Request 260 (accepted)

Overview

Request 260 (accepted)

update to current version 3.2.4, needed for current plugins to fix build on 12.2

Created by seife over 11 years ago
In state accepted

Submit audacious

Submit package home:seife:branches:Multimedia / audacious to package Multimedia / audacious

audacious.changes Changed

audacious.spec Changed

audacious-3.1.1.tar.bz2/GIT-Access Deleted

audacious-3.1.1.tar.bz2/NEWS Deleted

@@ -1,248 +0,0 @@
-Ok, so like, we suck at writing NEWS files.  If you want to find out about
-bug fixes, use JIRA.  If you want to find out about source changes, read our
-Mercurial logs.
-
-Audacious 2.1.0 (2009-07-06)
-============================
-
-Enhancements
-------------
-* Newui was moved into a plugin and is now called 'gtkui'. It is
-  still not very complete, but has progressed some.
-* Sorting by album added.
-* Completely new, written from scratch alsa-ng output plugin, which
-  fixes many of the problems our old ALSA output plugin had; including
-  high CPU load with Intel-HDA.
-* Listing of available interfaces via 'audacious -i list'.
-* Added bs2b (Bauer stereophonic-to-binaural) headphone crossfade filter
-  effect plugin. It is designed to prevent listener fatigue by reducing the
-  super-stereo effect that headphones normally produce.
-* rootvis plugin was dropped, as it does not work on most systems anymore.
-* Some updated translations.
-
-Bugfixes
---------
-* Mouse wheel settings where removed (for now) from properties, because
-  they didn't actually do anything.  
-* Fixed problems with seeking that could occur under certain conditions.
-* Many fixes in newui/gtkui.
-* Fixed frenzied looping, 100% CPU when loading metadata is disabled.
-* Run visualization process only when a shown and playing.
-* Quit cleanly (and safely) on SIGINT/QUIT/TERM.
-* Fixed several race conditions and NULL-pointer dereferences.
-* New playlist scanner, which, related to above, is safer and more effective.
-* Fixed MPRIS interface's GetStatus, StatusChange and Quit functionality to
-  match the official MPRIS spec.
-* Bunch of LADSPA, cdaudio-ng, PulseAudio fixes and cleanups.
-* Remove bogus and unnecessary end-of-playback logic in vorbis plugin.
-* Fixed NEON transport plugin error reporting.
-* SID-plugin was synchronized with XMMS-SID codebase, with number of
-  enhancements and fixes.
-* Fixed SSE2 instruction set support checking in configure.
-* JACK output plugin got cleaned up and checking for JACK availability
-  was changed to use pkg-config.
-* And bunch of other bugfixes, cleanups, etc.
-
-Audacious 2.0.1 (2009-05-13)
-============================
-
-Bugfixes
---------
-* Math dealing with the over-commitment of the equalizer values has been corrected.
-  However, please note that the equalizer goes from literal -12dB to +12dB, which
-  can be a very major boost. So yes, the highest settings causing distortion on really
-  loud audio is *not a bug*.
-  We may drop this down to 6dB in both ways in 2.1, depending on how many complaints
-  we get.
-
-Audacious 2.0.0 (2009-05-12)
-============================
-This branch of Audacious represents a major restructuring of how the player
-itself works. Notably, the skinned UI is no longer part of core. There is an
-experimental 'skinless' UI which can be launched with 'audacious2 -i newui',
-but it is incomplete at this time. Patches accepted!
-
-Other notable enhancements include switching to GIO/GVFS from using stdio,
-which while raising our requirements to GLib 2.16, gives us the ability to
-do many things out of the box. This is a good thing.
-
-Enhancements
-------------
-* Everything between 1.5.0 and 1.5.1.
-* Lots of other stuff.
-* Playing streams no longer edits the config preferences. This is a
-  behavioural trait from XMMS.
-* Many plugins have been added, including experimental support for PSF2.
-* The projectM plugin now works with libprojectM 1.2.
-
-Bugfixes
---------
-* The equalizer preamp setting has been fixed.
-* --play-pause actually works correctly now, it broke a long time ago
-  when we started using DBus
-* MPRIS exported data now includes the track number
-* Behavioural issues while seeking when paused have been corrected.
-* `audtool help playback-seek-relative` no longer segfaults
-* The file information dialog is no longer destroyed when you close it,
-  but is hidden instead.
-* Many legacy XMMS behaviours have been corrected.
-* Handling of non-bitmap fonts have been corrected.
-* Tons of others which are less notable.
-
-New bugs
---------
-* Probably a lot! Test and report.
-
-Audacious 1.5.0 (2008-03-13)
-============================
-This is the last branch of Audacious that will support in Winamp2 skins
-in core. We are working on a new default UI for Audacious2 which provides
-a more metadata rich environment (while still be lightweight and fast).
-However, it is planned to implement support for Winamp2 skins as a plugin in
-the next version. No promises, though.
-
-It has been fun being seen as "rescuing XMMS" by the community; but this
-has never been our goal. Our goal has always been to develop the best
-possible player on Linux. This means that we are audiophiles, and we want
-our audio to sound as nice as possible. This has been our primary goal;
-not maintaining a Winamp2 skinned player. When we determined that the current
-UI implementation was getting in our way, we decided to rip it out. As such,
-the future of Winamp2 skins in Audacious is undefined, but they will probably
-be supported via a plugin.
-
-Enhancements
-------------
-* Everything between 1.4.1 and 1.4.7. (duh)
-* Ability to disable GTK+ theme suggestions provided by skins.
-* Entirely from scratch audio engine (libSAD) which supports:
-  - 16-bit audio
-  - 24-bit audio
-  - 32-bit audio
-  - IEEE floating point audio
-  - 28-bit fractional audio
-  - many weird obscure "audiophile" formats
-  and:
-  - high quality dithering/conversion/resampling to produce as
-    high quality audio as possible for your sound system.
-  - bit-exact passthrough of decoded audio (compare to
-    "kernel streaming" in foobar2000)
-  As a result, support for oldschool 8-bit soundcards has been
-  _dropped_. It's 2008, they haven't made such hardware since the
-  early 90's.
-  Additionally, codecs now send audio to audacious using their
-  native format; removing the need for costly implementation-specific
-  conversion functionality.
-* New unified metadata editing for most formats. Ability to see
-  "raw metadata"; the metadata which can be used in tuplez scripts.
-* Removal of the XMMS audio conversion engine in it's entirety.
-* Support for "virtual plugins"; the ability for a single module to
-  export up to thousands of plugins. This will be used more in Audacious2.
-* Many adjustments to the winamp2 skinengine.
-* Faster jump-to-file.
-* Implement support for session management.
-
-Bugfixes
---------
-* playlist_compare_artist(): Avoid NULL dereferences.
-  (Bugzilla #172, Bugzilla #168, Bugzilla #35).
-* Tons of memory leaks fixed.
-
-
-Audacious 1.4.1 (2007-11-17)
-============================
-
-Enhancements
-------------
-* The skin code has been tweaked a little to fix loading of
-  more substandard winamp skins.
-  (http://boards.nenolod.net/viewtopic.php?f=5&t=859)
-* Playlists now carry an atomic serial number in order to avoid
-  unnecessary reloading of metadata.
-* The command names used by audtool have been sanitized in order
-  to make some level of sense.
-* Add many new calls to libaudclient which were unimplemented after
-  DBus transition.
-* Add error reporting when Tuplez scripts fail to compile.
-* Use a hashtable of extension to codec candidate lists to speed up 
-  codec detection.
-* Make on demand codec detection use the hashtable to filter out unplayable 
-  files.
-* Codec detection is now done on demand by default. Due to the recent 
-  rework of the codec detection system, this is the recommended setting.
-  (Audacious can process a large directory in only a few seconds of blocking 
-   this way, and streams are entirely processed in background this way.)
-* Add codec and quality fields to MPRIS TrackInfo tuples sent over DBus.
-
-Bugfixes
---------
-* [Bugzilla #53]: UTF-8 validation gives false positives
-  (Reported by Kosma Moczek; Fixed by Yoshiki Yazawa)
-* [Bugzilla #20]: status icon plugin breaks the 'always on top' feature
-  (Reported by Dorian Scholz; Fixed by Tomasz Moń)
-* playback_get_length() was returning the typecode of FIELD_LENGTH, not
-  it's value
-* audctrl.h was dependent on #ifdef __cplusplus being a valid macro,
-  now we use G_BEGIN_DECLS/G_END_DECLS to handle that.
-* Fix doublesize issues on startup. (Gentoo #199071)
-* Fix possible glitches that could be triggered by a scrolling textbox,
-  when the skin is switched.
-* Fix improper handling of integer constants in the Tuplez 
-  compiler/evaluation engine.
-* Fix misleading assertion notice triggers when a URI fails to load.
-* Cope with Winamp2 skins which do not have dashes in numbers.bmp.
-
-
-Audacious 1.4.0 (2007-11-01)
-============================
-
-* Everything ;)
-
-
-Audacious 1.3.0 (2007-03-02)
-============================
-
-Enhancements
-------------
-* The playlist code has been rewritten using conditional variables, 
-  which has resulted in speed improvements for the playlist code overall.
-* The behaviour for detecting filemagic has been redone and is now more
-  scalable.
-* DoubleSize support has been improved significantly.
-* Race conditions in produce_audio() have been corrected.
-* The playlist editor is now properly drawn in shaded mode.
-* g_utf8_validate has been replaced with a more strict utf8 validator, 
-  which solves the encapsulated UTF-8 phenomenon properly.
-* The controlsocket code no longer uses the stack in an improper manner.
-* Behaviour regarding conversion of %20 in the playlist has been corrected.
-* Window decorations can now be enabled in preferences.
-* The translation templates have been simplified.
-* Support for translating plugins has been re-added.
-* The Jump-to-File code has been rewritten and now searches using 
-  regular expressions. In addition, the search is done without GTK 
-  queueing redraws for each entry, which has resulted in interface 
-  speedups.
-* The overall UI code has been reworked significantly and should be of 
-  better quality. Notable enhancements include support for UIManager xml
-  file declarations.
-* A facility for searching and selecting/acting upon entries in the 
-  playlist has been added.
-* Support for multiple playlists has been added, and a playlist manager 
-  has been added to manage them.
-* Audacious now uses libmcs to store it's settings, which allows for 
-  tighter desktop environment integration.
-* Audacious now supports the XDG BASEDIR standard.
-* A lot of XMMS and BMP code has been either removed or rewritten so 
-  that it is less confusing. This should allow for easier maintainability 
-  in the future.
-* Debugging tools have been added for tracking memory allocation and freeing.
-* A safe signaling implementation has been added.
-* A voiceprint visualizer mode has been added.
-* Support for changing the tint in the graphics of skins has been added.
-* InputPlugins now use an InputPlayback context to track activity 
-  instead of blindly pushing data down a potentially undefined pipeline.
-* Audacious now uses GOption to parse the commandline.
-
-Bugfixes
---------
-* Too many to count.
-

audacious-3.1.1.tar.bz2/README Deleted

@@ -1,548 +0,0 @@
-Audacious
-A relatively powerful media player
-
-Copyright (c) 2005-2008 Audacious Development Team (see AUTHORS)
-
-Based on:
- BMP - Beep Media Player (c)2002-2005
-
-Which was based on:
- XMMS - X Multimedia System (c)1997-2001
-
- A Cross platform Multimedia Player
-
- Peter Alm, Thomas Nilsson, Olle Hallnas, Håvard Kvålen
-
-
-NOTE: This document is hardly maintained. Please check the Users' Guide
-on the Audacious website.
-
-
-TABLE OF CONTENTS
-*****************
-
-1. Disclaimer
-2. Installation
- 2.1. Basic Installation
- 2.2. Borderless Installation
- 2.3. Skin Installation
-3. Documentation
- 3.1. Controlling Audacious
- 3.1.1. Key bindings
- 3.2. Playlist editor
- 3.3. Equalizer
- 3.4. Menu
- 3.5. Preferences
- 3.5.1. Appearance
- 3.5.2. Playlist
- 3.5.3. Plugins
- 3.5.4. Audio
- 3.6. Plugins
- 3.7. Playlist Manager
-4. Obtaining Audacious
- 4.1. Obtaining Skins
-5. Bugs
-6. Contact
-
-
-
-
-1. Disclaimer
--------------
-
-We are not liable for any damage caused by the use of this program.
-
-Audacious is NOT a port of WinAmp (http://www.winamp.com). Audacious is
-a fork of XMMS (http://xmms.org) and BMP which borrowed the WinAmp GUI.
-
-However, Audacious is neither XMMS, or BMP, but takes a direction of
-its own.
-
-
-2. Installation
----------------
-
-Audacious requires the following libraries and their development
-packages installed:
-
- Glib 2, GTK+ 2, Pango, Cairo, libmcs, libmowgli
-
-The 'configure' script detects the presence of the required and
-optional depencies and their versions. Additional external libraries
-are required for much of Audacious functionality and plugins.
-
-You should always carefully check the output of 'configure' script
-to see if the options you wish to have become enabled, and see what
-requiremenst you may be missing if they are not.
-
-
-For building, GNU Make 3.80 or later is required. If you compile
-Audacious from a fresh Mercurial checkout, you will also need the
-following tools:
-
- autoconf >= 2.59
-
-Note that these tools and libraries are bundled with major Linux
-distributions. Use the packages provided with them where possible. If
-those packages are not sufficiently new, you may need to search
-third-party repositories for them.
-
-
-2.1. Basic Installation
------------------------
-
-cd audacious-VERSION
-./configure
-make
-make install
-
-This will put the binary in /usr/local/bin and plugins in
-/usr/local/lib/audacious/
-
-If you want to use the automatic character detection system, then you
-should use --enable-chardet.
-
-
-2.2. Borderless Installation
-----------------------------
-
-As far as I know most WM's accepts GTK decoration hints so it will
-not have borders. But some WM's can't handle this so you have to
-set in manually.
-
-AfterStep 1.0 ~/.steprc
-Style "XMMS_Player" NoTitle, NoHandles
-Style "XMMS_Playlist" NoTitle, NoHandles
-Style "XMMS_Equalizer" NoTitle, NoHandles
-
-AfterStep 1.4 ~/GNUstep/Library/AfterStep/database
-Style "XMMS_Player" NoTitle, NoHandles
-Style "XMMS_Playlist" NoTitle, NoHandles
-Style "XMMS_Equalizer" NoTitle, NoHandles
-
-Fvwm's ~/.fvwm95rc
-Style "XMMS_Player" NoTitle
-Style "XMMS_Playlist" NoTitle
-Style "XMMS_Equalizer" NoTitle
-
-CTWM's ~/.ctwmrc
-NoTitle and NoBorder sections:
-NoTitle {
- "xmms"
-}
-
-NoBorder {
- "xmms"
-}
-
-
-2.3. Skin Installation
-----------------------
-
-Audacious will create a directory called ~/.local/share/audacious/Skins.
-You can unarchive the skins the same way as you do for Winamp.
-
-However, you don't need to as Audacious supports archived skins. Audacious
-currently reads the following formats: zip, wsz, tar, tar.gz and
-tar.bz2
-
-Just copy the archive to one of the skin paths and Audacious will take
-care of the rest.
-
-In order to support zipped skins you will need to have unzip. Unzip
-is bundled with most Linux distributions.
-
-Audacious looks for skins in these directories (in listing order):
-
-<prefix>/share/audacious/Skins
-~/.local/share/audacious/Skins
-~/.audacious/Skins
-
-You can set the environment variable SKINSDIR to another location of
-your choice:
-
-For BASH: 
- export SKINSDIR=/path/to/Skins:/more/paths/to/other/locations/of/Skins
-
-For C Shell:
- setenv SKINSDIR /path/to/Skins:/more/paths/to/other/locations/of/Skins
-
-You should note that skins designed specifically for Audacious are not
-compatible with Winamp. Likewise, we do not support Winamp "modern" skins as
-there is a lot of Winamp-specifics that would have to be reverse-engineered
-or emulated to properly support those skins.
-
-3. Documentation
-----------------
-
-This file and / or http://audacious-media-player.org/
-
-
-3.1. Controlling Audacious
---------------------------
-
-When you start up Audacious, you will get a console very similar to that of
-Winamp.
-
-- On the top is the window title bar. To the right you will see 3 buttons,
- Left button will minimize Audacious.
- Middle button will make Audacious only display the title bar.
- Right button will end the Audacious session.
-
-- The area in the upper left part displays the following:
- - Play state: Paused, Stopped, or Playing
- - Time elapsed in the current song or if you click on it, the reversed.
- - Spectrum analyzer of the sound being played. Right mouse click will
- bring up the Visualization menu. Left mouse button will change the
- analyzer to an oscilloscope and/or none.
-
-- To the right of the Spectrum analyzer is the title of the file being
- played. This also contains the length of the song being played, as well
- as its position in the [unsorted] playlist. Right clicking in this window
- will bring up a new menu with some more options that are self explaining.
-
-- In the left part of the Spectrum analyzer you'll have letters (at least
- if you use the default skin) O A I D V. This is known as the "clutterbar'.
- Left-clicking on these will open up menus or perform the listed actions.
- O : Options menu
- A : Always on top
- I : File info box
- D : Double size mode
- V : Visualization menu
-
-- Underneath the track title are the following static informational data:
- - bit rate in KBps (usually 128 or 112)
- - Sample Rate in KHz (usually 44)
- - Stereo or Mono channel mixing
-
-- Underneath the informational data are a few controls you can play with:
- - The first slider controls the volume
- - The second slider controls the balance between speakers
- - The button marked "EQ" loads up the graphic equalizer
- - The button marked "PL" loads up the playlist editor
- - The LARGE slide bar moves from left to right as the song plays. You
- can drag this to jump to another location in the current file.
-
-- On the bottom of the console are the standard buttons you would see on
- a CD player: Previous track, Play, Pause, Stop, Next track, eject,
- shuffle and repeat.
-
- - The eject button doesn't REALLY eject, of course. :) It opens up the
- file requester. The File Requester builds a playlist for the current
- Audacious session. You can use it to load files, add files to the list,
- or load all mp3s in a directory.
-
- - The shuffle button randomizes the sequence of the playlist.
-
- - The repeat button when enabled makes the playlist loop when it reaches
- end of the playlist.
-
-
-3.1.1. Key bindings
--------------------
-
-Global: (Main, Equalizer and Playlist window)
-
- z = Previous song
- x = Play
- c = Pause
- v = Stop
- b = Next song
- l = Play file (brings up the Load file(s) dialog)
- j = Jump to file (in the existing playlist)
- r = Toggle Repeat
- s = Toggle Shuffle
-
- Control + h = Play location (url)
- Control + p = Preferences dialog
- Control + r = Time remaining
- Control + o = Always on top
- Control + w = Winshade mode
- Control + j = Jump to time
- Control + z = Start of list
- Control + n = No Playlist Advance
- Control + 3 = File info dialog
-
- Control + Alt + w = Toggle Equalizer winshade mode
- Shift + Control + w = Toggle Playlist winshade mode
-
- Alt + e = Toggle playlist window
- Alt + g = Toggle equalizer window
-
-Main window:
-
- Arrow key up = Volume up 2%
- Arrow key down = Volume down 2%
- Arrow key right = Skip 5 seconds forward in song
- Arrow key left = Skip 5 seconds back in song
-
-Playlist window:
-
- Arrow key up = up one step in playlist
- Arrow key down = Down one step in playlist
-
- Delete = Remove selected songs from playlist
- Page Up = Move one page up
- Page Down = Move one page down
- Home = Go to the first song
- End = Go to the last song
- Enter = Play selected song
- Insert = Add file dialog
- Shift + Insert = Add directory dialog
- Alt + Insert = Add url dialog
-
-Equalizer shade mode:
-
- Arrow key up = Volume up 2%
- Arrow key down = Volume down 2%
- Arrow key right = Balance 4% to right
- Arrow key left = Balance 4% to left
-
-
-3.2. Playlist editor
---------------------
-
-To access the Playlist editor, select the button labeled "PL" on the right
-side of the Audacious console.
-
-This will bring up the actual playlist window, here you'll find 5 buttons.
-All of these buttons can be held down to bring up an extra menu.
-From left to right:
-
-file + : will add a file to current playlist, held down mode you'll have
- 2 extra options
-dir : will let you pick a directory (recursive)
-url : will let you add an url for streaming
-
-file - : will delete the highlighted file, held down mode you'll have 3
- more options
-crop : delete all files except the highlighted in the list
-all : delete all files in the list
-misc : *** NOT FUNCTIONAL ***
-
-sel all : select all files in current playlist, held down mode you'll have
- 2 extra options
-sel zero : select none
-inv sel : invert you selection
-
-misc opts : held down you'll have 2 extra options
-fileinfo : opens the file info dialog.
-sort : release button on this will bring up another menu with sort
- options
-
-load list : will let you pick a playlist to load, held down you'll have
- 2 extra options
-save : will let you save your playlist
-new : will empty the playlist and let you create a new playlist
-
-If you want to select/deselect files in the filrequester/playlist editor use
-CTRL for files and SHIFT key for blocks of files. You can also browse the PL
-using the cursor keys and enter to select song. Pressing the delete button
-will remove the song from the playlist. If your mouse is equipped with a
-mouse wheel, you can use this to scroll up and down.
-
-
-3.3. Equalizer
---------------
-
-To access the Equalizer, select the button labeled "EQ" on the right side
-of the Audacious console.
-
-That will bring up the Equalizer window. It looks like an equalizer on a
-stereo and behaves like one as well. Press the button labeled ON to enable
-the use of the equalizer, once you turned it on you use it as a normal
-equalizer.
-
-EQ presets will be saved in ~/.audacious/config when you close Audacious. You
-can also have your own presets for different song using the "Preset" button,
-Audacious can also import/export from Winamp's preset files.
-
-If 'Auto' is enabled, Audacious will try to load equalizer presets like this:
-
-1: Look for a preset file in the directory of the file we are about to play.
-2: Look for a directory preset file in the same directory.
-3: Look for a preset saved with the "auto-load" feature.
-4: Finally, try to load the "default" preset.
-
-The 'preset' button will open up a menu with the following options:
-
-Load
- Preset : Will open a window with all available presets.
- Auto-load preset : Will open a window with all available auto-load
- presets.
- Default : Will load the default preset.
- Zero : Will reset the equalizer to zero.
- From file : Will load from a .preset file
- From Winamp EQF file : Will load from a Winamp equalizer file. If you
- choose a library file only the first entry will
- be loaded.
-Import
- Winamp presets : Imports the presets contained in an Winamp equalizer
- library file (often named Winamp.q1) and add all
- the entries to the Preset window.
-Save
- Preset : Let you name the current preset and save it.
- Auto-load preset : Saves the current settings as a preset for the song
- currently playing.
- Default : Saves the default value for the equalizer.
- From file : Saves the current settings in a preset file.
- From Winamp EQF file : Exports the current settings to a file readable by
- Winamp.
-Delete
- Preset : Let you delete a preset from the list.
- Auto-load preset : Let you delete a auto-load preset from the list.
-
-Configure Equalizer : Change the default names of directory based
- preset files.
-
-3.4. Menu
----------
-
-There are several menu hot spots on the Audacious window. One place is at the
-left hand side of the visual window described in sections 3.1 If you click
-the right mouse button in the main window, the menus will also pop up (same
-as clicking the button on the top left corner).
-
-
-3.5. Preferences
-----------------
-
-Use the menu to open Options / Preferences or press CTRL-P to bring the
-preferences dialog up.
-
-
-3.5.1. Appearance
------------------
-
-Skins
-In the skinlist you can choose a skin. How to install skins is described
-above. Click on a skin in the list to change to it.
-
-Fonts
-You can set the font in the main window by setting the 'Player' font. You
-can change the playlist font by setting the 'Playlist' font.
-
-Miscellaneous
-Show track numbers in playlist - Enable/disable displaying of track numbers
- in the playlist.
-Use custom cursors - Enable/disable custom cursors set by the
- skin.
-
-
-3.5.2. Playlist
----------------
-
-Filename
-Convert underscores to blanks - Converts '_' (underscores) to ' ' in the
- playlist.
-Convert %20 to blanks - Converts '%20' to ' ' in the
- playlist.
-
-Metadata
-Load metadata from playlists and files - Loads metadata from files and
- playlists (e.g. ID3 tags).
-
-Playback
-Don't advance in playlist - Don't advance to the next song in the playlist
- when the current song ends.
-Pause between songs - Set the time (in secons) to pause on songchange
-
-Song display
-Title format - Choose the format to display the song names in the playlist.
-Custom string - When the above option is set to 'Custom' insert a string of
- substitutes here.
-
-3.5.3. Plugins
---------------
-
-Enable/disable and configure plugins in this section.
-
-Choose a tab to list one of the types of plugins:
- - Decoders (filetype/device support)
- - General (general plugins)
- - Visualization (visualization plugins)
- - Effects (effect plugins)
-
-3.5.4. Audio
-------------
-
-The settings in this section are related to the audio system.
-
-
-3.6. Plugins
-------------
-
-Plugins are what makes Audacious work, by moving most of the code out of
-Audacious and into a plugin architecture it's possible to change almost
-everything in Audacious. There are today 8 different types of plugins.
-
-However to promote maximum flexibility of the platform itself, we no longer
-include any plugins with the Audacious core.
-
-You will need to download and install our plugin pack for Audacious if you
-expect it to do anything useful (like actually play any files).
-
-You should note that third-party plugins are not supported by the Audacious
-development team, and that you should report any issues with them on our
-forums, but NEVER on our bugtracker.
-
-
-3.7. Playlist Manager
----------------------
-
-Audacious supports multiple playlists (think foobar2000). For the manipulation
-of playlists, we have included a playlist manager tool.
-
-It is accessible from the Playlist menu.
-
-
-4. Obtaining Audacious
-----------------------
-
-Currently, we only provide source tarballs at:
-
- http://audacious-media-player.org/downloads
-
-Audacious source is managed and also available via the Atheme.org
-GIT repository, refer to following web-page for information:
-
- http://audacious-media-player.org/developers
-
-You may also want to read file "GIT-Access".
-
-
-4.1. Obtaining Skins
---------------------
-
-You can find skins for Audacious by Googling for WinAmp 2.x skins
-or XMMS skins. You may be also able to find Audacious specific skins.
-
-5. Bugs
--------
-
-Audacious is under heavy development and as such, has quite a number of
-bugs. Our bug tracker page is maintained at:
-
- http://jira.atheme.org/
-
-It will continue to have bugs as we fix and introduce new ones through
-rewriting and enhancement. Help us along by reporting new bugs, and
-verifying existing ones.
-
-
-6. Contact
-----------
-
-We do not currently have any official forum or other method of end-user
-related communication. Primarily any end-user type questions should be
-directed to your distribution-related forums.
-
-
-There exists an IRC channel at irc.atheme.org #audacious. You should note
-that this IRC presence is mainly for development issues and internal project
-use. It is not meant for end-user support or questions.
-
-Project admins:
-
- William Pitcock email: nenolod at sacredspiral.co.uk
- Tony Vroon email: chainsaw at gentoo.org

audacious-3.1.1.tar.bz2/contrib/migrate_config.sh Deleted

@@ -1,28 +0,0 @@
-#!/bin/sh
-#
-# This script is used to convert the old $HOME/.audacious config dir
-# to the new XDG basedir equivalent.
-#
-
-: ${BMP_RCPATH:=".audacious"}
-: ${XDG_CONFIG_HOME:="$HOME/.config"}
-: ${XDG_DATA_HOME:="$HOME/.local/share"}
-: ${XDG_CACHE_HOME:="$HOME/.cache"}
-
-rm -fr "$XDG_CONFIG_HOME/audacious"
-rm -fr "$XDG_DATA_HOME/audacious"
-rm -fr "$XDG_CACHE_HOME/audacious"
-
-mkdir -p "$XDG_CONFIG_HOME/audacious"
-mkdir -p "$XDG_DATA_HOME/audacious/Plugins"
-mkdir -p "$XDG_DATA_HOME/audacious/Skins"
-mkdir -p "$XDG_CACHE_HOME/audacious/thumbs"
-
-mv "$HOME/$BMP_RCPATH/config"        "$XDG_CONFIG_HOME/audacious/"
-mv "$HOME/$BMP_RCPATH/playlist.xspf" "$XDG_CONFIG_HOME/audacious/"
-mv "$HOME/$BMP_RCPATH/Plugins"       "$XDG_DATA_HOME/audacious/"
-mv "$HOME/$BMP_RCPATH/Skins"         "$XDG_DATA_HOME/audacious/"
-mv "$HOME/$BMP_RCPATH/accels"        "$XDG_CONFIG_HOME/audacious/"
-mv "$HOME/$BMP_RCPATH/log"           "$XDG_CONFIG_HOME/audacious/"
-
-echo "Conversion done. Please move the remaining files manually."

audacious-3.1.1.tar.bz2/contrib/win32/patches/xml2-config.diff Deleted

audacious-3.1.1.tar.bz2/doc Deleted

audacious-3.1.1.tar.bz2/doc/HACKING Deleted

@@ -1,127 +0,0 @@
-Hacking / coding guide for Audacious and Audacious-plugins
-==========================================================
-(C) Copyright 2008 Audacious Development Team
-
-
-Preamble
-========
-
-This document describes the guidelines for people who wish to work on
-improving or cleaning up Audacious media player, or any of the plugins
-we distribute in the plugins package.
-
-It is probably obvious to anyone who has taken a look into the depths
-of Audacious source, that many of these guidelines are not actually
-followed currently in all places, if at all.
-
-In fact, the purpose of this document is to act as a target to aim at,
-when noticing and cleaning up uncompliant code.. or writing new code.
-
-
-Coding guidelines
-=================
-- Public functions in Audacious core SHOULD be documented via Doxygen
-  comments! In this case "public" means any functions that span modules
-  OR are available to plugins.
-
-  Of course, most functions currently lack documentation. If you have
-  spare time, improve the situation.
-
-
-- We use Glib for portability. This means that we have sized integer types
-  such as gint{16,32,64}, etc. and shorthand types like guint and guchar
-  provided, so please do use them.
-
-  Arguably C99 provides inttypes.h with similar types, but C99 support
-  may not be complete on all platforms, it is both safer and more uniform
-  to use glib types.
-
-
-- Use other glib functionality, especially string handling like:
-  * g_snprintf(), g_strdup_printf(), g_strdup() ...
-
-
-- However, avoid following Glib things:
-  * GString - Useless in most cases compared to normal 'C' string functions
-    and introduces conversions back and forth.
-
-  * GList   - GList is slow, either use GQueue or libmowgli lists.
-
-
-- Be sure to know when you are handling UTF-8 or something else! Glib offers
-  special g_ascii_*() functions for certain operations that you might need
-  when handling non-unicode strings.
-
-
-- When reading data from files, it's usually a BIG mistake to read structs
-  directly from the stream! This is not portable, as C does not guarantee
-  a struct not to have alignment padding (unless the struct is "packed",
-  but see below.) In effect sizeof(struct), unless packed, on some platform
-  may not be equal to some other platform.
-
-  Making struct "packed" via the C packed qualifier or "#pragma pack()" is
-  a solution, but this must be used with care. Unaligned memory access
-  causes performance penalties, and may cause other, more serious problems
-  in some cases. For example, code written in assembler may not know about
-  the un-alignment, and may thus fail with 'bus errors' on platforms that
-  strictly required aligned data.
-
-  The 100% safe way is to read individual members of the struct one by one
-  from the stream. This may be bothersome, but by doing so, your code
-  will be portable for sure.
-
-
-- Always use Glib sized types for reading integer data from file streams.
-  Using plain C types (like 'long int' for example) is not wise, because
-  they may be of different size on different platforms depending on the
-  platform ABI. For example, on some 64-bit platforms, 'long int' is
-  64 bits, while on 32-bit platforms it is 32 bits.
-
-
-- Audacious core provides some helper functions for reading endian-dependant
-  integers from VFS streams (aud_vfs_fget_{le,be}{16,32,64}), see vfs.h and
-  documentation for more information.
-
-
-- Avoid reinventing wheels, avoid code duplication. If same thing is done
-  in two places, it should be in a library, or possibly in Audacious core.
-  Discuss about it with fellow developers.
-
-
-- In the core, DO NOT WRITE CODE THAT IS DEPENDENT ON A SPECIFIC UI OR
-  INTERFACE. The core should NEVER care what interface is in use.
-
-
-Additional style guidelines
-===========================
-
-- Indentation: Use the same indentation style (also spaces vs. tabs)
-  as the file you are editing. In new files/code, use indentation of
-  4 spaces (no tabs). When moving functions to new files, PLEASE
-  reindent the code.
-
-- Whitespace usage in code:
-
-  a = 1;
-
-  if (b == d && !strcmp(a, c)) ...
-
-  gchar *foo, *bar;
-
-  void hello(const gchar *baz);
-
-- Blocks:
-
-  while (...)
-  {
-      do_something(...);
-  }
-
-  if (...)
-  {
-      do_stuff();
-  }
-  else
-  {
-      do_other_stuff();
-  }

audacious-3.1.1.tar.bz2/doc/TODO Deleted

@@ -1,31 +0,0 @@
-Long-term "TODO"
-================
-
-- output plugins should have some kind of (optional) "query available formats"
-  function, so that the core could determine what should be used. perhaps
-  offer users this info?
-
-- maybe all audio plugins (input, output, effect) could be made completely
-  re-entrant. this probably means severely breaking the API. not very
-  trivial either .. some plugins are probably impossible.
-  * basically plugin init() should allocate / init a state struct to
-    be used in all operations, etc.
-  * context support should be added to plugin functions.
-  * question: issues with plugins that use non-re-entrant library backends
-    etc?
-
-- URIs with "?" are stripped (the subtune support uses that), which is bad,
-  because some (a lot) of real-world URLs use 'GET' arguments. this breaks
-  probing, but current input probing is confusing (and possibly broken anyway)
-  and should be refactored.
-  * As of 2.5, is this still a problem?
-
-- mime-types support:
-  * there is already code for mime support, but I think it may not be
-    sufficient as it is designed for input plugins only --
-    also playlist containers etc. need this (IMHO)
-
-- document the different APIs via Doxygen
-
-- plugin rewrites:
-  * modplug (in progress by ccr)

audacious-3.1.1.tar.bz2/mkinstalldirs Deleted

@@ -1,111 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain
-
-errstatus=0
-dirmode=""
-
-usage="\
-Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
-
-# process command line arguments
-while test $# -gt 0 ; do
- case $1 in
- -h | --help | --h*) # -h for help
- echo "$usage" 1>&2
- exit 0
- ;;
- -m) # -m PERM arg
- shift
- test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
- dirmode=$1
- shift
- ;;
- --) # stop option processing
- shift
- break
- ;;
- -*) # unknown option
- echo "$usage" 1>&2
- exit 1
- ;;
- *) # first non-opt arg
- break
- ;;
- esac
-done
-
-for file
-do
- if test -d "$file"; then
- shift
- else
- break
- fi
-done
-
-case $# in
- 0) exit 0 ;;
-esac
-
-case $dirmode in
- '')
- if mkdir -p -- . 2>/dev/null; then
- echo "mkdir -p -- $*"
- exec mkdir -p -- "$@"
- fi
- ;;
- *)
- if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
- echo "mkdir -m $dirmode -p -- $*"
- exec mkdir -m "$dirmode" -p -- "$@"
- fi
- ;;
-esac
-
-for file
-do
- set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
- shift
-
- pathcomp=
- for d
- do
- pathcomp="$pathcomp$d"
- case $pathcomp in
- -*) pathcomp=./$pathcomp ;;
- esac
-
- if test ! -d "$pathcomp"; then
- echo "mkdir $pathcomp"
-
- mkdir "$pathcomp" || lasterr=$?
-
- if test ! -d "$pathcomp"; then
- 	errstatus=$lasterr
- else
- 	if test ! -z "$dirmode"; then
-	 echo "chmod $dirmode $pathcomp"
- 	 lasterr=""
- 	 chmod "$dirmode" "$pathcomp" || lasterr=$?
-
- 	 if test ! -z "$lasterr"; then
- 	 errstatus=$lasterr
- 	 fi
- 	fi
- fi
- fi
-
- pathcomp="$pathcomp/"
- done
-done
-
-exit $errstatus
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# End:
-# mkinstalldirs ends here

audacious-3.1.1.tar.bz2/src/libaudcore/audio.h Deleted

@@ -1,58 +0,0 @@
-/*
- * audio.h
- * Copyright 2009 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 AUDACIOUS_AUDIO_H
-#define AUDACIOUS_AUDIO_H
-
-#include <glib.h>
-
-/* 24-bit integer samples are padded to 32-bit; high byte is always 0 */
-enum {
- FMT_FLOAT,
- FMT_S8, FMT_U8,
- FMT_S16_LE, FMT_S16_BE, FMT_U16_LE, FMT_U16_BE,
- FMT_S24_LE, FMT_S24_BE, FMT_U24_LE, FMT_U24_BE,
- FMT_S32_LE, FMT_S32_BE, FMT_U32_LE, FMT_U32_BE};
-
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-#define FMT_S16_NE FMT_S16_LE
-#define FMT_U16_NE FMT_U16_LE
-#define FMT_S24_NE FMT_S24_LE
-#define FMT_U24_NE FMT_U24_LE
-#define FMT_S32_NE FMT_S32_LE
-#define FMT_U32_NE FMT_U32_LE
-#else
-#define FMT_S16_NE FMT_S16_BE
-#define FMT_U16_NE FMT_U16_BE
-#define FMT_S24_NE FMT_S24_BE
-#define FMT_U24_NE FMT_U24_BE
-#define FMT_S32_NE FMT_S32_BE
-#define FMT_U32_NE FMT_U32_BE
-#endif
-
-#define FMT_SIZEOF(f) \
- (f == FMT_FLOAT ? sizeof (gfloat) : f <= FMT_U8 ? 1 : f <= FMT_U16_BE ? 2 : 4)
-
-void audio_from_int (const void * in, gint format, gfloat * out, gint samples);
-void audio_to_int (const gfloat * in, void * out, gint format, gint samples);
-void audio_amplify (gfloat * data, gint channels, gint frames, gfloat * factors);
-
-#endif

audacious-3.1.1.tar.bz2/src/libaudcore/eventqueue.h Deleted

@@ -1,43 +0,0 @@
-/*
- * eventqueue.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 AUDACIOUS_EVENTQUEUE_H
-#define AUDACIOUS_EVENTQUEUE_H
-
-#include <glib.h>
-
-/* Schedules a call of the hook <name> from the program's main loop, to be
- * executed in <time> milliseconds. If <free_data> is nonzero, <data> will be
- * freed with g_free() after the hook is called. */
-void event_queue_full (gint time, const gchar * name, void * data, gboolean free_data);
-
-/* convenience macro */
-#define event_queue(n,d) event_queue_full (0, n, d, FALSE)
-
-/* deprecated; use event_queue_full() instead */
-#define event_queue_timed(t,n,d) event_queue_full (t, n, d, FALSE)
-#define event_queue_with_data_free(n,d) event_queue_full (0, n, d, TRUE)
-
-/* Cancels pending hook calls matching <name> and <data>. If <data> is null,
- * all hook calls matching <name> are canceled. */
-void event_queue_cancel (const gchar * name, void * data);
-
-#endif

audacious-3.1.1.tar.bz2/src/libaudcore/md5.c Deleted

@@ -1,240 +0,0 @@
-/*
- * MD5 implementation, modified for Audacious from
- * Colin Plumb's implementation by Matti 'ccr' Hämäläinen.
- *
- * This code implements the MD5 message-digest algorithm.
- * The algorithm is due to Ron Rivest. This code was
- * written by Colin Plumb in 1993, no copyright is claimed.
- * This code is in the public domain; do with it what you wish.
- */
-#include "md5.h"
-#include <string.h>
-
-
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-# define aud_md5_bytereverse(buf, len) do { } while (0)
-#else
-# if G_BYTE_ORDER == G_BIG_ENDIAN
-static void aud_md5_bytereverse(guint8 *buf, guint l)
-{
- guint32 t;
- do {
- t = (guint32) ((guint) buf[3] << 8 | buf[2]) << 16 | ((guint) buf[1] << 8 | buf[0]);
- *(guint32 *) buf = t;
- buf += sizeof(guint32);
- } while (--l);
-}
-# else
-# error Unsupported endianess, not G_LITTLE_ENDIAN or G_BIG_ENDIAN!
-# endif
-#endif
-
-
-/**
- * Start MD5 accumulation. Set bit count to 0 and buffer to mysterious
- * initialization constants. Initializes the given state context.
- *
- * @param ctx Context structure to initialize.
- */
-void aud_md5_init(aud_md5state_t *ctx)
-{
- ctx->buf[0] = 0x67452301;
- ctx->buf[1] = 0xefcdab89;
- ctx->buf[2] = 0x98badcfe;
- ctx->buf[3] = 0x10325476;
-
- ctx->bits[0] = 0;
- ctx->bits[1] = 0;
-}
-
-
-/* The core of the MD5 algorithm, this alters an existing MD5 hash to
- * reflect the addition of 16 longwords of new data. aud_md5_update blocks
- * the data and converts bytes into longwords for this routine.
- */
-#define F1(x, y, z) (z ^ (x & (y ^ z)))
-#define F2(x, y, z) F1(z, x, y)
-#define F3(x, y, z) (x ^ y ^ z)
-#define F4(x, y, z) (y ^ (x | ~z))
-#define MD5STEP(f, w, x, y, z, data, s) \
- ( w += f(x, y, z) + data, w = w<<s | w>>(32-s), w += x )
-
-static void aud_md5_transform(guint32 buf[4], guint32 const in[16])
-{
- register guint32 a, b, c, d;
-
- a = buf[0];
- b = buf[1];
- c = buf[2];
- d = buf[3];
-
- MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478, 7);
- MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756, 12);
- MD5STEP(F1, c, d, a, b, in[2] + 0x242070db, 17);
- MD5STEP(F1, b, c, d, a, in[3] + 0xc1bdceee, 22);
- MD5STEP(F1, a, b, c, d, in[4] + 0xf57c0faf, 7);
- MD5STEP(F1, d, a, b, c, in[5] + 0x4787c62a, 12);
- MD5STEP(F1, c, d, a, b, in[6] + 0xa8304613, 17);
- MD5STEP(F1, b, c, d, a, in[7] + 0xfd469501, 22);
- MD5STEP(F1, a, b, c, d, in[8] + 0x698098d8, 7);
- MD5STEP(F1, d, a, b, c, in[9] + 0x8b44f7af, 12);
- MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1, 17);
- MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7be, 22);
- MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122, 7);
- MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12);
- MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17);
- MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22);
-
- MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562, 5);
- MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340, 9);
- MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14);
- MD5STEP(F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20);
- MD5STEP(F2, a, b, c, d, in[5] + 0xd62f105d, 5);
- MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9);
- MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681, 14);
- MD5STEP(F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20);
- MD5STEP(F2, a, b, c, d, in[9] + 0x21e1cde6, 5);
- MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6, 9);
- MD5STEP(F2, c, d, a, b, in[3] + 0xf4d50d87, 14);
- MD5STEP(F2, b, c, d, a, in[8] + 0x455a14ed, 20);
- MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905, 5);
- MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8, 9);
- MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9, 14);
- MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20);
-
- MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942, 4);
- MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681, 11);
- MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16);
- MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380c, 23);
- MD5STEP(F3, a, b, c, d, in[1] + 0xa4beea44, 4);
- MD5STEP(F3, d, a, b, c, in[4] + 0x4bdecfa9, 11);
- MD5STEP(F3, c, d, a, b, in[7] + 0xf6bb4b60, 16);
- MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70, 23);
- MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6, 4);
- MD5STEP(F3, d, a, b, c, in[0] + 0xeaa127fa, 11);
- MD5STEP(F3, c, d, a, b, in[3] + 0xd4ef3085, 16);
- MD5STEP(F3, b, c, d, a, in[6] + 0x04881d05, 23);
- MD5STEP(F3, a, b, c, d, in[9] + 0xd9d4d039, 4);
- MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11);
- MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16);
- MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665, 23);
-
- MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244, 6);
- MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97, 10);
- MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15);
- MD5STEP(F4, b, c, d, a, in[5] + 0xfc93a039, 21);
- MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3, 6);
- MD5STEP(F4, d, a, b, c, in[3] + 0x8f0ccc92, 10);
- MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47d, 15);
- MD5STEP(F4, b, c, d, a, in[1] + 0x85845dd1, 21);
- MD5STEP(F4, a, b, c, d, in[8] + 0x6fa87e4f, 6);
- MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10);
- MD5STEP(F4, c, d, a, b, in[6] + 0xa3014314, 15);
- MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1, 21);
- MD5STEP(F4, a, b, c, d, in[4] + 0xf7537e82, 6);
- MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10);
- MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15);
- MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391, 21);
-
- buf[0] += a;
- buf[1] += b;
- buf[2] += c;
- buf[3] += d;
-}
-
-
-/**
- * Appends more data to the MD5 state context. Updates context to
- * reflect the concatenation of another buffer full of bytes.
- *
- * @param ctx State context to add data in.
- * @param buf Pointer to buffer of data.
- * @param len Length/size of the data in buffer.
- */
-void aud_md5_append(aud_md5state_t *ctx, const guint8 *buf, guint len)
-{
- guint32 t;
-
- /* Update bitcount */
- t = ctx->bits[0];
- if ((ctx->bits[0] = t + ((guint32) len << 3)) < t)
- ctx->bits[1]++; /* Carry from low to high */
- ctx->bits[1] += len >> 29;
-
- t = (t >> 3) & 0x3f; /* Bytes already in shsInfo->data */
-
- /* Handle any leading odd-sized chunks */
- if (t) {
- guint8 *p = (guint8 *) ctx->in + t;
-
- t = 64 - t;
- if (len < t) {
- memcpy(p, buf, len);
- return;
- }
- memcpy(p, buf, t);
- aud_md5_bytereverse(ctx->in, 16);
- aud_md5_transform(ctx->buf, (guint32 *) ctx->in);
- buf += t;
- len -= t;
- }
-
- /* Process data in 64-byte chunks */
- while (len >= 64) {
- memcpy(ctx->in, buf, 64);
- aud_md5_bytereverse(ctx->in, 16);
- aud_md5_transform(ctx->buf, (guint32 *) ctx->in);
- buf += 64;
- len -= 64;
- }
-
- /* Handle any remaining bytes of data. */
- memcpy(ctx->in, buf, len);
-}
-
-/**
- * Calculates a MD5 hash digest from the given context.
- *
- * @param ctx State context to be hashed.
- * @param digest Variable where computed MD5 digest is placed.
- */
-void aud_md5_finish(aud_md5state_t *ctx, aud_md5hash_t digest)
-{
- guint count;
- guint8 *p;
-
- /* Compute number of bytes mod 64 */
- count = (ctx->bits[0] >> 3) & 0x3F;
-
- /* Set the first char of padding to 0x80. This is safe since there is
- always at least one byte free */
- p = ctx->in + count;
- *p++ = 0x80;
-
- /* Bytes of padding needed to make 64 bytes */
- count = 64 - 1 - count;
-
- /* Pad out to 56 mod 64 */
- if (count < 8) {
- /* Two lots of padding: Pad the first block to 64 bytes */
- memset(p, 0, count);
- aud_md5_bytereverse(ctx->in, 16);
- aud_md5_transform(ctx->buf, (guint32 *) ctx->in);
-
- /* Now fill the next block with 56 bytes */
- memset(ctx->in, 0, 56);
- } else {
- /* Pad block to 56 bytes */
- memset(p, 0, count - 8);
- }
- aud_md5_bytereverse(ctx->in, 14);
-
- /* Append length in bits and transform */
- ((guint32 *) ctx->in)[14] = ctx->bits[0];
- ((guint32 *) ctx->in)[15] = ctx->bits[1];
-
- aud_md5_transform(ctx->buf, (guint32 *) ctx->in);
- aud_md5_bytereverse((guint8 *) ctx->buf, 4);
- memcpy(digest, ctx->buf, 16);
- memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */
-}

audacious-3.1.1.tar.bz2/src/libaudcore/md5.h Deleted

audacious-3.1.1.tar.bz2/src/libaudcore/stringpool.c Deleted

@@ -1,89 +0,0 @@
-/*
- * Audacious
- * Copyright © 2009 William Pitcock <nenolod@atheme.org>
- * Copyright © 2010 John Lindgren <john.lindgren@tds.net>
- *
- * This program is free software; 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 <glib.h>
-#include <mowgli.h>
-
-static mowgli_patricia_t *stringpool_tree = NULL;
-static GStaticMutex stringpool_mutex = G_STATIC_MUTEX_INIT;
-
-#define MAXLEN 100
-
-gchar *
-stringpool_get(gchar *str, gboolean take)
-{
- if (str == NULL)
- return NULL;
-
- if (strlen(str) > MAXLEN)
- return take ? str : g_strdup(str);
-
- g_static_mutex_lock(&stringpool_mutex);
-
- if (stringpool_tree == NULL)
- stringpool_tree = mowgli_patricia_create(NULL);
-
- mowgli_patricia_elem_t *elem = mowgli_patricia_elem_find(stringpool_tree, str);
- if (elem != NULL)
- {
- gint refcount = GPOINTER_TO_INT(mowgli_patricia_elem_get_data(elem));
- mowgli_patricia_elem_set_data(elem, GINT_TO_POINTER(refcount + 1));
- }
- else
- {
- elem = mowgli_patricia_elem_add(stringpool_tree, str, GINT_TO_POINTER(1));
- assert(elem != NULL);
- }
-
- if (take)
- g_free(str);
- str = (gchar *)mowgli_patricia_elem_get_key(elem);
-
- g_static_mutex_unlock(&stringpool_mutex);
-
- return str;
-}
-
-void
-stringpool_unref(gchar *str)
-{
- if (str == NULL)
- return;
-
- if (strlen(str) > MAXLEN)
- return g_free(str);
-
- g_return_if_fail(stringpool_tree != NULL);
-
- g_static_mutex_lock(&stringpool_mutex);
-
- mowgli_patricia_elem_t *elem = mowgli_patricia_elem_find(stringpool_tree, str);
- assert(elem != NULL);
-
- gint refcount = GPOINTER_TO_INT(mowgli_patricia_elem_get_data(elem));
- if (refcount == 1)
- mowgli_patricia_elem_delete(stringpool_tree, elem);
- else
- mowgli_patricia_elem_set_data(elem, GINT_TO_POINTER(refcount - 1));
-
- g_static_mutex_unlock(&stringpool_mutex);
-}

audacious-3.1.1.tar.bz2/src/libaudcore/stringpool.h Deleted

@@ -1,51 +0,0 @@
-/*
- * Audacious
- * Copyright © 2009 William Pitcock <nenolod@atheme.org>
- *
- * This program is free software; 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.
- */
-/**
- * @file stringpool.h
- * String pool API for "pooling" identical strings into references
- * instead of keeping multiple copies around.
- */
-
-#ifndef AUDACIOUS_STRINGPOOL_H
-#define AUDACIOUS_STRINGPOOL_H
-
-/**
- * Fetches or allocates a given string from the stringpool.
- * If string already exists in the pool, reference to it is returned.
- * Otherwise, a new string is created in the pool with one reference.
- *
- * @param[in] str String to be poolified.
- * @param[in] take Nonzero if the caller no longer needs str; in this case, the
- * pool will eventually call g_free(str).
- * @return Reference to the pooled string, or NULL if the given
- * string was NULL or an error occured.
- */
-gchar *stringpool_get(gchar *str, gboolean take);
-
-/**
- * Unreference a pooled string. When there are no references left,
- * the string is unallocated and removed from the pool.
- *
- * @param[in] str Pointer to a string in the pool.
- */
-void stringpool_unref(gchar *str);
-
-#endif
-

audacious-3.1.1.tar.bz2/src/libaudcore/vfs_buffer.c Deleted

@@ -1,249 +0,0 @@
-/* Audacious
- * Copyright (c) 2006-2007 William Pitcock
- *
- * This program is free software; 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 "vfs.h"
-#include "vfs_buffer.h"
-
-
-static VFSFile *
-buffer_vfs_fopen_impl(const gchar * path,
- const gchar * mode)
-{
- return NULL;
-}
-
-static gint
-buffer_vfs_fclose_impl(VFSFile * file)
-{
- g_return_val_if_fail(file != NULL, -1);
-
- g_free(file->handle);
-
- return 0;
-}
-
-static gint64 buffer_vfs_fread_impl (void * i_ptr, gint64 size, gint64 nmemb,
- VFSFile * file)
-{
- VFSBuffer *handle;
- guchar *i;
- gsize read = 0;
- guchar *ptr = (guchar *) i_ptr;
-
- if (file == NULL)
- return 0;
-
- handle = (VFSBuffer *) file->handle;
-
- for (i = ptr; (gsize) (i - ptr) < nmemb * size &&
-	 (gsize) (i - ptr) <= handle->size;
-	 i++, handle->iter++)
- {
- *i = *handle->iter;
- read++;
- }
-
- return (read / size);
-}
-
-static gint64 buffer_vfs_fwrite_impl (const void * i_ptr, gint64 size, gint64
- nmemb, VFSFile * file)
-{
- VFSBuffer *handle;
- const guchar *i;
- gsize written = 0;
- const guchar *ptr = (const guchar *) i_ptr;
-
- if (file == NULL)
- return 0;
-
- handle = (VFSBuffer *) file->handle;
-
- for (i = ptr; (gsize) (i - ptr) < nmemb * size &&
-	 (gsize) (i - ptr) <= handle->size;
-	 i++, handle->iter++)
- {
- *handle->iter = *i;
- written++;
- }
-
- return (written / size);
-}
-
-static gint
-buffer_vfs_getc_impl(VFSFile *stream)
-{
- VFSBuffer *handle = (VFSBuffer *) stream->handle;
- gint c;
-
- c = *handle->iter;
- handle->iter++;
-
- return c;
-}
-
-static gint
-buffer_vfs_ungetc_impl(gint c, VFSFile *stream)
-{
- return -1;
-}
-
-static gint
-buffer_vfs_fseek_impl(VFSFile * file,
- gint64 offset,
- gint whence)
-{
- VFSBuffer *handle;
-
- if (file == NULL)
- return 0;
-
- handle = (VFSBuffer *) file->handle;
-
- switch(whence)
- {
- case SEEK_CUR:
- handle->iter = handle->iter + offset;
- break;
- case SEEK_END:
- handle->iter = handle->end;
- break;
- case SEEK_SET:
- default:
- handle->iter = handle->data + offset;
- break;
- }
-
- return 0;
-}
-
-static void
-buffer_vfs_rewind_impl(VFSFile * file)
-{
- VFSBuffer *handle;
-
- if (file == NULL)
- return;
-
- handle = (VFSBuffer *) file->handle;
-
- handle->iter = handle->data;
-}
-
-static gint64
-buffer_vfs_ftell_impl(VFSFile * file)
-{
- VFSBuffer *handle;
-
- if (file == NULL)
- return 0;
-
- handle = (VFSBuffer *) file->handle;
-
- return handle->iter - handle->data;
-}
-
-static gboolean
-buffer_vfs_feof_impl(VFSFile * file)
-{
- VFSBuffer *handle;
-
- if (file == NULL)
- return FALSE;
-
- handle = (VFSBuffer *) file->handle;
-
- return (gboolean) (handle->iter == handle->end);
-}
-
-static gint
-buffer_vfs_truncate_impl (VFSFile * file, gint64 size)
-{
- return 0;
-}
-
-static gint64
-buffer_vfs_fsize_impl(VFSFile * file)
-{
- VFSBuffer *handle;
-
- if (file == NULL)
- return -1;
-
- handle = (VFSBuffer *) file->handle;
-
- return (off_t) (handle->end - handle->data);
-}
-
-static VFSConstructor buffer_const = {
-	buffer_vfs_fopen_impl,
-	buffer_vfs_fclose_impl,
-	buffer_vfs_fread_impl,
-	buffer_vfs_fwrite_impl,
-	buffer_vfs_getc_impl,
-	buffer_vfs_ungetc_impl,
-	buffer_vfs_fseek_impl,
-	buffer_vfs_rewind_impl,
-	buffer_vfs_ftell_impl,
-	buffer_vfs_feof_impl,
-	buffer_vfs_truncate_impl,
-	buffer_vfs_fsize_impl,
-	NULL
-};
-
-VFSFile *
-vfs_buffer_new(gpointer data, gsize size)
-{
- VFSFile *handle;
- VFSBuffer *buffer;
-
- g_return_val_if_fail(data != NULL, NULL);
- g_return_val_if_fail(size > 0, NULL);
-
- if ((handle = g_new0(VFSFile, 1)) == NULL)
- return NULL;
-
- if ((buffer = g_new0(VFSBuffer, 1)) == NULL)
- {
- g_free(handle);
- return NULL;
- }
-
- buffer->data = data;
- buffer->iter = data;
- buffer->end = (guchar *) data + size;
- buffer->size = size;
-
- handle->handle = buffer;
- handle->base = &buffer_const;
- handle->ref = 1;
- handle->sig = VFS_SIG;
-
- return handle;
-}
-
-VFSFile *
-vfs_buffer_new_from_string(gchar *str)
-{
- g_return_val_if_fail(str != NULL, NULL);
-
- return vfs_buffer_new(str, strlen(str));
-}

audacious-3.1.1.tar.bz2/src/libaudcore/vfs_buffer.h Deleted

@@ -1,55 +0,0 @@
-/* Audacious
- * Copyright (c) 2006-2007 William Pitcock
- *
- * This program is free software; 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 AUDACIOUS_VFS_BUFFER_H
-#define AUDACIOUS_VFS_BUFFER_H
-
-#include <glib.h>
-#include "vfs.h"
-
-G_BEGIN_DECLS
-
-/** Private data for the VFS memorybuffer class. */
-typedef struct {
-	guchar *data; /**< The data inside the VFSBuffer. */
-	guchar *iter; /**< The current position of the VFS buffer iterator. */
-	guchar *end; /**< The end of the memory segment that the VFS buffer uses. */
-	gsize size; /**< The size of the memory segment. */
-} VFSBuffer;
-
-/**
- * Creates a VFS buffer for reading/writing to a memory segment.
- *
- * @param data Pointer to data to use.
- * @param size Size of data to use.
- * @return A VFSFile handle for the memory segment's stream representation.
- */
-VFSFile *vfs_buffer_new(gpointer data, gsize size);
-
-/**
- * Creates a VFS buffer for reading/writing to a string.
- *
- * @param str String to use.
- * @return A VFSFile handle for the memory segment's stream representation.
- */
-VFSFile *vfs_buffer_new_from_string(gchar *str);
-
-G_END_DECLS
-
-#endif /* AUDACIOUS_VFS_BUFFER_H */

audacious-3.1.1.tar.bz2/src/libaudcore/vfs_buffered_file.c Deleted

@@ -1,288 +0,0 @@
-/*
- * Copyright (c) 2006-2007 William Pitcock
- *
- * This program is free software; 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 "vfs.h"
-#include "vfs_buffer.h"
-#include "vfs_buffered_file.h"
-
-VFSFile *
-buffered_file_vfs_fopen_impl(const gchar * path,
- const gchar * mode)
-{
- return NULL;
-}
-
-gint
-buffered_file_vfs_fclose_impl(VFSFile * file)
-{
- g_return_val_if_fail(file != NULL, -1);
-
- if (file->handle)
- {
- VFSBufferedFile *handle = (VFSBufferedFile *) file->handle;
-
- if (handle->fd != NULL)
- vfs_fclose(handle->fd);
-
- vfs_fclose(handle->buffer);
- g_free(handle->mem);
- g_free(handle);
- }
-
- return 0;
-}
-
-gint64 buffered_file_vfs_fread_impl (void * i_ptr, gint64 size, gint64 nmemb,
- VFSFile * file)
-{
- VFSBufferedFile *handle = (VFSBufferedFile *) file->handle;
-
- /* is this request within the buffered area, or should we switch to
- * an FD? --nenolod
- */
- if (handle->which == FALSE &&
-	(vfs_ftell(handle->buffer)) + (size * nmemb) >
-	((VFSBuffer *) handle->buffer->handle)->size)
- {
- if (vfs_fseek (handle->fd, vfs_ftell (handle->buffer), SEEK_SET))
- return 0;
- handle->which = TRUE;
- }
-
- return vfs_fread(i_ptr, size, nmemb, handle->which == TRUE ? handle->fd : handle->buffer);
-}
-
-gint64 buffered_file_vfs_fwrite_impl (const void * i_ptr, gint64 size, gint64
- nmemb, VFSFile * file)
-{
- VFSBufferedFile *handle = (VFSBufferedFile *) file->handle;
-
- return vfs_fwrite(i_ptr, size, nmemb, handle->fd);
-}
-
-gint
-buffered_file_vfs_getc_impl(VFSFile *stream)
-{
- VFSBufferedFile *handle = (VFSBufferedFile *) stream->handle;
-
- /* is this request within the buffered area, or should we switch to
- * an FD? --nenolod
- */
- if ((vfs_ftell(handle->buffer)) + 1 >
-	((VFSBuffer *) handle->buffer->handle)->size)
- {
- if (vfs_fseek (handle->fd, vfs_ftell (handle->buffer), SEEK_SET))
- return EOF;
- handle->which = TRUE;
- }
-
- return vfs_getc(handle->which == TRUE ? handle->fd : handle->buffer);
-}
-
-gint
-buffered_file_vfs_ungetc_impl(gint c, VFSFile *stream)
-{
- return -1;
-}
-
-gint
-buffered_file_vfs_fseek_impl(VFSFile * file,
- gint64 offset,
- gint whence)
-{
- VFSBufferedFile *handle = (VFSBufferedFile *) file->handle;
-
- if (vfs_fseek (handle->buffer, offset, whence))
- return -1;
-
- switch(whence)
- {
- case SEEK_END:
- handle->which = TRUE;
- return vfs_fseek (handle->fd, offset, whence);
- case SEEK_CUR:
- if (vfs_ftell(handle->buffer) + offset >= ((VFSBuffer *) handle->buffer->handle)->size)
- {
- handle->which = TRUE;
- return vfs_fseek (handle->fd, offset, whence);
- }
- else
- {
- gint64 noff;
-
- handle->which = FALSE;
- noff = ((VFSBuffer *) handle->buffer->handle)->size - (vfs_ftell(handle->buffer) + offset);
- return vfs_fseek (handle->buffer, noff, whence);
- }
- break;
- case SEEK_SET:
- default:
- if (offset > ((VFSBuffer *) handle->buffer->handle)->size)
- {
- handle->which = TRUE;
- return vfs_fseek (handle->fd, offset, whence);
- }
- else
- {
- handle->which = FALSE;
- return vfs_fseek (handle->buffer, offset, whence);
- }
- break;
- }
- return 0;
-}
-
-void
-buffered_file_vfs_rewind_impl(VFSFile * file)
-{
- VFSBufferedFile *handle = (VFSBufferedFile *) file->handle;
-
- vfs_rewind(handle->buffer);
- vfs_rewind(handle->fd);
- handle->which = FALSE;
-}
-
-gint64
-buffered_file_vfs_ftell_impl(VFSFile * file)
-{
- VFSBufferedFile *handle = (VFSBufferedFile *) file->handle;
-
- return vfs_ftell(handle->which == TRUE ? handle->fd : handle->buffer);
-}
-
-gboolean
-buffered_file_vfs_feof_impl(VFSFile * file)
-{
- VFSBufferedFile *handle = (VFSBufferedFile *) file->handle;
-
- return vfs_feof(handle->which == TRUE ? handle->fd : handle->buffer);
-}
-
-gint
-buffered_file_vfs_truncate_impl (VFSFile * file, gint64 size)
-{
- return 0;
-}
-
-gint64
-buffered_file_vfs_fsize_impl(VFSFile * file)
-{
- VFSBufferedFile *handle = (VFSBufferedFile *) file->handle;
-
- return vfs_fsize(handle->fd);
-}
-
-gchar *
-buffered_file_vfs_metadata_impl(VFSFile * file, const gchar * field)
-{
- VFSBufferedFile *handle = (VFSBufferedFile *) file->handle;
-
- return vfs_get_metadata(handle->fd, field);
-}
-
-VFSConstructor buffered_file_const = {
-	buffered_file_vfs_fopen_impl,
-	buffered_file_vfs_fclose_impl,
-	buffered_file_vfs_fread_impl,
-	buffered_file_vfs_fwrite_impl,
-	buffered_file_vfs_getc_impl,
-	buffered_file_vfs_ungetc_impl,
-	buffered_file_vfs_fseek_impl,
-	buffered_file_vfs_rewind_impl,
-	buffered_file_vfs_ftell_impl,
-	buffered_file_vfs_feof_impl,
-	buffered_file_vfs_truncate_impl,
-	buffered_file_vfs_fsize_impl,
-	buffered_file_vfs_metadata_impl
-};
-
-/**
- * Creates a VFSBufferedFile. VFSBufferedFile is read-only.
- *
- * @param uri URI locator pointing to the file to open.
- * @return A VFSFile handle for the VFSBufferedFile.
- **/
-VFSFile *
-vfs_buffered_file_new_from_uri(const gchar *uri)
-{
- VFSFile *handle;
- VFSBufferedFile *fd;
- gsize sz;
-
- g_return_val_if_fail(uri != NULL, NULL);
-
- handle = g_new0(VFSFile, 1);
- fd = g_new0(VFSBufferedFile, 1);
- fd->mem = g_malloc0(128000);
- fd->fd = vfs_fopen(uri, "rb");
-
- if (fd->fd == NULL)
- {
-	g_free(fd->mem);
-	g_free(fd);
-	g_free(handle);
-
-	return NULL;
- }
-
- sz = vfs_fread(fd->mem, 1, 128000, fd->fd);
- vfs_rewind(fd->fd);
-
- if (!sz)
- {
-	vfs_fclose(fd->fd);
-	g_free(fd->mem);
-	g_free(fd);
-	g_free(handle);
-
-	return NULL;
- }
-
- fd->buffer = vfs_buffer_new(fd->mem, sz);
-
- handle->handle = fd;
- handle->base = &buffered_file_const;
- handle->uri = g_strdup(uri);
- handle->ref = 1;
- handle->sig = VFS_SIG;
-
- return handle;
-}
-
-/**
- * @bug Is this function used for anything? -- ccr
- * @deprecated This function probably should not be used.
- */
-VFSFile *
-vfs_buffered_file_release_live_fd(VFSFile *fd)
-{
- VFSBufferedFile *file = (VFSBufferedFile *) fd;
- VFSFile *out;
-
- g_return_val_if_fail(file != NULL, NULL);
-
- out = file->fd;
- file->fd = NULL;
-
- vfs_fclose(fd);
-
- return out;
-}

audacious-3.1.1.tar.bz2/src/libaudcore/vfs_buffered_file.h Deleted

@@ -1,46 +0,0 @@
-/* Audacious
- * Copyright (c) 2006-2007 William Pitcock
- *
- * This program is free software; 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.
- */
-/**
- * @file vfs_buffered_file.h
- * Functions and structures for buffered file access over VFS.
- */
-
-#ifndef AUDACIOUS_VFS_BUFFERED_FILE_H
-#define AUDACIOUS_VFS_BUFFERED_FILE_H
-
-#include <glib.h>
-#include "vfs.h"
-#include "vfs_buffer.h"
-
-G_BEGIN_DECLS
-
-/** Private data for the VFS memorybuffer class. */
-typedef struct {
-	VFSFile *fd; /**< VFS handle for the active FD. */
-	VFSFile *buffer; /**< First 32kb read from the FD. */
-	gchar *mem; /**< The memory for the buffer. */
-	gboolean which; /**< Whether to use the live FD or the buffer. */
-} VFSBufferedFile;
-
-VFSFile *vfs_buffered_file_new_from_uri(const gchar *uri);
-VFSFile *vfs_buffered_file_release_live_fd(VFSFile *fd);
-
-G_END_DECLS
-
-#endif /* AUDACIOUS_VFS_BUFFERED_FILE_H */

audacious-3.1.1.tar.bz2/src/libaudgui/icons-stock.h Deleted

@@ -1,32 +0,0 @@
-/* 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 AUDACIOUS_ICONS_STOCK_H
-#define AUDACIOUS_ICONS_STOCK_H
-
-void audgui_register_stock_icons(void);
-
-/* this header contains macro defines for Audacious stock icons */
-
-#define AUD_STOCK_PLAYLIST			"aud-playlist"
-#define AUD_STOCK_PLUGIN			"aud-plugin"
-#define AUD_STOCK_QUEUETOGGLE		"aud-queuetoggle"
-#define AUD_STOCK_RANDOMIZEPL		"aud-randomizepl"
-
-#endif /* AUDACIOUS_ICONS_STOCK_H */

audacious-3.1.1.tar.bz2/src/libaudgui/ui_about.c Deleted

@@ -1,102 +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.
- */
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <glib.h>
-#include <gtk/gtk.h>
-
-#include <gdk/gdk.h>
-#include <gdk/gdkkeysyms.h>
-
-#include <audacious/gtk-compat.h>
-#include <audacious/i18n.h>
-#include <audacious/misc.h>
-
-#include "libaudgui-gtk.h"
-
-/* ui_credits.c */
-GtkWidget * audgui_get_credits_widget (void);
-
-static GtkWidget *about_window = NULL;
-
-void
-audgui_show_about_window(void)
-{
- GtkWidget *brief_label;
- gchar *text;
- static const gchar *audacious_brief;
-
- if (about_window != NULL)
- {
- gtk_window_present(GTK_WINDOW(about_window));
- return;
- }
-
- aud_get_audacious_credits(&audacious_brief, NULL, NULL);
-
- about_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_container_set_border_width ((GtkContainer *) about_window, 3);
-
- g_signal_connect(about_window, "destroy",
- G_CALLBACK(gtk_widget_destroyed), &about_window);
-
- gtk_window_set_title(GTK_WINDOW(about_window), _("About Audacious"));
- gtk_window_set_resizable(GTK_WINDOW(about_window), FALSE);
- audgui_destroy_on_escape (about_window);
-
- GtkWidget * vbox = gtk_vbox_new (FALSE, 6);
- gtk_container_add ((GtkContainer *) about_window, vbox);
-
- gchar * name = g_strdup_printf ("%s/images/about-logo.png", aud_get_path (AUD_PATH_DATA_DIR));
- GtkWidget * image = gtk_image_new_from_file (name);
- gtk_box_pack_start ((GtkBox *) vbox, image, FALSE, FALSE, 0);
- g_free (name);
-
- brief_label = gtk_label_new(NULL);
- text = g_strdup_printf(_(audacious_brief), VERSION);
-
- gtk_label_set_markup(GTK_LABEL(brief_label), text);
- gtk_label_set_justify(GTK_LABEL(brief_label), GTK_JUSTIFY_CENTER);
- g_free(text);
-
- gtk_box_pack_start ((GtkBox *) vbox, brief_label, FALSE, FALSE, 0);
-
- GtkWidget * exp = gtk_expander_new (_("Credits"));
- gtk_container_add ((GtkContainer *) exp, audgui_get_credits_widget ());
- gtk_box_pack_start ((GtkBox *) vbox, exp, TRUE, TRUE, 0);
-
- gtk_widget_show_all(about_window);
-}
-
-void
-audgui_hide_about_window(void)
-{
- g_return_if_fail(about_window);
- gtk_widget_hide(GTK_WIDGET(about_window));
-}

audacious-3.1.1.tar.bz2/src/libaudgui/ui_credits.c Deleted

@@ -1,129 +0,0 @@
-/* Audacious - Cross-platform multimedia player
- * Copyright (C) 2005-2007 Audacious 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.
- */
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <glib.h>
-#include <gtk/gtk.h>
-
-#include <audacious/gtk-compat.h>
-#include <audacious/i18n.h>
-#include <audacious/misc.h>
-
-enum {
- COL_LEFT,
- COL_RIGHT,
- N_COLS
-};
-
-static GtkWidget *
-generate_credit_list(const gchar * text[], gboolean sec_space)
-{
- GtkWidget *scrollwin;
- GtkWidget *treeview;
- GtkListStore *list_store;
- GtkTreeIter iter;
- GtkTreeViewColumn *column;
- GtkCellRenderer *renderer;
- const gchar *const *item;
-
- list_store = gtk_list_store_new(N_COLS, G_TYPE_STRING, G_TYPE_STRING);
-
- item = text;
-
- while (*item) {
- gtk_list_store_append(list_store, &iter);
- gtk_list_store_set(list_store, &iter,
- COL_LEFT, _(item[0]), COL_RIGHT, _(item[1]), -1);
- item += 2;
-
- while (*item) {
- gtk_list_store_append(list_store, &iter);
- gtk_list_store_set(list_store, &iter,
- COL_LEFT, "", COL_RIGHT, _(*item++), -1);
- }
-
- ++item;
-
- if (*item && sec_space) {
- gtk_list_store_append(list_store, &iter);
- gtk_list_store_set(list_store, &iter,
- COL_LEFT, "", COL_RIGHT, "", -1);
- }
- }
-
- treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(list_store));
- gtk_tree_view_set_headers_clickable(GTK_TREE_VIEW(treeview), FALSE);
- gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(treeview), FALSE);
- gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)),
- GTK_SELECTION_NONE);
-
- renderer = gtk_cell_renderer_text_new();
- g_object_set(renderer, "xalign", 1.0, NULL);
- column = gtk_tree_view_column_new_with_attributes("Left", renderer,
- "text", COL_LEFT, NULL);
- gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), column);
-
- renderer = gtk_cell_renderer_text_new();
- g_object_set(renderer, "xalign", 0.0, NULL);
- column = gtk_tree_view_column_new_with_attributes("Right", renderer,
- "text", COL_RIGHT,
- NULL);
- gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), column);
-
- scrollwin = gtk_scrolled_window_new(NULL, NULL);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollwin),
- GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
- gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrollwin), GTK_SHADOW_IN);
- gtk_container_add(GTK_CONTAINER(scrollwin), treeview);
- gtk_container_set_border_width ((GtkContainer *) scrollwin, 4);
-
- return scrollwin;
-}
-
-GtkWidget * audgui_get_credits_widget (void)
-{
- GtkWidget *about_notebook;
- GtkWidget *list;
- const gchar **credit_text;
- const gchar **translators;
-
- aud_get_audacious_credits (NULL, &credit_text, &translators);
-
- about_notebook = gtk_notebook_new();
- gtk_widget_set_size_request (about_notebook, -1, 250);
-
- list = generate_credit_list(credit_text, TRUE);
- gtk_notebook_append_page(GTK_NOTEBOOK(about_notebook), list,
- gtk_label_new(_("Credits")));
-
- list = generate_credit_list(translators, FALSE);
- gtk_notebook_append_page(GTK_NOTEBOOK(about_notebook), list,
- gtk_label_new(_("Translators")));
-
- return about_notebook;
-}

audacious-3.1.1.tar.bz2/src/libaudgui/ui_gtk.c Deleted

@@ -1,29 +0,0 @@
-/* Audacious - Cross-platform multimedia player
- * Copyright (C) 2005-2009 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 <gtk/gtk.h>
-
-#include <audacious/misc.h>
-
-void audgui_set_default_icon (void)
-{
-#ifndef _WIN32
- gtk_window_set_default_icon_name ("audacious");
-#endif
-}

audacious-3.1.1.tar.bz2/src/libaudgui/ui_gtk.h Deleted

@@ -1,25 +0,0 @@
-/* Audacious - Cross-platform multimedia player
- * Copyright (C) 2005-2009 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 AUDACIOUS_UI_GTK_H
-#define AUDACIOUS_UI_GTK_H
-
-void audgui_set_default_icon(void);
-
-#endif /* AUDACIOUS_UI_GTK_H */

audacious-3.1.1.tar.bz2/src/libaudgui/ui_jumptotrack.h Deleted

@@ -1,33 +0,0 @@
-/* Audacious - Cross-platform multimedia player
- * Copyright (C) 2005-2006 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 AUDACIOUS_UI_JUMPTOTRACK_H
-#define AUDACIOUS_UI_JUMPTOTRACK_H
-
-void ui_jump_to_track_update(GtkWidget * widget, gpointer user_data);
-void audgui_jump_to_track(void);
-void audgui_jump_to_track_hide(void);
-
-#endif /* AUDACIOUS_UI_JUMPTOTRACK_H */

audacious-3.1.1.tar.bz2/src/libaudtag/aac Deleted

audacious-3.1.1.tar.bz2/src/libaudtag/aac/aac.c Deleted

@@ -1,479 +0,0 @@
-/*
- * Copyright 2009 Paula Stanciu
- *
- * 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 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 <glib/gstdio.h>
-#include <libaudcore/tuple.h>
-#include <libaudcore/vfs.h>
-#include "../tag_module.h"
-#include "aac.h"
-#include "../util.h"
-
-static const char *ID3v1GenreList[] = {
- "Blues", "Classic Rock", "Country", "Dance", "Disco", "Funk",
- "Grunge", "Hip-Hop", "Jazz", "Metal", "New Age", "Oldies",
- "Other", "Pop", "R&B", "Rap", "Reggae", "Rock",
- "Techno", "Industrial", "Alternative", "Ska", "Death Metal", "Pranks",
- "Soundtrack", "Euro-Techno", "Ambient", "Trip-Hop", "Vocal", "Jazz+Funk",
- "Fusion", "Trance", "Classical", "Instrumental", "Acid", "House",
- "Game", "Sound Clip", "Gospel", "Noise", "AlternRock", "Bass",
- "Soul", "Punk", "Space", "Meditative", "Instrumental Pop", "Instrumental Rock",
- "Ethnic", "Gothic", "Darkwave", "Techno-Industrial", "Electronic", "Pop-Folk",
- "Eurodance", "Dream", "Southern Rock", "Comedy", "Cult", "Gangsta",
- "Top 40", "Christian Rap", "Pop/Funk", "Jungle", "Native American", "Cabaret",
- "New Wave", "Psychedelic", "Rave", "Showtunes", "Trailer", "Lo-Fi",
- "Tribal", "Acid Punk", "Acid Jazz", "Polka", "Retro", "Musical",
- "Rock & Roll", "Hard Rock", "Folk", "Folk/Rock", "National Folk", "Swing",
- "Fast-Fusion", "Bebob", "Latin", "Revival", "Celtic", "Bluegrass", "Avantgarde",
- "Gothic Rock", "Progressive Rock", "Psychedelic Rock", "Symphonic Rock", "Slow Rock", "Big Band",
- "Chorus", "Easy Listening", "Acoustic", "Humour", "Speech", "Chanson",
- "Opera", "Chamber Music", "Sonata", "Symphony", "Booty Bass", "Primus",
- "Porn Groove", "Satire", "Slow Jam", "Club", "Tango", "Samba",
- "Folklore", "Ballad", "Power Ballad", "Rhythmic Soul", "Freestyle", "Duet",
- "Punk Rock", "Drum Solo", "A capella", "Euro-House", "Dance Hall",
- "Goa", "Drum & Bass", "Club House", "Hardcore", "Terror",
- "Indie", "BritPop", "NegerPunk", "Polsk Punk", "Beat",
- "Christian Gangsta", "Heavy Metal", "Black Metal", "Crossover", "Contemporary C",
- "Christian Rock", "Merengue", "Salsa", "Thrash Metal", "Anime", "JPop",
- "SynthPop",
-};
-
-gchar *atom_types[] = { "\251alb", "\251nam", "cprt", "\251art", "\251ART", "trkn", "\251day", "gnre", "desc" };
-
-Atom *readAtom(VFSFile * fd)
-{
- guint32 size = read_BEuint32(fd);
- if (size > vfs_fsize(fd))
- return NULL;
-
- Atom *atom = g_new0(Atom, 1);
- atom->size = size;
- atom->name = read_char_data(fd, 4);
- atom->body = read_char_data(fd, atom->size - 8);
- atom->type = 0;
- return atom;
-}
-
-void writeAtom(VFSFile * fd, Atom * atom)
-{
- write_BEuint32(fd, atom->size);
- vfs_fwrite(atom->name, 4, 1, fd);
- vfs_fwrite(atom->body, atom->size - 8, 1, fd);
-}
-
-void printAtom(Atom * atom)
-{
- TAGDBG("size = %x\n", atom->size);
- TAGDBG("name = %s\n", atom->name);
-}
-
-StrDataAtom *readStrDataAtom(VFSFile * fd)
-{
- StrDataAtom *atom = g_new0(StrDataAtom, 1);
- atom->atomsize = read_BEuint32(fd);
- atom->name = read_char_data(fd, 4);
- atom->datasize = read_BEuint32(fd);
- atom->dataname = read_char_data(fd, 4);
- atom->vflag = read_BEuint32(fd);
- atom->nullData = read_BEuint32(fd);
- atom->data = read_char_data(fd, atom->datasize - 16);
- atom->type = 1;
- return atom;
-}
-
-void writeStrDataAtom(VFSFile * fd, StrDataAtom * atom)
-{
- write_BEuint32(fd, atom->atomsize);
- vfs_fwrite(atom->name, 4, 1, fd);
- write_BEuint32(fd, atom->datasize);
- vfs_fwrite(atom->dataname, 4, 1, fd);
- write_BEuint32(fd, atom->vflag);
- write_BEuint32(fd, atom->nullData);
- vfs_fwrite(atom->data, atom->datasize - 16, 1, fd);
-}
-
-Atom *findAtom(VFSFile * fd, gchar * name)
-{
- Atom *atom = readAtom(fd);
- while (strcmp(atom->name, name) && !vfs_feof(fd))
- {
- g_free(atom);
- atom = readAtom(fd);
- }
- if (vfs_feof(fd))
- {
- g_free(atom);
- TAGDBG("The atom %s could not be found\n", name);
- return NULL;
- }
- return atom;
-}
-
-Atom *getilstAtom(VFSFile * fd)
-{
- Atom *moov = findAtom(fd, MOOV);
-
- // search atom childs
- vfs_fseek(fd, -(moov->size - 7), SEEK_CUR);
- Atom *udta = findAtom(fd, UDTA);
-
-
- vfs_fseek(fd, -(udta->size - 7), SEEK_CUR);
- Atom *meta = findAtom(fd, META);
-
- vfs_fseek(fd, -(meta->size - 11), SEEK_CUR);
- Atom *ilst = findAtom(fd, ILST);
-
- TAGDBG("zzz = %d\n", vfs_ftell(fd));
- ilstFileOffset = vfs_ftell(fd) - ilst->size;
- vfs_fseek(fd, -(ilst->size - 7), SEEK_CUR);
-
- return ilst;
-
-}
-
-int getAtomID(gchar * name)
-{
- g_return_val_if_fail(name != NULL, -1);
- int i = 0;
- for (i = 0; i < MP4_ITEMS_NO; i++)
- {
- if (!strcmp(name, atom_types[i]))
- return i;
- }
- return -1;
-}
-
-StrDataAtom *makeAtomWithData(const gchar * data, StrDataAtom * atom, int field)
-{
- guint32 charsize = strlen(data);
- atom->atomsize = charsize + 24;
- atom->name = atom_types[field];
- atom->datasize = charsize + 16;
- atom->dataname = "data";
- atom->vflag = 0x0;
- atom->nullData = 0x0;
- atom->data = (gchar *) data;
- atom->type = 1;
- return atom;
-
-}
-
-void writeAtomListToFile(VFSFile * from, VFSFile * to, int offset, mowgli_list_t * list)
-{
- //read free atom if we have any :D
- guint32 oset = ilstFileOffset + ilstAtom->size;
- vfs_fseek(from, oset, SEEK_SET);
- mowgli_list_t *atoms_before_free = mowgli_list_create();
- Atom *atom = readAtom(from);
- while (strcmp(atom->name, "free") && !vfs_feof(from))
- {
- mowgli_node_add(atom, mowgli_node_create(), atoms_before_free);
- g_free(atom);
- atom = readAtom(from);
- }
- g_free(atom);
- if (vfs_feof(from))
- {
- TAGDBG("No free atoms\n");
- g_free(atom);
- atom = NULL;
- }
-
- //write ilst atom header
- gchar il[4] = ILST;
- vfs_fwrite(&newilstSize, 4, 1, to);
- vfs_fwrite(il, 4, 1, to);
- //write ilst
-
- mowgli_node_t *n, *tn;
-
- MOWGLI_LIST_FOREACH_SAFE(n, tn, list->head)
- {
- if (((Atom *) (n->data))->type == 0)
- {
- writeAtom(to, (Atom *) (n->data));
- }
- else
- {
- writeStrDataAtom(to, (StrDataAtom *) (n->data));
- }
- }
-
- //write all atoms before free
- if (atoms_before_free->count != 0)
- {
-
- MOWGLI_LIST_FOREACH_SAFE(n, tn, list->head)
- {
- writeAtom(to, (Atom *) (n->data));
- }
- }
- if (atom != NULL)
- {
- atom->size -= newilstSize - ilstAtom->size;
- }
- writeAtom(to, atom);
-}
-
-gboolean aac_can_handle_file(VFSFile * f)
-{
- Atom *first_atom = readAtom(f);
- if (first_atom == NULL)
- return FALSE;
- if (!strcmp(first_atom->name, FTYP))
- return TRUE;
- return FALSE;
-}
-
-gboolean aac_read_tag (Tuple * tuple, VFSFile * f)
-{
- if (ilstAtom)
- g_free(ilstAtom);
- ilstAtom = getilstAtom(f);
- int size_read = 0;
-
- if (dataAtoms != NULL)
- {
- mowgli_node_t *n, *tn;
-
- MOWGLI_LIST_FOREACH_SAFE(n, tn, dataAtoms->head)
- {
- mowgli_node_delete(n, dataAtoms);
- }
- }
- dataAtoms = mowgli_list_create();
-
- while (size_read < ilstAtom->size)
- {
- Atom *at = readAtom(f);
- mowgli_node_add(at, mowgli_node_create(), dataAtoms);
- int atomtype = getAtomID(at->name);
- if (atomtype == -1)
- {
- size_read += at->size;
- continue;
- }
- g_free(at);
- vfs_fseek(f, -(at->size), SEEK_CUR);
- StrDataAtom *a = readStrDataAtom(f);
- size_read += a->atomsize;
-
- switch (atomtype)
- {
- case MP4_ALBUM:
- {
- tuple_associate_string(tuple, FIELD_ALBUM, NULL, a->data);
- }
- break;
- case MP4_TITLE:
- {
- tuple_associate_string(tuple, FIELD_TITLE, NULL, a->data);
- }
- break;
- case MP4_COPYRIGHT:
- {
- tuple_associate_string(tuple, FIELD_COPYRIGHT, NULL, a->data);
- }
- break;
- case MP4_ARTIST:
- case MP4_ARTIST2:
- {
- tuple_associate_string(tuple, FIELD_ARTIST, NULL, a->data);
- }
- break;
- case MP4_TRACKNR:
- {
- //tuple_associate_string(tuple,FIELD_ALBUM,NULL,a->data);
- }
- break;
- case MP4_YEAR:
- {
- tuple_associate_int(tuple, FIELD_YEAR, NULL, atoi(a->data));
- }
- break;
- case MP4_GENRE:
- {
- guint8 *val = (guint8 *) (a->data + (a->datasize - 17));
- const gchar *genre = ID3v1GenreList[*val - 1];
- tuple_associate_string(tuple, FIELD_GENRE, NULL, genre);
- }
- break;
- case MP4_COMMENT:
- {
- tuple_associate_string(tuple, FIELD_COMMENT, NULL, a->data);
- }
- break;
- }
- }
-
- return TRUE;
-}
-
-gboolean aac_write_tag (Tuple * tuple, VFSFile * f)
-{
-#ifdef BROKEN
- return FALSE;
-#endif
- newilstSize = 0;
- mowgli_node_t *n, *tn;
- mowgli_list_t *newdataAtoms;
- newdataAtoms = mowgli_list_create();
-
- MOWGLI_LIST_FOREACH_SAFE(n, tn, dataAtoms->head)
- {
- int atomtype = getAtomID(((StrDataAtom *) (n->data))->name);
- switch (atomtype)
- {
- case MP4_ALBUM:
- {
- const gchar *strVal = tuple_get_string(tuple, FIELD_ALBUM, NULL);
- if (strVal != NULL)
- {
- StrDataAtom *atom = g_new0(StrDataAtom, 1);
- atom = makeAtomWithData(strVal, atom, MP4_ALBUM);
- mowgli_node_add(atom, mowgli_node_create(), newdataAtoms);
- newilstSize += atom->atomsize;
- }
- else
- {
- mowgli_node_add(n->data, mowgli_node_create(), newdataAtoms);
- newilstSize += ((Atom *) (n->data))->size;
- }
- }
- break;
- case MP4_TITLE:
- {
- const gchar *strVal = tuple_get_string(tuple, FIELD_TITLE, NULL);
- if (strVal != NULL)
- {
- StrDataAtom *atom = g_new0(StrDataAtom, 1);
- atom = makeAtomWithData(strVal, atom, MP4_TITLE);
- mowgli_node_add(atom, mowgli_node_create(), newdataAtoms);
- newilstSize += atom->atomsize;
- }
- else
- {
- mowgli_node_add(n->data, mowgli_node_create(), newdataAtoms);
- newilstSize += ((Atom *) (n->data))->size;
- }
- }
- break;
- case MP4_COPYRIGHT:
- {
- const gchar *strVal = tuple_get_string(tuple, FIELD_COPYRIGHT, NULL);
- if (strVal != NULL)
- {
- StrDataAtom *atom = g_new0(StrDataAtom, 1);
- atom = makeAtomWithData(strVal, atom, MP4_COPYRIGHT);
- mowgli_node_add(atom, mowgli_node_create(), newdataAtoms);
- newilstSize += atom->atomsize;
- }
- else
- {
- mowgli_node_add(n->data, mowgli_node_create(), newdataAtoms);
- newilstSize += ((Atom *) (n->data))->size;
- }
- }
- break;
- case MP4_ARTIST:
- case MP4_ARTIST2:
- {
- const gchar *strVal = tuple_get_string(tuple, FIELD_ARTIST, NULL);
- if (strVal != NULL)
- {
- StrDataAtom *atom = g_new0(StrDataAtom, 1);
- atom = makeAtomWithData(strVal, atom, MP4_ARTIST2);
- mowgli_node_add(atom, mowgli_node_create(), newdataAtoms);
- newilstSize += atom->atomsize;
- }
- else
- {
- mowgli_node_add(n->data, mowgli_node_create(), newdataAtoms);
- newilstSize += ((Atom *) (n->data))->size;
- }
- }
- break;
- case MP4_TRACKNR:
- {
- //tuple_associate_string(tuple,FIELD_ALBUM,NULL,a->data);
- }
- break;
- case MP4_YEAR:
- {
- int iyear = tuple_get_int(tuple, FIELD_YEAR, NULL);
- gchar *strVal = g_strdup_printf("%d", iyear);
- if (strVal != NULL)
- {
- StrDataAtom *atom = g_new0(StrDataAtom, 1);
- atom = makeAtomWithData(strVal, atom, MP4_YEAR);
- mowgli_node_add(atom, mowgli_node_create(), newdataAtoms);
- newilstSize += atom->atomsize;
- }
- else
- {
- mowgli_node_add(n->data, mowgli_node_create(), newdataAtoms);
- newilstSize += ((Atom *) (n->data))->size;
- }
- }
- break;
- /*
- case MP4_GENRE:
- {
-
- guint8 *val = (guint8*)(a->data + (a->datasize-17));
- const gchar* genre = ID3v1GenreList[*val-1];
- tuple_associate_string(tuple,FIELD_GENRE,NULL,genre);
-
- }break;
- */
- case MP4_COMMENT:
- {
- const gchar *strVal = tuple_get_string(tuple, FIELD_COMMENT, NULL);
- if (strVal != NULL)
- {
- StrDataAtom *atom = g_new0(StrDataAtom, 1);
- atom = makeAtomWithData(strVal, atom, MP4_COMMENT);
- mowgli_node_add(atom, mowgli_node_create(), newdataAtoms);
- newilstSize += atom->atomsize;
- }
- else
- {
- mowgli_node_add(n->data, mowgli_node_create(), newdataAtoms);
- newilstSize += ((Atom *) (n->data))->size;
- }
- }
- break;
- default:
- {
- mowgli_node_add(n->data, mowgli_node_create(), newdataAtoms);
- newilstSize += ((Atom *) (n->data))->size;
- }
- break;
- }
- }
-
- VFSFile *tmp;
- const gchar *tmpdir = g_get_tmp_dir();
- gchar *tmp_path = g_strdup_printf("file://%s/%s", tmpdir, "tmp.mp4");
- tmp = vfs_fopen(tmp_path, "w");
- copyAudioData(f, tmp, 0, ilstFileOffset);
- writeAtomListToFile(f, tmp, ilstFileOffset, newdataAtoms);
- return TRUE;
-}

audacious-3.1.1.tar.bz2/src/libaudtag/aac/aac.h Deleted

@@ -1,86 +0,0 @@
-/*
- * Copyright 2009 Paula Stanciu
- *
- * 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 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 AAC_H
-#define	AAC_H
-#include <libaudcore/tuple.h>
-#include <libaudcore/vfs.h>
-#include "../tag_module.h"
-
-#define FTYP "ftyp"
-#define MOOV "moov"
-#define ILST "ilst"
-#define UDTA "udta"
-#define META "meta"
-#define ILST "ilst"
-#define FREE "free"
-
-enum {
- MP4_ALBUM = 0,
- MP4_TITLE,
- MP4_COPYRIGHT,
- MP4_ARTIST,
- MP4_ARTIST2,
- MP4_TRACKNR,
- MP4_YEAR,
- MP4_GENRE,
- MP4_COMMENT,
- MP4_ITEMS_NO
-};
-
-typedef struct mp4atom
-{
- guint32 size;
- gchar* name; //4 bytes
- gchar* body;
- int type;
-}Atom;
-
-
-typedef struct strdataatom
-{
- guint32 atomsize;
- gchar* name;
- guint32 datasize;
- gchar* dataname;
- guint32 vflag;
- guint32 nullData;
- gchar* data;
- int type;
-}StrDataAtom;
-
-Atom *ilstAtom;
-guint64 ilstFileOffset;
-guint32 newilstSize ;
-mowgli_list_t *dataAtoms;
-mowgli_dictionary_t *ilstAtoms;
-
-/* TAG plugin API */
-gboolean aac_can_handle_file(VFSFile *f);
-gboolean aac_read_tag (Tuple * tuple, VFSFile * handle);
-gboolean aac_write_tag (Tuple * tuple, VFSFile * handle);
-
-static const tag_module_t aac = {
- .name = "AAC",
- .can_handle_file = aac_can_handle_file,
- .read_tag = aac_read_tag,
- .write_tag = aac_write_tag,
-};
-#endif

audacious-3.1.1.tar.bz2/src/libaudtag/wma Deleted

audacious-3.1.1.tar.bz2/src/libaudtag/wma/guid.c Deleted

@@ -1,128 +0,0 @@
-/*
- * Copyright 2009 Paula Stanciu
- *
- * 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 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.
- */
-
-/* this stuff may be moved to ../util.h if needed by other formats */
-
-#include <inttypes.h>
-
-#include "libaudcore/vfs.h"
-#include "../util.h"
-#include "guid.h"
-#include "wma_fmt.h"
-
-GUID_t *guid_read_from_file(VFSFile * f)
-{
- GUID_t temp;
-
- if ((f == NULL) || (vfs_fread(&temp, sizeof(GUID_t), 1, f) != 1))
- return NULL;
-
- temp.le32 = GUINT32_FROM_LE(temp.le32);
- temp.le16_1 = GUINT16_FROM_LE(temp.le16_1);
- temp.le16_2 = GUINT16_FROM_LE(temp.le16_2);
- temp.be64 = GUINT64_FROM_BE(temp.be64);
-
- return g_memdup(&temp, sizeof(GUID_t));
-}
-
-gboolean guid_write_to_file(VFSFile * f, int guid_type)
-{
- g_return_val_if_fail(f != NULL, FALSE);
-
- GUID_t *g = guid_convert_from_string(wma_guid_map(guid_type));
-
- gboolean ret = write_LEuint32(f, g->le32) && write_LEuint16(f, g->le16_1) && write_LEuint16(f, g->le16_1) && write_LEuint64(f, g->be64);
- g_free(g);
- return ret;
-}
-
-GUID_t *guid_convert_from_string(const gchar * string)
-{
- GUID_t temp;
-
- if (sscanf(string, "%" SCNx32 "-%" SCNx16 "-%" SCNx16 "-%" SCNx64, &temp.le32, &temp.le16_1, &temp.le16_2, &temp.be64) != 4)
- return NULL;
- return g_memdup(&temp, sizeof(GUID_t));
-}
-
-gchar *guid_convert_to_string(const GUID_t * g)
-{
-
- return g_strdup_printf("%8x-%hx-%hx-%" PRIx64 "\n", GUINT32_TO_LE(g->le32), GUINT16_TO_LE(g->le16_1), GUINT16_TO_LE(g->le16_2), GUINT64_TO_BE(g->be64));
-}
-
-gboolean guid_equal(GUID_t * g1, GUID_t * g2)
-{
- /*
- TAGDBG("GUID 1 = %8x-%hx-%hx-%"PRIx64"\n", g1->le32, g1->le16_1, g1->le16_2, g1->be64);
- TAGDBG("GUID 2 = %8x-%hx-%hx-%"PRIx64"\n", g2->le32, g2->le16_1, g2->le16_2, g2->be64);
- */
-
- g_return_val_if_fail((g1 != NULL) && (g2 != NULL), FALSE);
- if (!memcmp(g1, g2, 16))
- {
- // TAGDBG("equal\n");
-
- return TRUE;
- }
- /* TAGDBG("not equal\n"); */
- return FALSE;
-}
-
-int get_guid_type(GUID_t * g)
-{
- GUID_t *g1;
- int i;
- for (i = 0; i < ASF_OBJECT_LAST - 1; i++)
- {
- g1 = guid_convert_from_string(wma_guid_map(i));
- if (guid_equal(g, g1))
- {
-
- g_free(g1);
- return i;
- }
- }
- return -1;
-}
-
-const gchar *wma_guid_map(int i)
-{
- const gchar *_guid_map[ASF_OBJECT_LAST] = {
- ASF_HEADER_OBJECT_GUID,
- ASF_FILE_PROPERTIES_OBJECT_GUID,
- ASF_STREAM_PROPERTIES_OBJECT_GUID,
- ASF_HEADER_EXTENSION_OBJECT_GUID,
- ASF_CODEC_LIST_OBJECT_GUID,
- ASF_SCRIPT_COMMAND_OBJECT_GUID,
- ASF_MARKER_OBJECT_GUID,
- ASF_BITRATE_MUTUAL_EXCLUSION_OBJECT_GUID,
- ASF_ERROR_CORRECTION_OBJECT_GUID,
- ASF_CONTENT_DESCRIPTION_OBJECT_GUID,
- ASF_EXTENDED_CONTENT_DESCRIPTION_OBJECT_GUID,
- ASF_CONTENT_BRANDING_OBJECT_GUID,
- ASF_STREAM_BITRATE_PROPERTIES_OBJECT_GUID,
- ASF_CONTENT_ENCRYPTION_OBJECT_GUID,
- ASF_EXTENDED_CONTENT_ENCRYPTION_OBJECT_GUID,
- ASF_DIGITAL_SIGNATURE_OBJECT_GUID,
- ASF_PADDING_OBJECT_GUID
- };
- return _guid_map[i];
-}

audacious-3.1.1.tar.bz2/src/libaudtag/wma/guid.h Deleted

@@ -1,45 +0,0 @@
-/*
- * Copyright 2009 Paula Stanciu
- *
- * 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 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 _GUID_H
-#define _GUID_H
-
-#include <glib.h>
-#include <libaudcore/vfs.h>
-
-/* this stuff may be moved to ../util.h if needed by other formats */
-typedef struct _guid {
- guint32 le32;
- guint16 le16_1;
- guint16 le16_2;
- guint64 be64;
-}GUID_t;
-
-
-GUID_t *guid_read_from_file(VFSFile *);
-gboolean guid_write_to_file(VFSFile *, int);
-
-GUID_t *guid_convert_from_string(const gchar *);
-gchar *guid_convert_to_string(const GUID_t*);
-gboolean guid_equal(GUID_t *, GUID_t *);
-int get_guid_type(GUID_t *);
-const gchar *wma_guid_map(int);
-
-#endif /* _GUID_H */

audacious-3.1.1.tar.bz2/src/libaudtag/wma/module.h Deleted

audacious-3.1.1.tar.bz2/src/libaudtag/wma/wma.c Deleted

@@ -1,436 +0,0 @@
-/*
- * Copyright 2009 Paula Stanciu
- *
- * 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 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 <inttypes.h>
-#include <glib-2.0/glib/gstdio.h>
-#include <libaudcore/tuple.h>
-
-#include "guid.h"
-#include "wma.h"
-#include "wma_fmt.h"
-#include "module.h"
-#include "../util.h"
-
-/* static functions */
-static GenericHeader *read_generic_header(VFSFile * f, gboolean read_data)
-{
- TAGDBG("read top-level header object\n");
- g_return_val_if_fail((f != NULL), NULL);
- GenericHeader *header = g_new0(GenericHeader, 1);
- header->guid = guid_read_from_file(f);
- header->size = read_LEuint64(f);
- if (read_data)
- header->data = (gchar *) read_char_data(f, header->size);
- else
- header->data = NULL;
-
- gchar *s = guid_convert_to_string(header->guid);
- TAGDBG("read GUID: %s\n", s);
- g_free(s);
-
- return header;
-}
-
-static HeaderObj *read_top_header_object(VFSFile * f)
-{
- TAGDBG("read top-level header object\n");
- g_return_val_if_fail((f != NULL), NULL);
- HeaderObj *header = g_new0(HeaderObj, 1);
-
- //we have already read the GUID so we skip it (16 bytes)
- vfs_fseek(f, 16, SEEK_SET);
-
- header->size = read_LEuint64(f);
- header->objectsNr = read_LEuint32(f);
- TAGDBG("Number of child objects: %d\n", header->objectsNr);
-
- header->res1 = read_uint8(f);
- header->res2 = read_uint8(f);
-
- if ((header->size == -1) || (header->objectsNr == -1) || (header->res2 != 2))
- {
- g_free(header);
- return NULL;
- }
- return header;
-}
-
-static ContentDescrObj *read_content_descr_obj(VFSFile * f)
-{
- ContentDescrObj *cdo = g_new0(ContentDescrObj, 1);
- cdo->guid = guid_read_from_file(f);
- cdo->size = read_LEuint64(f);
- cdo->title_length = read_LEuint16(f);
- cdo->author_length = read_LEuint16(f);
- cdo->copyright_length = read_LEuint16(f);
- cdo->desc_length = read_LEuint16(f);
- cdo->rating_length = read_LEuint16(f);
- cdo->title = fread_utf16(f, cdo->title_length);
- cdo->author = fread_utf16(f, cdo->author_length);
- cdo->copyright = fread_utf16(f, cdo->copyright_length);
- cdo->description = fread_utf16(f, cdo->desc_length);
- cdo->rating = fread_utf16(f, cdo->rating_length);
- return cdo;
-}
-
-static ExtContentDescrObj *read_ext_content_descr_obj(VFSFile * f, Tuple * t, gboolean populate_tuple)
-{
- ExtContentDescrObj *ecdo = g_new0(ExtContentDescrObj, 1);
- ecdo->guid = guid_read_from_file(f);
- ecdo->size = read_LEuint64(f);
- ecdo->content_desc_count = read_LEuint16(f);
- ecdo->descriptors = read_descriptors(f, ecdo->content_desc_count, t, populate_tuple);
- return ecdo;
-}
-
-static guint find_descriptor_id(gchar * s)
-{
- TAGDBG("finding descriptor id for '%s'\n", s);
- g_return_val_if_fail(s != NULL, -1);
- gchar *l[DESC_LAST] = { DESC_ALBUM_STR, DESC_YEAR_STR, DESC_GENRE_STR, DESC_TRACK_STR };
- guint i;
- for (i = 0; i < DESC_LAST; i++)
- if (!strcmp(l[i], s))
- {
- TAGDBG("found descriptor %s\n", s);
- return i;
- }
- return -1;
-}
-
-static ContentDescriptor *read_descriptor(VFSFile * f, Tuple * t, gboolean populate_tuple)
-{
- ContentDescriptor *cd = g_new0(ContentDescriptor, 1);
- gchar *val = NULL, *name = NULL;
- guint32 intval = -1;
- gint dtype;
- TAGDBG("reading name_len\n");
- cd->name_len = read_LEuint16(f);
- TAGDBG("reading name\n");
- cd->name = fread_utf16(f, cd->name_len);
- TAGDBG("reading val_type\n");
- cd->val_type = read_LEuint16(f);
- TAGDBG("reading val_len\n");
- cd->val_len = read_LEuint16(f);
-
- name = utf8(cd->name);
- dtype = find_descriptor_id(name);
- g_free(name);
-
- TAGDBG("reading val\n");
-
- if (populate_tuple)
- {
- /*we only parse int's and UTF strings, everything else is handled as raw data */
- if (cd->val_type == 0)
- { /*UTF16 */
- cd->val = read_char_data(f, cd->val_len);
- val = utf8((gunichar2 *) cd->val);
- TAGDBG("val: '%s' dtype: %d\n", val, dtype);
- if (dtype == DESC_ALBUM)
- tuple_associate_string(t, FIELD_ALBUM, NULL, val);
- if (dtype == DESC_GENRE)
- tuple_associate_string(t, FIELD_GENRE, NULL, val);
- if (dtype == DESC_TRACK)
- tuple_associate_int(t, FIELD_TRACK_NUMBER, NULL, atoi(val));
- if (dtype == DESC_YEAR)
- tuple_associate_int(t, FIELD_YEAR, NULL, atoi(val));
- }
- else
- {
- if (cd->val_type == 3)
- {
- intval = read_LEuint32(f);
- TAGDBG("intval: %d, dtype: %d\n", intval, dtype);
- if (dtype == DESC_TRACK)
- tuple_associate_int(t, FIELD_TRACK_NUMBER, NULL, intval);
- }
- else
- cd->val = read_char_data(f, cd->val_len);
- }
- }
- else
- cd->val = read_char_data(f, cd->val_len);
- TAGDBG("read str_val: '%s', intval: %d\n", val, intval);
- TAGDBG("exiting read_descriptor \n\n");
- return cd;
-}
-
-static ContentDescriptor **read_descriptors(VFSFile * f, guint count, Tuple * t, gboolean populate_tuple)
-{
- if (count == 0)
- return NULL;
- ContentDescriptor **descs = g_new0(ContentDescriptor *, count);
- int i;
- for (i = 0; i < count; i++)
- descs[i] = read_descriptor(f, t, populate_tuple);
- return descs;
-}
-
-void free_content_descr_obj(ContentDescrObj * c)
-{
- g_free(c->guid);
- g_free(c->title);
- g_free(c->author);
- g_free(c->copyright);
- g_free(c->description);
- g_free(c->rating);
- g_free(c);
-}
-
-void free_content_descr(ContentDescriptor * cd)
-{
- g_free(cd->name);
- g_free(cd->val);
- g_free(cd);
-}
-
-void free_ext_content_descr_obj(ExtContentDescrObj * ecdo)
-{
- int i;
- g_free(ecdo->guid);
- for (i = 0; i < ecdo->content_desc_count; i++)
- free_content_descr(ecdo->descriptors[i]);
- g_free(ecdo);
-}
-
-/* returns the offset of the object in the file */
-static long ftell_object_by_guid(VFSFile * f, GUID_t * g)
-{
- TAGDBG("seeking object %s, with ID %d \n", guid_convert_to_string(g), get_guid_type(g));
- HeaderObj *h = read_top_header_object(f);
- g_return_val_if_fail((f != NULL) && (g != NULL) && (h != NULL), -1);
-
- gint i = 0;
- while (i < h->objectsNr)
- {
- GenericHeader *gen_hdr = read_generic_header(f, FALSE);
- TAGDBG("encountered GUID %s, with ID %d\n", guid_convert_to_string(gen_hdr->guid), get_guid_type(gen_hdr->guid));
- if (guid_equal(gen_hdr->guid, g))
- {
- g_free(h);
- g_free(gen_hdr);
- guint64 ret = vfs_ftell(f) - 24;
- TAGDBG("at offset %" PRIx64 "\n", ret);
- return ret;
- }
- vfs_fseek(f, gen_hdr->size - 24, SEEK_CUR); //most headers have a size as their second field"
- i++;
- }
- TAGDBG("The object was not found\n");
-
- g_free(h);
- return -1;
-}
-
-VFSFile *make_temp_file()
-{
- /* create a temporary file */
- const gchar *tmpdir = g_get_tmp_dir();
- gchar *tmp_path = g_strdup_printf("file://%s/%s", tmpdir, "wmatmp.wma");
- return vfs_fopen(tmp_path, "w+");
-}
-
-long ftell_object_by_str(VFSFile * f, gchar * s)
-{
- GUID_t *g = guid_convert_from_string(s);
- long res = ftell_object_by_guid(f, g);
- g_free(g);
- return res;
-}
-
-static void write_content_descr_obj_from_tuple(VFSFile * f, ContentDescrObj * cdo, Tuple * t)
-{
- glong size;
- gboolean free_cdo = FALSE;
- if (cdo == NULL)
- {
- cdo = g_new0(ContentDescrObj, 1);
- free_cdo = TRUE;
- }
-
- cdo->title = g_utf8_to_utf16(tuple_get_string(t, FIELD_TITLE, NULL), -1, NULL, &size, NULL);
- cdo->title_length = 2 * (size + 1);
- cdo->author = g_utf8_to_utf16(tuple_get_string(t, FIELD_ARTIST, NULL), -1, NULL, &size, NULL);
- cdo->author_length = 2 * (size + 1);
- cdo->copyright = g_utf8_to_utf16(tuple_get_string(t, FIELD_COPYRIGHT, NULL), -1, NULL, &size, NULL);
- cdo->copyright_length = 2 * (size + 1);
- cdo->description = g_utf8_to_utf16(tuple_get_string(t, FIELD_COMMENT, NULL), -1, NULL, &size, NULL);
- cdo->desc_length = 2 * (size + 1);
- cdo->size = 34 + cdo->title_length + cdo->author_length + cdo->copyright_length + cdo->desc_length;
- guid_write_to_file(f, ASF_CONTENT_DESCRIPTION_OBJECT);
- write_LEuint64(f, cdo->size);
- write_LEuint16(f, cdo->title_length);
- write_LEuint16(f, cdo->author_length);
- write_LEuint16(f, cdo->copyright_length);
- write_LEuint16(f, cdo->desc_length);
- write_LEuint16(f, 2); // rating_length = 2
- write_utf16(f, cdo->title, cdo->title_length);
- write_utf16(f, cdo->title, cdo->title_length);
- write_utf16(f, cdo->author, cdo->author_length);
- write_utf16(f, cdo->copyright, cdo->copyright_length);
- write_utf16(f, cdo->description, cdo->desc_length);
- write_utf16(f, NULL, 2); //rating == NULL
-
- if (free_cdo)
- free_content_descr_obj(cdo);
-}
-
-static void write_ext_content_descr_obj_from_tuple(VFSFile * f, ExtContentDescrObj * ecdo, Tuple * tuple)
-{
-}
-
-static gboolean write_generic_header(VFSFile * f, GenericHeader * gh)
-{
- TAGDBG("Writing generic header\n");
- guid_write_to_file(f, get_guid_type(gh->guid));
- return write_char_data(f, gh->data, gh->size);
-}
-
-static void free_generic_header(GenericHeader * gh)
-{
- g_free(gh->guid);
- g_free(gh->data);
- g_free(gh);
-}
-
-static gboolean write_top_header_object(VFSFile * f, HeaderObj * header)
-{
- TAGDBG("write header object\n");
- vfs_fseek(f, 0, SEEK_SET);
- return (guid_write_to_file(f, ASF_HEADER_OBJECT) && write_LEuint64(f, header->size) && write_LEuint32(f, header->objectsNr) && write_uint8(f, header->res1) && /* the reserved fields */
- write_uint8(f, header->res2));
-}
-
-/* interface functions */
-gboolean wma_can_handle_file(VFSFile * f)
-{
- GUID_t *guid1 = guid_read_from_file(f);
- GUID_t *guid2 = guid_convert_from_string(ASF_HEADER_OBJECT_GUID);
- gboolean equal = ((guid1 != NULL) && guid_equal(guid1, guid2));
-
- g_free(guid1);
- g_free(guid2);
-
- return equal;
-}
-
-gboolean wma_read_tag (Tuple * t, VFSFile * f)
-{
- gchar *artist = NULL, *title = NULL, *comment = NULL;
-
- print_tuple(t);
- gint seek_res = vfs_fseek(f, ftell_object_by_str(f, ASF_CONTENT_DESCRIPTION_OBJECT_GUID), SEEK_SET);
- if (seek_res == 0)
- { //if the CONTENT_DESCRIPTION_OBJECT was found
- ContentDescrObj *cdo = read_content_descr_obj(f);
- artist = utf8(cdo->author);
- title = utf8(cdo->title);
- comment = utf8(cdo->description);
- free_content_descr_obj(cdo);
- tuple_associate_string(t, FIELD_ARTIST, NULL, artist);
- tuple_associate_string(t, FIELD_TITLE, NULL, title);
- tuple_associate_string(t, FIELD_COMMENT, NULL, comment);
- }
- seek_res = vfs_fseek(f, ftell_object_by_str(f, ASF_EXTENDED_CONTENT_DESCRIPTION_OBJECT_GUID), SEEK_SET);
- /*this populates the tuple with the attributes stored as extended descriptors */
- ExtContentDescrObj *ecdo = read_ext_content_descr_obj(f, t, TRUE);
- free_ext_content_descr_obj(ecdo);
- print_tuple(t);
- return TRUE;
-}
-
-gboolean wma_write_tag (Tuple * tuple, VFSFile * f)
-{
-#if BROKEN
- return FALSE;
-#endif
-
- HeaderObj *top_ho = read_top_header_object(f);
- VFSFile *tmpfile = make_temp_file();
- gint i, cdo_pos, ecdo_pos;
- GUID_t *g;
- /*read all the headers and write them to the new file */
- /*the headers that contain tuple data will be overwritten */
- TAGDBG("Header Object size: %" PRId64 "\n", top_ho->size);
- //vfs_fseek(tmpfile, )
- for (i = 0; i < top_ho->objectsNr; i++)
- {
- GenericHeader *gh = read_generic_header(f, TRUE);
- g = guid_convert_from_string(ASF_CONTENT_DESCRIPTION_OBJECT_GUID);
- if (guid_equal(gh->guid, g))
- {
- write_content_descr_obj_from_tuple(tmpfile, (ContentDescrObj *) gh, tuple);
- g_free(g);
- }
- else
- {
- g = guid_convert_from_string(ASF_EXTENDED_CONTENT_DESCRIPTION_OBJECT_GUID);
- if (guid_equal(gh->guid, g))
- write_ext_content_descr_obj_from_tuple(tmpfile, (ExtContentDescrObj *) gh, tuple);
- else
- {
- write_generic_header(tmpfile, gh);
- g_free(g);
- }
- }
- free_generic_header(gh);
- }
- /*check wether these headers existed in the original file */
- cdo_pos = ftell_object_by_str(f, ASF_CONTENT_DESCRIPTION_OBJECT_GUID);
- ecdo_pos = ftell_object_by_str(f, ASF_EXTENDED_CONTENT_DESCRIPTION_OBJECT_GUID);
- if (cdo_pos == -1)
- {
- write_content_descr_obj_from_tuple(tmpfile, NULL, tuple);
- top_ho->objectsNr++;
- }
- if (ecdo_pos != -1)
- {
- write_ext_content_descr_obj_from_tuple(tmpfile, NULL, tuple);
- top_ho->objectsNr++;
- }
- write_top_header_object(tmpfile, top_ho);
-
- gchar *f1 = g_filename_from_uri(tmpfile->uri, NULL, NULL);
- gchar *f2 = g_filename_from_uri(f->uri, NULL, NULL);
- vfs_fclose(tmpfile);
- /*
- if (g_rename(f1, f2) == 0)
- {
- TAGDBG("the tag was updated successfully\n");
- }
- else
- {
- TAGDBG("an error has occured\n");
- }
- */
- g_free(f1);
- g_free(f2);
-
- return TRUE;
-}
-
-tag_module_t wma = {
- .name = "WMA",
- .can_handle_file = wma_can_handle_file,
- .read_tag = wma_read_tag,
- .write_tag = wma_write_tag,
-};
-

audacious-3.1.1.tar.bz2/src/libaudtag/wma/wma.h Deleted

@@ -1,34 +0,0 @@
-/*
- * Copyright 2009 Paula Stanciu
- *
- * 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 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 _WMA_H
-
-#define _WMA_H
-
-#include "libaudcore/tuple.h"
-#include "libaudcore/vfs.h"
-#include "wma_fmt.h"
-
-/* TAG plugin API */
-gboolean wma_can_handle_file(VFSFile *f);
-gboolean wma_read_tag (Tuple * tuple, VFSFile * handle);
-gboolean wma_write_tag (Tuple * tuple, VFSFile * handle);
-
-#endif /* _WMA_H */

audacious-3.1.1.tar.bz2/src/libaudtag/wma/wma_fmt.h Deleted

@@ -1,162 +0,0 @@
-/*
- * Copyright 2009 Paula Stanciu
- *
- * 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 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 _WMA_FMT_H
-#define _WMA_FMT_H
-
-#include "guid.h"
-
-
-#define ASF_HEADER_OBJECT_GUID				"75B22630-668E-11CF-A6D900AA0062CE6C"
-#define ASF_FILE_PROPERTIES_OBJECT_GUID			"8CABDCA1-A947-11CF-8EE400C00C205365"
-#define ASF_STREAM_PROPERTIES_OBJECT_GUID		"B7DC0791-A9B7-11CF-8EE600C00C205365"
-#define ASF_HEADER_EXTENSION_OBJECT_GUID		"5FBF03B5-A92E-11CF-8EE300C00C205365"
-#define ASF_CODEC_LIST_OBJECT_GUID			"86D15240-311D-11D0-A3A400A0C90348F6"
-#define ASF_SCRIPT_COMMAND_OBJECT_GUID			"1EFB1A30-0B62-11D0-A39B00A0C90348F6"
-#define ASF_MARKER_OBJECT_GUID				"F487CD01-A951-11CF-8EE600C00C205365"
-#define ASF_BITRATE_MUTUAL_EXCLUSION_OBJECT_GUID	"D6E229DC-35DA-11D1-903400A0C90349BE"
-#define ASF_ERROR_CORRECTION_OBJECT_GUID		"75B22635-668E-11CF-A6D900AA0062CE6C"
-#define ASF_CONTENT_DESCRIPTION_OBJECT_GUID		"75B22633-668E-11CF-A6D900AA0062CE6C"
-#define ASF_EXTENDED_CONTENT_DESCRIPTION_OBJECT_GUID	"D2D0A440-E307-11D2-97F000A0C95EA850"
-#define ASF_CONTENT_BRANDING_OBJECT_GUID		"2211B3FA-BD23-11D2-B4B700A0C955FC6E"
-#define ASF_STREAM_BITRATE_PROPERTIES_OBJECT_GUID	"7BF875CE-468D-11D1-8D82006097C9A2B2"
-#define ASF_CONTENT_ENCRYPTION_OBJECT_GUID		"2211B3FB-BD23-11D2-B4B700A0C955FC6E"
-#define ASF_EXTENDED_CONTENT_ENCRYPTION_OBJECT_GUID	"298AE614-2622-4C17-B935DAE07EE9289C"
-#define ASF_DIGITAL_SIGNATURE_OBJECT_GUID		"2211B3FC-BD23-11D2-B4B700A0C955FC6E"
-#define ASF_PADDING_OBJECT_GUID				"1806D474-CADF-4509-A4BA9AABCB96AAE8"
-
-typedef enum {
- ASF_HEADER_OBJECT = 0,
- ASF_FILE_PROPERTIES_OBJECT, /* 1 */
- ASF_STREAM_PROPERTIES_OBJECT,
- ASF_HEADER_EXTENSION_OBJECT,
- ASF_CODEC_LIST_OBJECT,
- ASF_SCRIPT_COMMAND_OBJECT, /* 5 */
- ASF_MARKER_OBJECT,
- ASF_BITRATE_MUTUAL_EXCLUSION_OBJECT,
- ASF_ERROR_CORRECTION_OBJECT,
- ASF_CONTENT_DESCRIPTION_OBJECT,
- ASF_EXTENDED_CONTENT_DESCRIPTION_OBJECT, /* 10*/
- ASF_CONTENT_BRANDING_OBJECT,
- ASF_STREAM_BITRATE_PROPERTIES_OBJECT,
- ASF_CONTENT_ENCRYPTION_OBJECT,
- ASF_EXTENDED_CONTENT_ENCRYPTION_OBJECT,
- ASF_DIGITAL_SIGNATURE_OBJECT, /* 15 */
- ASF_PADDING_OBJECT,
- ASF_OBJECT_LAST /* dummy */
-} ObjectType;
-
-#define DESC_ALBUM_STR "WM/AlbumTitle"
-#define DESC_YEAR_STR "WM/Year"
-#define DESC_GENRE_STR "WM/Genre"
-#define DESC_TRACK_STR "WM/TrackNumber"
-
-typedef enum {
- DESC_ALBUM = 0,
- DESC_YEAR,
- DESC_GENRE,
- DESC_TRACK,
- DESC_LAST
-} DescrIndexes;
-
-/*
- * this should be fine for all headers whose content is irrelevant,
- * but the size is needed so that we can skip it
- */
-typedef struct _generic_header {
- GUID_t *guid;
- guint64 size;
- gchar *data;
-} GenericHeader;
-
-typedef struct _header_object {
- GUID_t *guid;
- guint64 size;
- guint32 objectsNr;
- guint8 res1;
- guint8 res2;
-} HeaderObj;
-
-/*
- * this is special, its size does not include the size of the ext_data
- */
-typedef struct _header_extension_object {
- GUID_t *guid;
- guint64 size;
- guint32 objects_count;
- guint8 res1;
- guint8 res2;
- guint32 ext_data_size;
- gchar *ext_data;
-} HeaderExtensionObject;
-
-typedef struct _file_properties_header {
- GUID_t *guid;
- guint64 size;
- gchar dontcare1[16];
- guint64 duration; //expressed as the count of 100ns intervals
- gchar dontcare2[32];
-} FilePropertiesHeader;
-
-typedef struct _content_description_object {
- GUID_t *guid;
- guint64 size;
- guint16 title_length;
- guint16 author_length;
- guint16 copyright_length; /* dontcare*/
- guint16 desc_length;
- guint16 rating_length; /* dontcare*/
- gunichar2 *title;
- gunichar2 *author;
- gunichar2 *copyright; /* dontcare*/
- gunichar2 *description;
- gunichar2 *rating; /* dontcare*/
-} ContentDescrObj;
-
-/* descr_val_type's meaning
- * Value Type length
- * 0x0000 Unicode string varies
- * 0x0001 BYTE array varies
- * 0x0002 BOOL 32
- * 0x0003 DWORD 32
- * 0x0004 QWORD 64
- * 0x0005 WORD 16
- */
-typedef struct _content_descriptor {
- guint16 name_len;
- gunichar2 *name;
- guint16 val_type;
- guint16 val_len;
- gchar * val;
-} ContentDescriptor;
-
-typedef struct _extended_content_description_object {
- GUID_t *guid;
- guint64 size;
- guint16 content_desc_count;
- ContentDescriptor **descriptors;
-} ExtContentDescrObj;
-
-typedef struct _content_field {
- guint16 size;
- gunichar2 *strValue;
-} ContentField;
-
-#endif /* _WMA_FMT_H */

audacious-3.1.1.tar.bz2/src/libeggsmclient/eggsmclient-win32.c Deleted

@@ -1,347 +0,0 @@
-/*
- * Copyright (C) 2007 Novell, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/* EggSMClientWin32
- *
- * For details on the Windows XP logout process, see:
- * http://msdn.microsoft.com/en-us/library/aa376876.aspx.
- *
- * Vista adds some new APIs which EggSMClient does not make use of; see
- * http://msdn.microsoft.com/en-us/library/ms700677(VS.85).aspx
- *
- * When shutting down, Windows sends every top-level window a
- * WM_QUERYENDSESSION event, which the application must respond to
- * synchronously, saying whether or not it will quit. To avoid main
- * loop re-entrancy problems (and to avoid having to muck about too
- * much with the guts of the gdk-win32 main loop), we watch for this
- * event in a separate thread, which then signals the main thread and
- * waits for the main thread to handle the event. Since we don't want
- * to require g_thread_init() to be called, we do this all using
- * Windows-specific thread methods.
- *
- * After the application handles the WM_QUERYENDSESSION event,
- * Windows then sends it a WM_ENDSESSION event with a TRUE or FALSE
- * parameter indicating whether the session is or is not actually
- * going to end now. We handle this from the other thread as well.
- *
- * As mentioned above, Vista introduces several additional new APIs
- * that don't fit into the (current) EggSMClient API. Windows also has
- * an entirely separate shutdown-notification scheme for non-GUI apps,
- * which we also don't handle here.
- */
-
-#include "config.h"
-
-#include "eggsmclient-private.h"
-#include <gdk/gdk.h>
-
-#define WIN32_LEAN_AND_MEAN
-#define UNICODE
-#include <windows.h>
-#include <process.h>
-
-#define EGG_TYPE_SM_CLIENT_WIN32 (egg_sm_client_win32_get_type ())
-#define EGG_SM_CLIENT_WIN32(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_SM_CLIENT_WIN32, EggSMClientWin32))
-#define EGG_SM_CLIENT_WIN32_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_SM_CLIENT_WIN32, EggSMClientWin32Class))
-#define EGG_IS_SM_CLIENT_WIN32(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_SM_CLIENT_WIN32))
-#define EGG_IS_SM_CLIENT_WIN32_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_SM_CLIENT_WIN32))
-#define EGG_SM_CLIENT_WIN32_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EGG_TYPE_SM_CLIENT_WIN32, EggSMClientWin32Class))
-
-typedef struct _EggSMClientWin32 EggSMClientWin32;
-typedef struct _EggSMClientWin32Class EggSMClientWin32Class;
-
-struct _EggSMClientWin32 {
- EggSMClient parent;
-
- HANDLE message_event, response_event;
-
- volatile GSourceFunc event;
- volatile gboolean will_quit;
-};
-
-struct _EggSMClientWin32Class
-{
- EggSMClientClass parent_class;
-
-};
-
-static void sm_client_win32_startup (EggSMClient *client,
-					 const char *client_id);
-static void sm_client_win32_will_quit (EggSMClient *client,
-					 gboolean will_quit);
-static gboolean sm_client_win32_end_session (EggSMClient *client,
-					 EggSMClientEndStyle style,
-					 gboolean request_confirmation);
-
-static GSource *g_win32_handle_source_add (HANDLE handle, GSourceFunc callback,
-					gpointer user_data);
-static gboolean got_message (gpointer user_data);
-static void sm_client_thread (gpointer data);
-
-G_DEFINE_TYPE (EggSMClientWin32, egg_sm_client_win32, EGG_TYPE_SM_CLIENT)
-
-static void
-egg_sm_client_win32_init (EggSMClientWin32 *win32)
-{
- ;
-}
-
-static void
-egg_sm_client_win32_class_init (EggSMClientWin32Class *klass)
-{
- EggSMClientClass *sm_client_class = EGG_SM_CLIENT_CLASS (klass);
-
- sm_client_class->startup = sm_client_win32_startup;
- sm_client_class->will_quit = sm_client_win32_will_quit;
- sm_client_class->end_session = sm_client_win32_end_session;
-}
-
-EggSMClient *
-egg_sm_client_win32_new (void)
-{
- return g_object_new (EGG_TYPE_SM_CLIENT_WIN32, NULL);
-}
-
-static void
-sm_client_win32_startup (EggSMClient *client,
-			 const char *client_id)
-{
- EggSMClientWin32 *win32 = (EggSMClientWin32 *)client;
-
- win32->message_event = CreateEvent (NULL, FALSE, FALSE, NULL);
- win32->response_event = CreateEvent (NULL, FALSE, FALSE, NULL);
- g_win32_handle_source_add (win32->message_event, got_message, win32);
- _beginthread (sm_client_thread, 0, client);
-}
-
-static void
-sm_client_win32_will_quit (EggSMClient *client,
-			 gboolean will_quit)
-{
- EggSMClientWin32 *win32 = (EggSMClientWin32 *)client;
-
- win32->will_quit = will_quit;
- SetEvent (win32->response_event);
-}
-
-static gboolean
-sm_client_win32_end_session (EggSMClient *client,
-			 EggSMClientEndStyle style,
-			 gboolean request_confirmation)
-{
- UINT uFlags = EWX_LOGOFF;
-
- switch (style)
- {
- case EGG_SM_CLIENT_END_SESSION_DEFAULT:
- case EGG_SM_CLIENT_LOGOUT:
- uFlags = EWX_LOGOFF;
- break;
- case EGG_SM_CLIENT_REBOOT:
- uFlags = EWX_REBOOT;
- break;
- case EGG_SM_CLIENT_SHUTDOWN:
- uFlags = EWX_POWEROFF;
- break;
- }
-
- /* There's no way to make ExitWindowsEx() show a logout dialog, so
- * we ignore @request_confirmation.
- */
-
-#ifdef SHTDN_REASON_FLAG_PLANNED
- ExitWindowsEx (uFlags, SHTDN_REASON_FLAG_PLANNED);
-#else
- ExitWindowsEx (uFlags, 0);
-#endif
-
- return TRUE;
-}
-
-
-/* callbacks from logout-listener thread */
-
-static gboolean
-emit_quit_requested (gpointer smclient)
-{
- egg_sm_client_quit_requested (smclient);
-
- return FALSE;
-}
-
-static gboolean
-emit_quit (gpointer smclient)
-{
- EggSMClientWin32 *win32 = smclient;
-
- egg_sm_client_quit (smclient);
-
- SetEvent (win32->response_event);
- return FALSE;
-}
-
-static gboolean
-emit_quit_cancelled (gpointer smclient)
-{
- EggSMClientWin32 *win32 = smclient;
-
- egg_sm_client_quit_cancelled (smclient);
-
- SetEvent (win32->response_event);
- return FALSE;
-}
-
-static gboolean
-got_message (gpointer smclient)
-{
- EggSMClientWin32 *win32 = smclient;
-
- win32->event (win32);
- return TRUE;
-}
-
-/* Windows HANDLE GSource */
-
-typedef struct {
- GSource source;
- GPollFD pollfd;
-} GWin32HandleSource;
-
-static gboolean
-g_win32_handle_source_prepare (GSource *source, gint *timeout)
-{
- *timeout = -1;
- return FALSE;
-}
-
-static gboolean
-g_win32_handle_source_check (GSource *source)
-{
- GWin32HandleSource *hsource = (GWin32HandleSource *)source;
-
- return hsource->pollfd.revents;
-}
-
-static gboolean
-g_win32_handle_source_dispatch (GSource *source, GSourceFunc callback, gpointer user_data)
-{
- return (*callback) (user_data);
-}
-
-static void
-g_win32_handle_source_finalize (GSource *source)
-{
- ;
-}
-
-GSourceFuncs g_win32_handle_source_funcs = {
- g_win32_handle_source_prepare,
- g_win32_handle_source_check,
- g_win32_handle_source_dispatch,
- g_win32_handle_source_finalize
-};
-
-static GSource *
-g_win32_handle_source_add (HANDLE handle, GSourceFunc callback, gpointer user_data)
-{
- GWin32HandleSource *hsource;
- GSource *source;
-
- source = g_source_new (&g_win32_handle_source_funcs, sizeof (GWin32HandleSource));
- hsource = (GWin32HandleSource *)source;
- hsource->pollfd.fd = (int)handle;
- hsource->pollfd.events = G_IO_IN;
- hsource->pollfd.revents = 0;
- g_source_add_poll (source, &hsource->pollfd);
-
- g_source_set_callback (source, callback, user_data, NULL);
- g_source_attach (source, NULL);
- return source;
-}
-
-/* logout-listener thread */
-
-LRESULT CALLBACK
-sm_client_win32_window_procedure (HWND hwnd,
-				 UINT message,
-				 WPARAM wParam,
-				 LPARAM lParam)
-{
- EggSMClientWin32 *win32 =
- (EggSMClientWin32 *)GetWindowLongPtr (hwnd, GWLP_USERDATA);
-
- switch (message)
- {
- case WM_QUERYENDSESSION:
- win32->event = emit_quit_requested;
- SetEvent (win32->message_event);
-
- WaitForSingleObject (win32->response_event, INFINITE);
- return win32->will_quit;
-
- case WM_ENDSESSION:
- if (wParam)
-	{
-	 /* The session is ending */
-	 win32->event = emit_quit;
-	}
- else
-	{
-	 /* Nope, the session *isn't* ending */
-	 win32->event = emit_quit_cancelled;
-	}
-
- SetEvent (win32->message_event);
- WaitForSingleObject (win32->response_event, INFINITE);
-
- return 0;
-
- default:
- return DefWindowProc (hwnd, message, wParam, lParam);
- }
-}
-
-static void
-sm_client_thread (gpointer smclient)
-{
- HINSTANCE instance;
- WNDCLASSEXW wcl;
- ATOM klass;
- HWND window;
- MSG msg;
-
- instance = GetModuleHandle (NULL);
-
- memset (&wcl, 0, sizeof (WNDCLASSEX));
- wcl.cbSize = sizeof (WNDCLASSEX);
- wcl.lpfnWndProc = sm_client_win32_window_procedure;
- wcl.hInstance = instance;
- wcl.lpszClassName = L"EggSmClientWindow";
- klass = RegisterClassEx (&wcl);
-
- window = CreateWindowEx (0, MAKEINTRESOURCE (klass),
-			 L"EggSmClientWindow", 0,
-			 10, 10, 50, 50, GetDesktopWindow (),
-			 NULL, instance, NULL);
- SetWindowLongPtr (window, GWLP_USERDATA, (LONG_PTR)smclient);
-
- /* main loop */
- while (GetMessage (&msg, NULL, 0, 0))
- DispatchMessage (&msg);
-}

audacious-3.1.1.tar.bz2/AUTHORS -> audacious-3.2.4.tar.bz2/AUTHORS Changed

@@ -1,4 +1,44 @@
-Audacious (C) GPL 2005-2009
+Audacious
+=========
+
+This file is quite out of date and in the process of being updated.
+
+Audacious core shared library (src/libaudcore):
+ * Copyright (C) 2006-2011:
+  Daniel Barkalow
+  Christian Birchinger
+  Ralf Ertzinger
+  Maciej Grela
+  Matti Hämäläinen
+  John Lindgren
+  Giacomo Lozito
+  William Pitcock
+  Tony Vroon
+  Yoshiki Yazawa
+  Eugene Zagidullin
+
+Audacious user interface shared library (src/libaudgui):
+ * Copyright (C) 1998-2003 XMMS development team
+ * Copyright (C) 2003-2004 BMP development team
+ * Copyright (C) 2006-2012:
+  Carlo Bramini
+  Michael Färber
+  Jussi Judin
+  John Lindgren
+  Giacomo Lozito
+  Tomasz Moń
+  William Pitcock
+  Yoshiki Yazawa
+  Eugene Zagidullin
+
+Session management support (src/libeggsmclient):
+ * Copyright (C) 1999-2000 Red Hat, Inc.
+ * Copyright (C) 2001 George Lebl
+ * Copyright (C) 2007 Novell, Inc.
+
+
+Old AUTHORS file
+================
 
 Authors listed alphabetically, by last name:
 --------------------------------------------

audacious-3.1.1.tar.bz2/INSTALL -> audacious-3.2.4.tar.bz2/INSTALL Changed

@@ -1,16 +1,25 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+ Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved. This file is offered as-is,
+without warranty of any kind.
 
 Basic Installation
 ==================
 
-These are generic installation instructions.
+ Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package. Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below. The lack of an optional feature in a given package is not
+necessarily a bug. More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
 
 The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation. It uses
@@ -23,9 +32,9 @@
 
 It can also use an optional file (typically called `config.cache'
 and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. (Caching is
+the results of its tests to speed up reconfiguring. Caching is
 disabled by default to prevent problems with accidental use of stale
-cache files.)
+cache files.
 
 If you need to do unusual things to compile the package, please try
 to figure out how `configure' could check whether to do them, and mail
@@ -35,30 +44,37 @@
 may remove or edit it.
 
 The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
+`configure' by a program called `autoconf'. You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
 
-The simplest way to compile this package is:
+ The simplest way to compile this package is:
 
 1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system. If you're
- using `csh' on an old version of System V, you might need to type
- `sh ./configure' instead to prevent `csh' from trying to execute
- `configure' itself.
+ `./configure' to configure the package for your system.
 
- Running `configure' takes awhile. While running, it prints some
- messages telling which features it is checking for.
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
 
 2. Type `make' to compile the package.
 
 3. Optionally, type `make check' to run any self-tests that come with
- the package.
+ the package, generally using the just-built uninstalled binaries.
 
 4. Type `make install' to install the programs and any data files and
- documentation.
-
- 5. You can remove the program binaries and object files from the
+ documentation. When installing into a prefix owned by root, it is
+ recommended that the package be configured and built as a regular
+ user, and only the `make install' phase executed with root
+ privileges.
+
+ 5. Optionally, type `make installcheck' to repeat any self-tests, but
+ this time using the binaries in their final installed location.
+ This target does not install anything. Running this target as a
+ regular user, particularly if the prior `make install' required
+ root privileges, verifies that the installation completed
+ correctly.
+
+ 6. You can remove the program binaries and object files from the
 source code directory by typing `make clean'. To also remove the
 files that `configure' created (so you can compile the package for
 a different kind of computer), type `make distclean'. There is
@@ -67,45 +83,69 @@
 all sorts of other programs in order to regenerate files that came
 with the distribution.
 
+ 7. Often, you can also type `make uninstall' to remove the installed
+ files again. In practice, not all packages have tested that
+ uninstallation works correctly, even though it is required by the
+ GNU Coding Standards.
+
+ 8. Some packages, particularly those that use Automake, provide `make
+ distcheck', which can by used by developers to test that all other
+ targets like `make install' and `make uninstall' work correctly.
+ This target is generally not run by end users.
+
 Compilers and Options
 =====================
 
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about. Run `./configure --help' for
-details on some of the pertinent environment variables.
+ Some systems require unusual options for compilation or linking that
+the `configure' script does not know about. Run `./configure --help'
+for details on some of the pertinent environment variables.
 
 You can give `configure' initial values for configuration parameters
 by setting variables in the command line or in the environment. Here
 is an example:
 
- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
 
 *Note Defining Variables::, for more details.
 
 Compiling For Multiple Architectures
 ====================================
 
-You can compile the package for more than one kind of computer at the
+ You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
-own directory. To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'. `cd' to the
+own directory. To do this, you can use GNU `make'. `cd' to the
 directory where you want the object files and executables to go and run
 the `configure' script. `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
+source code in the directory that `configure' is in and in `..'. This
+is known as a "VPATH" build.
+
+ With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
 
- If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory. After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
+ On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor. Like
+this:
+
+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CPP="gcc -E" CXXCPP="g++ -E"
+
+ This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
 
 Installation Names
 ==================
 
-By default, `make install' installs the package's commands under
+ By default, `make install' installs the package's commands under
 `/usr/local/bin', include files under `/usr/local/include', etc. You
 can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
 
 You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files. If you
@@ -116,16 +156,47 @@
 In addition, if you use an unusual directory layout you can give
 options like `--bindir=DIR' to specify different values for particular
 kinds of files. Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
+you can set and what kinds of files go in them. In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+ The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+ The first method involves providing an override variable for each
+affected directory. For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'. Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated. The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+ The second method involves providing the `DESTDIR' variable. For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names. The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters. On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
 
 If the package supports it, you can cause programs to be installed
 with an extra prefix or suffix on their names by giving `configure' the
 option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
 
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
+ Some packages pay attention to `--enable-FEATURE' options to
 `configure', where FEATURE indicates an optional part of the package.
 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
 is something like `gnu-as' or `x' (for the X Window System). The
@@ -137,14 +208,53 @@
 you can use the `configure' options `--x-includes=DIR' and
 `--x-libraries=DIR' to specify their locations.
 
+ Some packages offer the ability to configure how verbose the
+execution of `make' will be. For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
+Particular systems
+==================
+
+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+ ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file. The option `-nodtk' can be used as
+a workaround. If GNU CC is not installed, it is therefore recommended
+to try
+
+ ./configure CC="cc"
+
+and if that doesn't work, try
+
+ ./configure CC="cc -nodtk"
+
+ On Solaris, don't put `/usr/ucb' early in your `PATH'. This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+ On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'. It is recommended to use the following options:
+
+ ./configure --prefix=/boot/common
+
 Specifying the System Type
 ==========================
 
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
+ There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on. Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
 `--build=TYPE' option. TYPE can either be a short name for the system
 type, such as `sun4', or a canonical name which has the form:
 
@@ -152,7 +262,8 @@
 
 where SYSTEM can have one of these forms:
 
- OS KERNEL-OS
+ OS
+ KERNEL-OS
 
 See the file `config.sub' for the possible values of each field. If
 `config.sub' isn't included in this package, then this package doesn't
@@ -170,9 +281,9 @@
 Sharing Defaults
 ================
 
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
+ If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
 `configure' looks for `PREFIX/share/config.site' if it exists, then
 `PREFIX/etc/config.site' if it exists. Or, you can set the
 `CONFIG_SITE' environment variable to the location of the site script.
@@ -181,7 +292,7 @@
 Defining Variables
 ==================
 
-Variables not defined in a site shell script can be set in the
+ Variables not defined in a site shell script can be set in the
 environment passed to `configure'. However, some packages may run
 configure again during the build, and the customized values of these
 variables may be lost. In order to avoid this problem, you should set
@@ -190,21 +301,29 @@
 ./configure CC=/usr/local2/bin/gcc
 
 causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script). Here is a another example:
+overridden in the site shell script).
 
- /bin/bash ./configure CONFIG_SHELL=/bin/bash
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
 
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
 
 `configure' Invocation
 ======================
 
-`configure' recognizes the following options to control how it operates.
+ `configure' recognizes the following options to control how it
+operates.
 
 `--help'
 `-h'
- Print a summary of the options to `configure', and exit.
+ Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+ Print a summary of the options unique to this package's
+ `configure', and exit. The `short' variant lists options used
+ only in the top level, while the `recursive' variant lists options
+ also present in any nested packages.
 
 `--version'
 `-V'
@@ -231,6 +350,16 @@
 Look for the package's source code in directory DIR. Usually
 `configure' can determine that directory automatically.
 
+`--prefix=DIR'
+ Use DIR as the installation prefix. *note Installation Names::
+ for more details, including other options available for fine-tuning
+ the installation locations.
+
+`--no-create'
+`-n'
+ Run the configure checks, but stop before creating any output
+ files.
+
 `configure' also accepts some other, not widely useful, options. Run
 `configure --help' for more details.

audacious-3.1.1.tar.bz2/acinclude.m4 -> audacious-3.2.4.tar.bz2/acinclude.m4 Changed

@@ -1,16 +1,3 @@
-
-dnl ** ADD_PKG_REQUIRES([requirement])
-dnl ** Adds a dependency to package's pkg-config file.
-AC_DEFUN([ADD_PC_REQUIRES], [
-   if test "x$PC_REQUIRES" = "x"; then
-       PC_REQUIRES="$1"
-   else
-       PC_REQUIRES="$PC_REQUIRES, $1"
-   fi
-   AC_SUBST([PC_REQUIRES])
-])
-
-
 dnl ** AUD_CHECK_MODULE([define name], [module], [version required],
 dnl **     [informational name], [additional error message])
 dnl **
@@ -21,7 +8,6 @@
 dnl ** AUD_CHECK_MODULE([GLIB], [gtk+-2.0], [>= 2.8.0], [Gtk+2], [See http://www.gtk.org/])
 AC_DEFUN([AUD_CHECK_MODULE], [
     PKG_CHECK_MODULES([$1], [$2 $3], [
-        ADD_PC_REQUIRES([$2 $3])
     ],[
         PKG_CHECK_EXISTS([$2], [
             cv_pkg_version=`$PKG_CONFIG --modversion "$2" 2>/dev/null`
@@ -174,18 +160,18 @@
 AC_REQUIRE([AC_SYS_LARGEFILE])
 
 if test "x$GCC" = "xyes"; then
-    CFLAGS="$CFLAGS -Wall -pipe"
+    CFLAGS="$CFLAGS -std=gnu99 -Wall -pipe"
     CXXFLAGS="$CXXFLAGS -Wall -pipe"
     AUD_CHECK_CFLAGS(-Wtype-limits)
 fi
 
-dnl Enable "-z defs" only on Linux
+dnl Enable "-Wl,-z,defs" only on Linux
 dnl ==============================
 AC_MSG_CHECKING([for Linux])
 case "$target" in
     *linux*)
         AC_MSG_RESULT([yes])
-        LDFLAGS="$LDFLAGS -z defs"
+        LDFLAGS="$LDFLAGS -Wl,-z,defs"
         ;;
     *)
         AC_MSG_RESULT([no])
@@ -208,15 +194,11 @@
 dnl Check for Gtk+/GLib and pals
 dnl ============================
 AUD_CHECK_MODULE([GLIB], [glib-2.0], [>= 2.16], [Glib2])
+AUD_CHECK_MODULE([GMODULE], [gmodule-2.0], [>= 2.16], [GModule])
 AUD_CHECK_MODULE([GTHREAD], [gthread-2.0], [>= 2.16], [GThread])
 AUD_CHECK_MODULE([PANGO], [pango], [>= 1.20], [Pango])
 AUD_CHECK_MODULE([CAIRO], [cairo], [>= 1.6], [Cairo])
 
-dnl Check for libmowgli
-dnl ===================
-AUD_CHECK_MODULE([MOWGLI], [libmowgli], [>= 0.9], [libmowgli],
-    [http://www.atheme.org/projects/mowgli.shtml])
-
 ])

audacious-3.1.1.tar.bz2/aclocal.m4 -> audacious-3.2.4.tar.bz2/aclocal.m4 Changed

@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.1 -*- Autoconf -*-
+
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -2511,7 +2511,7 @@
 
 # Figure out how to run the assembler. -*- Autoconf -*-
 
-# Copyright (C) 2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -2533,22 +2533,21 @@
 
 # AM_CONDITIONAL -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 9
+# serial 10
 
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
 # Define a conditional.
 AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+[AC_PREREQ([2.52])dnl
+ m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
 AC_SUBST([$1_TRUE])dnl
 AC_SUBST([$1_FALSE])dnl
 _AM_SUBST_NOTMAKE([$1_TRUE])dnl
@@ -2567,16 +2566,15 @@
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 10
+# serial 17
 
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
 # will think it sees a *use*, and therefore will trigger all it's
 # C support machinery. Also note that it means that autoscan, seeing
@@ -2586,7 +2584,7 @@
 # _AM_DEPENDENCIES(NAME)
 # ----------------------
 # See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
 # We try a few techniques and use that to set a single cache variable.
 #
 # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
@@ -2599,12 +2597,13 @@
 AC_REQUIRE([AM_MAKE_INCLUDE])dnl
 AC_REQUIRE([AM_DEP_TRACK])dnl
 
-ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
- [$1], CXX, [depcc="$CXX" am_compiler_list=],
- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
- [$1], UPC, [depcc="$UPC" am_compiler_list=],
- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
- [depcc="$$1" am_compiler_list=])
+m4_if([$1], [CC], [depcc="$CC" am_compiler_list=],
+ [$1], [CXX], [depcc="$CXX" am_compiler_list=],
+ [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+ [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
+ [$1], [UPC], [depcc="$UPC" am_compiler_list=],
+ [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
+ [depcc="$$1" am_compiler_list=])
 
 AC_CACHE_CHECK([dependency style of $depcc],
 [am_cv_$1_dependencies_compiler_type],
@@ -2612,8 +2611,9 @@
 # We make a subdir and do the tests there. Otherwise we can end up
 # making bogus files that we don't know about and never remove. For
 # instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
+ # making a dummy file named 'D' -- because '-MD' means "put the output
+ # in D".
+ rm -rf conftest.dir
 mkdir conftest.dir
 # Copy depcomp to subdir because otherwise we won't find it if we're
 # using a relative directory.
@@ -2652,16 +2652,16 @@
 : > sub/conftest.c
 for i in 1 2 3 4 5 6; do
 echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+ # Solaris 10 /bin/sh.
+ echo '/* dummy */' > sub/conftst$i.h
 done
 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
 # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs
+ # handle '-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs.
 am__obj=sub/conftest.${OBJEXT-o}
 am__minus_obj="-o $am__obj"
 case $depmode in
@@ -2670,16 +2670,16 @@
 test "$am__universal" = false || continue
 ;;
 nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
+ # After this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested.
 if test "x$enable_dependency_tracking" = xyes; then
 	continue
 else
 	break
 fi
 ;;
- msvisualcpp | msvcmsys)
- # This compiler won't grok `-c -o', but also, the minuso test has
+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+ # This compiler won't grok '-c -o', but also, the minuso test has
 # not run yet. These depmodes are late enough in the game, and
 # so weak that their functioning should not be impacted.
 am__obj=conftest.${OBJEXT-o}
@@ -2727,7 +2727,7 @@
 # AM_SET_DEPDIR
 # -------------
 # Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
 AC_DEFUN([AM_SET_DEPDIR],
 [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
 AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
@@ -2737,28 +2737,34 @@
 # AM_DEP_TRACK
 # ------------
 AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[ --disable-dependency-tracking speeds up one-time build
- --enable-dependency-tracking do not reject slow dependency extractors])
+[AC_ARG_ENABLE([dependency-tracking], [dnl
+AS_HELP_STRING(
+ [--enable-dependency-tracking],
+ [do not reject slow dependency extractors])
+AS_HELP_STRING(
+ [--disable-dependency-tracking],
+ [speeds up one-time build])])
 if test "x$enable_dependency_tracking" != xno; then
 am_depcomp="$ac_aux_dir/depcomp"
 AMDEPBACKSLASH='\'
+ am__nodep='_no'
 fi
 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
 AC_SUBST([AMDEPBACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([am__nodep])dnl
+_AM_SUBST_NOTMAKE([am__nodep])dnl
 ])
 
 # Generate code to set up dependency tracking. -*- Autoconf -*-
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-#serial 5
+# serial 6
 
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
@@ -2777,7 +2783,7 @@
 # Strip MF so we end up with the name of the file.
 mf=`echo "$mf" | sed -e 's/:.*$//'`
 # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
+ # We used to match only the files named 'Makefile.in', but
 # some people rename them; so instead we look at the file content.
 # Grep'ing the first line is not enough: some people post-process
 # each Makefile.in and add a new line on top of each file to say so.
@@ -2789,21 +2795,19 @@
 continue
 fi
 # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
+ # from the Makefile without running 'make'.
 DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
 test -z "$DEPDIR" && continue
 am__include=`sed -n 's/^am__include = //p' < "$mf"`
 test -z "am__include" && continue
 am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
 # Find all dependency output files, they are included files with
 # $(DEPDIR) in their names. We invoke sed twice because it is the
 # simplest approach to changing $(DEPDIR) to its actual value in the
 # expansion.
 for file in `sed -n "
 s/^$am__include $am__quote$.*(DEPDIR).*$$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
 # Make sure the directory exists.
 test -f "$dirpart/$file" && continue
 fdir=`AS_DIRNAME(["$file"])`
@@ -2821,7 +2825,7 @@
 # This macro should only be invoked once -- use via AC_REQUIRE.
 #
 # This code is only required when automatic dependency tracking
-# is enabled. FIXME. This creates each `.P' file that we will
+# is enabled. FIXME. This creates each '.P' file that we will
 # need in order to bootstrap the dependency handling code.
 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 [AC_CONFIG_COMMANDS([depfiles],
@@ -2829,7 +2833,7 @@
 [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
 ])
 
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -2852,13 +2856,13 @@
 
 # Check to see how 'make' treats includes.	 -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
+# serial 5
 
 # AM_MAKE_INCLUDE()
 # -----------------
@@ -2877,7 +2881,7 @@
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
 case `$am_make -s -f confmf 2> /dev/null` in #(
 *the\ am__doit\ target*)
 am__include=include
@@ -2902,18 +2906,25 @@
 rm -f confinc confmf
 ])
 
-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 3
+
 # AM_PROG_MKDIR_P
 # ---------------
-# Check for `mkdir -p'.
+# Check for 'mkdir -p'.
 AC_DEFUN([AM_PROG_MKDIR_P],
 [AC_PREREQ([2.60])dnl
 AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl FIXME to be removed in Automake 1.13.
+AC_DIAGNOSE([obsolete],
+[$0: this macro is deprecated, and will soon be removed.
+You should use the Autoconf-provided 'AC][_PROG_MKDIR_P' macro instead,
+and use '$(MKDIR_P)' instead of '$(mkdir_p)'in your Makefile.am files.])
 dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
 dnl while keeping a definition of mkdir_p for backward compatibility.
 dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
@@ -2930,13 +2941,13 @@
 
 # Helper functions for option handling. -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
+# serial 6
 
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
@@ -2944,13 +2955,13 @@
 [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
 
 # _AM_SET_OPTION(NAME)
-# ------------------------------
+# --------------------
 # Set option NAME. Presently that only means defining a flag for this option.
 AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
 
 # _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
+# ------------------------
 # OPTIONS is a space-separated list of Automake options.
 AC_DEFUN([_AM_SET_OPTIONS],
 [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
@@ -2961,13 +2972,13 @@
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
+# serial 3
 
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
@@ -2976,7 +2987,7 @@
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 
 # AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
+# --------------------------
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])

audacious-3.1.1.tar.bz2/audacious.desktop -> audacious-3.2.4.tar.bz2/audacious.desktop Changed

audacious-3.1.1.tar.bz2/audacious.pc.in -> audacious-3.2.4.tar.bz2/audacious.pc.in Changed

audacious-3.1.1.tar.bz2/audclient.pc.in -> audacious-3.2.4.tar.bz2/audclient.pc.in Changed

audacious-3.1.1.tar.bz2/config.guess -> audacious-3.2.4.tar.bz2/config.guess Changed

@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-# Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+# Free Software Foundation, Inc.
 
-timestamp='2006-07-02'
+timestamp='2009-11-20'
 
 # 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
@@ -27,16 +27,16 @@
 # the same distribution terms that you use for the rest of that program.
 
 
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>. Submit a context
-# diff and a properly formatted ChangeLog entry.
+# Originally written by Per Bothner. Please send patches (context
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
+# entry.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub. If it succeeds, it prints the system name on stdout, and
 # exits with 0. Otherwise, it exits with 1.
 #
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -56,8 +56,8 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -139,23 +139,6 @@
 UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
-if [ "${UNAME_SYSTEM}" = "Linux" ] ; then
-	eval $set_cc_for_build
-	cat << EOF > $dummy.c
-	#include <features.h>
-	#ifdef __UCLIBC__
-	# ifdef __UCLIBC_CONFIG_VERSION__
-	LIBC=uclibc __UCLIBC_CONFIG_VERSION__
-	# else
-	LIBC=uclibc
-	# endif
-	#else
-	LIBC=gnu
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep LIBC= | sed -e 's: ::g'`
-fi
-
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -178,6 +161,7 @@
 	 arm*) machine=arm-unknown ;;
 	 sh3el) machine=shl-unknown ;;
 	 sh3eb) machine=sh-unknown ;;
+	 sh5el) machine=sh5le-unknown ;;
 	 *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
@@ -186,7 +170,7 @@
 	 arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
+			| grep -q __ELF__
 		then
 		 # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
 		 # Return netbsd for either. FIX?
@@ -340,14 +324,33 @@
 	case `/usr/bin/uname -p` in
 	 sparc) echo sparc-icl-nx7; exit ;;
 	esac ;;
+ s390x:SunOS:*:*)
+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
 sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
 sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
- i86pc:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux${UNAME_RELEASE}
+	exit ;;
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+	eval $set_cc_for_build
+	SUN_ARCH="i386"
+	# If there is a compiler, see if it is configured for 64-bit objects.
+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+	# This test works for both compilers.
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	 if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	 then
+		SUN_ARCH="x86_64"
+	 fi
+	fi
+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
 sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
@@ -548,7 +551,7 @@
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
- *:AIX:*:[45])
+ *:AIX:*:[456])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -656,7 +659,7 @@
 	 # => hppa64-hp-hpux11.23
 
 	 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep __LP64__ >/dev/null
+		grep -q __LP64__
 	 then
 		HP_ARCH="hppa2.0w"
 	 else
@@ -797,7 +800,7 @@
 i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
- i*:MINGW*:*)
+ *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
 i*:windows32*:*)
@@ -807,15 +810,24 @@
 i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
- x86:Interix*:[3456]*)
-	echo i586-pc-interix${UNAME_RELEASE}
-	exit ;;
- EM64T:Interix*:[3456]*)
-	echo x86_64-unknown-interix${UNAME_RELEASE}
-	exit ;;
+ *:Interix*:*)
+ 	case ${UNAME_MACHINE} in
+	 x86)
+		echo i586-pc-interix${UNAME_RELEASE}
+		exit ;;
+	 authenticamd | genuineintel | EM64T)
+		echo x86_64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	 IA64)
+		echo ia64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	esac ;;
 [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
+ 8664:Windows_NT:*)
+	echo x86_64-pc-mks
+	exit ;;
 i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -845,193 +857,125 @@
 i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
+ alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in
+	 EV5) UNAME_MACHINE=alphaev5 ;;
+	 EV56) UNAME_MACHINE=alphaev56 ;;
+	 PCA56) UNAME_MACHINE=alphapca56 ;;
+	 PCA57) UNAME_MACHINE=alphapca56 ;;
+	 EV6) UNAME_MACHINE=alphaev6 ;;
+	 EV67) UNAME_MACHINE=alphaev67 ;;
+	 EV68*) UNAME_MACHINE=alphaev68 ;;
+ esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	exit ;;
 arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	eval $set_cc_for_build
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	 | grep -q __ARM_EABI__
+	then
+	 echo ${UNAME_MACHINE}-unknown-linux-gnu
+	else
+	 echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	fi
 	exit ;;
 avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
 cris:Linux:*:*)
-	echo cris-axis-linux-${LIBC}
+	echo cris-axis-linux-gnu
 	exit ;;
 crisv32:Linux:*:*)
-	echo crisv32-axis-linux-${LIBC}
+	echo crisv32-axis-linux-gnu
 	exit ;;
 frv:Linux:*:*)
- 	echo frv-unknown-linux-${LIBC}
+ 	echo frv-unknown-linux-gnu
+	exit ;;
+ i*86:Linux:*:*)
+	LIBC=gnu
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
 	exit ;;
 ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
 m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
 m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
- mips:Linux:*:*)
+ mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 	#undef CPU
-	#undef mips
-	#undef mipsel
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
+	CPU=${UNAME_MACHINE}el
 	#else
 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
+	CPU=${UNAME_MACHINE}
 	#else
 	CPU=
 	#endif
 	#endif
 EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	 /^CPU/{
-		s: ::g
-		p
-	 }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
-	;;
- mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips64
-	#undef mips64el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	 /^CPU/{
-		s: ::g
-		p
-	 }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
 or32:Linux:*:*)
-	echo or32-unknown-linux-${LIBC}
+	echo or32-unknown-linux-gnu
 	exit ;;
- ppc:Linux:*:*)
-	echo powerpc-unknown-linux-${LIBC}
+ padre:Linux:*:*)
+	echo sparc-unknown-linux-gnu
 	exit ;;
- ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-${LIBC}
-	exit ;;
- alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in
-	 EV5) UNAME_MACHINE=alphaev5 ;;
-	 EV56) UNAME_MACHINE=alphaev56 ;;
-	 PCA56) UNAME_MACHINE=alphapca56 ;;
-	 PCA57) UNAME_MACHINE=alphapca56 ;;
-	 EV6) UNAME_MACHINE=alphaev6 ;;
-	 EV67) UNAME_MACHINE=alphaev67 ;;
-	 EV68*) UNAME_MACHINE=alphaev68 ;;
- esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-gnu
 	exit ;;
 parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	 PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
-	 PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
-	 *) echo hppa-unknown-linux-${LIBC} ;;
+	 PA7*) echo hppa1.1-unknown-linux-gnu ;;
+	 PA8*) echo hppa2.0-unknown-linux-gnu ;;
+	 *) echo hppa-unknown-linux-gnu ;;
 	esac
 	exit ;;
- parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-${LIBC}
+ ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-gnu
+	exit ;;
+ ppc:Linux:*:*)
+	echo powerpc-unknown-linux-gnu
 	exit ;;
 s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit ;;
 sh64*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
 sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
 sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
 vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+	echo ${UNAME_MACHINE}-dec-linux-gnu
 	exit ;;
 x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-${LIBC}
+	echo x86_64-unknown-linux-gnu
+	exit ;;
+ xtensa*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
- i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				 s/[ 	][ 	]*/ /g
-				 s/.*supported targets: *//
-				 s/ .*//
-				 p'`
- case "$ld_supported_targets" in
-	 elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-${LIBC}"
-		;;
-	 a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}aout"
-		exit ;;
-	 coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}coff"
-		exit ;;
-	 "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}oldld"
-		exit ;;
-	esac
-	# This should get integrated into the C code below, but now we hack
-	if [ "$LIBC" != "gnu" ] ; then echo "$TENTATIVE" && exit 0 ; fi
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	# if __GLIBC__ >= 2
-	LIBC=gnu
-	# else
-	LIBC=gnulibc1
-	# endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	 /^LIBC/{
-		s: ::g
-		p
-	 }'`"
-	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-		exit
-	}
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-	;;
 i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
@@ -1060,7 +1004,7 @@
 i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
 	exit ;;
- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
 i*86:*DOS:*:*)
@@ -1104,8 +1048,11 @@
 pc:*:*:*)
 	# Left here for compatibility:
 # uname -m prints for DJGPP always 'pc', but it prints nothing about
- # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
+ # the processor, so we play safe by assuming i586.
+	# Note: whatever this is, it MUST be the same as what config.sub
+	# prints for the "djgpp" host, or else GDB configury will decide that
+	# this is a cross-build.
+	echo i586-pc-msdosdjgpp
 exit ;;
 Intel:Mach:3*:*)
 	echo i386-pc-mach3
@@ -1143,6 +1090,16 @@
 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
 /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
 && { echo i486-ncr-sysv4; exit; } ;;
+ NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+	OS_REL='.3'
+	test -r /etc/.relid \
+	 && OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	 && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	 && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+	 && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
 m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
@@ -1155,7 +1112,7 @@
 rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
 SM[BE]S:UNIX_SV:*:*)
@@ -1218,6 +1175,9 @@
 BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
 	exit ;;
+ BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+	echo i586-pc-haiku
+	exit ;;
 SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit ;;
@@ -1227,6 +1187,15 @@
 SX-6:SUPER-UX:*:*)
 	echo sx6-nec-superux${UNAME_RELEASE}
 	exit ;;
+ SX-7:SUPER-UX:*:*)
+	echo sx7-nec-superux${UNAME_RELEASE}
+	exit ;;
+ SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux${UNAME_RELEASE}
+	exit ;;
+ SX-8R:SUPER-UX:*:*)
+	echo sx8r-nec-superux${UNAME_RELEASE}
+	exit ;;
 Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit ;;
@@ -1236,6 +1205,16 @@
 *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
+	 i386)
+		eval $set_cc_for_build
+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		 if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		 (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		 grep IS_64BIT_ARCH >/dev/null
+		 then
+		 UNAME_PROCESSOR="x86_64"
+		 fi
+		fi ;;
 	 unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
@@ -1317,6 +1296,9 @@
 i*86:rdos:*:*)
 	echo ${UNAME_MACHINE}-pc-rdos
 	exit ;;
+ i*86:AROS:*:*)
+	echo ${UNAME_MACHINE}-pc-aros
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1477,9 +1459,9 @@
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
 
- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 and
- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be

audacious-3.1.1.tar.bz2/config.h.in -> audacious-3.2.4.tar.bz2/config.h.in Changed

audacious-3.1.1.tar.bz2/config.rpath -> audacious-3.2.4.tar.bz2/config.rpath Changed

@@ -2,7 +2,7 @@
 # Output a system dependent set of variables, describing how to set the
 # run time search path of shared libraries in an executable.
 #
-# Copyright 1996-2006 Free Software Foundation, Inc.
+# Copyright 1996-2010 Free Software Foundation, Inc.
 # Taken from GNU libtool, 2001
 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
@@ -47,7 +47,7 @@
 done
 cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
 
-# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
+# Code taken from libtool.m4's _LT_COMPILER_PIC.
 
 wl=
 if test "$GCC" = yes; then
@@ -64,7 +64,7 @@
 ;;
 esac
 ;;
- mingw* | pw32* | os2*)
+ mingw* | cygwin* | pw32* | os2* | cegcc*)
 ;;
 hpux9* | hpux10* | hpux11*)
 wl='-Wl,'
@@ -74,9 +74,15 @@
 ;;
 newsos6)
 ;;
- linux*)
+ linux* | k*bsd*-gnu)
 case $cc_basename in
- icc* | ecc*)
+ ecc*)
+ wl='-Wl,'
+ ;;
+ icc* | ifort*)
+ wl='-Wl,'
+ ;;
+ lf95*)
 wl='-Wl,'
 ;;
 pgcc | pgf77 | pgf90)
@@ -100,7 +106,7 @@
 osf3* | osf4* | osf5*)
 wl='-Wl,'
 ;;
- sco3.2v5*)
+ rdos*)
 ;;
 solaris*)
 wl='-Wl,'
@@ -108,11 +114,14 @@
 sunos4*)
 wl='-Qoption ld '
 ;;
- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+ sysv4 | sysv4.2uw2* | sysv4.3*)
 wl='-Wl,'
 ;;
 sysv4*MP*)
 ;;
+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+ wl='-Wl,'
+ ;;
 unicos*)
 wl='-Wl,'
 ;;
@@ -121,7 +130,7 @@
 esac
 fi
 
-# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS.
+# Code taken from libtool.m4's _LT_LINKER_SHLIBS.
 
 hardcode_libdir_flag_spec=
 hardcode_libdir_separator=
@@ -129,7 +138,7 @@
 hardcode_minus_L=no
 
 case "$host_os" in
- cygwin* | mingw* | pw32*)
+ cygwin* | mingw* | pw32* | cegcc*)
 # FIXME: the MSVC++ port hasn't been tested in a loooong time
 # When not using gcc, we currently assume that we are using
 # Microsoft Visual C++.
@@ -155,7 +164,7 @@
 # option of GNU ld is called -rpath, not --rpath.
 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
 case "$host_os" in
- aix3* | aix4* | aix5*)
+ aix[3-9]*)
 # On AIX/PPC, the GNU linker is very broken
 if test "$host_cpu" != ia64; then
 ld_shlibs=no
@@ -179,7 +188,7 @@
 ld_shlibs=no
 fi
 ;;
- cygwin* | mingw* | pw32*)
+ cygwin* | mingw* | pw32* | cegcc*)
 # hardcode_libdir_flag_spec is actually meaningless, as there is
 # no search path for DLLs.
 hardcode_libdir_flag_spec='-L$libdir'
@@ -189,11 +198,11 @@
 ld_shlibs=no
 fi
 ;;
- interix3*)
+ interix[3-9]*)
 hardcode_direct=no
 hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
 ;;
- linux*)
+ gnu* | linux* | k*bsd*-gnu)
 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 :
 else
@@ -251,7 +260,7 @@
 hardcode_direct=unsupported
 fi
 ;;
- aix4* | aix5*)
+ aix[4-9]*)
 if test "$host_cpu" = ia64; then
 # On IA64, the linker does run time linking by default, so we don't
 # have to do anything special.
@@ -261,7 +270,7 @@
 # Test if we are trying to use run time linking or normal
 # AIX style linking. If -brtl is somewhere in LDFLAGS, we
 # need to do runtime linking.
- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
 for ld_flag in $LDFLAGS; do
 if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
 aix_use_runtimelinking=yes
@@ -280,7 +289,7 @@
 strings "$collect2name" | grep resolve_lib_name >/dev/null
 then
 # We have reworked collect2
- hardcode_direct=yes
+ :
 else
 # We have old collect2
 hardcode_direct=unsupported
@@ -323,7 +332,7 @@
 ;;
 bsdi[45]*)
 ;;
- cygwin* | mingw* | pw32*)
+ cygwin* | mingw* | pw32* | cegcc*)
 # When not using gcc, we currently assume that we are using
 # Microsoft Visual C++.
 # hardcode_libdir_flag_spec is actually meaningless, as there is
@@ -359,7 +368,7 @@
 hardcode_direct=yes
 hardcode_minus_L=yes
 ;;
- freebsd* | kfreebsd*-gnu | dragonfly*)
+ freebsd* | dragonfly*)
 hardcode_libdir_flag_spec='-R$libdir'
 hardcode_direct=yes
 ;;
@@ -412,18 +421,22 @@
 hardcode_libdir_separator=:
 ;;
 openbsd*)
- hardcode_direct=yes
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ if test -f /usr/libexec/ld.so; then
+ hardcode_direct=yes
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ else
+ case "$host_os" in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ ;;
+ esac
+ fi
 else
- case "$host_os" in
- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
- hardcode_libdir_flag_spec='-R$libdir'
- ;;
- *)
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
- ;;
- esac
+ ld_shlibs=no
 fi
 ;;
 os2*)
@@ -471,7 +484,7 @@
 ld_shlibs=yes
 fi
 ;;
- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
 ;;
 sysv5* | sco3.2v5* | sco5v6*)
 hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
@@ -487,34 +500,52 @@
 fi
 
 # Check dynamic linker characteristics
-# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER.
+# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER.
+# Unlike libtool.m4, here we don't care about _all_ names of the library, but
+# only about the one the linker finds when passed -lNAME. This is the last
+# element of library_names_spec in libtool.m4, or possibly two of them if the
+# linker has special search rules.
+library_names_spec= # the last element of library_names_spec in libtool.m4
 libname_spec='lib$name'
 case "$host_os" in
 aix3*)
+ library_names_spec='$libname.a'
 ;;
- aix4* | aix5*)
+ aix[4-9]*)
+ library_names_spec='$libname$shrext'
 ;;
 amigaos*)
+ library_names_spec='$libname.a'
 ;;
 beos*)
+ library_names_spec='$libname$shrext'
 ;;
 bsdi[45]*)
+ library_names_spec='$libname$shrext'
 ;;
- cygwin* | mingw* | pw32*)
+ cygwin* | mingw* | pw32* | cegcc*)
 shrext=.dll
+ library_names_spec='$libname.dll.a $libname.lib'
 ;;
 darwin* | rhapsody*)
 shrext=.dylib
+ library_names_spec='$libname$shrext'
 ;;
 dgux*)
+ library_names_spec='$libname$shrext'
 ;;
 freebsd1*)
 ;;
- kfreebsd*-gnu)
- ;;
 freebsd* | dragonfly*)
+ case "$host_os" in
+ freebsd[123]*)
+ library_names_spec='$libname$shrext$versuffix' ;;
+ *)
+ library_names_spec='$libname$shrext' ;;
+ esac
 ;;
 gnu*)
+ library_names_spec='$libname$shrext'
 ;;
 hpux9* | hpux10* | hpux11*)
 case $host_cpu in
@@ -528,10 +559,13 @@
 shrext=.sl
 ;;
 esac
+ library_names_spec='$libname$shrext'
 ;;
- interix3*)
+ interix[3-9]*)
+ library_names_spec='$libname$shrext'
 ;;
 irix5* | irix6* | nonstopux*)
+ library_names_spec='$libname$shrext'
 case "$host_os" in
 irix5* | nonstopux*)
 libsuff= shlibsuff=
@@ -548,41 +582,59 @@
 ;;
 linux*oldld* | linux*aout* | linux*coff*)
 ;;
- linux*)
+ linux* | k*bsd*-gnu)
+ library_names_spec='$libname$shrext'
 ;;
 knetbsd*-gnu)
+ library_names_spec='$libname$shrext'
 ;;
 netbsd*)
+ library_names_spec='$libname$shrext'
 ;;
 newsos6)
+ library_names_spec='$libname$shrext'
 ;;
 nto-qnx*)
+ library_names_spec='$libname$shrext'
 ;;
 openbsd*)
+ library_names_spec='$libname$shrext$versuffix'
 ;;
 os2*)
 libname_spec='$name'
 shrext=.dll
+ library_names_spec='$libname.a'
 ;;
 osf3* | osf4* | osf5*)
+ library_names_spec='$libname$shrext'
+ ;;
+ rdos*)
 ;;
 solaris*)
+ library_names_spec='$libname$shrext'
 ;;
 sunos4*)
+ library_names_spec='$libname$shrext$versuffix'
 ;;
 sysv4 | sysv4.3*)
+ library_names_spec='$libname$shrext'
 ;;
 sysv4*MP*)
+ library_names_spec='$libname$shrext'
 ;;
 sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ library_names_spec='$libname$shrext'
 ;;
 uts4*)
+ library_names_spec='$libname$shrext'
 ;;
 esac
 
 sed_quote_subst='s/$["`$\\]$/\\\1/g'
 escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
 shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
+escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
 escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
 
 LC_ALL=C sed -e 's/^$[a-zA-Z0-9_]*$=/acl_cv_\1=/' <<EOF
@@ -596,6 +648,12 @@
 # Shared library suffix (normally "so").
 shlibext="$shlibext"
 
+# Format of library name prefix.
+libname_spec="$escaped_libname_spec"
+
+# Library names that the linker finds when passed -lNAME.
+library_names_spec="$escaped_library_names_spec"
+
 # Flag to hardcode \$libdir into a binary during linking.
 # This must work even if \$libdir does not exist.
 hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"

audacious-3.1.1.tar.bz2/config.sub -> audacious-3.2.4.tar.bz2/config.sub Changed

audacious-3.1.1.tar.bz2/configure -> audacious-3.2.4.tar.bz2/configure Changed

@@ -1,17 +1,15 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for audacious 3.1.1.
+# Generated by GNU Autoconf 2.69 for audacious 3.2.4.
 #
 #
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 #
-# (C) 2005-2011 Audacious Team
+# (C) 2005-2012 Audacious Team
 ## -------------------- ##
 ## M4sh Initialization. ##
 ## -------------------- ##
@@ -136,6 +134,31 @@
 # 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.
+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+ _as_can_reexec=no; export _as_can_reexec;
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+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
+ 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 :
 emulate sh
@@ -169,7 +192,8 @@
 else
 exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || 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'\" &&
@@ -214,21 +238,25 @@
 
 
 if test "x$CONFIG_SHELL" != x; then :
- # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	# Preserve -v and -x to the replacement shell.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	case $- in # ((((
-	 *v*x* | *x*v* ) as_opts=-vx ;;
-	 *v* ) as_opts=-v ;;
-	 *x* ) as_opts=-x ;;
-	 * ) as_opts= ;;
-	esac
-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+ 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
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+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
+exit 255
 fi
 
 if test x$as_have_required = xno; then :
@@ -330,6 +358,14 @@
 
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -451,6 +487,10 @@
 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; }
 
+ # 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
+ # in an infinite loop. This has already happened in practice.
+ _as_can_reexec=no; export _as_can_reexec
 # Don't try to exec as it changes $[0], causing all sort of problems
 # (the dirname of $[0] is not the place where we might find the
 # original and so on. Autoconf is especially sensitive to this).
@@ -485,16 +525,16 @@
 # ... 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 -p'.
+ # 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 -p'
+ as_ln_s='cp -pR'
 elif ln conf$$.file conf$$ 2>/dev/null; then
 as_ln_s=ln
 else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
 fi
 else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -506,28 +546,8 @@
 as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
-	test -d "$1/.";
- else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+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'"
@@ -559,8 +579,8 @@
 # Identity of this package.
 PACKAGE_NAME='audacious'
 PACKAGE_TARNAME='audacious'
-PACKAGE_VERSION='3.1.1'
-PACKAGE_STRING='audacious 3.1.1'
+PACKAGE_VERSION='3.2.4'
+PACKAGE_STRING='audacious 3.2.4'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -639,7 +659,6 @@
 AUDACIOUS_PATH
 GTK_LIBS
 GTK_CFLAGS
-HAVE_MSWINDOWS
 POSUB
 LTLIBINTL
 LIBINTL
@@ -662,6 +681,8 @@
 INSTALL_DATA
 INSTALL_SCRIPT
 INSTALL_PROGRAM
+HAVE_MSWINDOWS
+BIGENDIAN
 CLEAN_LIB
 UNINSTALL_LIB
 INSTALL_LIB
@@ -682,15 +703,14 @@
 TERM_SGR0
 TERM_EL
 TPUT
-MOWGLI_LIBS
-MOWGLI_CFLAGS
 CAIRO_LIBS
 CAIRO_CFLAGS
 PANGO_LIBS
 PANGO_CFLAGS
 GTHREAD_LIBS
 GTHREAD_CFLAGS
-PC_REQUIRES
+GMODULE_LIBS
+GMODULE_CFLAGS
 GLIB_LIBS
 GLIB_CFLAGS
 PKG_CONFIG_LIBDIR
@@ -712,6 +732,7 @@
 am__fastdepCCAS_FALSE
 am__fastdepCCAS_TRUE
 CCASDEPMODE
+am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
@@ -821,14 +842,14 @@
 PKG_CONFIG_LIBDIR
 GLIB_CFLAGS
 GLIB_LIBS
+GMODULE_CFLAGS
+GMODULE_LIBS
 GTHREAD_CFLAGS
 GTHREAD_LIBS
 PANGO_CFLAGS
 PANGO_LIBS
 CAIRO_CFLAGS
 CAIRO_LIBS
-MOWGLI_CFLAGS
-MOWGLI_LIBS
 GTK_CFLAGS
 GTK_LIBS
 LIBGUESS_CFLAGS
@@ -1298,8 +1319,6 @@
 if test "x$host_alias" != x; then
 if test "x$build_alias" = x; then
 cross_compiling=maybe
- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used" >&2
 elif test "x$build_alias" != "x$host_alias"; then
 cross_compiling=yes
 fi
@@ -1385,7 +1404,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 3.1.1 to adapt to many kinds of systems.
+\`configure' configures audacious 3.2.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1451,7 +1470,7 @@
 
 if test -n "$ac_init_help"; then
 case $ac_init_help in
- short | recursive ) echo "Configuration of audacious 3.1.1:";;
+ short | recursive ) echo "Configuration of audacious 3.2.4:";;
 esac
 cat <<\_ACEOF
 
@@ -1459,8 +1478,10 @@
 --disable-option-checking ignore unrecognized --enable/--with options
 --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
 --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --disable-dependency-tracking speeds up one-time build
- --enable-dependency-tracking do not reject slow dependency extractors
+ --enable-dependency-tracking
+ do not reject slow dependency extractors
+ --disable-dependency-tracking
+ speeds up one-time build
 --disable-largefile omit support for large files
 --disable-nls do not use Native Language Support
 --disable-rpath do not hardcode runtime library paths
@@ -1505,6 +1526,10 @@
 path overriding pkg-config's built-in search path
 GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config
 GLIB_LIBS linker flags for GLIB, overriding pkg-config
+ GMODULE_CFLAGS
+ C compiler flags for GMODULE, overriding pkg-config
+ GMODULE_LIBS
+ linker flags for GMODULE, overriding pkg-config
 GTHREAD_CFLAGS
 C compiler flags for GTHREAD, overriding pkg-config
 GTHREAD_LIBS
@@ -1515,9 +1540,6 @@
 CAIRO_CFLAGS
 C compiler flags for CAIRO, overriding pkg-config
 CAIRO_LIBS linker flags for CAIRO, overriding pkg-config
- MOWGLI_CFLAGS
- C compiler flags for MOWGLI, overriding pkg-config
- MOWGLI_LIBS linker flags for MOWGLI, overriding pkg-config
 GTK_CFLAGS C compiler flags for GTK, overriding pkg-config
 GTK_LIBS linker flags for GTK, overriding pkg-config
 LIBGUESS_CFLAGS
@@ -1605,14 +1627,14 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
 cat <<\_ACEOF
-audacious configure 3.1.1
-generated by GNU Autoconf 2.68
+audacious configure 3.2.4
+generated by GNU Autoconf 2.69
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 
-(C) 2005-2011 Audacious Team
+(C) 2005-2012 Audacious Team
 _ACEOF
 exit
 fi
@@ -1921,7 +1943,7 @@
 	 test ! -s conftest.err
 } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
+	 test -x conftest$ac_exeext
 }; then :
 ac_retval=0
 else
@@ -2010,8 +2032,8 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by audacious $as_me 3.1.1, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+It was created by audacious $as_me 3.2.4, which was
+generated by GNU Autoconf 2.69. Invocation command line was
 
 $ $0 $@
 
@@ -2363,7 +2385,7 @@
 
 PACKAGE=audacious
 
-VERSION=3.1.1
+VERSION=3.2.4
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2540,7 +2562,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
 break 2
@@ -2580,7 +2602,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
 break 2
@@ -2633,7 +2655,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
 break 2
@@ -2674,7 +2696,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; 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
@@ -2732,7 +2754,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
 break 2
@@ -2776,7 +2798,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
 break 2
@@ -3222,8 +3244,7 @@
 /* end confdefs.h. */
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.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);
@@ -3336,7 +3357,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
 break 2
@@ -3380,7 +3401,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
 break 2
@@ -3593,7 +3614,7 @@
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
 case `$am_make -s -f confmf 2> /dev/null` in #(
 *the\ am__doit\ target*)
 am__include=include
@@ -3626,6 +3647,7 @@
 if test "x$enable_dependency_tracking" != xno; then
 am_depcomp="$ac_aux_dir/depcomp"
 AMDEPBACKSLASH='\'
+ am__nodep='_no'
 fi
 if test "x$enable_dependency_tracking" != xno; then
 AMDEP_TRUE=
@@ -3654,8 +3676,9 @@
 # We make a subdir and do the tests there. Otherwise we can end up
 # making bogus files that we don't know about and never remove. For
 # instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
+ # making a dummy file named 'D' -- because '-MD' means "put the output
+ # in D".
+ rm -rf conftest.dir
 mkdir conftest.dir
 # Copy depcomp to subdir because otherwise we won't find it if we're
 # using a relative directory.
@@ -3687,16 +3710,16 @@
 : > sub/conftest.c
 for i in 1 2 3 4 5 6; do
 echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+ # Solaris 10 /bin/sh.
+ echo '/* dummy */' > sub/conftst$i.h
 done
 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
 # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs
+ # handle '-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs.
 am__obj=sub/conftest.${OBJEXT-o}
 am__minus_obj="-o $am__obj"
 case $depmode in
@@ -3705,16 +3728,16 @@
 test "$am__universal" = false || continue
 ;;
 nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
+ # After this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested.
 if test "x$enable_dependency_tracking" = xyes; then
 	continue
 else
 	break
 fi
 ;;
- msvisualcpp | msvcmsys)
- # This compiler won't grok `-c -o', but also, the minuso test has
+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+ # This compiler won't grok '-c -o', but also, the minuso test has
 # not run yet. These depmodes are late enough in the game, and
 # so weak that their functioning should not be impacted.
 am__obj=conftest.${OBJEXT-o}
@@ -3923,7 +3946,7 @@
 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"
- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+ 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
@@ -3989,7 +4012,7 @@
 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"
- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+ 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
@@ -4586,6 +4609,8 @@
 esac
 rm -rf conftest*
 fi
+
+
 fi
 
 
@@ -4615,7 +4640,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -4658,7 +4683,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ 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
 break 2
@@ -4717,7 +4742,7 @@
 
 
 if test "x$GCC" = "xyes"; then
- CFLAGS="$CFLAGS -Wall -pipe"
+ CFLAGS="$CFLAGS -std=gnu99 -Wall -pipe"
 CXXFLAGS="$CXXFLAGS -Wall -pipe"
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C/C++ compiler supports -Wtype-limits" >&5
@@ -4759,7 +4784,7 @@
 *linux*)
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
- LDFLAGS="$LDFLAGS -z defs"
+ LDFLAGS="$LDFLAGS -Wl,-z,defs"
 ;;
 *)
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -4852,7 +4877,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ 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
 break 2
@@ -4892,7 +4917,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ 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
 break 2
@@ -4932,7 +4957,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ 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
 break 2
@@ -4972,7 +4997,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ 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
 break 2
@@ -5012,7 +5037,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_path_TR="$as_dir/$ac_word$ac_exec_ext"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -5052,7 +5077,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ 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
 break 2
@@ -5092,7 +5117,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ 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
 break 2
@@ -5229,32 +5254,24 @@
 $as_echo "yes" >&6; }
 
 
- if test "x$PC_REQUIRES" = "x"; then
- PC_REQUIRES="glib-2.0 >= 2.16"
- else
- PC_REQUIRES="$PC_REQUIRES, glib-2.0 >= 2.16"
- fi
-
-
-
 fi
 
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTHREAD" >&5
-$as_echo_n "checking for GTHREAD... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GMODULE" >&5
+$as_echo_n "checking for GMODULE... " >&6; }
 
-if test -n "$GTHREAD_CFLAGS"; then
- pkg_cv_GTHREAD_CFLAGS="$GTHREAD_CFLAGS"
+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 \"gthread-2.0 >= 2.16\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gthread-2.0 >= 2.16") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0 >= 2.16\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gmodule-2.0 >= 2.16") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_GTHREAD_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0 >= 2.16" 2>/dev/null`
+ pkg_cv_GMODULE_CFLAGS=`$PKG_CONFIG --cflags "gmodule-2.0 >= 2.16" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -5262,16 +5279,16 @@
 else
 pkg_failed=untried
 fi
-if test -n "$GTHREAD_LIBS"; then
- pkg_cv_GTHREAD_LIBS="$GTHREAD_LIBS"
+if test -n "$GMODULE_LIBS"; then
+ 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 \"gthread-2.0 >= 2.16\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gthread-2.0 >= 2.16") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0 >= 2.16\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gmodule-2.0 >= 2.16") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_GTHREAD_LIBS=`$PKG_CONFIG --libs "gthread-2.0 >= 2.16" 2>/dev/null`
+ pkg_cv_GMODULE_LIBS=`$PKG_CONFIG --libs "gmodule-2.0 >= 2.16" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -5292,30 +5309,30 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 GTHREAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gthread-2.0 >= 2.16" 2>&1`
+	 GMODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gmodule-2.0 >= 2.16" 2>&1`
 else
-	 GTHREAD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gthread-2.0 >= 2.16" 2>&1`
+	 GMODULE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gmodule-2.0 >= 2.16" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$GTHREAD_PKG_ERRORS" >&5
+	echo "$GMODULE_PKG_ERRORS" >&5
 
 
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gthread-2.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gmodule-2.0") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 
- cv_pkg_version=`$PKG_CONFIG --modversion "gthread-2.0" 2>/dev/null`
+ cv_pkg_version=`$PKG_CONFIG --modversion "gmodule-2.0" 2>/dev/null`
 as_fn_error $? "
-GThread version $cv_pkg_version was found, but gthread-2.0 >= 2.16 is required.
+GModule version $cv_pkg_version was found, but gmodule-2.0 >= 2.16 is required.
 " "$LINENO" 5
 
 else
 
 as_fn_error $? "
-Cannot find GThread! If you are using binary packages based system, check that you
+Cannot find GModule! If you are using binary packages based system, check that you
 have the corresponding -dev/devel packages installed.
 " "$LINENO" 5
 
@@ -5326,59 +5343,51 @@
 $as_echo "no" >&6; }
 
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gthread-2.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gmodule-2.0") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 
- cv_pkg_version=`$PKG_CONFIG --modversion "gthread-2.0" 2>/dev/null`
+ cv_pkg_version=`$PKG_CONFIG --modversion "gmodule-2.0" 2>/dev/null`
 as_fn_error $? "
-GThread version $cv_pkg_version was found, but gthread-2.0 >= 2.16 is required.
+GModule version $cv_pkg_version was found, but gmodule-2.0 >= 2.16 is required.
 " "$LINENO" 5
 
 else
 
 as_fn_error $? "
-Cannot find GThread! If you are using binary packages based system, check that you
+Cannot find GModule! If you are using binary packages based system, check that you
 have the corresponding -dev/devel packages installed.
 " "$LINENO" 5
 
 fi
 
 else
-	GTHREAD_CFLAGS=$pkg_cv_GTHREAD_CFLAGS
-	GTHREAD_LIBS=$pkg_cv_GTHREAD_LIBS
+	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; }
 
 
- if test "x$PC_REQUIRES" = "x"; then
- PC_REQUIRES="gthread-2.0 >= 2.16"
- else
- PC_REQUIRES="$PC_REQUIRES, gthread-2.0 >= 2.16"
- fi
-
-
-
 fi
 
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PANGO" >&5
-$as_echo_n "checking for PANGO... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTHREAD" >&5
+$as_echo_n "checking for GTHREAD... " >&6; }
 
-if test -n "$PANGO_CFLAGS"; then
- pkg_cv_PANGO_CFLAGS="$PANGO_CFLAGS"
+if test -n "$GTHREAD_CFLAGS"; then
+ pkg_cv_GTHREAD_CFLAGS="$GTHREAD_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pango >= 1.20\""; } >&5
- ($PKG_CONFIG --exists --print-errors "pango >= 1.20") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0 >= 2.16\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gthread-2.0 >= 2.16") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.20" 2>/dev/null`
+ pkg_cv_GTHREAD_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0 >= 2.16" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -5386,16 +5395,16 @@
 else
 pkg_failed=untried
 fi
-if test -n "$PANGO_LIBS"; then
- pkg_cv_PANGO_LIBS="$PANGO_LIBS"
+if test -n "$GTHREAD_LIBS"; then
+ pkg_cv_GTHREAD_LIBS="$GTHREAD_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pango >= 1.20\""; } >&5
- ($PKG_CONFIG --exists --print-errors "pango >= 1.20") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0 >= 2.16\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gthread-2.0 >= 2.16") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_PANGO_LIBS=`$PKG_CONFIG --libs "pango >= 1.20" 2>/dev/null`
+ pkg_cv_GTHREAD_LIBS=`$PKG_CONFIG --libs "gthread-2.0 >= 2.16" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -5416,30 +5425,30 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 PANGO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "pango >= 1.20" 2>&1`
+	 GTHREAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gthread-2.0 >= 2.16" 2>&1`
 else
-	 PANGO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "pango >= 1.20" 2>&1`
+	 GTHREAD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gthread-2.0 >= 2.16" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$PANGO_PKG_ERRORS" >&5
+	echo "$GTHREAD_PKG_ERRORS" >&5
 
 
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pango\""; } >&5
- ($PKG_CONFIG --exists --print-errors "pango") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gthread-2.0") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 
- cv_pkg_version=`$PKG_CONFIG --modversion "pango" 2>/dev/null`
+ cv_pkg_version=`$PKG_CONFIG --modversion "gthread-2.0" 2>/dev/null`
 as_fn_error $? "
-Pango version $cv_pkg_version was found, but pango >= 1.20 is required.
+GThread version $cv_pkg_version was found, but gthread-2.0 >= 2.16 is required.
 " "$LINENO" 5
 
 else
 
 as_fn_error $? "
-Cannot find Pango! If you are using binary packages based system, check that you
+Cannot find GThread! If you are using binary packages based system, check that you
 have the corresponding -dev/devel packages installed.
 " "$LINENO" 5
 
@@ -5450,59 +5459,51 @@
 $as_echo "no" >&6; }
 
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pango\""; } >&5
- ($PKG_CONFIG --exists --print-errors "pango") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gthread-2.0") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 
- cv_pkg_version=`$PKG_CONFIG --modversion "pango" 2>/dev/null`
+ cv_pkg_version=`$PKG_CONFIG --modversion "gthread-2.0" 2>/dev/null`
 as_fn_error $? "
-Pango version $cv_pkg_version was found, but pango >= 1.20 is required.
+GThread version $cv_pkg_version was found, but gthread-2.0 >= 2.16 is required.
 " "$LINENO" 5
 
 else
 
 as_fn_error $? "
-Cannot find Pango! If you are using binary packages based system, check that you
+Cannot find GThread! If you are using binary packages based system, check that you
 have the corresponding -dev/devel packages installed.
 " "$LINENO" 5
 
 fi
 
 else
-	PANGO_CFLAGS=$pkg_cv_PANGO_CFLAGS
-	PANGO_LIBS=$pkg_cv_PANGO_LIBS
+	GTHREAD_CFLAGS=$pkg_cv_GTHREAD_CFLAGS
+	GTHREAD_LIBS=$pkg_cv_GTHREAD_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
 
- if test "x$PC_REQUIRES" = "x"; then
- PC_REQUIRES="pango >= 1.20"
- else
- PC_REQUIRES="$PC_REQUIRES, pango >= 1.20"
- fi
-
-
-
 fi
 
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CAIRO" >&5
-$as_echo_n "checking for CAIRO... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PANGO" >&5
+$as_echo_n "checking for PANGO... " >&6; }
 
-if test -n "$CAIRO_CFLAGS"; then
- pkg_cv_CAIRO_CFLAGS="$CAIRO_CFLAGS"
+if test -n "$PANGO_CFLAGS"; then
+ pkg_cv_PANGO_CFLAGS="$PANGO_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo >= 1.6\""; } >&5
- ($PKG_CONFIG --exists --print-errors "cairo >= 1.6") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pango >= 1.20\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "pango >= 1.20") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= 1.6" 2>/dev/null`
+ pkg_cv_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.20" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -5510,16 +5511,16 @@
 else
 pkg_failed=untried
 fi
-if test -n "$CAIRO_LIBS"; then
- pkg_cv_CAIRO_LIBS="$CAIRO_LIBS"
+if test -n "$PANGO_LIBS"; then
+ pkg_cv_PANGO_LIBS="$PANGO_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo >= 1.6\""; } >&5
- ($PKG_CONFIG --exists --print-errors "cairo >= 1.6") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pango >= 1.20\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "pango >= 1.20") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_CAIRO_LIBS=`$PKG_CONFIG --libs "cairo >= 1.6" 2>/dev/null`
+ pkg_cv_PANGO_LIBS=`$PKG_CONFIG --libs "pango >= 1.20" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -5540,30 +5541,30 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 CAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "cairo >= 1.6" 2>&1`
+	 PANGO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "pango >= 1.20" 2>&1`
 else
-	 CAIRO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "cairo >= 1.6" 2>&1`
+	 PANGO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "pango >= 1.20" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$CAIRO_PKG_ERRORS" >&5
+	echo "$PANGO_PKG_ERRORS" >&5
 
 
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo\""; } >&5
- ($PKG_CONFIG --exists --print-errors "cairo") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pango\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "pango") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 
- cv_pkg_version=`$PKG_CONFIG --modversion "cairo" 2>/dev/null`
+ cv_pkg_version=`$PKG_CONFIG --modversion "pango" 2>/dev/null`
 as_fn_error $? "
-Cairo version $cv_pkg_version was found, but cairo >= 1.6 is required.
+Pango version $cv_pkg_version was found, but pango >= 1.20 is required.
 " "$LINENO" 5
 
 else
 
 as_fn_error $? "
-Cannot find Cairo! If you are using binary packages based system, check that you
+Cannot find Pango! If you are using binary packages based system, check that you
 have the corresponding -dev/devel packages installed.
 " "$LINENO" 5
 
@@ -5574,60 +5575,51 @@
 $as_echo "no" >&6; }
 
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo\""; } >&5
- ($PKG_CONFIG --exists --print-errors "cairo") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pango\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "pango") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 
- cv_pkg_version=`$PKG_CONFIG --modversion "cairo" 2>/dev/null`
+ cv_pkg_version=`$PKG_CONFIG --modversion "pango" 2>/dev/null`
 as_fn_error $? "
-Cairo version $cv_pkg_version was found, but cairo >= 1.6 is required.
+Pango version $cv_pkg_version was found, but pango >= 1.20 is required.
 " "$LINENO" 5
 
 else
 
 as_fn_error $? "
-Cannot find Cairo! If you are using binary packages based system, check that you
+Cannot find Pango! If you are using binary packages based system, check that you
 have the corresponding -dev/devel packages installed.
 " "$LINENO" 5
 
 fi
 
 else
-	CAIRO_CFLAGS=$pkg_cv_CAIRO_CFLAGS
-	CAIRO_LIBS=$pkg_cv_CAIRO_LIBS
+	PANGO_CFLAGS=$pkg_cv_PANGO_CFLAGS
+	PANGO_LIBS=$pkg_cv_PANGO_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
 
- if test "x$PC_REQUIRES" = "x"; then
- PC_REQUIRES="cairo >= 1.6"
- else
- PC_REQUIRES="$PC_REQUIRES, cairo >= 1.6"
- fi
-
-
-
 fi
 
 
 
-
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MOWGLI" >&5
-$as_echo_n "checking for MOWGLI... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CAIRO" >&5
+$as_echo_n "checking for CAIRO... " >&6; }
 
-if test -n "$MOWGLI_CFLAGS"; then
- pkg_cv_MOWGLI_CFLAGS="$MOWGLI_CFLAGS"
+if test -n "$CAIRO_CFLAGS"; then
+ pkg_cv_CAIRO_CFLAGS="$CAIRO_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmowgli >= 0.9\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libmowgli >= 0.9") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo >= 1.6\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "cairo >= 1.6") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_MOWGLI_CFLAGS=`$PKG_CONFIG --cflags "libmowgli >= 0.9" 2>/dev/null`
+ pkg_cv_CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= 1.6" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -5635,16 +5627,16 @@
 else
 pkg_failed=untried
 fi
-if test -n "$MOWGLI_LIBS"; then
- pkg_cv_MOWGLI_LIBS="$MOWGLI_LIBS"
+if test -n "$CAIRO_LIBS"; then
+ pkg_cv_CAIRO_LIBS="$CAIRO_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmowgli >= 0.9\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libmowgli >= 0.9") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo >= 1.6\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "cairo >= 1.6") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_MOWGLI_LIBS=`$PKG_CONFIG --libs "libmowgli >= 0.9" 2>/dev/null`
+ pkg_cv_CAIRO_LIBS=`$PKG_CONFIG --libs "cairo >= 1.6" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -5665,32 +5657,32 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 MOWGLI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmowgli >= 0.9" 2>&1`
+	 CAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "cairo >= 1.6" 2>&1`
 else
-	 MOWGLI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmowgli >= 0.9" 2>&1`
+	 CAIRO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "cairo >= 1.6" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$MOWGLI_PKG_ERRORS" >&5
+	echo "$CAIRO_PKG_ERRORS" >&5
 
 
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmowgli\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libmowgli") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "cairo") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 
- cv_pkg_version=`$PKG_CONFIG --modversion "libmowgli" 2>/dev/null`
+ cv_pkg_version=`$PKG_CONFIG --modversion "cairo" 2>/dev/null`
 as_fn_error $? "
-libmowgli version $cv_pkg_version was found, but libmowgli >= 0.9 is required.
-http://www.atheme.org/projects/mowgli.shtml" "$LINENO" 5
+Cairo version $cv_pkg_version was found, but cairo >= 1.6 is required.
+" "$LINENO" 5
 
 else
 
 as_fn_error $? "
-Cannot find libmowgli! If you are using binary packages based system, check that you
+Cannot find Cairo! If you are using binary packages based system, check that you
 have the corresponding -dev/devel packages installed.
-http://www.atheme.org/projects/mowgli.shtml" "$LINENO" 5
+" "$LINENO" 5
 
 fi
 
@@ -5699,41 +5691,33 @@
 $as_echo "no" >&6; }
 
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmowgli\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libmowgli") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "cairo") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 
- cv_pkg_version=`$PKG_CONFIG --modversion "libmowgli" 2>/dev/null`
+ cv_pkg_version=`$PKG_CONFIG --modversion "cairo" 2>/dev/null`
 as_fn_error $? "
-libmowgli version $cv_pkg_version was found, but libmowgli >= 0.9 is required.
-http://www.atheme.org/projects/mowgli.shtml" "$LINENO" 5
+Cairo version $cv_pkg_version was found, but cairo >= 1.6 is required.
+" "$LINENO" 5
 
 else
 
 as_fn_error $? "
-Cannot find libmowgli! If you are using binary packages based system, check that you
+Cannot find Cairo! If you are using binary packages based system, check that you
 have the corresponding -dev/devel packages installed.
-http://www.atheme.org/projects/mowgli.shtml" "$LINENO" 5
+" "$LINENO" 5
 
 fi
 
 else
-	MOWGLI_CFLAGS=$pkg_cv_MOWGLI_CFLAGS
-	MOWGLI_LIBS=$pkg_cv_MOWGLI_LIBS
+	CAIRO_CFLAGS=$pkg_cv_CAIRO_CFLAGS
+	CAIRO_LIBS=$pkg_cv_CAIRO_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
 
- if test "x$PC_REQUIRES" = "x"; then
- PC_REQUIRES="libmowgli >= 0.9"
- else
- PC_REQUIRES="$PC_REQUIRES, libmowgli >= 0.9"
- fi
-
-
-
 fi
 
 
@@ -5758,7 +5742,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ 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
 break 2
@@ -5947,6 +5931,261 @@
 
 
 
+CFLAGS="$CFLAGS -Wno-deprecated-declarations"
+
+ { $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
+ # See if we're dealing with a universal compiler.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#ifndef __APPLE_CC__
+	 not a universal capable compiler
+	 #endif
+	 typedef int dummy;
+
+_ACEOF
+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.
+	ac_arch=
+	ac_prev=
+	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
+	 if test -n "$ac_prev"; then
+	 case $ac_word in
+	 i?86 | x86_64 | ppc | ppc64)
+	 if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
+		 ac_arch=$ac_word
+	 else
+		 ac_cv_c_bigendian=universal
+		 break
+	 fi
+	 ;;
+	 esac
+	 ac_prev=
+	 elif test "x$ac_word" = "x-arch"; then
+	 ac_prev=arch
+	 fi
+ done
+fi
+rm -f core conftest.err conftest.$ac_objext 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
+/* end confdefs.h. */
+#include <sys/types.h>
+	 #include <sys/param.h>
+
+int
+main ()
+{
+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
+		 && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
+		 && LITTLE_ENDIAN)
+	 bogus endian macros
+	 #endif
+
+ ;
+ return 0;
+}
+_ACEOF
+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 <sys/types.h>
+		#include <sys/param.h>
+
+int
+main ()
+{
+#if BYTE_ORDER != BIG_ENDIAN
+		 not big endian
+		#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_c_bigendian=yes
+else
+ ac_cv_c_bigendian=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext 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).
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <limits.h>
+
+int
+main ()
+{
+#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
+	 bogus endian macros
+	 #endif
+
+ ;
+ return 0;
+}
+_ACEOF
+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 ()
+{
+#ifndef _BIG_ENDIAN
+		 not big endian
+		#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_c_bigendian=yes
+else
+ ac_cv_c_bigendian=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ if test $ac_cv_c_bigendian = unknown; then
+ # Compile a test program.
+ 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[] =
+		 { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+		short int ascii_ii[] =
+		 { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+		int use_ascii (int i) {
+		 return ascii_mm[i] + ascii_ii[i];
+		}
+		short int ebcdic_ii[] =
+		 { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+		short int ebcdic_mm[] =
+		 { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+		int use_ebcdic (int i) {
+		 return ebcdic_mm[i] + ebcdic_ii[i];
+		}
+		extern int foo;
+
+int
+main ()
+{
+return use_ascii (foo) == use_ebcdic (foo);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
+	 ac_cv_c_bigendian=yes
+	 fi
+	 if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+	 if test "$ac_cv_c_bigendian" = unknown; then
+		ac_cv_c_bigendian=no
+	 else
+		# finding both strings is unlikely to happen, but who knows?
+		ac_cv_c_bigendian=unknown
+	 fi
+	 fi
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+
+	 /* Are we little or big endian? From Harbison&Steele. */
+	 union
+	 {
+	 long int l;
+	 char c[sizeof (long int)];
+	 } u;
+	 u.l = 1;
+	 return u.c[sizeof (long int) - 1] == 1;
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ ac_cv_c_bigendian=no
+else
+ ac_cv_c_bigendian=yes
+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_c_bigendian" >&5
+$as_echo "$ac_cv_c_bigendian" >&6; }
+ case $ac_cv_c_bigendian in #(
+ yes)
+ BIGENDIAN=1;; #(
+ no)
+ BIGENDIAN=0 ;; #(
+ universal)
+ as_fn_error $? "Universal builds are not supported, sorry" "$LINENO" 5
+ ;; #(
+ *)
+ as_fn_error $? "Unknown machine byte order" "$LINENO" 5 ;;
+ esac
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Microsoft Windows" >&5
+$as_echo_n "checking for Microsoft Windows... " >&6; }
+case "$target" in
+ *mingw*)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ HAVE_MSWINDOWS="yes"
+ ;;
+ *)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ HAVE_MSWINDOWS="no"
+ ;;
+esac
+
+
+if test "x$HAVE_MSWINDOWS" = "xyes" ; then
+ EXPORT="__declspec(dllexport)"
+elif test "x$GCC" = "xyes" ; then
+ CFLAGS="$CFLAGS -fvisibility=hidden"
+ CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+ EXPORT="__attribute__((visibility(\"default\")))"
+else
+ as_fn_error $? "Unknown syntax for EXPORT keyword" "$LINENO" 5
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define EXPORT $EXPORT
+_ACEOF
+
+
 for ac_header in execinfo.h regex.h rxposix.h rx/rxposix.h
 do :
 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -6053,7 +6292,7 @@
 # by default.
 for ac_prog in ginstall scoinst install; do
 for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$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
 	 # AIX install. It has an incompatible calling convention.
@@ -6122,7 +6361,7 @@
 test -z "$as_dir" && as_dir=.
 for ac_prog in mkdir gmkdir; do
 	 for ac_exec_ext in '' $ac_executable_extensions; do
-	 { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	 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) '* | \
@@ -6151,6 +6390,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
 $as_echo "$MKDIR_P" >&6; }
 
+
 mkdir_p="$MKDIR_P"
 case $mkdir_p in
 [\\/$]* | ?:[\\/]*) ;;
@@ -6265,7 +6505,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ 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
 break 2
@@ -8206,32 +8446,11 @@
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Microsoft Windows" >&5
-$as_echo_n "checking for Microsoft Windows... " >&6; }
-case "$target" in
- *mingw*)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- have_mswindows=yes
- if test "x$use_text_console" = "xno"; then
- LDFLAGS="$LDFLAGS -Wl,-subsystem,windows"
- fi
- ;;
- *)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- have_mswindows=no
- ;;
-esac
-
-if test "x${have_mswindows}" = "xyes" ; then
- HAVE_MSWINDOWS="yes"
-else
- HAVE_MSWINDOWS="no"
+if test "x$HAVE_MSWINDOWS" = "xyes" && test "x$use_text_console" = "xno" ; then
+	LDFLAGS="$LDFLAGS -Wl,-subsystem,windows"
 fi
 
 
-
 # Check whether --enable-gtk3 was given.
 if test "${enable_gtk3+set}" = set; then :
 enableval=$enable_gtk3; use_gtk3=$enableval
@@ -8388,26 +8607,6 @@
 fi
 fi
 
-if test $use_gtk3 = yes ; then
-
- if test "x$PC_REQUIRES" = "x"; then
- PC_REQUIRES="gtk+-3.0 >= 3.0.0"
- else
- PC_REQUIRES="$PC_REQUIRES, gtk+-3.0 >= 3.0.0"
- fi
-
-
-else
-
- if test "x$PC_REQUIRES" = "x"; then
- PC_REQUIRES="gtk+-2.0 >= 2.12.0"
- else
- PC_REQUIRES="$PC_REQUIRES, gtk+-2.0 >= 2.12.0"
- fi
-
-
-fi
-
 
 
 
@@ -8430,7 +8629,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_path_AUDACIOUS_PATH="$as_dir/$ac_word$ac_exec_ext"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -8507,12 +8706,12 @@
 pkg_cv_LIBGUESS_CFLAGS="$LIBGUESS_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libguess\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libguess") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libguess >= 1.1\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libguess >= 1.1") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_LIBGUESS_CFLAGS=`$PKG_CONFIG --cflags "libguess" 2>/dev/null`
+ pkg_cv_LIBGUESS_CFLAGS=`$PKG_CONFIG --cflags "libguess >= 1.1" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -8524,12 +8723,12 @@
 pkg_cv_LIBGUESS_LIBS="$LIBGUESS_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libguess\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libguess") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libguess >= 1.1\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libguess >= 1.1") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_LIBGUESS_LIBS=`$PKG_CONFIG --libs "libguess" 2>/dev/null`
+ pkg_cv_LIBGUESS_LIBS=`$PKG_CONFIG --libs "libguess >= 1.1" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -8550,9 +8749,9 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 LIBGUESS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libguess" 2>&1`
+	 LIBGUESS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libguess >= 1.1" 2>&1`
 else
-	 LIBGUESS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libguess" 2>&1`
+	 LIBGUESS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libguess >= 1.1" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LIBGUESS_PKG_ERRORS" >&5
@@ -8686,7 +8885,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_path_DBUS_BINDING_TOOL="$as_dir/$ac_word$ac_exec_ext"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -8727,7 +8926,7 @@
 IFS=$as_save_IFS
 test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_path_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext"
 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
@@ -8754,22 +8953,6 @@
 enable_dbus="no"
 else
 
- if test "x$PC_REQUIRES" = "x"; then
- PC_REQUIRES="dbus-1 >= 0.60"
- else
- PC_REQUIRES="$PC_REQUIRES, dbus-1 >= 0.60"
- fi
-
-
-
- if test "x$PC_REQUIRES" = "x"; then
- PC_REQUIRES="dbus-glib-1 >= 0.60"
- else
- PC_REQUIRES="$PC_REQUIRES, dbus-glib-1 >= 0.60"
- fi
-
-
-
 $as_echo "#define USE_DBUS 1" >>confdefs.h
 
 LIBAUDCLIENT_LDFLAGS="-laudclient"
@@ -8921,14 +9104,6 @@
 $as_echo "yes" >&6; }
 
 
- if test "x$PC_REQUIRES" = "x"; then
- PC_REQUIRES="libpcre >= 6.7"
- else
- PC_REQUIRES="$PC_REQUIRES, libpcre >= 6.7"
- fi
-
-
-
 fi
 
 
@@ -9613,7 +9788,7 @@
 
 
 ### ---------------------------------------------------------------------------
-ac_config_files="$ac_config_files audacious.pc audclient.pc buildsys.mk extra.mk man/audtool.1 man/audacious.1"
+ac_config_files="$ac_config_files audacious.pc audclient.pc buildsys.mk extra.mk man/audtool.1 man/audacious.1 src/libaudcore/audio.h"
 
 
 
@@ -10040,16 +10215,16 @@
 # ... 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 -p'.
+ # 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 -p'
+ as_ln_s='cp -pR'
 elif ln conf$$.file conf$$ 2>/dev/null; then
 as_ln_s=ln
 else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
 fi
 else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -10109,28 +10284,16 @@
 as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
-	test -d "$1/.";
- else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+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'"
@@ -10151,8 +10314,8 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by audacious $as_me 3.1.1, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+This file was extended by audacious $as_me 3.2.4, which was
+generated by GNU Autoconf 2.69. Invocation command line was
 
 CONFIG_FILES = $CONFIG_FILES
 CONFIG_HEADERS = $CONFIG_HEADERS
@@ -10217,11 +10380,11 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-audacious config.status 3.1.1
-configured by $0, generated by GNU Autoconf 2.68,
+audacious config.status 3.2.4
+configured by $0, generated by GNU Autoconf 2.69,
 with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -10311,7 +10474,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
 shift
 \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
 CONFIG_SHELL='$SHELL'
@@ -10361,6 +10524,7 @@
 "extra.mk") CONFIG_FILES="$CONFIG_FILES extra.mk" ;;
 "man/audtool.1") CONFIG_FILES="$CONFIG_FILES man/audtool.1" ;;
 "man/audacious.1") CONFIG_FILES="$CONFIG_FILES man/audacious.1" ;;
+ "src/libaudcore/audio.h") CONFIG_FILES="$CONFIG_FILES src/libaudcore/audio.h" ;;
 
 *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
 esac
@@ -10936,7 +11100,7 @@
 # Strip MF so we end up with the name of the file.
 mf=`echo "$mf" | sed -e 's/:.*$//'`
 # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
+ # We used to match only the files named 'Makefile.in', but
 # some people rename them; so instead we look at the file content.
 # Grep'ing the first line is not enough: some people post-process
 # each Makefile.in and add a new line on top of each file to say so.
@@ -10970,21 +11134,19 @@
 continue
 fi
 # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
+ # from the Makefile without running 'make'.
 DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
 test -z "$DEPDIR" && continue
 am__include=`sed -n 's/^am__include = //p' < "$mf"`
 test -z "am__include" && continue
 am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
 # Find all dependency output files, they are included files with
 # $(DEPDIR) in their names. We invoke sed twice because it is the
 # simplest approach to changing $(DEPDIR) to its actual value in the
 # expansion.
 for file in `sed -n "
 s/^$am__include $am__quote$.*(DEPDIR).*$$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
 # Make sure the directory exists.
 test -f "$dirpart/$file" && continue
 fdir=`$as_dirname -- "$file" ||

audacious-3.1.1.tar.bz2/configure.ac -> audacious-3.2.4.tar.bz2/configure.ac Changed

@@ -5,8 +5,8 @@
 dnl Initialize
 dnl ==========
 AC_PREREQ([2.59])
-AC_INIT([audacious], [3.1.1])
-AC_COPYRIGHT([(C) 2005-2011 Audacious Team])
+AC_INIT([audacious], [3.2.4])
+AC_COPYRIGHT([(C) 2005-2012 Audacious Team])
 
 AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])
 AC_SUBST([VERSION], [AC_PACKAGE_VERSION])
@@ -22,6 +22,45 @@
 BUILDSYS_INIT
 BUILDSYS_SHARED_LIB
 
+dnl This is legacy branch; disable deprecation warnings
+dnl ===================================================
+CFLAGS="$CFLAGS -Wno-deprecated-declarations"
+
+dnl Byte order
+dnl ==========
+AC_C_BIGENDIAN([BIGENDIAN=1], [BIGENDIAN=0],
+ [AC_MSG_ERROR([Unknown machine byte order])],
+ [AC_MSG_ERROR([Universal builds are not supported, sorry])])
+AC_SUBST([BIGENDIAN])
+
+dnl Platform
+dnl ========
+AC_MSG_CHECKING([for Microsoft Windows])
+case "$target" in
+    *mingw*)
+        AC_MSG_RESULT([yes])
+        HAVE_MSWINDOWS="yes"
+        ;;
+    *)
+        AC_MSG_RESULT([no])
+        HAVE_MSWINDOWS="no"
+        ;;
+esac
+AC_SUBST([HAVE_MSWINDOWS])
+
+dnl Prevent symbol collisions
+dnl =========================
+if test "x$HAVE_MSWINDOWS" = "xyes" ; then
+    EXPORT="__declspec(dllexport)"
+elif test "x$GCC" = "xyes" ; then
+    CFLAGS="$CFLAGS -fvisibility=hidden"
+    CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+    EXPORT="__attribute__((visibility(\"default\")))"
+else
+    AC_MSG_ERROR([Unknown syntax for EXPORT keyword])
+fi
+AC_DEFINE_UNQUOTED([EXPORT], [$EXPORT], [Define to compiler syntax for public symbols])
+
 dnl Headers and functions
 dnl ===============================
 AC_CHECK_HEADERS([execinfo.h regex.h rxposix.h rx/rxposix.h])
@@ -68,22 +107,9 @@
 [use_text_console=no]
 )
 
-AC_MSG_CHECKING([for Microsoft Windows])
-case "$target" in
-    *mingw*)
-        AC_MSG_RESULT([yes])
-        have_mswindows=yes
-        if test "x$use_text_console" = "xno"; then
-            LDFLAGS="$LDFLAGS -Wl,-subsystem,windows"
-        fi
-        ;;
-    *)
-        AC_MSG_RESULT([no])
-        have_mswindows=no
-        ;;
-esac
-
-AUD_CONDITIONAL([HAVE_MSWINDOWS], [have_mswindows])
+if test "x$HAVE_MSWINDOWS" = "xyes" && test "x$use_text_console" = "xno" ; then
+	LDFLAGS="$LDFLAGS -Wl,-subsystem,windows"
+fi
 
 dnl Check for GTK+
 dnl ==============
@@ -101,12 +127,6 @@
      AC_MSG_ERROR([Cannot find GTK headers.  Aborting ...]))
 fi
 
-if test $use_gtk3 = yes ; then
-    ADD_PC_REQUIRES([gtk+-3.0 >= 3.0.0])
-else
-    ADD_PC_REQUIRES([gtk+-2.0 >= 2.12.0])
-fi
-
 AC_SUBST([GTK_LIBS])
 AC_SUBST([GTK_CFLAGS])
 
@@ -134,7 +154,7 @@
 AUD_ARG_ENABLE([chardet], [yes],
 [charset detection support],
 [
-    PKG_CHECK_MODULES([LIBGUESS], [libguess], [enable_chardet=yes], [enable_chardet=no])
+    PKG_CHECK_MODULES([LIBGUESS], [libguess >= 1.1], [enable_chardet=yes], [enable_chardet=no])
 
     if test "x$enable_chardet" = "xyes"; then
         AC_DEFINE([USE_CHARDET], 1, [Define if character set detection enabled])
@@ -158,8 +178,6 @@
     if test "x$DBUS_BINDING_TOOL" = "xno" || test "x$GLIB_GENMARSHAL" = "xno" || test "x$enable_dbus" = "xno" ; then
         enable_dbus="no"
     else
-        ADD_PC_REQUIRES([dbus-1 >= 0.60])
-        ADD_PC_REQUIRES([dbus-glib-1 >= 0.60])
         AC_DEFINE([USE_DBUS], 1, [Define if D-Bus support enabled])
         LIBAUDCLIENT_LDFLAGS="-laudclient"
         AC_SUBST([DBUS_CFLAGS])
@@ -319,6 +337,7 @@
     extra.mk
     man/audtool.1
     man/audacious.1
+    src/libaudcore/audio.h
 ])
 
 BUILDSYS_TOUCH_DEPS

audacious-3.1.1.tar.bz2/contrib/win32/notes.rtf -> audacious-3.2.4.tar.bz2/contrib/win32/notes.rtf Changed

@@ -2,7 +2,7 @@
 {\b Notes for Building Audacious on Windows}
 \par
 \par {John Lindgren}
-\par {November 7, 2011}
+\par {May 24, 2012}
 \par
 \par {This is not intended to be a complete set of instructions, but merely an outline.  Use at your own risk, etc., etc.}
 \par
@@ -24,22 +24,16 @@
 \par {\ul Install GTK+}
 \par
 \par {Download and unzip to }{\fs20 C:\\GTK}{:}
-\par {\fs20 http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.22/gtk+-bundle_2.22.1-20101227_win32.zip}
+\par {\fs20 http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.24/gtk+-bundle_2.24.8-20111122_win32.zip}
 \par
-\par {GTK+ 2.22 supports only Windows XP and newer.  If you have Windows 2000, use GTK+ 2.16 instead:}
-\par {\fs20 http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.16/gtk+-bundle_2.16.5-20090731_win32.zip}
-\par
-\par {Copy }{\fs20 C:\\GTK\\share\\themes\\MS-Windows\\gtk-2.0\\gtkrc}{ to }{\fs20 C:\\GTK\\etc\\gtk-2.0}{.  Apply the patch }{\fs20 gtkrc.diff}{.}
 \par {Copy }{\fs20 C:\\GTK\\share\\aclocal\\pkg.m4}{ to }{\fs20 C:\\MinGW\\share\\aclocal}{.}
+\par {Apply the patch }{\fs20 gtkrc.diff}{ to }{\fs20 C:\\GTK\\share\\themes\\MS-Windows\\gtk-2.0\\gtkrc}{.}
 \par
 \par {\ul Install SDL}
 \par
 \par {Download and unzip to }{\fs20 C:\\libs}{:}
 \par {\fs20 http://www.libsdl.org/release/SDL-devel-1.2.14-mingw32.tar.gz}
 \par
-\par {Apply the patch }{\fs20 sdl-config.diff}{ to }{\fs20 C:\\libs\\bin\\sdl-config}{.}
-\par {Copy }{\fs20 C:\\libs\\share\\aclocal\\sdl.m4}{ to }{\fs20 C:\\MinGW\\share\\aclocal}{.}
-\par
 \par {\ul Set up system paths}
 \par
 \par {Under }{\fs20 My Computer -> Properties -> Advanced -> Environment Variables}{, set:}
@@ -51,29 +45,23 @@
 \par
 \par {\ul Install libxml}
 \par
-\par {Download and unzip to }{\fs20 C:\\libs}{:}
-\par {\fs20 http://sourceforge.net/projects/mingw/files/MSYS/libxml2/libxml2-2.7.6-1/libxml2-2.7.6-1-msys-1.0.13-dev.tar.lzma/download}
-\par {\fs20 http://sourceforge.net/projects/mingw/files/MSYS/libxml2/libxml2-2.7.6-1/libxml2-2.7.6-1-msys-1.0.13-dll-2.tar.lzma/download}
-\par
-\par {Apply the patch }{\fs20 xml2-config.diff}{ to }{\fs20 C:\\libs\\bin\\xml2-config}{.}
+\par {Download and unzip to }{\fs20 C:\\libxml}{:}
+\par {\fs20 ftp://xmlsoft.org/libxml2/libxml2-2.7.8.tar.gz}
 \par
-\par {\ul Install regex}
-\par
-\par {Download and unzip to }{\fs20 C:\\libs}{:}
-\par {\fs20 http://sourceforge.net/projects/mingw/files/UserContributed/regex/mingw-regex-2.5.1/mingw-libgnurx-2.5.1-dev.tar.gz/download}
-\par {\fs20 http://sourceforge.net/projects/mingw/files/UserContributed/regex/mingw-regex-2.5.1/mingw-libgnurx-2.5.1-bin.tar.gz/download}
-\par
-\par {\ul Install libmowgli}
-\par
-\par {Download and unzip to }{\fs20 C:\\libmowgli}{:}
-\par {\fs20 http://distfiles.atheme.org/libmowgli-0.9.95.tar.bz2}
+\par {Apply the patch }{\fs20 libxml-testThreads.c.diff}{ to }{\fs20 C:\\libxml\\testThreads.c}{.}
 \par
 \par {In the MinGW shell:}
-\par {\fs20 cd /C/libmowgli}
+\par {\fs20 cd /C/libxml}
 \par {\fs20 ./configure --prefix=/C/libs}
 \par {\fs20 make}
 \par {\fs20 make install}
 \par
+\par {\ul Install regex}
+\par
+\par {Download and unzip to }{\fs20 C:\\libs}{:}
+\par {\fs20 http://sourceforge.net/projects/mingw/files/Other/UserContributed/regex/mingw-regex-2.5.1/mingw-libgnurx-2.5.1-dev.tar.gz/download}
+\par {\fs20 http://sourceforge.net/projects/mingw/files/Other/UserContributed/regex/mingw-regex-2.5.1/mingw-libgnurx-2.5.1-bin.tar.gz/download}
+\par
 \par {\ul Install mpg123}
 \par
 \par {Download and unzip to }{\fs20 C:\\mpg123}{:}
@@ -158,7 +146,7 @@
 \par {\ul Install LAME}
 \par
 \par {Download and unzip to }{\fs20 C:\\lame}{:}
-\par {\fs20 http://sourceforge.net/projects/lame/files/lame/3.99/lame-3.99.1.tar.gz/download}
+\par {\fs20 http://sourceforge.net/projects/lame/files/lame/3.99/lame-3.99.3.tar.gz/download}
 \par
 \par {In the MinGW shell:}
 \par {\fs20 cd /C/lame}
@@ -244,7 +232,7 @@
 \par {\ul Install FFmpeg}
 \par
 \par {Download and unzip to }{\fs20 C:\\ffmpeg}{:}
-\par {\fs20 http://ffmpeg.org/releases/ffmpeg-0.8.6.tar.bz2}
+\par {\fs20 http://ffmpeg.org/releases/ffmpeg-0.9.tar.bz2}
 \par
 \par {In the MinGW shell:}
 \par {\fs20 cd /C/ffmpeg}
@@ -255,11 +243,10 @@
 \par {\ul Install Audacious}
 \par
 \par {Download and unzip to }{\fs20 C:\\audacious}{:}
-\par {\fs20 http://hg.atheme.org/audacious/audacious/archive/tip.tar.bz2}
+\par {\fs20 http://distfiles.audacious-media-player.org/audacious-3.2.3.tar.bz2}
 \par
 \par {In the MinGW shell:}
 \par {\fs20 cd /C/audacious}
-\par {\fs20 ./autogen.sh}
 \par {\fs20 ./configure --prefix=/C/aud}
 \par {\fs20 make}
 \par {\fs20 make install}
@@ -267,11 +254,12 @@
 \par {\ul Install Audacious plugins}
 \par
 \par {Download and unzip to }{\fs20 C:\\audacious-plugins}{:}
-\par {\fs20 http://hg.atheme.org/audacious-plugins/audacious-plugins/archive/tip.tar.bz2}
+\par {\fs20 http://distfiles.audacious-media-player.org/audacious-plugins-3.2.3.tar.bz2}
 \par
 \par {In the MinGW shell:}
 \par {\fs20 cd /C/audacious-plugins}
-\par {\fs20 ./autogen.sh}
+\par {\fs20 export SDL_CFLAGS="-I/C/libs/include/SDL"}
+\par {\fs20 export SDL_LIBS="-L/C/libs/lib -lSDL"}
 \par {\fs20 ./configure --prefix=/C/aud}
 \par {\fs20 make}
 \par {\fs20 make install}

audacious-3.2.4.tar.bz2/contrib/win32/patches/libxml-testThreads.c.diff Added

audacious-3.1.1.tar.bz2/extra.mk.in -> audacious-3.2.4.tar.bz2/extra.mk.in Changed

audacious-3.1.1.tar.bz2/install-sh -> audacious-3.2.4.tar.bz2/install-sh Changed

@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2005-05-14.22
+scriptversion=2009-04-28.21; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -39,38 +39,68 @@
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
+# from scratch.
+
+nl='
+'
+IFS=" ""	$nl"
 
 # set DOITPROG to echo to test this script
 
 # Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
+doit=${DOITPROG-}
+if test -z "$doit"; then
+  doit_exec=exec
+else
+  doit_exec=$doit
+fi
 
-# put in absolute paths if you don't have them in your path; or use env. vars.
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
+
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+
+posix_glob='?'
+initialize_posix_glob='
+  test "$posix_glob" != "?" || {
+    if (set -f) 2>/dev/null; then
+      posix_glob=
+    else
+      posix_glob=:
+    fi
+  }
+'
 
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
 
-chmodcmd="$chmodprog 0755"
-chowncmd=
 chgrpcmd=
-stripcmd=
+chmodcmd=$chmodprog
+chowncmd=
+mvcmd=$mvprog
 rmcmd="$rmprog -f"
-mvcmd="$mvprog"
+stripcmd=
+
 src=
 dst=
 dir_arg=
-dstarg=
+dst_arg=
+
+copy_on_change=false
 no_target_directory=
 
-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
    or: $0 [OPTION]... SRCFILES... DIRECTORY
    or: $0 [OPTION]... -t DIRECTORY SRCFILES...
    or: $0 [OPTION]... -d DIRECTORIES...
@@ -80,81 +110,86 @@
 In the 4th, create DIRECTORIES.
 
 Options:
--c         (ignored)
--d         create directories instead of installing files.
--g GROUP   $chgrpprog installed files to GROUP.
--m MODE    $chmodprog installed files to MODE.
--o USER    $chownprog installed files to USER.
--s         $stripprog installed files.
--t DIRECTORY  install into DIRECTORY.
--T         report an error if DSTFILE is a directory.
---help     display this help and exit.
---version  display version info and exit.
+     --help     display this help and exit.
+     --version  display version info and exit.
+
+  -c            (ignored)
+  -C            install only if different (preserve the last data modification time)
+  -d            create directories instead of installing files.
+  -g GROUP      $chgrpprog installed files to GROUP.
+  -m MODE       $chmodprog installed files to MODE.
+  -o USER       $chownprog installed files to USER.
+  -s            $stripprog installed files.
+  -t DIRECTORY  install into DIRECTORY.
+  -T            report an error if DSTFILE is a directory.
 
 Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+  RMPROG STRIPPROG
 "
 
-while test -n "$1"; do
+while test $# -ne 0; do
   case $1 in
-    -c) shift
-        continue;;
+    -c) ;;
+
+    -C) copy_on_change=true;;
 
-    -d) dir_arg=true
-        shift
-        continue;;
+    -d) dir_arg=true;;
 
     -g) chgrpcmd="$chgrpprog $2"
-        shift
-        shift
-        continue;;
+	shift;;
 
     --help) echo "$usage"; exit $?;;
 
-    -m) chmodcmd="$chmodprog $2"
-        shift
-        shift
-        continue;;
+    -m) mode=$2
+	case $mode in
+	  *' '* | *'	'* | *'
+'*	  | *'*'* | *'?'* | *'['*)
+	    echo "$0: invalid mode: $mode" >&2
+	    exit 1;;
+	esac
+	shift;;
 
     -o) chowncmd="$chownprog $2"
-        shift
-        shift
-        continue;;
+	shift;;
 
-    -s) stripcmd=$stripprog
-        shift
-        continue;;
+    -s) stripcmd=$stripprog;;
 
-    -t) dstarg=$2
-	shift
-	shift
-	continue;;
+    -t) dst_arg=$2
+	shift;;
 
-    -T) no_target_directory=true
-	shift
-	continue;;
+    -T) no_target_directory=true;;
 
     --version) echo "$0 $scriptversion"; exit $?;;
 
-    *)  # When -d is used, all remaining arguments are directories to create.
-	# When -t is used, the destination is already specified.
-	test -n "$dir_arg$dstarg" && break
-        # Otherwise, the last argument is the destination.  Remove it from $@.
-	for arg
-	do
-          if test -n "$dstarg"; then
-	    # $@ is not empty: it contains at least $arg.
-	    set fnord "$@" "$dstarg"
-	    shift # fnord
-	  fi
-	  shift # arg
-	  dstarg=$arg
-	done
+    --)	shift
 	break;;
+
+    -*)	echo "$0: invalid option: $1" >&2
+	exit 1;;
+
+    *)  break;;
   esac
+  shift
 done
 
-if test -z "$1"; then
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+  # When -d is used, all remaining arguments are directories to create.
+  # When -t is used, the destination is already specified.
+  # Otherwise, the last argument is the destination.  Remove it from $@.
+  for arg
+  do
+    if test -n "$dst_arg"; then
+      # $@ is not empty: it contains at least $arg.
+      set fnord "$@" "$dst_arg"
+      shift # fnord
+    fi
+    shift # arg
+    dst_arg=$arg
+  done
+fi
+
+if test $# -eq 0; then
   if test -z "$dir_arg"; then
     echo "$0: no input file specified." >&2
     exit 1
@@ -164,24 +199,47 @@
   exit 0
 fi
 
+if test -z "$dir_arg"; then
+  trap '(exit $?); exit' 1 2 13 15
+
+  # Set umask so as not to create temps with too-generous modes.
+  # However, 'strip' requires both read and write access to temps.
+  case $mode in
+    # Optimize common cases.
+    *644) cp_umask=133;;
+    *755) cp_umask=22;;
+
+    *[0-7])
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw='% 200'
+      fi
+      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+    *)
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw=,u+rw
+      fi
+      cp_umask=$mode$u_plus_rw;;
+  esac
+fi
+
 for src
 do
   # Protect names starting with `-'.
   case $src in
-    -*) src=./$src ;;
+    -*) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
     dst=$src
-    src=
-
-    if test -d "$dst"; then
-      mkdircmd=:
-      chmodcmd=
-    else
-      mkdircmd=$mkdirprog
-    fi
+    dstdir=$dst
+    test -d "$dstdir"
+    dstdir_status=$?
   else
+
     # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
     # might cause directories to be created, which would be especially bad
     # if $src (and thus $dsttmp) contains '*'.
@@ -190,71 +248,199 @@
       exit 1
     fi
 
-    if test -z "$dstarg"; then
+    if test -z "$dst_arg"; then
       echo "$0: no destination specified." >&2
       exit 1
     fi
 
-    dst=$dstarg
+    dst=$dst_arg
     # Protect names starting with `-'.
     case $dst in
-      -*) dst=./$dst ;;
+      -*) dst=./$dst;;
     esac
 
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
     if test -d "$dst"; then
       if test -n "$no_target_directory"; then
-	echo "$0: $dstarg: Is a directory" >&2
+	echo "$0: $dst_arg: Is a directory" >&2
 	exit 1
       fi
-      dst=$dst/`basename "$src"`
+      dstdir=$dst
+      dst=$dstdir/`basename "$src"`
+      dstdir_status=0
+    else
+      # Prefer dirname, but fall back on a substitute if dirname fails.
+      dstdir=`
+	(dirname "$dst") 2>/dev/null ||
+	expr X"$dst" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
+	     X"$dst" : 'X$//$[^/]' \| \
+	     X"$dst" : 'X$//$$' \| \
+	     X"$dst" : 'X$/$' \| . 2>/dev/null ||
+	echo X"$dst" |
+	    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{
+		   s//\1/
+		   q
+		 }
+		 /^X$\/\/$[^/].*/{
+		   s//\1/
+		   q
+		 }
+		 /^X$\/\/$$/{
+		   s//\1/
+		   q
+		 }
+		 /^X$\/$.*/{
+		   s//\1/
+		   q
+		 }
+		 s/.*/./; q'
+      `
+
+      test -d "$dstdir"
+      dstdir_status=$?
     fi
   fi
 
-  # This sed command emulates the dirname command.
-  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
+  obsolete_mkdir_used=false
+
+  if test $dstdir_status != 0; then
+    case $posix_mkdir in
+      '')
+	# Create intermediate dirs using mode 755 as modified by the umask.
+	# This is like FreeBSD 'install' as of 1997-10-28.
+	umask=`umask`
+	case $stripcmd.$umask in
+	  # Optimize common cases.
+	  *[2367][2367]) mkdir_umask=$umask;;
+	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+	  *[0-7])
+	    mkdir_umask=`expr $umask + 22 \
+	      - $umask % 100 % 40 + $umask % 20 \
+	      - $umask % 10 % 4 + $umask % 2
+	    `;;
+	  *) mkdir_umask=$umask,go-w;;
+	esac
+
+	# With -d, create the new directory with the user-specified mode.
+	# Otherwise, rely on $mkdir_umask.
+	if test -n "$dir_arg"; then
+	  mkdir_mode=-m$mode
+	else
+	  mkdir_mode=
+	fi
+
+	posix_mkdir=false
+	case $umask in
+	  *[123567][0-7][0-7])
+	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
+	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+	    ;;
+	  *)
+	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+	    if (umask $mkdir_umask &&
+		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+	    then
+	      if test -z "$dir_arg" || {
+		   # Check for POSIX incompatibilities with -m.
+		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+		   # other-writeable bit of parent directory when it shouldn't.
+		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
+		   case $ls_ld_tmpdir in
+		     d????-?r-*) different_mode=700;;
+		     d????-?--*) different_mode=755;;
+		     *) false;;
+		   esac &&
+		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+		   }
+		 }
+	      then posix_mkdir=:
+	      fi
+	      rmdir "$tmpdir/d" "$tmpdir"
+	    else
+	      # Remove any dirs left behind by ancient mkdir implementations.
+	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+	    fi
+	    trap '' 0;;
+	esac;;
+    esac
 
-  # Make sure that the destination directory exists.
+    if
+      $posix_mkdir && (
+	umask $mkdir_umask &&
+	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+      )
+    then :
+    else
 
-  # Skip lots of stat calls in the usual case.
-  if test ! -d "$dstdir"; then
-    defaultIFS='
-	 '
-    IFS="${IFS-$defaultIFS}"
+      # The umask is ridiculous, or mkdir does not conform to POSIX,
+      # or it failed possibly due to a race condition.  Create the
+      # directory the slow way, step by step, checking for races as we go.
 
-    oIFS=$IFS
-    # Some sh's can't handle IFS=/ for some reason.
-    IFS='%'
-    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-    shift
-    IFS=$oIFS
+      case $dstdir in
+	/*) prefix='/';;
+	-*) prefix='./';;
+	*)  prefix='';;
+      esac
 
-    pathcomp=
+      eval "$initialize_posix_glob"
 
-    while test $# -ne 0 ; do
-      pathcomp=$pathcomp$1
+      oIFS=$IFS
+      IFS=/
+      $posix_glob set -f
+      set fnord $dstdir
       shift
-      if test ! -d "$pathcomp"; then
-        $mkdirprog "$pathcomp"
-	# mkdir can fail with a `File exist' error in case several
-	# install-sh are creating the directory concurrently.  This
-	# is OK.
-	test -d "$pathcomp" || exit
+      $posix_glob set +f
+      IFS=$oIFS
+
+      prefixes=
+
+      for d
+      do
+	test -z "$d" && continue
+
+	prefix=$prefix$d
+	if test -d "$prefix"; then
+	  prefixes=
+	else
+	  if $posix_mkdir; then
+	    (umask=$mkdir_umask &&
+	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+	    # Don't fail if two instances are running concurrently.
+	    test -d "$prefix" || exit 1
+	  else
+	    case $prefix in
+	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+	      *) qprefix=$prefix;;
+	    esac
+	    prefixes="$prefixes '$qprefix'"
+	  fi
+	fi
+	prefix=$prefix/
+      done
+
+      if test -n "$prefixes"; then
+	# Don't fail if two instances are running concurrently.
+	(umask $mkdir_umask &&
+	 eval "\$doit_exec \$mkdirprog $prefixes") ||
+	  test -d "$dstdir" || exit 1
+	obsolete_mkdir_used=true
       fi
-      pathcomp=$pathcomp/
-    done
+    fi
   fi
 
   if test -n "$dir_arg"; then
-    $doit $mkdircmd "$dst" \
-      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
-      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
-
+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
   else
-    dstfile=`basename "$dst"`
 
     # Make a couple of temp file names in the proper directory.
     dsttmp=$dstdir/_inst.$$_
@@ -262,10 +448,9 @@
 
     # Trap to clean up those temp files at exit.
     trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-    trap '(exit $?); exit' 1 2 13 15
 
     # Copy the file name to the temp name.
-    $doit $cpprog "$src" "$dsttmp" &&
+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
 
     # and set any options; do chmod last to preserve setuid bits.
     #
@@ -273,51 +458,63 @@
     # ignore errors from any of these, just make sure not to ignore
     # errors from the above "$doit $cpprog $src $dsttmp" command.
     #
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
-      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
-
-    # Now rename the file to the real destination.
-    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
-      || {
-	   # The rename failed, perhaps because mv can't rename something else
-	   # to itself, or perhaps because mv is so ancient that it does not
-	   # support -f.
-
-	   # Now remove or move aside any old file at destination location.
-	   # We try this two ways since rm can't unlink itself on some
-	   # systems and the destination file might be busy for other
-	   # reasons.  In this case, the final cleanup might fail but the new
-	   # file should still install successfully.
-	   {
-	     if test -f "$dstdir/$dstfile"; then
-	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
-	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
-	       || {
-		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-		 (exit 1); exit 1
-	       }
-	     else
-	       :
-	     fi
-	   } &&
-
-	   # Now rename the file to the real destination.
-	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
-	 }
-    }
-  fi || { (exit 1); exit 1; }
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+    # If -C, don't bother to copy if it wouldn't change the file.
+    if $copy_on_change &&
+       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
+
+       eval "$initialize_posix_glob" &&
+       $posix_glob set -f &&
+       set X $old && old=:$2:$4:$5:$6 &&
+       set X $new && new=:$2:$4:$5:$6 &&
+       $posix_glob set +f &&
+
+       test "$old" = "$new" &&
+       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+    then
+      rm -f "$dsttmp"
+    else
+      # Rename the file to the real destination.
+      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+      # The rename failed, perhaps because mv can't rename something else
+      # to itself, or perhaps because mv is so ancient that it does not
+      # support -f.
+      {
+	# Now remove or move aside any old file at destination location.
+	# We try this two ways since rm can't unlink itself on some
+	# systems and the destination file might be busy for other
+	# reasons.  In this case, the final cleanup might fail but the new
+	# file should still install successfully.
+	{
+	  test ! -f "$dst" ||
+	  $doit $rmcmd -f "$dst" 2>/dev/null ||
+	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+	  } ||
+	  { echo "$0: cannot unlink or rename $dst" >&2
+	    (exit 1); exit 1
+	  }
+	} &&
+
+	# Now rename the file to the real destination.
+	$doit $mvcmd "$dsttmp" "$dst"
+      }
+    fi || exit 1
+
+    trap '' 0
+  fi
 done
 
-# The final little trick to "correctly" pass the exit status to the exit trap.
-{
-  (exit 0); exit 0
-}
-
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:

audacious-3.1.1.tar.bz2/man/audacious.1.in -> audacious-3.2.4.tar.bz2/man/audacious.1.in Changed

audacious-3.1.1.tar.bz2/man/audtool.1.in -> audacious-3.2.4.tar.bz2/man/audtool.1.in Changed

audacious-3.1.1.tar.bz2/po/Makefile -> audacious-3.2.4.tar.bz2/po/Makefile Changed

audacious-3.1.1.tar.bz2/po/POTFILES.in -> audacious-3.2.4.tar.bz2/po/POTFILES.in Changed

audacious-3.1.1.tar.bz2/po/audacious.pot -> audacious-3.2.4.tar.bz2/po/audacious.pot Changed

@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://jira.atheme.org/\n"
-"POT-Creation-Date: 2011-10-19 21:32-0400\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2012-02-17 11:58-0500\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,1046 +18,1072 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: src/audacious/adder.c:71
+#: src/audacious/adder.c:77
 msgid "Searching ..."
 msgstr ""
 
-#: src/audacious/adder.c:97
+#: src/audacious/adder.c:113
 #, c-format
 msgid "%d file found"
 msgid_plural "%d files found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/audacious/chardet.c:38
+#: src/audacious/chardet.c:39
 msgid " (invalid UTF-8)"
 msgstr ""
 
-#: src/audacious/credits.c:35
+#: src/audacious/credits.c:37
 msgid "Core developers:"
 msgstr ""
 
-#: src/audacious/credits.c:49
+#: src/audacious/credits.c:51
 msgid "Graphics:"
 msgstr ""
 
-#: src/audacious/credits.c:54
+#: src/audacious/credits.c:56
 msgid "Default skin:"
 msgstr ""
 
-#: src/audacious/credits.c:60
+#: src/audacious/credits.c:62
 msgid "Plugin development:"
 msgstr ""
 
-#: src/audacious/credits.c:83
+#: src/audacious/credits.c:85
 msgid "Patch authors:"
 msgstr ""
 
-#: src/audacious/credits.c:126
+#: src/audacious/credits.c:131
 msgid "1.x developers:"
 msgstr ""
 
-#: src/audacious/credits.c:148
+#: src/audacious/credits.c:153
 msgid "BMP Developers:"
 msgstr ""
 
-#: src/audacious/credits.c:180
+#: src/audacious/credits.c:185
+msgid "Argentinian Spanish:"
+msgstr ""
+
+#: src/audacious/credits.c:188
 msgid "Belarusian:"
 msgstr ""
 
-#: src/audacious/credits.c:183
+#: src/audacious/credits.c:191
 msgid "Basque:"
 msgstr ""
 
-#: src/audacious/credits.c:186
+#: src/audacious/credits.c:194
 msgid "Brazilian Portuguese:"
 msgstr ""
 
-#: src/audacious/credits.c:191
+#: src/audacious/credits.c:199
 msgid "Breton:"
 msgstr ""
 
-#: src/audacious/credits.c:194
+#: src/audacious/credits.c:202
 msgid "Bulgarian:"
 msgstr ""
 
-#: src/audacious/credits.c:197
+#: src/audacious/credits.c:205
 msgid "Catalan:"
 msgstr ""
 
-#: src/audacious/credits.c:200
+#: src/audacious/credits.c:210
 msgid "Chinese:"
 msgstr ""
 
-#: src/audacious/credits.c:203
+#: src/audacious/credits.c:213
 msgid "Croatian:"
 msgstr ""
 
-#: src/audacious/credits.c:206
+#: src/audacious/credits.c:216
 msgid "Czech:"
 msgstr ""
 
-#: src/audacious/credits.c:209
+#: src/audacious/credits.c:219
 msgid "Dutch:"
 msgstr ""
 
-#: src/audacious/credits.c:213
+#: src/audacious/credits.c:223
 msgid "Estonian:"
 msgstr ""
 
-#: src/audacious/credits.c:216
+#: src/audacious/credits.c:226
 msgid "Finnish:"
 msgstr ""
 
-#: src/audacious/credits.c:221
+#: src/audacious/credits.c:232
 msgid "French:"
 msgstr ""
 
-#: src/audacious/credits.c:227
+#: src/audacious/credits.c:238
 msgid "German:"
 msgstr ""
 
-#: src/audacious/credits.c:234
+#: src/audacious/credits.c:245
 msgid "Georgian:"
 msgstr ""
 
-#: src/audacious/credits.c:237
+#: src/audacious/credits.c:248
 msgid "Greek:"
 msgstr ""
 
-#: src/audacious/credits.c:242
+#: src/audacious/credits.c:253
 msgid "Hindi:"
 msgstr ""
 
-#: src/audacious/credits.c:245
+#: src/audacious/credits.c:256
 msgid "Hungarian:"
 msgstr ""
 
-#: src/audacious/credits.c:249
+#: src/audacious/credits.c:260
 msgid "Italian:"
 msgstr ""
 
-#: src/audacious/credits.c:253
+#: src/audacious/credits.c:265
 msgid "Japanese:"
 msgstr ""
 
-#: src/audacious/credits.c:256
+#: src/audacious/credits.c:268
 msgid "Korean:"
 msgstr ""
 
-#: src/audacious/credits.c:259
+#: src/audacious/credits.c:271
 msgid "Latvian:"
 msgstr ""
 
-#: src/audacious/credits.c:262
+#: src/audacious/credits.c:274
 msgid "Lithuanian:"
 msgstr ""
 
-#: src/audacious/credits.c:267
+#: src/audacious/credits.c:279
 msgid "Macedonian:"
 msgstr ""
 
-#: src/audacious/credits.c:270
+#: src/audacious/credits.c:282
+msgid "Mexican Spanish:"
+msgstr ""
+
+#: src/audacious/credits.c:285
 msgid "Polish:"
 msgstr ""
 
-#: src/audacious/credits.c:276
+#: src/audacious/credits.c:292
 msgid "Portuguese:"
 msgstr ""
 
-#: src/audacious/credits.c:279
+#: src/audacious/credits.c:295
 msgid "Romanian:"
 msgstr ""
 
-#: src/audacious/credits.c:283
+#: src/audacious/credits.c:299
 msgid "Russian:"
 msgstr ""
 
-#: src/audacious/credits.c:287
+#: src/audacious/credits.c:303
 msgid "Serbian (Latin):"
 msgstr ""
 
-#: src/audacious/credits.c:290
+#: src/audacious/credits.c:306
 msgid "Serbian (Cyrillic):"
 msgstr ""
 
-#: src/audacious/credits.c:293
+#: src/audacious/credits.c:310
 msgid "Simplified Chinese:"
 msgstr ""
 
-#: src/audacious/credits.c:296
+#: src/audacious/credits.c:313
 msgid "Slovak:"
 msgstr ""
 
-#: src/audacious/credits.c:299
+#: src/audacious/credits.c:317
 msgid "Spanish:"
 msgstr ""
 
-#: src/audacious/credits.c:306
+#: src/audacious/credits.c:326
 msgid "Swedish:"
 msgstr ""
 
-#: src/audacious/credits.c:309
+#: src/audacious/credits.c:329
 msgid "Traditional Chinese:"
 msgstr ""
 
-#: src/audacious/credits.c:315
+#: src/audacious/credits.c:335
 msgid "Turkish:"
 msgstr ""
 
-#: src/audacious/credits.c:319
+#: src/audacious/credits.c:339
 msgid "Ukrainian:"
 msgstr ""
 
-#: src/audacious/credits.c:323
+#: src/audacious/credits.c:344
 msgid "Vietnamese:"
 msgstr ""
 
-#: src/audacious/credits.c:326
+#: src/audacious/credits.c:347
 msgid "Welsh:"
 msgstr ""
 
-#: src/audacious/drct.c:234
-msgid "Temporary Playlist"
-msgstr ""
-
-#: src/audacious/equalizer_preset.c:186
+#: src/audacious/equalizer_preset.c:180
 #, c-format
 msgid "Error importing Winamp EQF file '%s'"
 msgstr ""
 
-#: src/audacious/main.c:239
+#: src/audacious/main.c:243
 msgid "Skip backwards in playlist"
 msgstr ""
 
-#: src/audacious/main.c:240
+#: src/audacious/main.c:244
 msgid "Start playing current playlist"
 msgstr ""
 
-#: src/audacious/main.c:241
+#: src/audacious/main.c:245
 msgid "Pause current song"
 msgstr ""
 
-#: src/audacious/main.c:242
+#: src/audacious/main.c:246
 msgid "Stop current song"
 msgstr ""
 
-#: src/audacious/main.c:243
+#: src/audacious/main.c:247
 msgid "Pause if playing, play otherwise"
 msgstr ""
 
-#: src/audacious/main.c:244
+#: src/audacious/main.c:248
 msgid "Skip forward in playlist"
 msgstr ""
 
-#: src/audacious/main.c:245
+#: src/audacious/main.c:249
 msgid "Display Jump to File dialog"
 msgstr ""
 
-#: src/audacious/main.c:246
+#: src/audacious/main.c:250
 msgid "Add files to the playlist"
 msgstr ""
 
-#: src/audacious/main.c:247
+#: src/audacious/main.c:251
 msgid "Add new files to a temporary playlist"
 msgstr ""
 
-#: src/audacious/main.c:248
+#: src/audacious/main.c:252
 msgid "Display the main window"
 msgstr ""
 
-#: src/audacious/main.c:249
+#: src/audacious/main.c:253
 msgid "Show version"
 msgstr ""
 
-#: src/audacious/main.c:250
+#: src/audacious/main.c:254
 msgid "Print debugging messages"
 msgstr ""
 
-#: src/audacious/main.c:251
+#: src/audacious/main.c:255
 msgid "Headless mode (beta)"
 msgstr ""
 
-#: src/audacious/main.c:252
+#: src/audacious/main.c:256
 msgid "FILE..."
 msgstr ""
 
-#: src/audacious/main.c:264
+#: src/audacious/main.c:268
 msgid "- play multimedia files"
 msgstr ""
 
-#: src/audacious/main.c:274
+#: src/audacious/main.c:278
 #, c-format
 msgid ""
 "%s: %s\n"
 "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/audacious/main.c:547
+#: src/audacious/main.c:573
 msgid "Audacious"
 msgstr ""
 
-#: src/audacious/playback.c:303
+#: src/audacious/playback.c:307
 #, c-format
 msgid "No decoder found for %s."
 msgstr ""
 
-#: src/audacious/playlist-new.c:315
-msgid "Untitled Playlist"
+#: src/audacious/playlist-files.c:53
+#, c-format
+msgid "Cannot %s %s: unsupported file extension."
+msgstr ""
+
+#: src/audacious/playlist-files.c:54
+msgid "save"
+msgstr ""
+
+#: src/audacious/playlist-files.c:54
+msgid "load"
+msgstr ""
+
+#: src/audacious/playlist-new.c:131
+msgid "New Playlist"
+msgstr ""
+
+#: src/audacious/playlist-new.c:132
+msgid "Now Playing"
 msgstr ""
 
-#: src/audacious/playlist-new.c:1496
+#: src/audacious/playlist-new.c:1630
 msgid ""
 "The playlist cannot be sorted because metadata scanning is still in progress "
 "(or has been disabled)."
 msgstr ""
 
-#: src/audacious/ui_preferences.c:88
+#: src/audacious/ui_preferences.c:85
 msgid "Audio"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:89
+#: src/audacious/ui_preferences.c:86
 msgid "Network"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:90 src/audacious/ui_preferences.c:1634
+#: src/audacious/ui_preferences.c:87 src/audacious/ui_preferences.c:1603
 msgid "Playlist"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:91
+#: src/audacious/ui_preferences.c:88
 msgid "Plugins"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:97 src/libaudgui/infopopup.c:203
+#: src/audacious/ui_preferences.c:94 src/libaudgui/infopopup.c:199
 msgid "Artist"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:98 src/libaudgui/infopopup.c:205
+#: src/audacious/ui_preferences.c:95 src/libaudgui/infopopup.c:201
 msgid "Album"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:99 src/libaudgui/infopopup.c:201
-#: src/libaudgui/ui_playlist_manager.c:276
+#: src/audacious/ui_preferences.c:96 src/libaudgui/infopopup.c:197
+#: src/libaudgui/ui_playlist_manager.c:279
 msgid "Title"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:100
+#: src/audacious/ui_preferences.c:97
 msgid "Tracknumber"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:101 src/libaudgui/infopopup.c:207
+#: src/audacious/ui_preferences.c:98 src/libaudgui/infopopup.c:203
 msgid "Genre"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:102
+#: src/audacious/ui_preferences.c:99
 msgid "Filename"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:103
+#: src/audacious/ui_preferences.c:100
 msgid "Filepath"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:104
+#: src/audacious/ui_preferences.c:101
 msgid "Date"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:105 src/libaudgui/infopopup.c:209
+#: src/audacious/ui_preferences.c:102 src/libaudgui/infopopup.c:205
 msgid "Year"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:106
+#: src/audacious/ui_preferences.c:103
 msgid "Comment"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:107
+#: src/audacious/ui_preferences.c:104
 msgid "Codec"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:108
+#: src/audacious/ui_preferences.c:105
 msgid "Quality"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:114
+#: src/audacious/ui_preferences.c:111
 msgid "None"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:115
+#: src/audacious/ui_preferences.c:112
 msgid "Arabic"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:116
+#: src/audacious/ui_preferences.c:113
 msgid "Baltic"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:117
+#: src/audacious/ui_preferences.c:114
 msgid "Chinese"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:118
+#: src/audacious/ui_preferences.c:115
 msgid "Greek"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:119
+#: src/audacious/ui_preferences.c:116
 msgid "Hebrew"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:120
+#: src/audacious/ui_preferences.c:117
 msgid "Japanese"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:121
+#: src/audacious/ui_preferences.c:118
 msgid "Korean"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:122
+#: src/audacious/ui_preferences.c:119
 msgid "Polish"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:123
+#: src/audacious/ui_preferences.c:120
 msgid "Russian"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:124
+#: src/audacious/ui_preferences.c:121
 msgid "Taiwanese"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:125
+#: src/audacious/ui_preferences.c:122
 msgid "Turkish"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:147
+#: src/audacious/ui_preferences.c:144
 msgid "Album mode"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:150
+#: src/audacious/ui_preferences.c:147
 msgid "Output Settings"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:152
+#: src/audacious/ui_preferences.c:149
 msgid "Bit depth:"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:155
+#: src/audacious/ui_preferences.c:152
 msgid "Buffer size:"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:157
+#: src/audacious/ui_preferences.c:154
 msgid "ms"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:158
+#: src/audacious/ui_preferences.c:155
 msgid "Use software volume control (not recommended)"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:160
+#: src/audacious/ui_preferences.c:157
 msgid "Replay Gain"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:161
+#: src/audacious/ui_preferences.c:158
 msgid "Enable Replay Gain"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:164
+#: src/audacious/ui_preferences.c:161
 msgid "Prevent clipping (recommended)"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:166
+#: src/audacious/ui_preferences.c:163
 msgid "Adjust Levels"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:167
+#: src/audacious/ui_preferences.c:164
 msgid "Amplify all files:"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:169 src/audacious/ui_preferences.c:172
+#: src/audacious/ui_preferences.c:166 src/audacious/ui_preferences.c:169
 msgid "dB"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:170
+#: src/audacious/ui_preferences.c:167
 msgid "Amplify untagged files:"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:175
+#: src/audacious/ui_preferences.c:172
 msgid "Proxy hostname:"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:176
+#: src/audacious/ui_preferences.c:173
 msgid "Proxy port:"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:179
+#: src/audacious/ui_preferences.c:176
 msgid "Proxy username:"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:180
+#: src/audacious/ui_preferences.c:177
 msgid "Proxy password:"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:184
+#: src/audacious/ui_preferences.c:181
 msgid "Proxy Configuration"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:185
+#: src/audacious/ui_preferences.c:182
 msgid "Enable proxy usage"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:188
+#: src/audacious/ui_preferences.c:185
 msgid "Use authentication with proxy"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:196
+#: src/audacious/ui_preferences.c:193
 msgid "Auto character encoding detector for:"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:201
+#: src/audacious/ui_preferences.c:198
 msgid "Fallback character encodings:"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:205
+#: src/audacious/ui_preferences.c:202
 msgid "Behavior"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:206
+#: src/audacious/ui_preferences.c:203
 msgid "Continue playback on startup"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:208
+#: src/audacious/ui_preferences.c:205
 msgid "Advance when the current song is deleted"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:210
+#: src/audacious/ui_preferences.c:207
 msgid "Clear the playlist when opening files"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:212
+#: src/audacious/ui_preferences.c:209
 msgid "Open files in a temporary playlist"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:214
+#: src/audacious/ui_preferences.c:211
 msgid "Metadata"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:215
+#: src/audacious/ui_preferences.c:212
 msgid "Do not load metadata for songs until played"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:233
+#: src/audacious/ui_preferences.c:230
 msgid "TITLE"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:234
+#: src/audacious/ui_preferences.c:231
 msgid "ARTIST - TITLE"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:235
+#: src/audacious/ui_preferences.c:232
 msgid "ARTIST - ALBUM - TITLE"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:236
+#: src/audacious/ui_preferences.c:233
 msgid "ARTIST - ALBUM - TRACK. TITLE"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:237
+#: src/audacious/ui_preferences.c:234
 msgid "ARTIST [ ALBUM ] - TRACK. TITLE"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:238
+#: src/audacious/ui_preferences.c:235
 msgid "ALBUM - TITLE"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:577
+#: src/audacious/ui_preferences.c:556
 msgid "Category"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:801
+#: src/audacious/ui_preferences.c:780
 msgid "Popup Information Settings"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:810
+#: src/audacious/ui_preferences.c:789
 msgid "Cover image retrieve"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:815
+#: src/audacious/ui_preferences.c:794
 msgid ""
 "While searching for the album's cover, Audacious looks for certain words in "
 "the filename. You can specify those words in the lists below, separated "
 "using commas."
 msgstr ""
 
-#: src/audacious/ui_preferences.c:832
+#: src/audacious/ui_preferences.c:811
 msgid "Exclude:"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:839
+#: src/audacious/ui_preferences.c:818
 msgid "Include:"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:856
+#: src/audacious/ui_preferences.c:835
 msgid "Recursively search for cover"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:866
+#: src/audacious/ui_preferences.c:845
 msgid "Search depth: "
 msgstr ""
 
-#: src/audacious/ui_preferences.c:880
+#: src/audacious/ui_preferences.c:859
 msgid "Use per-file cover"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:883
+#: src/audacious/ui_preferences.c:862
 msgid "Miscellaneous"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:892
+#: src/audacious/ui_preferences.c:871
 msgid "Show Progress bar for the current track"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:902
+#: src/audacious/ui_preferences.c:881
 msgid "Delay until filepopup comes up: "
 msgstr ""
 
-#: src/audacious/ui_preferences.c:1340
+#: src/audacious/ui_preferences.c:1309
 msgid "Custom"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:1383
+#: src/audacious/ui_preferences.c:1352
 msgid "Song Display"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:1392
+#: src/audacious/ui_preferences.c:1361
 msgid "Show song numbers"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:1403
+#: src/audacious/ui_preferences.c:1372
 msgid "Show leading zeroes (02:00 instead of 2:00)"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:1425
+#: src/audacious/ui_preferences.c:1394
 msgid "Show information about titlestring format"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:1441
+#: src/audacious/ui_preferences.c:1410
 msgid "Custom string:"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:1448
+#: src/audacious/ui_preferences.c:1417
 msgid "Title format:"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:1459
+#: src/audacious/ui_preferences.c:1428
 msgid "Popup Information"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:1474
+#: src/audacious/ui_preferences.c:1443
 msgid "Show popup information for playlist entries"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:1475
+#: src/audacious/ui_preferences.c:1444
 msgid ""
 "Toggles popup information window for the pointed entry in the playlist. The "
 "window shows title of song, name of album, genre, year of publish, track "
 "number, track length, and artwork."
 msgstr ""
 
-#: src/audacious/ui_preferences.c:1486
+#: src/audacious/ui_preferences.c:1455
 msgid "Edit settings for popup information"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:1575
+#: src/audacious/ui_preferences.c:1544
 msgid "Output plugin:"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:1634
+#: src/audacious/ui_preferences.c:1603
 msgid "Transport"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:1634
+#: src/audacious/ui_preferences.c:1603
 msgid "Input"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:1635
+#: src/audacious/ui_preferences.c:1604
 msgid "Effect"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:1635
+#: src/audacious/ui_preferences.c:1604
 msgid "Visualization"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:1635
+#: src/audacious/ui_preferences.c:1604
 msgid "General"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:1675
+#: src/audacious/ui_preferences.c:1644
 msgid "Audacious Preferences"
 msgstr ""
 
-#: src/audacious/util.c:123
+#: src/audacious/util.c:121
 #, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr ""
 
-#: src/audtool/handlers_playlist.c:274
+#: src/audtool/handlers_playlist.c:273
 msgid "Position not found."
 msgstr ""
 
-#: src/audtool/handlers_vitals.c:64
+#: src/audtool/handlers_vitals.c:63
 msgid "No song playing."
 msgstr ""
 
-#: src/libaudcore/tuple.c:685
+#: src/libaudcore/audstrings.c:199
+#, c-format
+msgid "Audio CD, track %s"
+msgstr ""
+
+#: src/libaudcore/tuple.c:542
 msgid "Mono"
 msgstr ""
 
-#: src/libaudcore/tuple.c:687
+#: src/libaudcore/tuple.c:544
 msgid "Stereo"
 msgstr ""
 
-#: src/libaudcore/tuple.c:689
+#: src/libaudcore/tuple.c:546
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/libaudgui/confirm.c:78
+#: src/libaudgui/about.c:52 src/libaudgui/about.c:115
+msgid "Credits"
+msgstr ""
+
+#: src/libaudgui/about.c:52
+msgid "Translators"
+msgstr ""
+
+#: src/libaudgui/about.c:91
+msgid "About Audacious"
+msgstr ""
+
+#: src/libaudgui/confirm.c:76
 #, c-format
 msgid ""
 "Are you sure you want to close %s? If you do, any changes made since the "
 "playlist was exported will be lost."
 msgstr ""
 
-#: src/libaudgui/confirm.c:91
+#: src/libaudgui/confirm.c:89
 msgid "_Don't show this message again"
 msgstr ""
 
-#: src/libaudgui/confirm.c:128
+#: src/libaudgui/confirm.c:126
 msgid "Rename Playlist"
 msgstr ""
 
-#: src/libaudgui/effects-menu.c:76
+#: src/libaudgui/effects-menu.c:74
 msgid "settings ..."
 msgstr ""
 
-#: src/libaudgui/equalizer.c:52
+#: src/libaudgui/equalizer.c:51
 msgid "_Enable"
 msgstr ""
 
-#: src/libaudgui/equalizer.c:124
+#: src/libaudgui/equalizer.c:123
 msgid "31 Hz"
 msgstr ""
 
-#: src/libaudgui/equalizer.c:124
+#: src/libaudgui/equalizer.c:123
 msgid "63 Hz"
 msgstr ""
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "125 Hz"
 msgstr ""
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "250 Hz"
 msgstr ""
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "500 Hz"
 msgstr ""
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "1 kHz"
 msgstr ""
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "2 kHz"
 msgstr ""
 
-#: src/libaudgui/equalizer.c:126
+#: src/libaudgui/equalizer.c:125
 msgid "4 kHz"
 msgstr ""
 
-#: src/libaudgui/equalizer.c:126
+#: src/libaudgui/equalizer.c:125
 msgid "8 kHz"
 msgstr ""
 
-#: src/libaudgui/equalizer.c:126
+#: src/libaudgui/equalizer.c:125
 msgid "16 kHz"
 msgstr ""
 
-#: src/libaudgui/equalizer.c:131
+#: src/libaudgui/equalizer.c:130
 msgid "Equalizer"
 msgstr ""
 
-#: src/libaudgui/equalizer.c:147
+#: src/libaudgui/equalizer.c:146
 msgid "Preamp"
 msgstr ""
 
-#: src/libaudgui/infopopup.c:211
+#: src/libaudgui/infopopup.c:207
 msgid "Track Number"
 msgstr ""
 
-#: src/libaudgui/infopopup.c:213
+#: src/libaudgui/infopopup.c:209
 msgid "Track Length"
 msgstr ""
 
-#: src/libaudgui/infowin.c:77
+#: src/libaudgui/infowin.c:75
 msgid "Acid Jazz"
 msgstr ""
 
-#: src/libaudgui/infowin.c:78
+#: src/libaudgui/infowin.c:76
 msgid "Acid Rock"
 msgstr ""
 
-#: src/libaudgui/infowin.c:79
+#: src/libaudgui/infowin.c:77
 msgid "Ambient"
 msgstr ""
 
-#: src/libaudgui/infowin.c:80
+#: src/libaudgui/infowin.c:78
 msgid "Bebop"
 msgstr ""
 
-#: src/libaudgui/infowin.c:81
+#: src/libaudgui/infowin.c:79
 msgid "Bluegrass"
 msgstr ""
 
-#: src/libaudgui/infowin.c:82
+#: src/libaudgui/infowin.c:80
 msgid "Blues"
 msgstr ""
 
-#: src/libaudgui/infowin.c:83
+#: src/libaudgui/infowin.c:81
 msgid "Chamber Music"
 msgstr ""
 
-#: src/libaudgui/infowin.c:84
+#: src/libaudgui/infowin.c:82
 msgid "Classical"
 msgstr ""
 
-#: src/libaudgui/infowin.c:85
+#: src/libaudgui/infowin.c:83
 msgid "Country"
 msgstr ""
 
-#: src/libaudgui/infowin.c:86
+#: src/libaudgui/infowin.c:84
 msgid "Death Metal"
 msgstr ""
 
-#: src/libaudgui/infowin.c:87
+#: src/libaudgui/infowin.c:85
 msgid "Disco"
 msgstr ""
 
-#: src/libaudgui/infowin.c:88
+#: src/libaudgui/infowin.c:86
 msgid "Easy Listening"
 msgstr ""
 
-#: src/libaudgui/infowin.c:89
+#: src/libaudgui/infowin.c:87
 msgid "Folk"
 msgstr ""
 
-#: src/libaudgui/infowin.c:90
+#: src/libaudgui/infowin.c:88
 msgid "Funk"
 msgstr ""
 
-#: src/libaudgui/infowin.c:91
+#: src/libaudgui/infowin.c:89
 msgid "Gangsta Rap"
 msgstr ""
 
-#: src/libaudgui/infowin.c:92
+#: src/libaudgui/infowin.c:90
 msgid "Gospel"
 msgstr ""
 
-#: src/libaudgui/infowin.c:93
+#: src/libaudgui/infowin.c:91
 msgid "Grunge"
 msgstr ""
 
-#: src/libaudgui/infowin.c:94
+#: src/libaudgui/infowin.c:92
 msgid "Hard Rock"
 msgstr ""
 
-#: src/libaudgui/infowin.c:95
+#: src/libaudgui/infowin.c:93
 msgid "Heavy Metal"
 msgstr ""
 
-#: src/libaudgui/infowin.c:96
+#: src/libaudgui/infowin.c:94
 msgid "Hip-hop"
 msgstr ""
 
-#: src/libaudgui/infowin.c:97
+#: src/libaudgui/infowin.c:95
 msgid "House"
 msgstr ""
 
-#: src/libaudgui/infowin.c:98
+#: src/libaudgui/infowin.c:96
 msgid "Jazz"
 msgstr ""
 
-#: src/libaudgui/infowin.c:99
+#: src/libaudgui/infowin.c:97
 msgid "Jungle"
 msgstr ""
 
-#: src/libaudgui/infowin.c:100
+#: src/libaudgui/infowin.c:98
 msgid "Metal"
 msgstr ""
 
-#: src/libaudgui/infowin.c:101
+#: src/libaudgui/infowin.c:99
 msgid "New Age"
 msgstr ""
 
-#: src/libaudgui/infowin.c:102
+#: src/libaudgui/infowin.c:100
 msgid "New Wave"
 msgstr ""
 
-#: src/libaudgui/infowin.c:103
+#: src/libaudgui/infowin.c:101
 msgid "Noise"
 msgstr ""
 
-#: src/libaudgui/infowin.c:104
+#: src/libaudgui/infowin.c:102
 msgid "Pop"
 msgstr ""
 
-#: src/libaudgui/infowin.c:105
+#: src/libaudgui/infowin.c:103
 msgid "Punk Rock"
 msgstr ""
 
-#: src/libaudgui/infowin.c:106
+#: src/libaudgui/infowin.c:104
 msgid "Rap"
 msgstr ""
 
-#: src/libaudgui/infowin.c:107
+#: src/libaudgui/infowin.c:105
 msgid "Reggae"
 msgstr ""
 
-#: src/libaudgui/infowin.c:108
+#: src/libaudgui/infowin.c:106
 msgid "Rock"
 msgstr ""
 
-#: src/libaudgui/infowin.c:109
+#: src/libaudgui/infowin.c:107
 msgid "Rock and Roll"
 msgstr ""
 
-#: src/libaudgui/infowin.c:110
+#: src/libaudgui/infowin.c:108
 msgid "Rhythm and Blues"
 msgstr ""
 
-#: src/libaudgui/infowin.c:111
+#: src/libaudgui/infowin.c:109
 msgid "Ska"
 msgstr ""
 
-#: src/libaudgui/infowin.c:112
+#: src/libaudgui/infowin.c:110
 msgid "Soul"
 msgstr ""
 
-#: src/libaudgui/infowin.c:113
+#: src/libaudgui/infowin.c:111
 msgid "Swing"
 msgstr ""
 
-#: src/libaudgui/infowin.c:114
+#: src/libaudgui/infowin.c:112
 msgid "Techno"
 msgstr ""
 
-#: src/libaudgui/infowin.c:115
+#: src/libaudgui/infowin.c:113
 msgid "Trip-hop"
 msgstr ""
 
-#: src/libaudgui/infowin.c:175 src/libaudgui/infowin.c:361
-#: src/libaudgui/infowin.c:364 src/libaudgui/infowin.c:367
+#: src/libaudgui/infowin.c:177 src/libaudgui/infowin.c:363
+#: src/libaudgui/infowin.c:366 src/libaudgui/infowin.c:369
 msgid "n/a"
 msgstr ""
 
-#: src/libaudgui/infowin.c:265
+#: src/libaudgui/infowin.c:267
 msgid "Metadata updated successfully"
 msgstr ""
 
-#: src/libaudgui/infowin.c:270
+#: src/libaudgui/infowin.c:272
 msgid "Metadata updating failed"
 msgstr ""
 
-#: src/libaudgui/infowin.c:318
+#: src/libaudgui/infowin.c:320
 msgid "Track Information"
 msgstr ""
 
-#: src/libaudgui/infowin.c:350
+#: src/libaudgui/infowin.c:352
 msgid "Format:"
 msgstr ""
 
-#: src/libaudgui/infowin.c:354
+#: src/libaudgui/infowin.c:356
 msgid "Quality:"
 msgstr ""
 
-#: src/libaudgui/infowin.c:357
+#: src/libaudgui/infowin.c:359
 msgid "Bitrate:"
 msgstr ""
 
-#: src/libaudgui/infowin.c:387
+#: src/libaudgui/infowin.c:389
 msgid "Title"
 msgstr ""
 
-#: src/libaudgui/infowin.c:399
+#: src/libaudgui/infowin.c:401
 msgid "Artist"
 msgstr ""
 
-#: src/libaudgui/infowin.c:411
+#: src/libaudgui/infowin.c:413
 msgid "Album"
 msgstr ""
 
-#: src/libaudgui/infowin.c:423
+#: src/libaudgui/infowin.c:425
 msgid "Comment"
 msgstr ""
 
-#: src/libaudgui/infowin.c:435
+#: src/libaudgui/infowin.c:437
 msgid "Genre"
 msgstr ""
 
-#: src/libaudgui/infowin.c:456
+#: src/libaudgui/infowin.c:458
 msgid "Year"
 msgstr ""
 
-#: src/libaudgui/infowin.c:467
+#: src/libaudgui/infowin.c:469
 msgid "Track Number"
 msgstr ""
 
-#: src/libaudgui/infowin.c:549
+#: src/libaudgui/infowin.c:548
 #, c-format
 msgid "%d kb/s"
 msgstr ""
 
-#: src/libaudgui/infowin.c:579
+#: src/libaudgui/infowin.c:575
 #, c-format
 msgid "No info available for %s.\n"
 msgstr ""
 
-#: src/libaudgui/jump-to-time.c:75
+#: src/libaudgui/jump-to-time.c:72
 msgid "Jump to Time"
 msgstr ""
 
-#: src/libaudgui/jump-to-time.c:90
+#: src/libaudgui/jump-to-time.c:87
 msgid "mm:ss"
 msgstr ""
 
-#: src/libaudgui/playlists.c:39
+#: src/libaudgui/playlists.c:33
 msgid "Export Playlist"
 msgstr ""
 
-#: src/libaudgui/playlists.c:39
+#: src/libaudgui/playlists.c:33
 msgid "Import Playlist"
 msgstr ""
 
-#: src/libaudgui/playlists.c:72
+#: src/libaudgui/playlists.c:66
 #, c-format
 msgid "Overwrite %s?"
 msgstr ""
 
-#: src/libaudgui/queue-manager.c:185
+#: src/libaudgui/queue-manager.c:196
 msgid "Queue Manager"
 msgstr ""
 
-#: src/libaudgui/ui_about.c:69
-msgid "About Audacious"
-msgstr ""
-
-#: src/libaudgui/ui_about.c:90 src/libaudgui/ui_credits.c:122
-msgid "Credits"
-msgstr ""
-
-#: src/libaudgui/ui_credits.c:126
-msgid "Translators"
-msgstr ""
-
 #: src/libaudgui/ui_fileopener.c:109
 msgid "Open Files"
 msgstr ""
@@ -1074,60 +1100,60 @@
 msgid "Close dialog on Add"
 msgstr ""
 
-#: src/libaudgui/ui_jumptotrack.c:103 src/libaudgui/ui_jumptotrack.c:111
-#: src/libaudgui/ui_jumptotrack.c:322
+#: src/libaudgui/ui_jumptotrack.c:109 src/libaudgui/ui_jumptotrack.c:117
+#: src/libaudgui/ui_jumptotrack.c:326
 msgid "_Queue"
 msgstr ""
 
-#: src/libaudgui/ui_jumptotrack.c:109
+#: src/libaudgui/ui_jumptotrack.c:115
 msgid "Un_queue"
 msgstr ""
 
-#: src/libaudgui/ui_jumptotrack.c:239
-msgid "Jump to Track"
+#: src/libaudgui/ui_jumptotrack.c:258
+msgid "Jump to Song"
 msgstr ""
 
-#: src/libaudgui/ui_jumptotrack.c:277
+#: src/libaudgui/ui_jumptotrack.c:281
 msgid "Filter: "
 msgstr ""
 
-#: src/libaudgui/ui_jumptotrack.c:278
+#: src/libaudgui/ui_jumptotrack.c:282
 msgid "_Filter:"
 msgstr ""
 
-#: src/libaudgui/ui_jumptotrack.c:288
+#: src/libaudgui/ui_jumptotrack.c:292
 msgid "Remember"
 msgstr ""
 
-#: src/libaudgui/ui_jumptotrack.c:295
+#: src/libaudgui/ui_jumptotrack.c:299
 msgid "Clea_r"
 msgstr ""
 
-#: src/libaudgui/ui_jumptotrack.c:315
+#: src/libaudgui/ui_jumptotrack.c:319
 msgid "Close on Jump"
 msgstr ""
 
-#: src/libaudgui/ui_playlist_manager.c:250
+#: src/libaudgui/ui_playlist_manager.c:253
 msgid "Playlist Manager"
 msgstr ""
 
-#: src/libaudgui/ui_playlist_manager.c:277
+#: src/libaudgui/ui_playlist_manager.c:280
 msgid "Entries"
 msgstr ""
 
-#: src/libaudgui/ui_playlist_manager.c:298
+#: src/libaudgui/ui_playlist_manager.c:301
 msgid "_Rename"
 msgstr ""
 
-#: src/libaudgui/ui_playlist_manager.c:322
+#: src/libaudgui/ui_playlist_manager.c:325
 msgid "_Close dialog on activating playlist"
 msgstr ""
 
-#: src/libaudgui/ui_urlopener.c:51
+#: src/libaudgui/ui_urlopener.c:45
 msgid "Open URL"
 msgstr ""
 
-#: src/libaudgui/ui_urlopener.c:51
+#: src/libaudgui/ui_urlopener.c:45
 msgid "Add URL"
 msgstr ""
 
@@ -1141,30 +1167,30 @@
 msgid "File is not a valid .desktop file"
 msgstr ""
 
-#: src/libeggsmclient/eggdesktopfile.c:188
+#: src/libeggsmclient/eggdesktopfile.c:191
 #, c-format
 msgid "Unrecognized desktop file Version '%s'"
 msgstr ""
 
-#: src/libeggsmclient/eggdesktopfile.c:967
+#: src/libeggsmclient/eggdesktopfile.c:974
 #, c-format
 msgid "Starting %s"
 msgstr ""
 
-#: src/libeggsmclient/eggdesktopfile.c:1108
+#: src/libeggsmclient/eggdesktopfile.c:1116
 msgid "Application does not accept documents on command line"
 msgstr ""
 
-#: src/libeggsmclient/eggdesktopfile.c:1176
+#: src/libeggsmclient/eggdesktopfile.c:1184
 #, c-format
 msgid "Unrecognized launch option: %d"
 msgstr ""
 
-#: src/libeggsmclient/eggdesktopfile.c:1375
+#: src/libeggsmclient/eggdesktopfile.c:1391
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
 msgstr ""
 
-#: src/libeggsmclient/eggdesktopfile.c:1396
+#: src/libeggsmclient/eggdesktopfile.c:1412
 msgid "Not a launchable item"
 msgstr ""

audacious-3.1.1.tar.bz2/po/ca.po -> audacious-3.2.4.tar.bz2/po/ca.po Changed

@@ -1,1237 +1,1194 @@
-# Catalan messages for Audacious.
-# Copyright (C) 2008 Ernest Adrogué <eadrogue@gmx.net>
+# Catalan translation for Audacious
+# Copyright (C) Audacious translators
 # This file is distributed under the same license as the Audacious package.
-# Ernest Adrogué <eadrogue@gmx.net>, 2007, 2008.
 #
+# Translators:
+# Ernest Adrogué <eadrogue@gmx.net>, 2007, 2008.
+# Jordi Amenós <>, 2011.
+# juanmah <juanmah@gmail.com>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: audacious 1.5.1\n"
-"Report-Msgid-Bugs-To: http://jira.atheme.org/\n"
-"POT-Creation-Date: 2011-07-05 22:45+0200\n"
-"PO-Revision-Date: 2009-04-11 16:00+0200\n"
-"Last-Translator: Ernest Adrogué <eadrogue@gmx.net>\n"
-"Language-Team: Catalan <ca@dodds.net>\n"
-"Language: ca\n"
+"Project-Id-Version: Audacious\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2012-01-11 08:54-0500\n"
+"PO-Revision-Date: 2012-02-15 19:03+0000\n"
+"Last-Translator: Juanma Hernández <juanmah@gmail.com>\n"
+"Language-Team: Catalan\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/audacious/adder.c:71
+#: src/audacious/adder.c:77
 msgid "Searching ..."
-msgstr ""
+msgstr "Cercant "
 
-#: src/audacious/adder.c:99
+#: src/audacious/adder.c:113
 #, c-format
 msgid "%d file found"
 msgid_plural "%d files found"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Traduccions plurals\n\nun:%d arxiu trobat"
+msgstr[1] "altres:%d arxius trobats"
 
-#: src/audacious/chardet.c:37
+#: src/audacious/chardet.c:39
 msgid " (invalid UTF-8)"
 msgstr " (UTF-8 no vàlid)"
 
-#: src/audacious/credits.c:35
-#, fuzzy
+#: src/audacious/credits.c:37
 msgid "Core developers:"
-msgstr "Versió 0.1.x:"
+msgstr "desenvolupadors principals:"
 
-#: src/audacious/credits.c:49
+#: src/audacious/credits.c:51
 msgid "Graphics:"
 msgstr "Gràfics:"
 
-#: src/audacious/credits.c:54
+#: src/audacious/credits.c:56
 msgid "Default skin:"
 msgstr "Decoració per defecte:"
 
-#: src/audacious/credits.c:60
+#: src/audacious/credits.c:62
 msgid "Plugin development:"
 msgstr "Desenvolupament de connectors:"
 
-#: src/audacious/credits.c:83
+#: src/audacious/credits.c:85
 msgid "Patch authors:"
 msgstr "Millores:"
 
-#: src/audacious/credits.c:126
-#, fuzzy
+#: src/audacious/credits.c:131
 msgid "1.x developers:"
-msgstr "Versió 0.1.x:"
+msgstr "Desenvolupadors 1.x:"
 
-#: src/audacious/credits.c:148
+#: src/audacious/credits.c:153
 msgid "BMP Developers:"
 msgstr "Desenvolupadors del BMP:"
 
-#: src/audacious/credits.c:180
-#, fuzzy
+#: src/audacious/credits.c:185
 msgid "Belarusian:"
-msgstr "Búlgar:"
+msgstr "Bielorús:"
 
-#: src/audacious/credits.c:183
+#: src/audacious/credits.c:188
 msgid "Basque:"
-msgstr ""
+msgstr "Basc:"
 
-#: src/audacious/credits.c:186
+#: src/audacious/credits.c:191
 msgid "Brazilian Portuguese:"
 msgstr "Portuguès brasiler:"
 
-#: src/audacious/credits.c:190
+#: src/audacious/credits.c:196
 msgid "Breton:"
 msgstr "Bretó:"
 
-#: src/audacious/credits.c:193
+#: src/audacious/credits.c:199
 msgid "Bulgarian:"
 msgstr "Búlgar:"
 
-#: src/audacious/credits.c:196
+#: src/audacious/credits.c:202
 msgid "Catalan:"
 msgstr "Català:"
 
-#: src/audacious/credits.c:199
-#, fuzzy
+#: src/audacious/credits.c:206
 msgid "Chinese:"
-msgstr "Xinès"
+msgstr "Xinés:"
 
-#: src/audacious/credits.c:202
+#: src/audacious/credits.c:209
 msgid "Croatian:"
 msgstr "Croat:"
 
-#: src/audacious/credits.c:205
+#: src/audacious/credits.c:212
 msgid "Czech:"
 msgstr "Txec:"
 
-#: src/audacious/credits.c:208
+#: src/audacious/credits.c:215
 msgid "Dutch:"
 msgstr "Holandès:"
 
-#: src/audacious/credits.c:212
+#: src/audacious/credits.c:219
 msgid "Estonian:"
 msgstr "Estonià:"
 
-#: src/audacious/credits.c:215
+#: src/audacious/credits.c:222
 msgid "Finnish:"
 msgstr "Finès:"
 
-#: src/audacious/credits.c:220
+#: src/audacious/credits.c:227
 msgid "French:"
 msgstr "Francès:"
 
-#: src/audacious/credits.c:226
+#: src/audacious/credits.c:233
 msgid "German:"
 msgstr "Alemany:"
 
-#: src/audacious/credits.c:233
+#: src/audacious/credits.c:240
 msgid "Georgian:"
 msgstr "Georgià:"
 
-#: src/audacious/credits.c:236
+#: src/audacious/credits.c:243
 msgid "Greek:"
 msgstr "Grec:"
 
-#: src/audacious/credits.c:241
+#: src/audacious/credits.c:248
 msgid "Hindi:"
 msgstr "Hindi:"
 
-#: src/audacious/credits.c:244
+#: src/audacious/credits.c:251
 msgid "Hungarian:"
 msgstr "Hongarès:"
 
-#: src/audacious/credits.c:248
+#: src/audacious/credits.c:255
 msgid "Italian:"
 msgstr "Italià:"
 
-#: src/audacious/credits.c:252
+#: src/audacious/credits.c:260
 msgid "Japanese:"
 msgstr "Japonès:"
 
-#: src/audacious/credits.c:255
+#: src/audacious/credits.c:263
 msgid "Korean:"
 msgstr "Coreà:"
 
-#: src/audacious/credits.c:258
-#, fuzzy
+#: src/audacious/credits.c:266
 msgid "Latvian:"
-msgstr "Croat:"
+msgstr "Lituà:"
 
-#: src/audacious/credits.c:261
+#: src/audacious/credits.c:269
 msgid "Lithuanian:"
 msgstr "Lituà:"
 
-#: src/audacious/credits.c:265
+#: src/audacious/credits.c:274
 msgid "Macedonian:"
 msgstr "Macedoni:"
 
-#: src/audacious/credits.c:268
+#: src/audacious/credits.c:277
+msgid "Mexican Spanish:"
+msgstr "Castellà (Mèxic):"
+
+#: src/audacious/credits.c:280
 msgid "Polish:"
 msgstr "Polonès:"
 
-#: src/audacious/credits.c:274
-#, fuzzy
+#: src/audacious/credits.c:287
 msgid "Portuguese:"
-msgstr "Portuguès brasiler:"
+msgstr "Portuguès:"
 
-#: src/audacious/credits.c:277
+#: src/audacious/credits.c:290
 msgid "Romanian:"
 msgstr "Romanès:"
 
-#: src/audacious/credits.c:281
+#: src/audacious/credits.c:294
 msgid "Russian:"
 msgstr "Rus:"
 
-#: src/audacious/credits.c:285
+#: src/audacious/credits.c:298
 msgid "Serbian (Latin):"
 msgstr "Serbi (llatí):"
 
-#: src/audacious/credits.c:288
+#: src/audacious/credits.c:301
 msgid "Serbian (Cyrillic):"
 msgstr "Serbi (ciríl·lic):"
 
-#: src/audacious/credits.c:291
+#: src/audacious/credits.c:305
 msgid "Simplified Chinese:"
 msgstr "Xinès simplificat:"
 
-#: src/audacious/credits.c:294
+#: src/audacious/credits.c:308
 msgid "Slovak:"
 msgstr "Eslovac:"
 
-#: src/audacious/credits.c:297
+#: src/audacious/credits.c:312
 msgid "Spanish:"
 msgstr "Espanyol:"
 
-#: src/audacious/credits.c:304
+#: src/audacious/credits.c:320
 msgid "Swedish:"
 msgstr "Suec:"
 
-#: src/audacious/credits.c:307
+#: src/audacious/credits.c:323
 msgid "Traditional Chinese:"
 msgstr "Xinès tradicional:"
 
-#: src/audacious/credits.c:312
+#: src/audacious/credits.c:329
 msgid "Turkish:"
 msgstr "Turc:"
 
-#: src/audacious/credits.c:316
+#: src/audacious/credits.c:333
 msgid "Ukrainian:"
 msgstr "Ucraïnès:"
 
-#: src/audacious/credits.c:319
+#: src/audacious/credits.c:338
+msgid "Vietnamese:"
+msgstr "Vietnamita:"
+
+#: src/audacious/credits.c:341
 msgid "Welsh:"
 msgstr "Gal·lès:"
 
-#: src/audacious/drct.c:256
-#, fuzzy
-msgid "Temporary Playlist"
-msgstr "Carrega una llista de reproducció"
-
-#: src/audacious/equalizer_preset.c:186
+#: src/audacious/equalizer_preset.c:180
 #, c-format
 msgid "Error importing Winamp EQF file '%s'"
 msgstr "Error quan s'importava el fitxer EQF de Winamp '%s'"
 
-#: src/audacious/main.c:256
+#: src/audacious/main.c:243
 msgid "Skip backwards in playlist"
 msgstr "Salta enrere en la llista de reproducció"
 
-#: src/audacious/main.c:257
+#: src/audacious/main.c:244
 msgid "Start playing current playlist"
 msgstr "Comença a reproduir la llista actual"
 
-#: src/audacious/main.c:258
+#: src/audacious/main.c:245
 msgid "Pause current song"
 msgstr "Fa una pausa en la reproducció"
 
-#: src/audacious/main.c:259
+#: src/audacious/main.c:246
 msgid "Stop current song"
 msgstr "Atura la reproducció"
 
-#: src/audacious/main.c:260
+#: src/audacious/main.c:247
 msgid "Pause if playing, play otherwise"
 msgstr "Fa una pausa, o bé reprèn la reproducció"
 
-#: src/audacious/main.c:261
+#: src/audacious/main.c:248
 msgid "Skip forward in playlist"
 msgstr "Salta endavant en la llista de reproducció"
 
-# el títol posa "Jump to Track" en realitat
-#: src/audacious/main.c:262
+#: src/audacious/main.c:249
 msgid "Display Jump to File dialog"
 msgstr "Obre el diàleg Salta al fitxer"
 
-#: src/audacious/main.c:263
-#, fuzzy
+#: src/audacious/main.c:250
 msgid "Add files to the playlist"
-msgstr "Afegeix fitxers a la llista de reproducció."
+msgstr "Afegir arxius a la llista de reproducció"
 
-#: src/audacious/main.c:264
+#: src/audacious/main.c:251
 msgid "Add new files to a temporary playlist"
 msgstr "Afegeix els fitxers a una llista temporal"
 
-#: src/audacious/main.c:265
+#: src/audacious/main.c:252
 msgid "Display the main window"
 msgstr "Mostra la finestra principal"
 
-#: src/audacious/main.c:266
+#: src/audacious/main.c:253
 msgid "Show version"
 msgstr "Mostra la versió"
 
-#: src/audacious/main.c:267
+#: src/audacious/main.c:254
 msgid "Print debugging messages"
-msgstr ""
+msgstr "Imprimir missatges de depuració "
 
-#: src/audacious/main.c:268
+#: src/audacious/main.c:255
+msgid "Headless mode (beta)"
+msgstr "Control remot (beta)"
+
+#: src/audacious/main.c:256
 msgid "FILE..."
 msgstr "FITXER..."
 
-#: src/audacious/main.c:280
+#: src/audacious/main.c:268
 msgid "- play multimedia files"
 msgstr "- reprodueix fitxers multimèdia"
 
-#: src/audacious/main.c:290
+#: src/audacious/main.c:278
 #, c-format
 msgid ""
 "%s: %s\n"
 "Try `%s --help' for more information.\n"
-msgstr ""
-"%s: %s\n"
-"Proveu ‘%s --help’ per a més informació.\n"
-
-#: src/audacious/main.c:407
-msgid ""
-"Audacious seems to be already running but is not responding. You can start "
-"another instance of the program, but please be warned that this can cause "
-"data loss. If Audacious is not running, you can safely ignore this "
-"message. Press OK to start Audacious or Cancel to quit."
-msgstr ""
+msgstr "%s: %s\nProveu ‘%s --help’ per a més informació.\n"
 
-#: src/audacious/main.c:572
+#: src/audacious/main.c:573
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/audacious/playback.c:381
+#: src/audacious/playback.c:307
 #, c-format
 msgid "No decoder found for %s."
-msgstr ""
+msgstr "No es troba còdec per %s."
 
-#: src/audacious/playback.c:531
-msgid "Buffering ..."
-msgstr ""
+#: src/audacious/playlist-files.c:53
+#, c-format
+msgid "Cannot %s %s: unsupported file extension."
+msgstr "No es pot %s %s: extensió d'arxiu no suportada."
+
+#: src/audacious/playlist-files.c:54
+msgid "save"
+msgstr "guarda"
+
+#: src/audacious/playlist-files.c:54
+msgid "load"
+msgstr "carrega"
+
+#: src/audacious/playlist-new.c:131
+msgid "New Playlist"
+msgstr "Nova llista de reproducció"
+
+#: src/audacious/playlist-new.c:132
+msgid "Now Playing"
+msgstr "Nova reproducció"
 
-#: src/audacious/playlist-new.c:303
-#, fuzzy
-msgid "Untitled Playlist"
-msgstr "Llista de reproducció nova"
+#: src/audacious/playlist-new.c:1630
+msgid ""
+"The playlist cannot be sorted because metadata scanning is still in progress"
+" (or has been disabled)."
+msgstr "La llista de reproducció no es pot ordenar perquè la detecció de metadades encara està en marxa (o s'ha desactivat )"
 
-#: src/audacious/ui_preferences.c:87
+#: src/audacious/ui_preferences.c:85
 msgid "Audio"
 msgstr "Àudio"
 
-#: src/audacious/ui_preferences.c:88
+#: src/audacious/ui_preferences.c:86
 msgid "Network"
-msgstr ""
+msgstr "Xarxa"
 
-#: src/audacious/ui_preferences.c:89 src/audacious/ui_preferences.c:1556
+#: src/audacious/ui_preferences.c:87 src/audacious/ui_preferences.c:1603
 msgid "Playlist"
 msgstr "Llistes"
 
-#: src/audacious/ui_preferences.c:90
+#: src/audacious/ui_preferences.c:88
 msgid "Plugins"
 msgstr "Connectors"
 
-#: src/audacious/ui_preferences.c:96 src/libaudgui/infopopup.c:204
+#: src/audacious/ui_preferences.c:94 src/libaudgui/infopopup.c:199
 msgid "Artist"
 msgstr "Artista"
 
-#: src/audacious/ui_preferences.c:97 src/libaudgui/infopopup.c:206
+#: src/audacious/ui_preferences.c:95 src/libaudgui/infopopup.c:201
 msgid "Album"
 msgstr "Àlbum"
 
-#: src/audacious/ui_preferences.c:98 src/libaudgui/infopopup.c:202
-#: src/libaudgui/ui_playlist_manager.c:263
+#: src/audacious/ui_preferences.c:96 src/libaudgui/infopopup.c:197
+#: src/libaudgui/ui_playlist_manager.c:279
 msgid "Title"
 msgstr "Títol"
 
-#: src/audacious/ui_preferences.c:99
+#: src/audacious/ui_preferences.c:97
 msgid "Tracknumber"
 msgstr "Número de pista"
 
-#: src/audacious/ui_preferences.c:100 src/libaudgui/infopopup.c:208
+#: src/audacious/ui_preferences.c:98 src/libaudgui/infopopup.c:203
 msgid "Genre"
 msgstr "Gènere"
 
-#: src/audacious/ui_preferences.c:101
+#: src/audacious/ui_preferences.c:99
 msgid "Filename"
 msgstr "Nom del fitxer"
 
-#: src/audacious/ui_preferences.c:102
+#: src/audacious/ui_preferences.c:100
 msgid "Filepath"
 msgstr "Ubicació"
 
-#: src/audacious/ui_preferences.c:103
+#: src/audacious/ui_preferences.c:101
 msgid "Date"
 msgstr "Data"
 
-#: src/audacious/ui_preferences.c:104 src/libaudgui/infopopup.c:210
+#: src/audacious/ui_preferences.c:102 src/libaudgui/infopopup.c:205
 msgid "Year"
 msgstr "Any"
 
-#: src/audacious/ui_preferences.c:105
+#: src/audacious/ui_preferences.c:103
 msgid "Comment"
 msgstr "Comentari"
 
-#: src/audacious/ui_preferences.c:106
+#: src/audacious/ui_preferences.c:104
 msgid "Codec"
 msgstr "Códec"
 
-#: src/audacious/ui_preferences.c:107
+#: src/audacious/ui_preferences.c:105
 msgid "Quality"
 msgstr "Qualitat"
 
-#: src/audacious/ui_preferences.c:112
+#: src/audacious/ui_preferences.c:111
 msgid "None"
 msgstr "Cap"
 
+#: src/audacious/ui_preferences.c:112
+msgid "Arabic"
+msgstr "Àrab"
+
 #: src/audacious/ui_preferences.c:113
-msgid "Japanese"
-msgstr "Japonès"
+msgid "Baltic"
+msgstr "Bàltic"
 
 #: src/audacious/ui_preferences.c:114
-msgid "Taiwanese"
-msgstr "Taiwanès"
-
-#: src/audacious/ui_preferences.c:115
 msgid "Chinese"
 msgstr "Xinès"
 
+#: src/audacious/ui_preferences.c:115
+msgid "Greek"
+msgstr "Grec"
+
 #: src/audacious/ui_preferences.c:116
-msgid "Korean"
-msgstr "Coreà"
+msgid "Hebrew"
+msgstr "Hebreu"
 
 #: src/audacious/ui_preferences.c:117
-msgid "Russian"
-msgstr "Rus"
+msgid "Japanese"
+msgstr "Japonès"
 
 #: src/audacious/ui_preferences.c:118
-msgid "Greek"
-msgstr "Grec"
+msgid "Korean"
+msgstr "Coreà"
 
 #: src/audacious/ui_preferences.c:119
-msgid "Hebrew"
-msgstr "Hebreu"
+msgid "Polish"
+msgstr "Polonès"
 
 #: src/audacious/ui_preferences.c:120
-msgid "Turkish"
-msgstr "Turc"
+msgid "Russian"
+msgstr "Rus"
 
 #: src/audacious/ui_preferences.c:121
-msgid "Arabic"
-msgstr "Àrab"
+msgid "Taiwanese"
+msgstr "Taiwanès"
 
 #: src/audacious/ui_preferences.c:122
-#, fuzzy
-msgid "Polish"
-msgstr "Polonès:"
-
-#: src/audacious/ui_preferences.c:123
-#, fuzzy
-msgid "Baltic"
-msgstr "Cèltica"
-
-#: src/audacious/ui_preferences.c:124
-msgid "Universal"
-msgstr "Universal"
-
-#: src/audacious/ui_preferences.c:146
-#, fuzzy
-msgid "Single track mode"
-msgstr "Mostra detalls de la pista"
+msgid "Turkish"
+msgstr "Turc"
 
-#: src/audacious/ui_preferences.c:147
-#, fuzzy
+#: src/audacious/ui_preferences.c:144
 msgid "Album mode"
-msgstr "Àlbum:"
+msgstr "Manera Àlbum"
 
-#: src/audacious/ui_preferences.c:150
-#, fuzzy
+#: src/audacious/ui_preferences.c:147
 msgid "Output Settings"
-msgstr "Detecció de format"
+msgstr "Opcions sortida"
 
-#: src/audacious/ui_preferences.c:152
-#, fuzzy
+#: src/audacious/ui_preferences.c:149
 msgid "Bit depth:"
-msgstr "Profunditat de bits de sortida:"
+msgstr "Profunditat de bits:"
 
-#: src/audacious/ui_preferences.c:155
+#: src/audacious/ui_preferences.c:152
 msgid "Buffer size:"
 msgstr "Mida del buffer:"
 
-#: src/audacious/ui_preferences.c:157
+#: src/audacious/ui_preferences.c:154
 msgid "ms"
-msgstr ""
+msgstr "ms"
 
-#: src/audacious/ui_preferences.c:158
-#, fuzzy
+#: src/audacious/ui_preferences.c:155
 msgid "Use software volume control (not recommended)"
-msgstr "Usa el control de volum per programari"
+msgstr "Utilitzar control de volum per software (no recomanat)"
 
-#: src/audacious/ui_preferences.c:160
-#, fuzzy
+#: src/audacious/ui_preferences.c:157
 msgid "Replay Gain"
-msgstr "Mode de Replay Gain"
+msgstr "reproduir arxius sense fluctuacions de volum"
 
-#: src/audacious/ui_preferences.c:161
+#: src/audacious/ui_preferences.c:158
 msgid "Enable Replay Gain"
 msgstr "Activa el Replay Gain"
 
-#: src/audacious/ui_preferences.c:164
+#: src/audacious/ui_preferences.c:161
 msgid "Prevent clipping (recommended)"
-msgstr ""
+msgstr "Evitar saturació (recomanat)"
 
-#: src/audacious/ui_preferences.c:166
-#, fuzzy
+#: src/audacious/ui_preferences.c:163
 msgid "Adjust Levels"
-msgstr "Roda del ratolí"
+msgstr "Ajustar nivells"
 
-#: src/audacious/ui_preferences.c:167
+#: src/audacious/ui_preferences.c:164
 msgid "Amplify all files:"
-msgstr ""
+msgstr "Amplificar tots els arxius:"
 
-#: src/audacious/ui_preferences.c:169 src/audacious/ui_preferences.c:172
+#: src/audacious/ui_preferences.c:166 src/audacious/ui_preferences.c:169
 msgid "dB"
 msgstr "dB"
 
-#: src/audacious/ui_preferences.c:170
-#, fuzzy
+#: src/audacious/ui_preferences.c:167
 msgid "Amplify untagged files:"
-msgstr "- reprodueix fitxers multimèdia"
+msgstr "Amplificar arxius sense etiquetar:"
 
-#: src/audacious/ui_preferences.c:175
+#: src/audacious/ui_preferences.c:172
 msgid "Proxy hostname:"
 msgstr "Nom del servidor intermediari:"
 
-#: src/audacious/ui_preferences.c:176
+#: src/audacious/ui_preferences.c:173
 msgid "Proxy port:"
 msgstr "Port del servidor intermediari:"
 
-#: src/audacious/ui_preferences.c:179
+#: src/audacious/ui_preferences.c:176
 msgid "Proxy username:"
 msgstr "Nom d'usuari:"
 
-#: src/audacious/ui_preferences.c:180
+#: src/audacious/ui_preferences.c:177
 msgid "Proxy password:"
 msgstr "Contrasenya:"
 
-#: src/audacious/ui_preferences.c:184
+#: src/audacious/ui_preferences.c:181
 msgid "Proxy Configuration"
 msgstr "Configuració de servidors intermediaris"
 
-#: src/audacious/ui_preferences.c:185
+#: src/audacious/ui_preferences.c:182
 msgid "Enable proxy usage"
 msgstr "Activa l'ús de servidor intermediari"
 
-#: src/audacious/ui_preferences.c:187
+#: src/audacious/ui_preferences.c:185
 msgid "Use authentication with proxy"
 msgstr "Autenticació al servidor intermediari"
 
-#: src/audacious/ui_preferences.c:189
-msgid ""
-"Changing these settings will require a restart of "
-"Audacious."
-msgstr ""
-"Si canvieu aquestes opcions haureu de reiniciar "
-"l'Audacious."
-
 #: src/audacious/ui_preferences.c:193
 msgid "Auto character encoding detector for:"
 msgstr "Detecció automàtica del joc de caràcters per a:"
 
-#: src/audacious/ui_preferences.c:201
+#: src/audacious/ui_preferences.c:198
 msgid "Fallback character encodings:"
 msgstr "Jocs de caràcters de reserva:"
 
-#: src/audacious/ui_preferences.c:201
-msgid ""
-"List of character encodings used for fall back conversion of metadata. If "
-"automatic character encoding detector failed or has been disabled, encodings "
-"in this list would be treated as candidates of the encoding of metadata, and "
-"fall back conversion from these encodings to UTF-8 would be attempted."
-msgstr ""
-"Llista de jocs de caràcters de reserva per a la conversió de meta-dades. Si "
-"la detecció automàtica falla o està desactivada, els jocs de caràcters "
-"d'aquesta llista s'utilitzaran com a candidats per a la conversió i "
-"s'intentarà una conversió d'aquests jocs de caràcters a UTF-8."
-
-#: src/audacious/ui_preferences.c:205
-#, fuzzy
+#: src/audacious/ui_preferences.c:202
 msgid "Behavior"
-msgstr "Profunditat de bits"
+msgstr "Comportament"
 
-#: src/audacious/ui_preferences.c:206
+#: src/audacious/ui_preferences.c:203
 msgid "Continue playback on startup"
 msgstr "Reprèn la reproducció en engegar"
 
-#: src/audacious/ui_preferences.c:208
+#: src/audacious/ui_preferences.c:205
 msgid "Advance when the current song is deleted"
-msgstr ""
+msgstr "Avançar quan la cançó que s'està reproduint s'elimina"
 
-#: src/audacious/ui_preferences.c:210
-#, fuzzy
+#: src/audacious/ui_preferences.c:207
 msgid "Clear the playlist when opening files"
-msgstr "Crea una llista de reproducció nova amb els elements trobats"
+msgstr "A l'obrir arxius esborrar la llista que s'està reproduint "
 
-#: src/audacious/ui_preferences.c:212
-#, fuzzy
+#: src/audacious/ui_preferences.c:209
 msgid "Open files in a temporary playlist"
-msgstr "Afegeix els fitxers a una llista temporal"
+msgstr "Obrir arxius en llista temporal de reproducció"
 
-#: src/audacious/ui_preferences.c:214
+#: src/audacious/ui_preferences.c:211
 msgid "Metadata"
 msgstr "Meta-dades"
 
-#: src/audacious/ui_preferences.c:454
+#: src/audacious/ui_preferences.c:212
+msgid "Do not load metadata for songs until played"
+msgstr "No desar metadates mentre la cançó s'està reproduint"
+
+#: src/audacious/ui_preferences.c:230
+msgid "TITLE"
+msgstr "TÍTOL"
+
+#: src/audacious/ui_preferences.c:231
+msgid "ARTIST - TITLE"
+msgstr "ARTISTA - TÍTOL"
+
+#: src/audacious/ui_preferences.c:232
+msgid "ARTIST - ALBUM - TITLE"
+msgstr "ARTISTA - ÀLBUM - TÍTOL"
+
+#: src/audacious/ui_preferences.c:233
+msgid "ARTIST - ALBUM - TRACK. TITLE"
+msgstr "ARTISTA - ÀLBUM - PISTA. TÍTOL"
+
+#: src/audacious/ui_preferences.c:234
+msgid "ARTIST [ ALBUM ] - TRACK. TITLE"
+msgstr "ARTISTA [ ÀLBUM ] - PISTA. TÍTOL"
+
+#: src/audacious/ui_preferences.c:235
+msgid "ALBUM - TITLE"
+msgstr "ÀLBUM - TÍTOL"
+
+#: src/audacious/ui_preferences.c:556
 msgid "Category"
 msgstr "Categoria"
 
-#: src/audacious/ui_preferences.c:682
+#: src/audacious/ui_preferences.c:780
 msgid "Popup Information Settings"
 msgstr "Paràmetres de la informació emergent"
 
-#: src/audacious/ui_preferences.c:691
+#: src/audacious/ui_preferences.c:789
 msgid "Cover image retrieve"
 msgstr "Obtenció de la imatge de portada"
 
-#: src/audacious/ui_preferences.c:696
+#: src/audacious/ui_preferences.c:794
 msgid ""
 "While searching for the album's cover, Audacious looks for certain words in "
 "the filename. You can specify those words in the lists below, separated "
 "using commas."
-msgstr ""
-"Per a trobar la portada de l'àlbum, l'Audacious cerca certes paraules tretes "
-"del nom del fitxer. Podeu especificar aquestes paraules a les llistes de "
-"sota, separades per comes."
+msgstr "Per a trobar la portada de l'àlbum, l'Audacious cerca certes paraules tretes del nom del fitxer. Podeu especificar aquestes paraules a les llistes de sota, separades per comes."
 
-#: src/audacious/ui_preferences.c:713
+#: src/audacious/ui_preferences.c:811
 msgid "Exclude:"
 msgstr "Exclou:"
 
-#: src/audacious/ui_preferences.c:720
+#: src/audacious/ui_preferences.c:818
 msgid "Include:"
 msgstr "Inclou:"
 
-#: src/audacious/ui_preferences.c:737
+#: src/audacious/ui_preferences.c:835
 msgid "Recursively search for cover"
 msgstr "Cerca la portada recursivament"
 
-#: src/audacious/ui_preferences.c:747
+#: src/audacious/ui_preferences.c:845
 msgid "Search depth: "
 msgstr "Profunditat de recursió: "
 
-#: src/audacious/ui_preferences.c:761
+#: src/audacious/ui_preferences.c:859
 msgid "Use per-file cover"
 msgstr "Cerca una portada per a cada fitxer"
 
-#: src/audacious/ui_preferences.c:764
+#: src/audacious/ui_preferences.c:862
 msgid "Miscellaneous"
 msgstr "Miscel·lània"
 
-#: src/audacious/ui_preferences.c:773
+#: src/audacious/ui_preferences.c:871
 msgid "Show Progress bar for the current track"
 msgstr "Mostra una barra de progressió per a la pista actual"
 
-#: src/audacious/ui_preferences.c:783
+#: src/audacious/ui_preferences.c:881
 msgid "Delay until filepopup comes up: "
 msgstr "Retard de la finestra emergent: "
 
-#: src/audacious/ui_preferences.c:1283
+#: src/audacious/ui_preferences.c:1309
+msgid "Custom"
+msgstr "Personalitzat"
+
+#: src/audacious/ui_preferences.c:1352
 msgid "Song Display"
 msgstr "Visualització de les cançons"
 
-#: src/audacious/ui_preferences.c:1292
+#: src/audacious/ui_preferences.c:1361
 msgid "Show song numbers"
-msgstr ""
+msgstr "Mostrar el numero de les cançons"
 
-#: src/audacious/ui_preferences.c:1303
+#: src/audacious/ui_preferences.c:1372
 msgid "Show leading zeroes (02:00 instead of 2:00)"
-msgstr ""
+msgstr "Mostrar zeros a l'esquerra (02:00 en comptes de 2:00)"
 
-#: src/audacious/ui_preferences.c:1325
+#: src/audacious/ui_preferences.c:1394
 msgid "Show information about titlestring format"
 msgstr "Mostra informació sobre el format del títol"
 
-#: src/audacious/ui_preferences.c:1339
-msgid "TITLE"
-msgstr "TÍTOL"
-
-#: src/audacious/ui_preferences.c:1340
-msgid "ARTIST - TITLE"
-msgstr "ARTISTA - TÍTOL"
-
-#: src/audacious/ui_preferences.c:1341
-msgid "ARTIST - ALBUM - TITLE"
-msgstr "ARTISTA - ÀLBUM - TÍTOL"
-
-#: src/audacious/ui_preferences.c:1342
-msgid "ARTIST - ALBUM - TRACK. TITLE"
-msgstr "ARTISTA - ÀLBUM - PISTA. TÍTOL"
-
-#: src/audacious/ui_preferences.c:1343
-msgid "ARTIST [ ALBUM ] - TRACK. TITLE"
-msgstr "ARTISTA [ ÀLBUM ] - PISTA. TÍTOL"
-
-#: src/audacious/ui_preferences.c:1344
-msgid "ALBUM - TITLE"
-msgstr "ÀLBUM - TÍTOL"
-
-#: src/audacious/ui_preferences.c:1345
-msgid "Custom"
-msgstr "Personalitzat"
-
-#: src/audacious/ui_preferences.c:1354
+#: src/audacious/ui_preferences.c:1410
 msgid "Custom string:"
 msgstr "Cadena personalitzada:"
 
-#: src/audacious/ui_preferences.c:1361
+#: src/audacious/ui_preferences.c:1417
 msgid "Title format:"
 msgstr "Format del títol:"
 
-#: src/audacious/ui_preferences.c:1372
+#: src/audacious/ui_preferences.c:1428
 msgid "Popup Information"
 msgstr "Informació emergent"
 
-#: src/audacious/ui_preferences.c:1387
+#: src/audacious/ui_preferences.c:1443
 msgid "Show popup information for playlist entries"
-msgstr ""
-"Mostra informació emergent per als elements de la llista de reproducció"
+msgstr "Mostra informació emergent per als elements de la llista de reproducció"
 
-#: src/audacious/ui_preferences.c:1388
+#: src/audacious/ui_preferences.c:1444
 msgid ""
 "Toggles popup information window for the pointed entry in the playlist. The "
 "window shows title of song, name of album, genre, year of publish, track "
 "number, track length, and artwork."
-msgstr ""
-"Activa la finestra emergent d'informació per a les entrades de la llista de "
-"reproducció. La finestra mostra el títol de la cançó, el nom de l'àlbum, el "
-"gènere, l'any de publicació, el número de pista, la durada de la pista i "
-"material artístic."
+msgstr "Activa la finestra emergent d'informació per a les entrades de la llista de reproducció. La finestra mostra el títol de la cançó, el nom de l'àlbum, el gènere, l'any de publicació, el número de pista, la durada de la pista i material artístic."
 
-#: src/audacious/ui_preferences.c:1397
+#: src/audacious/ui_preferences.c:1455
 msgid "Edit settings for popup information"
 msgstr "Edita els paràmetres de la informació emergent"
 
-#: src/audacious/ui_preferences.c:1497
-#, fuzzy
+#: src/audacious/ui_preferences.c:1544
 msgid "Output plugin:"
-msgstr "Connector d'entrada: %s"
+msgstr "Connector de sortida"
 
-#: src/audacious/ui_preferences.c:1556
-#, fuzzy
+#: src/audacious/ui_preferences.c:1603
 msgid "Transport"
-msgstr "Traductors"
+msgstr "Transport"
 
-#: src/audacious/ui_preferences.c:1556
+#: src/audacious/ui_preferences.c:1603
 msgid "Input"
-msgstr ""
+msgstr "Entrada"
 
-#: src/audacious/ui_preferences.c:1557
-#, fuzzy
+#: src/audacious/ui_preferences.c:1604
 msgid "Effect"
-msgstr "Efectes"
+msgstr "Efectes"
 
-#: src/audacious/ui_preferences.c:1557
+#: src/audacious/ui_preferences.c:1604
 msgid "Visualization"
 msgstr "Visualització"
 
-#: src/audacious/ui_preferences.c:1557
+#: src/audacious/ui_preferences.c:1604
 msgid "General"
-msgstr ""
+msgstr "General"
 
-#: src/audacious/ui_preferences.c:1597
+#: src/audacious/ui_preferences.c:1644
 msgid "Audacious Preferences"
 msgstr "Preferències de l'Audacious"
 
-#: src/audacious/util.c:155
+#: src/audacious/util.c:120
 #, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr "No s'ha pogut crear el directori (%s): %s\n"
 
-#: src/audtool/handlers_playlist.c:264
+#: src/audtool/handlers_playlist.c:273
 msgid "Position not found."
-msgstr ""
+msgstr "No es troba aquesta posició."
 
-#: src/audtool/handlers_vitals.c:64
+#: src/audtool/handlers_vitals.c:63
 msgid "No song playing."
-msgstr ""
+msgstr "Aquesta cançó no es pot reproduir."
 
-#: src/libaudcore/tuple.c:685
+#: src/libaudcore/audstrings.c:199
+#, c-format
+msgid "Audio CD, track %s"
+msgstr "CD d'audio, pista %s"
+
+#: src/libaudcore/tuple.c:536
 msgid "Mono"
-msgstr ""
+msgstr "Mono"
 
-#: src/libaudcore/tuple.c:687
-#, fuzzy
+#: src/libaudcore/tuple.c:538
 msgid "Stereo"
-msgstr "estèreo"
+msgstr "Estèreo"
 
-#: src/libaudcore/tuple.c:689
+#: src/libaudcore/tuple.c:540
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Traduccions plurals\n\nun:%d canal"
+msgstr[1] "altres:%d canals"
+
+#: src/libaudgui/about.c:52 src/libaudgui/about.c:115
+msgid "Credits"
+msgstr "Crèdits"
+
+#: src/libaudgui/about.c:52
+msgid "Translators"
+msgstr "Traductors"
+
+#: src/libaudgui/about.c:91
+msgid "About Audacious"
+msgstr "Quant a l'Audacious"
 
-#: src/libaudgui/confirm.c:73
+#: src/libaudgui/confirm.c:76
 #, c-format
 msgid ""
 "Are you sure you want to close %s? If you do, any changes made since the "
 "playlist was exported will be lost."
-msgstr ""
+msgstr "Estar segur de tancar %s? qualsevol canvi que hagi fet a la llista de reproducció es perdrà."
 
-#: src/libaudgui/confirm.c:86
-#, fuzzy
+#: src/libaudgui/confirm.c:89
 msgid "_Don't show this message again"
-msgstr "No mostrar més aquest avís"
+msgstr "_No torni a sortir aquest missatge"
 
-#: src/libaudgui/confirm.c:124
-#, fuzzy
+#: src/libaudgui/confirm.c:126
 msgid "Rename Playlist"
-msgstr "Desa una llista de reproducció"
+msgstr "Reanomena la llista de reproducció"
 
-#: src/libaudgui/effects-menu.c:76
+#: src/libaudgui/effects-menu.c:74
 msgid "settings ..."
-msgstr ""
+msgstr "Opcions..."
 
-#: src/libaudgui/equalizer.c:68
-#, fuzzy
+#: src/libaudgui/equalizer.c:51
 msgid "_Enable"
-msgstr "Actiu"
+msgstr "_Connecta"
 
-#: src/libaudgui/equalizer.c:140
+#: src/libaudgui/equalizer.c:123
 msgid "31 Hz"
-msgstr ""
+msgstr "31 Hz"
 
-#: src/libaudgui/equalizer.c:140
+#: src/libaudgui/equalizer.c:123
 msgid "63 Hz"
-msgstr ""
+msgstr "63 Hz"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "125 Hz"
-msgstr ""
+msgstr "125 Hz"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "250 Hz"
-msgstr ""
+msgstr "250 Hz"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "500 Hz"
-msgstr ""
+msgstr "500 Hz"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "1 kHz"
-msgstr ""
+msgstr "1 kHz"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "2 kHz"
-msgstr ""
+msgstr "2 kHz"
 
-#: src/libaudgui/equalizer.c:142
+#: src/libaudgui/equalizer.c:125
 msgid "4 kHz"
-msgstr ""
+msgstr "4 kHz"
 
-#: src/libaudgui/equalizer.c:142
+#: src/libaudgui/equalizer.c:125
 msgid "8 kHz"
-msgstr ""
+msgstr "8 kHz"
 
-#: src/libaudgui/equalizer.c:142
+#: src/libaudgui/equalizer.c:125
 msgid "16 kHz"
-msgstr ""
+msgstr "16 kHz"
 
-#: src/libaudgui/equalizer.c:147
-#, fuzzy
+#: src/libaudgui/equalizer.c:130
 msgid "Equalizer"
-msgstr "Mostra l'equalitzador"
+msgstr "Equalitzador"
 
-#: src/libaudgui/equalizer.c:163
-#, fuzzy
+#: src/libaudgui/equalizer.c:146
 msgid "Preamp"
-msgstr "Preamp:"
+msgstr "Preamplificador"
 
-#: src/libaudgui/infopopup.c:212
+#: src/libaudgui/infopopup.c:207
 msgid "Track Number"
 msgstr "Número de pista"
 
-#: src/libaudgui/infopopup.c:214
+#: src/libaudgui/infopopup.c:209
 msgid "Track Length"
 msgstr "Durada de la pista:"
 
-#: src/libaudgui/infowin.c:77
+#: src/libaudgui/infowin.c:75
 msgid "Acid Jazz"
 msgstr "Jazz àcid"
 
-#: src/libaudgui/infowin.c:78
-#, fuzzy
+#: src/libaudgui/infowin.c:76
 msgid "Acid Rock"
-msgstr "Rock dur"
+msgstr "Acid Rock"
 
-#: src/libaudgui/infowin.c:79
+#: src/libaudgui/infowin.c:77
 msgid "Ambient"
 msgstr "Ambiental"
 
-#: src/libaudgui/infowin.c:80
-#, fuzzy
+#: src/libaudgui/infowin.c:78
 msgid "Bebop"
 msgstr "Bebop"
 
-#: src/libaudgui/infowin.c:81
+#: src/libaudgui/infowin.c:79
 msgid "Bluegrass"
 msgstr "Bluegrass"
 
-#: src/libaudgui/infowin.c:82
+#: src/libaudgui/infowin.c:80
 msgid "Blues"
 msgstr "Blues"
 
-#: src/libaudgui/infowin.c:83
+#: src/libaudgui/infowin.c:81
 msgid "Chamber Music"
 msgstr "Música de cambra"
 
-#: src/libaudgui/infowin.c:84
+#: src/libaudgui/infowin.c:82
 msgid "Classical"
 msgstr "Clàssica"
 
-#: src/libaudgui/infowin.c:85
+#: src/libaudgui/infowin.c:83
 msgid "Country"
 msgstr "Country"
 
-#: src/libaudgui/infowin.c:86
+#: src/libaudgui/infowin.c:84
 msgid "Death Metal"
 msgstr "Death metal"
 
-#: src/libaudgui/infowin.c:87
+#: src/libaudgui/infowin.c:85
 msgid "Disco"
 msgstr "Disco"
 
-#: src/libaudgui/infowin.c:88
+#: src/libaudgui/infowin.c:86
 msgid "Easy Listening"
 msgstr "Easy listening"
 
-#: src/libaudgui/infowin.c:89
+#: src/libaudgui/infowin.c:87
 msgid "Folk"
 msgstr "Folk"
 
-#: src/libaudgui/infowin.c:90
+#: src/libaudgui/infowin.c:88
 msgid "Funk"
 msgstr "Funk"
 
-#: src/libaudgui/infowin.c:91
+#: src/libaudgui/infowin.c:89
 msgid "Gangsta Rap"
 msgstr "Rap gangsta"
 
-#: src/libaudgui/infowin.c:92
+#: src/libaudgui/infowin.c:90
 msgid "Gospel"
 msgstr "Gospel"
 
-#: src/libaudgui/infowin.c:93
+#: src/libaudgui/infowin.c:91
 msgid "Grunge"
 msgstr "Grunge"
 
-#: src/libaudgui/infowin.c:94
+#: src/libaudgui/infowin.c:92
 msgid "Hard Rock"
 msgstr "Rock dur"
 
-#: src/libaudgui/infowin.c:95
+#: src/libaudgui/infowin.c:93
 msgid "Heavy Metal"
 msgstr "Heavy metal"
 
-#: src/libaudgui/infowin.c:96
-#, fuzzy
+#: src/libaudgui/infowin.c:94
 msgid "Hip-hop"
 msgstr "Hip-hop"
 
-#: src/libaudgui/infowin.c:97
+#: src/libaudgui/infowin.c:95
 msgid "House"
 msgstr "House"
 
-#: src/libaudgui/infowin.c:98
+#: src/libaudgui/infowin.c:96
 msgid "Jazz"
 msgstr "Jazz"
 
-#: src/libaudgui/infowin.c:99
+#: src/libaudgui/infowin.c:97
 msgid "Jungle"
 msgstr "Jungle"
 
-#: src/libaudgui/infowin.c:100
+#: src/libaudgui/infowin.c:98
 msgid "Metal"
 msgstr "Metal"
 
-#: src/libaudgui/infowin.c:101
+#: src/libaudgui/infowin.c:99
 msgid "New Age"
 msgstr "New age"
 
-#: src/libaudgui/infowin.c:102
+#: src/libaudgui/infowin.c:100
 msgid "New Wave"
 msgstr "New wave"
 
-#: src/libaudgui/infowin.c:103
+#: src/libaudgui/infowin.c:101
 msgid "Noise"
 msgstr "Soroll"
 
-#: src/libaudgui/infowin.c:104
+#: src/libaudgui/infowin.c:102
 msgid "Pop"
 msgstr "Pop"
 
-#: src/libaudgui/infowin.c:105
+#: src/libaudgui/infowin.c:103
 msgid "Punk Rock"
 msgstr "Punk rock"
 
-#: src/libaudgui/infowin.c:106
+#: src/libaudgui/infowin.c:104
 msgid "Rap"
 msgstr "Rap"
 
-#: src/libaudgui/infowin.c:107
+#: src/libaudgui/infowin.c:105
 msgid "Reggae"
 msgstr "Reggae"
 
-#: src/libaudgui/infowin.c:108
+#: src/libaudgui/infowin.c:106
 msgid "Rock"
 msgstr "Rock"
 
-#: src/libaudgui/infowin.c:109
-#, fuzzy
+#: src/libaudgui/infowin.c:107
 msgid "Rock and Roll"
-msgstr "Rock & roll"
+msgstr "Rock and Roll"
 
-#: src/libaudgui/infowin.c:110
+#: src/libaudgui/infowin.c:108
 msgid "Rhythm and Blues"
-msgstr ""
+msgstr "Rhythm and Blues"
 
-#: src/libaudgui/infowin.c:111
+#: src/libaudgui/infowin.c:109
 msgid "Ska"
 msgstr "Ska"
 
-#: src/libaudgui/infowin.c:112
+#: src/libaudgui/infowin.c:110
 msgid "Soul"
 msgstr "Soul"
 
-#: src/libaudgui/infowin.c:113
+#: src/libaudgui/infowin.c:111
 msgid "Swing"
 msgstr "Swing"
 
-#: src/libaudgui/infowin.c:114
+#: src/libaudgui/infowin.c:112
 msgid "Techno"
 msgstr "Tecno"
 
-#: src/libaudgui/infowin.c:115
-#, fuzzy
+#: src/libaudgui/infowin.c:113
 msgid "Trip-hop"
-msgstr "Trip-Hop"
+msgstr "Trip-hop"
 
-#: src/libaudgui/infowin.c:175 src/libaudgui/infowin.c:361
-#: src/libaudgui/infowin.c:364 src/libaudgui/infowin.c:367
+#: src/libaudgui/infowin.c:177 src/libaudgui/infowin.c:363
+#: src/libaudgui/infowin.c:366 src/libaudgui/infowin.c:369
 msgid "n/a"
 msgstr "n/d"
 
-#: src/libaudgui/infowin.c:265
+#: src/libaudgui/infowin.c:267
 msgid "Metadata updated successfully"
 msgstr "Les meta-dades s'han actualitzat correctament"
 
-#: src/libaudgui/infowin.c:270
+#: src/libaudgui/infowin.c:272
 msgid "Metadata updating failed"
 msgstr "Ha fallat l'actualització de les meta-dades"
 
-#: src/libaudgui/infowin.c:318
+#: src/libaudgui/infowin.c:320
 msgid "Track Information"
 msgstr "Informació de la pista"
 
-#: src/libaudgui/infowin.c:350
+#: src/libaudgui/infowin.c:352
 msgid "Format:"
 msgstr "Format:"
 
-#: src/libaudgui/infowin.c:354
+#: src/libaudgui/infowin.c:356
 msgid "Quality:"
 msgstr "Qualitat:"
 
-#: src/libaudgui/infowin.c:357
+#: src/libaudgui/infowin.c:359
 msgid "Bitrate:"
 msgstr "Flux de bits:"
 
-#: src/libaudgui/infowin.c:387
+#: src/libaudgui/infowin.c:389
 msgid "Title"
 msgstr "Títol"
 
-#: src/libaudgui/infowin.c:399
+#: src/libaudgui/infowin.c:401
 msgid "Artist"
 msgstr "Artista"
 
-#: src/libaudgui/infowin.c:411
+#: src/libaudgui/infowin.c:413
 msgid "Album"
 msgstr "Àlbum"
 
-#: src/libaudgui/infowin.c:423
+#: src/libaudgui/infowin.c:425
 msgid "Comment"
 msgstr "Comentari"
 
-#: src/libaudgui/infowin.c:435
+#: src/libaudgui/infowin.c:437
 msgid "Genre"
 msgstr "Gènere"
 
-#: src/libaudgui/infowin.c:456
+#: src/libaudgui/infowin.c:458
 msgid "Year"
 msgstr "Any"
 
-#: src/libaudgui/infowin.c:467
+#: src/libaudgui/infowin.c:469
 msgid "Track Number"
 msgstr "Número de pista"
 
-#: src/libaudgui/infowin.c:549
+#: src/libaudgui/infowin.c:548
 #, c-format
 msgid "%d kb/s"
 msgstr "%d kb/s"
 
-#: src/libaudgui/infowin.c:579
+#: src/libaudgui/infowin.c:575
 #, c-format
 msgid "No info available for %s.\n"
-msgstr ""
+msgstr "No hi ha informació disponible per %s.⏎\n\n"
 
-#: src/libaudgui/jump-to-time.c:75
+#: src/libaudgui/jump-to-time.c:72
 msgid "Jump to Time"
 msgstr "Salta al temps"
 
-#: src/libaudgui/jump-to-time.c:90
+#: src/libaudgui/jump-to-time.c:87
 msgid "mm:ss"
-msgstr ""
+msgstr "mm:ss"
 
-#: src/libaudgui/playlists.c:39
-#, fuzzy
+#: src/libaudgui/playlists.c:33
 msgid "Export Playlist"
-msgstr "Carrega una llista de reproducció"
+msgstr "Exportar llista de reproducció"
 
-#: src/libaudgui/playlists.c:39
-#, fuzzy
+#: src/libaudgui/playlists.c:33
 msgid "Import Playlist"
-msgstr "Carrega una llista de reproducció"
+msgstr "Importar llista de reproducció"
 
-#: src/libaudgui/playlists.c:71
+#: src/libaudgui/playlists.c:66
 #, c-format
 msgid "Overwrite %s?"
-msgstr ""
+msgstr "Reescriure %s?"
 
-#: src/libaudgui/ui_about.c:71
-msgid "About Audacious"
-msgstr "Quant a l'Audacious"
+#: src/libaudgui/queue-manager.c:196
+msgid "Queue Manager"
+msgstr "Gestor de cues"
 
-#: src/libaudgui/ui_about.c:93 src/libaudgui/ui_credits.c:122
-msgid "Credits"
-msgstr "Crèdits"
-
-#: src/libaudgui/ui_credits.c:126
-msgid "Translators"
-msgstr "Traductors"
-
-#: src/libaudgui/ui_fileopener.c:108
+#: src/libaudgui/ui_fileopener.c:109
 msgid "Open Files"
 msgstr "Obre els fitxers"
 
-#: src/libaudgui/ui_fileopener.c:108
+#: src/libaudgui/ui_fileopener.c:109
 msgid "Add Files"
 msgstr "Afegeix els fitxers"
 
-#: src/libaudgui/ui_fileopener.c:110
+#: src/libaudgui/ui_fileopener.c:111
 msgid "Close dialog on Open"
 msgstr "Tanca el diàleg en obrir"
 
-#: src/libaudgui/ui_fileopener.c:110
+#: src/libaudgui/ui_fileopener.c:111
 msgid "Close dialog on Add"
 msgstr "Tanca el diàleg en afegir"
 
-#: src/libaudgui/ui_jumptotrack.c:133
-msgid "Un_queue"
-msgstr "Treu de la _cua"
-
-#: src/libaudgui/ui_jumptotrack.c:135 src/libaudgui/ui_jumptotrack.c:512
+#: src/libaudgui/ui_jumptotrack.c:109 src/libaudgui/ui_jumptotrack.c:117
+#: src/libaudgui/ui_jumptotrack.c:326
 msgid "_Queue"
 msgstr "_Posa a la cua"
 
-#: src/libaudgui/ui_jumptotrack.c:399
-msgid "Jump to Track"
-msgstr "Salta a la pista"
+#: src/libaudgui/ui_jumptotrack.c:115
+msgid "Un_queue"
+msgstr "Treu de la _cua"
+
+#: src/libaudgui/ui_jumptotrack.c:258
+msgid "Jump to Song"
+msgstr "Salta a la cançó"
 
-#: src/libaudgui/ui_jumptotrack.c:442
+#: src/libaudgui/ui_jumptotrack.c:281
 msgid "Filter: "
 msgstr "Filtre: "
 
-#: src/libaudgui/ui_jumptotrack.c:443
+#: src/libaudgui/ui_jumptotrack.c:282
 msgid "_Filter:"
 msgstr "_Filtre:"
 
-#: src/libaudgui/ui_jumptotrack.c:461
+#: src/libaudgui/ui_jumptotrack.c:292
 msgid "Remember"
 msgstr "Recorda"
 
-#: src/libaudgui/ui_jumptotrack.c:470
-#, fuzzy
+#: src/libaudgui/ui_jumptotrack.c:299
 msgid "Clea_r"
-msgstr "Esborra A-B"
+msgstr "Neteja"
 
-#: src/libaudgui/ui_jumptotrack.c:504
+#: src/libaudgui/ui_jumptotrack.c:319
 msgid "Close on Jump"
 msgstr "Tanca en saltar"
 
-#: src/libaudgui/ui_playlist_manager.c:240
+#: src/libaudgui/ui_playlist_manager.c:253
 msgid "Playlist Manager"
 msgstr "Gestor de llistes"
 
-#: src/libaudgui/ui_playlist_manager.c:264
+#: src/libaudgui/ui_playlist_manager.c:280
 msgid "Entries"
 msgstr "Elements"
 
-#: src/libaudgui/ui_playlist_manager.c:285
+#: src/libaudgui/ui_playlist_manager.c:301
 msgid "_Rename"
 msgstr "_Reanomena"
 
-#: src/libaudgui/ui_playlist_manager.c:309
-#, fuzzy
+#: src/libaudgui/ui_playlist_manager.c:325
 msgid "_Close dialog on activating playlist"
-msgstr "Tanca el diàleg en obrir"
+msgstr "_Tancar diàlegs al activar llista de reproducció"
 
-#: src/libaudgui/ui_urlopener.c:58
+#: src/libaudgui/ui_urlopener.c:48
 msgid "Open URL"
-msgstr ""
+msgstr "Obrir URL"
 
-#: src/libaudgui/ui_urlopener.c:58
+#: src/libaudgui/ui_urlopener.c:48
 msgid "Add URL"
-msgstr ""
+msgstr "Afegir URL"
 
 #: src/libaudgui/util.c:95
 msgid ""
 "\n"
 "(Further messages have been hidden.)"
-msgstr ""
+msgstr "\n(Els missatges següents han estat amagats.)"
 
 #: src/libeggsmclient/eggdesktopfile.c:165
 msgid "File is not a valid .desktop file"
 msgstr "El fitxer no és un fitxer \"desktop\" vàlid"
 
-#: src/libeggsmclient/eggdesktopfile.c:188
+#: src/libeggsmclient/eggdesktopfile.c:191
 #, c-format
 msgid "Unrecognized desktop file Version '%s'"
 msgstr "Versió del fitxer \"desktop\" no reconeguda: '%s'"
 
-#: src/libeggsmclient/eggdesktopfile.c:967
+#: src/libeggsmclient/eggdesktopfile.c:974
 #, c-format
 msgid "Starting %s"
 msgstr "Començant %s"
 
-#: src/libeggsmclient/eggdesktopfile.c:1108
+#: src/libeggsmclient/eggdesktopfile.c:1116
 msgid "Application does not accept documents on command line"
 msgstr "L'aplicació no admet documents a la línia d'ordres"
 
-#: src/libeggsmclient/eggdesktopfile.c:1176
+#: src/libeggsmclient/eggdesktopfile.c:1184
 #, c-format
 msgid "Unrecognized launch option: %d"
 msgstr "Opció d'iniciació no reconeguda: %d"
 
-#: src/libeggsmclient/eggdesktopfile.c:1375
+#: src/libeggsmclient/eggdesktopfile.c:1391
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
-msgstr ""
-"No es poden passar URIs de documents a una entrada d'escriptori 'Type=Link'"
+msgstr "No es poden passar URIs de documents a una entrada d'escriptori 'Type=Link'"
 
-#: src/libeggsmclient/eggdesktopfile.c:1396
+#: src/libeggsmclient/eggdesktopfile.c:1412
 msgid "Not a launchable item"
 msgstr "No és un element iniciable"
 
@@ -1256,1993 +1213,9 @@
 msgstr "ID"
 
 #: src/libeggsmclient/eggsmclient.c:253
-#, fuzzy
 msgid "Session management options:"
-msgstr "Opcions de gestió de sessió"
+msgstr "Opcions de gestió de sessions "
 
 #: src/libeggsmclient/eggsmclient.c:254
-#, fuzzy
 msgid "Show session management options"
-msgstr "Mostra les opcions de gestió de sessió"
-
-#~ msgid "Replay Gain"
-#~ msgstr "Replay Gain"
-
-#~ msgid "Bit Depth"
-#~ msgstr "Profunditat de bits"
-
-#~ msgid ""
-#~ "All streams will be converted to this bit depth.\n"
-#~ "This should be the max supported bit depth of\n"
-#~ "the sound card or output plugin."
-#~ msgstr ""
-#~ "Tots els fluxos es convertiran a aquesta profunditat.\n"
-#~ "Aquesta hauria de correspondre amb la profunditat de bits\n"
-#~ "màxima que suporta la targeta de so o el connector de sortida."
-
-#~ msgid "Volume Control"
-#~ msgstr "Control de volum"
-
-#~ msgid ""
-#~ "Use software volume control. This may be useful for situations where your "
-#~ "audio system does not support controlling the playback volume."
-#~ msgstr ""
-#~ "Usa el control de volum per programari. Això pot resultar útil en "
-#~ "situacions en que el sistema d'àudio no permet controlar el volum de "
-#~ "reproducció."
-
-#, fuzzy
-#~ msgid "Mode"
-#~ msgstr "Meta-dades"
-
-#, fuzzy
-#~ msgid "Clipping Prevention"
-#~ msgstr "Informació emergent"
-
-#, fuzzy
-#~ msgid "Enable clipping prevention"
-#~ msgstr "Activa la prevenció d'escapçaments"
-
-#~ msgid "Audio System"
-#~ msgstr "Sistema d'àudio"
-
-#~ msgid "Current output plugin:"
-#~ msgstr "Connector de sortida actiu:"
-
-#~ msgid "Display all open Audacious windows"
-#~ msgstr "Mostra totes les finestres obertes"
-
-#~ msgid "%s: Unable to open display, exiting.\n"
-#~ msgstr "%s: No s'ha pogut obrir la pantalla, sortint.\n"
-
-#~ msgid "Preamp:"
-#~ msgstr "Preamp:"
-
-#~ msgid "Default gain:"
-#~ msgstr "Guany per defecte:"
-
-#~ msgid "This gain will be used if file doesn't contain Replay Gain metadata."
-#~ msgstr ""
-#~ "Aquest valor de guany s'utilitzarà si el fitxer no conté meta-dades "
-#~ "Replay Gain."
-
-#~ msgid ""
-#~ "Please remember that the most efficient way to "
-#~ "prevent signal clipping is not to use positive values above."
-#~ msgstr ""
-#~ "Recordeu que la forma més efectiva de prevenir "
-#~ "escapçaments del senyal és no utilitzar valors positius aquí dalt."
-
-#~ msgid "Replay Gain configuration"
-#~ msgstr "Configuració del Replay Gain"
-
-#~ msgid "Track gain/peak"
-#~ msgstr "Pista"
-
-#~ msgid "Album gain/peak"
-#~ msgstr "Àlbum"
-
-#~ msgid "Use peak value from Replay Gain info for clipping prevention"
-#~ msgstr ""
-#~ "Usa el valor de pic de la informació Replay Gain per a prevenir "
-#~ "escapçaments"
-
-#~ msgid "Classic Rock"
-#~ msgstr "Rock clàssic"
-
-#~ msgid "Dance"
-#~ msgstr "Dance"
-
-#~ msgid "Oldies"
-#~ msgstr "Antigues"
-
-#~ msgid "Other"
-#~ msgstr "Altres"
-
-#~ msgid "R&B"
-#~ msgstr "Rythm & blues"
-
-#~ msgid "Industrial"
-#~ msgstr "Industrial"
-
-#~ msgid "Alternative"
-#~ msgstr "Alternativa"
-
-#~ msgid "Pranks"
-#~ msgstr "Bromes"
-
-#~ msgid "Soundtrack"
-#~ msgstr "Banda sonora"
-
-#~ msgid "Euro-Techno"
-#~ msgstr "Euro-tecno"
-
-#~ msgid "Vocal"
-#~ msgstr "Vocal"
-
-#~ msgid "Jazz+Funk"
-#~ msgstr "Jazz+Funk"
-
-#~ msgid "Fusion"
-#~ msgstr "Fusió"
-
-#~ msgid "Trance"
-#~ msgstr "Trance"
-
-#~ msgid "Instrumental"
-#~ msgstr "Instrumental"
-
-#~ msgid "Acid"
-#~ msgstr "Àcida"
-
-#~ msgid "Game"
-#~ msgstr "Jocs"
-
-#~ msgid "Sound Clip"
-#~ msgstr "Clip d'àudio"
-
-#~ msgid "AlternRock"
-#~ msgstr "Rock alternatiu"
-
-#~ msgid "Bass"
-#~ msgstr "Bass"
-
-#~ msgid "Punk"
-#~ msgstr "Punk"
-
-#~ msgid "Space"
-#~ msgstr "Espacial"
-
-#~ msgid "Meditative"
-#~ msgstr "Meditativa"
-
-#~ msgid "Instrumental Pop"
-#~ msgstr "Pop instrumental"
-
-#~ msgid "Instrumental Rock"
-#~ msgstr "Rock instrumental"
-
-#~ msgid "Ethnic"
-#~ msgstr "Ètnica"
-
-#~ msgid "Gothic"
-#~ msgstr "Gòtica"
-
-#~ msgid "Darkwave"
-#~ msgstr "Darkwave"
-
-#~ msgid "Techno-Industrial"
-#~ msgstr "Tecno-industrial"
-
-#~ msgid "Electronic"
-#~ msgstr "Electrònica"
-
-#~ msgid "Pop-Folk"
-#~ msgstr "Pop-folk"
-
-#~ msgid "Eurodance"
-#~ msgstr "Eurodance"
-
-#~ msgid "Dream"
-#~ msgstr "Dream"
-
-#~ msgid "Southern Rock"
-#~ msgstr "Rock del sud"
-
-#~ msgid "Comedy"
-#~ msgstr "Comèdia"
-
-#~ msgid "Cult"
-#~ msgstr "De culte"
-
-#~ msgid "Top 40"
-#~ msgstr "Top 40"
-
-#~ msgid "Christian Rap"
-#~ msgstr "Rap cristià"
-
-#~ msgid "Pop/Funk"
-#~ msgstr "Pop/Funk"
-
-#~ msgid "Native American"
-#~ msgstr "Nativa americana"
-
-#~ msgid "Cabaret"
-#~ msgstr "Cabaret"
-
-#~ msgid "Psychedelic"
-#~ msgstr "Psiquedèlica"
-
-#~ msgid "Rave"
-#~ msgstr "Rave"
-
-#~ msgid "Showtunes"
-#~ msgstr "Showtunes"
-
-#~ msgid "Trailer"
-#~ msgstr "Tràiler"
-
-#~ msgid "Lo-Fi"
-#~ msgstr "Lo-fi"
-
-#~ msgid "Tribal"
-#~ msgstr "Tribal"
-
-#~ msgid "Acid Punk"
-#~ msgstr "Punk àcid"
-
-#~ msgid "Polka"
-#~ msgstr "Polca"
-
-#~ msgid "Retro"
-#~ msgstr "Retro"
-
-#~ msgid "Musical"
-#~ msgstr "Musical"
-
-#~ msgid "Folk/Rock"
-#~ msgstr "Folk/Rock"
-
-#~ msgid "National Folk"
-#~ msgstr "Folk nacional"
-
-#~ msgid "Fast-Fusion"
-#~ msgstr "Fast-fusion"
-
-#~ msgid "Latin"
-#~ msgstr "Llatina"
-
-#~ msgid "Revival"
-#~ msgstr "Revival"
-
-#~ msgid "Celtic"
-#~ msgstr "Cèltica"
-
-#~ msgid "Avantgarde"
-#~ msgstr "Avantguardista"
-
-#~ msgid "Gothic Rock"
-#~ msgstr "Rock gòtic"
-
-#~ msgid "Progressive Rock"
-#~ msgstr "Rock progressiu"
-
-#~ msgid "Psychedelic Rock"
-#~ msgstr "Rock psiquedèlic"
-
-#~ msgid "Symphonic Rock"
-#~ msgstr "Rock simfònic"
-
-#~ msgid "Slow Rock"
-#~ msgstr "Rock lent"
-
-#~ msgid "Big Band"
-#~ msgstr "Big band"
-
-#~ msgid "Chorus"
-#~ msgstr "Cors"
-
-#~ msgid "Acoustic"
-#~ msgstr "Acústica"
-
-#~ msgid "Humour"
-#~ msgstr "Humor"
-
-#~ msgid "Speech"
-#~ msgstr "Parla"
-
-#~ msgid "Chanson"
-#~ msgstr "Chanson"
-
-#~ msgid "Opera"
-#~ msgstr "Òpera"
-
-#~ msgid "Sonata"
-#~ msgstr "Sonata"
-
-#~ msgid "Symphony"
-#~ msgstr "Simfonia"
-
-#~ msgid "Booty Bass"
-#~ msgstr "Booty bass"
-
-#~ msgid "Primus"
-#~ msgstr "Primus"
-
-#~ msgid "Porn Groove"
-#~ msgstr "Groove pornogràfic"
-
-#~ msgid "Satire"
-#~ msgstr "Sàtira"
-
-#~ msgid "Slow Jam"
-#~ msgstr "Jam lent"
-
-#~ msgid "Club"
-#~ msgstr "Club"
-
-#~ msgid "Tango"
-#~ msgstr "Tango"
-
-#~ msgid "Samba"
-#~ msgstr "Samba"
-
-#~ msgid "Folklore"
-#~ msgstr "Folklòrica"
-
-#~ msgid "Ballad"
-#~ msgstr "Balada"
-
-#~ msgid "Power Ballad"
-#~ msgstr "Balada enèrgica"
-
-#~ msgid "Rhythmic Soul"
-#~ msgstr "Soul rítmic"
-
-#~ msgid "Freestyle"
-#~ msgstr "Freestyle"
-
-#~ msgid "Duet"
-#~ msgstr "Duet"
-
-#~ msgid "Drum Solo"
-#~ msgstr "Solo de bateria"
-
-#~ msgid "A Cappella"
-#~ msgstr "A capella"
-
-#~ msgid "Euro-House"
-#~ msgstr "Euro-house"
-
-#~ msgid "Dance Hall"
-#~ msgstr "Dance Hall"
-
-#~ msgid "Goa"
-#~ msgstr "Goa"
-
-#~ msgid "Drum & Bass"
-#~ msgstr "Drum & bass"
-
-#~ msgid "Club-House"
-#~ msgstr "Club-house"
-
-#~ msgid "Hardcore"
-#~ msgstr "Hardcore"
-
-#~ msgid "Terror"
-#~ msgstr "Terror"
-
-#~ msgid "Indie"
-#~ msgstr "Independent"
-
-#~ msgid "BritPop"
-#~ msgstr "Pop britànic"
-
-#~ msgid "Negerpunk"
-#~ msgstr "Punk negre"
-
-#~ msgid "Polsk Punk"
-#~ msgstr "Punk polonès"
-
-#~ msgid "Beat"
-#~ msgstr "Beat"
-
-#~ msgid "Christian Gangsta Rap"
-#~ msgstr "Rap gangsta cristià"
-
-#~ msgid "Black Metal"
-#~ msgstr "Black metal"
-
-#~ msgid "Crossover"
-#~ msgstr "Crossover"
-
-#~ msgid "Contemporary Christian"
-#~ msgstr "Cristiana contemporània"
-
-#~ msgid "Christian Rock"
-#~ msgstr "Rock cristià"
-
-#~ msgid "Merengue"
-#~ msgstr "Merengue"
-
-#~ msgid "Salsa"
-#~ msgstr "Salsa"
-
-#~ msgid "Thrash Metal"
-#~ msgstr "Thrash metal"
-
-#~ msgid "Anime"
-#~ msgstr "Anime"
-
-#~ msgid "JPop"
-#~ msgstr "JPop"
-
-#~ msgid "Synthpop"
-#~ msgstr "Synthpop"
-
-#, fuzzy
-#~ msgid ""
-#~ "<big>Audacious %s</big>\n"
-#~ "An audio player for many platforms.\n"
-#~ "Copyright (C) 2005-2011 Audacious Development Team"
-#~ msgstr ""
-#~ "<big>Audacious %s</big>\n"
-#~ "Un reproductor multimèdia amb decoracions per a diverses plataformes.\n"
-#~ "\n"
-#~ "Copyright (C) 2005-2007 Equip de Desenvolupament de l'Audacious\n"
-
-#~ msgid "Unable to create log file (%s)!\n"
-#~ msgstr "No s'ha pogut crear el fitxer de registre (%s)!\n"
-
-#~ msgid "Print all errors and warnings to stdout"
-#~ msgstr "Envia tots els errors i avisos a ‘stdout’"
-
-#~ msgid "Used in macpacking"
-#~ msgstr "Usat en l'empaquetat per a Mac"
-
-#~ msgid "Sorry, threads aren't supported on your platform.\n"
-#~ msgstr "Aquesta plataforma no suporta fils.\n"
-
-#~ msgid "Module loading not supported! Plugins will not be loaded.\n"
-#~ msgstr "Càrrega de mòduls no suportada! No es carregarà cap connector.\n"
-
-#, fuzzy
-#~ msgid "Audacious - Unsupported Version Warning"
-#~ msgstr "Audacious- avís de motor GTK defectuós"
-
-#~ msgid "Playback"
-#~ msgstr "Reproducció"
-
-#~ msgid "Playback"
-#~ msgstr "Reproducció"
-
-#~ msgid ""
-#~ "When Audacious starts, automatically begin playing from the point where "
-#~ "we stopped before."
-#~ msgstr ""
-#~ "Quan l'Audacious s'engega, automàticament continua la reproducció en el "
-#~ "punt on es va aturar."
-
-#~ msgid "Don't advance in the playlist"
-#~ msgstr "Discontinua la reproducció programada"
-
-#~ msgid ""
-#~ "When finished playing a song, don't automatically advance to the next."
-#~ msgstr "Quan s'acaba una cançó, no avança automàticament a la següent."
-
-#~ msgid "Enabled"
-#~ msgstr "Actiu"
-
-#~ msgid "Description"
-#~ msgstr "Descripció"
-
-#~ msgid "Output Plugin Preferences"
-#~ msgstr "Preferències del connector de sortida"
-
-#~ msgid "Output Plugin Information"
-#~ msgstr "Informació sobre el connector de sortida"
-
-#~ msgid "_Decoder list:"
-#~ msgstr "Llista de _descodificadors:"
-
-#~ msgid "Decoders"
-#~ msgstr "Descodificadors"
-
-#~ msgid "_General plugin list:"
-#~ msgstr "Llista de connectors _generals:"
-
-#~ msgid "General"
-#~ msgstr "General"
-
-#~ msgid "_Visualization plugin list:"
-#~ msgstr "Llista de connectors de _visualització:"
-
-#~ msgid "Visualization"
-#~ msgstr "Visualització"
-
-#, fuzzy
-#~ msgid "Effect plugins:"
-#~ msgstr "Llista de connectors d'_efectes:"
-
-#~ msgid "General"
-#~ msgstr "General"
-
-#~ msgid "Location"
-#~ msgstr "Ubicació"
-
-#~ msgid "Raw Metadata"
-#~ msgstr "Meta-dades en brut"
-
-#~ msgid "Key"
-#~ msgstr "Clau"
-
-#~ msgid "Value"
-#~ msgstr "Valor"
-
-#, fuzzy
-#~ msgid ""
-#~ "Available interfaces:\n"
-#~ "\n"
-#~ msgstr "_Valors programats disponibles:"
-
-#, fuzzy
-#~ msgid "Available Plugin Preferences:\n"
-#~ msgstr "_Valors programats disponibles:"
-
-#~ msgid "Add/Open URL Dialog"
-#~ msgstr "Afegeix o obre un URL"
-
-# apòstrof
-#~ msgid "Enter location to play:"
-#~ msgstr "Introduïu la ubicació a reproduir:"
-
-#~ msgid "Don't clear the playlist"
-#~ msgstr "No neteja la llista de reproducció"
-
-#~ msgid "audacious: %s"
-#~ msgstr "audacious: %s"
-
-#~ msgid "Filename:"
-#~ msgstr "Nom del fitxer:"
-
-#~ msgid "No input plugin recognized this file"
-#~ msgstr "Cap connector d'entrada reconeix aquest fitxer"
-
-#~ msgid ""
-#~ "<big>No output plugin selected.</big>\n"
-#~ "You have not selected an output plugin."
-#~ msgstr ""
-#~ "<big>No hi ha cap connector de sortida seleccionat.</big>\n"
-#~ "No heu seleccionat cap connector de sortida."
-
-#~ msgid "Connectivity"
-#~ msgstr "Connectivitat"
-
-#~ msgid "Best Sinc Interpolation"
-#~ msgstr "Interpolació sinc millor possible"
-
-#~ msgid "Medium Sinc Interpolation"
-#~ msgstr "Interpolació sinc mitjana"
-
-#~ msgid "Fastest Sinc Interpolation"
-#~ msgstr "Interpolació sinc més ràpida possible"
-
-#~ msgid "ZOH Interpolation"
-#~ msgstr "Interpolació ZOH"
-
-#~ msgid "Linear Interpolation"
-#~ msgstr "Interpolació lineal"
-
-#~ msgid "Sampling Rate [Hz]:"
-#~ msgstr "Freqüència de mostra [Hz]:"
-
-#~ msgid "Interpolation Engine:"
-#~ msgstr "Motor d'interpolació:"
-
-#~ msgid ""
-#~ "All streams will be converted to this sampling "
-#~ "rate.\n"
-#~ "This should be the max supported sampling rate of\n"
-#~ "the sound card or output plugin."
-#~ msgstr ""
-#~ "Tots els fluxos es convertiran a aquesta freqüència "
-#~ "de mostra.\n"
-#~ "Tal freqüència hauria de ser la màxima permesa per la targeta de so o el\n"
-#~ "connector de sortida."
-
-#~ msgid "Detect file formats by extension."
-#~ msgstr "Detecta el format dels fitxers a partir de l'extensió."
-
-#~ msgid ""
-#~ "When checked, Audacious will detect file formats based by extension. Only "
-#~ "files with extensions of supported formats will be loaded."
-#~ msgstr ""
-#~ "Quan està marcada, l'Audacious detectarà els formats basant-se en les "
-#~ "extensions dels fitxers. Només es carregaran els fitxers que tinguin una "
-#~ "extensió d'algun format suportat."
-
-#~ msgid "Sampling Rate Converter"
-#~ msgstr "Convertidor de la freqüència de mostra"
-
-#~ msgid "Enable Sampling Rate Converter"
-#~ msgstr "Activa el convertidor de la freqüència de mostra"
-
-#~ msgid "Advanced"
-#~ msgstr "Avançat"
-
-#~ msgid "Bypass all of signal processing if possible"
-#~ msgstr "Evita tot processament del senyal, si és possible"
-
-#~ msgid ""
-#~ "Try to pass input plugin's output directly to output plugin, if the "
-#~ "latter supports format produced by input plugin. If it's true, all signal "
-#~ "processing will be disabled (i.e. DSP plugins, equalizer, resampling, "
-#~ "Replay Gain and software volume control)."
-#~ msgstr ""
-#~ "Tracta de passar la sortida del connector d'entrada directament al "
-#~ "connector de sortida, si aquest suporta el format produït pel primer. En "
-#~ "aquest cas, tot processament del senyal quedarà inoperant (i.e., "
-#~ "connectors DSP, equalització, remostratge, Replay Gain i control de volum "
-#~ "per programari)."
-
-#~ msgid "Dynamically adjust scale factor to prevent clipping"
-#~ msgstr "Ajusta el factor d'escalat dinàmicament per a prevenir escapçaments"
-
-#~ msgid "Decrease scale factor (gain) if clipping nevertheless occurred"
-#~ msgstr ""
-#~ "Decrementa el factor d'escalat (guany), si de totes maneres s'ha produït "
-#~ "un escapçament"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Audacious has caught signal 11 (SIGSEGV).\n"
-#~ "\n"
-#~ "We apologize for the inconvenience, but Audacious has crashed.\n"
-#~ "This is a bug in the program, and should never happen under normal "
-#~ "circumstances.\n"
-#~ "Your current configuration has been saved and should not be damaged.\n"
-#~ "\n"
-#~ "You can help improve the quality of Audacious by filing a bug at http://"
-#~ "jira.atheme.org/\n"
-#~ "Please include the entire text of this message and a description of what "
-#~ "you were doing when\n"
-#~ "this crash occured in order to quickly expedite the handling of your bug "
-#~ "report:\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "L'Audacious ha caçat un senyal 11 (SIGSEGV).\n"
-#~ "\n"
-#~ "Ho sentim, però l'Audacious s'ha estrellat.\n"
-#~ "Això és un error en el programa, i no hauria de passar en circumstàncies "
-#~ "normals.\n"
-#~ "La vostra configuració actual s'ha desat i no s'hauria d'haver fet "
-#~ "malbé.\n"
-#~ "\n"
-#~ "Podeu ajudar a millorar la qualitat de l'Audacious omplint un formulari "
-#~ "d'informe\n"
-#~ "d'errors a: http://bugzilla.atheme.org\n"
-#~ "Si us plau, inclogueu el text complet d'aquest missatge i una descripció "
-#~ "del que\n"
-#~ "estàveu fent quan s'ha produït la fallada, per tal que la investigació "
-#~ "pugui ser:\n"
-#~ "expiditiva.\n"
-
-#~ msgid ""
-#~ "Stacktrace was unavailable. You might want to reproduce this problem "
-#~ "while running Audacious under GDB to get a proper backtrace.\n"
-#~ msgstr ""
-#~ "No s'ha pogut fer una traça de la pila. Potser voldreu reproduir aquest "
-#~ "problema executant l'Audacious sota el GDB per a obtenir una traça "
-#~ "adequada.\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Bugs can be reported at http://jira.atheme.org/ against the Audacious or "
-#~ "Audacious Plugins product.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Podeu informar d'errors trobats a l'Audacious a http://bugzilla.atheme."
-#~ "org/.\n"
-
-#~ msgid ""
-#~ "Your signaling implementation is broken.\n"
-#~ "Expect unusable crash reports.\n"
-#~ msgstr ""
-#~ "L'implementació de senyals en aquest sistema és defectuosa.\n"
-#~ "Els informes de fallades poden ser inservibles.\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "<big>Audacious %s</big>\n"
-#~ "\n"
-#~ "Copyright (C) 2005-2009 Audacious Development Team"
-#~ msgstr ""
-#~ "<big>Audacious %s</big>\n"
-#~ "\n"
-#~ "Copyright (C) 2005-2008 Equip de Desenvolupament de l'Audacious"
-
-#~ msgid "Detect file formats on demand, instead of immediately."
-#~ msgstr "Detecta el format dels fitxers a petició, en lloc d'immediatament"
-
-#~ msgid ""
-#~ "When checked, Audacious will detect file formats on demand. This can "
-#~ "result in a messier playlist, but delivers a major speed benefit."
-#~ msgstr ""
-#~ "Quan està activada, l'Audàcious detectarà el format quan ho necessiti. "
-#~ "Això pot fer que la llista de reproducció mostri informació incorrecta, "
-#~ "però aporta un gran benefici en termes de velocitat."
-
-#~ msgid "Load metadata from playlists and files"
-#~ msgstr "Llegeix les meta-dades dels fitxers i les llistes"
-
-#~ msgid "Load metadata (tag information) from music files."
-#~ msgstr ""
-#~ "Llegeix les meta-dades (informació de les etiquetes) dels fitxers de "
-#~ "música."
-
-#~ msgid "Can't jump to time when no track is being played.\n"
-#~ msgstr "No es pot saltar al temps quan no s'està reproduint cap pista.\n"
-
-#~ msgid "minutes:seconds"
-#~ msgstr "minuts:segons"
-
-#~ msgid "Track length:"
-#~ msgstr "Durada de la pista:"
-
-#~ msgid "Save as Static Playlist"
-#~ msgstr "Desa com a llista de reproducció estàtica"
-
-#~ msgid "Use Relative Path"
-#~ msgstr "Usa camins relatius"
-
-#~ msgid "Error writing playlist \"%s\": %s"
-#~ msgstr "Error quan s'escrivia la llista de reproducció \"%s\": %s"
-
-#~ msgid "%s already exist. Continue?"
-#~ msgstr "%s ja existeix. Voleu continuar?"
-
-#~ msgid ""
-#~ "<big>Unable to save playlist.</big>\n"
-#~ "\n"
-#~ "Unknown file type for '%s'.\n"
-#~ msgstr ""
-#~ "<big>No es pot desar la llista.</big>\n"
-#~ "\n"
-#~ "Tipus de fitxer desconegut: '%s'.\n"
-
-#~ msgid "Presets"
-#~ msgstr "Perfils"
-
-#~ msgid "Mouse"
-#~ msgstr "Ratolí"
-
-#~ msgid "Pause between songs"
-#~ msgstr "Pausa entre cançons"
-
-#~ msgid "Pause for"
-#~ msgstr "Pausa de"
-
-#~ msgid "seconds"
-#~ msgstr "segons"
-
-#~ msgid "Filename"
-#~ msgstr "Nom del fitxer"
-
-#~ msgid "Convert underscores to blanks"
-#~ msgstr "Converteix els guions baixos en espais"
-
-#~ msgid "Convert %20 to blanks"
-#~ msgstr "Converteix els %20 en espais"
-
-#~ msgid "Convert backslash '\\' to forward slash '/'"
-#~ msgstr "Converteix les barres invertides '\\' en barres normals '/'"
-
-#~ msgid "File Dialog"
-#~ msgstr "Diàleg de fitxer"
-
-#~ msgid "Always refresh directory when opening file dialog"
-#~ msgstr "Refresca sempre el directori quan s'obri el diàleg d'obrir fitxer"
-
-#~ msgid ""
-#~ "Always refresh the file dialog (this will slow opening the dialog on "
-#~ "large directories, and Gnome VFS should handle automatically)."
-#~ msgstr ""
-#~ "Refresca sempre el diàleg de fitxer (això farà que els directoris grans "
-#~ "s'obrin a poc a poc, i el VFS del Gnome hauria de funcionar "
-#~ "automàticament)."
-
-#~ msgid "Changes volume by"
-#~ msgstr "Canvia el volum un"
-
-#~ msgid "percent"
-#~ msgstr "per cent"
-
-#~ msgid "Scrolls playlist by"
-#~ msgstr "Desplaça la llista de reproducció"
-
-#~ msgid "lines"
-#~ msgstr "línies"
-
-#~ msgid "Stop after Current Song"
-#~ msgstr "Para quan s'acabi la cançó"
-
-#~ msgid "Peaks"
-#~ msgstr "Pics"
-
-#~ msgid "Repeat"
-#~ msgstr "Repeteix"
-
-#~ msgid "Shuffle"
-#~ msgstr "Barreja"
-
-#~ msgid "No Playlist Advance"
-#~ msgstr "Discontinua la reproducció programada"
-
-#~ msgid "Play"
-#~ msgstr "Reprodueix"
-
-#~ msgid "Pause"
-#~ msgstr "Pausa"
-
-#~ msgid "Stop"
-#~ msgstr "Para"
-
-#~ msgid "Previous"
-#~ msgstr "Anterior"
-
-#~ msgid "Next"
-#~ msgstr "Següent"
-
-#~ msgid "Visualization Mode"
-#~ msgstr "Mode de visualització"
-
-#~ msgid "Analyzer Mode"
-#~ msgstr "Mode de l'analitzador"
-
-#~ msgid "Scope Mode"
-#~ msgstr "Mode de l'oscil·loscopi"
-
-#~ msgid "Voiceprint Mode"
-#~ msgstr "Mode de l'empremta de veu"
-
-#~ msgid "WindowShade VU Mode"
-#~ msgstr "Mode del WindowShade VU"
-
-#~ msgid "Refresh Rate"
-#~ msgstr "Velocitat de refresc"
-
-#~ msgid "Analyzer Falloff"
-#~ msgstr "Caiguda de l'analitzador"
-
-#~ msgid "Peaks Falloff"
-#~ msgstr "Caiguda dels pics"
-
-#~ msgid "New Playlist"
-#~ msgstr "Llista de reproducció nova"
-
-#~ msgid "Select Next Playlist"
-#~ msgstr "Selecciona la llista següent"
-
-#~ msgid "Select Previous Playlist"
-#~ msgstr "Selecciona la llista anterior"
-
-#~ msgid "Delete Playlist"
-#~ msgstr "Esborra la llista"
-
-#~ msgid "Load List"
-#~ msgstr "Carrega una llista"
-
-#~ msgid "Loads a playlist file into the selected playlist."
-#~ msgstr "Afegeix una llista de reproducció a la llista seleccionada"
-
-#~ msgid "Save List"
-#~ msgstr "Desa la llista"
-
-#~ msgid "Saves the selected playlist."
-#~ msgstr "Desa les llistes de reproducció seleccionades."
-
-#~ msgid "Save Default List"
-#~ msgstr "Desa la llista per defecte"
-
-#~ msgid "Saves the selected playlist to the default location."
-#~ msgstr ""
-#~ "Desa les llistes de reproducció seleccionades a la ubicació per defecte."
-
-#~ msgid "Refresh List"
-#~ msgstr "Refresca la llista"
-
-#~ msgid "Refreshes metadata associated with a playlist entry."
-#~ msgstr "Refresca les meta-dades associades a cada element de la llista."
-
-#~ msgid "List Manager"
-#~ msgstr "Gestor de llistes"
-
-#~ msgid "Opens the playlist manager."
-#~ msgstr "Obre el gestor de llistes de reproducció."
-
-#~ msgid "View"
-#~ msgstr "Finestres"
-
-#~ msgid "Add Internet Address..."
-#~ msgstr "Afegeix una adreça d'Internet..."
-
-#~ msgid "Adds a remote track to the playlist."
-#~ msgstr "Afegeix una pista remota a la llista de reproducció."
-
-#~ msgid "Add Files..."
-#~ msgstr "Afegeix fitxers..."
-
-#~ msgid "Search and Select"
-#~ msgstr "Cerca i selecciona"
-
-#~ msgid ""
-#~ "Searches the playlist and selects playlist entries based on specific "
-#~ "criteria."
-#~ msgstr ""
-#~ "Cerca a la llista de reproducció i selecciona elements basant-se en "
-#~ "criteris específics."
-
-#~ msgid "Invert Selection"
-#~ msgstr "Inverteix la selecció"
-
-#~ msgid "Inverts the selected and unselected entries."
-#~ msgstr "Inverteix els elements seleccionats i no seleccionats."
-
-#~ msgid "Select All"
-#~ msgstr "Selecciona tots els elements"
-
-#~ msgid "Selects all of the playlist entries."
-#~ msgstr "Selecciona tots els elements de la llista de reproducció."
-
-#~ msgid "Select None"
-#~ msgstr "Selecciona no res"
-
-#~ msgid "Deselects all of the playlist entries."
-#~ msgstr "Deselecciona tots els elements de la llista de reproducció."
-
-#~ msgid "Remove All"
-#~ msgstr "Treu tots els elements"
-
-#~ msgid "Removes all entries from the playlist."
-#~ msgstr "Treu tots els elements de la llista de reproducció."
-
-#~ msgid "Clear Queue"
-#~ msgstr "Neteja la cua"
-
-#~ msgid "Clears the queue associated with this playlist."
-#~ msgstr "Neteja la cua associada a aquesta llista de reproducció. "
-
-#~ msgid "Remove Unavailable Files"
-#~ msgstr "Treu els fitxers no disponibles"
-
-#~ msgid "Removes unavailable files from the playlist."
-#~ msgstr "Treu els fitxers no disponibles de la llista de reproducció."
-
-#~ msgid "Remove Duplicates"
-#~ msgstr "Treu els duplicats"
-
-#~ msgid "By Title"
-#~ msgstr "Per títol"
-
-#~ msgid "Removes duplicate entries from the playlist by title."
-#~ msgstr "Treu els elements duplicats de la llista de reproducció per títol."
-
-#~ msgid "By Filename"
-#~ msgstr "Per nom de fitxer"
-
-#~ msgid "Removes duplicate entries from the playlist by filename."
-#~ msgstr ""
-#~ "Treu els elements duplicats de la llista de reproducció per nom de fitxer."
-
-#~ msgid "By Path + Filename"
-#~ msgstr "Per ubicació i nom de fitxer"
-
-#~ msgid "Removes duplicate entries from the playlist by their full path."
-#~ msgstr ""
-#~ "Treu els elements duplicats de la llista de reproducció per l'ubicació "
-#~ "completa."
-
-#~ msgid "Remove Unselected"
-#~ msgstr "Treu els no seleccionats"
-
-#~ msgid "Remove unselected entries from the playlist."
-#~ msgstr "Treu els elements no seleccionats de la llista de reproducció."
-
-#~ msgid "Remove Selected"
-#~ msgstr "Treu els seleccionats"
-
-#~ msgid "Remove selected entries from the playlist."
-#~ msgstr "Treu els elements seleccionats de la llista de reproducció."
-
-#~ msgid "Randomize List"
-#~ msgstr "Barreja la llista"
-
-#~ msgid "Randomizes the playlist."
-#~ msgstr "Reordena la llista de forma aleatòria."
-
-#~ msgid "Reverse List"
-#~ msgstr "Inverteix la llista"
-
-#~ msgid "Reverses the playlist."
-#~ msgstr "Inverteix l'ordre de la llista."
-
-#~ msgid "Sort List"
-#~ msgstr "Ordena la llista"
-
-#~ msgid "Sorts the list by title."
-#~ msgstr "Ordena la llista pel títol."
-
-#, fuzzy
-#~ msgid "By Album"
-#~ msgstr "Àlbum"
-
-#, fuzzy
-#~ msgid "Sorts the list by album."
-#~ msgstr "Ordena la llista pel títol."
-
-#~ msgid "By Artist"
-#~ msgstr "Per l'artista"
-
-#~ msgid "Sorts the list by artist."
-#~ msgstr "Ordena la llista per l'artista."
-
-#~ msgid "Sorts the list by filename."
-#~ msgstr "Ordena la llista pel nom de fitxer."
-
-#~ msgid "Sorts the list by full pathname."
-#~ msgstr "Ordena la llista per la ubicació completa."
-
-#~ msgid "By Date"
-#~ msgstr "Per la data"
-
-#~ msgid "Sorts the list by modification time."
-#~ msgstr "Ordena la llista per la data de modificació."
-
-#~ msgid "By Track Number"
-#~ msgstr "Pel número de pista"
-
-#~ msgid "Sorts the list by track number."
-#~ msgstr "Ordena la llista pel número de pista."
-
-#~ msgid "By Playlist Entry"
-#~ msgstr "Per l'entrada a la llista"
-
-#~ msgid "Sorts the list by playlist entry."
-#~ msgstr "Ordena la llista de reproducció per l'entrada."
-
-#~ msgid "Sort Selected"
-#~ msgstr "Ordena els seleccionats"
-
-#~ msgid "File"
-#~ msgstr "Fitxer"
-
-#~ msgid "Help"
-#~ msgstr "Ajuda"
-
-#, fuzzy
-#~ msgid "Components"
-#~ msgstr "Comentari"
-
-#~ msgid "View Track Details"
-#~ msgstr "Mostra detalls de la pista"
-
-#~ msgid "Play File"
-#~ msgstr "Reprodueix fitxer"
-
-#~ msgid "Load and play a file"
-#~ msgstr "Carrega i reprodueix un fitxer"
-
-#~ msgid "Play Location"
-#~ msgstr "Reprodueix una font remota"
-
-#~ msgid "Play media from the selected location"
-#~ msgstr "Reprodueix un mitjà des de la ubicació seleccionada"
-
-#~ msgid "Plugin services"
-#~ msgstr "Serveis de connectors"
-
-#~ msgid "Preferences"
-#~ msgstr "Preferències"
-
-#~ msgid "Open preferences window"
-#~ msgstr "Obre la finestra de preferències"
-
-#~ msgid "_Quit"
-#~ msgstr "_Surt"
-
-#~ msgid "Quit Audacious"
-#~ msgstr "Tanca l'Audacious"
-
-#~ msgid "Set A-B"
-#~ msgstr "Estableix A-B"
-
-#~ msgid "Clear A-B"
-#~ msgstr "Esborra A-B"
-
-#~ msgid "Jump to Playlist Start"
-#~ msgstr "Salta a l'inici de la llista"
-
-#~ msgid "Jump to File"
-#~ msgstr "Salta al fitxer"
-
-#~ msgid "Queue Toggle"
-#~ msgstr "Posa o treu de la cua"
-
-#~ msgid "Enables/disables the entry in the playlist's queue."
-#~ msgstr "Posa o lleva un element de la cua."
-
-#~ msgid "Load"
-#~ msgstr "Carrega"
-
-#~ msgid "Import"
-#~ msgstr "Importa"
-
-#~ msgid "Save"
-#~ msgstr "Desa"
-
-#~ msgid "Delete"
-#~ msgstr "Elimina"
-
-#~ msgid "Preset"
-#~ msgstr "Perfil"
-
-#~ msgid "Load preset"
-#~ msgstr "Carrega un perfil"
-
-#~ msgid "Auto-load preset"
-#~ msgstr "Perfil automàtics"
-
-#~ msgid "Load auto-load preset"
-#~ msgstr "Carrega un perfil automàtic"
-
-#~ msgid "Default"
-#~ msgstr "Per defecte"
-
-#~ msgid "Load default preset into equalizer"
-#~ msgstr "Carrega el perfil per defecte a l'equalitzador"
-
-#~ msgid "Zero"
-#~ msgstr "Zero"
-
-#~ msgid "Set equalizer preset levels to zero"
-#~ msgstr "Posa els valors de l'equalitzador a zero"
-
-#~ msgid "From file"
-#~ msgstr "Des d'un fitxer"
-
-#~ msgid "Load preset from file"
-#~ msgstr "Carrega el perfil des d'un fitxer"
-
-#~ msgid "From WinAMP EQF file"
-#~ msgstr "D'un fitxer EQF del WinAMP"
-
-#~ msgid "Load preset from WinAMP EQF file"
-#~ msgstr "Carrega el perfil des d'un fitxer EQF del WinAMP"
-
-#~ msgid "WinAMP Presets"
-#~ msgstr "Perfils del WinAMP"
-
-#~ msgid "Import WinAMP presets"
-#~ msgstr "Importa perfils del WinAMP"
-
-#~ msgid "Save preset"
-#~ msgstr "Desa el perfil"
-
-#~ msgid "Save auto-load preset"
-#~ msgstr "Desa com a perfil automàtic"
-
-#~ msgid "Save default preset"
-#~ msgstr "Desa com a perfil per defecte"
-
-#~ msgid "To file"
-#~ msgstr "En un fitxer"
-
-#~ msgid "Save preset to file"
-#~ msgstr "Desa el perfil en un fitxer"
-
-#~ msgid "To WinAMP EQF file"
-#~ msgstr "En un fitxer EQF del WinAMP"
-
-#~ msgid "Save preset to WinAMP EQF file"
-#~ msgstr "Desa els valors en un fitxer EQF del WinAMP"
-
-#~ msgid "Delete preset"
-#~ msgstr "Esborra el perfil"
-
-#~ msgid "Delete auto-load preset"
-#~ msgstr "Esborra el perfil automàtic"
-
-#~ msgid ""
-#~ "This is the amount of time to prebuffer audio "
-#~ "streams by, in milliseconds.\n"
-#~ "Increase this value if you are experiencing audio skipping.\n"
-#~ "Please note however, that high values will result in Audacious performing "
-#~ "poorly."
-#~ msgstr ""
-#~ "Això és la mida del buffer preliminar per als fluxos "
-#~ "d'àudio, en mil·lisegons.\n"
-#~ "Augmenteu aquest valor si es produeixen talls en la reproducció.\n"
-#~ "Tingueu en compte, però, que valors alts afectaran negativament el "
-#~ "rendiment de l'Audacious."
-
-#~ msgid "Enable headless operation"
-#~ msgstr "Activa el mode d'operació sense frontal"
-
-#~ msgid ""
-#~ "<big>Unable to load skin.</big>\n"
-#~ "\n"
-#~ "Check that skin at '%s' is usable and default skin is properly installed "
-#~ "at '%s'\n"
-#~ msgstr ""
-#~ "<big>No s'ha pogut carregar la decoració.</big>\n"
-#~ "\n"
-#~ "Comproveu que la decoració a '%s' és utilitzable i que la decoració "
-#~ "predeterminada està instal·lada correctament a '%s'\n"
-
-#~ msgid "Headless operation enabled\n"
-#~ msgstr "Operació sense frontal activada\n"
-
-#~ msgid "Audacious core developers:"
-#~ msgstr "Desenvolupadors principals:"
-
-#~ msgid "Audacious Equalizer"
-#~ msgstr "Equalitzador de l'Audacious"
-
-#~ msgid "Play files"
-#~ msgstr "Reprodueix els fitxers"
-
-#~ msgid "Load files"
-#~ msgstr "Carrega els fitxers"
-
-#~ msgid "%s - Audacious"
-#~ msgstr "%s - Audacious"
-
-#~ msgid "VBR"
-#~ msgstr "VBR"
-
-#~ msgid "mono"
-#~ msgstr "mono"
-
-#~ msgid "Audacious - visibility warning"
-#~ msgstr "Audacious - avís de visibilitat"
-
-#~ msgid "Show main player window"
-#~ msgstr "Mostra la finestra principal"
-
-#~ msgid "Ignore"
-#~ msgstr "Ignora"
-
-#~ msgid ""
-#~ "Audacious has been started with all of its windows hidden.\n"
-#~ "You may want to show the player window again to control Audacious; "
-#~ "otherwise, you'll have to control it remotely via audtool or enabled "
-#~ "plugins (such as the statusicon plugin)."
-#~ msgstr ""
-#~ "L'Audacious ha arrencat amb totes les finestres ocultes.\n"
-#~ "Potser voldreu mostrar la finestra del reproductor per a controlar "
-#~ "l'Audacious; en cas contrari, l'haureu de controlar remotament via "
-#~ "l'audtool o connectors (com ara el connector statusicon)."
-
-#~ msgid "Always ignore, show/hide is controlled remotely"
-#~ msgstr "Ignora sempre, mostra/oculta es controla remotament"
-
-#~ msgid ""
-#~ "<big>Broken GTK engine in use</big>\n"
-#~ "\n"
-#~ "Audacious has detected that you are using a broken GTK engine.\n"
-#~ "\n"
-#~ "The theme engine you are using, %s, is incompatible with some of "
-#~ "the features used by modern skins. The incompatible features have been "
-#~ "disabled for this session.\n"
-#~ "\n"
-#~ "To use these features, please consider using a different GTK theme engine."
-#~ msgstr ""
-#~ "<big>Esteu utilitzant un motor GTK defectuós</big>\n"
-#~ "\n"
-#~ "L'Audacious ha detectat que esteu utilitzant un motor GTK defectuós.\n"
-#~ "\n"
-#~ "El motor de temes que esteu usant, %s, és incompatible amb algunes "
-#~ "funcions que usen moltes decoracions actuals. Les funcions en qüestió "
-#~ "s'han deshabilitat per a aquesta sessió.\n"
-#~ "\n"
-#~ "Si voleu utilitzar aquestes funcions, considereu canviar el motor GTK "
-#~ "actual."
-
-#~ msgid "Seek to: %d:%-2.2d/%d:%-2.2d (%d%%)"
-#~ msgstr "Anar a: %d:%-2.2d/%d:%-2.2d (%d%%)"
-
-#~ msgid "Volume: %d%%"
-#~ msgstr "Volum: %d%%"
-
-#~ msgid "Balance: %d%% left"
-#~ msgstr "Balanç: %d%% esquerra"
-
-#~ msgid "Balance: center"
-#~ msgstr "Balanç: centrat"
-
-#~ msgid "Balance: %d%% right"
-#~ msgstr "Balanç: %d%% dreta"
-
-#~ msgid "Options Menu"
-#~ msgstr "Menú d'opcions"
-
-#~ msgid "Disable 'Always On Top'"
-#~ msgstr "Desactiva 'Sempre per sobre'"
-
-#~ msgid "Enable 'Always On Top'"
-#~ msgstr "Activa 'Sempre per sobre'"
-
-#~ msgid "File Info Box"
-#~ msgstr "Informació del fitxer"
-
-#~ msgid "Disable 'GUI Scaling'"
-#~ msgstr "Desactiva l'escalat de la IUG"
-
-#~ msgid "Enable 'GUI Scaling'"
-#~ msgstr "Activa l'escalat de la IUG"
-
-#~ msgid "Visualization Menu"
-#~ msgstr "Menú de visualització"
-
-#~ msgid ""
-#~ "<big>Couldn't open audio.</big>\n"
-#~ "\n"
-#~ "Please check that:\n"
-#~ "1. You have the correct output plugin selected.\n"
-#~ "2. No other programs is blocking the soundcard.\n"
-#~ "3. Your soundcard is configured properly.\n"
-#~ msgstr ""
-#~ "<big>No es pot obrir la sortida d'àudio.</big>\n"
-#~ "\n"
-#~ "Si us plau, comproveu que:\n"
-#~ "1. Heu seleccionat el connector de sortida correcte.\n"
-#~ "2. Cap altre programa està bloquejant la targeta de so.\n"
-#~ "3. Heu configurat la targeta de so correctament.\n"
-
-#~ msgid "Autoscroll Songname"
-#~ msgstr "Belluga el títol"
-
-#~ msgid "Show Player"
-#~ msgstr "Mostra el reproductor"
-
-#~ msgid "Show Playlist Editor"
-#~ msgstr "Mostra l'editor de llistes"
-
-#~ msgid "Show Equalizer"
-#~ msgstr "Mostra l'equalitzador"
-
-#~ msgid "Always on Top"
-#~ msgstr "Sempre per sobre"
-
-#~ msgid "Put on All Workspaces"
-#~ msgstr "A tots els espais de treball"
-
-#~ msgid "Roll up Player"
-#~ msgstr "Enrotlla el reproductor"
-
-#~ msgid "Roll up Playlist Editor"
-#~ msgstr "Enrotlla l'editor de llistes"
-
-#~ msgid "Roll up Equalizer"
-#~ msgstr "Enrotlla l'equalitzador"
-
-#~ msgid "Scale"
-#~ msgstr "Escala"
-
-#~ msgid "DoubleSize"
-#~ msgstr "Dobla la mida"
-
-#~ msgid "Easy Move"
-#~ msgstr "Moviment fàcil"
-
-#~ msgid "Analyzer"
-#~ msgstr "Analitzador"
-
-#~ msgid "Scope"
-#~ msgstr "Oscil·loscopi"
-
-#~ msgid "Voiceprint"
-#~ msgstr "Empremta de veu"
-
-#~ msgid "Off"
-#~ msgstr "Apagat"
-
-#~ msgid "Normal"
-#~ msgstr "Normal"
-
-#~ msgid "Fire"
-#~ msgstr "Foc"
-
-#~ msgid "Vertical Lines"
-#~ msgstr "Línies verticals"
-
-#~ msgid "Lines"
-#~ msgstr "Línies"
-
-#~ msgid "Bars"
-#~ msgstr "Barres"
-
-#~ msgid "Dot Scope"
-#~ msgstr "Oscil·loscopi de punts"
-
-#~ msgid "Line Scope"
-#~ msgstr "Oscil·loscopi de línies"
-
-#~ msgid "Solid Scope"
-#~ msgstr "Oscil·loscopi sòlid"
-
-#~ msgid "Ice"
-#~ msgstr "Gel"
-
-#~ msgid "Smooth"
-#~ msgstr "Suau"
-
-#~ msgid "Full (~50 fps)"
-#~ msgstr "Al màxim (~50 fps)"
-
-#~ msgid "Half (~25 fps)"
-#~ msgstr "La meitat (~25 fps)"
-
-#~ msgid "Quarter (~13 fps)"
-#~ msgstr "Un quart (~13 fps)"
-
-#~ msgid "Eighth (~6 fps)"
-#~ msgstr "Un octau (~6 fps)"
-
-#~ msgid "Slowest"
-#~ msgstr "Mínim"
-
-#~ msgid "Slow"
-#~ msgstr "Lent"
-
-#~ msgid "Medium"
-#~ msgstr "Mitjà"
-
-#~ msgid "Fast"
-#~ msgstr "Ràpid"
-
-#~ msgid "Fastest"
-#~ msgstr "Al màxim"
-
-#~ msgid "Time Elapsed"
-#~ msgstr "Temps transcorregut"
-
-#~ msgid "Time Remaining"
-#~ msgstr "Temps que queda"
-
-#~ msgid "Plugin Services"
-#~ msgstr "Serveis de connectors"
-
-#~ msgid "Search entries in active playlist"
-#~ msgstr "Cerca elements en la llista de reproducció activa"
-
-#~ 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."
-
-#~ msgid "Title: "
-#~ msgstr "Títol: "
-
-#~ msgid "Album: "
-#~ msgstr "Àlbum:"
-
-#~ msgid "Artist: "
-#~ msgstr "Artista: "
-
-#~ msgid "Filename: "
-#~ msgstr "Nom del fitxer: "
-
-#~ msgid "Clear previous selection before searching"
-#~ msgstr "Neteja la selecció anterior abans de cercar"
-
-#~ msgid "Automatically toggle queue for matching entries"
-#~ msgstr "Posa o treu de la cua automàticament els elements trobats"
-
-#~ msgid "Audacious Playlist Editor"
-#~ msgstr "Editor de llistes de l'Audacious"
-
-#~ msgid "Appearance"
-#~ msgstr "Aparença"
-
-#~ msgid "_Fonts"
-#~ msgstr "_Foses"
-
-#~ msgid "_Player:"
-#~ msgstr "_Reproductor:"
-
-#~ msgid "Select main player window font:"
-#~ msgstr "Trieu la fosa de la finestra principal:"
-
-#~ msgid "_Playlist:"
-#~ msgstr "_Llista de reproducció:"
-
-#~ msgid "Select playlist font:"
-#~ msgstr "Trieu la fosa de la llista de reproducció:"
-
-#~ msgid "Use Bitmap fonts if available"
-#~ msgstr "Usa foses mapa de bits, si n'hi ha de disponibles"
-
-#~ msgid ""
-#~ "Use bitmap fonts if they are available. Bitmap fonts do not support "
-#~ "Unicode strings."
-#~ msgstr ""
-#~ "Usa foses tipus mapa de bits, si n'hi ha de disponibles. Les fonts de "
-#~ "mapa de bits no suporten cadenes Unicode."
-
-#~ msgid "_Miscellaneous"
-#~ msgstr "_Miscel·lània"
-
-#~ msgid "Show track numbers in playlist"
-#~ msgstr "Mostra el número de pista a la llista de reproducció"
-
-#~ msgid "Show separators in playlist"
-#~ msgstr "Mostra separadors a la llista de reproducció"
-
-#~ msgid "Show window manager decoration"
-#~ msgstr "Mostra la decoració del gestor de finestres"
-
-#~ msgid "This enables the window manager to show decorations for windows."
-#~ msgstr ""
-#~ "Això permet al gestor de finestres mostrar la decoració de les finestres."
-
-#~ msgid "Use XMMS-style file selector instead of the default selector"
-#~ msgstr "Usa el selector de fitxers estil XMMS, en lloc del predeterminat"
-
-#~ msgid ""
-#~ "This enables the XMMS/GTK1-style file selection dialogs. This selector is "
-#~ "provided by Audacious itself and is faster than the default GTK2 selector "
-#~ "(but sadly not as user-friendly)."
-#~ msgstr ""
-#~ "Això activa els diàlegs de selecció de fitxer de l'estil XMMS/GTK-1. "
-#~ "Aquest selector el proporciona el propi Audacious i és més ràpid que el "
-#~ "selector GTK2 predeterminat (però no és tant amigable)."
-
-#~ msgid "Use two-way text scroller"
-#~ msgstr "Usa desplaçament de text bidireccional"
-
-#~ msgid ""
-#~ "If selected, the file information text in the main window will scroll "
-#~ "back and forth. If not selected, the text will only scroll in one "
-#~ "direction."
-#~ msgstr ""
-#~ "Si està seleccionat, la informació del fitxer a la finestra principal es "
-#~ "desplaçarà endavant i enrere. Si no està seleccionat, el text es "
-#~ "desplaçarà en una sola direcció."
-
-#~ msgid "Disable inline gtk theme"
-#~ msgstr "Deshabilita els temes GTK en línia"
-
-#~ msgid "Allow loading incomplete skins"
-#~ msgstr "Permet carregar decoracions incompletes"
-
-#~ msgid ""
-#~ "If selected, audacious won't refuse loading broken skins. Use only if "
-#~ "your favourite skin doesn't work"
-#~ msgstr ""
-#~ "Si està seleccionat, l'Audacious no refusarà carregar decoracions "
-#~ "defectuoses. Useu-ho només si la vostra decoració favorita no funciona"
-
-#~ msgid "On load"
-#~ msgstr "En el moment d'obrir el fitxer"
-
-#~ msgid "Load metadata when adding the file to the playlist or opening it"
-#~ msgstr ""
-#~ "Llegeix les meta-dades en obrir el fitxer o afegir-lo a la llista de "
-#~ "reproducció"
-
-#~ msgid "On display"
-#~ msgstr "Quan s'hagin de mostrar"
-
-#~ msgid ""
-#~ "Load metadata on demand when displaying the file in the playlist. You may "
-#~ "need to set \"Detect file formats on demand\" in Audio page for full "
-#~ "benefit."
-#~ msgstr ""
-#~ "Llegeix les meta-dades quan calgui mostrar el fitxer a la llista de "
-#~ "reproducció. Potser haureu de marcar \"Detecta el format dels fitxers a "
-#~ "petició\" a l'apartat de So per a treure'n profit."
-
-#~ msgid "Color Adjustment"
-#~ msgstr "Ajustament del color"
-
-#~ msgid ""
-#~ "Audacious allows you to alter the color balance of the skinned UI. The "
-#~ "sliders below will allow you to do this."
-#~ msgstr ""
-#~ "L'Audacious us permet alterar el balanç de colors de la decoració de la "
-#~ "IG. Els controls de sota us permetran fer això."
-
-#~ msgid "Blue"
-#~ msgstr "Blau"
-
-#~ msgid "Green"
-#~ msgstr "Verd"
-
-#~ msgid "Red"
-#~ msgstr "Roig"
-
-#~ msgid "_Skin"
-#~ msgstr "_Decoració"
-
-#~ msgid "Refresh skin list"
-#~ msgstr "Refresca la llista de decoracions"
-
-#~ msgid "PREAMP"
-#~ msgstr "PREAMP"
-
-#~ msgid "60HZ"
-#~ msgstr "60HZ"
-
-#~ msgid "170HZ"
-#~ msgstr "170HZ"
-
-#~ msgid "310HZ"
-#~ msgstr "310HZ"
-
-#~ msgid "600HZ"
-#~ msgstr "600HZ"
-
-#~ msgid "1KHZ"
-#~ msgstr "1KHZ"
-
-#~ msgid "3KHZ"
-#~ msgstr "3KHZ"
-
-#~ msgid "6KHZ"
-#~ msgstr "6KHZ"
-
-#~ msgid "12KHZ"
-#~ msgstr "12KHZ"
-
-#~ msgid "14KHZ"
-#~ msgstr "14KHZ"
-
-#~ msgid "16KHZ"
-#~ msgstr "16KHZ"
-
-#~ msgid "Archived Winamp 2.x skin"
-#~ msgstr "Decoració del Winamp 2.x arxivada"
-
-#~ msgid "Unarchived Winamp 2.x skin"
-#~ msgstr "Decoració del Winamp 2.x no arxivada"
-
-#~ msgid "Show version and builtin features"
-#~ msgstr "Mostra la versió i les característiques suportades"
-
-#~ msgid "Use custom cursors"
-#~ msgstr "Utilitza cursors canviats"
-
-#~ msgid ""
-#~ "Sorry, threads isn't supported on your platform.\n"
-#~ "\n"
-#~ "If you're on a libc5 based linux system and installed Glib & GTK+ before "
-#~ "you\n"
-#~ "installed LinuxThreads you need to recompile Glib & GTK+.\n"
-#~ msgstr ""
-#~ "La vostra plataforma no suporta fils.\n"
-#~ "\n"
-#~ "Si esteu en un sistema Linux basat en la libc5 i heu instal·lat la Glib i "
-#~ "el\n"
-#~ "GTK+ abans d'instal·lar el LinuxThreads, heu de recompilar la Glib i el "
-#~ "GTK+.\n"
-
-#~ msgid "Select which Audacious session ID to use"
-#~ msgstr "Selecciona la sessió d'Audacious a utilitzar"
-
-#~ msgid "File preset extension:"
-#~ msgstr "Extensió dels fitxers de valors programats:"
-
-#~ msgid "localhost"
-#~ msgstr "localhost"
-
-#~ msgid ""
-#~ "<big>Unable to create %s.</big>\n"
-#~ "\n"
-#~ "Could not open glade file (%s). Please check your installation.\n"
-#~ msgstr ""
-#~ "<big>No es pot crear %s.</big>\n"
-#~ "\n"
-#~ "No s'ha pogut obrir el fitxer Glade (%s). Reviseu la instal·lació.\n"
-
-#~ msgid ""
-#~ "TITLE\n"
-#~ "ARTIST - TITLE\n"
-#~ "ARTIST - ALBUM - TITLE\n"
-#~ "ARTIST - ALBUM - TRACK. TITLE\n"
-#~ "ARTIST [ ALBUM ] - TRACK. TITLE\n"
-#~ "ALBUM - TITLE\n"
-#~ "Custom"
-#~ msgstr ""
-#~ "TÍTOL\n"
-#~ "ARTISTA - TÍTOL\n"
-#~ "ARTISTA - ÀLBUM - TÍTOL\n"
-#~ "ARTISTA - ÀLBUM - PISTA. TÍTOL\n"
-#~ "ARTISTA [ ÀLBUM ] - PISTA. TÍTOL\n"
-#~ "ÀLBUM - TÍTOL\n"
-#~ "Personalitzat"
-
-#~ msgid "VOLUME: %d%%"
-#~ msgstr "VOLUM: %d%%"
-
-#~ msgid "BALANCE: %d%% LEFT"
-#~ msgstr "BALANÇ: %d%% ESQUERRA"
-
-#~ msgid "BALANCE: CENTER"
-#~ msgstr "BALANÇ: CENTRE"
-
-#~ msgid "BALANCE: %d%% RIGHT"
-#~ msgstr "BALANÇ: %d%% DRETA"
-
-#~ msgid "Last.fm radio"
-#~ msgstr "Ràdio Last.fm"
-
-#~ msgid ""
-#~ "<big>No playable CD found.</big>\n"
-#~ "\n"
-#~ "No CD inserted, or inserted CD is not an audio CD.\n"
-#~ msgstr ""
-#~ "<big>No s'ha trobat cap CD reproduïble</big>\n"
-#~ "\n"
-#~ "No hi ha cap CD inserit, o el CD inserit no és un CD d'àudio.\n"
-
-#~ msgid "Performer/Artist"
-#~ msgstr "Intèrpret/Artista"
-
-#~ msgid "File extension"
-#~ msgstr "Extensió del fitxer"
-
-#~ msgid "%{n:...%}: Display \"...\" only if element %n is present"
-#~ msgstr "%{n:...%}: Mostra \"...\" només si l'element %n està present"
-
-#~ msgid ""
-#~ "Sorry, your GTK+ version (%d.%d.%d) does not work with Audacious.\n"
-#~ "Please use GTK+ %s or newer.\n"
-#~ msgstr ""
-#~ "La versió del GTK+ (%d.%d.%d) no funciona amb l'Audacious.\n"
-#~ "Si us plau, utilitzeu la versió GTK+ %s, o posterior.\n"
-
-#~ msgid "OPTIONS MENU"
-#~ msgstr "MENÚ D'OPCIONS"
-
-#~ msgid "DISABLE ALWAYS ON TOP"
-#~ msgstr "DESHABILITA SEMPRE A DALT"
-
-#~ msgid "ENABLE ALWAYS ON TOP"
-#~ msgstr "HABILITA SEMPRE A DALT"
-
-#~ msgid "FILE INFO BOX"
-#~ msgstr "INFORMACIÓ DEL FITXER"
-
-#~ msgid "DISABLE DOUBLESIZE"
-#~ msgstr "DESHABILITA MIDA DOBLE"
-
-#~ msgid "ENABLE DOUBLESIZE"
-#~ msgstr "HABILITA MIDA DOBLE"
-
-#~ msgid "VISUALIZATION MENU"
-#~ msgstr "MENÚ DE VISUALITZACIÓ"
-
-#~ msgid ""
-#~ "<big>Unable to play files.</big>\n"
-#~ "\n"
-#~ "The following files could not be played. Please check that:\n"
-#~ "1. they are accessible.\n"
-#~ "2. you have enabled the media plugins required."
-#~ msgstr ""
-#~ "<big>No es pot reproduir el fitxer.</big>\n"
-#~ "\n"
-#~ "Els següents fitxers no s'han pogut reproduir. Comproveu que:\n"
-#~ "1. Són accessibles.\n"
-#~ "2. Heu habilitat els plugins requerits."
-
-#~ msgid ""
-#~ "\n"
-#~ "Received SIGSEGV\n"
-#~ "\n"
-#~ "This could be a bug in Audacious. If you don't know why this happened, "
-#~ "file a bug at http://bugs-meta.atheme.org/\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "S'ha rebut un SIGSEGV\n"
-#~ "\n"
-#~ "Això podria ser un error de programació a l'Audacious. Si no sabeu per "
-#~ "què ha passat això, ompliu un informe d'error a http://bugs-metha.atheme."
-#~ "org/\n"
-#~ "\n"
-
-#~ msgid "%s: option `%s' is ambiguous\n"
-#~ msgstr "%s: l'opció `%s' és ambigua\n"
-
-#~ msgid "%s: option `--%s' doesn't allow an argument\n"
-#~ msgstr "%s: l'opció `--%s' no admet arguments\n"
-
-#~ msgid "%s: option `%c%s' doesn't allow an argument\n"
-#~ msgstr "%s: l'opció `%c%s' no admet arguments\n"
-
-#~ msgid "%s: option `%s' requires an argument\n"
-#~ msgstr "%s: l'opció `%s' requereix un argument\n"
-
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: opció il·legal -- %c\n"
-
-#~ msgid "%s: invalid option -- %c\n"
-#~ msgstr "%s: opció no vàlida -- %c\n"
-
-#~ msgid "%s: option requires an argument -- %c\n"
-#~ msgstr "%s: l'opció requereix un argument -- %c\n"
-
-#~ msgid "%s: option `-W %s' is ambiguous\n"
-#~ msgstr "%s: l'opció `-W %s' és ambigua\n"
-
-#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
-#~ msgstr "%s: l'opció `-W %s' no admet arguments\n"
-
-#~ msgid ""
-#~ "Usage: audacious [options] [files] ...\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "--------\n"
-#~ msgstr ""
-#~ "Sintaxi: audacious [opcions] [fitxers] ...\n"
-#~ "\n"
-#~ "Opcions:\n"
-#~ "--------\n"
-
-#~ msgid "Previous session ID"
-#~ msgstr "ID de la sessió anterior"
-
-#~ msgid "Disable error/warning interception (logging)"
-#~ msgstr "Deshabilita l'intercepció d'errors/avisos (registre)"
-
-#~ msgid "Print version number and exit\n"
-#~ msgstr "Mostra el número de versió i surt\n"
-
-#~ msgid "Genre"
-#~ msgstr "Gènere"
-
-#~ msgid "Year"
-#~ msgstr "Any"
-
-#~ msgid ""
-#~ "Enables playlist transparency. This is not recommended for slower "
-#~ "machines as it requires some CPU time to create and cache the pixmaps "
-#~ "used for the transparency."
-#~ msgstr ""
-#~ "Torna la llista de reproducció transparent. Això no és recomanable en "
-#~ "màquines lentes, ja que requereix potència de CPU per a crear els mapes "
-#~ "de bits utilitzats en la transparència."
-
-#, fuzzy
-#~ msgid "label65"
-#~ msgstr "label65"
-
-#, fuzzy
-#~ msgid "label76"
-#~ msgstr "label76"
-
-#, fuzzy
-#~ msgid "Reload Plugins"
-#~ msgstr "Connectors"
-
-#, fuzzy
-#~ msgid "Error in Audacious."
-#~ msgstr "%s - Audacious"
-
-#, fuzzy
-#~ msgid "Disable 'Doublesize'"
-#~ msgstr "Dobla la mida"
-
-#, fuzzy
-#~ msgid "Enable 'Doublesize'"
-#~ msgstr "Dobla la mida"
-
-#, fuzzy
-#~ msgid "Presets"
-#~ msgstr "Efectes"
-
-#, fuzzy
-#~ msgid "Directory preset file:"
-#~ msgstr "Desa el perfil en un fitxer"
-
-#, fuzzy
-#~ msgid "Track Information Window"
-#~ msgstr "Informació de la pista"
-
-#, fuzzy
-#~ msgid "Preferences Window"
-#~ msgstr "Obre la finestra de preferències"
-
-#, fuzzy
-#~ msgid "Artist: %s"
-#~ msgstr "Artista: "
-
-#, fuzzy
-#~ msgid "Title: %s"
-#~ msgstr "Nom del fitxer"
-
-#, fuzzy
-#~ msgid "Album: %s"
-#~ msgstr "Àlbum:"
-
-#, fuzzy
-#~ msgid "Audacious last.fm radio tuner"
-#~ msgstr "Editor de llistes de l'Audacious"
-
-#, fuzzy
-#~ msgid "Artist:"
-#~ msgstr "_Foses"
-
-#, fuzzy
-#~ msgid "Album:"
-#~ msgstr "Reproducció"
-
-#, fuzzy
-#~ msgid "Play Last.fm radio"
-#~ msgstr "Reprodueix una font remota"
-
-#, fuzzy
-#~ msgid "Add CD..."
-#~ msgstr "Afegeix fitxers..."
-
-#, fuzzy
-#~ msgid "Adds a CD to the playlist."
-#~ msgstr "Afegeix fitxers a la llista de reproducció."
-
-#, fuzzy
-#~ msgid "Play CD"
-#~ msgstr "Reprodueix"
-
-#, fuzzy
-#~ msgid "File name"
-#~ msgstr "Nom del fitxer"
-
-#, fuzzy
-#~ msgid "File path"
-#~ msgstr "Ubicació"
-
-#, fuzzy
-#~ msgid "Track number"
-#~ msgstr "Número de pista"
-
-#, fuzzy
-#~ msgid "Track name: "
-#~ msgstr "Número de pista"
-
-#, fuzzy
-#~ msgid "Show more _details"
-#~ msgstr "Mostra detalls de la pista"
-
-#, fuzzy
-#~ msgid "%s: unrecognized option `%c%s'\n"
-#~ msgstr "Opció d'iniciació no reconeguda: %d"
-
-#, fuzzy
-#~ msgid "Display this text and exit"
-#~ msgstr "Mostra la finestra principal"
-
-#, fuzzy
-#~ msgid "Activate Audacious"
-#~ msgstr "Tanca l'Audacious"
-
-#, fuzzy
-#~ msgid "Track Number"
-#~ msgstr "Número de pista"
-
-#, fuzzy
-#~ msgid "Track Length"
-#~ msgstr "Durada de la pista:"
-
-#, fuzzy
-#~ msgid "Enable playlist transparency"
-#~ msgstr "Activa el Replay Gain"
+msgstr "Veure gestió d'opcions de sessions"

audacious-3.1.1.tar.bz2/po/cs.po -> audacious-3.2.4.tar.bz2/po/cs.po Changed

@@ -1,30 +1,30 @@
 # Czech translation for Audacious
-# Copyright (C) 2004 Jan Nárovec <finn@sendmail.cz>
+# Copyright (C) Audacious translators
 # This file is distributed under the same license as the Audacious package.
-# Jan Nárovec <finn@sendmail.cz>, 2004.
-# Petr Písař <petr.pisar@atlas.cz>, 2007, 2008, 2009, 2010, 2011.
-#
-# tags (metadata) → popisky
 #
+# Translators:
+# Jan Nárovec <finn@sendmail.cz>, 2004.
+# <pavelfric@seznam.cz>, 2012.
+# Petr Písař <petr.pisar@atlas.cz>, 2007, 2008, 2009, 2010, 2011, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: audacious audacious-3.1-7-gfdc3f96\n"
-"Report-Msgid-Bugs-To: http://jira.atheme.org/\n"
-"POT-Creation-Date: 2011-11-17 19:53+0100\n"
-"PO-Revision-Date: 2011-11-17 19:59+0100\n"
-"Last-Translator: Petr Písař <petr.pisar@atlas.cz>\n"
-"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
-"Language: cs\n"
+"Project-Id-Version: Audacious\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2012-01-11 08:54-0500\n"
+"PO-Revision-Date: 2012-03-31 14:29+0000\n"
+"Last-Translator: jlindgren <john.lindgren@aol.com>\n"
+"Language-Team: Czech\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"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
-#: src/audacious/adder.c:71
+#: src/audacious/adder.c:77
 msgid "Searching ..."
 msgstr "Hledá se…"
 
-#: src/audacious/adder.c:97
+#: src/audacious/adder.c:113
 #, c-format
 msgid "%d file found"
 msgid_plural "%d files found"
@@ -32,699 +32,712 @@
 msgstr[1] "Nalezeny %d soubory"
 msgstr[2] "Nalezeno %d souborů"
 
-#: src/audacious/chardet.c:38
+#: src/audacious/chardet.c:39
 msgid " (invalid UTF-8)"
 msgstr " (neplatné UTF-8)"
 
-#: src/audacious/credits.c:35
+#: src/audacious/credits.c:37
 msgid "Core developers:"
 msgstr "Vývojáři jádra:"
 
-#: src/audacious/credits.c:49
+#: src/audacious/credits.c:51
 msgid "Graphics:"
 msgstr "Grafika:"
 
-#: src/audacious/credits.c:54
+#: src/audacious/credits.c:56
 msgid "Default skin:"
 msgstr "Standardní vzhled:"
 
-#: src/audacious/credits.c:60
+#: src/audacious/credits.c:62
 msgid "Plugin development:"
 msgstr "Vývoj zásuvných modulů:"
 
-#: src/audacious/credits.c:83
+#: src/audacious/credits.c:85
 msgid "Patch authors:"
 msgstr "Autoři záplat:"
 
-#: src/audacious/credits.c:126
+#: src/audacious/credits.c:131
 msgid "1.x developers:"
 msgstr "Vývojáři řady 1.x:"
 
-#: src/audacious/credits.c:148
+#: src/audacious/credits.c:153
 msgid "BMP Developers:"
 msgstr "Vývojáři Audacious:"
 
-#: src/audacious/credits.c:180
+#: src/audacious/credits.c:185
 msgid "Belarusian:"
 msgstr "Běloruština:"
 
-#: src/audacious/credits.c:183
+#: src/audacious/credits.c:188
 msgid "Basque:"
 msgstr "Baskičtina:"
 
-#: src/audacious/credits.c:186
+#: src/audacious/credits.c:191
 msgid "Brazilian Portuguese:"
 msgstr "Brazilská portugalština:"
 
-#: src/audacious/credits.c:191
+#: src/audacious/credits.c:196
 msgid "Breton:"
 msgstr "Bretonština:"
 
-#: src/audacious/credits.c:194
+#: src/audacious/credits.c:199
 msgid "Bulgarian:"
 msgstr "Bulharština:"
 
-#: src/audacious/credits.c:197
+#: src/audacious/credits.c:202
 msgid "Catalan:"
 msgstr "Katalánština:"
 
-#: src/audacious/credits.c:200
+#: src/audacious/credits.c:206
 msgid "Chinese:"
 msgstr "Čínština:"
 
-#: src/audacious/credits.c:203
+#: src/audacious/credits.c:209
 msgid "Croatian:"
 msgstr "Chorvatština:"
 
-#: src/audacious/credits.c:206
+#: src/audacious/credits.c:212
 msgid "Czech:"
 msgstr "Čeština:"
 
-#: src/audacious/credits.c:209
+#: src/audacious/credits.c:215
 msgid "Dutch:"
 msgstr "Holandština:"
 
-#: src/audacious/credits.c:213
+#: src/audacious/credits.c:219
 msgid "Estonian:"
 msgstr "Estonština:"
 
-#: src/audacious/credits.c:216
+#: src/audacious/credits.c:222
 msgid "Finnish:"
 msgstr "Finština:"
 
-#: src/audacious/credits.c:221
+#: src/audacious/credits.c:227
 msgid "French:"
 msgstr "Francouzština:"
 
-#: src/audacious/credits.c:227
+#: src/audacious/credits.c:233
 msgid "German:"
 msgstr "Němčina:"
 
-#: src/audacious/credits.c:234
+#: src/audacious/credits.c:240
 msgid "Georgian:"
 msgstr "Gruzínština:"
 
-#: src/audacious/credits.c:237
+#: src/audacious/credits.c:243
 msgid "Greek:"
 msgstr "Řečtina:"
 
-#: src/audacious/credits.c:242
+#: src/audacious/credits.c:248
 msgid "Hindi:"
 msgstr "Hindština:"
 
-#: src/audacious/credits.c:245
+#: src/audacious/credits.c:251
 msgid "Hungarian:"
 msgstr "Maďarština:"
 
-#: src/audacious/credits.c:249
+#: src/audacious/credits.c:255
 msgid "Italian:"
 msgstr "Italština:"
 
-#: src/audacious/credits.c:253
+#: src/audacious/credits.c:260
 msgid "Japanese:"
 msgstr "Japonština:"
 
-#: src/audacious/credits.c:256
+#: src/audacious/credits.c:263
 msgid "Korean:"
 msgstr "Korejština:"
 
-#: src/audacious/credits.c:259
+#: src/audacious/credits.c:266
 msgid "Latvian:"
 msgstr "Lotyština:"
 
-#: src/audacious/credits.c:262
+#: src/audacious/credits.c:269
 msgid "Lithuanian:"
 msgstr "Litevština:"
 
-#: src/audacious/credits.c:267
+#: src/audacious/credits.c:274
 msgid "Macedonian:"
 msgstr "Makedonština:"
 
-#: src/audacious/credits.c:270
+#: src/audacious/credits.c:277
+msgid "Mexican Spanish:"
+msgstr "Mexická španělština:"
+
+#: src/audacious/credits.c:280
 msgid "Polish:"
 msgstr "Polština:"
 
-#: src/audacious/credits.c:276
+#: src/audacious/credits.c:287
 msgid "Portuguese:"
 msgstr "Portugalština:"
 
-#: src/audacious/credits.c:279
+#: src/audacious/credits.c:290
 msgid "Romanian:"
 msgstr "Rumunština:"
 
-#: src/audacious/credits.c:283
+#: src/audacious/credits.c:294
 msgid "Russian:"
 msgstr "Ruština:"
 
-#: src/audacious/credits.c:287
+#: src/audacious/credits.c:298
 msgid "Serbian (Latin):"
 msgstr "Srbština (latinka):"
 
-#: src/audacious/credits.c:290
+#: src/audacious/credits.c:301
 msgid "Serbian (Cyrillic):"
 msgstr "Srbština (cyrilice):"
 
-#: src/audacious/credits.c:294
+#: src/audacious/credits.c:305
 msgid "Simplified Chinese:"
 msgstr "Zjednodušená čínština:"
 
-#: src/audacious/credits.c:297
+#: src/audacious/credits.c:308
 msgid "Slovak:"
 msgstr "Slovenština:"
 
-#: src/audacious/credits.c:300
+#: src/audacious/credits.c:312
 msgid "Spanish:"
 msgstr "Španělština:"
 
-#: src/audacious/credits.c:307
+#: src/audacious/credits.c:320
 msgid "Swedish:"
 msgstr "Švédština:"
 
-#: src/audacious/credits.c:310
+#: src/audacious/credits.c:323
 msgid "Traditional Chinese:"
 msgstr "Tradiční čínština:"
 
-#: src/audacious/credits.c:316
+#: src/audacious/credits.c:329
 msgid "Turkish:"
 msgstr "Turečtina:"
 
-#: src/audacious/credits.c:320
+#: src/audacious/credits.c:333
 msgid "Ukrainian:"
 msgstr "Ukrajinština:"
 
-#: src/audacious/credits.c:324
+#: src/audacious/credits.c:338
 msgid "Vietnamese:"
 msgstr "Vietnamština:"
 
-#: src/audacious/credits.c:327
+#: src/audacious/credits.c:341
 msgid "Welsh:"
 msgstr "Welština:"
 
-#: src/audacious/drct.c:234
-msgid "Temporary Playlist"
-msgstr "Dočasný seznam skladeb"
-
-#: src/audacious/equalizer_preset.c:186
+#: src/audacious/equalizer_preset.c:180
 #, c-format
 msgid "Error importing Winamp EQF file '%s'"
 msgstr "Chyba při importu winampovského EQF souboru „%s“"
 
-#: src/audacious/main.c:239
+#: src/audacious/main.c:243
 msgid "Skip backwards in playlist"
 msgstr "Vrátí se zpět v seznamu skladeb"
 
-#: src/audacious/main.c:240
+#: src/audacious/main.c:244
 msgid "Start playing current playlist"
 msgstr "Přehraje skladby v aktuálním seznamu"
 
-#: src/audacious/main.c:241
+#: src/audacious/main.c:245
 msgid "Pause current song"
 msgstr "Pozastaví přehrávanou skladbu"
 
-#: src/audacious/main.c:242
+#: src/audacious/main.c:246
 msgid "Stop current song"
 msgstr "Zastaví přehrávanou skladbu"
 
-#: src/audacious/main.c:243
+#: src/audacious/main.c:247
 msgid "Pause if playing, play otherwise"
 msgstr "Pozastaví při přehrávání; jinak spustí"
 
-#: src/audacious/main.c:244
+#: src/audacious/main.c:248
 msgid "Skip forward in playlist"
 msgstr "Přejde na další skladbu"
 
-#: src/audacious/main.c:245
+#: src/audacious/main.c:249
 msgid "Display Jump to File dialog"
 msgstr "Zobrazí dialog „Přejít na soubor“"
 
-#: src/audacious/main.c:246
+#: src/audacious/main.c:250
 msgid "Add files to the playlist"
 msgstr "Přidá soubory do do seznamu skladeb"
 
-#: src/audacious/main.c:247
+#: src/audacious/main.c:251
 msgid "Add new files to a temporary playlist"
 msgstr "Přidá soubory do dočasného seznamu skladeb"
 
-#: src/audacious/main.c:248
+#: src/audacious/main.c:252
 msgid "Display the main window"
 msgstr "Zobrazí hlavní okno"
 
-#: src/audacious/main.c:249
+#: src/audacious/main.c:253
 msgid "Show version"
 msgstr "Zobrazí verzi"
 
-#: src/audacious/main.c:250
+#: src/audacious/main.c:254
 msgid "Print debugging messages"
 msgstr "Vypisuje ladicí hlášky"
 
-#: src/audacious/main.c:251
+#: src/audacious/main.c:255
 msgid "Headless mode (beta)"
 msgstr "Bezhlavý režim (beta)"
 
-#: src/audacious/main.c:252
+#: src/audacious/main.c:256
 msgid "FILE..."
 msgstr "SOUBOR…"
 
-#: src/audacious/main.c:264
+#: src/audacious/main.c:268
 msgid "- play multimedia files"
 msgstr "– přehrávat multimediální soubory"
 
-#: src/audacious/main.c:274
+#: src/audacious/main.c:278
 #, c-format
 msgid ""
 "%s: %s\n"
 "Try `%s --help' for more information.\n"
-msgstr ""
-"%s: %s\n"
-"Pro více informací zkuste „%s --help“.\n"
+msgstr "%s: %s\nPro více informací zkuste „%s --help“.\n"
 
-#: src/audacious/main.c:547
+#: src/audacious/main.c:573
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/audacious/playback.c:306
+#: src/audacious/playback.c:307
 #, c-format
 msgid "No decoder found for %s."
 msgstr "Pro %s nenalezen žádní dekodér."
 
-#: src/audacious/playlist-new.c:319
-msgid "Untitled Playlist"
-msgstr "Nepojmenovaný seznam skladeb"
+#: src/audacious/playlist-files.c:53
+#, c-format
+msgid "Cannot %s %s: unsupported file extension."
+msgstr "%2$s nelze %1$s: nepodporovaná přípona souboru."
+
+#: src/audacious/playlist-files.c:54
+msgid "save"
+msgstr "uložit"
+
+#: src/audacious/playlist-files.c:54
+msgid "load"
+msgstr "načíst"
+
+#: src/audacious/playlist-new.c:131
+msgid "New Playlist"
+msgstr "Nový seznam skladeb"
+
+#: src/audacious/playlist-new.c:132
+msgid "Now Playing"
+msgstr "Nyní hraje"
 
-#: src/audacious/playlist-new.c:1500
+#: src/audacious/playlist-new.c:1630
 msgid ""
-"The playlist cannot be sorted because metadata scanning is still in progress "
-"(or has been disabled)."
-msgstr ""
-"Seznam skladeb nelze seřadit, protože hledání metadat stále probíhá "
-"(nebo je vypnuto)."
+"The playlist cannot be sorted because metadata scanning is still in progress"
+" (or has been disabled)."
+msgstr "Seznam skladeb nelze seřadit, protože hledání metadat stále probíhá (nebo je vypnuto)."
 
-#: src/audacious/ui_preferences.c:88
+#: src/audacious/ui_preferences.c:85
 msgid "Audio"
 msgstr "Zvuk"
 
-#: src/audacious/ui_preferences.c:89
+#: src/audacious/ui_preferences.c:86
 msgid "Network"
 msgstr "Síť"
 
-#: src/audacious/ui_preferences.c:90 src/audacious/ui_preferences.c:1634
+#: src/audacious/ui_preferences.c:87 src/audacious/ui_preferences.c:1603
 msgid "Playlist"
 msgstr "Seznam skladeb"
 
-#: src/audacious/ui_preferences.c:91
+#: src/audacious/ui_preferences.c:88
 msgid "Plugins"
 msgstr "Moduly"
 
-#: src/audacious/ui_preferences.c:97 src/libaudgui/infopopup.c:203
+#: src/audacious/ui_preferences.c:94 src/libaudgui/infopopup.c:199
 msgid "Artist"
 msgstr "Umělec"
 
-#: src/audacious/ui_preferences.c:98 src/libaudgui/infopopup.c:205
+#: src/audacious/ui_preferences.c:95 src/libaudgui/infopopup.c:201
 msgid "Album"
 msgstr "Album"
 
-#: src/audacious/ui_preferences.c:99 src/libaudgui/infopopup.c:201
-#: src/libaudgui/ui_playlist_manager.c:276
+#: src/audacious/ui_preferences.c:96 src/libaudgui/infopopup.c:197
+#: src/libaudgui/ui_playlist_manager.c:279
 msgid "Title"
 msgstr "Název"
 
-#: src/audacious/ui_preferences.c:100
+#: src/audacious/ui_preferences.c:97
 msgid "Tracknumber"
 msgstr "Číslo stopy"
 
-#: src/audacious/ui_preferences.c:101 src/libaudgui/infopopup.c:207
+#: src/audacious/ui_preferences.c:98 src/libaudgui/infopopup.c:203
 msgid "Genre"
 msgstr "Žánr"
 
-#: src/audacious/ui_preferences.c:102
+#: src/audacious/ui_preferences.c:99
 msgid "Filename"
 msgstr "Jméno souboru"
 
-#: src/audacious/ui_preferences.c:103
+#: src/audacious/ui_preferences.c:100
 msgid "Filepath"
 msgstr "Cesta k souboru"
 
-#: src/audacious/ui_preferences.c:104
+#: src/audacious/ui_preferences.c:101
 msgid "Date"
 msgstr "Datum"
 
-#: src/audacious/ui_preferences.c:105 src/libaudgui/infopopup.c:209
+#: src/audacious/ui_preferences.c:102 src/libaudgui/infopopup.c:205
 msgid "Year"
 msgstr "Rok"
 
-#: src/audacious/ui_preferences.c:106
+#: src/audacious/ui_preferences.c:103
 msgid "Comment"
 msgstr "Komentář"
 
-#: src/audacious/ui_preferences.c:107
+#: src/audacious/ui_preferences.c:104
 msgid "Codec"
 msgstr "Kodek"
 
-#: src/audacious/ui_preferences.c:108
+#: src/audacious/ui_preferences.c:105
 msgid "Quality"
 msgstr "Kvalita"
 
-#: src/audacious/ui_preferences.c:114
+#: src/audacious/ui_preferences.c:111
 msgid "None"
 msgstr "Žádné"
 
-#: src/audacious/ui_preferences.c:115
+#: src/audacious/ui_preferences.c:112
 msgid "Arabic"
 msgstr "Arabština"
 
-#: src/audacious/ui_preferences.c:116
+#: src/audacious/ui_preferences.c:113
 msgid "Baltic"
 msgstr "Baltské jazyky"
 
-#: src/audacious/ui_preferences.c:117
+#: src/audacious/ui_preferences.c:114
 msgid "Chinese"
 msgstr "Čínština"
 
-#: src/audacious/ui_preferences.c:118
+#: src/audacious/ui_preferences.c:115
 msgid "Greek"
 msgstr "Řečtina"
 
-#: src/audacious/ui_preferences.c:119
+#: src/audacious/ui_preferences.c:116
 msgid "Hebrew"
 msgstr "Hebrejština"
 
-#: src/audacious/ui_preferences.c:120
+#: src/audacious/ui_preferences.c:117
 msgid "Japanese"
 msgstr "Japonština"
 
-#: src/audacious/ui_preferences.c:121
+#: src/audacious/ui_preferences.c:118
 msgid "Korean"
 msgstr "Korejština"
 
-#: src/audacious/ui_preferences.c:122
+#: src/audacious/ui_preferences.c:119
 msgid "Polish"
 msgstr "Polština"
 
-#: src/audacious/ui_preferences.c:123
+#: src/audacious/ui_preferences.c:120
 msgid "Russian"
 msgstr "Ruština"
 
-#: src/audacious/ui_preferences.c:124
+#: src/audacious/ui_preferences.c:121
 msgid "Taiwanese"
 msgstr "Tchajwanština"
 
-#: src/audacious/ui_preferences.c:125
+#: src/audacious/ui_preferences.c:122
 msgid "Turkish"
 msgstr "Turečtina"
 
-#: src/audacious/ui_preferences.c:147
+#: src/audacious/ui_preferences.c:144
 msgid "Album mode"
 msgstr "Režim alba"
 
-#: src/audacious/ui_preferences.c:150
+#: src/audacious/ui_preferences.c:147
 msgid "Output Settings"
 msgstr "Nastavení výstupu"
 
-#: src/audacious/ui_preferences.c:152
+#: src/audacious/ui_preferences.c:149
 msgid "Bit depth:"
 msgstr "Bitová hloubka:"
 
-#: src/audacious/ui_preferences.c:155
+#: src/audacious/ui_preferences.c:152
 msgid "Buffer size:"
 msgstr "Velikost vyrovnávací paměti:"
 
-#: src/audacious/ui_preferences.c:157
+#: src/audacious/ui_preferences.c:154
 msgid "ms"
 msgstr "ms"
 
-#: src/audacious/ui_preferences.c:158
+#: src/audacious/ui_preferences.c:155
 msgid "Use software volume control (not recommended)"
 msgstr "Hlasitost ovládat softwarově (nedoporučuje se)"
 
-#: src/audacious/ui_preferences.c:160
+#: src/audacious/ui_preferences.c:157
 msgid "Replay Gain"
 msgstr "Zesílení při přehrávání"
 
-#: src/audacious/ui_preferences.c:161
+#: src/audacious/ui_preferences.c:158
 msgid "Enable Replay Gain"
 msgstr "Zapnout zesílení při přehrávání"
 
-#: src/audacious/ui_preferences.c:164
+#: src/audacious/ui_preferences.c:161
 msgid "Prevent clipping (recommended)"
 msgstr "Předcházet ořezu (doporučuje se)"
 
-#: src/audacious/ui_preferences.c:166
+#: src/audacious/ui_preferences.c:163
 msgid "Adjust Levels"
 msgstr "Míra úpravy"
 
-#: src/audacious/ui_preferences.c:167
+#: src/audacious/ui_preferences.c:164
 msgid "Amplify all files:"
 msgstr "Zesílit všechny soubory:"
 
-#: src/audacious/ui_preferences.c:169 src/audacious/ui_preferences.c:172
+#: src/audacious/ui_preferences.c:166 src/audacious/ui_preferences.c:169
 msgid "dB"
 msgstr "dB"
 
-#: src/audacious/ui_preferences.c:170
+#: src/audacious/ui_preferences.c:167
 msgid "Amplify untagged files:"
 msgstr "Zesílit soubory bez popisků:"
 
-#: src/audacious/ui_preferences.c:175
+#: src/audacious/ui_preferences.c:172
 msgid "Proxy hostname:"
 msgstr "Jméno počítače:"
 
-#: src/audacious/ui_preferences.c:176
+#: src/audacious/ui_preferences.c:173
 msgid "Proxy port:"
 msgstr "Port:"
 
-#: src/audacious/ui_preferences.c:179
+#: src/audacious/ui_preferences.c:176
 msgid "Proxy username:"
 msgstr "Jméno:"
 
-#: src/audacious/ui_preferences.c:180
+#: src/audacious/ui_preferences.c:177
 msgid "Proxy password:"
 msgstr "Heslo:"
 
-#: src/audacious/ui_preferences.c:184
+#: src/audacious/ui_preferences.c:181
 msgid "Proxy Configuration"
 msgstr "Nastavení proxy"
 
-#: src/audacious/ui_preferences.c:185
+#: src/audacious/ui_preferences.c:182
 msgid "Enable proxy usage"
 msgstr "Používat proxy"
 
-#: src/audacious/ui_preferences.c:188
+#: src/audacious/ui_preferences.c:185
 msgid "Use authentication with proxy"
 msgstr "Autentizovat se na proxy"
 
-#: src/audacious/ui_preferences.c:196
+#: src/audacious/ui_preferences.c:193
 msgid "Auto character encoding detector for:"
 msgstr "Automatické rozpoznávání kódovaní znaků:"
 
-#: src/audacious/ui_preferences.c:201
+#: src/audacious/ui_preferences.c:198
 msgid "Fallback character encodings:"
 msgstr "Záložní kódování znaků:"
 
-#: src/audacious/ui_preferences.c:205
+#: src/audacious/ui_preferences.c:202
 msgid "Behavior"
 msgstr "Chování"
 
-#: src/audacious/ui_preferences.c:206
+#: src/audacious/ui_preferences.c:203
 msgid "Continue playback on startup"
 msgstr "Pokračovat v přehrávání po spuštění"
 
-#: src/audacious/ui_preferences.c:208
+#: src/audacious/ui_preferences.c:205
 msgid "Advance when the current song is deleted"
 msgstr "Přejít dál, když současná skladba je smazána"
 
-#: src/audacious/ui_preferences.c:210
+#: src/audacious/ui_preferences.c:207
 msgid "Clear the playlist when opening files"
 msgstr "Při otvírání souborů vyprázdnit seznam skladeb"
 
-#: src/audacious/ui_preferences.c:212
+#: src/audacious/ui_preferences.c:209
 msgid "Open files in a temporary playlist"
 msgstr "Otevřít soubory do dočasného seznamu skladeb"
 
-#: src/audacious/ui_preferences.c:214
+#: src/audacious/ui_preferences.c:211
 msgid "Metadata"
 msgstr "Metadata"
 
-#: src/audacious/ui_preferences.c:215
+#: src/audacious/ui_preferences.c:212
 msgid "Do not load metadata for songs until played"
 msgstr "Nenačítat metadata skladeb před přehráním"
 
-#: src/audacious/ui_preferences.c:233
+#: src/audacious/ui_preferences.c:230
 msgid "TITLE"
 msgstr "NÁZEV"
 
-#: src/audacious/ui_preferences.c:234
+#: src/audacious/ui_preferences.c:231
 msgid "ARTIST - TITLE"
 msgstr "UMĚLEC – NÁZEV"
 
-#: src/audacious/ui_preferences.c:235
+#: src/audacious/ui_preferences.c:232
 msgid "ARTIST - ALBUM - TITLE"
 msgstr "UMĚLEC – ALBUM – NÁZEV"
 
-#: src/audacious/ui_preferences.c:236
+#: src/audacious/ui_preferences.c:233
 msgid "ARTIST - ALBUM - TRACK. TITLE"
 msgstr "UMĚLEC – ALBUM – STOPA. NÁZEV"
 
-#: src/audacious/ui_preferences.c:237
+#: src/audacious/ui_preferences.c:234
 msgid "ARTIST [ ALBUM ] - TRACK. TITLE"
 msgstr "UMĚLEC [ ALBUM ] – STOPA. NÁZEV"
 
-#: src/audacious/ui_preferences.c:238
+#: src/audacious/ui_preferences.c:235
 msgid "ALBUM - TITLE"
 msgstr "ALBUM – NÁZEV"
 
-#: src/audacious/ui_preferences.c:577
+#: src/audacious/ui_preferences.c:556
 msgid "Category"
 msgstr "Kategorie"
 
-#: src/audacious/ui_preferences.c:801
+#: src/audacious/ui_preferences.c:780
 msgid "Popup Information Settings"
 msgstr "Nastavení vyskakovacího okna s detaily"
 
-#: src/audacious/ui_preferences.c:810
+#: src/audacious/ui_preferences.c:789
 msgid "Cover image retrieve"
 msgstr "Získání vyobrazení přebalu"
 
-#: src/audacious/ui_preferences.c:815
+#: src/audacious/ui_preferences.c:794
 msgid ""
 "While searching for the album's cover, Audacious looks for certain words in "
 "the filename. You can specify those words in the lists below, separated "
 "using commas."
-msgstr ""
-"Během hledání přebalu alba Audacious také zkouší určitá slova z názvu "
-"souboru. Tato slova oddělená čárkou můžete zadat v níže uvedených seznamech."
+msgstr "Během hledání přebalu alba Audacious také zkouší určitá slova z názvu souboru. Tato slova oddělená čárkou můžete zadat v níže uvedených seznamech."
 
-#: src/audacious/ui_preferences.c:832
+#: src/audacious/ui_preferences.c:811
 msgid "Exclude:"
 msgstr "Vyloučit:"
 
-#: src/audacious/ui_preferences.c:839
+#: src/audacious/ui_preferences.c:818
 msgid "Include:"
 msgstr "Zahrnout:"
 
-#: src/audacious/ui_preferences.c:856
+#: src/audacious/ui_preferences.c:835
 msgid "Recursively search for cover"
 msgstr "Rekurzivně hledat přebal"
 
-#: src/audacious/ui_preferences.c:866
+#: src/audacious/ui_preferences.c:845
 msgid "Search depth: "
 msgstr "Hloubka hledání:"
 
-#: src/audacious/ui_preferences.c:880
+#: src/audacious/ui_preferences.c:859
 msgid "Use per-file cover"
 msgstr "Použít přebal pro každý soubor zvlášť"
 
-#: src/audacious/ui_preferences.c:883
+#: src/audacious/ui_preferences.c:862
 msgid "Miscellaneous"
 msgstr "Různé"
 
-#: src/audacious/ui_preferences.c:892
+#: src/audacious/ui_preferences.c:871
 msgid "Show Progress bar for the current track"
 msgstr "Vyjádřit pozici v přehrávané skladbě posuvníkem"
 
-#: src/audacious/ui_preferences.c:902
+#: src/audacious/ui_preferences.c:881
 msgid "Delay until filepopup comes up: "
 msgstr "Čekat na vyskakovací okno o souboru: "
 
-#: src/audacious/ui_preferences.c:1340
+#: src/audacious/ui_preferences.c:1309
 msgid "Custom"
 msgstr "Vlastní"
 
-#: src/audacious/ui_preferences.c:1383
+#: src/audacious/ui_preferences.c:1352
 msgid "Song Display"
 msgstr "Zobrazení skladby"
 
-#: src/audacious/ui_preferences.c:1392
+#: src/audacious/ui_preferences.c:1361
 msgid "Show song numbers"
 msgstr "Zobrazovat čísla skladeb"
 
-#: src/audacious/ui_preferences.c:1403
+#: src/audacious/ui_preferences.c:1372
 msgid "Show leading zeroes (02:00 instead of 2:00)"
 msgstr "Zobrazovat úvodní nuly (02:00 místo 2:00)"
 
-#: src/audacious/ui_preferences.c:1425
+#: src/audacious/ui_preferences.c:1394
 msgid "Show information about titlestring format"
 msgstr "Zobrazit informace o formátu titulku"
 
-#: src/audacious/ui_preferences.c:1441
+#: src/audacious/ui_preferences.c:1410
 msgid "Custom string:"
 msgstr "Vlastní řetězec:"
 
-#: src/audacious/ui_preferences.c:1448
+#: src/audacious/ui_preferences.c:1417
 msgid "Title format:"
 msgstr "Formát názvu:"
 
-#: src/audacious/ui_preferences.c:1459
+#: src/audacious/ui_preferences.c:1428
 msgid "Popup Information"
 msgstr "Vyskakovací okno s podrobnostmi"
 
-#: src/audacious/ui_preferences.c:1474
+#: src/audacious/ui_preferences.c:1443
 msgid "Show popup information for playlist entries"
 msgstr "Zobrazovat podrobnosti k položkám v seznamu skladeb"
 
-#: src/audacious/ui_preferences.c:1475
+#: src/audacious/ui_preferences.c:1444
 msgid ""
 "Toggles popup information window for the pointed entry in the playlist. The "
 "window shows title of song, name of album, genre, year of publish, track "
 "number, track length, and artwork."
-msgstr ""
-"Přepne zobrazovaní vyskakovacího okna s podrobnostmi o vybrané položce "
-"v seznamu skladeb. V okně je zobrazen název skladby, název alba, žánr, rok "
-"vydání, číslo stopy, délka stopy a přebal."
+msgstr "Přepne zobrazovaní vyskakovacího okna s podrobnostmi o vybrané položce v seznamu skladeb. V okně je zobrazen název skladby, název alba, žánr, rok vydání, číslo stopy, délka stopy a přebal."
 
-#: src/audacious/ui_preferences.c:1486
+#: src/audacious/ui_preferences.c:1455
 msgid "Edit settings for popup information"
 msgstr "Upravit nastavení pro vyskakovací okno s podrobnostmi"
 
-#: src/audacious/ui_preferences.c:1575
+#: src/audacious/ui_preferences.c:1544
 msgid "Output plugin:"
 msgstr "Výstupní modul:"
 
-#: src/audacious/ui_preferences.c:1634
+#: src/audacious/ui_preferences.c:1603
 msgid "Transport"
 msgstr "Přenos"
 
-#: src/audacious/ui_preferences.c:1634
+#: src/audacious/ui_preferences.c:1603
 msgid "Input"
 msgstr "Vstup"
 
-#: src/audacious/ui_preferences.c:1635
+#: src/audacious/ui_preferences.c:1604
 msgid "Effect"
 msgstr "Efekt"
 
-#: src/audacious/ui_preferences.c:1635
+#: src/audacious/ui_preferences.c:1604
 msgid "Visualization"
 msgstr "Znázornění"
 
-#: src/audacious/ui_preferences.c:1635
+#: src/audacious/ui_preferences.c:1604
 msgid "General"
 msgstr "Obecné"
 
-#: src/audacious/ui_preferences.c:1675
+#: src/audacious/ui_preferences.c:1644
 msgid "Audacious Preferences"
 msgstr "Nastavení programu"
 
-#: src/audacious/util.c:123
+#: src/audacious/util.c:120
 #, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr "Nepodařilo se vytvořit adresář (%s): %s\n"
 
-#: src/audtool/handlers_playlist.c:274
+#: src/audtool/handlers_playlist.c:273
 msgid "Position not found."
 msgstr "Pozice nenalezena."
 
-#: src/audtool/handlers_vitals.c:64
+#: src/audtool/handlers_vitals.c:63
 msgid "No song playing."
 msgstr "Žádná skladba nehraje."
 
-#: src/libaudcore/tuple.c:685
+#: src/libaudcore/audstrings.c:199
+#, c-format
+msgid "Audio CD, track %s"
+msgstr "Zvukové CD, stopa %s"
+
+#: src/libaudcore/tuple.c:536
 msgid "Mono"
 msgstr "Mono"
 
-#: src/libaudcore/tuple.c:687
+#: src/libaudcore/tuple.c:538
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/libaudcore/tuple.c:689
+#: src/libaudcore/tuple.c:540
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
@@ -732,347 +745,345 @@
 msgstr[1] "%d kanály"
 msgstr[2] "%d kanálů"
 
-#: src/libaudgui/confirm.c:78
+#: src/libaudgui/about.c:52 src/libaudgui/about.c:115
+msgid "Credits"
+msgstr "Zásluhy"
+
+#: src/libaudgui/about.c:52
+msgid "Translators"
+msgstr "Překladatelé"
+
+#: src/libaudgui/about.c:91
+msgid "About Audacious"
+msgstr "O Audacious"
+
+#: src/libaudgui/confirm.c:76
 #, c-format
 msgid ""
 "Are you sure you want to close %s? If you do, any changes made since the "
 "playlist was exported will be lost."
-msgstr ""
-"Jste si jisti, že chcete %s zavřít? Pokud tak učiníte, jakékoliv změny "
-"provedené od posledního exportu budou ztraceny."
+msgstr "Jste si jisti, že chcete %s zavřít? Pokud tak učiníte, jakékoliv změny provedené od posledního exportu budou ztraceny."
 
-#: src/libaudgui/confirm.c:91
+#: src/libaudgui/confirm.c:89
 msgid "_Don't show this message again"
 msgstr "_Příště již toto zprávu nezobrazovat"
 
-#: src/libaudgui/confirm.c:128
+#: src/libaudgui/confirm.c:126
 msgid "Rename Playlist"
 msgstr "Přejmenovat seznam skladeb"
 
-#: src/libaudgui/effects-menu.c:76
+#: src/libaudgui/effects-menu.c:74
 msgid "settings ..."
 msgstr "nastavení…"
 
-#: src/libaudgui/equalizer.c:52
+#: src/libaudgui/equalizer.c:51
 msgid "_Enable"
 msgstr "_Zapnout"
 
-#: src/libaudgui/equalizer.c:124
+#: src/libaudgui/equalizer.c:123
 msgid "31 Hz"
 msgstr "31 Hz"
 
-#: src/libaudgui/equalizer.c:124
+#: src/libaudgui/equalizer.c:123
 msgid "63 Hz"
 msgstr "63 Hz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "125 Hz"
 msgstr "125 Hz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "250 Hz"
 msgstr "250 Hz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "500 Hz"
 msgstr "500 Hz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "1 kHz"
 msgstr "1 kHz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "2 kHz"
 msgstr "2 kHz"
 
-#: src/libaudgui/equalizer.c:126
+#: src/libaudgui/equalizer.c:125
 msgid "4 kHz"
 msgstr "4 kHz"
 
-#: src/libaudgui/equalizer.c:126
+#: src/libaudgui/equalizer.c:125
 msgid "8 kHz"
 msgstr "8 kHz"
 
-#: src/libaudgui/equalizer.c:126
+#: src/libaudgui/equalizer.c:125
 msgid "16 kHz"
 msgstr "16 kHz"
 
-#: src/libaudgui/equalizer.c:131
+#: src/libaudgui/equalizer.c:130
 msgid "Equalizer"
 msgstr "Ekvalizér"
 
-#: src/libaudgui/equalizer.c:147
+#: src/libaudgui/equalizer.c:146
 msgid "Preamp"
 msgstr "Předzesílení"
 
-#: src/libaudgui/infopopup.c:211
+#: src/libaudgui/infopopup.c:207
 msgid "Track Number"
 msgstr "Číslo stopy"
 
-#: src/libaudgui/infopopup.c:213
+#: src/libaudgui/infopopup.c:209
 msgid "Track Length"
 msgstr "Délka stopy"
 
-#: src/libaudgui/infowin.c:77
+#: src/libaudgui/infowin.c:75
 msgid "Acid Jazz"
 msgstr "Acid jazz"
 
-#: src/libaudgui/infowin.c:78
+#: src/libaudgui/infowin.c:76
 msgid "Acid Rock"
 msgstr "Acid rock"
 
-#: src/libaudgui/infowin.c:79
+#: src/libaudgui/infowin.c:77
 msgid "Ambient"
 msgstr "Ambient"
 
-#: src/libaudgui/infowin.c:80
+#: src/libaudgui/infowin.c:78
 msgid "Bebop"
 msgstr "Bebob"
 
-#: src/libaudgui/infowin.c:81
+#: src/libaudgui/infowin.c:79
 msgid "Bluegrass"
 msgstr "Bluegrass"
 
-#: src/libaudgui/infowin.c:82
+#: src/libaudgui/infowin.c:80
 msgid "Blues"
 msgstr "Blues"
 
-#: src/libaudgui/infowin.c:83
+#: src/libaudgui/infowin.c:81
 msgid "Chamber Music"
 msgstr "Komorní hudba"
 
-#: src/libaudgui/infowin.c:84
+#: src/libaudgui/infowin.c:82
 msgid "Classical"
 msgstr "Klasika"
 
-#: src/libaudgui/infowin.c:85
+#: src/libaudgui/infowin.c:83
 msgid "Country"
 msgstr "Country"
 
-#: src/libaudgui/infowin.c:86
+#: src/libaudgui/infowin.c:84
 msgid "Death Metal"
 msgstr "Death Metal"
 
-#: src/libaudgui/infowin.c:87
+#: src/libaudgui/infowin.c:85
 msgid "Disco"
 msgstr "Disko"
 
-#: src/libaudgui/infowin.c:88
+#: src/libaudgui/infowin.c:86
 msgid "Easy Listening"
 msgstr "Příjemné poslouchání"
 
-#: src/libaudgui/infowin.c:89
+#: src/libaudgui/infowin.c:87
 msgid "Folk"
 msgstr "Folk"
 
-#: src/libaudgui/infowin.c:90
+#: src/libaudgui/infowin.c:88
 msgid "Funk"
 msgstr "Funk"
 
-#: src/libaudgui/infowin.c:91
+#: src/libaudgui/infowin.c:89
 msgid "Gangsta Rap"
 msgstr "Gangsta Rap"
 
-#: src/libaudgui/infowin.c:92
+#: src/libaudgui/infowin.c:90
 msgid "Gospel"
 msgstr "Gospel"
 
-#: src/libaudgui/infowin.c:93
+#: src/libaudgui/infowin.c:91
 msgid "Grunge"
 msgstr "Grunge"
 
-#: src/libaudgui/infowin.c:94
+#: src/libaudgui/infowin.c:92
 msgid "Hard Rock"
 msgstr "Hard rock"
 
-#: src/libaudgui/infowin.c:95
+#: src/libaudgui/infowin.c:93
 msgid "Heavy Metal"
 msgstr "Heavy metal"
 
-#: src/libaudgui/infowin.c:96
+#: src/libaudgui/infowin.c:94
 msgid "Hip-hop"
 msgstr "Hip hop"
 
-#: src/libaudgui/infowin.c:97
+#: src/libaudgui/infowin.c:95
 msgid "House"
 msgstr "House"
 
-#: src/libaudgui/infowin.c:98
+#: src/libaudgui/infowin.c:96
 msgid "Jazz"
 msgstr "Jazz"
 
-#: src/libaudgui/infowin.c:99
+#: src/libaudgui/infowin.c:97
 msgid "Jungle"
 msgstr "Jungle"
 
-#: src/libaudgui/infowin.c:100
+#: src/libaudgui/infowin.c:98
 msgid "Metal"
 msgstr "Metal"
 
-#: src/libaudgui/infowin.c:101
+#: src/libaudgui/infowin.c:99
 msgid "New Age"
 msgstr "New Age"
 
-#: src/libaudgui/infowin.c:102
+#: src/libaudgui/infowin.c:100
 msgid "New Wave"
 msgstr "Nová vlna"
 
-#: src/libaudgui/infowin.c:103
+#: src/libaudgui/infowin.c:101
 msgid "Noise"
 msgstr "Šum"
 
-#: src/libaudgui/infowin.c:104
+#: src/libaudgui/infowin.c:102
 msgid "Pop"
 msgstr "Pop"
 
-#: src/libaudgui/infowin.c:105
+#: src/libaudgui/infowin.c:103
 msgid "Punk Rock"
 msgstr "Punk rock"
 
-#: src/libaudgui/infowin.c:106
+#: src/libaudgui/infowin.c:104
 msgid "Rap"
 msgstr "Rap"
 
-#: src/libaudgui/infowin.c:107
+#: src/libaudgui/infowin.c:105
 msgid "Reggae"
 msgstr "Reggae"
 
-#: src/libaudgui/infowin.c:108
+#: src/libaudgui/infowin.c:106
 msgid "Rock"
 msgstr "Rock"
 
-#: src/libaudgui/infowin.c:109
+#: src/libaudgui/infowin.c:107
 msgid "Rock and Roll"
 msgstr "Rock and roll"
 
-#: src/libaudgui/infowin.c:110
+#: src/libaudgui/infowin.c:108
 msgid "Rhythm and Blues"
 msgstr "R&B"
 
-#: src/libaudgui/infowin.c:111
+#: src/libaudgui/infowin.c:109
 msgid "Ska"
 msgstr "Ska"
 
-#: src/libaudgui/infowin.c:112
+#: src/libaudgui/infowin.c:110
 msgid "Soul"
 msgstr "Soul"
 
-#: src/libaudgui/infowin.c:113
+#: src/libaudgui/infowin.c:111
 msgid "Swing"
 msgstr "Swing"
 
-#: src/libaudgui/infowin.c:114
+#: src/libaudgui/infowin.c:112
 msgid "Techno"
 msgstr "Techno"
 
-#: src/libaudgui/infowin.c:115
+#: src/libaudgui/infowin.c:113
 msgid "Trip-hop"
 msgstr "Trip hop"
 
-#: src/libaudgui/infowin.c:175 src/libaudgui/infowin.c:361
-#: src/libaudgui/infowin.c:364 src/libaudgui/infowin.c:367
+#: src/libaudgui/infowin.c:177 src/libaudgui/infowin.c:363
+#: src/libaudgui/infowin.c:366 src/libaudgui/infowin.c:369
 msgid "n/a"
 msgstr "−"
 
-#: src/libaudgui/infowin.c:265
+#: src/libaudgui/infowin.c:267
 msgid "Metadata updated successfully"
 msgstr "Metadata byla úspěšně aktualizována"
 
-#: src/libaudgui/infowin.c:270
+#: src/libaudgui/infowin.c:272
 msgid "Metadata updating failed"
 msgstr "Aktualizace metadat selhala"
 
-#: src/libaudgui/infowin.c:318
+#: src/libaudgui/infowin.c:320
 msgid "Track Information"
 msgstr "Informace o stopě"
 
-#: src/libaudgui/infowin.c:350
+#: src/libaudgui/infowin.c:352
 msgid "Format:"
 msgstr "Formát:"
 
-#: src/libaudgui/infowin.c:354
+#: src/libaudgui/infowin.c:356
 msgid "Quality:"
 msgstr "Kvalita:"
 
-#: src/libaudgui/infowin.c:357
+#: src/libaudgui/infowin.c:359
 msgid "Bitrate:"
 msgstr "Datový tok:"
 
-#: src/libaudgui/infowin.c:387
+#: src/libaudgui/infowin.c:389
 msgid "Title"
 msgstr "Název"
 
-#: src/libaudgui/infowin.c:399
+#: src/libaudgui/infowin.c:401
 msgid "Artist"
 msgstr "Umělec"
 
-#: src/libaudgui/infowin.c:411
+#: src/libaudgui/infowin.c:413
 msgid "Album"
 msgstr "Album"
 
-#: src/libaudgui/infowin.c:423
+#: src/libaudgui/infowin.c:425
 msgid "Comment"
 msgstr "Komentář"
 
-#: src/libaudgui/infowin.c:435
+#: src/libaudgui/infowin.c:437
 msgid "Genre"
 msgstr "Žánr"
 
-#: src/libaudgui/infowin.c:456
+#: src/libaudgui/infowin.c:458
 msgid "Year"
 msgstr "Rok"
 
-#: src/libaudgui/infowin.c:467
+#: src/libaudgui/infowin.c:469
 msgid "Track Number"
 msgstr "Číslo stopy"
 
-#: src/libaudgui/infowin.c:549
+#: src/libaudgui/infowin.c:548
 #, c-format
 msgid "%d kb/s"
 msgstr "%d kb/s"
 
-#: src/libaudgui/infowin.c:579
+#: src/libaudgui/infowin.c:575
 #, c-format
 msgid "No info available for %s.\n"
 msgstr "Pro %s nejsou dostupné žádné údaje.\n"
 
-#: src/libaudgui/jump-to-time.c:75
+#: src/libaudgui/jump-to-time.c:72
 msgid "Jump to Time"
 msgstr "Přejít na čas"
 
-#: src/libaudgui/jump-to-time.c:90
+#: src/libaudgui/jump-to-time.c:87
 msgid "mm:ss"
 msgstr "mm:ss"
 
-#: src/libaudgui/playlists.c:39
+#: src/libaudgui/playlists.c:33
 msgid "Export Playlist"
 msgstr "Exportovat seznam skladeb"
 
-#: src/libaudgui/playlists.c:39
+#: src/libaudgui/playlists.c:33
 msgid "Import Playlist"
 msgstr "Importovat seznam skladeb"
 
-#: src/libaudgui/playlists.c:72
+#: src/libaudgui/playlists.c:66
 #, c-format
 msgid "Overwrite %s?"
 msgstr "Přepsat %s?"
 
-#: src/libaudgui/queue-manager.c:185
+#: src/libaudgui/queue-manager.c:196
 msgid "Queue Manager"
 msgstr "Správce fronty"
 
-#: src/libaudgui/ui_about.c:69
-msgid "About Audacious"
-msgstr "O Audacious"
-
-#: src/libaudgui/ui_about.c:90 src/libaudgui/ui_credits.c:122
-msgid "Credits"
-msgstr "Zásluhy"
-
-#: src/libaudgui/ui_credits.c:126
-msgid "Translators"
-msgstr "Překladatelé"
-
 #: src/libaudgui/ui_fileopener.c:109
 msgid "Open Files"
 msgstr "Otevřít soubory"
@@ -1089,60 +1100,60 @@
 msgid "Close dialog on Add"
 msgstr "Zavřít dialog při přidání"
 
-#: src/libaudgui/ui_jumptotrack.c:103 src/libaudgui/ui_jumptotrack.c:111
-#: src/libaudgui/ui_jumptotrack.c:322
+#: src/libaudgui/ui_jumptotrack.c:109 src/libaudgui/ui_jumptotrack.c:117
+#: src/libaudgui/ui_jumptotrack.c:326
 msgid "_Queue"
 msgstr "_Fronta"
 
-#: src/libaudgui/ui_jumptotrack.c:109
+#: src/libaudgui/ui_jumptotrack.c:115
 msgid "Un_queue"
 msgstr "Ode_brat z fronty"
 
-#: src/libaudgui/ui_jumptotrack.c:239
-msgid "Jump to Track"
-msgstr "Skočit na stopu"
+#: src/libaudgui/ui_jumptotrack.c:258
+msgid "Jump to Song"
+msgstr "Přejít na skladbu"
 
-#: src/libaudgui/ui_jumptotrack.c:277
+#: src/libaudgui/ui_jumptotrack.c:281
 msgid "Filter: "
 msgstr "Filtr: "
 
-#: src/libaudgui/ui_jumptotrack.c:278
+#: src/libaudgui/ui_jumptotrack.c:282
 msgid "_Filter:"
 msgstr "_Filtr:"
 
-#: src/libaudgui/ui_jumptotrack.c:288
+#: src/libaudgui/ui_jumptotrack.c:292
 msgid "Remember"
 msgstr "Zapamatovat si"
 
-#: src/libaudgui/ui_jumptotrack.c:295
+#: src/libaudgui/ui_jumptotrack.c:299
 msgid "Clea_r"
 msgstr "Vyp_rázdnit"
 
-#: src/libaudgui/ui_jumptotrack.c:315
+#: src/libaudgui/ui_jumptotrack.c:319
 msgid "Close on Jump"
 msgstr "Zavřít při skoku"
 
-#: src/libaudgui/ui_playlist_manager.c:250
+#: src/libaudgui/ui_playlist_manager.c:253
 msgid "Playlist Manager"
 msgstr "Správce seznamů skladeb"
 
-#: src/libaudgui/ui_playlist_manager.c:277
+#: src/libaudgui/ui_playlist_manager.c:280
 msgid "Entries"
 msgstr "Položky"
 
-#: src/libaudgui/ui_playlist_manager.c:298
+#: src/libaudgui/ui_playlist_manager.c:301
 msgid "_Rename"
 msgstr "_Přejmenovat"
 
-#: src/libaudgui/ui_playlist_manager.c:322
+#: src/libaudgui/ui_playlist_manager.c:325
 msgid "_Close dialog on activating playlist"
 msgstr "Při aktiva_ci seznamu skladeb zavřít dialog"
 
-#: src/libaudgui/ui_urlopener.c:51
+#: src/libaudgui/ui_urlopener.c:48
 msgid "Open URL"
 msgstr "Otevřít URL"
 
-#: src/libaudgui/ui_urlopener.c:51
+#: src/libaudgui/ui_urlopener.c:48
 msgid "Add URL"
 msgstr "Přidat URL"
 
@@ -1150,38 +1161,36 @@
 msgid ""
 "\n"
 "(Further messages have been hidden.)"
-msgstr ""
-"\n"
-"(Další zprávy jsou skryty.)"
+msgstr "\n(Další zprávy jsou skryty.)"
 
 #: src/libeggsmclient/eggdesktopfile.c:165
 msgid "File is not a valid .desktop file"
 msgstr "Soubor není platný souboru druhu .desktop"
 
-#: src/libeggsmclient/eggdesktopfile.c:188
+#: src/libeggsmclient/eggdesktopfile.c:191
 #, c-format
 msgid "Unrecognized desktop file Version '%s'"
 msgstr "Nerozpoznaná verze „%s“ desktopového souboru"
 
-#: src/libeggsmclient/eggdesktopfile.c:967
+#: src/libeggsmclient/eggdesktopfile.c:974
 #, c-format
 msgid "Starting %s"
 msgstr "Startuji %s"
 
-#: src/libeggsmclient/eggdesktopfile.c:1108
+#: src/libeggsmclient/eggdesktopfile.c:1116
 msgid "Application does not accept documents on command line"
 msgstr "Aplikace nepřijímá dokumenty z příkazové řádky"
 
-#: src/libeggsmclient/eggdesktopfile.c:1176
+#: src/libeggsmclient/eggdesktopfile.c:1184
 #, c-format
 msgid "Unrecognized launch option: %d"
 msgstr "Nerozpoznaná volba pro spuštění: %d"
 
-#: src/libeggsmclient/eggdesktopfile.c:1375
+#: src/libeggsmclient/eggdesktopfile.c:1391
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
 msgstr "URI dokumentu nelze předat do desktopové položky „Type=Link“"
 
-#: src/libeggsmclient/eggdesktopfile.c:1396
+#: src/libeggsmclient/eggdesktopfile.c:1412
 msgid "Not a launchable item"
 msgstr "Položka není spustitelná"
 
@@ -1212,4157 +1221,3 @@
 #: src/libeggsmclient/eggsmclient.c:254
 msgid "Show session management options"
 msgstr "Zobrazí přepínače správy relace"
-
-#~ msgid "Buffering ..."
-#~ msgstr "Načítá se…"
-
-#~ msgid ""
-#~ "Audacious seems to be already running but is not responding. You can "
-#~ "start another instance of the program, but please be warned that this can "
-#~ "cause data loss. If Audacious is not running, you can safely ignore this "
-#~ "message. Press OK to start Audacious or Cancel to quit."
-#~ msgstr ""
-#~ "Vypadá to, že Audacious již běží, ale neodpovídá. Můžete spustit další "
-#~ "instanci programu, ale mějte na paměti, že tak můžete ztratit data. Pokud "
-#~ "Audacious neběží, můžete tuto zprávu bezpečně ignorovat. Tlačítkem Budiž "
-#~ "Audacious spustíte, tlačítkem Zrušit ukončíte."
-
-#~ msgid "Universal"
-#~ msgstr "Univerzální"
-
-#~ msgid "Single track mode"
-#~ msgstr "Režim samostatné skladby"
-
-#~ msgid ""
-#~ "Changing these settings will require a restart of "
-#~ "Audacious."
-#~ msgstr ""
-#~ "Změna těchto nastavení se projeví až po restartu "
-#~ "Audacious."
-
-#~ msgid ""
-#~ "List of character encodings used for fall back conversion of metadata. If "
-#~ "automatic character encoding detector failed or has been disabled, "
-#~ "encodings in this list would be treated as candidates of the encoding of "
-#~ "metadata, and fall back conversion from these encodings to UTF-8 would be "
-#~ "attempted."
-#~ msgstr ""
-#~ "Seznam kódování znaků použitých pro konverzi metadat, nelze-li jejich "
-#~ "kódování s jistotou určit. Pokud automatické rozpoznávání kódování selže "
-#~ "nebo je zakázáno, kódování z tohoto seznamu budou považována za kandidáty "
-#~ "na kódování takových metadat a konverze z těchto kódování do UTF-8 bude "
-#~ "vyzkoušena."
-
-#~ msgid "Replay Gain"
-#~ msgstr "Zesílené přehrávání"
-
-#~ msgid "Bit Depth"
-#~ msgstr "Bitová hloubka"
-
-#~ msgid ""
-#~ "All streams will be converted to this bit depth.\n"
-#~ "This should be the max supported bit depth of\n"
-#~ "the sound card or output plugin."
-#~ msgstr ""
-#~ "Všechny proudy budou převedeny na tuto bitovou hloubku.\n"
-#~ "Ta by měla představovat maximální bitovou hloubku zvukové\n"
-#~ "karty nebo výstupního modulu."
-
-#~ msgid "Volume Control"
-#~ msgstr "Ovládání hlasitosti"
-
-#~ msgid ""
-#~ "Use software volume control. This may be useful for situations where your "
-#~ "audio system does not support controlling the playback volume."
-#~ msgstr ""
-#~ "Použije softwarové ovládání hlasitosti. Toto je užitečné, nepodporuje-li "
-#~ "váš zvukový systém změnu hlasitosti přehrávání."
-
-#~ msgid "Mode"
-#~ msgstr "Režim"
-
-#~ msgid "Clipping Prevention"
-#~ msgstr "Ochrana před ořezem"
-
-#~ msgid "Enable clipping prevention"
-#~ msgstr "Zapnout ochranu před ořezem"
-
-#~ msgid "Audio System"
-#~ msgstr "Zvukový systém"
-
-#~ msgid "Current output plugin:"
-#~ msgstr "Aktuální výstupní modul:"
-
-#~ msgid "Display all open Audacious windows"
-#~ msgstr "Zobrazí všechna okna Audacious"
-
-#~ msgid ""
-#~ "<big>Audacious %s</big>\n"
-#~ "An audio player for many platforms.\n"
-#~ "Copyright (C) 2005-2011 Audacious Development Team"
-#~ msgstr ""
-#~ "<big>Audacious %s</big>\n"
-#~ "Přehrávač zvuku pro mnoho platforem.\n"
-#~ "Copyright © 2005–2011 vývojový tým Audacious"
-
-#~ msgid ""
-#~ "Running multiple instances of Audacious can lead to corrupted "
-#~ "configuration files. If Audacious is not already running, or if you want "
-#~ "to run another instance anyway, please delete the file %s and run "
-#~ "Audacious again. Audacious will now close."
-#~ msgstr ""
-#~ "Provozování více instancí Audacious může vést k poškození konfiguračních "
-#~ "souborů. Jestliže Audacious ještě neběží nebo chcete-li přesto spustit "
-#~ "další instanci, prosím, smažte soubor %s a spusťte Audacious znovu. "
-#~ "Audacious bude nyní ukončen."
-
-#~ msgid "%s: Unable to open display, exiting.\n"
-#~ msgstr "%s: Nepodařilo se otevřít displej, končím.\n"
-
-#~ msgid "Preamp:"
-#~ msgstr "Předzesílení:"
-
-#~ msgid "Default gain:"
-#~ msgstr "Standardní zesílení:"
-
-#~ msgid "This gain will be used if file doesn't contain Replay Gain metadata."
-#~ msgstr ""
-#~ "Toto zesílení bude použito, pokud soubor neobsahuje metadata o zesílení "
-#~ "pro přehrávání."
-
-#~ msgid ""
-#~ "Please remember that the most efficient way to "
-#~ "prevent signal clipping is not to use positive values above."
-#~ msgstr ""
-#~ "Prosím, zapamatujte si, že nejúčinnější způsob, jak "
-#~ "předejít ořezu signálu, je výše nepoužít kladná čísla."
-
-#~ msgid "Replay Gain configuration"
-#~ msgstr "Nastavení zesílení při přehrávání"
-
-#~ msgid "Track gain/peak"
-#~ msgstr "Zesílení/vrchol skladby"
-
-#~ msgid "Album gain/peak"
-#~ msgstr "Zesílení/vrchol alba"
-
-#~ msgid "Use peak value from Replay Gain info for clipping prevention"
-#~ msgstr ""
-#~ "Použije hodnotu vrcholu z informací o zesílení pro přehrávání na ochranu "
-#~ "proti ořezu."
-
-#~ msgid "Surround"
-#~ msgstr "Prostorový zvuk"
-
-#~ msgid "Classic Rock"
-#~ msgstr "Klasický rock"
-
-#~ msgid "Dance"
-#~ msgstr "Taneční"
-
-#~ msgid "Oldies"
-#~ msgstr "Oldies"
-
-#~ msgid "Other"
-#~ msgstr "Jiný"
-
-#~ msgid "R&B"
-#~ msgstr "R&B"
-
-#~ msgid "Industrial"
-#~ msgstr "Industrial"
-
-#~ msgid "Alternative"
-#~ msgstr "Alternativní hudba"
-
-#~ msgid "Pranks"
-#~ msgstr "Pranks"
-
-#~ msgid "Soundtrack"
-#~ msgstr "Soundtrack"
-
-#~ msgid "Euro-Techno"
-#~ msgstr "Euro-Techno"
-
-#~ msgid "Vocal"
-#~ msgstr "Vokální"
-
-#~ msgid "Jazz+Funk"
-#~ msgstr "Jazz+Funk"
-
-#~ msgid "Fusion"
-#~ msgstr "Fúze"
-
-#~ msgid "Trance"
-#~ msgstr "Trance"
-
-#~ msgid "Instrumental"
-#~ msgstr "Instrumentální"
-
-#~ msgid "Acid"
-#~ msgstr "Acid"
-
-#~ msgid "Game"
-#~ msgstr "Hra"
-
-#~ msgid "Sound Clip"
-#~ msgstr "Zvukový klip"
-
-#~ msgid "AlternRock"
-#~ msgstr "Alternativní rock"
-
-#~ msgid "Bass"
-#~ msgstr "Basy"
-
-#~ msgid "Punk"
-#~ msgstr "Punk"
-
-#~ msgid "Space"
-#~ msgstr "Space"
-
-#~ msgid "Meditative"
-#~ msgstr "Meditativní"
-
-#~ msgid "Instrumental Pop"
-#~ msgstr "Instrumentální pop"
-
-#~ msgid "Instrumental Rock"
-#~ msgstr "Instrumentální Rock"
-
-#~ msgid "Ethnic"
-#~ msgstr "Etnická hudba"
-
-#~ msgid "Gothic"
-#~ msgstr "Gotická hudba"
-
-#~ msgid "Darkwave"
-#~ msgstr "Darkwave"
-
-#~ msgid "Techno-Industrial"
-#~ msgstr "Techno-Industrial"
-
-#~ msgid "Electronic"
-#~ msgstr "Elektronická"
-
-#~ msgid "Pop-Folk"
-#~ msgstr "Pop-Folk"
-
-#~ msgid "Eurodance"
-#~ msgstr "Eurodance"
-
-#~ msgid "Dream"
-#~ msgstr "Dream"
-
-#~ msgid "Southern Rock"
-#~ msgstr "Jižanský rock"
-
-#~ msgid "Comedy"
-#~ msgstr "Komedie"
-
-#~ msgid "Cult"
-#~ msgstr "Kult"
-
-#~ msgid "Top 40"
-#~ msgstr "Top 40"
-
-#~ msgid "Christian Rap"
-#~ msgstr "Křesťanský rap"
-
-#~ msgid "Pop/Funk"
-#~ msgstr "Pop/Funk"
-
-#~ msgid "Native American"
-#~ msgstr "Indiánská hudba"
-
-#~ msgid "Cabaret"
-#~ msgstr "Kabaret"
-
-#~ msgid "Psychedelic"
-#~ msgstr "Psychedelická"
-
-#~ msgid "Rave"
-#~ msgstr "Rave"
-
-#~ msgid "Showtunes"
-#~ msgstr "Šlágr z jeviště"
-
-#~ msgid "Trailer"
-#~ msgstr "Trailer"
-
-#~ msgid "Lo-Fi"
-#~ msgstr "Lo-Fi"
-
-#~ msgid "Tribal"
-#~ msgstr "Tribal"
-
-#~ msgid "Acid Punk"
-#~ msgstr "Acid punk"
-
-#~ msgid "Polka"
-#~ msgstr "Polka"
-
-#~ msgid "Retro"
-#~ msgstr "Retro"
-
-#~ msgid "Musical"
-#~ msgstr "Muzikál"
-
-#~ msgid "Folk/Rock"
-#~ msgstr "Folk/Rock"
-
-#~ msgid "National Folk"
-#~ msgstr "Národní lidová"
-
-#~ msgid "Fast-Fusion"
-#~ msgstr "Fast-Fusion"
-
-#~ msgid "Latin"
-#~ msgstr "Latinská"
-
-#~ msgid "Revival"
-#~ msgstr "Revival"
-
-#~ msgid "Celtic"
-#~ msgstr "Keltská hudba"
-
-#~ msgid "Avantgarde"
-#~ msgstr "Avantgardní"
-
-#~ msgid "Gothic Rock"
-#~ msgstr "Gotický rock"
-
-#~ msgid "Progressive Rock"
-#~ msgstr "Progresivní rock"
-
-#~ msgid "Psychedelic Rock"
-#~ msgstr "Psychedelický rock"
-
-#~ msgid "Symphonic Rock"
-#~ msgstr "Symfonický rock"
-
-#~ msgid "Slow Rock"
-#~ msgstr "Ploužák"
-
-#~ msgid "Big Band"
-#~ msgstr "Big Band"
-
-#~ msgid "Chorus"
-#~ msgstr "Chór"
-
-#~ msgid "Acoustic"
-#~ msgstr "Akustická"
-
-#~ msgid "Humour"
-#~ msgstr "Humor"
-
-#~ msgid "Speech"
-#~ msgstr "Mluvené"
-
-#~ msgid "Chanson"
-#~ msgstr "Šanson"
-
-#~ msgid "Opera"
-#~ msgstr "Opera"
-
-#~ msgid "Sonata"
-#~ msgstr "Sonáta"
-
-#~ msgid "Symphony"
-#~ msgstr "Symfonie"
-
-#~ msgid "Booty Bass"
-#~ msgstr "Booty Bass"
-
-#~ msgid "Primus"
-#~ msgstr "Primus"
-
-#~ msgid "Porn Groove"
-#~ msgstr "Porn Groove"
-
-#~ msgid "Satire"
-#~ msgstr "Satira"
-
-#~ msgid "Slow Jam"
-#~ msgstr "Slow Jam"
-
-#~ msgid "Club"
-#~ msgstr "Klub"
-
-#~ msgid "Tango"
-#~ msgstr "Tango"
-
-#~ msgid "Samba"
-#~ msgstr "Samba"
-
-#~ msgid "Folklore"
-#~ msgstr "Folklór"
-
-#~ msgid "Ballad"
-#~ msgstr "Balada"
-
-#~ msgid "Power Ballad"
-#~ msgstr "Rocková balada"
-
-#~ msgid "Rhythmic Soul"
-#~ msgstr "Rytmický soul"
-
-#~ msgid "Freestyle"
-#~ msgstr "Freestyle"
-
-#~ msgid "Duet"
-#~ msgstr "Duet"
-
-#~ msgid "Drum Solo"
-#~ msgstr "Drum Solo"
-
-#~ msgid "A Cappella"
-#~ msgstr "A Cappella"
-
-#~ msgid "Euro-House"
-#~ msgstr "Euro-House"
-
-#~ msgid "Dance Hall"
-#~ msgstr "Dance Hall"
-
-#~ msgid "Goa"
-#~ msgstr "Goa"
-
-#~ msgid "Drum & Bass"
-#~ msgstr "Drum & Bass"
-
-#~ msgid "Club-House"
-#~ msgstr "Club-House"
-
-#~ msgid "Hardcore"
-#~ msgstr "Hardcore"
-
-#~ msgid "Terror"
-#~ msgstr "Terror"
-
-#~ msgid "Indie"
-#~ msgstr "Indie"
-
-#~ msgid "BritPop"
-#~ msgstr "Britpop"
-
-#~ msgid "Negerpunk"
-#~ msgstr "Negerpunk"
-
-#~ msgid "Polsk Punk"
-#~ msgstr "Polsk Punk"
-
-#~ msgid "Beat"
-#~ msgstr "Beat"
-
-#~ msgid "Christian Gangsta Rap"
-#~ msgstr "Křesťanský Gangsta Rap"
-
-#~ msgid "Black Metal"
-#~ msgstr "Black metal"
-
-#~ msgid "Crossover"
-#~ msgstr "Crossover"
-
-#~ msgid "Contemporary Christian"
-#~ msgstr "Moderní křesťanská"
-
-#~ msgid "Christian Rock"
-#~ msgstr "Křesťanský rock"
-
-#~ msgid "Merengue"
-#~ msgstr "Merengue"
-
-#~ msgid "Salsa"
-#~ msgstr "Salsa"
-
-#~ msgid "Thrash Metal"
-#~ msgstr "Thrash metal"
-
-#~ msgid "Anime"
-#~ msgstr "Anime"
-
-#~ msgid "JPop"
-#~ msgstr "JPop"
-
-#~ msgid "Synthpop"
-#~ msgstr "Synthpop"
-
-#~ msgid "Sorry, threads aren't supported on your platform.\n"
-#~ msgstr "Je nám líto, ale vlákna nejsou na vaší platformě podporována.\n"
-
-#~ msgid "Module loading not supported! Plugins will not be loaded.\n"
-#~ msgstr "Nahrávání modulu není podporováno! Moduly nebudou nahrány.\n"
-
-# FIXME: This requires context. "Přehrávání" In preferences, "Přehrát" in
-# manager. Still?
-#~ msgid "Playback"
-#~ msgstr "Přehrávání"
-
-#~ msgid "Playback"
-#~ msgstr "Přehrávání"
-
-#~ msgid ""
-#~ "When Audacious starts, automatically begin playing from the point where "
-#~ "we stopped before."
-#~ msgstr ""
-#~ "Po spuštění Audacious automaticky začne hrát tam, kde před tím skončil."
-
-#~ msgid "Don't advance in the playlist"
-#~ msgstr "Nepokračovat v přehrávání dle seznamu skladeb"
-
-#~ msgid ""
-#~ "When finished playing a song, don't automatically advance to the next."
-#~ msgstr "Po přehrání skladby nepřecházet automaticky na následující."
-
-#~ msgid "Enabled"
-#~ msgstr "Povolený"
-
-#~ msgid "Description"
-#~ msgstr "Popis"
-
-#~ msgid "Output Plugin Preferences"
-#~ msgstr "Nastavení výstupního modulu"
-
-#~ msgid "Output Plugin Information"
-#~ msgstr "Podrobnosti o výstupním modulu"
-
-#~ msgid "_Decoder list:"
-#~ msgstr "Seznam _dekódovacích modulů:"
-
-#~ msgid "Decoders"
-#~ msgstr "Dekodéry"
-
-#~ msgid "_General plugin list:"
-#~ msgstr "_Seznam obecných modulů:"
-
-#~ msgid "General"
-#~ msgstr "Obecné"
-
-#~ msgid "_Visualization plugin list:"
-#~ msgstr "_Seznam vizualizačních modulů:"
-
-#~ msgid "Visualization"
-#~ msgstr "Vizualizační"
-
-#~ msgid "Effect plugins:"
-#~ msgstr "Moduly efektů:"
-
-#~ msgid "Effects"
-#~ msgstr "Efekty"
-
-#~ msgid "General"
-#~ msgstr "Obecné"
-
-#~ msgid "Location"
-#~ msgstr "Umístění"
-
-#~ msgid "Raw Metadata"
-#~ msgstr "Syrová metadata"
-
-#~ msgid "Key"
-#~ msgstr "Klíč"
-
-#~ msgid "Value"
-#~ msgstr "Hodnota"
-
-#~ msgid "Unable to create log file (%s)!\n"
-#~ msgstr "Nepodařilo se vytvořit protokolovací soubor (%s)!\n"
-
-#~ msgid "Print all errors and warnings to stdout"
-#~ msgstr "Všechny chyby a varování tisknout na standardní výstup"
-
-#~ msgid "Used in macpacking"
-#~ msgstr "Použito v macpackingu"
-
-#~ msgid "Audacious - Unsupported Version Warning"
-#~ msgstr "Audacious – varování před nepodporovanou verzí"
-
-#~ msgid "<big>Audacious2 is not ready yet!</big>"
-#~ msgstr "<big>Audacious2 ještě není hotový!</big>"
-
-#~ msgid ""
-#~ "Please don't file bugs at this point unless they represent major "
-#~ "problems."
-#~ msgstr ""
-#~ "Prosíme, abyste v ŧento okamžik nehlásili chyby, pokud nepředstavují "
-#~ "závažný problém."
-
-#~ msgid ""
-#~ "This is an alpha build of Audacious2. It is still fairly "
-#~ "incomplete and unpolished.\n"
-#~ "We suspect that most minor bugs reported during this time will be "
-#~ "resolved once more things\n"
-#~ "stablize. However, if there is a major bug, such as a crash on playing a "
-#~ "specific file, we\n"
-#~ "need to know about it.\n"
-#~ "\n"
-#~ "However, we ask you to be aware that dealing with trivial bugs is "
-#~ "distracting at this point,\n"
-#~ "and to please refrain from doing so. Thanks in advance!"
-#~ msgstr ""
-#~ "Toto je alfa sestavení Audacious2. Stále je poměrně nedokončené a "
-#~ "neutříděné.\n"
-#~ "Očekáváme, že většina drobných chyb nahlášených v této době bude "
-#~ "vyřešena, jakmile se více\n"
-#~ "věcí stabilizuje. Avšak, je-li zde zásadní chyba, jako je pád při "
-#~ "přehrávání určitého souboru,\n"
-#~ "potřebujeme o ní vědět.\n"
-#~ "\n"
-#~ "Žádáme vás, abyste chápali, že zaobírání se triviálními chybami "
-#~ "je v tento okamžik rozptylující,\n"
-#~ "a abyste se zdrželi takového chování. Děkujeme za pochopení!"
-
-#~ msgid "Blogging about bugs in it is also not helpful."
-#~ msgstr "Blogování o takových chybách také nepomůže."
-
-#~ msgid ""
-#~ "Likewise, we're developers. We don't read blogs on a regular basis. If "
-#~ "there is a major bug,\n"
-#~ "we ask you to bring it to our attention via our bugtracking instance at "
-#~ "http://jira.atheme.org/,\n"
-#~ "or via the forums that are on the website.\n"
-#~ "\n"
-#~ "This will help us find out more information about your concerns, which we "
-#~ "would likely\n"
-#~ "not know about otherwise."
-#~ msgstr ""
-#~ "My jsme vývojáři a blogy nečteme pravidelně. Existuje-li závažná chyba,\n"
-#~ "žádáme vás, abyste si naši pozornost získali prostřednictvím systému na\n"
-#~ "sledování chyb na adrese http://jira.atheme.org/ nebo prostřednictvím "
-#~ "fór,\n"
-#~ "které se nacházejí na našem webu.\n"
-#~ "\n"
-#~ "Toto nám pomůže zjistit více informací o vašich problémech, které bychom\n"
-#~ "pravděpodobně jinak nezjistili."
-
-#~ msgid "Interface to use (use -i list to view available interfaces)"
-#~ msgstr "Použít dané rozhraní (možná rozhraní lze vypsat pomocí „-i list“)"
-
-#~ msgid ""
-#~ "Available interfaces:\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Dostupná rozhraní:\n"
-#~ "\n"
-
-#~ msgid "Available Plugin Preferences:\n"
-#~ msgstr "Nastavení dostupných modulů:\n"
-
-#~ msgid "Headless Interface"
-#~ msgstr "Bezhlavé rozhraní"
-
-#~ msgid "Effect plugins (for 16-bit output only):"
-#~ msgstr "Moduly efektů (pouze pro 16b výstup):"
-
-#~ msgid "Add/Open URL Dialog"
-#~ msgstr "Dialog Přidat/otevřít URL"
-
-#~ msgid "Enter location to play:"
-#~ msgstr "Zadejte adresu, z které se má hrát:"
-
-#~ msgid "Don't clear the playlist"
-#~ msgstr "Nemazat seznam skladeb"
-
-#~ msgid "audacious: %s"
-#~ msgstr "audacious: %s"
-
-#~ msgid "Filename:"
-#~ msgstr "Jméno souboru:"
-
-#~ msgid "No input plugin recognized this file"
-#~ msgstr "Soubor nebyl rozpoznán žádným vstupním modulem"
-
-#~ msgid "Input plugin: %s"
-#~ msgstr "Vstupní modul: %s"
-
-#~ msgid ""
-#~ "<big>No output plugin selected.</big>\n"
-#~ "You have not selected an output plugin."
-#~ msgstr ""
-#~ "<big>Není vybrán žádný výstupní modul.</big>\n"
-#~ "Musíte vybrat výstupní modul."
-
-#~ msgid "Best Sinc Interpolation"
-#~ msgstr "Nejlepší sinová interpolace"
-
-#~ msgid "Medium Sinc Interpolation"
-#~ msgstr "Střední sinová interpolace"
-
-#~ msgid "Fastest Sinc Interpolation"
-#~ msgstr "Nejrychlejší sinová interpolace"
-
-#~ msgid "ZOH Interpolation"
-#~ msgstr "Interpolace ZOH:"
-
-#~ msgid "Linear Interpolation"
-#~ msgstr "Lineární interpolace:"
-
-#~ msgid "Sampling Rate [Hz]:"
-#~ msgstr "Vzorkovací kmitočet [Hz]:"
-
-#~ msgid "Interpolation Engine:"
-#~ msgstr "Způsob interpolace:"
-
-#~ msgid ""
-#~ "All streams will be converted to this sampling "
-#~ "rate.\n"
-#~ "This should be the max supported sampling rate of\n"
-#~ "the sound card or output plugin."
-#~ msgstr ""
-#~ "Všechny proudy budou převedeny na tento vzorkovací "
-#~ "kmitočet.\n"
-#~ "Ten by měl představovat maximální vzorkovací kmitočet zvukové karty nebo "
-#~ "výstupního modulu."
-
-#~ msgid "Sampling Rate Converter"
-#~ msgstr "Konvertor vzorkovacího kmitočtu"
-
-#~ msgid "Enable Sampling Rate Converter"
-#~ msgstr "Zapnout konvertor vzorkovacího kmitočtu"
-
-# TODO: plurals
-#~ msgid "%d files found"
-#~ msgstr "nalezeno %d souborů"
-
-#~ msgid "Connectivity"
-#~ msgstr "Připojení"
-
-#~ msgid "Detect file formats by extension."
-#~ msgstr "Rozpoznávat formát souboru podle přípony."
-
-#~ msgid ""
-#~ "When checked, Audacious will detect file formats based by extension. Only "
-#~ "files with extensions of supported formats will be loaded."
-#~ msgstr ""
-#~ "Je-li zatrhnuto, Audacious bude rozpoznávat formát souboru podle přípony. "
-#~ "Nahrány budou jen soubory, jejichž přípona přísluší podporovanému formátu."
-
-#~ msgid "Advanced"
-#~ msgstr "Pokročilé"
-
-#~ msgid "Bypass all of signal processing if possible"
-#~ msgstr "Obejít veškeré zpracování signálu, je-li to možno"
-
-#~ msgid ""
-#~ "Try to pass input plugin's output directly to output plugin, if the "
-#~ "latter supports format produced by input plugin. If it's true, all signal "
-#~ "processing will be disabled (i.e. DSP plugins, equalizer, resampling, "
-#~ "Replay Gain and software volume control)."
-#~ msgstr ""
-#~ "Pokusí se předávat výstup vstupního modulu přímo modulu výstupnímu, pokud "
-#~ "výstupní modul podporuje formát dat vyráběných vstupním modulem. Je-li "
-#~ "tomu tak, veškeré zpracování signálu bude zakázáno (tj. DSP moduly, "
-#~ "ekvalizér, převzorkování, zesílení přehrávání a softwarové ovládání "
-#~ "hlasitosti)."
-
-#~ msgid "Use fast floating-point conversion (16-bit output only)"
-#~ msgstr "Použít rychlý převod v plovoucí řádové čárce (pouze u 16b výstupu)"
-
-#~ msgid "Dynamically adjust scale factor to prevent clipping"
-#~ msgstr "Dynamicky upravovat škálovací činitel jako ochranu před ořezem"
-
-#~ msgid "Decrease scale factor (gain) if clipping nevertheless occurred"
-#~ msgstr "Sníží činitel zesílení, pokud by oříznutí bylo nevyhnutelné."
-
-#~ msgid ""
-#~ "\n"
-#~ "Audacious has caught signal 11 (SIGSEGV).\n"
-#~ "\n"
-#~ "We apologize for the inconvenience, but Audacious has crashed.\n"
-#~ "This is a bug in the program, and should never happen under normal "
-#~ "circumstances.\n"
-#~ "Your current configuration has been saved and should not be damaged.\n"
-#~ "\n"
-#~ "You can help improve the quality of Audacious by filing a bug at http://"
-#~ "jira.atheme.org/\n"
-#~ "Please include the entire text of this message and a description of what "
-#~ "you were doing when\n"
-#~ "this crash occured in order to quickly expedite the handling of your bug "
-#~ "report:\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Audacious zachytil signál č. 11 (SIGSEGV).\n"
-#~ "\n"
-#~ "Omlouváme se za potíže, ale Audacious zhavaroval.\n"
-#~ "Toto je chyba programu a za běžných okolností by k ní nikdy nemělo "
-#~ "dojít.\n"
-#~ "Vaše současná konfigurace byla uložena a neměla by být poškozena.\n"
-#~ "\n"
-#~ "I vy můžete pomoci zlepšit Audacious tím, že vyplníte chybové hlášení na "
-#~ "http://jira.atheme.org/\n"
-#~ "Prosím, zahrňte celý text této hlášky a popis toho, co jste dělali, když\n"
-#~ "došlo k pádu. Pomůžete tím k rychlejšímu odbavení svého chybového "
-#~ "hlášení:\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Stacktrace was unavailable. You might want to reproduce this problem "
-#~ "while running Audacious under GDB to get a proper backtrace.\n"
-#~ msgstr ""
-#~ "Mapa zásobníku nebyla k dispozici. Možná byste mohli chtít zreprodukovat "
-#~ "tento problém v Audicous běžícím pod GDB, aby jste tak získali správnou "
-#~ "posloupnost volání.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Bugs can be reported at http://jira.atheme.org/ against the Audacious or "
-#~ "Audacious Plugins product.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Chyby mohou být hlášeny na http://jira.atheme.org/ pod výrobkem\n"
-#~ "„Audacious“ nebo „Audacious Plugins“.\n"
-
-#~ msgid ""
-#~ "Your signaling implementation is broken.\n"
-#~ "Expect unusable crash reports.\n"
-#~ msgstr ""
-#~ "Vaše implementace signálů je rozbitá.\n"
-#~ "Očekávejte nepoužitelné hlášení o pádu.\n"
-
-#~ msgid ""
-#~ "<big>Audacious %s</big>\n"
-#~ "\n"
-#~ "Copyright (C) 2005-2009 Audacious Development Team"
-#~ msgstr ""
-#~ "<big>Audacious %s</big>\n"
-#~ "\n"
-#~ "Copyright © 2005–2009 vývojový tým Audacious"
-
-#~ msgid "Detect file formats on demand, instead of immediately."
-#~ msgstr "Rozpoznávat formát souboru na požádání namísto okamžitě."
-
-#~ msgid ""
-#~ "When checked, Audacious will detect file formats on demand. This can "
-#~ "result in a messier playlist, but delivers a major speed benefit."
-#~ msgstr ""
-#~ "Je-li zatrhnuto, Audacious bude rozpoznávat formát souboru, až bude "
-#~ "potřeba. Toto může vést k ošklivému seznamu skladeb, ale značně urychluje "
-#~ "jeho zpracování."
-
-#~ msgid "Load metadata from playlists and files"
-#~ msgstr "Načíst metadata ze seznamů skladeb a souborů"
-
-#~ msgid "Load metadata (tag information) from music files."
-#~ msgstr "Načíst metadata (tagy) z hudebních souborů."
-
-#~ msgid "Can't jump to time when no track is being played.\n"
-#~ msgstr "Nelze přejít na čas, když žádná skladba nehraje.\n"
-
-#~ msgid "minutes:seconds"
-#~ msgstr "minuty:sekundy"
-
-#~ msgid "Track length:"
-#~ msgstr "Délka stopy:"
-
-#~ msgid "Save as Static Playlist"
-#~ msgstr "Uložit statický seznam skladeb"
-
-#~ msgid "Use Relative Path"
-#~ msgstr "Použít relativní cesty"
-
-#~ msgid "Error writing playlist \"%s\": %s"
-#~ msgstr "Chyba při zapisování seznamu skladeb „%s“: %s"
-
-#~ msgid "%s already exist. Continue?"
-#~ msgstr "%s už existuje. Pokračovat?"
-
-#~ msgid ""
-#~ "<big>Unable to save playlist.</big>\n"
-#~ "\n"
-#~ "Unknown file type for '%s'.\n"
-#~ msgstr ""
-#~ "<big>Nelze uložit seznam skladeb.</big>\n"
-#~ "\n"
-#~ "Neznámý typ souboru %s.\n"
-
-#~ msgid "Presets"
-#~ msgstr "Předvolby"
-
-#~ msgid "Mouse"
-#~ msgstr "Myš"
-
-#~ msgid "Pause between songs"
-#~ msgstr "Pauza mezi skladbami"
-
-#~ msgid "Pause for"
-#~ msgstr "Pozastavit na"
-
-#~ msgid "seconds"
-#~ msgstr "s"
-
-#~ msgid "Filename"
-#~ msgstr "Jméno souboru"
-
-#~ msgid "Convert underscores to blanks"
-#~ msgstr "Převést podtržítka na mezery"
-
-#~ msgid "Convert %20 to blanks"
-#~ msgstr "Převést %20 na mezery"
-
-#~ msgid "Convert backslash '\\' to forward slash '/'"
-#~ msgstr "Převést zpětná lomítka „\\“ na lomítka dopředná „/“"
-
-#~ msgid "File Dialog"
-#~ msgstr "Dialog o souboru"
-
-#~ msgid "Always refresh directory when opening file dialog"
-#~ msgstr "Při otevření dialogu o souboru vždy zkontrolovat adresář"
-
-#~ msgid ""
-#~ "Always refresh the file dialog (this will slow opening the dialog on "
-#~ "large directories, and Gnome VFS should handle automatically)."
-#~ msgstr ""
-#~ "Vždy obnovit dialog o souboru (toto zpomalí dialog na velkých adresářích "
-#~ "a Gnome VFS by měl jednat automaticky)."
-
-#~ msgid "Changes volume by"
-#~ msgstr "změní hlasitost o"
-
-#~ msgid "percent"
-#~ msgstr "procent."
-
-#~ msgid "Scrolls playlist by"
-#~ msgstr "posune seznam skladeb o"
-
-#~ msgid "lines"
-#~ msgstr "řádek."
-
-#~ msgid "Stop after Current Song"
-#~ msgstr "Zastavit po současné skladbě"
-
-#~ msgid "Peaks"
-#~ msgstr "Vrcholy"
-
-#~ msgid "Repeat"
-#~ msgstr "Opakovat"
-
-#~ msgid "Shuffle"
-#~ msgstr "Náhodné přehrávání"
-
-#~ msgid "No Playlist Advance"
-#~ msgstr "Žádné pokračování dle seznamu skladeb"
-
-#~ msgid "Play"
-#~ msgstr "Hrát"
-
-#~ msgid "Pause"
-#~ msgstr "Pozastavit"
-
-#~ msgid "Stop"
-#~ msgstr "Zastavit"
-
-#~ msgid "Previous"
-#~ msgstr "Předchozí"
-
-#~ msgid "Next"
-#~ msgstr "Další"
-
-#~ msgid "Visualization Mode"
-#~ msgstr "Typ znázornění"
-
-#~ msgid "Analyzer Mode"
-#~ msgstr "Typ sloupců"
-
-#~ msgid "Scope Mode"
-#~ msgstr "Typ vlnovky"
-
-#~ msgid "Voiceprint Mode"
-#~ msgstr "Typ otisku"
-
-#~ msgid "WindowShade VU Mode"
-#~ msgstr "Typ WindowShade VU"
-
-#~ msgid "Refresh Rate"
-#~ msgstr "Rychlost překreslování"
-
-#~ msgid "Analyzer Falloff"
-#~ msgstr "Klesání sloupců"
-
-#~ msgid "Peaks Falloff"
-#~ msgstr "Klesání vrcholků"
-
-#~ msgid "New Playlist"
-#~ msgstr "Nový seznam skladeb"
-
-#~ msgid "Select Next Playlist"
-#~ msgstr "Vybrat následující seznam skladeb"
-
-#~ msgid "Select Previous Playlist"
-#~ msgstr "Vybrat předchozí seznam skladeb"
-
-#~ msgid "Delete Playlist"
-#~ msgstr "Smazat seznam skladeb"
-
-#~ msgid "Load List"
-#~ msgstr "Načíst seznam skladeb"
-
-#~ msgid "Loads a playlist file into the selected playlist."
-#~ msgstr "Načte soubor se seznamem skladeb do vybraného seznamu."
-
-#~ msgid "Save List"
-#~ msgstr "Uložit seznam"
-
-#~ msgid "Saves the selected playlist."
-#~ msgstr "Uloží vybraný seznam skladeb."
-
-#~ msgid "Save Default List"
-#~ msgstr "Uložit standardní seznam"
-
-#~ msgid "Saves the selected playlist to the default location."
-#~ msgstr "Uloží vybraný seznam skladeb na standardní místo."
-
-#~ msgid "Refresh List"
-#~ msgstr "Obnovit seznam"
-
-#~ msgid "Refreshes metadata associated with a playlist entry."
-#~ msgstr "Obnovuje metadata náležící skladbě ze seznamu."
-
-#~ msgid "Opens the playlist manager."
-#~ msgstr "Otevře správce seznamu skladeb."
-
-#~ msgid "View"
-#~ msgstr "Zobrazení"
-
-#~ msgid "Add Internet Address..."
-#~ msgstr "Přidat internetovou adresu…"
-
-#~ msgid "Adds a remote track to the playlist."
-#~ msgstr "Do seznamu přidá vzdálenou stopu."
-
-#~ msgid "Add Files..."
-#~ msgstr "Přidat soubory…"
-
-#~ msgid "Search and Select"
-#~ msgstr "Hledání a výběr"
-
-#~ msgid ""
-#~ "Searches the playlist and selects playlist entries based on specific "
-#~ "criteria."
-#~ msgstr ""
-#~ "Prohledá seznam skladeb a vybere skladby ze seznamu podle zadaných "
-#~ "omezení."
-
-#~ msgid "Invert Selection"
-#~ msgstr "Invertovat výběr"
-
-#~ msgid "Inverts the selected and unselected entries."
-#~ msgstr "Zamění vybrané a nevybrané položky."
-
-#~ msgid "Select All"
-#~ msgstr "Vybrat vše"
-
-#~ msgid "Selects all of the playlist entries."
-#~ msgstr "Vybere všechny skladby v seznamu."
-
-#~ msgid "Select None"
-#~ msgstr "Nevybrat žádné"
-
-#~ msgid "Deselects all of the playlist entries."
-#~ msgstr "Žádná skladba v seznamu nebude vybraná."
-
-#~ msgid "Remove All"
-#~ msgstr "Odebrat všechny"
-
-#~ msgid "Removes all entries from the playlist."
-#~ msgstr "Ze seznamu odstraní všechny skladby."
-
-#~ msgid "Clear Queue"
-#~ msgstr "Vyprázdnit frontu"
-
-#~ msgid "Clears the queue associated with this playlist."
-#~ msgstr "Vyprázdní frontu spojenou s tímto seznamem skladeb."
-
-#~ msgid "Remove Unavailable Files"
-#~ msgstr "Odstranit nedostupné soubory"
-
-#~ msgid "Removes unavailable files from the playlist."
-#~ msgstr "Ze seznamu skladeb odstraní nedostupné soubory."
-
-#~ msgid "Remove Duplicates"
-#~ msgstr "Odebrat duplikáty"
-
-#~ msgid "By Title"
-#~ msgstr "Podle názvu"
-
-#~ msgid "Removes duplicate entries from the playlist by title."
-#~ msgstr "Ze seznamu odstraní skladby na základě jejich názvu."
-
-#~ msgid "By Filename"
-#~ msgstr "Podle jména souboru"
-
-#~ msgid "Removes duplicate entries from the playlist by filename."
-#~ msgstr "Ze seznamu odstraní skladby na základě jména souboru."
-
-#~ msgid "By Path + Filename"
-#~ msgstr "Podle cesty a jména souboru"
-
-#~ msgid "Removes duplicate entries from the playlist by their full path."
-#~ msgstr "Ze seznamu odstraní skladby na základě celé cesty."
-
-#~ msgid "Remove Unselected"
-#~ msgstr "Odebrat neoznačené"
-
-#~ msgid "Remove unselected entries from the playlist."
-#~ msgstr "Odebrat neoznačené skladby se seznamu."
-
-#~ msgid "Remove Selected"
-#~ msgstr "Odebrat označené"
-
-#~ msgid "Remove selected entries from the playlist."
-#~ msgstr "Odebrat označené skladby ze seznamu."
-
-#~ msgid "Randomize List"
-#~ msgstr "Zamíchat pořadí"
-
-#~ msgid "Randomizes the playlist."
-#~ msgstr "Sklady v seznamu seřadí náhodně."
-
-#~ msgid "Reverse List"
-#~ msgstr "Otočit seznam"
-
-#~ msgid "Reverses the playlist."
-#~ msgstr "Obrátí pořadí skladeb v seznamu."
-
-#~ msgid "Sort List"
-#~ msgstr "Seřadit seznam"
-
-#~ msgid "Sorts the list by title."
-#~ msgstr "Seřadí seznam podle názvu."
-
-#~ msgid "By Album"
-#~ msgstr "Podle alba"
-
-#~ msgid "Sorts the list by album."
-#~ msgstr "Seřadí seznam podle alba."
-
-#~ msgid "By Artist"
-#~ msgstr "Podle umělce"
-
-#~ msgid "Sorts the list by artist."
-#~ msgstr "Skladby v seznam seřadí podle jména umělce."
-
-#~ msgid "Sorts the list by filename."
-#~ msgstr "Skladby v seznamu seřadí podle jména souboru"
-
-#~ msgid "Sorts the list by full pathname."
-#~ msgstr "Skladby v seznamu seřadí podle celé cesty."
-
-#~ msgid "By Date"
-#~ msgstr "Podle data"
-
-#~ msgid "Sorts the list by modification time."
-#~ msgstr ""
-#~ "Skladby v seznamu seřadí podle času poslední změny v obsahu souboru."
-
-#~ msgid "By Track Number"
-#~ msgstr "Podle čísla stopy"
-
-#~ msgid "Sorts the list by track number."
-#~ msgstr "Skladby v seznamu seřadí podle čísla stopy."
-
-#~ msgid "By Playlist Entry"
-#~ msgstr "Podle položek v seznamu"
-
-#~ msgid "Sorts the list by playlist entry."
-#~ msgstr "Skladby seřadí podle položek seznamu."
-
-#~ msgid "Sort Selected"
-#~ msgstr "Seřadit vybrané"
-
-#~ msgid "File"
-#~ msgstr "Soubor"
-
-#~ msgid "Help"
-#~ msgstr "Nápověda"
-
-#~ msgid "Components"
-#~ msgstr "Součásti"
-
-#~ msgid "View Track Details"
-#~ msgstr "Zobrazit informace o skladbě"
-
-#~ msgid "Play File"
-#~ msgstr "Přehrát soubor"
-
-#~ msgid "Load and play a file"
-#~ msgstr "Načíst a přehrát soubor"
-
-#~ msgid "Play Location"
-#~ msgstr "Hrát z adresy"
-
-#~ msgid "Play media from the selected location"
-#~ msgstr "Přehrát média z vybrané adresy"
-
-#~ msgid "Plugin services"
-#~ msgstr "Služby modulu"
-
-#~ msgid "Preferences"
-#~ msgstr "Nastavení"
-
-#~ msgid "Open preferences window"
-#~ msgstr "Otevřít okno s nastavením"
-
-#~ msgid "_Quit"
-#~ msgstr "_Konec"
-
-#~ msgid "Quit Audacious"
-#~ msgstr "O Audacious"
-
-#~ msgid "Set A-B"
-#~ msgstr "Nastavit A-B"
-
-#~ msgid "Clear A-B"
-#~ msgstr "Vyprázdnit A-B"
-
-#~ msgid "Jump to Playlist Start"
-#~ msgstr "Přejít na začátek seznamu skladeb"
-
-#~ msgid "Jump to File"
-#~ msgstr "Přejít na soubor"
-
-#~ msgid "Queue Toggle"
-#~ msgstr "Přepnout frontu"
-
-#~ msgid "Enables/disables the entry in the playlist's queue."
-#~ msgstr "Povolí/zakáže položku ve frontě seznamu skladeb."
-
-#~ msgid "Load"
-#~ msgstr "Načíst"
-
-#~ msgid "Import"
-#~ msgstr "Importovat"
-
-#~ msgid "Save"
-#~ msgstr "Uložit"
-
-#~ msgid "Delete"
-#~ msgstr "Smazat"
-
-#~ msgid "Preset"
-#~ msgstr "Předvolba"
-
-#~ msgid "Load preset"
-#~ msgstr "Načíst předvolbu"
-
-#~ msgid "Auto-load preset"
-#~ msgstr "Souborová předvolba"
-
-#~ msgid "Load auto-load preset"
-#~ msgstr "Načíst souborovou předvolbu"
-
-#~ msgid "Default"
-#~ msgstr "Standardní"
-
-#~ msgid "Load default preset into equalizer"
-#~ msgstr "Načíst standardní předvolbu do ekvalizéru"
-
-#~ msgid "Zero"
-#~ msgstr "Vynulovat"
-
-#~ msgid "Set equalizer preset levels to zero"
-#~ msgstr "Vynulovat předvolby ekvalizéru"
-
-#~ msgid "From file"
-#~ msgstr "Ze souboru"
-
-#~ msgid "Load preset from file"
-#~ msgstr "Načíst předvolbu ze souboru"
-
-#~ msgid "From WinAMP EQF file"
-#~ msgstr "Ze souboru WinAMP EQF"
-
-#~ msgid "Load preset from WinAMP EQF file"
-#~ msgstr "Načíst předvolbu ze souboru WinAMP EQF"
-
-#~ msgid "WinAMP Presets"
-#~ msgstr "Předvolby WinAMPu"
-
-#~ msgid "Import WinAMP presets"
-#~ msgstr "Importovat předvolby WinAMPu"
-
-#~ msgid "Save preset"
-#~ msgstr "Uložit předvolbu"
-
-#~ msgid "Save auto-load preset"
-#~ msgstr "Uložit souborovou předvolbu"
-
-#~ msgid "Save default preset"
-#~ msgstr "Uložit standardní předvolbu"
-
-#~ msgid "To file"
-#~ msgstr "Do souboru"
-
-#~ msgid "Save preset to file"
-#~ msgstr "Uložit předvolbu do souboru"
-
-#~ msgid "To WinAMP EQF file"
-#~ msgstr "Do souboru WinAMP EQF"
-
-#~ msgid "Save preset to WinAMP EQF file"
-#~ msgstr "Uložit předvolbu do souboru WinAMP EQF"
-
-#~ msgid "Delete preset"
-#~ msgstr "Smazat předvolbu"
-
-#~ msgid "Delete auto-load preset"
-#~ msgstr "Smazat souborovou předvolbu"
-
-#~ msgid ""
-#~ "This is the amount of time to prebuffer audio "
-#~ "streams by, in milliseconds.\n"
-#~ "Increase this value if you are experiencing audio skipping.\n"
-#~ "Please note however, that high values will result in Audacious performing "
-#~ "poorly."
-#~ msgstr ""
-#~ "Určuje délku zvukového proudu v milisekundách, který "
-#~ "bude předpočítán do vyrovnávací paměti.\n"
-#~ "Pokud máte problémy s přeskakováním zvuku, zvyšte tuto hodnotu.\n"
-#~ "Prosím, vezměte na vědomí, že příliš vysoké hodnoty mohou vést ke "
-#~ "zhoršení výkonu Audacious."
-
-#~ msgid "Enable headless operation"
-#~ msgstr "Zapnout bezhlavý režim"
-
-#~ msgid ""
-#~ "<big>Unable to load skin.</big>\n"
-#~ "\n"
-#~ "Check that skin at '%s' is usable and default skin is properly installed "
-#~ "at '%s'\n"
-#~ msgstr ""
-#~ "<big>Vzhled nelze načíst.</big>\n"
-#~ "\n"
-#~ "Zkontrolujte, zda vzhled v „%s“ je použitelný a zda je standardní vzhled "
-#~ "správně nainstalován v „%s“.\n"
-
-#~ msgid "Headless operation enabled\n"
-#~ msgstr "Bezhlavý režim zapnut\n"
-
-#~ msgid "Audacious core developers:"
-#~ msgstr "Vývojáři jádra Audacious:"
-
-#~ msgid "Audacious Equalizer"
-#~ msgstr "Ekvalizér"
-
-#~ msgid "Play files"
-#~ msgstr "Přehrát soubory"
-
-#~ msgid "Load files"
-#~ msgstr "Načíst soubory"
-
-#~ msgid "%s - Audacious"
-#~ msgstr "%s – Audacious"
-
-#~ msgid "VBR"
-#~ msgstr "VBR"
-
-#~ msgid "mono"
-#~ msgstr "mono"
-
-#~ msgid "Audacious - visibility warning"
-#~ msgstr "Audacious – viditelnost varování"
-
-#~ msgid "Show main player window"
-#~ msgstr "Ukázat hlavní okno přehrávače:"
-
-#~ msgid "Ignore"
-#~ msgstr "Ignorovat"
-
-#~ msgid ""
-#~ "Audacious has been started with all of its windows hidden.\n"
-#~ "You may want to show the player window again to control Audacious; "
-#~ "otherwise, you'll have to control it remotely via audtool or enabled "
-#~ "plugins (such as the statusicon plugin)."
-#~ msgstr ""
-#~ "Audacious byl spuštěn se všemi okny skrytými.\n"
-#~ "Možná budete chtít kvůli ovládání okno přehrávače opět zobrazit. V "
-#~ "opačném případě budete muset přehrávač ovládat vzdáleně pomocí audtool "
-#~ "nebo pomocí zapnutého modulu (např. modulu statusicon [stavová ikona])."
-
-#~ msgid "Always ignore, show/hide is controlled remotely"
-#~ msgstr "Vždy ignorovat, ukázat/skrýt je ovládáno vzdáleně"
-
-#~ msgid ""
-#~ "<big>Broken GTK engine in use</big>\n"
-#~ "\n"
-#~ "Audacious has detected that you are using a broken GTK engine.\n"
-#~ "\n"
-#~ "The theme engine you are using, %s, is incompatible with some of "
-#~ "the features used by modern skins. The incompatible features have been "
-#~ "disabled for this session.\n"
-#~ "\n"
-#~ "To use these features, please consider using a different GTK theme engine."
-#~ msgstr ""
-#~ "<big>Používá se rozbité jádro GTK</big>\n"
-#~ "\n"
-#~ "Audacious zjistil, že používáte rozbité jádro GTK.\n"
-#~ "\n"
-#~ "Tématické jádro, které používáte, %s, není kompatibilní "
-#~ "s některými vlastnostmi moderních témat. V této relaci budou "
-#~ "nekompatibilní vlastnosti vypnuty.\n"
-#~ "\n"
-#~ "Chcete-li využít těchto vlastností, zvažte použití jiného tematického "
-#~ "jádra pro GTK."
-
-#~ msgid "Seek to: %d:%-2.2d/%d:%-2.2d (%d%%)"
-#~ msgstr "Přejít na: %d:%-2.2d/%d:%-2.2d (%d %%)"
-
-#~ msgid "Volume: %d%%"
-#~ msgstr "Hlasitost %d %%"
-
-#~ msgid "Balance: %d%% left"
-#~ msgstr "Vyvážení: %d %% vlevo"
-
-#~ msgid "Balance: center"
-#~ msgstr "Vyvážení: střed"
-
-#~ msgid "Balance: %d%% right"
-#~ msgstr "Vyvážení: %d %% vpravo"
-
-#~ msgid "Options Menu"
-#~ msgstr "Nabídka s nastavením"
-
-#~ msgid "Disable 'Always On Top'"
-#~ msgstr "Vypnout „Vždy na vrchu“"
-
-#~ msgid "Enable 'Always On Top'"
-#~ msgstr "Zapnout „Vždy na vrchu“"
-
-#~ msgid "File Info Box"
-#~ msgstr "Informace o souboru"
-
-#~ msgid "Disable 'GUI Scaling'"
-#~ msgstr "Zapnout „Škálování GUI“"
-
-#~ msgid "Enable 'GUI Scaling'"
-#~ msgstr "Vypnout „Škálování GUI“"
-
-#~ msgid "Visualization Menu"
-#~ msgstr "Nabídka s typem znázornění"
-
-#~ msgid ""
-#~ "<big>Couldn't open audio.</big>\n"
-#~ "\n"
-#~ "Please check that:\n"
-#~ "1. You have the correct output plugin selected.\n"
-#~ "2. No other programs is blocking the soundcard.\n"
-#~ "3. Your soundcard is configured properly.\n"
-#~ msgstr ""
-#~ "<big>Nelze přehrávat.</big>\n"
-#~ "\n"
-#~ "Zkontrolujte, zda:\n"
-#~ "1. máte vybrán správný výstupní modul,\n"
-#~ "2. žádný jiný program neblokuje zvukovou kartu,\n"
-#~ "3. vaše karta je správně nakonfigurována.\n"
-
-#~ msgid "Autoscroll Songname"
-#~ msgstr "Automatický posun názvu skladby"
-
-#~ msgid "Show Player"
-#~ msgstr "Zobrazit přehrávač"
-
-#~ msgid "Show Playlist Editor"
-#~ msgstr "Zobrazit editor seznamu skladeb"
-
-#~ msgid "Show Equalizer"
-#~ msgstr "Zobrazit ekvalizér"
-
-#~ msgid "Always on Top"
-#~ msgstr "Vždy na vrchu"
-
-#~ msgid "Put on All Workspaces"
-#~ msgstr "Zobrazovat na všech plochách"
-
-#~ msgid "Roll up Player"
-#~ msgstr "Sbalit přehrávač"
-
-#~ msgid "Roll up Playlist Editor"
-#~ msgstr "Sbalit editor seznamu skladeb"
-
-#~ msgid "Roll up Equalizer"
-#~ msgstr "Sbalit ekvalizér"
-
-#~ msgid "Scale"
-#~ msgstr "Škálovat"
-
-#~ msgid "DoubleSize"
-#~ msgstr "Dvojitá velikost"
-
-#~ msgid "Easy Move"
-#~ msgstr "Snadný pohyb"
-
-#~ msgid "Analyzer"
-#~ msgstr "Sloupce"
-
-#~ msgid "Scope"
-#~ msgstr "Vlnovka"
-
-#~ msgid "Voiceprint"
-#~ msgstr "Otisk"
-
-#~ msgid "Off"
-#~ msgstr "Žádný"
-
-#~ msgid "Normal"
-#~ msgstr "Normální"
-
-#~ msgid "Fire"
-#~ msgstr "Oheň"
-
-#~ msgid "Vertical Lines"
-#~ msgstr "Svislé čáry"
-
-#~ msgid "Lines"
-#~ msgstr "Čáry"
-
-#~ msgid "Bars"
-#~ msgstr "Obdélníky"
-
-#~ msgid "Dot Scope"
-#~ msgstr "Bodová vlnovka"
-
-#~ msgid "Line Scope"
-#~ msgstr "Čárová vlnovka"
-
-#~ msgid "Solid Scope"
-#~ msgstr "Plná vlnovka"
-
-#~ msgid "Ice"
-#~ msgstr "Led"
-
-#~ msgid "Smooth"
-#~ msgstr "Plynulý"
-
-#~ msgid "Full (~50 fps)"
-#~ msgstr "Plná (~50 Hz)"
-
-#~ msgid "Half (~25 fps)"
-#~ msgstr "Poloviční (~25 Hz)"
-
-#~ msgid "Quarter (~13 fps)"
-#~ msgstr "Čtvrtinová (~13 Hz)"
-
-#~ msgid "Eighth (~6 fps)"
-#~ msgstr "Osminová (~6 Hz)"
-
-#~ msgid "Slowest"
-#~ msgstr "Nejpomalejší"
-
-#~ msgid "Slow"
-#~ msgstr "Pomalé"
-
-#~ msgid "Medium"
-#~ msgstr "Střední"
-
-#~ msgid "Fast"
-#~ msgstr "Rychlé"
-
-#~ msgid "Fastest"
-#~ msgstr "Nejrychlejší"
-
-#~ msgid "Time Elapsed"
-#~ msgstr "Dosažený čas"
-
-#~ msgid "Time Remaining"
-#~ msgstr "Zbývající čas"
-
-#~ msgid "Plugin Services"
-#~ msgstr "Služby modulu"
-
-#~ msgid "Search entries in active playlist"
-#~ msgstr "Vyhledat skladby v současném seznamu skladeb"
-
-#~ 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."
-
-#~ msgid "Title: "
-#~ msgstr "Název: "
-
-#~ msgid "Album: "
-#~ msgstr "Album: "
-
-#~ msgid "Artist: "
-#~ msgstr "Umělec: "
-
-#~ msgid "Filename: "
-#~ msgstr "Jméno souboru: "
-
-#~ msgid "Clear previous selection before searching"
-#~ msgstr "Před hledáním vymazat předchozí výběr"
-
-#~ msgid "Automatically toggle queue for matching entries"
-#~ msgstr "Shodující se položky automaticky zařadit/vyřadit z fronty"
-
-#~ msgid "Create a new playlist with matching entries"
-#~ msgstr "Ze shodujících se položek vytvořit nový seznam skladeb"
-
-#~ msgid "Audacious Playlist Editor"
-#~ msgstr "Zobrazit editor seznamu skladeb"
-
-#~ msgid "Appearance"
-#~ msgstr "Vzhled"
-
-#~ msgid "_Fonts"
-#~ msgstr "_Fonty"
-
-#~ msgid "_Player:"
-#~ msgstr "V okně _přehrávače:"
-
-#~ msgid "Select main player window font:"
-#~ msgstr "Vyberte font pro hlavní okno přehrávače:"
-
-#~ msgid "_Playlist:"
-#~ msgstr "V seznamu sklade_b:"
-
-#~ msgid "Select playlist font:"
-#~ msgstr "Vyberte font pro seznam skladeb:"
-
-#~ msgid "Use Bitmap fonts if available"
-#~ msgstr "Pokud možno, používat bitmapové fonty"
-
-#~ msgid ""
-#~ "Use bitmap fonts if they are available. Bitmap fonts do not support "
-#~ "Unicode strings."
-#~ msgstr ""
-#~ "Pokud to bude možné, použijí se bitmapové fonty. Bitmapové fonty "
-#~ "nepodporují unicodové řetězce."
-
-#~ msgid "_Miscellaneous"
-#~ msgstr "_Různé"
-
-#~ msgid "Show track numbers in playlist"
-#~ msgstr "Zobrazovat pořadová čísla v seznamu skladeb"
-
-#~ msgid "Show separators in playlist"
-#~ msgstr "Zobrazovat oddělovače v seznamu skladeb"
-
-#~ msgid "Show window manager decoration"
-#~ msgstr "Zobrazovat dekoraci podle správce oken"
-
-#~ msgid "This enables the window manager to show decorations for windows."
-#~ msgstr ""
-#~ "Tímto necháte rozhodnutí na správci oken, kdy má zobrazovat dekorace oken."
-
-#~ msgid "Use XMMS-style file selector instead of the default selector"
-#~ msgstr "Používat dialog výběru souboru jako v XMMS namísto implicitního"
-
-#~ msgid ""
-#~ "This enables the XMMS/GTK1-style file selection dialogs. This selector is "
-#~ "provided by Audacious itself and is faster than the default GTK2 selector "
-#~ "(but sadly not as user-friendly)."
-#~ msgstr ""
-#~ "Tato volba zapne dialog výběru souboru ve stylu XMMS/GTK1. Tento dialog "
-#~ "je poskytován samotným Audacious a je rychlejší než implicitní dialog "
-#~ "GTK2 (avšak ne tak pohodlný)."
-
-#~ msgid "Use two-way text scroller"
-#~ msgstr "Pohybovat textem v obou směrech"
-
-#~ msgid ""
-#~ "If selected, the file information text in the main window will scroll "
-#~ "back and forth. If not selected, the text will only scroll in one "
-#~ "direction."
-#~ msgstr ""
-#~ "Bude-li vybráno, text s informacemi o souboru v hlavním okně bude běhat "
-#~ "tam a zpět. Nebude-li vybráno, text se bude pohybovat jen jedním směrem."
-
-#~ msgid "Disable inline gtk theme"
-#~ msgstr "Zakázat vnitřní téma GTK"
-
-#~ msgid "Allow loading incomplete skins"
-#~ msgstr "Povolit načítání neúplných vzhledů"
-
-#~ msgid ""
-#~ "If selected, audacious won't refuse loading broken skins. Use only if "
-#~ "your favourite skin doesn't work"
-#~ msgstr ""
-#~ "Je-li vybráno, Audacious neodmítne nahrát rozbitý vzhled. Použijte, jen "
-#~ "když váš oblíbený vzhled nefunguje."
-
-#~ msgid "On load"
-#~ msgstr "Při nahrání"
-
-#~ msgid "Load metadata when adding the file to the playlist or opening it"
-#~ msgstr ""
-#~ "Načíst metadata při vložení souboru do seznamu skladeb nebo při otevření"
-
-#~ msgid "On display"
-#~ msgstr "Při zobrazení"
-
-#~ msgid ""
-#~ "Load metadata on demand when displaying the file in the playlist. You may "
-#~ "need to set \"Detect file formats on demand\" in Audio page for full "
-#~ "benefit."
-#~ msgstr ""
-#~ "Načíst metadata na vyžádání při zobrazení souboru v seznamu skladeb. "
-#~ "Plného účinku dosáhnete, když v záložce „Zvuk“ zapnete „Rozpoznávat "
-#~ "formát souboru na požádání“."
-
-#~ msgid "Color Adjustment"
-#~ msgstr "Přizpůsobení barvy"
-
-#~ msgid ""
-#~ "Audacious allows you to alter the color balance of the skinned UI. The "
-#~ "sliders below will allow you to do this."
-#~ msgstr ""
-#~ "Audacious umožňuje změnit zabarvení vzhledu uživatelského rozhraní pomocí "
-#~ "následujících jezdců."
-
-#~ msgid "Blue"
-#~ msgstr "Modrá"
-
-#~ msgid "Green"
-#~ msgstr "Zelená"
-
-#~ msgid "Red"
-#~ msgstr "Červená"
-
-#~ msgid "_Skin"
-#~ msgstr "_Skin"
-
-#~ msgid "Refresh skin list"
-#~ msgstr "Obnovit seznam vzhledů"
-
-#~ msgid "PREAMP"
-#~ msgstr "PREAMP"
-
-#~ msgid "60HZ"
-#~ msgstr "60 Hz"
-
-#~ msgid "170HZ"
-#~ msgstr "170 Hz"
-
-#~ msgid "310HZ"
-#~ msgstr "310 Hz"
-
-#~ msgid "600HZ"
-#~ msgstr "600 Hz"
-
-#~ msgid "1KHZ"
-#~ msgstr "1 kHz"
-
-#~ msgid "3KHZ"
-#~ msgstr "3 kHz"
-
-#~ msgid "6KHZ"
-#~ msgstr "6 kHz"
-
-#~ msgid "12KHZ"
-#~ msgstr "12 kHz"
-
-#~ msgid "14KHZ"
-#~ msgstr "14 kHz"
-
-#~ msgid "16KHZ"
-#~ msgstr "16 kHz"
-
-#~ msgid "Archived Winamp 2.x skin"
-#~ msgstr "Zabalený vzhled Winapmu 2.x"
-
-#~ msgid "Unarchived Winamp 2.x skin"
-#~ msgstr "Nezabalený vzhled Winampu 2.x"
-
-#~ msgid "Show version and builtin features"
-#~ msgstr "Zobrazit verzi a vestavěné funkce"
-
-#~ msgid "Use custom cursors"
-#~ msgstr "Použít vlastní kurzory"
-
-#~ msgid "Reload Plugins"
-#~ msgstr "Znovu načíst moduly"
-
-#~ msgid ""
-#~ "Sorry, threads isn't supported on your platform.\n"
-#~ "\n"
-#~ "If you're on a libc5 based linux system and installed Glib & GTK+ before "
-#~ "you\n"
-#~ "installed LinuxThreads you need to recompile Glib & GTK+.\n"
-#~ msgstr ""
-#~ "Bohužel, váš systém nepodporuje vlákna.\n"
-#~ "\n"
-#~ "Pokud máte linux založený na libc5 a knihovny Glib a GTK+ byly "
-#~ "nainstalovány dříve\n"
-#~ "než LinuxThreads, budete muset Glib a GTK+ přeložit znovu.\n"
-
-#~ msgid "Error in Audacious."
-#~ msgstr "Chyba v Audacious"
-
-#~ msgid "Enable 6 dB hard limiter"
-#~ msgstr "Zapnout 6dB tvrdé omezení"
-
-#~ msgid "Select which Audacious session ID to use"
-#~ msgstr "Výběr identifikátoru relace Audacious"
-
-#~ msgid "Disable 'Doublesize'"
-#~ msgstr "Vypnout „Dvojitou velikost“"
-
-#~ msgid "Enable 'Doublesize'"
-#~ msgstr "Zapnout „Dvojitou velikost“"
-
-#~ msgid ""
-#~ "<big>Unable to create %s.</big>\n"
-#~ "\n"
-#~ "Could not open glade file (%s). Please check your installation.\n"
-#~ msgstr ""
-#~ "<big>Nelze vytvořit %s.</big>\n"
-#~ "\n"
-#~ "Nepodařilo se otevřít soubor %s. Zkontrolujte prosím sovou instalaci.\n"
-
-#~ msgid ""
-#~ "TITLE\n"
-#~ "ARTIST - TITLE\n"
-#~ "ARTIST - ALBUM - TITLE\n"
-#~ "ARTIST - ALBUM - TRACK. TITLE\n"
-#~ "ARTIST [ ALBUM ] - TRACK. TITLE\n"
-#~ "ALBUM - TITLE\n"
-#~ "Custom"
-#~ msgstr ""
-#~ "NÁZEV\n"
-#~ "UMĚLEC – NÁZEV\n"
-#~ "UMĚLEC – ALBUM – NÁZEV\n"
-#~ "UMĚLEC – ALBUM – STOPA. NÁZEV\n"
-#~ "UMĚLEC – [ ALBUM ] – STOPA. NÁZEV\n"
-#~ "ALBUM – NÁZEV\n"
-#~ "Vlastní"
-
-#~ msgid "Presets"
-#~ msgstr "Předvolby"
-
-#~ msgid "File preset extension:"
-#~ msgstr "Přípony souborů s předvolbami:"
-
-#~ msgid "Directory preset file:"
-#~ msgstr "Adresář s předvolbami:"
-
-#~ msgid ""
-#~ "Best Sinc Interpolation\n"
-#~ "Medium Sinc Interpolation\n"
-#~ "Fastest Sinc Interpolation\n"
-#~ "ZOH Interpolation\n"
-#~ "Linear Interpolation"
-#~ msgstr ""
-#~ "Nejlepší sinová interpolace\n"
-#~ "Střední sinová interpolace\n"
-#~ "Nejrychlejší sinová interpolace\n"
-#~ "ZOH interpolace\n"
-#~ "Lineární interpolace"
-
-#~ msgid "Track Information Window"
-#~ msgstr "Okno s podrobnosti o stopě"
-
-#~ msgid "Close"
-#~ msgstr "Zavřít"
-
-#~ msgid "localhost"
-#~ msgstr "localhost"
-
-#~ msgid "Preferences Window"
-#~ msgstr "Okno nastavení"
-
-#~ msgid ""
-#~ "<big>Unable to play files.</big>\n"
-#~ "\n"
-#~ "The following files could not be played. Please check that:\n"
-#~ "1. they are accessible.\n"
-#~ "2. you have enabled the media plugins required."
-#~ msgstr ""
-#~ "<big>Soubory nelze přehrát</big>\n"
-#~ "\n"
-#~ "Následující soubory nelze přehrát. Zkontrolujte zda:\n"
-#~ "1. jsou přístupné,\n"
-#~ "2. máte povolené příslušné moduly."
-
-#~ msgid "Show more _details"
-#~ msgstr "Ukaž podrobné _informace"
-
-#~ msgid ""
-#~ "Sorry, your GTK+ version (%d.%d.%d) does not work with Audacious.\n"
-#~ "Please use GTK+ %s or newer.\n"
-#~ msgstr ""
-#~ "Verze knihovny GTK+ (%d.%d.%d) není kompatibilní s Audacious.\n"
-#~ "Použijte GTK+ %s nebo novější.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Received SIGSEGV\n"
-#~ "\n"
-#~ "This could be a bug in Audacious. If you don't know why this happened, "
-#~ "file a bug at http://bugs-meta.atheme.org/\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Zachycen SIGSEGV\n"
-#~ "\n"
-#~ "Asi jste narazili na chybu v programu Audacious. Pokud netušíte proč, "
-#~ "nahlaste chybu (anglicky) na http://bugs-meta.atheme.org/\n"
-#~ "\n"
-
-#~ msgid "VOLUME: %d%%"
-#~ msgstr "Hlasitost: %d%%"
-
-#~ msgid "BALANCE: %d%% LEFT"
-#~ msgstr "VYROVNÁNÍ: %d%% VLEVO"
-
-#~ msgid "BALANCE: CENTER"
-#~ msgstr "VYROVNÁNÍ: NA STŘED"
-
-#~ msgid "BALANCE: %d%% RIGHT"
-#~ msgstr "VYROVNÁNÍ: %d%% VPRAVO"
-
-#~ msgid "OPTIONS MENU"
-#~ msgstr "NASTAVENÍ"
-
-#~ msgid "DISABLE ALWAYS ON TOP"
-#~ msgstr "ZAKÁZAT FCI „VŽDY NA VRCHU“"
-
-#~ msgid "ENABLE ALWAYS ON TOP"
-#~ msgstr "POVOLIT FCI „VŽDY NA VRCHU“"
-
-#~ msgid "FILE INFO BOX"
-#~ msgstr "INFORMACE O SOUBORU"
-
-#~ msgid "DISABLE DOUBLESIZE"
-#~ msgstr "ZAKÁZAT DVOJITOU VELIKOST"
-
-#~ msgid "ENABLE DOUBLESIZE"
-#~ msgstr "POVOLIT DVOJITOU VELIKOST"
-
-#~ msgid "VISUALIZATION MENU"
-#~ msgstr "NASTAVENÍ ZOBRAZENÍ"
-
-#~ msgid ""
-#~ "<big>No playable CD found.</big>\n"
-#~ "\n"
-#~ "No CD inserted, or inserted CD is not an audio CD.\n"
-#~ msgstr ""
-#~ "<big>Nebylo nalezeno přehratelné CD.</big>\n"
-#~ "\n"
-#~ "Není vloženo CD, nebo vložené CD není typu Audio CD.\n"
-
-#~ msgid "Play CD"
-#~ msgstr "Přehrát CD"
-
-#~ msgid "Add CD..."
-#~ msgstr "Přidat CD…"
-
-#~ msgid "Adds a CD to the playlist."
-#~ msgstr "Přidá CD do seznamu skladeb"
-
-#~ msgid "Track name: "
-#~ msgstr "Název skladby: "
-
-#~ msgid "Performer/Artist"
-#~ msgstr "Interpret/umělec"
-
-#~ msgid "File name"
-#~ msgstr "Jméno souboru"
-
-#~ msgid "File path"
-#~ msgstr "Cesta k souboru"
-
-#~ msgid "File extension"
-#~ msgstr "Přípona souboru"
-
-#~ msgid "Track name"
-#~ msgstr "Název stopy"
-
-#~ msgid "Track number"
-#~ msgstr "Číslo stopy"
-
-#~ msgid "%{n:...%}: Display \"...\" only if element %n is present"
-#~ msgstr "%{n:…%}: Zobraz „…“ pouze pokud %n nechybí"
-
-#~ msgid "/Load"
-#~ msgstr "/Načíst"
-
-#~ msgid "/Load/Preset"
-#~ msgstr "/Načíst/Uloženou předvolbu"
-
-#~ msgid "/Load/Default"
-#~ msgstr "/Načíst/Standardní předvolbu"
-
-#~ msgid "/Load/Zero"
-#~ msgstr "/Načíst/Vynulovat"
-
-#~ msgid "/Save"
-#~ msgstr "/Uložit"
-
-#~ msgid "/Save/Preset"
-#~ msgstr "/Uložit/Předvolbu"
-
-#~ msgid "/Save/Default"
-#~ msgstr "/Uložit/Jako standardní"
-
-#~ msgid "/Save/To file"
-#~ msgstr "/Uložit/Do souboru"
-
-#~ msgid "/Delete"
-#~ msgstr "/Smazat"
-
-#~ msgid "/Delete/Preset"
-#~ msgstr "/Smazat/Předvolbu"
-
-#~ msgid "Load auto-preset"
-#~ msgstr "Načíst souborovou předvolbu"
-
-#~ msgid "Load equalizer preset"
-#~ msgstr "Načíst nastavení ekvalizéru"
-
-#~ msgid "Delete auto-preset"
-#~ msgstr "Smazat souborovou předvolbu"
-
-#~ msgid "%s: option `%s' is ambiguous\n"
-#~ msgstr "%s: volba `%s' je nejasná\n"
-
-#~ msgid "%s: option `--%s' doesn't allow an argument\n"
-#~ msgstr "%s: volba `--%s' nemá parametr\n"
-
-#~ msgid "%s: option `%c%s' doesn't allow an argument\n"
-#~ msgstr "%s: volba `%c%s' nemá parametr\n"
-
-#~ msgid "%s: option `%s' requires an argument\n"
-#~ msgstr "%s: volba `%s' vyžaduje parametr\n"
-
-#~ msgid "%s: unrecognized option `%c%s'\n"
-#~ msgstr "%s: neznámá volba `%c%s'\n"
-
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: nepřípustný parametr -- %c\n"
-
-#~ msgid "%s: invalid option -- %c\n"
-#~ msgstr "%s: neplatný parametr -- %c\n"
-
-#~ msgid "%s: option requires an argument -- %c\n"
-#~ msgstr "%s: volba vyžaduje parametr -- %c\n"
-
-#~ msgid "%s: option `-W %s' is ambiguous\n"
-#~ msgstr "%s: volba `-W %s' je nejasná\n"
-
-#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
-#~ msgstr "%s: volba `-W %s' nemá parametr\n"
-
-#~ msgid ""
-#~ "Usage: audacious [options] [files] ...\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "--------\n"
-#~ msgstr ""
-#~ "Použití: audacious [volby] [soubor]…\n"
-#~ "\n"
-#~ "Volby:\n"
-#~ "------\n"
-
-#~ msgid "Display this text and exit"
-#~ msgstr "Zobrazí tento text a skončí"
-
-#~ msgid "Activate Audacious"
-#~ msgstr "Aktivovat Audacious"
-
-#~ msgid "Previous session ID"
-#~ msgstr "ID předchozího sezení"
-
-#~ msgid "Disable error/warning interception (logging)"
-#~ msgstr "Nezachytávat chyby/varování (protokolování)"
-
-#~ msgid "Print version number and exit\n"
-#~ msgstr "Zobrazí číslo verze a skončí\n"
-
-#~ msgid "/Visualization Mode/Analyzer"
-#~ msgstr "/Typ zobrazení/Sloupce"
-
-#~ msgid "/Visualization Mode/Scope"
-#~ msgstr "/Typ zobrazení/Vlnovka"
-
-#~ msgid "/Visualization Mode/Off"
-#~ msgstr "/Typ zobrazení/Vypnout"
-
-#~ msgid "/Analyzer Mode/Normal"
-#~ msgstr "/Sloupce/Normální"
-
-#~ msgid "/Analyzer Mode/Fire"
-#~ msgstr "/Sloupce/Oheň"
-
-#~ msgid "/Analyzer Mode/Lines"
-#~ msgstr "/Sloupce/Tenké"
-
-#~ msgid "/Analyzer Mode/Bars"
-#~ msgstr "/Sloupce/Silné"
-
-#~ msgid "/Analyzer Mode/Peaks"
-#~ msgstr "/Sloupce/Vrcholky"
-
-#~ msgid "/WindowShade VU Mode/Normal"
-#~ msgstr "/Minimalizovaný režim/Normální"
-
-#~ msgid "/WindowShade VU Mode/Smooth"
-#~ msgstr "/Minimalizovaný režim/Jemný"
-
-#~ msgid "/Analyzer Falloff/Slowest"
-#~ msgstr "/Klesání sloupců/Nejpomalejší"
-
-#~ msgid "/Analyzer Falloff/Slow"
-#~ msgstr "/Klesání sloupců/Pomalé"
-
-#~ msgid "/Analyzer Falloff/Medium"
-#~ msgstr "/Klesání sloupců/Střední"
-
-#~ msgid "/Analyzer Falloff/Fast"
-#~ msgstr "/Klesání sloupců/Rychlé"
-
-#~ msgid "/Analyzer Falloff/Fastest"
-#~ msgstr "/Klesání sloupců/Nejrychlejší"
-
-#~ msgid "/Peaks Falloff/Slowest"
-#~ msgstr "/Klesání vrcholků/Nejpomalejší"
-
-#~ msgid "/Peaks Falloff/Slow"
-#~ msgstr "/Klesání vrcholků/Pomalé"
-
-#~ msgid "/Peaks Falloff/Medium"
-#~ msgstr "/Klesání vrcholků/Střední"
-
-#~ msgid "/Peaks Falloff/Fast"
-#~ msgstr "/Klesání vrcholků/Rychlé"
-
-#~ msgid "/Peaks Falloff/Fastest"
-#~ msgstr "/Klesání vrcholků/Nejrychlejší"
-
-#~ msgid "/Pause"
-#~ msgstr "/Pozastavit"
-
-#~ msgid "/-"
-#~ msgstr "/-"
-
-#~ msgid "/Jump to Time"
-#~ msgstr "/Přejít na čas"
-
-#~ msgid "/About Audacious"
-#~ msgstr "/O Audacious"
-
-#~ msgid "/Files..."
-#~ msgstr "/Soubory..."
-
-#~ msgid "/Internet location..."
-#~ msgstr "/Internetová adresa..."
-
-#~ msgid "Track Information Popup"
-#~ msgstr "Vyskakovací okno s informacemi o stopě"
-
-#~ msgid "/Show Popup Info"
-#~ msgstr "/Zobrazovat podrobnosti ve vyskakovacím okně"
-
-#~ msgid "/Remove Duplicates/By Title"
-#~ msgstr "/Odebrat duplikáty/Podle názvu"
-
-#~ msgid "/Remove Duplicates/By Filename"
-#~ msgstr "/Odebrat duplikáty/Podle jména souboru"
-
-#~ msgid "/New List"
-#~ msgstr "/Nový seznam"
-
-#~ msgid "/Update View"
-#~ msgstr "/Obnovit seznam"
-
-#~ msgid "/Select All"
-#~ msgstr "/Vybrat vše"
-
-#~ msgid "/Sort List/By Date"
-#~ msgstr "/Řadit/Podle data"
-
-#~ msgid "/Sort Selection/By Title"
-#~ msgstr "/Setřídit vybrané/Podle názvu"
-
-#~ msgid "/Sort Selection/By Artist"
-#~ msgstr "/Setřídit vybrané/Podle umělce"
-
-#~ msgid "/Sort Selection/By Filename"
-#~ msgstr "/Setřídit vybrané/Podle jména souboru"
-
-#~ msgid "/Sort Selection/By Path + Filename"
-#~ msgstr "/Setřídit vybrané/Podle cesty a jména souboru"
-
-#~ msgid "/Sort Selection/By Date"
-#~ msgstr "/Setřídit vybrané/Podle času"
-
-#~ msgid "/Sort Selection/By Track Number"
-#~ msgstr "/Setřídit vybrané/Podle čísla stopy"
-
-#~ msgid "/Sort Selection/By Playlist Entry"
-#~ msgstr "/Setřídit vybrané/Podle položky seznamu"
-
-#~ msgid "Close Dialog on Add"
-#~ msgstr "Zavřít dialog při přidání"
-
-#~ msgid "Deselect All"
-#~ msgstr "Odebrat vše"
-
-#~ msgid "Artist Popup"
-#~ msgstr "Vyskakovací okno o umělci"
-
-#~ msgid "Title"
-#~ msgstr "Název"
-
-#~ msgid "Artist"
-#~ msgstr "Umělec"
-
-#~ msgid "Album"
-#~ msgstr "Album"
-
-#~ msgid "Genre"
-#~ msgstr "Žánr"
-
-#~ msgid "Year"
-#~ msgstr "Rok"
-
-#~ msgid "Track Number"
-#~ msgstr "Číslo stopy"
-
-#~ msgid "Track Length"
-#~ msgstr "Délka stopy"
-
-#~ msgid "_Miscillaneous UI Features"
-#~ msgstr "_Rozličné vlastnosti uživatelského rozhraní"
-
-#~ msgid ""
-#~ "Enables playlist transparency. This is not recommended for slower "
-#~ "machines as it requires some CPU time to create and cache the pixmaps "
-#~ "used for the transparency."
-#~ msgstr ""
-#~ "Zapne průhlednost seznamu skladeb. Nedoporučuje se na pomalých "
-#~ "počítačích, protože vyžaduje jisté množství procesorového času na "
-#~ "vytvoření a udržování pixmap použitých pro průhlednost."
-
-#~ msgid "Enable playlist transparency"
-#~ msgstr "Povolit průhlednost seznamu skladeb"
-
-#~ msgid "This enables the window mangaer to show decorations for windows."
-#~ msgstr ""
-#~ "Tímto necháte rozhodní na správci oken, kdy má zobrazovat dekorace oken."
-
-#~ msgid "label65"
-#~ msgstr "jmenovka65"
-
-#~ msgid "label76"
-#~ msgstr "jmenovka76"
-
-#~ msgid "Ok"
-#~ msgstr "OK"
-
-#~ msgid "Cancel"
-#~ msgstr "Zrušit"
-
-#~ msgid "Apply"
-#~ msgstr "Použít"
-
-#~ msgid "Username:"
-#~ msgstr "Přístupové jméno:"
-
-#~ msgid "Password:"
-#~ msgstr "Heslo:"
-
-#~ msgid "Commands"
-#~ msgstr "Příkazy"
-
-#~ msgid "Command:"
-#~ msgstr "Příkaz:"
-
-#~ msgid ""
-#~ "You can use the following format strings which\n"
-#~ "will be substituted before calling the command\n"
-#~ "(not all are useful for the end-of-playlist command).\n"
-#~ "\n"
-#~ "%%F: Frequency (in hertz)\n"
-#~ "%%c: Number of channels\n"
-#~ "%%f: filename (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)"
-#~ msgstr ""
-#~ "Můžete používat následující formátovací řetězce, které budou před "
-#~ "spuštěním příkazu nahrazeny (ne všechny jsou užitečné pro příkaz "
-#~ "spouštěný na konci seznamu skladeb).\n"
-#~ "\n"
-#~ "%%F: Frekvence (v hertzích)\n"
-#~ "%%c: Počet kanálů\n"
-#~ "%%f: jméno souboru (celá cesta)\n"
-#~ "%%l: délka (v milisekundách)\n"
-#~ "%%n nebo %%s: Název skladby\n"
-#~ "%%r: Datový tok (v bitech za sekundu)\n"
-#~ "%%t: Pozice v seznamu skladeb (%%02d)\n"
-#~ "%%p: Právě se hraje (1 nebo 0)"
-
-#~ msgid "Name:"
-#~ msgstr "Jméno:"
-
-#~ msgid "CD Audio Plugin"
-#~ msgstr "CD Audio modul"
-
-#~ msgid "CD Audio Track %02u"
-#~ msgstr "CD audio stopa %02u"
-
-#~ msgid "(unknown)"
-#~ msgstr "(není známo)"
-
-#~ msgid "Drive %d"
-#~ msgstr "Mechanika %d"
-
-#~ msgid ""
-#~ "Failed to open device %s\n"
-#~ "Error: %s\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Nepodařilo se otevřít %s\n"
-#~ "Chyba: %s\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Failed to read \"Table of Contents\"\n"
-#~ "Maybe no disc in the drive?\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Nepodařilo se načíst obsah disku.\n"
-#~ "Je disk opravdu v mechanice?\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Device %s OK.\n"
-#~ "Disc has %d tracks"
-#~ msgstr ""
-#~ "Zařízení %s je v pořádku.\n"
-#~ "Disk obsahuje %d stop."
-
-#~ msgid " (%d data tracks)"
-#~ msgstr "(%d datových stop)"
-
-#~ msgid ""
-#~ "\n"
-#~ "Total length: %d:%d\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Celková délka: %d:%d\n"
-
-#~ msgid ""
-#~ "Digital audio extraction not tested as the disc has no audio tracks\n"
-#~ msgstr "Čtení zvuku netestováno - tento disk neobsahuje zvukové stopy.\n"
-
-#~ msgid ""
-#~ "Digital audio extraction test: OK\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Test čtení zvuku: v pořádku.\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Digital audio extraction test failed: %s\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Test čtení zvuku selhal: %s\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Failed to check directory %s\n"
-#~ "Error: %s"
-#~ msgstr ""
-#~ "Nepodařilo se načíst adresář %s.\n"
-#~ "Chyba: %s"
-
-#~ msgid "Error: %s exist, but is not a directory"
-#~ msgstr "Chyba: %s existuje, ale není adresářem."
-
-#~ msgid "Directory %s OK."
-#~ msgstr "Adresář %s je v pořádku."
-
-#~ msgid "Device:"
-#~ msgstr "Zařízení:"
-
-#~ msgid "_Device:"
-#~ msgstr "_Zařízení:"
-
-#~ msgid "Dir_ectory:"
-#~ msgstr "_Adresář:"
-
-#~ msgid "Play mode:"
-#~ msgstr "Způsob přehrávání:"
-
-#~ msgid "Analog"
-#~ msgstr "Analogově"
-
-#~ msgid "Digital audio extraction"
-#~ msgstr "Digitálně"
-
-#~ msgid "No mixer"
-#~ msgstr "Nepoužívat žádný mixér"
-
-#~ msgid "CDROM drive"
-#~ msgstr "CDROM mechanika"
-
-#~ msgid "OSS mixer"
-#~ msgstr "OSS mixér"
-
-#~ msgid "Check drive..."
-#~ msgstr "Zkontrolovat mechaniku..."
-
-#~ msgid "Remove drive"
-#~ msgstr "Odstranit mechaniku"
-
-#~ msgid "CD Audio Player Configuration"
-#~ msgstr "Nastavení přehrávače CD Audio"
-
-#~ msgid "Add drive"
-#~ msgstr "Přidat mechaniku"
-
-#~ msgid "Device"
-#~ msgstr "Zařízení"
-
-#~ msgid "CDDB:"
-#~ msgstr "CDDB:"
-
-#~ msgid "Use CDDB"
-#~ msgstr "Používat CDDB"
-
-#~ msgid "Get server list"
-#~ msgstr "Získat seznam serverů"
-
-#~ msgid "Show network window"
-#~ msgstr "Výpis síťového provozu"
-
-#~ msgid "CDDB server:"
-#~ msgstr "CDDB server:"
-
-#~ msgid "CD Index:"
-#~ msgstr "CD Index:"
-
-#~ msgid "Use CD Index"
-#~ msgstr "Použít server s databází CD"
-
-#~ msgid "CD Index server:"
-#~ msgstr "Server s databází CD:"
-
-#~ msgid "Override generic titles"
-#~ msgstr "Přepsat původní názvy"
-
-#~ msgid "Name format:"
-#~ msgstr "Formát názvu:"
-
-#~ msgid "CD Info"
-#~ msgstr "Informace o CD"
-
-#~ msgid ""
-#~ "Console music decoder engine based on Game_Music_Emu 0.3.0.\n"
-#~ "Audacious implementation by: William Pitcock <nenolod@nenolod.net>, \n"
-#~ " Shay Green <hotpop.com@blargg>"
-#~ msgstr ""
-#~ "Dekodér konzolové hudby založený na Game_Music_Emu 0.3.0.\n"
-#~ "Implementace v Audacious: William Pitcock <nenold@nenold.net>,\n"
-#~ " Shay Green <hotpop.com@blargg>"
-
-#~ msgid "SPC, VGM, NSF/NSFE, GBS, and GYM module decoder"
-#~ msgstr "Dekodér SPC, VGM, NSF/NSFE, GBS a modulů GYM"
-
-#~ msgid "Arabic (IBM-864)"
-#~ msgstr "arabštiny (IBM-864)"
-
-#~ msgid "Arabic (ISO-8859-6)"
-#~ msgstr "arabštiny (ISO-8859-6)"
-
-#~ msgid "Arabic (Windows-1256)"
-#~ msgstr "arabštiny (Windows-1256)"
-
-#~ msgid "Baltic (ISO-8859-13)"
-#~ msgstr "pobaltských jazyků (ISO-8859-13)"
-
-#~ msgid "Baltic (ISO-8859-4)"
-#~ msgstr "pobaltských jazyků (ISO-8859-4)"
-
-#~ msgid "Baltic (Windows-1257)"
-#~ msgstr "pobaltských jazyků (Windows-1257)"
-
-#~ msgid "Celtic (ISO-8859-14)"
-#~ msgstr "keltských jazyků (ISO-8859-14)"
-
-#~ msgid "Central European (IBM-852)"
-#~ msgstr "středoevropských jazyků (IBM-852)"
-
-#~ msgid "Central European (ISO-8859-2)"
-#~ msgstr "pobaltských jazyků (ISO-8859-2)"
-
-#~ msgid "Central European (Windows-1250)"
-#~ msgstr "pobaltských jazyků (Windows-1250)"
-
-#~ msgid "Chinese Simplified (GB18030)"
-#~ msgstr "zjednodušené čínštiny (GB18030)"
-
-#~ msgid "Chinese Simplified (GB2312)"
-#~ msgstr "zjednodušené čínštiny (GB2312)"
-
-#~ msgid "Chinese Traditional (Big5)"
-#~ msgstr "tradiční čínštiny (Big5)"
-
-#~ msgid "Chinese Traditional (Big5-HKSCS)"
-#~ msgstr "tradiční čínštiny (Big5-HKSCS)"
-
-#~ msgid "Cyrillic (IBM-855)"
-#~ msgstr "cyrilice (IBM-855)"
-
-#~ msgid "Cyrillic (ISO-8859-5)"
-#~ msgstr "cyrilice (ISO-8859-2)"
-
-#~ msgid "Cyrillic (ISO-IR-111)"
-#~ msgstr "cyrilice (ISO-IR-111)"
-
-#~ msgid "Cyrillic (KOI8-R)"
-#~ msgstr "cyrilice (KOI8-R)"
-
-#~ msgid "Cyrillic (Windows-1251)"
-#~ msgstr "cyrilice (Windows-1251)"
-
-#~ msgid "Cyrillic/Russian (CP-866)"
-#~ msgstr "ruské cyrilice (CP-866)"
-
-#~ msgid "Cyrillic/Ukrainian (KOI8-U)"
-#~ msgstr "ukrajinské cyrilice (KOI8-U)"
-
-#~ msgid "English (US-ASCII)"
-#~ msgstr "angličtiny (US-ASCII)"
-
-#~ msgid "Greek (ISO-8859-7)"
-#~ msgstr "řečtiny (ISO-8859-7)"
-
-#~ msgid "Greek (Windows-1253)"
-#~ msgstr "řečtiny (Windows-1253)"
-
-#~ msgid "Hebrew (IBM-862)"
-#~ msgstr "hebrejštiny (IBM-862)"
-
-#~ msgid "Hebrew (Windows-1255)"
-#~ msgstr "hebrejštiny (Windows-1255)"
-
-#~ msgid "Japanese (EUC-JP)"
-#~ msgstr "japonštiny (EUC-JP)"
-
-#~ msgid "Japanese (ISO-2022-JP)"
-#~ msgstr "japonštiny (ISO-2022-JP)"
-
-#~ msgid "Japanese (Shift_JIS)"
-#~ msgstr "japonštiny (Shif_JIS)"
-
-#~ msgid "Korean (EUC-KR)"
-#~ msgstr "korejštiny (EUC-KR)"
-
-#~ msgid "Nordic (ISO-8859-10)"
-#~ msgstr "severských jazyků (ISO-8859-10)"
-
-#~ msgid "South European (ISO-8859-3)"
-#~ msgstr "jihoevropských jazyků (ISO-8859-3)"
-
-#~ msgid "Thai (TIS-620)"
-#~ msgstr "thajštiny (TIS-620)"
-
-#~ msgid "Turkish (IBM-857)"
-#~ msgstr "turečtiny (IBM-857)"
-
-#~ msgid "Turkish (ISO-8859-9)"
-#~ msgstr "turečtiny (ISO-8859-9)"
-
-#~ msgid "Turkish (Windows-1254)"
-#~ msgstr "turečtiny (Windows-1254)"
-
-#~ msgid "Unicode (UTF-7)"
-#~ msgstr "unicode (UTF-7)"
-
-#~ msgid "Unicode (UTF-8)"
-#~ msgstr "unicode (UTF-8)"
-
-#~ msgid "Unicode (UTF-16BE)"
-#~ msgstr "unicode (UTF-16BE)"
-
-#~ msgid "Unicode (UTF-16LE)"
-#~ msgstr "unicode (UTF-16LE)"
-
-#~ msgid "Unicode (UTF-32BE)"
-#~ msgstr "unicode (UTF-32BE)"
-
-#~ msgid "Unicode (UTF-32LE)"
-#~ msgstr "unicode (UTF-32LE)"
-
-#~ msgid "Vietnamese (VISCII)"
-#~ msgstr "vietnamštiny (VISCII)"
-
-#~ msgid "Vietnamese (Windows-1258)"
-#~ msgstr "vietnamštiny (Windows-1258)"
-
-#~ msgid "Western (IBM-850)"
-#~ msgstr "západních jazyků (IBM-850)"
-
-#~ msgid "Western (ISO-8859-1)"
-#~ msgstr "západních jazyků (ISO-8859-1)"
-
-#~ msgid "Western (ISO-8859-15)"
-#~ msgstr "západních jazyků (ISO-8859-15)"
-
-#~ msgid "Western (Windows-1252)"
-#~ msgstr "západních jazyků (Windows-1252)"
-
-#~ msgid "Arabic (IBM-864-I)"
-#~ msgstr "arabštiny (IBM-864-I)"
-
-#~ msgid "Arabic (ISO-8859-6-E)"
-#~ msgstr "arabštiny (ISO-8859-6-E)"
-
-#~ msgid "Arabic (ISO-8859-6-I)"
-#~ msgstr "arabštiny (ISO-8859-6-I)"
-
-#~ msgid "Arabic (MacArabic)"
-#~ msgstr "arabštiny (MacArabic)"
-
-#~ msgid "Armenian (ARMSCII-8)"
-#~ msgstr "arménštiny (ARMSCII-8)"
-
-#~ msgid "Central European (MacCE)"
-#~ msgstr "středoevropských jazyků (MacCE)"
-
-#~ msgid "Chinese Simplified (GBK)"
-#~ msgstr "zjednodušené čínštiny (GBK)"
-
-#~ msgid "Chinese Simplified (HZ)"
-#~ msgstr "zjednodušené čínštiny (HZ)"
-
-#~ msgid "Chinese Traditional (EUC-TW)"
-#~ msgstr "tradiční čínštiny (EUC-TW)"
-
-#~ msgid "Croatian (MacCroatian)"
-#~ msgstr "chorvatštiny (MacCroatian)"
-
-#~ msgid "Cyrillic/Ukrainian (MacUkrainian)"
-#~ msgstr "ukrajinské cyrilice (MacUkrainian)"
-
-#~ msgid "Farsi (MacFarsi)"
-#~ msgstr "perštiny (MacFarsi)"
-
-#~ msgid "Greek (MacGreek)"
-#~ msgstr "řečtiny (MacGreek)"
-
-#~ msgid "Gujarati (MacGujarati)"
-#~ msgstr "gudžáratštiny (MacGujarati)"
-
-#~ msgid "Gurmukhi (MacGurmukhi)"
-#~ msgstr "gurmukhi (MacGurmukhi)"
-
-#~ msgid "Hebrew (ISO-8859-8-E)"
-#~ msgstr "hebrejštiny (ISO-8859-8-E)"
-
-#~ msgid "Hebrew (ISO-8859-8-I)"
-#~ msgstr "hebrejštiny (ISO-8859-8-I)"
-
-#~ msgid "Hebrew (MacHebrew)"
-#~ msgstr "hebrejštiny (MacHebrew)"
-
-#~ msgid "Hindi (MacDevanagari)"
-#~ msgstr "hindštiny (MacDevanagari)"
-
-#~ msgid "Icelandic (MacIcelandic)"
-#~ msgstr "islandštiny (MacIcelandic)"
-
-#~ msgid "Korean (JOHAB)"
-#~ msgstr "korejštiny (JOHAB)"
-
-#~ msgid "Korean (UHC)"
-#~ msgstr "korejštiny (UHC)"
-
-#~ msgid "Romanian (MacRomanian)"
-#~ msgstr "rumunštiny (MacRomanian)"
-
-#~ msgid "Turkish (MacTurkish)"
-#~ msgstr "turečtiny (MacTurkish)"
-
-#~ msgid "User Defined"
-#~ msgstr "Uživatelem definované"
-
-#~ msgid "Vietnamese (TCVN)"
-#~ msgstr "vietnamštiny (TCVN)"
-
-#~ msgid "Western (MacRoman)"
-#~ msgstr "západních jazyků (MacRoman)"
-
-#~ msgid "Select the directory where you want to store the MPEG streams:"
-#~ msgstr "Vyberte adresář, do něhož chcete vysílání uložit:"
-
-#~ msgid "Flac Configuration"
-#~ msgstr "Flac - nastavení"
-
-#~ msgid "Tag Handling"
-#~ msgstr "Zpracování tagů"
-
-#~ msgid "Convert Character Set"
-#~ msgstr "Změnit znakovou sadu"
-
-#~ msgid "Convert character set from :"
-#~ msgstr "Změnit znakovou sadu z :"
-
-#~ msgid "to :"
-#~ msgstr "na :"
-
-#~ msgid "Enable ReplayGain processing"
-#~ msgstr "Zapnout zesílení pro přehrávání"
-
-#~ msgid "Resolution"
-#~ msgstr "Rozlišení"
-
-#~ msgid "Without ReplayGain"
-#~ msgstr "Bez zesílení při přehrávání"
-
-#~ msgid "Dither 24bps to 16bps"
-#~ msgstr "Ditheringem převést 24 bitů na 16"
-
-#~ msgid "With ReplayGain"
-#~ msgstr "Se zesílením při přehrávání"
-
-#~ msgid "Enable dithering"
-#~ msgstr "Povolení ditheringu"
-
-#~ msgid "Noise shaping"
-#~ msgstr "Tvarování šumu"
-
-#~ msgid "high"
-#~ msgstr "silné"
-
-#~ msgid "Dither to"
-#~ msgstr "Dithering na"
-
-#~ msgid "16 bps"
-#~ msgstr "16bitové"
-
-#~ msgid "24 bps"
-#~ msgstr "24 bitů"
-
-#~ msgid "Output"
-#~ msgstr "Výstup"
-
-#~ msgid "Buffering:"
-#~ msgstr "Přednačítání"
-
-#~ msgid "Buffer size (kb):"
-#~ msgstr "Velikost vyrovnávací paměti (kB):"
-
-#~ msgid "Pre-buffer (percent):"
-#~ msgstr "Načíst předem (v procentech):"
-
-#~ msgid "Save stream to disk:"
-#~ msgstr "Uložit vysílání na disk:"
-
-#~ msgid "Save stream to disk"
-#~ msgstr "Uložit vysílání na disk:"
-
-#~ msgid "Path:"
-#~ msgstr "Cesta:"
-
-#~ msgid "Browse"
-#~ msgstr "Procházet:"
-
-#~ msgid "SHOUT/Icecast:"
-#~ msgstr "SHOUT/Icecast:"
-
-#~ msgid "Enable Icecast Metadata UDP Channel"
-#~ msgstr "Povolit Icecast Metadata UDP Channel"
-
-#~ msgid "About Flac Plugin"
-#~ msgstr "O modulu Flac"
-
-#~ msgid ""
-#~ "Flac Plugin by Josh Coalson\n"
-#~ "contributions by\n"
-#~ "......\n"
-#~ "......\n"
-#~ "and\n"
-#~ "Daisuke Shimamura\n"
-#~ "Visit http://flac.sourceforge.net/"
-#~ msgstr "Flac modul "
-
-#~ msgid "Samplerate: %d Hz"
-#~ msgstr "Vzorkovací kmitočet: %d Hz"
-
-#~ msgid "Channels: %d"
-#~ msgstr "Kanálů: %d"
-
-#~ msgid "Bits/Sample: %d"
-#~ msgstr "Bitů na vzorek: %d"
-
-#~ msgid "Blocksize: %d"
-#~ msgstr "Velikost bloku: %d"
-
-#~ msgid ""
-#~ "Blocksize: variable\n"
-#~ " min/max: %d/%d"
-#~ msgstr ""
-#~ "Velikost bloku: proměnná\n"
-#~ " min/max: %d/%d"
-
-#~ msgid ""
-#~ "Samples: %llu\n"
-#~ "Length: %d:%.2d"
-#~ msgstr ""
-#~ "Vzorků: %llu\n"
-#~ "Délka: %d:%.2d"
-
-#~ msgid "Filesize: %ld B"
-#~ msgstr "Velikost souboru: %ld B"
-
-#~ msgid ""
-#~ "Avg. bitrate: %.1f kb/s\n"
-#~ "Compression ratio: %.1f%%"
-#~ msgstr ""
-#~ "Prům. datový tok: %.1f kb/s\n"
-#~ "Kompresní poměr: %.1f%%"
-
-#~ msgid "Tag:"
-#~ msgstr "Tag:"
-
-#~ msgid "Comment:"
-#~ msgstr "Komentář:"
-
-#~ msgid "Date:"
-#~ msgstr "Datum:"
-
-#~ msgid "Track number:"
-#~ msgstr "Číslo stopy:"
-
-#~ msgid "Genre:"
-#~ msgstr "Žánr:"
-
-#~ msgid "Remove Tag"
-#~ msgstr "Odstranit tag"
-
-#~ msgid "Error"
-#~ msgstr "Chyba"
-
-#~ msgid "LOOKING UP %s"
-#~ msgstr "Vyhledávám %s"
-
-#~ msgid "Couldn't look up host %s"
-#~ msgstr "Nelze najít server %s"
-
-#~ msgid "CONNECTING TO %s:%d"
-#~ msgstr "Připojuji se k %s: %d"
-
-#~ msgid "Couldn't connect to host %s"
-#~ msgstr "Nelze se připojit k %s"
-
-#~ msgid "CONNECTED: WAITING FOR REPLY"
-#~ msgstr "Připojen: čekám na odpověď"
-
-#~ msgid ""
-#~ "Couldn't connect to host %s\n"
-#~ "Server reported: %s"
-#~ msgstr ""
-#~ "Nepodařilo se připojit k serveru %s\n"
-#~ "Server odpověděl: %s"
-
-#~ msgid "PRE-BUFFERING: %dKB/%dKB"
-#~ msgstr "Přednačteno: %d kB/%d kB"
-
-#~ msgid "ModPlug Configuration"
-#~ msgstr "Nastavení ModPlugu"
-
-#~ msgid "16 bit"
-#~ msgstr "16bitové"
-
-#~ msgid "8 bit"
-#~ msgstr "8bitové"
-
-#~ msgid "Resampling"
-#~ msgstr "Převzorkování"
-
-#~ msgid "Nearest (fastest)"
-#~ msgstr "Nejbližší (nejrychlejší)"
-
-#~ msgid "Linear (fast)"
-#~ msgstr "Lineární (rychlé)"
-
-#~ msgid "Spline (good quality)"
-#~ msgstr "Spline (kvalitní)"
-
-#~ msgid "8-tap Fir (extremely high quality)"
-#~ msgstr "FIR filtr osmého řádu (velmi kvalitní)"
-
-#~ msgid "Use Filename as Song Title"
-#~ msgstr "Použít jméno souboru jako název skladby"
-
-#~ msgid "Noise Reduction"
-#~ msgstr "Redukce šumu"
-
-#~ msgid "Bass Boost"
-#~ msgstr "Zvýraznění hlubokých tónů"
-
-#~ msgid "Amount"
-#~ msgstr "Množství"
-
-#~ msgid "time(s)"
-#~ msgstr "čas (s)"
-
-#~ msgid "OK"
-#~ msgstr "Budiž"
-
-#~ msgid ""
-#~ "Filename:\n"
-#~ "Title:\n"
-#~ "Type:\n"
-#~ "Length:\n"
-#~ "Speed:\n"
-#~ "Tempo:\n"
-#~ "Samples:\n"
-#~ "Instruments:\n"
-#~ "Patterns:\n"
-#~ "Channels:"
-#~ msgstr ""
-#~ "Jméno souboru:\n"
-#~ "Název skladby:\n"
-#~ "Typ:\n"
-#~ "Délka:\n"
-#~ "Rychlost:\n"
-#~ "Tempo:\n"
-#~ "Vzorků:\n"
-#~ "Nástroje:\n"
-#~ "Vzory:\n"
-#~ "Kanálů:"
-
-#~ msgid "Samples"
-#~ msgstr "Vzorky"
-
-#~ msgid "About Modplug"
-#~ msgstr "O modulu Modplug"
-
-#~ msgid "MPEG Audio Plugin Configuration"
-#~ msgstr "Nastavení modulu MPEG Audio"
-
-#~ msgid "Resolution:"
-#~ msgstr "Rozlišení:"
-
-#~ msgid "Channels:"
-#~ msgstr "Kanálů"
-
-#~ msgid "Stereo (if available)"
-#~ msgstr "Stereo (pokud existuje)"
-
-#~ msgid "Down sample:"
-#~ msgstr "Snížit vzorkovací kmitočet:"
-
-#~ msgid "1:1 (44 kHz)"
-#~ msgstr "1:1 (44 kHz)"
-
-#~ msgid "1:2 (22 kHz)"
-#~ msgstr "1:2 (22 kHz)"
-
-#~ msgid "1:4 (11 kHz)"
-#~ msgstr "1:4 (11 kHz)"
-
-#~ msgid "Decoder"
-#~ msgstr "Dekodér"
-
-#~ msgid "ID3 Tags:"
-#~ msgstr "ID3 tagy:"
-
-#~ msgid "ID3 format:"
-#~ msgstr "Formát ID3:"
-
-#~ msgid "Joint stereo"
-#~ msgstr "Joint stereo"
-
-#~ msgid "Dual channel"
-#~ msgstr "Dva kanály"
-
-#~ msgid "Single channel"
-#~ msgstr "Jeden kanál"
-
-#~ msgid "%ld Hz"
-#~ msgstr "%ld Hz"
-
-#~ msgid "50/15 ms"
-#~ msgstr "50/15 ms"
-
-#~ msgid "CCIT J.17"
-#~ msgstr "CCIT J.17"
-
-#~ msgid "No"
-#~ msgstr "Ne"
-
-#~ msgid "Yes"
-#~ msgstr "Ano"
-
-#~ msgid " MPEG Info "
-#~ msgstr " MPEG informace"
-
-#~ msgid "MPEG Level:"
-#~ msgstr "MPEG:"
-
-#~ msgid "Bit rate:"
-#~ msgstr "Datový tok:"
-
-#~ msgid "Sample rate:"
-#~ msgstr "Vzorkovací kmitočet:"
-
-#~ msgid "File size:"
-#~ msgstr "Velikost souboru:"
-
-#~ msgid "Error Protection:"
-#~ msgstr "Chybová ochrana:"
-
-#~ msgid "Copyright:"
-#~ msgstr "Autorská práva:"
-
-#~ msgid "Original:"
-#~ msgstr "Originál:"
-
-#~ msgid "Emphasis:"
-#~ msgstr "Zesílení:"
-
-#~ msgid " ID3 Tag "
-#~ msgstr " ID3 popis:"
-
-#~ msgid "Year:"
-#~ msgstr "Rok:"
-
-#~ msgid "N/A"
-#~ msgstr "není známo"
-
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#~ msgid "%lu Bytes"
-#~ msgstr "%lu bajtů"
-
-#~ msgid "About MPEG Audio Plugin"
-#~ msgstr "O modulu MPEG Audio"
-
-#~ msgid "MPEG Audio Plugin"
-#~ msgstr "Modul MPEG Audio"
-
-#~ msgid "About Tone Generator"
-#~ msgstr "O generátoru tónů"
-
-#~ msgid ""
-#~ "Sinus tone generator by Haavard Kvaalen <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 2000Hz tone and a 2005Hz tone"
-#~ msgstr ""
-#~ "Generátor harmonických tónů, vytvořil Haavard Kvaalen <havardk@xmms.org>\n"
-#~ "Upraven Danielem J. Pengem <danielpeng@bigfoot.com>\n"
-#~ "\n"
-#~ "Pro jeho aktivaci zadejte URL: tone://frekvence1;frekvence2;"
-#~ "frekvence3;...\n"
-#~ "např. tone://2000;2005 pro přehrání tónů o frekvenci 2000 a 2005 Hz."
-
-#~ msgid "Tone Generator: "
-#~ msgstr "Generátor tónů:"
-
-#~ msgid "Tone Generator %s"
-#~ msgstr "Generátor tónů %s"
-
-#~ msgid "Select the directory where you want to store the Ogg Vorbis streams:"
-#~ msgstr ""
-#~ "Vyberte adresář, do nějž bude ukládáno vysílání ve formátu Ogg Vorbis:"
-
-#~ msgid "Ogg Vorbis Audio Plugin Configuration"
-#~ msgstr "Nastavení modulu Ogg Vorbis Audio"
-
-#~ msgid "Ogg Vorbis Tags:"
-#~ msgstr "Ogg Vorbis Info:"
-
-#~ msgid "ReplayGain Settings:"
-#~ msgstr "Nastavení pro zesílení přehrávání:"
-
-#~ msgid "use Track Gain/Peak"
-#~ msgstr "použít zesílení/vrcholu skladby"
-
-#~ msgid "use Album Gain/Peak"
-#~ msgstr "použít zesílení/vrchol alba"
-
-#~ msgid "Enable 6dB Boost + Hard Limiting"
-#~ msgstr "Povolit 6 dB boost + tvrdé omezení"
-
-#~ msgid ""
-#~ "An error occured:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Nastala chyba:\n"
-#~ "%s"
-
-#~ msgid "Error!"
-#~ msgstr "Chyba!"
-
-#~ msgid "Failed to modify tag (open)"
-#~ msgstr "Změna tagu se nezdařila (otevření)"
-
-#~ msgid "Failed to modify tag (close)"
-#~ msgstr "Změna tagu se nezdařila (zavření)"
-
-#~ msgid "Failed to modify tag"
-#~ msgstr "Nepodařilo se upravit informace"
-
-#~ msgid " Ogg Vorbis Tag "
-#~ msgstr "Popis Ogg Vorbis souboru"
-
-#~ msgid "Description:"
-#~ msgstr "Popis:"
-
-#~ msgid "Location:"
-#~ msgstr "Umístění:"
-
-#~ msgid "Version:"
-#~ msgstr "Verze:"
-
-#~ msgid "ISRC number:"
-#~ msgstr "Číslo ISRC"
-
-#~ msgid "Organization:"
-#~ msgstr "Organizace:"
-
-#~ msgid " Ogg Vorbis ReplayGain "
-#~ msgstr " Zesílení Ogg Vorbis"
-
-#~ msgid "Album peak:"
-#~ msgstr "Vrchol alba:"
-
-#~ msgid " Ogg Vorbis Info "
-#~ msgstr " Ogg Vorbis Info "
-
-#~ msgid "Length:"
-#~ msgstr "Délka:"
-
-#~ msgid "%d KBit/s (nominal)"
-#~ msgstr "%d kb/s (jmenovitý tok)"
-
-#~ msgid "%d Hz"
-#~ msgstr "%d Hz"
-
-#~ msgid "%d"
-#~ msgstr "%d"
-
-#~ msgid "%d:%.2d"
-#~ msgstr "%d:%.2d"
-
-#~ msgid "%d Bytes"
-#~ msgstr "%d bajtů"
-
-#~ msgid "Ogg Vorbis Audio Plugin"
-#~ msgstr "Modul Ogg Vorbis Audio"
-
-#~ msgid "About Ogg Vorbis Audio Plugin"
-#~ msgstr "O modulu Ogg Vorbis Audio"
-
-#~ msgid ""
-#~ "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
-#~ "\n"
-#~ "Original code by\n"
-#~ "Tony Arcieri <bascule@inferno.tusculum.edu>\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"
-#~ "Haavard Kvaalen <havardk@xmms.org>\n"
-#~ "Gian-Carlo Pascutto <gcp@sjeng.org>\n"
-#~ "\n"
-#~ "Visit the Xiph.org Foundation at http://www.xiph.org/\n"
-#~ msgstr ""
-#~ "Modul Ogg Vorbis od the \"the Xiph.org Foundation\"\n"
-#~ "\n"
-#~ "Původní kód napsal\n"
-#~ "Tony Arcieri <bascule@inferno.tusculum.edu>\n"
-#~ "Přispěli\n"
-#~ "Chris Montgomery <monty@xiph.org>\n"
-#~ "Peter Alm <peter@xmms.org>\n"
-#~ "Michael Smith <msmith@labyrinth.edu.au>\n"
-#~ "Jack Moffitt <jack@icecast.org>\n"
-#~ "Jorn Baayen <jorn@nl.linux.org>\n"
-#~ "Haavard Kvaalen <havardk@xmms.org>\n"
-#~ "Gian-Carlo Pascutto <gcp@sjeng.org>\n"
-#~ "\n"
-#~ "Navštivte stránky \"the Xiph.org Foundation\": http://www.xiph.org/\n"
-
-#~ msgid ""
-#~ "Adapted for Audacious usage by Tony Vroon <chainsaw@gentoo.org>\n"
-#~ "from the xmms_sndfile plugin which is:\n"
-#~ "Copyright (C) 2000, 2002 Erik de Castro Lopo\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. \n"
-#~ "See the GNU General Public License for more details. \n"
-#~ "\n"
-#~ "You should have received a copy of the GNU General Public \n"
-#~ "License along with this program ; if not, write to \n"
-#~ "the Free Software Foundation, Inc., \n"
-#~ "51 Franklin Street, Fifth Floor, \n"
-#~ "Boston, MA 02110-1301 USA"
-#~ msgstr ""
-#~ "Pro Audacious upravil Tony Vroon <chainsaw@gentoo.org>\n"
-#~ "z původního modulu xmms_sndfile,\n"
-#~ "copyright © 2000, 2002 Erik de Castro Lopo\n"
-#~ "\n"
-#~ "Tento program je svobodný software; můžete jej šířit a/nebo měnit\n"
-#~ "pokud dodržíte podmínky GNU General Public License (GPL) vydané\n"
-#~ "Free Software Foundation a to buď ve verzi 2 nebo (dle vaší volby)\n"
-#~ "libovolné novější.\n"
-#~ "\n"
-#~ "Program je šířen v naději, že bude užitečný, ale BEZ JAKÉKOLIV\n"
-#~ "ZÁRUKY a to ani záruky obchodovatelnosti nebo vhodnosti pro\n"
-#~ "JAKÝKOLIV účel. Více informací najdete v GNU GPL.\n"
-#~ "\n"
-#~ "S tímto programem byste měli obdržet kopii GNU GPL.\n"
-#~ "Pokud se tak nestalo, obraťte se na\n"
-#~ "Free Software Foundation, Inc.,\n"
-#~ "51 Fraklin Streen, Fifth Floor,\n"
-#~ "Boston, MA  02110-1301,\n"
-#~ "USA.\n"
-#~ "Český překlad naleznete na webové adrese\n"
-#~ "http://www.gnu.cz/licence.html."
-
-#~ msgid "WAV Audio Plugin"
-#~ msgstr "Modul WAV Audio"
-
-#~ msgid "About OSS Driver"
-#~ msgstr "O modulu OSS"
-
-#~ msgid ""
-#~ "Audacious OSS Driver\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 ""
-#~ "Ovladač OSS programu Audacious\n"
-#~ "\n"
-#~ "Tento program je svobodný software; můžete jej šířit a/nebo měnit\n"
-#~ "pokud dodržíte podmínky GNU General Public License (GPL) vydané\n"
-#~ "Free Software Foundation a to buď ve verzi 2 nebo (dle vaší volby)\n"
-#~ "libovolné novější.\n"
-#~ "\n"
-#~ "Program je šířen v naději, že bude užitečný, ale BEZ JAKÉKOLIV\n"
-#~ "ZÁRUKY a to ani záruky OBCHODOVATELNOSTI nebo VHODNOSTI PRO\n"
-#~ "JAKÝKOLIV ÚČEL. Více informací najdete v GNU GPL.\n"
-#~ "\n"
-#~ "S tímto programem byste měli obdržet kopii GNU GPL. Pokud se\n"
-#~ "tak nestalo, obraťte se na Free Software Foundation, Inc.,\n"
-#~ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-#~ "USA. Český překlad naleznete na webové adrese\n"
-#~ "http://www.gnu.cz/licence.html."
-
-#~ msgid "Default (%s)"
-#~ msgstr "Standardně (%s)"
-
-#~ msgid "OSS Driver configuration"
-#~ msgstr "Nastavení ovladače OSS"
-
-#~ msgid "Audio device:"
-#~ msgstr "Zvukové zařízení:"
-
-#~ msgid "Use alternate device:"
-#~ msgstr "Použít jiné zařízení:"
-
-#~ msgid "Mixer device:"
-#~ msgstr "Mixér:"
-
-#~ msgid "Devices"
-#~ msgstr "Zařízení"
-
-#~ msgid "Buffer size (ms):"
-#~ msgstr "Velikost vyrovnávací paměti (ms):"
-
-#~ msgid "Mixer Settings:"
-#~ msgstr "Nastavení mixéru:"
-
-#~ msgid "Volume controls Master not PCM"
-#~ msgstr "Hlasitost ovládána Master kanálem místo PCM"
-
-#~ msgid "Mixer"
-#~ msgstr "Mixér"
-
-#~ msgid "About ALSA Driver"
-#~ msgstr "O ovladači ALSA"
-
-#~ msgid ""
-#~ "Audacious ALSA Driver\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.\n"
-#~ "Author: Matthieu Sozeau (mattam@altern.org)"
-#~ msgstr ""
-#~ "Ovladač ALSY programu Audacious\n"
-#~ "\n"
-#~ "Tento program je svobodný software; můžete jej šířit a/nebo měnit\n"
-#~ "pokud dodržíte podmínky GNU General Public License (GPL) vydané\n"
-#~ "Free Software Foundation a to buď ve verzi 2 nebo (dle vaší volby)\n"
-#~ "libovolné novější.\n"
-#~ "\n"
-#~ "Program je šířen v naději, že bude užitečný, ale BEZ JAKÉKOLIV\n"
-#~ "ZÁRUKY a to ani záruky OBCHODOVATELNOSTI nebo VHODNOSTI PRO\n"
-#~ "JAKÝKOLIV ÚČEL. Více informací najdete v GNU GPL.\n"
-#~ "\n"
-#~ "S tímto programem byste měli obdržet kopii GNU GPL. Pokud se\n"
-#~ "tak nestalo, obraťte se na Free Software Foundation, Inc.,\n"
-#~ "51 Franklin Streen, Fifth Floor, Boston, MA 02110-1301,\n"
-#~ "USA. Český překlad naleznete na webové adrese\n"
-#~ "http://www.gnu.cz/licence.html.\n"
-#~ "Autor: Matthieu Sozeau (mattam@altern.org)"
-
-#~ msgid "ALSA %s output plugin"
-#~ msgstr "Výstupní modul ALSA %s"
-
-#~ msgid "Unknown soundcard"
-#~ msgstr "Neznámá zvuková karta"
-
-#~ msgid "Default PCM device (%s)"
-#~ msgstr "Implicitní PCM zařízení (%s)"
-
-#~ msgid "ALSA Driver configuration"
-#~ msgstr "Nastavení ovladače ALSA"
-
-#~ msgid "Mixer:"
-#~ msgstr "Mixér:"
-
-#~ msgid "Mixer card:"
-#~ msgstr "Mixovací zařízení:"
-
-#~ msgid "Device settings"
-#~ msgstr "Nastavení zařízení"
-
-#~ msgid "Soundcard:"
-#~ msgstr "Zvuková karta:"
-
-#~ msgid "Buffer time (ms):"
-#~ msgstr "Velikost vyrovnávací paměti (ms):"
-
-#~ msgid "Period time (ms):"
-#~ msgstr "Perioda (ms):"
-
-#~ msgid "Advanced settings"
-#~ msgstr "Pokročilé nastavení"
-
-#~ msgid "aRts Driver configuration"
-#~ msgstr "Nastavení ovladače aRts"
-
-#~ msgid "Disk Writer Plugin %s"
-#~ msgstr "Modul Disk writer %s"
-
-#~ msgid ""
-#~ "You cannot use the Disk Writer plugin\n"
-#~ "when you're running in realtime mode."
-#~ msgstr ""
-#~ "Disk writer nelze použít, pokud\n"
-#~ "jste v režimu reálného času."
-
-#~ msgid "Select the directory where you want to store the output files:"
-#~ msgstr "Vyberte adresář, do něhož chcete soubory uložit:"
-
-#~ msgid "Disk Writer Configuration"
-#~ msgstr "Nastavení záznamu na disk"
-
-#~ msgid "About ESounD Plugin"
-#~ msgstr "O modulu ESounD"
-
-#~ msgid ""
-#~ "Audacious ESounD 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 ""
-#~ "Modul ESounD programu Audacious\n"
-#~ "\n"
-#~ "Tento program je svobodný software; můžete jej šířit a/nebo měnit\n"
-#~ "pokud dodržíte podmínky GNU General Public License (GPL) vydané\n"
-#~ "Free Software Foundation a to buď ve verzi 2 nebo (dle vaší volby)\n"
-#~ "libovolné novější.\n"
-#~ "\n"
-#~ "Program je šířen v naději, že bude užitečný, ale BEZ JAKÉKOLIV\n"
-#~ "ZÁRUKY a to ani záruky OBCHODOVATELNOSTI nebo VHODNOSTI PRO\n"
-#~ "JAKÝKOLIV ÚČEL. Více informací najdete v GNU GPL.\n"
-#~ "\n"
-#~ "S tímto programem byste měli obdržet kopii GNU GPL. Pokud se\n"
-#~ "tak nestalo, obraťte se na Free Software Foundation, Inc.,\n"
-#~ "51 Fanklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-#~ "USA. Český překlad naleznete na webové adrese\n"
-#~ "http://www.gnu.cz/licence.html."
-
-#~ msgid "Host:"
-#~ msgstr "Adresa:"
-
-#~ msgid "Use remote host"
-#~ msgstr "Použít vzdálený počítač"
-
-#~ msgid "Volume controls OSS mixer"
-#~ msgstr "Hlasitost ovládána OO mixérem"
-
-#~ msgid "Server"
-#~ msgstr "Server"
-
-#~ msgid "eSound Output Plugin"
-#~ msgstr "Výstupní modul eSound"
-
-#~ msgid "/Toggle Decorations"
-#~ msgstr "/Přepnout zobrazení dekorací"
-
-#~ msgid "Blur scope"
-#~ msgstr "Blur scope"
-
-#~ msgid "Blur Scope: Color selection"
-#~ msgstr "Blur scope: výběr barvy"
-
-#~ msgid "Options:"
-#~ msgstr "Volby:"
-
-#~ msgid "** DOUBLESIZE HAS BEEN REMOVED **"
-#~ msgstr "** FUNKCE ZDVOJNÁSOBENÍ VELIKOSTI BYLA ODSTRANĚNA **"
-
-#~ msgid ""
-#~ "Filename and song title tags should be inside double quotes (\"). Not "
-#~ "doing so might be a security risk. Continue anyway?"
-#~ msgstr ""
-#~ "Jméno souboru a název skladby je lépe napsat do uvozovek (\"), jinak může "
-#~ "být ohrožena bezpečnost počítače. Chcete přesto pokračovat?"
-
-#~ msgid ""
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---"
-#~ msgstr ""
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---\n"
-#~ "---"
-
-#~ msgid "Convert non-UTF8 ID3 tags to UTF8"
-#~ msgstr "Převést ID3 tagy z jiných kódování do UTF-8"
-
-#~ msgid "ID3 encoding:"
-#~ msgstr "Kódování ID3:"
-
-#~ msgid "Convert non-UTF8 Vorbis tags to UTF8"
-#~ msgstr "Převést Vorbis tagy z jiných kódování do UTF-8"
-
-#~ msgid "Vorbis encoding:"
-#~ msgstr "Vorbis - kódování:"
-
-#~ msgid "Audacious:"
-#~ msgstr "Audacious:"
-
-#~ msgid "William Pitcock"
-#~ msgstr "William Pitcock"
-
-#~ msgid "Tony Vroon"
-#~ msgstr "Tony Vroon"
-
-#~ msgid "Mohammed Sameer"
-#~ msgstr "Mohammed Sameer"
-
-#~ msgid "Artem Baguinski"
-#~ msgstr "Artem Baguinski"
-
-#~ msgid "Edward Brocklesby"
-#~ msgstr "Edward Brocklesby"
-
-#~ msgid "Chong Kai Xiong"
-#~ msgstr "Chong Kai Xiong"
-
-#~ msgid "Milosz Derezynski"
-#~ msgstr "Milosz Derezynski"
-
-#~ msgid "David Lau"
-#~ msgstr "David Lau"
-
-#~ msgid "Ole Andre Vadla Ravnaas"
-#~ msgstr "Ole Andre Vadla Ravnaas"
-
-#~ msgid "Michiel Sikkes"
-#~ msgstr "Michiel Sikkes"
-
-#~ msgid "Andrei Badea"
-#~ msgstr "Andrei Badea"
-
-#~ msgid "Peter Behroozi"
-#~ msgstr "Peter Behroozi"
-
-#~ msgid "Bernard Blackham"
-#~ msgstr "Bernard Blackham"
-
-#~ msgid "Oliver Blin"
-#~ msgstr "Oliver Blin"
-
-#~ msgid "Tomas Bzatek"
-#~ msgstr "Tomas Bzatek"
-
-#~ msgid "Liviu Danicel"
-#~ msgstr "Liviu Danicel"
-
-#~ msgid "Jon Dowland"
-#~ msgstr "Jon Dowland"
-
-#~ msgid "Artur Frysiak"
-#~ msgstr "Artur Frysiak"
-
-#~ msgid "Sebastian Kapfer"
-#~ msgstr "Sebastian Kapfer"
-
-#~ msgid "Lukas Koberstein"
-#~ msgstr "Lukas Koberstein"
-
-#~ msgid "Dan Korostelev"
-#~ msgstr "Dan Korostelev"
-
-#~ msgid "Jolan Luff"
-#~ msgstr "Jolan Luff"
-
-#~ msgid "Michael Marineau"
-#~ msgstr "Michael Marineau"
-
-#~ msgid "Tim-Philipp Muller"
-#~ msgstr "Tim-Philipp Muller"
-
-#~ msgid "Julien Portalier"
-#~ msgstr "Julien Portalier"
-
-#~ msgid "Andrew Ruder"
-#~ msgstr "Andrew Ruder"
-
-#~ msgid "Olivier Samyn"
-#~ msgstr "Olivier Samyn"
-
-#~ msgid "Martijn Vernooij"
-#~ msgstr "Martijn Vernooij"
-
-#~ msgid "Philipi Pinto"
-#~ msgstr "Philipi Pinto"
-
-#~ msgid "Thierry Vignaud"
-#~ msgstr "Thierry Vignaud"
-
-#~ msgid "Chao-Hsiung Liao"
-#~ msgstr "Chao-Hsiung Liao"
-
-#~ msgid "Jan Narovec"
-#~ msgstr "Jan Narovec"
-
-#~ msgid "Laurens Buhler"
-#~ msgstr "Laurens Buhler"
-
-#~ msgid "Pauli Virtanen"
-#~ msgstr "Pauli Virtanen"
-
-#~ msgid "David Le Brun"
-#~ msgstr "David Le Brun"
-
-#~ msgid "Matthias Debus"
-#~ msgstr "Matthias Debus"
-
-#~ msgid "George Machitidze"
-#~ msgstr "George Machitidze"
-
-#~ msgid "Kouzinopoulos Haris"
-#~ msgstr "Kouzinopoulos Haris"
-
-#~ msgid "Stavros Giannouris"
-#~ msgstr "Stavros Giannouris"
-
-#~ msgid "Dhananjaya Sharma"
-#~ msgstr "Dhananjaya Sharma"
-
-#~ msgid "Laszlo Dvornik"
-#~ msgstr "Laszlo Dvornik"
-
-#~ msgid "Alessio D'Ascanio"
-#~ msgstr "Alessio D'Ascanio"
-
-#~ msgid "Dai"
-#~ msgstr "Dai"
-
-#~ msgid "DongCheon Park"
-#~ msgstr "DongCheon Park"
-
-#~ msgid "Rimas Kudelis"
-#~ msgstr "Rimas Kudelis"
-
-#~ msgid "Arangel Angov"
-#~ msgstr "Arangel Angov"
-
-#~ msgid "Jacek Wolszczak"
-#~ msgstr "Jacek Wolszczak"
-
-#~ msgid "Pavlo Bohmat"
-#~ msgstr "Pavlo Bohmat"
-
-#~ msgid "Vitaly Lipatov"
-#~ msgstr "Vitalij Lipatov"
-
-#~ msgid "Pavel Kanzelsberger"
-#~ msgstr "Pavel Kanzelsberger"
-
-#~ msgid "Martin Persenius"
-#~ msgstr "Martin Persenius"
-
-#~ msgid "Mykola Lynnyk"
-#~ msgstr "Mykola Lynnyk"
-
-#~ msgid "Plugins"
-#~ msgstr "Moduly"
-
-#~ msgid "_Media plugin list:"
-#~ msgstr "_Seznam přehrávacích modulů"
-
-#~ msgid ""
-#~ "The change is now effective in Audacious' configuration database, but "
-#~ "won't take effect for playback until the next song!\n"
-#~ "\n"
-#~ "Optionally, you can stop and restart playback for the change to take "
-#~ "effect."
-#~ msgstr ""
-#~ "Změny jsou uloženy, ale projeví se až při přehrávání další skladby.\n"
-#~ "\n"
-#~ "Po zastavení a znovuspuštění se změny samozřejmě projeví i u současné "
-#~ "skladby."
-
-#~ msgid "Appearance"
-#~ msgstr "Vzhled"
-
-#~ msgid "Mouse"
-#~ msgstr "Myš"
-
-#~ msgid "Playlist"
-#~ msgstr "Seznam skladeb"
-
-#~ msgid "Equalizer"
-#~ msgstr "Ekvalizér"
-
-#~ msgid "Use proxy"
-#~ msgstr "Použít proxy"
-
-#~ msgid "Frames:"
-#~ msgstr "Rámců:"
-
-#~ msgid ""
-#~ "Variable,\n"
-#~ "avg. bitrate: %d KBit/s"
-#~ msgstr ""
-#~ "Proměnný,\n"
-#~ "průměrný datový tok: %d kb/s"
-
-#~ msgid "Francisco Javier F. Serrador"
-#~ msgstr "Francisco Javier F. Serrador"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "Unable to write to file: %s"
-#~ msgstr ""
-#~ "%s\n"
-#~ "Nelze zapsat do souboru: %s"
-
-#~ msgid "Couldn't write tag!"
-#~ msgstr "Informace nelze zapsat!"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "Unable to open file: %s"
-#~ msgstr ""
-#~ "%s\n"
-#~ "Nelze otevřít soubor: %s"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "Unable to truncate file: %s"
-#~ msgstr ""
-#~ "%s\n"
-#~ "Nepodařilo se upravit soubor: %s"
-
-#~ msgid "Couldn't remove tag!"
-#~ msgstr "Informace nelze odstranit!"
-
-#~ msgid "No tag to remove!"
-#~ msgstr "Žádný tag k odstranění!"
-
-#~ msgid "Copy album tags"
-#~ msgstr "Kopírovat společné položky"
-
-#~ msgid "Paste album tags"
-#~ msgstr "Vložit společné položky"
-
-#~ msgid "Content"
-#~ msgstr "Obsah"
-
-#~ msgid "Extension"
-#~ msgstr "Přípona"
-
-#~ msgid "Extension and content"
-#~ msgstr "Obsah i přípona"
-
-#~ msgid ""
-#~ "\n"
-#~ "Copyright (C) 2000-2004 Peter Eisenlohr <peter@eisenlohr.org>\n"
-#~ "\n"
-#~ "based on the original OSS Output Plugin Copyright (C) 1998-2000\n"
-#~ "Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson and 4Front "
-#~ "Technologies\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., 59 Temple Place - Suite 330, Boston, MA 02111-1307,\n"
-#~ "USA."
-#~ msgstr ""
-#~ "\n"
-#~ "Copyright (C) 2000-2004 Peter Eisenlohr <peter@eisenlohr.org>\n"
-#~ "\n"
-#~ "založeno na původním OSS modulu, copyright (C) 1998-2000\n"
-#~ "Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson a 4Front "
-#~ "Technologies\n"
-#~ "\n"
-#~ " Tento program je svobodný software; můžete jej šířit a/nebo měnit\n"
-#~ "pokud dodržíte podmínky GNU General Public License (GPL) vydané\n"
-#~ "Free Software Foundation a to buď ve verzi 2 nebo (dle vaší volby)\n"
-#~ "libovolné novější.\n"
-#~ "\n"
-#~ "Program je šířen v naději, že bude užitečný, ale BEZ JAKÉKOLIV\n"
-#~ "ZÁRUKY a to ani záruky obchodovatelnosti nebo vhodnosti pro\n"
-#~ "JAKÝKOLIV účel. Více informací najdete v GNU GPL.\n"
-#~ "\n"
-#~ "S tímto programem byste měli obdržet kopii GNU GPL. Pokud se\n"
-#~ "tak nestalo, obraťte se na Free Software Foundation,\n"
-#~ "Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,\n"
-#~ "USA. Český překlad naleznete na webové adrese\n"
-#~ "http://www.gnu.cz/licence.html."
-
-#~ msgid " Enable"
-#~ msgstr "Povolit"
-
-#~ msgid " left"
-#~ msgstr "zbývá"
-
-#~ msgid " total, "
-#~ msgstr "celkem,"
-
-#~ msgid "About XMMS Crossfade Plugin"
-#~ msgstr "O modulu Crossfade"
-
-#~ msgid "Advanced options"
-#~ msgstr "Pokročilé nastavení"
-
-#~ msgid ""
-#~ "Automatically calculate an optimal buffer size.\n"
-#~ "Default: On"
-#~ msgstr ""
-#~ "Automaticky určit optimální velikost vyrovnávací paměti.\n"
-#~ "Standardně: zapnuto"
-
-#~ msgid ""
-#~ "Beware that setting this value too low also increases the chance of "
-#~ "buffer underruns.\n"
-#~ "Default: 250"
-#~ msgstr ""
-#~ "Pozor, nastavení této hodnoty příliš nízko zvýší riziko podtečení "
-#~ "vyrovnávací paměti.\n"
-#~ "Standardně: 250"
-
-#~ msgid "Configure"
-#~ msgstr "Nastavit"
-
-#~ msgid ""
-#~ "Enable software mixer. Usefull for output plugins without mixer support.\n"
-#~ "Default: Off"
-#~ msgstr ""
-#~ "Povolit softwarový mixér. Užitečné pro výstupní moduly bez podpory "
-#~ "mixování zvuku.\n"
-#~ "Standardně: vypnuto"
-
-#~ msgid ""
-#~ "Enable the selected plugin. Note that after pressing 'Apply' it may take "
-#~ "a while until you can hear the effect, since it is applied before the "
-#~ "audio data goes into the buffer."
-#~ msgstr ""
-#~ "Povolí vybraný modul. Po stisknutí tlačítka ‚Použít‘ může chvilku trvat, "
-#~ "než se změny projeví, protože nové nastavení se aplikuje na data před "
-#~ "vyrovnávací pamětí."
-
-#~ msgid "Enable volume control"
-#~ msgstr "Povolit ovládání hlasitosti:"
-
-#~ msgid ""
-#~ "Enables the Buffer Monitor. This is a small window which shows how much "
-#~ "data is in the buffers. The top display belongs to the mixing buffer, the "
-#~ "bottom shows how much data is being buffered by the output plugin.\n"
-#~ "Default: Off"
-#~ msgstr ""
-#~ "Povolit sledování vyrovnávací paměti – otevře okno, které bude ukazovat "
-#~ "objem dat ve vyrovnávací paměti. Vrchní ukazatel patří vyrovnávací paměti "
-#~ "mixéru, spodní vyrovnávací paměti výstupního modulu.\n"
-#~ "Standardně: vypnuto"
-
-#~ msgid "End volume (%):"
-#~ msgstr "Koncová hlasitost (%):"
-
-#~ msgid "Keep output opened"
-#~ msgstr "Ponechat výstup otevřený"
-
-#~ msgid ""
-#~ "Keep the output device opened all the time, even if XMMS is stopped. This "
-#~ "way, you can avoid clicks caused by the soundcard when the device is "
-#~ "opened or closed\n"
-#~ "Default: Off"
-#~ msgstr ""
-#~ "Ponechá výstupní zařízení otevřené, i když je přehrávání pozastavené. Tak "
-#~ "lze zabránit cvakání, které způsobují některé zvukové karty při svém "
-#~ "spuštění/zastavení.\n"
-#~ "Standardně: vypnuto"
-
-#~ msgid "Max block size (bytes):"
-#~ msgstr "Max. velikost bloku (v bajtech):"
-
-#~ msgid "Max. length (ms):"
-#~ msgstr "Max. délka (ms):"
-
-#~ msgid "Mixing buffer size (ms):"
-#~ msgstr "Velikost vyrovnávací paměti mixéru (ms):"
-
-#~ msgid "Open the about dialog of the plugin selected above."
-#~ msgstr "Otevře okno s informacemi o výše vybraném modulu."
-
-#~ msgid "Open the configuration dialog of the plugin selected above."
-#~ msgstr "Otevře okno s nastavením výše vybraného modulu."
-
-#~ msgid "Output Buffer:"
-#~ msgstr "Výstupní vyrovnávací paměť:"
-
-#~ msgid "Position:"
-#~ msgstr "Pozice:"
-
-#~ msgid "Quality:"
-#~ msgstr "Kvalita"
-
-#~ msgid "Rate:"
-#~ msgstr "Tok:"
-
-#~ msgid "Read ID3V2 RVA2 Tag"
-#~ msgstr "Číst ID3V2 RVA2 tag"
-
-#~ msgid "Reopen"
-#~ msgstr "Znovu otevřít"
-
-#~ msgid ""
-#~ "Set the end volume. XMMS-crossfade will fade from 100% to this volume "
-#~ "during the time specified above.\n"
-#~ "Default: 0"
-#~ msgstr ""
-#~ "Zadejte koncovou hlasitost. Crossfade ztiší hudbu ze sta procent na tuto "
-#~ "hodnotu během výše specifikované doby.\n"
-#~ "Standardně: 0"
-
-#~ msgid ""
-#~ "Set the maximum length for gaps at the beginning of a stream.\n"
-#~ "Default: 500"
-#~ msgstr ""
-#~ "Zadejte maximální délku pauzy na začátku skladby.\n"
-#~ "Standardně: 500"
-
-#~ msgid ""
-#~ "Set the maximum length for gaps at the end of a stream.\n"
-#~ "Default: 500"
-#~ msgstr ""
-#~ "Zadejte maximální délku pauzy na konci skladby.\n"
-#~ "Standardně: 500"
-
-#~ msgid ""
-#~ "Set the maximum volume for gaps at the beginning of a stream. All samples "
-#~ "below this value are considered as silent.\n"
-#~ "Default: 512"
-#~ msgstr ""
-#~ "Zadejte maximální hlasitost určující mezeru na začátku skladby. Všechny "
-#~ "vzorky pod touto hodnotou budou považovány za ticho.\n"
-#~ "Standardně: 512"
-
-#~ msgid ""
-#~ "Set the maximum volume for gaps at the end of a stream. All samples below "
-#~ "this value are considered as silent.\n"
-#~ "Default: 512"
-#~ msgstr ""
-#~ "Zadejte nejvyšší hlasitost určující mezeru na konci skladby. Všechny "
-#~ "vzorky pod touto hodnotou budou považovány za ticho.\n"
-#~ "Standardně: 512"
-
-#~ msgid ""
-#~ "Set the start volume. XMMS-crossfade will fade from this volume to 100% "
-#~ "during the time specified above.\n"
-#~ "Default: 0"
-#~ msgstr ""
-#~ "Zadejte počáteční hlasitost. Crossfade bude hlasitost zesilovat od této "
-#~ "hodnoty na 100% hlasitost během doby specifikované výše.\n"
-#~ "Standardně: 0"
-
-#~ msgid "Show Buffer Monitor"
-#~ msgstr "Zapnout sledování vyrovnávací paměti"
-
-#~ msgid "Silence (ms):"
-#~ msgstr "Ticho (ms):"
-
-#~ msgid "Software Mixer"
-#~ msgstr "Softwarový mixér"
-
-#~ msgid "Start volume (%):"
-#~ msgstr "Počáteční hlasitost (%):"
-
-#~ msgid "Use plugin"
-#~ msgstr "Použít modul"
-
-#~ msgid "Volume control options"
-#~ msgstr "Nastavení ovládání hlasitosti"
-
-#~ msgid "Volume normalizer"
-#~ msgstr "Normalizace hlasitosti"
-
-#~ msgid "Write debug output to <stderr>"
-#~ msgstr "Vypisovat chyby na <stderr>"
-
-#~ msgid ""
-#~ "You do not need to press 'Apply' after making changes to the effect "
-#~ "plugin settings. It may take a while though until you can hear the "
-#~ "change, since the plugin is applied before the mixing buffer."
-#~ msgstr ""
-#~ "Změny v nastavení modulu aktivujete tlačítkem ‚Použít‘. Protože změny se "
-#~ "projeví až na nových datech ve vyrovnávací paměti, může chvíli trvat, než "
-#~ "je uslyšíte."
-
-#~ msgid "same file"
-#~ msgstr "shodný soubor"
-
-#~ msgid ""
-#~ "Libvisual Audacious Plugin\n"
-#~ "\n"
-#~ "Copyright (C) 2004, Duilio Protti <dprotti@users.sourceforge.net>\n"
-#~ "Dennis Smit <ds@nerds-incorporated.org>\n"
-#~ "\n"
-#~ "The Libvisual Audacious Plugin, more information about Libvisual can be "
-#~ "found at\n"
-#~ "http://libvisual.sf.net\n"
-#~ msgstr ""
-#~ "Modul Libvisual programu Audacious\n"
-#~ "\n"
-#~ "Copyright (C) 2004, Duilio Protti <dprotti@users.sourceforge.net>\n"
-#~ "Dennis Smit <ds@nerds-incorporated.org>\n"
-#~ "\n"
-#~ "Libvisual Audacious Plugin, více informací o modulu Libvisual naleznete "
-#~ "na\n"
-#~ "http://libvisual.sf.net\n"
-
-#~ msgid ""
-#~ "Brazilian Portuguese: Gustavo Sverzut Barbieri\n"
-#~ "Dutch: Dennis Smit\n"
-#~ "French: Jean-Christophe Hoelt\n"
-#~ "Spanish: Duilio Protti\n"
-#~ msgstr ""
-#~ "Brazilská portugalština: Gustavo Sverzut Barbieri\n"
-#~ "Holandština: Dennis Smit\n"
-#~ "Francouzština: Jean-Christophe Hoelt\n"
-#~ "Španělština: Duilio Protti\n"
-
-#~ msgid "LibVisual Audacious Plugin"
-#~ msgstr "Modul LibVisual"
-
-#~ msgid "Visualization Plugins"
-#~ msgstr "Vizualizační moduly"
-
-#~ msgid "Enable/Disable"
-#~ msgstr "Povolit/zakázat"
-
-#~ msgid "Fullscreen"
-#~ msgstr "Na celou obrazovku"
-
-#~ msgid ""
-#~ "You can toggle between normal and fullscreen mode pressing key TAB or F11"
-#~ msgstr ""
-#~ "Mezi normálním a celoobrazovkovým režimem můžete přepínat klávesami Tab "
-#~ "nebo F11."
-
-#~ msgid "All plugins"
-#~ msgstr "Všechny moduly"
-
-#~ msgid "Only non GL plugins"
-#~ msgstr "Jen moduly bez GL"
-
-#~ msgid "Only GL plugins"
-#~ msgstr "Jen GL moduly"
-
-#~ msgid "Maximum Frames Per Second:"
-#~ msgstr "Maximum snímků za sekundu:"
-
-#~ msgid "All plugins enabled"
-#~ msgstr "Všechny moduly povoleny"
-
-#~ msgid " (enabled)"
-#~ msgstr "(povolený)"
-
-#~ msgid "Version: "
-#~ msgstr "Verze:"
-
-#~ msgid "Author: "
-#~ msgstr "Autor:"
-
-#~ msgid " error"
-#~ msgstr "chyba"
-
-#~ msgid "There is no info for this plugin"
-#~ msgstr "K tomuto modulu nejsou žádné informace."
-
-#~ msgid "Audacious plugin"
-#~ msgstr "Modul Audacious"
-
-#~ msgid "Cannot initialize SDL!\n"
-#~ msgstr "Nepodařilo se inicializovat SDL.\n"
-
-#~ msgid " will not be loaded."
-#~ msgstr " nebude načten."
-
-#~ msgid "Last plugin: %s"
-#~ msgstr "Poslední modul: %s"
-
-#~ msgid "DISABLE ALWAYS ON TOP (N/A)"
-#~ msgstr "ZAKÁZAT FCI \"VŽDY NA VRCHU\" (N/A)"
-
-#~ msgid "ENABLE ALWAYS ON TOP (N/A)"
-#~ msgstr "POVOLIT FCI \"VŽDY NA VRCHU\" (N/A)"
-
-#~ msgid "Downsample:"
-#~ msgstr "Snížit vzorkovací kmitočet:"
-
-#~ msgid "%s - BMP"
-#~ msgstr "%s - BMP"
-
-#~ msgid "bmp: %s"
-#~ msgstr "bmp: %s"
-
-#~ msgid "Add Folders"
-#~ msgstr "Přidat adresáře"
-
-#~ msgid "3DNow! optimized decoder"
-#~ msgstr "Dekodér optimalizovaný pro 3DNow!"
-
-#~ msgid "MMX optimized decoder"
-#~ msgstr "Dekodér optimalizovaný pro MMX"
-
-#~ msgid "FPU decoder"
-#~ msgstr "FPU dekodér"
-
-#~ msgid ""
-#~ "mpg123 decoding engine by Michael Hipp <mh@mpg123.de>\n"
-#~ "Plugin by The XMMS team"
-#~ msgstr ""
-#~ "mpg123 dekodér vytvořil Michael Hipp <mh@mpg123.de>\n"
-#~ "Modul pochází od The XMMS team"
-
-#~ msgid "Advanced settings:"
-#~ msgstr "Pokročilé nastavení:"
-
-#~ msgid "Mmap mode"
-#~ msgstr "Mód mmap"
-
-#~ msgid "Homepage and Graphics:"
-#~ msgstr "Webové stránky a grafika:"
-
-#~ msgid "Takeshi Aihana"
-#~ msgstr "Takeshi Aihana"
-
-#~ msgid "BMP Equalizer"
-#~ msgstr "BMP ekvalizér"
-
-#~ msgid "Beep Media Player"
-#~ msgstr "Beep Media Player"
-
-#~ msgid "/About BMP"
-#~ msgstr "/O BMP"
-
-#~ msgid "BMP"
-#~ msgstr "BMP"
-
-#~ msgid "Add Internet Address"
-#~ msgstr "Přidat internetovou adresu"
-
-#~ msgid "*"
-#~ msgstr "*"
-
-#~ msgid "Vlad Gerasimov"
-#~ msgstr "Vlad Gerasimov"
-
-#~ msgid "/By extension"
-#~ msgstr "/Podle přípony"

audacious-3.1.1.tar.bz2/po/de.po -> audacious-3.2.4.tar.bz2/po/de.po Changed

@@ -1,9 +1,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious\n"
-"Report-Msgid-Bugs-To: http://jira.atheme.org/\n"
-"POT-Creation-Date: 2011-10-27 13:54+0200\n"
-"PO-Revision-Date: 2011-10-27 13:55+0000\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2012-01-15 02:23+0100\n"
+"PO-Revision-Date: 2012-01-15 02:25+0000\n"
 "Last-Translator: Thomas Lange\n"
 "Language-Team: German\n"
 "Language: de\n"
@@ -12,275 +12,279 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/audacious/adder.c:71
+#: src/audacious/adder.c:77
 msgid "Searching ..."
 msgstr "Suche ..."
 
-#: src/audacious/adder.c:97
+#: src/audacious/adder.c:113
 #, c-format
 msgid "%d file found"
 msgid_plural "%d files found"
 msgstr[0] "%d Datei gefunden"
 msgstr[1] "%d Dateien gefunden"
 
-#: src/audacious/chardet.c:38
+#: src/audacious/chardet.c:39
 msgid " (invalid UTF-8)"
 msgstr " (ungültiges UTF-8)"
 
-#: src/audacious/credits.c:35
+#: src/audacious/credits.c:37
 msgid "Core developers:"
 msgstr "Hauptentwickler:"
 
-#: src/audacious/credits.c:49
+#: src/audacious/credits.c:51
 msgid "Graphics:"
 msgstr "Grafiken:"
 
-#: src/audacious/credits.c:54
+#: src/audacious/credits.c:56
 msgid "Default skin:"
 msgstr "Standard-Skin:"
 
-#: src/audacious/credits.c:60
+#: src/audacious/credits.c:62
 msgid "Plugin development:"
 msgstr "Plugin-Entwicklung:"
 
-#: src/audacious/credits.c:83
+#: src/audacious/credits.c:85
 msgid "Patch authors:"
 msgstr "Patch-Autoren:"
 
-#: src/audacious/credits.c:126
+#: src/audacious/credits.c:131
 msgid "1.x developers:"
 msgstr "1.x-Entwickler:"
 
-#: src/audacious/credits.c:148
+#: src/audacious/credits.c:153
 msgid "BMP Developers:"
 msgstr "BMP-Entwickler:"
 
-#: src/audacious/credits.c:180
+#: src/audacious/credits.c:185
+msgid "Argentinian Spanish:"
+msgstr "Argentinisches Spanisch:"
+
+#: src/audacious/credits.c:188
 msgid "Belarusian:"
 msgstr "Weißrussisch:"
 
-#: src/audacious/credits.c:183
+#: src/audacious/credits.c:191
 msgid "Basque:"
 msgstr "Baskisch:"
 
-#: src/audacious/credits.c:186
+#: src/audacious/credits.c:194
 msgid "Brazilian Portuguese:"
 msgstr "Brasilianisches Portugiesisch:"
 
-#: src/audacious/credits.c:191
+#: src/audacious/credits.c:199
 msgid "Breton:"
 msgstr "Bretonisch:"
 
-#: src/audacious/credits.c:194
+#: src/audacious/credits.c:202
 msgid "Bulgarian:"
 msgstr "Bulgarisch:"
 
-#: src/audacious/credits.c:197
+#: src/audacious/credits.c:205
 msgid "Catalan:"
 msgstr "Katalanisch:"
 
-#: src/audacious/credits.c:200
+#: src/audacious/credits.c:209
 msgid "Chinese:"
 msgstr "Chinesisch:"
 
-#: src/audacious/credits.c:203
+#: src/audacious/credits.c:212
 msgid "Croatian:"
 msgstr "Kroatisch:"
 
-#: src/audacious/credits.c:206
+#: src/audacious/credits.c:215
 msgid "Czech:"
 msgstr "Tschechisch:"
 
-#: src/audacious/credits.c:209
+#: src/audacious/credits.c:218
 msgid "Dutch:"
 msgstr "Niederländisch:"
 
-#: src/audacious/credits.c:213
+#: src/audacious/credits.c:222
 msgid "Estonian:"
 msgstr "Estnisch:"
 
-#: src/audacious/credits.c:216
+#: src/audacious/credits.c:225
 msgid "Finnish:"
 msgstr "Finnisch:"
 
-#: src/audacious/credits.c:221
+#: src/audacious/credits.c:230
 msgid "French:"
 msgstr "Französisch:"
 
-#: src/audacious/credits.c:227
+#: src/audacious/credits.c:236
 msgid "German:"
 msgstr "Deutsch:"
 
-#: src/audacious/credits.c:234
+#: src/audacious/credits.c:243
 msgid "Georgian:"
 msgstr "Georgisch:"
 
-#: src/audacious/credits.c:237
+#: src/audacious/credits.c:246
 msgid "Greek:"
 msgstr "Griechisch:"
 
-#: src/audacious/credits.c:242
+#: src/audacious/credits.c:251
 msgid "Hindi:"
 msgstr "Hindi:"
 
-#: src/audacious/credits.c:245
+#: src/audacious/credits.c:254
 msgid "Hungarian:"
 msgstr "Ungarisch:"
 
-#: src/audacious/credits.c:249
+#: src/audacious/credits.c:258
 msgid "Italian:"
 msgstr "Italienisch:"
 
-#: src/audacious/credits.c:253
+#: src/audacious/credits.c:263
 msgid "Japanese:"
 msgstr "Japanisch:"
 
-#: src/audacious/credits.c:256
+#: src/audacious/credits.c:266
 msgid "Korean:"
 msgstr "Koreanisch:"
 
-#: src/audacious/credits.c:259
+#: src/audacious/credits.c:269
 msgid "Latvian:"
 msgstr "Lettisch:"
 
-#: src/audacious/credits.c:262
+#: src/audacious/credits.c:272
 msgid "Lithuanian:"
 msgstr "Litauisch:"
 
-#: src/audacious/credits.c:267
+#: src/audacious/credits.c:277
 msgid "Macedonian:"
 msgstr "Makedonisch:"
 
-#: src/audacious/credits.c:270
+#: src/audacious/credits.c:280
+msgid "Mexican Spanish:"
+msgstr "Mexikanisches Spanisch:"
+
+#: src/audacious/credits.c:283
 msgid "Polish:"
 msgstr "Polnisch:"
 
-#: src/audacious/credits.c:276
+#: src/audacious/credits.c:290
 msgid "Portuguese:"
 msgstr "Portugiesisch:"
 
-#: src/audacious/credits.c:279
+#: src/audacious/credits.c:293
 msgid "Romanian:"
 msgstr "Rumänisch:"
 
-#: src/audacious/credits.c:283
+#: src/audacious/credits.c:297
 msgid "Russian:"
 msgstr "Russisch:"
 
-#: src/audacious/credits.c:287
+#: src/audacious/credits.c:301
 msgid "Serbian (Latin):"
 msgstr "Serbisch (Latin):"
 
-#: src/audacious/credits.c:290
+#: src/audacious/credits.c:304
 msgid "Serbian (Cyrillic):"
 msgstr "Serbisch (Kyrillisch):"
 
-#: src/audacious/credits.c:293
+#: src/audacious/credits.c:308
 msgid "Simplified Chinese:"
 msgstr "Vereinfachtes Chinesisch:"
 
-#: src/audacious/credits.c:296
+#: src/audacious/credits.c:311
 msgid "Slovak:"
 msgstr "Slovakisch:"
 
-#: src/audacious/credits.c:299
+#: src/audacious/credits.c:315
 msgid "Spanish:"
 msgstr "Spanisch:"
 
-#: src/audacious/credits.c:306
+#: src/audacious/credits.c:324
 msgid "Swedish:"
 msgstr "Schwedisch:"
 
-#: src/audacious/credits.c:309
+#: src/audacious/credits.c:327
 msgid "Traditional Chinese:"
 msgstr "Traditionelles Chinesisch:"
 
-#: src/audacious/credits.c:315
+#: src/audacious/credits.c:333
 msgid "Turkish:"
 msgstr "Türkisch:"
 
-#: src/audacious/credits.c:319
+#: src/audacious/credits.c:337
 msgid "Ukrainian:"
 msgstr "Ukrainisch:"
 
-#: src/audacious/credits.c:323
+#: src/audacious/credits.c:342
 msgid "Vietnamese:"
 msgstr "Vietnamesisch:"
 
-#: src/audacious/credits.c:326
+#: src/audacious/credits.c:345
 msgid "Welsh:"
 msgstr "Walisisch:"
 
-#: src/audacious/drct.c:234
-msgid "Temporary Playlist"
-msgstr "Temporäre Wiedergabeliste"
-
-#: src/audacious/equalizer_preset.c:186
+#: src/audacious/equalizer_preset.c:180
 #, c-format
 msgid "Error importing Winamp EQF file '%s'"
 msgstr "Fehler beim Import der Winamp-EQF-Datei '%s'"
 
-#: src/audacious/main.c:239
+#: src/audacious/main.c:243
 msgid "Skip backwards in playlist"
 msgstr "In der Wiedergabeliste zurückspringen"
 
-#: src/audacious/main.c:240
+#: src/audacious/main.c:244
 msgid "Start playing current playlist"
 msgstr "Abspielen der aktuellen Wiedergabeliste beginnen"
 
-#: src/audacious/main.c:241
+#: src/audacious/main.c:245
 msgid "Pause current song"
 msgstr "Aktuellen Song unterbrechen"
 
-#: src/audacious/main.c:242
+#: src/audacious/main.c:246
 msgid "Stop current song"
 msgstr "Aktuellen Song stoppen"
 
-#: src/audacious/main.c:243
+#: src/audacious/main.c:247
 msgid "Pause if playing, play otherwise"
 msgstr "Pause falls beim Abspielen, andernfalls Wiedergabe starten"
 
-#: src/audacious/main.c:244
+#: src/audacious/main.c:248
 msgid "Skip forward in playlist"
 msgstr "In der Wiedergabeliste vorspringen"
 
-#: src/audacious/main.c:245
+#: src/audacious/main.c:249
 msgid "Display Jump to File dialog"
 msgstr "«Springe zu Datei»-Fenster anzeigen"
 
-#: src/audacious/main.c:246
+#: src/audacious/main.c:250
 msgid "Add files to the playlist"
 msgstr "Dateien zur Wiedergabeliste hinzufügen"
 
-#: src/audacious/main.c:247
+#: src/audacious/main.c:251
 msgid "Add new files to a temporary playlist"
 msgstr "Dateien zu temporärer Wiedergabeliste hinzufügen"
 
-#: src/audacious/main.c:248
+#: src/audacious/main.c:252
 msgid "Display the main window"
 msgstr "Hauptfenster anzeigen"
 
-#: src/audacious/main.c:249
+#: src/audacious/main.c:253
 msgid "Show version"
 msgstr "Zeige Version"
 
-#: src/audacious/main.c:250
+#: src/audacious/main.c:254
 msgid "Print debugging messages"
 msgstr "Debug-Meldungen anzeigen"
 
-#: src/audacious/main.c:251
+#: src/audacious/main.c:255
 msgid "Headless mode (beta)"
 msgstr "Headless-Modus (Beta)"
 
-#: src/audacious/main.c:252
+#: src/audacious/main.c:256
 msgid "FILE..."
 msgstr "DATEI..."
 
-#: src/audacious/main.c:264
+#: src/audacious/main.c:268
 msgid "- play multimedia files"
 msgstr " - Multimediadateien wiedergeben"
 
-#: src/audacious/main.c:274
+#: src/audacious/main.c:278
 #, c-format
 msgid ""
 "%s: %s\n"
@@ -289,294 +293,312 @@
 "%s: %s\n"
 "`%s --help' für weitere Informationen versuchen.\n"
 
-#: src/audacious/main.c:547
+#: src/audacious/main.c:573
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/audacious/playback.c:303
+#: src/audacious/playback.c:307
 #, c-format
 msgid "No decoder found for %s."
 msgstr "Kein Decoder gefunden für %s."
 
-#: src/audacious/playlist-new.c:315
-msgid "Untitled Playlist"
-msgstr "Unbenannte Wiedergabeliste"
+#: src/audacious/playlist-files.c:53
+#, c-format
+msgid "Cannot %s %s: unsupported file extension."
+msgstr "%s von %s nicht möglich: nicht unterstützte Dateiendung."
+
+#: src/audacious/playlist-files.c:54
+msgid "save"
+msgstr "Speichern"
 
-#: src/audacious/playlist-new.c:1496
+#: src/audacious/playlist-files.c:54
+msgid "load"
+msgstr "Laden"
+
+#: src/audacious/playlist-new.c:131
+msgid "New Playlist"
+msgstr "Neue Wiedergabeliste"
+
+#: src/audacious/playlist-new.c:132
+msgid "Now Playing"
+msgstr "Momentane Wiedergabe"
+
+#: src/audacious/playlist-new.c:1630
 msgid ""
 "The playlist cannot be sorted because metadata scanning is still in progress "
 "(or has been disabled)."
-msgstr "Die Wiedergabeliste kann nicht sortiert werden, weil das Scannen der "
+msgstr ""
+"Die Wiedergabeliste kann nicht sortiert werden, weil das Scannen der "
 "Metadaten noch aktiv ist (oder deaktiviert wurde)."
 
-#: src/audacious/ui_preferences.c:88
+#: src/audacious/ui_preferences.c:85
 msgid "Audio"
 msgstr "Audio"
 
-#: src/audacious/ui_preferences.c:89
+#: src/audacious/ui_preferences.c:86
 msgid "Network"
 msgstr "Netzwerk"
 
-#: src/audacious/ui_preferences.c:90 src/audacious/ui_preferences.c:1634
+#: src/audacious/ui_preferences.c:87 src/audacious/ui_preferences.c:1603
 msgid "Playlist"
 msgstr ""
 "Wiedergabe-\n"
 "Liste"
 
-#: src/audacious/ui_preferences.c:91
+#: src/audacious/ui_preferences.c:88
 msgid "Plugins"
 msgstr "Plugins"
 
-#: src/audacious/ui_preferences.c:97 src/libaudgui/infopopup.c:203
+#: src/audacious/ui_preferences.c:94 src/libaudgui/infopopup.c:199
 msgid "Artist"
 msgstr "Künstler"
 
-#: src/audacious/ui_preferences.c:98 src/libaudgui/infopopup.c:205
+#: src/audacious/ui_preferences.c:95 src/libaudgui/infopopup.c:201
 msgid "Album"
 msgstr "Album"
 
-#: src/audacious/ui_preferences.c:99 src/libaudgui/infopopup.c:201
-#: src/libaudgui/ui_playlist_manager.c:276
+#: src/audacious/ui_preferences.c:96 src/libaudgui/infopopup.c:197
+#: src/libaudgui/ui_playlist_manager.c:279
 msgid "Title"
 msgstr "Titel"
 
-#: src/audacious/ui_preferences.c:100
+#: src/audacious/ui_preferences.c:97
 msgid "Tracknumber"
 msgstr "Titelnummer"
 
-#: src/audacious/ui_preferences.c:101 src/libaudgui/infopopup.c:207
+#: src/audacious/ui_preferences.c:98 src/libaudgui/infopopup.c:203
 msgid "Genre"
 msgstr "Genre"
 
-#: src/audacious/ui_preferences.c:102
+#: src/audacious/ui_preferences.c:99
 msgid "Filename"
 msgstr "Dateiname"
 
-#: src/audacious/ui_preferences.c:103
+#: src/audacious/ui_preferences.c:100
 msgid "Filepath"
 msgstr "Dateipfad"
 
-#: src/audacious/ui_preferences.c:104
+#: src/audacious/ui_preferences.c:101
 msgid "Date"
 msgstr "Datum"
 
-#: src/audacious/ui_preferences.c:105 src/libaudgui/infopopup.c:209
+#: src/audacious/ui_preferences.c:102 src/libaudgui/infopopup.c:205
 msgid "Year"
 msgstr "Jahr"
 
-#: src/audacious/ui_preferences.c:106
+#: src/audacious/ui_preferences.c:103
 msgid "Comment"
 msgstr "Kommentar"
 
-#: src/audacious/ui_preferences.c:107
+#: src/audacious/ui_preferences.c:104
 msgid "Codec"
 msgstr "Codec"
 
-#: src/audacious/ui_preferences.c:108
+#: src/audacious/ui_preferences.c:105
 msgid "Quality"
 msgstr "Qualität"
 
-#: src/audacious/ui_preferences.c:114
+#: src/audacious/ui_preferences.c:111
 msgid "None"
 msgstr "Keine"
 
-#: src/audacious/ui_preferences.c:115
+#: src/audacious/ui_preferences.c:112
 msgid "Arabic"
 msgstr "Arabisch"
 
-#: src/audacious/ui_preferences.c:116
+#: src/audacious/ui_preferences.c:113
 msgid "Baltic"
 msgstr "Baltisch"
 
-#: src/audacious/ui_preferences.c:117
+#: src/audacious/ui_preferences.c:114
 msgid "Chinese"
 msgstr "Chinesisch"
 
-#: src/audacious/ui_preferences.c:118
+#: src/audacious/ui_preferences.c:115
 msgid "Greek"
 msgstr "Griechisch"
 
-#: src/audacious/ui_preferences.c:119
+#: src/audacious/ui_preferences.c:116
 msgid "Hebrew"
 msgstr "Hebräisch"
 
-#: src/audacious/ui_preferences.c:120
+#: src/audacious/ui_preferences.c:117
 msgid "Japanese"
 msgstr "Japanisch"
 
-#: src/audacious/ui_preferences.c:121
+#: src/audacious/ui_preferences.c:118
 msgid "Korean"
 msgstr "Koreanisch"
 
-#: src/audacious/ui_preferences.c:122
+#: src/audacious/ui_preferences.c:119
 msgid "Polish"
 msgstr "Polnisch"
 
-#: src/audacious/ui_preferences.c:123
+#: src/audacious/ui_preferences.c:120
 msgid "Russian"
 msgstr "Russisch"
 
-#: src/audacious/ui_preferences.c:124
+#: src/audacious/ui_preferences.c:121
 msgid "Taiwanese"
 msgstr "Taiwanisch"
 
-#: src/audacious/ui_preferences.c:125
+#: src/audacious/ui_preferences.c:122
 msgid "Turkish"
 msgstr "Türkisch"
 
-#: src/audacious/ui_preferences.c:147
+#: src/audacious/ui_preferences.c:144
 msgid "Album mode"
 msgstr "Album-Modus"
 
-#: src/audacious/ui_preferences.c:150
+#: src/audacious/ui_preferences.c:147
 msgid "Output Settings"
 msgstr "Ausgabe-Einstellungen"
 
-#: src/audacious/ui_preferences.c:152
+#: src/audacious/ui_preferences.c:149
 msgid "Bit depth:"
 msgstr "Bit-Tiefe:"
 
-#: src/audacious/ui_preferences.c:155
+#: src/audacious/ui_preferences.c:152
 msgid "Buffer size:"
 msgstr "Puffergröße:"
 
-#: src/audacious/ui_preferences.c:157
+#: src/audacious/ui_preferences.c:154
 msgid "ms"
 msgstr "ms"
 
-#: src/audacious/ui_preferences.c:158
+#: src/audacious/ui_preferences.c:155
 msgid "Use software volume control (not recommended)"
 msgstr "Softwareseitige Lautstärkeregelung benutzen (nicht empfohlen)"
 
-#: src/audacious/ui_preferences.c:160
+#: src/audacious/ui_preferences.c:157
 msgid "Replay Gain"
 msgstr "Wiedergabe-Verstärkung"
 
-#: src/audacious/ui_preferences.c:161
+#: src/audacious/ui_preferences.c:158
 msgid "Enable Replay Gain"
 msgstr "Wiedergabe-Verstärkung aktivieren"
 
-#: src/audacious/ui_preferences.c:164
+#: src/audacious/ui_preferences.c:161
 msgid "Prevent clipping (recommended)"
 msgstr "Übersteuern verhindern (empfohlen)"
 
-#: src/audacious/ui_preferences.c:166
+#: src/audacious/ui_preferences.c:163
 msgid "Adjust Levels"
 msgstr "Pegel anpassen"
 
-#: src/audacious/ui_preferences.c:167
+#: src/audacious/ui_preferences.c:164
 msgid "Amplify all files:"
 msgstr "Alle Dateien verstärken:"
 
-#: src/audacious/ui_preferences.c:169 src/audacious/ui_preferences.c:172
+#: src/audacious/ui_preferences.c:166 src/audacious/ui_preferences.c:169
 msgid "dB"
 msgstr "dB"
 
-#: src/audacious/ui_preferences.c:170
+#: src/audacious/ui_preferences.c:167
 msgid "Amplify untagged files:"
 msgstr "Unmarkierte Dateien verstärken:"
 
-#: src/audacious/ui_preferences.c:175
+#: src/audacious/ui_preferences.c:172
 msgid "Proxy hostname:"
 msgstr "Proxy-Host:"
 
-#: src/audacious/ui_preferences.c:176
+#: src/audacious/ui_preferences.c:173
 msgid "Proxy port:"
 msgstr "Proxy-Port:"
 
-#: src/audacious/ui_preferences.c:179
+#: src/audacious/ui_preferences.c:176
 msgid "Proxy username:"
 msgstr "Benutzername für Proxy:"
 
-#: src/audacious/ui_preferences.c:180
+#: src/audacious/ui_preferences.c:177
 msgid "Proxy password:"
 msgstr "Passwort für Proxy:"
 
-#: src/audacious/ui_preferences.c:184
+#: src/audacious/ui_preferences.c:181
 msgid "Proxy Configuration"
 msgstr "Proxy-Konfiguration"
 
-#: src/audacious/ui_preferences.c:185
+#: src/audacious/ui_preferences.c:182
 msgid "Enable proxy usage"
 msgstr "Proxy aktivieren"
 
-#: src/audacious/ui_preferences.c:188
+#: src/audacious/ui_preferences.c:185
 msgid "Use authentication with proxy"
 msgstr "Benutze Authentisierung mit Proxy"
 
-#: src/audacious/ui_preferences.c:196
+#: src/audacious/ui_preferences.c:193
 msgid "Auto character encoding detector for:"
 msgstr "Automatische Zeichensatzerkennung für:"
 
-#: src/audacious/ui_preferences.c:201
+#: src/audacious/ui_preferences.c:198
 msgid "Fallback character encodings:"
 msgstr "Alternative Zeichensätze:"
 
-#: src/audacious/ui_preferences.c:205
+#: src/audacious/ui_preferences.c:202
 msgid "Behavior"
 msgstr "Verhalten"
 
-#: src/audacious/ui_preferences.c:206
+#: src/audacious/ui_preferences.c:203
 msgid "Continue playback on startup"
 msgstr "Wiedergabe beim Starten fortführen"
 
-#: src/audacious/ui_preferences.c:208
+#: src/audacious/ui_preferences.c:205
 msgid "Advance when the current song is deleted"
 msgstr "Fortschreiten falls aktueller Titel gelöscht wird"
 
-#: src/audacious/ui_preferences.c:210
+#: src/audacious/ui_preferences.c:207
 msgid "Clear the playlist when opening files"
 msgstr "Wiedergabeliste beim Öffnen neuer Dateien leeren"
 
-#: src/audacious/ui_preferences.c:212
+#: src/audacious/ui_preferences.c:209
 msgid "Open files in a temporary playlist"
 msgstr "Dateien in temporärer Wiedergabeliste öffnen"
 
-#: src/audacious/ui_preferences.c:214
+#: src/audacious/ui_preferences.c:211
 msgid "Metadata"
 msgstr "Metadaten"
 
-#: src/audacious/ui_preferences.c:215
+#: src/audacious/ui_preferences.c:212
 msgid "Do not load metadata for songs until played"
 msgstr "Metadaten erst laden, wenn Titel gespielt wird"
 
-#: src/audacious/ui_preferences.c:233
+#: src/audacious/ui_preferences.c:230
 msgid "TITLE"
 msgstr "TITEL"
 
-#: src/audacious/ui_preferences.c:234
+#: src/audacious/ui_preferences.c:231
 msgid "ARTIST - TITLE"
 msgstr "KÜNSTLER - TITEL"
 
-#: src/audacious/ui_preferences.c:235
+#: src/audacious/ui_preferences.c:232
 msgid "ARTIST - ALBUM - TITLE"
 msgstr "KÜNSTLER - ALBUM - TITEL"
 
-#: src/audacious/ui_preferences.c:236
+#: src/audacious/ui_preferences.c:233
 msgid "ARTIST - ALBUM - TRACK. TITLE"
 msgstr "KÜNSTLER - ALBUM - TITELNUMMER. TITEL"
 
-#: src/audacious/ui_preferences.c:237
+#: src/audacious/ui_preferences.c:234
 msgid "ARTIST [ ALBUM ] - TRACK. TITLE"
 msgstr "KÜNSTLER [ ALBUM ] - TITELNUMMER. TITEL"
 
-#: src/audacious/ui_preferences.c:238
+#: src/audacious/ui_preferences.c:235
 msgid "ALBUM - TITLE"
 msgstr "ALBUM - TITEL"
 
-#: src/audacious/ui_preferences.c:577
+#: src/audacious/ui_preferences.c:556
 msgid "Category"
 msgstr "Kategorie"
 
-#: src/audacious/ui_preferences.c:801
+#: src/audacious/ui_preferences.c:780
 msgid "Popup Information Settings"
 msgstr "Popup-Informations-Einstellungen"
 
-#: src/audacious/ui_preferences.c:810
+#: src/audacious/ui_preferences.c:789
 msgid "Cover image retrieve"
 msgstr "Cover-Bild finden"
 
-#: src/audacious/ui_preferences.c:815
+#: src/audacious/ui_preferences.c:794
 msgid ""
 "While searching for the album's cover, Audacious looks for certain words in "
 "the filename. You can specify those words in the lists below, separated "
@@ -586,75 +608,75 @@
 "Dateinamen. Diese können nachfolgend eingegeben werden, jeweils durch Kommas "
 "getrennt."
 
-#: src/audacious/ui_preferences.c:832
+#: src/audacious/ui_preferences.c:811
 msgid "Exclude:"
 msgstr "Ausschließen:"
 
-#: src/audacious/ui_preferences.c:839
+#: src/audacious/ui_preferences.c:818
 msgid "Include:"
 msgstr "Einschließen:"
 
-#: src/audacious/ui_preferences.c:856
+#: src/audacious/ui_preferences.c:835
 msgid "Recursively search for cover"
 msgstr "Rekursiv nach dem Titelbild suchen"
 
-#: src/audacious/ui_preferences.c:866
+#: src/audacious/ui_preferences.c:845
 msgid "Search depth: "
 msgstr "Suchtiefe: "
 
-#: src/audacious/ui_preferences.c:880
+#: src/audacious/ui_preferences.c:859
 msgid "Use per-file cover"
 msgstr "Pro-Datei-Titelbild benutzen"
 
-#: src/audacious/ui_preferences.c:883
+#: src/audacious/ui_preferences.c:862
 msgid "Miscellaneous"
 msgstr "Verschiedenes"
 
-#: src/audacious/ui_preferences.c:892
+#: src/audacious/ui_preferences.c:871
 msgid "Show Progress bar for the current track"
 msgstr "Zeige Fortschrittsbalken für den aktuellen Titel"
 
-#: src/audacious/ui_preferences.c:902
+#: src/audacious/ui_preferences.c:881
 msgid "Delay until filepopup comes up: "
 msgstr "Verzögerung bis zum Erscheinen des Popups: "
 
-#: src/audacious/ui_preferences.c:1340
+#: src/audacious/ui_preferences.c:1309
 msgid "Custom"
 msgstr "Eigene Zeichenkette"
 
-#: src/audacious/ui_preferences.c:1383
+#: src/audacious/ui_preferences.c:1352
 msgid "Song Display"
 msgstr "Titelanzeige"
 
-#: src/audacious/ui_preferences.c:1392
+#: src/audacious/ui_preferences.c:1361
 msgid "Show song numbers"
 msgstr "Zeige Titelnummern"
 
-#: src/audacious/ui_preferences.c:1403
+#: src/audacious/ui_preferences.c:1372
 msgid "Show leading zeroes (02:00 instead of 2:00)"
 msgstr "Führende Nullen anzeigen (02:00 anstatt 2:00)"
 
-#: src/audacious/ui_preferences.c:1425
+#: src/audacious/ui_preferences.c:1394
 msgid "Show information about titlestring format"
 msgstr "Informationen über das Format der Titelzeile anzeigen"
 
-#: src/audacious/ui_preferences.c:1441
+#: src/audacious/ui_preferences.c:1410
 msgid "Custom string:"
 msgstr "Eigene Zeichenkette:"
 
-#: src/audacious/ui_preferences.c:1448
+#: src/audacious/ui_preferences.c:1417
 msgid "Title format:"
 msgstr "Titelformat:"
 
-#: src/audacious/ui_preferences.c:1459
+#: src/audacious/ui_preferences.c:1428
 msgid "Popup Information"
 msgstr "Popup-Information"
 
-#: src/audacious/ui_preferences.c:1474
+#: src/audacious/ui_preferences.c:1443
 msgid "Show popup information for playlist entries"
 msgstr "Popup-Informationen für Widergabelisteneinträge anzeigen"
 
-#: src/audacious/ui_preferences.c:1475
+#: src/audacious/ui_preferences.c:1444
 msgid ""
 "Toggles popup information window for the pointed entry in the playlist. The "
 "window shows title of song, name of album, genre, year of publish, track "
@@ -665,67 +687,84 @@
 "werden Titel, Album, Genre, Publikationsjahr, Titelnummer, Titellänge und "
 "Cover-Bild."
 
-#: src/audacious/ui_preferences.c:1486
+#: src/audacious/ui_preferences.c:1455
 msgid "Edit settings for popup information"
 msgstr "Einstellungen für Popup-Informationen bearbeiten"
 
-#: src/audacious/ui_preferences.c:1575
+#: src/audacious/ui_preferences.c:1544
 msgid "Output plugin:"
 msgstr "Ausgabe-Plugin:"
 
-#: src/audacious/ui_preferences.c:1634
+#: src/audacious/ui_preferences.c:1603
 msgid "Transport"
 msgstr "Transport"
 
-#: src/audacious/ui_preferences.c:1634
+#: src/audacious/ui_preferences.c:1603
 msgid "Input"
 msgstr "Eingabe"
 
-#: src/audacious/ui_preferences.c:1635
+#: src/audacious/ui_preferences.c:1604
 msgid "Effect"
 msgstr "Effekte"
 
-#: src/audacious/ui_preferences.c:1635
+#: src/audacious/ui_preferences.c:1604
 msgid "Visualization"
 msgstr "Visualisierung"
 
-#: src/audacious/ui_preferences.c:1635
+#: src/audacious/ui_preferences.c:1604
 msgid "General"
 msgstr "Allgemein"
 
-#: src/audacious/ui_preferences.c:1675
+#: src/audacious/ui_preferences.c:1644
 msgid "Audacious Preferences"
 msgstr "Audacious-Einstellungen"
 
-#: src/audacious/util.c:123
+#: src/audacious/util.c:120
 #, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr "Konnte Verzeichnis (%s) nicht erstellen: %s\n"
 
-#: src/audtool/handlers_playlist.c:274
+#: src/audtool/handlers_playlist.c:273
 msgid "Position not found."
 msgstr "Position nicht gefunden."
 
-#: src/audtool/handlers_vitals.c:64
+#: src/audtool/handlers_vitals.c:63
 msgid "No song playing."
 msgstr "Kein Titel wird wiedergegeben."
 
-#: src/libaudcore/tuple.c:685
+#: src/libaudcore/audstrings.c:199
+#, c-format
+msgid "Audio CD, track %s"
+msgstr "Audio-CD, Titel %s"
+
+#: src/libaudcore/tuple.c:536
 msgid "Mono"
 msgstr "Mono"
 
-#: src/libaudcore/tuple.c:687
+#: src/libaudcore/tuple.c:538
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/libaudcore/tuple.c:689
+#: src/libaudcore/tuple.c:540
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d Kanal"
 msgstr[1] "%d Kanäle"
 
-#: src/libaudgui/confirm.c:78
+#: src/libaudgui/about.c:52 src/libaudgui/about.c:115
+msgid "Credits"
+msgstr "Credits"
+
+#: src/libaudgui/about.c:52
+msgid "Translators"
+msgstr "Übersetzer"
+
+#: src/libaudgui/about.c:91
+msgid "About Audacious"
+msgstr "Über Audacious"
+
+#: src/libaudgui/confirm.c:76
 #, c-format
 msgid ""
 "Are you sure you want to close %s? If you do, any changes made since the "
@@ -734,338 +773,326 @@
 "Wollen Sie wirklich '%s' löschen? Alle seit der letzten Speicherung "
 "geänderten Einträge gehen dadurch verloren."
 
-#: src/libaudgui/confirm.c:91
+#: src/libaudgui/confirm.c:89
 msgid "_Don't show this message again"
 msgstr "_Diese Warnung nicht mehr anzeigen"
 
-#: src/libaudgui/confirm.c:128
+#: src/libaudgui/confirm.c:126
 msgid "Rename Playlist"
 msgstr "Wiedergabeliste umbenennen"
 
-#: src/libaudgui/effects-menu.c:76
+#: src/libaudgui/effects-menu.c:74
 msgid "settings ..."
 msgstr "Einstellungen ..."
 
-#: src/libaudgui/equalizer.c:52
+#: src/libaudgui/equalizer.c:51
 msgid "_Enable"
 msgstr "_Aktiv"
 
-#: src/libaudgui/equalizer.c:124
+#: src/libaudgui/equalizer.c:123
 msgid "31 Hz"
 msgstr "31 Hz"
 
-#: src/libaudgui/equalizer.c:124
+#: src/libaudgui/equalizer.c:123
 msgid "63 Hz"
 msgstr "63 Hz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "125 Hz"
 msgstr "125 Hz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "250 Hz"
 msgstr "250 Hz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "500 Hz"
 msgstr "500 Hz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "1 kHz"
 msgstr "1 kHz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "2 kHz"
 msgstr "2 kHz"
 
-#: src/libaudgui/equalizer.c:126
+#: src/libaudgui/equalizer.c:125
 msgid "4 kHz"
 msgstr "4 kHz"
 
-#: src/libaudgui/equalizer.c:126
+#: src/libaudgui/equalizer.c:125
 msgid "8 kHz"
 msgstr "8 kHz"
 
-#: src/libaudgui/equalizer.c:126
+#: src/libaudgui/equalizer.c:125
 msgid "16 kHz"
 msgstr "16 kHz"
 
-#: src/libaudgui/equalizer.c:131
+#: src/libaudgui/equalizer.c:130
 msgid "Equalizer"
 msgstr "Equalizer"
 
-#: src/libaudgui/equalizer.c:147
+#: src/libaudgui/equalizer.c:146
 msgid "Preamp"
 msgstr "Vorverstärkung"
 
-#: src/libaudgui/infopopup.c:211
+#: src/libaudgui/infopopup.c:207
 msgid "Track Number"
 msgstr "Titelnummer"
 
-#: src/libaudgui/infopopup.c:213
+#: src/libaudgui/infopopup.c:209
 msgid "Track Length"
 msgstr "Titellänge"
 
-#: src/libaudgui/infowin.c:77
+#: src/libaudgui/infowin.c:75
 msgid "Acid Jazz"
 msgstr "Acid Jazz"
 
-#: src/libaudgui/infowin.c:78
+#: src/libaudgui/infowin.c:76
 msgid "Acid Rock"
 msgstr "Psychedelic Rock"
 
-#: src/libaudgui/infowin.c:79
+#: src/libaudgui/infowin.c:77
 msgid "Ambient"
 msgstr "Ambient"
 
-#: src/libaudgui/infowin.c:80
+#: src/libaudgui/infowin.c:78
 msgid "Bebop"
 msgstr "Bebop"
 
-#: src/libaudgui/infowin.c:81
+#: src/libaudgui/infowin.c:79
 msgid "Bluegrass"
 msgstr "Bluegrass"
 
-#: src/libaudgui/infowin.c:82
+#: src/libaudgui/infowin.c:80
 msgid "Blues"
 msgstr "Blues"
 
-#: src/libaudgui/infowin.c:83
+#: src/libaudgui/infowin.c:81
 msgid "Chamber Music"
 msgstr "Kammermusik"
 
-#: src/libaudgui/infowin.c:84
+#: src/libaudgui/infowin.c:82
 msgid "Classical"
 msgstr "Klassisch"
 
-#: src/libaudgui/infowin.c:85
+#: src/libaudgui/infowin.c:83
 msgid "Country"
 msgstr "Country"
 
-#: src/libaudgui/infowin.c:86
+#: src/libaudgui/infowin.c:84
 msgid "Death Metal"
 msgstr "Death Metal"
 
-#: src/libaudgui/infowin.c:87
+#: src/libaudgui/infowin.c:85
 msgid "Disco"
 msgstr "Disco"
 
-#: src/libaudgui/infowin.c:88
+#: src/libaudgui/infowin.c:86
 msgid "Easy Listening"
 msgstr "Easy Listening"
 
-#: src/libaudgui/infowin.c:89
+#: src/libaudgui/infowin.c:87
 msgid "Folk"
 msgstr "Folk"
 
-#: src/libaudgui/infowin.c:90
+#: src/libaudgui/infowin.c:88
 msgid "Funk"
 msgstr "Funk"
 
-#: src/libaudgui/infowin.c:91
+#: src/libaudgui/infowin.c:89
 msgid "Gangsta Rap"
 msgstr "Gangsta Rap"
 
-#: src/libaudgui/infowin.c:92
+#: src/libaudgui/infowin.c:90
 msgid "Gospel"
 msgstr "Gospel"
 
-#: src/libaudgui/infowin.c:93
+#: src/libaudgui/infowin.c:91
 msgid "Grunge"
 msgstr "Grunge"
 
-#: src/libaudgui/infowin.c:94
+#: src/libaudgui/infowin.c:92
 msgid "Hard Rock"
 msgstr "Hard Rock"
 
-#: src/libaudgui/infowin.c:95
+#: src/libaudgui/infowin.c:93
 msgid "Heavy Metal"
 msgstr "Heavy Metal"
 
-#: src/libaudgui/infowin.c:96
+#: src/libaudgui/infowin.c:94
 msgid "Hip-hop"
 msgstr "Hip-Hop"
 
-#: src/libaudgui/infowin.c:97
+#: src/libaudgui/infowin.c:95
 msgid "House"
 msgstr "House"
 
-#: src/libaudgui/infowin.c:98
+#: src/libaudgui/infowin.c:96
 msgid "Jazz"
 msgstr "Jazz"
 
-#: src/libaudgui/infowin.c:99
+#: src/libaudgui/infowin.c:97
 msgid "Jungle"
 msgstr "Jungle"
 
-#: src/libaudgui/infowin.c:100
+#: src/libaudgui/infowin.c:98
 msgid "Metal"
 msgstr "Metal"
 
-#: src/libaudgui/infowin.c:101
+#: src/libaudgui/infowin.c:99
 msgid "New Age"
 msgstr "New Age"
 
-#: src/libaudgui/infowin.c:102
+#: src/libaudgui/infowin.c:100
 msgid "New Wave"
 msgstr "New Wave"
 
-#: src/libaudgui/infowin.c:103
+#: src/libaudgui/infowin.c:101
 msgid "Noise"
 msgstr "Noise"
 
-#: src/libaudgui/infowin.c:104
+#: src/libaudgui/infowin.c:102
 msgid "Pop"
 msgstr "Pop"
 
-#: src/libaudgui/infowin.c:105
+#: src/libaudgui/infowin.c:103
 msgid "Punk Rock"
 msgstr "Punk Rock"
 
-#: src/libaudgui/infowin.c:106
+#: src/libaudgui/infowin.c:104
 msgid "Rap"
 msgstr "Rap"
 
-#: src/libaudgui/infowin.c:107
+#: src/libaudgui/infowin.c:105
 msgid "Reggae"
 msgstr "Reggae"
 
-#: src/libaudgui/infowin.c:108
+#: src/libaudgui/infowin.c:106
 msgid "Rock"
 msgstr "Rock"
 
-#: src/libaudgui/infowin.c:109
+#: src/libaudgui/infowin.c:107
 msgid "Rock and Roll"
 msgstr "Rock & Roll"
 
-#: src/libaudgui/infowin.c:110
+#: src/libaudgui/infowin.c:108
 msgid "Rhythm and Blues"
 msgstr "Rhythm & Blues"
 
-#: src/libaudgui/infowin.c:111
+#: src/libaudgui/infowin.c:109
 msgid "Ska"
 msgstr "Ska"
 
-#: src/libaudgui/infowin.c:112
+#: src/libaudgui/infowin.c:110
 msgid "Soul"
 msgstr "Soul"
 
-#: src/libaudgui/infowin.c:113
+#: src/libaudgui/infowin.c:111
 msgid "Swing"
 msgstr "Swing"
 
-#: src/libaudgui/infowin.c:114
+#: src/libaudgui/infowin.c:112
 msgid "Techno"
 msgstr "Techno"
 
-#: src/libaudgui/infowin.c:115
+#: src/libaudgui/infowin.c:113
 msgid "Trip-hop"
 msgstr "Trip-Hop"
 
-#: src/libaudgui/infowin.c:175 src/libaudgui/infowin.c:361
-#: src/libaudgui/infowin.c:364 src/libaudgui/infowin.c:367
+#: src/libaudgui/infowin.c:177 src/libaudgui/infowin.c:363
+#: src/libaudgui/infowin.c:366 src/libaudgui/infowin.c:369
 msgid "n/a"
 msgstr "n/v"
 
-#: src/libaudgui/infowin.c:265
+#: src/libaudgui/infowin.c:267
 msgid "Metadata updated successfully"
 msgstr "Metadaten-Update erfolgreich"
 
-#: src/libaudgui/infowin.c:270
+#: src/libaudgui/infowin.c:272
 msgid "Metadata updating failed"
 msgstr "Metadaten-Update fehlgeschlagen"
 
-#: src/libaudgui/infowin.c:318
+#: src/libaudgui/infowin.c:320
 msgid "Track Information"
 msgstr "Titel-Information"
 
-#: src/libaudgui/infowin.c:350
+#: src/libaudgui/infowin.c:352
 msgid "Format:"
 msgstr "Format:"
 
-#: src/libaudgui/infowin.c:354
+#: src/libaudgui/infowin.c:356
 msgid "Quality:"
 msgstr "Qualität:"
 
-#: src/libaudgui/infowin.c:357
+#: src/libaudgui/infowin.c:359
 msgid "Bitrate:"
 msgstr "Bitrate:"
 
-#: src/libaudgui/infowin.c:387
+#: src/libaudgui/infowin.c:389
 msgid "Title"
 msgstr "Titel"
 
-#: src/libaudgui/infowin.c:399
+#: src/libaudgui/infowin.c:401
 msgid "Artist"
 msgstr "Künstler"
 
-#: src/libaudgui/infowin.c:411
+#: src/libaudgui/infowin.c:413
 msgid "Album"
 msgstr "Album"
 
-#: src/libaudgui/infowin.c:423
+#: src/libaudgui/infowin.c:425
 msgid "Comment"
 msgstr "Kommentar"
 
-#: src/libaudgui/infowin.c:435
+#: src/libaudgui/infowin.c:437
 msgid "Genre"
 msgstr "Genre"
 
-#: src/libaudgui/infowin.c:456
+#: src/libaudgui/infowin.c:458
 msgid "Year"
 msgstr "Jahr"
 
-#: src/libaudgui/infowin.c:467
+#: src/libaudgui/infowin.c:469
 msgid "Track Number"
 msgstr "Titelnummer"
 
-#: src/libaudgui/infowin.c:549
+#: src/libaudgui/infowin.c:548
 #, c-format
 msgid "%d kb/s"
 msgstr "%d kb/s"
 
-#: src/libaudgui/infowin.c:579
+#: src/libaudgui/infowin.c:575
 #, c-format
 msgid "No info available for %s.\n"
 msgstr "Keine Information verfügbar für %s.\n"
 
-#: src/libaudgui/jump-to-time.c:75
+#: src/libaudgui/jump-to-time.c:72
 msgid "Jump to Time"
 msgstr "Zu Zeitangabe springen"
 
-#: src/libaudgui/jump-to-time.c:90
+#: src/libaudgui/jump-to-time.c:87
 msgid "mm:ss"
 msgstr "min:sek"
 
-#: src/libaudgui/playlists.c:39
+#: src/libaudgui/playlists.c:33
 msgid "Export Playlist"
 msgstr "Wiedergabeliste exportieren"
 
-#: src/libaudgui/playlists.c:39
+#: src/libaudgui/playlists.c:33
 msgid "Import Playlist"
 msgstr "Wiedergabeliste importieren"
 
-#: src/libaudgui/playlists.c:72
+#: src/libaudgui/playlists.c:66
 #, c-format
 msgid "Overwrite %s?"
 msgstr "'%s' überschreiben?"
 
-#: src/libaudgui/queue-manager.c:185
+#: src/libaudgui/queue-manager.c:196
 msgid "Queue Manager"
 msgstr "Warteschlangen-Manager"
 
-#: src/libaudgui/ui_about.c:69
-msgid "About Audacious"
-msgstr "Über Audacious"
-
-#: src/libaudgui/ui_about.c:90 src/libaudgui/ui_credits.c:122
-msgid "Credits"
-msgstr "Credits"
-
-#: src/libaudgui/ui_credits.c:126
-msgid "Translators"
-msgstr "Übersetzer"
-
 #: src/libaudgui/ui_fileopener.c:109
 msgid "Open Files"
 msgstr "Dateien öffnen"
@@ -1082,60 +1109,60 @@
 msgid "Close dialog on Add"
 msgstr "Dialog beim Hinzufügen schließen"
 
-#: src/libaudgui/ui_jumptotrack.c:103 src/libaudgui/ui_jumptotrack.c:111
-#: src/libaudgui/ui_jumptotrack.c:322
+#: src/libaudgui/ui_jumptotrack.c:109 src/libaudgui/ui_jumptotrack.c:117
+#: src/libaudgui/ui_jumptotrack.c:326
 msgid "_Queue"
 msgstr "In _Warteschlange"
 
-#: src/libaudgui/ui_jumptotrack.c:109
+#: src/libaudgui/ui_jumptotrack.c:115
 msgid "Un_queue"
 msgstr "Aus _Warteschlange"
 
-#: src/libaudgui/ui_jumptotrack.c:239
-msgid "Jump to Track"
+#: src/libaudgui/ui_jumptotrack.c:258
+msgid "Jump to Song"
 msgstr "Zu Titel springen"
 
-#: src/libaudgui/ui_jumptotrack.c:277
+#: src/libaudgui/ui_jumptotrack.c:281
 msgid "Filter: "
 msgstr "Filter: "
 
-#: src/libaudgui/ui_jumptotrack.c:278
+#: src/libaudgui/ui_jumptotrack.c:282
 msgid "_Filter:"
 msgstr "_Filter:"
 
-#: src/libaudgui/ui_jumptotrack.c:288
+#: src/libaudgui/ui_jumptotrack.c:292
 msgid "Remember"
 msgstr "Merken"
 
-#: src/libaudgui/ui_jumptotrack.c:295
+#: src/libaudgui/ui_jumptotrack.c:299
 msgid "Clea_r"
 msgstr "A-B löschen"
 
-#: src/libaudgui/ui_jumptotrack.c:315
+#: src/libaudgui/ui_jumptotrack.c:319
 msgid "Close on Jump"
 msgstr "Nach Öffnen schließen"
 
-#: src/libaudgui/ui_playlist_manager.c:250
+#: src/libaudgui/ui_playlist_manager.c:253
 msgid "Playlist Manager"
 msgstr "Wiedergabelistenverwaltung"
 
-#: src/libaudgui/ui_playlist_manager.c:277
+#: src/libaudgui/ui_playlist_manager.c:280
 msgid "Entries"
 msgstr "Einträge"
 
-#: src/libaudgui/ui_playlist_manager.c:298
+#: src/libaudgui/ui_playlist_manager.c:301
 msgid "_Rename"
 msgstr "_Umbenennen"
 
-#: src/libaudgui/ui_playlist_manager.c:322
+#: src/libaudgui/ui_playlist_manager.c:325
 msgid "_Close dialog on activating playlist"
 msgstr "Dialog beim Öffnen einer Liste _schließen"
 
-#: src/libaudgui/ui_urlopener.c:51
+#: src/libaudgui/ui_urlopener.c:48
 msgid "Open URL"
 msgstr "URL öffnen"
 
-#: src/libaudgui/ui_urlopener.c:51
+#: src/libaudgui/ui_urlopener.c:48
 msgid "Add URL"
 msgstr "URL hinzufügen"
 
@@ -1151,30 +1178,30 @@
 msgid "File is not a valid .desktop file"
 msgstr "Datei ist keine gültige .desktop-Datei"
 
-#: src/libeggsmclient/eggdesktopfile.c:188
+#: src/libeggsmclient/eggdesktopfile.c:191
 #, c-format
 msgid "Unrecognized desktop file Version '%s'"
 msgstr "Unbekannte Desktop-Datei-Version '%s'"
 
-#: src/libeggsmclient/eggdesktopfile.c:967
+#: src/libeggsmclient/eggdesktopfile.c:974
 #, c-format
 msgid "Starting %s"
 msgstr "Starte %s"
 
-#: src/libeggsmclient/eggdesktopfile.c:1108
+#: src/libeggsmclient/eggdesktopfile.c:1116
 msgid "Application does not accept documents on command line"
 msgstr "Programm akzeptiert keine Dokumente auf der Kommandozeile"
 
-#: src/libeggsmclient/eggdesktopfile.c:1176
+#: src/libeggsmclient/eggdesktopfile.c:1184
 #, c-format
 msgid "Unrecognized launch option: %d"
 msgstr "Unbekannte Start-Option: %d"
 
-#: src/libeggsmclient/eggdesktopfile.c:1375
+#: src/libeggsmclient/eggdesktopfile.c:1391
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
 msgstr "Kann keine Dokument-URIs an einen 'Type=Link'-Desktopeintrag übergeben"
 
-#: src/libeggsmclient/eggdesktopfile.c:1396
+#: src/libeggsmclient/eggdesktopfile.c:1412
 msgid "Not a launchable item"
 msgstr "Ist nicht ausführbar"

audacious-3.1.1.tar.bz2/po/es.po -> audacious-3.2.4.tar.bz2/po/es.po Changed

@@ -3,19 +3,21 @@
 # This file is distributed under the same license as the Audacious package.
 #
 # Translators:
+# Adrián Ramirez Escalante <buried.prophet@gmail.com>, 2012.
 # Cosme Domínguez Díaz <cosme.ddiaz@gmail.com>, 2010.
 # Francisco Javier F. Serrador <serrador@cvs.gnome.org>, 2004.
 # Gustavo D. Vranjes <gvranjes@nerdshack.com>, 2006.
 # Jeki Sinneo Leinos <jeki72@gmail.com>, 2008.
+# Jordi Amenós <>, 2011.
 # Jorge Andrés <winninglero@gmail.com>, 2010.
 # <xukosky@yahoo.es>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious\n"
-"Report-Msgid-Bugs-To: http://jira.atheme.org/browse/AUD\n"
-"POT-Creation-Date: 2011-10-19 21:32-0400\n"
-"PO-Revision-Date: 2011-10-28 21:54+0000\n"
-"Last-Translator: xukosky <xukosky@yahoo.es>\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2012-01-11 08:54-0500\n"
+"PO-Revision-Date: 2012-01-12 04:11+0000\n"
+"Last-Translator: Adrián Ramirez Escalante <buried.prophet@gmail.com>\n"
 "Language-Team: Spanish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,275 +25,275 @@
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/audacious/adder.c:71
+#: src/audacious/adder.c:77
 msgid "Searching ..."
 msgstr "Buscando ..."
 
-#: src/audacious/adder.c:97
+#: src/audacious/adder.c:113
 #, c-format
 msgid "%d file found"
 msgid_plural "%d files found"
 msgstr[0] "%d archivo encontrado"
 msgstr[1] "%d archivos encontrados"
 
-#: src/audacious/chardet.c:38
+#: src/audacious/chardet.c:39
 msgid " (invalid UTF-8)"
 msgstr " (UTF-8 inválido)"
 
-#: src/audacious/credits.c:35
+#: src/audacious/credits.c:37
 msgid "Core developers:"
 msgstr "Desarrolladores del núcleo:"
 
-#: src/audacious/credits.c:49
+#: src/audacious/credits.c:51
 msgid "Graphics:"
 msgstr "Gráficos:"
 
-#: src/audacious/credits.c:54
+#: src/audacious/credits.c:56
 msgid "Default skin:"
 msgstr "Piel por defecto:"
 
-#: src/audacious/credits.c:60
+#: src/audacious/credits.c:62
 msgid "Plugin development:"
 msgstr "Desarrollo de complementos:"
 
-#: src/audacious/credits.c:83
+#: src/audacious/credits.c:85
 msgid "Patch authors:"
 msgstr "Autores de parches:"
 
-#: src/audacious/credits.c:126
+#: src/audacious/credits.c:131
 msgid "1.x developers:"
 msgstr "Desarrolladores 1.x:"
 
-#: src/audacious/credits.c:148
+#: src/audacious/credits.c:153
 msgid "BMP Developers:"
 msgstr "Desarrolladores de BMP:"
 
-#: src/audacious/credits.c:180
+#: src/audacious/credits.c:185
 msgid "Belarusian:"
 msgstr "Bielorruso:"
 
-#: src/audacious/credits.c:183
+#: src/audacious/credits.c:188
 msgid "Basque:"
 msgstr "Vasco:"
 
-#: src/audacious/credits.c:186
+#: src/audacious/credits.c:191
 msgid "Brazilian Portuguese:"
 msgstr "Portugués de Brasil:"
 
-#: src/audacious/credits.c:191
+#: src/audacious/credits.c:196
 msgid "Breton:"
 msgstr "Bretón:"
 
-#: src/audacious/credits.c:194
+#: src/audacious/credits.c:199
 msgid "Bulgarian:"
 msgstr "Búlgaro:"
 
-#: src/audacious/credits.c:197
+#: src/audacious/credits.c:202
 msgid "Catalan:"
 msgstr "Catalán:"
 
-#: src/audacious/credits.c:200
+#: src/audacious/credits.c:206
 msgid "Chinese:"
 msgstr "Chino:"
 
-#: src/audacious/credits.c:203
+#: src/audacious/credits.c:209
 msgid "Croatian:"
 msgstr "Croato:"
 
-#: src/audacious/credits.c:206
+#: src/audacious/credits.c:212
 msgid "Czech:"
 msgstr "Checo:"
 
-#: src/audacious/credits.c:209
+#: src/audacious/credits.c:215
 msgid "Dutch:"
 msgstr "Holandés:"
 
-#: src/audacious/credits.c:213
+#: src/audacious/credits.c:219
 msgid "Estonian:"
 msgstr "Estonio:"
 
-#: src/audacious/credits.c:216
+#: src/audacious/credits.c:222
 msgid "Finnish:"
 msgstr "Finlandés:"
 
-#: src/audacious/credits.c:221
+#: src/audacious/credits.c:227
 msgid "French:"
 msgstr "Francés:"
 
-#: src/audacious/credits.c:227
+#: src/audacious/credits.c:233
 msgid "German:"
 msgstr "Alemán:"
 
-#: src/audacious/credits.c:234
+#: src/audacious/credits.c:240
 msgid "Georgian:"
 msgstr "Georgiano:"
 
-#: src/audacious/credits.c:237
+#: src/audacious/credits.c:243
 msgid "Greek:"
 msgstr "Griego:"
 
-#: src/audacious/credits.c:242
+#: src/audacious/credits.c:248
 msgid "Hindi:"
 msgstr "Hindú:"
 
-#: src/audacious/credits.c:245
+#: src/audacious/credits.c:251
 msgid "Hungarian:"
 msgstr "Húngaro:"
 
-#: src/audacious/credits.c:249
+#: src/audacious/credits.c:255
 msgid "Italian:"
 msgstr "Italiano:"
 
-#: src/audacious/credits.c:253
+#: src/audacious/credits.c:260
 msgid "Japanese:"
 msgstr "Japonés:"
 
-#: src/audacious/credits.c:256
+#: src/audacious/credits.c:263
 msgid "Korean:"
 msgstr "Coreano:"
 
-#: src/audacious/credits.c:259
+#: src/audacious/credits.c:266
 msgid "Latvian:"
 msgstr "Letón:"
 
-#: src/audacious/credits.c:262
+#: src/audacious/credits.c:269
 msgid "Lithuanian:"
 msgstr "Lituano:"
 
-#: src/audacious/credits.c:267
+#: src/audacious/credits.c:274
 msgid "Macedonian:"
 msgstr "Macedonio:"
 
-#: src/audacious/credits.c:270
+#: src/audacious/credits.c:277
+msgid "Mexican Spanish:"
+msgstr "Español mexicano:"
+
+#: src/audacious/credits.c:280
 msgid "Polish:"
 msgstr "Polaco:"
 
-#: src/audacious/credits.c:276
+#: src/audacious/credits.c:287
 msgid "Portuguese:"
 msgstr "Portugués:"
 
-#: src/audacious/credits.c:279
+#: src/audacious/credits.c:290
 msgid "Romanian:"
 msgstr "Rumano:"
 
-#: src/audacious/credits.c:283
+#: src/audacious/credits.c:294
 msgid "Russian:"
 msgstr "Ruso:"
 
-#: src/audacious/credits.c:287
+#: src/audacious/credits.c:298
 msgid "Serbian (Latin):"
 msgstr "Serbio (Latin):"
 
-#: src/audacious/credits.c:290
+#: src/audacious/credits.c:301
 msgid "Serbian (Cyrillic):"
 msgstr "Serbio (Cyrillic):"
 
-#: src/audacious/credits.c:293
+#: src/audacious/credits.c:305
 msgid "Simplified Chinese:"
 msgstr "Chino simplificado:"
 
-#: src/audacious/credits.c:296
+#: src/audacious/credits.c:308
 msgid "Slovak:"
 msgstr "Eslovaco:"
 
-#: src/audacious/credits.c:299
+#: src/audacious/credits.c:312
 msgid "Spanish:"
 msgstr "Español:"
 
-#: src/audacious/credits.c:306
+#: src/audacious/credits.c:320
 msgid "Swedish:"
 msgstr "Sueco:"
 
-#: src/audacious/credits.c:309
+#: src/audacious/credits.c:323
 msgid "Traditional Chinese:"
 msgstr "Chino tradicional:"
 
-#: src/audacious/credits.c:315
+#: src/audacious/credits.c:329
 msgid "Turkish:"
 msgstr "Turco:"
 
-#: src/audacious/credits.c:319
+#: src/audacious/credits.c:333
 msgid "Ukrainian:"
 msgstr "Ucraniano:"
 
-#: src/audacious/credits.c:323
+#: src/audacious/credits.c:338
 msgid "Vietnamese:"
 msgstr "Vietnamita:"
 
-#: src/audacious/credits.c:326
+#: src/audacious/credits.c:341
 msgid "Welsh:"
 msgstr "Galés:"
 
-#: src/audacious/drct.c:234
-msgid "Temporary Playlist"
-msgstr "Lista de reproducción temporal"
-
-#: src/audacious/equalizer_preset.c:186
+#: src/audacious/equalizer_preset.c:180
 #, c-format
 msgid "Error importing Winamp EQF file '%s'"
 msgstr "Error importando archivo Winamp EQF '%s'"
 
-#: src/audacious/main.c:239
+#: src/audacious/main.c:243
 msgid "Skip backwards in playlist"
 msgstr "Saltar hacia atrás en la lista de reproducción"
 
-#: src/audacious/main.c:240
+#: src/audacious/main.c:244
 msgid "Start playing current playlist"
 msgstr "Empezar la reproducción de la lista de reproducción actual"
 
-#: src/audacious/main.c:241
+#: src/audacious/main.c:245
 msgid "Pause current song"
 msgstr "Pausar la canción actual"
 
-#: src/audacious/main.c:242
+#: src/audacious/main.c:246
 msgid "Stop current song"
 msgstr "Parar la canción actual"
 
-#: src/audacious/main.c:243
+#: src/audacious/main.c:247
 msgid "Pause if playing, play otherwise"
 msgstr "Pausar si se está reproduciendo, o reproducir"
 
-#: src/audacious/main.c:244
+#: src/audacious/main.c:248
 msgid "Skip forward in playlist"
 msgstr "Saltar hacia adelante en la lista de reproducción"
 
-#: src/audacious/main.c:245
+#: src/audacious/main.c:249
 msgid "Display Jump to File dialog"
 msgstr "Mostrar diálogo de salto al archivo"
 
-#: src/audacious/main.c:246
+#: src/audacious/main.c:250
 msgid "Add files to the playlist"
 msgstr "Añadir archivos a la lista de reproducción"
 
-#: src/audacious/main.c:247
+#: src/audacious/main.c:251
 msgid "Add new files to a temporary playlist"
 msgstr "Añdir nuevos archvios a una lista de reproducción temporal"
 
-#: src/audacious/main.c:248
+#: src/audacious/main.c:252
 msgid "Display the main window"
 msgstr "Mostrar la ventana principal"
 
-#: src/audacious/main.c:249
+#: src/audacious/main.c:253
 msgid "Show version"
 msgstr "Mostrar versión"
 
-#: src/audacious/main.c:250
+#: src/audacious/main.c:254
 msgid "Print debugging messages"
 msgstr "Imprimir mensajes de depuración"
 
-#: src/audacious/main.c:251
+#: src/audacious/main.c:255
 msgid "Headless mode (beta)"
 msgstr "Modo sin cabecera (beta)"
 
-#: src/audacious/main.c:252
+#: src/audacious/main.c:256
 msgid "FILE..."
 msgstr "ARCHIVO..."
 
-#: src/audacious/main.c:264
+#: src/audacious/main.c:268
 msgid "- play multimedia files"
 msgstr "- reproducir archivos multimedia"
 
-#: src/audacious/main.c:274
+#: src/audacious/main.c:278
 #, c-format
 msgid ""
 "%s: %s\n"
@@ -300,20 +302,37 @@
 "%s: %s\n"
 "Prueba `%s --help' para más información.\n"
 
-#: src/audacious/main.c:547
+#: src/audacious/main.c:573
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/audacious/playback.c:303
+#: src/audacious/playback.c:307
 #, c-format
 msgid "No decoder found for %s."
 msgstr "No se encontró decodificador para %s."
 
-#: src/audacious/playlist-new.c:315
-msgid "Untitled Playlist"
-msgstr "Lista de reproducción sin título"
+#: src/audacious/playlist-files.c:53
+#, c-format
+msgid "Cannot %s %s: unsupported file extension."
+msgstr "No se puede %s %s: la extensión del archivo no es válida."
+
+#: src/audacious/playlist-files.c:54
+msgid "save"
+msgstr "guardar"
+
+#: src/audacious/playlist-files.c:54
+msgid "load"
+msgstr "cargar"
 
-#: src/audacious/playlist-new.c:1496
+#: src/audacious/playlist-new.c:131
+msgid "New Playlist"
+msgstr "Nueva lista de reproduccion"
+
+#: src/audacious/playlist-new.c:132
+msgid "Now Playing"
+msgstr "Reproduccion actual"
+
+#: src/audacious/playlist-new.c:1630
 msgid ""
 "The playlist cannot be sorted because metadata scanning is still in progress"
 " (or has been disabled)."
@@ -321,272 +340,272 @@
 "La lista de reproducción no se puede ordenar porque la búsqueda de metadatos"
 " está en progreso (o ha sido deshabilitada)."
 
-#: src/audacious/ui_preferences.c:88
+#: src/audacious/ui_preferences.c:85
 msgid "Audio"
 msgstr "Audio"
 
-#: src/audacious/ui_preferences.c:89
+#: src/audacious/ui_preferences.c:86
 msgid "Network"
 msgstr "Red"
 
-#: src/audacious/ui_preferences.c:90 src/audacious/ui_preferences.c:1634
+#: src/audacious/ui_preferences.c:87 src/audacious/ui_preferences.c:1603
 msgid "Playlist"
 msgstr "Lista de reproducción"
 
-#: src/audacious/ui_preferences.c:91
+#: src/audacious/ui_preferences.c:88
 msgid "Plugins"
 msgstr "Complementos"
 
-#: src/audacious/ui_preferences.c:97 src/libaudgui/infopopup.c:203
+#: src/audacious/ui_preferences.c:94 src/libaudgui/infopopup.c:199
 msgid "Artist"
 msgstr "Artista"
 
-#: src/audacious/ui_preferences.c:98 src/libaudgui/infopopup.c:205
+#: src/audacious/ui_preferences.c:95 src/libaudgui/infopopup.c:201
 msgid "Album"
 msgstr "Álbum"
 
-#: src/audacious/ui_preferences.c:99 src/libaudgui/infopopup.c:201
-#: src/libaudgui/ui_playlist_manager.c:276
+#: src/audacious/ui_preferences.c:96 src/libaudgui/infopopup.c:197
+#: src/libaudgui/ui_playlist_manager.c:279
 msgid "Title"
 msgstr "Título"
 
-#: src/audacious/ui_preferences.c:100
+#: src/audacious/ui_preferences.c:97
 msgid "Tracknumber"
 msgstr "Número de pista"
 
-#: src/audacious/ui_preferences.c:101 src/libaudgui/infopopup.c:207
+#: src/audacious/ui_preferences.c:98 src/libaudgui/infopopup.c:203
 msgid "Genre"
 msgstr "Género"
 
-#: src/audacious/ui_preferences.c:102
+#: src/audacious/ui_preferences.c:99
 msgid "Filename"
 msgstr "Nombre de archivo"
 
-#: src/audacious/ui_preferences.c:103
+#: src/audacious/ui_preferences.c:100
 msgid "Filepath"
 msgstr "Ruta hasta el archivo"
 
-#: src/audacious/ui_preferences.c:104
+#: src/audacious/ui_preferences.c:101
 msgid "Date"
 msgstr "Fecha"
 
-#: src/audacious/ui_preferences.c:105 src/libaudgui/infopopup.c:209
+#: src/audacious/ui_preferences.c:102 src/libaudgui/infopopup.c:205
 msgid "Year"
 msgstr "Año"
 
-#: src/audacious/ui_preferences.c:106
+#: src/audacious/ui_preferences.c:103
 msgid "Comment"
 msgstr "Comentario"
 
-#: src/audacious/ui_preferences.c:107
+#: src/audacious/ui_preferences.c:104
 msgid "Codec"
 msgstr "Codec (formato)"
 
-#: src/audacious/ui_preferences.c:108
+#: src/audacious/ui_preferences.c:105
 msgid "Quality"
 msgstr "Calidad"
 
-#: src/audacious/ui_preferences.c:114
+#: src/audacious/ui_preferences.c:111
 msgid "None"
 msgstr "Ninguno"
 
-#: src/audacious/ui_preferences.c:115
+#: src/audacious/ui_preferences.c:112
 msgid "Arabic"
 msgstr "Arábico"
 
-#: src/audacious/ui_preferences.c:116
+#: src/audacious/ui_preferences.c:113
 msgid "Baltic"
 msgstr "Báltico"
 
-#: src/audacious/ui_preferences.c:117
+#: src/audacious/ui_preferences.c:114
 msgid "Chinese"
 msgstr "Chino"
 
-#: src/audacious/ui_preferences.c:118
+#: src/audacious/ui_preferences.c:115
 msgid "Greek"
 msgstr "Griego"
 
-#: src/audacious/ui_preferences.c:119
+#: src/audacious/ui_preferences.c:116
 msgid "Hebrew"
 msgstr "Hebreo"
 
-#: src/audacious/ui_preferences.c:120
+#: src/audacious/ui_preferences.c:117
 msgid "Japanese"
 msgstr "Japonés"
 
-#: src/audacious/ui_preferences.c:121
+#: src/audacious/ui_preferences.c:118
 msgid "Korean"
 msgstr "Coreano"
 
-#: src/audacious/ui_preferences.c:122
+#: src/audacious/ui_preferences.c:119
 msgid "Polish"
 msgstr "Polaco"
 
-#: src/audacious/ui_preferences.c:123
+#: src/audacious/ui_preferences.c:120
 msgid "Russian"
 msgstr "Ruso"
 
-#: src/audacious/ui_preferences.c:124
+#: src/audacious/ui_preferences.c:121
 msgid "Taiwanese"
 msgstr "Taiwanés"
 
-#: src/audacious/ui_preferences.c:125
+#: src/audacious/ui_preferences.c:122
 msgid "Turkish"
 msgstr "Turco"
 
-#: src/audacious/ui_preferences.c:147
+#: src/audacious/ui_preferences.c:144
 msgid "Album mode"
 msgstr "Modo de album"
 
-#: src/audacious/ui_preferences.c:150
+#: src/audacious/ui_preferences.c:147
 msgid "Output Settings"
 msgstr "Ajustes de salida"
 
-#: src/audacious/ui_preferences.c:152
+#: src/audacious/ui_preferences.c:149
 msgid "Bit depth:"
 msgstr "Profundidad de bit:"
 
-#: src/audacious/ui_preferences.c:155
+#: src/audacious/ui_preferences.c:152
 msgid "Buffer size:"
 msgstr "Tamaño del búfer:"
 
-#: src/audacious/ui_preferences.c:157
+#: src/audacious/ui_preferences.c:154
 msgid "ms"
 msgstr "ms"
 
-#: src/audacious/ui_preferences.c:158
+#: src/audacious/ui_preferences.c:155
 msgid "Use software volume control (not recommended)"
 msgstr "Usar control de volumen por software (no recomendado)"
 
-#: src/audacious/ui_preferences.c:160
+#: src/audacious/ui_preferences.c:157
 msgid "Replay Gain"
 msgstr "Normalizar volumen"
 
-#: src/audacious/ui_preferences.c:161
+#: src/audacious/ui_preferences.c:158
 msgid "Enable Replay Gain"
 msgstr "Activar la normalización de volumen"
 
-#: src/audacious/ui_preferences.c:164
+#: src/audacious/ui_preferences.c:161
 msgid "Prevent clipping (recommended)"
 msgstr "Evitar cortes (recomendado)"
 
-#: src/audacious/ui_preferences.c:166
+#: src/audacious/ui_preferences.c:163
 msgid "Adjust Levels"
 msgstr "Ajustar niveles"
 
-#: src/audacious/ui_preferences.c:167
+#: src/audacious/ui_preferences.c:164
 msgid "Amplify all files:"
 msgstr "Amplificar todos los archivos:"
 
-#: src/audacious/ui_preferences.c:169 src/audacious/ui_preferences.c:172
+#: src/audacious/ui_preferences.c:166 src/audacious/ui_preferences.c:169
 msgid "dB"
 msgstr "dB"
 
-#: src/audacious/ui_preferences.c:170
+#: src/audacious/ui_preferences.c:167
 msgid "Amplify untagged files:"
 msgstr "Amplificar archivos sin etiqueta:"
 
-#: src/audacious/ui_preferences.c:175
+#: src/audacious/ui_preferences.c:172
 msgid "Proxy hostname:"
 msgstr "Servidor proxy:"
 
-#: src/audacious/ui_preferences.c:176
+#: src/audacious/ui_preferences.c:173
 msgid "Proxy port:"
 msgstr "Puerto del proxy:"
 
-#: src/audacious/ui_preferences.c:179
+#: src/audacious/ui_preferences.c:176
 msgid "Proxy username:"
 msgstr "Nombre de usuario del proxy:"
 
-#: src/audacious/ui_preferences.c:180
+#: src/audacious/ui_preferences.c:177
 msgid "Proxy password:"
 msgstr "Contraseña del proxy:"
 
-#: src/audacious/ui_preferences.c:184
+#: src/audacious/ui_preferences.c:181
 msgid "Proxy Configuration"
 msgstr "Configuración del Proxy"
 
-#: src/audacious/ui_preferences.c:185
+#: src/audacious/ui_preferences.c:182
 msgid "Enable proxy usage"
 msgstr "Activar uso del proxy"
 
-#: src/audacious/ui_preferences.c:188
+#: src/audacious/ui_preferences.c:185
 msgid "Use authentication with proxy"
 msgstr "Usar autenticación con el proxy"
 
-#: src/audacious/ui_preferences.c:196
+#: src/audacious/ui_preferences.c:193
 msgid "Auto character encoding detector for:"
 msgstr "Detector de codificación de caracteres automático para: "
 
-#: src/audacious/ui_preferences.c:201
+#: src/audacious/ui_preferences.c:198
 msgid "Fallback character encodings:"
 msgstr "Codificación de caracteres alternativa:"
 
-#: src/audacious/ui_preferences.c:205
+#: src/audacious/ui_preferences.c:202
 msgid "Behavior"
 msgstr "Comportamiento"
 
-#: src/audacious/ui_preferences.c:206
+#: src/audacious/ui_preferences.c:203
 msgid "Continue playback on startup"
 msgstr "Continuar la reproducción al iniciar"
 
-#: src/audacious/ui_preferences.c:208
+#: src/audacious/ui_preferences.c:205
 msgid "Advance when the current song is deleted"
 msgstr "Avanzar cuando se borra la canción actual"
 
-#: src/audacious/ui_preferences.c:210
+#: src/audacious/ui_preferences.c:207
 msgid "Clear the playlist when opening files"
 msgstr "Limpiar la lista de reproducción al abrir archivos"
 
-#: src/audacious/ui_preferences.c:212
+#: src/audacious/ui_preferences.c:209
 msgid "Open files in a temporary playlist"
 msgstr "Abrir archivos en una lista de reproducción temporal"
 
-#: src/audacious/ui_preferences.c:214
+#: src/audacious/ui_preferences.c:211
 msgid "Metadata"
 msgstr "Metadatos"
 
-#: src/audacious/ui_preferences.c:215
+#: src/audacious/ui_preferences.c:212
 msgid "Do not load metadata for songs until played"
 msgstr "No cargar la información de metadatos hasta reproducir"
 
-#: src/audacious/ui_preferences.c:233
+#: src/audacious/ui_preferences.c:230
 msgid "TITLE"
 msgstr "TÍTULO"
 
-#: src/audacious/ui_preferences.c:234
+#: src/audacious/ui_preferences.c:231
 msgid "ARTIST - TITLE"
 msgstr "ARTISTA - TÍTULO"
 
-#: src/audacious/ui_preferences.c:235
+#: src/audacious/ui_preferences.c:232
 msgid "ARTIST - ALBUM - TITLE"
 msgstr "ARTISTA - ÁLBUM - TÍTULO"
 
-#: src/audacious/ui_preferences.c:236
+#: src/audacious/ui_preferences.c:233
 msgid "ARTIST - ALBUM - TRACK. TITLE"
 msgstr "ARTISTA - ÁLBUM - PISTA. TÍTULO"
 
-#: src/audacious/ui_preferences.c:237
+#: src/audacious/ui_preferences.c:234
 msgid "ARTIST [ ALBUM ] - TRACK. TITLE"
 msgstr "ARTISTA [ ÁLBUM ] - PISTA. TÍTULO"
 
-#: src/audacious/ui_preferences.c:238
+#: src/audacious/ui_preferences.c:235
 msgid "ALBUM - TITLE"
 msgstr "ÁLBUM - TÍTULO"
 
-#: src/audacious/ui_preferences.c:577
+#: src/audacious/ui_preferences.c:556
 msgid "Category"
 msgstr "Categoría"
 
-#: src/audacious/ui_preferences.c:801
+#: src/audacious/ui_preferences.c:780
 msgid "Popup Information Settings"
 msgstr "Ajustes de la información emergente"
 
-#: src/audacious/ui_preferences.c:810
+#: src/audacious/ui_preferences.c:789
 msgid "Cover image retrieve"
 msgstr "Recuperar carátula"
 
-#: src/audacious/ui_preferences.c:815
+#: src/audacious/ui_preferences.c:794
 msgid ""
 "While searching for the album's cover, Audacious looks for certain words in "
 "the filename. You can specify those words in the lists below, separated "
@@ -596,76 +615,76 @@
 "el nombre de archivo. Se pueden especificar éstas palabras en la lista de "
 "abajo, separadas usando comas."
 
-#: src/audacious/ui_preferences.c:832
+#: src/audacious/ui_preferences.c:811
 msgid "Exclude:"
 msgstr "Excluir:"
 
-#: src/audacious/ui_preferences.c:839
+#: src/audacious/ui_preferences.c:818
 msgid "Include:"
 msgstr "Incluir:"
 
-#: src/audacious/ui_preferences.c:856
+#: src/audacious/ui_preferences.c:835
 msgid "Recursively search for cover"
 msgstr "Busca recursiva para las carátulas"
 
-#: src/audacious/ui_preferences.c:866
+#: src/audacious/ui_preferences.c:845
 msgid "Search depth: "
 msgstr "Profundidad de la búsqueda:"
 
-#: src/audacious/ui_preferences.c:880
+#: src/audacious/ui_preferences.c:859
 msgid "Use per-file cover"
 msgstr "Usar carátula por archivo"
 
-#: src/audacious/ui_preferences.c:883
+#: src/audacious/ui_preferences.c:862
 msgid "Miscellaneous"
 msgstr "Varios"
 
-#: src/audacious/ui_preferences.c:892
+#: src/audacious/ui_preferences.c:871
 msgid "Show Progress bar for the current track"
 msgstr "Mostrar barra de progreso para la pista actual"
 
-#: src/audacious/ui_preferences.c:902
+#: src/audacious/ui_preferences.c:881
 msgid "Delay until filepopup comes up: "
 msgstr "Esperar hasta que la ventana emergente aparezca: "
 
-#: src/audacious/ui_preferences.c:1340
+#: src/audacious/ui_preferences.c:1309
 msgid "Custom"
 msgstr "Personalizada"
 
-#: src/audacious/ui_preferences.c:1383
+#: src/audacious/ui_preferences.c:1352
 msgid "Song Display"
 msgstr "Visualización de las canciones"
 
-#: src/audacious/ui_preferences.c:1392
+#: src/audacious/ui_preferences.c:1361
 msgid "Show song numbers"
 msgstr "Mostrar números de las canciones"
 
-#: src/audacious/ui_preferences.c:1403
+#: src/audacious/ui_preferences.c:1372
 msgid "Show leading zeroes (02:00 instead of 2:00)"
 msgstr "Mostrar ceros a la izquierda (02:00 en lugar de 2:00)"
 
-#: src/audacious/ui_preferences.c:1425
+#: src/audacious/ui_preferences.c:1394
 msgid "Show information about titlestring format"
 msgstr "Mostrar información acerca del formato del título"
 
-#: src/audacious/ui_preferences.c:1441
+#: src/audacious/ui_preferences.c:1410
 msgid "Custom string:"
 msgstr "Cadena personalizada:"
 
-#: src/audacious/ui_preferences.c:1448
+#: src/audacious/ui_preferences.c:1417
 msgid "Title format:"
 msgstr "Formato del título:"
 
-#: src/audacious/ui_preferences.c:1459
+#: src/audacious/ui_preferences.c:1428
 msgid "Popup Information"
 msgstr "Información emergente"
 
-#: src/audacious/ui_preferences.c:1474
+#: src/audacious/ui_preferences.c:1443
 msgid "Show popup information for playlist entries"
 msgstr ""
 "Mostrar información emergente para las entradas de la lista de canciones"
 
-#: src/audacious/ui_preferences.c:1475
+#: src/audacious/ui_preferences.c:1444
 msgid ""
 "Toggles popup information window for the pointed entry in the playlist. The "
 "window shows title of song, name of album, genre, year of publish, track "
@@ -676,67 +695,84 @@
 "álbum, género, año de publicación, número de pista, duración de la pista y "
 "el trabajo."
 
-#: src/audacious/ui_preferences.c:1486
+#: src/audacious/ui_preferences.c:1455
 msgid "Edit settings for popup information"
 msgstr "Editar ajustes para la información emergente"
 
-#: src/audacious/ui_preferences.c:1575
+#: src/audacious/ui_preferences.c:1544
 msgid "Output plugin:"
 msgstr "Complemento de salida:"
 
-#: src/audacious/ui_preferences.c:1634
+#: src/audacious/ui_preferences.c:1603
 msgid "Transport"
 msgstr "Transporte"
 
-#: src/audacious/ui_preferences.c:1634
+#: src/audacious/ui_preferences.c:1603
 msgid "Input"
 msgstr "Entrada"
 
-#: src/audacious/ui_preferences.c:1635
+#: src/audacious/ui_preferences.c:1604
 msgid "Effect"
 msgstr "Efecto"
 
-#: src/audacious/ui_preferences.c:1635
+#: src/audacious/ui_preferences.c:1604
 msgid "Visualization"
 msgstr "Visualización"
 
-#: src/audacious/ui_preferences.c:1635
+#: src/audacious/ui_preferences.c:1604
 msgid "General"
 msgstr "General"
 
-#: src/audacious/ui_preferences.c:1675
+#: src/audacious/ui_preferences.c:1644
 msgid "Audacious Preferences"
 msgstr "Preferencias de Audacious"
 
-#: src/audacious/util.c:123
+#: src/audacious/util.c:120
 #, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr "No se pudo crear el directorio (%s): %s\n"
 
-#: src/audtool/handlers_playlist.c:274
+#: src/audtool/handlers_playlist.c:273
 msgid "Position not found."
 msgstr "Posición no encontrada."
 
-#: src/audtool/handlers_vitals.c:64
+#: src/audtool/handlers_vitals.c:63
 msgid "No song playing."
 msgstr "No se reproduce ninguna canción."
 
-#: src/libaudcore/tuple.c:685
+#: src/libaudcore/audstrings.c:199
+#, c-format
+msgid "Audio CD, track %s"
+msgstr "CD de música, pista %s"
+
+#: src/libaudcore/tuple.c:536
 msgid "Mono"
 msgstr "Mono"
 
-#: src/libaudcore/tuple.c:687
+#: src/libaudcore/tuple.c:538
 msgid "Stereo"
 msgstr "Estéreo"
 
-#: src/libaudcore/tuple.c:689
+#: src/libaudcore/tuple.c:540
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d canal"
 msgstr[1] "%d canales"
 
-#: src/libaudgui/confirm.c:78
+#: src/libaudgui/about.c:52 src/libaudgui/about.c:115
+msgid "Credits"
+msgstr "Créditos:"
+
+#: src/libaudgui/about.c:52
+msgid "Translators"
+msgstr "Traductores"
+
+#: src/libaudgui/about.c:91
+msgid "About Audacious"
+msgstr "Acerca de Audacious"
+
+#: src/libaudgui/confirm.c:76
 #, c-format
 msgid ""
 "Are you sure you want to close %s? If you do, any changes made since the "
@@ -745,338 +781,326 @@
 "¿Esta seguro de querer cerrar %s? Si lo haces, se perderá cualquier cambio "
 "realizado desde que fue exportada la lista de reproducción."
 
-#: src/libaudgui/confirm.c:91
+#: src/libaudgui/confirm.c:89
 msgid "_Don't show this message again"
 msgstr "_No mostrar este mensaje de nuevo"
 
-#: src/libaudgui/confirm.c:128
+#: src/libaudgui/confirm.c:126
 msgid "Rename Playlist"
 msgstr "Renombrar la lista de reproducción"
 
-#: src/libaudgui/effects-menu.c:76
+#: src/libaudgui/effects-menu.c:74
 msgid "settings ..."
 msgstr "ajustes ..."
 
-#: src/libaudgui/equalizer.c:52
+#: src/libaudgui/equalizer.c:51
 msgid "_Enable"
 msgstr "_Activar"
 
-#: src/libaudgui/equalizer.c:124
+#: src/libaudgui/equalizer.c:123
 msgid "31 Hz"
 msgstr "31 Hz"
 
-#: src/libaudgui/equalizer.c:124
+#: src/libaudgui/equalizer.c:123
 msgid "63 Hz"
 msgstr "63 Hz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "125 Hz"
 msgstr "125 Hz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "250 Hz"
 msgstr "250 Hz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "500 Hz"
 msgstr "500 Hz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "1 kHz"
 msgstr "1 kHz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "2 kHz"
 msgstr "2 kHz"
 
-#: src/libaudgui/equalizer.c:126
+#: src/libaudgui/equalizer.c:125
 msgid "4 kHz"
 msgstr "4 kHz"
 
-#: src/libaudgui/equalizer.c:126
+#: src/libaudgui/equalizer.c:125
 msgid "8 kHz"
 msgstr "8 kHz"
 
-#: src/libaudgui/equalizer.c:126
+#: src/libaudgui/equalizer.c:125
 msgid "16 kHz"
 msgstr "16 kHz"
 
-#: src/libaudgui/equalizer.c:131
+#: src/libaudgui/equalizer.c:130
 msgid "Equalizer"
 msgstr "Ecualizador"
 
-#: src/libaudgui/equalizer.c:147
+#: src/libaudgui/equalizer.c:146
 msgid "Preamp"
 msgstr "Preamplificación"
 
-#: src/libaudgui/infopopup.c:211
+#: src/libaudgui/infopopup.c:207
 msgid "Track Number"
 msgstr "Número de pista"
 
-#: src/libaudgui/infopopup.c:213
+#: src/libaudgui/infopopup.c:209
 msgid "Track Length"
 msgstr "Duración de la pista:"
 
-#: src/libaudgui/infowin.c:77
+#: src/libaudgui/infowin.c:75
 msgid "Acid Jazz"
 msgstr "Jazz ácido"
 
-#: src/libaudgui/infowin.c:78
+#: src/libaudgui/infowin.c:76
 msgid "Acid Rock"
 msgstr "Rock ácido"
 
-#: src/libaudgui/infowin.c:79
+#: src/libaudgui/infowin.c:77
 msgid "Ambient"
 msgstr "Ambiental"
 
-#: src/libaudgui/infowin.c:80
+#: src/libaudgui/infowin.c:78
 msgid "Bebop"
 msgstr "Bebop"
 
-#: src/libaudgui/infowin.c:81
+#: src/libaudgui/infowin.c:79
 msgid "Bluegrass"
 msgstr "Bluegrass"
 
-#: src/libaudgui/infowin.c:82
+#: src/libaudgui/infowin.c:80
 msgid "Blues"
 msgstr "Blues"
 
-#: src/libaudgui/infowin.c:83
+#: src/libaudgui/infowin.c:81
 msgid "Chamber Music"
 msgstr "Música de cámara"
 
-#: src/libaudgui/infowin.c:84
+#: src/libaudgui/infowin.c:82
 msgid "Classical"
 msgstr "Clásica"
 
-#: src/libaudgui/infowin.c:85
+#: src/libaudgui/infowin.c:83
 msgid "Country"
 msgstr "Country"
 
-#: src/libaudgui/infowin.c:86
+#: src/libaudgui/infowin.c:84
 msgid "Death Metal"
 msgstr "Death Metal"
 
-#: src/libaudgui/infowin.c:87
+#: src/libaudgui/infowin.c:85
 msgid "Disco"
 msgstr "Disco"
 
-#: src/libaudgui/infowin.c:88
+#: src/libaudgui/infowin.c:86
 msgid "Easy Listening"
 msgstr "Escucha fácil"
 
-#: src/libaudgui/infowin.c:89
+#: src/libaudgui/infowin.c:87
 msgid "Folk"
 msgstr "Folclore"
 
-#: src/libaudgui/infowin.c:90
+#: src/libaudgui/infowin.c:88
 msgid "Funk"
 msgstr "Funk"
 
-#: src/libaudgui/infowin.c:91
+#: src/libaudgui/infowin.c:89
 msgid "Gangsta Rap"
 msgstr "Gangsta Rap"
 
-#: src/libaudgui/infowin.c:92
+#: src/libaudgui/infowin.c:90
 msgid "Gospel"
 msgstr "Gospel"
 
-#: src/libaudgui/infowin.c:93
+#: src/libaudgui/infowin.c:91
 msgid "Grunge"
 msgstr "Grunge"
 
-#: src/libaudgui/infowin.c:94
+#: src/libaudgui/infowin.c:92
 msgid "Hard Rock"
 msgstr "Rock duro"
 
-#: src/libaudgui/infowin.c:95
+#: src/libaudgui/infowin.c:93
 msgid "Heavy Metal"
 msgstr "Heavy Metal"
 
-#: src/libaudgui/infowin.c:96
+#: src/libaudgui/infowin.c:94
 msgid "Hip-hop"
 msgstr "Hip-hop"
 
-#: src/libaudgui/infowin.c:97
+#: src/libaudgui/infowin.c:95
 msgid "House"
 msgstr "House"
 
-#: src/libaudgui/infowin.c:98
+#: src/libaudgui/infowin.c:96
 msgid "Jazz"
 msgstr "Jazz"
 
-#: src/libaudgui/infowin.c:99
+#: src/libaudgui/infowin.c:97
 msgid "Jungle"
 msgstr "Jungle"
 
-#: src/libaudgui/infowin.c:100
+#: src/libaudgui/infowin.c:98
 msgid "Metal"
 msgstr "Metal"
 
-#: src/libaudgui/infowin.c:101
+#: src/libaudgui/infowin.c:99
 msgid "New Age"
 msgstr "New age"
 
-#: src/libaudgui/infowin.c:102
+#: src/libaudgui/infowin.c:100
 msgid "New Wave"
 msgstr "New wave"
 
-#: src/libaudgui/infowin.c:103
+#: src/libaudgui/infowin.c:101
 msgid "Noise"
 msgstr "Ruido"
 
-#: src/libaudgui/infowin.c:104
+#: src/libaudgui/infowin.c:102
 msgid "Pop"
 msgstr "Pop"
 
-#: src/libaudgui/infowin.c:105
+#: src/libaudgui/infowin.c:103
 msgid "Punk Rock"
 msgstr "Rock Punk"
 
-#: src/libaudgui/infowin.c:106
+#: src/libaudgui/infowin.c:104
 msgid "Rap"
 msgstr "Rap"
 
-#: src/libaudgui/infowin.c:107
+#: src/libaudgui/infowin.c:105
 msgid "Reggae"
 msgstr "Reggae"
 
-#: src/libaudgui/infowin.c:108
+#: src/libaudgui/infowin.c:106
 msgid "Rock"
 msgstr "Rock"
 
-#: src/libaudgui/infowin.c:109
+#: src/libaudgui/infowin.c:107
 msgid "Rock and Roll"
 msgstr "Rock and Roll"
 
-#: src/libaudgui/infowin.c:110
+#: src/libaudgui/infowin.c:108
 msgid "Rhythm and Blues"
 msgstr "Rhythm and Blues"
 
-#: src/libaudgui/infowin.c:111
+#: src/libaudgui/infowin.c:109
 msgid "Ska"
 msgstr "Ska"
 
-#: src/libaudgui/infowin.c:112
+#: src/libaudgui/infowin.c:110
 msgid "Soul"
 msgstr "Soul"
 
-#: src/libaudgui/infowin.c:113
+#: src/libaudgui/infowin.c:111
 msgid "Swing"
 msgstr "Swing"
 
-#: src/libaudgui/infowin.c:114
+#: src/libaudgui/infowin.c:112
 msgid "Techno"
 msgstr "Techno"
 
-#: src/libaudgui/infowin.c:115
+#: src/libaudgui/infowin.c:113
 msgid "Trip-hop"
 msgstr "Trip-hop"
 
-#: src/libaudgui/infowin.c:175 src/libaudgui/infowin.c:361
-#: src/libaudgui/infowin.c:364 src/libaudgui/infowin.c:367
+#: src/libaudgui/infowin.c:177 src/libaudgui/infowin.c:363
+#: src/libaudgui/infowin.c:366 src/libaudgui/infowin.c:369
 msgid "n/a"
 msgstr "n/a"
 
-#: src/libaudgui/infowin.c:265
+#: src/libaudgui/infowin.c:267
 msgid "Metadata updated successfully"
 msgstr "Metadata actualizada sin problemas"
 
-#: src/libaudgui/infowin.c:270
+#: src/libaudgui/infowin.c:272
 msgid "Metadata updating failed"
 msgstr "Actualización de metadatos fallida"
 
-#: src/libaudgui/infowin.c:318
+#: src/libaudgui/infowin.c:320
 msgid "Track Information"
 msgstr "Información de pista"
 
-#: src/libaudgui/infowin.c:350
+#: src/libaudgui/infowin.c:352
 msgid "Format:"
 msgstr "Formato:"
 
-#: src/libaudgui/infowin.c:354
+#: src/libaudgui/infowin.c:356
 msgid "Quality:"
 msgstr "Calidad:"
 
-#: src/libaudgui/infowin.c:357
+#: src/libaudgui/infowin.c:359
 msgid "Bitrate:"
 msgstr "Bitrate:"
 
-#: src/libaudgui/infowin.c:387
+#: src/libaudgui/infowin.c:389
 msgid "Title"
 msgstr "Título"
 
-#: src/libaudgui/infowin.c:399
+#: src/libaudgui/infowin.c:401
 msgid "Artist"
 msgstr "Artista"
 
-#: src/libaudgui/infowin.c:411
+#: src/libaudgui/infowin.c:413
 msgid "Album"
 msgstr "Álbum"
 
-#: src/libaudgui/infowin.c:423
+#: src/libaudgui/infowin.c:425
 msgid "Comment"
 msgstr "Comentario"
 
-#: src/libaudgui/infowin.c:435
+#: src/libaudgui/infowin.c:437
 msgid "Genre"
 msgstr "Género"
 
-#: src/libaudgui/infowin.c:456
+#: src/libaudgui/infowin.c:458
 msgid "Year"
 msgstr "Año"
 
-#: src/libaudgui/infowin.c:467
+#: src/libaudgui/infowin.c:469
 msgid "Track Number"
 msgstr "Numero de pista"
 
-#: src/libaudgui/infowin.c:549
+#: src/libaudgui/infowin.c:548
 #, c-format
 msgid "%d kb/s"
 msgstr "%d kb/s"
 
-#: src/libaudgui/infowin.c:579
+#: src/libaudgui/infowin.c:575
 #, c-format
 msgid "No info available for %s.\n"
 msgstr "No hay información disponible para %s.\n"
 
-#: src/libaudgui/jump-to-time.c:75
+#: src/libaudgui/jump-to-time.c:72
 msgid "Jump to Time"
 msgstr "Saltar en el tiempo"
 
-#: src/libaudgui/jump-to-time.c:90
+#: src/libaudgui/jump-to-time.c:87
 msgid "mm:ss"
 msgstr "mm:ss"
 
-#: src/libaudgui/playlists.c:39
+#: src/libaudgui/playlists.c:33
 msgid "Export Playlist"
 msgstr "Exportar lista de reproducción"
 
-#: src/libaudgui/playlists.c:39
+#: src/libaudgui/playlists.c:33
 msgid "Import Playlist"
 msgstr "Importar lista de reproducción"
 
-#: src/libaudgui/playlists.c:72
+#: src/libaudgui/playlists.c:66
 #, c-format
 msgid "Overwrite %s?"
 msgstr "¿Sobrescribir %s?"
 
-#: src/libaudgui/queue-manager.c:185
+#: src/libaudgui/queue-manager.c:196
 msgid "Queue Manager"
 msgstr "Gestor de cola"
 
-#: src/libaudgui/ui_about.c:69
-msgid "About Audacious"
-msgstr "Acerca de Audacious"
-
-#: src/libaudgui/ui_about.c:90 src/libaudgui/ui_credits.c:122
-msgid "Credits"
-msgstr "Créditos:"
-
-#: src/libaudgui/ui_credits.c:126
-msgid "Translators"
-msgstr "Traductores"
-
 #: src/libaudgui/ui_fileopener.c:109
 msgid "Open Files"
 msgstr "Abrir archivos"
@@ -1093,60 +1117,60 @@
 msgid "Close dialog on Add"
 msgstr "Cerrar diálogo al añadir"
 
-#: src/libaudgui/ui_jumptotrack.c:103 src/libaudgui/ui_jumptotrack.c:111
-#: src/libaudgui/ui_jumptotrack.c:322
+#: src/libaudgui/ui_jumptotrack.c:109 src/libaudgui/ui_jumptotrack.c:117
+#: src/libaudgui/ui_jumptotrack.c:326
 msgid "_Queue"
 msgstr "_Cola"
 
-#: src/libaudgui/ui_jumptotrack.c:109
+#: src/libaudgui/ui_jumptotrack.c:115
 msgid "Un_queue"
 msgstr "_Remover de la cola"
 
-#: src/libaudgui/ui_jumptotrack.c:239
-msgid "Jump to Track"
-msgstr "Saltar a la pista"
+#: src/libaudgui/ui_jumptotrack.c:258
+msgid "Jump to Song"
+msgstr "Saltar a una canción"
 
-#: src/libaudgui/ui_jumptotrack.c:277
+#: src/libaudgui/ui_jumptotrack.c:281
 msgid "Filter: "
 msgstr "Filtro: "
 
-#: src/libaudgui/ui_jumptotrack.c:278
+#: src/libaudgui/ui_jumptotrack.c:282
 msgid "_Filter:"
 msgstr "_Filtro:"
 
-#: src/libaudgui/ui_jumptotrack.c:288
+#: src/libaudgui/ui_jumptotrack.c:292
 msgid "Remember"
 msgstr "Recordar"
 
-#: src/libaudgui/ui_jumptotrack.c:295
+#: src/libaudgui/ui_jumptotrack.c:299
 msgid "Clea_r"
 msgstr "Limpia_r"
 
-#: src/libaudgui/ui_jumptotrack.c:315
+#: src/libaudgui/ui_jumptotrack.c:319
 msgid "Close on Jump"
 msgstr "Cerrar al saltar"
 
-#: src/libaudgui/ui_playlist_manager.c:250
+#: src/libaudgui/ui_playlist_manager.c:253
 msgid "Playlist Manager"
 msgstr "Administrador de la lista de reproducción"
 
-#: src/libaudgui/ui_playlist_manager.c:277
+#: src/libaudgui/ui_playlist_manager.c:280
 msgid "Entries"
 msgstr "Entradas"
 
-#: src/libaudgui/ui_playlist_manager.c:298
+#: src/libaudgui/ui_playlist_manager.c:301
 msgid "_Rename"
 msgstr "_Renombrar"
 
-#: src/libaudgui/ui_playlist_manager.c:322
+#: src/libaudgui/ui_playlist_manager.c:325
 msgid "_Close dialog on activating playlist"
 msgstr "_Cerrar diálogo al activar la lista de reproducción"
 
-#: src/libaudgui/ui_urlopener.c:51
+#: src/libaudgui/ui_urlopener.c:48
 msgid "Open URL"
 msgstr "Abrir URL"
 
-#: src/libaudgui/ui_urlopener.c:51
+#: src/libaudgui/ui_urlopener.c:48
 msgid "Add URL"
 msgstr "Añadir URL"
 
@@ -1162,31 +1186,31 @@
 msgid "File is not a valid .desktop file"
 msgstr "El archivo no es un archivo .desktop válido"
 
-#: src/libeggsmclient/eggdesktopfile.c:188
+#: src/libeggsmclient/eggdesktopfile.c:191
 #, c-format
 msgid "Unrecognized desktop file Version '%s'"
 msgstr "Versión del archivo de escritorio no reconocida '%s'"
 
-#: src/libeggsmclient/eggdesktopfile.c:967
+#: src/libeggsmclient/eggdesktopfile.c:974
 #, c-format
 msgid "Starting %s"
 msgstr "Iniciando %s"
 
-#: src/libeggsmclient/eggdesktopfile.c:1108
+#: src/libeggsmclient/eggdesktopfile.c:1116
 msgid "Application does not accept documents on command line"
 msgstr "La aplicación no acepta documentos en la linea de comandos"
 
-#: src/libeggsmclient/eggdesktopfile.c:1176
+#: src/libeggsmclient/eggdesktopfile.c:1184
 #, c-format
 msgid "Unrecognized launch option: %d"
 msgstr "Opción de cargar no reconocida: %d"
 
-#: src/libeggsmclient/eggdesktopfile.c:1375
+#: src/libeggsmclient/eggdesktopfile.c:1391
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
 msgstr ""
 "No se pueden pasar documentos URI a una entrada de escritorio 'Type=Link'"
 
-#: src/libeggsmclient/eggdesktopfile.c:1396
+#: src/libeggsmclient/eggdesktopfile.c:1412
 msgid "Not a launchable item"
 msgstr "No es un objeto lanzable"

audacious-3.2.4.tar.bz2/po/es_AR.po Added

@@ -0,0 +1,1245 @@
+# Argentinian Spanish translation for Audacious
+# Copyright (C) Audacious translators
+# This file is distributed under the same license as the Audacious package.
+#
+# Translators:
+# Adrián Ramirez Escalante <buried.prophet@gmail.com>, 2012.
+# Cosme Domínguez Díaz <cosme.ddiaz@gmail.com>, 2010.
+# Francisco Javier F. Serrador <serrador@cvs.gnome.org>, 2004.
+# Gustavo D. Vranjes <gvranjes@nerdshack.com>, 2006.
+# Jeki Sinneo Leinos <jeki72@gmail.com>, 2008.
+# Jordi Amenós <>, 2011.
+# Jorge Andrés <winninglero@gmail.com>, 2010.
+# <xukosky@yahoo.es>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: Audacious\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2012-01-11 08:54-0500\n"
+"PO-Revision-Date: 2012-01-12 04:25+0000\n"
+"Last-Translator: Adrián Ramirez Escalante <buried.prophet@gmail.com>\n"
+"Language-Team: Spanish (Argentinian)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_AR\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: src/audacious/adder.c:77
+msgid "Searching ..."
+msgstr "Buscando ..."
+
+#: src/audacious/adder.c:113
+#, c-format
+msgid "%d file found"
+msgid_plural "%d files found"
+msgstr[0] "%d archivo encontrado"
+msgstr[1] "%d archivos encontrados"
+
+#: src/audacious/chardet.c:39
+msgid " (invalid UTF-8)"
+msgstr " (UTF-8 inválido)"
+
+#: src/audacious/credits.c:37
+msgid "Core developers:"
+msgstr "Desarrolladores del núcleo:"
+
+#: src/audacious/credits.c:51
+msgid "Graphics:"
+msgstr "Gráficos:"
+
+#: src/audacious/credits.c:56
+msgid "Default skin:"
+msgstr "Skin por defecto:"
+
+#: src/audacious/credits.c:62
+msgid "Plugin development:"
+msgstr "Desarrollo de complementos:"
+
+#: src/audacious/credits.c:85
+msgid "Patch authors:"
+msgstr "Autores de parches:"
+
+#: src/audacious/credits.c:131
+msgid "1.x developers:"
+msgstr "Desarrolladores 1.x:"
+
+#: src/audacious/credits.c:153
+msgid "BMP Developers:"
+msgstr "Desarrolladores de BMP:"
+
+#: src/audacious/credits.c:185
+msgid "Belarusian:"
+msgstr "Bielorruso:"
+
+#: src/audacious/credits.c:188
+msgid "Basque:"
+msgstr "Vasco:"
+
+#: src/audacious/credits.c:191
+msgid "Brazilian Portuguese:"
+msgstr "Portugués de Brasil:"
+
+#: src/audacious/credits.c:196
+msgid "Breton:"
+msgstr "Bretón:"
+
+#: src/audacious/credits.c:199
+msgid "Bulgarian:"
+msgstr "Búlgaro:"
+
+#: src/audacious/credits.c:202
+msgid "Catalan:"
+msgstr "Catalán:"
+
+#: src/audacious/credits.c:206
+msgid "Chinese:"
+msgstr "Chino:"
+
+#: src/audacious/credits.c:209
+msgid "Croatian:"
+msgstr "Croato:"
+
+#: src/audacious/credits.c:212
+msgid "Czech:"
+msgstr "Checo:"
+
+#: src/audacious/credits.c:215
+msgid "Dutch:"
+msgstr "Holandés:"
+
+#: src/audacious/credits.c:219
+msgid "Estonian:"
+msgstr "Estonio:"
+
+#: src/audacious/credits.c:222
+msgid "Finnish:"
+msgstr "Finlandés:"
+
+#: src/audacious/credits.c:227
+msgid "French:"
+msgstr "Francés:"
+
+#: src/audacious/credits.c:233
+msgid "German:"
+msgstr "Alemán:"
+
+#: src/audacious/credits.c:240
+msgid "Georgian:"
+msgstr "Georgiano:"
+
+#: src/audacious/credits.c:243
+msgid "Greek:"
+msgstr "Griego:"
+
+#: src/audacious/credits.c:248
+msgid "Hindi:"
+msgstr "Hindú:"
+
+#: src/audacious/credits.c:251
+msgid "Hungarian:"
+msgstr "Húngaro:"
+
+#: src/audacious/credits.c:255
+msgid "Italian:"
+msgstr "Italiano:"
+
+#: src/audacious/credits.c:260
+msgid "Japanese:"
+msgstr "Japonés:"
+
+#: src/audacious/credits.c:263
+msgid "Korean:"
+msgstr "Coreano:"
+
+#: src/audacious/credits.c:266
+msgid "Latvian:"
+msgstr "Letón:"
+
+#: src/audacious/credits.c:269
+msgid "Lithuanian:"
+msgstr "Lituano:"
+
+#: src/audacious/credits.c:274
+msgid "Macedonian:"
+msgstr "Macedonio:"
+
+#: src/audacious/credits.c:277
+msgid "Mexican Spanish:"
+msgstr "Español mexicano:"
+
+#: src/audacious/credits.c:280
+msgid "Polish:"
+msgstr "Polaco:"
+
+#: src/audacious/credits.c:287
+msgid "Portuguese:"
+msgstr "Portugués:"
+
+#: src/audacious/credits.c:290
+msgid "Romanian:"
+msgstr "Rumano:"
+
+#: src/audacious/credits.c:294
+msgid "Russian:"
+msgstr "Ruso:"
+
+#: src/audacious/credits.c:298
+msgid "Serbian (Latin):"
+msgstr "Serbio (Latin):"
+
+#: src/audacious/credits.c:301
+msgid "Serbian (Cyrillic):"
+msgstr "Serbio (Cyrillic):"
+
+#: src/audacious/credits.c:305
+msgid "Simplified Chinese:"
+msgstr "Chino simplificado:"
+
+#: src/audacious/credits.c:308
+msgid "Slovak:"
+msgstr "Eslovaco:"
+
+#: src/audacious/credits.c:312
+msgid "Spanish:"
+msgstr "Español:"
+
+#: src/audacious/credits.c:320
+msgid "Swedish:"
+msgstr "Sueco:"
+
+#: src/audacious/credits.c:323
+msgid "Traditional Chinese:"
+msgstr "Chino tradicional:"
+
+#: src/audacious/credits.c:329
+msgid "Turkish:"
+msgstr "Turco:"
+
+#: src/audacious/credits.c:333
+msgid "Ukrainian:"
+msgstr "Ucraniano:"
+
+#: src/audacious/credits.c:338
+msgid "Vietnamese:"
+msgstr "Vietnamita:"
+
+#: src/audacious/credits.c:341
+msgid "Welsh:"
+msgstr "Galés:"
+
+#: src/audacious/equalizer_preset.c:180
+#, c-format
+msgid "Error importing Winamp EQF file '%s'"
+msgstr "Error importando archivo Winamp EQF '%s'"
+
+#: src/audacious/main.c:243
+msgid "Skip backwards in playlist"
+msgstr "Ir hacia atrás en la lista de reproducción"
+
+#: src/audacious/main.c:244
+msgid "Start playing current playlist"
+msgstr "Reproducir la lista de reproducción actual"
+
+#: src/audacious/main.c:245
+msgid "Pause current song"
+msgstr "Pausar la canción actual"
+
+#: src/audacious/main.c:246
+msgid "Stop current song"
+msgstr "Parar la canción actual"
+
+#: src/audacious/main.c:247
+msgid "Pause if playing, play otherwise"
+msgstr "Pausar si se está reproduciendo, o reproducir"
+
+#: src/audacious/main.c:248
+msgid "Skip forward in playlist"
+msgstr "Ir hacia adelante en la lista de reproducción"
+
+#: src/audacious/main.c:249
+msgid "Display Jump to File dialog"
+msgstr "Mostrar diálogo de ir al archivo"
+
+#: src/audacious/main.c:250
+msgid "Add files to the playlist"
+msgstr "Añadir archivos a la lista de reproducción"
+
+#: src/audacious/main.c:251
+msgid "Add new files to a temporary playlist"
+msgstr "Agregar nuevos archivos a una lista de reproducción temporal"
+
+#: src/audacious/main.c:252
+msgid "Display the main window"
+msgstr "Mostrar la ventana principal"
+
+#: src/audacious/main.c:253
+msgid "Show version"
+msgstr "Mostrar versión"
+
+#: src/audacious/main.c:254
+msgid "Print debugging messages"
+msgstr "Imprimir mensajes de depuración"
+
+#: src/audacious/main.c:255
+msgid "Headless mode (beta)"
+msgstr "Modo sin cabecera (beta)"
+
+#: src/audacious/main.c:256
+msgid "FILE..."
+msgstr "ARCHIVO..."
+
+#: src/audacious/main.c:268
+msgid "- play multimedia files"
+msgstr "- reproducir archivos multimedia"
+
+#: src/audacious/main.c:278
+#, c-format
+msgid ""
+"%s: %s\n"
+"Try `%s --help' for more information.\n"
+msgstr ""
+"%s: %s\n"
+"Probá `%s --help' para más información.\n"
+
+#: src/audacious/main.c:573
+msgid "Audacious"
+msgstr "Audacious"
+
+#: src/audacious/playback.c:307
+#, c-format
+msgid "No decoder found for %s."
+msgstr "No se encontró decodificador para %s."
+
+#: src/audacious/playlist-files.c:53
+#, c-format
+msgid "Cannot %s %s: unsupported file extension."
+msgstr "No se puede %s %s: la extensión del archivo no es válida."
+
+#: src/audacious/playlist-files.c:54
+msgid "save"
+msgstr "guardar"
+
+#: src/audacious/playlist-files.c:54
+msgid "load"
+msgstr "cargar"
+
+#: src/audacious/playlist-new.c:131
+msgid "New Playlist"
+msgstr "Nueva lista de reproducción"
+
+#: src/audacious/playlist-new.c:132
+msgid "Now Playing"
+msgstr "Reproducción actual"
+
+#: src/audacious/playlist-new.c:1630
+msgid ""
+"The playlist cannot be sorted because metadata scanning is still in progress"
+" (or has been disabled)."
+msgstr ""
+"La lista de reproducción no se puede ordenar porque la búsqueda de metadatos"
+" está en progreso (o ha sido deshabilitada)."
+
+#: src/audacious/ui_preferences.c:85
+msgid "Audio"
+msgstr "Audio"
+
+#: src/audacious/ui_preferences.c:86
+msgid "Network"
+msgstr "Red"
+
+#: src/audacious/ui_preferences.c:87 src/audacious/ui_preferences.c:1603
+msgid "Playlist"
+msgstr "Lista de reproducción"
+
+#: src/audacious/ui_preferences.c:88
+msgid "Plugins"
+msgstr "Complementos"
+
+#: src/audacious/ui_preferences.c:94 src/libaudgui/infopopup.c:199
+msgid "Artist"
+msgstr "Artista"
+
+#: src/audacious/ui_preferences.c:95 src/libaudgui/infopopup.c:201
+msgid "Album"
+msgstr "Álbum"
+
+#: src/audacious/ui_preferences.c:96 src/libaudgui/infopopup.c:197
+#: src/libaudgui/ui_playlist_manager.c:279
+msgid "Title"
+msgstr "Título"
+
+#: src/audacious/ui_preferences.c:97
+msgid "Tracknumber"
+msgstr "Número de pista"
+
+#: src/audacious/ui_preferences.c:98 src/libaudgui/infopopup.c:203
+msgid "Genre"
+msgstr "Género"
+
+#: src/audacious/ui_preferences.c:99
+msgid "Filename"
+msgstr "Nombre de archivo"
+
+#: src/audacious/ui_preferences.c:100
+msgid "Filepath"
+msgstr "Ruta hasta el archivo"
+
+#: src/audacious/ui_preferences.c:101
+msgid "Date"
+msgstr "Fecha"
+
+#: src/audacious/ui_preferences.c:102 src/libaudgui/infopopup.c:205
+msgid "Year"
+msgstr "Año"
+
+#: src/audacious/ui_preferences.c:103
+msgid "Comment"
+msgstr "Comentario"
+
+#: src/audacious/ui_preferences.c:104
+msgid "Codec"
+msgstr "Codec (formato)"
+
+#: src/audacious/ui_preferences.c:105
+msgid "Quality"
+msgstr "Calidad"
+
+#: src/audacious/ui_preferences.c:111
+msgid "None"
+msgstr "Ninguno"
+
+#: src/audacious/ui_preferences.c:112
+msgid "Arabic"
+msgstr "Arábico"
+
+#: src/audacious/ui_preferences.c:113
+msgid "Baltic"
+msgstr "Báltico"
+
+#: src/audacious/ui_preferences.c:114
+msgid "Chinese"
+msgstr "Chino"
+
+#: src/audacious/ui_preferences.c:115
+msgid "Greek"
+msgstr "Griego"
+
+#: src/audacious/ui_preferences.c:116
+msgid "Hebrew"
+msgstr "Hebreo"
+
+#: src/audacious/ui_preferences.c:117
+msgid "Japanese"
+msgstr "Japonés"
+
+#: src/audacious/ui_preferences.c:118
+msgid "Korean"
+msgstr "Coreano"
+
+#: src/audacious/ui_preferences.c:119
+msgid "Polish"
+msgstr "Polaco"
+
+#: src/audacious/ui_preferences.c:120
+msgid "Russian"
+msgstr "Ruso"
+
+#: src/audacious/ui_preferences.c:121
+msgid "Taiwanese"
+msgstr "Taiwanés"
+
+#: src/audacious/ui_preferences.c:122
+msgid "Turkish"
+msgstr "Turco"
+
+#: src/audacious/ui_preferences.c:144
+msgid "Album mode"
+msgstr "Modo de álbum"
+
+#: src/audacious/ui_preferences.c:147
+msgid "Output Settings"
+msgstr "Ajustes de salida"
+
+#: src/audacious/ui_preferences.c:149
+msgid "Bit depth:"
+msgstr "Profundidad de bit:"
+
+#: src/audacious/ui_preferences.c:152
+msgid "Buffer size:"
+msgstr "Tamaño del búfer:"
+
+#: src/audacious/ui_preferences.c:154
+msgid "ms"
+msgstr "ms"
+
+#: src/audacious/ui_preferences.c:155
+msgid "Use software volume control (not recommended)"
+msgstr "Usar control de volumen por software (no recomendado)"
+
+#: src/audacious/ui_preferences.c:157
+msgid "Replay Gain"
+msgstr "Normalizar volumen"
+
+#: src/audacious/ui_preferences.c:158
+msgid "Enable Replay Gain"
+msgstr "Activar la normalización de volumen"
+
+#: src/audacious/ui_preferences.c:161
+msgid "Prevent clipping (recommended)"
+msgstr "Evitar cortes (recomendado)"
+
+#: src/audacious/ui_preferences.c:163
+msgid "Adjust Levels"
+msgstr "Ajustar niveles"
+
+#: src/audacious/ui_preferences.c:164
+msgid "Amplify all files:"
+msgstr "Amplificar todos los archivos:"
+
+#: src/audacious/ui_preferences.c:166 src/audacious/ui_preferences.c:169
+msgid "dB"
+msgstr "dB"
+
+#: src/audacious/ui_preferences.c:167
+msgid "Amplify untagged files:"
+msgstr "Amplificar archivos sin etiqueta:"
+
+#: src/audacious/ui_preferences.c:172
+msgid "Proxy hostname:"
+msgstr "Servidor proxy:"
+
+#: src/audacious/ui_preferences.c:173
+msgid "Proxy port:"
+msgstr "Puerto del proxy:"
+
+#: src/audacious/ui_preferences.c:176
+msgid "Proxy username:"
+msgstr "Nombre de usuario del proxy:"
+
+#: src/audacious/ui_preferences.c:177
+msgid "Proxy password:"
+msgstr "Contraseña del proxy:"
+
+#: src/audacious/ui_preferences.c:181
+msgid "Proxy Configuration"
+msgstr "Configuración del Proxy"
+
+#: src/audacious/ui_preferences.c:182
+msgid "Enable proxy usage"
+msgstr "Activar uso del proxy"
+
+#: src/audacious/ui_preferences.c:185
+msgid "Use authentication with proxy"
+msgstr "Usar autenticación con el proxy"
+
+#: src/audacious/ui_preferences.c:193
+msgid "Auto character encoding detector for:"
+msgstr "Detector de codificación de caracteres automático para: "
+
+#: src/audacious/ui_preferences.c:198
+msgid "Fallback character encodings:"
+msgstr "Codificación de caracteres alternativa:"
+
+#: src/audacious/ui_preferences.c:202
+msgid "Behavior"
+msgstr "Comportamiento"
+
+#: src/audacious/ui_preferences.c:203
+msgid "Continue playback on startup"
+msgstr "Continuar la reproducción al iniciar"
+
+#: src/audacious/ui_preferences.c:205
+msgid "Advance when the current song is deleted"
+msgstr "Avanzar cuando se borra la canción actual"
+
+#: src/audacious/ui_preferences.c:207
+msgid "Clear the playlist when opening files"
+msgstr "Limpiar la lista de reproducción al abrir archivos"
+
+#: src/audacious/ui_preferences.c:209
+msgid "Open files in a temporary playlist"
+msgstr "Abrir archivos en una lista de reproducción temporal"
+
+#: src/audacious/ui_preferences.c:211
+msgid "Metadata"
+msgstr "Metadatos"
+
+#: src/audacious/ui_preferences.c:212
+msgid "Do not load metadata for songs until played"
+msgstr "No cargar la información de metadatos hasta reproducir"
+
+#: src/audacious/ui_preferences.c:230
+msgid "TITLE"
+msgstr "TÍTULO"
+
+#: src/audacious/ui_preferences.c:231
+msgid "ARTIST - TITLE"
+msgstr "ARTISTA - TÍTULO"
+
+#: src/audacious/ui_preferences.c:232
+msgid "ARTIST - ALBUM - TITLE"
+msgstr "ARTISTA - ÁLBUM - TÍTULO"
+
+#: src/audacious/ui_preferences.c:233
+msgid "ARTIST - ALBUM - TRACK. TITLE"
+msgstr "ARTISTA - ÁLBUM - PISTA. TÍTULO"
+
+#: src/audacious/ui_preferences.c:234
+msgid "ARTIST [ ALBUM ] - TRACK. TITLE"
+msgstr "ARTISTA [ ÁLBUM ] - PISTA. TÍTULO"
+
+#: src/audacious/ui_preferences.c:235
+msgid "ALBUM - TITLE"
+msgstr "ÁLBUM - TÍTULO"
+
+#: src/audacious/ui_preferences.c:556
+msgid "Category"
+msgstr "Categoría"
+
+#: src/audacious/ui_preferences.c:780
+msgid "Popup Information Settings"
+msgstr "Ajustes de la información emergente"
+
+#: src/audacious/ui_preferences.c:789
+msgid "Cover image retrieve"
+msgstr "Recuperar carátula"
+
+#: src/audacious/ui_preferences.c:794
+msgid ""
+"While searching for the album's cover, Audacious looks for certain words in "
+"the filename. You can specify those words in the lists below, separated "
+"using commas."
+msgstr ""
+"Cuando se busca la carátula del álbum, Audacious se fija en ciertas palabras"
+" en el nombre del archivo. Se pueden especificar éstas palabras en la lista "
+"de abajo, separadas con comas."
+
+#: src/audacious/ui_preferences.c:811
+msgid "Exclude:"
+msgstr "Excluir:"
+
+#: src/audacious/ui_preferences.c:818
+msgid "Include:"
+msgstr "Incluir:"
+
+#: src/audacious/ui_preferences.c:835
+msgid "Recursively search for cover"
+msgstr "Búsqueda recursiva para las carátulas"
+
+#: src/audacious/ui_preferences.c:845
+msgid "Search depth: "
+msgstr "Profundidad de la búsqueda:"
+
+#: src/audacious/ui_preferences.c:859
+msgid "Use per-file cover"
+msgstr "Usar carátula por archivo"
+
+#: src/audacious/ui_preferences.c:862
+msgid "Miscellaneous"
+msgstr "Varios"
+
+#: src/audacious/ui_preferences.c:871
+msgid "Show Progress bar for the current track"
+msgstr "Mostrar barra de progreso para la pista actual"
+
+#: src/audacious/ui_preferences.c:881
+msgid "Delay until filepopup comes up: "
+msgstr "Esperar hasta que la ventana emergente aparezca: "
+
+#: src/audacious/ui_preferences.c:1309
+msgid "Custom"
+msgstr "Personalizada"
+
+#: src/audacious/ui_preferences.c:1352
+msgid "Song Display"
+msgstr "Visualización de las canciones"
+
+#: src/audacious/ui_preferences.c:1361
+msgid "Show song numbers"
+msgstr "Mostrar números de las canciones"
+
+#: src/audacious/ui_preferences.c:1372
+msgid "Show leading zeroes (02:00 instead of 2:00)"
+msgstr "Mostrar ceros a la izquierda (02:00 en lugar de 2:00)"
+
+#: src/audacious/ui_preferences.c:1394
+msgid "Show information about titlestring format"
+msgstr "Mostrar información acerca del formato del título"
+
+#: src/audacious/ui_preferences.c:1410
+msgid "Custom string:"
+msgstr "Cadena personalizada:"
+
+#: src/audacious/ui_preferences.c:1417
+msgid "Title format:"
+msgstr "Formato del título:"
+
+#: src/audacious/ui_preferences.c:1428
+msgid "Popup Information"
+msgstr "Información emergente"
+
+#: src/audacious/ui_preferences.c:1443
+msgid "Show popup information for playlist entries"
+msgstr ""
+"Mostrar información emergente para las entradas de la lista de canciones"
+
+#: src/audacious/ui_preferences.c:1444
+msgid ""
+"Toggles popup information window for the pointed entry in the playlist. The "
+"window shows title of song, name of album, genre, year of publish, track "
+"number, track length, and artwork."
+msgstr ""
+"Activa la información de la ventana emergente para la entrada señalada en la"
+" lista de canciones. La ventana muestra el título de la canción, nombre del "
+"álbum, género, año de publicación, número de pista, duración de la pista y "
+"el arte de tapa."
+
+#: src/audacious/ui_preferences.c:1455
+msgid "Edit settings for popup information"
+msgstr "Editar ajustes para la información emergente"
+
+#: src/audacious/ui_preferences.c:1544
+msgid "Output plugin:"
+msgstr "Complemento de salida:"
+
+#: src/audacious/ui_preferences.c:1603
+msgid "Transport"
+msgstr "Transporte"
+
+#: src/audacious/ui_preferences.c:1603
+msgid "Input"
+msgstr "Entrada"
+
+#: src/audacious/ui_preferences.c:1604
+msgid "Effect"
+msgstr "Efecto"
+
+#: src/audacious/ui_preferences.c:1604
+msgid "Visualization"
+msgstr "Visualización"
+
+#: src/audacious/ui_preferences.c:1604
+msgid "General"
+msgstr "General"
+
+#: src/audacious/ui_preferences.c:1644
+msgid "Audacious Preferences"
+msgstr "Preferencias de Audacious"
+
+#: src/audacious/util.c:120
+#, c-format
+msgid "Could not create directory (%s): %s\n"
+msgstr "No se pudo crear el directorio (%s): %s\n"
+
+#: src/audtool/handlers_playlist.c:273
+msgid "Position not found."
+msgstr "Posición no encontrada."
+
+#: src/audtool/handlers_vitals.c:63
+msgid "No song playing."
+msgstr "No se reproduce ninguna canción."
+
+#: src/libaudcore/audstrings.c:199
+#, c-format
+msgid "Audio CD, track %s"
+msgstr "CD de audio, pista %s"
+
+#: src/libaudcore/tuple.c:536
+msgid "Mono"
+msgstr "Mono"
+
+#: src/libaudcore/tuple.c:538
+msgid "Stereo"
+msgstr "Estéreo"
+
+#: src/libaudcore/tuple.c:540
+#, c-format
+msgid "%d channel"
+msgid_plural "%d channels"
+msgstr[0] "%d canal"
+msgstr[1] "%d canales"
+
+#: src/libaudgui/about.c:52 src/libaudgui/about.c:115
+msgid "Credits"
+msgstr "Créditos:"
+
+#: src/libaudgui/about.c:52
+msgid "Translators"
+msgstr "Traductores"
+
+#: src/libaudgui/about.c:91
+msgid "About Audacious"
+msgstr "Acerca de Audacious"
+
+#: src/libaudgui/confirm.c:76
+#, c-format
+msgid ""
+"Are you sure you want to close %s? If you do, any changes made since the "
+"playlist was exported will be lost."
+msgstr ""
+"¿Estas seguro que querés cerrar %s? Si lo haces, se perderá cualquier "
+"cambio realizado desde que fue exportada la lista de reproducción."
+
+#: src/libaudgui/confirm.c:89
+msgid "_Don't show this message again"
+msgstr "_No mostrar este mensaje otra vez"
+
+#: src/libaudgui/confirm.c:126
+msgid "Rename Playlist"
+msgstr "Renombrar la lista de reproducción"
+
+#: src/libaudgui/effects-menu.c:74
+msgid "settings ..."
+msgstr "ajustes ..."
+
+#: src/libaudgui/equalizer.c:51
+msgid "_Enable"
+msgstr "_Activar"
+
+#: src/libaudgui/equalizer.c:123
+msgid "31 Hz"
+msgstr "31 Hz"
+
+#: src/libaudgui/equalizer.c:123
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/libaudgui/equalizer.c:124
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: src/libaudgui/equalizer.c:124
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: src/libaudgui/equalizer.c:124
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: src/libaudgui/equalizer.c:124
+msgid "1 kHz"
+msgstr "1 kHz"
+
+#: src/libaudgui/equalizer.c:124
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/libaudgui/equalizer.c:125
+msgid "4 kHz"
+msgstr "4 kHz"
+
+#: src/libaudgui/equalizer.c:125
+msgid "8 kHz"
+msgstr "8 kHz"
+
+#: src/libaudgui/equalizer.c:125
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/libaudgui/equalizer.c:130
+msgid "Equalizer"
+msgstr "Ecualizador"
+
+#: src/libaudgui/equalizer.c:146
+msgid "Preamp"
+msgstr "Preamplificación"
+
+#: src/libaudgui/infopopup.c:207
+msgid "Track Number"
+msgstr "Número de pista"
+
+#: src/libaudgui/infopopup.c:209
+msgid "Track Length"
+msgstr "Duración de la pista:"
+
+#: src/libaudgui/infowin.c:75
+msgid "Acid Jazz"
+msgstr "Jazz ácido"
+
+#: src/libaudgui/infowin.c:76
+msgid "Acid Rock"
+msgstr "Rock ácido"
+
+#: src/libaudgui/infowin.c:77
+msgid "Ambient"
+msgstr "Ambiental"
+
+#: src/libaudgui/infowin.c:78
+msgid "Bebop"
+msgstr "Bebop"
+
+#: src/libaudgui/infowin.c:79
+msgid "Bluegrass"
+msgstr "Bluegrass"
+
+#: src/libaudgui/infowin.c:80
+msgid "Blues"
+msgstr "Blues"
+
+#: src/libaudgui/infowin.c:81
+msgid "Chamber Music"
+msgstr "Música de cámara"
+
+#: src/libaudgui/infowin.c:82
+msgid "Classical"
+msgstr "Clásica"
+
+#: src/libaudgui/infowin.c:83
+msgid "Country"
+msgstr "Country"
+
+#: src/libaudgui/infowin.c:84
+msgid "Death Metal"
+msgstr "Death Metal"
+
+#: src/libaudgui/infowin.c:85
+msgid "Disco"
+msgstr "Disco"
+
+#: src/libaudgui/infowin.c:86
+msgid "Easy Listening"
+msgstr "Easy Listening"
+
+#: src/libaudgui/infowin.c:87
+msgid "Folk"
+msgstr "Folclore"
+
+#: src/libaudgui/infowin.c:88
+msgid "Funk"
+msgstr "Funk"
+
+#: src/libaudgui/infowin.c:89
+msgid "Gangsta Rap"
+msgstr "Gangsta Rap"
+
+#: src/libaudgui/infowin.c:90
+msgid "Gospel"
+msgstr "Gospel"
+
+#: src/libaudgui/infowin.c:91
+msgid "Grunge"
+msgstr "Grunge"
+
+#: src/libaudgui/infowin.c:92
+msgid "Hard Rock"
+msgstr "Hard Rock"
+
+#: src/libaudgui/infowin.c:93
+msgid "Heavy Metal"
+msgstr "Heavy Metal"
+
+#: src/libaudgui/infowin.c:94
+msgid "Hip-hop"
+msgstr "Hip-hop"
+
+#: src/libaudgui/infowin.c:95
+msgid "House"
+msgstr "House"
+
+#: src/libaudgui/infowin.c:96
+msgid "Jazz"
+msgstr "Jazz"
+
+#: src/libaudgui/infowin.c:97
+msgid "Jungle"
+msgstr "Jungle"
+
+#: src/libaudgui/infowin.c:98
+msgid "Metal"
+msgstr "Metal"
+
+#: src/libaudgui/infowin.c:99
+msgid "New Age"
+msgstr "New age"
+
+#: src/libaudgui/infowin.c:100
+msgid "New Wave"
+msgstr "New wave"
+
+#: src/libaudgui/infowin.c:101
+msgid "Noise"
+msgstr "Noise"
+
+#: src/libaudgui/infowin.c:102
+msgid "Pop"
+msgstr "Pop"
+
+#: src/libaudgui/infowin.c:103
+msgid "Punk Rock"
+msgstr "Rock Punk"
+
+#: src/libaudgui/infowin.c:104
+msgid "Rap"
+msgstr "Rap"
+
+#: src/libaudgui/infowin.c:105
+msgid "Reggae"
+msgstr "Reggae"
+
+#: src/libaudgui/infowin.c:106
+msgid "Rock"
+msgstr "Rock"
+
+#: src/libaudgui/infowin.c:107
+msgid "Rock and Roll"
+msgstr "Rock and Roll"
+
+#: src/libaudgui/infowin.c:108
+msgid "Rhythm and Blues"
+msgstr "Rhythm and Blues"
+
+#: src/libaudgui/infowin.c:109
+msgid "Ska"
+msgstr "Ska"
+
+#: src/libaudgui/infowin.c:110
+msgid "Soul"
+msgstr "Soul"
+
+#: src/libaudgui/infowin.c:111
+msgid "Swing"
+msgstr "Swing"
+
+#: src/libaudgui/infowin.c:112
+msgid "Techno"
+msgstr "Techno"
+
+#: src/libaudgui/infowin.c:113
+msgid "Trip-hop"
+msgstr "Trip-hop"
+
+#: src/libaudgui/infowin.c:177 src/libaudgui/infowin.c:363
+#: src/libaudgui/infowin.c:366 src/libaudgui/infowin.c:369
+msgid "n/a"
+msgstr "n/a"
+
+#: src/libaudgui/infowin.c:267
+msgid "Metadata updated successfully"
+msgstr "Metadata actualizada sin problemas"
+
+#: src/libaudgui/infowin.c:272
+msgid "Metadata updating failed"
+msgstr "Falló la actualización de metadatos"
+
+#: src/libaudgui/infowin.c:320
+msgid "Track Information"
+msgstr "Información de pista"
+
+#: src/libaudgui/infowin.c:352
+msgid "Format:"
+msgstr "Formato:"
+
+#: src/libaudgui/infowin.c:356
+msgid "Quality:"
+msgstr "Calidad:"
+
+#: src/libaudgui/infowin.c:359
+msgid "Bitrate:"
+msgstr "Bitrate:"
+
+#: src/libaudgui/infowin.c:389
+msgid "Title"
+msgstr "Título"
+
+#: src/libaudgui/infowin.c:401
+msgid "Artist"
+msgstr "Artista"
+
+#: src/libaudgui/infowin.c:413
+msgid "Album"
+msgstr "Álbum"
+
+#: src/libaudgui/infowin.c:425
+msgid "Comment"
+msgstr "Comentario"
+
+#: src/libaudgui/infowin.c:437
+msgid "Genre"
+msgstr "Género"
+
+#: src/libaudgui/infowin.c:458
+msgid "Year"
+msgstr "Año"
+
+#: src/libaudgui/infowin.c:469
+msgid "Track Number"
+msgstr "Numero de pista"
+
+#: src/libaudgui/infowin.c:548
+#, c-format
+msgid "%d kb/s"
+msgstr "%d kb/s"
+
+#: src/libaudgui/infowin.c:575
+#, c-format
+msgid "No info available for %s.\n"
+msgstr "No hay información disponible para %s.\n"
+
+#: src/libaudgui/jump-to-time.c:72
+msgid "Jump to Time"
+msgstr "Ir a tiempo"
+
+#: src/libaudgui/jump-to-time.c:87
+msgid "mm:ss"
+msgstr "mm:ss"
+
+#: src/libaudgui/playlists.c:33
+msgid "Export Playlist"
+msgstr "Exportar lista de reproducción"
+
+#: src/libaudgui/playlists.c:33
+msgid "Import Playlist"
+msgstr "Importar lista de reproducción"
+
+#: src/libaudgui/playlists.c:66
+#, c-format
+msgid "Overwrite %s?"
+msgstr "¿Sobrescribir %s?"
+
+#: src/libaudgui/queue-manager.c:196
+msgid "Queue Manager"
+msgstr "Gestor de cola de reproducción"
+
+#: src/libaudgui/ui_fileopener.c:109
+msgid "Open Files"
+msgstr "Abrir archivos"
+
+#: src/libaudgui/ui_fileopener.c:109
+msgid "Add Files"
+msgstr "Añadir archivos..."
+
+#: src/libaudgui/ui_fileopener.c:111
+msgid "Close dialog on Open"
+msgstr "Cerrar diálogo al abrir"
+
+#: src/libaudgui/ui_fileopener.c:111
+msgid "Close dialog on Add"
+msgstr "Cerrar diálogo al añadir"
+
+#: src/libaudgui/ui_jumptotrack.c:109 src/libaudgui/ui_jumptotrack.c:117
+#: src/libaudgui/ui_jumptotrack.c:326
+msgid "_Queue"
+msgstr "_Cola"
+
+#: src/libaudgui/ui_jumptotrack.c:115
+msgid "Un_queue"
+msgstr "_Remover de la cola"
+
+#: src/libaudgui/ui_jumptotrack.c:258
+msgid "Jump to Song"
+msgstr "Ir a una canción"
+
+#: src/libaudgui/ui_jumptotrack.c:281
+msgid "Filter: "
+msgstr "Filtro: "
+
+#: src/libaudgui/ui_jumptotrack.c:282
+msgid "_Filter:"
+msgstr "_Filtro:"
+
+#: src/libaudgui/ui_jumptotrack.c:292
+msgid "Remember"
+msgstr "Recordar"
+
+#: src/libaudgui/ui_jumptotrack.c:299
+msgid "Clea_r"
+msgstr "Limpia_r"
+
+#: src/libaudgui/ui_jumptotrack.c:319
+msgid "Close on Jump"
+msgstr "Cerrar al saltar"
+
+#: src/libaudgui/ui_playlist_manager.c:253
+msgid "Playlist Manager"
+msgstr "Administrador de la lista de reproducción"
+
+#: src/libaudgui/ui_playlist_manager.c:280
+msgid "Entries"
+msgstr "Entradas"
+
+#: src/libaudgui/ui_playlist_manager.c:301
+msgid "_Rename"
+msgstr "_Renombrar"
+
+#: src/libaudgui/ui_playlist_manager.c:325
+msgid "_Close dialog on activating playlist"
+msgstr "_Cerrar diálogo al activar la lista de reproducción"
+
+#: src/libaudgui/ui_urlopener.c:48
+msgid "Open URL"
+msgstr "Abrir URL"
+
+#: src/libaudgui/ui_urlopener.c:48
+msgid "Add URL"
+msgstr "Añadir URL"
+
+#: src/libaudgui/util.c:95
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+"\n"
+"(Se han ocultado el resto de mensajes.)"
+
+#: src/libeggsmclient/eggdesktopfile.c:165
+msgid "File is not a valid .desktop file"
+msgstr "El archivo no es un archivo .desktop válido"
+
+#: src/libeggsmclient/eggdesktopfile.c:191
+#, c-format
+msgid "Unrecognized desktop file Version '%s'"
+msgstr "Versión del archivo de escritorio no reconocida '%s'"
+
+#: src/libeggsmclient/eggdesktopfile.c:974
+#, c-format
+msgid "Starting %s"
+msgstr "Iniciando %s"
+
+#: src/libeggsmclient/eggdesktopfile.c:1116
+msgid "Application does not accept documents on command line"
+msgstr "La aplicación no acepta documentos en la linea de comandos"
+
+#: src/libeggsmclient/eggdesktopfile.c:1184
+#, c-format
+msgid "Unrecognized launch option: %d"
+msgstr "Opción de cargar no reconocida: %d"
+
+#: src/libeggsmclient/eggdesktopfile.c:1391
+msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
+msgstr ""
+"No se pueden pasar documentos URI a una entrada de escritorio 'Type=Link'"
+
+#: src/libeggsmclient/eggdesktopfile.c:1412
+msgid "Not a launchable item"
+msgstr "No es un objeto lanzable"
+
+#: src/libeggsmclient/eggsmclient.c:226
+msgid "Disable connection to session manager"
+msgstr "Conexión con el administrador de sesión deshabilitada"
+
+#: src/libeggsmclient/eggsmclient.c:229
+msgid "Specify file containing saved configuration"
+msgstr "Especificar archivo que contiene la configuración guardada"
+
+#: src/libeggsmclient/eggsmclient.c:229
+msgid "FILE"
+msgstr "ARCHIVO"
+
+#: src/libeggsmclient/eggsmclient.c:232
+msgid "Specify session management ID"
+msgstr "Especifique la ID de administración de sesiones"
+
+#: src/libeggsmclient/eggsmclient.c:232
+msgid "ID"
+msgstr "ID"
+
+#: src/libeggsmclient/eggsmclient.c:253
+msgid "Session management options:"
+msgstr "Opciones de la gestión de sesiones:"
+
+#: src/libeggsmclient/eggsmclient.c:254
+msgid "Show session management options"
+msgstr "Mostrar las opciones de gestión de sesiones"
+
+

audacious-3.2.4.tar.bz2/po/es_MX.po Added

@@ -0,0 +1,1219 @@
+# Mexican Spanish translation for Audacious
+# Copyright (C) Audacious translators
+# This file is distributed under the same license as the Audacious package.
+#
+# Translators:
+# Jorge A. García Sosa <jagsmd@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: Audacious\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2012-01-11 08:54-0500\n"
+"PO-Revision-Date: 2012-04-29 18:49+0000\n"
+"Last-Translator: Jorge A. García Sosa <jagsmd@gmail.com>\n"
+"Language-Team: Spanish (Mexican)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_MX\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: src/audacious/adder.c:77
+msgid "Searching ..."
+msgstr "Buscando..."
+
+#: src/audacious/adder.c:113
+#, c-format
+msgid "%d file found"
+msgid_plural "%d files found"
+msgstr[0] "%d archivo encontrado"
+msgstr[1] "%d archivos encontrados"
+
+#: src/audacious/chardet.c:39
+msgid " (invalid UTF-8)"
+msgstr " (UTF-8 no válido)"
+
+#: src/audacious/credits.c:37
+msgid "Core developers:"
+msgstr "Desarroladores del núcleo:"
+
+#: src/audacious/credits.c:51
+msgid "Graphics:"
+msgstr "Gráficas:"
+
+#: src/audacious/credits.c:56
+msgid "Default skin:"
+msgstr "Skin por defecto:"
+
+#: src/audacious/credits.c:62
+msgid "Plugin development:"
+msgstr "Desarrollo de plugins:"
+
+#: src/audacious/credits.c:85
+msgid "Patch authors:"
+msgstr "Autores de parches:"
+
+#: src/audacious/credits.c:131
+msgid "1.x developers:"
+msgstr "Desarrolladores 1.x:"
+
+#: src/audacious/credits.c:153
+msgid "BMP Developers:"
+msgstr "Desarrolladores BMP:"
+
+#: src/audacious/credits.c:185
+msgid "Belarusian:"
+msgstr "Bieloruso:"
+
+#: src/audacious/credits.c:188
+msgid "Basque:"
+msgstr "Vasco:"
+
+#: src/audacious/credits.c:191
+msgid "Brazilian Portuguese:"
+msgstr "Portugués brasileño:"
+
+#: src/audacious/credits.c:196
+msgid "Breton:"
+msgstr "Bretón:"
+
+#: src/audacious/credits.c:199
+msgid "Bulgarian:"
+msgstr "Búlgaro:"
+
+#: src/audacious/credits.c:202
+msgid "Catalan:"
+msgstr "Catalán:"
+
+#: src/audacious/credits.c:206
+msgid "Chinese:"
+msgstr "Chino:"
+
+#: src/audacious/credits.c:209
+msgid "Croatian:"
+msgstr "Croata:"
+
+#: src/audacious/credits.c:212
+msgid "Czech:"
+msgstr "Checo:"
+
+#: src/audacious/credits.c:215
+msgid "Dutch:"
+msgstr "Neerlandés:"
+
+#: src/audacious/credits.c:219
+msgid "Estonian:"
+msgstr "Estonio:"
+
+#: src/audacious/credits.c:222
+msgid "Finnish:"
+msgstr "Finés:"
+
+#: src/audacious/credits.c:227
+msgid "French:"
+msgstr "Francés:"
+
+#: src/audacious/credits.c:233
+msgid "German:"
+msgstr "Alemán:"
+
+#: src/audacious/credits.c:240
+msgid "Georgian:"
+msgstr "Georgiano:"
+
+#: src/audacious/credits.c:243
+msgid "Greek:"
+msgstr "Griego:"
+
+#: src/audacious/credits.c:248
+msgid "Hindi:"
+msgstr "Hindi:"
+
+#: src/audacious/credits.c:251
+msgid "Hungarian:"
+msgstr "Húngaro:"
+
+#: src/audacious/credits.c:255
+msgid "Italian:"
+msgstr "Italiano:"
+
+#: src/audacious/credits.c:260
+msgid "Japanese:"
+msgstr "Japonés:"
+
+#: src/audacious/credits.c:263
+msgid "Korean:"
+msgstr "Coreano:"
+
+#: src/audacious/credits.c:266
+msgid "Latvian:"
+msgstr "Letón:"
+
+#: src/audacious/credits.c:269
+msgid "Lithuanian:"
+msgstr "Lituano:"
+
+#: src/audacious/credits.c:274
+msgid "Macedonian:"
+msgstr "Macedonio:"
+
+#: src/audacious/credits.c:277
+msgid "Mexican Spanish:"
+msgstr "Español de México:"
+
+#: src/audacious/credits.c:280
+msgid "Polish:"
+msgstr "Polaco:"
+
+#: src/audacious/credits.c:287
+msgid "Portuguese:"
+msgstr "Portugués:"
+
+#: src/audacious/credits.c:290
+msgid "Romanian:"
+msgstr "Rumano:"
+
+#: src/audacious/credits.c:294
+msgid "Russian:"
+msgstr "Ruso:"
+
+#: src/audacious/credits.c:298
+msgid "Serbian (Latin):"
+msgstr "Serbio(Latín):"
+
+#: src/audacious/credits.c:301
+msgid "Serbian (Cyrillic):"
+msgstr "Serbio(Cirílico):"
+
+#: src/audacious/credits.c:305
+msgid "Simplified Chinese:"
+msgstr "Chino simplificado:"
+
+#: src/audacious/credits.c:308
+msgid "Slovak:"
+msgstr "Eslovaco:"
+
+#: src/audacious/credits.c:312
+msgid "Spanish:"
+msgstr "Español:"
+
+#: src/audacious/credits.c:320
+msgid "Swedish:"
+msgstr "Sueco:"
+
+#: src/audacious/credits.c:323
+msgid "Traditional Chinese:"
+msgstr "Chino tradicional:"
+
+#: src/audacious/credits.c:329
+msgid "Turkish:"
+msgstr "Turco:"
+
+#: src/audacious/credits.c:333
+msgid "Ukrainian:"
+msgstr "Ucraniano:"
+
+#: src/audacious/credits.c:338
+msgid "Vietnamese:"
+msgstr "Vietnamita:"
+
+#: src/audacious/credits.c:341
+msgid "Welsh:"
+msgstr "Galés:"
+
+#: src/audacious/equalizer_preset.c:180
+#, c-format
+msgid "Error importing Winamp EQF file '%s'"
+msgstr "Error al importar archivo EQF de Winamp '%s' "
+
+#: src/audacious/main.c:243
+msgid "Skip backwards in playlist"
+msgstr "Saltar hacia atrás en la lista de reproducción"
+
+#: src/audacious/main.c:244
+msgid "Start playing current playlist"
+msgstr "Comenzar a reproducir la lista actual"
+
+#: src/audacious/main.c:245
+msgid "Pause current song"
+msgstr "Pausar pista actual"
+
+#: src/audacious/main.c:246
+msgid "Stop current song"
+msgstr "Detener pista actual"
+
+#: src/audacious/main.c:247
+msgid "Pause if playing, play otherwise"
+msgstr "Pausar si está reproduciendo; de lo contrario, reproducir"
+
+#: src/audacious/main.c:248
+msgid "Skip forward in playlist"
+msgstr "Saltar hacia adelante en la lista de reproducción"
+
+#: src/audacious/main.c:249
+msgid "Display Jump to File dialog"
+msgstr "Mostrar dialogo Saltar al Archivo"
+
+#: src/audacious/main.c:250
+msgid "Add files to the playlist"
+msgstr "Agregar archivos a la lista de reproducción"
+
+#: src/audacious/main.c:251
+msgid "Add new files to a temporary playlist"
+msgstr "Agregar nuevos archivos a una lista de reproducción temporal"
+
+#: src/audacious/main.c:252
+msgid "Display the main window"
+msgstr "Mostrar la ventana principal"
+
+#: src/audacious/main.c:253
+msgid "Show version"
+msgstr "Mostrar versión"
+
+#: src/audacious/main.c:254
+msgid "Print debugging messages"
+msgstr "Imprimir mensajes debugging"
+
+#: src/audacious/main.c:255
+msgid "Headless mode (beta)"
+msgstr "Modo sin encabezado (beta)"
+
+#: src/audacious/main.c:256
+msgid "FILE..."
+msgstr "ARCHIVO..."
+
+#: src/audacious/main.c:268
+msgid "- play multimedia files"
+msgstr " - Reproducir archivos multimedia"
+
+#: src/audacious/main.c:278
+#, c-format
+msgid ""
+"%s: %s\n"
+"Try `%s --help' for more information.\n"
+msgstr "%s: %s\nIntenta `%s --ayuda' para mayor información.\n"
+
+#: src/audacious/main.c:573
+msgid "Audacious"
+msgstr "Audacious"
+
+#: src/audacious/playback.c:307
+#, c-format
+msgid "No decoder found for %s."
+msgstr "No se encontró un descodificador para %s."
+
+#: src/audacious/playlist-files.c:53
+#, c-format
+msgid "Cannot %s %s: unsupported file extension."
+msgstr "No se puede %s %s: extensión de archivo no soportada."
+
+#: src/audacious/playlist-files.c:54
+msgid "save"
+msgstr "guardar"
+
+#: src/audacious/playlist-files.c:54
+msgid "load"
+msgstr "cargar"
+
+#: src/audacious/playlist-new.c:131
+msgid "New Playlist"
+msgstr "Nueva Lista de reproducción"
+
+#: src/audacious/playlist-new.c:132
+msgid "Now Playing"
+msgstr "Reproduciendo"
+
+#: src/audacious/playlist-new.c:1630
+msgid ""
+"The playlist cannot be sorted because metadata scanning is still in progress"
+" (or has been disabled)."
+msgstr "La lista de reproducción no puede ser ordenada porque la exploración de metadatos está en progreso (o ha sido deshabilitada)."
+
+#: src/audacious/ui_preferences.c:85
+msgid "Audio"
+msgstr "Audio"
+
+#: src/audacious/ui_preferences.c:86
+msgid "Network"
+msgstr "Red"
+
+#: src/audacious/ui_preferences.c:87 src/audacious/ui_preferences.c:1603
+msgid "Playlist"
+msgstr "Lista de Reproducción"
+
+#: src/audacious/ui_preferences.c:88
+msgid "Plugins"
+msgstr "Plugins"
+
+#: src/audacious/ui_preferences.c:94 src/libaudgui/infopopup.c:199
+msgid "Artist"
+msgstr "Artista"
+
+#: src/audacious/ui_preferences.c:95 src/libaudgui/infopopup.c:201
+msgid "Album"
+msgstr "Álbum"
+
+#: src/audacious/ui_preferences.c:96 src/libaudgui/infopopup.c:197
+#: src/libaudgui/ui_playlist_manager.c:279
+msgid "Title"
+msgstr "Título"
+
+#: src/audacious/ui_preferences.c:97
+msgid "Tracknumber"
+msgstr "Número de pista"
+
+#: src/audacious/ui_preferences.c:98 src/libaudgui/infopopup.c:203
+msgid "Genre"
+msgstr "Género"
+
+#: src/audacious/ui_preferences.c:99
+msgid "Filename"
+msgstr "Nombre de archivo"
+
+#: src/audacious/ui_preferences.c:100
+msgid "Filepath"
+msgstr "Ruta de archivo"
+
+#: src/audacious/ui_preferences.c:101
+msgid "Date"
+msgstr "Fecha"
+
+#: src/audacious/ui_preferences.c:102 src/libaudgui/infopopup.c:205
+msgid "Year"
+msgstr "Año"
+
+#: src/audacious/ui_preferences.c:103
+msgid "Comment"
+msgstr "Comentario"
+
+#: src/audacious/ui_preferences.c:104
+msgid "Codec"
+msgstr "Codec"
+
+#: src/audacious/ui_preferences.c:105
+msgid "Quality"
+msgstr "Calidad"
+
+#: src/audacious/ui_preferences.c:111
+msgid "None"
+msgstr "Ninguno"
+
+#: src/audacious/ui_preferences.c:112
+msgid "Arabic"
+msgstr "Árabe"
+
+#: src/audacious/ui_preferences.c:113
+msgid "Baltic"
+msgstr "Báltico"
+
+#: src/audacious/ui_preferences.c:114
+msgid "Chinese"
+msgstr "Chino"
+
+#: src/audacious/ui_preferences.c:115
+msgid "Greek"
+msgstr "Griego"
+
+#: src/audacious/ui_preferences.c:116
+msgid "Hebrew"
+msgstr "Hebreo"
+
+#: src/audacious/ui_preferences.c:117
+msgid "Japanese"
+msgstr "Japonés"
+
+#: src/audacious/ui_preferences.c:118
+msgid "Korean"
+msgstr "Coreano"
+
+#: src/audacious/ui_preferences.c:119
+msgid "Polish"
+msgstr "Polaco"
+
+#: src/audacious/ui_preferences.c:120
+msgid "Russian"
+msgstr "Ruso"
+
+#: src/audacious/ui_preferences.c:121
+msgid "Taiwanese"
+msgstr "Taiwanés"
+
+#: src/audacious/ui_preferences.c:122
+msgid "Turkish"
+msgstr "Turco"
+
+#: src/audacious/ui_preferences.c:144
+msgid "Album mode"
+msgstr "Modo de Álbum"
+
+#: src/audacious/ui_preferences.c:147
+msgid "Output Settings"
+msgstr "Ajustes de Salida"
+
+#: src/audacious/ui_preferences.c:149
+msgid "Bit depth:"
+msgstr "Profundidad de bit:"
+
+#: src/audacious/ui_preferences.c:152
+msgid "Buffer size:"
+msgstr "Tamaño del Buffer:"
+
+#: src/audacious/ui_preferences.c:154
+msgid "ms"
+msgstr "ms"
+
+#: src/audacious/ui_preferences.c:155
+msgid "Use software volume control (not recommended)"
+msgstr "Usar control de volumen por software (no recomendado)"
+
+#: src/audacious/ui_preferences.c:157
+msgid "Replay Gain"
+msgstr "Replay Gain"
+
+#: src/audacious/ui_preferences.c:158
+msgid "Enable Replay Gain"
+msgstr "Habilitar Replay Gain"
+
+#: src/audacious/ui_preferences.c:161
+msgid "Prevent clipping (recommended)"
+msgstr "Evitar distorsiones clip (recomendado)"
+
+#: src/audacious/ui_preferences.c:163
+msgid "Adjust Levels"
+msgstr "Ajustar Niveles"
+
+#: src/audacious/ui_preferences.c:164
+msgid "Amplify all files:"
+msgstr "Amplificar todos los archivos:"
+
+#: src/audacious/ui_preferences.c:166 src/audacious/ui_preferences.c:169
+msgid "dB"
+msgstr "dB"
+
+#: src/audacious/ui_preferences.c:167
+msgid "Amplify untagged files:"
+msgstr "Amplificar archivos sin etiquetas:"
+
+#: src/audacious/ui_preferences.c:172
+msgid "Proxy hostname:"
+msgstr "Nombre del host proxy:"
+
+#: src/audacious/ui_preferences.c:173
+msgid "Proxy port:"
+msgstr "Puerto proxy:"
+
+#: src/audacious/ui_preferences.c:176
+msgid "Proxy username:"
+msgstr "nombre de usuario proxy:"
+
+#: src/audacious/ui_preferences.c:177
+msgid "Proxy password:"
+msgstr "contraseña proxy:"
+
+#: src/audacious/ui_preferences.c:181
+msgid "Proxy Configuration"
+msgstr "Configuración del Proxy"
+
+#: src/audacious/ui_preferences.c:182
+msgid "Enable proxy usage"
+msgstr "Habilitar uso del proxy"
+
+#: src/audacious/ui_preferences.c:185
+msgid "Use authentication with proxy"
+msgstr "Usar autenticación con el proxy"
+
+#: src/audacious/ui_preferences.c:193
+msgid "Auto character encoding detector for:"
+msgstr "Detector automático de codificación de caracteres para:"
+
+#: src/audacious/ui_preferences.c:198
+msgid "Fallback character encodings:"
+msgstr "Codificación de caracteres alternativa:"
+
+#: src/audacious/ui_preferences.c:202
+msgid "Behavior"
+msgstr "Comportamiento"
+
+#: src/audacious/ui_preferences.c:203
+msgid "Continue playback on startup"
+msgstr "Continuar reproducción al iniciar"
+
+#: src/audacious/ui_preferences.c:205
+msgid "Advance when the current song is deleted"
+msgstr "Avanzar cuando la pista actual sea borrada"
+
+#: src/audacious/ui_preferences.c:207
+msgid "Clear the playlist when opening files"
+msgstr "Limpiar la lista de reproducción al abrir archivos"
+
+#: src/audacious/ui_preferences.c:209
+msgid "Open files in a temporary playlist"
+msgstr "Abrir archivos en una lista de reproducción temporal"
+
+#: src/audacious/ui_preferences.c:211
+msgid "Metadata"
+msgstr "Metadatos"
+
+#: src/audacious/ui_preferences.c:212
+msgid "Do not load metadata for songs until played"
+msgstr "No cargar metadatos de pistas hasta su reproducción"
+
+#: src/audacious/ui_preferences.c:230
+msgid "TITLE"
+msgstr "TÍTULO"
+
+#: src/audacious/ui_preferences.c:231
+msgid "ARTIST - TITLE"
+msgstr "ARTISTA - TÍTULO"
+
+#: src/audacious/ui_preferences.c:232
+msgid "ARTIST - ALBUM - TITLE"
+msgstr "ARTISTA - ÁLBUM - TÍTULO"
+
+#: src/audacious/ui_preferences.c:233
+msgid "ARTIST - ALBUM - TRACK. TITLE"
+msgstr "ARTISTA - ÁLBUM - PISTA. TÍTULO"
+
+#: src/audacious/ui_preferences.c:234
+msgid "ARTIST [ ALBUM ] - TRACK. TITLE"
+msgstr "ARTISTA [ÁLBUM] - PISTA. TÍTULO"
+
+#: src/audacious/ui_preferences.c:235
+msgid "ALBUM - TITLE"
+msgstr "ÁLBUM - TÍTULO"
+
+#: src/audacious/ui_preferences.c:556
+msgid "Category"
+msgstr "Categoría"
+
+#: src/audacious/ui_preferences.c:780
+msgid "Popup Information Settings"
+msgstr "Información en Ventanas Emergentes"
+
+#: src/audacious/ui_preferences.c:789
+msgid "Cover image retrieve"
+msgstr "Recuperar imágenes de portada"
+
+#: src/audacious/ui_preferences.c:794
+msgid ""
+"While searching for the album's cover, Audacious looks for certain words in "
+"the filename. You can specify those words in the lists below, separated "
+"using commas."
+msgstr "Audacious busca ciertas palabras en el nombre del archivo mientras recupera la portada del álbum. Puedes especificar éstas palabras en la lista de abajo, sepáralas usando comas."
+
+#: src/audacious/ui_preferences.c:811
+msgid "Exclude:"
+msgstr "Excluir:"
+
+#: src/audacious/ui_preferences.c:818
+msgid "Include:"
+msgstr "Incluir:"
+
+#: src/audacious/ui_preferences.c:835
+msgid "Recursively search for cover"
+msgstr "Búscar portada recursívamente"
+
+#: src/audacious/ui_preferences.c:845
+msgid "Search depth: "
+msgstr "Profundidad de búsqueda:"
+
+#: src/audacious/ui_preferences.c:859
+msgid "Use per-file cover"
+msgstr "Utilizar una portada por archivo"
+
+#: src/audacious/ui_preferences.c:862
+msgid "Miscellaneous"
+msgstr "Varios"
+
+#: src/audacious/ui_preferences.c:871
+msgid "Show Progress bar for the current track"
+msgstr "Mostrar barra de progreso para la pista actual"
+
+#: src/audacious/ui_preferences.c:881
+msgid "Delay until filepopup comes up: "
+msgstr "Retrasar hasta que llegue el archivo emergente:"
+
+#: src/audacious/ui_preferences.c:1309
+msgid "Custom"
+msgstr "Personalizar"
+
+#: src/audacious/ui_preferences.c:1352
+msgid "Song Display"
+msgstr "Visualización de Pista"
+
+#: src/audacious/ui_preferences.c:1361
+msgid "Show song numbers"
+msgstr "Mostrar números de pista"
+
+#: src/audacious/ui_preferences.c:1372
+msgid "Show leading zeroes (02:00 instead of 2:00)"
+msgstr "Mostrar ceros a la izquierda (02:00 en vez de 2:00)"
+
+#: src/audacious/ui_preferences.c:1394
+msgid "Show information about titlestring format"
+msgstr "Mostrar información sobre la cadena del formato de título"
+
+#: src/audacious/ui_preferences.c:1410
+msgid "Custom string:"
+msgstr "Cadena personalizada:"
+
+#: src/audacious/ui_preferences.c:1417
+msgid "Title format:"
+msgstr "Formato de Título"
+
+#: src/audacious/ui_preferences.c:1428
+msgid "Popup Information"
+msgstr "Información Emergente"
+
+#: src/audacious/ui_preferences.c:1443
+msgid "Show popup information for playlist entries"
+msgstr "Mostrar información emergente para las entradas de la Lista de Reproducción"
+
+#: src/audacious/ui_preferences.c:1444
+msgid ""
+"Toggles popup information window for the pointed entry in the playlist. The "
+"window shows title of song, name of album, genre, year of publish, track "
+"number, track length, and artwork."
+msgstr "Cambiar la ventana de información emergente por la entrada seleccionada en la lista de reproducción. La ventana muestra título de la pista, nombre del álbum, género, año de publicación, número de pista, duración de la pista y arte."
+
+#: src/audacious/ui_preferences.c:1455
+msgid "Edit settings for popup information"
+msgstr "Editar ajustes de información emergente"
+
+#: src/audacious/ui_preferences.c:1544
+msgid "Output plugin:"
+msgstr "Plugin de Salida:"
+
+#: src/audacious/ui_preferences.c:1603
+msgid "Transport"
+msgstr "Transporte"
+
+#: src/audacious/ui_preferences.c:1603
+msgid "Input"
+msgstr "Entrada"
+
+#: src/audacious/ui_preferences.c:1604
+msgid "Effect"
+msgstr "Efecto"
+
+#: src/audacious/ui_preferences.c:1604
+msgid "Visualization"
+msgstr "Visualización"
+
+#: src/audacious/ui_preferences.c:1604
+msgid "General"
+msgstr "General"
+
+#: src/audacious/ui_preferences.c:1644
+msgid "Audacious Preferences"
+msgstr "Preferencias de Audacious"
+
+#: src/audacious/util.c:120
+#, c-format
+msgid "Could not create directory (%s): %s\n"
+msgstr "No se pudo crear el directorio (%s): %s\n"
+
+#: src/audtool/handlers_playlist.c:273
+msgid "Position not found."
+msgstr "Posición no encontrada."
+
+#: src/audtool/handlers_vitals.c:63
+msgid "No song playing."
+msgstr "Ninguna pista se está reproduciendo."
+
+#: src/libaudcore/audstrings.c:199
+#, c-format
+msgid "Audio CD, track %s"
+msgstr "CD de Audio, pista %s"
+
+#: src/libaudcore/tuple.c:536
+msgid "Mono"
+msgstr "Monoaural"
+
+#: src/libaudcore/tuple.c:538
+msgid "Stereo"
+msgstr "Estéreo"
+
+#: src/libaudcore/tuple.c:540
+#, c-format
+msgid "%d channel"
+msgid_plural "%d channels"
+msgstr[0] "%d canal"
+msgstr[1] "%d canales"
+
+#: src/libaudgui/about.c:52 src/libaudgui/about.c:115
+msgid "Credits"
+msgstr "Créditos"
+
+#: src/libaudgui/about.c:52
+msgid "Translators"
+msgstr "Traductores"
+
+#: src/libaudgui/about.c:91
+msgid "About Audacious"
+msgstr "Acerca de Audacious"
+
+#: src/libaudgui/confirm.c:76
+#, c-format
+msgid ""
+"Are you sure you want to close %s? If you do, any changes made since the "
+"playlist was exported will be lost."
+msgstr "¿Estás seguro que quieres cerrar %s? Si lo haces, cualquier cambio hecho desde que la lista de reproducción fue exportada se perderá."
+
+#: src/libaudgui/confirm.c:89
+msgid "_Don't show this message again"
+msgstr "_No mostrar este mensaje otra vez"
+
+#: src/libaudgui/confirm.c:126
+msgid "Rename Playlist"
+msgstr "Renombrar la Lista de Reproducción"
+
+#: src/libaudgui/effects-menu.c:74
+msgid "settings ..."
+msgstr "ajustes ..."
+
+#: src/libaudgui/equalizer.c:51
+msgid "_Enable"
+msgstr "_Habilitar"
+
+#: src/libaudgui/equalizer.c:123
+msgid "31 Hz"
+msgstr "31 Hz"
+
+#: src/libaudgui/equalizer.c:123
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/libaudgui/equalizer.c:124
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: src/libaudgui/equalizer.c:124
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: src/libaudgui/equalizer.c:124
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: src/libaudgui/equalizer.c:124
+msgid "1 kHz"
+msgstr "1 kHz"
+
+#: src/libaudgui/equalizer.c:124
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/libaudgui/equalizer.c:125
+msgid "4 kHz"
+msgstr "4 kHz"
+
+#: src/libaudgui/equalizer.c:125
+msgid "8 kHz"
+msgstr "8 kHz"
+
+#: src/libaudgui/equalizer.c:125
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/libaudgui/equalizer.c:130
+msgid "Equalizer"
+msgstr "Ecualizador"
+
+#: src/libaudgui/equalizer.c:146
+msgid "Preamp"
+msgstr "Preamplificador"
+
+#: src/libaudgui/infopopup.c:207
+msgid "Track Number"
+msgstr "Número de Pista"
+
+#: src/libaudgui/infopopup.c:209
+msgid "Track Length"
+msgstr "Duración de Pista"
+
+#: src/libaudgui/infowin.c:75
+msgid "Acid Jazz"
+msgstr "Acid Jazz"
+
+#: src/libaudgui/infowin.c:76
+msgid "Acid Rock"
+msgstr "Acid Rock"
+
+#: src/libaudgui/infowin.c:77
+msgid "Ambient"
+msgstr "Ambient"
+
+#: src/libaudgui/infowin.c:78
+msgid "Bebop"
+msgstr "Bebop"
+
+#: src/libaudgui/infowin.c:79
+msgid "Bluegrass"
+msgstr "Bluegrass"
+
+#: src/libaudgui/infowin.c:80
+msgid "Blues"
+msgstr "blues"
+
+#: src/libaudgui/infowin.c:81
+msgid "Chamber Music"
+msgstr "Música de Cámara"
+
+#: src/libaudgui/infowin.c:82
+msgid "Classical"
+msgstr "Clásica"
+
+#: src/libaudgui/infowin.c:83
+msgid "Country"
+msgstr "Country"
+
+#: src/libaudgui/infowin.c:84
+msgid "Death Metal"
+msgstr "Death Metal"
+
+#: src/libaudgui/infowin.c:85
+msgid "Disco"
+msgstr "Disco"
+
+#: src/libaudgui/infowin.c:86
+msgid "Easy Listening"
+msgstr "Easy Listening"
+
+#: src/libaudgui/infowin.c:87
+msgid "Folk"
+msgstr "Folk"
+
+#: src/libaudgui/infowin.c:88
+msgid "Funk"
+msgstr "Funk"
+
+#: src/libaudgui/infowin.c:89
+msgid "Gangsta Rap"
+msgstr "Gangsta Rap"
+
+#: src/libaudgui/infowin.c:90
+msgid "Gospel"
+msgstr "Gospel"
+
+#: src/libaudgui/infowin.c:91
+msgid "Grunge"
+msgstr "Grunge"
+
+#: src/libaudgui/infowin.c:92
+msgid "Hard Rock"
+msgstr "Hard Rock"
+
+#: src/libaudgui/infowin.c:93
+msgid "Heavy Metal"
+msgstr "Heavy Metal"
+
+#: src/libaudgui/infowin.c:94
+msgid "Hip-hop"
+msgstr "Hip-hop"
+
+#: src/libaudgui/infowin.c:95
+msgid "House"
+msgstr "House"
+
+#: src/libaudgui/infowin.c:96
+msgid "Jazz"
+msgstr "Jazz"
+
+#: src/libaudgui/infowin.c:97
+msgid "Jungle"
+msgstr "Jungle"
+
+#: src/libaudgui/infowin.c:98
+msgid "Metal"
+msgstr "Metal"
+
+#: src/libaudgui/infowin.c:99
+msgid "New Age"
+msgstr "New Age"
+
+#: src/libaudgui/infowin.c:100
+msgid "New Wave"
+msgstr "New Wave"
+
+#: src/libaudgui/infowin.c:101
+msgid "Noise"
+msgstr "Noise"
+
+#: src/libaudgui/infowin.c:102
+msgid "Pop"
+msgstr "Pop"
+
+#: src/libaudgui/infowin.c:103
+msgid "Punk Rock"
+msgstr "Punk Rock"
+
+#: src/libaudgui/infowin.c:104
+msgid "Rap"
+msgstr "Rap"
+
+#: src/libaudgui/infowin.c:105
+msgid "Reggae"
+msgstr "Reggae"
+
+#: src/libaudgui/infowin.c:106
+msgid "Rock"
+msgstr "Rock"
+
+#: src/libaudgui/infowin.c:107
+msgid "Rock and Roll"
+msgstr "Rock and Roll"
+
+#: src/libaudgui/infowin.c:108
+msgid "Rhythm and Blues"
+msgstr "Rhythm and Blues"
+
+#: src/libaudgui/infowin.c:109
+msgid "Ska"
+msgstr "Ska"
+
+#: src/libaudgui/infowin.c:110
+msgid "Soul"
+msgstr "Soul"
+
+#: src/libaudgui/infowin.c:111
+msgid "Swing"
+msgstr "Swing"
+
+#: src/libaudgui/infowin.c:112
+msgid "Techno"
+msgstr "Techno"
+
+#: src/libaudgui/infowin.c:113
+msgid "Trip-hop"
+msgstr "Trip-hop"
+
+#: src/libaudgui/infowin.c:177 src/libaudgui/infowin.c:363
+#: src/libaudgui/infowin.c:366 src/libaudgui/infowin.c:369
+msgid "n/a"
+msgstr "n/d"
+
+#: src/libaudgui/infowin.c:267
+msgid "Metadata updated successfully"
+msgstr "Metadatos actualizados existósamente"
+
+#: src/libaudgui/infowin.c:272
+msgid "Metadata updating failed"
+msgstr "Falló actualización de metadatos"
+
+#: src/libaudgui/infowin.c:320
+msgid "Track Information"
+msgstr "Información de pistas"
+
+#: src/libaudgui/infowin.c:352
+msgid "Format:"
+msgstr "Formato:"
+
+#: src/libaudgui/infowin.c:356
+msgid "Quality:"
+msgstr "Calidad:"
+
+#: src/libaudgui/infowin.c:359
+msgid "Bitrate:"
+msgstr "Tasa de bits:"
+
+#: src/libaudgui/infowin.c:389
+msgid "Title"
+msgstr "Título"
+
+#: src/libaudgui/infowin.c:401
+msgid "Artist"
+msgstr "Artista"
+
+#: src/libaudgui/infowin.c:413
+msgid "Album"
+msgstr "Álbum"
+
+#: src/libaudgui/infowin.c:425
+msgid "Comment"
+msgstr "Comentario"
+
+#: src/libaudgui/infowin.c:437
+msgid "Genre"
+msgstr "Género"
+
+#: src/libaudgui/infowin.c:458
+msgid "Year"
+msgstr "Año"
+
+#: src/libaudgui/infowin.c:469
+msgid "Track Number"
+msgstr "Número de Pista"
+
+#: src/libaudgui/infowin.c:548
+#, c-format
+msgid "%d kb/s"
+msgstr "%d kb/s"
+
+#: src/libaudgui/infowin.c:575
+#, c-format
+msgid "No info available for %s.\n"
+msgstr "No hay información disponible para %s.\n"
+
+#: src/libaudgui/jump-to-time.c:72
+msgid "Jump to Time"
+msgstr "Saltar al Tiempo"
+
+#: src/libaudgui/jump-to-time.c:87
+msgid "mm:ss"
+msgstr "mm:ss"
+
+#: src/libaudgui/playlists.c:33
+msgid "Export Playlist"
+msgstr "Exportar Lista de Reproducción"
+
+#: src/libaudgui/playlists.c:33
+msgid "Import Playlist"
+msgstr "Importar Lista de Reproducción"
+
+#: src/libaudgui/playlists.c:66
+#, c-format
+msgid "Overwrite %s?"
+msgstr "¿Sobreescribir %s?"
+
+#: src/libaudgui/queue-manager.c:196
+msgid "Queue Manager"
+msgstr "Administrador de colas"
+
+#: src/libaudgui/ui_fileopener.c:109
+msgid "Open Files"
+msgstr "Abrir Archivos"
+
+#: src/libaudgui/ui_fileopener.c:109
+msgid "Add Files"
+msgstr "Agregar Archivos"
+
+#: src/libaudgui/ui_fileopener.c:111
+msgid "Close dialog on Open"
+msgstr "Cerrar dialogo al Abrir"
+
+#: src/libaudgui/ui_fileopener.c:111
+msgid "Close dialog on Add"
+msgstr "Cerrar dialogo al Agregar"
+
+#: src/libaudgui/ui_jumptotrack.c:109 src/libaudgui/ui_jumptotrack.c:117
+#: src/libaudgui/ui_jumptotrack.c:326
+msgid "_Queue"
+msgstr "A la _Cola"
+
+#: src/libaudgui/ui_jumptotrack.c:115
+msgid "Un_queue"
+msgstr "Quitar de la _cola"
+
+#: src/libaudgui/ui_jumptotrack.c:258
+msgid "Jump to Song"
+msgstr "Saltar a la Pista"
+
+#: src/libaudgui/ui_jumptotrack.c:281
+msgid "Filter: "
+msgstr "Filtro: "
+
+#: src/libaudgui/ui_jumptotrack.c:282
+msgid "_Filter:"
+msgstr "_Filtro:"
+
+#: src/libaudgui/ui_jumptotrack.c:292
+msgid "Remember"
+msgstr "Recordar"
+
+#: src/libaudgui/ui_jumptotrack.c:299
+msgid "Clea_r"
+msgstr "Limpia_r"
+
+#: src/libaudgui/ui_jumptotrack.c:319
+msgid "Close on Jump"
+msgstr "Cerrar al Saltar"
+
+#: src/libaudgui/ui_playlist_manager.c:253
+msgid "Playlist Manager"
+msgstr "Administrador de Listas de Reproducción"
+
+#: src/libaudgui/ui_playlist_manager.c:280
+msgid "Entries"
+msgstr "Entradas"
+
+#: src/libaudgui/ui_playlist_manager.c:301
+msgid "_Rename"
+msgstr "_Renombrar"
+
+#: src/libaudgui/ui_playlist_manager.c:325
+msgid "_Close dialog on activating playlist"
+msgstr "_Cerrar dialogo al activar Lista de Reproducción"
+
+#: src/libaudgui/ui_urlopener.c:48
+msgid "Open URL"
+msgstr "Abrir URL"
+
+#: src/libaudgui/ui_urlopener.c:48
+msgid "Add URL"
+msgstr "Agregar URL"
+
+#: src/libaudgui/util.c:95
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr "\n(Más mensajes han sido ocultados.)"
+
+#: src/libeggsmclient/eggdesktopfile.c:165
+msgid "File is not a valid .desktop file"
+msgstr "El archivo no es un archivo .desktop válido"
+
+#: src/libeggsmclient/eggdesktopfile.c:191
+#, c-format
+msgid "Unrecognized desktop file Version '%s'"
+msgstr "Versión '%s' de archivo desktop no reconocida"
+
+#: src/libeggsmclient/eggdesktopfile.c:974
+#, c-format
+msgid "Starting %s"
+msgstr "Iniciando %s"
+
+#: src/libeggsmclient/eggdesktopfile.c:1116
+msgid "Application does not accept documents on command line"
+msgstr "La aplicación no acepta documentos en la línea de comandos"
+
+#: src/libeggsmclient/eggdesktopfile.c:1184
+#, c-format
+msgid "Unrecognized launch option: %d"
+msgstr "Opción de lanzamiento no reconocida: %d"
+
+#: src/libeggsmclient/eggdesktopfile.c:1391
+msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
+msgstr "No puedes pasar documentos URIs a una entrada del escritorio 'Type=Link'"
+
+#: src/libeggsmclient/eggdesktopfile.c:1412
+msgid "Not a launchable item"
+msgstr "No es una cosa lanzable"
+
+#: src/libeggsmclient/eggsmclient.c:226
+msgid "Disable connection to session manager"
+msgstr "Deshabilitar conección con el administrador de sesión"
+
+#: src/libeggsmclient/eggsmclient.c:229
+msgid "Specify file containing saved configuration"
+msgstr "Especificar archivo que contiene configuración guardada"
+
+#: src/libeggsmclient/eggsmclient.c:229
+msgid "FILE"
+msgstr "ARCHIVO"
+
+#: src/libeggsmclient/eggsmclient.c:232
+msgid "Specify session management ID"
+msgstr "Específicar ID de administración de sesión"
+
+#: src/libeggsmclient/eggsmclient.c:232
+msgid "ID"
+msgstr "ID"
+
+#: src/libeggsmclient/eggsmclient.c:253
+msgid "Session management options:"
+msgstr "Opciones de administración de sesión:"
+
+#: src/libeggsmclient/eggsmclient.c:254
+msgid "Show session management options"
+msgstr "Mostrar opciones de administración de sesión"

audacious-3.1.1.tar.bz2/po/et.po -> audacious-3.2.4.tar.bz2/po/et.po Changed

@@ -1,2657 +1,1220 @@
-# Audacious'e eesti keele tõlge.
-# Estonian translation of Audacious.
+# Estonian translation for Audacious
+# Copyright (C) Audacious translators
+# This file is distributed under the same license as the Audacious package.
 #
-# Copyright (C) 2007 Free Software Foundation, Inc.
+# Translators:
 # Ivar Smolin <okul at linux ee>, 2007.
-#
+# Ivar Smolin <okul@linux.ee>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: audacious 1.4.0\n"
-"Report-Msgid-Bugs-To: http://jira.atheme.org/\n"
-"POT-Creation-Date: 2011-07-05 22:45+0200\n"
-"PO-Revision-Date: 2007-11-25 22:02+0200\n"
+"Project-Id-Version: Audacious\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2012-01-11 08:54-0500\n"
+"PO-Revision-Date: 2012-04-21 04:05+0000\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
-"Language-Team: Estonian <et@li.org>\n"
-"Language: et\n"
+"Language-Team: Estonian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/audacious/adder.c:71
+#: src/audacious/adder.c:77
 msgid "Searching ..."
-msgstr ""
+msgstr "Otsimine..."
 
-#: src/audacious/adder.c:99
+#: src/audacious/adder.c:113
 #, c-format
 msgid "%d file found"
 msgid_plural "%d files found"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "leiti %d fail"
+msgstr[1] "leiti %d faili"
 
-#: src/audacious/chardet.c:37
+#: src/audacious/chardet.c:39
 msgid " (invalid UTF-8)"
 msgstr " (vigane UTF-8)"
 
-#: src/audacious/credits.c:35
-#, fuzzy
+#: src/audacious/credits.c:37
 msgid "Core developers:"
-msgstr "0.1.x arendajad"
+msgstr "Tuumikosa arendajad:"
 
-#: src/audacious/credits.c:49
+#: src/audacious/credits.c:51
 msgid "Graphics:"
 msgstr "Graafika:"
 
-#: src/audacious/credits.c:54
+#: src/audacious/credits.c:56
 msgid "Default skin:"
 msgstr "Vaikimisi rüü:"
 
-#: src/audacious/credits.c:60
+#: src/audacious/credits.c:62
 msgid "Plugin development:"
 msgstr "Pluginate arendus:"
 
-#: src/audacious/credits.c:83
+#: src/audacious/credits.c:85
 msgid "Patch authors:"
 msgstr "Paranduste autorid:"
 
-#: src/audacious/credits.c:126
-#, fuzzy
+#: src/audacious/credits.c:131
 msgid "1.x developers:"
-msgstr "0.1.x arendajad"
+msgstr "Versioonide 1.x arendajad:"
 
-#: src/audacious/credits.c:148
+#: src/audacious/credits.c:153
 msgid "BMP Developers:"
 msgstr "BMP arendajad"
 
-#: src/audacious/credits.c:180
-#, fuzzy
+#: src/audacious/credits.c:185
 msgid "Belarusian:"
-msgstr "Bulgaaria:"
+msgstr "Valgevene:"
 
-#: src/audacious/credits.c:183
+#: src/audacious/credits.c:188
 msgid "Basque:"
-msgstr ""
+msgstr "Baski:"
 
-#: src/audacious/credits.c:186
+#: src/audacious/credits.c:191
 msgid "Brazilian Portuguese:"
 msgstr "Brasiilia portugali:"
 
-#: src/audacious/credits.c:190
+#: src/audacious/credits.c:196
 msgid "Breton:"
 msgstr "Bretooni:"
 
-#: src/audacious/credits.c:193
+#: src/audacious/credits.c:199
 msgid "Bulgarian:"
 msgstr "Bulgaaria:"
 
-#: src/audacious/credits.c:196
+#: src/audacious/credits.c:202
 msgid "Catalan:"
 msgstr "Katalaani:"
 
-#: src/audacious/credits.c:199
-#, fuzzy
+#: src/audacious/credits.c:206
 msgid "Chinese:"
-msgstr "Jooned"
+msgstr "Hiina:"
 
-#: src/audacious/credits.c:202
+#: src/audacious/credits.c:209
 msgid "Croatian:"
 msgstr "Horvaatia:"
 
-#: src/audacious/credits.c:205
+#: src/audacious/credits.c:212
 msgid "Czech:"
 msgstr "Tšehhi:"
 
-#: src/audacious/credits.c:208
+#: src/audacious/credits.c:215
 msgid "Dutch:"
 msgstr "Hollandi:"
 
-#: src/audacious/credits.c:212
+#: src/audacious/credits.c:219
 msgid "Estonian:"
 msgstr "Eesti:"
 
-#: src/audacious/credits.c:215
+#: src/audacious/credits.c:222
 msgid "Finnish:"
 msgstr "Soome:"
 
-#: src/audacious/credits.c:220
+#: src/audacious/credits.c:227
 msgid "French:"
 msgstr "Prantsuse:"
 
-#: src/audacious/credits.c:226
+#: src/audacious/credits.c:233
 msgid "German:"
 msgstr "Saksa:"
 
-#: src/audacious/credits.c:233
+#: src/audacious/credits.c:240
 msgid "Georgian:"
 msgstr "Gruusia:"
 
-#: src/audacious/credits.c:236
+#: src/audacious/credits.c:243
 msgid "Greek:"
 msgstr "Kreeka:"
 
-#: src/audacious/credits.c:241
+#: src/audacious/credits.c:248
 msgid "Hindi:"
 msgstr "Hindi:"
 
-#: src/audacious/credits.c:244
+#: src/audacious/credits.c:251
 msgid "Hungarian:"
 msgstr "Ungari:"
 
-#: src/audacious/credits.c:248
+#: src/audacious/credits.c:255
 msgid "Italian:"
 msgstr "Itaalia:"
 
-#: src/audacious/credits.c:252
+#: src/audacious/credits.c:260
 msgid "Japanese:"
 msgstr "Jaapani:"
 
-#: src/audacious/credits.c:255
+#: src/audacious/credits.c:263
 msgid "Korean:"
 msgstr "Koera:"
 
-#: src/audacious/credits.c:258
-#, fuzzy
+#: src/audacious/credits.c:266
 msgid "Latvian:"
-msgstr "Horvaatia:"
+msgstr "Läti:"
 
-#: src/audacious/credits.c:261
+#: src/audacious/credits.c:269
 msgid "Lithuanian:"
 msgstr "Leedu:"
 
-#: src/audacious/credits.c:265
+#: src/audacious/credits.c:274
 msgid "Macedonian:"
 msgstr "Makedoonia:"
 
-#: src/audacious/credits.c:268
+#: src/audacious/credits.c:277
+msgid "Mexican Spanish:"
+msgstr "Mehhiko hispaania:"
+
+#: src/audacious/credits.c:280
 msgid "Polish:"
 msgstr "Poola:"
 
-#: src/audacious/credits.c:274
-#, fuzzy
+#: src/audacious/credits.c:287
 msgid "Portuguese:"
-msgstr "Brasiilia portugali:"
+msgstr "Portugali:"
 
-#: src/audacious/credits.c:277
+#: src/audacious/credits.c:290
 msgid "Romanian:"
 msgstr "Rumeenia:"
 
-#: src/audacious/credits.c:281
+#: src/audacious/credits.c:294
 msgid "Russian:"
 msgstr "Vene:"
 
-#: src/audacious/credits.c:285
+#: src/audacious/credits.c:298
 msgid "Serbian (Latin):"
 msgstr "Serbia (ladina)"
 
-#: src/audacious/credits.c:288
+#: src/audacious/credits.c:301
 msgid "Serbian (Cyrillic):"
 msgstr "Serbia (kirillitsa)"
 
-#: src/audacious/credits.c:291
+#: src/audacious/credits.c:305
 msgid "Simplified Chinese:"
 msgstr "Hiina lihtsustatud:"
 
-#: src/audacious/credits.c:294
+#: src/audacious/credits.c:308
 msgid "Slovak:"
 msgstr "Slovaki:"
 
-#: src/audacious/credits.c:297
+#: src/audacious/credits.c:312
 msgid "Spanish:"
 msgstr "Hispaania:"
 
-#: src/audacious/credits.c:304
+#: src/audacious/credits.c:320
 msgid "Swedish:"
 msgstr "Rootsi:"
 
-#: src/audacious/credits.c:307
+#: src/audacious/credits.c:323
 msgid "Traditional Chinese:"
 msgstr "Hiina traditsiooniline:"
 
-#: src/audacious/credits.c:312
+#: src/audacious/credits.c:329
 msgid "Turkish:"
 msgstr "Türgi:"
 
-#: src/audacious/credits.c:316
+#: src/audacious/credits.c:333
 msgid "Ukrainian:"
 msgstr "Ukraina:"
 
-#: src/audacious/credits.c:319
+#: src/audacious/credits.c:338
+msgid "Vietnamese:"
+msgstr "Vietnami:"
+
+#: src/audacious/credits.c:341
 msgid "Welsh:"
 msgstr "Kõmri:"
 
-#: src/audacious/drct.c:256
-#, fuzzy
-msgid "Temporary Playlist"
-msgstr "Esitusnimekirja laadimine"
-
-#: src/audacious/equalizer_preset.c:186
+#: src/audacious/equalizer_preset.c:180
 #, c-format
 msgid "Error importing Winamp EQF file '%s'"
-msgstr ""
+msgstr "Viga Winampi EQF-faili '%s' importimisel"
 
-#: src/audacious/main.c:256
+#: src/audacious/main.c:243
 msgid "Skip backwards in playlist"
 msgstr "Esitusnimekirjas eelmisele loole hüppamine"
 
-#: src/audacious/main.c:257
+#: src/audacious/main.c:244
 msgid "Start playing current playlist"
 msgstr "Praeguse esitusnimekirja esitamise alustamine"
 
-#: src/audacious/main.c:258
+#: src/audacious/main.c:245
 msgid "Pause current song"
 msgstr "Praeguse loo pausimine"
 
-#: src/audacious/main.c:259
+#: src/audacious/main.c:246
 msgid "Stop current song"
 msgstr "Praeguse loo seiskamine"
 
-#: src/audacious/main.c:260
+#: src/audacious/main.c:247
 msgid "Pause if playing, play otherwise"
 msgstr "Esitamise korral pausimine, pausi korral esitamine"
 
-#: src/audacious/main.c:261
+#: src/audacious/main.c:248
 msgid "Skip forward in playlist"
 msgstr "Esitusnimekirjas järgmisele loole hüppamine"
 
-#: src/audacious/main.c:262
+#: src/audacious/main.c:249
 msgid "Display Jump to File dialog"
 msgstr "Failile hüppamise dialoogi kuvamine"
 
-#: src/audacious/main.c:263
-#, fuzzy
+#: src/audacious/main.c:250
 msgid "Add files to the playlist"
-msgstr "Failide lisamine esitusnimekirja."
+msgstr "Failide lisamine esitusnimekirja"
 
-#: src/audacious/main.c:264
+#: src/audacious/main.c:251
 msgid "Add new files to a temporary playlist"
 msgstr "Uute failide lisamine ajutisse esitusnimekirja"
 
-#: src/audacious/main.c:265
+#: src/audacious/main.c:252
 msgid "Display the main window"
 msgstr "Peaakna kuvamine"
 
-#: src/audacious/main.c:266
-#, fuzzy
+#: src/audacious/main.c:253
 msgid "Show version"
-msgstr "Näita peaakent"
+msgstr "Versiooni näitamine"
 
-#: src/audacious/main.c:267
+#: src/audacious/main.c:254
 msgid "Print debugging messages"
-msgstr ""
+msgstr "Silumisteadete väljastamine"
 
-#: src/audacious/main.c:268
+#: src/audacious/main.c:255
+msgid "Headless mode (beta)"
+msgstr "Akendeta režiim (beeta)"
+
+#: src/audacious/main.c:256
 msgid "FILE..."
 msgstr "FAIL..."
 
-#: src/audacious/main.c:280
+#: src/audacious/main.c:268
 msgid "- play multimedia files"
 msgstr "- multimeediafailide esitamine"
 
-#: src/audacious/main.c:290
+#: src/audacious/main.c:278
 #, c-format
 msgid ""
 "%s: %s\n"
 "Try `%s --help' for more information.\n"
-msgstr ""
-"%s: %s\n"
-"Täiendava teabe saamiseks proovi `%s --help'.\n"
+msgstr "%s: %s\nTäiendava teabe saamiseks proovi `%s --help'.\n"
 
-#: src/audacious/main.c:407
-msgid ""
-"Audacious seems to be already running but is not responding. You can start "
-"another instance of the program, but please be warned that this can cause "
-"data loss. If Audacious is not running, you can safely ignore this "
-"message. Press OK to start Audacious or Cancel to quit."
-msgstr ""
-
-#: src/audacious/main.c:572
+#: src/audacious/main.c:573
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/audacious/playback.c:381
+#: src/audacious/playback.c:307
 #, c-format
 msgid "No decoder found for %s."
-msgstr ""
+msgstr "Failile %s ei leitud dekoodrit."
 
-#: src/audacious/playback.c:531
-msgid "Buffering ..."
-msgstr ""
+#: src/audacious/playlist-files.c:53
+#, c-format
+msgid "Cannot %s %s: unsupported file extension."
+msgstr "Faili %2$s %1$s pole võimalik: faili laiend pole toetatud"
+
+#: src/audacious/playlist-files.c:54
+msgid "save"
+msgstr "salvestamine"
+
+#: src/audacious/playlist-files.c:54
+msgid "load"
+msgstr "laadimine"
 
-#: src/audacious/playlist-new.c:303
-#, fuzzy
-msgid "Untitled Playlist"
+#: src/audacious/playlist-new.c:131
+msgid "New Playlist"
 msgstr "Uus esitusnimekiri"
 
-#: src/audacious/ui_preferences.c:87
+#: src/audacious/playlist-new.c:132
+msgid "Now Playing"
+msgstr "Praegu esitamisel"
+
+#: src/audacious/playlist-new.c:1630
+msgid ""
+"The playlist cannot be sorted because metadata scanning is still in progress"
+" (or has been disabled)."
+msgstr "Esitusnimekirja sortimine pole võimalik, kuna metaandmete laadimine on pooleli (või keelatud)."
+
+#: src/audacious/ui_preferences.c:85
 msgid "Audio"
 msgstr "Audio"
 
-#: src/audacious/ui_preferences.c:88
+#: src/audacious/ui_preferences.c:86
 msgid "Network"
-msgstr ""
+msgstr "Võrk"
 
-#: src/audacious/ui_preferences.c:89 src/audacious/ui_preferences.c:1556
+#: src/audacious/ui_preferences.c:87 src/audacious/ui_preferences.c:1603
 msgid "Playlist"
 msgstr "Esitusnimekiri"
 
-#: src/audacious/ui_preferences.c:90
+#: src/audacious/ui_preferences.c:88
 msgid "Plugins"
 msgstr "Pluginad"
 
-#: src/audacious/ui_preferences.c:96 src/libaudgui/infopopup.c:204
+#: src/audacious/ui_preferences.c:94 src/libaudgui/infopopup.c:199
 msgid "Artist"
 msgstr "Esitaja"
 
-#: src/audacious/ui_preferences.c:97 src/libaudgui/infopopup.c:206
+#: src/audacious/ui_preferences.c:95 src/libaudgui/infopopup.c:201
 msgid "Album"
 msgstr "Album"
 
-#: src/audacious/ui_preferences.c:98 src/libaudgui/infopopup.c:202
-#: src/libaudgui/ui_playlist_manager.c:263
+#: src/audacious/ui_preferences.c:96 src/libaudgui/infopopup.c:197
+#: src/libaudgui/ui_playlist_manager.c:279
 msgid "Title"
 msgstr "Pealkiri"
 
-#: src/audacious/ui_preferences.c:99
+#: src/audacious/ui_preferences.c:97
 msgid "Tracknumber"
 msgstr "Loo number"
 
-#: src/audacious/ui_preferences.c:100 src/libaudgui/infopopup.c:208
+#: src/audacious/ui_preferences.c:98 src/libaudgui/infopopup.c:203
 msgid "Genre"
 msgstr "Žanr"
 
-#: src/audacious/ui_preferences.c:101
+#: src/audacious/ui_preferences.c:99
 msgid "Filename"
 msgstr "Failinimi"
 
-#: src/audacious/ui_preferences.c:102
+#: src/audacious/ui_preferences.c:100
 msgid "Filepath"
 msgstr "Faili rada"
 
-#: src/audacious/ui_preferences.c:103
+#: src/audacious/ui_preferences.c:101
 msgid "Date"
 msgstr "Kuupäev"
 
-#: src/audacious/ui_preferences.c:104 src/libaudgui/infopopup.c:210
+#: src/audacious/ui_preferences.c:102 src/libaudgui/infopopup.c:205
 msgid "Year"
 msgstr "Aasta"
 
-#: src/audacious/ui_preferences.c:105
+#: src/audacious/ui_preferences.c:103
 msgid "Comment"
 msgstr "Kommentaar"
 
-#: src/audacious/ui_preferences.c:106
+#: src/audacious/ui_preferences.c:104
 msgid "Codec"
 msgstr "Koodek"
 
-#: src/audacious/ui_preferences.c:107
+#: src/audacious/ui_preferences.c:105
 msgid "Quality"
 msgstr "Kvaliteet"
 
-#: src/audacious/ui_preferences.c:112
+#: src/audacious/ui_preferences.c:111
 msgid "None"
-msgstr ""
+msgstr "Puudub"
+
+#: src/audacious/ui_preferences.c:112
+msgid "Arabic"
+msgstr "Araabia"
 
 #: src/audacious/ui_preferences.c:113
-#, fuzzy
-msgid "Japanese"
-msgstr "Jaapani:"
+msgid "Baltic"
+msgstr "Balti"
 
 #: src/audacious/ui_preferences.c:114
-#, fuzzy
-msgid "Taiwanese"
-msgstr "Jaapani:"
+msgid "Chinese"
+msgstr "Hiina"
 
 #: src/audacious/ui_preferences.c:115
-#, fuzzy
-msgid "Chinese"
-msgstr "Jooned"
+msgid "Greek"
+msgstr "Kreeka"
 
 #: src/audacious/ui_preferences.c:116
-#, fuzzy
-msgid "Korean"
-msgstr "Koera:"
+msgid "Hebrew"
+msgstr "Heebrea"
 
 #: src/audacious/ui_preferences.c:117
-#, fuzzy
-msgid "Russian"
-msgstr "Vene:"
+msgid "Japanese"
+msgstr "Jaapani"
 
 #: src/audacious/ui_preferences.c:118
-#, fuzzy
-msgid "Greek"
-msgstr "Kreeka:"
+msgid "Korean"
+msgstr "Korea"
 
 #: src/audacious/ui_preferences.c:119
-msgid "Hebrew"
-msgstr ""
+msgid "Polish"
+msgstr "Poola"
 
 #: src/audacious/ui_preferences.c:120
-#, fuzzy
-msgid "Turkish"
-msgstr "Türgi:"
+msgid "Russian"
+msgstr "Vene"
 
 #: src/audacious/ui_preferences.c:121
-msgid "Arabic"
-msgstr ""
+msgid "Taiwanese"
+msgstr "Taivani"
 
 #: src/audacious/ui_preferences.c:122
-#, fuzzy
-msgid "Polish"
-msgstr "Poola:"
-
-#: src/audacious/ui_preferences.c:123
-msgid "Baltic"
-msgstr ""
-
-#: src/audacious/ui_preferences.c:124
-msgid "Universal"
-msgstr ""
-
-#: src/audacious/ui_preferences.c:146
-#, fuzzy
-msgid "Single track mode"
-msgstr "Loo üksikasjade vaatamine"
+msgid "Turkish"
+msgstr "Türgi"
 
-#: src/audacious/ui_preferences.c:147
-#, fuzzy
+#: src/audacious/ui_preferences.c:144
 msgid "Album mode"
-msgstr "Album: "
+msgstr "Albumi kaupa"
 
-#: src/audacious/ui_preferences.c:150
-#, fuzzy
+#: src/audacious/ui_preferences.c:147
 msgid "Output Settings"
-msgstr "Vormingu tuvastamine"
+msgstr "Väljundi sätted"
 
-#: src/audacious/ui_preferences.c:152
-#, fuzzy
+#: src/audacious/ui_preferences.c:149
 msgid "Bit depth:"
-msgstr "Vormingu tuvastamine"
+msgstr "Bitisügavus:"
 
-#: src/audacious/ui_preferences.c:155
+#: src/audacious/ui_preferences.c:152
 msgid "Buffer size:"
 msgstr "Puhvri suurus:"
 
-#: src/audacious/ui_preferences.c:157
+#: src/audacious/ui_preferences.c:154
 msgid "ms"
-msgstr ""
+msgstr "ms"
 
-#: src/audacious/ui_preferences.c:158
-#, fuzzy
+#: src/audacious/ui_preferences.c:155
 msgid "Use software volume control (not recommended)"
-msgstr "Kasutatakse tarkvaralist helivaljuse juhtimist"
+msgstr "Tarkvaraline valjuse juhtimine (pole soovitatav)"
 
-#: src/audacious/ui_preferences.c:160
-#, fuzzy
+#: src/audacious/ui_preferences.c:157
 msgid "Replay Gain"
-msgstr "Proksi sätted"
+msgstr "Helitugevuse korrektsioon"
 
-#: src/audacious/ui_preferences.c:161
-#, fuzzy
+#: src/audacious/ui_preferences.c:158
 msgid "Enable Replay Gain"
-msgstr "Proksi kasutamine on lubatud"
+msgstr "Helitugevuse korrektsioon on lubatud"
 
-#: src/audacious/ui_preferences.c:164
+#: src/audacious/ui_preferences.c:161
 msgid "Prevent clipping (recommended)"
-msgstr ""
+msgstr "Hoidutakse kärpimisest (soovitatav)"
 
-#: src/audacious/ui_preferences.c:166
-#, fuzzy
+#: src/audacious/ui_preferences.c:163
 msgid "Adjust Levels"
-msgstr "Hiireratas"
+msgstr "Valjuse kohendamine"
 
-#: src/audacious/ui_preferences.c:167
+#: src/audacious/ui_preferences.c:164
 msgid "Amplify all files:"
-msgstr ""
+msgstr "Kõikide failide võimendamine:"
 
-#: src/audacious/ui_preferences.c:169 src/audacious/ui_preferences.c:172
+#: src/audacious/ui_preferences.c:166 src/audacious/ui_preferences.c:169
 msgid "dB"
-msgstr ""
+msgstr "dB"
 
-#: src/audacious/ui_preferences.c:170
-#, fuzzy
+#: src/audacious/ui_preferences.c:167
 msgid "Amplify untagged files:"
-msgstr "- multimeediafailide esitamine"
+msgstr "Sildistamata failide võimendamine:"
 
-#: src/audacious/ui_preferences.c:175
+#: src/audacious/ui_preferences.c:172
 msgid "Proxy hostname:"
 msgstr "Proksi hostinimi:"
 
-#: src/audacious/ui_preferences.c:176
+#: src/audacious/ui_preferences.c:173
 msgid "Proxy port:"
 msgstr "Proksi port:"
 
-#: src/audacious/ui_preferences.c:179
+#: src/audacious/ui_preferences.c:176
 msgid "Proxy username:"
 msgstr "Proksi kasutajanimi:"
 
-#: src/audacious/ui_preferences.c:180
+#: src/audacious/ui_preferences.c:177
 msgid "Proxy password:"
 msgstr "Proksi parool:"
 
-#: src/audacious/ui_preferences.c:184
+#: src/audacious/ui_preferences.c:181
 msgid "Proxy Configuration"
 msgstr "Proksi sätted"
 
-#: src/audacious/ui_preferences.c:185
+#: src/audacious/ui_preferences.c:182
 msgid "Enable proxy usage"
 msgstr "Proksi kasutamine on lubatud"
 
-#: src/audacious/ui_preferences.c:187
+#: src/audacious/ui_preferences.c:185
 msgid "Use authentication with proxy"
-msgstr "Kasutatakse proksi autentimist"
-
-#: src/audacious/ui_preferences.c:189
-msgid ""
-"Changing these settings will require a restart of "
-"Audacious."
-msgstr ""
-"Pärast nende sätete muutmist tuleb Audacious "
-"taaskäivitada."
+msgstr "Proksi kasutatab autentimist"
 
 #: src/audacious/ui_preferences.c:193
 msgid "Auto character encoding detector for:"
 msgstr "Automaatne kooditabeli tuvastaja:"
 
-#: src/audacious/ui_preferences.c:201
+#: src/audacious/ui_preferences.c:198
 msgid "Fallback character encodings:"
 msgstr "Kooditabelite tagavara:"
 
-#: src/audacious/ui_preferences.c:201
-msgid ""
-"List of character encodings used for fall back conversion of metadata. If "
-"automatic character encoding detector failed or has been disabled, encodings "
-"in this list would be treated as candidates of the encoding of metadata, and "
-"fall back conversion from these encodings to UTF-8 would be attempted."
-msgstr ""
-"Metaandmete teisendamiseks mõeldud kooditabelite tagavaranimekiri. Kui "
-"automaatne kooditabeli tuvastamine ei õnnestu või on keelatud, siis "
-"proovitakse metaandmeid teisendada tagavaranimekirjas olevatest tabelitest "
-"UTF-8 tabelisse."
-
-#: src/audacious/ui_preferences.c:205
-#, fuzzy
+#: src/audacious/ui_preferences.c:202
 msgid "Behavior"
-msgstr "Vormingu tuvastamine"
+msgstr "Käitumine"
 
-#: src/audacious/ui_preferences.c:206
+#: src/audacious/ui_preferences.c:203
 msgid "Continue playback on startup"
-msgstr "Käivitamisel jätkatakse esitust"
+msgstr "Käivitamisel jätkatakse esitamist"
 
-#: src/audacious/ui_preferences.c:208
+#: src/audacious/ui_preferences.c:205
 msgid "Advance when the current song is deleted"
-msgstr ""
+msgstr "Esitatava loo kustutamisel hakatakse järgmist lugu esitama"
 
-#: src/audacious/ui_preferences.c:210
-#, fuzzy
+#: src/audacious/ui_preferences.c:207
 msgid "Clear the playlist when opening files"
-msgstr "Vastavuses olevatest kirjetest koostatakse uus esitusnimekiri"
+msgstr "Failide avamisel tühjendatakse esitusnimekiri"
 
-#: src/audacious/ui_preferences.c:212
-#, fuzzy
+#: src/audacious/ui_preferences.c:209
 msgid "Open files in a temporary playlist"
-msgstr "Uute failide lisamine ajutisse esitusnimekirja"
+msgstr "Failid avatakse ajutises esitusnimekirjas"
 
-#: src/audacious/ui_preferences.c:214
+#: src/audacious/ui_preferences.c:211
 msgid "Metadata"
 msgstr "Metaandmed"
 
-#: src/audacious/ui_preferences.c:454
+#: src/audacious/ui_preferences.c:212
+msgid "Do not load metadata for songs until played"
+msgstr "Loo metaandmeid enne esitamist ei laadita"
+
+#: src/audacious/ui_preferences.c:230
+msgid "TITLE"
+msgstr "PEALKIRI"
+
+#: src/audacious/ui_preferences.c:231
+msgid "ARTIST - TITLE"
+msgstr "ESITAJA - PEALKIRI"
+
+#: src/audacious/ui_preferences.c:232
+msgid "ARTIST - ALBUM - TITLE"
+msgstr "ESITAJA - ALBUM - PEALKIRI"
+
+#: src/audacious/ui_preferences.c:233
+msgid "ARTIST - ALBUM - TRACK. TITLE"
+msgstr "ESITAJA - ALBUM - RADA. PEALKIRI"
+
+#: src/audacious/ui_preferences.c:234
+msgid "ARTIST [ ALBUM ] - TRACK. TITLE"
+msgstr "ESITAJA [ALBUM] - RADA. PEALKIRI"
+
+#: src/audacious/ui_preferences.c:235
+msgid "ALBUM - TITLE"
+msgstr "ALBUM - PEALKIRI"
+
+#: src/audacious/ui_preferences.c:556
 msgid "Category"
 msgstr "Kategooria"
 
-#: src/audacious/ui_preferences.c:682
+#: src/audacious/ui_preferences.c:780
 msgid "Popup Information Settings"
 msgstr "Hüpikandmete sätted"
 
-#: src/audacious/ui_preferences.c:691
+#: src/audacious/ui_preferences.c:789
 msgid "Cover image retrieve"
 msgstr "Kaanepildi hankimine"
 
-#: src/audacious/ui_preferences.c:696
+#: src/audacious/ui_preferences.c:794
 msgid ""
 "While searching for the album's cover, Audacious looks for certain words in "
 "the filename. You can specify those words in the lists below, separated "
 "using commas."
-msgstr ""
-"Albumi kaanepildi otsimise käigus otsib Audacious failinimedest eelnevalt "
-"kindlaksmääratud sõnu. Neid sõnu on võimalik allpool olevate nimekirjade "
-"abil määrata, eraldades sõnad üksteisest komadega."
+msgstr "Albumi kaanepildi otsimise käigus otsib Audacious failinimedest eelnevalt kindlaksmääratud sõnu. Neid sõnu on võimalik allpool olevate nimekirjade abil määrata, eraldades sõnad üksteisest komadega."
 
-#: src/audacious/ui_preferences.c:713
+#: src/audacious/ui_preferences.c:811
 msgid "Exclude:"
 msgstr "Välistatud:"
 
-#: src/audacious/ui_preferences.c:720
+#: src/audacious/ui_preferences.c:818
 msgid "Include:"
 msgstr "Kaasatud:"
 
-#: src/audacious/ui_preferences.c:737
+#: src/audacious/ui_preferences.c:835
 msgid "Recursively search for cover"
-msgstr "Kaanepilti otsitakse rekursiivselt"
+msgstr "Kaanepilti otsitakse sügavuti"
 
-#: src/audacious/ui_preferences.c:747
+#: src/audacious/ui_preferences.c:845
 msgid "Search depth: "
 msgstr "Otsingu sügavus: "
 
-#: src/audacious/ui_preferences.c:761
+#: src/audacious/ui_preferences.c:859
 msgid "Use per-file cover"
 msgstr "Kasutatakse failipõhist kaanepilti"
 
-#: src/audacious/ui_preferences.c:764
+#: src/audacious/ui_preferences.c:862
 msgid "Miscellaneous"
 msgstr "Muu"
 
-#: src/audacious/ui_preferences.c:773
+#: src/audacious/ui_preferences.c:871
 msgid "Show Progress bar for the current track"
 msgstr "Esitatava loo kohta näidatakse edenemisriba"
 
-#: src/audacious/ui_preferences.c:783
+#: src/audacious/ui_preferences.c:881
 msgid "Delay until filepopup comes up: "
 msgstr "Viivitus enne hüpikakna avanemist: "
 
-#: src/audacious/ui_preferences.c:1283
+#: src/audacious/ui_preferences.c:1309
+msgid "Custom"
+msgstr "Kohandatud"
+
+#: src/audacious/ui_preferences.c:1352
 msgid "Song Display"
 msgstr "Loo kuvamine"
 
-#: src/audacious/ui_preferences.c:1292
+#: src/audacious/ui_preferences.c:1361
 msgid "Show song numbers"
-msgstr ""
+msgstr "Näidatakse lugude numbreid"
 
-#: src/audacious/ui_preferences.c:1303
+#: src/audacious/ui_preferences.c:1372
 msgid "Show leading zeroes (02:00 instead of 2:00)"
-msgstr ""
+msgstr "Alguses näidatakse nulle (2:00 asemel näidatakse 02:00)"
 
-#: src/audacious/ui_preferences.c:1325
+#: src/audacious/ui_preferences.c:1394
 msgid "Show information about titlestring format"
 msgstr "Pealkirjastringi vormingu kohta andmete näitamine"
 
-#: src/audacious/ui_preferences.c:1339
-msgid "TITLE"
-msgstr ""
-
-#: src/audacious/ui_preferences.c:1340
-msgid "ARTIST - TITLE"
-msgstr ""
-
-#: src/audacious/ui_preferences.c:1341
-msgid "ARTIST - ALBUM - TITLE"
-msgstr ""
-
-#: src/audacious/ui_preferences.c:1342
-msgid "ARTIST - ALBUM - TRACK. TITLE"
-msgstr ""
-
-#: src/audacious/ui_preferences.c:1343
-msgid "ARTIST [ ALBUM ] - TRACK. TITLE"
-msgstr ""
-
-#: src/audacious/ui_preferences.c:1344
-msgid "ALBUM - TITLE"
-msgstr ""
-
-#: src/audacious/ui_preferences.c:1345
-#, fuzzy
-msgid "Custom"
-msgstr "Kohandatud string:"
-
-#: src/audacious/ui_preferences.c:1354
+#: src/audacious/ui_preferences.c:1410
 msgid "Custom string:"
 msgstr "Kohandatud string:"
 
-#: src/audacious/ui_preferences.c:1361
+#: src/audacious/ui_preferences.c:1417
 msgid "Title format:"
 msgstr "Pealkirja vorming:"
 
-#: src/audacious/ui_preferences.c:1372
+#: src/audacious/ui_preferences.c:1428
 msgid "Popup Information"
 msgstr "Teabe hüpikaken"
 
-#: src/audacious/ui_preferences.c:1387
+#: src/audacious/ui_preferences.c:1443
 msgid "Show popup information for playlist entries"
-msgstr "Hüpikaknas näidatakse esitusnimekirja kirjete kohta andmeid"
+msgstr "Hüpikaknas näidatakse andmeid esitusnimekirja kirjete kohta"
 
-#: src/audacious/ui_preferences.c:1388
+#: src/audacious/ui_preferences.c:1444
 msgid ""
 "Toggles popup information window for the pointed entry in the playlist. The "
 "window shows title of song, name of album, genre, year of publish, track "
 "number, track length, and artwork."
-msgstr ""
-"Teabe hüpikakna sisse- või väljalülitamine. Seda hüpikakent kuvatakse, kui "
-"hoida hiirekursorit esitusnimekirjas oleva loo kohal ja selles aknas "
-"kuvatakse andmeid loo pealkirja, numbri ja pikkuse; albumi nime, žanri, ja "
-"avaldamise aasta; ning kaanepildi kohta."
+msgstr "Teabe hüpikakna sisse- või väljalülitamine. Seda hüpikakent kuvatakse, kui hoida hiirekursorit esitusnimekirjas oleva loo kohal ja selles aknas kuvatakse andmeid loo pealkirja, numbri ja pikkuse; albumi nime, žanri, ja avaldamise aasta; ning kaanepildi kohta."
 
-#: src/audacious/ui_preferences.c:1397
+#: src/audacious/ui_preferences.c:1455
 msgid "Edit settings for popup information"
 msgstr "Andmete hüpikakna sätete muutmine"
 
-#: src/audacious/ui_preferences.c:1497
-#, fuzzy
+#: src/audacious/ui_preferences.c:1544
 msgid "Output plugin:"
-msgstr "Sisendplugin: %s"
+msgstr "Väljundplugin:"
 
-#: src/audacious/ui_preferences.c:1556
-#, fuzzy
+#: src/audacious/ui_preferences.c:1603
 msgid "Transport"
-msgstr "Tõlkijad"
+msgstr "Transport"
 
-#: src/audacious/ui_preferences.c:1556
+#: src/audacious/ui_preferences.c:1603
 msgid "Input"
-msgstr ""
+msgstr "Sisend"
 
-#: src/audacious/ui_preferences.c:1557
-#, fuzzy
+#: src/audacious/ui_preferences.c:1604
 msgid "Effect"
-msgstr "Efektid"
+msgstr "Efekt"
 
-#: src/audacious/ui_preferences.c:1557
+#: src/audacious/ui_preferences.c:1604
 msgid "Visualization"
 msgstr "Visualiseerimine"
 
-#: src/audacious/ui_preferences.c:1557
+#: src/audacious/ui_preferences.c:1604
 msgid "General"
-msgstr ""
+msgstr "Üldine"
 
-#: src/audacious/ui_preferences.c:1597
+#: src/audacious/ui_preferences.c:1644
 msgid "Audacious Preferences"
-msgstr "Audacious'e eelistused"
+msgstr "Audaciouse eelistused"
 
-#: src/audacious/util.c:155
+#: src/audacious/util.c:120
 #, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr "Kataloogi pole võimalik luua (%s): %s\n"
 
-#: src/audtool/handlers_playlist.c:264
+#: src/audtool/handlers_playlist.c:273
 msgid "Position not found."
-msgstr ""
+msgstr "Asukohta ei leitud."
 
-#: src/audtool/handlers_vitals.c:64
+#: src/audtool/handlers_vitals.c:63
 msgid "No song playing."
-msgstr ""
+msgstr "Hetkel ei esitata ühtegi lugu."
+
+#: src/libaudcore/audstrings.c:199
+#, c-format
+msgid "Audio CD, track %s"
+msgstr "Audio-CD, lugu %s"
 
-#: src/libaudcore/tuple.c:685
+#: src/libaudcore/tuple.c:536
 msgid "Mono"
-msgstr ""
+msgstr "Mono"
 
-#: src/libaudcore/tuple.c:687
-#, fuzzy
+#: src/libaudcore/tuple.c:538
 msgid "Stereo"
-msgstr "stereo"
+msgstr "Stereo"
 
-#: src/libaudcore/tuple.c:689
+#: src/libaudcore/tuple.c:540
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d kanal"
+msgstr[1] "%d kanalit"
+
+#: src/libaudgui/about.c:52 src/libaudgui/about.c:115
+msgid "Credits"
+msgstr "Autorid"
 
-#: src/libaudgui/confirm.c:73
+#: src/libaudgui/about.c:52
+msgid "Translators"
+msgstr "Tõlkijad"
+
+#: src/libaudgui/about.c:91
+msgid "About Audacious"
+msgstr "Audacious'est lähemalt"
+
+#: src/libaudgui/confirm.c:76
 #, c-format
 msgid ""
 "Are you sure you want to close %s? If you do, any changes made since the "
 "playlist was exported will be lost."
-msgstr ""
+msgstr "Kas soovid sulgeda esitusnimekirja \"%s\"? Kõik pärast nimekirja viimast eksportimist tehtud muutused lähevad kaotsi."
 
-#: src/libaudgui/confirm.c:86
-#, fuzzy
+#: src/libaudgui/confirm.c:89
 msgid "_Don't show this message again"
-msgstr "Peaakna kuvamine"
+msgstr "Seda teadet rohkem ei _näidata"
 
-#: src/libaudgui/confirm.c:124
-#, fuzzy
+#: src/libaudgui/confirm.c:126
 msgid "Rename Playlist"
-msgstr "Esitusnimekirja salvestamine"
+msgstr "Esitusnimekirja nime muutmine"
 
-#: src/libaudgui/effects-menu.c:76
+#: src/libaudgui/effects-menu.c:74
 msgid "settings ..."
-msgstr ""
+msgstr "sätted..."
 
-#: src/libaudgui/equalizer.c:68
-#, fuzzy
+#: src/libaudgui/equalizer.c:51
 msgid "_Enable"
-msgstr "Lubatud"
+msgstr "_Lubatud"
 
-#: src/libaudgui/equalizer.c:140
+#: src/libaudgui/equalizer.c:123
 msgid "31 Hz"
-msgstr ""
+msgstr "31 Hz"
 
-#: src/libaudgui/equalizer.c:140
+#: src/libaudgui/equalizer.c:123
 msgid "63 Hz"
-msgstr ""
+msgstr "63 Hz"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "125 Hz"
-msgstr ""
+msgstr "125 Hz"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "250 Hz"
-msgstr ""
+msgstr "250 Hz"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "500 Hz"
-msgstr ""
+msgstr "500 Hz"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "1 kHz"
-msgstr ""
+msgstr "1 kHz"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "2 kHz"
-msgstr ""
+msgstr "2 kHz"
 
-#: src/libaudgui/equalizer.c:142
+#: src/libaudgui/equalizer.c:125
 msgid "4 kHz"
-msgstr ""
+msgstr "4 kHz"
 
-#: src/libaudgui/equalizer.c:142
+#: src/libaudgui/equalizer.c:125
 msgid "8 kHz"
-msgstr ""
+msgstr "8 kHz"
 
-#: src/libaudgui/equalizer.c:142
+#: src/libaudgui/equalizer.c:125
 msgid "16 kHz"
-msgstr ""
+msgstr "16 kHz"
 
-#: src/libaudgui/equalizer.c:147
+#: src/libaudgui/equalizer.c:130
 msgid "Equalizer"
 msgstr "Ekvalaiser"
 
-#: src/libaudgui/equalizer.c:163
+#: src/libaudgui/equalizer.c:146
 msgid "Preamp"
-msgstr ""
+msgstr "Eelmoonutus"
 
-#: src/libaudgui/infopopup.c:212
+#: src/libaudgui/infopopup.c:207
 msgid "Track Number"
 msgstr "Loo number"
 
-#: src/libaudgui/infopopup.c:214
+#: src/libaudgui/infopopup.c:209
 msgid "Track Length"
 msgstr "Loo kestus"
 
-#: src/libaudgui/infowin.c:77
+#: src/libaudgui/infowin.c:75
 msgid "Acid Jazz"
-msgstr ""
+msgstr "Acid Jazz"
 
-#: src/libaudgui/infowin.c:78
+#: src/libaudgui/infowin.c:76
 msgid "Acid Rock"
-msgstr ""
+msgstr "Acid Rock"
 
-#: src/libaudgui/infowin.c:79
+#: src/libaudgui/infowin.c:77
 msgid "Ambient"
-msgstr ""
+msgstr "Ambient"
 
-#: src/libaudgui/infowin.c:80
+#: src/libaudgui/infowin.c:78
 msgid "Bebop"
-msgstr ""
+msgstr "Bebop"
 
-#: src/libaudgui/infowin.c:81
-#, fuzzy
+#: src/libaudgui/infowin.c:79
 msgid "Bluegrass"
-msgstr "Sinine"
+msgstr "Bluegrass"
 
-#: src/libaudgui/infowin.c:82
-#, fuzzy
+#: src/libaudgui/infowin.c:80
 msgid "Blues"
-msgstr "Sinine"
+msgstr "Bluus"
 
-#: src/libaudgui/infowin.c:83
+#: src/libaudgui/infowin.c:81
 msgid "Chamber Music"
-msgstr ""
+msgstr "Kammermuusika"
 
-#: src/libaudgui/infowin.c:84
+#: src/libaudgui/infowin.c:82
 msgid "Classical"
-msgstr ""
+msgstr "Klassikaline"
 
-#: src/libaudgui/infowin.c:85
+#: src/libaudgui/infowin.c:83
 msgid "Country"
-msgstr ""
+msgstr "Kantri"
 
-#: src/libaudgui/infowin.c:86
+#: src/libaudgui/infowin.c:84
 msgid "Death Metal"
-msgstr ""
+msgstr "Death Metal"
 
-#: src/libaudgui/infowin.c:87
+#: src/libaudgui/infowin.c:85
 msgid "Disco"
-msgstr ""
+msgstr "Disko"
 
-#: src/libaudgui/infowin.c:88
+#: src/libaudgui/infowin.c:86
 msgid "Easy Listening"
-msgstr ""
+msgstr "Ajaviitemuusika"
 
-#: src/libaudgui/infowin.c:89
+#: src/libaudgui/infowin.c:87
 msgid "Folk"
-msgstr ""
+msgstr "Folk"
 
-#: src/libaudgui/infowin.c:90
+#: src/libaudgui/infowin.c:88
 msgid "Funk"
-msgstr ""
+msgstr "Funk"
 
-#: src/libaudgui/infowin.c:91
+#: src/libaudgui/infowin.c:89
 msgid "Gangsta Rap"
-msgstr ""
+msgstr "Gangsta Rap"
 
-#: src/libaudgui/infowin.c:92
+#: src/libaudgui/infowin.c:90
 msgid "Gospel"
-msgstr ""
+msgstr "Gospel"
 
-#: src/libaudgui/infowin.c:93
+#: src/libaudgui/infowin.c:91
 msgid "Grunge"
-msgstr ""
+msgstr "Grunge"
 
-#: src/libaudgui/infowin.c:94
+#: src/libaudgui/infowin.c:92
 msgid "Hard Rock"
-msgstr ""
+msgstr "Raske rokk"
 
-#: src/libaudgui/infowin.c:95
+#: src/libaudgui/infowin.c:93
 msgid "Heavy Metal"
-msgstr ""
+msgstr "Heavy Metal"
 
-#: src/libaudgui/infowin.c:96
+#: src/libaudgui/infowin.c:94
 msgid "Hip-hop"
-msgstr ""
+msgstr "Hip-hop"
 
-#: src/libaudgui/infowin.c:97
-#, fuzzy
+#: src/libaudgui/infowin.c:95
 msgid "House"
-msgstr "Hiir"
+msgstr "House"
 
-#: src/libaudgui/infowin.c:98
+#: src/libaudgui/infowin.c:96
 msgid "Jazz"
-msgstr ""
+msgstr "Džäss"
 
-#: src/libaudgui/infowin.c:99
+#: src/libaudgui/infowin.c:97
 msgid "Jungle"
-msgstr ""
+msgstr "Jungle"
 
-#: src/libaudgui/infowin.c:100
+#: src/libaudgui/infowin.c:98
 msgid "Metal"
-msgstr ""
+msgstr "Metal"
 
-#: src/libaudgui/infowin.c:101
+#: src/libaudgui/infowin.c:99
 msgid "New Age"
-msgstr ""
+msgstr "New Age"
 
-#: src/libaudgui/infowin.c:102
+#: src/libaudgui/infowin.c:100
 msgid "New Wave"
-msgstr ""
+msgstr "New Wave"
 
-#: src/libaudgui/infowin.c:103
-#, fuzzy
+#: src/libaudgui/infowin.c:101
 msgid "Noise"
-msgstr "Hiir"
+msgstr "Müra"
 
-#: src/libaudgui/infowin.c:104
+#: src/libaudgui/infowin.c:102
 msgid "Pop"
-msgstr ""
+msgstr "Pop"
 
-#: src/libaudgui/infowin.c:105
+#: src/libaudgui/infowin.c:103
 msgid "Punk Rock"
-msgstr ""
+msgstr "Punkrokk"
 
-#: src/libaudgui/infowin.c:106
+#: src/libaudgui/infowin.c:104
 msgid "Rap"
-msgstr ""
+msgstr "Räpp"
 
-#: src/libaudgui/infowin.c:107
-#, fuzzy
+#: src/libaudgui/infowin.c:105
 msgid "Reggae"
-msgstr "_Muuda nime"
+msgstr "Rege"
 
-#: src/libaudgui/infowin.c:108
+#: src/libaudgui/infowin.c:106
 msgid "Rock"
-msgstr ""
+msgstr "Rokk"
 
-#: src/libaudgui/infowin.c:109
+#: src/libaudgui/infowin.c:107
 msgid "Rock and Roll"
-msgstr ""
+msgstr "Rock & Roll"
 
-#: src/libaudgui/infowin.c:110
+#: src/libaudgui/infowin.c:108
 msgid "Rhythm and Blues"
-msgstr ""
+msgstr "Rütmibluus"
 
-#: src/libaudgui/infowin.c:111
+#: src/libaudgui/infowin.c:109
 msgid "Ska"
-msgstr ""
+msgstr "Ska"
 
-#: src/libaudgui/infowin.c:112
+#: src/libaudgui/infowin.c:110
 msgid "Soul"
-msgstr ""
+msgstr "Soul"
 
-#: src/libaudgui/infowin.c:113
+#: src/libaudgui/infowin.c:111
 msgid "Swing"
-msgstr ""
+msgstr "Sving"
 
-#: src/libaudgui/infowin.c:114
+#: src/libaudgui/infowin.c:112
 msgid "Techno"
-msgstr ""
+msgstr "Tehno"
 
-#: src/libaudgui/infowin.c:115
+#: src/libaudgui/infowin.c:113
 msgid "Trip-hop"
-msgstr ""
+msgstr "Trip-hop"
 
-#: src/libaudgui/infowin.c:175 src/libaudgui/infowin.c:361
-#: src/libaudgui/infowin.c:364 src/libaudgui/infowin.c:367
-#, fuzzy
+#: src/libaudgui/infowin.c:177 src/libaudgui/infowin.c:363
+#: src/libaudgui/infowin.c:366 src/libaudgui/infowin.c:369
 msgid "n/a"
-msgstr "Aasta"
+msgstr "puudub"
 
-#: src/libaudgui/infowin.c:265
+#: src/libaudgui/infowin.c:267
 msgid "Metadata updated successfully"
-msgstr ""
+msgstr "Metaandmed edukalt uuendatud"
 
-#: src/libaudgui/infowin.c:270
+#: src/libaudgui/infowin.c:272
 msgid "Metadata updating failed"
-msgstr ""
+msgstr "Metaandmete uuendamine nurjus"
 
-#: src/libaudgui/infowin.c:318
+#: src/libaudgui/infowin.c:320
 msgid "Track Information"
 msgstr "Loo andmed"
 
-#: src/libaudgui/infowin.c:350
-#, fuzzy
+#: src/libaudgui/infowin.c:352
 msgid "Format:"
-msgstr "Kommentaar"
+msgstr "Vorming:"
 
-#: src/libaudgui/infowin.c:354
-#, fuzzy
+#: src/libaudgui/infowin.c:356
 msgid "Quality:"
-msgstr "Pealkiri"
+msgstr "Kvaliteet:"
 
-#: src/libaudgui/infowin.c:357
-#, fuzzy
+#: src/libaudgui/infowin.c:359
 msgid "Bitrate:"
-msgstr "Kommentaar"
+msgstr "Bitikiirus:"
 
-#: src/libaudgui/infowin.c:387
+#: src/libaudgui/infowin.c:389
 msgid "Title"
 msgstr "Pealkiri"
 
-#: src/libaudgui/infowin.c:399
+#: src/libaudgui/infowin.c:401
 msgid "Artist"
 msgstr "Esitaja"
 
-#: src/libaudgui/infowin.c:411
+#: src/libaudgui/infowin.c:413
 msgid "Album"
 msgstr "Album"
 
-#: src/libaudgui/infowin.c:423
+#: src/libaudgui/infowin.c:425
 msgid "Comment"
 msgstr "Kommentaar"
 
-#: src/libaudgui/infowin.c:435
+#: src/libaudgui/infowin.c:437
 msgid "Genre"
 msgstr "Žanr"
 
-#: src/libaudgui/infowin.c:456
+#: src/libaudgui/infowin.c:458
 msgid "Year"
 msgstr "Aasta"
 
-#: src/libaudgui/infowin.c:467
+#: src/libaudgui/infowin.c:469
 msgid "Track Number"
 msgstr "Loo number"
 
-#: src/libaudgui/infowin.c:549
+#: src/libaudgui/infowin.c:548
 #, c-format
 msgid "%d kb/s"
-msgstr ""
+msgstr "%d kb/s"
 
-#: src/libaudgui/infowin.c:579
+#: src/libaudgui/infowin.c:575
 #, c-format
 msgid "No info available for %s.\n"
-msgstr ""
+msgstr "Faili %s kohta puuduvad andmed.\n"
 
-#: src/libaudgui/jump-to-time.c:75
+#: src/libaudgui/jump-to-time.c:72
 msgid "Jump to Time"
-msgstr "Hüppa ajahetkele"
+msgstr "Ajahetkele hüppamine"
 
-#: src/libaudgui/jump-to-time.c:90
+#: src/libaudgui/jump-to-time.c:87
 msgid "mm:ss"
-msgstr ""
+msgstr "mm:ss"
 
-#: src/libaudgui/playlists.c:39
-#, fuzzy
+#: src/libaudgui/playlists.c:33
 msgid "Export Playlist"
-msgstr "Esitusnimekirja laadimine"
+msgstr "Esitusnimekirja eksportimine"
 
-#: src/libaudgui/playlists.c:39
-#, fuzzy
+#: src/libaudgui/playlists.c:33
 msgid "Import Playlist"
-msgstr "Esitusnimekirja laadimine"
+msgstr "Esitusnimekirja importimine"
 
-#: src/libaudgui/playlists.c:71
+#: src/libaudgui/playlists.c:66
 #, c-format
 msgid "Overwrite %s?"
-msgstr ""
-
-#: src/libaudgui/ui_about.c:71
-msgid "About Audacious"
-msgstr "Audacious'est lähemalt"
-
-#: src/libaudgui/ui_about.c:93 src/libaudgui/ui_credits.c:122
-msgid "Credits"
-msgstr "Autorid"
+msgstr "Kas kirjutada fail %s üle?"
 
-#: src/libaudgui/ui_credits.c:126
-msgid "Translators"
-msgstr "Tõlkijad"
+#: src/libaudgui/queue-manager.c:196
+msgid "Queue Manager"
+msgstr "Esitusjärjekorra haldamine"
 
-#: src/libaudgui/ui_fileopener.c:108
+#: src/libaudgui/ui_fileopener.c:109
 msgid "Open Files"
 msgstr "Failide avamine"
 
-#: src/libaudgui/ui_fileopener.c:108
+#: src/libaudgui/ui_fileopener.c:109
 msgid "Add Files"
 msgstr "Failide lisamine"
 
-#: src/libaudgui/ui_fileopener.c:110
+#: src/libaudgui/ui_fileopener.c:111
 msgid "Close dialog on Open"
-msgstr "Dialoog sulgetakse pärast faili avamist"
+msgstr "Dialoog suletakse pärast faili avamist"
 
-#: src/libaudgui/ui_fileopener.c:110
+#: src/libaudgui/ui_fileopener.c:111
 msgid "Close dialog on Add"
-msgstr "Dialoog sulgetakse pärast faili lisamist"
-
-#: src/libaudgui/ui_jumptotrack.c:133
-msgid "Un_queue"
-msgstr "Eemalda _järjekorrast"
+msgstr "Dialoog suletakse pärast faili lisamist"
 
-#: src/libaudgui/ui_jumptotrack.c:135 src/libaudgui/ui_jumptotrack.c:512
+#: src/libaudgui/ui_jumptotrack.c:109 src/libaudgui/ui_jumptotrack.c:117
+#: src/libaudgui/ui_jumptotrack.c:326
 msgid "_Queue"
 msgstr "Pane _järjekorda"
 
-#: src/libaudgui/ui_jumptotrack.c:399
-msgid "Jump to Track"
-msgstr "Valitud loo peale hüppamine"
+#: src/libaudgui/ui_jumptotrack.c:115
+msgid "Un_queue"
+msgstr "Eemalda _järjekorrast"
+
+#: src/libaudgui/ui_jumptotrack.c:258
+msgid "Jump to Song"
+msgstr "Loo vahetamine"
 
-#: src/libaudgui/ui_jumptotrack.c:442
+#: src/libaudgui/ui_jumptotrack.c:281
 msgid "Filter: "
 msgstr "Filter: "
 
-#: src/libaudgui/ui_jumptotrack.c:443
+#: src/libaudgui/ui_jumptotrack.c:282
 msgid "_Filter:"
 msgstr "_Filter:"
 
-#: src/libaudgui/ui_jumptotrack.c:461
+#: src/libaudgui/ui_jumptotrack.c:292
 msgid "Remember"
-msgstr ""
+msgstr "Jätetakse meelde"
 
-#: src/libaudgui/ui_jumptotrack.c:470
-#, fuzzy
+#: src/libaudgui/ui_jumptotrack.c:299
 msgid "Clea_r"
-msgstr "Nulli A-B"
+msgstr "_Puhasta"
 
-#: src/libaudgui/ui_jumptotrack.c:504
+#: src/libaudgui/ui_jumptotrack.c:319
 msgid "Close on Jump"
-msgstr "Pärast hüpet suletakse aken"
+msgstr "Pärast loo vahetust suletakse aken"
 
-#: src/libaudgui/ui_playlist_manager.c:240
+#: src/libaudgui/ui_playlist_manager.c:253
 msgid "Playlist Manager"
-msgstr "Esitusnimekirja haldur"
+msgstr "Esitusnimekirjade haldur"
 
-#: src/libaudgui/ui_playlist_manager.c:264
+#: src/libaudgui/ui_playlist_manager.c:280
 msgid "Entries"
 msgstr "Kirjeid"
 
-#: src/libaudgui/ui_playlist_manager.c:285
+#: src/libaudgui/ui_playlist_manager.c:301
 msgid "_Rename"
 msgstr "_Muuda nime"
 
-#: src/libaudgui/ui_playlist_manager.c:309
-#, fuzzy
+#: src/libaudgui/ui_playlist_manager.c:325
 msgid "_Close dialog on activating playlist"
-msgstr "Dialoog sulgetakse pärast faili avamist"
+msgstr "Esitusnimekirja _aktiveerimisel dialoog suletakse"
 
-#: src/libaudgui/ui_urlopener.c:58
+#: src/libaudgui/ui_urlopener.c:48
 msgid "Open URL"
-msgstr ""
+msgstr "URL-i avamine"
 
-#: src/libaudgui/ui_urlopener.c:58
+#: src/libaudgui/ui_urlopener.c:48
 msgid "Add URL"
-msgstr ""
+msgstr "URL-i lisamine"
 
 #: src/libaudgui/util.c:95
 msgid ""
 "\n"
 "(Further messages have been hidden.)"
-msgstr ""
+msgstr "\n(Ülejäänud sõnumid peidetakse.)"
 
 #: src/libeggsmclient/eggdesktopfile.c:165
 msgid "File is not a valid .desktop file"
-msgstr ""
+msgstr "Fail pole korrektne .desktop-fail"
 
-#: src/libeggsmclient/eggdesktopfile.c:188
+#: src/libeggsmclient/eggdesktopfile.c:191
 #, c-format
 msgid "Unrecognized desktop file Version '%s'"
-msgstr ""
+msgstr "Töölauafaili tundmatu versioon '%s'"
 
-#: src/libeggsmclient/eggdesktopfile.c:967
+#: src/libeggsmclient/eggdesktopfile.c:974
 #, c-format
 msgid "Starting %s"
-msgstr ""
+msgstr "Faili %s käivitamine"
 
-#: src/libeggsmclient/eggdesktopfile.c:1108
+#: src/libeggsmclient/eggdesktopfile.c:1116
 msgid "Application does not accept documents on command line"
-msgstr ""
+msgstr "Rakendus ei toeta käsurealt määratud dokumente"
 
-#: src/libeggsmclient/eggdesktopfile.c:1176
+#: src/libeggsmclient/eggdesktopfile.c:1184
 #, c-format
 msgid "Unrecognized launch option: %d"
-msgstr ""
+msgstr "Arusaamatu käivitusvõti: %d"
 
-#: src/libeggsmclient/eggdesktopfile.c:1375
+#: src/libeggsmclient/eggdesktopfile.c:1391
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
-msgstr ""
+msgstr "Dokumendi URI-sid pole võimalik 'Liik=Viit' tüüpi töölauakirjele edastada"
 
-#: src/libeggsmclient/eggdesktopfile.c:1396
+#: src/libeggsmclient/eggdesktopfile.c:1412
 msgid "Not a launchable item"
-msgstr ""
+msgstr "Pole käivitatav kirje"
 
 #: src/libeggsmclient/eggsmclient.c:226
 msgid "Disable connection to session manager"
-msgstr ""
+msgstr "Seansihalduriga ühendumise keelamine"
 
 #: src/libeggsmclient/eggsmclient.c:229
 msgid "Specify file containing saved configuration"
-msgstr ""
+msgstr "Salvestatud seadistusi sisaldava faili määramine"
 
 #: src/libeggsmclient/eggsmclient.c:229
-#, fuzzy
 msgid "FILE"
-msgstr "FAIL..."
+msgstr "FAIL"
 
 #: src/libeggsmclient/eggsmclient.c:232
 msgid "Specify session management ID"
-msgstr ""
+msgstr "Seandihalduse ID määramine"
 
 #: src/libeggsmclient/eggsmclient.c:232
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #: src/libeggsmclient/eggsmclient.c:253
-#, fuzzy
 msgid "Session management options:"
-msgstr "Aknahalduri dekoratsioonid on nähtaval"
+msgstr "Seansihalduse valikud:"
 
 #: src/libeggsmclient/eggsmclient.c:254
-#, fuzzy
 msgid "Show session management options"
-msgstr "Aknahalduri dekoratsioonid on nähtaval"
-
-#, fuzzy
-#~ msgid ""
-#~ "All streams will be converted to this bit depth.\n"
-#~ "This should be the max supported bit depth of\n"
-#~ "the sound card or output plugin."
-#~ msgstr ""
-#~ "Kõik audiovood teisendatakse sellele "
-#~ "diskreetimissagedusele.\n"
-#~ "See peaks olema võrdne helikaardi või väljundplugina\n"
-#~ "suurima diskreetimissagedusega."
-
-#~ msgid "Volume Control"
-#~ msgstr "Helivaljuse juhtimine"
-
-#, fuzzy
-#~ msgid ""
-#~ "Use software volume control. This may be useful for situations where your "
-#~ "audio system does not support controlling the playback volume."
-#~ msgstr ""
-#~ "Tarkvaralise helivaljuse juhtimise kasutamine. See võib olla kasulik "
-#~ "olukorras, kus sinu audiosüsteem ei toeta esitatava audio helivaljuse "
-#~ "juhtimist."
-
-#, fuzzy
-#~ msgid "Mode"
-#~ msgstr "Metaandmed"
-
-#, fuzzy
-#~ msgid "Clipping Prevention"
-#~ msgstr "Teabe hüpikaken"
-
-#~ msgid "Audio System"
-#~ msgstr "Audiosüsteem"
-
-#~ msgid "Current output plugin:"
-#~ msgstr "Praegune väljundplugin:"
-
-#~ msgid "Display all open Audacious windows"
-#~ msgstr "Audacious'e kõigi avatud akende kuvamine"
-
-#~ msgid "%s: Unable to open display, exiting.\n"
-#~ msgstr "%s: Kuva pole võimalik avada, töö lõpetatakse.\n"
-
-#, fuzzy
-#~ msgid "Default gain:"
-#~ msgstr "Vaikimisi rüü:"
-
-#, fuzzy
-#~ msgid "Dance"
-#~ msgstr "Kuupäev"
-
-#, fuzzy
-#~ msgid "Oldies"
-#~ msgstr "rea võrra"
-
-#, fuzzy
-#~ msgid "Pranks"
-#~ msgstr "Kõrgeimad tasemed"
-
-#, fuzzy
-#~ msgid "Fusion"
-#~ msgstr "Vene:"
-
-#, fuzzy
-#~ msgid "Trance"
-#~ msgstr "Välimus"
-
-#, fuzzy
-#~ msgid "Bass"
-#~ msgstr "Tulbad"
-
-#, fuzzy
-#~ msgid "Space"
-#~ msgstr "Salvesta"
-
-#, fuzzy
-#~ msgid "Comedy"
-#~ msgstr "Kommentaar"
-
-#, fuzzy
-#~ msgid "Cult"
-#~ msgstr "Kohandatud string:"
-
-#, fuzzy
-#~ msgid "Rave"
-#~ msgstr "Salvesta"
-
-#, fuzzy
-#~ msgid "Showtunes"
-#~ msgstr "Aeglaseim"
-
-#, fuzzy
-#~ msgid "Trailer"
-#~ msgstr "Pealkiri"
-
-#, fuzzy
-#~ msgid "Polka"
-#~ msgstr "Esita"
-
-#, fuzzy
-#~ msgid "Retro"
-#~ msgstr "Nulli"
-
-#, fuzzy
-#~ msgid "Latin"
-#~ msgstr "Jooned"
-
-#, fuzzy
-#~ msgid "Slow Rock"
-#~ msgstr "Aeglane"
-
-#, fuzzy
-#~ msgid "Primus"
-#~ msgstr "Eelmine"
-
-#, fuzzy
-#~ msgid "Satire"
-#~ msgstr "Tuli"
-
-#, fuzzy
-#~ msgid "Slow Jam"
-#~ msgstr "Aeglane"
-
-#, fuzzy
-#~ msgid "Duet"
-#~ msgstr "Hollandi:"
-
-#, fuzzy
-#~ msgid "Terror"
-#~ msgstr "Nulli"
-
-#, fuzzy
-#~ msgid "Indie"
-#~ msgstr "Kaasatud:"
-
-#, fuzzy
-#~ msgid "Beat"
-#~ msgstr "Kordus"
-
-#, fuzzy
-#~ msgid "Synthpop"
-#~ msgstr "Seiska"
-
-#, fuzzy
-#~ msgid ""
-#~ "<big>Audacious %s</big>\n"
-#~ "An audio player for many platforms.\n"
-#~ "Copyright (C) 2005-2011 Audacious Development Team"
-#~ msgstr ""
-#~ "<big>Audacious %s</big>\n"
-#~ "Rüütatud multimeediaesitaja paljudele platvormidele.\n"
-#~ "\n"
-#~ "Autoriõigused (C) 2005-2007 Audaciouse arendusmeeskond\n"
-
-#~ msgid "Unable to create log file (%s)!\n"
-#~ msgstr "Logifaili pole võimalik luua (%s)!\n"
-
-#~ msgid "Print all errors and warnings to stdout"
-#~ msgstr "Kõikide vigade ja hoiatuse väljastamine standardväljundisse"
-
-#, fuzzy
-#~ msgid "Audacious - Unsupported Version Warning"
-#~ msgstr "Audacious - nähtavaloleku hoiatus"
-
-#~ msgid "Playback"
-#~ msgstr "Esitamine"
-
-#~ msgid "Playback"
-#~ msgstr "Esitamine"
-
-#~ msgid ""
-#~ "When Audacious starts, automatically begin playing from the point where "
-#~ "we stopped before."
-#~ msgstr ""
-#~ "Kui märgitud, siis Audaciouse käivitamisel jätkatakse esitust sellest "
-#~ "kohtast, kus esitamine sulgemise ajal katkes."
-
-#~ msgid "Don't advance in the playlist"
-#~ msgstr "Esitusnimekirjas ei siirduta automaatselt järgmise loo peale"
-
-#~ msgid ""
-#~ "When finished playing a song, don't automatically advance to the next."
-#~ msgstr ""
-#~ "Kui märgitud, siis pärast loo lõppemist ei hakata automaatselt järgmist "
-#~ "lugu esitama."
-
-#~ msgid "Enabled"
-#~ msgstr "Lubatud"
-
-#~ msgid "Description"
-#~ msgstr "Kirjeldus"
-
-#~ msgid "Output Plugin Preferences"
-#~ msgstr "Väljundplugina eelistused"
-
-#~ msgid "Output Plugin Information"
-#~ msgstr "Väljundplugina andmed"
-
-#~ msgid "_Decoder list:"
-#~ msgstr "_Dekoodrite nimekiri:"
-
-#~ msgid "Decoders"
-#~ msgstr "Dekoodrid"
-
-#~ msgid "_General plugin list:"
-#~ msgstr "Ü_ldpluginate nimekiri:"
-
-#~ msgid "General"
-#~ msgstr "Üldised"
-
-#~ msgid "_Visualization plugin list:"
-#~ msgstr "_Visualiseerimispluginate nimekiri:"
-
-#~ msgid "Visualization"
-#~ msgstr "Visualiseerimine"
-
-#, fuzzy
-#~ msgid "Effect plugins:"
-#~ msgstr "_Efektipluginate nimekiri:"
-
-#, fuzzy
-#~ msgid "General"
-#~ msgstr "Žanr"
-
-#~ msgid "Location"
-#~ msgstr "Asukoht"
-
-#, fuzzy
-#~ msgid "Raw Metadata"
-#~ msgstr "Aasta"
-
-#, fuzzy
-#~ msgid "Value"
-#~ msgstr "Sinine"
-
-#, fuzzy
-#~ msgid ""
-#~ "Available interfaces:\n"
-#~ "\n"
-#~ msgstr "Saadaolevad _valmisseadistused:"
-
-#, fuzzy
-#~ msgid "Available Plugin Preferences:\n"
-#~ msgstr "Saadaolevad _valmisseadistused:"
-
-#~ msgid "Add/Open URL Dialog"
-#~ msgstr "URL-i lisamise/avamise dialoog"
-
-#~ msgid "Enter location to play:"
-#~ msgstr "Sisesta esitatava loo asukoht:"
-
-#~ msgid "Don't clear the playlist"
-#~ msgstr "Esitusnimekirja ei puhastata"
-
-#~ msgid "audacious: %s"
-#~ msgstr "audacious: %s"
-
-#~ msgid "Filename:"
-#~ msgstr "Failinimi:"
-
-#~ msgid "No input plugin recognized this file"
-#~ msgstr "Selle faili jaoks pole teadaolevat sisendpluginat"
-
-#~ msgid ""
-#~ "<big>No output plugin selected.</big>\n"
-#~ "You have not selected an output plugin."
-#~ msgstr ""
-#~ "<big>Väljundpluginat pole valitud.</big>\n"
-#~ "Sa pole valinud väljundpluginat."
-
-#~ msgid "Connectivity"
-#~ msgstr "Ühendused"
-
-#, fuzzy
-#~ msgid "ZOH Interpolation"
-#~ msgstr "Interpoleerimismootor:"
-
-#, fuzzy
-#~ msgid "Linear Interpolation"
-#~ msgstr "Interpoleerimismootor:"
-
-#~ msgid "Sampling Rate [Hz]:"
-#~ msgstr "Diskreetimissagedus [Hz]:"
-
-#~ msgid "Interpolation Engine:"
-#~ msgstr "Interpoleerimismootor:"
-
-#~ msgid ""
-#~ "All streams will be converted to this sampling "
-#~ "rate.\n"
-#~ "This should be the max supported sampling rate of\n"
-#~ "the sound card or output plugin."
-#~ msgstr ""
-#~ "Kõik audiovood teisendatakse sellele "
-#~ "diskreetimissagedusele.\n"
-#~ "See peaks olema võrdne helikaardi või väljundplugina\n"
-#~ "suurima diskreetimissagedusega."
-
-#~ msgid "Detect file formats by extension."
-#~ msgstr "Failivormingud tuvastatakse laiendi alusel."
-
-#, fuzzy
-#~ msgid ""
-#~ "When checked, Audacious will detect file formats based by extension. Only "
-#~ "files with extensions of supported formats will be loaded."
-#~ msgstr ""
-#~ "Kui märgitud, siis tuvastab Audacious failivorminguid failinime laiendi "
-#~ "alusel. See on veidi aeglasem kui failivormingu tuvastamine vajaduse "
-#~ "korral, samas tagab see minimaalse vormingutuvastamise taseme."
-
-#~ msgid "Sampling Rate Converter"
-#~ msgstr "Diskreetimissageduse teisendaja"
-
-#~ msgid "Enable Sampling Rate Converter"
-#~ msgstr "Diskreetimissageduse teisendamine on lubatud"
-
-#, fuzzy
-#~ msgid "Advanced"
-#~ msgstr "Esitamine"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Audacious has caught signal 11 (SIGSEGV).\n"
-#~ "\n"
-#~ "We apologize for the inconvenience, but Audacious has crashed.\n"
-#~ "This is a bug in the program, and should never happen under normal "
-#~ "circumstances.\n"
-#~ "Your current configuration has been saved and should not be damaged.\n"
-#~ "\n"
-#~ "You can help improve the quality of Audacious by filing a bug at http://"
-#~ "jira.atheme.org/\n"
-#~ "Please include the entire text of this message and a description of what "
-#~ "you were doing when\n"
-#~ "this crash occured in order to quickly expedite the handling of your bug "
-#~ "report:\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Audacious võttis vastu signaali 11 (SIGSEGV).\n"
-#~ "\n"
-#~ "Me vabandame ebamugavuste pärast, kuid Audacious krahhis.\n"
-#~ "See on programmiviga ja seda ei peaks tavatingimustes kunagi juhtuma.\n"
-#~ "Sinu praegused sätted salvestati ja need ei tohiks katki minna.\n"
-#~ "\n"
-#~ "Sa saad Audacious'e arendamisele kaasa aidata, kui täidad vearaporti "
-#~ "aadressil http://bugs-meta.atheme.org\n"
-#~ "Palun lisa sellele kogu käesolev sõnum ja ka lühidalt andmed selle "
-#~ "kohta,\n"
-#~ "mida sa krahhi ajal parasjagu tegid. Siis on võimalik sinu vearaport\n"
-#~ "kiiresti töösse võtta:\n"
-#~ "\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Bugs can be reported at http://jira.atheme.org/ against the Audacious or "
-#~ "Audacious Plugins product.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Audacious'e toodete vigadest võib teada anda aadressil http://bugs-meta."
-#~ "atheme.org.\n"
-
-#~ msgid ""
-#~ "Your signaling implementation is broken.\n"
-#~ "Expect unusable crash reports.\n"
-#~ msgstr ""
-#~ "Süsteemi signaalitöötluse teostus ei toimi.\n"
-#~ "Seetõttu võib oodata mõttetuid krahhiteateid.\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "<big>Audacious %s</big>\n"
-#~ "\n"
-#~ "Copyright (C) 2005-2009 Audacious Development Team"
-#~ msgstr ""
-#~ "<big>Audacious %s</big>\n"
-#~ "\n"
-#~ "Autoriõigused (C) 2005-2007 Audaciouse arendusmeeskond"
-
-#~ msgid "Detect file formats on demand, instead of immediately."
-#~ msgstr "Failivormingud tuvastatakse vajadusel, mitte koheselt."
-
-#~ msgid ""
-#~ "When checked, Audacious will detect file formats on demand. This can "
-#~ "result in a messier playlist, but delivers a major speed benefit."
-#~ msgstr ""
-#~ "Kui märgitud, siis tuvastab Audacious failivormingud vajaduse korral. See "
-#~ "võib põhjustada küll veidi segase esitusnimekirja aga samas tagab see ka "
-#~ "Audacious'e kiirema töö."
-
-#~ msgid "Load metadata from playlists and files"
-#~ msgstr "Metaandmed loetakse esitusnimekirjadest ja failidest"
-
-#~ msgid "Load metadata (tag information) from music files."
-#~ msgstr "Metaandmete (sildiandmete) laadimine helifailidest."
-
-#~ msgid "minutes:seconds"
-#~ msgstr "minutit:sekundit"
-
-#~ msgid "Track length:"
-#~ msgstr "Loo kestus:"
-
-#~ msgid "Save as Static Playlist"
-#~ msgstr "Salvestatakse staatilise esitusnimekirjana"
-
-#~ msgid "Use Relative Path"
-#~ msgstr "Kasutatakse suhtelist rada"
-
-#~ msgid "Error writing playlist \"%s\": %s"
-#~ msgstr "Viga esitusnimekirja \"%s\" kirjutamisel: %s"
-
-#~ msgid "%s already exist. Continue?"
-#~ msgstr "%s on juba olemas. Kas jätkata?"
-
-#~ msgid ""
-#~ "<big>Unable to save playlist.</big>\n"
-#~ "\n"
-#~ "Unknown file type for '%s'.\n"
-#~ msgstr ""
-#~ "<big>Esitusnimekirja pole võimalik salvestada.</big>\n"
-#~ "\n"
-#~ "Tundmatu failitüüp failile '%s'.\n"
-
-#~ msgid "Presets"
-#~ msgstr "Valmisseadistused"
-
-#~ msgid "Mouse"
-#~ msgstr "Hiir"
-
-#~ msgid "Pause between songs"
-#~ msgstr "Lugude vahel peetakse pausi"
-
-#~ msgid "Pause for"
-#~ msgstr "Pausi kestus on"
-
-#~ msgid "seconds"
-#~ msgstr "sekundit"
-
-#~ msgid "Filename"
-#~ msgstr "Failinimi"
-
-#~ msgid "Convert underscores to blanks"
-#~ msgstr "Alakriipsud teisendatakse tühikuteks"
-
-#~ msgid "Convert %20 to blanks"
-#~ msgstr "%20-stringid teisendatakse tühikuteks"
-
-#~ msgid "Convert backslash '\\' to forward slash '/'"
-#~ msgstr "Kurakaldkriipsud '\\' teisendatkse kaldkriipsudeks '/'"
-
-#~ msgid "File Dialog"
-#~ msgstr "Failidialoog"
-
-#~ msgid "Always refresh directory when opening file dialog"
-#~ msgstr "Kataloogi värskendatakse faili avamisel alati"
-
-#~ msgid ""
-#~ "Always refresh the file dialog (this will slow opening the dialog on "
-#~ "large directories, and Gnome VFS should handle automatically)."
-#~ msgstr ""
-#~ "Failidialoogi katalooge värskendatakse alati (see aeglustab failide "
-#~ "avamist suurtest kataloogidest. Gnome VFS peaks seda automaatselt "
-#~ "käsitlema)."
-
-#~ msgid "Changes volume by"
-#~ msgstr "Muudab helivaljust"
-
-#~ msgid "percent"
-#~ msgstr "protsendi võrra"
-
-#~ msgid "Scrolls playlist by"
-#~ msgstr "Kerib esitusnimekirja"
-
-#~ msgid "lines"
-#~ msgstr "rea võrra"
-
-#~ msgid "Stop after Current Song"
-#~ msgstr "Seiska pärast praegust lugu"
-
-#~ msgid "Peaks"
-#~ msgstr "Kõrgeimad tasemed"
-
-#~ msgid "Repeat"
-#~ msgstr "Kordus"
-
-#~ msgid "Shuffle"
-#~ msgstr "Segatud"
-
-#~ msgid "No Playlist Advance"
-#~ msgstr "Esitusnimekirjas ei minda järgmise loo peale"
-
-#~ msgid "Play"
-#~ msgstr "Esita"
-
-#~ msgid "Pause"
-#~ msgstr "Pausi"
-
-#~ msgid "Stop"
-#~ msgstr "Seiska"
-
-#~ msgid "Previous"
-#~ msgstr "Eelmine"
-
-#~ msgid "Next"
-#~ msgstr "Järgmine"
-
-#~ msgid "Visualization Mode"
-#~ msgstr "Visualiseerimisrežiim"
-
-#~ msgid "Analyzer Mode"
-#~ msgstr "Analüsaatori režiim"
-
-#~ msgid "Scope Mode"
-#~ msgstr "Ostsilloskoobi graafik"
-
-#~ msgid "Voiceprint Mode"
-#~ msgstr "Spektrogrammi režiim"
-
-#~ msgid "WindowShade VU Mode"
-#~ msgstr "Kokkukeritud akna visualiseerimisrežiim"
-
-#~ msgid "Refresh Rate"
-#~ msgstr "Värskendussagedus"
-
-#~ msgid "Analyzer Falloff"
-#~ msgstr "Analüsaatori kukkumine"
-
-#~ msgid "Peaks Falloff"
-#~ msgstr "Kõrgeimate tasemete kukkumine"
-
-#~ msgid "New Playlist"
-#~ msgstr "Uus esitusnimekiri"
-
-#~ msgid "Select Next Playlist"
-#~ msgstr "Vali järgmine esitusnimekiri"
-
-#~ msgid "Select Previous Playlist"
-#~ msgstr "Vali eelmine esitusnimekiri"
-
-#~ msgid "Delete Playlist"
-#~ msgstr "Kustuta esitusnimekiri"
-
-#~ msgid "Load List"
-#~ msgstr "Laadi nimekiri"
-
-#~ msgid "Loads a playlist file into the selected playlist."
-#~ msgstr "Esitusnimekirja faili laadimine valitud esitusnimekirja."
-
-#~ msgid "Save List"
-#~ msgstr "Salvesta nimekiri"
-
-#~ msgid "Saves the selected playlist."
-#~ msgstr "Valitud esitusnimekirja salvestamine"
-
-#~ msgid "Save Default List"
-#~ msgstr "Salvesta vaikimisi nimekiri"
-
-#~ msgid "Saves the selected playlist to the default location."
-#~ msgstr "Valitud esitusnimekirja salvestamine vaikimisi asukohta."
-
-#~ msgid "Refresh List"
-#~ msgstr "Värskenda nimekirja"
-
-#~ msgid "Refreshes metadata associated with a playlist entry."
-#~ msgstr "Esitusnimekirja kirjega seotud metaandmete värskendamine."
-
-#~ msgid "List Manager"
-#~ msgstr "Nimekirjahaldur"
-
-#~ msgid "Opens the playlist manager."
-#~ msgstr "Esitusnimekirja halduri avamine."
-
-#~ msgid "View"
-#~ msgstr "Vaade"
-
-#~ msgid "Add Internet Address..."
-#~ msgstr "Lisa internetiaadress..."
-
-#~ msgid "Adds a remote track to the playlist."
-#~ msgstr "Võrgus asuvate lugude lisamine esitusnimekirja."
-
-#~ msgid "Add Files..."
-#~ msgstr "Lisa faile..."
-
-#~ msgid "Search and Select"
-#~ msgstr "Otsi ja vali"
-
-#~ msgid ""
-#~ "Searches the playlist and selects playlist entries based on specific "
-#~ "criteria."
-#~ msgstr "Esitusnimekirjast otsimine ja otsingutulemuse määramine valikuks."
-
-#~ msgid "Invert Selection"
-#~ msgstr "Pööra valik"
-
-#~ msgid "Inverts the selected and unselected entries."
-#~ msgstr "Valitud ja valimata kirjete oleku vastupidiseks pööramine"
-
-#~ msgid "Select All"
-#~ msgstr "Vali kõik"
-
-#~ msgid "Selects all of the playlist entries."
-#~ msgstr "Kõikide esitusnimekirja kirjete avamine."
-
-#~ msgid "Select None"
-#~ msgstr "Tühista valik"
-
-#~ msgid "Deselects all of the playlist entries."
-#~ msgstr "Kõigi valitud kirjete eemaldamine valikust"
-
-#~ msgid "Remove All"
-#~ msgstr "Eemalda kõik"
-
-#~ msgid "Removes all entries from the playlist."
-#~ msgstr "Kõigi kirjete eemaldamine esitusnimekirjast."
-
-#~ msgid "Clear Queue"
-#~ msgstr "Puhasta järjekord"
-
-#~ msgid "Clears the queue associated with this playlist."
-#~ msgstr "Esitusnimekirjaga seotud järjekorra tühjendamine."
-
-#~ msgid "Remove Unavailable Files"
-#~ msgstr "Eemalda kättesaamatud failid"
-
-#~ msgid "Removes unavailable files from the playlist."
-#~ msgstr ""
-#~ "Esitusnimekirjast selliste failide eemaldamine, millele pole võimalik "
-#~ "ligi pääseda."
-
-#~ msgid "Remove Duplicates"
-#~ msgstr "Eemalda duplikaadid"
-
-#~ msgid "By Title"
-#~ msgstr "Pealkirja järgi"
-
-#~ msgid "Removes duplicate entries from the playlist by title."
-#~ msgstr ""
-#~ "Esitusnimekirjast selliste lugude eemaldamine, mis esinevad seal mitu "
-#~ "korda (vaadatakse pealkirja järgi)."
-
-#~ msgid "By Filename"
-#~ msgstr "Failinime järgi"
-
-#~ msgid "Removes duplicate entries from the playlist by filename."
-#~ msgstr ""
-#~ "Mitu korda esinevate lugude eemaldamine esitusnimekirjast (otsus tehakse "
-#~ "failinime alusel)."
-
-#~ msgid "By Path + Filename"
-#~ msgstr "Raja ja failinime järgi"
-
-#~ msgid "Removes duplicate entries from the playlist by their full path."
-#~ msgstr ""
-#~ "Mitu korda esinevate lugude eemaldamine esitusnimekirjast (otsus tehakse "
-#~ "faili täisraja ja nime alusel)."
-
-#~ msgid "Remove Unselected"
-#~ msgstr "Eemalda valimata loo(d)"
-
-#~ msgid "Remove unselected entries from the playlist."
-#~ msgstr "Valimata kirje(te) eemaldamine esitusnimekirjast."
-
-#~ msgid "Remove Selected"
-#~ msgstr "Eemalda valitud loo(d)"
-
-#~ msgid "Remove selected entries from the playlist."
-#~ msgstr "Valitud kirje(te) eemaldamine esitusnimekirjast."
-
-#~ msgid "Randomize List"
-#~ msgstr "Nimekiri juhuslikuks"
-
-#~ msgid "Randomizes the playlist."
-#~ msgstr "Esitusnimekirja järjekorra sortimine juhusliku järjekorra alusel."
-
-#~ msgid "Reverse List"
-#~ msgstr "Nimekiri vastupidisesse järjekorda"
-
-#~ msgid "Reverses the playlist."
-#~ msgstr "Esitusnimekirja sortimine vastupidise järjekorra alusel."
-
-#~ msgid "Sort List"
-#~ msgstr "Sordi nimekiri"
-
-#~ msgid "Sorts the list by title."
-#~ msgstr "Nimekirja sortimine pealkirja järgi."
-
-#, fuzzy
-#~ msgid "By Album"
-#~ msgstr "Album"
-
-#, fuzzy
-#~ msgid "Sorts the list by album."
-#~ msgstr "Nimekirja sortimine pealkirja järgi."
-
-#~ msgid "By Artist"
-#~ msgstr "Esitaja järgi"
-
-#~ msgid "Sorts the list by artist."
-#~ msgstr "Nimekirja sortimine esitaja järgi."
-
-#~ msgid "Sorts the list by filename."
-#~ msgstr "Nimekirja sortimine failinime järgi."
-
-#~ msgid "Sorts the list by full pathname."
-#~ msgstr "Nimekirja sortimine täieliku rajanime järgi."
-
-#~ msgid "By Date"
-#~ msgstr "Kuupäeva järgi"
-
-#~ msgid "Sorts the list by modification time."
-#~ msgstr "Nimekirja sortimine muutmise kuupäeva järgi."
-
-#~ msgid "By Track Number"
-#~ msgstr "Loo numbri järgi"
-
-#~ msgid "Sorts the list by track number."
-#~ msgstr "Nimekirja sortimine loo numbri järgi."
-
-#~ msgid "By Playlist Entry"
-#~ msgstr "Esitusnimekirja kirje järgi"
-
-#~ msgid "Sorts the list by playlist entry."
-#~ msgstr "Nimekirja sortimine esitusnimekirja kirje järgi."
-
-#~ msgid "Sort Selected"
-#~ msgstr "Sordi valitud kirjed"
-
-#~ msgid "File"
-#~ msgstr "Fail"
-
-#~ msgid "Help"
-#~ msgstr "Abi"
-
-#, fuzzy
-#~ msgid "Components"
-#~ msgstr "Kommentaar"
-
-#~ msgid "View Track Details"
-#~ msgstr "Vaata loo üksikasju"
-
-#~ msgid "Play File"
-#~ msgstr "Esita faili"
-
-#~ msgid "Load and play a file"
-#~ msgstr "Faili laadimine ja esitamine"
-
-#~ msgid "Play Location"
-#~ msgstr "Esita asukohast"
-
-#~ msgid "Play media from the selected location"
-#~ msgstr "Meedia esitamine määratud asukohast"
-
-#~ msgid "Plugin services"
-#~ msgstr "Pluginate teenused"
-
-#~ msgid "Preferences"
-#~ msgstr "Eelistused"
-
-#~ msgid "Open preferences window"
-#~ msgstr "Eelistuste akna avamine"
-
-#~ msgid "_Quit"
-#~ msgstr "Vä_lju"
-
-#~ msgid "Quit Audacious"
-#~ msgstr "Audacious'e töö lõpetamine"
-
-#~ msgid "Set A-B"
-#~ msgstr "Määra A-B"
-
-#~ msgid "Clear A-B"
-#~ msgstr "Nulli A-B"
-
-#~ msgid "Jump to Playlist Start"
-#~ msgstr "Hüppa esitusnimekirja algusesse"
-
-#~ msgid "Jump to File"
-#~ msgstr "Hüppa failile..."
-
-#~ msgid "Queue Toggle"
-#~ msgstr "Lisa järjekorda/Eemalda järjekorrast"
-
-#~ msgid "Enables/disables the entry in the playlist's queue."
-#~ msgstr ""
-#~ "Esitusnimekirja kirje järjekorda panek või kui see on juba järjekorras, "
-#~ "siis sealt eemaldamine."
-
-#~ msgid "Load"
-#~ msgstr "Laadi"
-
-#~ msgid "Import"
-#~ msgstr "Impordi"
-
-#~ msgid "Save"
-#~ msgstr "Salvesta"
-
-#~ msgid "Delete"
-#~ msgstr "Kustuta"
-
-#~ msgid "Preset"
-#~ msgstr "Valmisseadistus"
-
-#~ msgid "Load preset"
-#~ msgstr "Valmisseadistuse laadimine"
-
-#~ msgid "Auto-load preset"
-#~ msgstr "Automaatlaaditav valmisseadistus"
-
-#~ msgid "Load auto-load preset"
-#~ msgstr "Automaatlaaditava valmisseadistuse laadimine"
-
-#~ msgid "Default"
-#~ msgstr "Vaikimisi"
-
-#~ msgid "Load default preset into equalizer"
-#~ msgstr "Valikimisi valmisseadistuste laadimine ekvalaiserisse"
-
-#~ msgid "Zero"
-#~ msgstr "Nulli"
-
-#~ msgid "Set equalizer preset levels to zero"
-#~ msgstr "Ekvalaiseri seadistustasemete nullimine"
-
-#~ msgid "From file"
-#~ msgstr "Failist"
-
-#~ msgid "Load preset from file"
-#~ msgstr "Valmisseadistuste laadimine failist"
-
-#~ msgid "From WinAMP EQF file"
-#~ msgstr "WinAMP-i EQF-failist"
-
-#~ msgid "Load preset from WinAMP EQF file"
-#~ msgstr "Valmisseadistuse laadimine WinAMP'i EQF-failist"
-
-#~ msgid "WinAMP Presets"
-#~ msgstr "WinAMP'i valmisseadistused"
-
-#~ msgid "Import WinAMP presets"
-#~ msgstr "WinAMP'i valmisseadistuste importimine"
-
-#~ msgid "Save preset"
-#~ msgstr "Valmisseadistuse salvestamine"
-
-#~ msgid "Save auto-load preset"
-#~ msgstr "Automaatlaaditava valmisseadistuse salvestamine"
-
-#~ msgid "Save default preset"
-#~ msgstr "Vaikimisi valmisseadistuste salvestamine"
-
-#~ msgid "To file"
-#~ msgstr "Faili"
-
-#~ msgid "Save preset to file"
-#~ msgstr "Valmisseadistuse salvestamine faili"
-
-#~ msgid "To WinAMP EQF file"
-#~ msgstr "WinAMP'i EQF-faili"
-
-#~ msgid "Save preset to WinAMP EQF file"
-#~ msgstr "Valmisseadistuse salvestamine WinAMP'i EQF-faili"
-
-#~ msgid "Delete preset"
-#~ msgstr "Valmisseadistuste kustutamine"
-
-#~ msgid "Delete auto-load preset"
-#~ msgstr "Automaatlaaditava valmisseadistuse kustutamine"
-
-#~ msgid ""
-#~ "This is the amount of time to prebuffer audio "
-#~ "streams by, in milliseconds.\n"
-#~ "Increase this value if you are experiencing audio skipping.\n"
-#~ "Please note however, that high values will result in Audacious performing "
-#~ "poorly."
-#~ msgstr ""
-#~ "Sellega määratakse audiovoogude eelpuhvri suurus "
-#~ "millisekundites.\n"
-#~ "Kui sul esineb heli katkemist, siis peaksid sa ilmselt seda väärtust "
-#~ "suurendama.\n"
-#~ "Tasub ka tähele panna, et suuremad väärtused mõjuvab Audacious'e "
-#~ "jõudlusele halvasti."
-
-#~ msgid "Enable headless operation"
-#~ msgstr "Akendeta töötamise lubamine"
-
-#~ msgid ""
-#~ "<big>Unable to load skin.</big>\n"
-#~ "\n"
-#~ "Check that skin at '%s' is usable and default skin is properly installed "
-#~ "at '%s'\n"
-#~ msgstr ""
-#~ "<big>Rüüd pole võimalik laadida.</big>\n"
-#~ "\n"
-#~ "Kontrolli, et asukohas '%s' olev rüü on kasutatav ja et vaikimisi rüü on "
-#~ "paigaldatud asukohta '%s'\n"
-
-#, fuzzy
-#~ msgid "Headless operation enabled\n"
-#~ msgstr "Akendeta töötamise lubamine"
-
-#~ msgid "Audacious core developers:"
-#~ msgstr "Audaciouse tuumikarendajad:"
-
-#~ msgid "Audacious Equalizer"
-#~ msgstr "Audacious'e ekvalaiser"
-
-#~ msgid "Play files"
-#~ msgstr "Failide esitamine"
-
-#~ msgid "Load files"
-#~ msgstr "Failide laadimine"
-
-#~ msgid "%s - Audacious"
-#~ msgstr "%s - Audacious"
-
-#~ msgid "VBR"
-#~ msgstr "VBR"
-
-#~ msgid "mono"
-#~ msgstr "mono"
-
-#~ msgid "Audacious - visibility warning"
-#~ msgstr "Audacious - nähtavaloleku hoiatus"
-
-#~ msgid "Show main player window"
-#~ msgstr "Esitaja peaakna näitamine"
-
-#~ msgid "Ignore"
-#~ msgstr "Eira"
-
-#~ msgid ""
-#~ "Audacious has been started with all of its windows hidden.\n"
-#~ "You may want to show the player window again to control Audacious; "
-#~ "otherwise, you'll have to control it remotely via audtool or enabled "
-#~ "plugins (such as the statusicon plugin)."
-#~ msgstr ""
-#~ "Audacious on käivitatud nii, et kõik programmi aknad on peidus.\n"
-#~ "Võib-olla tahad sa aknaid jälle nähtavale tuua, et esitamist juhtida, "
-#~ "vastasel juhul pead sa juhtima kaugjuhtimisvahendiga \"audtool\" või "
-#~ "lubatud pluginate abil (näiteks olekuikooni plugin)."
-
-#~ msgid "Always ignore, show/hide is controlled remotely"
-#~ msgstr ""
-#~ "Seda eiratakse alati, näitamist ja peitmist juhitakse kaugvahenditega"
-
-#~ msgid "Seek to: %d:%-2.2d/%d:%-2.2d (%d%%)"
-#~ msgstr "Asukohale: %d:%-2.2d/%d:%-2.2d (%d%%)"
-
-#~ msgid "Volume: %d%%"
-#~ msgstr "Valjus: %d%%"
-
-#~ msgid "Balance: %d%% left"
-#~ msgstr "Tasakaal: %d%% vasakul"
-
-#~ msgid "Balance: center"
-#~ msgstr "Tasakaal: keskel"
-
-#~ msgid "Balance: %d%% right"
-#~ msgstr "Tasakaal: %d%% paremal"
-
-#~ msgid "Options Menu"
-#~ msgstr "Valikute menüü"
-
-#~ msgid "Disable 'Always On Top'"
-#~ msgstr "Keela 'alati pealmine'"
-
-#~ msgid "Enable 'Always On Top'"
-#~ msgstr "Luba 'alati pealmine'"
-
-#~ msgid "File Info Box"
-#~ msgstr "Faili andmete aken"
-
-#~ msgid "Visualization Menu"
-#~ msgstr "Visualiseerimismenüü"
-
-#~ msgid ""
-#~ "<big>Couldn't open audio.</big>\n"
-#~ "\n"
-#~ "Please check that:\n"
-#~ "1. You have the correct output plugin selected.\n"
-#~ "2. No other programs is blocking the soundcard.\n"
-#~ "3. Your soundcard is configured properly.\n"
-#~ msgstr ""
-#~ "<big>Audiot pole võimalik avada.</big>\n"
-#~ "\n"
-#~ "Palun veendu, et:\n"
-#~ "1. Sul on valitud toimiv väljundplugin.\n"
-#~ "2. Ükski teine programm ei hoia helikaarti kinni.\n"
-#~ "3. Sinu helikaart on korrektselt seadistatud.\n"
-
-#~ msgid "Autoscroll Songname"
-#~ msgstr "Loo nime automaatkerimine"
-
-#~ msgid "Show Player"
-#~ msgstr "Näita peaakent"
-
-#~ msgid "Show Playlist Editor"
-#~ msgstr "Näita esitusnimekirja redaktorit"
-
-#~ msgid "Show Equalizer"
-#~ msgstr "Näita ekvalaiserit"
-
-#~ msgid "Always on Top"
-#~ msgstr "Alati pealmine"
-
-#~ msgid "Put on All Workspaces"
-#~ msgstr "Nähtav kõigil tööaladel"
-
-#~ msgid "Roll up Player"
-#~ msgstr "Keri peaaken kokku"
-
-#~ msgid "Roll up Playlist Editor"
-#~ msgstr "Keri esitusnimekirja redaktor kokku"
-
-#~ msgid "Roll up Equalizer"
-#~ msgstr "Keri ekvalaiser kokku"
-
-#, fuzzy
-#~ msgid "Scale"
-#~ msgstr "Salvesta"
-
-#~ msgid "DoubleSize"
-#~ msgstr "Topeltsuurus"
-
-#~ msgid "Easy Move"
-#~ msgstr "Lihtne liigutamine"
-
-#~ msgid "Analyzer"
-#~ msgstr "Analüsaator"
-
-#~ msgid "Scope"
-#~ msgstr "Ostsilloskoop"
-
-#~ msgid "Voiceprint"
-#~ msgstr "Spektrogramm"
-
-#~ msgid "Off"
-#~ msgstr "Väljas"
-
-#~ msgid "Normal"
-#~ msgstr "Tavaline"
-
-#~ msgid "Fire"
-#~ msgstr "Tuli"
-
-#~ msgid "Vertical Lines"
-#~ msgstr "Püstjooned"
-
-#~ msgid "Lines"
-#~ msgstr "Jooned"
-
-#~ msgid "Bars"
-#~ msgstr "Tulbad"
-
-#~ msgid "Dot Scope"
-#~ msgstr "Punktidena"
-
-#~ msgid "Line Scope"
-#~ msgstr "Joonena"
-
-#~ msgid "Solid Scope"
-#~ msgstr "Alana"
-
-#~ msgid "Ice"
-#~ msgstr "Jää"
-
-#~ msgid "Smooth"
-#~ msgstr "Pehme"
-
-#~ msgid "Full (~50 fps)"
-#~ msgstr "Täielik (~50 kaadrit sekundis)"
-
-#~ msgid "Half (~25 fps)"
-#~ msgstr "Pool (~25 kaadrit sekundis)"
-
-#~ msgid "Quarter (~13 fps)"
-#~ msgstr "Veerand (~13 kaadrit sekundis)"
-
-#~ msgid "Eighth (~6 fps)"
-#~ msgstr "Kaheksandik (~6 kaadrit sekundis)"
-
-#~ msgid "Slowest"
-#~ msgstr "Aeglaseim"
-
-#~ msgid "Slow"
-#~ msgstr "Aeglane"
-
-#~ msgid "Medium"
-#~ msgstr "Keskmine"
-
-#~ msgid "Fast"
-#~ msgstr "Kiire"
-
-#~ msgid "Fastest"
-#~ msgstr "Kiireim"
-
-#~ msgid "Time Elapsed"
-#~ msgstr "Aega kulunud"
-
-#~ msgid "Time Remaining"
-#~ msgstr "Aega jäänud"
-
-#~ msgid "Plugin Services"
-#~ msgstr "Pluginate teenused"
-
-#~ msgid "Search entries in active playlist"
-#~ msgstr "Kirjete otsimine aktiivsest esitusnimekirjast"
-
-#~ 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 ""
-#~ "Esitusnimekirjas olevatest kirjete hulgast otsimiseks tuleb allpool "
-#~ "olevatele väljadele sisestada otsinguavaldised. Otsinguavaldised on "
-#~ "regulaaravaldise süntaksiga tõstutundetud otsingustringid. Kui sa ei tea, "
-#~ "mismoodi regulaaravaldised toimivad, siis sisesta selle asemel lihtsalt "
-#~ "tavalised otsimisstringid."
-
-#~ msgid "Title: "
-#~ msgstr "Pealkiri: "
-
-#~ msgid "Artist: "
-#~ msgstr "Esitaja: "
-
-#~ msgid "Filename: "
-#~ msgstr "Failinimi: "
-
-#~ msgid "Clear previous selection before searching"
-#~ msgstr "Enne otsingut puhastatakse eelmine valik"
-
-#~ msgid "Automatically toggle queue for matching entries"
-#~ msgstr "Vastavuses olevad kirjed pannakse esitusjärjekorda"
-
-#~ msgid "Audacious Playlist Editor"
-#~ msgstr "Audacious'e esitusnimekirja redaktor"
-
-#~ msgid "Appearance"
-#~ msgstr "Välimus"
-
-#~ msgid "_Fonts"
-#~ msgstr "_Kirjatüübid"
-
-#~ msgid "_Player:"
-#~ msgstr "_Esitaja:"
-
-#~ msgid "Select main player window font:"
-#~ msgstr "Esitaja peaakna kirjatüübi valimine:"
-
-#~ msgid "_Playlist:"
-#~ msgstr "Esitus_nimekiri:"
-
-#~ msgid "Select playlist font:"
-#~ msgstr "Esitusnimekirja kirjatüübi valimine:"
-
-#~ msgid "Use Bitmap fonts if available"
-#~ msgstr "Võimalusel kasutatakse rasterfonti"
-
-#~ msgid ""
-#~ "Use bitmap fonts if they are available. Bitmap fonts do not support "
-#~ "Unicode strings."
-#~ msgstr ""
-#~ "Kui mõni rasterfont on saadaval, siis kasutatakse seda. Rasterfondid ei "
-#~ "toeta Unicode stringe."
-
-#~ msgid "_Miscellaneous"
-#~ msgstr "_Muu"
-
-#~ msgid "Show track numbers in playlist"
-#~ msgstr "Esitusnimekirjas näidatakse lugude numbreid"
-
-#~ msgid "Show separators in playlist"
-#~ msgstr "Esitusnimekirjas näidatakse eraldajaid"
-
-#~ msgid "Show window manager decoration"
-#~ msgstr "Aknahalduri dekoratsioonid on nähtaval"
-
-#~ msgid "This enables the window manager to show decorations for windows."
-#~ msgstr "Sellega lubatakse akendel näidata aknahalduri dekoratsioone."
-
-#~ msgid "Use XMMS-style file selector instead of the default selector"
-#~ msgstr "XMMS-i moodi failivalija kasutamine vaikimisi valija asemel"
-
-#~ msgid ""
-#~ "This enables the XMMS/GTK1-style file selection dialogs. This selector is "
-#~ "provided by Audacious itself and is faster than the default GTK2 selector "
-#~ "(but sadly not as user-friendly)."
-#~ msgstr ""
-#~ "Selle võtmega lubatakse XMMS/GTK1-laadis failivalimisdialoogis. See "
-#~ "valija on Audacious'ega kaasas ja see on kiirem kui GTK2-valija (kuid "
-#~ "kahjuks pole see samavõrd kasutajasõbralik)."
-
-#~ msgid "Use two-way text scroller"
-#~ msgstr "Kasutatakse kahesuunalist tekstikerimist"
-
-#~ msgid ""
-#~ "If selected, the file information text in the main window will scroll "
-#~ "back and forth. If not selected, the text will only scroll in one "
-#~ "direction."
-#~ msgstr ""
-#~ "Kui märgitud, siis peaaknas olevat faili andmete teksti keritakse edasi "
-#~ "ja tagasi. Kui valimata, siis keritakse teksti ainult ühes suunas."
-
-#~ msgid "On load"
-#~ msgstr "Laadimisel"
-
-#~ msgid "Load metadata when adding the file to the playlist or opening it"
-#~ msgstr ""
-#~ "Metaandmed loetakse faili avamisel või faili lisamisel esitusnimekirja"
-
-#~ msgid "On display"
-#~ msgstr "Kuvamisel"
-
-#, fuzzy
-#~ msgid ""
-#~ "Load metadata on demand when displaying the file in the playlist. You may "
-#~ "need to set \"Detect file formats on demand\" in Audio page for full "
-#~ "benefit."
-#~ msgstr "Metaandmed loetakse siis, kui on vaja faili esitusnimekirjas kuvada"
-
-#~ msgid "Color Adjustment"
-#~ msgstr "Värvuste kohandamine"
-
-#~ msgid ""
-#~ "Audacious allows you to alter the color balance of the skinned UI. The "
-#~ "sliders below will allow you to do this."
-#~ msgstr ""
-#~ "Audacious võimaldada rüütatud kasutajaliidese värvitasakaalu muuta. Seda "
-#~ "saab teha allpool olevate liugurite abil."
-
-#~ msgid "Blue"
-#~ msgstr "Sinine"
-
-#~ msgid "Green"
-#~ msgstr "Roheline"
-
-#~ msgid "Red"
-#~ msgstr "Punane"
-
-#~ msgid "_Skin"
-#~ msgstr "_Rüü"
-
-#~ msgid "Refresh skin list"
-#~ msgstr "Rüüde nimekirja värskendamine"
-
-#~ msgid "PREAMP"
-#~ msgstr "EELVÕIM"
-
-#~ msgid "60HZ"
-#~ msgstr "60HZ"
-
-#~ msgid "170HZ"
-#~ msgstr "170HZ"
-
-#~ msgid "310HZ"
-#~ msgstr "310HZ"
-
-#~ msgid "600HZ"
-#~ msgstr "600HZ"
-
-#~ msgid "1KHZ"
-#~ msgstr "1KHZ"
-
-#~ msgid "3KHZ"
-#~ msgstr "3KHZ"
-
-#~ msgid "6KHZ"
-#~ msgstr "6KHZ"
-
-#~ msgid "12KHZ"
-#~ msgstr "12KHZ"
-
-#~ msgid "14KHZ"
-#~ msgstr "14KHZ"
-
-#~ msgid "16KHZ"
-#~ msgstr "16KHZ"
-
-#~ msgid "Archived Winamp 2.x skin"
-#~ msgstr "Arhiveeritud Winamp 2.x rüü"
-
-#~ msgid "Unarchived Winamp 2.x skin"
-#~ msgstr "Arhiveerimata Winamp 2.x rüü"
-
-#~ msgid "Show version and builtin features"
-#~ msgstr "Versiooni ja sisseehitatud võimaluste näitamine"
-
-#~ msgid "Use custom cursors"
-#~ msgstr "Kasutatakse kohandatud kursoreid"
-
-#~ msgid "Reload Plugins"
-#~ msgstr "Laadi pluginad uuesti"
-
-#~ msgid ""
-#~ "Sorry, threads isn't supported on your platform.\n"
-#~ "\n"
-#~ "If you're on a libc5 based linux system and installed Glib & GTK+ before "
-#~ "you\n"
-#~ "installed LinuxThreads you need to recompile Glib & GTK+.\n"
-#~ msgstr ""
-#~ "Vabandust, Sinu platvormil pole lõimed toetatud.\n"
-#~ "\n"
-#~ "Kui sa kasutad libc5'l põhinevat linuxisüsteemi ja sa oled teegid Glib "
-#~ "ja\n"
-#~ "GTK+ paigaldanud enne LinuxThreads'i paigaldamist, siis pead sa need "
-#~ "teegid\n"
-#~ "uuesti kompileerima.\n"
-
-#~ msgid "Error in Audacious."
-#~ msgstr "Viga Audacious'es."
-
-#~ msgid "Select which Audacious session ID to use"
-#~ msgstr "Kasutatava Audacious'e seansi-ID valimine"
-
-#~ msgid "Disable 'Doublesize'"
-#~ msgstr "Keela 'topeltsuurus'"
-
-#~ msgid "Enable 'Doublesize'"
-#~ msgstr "Luba 'topeltsuurus'"
-
-#~ msgid "Presets"
-#~ msgstr "Valmisseadistused"
-
-#~ msgid "File preset extension:"
-#~ msgstr "Valmisseadistuste faili laiend:"
-
-#~ msgid "Directory preset file:"
-#~ msgstr "Valmisseadistuste kataloogfail:"
-
-#~ msgid ""
-#~ "<big>Unable to create %s.</big>\n"
-#~ "\n"
-#~ "Could not open glade file (%s). Please check your installation.\n"
-#~ msgstr ""
-#~ "<big>Komponenti %s pole võimalik luua.</big>\n"
-#~ "\n"
-#~ "Glade faili (%s) pole võimalik avada. Palun kontrolli programmi "
-#~ "paigalduse korrektsust.\n"
-
-#~ msgid ""
-#~ "TITLE\n"
-#~ "ARTIST - TITLE\n"
-#~ "ARTIST - ALBUM - TITLE\n"
-#~ "ARTIST - ALBUM - TRACK. TITLE\n"
-#~ "ARTIST [ ALBUM ] - TRACK. TITLE\n"
-#~ "ALBUM - TITLE\n"
-#~ "Custom"
-#~ msgstr ""
-#~ "PEALKIRI\n"
-#~ "ESITAJA - PEALKIRI\n"
-#~ "ESITAJA - ALBUM - PEALKIRI\n"
-#~ "ESITAJA - ALBUM - PALA. PEALKIRI\n"
-#~ "ESITAJA [ ALBUM ] - PALA. PEALKIRI\n"
-#~ "ALBUM - PEALKIRI\n"
-#~ "Kohandatud"
-
-#~ msgid ""
-#~ "Best Sinc Interpolation\n"
-#~ "Medium Sinc Interpolation\n"
-#~ "Fastest Sinc Interpolation\n"
-#~ "ZOH Interpolation\n"
-#~ "Linear Interpolation"
-#~ msgstr ""
-#~ "Parim sinc-interpolatsioon\n"
-#~ "Keskmine sinc-interpolatsioon\n"
-#~ "Kiireim sinc-interpolatsioon\n"
-#~ "ZOH-interpolatsioon\n"
-#~ "Lineaarinterpolatsioon"
-
-#~ msgid "Track Information Window"
-#~ msgstr "Loo andmete aken"
-
-#~ msgid "localhost"
-#~ msgstr "localhost"
-
-#~ msgid "Preferences Window"
-#~ msgstr "Eelistuste aken"
+msgstr "Seansihalduse valikute näitamine"

audacious-3.1.1.tar.bz2/po/eu.po -> audacious-3.2.4.tar.bz2/po/eu.po Changed

@@ -1,1203 +1,1158 @@
-# translation of audacious_2.0_eu.po to Basque
-# translation of audacious_2.0_eu.po to
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# Basque translation for Audacious
+# Copyright (C) Audacious translators
+# This file is distributed under the same license as the Audacious package.
 #
+# Translators:
+# <ibonatan@gmail.com>, 2012.
 # Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>, 2008, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: audacious_2.0_eu\n"
-"Report-Msgid-Bugs-To: http://jira.atheme.org/\n"
-"POT-Creation-Date: 2011-07-05 22:45+0200\n"
-"PO-Revision-Date: 2009-04-02 22:22+0200\n"
-"Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>\n"
-"Language-Team: Basque <itzulpena@euskalgnu.org>\n"
-"Language: eu\n"
+"Project-Id-Version: Audacious\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2012-01-11 08:54-0500\n"
+"PO-Revision-Date: 2012-03-22 18:04+0000\n"
+"Last-Translator: obibon <ibonatan@gmail.com>\n"
+"Language-Team: Basque\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/audacious/adder.c:71
+#: src/audacious/adder.c:77
 msgid "Searching ..."
-msgstr ""
+msgstr "Bilatzen"
 
-#: src/audacious/adder.c:99
+#: src/audacious/adder.c:113
 #, c-format
 msgid "%d file found"
 msgid_plural "%d files found"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d fitxategia ez da aurkitu"
+msgstr[1] "%d fitxategiak ez dira aurkitu"
 
-#: src/audacious/chardet.c:37
+#: src/audacious/chardet.c:39
 msgid " (invalid UTF-8)"
 msgstr " (UTF-8 baliogabea)"
 
-#: src/audacious/credits.c:35
-#, fuzzy
+#: src/audacious/credits.c:37
 msgid "Core developers:"
-msgstr "0.1.x garatzaileak:"
+msgstr ""
 
-#: src/audacious/credits.c:49
+#: src/audacious/credits.c:51
 msgid "Graphics:"
 msgstr "Grafikoak:"
 
-#: src/audacious/credits.c:54
+#: src/audacious/credits.c:56
 msgid "Default skin:"
 msgstr "Azal lehenetsia:"
 
-#: src/audacious/credits.c:60
+#: src/audacious/credits.c:62
 msgid "Plugin development:"
 msgstr "Pluginen garaketa:"
 
-#: src/audacious/credits.c:83
+#: src/audacious/credits.c:85
 msgid "Patch authors:"
 msgstr "Adabakien egileak:"
 
-#: src/audacious/credits.c:126
-#, fuzzy
+#: src/audacious/credits.c:131
 msgid "1.x developers:"
-msgstr "0.1.x garatzaileak:"
+msgstr ""
 
-#: src/audacious/credits.c:148
+#: src/audacious/credits.c:153
 msgid "BMP Developers:"
 msgstr "MBP garatzaileak:"
 
-#: src/audacious/credits.c:180
-#, fuzzy
+#: src/audacious/credits.c:185
 msgid "Belarusian:"
-msgstr "Bulgariera:"
+msgstr "Biolorrusiera"
 
-#: src/audacious/credits.c:183
+#: src/audacious/credits.c:188
 msgid "Basque:"
-msgstr ""
+msgstr "Euskara"
 
-#: src/audacious/credits.c:186
+#: src/audacious/credits.c:191
 msgid "Brazilian Portuguese:"
 msgstr "Brasilgo portugesa:"
 
-#: src/audacious/credits.c:190
+#: src/audacious/credits.c:196
 msgid "Breton:"
 msgstr "Bretoiera:"
 
-#: src/audacious/credits.c:193
+#: src/audacious/credits.c:199
 msgid "Bulgarian:"
 msgstr "Bulgariera:"
 
-#: src/audacious/credits.c:196
+#: src/audacious/credits.c:202
 msgid "Catalan:"
 msgstr "Katalana:"
 
-#: src/audacious/credits.c:199
-#, fuzzy
+#: src/audacious/credits.c:206
 msgid "Chinese:"
-msgstr "Txinatarra"
+msgstr "Txinera"
 
-#: src/audacious/credits.c:202
+#: src/audacious/credits.c:209
 msgid "Croatian:"
 msgstr "Kroaziera:"
 
-#: src/audacious/credits.c:205
+#: src/audacious/credits.c:212
 msgid "Czech:"
 msgstr "Txekiera:"
 
-#: src/audacious/credits.c:208
+#: src/audacious/credits.c:215
 msgid "Dutch:"
 msgstr "Nederlandera:"
 
-#: src/audacious/credits.c:212
+#: src/audacious/credits.c:219
 msgid "Estonian:"
 msgstr "Estoniera:"
 
-#: src/audacious/credits.c:215
+#: src/audacious/credits.c:222
 msgid "Finnish:"
 msgstr "Finlandiera:"
 
-#: src/audacious/credits.c:220
+#: src/audacious/credits.c:227
 msgid "French:"
 msgstr "Frantsesa:"
 
-#: src/audacious/credits.c:226
+#: src/audacious/credits.c:233
 msgid "German:"
 msgstr "Alemana:"
 
-#: src/audacious/credits.c:233
+#: src/audacious/credits.c:240
 msgid "Georgian:"
 msgstr "Georgiera:"
 
-#: src/audacious/credits.c:236
+#: src/audacious/credits.c:243
 msgid "Greek:"
 msgstr "Grekoa:"
 
-#: src/audacious/credits.c:241
+#: src/audacious/credits.c:248
 msgid "Hindi:"
 msgstr "Hindiera:"
 
-#: src/audacious/credits.c:244
+#: src/audacious/credits.c:251
 msgid "Hungarian:"
 msgstr "Hungariera:"
 
-#: src/audacious/credits.c:248
+#: src/audacious/credits.c:255
 msgid "Italian:"
 msgstr "Italiera:"
 
-#: src/audacious/credits.c:252
+#: src/audacious/credits.c:260
 msgid "Japanese:"
 msgstr "Japoniera:"
 
-#: src/audacious/credits.c:255
+#: src/audacious/credits.c:263
 msgid "Korean:"
 msgstr "Koreera:"
 
-#: src/audacious/credits.c:258
-#, fuzzy
+#: src/audacious/credits.c:266
 msgid "Latvian:"
-msgstr "Kroaziera:"
+msgstr "Letoniera"
 
-#: src/audacious/credits.c:261
+#: src/audacious/credits.c:269
 msgid "Lithuanian:"
 msgstr "Lituaniera:"
 
-#: src/audacious/credits.c:265
+#: src/audacious/credits.c:274
 msgid "Macedonian:"
 msgstr "Mazedoniera:"
 
-#: src/audacious/credits.c:268
+#: src/audacious/credits.c:277
+msgid "Mexican Spanish:"
+msgstr "Mexikoko gaztelera"
+
+#: src/audacious/credits.c:280
 msgid "Polish:"
 msgstr "Poloniera:"
 
-#: src/audacious/credits.c:274
-#, fuzzy
+#: src/audacious/credits.c:287
 msgid "Portuguese:"
-msgstr "Brasilgo portugesa:"
+msgstr "Portugesa"
 
-#: src/audacious/credits.c:277
+#: src/audacious/credits.c:290
 msgid "Romanian:"
 msgstr "Errumaniera:"
 
-#: src/audacious/credits.c:281
+#: src/audacious/credits.c:294
 msgid "Russian:"
 msgstr "Errusiera:"
 
-#: src/audacious/credits.c:285
+#: src/audacious/credits.c:298
 msgid "Serbian (Latin):"
 msgstr "Serbiera (Latinoa):"
 
-#: src/audacious/credits.c:288
+#: src/audacious/credits.c:301
 msgid "Serbian (Cyrillic):"
 msgstr "Serbiera (Zirilikoa):"
 
-#: src/audacious/credits.c:291
+#: src/audacious/credits.c:305
 msgid "Simplified Chinese:"
 msgstr "Txinera soildua:"
 
-#: src/audacious/credits.c:294
+#: src/audacious/credits.c:308
 msgid "Slovak:"
 msgstr "Eslovakiera:"
 
-#: src/audacious/credits.c:297
+#: src/audacious/credits.c:312
 msgid "Spanish:"
 msgstr "Gaztelania:"
 
-#: src/audacious/credits.c:304
+#: src/audacious/credits.c:320
 msgid "Swedish:"
 msgstr "Suediera:"
 
-#: src/audacious/credits.c:307
+#: src/audacious/credits.c:323
 msgid "Traditional Chinese:"
 msgstr "Txinera tradizionala:"
 
-#: src/audacious/credits.c:312
+#: src/audacious/credits.c:329
 msgid "Turkish:"
 msgstr "Turkiera:"
 
-#: src/audacious/credits.c:316
+#: src/audacious/credits.c:333
 msgid "Ukrainian:"
 msgstr "Ukrainera:"
 
-#: src/audacious/credits.c:319
+#: src/audacious/credits.c:338
+msgid "Vietnamese:"
+msgstr "Vietnamera"
+
+#: src/audacious/credits.c:341
 msgid "Welsh:"
 msgstr "Galesa:"
 
-#: src/audacious/drct.c:256
-#, fuzzy
-msgid "Temporary Playlist"
-msgstr "Kargatu erreprodukzio-zerrenda"
-
-#: src/audacious/equalizer_preset.c:186
+#: src/audacious/equalizer_preset.c:180
 #, c-format
 msgid "Error importing Winamp EQF file '%s'"
 msgstr "Errorea '%s' Winamp EQF fitxategia inportatzean"
 
-#: src/audacious/main.c:256
+#: src/audacious/main.c:243
 msgid "Skip backwards in playlist"
 msgstr "Erreprodukzio-zerrendan atzerantz egiten du"
 
-#: src/audacious/main.c:257
+#: src/audacious/main.c:244
 msgid "Start playing current playlist"
 msgstr "Uneko zerrenda erreproduzitzen hasten da"
 
-#: src/audacious/main.c:258
+#: src/audacious/main.c:245
 msgid "Pause current song"
 msgstr "Uneko kanta pausarazten du"
 
-#: src/audacious/main.c:259
+#: src/audacious/main.c:246
 msgid "Stop current song"
 msgstr "Uneko kanta geldiarazten du"
 
-#: src/audacious/main.c:260
+#: src/audacious/main.c:247
 msgid "Pause if playing, play otherwise"
 msgstr "Erreproduzitzen ari bada pausarazi, bestela erreproduzitu"
 
-#: src/audacious/main.c:261
+#: src/audacious/main.c:248
 msgid "Skip forward in playlist"
 msgstr "Erreprodukzio-zerrendan aurrerantz egiten du"
 
-#: src/audacious/main.c:262
+#: src/audacious/main.c:249
 msgid "Display Jump to File dialog"
 msgstr "Bistaratu 'Saltatu fitxategira' elkarrizketa-koadroa"
 
-#: src/audacious/main.c:263
-#, fuzzy
+#: src/audacious/main.c:250
 msgid "Add files to the playlist"
-msgstr "Fitxategiak gehitzen dizkio zerrendari."
+msgstr "Gehitu fitxategiak erreprodukzio-zerrendara"
 
-#: src/audacious/main.c:264
+#: src/audacious/main.c:251
 msgid "Add new files to a temporary playlist"
 msgstr "Gehitu fitxategi berriak aldi baterako erreprodukzio-zerrendari"
 
-#: src/audacious/main.c:265
+#: src/audacious/main.c:252
 msgid "Display the main window"
 msgstr "Bistaratu nagusia leihoa"
 
-#: src/audacious/main.c:266
+#: src/audacious/main.c:253
 msgid "Show version"
 msgstr "Erakutsi bertsioa"
 
-#: src/audacious/main.c:267
+#: src/audacious/main.c:254
 msgid "Print debugging messages"
 msgstr ""
 
-#: src/audacious/main.c:268
+#: src/audacious/main.c:255
+msgid "Headless mode (beta)"
+msgstr ""
+
+#: src/audacious/main.c:256
 msgid "FILE..."
 msgstr "FITXATEGIA..."
 
-#: src/audacious/main.c:280
+#: src/audacious/main.c:268
 msgid "- play multimedia files"
 msgstr "- erreproduzitu multimedia fitxategiak"
 
-#: src/audacious/main.c:290
+#: src/audacious/main.c:278
 #, c-format
 msgid ""
 "%s: %s\n"
 "Try `%s --help' for more information.\n"
-msgstr ""
-"%s: %s\n"
-"Exekutatu '%s --help' informazio gehiagorako.\n"
-
-#: src/audacious/main.c:407
-msgid ""
-"Audacious seems to be already running but is not responding. You can start "
-"another instance of the program, but please be warned that this can cause "
-"data loss. If Audacious is not running, you can safely ignore this "
-"message. Press OK to start Audacious or Cancel to quit."
-msgstr ""
+msgstr "%s: %s\nExekutatu '%s --help' informazio gehiagorako.\n"
 
-#: src/audacious/main.c:572
+#: src/audacious/main.c:573
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/audacious/playback.c:381
+#: src/audacious/playback.c:307
 #, c-format
 msgid "No decoder found for %s."
-msgstr ""
+msgstr "Ez dago %s-rako dekodifikatzailerik."
 
-#: src/audacious/playback.c:531
-msgid "Buffering ..."
+#: src/audacious/playlist-files.c:53
+#, c-format
+msgid "Cannot %s %s: unsupported file extension."
 msgstr ""
 
-#: src/audacious/playlist-new.c:303
-#, fuzzy
-msgid "Untitled Playlist"
+#: src/audacious/playlist-files.c:54
+msgid "save"
+msgstr "Gorde"
+
+#: src/audacious/playlist-files.c:54
+msgid "load"
+msgstr "Kargatu"
+
+#: src/audacious/playlist-new.c:131
+msgid "New Playlist"
 msgstr "Erreprodukzio-zerrenda berria"
 
-#: src/audacious/ui_preferences.c:87
+#: src/audacious/playlist-new.c:132
+msgid "Now Playing"
+msgstr "Orain erreproduzitzen"
+
+#: src/audacious/playlist-new.c:1630
+msgid ""
+"The playlist cannot be sorted because metadata scanning is still in progress"
+" (or has been disabled)."
+msgstr ""
+
+#: src/audacious/ui_preferences.c:85
 msgid "Audio"
 msgstr "Audioa"
 
-#: src/audacious/ui_preferences.c:88
+#: src/audacious/ui_preferences.c:86
 msgid "Network"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:89 src/audacious/ui_preferences.c:1556
+#: src/audacious/ui_preferences.c:87 src/audacious/ui_preferences.c:1603
 msgid "Playlist"
 msgstr "Erreprodukzio-zerrenda"
 
-#: src/audacious/ui_preferences.c:90
+#: src/audacious/ui_preferences.c:88
 msgid "Plugins"
 msgstr "Pluginak"
 
-#: src/audacious/ui_preferences.c:96 src/libaudgui/infopopup.c:204
+#: src/audacious/ui_preferences.c:94 src/libaudgui/infopopup.c:199
 msgid "Artist"
 msgstr "Artista"
 
-#: src/audacious/ui_preferences.c:97 src/libaudgui/infopopup.c:206
+#: src/audacious/ui_preferences.c:95 src/libaudgui/infopopup.c:201
 msgid "Album"
 msgstr "Albuma"
 
-#: src/audacious/ui_preferences.c:98 src/libaudgui/infopopup.c:202
-#: src/libaudgui/ui_playlist_manager.c:263
+#: src/audacious/ui_preferences.c:96 src/libaudgui/infopopup.c:197
+#: src/libaudgui/ui_playlist_manager.c:279
 msgid "Title"
 msgstr "Titulua"
 
-#: src/audacious/ui_preferences.c:99
+#: src/audacious/ui_preferences.c:97
 msgid "Tracknumber"
 msgstr "Pista-zenbakia"
 
-#: src/audacious/ui_preferences.c:100 src/libaudgui/infopopup.c:208
+#: src/audacious/ui_preferences.c:98 src/libaudgui/infopopup.c:203
 msgid "Genre"
 msgstr "Generoa"
 
-#: src/audacious/ui_preferences.c:101
+#: src/audacious/ui_preferences.c:99
 msgid "Filename"
 msgstr "Fitxategi-izena"
 
-#: src/audacious/ui_preferences.c:102
+#: src/audacious/ui_preferences.c:100
 msgid "Filepath"
 msgstr "Fitxategiaren bide-izena"
 
-#: src/audacious/ui_preferences.c:103
+#: src/audacious/ui_preferences.c:101
 msgid "Date"
 msgstr "Data"
 
-#: src/audacious/ui_preferences.c:104 src/libaudgui/infopopup.c:210
+#: src/audacious/ui_preferences.c:102 src/libaudgui/infopopup.c:205
 msgid "Year"
 msgstr "Urtea"
 
-#: src/audacious/ui_preferences.c:105
+#: src/audacious/ui_preferences.c:103
 msgid "Comment"
 msgstr "Iruzkina"
 
-#: src/audacious/ui_preferences.c:106
+#: src/audacious/ui_preferences.c:104
 msgid "Codec"
 msgstr "Kodeka"
 
-#: src/audacious/ui_preferences.c:107
+#: src/audacious/ui_preferences.c:105
 msgid "Quality"
 msgstr "Kalitatea"
 
-#: src/audacious/ui_preferences.c:112
+#: src/audacious/ui_preferences.c:111
 msgid "None"
 msgstr "Bat ere ez"
 
+#: src/audacious/ui_preferences.c:112
+msgid "Arabic"
+msgstr "Arabiarra"
+
 #: src/audacious/ui_preferences.c:113
-msgid "Japanese"
-msgstr "Japoniarra"
+msgid "Baltic"
+msgstr "Baltikoa"
 
 #: src/audacious/ui_preferences.c:114
-msgid "Taiwanese"
-msgstr "Taiwanera"
-
-#: src/audacious/ui_preferences.c:115
 msgid "Chinese"
 msgstr "Txinatarra"
 
+#: src/audacious/ui_preferences.c:115
+msgid "Greek"
+msgstr "Grekoa"
+
 #: src/audacious/ui_preferences.c:116
-msgid "Korean"
-msgstr "Korearra"
+msgid "Hebrew"
+msgstr "Hebrearra"
 
 #: src/audacious/ui_preferences.c:117
-msgid "Russian"
-msgstr "Errusiarra"
+msgid "Japanese"
+msgstr "Japoniarra"
 
 #: src/audacious/ui_preferences.c:118
-msgid "Greek"
-msgstr "Grekoa"
+msgid "Korean"
+msgstr "Korearra"
 
 #: src/audacious/ui_preferences.c:119
-msgid "Hebrew"
-msgstr "Hebrearra"
+msgid "Polish"
+msgstr "Poloniera"
 
 #: src/audacious/ui_preferences.c:120
-msgid "Turkish"
-msgstr "Turkiarra"
+msgid "Russian"
+msgstr "Errusiarra"
 
 #: src/audacious/ui_preferences.c:121
-msgid "Arabic"
-msgstr "Arabiarra"
+msgid "Taiwanese"
+msgstr "Taiwanera"
 
 #: src/audacious/ui_preferences.c:122
-#, fuzzy
-msgid "Polish"
-msgstr "Poloniera:"
-
-#: src/audacious/ui_preferences.c:123
-#, fuzzy
-msgid "Baltic"
-msgstr "Zelta"
-
-#: src/audacious/ui_preferences.c:124
-msgid "Universal"
-msgstr "Unibertsala"
-
-#: src/audacious/ui_preferences.c:146
-#, fuzzy
-msgid "Single track mode"
-msgstr "Ikusi pistaren xehetasunak"
+msgid "Turkish"
+msgstr "Turkiarra"
 
-#: src/audacious/ui_preferences.c:147
-#, fuzzy
+#: src/audacious/ui_preferences.c:144
 msgid "Album mode"
-msgstr "Albuma: "
+msgstr ""
 
-#: src/audacious/ui_preferences.c:150
-#, fuzzy
+#: src/audacious/ui_preferences.c:147
 msgid "Output Settings"
-msgstr "Formatuaren detekzioa"
+msgstr ""
 
-#: src/audacious/ui_preferences.c:152
-#, fuzzy
+#: src/audacious/ui_preferences.c:149
 msgid "Bit depth:"
-msgstr "Irteerako bit-sakonera:"
+msgstr ""
 
-#: src/audacious/ui_preferences.c:155
+#: src/audacious/ui_preferences.c:152
 msgid "Buffer size:"
 msgstr "Bufferraren tamaina:"
 
-#: src/audacious/ui_preferences.c:157
+#: src/audacious/ui_preferences.c:154
 msgid "ms"
-msgstr ""
+msgstr "ms"
 
-#: src/audacious/ui_preferences.c:158
-#, fuzzy
+#: src/audacious/ui_preferences.c:155
 msgid "Use software volume control (not recommended)"
-msgstr "Erabili softwarearen bolumen-kontrola"
+msgstr "Softwarearen bolumen kontrola erabili (ez gomendagarria)"
 
-#: src/audacious/ui_preferences.c:160
-#, fuzzy
+#: src/audacious/ui_preferences.c:157
 msgid "Replay Gain"
-msgstr "Irabazpenaren modua"
+msgstr ""
 
-#: src/audacious/ui_preferences.c:161
+#: src/audacious/ui_preferences.c:158
 msgid "Enable Replay Gain"
 msgstr "Gaitu irabazpena"
 
-#: src/audacious/ui_preferences.c:164
+#: src/audacious/ui_preferences.c:161
 msgid "Prevent clipping (recommended)"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:166
-#, fuzzy
+#: src/audacious/ui_preferences.c:163
 msgid "Adjust Levels"
-msgstr "Saguaren gurpila"
+msgstr ""
 
-#: src/audacious/ui_preferences.c:167
+#: src/audacious/ui_preferences.c:164
 msgid "Amplify all files:"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:169 src/audacious/ui_preferences.c:172
+#: src/audacious/ui_preferences.c:166 src/audacious/ui_preferences.c:169
 msgid "dB"
 msgstr "dB"
 
-#: src/audacious/ui_preferences.c:170
-#, fuzzy
+#: src/audacious/ui_preferences.c:167
 msgid "Amplify untagged files:"
-msgstr "- erreproduzitu multimedia fitxategiak"
+msgstr ""
 
-#: src/audacious/ui_preferences.c:175
+#: src/audacious/ui_preferences.c:172
 msgid "Proxy hostname:"
 msgstr "Proxy-aren ostalari-izena:"
 
-#: src/audacious/ui_preferences.c:176
+#: src/audacious/ui_preferences.c:173
 msgid "Proxy port:"
 msgstr "Proxy-aren ataka:"
 
-#: src/audacious/ui_preferences.c:179
+#: src/audacious/ui_preferences.c:176
 msgid "Proxy username:"
 msgstr "Proxy-aren erabiltzaile-izena:"
 
-#: src/audacious/ui_preferences.c:180
+#: src/audacious/ui_preferences.c:177
 msgid "Proxy password:"
 msgstr "Proxy-aren pasahitza:"
 
-#: src/audacious/ui_preferences.c:184
+#: src/audacious/ui_preferences.c:181
 msgid "Proxy Configuration"
 msgstr "Proxy-aren konfigurazioa"
 
-#: src/audacious/ui_preferences.c:185
+#: src/audacious/ui_preferences.c:182
 msgid "Enable proxy usage"
 msgstr "Gaitu proxy-a erabiltzea"
 
-#: src/audacious/ui_preferences.c:187
+#: src/audacious/ui_preferences.c:185
 msgid "Use authentication with proxy"
 msgstr "Erabili autentifikazioa proxy-arekin"
 
-#: src/audacious/ui_preferences.c:189
-msgid ""
-"Changing these settings will require a restart of "
-"Audacious."
-msgstr ""
-"Ezarpen hauen aldaketek Audacious berrabiaraztea "
-"eskatzen dute."
-
 #: src/audacious/ui_preferences.c:193
 msgid "Auto character encoding detector for:"
 msgstr "Karaktere-kodeketaren detekzio automatikoa:"
 
-#: src/audacious/ui_preferences.c:201
+#: src/audacious/ui_preferences.c:198
 msgid "Fallback character encodings:"
 msgstr "Karaktere-kodeketa:"
 
-#: src/audacious/ui_preferences.c:201
-msgid ""
-"List of character encodings used for fall back conversion of metadata. If "
-"automatic character encoding detector failed or has been disabled, encodings "
-"in this list would be treated as candidates of the encoding of metadata, and "
-"fall back conversion from these encodings to UTF-8 would be attempted."
-msgstr ""
-"Metadatuen bihurketa egiteko erabiliko den karaktere-kodeketen zerrenda. "
-"Karaktere-kodeketaren detekzio automatikoak huts egiten badu, edo desgaitu "
-"egin bada, zerrenda honetako kodeketak erabiliko dira metadatuen kodeketako "
-"hautagai gisa, eta kodeketa hauetatik UTF-8ra bihurtzen saiatuko da."
-
-#: src/audacious/ui_preferences.c:205
-#, fuzzy
+#: src/audacious/ui_preferences.c:202
 msgid "Behavior"
-msgstr "Bit-sakonera"
+msgstr "Jarrera"
 
-#: src/audacious/ui_preferences.c:206
+#: src/audacious/ui_preferences.c:203
 msgid "Continue playback on startup"
 msgstr "Jarraitu erreprodukzioa abiaraztean"
 
-#: src/audacious/ui_preferences.c:208
+#: src/audacious/ui_preferences.c:205
 msgid "Advance when the current song is deleted"
-msgstr ""
+msgstr "Aurreratu uneko abestia ezabatzen denean"
 
-#: src/audacious/ui_preferences.c:210
-#, fuzzy
+#: src/audacious/ui_preferences.c:207
 msgid "Clear the playlist when opening files"
-msgstr "Sortu erreprodukzio-zerrenda berria bat datozten sarrerekin"
+msgstr "Garbitu erreprodukzio-zerrenda fitxategiak irekitzerakoan"
 
-#: src/audacious/ui_preferences.c:212
-#, fuzzy
+#: src/audacious/ui_preferences.c:209
 msgid "Open files in a temporary playlist"
 msgstr "Gehitu fitxategi berriak aldi baterako erreprodukzio-zerrendari"
 
-#: src/audacious/ui_preferences.c:214
+#: src/audacious/ui_preferences.c:211
 msgid "Metadata"
 msgstr "Metadatuak"
 
-#: src/audacious/ui_preferences.c:454
+#: src/audacious/ui_preferences.c:212
+msgid "Do not load metadata for songs until played"
+msgstr ""
+
+#: src/audacious/ui_preferences.c:230
+msgid "TITLE"
+msgstr "TITULUA"
+
+#: src/audacious/ui_preferences.c:231
+msgid "ARTIST - TITLE"
+msgstr "ARTISTA - TITULUA"
+
+#: src/audacious/ui_preferences.c:232
+msgid "ARTIST - ALBUM - TITLE"
+msgstr "ARTISTA - ALBUMA - TITULUA"
+
+#: src/audacious/ui_preferences.c:233
+msgid "ARTIST - ALBUM - TRACK. TITLE"
+msgstr "ARTISTA - ALBUMA - PISTA. TITULUA"
+
+#: src/audacious/ui_preferences.c:234
+msgid "ARTIST [ ALBUM ] - TRACK. TITLE"
+msgstr "ARTISTA - [ALBUMA] - PISTA. TITULUA"
+
+#: src/audacious/ui_preferences.c:235
+msgid "ALBUM - TITLE"
+msgstr "ALBUMA - TITULUA"
+
+#: src/audacious/ui_preferences.c:556
 msgid "Category"
 msgstr "Kategoria"
 
-#: src/audacious/ui_preferences.c:682
+#: src/audacious/ui_preferences.c:780
 msgid "Popup Information Settings"
 msgstr "Laster-leihoen ezarpenak"
 
-#: src/audacious/ui_preferences.c:691
+#: src/audacious/ui_preferences.c:789
 msgid "Cover image retrieve"
 msgstr "Eskuratu azaleko irudia"
 
-#: src/audacious/ui_preferences.c:696
+#: src/audacious/ui_preferences.c:794
 msgid ""
 "While searching for the album's cover, Audacious looks for certain words in "
 "the filename. You can specify those words in the lists below, separated "
 "using commas."
-msgstr ""
-"Albumaren azala bilatzean, Audacious-ek hitz zehatz batzuk begiratuko ditu "
-"fitxategi-izenean. Hitz horiek azpiko zerrendan zehatz ditzakezu, komaz "
-"bereiztuta."
+msgstr "Albumaren azala bilatzean, Audacious-ek hitz zehatz batzuk begiratuko ditu fitxategi-izenean. Hitz horiek azpiko zerrendan zehatz ditzakezu, komaz bereiztuta."
 
-#: src/audacious/ui_preferences.c:713
+#: src/audacious/ui_preferences.c:811
 msgid "Exclude:"
 msgstr "Baztertu:"
 
-#: src/audacious/ui_preferences.c:720
+#: src/audacious/ui_preferences.c:818
 msgid "Include:"
 msgstr "Sartu:"
 
-#: src/audacious/ui_preferences.c:737
+#: src/audacious/ui_preferences.c:835
 msgid "Recursively search for cover"
 msgstr "Bilatu azala errekurtsiboki"
 
-#: src/audacious/ui_preferences.c:747
+#: src/audacious/ui_preferences.c:845
 msgid "Search depth: "
 msgstr "Sakonera:"
 
-#: src/audacious/ui_preferences.c:761
+#: src/audacious/ui_preferences.c:859
 msgid "Use per-file cover"
 msgstr "Erabili azala fitxategiko"
 
-#: src/audacious/ui_preferences.c:764
+#: src/audacious/ui_preferences.c:862
 msgid "Miscellaneous"
 msgstr "Hainbat"
 
-#: src/audacious/ui_preferences.c:773
+#: src/audacious/ui_preferences.c:871
 msgid "Show Progress bar for the current track"
 msgstr "Erakutsi uneko kantaren progresio-barra"
 
-#: src/audacious/ui_preferences.c:783
+#: src/audacious/ui_preferences.c:881
 msgid "Delay until filepopup comes up: "
 msgstr "Atzerapena laster-leihoa agertzeko: "
 
-#: src/audacious/ui_preferences.c:1283
+#: src/audacious/ui_preferences.c:1309
+msgid "Custom"
+msgstr "Pertsonalizatua"
+
+#: src/audacious/ui_preferences.c:1352
 msgid "Song Display"
 msgstr "Kanten ikuspegia"
 
-#: src/audacious/ui_preferences.c:1292
+#: src/audacious/ui_preferences.c:1361
 msgid "Show song numbers"
-msgstr ""
+msgstr "Abesti zenbakiak erakutsi"
 
-#: src/audacious/ui_preferences.c:1303
+#: src/audacious/ui_preferences.c:1372
 msgid "Show leading zeroes (02:00 instead of 2:00)"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:1325
+#: src/audacious/ui_preferences.c:1394
 msgid "Show information about titlestring format"
 msgstr "Erakutsi titulu-formatuari buruzko informazioa"
 
-#: src/audacious/ui_preferences.c:1339
-msgid "TITLE"
-msgstr "TITULUA"
-
-#: src/audacious/ui_preferences.c:1340
-msgid "ARTIST - TITLE"
-msgstr "ARTISTA - TITULUA"
-
-#: src/audacious/ui_preferences.c:1341
-msgid "ARTIST - ALBUM - TITLE"
-msgstr "ARTISTA - ALBUMA - TITULUA"
-
-#: src/audacious/ui_preferences.c:1342
-msgid "ARTIST - ALBUM - TRACK. TITLE"
-msgstr "ARTISTA - ALBUMA - PISTA. TITULUA"
-
-#: src/audacious/ui_preferences.c:1343
-msgid "ARTIST [ ALBUM ] - TRACK. TITLE"
-msgstr "ARTISTA - [ALBUMA] - PISTA. TITULUA"
-
-#: src/audacious/ui_preferences.c:1344
-msgid "ALBUM - TITLE"
-msgstr "ALBUMA - TITULUA"
-
-#: src/audacious/ui_preferences.c:1345
-msgid "Custom"
-msgstr "Pertsonalizatua"
-
-#: src/audacious/ui_preferences.c:1354
+#: src/audacious/ui_preferences.c:1410
 msgid "Custom string:"
 msgstr "Kate pertsonalizatua:"
 
-#: src/audacious/ui_preferences.c:1361
+#: src/audacious/ui_preferences.c:1417
 msgid "Title format:"
 msgstr "Tituluaren formatua:"
 
-#: src/audacious/ui_preferences.c:1372
+#: src/audacious/ui_preferences.c:1428
 msgid "Popup Information"
 msgstr "Laster-leihoa"
 
-#: src/audacious/ui_preferences.c:1387
+#: src/audacious/ui_preferences.c:1443
 msgid "Show popup information for playlist entries"
-msgstr ""
-"Erakutsi erreprodukzio-zerrendako sarreren informazioaren laster-leihoa"
+msgstr "Erakutsi erreprodukzio-zerrendako sarreren informazioaren laster-leihoa"
 
-#: src/audacious/ui_preferences.c:1388
+#: src/audacious/ui_preferences.c:1444
 msgid ""
 "Toggles popup information window for the pointed entry in the playlist. The "
 "window shows title of song, name of album, genre, year of publish, track "
 "number, track length, and artwork."
-msgstr ""
-"Erakuslea erreprodukzio-zerrendako sarrera baten gainean jartzean kantari "
-"dagokion informazioa bistaratuko da laster-leihoan. Leihoak kantuaren "
-"titulua, albumaren izena, generoa, argitalpen urtea, pista-zenbakia, "
-"pistaren iraupena eta irudiak erakutsiko ditu."
+msgstr "Erakuslea erreprodukzio-zerrendako sarrera baten gainean jartzean kantari dagokion informazioa bistaratuko da laster-leihoan. Leihoak kantuaren titulua, albumaren izena, generoa, argitalpen urtea, pista-zenbakia, pistaren iraupena eta irudiak erakutsiko ditu."
 
-#: src/audacious/ui_preferences.c:1397
+#: src/audacious/ui_preferences.c:1455
 msgid "Edit settings for popup information"
 msgstr "Editatu laster-leihoaren ezarpenak"
 
-#: src/audacious/ui_preferences.c:1497
-#, fuzzy
+#: src/audacious/ui_preferences.c:1544
 msgid "Output plugin:"
-msgstr "Sarrerako plugina: %s"
+msgstr ""
 
-#: src/audacious/ui_preferences.c:1556
-#, fuzzy
+#: src/audacious/ui_preferences.c:1603
 msgid "Transport"
-msgstr "Itzultzaileak"
+msgstr ""
 
-#: src/audacious/ui_preferences.c:1556
+#: src/audacious/ui_preferences.c:1603
 msgid "Input"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:1557
-#, fuzzy
+#: src/audacious/ui_preferences.c:1604
 msgid "Effect"
 msgstr "Efektuak"
 
-#: src/audacious/ui_preferences.c:1557
+#: src/audacious/ui_preferences.c:1604
 msgid "Visualization"
 msgstr "Bistaratzea"
 
-#: src/audacious/ui_preferences.c:1557
+#: src/audacious/ui_preferences.c:1604
 msgid "General"
-msgstr ""
+msgstr "Orokorra"
 
-#: src/audacious/ui_preferences.c:1597
+#: src/audacious/ui_preferences.c:1644
 msgid "Audacious Preferences"
 msgstr "Audacious-en hobespenak"
 
-#: src/audacious/util.c:155
+#: src/audacious/util.c:120
 #, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr "Ezin izan da %s direktorioa sortu: %s\n"
 
-#: src/audtool/handlers_playlist.c:264
+#: src/audtool/handlers_playlist.c:273
 msgid "Position not found."
 msgstr ""
 
-#: src/audtool/handlers_vitals.c:64
+#: src/audtool/handlers_vitals.c:63
 msgid "No song playing."
 msgstr ""
 
-#: src/libaudcore/tuple.c:685
-msgid "Mono"
+#: src/libaudcore/audstrings.c:199
+#, c-format
+msgid "Audio CD, track %s"
 msgstr ""
 
-#: src/libaudcore/tuple.c:687
-#, fuzzy
+#: src/libaudcore/tuple.c:536
+msgid "Mono"
+msgstr "Mono"
+
+#: src/libaudcore/tuple.c:538
 msgid "Stereo"
-msgstr "estereoa"
+msgstr "Estereo"
 
-#: src/libaudcore/tuple.c:689
+#: src/libaudcore/tuple.c:540
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d kanala"
+msgstr[1] "%d kanalak"
+
+#: src/libaudgui/about.c:52 src/libaudgui/about.c:115
+msgid "Credits"
+msgstr "Kredituak"
+
+#: src/libaudgui/about.c:52
+msgid "Translators"
+msgstr "Itzultzaileak"
+
+#: src/libaudgui/about.c:91
+msgid "About Audacious"
+msgstr "Audacious-i buruz"
 
-#: src/libaudgui/confirm.c:73
+#: src/libaudgui/confirm.c:76
 #, c-format
 msgid ""
 "Are you sure you want to close %s? If you do, any changes made since the "
 "playlist was exported will be lost."
-msgstr ""
+msgstr "%s itxi nahi duzulaz ziur zaude? Ixten baduzu, erreprodukzio-zerrenda itxi zenetik egindako aldaketak galduko dira."
 
-#: src/libaudgui/confirm.c:86
-#, fuzzy
+#: src/libaudgui/confirm.c:89
 msgid "_Don't show this message again"
 msgstr "Ez erakutsi mezu hau aurrerantzean"
 
-#: src/libaudgui/confirm.c:124
-#, fuzzy
+#: src/libaudgui/confirm.c:126
 msgid "Rename Playlist"
-msgstr "Gorde erreprodukzio-zerrenda"
+msgstr "Erreprodukzio-zerrenda berrizendatu"
 
-#: src/libaudgui/effects-menu.c:76
+#: src/libaudgui/effects-menu.c:74
 msgid "settings ..."
 msgstr ""
 
-#: src/libaudgui/equalizer.c:68
-#, fuzzy
+#: src/libaudgui/equalizer.c:51
 msgid "_Enable"
-msgstr "Gaituta"
+msgstr "Gaitu"
 
-#: src/libaudgui/equalizer.c:140
+#: src/libaudgui/equalizer.c:123
 msgid "31 Hz"
-msgstr ""
+msgstr "31 Hz"
 
-#: src/libaudgui/equalizer.c:140
+#: src/libaudgui/equalizer.c:123
 msgid "63 Hz"
-msgstr ""
+msgstr "63 Hz"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "125 Hz"
-msgstr ""
+msgstr "125 Hz"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "250 Hz"
-msgstr ""
+msgstr "250 Hz"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "500 Hz"
-msgstr ""
+msgstr "500 Hz"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "1 kHz"
-msgstr ""
+msgstr "1 kHz"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "2 kHz"
-msgstr ""
+msgstr "2 kHz"
 
-#: src/libaudgui/equalizer.c:142
+#: src/libaudgui/equalizer.c:125
 msgid "4 kHz"
-msgstr ""
+msgstr "4 kHz"
 
-#: src/libaudgui/equalizer.c:142
+#: src/libaudgui/equalizer.c:125
 msgid "8 kHz"
-msgstr ""
+msgstr "8 kHz"
 
-#: src/libaudgui/equalizer.c:142
+#: src/libaudgui/equalizer.c:125
 msgid "16 kHz"
-msgstr ""
+msgstr "16 kHz"
 
-#: src/libaudgui/equalizer.c:147
-#, fuzzy
+#: src/libaudgui/equalizer.c:130
 msgid "Equalizer"
 msgstr "Erakutsi ekualizadorea"
 
-#: src/libaudgui/equalizer.c:163
-#, fuzzy
+#: src/libaudgui/equalizer.c:146
 msgid "Preamp"
-msgstr "Aurre-anp:"
+msgstr ""
 
-#: src/libaudgui/infopopup.c:212
+#: src/libaudgui/infopopup.c:207
 msgid "Track Number"
 msgstr "Pista-zenbakia"
 
-#: src/libaudgui/infopopup.c:214
+#: src/libaudgui/infopopup.c:209
 msgid "Track Length"
 msgstr "Pistaren luzera"
 
-#: src/libaudgui/infowin.c:77
+#: src/libaudgui/infowin.c:75
 msgid "Acid Jazz"
 msgstr "Jazz azidoa"
 
-#: src/libaudgui/infowin.c:78
-#, fuzzy
+#: src/libaudgui/infowin.c:76
 msgid "Acid Rock"
-msgstr "Rock gogorra"
+msgstr ""
 
-#: src/libaudgui/infowin.c:79
+#: src/libaudgui/infowin.c:77
 msgid "Ambient"
 msgstr "Giroko musika"
 
-#: src/libaudgui/infowin.c:80
-#, fuzzy
+#: src/libaudgui/infowin.c:78
 msgid "Bebop"
-msgstr "Bebob"
+msgstr ""
 
-#: src/libaudgui/infowin.c:81
+#: src/libaudgui/infowin.c:79
 msgid "Bluegrass"
 msgstr "Bluegrass"
 
-#: src/libaudgui/infowin.c:82
+#: src/libaudgui/infowin.c:80
 msgid "Blues"
 msgstr "Blues-a"
 
-#: src/libaudgui/infowin.c:83
+#: src/libaudgui/infowin.c:81
 msgid "Chamber Music"
 msgstr "Ganbera-musika"
 
-#: src/libaudgui/infowin.c:84
+#: src/libaudgui/infowin.c:82
 msgid "Classical"
 msgstr "Klasikoa"
 
-#: src/libaudgui/infowin.c:85
+#: src/libaudgui/infowin.c:83
 msgid "Country"
 msgstr "Country"
 
-#: src/libaudgui/infowin.c:86
+#: src/libaudgui/infowin.c:84
 msgid "Death Metal"
 msgstr "Death Metal"
 
-#: src/libaudgui/infowin.c:87
+#: src/libaudgui/infowin.c:85
 msgid "Disco"
 msgstr "Disko"
 
-#: src/libaudgui/infowin.c:88
+#: src/libaudgui/infowin.c:86
 msgid "Easy Listening"
 msgstr "Entzuteko erraza"
 
-#: src/libaudgui/infowin.c:89
+#: src/libaudgui/infowin.c:87
 msgid "Folk"
 msgstr "Folka"
 
-#: src/libaudgui/infowin.c:90
+#: src/libaudgui/infowin.c:88
 msgid "Funk"
 msgstr "Funk-a"
 
-#: src/libaudgui/infowin.c:91
+#: src/libaudgui/infowin.c:89
 msgid "Gangsta Rap"
 msgstr "Gangsta Rap"
 
-#: src/libaudgui/infowin.c:92
+#: src/libaudgui/infowin.c:90
 msgid "Gospel"
 msgstr "Gospel-a"
 
-#: src/libaudgui/infowin.c:93
+#: src/libaudgui/infowin.c:91
 msgid "Grunge"
 msgstr "Grunge-a"
 
-#: src/libaudgui/infowin.c:94
+#: src/libaudgui/infowin.c:92
 msgid "Hard Rock"
 msgstr "Rock gogorra"
 
-#: src/libaudgui/infowin.c:95
+#: src/libaudgui/infowin.c:93
 msgid "Heavy Metal"
 msgstr "Heavy Metal-a"
 
-#: src/libaudgui/infowin.c:96
-#, fuzzy
+#: src/libaudgui/infowin.c:94
 msgid "Hip-hop"
 msgstr "Hip-Hop-a"
 
-#: src/libaudgui/infowin.c:97
+#: src/libaudgui/infowin.c:95
 msgid "House"
 msgstr "House"
 
-#: src/libaudgui/infowin.c:98
+#: src/libaudgui/infowin.c:96
 msgid "Jazz"
 msgstr "Jazza"
 
-#: src/libaudgui/infowin.c:99
+#: src/libaudgui/infowin.c:97
 msgid "Jungle"
 msgstr "Jungle-a"
 
-#: src/libaudgui/infowin.c:100
+#: src/libaudgui/infowin.c:98
 msgid "Metal"
 msgstr "Metala"
 
-#: src/libaudgui/infowin.c:101
+#: src/libaudgui/infowin.c:99
 msgid "New Age"
 msgstr "New Age"
 
-#: src/libaudgui/infowin.c:102
+#: src/libaudgui/infowin.c:100
 msgid "New Wave"
 msgstr "New Wave"
 
-#: src/libaudgui/infowin.c:103
+#: src/libaudgui/infowin.c:101
 msgid "Noise"
 msgstr "Zarata"
 
-#: src/libaudgui/infowin.c:104
+#: src/libaudgui/infowin.c:102
 msgid "Pop"
 msgstr "Pop-a"
 
-#: src/libaudgui/infowin.c:105
+#: src/libaudgui/infowin.c:103
 msgid "Punk Rock"
 msgstr "Punk Rock-a"
 
-#: src/libaudgui/infowin.c:106
+#: src/libaudgui/infowin.c:104
 msgid "Rap"
 msgstr "Rap-a"
 
-#: src/libaudgui/infowin.c:107
+#: src/libaudgui/infowin.c:105
 msgid "Reggae"
 msgstr "Reggae"
 
-#: src/libaudgui/infowin.c:108
+#: src/libaudgui/infowin.c:106
 msgid "Rock"
 msgstr "Rocka"
 
-#: src/libaudgui/infowin.c:109
-#, fuzzy
+#: src/libaudgui/infowin.c:107
 msgid "Rock and Roll"
 msgstr "Rock & Roll-a"
 
-#: src/libaudgui/infowin.c:110
+#: src/libaudgui/infowin.c:108
 msgid "Rhythm and Blues"
 msgstr ""
 
-#: src/libaudgui/infowin.c:111
+#: src/libaudgui/infowin.c:109
 msgid "Ska"
 msgstr "Ska"
 
-#: src/libaudgui/infowin.c:112
+#: src/libaudgui/infowin.c:110
 msgid "Soul"
 msgstr "Soul-a"
 
-#: src/libaudgui/infowin.c:113
+#: src/libaudgui/infowin.c:111
 msgid "Swing"
 msgstr "Swing-a"
 
-#: src/libaudgui/infowin.c:114
+#: src/libaudgui/infowin.c:112
 msgid "Techno"
 msgstr "Teknoa"
 
-#: src/libaudgui/infowin.c:115
-#, fuzzy
+#: src/libaudgui/infowin.c:113
 msgid "Trip-hop"
 msgstr "Trip-Hop-a"
 
-#: src/libaudgui/infowin.c:175 src/libaudgui/infowin.c:361
-#: src/libaudgui/infowin.c:364 src/libaudgui/infowin.c:367
+#: src/libaudgui/infowin.c:177 src/libaudgui/infowin.c:363
+#: src/libaudgui/infowin.c:366 src/libaudgui/infowin.c:369
 msgid "n/a"
 msgstr "e/e"
 
-#: src/libaudgui/infowin.c:265
+#: src/libaudgui/infowin.c:267
 msgid "Metadata updated successfully"
 msgstr "Metadatuak ongi eguneratu dira"
 
-#: src/libaudgui/infowin.c:270
+#: src/libaudgui/infowin.c:272
 msgid "Metadata updating failed"
 msgstr "Huts egin du metadatuak eguneratzean"
 
-#: src/libaudgui/infowin.c:318
+#: src/libaudgui/infowin.c:320
 msgid "Track Information"
 msgstr "Pistaren informazioa"
 
-#: src/libaudgui/infowin.c:350
+#: src/libaudgui/infowin.c:352
 msgid "Format:"
 msgstr "Formatua:"
 
-#: src/libaudgui/infowin.c:354
+#: src/libaudgui/infowin.c:356
 msgid "Quality:"
 msgstr "Kalitatea:"
 
-#: src/libaudgui/infowin.c:357
+#: src/libaudgui/infowin.c:359
 msgid "Bitrate:"
 msgstr "Bit-tasa:"
 
-#: src/libaudgui/infowin.c:387
+#: src/libaudgui/infowin.c:389
 msgid "Title"
 msgstr "Titulua"
 
-#: src/libaudgui/infowin.c:399
+#: src/libaudgui/infowin.c:401
 msgid "Artist"
 msgstr "Artista"
 
-#: src/libaudgui/infowin.c:411
+#: src/libaudgui/infowin.c:413
 msgid "Album"
 msgstr "Albuma"
 
-#: src/libaudgui/infowin.c:423
+#: src/libaudgui/infowin.c:425
 msgid "Comment"
 msgstr "Iruzkina"
 
-#: src/libaudgui/infowin.c:435
+#: src/libaudgui/infowin.c:437
 msgid "Genre"
 msgstr "Generoa"
 
-#: src/libaudgui/infowin.c:456
+#: src/libaudgui/infowin.c:458
 msgid "Year"
 msgstr "Urtea"
 
-#: src/libaudgui/infowin.c:467
+#: src/libaudgui/infowin.c:469
 msgid "Track Number"
 msgstr "Pista-zenbakia"
 
-#: src/libaudgui/infowin.c:549
+#: src/libaudgui/infowin.c:548
 #, c-format
 msgid "%d kb/s"
 msgstr "%d kb/s"
 
-#: src/libaudgui/infowin.c:579
+#: src/libaudgui/infowin.c:575
 #, c-format
 msgid "No info available for %s.\n"
 msgstr ""
 
-#: src/libaudgui/jump-to-time.c:75
+#: src/libaudgui/jump-to-time.c:72
 msgid "Jump to Time"
 msgstr "Saltatu denborara"
 
-#: src/libaudgui/jump-to-time.c:90
+#: src/libaudgui/jump-to-time.c:87
 msgid "mm:ss"
 msgstr ""
 
-#: src/libaudgui/playlists.c:39
-#, fuzzy
+#: src/libaudgui/playlists.c:33
 msgid "Export Playlist"
-msgstr "Kargatu erreprodukzio-zerrenda"
+msgstr "Erreprodukzio-zerrenda esportatu"
 
-#: src/libaudgui/playlists.c:39
-#, fuzzy
+#: src/libaudgui/playlists.c:33
 msgid "Import Playlist"
-msgstr "Kargatu erreprodukzio-zerrenda"
+msgstr "Erreprodukzio-zerrenda inportatu"
 
-#: src/libaudgui/playlists.c:71
+#: src/libaudgui/playlists.c:66
 #, c-format
 msgid "Overwrite %s?"
-msgstr ""
-
-#: src/libaudgui/ui_about.c:71
-msgid "About Audacious"
-msgstr "Audacious-i buruz"
-
-#: src/libaudgui/ui_about.c:93 src/libaudgui/ui_credits.c:122
-msgid "Credits"
-msgstr "Kredituak"
+msgstr "%s gainidatzi?"
 
-#: src/libaudgui/ui_credits.c:126
-msgid "Translators"
-msgstr "Itzultzaileak"
+#: src/libaudgui/queue-manager.c:196
+msgid "Queue Manager"
+msgstr ""
 
-#: src/libaudgui/ui_fileopener.c:108
+#: src/libaudgui/ui_fileopener.c:109
 msgid "Open Files"
 msgstr "Ireki fitxategiak"
 
-#: src/libaudgui/ui_fileopener.c:108
+#: src/libaudgui/ui_fileopener.c:109
 msgid "Add Files"
 msgstr "Gehitu fitxategiak"
 
-#: src/libaudgui/ui_fileopener.c:110
+#: src/libaudgui/ui_fileopener.c:111
 msgid "Close dialog on Open"
 msgstr "Itxi elkarrizketa-koadroa fitxategia ireki ondoren"
 
-#: src/libaudgui/ui_fileopener.c:110
+#: src/libaudgui/ui_fileopener.c:111
 msgid "Close dialog on Add"
 msgstr "Itxi elkarrizketa-koadroa fitxategia gehitu ondoren"
 
-#: src/libaudgui/ui_jumptotrack.c:133
-msgid "Un_queue"
-msgstr "_Kendu ilara"
-
-#: src/libaudgui/ui_jumptotrack.c:135 src/libaudgui/ui_jumptotrack.c:512
+#: src/libaudgui/ui_jumptotrack.c:109 src/libaudgui/ui_jumptotrack.c:117
+#: src/libaudgui/ui_jumptotrack.c:326
 msgid "_Queue"
 msgstr "_Ilara"
 
-#: src/libaudgui/ui_jumptotrack.c:399
-msgid "Jump to Track"
-msgstr "Saltatu pistara"
+#: src/libaudgui/ui_jumptotrack.c:115
+msgid "Un_queue"
+msgstr "_Kendu ilara"
+
+#: src/libaudgui/ui_jumptotrack.c:258
+msgid "Jump to Song"
+msgstr "Abesti honetara saltatu"
 
-#: src/libaudgui/ui_jumptotrack.c:442
+#: src/libaudgui/ui_jumptotrack.c:281
 msgid "Filter: "
 msgstr "Iragazkia: "
 
-#: src/libaudgui/ui_jumptotrack.c:443
+#: src/libaudgui/ui_jumptotrack.c:282
 msgid "_Filter:"
 msgstr "_Iragazkia:"
 
-#: src/libaudgui/ui_jumptotrack.c:461
+#: src/libaudgui/ui_jumptotrack.c:292
 msgid "Remember"
 msgstr "Gogoratu"
 
-#: src/libaudgui/ui_jumptotrack.c:470
-#, fuzzy
+#: src/libaudgui/ui_jumptotrack.c:299
 msgid "Clea_r"
-msgstr "Garbitu A-B"
+msgstr ""
 
-#: src/libaudgui/ui_jumptotrack.c:504
+#: src/libaudgui/ui_jumptotrack.c:319
 msgid "Close on Jump"
 msgstr "Itxi saltatzean"
 
-#: src/libaudgui/ui_playlist_manager.c:240
+#: src/libaudgui/ui_playlist_manager.c:253
 msgid "Playlist Manager"
 msgstr "Erreprodukzio-zerrendaren kudeatzailea"
 
-#: src/libaudgui/ui_playlist_manager.c:264
+#: src/libaudgui/ui_playlist_manager.c:280
 msgid "Entries"
 msgstr "Sarrerak"
 
-#: src/libaudgui/ui_playlist_manager.c:285
+#: src/libaudgui/ui_playlist_manager.c:301
 msgid "_Rename"
 msgstr "_Izena aldatu"
 
-#: src/libaudgui/ui_playlist_manager.c:309
-#, fuzzy
+#: src/libaudgui/ui_playlist_manager.c:325
 msgid "_Close dialog on activating playlist"
-msgstr "Itxi elkarrizketa-koadroa fitxategia ireki ondoren"
+msgstr ""
 
-#: src/libaudgui/ui_urlopener.c:58
+#: src/libaudgui/ui_urlopener.c:48
 msgid "Open URL"
-msgstr ""
+msgstr "Ireki URL"
 
-#: src/libaudgui/ui_urlopener.c:58
+#: src/libaudgui/ui_urlopener.c:48
 msgid "Add URL"
-msgstr ""
+msgstr "Gehitu URL"
 
 #: src/libaudgui/util.c:95
 msgid ""
@@ -1209,31 +1164,30 @@
 msgid "File is not a valid .desktop file"
 msgstr "Ez da baliozko '.desktop' fitxategia"
 
-#: src/libeggsmclient/eggdesktopfile.c:188
+#: src/libeggsmclient/eggdesktopfile.c:191
 #, c-format
 msgid "Unrecognized desktop file Version '%s'"
 msgstr "Mahaigaineko fitxategiaren '%s' bertsioa ezezaguna"
 
-#: src/libeggsmclient/eggdesktopfile.c:967
+#: src/libeggsmclient/eggdesktopfile.c:974
 #, c-format
 msgid "Starting %s"
 msgstr "%s abiarazten"
 
-#: src/libeggsmclient/eggdesktopfile.c:1108
+#: src/libeggsmclient/eggdesktopfile.c:1116
 msgid "Application does not accept documents on command line"
 msgstr "Aplikazioak ez du dokumenturik onartzen komando-lerroan"
 
-#: src/libeggsmclient/eggdesktopfile.c:1176
+#: src/libeggsmclient/eggdesktopfile.c:1184
 #, c-format
 msgid "Unrecognized launch option: %d"
 msgstr "Abiarazteko parametro ezezaguna: %d"
 
-#: src/libeggsmclient/eggdesktopfile.c:1375
+#: src/libeggsmclient/eggdesktopfile.c:1391
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
-msgstr ""
-"Ezin zaio dokumentuen URIrik eman 'Type=Link' motako mahaigaineko sarrerari"
+msgstr "Ezin zaio dokumentuen URIrik eman 'Type=Link' motako mahaigaineko sarrerari"
 
-#: src/libeggsmclient/eggdesktopfile.c:1396
+#: src/libeggsmclient/eggdesktopfile.c:1412
 msgid "Not a launchable item"
 msgstr "Ez da elementu abiarazgarria"
 
@@ -1258,1652 +1212,9 @@
 msgstr "IDa"
 
 #: src/libeggsmclient/eggsmclient.c:253
-#, fuzzy
 msgid "Session management options:"
 msgstr "Saio-kudeaketaren aukerak"
 
 #: src/libeggsmclient/eggsmclient.c:254
-#, fuzzy
 msgid "Show session management options"
 msgstr "Erakutsi saio-kudeaketaren aukerak"
-
-#~ msgid "Replay Gain"
-#~ msgstr "Irabazpena"
-
-#~ msgid "Bit Depth"
-#~ msgstr "Bit-sakonera"
-
-#~ msgid ""
-#~ "All streams will be converted to this bit depth.\n"
-#~ "This should be the max supported bit depth of\n"
-#~ "the sound card or output plugin."
-#~ msgstr ""
-#~ "Korronte guztiak bit-sakonera honetara bihurtuko dira.\n"
-#~ "Hau soinu-txartelak edo irteerako pluginak onartutako\n"
-#~ "gehienezko bit-sakonera izan beharko luke."
-
-#~ msgid "Volume Control"
-#~ msgstr "Bolumen-kontrola"
-
-#~ msgid ""
-#~ "Use software volume control. This may be useful for situations where your "
-#~ "audio system does not support controlling the playback volume."
-#~ msgstr ""
-#~ "Erabili softwarearen bolumen-kontrola. Oso erabilgarria izan daiteke "
-#~ "audioko sistemak erreprodukzioaren bolumena ezin duenean kontrolatu."
-
-#, fuzzy
-#~ msgid "Mode"
-#~ msgstr "Metadatuak"
-
-#, fuzzy
-#~ msgid "Clipping Prevention"
-#~ msgstr "Laster-leihoa"
-
-#, fuzzy
-#~ msgid "Enable clipping prevention"
-#~ msgstr "Gaitu tontorraren datuen mozketa saihestea"
-
-#~ msgid "Audio System"
-#~ msgstr "Audio-sistema"
-
-#~ msgid "Current output plugin:"
-#~ msgstr "Uneko irteerako plugina:"
-
-#~ msgid "Display all open Audacious windows"
-#~ msgstr "Bistaratu Audacious-en irekitako leiho guztiak"
-
-#~ msgid "%s: Unable to open display, exiting.\n"
-#~ msgstr "%s: ezin da pantaila ireki. Irtetzen.\n"
-
-#~ msgid "Preamp:"
-#~ msgstr "Aurre-anp:"
-
-#~ msgid "Default gain:"
-#~ msgstr "Irabazpen lehenetsia:"
-
-#~ msgid "This gain will be used if file doesn't contain Replay Gain metadata."
-#~ msgstr ""
-#~ "Irabazpen hau erabiliko da fitxategiak irabazpenaren metadaturik ez badu."
-
-#~ msgid ""
-#~ "Please remember that the most efficient way to "
-#~ "prevent signal clipping is not to use positive values above."
-#~ msgstr ""
-#~ "Gogoratu modu egokiena soinuaren mozketa saihesteko "
-#~ "balio positiborik ez erabiltzea da."
-
-#~ msgid "Replay Gain configuration"
-#~ msgstr "Irabazpenaren konfigurazioa"
-
-#~ msgid "Track gain/peak"
-#~ msgstr "Pistaren irabazpena/tontorra"
-
-#~ msgid "Album gain/peak"
-#~ msgstr "Albumaren irabazpena/tontorra"
-
-#~ msgid "Use peak value from Replay Gain info for clipping prevention"
-#~ msgstr "Erabili tontorrari buruzko irabazpeneko datuak mozketa saihesteko"
-
-#~ msgid "Classic Rock"
-#~ msgstr "Rock klasikoa"
-
-#~ msgid "Dance"
-#~ msgstr "Dance"
-
-#~ msgid "Oldies"
-#~ msgstr "Aspaldikoak"
-
-#~ msgid "Other"
-#~ msgstr "Bestelakoak"
-
-#~ msgid "R&B"
-#~ msgstr "R&B"
-
-#~ msgid "Industrial"
-#~ msgstr "Industriala"
-
-#~ msgid "Alternative"
-#~ msgstr "Alternatiboa"
-
-#~ msgid "Pranks"
-#~ msgstr "Pranks"
-
-#~ msgid "Soundtrack"
-#~ msgstr "Soinu-banda"
-
-#~ msgid "Euro-Techno"
-#~ msgstr "Euro Teknoa"
-
-#~ msgid "Vocal"
-#~ msgstr "Ahotsezkoa"
-
-#~ msgid "Jazz+Funk"
-#~ msgstr "Jazz+Funk-a"
-
-#~ msgid "Fusion"
-#~ msgstr "Fusion"
-
-#~ msgid "Trance"
-#~ msgstr "Trance"
-
-#~ msgid "Instrumental"
-#~ msgstr "Instrumentala"
-
-#~ msgid "Acid"
-#~ msgstr "Acid"
-
-#~ msgid "Game"
-#~ msgstr "Game"
-
-#~ msgid "Sound Clip"
-#~ msgstr "Soinu-klipa"
-
-#~ msgid "AlternRock"
-#~ msgstr "AlternRock"
-
-#~ msgid "Bass"
-#~ msgstr "Baxua"
-
-#~ msgid "Punk"
-#~ msgstr "Punk-a"
-
-#~ msgid "Space"
-#~ msgstr "Espazioa"
-
-#~ msgid "Meditative"
-#~ msgstr "Meditatiboa"
-
-#~ msgid "Instrumental Pop"
-#~ msgstr "Pop instrumentala"
-
-#~ msgid "Instrumental Rock"
-#~ msgstr "Rock instrumentala"
-
-#~ msgid "Ethnic"
-#~ msgstr "Etnikoa"
-
-#~ msgid "Gothic"
-#~ msgstr "Gotikoa"
-
-#~ msgid "Darkwave"
-#~ msgstr "Darkwave"
-
-#~ msgid "Techno-Industrial"
-#~ msgstr "Tekno industriala"
-
-#~ msgid "Electronic"
-#~ msgstr "Elektronikoa"
-
-#~ msgid "Pop-Folk"
-#~ msgstr "Pop-Folk-a"
-
-#~ msgid "Eurodance"
-#~ msgstr "Eurodance-a"
-
-#~ msgid "Dream"
-#~ msgstr "Dream"
-
-#~ msgid "Southern Rock"
-#~ msgstr "Hegoaldeko rocka"
-
-#~ msgid "Comedy"
-#~ msgstr "Komedia"
-
-#~ msgid "Cult"
-#~ msgstr "Kultua"
-
-#~ msgid "Top 40"
-#~ msgstr "40 onenak"
-
-#~ msgid "Christian Rap"
-#~ msgstr "Rap kristaua"
-
-#~ msgid "Pop/Funk"
-#~ msgstr "Pop/Funk-a"
-
-#~ msgid "Native American"
-#~ msgstr "Indioa"
-
-#~ msgid "Cabaret"
-#~ msgstr "Kabareta"
-
-#~ msgid "Psychedelic"
-#~ msgstr "Psikodelikoa"
-
-#~ msgid "Rave"
-#~ msgstr "Rave"
-
-#~ msgid "Showtunes"
-#~ msgstr "Showtunes"
-
-#~ msgid "Trailer"
-#~ msgstr "Aurrerakina"
-
-#~ msgid "Lo-Fi"
-#~ msgstr "Lo-Fi-a"
-
-#~ msgid "Tribal"
-#~ msgstr "Tribala"
-
-#~ msgid "Acid Punk"
-#~ msgstr "Punk azidoa"
-
-#~ msgid "Polka"
-#~ msgstr "Polka"
-
-#~ msgid "Retro"
-#~ msgstr "Retro"
-
-#~ msgid "Musical"
-#~ msgstr "Musikala"
-
-#~ msgid "Folk/Rock"
-#~ msgstr "Folk/Rock-a"
-
-#~ msgid "National Folk"
-#~ msgstr "Folk nazionala"
-
-#~ msgid "Fast-Fusion"
-#~ msgstr "Fast-Fusion"
-
-#~ msgid "Latin"
-#~ msgstr "Latinoa"
-
-#~ msgid "Revival"
-#~ msgstr "Revival"
-
-#~ msgid "Celtic"
-#~ msgstr "Zelta"
-
-#~ msgid "Avantgarde"
-#~ msgstr "Abangoardia"
-
-#~ msgid "Gothic Rock"
-#~ msgstr "Rock gotikoa"
-
-#~ msgid "Progressive Rock"
-#~ msgstr "Rock progresiboa"
-
-#~ msgid "Psychedelic Rock"
-#~ msgstr "Rock psikodelikoa"
-
-#~ msgid "Symphonic Rock"
-#~ msgstr "Rock sinfonikoa"
-
-#~ msgid "Slow Rock"
-#~ msgstr "Rock motela"
-
-#~ msgid "Big Band"
-#~ msgstr "Big Band-a"
-
-#~ msgid "Chorus"
-#~ msgstr "Abesbatzak"
-
-#~ msgid "Acoustic"
-#~ msgstr "Akustikoa"
-
-#~ msgid "Humour"
-#~ msgstr "Umorezkoa"
-
-#~ msgid "Speech"
-#~ msgstr "Hitzaldia"
-
-#~ msgid "Chanson"
-#~ msgstr "Chanson-a"
-
-#~ msgid "Opera"
-#~ msgstr "Opera"
-
-#~ msgid "Sonata"
-#~ msgstr "Sonata"
-
-#~ msgid "Symphony"
-#~ msgstr "Sinfonia"
-
-#~ msgid "Booty Bass"
-#~ msgstr "Booty Bass"
-
-#~ msgid "Primus"
-#~ msgstr "Primus"
-
-#~ msgid "Porn Groove"
-#~ msgstr "Porn Groove"
-
-#~ msgid "Satire"
-#~ msgstr "Satire"
-
-#~ msgid "Slow Jam"
-#~ msgstr "Jam motela"
-
-#~ msgid "Club"
-#~ msgstr "Club"
-
-#~ msgid "Tango"
-#~ msgstr "Tangoa"
-
-#~ msgid "Samba"
-#~ msgstr "Samba"
-
-#~ msgid "Folklore"
-#~ msgstr "Folklorea"
-
-#~ msgid "Ballad"
-#~ msgstr "Balada"
-
-#~ msgid "Power Ballad"
-#~ msgstr "Power balada"
-
-#~ msgid "Rhythmic Soul"
-#~ msgstr "Soul erritmikoa"
-
-#~ msgid "Freestyle"
-#~ msgstr "Estilo librea"
-
-#~ msgid "Duet"
-#~ msgstr "Duoa"
-
-#~ msgid "Drum Solo"
-#~ msgstr "Bateria bakarlaria"
-
-#~ msgid "A Cappella"
-#~ msgstr "A Cappella"
-
-#~ msgid "Euro-House"
-#~ msgstr "Euro House"
-
-#~ msgid "Dance Hall"
-#~ msgstr "Dance Hall"
-
-#~ msgid "Goa"
-#~ msgstr "Goa"
-
-#~ msgid "Drum & Bass"
-#~ msgstr "Drum & Bass"
-
-#~ msgid "Club-House"
-#~ msgstr "Club House"
-
-#~ msgid "Hardcore"
-#~ msgstr "Hardcore-a"
-
-#~ msgid "Terror"
-#~ msgstr "Beldurrezkoa"
-
-#~ msgid "Indie"
-#~ msgstr "Indie"
-
-#~ msgid "BritPop"
-#~ msgstr "Britainiako pop-a"
-
-#~ msgid "Negerpunk"
-#~ msgstr "Negerpunk-a"
-
-#~ msgid "Polsk Punk"
-#~ msgstr "Polsk Punk-a"
-
-#~ msgid "Beat"
-#~ msgstr "Beat"
-
-#~ msgid "Christian Gangsta Rap"
-#~ msgstr "Gangsta Rap kristaua"
-
-#~ msgid "Black Metal"
-#~ msgstr "Black Metal"
-
-#~ msgid "Crossover"
-#~ msgstr "Crossover"
-
-#~ msgid "Contemporary Christian"
-#~ msgstr "Kristau garaikidea"
-
-#~ msgid "Christian Rock"
-#~ msgstr "Rock kristaua"
-
-#~ msgid "Merengue"
-#~ msgstr "Merengea"
-
-#~ msgid "Salsa"
-#~ msgstr "Salsa"
-
-#~ msgid "Thrash Metal"
-#~ msgstr "Thrash Metal"
-
-#~ msgid "Anime"
-#~ msgstr "Anime"
-
-#~ msgid "JPop"
-#~ msgstr "JPop-a"
-
-#~ msgid "Synthpop"
-#~ msgstr "Synthpop"
-
-#, fuzzy
-#~ msgid ""
-#~ "<big>Audacious %s</big>\n"
-#~ "An audio player for many platforms.\n"
-#~ "Copyright (C) 2005-2011 Audacious Development Team"
-#~ msgstr ""
-#~ "<big>Audacious %s</big>\n"
-#~ "Hainbat plataformetarako multimedia erreproduzigailua.\n"
-#~ "\n"
-#~ "Copyright-a (C) 2005-2008 Audacious garatzeko taldea\n"
-
-#~ msgid "Unable to create log file (%s)!\n"
-#~ msgstr "Ezin da egunkari-fitxategia sortu (%s).\n"
-
-#~ msgid "Print all errors and warnings to stdout"
-#~ msgstr "Erakutsi errore eta abisu guztiak irteera estandarrean"
-
-#~ msgid "Used in macpacking"
-#~ msgstr "'Macpac'-en erabilita"
-
-#~ msgid "Sorry, threads aren't supported on your platform.\n"
-#~ msgstr "Plataforma honetan hariak ez daude onartuta.\n"
-
-#~ msgid "Module loading not supported! Plugins will not be loaded.\n"
-#~ msgstr ""
-#~ "Modulua kargatzea ez dago onartuta. Pluginak ezin izango dira kargatu.\n"
-
-#, fuzzy
-#~ msgid "Audacious - Unsupported Version Warning"
-#~ msgstr "Audacious - GTK motorra hautsita"
-
-#~ msgid "Playback"
-#~ msgstr "Erreproduzitzea"
-
-#~ msgid "Playback"
-#~ msgstr "Erreproduzitzea"
-
-#~ msgid ""
-#~ "When Audacious starts, automatically begin playing from the point where "
-#~ "we stopped before."
-#~ msgstr ""
-#~ "Audacious abiarazten denean, automatikoki hasiko da erreproduzitzen "
-#~ "aurrez gelditutako puntutik."
-
-#~ msgid "Don't advance in the playlist"
-#~ msgstr "Ez jarraitu erreprodukzio-zerrendan"
-
-#~ msgid ""
-#~ "When finished playing a song, don't automatically advance to the next."
-#~ msgstr ""
-#~ "Kantu baten erreprodukzioa amaitzean, ez jarraitu automatikoki hurrengo "
-#~ "abestiarekin."
-
-#~ msgid "Enabled"
-#~ msgstr "Gaituta"
-
-#~ msgid "Description"
-#~ msgstr "Azalpena"
-
-#~ msgid "Output Plugin Preferences"
-#~ msgstr "Irteerako pluginaren hobespenak"
-
-#~ msgid "Output Plugin Information"
-#~ msgstr "Irteerako pluginaren informazioa"
-
-#~ msgid "_Decoder list:"
-#~ msgstr "_Deskodetzaile-zerrenda:"
-
-#~ msgid "Decoders"
-#~ msgstr "Deskodetzaileak"
-
-#~ msgid "_General plugin list:"
-#~ msgstr "Plugin _orokorrak:"
-
-#~ msgid "General"
-#~ msgstr "Orokorra"
-
-#~ msgid "_Visualization plugin list:"
-#~ msgstr "_Bistaratzeko pluginak:"
-
-#~ msgid "Visualization"
-#~ msgstr "Bistaratzea"
-
-#, fuzzy
-#~ msgid "Effect plugins:"
-#~ msgstr "_Efektuen pluginak:"
-
-#~ msgid "General"
-#~ msgstr "Orokorra"
-
-#~ msgid "Location"
-#~ msgstr "Kokalekua"
-
-#~ msgid "Raw Metadata"
-#~ msgstr "Metadatu gordinak"
-
-#~ msgid "Key"
-#~ msgstr "Tekla"
-
-#~ msgid "Value"
-#~ msgstr "Balioa"
-
-#, fuzzy
-#~ msgid "Available Plugin Preferences:\n"
-#~ msgstr "Irteerako pluginaren hobespenak"
-
-#~ msgid "Add/Open URL Dialog"
-#~ msgstr "Gehitu/Ireki URLa elkarrizketa-koadroa"
-
-#~ msgid "Enter location to play:"
-#~ msgstr "Idatzi erreproduzitu beharreko kokalekua:"
-
-#~ msgid "Don't clear the playlist"
-#~ msgstr "Ez garbitu erreprodukzio-zerrenda"
-
-#~ msgid "audacious: %s"
-#~ msgstr "audacious: %s"
-
-#~ msgid "Filename:"
-#~ msgstr "Fitxategi-izena:"
-
-#~ msgid "No input plugin recognized this file"
-#~ msgstr "Fitxategi honek ez du sarrerako pluginik ezagutu"
-
-#~ msgid ""
-#~ "<big>No output plugin selected.</big>\n"
-#~ "You have not selected an output plugin."
-#~ msgstr ""
-#~ "<big>Ez da irteerako pluginik hautatu.</big>\n"
-#~ "Ez duzu irteerako pluginik hautatu."
-
-#~ msgid "Connectivity"
-#~ msgstr "Konektibitatea"
-
-#~ msgid "Best Sinc Interpolation"
-#~ msgstr "Kalitate onena"
-
-#~ msgid "Medium Sinc Interpolation"
-#~ msgstr "Tarteko kalitatea"
-
-#~ msgid "Fastest Sinc Interpolation"
-#~ msgstr "Interpolazio azkarrena"
-
-#~ msgid "ZOH Interpolation"
-#~ msgstr "ZOH interpolazioa"
-
-#~ msgid "Linear Interpolation"
-#~ msgstr "Interpolazio lineala"
-
-#~ msgid "Sampling Rate [Hz]:"
-#~ msgstr "Lagin-tasa [Hz]:"
-
-#~ msgid "Interpolation Engine:"
-#~ msgstr "Interpolazio-motorra:"
-
-#~ msgid ""
-#~ "All streams will be converted to this sampling "
-#~ "rate.\n"
-#~ "This should be the max supported sampling rate of\n"
-#~ "the sound card or output plugin."
-#~ msgstr ""
-#~ "Korronte guztiak lagin-tasa honetara bihurtuko \n"
-#~ "dira. Hau soinu-txartelak edo irteerako pluginak onartutako\n"
-#~ "gehienezko bit-sakonera izan beharko luke."
-
-#~ msgid "Detect file formats by extension."
-#~ msgstr "Detektatu fitxategi-formatuak luzapenaren arabera."
-
-#~ msgid ""
-#~ "When checked, Audacious will detect file formats based by extension. Only "
-#~ "files with extensions of supported formats will be loaded."
-#~ msgstr ""
-#~ "Aktibatuta dagoeneaz, Audacious-ek fitxategien formatuak luzapenaren "
-#~ "arabera detektatuko ditu. Onartutako formatuen luzapenak dituzten "
-#~ "fitxategiak soilik kargatuko dira."
-
-#~ msgid "Sampling Rate Converter"
-#~ msgstr "Lagin-tasa bihurtzea"
-
-#~ msgid "Enable Sampling Rate Converter"
-#~ msgstr "Gaitu lagin-tasa bihurtzea"
-
-#~ msgid "Advanced"
-#~ msgstr "Aurreratua"
-
-#~ msgid "Bypass all of signal processing if possible"
-#~ msgstr "Soinu tratamenduaren eragiketa guztiak saltatu (posible bada)"
-
-#~ msgid ""
-#~ "Try to pass input plugin's output directly to output plugin, if the "
-#~ "latter supports format produced by input plugin. If it's true, all signal "
-#~ "processing will be disabled (i.e. DSP plugins, equalizer, resampling, "
-#~ "Replay Gain and software volume control)."
-#~ msgstr ""
-#~ "Saiatu sarrerako pluginen irteera zuzenean irteerako pluginera eramaten, "
-#~ "azkenengoak sarrerako pluginak sortutako formatua onartzen badu. Egia "
-#~ "bada, soinuaren tratamenduko eragiketa guztiak desgaitu egingo dira "
-#~ "(adib. DSP plugina, ekualizadorea, birlaginketa, irabazpena eta "
-#~ "softwarearen bolumen-kontrola)."
-
-#~ msgid "Dynamically adjust scale factor to prevent clipping"
-#~ msgstr "Doitu eskala-faktorea dinamikoki mozketa saihesteko"
-
-#~ msgid "Decrease scale factor (gain) if clipping nevertheless occurred"
-#~ msgstr ""
-#~ "Gutxiagotu eskalaren faktorea (irabazpena) mozketa inoiz ez bada gertatu"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Audacious has caught signal 11 (SIGSEGV).\n"
-#~ "\n"
-#~ "We apologize for the inconvenience, but Audacious has crashed.\n"
-#~ "This is a bug in the program, and should never happen under normal "
-#~ "circumstances.\n"
-#~ "Your current configuration has been saved and should not be damaged.\n"
-#~ "\n"
-#~ "You can help improve the quality of Audacious by filing a bug at http://"
-#~ "jira.atheme.org/\n"
-#~ "Please include the entire text of this message and a description of what "
-#~ "you were doing when\n"
-#~ "this crash occured in order to quickly expedite the handling of your bug "
-#~ "report:\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Audacious-ek 11 (SIGSEGV) seinalea jaso du.\n"
-#~ "\n"
-#~ "Sentitzen dugu eragozpenak, baina Audacious kraskatu egin da.\n"
-#~ "Programaren errorea da hau, eta egoera normalean ez luke gertatu behar.\n"
-#~ "Zure uneko konfigurazioa gorde egin da, eta ez luke hondatuta egon "
-#~ "beharko.\n"
-#~ "Audacious-en kalitatea hobetzen lagun gaitzakezu. Eskertuko genizuke "
-#~ "erroreari buruzko txostena honako helbidera bidaliko bazenu:\n"
-#~ "http://bugzilla.atheme.org/\n"
-#~ "Sartu mezu honetako testu guztia eta kraskadura gertatu aurretik eman "
-#~ "dituzun urrats guztiei buruzko azalpena,\n"
-#~ "horrela errorea errazago aurkitzen lagun gaitzakezu:\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Stacktrace was unavailable. You might want to reproduce this problem "
-#~ "while running Audacious under GDB to get a proper backtrace.\n"
-#~ msgstr ""
-#~ "Aztarnaren pila ez dago erabilgarri. Agian GDB barnean Audacious "
-#~ "exekutatzea nahiko duzu arazo hau berriro sortu eta aztarna egokia "
-#~ "lortzeko.\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Bugs can be reported at http://jira.atheme.org/ against the Audacious or "
-#~ "Audacious Plugins product.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Erroreei buruzko txostenak http://bugzilla.atheme.org/ webgunera bidal "
-#~ "daitezke, Audacious edo Audacious-en pluginak produktua hautatuz.\n"
-
-#~ msgid ""
-#~ "Your signaling implementation is broken.\n"
-#~ "Expect unusable crash reports.\n"
-#~ msgstr ""
-#~ "Sinatzeko inplementazioa hondatuta dago.\n"
-#~ "Kraskadurei buruzko txostenak bidaltzeko tresna ezin izango da erabili.\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "<big>Audacious %s</big>\n"
-#~ "\n"
-#~ "Copyright (C) 2005-2009 Audacious Development Team"
-#~ msgstr ""
-#~ "<big>Audacious %s</big>\n"
-#~ "\n"
-#~ "Copyright-a (C) 2005-2008 Audacious garatzeko taldea"
-
-#~ msgid "Detect file formats on demand, instead of immediately."
-#~ msgstr ""
-#~ "Detektatu fitxategi-formatuak eskatutakoan, berehala detektatu ordez."
-
-#~ msgid ""
-#~ "When checked, Audacious will detect file formats on demand. This can "
-#~ "result in a messier playlist, but delivers a major speed benefit."
-#~ msgstr ""
-#~ "Aktibatuta dagoenean, Audacious-ek fitxategien formatuak eskatutakoan "
-#~ "detektatzen ditu. Ondorioz, metodo honek erreprodukzio-zerrendaren "
-#~ "antolaketari eragin dezaiokeen arren, askoz ere azkarragoa da."
-
-#~ msgid "Load metadata from playlists and files"
-#~ msgstr "Kargatu metadatuak erreprodukzio-zerrenda eta fitxategietatik"
-
-#~ msgid "Load metadata (tag information) from music files."
-#~ msgstr "Kargatu metadatuak (etiketa-informazioa) musika-fitxategietatik."
-
-#~ msgid "Can't jump to time when no track is being played.\n"
-#~ msgstr "Ezin da denborara saltatu pista erreproduzitzen hasi gabe.\n"
-
-#~ msgid "minutes:seconds"
-#~ msgstr "minutu:segundo"
-
-#~ msgid "Track length:"
-#~ msgstr "Pistaren luzera:"
-
-#~ msgid "Save as Static Playlist"
-#~ msgstr "Gorde erreprodukzio-zerrenda estiko gisa"
-
-#~ msgid "Use Relative Path"
-#~ msgstr "Erabili bide-izen erlatiboa"
-
-#~ msgid "Error writing playlist \"%s\": %s"
-#~ msgstr "Errorera \"%s\" erreprodukzio-zerrenda idaztean: %s"
-
-#~ msgid "%s already exist. Continue?"
-#~ msgstr "%s badago lehendik ere. Jarraitu?"
-
-#~ msgid ""
-#~ "<big>Unable to save playlist.</big>\n"
-#~ "\n"
-#~ "Unknown file type for '%s'.\n"
-#~ msgstr ""
-#~ "<big>Ezin da erreprodukzio-zerrenda gorde.</big>\n"
-#~ "\n"
-#~ "Fitxategi mota ezezaguna '%s'(e)ntzako.\n"
-
-#~ msgid "Presets"
-#~ msgstr "Aurrezarpenak"
-
-#~ msgid "Mouse"
-#~ msgstr "Sagua"
-
-#~ msgid "Pause between songs"
-#~ msgstr "Kanten arteko pausa"
-
-#~ msgid "Pause for"
-#~ msgstr "Pausarazi "
-
-#~ msgid "seconds"
-#~ msgstr "segundotan"
-
-#~ msgid "Filename"
-#~ msgstr "Fitxategi-izena"
-
-#~ msgid "Convert underscores to blanks"
-#~ msgstr "Bihurtu azpimarrak zuriune"
-
-#~ msgid "Convert %20 to blanks"
-#~ msgstr "Bihurtu %20 zuriune"
-
-#~ msgid "Convert backslash '\\' to forward slash '/'"
-#~ msgstr "Bihurtu alderantzizko barra (\\) aurrera barra (/)"
-
-#~ msgid "File Dialog"
-#~ msgstr "Fitxategia elkarrizketa-koadroa"
-
-#~ msgid "Always refresh directory when opening file dialog"
-#~ msgstr ""
-#~ "Beti freskatu direktorioa fitxategien elkarrizketa-koadroa irekitzean"
-
-#~ msgid ""
-#~ "Always refresh the file dialog (this will slow opening the dialog on "
-#~ "large directories, and Gnome VFS should handle automatically)."
-#~ msgstr ""
-#~ "Beti freskatu fitxategien elkarrizketa-koadroa (elkarrizketa-koadroaren "
-#~ "irekiera moteldu lezake direktorio handietan, eta GNOME VFS-ek kudeatu "
-#~ "beharko luke automatikoki)."
-
-#~ msgid "Changes volume by"
-#~ msgstr "Aldatu bolumena: "
-
-#~ msgid "percent"
-#~ msgstr "ehuneko"
-
-#~ msgid "Scrolls playlist by"
-#~ msgstr "Korritu erreprodukzio-zerrenda:"
-
-#~ msgid "lines"
-#~ msgstr "lerro"
-
-#~ msgid "Stop after Current Song"
-#~ msgstr "Gelditu uneko kantaren ondoren"
-
-#~ msgid "Peaks"
-#~ msgstr "Tontorrak"
-
-#~ msgid "Repeat"
-#~ msgstr "Errepikatu"
-
-#~ msgid "Shuffle"
-#~ msgstr "Ausaz"
-
-#~ msgid "No Playlist Advance"
-#~ msgstr "Erreprodukzio-zerrenda ez mugitu"
-
-#~ msgid "Play"
-#~ msgstr "Erreproduzitu"
-
-#~ msgid "Pause"
-#~ msgstr "Pausarazi"
-
-#~ msgid "Stop"
-#~ msgstr "Gelditu"
-
-#~ msgid "Previous"
-#~ msgstr "Aurrekoa"
-
-#~ msgid "Next"
-#~ msgstr "Hurrengoa"
-
-#~ msgid "Visualization Mode"
-#~ msgstr "Bistaratzeko modua"
-
-#~ msgid "Analyzer Mode"
-#~ msgstr "Analizatzailearen modua"
-
-#~ msgid "Scope Mode"
-#~ msgstr "Esparruaren modua"
-
-#~ msgid "Voiceprint Mode"
-#~ msgstr "Espektrogramaren modua"
-
-#~ msgid "WindowShade VU Mode"
-#~ msgstr "Leiho-itzalduraren VU modua"
-
-#~ msgid "Refresh Rate"
-#~ msgstr "Freskatze-maiztasuna"
-
-#~ msgid "Analyzer Falloff"
-#~ msgstr "Analizatzailearen erortzea"
-
-#~ msgid "Peaks Falloff"
-#~ msgstr "Tontorren erortzea"
-
-#~ msgid "New Playlist"
-#~ msgstr "Erreprodukzio-zerrenda berria"
-
-#~ msgid "Select Next Playlist"
-#~ msgstr "Hautatu hurrengo erreprodukzio-zerrenda"
-
-#~ msgid "Select Previous Playlist"
-#~ msgstr "Hautatu aurreko erreprodukzio-zerrenda"
-
-#~ msgid "Delete Playlist"
-#~ msgstr "Ezabatu erreprodukzio-zerrenda"
-
-#~ msgid "Load List"
-#~ msgstr "Kargatu zerrenda"
-
-#~ msgid "Loads a playlist file into the selected playlist."
-#~ msgstr ""
-#~ "Erreprodukzio-zerrendaren fitxategia hautatutako zerrendan kargatzen du."
-
-#~ msgid "Save List"
-#~ msgstr "Gorde zerrenda"
-
-#~ msgid "Saves the selected playlist."
-#~ msgstr "Hautatutako erreprodukzio-zerrenda gordetzen du."
-
-#~ msgid "Save Default List"
-#~ msgstr "Gorde zerrenda lehenetsia"
-
-#~ msgid "Saves the selected playlist to the default location."
-#~ msgstr ""
-#~ "Hautatutako erreprodukzio-zerrenda kokaleku lehenetsian gordetzen du."
-
-#~ msgid "Refresh List"
-#~ msgstr "Freskatu zerrenda"
-
-#~ msgid "Refreshes metadata associated with a playlist entry."
-#~ msgstr "Erreprodukzio-zerrenda bati dagokion metadatuak freskatzen ditu."
-
-#~ msgid "List Manager"
-#~ msgstr "Zerrenda-kudeatzailea"
-
-#~ msgid "Opens the playlist manager."
-#~ msgstr "Erreprodukzio-zerrenden kudeatzailea irekitzen du."
-
-#~ msgid "View"
-#~ msgstr "Ikusi"
-
-#~ msgid "Add Internet Address..."
-#~ msgstr "Gehitu Interneteko helbidea..."
-
-#~ msgid "Adds a remote track to the playlist."
-#~ msgstr "Urruneko pista gehitzen dio zerrendari."
-
-#~ msgid "Add Files..."
-#~ msgstr "Gehitu fitxategiak..."
-
-#~ msgid "Search and Select"
-#~ msgstr "Bilatu eta hautatu"
-
-#~ msgid ""
-#~ "Searches the playlist and selects playlist entries based on specific "
-#~ "criteria."
-#~ msgstr ""
-#~ "Erreprodukzio-zerrendan bilaketa egiten du eta irizpide baten arabera "
-#~ "zerrendako sarrerak hautatzen ditu."
-
-#~ msgid "Invert Selection"
-#~ msgstr "Alderantzikatu hautapena"
-
-#~ msgid "Inverts the selected and unselected entries."
-#~ msgstr "Hautatutako eta hautatu gabeko sarrerak alderantzikatzen ditu."
-
-#~ msgid "Select All"
-#~ msgstr "Hautatu dena"
-
-#~ msgid "Selects all of the playlist entries."
-#~ msgstr "Erreprodukzioko sarrera guztiak hautatzen ditu."
-
-#~ msgid "Select None"
-#~ msgstr "Bat ere ez hautatu"
-
-#~ msgid "Deselects all of the playlist entries."
-#~ msgstr "Erreprodukzio-zerrendako sarrera guztiak deshautatzen ditu."
-
-#~ msgid "Remove All"
-#~ msgstr "Kendu denak"
-
-#~ msgid "Removes all entries from the playlist."
-#~ msgstr "Sarrera guztiak kentzen ditu erreprodukzio-zerrendatik."
-
-#~ msgid "Clear Queue"
-#~ msgstr "Garbitu ilara"
-
-#~ msgid "Clears the queue associated with this playlist."
-#~ msgstr "Erreprodukzio-zerrendarekin elkartutako ilara garbitzen du."
-
-#~ msgid "Remove Unavailable Files"
-#~ msgstr "Kendu erabilgarri ez dauden fitxategiak"
-
-#~ msgid "Removes unavailable files from the playlist."
-#~ msgstr ""
-#~ "Erabilgarri ez dauden fitxategiak kentzen ditu erreprodukzio-zerrendatik."
-
-#~ msgid "Remove Duplicates"
-#~ msgstr "Kendu bikoiztutakoak"
-
-#~ msgid "By Title"
-#~ msgstr "Tituluaren arabera"
-
-#~ msgid "Removes duplicate entries from the playlist by title."
-#~ msgstr ""
-#~ "Bikoiztutako sarrerak erreprodukzio-zerrendatik kentzen ditu tituluaren "
-#~ "arabera."
-
-#~ msgid "By Filename"
-#~ msgstr "Fitxategi-izenaren arabera"
-
-#~ msgid "Removes duplicate entries from the playlist by filename."
-#~ msgstr ""
-#~ "Bikoiztutako sarrerak erreprodukzio-zerrendatik kentzen ditu fitxategi-"
-#~ "izenaren arabera."
-
-#~ msgid "By Path + Filename"
-#~ msgstr "Bide-izenaren arabera"
-
-#~ msgid "Removes duplicate entries from the playlist by their full path."
-#~ msgstr ""
-#~ "Bikoiztutako sarrerak erreprodukzio-zerrendatik kentzen ditu bide-izen "
-#~ "osoaren arabera."
-
-#~ msgid "Remove Unselected"
-#~ msgstr "Kendu hautatu gabekoak"
-
-#~ msgid "Remove unselected entries from the playlist."
-#~ msgstr "Hautatu gabeko sarrerak erreprodukzio-zerrendatik kentzen ditu."
-
-#~ msgid "Remove Selected"
-#~ msgstr "Kendu hautatutakoak"
-
-#~ msgid "Remove selected entries from the playlist."
-#~ msgstr "Hautatutako sarrerak erreprodukzio-zerrendatik kentzen ditu."
-
-#~ msgid "Randomize List"
-#~ msgstr "Nahastu zerrenda"
-
-#~ msgid "Randomizes the playlist."
-#~ msgstr "Erreprodukzio-zerrenda ausaz nahasten du."
-
-#~ msgid "Reverse List"
-#~ msgstr "Alderantzikatu zerrenda"
-
-#~ msgid "Reverses the playlist."
-#~ msgstr "Erreprodukzio-zerrenda alderantzikatzen du."
-
-#~ msgid "Sort List"
-#~ msgstr "Ordenatu zerrenda"
-
-#~ msgid "Sorts the list by title."
-#~ msgstr "Zerrenda ordenatzen du tituluaren arabera."
-
-#, fuzzy
-#~ msgid "By Album"
-#~ msgstr "Albuma"
-
-#, fuzzy
-#~ msgid "Sorts the list by album."
-#~ msgstr "Zerrenda ordenatzen du tituluaren arabera."
-
-#~ msgid "By Artist"
-#~ msgstr "Artistaren arabera"
-
-#~ msgid "Sorts the list by artist."
-#~ msgstr "Zerrenda ordenatzen du artistaren arabera."
-
-#~ msgid "Sorts the list by filename."
-#~ msgstr "Zerrenda ordenatzen du fitxategi-izenaren arabera."
-
-#~ msgid "Sorts the list by full pathname."
-#~ msgstr "Zerrenda ordenatzen du bide-izen osoaren arabera."
-
-#~ msgid "By Date"
-#~ msgstr "Dataren arabera"
-
-#~ msgid "Sorts the list by modification time."
-#~ msgstr "Zerrenda ordenatzen du aldatze-dataren arabera."
-
-#~ msgid "By Track Number"
-#~ msgstr "Pista-zenbakiaren arabera"
-
-#~ msgid "Sorts the list by track number."
-#~ msgstr "Zerrenda ordenatzen du pista-zenbakiaren arabera."
-
-#~ msgid "By Playlist Entry"
-#~ msgstr "Erreprodukzio-zerrendako sarreraren arabera"
-
-#~ msgid "Sorts the list by playlist entry."
-#~ msgstr "Zerrenda ordenatzen du erreprodukzio-zerrendako sarreraren arabera."
-
-#~ msgid "Sort Selected"
-#~ msgstr "Ordenatu hautatutakoak"
-
-#~ msgid "File"
-#~ msgstr "Fitxategia"
-
-#~ msgid "Help"
-#~ msgstr "Laguntza"
-
-#, fuzzy
-#~ msgid "Components"
-#~ msgstr "Iruzkina"
-
-#~ msgid "View Track Details"
-#~ msgstr "Ikusi pistaren xehetasunak"
-
-#~ msgid "Play File"
-#~ msgstr "Erreproduzitu fitxategia"
-
-#~ msgid "Load and play a file"
-#~ msgstr "Kargatu eta erreproduzitu fitxategia"
-
-#~ msgid "Play Location"
-#~ msgstr "Erreproduzitu kokalekua"
-
-#~ msgid "Play media from the selected location"
-#~ msgstr "Erreproduzitu multimedia hautatutako kokalekutik"
-
-#~ msgid "Plugin services"
-#~ msgstr "Plugin zerbitzuak"
-
-#~ msgid "Preferences"
-#~ msgstr "Hobespenak"
-
-#~ msgid "Open preferences window"
-#~ msgstr "Ireki hobespenen leihoa"
-
-#~ msgid "_Quit"
-#~ msgstr "Irte_n"
-
-#~ msgid "Quit Audacious"
-#~ msgstr "Irten Audacious-etik"
-
-#~ msgid "Set A-B"
-#~ msgstr "Ezarri A-B"
-
-#~ msgid "Clear A-B"
-#~ msgstr "Garbitu A-B"
-
-#~ msgid "Jump to Playlist Start"
-#~ msgstr "Saltatu erreprodukzio-zerrendaren hasierara"
-
-#~ msgid "Jump to File"
-#~ msgstr "Saltatu fitxategira"
-
-#~ msgid "Queue Toggle"
-#~ msgstr "Txandakatu ilara"
-
-#~ msgid "Enables/disables the entry in the playlist's queue."
-#~ msgstr "Erreprodukzio-zerrendako ilarako sarrera gaitzen/desgaitzen du."
-
-#~ msgid "Load"
-#~ msgstr "Kargatu"
-
-#~ msgid "Import"
-#~ msgstr "Inportatu"
-
-#~ msgid "Save"
-#~ msgstr "Gorde"
-
-#~ msgid "Delete"
-#~ msgstr "Ezabatu"
-
-#~ msgid "Preset"
-#~ msgstr "Aurrezarpena"
-
-#~ msgid "Load preset"
-#~ msgstr "Kargatu aurrezarpena"
-
-#~ msgid "Auto-load preset"
-#~ msgstr "Zehaztutako aurrezarpena"
-
-#~ msgid "Load auto-load preset"
-#~ msgstr "Kargatu zehaztutako aurrezarpena"
-
-#~ msgid "Default"
-#~ msgstr "Lehenetsia"
-
-#~ msgid "Load default preset into equalizer"
-#~ msgstr "Kargatu aurrezarpen lehenetsia ekualizadorean"
-
-#~ msgid "Zero"
-#~ msgstr "Zero"
-
-#~ msgid "Set equalizer preset levels to zero"
-#~ msgstr "Ezarri ekualizadorearen aurrezarpenaren maila zerora"
-
-#~ msgid "From file"
-#~ msgstr "Fitxategitik"
-
-#~ msgid "Load preset from file"
-#~ msgstr "Kargatu aurrezarpena fitxategitik"
-
-#~ msgid "From WinAMP EQF file"
-#~ msgstr "WinAMP EQF fitxategitik"
-
-#~ msgid "Load preset from WinAMP EQF file"
-#~ msgstr "Kargatu aurrezarpena WinAMP EQF fitxategitik"
-
-#~ msgid "WinAMP Presets"
-#~ msgstr "WinAMP aurrezarpenak"
-
-#~ msgid "Import WinAMP presets"
-#~ msgstr "Inportatu WinAMP aurrezarpenak"
-
-#~ msgid "Save preset"
-#~ msgstr "Gorde aurrezarpena"
-
-#~ msgid "Save auto-load preset"
-#~ msgstr "Gorde zehaztutako aurrezarpena"
-
-#~ msgid "Save default preset"
-#~ msgstr "Gorde aurrezarpen lehenetsia"
-
-#~ msgid "To file"
-#~ msgstr "Fitxategian"
-
-#~ msgid "Save preset to file"
-#~ msgstr "Gorde aurrezarpena fitxategian"
-
-#~ msgid "To WinAMP EQF file"
-#~ msgstr "WinAMP EQF fitxategian"
-
-#~ msgid "Save preset to WinAMP EQF file"
-#~ msgstr "Gorde aurrezarpena WinAMP EQF fitxategian"
-
-#~ msgid "Delete preset"
-#~ msgstr "Ezabatu aurrezarpena"
-
-#~ msgid "Delete auto-load preset"
-#~ msgstr "Ezabatu zehaztutako aurrezarpena"
-
-#~ msgid ""
-#~ "This is the amount of time to prebuffer audio "
-#~ "streams by, in milliseconds.\n"
-#~ "Increase this value if you are experiencing audio skipping.\n"
-#~ "Please note however, that high values will result in Audacious performing "
-#~ "poorly."
-#~ msgstr ""
-#~ " Audioaren korronteak aurrebufferrean edukiko den "
-#~ "denbora kopurua (milisegundotan)\n"
-#~ "Handiagotu balio hau audioan jauziak nabarmentzen badituzu.\n"
-#~ "Hala ere, jakin ezazu balio altuek Audacious-en errendimendua motelduko "
-#~ "dutela."
-
-#~ msgid "Enable headless operation"
-#~ msgstr "Gaitu 'zerbitzari' modua"
-
-#~ msgid ""
-#~ "<big>Unable to load skin.</big>\n"
-#~ "\n"
-#~ "Check that skin at '%s' is usable and default skin is properly installed "
-#~ "at '%s'\n"
-#~ msgstr ""
-#~ "<big>Ezin da azala kargatu.</big>\n"
-#~ "\n"
-#~ "Egiaztatu '%s' azala erabilgarri dagoela, eta azal lehenetsia '%s'(e)n "
-#~ "ongi instalatuta dagoela.\n"
-
-#~ msgid "Headless operation enabled\n"
-#~ msgstr "'Zerbitzari' modua gaituta\n"
-
-#~ msgid "Audacious core developers:"
-#~ msgstr "Audacious-eko garatzaile nagusiak:"
-
-#~ msgid "Audacious Equalizer"
-#~ msgstr "Audacious-en ekualizadorea"
-
-#~ msgid "Play files"
-#~ msgstr "Erreproduzitu fitxategiak"
-
-#~ msgid "Load files"
-#~ msgstr "Kargatu fitxategiak"
-
-#~ msgid "%s - Audacious"
-#~ msgstr "%s - Audacious"
-
-#~ msgid "VBR"
-#~ msgstr "VBR"
-
-#~ msgid "mono"
-#~ msgstr "monoa"
-
-#~ msgid "Audacious - visibility warning"
-#~ msgstr "Audacious - ikusgaitasunaren abisua"
-
-#~ msgid "Show main player window"
-#~ msgstr "Erakutsi erreproduzigailu nagusiaren leihoa"
-
-#~ msgid "Ignore"
-#~ msgstr "Ez ikusi egin"
-
-#~ msgid ""
-#~ "Audacious has been started with all of its windows hidden.\n"
-#~ "You may want to show the player window again to control Audacious; "
-#~ "otherwise, you'll have to control it remotely via audtool or enabled "
-#~ "plugins (such as the statusicon plugin)."
-#~ msgstr ""
-#~ "Audacious leiho guztiak ezkutatuta dituela abiarazi da.\n"
-#~ "Erreproduzigailuaren leihoa berriro bistaratzea nahiko duzu Audacious "
-#~ "kontrolatzeko. Bestela, urrunetik kontrola dezakezu audtool edo gaitutako "
-#~ "pluginak (egoerako ikonoa, edo statusicon, plugina bezalako bat) erabiliz."
-
-#~ msgid "Always ignore, show/hide is controlled remotely"
-#~ msgstr "Ez ikusi egin beti. Erakutsi/ezkutatu urrunetik kontrolatzen da"
-
-#~ msgid ""
-#~ "<big>Broken GTK engine in use</big>\n"
-#~ "\n"
-#~ "Audacious has detected that you are using a broken GTK engine.\n"
-#~ "\n"
-#~ "The theme engine you are using, %s, is incompatible with some of "
-#~ "the features used by modern skins. The incompatible features have been "
-#~ "disabled for this session.\n"
-#~ "\n"
-#~ "To use these features, please consider using a different GTK theme engine."
-#~ msgstr ""
-#~ "<big>Hautsitako GTK motorra erabiltzen</big>\n"
-#~ "\n"
-#~ "Audacious-ek hautsitako GTK motorra erabiltzen ari zarela detektatu du.\n"
-#~ "\n"
-#~ "Erabiltzen ari zaren gaiaren motorra, %s, azal modernoek "
-#~ "erabiltzen dituzten eginbide batzuekin ez dira bateragarriak. "
-#~ "Bateragarriak ez diren eginbideak desgaitu egin dira saio honetan.\n"
-#~ "\n"
-#~ "Eginbide hauek erabiltzeko, saiatu bestelako GTK gaiaren motorra "
-#~ "erabiltzen."
-
-#~ msgid "Seek to: %d:%-2.2d/%d:%-2.2d (%d%%)"
-#~ msgstr "Posizioa: %d:%-2.2d/%d:%-2.2d (%% %d)"
-
-#~ msgid "Volume: %d%%"
-#~ msgstr "Bolumena: %% %d"
-
-#~ msgid "Balance: %d%% left"
-#~ msgstr "Balantzea: %% %d ezkerrean"
-
-#~ msgid "Balance: center"
-#~ msgstr "Balantzea: erdian"
-
-#~ msgid "Balance: %d%% right"
-#~ msgstr "Balantzea: %% %d eskuinean"
-
-#~ msgid "Options Menu"
-#~ msgstr "Aukeren menua"
-
-#~ msgid "Disable 'Always On Top'"
-#~ msgstr "Desgaitu 'Beti goian'"
-
-#~ msgid "Enable 'Always On Top'"
-#~ msgstr "Gaitu 'Beti goian'"
-
-#~ msgid "File Info Box"
-#~ msgstr "Fitxategi-informazioaren laukia"
-
-#~ msgid "Disable 'GUI Scaling'"
-#~ msgstr "Desgaitu 'GUI eskalatzea'"
-
-#~ msgid "Enable 'GUI Scaling'"
-#~ msgstr "Gaitu 'GUI eskalatzea'"
-
-#~ msgid "Visualization Menu"
-#~ msgstr "Bistaratzeko menua"
-
-#~ msgid ""
-#~ "<big>Couldn't open audio.</big>\n"
-#~ "\n"
-#~ "Please check that:\n"
-#~ "1. You have the correct output plugin selected.\n"
-#~ "2. No other programs is blocking the soundcard.\n"
-#~ "3. Your soundcard is configured properly.\n"
-#~ msgstr ""
-#~ "<big>Ezin izan da audioa ireki.</big>\n"
-#~ "\n"
-#~ "Egiaztatu honakoak:\n"
-#~ "1. Irteerako plugin egokia duzula hautatuta\n"
-#~ "2. Beste programaren bat ez dela soinu-txartela blokeatzen ari.\n"
-#~ "3. Soinu-txartela behar bezala konfiguratuta dagoela\n"
-
-#~ msgid "Autoscroll Songname"
-#~ msgstr "Kanta-izenak automatikoki korritu"
-
-#~ msgid "Show Player"
-#~ msgstr "Erakutsi erreproduzigailua"
-
-#~ msgid "Show Playlist Editor"
-#~ msgstr "Erakutsi erreprodukzio-zerrendaren editorea"
-
-#~ msgid "Always on Top"
-#~ msgstr "Beti goian"
-
-#~ msgid "Put on All Workspaces"
-#~ msgstr "Jarri laneko area guztietan"
-
-#~ msgid "Roll up Player"
-#~ msgstr "Bildu erreproduzigailua"
-
-#~ msgid "Roll up Playlist Editor"
-#~ msgstr "Bildu erreprodukzio-zerrendaren editorea"
-
-#~ msgid "Roll up Equalizer"
-#~ msgstr "Bildu ekualizadorea"
-
-#~ msgid "Scale"
-#~ msgstr "Eskalatu"
-
-#~ msgid "DoubleSize"
-#~ msgstr "Tamaina bikoitza"
-
-#~ msgid "Easy Move"
-#~ msgstr "Erraz lekuz aldatu"
-
-#~ msgid "Analyzer"
-#~ msgstr "Analizatzailea"
-
-#~ msgid "Scope"
-#~ msgstr "Esparrua"
-
-#~ msgid "Voiceprint"
-#~ msgstr "Espektrograma"
-
-#~ msgid "Off"
-#~ msgstr "Desaktibatu"
-
-#~ msgid "Normal"
-#~ msgstr "Normala"
-
-#~ msgid "Fire"
-#~ msgstr "Garrak"
-
-#~ msgid "Vertical Lines"
-#~ msgstr "Marra bertikalak"
-
-#~ msgid "Lines"
-#~ msgstr "Marrak"
-
-#~ msgid "Bars"
-#~ msgstr "Barrak"
-
-#~ msgid "Dot Scope"
-#~ msgstr "Puntu-esparrua"
-
-#~ msgid "Line Scope"
-#~ msgstr "Marra-esparrua"
-
-#~ msgid "Solid Scope"
-#~ msgstr "Esparru solidoa"
-
-#~ msgid "Ice"
-#~ msgstr "Izotza"
-
-#~ msgid "Smooth"
-#~ msgstr "Leuna"
-
-#~ msgid "Full (~50 fps)"
-#~ msgstr "Osoa (~50 f/s)"
-
-#~ msgid "Half (~25 fps)"
-#~ msgstr "Erdia (~25 f/s)"
-
-#~ msgid "Quarter (~13 fps)"
-#~ msgstr "Laurdena (~13 f/s)"
-
-#~ msgid "Eighth (~6 fps)"
-#~ msgstr "Zortzirena (~6 f/s)"
-
-#~ msgid "Slowest"
-#~ msgstr "Motelena"
-
-#~ msgid "Slow"
-#~ msgstr "Motela"
-
-#~ msgid "Medium"
-#~ msgstr "Tartekoa"
-
-#~ msgid "Fast"
-#~ msgstr "Azkarra"
-
-#~ msgid "Fastest"
-#~ msgstr "Azkarrena"
-
-#~ msgid "Time Elapsed"
-#~ msgstr "Igarotako denbora"
-
-#~ msgid "Time Remaining"
-#~ msgstr "Geratzen den denbora"
-
-#~ msgid "Plugin Services"
-#~ msgstr "Plugin zerbitzuak"
-
-#~ msgid "Search entries in active playlist"
-#~ msgstr "Bilatu sarrerak erreprodukzio-zerrenda aktiboan"
-
-#~ 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 erreprodukzio-zerrendako sarrerak eremu bat edo gehiago betez. "
-#~ "Eremuek adierazpen erregularraren sintaxia erabiltzen dute. Ez badakizu "
-#~ "adierazpen erregularrak nola erabiltzen diren, bilatzea nahi duzunaren "
-#~ "zati literala idatzi."
-
-#~ msgid "Title: "
-#~ msgstr "Titulua: "
-
-#~ msgid "Artist: "
-#~ msgstr "Artista: "
-
-#~ msgid "Filename: "
-#~ msgstr "Fitxategi-izena: "
-
-#~ msgid "Clear previous selection before searching"
-#~ msgstr "Garbitu aurreko hautapena bilatu aurretik"
-
-#~ msgid "Automatically toggle queue for matching entries"
-#~ msgstr "Automatikoki txandakatu bat datozten sarreren ilara"
-
-#~ msgid "Audacious Playlist Editor"
-#~ msgstr "Audacious-en erreprodukzio-zerrendaren editorea"
-
-#~ msgid "Appearance"
-#~ msgstr "Itxura"
-
-#~ msgid "_Fonts"
-#~ msgstr "_Letra-tipoak"
-
-#~ msgid "_Player:"
-#~ msgstr "_Erreproduzigailua:"
-
-#~ msgid "Select main player window font:"
-#~ msgstr "Hautatu erreproduzigailu nagusiaren leihoaren letra-tipoa:"
-
-#~ msgid "_Playlist:"
-#~ msgstr "_Erreprodukzio-zerrenda:"
-
-#~ msgid "Select playlist font:"
-#~ msgstr "Hautatu erreprodukzio-zerrendaren letra-tipoa:"
-
-#~ msgid "Use Bitmap fonts if available"
-#~ msgstr "Erabili bit-mapa letra-tipoak erabilgarri egonez gero"
-
-#~ msgid ""
-#~ "Use bitmap fonts if they are available. Bitmap fonts do not support "
-#~ "Unicode strings."
-#~ msgstr ""
-#~ "Erabili bit-mapa motako letra-tipoak erabilgarri egonez gero. Bit-mapa "
-#~ "motako letra-tipoek ez dute Unicode motako katerik onartzen."
-
-#~ msgid "_Miscellaneous"
-#~ msgstr "_Hainbat"
-
-#~ msgid "Show track numbers in playlist"
-#~ msgstr "Erakutsi pista-zenbakia erreprodukzio-zerrendan"
-
-#~ msgid "Show separators in playlist"
-#~ msgstr "Erakutsi bereizleak erreprodukzio-zerrendan"
-
-#~ msgid "Show window manager decoration"
-#~ msgstr "Erakutsi leiho-kudeatzailearen dekorazioa"
-
-#~ msgid "This enables the window manager to show decorations for windows."
-#~ msgstr ""
-#~ "Honek leiho-kudeatzaileak leihoen dekorazioa bistaratzea gaitzen du."
-
-#~ msgid "Use XMMS-style file selector instead of the default selector"
-#~ msgstr ""
-#~ "Erabili XMMS estiloko fitxategi hautatzailea (hautatzaile lehenetsiaren "
-#~ "ordez)"
-
-#~ msgid ""
-#~ "This enables the XMMS/GTK1-style file selection dialogs. This selector is "
-#~ "provided by Audacious itself and is faster than the default GTK2 selector "
-#~ "(but sadly not as user-friendly)."
-#~ msgstr ""
-#~ "XMMS/GTK1 estiloko fitxategi-hautapenaren elkarrizketa-koadroak gaitzen "
-#~ "ditu. Hautatzaile hau Audacious berak eskaintzen du, eta GTK2 "
-#~ "hautatzailea baino azkarragoa da (tamalez piska bat zailagoa da "
-#~ "erabiltzeko)."
-
-#~ msgid "Use two-way text scroller"
-#~ msgstr "Erabili bi norantzako testu-korritzea"
-
-#~ msgid ""
-#~ "If selected, the file information text in the main window will scroll "
-#~ "back and forth. If not selected, the text will only scroll in one "
-#~ "direction."
-#~ msgstr ""
-#~ "Hautatzen bada, leiho nagusiko fitxategiaren informazioaren testua atzera "
-#~ "eta aurrera korritu daiteke. Ez bada hautatzen, testua norabide bakarrean "
-#~ "korritu daiteke."
-
-#~ msgid "Disable inline gtk theme"
-#~ msgstr "Desgaitu barneko gtk gaia"
-
-#~ msgid "Allow loading incomplete skins"
-#~ msgstr "Onartu osatu gabeko azalak kargatzea"
-
-#~ msgid ""
-#~ "If selected, audacious won't refuse loading broken skins. Use only if "
-#~ "your favourite skin doesn't work"
-#~ msgstr ""
-#~ "Hautatzen bada, Audacious-ek ezin izango du ukatu hautsitako azalak "
-#~ "kargatzea. Azal gogokoena funtzionatzen ez duenean soilik erabili aukera "
-#~ "hau."
-
-#~ msgid "On load"
-#~ msgstr "Aktibatuta kargatzean"
-
-#~ msgid "Load metadata when adding the file to the playlist or opening it"
-#~ msgstr ""
-#~ "Kargatu metadatuak fitxategia erreprodukzio-zerrendan gehitzean edo "
-#~ "irekitzean"
-
-#~ msgid "On display"
-#~ msgstr "Aktibatuta bistaratzean"
-
-#~ msgid ""
-#~ "Load metadata on demand when displaying the file in the playlist. You may "
-#~ "need to set \"Detect file formats on demand\" in Audio page for full "
-#~ "benefit."
-#~ msgstr ""
-#~ "Kargatu metadatuak eskatutakoan fitxategia erreprodukzio-zerrendan "
-#~ "bistaratzean. Audioaren ataleko \"Detektatu fitxategi-formatuak "
-#~ "eskatutakoan\" ezarri beharko duzu abantailaz baliatzeko."
-
-#~ msgid "Color Adjustment"
-#~ msgstr "Kolore-doikuntza"
-
-#~ msgid ""
-#~ "Audacious allows you to alter the color balance of the skinned UI. The "
-#~ "sliders below will allow you to do this."
-#~ msgstr ""
-#~ "Audacious-ek interfazearen kolore-balantzea aldatzea utziko dizu. Azpiko "
-#~ "graduatzaileek baimenduko zaituzte hori egitea."
-
-#~ msgid "Blue"
-#~ msgstr "Urdina"
-
-#~ msgid "Green"
-#~ msgstr "Berdea"
-
-#~ msgid "Red"
-#~ msgstr "Gorria"
-
-#~ msgid "_Skin"
-#~ msgstr "_Azala"
-
-#~ msgid "Refresh skin list"
-#~ msgstr "Freskatu azalen zerrenda"
-
-#~ msgid "PREAMP"
-#~ msgstr "AURRE-ANP"
-
-#~ msgid "60HZ"
-#~ msgstr "60Hz"
-
-#~ msgid "170HZ"
-#~ msgstr "170Hz"
-
-#~ msgid "310HZ"
-#~ msgstr "310Hz"
-
-#~ msgid "600HZ"
-#~ msgstr "600Hz"
-
-#~ msgid "1KHZ"
-#~ msgstr "1KHz"
-
-#~ msgid "3KHZ"
-#~ msgstr "3KHz"
-
-#~ msgid "6KHZ"
-#~ msgstr "6KHz"
-
-#~ msgid "12KHZ"
-#~ msgstr "12KHz"
-
-#~ msgid "14KHZ"
-#~ msgstr "14KHz"
-
-#~ msgid "16KHZ"
-#~ msgstr "16KHz"
-
-#~ msgid "Archived Winamp 2.x skin"
-#~ msgstr "Konprimitutako Winamp 2.x azala"
-
-#~ msgid "Unarchived Winamp 2.x skin"
-#~ msgstr "Konprimitu gabeko Winamp 2.x azala"

audacious-3.1.1.tar.bz2/po/fi.po -> audacious-3.2.4.tar.bz2/po/fi.po Changed

@@ -1,285 +1,295 @@
-# fi Finnish translation
-# Audacious Media Player Finnish translation
-# Copyright (C) 2008 Free Software Foundation, Inc.
-# This file is distributed under the same license as Audacious Media Player.
-# Pauli Virtanen <pauli.virtanen@hut.fi>, 2004.
-# Matti Hämäläinen, 2008.
+# Finnish translation for Audacious
+# Copyright (C) Audacious translators
+# This file is distributed under the same license as the Audacious package.
+
+# Translators:
 # Elias Julkunen <elias.julkunen@gmail.com>, 2011.
+# Matti Hämäläinen, 2008.
+# Pauli Virtanen <pauli.virtanen@hut.fi>, 2004.
+# Tuomas Lähteenmäki <lahtis@gmail.com>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: fi\n"
-"Report-Msgid-Bugs-To: http://jira.atheme.org/\n"
-"POT-Creation-Date: 2011-07-05 22:45+0200\n"
-"PO-Revision-Date: 2011-05-23 23:13+0100\n"
-"Last-Translator: Elias Julkunen <elias.julkunen@gmail.com>\n"
-"Language-Team: Finnish <fi@li.org>\n"
-"Language: fi\n"
+"Project-Id-Version: Audacious\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2012-01-11 08:54-0500\n"
+"PO-Revision-Date: 2012-01-29 22:35+0000\n"
+"Last-Translator: Tuomas Lähteenmäki <lahtis@gmail.com>\n"
+"Language-Team: Finnish\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"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/audacious/adder.c:71
+#: src/audacious/adder.c:77
 msgid "Searching ..."
 msgstr "Etsitään..."
 
-#: src/audacious/adder.c:99
+#: src/audacious/adder.c:113
 #, c-format
 msgid "%d file found"
 msgid_plural "%d files found"
 msgstr[0] "%d tiedosto löytyi"
 msgstr[1] "%d tiedostoa löytyi"
 
-#: src/audacious/chardet.c:37
+#: src/audacious/chardet.c:39
 msgid " (invalid UTF-8)"
 msgstr " (virheellinen UTF-8)"
 
-#: src/audacious/credits.c:35
+#: src/audacious/credits.c:37
 msgid "Core developers:"
 msgstr "Pääkehittäjät:"
 
-#: src/audacious/credits.c:49
+#: src/audacious/credits.c:51
 msgid "Graphics:"
 msgstr "Grafiikat:"
 
-#: src/audacious/credits.c:54
+#: src/audacious/credits.c:56
 msgid "Default skin:"
 msgstr "Oletusteema:"
 
-#: src/audacious/credits.c:60
+#: src/audacious/credits.c:62
 msgid "Plugin development:"
 msgstr "Liitännäisten kehitys:"
 
-#: src/audacious/credits.c:83
+#: src/audacious/credits.c:85
 msgid "Patch authors:"
 msgstr "Paikkojen tekijät:"
 
-#: src/audacious/credits.c:126
+#: src/audacious/credits.c:131
 msgid "1.x developers:"
 msgstr "1.x-version kehittäjät:"
 
-#: src/audacious/credits.c:148
+#: src/audacious/credits.c:153
 msgid "BMP Developers:"
 msgstr "BMP:n kehittäjät:"
 
-#: src/audacious/credits.c:180
+#: src/audacious/credits.c:185
 msgid "Belarusian:"
 msgstr "valko-venäjä:"
 
-#: src/audacious/credits.c:183
+#: src/audacious/credits.c:188
 msgid "Basque:"
 msgstr "baski:"
 
-#: src/audacious/credits.c:186
+#: src/audacious/credits.c:191
 msgid "Brazilian Portuguese:"
 msgstr "portugali (Brasilia):"
 
-#: src/audacious/credits.c:190
+#: src/audacious/credits.c:196
 msgid "Breton:"
 msgstr "bretoni:"
 
-#: src/audacious/credits.c:193
+#: src/audacious/credits.c:199
 msgid "Bulgarian:"
 msgstr "bulgaria:"
 
-#: src/audacious/credits.c:196
+#: src/audacious/credits.c:202
 msgid "Catalan:"
 msgstr "katalaani:"
 
-#: src/audacious/credits.c:199
+#: src/audacious/credits.c:206
 msgid "Chinese:"
 msgstr "kiina:"
 
-#: src/audacious/credits.c:202
+#: src/audacious/credits.c:209
 msgid "Croatian:"
 msgstr "kroatia:"
 
-#: src/audacious/credits.c:205
+#: src/audacious/credits.c:212
 msgid "Czech:"
 msgstr "tšekki:"
 
-#: src/audacious/credits.c:208
+#: src/audacious/credits.c:215
 msgid "Dutch:"
 msgstr "hollanti:"
 
-#: src/audacious/credits.c:212
+#: src/audacious/credits.c:219
 msgid "Estonian:"
 msgstr "eesti:"
 
-#: src/audacious/credits.c:215
+#: src/audacious/credits.c:222
 msgid "Finnish:"
 msgstr "suomi:"
 
-#: src/audacious/credits.c:220
+#: src/audacious/credits.c:227
 msgid "French:"
 msgstr "ranska:"
 
-#: src/audacious/credits.c:226
+#: src/audacious/credits.c:233
 msgid "German:"
 msgstr "saksa:"
 
-#: src/audacious/credits.c:233
+#: src/audacious/credits.c:240
 msgid "Georgian:"
 msgstr "georgia:"
 
-#: src/audacious/credits.c:236
+#: src/audacious/credits.c:243
 msgid "Greek:"
 msgstr "kreikka:"
 
-#: src/audacious/credits.c:241
+#: src/audacious/credits.c:248
 msgid "Hindi:"
 msgstr "hindi:"
 
-#: src/audacious/credits.c:244
+#: src/audacious/credits.c:251
 msgid "Hungarian:"
 msgstr "unkari:"
 
-#: src/audacious/credits.c:248
+#: src/audacious/credits.c:255
 msgid "Italian:"
 msgstr "italia:"
 
-#: src/audacious/credits.c:252
+#: src/audacious/credits.c:260
 msgid "Japanese:"
 msgstr "japani:"
 
-#: src/audacious/credits.c:255
+#: src/audacious/credits.c:263
 msgid "Korean:"
 msgstr "korea:"
 
-#: src/audacious/credits.c:258
+#: src/audacious/credits.c:266
 msgid "Latvian:"
 msgstr "latvia:"
 
-#: src/audacious/credits.c:261
+#: src/audacious/credits.c:269
 msgid "Lithuanian:"
 msgstr "liettua:"
 
-#: src/audacious/credits.c:265
+#: src/audacious/credits.c:274
 msgid "Macedonian:"
 msgstr "makedonia:"
 
-#: src/audacious/credits.c:268
+#: src/audacious/credits.c:277
+msgid "Mexican Spanish:"
+msgstr ""
+
+#: src/audacious/credits.c:280
 msgid "Polish:"
 msgstr "puola:"
 
-#: src/audacious/credits.c:274
+#: src/audacious/credits.c:287
 msgid "Portuguese:"
 msgstr "portugali:"
 
-#: src/audacious/credits.c:277
+#: src/audacious/credits.c:290
 msgid "Romanian:"
 msgstr "romania:"
 
-#: src/audacious/credits.c:281
+#: src/audacious/credits.c:294
 msgid "Russian:"
 msgstr "venäjä:"
 
-#: src/audacious/credits.c:285
+#: src/audacious/credits.c:298
 msgid "Serbian (Latin):"
 msgstr "serbia (latin):"
 
-#: src/audacious/credits.c:288
+#: src/audacious/credits.c:301
 msgid "Serbian (Cyrillic):"
 msgstr "serbia (kyrillinen):"
 
-#: src/audacious/credits.c:291
+#: src/audacious/credits.c:305
 msgid "Simplified Chinese:"
 msgstr "yksinkertaistettu kiina:"
 
-#: src/audacious/credits.c:294
+#: src/audacious/credits.c:308
 msgid "Slovak:"
 msgstr "slovakki:"
 
-#: src/audacious/credits.c:297
+#: src/audacious/credits.c:312
 msgid "Spanish:"
 msgstr "espanja:"
 
-#: src/audacious/credits.c:304
+#: src/audacious/credits.c:320
 msgid "Swedish:"
 msgstr "ruotsi:"
 
-#: src/audacious/credits.c:307
+#: src/audacious/credits.c:323
 msgid "Traditional Chinese:"
 msgstr "perinteinen kiina:"
 
-#: src/audacious/credits.c:312
+#: src/audacious/credits.c:329
 msgid "Turkish:"
 msgstr "turkki:"
 
-#: src/audacious/credits.c:316
+#: src/audacious/credits.c:333
 msgid "Ukrainian:"
 msgstr "ukraina:"
 
-#: src/audacious/credits.c:319
+#: src/audacious/credits.c:338
+msgid "Vietnamese:"
+msgstr "vietnami"
+
+#: src/audacious/credits.c:341
 msgid "Welsh:"
 msgstr "kymri:"
 
-#: src/audacious/drct.c:256
-msgid "Temporary Playlist"
-msgstr "Tilapäinen soittolista"
-
-#: src/audacious/equalizer_preset.c:186
+#: src/audacious/equalizer_preset.c:180
 #, c-format
 msgid "Error importing Winamp EQF file '%s'"
 msgstr "Virhe luettaessa Winamp EQF -tiedostoa '%s'"
 
-#: src/audacious/main.c:256
+#: src/audacious/main.c:243
 msgid "Skip backwards in playlist"
 msgstr "Siirry taaksepäin soittolistassa"
 
-#: src/audacious/main.c:257
+#: src/audacious/main.c:244
 msgid "Start playing current playlist"
 msgstr "Soita nykyistä soittolistaa"
 
-#: src/audacious/main.c:258
+#: src/audacious/main.c:245
 msgid "Pause current song"
 msgstr "Keskeytä nykyinen kappale"
 
-#: src/audacious/main.c:259
+#: src/audacious/main.c:246
 msgid "Stop current song"
 msgstr "Pysäytä nykyinen kappale"
 
-#: src/audacious/main.c:260
+#: src/audacious/main.c:247
 msgid "Pause if playing, play otherwise"
 msgstr "Keskeytä jos kappale soi, muuten jatka soittamista"
 
-#: src/audacious/main.c:261
+#: src/audacious/main.c:248
 msgid "Skip forward in playlist"
 msgstr "Siirry eteenpäin soittolistassa"
 
-#: src/audacious/main.c:262
+#: src/audacious/main.c:249
 msgid "Display Jump to File dialog"
 msgstr "Näytä Siirry tiedostoon -valintaikkuna"
 
-#: src/audacious/main.c:263
+#: src/audacious/main.c:250
 msgid "Add files to the playlist"
 msgstr "Lisää tiedostoja soittolistaan"
 
-#: src/audacious/main.c:264
+#: src/audacious/main.c:251
 msgid "Add new files to a temporary playlist"
 msgstr "Lisää uusia tiedostoja väliaikaiseen soittolistaan"
 
-#: src/audacious/main.c:265
+#: src/audacious/main.c:252
 msgid "Display the main window"
 msgstr "Näytä pääikkuna"
 
-#: src/audacious/main.c:266
+#: src/audacious/main.c:253
 msgid "Show version"
 msgstr "Näytä versio"
 
-#: src/audacious/main.c:267
+#: src/audacious/main.c:254
 msgid "Print debugging messages"
 msgstr "Näytä virheenjäljitysviestit"
 
-#: src/audacious/main.c:268
+#: src/audacious/main.c:255
+msgid "Headless mode (beta)"
+msgstr ""
+
+#: src/audacious/main.c:256
 msgid "FILE..."
 msgstr "TIEDOSTO..."
 
-#: src/audacious/main.c:280
+#: src/audacious/main.c:268
 msgid "- play multimedia files"
 msgstr "- soita multimediatiedostoja"
 
-#: src/audacious/main.c:290
+#: src/audacious/main.c:278
 #, c-format
 msgid ""
 "%s: %s\n"
@@ -288,304 +298,308 @@
 "%s: %s\n"
 "Kokeile `%s --help' saadaksesi lisätietoja.\n"
 
-#: src/audacious/main.c:407
-msgid ""
-"Audacious seems to be already running but is not responding. You can start "
-"another instance of the program, but please be warned that this can cause "
-"data loss. If Audacious is not running, you can safely ignore this "
-"message. Press OK to start Audacious or Cancel to quit."
-msgstr ""
-"Audacious näyttää olevan jo käynnissä, mutta se ei vastaa. Voit käynnistää "
-"toisen instanssin ohjelmasta, mutta tämä voi aiheuttaa tietojen katoamista. "
-"Jos Audacious ei ole käynnissä, voit turvallisesti ohittaa tämän viestin. "
-"Napsauta OK käynnistääksesi Audaciouksen tai Peruuta poistuaksesi."
-
-#: src/audacious/main.c:572
+#: src/audacious/main.c:573
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/audacious/playback.c:381
+#: src/audacious/playback.c:307
 #, c-format
 msgid "No decoder found for %s."
 msgstr "Purkajaa ei löytynyt tiedostomuodolle %s."
 
-#: src/audacious/playback.c:531
-msgid "Buffering ..."
-msgstr "Puskuroidaan..."
+#: src/audacious/playlist-files.c:53
+#, c-format
+msgid "Cannot %s %s: unsupported file extension."
+msgstr ""
+
+#: src/audacious/playlist-files.c:54
+msgid "save"
+msgstr "tallenna"
+
+#: src/audacious/playlist-files.c:54
+msgid "load"
+msgstr "lataa"
 
-#: src/audacious/playlist-new.c:303
-msgid "Untitled Playlist"
-msgstr "Nimetön soittolista"
+#: src/audacious/playlist-new.c:131
+msgid "New Playlist"
+msgstr "Uusi soittolista"
 
-#: src/audacious/ui_preferences.c:87
+#: src/audacious/playlist-new.c:132
+msgid "Now Playing"
+msgstr "Soi nyt"
+
+#: src/audacious/playlist-new.c:1630
+msgid ""
+"The playlist cannot be sorted because metadata scanning is still in progress"
+" (or has been disabled)."
+msgstr ""
+
+#: src/audacious/ui_preferences.c:85
 msgid "Audio"
 msgstr "Ääni"
 
-#: src/audacious/ui_preferences.c:88
+#: src/audacious/ui_preferences.c:86
 msgid "Network"
 msgstr "Verkko"
 
-#: src/audacious/ui_preferences.c:89 src/audacious/ui_preferences.c:1556
+#: src/audacious/ui_preferences.c:87 src/audacious/ui_preferences.c:1603
 msgid "Playlist"
 msgstr "Soittolista"
 
-#: src/audacious/ui_preferences.c:90
+#: src/audacious/ui_preferences.c:88
 msgid "Plugins"
 msgstr "Liitännäiset"
 
-#: src/audacious/ui_preferences.c:96 src/libaudgui/infopopup.c:204
+#: src/audacious/ui_preferences.c:94 src/libaudgui/infopopup.c:199
 msgid "Artist"
 msgstr "Esittäjä"
 
-#: src/audacious/ui_preferences.c:97 src/libaudgui/infopopup.c:206
+#: src/audacious/ui_preferences.c:95 src/libaudgui/infopopup.c:201
 msgid "Album"
 msgstr "Albumi"
 
-#: src/audacious/ui_preferences.c:98 src/libaudgui/infopopup.c:202
-#: src/libaudgui/ui_playlist_manager.c:263
+#: src/audacious/ui_preferences.c:96 src/libaudgui/infopopup.c:197
+#: src/libaudgui/ui_playlist_manager.c:279
 msgid "Title"
 msgstr "Nimi"
 
-#: src/audacious/ui_preferences.c:99
+#: src/audacious/ui_preferences.c:97
 msgid "Tracknumber"
 msgstr "Kappalenumero"
 
-#: src/audacious/ui_preferences.c:100 src/libaudgui/infopopup.c:208
+#: src/audacious/ui_preferences.c:98 src/libaudgui/infopopup.c:203
 msgid "Genre"
 msgstr "Tyylilaji"
 
-#: src/audacious/ui_preferences.c:101
+#: src/audacious/ui_preferences.c:99
 msgid "Filename"
 msgstr "Tiedostonimi"
 
-#: src/audacious/ui_preferences.c:102
+#: src/audacious/ui_preferences.c:100
 msgid "Filepath"
 msgstr "Tiedostopolku"
 
-#: src/audacious/ui_preferences.c:103
+#: src/audacious/ui_preferences.c:101
 msgid "Date"
 msgstr "Päiväys"
 
-#: src/audacious/ui_preferences.c:104 src/libaudgui/infopopup.c:210
+#: src/audacious/ui_preferences.c:102 src/libaudgui/infopopup.c:205
 msgid "Year"
 msgstr "Vuosi"
 
-#: src/audacious/ui_preferences.c:105
+#: src/audacious/ui_preferences.c:103
 msgid "Comment"
 msgstr "Kommentti"
 
-#: src/audacious/ui_preferences.c:106
+#: src/audacious/ui_preferences.c:104
 msgid "Codec"
 msgstr "Koodekki"
 
-#: src/audacious/ui_preferences.c:107
+#: src/audacious/ui_preferences.c:105
 msgid "Quality"
 msgstr "Laatu"
 
-#: src/audacious/ui_preferences.c:112
+#: src/audacious/ui_preferences.c:111
 msgid "None"
 msgstr "Ei mikään"
 
+#: src/audacious/ui_preferences.c:112
+msgid "Arabic"
+msgstr "Arabia"
+
 #: src/audacious/ui_preferences.c:113
-msgid "Japanese"
-msgstr "Japani"
+msgid "Baltic"
+msgstr "Balttia"
 
 #: src/audacious/ui_preferences.c:114
-msgid "Taiwanese"
-msgstr "Taiwan"
-
-#: src/audacious/ui_preferences.c:115
 msgid "Chinese"
 msgstr "Kiina"
 
-#: src/audacious/ui_preferences.c:116
-msgid "Korean"
-msgstr "Korea"
-
-#: src/audacious/ui_preferences.c:117
-msgid "Russian"
-msgstr "Venäjä"
-
-#: src/audacious/ui_preferences.c:118
+#: src/audacious/ui_preferences.c:115
 msgid "Greek"
 msgstr "Kreikka"
 
-#: src/audacious/ui_preferences.c:119
+#: src/audacious/ui_preferences.c:116
 msgid "Hebrew"
 msgstr "Heprea"
 
-#: src/audacious/ui_preferences.c:120
-msgid "Turkish"
-msgstr "Turkki"
+#: src/audacious/ui_preferences.c:117
+msgid "Japanese"
+msgstr "Japani"
 
-#: src/audacious/ui_preferences.c:121
-msgid "Arabic"
-msgstr "Arabia"
+#: src/audacious/ui_preferences.c:118
+msgid "Korean"
+msgstr "Korea"
 
-#: src/audacious/ui_preferences.c:122
+#: src/audacious/ui_preferences.c:119
 msgid "Polish"
 msgstr "Puola"
 
-#: src/audacious/ui_preferences.c:123
-msgid "Baltic"
-msgstr "balttia"
+#: src/audacious/ui_preferences.c:120
+msgid "Russian"
+msgstr "Venäjä"
 
-#: src/audacious/ui_preferences.c:124
-msgid "Universal"
-msgstr "Yleismaailmallinen"
+#: src/audacious/ui_preferences.c:121
+msgid "Taiwanese"
+msgstr "Taiwan"
 
-#: src/audacious/ui_preferences.c:146
-msgid "Single track mode"
-msgstr "Yksittäinen kappale -tila"
+#: src/audacious/ui_preferences.c:122
+msgid "Turkish"
+msgstr "Turkki"
 
-#: src/audacious/ui_preferences.c:147
+#: src/audacious/ui_preferences.c:144
 msgid "Album mode"
 msgstr "Albumitila"
 
-#: src/audacious/ui_preferences.c:150
+#: src/audacious/ui_preferences.c:147
 msgid "Output Settings"
-msgstr ""
+msgstr "Ulostulo asetukset"
 
-#: src/audacious/ui_preferences.c:152
-#, fuzzy
+#: src/audacious/ui_preferences.c:149
 msgid "Bit depth:"
-msgstr "Ulostulon bittisyvyys:"
+msgstr ""
 
-#: src/audacious/ui_preferences.c:155
+#: src/audacious/ui_preferences.c:152
 msgid "Buffer size:"
 msgstr "Puskurin koko:"
 
-#: src/audacious/ui_preferences.c:157
+#: src/audacious/ui_preferences.c:154
 msgid "ms"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:158
-#, fuzzy
+#: src/audacious/ui_preferences.c:155
 msgid "Use software volume control (not recommended)"
-msgstr "Käytä ohjelmapohjaista äänenvoimakkuuden hallintaa"
+msgstr ""
 
-#: src/audacious/ui_preferences.c:160
+#: src/audacious/ui_preferences.c:157
 msgid "Replay Gain"
-msgstr "Replay Gain"
+msgstr ""
 
-#: src/audacious/ui_preferences.c:161
+#: src/audacious/ui_preferences.c:158
 msgid "Enable Replay Gain"
 msgstr "Käytä Replay Gainia"
 
-#: src/audacious/ui_preferences.c:164
+#: src/audacious/ui_preferences.c:161
 msgid "Prevent clipping (recommended)"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:166
+#: src/audacious/ui_preferences.c:163
 msgid "Adjust Levels"
 msgstr "Säädä tasoja"
 
-#: src/audacious/ui_preferences.c:167
+#: src/audacious/ui_preferences.c:164
 msgid "Amplify all files:"
 msgstr "Vahvista kaikki tiedostot:"
 
-#: src/audacious/ui_preferences.c:169 src/audacious/ui_preferences.c:172
+#: src/audacious/ui_preferences.c:166 src/audacious/ui_preferences.c:169
 msgid "dB"
 msgstr "dB"
 
-#: src/audacious/ui_preferences.c:170
+#: src/audacious/ui_preferences.c:167
 msgid "Amplify untagged files:"
 msgstr "Vahvista luokittelemattomat tiedostot:"
 
-#: src/audacious/ui_preferences.c:175
+#: src/audacious/ui_preferences.c:172
 msgid "Proxy hostname:"
 msgstr "Välityspalvelimen osoite:"
 
-#: src/audacious/ui_preferences.c:176
+#: src/audacious/ui_preferences.c:173
 msgid "Proxy port:"
 msgstr "Välityspalvelimen portti:"
 
-#: src/audacious/ui_preferences.c:179
+#: src/audacious/ui_preferences.c:176
 msgid "Proxy username:"
 msgstr "Välityspalvelimen käyttäjätunnus:"
 
-#: src/audacious/ui_preferences.c:180
+#: src/audacious/ui_preferences.c:177
 msgid "Proxy password:"
 msgstr "Välityspalvelimen salasana:"
 
-#: src/audacious/ui_preferences.c:184
+#: src/audacious/ui_preferences.c:181
 msgid "Proxy Configuration"
 msgstr "Välityspalvelinasetukset"
 
-#: src/audacious/ui_preferences.c:185
+#: src/audacious/ui_preferences.c:182
 msgid "Enable proxy usage"
 msgstr "Käytä välityspalvelinta"
 
-#: src/audacious/ui_preferences.c:187
+#: src/audacious/ui_preferences.c:185
 msgid "Use authentication with proxy"
 msgstr "Käytä tunnistautumista välityspalvelimen kanssa"
 
-#: src/audacious/ui_preferences.c:189
-msgid ""
-"Changing these settings will require a restart of "
-"Audacious."
-msgstr ""
-"Näiden asetusten muuttaminen vaatii Audaciouksen "
-"uudelleenkäynnistyksen."
-
 #: src/audacious/ui_preferences.c:193
 msgid "Auto character encoding detector for:"
 msgstr "Automaattinen merkistökoodauksen tunnistus:"
 
-#: src/audacious/ui_preferences.c:201
+#: src/audacious/ui_preferences.c:198
 msgid "Fallback character encodings:"
 msgstr "Toissijaiset merkistökoodaukset:"
 
-#: src/audacious/ui_preferences.c:201
-msgid ""
-"List of character encodings used for fall back conversion of metadata. If "
-"automatic character encoding detector failed or has been disabled, encodings "
-"in this list would be treated as candidates of the encoding of metadata, and "
-"fall back conversion from these encodings to UTF-8 would be attempted."
-msgstr ""
-"Luettelo metatietojen muuttamiseen käytettävistä toissijaisista "
-"merkistökoodauksista. Jos automaattinen merkistökoodauksen tunnistus "
-"epäonnistuu tai se on pois käytöstä, tämän luettelon koodauksia pidetään "
-"ehdokkaina metatietojen koodauksille, ja muuntoa näistä koodauksista UTF-8-"
-"koodaukseen yritetään."
-
-#: src/audacious/ui_preferences.c:205
+#: src/audacious/ui_preferences.c:202
 msgid "Behavior"
 msgstr "Käytös"
 
-#: src/audacious/ui_preferences.c:206
+#: src/audacious/ui_preferences.c:203
 msgid "Continue playback on startup"
 msgstr "Jatka soittoa käynnistettäessä"
 
-#: src/audacious/ui_preferences.c:208
+#: src/audacious/ui_preferences.c:205
 msgid "Advance when the current song is deleted"
 msgstr "Jatka, kun nykyinen kappale on poistettu"
 
-#: src/audacious/ui_preferences.c:210
+#: src/audacious/ui_preferences.c:207
 msgid "Clear the playlist when opening files"
 msgstr "Tyhjennä soittolista avattaessa tiedostoja"
 
-#: src/audacious/ui_preferences.c:212
+#: src/audacious/ui_preferences.c:209
 msgid "Open files in a temporary playlist"
 msgstr "Avaa tiedostot väliaikaisessa soittolistassa"
 
-#: src/audacious/ui_preferences.c:214
+#: src/audacious/ui_preferences.c:211
 msgid "Metadata"
 msgstr "Metatiedot"
 
-#: src/audacious/ui_preferences.c:454
+#: src/audacious/ui_preferences.c:212
+msgid "Do not load metadata for songs until played"
+msgstr "Älä lataa metatietoja kun kappaletta soitetaan"
+
+#: src/audacious/ui_preferences.c:230
+msgid "TITLE"
+msgstr "NIMI"
+
+#: src/audacious/ui_preferences.c:231
+msgid "ARTIST - TITLE"
+msgstr "ARTISTI - NIMI"
+
+#: src/audacious/ui_preferences.c:232
+msgid "ARTIST - ALBUM - TITLE"
+msgstr "ARTISTI - ALBUMI - NIMI"
+
+#: src/audacious/ui_preferences.c:233
+msgid "ARTIST - ALBUM - TRACK. TITLE"
+msgstr "ARTISTI - ALBUMI - KAPPALENUMERO. NIMI"
+
+#: src/audacious/ui_preferences.c:234
+msgid "ARTIST [ ALBUM ] - TRACK. TITLE"
+msgstr "ARTISTI [ ALBUMI ] - KAPPALENUMERO. NIMI"
+
+#: src/audacious/ui_preferences.c:235
+msgid "ALBUM - TITLE"
+msgstr "ALBUMI - NIMI"
+
+#: src/audacious/ui_preferences.c:556
 msgid "Category"
 msgstr "Luokka"
 
-#: src/audacious/ui_preferences.c:682
+#: src/audacious/ui_preferences.c:780
 msgid "Popup Information Settings"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:691
+#: src/audacious/ui_preferences.c:789
 msgid "Cover image retrieve"
 msgstr "Kansikuvien haku"
 
-#: src/audacious/ui_preferences.c:696
+#: src/audacious/ui_preferences.c:794
 msgid ""
 "While searching for the album's cover, Audacious looks for certain words in "
 "the filename. You can specify those words in the lists below, separated "
@@ -595,167 +609,159 @@
 "tiedostonnimessä. Voit määritellä nämä sanat alla olevissa luetteloissa "
 "pilkuilla erotettuina."
 
-#: src/audacious/ui_preferences.c:713
+#: src/audacious/ui_preferences.c:811
 msgid "Exclude:"
 msgstr "Jätä huomiotta:"
 
-#: src/audacious/ui_preferences.c:720
+#: src/audacious/ui_preferences.c:818
 msgid "Include:"
-msgstr "Siällytä:"
+msgstr "Sisällytä:"
 
-#: src/audacious/ui_preferences.c:737
+#: src/audacious/ui_preferences.c:835
 msgid "Recursively search for cover"
 msgstr "Etsi albumin kansikuvaa rekursiivisesti"
 
-#: src/audacious/ui_preferences.c:747
+#: src/audacious/ui_preferences.c:845
 msgid "Search depth: "
 msgstr "Haun syvyys: "
 
-#: src/audacious/ui_preferences.c:761
+#: src/audacious/ui_preferences.c:859
 msgid "Use per-file cover"
 msgstr "Käytä kansikuvia yksittäisille tiedostoille"
 
-#: src/audacious/ui_preferences.c:764
+#: src/audacious/ui_preferences.c:862
 msgid "Miscellaneous"
 msgstr "Sekalaista"
 
-#: src/audacious/ui_preferences.c:773
+#: src/audacious/ui_preferences.c:871
 msgid "Show Progress bar for the current track"
 msgstr "Näytä edistymispalkki nykyiselle kappaleelle"
 
-#: src/audacious/ui_preferences.c:783
+#: src/audacious/ui_preferences.c:881
 msgid "Delay until filepopup comes up: "
 msgstr ""
 
-#: src/audacious/ui_preferences.c:1283
+#: src/audacious/ui_preferences.c:1309
+msgid "Custom"
+msgstr "Muu ..."
+
+#: src/audacious/ui_preferences.c:1352
 msgid "Song Display"
 msgstr "Kappaleen näyttö"
 
-#: src/audacious/ui_preferences.c:1292
+#: src/audacious/ui_preferences.c:1361
 msgid "Show song numbers"
 msgstr "Näytä kappalenumerot"
 
-#: src/audacious/ui_preferences.c:1303
+#: src/audacious/ui_preferences.c:1372
 msgid "Show leading zeroes (02:00 instead of 2:00)"
 msgstr "Näytä edeltävät nollat (02:00 2:00:n sijasta)"
 
-#: src/audacious/ui_preferences.c:1325
+#: src/audacious/ui_preferences.c:1394
 msgid "Show information about titlestring format"
 msgstr "Näytä tietoja kappaleiden nimiketekstin muodosta"
 
-#: src/audacious/ui_preferences.c:1339
-msgid "TITLE"
-msgstr "NIMI"
-
-#: src/audacious/ui_preferences.c:1340
-msgid "ARTIST - TITLE"
-msgstr "ARTISTI - NIMI"
-
-#: src/audacious/ui_preferences.c:1341
-msgid "ARTIST - ALBUM - TITLE"
-msgstr "ARTISTI - ALBUMI - NIMI"
-
-#: src/audacious/ui_preferences.c:1342
-msgid "ARTIST - ALBUM - TRACK. TITLE"
-msgstr "ARTISTI - ALBUMI - KAPPALENUMERO. NIMI"
-
-#: src/audacious/ui_preferences.c:1343
-msgid "ARTIST [ ALBUM ] - TRACK. TITLE"
-msgstr "ARTISTI [ ALBUMI ] - KAPPALENUMERO. NIMI"
-
-#: src/audacious/ui_preferences.c:1344
-msgid "ALBUM - TITLE"
-msgstr "ALBUMI - NIMI"
-
-#: src/audacious/ui_preferences.c:1345
-msgid "Custom"
-msgstr "Muu ..."
-
-#: src/audacious/ui_preferences.c:1354
+#: src/audacious/ui_preferences.c:1410
 msgid "Custom string:"
 msgstr "Muu merkkijono:"
 
-#: src/audacious/ui_preferences.c:1361
+#: src/audacious/ui_preferences.c:1417
 msgid "Title format:"
 msgstr "Nimikkeen muoto:"
 
-#: src/audacious/ui_preferences.c:1372
+#: src/audacious/ui_preferences.c:1428
 msgid "Popup Information"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:1387
+#: src/audacious/ui_preferences.c:1443
 msgid "Show popup information for playlist entries"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:1388
+#: src/audacious/ui_preferences.c:1444
 msgid ""
 "Toggles popup information window for the pointed entry in the playlist. The "
 "window shows title of song, name of album, genre, year of publish, track "
 "number, track length, and artwork."
 msgstr ""
 
-#: src/audacious/ui_preferences.c:1397
+#: src/audacious/ui_preferences.c:1455
 msgid "Edit settings for popup information"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:1497
-#, fuzzy
+#: src/audacious/ui_preferences.c:1544
 msgid "Output plugin:"
-msgstr "Nykyinen ulostuloliitännäinen:"
+msgstr "Ulostulon lisäosa:"
 
-#: src/audacious/ui_preferences.c:1556
+#: src/audacious/ui_preferences.c:1603
 msgid "Transport"
 msgstr "Siirtäminen"
 
-#: src/audacious/ui_preferences.c:1556
+#: src/audacious/ui_preferences.c:1603
 msgid "Input"
 msgstr "Syöte"
 
-#: src/audacious/ui_preferences.c:1557
+#: src/audacious/ui_preferences.c:1604
 msgid "Effect"
 msgstr "Tehosteet"
 
-#: src/audacious/ui_preferences.c:1557
+#: src/audacious/ui_preferences.c:1604
 msgid "Visualization"
 msgstr "Visualisointi"
 
-#: src/audacious/ui_preferences.c:1557
+#: src/audacious/ui_preferences.c:1604
 msgid "General"
 msgstr "Yleiset"
 
-#: src/audacious/ui_preferences.c:1597
+#: src/audacious/ui_preferences.c:1644
 msgid "Audacious Preferences"
 msgstr "Audaciouksen asetukset"
 
-#: src/audacious/util.c:155
+#: src/audacious/util.c:120
 #, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr "Hakemiston (%s) luominen epäonnistui: %s\n"
 
-#: src/audtool/handlers_playlist.c:264
+#: src/audtool/handlers_playlist.c:273
 msgid "Position not found."
 msgstr "Sijaintia ei löytynyt."
 
-#: src/audtool/handlers_vitals.c:64
+#: src/audtool/handlers_vitals.c:63
 msgid "No song playing."
 msgstr "Mitään kappaletta ei soiteta."
 
-#: src/libaudcore/tuple.c:685
+#: src/libaudcore/audstrings.c:199
+#, c-format
+msgid "Audio CD, track %s"
+msgstr "Ääni-CD, kappale %s"
+
+#: src/libaudcore/tuple.c:536
 msgid "Mono"
 msgstr "Mono"
 
-#: src/libaudcore/tuple.c:687
+#: src/libaudcore/tuple.c:538
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/libaudcore/tuple.c:689
+#: src/libaudcore/tuple.c:540
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d kanava"
 msgstr[1] "%d kanavaa"
 
-#: src/libaudgui/confirm.c:73
+#: src/libaudgui/about.c:52 src/libaudgui/about.c:115
+msgid "Credits"
+msgstr "Tekijät"
+
+#: src/libaudgui/about.c:52
+msgid "Translators"
+msgstr "Kääntäjät"
+
+#: src/libaudgui/about.c:91
+msgid "About Audacious"
+msgstr "Tietoja Audaciouksesta"
+
+#: src/libaudgui/confirm.c:76
 #, c-format
 msgid ""
 "Are you sure you want to close %s? If you do, any changes made since the "
@@ -764,406 +770,396 @@
 "Suljetaanko soittolista %s? Jos suljetaan, niin kaikki tehdyt muutokset "
 "soittolistan tallentamisesta saakka menetetään."
 
-#: src/libaudgui/confirm.c:86
+#: src/libaudgui/confirm.c:89
 msgid "_Don't show this message again"
 msgstr "_Älä näytä tätä viestiä enää"
 
-#: src/libaudgui/confirm.c:124
+#: src/libaudgui/confirm.c:126
 msgid "Rename Playlist"
 msgstr "Nimeä soittolista uudelleen"
 
-#: src/libaudgui/effects-menu.c:76
+#: src/libaudgui/effects-menu.c:74
 msgid "settings ..."
 msgstr "asetukset ..."
 
-#: src/libaudgui/equalizer.c:68
+#: src/libaudgui/equalizer.c:51
 msgid "_Enable"
 msgstr "_Käytä"
 
-#: src/libaudgui/equalizer.c:140
+#: src/libaudgui/equalizer.c:123
 msgid "31 Hz"
 msgstr "31 Hz"
 
-#: src/libaudgui/equalizer.c:140
+#: src/libaudgui/equalizer.c:123
 msgid "63 Hz"
 msgstr "63 Hz"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "125 Hz"
 msgstr "125 Hz"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "250 Hz"
 msgstr "250 Hz"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "500 Hz"
 msgstr "500 Hz"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "1 kHz"
 msgstr "1 kHz"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "2 kHz"
 msgstr "2 kHz"
 
-#: src/libaudgui/equalizer.c:142
+#: src/libaudgui/equalizer.c:125
 msgid "4 kHz"
 msgstr "4 kHz"
 
-#: src/libaudgui/equalizer.c:142
+#: src/libaudgui/equalizer.c:125
 msgid "8 kHz"
 msgstr "8 kHz"
 
-#: src/libaudgui/equalizer.c:142
+#: src/libaudgui/equalizer.c:125
 msgid "16 kHz"
 msgstr "16 kHz"
 
-#: src/libaudgui/equalizer.c:147
+#: src/libaudgui/equalizer.c:130
 msgid "Equalizer"
 msgstr "Taajuuskorjain"
 
-#: src/libaudgui/equalizer.c:163
+#: src/libaudgui/equalizer.c:146
 msgid "Preamp"
 msgstr "Esivahvistus"
 
-#: src/libaudgui/infopopup.c:212
+#: src/libaudgui/infopopup.c:207
 msgid "Track Number"
 msgstr "Kappaleen numero"
 
-#: src/libaudgui/infopopup.c:214
+#: src/libaudgui/infopopup.c:209
 msgid "Track Length"
 msgstr "Kappaleen kesto:"
 
-#: src/libaudgui/infowin.c:77
+#: src/libaudgui/infowin.c:75
 msgid "Acid Jazz"
 msgstr "Acid jazz"
 
-#: src/libaudgui/infowin.c:78
+#: src/libaudgui/infowin.c:76
 msgid "Acid Rock"
 msgstr "Acid rock"
 
-#: src/libaudgui/infowin.c:79
+#: src/libaudgui/infowin.c:77
 msgid "Ambient"
 msgstr "Ambient"
 
-#: src/libaudgui/infowin.c:80
+#: src/libaudgui/infowin.c:78
 msgid "Bebop"
 msgstr "Bebop"
 
-#: src/libaudgui/infowin.c:81
+#: src/libaudgui/infowin.c:79
 msgid "Bluegrass"
 msgstr "Bluegrass"
 
-#: src/libaudgui/infowin.c:82
+#: src/libaudgui/infowin.c:80
 msgid "Blues"
 msgstr "Blues"
 
-#: src/libaudgui/infowin.c:83
+#: src/libaudgui/infowin.c:81
 msgid "Chamber Music"
 msgstr "Kamarimusiikki"
 
-#: src/libaudgui/infowin.c:84
+#: src/libaudgui/infowin.c:82
 msgid "Classical"
 msgstr "Klassinen"
 
-#: src/libaudgui/infowin.c:85
+#: src/libaudgui/infowin.c:83
 msgid "Country"
-msgstr "Kantri"
+msgstr "Kautri"
 
-#: src/libaudgui/infowin.c:86
+#: src/libaudgui/infowin.c:84
 msgid "Death Metal"
 msgstr "Death metal"
 
-#: src/libaudgui/infowin.c:87
+#: src/libaudgui/infowin.c:85
 msgid "Disco"
 msgstr "Disko"
 
-#: src/libaudgui/infowin.c:88
+#: src/libaudgui/infowin.c:86
 msgid "Easy Listening"
 msgstr "Kevyt kuunneltava"
 
-#: src/libaudgui/infowin.c:89
+#: src/libaudgui/infowin.c:87
 msgid "Folk"
 msgstr "Folk"
 
-#: src/libaudgui/infowin.c:90
+#: src/libaudgui/infowin.c:88
 msgid "Funk"
 msgstr "Funk"
 
-#: src/libaudgui/infowin.c:91
+#: src/libaudgui/infowin.c:89
 msgid "Gangsta Rap"
 msgstr "Gangsta-rap"
 
-#: src/libaudgui/infowin.c:92
+#: src/libaudgui/infowin.c:90
 msgid "Gospel"
 msgstr "Gospel"
 
-#: src/libaudgui/infowin.c:93
+#: src/libaudgui/infowin.c:91
 msgid "Grunge"
 msgstr "Grunge"
 
-#: src/libaudgui/infowin.c:94
+#: src/libaudgui/infowin.c:92
 msgid "Hard Rock"
 msgstr "Hard rock"
 
-#: src/libaudgui/infowin.c:95
+#: src/libaudgui/infowin.c:93
 msgid "Heavy Metal"
 msgstr "Heavy metal"
 
-#: src/libaudgui/infowin.c:96
+#: src/libaudgui/infowin.c:94
 msgid "Hip-hop"
 msgstr "Hip-hop"
 
-#: src/libaudgui/infowin.c:97
+#: src/libaudgui/infowin.c:95
 msgid "House"
 msgstr "House"
 
-#: src/libaudgui/infowin.c:98
+#: src/libaudgui/infowin.c:96
 msgid "Jazz"
 msgstr "Jazz"
 
-#: src/libaudgui/infowin.c:99
+#: src/libaudgui/infowin.c:97
 msgid "Jungle"
 msgstr "Jungle"
 
-#: src/libaudgui/infowin.c:100
+#: src/libaudgui/infowin.c:98
 msgid "Metal"
 msgstr "Metalli"
 
-#: src/libaudgui/infowin.c:101
+#: src/libaudgui/infowin.c:99
 msgid "New Age"
 msgstr "New age"
 
-#: src/libaudgui/infowin.c:102
+#: src/libaudgui/infowin.c:100
 msgid "New Wave"
 msgstr "New wave"
 
-#: src/libaudgui/infowin.c:103
+#: src/libaudgui/infowin.c:101
 msgid "Noise"
 msgstr "Melu"
 
-#: src/libaudgui/infowin.c:104
+#: src/libaudgui/infowin.c:102
 msgid "Pop"
 msgstr "Pop"
 
-#: src/libaudgui/infowin.c:105
+#: src/libaudgui/infowin.c:103
 msgid "Punk Rock"
 msgstr "Punk rock"
 
-#: src/libaudgui/infowin.c:106
+#: src/libaudgui/infowin.c:104
 msgid "Rap"
 msgstr "Rap"
 
-#: src/libaudgui/infowin.c:107
+#: src/libaudgui/infowin.c:105
 msgid "Reggae"
 msgstr "Reggae"
 
-#: src/libaudgui/infowin.c:108
+#: src/libaudgui/infowin.c:106
 msgid "Rock"
 msgstr "Rock"
 
-#: src/libaudgui/infowin.c:109
+#: src/libaudgui/infowin.c:107
 msgid "Rock and Roll"
 msgstr "Rock 'n' roll"
 
-#: src/libaudgui/infowin.c:110
+#: src/libaudgui/infowin.c:108
 msgid "Rhythm and Blues"
 msgstr "R'n'B"
 
-#: src/libaudgui/infowin.c:111
+#: src/libaudgui/infowin.c:109
 msgid "Ska"
 msgstr "Ska"
 
-#: src/libaudgui/infowin.c:112
+#: src/libaudgui/infowin.c:110
 msgid "Soul"
 msgstr "Soul"
 
-#: src/libaudgui/infowin.c:113
+#: src/libaudgui/infowin.c:111
 msgid "Swing"
 msgstr "Swing"
 
-#: src/libaudgui/infowin.c:114
+#: src/libaudgui/infowin.c:112
 msgid "Techno"
 msgstr "Tekno"
 
-#: src/libaudgui/infowin.c:115
+#: src/libaudgui/infowin.c:113
 msgid "Trip-hop"
 msgstr "Trip-hop"
 
-#: src/libaudgui/infowin.c:175 src/libaudgui/infowin.c:361
-#: src/libaudgui/infowin.c:364 src/libaudgui/infowin.c:367
+#: src/libaudgui/infowin.c:177 src/libaudgui/infowin.c:363
+#: src/libaudgui/infowin.c:366 src/libaudgui/infowin.c:369
 msgid "n/a"
 msgstr "ei saatavilla"
 
-#: src/libaudgui/infowin.c:265
+#: src/libaudgui/infowin.c:267
 msgid "Metadata updated successfully"
 msgstr "Metatiedot päivitetty onnistuneesti"
 
-#: src/libaudgui/infowin.c:270
+#: src/libaudgui/infowin.c:272
 msgid "Metadata updating failed"
 msgstr "Metatietojen päivitys epäonnistui"
 
-#: src/libaudgui/infowin.c:318
+#: src/libaudgui/infowin.c:320
 msgid "Track Information"
 msgstr "Kappaleen tiedot"
 
-#: src/libaudgui/infowin.c:350
+#: src/libaudgui/infowin.c:352
 msgid "Format:"
 msgstr "Muoto:"
 
-#: src/libaudgui/infowin.c:354
+#: src/libaudgui/infowin.c:356
 msgid "Quality:"
 msgstr "Laatu:"
 
-#: src/libaudgui/infowin.c:357
+#: src/libaudgui/infowin.c:359
 msgid "Bitrate:"
 msgstr "Bittinopeus:"
 
-#: src/libaudgui/infowin.c:387
+#: src/libaudgui/infowin.c:389
 msgid "Title"
 msgstr "Nimi"
 
-#: src/libaudgui/infowin.c:399
+#: src/libaudgui/infowin.c:401
 msgid "Artist"
 msgstr "Artisti"
 
-#: src/libaudgui/infowin.c:411
+#: src/libaudgui/infowin.c:413
 msgid "Album"
 msgstr "Levy"
 
-#: src/libaudgui/infowin.c:423
+#: src/libaudgui/infowin.c:425
 msgid "Comment"
 msgstr "Kommentti"
 
-#: src/libaudgui/infowin.c:435
+#: src/libaudgui/infowin.c:437
 msgid "Genre"
 msgstr "Tyylilaji"
 
-#: src/libaudgui/infowin.c:456
+#: src/libaudgui/infowin.c:458
 msgid "Year"
 msgstr "Vuosi"
 
-#: src/libaudgui/infowin.c:467
+#: src/libaudgui/infowin.c:469
 msgid "Track Number"
 msgstr "Kappaleen numero"
 
-#: src/libaudgui/infowin.c:549
+#: src/libaudgui/infowin.c:548
 #, c-format
 msgid "%d kb/s"
 msgstr "%d kb/s"
 
-#: src/libaudgui/infowin.c:579
+#: src/libaudgui/infowin.c:575
 #, c-format
 msgid "No info available for %s.\n"
 msgstr "Tietoja ei ole saatavilla aiheesta %s.\n"
 
-#: src/libaudgui/jump-to-time.c:75
-#, fuzzy
+#: src/libaudgui/jump-to-time.c:72
 msgid "Jump to Time"
-msgstr "Siirry kappaleeseen"
+msgstr "Hyppää aikaan"
 
-#: src/libaudgui/jump-to-time.c:90
+#: src/libaudgui/jump-to-time.c:87
 msgid "mm:ss"
 msgstr ""
 
-#: src/libaudgui/playlists.c:39
-#, fuzzy
+#: src/libaudgui/playlists.c:33
 msgid "Export Playlist"
-msgstr "Tilapäinen soittolista"
+msgstr "Vie soittolista"
 
-#: src/libaudgui/playlists.c:39
-#, fuzzy
+#: src/libaudgui/playlists.c:33
 msgid "Import Playlist"
-msgstr "Tilapäinen soittolista"
+msgstr "Tuo soittolista"
 
-#: src/libaudgui/playlists.c:71
+#: src/libaudgui/playlists.c:66
 #, c-format
 msgid "Overwrite %s?"
-msgstr ""
+msgstr "Ylikirjoita %s?"
 
-#: src/libaudgui/ui_about.c:71
-msgid "About Audacious"
-msgstr "Tietoja Audaciouksesta"
+#: src/libaudgui/queue-manager.c:196
+msgid "Queue Manager"
+msgstr "Jonomanageri"
 
-#: src/libaudgui/ui_about.c:93 src/libaudgui/ui_credits.c:122
-msgid "Credits"
-msgstr "Tekijät"
-
-#: src/libaudgui/ui_credits.c:126
-msgid "Translators"
-msgstr "Kääntäjät"
-
-#: src/libaudgui/ui_fileopener.c:108
+#: src/libaudgui/ui_fileopener.c:109
 msgid "Open Files"
 msgstr "Avaa tiedostoja"
 
-#: src/libaudgui/ui_fileopener.c:108
+#: src/libaudgui/ui_fileopener.c:109
 msgid "Add Files"
 msgstr "Lisää tiedostoja"
 
-#: src/libaudgui/ui_fileopener.c:110
+#: src/libaudgui/ui_fileopener.c:111
 msgid "Close dialog on Open"
 msgstr "Sulje ikkuna, kun tiedostot avattu"
 
-#: src/libaudgui/ui_fileopener.c:110
+#: src/libaudgui/ui_fileopener.c:111
 msgid "Close dialog on Add"
 msgstr "Sulje ikkuna, kun tiedostot lisätty"
 
-#: src/libaudgui/ui_jumptotrack.c:133
-msgid "Un_queue"
-msgstr "_Poista jonosta"
-
-#: src/libaudgui/ui_jumptotrack.c:135 src/libaudgui/ui_jumptotrack.c:512
+#: src/libaudgui/ui_jumptotrack.c:109 src/libaudgui/ui_jumptotrack.c:117
+#: src/libaudgui/ui_jumptotrack.c:326
 msgid "_Queue"
 msgstr "_Lisää jonoon"
 
-#: src/libaudgui/ui_jumptotrack.c:399
-msgid "Jump to Track"
-msgstr "Siirry kappaleeseen"
+#: src/libaudgui/ui_jumptotrack.c:115
+msgid "Un_queue"
+msgstr "_Poista jonosta"
+
+#: src/libaudgui/ui_jumptotrack.c:258
+msgid "Jump to Song"
+msgstr "Hyppää kappaleeseen"
 
-#: src/libaudgui/ui_jumptotrack.c:442
+#: src/libaudgui/ui_jumptotrack.c:281
 msgid "Filter: "
 msgstr "Suodatin: "
 
-#: src/libaudgui/ui_jumptotrack.c:443
+#: src/libaudgui/ui_jumptotrack.c:282
 msgid "_Filter:"
 msgstr "_Suodatin:"
 
-#: src/libaudgui/ui_jumptotrack.c:461
+#: src/libaudgui/ui_jumptotrack.c:292
 msgid "Remember"
 msgstr "Muista"
 
-#: src/libaudgui/ui_jumptotrack.c:470
+#: src/libaudgui/ui_jumptotrack.c:299
 msgid "Clea_r"
 msgstr "_Tyhjennä"
 
-#: src/libaudgui/ui_jumptotrack.c:504
+#: src/libaudgui/ui_jumptotrack.c:319
 msgid "Close on Jump"
 msgstr "Sulje ikkuna siirryttäessä"
 
-#: src/libaudgui/ui_playlist_manager.c:240
+#: src/libaudgui/ui_playlist_manager.c:253
 msgid "Playlist Manager"
 msgstr "Soittolistojen hallinta"
 
-#: src/libaudgui/ui_playlist_manager.c:264
+#: src/libaudgui/ui_playlist_manager.c:280
 msgid "Entries"
 msgstr ""
 
-#: src/libaudgui/ui_playlist_manager.c:285
+#: src/libaudgui/ui_playlist_manager.c:301
 msgid "_Rename"
 msgstr "_Nimeä uudelleen"
 
-#: src/libaudgui/ui_playlist_manager.c:309
+#: src/libaudgui/ui_playlist_manager.c:325
 msgid "_Close dialog on activating playlist"
 msgstr "_Sulje ikkuna, kun soittolista on aktivoitu"
 
-#: src/libaudgui/ui_urlopener.c:58
+#: src/libaudgui/ui_urlopener.c:48
 msgid "Open URL"
 msgstr "Avaa URL-osoite"
 
-#: src/libaudgui/ui_urlopener.c:58
+#: src/libaudgui/ui_urlopener.c:48
 msgid "Add URL"
 msgstr "Lisää URL-osoite"
 
@@ -1177,30 +1173,30 @@
 msgid "File is not a valid .desktop file"
 msgstr "Tiedosto ei ole validi .desktop-tiedosto"
 
-#: src/libeggsmclient/eggdesktopfile.c:188
+#: src/libeggsmclient/eggdesktopfile.c:191
 #, c-format
 msgid "Unrecognized desktop file Version '%s'"
 msgstr "Tuntematon desktop-tiedoston versio '%s'"
 
-#: src/libeggsmclient/eggdesktopfile.c:967
+#: src/libeggsmclient/eggdesktopfile.c:974
 #, c-format
 msgid "Starting %s"
 msgstr "Käynnistetään %s"
 
-#: src/libeggsmclient/eggdesktopfile.c:1108
+#: src/libeggsmclient/eggdesktopfile.c:1116
 msgid "Application does not accept documents on command line"
 msgstr "Sovellus ei hyväksy dokumentteja komentorivillä"
 
-#: src/libeggsmclient/eggdesktopfile.c:1176
+#: src/libeggsmclient/eggdesktopfile.c:1184
 #, c-format
 msgid "Unrecognized launch option: %d"
 msgstr "Tunnistamaton käynnistysoptio: %d"
 
-#: src/libeggsmclient/eggdesktopfile.c:1375
+#: src/libeggsmclient/eggdesktopfile.c:1391
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
 msgstr ""
 
-#: src/libeggsmclient/eggdesktopfile.c:1396
+#: src/libeggsmclient/eggdesktopfile.c:1412
 msgid "Not a launchable item"
 msgstr "Ei käynnistettävä"
 
@@ -1232,43 +1228,4 @@
 msgid "Show session management options"
 msgstr "Näytä istunnonhallinnan valinnat"
 
-#~ msgid "Replay Gain"
-#~ msgstr "Replay Gain"
-
-#~ msgid "Bit Depth"
-#~ msgstr "Bittisyvyys"
-
-#~ msgid ""
-#~ "All streams will be converted to this bit depth.\n"
-#~ "This should be the max supported bit depth of\n"
-#~ "the sound card or output plugin."
-#~ msgstr ""
-#~ "Kaikki virrat muunnetaan tähän bittisyvyyteen.\n"
-#~ "Tämän pitäisi olla suurin äänikortin tai\n"
-#~ "ulostuloliitännäisen tukema bittisyvyys."
-
-#~ msgid "Volume Control"
-#~ msgstr "Äänenvoimakkuuden hallinta"
-
-#~ msgid ""
-#~ "Use software volume control. This may be useful for situations where your "
-#~ "audio system does not support controlling the playback volume."
-#~ msgstr ""
-#~ "Käytä ohjelmapohjaista äänenvoimakkuuden hallintaa. Tämä voi olla "
-#~ "hyödyllistä tilanteissa, joissa äänijärjestelmäsi ei tue "
-#~ "äänenvoimakkuuden hallintaa."
-
-#~ msgid "Mode"
-#~ msgstr "Tila"
-
-#~ msgid "Clipping Prevention"
-#~ msgstr "Huippujen leikkautuminen"
-
-#~ msgid "Enable clipping prevention"
-#~ msgstr "Estä huippujen leikkautuminen"
-
-#~ msgid "Audio System"
-#~ msgstr "Äänijärjestelmä"
 
-#~ msgid "Display all open Audacious windows"
-#~ msgstr "Näytä kaikki avoimet Audacious-ikkunat"

audacious-3.1.1.tar.bz2/po/fr.po -> audacious-3.2.4.tar.bz2/po/fr.po Changed

@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the Audacious package.
 #
 # Translators:
-# <jagw40k@free.fr>, 2011.
+# Alain-Olivier Breysse <yahoe.001@gmail.com>, 2012.
+# <jagw40k@free.fr>, 2011, 2012.
 # Jean-Alexandre Anglès d'Auriac <jagw40k@free.fr>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious\n"
-"Report-Msgid-Bugs-To: http://jira.atheme.org/browse/AUD\n"
-"POT-Creation-Date: 2011-10-19 21:32-0400\n"
-"PO-Revision-Date: 2011-11-09 20:47+0000\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2012-01-11 08:54-0500\n"
+"PO-Revision-Date: 2012-05-21 09:54+0000\n"
 "Last-Translator: Oxayotl <jagw40k@free.fr>\n"
 "Language-Team: French\n"
 "MIME-Version: 1.0\n"
@@ -19,1063 +20,1068 @@
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: src/audacious/adder.c:71
+#: src/audacious/adder.c:77
 msgid "Searching ..."
-msgstr "Recherche ..."
+msgstr "Recherche en cours..."
 
-#: src/audacious/adder.c:97
+#: src/audacious/adder.c:113
 #, c-format
 msgid "%d file found"
 msgid_plural "%d files found"
 msgstr[0] "%d fichier trouvé"
 msgstr[1] "%d fichiers trouvés"
 
-#: src/audacious/chardet.c:38
+#: src/audacious/chardet.c:39
 msgid " (invalid UTF-8)"
 msgstr " (format UTF-8 invalide)"
 
-#: src/audacious/credits.c:35
+#: src/audacious/credits.c:37
 msgid "Core developers:"
 msgstr "Développeurs du noyau :"
 
-#: src/audacious/credits.c:49
+#: src/audacious/credits.c:51
 msgid "Graphics:"
 msgstr "Graphismes :"
 
-#: src/audacious/credits.c:54
+#: src/audacious/credits.c:56
 msgid "Default skin:"
 msgstr "Thème par défaut :"
 
-#: src/audacious/credits.c:60
+#: src/audacious/credits.c:62
 msgid "Plugin development:"
-msgstr "Développeurs des modules :"
+msgstr "Développent des modules :"
 
-#: src/audacious/credits.c:83
+#: src/audacious/credits.c:85
 msgid "Patch authors:"
-msgstr "Auteurs des modifications/correctifs :"
+msgstr "Auteurs des correctifs :"
 
-#: src/audacious/credits.c:126
+#: src/audacious/credits.c:131
 msgid "1.x developers:"
 msgstr "Développeurs de la branche 1.x :"
 
-#: src/audacious/credits.c:148
+#: src/audacious/credits.c:153
 msgid "BMP Developers:"
 msgstr "Développeurs de BMP :"
 
-#: src/audacious/credits.c:180
+#: src/audacious/credits.c:185
 msgid "Belarusian:"
 msgstr "Biélorusse :"
 
-#: src/audacious/credits.c:183
+#: src/audacious/credits.c:188
 msgid "Basque:"
 msgstr "Basque :"
 
-#: src/audacious/credits.c:186
+#: src/audacious/credits.c:191
 msgid "Brazilian Portuguese:"
 msgstr "Brésilien portugais :"
 
-#: src/audacious/credits.c:191
+#: src/audacious/credits.c:196
 msgid "Breton:"
 msgstr "Breton :"
 
-#: src/audacious/credits.c:194
+#: src/audacious/credits.c:199
 msgid "Bulgarian:"
 msgstr "Bulgare :"
 
-#: src/audacious/credits.c:197
+#: src/audacious/credits.c:202
 msgid "Catalan:"
 msgstr "Catalan :"
 
-#: src/audacious/credits.c:200
+#: src/audacious/credits.c:206
 msgid "Chinese:"
 msgstr "Chinois :"
 
-#: src/audacious/credits.c:203
+#: src/audacious/credits.c:209
 msgid "Croatian:"
 msgstr "Croate :"
 
-#: src/audacious/credits.c:206
+#: src/audacious/credits.c:212
 msgid "Czech:"
 msgstr "Tchèque :"
 
-#: src/audacious/credits.c:209
+#: src/audacious/credits.c:215
 msgid "Dutch:"
 msgstr "Néerlandais :"
 
-#: src/audacious/credits.c:213
+#: src/audacious/credits.c:219
 msgid "Estonian:"
 msgstr "Estonien :"
 
-#: src/audacious/credits.c:216
+#: src/audacious/credits.c:222
 msgid "Finnish:"
 msgstr "Finlandais :"
 
-#: src/audacious/credits.c:221
+#: src/audacious/credits.c:227
 msgid "French:"
 msgstr "Français :"
 
-#: src/audacious/credits.c:227
+#: src/audacious/credits.c:233
 msgid "German:"
 msgstr "Allemand :"
 
-#: src/audacious/credits.c:234
+#: src/audacious/credits.c:240
 msgid "Georgian:"
 msgstr "Géorgien :"
 
-#: src/audacious/credits.c:237
+#: src/audacious/credits.c:243
 msgid "Greek:"
 msgstr "Grec :"
 
-#: src/audacious/credits.c:242
+#: src/audacious/credits.c:248
 msgid "Hindi:"
 msgstr "Hindi :"
 
-#: src/audacious/credits.c:245
+#: src/audacious/credits.c:251
 msgid "Hungarian:"
 msgstr "Hongrois :"
 
-#: src/audacious/credits.c:249
+#: src/audacious/credits.c:255
 msgid "Italian:"
 msgstr "Italien :"
 
-#: src/audacious/credits.c:253
+#: src/audacious/credits.c:260
 msgid "Japanese:"
 msgstr "Japonais :"
 
-#: src/audacious/credits.c:256
+#: src/audacious/credits.c:263
 msgid "Korean:"
-msgstr "Koréenn :"
+msgstr "Coréen :"
 
-#: src/audacious/credits.c:259
+#: src/audacious/credits.c:266
 msgid "Latvian:"
-msgstr "Letton :"
+msgstr "Lette :"
 
-#: src/audacious/credits.c:262
+#: src/audacious/credits.c:269
 msgid "Lithuanian:"
 msgstr "Lituanien :"
 
-#: src/audacious/credits.c:267
+#: src/audacious/credits.c:274
 msgid "Macedonian:"
 msgstr "Macédonien :"
 
-#: src/audacious/credits.c:270
+#: src/audacious/credits.c:277
+msgid "Mexican Spanish:"
+msgstr "Espagnol mexicain :"
+
+#: src/audacious/credits.c:280
 msgid "Polish:"
 msgstr "Polonais :"
 
-#: src/audacious/credits.c:276
+#: src/audacious/credits.c:287
 msgid "Portuguese:"
 msgstr "Portugais :"
 
-#: src/audacious/credits.c:279
+#: src/audacious/credits.c:290
 msgid "Romanian:"
 msgstr "Roumain :"
 
-#: src/audacious/credits.c:283
+#: src/audacious/credits.c:294
 msgid "Russian:"
 msgstr "Russe :"
 
-#: src/audacious/credits.c:287
+#: src/audacious/credits.c:298
 msgid "Serbian (Latin):"
 msgstr "Serbe (latin) :"
 
-#: src/audacious/credits.c:290
+#: src/audacious/credits.c:301
 msgid "Serbian (Cyrillic):"
 msgstr "Serbe (cyrillique) :"
 
-#: src/audacious/credits.c:293
+#: src/audacious/credits.c:305
 msgid "Simplified Chinese:"
 msgstr "Chinois simplifié :"
 
-#: src/audacious/credits.c:296
+#: src/audacious/credits.c:308
 msgid "Slovak:"
 msgstr "Slovaque :"
 
-#: src/audacious/credits.c:299
+#: src/audacious/credits.c:312
 msgid "Spanish:"
 msgstr "Espagnol :"
 
-#: src/audacious/credits.c:306
+#: src/audacious/credits.c:320
 msgid "Swedish:"
 msgstr "Suédois :"
 
-#: src/audacious/credits.c:309
+#: src/audacious/credits.c:323
 msgid "Traditional Chinese:"
 msgstr "Chinois traditionnel :"
 
-#: src/audacious/credits.c:315
+#: src/audacious/credits.c:329
 msgid "Turkish:"
 msgstr "Turc :"
 
-#: src/audacious/credits.c:319
+#: src/audacious/credits.c:333
 msgid "Ukrainian:"
 msgstr "Ukrainien :"
 
-#: src/audacious/credits.c:323
+#: src/audacious/credits.c:338
 msgid "Vietnamese:"
 msgstr "Vietnamien :"
 
-#: src/audacious/credits.c:326
+#: src/audacious/credits.c:341
 msgid "Welsh:"
 msgstr "Gallois :"
 
-#: src/audacious/drct.c:234
-msgid "Temporary Playlist"
-msgstr "Liste de lecture provisoire"
-
-#: src/audacious/equalizer_preset.c:186
+#: src/audacious/equalizer_preset.c:180
 #, c-format
 msgid "Error importing Winamp EQF file '%s'"
-msgstr ""
-"Erreur lors de l'importation du fichier 'EQF' de 'Winamp' suivant : '%s'"
+msgstr "Erreur lors de l'importation du fichier Winamp EQF '%s'"
 
-#: src/audacious/main.c:239
+#: src/audacious/main.c:243
 msgid "Skip backwards in playlist"
 msgstr "Reculer dans la liste de lecture"
 
-#: src/audacious/main.c:240
+#: src/audacious/main.c:244
 msgid "Start playing current playlist"
-msgstr "Commencer à lire la liste de lecture active"
+msgstr "Jouer la liste de lecture active"
 
-#: src/audacious/main.c:241
+#: src/audacious/main.c:245
 msgid "Pause current song"
-msgstr "Mettre en pause la chanson en cours de lecture"
+msgstr "Mettre en pause le morceau en cours"
 
-#: src/audacious/main.c:242
+#: src/audacious/main.c:246
 msgid "Stop current song"
-msgstr "Arrêter la chanson en cours de lecture"
+msgstr "Arrêter le morceau en cours"
 
-#: src/audacious/main.c:243
+#: src/audacious/main.c:247
 msgid "Pause if playing, play otherwise"
 msgstr "Mettre en pause, sinon commencer la lecture"
 
-#: src/audacious/main.c:244
+#: src/audacious/main.c:248
 msgid "Skip forward in playlist"
 msgstr "Avancer dans la liste de lecture"
 
-#: src/audacious/main.c:245
+#: src/audacious/main.c:249
 msgid "Display Jump to File dialog"
 msgstr "Afficher la fenêtre 'Aller au fichier...'"
 
-#: src/audacious/main.c:246
+#: src/audacious/main.c:250
 msgid "Add files to the playlist"
-msgstr "Ajouter les fichiers à la liste de lecture"
+msgstr "Ajouter des fichiers à la liste de lecture"
 
-#: src/audacious/main.c:247
+#: src/audacious/main.c:251
 msgid "Add new files to a temporary playlist"
-msgstr "Ajouter les nouveaux fichiers à une liste de lecture provisoire"
+msgstr "Ajouter de nouveaux fichiers à une liste de lecture provisoire"
 
-#: src/audacious/main.c:248
+#: src/audacious/main.c:252
 msgid "Display the main window"
 msgstr "Afficher la fenêtre principale"
 
-#: src/audacious/main.c:249
+#: src/audacious/main.c:253
 msgid "Show version"
 msgstr "Afficher la version"
 
-#: src/audacious/main.c:250
+#: src/audacious/main.c:254
 msgid "Print debugging messages"
-msgstr "Afficher les messages de deboggage"
+msgstr "Afficher les messages de débogage"
 
-#: src/audacious/main.c:251
+#: src/audacious/main.c:255
 msgid "Headless mode (beta)"
 msgstr "Mode sans interface graphique (beta)"
 
-#: src/audacious/main.c:252
+#: src/audacious/main.c:256
 msgid "FILE..."
 msgstr "FICHIER..."
 
-#: src/audacious/main.c:264
+#: src/audacious/main.c:268
 msgid "- play multimedia files"
 msgstr "- lire les fichiers multimédia"
 
-#: src/audacious/main.c:274
+#: src/audacious/main.c:278
 #, c-format
 msgid ""
 "%s: %s\n"
 "Try `%s --help' for more information.\n"
-msgstr ""
-"%s: %s\n"
-"Essayez '%s --help' pour davantage d'informations.\n"
+msgstr "%s: %s\nEssayez '%s --help' pour davantage d'informations.\n"
 
-#: src/audacious/main.c:547
+#: src/audacious/main.c:573
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/audacious/playback.c:303
+#: src/audacious/playback.c:307
 #, c-format
 msgid "No decoder found for %s."
 msgstr "Aucun décodeur trouvé pour %s."
 
-#: src/audacious/playlist-new.c:315
-msgid "Untitled Playlist"
-msgstr "Liste sans nom"
+#: src/audacious/playlist-files.c:53
+#, c-format
+msgid "Cannot %s %s: unsupported file extension."
+msgstr "Impossible de %s %s : extension non prise en charge."
+
+#: src/audacious/playlist-files.c:54
+msgid "save"
+msgstr "sauvegarder"
+
+#: src/audacious/playlist-files.c:54
+msgid "load"
+msgstr "charger"
 
-#: src/audacious/playlist-new.c:1496
+#: src/audacious/playlist-new.c:131
+msgid "New Playlist"
+msgstr "Nouvelle liste de lecture"
+
+#: src/audacious/playlist-new.c:132
+msgid "Now Playing"
+msgstr "Lecture en cours"
+
+#: src/audacious/playlist-new.c:1630
 msgid ""
 "The playlist cannot be sorted because metadata scanning is still in progress"
 " (or has been disabled)."
-msgstr ""
-"La liste de lecture ne peut pas être triée car la lecture des métadonnées "
-"n'est pas encore terminée (ou bien elle a été désactivée)."
+msgstr "La liste de lecture ne peut pas être triée car le balayage des métadonnées est en cours (ou a été désactivé)."
 
-#: src/audacious/ui_preferences.c:88
+#: src/audacious/ui_preferences.c:85
 msgid "Audio"
 msgstr "Audio"
 
-#: src/audacious/ui_preferences.c:89
+#: src/audacious/ui_preferences.c:86
 msgid "Network"
 msgstr "Réseau"
 
-#: src/audacious/ui_preferences.c:90 src/audacious/ui_preferences.c:1634
+#: src/audacious/ui_preferences.c:87 src/audacious/ui_preferences.c:1603
 msgid "Playlist"
 msgstr "Liste de lecture"
 
-#: src/audacious/ui_preferences.c:91
+#: src/audacious/ui_preferences.c:88
 msgid "Plugins"
 msgstr "Modules d'extension"
 
-#: src/audacious/ui_preferences.c:97 src/libaudgui/infopopup.c:203
+#: src/audacious/ui_preferences.c:94 src/libaudgui/infopopup.c:199
 msgid "Artist"
 msgstr "Artiste"
 
-#: src/audacious/ui_preferences.c:98 src/libaudgui/infopopup.c:205
+#: src/audacious/ui_preferences.c:95 src/libaudgui/infopopup.c:201
 msgid "Album"
 msgstr "Album"
 
-#: src/audacious/ui_preferences.c:99 src/libaudgui/infopopup.c:201
-#: src/libaudgui/ui_playlist_manager.c:276
+#: src/audacious/ui_preferences.c:96 src/libaudgui/infopopup.c:197
+#: src/libaudgui/ui_playlist_manager.c:279
 msgid "Title"
 msgstr "Titre"
 
-#: src/audacious/ui_preferences.c:100
+#: src/audacious/ui_preferences.c:97
 msgid "Tracknumber"
 msgstr "Numéro de la piste"
 
-#: src/audacious/ui_preferences.c:101 src/libaudgui/infopopup.c:207
+#: src/audacious/ui_preferences.c:98 src/libaudgui/infopopup.c:203
 msgid "Genre"
 msgstr "Genre"
 
-#: src/audacious/ui_preferences.c:102
+#: src/audacious/ui_preferences.c:99
 msgid "Filename"
 msgstr "Nom du fichier"
 
-#: src/audacious/ui_preferences.c:103
+#: src/audacious/ui_preferences.c:100
 msgid "Filepath"
 msgstr "Chemin du fichier"
 
-#: src/audacious/ui_preferences.c:104
+#: src/audacious/ui_preferences.c:101
 msgid "Date"
 msgstr "Date"
 
-#: src/audacious/ui_preferences.c:105 src/libaudgui/infopopup.c:209
+#: src/audacious/ui_preferences.c:102 src/libaudgui/infopopup.c:205
 msgid "Year"
 msgstr "Année"
 
-#: src/audacious/ui_preferences.c:106
+#: src/audacious/ui_preferences.c:103
 msgid "Comment"
 msgstr "Commentaire"
 
-#: src/audacious/ui_preferences.c:107
+#: src/audacious/ui_preferences.c:104
 msgid "Codec"
 msgstr "Codec"
 
-#: src/audacious/ui_preferences.c:108
+#: src/audacious/ui_preferences.c:105
 msgid "Quality"
 msgstr "Qualité"
 
-#: src/audacious/ui_preferences.c:114
+#: src/audacious/ui_preferences.c:111
 msgid "None"
-msgstr "aucune langue"
+msgstr "Aucune langue"
 
-#: src/audacious/ui_preferences.c:115
+#: src/audacious/ui_preferences.c:112
 msgid "Arabic"
-msgstr "l'arabe"
+msgstr "Arabe"
 
-#: src/audacious/ui_preferences.c:116
+#: src/audacious/ui_preferences.c:113
 msgid "Baltic"
-msgstr "le balte"
+msgstr "Balte"
 
-#: src/audacious/ui_preferences.c:117
+#: src/audacious/ui_preferences.c:114
 msgid "Chinese"
-msgstr "le chinois"
+msgstr "Chinois"
 
-#: src/audacious/ui_preferences.c:118
+#: src/audacious/ui_preferences.c:115
 msgid "Greek"
-msgstr "le grec"
+msgstr "Grec"
 
-#: src/audacious/ui_preferences.c:119
+#: src/audacious/ui_preferences.c:116
 msgid "Hebrew"
-msgstr "l'hébreu"
+msgstr "Hébreu"
 
-#: src/audacious/ui_preferences.c:120
+#: src/audacious/ui_preferences.c:117
 msgid "Japanese"
-msgstr "le japonais"
+msgstr "Japonais"
 
-#: src/audacious/ui_preferences.c:121
+#: src/audacious/ui_preferences.c:118
 msgid "Korean"
-msgstr "le coréen"
+msgstr "Coréen"
 
-#: src/audacious/ui_preferences.c:122
+#: src/audacious/ui_preferences.c:119
 msgid "Polish"
-msgstr "le polonais"
+msgstr "Polonais"
 
-#: src/audacious/ui_preferences.c:123
+#: src/audacious/ui_preferences.c:120
 msgid "Russian"
-msgstr "le russe"
+msgstr "Russe"
 
-#: src/audacious/ui_preferences.c:124
+#: src/audacious/ui_preferences.c:121
 msgid "Taiwanese"
-msgstr "le taïwanais"
+msgstr "Taïwanais"
 
-#: src/audacious/ui_preferences.c:125
+#: src/audacious/ui_preferences.c:122
 msgid "Turkish"
-msgstr "le turc"
+msgstr "Turc"
 
-#: src/audacious/ui_preferences.c:147
+#: src/audacious/ui_preferences.c:144
 msgid "Album mode"
 msgstr "Fonctionnement par albums"
 
-#: src/audacious/ui_preferences.c:150
+#: src/audacious/ui_preferences.c:147
 msgid "Output Settings"
 msgstr "Paramètres de sortie"
 
-#: src/audacious/ui_preferences.c:152
+#: src/audacious/ui_preferences.c:149
 msgid "Bit depth:"
 msgstr "Profondeur du flux :"
 
-#: src/audacious/ui_preferences.c:155
+#: src/audacious/ui_preferences.c:152
 msgid "Buffer size:"
 msgstr "Taille du tampon :"
 
-#: src/audacious/ui_preferences.c:157
+#: src/audacious/ui_preferences.c:154
 msgid "ms"
 msgstr "ms"
 
-#: src/audacious/ui_preferences.c:158
+#: src/audacious/ui_preferences.c:155
 msgid "Use software volume control (not recommended)"
-msgstr "Utiliser un contrôle du volume interne (non recommandé)"
+msgstr "Utiliser un contrôle logiciel du volume (non recommandé)"
 
-#: src/audacious/ui_preferences.c:160
+#: src/audacious/ui_preferences.c:157
 msgid "Replay Gain"
 msgstr "Correction de gain"
 
-#: src/audacious/ui_preferences.c:161
+#: src/audacious/ui_preferences.c:158
 msgid "Enable Replay Gain"
 msgstr "Activer « Replay Gain »"
 
-#: src/audacious/ui_preferences.c:164
+#: src/audacious/ui_preferences.c:161
 msgid "Prevent clipping (recommended)"
-msgstr "Éviter la saturation (recommandé)"
+msgstr "Éviter l'écrêtage (recommandé)"
 
-#: src/audacious/ui_preferences.c:166
+#: src/audacious/ui_preferences.c:163
 msgid "Adjust Levels"
-msgstr "Niveau d'ajustement"
+msgstr "Ajustement des niveaux"
 
-#: src/audacious/ui_preferences.c:167
+#: src/audacious/ui_preferences.c:164
 msgid "Amplify all files:"
-msgstr "Amplifier tous les fichiers de"
+msgstr "Amplifier tous les fichiers :"
 
-#: src/audacious/ui_preferences.c:169 src/audacious/ui_preferences.c:172
+#: src/audacious/ui_preferences.c:166 src/audacious/ui_preferences.c:169
 msgid "dB"
 msgstr "dB"
 
-#: src/audacious/ui_preferences.c:170
+#: src/audacious/ui_preferences.c:167
 msgid "Amplify untagged files:"
-msgstr "Amplifier les fichiers non taggés de"
+msgstr "Amplifier les fichiers sans label :"
 
-#: src/audacious/ui_preferences.c:175
+#: src/audacious/ui_preferences.c:172
 msgid "Proxy hostname:"
-msgstr "Nom du serveur :"
+msgstr "Nom du serveur mandataire hôte :"
 
-#: src/audacious/ui_preferences.c:176
+#: src/audacious/ui_preferences.c:173
 msgid "Proxy port:"
-msgstr "Port du serveur :"
+msgstr "Port du serveur mandataire :"
 
-#: src/audacious/ui_preferences.c:179
+#: src/audacious/ui_preferences.c:176
 msgid "Proxy username:"
-msgstr "Nom d'utilisateur :"
+msgstr "Nom d'utilisateur pour le serveur mandataire :"
 
-#: src/audacious/ui_preferences.c:180
+#: src/audacious/ui_preferences.c:177
 msgid "Proxy password:"
-msgstr "Mot de passe :"
+msgstr "Mot de passe pour le serveur mandataire :"
 
-#: src/audacious/ui_preferences.c:184
+#: src/audacious/ui_preferences.c:181
 msgid "Proxy Configuration"
 msgstr "Configuration du serveur mandataire"
 
-#: src/audacious/ui_preferences.c:185
+#: src/audacious/ui_preferences.c:182
 msgid "Enable proxy usage"
 msgstr "Activer l'utilisation du serveur mandataire"
 
-#: src/audacious/ui_preferences.c:188
+#: src/audacious/ui_preferences.c:185
 msgid "Use authentication with proxy"
 msgstr "Le serveur mandataire demande une authentification"
 
-#: src/audacious/ui_preferences.c:196
+#: src/audacious/ui_preferences.c:193
 msgid "Auto character encoding detector for:"
-msgstr "Détection automatique de l'encodage pour "
+msgstr "Détection automatique de l'encodage pour :"
 
-#: src/audacious/ui_preferences.c:201
+#: src/audacious/ui_preferences.c:198
 msgid "Fallback character encodings:"
-msgstr "Encodages supplémentaires :"
+msgstr "Encodages supplémentaires de secours :"
 
-#: src/audacious/ui_preferences.c:205
+#: src/audacious/ui_preferences.c:202
 msgid "Behavior"
 msgstr "Comportement"
 
-#: src/audacious/ui_preferences.c:206
+#: src/audacious/ui_preferences.c:203
 msgid "Continue playback on startup"
 msgstr "Reprendre la lecture au démarrage"
 
-#: src/audacious/ui_preferences.c:208
+#: src/audacious/ui_preferences.c:205
 msgid "Advance when the current song is deleted"
 msgstr "Passer à la piste suivante si la piste courante est supprimée"
 
-#: src/audacious/ui_preferences.c:210
+#: src/audacious/ui_preferences.c:207
 msgid "Clear the playlist when opening files"
-msgstr ""
-"Remplacer l'ancien contenu de la liste de lecture, lors de l'ouverture de "
-"nouveaux fichiers"
+msgstr "Vider la liste de lecture lors de l'ouverture de nouveaux fichiers"
 
-#: src/audacious/ui_preferences.c:212
+#: src/audacious/ui_preferences.c:209
 msgid "Open files in a temporary playlist"
 msgstr "Ouvrir les nouveaux fichiers dans une liste de lecture provisoire"
 
-#: src/audacious/ui_preferences.c:214
+#: src/audacious/ui_preferences.c:211
 msgid "Metadata"
 msgstr "Métadonnées"
 
-#: src/audacious/ui_preferences.c:215
+#: src/audacious/ui_preferences.c:212
 msgid "Do not load metadata for songs until played"
-msgstr "Ne charger les metadonnées qu'à la lecture du fichier"
+msgstr "Ne charger les metadonnées qu'à la lecture"
 
-#: src/audacious/ui_preferences.c:233
+#: src/audacious/ui_preferences.c:230
 msgid "TITLE"
 msgstr "TITRE"
 
-#: src/audacious/ui_preferences.c:234
+#: src/audacious/ui_preferences.c:231
 msgid "ARTIST - TITLE"
 msgstr "ARTISTE - TITRE"
 
-#: src/audacious/ui_preferences.c:235
+#: src/audacious/ui_preferences.c:232
 msgid "ARTIST - ALBUM - TITLE"
 msgstr "ARTISTE - ALBUM - TITRE"
 
-#: src/audacious/ui_preferences.c:236
+#: src/audacious/ui_preferences.c:233
 msgid "ARTIST - ALBUM - TRACK. TITLE"
 msgstr "ARTISTE - ALBUM - PISTE. TITRE"
 
-#: src/audacious/ui_preferences.c:237
+#: src/audacious/ui_preferences.c:234
 msgid "ARTIST [ ALBUM ] - TRACK. TITLE"
 msgstr "ARTISTE [ ALBUM ] - PISTE. TITRE"
 
-#: src/audacious/ui_preferences.c:238
+#: src/audacious/ui_preferences.c:235
 msgid "ALBUM - TITLE"
 msgstr "ALBUM - TITRE"
 
-#: src/audacious/ui_preferences.c:577
+#: src/audacious/ui_preferences.c:556
 msgid "Category"
 msgstr "Catégorie"
 
-#: src/audacious/ui_preferences.c:801
+#: src/audacious/ui_preferences.c:780
 msgid "Popup Information Settings"
 msgstr "Préférences de la fenêtre contextuelle"
 
-#: src/audacious/ui_preferences.c:810
+#: src/audacious/ui_preferences.c:789
 msgid "Cover image retrieve"
-msgstr "Récupération des pochettes"
+msgstr "Récupération de la pochette"
 
-#: src/audacious/ui_preferences.c:815
+#: src/audacious/ui_preferences.c:794
 msgid ""
 "While searching for the album's cover, Audacious looks for certain words in "
 "the filename. You can specify those words in the lists below, separated "
 "using commas."
-msgstr ""
-"Lors de la recherche de la pochette d'un album, Audacious vérifie certains "
-"mots dans le nom du fichier. Vous pouvez spécifier ces mots dans les listes "
-"ci-dessous, séparés par des virgules."
+msgstr "Lors de la recherche de la pochette d'un album, Audacious vérifie certains mots dans le nom du fichier. Vous pouvez spécifier ces mots dans les listes ci-dessous, séparés par des virgules."
 
-#: src/audacious/ui_preferences.c:832
+#: src/audacious/ui_preferences.c:811
 msgid "Exclude:"
 msgstr "Exclure :"
 
-#: src/audacious/ui_preferences.c:839
+#: src/audacious/ui_preferences.c:818
 msgid "Include:"
 msgstr "Inclure :"
 
-#: src/audacious/ui_preferences.c:856
+#: src/audacious/ui_preferences.c:835
 msgid "Recursively search for cover"
-msgstr "Chercher les pochettes de manière récursive"
+msgstr "Recherche récursive de la pochette"
 
-#: src/audacious/ui_preferences.c:866
+#: src/audacious/ui_preferences.c:845
 msgid "Search depth: "
 msgstr "Profondeur de la recherche :"
 
-#: src/audacious/ui_preferences.c:880
+#: src/audacious/ui_preferences.c:859
 msgid "Use per-file cover"
-msgstr "Chercher les pochettes d'après le nom exact des fichiers audio"
+msgstr "Utiliser une pochette différente par fichier audio"
 
-#: src/audacious/ui_preferences.c:883
+#: src/audacious/ui_preferences.c:862
 msgid "Miscellaneous"
 msgstr "Options diverses"
 
-#: src/audacious/ui_preferences.c:892
+#: src/audacious/ui_preferences.c:871
 msgid "Show Progress bar for the current track"
 msgstr "Montrer une barre de progression pour le morceau écouté"
 
-#: src/audacious/ui_preferences.c:902
+#: src/audacious/ui_preferences.c:881
 msgid "Delay until filepopup comes up: "
 msgstr "Délai avant l'affichage de la fenêtre :"
 
-#: src/audacious/ui_preferences.c:1340
+#: src/audacious/ui_preferences.c:1309
 msgid "Custom"
 msgstr "Personnalisé"
 
-#: src/audacious/ui_preferences.c:1383
+#: src/audacious/ui_preferences.c:1352
 msgid "Song Display"
 msgstr "Affichage du morceau"
 
-#: src/audacious/ui_preferences.c:1392
+#: src/audacious/ui_preferences.c:1361
 msgid "Show song numbers"
 msgstr "Afficher la position des titres"
 
-#: src/audacious/ui_preferences.c:1403
+#: src/audacious/ui_preferences.c:1372
 msgid "Show leading zeroes (02:00 instead of 2:00)"
 msgstr "Afficher les zéros en début d'heure (02:00 au lieu de 2:00)"
 
-#: src/audacious/ui_preferences.c:1425
+#: src/audacious/ui_preferences.c:1394
 msgid "Show information about titlestring format"
 msgstr "Affiche des informations sur le format du titre."
 
-#: src/audacious/ui_preferences.c:1441
+#: src/audacious/ui_preferences.c:1410
 msgid "Custom string:"
 msgstr "Format personnalisé :"
 
-#: src/audacious/ui_preferences.c:1448
+#: src/audacious/ui_preferences.c:1417
 msgid "Title format:"
 msgstr "Format du titre :"
 
-#: src/audacious/ui_preferences.c:1459
+#: src/audacious/ui_preferences.c:1428
 msgid "Popup Information"
-msgstr "Fenêtre d'informations contextuelle"
+msgstr "Fenêtre d'information contextuelle"
 
-#: src/audacious/ui_preferences.c:1474
+#: src/audacious/ui_preferences.c:1443
 msgid "Show popup information for playlist entries"
-msgstr ""
-"Montrer la fenêtre d'informations pour les entrées de la liste de lecture"
+msgstr "Montrer la fenêtre d'informations pour les entrées de la liste de lecture"
 
-#: src/audacious/ui_preferences.c:1475
+#: src/audacious/ui_preferences.c:1444
 msgid ""
 "Toggles popup information window for the pointed entry in the playlist. The "
 "window shows title of song, name of album, genre, year of publish, track "
 "number, track length, and artwork."
-msgstr ""
-"Affiche une fenêtre d'informations sur l'entrée de la liste de lecture "
-"pointée par le curseur de la souris. La fenêtre présente le titre du "
-"morceau, le nom de l'album, le genre, l'année de publication, le numéro de "
-"la piste, la durée du morceau, ainsi que la pochette de l'album."
+msgstr "Active une fenêtre d'information sur l'entrée de la liste de lecture pointée par le curseur de la souris. La fenêtre présente le titre du morceau, le nom de l'album, le genre, l'année de publication, le numéro de la piste, la durée du morceau ainsi que la pochette."
 
-#: src/audacious/ui_preferences.c:1486
+#: src/audacious/ui_preferences.c:1455
 msgid "Edit settings for popup information"
-msgstr "Modifie les préférences de la fenêtre d'informations contextuelle."
+msgstr "Modifie les préférences de la fenêtre d'information contextuelle."
 
-#: src/audacious/ui_preferences.c:1575
+#: src/audacious/ui_preferences.c:1544
 msgid "Output plugin:"
-msgstr "Greffons de sortie"
+msgstr "Greffon de sortie"
 
-#: src/audacious/ui_preferences.c:1634
+#: src/audacious/ui_preferences.c:1603
 msgid "Transport"
 msgstr "Accès aux fichiers"
 
-#: src/audacious/ui_preferences.c:1634
+#: src/audacious/ui_preferences.c:1603
 msgid "Input"
-msgstr "Entrées sonores"
+msgstr "Entrée"
 
-#: src/audacious/ui_preferences.c:1635
+#: src/audacious/ui_preferences.c:1604
 msgid "Effect"
 msgstr "Effets audio"
 
-#: src/audacious/ui_preferences.c:1635
+#: src/audacious/ui_preferences.c:1604
 msgid "Visualization"
-msgstr "Visualisations"
+msgstr "Visualisation"
 
-#: src/audacious/ui_preferences.c:1635
+#: src/audacious/ui_preferences.c:1604
 msgid "General"
 msgstr "Général"
 
-#: src/audacious/ui_preferences.c:1675
+#: src/audacious/ui_preferences.c:1644
 msgid "Audacious Preferences"
 msgstr "Préférences d'Audacious"
 
-#: src/audacious/util.c:123
+#: src/audacious/util.c:120
 #, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr "Impossible de créer le répertoire suivant (%s): %s\n"
 
-#: src/audtool/handlers_playlist.c:274
+#: src/audtool/handlers_playlist.c:273
 msgid "Position not found."
 msgstr "Position non trouvée."
 
-#: src/audtool/handlers_vitals.c:64
+#: src/audtool/handlers_vitals.c:63
 msgid "No song playing."
 msgstr "Aucun titre en cours de lecture."
 
-#: src/libaudcore/tuple.c:685
+#: src/libaudcore/audstrings.c:199
+#, c-format
+msgid "Audio CD, track %s"
+msgstr "CD audio, piste %s"
+
+#: src/libaudcore/tuple.c:536
 msgid "Mono"
 msgstr "Mono"
 
-#: src/libaudcore/tuple.c:687
+#: src/libaudcore/tuple.c:538
 msgid "Stereo"
 msgstr "Stéréo"
 
-#: src/libaudcore/tuple.c:689
+#: src/libaudcore/tuple.c:540
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d canal"
 msgstr[1] "%d canaux"
 
-#: src/libaudgui/confirm.c:78
+#: src/libaudgui/about.c:52 src/libaudgui/about.c:115
+msgid "Credits"
+msgstr "Crédits"
+
+#: src/libaudgui/about.c:52
+msgid "Translators"
+msgstr "Traducteurs"
+
+#: src/libaudgui/about.c:91
+msgid "About Audacious"
+msgstr "À propos d'Audacious"
+
+#: src/libaudgui/confirm.c:76
 #, c-format
 msgid ""
 "Are you sure you want to close %s? If you do, any changes made since the "
 "playlist was exported will be lost."
-msgstr ""
-"Êtes-vous certain de vouloir fermer %s ? Si tel est le cas, toute "
-"modification apportée à la liste depuis l'exportation sera perdue."
+msgstr "Êtes-vous certain de vouloir fermer %s ? Si tel est le cas, toute modification apportée à la liste depuis l'exportation sera perdue."
 
-#: src/libaudgui/confirm.c:91
+#: src/libaudgui/confirm.c:89
 msgid "_Don't show this message again"
 msgstr "_Ne plus afficher ce message"
 
-#: src/libaudgui/confirm.c:128
+#: src/libaudgui/confirm.c:126
 msgid "Rename Playlist"
 msgstr "Renommer la liste de lecture"
 
-#: src/libaudgui/effects-menu.c:76
+#: src/libaudgui/effects-menu.c:74
 msgid "settings ..."
 msgstr "paramètres ..."
 
-#: src/libaudgui/equalizer.c:52
+#: src/libaudgui/equalizer.c:51
 msgid "_Enable"
 msgstr "_Activer"
 
-#: src/libaudgui/equalizer.c:124
+#: src/libaudgui/equalizer.c:123
 msgid "31 Hz"
 msgstr "31 Hz"
 
-#: src/libaudgui/equalizer.c:124
+#: src/libaudgui/equalizer.c:123
 msgid "63 Hz"
 msgstr "63 Hz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "125 Hz"
 msgstr "125 Hz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "250 Hz"
 msgstr "250 Hz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "500 Hz"
 msgstr "500 Hz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "1 kHz"
 msgstr "1 kHz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "2 kHz"
 msgstr "2 kHz"
 
-#: src/libaudgui/equalizer.c:126
+#: src/libaudgui/equalizer.c:125
 msgid "4 kHz"
 msgstr "4 kHz"
 
-#: src/libaudgui/equalizer.c:126
+#: src/libaudgui/equalizer.c:125
 msgid "8 kHz"
 msgstr "8 kHz"
 
-#: src/libaudgui/equalizer.c:126
+#: src/libaudgui/equalizer.c:125
 msgid "16 kHz"
 msgstr "16 kHz"
 
-#: src/libaudgui/equalizer.c:131
+#: src/libaudgui/equalizer.c:130
 msgid "Equalizer"
 msgstr "Égaliseur"
 
-#: src/libaudgui/equalizer.c:147
+#: src/libaudgui/equalizer.c:146
 msgid "Preamp"
 msgstr "Préamp."
 
-#: src/libaudgui/infopopup.c:211
+#: src/libaudgui/infopopup.c:207
 msgid "Track Number"
-msgstr "Piste"
+msgstr "Numéro de la piste"
 
-#: src/libaudgui/infopopup.c:213
+#: src/libaudgui/infopopup.c:209
 msgid "Track Length"
-msgstr "Durée"
+msgstr "Durée de la piste"
 
-#: src/libaudgui/infowin.c:77
+#: src/libaudgui/infowin.c:75
 msgid "Acid Jazz"
 msgstr "Acid Jazz"
 
-#: src/libaudgui/infowin.c:78
+#: src/libaudgui/infowin.c:76
 msgid "Acid Rock"
 msgstr "Acid Rock"
 
-#: src/libaudgui/infowin.c:79
+#: src/libaudgui/infowin.c:77
 msgid "Ambient"
 msgstr "Ambient"
 
-#: src/libaudgui/infowin.c:80
+#: src/libaudgui/infowin.c:78
 msgid "Bebop"
-msgstr "Bebob"
+msgstr "Bebop"
 
-#: src/libaudgui/infowin.c:81
+#: src/libaudgui/infowin.c:79
 msgid "Bluegrass"
 msgstr "Bluegrass"
 
-#: src/libaudgui/infowin.c:82
+#: src/libaudgui/infowin.c:80
 msgid "Blues"
 msgstr "Blues"
 
-#: src/libaudgui/infowin.c:83
+#: src/libaudgui/infowin.c:81
 msgid "Chamber Music"
-msgstr "Chamber Music"
+msgstr "Musique de chambre"
 
-#: src/libaudgui/infowin.c:84
+#: src/libaudgui/infowin.c:82
 msgid "Classical"
-msgstr "Classical"
+msgstr "Classique"
 
-#: src/libaudgui/infowin.c:85
+#: src/libaudgui/infowin.c:83
 msgid "Country"
 msgstr "Country"
 
-#: src/libaudgui/infowin.c:86
+#: src/libaudgui/infowin.c:84
 msgid "Death Metal"
 msgstr "Death Metal"
 
-#: src/libaudgui/infowin.c:87
+#: src/libaudgui/infowin.c:85
 msgid "Disco"
 msgstr "Disco"
 
-#: src/libaudgui/infowin.c:88
+#: src/libaudgui/infowin.c:86
 msgid "Easy Listening"
 msgstr "Easy Listening"
 
-#: src/libaudgui/infowin.c:89
+#: src/libaudgui/infowin.c:87
 msgid "Folk"
 msgstr "Folk"
 
-#: src/libaudgui/infowin.c:90
+#: src/libaudgui/infowin.c:88
 msgid "Funk"
 msgstr "Funk"
 
-#: src/libaudgui/infowin.c:91
+#: src/libaudgui/infowin.c:89
 msgid "Gangsta Rap"
 msgstr "Gangsta Rap"
 
-#: src/libaudgui/infowin.c:92
+#: src/libaudgui/infowin.c:90
 msgid "Gospel"
 msgstr "Gospel"
 
-#: src/libaudgui/infowin.c:93
+#: src/libaudgui/infowin.c:91
 msgid "Grunge"
 msgstr "Grunge"
 
-#: src/libaudgui/infowin.c:94
+#: src/libaudgui/infowin.c:92
 msgid "Hard Rock"
 msgstr "Hard Rock"
 
-#: src/libaudgui/infowin.c:95
+#: src/libaudgui/infowin.c:93
 msgid "Heavy Metal"
 msgstr "Heavy Metal"
 
-#: src/libaudgui/infowin.c:96
+#: src/libaudgui/infowin.c:94
 msgid "Hip-hop"
 msgstr "Hip-Hop"
 
-#: src/libaudgui/infowin.c:97
+#: src/libaudgui/infowin.c:95
 msgid "House"
 msgstr "House"
 
-#: src/libaudgui/infowin.c:98
+#: src/libaudgui/infowin.c:96
 msgid "Jazz"
 msgstr "Jazz"
 
-#: src/libaudgui/infowin.c:99
+#: src/libaudgui/infowin.c:97
 msgid "Jungle"
 msgstr "Jungle"
 
-#: src/libaudgui/infowin.c:100
+#: src/libaudgui/infowin.c:98
 msgid "Metal"
 msgstr "Metal"
 
-#: src/libaudgui/infowin.c:101
+#: src/libaudgui/infowin.c:99
 msgid "New Age"
 msgstr "New Age"
 
-#: src/libaudgui/infowin.c:102
+#: src/libaudgui/infowin.c:100
 msgid "New Wave"
 msgstr "New Wave"
 
-#: src/libaudgui/infowin.c:103
+#: src/libaudgui/infowin.c:101
 msgid "Noise"
 msgstr "Noise"
 
-#: src/libaudgui/infowin.c:104
+#: src/libaudgui/infowin.c:102
 msgid "Pop"
 msgstr "Pop"
 
-#: src/libaudgui/infowin.c:105
+#: src/libaudgui/infowin.c:103
 msgid "Punk Rock"
 msgstr "Punk Rock"
 
-#: src/libaudgui/infowin.c:106
+#: src/libaudgui/infowin.c:104
 msgid "Rap"
 msgstr "Rap"
 
-#: src/libaudgui/infowin.c:107
+#: src/libaudgui/infowin.c:105
 msgid "Reggae"
 msgstr "Reggae"
 
-#: src/libaudgui/infowin.c:108
+#: src/libaudgui/infowin.c:106
 msgid "Rock"
 msgstr "Rock"
 
-#: src/libaudgui/infowin.c:109
+#: src/libaudgui/infowin.c:107
 msgid "Rock and Roll"
 msgstr "Rock and Roll"
 
-#: src/libaudgui/infowin.c:110
+#: src/libaudgui/infowin.c:108
 msgid "Rhythm and Blues"
 msgstr "Rhythm and Blues"
 
-#: src/libaudgui/infowin.c:111
+#: src/libaudgui/infowin.c:109
 msgid "Ska"
 msgstr "Ska"
 
-#: src/libaudgui/infowin.c:112
+#: src/libaudgui/infowin.c:110
 msgid "Soul"
 msgstr "Soul"
 
-#: src/libaudgui/infowin.c:113
+#: src/libaudgui/infowin.c:111
 msgid "Swing"
 msgstr "Swing"
 
-#: src/libaudgui/infowin.c:114
+#: src/libaudgui/infowin.c:112
 msgid "Techno"
 msgstr "Techno"
 
-#: src/libaudgui/infowin.c:115
+#: src/libaudgui/infowin.c:113
 msgid "Trip-hop"
 msgstr "Trip-Hop"
 
-#: src/libaudgui/infowin.c:175 src/libaudgui/infowin.c:361
-#: src/libaudgui/infowin.c:364 src/libaudgui/infowin.c:367
+#: src/libaudgui/infowin.c:177 src/libaudgui/infowin.c:363
+#: src/libaudgui/infowin.c:366 src/libaudgui/infowin.c:369
 msgid "n/a"
 msgstr "non disponible"
 
-#: src/libaudgui/infowin.c:265
+#: src/libaudgui/infowin.c:267
 msgid "Metadata updated successfully"
 msgstr "Mise à jour des métadonnées réussie"
 
-#: src/libaudgui/infowin.c:270
+#: src/libaudgui/infowin.c:272
 msgid "Metadata updating failed"
 msgstr "Échec lors de la mise à jour des métadonnées"
 
-#: src/libaudgui/infowin.c:318
+#: src/libaudgui/infowin.c:320
 msgid "Track Information"
 msgstr "Informations sur le morceau"
 
-#: src/libaudgui/infowin.c:350
+#: src/libaudgui/infowin.c:352
 msgid "Format:"
 msgstr "Format :"
 
-#: src/libaudgui/infowin.c:354
+#: src/libaudgui/infowin.c:356
 msgid "Quality:"
 msgstr "Qualité :"
 
-#: src/libaudgui/infowin.c:357
+#: src/libaudgui/infowin.c:359
 msgid "Bitrate:"
 msgstr "Taux d'encodage :"
 
-#: src/libaudgui/infowin.c:387
+#: src/libaudgui/infowin.c:389
 msgid "Title"
 msgstr "Titre"
 
-#: src/libaudgui/infowin.c:399
+#: src/libaudgui/infowin.c:401
 msgid "Artist"
 msgstr "Artiste"
 
-#: src/libaudgui/infowin.c:411
+#: src/libaudgui/infowin.c:413
 msgid "Album"
 msgstr "Album"
 
-#: src/libaudgui/infowin.c:423
+#: src/libaudgui/infowin.c:425
 msgid "Comment"
 msgstr "Commentaire"
 
-#: src/libaudgui/infowin.c:435
+#: src/libaudgui/infowin.c:437
 msgid "Genre"
 msgstr "Genre"
 
-#: src/libaudgui/infowin.c:456
+#: src/libaudgui/infowin.c:458
 msgid "Year"
 msgstr "Année"
 
-#: src/libaudgui/infowin.c:467
+#: src/libaudgui/infowin.c:469
 msgid "Track Number"
-msgstr "Piste"
+msgstr "Numéro de piste"
 
-#: src/libaudgui/infowin.c:549
+#: src/libaudgui/infowin.c:548
 #, c-format
 msgid "%d kb/s"
 msgstr "%d kb/s"
 
-#: src/libaudgui/infowin.c:579
+#: src/libaudgui/infowin.c:575
 #, c-format
 msgid "No info available for %s.\n"
 msgstr "Aucune information disponible pour %s.\n"
 
-#: src/libaudgui/jump-to-time.c:75
+#: src/libaudgui/jump-to-time.c:72
 msgid "Jump to Time"
 msgstr "Sauter au temps"
 
-#: src/libaudgui/jump-to-time.c:90
+#: src/libaudgui/jump-to-time.c:87
 msgid "mm:ss"
 msgstr "mm:ss"
 
-#: src/libaudgui/playlists.c:39
+#: src/libaudgui/playlists.c:33
 msgid "Export Playlist"
 msgstr "Exporter la liste de lecture"
 
-#: src/libaudgui/playlists.c:39
+#: src/libaudgui/playlists.c:33
 msgid "Import Playlist"
 msgstr "Importer la piste de lecture"
 
-#: src/libaudgui/playlists.c:72
+#: src/libaudgui/playlists.c:66
 #, c-format
 msgid "Overwrite %s?"
 msgstr "Écraser %s ?"
 
-#: src/libaudgui/queue-manager.c:185
+#: src/libaudgui/queue-manager.c:196
 msgid "Queue Manager"
 msgstr "Gestionnaire de file d'attente"
 
-#: src/libaudgui/ui_about.c:69
-msgid "About Audacious"
-msgstr "À propos d'Audacious"
-
-#: src/libaudgui/ui_about.c:90 src/libaudgui/ui_credits.c:122
-msgid "Credits"
-msgstr "Crédits"
-
-#: src/libaudgui/ui_credits.c:126
-msgid "Translators"
-msgstr "Traducteurs"
-
 #: src/libaudgui/ui_fileopener.c:109
 msgid "Open Files"
 msgstr "Ouvrir des fichiers"
@@ -1086,111 +1092,103 @@
 
 #: src/libaudgui/ui_fileopener.c:111
 msgid "Close dialog on Open"
-msgstr "Fermer la fenêtre après l'ouverture des fichiers"
+msgstr "Fermer la fenêtre après l'ouverture de fichiers"
 
 #: src/libaudgui/ui_fileopener.c:111
 msgid "Close dialog on Add"
-msgstr "Fermer la fenêtre après l'ajout des fichiers"
+msgstr "Fermer la fenêtre après l'ajout de fichiers"
 
-#: src/libaudgui/ui_jumptotrack.c:103 src/libaudgui/ui_jumptotrack.c:111
-#: src/libaudgui/ui_jumptotrack.c:322
+#: src/libaudgui/ui_jumptotrack.c:109 src/libaudgui/ui_jumptotrack.c:117
+#: src/libaudgui/ui_jumptotrack.c:326
 msgid "_Queue"
 msgstr "_Mettre dans la file"
 
-#: src/libaudgui/ui_jumptotrack.c:109
+#: src/libaudgui/ui_jumptotrack.c:115
 msgid "Un_queue"
 msgstr "_Retirer de la file"
 
-#: src/libaudgui/ui_jumptotrack.c:239
-msgid "Jump to Track"
-msgstr "Aller au titre..."
+#: src/libaudgui/ui_jumptotrack.c:258
+msgid "Jump to Song"
+msgstr "Sauter au morceau"
 
-#: src/libaudgui/ui_jumptotrack.c:277
+#: src/libaudgui/ui_jumptotrack.c:281
 msgid "Filter: "
 msgstr "Filtre :"
 
-#: src/libaudgui/ui_jumptotrack.c:278
+#: src/libaudgui/ui_jumptotrack.c:282
 msgid "_Filter:"
 msgstr "_Filtre :"
 
-#: src/libaudgui/ui_jumptotrack.c:288
+#: src/libaudgui/ui_jumptotrack.c:292
 msgid "Remember"
-msgstr ""
-"Se souvenir de\n"
-"la recherche"
+msgstr "Se souvenir de\nla recherche"
 
-#: src/libaudgui/ui_jumptotrack.c:295
+#: src/libaudgui/ui_jumptotrack.c:299
 msgid "Clea_r"
 msgstr "Efface_r"
 
-#: src/libaudgui/ui_jumptotrack.c:315
+#: src/libaudgui/ui_jumptotrack.c:319
 msgid "Close on Jump"
-msgstr ""
-"Fermer la fenêtre\n"
-"après la sélection"
+msgstr "Fermer la fenêtre\naprès la sélection"
 
-#: src/libaudgui/ui_playlist_manager.c:250
+#: src/libaudgui/ui_playlist_manager.c:253
 msgid "Playlist Manager"
-msgstr "Gestionnaire de listes de lecture"
+msgstr "Gestionnaire de liste de lecture"
 
-#: src/libaudgui/ui_playlist_manager.c:277
+#: src/libaudgui/ui_playlist_manager.c:280
 msgid "Entries"
 msgstr "Entrées"
 
-#: src/libaudgui/ui_playlist_manager.c:298
+#: src/libaudgui/ui_playlist_manager.c:301
 msgid "_Rename"
 msgstr "_Renommer"
 
-#: src/libaudgui/ui_playlist_manager.c:322
+#: src/libaudgui/ui_playlist_manager.c:325
 msgid "_Close dialog on activating playlist"
 msgstr "_Fermer la fenêtre après l'activation de la liste de lecture"
 
-#: src/libaudgui/ui_urlopener.c:51
+#: src/libaudgui/ui_urlopener.c:48
 msgid "Open URL"
-msgstr "Ouvrir l'adresse d'un flux"
+msgstr "Ouvrir l'adresse URL d'un flux"
 
-#: src/libaudgui/ui_urlopener.c:51
+#: src/libaudgui/ui_urlopener.c:48
 msgid "Add URL"
-msgstr "Ajouter l'adresse d'un flux"
+msgstr "Ajouter l'adresse URL d'un flux"
 
 #: src/libaudgui/util.c:95
 msgid ""
 "\n"
 "(Further messages have been hidden.)"
-msgstr ""
-"\n"
-"(Des messages supplémentaires ont été cachés.)"
+msgstr "\n(Les messages supplémentaires ont été cachés.)"
 
 #: src/libeggsmclient/eggdesktopfile.c:165
 msgid "File is not a valid .desktop file"
 msgstr "Le fichier n'est pas un fichier '.desktop' valide"
 
-#: src/libeggsmclient/eggdesktopfile.c:188
+#: src/libeggsmclient/eggdesktopfile.c:191
 #, c-format
 msgid "Unrecognized desktop file Version '%s'"
 msgstr "Version du fichier '.desktop' suivant inconnue : '%s'"
 
-#: src/libeggsmclient/eggdesktopfile.c:967
+#: src/libeggsmclient/eggdesktopfile.c:974
 #, c-format
 msgid "Starting %s"
 msgstr "Exécution de %s"
 
-#: src/libeggsmclient/eggdesktopfile.c:1108
+#: src/libeggsmclient/eggdesktopfile.c:1116
 msgid "Application does not accept documents on command line"
-msgstr "L'application n'accepte pas de ressources via la ligne de commande"
+msgstr "L'application n'accepte pas de document via la ligne de commande"
 
-#: src/libeggsmclient/eggdesktopfile.c:1176
+#: src/libeggsmclient/eggdesktopfile.c:1184
 #, c-format
 msgid "Unrecognized launch option: %d"
-msgstr "Option de lancement suivante inconnue : %d"
+msgstr "Option de lancement inconnue : %d"
 
-#: src/libeggsmclient/eggdesktopfile.c:1375
+#: src/libeggsmclient/eggdesktopfile.c:1391
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
-msgstr ""
-"Impossible de passer les identifiants uniformes de ressource ('URIs') à une "
-"entrée 'Type=Link' du fichier '.desktop'"
+msgstr "Impossible de passer les identifiants uniformes de ressource ('URIs') à une entrée 'Type=Link' du fichier '.desktop'"
 
-#: src/libeggsmclient/eggdesktopfile.c:1396
+#: src/libeggsmclient/eggdesktopfile.c:1412
 msgid "Not a launchable item"
 msgstr "L'élément n'est pas exécutable"
 
@@ -1208,7 +1206,7 @@
 
 #: src/libeggsmclient/eggsmclient.c:232
 msgid "Specify session management ID"
-msgstr "Spécifier l'identifiant de la session à gérer"
+msgstr "Spécifier l'identifiant du gestionnaire de session"
 
 #: src/libeggsmclient/eggsmclient.c:232
 msgid "ID"
@@ -1216,10 +1214,8 @@
 
 #: src/libeggsmclient/eggsmclient.c:253
 msgid "Session management options:"
-msgstr "Options du gestionnaire de sessions"
+msgstr "Options du gestionnaire de session"
 
 #: src/libeggsmclient/eggsmclient.c:254
 msgid "Show session management options"
-msgstr "Afficher les options du gestionnaire de sessions"
-
-
+msgstr "Afficher les options du gestionnaire de session"

audacious-3.1.1.tar.bz2/po/hu.po -> audacious-3.2.4.tar.bz2/po/hu.po Changed

@@ -5,14 +5,14 @@
 # Translators:
 # Laszlo Dvornik <dvornik@gnome.hu>, 2006.
 # Peter Polonkai <polesz@nedudu.hu>, 2010.
-# Péter Polonkai <polesz@nedudu.hu>, 2011.
+# Péter Polonkai <polesz@nedudu.hu>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious\n"
-"Report-Msgid-Bugs-To: http://jira.atheme.org/browse/AUD\n"
-"POT-Creation-Date: 2011-10-19 21:32-0400\n"
-"PO-Revision-Date: 2011-11-01 17:33+0000\n"
-"Last-Translator: Polesz <polesz@nedudu.hu>\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2012-01-11 08:54-0500\n"
+"PO-Revision-Date: 2012-01-12 06:38+0000\n"
+"Last-Translator: Péter Polonkai <polesz@nedudu.hu>\n"
 "Language-Team: Hungarian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,275 +20,275 @@
 "Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/audacious/adder.c:71
+#: src/audacious/adder.c:77
 msgid "Searching ..."
 msgstr "Keresés ..."
 
-#: src/audacious/adder.c:97
+#: src/audacious/adder.c:113
 #, c-format
 msgid "%d file found"
 msgid_plural "%d files found"
 msgstr[0] "%d fájl található"
 msgstr[1] "%d fájl található"
 
-#: src/audacious/chardet.c:38
+#: src/audacious/chardet.c:39
 msgid " (invalid UTF-8)"
 msgstr " (érvénytelen UTF-8)"
 
-#: src/audacious/credits.c:35
+#: src/audacious/credits.c:37
 msgid "Core developers:"
 msgstr "Fő fejlesztők:"
 
-#: src/audacious/credits.c:49
+#: src/audacious/credits.c:51
 msgid "Graphics:"
 msgstr "Grafika:"
 
-#: src/audacious/credits.c:54
+#: src/audacious/credits.c:56
 msgid "Default skin:"
 msgstr "Alapértelmezett bőr:"
 
-#: src/audacious/credits.c:60
+#: src/audacious/credits.c:62
 msgid "Plugin development:"
 msgstr "Bővítmény fejlesztés:"
 
-#: src/audacious/credits.c:83
+#: src/audacious/credits.c:85
 msgid "Patch authors:"
 msgstr "Patch készítők:"
 
-#: src/audacious/credits.c:126
+#: src/audacious/credits.c:131
 msgid "1.x developers:"
 msgstr "1.x fejlesztői:"
 
-#: src/audacious/credits.c:148
+#: src/audacious/credits.c:153
 msgid "BMP Developers:"
 msgstr "BMP-fejlesztők:"
 
-#: src/audacious/credits.c:180
+#: src/audacious/credits.c:185
 msgid "Belarusian:"
 msgstr "Belorusz"
 
-#: src/audacious/credits.c:183
+#: src/audacious/credits.c:188
 msgid "Basque:"
 msgstr "Baszk:"
 
-#: src/audacious/credits.c:186
+#: src/audacious/credits.c:191
 msgid "Brazilian Portuguese:"
 msgstr "Brazil portugál:"
 
-#: src/audacious/credits.c:191
+#: src/audacious/credits.c:196
 msgid "Breton:"
 msgstr "Breton:"
 
-#: src/audacious/credits.c:194
+#: src/audacious/credits.c:199
 msgid "Bulgarian:"
 msgstr "Bolgár"
 
-#: src/audacious/credits.c:197
+#: src/audacious/credits.c:202
 msgid "Catalan:"
 msgstr "Katalán"
 
-#: src/audacious/credits.c:200
+#: src/audacious/credits.c:206
 msgid "Chinese:"
 msgstr "Kínai:"
 
-#: src/audacious/credits.c:203
+#: src/audacious/credits.c:209
 msgid "Croatian:"
 msgstr "Horvát"
 
-#: src/audacious/credits.c:206
+#: src/audacious/credits.c:212
 msgid "Czech:"
 msgstr "Cseh:"
 
-#: src/audacious/credits.c:209
+#: src/audacious/credits.c:215
 msgid "Dutch:"
 msgstr "Holland:"
 
-#: src/audacious/credits.c:213
+#: src/audacious/credits.c:219
 msgid "Estonian:"
 msgstr "Észt"
 
-#: src/audacious/credits.c:216
+#: src/audacious/credits.c:222
 msgid "Finnish:"
 msgstr "Finn:"
 
-#: src/audacious/credits.c:221
+#: src/audacious/credits.c:227
 msgid "French:"
 msgstr "Francia:"
 
-#: src/audacious/credits.c:227
+#: src/audacious/credits.c:233
 msgid "German:"
 msgstr "Német:"
 
-#: src/audacious/credits.c:234
+#: src/audacious/credits.c:240
 msgid "Georgian:"
 msgstr "Grúz"
 
-#: src/audacious/credits.c:237
+#: src/audacious/credits.c:243
 msgid "Greek:"
 msgstr "Görög:"
 
-#: src/audacious/credits.c:242
+#: src/audacious/credits.c:248
 msgid "Hindi:"
 msgstr "Hindi:"
 
-#: src/audacious/credits.c:245
+#: src/audacious/credits.c:251
 msgid "Hungarian:"
 msgstr "Magyar:"
 
-#: src/audacious/credits.c:249
+#: src/audacious/credits.c:255
 msgid "Italian:"
 msgstr "Olasz:"
 
-#: src/audacious/credits.c:253
+#: src/audacious/credits.c:260
 msgid "Japanese:"
 msgstr "Japán:"
 
-#: src/audacious/credits.c:256
+#: src/audacious/credits.c:263
 msgid "Korean:"
 msgstr "Koreai:"
 
-#: src/audacious/credits.c:259
+#: src/audacious/credits.c:266
 msgid "Latvian:"
 msgstr "Lett:"
 
-#: src/audacious/credits.c:262
+#: src/audacious/credits.c:269
 msgid "Lithuanian:"
 msgstr "Litván:"
 
-#: src/audacious/credits.c:267
+#: src/audacious/credits.c:274
 msgid "Macedonian:"
 msgstr "Macedón:"
 
-#: src/audacious/credits.c:270
+#: src/audacious/credits.c:277
+msgid "Mexican Spanish:"
+msgstr "Mexikói spanyol:"
+
+#: src/audacious/credits.c:280
 msgid "Polish:"
 msgstr "Lengyel:"
 
-#: src/audacious/credits.c:276
+#: src/audacious/credits.c:287
 msgid "Portuguese:"
 msgstr "Portugál:"
 
-#: src/audacious/credits.c:279
+#: src/audacious/credits.c:290
 msgid "Romanian:"
 msgstr "Román:"
 
-#: src/audacious/credits.c:283
+#: src/audacious/credits.c:294
 msgid "Russian:"
 msgstr "Orosz:"
 
-#: src/audacious/credits.c:287
+#: src/audacious/credits.c:298
 msgid "Serbian (Latin):"
 msgstr "Szerb (Latin):"
 
-#: src/audacious/credits.c:290
+#: src/audacious/credits.c:301
 msgid "Serbian (Cyrillic):"
 msgstr "Szerb (Cirill):"
 
-#: src/audacious/credits.c:293
+#: src/audacious/credits.c:305
 msgid "Simplified Chinese:"
 msgstr "Egyszerűsített kínai:"
 
-#: src/audacious/credits.c:296
+#: src/audacious/credits.c:308
 msgid "Slovak:"
 msgstr "Szlovák:"
 
-#: src/audacious/credits.c:299
+#: src/audacious/credits.c:312
 msgid "Spanish:"
 msgstr "Spanyol:"
 
-#: src/audacious/credits.c:306
+#: src/audacious/credits.c:320
 msgid "Swedish:"
 msgstr "Svéd:"
 
-#: src/audacious/credits.c:309
+#: src/audacious/credits.c:323
 msgid "Traditional Chinese:"
 msgstr "Hagyományos kínai:"
 
-#: src/audacious/credits.c:315
+#: src/audacious/credits.c:329
 msgid "Turkish:"
 msgstr "Török:"
 
-#: src/audacious/credits.c:319
+#: src/audacious/credits.c:333
 msgid "Ukrainian:"
 msgstr "Ukrán:"
 
-#: src/audacious/credits.c:323
+#: src/audacious/credits.c:338
 msgid "Vietnamese:"
 msgstr "Vietnami:"
 
-#: src/audacious/credits.c:326
+#: src/audacious/credits.c:341
 msgid "Welsh:"
 msgstr "Walesi:"
 
-#: src/audacious/drct.c:234
-msgid "Temporary Playlist"
-msgstr "Ideiglenes lejátszólista"
-
-#: src/audacious/equalizer_preset.c:186
+#: src/audacious/equalizer_preset.c:180
 #, c-format
 msgid "Error importing Winamp EQF file '%s'"
 msgstr "Hiba a Winamp EQF fájl '%s' importálásakor"
 
-#: src/audacious/main.c:239
+#: src/audacious/main.c:243
 msgid "Skip backwards in playlist"
 msgstr "Visszalépés a lejátszólistában"
 
-#: src/audacious/main.c:240
+#: src/audacious/main.c:244
 msgid "Start playing current playlist"
 msgstr "Jelenlegi lejátszólista lejátszásának elkezdése"
 
-#: src/audacious/main.c:241
+#: src/audacious/main.c:245
 msgid "Pause current song"
 msgstr "Jelenlegi szám szüneteltetése"
 
-#: src/audacious/main.c:242
+#: src/audacious/main.c:246
 msgid "Stop current song"
 msgstr "Jelenlegi szám leállítása"
 
-#: src/audacious/main.c:243
+#: src/audacious/main.c:247
 msgid "Pause if playing, play otherwise"
 msgstr "Lejátszás esetén szüneteltetés, különben lejátszás"
 
-#: src/audacious/main.c:244
+#: src/audacious/main.c:248
 msgid "Skip forward in playlist"
 msgstr "Előrelépés a lejátszólistában"
 
-#: src/audacious/main.c:245
+#: src/audacious/main.c:249
 msgid "Display Jump to File dialog"
 msgstr "Ugrás fájlra párbeszédablak megjelenítése"
 
-#: src/audacious/main.c:246
+#: src/audacious/main.c:250
 msgid "Add files to the playlist"
 msgstr "Fájlok hozzáadása a lejátszó listához"
 
-#: src/audacious/main.c:247
+#: src/audacious/main.c:251
 msgid "Add new files to a temporary playlist"
 msgstr "Új fájlok hozzáadása az ideiglenes lejátszólistához"
 
-#: src/audacious/main.c:248
+#: src/audacious/main.c:252
 msgid "Display the main window"
 msgstr "Főablak megjelenítése"
 
-#: src/audacious/main.c:249
+#: src/audacious/main.c:253
 msgid "Show version"
 msgstr "Verzió mutatása"
 
-#: src/audacious/main.c:250
+#: src/audacious/main.c:254
 msgid "Print debugging messages"
 msgstr "Hibakereső üzenetek kiírása"
 
-#: src/audacious/main.c:251
+#: src/audacious/main.c:255
 msgid "Headless mode (beta)"
 msgstr "Headless mód (béta)"
 
-#: src/audacious/main.c:252
+#: src/audacious/main.c:256
 msgid "FILE..."
 msgstr "Fájl..."
 
-#: src/audacious/main.c:264
+#: src/audacious/main.c:268
 msgid "- play multimedia files"
 msgstr "- multimédia fájlok lejátszása"
 
-#: src/audacious/main.c:274
+#: src/audacious/main.c:278
 #, c-format
 msgid ""
 "%s: %s\n"
@@ -297,20 +297,37 @@
 "%s: %s\n"
 "Próbája a `%s --help' további információkért.\n"
 
-#: src/audacious/main.c:547
+#: src/audacious/main.c:573
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/audacious/playback.c:303
+#: src/audacious/playback.c:307
 #, c-format
 msgid "No decoder found for %s."
 msgstr "Dekóder nem található ehhez %s."
 
-#: src/audacious/playlist-new.c:315
-msgid "Untitled Playlist"
-msgstr "Névtelen lejátszólista"
+#: src/audacious/playlist-files.c:53
+#, c-format
+msgid "Cannot %s %s: unsupported file extension."
+msgstr "Nem lehetséges %s %s: nem támogatott fájl kiterjesztés."
+
+#: src/audacious/playlist-files.c:54
+msgid "save"
+msgstr "mentés"
+
+#: src/audacious/playlist-files.c:54
+msgid "load"
+msgstr "betöltés'"
 
-#: src/audacious/playlist-new.c:1496
+#: src/audacious/playlist-new.c:131
+msgid "New Playlist"
+msgstr "Új lejátszólista"
+
+#: src/audacious/playlist-new.c:132
+msgid "Now Playing"
+msgstr "Most játszott"
+
+#: src/audacious/playlist-new.c:1630
 msgid ""
 "The playlist cannot be sorted because metadata scanning is still in progress"
 " (or has been disabled)."
@@ -318,272 +335,272 @@
 "A lejátszási listát nem lehet rendezni, mert a metaadatok keresése még "
 "folyamatban van (vagy le van tiltva)."
 
-#: src/audacious/ui_preferences.c:88
+#: src/audacious/ui_preferences.c:85
 msgid "Audio"
 msgstr "Hang"
 
-#: src/audacious/ui_preferences.c:89
+#: src/audacious/ui_preferences.c:86
 msgid "Network"
 msgstr "Hálózat"
 
-#: src/audacious/ui_preferences.c:90 src/audacious/ui_preferences.c:1634
+#: src/audacious/ui_preferences.c:87 src/audacious/ui_preferences.c:1603
 msgid "Playlist"
 msgstr "Lejátszólista"
 
-#: src/audacious/ui_preferences.c:91
+#: src/audacious/ui_preferences.c:88
 msgid "Plugins"
 msgstr "Bővítmények"
 
-#: src/audacious/ui_preferences.c:97 src/libaudgui/infopopup.c:203
+#: src/audacious/ui_preferences.c:94 src/libaudgui/infopopup.c:199
 msgid "Artist"
 msgstr "Előadó"
 
-#: src/audacious/ui_preferences.c:98 src/libaudgui/infopopup.c:205
+#: src/audacious/ui_preferences.c:95 src/libaudgui/infopopup.c:201
 msgid "Album"
 msgstr "Album"
 
-#: src/audacious/ui_preferences.c:99 src/libaudgui/infopopup.c:201
-#: src/libaudgui/ui_playlist_manager.c:276
+#: src/audacious/ui_preferences.c:96 src/libaudgui/infopopup.c:197
+#: src/libaudgui/ui_playlist_manager.c:279
 msgid "Title"
 msgstr "Cím"
 
-#: src/audacious/ui_preferences.c:100
+#: src/audacious/ui_preferences.c:97
 msgid "Tracknumber"
 msgstr "Szám sorszáma"
 
-#: src/audacious/ui_preferences.c:101 src/libaudgui/infopopup.c:207
+#: src/audacious/ui_preferences.c:98 src/libaudgui/infopopup.c:203
 msgid "Genre"
 msgstr "Műfaj"
 
-#: src/audacious/ui_preferences.c:102
+#: src/audacious/ui_preferences.c:99
 msgid "Filename"
 msgstr "Fájlnév"
 
-#: src/audacious/ui_preferences.c:103
+#: src/audacious/ui_preferences.c:100
 msgid "Filepath"
 msgstr "Fájlútvonal"
 
-#: src/audacious/ui_preferences.c:104
+#: src/audacious/ui_preferences.c:101
 msgid "Date"
 msgstr "Dátum"
 
-#: src/audacious/ui_preferences.c:105 src/libaudgui/infopopup.c:209
+#: src/audacious/ui_preferences.c:102 src/libaudgui/infopopup.c:205
 msgid "Year"
 msgstr "Év"
 
-#: src/audacious/ui_preferences.c:106
+#: src/audacious/ui_preferences.c:103
 msgid "Comment"
 msgstr "Megjegyzés"
 
-#: src/audacious/ui_preferences.c:107
+#: src/audacious/ui_preferences.c:104
 msgid "Codec"
 msgstr "Kodek"
 
-#: src/audacious/ui_preferences.c:108
+#: src/audacious/ui_preferences.c:105
 msgid "Quality"
 msgstr "Minőség"
 
-#: src/audacious/ui_preferences.c:114
+#: src/audacious/ui_preferences.c:111
 msgid "None"
 msgstr "Nincs"
 
-#: src/audacious/ui_preferences.c:115
+#: src/audacious/ui_preferences.c:112
 msgid "Arabic"
 msgstr "Arab"
 
-#: src/audacious/ui_preferences.c:116
+#: src/audacious/ui_preferences.c:113
 msgid "Baltic"
 msgstr "Balti"
 
-#: src/audacious/ui_preferences.c:117
+#: src/audacious/ui_preferences.c:114
 msgid "Chinese"
 msgstr "Kínai"
 
-#: src/audacious/ui_preferences.c:118
+#: src/audacious/ui_preferences.c:115
 msgid "Greek"
 msgstr "Görög"
 
-#: src/audacious/ui_preferences.c:119
+#: src/audacious/ui_preferences.c:116
 msgid "Hebrew"
 msgstr "Héber"
 
-#: src/audacious/ui_preferences.c:120
+#: src/audacious/ui_preferences.c:117
 msgid "Japanese"
 msgstr "Japán"
 
-#: src/audacious/ui_preferences.c:121
+#: src/audacious/ui_preferences.c:118
 msgid "Korean"
 msgstr "Koreai"
 
-#: src/audacious/ui_preferences.c:122
+#: src/audacious/ui_preferences.c:119
 msgid "Polish"
 msgstr "Lengyel"
 
-#: src/audacious/ui_preferences.c:123
+#: src/audacious/ui_preferences.c:120
 msgid "Russian"
 msgstr "Orosz"
 
-#: src/audacious/ui_preferences.c:124
+#: src/audacious/ui_preferences.c:121
 msgid "Taiwanese"
 msgstr "Tajvani"
 
-#: src/audacious/ui_preferences.c:125
+#: src/audacious/ui_preferences.c:122
 msgid "Turkish"
 msgstr "Török"
 
-#: src/audacious/ui_preferences.c:147
+#: src/audacious/ui_preferences.c:144
 msgid "Album mode"
 msgstr "Album mód"
 
-#: src/audacious/ui_preferences.c:150
+#: src/audacious/ui_preferences.c:147
 msgid "Output Settings"
 msgstr "Kimeneti beállítások"
 
-#: src/audacious/ui_preferences.c:152
+#: src/audacious/ui_preferences.c:149
 msgid "Bit depth:"
 msgstr "Bit mélység:"
 
-#: src/audacious/ui_preferences.c:155
+#: src/audacious/ui_preferences.c:152
 msgid "Buffer size:"
 msgstr "Pufferméret:"
 
-#: src/audacious/ui_preferences.c:157
+#: src/audacious/ui_preferences.c:154
 msgid "ms"
 msgstr "ms"
 
-#: src/audacious/ui_preferences.c:158
+#: src/audacious/ui_preferences.c:155
 msgid "Use software volume control (not recommended)"
 msgstr "Szoftveres hangerő-szabályozás használata (nem ajánlott)"
 
-#: src/audacious/ui_preferences.c:160
+#: src/audacious/ui_preferences.c:157
 msgid "Replay Gain"
 msgstr "Replay Gain"
 
-#: src/audacious/ui_preferences.c:161
+#: src/audacious/ui_preferences.c:158
 msgid "Enable Replay Gain"
 msgstr "Lejátszási erősítés engedélyezése"
 
-#: src/audacious/ui_preferences.c:164
+#: src/audacious/ui_preferences.c:161
 msgid "Prevent clipping (recommended)"
 msgstr "Vágás megakadályozása (ajánlott)"
 
-#: src/audacious/ui_preferences.c:166
+#: src/audacious/ui_preferences.c:163
 msgid "Adjust Levels"
 msgstr "Szintek állítása"
 
-#: src/audacious/ui_preferences.c:167
+#: src/audacious/ui_preferences.c:164
 msgid "Amplify all files:"
 msgstr "Amplify all files:"
 
-#: src/audacious/ui_preferences.c:169 src/audacious/ui_preferences.c:172
+#: src/audacious/ui_preferences.c:166 src/audacious/ui_preferences.c:169
 msgid "dB"
 msgstr "dB"
 
-#: src/audacious/ui_preferences.c:170
+#: src/audacious/ui_preferences.c:167
 msgid "Amplify untagged files:"
 msgstr "Címkézetlen fájlok kiegészítése:"
 
-#: src/audacious/ui_preferences.c:175
+#: src/audacious/ui_preferences.c:172
 msgid "Proxy hostname:"
 msgstr "Proxy gépnév:"
 
-#: src/audacious/ui_preferences.c:176
+#: src/audacious/ui_preferences.c:173
 msgid "Proxy port:"
 msgstr "Proxy port:"
 
-#: src/audacious/ui_preferences.c:179
+#: src/audacious/ui_preferences.c:176
 msgid "Proxy username:"
 msgstr "Proxy felhasználónév:"
 
-#: src/audacious/ui_preferences.c:180
+#: src/audacious/ui_preferences.c:177
 msgid "Proxy password:"
 msgstr "Proxy jelszó:"
 
-#: src/audacious/ui_preferences.c:184
+#: src/audacious/ui_preferences.c:181
 msgid "Proxy Configuration"
 msgstr "Proxy beállítása"
 
-#: src/audacious/ui_preferences.c:185
+#: src/audacious/ui_preferences.c:182
 msgid "Enable proxy usage"
 msgstr "Proxyhasználat bekapcsolása"
 
-#: src/audacious/ui_preferences.c:188
+#: src/audacious/ui_preferences.c:185
 msgid "Use authentication with proxy"
 msgstr "Hitelesítés használata proxyval"
 
-#: src/audacious/ui_preferences.c:196
+#: src/audacious/ui_preferences.c:193
 msgid "Auto character encoding detector for:"
 msgstr "Automatikus karakterkódolás felismerés ennél:"
 
-#: src/audacious/ui_preferences.c:201
+#: src/audacious/ui_preferences.c:198
 msgid "Fallback character encodings:"
 msgstr "Tartalék karakterkódolások:"
 
-#: src/audacious/ui_preferences.c:205
+#: src/audacious/ui_preferences.c:202
 msgid "Behavior"
 msgstr "Viselkedés"
 
-#: src/audacious/ui_preferences.c:206
+#: src/audacious/ui_preferences.c:203
 msgid "Continue playback on startup"
 msgstr "Lejátszás folytatása induláskor"
 
-#: src/audacious/ui_preferences.c:208
+#: src/audacious/ui_preferences.c:205
 msgid "Advance when the current song is deleted"
 msgstr "Ajánlott amikor a jelenlegi zeneszám törlésre kerül"
 
-#: src/audacious/ui_preferences.c:210
+#: src/audacious/ui_preferences.c:207
 msgid "Clear the playlist when opening files"
 msgstr "Lejátszólista törlése fájlok megnyitásakor"
 
-#: src/audacious/ui_preferences.c:212
+#: src/audacious/ui_preferences.c:209
 msgid "Open files in a temporary playlist"
 msgstr "Fájlok megnyitása az ideiglenes lejátszólistában"
 
-#: src/audacious/ui_preferences.c:214
+#: src/audacious/ui_preferences.c:211
 msgid "Metadata"
 msgstr "Metaadat"
 
-#: src/audacious/ui_preferences.c:215
+#: src/audacious/ui_preferences.c:212
 msgid "Do not load metadata for songs until played"
 msgstr "Ne töltse be a metaadatokat amíg játssza a dalt"
 
-#: src/audacious/ui_preferences.c:233
+#: src/audacious/ui_preferences.c:230
 msgid "TITLE"
 msgstr "CÍM"
 
-#: src/audacious/ui_preferences.c:234
+#: src/audacious/ui_preferences.c:231
 msgid "ARTIST - TITLE"
 msgstr "ELŐADÓ - CÍM"
 
-#: src/audacious/ui_preferences.c:235
+#: src/audacious/ui_preferences.c:232
 msgid "ARTIST - ALBUM - TITLE"
 msgstr "ELŐADÓ - ALBUM - CÍM"
 
-#: src/audacious/ui_preferences.c:236
+#: src/audacious/ui_preferences.c:233
 msgid "ARTIST - ALBUM - TRACK. TITLE"
 msgstr "ELŐADÓ - ALBUM - SÁV. CÍM"
 
-#: src/audacious/ui_preferences.c:237
+#: src/audacious/ui_preferences.c:234
 msgid "ARTIST [ ALBUM ] - TRACK. TITLE"
 msgstr "ELŐADÓ [ ALBUM] - SÁV. CÍM"
 
-#: src/audacious/ui_preferences.c:238
+#: src/audacious/ui_preferences.c:235
 msgid "ALBUM - TITLE"
 msgstr "ALBUM - CÍM"
 
-#: src/audacious/ui_preferences.c:577
+#: src/audacious/ui_preferences.c:556
 msgid "Category"
 msgstr "Kategória"
 
-#: src/audacious/ui_preferences.c:801
+#: src/audacious/ui_preferences.c:780
 msgid "Popup Information Settings"
 msgstr "Felbukkanó információ beállításai"
 
-#: src/audacious/ui_preferences.c:810
+#: src/audacious/ui_preferences.c:789
 msgid "Cover image retrieve"
 msgstr "Borítókép letöltése"
 
-#: src/audacious/ui_preferences.c:815
+#: src/audacious/ui_preferences.c:794
 msgid ""
 "While searching for the album's cover, Audacious looks for certain words in "
 "the filename. You can specify those words in the lists below, separated "
@@ -593,75 +610,75 @@
 "fájlnévben. Megadhatja ezeket a szavakat az alábbi listában, vesszővel "
 "elválasztva."
 
-#: src/audacious/ui_preferences.c:832
+#: src/audacious/ui_preferences.c:811
 msgid "Exclude:"
 msgstr "Kihagyja:"
 
-#: src/audacious/ui_preferences.c:839
+#: src/audacious/ui_preferences.c:818
 msgid "Include:"
 msgstr "Beletartozzon:"
 
-#: src/audacious/ui_preferences.c:856
+#: src/audacious/ui_preferences.c:835
 msgid "Recursively search for cover"
 msgstr "Borító keresése rekurzívan"
 
-#: src/audacious/ui_preferences.c:866
+#: src/audacious/ui_preferences.c:845
 msgid "Search depth: "
 msgstr "Keresési mélység: "
 
-#: src/audacious/ui_preferences.c:880
+#: src/audacious/ui_preferences.c:859
 msgid "Use per-file cover"
 msgstr "Fájlonkénti borító használata"
 
-#: src/audacious/ui_preferences.c:883
+#: src/audacious/ui_preferences.c:862
 msgid "Miscellaneous"
 msgstr "Egyéb"
 
-#: src/audacious/ui_preferences.c:892
+#: src/audacious/ui_preferences.c:871
 msgid "Show Progress bar for the current track"
 msgstr "Folyamatjelző mutatása az aktuális számhoz"
 
-#: src/audacious/ui_preferences.c:902
+#: src/audacious/ui_preferences.c:881
 msgid "Delay until filepopup comes up: "
 msgstr "Késleltetés a file popup ablak megnyitásakor:"
 
-#: src/audacious/ui_preferences.c:1340
+#: src/audacious/ui_preferences.c:1309
 msgid "Custom"
 msgstr "Egyéni"
 
-#: src/audacious/ui_preferences.c:1383
+#: src/audacious/ui_preferences.c:1352
 msgid "Song Display"
 msgstr "Szám megjelenítése"
 
-#: src/audacious/ui_preferences.c:1392
+#: src/audacious/ui_preferences.c:1361
 msgid "Show song numbers"
 msgstr "A dalok számának mutatása"
 
-#: src/audacious/ui_preferences.c:1403
+#: src/audacious/ui_preferences.c:1372
 msgid "Show leading zeroes (02:00 instead of 2:00)"
 msgstr "Vezető nullák mutatása (2:00 helyett 02:00)"
 
-#: src/audacious/ui_preferences.c:1425
+#: src/audacious/ui_preferences.c:1394
 msgid "Show information about titlestring format"
 msgstr "Információ megjelenítése a cím-karakterlánc formátumáról"
 
-#: src/audacious/ui_preferences.c:1441
+#: src/audacious/ui_preferences.c:1410
 msgid "Custom string:"
 msgstr "Egyéni karakterlánc:"
 
-#: src/audacious/ui_preferences.c:1448
+#: src/audacious/ui_preferences.c:1417
 msgid "Title format:"
 msgstr "Címformátum:"
 
-#: src/audacious/ui_preferences.c:1459
+#: src/audacious/ui_preferences.c:1428
 msgid "Popup Information"
 msgstr "Felbukkanó információ"
 
-#: src/audacious/ui_preferences.c:1474
+#: src/audacious/ui_preferences.c:1443
 msgid "Show popup information for playlist entries"
 msgstr "Felbukkanó információ megjelenítése a lejátszólista bejegyzéseknél"
 
-#: src/audacious/ui_preferences.c:1475
+#: src/audacious/ui_preferences.c:1444
 msgid ""
 "Toggles popup information window for the pointed entry in the playlist. The "
 "window shows title of song, name of album, genre, year of publish, track "
@@ -672,67 +689,84 @@
 "műfaját, a megjelenés évét, a szám sorszámát, a szám hosszát és az "
 "albumborítót."
 
-#: src/audacious/ui_preferences.c:1486
+#: src/audacious/ui_preferences.c:1455
 msgid "Edit settings for popup information"
 msgstr "Felbukkanó információ beállításainak szerkesztése"
 
-#: src/audacious/ui_preferences.c:1575
+#: src/audacious/ui_preferences.c:1544
 msgid "Output plugin:"
 msgstr "Kimeneti bővítmény:"
 
-#: src/audacious/ui_preferences.c:1634
+#: src/audacious/ui_preferences.c:1603
 msgid "Transport"
 msgstr "Átvitel"
 
-#: src/audacious/ui_preferences.c:1634
+#: src/audacious/ui_preferences.c:1603
 msgid "Input"
 msgstr "Bemenet"
 
-#: src/audacious/ui_preferences.c:1635
+#: src/audacious/ui_preferences.c:1604
 msgid "Effect"
 msgstr "Effekt"
 
-#: src/audacious/ui_preferences.c:1635
+#: src/audacious/ui_preferences.c:1604
 msgid "Visualization"
 msgstr "Megjelenítés"
 
-#: src/audacious/ui_preferences.c:1635
+#: src/audacious/ui_preferences.c:1604
 msgid "General"
 msgstr "Általános"
 
-#: src/audacious/ui_preferences.c:1675
+#: src/audacious/ui_preferences.c:1644
 msgid "Audacious Preferences"
 msgstr "Audacious beállításai"
 
-#: src/audacious/util.c:123
+#: src/audacious/util.c:120
 #, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr "Nem lehet létrehozni a könyvtárat (%s): %s\n"
 
-#: src/audtool/handlers_playlist.c:274
+#: src/audtool/handlers_playlist.c:273
 msgid "Position not found."
 msgstr "Pozíció nem található."
 
-#: src/audtool/handlers_vitals.c:64
+#: src/audtool/handlers_vitals.c:63
 msgid "No song playing."
 msgstr "Nincs lejátszott dal."
 
-#: src/libaudcore/tuple.c:685
+#: src/libaudcore/audstrings.c:199
+#, c-format
+msgid "Audio CD, track %s"
+msgstr "Audio CD, sáv %s"
+
+#: src/libaudcore/tuple.c:536
 msgid "Mono"
 msgstr "Monó"
 
-#: src/libaudcore/tuple.c:687
+#: src/libaudcore/tuple.c:538
 msgid "Stereo"
 msgstr "Sztereó"
 
-#: src/libaudcore/tuple.c:689
+#: src/libaudcore/tuple.c:540
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d csatorna"
 msgstr[1] "%d csatorna"
 
-#: src/libaudgui/confirm.c:78
+#: src/libaudgui/about.c:52 src/libaudgui/about.c:115
+msgid "Credits"
+msgstr "Köszönet"
+
+#: src/libaudgui/about.c:52
+msgid "Translators"
+msgstr "Fordítók"
+
+#: src/libaudgui/about.c:91
+msgid "About Audacious"
+msgstr "Audacious névjegye"
+
+#: src/libaudgui/confirm.c:76
 #, c-format
 msgid ""
 "Are you sure you want to close %s? If you do, any changes made since the "
@@ -741,338 +775,326 @@
 "Valóban be akarja zárni ezt a fájlt %s? Ha igen, akkor bármilyen változás "
 "történt a lejátszólistán az el fog veszni."
 
-#: src/libaudgui/confirm.c:91
+#: src/libaudgui/confirm.c:89
 msgid "_Don't show this message again"
 msgstr "_Ne mutassa többé ezt a figyelmeztetést"
 
-#: src/libaudgui/confirm.c:128
+#: src/libaudgui/confirm.c:126
 msgid "Rename Playlist"
 msgstr "Lejátszólista átnevezése"
 
-#: src/libaudgui/effects-menu.c:76
+#: src/libaudgui/effects-menu.c:74
 msgid "settings ..."
 msgstr "beállítások ..."
 
-#: src/libaudgui/equalizer.c:52
+#: src/libaudgui/equalizer.c:51
 msgid "_Enable"
 msgstr "_Engedélyezve"
 
-#: src/libaudgui/equalizer.c:124
+#: src/libaudgui/equalizer.c:123
 msgid "31 Hz"
 msgstr "31 Hz"
 
-#: src/libaudgui/equalizer.c:124
+#: src/libaudgui/equalizer.c:123
 msgid "63 Hz"
 msgstr "63 Hz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "125 Hz"
 msgstr "125 Hz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "250 Hz"
 msgstr "250 Hz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "500 Hz"
 msgstr "500 Hz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "1 kHz"
 msgstr "1 kHz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "2 kHz"
 msgstr "2 kHz"
 
-#: src/libaudgui/equalizer.c:126
+#: src/libaudgui/equalizer.c:125
 msgid "4 kHz"
 msgstr "4 kHz"
 
-#: src/libaudgui/equalizer.c:126
+#: src/libaudgui/equalizer.c:125
 msgid "8 kHz"
 msgstr "8 kHz"
 
-#: src/libaudgui/equalizer.c:126
+#: src/libaudgui/equalizer.c:125
 msgid "16 kHz"
 msgstr "16 kHz"
 
-#: src/libaudgui/equalizer.c:131
+#: src/libaudgui/equalizer.c:130
 msgid "Equalizer"
 msgstr "Equalizer"
 
-#: src/libaudgui/equalizer.c:147
+#: src/libaudgui/equalizer.c:146
 msgid "Preamp"
 msgstr "Preamp"
 
-#: src/libaudgui/infopopup.c:211
+#: src/libaudgui/infopopup.c:207
 msgid "Track Number"
 msgstr "Szám sorszáma"
 
-#: src/libaudgui/infopopup.c:213
+#: src/libaudgui/infopopup.c:209
 msgid "Track Length"
 msgstr "Szám hossza"
 
-#: src/libaudgui/infowin.c:77
+#: src/libaudgui/infowin.c:75
 msgid "Acid Jazz"
 msgstr "Acid Jazz"
 
-#: src/libaudgui/infowin.c:78
+#: src/libaudgui/infowin.c:76
 msgid "Acid Rock"
 msgstr "Acid rock"
 
-#: src/libaudgui/infowin.c:79
+#: src/libaudgui/infowin.c:77
 msgid "Ambient"
 msgstr "Ambient"
 
-#: src/libaudgui/infowin.c:80
+#: src/libaudgui/infowin.c:78
 msgid "Bebop"
 msgstr "Bebop"
 
-#: src/libaudgui/infowin.c:81
+#: src/libaudgui/infowin.c:79
 msgid "Bluegrass"
 msgstr "Bluegrass"
 
-#: src/libaudgui/infowin.c:82
+#: src/libaudgui/infowin.c:80
 msgid "Blues"
 msgstr "Blues"
 
-#: src/libaudgui/infowin.c:83
+#: src/libaudgui/infowin.c:81
 msgid "Chamber Music"
 msgstr "Chamber Music"
 
-#: src/libaudgui/infowin.c:84
+#: src/libaudgui/infowin.c:82
 msgid "Classical"
 msgstr "Klasszikus"
 
-#: src/libaudgui/infowin.c:85
+#: src/libaudgui/infowin.c:83
 msgid "Country"
 msgstr "Country"
 
-#: src/libaudgui/infowin.c:86
+#: src/libaudgui/infowin.c:84
 msgid "Death Metal"
 msgstr "Death Metal"
 
-#: src/libaudgui/infowin.c:87
+#: src/libaudgui/infowin.c:85
 msgid "Disco"
 msgstr "Diszkó"
 
-#: src/libaudgui/infowin.c:88
+#: src/libaudgui/infowin.c:86
 msgid "Easy Listening"
 msgstr "Easy Listening"
 
-#: src/libaudgui/infowin.c:89
+#: src/libaudgui/infowin.c:87
 msgid "Folk"
 msgstr "Folk"
 
-#: src/libaudgui/infowin.c:90
+#: src/libaudgui/infowin.c:88
 msgid "Funk"
 msgstr "Funk"
 
-#: src/libaudgui/infowin.c:91
+#: src/libaudgui/infowin.c:89
 msgid "Gangsta Rap"
 msgstr "Gengszter Rap"
 
-#: src/libaudgui/infowin.c:92
+#: src/libaudgui/infowin.c:90
 msgid "Gospel"
 msgstr "Gospel"
 
-#: src/libaudgui/infowin.c:93
+#: src/libaudgui/infowin.c:91
 msgid "Grunge"
 msgstr "Grunge"
 
-#: src/libaudgui/infowin.c:94
+#: src/libaudgui/infowin.c:92
 msgid "Hard Rock"
 msgstr "Kemény Rock"
 
-#: src/libaudgui/infowin.c:95
+#: src/libaudgui/infowin.c:93
 msgid "Heavy Metal"
 msgstr "Heavy Metal"
 
-#: src/libaudgui/infowin.c:96
+#: src/libaudgui/infowin.c:94
 msgid "Hip-hop"
 msgstr "Hip-hop"
 
-#: src/libaudgui/infowin.c:97
+#: src/libaudgui/infowin.c:95
 msgid "House"
 msgstr "House"
 
-#: src/libaudgui/infowin.c:98
+#: src/libaudgui/infowin.c:96
 msgid "Jazz"
 msgstr "Jazz"
 
-#: src/libaudgui/infowin.c:99
+#: src/libaudgui/infowin.c:97
 msgid "Jungle"
 msgstr "Jungle"
 
-#: src/libaudgui/infowin.c:100
+#: src/libaudgui/infowin.c:98
 msgid "Metal"
 msgstr "Metal"
 
-#: src/libaudgui/infowin.c:101
+#: src/libaudgui/infowin.c:99
 msgid "New Age"
 msgstr "New Age"
 
-#: src/libaudgui/infowin.c:102
+#: src/libaudgui/infowin.c:100
 msgid "New Wave"
 msgstr "Új Hullám"
 
-#: src/libaudgui/infowin.c:103
+#: src/libaudgui/infowin.c:101
 msgid "Noise"
 msgstr "Noise"
 
-#: src/libaudgui/infowin.c:104
+#: src/libaudgui/infowin.c:102
 msgid "Pop"
 msgstr "Pop"
 
-#: src/libaudgui/infowin.c:105
+#: src/libaudgui/infowin.c:103
 msgid "Punk Rock"
 msgstr "Punk Rock"
 
-#: src/libaudgui/infowin.c:106
+#: src/libaudgui/infowin.c:104
 msgid "Rap"
 msgstr "Rap"
 
-#: src/libaudgui/infowin.c:107
+#: src/libaudgui/infowin.c:105
 msgid "Reggae"
 msgstr "Reggae"
 
-#: src/libaudgui/infowin.c:108
+#: src/libaudgui/infowin.c:106
 msgid "Rock"
 msgstr "Rock"
 
-#: src/libaudgui/infowin.c:109
+#: src/libaudgui/infowin.c:107
 msgid "Rock and Roll"
 msgstr "Rock and Roll"
 
-#: src/libaudgui/infowin.c:110
+#: src/libaudgui/infowin.c:108
 msgid "Rhythm and Blues"
 msgstr "Rhythm and Blues"
 
-#: src/libaudgui/infowin.c:111
+#: src/libaudgui/infowin.c:109
 msgid "Ska"
 msgstr "Ska"
 
-#: src/libaudgui/infowin.c:112
+#: src/libaudgui/infowin.c:110
 msgid "Soul"
 msgstr "Soul"
 
-#: src/libaudgui/infowin.c:113
+#: src/libaudgui/infowin.c:111
 msgid "Swing"
 msgstr "Szving"
 
-#: src/libaudgui/infowin.c:114
+#: src/libaudgui/infowin.c:112
 msgid "Techno"
 msgstr "Techno"
 
-#: src/libaudgui/infowin.c:115
+#: src/libaudgui/infowin.c:113
 msgid "Trip-hop"
 msgstr "Trip-hop"
 
-#: src/libaudgui/infowin.c:175 src/libaudgui/infowin.c:361
-#: src/libaudgui/infowin.c:364 src/libaudgui/infowin.c:367
+#: src/libaudgui/infowin.c:177 src/libaudgui/infowin.c:363
+#: src/libaudgui/infowin.c:366 src/libaudgui/infowin.c:369
 msgid "n/a"
 msgstr "n/a"
 
-#: src/libaudgui/infowin.c:265
+#: src/libaudgui/infowin.c:267
 msgid "Metadata updated successfully"
 msgstr "Metaadat frissítés sikeres"
 
-#: src/libaudgui/infowin.c:270
+#: src/libaudgui/infowin.c:272
 msgid "Metadata updating failed"
 msgstr "Metaadat frissítés sikertelen"
 
-#: src/libaudgui/infowin.c:318
+#: src/libaudgui/infowin.c:320
 msgid "Track Information"
 msgstr "Száminformáció"
 
-#: src/libaudgui/infowin.c:350
+#: src/libaudgui/infowin.c:352
 msgid "Format:"
 msgstr "Formátum:"
 
-#: src/libaudgui/infowin.c:354
+#: src/libaudgui/infowin.c:356
 msgid "Quality:"
 msgstr "Minőség:"
 
-#: src/libaudgui/infowin.c:357
+#: src/libaudgui/infowin.c:359
 msgid "Bitrate:"
 msgstr "Bitráta:"
 
-#: src/libaudgui/infowin.c:387
+#: src/libaudgui/infowin.c:389
 msgid "Title"
 msgstr "Cím"
 
-#: src/libaudgui/infowin.c:399
+#: src/libaudgui/infowin.c:401
 msgid "Artist"
 msgstr "Előadó"
 
-#: src/libaudgui/infowin.c:411
+#: src/libaudgui/infowin.c:413
 msgid "Album"
 msgstr "Album"
 
-#: src/libaudgui/infowin.c:423
+#: src/libaudgui/infowin.c:425
 msgid "Comment"
 msgstr "Megjegyzés"
 
-#: src/libaudgui/infowin.c:435
+#: src/libaudgui/infowin.c:437
 msgid "Genre"
 msgstr "Műfaj"
 
-#: src/libaudgui/infowin.c:456
+#: src/libaudgui/infowin.c:458
 msgid "Year"
 msgstr "Év"
 
-#: src/libaudgui/infowin.c:467
+#: src/libaudgui/infowin.c:469
 msgid "Track Number"
 msgstr "Szám sorszáma"
 
-#: src/libaudgui/infowin.c:549
+#: src/libaudgui/infowin.c:548
 #, c-format
 msgid "%d kb/s"
 msgstr "%d kb/s"
 
-#: src/libaudgui/infowin.c:579
+#: src/libaudgui/infowin.c:575
 #, c-format
 msgid "No info available for %s.\n"
 msgstr "Nincs ehhez információ %s.\n"
 
-#: src/libaudgui/jump-to-time.c:75
+#: src/libaudgui/jump-to-time.c:72
 msgid "Jump to Time"
 msgstr "Ugrás időpontra"
 
-#: src/libaudgui/jump-to-time.c:90
+#: src/libaudgui/jump-to-time.c:87
 msgid "mm:ss"
 msgstr "mm:ss"
 
-#: src/libaudgui/playlists.c:39
+#: src/libaudgui/playlists.c:33
 msgid "Export Playlist"
 msgstr "Lejátszólista exportálása"
 
-#: src/libaudgui/playlists.c:39
+#: src/libaudgui/playlists.c:33
 msgid "Import Playlist"
 msgstr "Lejátszólista importálása"
 
-#: src/libaudgui/playlists.c:72
+#: src/libaudgui/playlists.c:66
 #, c-format
 msgid "Overwrite %s?"
 msgstr "Felülírja %s?"
 
-#: src/libaudgui/queue-manager.c:185
+#: src/libaudgui/queue-manager.c:196
 msgid "Queue Manager"
 msgstr "Várakozási sor menedzser"
 
-#: src/libaudgui/ui_about.c:69
-msgid "About Audacious"
-msgstr "Audacious névjegye"
-
-#: src/libaudgui/ui_about.c:90 src/libaudgui/ui_credits.c:122
-msgid "Credits"
-msgstr "Köszönet"
-
-#: src/libaudgui/ui_credits.c:126
-msgid "Translators"
-msgstr "Fordítók"
-
 #: src/libaudgui/ui_fileopener.c:109
 msgid "Open Files"
 msgstr "Fájlok megnyitása"
@@ -1089,60 +1111,60 @@
 msgid "Close dialog on Add"
 msgstr "Párbeszédablak bezárása hozzáadás után"
 
-#: src/libaudgui/ui_jumptotrack.c:103 src/libaudgui/ui_jumptotrack.c:111
-#: src/libaudgui/ui_jumptotrack.c:322
+#: src/libaudgui/ui_jumptotrack.c:109 src/libaudgui/ui_jumptotrack.c:117
+#: src/libaudgui/ui_jumptotrack.c:326
 msgid "_Queue"
 msgstr "_Sorba állítás"
 
-#: src/libaudgui/ui_jumptotrack.c:109
+#: src/libaudgui/ui_jumptotrack.c:115
 msgid "Un_queue"
 msgstr "_Kiszedés a sorból"
 
-#: src/libaudgui/ui_jumptotrack.c:239
-msgid "Jump to Track"
-msgstr "Ugrás számra"
+#: src/libaudgui/ui_jumptotrack.c:258
+msgid "Jump to Song"
+msgstr "Ugrás a számra"
 
-#: src/libaudgui/ui_jumptotrack.c:277
+#: src/libaudgui/ui_jumptotrack.c:281
 msgid "Filter: "
 msgstr "Szűrő: "
 
-#: src/libaudgui/ui_jumptotrack.c:278
+#: src/libaudgui/ui_jumptotrack.c:282
 msgid "_Filter:"
 msgstr "_Szűrő: "
 
-#: src/libaudgui/ui_jumptotrack.c:288
+#: src/libaudgui/ui_jumptotrack.c:292
 msgid "Remember"
 msgstr "Megjegyzés"
 
-#: src/libaudgui/ui_jumptotrack.c:295
+#: src/libaudgui/ui_jumptotrack.c:299
 msgid "Clea_r"
 msgstr "Tö_rlés"
 
-#: src/libaudgui/ui_jumptotrack.c:315
+#: src/libaudgui/ui_jumptotrack.c:319
 msgid "Close on Jump"
 msgstr "Bezárás ugrás után"
 
-#: src/libaudgui/ui_playlist_manager.c:250
+#: src/libaudgui/ui_playlist_manager.c:253
 msgid "Playlist Manager"
 msgstr "Lejátszólista kezelő"
 
-#: src/libaudgui/ui_playlist_manager.c:277
+#: src/libaudgui/ui_playlist_manager.c:280
 msgid "Entries"
 msgstr "Elemek"
 
-#: src/libaudgui/ui_playlist_manager.c:298
+#: src/libaudgui/ui_playlist_manager.c:301
 msgid "_Rename"
 msgstr "Át_nevezés"
 
-#: src/libaudgui/ui_playlist_manager.c:322
+#: src/libaudgui/ui_playlist_manager.c:325
 msgid "_Close dialog on activating playlist"
 msgstr "_Párbeszédablak bezárása a lejátszólista aktíválása után"
 
-#: src/libaudgui/ui_urlopener.c:51
+#: src/libaudgui/ui_urlopener.c:48
 msgid "Open URL"
 msgstr "URL megnyitása"
 
-#: src/libaudgui/ui_urlopener.c:51
+#: src/libaudgui/ui_urlopener.c:48
 msgid "Add URL"
 msgstr "URL hozzáadása"
 
@@ -1158,30 +1180,30 @@
 msgid "File is not a valid .desktop file"
 msgstr "A fájl nem valós .desktop fájl"
 
-#: src/libeggsmclient/eggdesktopfile.c:188
+#: src/libeggsmclient/eggdesktopfile.c:191
 #, c-format
 msgid "Unrecognized desktop file Version '%s'"
 msgstr "Ismeretlen desktop fájl verzió '%s'"
 
-#: src/libeggsmclient/eggdesktopfile.c:967
+#: src/libeggsmclient/eggdesktopfile.c:974
 #, c-format
 msgid "Starting %s"
 msgstr "Indítás %s"
 
-#: src/libeggsmclient/eggdesktopfile.c:1108
+#: src/libeggsmclient/eggdesktopfile.c:1116
 msgid "Application does not accept documents on command line"
 msgstr "Az alkalmazás nem fog el dokumentumokat a parancssorban"
 
-#: src/libeggsmclient/eggdesktopfile.c:1176
+#: src/libeggsmclient/eggdesktopfile.c:1184
 #, c-format
 msgid "Unrecognized launch option: %d"
 msgstr "Ismeretlen futtatási opció: %d"
 
-#: src/libeggsmclient/eggdesktopfile.c:1375
+#: src/libeggsmclient/eggdesktopfile.c:1391
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
 msgstr "Nem adja át a dokumentum URI a 'Type=Link' desktop értéket"
 
-#: src/libeggsmclient/eggdesktopfile.c:1396
+#: src/libeggsmclient/eggdesktopfile.c:1412
 msgid "Not a launchable item"
 msgstr "Nincs futtatható elem"

audacious-3.1.1.tar.bz2/po/it.po -> audacious-3.2.4.tar.bz2/po/it.po Changed

@@ -1,2654 +1,1241 @@
-# translation of it.po to Italian
-# Italian translation of bmp.
-# Copyright (C) 2004 Alessio D'Ascanio <g3ntaro@gmail.com>
-# This file is distributed under the same license as the bmp package.
+# Italian translation for Audacious
+# Copyright (C) Audacious translators
+# This file is distributed under the same license as the Audacious package.
 #
+# Translators:
 # Alessio D'Ascanio <g3ntaro@gmail.com>, 2004.
 # Diego 'Flameeyes' Pettenò <flameeyes@gentoo.org>, 2006.
 # Diego 'Flameeyes' Pettenò <flameeyes@gmail.com>, 2007.
+# Jacopo Lorenzetti <jacopo.jl@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: it\n"
-"Report-Msgid-Bugs-To: http://jira.atheme.org/\n"
-"POT-Creation-Date: 2011-07-05 22:45+0200\n"
-"PO-Revision-Date: 2007-02-19 19:12+0100\n"
-"Last-Translator: Diego 'Flameeyes' Pettenò <flameeyes@gmail.com>\n"
+"Project-Id-Version: Audacious\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2012-01-11 08:54-0500\n"
+"PO-Revision-Date: 2012-01-11 18:54+0000\n"
+"Last-Translator: Jacopo Lorenzetti <jacopo.jl@gmail.com>\n"
 "Language-Team: Italian\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Italian\n"
-"X-Poedit-Country: ITALY\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/audacious/adder.c:71
+#: src/audacious/adder.c:77
 msgid "Searching ..."
-msgstr ""
+msgstr "Ricerca in corso…"
 
-#: src/audacious/adder.c:99
+#: src/audacious/adder.c:113
 #, c-format
 msgid "%d file found"
 msgid_plural "%d files found"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Trovato %d file"
+msgstr[1] "Trovati %d file"
 
-#: src/audacious/chardet.c:37
+#: src/audacious/chardet.c:39
 msgid " (invalid UTF-8)"
-msgstr " (UTF-8 invalido)"
+msgstr " (UTF-8 non valido)"
 
-#: src/audacious/credits.c:35
-#, fuzzy
+#: src/audacious/credits.c:37
 msgid "Core developers:"
-msgstr "Sviluppatori di 0.1.x:"
+msgstr "Core developer:"
 
-#: src/audacious/credits.c:49
+#: src/audacious/credits.c:51
 msgid "Graphics:"
 msgstr "Grafica:"
 
-#: src/audacious/credits.c:54
+#: src/audacious/credits.c:56
 msgid "Default skin:"
 msgstr "Skin predefinita:"
 
-#: src/audacious/credits.c:60
+#: src/audacious/credits.c:62
 msgid "Plugin development:"
 msgstr "Sviluppo plugin:"
 
-#: src/audacious/credits.c:83
+#: src/audacious/credits.c:85
 msgid "Patch authors:"
-msgstr "Autori di modifiche:"
+msgstr "Autori di patch:"
 
-#: src/audacious/credits.c:126
-#, fuzzy
+#: src/audacious/credits.c:131
 msgid "1.x developers:"
-msgstr "Sviluppatori di 0.1.x:"
+msgstr "Sviluppatori 1.x:"
 
-#: src/audacious/credits.c:148
+#: src/audacious/credits.c:153
 msgid "BMP Developers:"
 msgstr "Sviluppatori di BMP:"
 
-#: src/audacious/credits.c:180
-#, fuzzy
+#: src/audacious/credits.c:185
 msgid "Belarusian:"
-msgstr "Bulgaro:"
+msgstr "Bielorusso:"
 
-#: src/audacious/credits.c:183
+#: src/audacious/credits.c:188
 msgid "Basque:"
-msgstr ""
+msgstr "Basco:"
 
-#: src/audacious/credits.c:186
+#: src/audacious/credits.c:191
 msgid "Brazilian Portuguese:"
-msgstr "Portoghese (Brasile):"
+msgstr "Portoghese brasiliano:"
 
-#: src/audacious/credits.c:190
+#: src/audacious/credits.c:196
 msgid "Breton:"
 msgstr "Bretone:"
 
-#: src/audacious/credits.c:193
+#: src/audacious/credits.c:199
 msgid "Bulgarian:"
 msgstr "Bulgaro:"
 
-#: src/audacious/credits.c:196
-#, fuzzy
+#: src/audacious/credits.c:202
 msgid "Catalan:"
-msgstr "Italiano:"
+msgstr "Catalano:"
 
-#: src/audacious/credits.c:199
-#, fuzzy
+#: src/audacious/credits.c:206
 msgid "Chinese:"
-msgstr "Linee"
+msgstr "Cinese:"
 
-#: src/audacious/credits.c:202
+#: src/audacious/credits.c:209
 msgid "Croatian:"
 msgstr "Croato:"
 
-#: src/audacious/credits.c:205
+#: src/audacious/credits.c:212
 msgid "Czech:"
 msgstr "Ceco:"
 
-#: src/audacious/credits.c:208
+#: src/audacious/credits.c:215
 msgid "Dutch:"
 msgstr "Olandese:"
 
-#: src/audacious/credits.c:212
-#, fuzzy
+#: src/audacious/credits.c:219
 msgid "Estonian:"
-msgstr "Rumeno:"
+msgstr "Estone:"
 
-#: src/audacious/credits.c:215
+#: src/audacious/credits.c:222
 msgid "Finnish:"
 msgstr "Finlandese:"
 
-#: src/audacious/credits.c:220
+#: src/audacious/credits.c:227
 msgid "French:"
 msgstr "Francese:"
 
-#: src/audacious/credits.c:226
+#: src/audacious/credits.c:233
 msgid "German:"
 msgstr "Tedesco:"
 
-#: src/audacious/credits.c:233
+#: src/audacious/credits.c:240
 msgid "Georgian:"
 msgstr "Georgiano:"
 
-#: src/audacious/credits.c:236
+#: src/audacious/credits.c:243
 msgid "Greek:"
 msgstr "Greco:"
 
-#: src/audacious/credits.c:241
+#: src/audacious/credits.c:248
 msgid "Hindi:"
 msgstr "Hindi:"
 
-#: src/audacious/credits.c:244
+#: src/audacious/credits.c:251
 msgid "Hungarian:"
 msgstr "Ungherese:"
 
-#: src/audacious/credits.c:248
+#: src/audacious/credits.c:255
 msgid "Italian:"
 msgstr "Italiano:"
 
-#: src/audacious/credits.c:252
+#: src/audacious/credits.c:260
 msgid "Japanese:"
 msgstr "Giapponese:"
 
-#: src/audacious/credits.c:255
+#: src/audacious/credits.c:263
 msgid "Korean:"
 msgstr "Coreano:"
 
-#: src/audacious/credits.c:258
-#, fuzzy
+#: src/audacious/credits.c:266
 msgid "Latvian:"
-msgstr "Croato:"
+msgstr "Lettone:"
 
-#: src/audacious/credits.c:261
+#: src/audacious/credits.c:269
 msgid "Lithuanian:"
 msgstr "Lituano:"
 
-#: src/audacious/credits.c:265
+#: src/audacious/credits.c:274
 msgid "Macedonian:"
 msgstr "Macedone:"
 
-#: src/audacious/credits.c:268
+#: src/audacious/credits.c:277
+msgid "Mexican Spanish:"
+msgstr "Spagnolo messicano:"
+
+#: src/audacious/credits.c:280
 msgid "Polish:"
 msgstr "Polacco:"
 
-#: src/audacious/credits.c:274
-#, fuzzy
+#: src/audacious/credits.c:287
 msgid "Portuguese:"
-msgstr "Portoghese (Brasile):"
+msgstr "Portoghese:"
 
-#: src/audacious/credits.c:277
+#: src/audacious/credits.c:290
 msgid "Romanian:"
 msgstr "Rumeno:"
 
-#: src/audacious/credits.c:281
+#: src/audacious/credits.c:294
 msgid "Russian:"
 msgstr "Russo:"
 
-#: src/audacious/credits.c:285
+#: src/audacious/credits.c:298
 msgid "Serbian (Latin):"
 msgstr "Serbo (Latino):"
 
-#: src/audacious/credits.c:288
+#: src/audacious/credits.c:301
 msgid "Serbian (Cyrillic):"
 msgstr "Serbo (Cirillico):"
 
-#: src/audacious/credits.c:291
+#: src/audacious/credits.c:305
 msgid "Simplified Chinese:"
 msgstr "Cinese semplificato:"
 
-#: src/audacious/credits.c:294
+#: src/audacious/credits.c:308
 msgid "Slovak:"
 msgstr "Slovacco:"
 
-#: src/audacious/credits.c:297
+#: src/audacious/credits.c:312
 msgid "Spanish:"
 msgstr "Spagnolo:"
 
-#: src/audacious/credits.c:304
+#: src/audacious/credits.c:320
 msgid "Swedish:"
 msgstr "Svedese:"
 
-#: src/audacious/credits.c:307
+#: src/audacious/credits.c:323
 msgid "Traditional Chinese:"
 msgstr "Cinese tradizionale:"
 
-#: src/audacious/credits.c:312
+#: src/audacious/credits.c:329
 msgid "Turkish:"
 msgstr "Turco:"
 
-#: src/audacious/credits.c:316
+#: src/audacious/credits.c:333
 msgid "Ukrainian:"
 msgstr "Ucraino:"
 
-#: src/audacious/credits.c:319
+#: src/audacious/credits.c:338
+msgid "Vietnamese:"
+msgstr "Vietnamita:"
+
+#: src/audacious/credits.c:341
 msgid "Welsh:"
 msgstr "Gallese:"
 
-#: src/audacious/drct.c:256
-#, fuzzy
-msgid "Temporary Playlist"
-msgstr "Carica playlist"
-
-#: src/audacious/equalizer_preset.c:186
+#: src/audacious/equalizer_preset.c:180
 #, c-format
 msgid "Error importing Winamp EQF file '%s'"
-msgstr ""
+msgstr "Errore durante l'importazione del file EQF di Winamp '%s'"
 
-#: src/audacious/main.c:256
+#: src/audacious/main.c:243
 msgid "Skip backwards in playlist"
-msgstr "Indietreggia nella playlist"
+msgstr "Salta indietro nella playlist"
 
-#: src/audacious/main.c:257
+#: src/audacious/main.c:244
 msgid "Start playing current playlist"
-msgstr "Riproduci la playlist corrente"
+msgstr "Avvia la riproduzione della playlist corrente"
 
-#: src/audacious/main.c:258
+#: src/audacious/main.c:245
 msgid "Pause current song"
-msgstr "Pausa"
+msgstr "Interrompi il brano corrente"
 
-#: src/audacious/main.c:259
+#: src/audacious/main.c:246
 msgid "Stop current song"
-msgstr "Ferma la canzone"
+msgstr "Ferma il brano corrente"
 
-#: src/audacious/main.c:260
+#: src/audacious/main.c:247
 msgid "Pause if playing, play otherwise"
-msgstr "Pausa se si sta suonando, altrimenti riproduci"
+msgstr "Interrompi se in riproduzione, altrimenti riproduci"
 
-#: src/audacious/main.c:261
+#: src/audacious/main.c:248
 msgid "Skip forward in playlist"
-msgstr "Avanza nella playlist"
+msgstr "Salta avanti nella playlist"
 
-#: src/audacious/main.c:262
+#: src/audacious/main.c:249
 msgid "Display Jump to File dialog"
-msgstr "Visualizza la finestra di dialogo Salta al File"
+msgstr "Visualizza la finestra di dialogo Salta al file"
 
-#: src/audacious/main.c:263
-#, fuzzy
+#: src/audacious/main.c:250
 msgid "Add files to the playlist"
-msgstr "Aggiunge file alla playlist."
+msgstr "Aggiunge file alla playlist"
 
-#: src/audacious/main.c:264
+#: src/audacious/main.c:251
 msgid "Add new files to a temporary playlist"
-msgstr "Aggiungi nuovi file ad una playlist temporanea"
+msgstr "Aggiunge nuovi file a una playlist temporanea"
 
-#: src/audacious/main.c:265
+#: src/audacious/main.c:252
 msgid "Display the main window"
-msgstr "Mostra la finestra principale"
+msgstr "Visualizza la finestra principale"
 
-#: src/audacious/main.c:266
-#, fuzzy
+#: src/audacious/main.c:253
 msgid "Show version"
-msgstr "Mostra player"
+msgstr "Mostra versione"
 
-#: src/audacious/main.c:267
+#: src/audacious/main.c:254
 msgid "Print debugging messages"
-msgstr ""
+msgstr "Visualizza messaggi di debug"
 
-#: src/audacious/main.c:268
+#: src/audacious/main.c:255
+msgid "Headless mode (beta)"
+msgstr "Modalità headless (beta)"
+
+#: src/audacious/main.c:256
 msgid "FILE..."
-msgstr "FILE..."
+msgstr "FILE…"
 
-#: src/audacious/main.c:280
+#: src/audacious/main.c:268
 msgid "- play multimedia files"
 msgstr "- riproduci file multimediali"
 
-#: src/audacious/main.c:290
+#: src/audacious/main.c:278
 #, c-format
 msgid ""
 "%s: %s\n"
 "Try `%s --help' for more information.\n"
 msgstr ""
 "%s: %s\n"
-"Per maggiori informazioni si veda `%s --help' .\n"
+"Per maggiori informazioni prova `%s --help'.\n"
 
-#: src/audacious/main.c:407
-msgid ""
-"Audacious seems to be already running but is not responding. You can start "
-"another instance of the program, but please be warned that this can cause "
-"data loss. If Audacious is not running, you can safely ignore this "
-"message. Press OK to start Audacious or Cancel to quit."
-msgstr ""
-
-#: src/audacious/main.c:572
+#: src/audacious/main.c:573
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/audacious/playback.c:381
+#: src/audacious/playback.c:307
 #, c-format
 msgid "No decoder found for %s."
-msgstr ""
+msgstr "Nessun decoder trovato per %s."
 
-#: src/audacious/playback.c:531
-msgid "Buffering ..."
-msgstr ""
+#: src/audacious/playlist-files.c:53
+#, c-format
+msgid "Cannot %s %s: unsupported file extension."
+msgstr "Impossibile %s %s: estensione file non supportata."
+
+#: src/audacious/playlist-files.c:54
+msgid "save"
+msgstr "salvare"
+
+#: src/audacious/playlist-files.c:54
+msgid "load"
+msgstr "caricare"
 
-#: src/audacious/playlist-new.c:303
-#, fuzzy
-msgid "Untitled Playlist"
+#: src/audacious/playlist-new.c:131
+msgid "New Playlist"
 msgstr "Nuova playlist"
 
-#: src/audacious/ui_preferences.c:87
+#: src/audacious/playlist-new.c:132
+msgid "Now Playing"
+msgstr "In riproduzione"
+
+#: src/audacious/playlist-new.c:1630
+msgid ""
+"The playlist cannot be sorted because metadata scanning is still in progress"
+" (or has been disabled)."
+msgstr ""
+"La playlist non può essere riordinata poiché la scansione dei metadati è "
+"ancora in corso (o è stata disabilitata)."
+
+#: src/audacious/ui_preferences.c:85
 msgid "Audio"
 msgstr "Audio"
 
-#: src/audacious/ui_preferences.c:88
+#: src/audacious/ui_preferences.c:86
 msgid "Network"
-msgstr ""
+msgstr "Rete"
 
-#: src/audacious/ui_preferences.c:89 src/audacious/ui_preferences.c:1556
+#: src/audacious/ui_preferences.c:87 src/audacious/ui_preferences.c:1603
 msgid "Playlist"
 msgstr "Playlist"
 
-#: src/audacious/ui_preferences.c:90
+#: src/audacious/ui_preferences.c:88
 msgid "Plugins"
-msgstr "Plugins"
+msgstr "Plugin"
 
-#: src/audacious/ui_preferences.c:96 src/libaudgui/infopopup.c:204
+#: src/audacious/ui_preferences.c:94 src/libaudgui/infopopup.c:199
 msgid "Artist"
 msgstr "Artista"
 
-#: src/audacious/ui_preferences.c:97 src/libaudgui/infopopup.c:206
+#: src/audacious/ui_preferences.c:95 src/libaudgui/infopopup.c:201
 msgid "Album"
 msgstr "Album"
 
-#: src/audacious/ui_preferences.c:98 src/libaudgui/infopopup.c:202
-#: src/libaudgui/ui_playlist_manager.c:263
+#: src/audacious/ui_preferences.c:96 src/libaudgui/infopopup.c:197
+#: src/libaudgui/ui_playlist_manager.c:279
 msgid "Title"
 msgstr "Titolo"
 
-#: src/audacious/ui_preferences.c:99
+#: src/audacious/ui_preferences.c:97
 msgid "Tracknumber"
 msgstr "Numero di traccia"
 
-#: src/audacious/ui_preferences.c:100 src/libaudgui/infopopup.c:208
+#: src/audacious/ui_preferences.c:98 src/libaudgui/infopopup.c:203
 msgid "Genre"
 msgstr "Genere"
 
-#: src/audacious/ui_preferences.c:101
+#: src/audacious/ui_preferences.c:99
 msgid "Filename"
 msgstr "Nome del file"
 
-#: src/audacious/ui_preferences.c:102
+#: src/audacious/ui_preferences.c:100
 msgid "Filepath"
-msgstr "Percorso file"
+msgstr "Percorso del file"
 
-#: src/audacious/ui_preferences.c:103
+#: src/audacious/ui_preferences.c:101
 msgid "Date"
 msgstr "Data"
 
-#: src/audacious/ui_preferences.c:104 src/libaudgui/infopopup.c:210
+#: src/audacious/ui_preferences.c:102 src/libaudgui/infopopup.c:205
 msgid "Year"
 msgstr "Anno"
 
-#: src/audacious/ui_preferences.c:105
+#: src/audacious/ui_preferences.c:103
 msgid "Comment"
 msgstr "Commento"
 
-#: src/audacious/ui_preferences.c:106
+#: src/audacious/ui_preferences.c:104
 msgid "Codec"
-msgstr ""
+msgstr "Codec"
 
-#: src/audacious/ui_preferences.c:107
-#, fuzzy
+#: src/audacious/ui_preferences.c:105
 msgid "Quality"
-msgstr "_Esci"
+msgstr "Qualità"
 
-#: src/audacious/ui_preferences.c:112
+#: src/audacious/ui_preferences.c:111
 msgid "None"
-msgstr ""
+msgstr "Nessuna"
+
+#: src/audacious/ui_preferences.c:112
+msgid "Arabic"
+msgstr "Araba"
 
 #: src/audacious/ui_preferences.c:113
-#, fuzzy
-msgid "Japanese"
-msgstr "Giapponese:"
+msgid "Baltic"
+msgstr "Baltica"
 
 #: src/audacious/ui_preferences.c:114
-#, fuzzy
-msgid "Taiwanese"
-msgstr "Giapponese:"
+msgid "Chinese"
+msgstr "Cinese"
 
 #: src/audacious/ui_preferences.c:115
-#, fuzzy
-msgid "Chinese"
-msgstr "Linee"
+msgid "Greek"
+msgstr "Greca"
 
 #: src/audacious/ui_preferences.c:116
-#, fuzzy
-msgid "Korean"
-msgstr "Coreano:"
+msgid "Hebrew"
+msgstr "Ebraica"
 
 #: src/audacious/ui_preferences.c:117
-#, fuzzy
-msgid "Russian"
-msgstr "Russo:"
+msgid "Japanese"
+msgstr "Giapponese"
 
 #: src/audacious/ui_preferences.c:118
-#, fuzzy
-msgid "Greek"
-msgstr "Greco:"
+msgid "Korean"
+msgstr "Coreana"
 
 #: src/audacious/ui_preferences.c:119
-msgid "Hebrew"
-msgstr ""
+msgid "Polish"
+msgstr "Polacca"
 
 #: src/audacious/ui_preferences.c:120
-#, fuzzy
-msgid "Turkish"
-msgstr "Turco:"
+msgid "Russian"
+msgstr "Russa"
 
 #: src/audacious/ui_preferences.c:121
-msgid "Arabic"
-msgstr ""
+msgid "Taiwanese"
+msgstr "Taiwanese"
 
 #: src/audacious/ui_preferences.c:122
-#, fuzzy
-msgid "Polish"
-msgstr "Polacco:"
-
-#: src/audacious/ui_preferences.c:123
-msgid "Baltic"
-msgstr ""
-
-#: src/audacious/ui_preferences.c:124
-msgid "Universal"
-msgstr ""
-
-#: src/audacious/ui_preferences.c:146
-#, fuzzy
-msgid "Single track mode"
-msgstr "Mostra i dettagli della traccia."
+msgid "Turkish"
+msgstr "Turca"
 
-#: src/audacious/ui_preferences.c:147
-#, fuzzy
+#: src/audacious/ui_preferences.c:144
 msgid "Album mode"
-msgstr "Nome dell'album: "
+msgstr "Modalità album"
 
-#: src/audacious/ui_preferences.c:150
-#, fuzzy
+#: src/audacious/ui_preferences.c:147
 msgid "Output Settings"
-msgstr "Individuazione formato"
+msgstr "Impostazioni di uscita"
 
-#: src/audacious/ui_preferences.c:152
-#, fuzzy
+#: src/audacious/ui_preferences.c:149
 msgid "Bit depth:"
-msgstr "Nome del file"
+msgstr "Profondità di bit:"
 
-#: src/audacious/ui_preferences.c:155
+#: src/audacious/ui_preferences.c:152
 msgid "Buffer size:"
 msgstr "Dimensione del buffer:"
 
-#: src/audacious/ui_preferences.c:157
+#: src/audacious/ui_preferences.c:154
 msgid "ms"
-msgstr ""
+msgstr "ms"
 
-#: src/audacious/ui_preferences.c:158
+#: src/audacious/ui_preferences.c:155
 msgid "Use software volume control (not recommended)"
-msgstr ""
+msgstr "Utilizza controllo volume software (non raccomandato)"
 
-#: src/audacious/ui_preferences.c:160
-#, fuzzy
+#: src/audacious/ui_preferences.c:157
 msgid "Replay Gain"
-msgstr "Configurazione Proxy"
+msgstr "Replay Gain"
 
-#: src/audacious/ui_preferences.c:161
-#, fuzzy
+#: src/audacious/ui_preferences.c:158
 msgid "Enable Replay Gain"
-msgstr "Abilita utilizzo del proxy"
+msgstr "Abilita Replay Gain"
 
-#: src/audacious/ui_preferences.c:164
+#: src/audacious/ui_preferences.c:161
 msgid "Prevent clipping (recommended)"
-msgstr ""
+msgstr "Evita il clipping (raccomandato)"
 
-#: src/audacious/ui_preferences.c:166
-#, fuzzy
+#: src/audacious/ui_preferences.c:163
 msgid "Adjust Levels"
-msgstr "Rotellina del mouse"
+msgstr "Regola i livelli"
 
-#: src/audacious/ui_preferences.c:167
+#: src/audacious/ui_preferences.c:164
 msgid "Amplify all files:"
-msgstr ""
+msgstr "Amplifica tutti i file:"
 
-#: src/audacious/ui_preferences.c:169 src/audacious/ui_preferences.c:172
+#: src/audacious/ui_preferences.c:166 src/audacious/ui_preferences.c:169
 msgid "dB"
-msgstr ""
+msgstr "dB"
 
-#: src/audacious/ui_preferences.c:170
-#, fuzzy
+#: src/audacious/ui_preferences.c:167
 msgid "Amplify untagged files:"
-msgstr "- riproduci file multimediali"
+msgstr "Amplifica i file senza tag:"
 
-#: src/audacious/ui_preferences.c:175
+#: src/audacious/ui_preferences.c:172
 msgid "Proxy hostname:"
-msgstr "Nome del proxy:"
+msgstr "Host del proxy:"
 
-#: src/audacious/ui_preferences.c:176
+#: src/audacious/ui_preferences.c:173
 msgid "Proxy port:"
 msgstr "Porta del proxy:"
 
-#: src/audacious/ui_preferences.c:179
+#: src/audacious/ui_preferences.c:176
 msgid "Proxy username:"
 msgstr "Utente proxy:"
 
-#: src/audacious/ui_preferences.c:180
+#: src/audacious/ui_preferences.c:177
 msgid "Proxy password:"
 msgstr "Password proxy:"
 
-#: src/audacious/ui_preferences.c:184
+#: src/audacious/ui_preferences.c:181
 msgid "Proxy Configuration"
-msgstr "Configurazione Proxy"
+msgstr "Configurazione proxy"
 
-#: src/audacious/ui_preferences.c:185
+#: src/audacious/ui_preferences.c:182
 msgid "Enable proxy usage"
 msgstr "Abilita utilizzo del proxy"
 
-#: src/audacious/ui_preferences.c:187
+#: src/audacious/ui_preferences.c:185
 msgid "Use authentication with proxy"
 msgstr "Usa autenticazione con il proxy"
 
-#: src/audacious/ui_preferences.c:189
-msgid ""
-"Changing these settings will require a restart of "
-"Audacious."
-msgstr ""
-"Modificare queste impostazioni richiederà un riavvio di "
-"Audacious."
-
 #: src/audacious/ui_preferences.c:193
 msgid "Auto character encoding detector for:"
 msgstr "Individuazione automatica della codifica dei caratteri per:"
 
-#: src/audacious/ui_preferences.c:201
+#: src/audacious/ui_preferences.c:198
 msgid "Fallback character encodings:"
-msgstr "Codifica dei caratteri di riserva:"
-
-#: src/audacious/ui_preferences.c:201
-msgid ""
-"List of character encodings used for fall back conversion of metadata. If "
-"automatic character encoding detector failed or has been disabled, encodings "
-"in this list would be treated as candidates of the encoding of metadata, and "
-"fall back conversion from these encodings to UTF-8 would be attempted."
-msgstr ""
-"Lista di codifiche di caratteri utilizzate per la conversione di riserva dei "
-"metadati. Se l'individuazione della codifica di caratteri fallisce o è stata "
-"disattivata, verranno considerati candidati per la codifica dei metadati le "
-"codifiche di questa lista, e sarà tentata una conversione di riserva da "
-"queste a UTF-8."
+msgstr "Codifiche di riserva dei caratteri:"
 
-#: src/audacious/ui_preferences.c:205
-#, fuzzy
+#: src/audacious/ui_preferences.c:202
 msgid "Behavior"
-msgstr "Nome del file"
+msgstr "Comportamento"
 
-#: src/audacious/ui_preferences.c:206
+#: src/audacious/ui_preferences.c:203
 msgid "Continue playback on startup"
 msgstr "Continua la riproduzione all'avvio"
 
-#: src/audacious/ui_preferences.c:208
+#: src/audacious/ui_preferences.c:205
 msgid "Advance when the current song is deleted"
-msgstr ""
+msgstr "Avanza quando il brano corrente viene eliminato"
 
-#: src/audacious/ui_preferences.c:210
-#, fuzzy
+#: src/audacious/ui_preferences.c:207
 msgid "Clear the playlist when opening files"
-msgstr "Crea una nuova playlist con gli elementi individuati"
+msgstr "Cancella la playlist quando si aprono i file"
 
-#: src/audacious/ui_preferences.c:212
-#, fuzzy
+#: src/audacious/ui_preferences.c:209
 msgid "Open files in a temporary playlist"
-msgstr "Aggiungi nuovi file ad una playlist temporanea"
+msgstr "Apri i file in una playlist temporanea"
 
-#: src/audacious/ui_preferences.c:214
+#: src/audacious/ui_preferences.c:211
 msgid "Metadata"
-msgstr "Metadata"
+msgstr "Metadati"
+
+#: src/audacious/ui_preferences.c:212
+msgid "Do not load metadata for songs until played"
+msgstr "Non caricare i metadati dei brani finché non vengono riprodotti"
+
+#: src/audacious/ui_preferences.c:230
+msgid "TITLE"
+msgstr "TITOLO"
+
+#: src/audacious/ui_preferences.c:231
+msgid "ARTIST - TITLE"
+msgstr "ARTISTA - TITOLO"
+
+#: src/audacious/ui_preferences.c:232
+msgid "ARTIST - ALBUM - TITLE"
+msgstr "ARTISTA - ALBUM - TITOLO"
+
+#: src/audacious/ui_preferences.c:233
+msgid "ARTIST - ALBUM - TRACK. TITLE"
+msgstr "ARTISTA - ALBUM - TRACCIA. TITOLO"
+
+#: src/audacious/ui_preferences.c:234
+msgid "ARTIST [ ALBUM ] - TRACK. TITLE"
+msgstr "ARTISTA [ALBUM] - TRACCIA. TITOLO"
+
+#: src/audacious/ui_preferences.c:235
+msgid "ALBUM - TITLE"
+msgstr "ALBUM - TITOLO"
 
-#: src/audacious/ui_preferences.c:454
+#: src/audacious/ui_preferences.c:556
 msgid "Category"
 msgstr "Categoria"
 
-#: src/audacious/ui_preferences.c:682
+#: src/audacious/ui_preferences.c:780
 msgid "Popup Information Settings"
-msgstr "Impostazioni delle informazioni di popup"
+msgstr "Impostazioni delle informazioni popup"
 
-#: src/audacious/ui_preferences.c:691
+#: src/audacious/ui_preferences.c:789
 msgid "Cover image retrieve"
-msgstr "Ricerca delle immagini delle copertine"
+msgstr "Recupero dell'immagine di copertina"
 
-#: src/audacious/ui_preferences.c:696
+#: src/audacious/ui_preferences.c:794
 msgid ""
 "While searching for the album's cover, Audacious looks for certain words in "
 "the filename. You can specify those words in the lists below, separated "
 "using commas."
 msgstr ""
-"Quando si cerca la copertina di un album, Audacious cerca certe parole nel "
-"nome del file.Si possono specificare tali parole nella lista seguente, "
-"separate da virgola."
+"Durante la ricerca della copertina dell'album, Audacious cerca certe parole "
+"nel nome del file. Puoi specificare tali parole nella lista seguente, "
+"separate da virgole."
 
-#: src/audacious/ui_preferences.c:713
+#: src/audacious/ui_preferences.c:811
 msgid "Exclude:"
 msgstr "Escludi:"
 
-#: src/audacious/ui_preferences.c:720
+#: src/audacious/ui_preferences.c:818
 msgid "Include:"
 msgstr "Includi:"
 
-#: src/audacious/ui_preferences.c:737
+#: src/audacious/ui_preferences.c:835
 msgid "Recursively search for cover"
 msgstr "Cerca la copertina ricorsivamente"
 
-#: src/audacious/ui_preferences.c:747
+#: src/audacious/ui_preferences.c:845
 msgid "Search depth: "
-msgstr "Profondità di ricerca:"
+msgstr "Profondità di ricerca: "
 
-#: src/audacious/ui_preferences.c:761
+#: src/audacious/ui_preferences.c:859
 msgid "Use per-file cover"
 msgstr "Usa una copertina diversa per file"
 
-#: src/audacious/ui_preferences.c:764
+#: src/audacious/ui_preferences.c:862
 msgid "Miscellaneous"
 msgstr "Varie"
 
-#: src/audacious/ui_preferences.c:773
+#: src/audacious/ui_preferences.c:871
 msgid "Show Progress bar for the current track"
-msgstr "Mostra barra di avanzamento per la traccia corrente."
+msgstr "Mostra barra di avanzamento per la traccia corrente"
 
-#: src/audacious/ui_preferences.c:783
+#: src/audacious/ui_preferences.c:881
 msgid "Delay until filepopup comes up: "
-msgstr "Attendi fino alla comparsa del popup file:"
+msgstr "Ritardo prima della comparsa del popup file: "
+
+#: src/audacious/ui_preferences.c:1309
+msgid "Custom"
+msgstr "Personalizzato"
 
-#: src/audacious/ui_preferences.c:1283
+#: src/audacious/ui_preferences.c:1352
 msgid "Song Display"
-msgstr ""
+msgstr "Visualizzazione del brano"
 
-#: src/audacious/ui_preferences.c:1292
+#: src/audacious/ui_preferences.c:1361
 msgid "Show song numbers"
-msgstr ""
+msgstr "Mostra numeri dei brani"
 
-#: src/audacious/ui_preferences.c:1303
+#: src/audacious/ui_preferences.c:1372
 msgid "Show leading zeroes (02:00 instead of 2:00)"
-msgstr ""
+msgstr "Mostra zeri iniziali (02:00 invece di 2:00)"
 
-#: src/audacious/ui_preferences.c:1325
+#: src/audacious/ui_preferences.c:1394
 msgid "Show information about titlestring format"
-msgstr "Mostra informazioni sulla stringa del titolo"
-
-#: src/audacious/ui_preferences.c:1339
-msgid "TITLE"
-msgstr ""
-
-#: src/audacious/ui_preferences.c:1340
-msgid "ARTIST - TITLE"
-msgstr ""
-
-#: src/audacious/ui_preferences.c:1341
-msgid "ARTIST - ALBUM - TITLE"
-msgstr ""
-
-#: src/audacious/ui_preferences.c:1342
-msgid "ARTIST - ALBUM - TRACK. TITLE"
-msgstr ""
-
-#: src/audacious/ui_preferences.c:1343
-msgid "ARTIST [ ALBUM ] - TRACK. TITLE"
-msgstr ""
-
-#: src/audacious/ui_preferences.c:1344
-msgid "ALBUM - TITLE"
-msgstr ""
+msgstr "Mostra informazioni sul formato della stringa del titolo"
 
-#: src/audacious/ui_preferences.c:1345
-#, fuzzy
-msgid "Custom"
-msgstr "Stringa personalizzata:"
-
-#: src/audacious/ui_preferences.c:1354
+#: src/audacious/ui_preferences.c:1410
 msgid "Custom string:"
 msgstr "Stringa personalizzata:"
 
-#: src/audacious/ui_preferences.c:1361
+#: src/audacious/ui_preferences.c:1417
 msgid "Title format:"
 msgstr "Formato titolo:"
 
-#: src/audacious/ui_preferences.c:1372
+#: src/audacious/ui_preferences.c:1428
 msgid "Popup Information"
-msgstr "Informazioni di popup"
+msgstr "Informazioni popup"
 
-#: src/audacious/ui_preferences.c:1387
+#: src/audacious/ui_preferences.c:1443
 msgid "Show popup information for playlist entries"
-msgstr "Mostra le inforormazioni di popup per gli elementi della playlist"
+msgstr "Mostra informazioni popup per gli elementi della playlist"
 
-#: src/audacious/ui_preferences.c:1388
+#: src/audacious/ui_preferences.c:1444
 msgid ""
 "Toggles popup information window for the pointed entry in the playlist. The "
 "window shows title of song, name of album, genre, year of publish, track "
 "number, track length, and artwork."
 msgstr ""
-"Abilita la finestra di informazioni di popup per l'elemento puntato. La "
-"finestra mostra il titolo della canzone, il nome dell'album, il genere, "
-"l'anno di pubblicazione, il numero di traccia, la lunghezza della traccia e "
-"l'artwork."
+"Attiva la finestra di informazioni popup per l'elemento puntato nella "
+"playlist. La finestra mostra il titolo della canzone, il nome dell'album, il"
+" genere, l'anno di pubblicazione, il numero di traccia, la durata della "
+"traccia e la grafica."
 
-#: src/audacious/ui_preferences.c:1397
+#: src/audacious/ui_preferences.c:1455
 msgid "Edit settings for popup information"
-msgstr "Modifica impostazioni per le informazioni di popup"
+msgstr "Modifica impostazioni per le informazioni popup"
 
-#: src/audacious/ui_preferences.c:1497
-#, fuzzy
+#: src/audacious/ui_preferences.c:1544
 msgid "Output plugin:"
-msgstr "Input plugin: %s"
+msgstr "Plugin di uscita:"
 
-#: src/audacious/ui_preferences.c:1556
-#, fuzzy
+#: src/audacious/ui_preferences.c:1603
 msgid "Transport"
-msgstr "Traduttori"
+msgstr "Trasporto"
 
-#: src/audacious/ui_preferences.c:1556
+#: src/audacious/ui_preferences.c:1603
 msgid "Input"
-msgstr ""
+msgstr "Ingresso"
 
-#: src/audacious/ui_preferences.c:1557
-#, fuzzy
+#: src/audacious/ui_preferences.c:1604
 msgid "Effect"
-msgstr "Effetti"
+msgstr "Effetto"
 
-#: src/audacious/ui_preferences.c:1557
+#: src/audacious/ui_preferences.c:1604
 msgid "Visualization"
 msgstr "Visualizzazione"
 
-#: src/audacious/ui_preferences.c:1557
+#: src/audacious/ui_preferences.c:1604
 msgid "General"
-msgstr ""
+msgstr "Generici"
 
-#: src/audacious/ui_preferences.c:1597
+#: src/audacious/ui_preferences.c:1644
 msgid "Audacious Preferences"
-msgstr "Impostazioni di Audacious"
+msgstr "Preferenze di Audacious"
 
-#: src/audacious/util.c:155
+#: src/audacious/util.c:120
 #, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr "Impossibile creare la directory (%s): %s\n"
 
-#: src/audtool/handlers_playlist.c:264
+#: src/audtool/handlers_playlist.c:273
 msgid "Position not found."
-msgstr ""
+msgstr "Posizione non trovata."
 
-#: src/audtool/handlers_vitals.c:64
+#: src/audtool/handlers_vitals.c:63
 msgid "No song playing."
-msgstr ""
+msgstr "Nessun brano in riproduzione."
+
+#: src/libaudcore/audstrings.c:199
+#, c-format
+msgid "Audio CD, track %s"
+msgstr "CD Audio, traccia %s"
 
-#: src/libaudcore/tuple.c:685
+#: src/libaudcore/tuple.c:536
 msgid "Mono"
-msgstr ""
+msgstr "Mono"
 
-#: src/libaudcore/tuple.c:687
-#, fuzzy
+#: src/libaudcore/tuple.c:538
 msgid "Stereo"
-msgstr "stereo"
+msgstr "Stereo"
 
-#: src/libaudcore/tuple.c:689
+#: src/libaudcore/tuple.c:540
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d canale"
+msgstr[1] "%d canali"
+
+#: src/libaudgui/about.c:52 src/libaudgui/about.c:115
+msgid "Credits"
+msgstr "Crediti"
+
+#: src/libaudgui/about.c:52
+msgid "Translators"
+msgstr "Traduttori"
+
+#: src/libaudgui/about.c:91
+msgid "About Audacious"
+msgstr "Informazioni su Audacious"
 
-#: src/libaudgui/confirm.c:73
+#: src/libaudgui/confirm.c:76
 #, c-format
 msgid ""
 "Are you sure you want to close %s? If you do, any changes made since the "
 "playlist was exported will be lost."
 msgstr ""
+"Sei sicuro di voler chiudere %s? Se lo fai, qualunque modifica apportata "
+"dopo l'esportazione della playlist andrà persa."
 
-#: src/libaudgui/confirm.c:86
-#, fuzzy
+#: src/libaudgui/confirm.c:89
 msgid "_Don't show this message again"
-msgstr "Non mostrare più questo avvertimento"
+msgstr "_Non mostrare più questo messaggio"
 
-#: src/libaudgui/confirm.c:124
-#, fuzzy
+#: src/libaudgui/confirm.c:126
 msgid "Rename Playlist"
-msgstr "Salva playlist"
+msgstr "Rinomina playlist"
 
-#: src/libaudgui/effects-menu.c:76
+#: src/libaudgui/effects-menu.c:74
 msgid "settings ..."
-msgstr ""
+msgstr "impostazioni…"
 
-#: src/libaudgui/equalizer.c:68
-#, fuzzy
+#: src/libaudgui/equalizer.c:51
 msgid "_Enable"
-msgstr "Abilitato"
+msgstr "_Abilita"
 
-#: src/libaudgui/equalizer.c:140
+#: src/libaudgui/equalizer.c:123
 msgid "31 Hz"
-msgstr ""
+msgstr "31 Hz"
 
-#: src/libaudgui/equalizer.c:140
+#: src/libaudgui/equalizer.c:123
 msgid "63 Hz"
-msgstr ""
+msgstr "63 Hz"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "125 Hz"
-msgstr ""
+msgstr "125 Hz"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "250 Hz"
-msgstr ""
+msgstr "250 Hz"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "500 Hz"
-msgstr ""
+msgstr "500 Hz"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "1 kHz"
-msgstr ""
+msgstr "1 kHz"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "2 kHz"
-msgstr ""
+msgstr "2 kHz"
 
-#: src/libaudgui/equalizer.c:142
+#: src/libaudgui/equalizer.c:125
 msgid "4 kHz"
-msgstr ""
+msgstr "4 kHz"
 
-#: src/libaudgui/equalizer.c:142
+#: src/libaudgui/equalizer.c:125
 msgid "8 kHz"
-msgstr ""
+msgstr "8 kHz"
 
-#: src/libaudgui/equalizer.c:142
+#: src/libaudgui/equalizer.c:125
 msgid "16 kHz"
-msgstr ""
+msgstr "16 kHz"
 
-#: src/libaudgui/equalizer.c:147
+#: src/libaudgui/equalizer.c:130
 msgid "Equalizer"
 msgstr "Equalizzatore"
 
-#: src/libaudgui/equalizer.c:163
+#: src/libaudgui/equalizer.c:146
 msgid "Preamp"
-msgstr ""
+msgstr "Preamplificazione"
 
-#: src/libaudgui/infopopup.c:212
+#: src/libaudgui/infopopup.c:207
 msgid "Track Number"
 msgstr "Numero di traccia"
 
-#: src/libaudgui/infopopup.c:214
+#: src/libaudgui/infopopup.c:209
 msgid "Track Length"
-msgstr "Lunghezza della traccia"
+msgstr "Durata della traccia"
 
-#: src/libaudgui/infowin.c:77
+#: src/libaudgui/infowin.c:75
 msgid "Acid Jazz"
-msgstr ""
+msgstr "Acid Jazz"
 
-#: src/libaudgui/infowin.c:78
+#: src/libaudgui/infowin.c:76
 msgid "Acid Rock"
-msgstr ""
+msgstr "Acid Rock"
 
-#: src/libaudgui/infowin.c:79
+#: src/libaudgui/infowin.c:77
 msgid "Ambient"
-msgstr ""
+msgstr "Ambient"
 
-#: src/libaudgui/infowin.c:80
+#: src/libaudgui/infowin.c:78
 msgid "Bebop"
-msgstr ""
+msgstr "Bebop"
 
-#: src/libaudgui/infowin.c:81
-#, fuzzy
+#: src/libaudgui/infowin.c:79
 msgid "Bluegrass"
-msgstr "Blu"
+msgstr "Bluegrass"
 
-#: src/libaudgui/infowin.c:82
-#, fuzzy
+#: src/libaudgui/infowin.c:80
 msgid "Blues"
-msgstr "Blu"
+msgstr "Blues"
 
-#: src/libaudgui/infowin.c:83
+#: src/libaudgui/infowin.c:81
 msgid "Chamber Music"
-msgstr ""
+msgstr "Musica da camera"
 
-#: src/libaudgui/infowin.c:84
+#: src/libaudgui/infowin.c:82
 msgid "Classical"
-msgstr ""
+msgstr "Classica"
 
-#: src/libaudgui/infowin.c:85
+#: src/libaudgui/infowin.c:83
 msgid "Country"
-msgstr ""
+msgstr "Country"
 
-#: src/libaudgui/infowin.c:86
+#: src/libaudgui/infowin.c:84
 msgid "Death Metal"
-msgstr ""
+msgstr "Death Metal"
 
-#: src/libaudgui/infowin.c:87
+#: src/libaudgui/infowin.c:85
 msgid "Disco"
-msgstr ""
+msgstr "Disco"
 
-#: src/libaudgui/infowin.c:88
+#: src/libaudgui/infowin.c:86
 msgid "Easy Listening"
-msgstr ""
+msgstr "Easy Listening"
 
-#: src/libaudgui/infowin.c:89
+#: src/libaudgui/infowin.c:87
 msgid "Folk"
-msgstr ""
+msgstr "Folk"
 
-#: src/libaudgui/infowin.c:90
+#: src/libaudgui/infowin.c:88
 msgid "Funk"
-msgstr ""
+msgstr "Funk"
 
-#: src/libaudgui/infowin.c:91
+#: src/libaudgui/infowin.c:89
 msgid "Gangsta Rap"
-msgstr ""
+msgstr "Gangsta Rap"
 
-#: src/libaudgui/infowin.c:92
+#: src/libaudgui/infowin.c:90
 msgid "Gospel"
-msgstr ""
+msgstr "Gospel"
 
-#: src/libaudgui/infowin.c:93
+#: src/libaudgui/infowin.c:91
 msgid "Grunge"
-msgstr ""
+msgstr "Grunge"
 
-#: src/libaudgui/infowin.c:94
+#: src/libaudgui/infowin.c:92
 msgid "Hard Rock"
-msgstr ""
+msgstr "Hard Rock"
 
-#: src/libaudgui/infowin.c:95
+#: src/libaudgui/infowin.c:93
 msgid "Heavy Metal"
-msgstr ""
+msgstr "Heavy Metal"
 
-#: src/libaudgui/infowin.c:96
+#: src/libaudgui/infowin.c:94
 msgid "Hip-hop"
-msgstr ""
+msgstr "Hip-hop"
 
-#: src/libaudgui/infowin.c:97
-#, fuzzy
+#: src/libaudgui/infowin.c:95
 msgid "House"
-msgstr "Mouse"
+msgstr "House"
 
-#: src/libaudgui/infowin.c:98
+#: src/libaudgui/infowin.c:96
 msgid "Jazz"
-msgstr ""
+msgstr "Jazz"
 
-#: src/libaudgui/infowin.c:99
+#: src/libaudgui/infowin.c:97
 msgid "Jungle"
-msgstr ""
+msgstr "Jungle"
 
-#: src/libaudgui/infowin.c:100
+#: src/libaudgui/infowin.c:98
 msgid "Metal"
-msgstr ""
+msgstr "Metal"
 
-#: src/libaudgui/infowin.c:101
+#: src/libaudgui/infowin.c:99
 msgid "New Age"
-msgstr ""
+msgstr "New Age"
 
-#: src/libaudgui/infowin.c:102
+#: src/libaudgui/infowin.c:100
 msgid "New Wave"
-msgstr ""
+msgstr "New Wave"
 
-#: src/libaudgui/infowin.c:103
-#, fuzzy
+#: src/libaudgui/infowin.c:101
 msgid "Noise"
-msgstr "Mouse"
+msgstr "Noise"
 
-#: src/libaudgui/infowin.c:104
+#: src/libaudgui/infowin.c:102
 msgid "Pop"
-msgstr ""
+msgstr "Pop"
 
-#: src/libaudgui/infowin.c:105
+#: src/libaudgui/infowin.c:103
 msgid "Punk Rock"
-msgstr ""
+msgstr "Punk Rock"
 
-#: src/libaudgui/infowin.c:106
+#: src/libaudgui/infowin.c:104
 msgid "Rap"
-msgstr ""
+msgstr "Rap"
 
-#: src/libaudgui/infowin.c:107
-#, fuzzy
+#: src/libaudgui/infowin.c:105
 msgid "Reggae"
-msgstr "_Rinomina"
+msgstr "Reggae"
 
-#: src/libaudgui/infowin.c:108
+#: src/libaudgui/infowin.c:106
 msgid "Rock"
-msgstr ""
+msgstr "Rock"
 
-#: src/libaudgui/infowin.c:109
+#: src/libaudgui/infowin.c:107
 msgid "Rock and Roll"
-msgstr ""
+msgstr "Rock and Roll"
 
-#: src/libaudgui/infowin.c:110
+#: src/libaudgui/infowin.c:108
 msgid "Rhythm and Blues"
-msgstr ""
+msgstr "Rhythm and Blues"
 
-#: src/libaudgui/infowin.c:111
+#: src/libaudgui/infowin.c:109
 msgid "Ska"
-msgstr ""
+msgstr "Ska"
 
-#: src/libaudgui/infowin.c:112
+#: src/libaudgui/infowin.c:110
 msgid "Soul"
-msgstr ""
+msgstr "Soul"
 
-#: src/libaudgui/infowin.c:113
+#: src/libaudgui/infowin.c:111
 msgid "Swing"
-msgstr ""
+msgstr "Swing"
 
-#: src/libaudgui/infowin.c:114
+#: src/libaudgui/infowin.c:112
 msgid "Techno"
-msgstr ""
+msgstr "Techno"
 
-#: src/libaudgui/infowin.c:115
+#: src/libaudgui/infowin.c:113
 msgid "Trip-hop"
-msgstr ""
+msgstr "Trip-hop"
 
-#: src/libaudgui/infowin.c:175 src/libaudgui/infowin.c:361
-#: src/libaudgui/infowin.c:364 src/libaudgui/infowin.c:367
-#, fuzzy
+#: src/libaudgui/infowin.c:177 src/libaudgui/infowin.c:363
+#: src/libaudgui/infowin.c:366 src/libaudgui/infowin.c:369
 msgid "n/a"
-msgstr "Anno"
+msgstr "n/d"
 
-#: src/libaudgui/infowin.c:265
+#: src/libaudgui/infowin.c:267
 msgid "Metadata updated successfully"
-msgstr ""
+msgstr "Metadati aggiornati con successo"
 
-#: src/libaudgui/infowin.c:270
+#: src/libaudgui/infowin.c:272
 msgid "Metadata updating failed"
-msgstr ""
+msgstr "Errore nell'aggiornamento dei metadati"
 
-#: src/libaudgui/infowin.c:318
+#: src/libaudgui/infowin.c:320
 msgid "Track Information"
 msgstr "Informazioni sulla traccia"
 
-#: src/libaudgui/infowin.c:350
-#, fuzzy
+#: src/libaudgui/infowin.c:352
 msgid "Format:"
-msgstr "Commenti"
+msgstr "Formato:"
 
-#: src/libaudgui/infowin.c:354
-#, fuzzy
+#: src/libaudgui/infowin.c:356
 msgid "Quality:"
-msgstr "Titolo"
+msgstr "Qualità:"
 
-#: src/libaudgui/infowin.c:357
-#, fuzzy
+#: src/libaudgui/infowin.c:359
 msgid "Bitrate:"
-msgstr "Commenti"
+msgstr "Bitrate:"
 
-#: src/libaudgui/infowin.c:387
+#: src/libaudgui/infowin.c:389
 msgid "Title"
 msgstr "Titolo"
 
-#: src/libaudgui/infowin.c:399
+#: src/libaudgui/infowin.c:401
 msgid "Artist"
 msgstr "Artista"
 
-#: src/libaudgui/infowin.c:411
+#: src/libaudgui/infowin.c:413
 msgid "Album"
 msgstr "Album"
 
-#: src/libaudgui/infowin.c:423
+#: src/libaudgui/infowin.c:425
 msgid "Comment"
-msgstr "Commenti"
+msgstr "Commento"
 
-#: src/libaudgui/infowin.c:435
+#: src/libaudgui/infowin.c:437
 msgid "Genre"
 msgstr "Genere"
 
-#: src/libaudgui/infowin.c:456
+#: src/libaudgui/infowin.c:458
 msgid "Year"
 msgstr "Anno"
 
-#: src/libaudgui/infowin.c:467
+#: src/libaudgui/infowin.c:469
 msgid "Track Number"
 msgstr "Numero di traccia"
 
-#: src/libaudgui/infowin.c:549
+#: src/libaudgui/infowin.c:548
 #, c-format
 msgid "%d kb/s"
-msgstr ""
+msgstr "%d kb/s"
 
-#: src/libaudgui/infowin.c:579
+#: src/libaudgui/infowin.c:575
 #, c-format
 msgid "No info available for %s.\n"
-msgstr ""
+msgstr "Nessuna informazione disponibile per %s.\n"
 
-#: src/libaudgui/jump-to-time.c:75
+#: src/libaudgui/jump-to-time.c:72
 msgid "Jump to Time"
 msgstr "Salta alla posizione"
 
-#: src/libaudgui/jump-to-time.c:90
+#: src/libaudgui/jump-to-time.c:87
 msgid "mm:ss"
-msgstr ""
+msgstr "mm:ss"
 
-#: src/libaudgui/playlists.c:39
-#, fuzzy
+#: src/libaudgui/playlists.c:33
 msgid "Export Playlist"
-msgstr "Carica playlist"
+msgstr "Esporta playlist"
 
-#: src/libaudgui/playlists.c:39
-#, fuzzy
+#: src/libaudgui/playlists.c:33
 msgid "Import Playlist"
-msgstr "Carica playlist"
+msgstr "Importa playlist"
 
-#: src/libaudgui/playlists.c:71
+#: src/libaudgui/playlists.c:66
 #, c-format
 msgid "Overwrite %s?"
-msgstr ""
-
-#: src/libaudgui/ui_about.c:71
-msgid "About Audacious"
-msgstr "Informazioni su Audacious"
+msgstr "Sovrascrivere %s?"
 
-#: src/libaudgui/ui_about.c:93 src/libaudgui/ui_credits.c:122
-msgid "Credits"
-msgstr "Crediti"
+#: src/libaudgui/queue-manager.c:196
+msgid "Queue Manager"
+msgstr "Gestione coda"
 
-#: src/libaudgui/ui_credits.c:126
-msgid "Translators"
-msgstr "Traduttori"
-
-#: src/libaudgui/ui_fileopener.c:108
+#: src/libaudgui/ui_fileopener.c:109
 msgid "Open Files"
-msgstr "Apri Files"
+msgstr "Apri file"
 
-#: src/libaudgui/ui_fileopener.c:108
+#: src/libaudgui/ui_fileopener.c:109
 msgid "Add Files"
-msgstr "Aggiungi Files"
+msgstr "Aggiungi file"
 
-#: src/libaudgui/ui_fileopener.c:110
+#: src/libaudgui/ui_fileopener.c:111
 msgid "Close dialog on Open"
 msgstr "Chiudi finestra quando Apri"
 
-#: src/libaudgui/ui_fileopener.c:110
+#: src/libaudgui/ui_fileopener.c:111
 msgid "Close dialog on Add"
 msgstr "Chiudi finestra quando Aggiungi"
 
-#: src/libaudgui/ui_jumptotrack.c:133
-msgid "Un_queue"
-msgstr "Rimuovi dalla _coda"
-
-#: src/libaudgui/ui_jumptotrack.c:135 src/libaudgui/ui_jumptotrack.c:512
+#: src/libaudgui/ui_jumptotrack.c:109 src/libaudgui/ui_jumptotrack.c:117
+#: src/libaudgui/ui_jumptotrack.c:326
 msgid "_Queue"
 msgstr "_Coda"
 
-#: src/libaudgui/ui_jumptotrack.c:399
-msgid "Jump to Track"
-msgstr "Salta alla traccia"
+#: src/libaudgui/ui_jumptotrack.c:115
+msgid "Un_queue"
+msgstr "Rimuovi dalla _coda"
+
+#: src/libaudgui/ui_jumptotrack.c:258
+msgid "Jump to Song"
+msgstr "Salta al brano"
 
-#: src/libaudgui/ui_jumptotrack.c:442
+#: src/libaudgui/ui_jumptotrack.c:281
 msgid "Filter: "
-msgstr "Filtro:"
+msgstr "Filtro: "
 
-#: src/libaudgui/ui_jumptotrack.c:443
+#: src/libaudgui/ui_jumptotrack.c:282
 msgid "_Filter:"
 msgstr "_Filtro:"
 
-#: src/libaudgui/ui_jumptotrack.c:461
+#: src/libaudgui/ui_jumptotrack.c:292
 msgid "Remember"
-msgstr ""
+msgstr "Ricorda"
 
-#: src/libaudgui/ui_jumptotrack.c:470
-#, fuzzy
+#: src/libaudgui/ui_jumptotrack.c:299
 msgid "Clea_r"
-msgstr "Cancella coda"
+msgstr "Ca_ncella"
 
-#: src/libaudgui/ui_jumptotrack.c:504
-#, fuzzy
+#: src/libaudgui/ui_jumptotrack.c:319
 msgid "Close on Jump"
-msgstr "Chiudi finestra quando Apri"
+msgstr "Chiudi quando salti"
 
-#: src/libaudgui/ui_playlist_manager.c:240
+#: src/libaudgui/ui_playlist_manager.c:253
 msgid "Playlist Manager"
-msgstr "Gestore playlist"
+msgstr "Gestione playlist"
 
-#: src/libaudgui/ui_playlist_manager.c:264
+#: src/libaudgui/ui_playlist_manager.c:280
 msgid "Entries"
 msgstr "Elementi"
 
-#: src/libaudgui/ui_playlist_manager.c:285
+#: src/libaudgui/ui_playlist_manager.c:301
 msgid "_Rename"
 msgstr "_Rinomina"
 
-#: src/libaudgui/ui_playlist_manager.c:309
-#, fuzzy
+#: src/libaudgui/ui_playlist_manager.c:325
 msgid "_Close dialog on activating playlist"
-msgstr "Chiudi finestra quando Apri"
+msgstr "_Chiudi finestra quando attivi la playlist"
 
-#: src/libaudgui/ui_urlopener.c:58
+#: src/libaudgui/ui_urlopener.c:48
 msgid "Open URL"
-msgstr ""
+msgstr "Apri URL"
 
-#: src/libaudgui/ui_urlopener.c:58
+#: src/libaudgui/ui_urlopener.c:48
 msgid "Add URL"
-msgstr ""
+msgstr "Aggiungi URL"
 
 #: src/libaudgui/util.c:95
 msgid ""
 "\n"
 "(Further messages have been hidden.)"
 msgstr ""
+"\n"
+"(Ulteriori messaggi sono stati nascosti.)"
 
 #: src/libeggsmclient/eggdesktopfile.c:165
 msgid "File is not a valid .desktop file"
-msgstr ""
+msgstr "Il file non è un file .desktop valido"
 
-#: src/libeggsmclient/eggdesktopfile.c:188
+#: src/libeggsmclient/eggdesktopfile.c:191
 #, c-format
 msgid "Unrecognized desktop file Version '%s'"
-msgstr ""
+msgstr "Versione '%s' del file desktop non riconosciuta"
 
-#: src/libeggsmclient/eggdesktopfile.c:967
+#: src/libeggsmclient/eggdesktopfile.c:974
 #, c-format
 msgid "Starting %s"
-msgstr ""
+msgstr "Avvio di %s"
 
-#: src/libeggsmclient/eggdesktopfile.c:1108
+#: src/libeggsmclient/eggdesktopfile.c:1116
 msgid "Application does not accept documents on command line"
-msgstr ""
+msgstr "L'applicazione non accetta documenti sulla linea di comando"
 
-#: src/libeggsmclient/eggdesktopfile.c:1176
+#: src/libeggsmclient/eggdesktopfile.c:1184
 #, c-format
 msgid "Unrecognized launch option: %d"
-msgstr ""
+msgstr "Opzione di lancio non riconosciuta: %d"
 
-#: src/libeggsmclient/eggdesktopfile.c:1375
+#: src/libeggsmclient/eggdesktopfile.c:1391
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
 msgstr ""
+"Impossibile passare URI di documenti ad una voce del desktop di tipo "
+"'Type=Link'"
 
-#: src/libeggsmclient/eggdesktopfile.c:1396
+#: src/libeggsmclient/eggdesktopfile.c:1412
 msgid "Not a launchable item"
-msgstr ""
+msgstr "Non è un elemento avviabile"
 
 #: src/libeggsmclient/eggsmclient.c:226
 msgid "Disable connection to session manager"
-msgstr ""
+msgstr "Disabilita la connessione al gestore della sessione"
 
 #: src/libeggsmclient/eggsmclient.c:229
 msgid "Specify file containing saved configuration"
-msgstr ""
+msgstr "Specifica il file contenente la configurazione salvata"
 
 #: src/libeggsmclient/eggsmclient.c:229
-#, fuzzy
 msgid "FILE"
-msgstr "FILE..."
+msgstr "FILE"
 
 #: src/libeggsmclient/eggsmclient.c:232
 msgid "Specify session management ID"
-msgstr ""
+msgstr "Specifica l'ID della gestione della sessione"
 
 #: src/libeggsmclient/eggsmclient.c:232
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #: src/libeggsmclient/eggsmclient.c:253
-#, fuzzy
 msgid "Session management options:"
-msgstr "Mostra le decorazioni del gestore delle finestre"
+msgstr "Opzioni di gestione della sessione:"
 
 #: src/libeggsmclient/eggsmclient.c:254
-#, fuzzy
 msgid "Show session management options"
-msgstr "Mostra le decorazioni del gestore delle finestre"
-
-#, fuzzy
-#~ msgid "Volume Control"
-#~ msgstr "Rotellina del mouse"
-
-#, fuzzy
-#~ msgid "Mode"
-#~ msgstr "Metadata"
-
-#, fuzzy
-#~ msgid "Clipping Prevention"
-#~ msgstr "Informazioni di popup"
-
-#~ msgid "Audio System"
-#~ msgstr "Sistema audio"
-
-#~ msgid "Current output plugin:"
-#~ msgstr "Plugin di output corrente:"
-
-#~ msgid "Display all open Audacious windows"
-#~ msgstr "Mostra tutte le finestre di Audacious aperte"
-
-#~ msgid "%s: Unable to open display, exiting.\n"
-#~ msgstr "%s: Impossibile aprire display, uscita in corso.\n"
-
-#, fuzzy
-#~ msgid "Default gain:"
-#~ msgstr "Skin predefinita:"
-
-#, fuzzy
-#~ msgid "Track gain/peak"
-#~ msgstr "Nome traccia"
-
-#, fuzzy
-#~ msgid "Dance"
-#~ msgstr "Data"
-
-#, fuzzy
-#~ msgid "Oldies"
-#~ msgstr "linee"
-
-#, fuzzy
-#~ msgid "Pranks"
-#~ msgstr "Pausa"
-
-#, fuzzy
-#~ msgid "Fusion"
-#~ msgstr "Russo:"
-
-#, fuzzy
-#~ msgid "Trance"
-#~ msgstr "Aspetto"
-
-#, fuzzy
-#~ msgid "Bass"
-#~ msgstr "Barre"
-
-#, fuzzy
-#~ msgid "Space"
-#~ msgstr "Salva"
-
-#, fuzzy
-#~ msgid "Comedy"
-#~ msgstr "Commento"
-
-#, fuzzy
-#~ msgid "Cult"
-#~ msgstr "Stringa personalizzata:"
-
-#, fuzzy
-#~ msgid "Rave"
-#~ msgstr "Salva"
-
-#, fuzzy
-#~ msgid "Showtunes"
-#~ msgstr "Molto lenta"
-
-#, fuzzy
-#~ msgid "Trailer"
-#~ msgstr "Titolo"
-
-#, fuzzy
-#~ msgid "Polka"
-#~ msgstr "Play"
-
-#, fuzzy
-#~ msgid "Retro"
-#~ msgstr "Zero"
-
-#, fuzzy
-#~ msgid "Latin"
-#~ msgstr "Italiano:"
-
-#, fuzzy
-#~ msgid "Slow Rock"
-#~ msgstr "Lenta"
-
-#, fuzzy
-#~ msgid "Primus"
-#~ msgstr "Precedente"
-
-#, fuzzy
-#~ msgid "Satire"
-#~ msgstr "Fuoco"
-
-#, fuzzy
-#~ msgid "Slow Jam"
-#~ msgstr "Lenta"
-
-#, fuzzy
-#~ msgid "Duet"
-#~ msgstr "Olandese:"
-
-#, fuzzy
-#~ msgid "Club-House"
-#~ msgstr "Mouse"
-
-#, fuzzy
-#~ msgid "Terror"
-#~ msgstr "Zero"
-
-#, fuzzy
-#~ msgid "Indie"
-#~ msgstr "Includi:"
-
-#, fuzzy
-#~ msgid "Beat"
-#~ msgstr "Ripeti"
-
-#, fuzzy
-#~ msgid "Synthpop"
-#~ msgstr "Stop"
-
-#, fuzzy
-#~ msgid ""
-#~ "<big>Audacious %s</big>\n"
-#~ "An audio player for many platforms.\n"
-#~ "Copyright (C) 2005-2011 Audacious Development Team"
-#~ msgstr ""
-#~ "<big>Audacious %s</big>\n"
-#~ "Il futuro del multimediale UNIX.\n"
-#~ "\n"
-#~ "Copyright (C) 2005-2007 Audacious Development Team\n"
-
-#~ msgid "Unable to create log file (%s)!\n"
-#~ msgstr "Impossibile creare il file di log (%s)!\n"
-
-#~ msgid "Print all errors and warnings to stdout"
-#~ msgstr "Visualizza tutti gli errori e gli avvisi su stdout"
-
-#~ msgid "Playback"
-#~ msgstr "Riproduzione"
-
-#~ msgid "Playback"
-#~ msgstr "Riproduzione"
-
-#~ msgid ""
-#~ "When Audacious starts, automatically begin playing from the point where "
-#~ "we stopped before."
-#~ msgstr ""
-#~ "Quando Audacious viene avviato, inizia automaticament a riprodurre dal "
-#~ "punto in cui è stato fermato."
-
-#~ msgid "Don't advance in the playlist"
-#~ msgstr "Non avanzare nella playlist"
-
-#~ msgid ""
-#~ "When finished playing a song, don't automatically advance to the next."
-#~ msgstr ""
-#~ "Una volta terminata la riproduzione della canzone non avanzare alla "
-#~ "prossima."
-
-#~ msgid "Enabled"
-#~ msgstr "Abilitato"
-
-#~ msgid "Description"
-#~ msgstr "Descrizione"
-
-#~ msgid "Output Plugin Preferences"
-#~ msgstr "Impostazioni del plugin di output"
-
-#~ msgid "Output Plugin Information"
-#~ msgstr "Informazioni sul plugin di output"
-
-#~ msgid "_Decoder list:"
-#~ msgstr "Lista di _decoder:"
-
-#~ msgid "Decoders"
-#~ msgstr "Decoder"
-
-#~ msgid "_General plugin list:"
-#~ msgstr "Lista plugin generici"
-
-#~ msgid "General"
-#~ msgstr "Generale"
-
-#~ msgid "_Visualization plugin list:"
-#~ msgstr "Lista plugin _Visualizzazione"
-
-#~ msgid "Visualization"
-#~ msgstr "Visualizzazione"
-
-#, fuzzy
-#~ msgid "Effect plugins:"
-#~ msgstr "Lista plugin _Effetti"
-
-#, fuzzy
-#~ msgid "General"
-#~ msgstr "Genere"
-
-#~ msgid "Location"
-#~ msgstr "Posizione"
-
-#, fuzzy
-#~ msgid "Raw Metadata"
-#~ msgstr "Anno"
-
-#, fuzzy
-#~ msgid "Value"
-#~ msgstr "Blu"
-
-#, fuzzy
-#~ msgid ""
-#~ "Available interfaces:\n"
-#~ "\n"
-#~ msgstr "_Preset Disponibili:"
-
-#, fuzzy
-#~ msgid "Available Plugin Preferences:\n"
-#~ msgstr "_Preset Disponibili:"
-
-#~ msgid "Add/Open URL Dialog"
-#~ msgstr "Finestra di dialogo Aggiungi/Apri URL"
-
-#~ msgid "Enter location to play:"
-#~ msgstr "Inserisci indirizzo da riprodurre:"
-
-#~ msgid "Don't clear the playlist"
-#~ msgstr "Non cancellare la playlist"
-
-#~ msgid "audacious: %s"
-#~ msgstr "audacious: %s"
-
-#~ msgid "Filename:"
-#~ msgstr "Nome del file:"
-
-#~ msgid "No input plugin recognized this file"
-#~ msgstr "Nessun input plugin per questo file"
-
-#~ msgid ""
-#~ "<big>No output plugin selected.</big>\n"
-#~ "You have not selected an output plugin."
-#~ msgstr ""
-#~ "<big>Nessun plugin di uscita selezionato.</big>\n"
-#~ "Non è stato selezionato un plugin di uscita."
-
-#~ msgid "Connectivity"
-#~ msgstr "Connettività"
-
-#~ msgid "Detect file formats by extension."
-#~ msgstr "Individua formato di file dall'estensione."
-
-#, fuzzy
-#~ msgid ""
-#~ "When checked, Audacious will detect file formats based by extension. Only "
-#~ "files with extensions of supported formats will be loaded."
-#~ msgstr ""
-#~ "Quando abilitato, Audacious individuerà i formati di file basandosi "
-#~ "sull'estensione. Si tratta di un metodo più lento dell'individuazione su "
-#~ "richiesta, ma fornisce ancora un livello minimo di individuazione del "
-#~ "formato."
-
-#, fuzzy
-#~ msgid "Advanced"
-#~ msgstr "Riproduzione"
-
-#, fuzzy
-#~ msgid ""
-#~ "<big>Audacious %s</big>\n"
-#~ "\n"
-#~ "Copyright (C) 2005-2009 Audacious Development Team"
-#~ msgstr ""
-#~ "<big>Audacious %s</big>\n"
-#~ "Il futuro del multimediale UNIX.\n"
-#~ "\n"
-#~ "Copyright (C) 2005-2007 Audacious Development Team"
-
-#~ msgid "Detect file formats on demand, instead of immediately."
-#~ msgstr ""
-#~ "Individuazione formato di file su richiesta, anziché immediatamente."
-
-#~ msgid ""
-#~ "When checked, Audacious will detect file formats on demand. This can "
-#~ "result in a messier playlist, but delivers a major speed benefit."
-#~ msgstr ""
-#~ "Quando abilitato, Audacious individuerà i formati di file su richiesta. "
-#~ "Questo può risultare in una playlist più confusa, ma fornisce migliore "
-#~ "velocità."
-
-#~ msgid "Load metadata from playlists and files"
-#~ msgstr "Carica metadata dalla playlist e dai file"
-
-#~ msgid "Load metadata (tag information) from music files."
-#~ msgstr "Carica metadata (ID3) dai file musicali"
-
-#~ msgid "minutes:seconds"
-#~ msgstr "minuti:secondi"
-
-#~ msgid "Track length:"
-#~ msgstr "Lunghezza traccia:"
-
-#, fuzzy
-#~ msgid "Save as Static Playlist"
-#~ msgstr "Salva playlist"
-
-#~ msgid "Error writing playlist \"%s\": %s"
-#~ msgstr "Errore nello scrivere la playlist \"%s\": %s"
-
-#~ msgid "%s already exist. Continue?"
-#~ msgstr "%s esiste già. Continuare?"
-
-#~ msgid ""
-#~ "<big>Unable to save playlist.</big>\n"
-#~ "\n"
-#~ "Unknown file type for '%s'.\n"
-#~ msgstr ""
-#~ "<big>Impossibile salvare la playlist!</big>\n"
-#~ "\n"
-#~ "Tipo di file sconosciuto per '%s'.\n"
-
-#~ msgid "Presets"
-#~ msgstr "_Presets"
-
-#~ msgid "Mouse"
-#~ msgstr "Mouse"
-
-#~ msgid "Pause between songs"
-#~ msgstr "Pausa tra le canzoni"
-
-#~ msgid "Pause for"
-#~ msgstr "Pausa per"
-
-#~ msgid "seconds"
-#~ msgstr "secondi"
-
-#~ msgid "Filename"
-#~ msgstr "Nome del file"
-
-#~ msgid "Convert underscores to blanks"
-#~ msgstr "Converti underscores in spazi"
-
-#~ msgid "Convert %20 to blanks"
-#~ msgstr "Converti %%20 in spazi"
-
-#~ msgid "Convert backslash '\\' to forward slash '/'"
-#~ msgstr "Converti le barre inverse '\\' in barre dritte '/'"
-
-#~ msgid "File Dialog"
-#~ msgstr "Finestra File"
-
-#~ msgid "Always refresh directory when opening file dialog"
-#~ msgstr "Aggiorna sempre la directory quando si apre la finestra file"
-
-#~ msgid ""
-#~ "Always refresh the file dialog (this will slow opening the dialog on "
-#~ "large directories, and Gnome VFS should handle automatically)."
-#~ msgstr ""
-#~ "Aggiorna sempre la finestra file (questo rallenterà l'apertura della "
-#~ "finestra su grandi directory, e Gnome VFS dovrebbe gestirlo "
-#~ "automaticamente)."
-
-#~ msgid "Changes volume by"
-#~ msgstr "Varia il volume del"
-
-#~ msgid "percent"
-#~ msgstr "percento"
-
-#~ msgid "Scrolls playlist by"
-#~ msgstr "Scorre la playlist di"
-
-#~ msgid "lines"
-#~ msgstr "linee"
-
-#~ msgid "Stop after Current Song"
-#~ msgstr "Fermati dopo la canzone corrente"
-
-#, fuzzy
-#~ msgid "Peaks"
-#~ msgstr "Pausa"
-
-#~ msgid "Repeat"
-#~ msgstr "Ripeti"
-
-#~ msgid "Shuffle"
-#~ msgstr "Shuffle"
-
-#~ msgid "No Playlist Advance"
-#~ msgstr "Nessun Avanzamento in Playlist"
-
-#~ msgid "Play"
-#~ msgstr "Play"
-
-#~ msgid "Pause"
-#~ msgstr "Pausa"
-
-#~ msgid "Stop"
-#~ msgstr "Stop"
-
-#~ msgid "Previous"
-#~ msgstr "Precedente"
-
-#~ msgid "Next"
-#~ msgstr "Prossimo"
-
-#~ msgid "Visualization Mode"
-#~ msgstr "Modo Visualizzazione"
-
-#~ msgid "Analyzer Mode"
-#~ msgstr "Modo Analizzatore"
-
-#~ msgid "Scope Mode"
-#~ msgstr "Modo Spettrogramma"
-
-#~ msgid "WindowShade VU Mode"
-#~ msgstr "WindowShade VU Mode"
-
-#~ msgid "Refresh Rate"
-#~ msgstr "Frequenza Aggiornamento"
-
-#~ msgid "Analyzer Falloff"
-#~ msgstr "Discesa analizzatore"
-
-#~ msgid "Peaks Falloff"
-#~ msgstr "Discesa picchi"
-
-#~ msgid "New Playlist"
-#~ msgstr "Nuova playlist"
-
-#~ msgid "Select Next Playlist"
-#~ msgstr "Seleziona prossima playlist"
-
-#~ msgid "Select Previous Playlist"
-#~ msgstr "Seleziona precedente playlist"
-
-#~ msgid "Delete Playlist"
-#~ msgstr "Cancella playlist"
-
-#~ msgid "Load List"
-#~ msgstr "Carica Lista"
-
-#~ msgid "Loads a playlist file into the selected playlist."
-#~ msgstr "Carica un file playlist nella playlist selezionata"
-
-#~ msgid "Save List"
-#~ msgstr "Salva lista"
-
-#~ msgid "Saves the selected playlist."
-#~ msgstr "Salva la playlist selezionata."
-
-#~ msgid "Save Default List"
-#~ msgstr "Salva lista predefinita"
-
-#~ msgid "Saves the selected playlist to the default location."
-#~ msgstr "Salva la playlist selezionata alla posizione predefinita."
-
-#~ msgid "Refresh List"
-#~ msgstr "Aggiorna lista"
-
-#~ msgid "Refreshes metadata associated with a playlist entry."
-#~ msgstr "Aggiorna i metadati associati con l'elemento della playlist."
-
-#~ msgid "List Manager"
-#~ msgstr "Gestore liste"
-
-#~ msgid "Opens the playlist manager."
-#~ msgstr "Apre il gestore delle playlist."
-
-#~ msgid "View"
-#~ msgstr "Visualizza"
-
-#~ msgid "Add Internet Address..."
-#~ msgstr "Aggiungi Indirizzo internet..."
-
-#~ msgid "Adds a remote track to the playlist."
-#~ msgstr "Aggiunge una traccia remota alla playlist."
-
-#~ msgid "Add Files..."
-#~ msgstr "Aggiungi files..."
-
-#~ msgid "Search and Select"
-#~ msgstr "Cerca e seleziona"
-
-#~ msgid ""
-#~ "Searches the playlist and selects playlist entries based on specific "
-#~ "criteria."
-#~ msgstr ""
-#~ "Cerca nella playlist e seleziona gli elementi basati su criteri specifici."
-
-#~ msgid "Invert Selection"
-#~ msgstr "Inverti selezione"
-
-#~ msgid "Inverts the selected and unselected entries."
-#~ msgstr "Inverte gli elementi selezionati e non selezionati."
-
-#~ msgid "Select All"
-#~ msgstr "Seleziona tutti"
-
-#~ msgid "Selects all of the playlist entries."
-#~ msgstr "Seleziona tutti gli elementi "
-
-#~ msgid "Select None"
-#~ msgstr "Deseleziona tutti"
-
-#~ msgid "Deselects all of the playlist entries."
-#~ msgstr "Deseleziona tutti gli elementi della playlist."
-
-#~ msgid "Remove All"
-#~ msgstr "Rimuovi tutti"
-
-#~ msgid "Removes all entries from the playlist."
-#~ msgstr "Rimuove tutti gli elementi dalla playlist."
-
-#~ msgid "Clear Queue"
-#~ msgstr "Cancella coda"
-
-#~ msgid "Clears the queue associated with this playlist."
-#~ msgstr "Cancella la coda associata con questa playlist."
-
-#~ msgid "Remove Unavailable Files"
-#~ msgstr "Rimuovi file non disponibili"
-
-#~ msgid "Removes unavailable files from the playlist."
-#~ msgstr "Rimuove i file non disponibilid alla playlist."
-
-#~ msgid "Remove Duplicates"
-#~ msgstr "Rimuovi duplicati"
-
-#~ msgid "By Title"
-#~ msgstr "Per titolo"
-
-#~ msgid "Removes duplicate entries from the playlist by title."
-#~ msgstr "Rimuove dalla playlist gli elementi duplicati per titolo."
-
-#~ msgid "By Filename"
-#~ msgstr "Per nome del file"
-
-#~ msgid "Removes duplicate entries from the playlist by filename."
-#~ msgstr "Rimuove dalla playlist gli elementi duplicati per nome del file."
-
-#~ msgid "By Path + Filename"
-#~ msgstr "Per percorso e nome del file"
-
-#~ msgid "Removes duplicate entries from the playlist by their full path."
-#~ msgstr ""
-#~ "Rimuove dalla playlist gli elementi duplicati per il loro percorso "
-#~ "completo."
-
-#~ msgid "Remove Unselected"
-#~ msgstr "Rimuovi non selezionati"
-
-#~ msgid "Remove unselected entries from the playlist."
-#~ msgstr "Rimuove gli elementi non selezionati dalla playlist."
-
-#~ msgid "Remove Selected"
-#~ msgstr "Rimuovi selezionati"
-
-#~ msgid "Remove selected entries from the playlist."
-#~ msgstr "Rimuove gli elementi selezionati dalla playlist."
-
-#~ msgid "Randomize List"
-#~ msgstr "Riordina lista a caso"
-
-#~ msgid "Randomizes the playlist."
-#~ msgstr "Riordina la playlist secondo un ordine casuale."
-
-#~ msgid "Reverse List"
-#~ msgstr "Inverti l'ordine della lista"
-
-#~ msgid "Reverses the playlist."
-#~ msgstr "Inverte l'ordine degli elementi nella playlist."
-
-#~ msgid "Sort List"
-#~ msgstr "Ordina Lista"
-
-#~ msgid "Sorts the list by title."
-#~ msgstr "Ordina la lista per titolo."
-
-#, fuzzy
-#~ msgid "By Album"
-#~ msgstr "Album"
-
-#, fuzzy
-#~ msgid "Sorts the list by album."
-#~ msgstr "Ordina la lista per titolo."
-
-#~ msgid "By Artist"
-#~ msgstr "Per artista"
-
-#~ msgid "Sorts the list by artist."
-#~ msgstr "Ordina la lista per artista."
-
-#~ msgid "Sorts the list by filename."
-#~ msgstr "Ordina la lista per nome del file."
-
-#~ msgid "Sorts the list by full pathname."
-#~ msgstr "Ordina la lista per percorso completo del file."
-
-#~ msgid "By Date"
-#~ msgstr "Per data"
-
-#~ msgid "Sorts the list by modification time."
-#~ msgstr "Ordina la lista per data di modifica."
-
-#~ msgid "By Track Number"
-#~ msgstr "Per numero di traccia"
-
-#~ msgid "Sorts the list by track number."
-#~ msgstr "Ordina la lista per numero di traccia."
-
-#~ msgid "By Playlist Entry"
-#~ msgstr "Per elemento della playlist"
-
-#~ msgid "Sorts the list by playlist entry."
-#~ msgstr "Ordina la lista per elemento della playlist."
-
-#~ msgid "Sort Selected"
-#~ msgstr "Ordina selezione"
-
-#, fuzzy
-#~ msgid "File"
-#~ msgstr "Fuoco"
-
-#, fuzzy
-#~ msgid "Components"
-#~ msgstr "Commento"
-
-#~ msgid "View Track Details"
-#~ msgstr "Mostra dettagli traccia"
-
-#~ msgid "Play File"
-#~ msgstr "Riproduci file"
-
-#~ msgid "Load and play a file"
-#~ msgstr "Carica e riproduce un file"
-
-#~ msgid "Play Location"
-#~ msgstr "Riproduci posizione"
-
-#~ msgid "Play media from the selected location"
-#~ msgstr "Riproduce un file dalla posizione indicata"
-
-#, fuzzy
-#~ msgid "Plugin services"
-#~ msgstr "Plugins"
-
-#~ msgid "Preferences"
-#~ msgstr "Impostazioni"
-
-#~ msgid "Open preferences window"
-#~ msgstr "Apre la finestra delle impostazioni"
-
-#~ msgid "_Quit"
-#~ msgstr "_Esci"
-
-#~ msgid "Quit Audacious"
-#~ msgstr "Esce da Audacious"
-
-#, fuzzy
-#~ msgid "Clear A-B"
-#~ msgstr "Cancella coda"
-
-#~ msgid "Jump to Playlist Start"
-#~ msgstr "Salta all'inizio della playlist"
-
-#~ msgid "Jump to File"
-#~ msgstr "Salta al file"
-
-#~ msgid "Queue Toggle"
-#~ msgstr "Attiva/disattiva coda"
-
-#~ msgid "Enables/disables the entry in the playlist's queue."
-#~ msgstr "Attiva o disattiva l'elemento nella coda della playlist"
-
-#~ msgid "Load"
-#~ msgstr "Carica"
-
-#~ msgid "Import"
-#~ msgstr "Importa"
-
-#~ msgid "Save"
-#~ msgstr "Salva"
-
-#~ msgid "Delete"
-#~ msgstr "Cancella"
-
-#~ msgid "Preset"
-#~ msgstr "Preset"
-
-#~ msgid "Load preset"
-#~ msgstr "Carica preset"
-
-#~ msgid "Auto-load preset"
-#~ msgstr "Preset automatico"
-
-#~ msgid "Load auto-load preset"
-#~ msgstr "Carica preset automatico"
-
-#~ msgid "Default"
-#~ msgstr "Predefinito"
-
-#~ msgid "Load default preset into equalizer"
-#~ msgstr "Carica il preset di default nell'equalizzatore"
-
-#~ msgid "Zero"
-#~ msgstr "Zero"
-
-#~ msgid "Set equalizer preset levels to zero"
-#~ msgstr "Imposta i livelli di preset dell'equalizzatore a zero"
-
-#~ msgid "From file"
-#~ msgstr "Da file"
-
-#~ msgid "Load preset from file"
-#~ msgstr "Carica i preset da file"
-
-#~ msgid "From WinAMP EQF file"
-#~ msgstr "Da un file EQF di WinAMP"
-
-#~ msgid "Load preset from WinAMP EQF file"
-#~ msgstr "Carica i preset da un file EQF di WinAMP"
-
-#~ msgid "WinAMP Presets"
-#~ msgstr "Preset di WinAMP"
-
-#~ msgid "Import WinAMP presets"
-#~ msgstr "Importa i preset di WinAMP"
-
-#~ msgid "Save preset"
-#~ msgstr "Salva preset"
-
-#~ msgid "Save auto-load preset"
-#~ msgstr "Salva preset automatico"
-
-#~ msgid "Save default preset"
-#~ msgstr "Salva preset predefinito"
-
-#~ msgid "To file"
-#~ msgstr "Su file"
-
-#~ msgid "Save preset to file"
-#~ msgstr "Salva preset su file"
-
-#~ msgid "To WinAMP EQF file"
-#~ msgstr "Su file EQF di WinAMP"
-
-#~ msgid "Save preset to WinAMP EQF file"
-#~ msgstr "Salva i preset su un file EQF di WinAMP"
-
-#~ msgid "Delete preset"
-#~ msgstr "Cancella preset"
-
-#~ msgid "Delete auto-load preset"
-#~ msgstr "Cancella preset automatico"
-
-#, fuzzy
-#~ msgid ""
-#~ "This is the amount of time to prebuffer audio "
-#~ "streams by, in milliseconds.\n"
-#~ "Increase this value if you are experiencing audio skipping.\n"
-#~ "Please note however, that high values will result in Audacious performing "
-#~ "poorly."
-#~ msgstr ""
-#~ "Quantità di tempo in millisecondi da precaricare dai "
-#~ "flussi audio.\n"
-#~ "Aumentate questo valore se si stanno avendo salti nella riproduzione.\n"
-#~ "Si noti comunque che valori troppo alti risulteranno in basse prestazioni "
-#~ "per Audacious."
-
-#~ msgid "Enable headless operation"
-#~ msgstr "Abilita il funzionamento invisibile"
-
-#~ msgid ""
-#~ "<big>Unable to load skin.</big>\n"
-#~ "\n"
-#~ "Check that skin at '%s' is usable and default skin is properly installed "
-#~ "at '%s'\n"
-#~ msgstr ""
-#~ "<big>Impossibile caricare la skin.</big>\n"
-#~ "\n"
-#~ "Controllare che la skin '%s' sia usabile e che la skin di default sia "
-#~ "installata in '%s'\n"
-
-#, fuzzy
-#~ msgid "Headless operation enabled\n"
-#~ msgstr "Abilita il funzionamento invisibile"
-
-#~ msgid "Audacious core developers:"
-#~ msgstr "Sviluppatori primari Audacious:"
-
-#~ msgid "Audacious Equalizer"
-#~ msgstr "Equalizzatore di Audacious"
-
-#~ msgid "Play files"
-#~ msgstr "Riproduci file"
-
-#~ msgid "Load files"
-#~ msgstr "Carica file"
-
-#~ msgid "%s - Audacious"
-#~ msgstr "%s - Audacious"
-
-#~ msgid "VBR"
-#~ msgstr "VBR"
-
-#~ msgid "mono"
-#~ msgstr "mono"
-
-#, fuzzy
-#~ msgid "Show main player window"
-#~ msgstr "Seleziona font per la finestra principale"
-
-#, fuzzy
-#~ msgid "Seek to: %d:%-2.2d/%d:%-2.2d (%d%%)"
-#~ msgstr "SEEK TO: %d:%-2.2d/%d:%-2.2d (%d%%)"
-
-#, fuzzy
-#~ msgid "Disable 'Always On Top'"
-#~ msgstr "Sempre in primo piano"
-
-#, fuzzy
-#~ msgid "Enable 'Always On Top'"
-#~ msgstr "Sempre in primo piano"
-
-#, fuzzy
-#~ msgid "Visualization Menu"
-#~ msgstr "Modo Visualizzazione"
-
-#~ msgid ""
-#~ "<big>Couldn't open audio.</big>\n"
-#~ "\n"
-#~ "Please check that:\n"
-#~ "1. You have the correct output plugin selected.\n"
-#~ "2. No other programs is blocking the soundcard.\n"
-#~ "3. Your soundcard is configured properly.\n"
-#~ msgstr ""
-#~ "<big>Impossibile avviare l'audio.</big>\n"
-#~ "\n"
-#~ "Controllare che:\n"
-#~ "1. È stato selezionato il giusto output plugin.\n"
-#~ "2. Altri progrmmi non stiano bloccando la scheda audio.\n"
-#~ "3. La scheda audio sia configurata.\n"
-
-#~ msgid "Autoscroll Songname"
-#~ msgstr "Scorri automaticamente il titolo"
-
-#~ msgid "Show Player"
-#~ msgstr "Mostra player"
-
-#~ msgid "Show Playlist Editor"
-#~ msgstr "Mostra editor playlist"
-
-#~ msgid "Show Equalizer"
-#~ msgstr "Mostra Equalizzatore"
-
-#~ msgid "Always on Top"
-#~ msgstr "Sempre in primo piano"
-
-#~ msgid "Put on All Workspaces"
-#~ msgstr "Mostra su Tutti i Desktop"
-
-#~ msgid "Roll up Player"
-#~ msgstr "Arrotola Player"
-
-#~ msgid "Roll up Playlist Editor"
-#~ msgstr "Arrotola Editor della Playlist"
-
-#~ msgid "Roll up Equalizer"
-#~ msgstr "Arrotola Equalizzatore"
-
-#, fuzzy
-#~ msgid "Scale"
-#~ msgstr "Salva"
-
-#~ msgid "DoubleSize"
-#~ msgstr "Doppia dimensione"
-
-#~ msgid "Easy Move"
-#~ msgstr "Movimento facilitato"
-
-#~ msgid "Analyzer"
-#~ msgstr "Analizzatore"
-
-#~ msgid "Scope"
-#~ msgstr "Spettrogramma"
-
-#~ msgid "Off"
-#~ msgstr "Spento"
-
-#~ msgid "Normal"
-#~ msgstr "Normale"
-
-#~ msgid "Fire"
-#~ msgstr "Fuoco"
-
-#~ msgid "Vertical Lines"
-#~ msgstr "Linee verticali"
-
-#~ msgid "Lines"
-#~ msgstr "Linee"
-
-#~ msgid "Bars"
-#~ msgstr "Barre"
-
-#~ msgid "Dot Scope"
-#~ msgstr "Spettro a punti"
-
-#~ msgid "Line Scope"
-#~ msgstr "Spettro a linee"
-
-#~ msgid "Solid Scope"
-#~ msgstr "Spettro solido"
-
-#~ msgid "Ice"
-#~ msgstr "Ghiaccio"
-
-#~ msgid "Smooth"
-#~ msgstr "Morbido"
-
-#~ msgid "Full (~50 fps)"
-#~ msgstr "Piena (~50 fps)"
-
-#~ msgid "Half (~25 fps)"
-#~ msgstr "Dimezzata (~ 25 fps)"
-
-#~ msgid "Quarter (~13 fps)"
-#~ msgstr "Un Quarto (~13 fps)"
-
-#~ msgid "Eighth (~6 fps)"
-#~ msgstr "Un Ottavo (~6 fps)"
-
-#~ msgid "Slowest"
-#~ msgstr "Molto lenta"
-
-#~ msgid "Slow"
-#~ msgstr "Lenta"
-
-#~ msgid "Medium"
-#~ msgstr "Media"
-
-#~ msgid "Fast"
-#~ msgstr "Veloce"
-
-#~ msgid "Fastest"
-#~ msgstr "Molto veloce"
-
-#~ msgid "Time Elapsed"
-#~ msgstr "Tempo trascorso"
-
-#~ msgid "Time Remaining"
-#~ msgstr "Tempo Rimanente"
-
-#, fuzzy
-#~ msgid "Plugin Services"
-#~ msgstr "Plugins"
-
-#~ msgid "Search entries in active playlist"
-#~ msgstr "Ricerca elementi nella playlist attiva"
-
-#~ 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 riempiendo uno o più campi. I campi "
-#~ "utilizzano la sintassi delle espressioni regolari, senza distinzione "
-#~ "maiuscole/minuscole. Se non si conosce come funzionano le espressioni "
-#~ "regolari, si inserisca semplicemente il testo che si sta cercando."
-
-#, fuzzy
-#~ msgid "Title: "
-#~ msgstr "Titolo"
-
-#, fuzzy
-#~ msgid "Album: "
-#~ msgstr "Album"
-
-#~ msgid "Artist: "
-#~ msgstr "Artista: "
-
-#~ msgid "Filename: "
-#~ msgstr "Nome del file: "
-
-#~ msgid "Clear previous selection before searching"
-#~ msgstr "Pulisci la selezione precedente prima di cercare"
-
-#~ msgid "Automatically toggle queue for matching entries"
-#~ msgstr ""
-#~ "Abilita/disabilita coda automaticamente per gli elementi individuati"
-
-#~ msgid "Audacious Playlist Editor"
-#~ msgstr "Editor di lista di Audacious"
-
-#~ msgid "Appearance"
-#~ msgstr "Aspetto"
-
-#~ msgid "_Fonts"
-#~ msgstr "_Font"
-
-#~ msgid "_Player:"
-#~ msgstr "_Player:"
-
-#~ msgid "Select main player window font:"
-#~ msgstr "Seleziona font per la finestra principale"
-
-#~ msgid "_Playlist:"
-#~ msgstr "_Playlist:"
-
-#, fuzzy
-#~ msgid "Select playlist font:"
-#~ msgstr "Seleziona font per la finestra principale"
-
-#~ msgid "Use Bitmap fonts if available"
-#~ msgstr "Usa i font bitmap se disponibili."
-
-#~ msgid ""
-#~ "Use bitmap fonts if they are available. Bitmap fonts do not support "
-#~ "Unicode strings."
-#~ msgstr ""
-#~ "Usa i font bitmap se disponibili. I font bitmap non hanno supporto per le "
-#~ "stringhe Unicode."
-
-#~ msgid "_Miscellaneous"
-#~ msgstr "_Varie"
-
-#~ msgid "Show track numbers in playlist"
-#~ msgstr "Mostra numero traccia nella playlist"
-
-#~ msgid "Show separators in playlist"
-#~ msgstr "Mostra separatori nella playlist"
-
-#~ msgid "Show window manager decoration"
-#~ msgstr "Mostra la decorazione del gestore delle finestre"
-
-#~ msgid "This enables the window manager to show decorations for windows."
-#~ msgstr ""
-#~ "Abilita il gestore delle finestre a mostrare le decorazioni per la "
-#~ "finestra."
-
-#~ msgid "Use XMMS-style file selector instead of the default selector"
-#~ msgstr "Usa la selezione file in stile XMMS invece di quella predefinita"
-
-#~ msgid ""
-#~ "This enables the XMMS/GTK1-style file selection dialogs. This selector is "
-#~ "provided by Audacious itself and is faster than the default GTK2 selector "
-#~ "(but sadly not as user-friendly)."
-#~ msgstr ""
-#~ "Abilita le finestre di dialogo di selezione del file in stile XMMS/GTK1. "
-#~ "Questa finestra è fornita direttamente da Audacious ed è più veloce della "
-#~ "finestra GTK2 (ma sfortunatamente non così user-friendly)."
-
-#~ msgid "On load"
-#~ msgstr "Durante il caricamento"
-
-#~ msgid "Load metadata when adding the file to the playlist or opening it"
-#~ msgstr ""
-#~ "Carica metadata quando vengono aggiunti file alla playlist o vengono "
-#~ "aperti"
-
-#~ msgid "On display"
-#~ msgstr "Durante la visualizzazione"
-
-#, fuzzy
-#~ msgid ""
-#~ "Load metadata on demand when displaying the file in the playlist. You may "
-#~ "need to set \"Detect file formats on demand\" in Audio page for full "
-#~ "benefit."
-#~ msgstr ""
-#~ "Carica i metadati su richiesta quando si visualizza il file nella playlist"
-
-#~ msgid "Color Adjustment"
-#~ msgstr "Aggiustamento colori"
-
-#~ msgid ""
-#~ "Audacious allows you to alter the color balance of the skinned UI. The "
-#~ "sliders below will allow you to do this."
-#~ msgstr ""
-#~ "Audacious ti permette di alterare il bilanciamento dei colori "
-#~ "dell'interfaccia Skin tramite le slitte sottostanti."
-
-#~ msgid "Blue"
-#~ msgstr "Blu"
-
-#~ msgid "Green"
-#~ msgstr "Verde"
-
-#~ msgid "Red"
-#~ msgstr "Rosso"
-
-#~ msgid "_Skin"
-#~ msgstr "_Skin"
-
-#~ msgid "Refresh skin list"
-#~ msgstr "Aggiorna lista skin"
-
-#~ msgid "PREAMP"
-#~ msgstr "PREAMP"
-
-#~ msgid "60HZ"
-#~ msgstr "60HZ"
-
-#~ msgid "170HZ"
-#~ msgstr "170HZ"
-
-#~ msgid "310HZ"
-#~ msgstr "310HZ"
-
-#~ msgid "600HZ"
-#~ msgstr "600HZ"
-
-#~ msgid "1KHZ"
-#~ msgstr "1KHZ"
-
-#~ msgid "3KHZ"
-#~ msgstr "3KHZ"
-
-#~ msgid "6KHZ"
-#~ msgstr "6KHZ"
-
-#~ msgid "12KHZ"
-#~ msgstr "12KHZ"
-
-#~ msgid "14KHZ"
-#~ msgstr "14KHZ"
-
-#~ msgid "16KHZ"
-#~ msgstr "16KHZ"
-
-#~ msgid "Archived Winamp 2.x skin"
-#~ msgstr "Skin Winamp 2.x compressa"
-
-#~ msgid "Unarchived Winamp 2.x skin"
-#~ msgstr "Skin Winamp 2.x non compressa"
-
-#~ msgid "Show version and builtin features"
-#~ msgstr "Mostra la versione e le funzionalità integrate"
-
-#~ msgid "Use custom cursors"
-#~ msgstr "Usa cursore personalizzato"
-
-#, fuzzy
-#~ msgid "Reload Plugins"
-#~ msgstr "Plugins"
-
-#~ msgid ""
-#~ "Sorry, threads isn't supported on your platform.\n"
-#~ "\n"
-#~ "If you're on a libc5 based linux system and installed Glib & GTK+ before "
-#~ "you\n"
-#~ "installed LinuxThreads you need to recompile Glib & GTK+.\n"
-#~ msgstr ""
-#~ "La tua piattaforma non supporta i threads.\n"
-#~ "\n"
-#~ "Se usi un sistema linux basato su libc5 e hai installato Glib & GTK+ "
-#~ "prima di quando\n"
-#~ "hai installato LinuxThreads devi ricompilareGlib & GTK+.\n"
-
-#~ msgid "Error in Audacious."
-#~ msgstr "Errore in Audacious."
-
-#~ msgid "Select which Audacious session ID to use"
-#~ msgstr "Seleziona quale ID sessione di Audacious usare"
-
-#, fuzzy
-#~ msgid "Disable 'Doublesize'"
-#~ msgstr "Doppia dimensione"
-
-#, fuzzy
-#~ msgid "Enable 'Doublesize'"
-#~ msgstr "Doppia dimensione"
-
-#~ msgid "Presets"
-#~ msgstr "Presets"
-
-#~ msgid "File preset extension:"
-#~ msgstr "Estensione dei file preset:"
-
-#~ msgid "Directory preset file:"
-#~ msgstr "Directory per i file preset:"
-
-#~ msgid "localhost"
-#~ msgstr "localhost"
-
-#~ msgid ""
-#~ "<big>Unable to create %s.</big>\n"
-#~ "\n"
-#~ "Could not open glade file (%s). Please check your installation.\n"
-#~ msgstr ""
-#~ "<big>Impossibile creare %s.</big>\n"
-#~ "\n"
-#~ "Impossibile aprire il file glade (%s). Controllare l'installazione.\n"
-
-#~ msgid ""
-#~ "TITLE\n"
-#~ "ARTIST - TITLE\n"
-#~ "ARTIST - ALBUM - TITLE\n"
-#~ "ARTIST - ALBUM - TRACK. TITLE\n"
-#~ "ARTIST [ ALBUM ] - TRACK. TITLE\n"
-#~ "ALBUM - TITLE\n"
-#~ "Custom"
-#~ msgstr ""
-#~ "TITOLO\n"
-#~ "ARTISTA - TITOLO\n"
-#~ "ARTISTA - ALBUM - TITOLO\n"
-#~ "ARTISTA - ALBUM - TRACCIA. TITOLO\n"
-#~ "ARTISTA [ ALBUM ] - TRACCIA. TITOLO\n"
-#~ "ALBUM - TITOLO\n"
-#~ "Personalizzato"
-
-#~ msgid "Track Information Window"
-#~ msgstr "Finestra di informazioni sulla traccia"
-
-#~ msgid "Preferences Window"
-#~ msgstr "Preferenze"
-
-#, fuzzy
-#~ msgid "Artist: %s"
-#~ msgstr "Presets"
-
-#, fuzzy
-#~ msgid "Title: %s"
-#~ msgstr "Nome del file"
+msgstr "Mostra le opzioni di gestione della sessione"
 
-#, fuzzy
-#~ msgid "Album: %s"
-#~ msgstr "Album"
 
-#, fuzzy
-#~ msgid "Audacious last.fm radio tuner"
-#~ msgstr "Editor di lista di Audacious"
-
-#, fuzzy
-#~ msgid "Artist:"
-#~ msgstr "Presets"
-
-#, fuzzy
-#~ msgid "Album:"
-#~ msgstr "Nome del file"
-
-#~ msgid "VOLUME: %d%%"
-#~ msgstr "VOLUME: %d%%"
-
-#~ msgid "BALANCE: %d%% LEFT"
-#~ msgstr "BALANCE: %d%% SINISTRA"
-
-#~ msgid "BALANCE: CENTER"
-#~ msgstr "BALANCE: CENTRO"
-
-#~ msgid "BALANCE: %d%% RIGHT"
-#~ msgstr "BALANCE: %d%% DESTRA"
-
-#, fuzzy
-#~ msgid "Last.fm radio"
-#~ msgstr "Riproduci posizione"
-
-#, fuzzy
-#~ msgid "Play Last.fm radio"
-#~ msgstr "Riproduci posizione"
-
-#~ msgid ""
-#~ "<big>No playable CD found.</big>\n"
-#~ "\n"
-#~ "No CD inserted, or inserted CD is not an audio CD.\n"
-#~ msgstr ""
-#~ "<big>Nessun cd riproducibile trovato.</big>\n"
-#~ "\n"
-#~ "Nessun CD inserito, oppure non è un CD audio.\n"
-
-#~ msgid "Add CD..."
-#~ msgstr "Aggiungi CD..."
-
-#~ msgid "Adds a CD to the playlist."
-#~ msgstr "Aggiunge un CD alla playlist."
-
-#~ msgid "Play CD"
-#~ msgstr "Riproduci CD"
-
-#~ msgid "Performer/Artist"
-#~ msgstr "Artista"
-
-#~ msgid "File name"
-#~ msgstr "Nome file"
-
-#~ msgid "File path"
-#~ msgstr "Percorso file"
-
-#~ msgid "File extension"
-#~ msgstr "Estensione file"
-
-#~ msgid "Track number"
-#~ msgstr "Traccia n°"
-
-#~ msgid "%{n:...%}: Display \"...\" only if element %n is present"
-#~ msgstr "%{n:...%}: Mostra \"...\" solo se l'elemento %n è presente"
-
-#~ msgid ""
-#~ "Sorry, your GTK+ version (%d.%d.%d) does not work with Audacious.\n"
-#~ "Please use GTK+ %s or newer.\n"
-#~ msgstr ""
-#~ "La tua versione di GTK+ (%d.%d.%d) non è compatibile con Audacious.\n"
-#~ "Si usi GTK+ %s o superiore.\n"
-
-#~ msgid "OPTIONS MENU"
-#~ msgstr "MENU OPZIONI"
-
-#~ msgid "DISABLE ALWAYS ON TOP"
-#~ msgstr "DISABILITA SEMPRE IN PRIMO PIANO"
-
-#~ msgid "ENABLE ALWAYS ON TOP"
-#~ msgstr "ABILITA SEMPRE IN PRIMO PIANO"
-
-#~ msgid "FILE INFO BOX"
-#~ msgstr "FILE INFO BOX"
-
-#~ msgid "DISABLE DOUBLESIZE"
-#~ msgstr "DISABILITA DIMENSIONE DOPPIA"
-
-#~ msgid "ENABLE DOUBLESIZE"
-#~ msgstr "ABILITA DIMENSIONE DOPPIA"
-
-#~ msgid "VISUALIZATION MENU"
-#~ msgstr "MENU VISUALIZZAZIONE"
-
-#~ msgid "Track name: "
-#~ msgstr "Nome della traccia: "
-
-#~ msgid ""
-#~ "<big>Unable to play files.</big>\n"
-#~ "\n"
-#~ "The following files could not be played. Please check that:\n"
-#~ "1. they are accessible.\n"
-#~ "2. you have enabled the media plugins required."
-#~ msgstr ""
-#~ "<big>Impossibile riprodurre il file.</big>\n"
-#~ "\n"
-#~ "I seguenti files non possono essere riprodotti. Controllare che:\n"
-#~ "1. siano accessibili.\n"
-#~ "2. sia abilitato il plugin richiesto."
-
-#~ msgid "Show more _details"
-#~ msgstr "Mostra piu _dettagli"
-
-#~ msgid ""
-#~ "\n"
-#~ "Received SIGSEGV\n"
-#~ "\n"
-#~ "This could be a bug in Audacious. If you don't know why this happened, "
-#~ "file a bug at http://bugs-meta.atheme.org/\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Ricevuto SIGSEGV\n"
-#~ "\n"
-#~ "Questo potrebbe essere un bug in Audacious. Se non si conosce il motivo "
-#~ "per cui questo è accaduto, si apra un bug su http://bugs-meta.atheme."
-#~ "org/\n"
-#~ "\n"

audacious-3.1.1.tar.bz2/po/ja.po -> audacious-3.2.4.tar.bz2/po/ja.po Changed

@@ -1,1235 +1,1192 @@
-# audacious ja.po.
-# Copyright (C) 2000-2004 Free Software Foundation, Inc.
-# This file is distributed under the same license as the bmp package.
-# Hiroshi Takekawa <sian@big.or.jp>, 2000-2003. (XMMS)
-# -----------------------------------------------------
-# Takeshi AIHANA <aihana@gnome.gr.jp>, 2004. (bmp)
-# -----------------------------------------------------
-# dai <d+po@vdr.jp>, 2005-2007.
-# Thanks to:
-# 	KAZUKI SHIMURA <kazuki@ma.ccnw.ne.jp>
+# Japanese translation for Audacious
+# Copyright (C) Audacious translators
+# This file is distributed under the same license as the Audacious package.
 #
+# Translators:
+# <m2330880989@shibuya-center.com>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: audacious HEAD\n"
-"Report-Msgid-Bugs-To: http://jira.atheme.org/\n"
-"POT-Creation-Date: 2011-07-05 22:45+0200\n"
-"PO-Revision-Date: 2009-06-19 12:22+0900\n"
-"Last-Translator: dai <d+po@vdr.jp>\n"
-"Language-Team: Japanese <ja@li.org>\n"
-"Language: ja\n"
+"Project-Id-Version: Audacious\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2012-01-11 08:54-0500\n"
+"PO-Revision-Date: 2012-05-14 12:19+0000\n"
+"Last-Translator: Shuuji Takahashi <shuuji3@gmail.com>\n"
+"Language-Team: Japanese\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
-#: src/audacious/adder.c:71
+#: src/audacious/adder.c:77
 msgid "Searching ..."
-msgstr ""
+msgstr "検索中..."
 
-#: src/audacious/adder.c:99
+#: src/audacious/adder.c:113
 #, c-format
 msgid "%d file found"
 msgid_plural "%d files found"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d 個のファイルが見つかりました"
 
-#: src/audacious/chardet.c:37
+#: src/audacious/chardet.c:39
 msgid " (invalid UTF-8)"
 msgstr " (不正な UTF-8)"
 
-#: src/audacious/credits.c:35
+#: src/audacious/credits.c:37
 msgid "Core developers:"
 msgstr "主要開発者:"
 
-#: src/audacious/credits.c:49
+#: src/audacious/credits.c:51
 msgid "Graphics:"
 msgstr "グラフィックス:"
 
-#: src/audacious/credits.c:54
+#: src/audacious/credits.c:56
 msgid "Default skin:"
 msgstr "デフォルトのスキン:"
 
-#: src/audacious/credits.c:60
+#: src/audacious/credits.c:62
 msgid "Plugin development:"
 msgstr "プラグイン開発:"
 
-#: src/audacious/credits.c:83
+#: src/audacious/credits.c:85
 msgid "Patch authors:"
 msgstr "パッチ作者:"
 
-#: src/audacious/credits.c:126
+#: src/audacious/credits.c:131
 msgid "1.x developers:"
 msgstr "1.x 開発者:"
 
-#: src/audacious/credits.c:148
+#: src/audacious/credits.c:153
 msgid "BMP Developers:"
 msgstr "BMP 開発者:"
 
-#: src/audacious/credits.c:180
-#, fuzzy
+#: src/audacious/credits.c:185
 msgid "Belarusian:"
-msgstr "ブルガリア語:"
+msgstr "ベラルーシ語:"
 
-#: src/audacious/credits.c:183
+#: src/audacious/credits.c:188
 msgid "Basque:"
 msgstr "バスク語:"
 
-#: src/audacious/credits.c:186
+#: src/audacious/credits.c:191
 msgid "Brazilian Portuguese:"
 msgstr "ブラジルポルトガル語:"
 
-#: src/audacious/credits.c:190
+#: src/audacious/credits.c:196
 msgid "Breton:"
 msgstr "ブレトン語:"
 
-#: src/audacious/credits.c:193
+#: src/audacious/credits.c:199
 msgid "Bulgarian:"
 msgstr "ブルガリア語:"
 
-#: src/audacious/credits.c:196
+#: src/audacious/credits.c:202
 msgid "Catalan:"
 msgstr "カタロニア語:"
 
-#: src/audacious/credits.c:199
-#, fuzzy
+#: src/audacious/credits.c:206
 msgid "Chinese:"
-msgstr "簡体中国語"
+msgstr "中国語:"
 
-#: src/audacious/credits.c:202
+#: src/audacious/credits.c:209
 msgid "Croatian:"
 msgstr "クロアチア語:"
 
-#: src/audacious/credits.c:205
+#: src/audacious/credits.c:212
 msgid "Czech:"
 msgstr "チェコ語:"
 
-#: src/audacious/credits.c:208
+#: src/audacious/credits.c:215
 msgid "Dutch:"
 msgstr "オランダ語:"
 
-#: src/audacious/credits.c:212
+#: src/audacious/credits.c:219
 msgid "Estonian:"
 msgstr "エストニア語:"
 
-#: src/audacious/credits.c:215
+#: src/audacious/credits.c:222
 msgid "Finnish:"
 msgstr "フィンランド語:"
 
-#: src/audacious/credits.c:220
+#: src/audacious/credits.c:227
 msgid "French:"
 msgstr "フランス語:"
 
-#: src/audacious/credits.c:226
+#: src/audacious/credits.c:233
 msgid "German:"
 msgstr "ドイツ語:"
 
-#: src/audacious/credits.c:233
+#: src/audacious/credits.c:240
 msgid "Georgian:"
 msgstr "グルジア語:"
 
-#: src/audacious/credits.c:236
+#: src/audacious/credits.c:243
 msgid "Greek:"
 msgstr "ギリシア語:"
 
-#: src/audacious/credits.c:241
+#: src/audacious/credits.c:248
 msgid "Hindi:"
 msgstr "ヒンディ語:"
 
-#: src/audacious/credits.c:244
+#: src/audacious/credits.c:251
 msgid "Hungarian:"
 msgstr "ハンガリー語:"
 
-#: src/audacious/credits.c:248
+#: src/audacious/credits.c:255
 msgid "Italian:"
 msgstr "イタリア語:"
 
-#: src/audacious/credits.c:252
+#: src/audacious/credits.c:260
 msgid "Japanese:"
 msgstr "日本語:"
 
-#: src/audacious/credits.c:255
+#: src/audacious/credits.c:263
 msgid "Korean:"
 msgstr "朝鮮語:"
 
-#: src/audacious/credits.c:258
-#, fuzzy
+#: src/audacious/credits.c:266
 msgid "Latvian:"
-msgstr "クロアチア語:"
+msgstr "ラトビア語:"
 
-#: src/audacious/credits.c:261
+#: src/audacious/credits.c:269
 msgid "Lithuanian:"
 msgstr "リトアニア語:"
 
-#: src/audacious/credits.c:265
+#: src/audacious/credits.c:274
 msgid "Macedonian:"
 msgstr "マケドニア語:"
 
-#: src/audacious/credits.c:268
+#: src/audacious/credits.c:277
+msgid "Mexican Spanish:"
+msgstr "スペイン語(メキシコ):"
+
+#: src/audacious/credits.c:280
 msgid "Polish:"
 msgstr "ポーランド語:"
 
-#: src/audacious/credits.c:274
-#, fuzzy
+#: src/audacious/credits.c:287
 msgid "Portuguese:"
-msgstr "ブラジルポルトガル語:"
+msgstr "ポルトガル語:"
 
-#: src/audacious/credits.c:277
+#: src/audacious/credits.c:290
 msgid "Romanian:"
 msgstr "ルーマニア語:"
 
-#: src/audacious/credits.c:281
+#: src/audacious/credits.c:294
 msgid "Russian:"
 msgstr "ロシア語:"
 
-#: src/audacious/credits.c:285
+#: src/audacious/credits.c:298
 msgid "Serbian (Latin):"
 msgstr "セルビア語 (ラテン文字):"
 
-#: src/audacious/credits.c:288
+#: src/audacious/credits.c:301
 msgid "Serbian (Cyrillic):"
 msgstr "セルビア語 (キリル文字):"
 
-#: src/audacious/credits.c:291
+#: src/audacious/credits.c:305
 msgid "Simplified Chinese:"
 msgstr "簡体字中国語:"
 
-#: src/audacious/credits.c:294
+#: src/audacious/credits.c:308
 msgid "Slovak:"
 msgstr "スロバキア語:"
 
-#: src/audacious/credits.c:297
+#: src/audacious/credits.c:312
 msgid "Spanish:"
 msgstr "スペイン語:"
 
-#: src/audacious/credits.c:304
+#: src/audacious/credits.c:320
 msgid "Swedish:"
 msgstr "スウェーデン語:"
 
-#: src/audacious/credits.c:307
+#: src/audacious/credits.c:323
 msgid "Traditional Chinese:"
 msgstr "繁体字中国語:"
 
-#: src/audacious/credits.c:312
+#: src/audacious/credits.c:329
 msgid "Turkish:"
 msgstr "トルコ語:"
 
-#: src/audacious/credits.c:316
+#: src/audacious/credits.c:333
 msgid "Ukrainian:"
 msgstr "ウクライナ語:"
 
-#: src/audacious/credits.c:319
+#: src/audacious/credits.c:338
+msgid "Vietnamese:"
+msgstr "ベトナム語:"
+
+#: src/audacious/credits.c:341
 msgid "Welsh:"
 msgstr "ウェールズ語:"
 
-#: src/audacious/drct.c:256
-#, fuzzy
-msgid "Temporary Playlist"
-msgstr "プレイリストの読み込み"
-
-#: src/audacious/equalizer_preset.c:186
+#: src/audacious/equalizer_preset.c:180
 #, c-format
 msgid "Error importing Winamp EQF file '%s'"
 msgstr "Winamp EQF ファイル '%s' のインポートエラー"
 
-#: src/audacious/main.c:256
+#: src/audacious/main.c:243
 msgid "Skip backwards in playlist"
 msgstr "プレイリストの一つ前の曲にジャンプする"
 
-#: src/audacious/main.c:257
+#: src/audacious/main.c:244
 msgid "Start playing current playlist"
 msgstr "現在のプレイリストで演奏を開始する"
 
-#: src/audacious/main.c:258
+#: src/audacious/main.c:245
 msgid "Pause current song"
 msgstr "現在の曲を一時停止する"
 
-#: src/audacious/main.c:259
+#: src/audacious/main.c:246
 msgid "Stop current song"
 msgstr "現在の曲を停止する"
 
-#: src/audacious/main.c:260
+#: src/audacious/main.c:247
 msgid "Pause if playing, play otherwise"
 msgstr "演奏していたら一時停止し, それ以外は演奏する"
 
-#: src/audacious/main.c:261
+#: src/audacious/main.c:248
 msgid "Skip forward in playlist"
 msgstr "プレイリストの一つ次の曲にジャンプする"
 
-#: src/audacious/main.c:262
+#: src/audacious/main.c:249
 msgid "Display Jump to File dialog"
 msgstr "ファイルダイアログへのジャンプを表示"
 
-#: src/audacious/main.c:263
-#, fuzzy
+#: src/audacious/main.c:250
 msgid "Add files to the playlist"
-msgstr "ファイルをプレイリストに追加します."
+msgstr "プレイリストにファイルを追加"
 
-#: src/audacious/main.c:264
+#: src/audacious/main.c:251
 msgid "Add new files to a temporary playlist"
 msgstr "新しいファイルを一時プレイリストに追加する"
 
-#: src/audacious/main.c:265
+#: src/audacious/main.c:252
 msgid "Display the main window"
 msgstr "メインウィンドウを表示する"
 
-#: src/audacious/main.c:266
+#: src/audacious/main.c:253
 msgid "Show version"
-msgstr "ヴァージョンを表示する"
+msgstr "バージョンを表示する"
 
-#: src/audacious/main.c:267
+#: src/audacious/main.c:254
 msgid "Print debugging messages"
-msgstr ""
+msgstr "デバッグメッセージを表示する"
 
-#: src/audacious/main.c:268
+#: src/audacious/main.c:255
+msgid "Headless mode (beta)"
+msgstr "ヘッドレスモード (ベータ)"
+
+#: src/audacious/main.c:256
 msgid "FILE..."
 msgstr "ファイル..."
 
-#: src/audacious/main.c:280
+#: src/audacious/main.c:268
 msgid "- play multimedia files"
 msgstr "- マルチメディアファイルを再生する"
 
-#: src/audacious/main.c:290
+#: src/audacious/main.c:278
 #, c-format
 msgid ""
 "%s: %s\n"
 "Try `%s --help' for more information.\n"
-msgstr ""
-"%s: %s\n"
-"詳しくは `%s --help' を実行して下さい.\n"
-
-#: src/audacious/main.c:407
-msgid ""
-"Audacious seems to be already running but is not responding. You can start "
-"another instance of the program, but please be warned that this can cause "
-"data loss. If Audacious is not running, you can safely ignore this "
-"message. Press OK to start Audacious or Cancel to quit."
-msgstr ""
+msgstr "%s: %s\n詳しくは `%s --help' を実行して下さい.\n"
 
-#: src/audacious/main.c:572
+#: src/audacious/main.c:573
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/audacious/playback.c:381
+#: src/audacious/playback.c:307
 #, c-format
 msgid "No decoder found for %s."
-msgstr ""
+msgstr "%s のためのデコーダがありません。"
 
-#: src/audacious/playback.c:531
-msgid "Buffering ..."
-msgstr ""
+#: src/audacious/playlist-files.c:53
+#, c-format
+msgid "Cannot %s %s: unsupported file extension."
+msgstr "%s %s できません: ファイルの拡張子に対応していません。"
 
-#: src/audacious/playlist-new.c:303
-msgid "Untitled Playlist"
-msgstr "タイトルなしプレイリスト"
+#: src/audacious/playlist-files.c:54
+msgid "save"
+msgstr "保存"
 
-#: src/audacious/ui_preferences.c:87
+#: src/audacious/playlist-files.c:54
+msgid "load"
+msgstr "読み込み"
+
+#: src/audacious/playlist-new.c:131
+msgid "New Playlist"
+msgstr "新規プレイリスト"
+
+#: src/audacious/playlist-new.c:132
+msgid "Now Playing"
+msgstr "再生中"
+
+#: src/audacious/playlist-new.c:1630
+msgid ""
+"The playlist cannot be sorted because metadata scanning is still in progress"
+" (or has been disabled)."
+msgstr "メタデータのスキャンが進行中、または無効になっているため、プレイリストをソートできません。"
+
+#: src/audacious/ui_preferences.c:85
 msgid "Audio"
 msgstr "オーディオ"
 
-#: src/audacious/ui_preferences.c:88
+#: src/audacious/ui_preferences.c:86
 msgid "Network"
-msgstr ""
+msgstr "ネットワーク"
 
-#: src/audacious/ui_preferences.c:89 src/audacious/ui_preferences.c:1556
+#: src/audacious/ui_preferences.c:87 src/audacious/ui_preferences.c:1603
 msgid "Playlist"
 msgstr "プレイリスト"
 
-#: src/audacious/ui_preferences.c:90
+#: src/audacious/ui_preferences.c:88
 msgid "Plugins"
 msgstr "プラグイン"
 
-#: src/audacious/ui_preferences.c:96 src/libaudgui/infopopup.c:204
+#: src/audacious/ui_preferences.c:94 src/libaudgui/infopopup.c:199
 msgid "Artist"
 msgstr "アーティスト"
 
-#: src/audacious/ui_preferences.c:97 src/libaudgui/infopopup.c:206
+#: src/audacious/ui_preferences.c:95 src/libaudgui/infopopup.c:201
 msgid "Album"
 msgstr "アルバム名"
 
-#: src/audacious/ui_preferences.c:98 src/libaudgui/infopopup.c:202
-#: src/libaudgui/ui_playlist_manager.c:263
+#: src/audacious/ui_preferences.c:96 src/libaudgui/infopopup.c:197
+#: src/libaudgui/ui_playlist_manager.c:279
 msgid "Title"
 msgstr "タイトル"
 
-#: src/audacious/ui_preferences.c:99
+#: src/audacious/ui_preferences.c:97
 msgid "Tracknumber"
 msgstr "トラック番号"
 
-#: src/audacious/ui_preferences.c:100 src/libaudgui/infopopup.c:208
+#: src/audacious/ui_preferences.c:98 src/libaudgui/infopopup.c:203
 msgid "Genre"
 msgstr "ジャンル"
 
-#: src/audacious/ui_preferences.c:101
+#: src/audacious/ui_preferences.c:99
 msgid "Filename"
 msgstr "ファイル名"
 
-#: src/audacious/ui_preferences.c:102
+#: src/audacious/ui_preferences.c:100
 msgid "Filepath"
 msgstr "パス名"
 
-#: src/audacious/ui_preferences.c:103
+#: src/audacious/ui_preferences.c:101
 msgid "Date"
 msgstr "日付"
 
-#: src/audacious/ui_preferences.c:104 src/libaudgui/infopopup.c:210
+#: src/audacious/ui_preferences.c:102 src/libaudgui/infopopup.c:205
 msgid "Year"
 msgstr "制作年"
 
-#: src/audacious/ui_preferences.c:105
+#: src/audacious/ui_preferences.c:103
 msgid "Comment"
 msgstr "コメント"
 
-#: src/audacious/ui_preferences.c:106
+#: src/audacious/ui_preferences.c:104
 msgid "Codec"
 msgstr "コーデック"
 
-#: src/audacious/ui_preferences.c:107
+#: src/audacious/ui_preferences.c:105
 msgid "Quality"
 msgstr "音質"
 
-#: src/audacious/ui_preferences.c:112
+#: src/audacious/ui_preferences.c:111
 msgid "None"
 msgstr "なし"
 
+#: src/audacious/ui_preferences.c:112
+msgid "Arabic"
+msgstr "アラビア語"
+
 #: src/audacious/ui_preferences.c:113
-msgid "Japanese"
-msgstr "日本語"
+msgid "Baltic"
+msgstr "バルト諸語"
 
 #: src/audacious/ui_preferences.c:114
-msgid "Taiwanese"
-msgstr "繁体中国語"
-
-#: src/audacious/ui_preferences.c:115
 msgid "Chinese"
 msgstr "簡体中国語"
 
+#: src/audacious/ui_preferences.c:115
+msgid "Greek"
+msgstr "ギリシア語"
+
 #: src/audacious/ui_preferences.c:116
-msgid "Korean"
-msgstr "朝鮮語"
+msgid "Hebrew"
+msgstr "ヘブライ語"
 
 #: src/audacious/ui_preferences.c:117
-msgid "Russian"
-msgstr "ロシア語"
+msgid "Japanese"
+msgstr "日本語"
 
 #: src/audacious/ui_preferences.c:118
-msgid "Greek"
-msgstr "ギリシア語"
+msgid "Korean"
+msgstr "朝鮮語"
 
 #: src/audacious/ui_preferences.c:119
-msgid "Hebrew"
-msgstr "ヘブライ語"
+msgid "Polish"
+msgstr "ポーランド語"
 
 #: src/audacious/ui_preferences.c:120
-msgid "Turkish"
-msgstr "トルコ語"
+msgid "Russian"
+msgstr "ロシア語"
 
 #: src/audacious/ui_preferences.c:121
-msgid "Arabic"
-msgstr "アラビア語"
+msgid "Taiwanese"
+msgstr "繁体中国語"
 
 #: src/audacious/ui_preferences.c:122
-#, fuzzy
-msgid "Polish"
-msgstr "ポーランド語:"
-
-#: src/audacious/ui_preferences.c:123
-#, fuzzy
-msgid "Baltic"
-msgstr "セルティック"
-
-#: src/audacious/ui_preferences.c:124
-msgid "Universal"
-msgstr "汎用"
-
-#: src/audacious/ui_preferences.c:146
-#, fuzzy
-msgid "Single track mode"
-msgstr "トラックの詳細"
+msgid "Turkish"
+msgstr "トルコ語"
 
-#: src/audacious/ui_preferences.c:147
-#, fuzzy
+#: src/audacious/ui_preferences.c:144
 msgid "Album mode"
-msgstr "アルバムモード: "
+msgstr "アルバムモード"
 
-#: src/audacious/ui_preferences.c:150
-#, fuzzy
+#: src/audacious/ui_preferences.c:147
 msgid "Output Settings"
-msgstr "フォーマットの検出"
+msgstr "出力の設定"
 
-#: src/audacious/ui_preferences.c:152
-#, fuzzy
+#: src/audacious/ui_preferences.c:149
 msgid "Bit depth:"
-msgstr "出力ビット深度:"
+msgstr "ビット深度:"
 
-#: src/audacious/ui_preferences.c:155
+#: src/audacious/ui_preferences.c:152
 msgid "Buffer size:"
-msgstr "バッファのサイズ:"
+msgstr "バッファサイズ:"
 
-#: src/audacious/ui_preferences.c:157
+#: src/audacious/ui_preferences.c:154
 msgid "ms"
-msgstr ""
+msgstr "ms"
 
-#: src/audacious/ui_preferences.c:158
-#, fuzzy
+#: src/audacious/ui_preferences.c:155
 msgid "Use software volume control (not recommended)"
-msgstr "ソフトウェアボリュームコントロールを使う"
+msgstr "ソフトウェアの音量コントロールを使う (非推奨)"
 
-#: src/audacious/ui_preferences.c:160
-#, fuzzy
+#: src/audacious/ui_preferences.c:157
 msgid "Replay Gain"
-msgstr "リプレイゲインモード"
+msgstr "リプレイゲイン"
 
-#: src/audacious/ui_preferences.c:161
+#: src/audacious/ui_preferences.c:158
 msgid "Enable Replay Gain"
-msgstr "リプレイゲイン有効にする"
+msgstr "リプレイゲインを有効にする"
 
-#: src/audacious/ui_preferences.c:164
+#: src/audacious/ui_preferences.c:161
 msgid "Prevent clipping (recommended)"
-msgstr ""
+msgstr "クリッピングを防ぐ (非推奨)"
 
-#: src/audacious/ui_preferences.c:166
-#, fuzzy
+#: src/audacious/ui_preferences.c:163
 msgid "Adjust Levels"
-msgstr "マウスのホィール"
+msgstr "音量の調整"
 
-#: src/audacious/ui_preferences.c:167
+#: src/audacious/ui_preferences.c:164
 msgid "Amplify all files:"
-msgstr ""
+msgstr "すべてのファイルを増幅する:"
 
-#: src/audacious/ui_preferences.c:169 src/audacious/ui_preferences.c:172
+#: src/audacious/ui_preferences.c:166 src/audacious/ui_preferences.c:169
 msgid "dB"
 msgstr "dB"
 
-#: src/audacious/ui_preferences.c:170
-#, fuzzy
+#: src/audacious/ui_preferences.c:167
 msgid "Amplify untagged files:"
-msgstr "- マルチメディアファイルを再生する"
+msgstr "タグづけされていないファイルを増幅する"
 
-#: src/audacious/ui_preferences.c:175
+#: src/audacious/ui_preferences.c:172
 msgid "Proxy hostname:"
 msgstr "プロキシのホスト名:"
 
-#: src/audacious/ui_preferences.c:176
+#: src/audacious/ui_preferences.c:173
 msgid "Proxy port:"
 msgstr "プロキシのポート:"
 
-#: src/audacious/ui_preferences.c:179
+#: src/audacious/ui_preferences.c:176
 msgid "Proxy username:"
 msgstr "プロキシのユーザ名:"
 
-#: src/audacious/ui_preferences.c:180
+#: src/audacious/ui_preferences.c:177
 msgid "Proxy password:"
 msgstr "プロキシのパスワード:"
 
-#: src/audacious/ui_preferences.c:184
+#: src/audacious/ui_preferences.c:181
 msgid "Proxy Configuration"
 msgstr "プロキシ設定"
 
-#: src/audacious/ui_preferences.c:185
+#: src/audacious/ui_preferences.c:182
 msgid "Enable proxy usage"
 msgstr "プロキシの使用を有効にする"
 
-#: src/audacious/ui_preferences.c:187
+#: src/audacious/ui_preferences.c:185
 msgid "Use authentication with proxy"
 msgstr "プロキシの認証を行う"
 
-#: src/audacious/ui_preferences.c:189
-msgid ""
-"Changing these settings will require a restart of "
-"Audacious."
-msgstr ""
-"変更した設定を有効にするには Audacious の再起動が必要で"
-"す."
-
 #: src/audacious/ui_preferences.c:193
 msgid "Auto character encoding detector for:"
 msgstr "自動キャラクタエンコーディング検出:"
 
-#: src/audacious/ui_preferences.c:201
+#: src/audacious/ui_preferences.c:198
 msgid "Fallback character encodings:"
 msgstr "代替キャラクタエンコーディング:"
 
-#: src/audacious/ui_preferences.c:201
-msgid ""
-"List of character encodings used for fall back conversion of metadata. If "
-"automatic character encoding detector failed or has been disabled, encodings "
-"in this list would be treated as candidates of the encoding of metadata, and "
-"fall back conversion from these encodings to UTF-8 would be attempted."
-msgstr ""
-"メタデータの変換の代替に用いるキャラクタエンコーディングのリスト. 自動キャラ"
-"クタエンコーディング検出が失敗するか無効であれば, メタデータのエンコーディン"
-"グの候補としてリスト中のエンコーディングが用いられ, これらのエンコーディング"
-"から UTF-8 への変換が試みられます."
-
-#: src/audacious/ui_preferences.c:205
-#, fuzzy
+#: src/audacious/ui_preferences.c:202
 msgid "Behavior"
-msgstr "ビット深度"
+msgstr "動作"
 
-#: src/audacious/ui_preferences.c:206
+#: src/audacious/ui_preferences.c:203
 msgid "Continue playback on startup"
-msgstr "起動時に再生を続ける"
+msgstr "起動時に前回再生していた曲を再生する"
 
-#: src/audacious/ui_preferences.c:208
+#: src/audacious/ui_preferences.c:205
 msgid "Advance when the current song is deleted"
-msgstr ""
+msgstr "現在の曲が削除された時に次の曲を再生する"
 
-#: src/audacious/ui_preferences.c:210
-#, fuzzy
+#: src/audacious/ui_preferences.c:207
 msgid "Clear the playlist when opening files"
-msgstr "マッチしたエントリで新しいプレイリストを作成"
+msgstr "ファイルを開く時にプレイリストをクリアする"
 
-#: src/audacious/ui_preferences.c:212
-#, fuzzy
+#: src/audacious/ui_preferences.c:209
 msgid "Open files in a temporary playlist"
-msgstr "新しいファイルを一時プレイリストに追加する"
+msgstr "ファイルを一時プレイリストで開く"
 
-#: src/audacious/ui_preferences.c:214
+#: src/audacious/ui_preferences.c:211
 msgid "Metadata"
 msgstr "メタデータ"
 
-#: src/audacious/ui_preferences.c:454
+#: src/audacious/ui_preferences.c:212
+msgid "Do not load metadata for songs until played"
+msgstr "再生が終わるまで曲のメタデータを読み込まない"
+
+#: src/audacious/ui_preferences.c:230
+msgid "TITLE"
+msgstr "タイトル"
+
+#: src/audacious/ui_preferences.c:231
+msgid "ARTIST - TITLE"
+msgstr "アーティスト - タイトル"
+
+#: src/audacious/ui_preferences.c:232
+msgid "ARTIST - ALBUM - TITLE"
+msgstr "アーティスト - アルバム - タイトル"
+
+#: src/audacious/ui_preferences.c:233
+msgid "ARTIST - ALBUM - TRACK. TITLE"
+msgstr "アーティスト - アルバム - トラック. タイトル"
+
+#: src/audacious/ui_preferences.c:234
+msgid "ARTIST [ ALBUM ] - TRACK. TITLE"
+msgstr "アーティスト [ アルバム ] - トラック. タイトル"
+
+#: src/audacious/ui_preferences.c:235
+msgid "ALBUM - TITLE"
+msgstr "アルバム - タイトル"
+
+#: src/audacious/ui_preferences.c:556
 msgid "Category"
 msgstr "カテゴリ"
 
-#: src/audacious/ui_preferences.c:682
+#: src/audacious/ui_preferences.c:780
 msgid "Popup Information Settings"
 msgstr "ポップアップ情報の設定"
 
-#: src/audacious/ui_preferences.c:691
+#: src/audacious/ui_preferences.c:789
 msgid "Cover image retrieve"
 msgstr "カバー画像の取得"
 
-#: src/audacious/ui_preferences.c:696
+#: src/audacious/ui_preferences.c:794
 msgid ""
 "While searching for the album's cover, Audacious looks for certain words in "
 "the filename. You can specify those words in the lists below, separated "
 "using commas."
-msgstr ""
-"アルバムのカバーを検索する際, Audacious はファイル名の中の単語を探します. コ"
-"ンマで区切られた単語リストを以下に指定できます."
+msgstr "アルバムのカバーを検索する際、Audacious はファイル名の中の単語を探します。コンマで区切られた単語リストを以下に指定できます。"
 
-#: src/audacious/ui_preferences.c:713
+#: src/audacious/ui_preferences.c:811
 msgid "Exclude:"
 msgstr "含まない:"
 
-#: src/audacious/ui_preferences.c:720
+#: src/audacious/ui_preferences.c:818
 msgid "Include:"
 msgstr "含む:"
 
-#: src/audacious/ui_preferences.c:737
+#: src/audacious/ui_preferences.c:835
 msgid "Recursively search for cover"
 msgstr "カバーの再帰検索"
 
-#: src/audacious/ui_preferences.c:747
+#: src/audacious/ui_preferences.c:845
 msgid "Search depth: "
 msgstr "検索の深さ: "
 
-#: src/audacious/ui_preferences.c:761
+#: src/audacious/ui_preferences.c:859
 msgid "Use per-file cover"
 msgstr "ファイルごとのカバーを使う"
 
-#: src/audacious/ui_preferences.c:764
+#: src/audacious/ui_preferences.c:862
 msgid "Miscellaneous"
 msgstr "その他"
 
-#: src/audacious/ui_preferences.c:773
+#: src/audacious/ui_preferences.c:871
 msgid "Show Progress bar for the current track"
 msgstr "現在のトラックのプログレスバーを表示する"
 
-#: src/audacious/ui_preferences.c:783
+#: src/audacious/ui_preferences.c:881
 msgid "Delay until filepopup comes up: "
 msgstr "ファイルポップアップが表示されるまでの遅延: "
 
-#: src/audacious/ui_preferences.c:1283
+#: src/audacious/ui_preferences.c:1309
+msgid "Custom"
+msgstr "カスタム"
+
+#: src/audacious/ui_preferences.c:1352
 msgid "Song Display"
 msgstr "曲の表示"
 
-#: src/audacious/ui_preferences.c:1292
+#: src/audacious/ui_preferences.c:1361
 msgid "Show song numbers"
 msgstr "曲番号の表示"
 
-#: src/audacious/ui_preferences.c:1303
+#: src/audacious/ui_preferences.c:1372
 msgid "Show leading zeroes (02:00 instead of 2:00)"
-msgstr ""
+msgstr "先頭のゼロを表示する (2:00 -> 02:00)"
 
-#: src/audacious/ui_preferences.c:1325
+#: src/audacious/ui_preferences.c:1394
 msgid "Show information about titlestring format"
 msgstr "タイトルに使用できる書式を表示します"
 
-#: src/audacious/ui_preferences.c:1339
-msgid "TITLE"
-msgstr "タイトル"
-
-#: src/audacious/ui_preferences.c:1340
-msgid "ARTIST - TITLE"
-msgstr "アーティスト - タイトル"
-
-#: src/audacious/ui_preferences.c:1341
-msgid "ARTIST - ALBUM - TITLE"
-msgstr "アーティスト - アルバム - タイトル"
-
-#: src/audacious/ui_preferences.c:1342
-msgid "ARTIST - ALBUM - TRACK. TITLE"
-msgstr "アーティスト - アルバム - トラック. タイトル"
-
-#: src/audacious/ui_preferences.c:1343
-msgid "ARTIST [ ALBUM ] - TRACK. TITLE"
-msgstr "アーティスト [ アルバム ] - トラック. タイトル"
-
-#: src/audacious/ui_preferences.c:1344
-msgid "ALBUM - TITLE"
-msgstr "アルバム - タイトル"
-
-#: src/audacious/ui_preferences.c:1345
-msgid "Custom"
-msgstr "カスタム"
-
-#: src/audacious/ui_preferences.c:1354
+#: src/audacious/ui_preferences.c:1410
 msgid "Custom string:"
 msgstr "カスタム文字列:"
 
-#: src/audacious/ui_preferences.c:1361
+#: src/audacious/ui_preferences.c:1417
 msgid "Title format:"
 msgstr "タイトルの書式:"
 
-#: src/audacious/ui_preferences.c:1372
+#: src/audacious/ui_preferences.c:1428
 msgid "Popup Information"
 msgstr "ポップアップ情報"
 
-#: src/audacious/ui_preferences.c:1387
+#: src/audacious/ui_preferences.c:1443
 msgid "Show popup information for playlist entries"
 msgstr "プレイリストのエントリのポップアップ情報を表示する"
 
-#: src/audacious/ui_preferences.c:1388
+#: src/audacious/ui_preferences.c:1444
 msgid ""
 "Toggles popup information window for the pointed entry in the playlist. The "
 "window shows title of song, name of album, genre, year of publish, track "
 "number, track length, and artwork."
-msgstr ""
-"プレイリスト中でポイントされたエントリのポップアップ情報ウィンドウを切り替え"
-"ます. ウィンドウには曲のタイトル, アルバム名, ジャンル, 製作年, トラック番"
-"号, トラックの長さとアートワークが表示されます."
+msgstr "プレイリスト中でポイントされたエントリのポップアップ情報ウィンドウを切り替えます。ウィンドウには曲のタイトル、アルバム名、ジャンル、製作年、トラック番号、トラックの長さ、アートワークが表示されます。"
 
-#: src/audacious/ui_preferences.c:1397
+#: src/audacious/ui_preferences.c:1455
 msgid "Edit settings for popup information"
 msgstr "ポップアップ情報の設定を編集する"
 
-#: src/audacious/ui_preferences.c:1497
-#, fuzzy
+#: src/audacious/ui_preferences.c:1544
 msgid "Output plugin:"
-msgstr "入力プラグイン: %s"
+msgstr "出力プラグイン:"
 
-#: src/audacious/ui_preferences.c:1556
-#, fuzzy
+#: src/audacious/ui_preferences.c:1603
 msgid "Transport"
-msgstr "翻訳者"
+msgstr "トランスポート"
 
-#: src/audacious/ui_preferences.c:1556
+#: src/audacious/ui_preferences.c:1603
 msgid "Input"
-msgstr ""
+msgstr "インプット"
 
-#: src/audacious/ui_preferences.c:1557
-#, fuzzy
+#: src/audacious/ui_preferences.c:1604
 msgid "Effect"
-msgstr "エフェクト"
+msgstr "エフェクト"
 
-#: src/audacious/ui_preferences.c:1557
+#: src/audacious/ui_preferences.c:1604
 msgid "Visualization"
 msgstr "視覚化"
 
-#: src/audacious/ui_preferences.c:1557
+#: src/audacious/ui_preferences.c:1604
 msgid "General"
-msgstr ""
+msgstr "一般"
 
-#: src/audacious/ui_preferences.c:1597
+#: src/audacious/ui_preferences.c:1644
 msgid "Audacious Preferences"
 msgstr "Audacious の設定"
 
-#: src/audacious/util.c:155
+#: src/audacious/util.c:120
 #, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr "ディレクトリ (%s) を作成できませんでした: %s\n"
 
-#: src/audtool/handlers_playlist.c:264
+#: src/audtool/handlers_playlist.c:273
 msgid "Position not found."
-msgstr ""
+msgstr "場所が見つかりませんでした。"
 
-#: src/audtool/handlers_vitals.c:64
+#: src/audtool/handlers_vitals.c:63
 msgid "No song playing."
-msgstr ""
+msgstr "再生中の曲はありません。"
+
+#: src/libaudcore/audstrings.c:199
+#, c-format
+msgid "Audio CD, track %s"
+msgstr "オーディオ CD、トラック %s"
 
-#: src/libaudcore/tuple.c:685
+#: src/libaudcore/tuple.c:536
 msgid "Mono"
-msgstr ""
+msgstr "モノラル"
 
-#: src/libaudcore/tuple.c:687
-#, fuzzy
+#: src/libaudcore/tuple.c:538
 msgid "Stereo"
 msgstr "ステレオ"
 
-#: src/libaudcore/tuple.c:689
+#: src/libaudcore/tuple.c:540
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d チャンネル"
+
+#: src/libaudgui/about.c:52 src/libaudgui/about.c:115
+msgid "Credits"
+msgstr "クレジット"
 
-#: src/libaudgui/confirm.c:73
+#: src/libaudgui/about.c:52
+msgid "Translators"
+msgstr "翻訳者"
+
+#: src/libaudgui/about.c:91
+msgid "About Audacious"
+msgstr "Audacious について"
+
+#: src/libaudgui/confirm.c:76
 #, c-format
 msgid ""
 "Are you sure you want to close %s? If you do, any changes made since the "
 "playlist was exported will be lost."
-msgstr ""
+msgstr "本当に %s を閉じますか？ 変更が加えられていた場合、保存されずに破棄されます。"
 
-#: src/libaudgui/confirm.c:86
-#, fuzzy
+#: src/libaudgui/confirm.c:89
 msgid "_Don't show this message again"
-msgstr "次回からこの警告を表示しない"
+msgstr "このメッセージを二度と表示しない(_D)"
 
-#: src/libaudgui/confirm.c:124
-#, fuzzy
+#: src/libaudgui/confirm.c:126
 msgid "Rename Playlist"
-msgstr "プレイリストの保存"
+msgstr "プレイリストをリネーム"
 
-#: src/libaudgui/effects-menu.c:76
+#: src/libaudgui/effects-menu.c:74
 msgid "settings ..."
-msgstr ""
+msgstr "設定"
 
-#: src/libaudgui/equalizer.c:68
-#, fuzzy
+#: src/libaudgui/equalizer.c:51
 msgid "_Enable"
-msgstr "有効"
+msgstr "有効(_E)"
 
-#: src/libaudgui/equalizer.c:140
+#: src/libaudgui/equalizer.c:123
 msgid "31 Hz"
-msgstr ""
+msgstr "31 Hz"
 
-#: src/libaudgui/equalizer.c:140
+#: src/libaudgui/equalizer.c:123
 msgid "63 Hz"
-msgstr ""
+msgstr "63 Hz"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "125 Hz"
-msgstr ""
+msgstr "125 Hz"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "250 Hz"
-msgstr ""
+msgstr "250 Hz"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "500 Hz"
-msgstr ""
+msgstr "500 Hz"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "1 kHz"
-msgstr ""
+msgstr "1 kHz"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "2 kHz"
-msgstr ""
+msgstr "2 kHz"
 
-#: src/libaudgui/equalizer.c:142
+#: src/libaudgui/equalizer.c:125
 msgid "4 kHz"
-msgstr ""
+msgstr "4 kHz"
 
-#: src/libaudgui/equalizer.c:142
+#: src/libaudgui/equalizer.c:125
 msgid "8 kHz"
-msgstr ""
+msgstr "8 kHz"
 
-#: src/libaudgui/equalizer.c:142
+#: src/libaudgui/equalizer.c:125
 msgid "16 kHz"
-msgstr ""
+msgstr "16 kHz"
 
-#: src/libaudgui/equalizer.c:147
+#: src/libaudgui/equalizer.c:130
 msgid "Equalizer"
 msgstr "イコライザ"
 
-#: src/libaudgui/equalizer.c:163
-#, fuzzy
+#: src/libaudgui/equalizer.c:146
 msgid "Preamp"
-msgstr "プリアンプ:"
+msgstr "プリアンプ"
 
-#: src/libaudgui/infopopup.c:212
+#: src/libaudgui/infopopup.c:207
 msgid "Track Number"
 msgstr "トラック番号"
 
-#: src/libaudgui/infopopup.c:214
+#: src/libaudgui/infopopup.c:209
 msgid "Track Length"
 msgstr "トラックの長さ:"
 
-#: src/libaudgui/infowin.c:77
+#: src/libaudgui/infowin.c:75
 msgid "Acid Jazz"
 msgstr "アシッドジャズ"
 
-#: src/libaudgui/infowin.c:78
-#, fuzzy
+#: src/libaudgui/infowin.c:76
 msgid "Acid Rock"
-msgstr "ハードロック"
+msgstr "アシッド・ロック"
 
-#: src/libaudgui/infowin.c:79
+#: src/libaudgui/infowin.c:77
 msgid "Ambient"
 msgstr "アンビエント"
 
-#: src/libaudgui/infowin.c:80
-#, fuzzy
+#: src/libaudgui/infowin.c:78
 msgid "Bebop"
-msgstr "Bebob"
+msgstr "ビバップ"
 
-#: src/libaudgui/infowin.c:81
+#: src/libaudgui/infowin.c:79
 msgid "Bluegrass"
 msgstr "ブルーグラス"
 
-#: src/libaudgui/infowin.c:82
+#: src/libaudgui/infowin.c:80
 msgid "Blues"
 msgstr "ブルース"
 
-#: src/libaudgui/infowin.c:83
+#: src/libaudgui/infowin.c:81
 msgid "Chamber Music"
 msgstr "チャンバーミュージック"
 
-#: src/libaudgui/infowin.c:84
+#: src/libaudgui/infowin.c:82
 msgid "Classical"
 msgstr "クラシカル"
 
-#: src/libaudgui/infowin.c:85
+#: src/libaudgui/infowin.c:83
 msgid "Country"
 msgstr "カントリー"
 
-#: src/libaudgui/infowin.c:86
+#: src/libaudgui/infowin.c:84
 msgid "Death Metal"
 msgstr "デスメタル"
 
-#: src/libaudgui/infowin.c:87
+#: src/libaudgui/infowin.c:85
 msgid "Disco"
 msgstr "ディスコ"
 
-#: src/libaudgui/infowin.c:88
+#: src/libaudgui/infowin.c:86
 msgid "Easy Listening"
 msgstr "イージーリスニング"
 
-#: src/libaudgui/infowin.c:89
+#: src/libaudgui/infowin.c:87
 msgid "Folk"
 msgstr "フォーク"
 
-#: src/libaudgui/infowin.c:90
+#: src/libaudgui/infowin.c:88
 msgid "Funk"
 msgstr "ファンキー"
 
-#: src/libaudgui/infowin.c:91
+#: src/libaudgui/infowin.c:89
 msgid "Gangsta Rap"
 msgstr "ギャングスタラップ"
 
-#: src/libaudgui/infowin.c:92
+#: src/libaudgui/infowin.c:90
 msgid "Gospel"
 msgstr "ゴスペル"
 
-#: src/libaudgui/infowin.c:93
+#: src/libaudgui/infowin.c:91
 msgid "Grunge"
 msgstr "グランジ"
 
-#: src/libaudgui/infowin.c:94
+#: src/libaudgui/infowin.c:92
 msgid "Hard Rock"
 msgstr "ハードロック"
 
-#: src/libaudgui/infowin.c:95
+#: src/libaudgui/infowin.c:93
 msgid "Heavy Metal"
 msgstr "ヘヴィメタル"
 
-#: src/libaudgui/infowin.c:96
-#, fuzzy
+#: src/libaudgui/infowin.c:94
 msgid "Hip-hop"
 msgstr "ヒップホップ"
 
-#: src/libaudgui/infowin.c:97
+#: src/libaudgui/infowin.c:95
 msgid "House"
 msgstr "ハウス"
 
-#: src/libaudgui/infowin.c:98
+#: src/libaudgui/infowin.c:96
 msgid "Jazz"
 msgstr "ジャズ"
 
-#: src/libaudgui/infowin.c:99
+#: src/libaudgui/infowin.c:97
 msgid "Jungle"
 msgstr "ジャングル"
 
-#: src/libaudgui/infowin.c:100
+#: src/libaudgui/infowin.c:98
 msgid "Metal"
 msgstr "メタル"
 
-#: src/libaudgui/infowin.c:101
+#: src/libaudgui/infowin.c:99
 msgid "New Age"
 msgstr "ニューエイジ"
 
-#: src/libaudgui/infowin.c:102
+#: src/libaudgui/infowin.c:100
 msgid "New Wave"
 msgstr "ニューウェーブ"
 
-#: src/libaudgui/infowin.c:103
+#: src/libaudgui/infowin.c:101
 msgid "Noise"
 msgstr "ノイズ"
 
-#: src/libaudgui/infowin.c:104
+#: src/libaudgui/infowin.c:102
 msgid "Pop"
 msgstr "ポップ"
 
-#: src/libaudgui/infowin.c:105
+#: src/libaudgui/infowin.c:103
 msgid "Punk Rock"
 msgstr "パンクロック"
 
-#: src/libaudgui/infowin.c:106
+#: src/libaudgui/infowin.c:104
 msgid "Rap"
 msgstr "ラップ"
 
-#: src/libaudgui/infowin.c:107
+#: src/libaudgui/infowin.c:105
 msgid "Reggae"
 msgstr "レゲェ"
 
-#: src/libaudgui/infowin.c:108
+#: src/libaudgui/infowin.c:106
 msgid "Rock"
 msgstr "ロック"
 
-#: src/libaudgui/infowin.c:109
-#, fuzzy
+#: src/libaudgui/infowin.c:107
 msgid "Rock and Roll"
 msgstr "ロックンロール"
 
-#: src/libaudgui/infowin.c:110
+#: src/libaudgui/infowin.c:108
 msgid "Rhythm and Blues"
-msgstr ""
+msgstr "R&B"
 
-#: src/libaudgui/infowin.c:111
+#: src/libaudgui/infowin.c:109
 msgid "Ska"
 msgstr "スカ"
 
-#: src/libaudgui/infowin.c:112
+#: src/libaudgui/infowin.c:110
 msgid "Soul"
 msgstr "ソウル"
 
-#: src/libaudgui/infowin.c:113
+#: src/libaudgui/infowin.c:111
 msgid "Swing"
 msgstr "スウィング"
 
-#: src/libaudgui/infowin.c:114
+#: src/libaudgui/infowin.c:112
 msgid "Techno"
 msgstr "テクノ"
 
-#: src/libaudgui/infowin.c:115
-#, fuzzy
+#: src/libaudgui/infowin.c:113
 msgid "Trip-hop"
-msgstr "トリップホップ"
+msgstr "トリップ・ホップ"
 
-#: src/libaudgui/infowin.c:175 src/libaudgui/infowin.c:361
-#: src/libaudgui/infowin.c:364 src/libaudgui/infowin.c:367
+#: src/libaudgui/infowin.c:177 src/libaudgui/infowin.c:363
+#: src/libaudgui/infowin.c:366 src/libaudgui/infowin.c:369
 msgid "n/a"
 msgstr "n/a"
 
-#: src/libaudgui/infowin.c:265
+#: src/libaudgui/infowin.c:267
 msgid "Metadata updated successfully"
 msgstr "メタデータは正常に更新されました"
 
-#: src/libaudgui/infowin.c:270
+#: src/libaudgui/infowin.c:272
 msgid "Metadata updating failed"
 msgstr "メタデータの更新に失敗しました"
 
-#: src/libaudgui/infowin.c:318
+#: src/libaudgui/infowin.c:320
 msgid "Track Information"
-msgstr "トラック"
+msgstr "トラック情報"
 
-#: src/libaudgui/infowin.c:350
+#: src/libaudgui/infowin.c:352
 msgid "Format:"
 msgstr "フォーマット:"
 
-#: src/libaudgui/infowin.c:354
+#: src/libaudgui/infowin.c:356
 msgid "Quality:"
 msgstr "品質:"
 
-#: src/libaudgui/infowin.c:357
+#: src/libaudgui/infowin.c:359
 msgid "Bitrate:"
 msgstr "ビットレート:"
 
-#: src/libaudgui/infowin.c:387
+#: src/libaudgui/infowin.c:389
 msgid "Title"
 msgstr "タイトル"
 
-#: src/libaudgui/infowin.c:399
+#: src/libaudgui/infowin.c:401
 msgid "Artist"
 msgstr "アーティスト"
 
-#: src/libaudgui/infowin.c:411
+#: src/libaudgui/infowin.c:413
 msgid "Album"
 msgstr "アルバム"
 
-#: src/libaudgui/infowin.c:423
+#: src/libaudgui/infowin.c:425
 msgid "Comment"
 msgstr "コメント"
 
-#: src/libaudgui/infowin.c:435
+#: src/libaudgui/infowin.c:437
 msgid "Genre"
 msgstr "ジャンル"
 
-#: src/libaudgui/infowin.c:456
+#: src/libaudgui/infowin.c:458
 msgid "Year"
 msgstr "年"
 
-#: src/libaudgui/infowin.c:467
+#: src/libaudgui/infowin.c:469
 msgid "Track Number"
 msgstr "トラック番号"
 
-#: src/libaudgui/infowin.c:549
+#: src/libaudgui/infowin.c:548
 #, c-format
 msgid "%d kb/s"
 msgstr "%d kb/s"
 
-#: src/libaudgui/infowin.c:579
+#: src/libaudgui/infowin.c:575
 #, c-format
 msgid "No info available for %s.\n"
-msgstr ""
+msgstr "%s の情報が取得できません。\n"
 
-#: src/libaudgui/jump-to-time.c:75
+#: src/libaudgui/jump-to-time.c:72
 msgid "Jump to Time"
-msgstr "指定した時間へ移動"
+msgstr "指定した時間へジャンプ"
 
-#: src/libaudgui/jump-to-time.c:90
+#: src/libaudgui/jump-to-time.c:87
 msgid "mm:ss"
-msgstr ""
+msgstr "mm:ss"
 
-#: src/libaudgui/playlists.c:39
-#, fuzzy
+#: src/libaudgui/playlists.c:33
 msgid "Export Playlist"
-msgstr "プレイリストの読み込み"
+msgstr "プレイリストを出力"
 
-#: src/libaudgui/playlists.c:39
-#, fuzzy
+#: src/libaudgui/playlists.c:33
 msgid "Import Playlist"
-msgstr "プレイリストの読み込み"
+msgstr "プレイリストを読み込み"
 
-#: src/libaudgui/playlists.c:71
+#: src/libaudgui/playlists.c:66
 #, c-format
 msgid "Overwrite %s?"
-msgstr ""
-
-#: src/libaudgui/ui_about.c:71
-msgid "About Audacious"
-msgstr "Audacious について"
+msgstr "%s を上書きしてもよろしいですか？"
 
-#: src/libaudgui/ui_about.c:93 src/libaudgui/ui_credits.c:122
-msgid "Credits"
-msgstr "クレジット"
+#: src/libaudgui/queue-manager.c:196
+msgid "Queue Manager"
+msgstr "キューマネージャ"
 
-#: src/libaudgui/ui_credits.c:126
-msgid "Translators"
-msgstr "翻訳者"
-
-#: src/libaudgui/ui_fileopener.c:108
+#: src/libaudgui/ui_fileopener.c:109
 msgid "Open Files"
 msgstr "ファイルを開く"
 
-#: src/libaudgui/ui_fileopener.c:108
+#: src/libaudgui/ui_fileopener.c:109
 msgid "Add Files"
 msgstr "ファイルの追加"
 
-#: src/libaudgui/ui_fileopener.c:110
+#: src/libaudgui/ui_fileopener.c:111
 msgid "Close dialog on Open"
 msgstr "開いたらダイアログを閉じる"
 
-#: src/libaudgui/ui_fileopener.c:110
+#: src/libaudgui/ui_fileopener.c:111
 msgid "Close dialog on Add"
 msgstr "追加したらダイアログを閉じる"
 
-#: src/libaudgui/ui_jumptotrack.c:133
-msgid "Un_queue"
-msgstr "キューから外す"
-
-#: src/libaudgui/ui_jumptotrack.c:135 src/libaudgui/ui_jumptotrack.c:512
+#: src/libaudgui/ui_jumptotrack.c:109 src/libaudgui/ui_jumptotrack.c:117
+#: src/libaudgui/ui_jumptotrack.c:326
 msgid "_Queue"
-msgstr "キューに入れる"
+msgstr "キューに追加(_Q)"
 
-#: src/libaudgui/ui_jumptotrack.c:399
-msgid "Jump to Track"
-msgstr "指定トラックへ移動"
+#: src/libaudgui/ui_jumptotrack.c:115
+msgid "Un_queue"
+msgstr "キューから外す(_U)"
+
+#: src/libaudgui/ui_jumptotrack.c:258
+msgid "Jump to Song"
+msgstr "指定した曲にジャンプ"
 
-#: src/libaudgui/ui_jumptotrack.c:442
+#: src/libaudgui/ui_jumptotrack.c:281
 msgid "Filter: "
 msgstr "フィルタ:"
 
-#: src/libaudgui/ui_jumptotrack.c:443
+#: src/libaudgui/ui_jumptotrack.c:282
 msgid "_Filter:"
 msgstr "フィルタ(_F):"
 
-#: src/libaudgui/ui_jumptotrack.c:461
+#: src/libaudgui/ui_jumptotrack.c:292
 msgid "Remember"
-msgstr "記憶"
+msgstr "記憶する"
 
-#: src/libaudgui/ui_jumptotrack.c:470
+#: src/libaudgui/ui_jumptotrack.c:299
 msgid "Clea_r"
-msgstr "クリア(_r)"
+msgstr "クリア(_R)"
 
-#: src/libaudgui/ui_jumptotrack.c:504
+#: src/libaudgui/ui_jumptotrack.c:319
 msgid "Close on Jump"
 msgstr "ジャンプしたらダイアログを閉じる"
 
-#: src/libaudgui/ui_playlist_manager.c:240
+#: src/libaudgui/ui_playlist_manager.c:253
 msgid "Playlist Manager"
 msgstr "プレイリストマネージャ"
 
-#: src/libaudgui/ui_playlist_manager.c:264
+#: src/libaudgui/ui_playlist_manager.c:280
 msgid "Entries"
 msgstr "エントリ"
 
-#: src/libaudgui/ui_playlist_manager.c:285
+#: src/libaudgui/ui_playlist_manager.c:301
 msgid "_Rename"
 msgstr "リネーム(_R)"
 
-#: src/libaudgui/ui_playlist_manager.c:309
-#, fuzzy
+#: src/libaudgui/ui_playlist_manager.c:325
 msgid "_Close dialog on activating playlist"
-msgstr "開いたらダイアログを閉じる"
+msgstr "プレイリストをアクティブにしたらファイアログを閉じる(_C)"
 
-#: src/libaudgui/ui_urlopener.c:58
+#: src/libaudgui/ui_urlopener.c:48
 msgid "Open URL"
-msgstr ""
+msgstr "URL を開く"
 
-#: src/libaudgui/ui_urlopener.c:58
+#: src/libaudgui/ui_urlopener.c:48
 msgid "Add URL"
-msgstr ""
+msgstr "URL を追加"
 
 #: src/libaudgui/util.c:95
 msgid ""
 "\n"
 "(Further messages have been hidden.)"
-msgstr ""
+msgstr "\n(追加のメッセージが隠れているかもしれません。)"
 
 #: src/libeggsmclient/eggdesktopfile.c:165
 msgid "File is not a valid .desktop file"
 msgstr "有効な .desktop ファイルではありません"
 
-#: src/libeggsmclient/eggdesktopfile.c:188
+#: src/libeggsmclient/eggdesktopfile.c:191
 #, c-format
 msgid "Unrecognized desktop file Version '%s'"
-msgstr "認識できないデスクトップファイルヴァージョン '%s'"
+msgstr "認識できないデスクトップファイルバージョン '%s'"
 
-#: src/libeggsmclient/eggdesktopfile.c:967
+#: src/libeggsmclient/eggdesktopfile.c:974
 #, c-format
 msgid "Starting %s"
 msgstr "%s を開始"
 
-#: src/libeggsmclient/eggdesktopfile.c:1108
+#: src/libeggsmclient/eggdesktopfile.c:1116
 msgid "Application does not accept documents on command line"
 msgstr "アプリケーションはコマンドライン上のドキュメントを受け付けません"
 
-#: src/libeggsmclient/eggdesktopfile.c:1176
+#: src/libeggsmclient/eggdesktopfile.c:1184
 #, c-format
 msgid "Unrecognized launch option: %d"
-msgstr "認識できないローンチオプション: %d"
+msgstr "認識できない起動オプション: %d"
 
-#: src/libeggsmclient/eggdesktopfile.c:1375
+#: src/libeggsmclient/eggdesktopfile.c:1391
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
-msgstr "'Type=Link' デスクトップエントリにドキュメント URI を渡せません"
+msgstr "'Type=Link' デスクトップエントリにドキュメントの URI を渡せません"
 
-#: src/libeggsmclient/eggdesktopfile.c:1396
+#: src/libeggsmclient/eggdesktopfile.c:1412
 msgid "Not a launchable item"
-msgstr "ローンチ可能なアイテムではありません"
+msgstr "起動可能なアイテムではありません"
 
 #: src/libeggsmclient/eggsmclient.c:226
 msgid "Disable connection to session manager"
@@ -1252,1924 +1209,9 @@
 msgstr "ID"
 
 #: src/libeggsmclient/eggsmclient.c:253
-#, fuzzy
 msgid "Session management options:"
-msgstr "セッションマネージメントオプション"
+msgstr "セッションマネージメントオプション:"
 
 #: src/libeggsmclient/eggsmclient.c:254
-#, fuzzy
 msgid "Show session management options"
 msgstr "セッションマネージメントオプションを表示する"
-
-#~ msgid "Replay Gain"
-#~ msgstr "リプレイゲイン"
-
-#~ msgid "Bit Depth"
-#~ msgstr "ビット深度"
-
-#~ msgid ""
-#~ "All streams will be converted to this bit depth.\n"
-#~ "This should be the max supported bit depth of\n"
-#~ "the sound card or output plugin."
-#~ msgstr ""
-#~ "すべてのストリームはこのビット深度に変換されます．\n"
-#~ "これはサウンドカードか出力プラグインでサポートされたビット深度の最大値とな"
-#~ "るはずです．"
-
-#~ msgid "Volume Control"
-#~ msgstr "ボリュームコントロール"
-
-#~ msgid ""
-#~ "Use software volume control. This may be useful for situations where your "
-#~ "audio system does not support controlling the playback volume."
-#~ msgstr ""
-#~ "ソフトウェアボリュームコントロールを使います．オーディオシステムが再生音量"
-#~ "のコントロールをサポートしていない状況で有用でしょう．"
-
-#, fuzzy
-#~ msgid "Mode"
-#~ msgstr "メタデータ"
-
-#, fuzzy
-#~ msgid "Clipping Prevention"
-#~ msgstr "ポップアップ情報"
-
-#, fuzzy
-#~ msgid "Enable clipping prevention"
-#~ msgstr "クリッピング防止のためにピーク情報を有効にする"
-
-#~ msgid "Audio System"
-#~ msgstr "オーディオシステム:"
-
-#~ msgid "Current output plugin:"
-#~ msgstr "現在の出力プラグイン:"
-
-#~ msgid "Display all open Audacious windows"
-#~ msgstr "開かれた Audacious ウィンドウを全て表示する"
-
-#~ msgid "%s: Unable to open display, exiting.\n"
-#~ msgstr "%s: ディスプレイを開けません. 終了します.\n"
-
-#~ msgid "Preamp:"
-#~ msgstr "プリアンプ:"
-
-#~ msgid "Default gain:"
-#~ msgstr "デフォルトゲイン:"
-
-#~ msgid "This gain will be used if file doesn't contain Replay Gain metadata."
-#~ msgstr ""
-#~ "ファイルがリプレイゲインメタデータを含んでいなければ，この値が用いられま"
-#~ "す．"
-
-#~ msgid ""
-#~ "Please remember that the most efficient way to "
-#~ "prevent signal clipping is not to use positive values above."
-#~ msgstr ""
-#~ "シグナルクリッピングを防ぐ最も有効な方法は，正数値を"
-#~ "用いないということに注意しください．"
-
-#~ msgid "Replay Gain configuration"
-#~ msgstr "リプレイゲイン設定"
-
-#~ msgid "Track gain/peak"
-#~ msgstr "トラックゲイン/ピーク"
-
-#~ msgid "Album gain/peak"
-#~ msgstr "アルバムゲイン/ピーク"
-
-#~ msgid "Use peak value from Replay Gain info for clipping prevention"
-#~ msgstr "リプレイゲイン情報のピーク値を用います．"
-
-#~ msgid "Classic Rock"
-#~ msgstr "クラシックロック"
-
-#~ msgid "Dance"
-#~ msgstr "ダンス"
-
-#~ msgid "Oldies"
-#~ msgstr "オールディーズ"
-
-#~ msgid "Other"
-#~ msgstr "その他"
-
-#~ msgid "R&B"
-#~ msgstr "Ｒ＆Ｂ"
-
-#~ msgid "Industrial"
-#~ msgstr "インダストリアル"
-
-#~ msgid "Alternative"
-#~ msgstr "オルタナティヴ"
-
-#~ msgid "Pranks"
-#~ msgstr "プランク"
-
-#~ msgid "Soundtrack"
-#~ msgstr "サウンドトラック"
-
-#~ msgid "Euro-Techno"
-#~ msgstr "ユーロテクノ"
-
-#~ msgid "Vocal"
-#~ msgstr "ヴォーカル"
-
-#~ msgid "Jazz+Funk"
-#~ msgstr "ジャズ+ファンク"
-
-#~ msgid "Fusion"
-#~ msgstr "フュージョン"
-
-#~ msgid "Trance"
-#~ msgstr "トランス"
-
-#~ msgid "Instrumental"
-#~ msgstr "インストゥルメンタル"
-
-#~ msgid "Acid"
-#~ msgstr "アシッド"
-
-#~ msgid "Game"
-#~ msgstr "ゲーム"
-
-#~ msgid "Sound Clip"
-#~ msgstr "サウンドクリップ"
-
-#~ msgid "AlternRock"
-#~ msgstr "オルタナロック"
-
-#~ msgid "Bass"
-#~ msgstr "ベース"
-
-#~ msgid "Punk"
-#~ msgstr "パンク"
-
-#~ msgid "Space"
-#~ msgstr "スペース"
-
-#~ msgid "Meditative"
-#~ msgstr "教会音楽"
-
-#~ msgid "Instrumental Pop"
-#~ msgstr "インストゥルメンタルポップ"
-
-#~ msgid "Instrumental Rock"
-#~ msgstr "インストゥルメンタルロック"
-
-#~ msgid "Ethnic"
-#~ msgstr "エスニック"
-
-#~ msgid "Gothic"
-#~ msgstr "ゴシック"
-
-#~ msgid "Darkwave"
-#~ msgstr "ダークウェーヴ"
-
-#~ msgid "Techno-Industrial"
-#~ msgstr "テクノインスツルメント"
-
-#~ msgid "Electronic"
-#~ msgstr "エレクトロニック"
-
-#~ msgid "Pop-Folk"
-#~ msgstr "ポップフォーク"
-
-#~ msgid "Eurodance"
-#~ msgstr "ユーロダンス"
-
-#~ msgid "Dream"
-#~ msgstr "ドリーム"
-
-#~ msgid "Southern Rock"
-#~ msgstr "サザンロック"
-
-#~ msgid "Comedy"
-#~ msgstr "コメディ"
-
-#~ msgid "Cult"
-#~ msgstr "カルト"
-
-#~ msgid "Top 40"
-#~ msgstr "トップ 40"
-
-#~ msgid "Christian Rap"
-#~ msgstr "クリスチャンラップ"
-
-#~ msgid "Pop/Funk"
-#~ msgstr "ポップ/ファンキー"
-
-#~ msgid "Native American"
-#~ msgstr "ネイティヴアメリカン"
-
-#~ msgid "Cabaret"
-#~ msgstr "キャバレー"
-
-#~ msgid "Psychedelic"
-#~ msgstr "サイケデリック"
-
-#~ msgid "Rave"
-#~ msgstr "レイヴ"
-
-#~ msgid "Showtunes"
-#~ msgstr "ショーチューン"
-
-#~ msgid "Trailer"
-#~ msgstr "トレイラー"
-
-#~ msgid "Lo-Fi"
-#~ msgstr "ローファイ"
-
-#~ msgid "Tribal"
-#~ msgstr "トリバル"
-
-#~ msgid "Acid Punk"
-#~ msgstr "アシッドパンク"
-
-#~ msgid "Polka"
-#~ msgstr "ポルカ"
-
-#~ msgid "Retro"
-#~ msgstr "レトロ"
-
-#~ msgid "Musical"
-#~ msgstr "ミュージカル"
-
-#~ msgid "Folk/Rock"
-#~ msgstr "フォーク/ロック"
-
-#~ msgid "National Folk"
-#~ msgstr "ナショナルフォーク"
-
-#~ msgid "Fast-Fusion"
-#~ msgstr "ファストフュージョン"
-
-#~ msgid "Latin"
-#~ msgstr "ラテン"
-
-#~ msgid "Revival"
-#~ msgstr "リバイバル"
-
-#~ msgid "Celtic"
-#~ msgstr "セルティック"
-
-#~ msgid "Avantgarde"
-#~ msgstr "アバンギャルド"
-
-#~ msgid "Gothic Rock"
-#~ msgstr "ゴシックロック"
-
-#~ msgid "Progressive Rock"
-#~ msgstr "プログレッシヴロック"
-
-#~ msgid "Psychedelic Rock"
-#~ msgstr "サイケデリックロック"
-
-#~ msgid "Symphonic Rock"
-#~ msgstr "シンフォニックロック"
-
-#~ msgid "Slow Rock"
-#~ msgstr "スローロック"
-
-#~ msgid "Big Band"
-#~ msgstr "ビッグバンド"
-
-#~ msgid "Chorus"
-#~ msgstr "コーラス"
-
-#~ msgid "Acoustic"
-#~ msgstr "アコースティック"
-
-#~ msgid "Humour"
-#~ msgstr "ユーモア"
-
-#~ msgid "Speech"
-#~ msgstr "スピーチ"
-
-#~ msgid "Chanson"
-#~ msgstr "シャンソン"
-
-#~ msgid "Opera"
-#~ msgstr "オペラ"
-
-#~ msgid "Sonata"
-#~ msgstr "ソナタ"
-
-#~ msgid "Symphony"
-#~ msgstr "シンフォニー"
-
-#~ msgid "Booty Bass"
-#~ msgstr "ブーティベース"
-
-#~ msgid "Primus"
-#~ msgstr "プリマス"
-
-#~ msgid "Porn Groove"
-#~ msgstr "ポルノグルーヴ"
-
-#~ msgid "Satire"
-#~ msgstr "サティア"
-
-#~ msgid "Slow Jam"
-#~ msgstr "スロージャム"
-
-#~ msgid "Club"
-#~ msgstr "クラブ"
-
-#~ msgid "Tango"
-#~ msgstr "タンゴ"
-
-#~ msgid "Samba"
-#~ msgstr "サンバ"
-
-#~ msgid "Folklore"
-#~ msgstr "フォークロア"
-
-#~ msgid "Ballad"
-#~ msgstr "バラード"
-
-#~ msgid "Power Ballad"
-#~ msgstr "パワーバラード"
-
-#~ msgid "Rhythmic Soul"
-#~ msgstr "リズミックソウル"
-
-#~ msgid "Freestyle"
-#~ msgstr "フリースタイル"
-
-#~ msgid "Duet"
-#~ msgstr "デュエット"
-
-#~ msgid "Drum Solo"
-#~ msgstr "ドラムソロ"
-
-#~ msgid "A Cappella"
-#~ msgstr "ア・カペラ"
-
-#~ msgid "Euro-House"
-#~ msgstr "ユーロハウス"
-
-#~ msgid "Dance Hall"
-#~ msgstr "ダンスホール"
-
-#~ msgid "Goa"
-#~ msgstr "ゴア"
-
-#~ msgid "Drum & Bass"
-#~ msgstr "ドラムンベース"
-
-#~ msgid "Club-House"
-#~ msgstr "クラブハウス"
-
-#~ msgid "Hardcore"
-#~ msgstr "ハードコア"
-
-#~ msgid "Terror"
-#~ msgstr "テラー"
-
-#~ msgid "Indie"
-#~ msgstr "インディーズ"
-
-#~ msgid "BritPop"
-#~ msgstr "ブリットポップ"
-
-#~ msgid "Negerpunk"
-#~ msgstr "ニガーパンク"
-
-#~ msgid "Polsk Punk"
-#~ msgstr "ポルスクパンク"
-
-#~ msgid "Beat"
-#~ msgstr "ビート"
-
-#~ msgid "Christian Gangsta Rap"
-#~ msgstr "クリスチャンギャングスタラップ"
-
-#~ msgid "Black Metal"
-#~ msgstr "ブラックメタル"
-
-#~ msgid "Crossover"
-#~ msgstr "クロスオーバー"
-
-#~ msgid "Contemporary Christian"
-#~ msgstr "コンテンポラリクリスチャン"
-
-#~ msgid "Christian Rock"
-#~ msgstr "クリスチャンロック"
-
-#~ msgid "Merengue"
-#~ msgstr "メレンゲ"
-
-#~ msgid "Salsa"
-#~ msgstr "サルサ"
-
-#~ msgid "Thrash Metal"
-#~ msgstr "スラッシュメタル"
-
-#~ msgid "Anime"
-#~ msgstr "アニメ"
-
-#~ msgid "JPop"
-#~ msgstr "Jポップ"
-
-#~ msgid "Synthpop"
-#~ msgstr "シンセポップ"
-
-#, fuzzy
-#~ msgid ""
-#~ "<big>Audacious %s</big>\n"
-#~ "An audio player for many platforms.\n"
-#~ "Copyright (C) 2005-2011 Audacious Development Team"
-#~ msgstr ""
-#~ "<big>Audacious %s</big>\n"
-#~ "多くのプラットフォームに対応したマルチメディアプレーヤ.\n"
-#~ "\n"
-#~ "Copyright (C) 2005-2009 Audacious 開発チーム\n"
-
-#~ msgid "Unable to create log file (%s)!\n"
-#~ msgstr "ログファイル (%s) を作成できません!\n"
-
-#~ msgid "Print all errors and warnings to stdout"
-#~ msgstr "標準出力に全てのエラーと警告を表示する"
-
-#~ msgid "Used in macpacking"
-#~ msgstr "macpack で使用する"
-
-#~ msgid "Sorry, threads aren't supported on your platform.\n"
-#~ msgstr ""
-#~ "申し訳ありません, このプラットフォームではスレッドがサポートされていませ"
-#~ "ん.\n"
-
-#~ msgid "Module loading not supported! Plugins will not be loaded.\n"
-#~ msgstr ""
-#~ "モジュール読み込みがサポートされていません! プラグインは読み込まれませ"
-#~ "ん.\n"
-
-#~ msgid "Audacious - Unsupported Version Warning"
-#~ msgstr "Audacious - 未サポートヴァージョン警告"
-
-#~ msgid "<big>Audacious2 is not ready yet!</big>"
-#~ msgstr "<big>Audacious2 はまだ準備できていません!</big>"
-
-#~ msgid ""
-#~ "Please don't file bugs at this point unless they represent major "
-#~ "problems."
-#~ msgstr "重大な問題でない限り，この時点でバグを登録しないでください．"
-
-#~ msgid "Playback"
-#~ msgstr "演奏"
-
-#~ msgid "Playback"
-#~ msgstr "再生"
-
-#~ msgid ""
-#~ "When Audacious starts, automatically begin playing from the point where "
-#~ "we stopped before."
-#~ msgstr ""
-#~ "Audacious が開始したとき, 以前停止した位置から自動的に演奏を開始します."
-
-#~ msgid "Don't advance in the playlist"
-#~ msgstr "プレイリストの次の曲へ進めない"
-
-#~ msgid ""
-#~ "When finished playing a song, don't automatically advance to the next."
-#~ msgstr "曲の演奏が終了したら, 次の曲を自動的に演奏しません."
-
-#~ msgid "Enabled"
-#~ msgstr "有効"
-
-#~ msgid "Description"
-#~ msgstr "説明"
-
-#~ msgid "Output Plugin Preferences"
-#~ msgstr "出力プラグイン設定"
-
-#~ msgid "Output Plugin Information"
-#~ msgstr "出力プラグイン情報"
-
-#~ msgid "_Decoder list:"
-#~ msgstr "デコーダ一覧(_D):"
-
-#~ msgid "Decoders"
-#~ msgstr "デコーダ"
-
-#~ msgid "_General plugin list:"
-#~ msgstr "全般プラグインの一覧(_G):"
-
-#~ msgid "General"
-#~ msgstr "全般"
-
-#~ msgid "_Visualization plugin list:"
-#~ msgstr "視覚化プラグインの一覧(_V):"
-
-#~ msgid "Visualization"
-#~ msgstr "視覚化"
-
-#, fuzzy
-#~ msgid "Effect plugins:"
-#~ msgstr "エフェクトプラグインの一覧(_E):"
-
-#~ msgid "General"
-#~ msgstr "一般"
-
-#~ msgid "Location"
-#~ msgstr "位置"
-
-#~ msgid "Raw Metadata"
-#~ msgstr "生メタデータ"
-
-#~ msgid "Key"
-#~ msgstr "キー"
-
-#~ msgid "Value"
-#~ msgstr "値"
-
-#~ msgid "Interface to use (use -i list to view available interfaces)"
-#~ msgstr ""
-#~ "使用するインタフェイス (利用可能なインタフェイスを見るには -i list とする)"
-
-#~ msgid ""
-#~ "Available interfaces:\n"
-#~ "\n"
-#~ msgstr ""
-#~ "利用可能なインタフェイス:\n"
-#~ "\n"
-
-#, fuzzy
-#~ msgid "Available Plugin Preferences:\n"
-#~ msgstr ""
-#~ "利用可能なインタフェイス:\n"
-#~ "\n"
-
-#~ msgid "Headless Interface"
-#~ msgstr "ヘッドレスインタフェイス"
-
-#~ msgid "Add/Open URL Dialog"
-#~ msgstr "ファイルの追加/URL を開く"
-
-#~ msgid "Enter location to play:"
-#~ msgstr "演奏する位置の入力:"
-
-#~ msgid "Don't clear the playlist"
-#~ msgstr "プレイリストをクリアしない"
-
-#~ msgid "audacious: %s"
-#~ msgstr "audacious: %s"
-
-#~ msgid "Filename:"
-#~ msgstr "ファイル名:"
-
-#~ msgid "No input plugin recognized this file"
-#~ msgstr "このファイルを認識する入力プラグインではありません"
-
-#~ msgid ""
-#~ "<big>No output plugin selected.</big>\n"
-#~ "You have not selected an output plugin."
-#~ msgstr ""
-#~ "<big>出力プラグインが選択されていません.</big>\n"
-#~ "出力プラグインを選択していません."
-
-#~ msgid "Connectivity"
-#~ msgstr "接続"
-
-#~ msgid "Best Sinc Interpolation"
-#~ msgstr "最適 Sinc 補間"
-
-#~ msgid "Medium Sinc Interpolation"
-#~ msgstr "中間 Sinc 補間"
-
-#~ msgid "Fastest Sinc Interpolation"
-#~ msgstr "最速 Sinc 補間"
-
-#~ msgid "ZOH Interpolation"
-#~ msgstr "ZOH 補間"
-
-#~ msgid "Linear Interpolation"
-#~ msgstr "線形補間"
-
-#~ msgid "Sampling Rate [Hz]:"
-#~ msgstr "サンプリングレート [Hz]:"
-
-#~ msgid "Interpolation Engine:"
-#~ msgstr "補間エンジン:"
-
-#~ msgid ""
-#~ "All streams will be converted to this sampling "
-#~ "rate.\n"
-#~ "This should be the max supported sampling rate of\n"
-#~ "the sound card or output plugin."
-#~ msgstr ""
-#~ "すべてのストリームはこのサンプリングレートに変換され"
-#~ "ます．\n"
-#~ "これはサウンドカードか出力プラグインでサポートされたサンプリングレートの最"
-#~ "大値となるはずです．"
-
-#~ msgid "Detect file formats by extension."
-#~ msgstr "ファイルフォーマットを拡張子で検出する"
-
-#~ msgid ""
-#~ "When checked, Audacious will detect file formats based by extension. Only "
-#~ "files with extensions of supported formats will be loaded."
-#~ msgstr ""
-#~ "有効ならば, Audacious はファイルフォーマットを拡張子によって検出します. サ"
-#~ "ポートされたフォーマットの拡張子を持ったファイルのみ読み込まれます."
-
-#~ msgid "Sampling Rate Converter"
-#~ msgstr "サンプリングレートコンバータ"
-
-#~ msgid "Enable Sampling Rate Converter"
-#~ msgstr "サンプリングレートコンバータを有効にする"
-
-#~ msgid "Advanced"
-#~ msgstr "高度な設定"
-
-#~ msgid "Bypass all of signal processing if possible"
-#~ msgstr "可能ならすべての信号処理をバイパスする"
-
-#~ msgid ""
-#~ "Try to pass input plugin's output directly to output plugin, if the "
-#~ "latter supports format produced by input plugin. If it's true, all signal "
-#~ "processing will be disabled (i.e. DSP plugins, equalizer, resampling, "
-#~ "Replay Gain and software volume control)."
-#~ msgstr ""
-#~ "入力プラグインによって生成されたフォーマットが出力プラグインでサポートされ"
-#~ "ているならば，入力プラグインの出力を直接出力プラグインに渡します．これを有"
-#~ "効にすると，すべての信号処理は無効にされます (例: DSP プラグイン，イコライ"
-#~ "ザ，リサンプリング，リプレイゲイン，ソフトウェアボリュームコントロール)"
-
-#~ msgid "Dynamically adjust scale factor to prevent clipping"
-#~ msgstr "クリッピング防止のために縮尺係数を動的に調整する"
-
-#~ msgid "Decrease scale factor (gain) if clipping nevertheless occurred"
-#~ msgstr ""
-#~ "それにもかかわらずクリッピングが発生するなら，縮尺係数(ゲイン)を減らしてく"
-#~ "ださい．"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Audacious has caught signal 11 (SIGSEGV).\n"
-#~ "\n"
-#~ "We apologize for the inconvenience, but Audacious has crashed.\n"
-#~ "This is a bug in the program, and should never happen under normal "
-#~ "circumstances.\n"
-#~ "Your current configuration has been saved and should not be damaged.\n"
-#~ "\n"
-#~ "You can help improve the quality of Audacious by filing a bug at http://"
-#~ "jira.atheme.org/\n"
-#~ "Please include the entire text of this message and a description of what "
-#~ "you were doing when\n"
-#~ "this crash occured in order to quickly expedite the handling of your bug "
-#~ "report:\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Audacious はシグナル 11 (SIGSEGV) を受け取りました．\n"
-#~ "\n"
-#~ "Audacious がクラッシュし，申し訳ありません．\n"
-#~ "これはプログラムのバグで，通常の環境では起こりえません．\n"
-#~ "現在の設定は保存されており，影響は受けていないはずです．\n"
-#~ "\n"
-#~ "このバグを http://bugzilla.atheme.org/ にファイルしていただけると，"
-#~ "Audacious の品質向上の手助けとなります．\n"
-#~ "あなたのバグレポートの取り扱いを素早く済ませるために，このメッセージの全文"
-#~ "とクラッシュしたときに何をしていたかの解説を含めてください:\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Stacktrace was unavailable. You might want to reproduce this problem "
-#~ "while running Audacious under GDB to get a proper backtrace.\n"
-#~ msgstr ""
-#~ "スタックトレースが利用できませんでした．正しいバックトレースを取得するに"
-#~ "は，Audacious を GDB 経由で起動して問題を再現させる必要があります．\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Bugs can be reported at http://jira.atheme.org/ against the Audacious or "
-#~ "Audacious Plugins product.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Audacious や Audacious プラグインのバグは http://redmine.atheme.org/ にレ"
-#~ "ポートしてください．\n"
-
-#~ msgid ""
-#~ "Your signaling implementation is broken.\n"
-#~ "Expect unusable crash reports.\n"
-#~ msgstr ""
-#~ "ご利用のシグナル実装は壊れています．\n"
-#~ "クラッシュレポートはおそらく利用できないでしょう．\n"
-
-#~ msgid ""
-#~ "<big>Audacious %s</big>\n"
-#~ "\n"
-#~ "Copyright (C) 2005-2009 Audacious Development Team"
-#~ msgstr ""
-#~ "<big>Audacious %s</big>\n"
-#~ "\n"
-#~ "Copyright (C) 2005-2009 Audacious 開発チーム"
-
-#~ msgid "Detect file formats on demand, instead of immediately."
-#~ msgstr "ファイルフォーマットをすぐにではなく要求に応じて検出する"
-
-#~ msgid ""
-#~ "When checked, Audacious will detect file formats on demand. This can "
-#~ "result in a messier playlist, but delivers a major speed benefit."
-#~ msgstr ""
-#~ "有効ならば, Audacious はファイルフォーマットを要求に応じて検出します. プレ"
-#~ "イリストが汚くなってしまいますが, 速度は大いに早くなります."
-
-#~ msgid "Load metadata from playlists and files"
-#~ msgstr "プレイリストとファイルからメタデータを読み込む"
-
-#~ msgid "Load metadata (tag information) from music files."
-#~ msgstr "曲ファイルからタグ情報を読み込みます."
-
-#~ msgid "Can't jump to time when no track is being played.\n"
-#~ msgstr "再生されるトラックがない時間へは移動できません.\n"
-
-#~ msgid "minutes:seconds"
-#~ msgstr "分:秒"
-
-#~ msgid "Track length:"
-#~ msgstr "トラックの合計時間:"
-
-#~ msgid "Save as Static Playlist"
-#~ msgstr "スタティックプレイリストとして保存"
-
-#~ msgid "Use Relative Path"
-#~ msgstr "相対パスを使う"
-
-#~ msgid "Error writing playlist \"%s\": %s"
-#~ msgstr "プレイリスト \"%s\" を書き込む際にエラー: %s"
-
-#~ msgid "%s already exist. Continue?"
-#~ msgstr "%s は既に存在しています. 続行しますか？"
-
-#~ msgid ""
-#~ "<big>Unable to save playlist.</big>\n"
-#~ "\n"
-#~ "Unknown file type for '%s'.\n"
-#~ msgstr ""
-#~ "<big>プレイリストを保存できません!</big>\n"
-#~ "\n"
-#~ "%s のファイルの種類が不明です.\n"
-
-#~ msgid "Presets"
-#~ msgstr "プリセット"
-
-#~ msgid "Mouse"
-#~ msgstr "マウス"
-
-#~ msgid "Pause between songs"
-#~ msgstr "曲の間に一時停止する"
-
-#~ msgid "Pause for"
-#~ msgstr "一時停止の時間: "
-
-#~ msgid "seconds"
-#~ msgstr "秒"
-
-#~ msgid "Filename"
-#~ msgstr "ファイル名"
-
-#~ msgid "Convert underscores to blanks"
-#~ msgstr "アンダースコア (__) をスペースに変換する"
-
-#~ msgid "Convert %20 to blanks"
-#~ msgstr "'%20' をスペースに変換する"
-
-#~ msgid "Convert backslash '\\' to forward slash '/'"
-#~ msgstr "バックスラッシュ '\\' をスラッシュ '/' に変換する"
-
-#~ msgid "File Dialog"
-#~ msgstr "ファイルダイアログ"
-
-#~ msgid "Always refresh directory when opening file dialog"
-#~ msgstr "ファイルダイアログを開くときにディレクトリを常に更新する"
-
-#~ msgid ""
-#~ "Always refresh the file dialog (this will slow opening the dialog on "
-#~ "large directories, and Gnome VFS should handle automatically)."
-#~ msgstr ""
-#~ "ファイルダイアログを常に更新します(大きなディレクトリがあるとダイアログを"
-#~ "開くのが遅くなりますが, Gnome VFS は自動的に扱ってくれます)."
-
-#~ msgid "Changes volume by"
-#~ msgstr "音量を変更する割合: "
-
-#~ msgid "percent"
-#~ msgstr "％"
-
-#~ msgid "Scrolls playlist by"
-#~ msgstr "プレイリストで移動する量: "
-
-#~ msgid "lines"
-#~ msgstr "行"
-
-#~ msgid "Stop after Current Song"
-#~ msgstr "現在の曲の後に停止する"
-
-#~ msgid "Peaks"
-#~ msgstr "ピーク"
-
-#~ msgid "Repeat"
-#~ msgstr "リピート"
-
-#~ msgid "Shuffle"
-#~ msgstr "シャッフル"
-
-#~ msgid "No Playlist Advance"
-#~ msgstr "次の曲に進まない"
-
-#~ msgid "Play"
-#~ msgstr "演奏"
-
-#~ msgid "Pause"
-#~ msgstr "一時停止"
-
-#~ msgid "Stop"
-#~ msgstr "停止"
-
-#~ msgid "Previous"
-#~ msgstr "前の曲"
-
-#~ msgid "Next"
-#~ msgstr "次の曲"
-
-#~ msgid "Visualization Mode"
-#~ msgstr "視覚化モード"
-
-#~ msgid "Analyzer Mode"
-#~ msgstr "アナライザモード"
-
-#~ msgid "Scope Mode"
-#~ msgstr "スコープモード"
-
-#~ msgid "Voiceprint Mode"
-#~ msgstr "声紋モード"
-
-#~ msgid "WindowShade VU Mode"
-#~ msgstr "WindowShade VU モード"
-
-#~ msgid "Refresh Rate"
-#~ msgstr "リフレッシュレート"
-
-#~ msgid "Analyzer Falloff"
-#~ msgstr "アナライザ フォールオフ"
-
-#~ msgid "Peaks Falloff"
-#~ msgstr "ピーク フォールオフ"
-
-#~ msgid "New Playlist"
-#~ msgstr "新しいプレイリスト"
-
-#~ msgid "Select Next Playlist"
-#~ msgstr "次のプレイリストを選択"
-
-#~ msgid "Select Previous Playlist"
-#~ msgstr "前のプレイリストを選択"
-
-#~ msgid "Delete Playlist"
-#~ msgstr "プレイリストの削除"
-
-#~ msgid "Load List"
-#~ msgstr "プレイリストの読み込み"
-
-#~ msgid "Loads a playlist file into the selected playlist."
-#~ msgstr "選択したプレイリストにプレイリストファイルを読み込みます."
-
-#~ msgid "Save List"
-#~ msgstr "プレイリストの保存"
-
-#~ msgid "Saves the selected playlist."
-#~ msgstr "選択したプレイリストを保存します."
-
-#~ msgid "Save Default List"
-#~ msgstr "デフォルトのプレイリストの保存"
-
-#~ msgid "Saves the selected playlist to the default location."
-#~ msgstr "選択したプレイリストをデフォルト位置に保存します."
-
-#~ msgid "Refresh List"
-#~ msgstr "プレイリストの更新"
-
-#~ msgid "Refreshes metadata associated with a playlist entry."
-#~ msgstr "プレイリストのエントリに関連付けられたメタデータを更新します."
-
-#~ msgid "List Manager"
-#~ msgstr "プレイリストマネージャ"
-
-#~ msgid "Opens the playlist manager."
-#~ msgstr "プレイリストマネージャを開きます."
-
-#~ msgid "View"
-#~ msgstr "表示"
-
-#~ msgid "Add Internet Address..."
-#~ msgstr "インターネットアドレスの追加..."
-
-#~ msgid "Adds a remote track to the playlist."
-#~ msgstr "リモートトラックをプレイリストに追加します."
-
-#~ msgid "Add Files..."
-#~ msgstr "ファイルの追加..."
-
-#~ msgid "Search and Select"
-#~ msgstr "検索と選択"
-
-#~ msgid ""
-#~ "Searches the playlist and selects playlist entries based on specific "
-#~ "criteria."
-#~ msgstr "プレイリストを検索し, 特定の判定基準に基いて選択します."
-
-#~ msgid "Invert Selection"
-#~ msgstr "選択範囲の反転"
-
-#~ msgid "Inverts the selected and unselected entries."
-#~ msgstr "エントリの選択と未選択を反転します."
-
-#~ msgid "Select All"
-#~ msgstr "全て選択"
-
-#~ msgid "Selects all of the playlist entries."
-#~ msgstr "プレイリストの全てのエントリを選択します."
-
-#~ msgid "Select None"
-#~ msgstr "未選択にする"
-
-#~ msgid "Deselects all of the playlist entries."
-#~ msgstr "プレイリストの全てのエントリを未選択にします."
-
-#~ msgid "Remove All"
-#~ msgstr "全て削除"
-
-#~ msgid "Removes all entries from the playlist."
-#~ msgstr "全てのエントリをプレイリストから削除します."
-
-#~ msgid "Clear Queue"
-#~ msgstr "キューのクリア"
-
-#~ msgid "Clears the queue associated with this playlist."
-#~ msgstr "プレイリストに関連付けられたキューをクリアします."
-
-#~ msgid "Remove Unavailable Files"
-#~ msgstr "利用不可ファイルの削除"
-
-#~ msgid "Removes unavailable files from the playlist."
-#~ msgstr "利用不可ファイルをプレイリストから削除します."
-
-#~ msgid "Remove Duplicates"
-#~ msgstr "重複エントリの削除"
-
-#~ msgid "By Title"
-#~ msgstr "タイトル"
-
-#~ msgid "Removes duplicate entries from the playlist by title."
-#~ msgstr "重複するタイトルのエントリをプレイリストから削除します."
-
-#~ msgid "By Filename"
-#~ msgstr "ファイル名"
-
-#~ msgid "Removes duplicate entries from the playlist by filename."
-#~ msgstr "重複するファイル名のエントリをプレイリストから削除します."
-
-#~ msgid "By Path + Filename"
-#~ msgstr "パス名とファイル名"
-
-#~ msgid "Removes duplicate entries from the playlist by their full path."
-#~ msgstr "重複するパス名とファイル名のエントリをプレイリストから削除します."
-
-#~ msgid "Remove Unselected"
-#~ msgstr "選択していないエントリの削除"
-
-#~ msgid "Remove unselected entries from the playlist."
-#~ msgstr "選択していないエントリをプレイリストから削除します."
-
-#~ msgid "Remove Selected"
-#~ msgstr "選択したエントリの削除"
-
-#~ msgid "Remove selected entries from the playlist."
-#~ msgstr "選択したエントリをプレイリストから削除します."
-
-#~ msgid "Randomize List"
-#~ msgstr "プレイリストをランダムにする"
-
-#~ msgid "Randomizes the playlist."
-#~ msgstr "プレイリストの順序をランダムにします."
-
-#~ msgid "Reverse List"
-#~ msgstr "プレイリストを逆順にする"
-
-#~ msgid "Reverses the playlist."
-#~ msgstr "プレイリストの順序を逆順にします."
-
-#~ msgid "Sort List"
-#~ msgstr "プレイリストのソート"
-
-#~ msgid "Sorts the list by title."
-#~ msgstr "タイトル順でプレイリストをソートします."
-
-#~ msgid "By Album"
-#~ msgstr "アルバム"
-
-#~ msgid "Sorts the list by album."
-#~ msgstr "アルバム順でプレイリストをソートします."
-
-#~ msgid "By Artist"
-#~ msgstr "アーティスト"
-
-#~ msgid "Sorts the list by artist."
-#~ msgstr "アーティスト順でプレイリストをソートします."
-
-#~ msgid "Sorts the list by filename."
-#~ msgstr "ファイル名順でプレイリストをソートします."
-
-#~ msgid "Sorts the list by full pathname."
-#~ msgstr "ファイルのパス名でプレイリストをソートします."
-
-#~ msgid "By Date"
-#~ msgstr "日付"
-
-#~ msgid "Sorts the list by modification time."
-#~ msgstr "変更時間でプレイリストをソートします."
-
-#~ msgid "By Track Number"
-#~ msgstr "トラック番号"
-
-#~ msgid "Sorts the list by track number."
-#~ msgstr "トラック番号順でプレイリストをソートします."
-
-#~ msgid "By Playlist Entry"
-#~ msgstr "プレイリストのエントリ"
-
-#~ msgid "Sorts the list by playlist entry."
-#~ msgstr "プレイリストのエントリ順でソートします."
-
-#~ msgid "Sort Selected"
-#~ msgstr "選択範囲のソート"
-
-#~ msgid "File"
-#~ msgstr "ファイル"
-
-#~ msgid "Help"
-#~ msgstr "ヘルプ"
-
-#~ msgid "Components"
-#~ msgstr "コンポーネント"
-
-#~ msgid "View Track Details"
-#~ msgstr "トラックの詳細"
-
-#~ msgid "Play File"
-#~ msgstr "ファイルを演奏"
-
-#~ msgid "Load and play a file"
-#~ msgstr "ファイルを読み込んで演奏"
-
-#~ msgid "Play Location"
-#~ msgstr "場所を演奏"
-
-#~ msgid "Play media from the selected location"
-#~ msgstr "選択した場所からメディアを演奏"
-
-#~ msgid "Plugin services"
-#~ msgstr "プラグインサービス"
-
-#~ msgid "Preferences"
-#~ msgstr "設定"
-
-#~ msgid "Open preferences window"
-#~ msgstr "設定ウィンドウを開く"
-
-#~ msgid "_Quit"
-#~ msgstr "終了(_Q)"
-
-#~ msgid "Quit Audacious"
-#~ msgstr "Audacious を終了する"
-
-#~ msgid "Set A-B"
-#~ msgstr "A-B をセット"
-
-#~ msgid "Clear A-B"
-#~ msgstr "A-B をクリア"
-
-#~ msgid "Jump to Playlist Start"
-#~ msgstr "最初の曲へ移動"
-
-#~ msgid "Jump to File"
-#~ msgstr "指定したファイルへ移動"
-
-#~ msgid "Queue Toggle"
-#~ msgstr "キューを切り替える"
-
-#~ msgid "Enables/disables the entry in the playlist's queue."
-#~ msgstr "プレイリストのキューに入っているエントリの有効/無効を切り替えます."
-
-#~ msgid "Load"
-#~ msgstr "読み込み"
-
-#~ msgid "Import"
-#~ msgstr "インポート"
-
-#~ msgid "Save"
-#~ msgstr "保存"
-
-#~ msgid "Delete"
-#~ msgstr "削除"
-
-#~ msgid "Preset"
-#~ msgstr "プリセット"
-
-#~ msgid "Load preset"
-#~ msgstr "プリセットの読み込み"
-
-#~ msgid "Auto-load preset"
-#~ msgstr "自動読み込みのプリセット"
-
-#~ msgid "Load auto-load preset"
-#~ msgstr "自動読み込みのプリセット"
-
-#~ msgid "Default"
-#~ msgstr "デフォルト"
-
-#~ msgid "Load default preset into equalizer"
-#~ msgstr "イコライザにデフォルトプリセットを読み込む"
-
-#~ msgid "Zero"
-#~ msgstr "ゼロ"
-
-#~ msgid "Set equalizer preset levels to zero"
-#~ msgstr "イコライザプリセットレベルをゼロにセット"
-
-#~ msgid "From file"
-#~ msgstr "ファイル"
-
-#~ msgid "Load preset from file"
-#~ msgstr "ファイルからプリセットを読み込み"
-
-#~ msgid "From WinAMP EQF file"
-#~ msgstr "WinAMP EQF ファイル"
-
-#~ msgid "Load preset from WinAMP EQF file"
-#~ msgstr "WinAMP EQF ファイルからプリセットを読み込み"
-
-#~ msgid "WinAMP Presets"
-#~ msgstr "WinAMP プリセット"
-
-#~ msgid "Import WinAMP presets"
-#~ msgstr "WinAMP プリセット"
-
-#~ msgid "Save preset"
-#~ msgstr "プリセットの保存"
-
-#~ msgid "Save auto-load preset"
-#~ msgstr "自動読み込みのプリセットの保存"
-
-#~ msgid "Save default preset"
-#~ msgstr "デフォルトプリセットの保存"
-
-#~ msgid "To file"
-#~ msgstr "ファイル"
-
-#~ msgid "Save preset to file"
-#~ msgstr "プリセットをファイルへ保存"
-
-#~ msgid "To WinAMP EQF file"
-#~ msgstr "WinAMP EQF ファイル"
-
-#~ msgid "Save preset to WinAMP EQF file"
-#~ msgstr "プリセットを WinAMP EQF ファイルへ保存"
-
-#~ msgid "Delete preset"
-#~ msgstr "プリセットの削除"
-
-#~ msgid "Delete auto-load preset"
-#~ msgstr "自動読み込みのプリセットの削除"
-
-#~ msgid "New Interface"
-#~ msgstr "新しいインタフェイス"
-
-#~ msgid ""
-#~ "This is the amount of time to prebuffer audio "
-#~ "streams by, in milliseconds.\n"
-#~ "Increase this value if you are experiencing audio skipping.\n"
-#~ "Please note however, that high values will result in Audacious performing "
-#~ "poorly."
-#~ msgstr ""
-#~ "オーディオストリームをプレバッファするための十分な時"
-#~ "間をミリ秒で指定します.\n"
-#~ "音飛びがあるならこの値を増やします.\n"
-#~ "しかし, 高い値は Audacious のパフォーマンスを悪くすることに注意してくださ"
-#~ "い."
-
-#~ msgid "Enable headless operation"
-#~ msgstr "ヘッドレス操作を有効にする"
-
-#~ msgid ""
-#~ "<big>Unable to load skin.</big>\n"
-#~ "\n"
-#~ "Check that skin at '%s' is usable and default skin is properly installed "
-#~ "at '%s'\n"
-#~ msgstr ""
-#~ "<big>スキンをロードできません.</big>\n"
-#~ "\n"
-#~ "'%s' にあるスキンが利用可能であるか確認して下さい.\n"
-#~ "デフォルトのスキンはおそらく '%s' にインストールされています.\n"
-
-#~ msgid "Headless operation enabled\n"
-#~ msgstr "ヘッドレス操作を有効にしました\n"
-
-#~ msgid "Audacious core developers:"
-#~ msgstr "Audacious 主要開発者:"
-
-#~ msgid "Audacious Equalizer"
-#~ msgstr "Audacious イコライザ"
-
-#~ msgid "Play files"
-#~ msgstr "ファイルを演奏"
-
-#~ msgid "Load files"
-#~ msgstr "ファイルを読み込む"
-
-#~ msgid "%s - Audacious"
-#~ msgstr "%s - Audacious"
-
-#~ msgid "VBR"
-#~ msgstr "VBR"
-
-#~ msgid "mono"
-#~ msgstr "モノラル"
-
-#~ msgid "Audacious - visibility warning"
-#~ msgstr "Audacious - 可視警告"
-
-#~ msgid "Show main player window"
-#~ msgstr "メインウィンドウを表示する"
-
-#~ msgid "Ignore"
-#~ msgstr "無視"
-
-#~ msgid ""
-#~ "Audacious has been started with all of its windows hidden.\n"
-#~ "You may want to show the player window again to control Audacious; "
-#~ "otherwise, you'll have to control it remotely via audtool or enabled "
-#~ "plugins (such as the statusicon plugin)."
-#~ msgstr ""
-#~ "Audacious はすべてのウィンドウが隠された状態で開始されました．\n"
-#~ "再度プレイヤウィンドウを表示するか，そのまま Audacious を操作するために"
-#~ "は，audtool を用いるか statusicon のようなプラグインを有効にすることで遠隔"
-#~ "操作してください．"
-
-#~ msgid "Always ignore, show/hide is controlled remotely"
-#~ msgstr "常に無視し，表示する/隠す は遠隔操作する"
-
-#~ msgid ""
-#~ "<big>Broken GTK engine in use</big>\n"
-#~ "\n"
-#~ "Audacious has detected that you are using a broken GTK engine.\n"
-#~ "\n"
-#~ "The theme engine you are using, %s, is incompatible with some of "
-#~ "the features used by modern skins. The incompatible features have been "
-#~ "disabled for this session.\n"
-#~ "\n"
-#~ "To use these features, please consider using a different GTK theme engine."
-#~ msgstr ""
-#~ "<big>壊れた GTK エンジンが使われています</big>\n"
-#~ "\n"
-#~ "Audacious は GTK エンジンが使われていることを検出しました.\n"
-#~ "\n"
-#~ "テーマエンジン %s は最近のスキンで用いられている特徴と非互換です.非"
-#~ "互換な特徴はこのセッションでは無効にされました.\n"
-#~ "\n"
-#~ "これらの特徴を用いるには, 他の GTK テーマエンジンを使うことを考慮してくだ"
-#~ "さい."
-
-#~ msgid "Seek to: %d:%-2.2d/%d:%-2.2d (%d%%)"
-#~ msgstr "移動先: %d:%-2.2d/%d:%-2.2d (%d%%)"
-
-#~ msgid "Volume: %d%%"
-#~ msgstr "音量: %d%%"
-
-#~ msgid "Balance: %d%% left"
-#~ msgstr "バランス: %d%% 左"
-
-#~ msgid "Balance: center"
-#~ msgstr "バランス: 中央"
-
-#~ msgid "Balance: %d%% right"
-#~ msgstr "バランス: %d%% 右"
-
-#~ msgid "Options Menu"
-#~ msgstr "オプションメニュー"
-
-#~ msgid "Disable 'Always On Top'"
-#~ msgstr "「常に最前面に配置」無効"
-
-#~ msgid "Enable 'Always On Top'"
-#~ msgstr "「常に最前面に配置」有効"
-
-#~ msgid "File Info Box"
-#~ msgstr "ファイル情報ボックス"
-
-#~ msgid "Disable 'GUI Scaling'"
-#~ msgstr "「GUI スケーリング」無効"
-
-#~ msgid "Enable 'GUI Scaling'"
-#~ msgstr "「GUI スケーリング」有効"
-
-#~ msgid "Visualization Menu"
-#~ msgstr "視覚化メニュー"
-
-#~ msgid ""
-#~ "<big>Couldn't open audio.</big>\n"
-#~ "\n"
-#~ "Please check that:\n"
-#~ "1. You have the correct output plugin selected.\n"
-#~ "2. No other programs is blocking the soundcard.\n"
-#~ "3. Your soundcard is configured properly.\n"
-#~ msgstr ""
-#~ "<big>オーディオデバイスを開けませんでした.</big>\n"
-#~ "\n"
-#~ "以下をチェックして下さい:\n"
-#~ "1. 現在選択している出力プラグインが正しいか.\n"
-#~ "2. お使いのサウンドカードをブロックしているアプリが他に存在しないか.\n"
-#~ "3. お使いのサウンドカードが正しく設定されているか.\n"
-
-#~ msgid "Autoscroll Songname"
-#~ msgstr "曲名の自動スクロール"
-
-#~ msgid "Show Player"
-#~ msgstr "プレイヤを表示する"
-
-#~ msgid "Show Playlist Editor"
-#~ msgstr "プレイリストエディタを表示する"
-
-#~ msgid "Show Equalizer"
-#~ msgstr "イコライザを表示する"
-
-#~ msgid "Always on Top"
-#~ msgstr "常に最前面に配置する"
-
-#~ msgid "Put on All Workspaces"
-#~ msgstr "全ワークスペースに配置する"
-
-#~ msgid "Roll up Player"
-#~ msgstr "プレイヤを巻き上げる"
-
-#~ msgid "Roll up Playlist Editor"
-#~ msgstr "プレイリストエディタを巻き上げる"
-
-#~ msgid "Roll up Equalizer"
-#~ msgstr "イコライザを巻き上げる"
-
-#~ msgid "Scale"
-#~ msgstr "スケール"
-
-#~ msgid "DoubleSize"
-#~ msgstr "ダブルサイズ"
-
-#~ msgid "Easy Move"
-#~ msgstr "簡単移動"
-
-#~ msgid "Analyzer"
-#~ msgstr "アナライザ"
-
-#~ msgid "Scope"
-#~ msgstr "スコープ"
-
-#~ msgid "Voiceprint"
-#~ msgstr "声紋"
-
-#~ msgid "Off"
-#~ msgstr "オフ"
-
-#~ msgid "Normal"
-#~ msgstr "標準"
-
-#~ msgid "Fire"
-#~ msgstr "ファイア"
-
-#~ msgid "Vertical Lines"
-#~ msgstr "垂直ライン"
-
-#~ msgid "Lines"
-#~ msgstr "ライン"
-
-#~ msgid "Bars"
-#~ msgstr "バー"
-
-#~ msgid "Dot Scope"
-#~ msgstr "ドット"
-
-#~ msgid "Line Scope"
-#~ msgstr "ライン"
-
-#~ msgid "Solid Scope"
-#~ msgstr "ソリッド"
-
-#~ msgid "Ice"
-#~ msgstr "アイス"
-
-#~ msgid "Smooth"
-#~ msgstr "スムーズ"
-
-#~ msgid "Full (~50 fps)"
-#~ msgstr "1:1 (〜50 fps)"
-
-#~ msgid "Half (~25 fps)"
-#~ msgstr "1:2 (〜25 fps)"
-
-#~ msgid "Quarter (~13 fps)"
-#~ msgstr "1:4 (〜13 fps)"
-
-#~ msgid "Eighth (~6 fps)"
-#~ msgstr "1:8 (〜6 fps)"
-
-#~ msgid "Slowest"
-#~ msgstr "最も遅い"
-
-#~ msgid "Slow"
-#~ msgstr "遅い"
-
-#~ msgid "Medium"
-#~ msgstr "中"
-
-#~ msgid "Fast"
-#~ msgstr "早い"
-
-#~ msgid "Fastest"
-#~ msgstr "最も早い"
-
-#~ msgid "Time Elapsed"
-#~ msgstr "経過時間を表示する"
-
-#~ msgid "Time Remaining"
-#~ msgstr "残り時間を表示する"
-
-#~ msgid "Plugin Services"
-#~ msgstr "プラグインサービス"
-
-#~ msgid "Search entries in active playlist"
-#~ msgstr "有効になっているプレイリストのエントリを検索"
-
-#~ 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つ以上の項目を埋めることによって, プレイリストのエントリを選択します. 項"
-#~ "目は正規表現が使え, 大文字と小文字を区別しません. 正規表現がどのように動作"
-#~ "するかわからない場合は, 単純に検索しようとしているものの文字を入力します."
-
-#~ msgid "Title: "
-#~ msgstr "タイトル: "
-
-#~ msgid "Album: "
-#~ msgstr "アルバム名: "
-
-#~ msgid "Artist: "
-#~ msgstr "アーティスト: "
-
-#~ msgid "Filename: "
-#~ msgstr "ファイル名: "
-
-#~ msgid "Clear previous selection before searching"
-#~ msgstr "検索前に以前の選択をクリア"
-
-#~ msgid "Automatically toggle queue for matching entries"
-#~ msgstr "マッチしたエントリのキューを自動的にトグル"
-
-#~ msgid "Audacious Playlist Editor"
-#~ msgstr "Audacious プレイリストエディタ"
-
-#~ msgid "Appearance"
-#~ msgstr "外観"
-
-#~ msgid "_Fonts"
-#~ msgstr "フォント(_F)"
-
-#~ msgid "_Player:"
-#~ msgstr "プレイヤ(_P):"
-
-#~ msgid "Select main player window font:"
-#~ msgstr "メインウィンドウで使用するフォントの選択"
-
-#~ msgid "_Playlist:"
-#~ msgstr "プレイリスト(_P):"
-
-#~ msgid "Select playlist font:"
-#~ msgstr "プレイリストで使用するフォントの選択"
-
-#~ msgid "Use Bitmap fonts if available"
-#~ msgstr "可能ならばビットマップフォントを使用"
-
-#~ msgid ""
-#~ "Use bitmap fonts if they are available. Bitmap fonts do not support "
-#~ "Unicode strings."
-#~ msgstr ""
-#~ "可能ならばビットマップフォントを使用します. ビットマップフォントは "
-#~ "Unicode 文字列をサポートしていません."
-
-#~ msgid "_Miscellaneous"
-#~ msgstr "その他(_M)"
-
-#~ msgid "Show track numbers in playlist"
-#~ msgstr "プレイリストにトラック番号を表示する"
-
-#~ msgid "Show separators in playlist"
-#~ msgstr "プレイリストの区切り線を表示する"
-
-#~ msgid "Show window manager decoration"
-#~ msgstr "ウィンドウマネージャ装飾を表示する"
-
-#~ msgid "This enables the window manager to show decorations for windows."
-#~ msgstr "ウィンドウマネージャによるウィンドウ装飾を有効にします."
-
-#~ msgid "Use XMMS-style file selector instead of the default selector"
-#~ msgstr ""
-#~ "デフォルトのセレクタの代わりに XMMS スタイルのファイルセレクタを使う"
-
-#~ msgid ""
-#~ "This enables the XMMS/GTK1-style file selection dialogs. This selector is "
-#~ "provided by Audacious itself and is faster than the default GTK2 selector "
-#~ "(but sadly not as user-friendly)."
-#~ msgstr ""
-#~ "XMMS/GTK1 スタイルのファイル選択ダイアログを有効にします. このセレクタは "
-#~ "Audacious 自身が提供し, GTK2 デフォルトのセレクタより高速です. (ただし, 悲"
-#~ "しいことにユーザフレンドリではありません)"
-
-#~ msgid "Use two-way text scroller"
-#~ msgstr "双方向テキストスクロールを使う"
-
-#~ msgid ""
-#~ "If selected, the file information text in the main window will scroll "
-#~ "back and forth. If not selected, the text will only scroll in one "
-#~ "direction."
-#~ msgstr ""
-#~ "これを使うと，メインウィンドウのファイル情報テキストが前後にスクロールしま"
-#~ "す．そうでなければ，テキストは一方向のみにスクロールします．"
-
-#~ msgid "Disable inline gtk theme"
-#~ msgstr "インライン GTK テーマを無効にする"
-
-#~ msgid "Allow loading incomplete skins"
-#~ msgstr "不完全なスキンの読み込みを許可する"
-
-#~ msgid ""
-#~ "If selected, audacious won't refuse loading broken skins. Use only if "
-#~ "your favourite skin doesn't work"
-#~ msgstr ""
-#~ "これを使うと，audacious は壊れたスキンの読み込みを拒絶しません．お気に入り"
-#~ "のスキンが動かないときだけ使用してください．"
-
-#~ msgid "On load"
-#~ msgstr "読み込み時"
-
-#~ msgid "Load metadata when adding the file to the playlist or opening it"
-#~ msgstr ""
-#~ "プレイリストへファイルを追加するか, プレイリストを開いたらタグ情報を読み込"
-#~ "みます."
-
-#~ msgid "On display"
-#~ msgstr "表示時"
-
-#~ msgid ""
-#~ "Load metadata on demand when displaying the file in the playlist. You may "
-#~ "need to set \"Detect file formats on demand\" in Audio page for full "
-#~ "benefit."
-#~ msgstr ""
-#~ "プレイリストのファイル表示に応じてメタデータを読み込みます.完全な恩恵を得"
-#~ "るにはオーディオ設定にて\"ファイルフォーマットを要求に応じて検出する\" を"
-#~ "有効にする必要があります."
-
-#~ msgid "Color Adjustment"
-#~ msgstr "色補正"
-
-#~ msgid ""
-#~ "Audacious allows you to alter the color balance of the skinned UI. The "
-#~ "sliders below will allow you to do this."
-#~ msgstr "以下のスライダを用いてスキン UI の色合いの変更ができます."
-
-#~ msgid "Blue"
-#~ msgstr "青"
-
-#~ msgid "Green"
-#~ msgstr "緑"
-
-#~ msgid "Red"
-#~ msgstr "赤"
-
-#~ msgid "_Skin"
-#~ msgstr "スキン(_S)"
-
-#~ msgid "Refresh skin list"
-#~ msgstr "スキン一覧の更新"
-
-#~ msgid "PREAMP"
-#~ msgstr "プリアンプ"
-
-#~ msgid "60HZ"
-#~ msgstr "60HZ"
-
-#~ msgid "170HZ"
-#~ msgstr "170HZ"
-
-#~ msgid "310HZ"
-#~ msgstr "310HZ"
-
-#~ msgid "600HZ"
-#~ msgstr "600HZ"
-
-#~ msgid "1KHZ"
-#~ msgstr "1KHZ"
-
-#~ msgid "3KHZ"
-#~ msgstr "3KHZ"
-
-#~ msgid "6KHZ"
-#~ msgstr "6KHZ"
-
-#~ msgid "12KHZ"
-#~ msgstr "12KHZ"
-
-#~ msgid "14KHZ"
-#~ msgstr "14KHZ"
-
-#~ msgid "16KHZ"
-#~ msgstr "16KHZ"
-
-#~ msgid "Archived Winamp 2.x skin"
-#~ msgstr "Archived Winamp 2.x スキン"
-
-#~ msgid "Unarchived Winamp 2.x skin"
-#~ msgstr "Unarchived Winamp 2.x スキン"
-
-#~ msgid "Show version and builtin features"
-#~ msgstr "ヴァージョンと組み込み機能を表示する"
-
-#~ msgid "Use custom cursors"
-#~ msgstr "カスタムカーソルを使用する"
-
-#~ msgid "Reload Plugins"
-#~ msgstr "プラグインを再読み込みする"
-
-#~ msgid ""
-#~ "Sorry, threads isn't supported on your platform.\n"
-#~ "\n"
-#~ "If you're on a libc5 based linux system and installed Glib & GTK+ before "
-#~ "you\n"
-#~ "installed LinuxThreads you need to recompile Glib & GTK+.\n"
-#~ msgstr ""
-#~ "すみませんが, お使いのシステムでは Thread をサポートしていないようです.\n"
-#~ "\n"
-#~ "libc5 ベースのシステムの場合と LinuxThreads をインストールする前に Glib "
-#~ "と GTK+ をインストールした場合は, Glib と GTK+ を再コンパイルして再インス"
-#~ "トールする必要があります.\n"
-
-#~ msgid "Error in Audacious."
-#~ msgstr "Audacious エラー"
-
-#~ msgid "Select which Audacious session ID to use"
-#~ msgstr "使用する Audacious セッションを選択する"
-
-#~ msgid "Disable 'Doublesize'"
-#~ msgstr "「ダブルサイズ」無効"
-
-#~ msgid "Enable 'Doublesize'"
-#~ msgstr "「ダブルサイズ」有効"
-
-#~ msgid "Presets"
-#~ msgstr "プリセット"
-
-#~ msgid "File preset extension:"
-#~ msgstr "プリセットの拡張子:"
-
-#~ msgid "Directory preset file:"
-#~ msgstr "ディレクトリのプリセット:"
-
-#~ msgid "localhost"
-#~ msgstr "localhost"
-
-#~ msgid ""
-#~ "<big>Unable to create %s.</big>\n"
-#~ "\n"
-#~ "Could not open glade file (%s). Please check your installation.\n"
-#~ msgstr ""
-#~ "<big>%s を作成できません.</big>\n"
-#~ "\n"
-#~ "glade ファイル (%s) を開けません. インストール手順を確認してください.\n"
-
-#~ msgid ""
-#~ "TITLE\n"
-#~ "ARTIST - TITLE\n"
-#~ "ARTIST - ALBUM - TITLE\n"
-#~ "ARTIST - ALBUM - TRACK. TITLE\n"
-#~ "ARTIST [ ALBUM ] - TRACK. TITLE\n"
-#~ "ALBUM - TITLE\n"
-#~ "Custom"
-#~ msgstr ""
-#~ "タイトル\n"
-#~ "アーティスト - タイトル\n"
-#~ "アーティスト - アルバム名 - タイトル\n"
-#~ "アーティスト - アルバム名 - トラック. タイトル\n"
-#~ "アーティスト [ アルバム名 ] - トラック. タイトル\n"
-#~ "アルバム名 - タイトル\n"
-#~ "カスタム"
-
-#~ msgid "Track Information Window"
-#~ msgstr "トラック情報ウィンドウ"
-
-#~ msgid "Preferences Window"
-#~ msgstr "設定ウィンドウ"
-
-#~ msgid "Not last.fm stream"
-#~ msgstr "last.fm ストリームではありません"
-
-#~ msgid "Artist: %s"
-#~ msgstr "アーティスト: %s"
-
-#~ msgid "Title: %s"
-#~ msgstr "タイトル: %s"
-
-#~ msgid "Album: %s"
-#~ msgstr "アルバム: %s"
-
-#~ msgid ""
-#~ "<big>Couldn't find your lastfm login data.</big>\n"
-#~ "\n"
-#~ "Check if your Scrobbler's plugin login settings are configured properly.\n"
-#~ msgstr ""
-#~ "<big>lastfm ログインデータが見つかりませんでした.</big>\n"
-#~ "\n"
-#~ "Scrobbler プラグインのログイン設定が正しくなされているか確認してくださ"
-#~ "い.\n"
-
-#~ msgid "Audacious last.fm radio tuner"
-#~ msgstr "Audacious last.fm ラジオチューナ"
-
-#~ msgid "Artist:"
-#~ msgstr "アーティスト:"
-
-#~ msgid "Album:"
-#~ msgstr "アルバム:"
-
-#~ msgid "Love"
-#~ msgstr "好き"
-
-#~ msgid "Ban"
-#~ msgstr "嫌い"
-
-#~ msgid "Skip"
-#~ msgstr "スキップ"
-
-#~ msgid "Tune in"
-#~ msgstr "ラジオをかける"
-
-#~ msgid "Neighbours' radio"
-#~ msgstr "ご近所のラジオ"
-
-#~ msgid "Personal radio"
-#~ msgstr "パーソナルラジオ"
-
-#~ msgid ""
-#~ "<big>The lastfm radio plugin could not be found.</big>\n"
-#~ "\n"
-#~ "Check if the AudioScrobbler plugin was compiled in\n"
-#~ msgstr ""
-#~ "<big>lastfm ラジオプラグインが見つかりませんでした.</big>\n"
-#~ "\n"
-#~ "AudioScrobbler プラグインがコンパイルされているか確認してください\n"
-
-#~ msgid "VOLUME: %d%%"
-#~ msgstr "音量: %d%%"
-
-#~ msgid "BALANCE: %d%% LEFT"
-#~ msgstr "バランス: %d%% (左寄り)"
-
-#~ msgid "BALANCE: CENTER"
-#~ msgstr "バランス: 中央"
-
-#~ msgid "BALANCE: %d%% RIGHT"
-#~ msgstr "バランス: %d%% (右寄り)"
-
-#~ msgid "Last.fm radio"
-#~ msgstr "Last.fm ラジオ"
-
-#~ msgid "Play Last.fm radio"
-#~ msgstr "Last.fm ラジオを演奏"
-
-#~ msgid "Converter Type:"
-#~ msgstr "コンバータタイプ:"
-
-#~ msgid ""
-#~ "SRC_SINC_BEST_QUALITY\n"
-#~ "SRC_SINC_MEDIUM_QUALITY\n"
-#~ "SRC_SINC_FASTEST\n"
-#~ "SRC_ZERO_ORDER_HOLD\n"
-#~ "SRC_LINEAR"
-#~ msgstr ""
-#~ "SRC_SINC_BEST_QUALITY\n"
-#~ "SRC_SINC_MEDIUM_QUALITY\n"
-#~ "SRC_SINC_FASTEST\n"
-#~ "SRC_ZERO_ORDER_HOLD\n"
-#~ "SRC_LINEAR"
-
-#~ msgid ""
-#~ "<big>No playable CD found.</big>\n"
-#~ "\n"
-#~ "No CD inserted, or inserted CD is not an audio CD.\n"
-#~ msgstr ""
-#~ "<big>演奏できる CD が見つかりませんでした.</big>\n"
-#~ "\n"
-#~ "CD が挿入されていないか, 挿入された CD はオーディオ CD ではありません.\n"
-
-#~ msgid "Add CD..."
-#~ msgstr "CD の追加..."
-
-#~ msgid "Adds a CD to the playlist."
-#~ msgstr "CD をプレイリストに追加します."
-
-#~ msgid "Play CD"
-#~ msgstr "CD の演奏"
-
-#~ msgid "Performer/Artist"
-#~ msgstr "演奏者/アーティスト"
-
-#~ msgid "File name"
-#~ msgstr "ファイル名"
-
-#~ msgid "File path"
-#~ msgstr "ファイルパス"
-
-#~ msgid "File extension"
-#~ msgstr "拡張子"
-
-#~ msgid "Track number"
-#~ msgstr "トラック番号"
-
-#~ msgid "%{n:...%}: Display \"...\" only if element %n is present"
-#~ msgstr ""
-#~ "%{n:...%}: トラック番号 %n が存在している場合にのみ \"...\" を表示する"
-
-#~ msgid ""
-#~ "Sorry, your GTK+ version (%d.%d.%d) does not work with Audacious.\n"
-#~ "Please use GTK+ %s or newer.\n"
-#~ msgstr ""
-#~ "すみませんが, Audacious ではお使いの GTK+ のバージョン (%d.%d.%d) をサポー"
-#~ "トしていません.\n"
-#~ "GTK+ %s またはそれ以降のバージョンをお使い下さい.\n"
-
-#~ msgid "OPTIONS MENU"
-#~ msgstr "オプションメニュー"
-
-#~ msgid "DISABLE ALWAYS ON TOP"
-#~ msgstr "\"常に最前面に配置\" は無効"
-
-#~ msgid "ENABLE ALWAYS ON TOP"
-#~ msgstr "\"常に最前面に配置\" は有効"
-
-#~ msgid "FILE INFO BOX"
-#~ msgstr "ファイル情報ボックス"
-
-#~ msgid "DISABLE DOUBLESIZE"
-#~ msgstr "ダブルサイズ無効"
-
-#~ msgid "ENABLE DOUBLESIZE"
-#~ msgstr "ダブルサイズ有効"
-
-#~ msgid "VISUALIZATION MENU"
-#~ msgstr "視覚化メニュー"
-
-#~ msgid "Track name: "
-#~ msgstr "トラック名: "
-
-#~ msgid ""
-#~ "<big>Unable to play files.</big>\n"
-#~ "\n"
-#~ "The following files could not be played. Please check that:\n"
-#~ "1. they are accessible.\n"
-#~ "2. you have enabled the media plugins required."
-#~ msgstr ""
-#~ "<big>ファイルを演奏できません.</big>\n"
-#~ "\n"
-#~ "次のファイルを演奏できませんでした. 以下をチェックして下さい:\n"
-#~ "1. アクセス可能であるか.\n"
-#~ "2. 演奏に必要なメディアのプラグインを有効にしているか."
-
-#~ msgid "Show more _details"
-#~ msgstr "詳細を表示する(_D)"
-
-#~ msgid ""
-#~ "\n"
-#~ "Received SIGSEGV\n"
-#~ "\n"
-#~ "This could be a bug in Audacious. If you don't know why this happened, "
-#~ "file a bug at http://bugs-meta.atheme.org/\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "シグナル SIGSEGV を受け取りました.\n"
-#~ "\n"
-#~ "これは Audacious のバグの可能性があります. 発生の原因が不明な場合は, "
-#~ "http://bugs-meta.atheme.org/ に報告して下さい.\n"
-#~ "\n"

audacious-3.1.1.tar.bz2/po/lt.po -> audacious-3.2.4.tar.bz2/po/lt.po Changed

@@ -1,19 +1,19 @@
 # Lithuanian translation for Audacious
-# Copyright (C) Audacious Translators
+# Copyright (C) Audacious translators
 # This file is distributed under the same license as the Audacious package.
 #
 # Translators:
 # Algimantas Margevičius <gymka@mail.ru>, 2011.
-# Algimantas Margevičius <margevicius.algimantas@gmail.com>, 2011.
+# Algimantas Margevičius <margevicius.algimantas@gmail.com>, 2011, 2012.
 # Gymka <gymka@mail.ru>, 2011.
 # Rimas Kudelis <rq@akl.lt>, 2004.
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious\n"
-"Report-Msgid-Bugs-To: http://jira.atheme.org/browse/AUD\n"
-"POT-Creation-Date: 2011-10-19 21:32-0400\n"
-"PO-Revision-Date: 2011-11-08 08:53+0000\n"
-"Last-Translator: gymka_ltu <margevicius.algimantas@gmail.com>\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2012-01-11 08:54-0500\n"
+"PO-Revision-Date: 2012-02-19 16:09+0000\n"
+"Last-Translator: Algimantas Margevičius <margevicius.algimantas@gmail.com>\n"
 "Language-Team: Lithuanian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,11 +21,11 @@
 "Language: lt\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: src/audacious/adder.c:71
+#: src/audacious/adder.c:77
 msgid "Searching ..."
 msgstr "Ieškoma ..."
 
-#: src/audacious/adder.c:97
+#: src/audacious/adder.c:113
 #, c-format
 msgid "%d file found"
 msgid_plural "%d files found"
@@ -33,700 +33,712 @@
 msgstr[1] "%d failai rasti"
 msgstr[2] "%d failų rasti"
 
-#: src/audacious/chardet.c:38
+#: src/audacious/chardet.c:39
 msgid " (invalid UTF-8)"
-msgstr " (blogas UTF-8)"
+msgstr " (netinkamas UTF-8)"
 
-#: src/audacious/credits.c:35
+#: src/audacious/credits.c:37
 msgid "Core developers:"
 msgstr "Autoriai:"
 
-#: src/audacious/credits.c:49
+#: src/audacious/credits.c:51
 msgid "Graphics:"
 msgstr "Grafika:"
 
-#: src/audacious/credits.c:54
+#: src/audacious/credits.c:56
 msgid "Default skin:"
 msgstr "Numatytoji išvaizda:"
 
-#: src/audacious/credits.c:60
+#: src/audacious/credits.c:62
 msgid "Plugin development:"
 msgstr "Įskiepių kūrėjai:"
 
-#: src/audacious/credits.c:83
+#: src/audacious/credits.c:85
 msgid "Patch authors:"
 msgstr "Pataisymų kūrėjai:"
 
-#: src/audacious/credits.c:126
+#: src/audacious/credits.c:131
 msgid "1.x developers:"
-msgstr "Kūrėjai:"
+msgstr "1.x kūrėjai:"
 
-#: src/audacious/credits.c:148
+#: src/audacious/credits.c:153
 msgid "BMP Developers:"
-msgstr "Kūrėjai:"
+msgstr "BMP kūrėjai:"
 
-#: src/audacious/credits.c:180
+#: src/audacious/credits.c:185
 msgid "Belarusian:"
 msgstr "Į baltarusių k.:"
 
-#: src/audacious/credits.c:183
+#: src/audacious/credits.c:188
 msgid "Basque:"
 msgstr "Į Baskų k.:"
 
-#: src/audacious/credits.c:186
+#: src/audacious/credits.c:191
 msgid "Brazilian Portuguese:"
 msgstr "Į brazilų k. (portugalų dialektą):"
 
-#: src/audacious/credits.c:191
+#: src/audacious/credits.c:196
 msgid "Breton:"
 msgstr "Į bretonų k.:"
 
-#: src/audacious/credits.c:194
+#: src/audacious/credits.c:199
 msgid "Bulgarian:"
 msgstr "Į bulgarų k.:"
 
-#: src/audacious/credits.c:197
+#: src/audacious/credits.c:202
 msgid "Catalan:"
 msgstr "Į katalonų k.:"
 
-#: src/audacious/credits.c:200
+#: src/audacious/credits.c:206
 msgid "Chinese:"
 msgstr "Į kinų k.:"
 
-#: src/audacious/credits.c:203
+#: src/audacious/credits.c:209
 msgid "Croatian:"
 msgstr "Į kroatų k.:"
 
-#: src/audacious/credits.c:206
+#: src/audacious/credits.c:212
 msgid "Czech:"
 msgstr "Į čekų k.:"
 
-#: src/audacious/credits.c:209
+#: src/audacious/credits.c:215
 msgid "Dutch:"
 msgstr "Į olandų k.:"
 
-#: src/audacious/credits.c:213
+#: src/audacious/credits.c:219
 msgid "Estonian:"
 msgstr "Į estų k.:"
 
-#: src/audacious/credits.c:216
+#: src/audacious/credits.c:222
 msgid "Finnish:"
 msgstr "Į suomių k.:"
 
-#: src/audacious/credits.c:221
+#: src/audacious/credits.c:227
 msgid "French:"
 msgstr "Į prancūzų k.:"
 
-#: src/audacious/credits.c:227
+#: src/audacious/credits.c:233
 msgid "German:"
 msgstr "Į vokiečių k.:"
 
-#: src/audacious/credits.c:234
+#: src/audacious/credits.c:240
 msgid "Georgian:"
 msgstr "Į vokiečių k.:"
 
-#: src/audacious/credits.c:237
+#: src/audacious/credits.c:243
 msgid "Greek:"
 msgstr "Į graikų k.:"
 
-#: src/audacious/credits.c:242
+#: src/audacious/credits.c:248
 msgid "Hindi:"
-msgstr "Į hindi"
+msgstr "Į hindi k.:"
 
-#: src/audacious/credits.c:245
+#: src/audacious/credits.c:251
 msgid "Hungarian:"
 msgstr "Į vengrų k.:"
 
-#: src/audacious/credits.c:249
+#: src/audacious/credits.c:255
 msgid "Italian:"
 msgstr "Į italų k.:"
 
-#: src/audacious/credits.c:253
+#: src/audacious/credits.c:260
 msgid "Japanese:"
 msgstr "Į japonų k.:"
 
-#: src/audacious/credits.c:256
+#: src/audacious/credits.c:263
 msgid "Korean:"
 msgstr "Į korėjiečių k.:"
 
-#: src/audacious/credits.c:259
+#: src/audacious/credits.c:266
 msgid "Latvian:"
 msgstr "Į latvių k.:"
 
-#: src/audacious/credits.c:262
+#: src/audacious/credits.c:269
 msgid "Lithuanian:"
 msgstr "Į lietuvių k.:"
 
-#: src/audacious/credits.c:267
+#: src/audacious/credits.c:274
 msgid "Macedonian:"
 msgstr "Į makedonų k.:"
 
-#: src/audacious/credits.c:270
+#: src/audacious/credits.c:277
+msgid "Mexican Spanish:"
+msgstr "Į Ispanų (Meksika) k.:"
+
+#: src/audacious/credits.c:280
 msgid "Polish:"
 msgstr "Į lenkų k.:"
 
-#: src/audacious/credits.c:276
+#: src/audacious/credits.c:287
 msgid "Portuguese:"
 msgstr "Į portugalų k.:"
 
-#: src/audacious/credits.c:279
+#: src/audacious/credits.c:290
 msgid "Romanian:"
 msgstr "Į rumunų k.:"
 
-#: src/audacious/credits.c:283
+#: src/audacious/credits.c:294
 msgid "Russian:"
 msgstr "Į rusų k.:"
 
-#: src/audacious/credits.c:287
+#: src/audacious/credits.c:298
 msgid "Serbian (Latin):"
 msgstr "Į serbų (lotynų) k."
 
-#: src/audacious/credits.c:290
+#: src/audacious/credits.c:301
 msgid "Serbian (Cyrillic):"
 msgstr "Į serbų (Kirilica) k.:"
 
-#: src/audacious/credits.c:293
+#: src/audacious/credits.c:305
 msgid "Simplified Chinese:"
-msgstr "Supaprastinta kinų k."
+msgstr "Į Supaprastinta kinų k."
 
-#: src/audacious/credits.c:296
+#: src/audacious/credits.c:308
 msgid "Slovak:"
 msgstr "Į slovakų k.:"
 
-#: src/audacious/credits.c:299
+#: src/audacious/credits.c:312
 msgid "Spanish:"
 msgstr "Į ispanų k.:"
 
-#: src/audacious/credits.c:306
+#: src/audacious/credits.c:320
 msgid "Swedish:"
 msgstr "Į švedų k.:"
 
-#: src/audacious/credits.c:309
+#: src/audacious/credits.c:323
 msgid "Traditional Chinese:"
-msgstr "Tradicinė kinų:"
+msgstr "Į Tradicinę kinų k.:"
 
-#: src/audacious/credits.c:315
+#: src/audacious/credits.c:329
 msgid "Turkish:"
-msgstr "Turkų:"
+msgstr "Į Turkų k.:"
 
-#: src/audacious/credits.c:319
+#: src/audacious/credits.c:333
 msgid "Ukrainian:"
 msgstr "Į ukrainiečių k.:"
 
-#: src/audacious/credits.c:323
+#: src/audacious/credits.c:338
 msgid "Vietnamese:"
-msgstr "Vietnamiečių:"
+msgstr "Į Vietnamiečių k.:"
 
-#: src/audacious/credits.c:326
+#: src/audacious/credits.c:341
 msgid "Welsh:"
 msgstr "Į velsiečių k.:"
 
-#: src/audacious/drct.c:234
-msgid "Temporary Playlist"
-msgstr "Laikinas grojaraštis"
-
-#: src/audacious/equalizer_preset.c:186
+#: src/audacious/equalizer_preset.c:180
 #, c-format
 msgid "Error importing Winamp EQF file '%s'"
 msgstr "Klaida įkeliant Winamp EQF failą „%s“"
 
-#: src/audacious/main.c:239
+#: src/audacious/main.c:243
 msgid "Skip backwards in playlist"
-msgstr "Šoktelti atgal grojaraštyje"
+msgstr "Grojaraštyje eiti atgal"
 
-#: src/audacious/main.c:240
+#: src/audacious/main.c:244
 msgid "Start playing current playlist"
 msgstr "Pradėti groti dabartinį grojaraštį"
 
-#: src/audacious/main.c:241
+#: src/audacious/main.c:245
 msgid "Pause current song"
 msgstr "Pristabdyti grojamą dainą"
 
-#: src/audacious/main.c:242
+#: src/audacious/main.c:246
 msgid "Stop current song"
 msgstr "Sustabdyti grojamą dainą"
 
-#: src/audacious/main.c:243
+#: src/audacious/main.c:247
 msgid "Pause if playing, play otherwise"
 msgstr "Pristabdyti, jei grojama, kitu atveju groti"
 
-#: src/audacious/main.c:244
+#: src/audacious/main.c:248
 msgid "Skip forward in playlist"
-msgstr "Šoktelti pirmyn grojaraštyje"
+msgstr "Grojaraštyje eiti pirmyn"
 
-#: src/audacious/main.c:245
+#: src/audacious/main.c:249
 msgid "Display Jump to File dialog"
 msgstr "Rodyti šokti į bylą langą"
 
-#: src/audacious/main.c:246
+#: src/audacious/main.c:250
 msgid "Add files to the playlist"
 msgstr "Pridėti failus į grojaraštį"
 
-#: src/audacious/main.c:247
+#: src/audacious/main.c:251
 msgid "Add new files to a temporary playlist"
 msgstr "Pridėti naujus failus į laikiną grojaraštį"
 
-#: src/audacious/main.c:248
+#: src/audacious/main.c:252
 msgid "Display the main window"
 msgstr "Parodyti pagrindinį langą"
 
-#: src/audacious/main.c:249
+#: src/audacious/main.c:253
 msgid "Show version"
 msgstr "Rodyti versiją"
 
-#: src/audacious/main.c:250
+#: src/audacious/main.c:254
 msgid "Print debugging messages"
 msgstr "Rodyti derinimo pranešimus"
 
-#: src/audacious/main.c:251
+#: src/audacious/main.c:255
 msgid "Headless mode (beta)"
 msgstr "Begalvis režimas (beta)"
 
-#: src/audacious/main.c:252
+#: src/audacious/main.c:256
 msgid "FILE..."
 msgstr "FAILAS..."
 
-#: src/audacious/main.c:264
+#: src/audacious/main.c:268
 msgid "- play multimedia files"
 msgstr "- groti daugialypės terpės failus"
 
-#: src/audacious/main.c:274
+#: src/audacious/main.c:278
 #, c-format
 msgid ""
 "%s: %s\n"
 "Try `%s --help' for more information.\n"
-msgstr ""
-"%s: %s\n"
-"Bandykite `%s --help' išsamesniai informacijai.\n"
+msgstr "%s: %s\nBandykite „%s --help“ išsamesniai informacijai.\n"
 
-#: src/audacious/main.c:547
+#: src/audacious/main.c:573
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/audacious/playback.c:303
+#: src/audacious/playback.c:307
 #, c-format
 msgid "No decoder found for %s."
 msgstr "Failui %s dekoderis nerastas."
 
-#: src/audacious/playlist-new.c:315
-msgid "Untitled Playlist"
-msgstr "Nepavadintas grojaraštis"
+#: src/audacious/playlist-files.c:53
+#, c-format
+msgid "Cannot %s %s: unsupported file extension."
+msgstr "Neįmanoma %s %s: nepalaikomas failo plėtinys."
+
+#: src/audacious/playlist-files.c:54
+msgid "save"
+msgstr "išsaugoti"
+
+#: src/audacious/playlist-files.c:54
+msgid "load"
+msgstr "įkelti"
 
-#: src/audacious/playlist-new.c:1496
+#: src/audacious/playlist-new.c:131
+msgid "New Playlist"
+msgstr "Naujas grojaraštis"
+
+#: src/audacious/playlist-new.c:132
+msgid "Now Playing"
+msgstr "Dabar grojama"
+
+#: src/audacious/playlist-new.c:1630
 msgid ""
 "The playlist cannot be sorted because metadata scanning is still in progress"
 " (or has been disabled)."
-msgstr ""
-"Vis dar vyksta(arba išjungta) meta duomenų skaitymas, todėl neįmanoma "
-"surikiuoti grojaraščio."
+msgstr "Vis dar vyksta(arba išjungta) meta duomenų skaitymas, todėl neįmanoma surikiuoti grojaraščio."
 
-#: src/audacious/ui_preferences.c:88
+#: src/audacious/ui_preferences.c:85
 msgid "Audio"
 msgstr "Garsas"
 
-#: src/audacious/ui_preferences.c:89
+#: src/audacious/ui_preferences.c:86
 msgid "Network"
 msgstr "Tinklas"
 
-#: src/audacious/ui_preferences.c:90 src/audacious/ui_preferences.c:1634
+#: src/audacious/ui_preferences.c:87 src/audacious/ui_preferences.c:1603
 msgid "Playlist"
 msgstr "Grojaraštis"
 
-#: src/audacious/ui_preferences.c:91
+#: src/audacious/ui_preferences.c:88
 msgid "Plugins"
 msgstr "Įskiepiai"
 
-#: src/audacious/ui_preferences.c:97 src/libaudgui/infopopup.c:203
+#: src/audacious/ui_preferences.c:94 src/libaudgui/infopopup.c:199
 msgid "Artist"
 msgstr "Atlikėjas"
 
-#: src/audacious/ui_preferences.c:98 src/libaudgui/infopopup.c:205
+#: src/audacious/ui_preferences.c:95 src/libaudgui/infopopup.c:201
 msgid "Album"
 msgstr "Albumas"
 
-#: src/audacious/ui_preferences.c:99 src/libaudgui/infopopup.c:201
-#: src/libaudgui/ui_playlist_manager.c:276
+#: src/audacious/ui_preferences.c:96 src/libaudgui/infopopup.c:197
+#: src/libaudgui/ui_playlist_manager.c:279
 msgid "Title"
 msgstr "Pavadinimas"
 
-#: src/audacious/ui_preferences.c:100
+#: src/audacious/ui_preferences.c:97
 msgid "Tracknumber"
 msgstr "Takelio numeris"
 
-#: src/audacious/ui_preferences.c:101 src/libaudgui/infopopup.c:207
+#: src/audacious/ui_preferences.c:98 src/libaudgui/infopopup.c:203
 msgid "Genre"
 msgstr "Žanras"
 
-#: src/audacious/ui_preferences.c:102
+#: src/audacious/ui_preferences.c:99
 msgid "Filename"
-msgstr "Bylos vardas"
+msgstr "Failo vardas"
 
-#: src/audacious/ui_preferences.c:103
+#: src/audacious/ui_preferences.c:100
 msgid "Filepath"
-msgstr "Bylos kelias"
+msgstr "Failo kelias"
 
-#: src/audacious/ui_preferences.c:104
+#: src/audacious/ui_preferences.c:101
 msgid "Date"
 msgstr "Data"
 
-#: src/audacious/ui_preferences.c:105 src/libaudgui/infopopup.c:209
+#: src/audacious/ui_preferences.c:102 src/libaudgui/infopopup.c:205
 msgid "Year"
 msgstr "Metai"
 
-#: src/audacious/ui_preferences.c:106
+#: src/audacious/ui_preferences.c:103
 msgid "Comment"
 msgstr "Komentaras"
 
-#: src/audacious/ui_preferences.c:107
+#: src/audacious/ui_preferences.c:104
 msgid "Codec"
 msgstr "Kodekas"
 
-#: src/audacious/ui_preferences.c:108
+#: src/audacious/ui_preferences.c:105
 msgid "Quality"
 msgstr "Kokybė"
 
-#: src/audacious/ui_preferences.c:114
+#: src/audacious/ui_preferences.c:111
 msgid "None"
 msgstr "Joks"
 
-#: src/audacious/ui_preferences.c:115
+#: src/audacious/ui_preferences.c:112
 msgid "Arabic"
 msgstr "Arabų"
 
-#: src/audacious/ui_preferences.c:116
+#: src/audacious/ui_preferences.c:113
 msgid "Baltic"
 msgstr "Baltijos"
 
-#: src/audacious/ui_preferences.c:117
+#: src/audacious/ui_preferences.c:114
 msgid "Chinese"
 msgstr "Kinų"
 
-#: src/audacious/ui_preferences.c:118
+#: src/audacious/ui_preferences.c:115
 msgid "Greek"
 msgstr "Graikų"
 
-#: src/audacious/ui_preferences.c:119
+#: src/audacious/ui_preferences.c:116
 msgid "Hebrew"
 msgstr "Hebrajų"
 
-#: src/audacious/ui_preferences.c:120
+#: src/audacious/ui_preferences.c:117
 msgid "Japanese"
 msgstr "Japonų"
 
-#: src/audacious/ui_preferences.c:121
+#: src/audacious/ui_preferences.c:118
 msgid "Korean"
 msgstr "Korėjiečių"
 
-#: src/audacious/ui_preferences.c:122
+#: src/audacious/ui_preferences.c:119
 msgid "Polish"
 msgstr "Lenkų"
 
-#: src/audacious/ui_preferences.c:123
+#: src/audacious/ui_preferences.c:120
 msgid "Russian"
 msgstr "Rusų"
 
-#: src/audacious/ui_preferences.c:124
+#: src/audacious/ui_preferences.c:121
 msgid "Taiwanese"
 msgstr "Taivaniečių"
 
-#: src/audacious/ui_preferences.c:125
+#: src/audacious/ui_preferences.c:122
 msgid "Turkish"
 msgstr "Turkų"
 
-#: src/audacious/ui_preferences.c:147
+#: src/audacious/ui_preferences.c:144
 msgid "Album mode"
 msgstr "Albumo režimas"
 
-#: src/audacious/ui_preferences.c:150
+#: src/audacious/ui_preferences.c:147
 msgid "Output Settings"
 msgstr "Išvesties nustatymai"
 
-#: src/audacious/ui_preferences.c:152
+#: src/audacious/ui_preferences.c:149
 msgid "Bit depth:"
 msgstr "Nominalus bitų sekos greitis:"
 
-#: src/audacious/ui_preferences.c:155
+#: src/audacious/ui_preferences.c:152
 msgid "Buffer size:"
 msgstr "Buferio dydis (kb):"
 
-#: src/audacious/ui_preferences.c:157
+#: src/audacious/ui_preferences.c:154
 msgid "ms"
 msgstr "ms"
 
-#: src/audacious/ui_preferences.c:158
+#: src/audacious/ui_preferences.c:155
 msgid "Use software volume control (not recommended)"
 msgstr "Naudoti programinį garso valdymą (nerekomenduojama)"
 
-#: src/audacious/ui_preferences.c:160
+#: src/audacious/ui_preferences.c:157
 msgid "Replay Gain"
 msgstr "Garso lygio sulyginimas"
 
-#: src/audacious/ui_preferences.c:161
+#: src/audacious/ui_preferences.c:158
 msgid "Enable Replay Gain"
 msgstr "Įjungt garso lygio sulyginimą"
 
-#: src/audacious/ui_preferences.c:164
+#: src/audacious/ui_preferences.c:161
 msgid "Prevent clipping (recommended)"
 msgstr "Uždrausti apkarpymą (rekomenduojama)"
 
-#: src/audacious/ui_preferences.c:166
+#: src/audacious/ui_preferences.c:163
 msgid "Adjust Levels"
 msgstr "Nustatyti lygius"
 
-#: src/audacious/ui_preferences.c:167
+#: src/audacious/ui_preferences.c:164
 msgid "Amplify all files:"
 msgstr "Pagarsinti visus failus:"
 
-#: src/audacious/ui_preferences.c:169 src/audacious/ui_preferences.c:172
+#: src/audacious/ui_preferences.c:166 src/audacious/ui_preferences.c:169
 msgid "dB"
 msgstr "dB"
 
-#: src/audacious/ui_preferences.c:170
+#: src/audacious/ui_preferences.c:167
 msgid "Amplify untagged files:"
-msgstr "Pagarsinti nepažymėtus failus:"
+msgstr "Pagarsinti failus be žymių:"
 
-#: src/audacious/ui_preferences.c:175
+#: src/audacious/ui_preferences.c:172
 msgid "Proxy hostname:"
 msgstr "Tarpinis serveris:"
 
-#: src/audacious/ui_preferences.c:176
+#: src/audacious/ui_preferences.c:173
 msgid "Proxy port:"
 msgstr "Tarpinio serverio prievadas:"
 
-#: src/audacious/ui_preferences.c:179
+#: src/audacious/ui_preferences.c:176
 msgid "Proxy username:"
-msgstr "Naudotojas:"
+msgstr "Tarpinio serverio naudotojas:"
 
-#: src/audacious/ui_preferences.c:180
+#: src/audacious/ui_preferences.c:177
 msgid "Proxy password:"
-msgstr "Slaptažodis:"
+msgstr "Tarpinio serverio slaptažodis:"
 
-#: src/audacious/ui_preferences.c:184
+#: src/audacious/ui_preferences.c:181
 msgid "Proxy Configuration"
 msgstr "Tarpinio serverio nustatymai"
 
-#: src/audacious/ui_preferences.c:185
+#: src/audacious/ui_preferences.c:182
 msgid "Enable proxy usage"
 msgstr "Leisti naudoti tarpinį serverį"
 
-#: src/audacious/ui_preferences.c:188
+#: src/audacious/ui_preferences.c:185
 msgid "Use authentication with proxy"
 msgstr "Su tarpiniu serveriu naudoti tapatybės nustatymą"
 
-#: src/audacious/ui_preferences.c:196
+#: src/audacious/ui_preferences.c:193
 msgid "Auto character encoding detector for:"
 msgstr "Automatinis koduotės nustatymas:"
 
-#: src/audacious/ui_preferences.c:201
+#: src/audacious/ui_preferences.c:198
 msgid "Fallback character encodings:"
 msgstr "Atsarginis kodavimas:"
 
-#: src/audacious/ui_preferences.c:205
+#: src/audacious/ui_preferences.c:202
 msgid "Behavior"
 msgstr "Elgsena"
 
-#: src/audacious/ui_preferences.c:206
+#: src/audacious/ui_preferences.c:203
 msgid "Continue playback on startup"
 msgstr "Paleidžiant tęsti atkūrimą"
 
-#: src/audacious/ui_preferences.c:208
+#: src/audacious/ui_preferences.c:205
 msgid "Advance when the current song is deleted"
 msgstr "Kai pasirinkta daina ištrinama, žengti į priekį"
 
-#: src/audacious/ui_preferences.c:210
+#: src/audacious/ui_preferences.c:207
 msgid "Clear the playlist when opening files"
-msgstr "Kai atidaromas failas, išvalyti grojaraštį"
+msgstr "Kai atveriamas failas, išvalyti grojaraštį"
 
-#: src/audacious/ui_preferences.c:212
+#: src/audacious/ui_preferences.c:209
 msgid "Open files in a temporary playlist"
-msgstr "Atidaryti failus laikiname grojaraštyje"
+msgstr "Atverti failus laikiname grojaraštyje"
 
-#: src/audacious/ui_preferences.c:214
+#: src/audacious/ui_preferences.c:211
 msgid "Metadata"
 msgstr "Meta duomenys"
 
-#: src/audacious/ui_preferences.c:215
+#: src/audacious/ui_preferences.c:212
 msgid "Do not load metadata for songs until played"
 msgstr "Kol negrojama, dainom neįkrauti meta duomenų"
 
-#: src/audacious/ui_preferences.c:233
+#: src/audacious/ui_preferences.c:230
 msgid "TITLE"
 msgstr "PAVADINIMAS"
 
-#: src/audacious/ui_preferences.c:234
+#: src/audacious/ui_preferences.c:231
 msgid "ARTIST - TITLE"
 msgstr "ATLIKĖJAS - PAVADINIMAS"
 
-#: src/audacious/ui_preferences.c:235
+#: src/audacious/ui_preferences.c:232
 msgid "ARTIST - ALBUM - TITLE"
 msgstr "ATLIKĖJAS - ALBUMAS - PAVADINIMAS"
 
-#: src/audacious/ui_preferences.c:236
+#: src/audacious/ui_preferences.c:233
 msgid "ARTIST - ALBUM - TRACK. TITLE"
 msgstr "ATLIKĖJAS - ALBUMAS - TAKELIS. PAVADINIMAS"
 
-#: src/audacious/ui_preferences.c:237
+#: src/audacious/ui_preferences.c:234
 msgid "ARTIST [ ALBUM ] - TRACK. TITLE"
 msgstr "ATLIKĖJAS [ ALBUMAS ] - TAKELIS. PAVADINIMAS"
 
-#: src/audacious/ui_preferences.c:238
+#: src/audacious/ui_preferences.c:235
 msgid "ALBUM - TITLE"
 msgstr "ALBUMAS - PAVADINIMAS"
 
-#: src/audacious/ui_preferences.c:577
+#: src/audacious/ui_preferences.c:556
 msgid "Category"
 msgstr "Kategorija"
 
-#: src/audacious/ui_preferences.c:801
+#: src/audacious/ui_preferences.c:780
 msgid "Popup Information Settings"
 msgstr "Iššokančio informacijos lango nustatymai"
 
-#: src/audacious/ui_preferences.c:810
+#: src/audacious/ui_preferences.c:789
 msgid "Cover image retrieve"
 msgstr "Albumo viršelio gavimas"
 
-#: src/audacious/ui_preferences.c:815
+#: src/audacious/ui_preferences.c:794
 msgid ""
 "While searching for the album's cover, Audacious looks for certain words in "
 "the filename. You can specify those words in the lists below, separated "
 "using commas."
-msgstr ""
-"Kai ieškoma albumo viršelio, Audacious ieško tam tikrų žodžių failo varde. "
-"Tu gali įrašyt paieškos žodžius apačioj esančiame langelyje, atskiriant "
-"kableliais."
+msgstr "Kai ieškoma albumo viršelio, Audacious ieško tam tikrų žodžių failo varde. Tu gali įrašyt paieškos žodžius apačioje esančiame langelyje, atskiriant kableliais."
 
-#: src/audacious/ui_preferences.c:832
+#: src/audacious/ui_preferences.c:811
 msgid "Exclude:"
 msgstr "Išimtis:"
 
-#: src/audacious/ui_preferences.c:839
+#: src/audacious/ui_preferences.c:818
 msgid "Include:"
 msgstr "Įterpti:"
 
-#: src/audacious/ui_preferences.c:856
+#: src/audacious/ui_preferences.c:835
 msgid "Recursively search for cover"
 msgstr "Rekursyviai ieškoti viršelio"
 
-#: src/audacious/ui_preferences.c:866
+#: src/audacious/ui_preferences.c:845
 msgid "Search depth: "
 msgstr "Paieškos gylis:"
 
-#: src/audacious/ui_preferences.c:880
+#: src/audacious/ui_preferences.c:859
 msgid "Use per-file cover"
 msgstr "Kiekvienam failui atskiras viršelis"
 
-#: src/audacious/ui_preferences.c:883
+#: src/audacious/ui_preferences.c:862
 msgid "Miscellaneous"
 msgstr "Kita"
 
-#: src/audacious/ui_preferences.c:892
+#: src/audacious/ui_preferences.c:871
 msgid "Show Progress bar for the current track"
 msgstr "Esamam takeliui, rodyti pažangos juostą"
 
-#: src/audacious/ui_preferences.c:902
+#: src/audacious/ui_preferences.c:881
 msgid "Delay until filepopup comes up: "
 msgstr "Palaukti kol pasirodys failo iššokantis langas: "
 
-#: src/audacious/ui_preferences.c:1340
+#: src/audacious/ui_preferences.c:1309
 msgid "Custom"
 msgstr "Pasirinkta eilutė"
 
-#: src/audacious/ui_preferences.c:1383
+#: src/audacious/ui_preferences.c:1352
 msgid "Song Display"
 msgstr "Kūrinio pavadinimo vaizdavimas"
 
-#: src/audacious/ui_preferences.c:1392
+#: src/audacious/ui_preferences.c:1361
 msgid "Show song numbers"
 msgstr "Rodyti dainos numerį"
 
-#: src/audacious/ui_preferences.c:1403
+#: src/audacious/ui_preferences.c:1372
 msgid "Show leading zeroes (02:00 instead of 2:00)"
 msgstr "Rodyti nulius priekyje (02:00 vietoj 2:00)"
 
-#: src/audacious/ui_preferences.c:1425
+#: src/audacious/ui_preferences.c:1394
 msgid "Show information about titlestring format"
 msgstr "Parodyti informaciją apie pavadinimo formatą"
 
-#: src/audacious/ui_preferences.c:1441
+#: src/audacious/ui_preferences.c:1410
 msgid "Custom string:"
 msgstr "Pasirinkta eilutė:"
 
-#: src/audacious/ui_preferences.c:1448
+#: src/audacious/ui_preferences.c:1417
 msgid "Title format:"
 msgstr "Pavadinimo formatas:"
 
-#: src/audacious/ui_preferences.c:1459
+#: src/audacious/ui_preferences.c:1428
 msgid "Popup Information"
 msgstr "Iššokančio lango informacija"
 
-#: src/audacious/ui_preferences.c:1474
+#: src/audacious/ui_preferences.c:1443
 msgid "Show popup information for playlist entries"
 msgstr "Grojaraščio elementams, rodyti iššokantį langą"
 
-#: src/audacious/ui_preferences.c:1475
+#: src/audacious/ui_preferences.c:1444
 msgid ""
 "Toggles popup information window for the pointed entry in the playlist. The "
 "window shows title of song, name of album, genre, year of publish, track "
 "number, track length, and artwork."
-msgstr ""
-"Nurodytam grojaraščio elementui, įjungia iššokančio lango informacinį langą."
-" Lange rodomas dainos pavadinimas, albumo pavadinimas, žanras, išleidimo "
-"data, takelio numeris, takelio trukmė bei dizainas."
+msgstr "Nurodytam grojaraščio elementui, įjungia iššokančio lango informacinį langą. Lange rodomas dainos pavadinimas, albumo pavadinimas, žanras, išleidimo data, takelio numeris, takelio trukmė bei dizainas."
 
-#: src/audacious/ui_preferences.c:1486
+#: src/audacious/ui_preferences.c:1455
 msgid "Edit settings for popup information"
 msgstr "Keisti iššokančio lango nustatymus"
 
-#: src/audacious/ui_preferences.c:1575
+#: src/audacious/ui_preferences.c:1544
 msgid "Output plugin:"
 msgstr "Išvesties įskiepis:"
 
-#: src/audacious/ui_preferences.c:1634
+#: src/audacious/ui_preferences.c:1603
 msgid "Transport"
 msgstr "Transportas"
 
-#: src/audacious/ui_preferences.c:1634
+#: src/audacious/ui_preferences.c:1603
 msgid "Input"
 msgstr "Įvestis"
 
-#: src/audacious/ui_preferences.c:1635
+#: src/audacious/ui_preferences.c:1604
 msgid "Effect"
 msgstr "Efektai"
 
-#: src/audacious/ui_preferences.c:1635
+#: src/audacious/ui_preferences.c:1604
 msgid "Visualization"
 msgstr "Vizualizacija"
 
-#: src/audacious/ui_preferences.c:1635
+#: src/audacious/ui_preferences.c:1604
 msgid "General"
 msgstr "Pagrindiniai"
 
-#: src/audacious/ui_preferences.c:1675
+#: src/audacious/ui_preferences.c:1644
 msgid "Audacious Preferences"
 msgstr "Audacious nustatymai"
 
-#: src/audacious/util.c:123
+#: src/audacious/util.c:120
 #, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr "Nepavyko sukurti aplanko (%s): %s\n"
 
-#: src/audtool/handlers_playlist.c:274
+#: src/audtool/handlers_playlist.c:273
 msgid "Position not found."
 msgstr "Pozicija nerasta."
 
-#: src/audtool/handlers_vitals.c:64
+#: src/audtool/handlers_vitals.c:63
 msgid "No song playing."
 msgstr "Negroja jokia daina."
 
-#: src/libaudcore/tuple.c:685
+#: src/libaudcore/audstrings.c:199
+#, c-format
+msgid "Audio CD, track %s"
+msgstr "Audio CD, takelis %s"
+
+#: src/libaudcore/tuple.c:536
 msgid "Mono"
 msgstr "Mono"
 
-#: src/libaudcore/tuple.c:687
+#: src/libaudcore/tuple.c:538
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/libaudcore/tuple.c:689
+#: src/libaudcore/tuple.c:540
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
@@ -734,354 +746,352 @@
 msgstr[1] "%d kanalai"
 msgstr[2] "%d kanalų"
 
-#: src/libaudgui/confirm.c:78
+#: src/libaudgui/about.c:52 src/libaudgui/about.c:115
+msgid "Credits"
+msgstr "Padėkos"
+
+#: src/libaudgui/about.c:52
+msgid "Translators"
+msgstr "Vertėjai"
+
+#: src/libaudgui/about.c:91
+msgid "About Audacious"
+msgstr "Apie Audacious"
+
+#: src/libaudgui/confirm.c:76
 #, c-format
 msgid ""
 "Are you sure you want to close %s? If you do, any changes made since the "
 "playlist was exported will be lost."
-msgstr ""
-"Ar tu tikrai nori uždaryti %s? Jei taip, visi pakeitimai padaryti po "
-"grojaraščio eksportavimo bus prarasti."
+msgstr "Ar tu tikrai nori uždaryti %s? Jei taip, visi pakeitimai padaryti po grojaraščio eksportavimo bus prarasti."
 
-#: src/libaudgui/confirm.c:91
+#: src/libaudgui/confirm.c:89
 msgid "_Don't show this message again"
 msgstr "_Daugiau neberodyti šio pranešimo"
 
-#: src/libaudgui/confirm.c:128
+#: src/libaudgui/confirm.c:126
 msgid "Rename Playlist"
 msgstr "Pervadinti grojaraštį"
 
-#: src/libaudgui/effects-menu.c:76
+#: src/libaudgui/effects-menu.c:74
 msgid "settings ..."
 msgstr "nustatymai ..."
 
-#: src/libaudgui/equalizer.c:52
+#: src/libaudgui/equalizer.c:51
 msgid "_Enable"
 msgstr "_Įjungtas"
 
-#: src/libaudgui/equalizer.c:124
+#: src/libaudgui/equalizer.c:123
 msgid "31 Hz"
 msgstr "31 Hz"
 
-#: src/libaudgui/equalizer.c:124
+#: src/libaudgui/equalizer.c:123
 msgid "63 Hz"
 msgstr "63 Hz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "125 Hz"
 msgstr "125 Hz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "250 Hz"
 msgstr "250 Hz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "500 Hz"
 msgstr "500 Hz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "1 kHz"
 msgstr "1 kHz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "2 kHz"
 msgstr "2 kHz"
 
-#: src/libaudgui/equalizer.c:126
+#: src/libaudgui/equalizer.c:125
 msgid "4 kHz"
 msgstr "4 kHz"
 
-#: src/libaudgui/equalizer.c:126
+#: src/libaudgui/equalizer.c:125
 msgid "8 kHz"
 msgstr "8 kHz"
 
-#: src/libaudgui/equalizer.c:126
+#: src/libaudgui/equalizer.c:125
 msgid "16 kHz"
 msgstr "16 kHz"
 
-#: src/libaudgui/equalizer.c:131
+#: src/libaudgui/equalizer.c:130
 msgid "Equalizer"
 msgstr "Ekvalaizeris"
 
-#: src/libaudgui/equalizer.c:147
+#: src/libaudgui/equalizer.c:146
 msgid "Preamp"
 msgstr "Preamp"
 
-#: src/libaudgui/infopopup.c:211
+#: src/libaudgui/infopopup.c:207
 msgid "Track Number"
 msgstr "Takelio numeris"
 
-#: src/libaudgui/infopopup.c:213
+#: src/libaudgui/infopopup.c:209
 msgid "Track Length"
 msgstr "Takelio trukmė"
 
-#: src/libaudgui/infowin.c:77
+#: src/libaudgui/infowin.c:75
 msgid "Acid Jazz"
 msgstr "Acid Jazz"
 
-#: src/libaudgui/infowin.c:78
+#: src/libaudgui/infowin.c:76
 msgid "Acid Rock"
 msgstr "Acid Rock"
 
-#: src/libaudgui/infowin.c:79
+#: src/libaudgui/infowin.c:77
 msgid "Ambient"
 msgstr "Ambient"
 
-#: src/libaudgui/infowin.c:80
+#: src/libaudgui/infowin.c:78
 msgid "Bebop"
 msgstr "Bebob"
 
-#: src/libaudgui/infowin.c:81
+#: src/libaudgui/infowin.c:79
 msgid "Bluegrass"
 msgstr "Bluegrass"
 
-#: src/libaudgui/infowin.c:82
+#: src/libaudgui/infowin.c:80
 msgid "Blues"
 msgstr "Blues"
 
-#: src/libaudgui/infowin.c:83
+#: src/libaudgui/infowin.c:81
 msgid "Chamber Music"
 msgstr "Chamber Music"
 
-#: src/libaudgui/infowin.c:84
+#: src/libaudgui/infowin.c:82
 msgid "Classical"
 msgstr "Classical"
 
-#: src/libaudgui/infowin.c:85
+#: src/libaudgui/infowin.c:83
 msgid "Country"
 msgstr "Country"
 
-#: src/libaudgui/infowin.c:86
+#: src/libaudgui/infowin.c:84
 msgid "Death Metal"
 msgstr "Death Metal"
 
-#: src/libaudgui/infowin.c:87
+#: src/libaudgui/infowin.c:85
 msgid "Disco"
 msgstr "Disco"
 
-#: src/libaudgui/infowin.c:88
+#: src/libaudgui/infowin.c:86
 msgid "Easy Listening"
 msgstr "Easy Listening"
 
-#: src/libaudgui/infowin.c:89
+#: src/libaudgui/infowin.c:87
 msgid "Folk"
 msgstr "Folk"
 
-#: src/libaudgui/infowin.c:90
+#: src/libaudgui/infowin.c:88
 msgid "Funk"
 msgstr "Funk"
 
-#: src/libaudgui/infowin.c:91
+#: src/libaudgui/infowin.c:89
 msgid "Gangsta Rap"
 msgstr "Gangsta Rap"
 
-#: src/libaudgui/infowin.c:92
+#: src/libaudgui/infowin.c:90
 msgid "Gospel"
 msgstr "Gospel"
 
-#: src/libaudgui/infowin.c:93
+#: src/libaudgui/infowin.c:91
 msgid "Grunge"
 msgstr "Grunge"
 
-#: src/libaudgui/infowin.c:94
+#: src/libaudgui/infowin.c:92
 msgid "Hard Rock"
 msgstr "Hard Rock"
 
-#: src/libaudgui/infowin.c:95
+#: src/libaudgui/infowin.c:93
 msgid "Heavy Metal"
 msgstr "Heavy Metal"
 
-#: src/libaudgui/infowin.c:96
+#: src/libaudgui/infowin.c:94
 msgid "Hip-hop"
 msgstr "Hip-Hop"
 
-#: src/libaudgui/infowin.c:97
+#: src/libaudgui/infowin.c:95
 msgid "House"
 msgstr "House"
 
-#: src/libaudgui/infowin.c:98
+#: src/libaudgui/infowin.c:96
 msgid "Jazz"
 msgstr "Jazz"
 
-#: src/libaudgui/infowin.c:99
+#: src/libaudgui/infowin.c:97
 msgid "Jungle"
 msgstr "Jungle"
 
-#: src/libaudgui/infowin.c:100
+#: src/libaudgui/infowin.c:98
 msgid "Metal"
 msgstr "Metal"
 
-#: src/libaudgui/infowin.c:101
+#: src/libaudgui/infowin.c:99
 msgid "New Age"
 msgstr "New Age"
 
-#: src/libaudgui/infowin.c:102
+#: src/libaudgui/infowin.c:100
 msgid "New Wave"
 msgstr "New Wave"
 
-#: src/libaudgui/infowin.c:103
+#: src/libaudgui/infowin.c:101
 msgid "Noise"
 msgstr "Noise"
 
-#: src/libaudgui/infowin.c:104
+#: src/libaudgui/infowin.c:102
 msgid "Pop"
 msgstr "Pop"
 
-#: src/libaudgui/infowin.c:105
+#: src/libaudgui/infowin.c:103
 msgid "Punk Rock"
 msgstr "Punk Rock"
 
-#: src/libaudgui/infowin.c:106
+#: src/libaudgui/infowin.c:104
 msgid "Rap"
 msgstr "Rap"
 
-#: src/libaudgui/infowin.c:107
+#: src/libaudgui/infowin.c:105
 msgid "Reggae"
 msgstr "Reggae"
 
-#: src/libaudgui/infowin.c:108
+#: src/libaudgui/infowin.c:106
 msgid "Rock"
 msgstr "Rock"
 
-#: src/libaudgui/infowin.c:109
+#: src/libaudgui/infowin.c:107
 msgid "Rock and Roll"
 msgstr "Rock and Roll"
 
-#: src/libaudgui/infowin.c:110
+#: src/libaudgui/infowin.c:108
 msgid "Rhythm and Blues"
 msgstr "Rhythm and Blues"
 
-#: src/libaudgui/infowin.c:111
+#: src/libaudgui/infowin.c:109
 msgid "Ska"
 msgstr "Ska"
 
-#: src/libaudgui/infowin.c:112
+#: src/libaudgui/infowin.c:110
 msgid "Soul"
 msgstr "Soul"
 
-#: src/libaudgui/infowin.c:113
+#: src/libaudgui/infowin.c:111
 msgid "Swing"
 msgstr "Swing"
 
-#: src/libaudgui/infowin.c:114
+#: src/libaudgui/infowin.c:112
 msgid "Techno"
 msgstr "Techno"
 
-#: src/libaudgui/infowin.c:115
+#: src/libaudgui/infowin.c:113
 msgid "Trip-hop"
 msgstr "Trip-Hop"
 
-#: src/libaudgui/infowin.c:175 src/libaudgui/infowin.c:361
-#: src/libaudgui/infowin.c:364 src/libaudgui/infowin.c:367
+#: src/libaudgui/infowin.c:177 src/libaudgui/infowin.c:363
+#: src/libaudgui/infowin.c:366 src/libaudgui/infowin.c:369
 msgid "n/a"
 msgstr "n/a"
 
-#: src/libaudgui/infowin.c:265
+#: src/libaudgui/infowin.c:267
 msgid "Metadata updated successfully"
 msgstr "Meta duomenys atnaujinti sėkmingai"
 
-#: src/libaudgui/infowin.c:270
+#: src/libaudgui/infowin.c:272
 msgid "Metadata updating failed"
 msgstr "Meta duomenų atnaujinti nepavyko"
 
-#: src/libaudgui/infowin.c:318
+#: src/libaudgui/infowin.c:320
 msgid "Track Information"
 msgstr "Takelio informacija"
 
-#: src/libaudgui/infowin.c:350
+#: src/libaudgui/infowin.c:352
 msgid "Format:"
 msgstr "Formatas:"
 
-#: src/libaudgui/infowin.c:354
+#: src/libaudgui/infowin.c:356
 msgid "Quality:"
 msgstr "Kokybė:"
 
-#: src/libaudgui/infowin.c:357
+#: src/libaudgui/infowin.c:359
 msgid "Bitrate:"
 msgstr "Bitai per sekundę:"
 
-#: src/libaudgui/infowin.c:387
+#: src/libaudgui/infowin.c:389
 msgid "Title"
 msgstr "Pavadinimas"
 
-#: src/libaudgui/infowin.c:399
+#: src/libaudgui/infowin.c:401
 msgid "Artist"
 msgstr "Atlikėjas"
 
-#: src/libaudgui/infowin.c:411
+#: src/libaudgui/infowin.c:413
 msgid "Album"
 msgstr "Albumas"
 
-#: src/libaudgui/infowin.c:423
+#: src/libaudgui/infowin.c:425
 msgid "Comment"
 msgstr "Komentaras"
 
-#: src/libaudgui/infowin.c:435
+#: src/libaudgui/infowin.c:437
 msgid "Genre"
 msgstr "Žanras"
 
-#: src/libaudgui/infowin.c:456
+#: src/libaudgui/infowin.c:458
 msgid "Year"
 msgstr "Metai"
 
-#: src/libaudgui/infowin.c:467
+#: src/libaudgui/infowin.c:469
 msgid "Track Number"
 msgstr "Takelio numeris"
 
-#: src/libaudgui/infowin.c:549
+#: src/libaudgui/infowin.c:548
 #, c-format
 msgid "%d kb/s"
 msgstr "%d kb/s"
 
-#: src/libaudgui/infowin.c:579
+#: src/libaudgui/infowin.c:575
 #, c-format
 msgid "No info available for %s.\n"
 msgstr "Nėra informacijos apie %s.\n"
 
-#: src/libaudgui/jump-to-time.c:75
+#: src/libaudgui/jump-to-time.c:72
 msgid "Jump to Time"
 msgstr "Šokti į laiką"
 
-#: src/libaudgui/jump-to-time.c:90
+#: src/libaudgui/jump-to-time.c:87
 msgid "mm:ss"
 msgstr "mm:ss"
 
-#: src/libaudgui/playlists.c:39
+#: src/libaudgui/playlists.c:33
 msgid "Export Playlist"
 msgstr "Eksportuoti grojaraštį"
 
-#: src/libaudgui/playlists.c:39
+#: src/libaudgui/playlists.c:33
 msgid "Import Playlist"
 msgstr "Įkrauti grojaraštį"
 
-#: src/libaudgui/playlists.c:72
+#: src/libaudgui/playlists.c:66
 #, c-format
 msgid "Overwrite %s?"
 msgstr "Perrašyti %s?"
 
-#: src/libaudgui/queue-manager.c:185
+#: src/libaudgui/queue-manager.c:196
 msgid "Queue Manager"
 msgstr "Eilės redaktorius"
 
-#: src/libaudgui/ui_about.c:69
-msgid "About Audacious"
-msgstr "Apie Audacious"
-
-#: src/libaudgui/ui_about.c:90 src/libaudgui/ui_credits.c:122
-msgid "Credits"
-msgstr "Padėkos"
-
-#: src/libaudgui/ui_credits.c:126
-msgid "Translators"
-msgstr "Vertėjai"
-
 #: src/libaudgui/ui_fileopener.c:109
 msgid "Open Files"
-msgstr "Atverti bylas"
+msgstr "Atverti failus"
 
 #: src/libaudgui/ui_fileopener.c:109
 msgid "Add Files"
-msgstr "Pridėti bylas"
+msgstr "Pridėti failus"
 
 #: src/libaudgui/ui_fileopener.c:111
 msgid "Close dialog on Open"
@@ -1091,60 +1101,60 @@
 msgid "Close dialog on Add"
 msgstr "Pridėjus, užverti dialogą"
 
-#: src/libaudgui/ui_jumptotrack.c:103 src/libaudgui/ui_jumptotrack.c:111
-#: src/libaudgui/ui_jumptotrack.c:322
+#: src/libaudgui/ui_jumptotrack.c:109 src/libaudgui/ui_jumptotrack.c:117
+#: src/libaudgui/ui_jumptotrack.c:326
 msgid "_Queue"
 msgstr "_Į eilę"
 
-#: src/libaudgui/ui_jumptotrack.c:109
+#: src/libaudgui/ui_jumptotrack.c:115
 msgid "Un_queue"
 msgstr "Iš _eilės"
 
-#: src/libaudgui/ui_jumptotrack.c:239
-msgid "Jump to Track"
-msgstr "Šokti į takelį"
+#: src/libaudgui/ui_jumptotrack.c:258
+msgid "Jump to Song"
+msgstr "Peršokti į dainą"
 
-#: src/libaudgui/ui_jumptotrack.c:277
+#: src/libaudgui/ui_jumptotrack.c:281
 msgid "Filter: "
 msgstr "Filtruoti:"
 
-#: src/libaudgui/ui_jumptotrack.c:278
+#: src/libaudgui/ui_jumptotrack.c:282
 msgid "_Filter:"
 msgstr "_Filtruoti:"
 
-#: src/libaudgui/ui_jumptotrack.c:288
+#: src/libaudgui/ui_jumptotrack.c:292
 msgid "Remember"
 msgstr "Prisiminti"
 
-#: src/libaudgui/ui_jumptotrack.c:295
+#: src/libaudgui/ui_jumptotrack.c:299
 msgid "Clea_r"
 msgstr "Išvalyt_i"
 
-#: src/libaudgui/ui_jumptotrack.c:315
+#: src/libaudgui/ui_jumptotrack.c:319
 msgid "Close on Jump"
 msgstr "Užverti peršokant"
 
-#: src/libaudgui/ui_playlist_manager.c:250
+#: src/libaudgui/ui_playlist_manager.c:253
 msgid "Playlist Manager"
 msgstr "Grojaraščio redaktorius"
 
-#: src/libaudgui/ui_playlist_manager.c:277
+#: src/libaudgui/ui_playlist_manager.c:280
 msgid "Entries"
 msgstr "Elementai"
 
-#: src/libaudgui/ui_playlist_manager.c:298
+#: src/libaudgui/ui_playlist_manager.c:301
 msgid "_Rename"
 msgstr "_Pervadinti"
 
-#: src/libaudgui/ui_playlist_manager.c:322
+#: src/libaudgui/ui_playlist_manager.c:325
 msgid "_Close dialog on activating playlist"
 msgstr "_Įjungiant grojaraštį, užverti dialogą"
 
-#: src/libaudgui/ui_urlopener.c:51
+#: src/libaudgui/ui_urlopener.c:48
 msgid "Open URL"
 msgstr "Atverti URL"
 
-#: src/libaudgui/ui_urlopener.c:51
+#: src/libaudgui/ui_urlopener.c:48
 msgid "Add URL"
 msgstr "Pridėti URL"
 
@@ -1152,38 +1162,36 @@
 msgid ""
 "\n"
 "(Further messages have been hidden.)"
-msgstr ""
-"\n"
-"(Sekantys pranešimai paslėpti.)"
+msgstr "\n(Sekantys pranešimai paslėpti.)"
 
 #: src/libeggsmclient/eggdesktopfile.c:165
 msgid "File is not a valid .desktop file"
-msgstr "Šis failas nėra tinkamas .desktop failas"
+msgstr "Šis failas nėra tinkamas .desktop failas"
 
-#: src/libeggsmclient/eggdesktopfile.c:188
+#: src/libeggsmclient/eggdesktopfile.c:191
 #, c-format
 msgid "Unrecognized desktop file Version '%s'"
 msgstr "Neatpažinta „desktop“ failo versija „%s“"
 
-#: src/libeggsmclient/eggdesktopfile.c:967
+#: src/libeggsmclient/eggdesktopfile.c:974
 #, c-format
 msgid "Starting %s"
 msgstr "Pradedama %s"
 
-#: src/libeggsmclient/eggdesktopfile.c:1108
+#: src/libeggsmclient/eggdesktopfile.c:1116
 msgid "Application does not accept documents on command line"
 msgstr "Programa nepriima dokumentų iš komandinės eilutės"
 
-#: src/libeggsmclient/eggdesktopfile.c:1176
+#: src/libeggsmclient/eggdesktopfile.c:1184
 #, c-format
 msgid "Unrecognized launch option: %d"
 msgstr "Neatpažinta paleisties pasirinktis: %d"
 
-#: src/libeggsmclient/eggdesktopfile.c:1375
+#: src/libeggsmclient/eggdesktopfile.c:1391
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
 msgstr "Negaliu perduot dokumento URI į darbastalio įrašą „Type=Link“"
 
-#: src/libeggsmclient/eggdesktopfile.c:1396
+#: src/libeggsmclient/eggdesktopfile.c:1412
 msgid "Not a launchable item"
 msgstr "Nepaleistinas elementas"
 
@@ -1214,5 +1222,3 @@
 #: src/libeggsmclient/eggsmclient.c:254
 msgid "Show session management options"
 msgstr "Rodyti sesijos valdymo pasirinktis"
-
-

audacious-3.1.1.tar.bz2/po/nl.po -> audacious-3.2.4.tar.bz2/po/nl.po Changed

@@ -1,1280 +1,1207 @@
 # Dutch translation for Audacious
-# Copyright (C) 2004 Laurens Buhler <masterpe@xs4all.nl>
-# Copyright (C) 2006 Tony Vroon <chainsaw@gentoo.org>
+# Copyright (C) Audacious translators
 # This file is distributed under the same license as the Audacious package.
 #
+# Translators:
+# Bjorn Roesbeke <inbox@bjornroesbeke.be>, 2012.
+# <glenn_de_groot@hotmail.com>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: nl\n"
-"Report-Msgid-Bugs-To: http://jira.atheme.org/\n"
-"POT-Creation-Date: 2011-07-05 22:45+0200\n"
-"PO-Revision-Date: 2006-11-16 20:02+0100\n"
-"Last-Translator: Tony Vroon <chainsaw@gentoo.org>\n"
-"Language-Team: (not responsive)\n"
-"Language: \n"
+"Project-Id-Version: Audacious\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2012-01-11 08:54-0500\n"
+"PO-Revision-Date: 2012-03-11 15:58+0000\n"
+"Last-Translator: Bjorn Roesbeke <inbox@bjornroesbeke.be>\n"
+"Language-Team: Dutch\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-15\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/audacious/adder.c:71
+#: src/audacious/adder.c:77
 msgid "Searching ..."
-msgstr ""
+msgstr "Zoeken..."
 
-#: src/audacious/adder.c:99
+#: src/audacious/adder.c:113
 #, c-format
 msgid "%d file found"
 msgid_plural "%d files found"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d bestand gevonden"
+msgstr[1] "%d bestanden gevonden"
 
-#: src/audacious/chardet.c:37
+#: src/audacious/chardet.c:39
 msgid " (invalid UTF-8)"
 msgstr " (ongeldige UTF-8)"
 
-#: src/audacious/credits.c:35
-#, fuzzy
+#: src/audacious/credits.c:37
 msgid "Core developers:"
-msgstr "0.1.x ontwikkelaars:"
+msgstr "Hoofdontwikkelaars:"
 
-#: src/audacious/credits.c:49
+#: src/audacious/credits.c:51
 msgid "Graphics:"
 msgstr "Graphics:"
 
-#: src/audacious/credits.c:54
+#: src/audacious/credits.c:56
 msgid "Default skin:"
 msgstr "Standaard skin:"
 
-#: src/audacious/credits.c:60
+#: src/audacious/credits.c:62
 msgid "Plugin development:"
 msgstr "Plugin-ontwikkeling:"
 
-#: src/audacious/credits.c:83
+#: src/audacious/credits.c:85
 msgid "Patch authors:"
 msgstr "Patches aangeleverd door:"
 
-#: src/audacious/credits.c:126
-#, fuzzy
+#: src/audacious/credits.c:131
 msgid "1.x developers:"
-msgstr "0.1.x ontwikkelaars:"
+msgstr "1.x ontwikkelaars:"
 
-#: src/audacious/credits.c:148
+#: src/audacious/credits.c:153
 msgid "BMP Developers:"
 msgstr "BMP ontwikkelaars:"
 
-#: src/audacious/credits.c:180
-#, fuzzy
+#: src/audacious/credits.c:185
 msgid "Belarusian:"
-msgstr "Hongaars:"
+msgstr "Wit-Russisch:"
 
-#: src/audacious/credits.c:183
+#: src/audacious/credits.c:188
 msgid "Basque:"
-msgstr ""
+msgstr "Baskisch:"
 
-#: src/audacious/credits.c:186
+#: src/audacious/credits.c:191
 msgid "Brazilian Portuguese:"
 msgstr "Braziliaans Portugees:"
 
-#: src/audacious/credits.c:190
+#: src/audacious/credits.c:196
 msgid "Breton:"
 msgstr "Bretons:"
 
-#: src/audacious/credits.c:193
-#, fuzzy
+#: src/audacious/credits.c:199
 msgid "Bulgarian:"
-msgstr "Hongaars:"
+msgstr "Bulgaars:"
 
-#: src/audacious/credits.c:196
-#, fuzzy
+#: src/audacious/credits.c:202
 msgid "Catalan:"
-msgstr "Italiaans:"
+msgstr "Catalaans:"
 
-#: src/audacious/credits.c:199
-#, fuzzy
+#: src/audacious/credits.c:206
 msgid "Chinese:"
 msgstr "Chinees:"
 
-#: src/audacious/credits.c:202
-#, fuzzy
+#: src/audacious/credits.c:209
 msgid "Croatian:"
-msgstr "Roemeens:"
+msgstr "Kroatisch:"
 
-#: src/audacious/credits.c:205
+#: src/audacious/credits.c:212
 msgid "Czech:"
 msgstr "Tjechisch:"
 
-#: src/audacious/credits.c:208
+#: src/audacious/credits.c:215
 msgid "Dutch:"
 msgstr "Nederlands:"
 
-#: src/audacious/credits.c:212
-#, fuzzy
+#: src/audacious/credits.c:219
 msgid "Estonian:"
-msgstr "Roemeens:"
+msgstr "Estisch:"
 
-#: src/audacious/credits.c:215
+#: src/audacious/credits.c:222
 msgid "Finnish:"
 msgstr "Fins:"
 
-#: src/audacious/credits.c:220
+#: src/audacious/credits.c:227
 msgid "French:"
 msgstr "Frans:"
 
-#: src/audacious/credits.c:226
+#: src/audacious/credits.c:233
 msgid "German:"
 msgstr "Duits:"
 
-#: src/audacious/credits.c:233
-#, fuzzy
+#: src/audacious/credits.c:240
 msgid "Georgian:"
 msgstr "Georgisch:"
 
-#: src/audacious/credits.c:236
+#: src/audacious/credits.c:243
 msgid "Greek:"
 msgstr "Grieks:"
 
-#: src/audacious/credits.c:241
+#: src/audacious/credits.c:248
 msgid "Hindi:"
 msgstr "Hindi:"
 
-#: src/audacious/credits.c:244
+#: src/audacious/credits.c:251
 msgid "Hungarian:"
 msgstr "Hongaars:"
 
-#: src/audacious/credits.c:248
+#: src/audacious/credits.c:255
 msgid "Italian:"
 msgstr "Italiaans:"
 
-#: src/audacious/credits.c:252
+#: src/audacious/credits.c:260
 msgid "Japanese:"
 msgstr "Japans:"
 
-#: src/audacious/credits.c:255
+#: src/audacious/credits.c:263
 msgid "Korean:"
 msgstr "Koreaans:"
 
-#: src/audacious/credits.c:258
-#, fuzzy
+#: src/audacious/credits.c:266
 msgid "Latvian:"
-msgstr "Roemeens:"
+msgstr "Lets:"
 
-#: src/audacious/credits.c:261
+#: src/audacious/credits.c:269
 msgid "Lithuanian:"
 msgstr "Lets:"
 
-#: src/audacious/credits.c:265
+#: src/audacious/credits.c:274
 msgid "Macedonian:"
 msgstr "Macedonisch:"
 
-#: src/audacious/credits.c:268
+#: src/audacious/credits.c:277
+msgid "Mexican Spanish:"
+msgstr "Mexicaans Spaans:"
+
+#: src/audacious/credits.c:280
 msgid "Polish:"
 msgstr "Pools:"
 
-#: src/audacious/credits.c:274
-#, fuzzy
+#: src/audacious/credits.c:287
 msgid "Portuguese:"
-msgstr "Braziliaans Portugees:"
+msgstr "Portugees:"
 
-#: src/audacious/credits.c:277
+#: src/audacious/credits.c:290
 msgid "Romanian:"
 msgstr "Roemeens:"
 
-#: src/audacious/credits.c:281
+#: src/audacious/credits.c:294
 msgid "Russian:"
 msgstr "Russisch:"
 
-#: src/audacious/credits.c:285
+#: src/audacious/credits.c:298
 msgid "Serbian (Latin):"
-msgstr ""
+msgstr "Servisch (Latijn):"
 
-#: src/audacious/credits.c:288
+#: src/audacious/credits.c:301
 msgid "Serbian (Cyrillic):"
-msgstr ""
+msgstr "Servisch (Cyrillisch):"
 
-#: src/audacious/credits.c:291
+#: src/audacious/credits.c:305
 msgid "Simplified Chinese:"
-msgstr ""
+msgstr "Vereenvoudigd Chinees:"
 
-#: src/audacious/credits.c:294
+#: src/audacious/credits.c:308
 msgid "Slovak:"
 msgstr "Slowaaks:"
 
-#: src/audacious/credits.c:297
+#: src/audacious/credits.c:312
 msgid "Spanish:"
 msgstr "Spaans:"
 
-#: src/audacious/credits.c:304
+#: src/audacious/credits.c:320
 msgid "Swedish:"
 msgstr "Zweeds:"
 
-#: src/audacious/credits.c:307
+#: src/audacious/credits.c:323
 msgid "Traditional Chinese:"
-msgstr ""
+msgstr "Traditioneel Chinees:"
 
-#: src/audacious/credits.c:312
+#: src/audacious/credits.c:329
 msgid "Turkish:"
-msgstr ""
+msgstr "Turks:"
 
-#: src/audacious/credits.c:316
+#: src/audacious/credits.c:333
 msgid "Ukrainian:"
 msgstr "Ukrainees:"
 
-#: src/audacious/credits.c:319
+#: src/audacious/credits.c:338
+msgid "Vietnamese:"
+msgstr "Vietnamees:"
+
+#: src/audacious/credits.c:341
 msgid "Welsh:"
 msgstr "Welsh:"
 
-#: src/audacious/drct.c:256
-#, fuzzy
-msgid "Temporary Playlist"
-msgstr "Afspeellijst laden"
-
-#: src/audacious/equalizer_preset.c:186
+#: src/audacious/equalizer_preset.c:180
 #, c-format
 msgid "Error importing Winamp EQF file '%s'"
-msgstr ""
+msgstr "Er is een fout opgetreden bij het importeren van een Winamp EQF bestand met als naam '%s'"
 
-# -r, --rew switch
-#: src/audacious/main.c:256
+#: src/audacious/main.c:243
 msgid "Skip backwards in playlist"
 msgstr "Ga terug in de speellijst"
 
-# -p, --play switch
-#: src/audacious/main.c:257
+#: src/audacious/main.c:244
 msgid "Start playing current playlist"
 msgstr "Begin de huidige speellijst af te spelen"
 
-# -u, --pause switch
-#: src/audacious/main.c:258
+#: src/audacious/main.c:245
 msgid "Pause current song"
 msgstr "Pauzeer huidig nummer"
 
-# -s, --stop switch
-#: src/audacious/main.c:259
+#: src/audacious/main.c:246
 msgid "Stop current song"
 msgstr "Stop huidig nummer"
 
-# -t, --play-pause switch
-#: src/audacious/main.c:260
+#: src/audacious/main.c:247
 msgid "Pause if playing, play otherwise"
 msgstr "Pauzeer tijdens spelen, anders afspelen"
 
-# -f, --fwd switch
-#: src/audacious/main.c:261
+#: src/audacious/main.c:248
 msgid "Skip forward in playlist"
 msgstr "Ga vooruit in de speellijst"
 
-#: src/audacious/main.c:262
-#, fuzzy
+#: src/audacious/main.c:249
 msgid "Display Jump to File dialog"
-msgstr "Spring-naar-bestand dialoog weergeven"
+msgstr "Toon 'ga naar bestand' dialoogvenster"
 
-# -e, --enqueue switch
-#: src/audacious/main.c:263
-#, fuzzy
+#: src/audacious/main.c:250
 msgid "Add files to the playlist"
-msgstr "Speellijst niet wissen"
+msgstr "Voeg bestanden toe aan de afspeellijst"
 
-# -e, --enqueue switch
-#: src/audacious/main.c:264
-#, fuzzy
+#: src/audacious/main.c:251
 msgid "Add new files to a temporary playlist"
-msgstr "Speellijst niet wissen"
+msgstr "Voeg nieuwe bestanden toe aan een tijdelijke speellijst"
 
-# -m, --show-main-window switch
-#: src/audacious/main.c:265
-#, fuzzy
+#: src/audacious/main.c:252
 msgid "Display the main window"
-msgstr "Geef het hoofdvenster weer"
+msgstr "Toon het hoofdvenster"
 
-#: src/audacious/main.c:266
-#, fuzzy
+#: src/audacious/main.c:253
 msgid "Show version"
-msgstr "Sp/eler weergeven"
+msgstr "Toon de versie"
 
-#: src/audacious/main.c:267
+#: src/audacious/main.c:254
 msgid "Print debugging messages"
+msgstr "Toon debug berichten"
+
+#: src/audacious/main.c:255
+msgid "Headless mode (beta)"
 msgstr ""
 
-#: src/audacious/main.c:268
+#: src/audacious/main.c:256
 msgid "FILE..."
-msgstr ""
+msgstr "BESTAND..."
 
-#: src/audacious/main.c:280
+#: src/audacious/main.c:268
 msgid "- play multimedia files"
-msgstr ""
+msgstr "- speel multimedia bestanden af"
 
-#: src/audacious/main.c:290
+#: src/audacious/main.c:278
 #, c-format
 msgid ""
 "%s: %s\n"
 "Try `%s --help' for more information.\n"
-msgstr ""
-
-#: src/audacious/main.c:407
-msgid ""
-"Audacious seems to be already running but is not responding. You can start "
-"another instance of the program, but please be warned that this can cause "
-"data loss. If Audacious is not running, you can safely ignore this "
-"message. Press OK to start Audacious or Cancel to quit."
-msgstr ""
+msgstr "%s: %s\nProbeer `%s --help' voor meer informatie.\n"
 
-#: src/audacious/main.c:572
+#: src/audacious/main.c:573
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/audacious/playback.c:381
+#: src/audacious/playback.c:307
 #, c-format
 msgid "No decoder found for %s."
-msgstr ""
+msgstr "Geen decoder gevonden voor %s."
 
-#: src/audacious/playback.c:531
-msgid "Buffering ..."
-msgstr ""
+#: src/audacious/playlist-files.c:53
+#, c-format
+msgid "Cannot %s %s: unsupported file extension."
+msgstr "Kan niet %s %s: niet ondersteunde bestandsextensie."
+
+#: src/audacious/playlist-files.c:54
+msgid "save"
+msgstr "opslaan"
+
+#: src/audacious/playlist-files.c:54
+msgid "load"
+msgstr "laad"
+
+#: src/audacious/playlist-new.c:131
+msgid "New Playlist"
+msgstr "Nieuwe afspeellijst"
 
-#: src/audacious/playlist-new.c:303
-#, fuzzy
-msgid "Untitled Playlist"
-msgstr "Afspeellijst opslaan"
+#: src/audacious/playlist-new.c:132
+msgid "Now Playing"
+msgstr "Nu aan het afspelen"
 
-#: src/audacious/ui_preferences.c:87
+#: src/audacious/playlist-new.c:1630
+msgid ""
+"The playlist cannot be sorted because metadata scanning is still in progress"
+" (or has been disabled)."
+msgstr "De speellijst kon niet gesorteerd worden omdat metadata scannen nog steeds bezig (of uitgeschakeld) is."
+
+#: src/audacious/ui_preferences.c:85
 msgid "Audio"
 msgstr "Geluid"
 
-#: src/audacious/ui_preferences.c:88
+#: src/audacious/ui_preferences.c:86
 msgid "Network"
-msgstr ""
+msgstr "Netwerk"
 
-#: src/audacious/ui_preferences.c:89 src/audacious/ui_preferences.c:1556
+#: src/audacious/ui_preferences.c:87 src/audacious/ui_preferences.c:1603
 msgid "Playlist"
 msgstr "Speellijst"
 
-#: src/audacious/ui_preferences.c:90
+#: src/audacious/ui_preferences.c:88
 msgid "Plugins"
 msgstr "Plugins"
 
-#: src/audacious/ui_preferences.c:96 src/libaudgui/infopopup.c:204
+#: src/audacious/ui_preferences.c:94 src/libaudgui/infopopup.c:199
 msgid "Artist"
 msgstr "Artiest"
 
-#: src/audacious/ui_preferences.c:97 src/libaudgui/infopopup.c:206
+#: src/audacious/ui_preferences.c:95 src/libaudgui/infopopup.c:201
 msgid "Album"
 msgstr "Album"
 
-#: src/audacious/ui_preferences.c:98 src/libaudgui/infopopup.c:202
-#: src/libaudgui/ui_playlist_manager.c:263
+#: src/audacious/ui_preferences.c:96 src/libaudgui/infopopup.c:197
+#: src/libaudgui/ui_playlist_manager.c:279
 msgid "Title"
 msgstr "Titel"
 
-#: src/audacious/ui_preferences.c:99
+#: src/audacious/ui_preferences.c:97
 msgid "Tracknumber"
 msgstr "Nummer"
 
-#: src/audacious/ui_preferences.c:100 src/libaudgui/infopopup.c:208
+#: src/audacious/ui_preferences.c:98 src/libaudgui/infopopup.c:203
 msgid "Genre"
 msgstr "Genre"
 
-#: src/audacious/ui_preferences.c:101
+#: src/audacious/ui_preferences.c:99
 msgid "Filename"
 msgstr "Bestandsnaam"
 
-#: src/audacious/ui_preferences.c:102
+#: src/audacious/ui_preferences.c:100
 msgid "Filepath"
 msgstr "Bestandslocatie"
 
-#: src/audacious/ui_preferences.c:103
+#: src/audacious/ui_preferences.c:101
 msgid "Date"
 msgstr "Datum"
 
-#: src/audacious/ui_preferences.c:104 src/libaudgui/infopopup.c:210
+#: src/audacious/ui_preferences.c:102 src/libaudgui/infopopup.c:205
 msgid "Year"
 msgstr "Jaar"
 
-#: src/audacious/ui_preferences.c:105
+#: src/audacious/ui_preferences.c:103
 msgid "Comment"
 msgstr "Opmerking"
 
-#: src/audacious/ui_preferences.c:106
+#: src/audacious/ui_preferences.c:104
 msgid "Codec"
-msgstr ""
+msgstr "Codec"
 
-#: src/audacious/ui_preferences.c:107
-#, fuzzy
+#: src/audacious/ui_preferences.c:105
 msgid "Quality"
-msgstr "/_Afsluiten"
+msgstr "Kwaliteit"
 
-#: src/audacious/ui_preferences.c:112
+#: src/audacious/ui_preferences.c:111
 msgid "None"
-msgstr ""
+msgstr "Geen"
+
+#: src/audacious/ui_preferences.c:112
+msgid "Arabic"
+msgstr "Arabisch"
 
 #: src/audacious/ui_preferences.c:113
-#, fuzzy
-msgid "Japanese"
-msgstr "Japans:"
+msgid "Baltic"
+msgstr "Baltisch"
 
 #: src/audacious/ui_preferences.c:114
-#, fuzzy
-msgid "Taiwanese"
-msgstr "Japans:"
+msgid "Chinese"
+msgstr "Chinees"
 
 #: src/audacious/ui_preferences.c:115
-#, fuzzy
-msgid "Chinese"
-msgstr "Chinees:"
+msgid "Greek"
+msgstr "Grieks"
 
 #: src/audacious/ui_preferences.c:116
-#, fuzzy
-msgid "Korean"
-msgstr "Koreaans:"
+msgid "Hebrew"
+msgstr "Hebreeuws"
 
 #: src/audacious/ui_preferences.c:117
-#, fuzzy
-msgid "Russian"
-msgstr "Russisch:"
+msgid "Japanese"
+msgstr "Japans"
 
 #: src/audacious/ui_preferences.c:118
-#, fuzzy
-msgid "Greek"
-msgstr "Grieks:"
+msgid "Korean"
+msgstr "Koreaans"
 
 #: src/audacious/ui_preferences.c:119
-msgid "Hebrew"
-msgstr ""
+msgid "Polish"
+msgstr "Pools"
 
 #: src/audacious/ui_preferences.c:120
-msgid "Turkish"
-msgstr ""
+msgid "Russian"
+msgstr "Russisch"
 
 #: src/audacious/ui_preferences.c:121
-msgid "Arabic"
-msgstr ""
+msgid "Taiwanese"
+msgstr "Taiwanees"
 
 #: src/audacious/ui_preferences.c:122
-#, fuzzy
-msgid "Polish"
-msgstr "Pools:"
-
-#: src/audacious/ui_preferences.c:123
-msgid "Baltic"
-msgstr ""
-
-#: src/audacious/ui_preferences.c:124
-msgid "Universal"
-msgstr ""
-
-#: src/audacious/ui_preferences.c:146
-#, fuzzy
-msgid "Single track mode"
-msgstr "/Nummer details weergeven"
+msgid "Turkish"
+msgstr "Turks"
 
-#: src/audacious/ui_preferences.c:147
-#, fuzzy
+#: src/audacious/ui_preferences.c:144
 msgid "Album mode"
-msgstr "Album"
+msgstr "Album modus"
 
-#: src/audacious/ui_preferences.c:150
-#, fuzzy
+#: src/audacious/ui_preferences.c:147
 msgid "Output Settings"
-msgstr "Formaat-detectie"
+msgstr "Uitvoer instellingen"
 
-#: src/audacious/ui_preferences.c:152
-#, fuzzy
+#: src/audacious/ui_preferences.c:149
 msgid "Bit depth:"
-msgstr "Titel"
+msgstr "Bitdiepte:"
 
-#: src/audacious/ui_preferences.c:155
+#: src/audacious/ui_preferences.c:152
 msgid "Buffer size:"
 msgstr "Bufferomvang:"
 
-#: src/audacious/ui_preferences.c:157
+#: src/audacious/ui_preferences.c:154
 msgid "ms"
-msgstr ""
+msgstr "ms"
 
-#: src/audacious/ui_preferences.c:158
+#: src/audacious/ui_preferences.c:155
 msgid "Use software volume control (not recommended)"
-msgstr ""
+msgstr "Gebruik de software volumeregelaar (niet aangeraden)"
 
-#: src/audacious/ui_preferences.c:160
-#, fuzzy
+#: src/audacious/ui_preferences.c:157
 msgid "Replay Gain"
-msgstr "Proxy-configuratie"
+msgstr ""
 
-#: src/audacious/ui_preferences.c:161
-#, fuzzy
+#: src/audacious/ui_preferences.c:158
 msgid "Enable Replay Gain"
-msgstr "Proxy gebruiken"
+msgstr ""
 
-#: src/audacious/ui_preferences.c:164
+#: src/audacious/ui_preferences.c:161
 msgid "Prevent clipping (recommended)"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:166
-#, fuzzy
+#: src/audacious/ui_preferences.c:163
 msgid "Adjust Levels"
-msgstr "Muiswiel"
+msgstr "Niveaus aanpassen"
 
-#: src/audacious/ui_preferences.c:167
+#: src/audacious/ui_preferences.c:164
 msgid "Amplify all files:"
-msgstr ""
+msgstr "Versterk alle bestanden:"
 
-#: src/audacious/ui_preferences.c:169 src/audacious/ui_preferences.c:172
+#: src/audacious/ui_preferences.c:166 src/audacious/ui_preferences.c:169
 msgid "dB"
-msgstr ""
+msgstr "dB"
 
-#: src/audacious/ui_preferences.c:170
+#: src/audacious/ui_preferences.c:167
 msgid "Amplify untagged files:"
 msgstr ""
 
-#: src/audacious/ui_preferences.c:175
+#: src/audacious/ui_preferences.c:172
 msgid "Proxy hostname:"
 msgstr "Proxy-hostnaam:"
 
-#: src/audacious/ui_preferences.c:176
+#: src/audacious/ui_preferences.c:173
 msgid "Proxy port:"
 msgstr "Proxy-poort:"
 
-#: src/audacious/ui_preferences.c:179
+#: src/audacious/ui_preferences.c:176
 msgid "Proxy username:"
 msgstr "Proxy-gebruikersnaam:"
 
-#: src/audacious/ui_preferences.c:180
+#: src/audacious/ui_preferences.c:177
 msgid "Proxy password:"
 msgstr "Proxy-wachtwoord:"
 
-#: src/audacious/ui_preferences.c:184
+#: src/audacious/ui_preferences.c:181
 msgid "Proxy Configuration"
 msgstr "Proxy-configuratie"
 
-#: src/audacious/ui_preferences.c:185
+#: src/audacious/ui_preferences.c:182
 msgid "Enable proxy usage"
 msgstr "Proxy gebruiken"
 
-#: src/audacious/ui_preferences.c:187
+#: src/audacious/ui_preferences.c:185
 msgid "Use authentication with proxy"
 msgstr "Gebruik authenticatie voor proxy"
 
-#: src/audacious/ui_preferences.c:189
-msgid ""
-"Changing these settings will require a restart of "
-"Audacious."
-msgstr ""
-"Het aanpassen van deze instellingen vereist een "
-"herstart van Audacious."
-
 #: src/audacious/ui_preferences.c:193
 msgid "Auto character encoding detector for:"
 msgstr "Automatische karakter-encoding detector ingeschakeld voor:"
 
-#: src/audacious/ui_preferences.c:201
+#: src/audacious/ui_preferences.c:198
 msgid "Fallback character encodings:"
 msgstr "Terugvallen op karakter-encodings:"
 
-#: src/audacious/ui_preferences.c:201
-msgid ""
-"List of character encodings used for fall back conversion of metadata. If "
-"automatic character encoding detector failed or has been disabled, encodings "
-"in this list would be treated as candidates of the encoding of metadata, and "
-"fall back conversion from these encodings to UTF-8 would be attempted."
-msgstr ""
-"Lijst van karakter-encodings welke voor conversie van metadata worden "
-"gebruikt (hier wordt op teruggevallen als automatische detectie faalt of is "
-"uitgeschakeld)."
-
-#: src/audacious/ui_preferences.c:205
-#, fuzzy
+#: src/audacious/ui_preferences.c:202
 msgid "Behavior"
-msgstr "Titel"
+msgstr "Gedrag"
 
-#: src/audacious/ui_preferences.c:206
+#: src/audacious/ui_preferences.c:203
 msgid "Continue playback on startup"
 msgstr "Afspeelpositie onthouden"
 
-#: src/audacious/ui_preferences.c:208
+#: src/audacious/ui_preferences.c:205
 msgid "Advance when the current song is deleted"
-msgstr ""
+msgstr "Ga verder wanneer het huidige liedje is verwijderd"
 
-#: src/audacious/ui_preferences.c:210
-#, fuzzy
+#: src/audacious/ui_preferences.c:207
 msgid "Clear the playlist when opening files"
-msgstr "/Lijst sorteren/Op volgorde afspeellijst"
+msgstr "Wis de afspeellijst wanneer bestanden worden geopend"
 
-# -e, --enqueue switch
-#: src/audacious/ui_preferences.c:212
-#, fuzzy
+#: src/audacious/ui_preferences.c:209
 msgid "Open files in a temporary playlist"
-msgstr "Speellijst niet wissen"
+msgstr "Open bestanden in een tijdelijke speellijst"
 
-#: src/audacious/ui_preferences.c:214
+#: src/audacious/ui_preferences.c:211
 msgid "Metadata"
 msgstr "Metadata"
 
-#: src/audacious/ui_preferences.c:454
+#: src/audacious/ui_preferences.c:212
+msgid "Do not load metadata for songs until played"
+msgstr "Laad metadata voor gegevens niet tot ze afgespeeld worden"
+
+#: src/audacious/ui_preferences.c:230
+msgid "TITLE"
+msgstr "TITEL"
+
+#: src/audacious/ui_preferences.c:231
+msgid "ARTIST - TITLE"
+msgstr "ARTIEST - TITEL"
+
+#: src/audacious/ui_preferences.c:232
+msgid "ARTIST - ALBUM - TITLE"
+msgstr "ARTIEST - ALBUM -TITEL"
+
+#: src/audacious/ui_preferences.c:233
+msgid "ARTIST - ALBUM - TRACK. TITLE"
+msgstr "ARTIEST - ALBUM - NUMMER. TITEL"
+
+#: src/audacious/ui_preferences.c:234
+msgid "ARTIST [ ALBUM ] - TRACK. TITLE"
+msgstr "ARTIEST [ ALBUM ] - NUMMER. TITEL"
+
+#: src/audacious/ui_preferences.c:235
+msgid "ALBUM - TITLE"
+msgstr "ALBUM - TITEL"
+
+#: src/audacious/ui_preferences.c:556
 msgid "Category"
 msgstr "Categorie"
 
-#: src/audacious/ui_preferences.c:682
+#: src/audacious/ui_preferences.c:780
 msgid "Popup Information Settings"
 msgstr "Instellingen van popup-informatie"
 
-#: src/audacious/ui_preferences.c:691
-#, fuzzy
+#: src/audacious/ui_preferences.c:789
 msgid "Cover image retrieve"
-msgstr "Formaat-detectie"
+msgstr ""
 
-#: src/audacious/ui_preferences.c:696
+#: src/audacious/ui_preferences.c:794
 msgid ""
 "While searching for the album's cover, Audacious looks for certain words in "
 "the filename. You can specify those words in the lists below, separated "
 "using commas."
-msgstr ""
-"Tijdens het zoeken naar cover art wordt naar bepaalde woorden in de "
-"bestandsnaam gekeken. Deze woorden kunnen hier worden opgegeven, gescheiden "
-"door komma's."
+msgstr "Tijdens het zoeken naar cover art wordt naar bepaalde woorden in de bestandsnaam gekeken. Deze woorden kunnen hier worden opgegeven, gescheiden door komma's."
 
-#: src/audacious/ui_preferences.c:713
+#: src/audacious/ui_preferences.c:811
 msgid "Exclude:"
 msgstr "Uitsluiten:"
 
-#: src/audacious/ui_preferences.c:720
+#: src/audacious/ui_preferences.c:818
 msgid "Include:"
 msgstr "Zoeken naar:"
 
-#: src/audacious/ui_preferences.c:737
+#: src/audacious/ui_preferences.c:835
 msgid "Recursively search for cover"
 msgstr "Recursief zoeken naar covers"
 
-#: src/audacious/ui_preferences.c:747
+#: src/audacious/ui_preferences.c:845
 msgid "Search depth: "
 msgstr "Zoekdiepte: "
 
-#: src/audacious/ui_preferences.c:761
+#: src/audacious/ui_preferences.c:859
 msgid "Use per-file cover"
 msgstr "Cover per bestand"
 
-#: src/audacious/ui_preferences.c:764
-#, fuzzy
+#: src/audacious/ui_preferences.c:862
 msgid "Miscellaneous"
-msgstr "_Diversen"
+msgstr "Diversen"
 
-#: src/audacious/ui_preferences.c:773
+#: src/audacious/ui_preferences.c:871
 msgid "Show Progress bar for the current track"
-msgstr ""
+msgstr "Toon voortgangsbalk voor het huidige nummer"
 
-#: src/audacious/ui_preferences.c:783
+#: src/audacious/ui_preferences.c:881
 msgid "Delay until filepopup comes up: "
-msgstr ""
+msgstr "Vertraging tot bestandsvenster getoond wordt:"
 
-#: src/audacious/ui_preferences.c:1283
+#: src/audacious/ui_preferences.c:1309
+msgid "Custom"
+msgstr "Aangepast"
+
+#: src/audacious/ui_preferences.c:1352
 msgid "Song Display"
 msgstr "Nummer weergave"
 
-#: src/audacious/ui_preferences.c:1292
+#: src/audacious/ui_preferences.c:1361
 msgid "Show song numbers"
-msgstr ""
+msgstr "Toon lied nummers"
 
-#: src/audacious/ui_preferences.c:1303
+#: src/audacious/ui_preferences.c:1372
 msgid "Show leading zeroes (02:00 instead of 2:00)"
-msgstr ""
+msgstr "Toon leidende nullen (02:00 in plaats van 2:00)"
 
-#: src/audacious/ui_preferences.c:1325
+#: src/audacious/ui_preferences.c:1394
 msgid "Show information about titlestring format"
 msgstr "Geef informatie over het titelformaat"
 
-#: src/audacious/ui_preferences.c:1339
-msgid "TITLE"
-msgstr ""
-
-#: src/audacious/ui_preferences.c:1340
-msgid "ARTIST - TITLE"
-msgstr ""
-
-#: src/audacious/ui_preferences.c:1341
-msgid "ARTIST - ALBUM - TITLE"
-msgstr ""
-
-#: src/audacious/ui_preferences.c:1342
-msgid "ARTIST - ALBUM - TRACK. TITLE"
-msgstr ""
-
-#: src/audacious/ui_preferences.c:1343
-msgid "ARTIST [ ALBUM ] - TRACK. TITLE"
-msgstr ""
-
-#: src/audacious/ui_preferences.c:1344
-msgid "ALBUM - TITLE"
-msgstr ""
-
-#: src/audacious/ui_preferences.c:1345
-#, fuzzy
-msgid "Custom"
-msgstr "Handmatige instelling:"
-
-#: src/audacious/ui_preferences.c:1354
+#: src/audacious/ui_preferences.c:1410
 msgid "Custom string:"
 msgstr "Handmatige instelling:"
 
-#: src/audacious/ui_preferences.c:1361
+#: src/audacious/ui_preferences.c:1417
 msgid "Title format:"
 msgstr "Titelformaat:"
 
-#: src/audacious/ui_preferences.c:1372
+#: src/audacious/ui_preferences.c:1428
 msgid "Popup Information"
 msgstr "Popup-informatie"
 
-#: src/audacious/ui_preferences.c:1387
+#: src/audacious/ui_preferences.c:1443
 msgid "Show popup information for playlist entries"
 msgstr "Popup-informatie tonen voor items in afspeellijst"
 
-#: src/audacious/ui_preferences.c:1388
+#: src/audacious/ui_preferences.c:1444
 msgid ""
 "Toggles popup information window for the pointed entry in the playlist. The "
 "window shows title of song, name of album, genre, year of publish, track "
 "number, track length, and artwork."
-msgstr ""
-"Schakelt het tonen van een popup-venster in. Dit venster toont meer "
-"informatie over het geselecteerde item in de afspeellijst, zoals de titel, "
-"het album, het genre, het jaar van publicatie, tracknummer en eventuele "
-"cover art."
+msgstr "Schakelt het tonen van een popup-venster in. Dit venster toont meer informatie over het geselecteerde item in de afspeellijst, zoals de titel, het album, het genre, het jaar van publicatie, tracknummer en eventuele cover art."
 
-#: src/audacious/ui_preferences.c:1397
+#: src/audacious/ui_preferences.c:1455
 msgid "Edit settings for popup information"
 msgstr "Instellingen aanpassen voor popup-informatie"
 
-#: src/audacious/ui_preferences.c:1497
-#, fuzzy
+#: src/audacious/ui_preferences.c:1544
 msgid "Output plugin:"
-msgstr "Invoer plugin: %s"
+msgstr "Uitvoer plugin"
 
-#: src/audacious/ui_preferences.c:1556
-#, fuzzy
+#: src/audacious/ui_preferences.c:1603
 msgid "Transport"
-msgstr "Vertalers"
+msgstr ""
 
-#: src/audacious/ui_preferences.c:1556
+#: src/audacious/ui_preferences.c:1603
 msgid "Input"
-msgstr ""
+msgstr "Invoer"
 
-#: src/audacious/ui_preferences.c:1557
-#, fuzzy
+#: src/audacious/ui_preferences.c:1604
 msgid "Effect"
-msgstr "Effecten"
+msgstr "Effect"
 
-#: src/audacious/ui_preferences.c:1557
-#, fuzzy
+#: src/audacious/ui_preferences.c:1604
 msgid "Visualization"
-msgstr "/Visualisatie"
+msgstr "Visualisatie "
 
-#: src/audacious/ui_preferences.c:1557
+#: src/audacious/ui_preferences.c:1604
 msgid "General"
-msgstr ""
+msgstr "Algemeen"
 
-#: src/audacious/ui_preferences.c:1597
+#: src/audacious/ui_preferences.c:1644
 msgid "Audacious Preferences"
 msgstr "Audacious voorkeuren"
 
-#: src/audacious/util.c:155
-#, fuzzy, c-format
+#: src/audacious/util.c:120
+#, c-format
 msgid "Could not create directory (%s): %s\n"
-msgstr "Kon de map (%s) niet aanmaken: %s"
+msgstr "Kon de map (%s) niet aanmaken: %s\n"
 
-#: src/audtool/handlers_playlist.c:264
+#: src/audtool/handlers_playlist.c:273
 msgid "Position not found."
-msgstr ""
+msgstr "Positie niet gevonden."
 
-#: src/audtool/handlers_vitals.c:64
+#: src/audtool/handlers_vitals.c:63
 msgid "No song playing."
-msgstr ""
+msgstr "Er is geen lied aan het afspelen."
+
+#: src/libaudcore/audstrings.c:199
+#, c-format
+msgid "Audio CD, track %s"
+msgstr "Audio CD, nummer %s"
 
-#: src/libaudcore/tuple.c:685
+#: src/libaudcore/tuple.c:536
 msgid "Mono"
-msgstr ""
+msgstr "Mono"
 
-#: src/libaudcore/tuple.c:687
-#, fuzzy
+#: src/libaudcore/tuple.c:538
 msgid "Stereo"
-msgstr "stereo"
+msgstr "Stereo"
 
-#: src/libaudcore/tuple.c:689
+#: src/libaudcore/tuple.c:540
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d kanaal"
+msgstr[1] "%d kanalen"
+
+#: src/libaudgui/about.c:52 src/libaudgui/about.c:115
+msgid "Credits"
+msgstr "Met dank aan"
+
+#: src/libaudgui/about.c:52
+msgid "Translators"
+msgstr "Vertalers"
+
+#: src/libaudgui/about.c:91
+msgid "About Audacious"
+msgstr "Over Audacious"
 
-#: src/libaudgui/confirm.c:73
+#: src/libaudgui/confirm.c:76
 #, c-format
 msgid ""
 "Are you sure you want to close %s? If you do, any changes made since the "
 "playlist was exported will be lost."
-msgstr ""
+msgstr "Bent u zeker dat u %s wil sluiten? Als u dit doet zullen alle wijzigingen sinds de speellijst geëxporteed werd verloren gaan."
 
-#: src/libaudgui/confirm.c:86
-#, fuzzy
+#: src/libaudgui/confirm.c:89
 msgid "_Don't show this message again"
-msgstr "Deze waarschuwing niet meer weergeven"
+msgstr "_Toon dit bericht niet opnieuw"
 
-#: src/libaudgui/confirm.c:124
-#, fuzzy
+#: src/libaudgui/confirm.c:126
 msgid "Rename Playlist"
-msgstr "Afspeellijst opslaan"
+msgstr "Afspeellijst hernoemen"
 
-#: src/libaudgui/effects-menu.c:76
+#: src/libaudgui/effects-menu.c:74
 msgid "settings ..."
-msgstr ""
+msgstr "instellingen ..."
 
-#: src/libaudgui/equalizer.c:68
-#, fuzzy
+#: src/libaudgui/equalizer.c:51
 msgid "_Enable"
-msgstr "Actief"
+msgstr "_Inschakelen"
 
-#: src/libaudgui/equalizer.c:140
+#: src/libaudgui/equalizer.c:123
 msgid "31 Hz"
-msgstr ""
+msgstr "31 Hz"
 
-#: src/libaudgui/equalizer.c:140
+#: src/libaudgui/equalizer.c:123
 msgid "63 Hz"
-msgstr ""
+msgstr "63 Hz"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "125 Hz"
-msgstr ""
+msgstr "125 Hz"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "250 Hz"
-msgstr ""
+msgstr "250 Hz"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "500 Hz"
-msgstr ""
+msgstr "500 Hz"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "1 kHz"
-msgstr ""
+msgstr "1 kHz"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "2 kHz"
-msgstr ""
+msgstr "2 kHz"
 
-#: src/libaudgui/equalizer.c:142
+#: src/libaudgui/equalizer.c:125
 msgid "4 kHz"
-msgstr ""
+msgstr "4 kHz"
 
-#: src/libaudgui/equalizer.c:142
+#: src/libaudgui/equalizer.c:125
 msgid "8 kHz"
-msgstr ""
+msgstr "8 kHz"
 
-#: src/libaudgui/equalizer.c:142
+#: src/libaudgui/equalizer.c:125
 msgid "16 kHz"
-msgstr ""
+msgstr "16 kHz"
 
-#: src/libaudgui/equalizer.c:147
+#: src/libaudgui/equalizer.c:130
 msgid "Equalizer"
 msgstr "Equalizer"
 
-#: src/libaudgui/equalizer.c:163
+#: src/libaudgui/equalizer.c:146
 msgid "Preamp"
-msgstr ""
+msgstr "Voorversterker"
 
-#: src/libaudgui/infopopup.c:212
-#, fuzzy
+#: src/libaudgui/infopopup.c:207
 msgid "Track Number"
-msgstr "Nummer"
+msgstr ""
 
-#: src/libaudgui/infopopup.c:214
-#, fuzzy
+#: src/libaudgui/infopopup.c:209
 msgid "Track Length"
-msgstr "Duur:"
+msgstr ""
 
-#: src/libaudgui/infowin.c:77
+#: src/libaudgui/infowin.c:75
 msgid "Acid Jazz"
-msgstr ""
+msgstr "Acid Jazz"
 
-#: src/libaudgui/infowin.c:78
+#: src/libaudgui/infowin.c:76
 msgid "Acid Rock"
-msgstr ""
+msgstr "Acid Rock"
 
-#: src/libaudgui/infowin.c:79
+#: src/libaudgui/infowin.c:77
 msgid "Ambient"
-msgstr ""
+msgstr "Ambient"
 
-#: src/libaudgui/infowin.c:80
+#: src/libaudgui/infowin.c:78
 msgid "Bebop"
-msgstr ""
+msgstr "Bebop"
 
-#: src/libaudgui/infowin.c:81
+#: src/libaudgui/infowin.c:79
 msgid "Bluegrass"
-msgstr ""
+msgstr "Bluegrass"
 
-#: src/libaudgui/infowin.c:82
-#, fuzzy
+#: src/libaudgui/infowin.c:80
 msgid "Blues"
-msgstr "regels"
+msgstr "Blues"
 
-#: src/libaudgui/infowin.c:83
+#: src/libaudgui/infowin.c:81
 msgid "Chamber Music"
-msgstr ""
+msgstr "Kamermuziek"
 
-#: src/libaudgui/infowin.c:84
+#: src/libaudgui/infowin.c:82
 msgid "Classical"
-msgstr ""
+msgstr "Klassiek"
 
-#: src/libaudgui/infowin.c:85
+#: src/libaudgui/infowin.c:83
 msgid "Country"
-msgstr ""
+msgstr "Country"
 
-#: src/libaudgui/infowin.c:86
+#: src/libaudgui/infowin.c:84
 msgid "Death Metal"
-msgstr ""
+msgstr "Death Metal"
 
-#: src/libaudgui/infowin.c:87
+#: src/libaudgui/infowin.c:85
 msgid "Disco"
-msgstr ""
+msgstr "Disco"
 
-#: src/libaudgui/infowin.c:88
+#: src/libaudgui/infowin.c:86
 msgid "Easy Listening"
-msgstr ""
+msgstr "Easy Listening"
 
-#: src/libaudgui/infowin.c:89
+#: src/libaudgui/infowin.c:87
 msgid "Folk"
-msgstr ""
+msgstr "Folk"
 
-#: src/libaudgui/infowin.c:90
+#: src/libaudgui/infowin.c:88
 msgid "Funk"
-msgstr ""
+msgstr "Funk"
 
-#: src/libaudgui/infowin.c:91
+#: src/libaudgui/infowin.c:89
 msgid "Gangsta Rap"
-msgstr ""
+msgstr "Gangsta Rap"
 
-#: src/libaudgui/infowin.c:92
+#: src/libaudgui/infowin.c:90
 msgid "Gospel"
-msgstr ""
+msgstr "Gospel"
 
-#: src/libaudgui/infowin.c:93
+#: src/libaudgui/infowin.c:91
 msgid "Grunge"
-msgstr ""
+msgstr "Grunge"
 
-#: src/libaudgui/infowin.c:94
+#: src/libaudgui/infowin.c:92
 msgid "Hard Rock"
-msgstr ""
+msgstr "Hard Rock"
 
-#: src/libaudgui/infowin.c:95
+#: src/libaudgui/infowin.c:93
 msgid "Heavy Metal"
-msgstr ""
+msgstr "Heavy Metal"
 
-#: src/libaudgui/infowin.c:96
+#: src/libaudgui/infowin.c:94
 msgid "Hip-hop"
-msgstr ""
+msgstr "Hip-hop "
 
-#: src/libaudgui/infowin.c:97
-#, fuzzy
+#: src/libaudgui/infowin.c:95
 msgid "House"
-msgstr "Muis"
+msgstr "House"
 
-#: src/libaudgui/infowin.c:98
+#: src/libaudgui/infowin.c:96
 msgid "Jazz"
-msgstr ""
+msgstr "Jazz"
 
-#: src/libaudgui/infowin.c:99
+#: src/libaudgui/infowin.c:97
 msgid "Jungle"
-msgstr ""
+msgstr "Jungle"
 
-#: src/libaudgui/infowin.c:100
+#: src/libaudgui/infowin.c:98
 msgid "Metal"
-msgstr ""
+msgstr "Metal"
 
-#: src/libaudgui/infowin.c:101
+#: src/libaudgui/infowin.c:99
 msgid "New Age"
-msgstr ""
+msgstr "New Age"
 
-#: src/libaudgui/infowin.c:102
+#: src/libaudgui/infowin.c:100
 msgid "New Wave"
-msgstr ""
+msgstr "New Wave"
 
-#: src/libaudgui/infowin.c:103
-#, fuzzy
+#: src/libaudgui/infowin.c:101
 msgid "Noise"
-msgstr "Muis"
+msgstr "Noise"
 
-#: src/libaudgui/infowin.c:104
+#: src/libaudgui/infowin.c:102
 msgid "Pop"
-msgstr ""
+msgstr "Pop"
 
-#: src/libaudgui/infowin.c:105
+#: src/libaudgui/infowin.c:103
 msgid "Punk Rock"
-msgstr ""
+msgstr "Punk Rock"
 
-#: src/libaudgui/infowin.c:106
+#: src/libaudgui/infowin.c:104
 msgid "Rap"
-msgstr ""
+msgstr "Rap"
 
-#: src/libaudgui/infowin.c:107
-#, fuzzy
+#: src/libaudgui/infowin.c:105
 msgid "Reggae"
-msgstr "Bestandsnaam"
+msgstr "Reggae"
 
-#: src/libaudgui/infowin.c:108
+#: src/libaudgui/infowin.c:106
 msgid "Rock"
-msgstr ""
+msgstr "Rock"
 
-#: src/libaudgui/infowin.c:109
+#: src/libaudgui/infowin.c:107
 msgid "Rock and Roll"
-msgstr ""
+msgstr "Rock and Roll"
 
-#: src/libaudgui/infowin.c:110
+#: src/libaudgui/infowin.c:108
 msgid "Rhythm and Blues"
-msgstr ""
+msgstr "Rhythm-and-Blues"
 
-#: src/libaudgui/infowin.c:111
+#: src/libaudgui/infowin.c:109
 msgid "Ska"
-msgstr ""
+msgstr "Ska"
 
-#: src/libaudgui/infowin.c:112
+#: src/libaudgui/infowin.c:110
 msgid "Soul"
-msgstr ""
+msgstr "Soul"
 
-#: src/libaudgui/infowin.c:113
+#: src/libaudgui/infowin.c:111
 msgid "Swing"
-msgstr ""
+msgstr "Swing"
 
-#: src/libaudgui/infowin.c:114
+#: src/libaudgui/infowin.c:112
 msgid "Techno"
-msgstr ""
+msgstr "Techno"
 
-#: src/libaudgui/infowin.c:115
+#: src/libaudgui/infowin.c:113
 msgid "Trip-hop"
-msgstr ""
+msgstr "Trip-hop"
 
-#: src/libaudgui/infowin.c:175 src/libaudgui/infowin.c:361
-#: src/libaudgui/infowin.c:364 src/libaudgui/infowin.c:367
-#, fuzzy
+#: src/libaudgui/infowin.c:177 src/libaudgui/infowin.c:363
+#: src/libaudgui/infowin.c:366 src/libaudgui/infowin.c:369
 msgid "n/a"
-msgstr "Jaar"
+msgstr "n.v.t."
 
-#: src/libaudgui/infowin.c:265
+#: src/libaudgui/infowin.c:267
 msgid "Metadata updated successfully"
-msgstr ""
+msgstr "Metadata succesvol geactualiseerd"
 
-#: src/libaudgui/infowin.c:270
+#: src/libaudgui/infowin.c:272
 msgid "Metadata updating failed"
-msgstr ""
+msgstr "Metadata actualiseren mislukt"
 
-#: src/libaudgui/infowin.c:318
+#: src/libaudgui/infowin.c:320
 msgid "Track Information"
 msgstr "Nummer-informatie:"
 
-#: src/libaudgui/infowin.c:350
-#, fuzzy
+#: src/libaudgui/infowin.c:352
 msgid "Format:"
-msgstr "Commentaar"
+msgstr ""
 
-#: src/libaudgui/infowin.c:354
-#, fuzzy
+#: src/libaudgui/infowin.c:356
 msgid "Quality:"
-msgstr "Titel"
+msgstr "Kwaliteit:"
 
-#: src/libaudgui/infowin.c:357
-#, fuzzy
+#: src/libaudgui/infowin.c:359
 msgid "Bitrate:"
-msgstr "Commentaar"
+msgstr "Bitsnelheid:"
 
-#: src/libaudgui/infowin.c:387
+#: src/libaudgui/infowin.c:389
 msgid "Title"
 msgstr "Titel"
 
-#: src/libaudgui/infowin.c:399
+#: src/libaudgui/infowin.c:401
 msgid "Artist"
 msgstr "Artiest"
 
-#: src/libaudgui/infowin.c:411
+#: src/libaudgui/infowin.c:413
 msgid "Album"
 msgstr "Album"
 
-#: src/libaudgui/infowin.c:423
+#: src/libaudgui/infowin.c:425
 msgid "Comment"
 msgstr "Commentaar"
 
-#: src/libaudgui/infowin.c:435
+#: src/libaudgui/infowin.c:437
 msgid "Genre"
 msgstr "Genre"
 
-#: src/libaudgui/infowin.c:456
+#: src/libaudgui/infowin.c:458
 msgid "Year"
 msgstr "Jaar"
 
-#: src/libaudgui/infowin.c:467
+#: src/libaudgui/infowin.c:469
 msgid "Track Number"
 msgstr "Nummer"
 
-#: src/libaudgui/infowin.c:549
+#: src/libaudgui/infowin.c:548
 #, c-format
 msgid "%d kb/s"
-msgstr ""
+msgstr "%d kb/s"
 
-#: src/libaudgui/infowin.c:579
+#: src/libaudgui/infowin.c:575
 #, c-format
 msgid "No info available for %s.\n"
-msgstr ""
+msgstr "Geen informatie beschikbaar voor %s.\n"
 
-#: src/libaudgui/jump-to-time.c:75
+#: src/libaudgui/jump-to-time.c:72
 msgid "Jump to Time"
 msgstr "Ga naar tijd"
 
-#: src/libaudgui/jump-to-time.c:90
+#: src/libaudgui/jump-to-time.c:87
 msgid "mm:ss"
-msgstr ""
+msgstr "mm:ss"
 
-#: src/libaudgui/playlists.c:39
-#, fuzzy
+#: src/libaudgui/playlists.c:33
 msgid "Export Playlist"
-msgstr "Afspeellijst laden"
+msgstr "Exporteer speellijst"
 
-#: src/libaudgui/playlists.c:39
-#, fuzzy
+#: src/libaudgui/playlists.c:33
 msgid "Import Playlist"
-msgstr "Afspeellijst laden"
+msgstr "Importeer speellijst"
 
-#: src/libaudgui/playlists.c:71
+#: src/libaudgui/playlists.c:66
 #, c-format
 msgid "Overwrite %s?"
-msgstr ""
+msgstr "%s overschrijven?"
 
-#: src/libaudgui/ui_about.c:71
-msgid "About Audacious"
-msgstr "Over Audacious"
-
-#: src/libaudgui/ui_about.c:93 src/libaudgui/ui_credits.c:122
-msgid "Credits"
-msgstr "Met dank aan"
-
-#: src/libaudgui/ui_credits.c:126
-msgid "Translators"
-msgstr "Vertalers"
+#: src/libaudgui/queue-manager.c:196
+msgid "Queue Manager"
+msgstr "Wachtrij beheerder"
 
-#: src/libaudgui/ui_fileopener.c:108
+#: src/libaudgui/ui_fileopener.c:109
 msgid "Open Files"
 msgstr "Bestanden openen"
 
-#: src/libaudgui/ui_fileopener.c:108
+#: src/libaudgui/ui_fileopener.c:109
 msgid "Add Files"
 msgstr "Bestanden toevoegen"
 
-#: src/libaudgui/ui_fileopener.c:110
+#: src/libaudgui/ui_fileopener.c:111
 msgid "Close dialog on Open"
 msgstr "Sluit venster bij openen"
 
-#: src/libaudgui/ui_fileopener.c:110
+#: src/libaudgui/ui_fileopener.c:111
 msgid "Close dialog on Add"
 msgstr "Sluit venster bij toevoegen"
 
-#: src/libaudgui/ui_jumptotrack.c:133
-msgid "Un_queue"
-msgstr "_Uit wachtrij verwijderen"
-
-#: src/libaudgui/ui_jumptotrack.c:135 src/libaudgui/ui_jumptotrack.c:512
+#: src/libaudgui/ui_jumptotrack.c:109 src/libaudgui/ui_jumptotrack.c:117
+#: src/libaudgui/ui_jumptotrack.c:326
 msgid "_Queue"
 msgstr "_In wachtrij plaatsen"
 
-#: src/libaudgui/ui_jumptotrack.c:399
-msgid "Jump to Track"
-msgstr "Ga naar nummer"
+#: src/libaudgui/ui_jumptotrack.c:115
+msgid "Un_queue"
+msgstr "_Uit wachtrij verwijderen"
 
-#: src/libaudgui/ui_jumptotrack.c:442
+#: src/libaudgui/ui_jumptotrack.c:258
+msgid "Jump to Song"
+msgstr "Ga naar lied"
+
+#: src/libaudgui/ui_jumptotrack.c:281
 msgid "Filter: "
 msgstr "Filter: "
 
-#: src/libaudgui/ui_jumptotrack.c:443
-#, fuzzy
+#: src/libaudgui/ui_jumptotrack.c:282
 msgid "_Filter:"
-msgstr "Filter: "
+msgstr "_Filter:"
 
-#: src/libaudgui/ui_jumptotrack.c:461
+#: src/libaudgui/ui_jumptotrack.c:292
 msgid "Remember"
-msgstr ""
+msgstr "Onthouden"
 
-#: src/libaudgui/ui_jumptotrack.c:470
-#, fuzzy
+#: src/libaudgui/ui_jumptotrack.c:299
 msgid "Clea_r"
-msgstr "A-B /wissen"
+msgstr "Wis_sen"
 
-#: src/libaudgui/ui_jumptotrack.c:504
-#, fuzzy
+#: src/libaudgui/ui_jumptotrack.c:319
 msgid "Close on Jump"
-msgstr "Sluit venster bij openen"
+msgstr ""
 
-#: src/libaudgui/ui_playlist_manager.c:240
-#, fuzzy
+#: src/libaudgui/ui_playlist_manager.c:253
 msgid "Playlist Manager"
-msgstr "/Niet vooruitlopen in de speellijst"
+msgstr "Speellijst beheerder"
 
-#: src/libaudgui/ui_playlist_manager.c:264
+#: src/libaudgui/ui_playlist_manager.c:280
 msgid "Entries"
 msgstr ""
 
-#: src/libaudgui/ui_playlist_manager.c:285
-#, fuzzy
+#: src/libaudgui/ui_playlist_manager.c:301
 msgid "_Rename"
-msgstr "Bestandsnaam"
+msgstr "_Hernoemen"
 
-#: src/libaudgui/ui_playlist_manager.c:309
-#, fuzzy
+#: src/libaudgui/ui_playlist_manager.c:325
 msgid "_Close dialog on activating playlist"
-msgstr "Sluit venster bij openen"
+msgstr ""
 
-#: src/libaudgui/ui_urlopener.c:58
+#: src/libaudgui/ui_urlopener.c:48
 msgid "Open URL"
-msgstr ""
+msgstr "Open URL"
 
-#: src/libaudgui/ui_urlopener.c:58
+#: src/libaudgui/ui_urlopener.c:48
 msgid "Add URL"
-msgstr ""
+msgstr "Voeg URL toe"
 
 #: src/libaudgui/util.c:95
 msgid ""
 "\n"
 "(Further messages have been hidden.)"
-msgstr ""
+msgstr "\n(Verdere berichten werden verborgen.)"
 
 #: src/libeggsmclient/eggdesktopfile.c:165
 msgid "File is not a valid .desktop file"
-msgstr ""
+msgstr "Bestand is geen geldig .desktop bestand."
 
-#: src/libeggsmclient/eggdesktopfile.c:188
-#, fuzzy, c-format
+#: src/libeggsmclient/eggdesktopfile.c:191
+#, c-format
 msgid "Unrecognized desktop file Version '%s'"
-msgstr "%s: onbekende optie `--%s'\n"
+msgstr "Onherkend desktop bestand Versie '%s'"
 
-#: src/libeggsmclient/eggdesktopfile.c:967
+#: src/libeggsmclient/eggdesktopfile.c:974
 #, c-format
 msgid "Starting %s"
-msgstr ""
+msgstr "Starten %s"
 
-#: src/libeggsmclient/eggdesktopfile.c:1108
+#: src/libeggsmclient/eggdesktopfile.c:1116
 msgid "Application does not accept documents on command line"
-msgstr ""
+msgstr "Toepassing aanvaardt geen documenten in opdrachtregel"
 
-#: src/libeggsmclient/eggdesktopfile.c:1176
-#, fuzzy, c-format
+#: src/libeggsmclient/eggdesktopfile.c:1184
+#, c-format
 msgid "Unrecognized launch option: %d"
-msgstr "%s: onbekende optie `--%s'\n"
+msgstr "Niet herkende opstartoptie: %d"
 
-#: src/libeggsmclient/eggdesktopfile.c:1375
+#: src/libeggsmclient/eggdesktopfile.c:1391
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
 msgstr ""
 
-#: src/libeggsmclient/eggdesktopfile.c:1396
+#: src/libeggsmclient/eggdesktopfile.c:1412
 msgid "Not a launchable item"
-msgstr ""
+msgstr "Niet een startbaar item"
 
 #: src/libeggsmclient/eggsmclient.c:226
 msgid "Disable connection to session manager"
-msgstr ""
+msgstr "Verbinding met sessiebeheerder uitschakelen"
 
 #: src/libeggsmclient/eggsmclient.c:229
 msgid "Specify file containing saved configuration"
-msgstr ""
+msgstr "Geef bestand met opgeslagen configuratie op"
 
 #: src/libeggsmclient/eggsmclient.c:229
 msgid "FILE"
-msgstr ""
+msgstr "BESTAND"
 
 #: src/libeggsmclient/eggsmclient.c:232
 msgid "Specify session management ID"
@@ -1282,1701 +1209,12 @@
 
 #: src/libeggsmclient/eggsmclient.c:232
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #: src/libeggsmclient/eggsmclient.c:253
-#, fuzzy
 msgid "Session management options:"
-msgstr "Toon vensterdecoraties"
+msgstr ""
 
 #: src/libeggsmclient/eggsmclient.c:254
-#, fuzzy
 msgid "Show session management options"
-msgstr "Toon vensterdecoraties"
-
-#, fuzzy
-#~ msgid "Volume Control"
-#~ msgstr "Muiswiel"
-
-#, fuzzy
-#~ msgid "Mode"
-#~ msgstr "Metadata"
-
-#, fuzzy
-#~ msgid "Clipping Prevention"
-#~ msgstr "Popup-informatie"
-
-#~ msgid "Audio System"
-#~ msgstr "Geluidssysteem"
-
-#~ msgid "Current output plugin:"
-#~ msgstr "Huidige uitvoer-plugin:"
-
-#, fuzzy
-#~ msgid "%s: Unable to open display, exiting.\n"
-#~ msgstr ""
-#~ "audacious: Kan het venster niet openen, het programma sluit nu af.\n"
-
-#, fuzzy
-#~ msgid "Default gain:"
-#~ msgstr "Standaard skin:"
-
-#, fuzzy
-#~ msgid "Track gain/peak"
-#~ msgstr "Titel"
-
-#, fuzzy
-#~ msgid "Dance"
-#~ msgstr "Datum"
-
-#, fuzzy
-#~ msgid "Oldies"
-#~ msgstr "regels"
-
-#, fuzzy
-#~ msgid "Pranks"
-#~ msgstr "/Pause"
-
-#, fuzzy
-#~ msgid "Fusion"
-#~ msgstr "Russisch:"
-
-#, fuzzy
-#~ msgid "Trance"
-#~ msgstr "Uiterlijk"
-
-#, fuzzy
-#~ msgid "Space"
-#~ msgstr "/Opslaan"
-
-#, fuzzy
-#~ msgid "Comedy"
-#~ msgstr "Opmerking"
-
-#, fuzzy
-#~ msgid "Cult"
-#~ msgstr "Handmatige instelling:"
-
-#, fuzzy
-#~ msgid "Rave"
-#~ msgstr "/Opslaan"
-
-#, fuzzy
-#~ msgid "Trailer"
-#~ msgstr "Titel"
-
-#, fuzzy
-#~ msgid "Polka"
-#~ msgstr "/Afspelen"
-
-#, fuzzy
-#~ msgid "Retro"
-#~ msgstr "stereo"
-
-#, fuzzy
-#~ msgid "Latin"
-#~ msgstr "Italiaans:"
-
-#, fuzzy
-#~ msgid "Primus"
-#~ msgstr "/Vorige"
-
-#, fuzzy
-#~ msgid "Satire"
-#~ msgstr "/Opslaan"
-
-#, fuzzy
-#~ msgid "Duet"
-#~ msgstr "Nederlands:"
-
-#, fuzzy
-#~ msgid "Club-House"
-#~ msgstr "Muis"
-
-#, fuzzy
-#~ msgid "Terror"
-#~ msgstr "stereo"
-
-#, fuzzy
-#~ msgid "Indie"
-#~ msgstr "Zoeken naar:"
-
-#, fuzzy
-#~ msgid "BritPop"
-#~ msgstr "Artiest Popup"
-
-#, fuzzy
-#~ msgid "Beat"
-#~ msgstr "/Herhalen"
-
-#, fuzzy
-#~ msgid "Synthpop"
-#~ msgstr "/Stop"
-
-#, fuzzy
-#~ msgid ""
-#~ "<big>Audacious %s</big>\n"
-#~ "An audio player for many platforms.\n"
-#~ "Copyright (C) 2005-2011 Audacious Development Team"
-#~ msgstr ""
-#~ "<big>Audacious %s</big>\n"
-#~ "De toekomst van UNIX multimedia.\n"
-#~ "\n"
-#~ "Copyright (C) 2005-2006 Audacious ontwikkelteam\n"
-
-#~ msgid "Unable to create log file (%s)!\n"
-#~ msgstr "Kon logbestand niet aanmaken (%s)!\n"
-
-#, fuzzy
-#~ msgid "Playback"
-#~ msgstr "/A_fspelen"
-
-#~ msgid "Playback"
-#~ msgstr "Afspelen"
-
-#~ msgid ""
-#~ "When Audacious starts, automatically begin playing from the point where "
-#~ "we stopped before."
-#~ msgstr ""
-#~ "Wanneer Audacious gestart wordt zal afspelen hervatten van dezelfde "
-#~ "positie als waar het bij het afsluiten stopte."
-
-# -e, --enqueue switch
-#~ msgid "Don't advance in the playlist"
-#~ msgstr "Niet vooruitlopen in de speellijst"
-
-#~ msgid ""
-#~ "When finished playing a song, don't automatically advance to the next."
-#~ msgstr ""
-#~ "Ga niet automatisch naar het volgende nummer, wanneer het huidige nummer "
-#~ "is afgelopen."
-
-#~ msgid "Enabled"
-#~ msgstr "Actief"
-
-#~ msgid "Description"
-#~ msgstr "Beschrijving"
-
-#~ msgid "Output Plugin Preferences"
-#~ msgstr "Instellingen uitvoer-plugin"
-
-#~ msgid "Output Plugin Information"
-#~ msgstr "Informatie over uitvoer-plugin"
-
-#~ msgid "_Decoder list:"
-#~ msgstr "_Decoder-lijst:"
-
-#~ msgid "Decoders"
-#~ msgstr "Decoders"
-
-#~ msgid "_General plugin list:"
-#~ msgstr "_Algemene plugin-lijst:"
-
-#~ msgid "General"
-#~ msgstr "Algemeen"
-
-#~ msgid "_Visualization plugin list:"
-#~ msgstr "_Visualisatie plugin-lijst:"
-
-#~ msgid "Visualization"
-#~ msgstr "Visualisatie"
-
-#, fuzzy
-#~ msgid "Effect plugins:"
-#~ msgstr "_Effect plugin-lijst:"
-
-#, fuzzy
-#~ msgid "General"
-#~ msgstr "Genre"
-
-#~ msgid "Location"
-#~ msgstr "Locatie"
-
-#, fuzzy
-#~ msgid "Raw Metadata"
-#~ msgstr "Jaar"
-
-#, fuzzy
-#~ msgid "Value"
-#~ msgstr "/Pause"
-
-#, fuzzy
-#~ msgid ""
-#~ "Available interfaces:\n"
-#~ "\n"
-#~ msgstr "Beschikbare _Opgeslagen instellingen:"
-
-#, fuzzy
-#~ msgid "Available Plugin Preferences:\n"
-#~ msgstr "Beschikbare _Opgeslagen instellingen:"
-
-#, fuzzy
-#~ msgid "Add/Open URL Dialog"
-#~ msgstr "Toevoegen/Bestanden openen venster"
-
-#~ msgid "Enter location to play:"
-#~ msgstr "Geef afspeellocatie op:"
-
-# -e, --enqueue switch
-#~ msgid "Don't clear the playlist"
-#~ msgstr "Speellijst niet wissen"
-
-#~ msgid "audacious: %s"
-#~ msgstr "audacious: %s"
-
-#~ msgid "Filename:"
-#~ msgstr "Bestandsnaam:"
-
-#~ msgid "No input plugin recognized this file"
-#~ msgstr "Geen invoer-plugin heeft dit bestand herkend"
-
-#~ msgid ""
-#~ "<big>No output plugin selected.</big>\n"
-#~ "You have not selected an output plugin."
-#~ msgstr ""
-#~ "<big>Geen uitvoer-plugin geselecteerd.</big>\n"
-#~ "U heeft (nog) geen uitvoer-plugin gekozen."
-
-#~ msgid "Connectivity"
-#~ msgstr "Verbindingen"
-
-#, fuzzy
-#~ msgid ""
-#~ "When checked, Audacious will detect file formats based by extension. Only "
-#~ "files with extensions of supported formats will be loaded."
-#~ msgstr ""
-#~ "Als deze optie ingeschakeld is wordt het formaat van een bestand pas bij "
-#~ "het afspelen bepaald. Dit kan een rommelige afspeellijst opleveren, maar "
-#~ "versnelt het inladen van bestanden aanzienlijk."
-
-#, fuzzy
-#~ msgid "Advanced"
-#~ msgstr "Afspelen"
-
-#, fuzzy
-#~ msgid ""
-#~ "<big>Audacious %s</big>\n"
-#~ "\n"
-#~ "Copyright (C) 2005-2009 Audacious Development Team"
-#~ msgstr ""
-#~ "<big>Audacious %s</big>\n"
-#~ "De toekomst van UNIX multimedia.\n"
-#~ "\n"
-#~ "Copyright (C) 2005-2006 Audacious ontwikkelteam\n"
-
-#~ msgid "Detect file formats on demand, instead of immediately."
-#~ msgstr "Detecteer bestandsformaat op het laatste moment."
-
-#, fuzzy
-#~ msgid ""
-#~ "When checked, Audacious will detect file formats on demand. This can "
-#~ "result in a messier playlist, but delivers a major speed benefit."
-#~ msgstr ""
-#~ "Als deze optie ingeschakeld is wordt het formaat van een bestand pas bij "
-#~ "het afspelen bepaald. Dit kan een rommelige afspeellijst opleveren, maar "
-#~ "versnelt het inladen van bestanden aanzienlijk."
-
-#~ msgid "Load metadata from playlists and files"
-#~ msgstr "Metadata van speellijsten en bestanden laden"
-
-#~ msgid "Load metadata (tag information) from music files."
-#~ msgstr "Metadata (tag-informatie) van muziekbestanden laden"
-
-#~ msgid "minutes:seconds"
-#~ msgstr "minuten:seconden"
-
-#~ msgid "Track length:"
-#~ msgstr "Duur:"
-
-#, fuzzy
-#~ msgid "Save as Static Playlist"
-#~ msgstr "Afspeellijst opslaan"
-
-#~ msgid "Error writing playlist \"%s\": %s"
-#~ msgstr "Fout bij wegschrijven afspeellijst \"%s\": %s"
-
-#~ msgid "%s already exist. Continue?"
-#~ msgstr "%s bestaat reeds. Wilt u doorgaan?"
-
-#~ msgid ""
-#~ "<big>Unable to save playlist.</big>\n"
-#~ "\n"
-#~ "Unknown file type for '%s'.\n"
-#~ msgstr ""
-#~ "<big>Kon de afspeellijst niet opslaan.</big>\n"
-#~ "\n"
-#~ "Onbekend bestandstype voor '%s'.\n"
-
-#~ msgid "Presets"
-#~ msgstr "Standen"
-
-#~ msgid "Mouse"
-#~ msgstr "Muis"
-
-# -u, --pause switch
-#~ msgid "Pause between songs"
-#~ msgstr "Pauzeer tussen nummers"
-
-#~ msgid "Pause for"
-#~ msgstr "Pauzeer voor"
-
-#~ msgid "seconds"
-#~ msgstr "seconden"
-
-#~ msgid "Filename"
-#~ msgstr "Bestandsnaam"
-
-#~ msgid "Convert underscores to blanks"
-#~ msgstr "Converteer underscores naar spaties"
-
-#~ msgid "Convert %20 to blanks"
-#~ msgstr "Converteer %20 naar spaties"
-
-#~ msgid "File Dialog"
-#~ msgstr "Bestandsvenster"
-
-#~ msgid "Always refresh directory when opening file dialog"
-#~ msgstr ""
-#~ "Ververs altijd de mapinhoud bij het openen van het bestandsvenster, niet "
-#~ "noodzakelijk als Gnome VFS actief is."
-
-#~ msgid ""
-#~ "Always refresh the file dialog (this will slow opening the dialog on "
-#~ "large directories, and Gnome VFS should handle automatically)."
-#~ msgstr ""
-#~ "Ververs altijd het bestandsvenster (dit kan het openen van het venster "
-#~ "vertragen voor grote mappen, en mag worden uitgeschakeld als Gnome-VFS "
-#~ "actief is)."
-
-#~ msgid "Changes volume by"
-#~ msgstr "Muiswiel verandert het volume met"
-
-#~ msgid "percent"
-#~ msgstr "procent"
-
-#~ msgid "Scrolls playlist by"
-#~ msgstr "Muiswiel scrollt de speellijst met"
-
-#~ msgid "lines"
-#~ msgstr "regels"
-
-# -s, --stop switch
-#, fuzzy
-#~ msgid "Stop after Current Song"
-#~ msgstr "/Stop na huidig nummer"
-
-#, fuzzy
-#~ msgid "Peaks"
-#~ msgstr "/Pause"
-
-#, fuzzy
-#~ msgid "Repeat"
-#~ msgstr "/Herhalen"
-
-#, fuzzy
-#~ msgid "Shuffle"
-#~ msgstr "/Willekeurig afspelen"
-
-#, fuzzy
-#~ msgid "No Playlist Advance"
-#~ msgstr "/Niet vooruitlopen in de speellijst"
-
-#, fuzzy
-#~ msgid "Play"
-#~ msgstr "/Afspelen"
-
-#, fuzzy
-#~ msgid "Pause"
-#~ msgstr "/Pause"
-
-#, fuzzy
-#~ msgid "Stop"
-#~ msgstr "/Stop"
-
-#, fuzzy
-#~ msgid "Previous"
-#~ msgstr "/Vorige"
-
-#, fuzzy
-#~ msgid "Next"
-#~ msgstr "/Volgende"
-
-#, fuzzy
-#~ msgid "Visualization Mode"
-#~ msgstr "/Visualisatie type"
-
-#, fuzzy
-#~ msgid "Analyzer Mode"
-#~ msgstr "/Analyzer type/Vurig"
-
-#, fuzzy
-#~ msgid "Scope Mode"
-#~ msgstr "/Scope type"
-
-#, fuzzy
-#~ msgid "Voiceprint Mode"
-#~ msgstr "/Analyzer type/Vurig"
-
-#, fuzzy
-#~ msgid "WindowShade VU Mode"
-#~ msgstr "/Vensterschaduw VU type"
-
-#, fuzzy
-#~ msgid "Refresh Rate"
-#~ msgstr "/Ververssnelheid"
-
-#, fuzzy
-#~ msgid "Analyzer Falloff"
-#~ msgstr "/Analyzer snelheid"
-
-#, fuzzy
-#~ msgid "Peaks Falloff"
-#~ msgstr "/Toppen snelheid"
-
-#, fuzzy
-#~ msgid "New Playlist"
-#~ msgstr "Afspeellijst opslaan"
-
-#, fuzzy
-#~ msgid "Select Next Playlist"
-#~ msgstr "Kies het lettertype voor de speellijst:"
-
-#, fuzzy
-#~ msgid "Select Previous Playlist"
-#~ msgstr "/Selectie sorteren/Op volgorde afspeellijst"
-
-#, fuzzy
-#~ msgid "Delete Playlist"
-#~ msgstr "Kies het lettertype voor de speellijst:"
-
-#, fuzzy
-#~ msgid "Load List"
-#~ msgstr "/Lijst laden"
-
-#, fuzzy
-#~ msgid "Loads a playlist file into the selected playlist."
-#~ msgstr "Metadata laden zodra het bestand wordt weergegeven in de speellijst"
-
-#, fuzzy
-#~ msgid "Save List"
-#~ msgstr "/Lijst opslaan"
-
-#, fuzzy
-#~ msgid "Saves the selected playlist."
-#~ msgstr "Kies het lettertype voor de speellijst:"
-
-#, fuzzy
-#~ msgid "Save Default List"
-#~ msgstr "/Standaardlijst Opslaan"
-
-#, fuzzy
-#~ msgid "Saves the selected playlist to the default location."
-#~ msgstr "Gebruik XMMS-stijl bestandsdialoog ipv standaard"
-
-#, fuzzy
-#~ msgid "Refresh List"
-#~ msgstr "Skin-lijst verversen"
-
-#, fuzzy
-#~ msgid "List Manager"
-#~ msgstr "/Niet vooruitlopen in de speellijst"
-
-# -e, --enqueue switch
-#, fuzzy
-#~ msgid "Opens the playlist manager."
-#~ msgstr "Speellijst niet wissen"
-
-#, fuzzy
-#~ msgid "View"
-#~ msgstr "/_Geef weer"
-
-#, fuzzy
-#~ msgid "Add Internet Address..."
-#~ msgstr "/Internet adres toevoegen..."
-
-# -e, --enqueue switch
-#, fuzzy
-#~ msgid "Adds a remote track to the playlist."
-#~ msgstr "Speellijst niet wissen"
-
-#, fuzzy
-#~ msgid "Add Files..."
-#~ msgstr "/Bestanden toevoegen..."
-
-#, fuzzy
-#~ msgid "Search and Select"
-#~ msgstr "Zoekdiepte: "
-
-#, fuzzy
-#~ msgid "Invert Selection"
-#~ msgstr "/Selectie omkeren"
-
-#, fuzzy
-#~ msgid "Inverts the selected and unselected entries."
-#~ msgstr "Kies het lettertype voor de speellijst:"
-
-#~ msgid "Select All"
-#~ msgstr "Selecteer alles"
-
-#, fuzzy
-#~ msgid "Select None"
-#~ msgstr "/Deselecteer alles"
-
-# -e, --enqueue switch
-#, fuzzy
-#~ msgid "Deselects all of the playlist entries."
-#~ msgstr "Speellijst niet wissen"
-
-#, fuzzy
-#~ msgid "Remove All"
-#~ msgstr "/Alles wissen"
-
-#, fuzzy
-#~ msgid "Removes all entries from the playlist."
-#~ msgstr "/Ontoegankelijke bestanden wissen"
-
-#, fuzzy
-#~ msgid "Clear Queue"
-#~ msgstr "/Wachtrij wissen"
-
-#, fuzzy
-#~ msgid "Clears the queue associated with this playlist."
-#~ msgstr "Kies het lettertype voor de speellijst:"
-
-#, fuzzy
-#~ msgid "Remove Unavailable Files"
-#~ msgstr "/Ontoegankelijke bestanden wissen"
-
-#, fuzzy
-#~ msgid "Removes unavailable files from the playlist."
-#~ msgstr "/Ontoegankelijke bestanden wissen"
-
-#, fuzzy
-#~ msgid "Remove Duplicates"
-#~ msgstr "/Dubbele nummers wissen"
-
-#, fuzzy
-#~ msgid "By Title"
-#~ msgstr "Titel"
-
-#, fuzzy
-#~ msgid "Removes duplicate entries from the playlist by title."
-#~ msgstr "/Dubbele nummers wissen/Op locatie en bestandsnaam"
-
-#, fuzzy
-#~ msgid "By Filename"
-#~ msgstr "Bestandsnaam"
-
-#, fuzzy
-#~ msgid "Removes duplicate entries from the playlist by filename."
-#~ msgstr "/Dubbele nummers wissen/Op locatie en bestandsnaam"
-
-#, fuzzy
-#~ msgid "By Path + Filename"
-#~ msgstr "/Lijst sorteren/Op locatie en bestandsnaam"
-
-#, fuzzy
-#~ msgid "Removes duplicate entries from the playlist by their full path."
-#~ msgstr "/Dubbele nummers wissen/Op locatie en bestandsnaam"
-
-#, fuzzy
-#~ msgid "Remove Unselected"
-#~ msgstr "/Selectie behouden"
-
-#, fuzzy
-#~ msgid "Remove unselected entries from the playlist."
-#~ msgstr "/Dubbele nummers wissen/Op locatie en bestandsnaam"
-
-#, fuzzy
-#~ msgid "Remove Selected"
-#~ msgstr "/Selectie wissen"
-
-#, fuzzy
-#~ msgid "Remove selected entries from the playlist."
-#~ msgstr "/Dubbele nummers wissen/Op locatie en bestandsnaam"
-
-#, fuzzy
-#~ msgid "Randomize List"
-#~ msgstr "/Willekeurig verdelen"
-
-#, fuzzy
-#~ msgid "Randomizes the playlist."
-#~ msgstr "/Willekeurig verdelen"
-
-#, fuzzy
-#~ msgid "Reverse List"
-#~ msgstr "/Omdraaien"
-
-# -e, --enqueue switch
-#, fuzzy
-#~ msgid "Reverses the playlist."
-#~ msgstr "Speellijst niet wissen"
-
-#, fuzzy
-#~ msgid "Sort List"
-#~ msgstr "/Lijst sorteren"
-
-#, fuzzy
-#~ msgid "Sorts the list by title."
-#~ msgstr "/Lijst sorteren/Op titel"
-
-#, fuzzy
-#~ msgid "By Album"
-#~ msgstr "Album"
-
-#, fuzzy
-#~ msgid "Sorts the list by album."
-#~ msgstr "/Lijst sorteren/Op titel"
-
-#, fuzzy
-#~ msgid "By Artist"
-#~ msgstr "Artiest"
-
-#, fuzzy
-#~ msgid "Sorts the list by artist."
-#~ msgstr "/Lijst sorteren/Op artiest"
-
-#, fuzzy
-#~ msgid "Sorts the list by filename."
-#~ msgstr "/Lijst sorteren/Op bestandsnaam"
-
-#, fuzzy
-#~ msgid "Sorts the list by full pathname."
-#~ msgstr "/Lijst sorteren/Op bestandsnaam"
-
-#, fuzzy
-#~ msgid "By Date"
-#~ msgstr "Datum"
-
-#, fuzzy
-#~ msgid "Sorts the list by modification time."
-#~ msgstr "/Lijst sorteren/Op titel"
-
-#, fuzzy
-#~ msgid "By Track Number"
-#~ msgstr "Nummer"
-
-#, fuzzy
-#~ msgid "Sorts the list by track number."
-#~ msgstr "/Lijst sorteren/Op tracknummer"
-
-#, fuzzy
-#~ msgid "By Playlist Entry"
-#~ msgstr "/Lijst sorteren/Op volgorde afspeellijst"
-
-#, fuzzy
-#~ msgid "Sorts the list by playlist entry."
-#~ msgstr "/Lijst sorteren/Op volgorde afspeellijst"
-
-#, fuzzy
-#~ msgid "Sort Selected"
-#~ msgstr "/Selectie sorteren"
-
-#, fuzzy
-#~ msgid "File"
-#~ msgstr "Titel"
-
-#, fuzzy
-#~ msgid "Components"
-#~ msgstr "Opmerking"
-
-#, fuzzy
-#~ msgid "View Track Details"
-#~ msgstr "/Nummer details weergeven"
-
-#, fuzzy
-#~ msgid "Play File"
-#~ msgstr "Bestand afspelen"
-
-#, fuzzy
-#~ msgid "Load and play a file"
-#~ msgstr "Metadata van speellijsten en bestanden laden"
-
-#, fuzzy
-#~ msgid "Play Location"
-#~ msgstr "Afspeellocatie:"
-
-#, fuzzy
-#~ msgid "Plugin services"
-#~ msgstr "Plugins"
-
-#, fuzzy
-#~ msgid "Preferences"
-#~ msgstr "/Instellingen"
-
-# load the interface
-#, fuzzy
-#~ msgid "Open preferences window"
-#~ msgstr "Instellingen venster"
-
-#, fuzzy
-#~ msgid "_Quit"
-#~ msgstr "/_Afsluiten"
-
-#, fuzzy
-#~ msgid "Quit Audacious"
-#~ msgstr "Over Audacious"
-
-#, fuzzy
-#~ msgid "Set A-B"
-#~ msgstr "A-B /herhaling"
-
-#, fuzzy
-#~ msgid "Clear A-B"
-#~ msgstr "A-B /wissen"
-
-#, fuzzy
-#~ msgid "Jump to Playlist Start"
-#~ msgstr "/Naar het begin van de speellijst"
-
-#, fuzzy
-#~ msgid "Jump to File"
-#~ msgstr "/Ga naar bestand"
-
-#, fuzzy
-#~ msgid "Queue Toggle"
-#~ msgstr "/In de wachtrij zetten"
-
-#, fuzzy
-#~ msgid "Load"
-#~ msgstr "/Laden"
-
-#, fuzzy
-#~ msgid "Import"
-#~ msgstr "/Importeer"
-
-#, fuzzy
-#~ msgid "Save"
-#~ msgstr "/Opslaan"
-
-#, fuzzy
-#~ msgid "Delete"
-#~ msgstr "/Wissen"
-
-#~ msgid "Preset"
-#~ msgstr "Standen"
-
-#~ msgid "Load preset"
-#~ msgstr "Standen laden"
-
-#, fuzzy
-#~ msgid "Auto-load preset"
-#~ msgstr "/Laden/Automatisch te laden stand"
-
-#, fuzzy
-#~ msgid "Load auto-load preset"
-#~ msgstr "/Laden/Automatisch te laden stand"
-
-#, fuzzy
-#~ msgid "Default"
-#~ msgstr "Standaard skin:"
-
-#, fuzzy
-#~ msgid "Load default preset into equalizer"
-#~ msgstr "Automatische stand opslaan"
-
-#, fuzzy
-#~ msgid "Zero"
-#~ msgstr "stereo"
-
-#, fuzzy
-#~ msgid "Set equalizer preset levels to zero"
-#~ msgstr "Equalizer standen opslaan"
-
-#, fuzzy
-#~ msgid "From file"
-#~ msgstr "/Laden/Bestand"
-
-#, fuzzy
-#~ msgid "Load preset from file"
-#~ msgstr "Standen laden"
-
-#, fuzzy
-#~ msgid "From WinAMP EQF file"
-#~ msgstr "/Laden/WinAMP EQF-bestand"
-
-#, fuzzy
-#~ msgid "Load preset from WinAMP EQF file"
-#~ msgstr "/Laden/WinAMP EQF-bestand"
-
-#, fuzzy
-#~ msgid "WinAMP Presets"
-#~ msgstr "/Importeer/WinAMP Equalizer stand"
-
-#, fuzzy
-#~ msgid "Import WinAMP presets"
-#~ msgstr "/Importeer/WinAMP Equalizer stand"
-
-#~ msgid "Save preset"
-#~ msgstr "Stand opslaan"
-
-#, fuzzy
-#~ msgid "Save auto-load preset"
-#~ msgstr "/Opslaan/Automatisch te laden stand"
-
-#, fuzzy
-#~ msgid "Save default preset"
-#~ msgstr "Automatische stand opslaan"
-
-#, fuzzy
-#~ msgid "To file"
-#~ msgstr "Bestanden laden"
-
-#, fuzzy
-#~ msgid "Save preset to file"
-#~ msgstr "Stand opslaan"
-
-#, fuzzy
-#~ msgid "To WinAMP EQF file"
-#~ msgstr "/Opslaan/Als WinAMP EQF bestand"
-
-#, fuzzy
-#~ msgid "Save preset to WinAMP EQF file"
-#~ msgstr "/Opslaan/Als WinAMP EQF bestand"
-
-#~ msgid "Delete preset"
-#~ msgstr "Stand wissen"
-
-#, fuzzy
-#~ msgid "Delete auto-load preset"
-#~ msgstr "/Wissen/Automatisch te laden stand"
-
-#, fuzzy
-#~ msgid ""
-#~ "This is the amount of time to prebuffer audio "
-#~ "streams by, in milliseconds.\n"
-#~ "Increase this value if you are experiencing audio skipping.\n"
-#~ "Please note however, that high values will result in Audacious performing "
-#~ "poorly."
-#~ msgstr ""
-#~ "Dit is de grootte van de prebuffer in "
-#~ "milliseconden.\n"
-#~ "Verhoog deze waarde als de audio klikt of overslaat.\n"
-#~ "Gelieve er rekening mee te houden dat overdreven grote waardes de "
-#~ "prestaties van Audacious sterk kunnen verminderen."
-
-#~ msgid ""
-#~ "<big>Unable to load skin.</big>\n"
-#~ "\n"
-#~ "Check that skin at '%s' is usable and default skin is properly installed "
-#~ "at '%s'\n"
-#~ msgstr ""
-#~ "<big>Kon de skin niet laden.</big>\n"
-#~ "\n"
-#~ "Controleer dat de skin bij '%s' bruikbaar is en de standaardskin correct "
-#~ "geinstalleerd bij '%s'\n"
-
-#, fuzzy
-#~ msgid "Headless operation enabled\n"
-#~ msgstr "Geen interface weergeven (headless) [experimenteel]"
-
-#~ msgid "Audacious core developers:"
-#~ msgstr "Audacious kern-ontwikkelaars:"
-
-#~ msgid "Audacious Equalizer"
-#~ msgstr "Audacious Equalizer"
-
-#~ msgid "Play files"
-#~ msgstr "Bestanden afspelen"
-
-#~ msgid "Load files"
-#~ msgstr "Bestanden laden"
-
-#~ msgid "%s - Audacious"
-#~ msgstr "%s - Audacious"
-
-#~ msgid "VBR"
-#~ msgstr "VBR"
-
-#~ msgid "mono"
-#~ msgstr "mono"
-
-#, fuzzy
-#~ msgid "Show main player window"
-#~ msgstr "Kies het lettertype voor het hoofdvenster:"
-
-#, fuzzy
-#~ msgid "Seek to: %d:%-2.2d/%d:%-2.2d (%d%%)"
-#~ msgstr "ZOEK NAAR: %d:%-2.2d/%d:%-2.2d (%d%%)"
-
-#, fuzzy
-#~ msgid "Disable 'Always On Top'"
-#~ msgstr "/Altijd op de voorgrond"
-
-#, fuzzy
-#~ msgid "Enable 'Always On Top'"
-#~ msgstr "/Altijd op de voorgrond"
-
-#, fuzzy
-#~ msgid "Visualization Menu"
-#~ msgstr "/Visualisatie type"
-
-#~ msgid ""
-#~ "<big>Couldn't open audio.</big>\n"
-#~ "\n"
-#~ "Please check that:\n"
-#~ "1. You have the correct output plugin selected.\n"
-#~ "2. No other programs is blocking the soundcard.\n"
-#~ "3. Your soundcard is configured properly.\n"
-#~ msgstr ""
-#~ "<big>Kon geluid niet openen.</big>\n"
-#~ "\n"
-#~ "Gelieve te controleren dat:\n"
-#~ "1. De correcte uitvoer plugin geselecteerd is\n"
-#~ "2. Geen andere programma's de geluidskaart blokkeren\n"
-#~ "3. Uw geluidskaart juist geconfigureerd is\n"
-
-#, fuzzy
-#~ msgid "Autoscroll Songname"
-#~ msgstr "/Titel automatisch scrollen"
-
-#, fuzzy
-#~ msgid "Show Player"
-#~ msgstr "Sp/eler weergeven"
-
-#, fuzzy
-#~ msgid "Show Playlist Editor"
-#~ msgstr "/Speellijst weergeven"
-
-#, fuzzy
-#~ msgid "Show Equalizer"
-#~ msgstr "/Equalizer weergeven"
-
-#, fuzzy
-#~ msgid "Always on Top"
-#~ msgstr "/Altijd op de voorgrond"
-
-#, fuzzy
-#~ msgid "Put on All Workspaces"
-#~ msgstr "/Op alle bureaubladen weergeven"
-
-#, fuzzy
-#~ msgid "Roll up Player"
-#~ msgstr "/Speler oprollen"
-
-#, fuzzy
-#~ msgid "Roll up Playlist Editor"
-#~ msgstr "/Speellijst oprollen"
-
-#, fuzzy
-#~ msgid "Roll up Equalizer"
-#~ msgstr "/Equalizer oprollen"
-
-#, fuzzy
-#~ msgid "Scale"
-#~ msgstr "/Opslaan"
-
-#, fuzzy
-#~ msgid "DoubleSize"
-#~ msgstr "/Dubbele grootte"
-
-#, fuzzy
-#~ msgid "Easy Move"
-#~ msgstr "/Eenvoudig verplaatsen"
-
-#, fuzzy
-#~ msgid "Analyzer"
-#~ msgstr "/Analyzer type"
-
-#, fuzzy
-#~ msgid "Scope"
-#~ msgstr "/Scope type"
-
-#, fuzzy
-#~ msgid "Voiceprint"
-#~ msgstr "/Analyzer type/Vurig"
-
-#, fuzzy
-#~ msgid "Vertical Lines"
-#~ msgstr "/Analyzer type/Verticale lijnen"
-
-#, fuzzy
-#~ msgid "Lines"
-#~ msgstr "regels"
-
-#, fuzzy
-#~ msgid "Dot Scope"
-#~ msgstr "/Scope type/Punt Scope"
-
-#, fuzzy
-#~ msgid "Line Scope"
-#~ msgstr "/Scope type/Lijn Scope"
-
-#, fuzzy
-#~ msgid "Solid Scope"
-#~ msgstr "/Scope type/Solide Scope"
-
-#, fuzzy
-#~ msgid "Smooth"
-#~ msgstr "mono"
-
-#, fuzzy
-#~ msgid "Full (~50 fps)"
-#~ msgstr "/Ververssnelheid/Volledig (~50 fps)"
-
-#, fuzzy
-#~ msgid "Half (~25 fps)"
-#~ msgstr "/Ververssnelheid/Half (~25 fps)"
-
-#, fuzzy
-#~ msgid "Quarter (~13 fps)"
-#~ msgstr "/Ververssnelheid/ɩn vierde (~13 fps)"
-
-#, fuzzy
-#~ msgid "Eighth (~6 fps)"
-#~ msgstr "/Ververssnelheid/ɩn achtste (~6 fps)"
-
-#, fuzzy
-#~ msgid "Time Elapsed"
-#~ msgstr "/Verstreken tijd"
-
-#, fuzzy
-#~ msgid "Time Remaining"
-#~ msgstr "/Resterende tijd"
-
-#, fuzzy
-#~ msgid "Plugin Services"
-#~ msgstr "Plugins"
-
-# -r, --rew switch
-#, fuzzy
-#~ msgid "Search entries in active playlist"
-#~ msgstr "Scheidingslijnen in de speellijst weergeven"
-
-#, fuzzy
-#~ msgid "Title: "
-#~ msgstr "Titel"
-
-#, fuzzy
-#~ msgid "Artist: "
-#~ msgstr "Artiest"
-
-#, fuzzy
-#~ msgid "Filename: "
-#~ msgstr "Bestandsnaam:"
-
-#~ msgid "Audacious Playlist Editor"
-#~ msgstr "Audacious afspeellijst-editor"
-
-#~ msgid "Appearance"
-#~ msgstr "Uiterlijk"
-
-#~ msgid "_Fonts"
-#~ msgstr "_Lettertypen"
-
-#~ msgid "_Player:"
-#~ msgstr "_Speler:"
-
-#~ msgid "Select main player window font:"
-#~ msgstr "Kies het lettertype voor het hoofdvenster:"
-
-#~ msgid "_Playlist:"
-#~ msgstr "_Afspeellijst:"
-
-#, fuzzy
-#~ msgid "Select playlist font:"
-#~ msgstr "Kies het lettertype voor het hoofdvenster:"
-
-#~ msgid "Use Bitmap fonts if available"
-#~ msgstr "Gebruik bitmapfonts (mits beschikbaar)"
-
-#~ msgid ""
-#~ "Use bitmap fonts if they are available. Bitmap fonts do not support "
-#~ "Unicode strings."
-#~ msgstr ""
-#~ "Gebruik bitmap-lettertypen als deze beschikbaar zijn. Bitmaplettertypen "
-#~ "ondersteunen geen unicode strings."
-
-#~ msgid "_Miscellaneous"
-#~ msgstr "_Diversen"
-
-# -r, --rew switch
-#~ msgid "Show track numbers in playlist"
-#~ msgstr "Positienummers in de speellijst weergeven"
-
-# -r, --rew switch
-#~ msgid "Show separators in playlist"
-#~ msgstr "Scheidingslijnen in de speellijst weergeven"
-
-#~ msgid "Show window manager decoration"
-#~ msgstr "Toon vensterdecoraties"
-
-#~ msgid "This enables the window manager to show decorations for windows."
-#~ msgstr "Dit laat de venster-beheerder decoraties om de vensters tekenen."
-
-#~ msgid "Use XMMS-style file selector instead of the default selector"
-#~ msgstr "Gebruik XMMS-stijl bestandsdialoog ipv standaard"
-
-#~ msgid ""
-#~ "This enables the XMMS/GTK1-style file selection dialogs. This selector is "
-#~ "provided by Audacious itself and is faster than the default GTK2 selector "
-#~ "(but sadly not as user-friendly)."
-#~ msgstr ""
-#~ "Dit schakelt de bestandsdialoog naar XMMS/GTK1-stijl. Deze selector wordt "
-#~ "door Audacious zelf aangeboden en is sneller dan de GTK2 uitvoering (maar "
-#~ "helaas niet even gebruikersvriendelijk)."
-
-#~ msgid "On load"
-#~ msgstr "Bij laden"
-
-#~ msgid "Load metadata when adding the file to the playlist or opening it"
-#~ msgstr "Metadata laden zodra een bestand wordt toegevoegd of geopened"
-
-#~ msgid "On display"
-#~ msgstr "Bij weergave"
-
-#, fuzzy
-#~ msgid ""
-#~ "Load metadata on demand when displaying the file in the playlist. You may "
-#~ "need to set \"Detect file formats on demand\" in Audio page for full "
-#~ "benefit."
-#~ msgstr "Metadata laden zodra een bestand wordt toegevoegd of geopened"
-
-#, fuzzy
-#~ msgid "Green"
-#~ msgstr "Grieks:"
-
-#~ msgid "_Skin"
-#~ msgstr "S_kin"
-
-#, fuzzy
-#~ msgid "Refresh skin list"
-#~ msgstr "Skin-lijst verversen"
-
-#~ msgid "PREAMP"
-#~ msgstr "Voorsterker"
-
-#~ msgid "60HZ"
-#~ msgstr "60HZ"
-
-#~ msgid "170HZ"
-#~ msgstr "170HZ"
-
-#~ msgid "310HZ"
-#~ msgstr "310HZ"
-
-#~ msgid "600HZ"
-#~ msgstr "600HZ"
-
-#~ msgid "1KHZ"
-#~ msgstr "1KHZ"
-
-#~ msgid "3KHZ"
-#~ msgstr "3KHZ"
-
-#~ msgid "6KHZ"
-#~ msgstr "6KHZ"
-
-#~ msgid "12KHZ"
-#~ msgstr "12KHZ"
-
-#~ msgid "14KHZ"
-#~ msgstr "14KHZ"
-
-#~ msgid "16KHZ"
-#~ msgstr "16KHZ"
-
-#~ msgid "Archived Winamp 2.x skin"
-#~ msgstr "Ingepakte Winamp 2.x skin"
-
-#~ msgid "Unarchived Winamp 2.x skin"
-#~ msgstr "Uitgepakte Winamp 2.x skin"
-
-#~ msgid "Use custom cursors"
-#~ msgstr "Gebruik muiscursors van skin"
-
-#, fuzzy
-#~ msgid "Reload Plugins"
-#~ msgstr "Plugins"
-
-#~ msgid ""
-#~ "Sorry, threads isn't supported on your platform.\n"
-#~ "\n"
-#~ "If you're on a libc5 based linux system and installed Glib & GTK+ before "
-#~ "you\n"
-#~ "installed LinuxThreads you need to recompile Glib & GTK+.\n"
-#~ msgstr ""
-#~ "Sorry, threads zijn niet ondersteund op uw platform.\n"
-#~ "\n"
-#~ "Als u gebruikt maakt van libc5 gebaseerde linux en u heeft Glib/GTK+ "
-#~ "geinstalleerd voordat u\n"
-#~ "LinuxThreads heeft geinstalleerd moet u Glib/GTK+ hercompileren.\n"
-
-#, fuzzy
-#~ msgid "Error in Audacious."
-#~ msgstr "%s - Audacious"
-
-# -n, --session switch
-#, fuzzy
-#~ msgid "Select which Audacious session ID to use"
-#~ msgstr "Kies Audacious sessie (Standaard: 0)"
-
-#, fuzzy
-#~ msgid "Disable 'Doublesize'"
-#~ msgstr "/Dubbele grootte"
-
-#, fuzzy
-#~ msgid "Enable 'Doublesize'"
-#~ msgstr "/Dubbele grootte"
-
-#~ msgid "Presets"
-#~ msgstr "Opgeslagen equalizer standen"
-
-#~ msgid "File preset extension:"
-#~ msgstr "Extensie van standenbestand:"
-
-#~ msgid "Directory preset file:"
-#~ msgstr "Map voor standenbestand:"
-
-#~ msgid "localhost"
-#~ msgstr "locale machine"
-
-#~ msgid ""
-#~ "<big>Unable to create %s.</big>\n"
-#~ "\n"
-#~ "Could not open glade file (%s). Please check your installation.\n"
-#~ msgstr ""
-#~ "<big>Kan %s niet aanmaken.</big>\n"
-#~ "\n"
-#~ "Het glade-bestand (%s) kon niet geopend worden. Is uw installatie "
-#~ "compleet?\n"
-
-#~ msgid ""
-#~ "TITLE\n"
-#~ "ARTIST - TITLE\n"
-#~ "ARTIST - ALBUM - TITLE\n"
-#~ "ARTIST - ALBUM - TRACK. TITLE\n"
-#~ "ARTIST [ ALBUM ] - TRACK. TITLE\n"
-#~ "ALBUM - TITLE\n"
-#~ "Custom"
-#~ msgstr ""
-#~ "TITEL\n"
-#~ "ARTIEST - TITLE\n"
-#~ "ARTIEST - ALBUM - TITEL\n"
-#~ "ARTIEST - ALBUM - TRACKNR. TITEL\n"
-#~ "ARTIEST [ ALBUM ] - TRACKNR. TITEL\n"
-#~ "ALBUM - TITEL\n"
-#~ "Aanpassen"
-
-#~ msgid "Track Information Window"
-#~ msgstr "Nummer-info"
-
-# load the interface
-#~ msgid "Preferences Window"
-#~ msgstr "Instellingen venster"
-
-#, fuzzy
-#~ msgid "Artist: %s"
-#~ msgstr "Artiest"
-
-#, fuzzy
-#~ msgid "Title: %s"
-#~ msgstr "Titel"
-
-#, fuzzy
-#~ msgid "Album: %s"
-#~ msgstr "Album"
-
-#, fuzzy
-#~ msgid "Audacious last.fm radio tuner"
-#~ msgstr "Audacious afspeellijst-editor"
-
-#, fuzzy
-#~ msgid "Artist:"
-#~ msgstr "Artiest"
-
-#, fuzzy
-#~ msgid "Album:"
-#~ msgstr "Album"
-
-#~ msgid "VOLUME: %d%%"
-#~ msgstr "VOLUME: %d%%"
-
-#~ msgid "BALANCE: %d%% LEFT"
-#~ msgstr "BALANS: %d%% LINKS"
-
-#~ msgid "BALANCE: CENTER"
-#~ msgstr "BALANS: MIDDEN"
-
-#~ msgid "BALANCE: %d%% RIGHT"
-#~ msgstr "BALANS: %d%% RECHTS"
-
-#, fuzzy
-#~ msgid "Last.fm radio"
-#~ msgstr "Afspeellocatie:"
-
-#, fuzzy
-#~ msgid "Play Last.fm radio"
-#~ msgstr "Afspeellocatie:"
-
-#~ msgid ""
-#~ "<big>No playable CD found.</big>\n"
-#~ "\n"
-#~ "No CD inserted, or inserted CD is not an audio CD.\n"
-#~ msgstr ""
-#~ "<big>Geen afspeelbare CD gevonden.</big>\n"
-#~ "\n"
-#~ "Geen CD aanwezig of de aanwezige CD is geen audio CD.\n"
-
-#, fuzzy
-#~ msgid "Add CD..."
-#~ msgstr "/CD toevoegen..."
-
-#, fuzzy
-#~ msgid "Play CD"
-#~ msgstr "/CD afspelen"
-
-#~ msgid "Performer/Artist"
-#~ msgstr "Artiest"
-
-#~ msgid "File name"
-#~ msgstr "Bestandsnaam"
-
-#~ msgid "File path"
-#~ msgstr "Bestandslocatie"
-
-#~ msgid "File extension"
-#~ msgstr "Bestandstype"
-
-#~ msgid "Track number"
-#~ msgstr "Nummer"
-
-#~ msgid "%{n:...%}: Display \"...\" only if element %n is present"
-#~ msgstr ""
-#~ "%{n:...%}: Geef \"...\" alleen weer wanneer element %n beschikbaar is"
-
-#~ msgid ""
-#~ "Sorry, your GTK+ version (%d.%d.%d) does not work with Audacious.\n"
-#~ "Please use GTK+ %s or newer.\n"
-#~ msgstr ""
-#~ "Sorry, uw GTK+ versie (%d.%d.%d) werkt niet met Audacious.\n"
-#~ "Gelieve GTK+ %s of nieuwer te installeren.\n"
-
-#~ msgid "OPTIONS MENU"
-#~ msgstr "OPTIES-MENU"
-
-#~ msgid "DISABLE ALWAYS ON TOP"
-#~ msgstr "ALTIJD OP VOORGROND UITSCHAKELEN"
-
-#~ msgid "ENABLE ALWAYS ON TOP"
-#~ msgstr "ALTIJD OP VOORGROND INSCHAKELEN"
-
-#~ msgid "FILE INFO BOX"
-#~ msgstr "BESTANDSINFORMATIE BOX"
-
-#~ msgid "DISABLE DOUBLESIZE"
-#~ msgstr "DUBBEL FORMAAT UIT"
-
-#~ msgid "ENABLE DOUBLESIZE"
-#~ msgstr "DUBBEL FORMAAT AAN"
-
-#~ msgid "VISUALIZATION MENU"
-#~ msgstr "VISUALISATIE MENU"
-
-#, fuzzy
-#~ msgid "Track name: "
-#~ msgstr "Titel"
-
-#~ msgid ""
-#~ "<big>Unable to play files.</big>\n"
-#~ "\n"
-#~ "The following files could not be played. Please check that:\n"
-#~ "1. they are accessible.\n"
-#~ "2. you have enabled the media plugins required."
-#~ msgstr ""
-#~ "<big>Kon bestanden niet afspelen.</big>\n"
-#~ "\n"
-#~ "De bestanden konden niet afgespeeld worden, controleer dat:\n"
-#~ "1. U toegang heeft to de bestanden.\n"
-#~ "2. U de correcte plugins heeft aanstaan."
-
-#~ msgid "Show more _details"
-#~ msgstr "Geef meer _details weer"
-
-#~ msgid ""
-#~ "\n"
-#~ "Received SIGSEGV\n"
-#~ "\n"
-#~ "This could be a bug in Audacious. If you don't know why this happened, "
-#~ "file a bug at http://bugs-meta.atheme.org/\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "SIGSEGV-signaal ontvangen\n"
-#~ "\n"
-#~ "Dit is mogelijk een bug in Audacious. Gelieve zonder externe plugins te "
-#~ "proberen.\n"
-#~ "Als u niet weet waarom dit gebeurde, rapporteer dan een bug bij uw "
-#~ "linuxdistributie.\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Enables playlist transparency. This is not recommended for slower "
-#~ "machines as it requires some CPU time to create and cache the pixmaps "
-#~ "used for the transparency."
-#~ msgstr ""
-#~ "Maakt de afspeellijst doorzichtig. Dit is niet aan te raden op langzamere "
-#~ "machines aangezien er enige CPU-tijd nodig is om de benodigde pixmaps aan "
-#~ "te maken en actueel te houden."
-
-#~ msgid "Enable playlist transparency"
-#~ msgstr "Gebruik doorzichtige speellijst"
-
-#~ msgid "%s: option `%s' is ambiguous\n"
-#~ msgstr "%s: optie `%s' is dubbelzinnig\n"
-
-#~ msgid "%s: option `--%s' doesn't allow an argument\n"
-#~ msgstr "%s: optie `--%s' staat geen argument toe\n"
-
-#~ msgid "%s: option `%c%s' doesn't allow an argument\n"
-#~ msgstr "%s: optie `%c%s' staat geen argument toe\n"
-
-#~ msgid "%s: option `%s' requires an argument\n"
-#~ msgstr "%s: optie `%s' heeft een argument nodig\n"
-
-#~ msgid "%s: unrecognized option `%c%s'\n"
-#~ msgstr "%s: unbekende optie `%c%s'\n"
-
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: illegale optie -- %c\n"
-
-#~ msgid "%s: invalid option -- %c\n"
-#~ msgstr "%s: ongeldige optie -- %c\n"
-
-#~ msgid "%s: option requires an argument -- %c\n"
-#~ msgstr "%s: optie heeft een argument nodig -- %c\n"
-
-#~ msgid "%s: option `-W %s' is ambiguous\n"
-#~ msgstr "%s: optie `-W %s' is dubbelzinnig\n"
-
-#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
-#~ msgstr "%s: optie `-W %s' staat geen argument toe\n"
-
-#~ msgid ""
-#~ "Usage: audacious [options] [files] ...\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "--------\n"
-#~ msgstr ""
-#~ "Gebruik: audacious [opties] [bestanden] ...\n"
-#~ "\n"
-#~ "Opties:\n"
-#~ "--------\n"
-
-# -h, --help switch
-#~ msgid "Display this text and exit"
-#~ msgstr "Deze tekst weergeven en stoppen"
-
-#~ msgid "Activate Audacious"
-#~ msgstr "Activeer Audacious"
-
-#~ msgid "Previous session ID"
-#~ msgstr "Vorige session ID"
-
-#~ msgid "Disable error/warning interception (logging)"
-#~ msgstr "Fouten & waarschuwingen niet afvangen (logging uitschakelen)"
-
-# -v, --version switch
-#~ msgid "Print version number and exit\n"
-#~ msgstr "Versienummer weergeven en stoppen\n"
-
-#~ msgid "Add/Open Files dialog"
-#~ msgstr "Toevoegen/Bestanden openen venster"
-
-#~ msgid "Close Dialog on Add"
-#~ msgstr "Sluit venster bij toevoegen"
-
-#~ msgid "Deselect All"
-#~ msgstr "Deselecteer alles"
-
-#~ msgid "Track Information Popup"
-#~ msgstr "Nummer-info popup"
-
-#~ msgid "Genre"
-#~ msgstr "Genre"
-
-#~ msgid "Year"
-#~ msgstr "Jaar"
-
-#~ msgid "Track Number"
-#~ msgstr "Nummer"
-
-#~ msgid "Track Length"
-#~ msgstr "Speelduur:"
-
-#~ msgid "label65"
-#~ msgstr "label65"
-
-#~ msgid "label76"
-#~ msgstr "label76"
-
-#~ msgid "/View Track Details"
-#~ msgstr "/Nummer details weergeven"
-
-#~ msgid "/Visualization Mode/Analyzer"
-#~ msgstr "/Visualisatie type/Analyzer"
-
-#~ msgid "/Visualization Mode/Scope"
-#~ msgstr "/Visualisatie type/Scope"
-
-#, fuzzy
-#~ msgid "/Visualization Mode/Voiceprint"
-#~ msgstr "/Visualisatie type/Scope"
-
-#~ msgid "/Visualization Mode/Off"
-#~ msgstr "/Visualisatie type/Uit"
-
-#~ msgid "/Analyzer Mode/Normal"
-#~ msgstr "/Analyzer type/Normaal"
-
-#~ msgid "/Analyzer Mode/Lines"
-#~ msgstr "/Analyzer type/Lijnen"
-
-#~ msgid "/Analyzer Mode/Bars"
-#~ msgstr "/Analyzer type/Balken"
-
-#~ msgid "/Analyzer Mode/Peaks"
-#~ msgstr "/Analyzer type/Toppen"
-
-#, fuzzy
-#~ msgid "/Voiceprint mode/Normal"
-#~ msgstr "/Analyzer type/Normaal"
-
-#~ msgid "/WindowShade VU Mode/Normal"
-#~ msgstr "/Vensterschaduw VU type/Normaal"
-
-#~ msgid "/WindowShade VU Mode/Smooth"
-#~ msgstr "/Vensterschaduw VU type/Soepel"
-
-#~ msgid "/Analyzer Falloff/Slowest"
-#~ msgstr "/Analyzer snelheid/Sloom"
-
-#~ msgid "/Analyzer Falloff/Slow"
-#~ msgstr "/Analyzer snelheid/Langzaam"
-
-#~ msgid "/Analyzer Falloff/Medium"
-#~ msgstr "/Analyzer snelheid/Normaal"
-
-#~ msgid "/Analyzer Falloff/Fast"
-#~ msgstr "/Analyzer snelheid/Sneller"
-
-#~ msgid "/Analyzer Falloff/Fastest"
-#~ msgstr "/Analyzer snelheid/Snelst"
-
-#~ msgid "/Peaks Falloff/Slowest"
-#~ msgstr "/Toppen snelheid/Sloom"
-
-#~ msgid "/Peaks Falloff/Slow"
-#~ msgstr "/Toppen snelheid/Langzaam"
-
-#~ msgid "/Peaks Falloff/Medium"
-#~ msgstr "/Toppen snelheid/Normaal"
-
-#~ msgid "/Peaks Falloff/Fast"
-#~ msgstr "/Toppen snelheid/Sneller"
-
-#~ msgid "/Peaks Falloff/Fastest"
-#~ msgstr "/Toppen snelheid/Snelst"
-
-#~ msgid "/-"
-#~ msgstr "/-"
-
-#~ msgid "/Jump to Time"
-#~ msgstr "/Ga naar tijd"
-
-#~ msgid "/About Audacious"
-#~ msgstr "/Over Audacious"
-
-#~ msgid "/Files..."
-#~ msgstr "/Bestanden..."
-
-#~ msgid "/Internet location..."
-#~ msgstr "/Internet adres..."
-
-#, fuzzy
-#~ msgid "New List"
-#~ msgstr "/Nieuwe lijst"
-
-# -r, --rew switch
-#, fuzzy
-#~ msgid "Creates a new playlist."
-#~ msgstr "Scheidingslijnen in de speellijst weergeven"
-
-#, fuzzy
-#~ msgid "Displays track information."
-#~ msgstr "Nummer-informatie:"
-
-#~ msgid "/Load/Preset"
-#~ msgstr "/Laden/Stand"
-
-#~ msgid "/Load/Default"
-#~ msgstr "/Laden/Standaard stand"
-
-#~ msgid "/Load/Zero"
-#~ msgstr "/Laden/Neutrale stand"
-
-#~ msgid "/Save/Preset"
-#~ msgstr "/Opslaan/Huidige stand"
-
-#~ msgid "/Save/Default"
-#~ msgstr "/Opslaan/Als standaard stand"
-
-#~ msgid "/Save/To file"
-#~ msgstr "/Opslaan/Als bestand"
-
-#~ msgid "/Delete/Preset"
-#~ msgstr "/Wissen/Stand"
-
-#~ msgid "Load auto-preset"
-#~ msgstr "Automatische standen laden"
-
-#~ msgid "Load equalizer preset"
-#~ msgstr "Equalizer standen laden"
-
-#~ msgid "Delete auto-preset"
-#~ msgstr "Automatische standen wissen"
-
-#~ msgid "/Show Popup Info"
-#~ msgstr "/Popup informatie tonen"
-
-#~ msgid "/Remove Duplicates/By Title"
-#~ msgstr "/Dubbele nummers wissen/Op titel"
-
-#~ msgid "/Remove Duplicates/By Filename"
-#~ msgstr "/Dubbele nummers wissen/Op bestandsnaam"
-
-#~ msgid "/Update View"
-#~ msgstr "/Verversen"
-
-#~ msgid "/Select All"
-#~ msgstr "/Selecteer alles"
-
-#~ msgid "/Sort List/By Date"
-#~ msgstr "/Lijst sorteren/Op datum"
-
-#~ msgid "/Sort Selection/By Title"
-#~ msgstr "/Selectie sorteren/Op titel"
-
-#~ msgid "/Sort Selection/By Artist"
-#~ msgstr "/Selectie sorteren/Op artiest"
-
-#~ msgid "/Sort Selection/By Filename"
-#~ msgstr "/Selectie sorteren/Op bestandsnaam"
-
-#~ msgid "/Sort Selection/By Path + Filename"
-#~ msgstr "/Selectie sorteren/Op locatie en bestandsnaam"
-
-#~ msgid "/Sort Selection/By Date"
-#~ msgstr "/Selectie sorteren/Op datum"
-
-#~ msgid "/Sort Selection/By Track Number"
-#~ msgstr "/Selectie sorteren/Op tracknummer"
-
-#~ msgid "/Sort Selection/By Playlist Entry"
-#~ msgstr "/Selectie sorteren/Op volgorde afspeellijst"
-
-#~ msgid "_Miscillaneous UI Features"
-#~ msgstr "Diverse opties"
-
-#~ msgid "This enables the window mangaer to show decorations for windows."
-#~ msgstr "Dit laat de venster-beheerder decoraties om de vensters tekenen."
+msgstr ""

audacious-3.1.1.tar.bz2/po/pl.po -> audacious-3.2.4.tar.bz2/po/pl.po Changed

@@ -6,13 +6,15 @@
 # Bartosz Kosiorek <gang65@poczta.onet.pl>, 2003.
 # GNOME PL Team <translators@gnome.pl>, 2004.
 # Grzegorz Kowal <g_kowal@poczta.onet.pl>, 2000, 2001.
+# Piotr Sokół <psokol@jabster.pl>, 2012.
+# Szymon Weihs <sz.weihs@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious\n"
-"Report-Msgid-Bugs-To: http://jira.atheme.org/browse/AUD\n"
-"POT-Creation-Date: 2011-10-19 21:32-0400\n"
-"PO-Revision-Date: 2011-11-17 00:53+0000\n"
-"Last-Translator: Shymwo <sz.weihs@gmail.com>\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2012-01-11 08:54-0500\n"
+"PO-Revision-Date: 2012-01-29 17:44+0000\n"
+"Last-Translator: Piotr Sokół <psokol@jabster.pl>\n"
 "Language-Team: Polish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,11 +22,11 @@
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: src/audacious/adder.c:71
+#: src/audacious/adder.c:77
 msgid "Searching ..."
-msgstr "Szukanie..."
+msgstr "Wyszukiwanie..."
 
-#: src/audacious/adder.c:97
+#: src/audacious/adder.c:113
 #, c-format
 msgid "%d file found"
 msgid_plural "%d files found"
@@ -32,637 +34,654 @@
 msgstr[1] "Znaleziono %d pliki"
 msgstr[2] "Znaleziono %d plików"
 
-#: src/audacious/chardet.c:38
+#: src/audacious/chardet.c:39
 msgid " (invalid UTF-8)"
-msgstr " (nieprawidłowy UTF-8)"
+msgstr " (nieprawidłowe kodowanie UTF-8)"
 
-#: src/audacious/credits.c:35
+#: src/audacious/credits.c:37
 msgid "Core developers:"
-msgstr "Programiści:"
+msgstr "Główni programiści:"
 
-#: src/audacious/credits.c:49
+#: src/audacious/credits.c:51
 msgid "Graphics:"
 msgstr "Grafika:"
 
-#: src/audacious/credits.c:54
+#: src/audacious/credits.c:56
 msgid "Default skin:"
-msgstr "Domyślna skóra:"
+msgstr "Domyślny styl:"
 
-#: src/audacious/credits.c:60
+#: src/audacious/credits.c:62
 msgid "Plugin development:"
-msgstr "Twórcy pluginów:"
+msgstr "Programiści wtyczek:"
 
-#: src/audacious/credits.c:83
+#: src/audacious/credits.c:85
 msgid "Patch authors:"
 msgstr "Autorzy poprawek:"
 
-#: src/audacious/credits.c:126
+#: src/audacious/credits.c:131
 msgid "1.x developers:"
 msgstr "Programiści wersji 1.x"
 
-#: src/audacious/credits.c:148
+#: src/audacious/credits.c:153
 msgid "BMP Developers:"
 msgstr "Programiści BMP:"
 
-#: src/audacious/credits.c:180
+#: src/audacious/credits.c:185
 msgid "Belarusian:"
 msgstr "Bułgarski:"
 
-#: src/audacious/credits.c:183
+#: src/audacious/credits.c:188
 msgid "Basque:"
 msgstr "Baskijski:"
 
-#: src/audacious/credits.c:186
+#: src/audacious/credits.c:191
 msgid "Brazilian Portuguese:"
 msgstr "Brazylijski Portugalski:"
 
-#: src/audacious/credits.c:191
+#: src/audacious/credits.c:196
 msgid "Breton:"
 msgstr "Bretoński:"
 
-#: src/audacious/credits.c:194
+#: src/audacious/credits.c:199
 msgid "Bulgarian:"
 msgstr "Bułgarski:"
 
-#: src/audacious/credits.c:197
+#: src/audacious/credits.c:202
 msgid "Catalan:"
 msgstr "Kataloński:"
 
-#: src/audacious/credits.c:200
+#: src/audacious/credits.c:206
 msgid "Chinese:"
 msgstr "Chiński:"
 
-#: src/audacious/credits.c:203
+#: src/audacious/credits.c:209
 msgid "Croatian:"
 msgstr "Chorwacki:"
 
-#: src/audacious/credits.c:206
+#: src/audacious/credits.c:212
 msgid "Czech:"
 msgstr "Czeski:"
 
-#: src/audacious/credits.c:209
+#: src/audacious/credits.c:215
 msgid "Dutch:"
 msgstr "Holenderski:"
 
-#: src/audacious/credits.c:213
+#: src/audacious/credits.c:219
 msgid "Estonian:"
 msgstr "Estoński:"
 
-#: src/audacious/credits.c:216
+#: src/audacious/credits.c:222
 msgid "Finnish:"
 msgstr "Fiński:"
 
-#: src/audacious/credits.c:221
+#: src/audacious/credits.c:227
 msgid "French:"
 msgstr "Francuski:"
 
-#: src/audacious/credits.c:227
+#: src/audacious/credits.c:233
 msgid "German:"
 msgstr "Niemiecki:"
 
-#: src/audacious/credits.c:234
+#: src/audacious/credits.c:240
 msgid "Georgian:"
 msgstr "Gruziński:"
 
-#: src/audacious/credits.c:237
+#: src/audacious/credits.c:243
 msgid "Greek:"
 msgstr "Grecki:"
 
-#: src/audacious/credits.c:242
+#: src/audacious/credits.c:248
 msgid "Hindi:"
 msgstr "Hinduski:"
 
-#: src/audacious/credits.c:245
+#: src/audacious/credits.c:251
 msgid "Hungarian:"
 msgstr "Węgierski:"
 
-#: src/audacious/credits.c:249
+#: src/audacious/credits.c:255
 msgid "Italian:"
 msgstr "Włoski:"
 
-#: src/audacious/credits.c:253
+#: src/audacious/credits.c:260
 msgid "Japanese:"
 msgstr "Japoński:"
 
-#: src/audacious/credits.c:256
+#: src/audacious/credits.c:263
 msgid "Korean:"
 msgstr "Koreański:"
 
-#: src/audacious/credits.c:259
+#: src/audacious/credits.c:266
 msgid "Latvian:"
 msgstr "Łotewski:"
 
-#: src/audacious/credits.c:262
+#: src/audacious/credits.c:269
 msgid "Lithuanian:"
 msgstr "Litewski:"
 
-#: src/audacious/credits.c:267
+#: src/audacious/credits.c:274
 msgid "Macedonian:"
 msgstr "Macedoński:"
 
-#: src/audacious/credits.c:270
+#: src/audacious/credits.c:277
+msgid "Mexican Spanish:"
+msgstr "Hiszpański (Meksykański):"
+
+#: src/audacious/credits.c:280
 msgid "Polish:"
 msgstr "Polski:"
 
-#: src/audacious/credits.c:276
+#: src/audacious/credits.c:287
 msgid "Portuguese:"
 msgstr "Portugalski:"
 
-#: src/audacious/credits.c:279
+#: src/audacious/credits.c:290
 msgid "Romanian:"
 msgstr "Rumuński:"
 
-#: src/audacious/credits.c:283
+#: src/audacious/credits.c:294
 msgid "Russian:"
 msgstr "Rosyjski:"
 
-#: src/audacious/credits.c:287
+#: src/audacious/credits.c:298
 msgid "Serbian (Latin):"
 msgstr "Serbski (Łaciński):"
 
-#: src/audacious/credits.c:290
+#: src/audacious/credits.c:301
 msgid "Serbian (Cyrillic):"
 msgstr "Serbski (Cyrylica):"
 
-#: src/audacious/credits.c:293
+#: src/audacious/credits.c:305
 msgid "Simplified Chinese:"
 msgstr "Chiński uproszczony:"
 
-#: src/audacious/credits.c:296
+#: src/audacious/credits.c:308
 msgid "Slovak:"
 msgstr "Słowacki:"
 
-#: src/audacious/credits.c:299
+#: src/audacious/credits.c:312
 msgid "Spanish:"
 msgstr "Hiszpański:"
 
-#: src/audacious/credits.c:306
+#: src/audacious/credits.c:320
 msgid "Swedish:"
 msgstr "Szwedzki:"
 
-#: src/audacious/credits.c:309
+#: src/audacious/credits.c:323
 msgid "Traditional Chinese:"
 msgstr "Chiński tradycyjny:"
 
-#: src/audacious/credits.c:315
+#: src/audacious/credits.c:329
 msgid "Turkish:"
 msgstr "Turecki:"
 
-#: src/audacious/credits.c:319
+#: src/audacious/credits.c:333
 msgid "Ukrainian:"
 msgstr "Ukraiński:"
 
-#: src/audacious/credits.c:323
+#: src/audacious/credits.c:338
 msgid "Vietnamese:"
 msgstr "Wietnamski:"
 
-#: src/audacious/credits.c:326
+#: src/audacious/credits.c:341
 msgid "Welsh:"
 msgstr "Walijski:"
 
-#: src/audacious/drct.c:234
-msgid "Temporary Playlist"
-msgstr "Tymczasowe"
-
-#: src/audacious/equalizer_preset.c:186
+#: src/audacious/equalizer_preset.c:180
 #, c-format
 msgid "Error importing Winamp EQF file '%s'"
-msgstr "Błąd importowania pliku Winamp EQF: %s"
+msgstr "Błąd importowania pliku EQF, programu Winamp: %s"
 
-#: src/audacious/main.c:239
+#: src/audacious/main.c:243
 msgid "Skip backwards in playlist"
-msgstr "Przeskakuje do poprzedniego utworu na liście odtwarzania"
+msgstr "Przechodzi do poprzedniego nagrania na liście odtwarzania"
 
-#: src/audacious/main.c:240
+#: src/audacious/main.c:244
 msgid "Start playing current playlist"
 msgstr "Rozpoczyna odtwarzanie bieżącej listy odtwarzania"
 
-#: src/audacious/main.c:241
+#: src/audacious/main.c:245
 msgid "Pause current song"
-msgstr "Wstrzymuje bieżący utwór"
+msgstr "Wstrzymuje odtwarzanie bieżącego nagrania"
 
-#: src/audacious/main.c:242
+#: src/audacious/main.c:246
 msgid "Stop current song"
-msgstr "Zatrzymuje bieżący utwór"
+msgstr "Zatrzymuje odtwarzanie bieżącego nagrania"
 
-#: src/audacious/main.c:243
+#: src/audacious/main.c:247
 msgid "Pause if playing, play otherwise"
-msgstr "Wstrzymuje, jeśli odtwarzany jest utwór, w przeciwnym razie wznawia"
+msgstr "Wstrzymuje i wznawia odtwarzanie bieżącego nagrania"
 
-#: src/audacious/main.c:244
+#: src/audacious/main.c:248
 msgid "Skip forward in playlist"
-msgstr "Przechodzi do następnego utworu na liście odtwarzania"
+msgstr "Przechodzi do następnego nagrania na liście odtwarzania"
 
-#: src/audacious/main.c:245
+#: src/audacious/main.c:249
 msgid "Display Jump to File dialog"
-msgstr "Wyświetl okno dialogowe Skocz do pliku"
+msgstr "Wyświetla okno dialogowe przechodzenia do nagrania"
 
-#: src/audacious/main.c:246
+#: src/audacious/main.c:250
 msgid "Add files to the playlist"
-msgstr "Dodaje pliki do listy odtwarzania."
+msgstr "Dodaje pliki do listy odtwarzania"
 
-#: src/audacious/main.c:247
+#: src/audacious/main.c:251
 msgid "Add new files to a temporary playlist"
-msgstr "Dodaj nowe pliki do tymczasowej listy odtwarzania"
+msgstr "Dodaje pliki do tymczasowej listy odtwarzania"
 
-#: src/audacious/main.c:248
+#: src/audacious/main.c:252
 msgid "Display the main window"
-msgstr "Wyświetla główne okno"
+msgstr "Wyświetla główne okno programu"
 
-#: src/audacious/main.c:249
+#: src/audacious/main.c:253
 msgid "Show version"
-msgstr "Pokaż wersję"
+msgstr "Wypisuje informacje o wersji"
 
-#: src/audacious/main.c:250
+#: src/audacious/main.c:254
 msgid "Print debugging messages"
-msgstr "Wyświetl komunikaty debugera"
+msgstr "Wypisuje komunikaty diagnozowania błędów"
 
-#: src/audacious/main.c:251
+#: src/audacious/main.c:255
 msgid "Headless mode (beta)"
-msgstr "Tryb \"Headless\" (bez gui - beta)"
+msgstr "Uruchamia w trybie bez interfajsu graficznego (beta)"
 
-#: src/audacious/main.c:252
+#: src/audacious/main.c:256
 msgid "FILE..."
 msgstr "PLIK..."
 
-#: src/audacious/main.c:264
+#: src/audacious/main.c:268
 msgid "- play multimedia files"
 msgstr " - odtwarza pliki multimedialne"
 
-#: src/audacious/main.c:274
+#: src/audacious/main.c:278
 #, c-format
 msgid ""
 "%s: %s\n"
 "Try `%s --help' for more information.\n"
 msgstr ""
 "%s: %s\n"
-"Napisz `%s --help', żeby dowiedzieć się więcej.\n"
+"Proszę wprowadzić „%s --help”, aby wypisać komunikat pomocy.\n"
 
-#: src/audacious/main.c:547
+#: src/audacious/main.c:573
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/audacious/playback.c:303
+#: src/audacious/playback.c:307
 #, c-format
 msgid "No decoder found for %s."
-msgstr "Nie znaleziono dekodera dla %s"
+msgstr "Nie odnaleziono dekodera dla %s."
+
+#: src/audacious/playlist-files.c:53
+#, c-format
+msgid "Cannot %s %s: unsupported file extension."
+msgstr "Nie można %s %s: nieobsługiwane rozszerzenie pliku."
+
+#: src/audacious/playlist-files.c:54
+msgid "save"
+msgstr "zapisać"
 
-#: src/audacious/playlist-new.c:315
-msgid "Untitled Playlist"
-msgstr "Nowa lista"
+#: src/audacious/playlist-files.c:54
+msgid "load"
+msgstr "wczytać"
 
-#: src/audacious/playlist-new.c:1496
+#: src/audacious/playlist-new.c:131
+msgid "New Playlist"
+msgstr "Nowa lista odtwarzania"
+
+#: src/audacious/playlist-new.c:132
+msgid "Now Playing"
+msgstr "Aktualnie odtwarzane"
+
+#: src/audacious/playlist-new.c:1630
 msgid ""
 "The playlist cannot be sorted because metadata scanning is still in progress"
 " (or has been disabled)."
 msgstr ""
-"Lista odtwarzania nie może zostać posortowana, gdyż odczytywanie metadanych "
+"Nie można posortować listy odtwarzania, ponieważ odczytywanie metadanych "
 "nadal trwa albo zostało ono wyłączone."
 
-#: src/audacious/ui_preferences.c:88
+#: src/audacious/ui_preferences.c:85
 msgid "Audio"
-msgstr "Audio"
+msgstr "Dźwięk"
 
-#: src/audacious/ui_preferences.c:89
+#: src/audacious/ui_preferences.c:86
 msgid "Network"
 msgstr "Sieć"
 
-#: src/audacious/ui_preferences.c:90 src/audacious/ui_preferences.c:1634
+#: src/audacious/ui_preferences.c:87 src/audacious/ui_preferences.c:1603
 msgid "Playlist"
 msgstr "Lista odtwarzania"
 
-#: src/audacious/ui_preferences.c:91
+#: src/audacious/ui_preferences.c:88
 msgid "Plugins"
 msgstr "Wtyczki"
 
-#: src/audacious/ui_preferences.c:97 src/libaudgui/infopopup.c:203
+#: src/audacious/ui_preferences.c:94 src/libaudgui/infopopup.c:199
 msgid "Artist"
 msgstr "Wykonawca"
 
-#: src/audacious/ui_preferences.c:98 src/libaudgui/infopopup.c:205
+#: src/audacious/ui_preferences.c:95 src/libaudgui/infopopup.c:201
 msgid "Album"
 msgstr "Album"
 
-#: src/audacious/ui_preferences.c:99 src/libaudgui/infopopup.c:201
-#: src/libaudgui/ui_playlist_manager.c:276
+#: src/audacious/ui_preferences.c:96 src/libaudgui/infopopup.c:197
+#: src/libaudgui/ui_playlist_manager.c:279
 msgid "Title"
 msgstr "Tytuł"
 
-#: src/audacious/ui_preferences.c:100
+#: src/audacious/ui_preferences.c:97
 msgid "Tracknumber"
-msgstr "Numer utworu"
+msgstr "Numer ścieżki"
 
-#: src/audacious/ui_preferences.c:101 src/libaudgui/infopopup.c:207
+#: src/audacious/ui_preferences.c:98 src/libaudgui/infopopup.c:203
 msgid "Genre"
 msgstr "Gatunek"
 
-#: src/audacious/ui_preferences.c:102
+#: src/audacious/ui_preferences.c:99
 msgid "Filename"
 msgstr "Nazwa pliku"
 
-#: src/audacious/ui_preferences.c:103
+#: src/audacious/ui_preferences.c:100
 msgid "Filepath"
 msgstr "Położenie pliku"
 
-#: src/audacious/ui_preferences.c:104
+#: src/audacious/ui_preferences.c:101
 msgid "Date"
-msgstr "Data"
+msgstr "Data wydania"
 
-#: src/audacious/ui_preferences.c:105 src/libaudgui/infopopup.c:209
+#: src/audacious/ui_preferences.c:102 src/libaudgui/infopopup.c:205
 msgid "Year"
-msgstr "Rok"
+msgstr "Rok wydania"
 
-#: src/audacious/ui_preferences.c:106
+#: src/audacious/ui_preferences.c:103
 msgid "Comment"
 msgstr "Komentarz"
 
-#: src/audacious/ui_preferences.c:107
+#: src/audacious/ui_preferences.c:104
 msgid "Codec"
 msgstr "Kodek"
 
-#: src/audacious/ui_preferences.c:108
+#: src/audacious/ui_preferences.c:105
 msgid "Quality"
 msgstr "Jakość"
 
-#: src/audacious/ui_preferences.c:114
+#: src/audacious/ui_preferences.c:111
 msgid "None"
 msgstr "Brak"
 
-#: src/audacious/ui_preferences.c:115
+#: src/audacious/ui_preferences.c:112
 msgid "Arabic"
 msgstr "Arabski"
 
-#: src/audacious/ui_preferences.c:116
+#: src/audacious/ui_preferences.c:113
 msgid "Baltic"
 msgstr "Bałtycki"
 
-#: src/audacious/ui_preferences.c:117
+#: src/audacious/ui_preferences.c:114
 msgid "Chinese"
 msgstr "Chiński"
 
-#: src/audacious/ui_preferences.c:118
+#: src/audacious/ui_preferences.c:115
 msgid "Greek"
 msgstr "Grecki"
 
-#: src/audacious/ui_preferences.c:119
+#: src/audacious/ui_preferences.c:116
 msgid "Hebrew"
 msgstr "Hebrajski"
 
-#: src/audacious/ui_preferences.c:120
+#: src/audacious/ui_preferences.c:117
 msgid "Japanese"
 msgstr "Japoński"
 
-#: src/audacious/ui_preferences.c:121
+#: src/audacious/ui_preferences.c:118
 msgid "Korean"
 msgstr "Koreański"
 
-#: src/audacious/ui_preferences.c:122
+#: src/audacious/ui_preferences.c:119
 msgid "Polish"
 msgstr "Polski"
 
-#: src/audacious/ui_preferences.c:123
+#: src/audacious/ui_preferences.c:120
 msgid "Russian"
 msgstr "Rosyjski"
 
-#: src/audacious/ui_preferences.c:124
+#: src/audacious/ui_preferences.c:121
 msgid "Taiwanese"
 msgstr "Tajwański"
 
-#: src/audacious/ui_preferences.c:125
+#: src/audacious/ui_preferences.c:122
 msgid "Turkish"
 msgstr "Turecki"
 
-#: src/audacious/ui_preferences.c:147
+#: src/audacious/ui_preferences.c:144
 msgid "Album mode"
-msgstr "Album"
+msgstr "Tryb albumu"
 
-#: src/audacious/ui_preferences.c:150
+#: src/audacious/ui_preferences.c:147
 msgid "Output Settings"
-msgstr "Opcje wyjściowe dźwięku"
+msgstr "Wyjście dźwiękowe"
 
-#: src/audacious/ui_preferences.c:152
+#: src/audacious/ui_preferences.c:149
 msgid "Bit depth:"
-msgstr "Głębia:"
+msgstr "Rozdzielczość bitowa:"
 
-#: src/audacious/ui_preferences.c:155
+#: src/audacious/ui_preferences.c:152
 msgid "Buffer size:"
 msgstr "Rozmiar bufora:"
 
-#: src/audacious/ui_preferences.c:157
+#: src/audacious/ui_preferences.c:154
 msgid "ms"
 msgstr "ms"
 
-#: src/audacious/ui_preferences.c:158
+#: src/audacious/ui_preferences.c:155
 msgid "Use software volume control (not recommended)"
-msgstr "Użyj programowej regulacji głośności (niezalecane)"
+msgstr "Użycie programowej regulacji głośności (niezalecane)"
 
-#: src/audacious/ui_preferences.c:160
+#: src/audacious/ui_preferences.c:157
 msgid "Replay Gain"
 msgstr "Replay Gain"
 
-#: src/audacious/ui_preferences.c:161
+#: src/audacious/ui_preferences.c:158
 msgid "Enable Replay Gain"
-msgstr "Włącz Replay Gain"
+msgstr "Włączenie"
 
-#: src/audacious/ui_preferences.c:164
+#: src/audacious/ui_preferences.c:161
 msgid "Prevent clipping (recommended)"
-msgstr "Zapobiegaj zakłóceniom (zalecane)"
+msgstr "Zapobieganie zakłóceniom (zalecane)"
 
-#: src/audacious/ui_preferences.c:166
+#: src/audacious/ui_preferences.c:163
 msgid "Adjust Levels"
-msgstr "Dostrój poziomy"
+msgstr "Dostrajanie"
 
-#: src/audacious/ui_preferences.c:167
+#: src/audacious/ui_preferences.c:164
 msgid "Amplify all files:"
-msgstr "Wzmocnij wszystkie pliki:"
+msgstr "Wzmocnienie wszystkich plików:"
 
-#: src/audacious/ui_preferences.c:169 src/audacious/ui_preferences.c:172
+#: src/audacious/ui_preferences.c:166 src/audacious/ui_preferences.c:169
 msgid "dB"
 msgstr "dB"
 
-#: src/audacious/ui_preferences.c:170
+#: src/audacious/ui_preferences.c:167
 msgid "Amplify untagged files:"
-msgstr "Wzmocnij nieotagowane pliki:"
+msgstr "Wzmocnienie plików bez etykiet:"
 
-#: src/audacious/ui_preferences.c:175
+#: src/audacious/ui_preferences.c:172
 msgid "Proxy hostname:"
-msgstr "Nazwa proxy:"
+msgstr "Nazwa komputera:"
 
-#: src/audacious/ui_preferences.c:176
+#: src/audacious/ui_preferences.c:173
 msgid "Proxy port:"
-msgstr "Port proxy:"
+msgstr "Port:"
 
-#: src/audacious/ui_preferences.c:179
+#: src/audacious/ui_preferences.c:176
 msgid "Proxy username:"
-msgstr "Użytkownik proxy:"
+msgstr "Nazwa użytkownika:"
 
-#: src/audacious/ui_preferences.c:180
+#: src/audacious/ui_preferences.c:177
 msgid "Proxy password:"
-msgstr "Hasło dla proxy:"
+msgstr "Hasło:"
 
-#: src/audacious/ui_preferences.c:184
+#: src/audacious/ui_preferences.c:181
 msgid "Proxy Configuration"
-msgstr "Konfiguracja proxy"
+msgstr "Pośrednik sieciowy"
 
-#: src/audacious/ui_preferences.c:185
+#: src/audacious/ui_preferences.c:182
 msgid "Enable proxy usage"
-msgstr "Włącz ustawienia proxy"
+msgstr "Włączenie"
 
-#: src/audacious/ui_preferences.c:188
+#: src/audacious/ui_preferences.c:185
 msgid "Use authentication with proxy"
-msgstr "Użyj uwierzytelniania dla proxy"
+msgstr "Uwierzytelnianie"
 
-#: src/audacious/ui_preferences.c:196
+#: src/audacious/ui_preferences.c:193
 msgid "Auto character encoding detector for:"
-msgstr "Autodetekcja kodowania na:"
+msgstr "Automatycze wykrywanie kodowania dla:"
 
-#: src/audacious/ui_preferences.c:201
+#: src/audacious/ui_preferences.c:198
 msgid "Fallback character encodings:"
 msgstr "Zastępcze kodowanie znaków:"
 
-#: src/audacious/ui_preferences.c:205
+#: src/audacious/ui_preferences.c:202
 msgid "Behavior"
 msgstr "Zachowanie"
 
-#: src/audacious/ui_preferences.c:206
+#: src/audacious/ui_preferences.c:203
 msgid "Continue playback on startup"
-msgstr "Kontynuuj grę po uruchomieniu programu"
+msgstr "Kontynuowanie odtwarzania po uruchomieniu programu"
 
-#: src/audacious/ui_preferences.c:208
+#: src/audacious/ui_preferences.c:205
 msgid "Advance when the current song is deleted"
-msgstr "Odtwarzaj następny, gdy aktualny utwór zostanie usunięty"
+msgstr "Przejście do następnego nagrania po napotkaniu niedostępnego"
 
-#: src/audacious/ui_preferences.c:210
+#: src/audacious/ui_preferences.c:207
 msgid "Clear the playlist when opening files"
-msgstr "Wyczyść listę odtwarzania przy otwieraniu nowych plików"
+msgstr "Czyszczenie listy odtwarzania podczas otwierania nowych plików"
 
-#: src/audacious/ui_preferences.c:212
+#: src/audacious/ui_preferences.c:209
 msgid "Open files in a temporary playlist"
-msgstr "Dodaj nowe pliki do tymczasowej listy odtwarzania"
+msgstr "Dodawanie plików do tymczasowej listy odtwarzania"
 
-#: src/audacious/ui_preferences.c:214
+#: src/audacious/ui_preferences.c:211
 msgid "Metadata"
-msgstr "Opcje metadanych"
+msgstr "Metadane"
 
-#: src/audacious/ui_preferences.c:215
+#: src/audacious/ui_preferences.c:212
 msgid "Do not load metadata for songs until played"
-msgstr "Nie ładuj metadanych dla piosenek, dopóki nie zostaną odtworzone."
+msgstr "Opóźnienie wczytywania metadanych nagrań do czasu ich odtworzenia"
 
-#: src/audacious/ui_preferences.c:233
+#: src/audacious/ui_preferences.c:230
 msgid "TITLE"
 msgstr "TYTUŁ"
 
-#: src/audacious/ui_preferences.c:234
+#: src/audacious/ui_preferences.c:231
 msgid "ARTIST - TITLE"
-msgstr "ARTYSTA - TYTUŁ"
+msgstr "WYKONAWCA - TYTUŁ"
 
-#: src/audacious/ui_preferences.c:235
+#: src/audacious/ui_preferences.c:232
 msgid "ARTIST - ALBUM - TITLE"
-msgstr "ARTYSTA - ALBUM - TYTUŁ"
+msgstr "WYKONAWCA - ALBUM - TYTUŁ"
 
-#: src/audacious/ui_preferences.c:236
+#: src/audacious/ui_preferences.c:233
 msgid "ARTIST - ALBUM - TRACK. TITLE"
-msgstr "ARTYSTA - ALBUM - UTWÓR. TYTUŁ"
+msgstr "WYKONAWCA - ALBUM - NUMER ŚCIEŻKI. TYTUŁ"
 
-#: src/audacious/ui_preferences.c:237
+#: src/audacious/ui_preferences.c:234
 msgid "ARTIST [ ALBUM ] - TRACK. TITLE"
-msgstr "ARTYSTA [ ALBUM ] - UTWÓR. TYTUŁ"
+msgstr "WYKONAWCA [ ALBUM ] - NUMER ŚCIEŻKI. TYTUŁ"
 
-#: src/audacious/ui_preferences.c:238
+#: src/audacious/ui_preferences.c:235
 msgid "ALBUM - TITLE"
 msgstr "ALBUM - TYTUŁ"
 
-#: src/audacious/ui_preferences.c:577
+#: src/audacious/ui_preferences.c:556
 msgid "Category"
 msgstr "Kategoria"
 
-#: src/audacious/ui_preferences.c:801
+#: src/audacious/ui_preferences.c:780
 msgid "Popup Information Settings"
-msgstr "Ustawienia informacji w dymkach"
+msgstr "Ustawienia informacji podręcznych"
 
-#: src/audacious/ui_preferences.c:810
+#: src/audacious/ui_preferences.c:789
 msgid "Cover image retrieve"
 msgstr "Wyszukiwanie okładek albumów"
 
-#: src/audacious/ui_preferences.c:815
+#: src/audacious/ui_preferences.c:794
 msgid ""
 "While searching for the album's cover, Audacious looks for certain words in "
 "the filename. You can specify those words in the lists below, separated "
 "using commas."
 msgstr ""
-"Podczas poszukiwania okładek albumów Audacious szuka konkretnych słów w "
-"nazwach plików. Możesz określić te słowa w listach poniżej, oddzielając je "
-"średnikami"
+"Podczas poszukiwania okładek albumów, program wyszukuje konkretnych wyrażeń "
+"w nazwach plików. Można określić te wyrażenia w poniższych polach, "
+"rozdzielając je przecinkami."
 
-#: src/audacious/ui_preferences.c:832
+#: src/audacious/ui_preferences.c:811
 msgid "Exclude:"
-msgstr "Omiń:"
+msgstr "Pomijanie:"
 
-#: src/audacious/ui_preferences.c:839
+#: src/audacious/ui_preferences.c:818
 msgid "Include:"
-msgstr "Użyj:"
+msgstr "Uwzględnianie:"
 
-#: src/audacious/ui_preferences.c:856
+#: src/audacious/ui_preferences.c:835
 msgid "Recursively search for cover"
-msgstr "Rekurencyjnie szukaj okładek"
+msgstr "Wyszukiwanie rekurencyjne"
 
-#: src/audacious/ui_preferences.c:866
+#: src/audacious/ui_preferences.c:845
 msgid "Search depth: "
 msgstr "Głębokość wyszukiwania: "
 
-#: src/audacious/ui_preferences.c:880
+#: src/audacious/ui_preferences.c:859
 msgid "Use per-file cover"
-msgstr "Użyj osobnej okładki do każdego pliku"
+msgstr "Używanie osobnej okładki dla każdego pliku"
 
-#: src/audacious/ui_preferences.c:883
+#: src/audacious/ui_preferences.c:862
 msgid "Miscellaneous"
 msgstr "Różne"
 
-#: src/audacious/ui_preferences.c:892
+#: src/audacious/ui_preferences.c:871
 msgid "Show Progress bar for the current track"
-msgstr "Pokaż pasek postępu dla aktualnej ścieżki"
+msgstr "Wyświetlanie paska postępu dla bieżącego nagrania"
 
-#: src/audacious/ui_preferences.c:902
+#: src/audacious/ui_preferences.c:881
 msgid "Delay until filepopup comes up: "
 msgstr "Opóźnienie wyświetlania informacji:"
 
-#: src/audacious/ui_preferences.c:1340
+#: src/audacious/ui_preferences.c:1309
 msgid "Custom"
 msgstr "Własny"
 
-#: src/audacious/ui_preferences.c:1383
+#: src/audacious/ui_preferences.c:1352
 msgid "Song Display"
 msgstr "Wyświetlanie utworu"
 
-#: src/audacious/ui_preferences.c:1392
+#: src/audacious/ui_preferences.c:1361
 msgid "Show song numbers"
-msgstr "Pokaż numery utworów"
+msgstr "Numery ścieżek"
 
-#: src/audacious/ui_preferences.c:1403
+#: src/audacious/ui_preferences.c:1372
 msgid "Show leading zeroes (02:00 instead of 2:00)"
-msgstr "Pokaż zera wiodące (02:00 zamiast 2:00)"
+msgstr "Zera wiodące (02:00 zamiast 2:00)"
 
-#: src/audacious/ui_preferences.c:1425
+#: src/audacious/ui_preferences.c:1394
 msgid "Show information about titlestring format"
-msgstr "Pokaż informację o formacie ciągu tytułowego"
+msgstr "Wyświetla informacje o formatowaniu"
 
-#: src/audacious/ui_preferences.c:1441
+#: src/audacious/ui_preferences.c:1410
 msgid "Custom string:"
 msgstr "Własny:"
 
-#: src/audacious/ui_preferences.c:1448
+#: src/audacious/ui_preferences.c:1417
 msgid "Title format:"
 msgstr "Format tytułu:"
 
-#: src/audacious/ui_preferences.c:1459
+#: src/audacious/ui_preferences.c:1428
 msgid "Popup Information"
-msgstr "Informacja w dymkach"
+msgstr "Informacje podręczne"
 
-#: src/audacious/ui_preferences.c:1474
+#: src/audacious/ui_preferences.c:1443
 msgid "Show popup information for playlist entries"
-msgstr "Pokaż informacje w dymkach dla wpisów na liście"
+msgstr "Wyświetlanie podręcznych informacji elementów listy odtwarzania"
 
-#: src/audacious/ui_preferences.c:1475
+#: src/audacious/ui_preferences.c:1444
 msgid ""
 "Toggles popup information window for the pointed entry in the playlist. The "
 "window shows title of song, name of album, genre, year of publish, track "
@@ -672,60 +691,65 @@
 "Okno to ukazuje informacje o tytule, nazwie albumu, rodzaju muzyki, roku "
 "publikacji, numeru ścieżki, jej długości oraz zdjęcie okładki."
 
-#: src/audacious/ui_preferences.c:1486
+#: src/audacious/ui_preferences.c:1455
 msgid "Edit settings for popup information"
-msgstr "Edytuj wpisy dla informacji o dymkach"
+msgstr "Modyfikuje ustawienia podręcznych informacji"
 
-#: src/audacious/ui_preferences.c:1575
+#: src/audacious/ui_preferences.c:1544
 msgid "Output plugin:"
 msgstr "Wtyczka:"
 
-#: src/audacious/ui_preferences.c:1634
+#: src/audacious/ui_preferences.c:1603
 msgid "Transport"
 msgstr "Transport"
 
-#: src/audacious/ui_preferences.c:1634
+#: src/audacious/ui_preferences.c:1603
 msgid "Input"
 msgstr "Wejście"
 
-#: src/audacious/ui_preferences.c:1635
+#: src/audacious/ui_preferences.c:1604
 msgid "Effect"
 msgstr "Efekty"
 
-#: src/audacious/ui_preferences.c:1635
+#: src/audacious/ui_preferences.c:1604
 msgid "Visualization"
 msgstr "Wizualizacja"
 
-#: src/audacious/ui_preferences.c:1635
+#: src/audacious/ui_preferences.c:1604
 msgid "General"
 msgstr "Ogólne"
 
-#: src/audacious/ui_preferences.c:1675
+#: src/audacious/ui_preferences.c:1644
 msgid "Audacious Preferences"
-msgstr "Ustawienia Audacious"
+msgstr "Preferencje programu Audacious"
 
-#: src/audacious/util.c:123
+#: src/audacious/util.c:120
 #, c-format
 msgid "Could not create directory (%s): %s\n"
-msgstr "Nie można utworzyć folderu (%s): %s\n"
+msgstr "Nie można utworzyć katalogu (%s): %s\n"
 
-#: src/audtool/handlers_playlist.c:274
+#: src/audtool/handlers_playlist.c:273
 msgid "Position not found."
-msgstr "Pozycja nie została znaleziona"
+msgstr "Nie odnaleziono pozycji"
 
-#: src/audtool/handlers_vitals.c:64
+#: src/audtool/handlers_vitals.c:63
 msgid "No song playing."
-msgstr "Żaden utwór nie jest odtwarzany"
+msgstr "Żadne nagranie nie jest odtwarzane."
+
+#: src/libaudcore/audstrings.c:199
+#, c-format
+msgid "Audio CD, track %s"
+msgstr "Płyta Audio CD, ścieżka %s"
 
-#: src/libaudcore/tuple.c:685
+#: src/libaudcore/tuple.c:536
 msgid "Mono"
 msgstr "Mono"
 
-#: src/libaudcore/tuple.c:687
+#: src/libaudcore/tuple.c:538
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/libaudcore/tuple.c:689
+#: src/libaudcore/tuple.c:540
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
@@ -733,419 +757,419 @@
 msgstr[1] "%d kanały"
 msgstr[2] "%d kanałów"
 
-#: src/libaudgui/confirm.c:78
+#: src/libaudgui/about.c:52 src/libaudgui/about.c:115
+msgid "Credits"
+msgstr "Zasługi"
+
+#: src/libaudgui/about.c:52
+msgid "Translators"
+msgstr "Tłumaczenia"
+
+#: src/libaudgui/about.c:91
+msgid "About Audacious"
+msgstr "Informacje o programie Audacious"
+
+#: src/libaudgui/confirm.c:76
 #, c-format
 msgid ""
 "Are you sure you want to close %s? If you do, any changes made since the "
 "playlist was exported will be lost."
 msgstr ""
-"Jesteś pewien, że chcesz zamknąć %s? Jeśli to zrobisz, wszelkie zmiany "
-"poczynione od momentu eksportowania listy zostaną utracone."
+"Zamknąć listę odtwarzania „%s”? Wszelkie zmiany poczynione od momentu "
+"eksportowania listy zostaną utracone."
 
-#: src/libaudgui/confirm.c:91
+#: src/libaudgui/confirm.c:89
 msgid "_Don't show this message again"
-msgstr "Nie pokazuj więcej tego _ostrzeżenia"
+msgstr "_Pomijanie wyświetlania tego ostrzeżenia w przyszłości"
 
-#: src/libaudgui/confirm.c:128
+#: src/libaudgui/confirm.c:126
 msgid "Rename Playlist"
-msgstr "Zmień nazwę playlisty"
+msgstr "Zmienianie nazwy"
 
-#: src/libaudgui/effects-menu.c:76
+#: src/libaudgui/effects-menu.c:74
 msgid "settings ..."
-msgstr "Ustawienia miksera"
+msgstr "Preferencje..."
 
-#: src/libaudgui/equalizer.c:52
+#: src/libaudgui/equalizer.c:51
 msgid "_Enable"
-msgstr "_Włączony"
+msgstr "_Włączenie"
 
-#: src/libaudgui/equalizer.c:124
+#: src/libaudgui/equalizer.c:123
 msgid "31 Hz"
 msgstr "31 Hz"
 
-#: src/libaudgui/equalizer.c:124
+#: src/libaudgui/equalizer.c:123
 msgid "63 Hz"
 msgstr "63 Hz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "125 Hz"
 msgstr "125 Hz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "250 Hz"
 msgstr "250 Hz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "500 Hz"
 msgstr "500 Hz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "1 kHz"
 msgstr "1 kHz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "2 kHz"
 msgstr "2 kHz"
 
-#: src/libaudgui/equalizer.c:126
+#: src/libaudgui/equalizer.c:125
 msgid "4 kHz"
 msgstr "4 kHz"
 
-#: src/libaudgui/equalizer.c:126
+#: src/libaudgui/equalizer.c:125
 msgid "8 kHz"
 msgstr "8 kHz"
 
-#: src/libaudgui/equalizer.c:126
+#: src/libaudgui/equalizer.c:125
 msgid "16 kHz"
 msgstr "16 kHz"
 
-#: src/libaudgui/equalizer.c:131
+#: src/libaudgui/equalizer.c:130
 msgid "Equalizer"
 msgstr "Korektor graficzny"
 
-#: src/libaudgui/equalizer.c:147
+#: src/libaudgui/equalizer.c:146
 msgid "Preamp"
 msgstr "Przedwzm."
 
-#: src/libaudgui/infopopup.c:211
+#: src/libaudgui/infopopup.c:207
 msgid "Track Number"
-msgstr "Numer utworu"
+msgstr "Numer ścieżki"
 
-#: src/libaudgui/infopopup.c:213
+#: src/libaudgui/infopopup.c:209
 msgid "Track Length"
-msgstr "Długość utworu"
+msgstr "Czas trwania"
 
-#: src/libaudgui/infowin.c:77
+#: src/libaudgui/infowin.c:75
 msgid "Acid Jazz"
 msgstr "Acid Jazz"
 
-#: src/libaudgui/infowin.c:78
+#: src/libaudgui/infowin.c:76
 msgid "Acid Rock"
 msgstr "Acid Rock"
 
-#: src/libaudgui/infowin.c:79
+#: src/libaudgui/infowin.c:77
 msgid "Ambient"
 msgstr "Ambient"
 
-#: src/libaudgui/infowin.c:80
+#: src/libaudgui/infowin.c:78
 msgid "Bebop"
 msgstr "Bebop"
 
-#: src/libaudgui/infowin.c:81
+#: src/libaudgui/infowin.c:79
 msgid "Bluegrass"
 msgstr "Bluegrass"
 
-#: src/libaudgui/infowin.c:82
+#: src/libaudgui/infowin.c:80
 msgid "Blues"
 msgstr "Blues"
 
-#: src/libaudgui/infowin.c:83
+#: src/libaudgui/infowin.c:81
 msgid "Chamber Music"
 msgstr "Muzyka kameralna"
 
-#: src/libaudgui/infowin.c:84
+#: src/libaudgui/infowin.c:82
 msgid "Classical"
 msgstr "Klasyczna"
 
-#: src/libaudgui/infowin.c:85
+#: src/libaudgui/infowin.c:83
 msgid "Country"
 msgstr "Country"
 
-#: src/libaudgui/infowin.c:86
+#: src/libaudgui/infowin.c:84
 msgid "Death Metal"
 msgstr "Death Metal"
 
-#: src/libaudgui/infowin.c:87
+#: src/libaudgui/infowin.c:85
 msgid "Disco"
 msgstr "Disco"
 
-#: src/libaudgui/infowin.c:88
+#: src/libaudgui/infowin.c:86
 msgid "Easy Listening"
-msgstr "Lekka w słuchaniu"
+msgstr "Prosta w odbiorze"
 
-#: src/libaudgui/infowin.c:89
+#: src/libaudgui/infowin.c:87
 msgid "Folk"
 msgstr "Folk"
 
-#: src/libaudgui/infowin.c:90
+#: src/libaudgui/infowin.c:88
 msgid "Funk"
 msgstr "Funk"
 
-#: src/libaudgui/infowin.c:91
+#: src/libaudgui/infowin.c:89
 msgid "Gangsta Rap"
 msgstr "Gangsta rap"
 
-#: src/libaudgui/infowin.c:92
+#: src/libaudgui/infowin.c:90
 msgid "Gospel"
 msgstr "Gospel"
 
-#: src/libaudgui/infowin.c:93
+#: src/libaudgui/infowin.c:91
 msgid "Grunge"
 msgstr "Grunge"
 
-#: src/libaudgui/infowin.c:94
+#: src/libaudgui/infowin.c:92
 msgid "Hard Rock"
 msgstr "Hard Rock"
 
-#: src/libaudgui/infowin.c:95
+#: src/libaudgui/infowin.c:93
 msgid "Heavy Metal"
 msgstr "Heavy Metal"
 
-#: src/libaudgui/infowin.c:96
+#: src/libaudgui/infowin.c:94
 msgid "Hip-hop"
 msgstr "Hip-hop"
 
-#: src/libaudgui/infowin.c:97
+#: src/libaudgui/infowin.c:95
 msgid "House"
 msgstr "House"
 
-#: src/libaudgui/infowin.c:98
+#: src/libaudgui/infowin.c:96
 msgid "Jazz"
 msgstr "Jazz"
 
-#: src/libaudgui/infowin.c:99
+#: src/libaudgui/infowin.c:97
 msgid "Jungle"
 msgstr "Jungle"
 
-#: src/libaudgui/infowin.c:100
+#: src/libaudgui/infowin.c:98
 msgid "Metal"
 msgstr "Metal"
 
-#: src/libaudgui/infowin.c:101
+#: src/libaudgui/infowin.c:99
 msgid "New Age"
 msgstr "New Age"
 
-#: src/libaudgui/infowin.c:102
+#: src/libaudgui/infowin.c:100
 msgid "New Wave"
 msgstr "New Wave"
 
-#: src/libaudgui/infowin.c:103
+#: src/libaudgui/infowin.c:101
 msgid "Noise"
 msgstr "Noise"
 
-#: src/libaudgui/infowin.c:104
+#: src/libaudgui/infowin.c:102
 msgid "Pop"
 msgstr "Pop"
 
-#: src/libaudgui/infowin.c:105
+#: src/libaudgui/infowin.c:103
 msgid "Punk Rock"
 msgstr "Punk Rock"
 
-#: src/libaudgui/infowin.c:106
+#: src/libaudgui/infowin.c:104
 msgid "Rap"
 msgstr "Rap"
 
-#: src/libaudgui/infowin.c:107
+#: src/libaudgui/infowin.c:105
 msgid "Reggae"
 msgstr "Reggae"
 
-#: src/libaudgui/infowin.c:108
+#: src/libaudgui/infowin.c:106
 msgid "Rock"
 msgstr "Rock"
 
-#: src/libaudgui/infowin.c:109
+#: src/libaudgui/infowin.c:107
 msgid "Rock and Roll"
 msgstr "Rock & Roll"
 
-#: src/libaudgui/infowin.c:110
+#: src/libaudgui/infowin.c:108
 msgid "Rhythm and Blues"
 msgstr "Rhythm and Blues"
 
-#: src/libaudgui/infowin.c:111
+#: src/libaudgui/infowin.c:109
 msgid "Ska"
 msgstr "Ska"
 
-#: src/libaudgui/infowin.c:112
+#: src/libaudgui/infowin.c:110
 msgid "Soul"
-msgstr "Duchowa"
+msgstr "Soul"
 
-#: src/libaudgui/infowin.c:113
+#: src/libaudgui/infowin.c:111
 msgid "Swing"
 msgstr "Swing"
 
-#: src/libaudgui/infowin.c:114
+#: src/libaudgui/infowin.c:112
 msgid "Techno"
 msgstr "Techno"
 
-#: src/libaudgui/infowin.c:115
+#: src/libaudgui/infowin.c:113
 msgid "Trip-hop"
 msgstr "Trip-hop"
 
-#: src/libaudgui/infowin.c:175 src/libaudgui/infowin.c:361
-#: src/libaudgui/infowin.c:364 src/libaudgui/infowin.c:367
+#: src/libaudgui/infowin.c:177 src/libaudgui/infowin.c:363
+#: src/libaudgui/infowin.c:366 src/libaudgui/infowin.c:369
 msgid "n/a"
-msgstr "n/a"
+msgstr "n/d"
 
-#: src/libaudgui/infowin.c:265
+#: src/libaudgui/infowin.c:267
 msgid "Metadata updated successfully"
-msgstr "Aktualizacja metadanych zakończona powodzeniem"
+msgstr "Zaktualizowano metadane"
 
-#: src/libaudgui/infowin.c:270
+#: src/libaudgui/infowin.c:272
 msgid "Metadata updating failed"
 msgstr "Nie udało się zaktualizować metadanych"
 
-#: src/libaudgui/infowin.c:318
+#: src/libaudgui/infowin.c:320
 msgid "Track Information"
-msgstr "Informacje o ścieżce"
+msgstr "Informacje o nagraniu"
 
-#: src/libaudgui/infowin.c:350
+#: src/libaudgui/infowin.c:352
 msgid "Format:"
 msgstr "Format:"
 
-#: src/libaudgui/infowin.c:354
+#: src/libaudgui/infowin.c:356
 msgid "Quality:"
 msgstr "Jakość:"
 
-#: src/libaudgui/infowin.c:357
+#: src/libaudgui/infowin.c:359
 msgid "Bitrate:"
-msgstr "Próbkowanie:"
+msgstr "Tempo transmisji:"
 
-#: src/libaudgui/infowin.c:387
+#: src/libaudgui/infowin.c:389
 msgid "Title"
 msgstr "Tytuł"
 
-#: src/libaudgui/infowin.c:399
+#: src/libaudgui/infowin.c:401
 msgid "Artist"
-msgstr "Artysta"
+msgstr "Wykonawca"
 
-#: src/libaudgui/infowin.c:411
+#: src/libaudgui/infowin.c:413
 msgid "Album"
 msgstr "Album"
 
-#: src/libaudgui/infowin.c:423
+#: src/libaudgui/infowin.c:425
 msgid "Comment"
 msgstr "Komentarz"
 
-#: src/libaudgui/infowin.c:435
+#: src/libaudgui/infowin.c:437
 msgid "Genre"
-msgstr "Rodzaj"
+msgstr "Gatunek"
 
-#: src/libaudgui/infowin.c:456
+#: src/libaudgui/infowin.c:458
 msgid "Year"
-msgstr "Rok"
+msgstr "Rok wydania"
 
-#: src/libaudgui/infowin.c:467
+#: src/libaudgui/infowin.c:469
 msgid "Track Number"
-msgstr "Numer utworu"
+msgstr "Numer ścieżki"
 
-#: src/libaudgui/infowin.c:549
+#: src/libaudgui/infowin.c:548
 #, c-format
 msgid "%d kb/s"
 msgstr "%d kb/s"
 
-#: src/libaudgui/infowin.c:579
+#: src/libaudgui/infowin.c:575
 #, c-format
 msgid "No info available for %s.\n"
 msgstr "Brak informacji dla %s. \n"
 
-#: src/libaudgui/jump-to-time.c:75
+#: src/libaudgui/jump-to-time.c:72
 msgid "Jump to Time"
-msgstr "Skok do czasu"
+msgstr "Przechodzenie do czasu"
 
-#: src/libaudgui/jump-to-time.c:90
+#: src/libaudgui/jump-to-time.c:87
 msgid "mm:ss"
 msgstr "mm:ss"
 
-#: src/libaudgui/playlists.c:39
+#: src/libaudgui/playlists.c:33
 msgid "Export Playlist"
-msgstr "Eksportuj listę odtwarzania"
+msgstr "Wybór pliku eksportowania"
 
-#: src/libaudgui/playlists.c:39
+#: src/libaudgui/playlists.c:33
 msgid "Import Playlist"
-msgstr "Importuj listę odtwarzania"
+msgstr "Wybór pliku importowania"
 
-#: src/libaudgui/playlists.c:72
+#: src/libaudgui/playlists.c:66
 #, c-format
 msgid "Overwrite %s?"
-msgstr "Nadpisać %s?"
+msgstr "Zastąpić %s?"
 
-#: src/libaudgui/queue-manager.c:185
+#: src/libaudgui/queue-manager.c:196
 msgid "Queue Manager"
 msgstr "Menedżer kolejki"
 
-#: src/libaudgui/ui_about.c:69
-msgid "About Audacious"
-msgstr "Informacje o Audacious"
-
-#: src/libaudgui/ui_about.c:90 src/libaudgui/ui_credits.c:122
-msgid "Credits"
-msgstr "Zasługi"
-
-#: src/libaudgui/ui_credits.c:126
-msgid "Translators"
-msgstr "Lokalizacja"
-
 #: src/libaudgui/ui_fileopener.c:109
 msgid "Open Files"
-msgstr "Wczytaj pliki"
+msgstr "Wybór pliku"
 
 #: src/libaudgui/ui_fileopener.c:109
 msgid "Add Files"
-msgstr "Dodaj pliki"
+msgstr "Dodawanie pliku"
 
 #: src/libaudgui/ui_fileopener.c:111
 msgid "Close dialog on Open"
-msgstr "Zamknij to okno przy otwarciu"
+msgstr "Zamknięcie tego okna po otworzeniu"
 
 #: src/libaudgui/ui_fileopener.c:111
 msgid "Close dialog on Add"
-msgstr "Zamknij to okno przy dodaniu"
+msgstr "Zamknięcie tego okna po dodaniu"
 
-#: src/libaudgui/ui_jumptotrack.c:103 src/libaudgui/ui_jumptotrack.c:111
-#: src/libaudgui/ui_jumptotrack.c:322
+#: src/libaudgui/ui_jumptotrack.c:109 src/libaudgui/ui_jumptotrack.c:117
+#: src/libaudgui/ui_jumptotrack.c:326
 msgid "_Queue"
-msgstr "_Dodaj do Kolejki"
+msgstr "_Dodaj do kolejki"
 
-#: src/libaudgui/ui_jumptotrack.c:109
+#: src/libaudgui/ui_jumptotrack.c:115
 msgid "Un_queue"
-msgstr "_Odejmij z kolejki"
+msgstr "_Usuń z kolejki"
 
-#: src/libaudgui/ui_jumptotrack.c:239
-msgid "Jump to Track"
-msgstr "Skok do utworu"
+#: src/libaudgui/ui_jumptotrack.c:258
+msgid "Jump to Song"
+msgstr "Przechodzenie do nagrania"
 
-#: src/libaudgui/ui_jumptotrack.c:277
+#: src/libaudgui/ui_jumptotrack.c:281
 msgid "Filter: "
 msgstr "Filtr: "
 
-#: src/libaudgui/ui_jumptotrack.c:278
+#: src/libaudgui/ui_jumptotrack.c:282
 msgid "_Filter:"
 msgstr "_Filtr: "
 
-#: src/libaudgui/ui_jumptotrack.c:288
+#: src/libaudgui/ui_jumptotrack.c:292
 msgid "Remember"
-msgstr "Pamiętaj"
+msgstr "Pamiętanie"
 
-#: src/libaudgui/ui_jumptotrack.c:295
+#: src/libaudgui/ui_jumptotrack.c:299
 msgid "Clea_r"
 msgstr "_Wyczyść"
 
-#: src/libaudgui/ui_jumptotrack.c:315
+#: src/libaudgui/ui_jumptotrack.c:319
 msgid "Close on Jump"
-msgstr "Zamknij to okno przy otwarciu"
+msgstr "Zamknięcie tego okna po przejściu"
 
-#: src/libaudgui/ui_playlist_manager.c:250
+#: src/libaudgui/ui_playlist_manager.c:253
 msgid "Playlist Manager"
-msgstr "Menedżer list"
+msgstr "Menedżer list odtwarzania"
 
-#: src/libaudgui/ui_playlist_manager.c:277
+#: src/libaudgui/ui_playlist_manager.c:280
 msgid "Entries"
-msgstr "Pozycje"
+msgstr "Ilość elementów"
 
-#: src/libaudgui/ui_playlist_manager.c:298
+#: src/libaudgui/ui_playlist_manager.c:301
 msgid "_Rename"
 msgstr "Zmień _nazwę"
 
-#: src/libaudgui/ui_playlist_manager.c:322
+#: src/libaudgui/ui_playlist_manager.c:325
 msgid "_Close dialog on activating playlist"
-msgstr "Zamknij to okno przy aktywa_cji playlisty"
+msgstr "Za_mknięcie tego okna po aktywowaniu listy"
 
-#: src/libaudgui/ui_urlopener.c:51
+#: src/libaudgui/ui_urlopener.c:48
 msgid "Open URL"
-msgstr "Otwórz URL"
+msgstr "Otwieranie adresu URL"
 
-#: src/libaudgui/ui_urlopener.c:51
+#: src/libaudgui/ui_urlopener.c:48
 msgid "Add URL"
-msgstr "Dodaj URL"
+msgstr "Dodawanie adresu URL"
 
 #: src/libaudgui/util.c:95
 msgid ""
@@ -1157,42 +1181,43 @@
 
 #: src/libeggsmclient/eggdesktopfile.c:165
 msgid "File is not a valid .desktop file"
-msgstr "Ten plik nie jest prawidłowym plikiem typu .desktop"
+msgstr "Plik nie jest prawidłowym plikiem typu desktop"
 
-#: src/libeggsmclient/eggdesktopfile.c:188
+#: src/libeggsmclient/eggdesktopfile.c:191
 #, c-format
 msgid "Unrecognized desktop file Version '%s'"
-msgstr "Nierozpoznana wersja pliku desktop: '%s'"
+msgstr "Nierozpoznana wersja pliku desktop: „%s”"
 
-#: src/libeggsmclient/eggdesktopfile.c:967
+#: src/libeggsmclient/eggdesktopfile.c:974
 #, c-format
 msgid "Starting %s"
 msgstr "Uruchamianie %s"
 
-#: src/libeggsmclient/eggdesktopfile.c:1108
+#: src/libeggsmclient/eggdesktopfile.c:1116
 msgid "Application does not accept documents on command line"
-msgstr "Aplikacja nie przyjmuje dokumentów poprzez wiersz poleceń"
+msgstr "Program nie przyjmuje dokumentów poprzez wiersz poleceń"
 
-#: src/libeggsmclient/eggdesktopfile.c:1176
+#: src/libeggsmclient/eggdesktopfile.c:1184
 #, c-format
 msgid "Unrecognized launch option: %d"
 msgstr "Nieznana opcja uruchamiania: %d"
 
-#: src/libeggsmclient/eggdesktopfile.c:1375
+#: src/libeggsmclient/eggdesktopfile.c:1391
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
-msgstr "Nie można przekazać URLi dokumentu do wpisu desktop 'Type=Link'"
+msgstr ""
+"Nie można przekazać adresów URI dokumentów do wpisu desktop „Type=Link”"
 
-#: src/libeggsmclient/eggdesktopfile.c:1396
+#: src/libeggsmclient/eggdesktopfile.c:1412
 msgid "Not a launchable item"
 msgstr "Nieobsługiwany typ pliku"
 
 #: src/libeggsmclient/eggsmclient.c:226
 msgid "Disable connection to session manager"
-msgstr "Wyłącz połączenie z menedżerem sesji"
+msgstr "Przerywa połączenie z menedżerem sesji"
 
 #: src/libeggsmclient/eggsmclient.c:229
 msgid "Specify file containing saved configuration"
-msgstr "Wybierz plik zawierający zapisaną konfigurację"
+msgstr "Określa plik zawierający zapisaną konfigurację"
 
 #: src/libeggsmclient/eggsmclient.c:229
 msgid "FILE"
@@ -1200,7 +1225,7 @@
 
 #: src/libeggsmclient/eggsmclient.c:232
 msgid "Specify session management ID"
-msgstr "Wybierz ID zarządzania sesją"
+msgstr "Określa identyfikator zarządzania sesją"
 
 #: src/libeggsmclient/eggsmclient.c:232
 msgid "ID"
@@ -1212,6 +1237,6 @@
 
 #: src/libeggsmclient/eggsmclient.c:254
 msgid "Show session management options"
-msgstr "Pokaż opcje zarządzania sesją"
+msgstr "Wyświetla opcje zarządzania sesją"

audacious-3.1.1.tar.bz2/po/pt_BR.po -> audacious-3.2.4.tar.bz2/po/pt_BR.po Changed

@@ -1,1152 +1,1157 @@
 # Brazilian Portuguese translation for Audacious
-# Karen Eliot <kareneliot@riseup. net>, 2011.
+# Copyright (C) Audacious translators
+# This file is distributed under the same license as the Audacious package.
 #
+# Translators:
+# Cleiton cleitonlima <cleitonlima@lavabit.com>, 2011.
+# Karen Eliot <kareneliot@riseup. net>, 2011.
+# Rafael Ferreira <rafael.f.f1@gmail.com>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: pt_BR\n"
-"Report-Msgid-Bugs-To: http://jira.atheme.org/\n"
-"POT-Creation-Date: 2011-07-05 22:45+0200\n"
-"PO-Revision-Date: 2011-08-03 00:59-0300\n"
-"Last-Translator: Karen Eliot <kareneliot@riseup. net>\n"
-"Language-Team: Brazilian Portuguese <havacci@gmail.com>\n"
-"Language: pt_BR\n"
+"Project-Id-Version: Audacious\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2012-01-11 08:54-0500\n"
+"PO-Revision-Date: 2012-02-26 05:32+0000\n"
+"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
+"Language-Team: Brazilian Portuguese\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.2\n"
-"X-Poedit-Language: Portuguese\n"
-"X-Poedit-Country: BRAZIL\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: src/audacious/adder.c:71
+#: src/audacious/adder.c:77
 msgid "Searching ..."
 msgstr "Procurando..."
 
-#: src/audacious/adder.c:99 src/audacious/chardet.c:37
+#: src/audacious/adder.c:113
 #, c-format
+msgid "%d file found"
+msgid_plural "%d files found"
+msgstr[0] "%d arquivo encontrado"
+msgstr[1] "%d arquivos encontrados"
+
+#: src/audacious/chardet.c:39
 msgid " (invalid UTF-8)"
 msgstr " (UTF-8 inválido)"
 
-#: src/audacious/credits.c:35
+#: src/audacious/credits.c:37
 msgid "Core developers:"
 msgstr "Desenvolvedores do núcleo:"
 
-#: src/audacious/credits.c:49
+#: src/audacious/credits.c:51
 msgid "Graphics:"
 msgstr "Gráficos:"
 
-#: src/audacious/credits.c:54
+#: src/audacious/credits.c:56
 msgid "Default skin:"
 msgstr "Skin padrão:"
 
-#: src/audacious/credits.c:60
+#: src/audacious/credits.c:62
 msgid "Plugin development:"
 msgstr "Desenvolvedores dos plugins:"
 
-#: src/audacious/credits.c:83
+#: src/audacious/credits.c:85
 msgid "Patch authors:"
 msgstr "Autores de correções:"
 
-#: src/audacious/credits.c:126
+#: src/audacious/credits.c:131
 msgid "1.x developers:"
 msgstr "Desenvolvedores do 1.x:"
 
-#: src/audacious/credits.c:148
+#: src/audacious/credits.c:153
 msgid "BMP Developers:"
 msgstr "Desenvolvedores do BMP:"
 
-#: src/audacious/credits.c:180
+#: src/audacious/credits.c:185
 msgid "Belarusian:"
 msgstr "Bielorrusso:"
 
-#: src/audacious/credits.c:183
+#: src/audacious/credits.c:188
 msgid "Basque:"
 msgstr "Basco:"
 
-#: src/audacious/credits.c:186
+#: src/audacious/credits.c:191
 msgid "Brazilian Portuguese:"
 msgstr "Português do Brasil:"
 
-#: src/audacious/credits.c:190
+#: src/audacious/credits.c:196
 msgid "Breton:"
 msgstr "Breton:"
 
-#: src/audacious/credits.c:193
+#: src/audacious/credits.c:199
 msgid "Bulgarian:"
 msgstr "Búlgaro:"
 
-#: src/audacious/credits.c:196
+#: src/audacious/credits.c:202
 msgid "Catalan:"
 msgstr "Catalão:"
 
-#: src/audacious/credits.c:199
+#: src/audacious/credits.c:206
 msgid "Chinese:"
 msgstr "Chinês:"
 
-#: src/audacious/credits.c:202
+#: src/audacious/credits.c:209
 msgid "Croatian:"
 msgstr "Croata:"
 
-#: src/audacious/credits.c:205
+#: src/audacious/credits.c:212
 msgid "Czech:"
 msgstr "Checo:"
 
-#: src/audacious/credits.c:208
+#: src/audacious/credits.c:215
 msgid "Dutch:"
 msgstr "Holandês:"
 
-#: src/audacious/credits.c:212
+#: src/audacious/credits.c:219
 msgid "Estonian:"
 msgstr "Estónio:"
 
-#: src/audacious/credits.c:215
+#: src/audacious/credits.c:222
 msgid "Finnish:"
 msgstr "Finlândes:"
 
-#: src/audacious/credits.c:220
+#: src/audacious/credits.c:227
 msgid "French:"
 msgstr "Francês:"
 
-#: src/audacious/credits.c:226
+#: src/audacious/credits.c:233
 msgid "German:"
 msgstr "Alemão:"
 
-#: src/audacious/credits.c:233
+#: src/audacious/credits.c:240
 msgid "Georgian:"
 msgstr "Georgiano:"
 
-#: src/audacious/credits.c:236
+#: src/audacious/credits.c:243
 msgid "Greek:"
 msgstr "Grego:"
 
-#: src/audacious/credits.c:241
+#: src/audacious/credits.c:248
 msgid "Hindi:"
 msgstr "Hindú:"
 
-#: src/audacious/credits.c:244
+#: src/audacious/credits.c:251
 msgid "Hungarian:"
 msgstr "Húngaro:"
 
-#: src/audacious/credits.c:248
+#: src/audacious/credits.c:255
 msgid "Italian:"
 msgstr "Italiano:"
 
-#: src/audacious/credits.c:252
+#: src/audacious/credits.c:260
 msgid "Japanese:"
 msgstr "Japonês:"
 
-#: src/audacious/credits.c:255
+#: src/audacious/credits.c:263
 msgid "Korean:"
 msgstr "Coreano:"
 
-#: src/audacious/credits.c:258
+#: src/audacious/credits.c:266
 msgid "Latvian:"
 msgstr "Letão:"
 
-#: src/audacious/credits.c:261
+#: src/audacious/credits.c:269
 msgid "Lithuanian:"
 msgstr "Lítuano:"
 
-#: src/audacious/credits.c:265
+#: src/audacious/credits.c:274
 msgid "Macedonian:"
 msgstr "Macedônio:"
 
-#: src/audacious/credits.c:268
+#: src/audacious/credits.c:277
+msgid "Mexican Spanish:"
+msgstr "Espanhol Mexicano:"
+
+#: src/audacious/credits.c:280
 msgid "Polish:"
 msgstr "Polonês:"
 
-#: src/audacious/credits.c:274
+#: src/audacious/credits.c:287
 msgid "Portuguese:"
 msgstr "Português:"
 
-#: src/audacious/credits.c:277
+#: src/audacious/credits.c:290
 msgid "Romanian:"
 msgstr "Romeno:"
 
-#: src/audacious/credits.c:281
+#: src/audacious/credits.c:294
 msgid "Russian:"
 msgstr "Russo:"
 
-#: src/audacious/credits.c:285
+#: src/audacious/credits.c:298
 msgid "Serbian (Latin):"
 msgstr "Sérvio (Latino):"
 
-#: src/audacious/credits.c:288
+#: src/audacious/credits.c:301
 msgid "Serbian (Cyrillic):"
 msgstr "Sérvio (Cyrillic):"
 
-#: src/audacious/credits.c:291
+#: src/audacious/credits.c:305
 msgid "Simplified Chinese:"
 msgstr "Chinês Simplificado:"
 
-#: src/audacious/credits.c:294
+#: src/audacious/credits.c:308
 msgid "Slovak:"
 msgstr "Eslovaco:"
 
-#: src/audacious/credits.c:297
+#: src/audacious/credits.c:312
 msgid "Spanish:"
 msgstr "Espanhol:"
 
-#: src/audacious/credits.c:304
+#: src/audacious/credits.c:320
 msgid "Swedish:"
 msgstr "Sueco:"
 
-#: src/audacious/credits.c:307
+#: src/audacious/credits.c:323
 msgid "Traditional Chinese:"
 msgstr "Chinês Tradicional:"
 
-#: src/audacious/credits.c:312
+#: src/audacious/credits.c:329
 msgid "Turkish:"
 msgstr "Turco:"
 
-#: src/audacious/credits.c:316
+#: src/audacious/credits.c:333
 msgid "Ukrainian:"
 msgstr "Ucraniano:"
 
-#: src/audacious/credits.c:319
+#: src/audacious/credits.c:338
+msgid "Vietnamese:"
+msgstr "Vietnamita:"
+
+#: src/audacious/credits.c:341
 msgid "Welsh:"
 msgstr "Galês:"
 
-#: src/audacious/drct.c:256
-msgid "Temporary Playlist"
-msgstr "Lista de Reprodução Temporária"
-
-#: src/audacious/equalizer_preset.c:186
+#: src/audacious/equalizer_preset.c:180
 #, c-format
 msgid "Error importing Winamp EQF file '%s'"
 msgstr "Erro importando arquivo EQF do Winamp '%s'"
 
-#: src/audacious/main.c:256
+#: src/audacious/main.c:243
 msgid "Skip backwards in playlist"
 msgstr "Voltar na lista de reprodução"
 
-#: src/audacious/main.c:257
+#: src/audacious/main.c:244
 msgid "Start playing current playlist"
 msgstr "Reproduzir lista de reprodução atual"
 
-#: src/audacious/main.c:258
+#: src/audacious/main.c:245
 msgid "Pause current song"
 msgstr "Pausar música atual"
 
-#: src/audacious/main.c:259
+#: src/audacious/main.c:246
 msgid "Stop current song"
 msgstr "Parar música atual"
 
-#: src/audacious/main.c:260
+#: src/audacious/main.c:247
 msgid "Pause if playing, play otherwise"
 msgstr "Pausar ou reproduzir"
 
-#: src/audacious/main.c:261
+#: src/audacious/main.c:248
 msgid "Skip forward in playlist"
 msgstr "Próximo na lista de reprodução"
 
-#: src/audacious/main.c:262
+#: src/audacious/main.c:249
 msgid "Display Jump to File dialog"
 msgstr "Mostrar caixa de diálogo \"Ir para o Arquivo\""
 
-#: src/audacious/main.c:263
+#: src/audacious/main.c:250
 msgid "Add files to the playlist"
 msgstr "Adicionar arquivos à lista de reprodução"
 
-#: src/audacious/main.c:264
+#: src/audacious/main.c:251
 msgid "Add new files to a temporary playlist"
 msgstr "Adicionar novos arquivos a uma lista de reprodução temporária"
 
-#: src/audacious/main.c:265
+#: src/audacious/main.c:252
 msgid "Display the main window"
 msgstr "Mostrar janela principal"
 
-#: src/audacious/main.c:266
+#: src/audacious/main.c:253
 msgid "Show version"
 msgstr "Mostrar versão"
 
-#: src/audacious/main.c:267
+#: src/audacious/main.c:254
 msgid "Print debugging messages"
 msgstr "Imprimir mensagens de depuração"
 
-#: src/audacious/main.c:268
+#: src/audacious/main.c:255
+msgid "Headless mode (beta)"
+msgstr "Modo headless (beta)"
+
+#: src/audacious/main.c:256
 msgid "FILE..."
 msgstr "ARQUIVO..."
 
-#: src/audacious/main.c:280
+#: src/audacious/main.c:268
 msgid "- play multimedia files"
 msgstr "- reproduzir arquivos multimídia"
 
-#: src/audacious/main.c:290
+#: src/audacious/main.c:278
 #, c-format
 msgid ""
 "%s: %s\n"
 "Try `%s --help' for more information.\n"
-msgstr ""
-"%s: %s\n"
-"Tente `%s --help' para mais informações.\n"
-
-#: src/audacious/main.c:407
-msgid ""
-"Audacious seems to be already running but is not responding. You can start "
-"another instance of the program, but please be warned that this can cause "
-"data loss. If Audacious is not running, you can safely ignore this "
-"message. Press OK to start Audacious or Cancel to quit."
-msgstr ""
-"Parece que o Audacious já está sendo executado mas não responde. Você pode "
-"iniciar o programa denovo, mas cuidado porque isto pode causar perda de "
-"dados. Se o Audacious não está sendo executado, você pode ignorar esta "
-"mensagem com segurança. Pressione OK para iniciar Audacious ou Cancelar para "
-"fechar."
+msgstr "%s: %s\nTente `%s --help' para mais informações.\n"
 
-#: src/audacious/main.c:572
+#: src/audacious/main.c:573
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/audacious/playback.c:381
+#: src/audacious/playback.c:307
 #, c-format
 msgid "No decoder found for %s."
 msgstr "Decodificador para %s não encontrado "
 
-#: src/audacious/playback.c:531
-msgid "Buffering ..."
-msgstr "Carregando..."
+#: src/audacious/playlist-files.c:53
+#, c-format
+msgid "Cannot %s %s: unsupported file extension."
+msgstr "Não é possível %s %s: extensão de arquivo não suportada"
+
+#: src/audacious/playlist-files.c:54
+msgid "save"
+msgstr "salvar"
 
-#: src/audacious/playlist-new.c:303
-msgid "Untitled Playlist"
-msgstr "Lista de Reprodução sem título"
+#: src/audacious/playlist-files.c:54
+msgid "load"
+msgstr "carregar"
+
+#: src/audacious/playlist-new.c:131
+msgid "New Playlist"
+msgstr "Nova Lista de Reprodução"
+
+#: src/audacious/playlist-new.c:132
+msgid "Now Playing"
+msgstr "Reproduzindo"
+
+#: src/audacious/playlist-new.c:1630
+msgid ""
+"The playlist cannot be sorted because metadata scanning is still in progress"
+" (or has been disabled)."
+msgstr "A lista de reprodução não pode ser ordenada porque a varredura de metadados ainda está em progresso (ou foi desabilitada)."
 
-#: src/audacious/ui_preferences.c:87
+#: src/audacious/ui_preferences.c:85
 msgid "Audio"
 msgstr "Áudio"
 
-#: src/audacious/ui_preferences.c:88
+#: src/audacious/ui_preferences.c:86
 msgid "Network"
 msgstr "Rede"
 
-#: src/audacious/ui_preferences.c:89 src/audacious/ui_preferences.c:1556
+#: src/audacious/ui_preferences.c:87 src/audacious/ui_preferences.c:1603
 msgid "Playlist"
 msgstr "Lista de Reprodução"
 
-#: src/audacious/ui_preferences.c:90
+#: src/audacious/ui_preferences.c:88
 msgid "Plugins"
 msgstr "Plugins"
 
-#: src/audacious/ui_preferences.c:96 src/libaudgui/infopopup.c:204
+#: src/audacious/ui_preferences.c:94 src/libaudgui/infopopup.c:199
 msgid "Artist"
 msgstr "Artista"
 
-#: src/audacious/ui_preferences.c:97 src/libaudgui/infopopup.c:206
+#: src/audacious/ui_preferences.c:95 src/libaudgui/infopopup.c:201
 msgid "Album"
 msgstr "Álbum"
 
-#: src/audacious/ui_preferences.c:98 src/libaudgui/infopopup.c:202
-#: src/libaudgui/ui_playlist_manager.c:263
+#: src/audacious/ui_preferences.c:96 src/libaudgui/infopopup.c:197
+#: src/libaudgui/ui_playlist_manager.c:279
 msgid "Title"
 msgstr "Título"
 
-#: src/audacious/ui_preferences.c:99
+#: src/audacious/ui_preferences.c:97
 msgid "Tracknumber"
 msgstr "Número da faixa"
 
-#: src/audacious/ui_preferences.c:100 src/libaudgui/infopopup.c:208
+#: src/audacious/ui_preferences.c:98 src/libaudgui/infopopup.c:203
 msgid "Genre"
 msgstr "Gênero"
 
-#: src/audacious/ui_preferences.c:101
+#: src/audacious/ui_preferences.c:99
 msgid "Filename"
 msgstr "Nome do arquivo"
 
-#: src/audacious/ui_preferences.c:102
+#: src/audacious/ui_preferences.c:100
 msgid "Filepath"
 msgstr "Localização"
 
-#: src/audacious/ui_preferences.c:103
+#: src/audacious/ui_preferences.c:101
 msgid "Date"
 msgstr "Data"
 
-#: src/audacious/ui_preferences.c:104 src/libaudgui/infopopup.c:210
+#: src/audacious/ui_preferences.c:102 src/libaudgui/infopopup.c:205
 msgid "Year"
 msgstr "Ano"
 
-#: src/audacious/ui_preferences.c:105
+#: src/audacious/ui_preferences.c:103
 msgid "Comment"
 msgstr "Comentário"
 
-#: src/audacious/ui_preferences.c:106
+#: src/audacious/ui_preferences.c:104
 msgid "Codec"
 msgstr "Codec"
 
-#: src/audacious/ui_preferences.c:107
+#: src/audacious/ui_preferences.c:105
 msgid "Quality"
 msgstr "Qualidade"
 
-#: src/audacious/ui_preferences.c:112
+#: src/audacious/ui_preferences.c:111
 msgid "None"
 msgstr "Nenhum"
 
+#: src/audacious/ui_preferences.c:112
+msgid "Arabic"
+msgstr "Árabe"
+
 #: src/audacious/ui_preferences.c:113
-msgid "Japanese"
-msgstr "Japonês"
+msgid "Baltic"
+msgstr "Báltico"
 
 #: src/audacious/ui_preferences.c:114
-msgid "Taiwanese"
-msgstr "Taiwanês"
-
-#: src/audacious/ui_preferences.c:115
 msgid "Chinese"
 msgstr "Chines"
 
-#: src/audacious/ui_preferences.c:116
-msgid "Korean"
-msgstr "Koreano"
-
-#: src/audacious/ui_preferences.c:117
-msgid "Russian"
-msgstr "Russo"
-
-#: src/audacious/ui_preferences.c:118
+#: src/audacious/ui_preferences.c:115
 msgid "Greek"
 msgstr "Grego"
 
-#: src/audacious/ui_preferences.c:119
+#: src/audacious/ui_preferences.c:116
 msgid "Hebrew"
 msgstr "Hebraico"
 
-#: src/audacious/ui_preferences.c:120
-msgid "Turkish"
-msgstr "Turco"
+#: src/audacious/ui_preferences.c:117
+msgid "Japanese"
+msgstr "Japonês"
 
-#: src/audacious/ui_preferences.c:121
-msgid "Arabic"
-msgstr "Árabe"
+#: src/audacious/ui_preferences.c:118
+msgid "Korean"
+msgstr "Koreano"
 
-#: src/audacious/ui_preferences.c:122
+#: src/audacious/ui_preferences.c:119
 msgid "Polish"
 msgstr "Polonês"
 
-#: src/audacious/ui_preferences.c:123
-msgid "Baltic"
-msgstr "Báltico"
+#: src/audacious/ui_preferences.c:120
+msgid "Russian"
+msgstr "Russo"
 
-#: src/audacious/ui_preferences.c:124
-msgid "Universal"
-msgstr "Geral"
+#: src/audacious/ui_preferences.c:121
+msgid "Taiwanese"
+msgstr "Taiwanês"
 
-#: src/audacious/ui_preferences.c:146
-msgid "Single track mode"
-msgstr "Modo faixa única"
+#: src/audacious/ui_preferences.c:122
+msgid "Turkish"
+msgstr "Turco"
 
-#: src/audacious/ui_preferences.c:147
+#: src/audacious/ui_preferences.c:144
 msgid "Album mode"
 msgstr "Modo álbum"
 
-#: src/audacious/ui_preferences.c:150
+#: src/audacious/ui_preferences.c:147
 msgid "Output Settings"
 msgstr "Configuração de Saída"
 
-#: src/audacious/ui_preferences.c:152
+#: src/audacious/ui_preferences.c:149
 msgid "Bit depth:"
 msgstr "Profundidade de bit:"
 
-#: src/audacious/ui_preferences.c:155
+#: src/audacious/ui_preferences.c:152
 msgid "Buffer size:"
 msgstr "Tamanho do armazenamento:"
 
-#: src/audacious/ui_preferences.c:157
+#: src/audacious/ui_preferences.c:154
 msgid "ms"
 msgstr "ms"
 
-#: src/audacious/ui_preferences.c:158
+#: src/audacious/ui_preferences.c:155
 msgid "Use software volume control (not recommended)"
 msgstr "Usar controle de volume de software (não recomendado)"
 
-#: src/audacious/ui_preferences.c:160
+#: src/audacious/ui_preferences.c:157
 msgid "Replay Gain"
 msgstr "Ganho de Replay"
 
-#: src/audacious/ui_preferences.c:161
+#: src/audacious/ui_preferences.c:158
 msgid "Enable Replay Gain"
 msgstr "Habilitar Ganho de Replay"
 
-#: src/audacious/ui_preferences.c:164
+#: src/audacious/ui_preferences.c:161
 msgid "Prevent clipping (recommended)"
 msgstr "Prevenir ruídos (recomendado)"
 
-#: src/audacious/ui_preferences.c:166
+#: src/audacious/ui_preferences.c:163
 msgid "Adjust Levels"
 msgstr "Ajustar Níveis"
 
-#: src/audacious/ui_preferences.c:167
+#: src/audacious/ui_preferences.c:164
 msgid "Amplify all files:"
 msgstr "Amplificar todos os arquivos:"
 
-#: src/audacious/ui_preferences.c:169 src/audacious/ui_preferences.c:172
+#: src/audacious/ui_preferences.c:166 src/audacious/ui_preferences.c:169
 msgid "dB"
 msgstr "dB"
 
-#: src/audacious/ui_preferences.c:170
+#: src/audacious/ui_preferences.c:167
 msgid "Amplify untagged files:"
 msgstr "Amplificar arquivos não-marcados:"
 
-#: src/audacious/ui_preferences.c:175
+#: src/audacious/ui_preferences.c:172
 msgid "Proxy hostname:"
 msgstr "Endereço do proxy:"
 
-#: src/audacious/ui_preferences.c:176
+#: src/audacious/ui_preferences.c:173
 msgid "Proxy port:"
 msgstr "Porta do proxy:"
 
-#: src/audacious/ui_preferences.c:179
+#: src/audacious/ui_preferences.c:176
 msgid "Proxy username:"
 msgstr "Nome de usuário do proxy:"
 
-#: src/audacious/ui_preferences.c:180
+#: src/audacious/ui_preferences.c:177
 msgid "Proxy password:"
 msgstr "Senha do proxy:"
 
-#: src/audacious/ui_preferences.c:184
+#: src/audacious/ui_preferences.c:181
 msgid "Proxy Configuration"
 msgstr "Configurações de Proxy"
 
-#: src/audacious/ui_preferences.c:185
+#: src/audacious/ui_preferences.c:182
 msgid "Enable proxy usage"
 msgstr "Ativar o uso de proxy"
 
-#: src/audacious/ui_preferences.c:187
+#: src/audacious/ui_preferences.c:185
 msgid "Use authentication with proxy"
 msgstr "Usar autenticação do proxy"
 
-#: src/audacious/ui_preferences.c:189
-msgid ""
-"Changing these settings will require a restart of "
-"Audacious."
-msgstr ""
-"Em caso de alteração, o Audacious deve ser reiniciado</"
-"span>"
-
 #: src/audacious/ui_preferences.c:193
 msgid "Auto character encoding detector for:"
 msgstr "Converter caracteres automaticamente para:"
 
-#: src/audacious/ui_preferences.c:201
+#: src/audacious/ui_preferences.c:198
 msgid "Fallback character encodings:"
 msgstr "Códigos de caracteres de arquivos:"
 
-#: src/audacious/ui_preferences.c:201
-msgid ""
-"List of character encodings used for fall back conversion of metadata. If "
-"automatic character encoding detector failed or has been disabled, encodings "
-"in this list would be treated as candidates of the encoding of metadata, and "
-"fall back conversion from these encodings to UTF-8 would be attempted."
-msgstr ""
-"Lista de códigos de caracteres usada para a conversão de TAGs dos arquivos. "
-"Caso o conversor automático seja desativado ou falhe, os códigos serão "
-"tratados como informações codificadas de TAG, e os códigos serão convertidos "
-"para UTF-8."
-
-#: src/audacious/ui_preferences.c:205
+#: src/audacious/ui_preferences.c:202
 msgid "Behavior"
 msgstr "Comportamento"
 
-#: src/audacious/ui_preferences.c:206
+#: src/audacious/ui_preferences.c:203
 msgid "Continue playback on startup"
 msgstr "Continuar reprodução ao iniciar"
 
-#: src/audacious/ui_preferences.c:208
+#: src/audacious/ui_preferences.c:205
 msgid "Advance when the current song is deleted"
 msgstr "Avançar quando a música atual for excluída"
 
-#: src/audacious/ui_preferences.c:210
+#: src/audacious/ui_preferences.c:207
 msgid "Clear the playlist when opening files"
 msgstr "Limpar lista de reprodução ao abrir arquivos"
 
-#: src/audacious/ui_preferences.c:212
+#: src/audacious/ui_preferences.c:209
 msgid "Open files in a temporary playlist"
 msgstr "Abrir arquivos em uma lista de reprodução temporária"
 
-#: src/audacious/ui_preferences.c:214
+#: src/audacious/ui_preferences.c:211
 msgid "Metadata"
 msgstr "TAGs"
 
-#: src/audacious/ui_preferences.c:454
+#: src/audacious/ui_preferences.c:212
+msgid "Do not load metadata for songs until played"
+msgstr "Não carregar metadados para as músicas até que sejam tocadas"
+
+#: src/audacious/ui_preferences.c:230
+msgid "TITLE"
+msgstr "TÍTULO"
+
+#: src/audacious/ui_preferences.c:231
+msgid "ARTIST - TITLE"
+msgstr "ARTISTA - TÍTULO"
+
+#: src/audacious/ui_preferences.c:232
+msgid "ARTIST - ALBUM - TITLE"
+msgstr "ARTISTA - ÁLBUM - TÍTULO"
+
+#: src/audacious/ui_preferences.c:233
+msgid "ARTIST - ALBUM - TRACK. TITLE"
+msgstr "ARTISTA - ÁLBUM - FAIXA. TÍTULO"
+
+#: src/audacious/ui_preferences.c:234
+msgid "ARTIST [ ALBUM ] - TRACK. TITLE"
+msgstr "ARTISTA [ ÁLBUM ] - FAIXA. TÍTULO"
+
+#: src/audacious/ui_preferences.c:235
+msgid "ALBUM - TITLE"
+msgstr "ÁLBUM - TÍTULO"
+
+#: src/audacious/ui_preferences.c:556
 msgid "Category"
 msgstr "Categoria"
 
-#: src/audacious/ui_preferences.c:682
+#: src/audacious/ui_preferences.c:780
 msgid "Popup Information Settings"
 msgstr "Configuração de informações em janelas popup"
 
-#: src/audacious/ui_preferences.c:691
+#: src/audacious/ui_preferences.c:789
 msgid "Cover image retrieve"
 msgstr "Buscar imagem de capa"
 
-#: src/audacious/ui_preferences.c:696
+#: src/audacious/ui_preferences.c:794
 msgid ""
 "While searching for the album's cover, Audacious looks for certain words in "
 "the filename. You can specify those words in the lists below, separated "
 "using commas."
-msgstr ""
-"Para buscar imagem de capa para o Álbum, o Audacious utiliza o nome do "
-"arquivo. Mas, você pode especificar outras palavras na lista abaixo, "
-"separadas por vírgulas."
+msgstr "Para buscar imagem de capa para o Álbum, o Audacious utiliza o nome do arquivo. Mas, você pode especificar outras palavras na lista abaixo, separadas por vírgulas."
 
-#: src/audacious/ui_preferences.c:713
+#: src/audacious/ui_preferences.c:811
 msgid "Exclude:"
 msgstr "Excluir:"
 
-#: src/audacious/ui_preferences.c:720
+#: src/audacious/ui_preferences.c:818
 msgid "Include:"
 msgstr "Incluir:"
 
-#: src/audacious/ui_preferences.c:737
+#: src/audacious/ui_preferences.c:835
 msgid "Recursively search for cover"
 msgstr "Buscar pela capa"
 
-#: src/audacious/ui_preferences.c:747
+#: src/audacious/ui_preferences.c:845
 msgid "Search depth: "
 msgstr "Profundidade da busca:"
 
-#: src/audacious/ui_preferences.c:761
+#: src/audacious/ui_preferences.c:859
 msgid "Use per-file cover"
 msgstr "Exibir capa"
 
-#: src/audacious/ui_preferences.c:764
+#: src/audacious/ui_preferences.c:862
 msgid "Miscellaneous"
 msgstr "Diversos"
 
-#: src/audacious/ui_preferences.c:773
+#: src/audacious/ui_preferences.c:871
 msgid "Show Progress bar for the current track"
 msgstr "Mostrar Barra de Progresso para o arquivo atual"
 
-#: src/audacious/ui_preferences.c:783
+#: src/audacious/ui_preferences.c:881
 msgid "Delay until filepopup comes up: "
 msgstr "Tempo até que a janela popup do arquivo apareça:"
 
-#: src/audacious/ui_preferences.c:1283
+#: src/audacious/ui_preferences.c:1309
+msgid "Custom"
+msgstr "Personalizado"
+
+#: src/audacious/ui_preferences.c:1352
 msgid "Song Display"
 msgstr "Exibição do Arquivo"
 
-#: src/audacious/ui_preferences.c:1292
+#: src/audacious/ui_preferences.c:1361
 msgid "Show song numbers"
 msgstr "Mostrar números das músicas"
 
-#: src/audacious/ui_preferences.c:1303
+#: src/audacious/ui_preferences.c:1372
 msgid "Show leading zeroes (02:00 instead of 2:00)"
 msgstr "Mostrar zero a esquerda (02:00 ao invés de 2:00)"
 
-#: src/audacious/ui_preferences.c:1325
+#: src/audacious/ui_preferences.c:1394
 msgid "Show information about titlestring format"
 msgstr "Mostrar informações sobre o formato do título"
 
-#: src/audacious/ui_preferences.c:1339
-msgid "TITLE"
-msgstr "TÍTULO"
-
-#: src/audacious/ui_preferences.c:1340
-msgid "ARTIST - TITLE"
-msgstr "ARTISTA - TÍTULO"
-
-#: src/audacious/ui_preferences.c:1341
-msgid "ARTIST - ALBUM - TITLE"
-msgstr "ARTISTA - ÁLBUM - TÍTULO"
-
-#: src/audacious/ui_preferences.c:1342
-msgid "ARTIST - ALBUM - TRACK. TITLE"
-msgstr "ARTISTA - ÁLBUM - FAIXA. TÍTULO"
-
-#: src/audacious/ui_preferences.c:1343
-msgid "ARTIST [ ALBUM ] - TRACK. TITLE"
-msgstr "ARTISTA [ ÁLBUM ] - FAIXA. TÍTULO"
-
-#: src/audacious/ui_preferences.c:1344
-msgid "ALBUM - TITLE"
-msgstr "ÁLBUM - TÍTULO"
-
-#: src/audacious/ui_preferences.c:1345
-msgid "Custom"
-msgstr "Personalizado"
-
-#: src/audacious/ui_preferences.c:1354
+#: src/audacious/ui_preferences.c:1410
 msgid "Custom string:"
 msgstr "Formato personalizado:"
 
-#: src/audacious/ui_preferences.c:1361
+#: src/audacious/ui_preferences.c:1417
 msgid "Title format:"
 msgstr "Formato do título:"
 
-#: src/audacious/ui_preferences.c:1372
+#: src/audacious/ui_preferences.c:1428
 msgid "Popup Information"
 msgstr "Informações Popup"
 
-#: src/audacious/ui_preferences.c:1387
+#: src/audacious/ui_preferences.c:1443
 msgid "Show popup information for playlist entries"
-msgstr ""
-"Exibir informações de arquivos da lista de reprodução em uma janela popup"
+msgstr "Exibir informações de arquivos da lista de reprodução em uma janela popup"
 
-#: src/audacious/ui_preferences.c:1388
+#: src/audacious/ui_preferences.c:1444
 msgid ""
 "Toggles popup information window for the pointed entry in the playlist. The "
 "window shows title of song, name of album, genre, year of publish, track "
 "number, track length, and artwork."
-msgstr ""
-"Ativa a exibição de informações de arquivos da lista de reprodução em uma "
-"janela popup. A janela mostra o título, número, álbum, gênero, ano, duração "
-"e arte do arquivo selecionado."
+msgstr "Ativa a exibição de informações de arquivos da lista de reprodução em uma janela popup. A janela mostra o título, número, álbum, gênero, ano, duração e arte do arquivo selecionado."
 
-#: src/audacious/ui_preferences.c:1397
+#: src/audacious/ui_preferences.c:1455
 msgid "Edit settings for popup information"
 msgstr "Editar valores para informações popup"
 
-#: src/audacious/ui_preferences.c:1497
+#: src/audacious/ui_preferences.c:1544
 msgid "Output plugin:"
 msgstr "Plugin de saída:"
 
-#: src/audacious/ui_preferences.c:1556
+#: src/audacious/ui_preferences.c:1603
 msgid "Transport"
 msgstr "Transportar"
 
-#: src/audacious/ui_preferences.c:1556
+#: src/audacious/ui_preferences.c:1603
 msgid "Input"
 msgstr "Entrada"
 
-#: src/audacious/ui_preferences.c:1557
+#: src/audacious/ui_preferences.c:1604
 msgid "Effect"
 msgstr "Efeito"
 
-#: src/audacious/ui_preferences.c:1557
+#: src/audacious/ui_preferences.c:1604
 msgid "Visualization"
 msgstr "Visualização"
 
-#: src/audacious/ui_preferences.c:1557
+#: src/audacious/ui_preferences.c:1604
 msgid "General"
 msgstr "Geral"
 
-#: src/audacious/ui_preferences.c:1597
+#: src/audacious/ui_preferences.c:1644
 msgid "Audacious Preferences"
 msgstr "Preferências do Audacious"
 
-#: src/audacious/util.c:155
+#: src/audacious/util.c:120
 #, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr "Erro ao criar o diretório (%s): %s\n"
 
-#: src/audtool/handlers_playlist.c:264
+#: src/audtool/handlers_playlist.c:273
 msgid "Position not found."
 msgstr "Posição não encontrada."
 
-#: src/audtool/handlers_vitals.c:64
+#: src/audtool/handlers_vitals.c:63
 msgid "No song playing."
 msgstr "Nenhuma música tocando."
 
-#: src/libaudcore/tuple.c:685
+#: src/libaudcore/audstrings.c:199
+#, c-format
+msgid "Audio CD, track %s"
+msgstr "CD de Áudio, trilha %s"
+
+#: src/libaudcore/tuple.c:536
 msgid "Mono"
 msgstr "Mono"
 
-#: src/libaudcore/tuple.c:687
+#: src/libaudcore/tuple.c:538
 msgid "Stereo"
 msgstr "Estéreo"
 
-#: src/libaudcore/tuple.c:689 src/libaudgui/confirm.c:73
+#: src/libaudcore/tuple.c:540
+#, c-format
+msgid "%d channel"
+msgid_plural "%d channels"
+msgstr[0] "%d canal"
+msgstr[1] "%d canais"
+
+#: src/libaudgui/about.c:52 src/libaudgui/about.c:115
+msgid "Credits"
+msgstr "Créditos"
+
+#: src/libaudgui/about.c:52
+msgid "Translators"
+msgstr "Tradutores(as)"
+
+#: src/libaudgui/about.c:91
+msgid "About Audacious"
+msgstr "Sobre o Audacious"
+
+#: src/libaudgui/confirm.c:76
 #, c-format
 msgid ""
 "Are you sure you want to close %s? If you do, any changes made since the "
 "playlist was exported will be lost."
-msgstr ""
-"Você tem certeza que deseja fechar %s? Se você fizer isto, todas as mudanças "
-"feitas desde que a lista de reprodução foi exportada serão perdidas."
+msgstr "Você tem certeza que deseja fechar %s? Se você fizer isto, todas as mudanças feitas desde que a lista de reprodução foi exportada serão perdidas."
 
-#: src/libaudgui/confirm.c:86
+#: src/libaudgui/confirm.c:89
 msgid "_Don't show this message again"
 msgstr "_Não mostrar esta mensagem novamente"
 
-#: src/libaudgui/confirm.c:124
+#: src/libaudgui/confirm.c:126
 msgid "Rename Playlist"
 msgstr "Renomear Lista de Reprodução"
 
-#: src/libaudgui/effects-menu.c:76
+#: src/libaudgui/effects-menu.c:74
 msgid "settings ..."
 msgstr "configurações..."
 
-#: src/libaudgui/equalizer.c:68
+#: src/libaudgui/equalizer.c:51
 msgid "_Enable"
 msgstr "_Ativar"
 
-#: src/libaudgui/equalizer.c:140
+#: src/libaudgui/equalizer.c:123
 msgid "31 Hz"
 msgstr "31 Hz"
 
-#: src/libaudgui/equalizer.c:140
+#: src/libaudgui/equalizer.c:123
 msgid "63 Hz"
 msgstr "63 Hz"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "125 Hz"
 msgstr "125 Hz"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "250 Hz"
 msgstr "250 Hz"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "500 Hz"
 msgstr "500 Hz"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "1 kHz"
 msgstr "1 kHz"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "2 kHz"
 msgstr "2 kHz"
 
-#: src/libaudgui/equalizer.c:142
+#: src/libaudgui/equalizer.c:125
 msgid "4 kHz"
 msgstr "4 kHz"
 
-#: src/libaudgui/equalizer.c:142
+#: src/libaudgui/equalizer.c:125
 msgid "8 kHz"
 msgstr "8 kHz"
 
-#: src/libaudgui/equalizer.c:142
+#: src/libaudgui/equalizer.c:125
 msgid "16 kHz"
 msgstr "16 kHz"
 
-#: src/libaudgui/equalizer.c:147
+#: src/libaudgui/equalizer.c:130
 msgid "Equalizer"
 msgstr "Equalizador"
 
-#: src/libaudgui/equalizer.c:163
+#: src/libaudgui/equalizer.c:146
 msgid "Preamp"
 msgstr "Preamplificação"
 
-#: src/libaudgui/infopopup.c:212
+#: src/libaudgui/infopopup.c:207
 msgid "Track Number"
 msgstr "Número do Arquivo"
 
-#: src/libaudgui/infopopup.c:214
+#: src/libaudgui/infopopup.c:209
 msgid "Track Length"
 msgstr "Duração do arquivo"
 
-#: src/libaudgui/infowin.c:77
+#: src/libaudgui/infowin.c:75
 msgid "Acid Jazz"
 msgstr "Jazz ácido"
 
-#: src/libaudgui/infowin.c:78
+#: src/libaudgui/infowin.c:76
 msgid "Acid Rock"
 msgstr "Acid Rock"
 
-#: src/libaudgui/infowin.c:79
+#: src/libaudgui/infowin.c:77
 msgid "Ambient"
 msgstr "Ambient"
 
-#: src/libaudgui/infowin.c:80
+#: src/libaudgui/infowin.c:78
 msgid "Bebop"
 msgstr "Bebop"
 
-#: src/libaudgui/infowin.c:81
+#: src/libaudgui/infowin.c:79
 msgid "Bluegrass"
 msgstr "Bluegrass"
 
-#: src/libaudgui/infowin.c:82
+#: src/libaudgui/infowin.c:80
 msgid "Blues"
 msgstr "Blues"
 
-#: src/libaudgui/infowin.c:83
+#: src/libaudgui/infowin.c:81
 msgid "Chamber Music"
 msgstr "Música de cámara"
 
-#: src/libaudgui/infowin.c:84
+#: src/libaudgui/infowin.c:82
 msgid "Classical"
 msgstr "Clásica"
 
-#: src/libaudgui/infowin.c:85
+#: src/libaudgui/infowin.c:83
 msgid "Country"
 msgstr "Country"
 
-#: src/libaudgui/infowin.c:86
+#: src/libaudgui/infowin.c:84
 msgid "Death Metal"
 msgstr "Death Metal"
 
-#: src/libaudgui/infowin.c:87
+#: src/libaudgui/infowin.c:85
 msgid "Disco"
 msgstr "Disco"
 
-#: src/libaudgui/infowin.c:88
+#: src/libaudgui/infowin.c:86
 msgid "Easy Listening"
 msgstr "Fácil de escutar"
 
-#: src/libaudgui/infowin.c:89
+#: src/libaudgui/infowin.c:87
 msgid "Folk"
 msgstr "Folclore"
 
-#: src/libaudgui/infowin.c:90
+#: src/libaudgui/infowin.c:88
 msgid "Funk"
 msgstr "Funk"
 
-#: src/libaudgui/infowin.c:91
+#: src/libaudgui/infowin.c:89
 msgid "Gangsta Rap"
 msgstr "Gangsta Rap"
 
-#: src/libaudgui/infowin.c:92
+#: src/libaudgui/infowin.c:90
 msgid "Gospel"
 msgstr "Gospel"
 
-#: src/libaudgui/infowin.c:93
+#: src/libaudgui/infowin.c:91
 msgid "Grunge"
 msgstr "Grunge"
 
-#: src/libaudgui/infowin.c:94
+#: src/libaudgui/infowin.c:92
 msgid "Hard Rock"
 msgstr "Hard Rock"
 
-#: src/libaudgui/infowin.c:95
+#: src/libaudgui/infowin.c:93
 msgid "Heavy Metal"
 msgstr "Heavy Metal"
 
-#: src/libaudgui/infowin.c:96
+#: src/libaudgui/infowin.c:94
 msgid "Hip-hop"
 msgstr "Hip-hop"
 
-#: src/libaudgui/infowin.c:97
+#: src/libaudgui/infowin.c:95
 msgid "House"
 msgstr "House"
 
-#: src/libaudgui/infowin.c:98
+#: src/libaudgui/infowin.c:96
 msgid "Jazz"
 msgstr "Jazz"
 
-#: src/libaudgui/infowin.c:99
+#: src/libaudgui/infowin.c:97
 msgid "Jungle"
 msgstr "Jungle"
 
-#: src/libaudgui/infowin.c:100
+#: src/libaudgui/infowin.c:98
 msgid "Metal"
 msgstr "Metal"
 
-#: src/libaudgui/infowin.c:101
+#: src/libaudgui/infowin.c:99
 msgid "New Age"
 msgstr "New age"
 
-#: src/libaudgui/infowin.c:102
+#: src/libaudgui/infowin.c:100
 msgid "New Wave"
 msgstr "New wave"
 
-#: src/libaudgui/infowin.c:103
+#: src/libaudgui/infowin.c:101
 msgid "Noise"
 msgstr "Noise"
 
-#: src/libaudgui/infowin.c:104
+#: src/libaudgui/infowin.c:102
 msgid "Pop"
 msgstr "Pop"
 
-#: src/libaudgui/infowin.c:105
+#: src/libaudgui/infowin.c:103
 msgid "Punk Rock"
 msgstr "Rock Punk"
 
-#: src/libaudgui/infowin.c:106
+#: src/libaudgui/infowin.c:104
 msgid "Rap"
 msgstr "Rap"
 
-#: src/libaudgui/infowin.c:107
+#: src/libaudgui/infowin.c:105
 msgid "Reggae"
 msgstr "Reggae"
 
-#: src/libaudgui/infowin.c:108
+#: src/libaudgui/infowin.c:106
 msgid "Rock"
 msgstr "Rock"
 
-#: src/libaudgui/infowin.c:109
+#: src/libaudgui/infowin.c:107
 msgid "Rock and Roll"
 msgstr "Rock and Roll"
 
-#: src/libaudgui/infowin.c:110
+#: src/libaudgui/infowin.c:108
 msgid "Rhythm and Blues"
 msgstr "Rhythm and Blues"
 
-#: src/libaudgui/infowin.c:111
+#: src/libaudgui/infowin.c:109
 msgid "Ska"
 msgstr "Ska"
 
-#: src/libaudgui/infowin.c:112
+#: src/libaudgui/infowin.c:110
 msgid "Soul"
 msgstr "Soul"
 
-#: src/libaudgui/infowin.c:113
+#: src/libaudgui/infowin.c:111
 msgid "Swing"
 msgstr "Swing"
 
-#: src/libaudgui/infowin.c:114
+#: src/libaudgui/infowin.c:112
 msgid "Techno"
 msgstr "Techno"
 
-#: src/libaudgui/infowin.c:115
+#: src/libaudgui/infowin.c:113
 msgid "Trip-hop"
 msgstr "Trip-hop"
 
-#: src/libaudgui/infowin.c:175 src/libaudgui/infowin.c:361
-#: src/libaudgui/infowin.c:364 src/libaudgui/infowin.c:367
+#: src/libaudgui/infowin.c:177 src/libaudgui/infowin.c:363
+#: src/libaudgui/infowin.c:366 src/libaudgui/infowin.c:369
 msgid "n/a"
 msgstr "n/a"
 
-#: src/libaudgui/infowin.c:265
+#: src/libaudgui/infowin.c:267
 msgid "Metadata updated successfully"
 msgstr "Metadata atualizado com sucesso"
 
-#: src/libaudgui/infowin.c:270
+#: src/libaudgui/infowin.c:272
 msgid "Metadata updating failed"
 msgstr "Atualização de metadata falhou"
 
-#: src/libaudgui/infowin.c:318
+#: src/libaudgui/infowin.c:320
 msgid "Track Information"
 msgstr "Informações do arquivo"
 
-#: src/libaudgui/infowin.c:350
+#: src/libaudgui/infowin.c:352
 msgid "Format:"
 msgstr "Formato:"
 
-#: src/libaudgui/infowin.c:354
+#: src/libaudgui/infowin.c:356
 msgid "Quality:"
 msgstr "Qualidade:"
 
-#: src/libaudgui/infowin.c:357
+#: src/libaudgui/infowin.c:359
 msgid "Bitrate:"
 msgstr "Frequência:"
 
-#: src/libaudgui/infowin.c:387
+#: src/libaudgui/infowin.c:389
 msgid "Title"
 msgstr "Título"
 
-#: src/libaudgui/infowin.c:399
+#: src/libaudgui/infowin.c:401
 msgid "Artist"
 msgstr "Artista"
 
-#: src/libaudgui/infowin.c:411
+#: src/libaudgui/infowin.c:413
 msgid "Album"
 msgstr "Álbum"
 
-#: src/libaudgui/infowin.c:423
+#: src/libaudgui/infowin.c:425
 msgid "Comment"
 msgstr "Comentário"
 
-#: src/libaudgui/infowin.c:435
+#: src/libaudgui/infowin.c:437
 msgid "Genre"
 msgstr "Gênero"
 
-#: src/libaudgui/infowin.c:456
+#: src/libaudgui/infowin.c:458
 msgid "Year"
 msgstr "Ano"
 
-#: src/libaudgui/infowin.c:467
+#: src/libaudgui/infowin.c:469
 msgid "Track Number"
 msgstr "Número do Arquivo"
 
-#: src/libaudgui/infowin.c:549
+#: src/libaudgui/infowin.c:548
 #, c-format
 msgid "%d kb/s"
 msgstr "%d kb/s"
 
-#: src/libaudgui/infowin.c:579
+#: src/libaudgui/infowin.c:575
 #, c-format
 msgid "No info available for %s.\n"
 msgstr "Sem informação disponível para %s.\n"
 
-#: src/libaudgui/jump-to-time.c:75
+#: src/libaudgui/jump-to-time.c:72
 msgid "Jump to Time"
 msgstr "Avançar Tempo até"
 
-#: src/libaudgui/jump-to-time.c:90
+#: src/libaudgui/jump-to-time.c:87
 msgid "mm:ss"
 msgstr "mm:ss"
 
-#: src/libaudgui/playlists.c:39
+#: src/libaudgui/playlists.c:33
 msgid "Export Playlist"
 msgstr "Exportar Lista de Reprodução"
 
-#: src/libaudgui/playlists.c:39
+#: src/libaudgui/playlists.c:33
 msgid "Import Playlist"
 msgstr "Importar Lista de Reprodução"
 
-#: src/libaudgui/playlists.c:71
+#: src/libaudgui/playlists.c:66
 #, c-format
 msgid "Overwrite %s?"
 msgstr "Substituir %s?"
 
-#: src/libaudgui/ui_about.c:71
-msgid "About Audacious"
-msgstr "Sobre o Audacious"
-
-#: src/libaudgui/ui_about.c:93 src/libaudgui/ui_credits.c:122
-msgid "Credits"
-msgstr "Créditos"
-
-#: src/libaudgui/ui_credits.c:126
-msgid "Translators"
-msgstr "Tradutores(as)"
+#: src/libaudgui/queue-manager.c:196
+msgid "Queue Manager"
+msgstr "Gerenciador de Fila"
 
-#: src/libaudgui/ui_fileopener.c:108
+#: src/libaudgui/ui_fileopener.c:109
 msgid "Open Files"
 msgstr "Abrir Arquivos"
 
-#: src/libaudgui/ui_fileopener.c:108
+#: src/libaudgui/ui_fileopener.c:109
 msgid "Add Files"
 msgstr "Adicionar Arquivos"
 
-#: src/libaudgui/ui_fileopener.c:110
+#: src/libaudgui/ui_fileopener.c:111
 msgid "Close dialog on Open"
 msgstr "Fechar janela ao Abrir"
 
-#: src/libaudgui/ui_fileopener.c:110
+#: src/libaudgui/ui_fileopener.c:111
 msgid "Close dialog on Add"
 msgstr "Fechar janela ao Adicionar"
 
-#: src/libaudgui/ui_jumptotrack.c:133
-msgid "Un_queue"
-msgstr "_Remover da fila"
-
-#: src/libaudgui/ui_jumptotrack.c:135 src/libaudgui/ui_jumptotrack.c:512
+#: src/libaudgui/ui_jumptotrack.c:109 src/libaudgui/ui_jumptotrack.c:117
+#: src/libaudgui/ui_jumptotrack.c:326
 msgid "_Queue"
 msgstr "_Inserir na fila"
 
-#: src/libaudgui/ui_jumptotrack.c:399
-msgid "Jump to Track"
-msgstr "Ir para a Faixa"
+#: src/libaudgui/ui_jumptotrack.c:115
+msgid "Un_queue"
+msgstr "_Remover da fila"
+
+#: src/libaudgui/ui_jumptotrack.c:258
+msgid "Jump to Song"
+msgstr "Pular para Música"
 
-#: src/libaudgui/ui_jumptotrack.c:442
+#: src/libaudgui/ui_jumptotrack.c:281
 msgid "Filter: "
 msgstr "Filtro:"
 
-#: src/libaudgui/ui_jumptotrack.c:443
+#: src/libaudgui/ui_jumptotrack.c:282
 msgid "_Filter:"
 msgstr "_Filtro:"
 
-#: src/libaudgui/ui_jumptotrack.c:461
+#: src/libaudgui/ui_jumptotrack.c:292
 msgid "Remember"
 msgstr "Lembrar"
 
-#: src/libaudgui/ui_jumptotrack.c:470
+#: src/libaudgui/ui_jumptotrack.c:299
 msgid "Clea_r"
 msgstr "Clea_r"
 
-#: src/libaudgui/ui_jumptotrack.c:504
+#: src/libaudgui/ui_jumptotrack.c:319
 msgid "Close on Jump"
 msgstr "Fechar janela ao abrir"
 
-#: src/libaudgui/ui_playlist_manager.c:240
+#: src/libaudgui/ui_playlist_manager.c:253
 msgid "Playlist Manager"
 msgstr "Editor de Lista de Reprodução"
 
-#: src/libaudgui/ui_playlist_manager.c:264
+#: src/libaudgui/ui_playlist_manager.c:280
 msgid "Entries"
 msgstr "Entradas"
 
-#: src/libaudgui/ui_playlist_manager.c:285
+#: src/libaudgui/ui_playlist_manager.c:301
 msgid "_Rename"
 msgstr "_Renomear"
 
-#: src/libaudgui/ui_playlist_manager.c:309
+#: src/libaudgui/ui_playlist_manager.c:325
 msgid "_Close dialog on activating playlist"
 msgstr "_Fechar janela ao ativar lista de reprodução"
 
-#: src/libaudgui/ui_urlopener.c:58
+#: src/libaudgui/ui_urlopener.c:48
 msgid "Open URL"
 msgstr "Abrir URL"
 
-#: src/libaudgui/ui_urlopener.c:58
+#: src/libaudgui/ui_urlopener.c:48
 msgid "Add URL"
 msgstr "Adicionar URL"
 
@@ -1154,40 +1159,36 @@
 msgid ""
 "\n"
 "(Further messages have been hidden.)"
-msgstr ""
-"\n"
-"(Demais mensagens foram escondidas.)"
+msgstr "\n(Demais mensagens foram escondidas.)"
 
 #: src/libeggsmclient/eggdesktopfile.c:165
 msgid "File is not a valid .desktop file"
 msgstr "Este não é um arquivo .desktop válido"
 
-#: src/libeggsmclient/eggdesktopfile.c:188
+#: src/libeggsmclient/eggdesktopfile.c:191
 #, c-format
 msgid "Unrecognized desktop file Version '%s'"
 msgstr "Arquivo desktop desconhecido Versão '%s'"
 
-#: src/libeggsmclient/eggdesktopfile.c:967
+#: src/libeggsmclient/eggdesktopfile.c:974
 #, c-format
 msgid "Starting %s"
 msgstr "Iniciando %s"
 
-#: src/libeggsmclient/eggdesktopfile.c:1108
+#: src/libeggsmclient/eggdesktopfile.c:1116
 msgid "Application does not accept documents on command line"
 msgstr "Aplicação não aceita documentos na linha de comando"
 
-#: src/libeggsmclient/eggdesktopfile.c:1176
+#: src/libeggsmclient/eggdesktopfile.c:1184
 #, c-format
 msgid "Unrecognized launch option: %d"
 msgstr "Opção de inicialização desconhecida: %d"
 
-#: src/libeggsmclient/eggdesktopfile.c:1375
+#: src/libeggsmclient/eggdesktopfile.c:1391
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
-msgstr ""
-"Não se pode passar URIs de documentos para uma entrada de desktop \"Type=Link"
-"\""
+msgstr "Não se pode passar URIs de documentos para uma entrada de desktop \"Type=Link\""
 
-#: src/libeggsmclient/eggdesktopfile.c:1396
+#: src/libeggsmclient/eggdesktopfile.c:1412
 msgid "Not a launchable item"
 msgstr "Não é possível iniciar este item"
 
@@ -1218,1601 +1219,3 @@
 #: src/libeggsmclient/eggsmclient.c:254
 msgid "Show session management options"
 msgstr "Mostrar opções de gerenciamento de sessão"
-
-#~ msgid "Replay Gain"
-#~ msgstr "Repetir aumento"
-
-#~ msgid "Bit Depth"
-#~ msgstr "Taxa:"
-
-#~ msgid ""
-#~ "All streams will be converted to this bit depth.\n"
-#~ "This should be the max supported bit depth of\n"
-#~ "the sound card or output plugin."
-#~ msgstr ""
-#~ "Todas as streams serão convertidas tamanho.\n"
-#~ "Este deve ser o tamaho máximo suportado\n"
-#~ "pela placa de som ou plugin de saída"
-
-#~ msgid "Volume Control"
-#~ msgstr "Controle de Volume"
-
-#, fuzzy
-#~ msgid ""
-#~ "Use software volume control. This may be useful for situations where your "
-#~ "audio system does not support controlling the playback volume."
-#~ msgstr ""
-#~ "Use software para controle de volume. Isto pode ser útil para situações "
-#~ "onde seu sistema de áudio não suporta controlar o volume de reprodução."
-
-#, fuzzy
-#~ msgid "Mode"
-#~ msgstr "TAGs"
-
-#, fuzzy
-#~ msgid "Clipping Prevention"
-#~ msgstr "Informações Popup"
-
-#, fuzzy
-#~ msgid "Enable clipping prevention"
-#~ msgstr "Habilitar prevenção de clipping"
-
-#~ msgid "Audio System"
-#~ msgstr "Sistema de Áudio"
-
-#~ msgid "Current output plugin:"
-#~ msgstr "Plugin de saída atual:"
-
-#~ msgid "Display all open Audacious windows"
-#~ msgstr "Mostrar janelas abertas do Audacious"
-
-#~ msgid "%s: Unable to open display, exiting.\n"
-#~ msgstr "%s: Erro ao abrir exibidor, abortando.\n"
-
-#~ msgid "Preamp:"
-#~ msgstr "Preamplificación:"
-
-#~ msgid "Default gain:"
-#~ msgstr "Obter padrão:"
-
-#~ msgid "This gain will be used if file doesn't contain Replay Gain metadata."
-#~ msgstr ""
-#~ "Esse ganho será usado se o arquivo não contiver dados de ganho de replay."
-
-#~ msgid "Replay Gain configuration"
-#~ msgstr "Repetir ganho de configuração"
-
-#, fuzzy
-#~ msgid "Track gain/peak"
-#~ msgstr "Faixa ganho/pico"
-
-#, fuzzy
-#~ msgid "Album gain/peak"
-#~ msgstr "Álbum ganho/pico"
-
-#~ msgid "Classic Rock"
-#~ msgstr "Rock clásico"
-
-#~ msgid "Dance"
-#~ msgstr "Dance"
-
-#~ msgid "Oldies"
-#~ msgstr "Antiguos"
-
-#~ msgid "Other"
-#~ msgstr "Otro"
-
-#~ msgid "R&B"
-#~ msgstr "R&B"
-
-#~ msgid "Industrial"
-#~ msgstr "Industrial"
-
-#~ msgid "Alternative"
-#~ msgstr "Alternativa"
-
-#, fuzzy
-#~ msgid "Pranks"
-#~ msgstr "Brincar"
-
-#~ msgid "Soundtrack"
-#~ msgstr "Banda Sonora"
-
-#~ msgid "Euro-Techno"
-#~ msgstr "Euro-Techno"
-
-#~ msgid "Vocal"
-#~ msgstr "Vocal"
-
-#~ msgid "Jazz+Funk"
-#~ msgstr "Jazz+Funk"
-
-#~ msgid "Fusion"
-#~ msgstr "Fusión"
-
-#~ msgid "Trance"
-#~ msgstr "Trance"
-
-#~ msgid "Instrumental"
-#~ msgstr "Instrumental"
-
-#~ msgid "Acid"
-#~ msgstr "Acid"
-
-#~ msgid "Game"
-#~ msgstr "Juego"
-
-#~ msgid "Sound Clip"
-#~ msgstr "Clip de sonido"
-
-#~ msgid "AlternRock"
-#~ msgstr "Rock alternativo"
-
-#~ msgid "Bass"
-#~ msgstr "Grave"
-
-#~ msgid "Punk"
-#~ msgstr "Punk"
-
-#~ msgid "Space"
-#~ msgstr "Espacio"
-
-#~ msgid "Meditative"
-#~ msgstr "Meditativa"
-
-#~ msgid "Instrumental Pop"
-#~ msgstr "Pop instrumental"
-
-#~ msgid "Instrumental Rock"
-#~ msgstr "Rock instrumental"
-
-#~ msgid "Ethnic"
-#~ msgstr "Étnica"
-
-#~ msgid "Gothic"
-#~ msgstr "Gótica"
-
-#~ msgid "Darkwave"
-#~ msgstr "Darkwave"
-
-#~ msgid "Techno-Industrial"
-#~ msgstr "Tecno-industrial"
-
-#~ msgid "Electronic"
-#~ msgstr "Electrónica"
-
-#~ msgid "Pop-Folk"
-#~ msgstr "Pop-folk"
-
-#~ msgid "Eurodance"
-#~ msgstr "Eurodance"
-
-#~ msgid "Dream"
-#~ msgstr "Dream"
-
-#~ msgid "Southern Rock"
-#~ msgstr "Rock sureño"
-
-#~ msgid "Comedy"
-#~ msgstr "Comedia"
-
-#~ msgid "Cult"
-#~ msgstr "Culto"
-
-#~ msgid "Top 40"
-#~ msgstr "Primeros 40"
-
-#~ msgid "Christian Rap"
-#~ msgstr "Rap cristiano"
-
-#~ msgid "Pop/Funk"
-#~ msgstr "Pop/Funk"
-
-#~ msgid "Native American"
-#~ msgstr "Nativa americana"
-
-#~ msgid "Cabaret"
-#~ msgstr "Cabaret"
-
-#~ msgid "Psychedelic"
-#~ msgstr "Psicodélica"
-
-#~ msgid "Rave"
-#~ msgstr "Rave"
-
-#, fuzzy
-#~ msgid "Showtunes"
-#~ msgstr "Músicas"
-
-#~ msgid "Trailer"
-#~ msgstr "Trailer"
-
-#~ msgid "Lo-Fi"
-#~ msgstr "Lo-Fi"
-
-#~ msgid "Tribal"
-#~ msgstr "Tribal"
-
-#~ msgid "Acid Punk"
-#~ msgstr "Acid Punk"
-
-#~ msgid "Polka"
-#~ msgstr "Polka"
-
-#~ msgid "Retro"
-#~ msgstr "Retrô"
-
-#~ msgid "Musical"
-#~ msgstr "Musical"
-
-#~ msgid "Folk/Rock"
-#~ msgstr "Folclore/Rock"
-
-#~ msgid "National Folk"
-#~ msgstr "Folclore nacional"
-
-#~ msgid "Fast-Fusion"
-#~ msgstr "Fast-Fusion"
-
-#~ msgid "Latin"
-#~ msgstr "Latín"
-
-#~ msgid "Revival"
-#~ msgstr "Revival"
-
-#~ msgid "Celtic"
-#~ msgstr "Celta"
-
-#~ msgid "Avantgarde"
-#~ msgstr "Avantgarde"
-
-#~ msgid "Gothic Rock"
-#~ msgstr "Rock gótico"
-
-#~ msgid "Progressive Rock"
-#~ msgstr "Rock progresivo"
-
-#~ msgid "Psychedelic Rock"
-#~ msgstr "Rock Psicodélico"
-
-#~ msgid "Symphonic Rock"
-#~ msgstr "Rock sinfónico"
-
-#~ msgid "Slow Rock"
-#~ msgstr "Rock lento"
-
-#~ msgid "Big Band"
-#~ msgstr "Big Band"
-
-#~ msgid "Chorus"
-#~ msgstr "Refrão"
-
-#~ msgid "Acoustic"
-#~ msgstr "Acústica"
-
-#~ msgid "Humour"
-#~ msgstr "Humor"
-
-#~ msgid "Speech"
-#~ msgstr "Discurso"
-
-#~ msgid "Chanson"
-#~ msgstr "Chanson"
-
-#~ msgid "Opera"
-#~ msgstr "Opera"
-
-#~ msgid "Sonata"
-#~ msgstr "Sonata"
-
-#~ msgid "Symphony"
-#~ msgstr "Sinfonía"
-
-#~ msgid "Booty Bass"
-#~ msgstr "Booty Bass"
-
-#~ msgid "Primus"
-#~ msgstr "Primus"
-
-#~ msgid "Porn Groove"
-#~ msgstr "Porn Groove"
-
-#~ msgid "Satire"
-#~ msgstr "Sátira"
-
-#~ msgid "Slow Jam"
-#~ msgstr "Slow Jam"
-
-#~ msgid "Club"
-#~ msgstr "Club"
-
-#~ msgid "Tango"
-#~ msgstr "Tango"
-
-#~ msgid "Samba"
-#~ msgstr "Samba"
-
-#~ msgid "Folklore"
-#~ msgstr "Folclore"
-
-#~ msgid "Ballad"
-#~ msgstr "Balada"
-
-#~ msgid "Power Ballad"
-#~ msgstr "Power Ballad"
-
-#~ msgid "Rhythmic Soul"
-#~ msgstr "Soul rítmico"
-
-#~ msgid "Freestyle"
-#~ msgstr "Estilo libre"
-
-#~ msgid "Duet"
-#~ msgstr "Dueto"
-
-#~ msgid "Drum Solo"
-#~ msgstr "Solo de batería"
-
-#~ msgid "A Cappella"
-#~ msgstr "A cappella"
-
-#~ msgid "Euro-House"
-#~ msgstr "Euro-House"
-
-#~ msgid "Dance Hall"
-#~ msgstr "Dance Hall"
-
-#~ msgid "Goa"
-#~ msgstr "Goa"
-
-#~ msgid "Drum & Bass"
-#~ msgstr "Bajo y batería"
-
-#~ msgid "Club-House"
-#~ msgstr "Club-House"
-
-#~ msgid "Hardcore"
-#~ msgstr "Hardcore"
-
-#~ msgid "Terror"
-#~ msgstr "Terror"
-
-#~ msgid "Indie"
-#~ msgstr "Indie"
-
-#~ msgid "BritPop"
-#~ msgstr "BritPop"
-
-#~ msgid "Negerpunk"
-#~ msgstr "Negerpunk"
-
-#~ msgid "Polsk Punk"
-#~ msgstr "Polsk Punk"
-
-#~ msgid "Beat"
-#~ msgstr "Beat"
-
-#~ msgid "Christian Gangsta Rap"
-#~ msgstr "Christian Gangsta Rap"
-
-#~ msgid "Black Metal"
-#~ msgstr "Black Metal"
-
-#~ msgid "Crossover"
-#~ msgstr "Crossover"
-
-#~ msgid "Contemporary Christian"
-#~ msgstr "Cristiana contemporánea"
-
-#~ msgid "Christian Rock"
-#~ msgstr "Rock cristiano"
-
-#~ msgid "Merengue"
-#~ msgstr "Merengue"
-
-#~ msgid "Salsa"
-#~ msgstr "Salsa"
-
-#~ msgid "Thrash Metal"
-#~ msgstr "Thrash Metal"
-
-#~ msgid "Anime"
-#~ msgstr "Anime"
-
-#~ msgid "JPop"
-#~ msgstr "JPop"
-
-#~ msgid "Synthpop"
-#~ msgstr "Synthpop"
-
-#, fuzzy
-#~ msgid ""
-#~ "<big>Audacious %s</big>\n"
-#~ "An audio player for many platforms.\n"
-#~ "Copyright (C) 2005-2011 Audacious Development Team"
-#~ msgstr ""
-#~ "<big>Audacious %s</big>\n"
-#~ "Um tocador multimídia com layout para várias plataformas.\n"
-#~ "\n"
-#~ "Direitos autorais (C) 2005-2006 Equipe de Desenvolvimento do Audacious \n"
-
-#~ msgid "Unable to create log file (%s)!\n"
-#~ msgstr "Erro ao criar arquivo de log (%s)\n"
-
-#~ msgid "Print all errors and warnings to stdout"
-#~ msgstr ""
-#~ "Imprimir todos os avisos e erros antes de criar saída padrão de stream"
-
-#~ msgid "Used in macpacking"
-#~ msgstr "Usado em macpacking"
-
-#, fuzzy
-#~ msgid "Audacious - Unsupported Version Warning"
-#~ msgstr "Audacious - erros do GTK exibe avisos"
-
-#~ msgid "Playback"
-#~ msgstr "Reproduzir"
-
-#~ msgid "Playback"
-#~ msgstr "Reprodução"
-
-#~ msgid ""
-#~ "When Audacious starts, automatically begin playing from the point where "
-#~ "we stopped before."
-#~ msgstr "Ao iniciar o Audacious, reproduzir o arquivo do ponto que paramos."
-
-#~ msgid "Don't advance in the playlist"
-#~ msgstr "Não avançar automaticamente na lista de reprodução"
-
-#~ msgid ""
-#~ "When finished playing a song, don't automatically advance to the next."
-#~ msgstr ""
-#~ "Ao terminar a reprodução de um arquivo, não reproduzir o próximo "
-#~ "automaticamente."
-
-#~ msgid "Enabled"
-#~ msgstr "Ativado"
-
-#~ msgid "Description"
-#~ msgstr "Descrição"
-
-#~ msgid "Output Plugin Preferences"
-#~ msgstr "Preferências dos Plugins de Saída"
-
-#~ msgid "Output Plugin Information"
-#~ msgstr "Informações de Plugin de Saída"
-
-#~ msgid "_Decoder list:"
-#~ msgstr "_Lista de decodificadores:"
-
-#~ msgid "Decoders"
-#~ msgstr "Decodificadores"
-
-#~ msgid "_General plugin list:"
-#~ msgstr "Lista de plugins _gerais:"
-
-#~ msgid "General"
-#~ msgstr "Geral"
-
-#~ msgid "_Visualization plugin list:"
-#~ msgstr "Lista de _plugins de visualização:"
-
-#~ msgid "Visualization"
-#~ msgstr "Visualização"
-
-#, fuzzy
-#~ msgid "Effect plugins:"
-#~ msgstr "Lista de plugins de _efeitos:"
-
-#~ msgid "General"
-#~ msgstr "Geral"
-
-#~ msgid "Location"
-#~ msgstr "Localização"
-
-#~ msgid "Raw Metadata"
-#~ msgstr "Zerar metadata"
-
-#~ msgid "Key"
-#~ msgstr "Chave"
-
-#~ msgid "Value"
-#~ msgstr "Valor"
-
-#, fuzzy
-#~ msgid "Available Plugin Preferences:\n"
-#~ msgstr "Preferências dos Plugins de Saída"
-
-#~ msgid "Add/Open URL Dialog"
-#~ msgstr "Adicionar/Abrir URL..."
-
-#~ msgid "Enter location to play:"
-#~ msgstr "Insira a URL:"
-
-#~ msgid "Don't clear the playlist"
-#~ msgstr "Não limpar lista de reprodução"
-
-#~ msgid "audacious: %s"
-#~ msgstr "audacious: %s"
-
-#~ msgid "Filename:"
-#~ msgstr "Nome do Arquivo:"
-
-#~ msgid "No input plugin recognized this file"
-#~ msgstr "Nenhum plugin de entrada reconheceu este arquivo"
-
-#~ msgid ""
-#~ "<big>No output plugin selected.</big>\n"
-#~ "You have not selected an output plugin."
-#~ msgstr ""
-#~ "<big>Não há plugin de saída selecionado.</big>\n"
-#~ "Você não selecionou nenhum plugin de saída..."
-
-#~ msgid "Connectivity"
-#~ msgstr "Conectividade"
-
-#~ msgid "Best Sinc Interpolation"
-#~ msgstr "Melhor Sincronia de Interpolação"
-
-#~ msgid "Medium Sinc Interpolation"
-#~ msgstr "Média Sincronia de Interpolação"
-
-#~ msgid "Fastest Sinc Interpolation"
-#~ msgstr "Rápida Sincronia de Interpolação"
-
-#~ msgid "ZOH Interpolation"
-#~ msgstr "Interpolação ZOH"
-
-#~ msgid "Linear Interpolation"
-#~ msgstr "Interpolação linear"
-
-#~ msgid "Sampling Rate [Hz]:"
-#~ msgstr "Taxa de Amostragem [Hz]:"
-
-#~ msgid "Interpolation Engine:"
-#~ msgstr "Sistema de interpolação:"
-
-#~ msgid ""
-#~ "All streams will be converted to this sampling "
-#~ "rate.\n"
-#~ "This should be the max supported sampling rate of\n"
-#~ "the sound card or output plugin."
-#~ msgstr ""
-#~ "Todos os streams serão convertidos para esta taxa de "
-#~ "amostragem.\n"
-#~ "Provavelmente é a taxa de amostragem máxima suportada\n"
-#~ "pela placa de som ou pelo plugin de saída."
-
-#~ msgid "Detect file formats by extension."
-#~ msgstr "Detectar formatos dos arquivos pela extenção."
-
-#~ msgid ""
-#~ "When checked, Audacious will detect file formats based by extension. Only "
-#~ "files with extensions of supported formats will be loaded."
-#~ msgstr ""
-#~ "Quando ativado, o Audacious detectará os formatos de arquivos pela "
-#~ "extenção. Somente arquivos com extensões de formato suportados serão "
-#~ "carregados."
-
-#~ msgid "Sampling Rate Converter"
-#~ msgstr "Conversor de Taxa de Amostragem"
-
-#~ msgid "Enable Sampling Rate Converter"
-#~ msgstr "Ativar Conversor de Taxa de Amostragem"
-
-#, fuzzy
-#~ msgid "Advanced"
-#~ msgstr "Reprodução"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Audacious has caught signal 11 (SIGSEGV).\n"
-#~ "\n"
-#~ "We apologize for the inconvenience, but Audacious has crashed.\n"
-#~ "This is a bug in the program, and should never happen under normal "
-#~ "circumstances.\n"
-#~ "Your current configuration has been saved and should not be damaged.\n"
-#~ "\n"
-#~ "You can help improve the quality of Audacious by filing a bug at http://"
-#~ "jira.atheme.org/\n"
-#~ "Please include the entire text of this message and a description of what "
-#~ "you were doing when\n"
-#~ "this crash occured in order to quickly expedite the handling of your bug "
-#~ "report:\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Audacious acusou erro no sinal 11 (SIGSEGV).\n"
-#~ "\n"
-#~ "Desculpe-nos pela inconviniência, mas o Audacious deixou de funcionar.\n"
-#~ "Este é um erro do programa, mas não deve ocorrer um cincunstâncias "
-#~ "normais.\n"
-#~ "Sua configuração atual foi salva e não deve ser danificada.\n"
-#~ "\n"
-#~ "Você pode ajudar relatando o erro em http://bugs-meta.atheme.org\n"
-#~ "Por favor, inclua na mensagem o que você estava fazendo quando ocorreu o "
-#~ "erro\n"
-#~ "Este erro pode ser rapidamente consertado se você relatá-lo:\n"
-#~ "\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Bugs can be reported at http://jira.atheme.org/ against the Audacious or "
-#~ "Audacious Plugins product.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Erros no Audacious podem ser reportados em http://bugs-meta.atheme.org.\n"
-
-#~ msgid ""
-#~ "Your signaling implementation is broken.\n"
-#~ "Expect unusable crash reports.\n"
-#~ msgstr ""
-#~ "Erro na execução do Audacious.\n"
-#~ "Aguarde reletório de erros.\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "<big>Audacious %s</big>\n"
-#~ "\n"
-#~ "Copyright (C) 2005-2009 Audacious Development Team"
-#~ msgstr ""
-#~ "<big>Audacious %s</big>\n"
-#~ "\n"
-#~ "Direitos autorais (C) 2005-2008 Equipe de Desenvolvimento do Audacious"
-
-#~ msgid "Detect file formats on demand, instead of immediately."
-#~ msgstr ""
-#~ "Detectar formatos dos arquivos ao tentar reproduzir, e não ao inserir na "
-#~ "lista de reprodução."
-
-#~ msgid ""
-#~ "When checked, Audacious will detect file formats on demand. This can "
-#~ "result in a messier playlist, but delivers a major speed benefit."
-#~ msgstr ""
-#~ "Quando ativado, o Audacious detectará os formatos durante a busca. Isto "
-#~ "pode resultar em uma lista de reprodução desorganizada, porém pode "
-#~ "executar mais rapidamente a operação."
-
-#~ msgid "Load metadata from playlists and files"
-#~ msgstr "Carregar TAGs das listas de reprodução e dos arquivos"
-
-#~ msgid "Load metadata (tag information) from music files."
-#~ msgstr "Carregar TAGs dos arquivos."
-
-#~ msgid "minutes:seconds"
-#~ msgstr "minutos:segundos"
-
-#~ msgid "Track length:"
-#~ msgstr "Duração do arquivo:"
-
-#~ msgid "Save as Static Playlist"
-#~ msgstr "Salvar Lista de Reprodução Estática"
-
-#~ msgid "Use Relative Path"
-#~ msgstr "Utilizar localização relativa"
-
-#~ msgid "Error writing playlist \"%s\": %s"
-#~ msgstr "Erro ao criar lista de reprodução \"%s\": %s"
-
-#~ msgid "%s already exist. Continue?"
-#~ msgstr "%s já existe. Continuar?"
-
-#~ msgid ""
-#~ "<big>Unable to save playlist.</big>\n"
-#~ "\n"
-#~ "Unknown file type for '%s'.\n"
-#~ msgstr ""
-#~ "<big>Erro ao salvar lista de reprodução. </big>\n"
-#~ "\n"
-#~ "Tipo de arquivo desconhecido para '%s'.\n"
-
-#~ msgid "Presets"
-#~ msgstr "Pré-regulagem"
-
-#~ msgid "Mouse"
-#~ msgstr "Mouse"
-
-#~ msgid "Pause between songs"
-#~ msgstr "Pausa entre os arquivos"
-
-#~ msgid "Pause for"
-#~ msgstr "Pausa de"
-
-#~ msgid "seconds"
-#~ msgstr "segundos"
-
-#~ msgid "Filename"
-#~ msgstr "Nome do arquivo"
-
-#~ msgid "Convert underscores to blanks"
-#~ msgstr "Converter _ em espaço em branco"
-
-#~ msgid "Convert %20 to blanks"
-#~ msgstr "Converter %20 em espaço"
-
-#~ msgid "Convert backslash '\\' to forward slash '/'"
-#~ msgstr "Converter '\\' em '/'"
-
-#~ msgid "File Dialog"
-#~ msgstr "Caixa de Diálogo do Arquivo"
-
-#~ msgid "Always refresh directory when opening file dialog"
-#~ msgstr "Sempre atualizar o diretório ao abrir a caixa de diálogo do arquivo"
-
-#~ msgid ""
-#~ "Always refresh the file dialog (this will slow opening the dialog on "
-#~ "large directories, and Gnome VFS should handle automatically)."
-#~ msgstr ""
-#~ "Sempre atualizar a caixa de diálogo do arquivo (isto tornará a abertura "
-#~ "da caixa de diálogo mais lenta em diretórios grandes)."
-
-#~ msgid "Changes volume by"
-#~ msgstr "Alterar volume em"
-
-#~ msgid "percent"
-#~ msgstr "porcento"
-
-#~ msgid "Scrolls playlist by"
-#~ msgstr "Rolar lista de reprodução por"
-
-#~ msgid "lines"
-#~ msgstr "linhas"
-
-#~ msgid "Stop after Current Song"
-#~ msgstr "Parar após Arquivo Atual"
-
-#~ msgid "Peaks"
-#~ msgstr "Picos"
-
-#~ msgid "Repeat"
-#~ msgstr "Repetir"
-
-#~ msgid "Shuffle"
-#~ msgstr "Aleatório"
-
-#~ msgid "No Playlist Advance"
-#~ msgstr "Lista de Reprodução não-avançada"
-
-#~ msgid "Play"
-#~ msgstr "Reproduzir"
-
-#~ msgid "Pause"
-#~ msgstr "Pausar"
-
-#~ msgid "Stop"
-#~ msgstr "Parar"
-
-#~ msgid "Previous"
-#~ msgstr "Anterior"
-
-#~ msgid "Next"
-#~ msgstr "Próximo"
-
-#~ msgid "Visualization Mode"
-#~ msgstr "Modos de Visualização"
-
-#~ msgid "Analyzer Mode"
-#~ msgstr "Modo Analizador"
-
-#~ msgid "Scope Mode"
-#~ msgstr "Modo Osciloscópio"
-
-#~ msgid "Voiceprint Mode"
-#~ msgstr "Modo Impressão de Voz"
-
-#~ msgid "WindowShade VU Mode"
-#~ msgstr "Sombreamento da Janela"
-
-#~ msgid "Refresh Rate"
-#~ msgstr "Taxa de Amostragem"
-
-#~ msgid "Analyzer Falloff"
-#~ msgstr "Queda do Analizador"
-
-#~ msgid "Peaks Falloff"
-#~ msgstr "Queda dos Picos"
-
-#~ msgid "New Playlist"
-#~ msgstr "Nova Lista de Reprodução"
-
-#~ msgid "Select Next Playlist"
-#~ msgstr "Selecionar Próxima Lista de Reprodução"
-
-#~ msgid "Select Previous Playlist"
-#~ msgstr "Selecionar Lista de Reprodução Anterior"
-
-#~ msgid "Delete Playlist"
-#~ msgstr "Limpar Lista de Reprodução"
-
-#~ msgid "Load List"
-#~ msgstr "Abrir Lista"
-
-#~ msgid "Loads a playlist file into the selected playlist."
-#~ msgstr ""
-#~ "Abrir arquivos da lista de reprodução na lista de reprodução selecionada."
-
-#~ msgid "Save List"
-#~ msgstr "Salvar Lista"
-
-#~ msgid "Saves the selected playlist."
-#~ msgstr "Salvar lista de reprodução selecionada."
-
-#~ msgid "Save Default List"
-#~ msgstr "Salvar Lista Padrão"
-
-#~ msgid "Saves the selected playlist to the default location."
-#~ msgstr "Salvar lista de reprodução selecionada para o diretório padrão."
-
-#~ msgid "Refresh List"
-#~ msgstr "Atualizar Lista"
-
-#~ msgid "Refreshes metadata associated with a playlist entry."
-#~ msgstr "Atualizar TAGs associadas aos arquivos da lista de reprodução."
-
-#~ msgid "List Manager"
-#~ msgstr "Editor de Listas"
-
-#~ msgid "Opens the playlist manager."
-#~ msgstr "Abrir editor da lista de reprodução."
-
-#~ msgid "View"
-#~ msgstr "Visualizar"
-
-#~ msgid "Add Internet Address..."
-#~ msgstr "Adicionar URL..."
-
-#~ msgid "Adds a remote track to the playlist."
-#~ msgstr "Adicionar arquivo remoto à lista de reprodução."
-
-#~ msgid "Add Files..."
-#~ msgstr "Adicionar Arquivos..."
-
-#~ msgid "Search and Select"
-#~ msgstr "Buscar e Selecionar"
-
-#~ msgid ""
-#~ "Searches the playlist and selects playlist entries based on specific "
-#~ "criteria."
-#~ msgstr ""
-#~ "Buscar lista de reprodução e selecionar arquivos baseado em um critério "
-#~ "específico."
-
-#~ msgid "Invert Selection"
-#~ msgstr "Inverter Seleção"
-
-#~ msgid "Inverts the selected and unselected entries."
-#~ msgstr "Inverter arquivos selecionados e não-selecionados."
-
-#~ msgid "Select All"
-#~ msgstr "Selecionar Todos"
-
-#~ msgid "Selects all of the playlist entries."
-#~ msgstr "Selecionar todas os arquivos da lista de reprodução."
-
-#~ msgid "Select None"
-#~ msgstr "Deselecionar Todos"
-
-#~ msgid "Deselects all of the playlist entries."
-#~ msgstr "Deselecionar todos os arquivos da lista de reprodução."
-
-#~ msgid "Remove All"
-#~ msgstr "Remover Todos"
-
-#~ msgid "Removes all entries from the playlist."
-#~ msgstr "Remover todos os arquivos da lista de reprodução."
-
-#~ msgid "Clear Queue"
-#~ msgstr "Limpar Fila"
-
-#~ msgid "Clears the queue associated with this playlist."
-#~ msgstr "Limpar fila associada com esta lista de reprodução."
-
-#~ msgid "Remove Unavailable Files"
-#~ msgstr "Remover Arquivos Indisponíveis"
-
-#~ msgid "Removes unavailable files from the playlist."
-#~ msgstr "Remover arquivos indisponíveis da lista de reprodução."
-
-#~ msgid "Remove Duplicates"
-#~ msgstr "Remover Duplicados"
-
-#~ msgid "By Title"
-#~ msgstr "Por Título"
-
-#~ msgid "Removes duplicate entries from the playlist by title."
-#~ msgstr "Remover arquivos duplicados da lista de reprodução por título."
-
-#~ msgid "By Filename"
-#~ msgstr "Por Nome do Arquivo"
-
-#~ msgid "Removes duplicate entries from the playlist by filename."
-#~ msgstr ""
-#~ "Remover arquivos duplicados da lista de reprodução por nome do arquivo."
-
-#~ msgid "By Path + Filename"
-#~ msgstr "Por Localização + Nome do Arquivo"
-
-#~ msgid "Removes duplicate entries from the playlist by their full path."
-#~ msgstr ""
-#~ "Remover arquivos duplicados da lista de reprodução pela localização."
-
-#~ msgid "Remove Unselected"
-#~ msgstr "Remover Não-selecionados"
-
-#~ msgid "Remove unselected entries from the playlist."
-#~ msgstr "Remover arquivos não-selecionados da lista de reprodução."
-
-#~ msgid "Remove Selected"
-#~ msgstr "Remover Selecionado"
-
-#~ msgid "Remove selected entries from the playlist."
-#~ msgstr "Remover arquivos selecionados da lista de reprodução."
-
-#~ msgid "Randomize List"
-#~ msgstr "Embaralhar Lista"
-
-#~ msgid "Randomizes the playlist."
-#~ msgstr "Embaralhar lista de reprodução."
-
-#~ msgid "Reverse List"
-#~ msgstr "Inverter Lista"
-
-#~ msgid "Reverses the playlist."
-#~ msgstr "Reverter lista de reprodução."
-
-#~ msgid "Sort List"
-#~ msgstr "Organizar Lista"
-
-#~ msgid "Sorts the list by title."
-#~ msgstr "Organizar lista por título."
-
-#, fuzzy
-#~ msgid "By Album"
-#~ msgstr "Álbum"
-
-#, fuzzy
-#~ msgid "Sorts the list by album."
-#~ msgstr "Organizar lista por título."
-
-#~ msgid "By Artist"
-#~ msgstr "Por Artista"
-
-#~ msgid "Sorts the list by artist."
-#~ msgstr "Organizar lista por artista."
-
-#~ msgid "Sorts the list by filename."
-#~ msgstr "Organizar lista por nome do arquivo."
-
-#~ msgid "Sorts the list by full pathname."
-#~ msgstr "Organizar lista por localização do arquivo"
-
-#~ msgid "By Date"
-#~ msgstr "Por Data"
-
-#~ msgid "Sorts the list by modification time."
-#~ msgstr "Organizar lista por hora de modificação."
-
-#~ msgid "By Track Number"
-#~ msgstr "Por Número do Arquivo"
-
-#~ msgid "Sorts the list by track number."
-#~ msgstr "Organizar lista por número do arquivo."
-
-#~ msgid "By Playlist Entry"
-#~ msgstr "Por entrada na Lista de Reprodução"
-
-#~ msgid "Sorts the list by playlist entry."
-#~ msgstr "Organizar lista por entrada na lista de reprodução."
-
-#~ msgid "Sort Selected"
-#~ msgstr "Organizar Seleção"
-
-#~ msgid "File"
-#~ msgstr "Arquivo"
-
-#~ msgid "Help"
-#~ msgstr "Ajuda"
-
-#, fuzzy
-#~ msgid "Components"
-#~ msgstr "Comentário"
-
-#~ msgid "View Track Details"
-#~ msgstr "Visualizar Detalhes do Arquivo"
-
-#~ msgid "Play File"
-#~ msgstr "Reproduzir Arquivo"
-
-#~ msgid "Load and play a file"
-#~ msgstr "Abrir e reproduzir arquivo"
-
-#~ msgid "Play Location"
-#~ msgstr "Reproduzir URL"
-
-#~ msgid "Play media from the selected location"
-#~ msgstr "Reproduzir mídia de uma localização selecionada"
-
-#~ msgid "Plugin services"
-#~ msgstr "Serviços de plugin"
-
-#~ msgid "Preferences"
-#~ msgstr "Preferências"
-
-#~ msgid "Open preferences window"
-#~ msgstr "Abrir janela de preferências"
-
-#~ msgid "_Quit"
-#~ msgstr "_Sair"
-
-#~ msgid "Quit Audacious"
-#~ msgstr "Sair do Audacious"
-
-#~ msgid "Set A-B"
-#~ msgstr "Selecionar tudo"
-
-#~ msgid "Clear A-B"
-#~ msgstr "Limpar tudo"
-
-#~ msgid "Jump to Playlist Start"
-#~ msgstr "Voltar ao Início da Lista de Reprodução"
-
-#~ msgid "Jump to File"
-#~ msgstr "Ir para o Arquivo"
-
-#~ msgid "Queue Toggle"
-#~ msgstr "Inserir/remover da fila"
-
-#~ msgid "Enables/disables the entry in the playlist's queue."
-#~ msgstr "Ativa/desativa arquivos na fila da lista de reprodução."
-
-#~ msgid "Load"
-#~ msgstr "Abrir"
-
-#~ msgid "Import"
-#~ msgstr "Importar"
-
-#~ msgid "Save"
-#~ msgstr "Salvar"
-
-#~ msgid "Delete"
-#~ msgstr "Apagar"
-
-#~ msgid "Preset"
-#~ msgstr "Pré-regulagem"
-
-#~ msgid "Load preset"
-#~ msgstr "Abrir pré-regulagem"
-
-#~ msgid "Auto-load preset"
-#~ msgstr "Pré-regulagem automática"
-
-#~ msgid "Load auto-load preset"
-#~ msgstr "Abrir pré-regulagem automática"
-
-#~ msgid "Default"
-#~ msgstr "Padrão"
-
-#~ msgid "Load default preset into equalizer"
-#~ msgstr "Abrir pré-regulagem padrão no Equalizador"
-
-#~ msgid "Zero"
-#~ msgstr "Zero"
-
-#~ msgid "Set equalizer preset levels to zero"
-#~ msgstr "Mudar equalizador para pré-regulagem zero"
-
-#~ msgid "From file"
-#~ msgstr "Do arquivo"
-
-#~ msgid "Load preset from file"
-#~ msgstr "Abrir pré-regulagem do arquivo"
-
-#~ msgid "From WinAMP EQF file"
-#~ msgstr "De um arquivo EQF do WinAMP"
-
-#~ msgid "Load preset from WinAMP EQF file"
-#~ msgstr "Abrir pré-regulagem de um arquivo EQF do WinAMP"
-
-#~ msgid "WinAMP Presets"
-#~ msgstr "Pré-regulagem do WinAMP"
-
-#~ msgid "Import WinAMP presets"
-#~ msgstr "Importar pré-regulagem do WinAMP"
-
-#~ msgid "Save preset"
-#~ msgstr "Salvar preset"
-
-#~ msgid "Save auto-load preset"
-#~ msgstr "Salvar pré-regulagem automática"
-
-#~ msgid "Save default preset"
-#~ msgstr "Salvar pré-regulagem padrão"
-
-#~ msgid "To file"
-#~ msgstr "Para o arquivo"
-
-#~ msgid "Save preset to file"
-#~ msgstr "Salvar pré-regulagem para o arquivo"
-
-#~ msgid "To WinAMP EQF file"
-#~ msgstr "Para EQF do WinAMP"
-
-#~ msgid "Save preset to WinAMP EQF file"
-#~ msgstr "Salvar pré-regulagem para EQF do WinAMP"
-
-#~ msgid "Delete preset"
-#~ msgstr "Apagar preset"
-
-#~ msgid "Delete auto-load preset"
-#~ msgstr "Apagar pré-regulagem automática"
-
-#~ msgid ""
-#~ "This is the amount of time to prebuffer audio "
-#~ "streams by, in milliseconds.\n"
-#~ "Increase this value if you are experiencing audio skipping.\n"
-#~ "Please note however, that high values will result in Audacious performing "
-#~ "poorly."
-#~ msgstr ""
-#~ "Esta é a quantidade de tempo de armazenamento de "
-#~ "áudio, em milisegundos.\n"
-#~ "Valores muito altos podem resultar em uma baixa performace do Audacious.</"
-#~ "span>"
-
-#~ msgid "Enable headless operation"
-#~ msgstr "Ativar operação de interatividade \"Modo Texto\""
-
-#~ msgid ""
-#~ "<big>Unable to load skin.</big>\n"
-#~ "\n"
-#~ "Check that skin at '%s' is usable and default skin is properly installed "
-#~ "at '%s'\n"
-#~ msgstr ""
-#~ "<big>Não foi possível abrir a skin</big>\n"
-#~ "\n"
-#~ "Por favor, cheque se a skin «%s» é válida e se está instalada "
-#~ "corretamente em «%s»\n"
-
-#, fuzzy
-#~ msgid "Headless operation enabled\n"
-#~ msgstr "Ativar operação de interatividade \"Modo Texto\""
-
-#~ msgid "Audacious core developers:"
-#~ msgstr "Desenvolvedores do núcleo do Audacious:"
-
-#~ msgid "Audacious Equalizer"
-#~ msgstr "Equalizador do Audacious"
-
-#~ msgid "Play files"
-#~ msgstr "Reproduzir arquivos"
-
-#~ msgid "Load files"
-#~ msgstr "Abrir arquivos"
-
-#~ msgid "%s - Audacious"
-#~ msgstr "%s - Audacious"
-
-#~ msgid "VBR"
-#~ msgstr "VBR"
-
-#~ msgid "mono"
-#~ msgstr "mono"
-
-#~ msgid "Audacious - visibility warning"
-#~ msgstr "Audacious - exibição de avisos"
-
-#~ msgid "Show main player window"
-#~ msgstr "Mostrar janela principal do reprodutor"
-
-#~ msgid "Ignore"
-#~ msgstr "Ignorar"
-
-#~ msgid ""
-#~ "Audacious has been started with all of its windows hidden.\n"
-#~ "You may want to show the player window again to control Audacious; "
-#~ "otherwise, you'll have to control it remotely via audtool or enabled "
-#~ "plugins (such as the statusicon plugin)."
-#~ msgstr ""
-#~ "Audacious está sendo iniciado com todas as janelas ocultas. Você deve "
-#~ "esperar a janela principal ser exibida para ter total controle sobre o "
-#~ "Audacious; entretando você pode controlá-lo remotamente ou sem a janela "
-#~ "principal ativando plugins com esta opção (como o plugin na barra de "
-#~ "status, por exemplo)."
-
-#~ msgid "Always ignore, show/hide is controlled remotely"
-#~ msgstr "Ignorar sempre, mostrar/esconder é controlado remotamente"
-
-#~ msgid ""
-#~ "<big>Broken GTK engine in use</big>\n"
-#~ "\n"
-#~ "Audacious has detected that you are using a broken GTK engine.\n"
-#~ "\n"
-#~ "The theme engine you are using, %s, is incompatible with some of "
-#~ "the features used by modern skins. The incompatible features have been "
-#~ "disabled for this session.\n"
-#~ "\n"
-#~ "To use these features, please consider using a different GTK theme engine."
-#~ msgstr ""
-#~ "<big>Erro do sistema GTK em uso</big>\n"
-#~ "\n"
-#~ "Audacious detectou que você está usando um sistema GTK com problemas.\n"
-#~ "\n"
-#~ "O tema do sistema que você está usando, %s, não é compativel com "
-#~ "algumas funcionalidades usadas pelos skins modernos. A incompatibilidade "
-#~ "de funcionalidade está desabilitada para está sessão.\n"
-#~ "\n"
-#~ "Para usar essas funcionalidades, por favor considere usar um diferente "
-#~ "thema do sistema GTK."
-
-#~ msgid "Seek to: %d:%-2.2d/%d:%-2.2d (%d%%)"
-#~ msgstr "Buscar por: %d:%-2.2d/%d:%-2.2d (%d%%)"
-
-#~ msgid "Volume: %d%%"
-#~ msgstr "Volume: %d%%"
-
-#~ msgid "Balance: %d%% left"
-#~ msgstr "Balanço: %d%% esquerda"
-
-#~ msgid "Balance: center"
-#~ msgstr "Balanço: centro"
-
-#~ msgid "Balance: %d%% right"
-#~ msgstr "Balanço: %d%% direita"
-
-#~ msgid "Options Menu"
-#~ msgstr "Opções:"
-
-#~ msgid "Disable 'Always On Top'"
-#~ msgstr "Desativar \"Sempre no Topo\""
-
-#~ msgid "Enable 'Always On Top'"
-#~ msgstr "Ativar \"Sempre no Topo\""
-
-#~ msgid "File Info Box"
-#~ msgstr "Informações do Arquivo"
-
-#~ msgid "Disable 'GUI Scaling'"
-#~ msgstr "Desabilitar 'Escala GUI'"
-
-#~ msgid "Enable 'GUI Scaling'"
-#~ msgstr "Habilitar 'Escala GUI'"
-
-#~ msgid "Visualization Menu"
-#~ msgstr "Menu de Visualização"
-
-#~ msgid ""
-#~ "<big>Couldn't open audio.</big>\n"
-#~ "\n"
-#~ "Please check that:\n"
-#~ "1. You have the correct output plugin selected.\n"
-#~ "2. No other programs is blocking the soundcard.\n"
-#~ "3. Your soundcard is configured properly.\n"
-#~ msgstr ""
-#~ "<big>Erro ao abrir o áudio</big>\n"
-#~ "\n"
-#~ "Por favor, verifique se:\n"
-#~ "1. Plugin de saída está selecionado corretamente\n"
-#~ "2. Nenhum programa está bloqueando a placa de som\n"
-#~ "3. A placa de som está configurada corretamente\n"
-
-#~ msgid "Autoscroll Songname"
-#~ msgstr "Auto-rolar Nome do Arquivo"
-
-#~ msgid "Show Player"
-#~ msgstr "Mostrar Reprodutor"
-
-#~ msgid "Show Playlist Editor"
-#~ msgstr "Mostrar Lista de Reprodução"
-
-#~ msgid "Always on Top"
-#~ msgstr "Sempre no Topo"
-
-#~ msgid "Put on All Workspaces"
-#~ msgstr "Exibir em todas as Áreas de Trabalho"
-
-#~ msgid "Roll up Player"
-#~ msgstr "Encolher Reprodutor"
-
-#~ msgid "Roll up Playlist Editor"
-#~ msgstr "Encolher Editor de Lista de Reprodução"
-
-#~ msgid "Roll up Equalizer"
-#~ msgstr "Encolher Equalizador"
-
-#~ msgid "Scale"
-#~ msgstr "Escala"
-
-#~ msgid "DoubleSize"
-#~ msgstr "Tamanho Duplo"
-
-#~ msgid "Easy Move"
-#~ msgstr "Movimentação Fácil"
-
-#~ msgid "Analyzer"
-#~ msgstr "Analizador"
-
-#~ msgid "Scope"
-#~ msgstr "Osciloscópio"
-
-#~ msgid "Voiceprint"
-#~ msgstr "Impressão de Voz"
-
-#~ msgid "Off"
-#~ msgstr "Desligado"
-
-#~ msgid "Normal"
-#~ msgstr "Normal"
-
-#~ msgid "Fire"
-#~ msgstr "Fogo"
-
-#~ msgid "Vertical Lines"
-#~ msgstr "Linhas Verticais"
-
-#~ msgid "Lines"
-#~ msgstr "Linhas"
-
-#~ msgid "Bars"
-#~ msgstr "Barras"
-
-#~ msgid "Dot Scope"
-#~ msgstr "Osciloscópio Pontos"
-
-#~ msgid "Line Scope"
-#~ msgstr "Osciloscópio Linhas"
-
-#~ msgid "Solid Scope"
-#~ msgstr "Osciloscópio Sólido"
-
-#~ msgid "Ice"
-#~ msgstr "Gelo"
-
-#~ msgid "Smooth"
-#~ msgstr "Suave"
-
-#~ msgid "Full (~50 fps)"
-#~ msgstr "Completa (~50 fps)"
-
-#~ msgid "Half (~25 fps)"
-#~ msgstr "Média (~25 fps)"
-
-#~ msgid "Quarter (~13 fps)"
-#~ msgstr "Um quarto (~13 fps)"
-
-#~ msgid "Eighth (~6 fps)"
-#~ msgstr "Um oitavo (~6 fps)"
-
-#~ msgid "Slowest"
-#~ msgstr "Muito lento"
-
-#~ msgid "Slow"
-#~ msgstr "Lento"
-
-#~ msgid "Medium"
-#~ msgstr "Médio"
-
-#~ msgid "Fast"
-#~ msgstr "Rápido"
-
-#~ msgid "Fastest"
-#~ msgstr "Muito rápido"
-
-#~ msgid "Time Elapsed"
-#~ msgstr "Tempo Decorrido"
-
-#~ msgid "Time Remaining"
-#~ msgstr "Tempo Restante"
-
-#~ msgid "Plugin Services"
-#~ msgstr "Plugins de Serviços"
-
-#~ msgid "Search entries in active playlist"
-#~ msgstr "Buscar arquivos na lista de reprodução ativa"
-
-#~ 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 ""
-#~ "Insira nos campos abaixo informações ou qualquer palavra relacionada ao "
-#~ "arquivo que deseja buscar. "
-
-#~ msgid "Title: "
-#~ msgstr "Título:"
-
-#~ msgid "Artist: "
-#~ msgstr "Artista:"
-
-#~ msgid "Filename: "
-#~ msgstr "Nome do arquivo:"
-
-#~ msgid "Clear previous selection before searching"
-#~ msgstr "Limpar seleção anterior antes de buscar"
-
-#~ msgid "Automatically toggle queue for matching entries"
-#~ msgstr "Inserir novos arquivos automaticamente na fila"
-
-#~ msgid "Audacious Playlist Editor"
-#~ msgstr "Editor Listas de Reprodução do Audacious"
-
-#~ msgid "Appearance"
-#~ msgstr "Aparência"
-
-#~ msgid "_Fonts"
-#~ msgstr "_Fontes"
-
-#~ msgid "_Player:"
-#~ msgstr "Re_produtor:"
-
-#~ msgid "Select main player window font:"
-#~ msgstr "Selecione a fonte da janela principal:"
-
-#~ msgid "_Playlist:"
-#~ msgstr "Lista de Re_produção:"
-
-#~ msgid "Select playlist font:"
-#~ msgstr "Selecione a fonte da lista de reprodução:"
-
-#~ msgid "Use Bitmap fonts if available"
-#~ msgstr "Utilizar fontes Bitmap se estiverem disponíveis"
-
-#~ msgid ""
-#~ "Use bitmap fonts if they are available. Bitmap fonts do not support "
-#~ "Unicode strings."
-#~ msgstr ""
-#~ "Utilizar fontes Bitmap se estiverem disponíveis. As fontes Bitmap não "
-#~ "suportam códigos Unicode."
-
-#~ msgid "_Miscellaneous"
-#~ msgstr "Vários"
-
-#~ msgid "Show track numbers in playlist"
-#~ msgstr "Mostrar números dos arquivos na lista de reprodução"
-
-#~ msgid "Show separators in playlist"
-#~ msgstr "Mostrar separadores na lista de reprodução"
-
-#~ msgid "Show window manager decoration"
-#~ msgstr "Mostrar decoração de janelas do gerenciador de janelas"
-
-#~ msgid "This enables the window manager to show decorations for windows."
-#~ msgstr "Ativa a exibição de decoração de janelas do gerenciador de janelas."
-
-#~ msgid "Use XMMS-style file selector instead of the default selector"
-#~ msgstr "Utilizar estilo XMMS na janela de abertura de arquivos"
-
-#~ msgid ""
-#~ "This enables the XMMS/GTK1-style file selection dialogs. This selector is "
-#~ "provided by Audacious itself and is faster than the default GTK2 selector "
-#~ "(but sadly not as user-friendly)."
-#~ msgstr ""
-#~ "Ativa o estilo XMMS/GTK1 nas caixas de diálogos dos arquivos. As caixas "
-#~ "de diálogos do estilo XMMS/GTK1 são mais rápidas que as padrão GTK2 (mas "
-#~ "esteticamente mais feias e difíceis para o usuário comum)."
-
-#~ msgid "Use two-way text scroller"
-#~ msgstr "Usar rolador de texto de dois sentidos"
-
-#~ msgid ""
-#~ "If selected, the file information text in the main window will scroll "
-#~ "back and forth. If not selected, the text will only scroll in one "
-#~ "direction."
-#~ msgstr ""
-#~ "Se selecionado, a informação do arquivo na janela principal irá rolar "
-#~ "para frente e para trás. Se não for selecionado, o texto irá rolar "
-#~ "somente em uma direção"
-
-#~ msgid "Disable inline gtk theme"
-#~ msgstr "Desabilitar tema gtk na linha"
-
-#~ msgid "On load"
-#~ msgstr "Ao abrir"
-
-#~ msgid "Load metadata when adding the file to the playlist or opening it"
-#~ msgstr ""
-#~ "Carregar TAGs ao adicionar arquivo à lista de reprodução ou reproduzi-lo"
-
-#~ msgid "On display"
-#~ msgstr "Ao exibir"
-
-#~ msgid ""
-#~ "Load metadata on demand when displaying the file in the playlist. You may "
-#~ "need to set \"Detect file formats on demand\" in Audio page for full "
-#~ "benefit."
-#~ msgstr ""
-#~ "Carregar dados em demanda quando aparecer arquivos na lista de "
-#~ "reprodução. Você pode ter que setar \"Detectar formatos dos arquivos ao "
-#~ "tentar reproduzir\" na seção de Áudio para total efeito."
-
-#~ msgid "Color Adjustment"
-#~ msgstr "Ajuste de Cor"
-
-#~ msgid ""
-#~ "Audacious allows you to alter the color balance of the skinned UI. The "
-#~ "sliders below will allow you to do this."
-#~ msgstr ""
-#~ "O Audacious oferece a opção de alterar o balanço de cores do skin. As "
-#~ "barras abaixo permitem você configurar esta opção."
-
-#~ msgid "Blue"
-#~ msgstr "Azul"
-
-#~ msgid "Green"
-#~ msgstr "Verde"
-
-#~ msgid "Red"
-#~ msgstr "Vermelho"
-
-#~ msgid "_Skin"
-#~ msgstr "_Skins"
-
-#~ msgid "Refresh skin list"
-#~ msgstr "Atualizar lista de skins"
-
-#~ msgid "PREAMP"
-#~ msgstr "PREAMP"
-
-#~ msgid "60HZ"
-#~ msgstr "60HZ"
-
-#~ msgid "170HZ"
-#~ msgstr "170HZ"
-
-#~ msgid "310HZ"
-#~ msgstr "310HZ"
-
-#~ msgid "600HZ"
-#~ msgstr "600HZ"
-
-#~ msgid "1KHZ"
-#~ msgstr "1KHZ"
-
-#~ msgid "3KHZ"
-#~ msgstr "3KHZ"
-
-#~ msgid "6KHZ"
-#~ msgstr "6KHZ"
-
-#~ msgid "12KHZ"
-#~ msgstr "12KHZ"
-
-#~ msgid "14KHZ"
-#~ msgstr "14KHZ"
-
-#~ msgid "16KHZ"
-#~ msgstr "16KHZ"
-
-#~ msgid "Archived Winamp 2.x skin"
-#~ msgstr "Skin do Winamp 2.x compactada"
-
-#~ msgid "Unarchived Winamp 2.x skin"
-#~ msgstr "Skin do Winamp 2.x descompactada"
-
-#~ msgid "Show version and builtin features"
-#~ msgstr "Exibir novidades e versão do Audacious"
-
-#~ msgid "Use custom cursors"
-#~ msgstr "Utilizar cursores personalizados"
-
-#~ msgid "Reload Plugins"
-#~ msgstr "Atualizar Plugins"
-
-#~ msgid ""
-#~ "Sorry, threads isn't supported on your platform.\n"
-#~ "\n"
-#~ "If you're on a libc5 based linux system and installed Glib & GTK+ before "
-#~ "you\n"
-#~ "installed LinuxThreads you need to recompile Glib & GTK+.\n"
-#~ msgstr ""
-#~ "Desculpe-nos, mas seu sistema não suporta módulos.\n"
-#~ "\n"
-#~ "Se você está em um sistema linux baseado em libc5 e instalou Glib & GTK+ "
-#~ "antes de instalar LinuxThreads, você deve recompilar o GLIB e o GTK+\n"
-
-#~ msgid "Error in Audacious."
-#~ msgstr "Erro no Audacious"
-
-#~ msgid "Enable 6 dB hard limiter"
-#~ msgstr "Habilitar 6 dB de limitação"

audacious-3.1.1.tar.bz2/po/pt_PT.po -> audacious-3.2.4.tar.bz2/po/pt_PT.po Changed

@@ -4,14 +4,15 @@
 #
 # Translators:
 # Luís Picciochi <Pitxyoki@gmail.com>, 2010.
+# Sérgio Marques <smarquespt@gmail.com>, 2012.
 # Valter Vicente <souobadaro@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious\n"
-"Report-Msgid-Bugs-To: http://jira.atheme.org/browse/AUD\n"
-"POT-Creation-Date: 2011-10-19 21:32-0400\n"
-"PO-Revision-Date: 2011-11-06 02:19+0000\n"
-"Last-Translator: valtervicente <souobadaro@gmail.com>\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2012-01-11 08:54-0500\n"
+"PO-Revision-Date: 2012-04-26 11:56+0000\n"
+"Last-Translator: Sérgio Marques <smarquespt@gmail.com>\n"
 "Language-Team: Portuguese\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,1065 +20,1075 @@
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/audacious/adder.c:71
+#: src/audacious/adder.c:77
 msgid "Searching ..."
-msgstr "À procura..."
+msgstr "A procurar..."
 
-#: src/audacious/adder.c:97
+#: src/audacious/adder.c:113
 #, c-format
 msgid "%d file found"
 msgid_plural "%d files found"
-msgstr[0] "um: %d ficheiro encontrado"
-msgstr[1] "outro: %d ficheiros encontrados"
+msgstr[0] "%d ficheiro encontrado"
+msgstr[1] "%d ficheiros encontrados"
 
-#: src/audacious/chardet.c:38
+#: src/audacious/chardet.c:39
 msgid " (invalid UTF-8)"
 msgstr " (UTF-8 inválido)"
 
-#: src/audacious/credits.c:35
+#: src/audacious/credits.c:37
 msgid "Core developers:"
 msgstr "Principais programadores:"
 
-#: src/audacious/credits.c:49
+#: src/audacious/credits.c:51
 msgid "Graphics:"
 msgstr "Imagens:"
 
-#: src/audacious/credits.c:54
+#: src/audacious/credits.c:56
 msgid "Default skin:"
 msgstr "Tema pré-definido:"
 
-#: src/audacious/credits.c:60
+#: src/audacious/credits.c:62
 msgid "Plugin development:"
-msgstr "Desenvolvimento de Plugins:"
+msgstr "Desenvolvimento de suplementos:"
 
-#: src/audacious/credits.c:83
+#: src/audacious/credits.c:85
 msgid "Patch authors:"
-msgstr "Autores de patches:"
+msgstr "Autores de correções:"
 
-#: src/audacious/credits.c:126
+#: src/audacious/credits.c:131
 msgid "1.x developers:"
 msgstr "Programadores da versão 1.x:"
 
-#: src/audacious/credits.c:148
+#: src/audacious/credits.c:153
 msgid "BMP Developers:"
 msgstr "Programadores do BMP:"
 
-#: src/audacious/credits.c:180
+#: src/audacious/credits.c:185
 msgid "Belarusian:"
-msgstr "Bielorrusso"
+msgstr "Bielorrusso:"
 
-#: src/audacious/credits.c:183
+#: src/audacious/credits.c:188
 msgid "Basque:"
 msgstr "Basco:"
 
-#: src/audacious/credits.c:186
+#: src/audacious/credits.c:191
 msgid "Brazilian Portuguese:"
 msgstr "Português do Brasil:"
 
-#: src/audacious/credits.c:191
+#: src/audacious/credits.c:196
 msgid "Breton:"
 msgstr "Bretão:"
 
-#: src/audacious/credits.c:194
+#: src/audacious/credits.c:199
 msgid "Bulgarian:"
 msgstr "Búlgaro:"
 
-#: src/audacious/credits.c:197
+#: src/audacious/credits.c:202
 msgid "Catalan:"
 msgstr "Catalão:"
 
-#: src/audacious/credits.c:200
+#: src/audacious/credits.c:206
 msgid "Chinese:"
-msgstr "Chinês"
+msgstr "Mandarim:"
 
-#: src/audacious/credits.c:203
+#: src/audacious/credits.c:209
 msgid "Croatian:"
 msgstr "Croata:"
 
-#: src/audacious/credits.c:206
+#: src/audacious/credits.c:212
 msgid "Czech:"
 msgstr "Checo:"
 
-#: src/audacious/credits.c:209
+#: src/audacious/credits.c:215
 msgid "Dutch:"
 msgstr "Holandês:"
 
-#: src/audacious/credits.c:213
+#: src/audacious/credits.c:219
 msgid "Estonian:"
 msgstr "Estónio:"
 
-#: src/audacious/credits.c:216
+#: src/audacious/credits.c:222
 msgid "Finnish:"
 msgstr "Finlandês:"
 
-#: src/audacious/credits.c:221
+#: src/audacious/credits.c:227
 msgid "French:"
 msgstr "Francês:"
 
-#: src/audacious/credits.c:227
+#: src/audacious/credits.c:233
 msgid "German:"
 msgstr "Alemão:"
 
-#: src/audacious/credits.c:234
+#: src/audacious/credits.c:240
 msgid "Georgian:"
 msgstr "Georgiano:"
 
-#: src/audacious/credits.c:237
+#: src/audacious/credits.c:243
 msgid "Greek:"
 msgstr "Grego:"
 
-#: src/audacious/credits.c:242
+#: src/audacious/credits.c:248
 msgid "Hindi:"
 msgstr "Hindi:"
 
-#: src/audacious/credits.c:245
+#: src/audacious/credits.c:251
 msgid "Hungarian:"
 msgstr "Húngaro:"
 
-#: src/audacious/credits.c:249
+#: src/audacious/credits.c:255
 msgid "Italian:"
 msgstr "Italiano:"
 
-#: src/audacious/credits.c:253
+#: src/audacious/credits.c:260
 msgid "Japanese:"
 msgstr "Japonês:"
 
-#: src/audacious/credits.c:256
+#: src/audacious/credits.c:263
 msgid "Korean:"
 msgstr "Coreano:"
 
-#: src/audacious/credits.c:259
+#: src/audacious/credits.c:266
 msgid "Latvian:"
-msgstr "Letão"
+msgstr "Letão:"
 
-#: src/audacious/credits.c:262
+#: src/audacious/credits.c:269
 msgid "Lithuanian:"
 msgstr "Lituano:"
 
-#: src/audacious/credits.c:267
+#: src/audacious/credits.c:274
 msgid "Macedonian:"
 msgstr "Macedónio:"
 
-#: src/audacious/credits.c:270
+#: src/audacious/credits.c:277
+msgid "Mexican Spanish:"
+msgstr "Espanhol do México:"
+
+#: src/audacious/credits.c:280
 msgid "Polish:"
 msgstr "Polaco:"
 
-#: src/audacious/credits.c:276
+#: src/audacious/credits.c:287
 msgid "Portuguese:"
-msgstr "Português"
+msgstr "Português:"
 
-#: src/audacious/credits.c:279
+#: src/audacious/credits.c:290
 msgid "Romanian:"
 msgstr "Romeno:"
 
-#: src/audacious/credits.c:283
+#: src/audacious/credits.c:294
 msgid "Russian:"
 msgstr "Russo:"
 
-#: src/audacious/credits.c:287
+#: src/audacious/credits.c:298
 msgid "Serbian (Latin):"
-msgstr "Sérvio (Latino):"
+msgstr "Sérvio (Latim):"
 
-#: src/audacious/credits.c:290
+#: src/audacious/credits.c:301
 msgid "Serbian (Cyrillic):"
 msgstr "Sérvio (Cirílico):"
 
-#: src/audacious/credits.c:293
+#: src/audacious/credits.c:305
 msgid "Simplified Chinese:"
-msgstr "Chinês Simplificado:"
+msgstr "Mandarim simplificado:"
 
-#: src/audacious/credits.c:296
+#: src/audacious/credits.c:308
 msgid "Slovak:"
 msgstr "Eslovaco:"
 
-#: src/audacious/credits.c:299
+#: src/audacious/credits.c:312
 msgid "Spanish:"
 msgstr "Espanhol:"
 
-#: src/audacious/credits.c:306
+#: src/audacious/credits.c:320
 msgid "Swedish:"
 msgstr "Sueco:"
 
-#: src/audacious/credits.c:309
+#: src/audacious/credits.c:323
 msgid "Traditional Chinese:"
-msgstr "Chinês Tradicional:"
+msgstr "Mandarim tradicional:"
 
-#: src/audacious/credits.c:315
+#: src/audacious/credits.c:329
 msgid "Turkish:"
 msgstr "Turco:"
 
-#: src/audacious/credits.c:319
+#: src/audacious/credits.c:333
 msgid "Ukrainian:"
 msgstr "Ucraniano:"
 
-#: src/audacious/credits.c:323
+#: src/audacious/credits.c:338
 msgid "Vietnamese:"
-msgstr "Vietnamita"
+msgstr "Vietnamita:"
 
-#: src/audacious/credits.c:326
+#: src/audacious/credits.c:341
 msgid "Welsh:"
 msgstr "Galês:"
 
-#: src/audacious/drct.c:234
-msgid "Temporary Playlist"
-msgstr "Lista de reprodução temporária"
-
-#: src/audacious/equalizer_preset.c:186
+#: src/audacious/equalizer_preset.c:180
 #, c-format
 msgid "Error importing Winamp EQF file '%s'"
-msgstr "Erro ao importar ficheiro EQF do Winamp '%s'"
+msgstr "Erro ao importar o EQF \"%s\" do Winamp"
 
-#: src/audacious/main.c:239
+#: src/audacious/main.c:243
 msgid "Skip backwards in playlist"
-msgstr "Saltar para trás na lista de reprodução"
+msgstr "Recuar na lista de reprodução"
 
-#: src/audacious/main.c:240
+#: src/audacious/main.c:244
 msgid "Start playing current playlist"
-msgstr "Começar a reproduzir a lista de reprodução actual"
+msgstr "Reproduzir lista de reprodução atual"
 
-#: src/audacious/main.c:241
+#: src/audacious/main.c:245
 msgid "Pause current song"
-msgstr "Colocar faixa actual em pausa"
+msgstr "Pausar faixa atual"
 
-#: src/audacious/main.c:242
+#: src/audacious/main.c:246
 msgid "Stop current song"
-msgstr "Parar faixa actual"
+msgstr "Parar faixa atual"
 
-#: src/audacious/main.c:243
+#: src/audacious/main.c:247
 msgid "Pause if playing, play otherwise"
-msgstr "Colocar em pausa se estiver a reproduzir. Caso contrário, reproduzir"
+msgstr "Pausar se em reprodução. Caso contrário, reproduzir"
 
-#: src/audacious/main.c:244
+#: src/audacious/main.c:248
 msgid "Skip forward in playlist"
-msgstr "Passar à frente na lista de reprodução"
+msgstr "Avançar na lista de reprodução"
 
-#: src/audacious/main.c:245
+#: src/audacious/main.c:249
 msgid "Display Jump to File dialog"
-msgstr "Mostrar diálogo 'Ir Para Faixa'"
+msgstr "Mostrar \"Ir para o ficheiro\""
 
-#: src/audacious/main.c:246
+#: src/audacious/main.c:250
 msgid "Add files to the playlist"
 msgstr "Adicionar ficheiros à lista de reprodução"
 
-#: src/audacious/main.c:247
+#: src/audacious/main.c:251
 msgid "Add new files to a temporary playlist"
 msgstr "Adicionar novos ficheiros a uma lista de reprodução temporária"
 
-#: src/audacious/main.c:248
+#: src/audacious/main.c:252
 msgid "Display the main window"
 msgstr "Mostrar a janela principal"
 
-#: src/audacious/main.c:249
+#: src/audacious/main.c:253
 msgid "Show version"
 msgstr "Mostrar versão"
 
-#: src/audacious/main.c:250
+#: src/audacious/main.c:254
 msgid "Print debugging messages"
 msgstr "Imprimir mensagens de depuração"
 
-#: src/audacious/main.c:251
+#: src/audacious/main.c:255
 msgid "Headless mode (beta)"
-msgstr "Modo headless (beta)"
+msgstr "Modo \"headless\" (beta)"
 
-#: src/audacious/main.c:252
+#: src/audacious/main.c:256
 msgid "FILE..."
-msgstr "FICHEIRO..."
+msgstr "Ficheiro..."
 
-#: src/audacious/main.c:264
+#: src/audacious/main.c:268
 msgid "- play multimedia files"
 msgstr "- reproduzir ficheiros multimédia"
 
-#: src/audacious/main.c:274
+#: src/audacious/main.c:278
 #, c-format
 msgid ""
 "%s: %s\n"
 "Try `%s --help' for more information.\n"
-msgstr ""
-"%s: %s\n"
-"Tente `%s --help' para mais informações.\n"
+msgstr "%s: %s\nUtilize \"%s --help\" para mais informações\n"
 
-#: src/audacious/main.c:547
+#: src/audacious/main.c:573
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/audacious/playback.c:303
+#: src/audacious/playback.c:307
 #, c-format
 msgid "No decoder found for %s."
-msgstr "Descodificador não encontrado para %s."
+msgstr "Não foi encontrado o descodificador para %s"
+
+#: src/audacious/playlist-files.c:53
+#, c-format
+msgid "Cannot %s %s: unsupported file extension."
+msgstr "Não é possível %s %s: extensão não suportada"
+
+#: src/audacious/playlist-files.c:54
+msgid "save"
+msgstr "gravar"
 
-#: src/audacious/playlist-new.c:315
-msgid "Untitled Playlist"
-msgstr "Lista de Reprodução Sem Título"
+#: src/audacious/playlist-files.c:54
+msgid "load"
+msgstr "carregar"
 
-#: src/audacious/playlist-new.c:1496
+#: src/audacious/playlist-new.c:131
+msgid "New Playlist"
+msgstr "Nova lista de reprodução"
+
+#: src/audacious/playlist-new.c:132
+msgid "Now Playing"
+msgstr "A reproduzir"
+
+#: src/audacious/playlist-new.c:1630
 msgid ""
 "The playlist cannot be sorted because metadata scanning is still in progress"
 " (or has been disabled)."
-msgstr ""
-"A lista de reprodução não pode ser ordenada porque a análise de metadados "
-"ainda está a decorrer (ou está desabilitada)."
+msgstr "A lista de reprodução não pode ser ordenada porque a análise de detalhes ainda está a decorrer (ou inativa)"
 
-#: src/audacious/ui_preferences.c:88
+#: src/audacious/ui_preferences.c:85
 msgid "Audio"
 msgstr "Áudio"
 
-#: src/audacious/ui_preferences.c:89
+#: src/audacious/ui_preferences.c:86
 msgid "Network"
 msgstr "Rede"
 
-#: src/audacious/ui_preferences.c:90 src/audacious/ui_preferences.c:1634
+#: src/audacious/ui_preferences.c:87 src/audacious/ui_preferences.c:1603
 msgid "Playlist"
-msgstr "Lista de Reprodução"
+msgstr "Lista de reprodução"
 
-#: src/audacious/ui_preferences.c:91
+#: src/audacious/ui_preferences.c:88
 msgid "Plugins"
-msgstr "Plugins"
+msgstr "Suplementos"
 
-#: src/audacious/ui_preferences.c:97 src/libaudgui/infopopup.c:203
+#: src/audacious/ui_preferences.c:94 src/libaudgui/infopopup.c:199
 msgid "Artist"
 msgstr "Artista"
 
-#: src/audacious/ui_preferences.c:98 src/libaudgui/infopopup.c:205
+#: src/audacious/ui_preferences.c:95 src/libaudgui/infopopup.c:201
 msgid "Album"
 msgstr "Álbum"
 
-#: src/audacious/ui_preferences.c:99 src/libaudgui/infopopup.c:201
-#: src/libaudgui/ui_playlist_manager.c:276
+#: src/audacious/ui_preferences.c:96 src/libaudgui/infopopup.c:197
+#: src/libaudgui/ui_playlist_manager.c:279
 msgid "Title"
 msgstr "Título"
 
-#: src/audacious/ui_preferences.c:100
+#: src/audacious/ui_preferences.c:97
 msgid "Tracknumber"
-msgstr "Número da Faixa"
+msgstr "Número da faixa"
 
-#: src/audacious/ui_preferences.c:101 src/libaudgui/infopopup.c:207
+#: src/audacious/ui_preferences.c:98 src/libaudgui/infopopup.c:203
 msgid "Genre"
 msgstr "Género"
 
-#: src/audacious/ui_preferences.c:102
+#: src/audacious/ui_preferences.c:99
 msgid "Filename"
-msgstr "Nome do Ficheiro"
+msgstr "Nome do ficheiro"
 
-#: src/audacious/ui_preferences.c:103
+#: src/audacious/ui_preferences.c:100
 msgid "Filepath"
-msgstr "Caminho para o Ficheiro"
+msgstr "Caminho do ficheiro"
 
-#: src/audacious/ui_preferences.c:104
+#: src/audacious/ui_preferences.c:101
 msgid "Date"
 msgstr "Data"
 
-#: src/audacious/ui_preferences.c:105 src/libaudgui/infopopup.c:209
+#: src/audacious/ui_preferences.c:102 src/libaudgui/infopopup.c:205
 msgid "Year"
 msgstr "Ano"
 
-#: src/audacious/ui_preferences.c:106
+#: src/audacious/ui_preferences.c:103
 msgid "Comment"
 msgstr "Comentário"
 
-#: src/audacious/ui_preferences.c:107
+#: src/audacious/ui_preferences.c:104
 msgid "Codec"
-msgstr "Codec"
+msgstr "Codificador"
 
-#: src/audacious/ui_preferences.c:108
+#: src/audacious/ui_preferences.c:105
 msgid "Quality"
 msgstr "Qualidade"
 
-#: src/audacious/ui_preferences.c:114
+#: src/audacious/ui_preferences.c:111
 msgid "None"
 msgstr "Nenhum"
 
-#: src/audacious/ui_preferences.c:115
+#: src/audacious/ui_preferences.c:112
 msgid "Arabic"
 msgstr "Árabe"
 
-#: src/audacious/ui_preferences.c:116
+#: src/audacious/ui_preferences.c:113
 msgid "Baltic"
 msgstr "Báltico"
 
-#: src/audacious/ui_preferences.c:117
+#: src/audacious/ui_preferences.c:114
 msgid "Chinese"
-msgstr "Chinês"
+msgstr "Mandarim"
 
-#: src/audacious/ui_preferences.c:118
+#: src/audacious/ui_preferences.c:115
 msgid "Greek"
 msgstr "Grego"
 
-#: src/audacious/ui_preferences.c:119
+#: src/audacious/ui_preferences.c:116
 msgid "Hebrew"
-msgstr "Hebreu"
+msgstr "Hebraico"
 
-#: src/audacious/ui_preferences.c:120
+#: src/audacious/ui_preferences.c:117
 msgid "Japanese"
 msgstr "Japonês"
 
-#: src/audacious/ui_preferences.c:121
+#: src/audacious/ui_preferences.c:118
 msgid "Korean"
 msgstr "Coreano"
 
-#: src/audacious/ui_preferences.c:122
+#: src/audacious/ui_preferences.c:119
 msgid "Polish"
 msgstr "Polaco"
 
-#: src/audacious/ui_preferences.c:123
+#: src/audacious/ui_preferences.c:120
 msgid "Russian"
 msgstr "Russo"
 
-#: src/audacious/ui_preferences.c:124
+#: src/audacious/ui_preferences.c:121
 msgid "Taiwanese"
 msgstr "Taiwanês"
 
-#: src/audacious/ui_preferences.c:125
+#: src/audacious/ui_preferences.c:122
 msgid "Turkish"
 msgstr "Turco"
 
-#: src/audacious/ui_preferences.c:147
+#: src/audacious/ui_preferences.c:144
 msgid "Album mode"
 msgstr "Modo de álbum"
 
-#: src/audacious/ui_preferences.c:150
+#: src/audacious/ui_preferences.c:147
 msgid "Output Settings"
-msgstr "Definições de Saída"
+msgstr "Definições de saída"
 
-#: src/audacious/ui_preferences.c:152
+#: src/audacious/ui_preferences.c:149
 msgid "Bit depth:"
-msgstr "Profundidade de bit:"
+msgstr "Profundidade:"
 
-#: src/audacious/ui_preferences.c:155
+#: src/audacious/ui_preferences.c:152
 msgid "Buffer size:"
-msgstr "Tamanho do buffer:"
+msgstr "\"Buffer\":"
 
-#: src/audacious/ui_preferences.c:157
+#: src/audacious/ui_preferences.c:154
 msgid "ms"
 msgstr "ms"
 
-#: src/audacious/ui_preferences.c:158
+#: src/audacious/ui_preferences.c:155
 msgid "Use software volume control (not recommended)"
-msgstr "Usar software de controlo de volume (não recomendado)"
+msgstr "Utilizar controlo de volume do programa (não recomendado)"
 
-#: src/audacious/ui_preferences.c:160
+#: src/audacious/ui_preferences.c:157
 msgid "Replay Gain"
-msgstr "Ganho de Reprodução"
+msgstr "Replay Gain"
 
-#: src/audacious/ui_preferences.c:161
+#: src/audacious/ui_preferences.c:158
 msgid "Enable Replay Gain"
-msgstr "Activar Replay Gain"
+msgstr "Ativar Replay Gain"
 
-#: src/audacious/ui_preferences.c:164
+#: src/audacious/ui_preferences.c:161
 msgid "Prevent clipping (recommended)"
-msgstr "Prevenir recortar (recomendado)"
+msgstr "Prevenir distorção (recomendado)"
 
-#: src/audacious/ui_preferences.c:166
+#: src/audacious/ui_preferences.c:163
 msgid "Adjust Levels"
 msgstr "Ajustar níveis"
 
-#: src/audacious/ui_preferences.c:167
+#: src/audacious/ui_preferences.c:164
 msgid "Amplify all files:"
 msgstr "Amplificar todos os ficheiros:"
 
-#: src/audacious/ui_preferences.c:169 src/audacious/ui_preferences.c:172
+#: src/audacious/ui_preferences.c:166 src/audacious/ui_preferences.c:169
 msgid "dB"
 msgstr "dB"
 
-#: src/audacious/ui_preferences.c:170
+#: src/audacious/ui_preferences.c:167
 msgid "Amplify untagged files:"
-msgstr "Amplificar ficheiros sem etiquetas:"
+msgstr "Amplificar ficheiros sem \"tags\":"
 
-#: src/audacious/ui_preferences.c:175
+#: src/audacious/ui_preferences.c:172
 msgid "Proxy hostname:"
-msgstr "Nome de máquina do proxy:"
+msgstr "Nome do proxy:"
 
-#: src/audacious/ui_preferences.c:176
+#: src/audacious/ui_preferences.c:173
 msgid "Proxy port:"
-msgstr "Porto do Proxy:"
+msgstr "Porta do proxy:"
 
-#: src/audacious/ui_preferences.c:179
+#: src/audacious/ui_preferences.c:176
 msgid "Proxy username:"
 msgstr "Nome de utilizador do proxy:"
 
-#: src/audacious/ui_preferences.c:180
+#: src/audacious/ui_preferences.c:177
 msgid "Proxy password:"
-msgstr "Palavra-passe do proxy:"
+msgstr "Senha do proxy:"
 
-#: src/audacious/ui_preferences.c:184
+#: src/audacious/ui_preferences.c:181
 msgid "Proxy Configuration"
-msgstr "Configuração de Proxy"
+msgstr "Configuração do proxy"
 
-#: src/audacious/ui_preferences.c:185
+#: src/audacious/ui_preferences.c:182
 msgid "Enable proxy usage"
-msgstr "Activar utilização de proxy"
+msgstr "Ativar utilização do proxy"
 
-#: src/audacious/ui_preferences.c:188
+#: src/audacious/ui_preferences.c:185
 msgid "Use authentication with proxy"
-msgstr "Utilizar autenticação no proxy"
+msgstr "Utilizar autenticação do proxy"
 
-#: src/audacious/ui_preferences.c:196
+#: src/audacious/ui_preferences.c:193
 msgid "Auto character encoding detector for:"
-msgstr "Detectar codificação de caracteres automaticamente para:"
+msgstr "Deteção automática da codificação de caracteres para:"
 
-#: src/audacious/ui_preferences.c:201
+#: src/audacious/ui_preferences.c:198
 msgid "Fallback character encodings:"
-msgstr "Recurso para codificações de caracteres:"
+msgstr "Recurso para codificação de caracteres:"
 
-#: src/audacious/ui_preferences.c:205
+#: src/audacious/ui_preferences.c:202
 msgid "Behavior"
 msgstr "Comportamento"
 
-#: src/audacious/ui_preferences.c:206
+#: src/audacious/ui_preferences.c:203
 msgid "Continue playback on startup"
-msgstr "Continuar a reprodução no arranque"
+msgstr "Retomar reprodução ao iniciar"
 
-#: src/audacious/ui_preferences.c:208
+#: src/audacious/ui_preferences.c:205
 msgid "Advance when the current song is deleted"
-msgstr "Avançar quando a música actual é removida"
+msgstr "Avançar ao eliminar a faixa atual"
 
-#: src/audacious/ui_preferences.c:210
+#: src/audacious/ui_preferences.c:207
 msgid "Clear the playlist when opening files"
-msgstr "Apagar a lista de reprodução quando abrir ficheiros"
+msgstr "Apagar lista de reprodução ao abrir ficheiros"
 
-#: src/audacious/ui_preferences.c:212
+#: src/audacious/ui_preferences.c:209
 msgid "Open files in a temporary playlist"
 msgstr "Abrir ficheiros numa lista de reprodução temporária"
 
-#: src/audacious/ui_preferences.c:214
+#: src/audacious/ui_preferences.c:211
 msgid "Metadata"
-msgstr "Metadados"
+msgstr "Detalhes"
 
-#: src/audacious/ui_preferences.c:215
+#: src/audacious/ui_preferences.c:212
 msgid "Do not load metadata for songs until played"
-msgstr "Não carregar metadados da música até ser tocada"
+msgstr "Não carregar detalhes da faixa antes da reprodução"
 
-#: src/audacious/ui_preferences.c:233
+#: src/audacious/ui_preferences.c:230
 msgid "TITLE"
-msgstr "TÍTULO"
+msgstr "Título"
 
-#: src/audacious/ui_preferences.c:234
+#: src/audacious/ui_preferences.c:231
 msgid "ARTIST - TITLE"
-msgstr "ARTISTA - TÍTULO"
+msgstr "Artista - Título"
 
-#: src/audacious/ui_preferences.c:235
+#: src/audacious/ui_preferences.c:232
 msgid "ARTIST - ALBUM - TITLE"
-msgstr "ARTISTA - ÁLBUM - TÍTULO"
+msgstr "Artista - Álbum - Título"
 
-#: src/audacious/ui_preferences.c:236
+#: src/audacious/ui_preferences.c:233
 msgid "ARTIST - ALBUM - TRACK. TITLE"
-msgstr "ARTISTA - ÁLBUM - FAIXA - TÍTULO"
+msgstr "Artista - Álbum - Faixa. Título"
 
-#: src/audacious/ui_preferences.c:237
+#: src/audacious/ui_preferences.c:234
 msgid "ARTIST [ ALBUM ] - TRACK. TITLE"
-msgstr "ARTISTA [ ÁLBUM ] - FAIXA. TÍTULO"
+msgstr "Artista - [Álbum] - Faixa. Título"
 
-#: src/audacious/ui_preferences.c:238
+#: src/audacious/ui_preferences.c:235
 msgid "ALBUM - TITLE"
-msgstr "ÁLBUM - TÍTULO"
+msgstr "Álbum - Título"
 
-#: src/audacious/ui_preferences.c:577
+#: src/audacious/ui_preferences.c:556
 msgid "Category"
 msgstr "Categoria"
 
-#: src/audacious/ui_preferences.c:801
+#: src/audacious/ui_preferences.c:780
 msgid "Popup Information Settings"
-msgstr "Definições de Dicas de Informação"
+msgstr "Definições dos alertas"
 
-#: src/audacious/ui_preferences.c:810
+#: src/audacious/ui_preferences.c:789
 msgid "Cover image retrieve"
-msgstr "Obtenção de imagem da capa"
+msgstr "Obtenção da capa do álbum"
 
-#: src/audacious/ui_preferences.c:815
+#: src/audacious/ui_preferences.c:794
 msgid ""
 "While searching for the album's cover, Audacious looks for certain words in "
 "the filename. You can specify those words in the lists below, separated "
 "using commas."
-msgstr ""
-"Ao pesquisar pela capa do álbum, o Audacious pesquisa certas palavras nos "
-"nomes dos ficheiros. Pode especificar estas palavras na lista abaixo, "
-"separadas por vírgulas."
+msgstr "Ao procurar a capa do álbum, o Audacious analisa as palavras no nome do ficheiro. Pode especificar as palavras a procurar na lista abaixo, separadas por vírgulas"
 
-#: src/audacious/ui_preferences.c:832
+#: src/audacious/ui_preferences.c:811
 msgid "Exclude:"
 msgstr "Excluir:"
 
-#: src/audacious/ui_preferences.c:839
+#: src/audacious/ui_preferences.c:818
 msgid "Include:"
 msgstr "Incluir:"
 
-#: src/audacious/ui_preferences.c:856
+#: src/audacious/ui_preferences.c:835
 msgid "Recursively search for cover"
-msgstr "Pesquisar capa recursivamente"
+msgstr "Procurar capa recursivamente"
 
-#: src/audacious/ui_preferences.c:866
+#: src/audacious/ui_preferences.c:845
 msgid "Search depth: "
-msgstr "Profundidade da pesquisa: "
+msgstr "Profundidade da procura: "
 
-#: src/audacious/ui_preferences.c:880
+#: src/audacious/ui_preferences.c:859
 msgid "Use per-file cover"
-msgstr "Utilizar capa por ficheiro"
+msgstr "Utilizar capa de álbum por ficheiro"
 
-#: src/audacious/ui_preferences.c:883
+#: src/audacious/ui_preferences.c:862
 msgid "Miscellaneous"
-msgstr "Miscelânea"
+msgstr "Diversos"
 
-#: src/audacious/ui_preferences.c:892
+#: src/audacious/ui_preferences.c:871
 msgid "Show Progress bar for the current track"
-msgstr "Mostrar barra de progresso para a faixa actual"
+msgstr "Mostrar barra de progresso para a faixa atual"
 
-#: src/audacious/ui_preferences.c:902
+#: src/audacious/ui_preferences.c:881
 msgid "Delay until filepopup comes up: "
-msgstr "Atraso para o aparecimento da informação do ficheiro: "
+msgstr "Atraso para o alerta de informações do ficheiro: "
 
-#: src/audacious/ui_preferences.c:1340
+#: src/audacious/ui_preferences.c:1309
 msgid "Custom"
 msgstr "Personalizado"
 
-#: src/audacious/ui_preferences.c:1383
+#: src/audacious/ui_preferences.c:1352
 msgid "Song Display"
-msgstr "Apresentação de Faixas"
+msgstr "Exibição de faixas"
 
-#: src/audacious/ui_preferences.c:1392
+#: src/audacious/ui_preferences.c:1361
 msgid "Show song numbers"
-msgstr "Mostrar números das faixas"
+msgstr "Mostrar número das faixas"
 
-#: src/audacious/ui_preferences.c:1403
+#: src/audacious/ui_preferences.c:1372
 msgid "Show leading zeroes (02:00 instead of 2:00)"
 msgstr "Mostrar zeros (02:00 em vez de 2:00)"
 
-#: src/audacious/ui_preferences.c:1425
+#: src/audacious/ui_preferences.c:1394
 msgid "Show information about titlestring format"
-msgstr "Mostrar informação acerca do formato do título"
+msgstr "Mostrar informações sobre o formato do título"
 
-#: src/audacious/ui_preferences.c:1441
+#: src/audacious/ui_preferences.c:1410
 msgid "Custom string:"
-msgstr "String de Personalização:"
+msgstr "Linha personalizada:"
 
-#: src/audacious/ui_preferences.c:1448
+#: src/audacious/ui_preferences.c:1417
 msgid "Title format:"
 msgstr "Formato do título:"
 
-#: src/audacious/ui_preferences.c:1459
+#: src/audacious/ui_preferences.c:1428
 msgid "Popup Information"
-msgstr "Informação das Dicas"
+msgstr "Alertas"
 
-#: src/audacious/ui_preferences.c:1474
+#: src/audacious/ui_preferences.c:1443
 msgid "Show popup information for playlist entries"
-msgstr "Mostrar dicas com informação nas entradas da lista de reprodução"
+msgstr "Mostrar alerta com as informações da lista de reprodução"
 
-#: src/audacious/ui_preferences.c:1475
+#: src/audacious/ui_preferences.c:1444
 msgid ""
 "Toggles popup information window for the pointed entry in the playlist. The "
 "window shows title of song, name of album, genre, year of publish, track "
 "number, track length, and artwork."
-msgstr ""
-"Activa a janela de informação para entradas apontadas na lista de "
-"reprodução. A janela mostra o título da faixa, o nome do álbum, género, ano "
-"de publicação, número da faixa, tamanho da faixa e a capa."
+msgstr "Ativa a janela de informações para a faixa assinalada na lista de reprodução. A janela mostra o título, número e duração da faixa, o nome do álbum, o género, o ano de publicação e a capa do álbum"
 
-#: src/audacious/ui_preferences.c:1486
+#: src/audacious/ui_preferences.c:1455
 msgid "Edit settings for popup information"
-msgstr "Editar definições para dica de informação"
+msgstr "Editar definições para os alertas"
 
-#: src/audacious/ui_preferences.c:1575
+#: src/audacious/ui_preferences.c:1544
 msgid "Output plugin:"
-msgstr "Plugin de saída:"
+msgstr "Suplemento de saída:"
 
-#: src/audacious/ui_preferences.c:1634
+#: src/audacious/ui_preferences.c:1603
 msgid "Transport"
 msgstr "Transporte"
 
-#: src/audacious/ui_preferences.c:1634
+#: src/audacious/ui_preferences.c:1603
 msgid "Input"
 msgstr "Entrada"
 
-#: src/audacious/ui_preferences.c:1635
+#: src/audacious/ui_preferences.c:1604
 msgid "Effect"
 msgstr "Efeito"
 
-#: src/audacious/ui_preferences.c:1635
+#: src/audacious/ui_preferences.c:1604
 msgid "Visualization"
 msgstr "Visualização"
 
-#: src/audacious/ui_preferences.c:1635
+#: src/audacious/ui_preferences.c:1604
 msgid "General"
 msgstr "Geral"
 
-#: src/audacious/ui_preferences.c:1675
+#: src/audacious/ui_preferences.c:1644
 msgid "Audacious Preferences"
 msgstr "Preferências do Audacious"
 
-#: src/audacious/util.c:123
+#: src/audacious/util.c:120
 #, c-format
 msgid "Could not create directory (%s): %s\n"
-msgstr "Não foi possível criar directoria (%s): %s\n"
+msgstr "Não foi possível criar o diretório (%s): %s\n\n"
 
-#: src/audtool/handlers_playlist.c:274
+#: src/audtool/handlers_playlist.c:273
 msgid "Position not found."
-msgstr "Posição não encontrada."
+msgstr "Posição não encontrada"
 
-#: src/audtool/handlers_vitals.c:64
+#: src/audtool/handlers_vitals.c:63
 msgid "No song playing."
-msgstr "Nenhuma música em reprodução."
+msgstr "Nenhuma faixa em reprodução"
+
+#: src/libaudcore/audstrings.c:199
+#, c-format
+msgid "Audio CD, track %s"
+msgstr "CD áudio, faixa %s"
 
-#: src/libaudcore/tuple.c:685
+#: src/libaudcore/tuple.c:536
 msgid "Mono"
 msgstr "Mono"
 
-#: src/libaudcore/tuple.c:687
+#: src/libaudcore/tuple.c:538
 msgid "Stereo"
-msgstr "Stereo"
+msgstr "Estéreo"
 
-#: src/libaudcore/tuple.c:689
+#: src/libaudcore/tuple.c:540
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
-msgstr[0] "um: %d canal"
-msgstr[1] "outro: %d canais"
+msgstr[0] "%d canal"
+msgstr[1] "%d canais"
+
+#: src/libaudgui/about.c:52 src/libaudgui/about.c:115
+msgid "Credits"
+msgstr "Créditos"
 
-#: src/libaudgui/confirm.c:78
+#: src/libaudgui/about.c:52
+msgid "Translators"
+msgstr "Tradutores"
+
+#: src/libaudgui/about.c:91
+msgid "About Audacious"
+msgstr "Sobre o Audacious"
+
+#: src/libaudgui/confirm.c:76
 #, c-format
 msgid ""
 "Are you sure you want to close %s? If you do, any changes made since the "
 "playlist was exported will be lost."
-msgstr ""
-"Tem a certeza que quer fechar %s? Se sim, todas as modificações feitas desde"
-" que a lista de reprodução foi exportada serão perdidas."
+msgstr "Tem a certeza que quer fechar %s? Se fechar, vai perder todas as modificações efetuadas após a exportação da lista de reprodução"
 
-#: src/libaudgui/confirm.c:91
+#: src/libaudgui/confirm.c:89
 msgid "_Don't show this message again"
-msgstr "_Não mostrar esta mensagem novamente"
+msgstr "_Não mostrar mensagem novamente"
 
-#: src/libaudgui/confirm.c:128
+#: src/libaudgui/confirm.c:126
 msgid "Rename Playlist"
-msgstr "Renomear lista de reprodução"
+msgstr "Mudar nome da lista de reprodução"
 
-#: src/libaudgui/effects-menu.c:76
+#: src/libaudgui/effects-menu.c:74
 msgid "settings ..."
 msgstr "definições..."
 
-#: src/libaudgui/equalizer.c:52
+#: src/libaudgui/equalizer.c:51
 msgid "_Enable"
-msgstr "_Activar"
+msgstr "_Ativar"
 
-#: src/libaudgui/equalizer.c:124
+#: src/libaudgui/equalizer.c:123
 msgid "31 Hz"
 msgstr "31 Hz"
 
-#: src/libaudgui/equalizer.c:124
+#: src/libaudgui/equalizer.c:123
 msgid "63 Hz"
 msgstr "63 Hz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "125 Hz"
 msgstr "125 Hz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "250 Hz"
 msgstr "250 Hz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "500 Hz"
 msgstr "500 Hz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "1 kHz"
 msgstr "1 kHz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "2 kHz"
 msgstr "2 kHz"
 
-#: src/libaudgui/equalizer.c:126
+#: src/libaudgui/equalizer.c:125
 msgid "4 kHz"
 msgstr "4 kHz"
 
-#: src/libaudgui/equalizer.c:126
+#: src/libaudgui/equalizer.c:125
 msgid "8 kHz"
 msgstr "8 kHz"
 
-#: src/libaudgui/equalizer.c:126
+#: src/libaudgui/equalizer.c:125
 msgid "16 kHz"
 msgstr "16 kHz"
 
-#: src/libaudgui/equalizer.c:131
+#: src/libaudgui/equalizer.c:130
 msgid "Equalizer"
 msgstr "Equalizador"
 
-#: src/libaudgui/equalizer.c:147
+#: src/libaudgui/equalizer.c:146
 msgid "Preamp"
-msgstr "Pré-Amplificador"
+msgstr "Amplificador"
 
-#: src/libaudgui/infopopup.c:211
+#: src/libaudgui/infopopup.c:207
 msgid "Track Number"
-msgstr "Número da Faixa"
+msgstr "Número da faixa"
 
-#: src/libaudgui/infopopup.c:213
+#: src/libaudgui/infopopup.c:209
 msgid "Track Length"
-msgstr "Tamanho da Faixa"
+msgstr "Duração da faixa"
 
-#: src/libaudgui/infowin.c:77
+#: src/libaudgui/infowin.c:75
 msgid "Acid Jazz"
 msgstr "Acid Jazz"
 
-#: src/libaudgui/infowin.c:78
+#: src/libaudgui/infowin.c:76
 msgid "Acid Rock"
 msgstr "Acid Rock"
 
-#: src/libaudgui/infowin.c:79
+#: src/libaudgui/infowin.c:77
 msgid "Ambient"
 msgstr "Ambiente"
 
-#: src/libaudgui/infowin.c:80
+#: src/libaudgui/infowin.c:78
 msgid "Bebop"
 msgstr "Bebop"
 
-#: src/libaudgui/infowin.c:81
+#: src/libaudgui/infowin.c:79
 msgid "Bluegrass"
 msgstr "Bluegrass"
 
-#: src/libaudgui/infowin.c:82
+#: src/libaudgui/infowin.c:80
 msgid "Blues"
 msgstr "Blues"
 
-#: src/libaudgui/infowin.c:83
+#: src/libaudgui/infowin.c:81
 msgid "Chamber Music"
-msgstr "Música de Câmara"
+msgstr "Música de câmara"
 
-#: src/libaudgui/infowin.c:84
+#: src/libaudgui/infowin.c:82
 msgid "Classical"
 msgstr "Clássica"
 
-#: src/libaudgui/infowin.c:85
+#: src/libaudgui/infowin.c:83
 msgid "Country"
 msgstr "Country"
 
-#: src/libaudgui/infowin.c:86
+#: src/libaudgui/infowin.c:84
 msgid "Death Metal"
 msgstr "Death Metal"
 
-#: src/libaudgui/infowin.c:87
+#: src/libaudgui/infowin.c:85
 msgid "Disco"
 msgstr "Disco"
 
-#: src/libaudgui/infowin.c:88
+#: src/libaudgui/infowin.c:86
 msgid "Easy Listening"
-msgstr "Música Ligeira"
+msgstr "Música ligeira"
 
-#: src/libaudgui/infowin.c:89
+#: src/libaudgui/infowin.c:87
 msgid "Folk"
 msgstr "Folk"
 
-#: src/libaudgui/infowin.c:90
+#: src/libaudgui/infowin.c:88
 msgid "Funk"
 msgstr "Funk"
 
-#: src/libaudgui/infowin.c:91
+#: src/libaudgui/infowin.c:89
 msgid "Gangsta Rap"
 msgstr "Gangsta Rap"
 
-#: src/libaudgui/infowin.c:92
+#: src/libaudgui/infowin.c:90
 msgid "Gospel"
 msgstr "Gospel"
 
-#: src/libaudgui/infowin.c:93
+#: src/libaudgui/infowin.c:91
 msgid "Grunge"
 msgstr "Grunge"
 
-#: src/libaudgui/infowin.c:94
+#: src/libaudgui/infowin.c:92
 msgid "Hard Rock"
 msgstr "Hard Rock"
 
-#: src/libaudgui/infowin.c:95
+#: src/libaudgui/infowin.c:93
 msgid "Heavy Metal"
 msgstr "Heavy Metal"
 
-#: src/libaudgui/infowin.c:96
+#: src/libaudgui/infowin.c:94
 msgid "Hip-hop"
 msgstr "Hip-hop"
 
-#: src/libaudgui/infowin.c:97
+#: src/libaudgui/infowin.c:95
 msgid "House"
 msgstr "House"
 
-#: src/libaudgui/infowin.c:98
+#: src/libaudgui/infowin.c:96
 msgid "Jazz"
 msgstr "Jazz"
 
-#: src/libaudgui/infowin.c:99
+#: src/libaudgui/infowin.c:97
 msgid "Jungle"
-msgstr "Selva"
+msgstr "Jungle"
 
-#: src/libaudgui/infowin.c:100
+#: src/libaudgui/infowin.c:98
 msgid "Metal"
 msgstr "Metal"
 
-#: src/libaudgui/infowin.c:101
+#: src/libaudgui/infowin.c:99
 msgid "New Age"
 msgstr "New Age"
 
-#: src/libaudgui/infowin.c:102
+#: src/libaudgui/infowin.c:100
 msgid "New Wave"
 msgstr "New Wave"
 
-#: src/libaudgui/infowin.c:103
+#: src/libaudgui/infowin.c:101
 msgid "Noise"
 msgstr "Noise"
 
-#: src/libaudgui/infowin.c:104
+#: src/libaudgui/infowin.c:102
 msgid "Pop"
 msgstr "Pop"
 
-#: src/libaudgui/infowin.c:105
+#: src/libaudgui/infowin.c:103
 msgid "Punk Rock"
 msgstr "Punk Rock"
 
-#: src/libaudgui/infowin.c:106
+#: src/libaudgui/infowin.c:104
 msgid "Rap"
 msgstr "Rap"
 
-#: src/libaudgui/infowin.c:107
+#: src/libaudgui/infowin.c:105
 msgid "Reggae"
 msgstr "Reggae"
 
-#: src/libaudgui/infowin.c:108
+#: src/libaudgui/infowin.c:106
 msgid "Rock"
 msgstr "Rock"
 
-#: src/libaudgui/infowin.c:109
+#: src/libaudgui/infowin.c:107
 msgid "Rock and Roll"
 msgstr "Rock and Roll"
 
-#: src/libaudgui/infowin.c:110
+#: src/libaudgui/infowin.c:108
 msgid "Rhythm and Blues"
 msgstr "Rhythm and Blues"
 
-#: src/libaudgui/infowin.c:111
+#: src/libaudgui/infowin.c:109
 msgid "Ska"
 msgstr "Ska"
 
-#: src/libaudgui/infowin.c:112
+#: src/libaudgui/infowin.c:110
 msgid "Soul"
 msgstr "Soul"
 
-#: src/libaudgui/infowin.c:113
+#: src/libaudgui/infowin.c:111
 msgid "Swing"
 msgstr "Swing"
 
-#: src/libaudgui/infowin.c:114
+#: src/libaudgui/infowin.c:112
 msgid "Techno"
-msgstr "Tecno"
+msgstr "Techno"
 
-#: src/libaudgui/infowin.c:115
+#: src/libaudgui/infowin.c:113
 msgid "Trip-hop"
 msgstr "Trip-hop"
 
-#: src/libaudgui/infowin.c:175 src/libaudgui/infowin.c:361
-#: src/libaudgui/infowin.c:364 src/libaudgui/infowin.c:367
+#: src/libaudgui/infowin.c:177 src/libaudgui/infowin.c:363
+#: src/libaudgui/infowin.c:366 src/libaudgui/infowin.c:369
 msgid "n/a"
 msgstr "n/d"
 
-#: src/libaudgui/infowin.c:265
+#: src/libaudgui/infowin.c:267
 msgid "Metadata updated successfully"
-msgstr "Metadados actualizados"
+msgstr "Detalhes atualizados com sucesso"
 
-#: src/libaudgui/infowin.c:270
+#: src/libaudgui/infowin.c:272
 msgid "Metadata updating failed"
-msgstr "Falha ao actualizar metadados"
+msgstr "Falha ao atualizar os detalhes"
 
-#: src/libaudgui/infowin.c:318
+#: src/libaudgui/infowin.c:320
 msgid "Track Information"
-msgstr "Informações da Faixa"
+msgstr "Informações da faixa"
 
-#: src/libaudgui/infowin.c:350
+#: src/libaudgui/infowin.c:352
 msgid "Format:"
 msgstr "Formato:"
 
-#: src/libaudgui/infowin.c:354
+#: src/libaudgui/infowin.c:356
 msgid "Quality:"
 msgstr "Qualidade:"
 
-#: src/libaudgui/infowin.c:357
+#: src/libaudgui/infowin.c:359
 msgid "Bitrate:"
-msgstr "Bitrate:"
+msgstr "Taxa de dados:"
 
-#: src/libaudgui/infowin.c:387
+#: src/libaudgui/infowin.c:389
 msgid "Title"
 msgstr "Título"
 
-#: src/libaudgui/infowin.c:399
+#: src/libaudgui/infowin.c:401
 msgid "Artist"
 msgstr "Artista"
 
-#: src/libaudgui/infowin.c:411
+#: src/libaudgui/infowin.c:413
 msgid "Album"
 msgstr "Álbum"
 
-#: src/libaudgui/infowin.c:423
+#: src/libaudgui/infowin.c:425
 msgid "Comment"
 msgstr "Comentário"
 
-#: src/libaudgui/infowin.c:435
+#: src/libaudgui/infowin.c:437
 msgid "Genre"
 msgstr "Género"
 
-#: src/libaudgui/infowin.c:456
+#: src/libaudgui/infowin.c:458
 msgid "Year"
 msgstr "Ano"
 
-#: src/libaudgui/infowin.c:467
+#: src/libaudgui/infowin.c:469
 msgid "Track Number"
-msgstr "Número da Faixa"
+msgstr "Número da faixa"
 
-#: src/libaudgui/infowin.c:549
+#: src/libaudgui/infowin.c:548
 #, c-format
 msgid "%d kb/s"
 msgstr "%d kb/s"
 
-#: src/libaudgui/infowin.c:579
+#: src/libaudgui/infowin.c:575
 #, c-format
 msgid "No info available for %s.\n"
-msgstr "Nenhuma informação disponível para %s.\n"
+msgstr "Sem informações para %s\n\n"
 
-#: src/libaudgui/jump-to-time.c:75
+#: src/libaudgui/jump-to-time.c:72
 msgid "Jump to Time"
-msgstr "Saltar para tempo"
+msgstr "Ir para posição temporal"
 
-#: src/libaudgui/jump-to-time.c:90
+#: src/libaudgui/jump-to-time.c:87
 msgid "mm:ss"
-msgstr "mm: ss"
+msgstr "mm:ss"
 
-#: src/libaudgui/playlists.c:39
+#: src/libaudgui/playlists.c:33
 msgid "Export Playlist"
 msgstr "Exportar lista de reprodução"
 
-#: src/libaudgui/playlists.c:39
+#: src/libaudgui/playlists.c:33
 msgid "Import Playlist"
 msgstr "Importar lista de reprodução"
 
-#: src/libaudgui/playlists.c:72
+#: src/libaudgui/playlists.c:66
 #, c-format
 msgid "Overwrite %s?"
-msgstr "Sobrepor %s?"
+msgstr "Substituir %s?"
 
-#: src/libaudgui/queue-manager.c:185
+#: src/libaudgui/queue-manager.c:196
 msgid "Queue Manager"
 msgstr "Gestor de fila"
 
-#: src/libaudgui/ui_about.c:69
-msgid "About Audacious"
-msgstr "Acerca do Audacious"
-
-#: src/libaudgui/ui_about.c:90 src/libaudgui/ui_credits.c:122
-msgid "Credits"
-msgstr "Créditos"
-
-#: src/libaudgui/ui_credits.c:126
-msgid "Translators"
-msgstr "Tradutores"
-
 #: src/libaudgui/ui_fileopener.c:109
 msgid "Open Files"
-msgstr "Abrir Ficheiros"
+msgstr "Abrir ficheiros"
 
 #: src/libaudgui/ui_fileopener.c:109
 msgid "Add Files"
-msgstr "Adicionar Ficheiros"
+msgstr "Adicionar ficheiros"
 
 #: src/libaudgui/ui_fileopener.c:111
 msgid "Close dialog on Open"
@@ -1087,60 +1098,60 @@
 msgid "Close dialog on Add"
 msgstr "Fechar caixa de diálogo depois de Adicionar"
 
-#: src/libaudgui/ui_jumptotrack.c:103 src/libaudgui/ui_jumptotrack.c:111
-#: src/libaudgui/ui_jumptotrack.c:322
+#: src/libaudgui/ui_jumptotrack.c:109 src/libaudgui/ui_jumptotrack.c:117
+#: src/libaudgui/ui_jumptotrack.c:326
 msgid "_Queue"
-msgstr "_Colocar na Fila"
+msgstr "_Colocar na fila"
 
-#: src/libaudgui/ui_jumptotrack.c:109
+#: src/libaudgui/ui_jumptotrack.c:115
 msgid "Un_queue"
-msgstr "_Retirar da Fila"
+msgstr "_Retirar da fila"
 
-#: src/libaudgui/ui_jumptotrack.c:239
-msgid "Jump to Track"
-msgstr "Ir Para Faixa"
+#: src/libaudgui/ui_jumptotrack.c:258
+msgid "Jump to Song"
+msgstr "Ir para a faixa"
 
-#: src/libaudgui/ui_jumptotrack.c:277
+#: src/libaudgui/ui_jumptotrack.c:281
 msgid "Filter: "
 msgstr "Filtro: "
 
-#: src/libaudgui/ui_jumptotrack.c:278
+#: src/libaudgui/ui_jumptotrack.c:282
 msgid "_Filter:"
 msgstr "_Filtro:"
 
-#: src/libaudgui/ui_jumptotrack.c:288
+#: src/libaudgui/ui_jumptotrack.c:292
 msgid "Remember"
 msgstr "Lembrar"
 
-#: src/libaudgui/ui_jumptotrack.c:295
+#: src/libaudgui/ui_jumptotrack.c:299
 msgid "Clea_r"
-msgstr "Limpa_r"
+msgstr "Apaga_r"
 
-#: src/libaudgui/ui_jumptotrack.c:315
+#: src/libaudgui/ui_jumptotrack.c:319
 msgid "Close on Jump"
 msgstr "Fechar ao ir para a faixa"
 
-#: src/libaudgui/ui_playlist_manager.c:250
+#: src/libaudgui/ui_playlist_manager.c:253
 msgid "Playlist Manager"
 msgstr "Gestor de lista de reprodução"
 
-#: src/libaudgui/ui_playlist_manager.c:277
+#: src/libaudgui/ui_playlist_manager.c:280
 msgid "Entries"
 msgstr "Entradas"
 
-#: src/libaudgui/ui_playlist_manager.c:298
+#: src/libaudgui/ui_playlist_manager.c:301
 msgid "_Rename"
-msgstr "_Renomear"
+msgstr "Muda_r nome"
 
-#: src/libaudgui/ui_playlist_manager.c:322
+#: src/libaudgui/ui_playlist_manager.c:325
 msgid "_Close dialog on activating playlist"
-msgstr "_Fechar diálogo de activação de lista de reprodução"
+msgstr "Fe_char caixa de diálogo ao ativar a lista de reprodução"
 
-#: src/libaudgui/ui_urlopener.c:51
+#: src/libaudgui/ui_urlopener.c:48
 msgid "Open URL"
 msgstr "Abrir URL"
 
-#: src/libaudgui/ui_urlopener.c:51
+#: src/libaudgui/ui_urlopener.c:48
 msgid "Add URL"
 msgstr "Adicionar URL"
 
@@ -1148,58 +1159,54 @@
 msgid ""
 "\n"
 "(Further messages have been hidden.)"
-msgstr ""
-"\n"
-"(Mensagens adicionais foram escondidas.)"
+msgstr "\n(Foram ocultas algumas mensagens)"
 
 #: src/libeggsmclient/eggdesktopfile.c:165
 msgid "File is not a valid .desktop file"
-msgstr "O ficheiro não é um ficheiro .desktop válido"
+msgstr "Este não é um ficheiro .desktop válido"
 
-#: src/libeggsmclient/eggdesktopfile.c:188
+#: src/libeggsmclient/eggdesktopfile.c:191
 #, c-format
 msgid "Unrecognized desktop file Version '%s'"
-msgstr "Versão de ficheiro desktop desconhecida, '%s'"
+msgstr "Versão de ficheiro .desktop desconhecida \"%s\""
 
-#: src/libeggsmclient/eggdesktopfile.c:967
+#: src/libeggsmclient/eggdesktopfile.c:974
 #, c-format
 msgid "Starting %s"
 msgstr "A iniciar %s"
 
-#: src/libeggsmclient/eggdesktopfile.c:1108
+#: src/libeggsmclient/eggdesktopfile.c:1116
 msgid "Application does not accept documents on command line"
 msgstr "A aplicação não aceita documentos na linha de comandos"
 
-#: src/libeggsmclient/eggdesktopfile.c:1176
+#: src/libeggsmclient/eggdesktopfile.c:1184
 #, c-format
 msgid "Unrecognized launch option: %d"
 msgstr "Opção de arranque desconhecida: %d"
 
-#: src/libeggsmclient/eggdesktopfile.c:1375
+#: src/libeggsmclient/eggdesktopfile.c:1391
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
-msgstr ""
-"Não é possível passar URIs de documentos para uma entrada de desktop "
-"'Type=Link'"
+msgstr "Não pode enviar URIs de documentos para uma entrada \"Type=Link\""
 
-#: src/libeggsmclient/eggdesktopfile.c:1396
+#: src/libeggsmclient/eggdesktopfile.c:1412
 msgid "Not a launchable item"
 msgstr "Não é um item iniciável"
 
 #: src/libeggsmclient/eggsmclient.c:226
 msgid "Disable connection to session manager"
-msgstr "Desactivar ligação ao gestor de sessão"
+msgstr "Desativar ligação ao gestor de sessão"
 
 #: src/libeggsmclient/eggsmclient.c:229
 msgid "Specify file containing saved configuration"
-msgstr "Indique o ficheiro com a gravação da configuração"
+msgstr "Indique o ficheiro com a configuração"
 
 #: src/libeggsmclient/eggsmclient.c:229
 msgid "FILE"
-msgstr "FICHEIRO"
+msgstr "Ficheiro"
 
 #: src/libeggsmclient/eggsmclient.c:232
 msgid "Specify session management ID"
-msgstr "Indique ID de gestão de sessão"
+msgstr "Indique a ID do gestor de sessão"
 
 #: src/libeggsmclient/eggsmclient.c:232
 msgid "ID"
@@ -1212,5 +1219,3 @@
 #: src/libeggsmclient/eggsmclient.c:254
 msgid "Show session management options"
 msgstr "Mostrar opções de gestão de sessão"
-
-

audacious-3.1.1.tar.bz2/po/ru.po -> audacious-3.2.4.tar.bz2/po/ru.po Changed

@@ -1,40 +1,35 @@
-# Russian translation for Audacious.
-# Copyright (C) 2006,2007 Alexander Orlov <alxorlov@pochta.ru>
+# Russian translation for Audacious
+# Copyright (C) Audacious translators
 # This file is distributed under the same license as the Audacious package.
 #
-# За основу взят перевод Виталия Липатова для BMP.
-# Улучшения перевода приветствуются :)
-#
-#
+# Translators:
 # Alexander Orlov <alxorlov@pochta.ru>, 2007.
-# Vitaly Lipatov <lav@etersoft.ru>, 2007.
+# <a.michurin@gmail.com>, 2011.
+# Eugene Paskevich <eugene@raptor.kiev.ua>, 2010.
 # Eugene Zagidullin <e.asphyx@gmail.com>, 2007.
+# NaiLi Rootaerc <theism@mail.ru>, 2012.
 # serg0 <serg0@ulx.ru>, 2009.
-# Eugene Paskevich <eugene@raptor.kiev.ua>, 2010.
 # Sergey V. Mironov <sergo@bk.ru>, 2010.
+# Vitaly Lipatov <lav@etersoft.ru>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: audacious 2.4\n"
-"Report-Msgid-Bugs-To: http://jira.atheme.org/\n"
-"POT-Creation-Date: 2011-07-05 22:45+0200\n"
-"PO-Revision-Date: 2010-08-22 22:15+0400\n"
-"Last-Translator: Sergey V. Mironov <sergo@bk.ru>\n"
-"Language-Team: Russian <kde-russian@lists.kde.ru>\n"
-"Language: ru\n"
+"Project-Id-Version: Audacious\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2012-01-11 08:54-0500\n"
+"PO-Revision-Date: 2012-01-13 11:35+0000\n"
+"Last-Translator: NaiLi Rootaerc <theism@mail.ru>\n"
+"Language-Team: Russian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\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"
-"X-Poedit-Language: Russian\n"
-"X-Poedit-Basepath: /home/asphyx/ahinea/audacious\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: src/audacious/adder.c:71
+#: src/audacious/adder.c:77
 msgid "Searching ..."
 msgstr "Поиск ..."
 
-#: src/audacious/adder.c:99
+#: src/audacious/adder.c:113
 #, c-format
 msgid "%d file found"
 msgid_plural "%d files found"
@@ -42,258 +37,264 @@
 msgstr[1] "Найдено %d файла"
 msgstr[2] "Найдено %d файлов"
 
-#: src/audacious/chardet.c:37
+#: src/audacious/chardet.c:39
 msgid " (invalid UTF-8)"
 msgstr " (недопустимая последовательность Юникод)"
 
-#: src/audacious/credits.c:35
+#: src/audacious/credits.c:37
 msgid "Core developers:"
 msgstr "Главные разработчики:"
 
-#: src/audacious/credits.c:49
+#: src/audacious/credits.c:51
 msgid "Graphics:"
 msgstr "Графика:"
 
-#: src/audacious/credits.c:54
+#: src/audacious/credits.c:56
 msgid "Default skin:"
 msgstr "Стандартная тема:"
 
-#: src/audacious/credits.c:60
+#: src/audacious/credits.c:62
 msgid "Plugin development:"
 msgstr "Разработка модулей:"
 
-#: src/audacious/credits.c:83
+#: src/audacious/credits.c:85
 msgid "Patch authors:"
 msgstr "Авторы патчей:"
 
-#: src/audacious/credits.c:126
+#: src/audacious/credits.c:131
 msgid "1.x developers:"
 msgstr "Разработчики версий 1.x:"
 
-#: src/audacious/credits.c:148
+#: src/audacious/credits.c:153
 msgid "BMP Developers:"
 msgstr "Разработчики BMP:"
 
-#: src/audacious/credits.c:180
+#: src/audacious/credits.c:185
 msgid "Belarusian:"
 msgstr "Белорусский:"
 
-#: src/audacious/credits.c:183
+#: src/audacious/credits.c:188
 msgid "Basque:"
 msgstr "Баскский:"
 
-#: src/audacious/credits.c:186
+#: src/audacious/credits.c:191
 msgid "Brazilian Portuguese:"
 msgstr "Бразильский португальский:"
 
-#: src/audacious/credits.c:190
+#: src/audacious/credits.c:196
 msgid "Breton:"
 msgstr "Бретонский:"
 
-#: src/audacious/credits.c:193
+#: src/audacious/credits.c:199
 msgid "Bulgarian:"
 msgstr "Болгарский:"
 
-#: src/audacious/credits.c:196
+#: src/audacious/credits.c:202
 msgid "Catalan:"
 msgstr "Каталонский:"
 
-#: src/audacious/credits.c:199
+#: src/audacious/credits.c:206
 msgid "Chinese:"
 msgstr "Китайский:"
 
-#: src/audacious/credits.c:202
+#: src/audacious/credits.c:209
 msgid "Croatian:"
 msgstr "Хорватский:"
 
-#: src/audacious/credits.c:205
+#: src/audacious/credits.c:212
 msgid "Czech:"
 msgstr "Чешский:"
 
-#: src/audacious/credits.c:208
+#: src/audacious/credits.c:215
 msgid "Dutch:"
 msgstr "Голландский:"
 
-#: src/audacious/credits.c:212
+#: src/audacious/credits.c:219
 msgid "Estonian:"
 msgstr "Эстонский:"
 
-#: src/audacious/credits.c:215
+#: src/audacious/credits.c:222
 msgid "Finnish:"
 msgstr "Финский:"
 
-#: src/audacious/credits.c:220
+#: src/audacious/credits.c:227
 msgid "French:"
 msgstr "Французский:"
 
-#: src/audacious/credits.c:226
+#: src/audacious/credits.c:233
 msgid "German:"
 msgstr "Немецкий:"
 
-#: src/audacious/credits.c:233
+#: src/audacious/credits.c:240
 msgid "Georgian:"
 msgstr "Грузинский:"
 
-#: src/audacious/credits.c:236
+#: src/audacious/credits.c:243
 msgid "Greek:"
 msgstr "Греческий:"
 
-#: src/audacious/credits.c:241
+#: src/audacious/credits.c:248
 msgid "Hindi:"
 msgstr "Хинди:"
 
-#: src/audacious/credits.c:244
+#: src/audacious/credits.c:251
 msgid "Hungarian:"
 msgstr "Венгерский:"
 
-#: src/audacious/credits.c:248
+#: src/audacious/credits.c:255
 msgid "Italian:"
 msgstr "Итальянский:"
 
-#: src/audacious/credits.c:252
+#: src/audacious/credits.c:260
 msgid "Japanese:"
 msgstr "Японский:"
 
-#: src/audacious/credits.c:255
+#: src/audacious/credits.c:263
 msgid "Korean:"
 msgstr "Корейский:"
 
-#: src/audacious/credits.c:258
-#, fuzzy
+#: src/audacious/credits.c:266
 msgid "Latvian:"
-msgstr "Хорватский:"
+msgstr "Латышский:"
 
-#: src/audacious/credits.c:261
+#: src/audacious/credits.c:269
 msgid "Lithuanian:"
 msgstr "Литовский:"
 
-#: src/audacious/credits.c:265
+#: src/audacious/credits.c:274
 msgid "Macedonian:"
 msgstr "Македонский:"
 
-#: src/audacious/credits.c:268
+#: src/audacious/credits.c:277
+msgid "Mexican Spanish:"
+msgstr "Испанский язык, Мексика:"
+
+#: src/audacious/credits.c:280
 msgid "Polish:"
 msgstr "Польский:"
 
-#: src/audacious/credits.c:274
-#, fuzzy
+#: src/audacious/credits.c:287
 msgid "Portuguese:"
 msgstr "Португальский:"
 
-#: src/audacious/credits.c:277
+#: src/audacious/credits.c:290
 msgid "Romanian:"
 msgstr "Румынский:"
 
-#: src/audacious/credits.c:281
+#: src/audacious/credits.c:294
 msgid "Russian:"
 msgstr "Русский:"
 
-#: src/audacious/credits.c:285
+#: src/audacious/credits.c:298
 msgid "Serbian (Latin):"
 msgstr "Сербский (латиница):"
 
-#: src/audacious/credits.c:288
+#: src/audacious/credits.c:301
 msgid "Serbian (Cyrillic):"
 msgstr "Сербский (кириллица):"
 
-#: src/audacious/credits.c:291
+#: src/audacious/credits.c:305
 msgid "Simplified Chinese:"
 msgstr "Упрощённый китайский:"
 
-#: src/audacious/credits.c:294
+#: src/audacious/credits.c:308
 msgid "Slovak:"
 msgstr "Словацкий:"
 
-#: src/audacious/credits.c:297
+#: src/audacious/credits.c:312
 msgid "Spanish:"
 msgstr "Испанский:"
 
-#: src/audacious/credits.c:304
+#: src/audacious/credits.c:320
 msgid "Swedish:"
 msgstr "Шведский:"
 
-#: src/audacious/credits.c:307
+#: src/audacious/credits.c:323
 msgid "Traditional Chinese:"
 msgstr "Традиционный китайский:"
 
-#: src/audacious/credits.c:312
+#: src/audacious/credits.c:329
 msgid "Turkish:"
 msgstr "Турецкий:"
 
-#: src/audacious/credits.c:316
+#: src/audacious/credits.c:333
 msgid "Ukrainian:"
 msgstr "Украинский:"
 
-#: src/audacious/credits.c:319
+#: src/audacious/credits.c:338
+msgid "Vietnamese:"
+msgstr "Вьетнамский:"
+
+#: src/audacious/credits.c:341
 msgid "Welsh:"
 msgstr "Уэльский:"
 
-#: src/audacious/drct.c:256
-msgid "Temporary Playlist"
-msgstr "Временный список воспроизведения"
-
-#: src/audacious/equalizer_preset.c:186
+#: src/audacious/equalizer_preset.c:180
 #, c-format
 msgid "Error importing Winamp EQF file '%s'"
 msgstr "Невозможно импортировать Winamp EQF файл '%s'"
 
-#: src/audacious/main.c:256
+#: src/audacious/main.c:243
 msgid "Skip backwards in playlist"
 msgstr "Перейти к предыдущей дорожке в списке воспроизведения"
 
-#: src/audacious/main.c:257
+#: src/audacious/main.c:244
 msgid "Start playing current playlist"
 msgstr "Начать проигрывать текущий список воспроизведения"
 
-#: src/audacious/main.c:258
+#: src/audacious/main.c:245
 msgid "Pause current song"
 msgstr "Приостановить текущую дорожку"
 
-#: src/audacious/main.c:259
+#: src/audacious/main.c:246
 msgid "Stop current song"
 msgstr "Остановить текущую дорожку"
 
-#: src/audacious/main.c:260
+#: src/audacious/main.c:247
 msgid "Pause if playing, play otherwise"
 msgstr "Приостановить при проигрывании, иначе ― воспроизводить"
 
-#: src/audacious/main.c:261
+#: src/audacious/main.c:248
 msgid "Skip forward in playlist"
 msgstr "Перейти к следующей дорожке в списке воспроизведения"
 
-#: src/audacious/main.c:262
+#: src/audacious/main.c:249
 msgid "Display Jump to File dialog"
 msgstr "Показать диалог перехода к файлу"
 
-#: src/audacious/main.c:263
+#: src/audacious/main.c:250
 msgid "Add files to the playlist"
 msgstr "Добавить файлы в список воспроизведения"
 
-#: src/audacious/main.c:264
+#: src/audacious/main.c:251
 msgid "Add new files to a temporary playlist"
 msgstr "Добавить файлы во временный список воспроизведения"
 
-#: src/audacious/main.c:265
+#: src/audacious/main.c:252
 msgid "Display the main window"
 msgstr "Показать главное окно"
 
-#: src/audacious/main.c:266
+#: src/audacious/main.c:253
 msgid "Show version"
 msgstr "Показать версию"
 
-#: src/audacious/main.c:267
+#: src/audacious/main.c:254
 msgid "Print debugging messages"
-msgstr ""
+msgstr "Печатать отладочную информацию"
 
-#: src/audacious/main.c:268
+#: src/audacious/main.c:255
+msgid "Headless mode (beta)"
+msgstr "Управление с консоли (бета)"
+
+#: src/audacious/main.c:256
 msgid "FILE..."
 msgstr "ФАЙЛ..."
 
-#: src/audacious/main.c:280
+#: src/audacious/main.c:268
 msgid "- play multimedia files"
 msgstr "- проиграть мультимедийные файлы"
 
-#: src/audacious/main.c:290
+#: src/audacious/main.c:278
 #, c-format
 msgid ""
 "%s: %s\n"
@@ -302,306 +303,310 @@
 "%s: %s\n"
 "Попробуйте `%s --help' для получения подробного описания.\n"
 
-#: src/audacious/main.c:407
-msgid ""
-"Audacious seems to be already running but is not responding. You can start "
-"another instance of the program, but please be warned that this can cause "
-"data loss. If Audacious is not running, you can safely ignore this "
-"message. Press OK to start Audacious or Cancel to quit."
-msgstr ""
-
-#: src/audacious/main.c:572
+#: src/audacious/main.c:573
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/audacious/playback.c:381
+#: src/audacious/playback.c:307
 #, c-format
 msgid "No decoder found for %s."
 msgstr "Не найден декодер для %s."
 
-#: src/audacious/playback.c:531
-msgid "Buffering ..."
-msgstr "Буферизация..."
+#: src/audacious/playlist-files.c:53
+#, c-format
+msgid "Cannot %s %s: unsupported file extension."
+msgstr "Невозможно %s %s: расширение файла не поддерживается."
+
+#: src/audacious/playlist-files.c:54
+msgid "save"
+msgstr "сохранить"
+
+#: src/audacious/playlist-files.c:54
+msgid "load"
+msgstr "загрузить"
+
+#: src/audacious/playlist-new.c:131
+msgid "New Playlist"
+msgstr "Новый Список"
 
-#: src/audacious/playlist-new.c:303
-msgid "Untitled Playlist"
-msgstr "Новый список воспроизведения"
+#: src/audacious/playlist-new.c:132
+msgid "Now Playing"
+msgstr "Сейчас Воспроизводится"
 
-#: src/audacious/ui_preferences.c:87
+#: src/audacious/playlist-new.c:1630
+msgid ""
+"The playlist cannot be sorted because metadata scanning is still in progress"
+" (or has been disabled)."
+msgstr ""
+"Список не может быть отсортирован, так как сканирование метаданных всё ещё "
+"происходит (или было выключено)."
+
+#: src/audacious/ui_preferences.c:85
 msgid "Audio"
 msgstr "Звук"
 
-#: src/audacious/ui_preferences.c:88
+#: src/audacious/ui_preferences.c:86
 msgid "Network"
 msgstr "Сеть"
 
-#: src/audacious/ui_preferences.c:89 src/audacious/ui_preferences.c:1556
+#: src/audacious/ui_preferences.c:87 src/audacious/ui_preferences.c:1603
 msgid "Playlist"
 msgstr "Список воспроизведения"
 
-#: src/audacious/ui_preferences.c:90
+#: src/audacious/ui_preferences.c:88
 msgid "Plugins"
 msgstr "Модули"
 
-#: src/audacious/ui_preferences.c:96 src/libaudgui/infopopup.c:204
+#: src/audacious/ui_preferences.c:94 src/libaudgui/infopopup.c:199
 msgid "Artist"
 msgstr "Исполнитель"
 
-#: src/audacious/ui_preferences.c:97 src/libaudgui/infopopup.c:206
+#: src/audacious/ui_preferences.c:95 src/libaudgui/infopopup.c:201
 msgid "Album"
 msgstr "Альбом"
 
-#: src/audacious/ui_preferences.c:98 src/libaudgui/infopopup.c:202
-#: src/libaudgui/ui_playlist_manager.c:263
+#: src/audacious/ui_preferences.c:96 src/libaudgui/infopopup.c:197
+#: src/libaudgui/ui_playlist_manager.c:279
 msgid "Title"
 msgstr "Название"
 
-#: src/audacious/ui_preferences.c:99
+#: src/audacious/ui_preferences.c:97
 msgid "Tracknumber"
 msgstr "Номер дорожки"
 
-#: src/audacious/ui_preferences.c:100 src/libaudgui/infopopup.c:208
+#: src/audacious/ui_preferences.c:98 src/libaudgui/infopopup.c:203
 msgid "Genre"
 msgstr "Жанр"
 
-#: src/audacious/ui_preferences.c:101
+#: src/audacious/ui_preferences.c:99
 msgid "Filename"
 msgstr "Имя файла"
 
-#: src/audacious/ui_preferences.c:102
+#: src/audacious/ui_preferences.c:100
 msgid "Filepath"
 msgstr "Путь к файлу"
 
-#: src/audacious/ui_preferences.c:103
+#: src/audacious/ui_preferences.c:101
 msgid "Date"
 msgstr "Дата"
 
-#: src/audacious/ui_preferences.c:104 src/libaudgui/infopopup.c:210
+#: src/audacious/ui_preferences.c:102 src/libaudgui/infopopup.c:205
 msgid "Year"
 msgstr "Год"
 
-#: src/audacious/ui_preferences.c:105
+#: src/audacious/ui_preferences.c:103
 msgid "Comment"
 msgstr "Комментарий"
 
-#: src/audacious/ui_preferences.c:106
+#: src/audacious/ui_preferences.c:104
 msgid "Codec"
 msgstr "Кодек"
 
-#: src/audacious/ui_preferences.c:107
+#: src/audacious/ui_preferences.c:105
 msgid "Quality"
 msgstr "Качество"
 
-#: src/audacious/ui_preferences.c:112
+#: src/audacious/ui_preferences.c:111
 msgid "None"
 msgstr "Нет"
 
+#: src/audacious/ui_preferences.c:112
+msgid "Arabic"
+msgstr "Арабский"
+
 #: src/audacious/ui_preferences.c:113
-msgid "Japanese"
-msgstr "Японский"
+msgid "Baltic"
+msgstr "Балтийские языки"
 
 #: src/audacious/ui_preferences.c:114
-msgid "Taiwanese"
-msgstr "Тайваньский"
-
-#: src/audacious/ui_preferences.c:115
 msgid "Chinese"
 msgstr "Китайский"
 
-#: src/audacious/ui_preferences.c:116
-msgid "Korean"
-msgstr "Корейский"
-
-#: src/audacious/ui_preferences.c:117
-msgid "Russian"
-msgstr "Русский"
-
-#: src/audacious/ui_preferences.c:118
+#: src/audacious/ui_preferences.c:115
 msgid "Greek"
 msgstr "Греческий"
 
-#: src/audacious/ui_preferences.c:119
+#: src/audacious/ui_preferences.c:116
 msgid "Hebrew"
 msgstr "Иврит"
 
-#: src/audacious/ui_preferences.c:120
-msgid "Turkish"
-msgstr "Турецкий"
+#: src/audacious/ui_preferences.c:117
+msgid "Japanese"
+msgstr "Японский"
 
-#: src/audacious/ui_preferences.c:121
-msgid "Arabic"
-msgstr "Арабский"
+#: src/audacious/ui_preferences.c:118
+msgid "Korean"
+msgstr "Корейский"
 
-#: src/audacious/ui_preferences.c:122
+#: src/audacious/ui_preferences.c:119
 msgid "Polish"
 msgstr "Польский"
 
-#: src/audacious/ui_preferences.c:123
-msgid "Baltic"
-msgstr "Балтийские языки"
+#: src/audacious/ui_preferences.c:120
+msgid "Russian"
+msgstr "Русский"
 
-#: src/audacious/ui_preferences.c:124
-msgid "Universal"
-msgstr "Универсальный режим"
+#: src/audacious/ui_preferences.c:121
+msgid "Taiwanese"
+msgstr "Тайваньский"
 
-#: src/audacious/ui_preferences.c:146
-msgid "Single track mode"
-msgstr ""
+#: src/audacious/ui_preferences.c:122
+msgid "Turkish"
+msgstr "Турецкий"
 
-#: src/audacious/ui_preferences.c:147
-#, fuzzy
+#: src/audacious/ui_preferences.c:144
 msgid "Album mode"
-msgstr "Альбом"
+msgstr "Режим альбома"
 
-#: src/audacious/ui_preferences.c:150
+#: src/audacious/ui_preferences.c:147
 msgid "Output Settings"
-msgstr ""
+msgstr "Настройки вывода"
 
-#: src/audacious/ui_preferences.c:152
-#, fuzzy
+#: src/audacious/ui_preferences.c:149
 msgid "Bit depth:"
-msgstr "Разрядность выходного потока:"
+msgstr "Разрядность"
 
-#: src/audacious/ui_preferences.c:155
+#: src/audacious/ui_preferences.c:152
 msgid "Buffer size:"
 msgstr "Размер буфера:"
 
-#: src/audacious/ui_preferences.c:157
+#: src/audacious/ui_preferences.c:154
 msgid "ms"
-msgstr ""
+msgstr "мс"
 
-#: src/audacious/ui_preferences.c:158
-#, fuzzy
+#: src/audacious/ui_preferences.c:155
 msgid "Use software volume control (not recommended)"
-msgstr "Программная регулировка громкости"
+msgstr "Использовать программную регулировку громкости (не рекомендуется)"
 
-#: src/audacious/ui_preferences.c:160
-#, fuzzy
+#: src/audacious/ui_preferences.c:157
 msgid "Replay Gain"
-msgstr "Режим Replay Gain"
+msgstr "Выравнивание громкости"
 
-#: src/audacious/ui_preferences.c:161
+#: src/audacious/ui_preferences.c:158
 msgid "Enable Replay Gain"
 msgstr "Включить Replay Gain"
 
-#: src/audacious/ui_preferences.c:164
+#: src/audacious/ui_preferences.c:161
 msgid "Prevent clipping (recommended)"
-msgstr ""
+msgstr "Предотвратить шипение/треск (рекомендуется)"
 
-#: src/audacious/ui_preferences.c:166
-#, fuzzy
+#: src/audacious/ui_preferences.c:163
 msgid "Adjust Levels"
-msgstr "Звуковая система"
+msgstr "Регулировка уровней"
 
-#: src/audacious/ui_preferences.c:167
+#: src/audacious/ui_preferences.c:164
 msgid "Amplify all files:"
-msgstr ""
+msgstr "Увеличить всем файлам:"
 
-#: src/audacious/ui_preferences.c:169 src/audacious/ui_preferences.c:172
+#: src/audacious/ui_preferences.c:166 src/audacious/ui_preferences.c:169
 msgid "dB"
 msgstr "дБ"
 
-#: src/audacious/ui_preferences.c:170
-#, fuzzy
+#: src/audacious/ui_preferences.c:167
 msgid "Amplify untagged files:"
-msgstr "- проиграть мультимедийные файлы"
+msgstr "Увеличить непомеченным файлам"
 
-#: src/audacious/ui_preferences.c:175
+#: src/audacious/ui_preferences.c:172
 msgid "Proxy hostname:"
 msgstr "Прокси сервер:"
 
-#: src/audacious/ui_preferences.c:176
+#: src/audacious/ui_preferences.c:173
 msgid "Proxy port:"
 msgstr "Порт прокси:"
 
-#: src/audacious/ui_preferences.c:179
+#: src/audacious/ui_preferences.c:176
 msgid "Proxy username:"
 msgstr "Имя пользователя прокси:"
 
-#: src/audacious/ui_preferences.c:180
+#: src/audacious/ui_preferences.c:177
 msgid "Proxy password:"
 msgstr "Пароль прокси:"
 
-#: src/audacious/ui_preferences.c:184
+#: src/audacious/ui_preferences.c:181
 msgid "Proxy Configuration"
 msgstr "Настройка прокси"
 
-#: src/audacious/ui_preferences.c:185
+#: src/audacious/ui_preferences.c:182
 msgid "Enable proxy usage"
 msgstr "Использовать прокси"
 
-#: src/audacious/ui_preferences.c:187
+#: src/audacious/ui_preferences.c:185
 msgid "Use authentication with proxy"
 msgstr "Использовать авторизацию через прокси"
 
-#: src/audacious/ui_preferences.c:189
-msgid ""
-"Changing these settings will require a restart of "
-"Audacious."
-msgstr ""
-"Изменение этих настроек потребует перезапуска Audacious."
-""
-
 #: src/audacious/ui_preferences.c:193
 msgid "Auto character encoding detector for:"
 msgstr "Язык для автоматического определения кодировки:"
 
-#: src/audacious/ui_preferences.c:201
+#: src/audacious/ui_preferences.c:198
 msgid "Fallback character encodings:"
 msgstr "Кодировка по умолчанию:"
 
-#: src/audacious/ui_preferences.c:201
-msgid ""
-"List of character encodings used for fall back conversion of metadata. If "
-"automatic character encoding detector failed or has been disabled, encodings "
-"in this list would be treated as candidates of the encoding of metadata, and "
-"fall back conversion from these encodings to UTF-8 would be attempted."
-msgstr ""
-"Список кодировок, используемых при отображении метаданных. Если "
-"автоматическое определение кодировки отключено или не сработает, то для "
-"преобразования метаданных в UTF-8 будут использованы кодировки из этого "
-"списка."
-
-#: src/audacious/ui_preferences.c:205
-#, fuzzy
+#: src/audacious/ui_preferences.c:202
 msgid "Behavior"
-msgstr "Разрядность"
+msgstr "Режим"
 
-#: src/audacious/ui_preferences.c:206
+#: src/audacious/ui_preferences.c:203
 msgid "Continue playback on startup"
 msgstr "Продолжать воспроизведение при запуске"
 
-#: src/audacious/ui_preferences.c:208
+#: src/audacious/ui_preferences.c:205
 msgid "Advance when the current song is deleted"
-msgstr ""
+msgstr "Продвигаться дальше если текущая песня удалена"
 
-#: src/audacious/ui_preferences.c:210
-#, fuzzy
+#: src/audacious/ui_preferences.c:207
 msgid "Clear the playlist when opening files"
-msgstr "Очистить текущий список воспроизведения при открытии новых файлов "
+msgstr "Очищать список если открывается новая песня"
 
-#: src/audacious/ui_preferences.c:212
-#, fuzzy
+#: src/audacious/ui_preferences.c:209
 msgid "Open files in a temporary playlist"
-msgstr "Добавить файлы во временный список воспроизведения"
+msgstr "Открывать файлы во временном списке"
 
-#: src/audacious/ui_preferences.c:214
+#: src/audacious/ui_preferences.c:211
 msgid "Metadata"
 msgstr "Мета-информация о дорожке"
 
-#: src/audacious/ui_preferences.c:454
+#: src/audacious/ui_preferences.c:212
+msgid "Do not load metadata for songs until played"
+msgstr "Не загружать метаданные песен до того как они начнут проигрываться"
+
+#: src/audacious/ui_preferences.c:230
+msgid "TITLE"
+msgstr "НАЗВАНИЕ"
+
+#: src/audacious/ui_preferences.c:231
+msgid "ARTIST - TITLE"
+msgstr "ИСПОЛНИТЕЛЬ - НАЗВАНИЕ"
+
+#: src/audacious/ui_preferences.c:232
+msgid "ARTIST - ALBUM - TITLE"
+msgstr "ИСПОЛНИТЕЛЬ - АЛЬБОМ - НАЗВАНИЕ"
+
+#: src/audacious/ui_preferences.c:233
+msgid "ARTIST - ALBUM - TRACK. TITLE"
+msgstr "ИСПОЛНИТЕЛЬ - АЛЬБОМ - ДОРОЖКА. НАЗВАНИЕ"
+
+#: src/audacious/ui_preferences.c:234
+msgid "ARTIST [ ALBUM ] - TRACK. TITLE"
+msgstr "ИСПОЛНИТЕЛЬ [ АЛЬБОМ ] - ДОРОЖКА. НАЗВАНИЕ"
+
+#: src/audacious/ui_preferences.c:235
+msgid "ALBUM - TITLE"
+msgstr "АЛЬБОМ - НАЗВАНИЕ"
+
+#: src/audacious/ui_preferences.c:556
 msgid "Category"
 msgstr "Категория"
 
-#: src/audacious/ui_preferences.c:682
+#: src/audacious/ui_preferences.c:780
 msgid "Popup Information Settings"
 msgstr "Настройка всплывающей информации"
 
-#: src/audacious/ui_preferences.c:691
+#: src/audacious/ui_preferences.c:789
 msgid "Cover image retrieve"
 msgstr "Поиск обложки альбома"
 
-#: src/audacious/ui_preferences.c:696
+#: src/audacious/ui_preferences.c:794
 msgid ""
 "While searching for the album's cover, Audacious looks for certain words in "
 "the filename. You can specify those words in the lists below, separated "
@@ -610,101 +615,77 @@
 "При поиске обложки альбома Audacious ищет определенные слова в именах "
 "файлов. Вы можете указать эти слова ниже, разделив их запятыми."
 
-#: src/audacious/ui_preferences.c:713
+#: src/audacious/ui_preferences.c:811
 msgid "Exclude:"
 msgstr "Исключая:"
 
-#: src/audacious/ui_preferences.c:720
+#: src/audacious/ui_preferences.c:818
 msgid "Include:"
 msgstr "Включая:"
 
-#: src/audacious/ui_preferences.c:737
+#: src/audacious/ui_preferences.c:835
 msgid "Recursively search for cover"
 msgstr "Искать обложку во вложенных каталогах"
 
-#: src/audacious/ui_preferences.c:747
+#: src/audacious/ui_preferences.c:845
 msgid "Search depth: "
 msgstr "Глубина поиска: "
 
-#: src/audacious/ui_preferences.c:761
+#: src/audacious/ui_preferences.c:859
 msgid "Use per-file cover"
 msgstr "Искать изображение для каждого файла"
 
-#: src/audacious/ui_preferences.c:764
+#: src/audacious/ui_preferences.c:862
 msgid "Miscellaneous"
 msgstr "Разное"
 
-#: src/audacious/ui_preferences.c:773
+#: src/audacious/ui_preferences.c:871
 msgid "Show Progress bar for the current track"
 msgstr "Показывать полосу завершения для проигрываемой дорожки"
 
-#: src/audacious/ui_preferences.c:783
+#: src/audacious/ui_preferences.c:881
 msgid "Delay until filepopup comes up: "
 msgstr "Задержка появления всплывающей информации: "
 
-#: src/audacious/ui_preferences.c:1283
+#: src/audacious/ui_preferences.c:1309
+msgid "Custom"
+msgstr "Собственные установки"
+
+#: src/audacious/ui_preferences.c:1352
 msgid "Song Display"
 msgstr "Отображение дорожек"
 
-#: src/audacious/ui_preferences.c:1292
+#: src/audacious/ui_preferences.c:1361
 msgid "Show song numbers"
 msgstr "Показать номер дорожки"
 
-#: src/audacious/ui_preferences.c:1303
+#: src/audacious/ui_preferences.c:1372
 msgid "Show leading zeroes (02:00 instead of 2:00)"
-msgstr ""
+msgstr "Отображать начало с нуля (02:00 вместо 2:00)"
 
-#: src/audacious/ui_preferences.c:1325
+#: src/audacious/ui_preferences.c:1394
 msgid "Show information about titlestring format"
 msgstr "Показать информацию о формате названия"
 
-#: src/audacious/ui_preferences.c:1339
-msgid "TITLE"
-msgstr "НАЗВАНИЕ"
-
-#: src/audacious/ui_preferences.c:1340
-msgid "ARTIST - TITLE"
-msgstr "ИСПОЛНИТЕЛЬ - НАЗВАНИЕ"
-
-#: src/audacious/ui_preferences.c:1341
-msgid "ARTIST - ALBUM - TITLE"
-msgstr "ИСПОЛНИТЕЛЬ - АЛЬБОМ - НАЗВАНИЕ"
-
-#: src/audacious/ui_preferences.c:1342
-msgid "ARTIST - ALBUM - TRACK. TITLE"
-msgstr "ИСПОЛНИТЕЛЬ - АЛЬБОМ - ДОРОЖКА. НАЗВАНИЕ"
-
-#: src/audacious/ui_preferences.c:1343
-msgid "ARTIST [ ALBUM ] - TRACK. TITLE"
-msgstr "ИСПОЛНИТЕЛЬ [ АЛЬБОМ ] - ДОРОЖКА. НАЗВАНИЕ"
-
-#: src/audacious/ui_preferences.c:1344
-msgid "ALBUM - TITLE"
-msgstr "АЛЬБОМ - НАЗВАНИЕ"
-
-#: src/audacious/ui_preferences.c:1345
-msgid "Custom"
-msgstr "Собственные установки"
-
-#: src/audacious/ui_preferences.c:1354
+#: src/audacious/ui_preferences.c:1410
 msgid "Custom string:"
 msgstr "Свой формат:"
 
-#: src/audacious/ui_preferences.c:1361
+#: src/audacious/ui_preferences.c:1417
 msgid "Title format:"
 msgstr "Формат названия:"
 
-#: src/audacious/ui_preferences.c:1372
+#: src/audacious/ui_preferences.c:1428
 msgid "Popup Information"
 msgstr "Всплывающее информационное окно"
 
-#: src/audacious/ui_preferences.c:1387
+#: src/audacious/ui_preferences.c:1443
 msgid "Show popup information for playlist entries"
 msgstr ""
 "Показывать всплывающее информационное окно для дорожек в списке "
 "воспроизведения"
 
-#: src/audacious/ui_preferences.c:1388
+#: src/audacious/ui_preferences.c:1444
 msgid ""
 "Toggles popup information window for the pointed entry in the playlist. The "
 "window shows title of song, name of album, genre, year of publish, track "
@@ -714,72 +695,85 @@
 "воспроизведения. Окно содержит название песни, название альбома, жанр, год, "
 "номер дорожки, длительность песни и обложку альбома."
 
-#: src/audacious/ui_preferences.c:1397
+#: src/audacious/ui_preferences.c:1455
 msgid "Edit settings for popup information"
 msgstr "Изменить настройки всплывающего информационного окна"
 
-#: src/audacious/ui_preferences.c:1497
-#, fuzzy
+#: src/audacious/ui_preferences.c:1544
 msgid "Output plugin:"
-msgstr "Текущий модуль вывода звука:"
+msgstr "Плагин вывода:"
 
-#: src/audacious/ui_preferences.c:1556
-#, fuzzy
+#: src/audacious/ui_preferences.c:1603
 msgid "Transport"
-msgstr "Переводчики"
+msgstr "Транспорт"
 
-#: src/audacious/ui_preferences.c:1556
+#: src/audacious/ui_preferences.c:1603
 msgid "Input"
-msgstr ""
+msgstr "Ввод"
 
-#: src/audacious/ui_preferences.c:1557
-#, fuzzy
+#: src/audacious/ui_preferences.c:1604
 msgid "Effect"
-msgstr "Эффекты"
+msgstr "Эффекты"
 
-#: src/audacious/ui_preferences.c:1557
-#, fuzzy
+#: src/audacious/ui_preferences.c:1604
 msgid "Visualization"
-msgstr "Визуализация"
+msgstr "Визуализация"
 
-#: src/audacious/ui_preferences.c:1557
+#: src/audacious/ui_preferences.c:1604
 msgid "General"
-msgstr ""
+msgstr "Общие"
 
-#: src/audacious/ui_preferences.c:1597
+#: src/audacious/ui_preferences.c:1644
 msgid "Audacious Preferences"
 msgstr "Параметры Audacious"
 
-#: src/audacious/util.c:155
+#: src/audacious/util.c:120
 #, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr "Невозможно создать каталог (%s): %s\n"
 
-#: src/audtool/handlers_playlist.c:264
+#: src/audtool/handlers_playlist.c:273
 msgid "Position not found."
 msgstr "Позиция не найдена."
 
-#: src/audtool/handlers_vitals.c:64
+#: src/audtool/handlers_vitals.c:63
 msgid "No song playing."
 msgstr "Ничего не проигрывается."
 
-#: src/libaudcore/tuple.c:685
+#: src/libaudcore/audstrings.c:199
+#, c-format
+msgid "Audio CD, track %s"
+msgstr "Аудио CD, трек %s"
+
+#: src/libaudcore/tuple.c:536
 msgid "Mono"
-msgstr ""
+msgstr "Моно"
 
-#: src/libaudcore/tuple.c:687
+#: src/libaudcore/tuple.c:538
 msgid "Stereo"
-msgstr ""
+msgstr "Стерео"
 
-#: src/libaudcore/tuple.c:689
+#: src/libaudcore/tuple.c:540
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d канал"
+msgstr[1] "%d каналов"
+msgstr[2] "%d каналы"
 
-#: src/libaudgui/confirm.c:73
+#: src/libaudgui/about.c:52 src/libaudgui/about.c:115
+msgid "Credits"
+msgstr "Авторы"
+
+#: src/libaudgui/about.c:52
+msgid "Translators"
+msgstr "Переводчики"
+
+#: src/libaudgui/about.c:91
+msgid "About Audacious"
+msgstr "Об Audacious"
+
+#: src/libaudgui/confirm.c:76
 #, c-format
 msgid ""
 "Are you sure you want to close %s? If you do, any changes made since the "
@@ -788,412 +782,396 @@
 "Вы уверены, что хотите закрыть %s? В этом случае все изменения с момента "
 "экспорта списка воспроизведения будут утеряны."
 
-#: src/libaudgui/confirm.c:86
+#: src/libaudgui/confirm.c:89
 msgid "_Don't show this message again"
 msgstr "Больше не показывать это предупреждение"
 
-#: src/libaudgui/confirm.c:124
-#, fuzzy
+#: src/libaudgui/confirm.c:126
 msgid "Rename Playlist"
-msgstr "Список воспроизведения"
+msgstr "Переименовать Список"
 
-#: src/libaudgui/effects-menu.c:76
+#: src/libaudgui/effects-menu.c:74
 msgid "settings ..."
 msgstr "настройки..."
 
-#: src/libaudgui/equalizer.c:68
+#: src/libaudgui/equalizer.c:51
 msgid "_Enable"
 msgstr "Включить"
 
-#: src/libaudgui/equalizer.c:140
+#: src/libaudgui/equalizer.c:123
 msgid "31 Hz"
 msgstr "31 Гц"
 
-#: src/libaudgui/equalizer.c:140
+#: src/libaudgui/equalizer.c:123
 msgid "63 Hz"
 msgstr "63 Гц"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "125 Hz"
 msgstr "125 Гц"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "250 Hz"
 msgstr "250 Гц"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "500 Hz"
 msgstr "500 Гц"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "1 kHz"
 msgstr "1 кГц"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "2 kHz"
 msgstr "2 кГц"
 
-#: src/libaudgui/equalizer.c:142
+#: src/libaudgui/equalizer.c:125
 msgid "4 kHz"
 msgstr "4 кГц"
 
-#: src/libaudgui/equalizer.c:142
+#: src/libaudgui/equalizer.c:125
 msgid "8 kHz"
 msgstr "8 кГц"
 
-#: src/libaudgui/equalizer.c:142
+#: src/libaudgui/equalizer.c:125
 msgid "16 kHz"
 msgstr "16 кГц"
 
-#: src/libaudgui/equalizer.c:147
+#: src/libaudgui/equalizer.c:130
 msgid "Equalizer"
 msgstr "Эквалайзер"
 
-#: src/libaudgui/equalizer.c:163
+#: src/libaudgui/equalizer.c:146
 msgid "Preamp"
 msgstr "Пред. усиление"
 
-#: src/libaudgui/infopopup.c:212
+#: src/libaudgui/infopopup.c:207
 msgid "Track Number"
 msgstr "Номер дорожки"
 
-#: src/libaudgui/infopopup.c:214
+#: src/libaudgui/infopopup.c:209
 msgid "Track Length"
 msgstr "Длительность"
 
-#: src/libaudgui/infowin.c:77
+#: src/libaudgui/infowin.c:75
 msgid "Acid Jazz"
 msgstr "Acid Jazz"
 
-#: src/libaudgui/infowin.c:78
-#, fuzzy
+#: src/libaudgui/infowin.c:76
 msgid "Acid Rock"
-msgstr "Hard Rock"
+msgstr "Эйсид-рок"
 
-#: src/libaudgui/infowin.c:79
+#: src/libaudgui/infowin.c:77
 msgid "Ambient"
 msgstr "Ambient"
 
-#: src/libaudgui/infowin.c:80
-#, fuzzy
+#: src/libaudgui/infowin.c:78
 msgid "Bebop"
-msgstr "Bebob"
+msgstr "Бибоп"
 
-#: src/libaudgui/infowin.c:81
+#: src/libaudgui/infowin.c:79
 msgid "Bluegrass"
 msgstr "Bluegrass"
 
-#: src/libaudgui/infowin.c:82
+#: src/libaudgui/infowin.c:80
 msgid "Blues"
 msgstr "Blues"
 
-#: src/libaudgui/infowin.c:83
+#: src/libaudgui/infowin.c:81
 msgid "Chamber Music"
 msgstr "Chamber Music"
 
-#: src/libaudgui/infowin.c:84
+#: src/libaudgui/infowin.c:82
 msgid "Classical"
 msgstr "Classical"
 
-#: src/libaudgui/infowin.c:85
+#: src/libaudgui/infowin.c:83
 msgid "Country"
 msgstr "Country"
 
-#: src/libaudgui/infowin.c:86
+#: src/libaudgui/infowin.c:84
 msgid "Death Metal"
 msgstr "Death Metal"
 
-#: src/libaudgui/infowin.c:87
+#: src/libaudgui/infowin.c:85
 msgid "Disco"
 msgstr "Disco"
 
-#: src/libaudgui/infowin.c:88
+#: src/libaudgui/infowin.c:86
 msgid "Easy Listening"
 msgstr "Easy Listening"
 
-#: src/libaudgui/infowin.c:89
+#: src/libaudgui/infowin.c:87
 msgid "Folk"
 msgstr "Folk"
 
-#: src/libaudgui/infowin.c:90
+#: src/libaudgui/infowin.c:88
 msgid "Funk"
 msgstr "Funk"
 
-#: src/libaudgui/infowin.c:91
+#: src/libaudgui/infowin.c:89
 msgid "Gangsta Rap"
 msgstr "Gangsta Rap"
 
-#: src/libaudgui/infowin.c:92
+#: src/libaudgui/infowin.c:90
 msgid "Gospel"
 msgstr "Gospel"
 
-#: src/libaudgui/infowin.c:93
+#: src/libaudgui/infowin.c:91
 msgid "Grunge"
 msgstr "Grunge"
 
-#: src/libaudgui/infowin.c:94
+#: src/libaudgui/infowin.c:92
 msgid "Hard Rock"
 msgstr "Hard Rock"
 
-#: src/libaudgui/infowin.c:95
+#: src/libaudgui/infowin.c:93
 msgid "Heavy Metal"
 msgstr "Heavy Metal"
 
-#: src/libaudgui/infowin.c:96
-#, fuzzy
+#: src/libaudgui/infowin.c:94
 msgid "Hip-hop"
-msgstr "Hip-Hop"
+msgstr "Хип-хоп"
 
-#: src/libaudgui/infowin.c:97
+#: src/libaudgui/infowin.c:95
 msgid "House"
 msgstr "House"
 
-#: src/libaudgui/infowin.c:98
+#: src/libaudgui/infowin.c:96
 msgid "Jazz"
 msgstr "Jazz"
 
-#: src/libaudgui/infowin.c:99
+#: src/libaudgui/infowin.c:97
 msgid "Jungle"
 msgstr "Jungle"
 
-#: src/libaudgui/infowin.c:100
+#: src/libaudgui/infowin.c:98
 msgid "Metal"
 msgstr "Metal"
 
-#: src/libaudgui/infowin.c:101
+#: src/libaudgui/infowin.c:99
 msgid "New Age"
 msgstr "New Age"
 
-#: src/libaudgui/infowin.c:102
+#: src/libaudgui/infowin.c:100
 msgid "New Wave"
 msgstr "New Wave"
 
-#: src/libaudgui/infowin.c:103
+#: src/libaudgui/infowin.c:101
 msgid "Noise"
 msgstr "Noise"
 
-#: src/libaudgui/infowin.c:104
+#: src/libaudgui/infowin.c:102
 msgid "Pop"
 msgstr "Pop"
 
-#: src/libaudgui/infowin.c:105
+#: src/libaudgui/infowin.c:103
 msgid "Punk Rock"
 msgstr "Punk Rock"
 
-#: src/libaudgui/infowin.c:106
+#: src/libaudgui/infowin.c:104
 msgid "Rap"
 msgstr "Rap"
 
-#: src/libaudgui/infowin.c:107
+#: src/libaudgui/infowin.c:105
 msgid "Reggae"
 msgstr "Reggae"
 
-#: src/libaudgui/infowin.c:108
+#: src/libaudgui/infowin.c:106
 msgid "Rock"
 msgstr "Rock"
 
-#: src/libaudgui/infowin.c:109
-#, fuzzy
+#: src/libaudgui/infowin.c:107
 msgid "Rock and Roll"
-msgstr "Rock & Roll"
+msgstr "Рок-н-ролл"
 
-#: src/libaudgui/infowin.c:110
+#: src/libaudgui/infowin.c:108
 msgid "Rhythm and Blues"
-msgstr ""
+msgstr "Ритм и Блюз"
 
-#: src/libaudgui/infowin.c:111
+#: src/libaudgui/infowin.c:109
 msgid "Ska"
 msgstr "Ska"
 
-#: src/libaudgui/infowin.c:112
+#: src/libaudgui/infowin.c:110
 msgid "Soul"
 msgstr "Soul"
 
-#: src/libaudgui/infowin.c:113
+#: src/libaudgui/infowin.c:111
 msgid "Swing"
 msgstr "Swing"
 
-#: src/libaudgui/infowin.c:114
+#: src/libaudgui/infowin.c:112
 msgid "Techno"
 msgstr "Techno"
 
-#: src/libaudgui/infowin.c:115
-#, fuzzy
+#: src/libaudgui/infowin.c:113
 msgid "Trip-hop"
-msgstr "Trip-Hop"
+msgstr "Трип-Хоп"
 
-#: src/libaudgui/infowin.c:175 src/libaudgui/infowin.c:361
-#: src/libaudgui/infowin.c:364 src/libaudgui/infowin.c:367
+#: src/libaudgui/infowin.c:177 src/libaudgui/infowin.c:363
+#: src/libaudgui/infowin.c:366 src/libaudgui/infowin.c:369
 msgid "n/a"
 msgstr "недоступно"
 
-#: src/libaudgui/infowin.c:265
+#: src/libaudgui/infowin.c:267
 msgid "Metadata updated successfully"
 msgstr "Метаданные успешно обновлены"
 
-#: src/libaudgui/infowin.c:270
+#: src/libaudgui/infowin.c:272
 msgid "Metadata updating failed"
 msgstr "Ошибка при обновлении метаданных"
 
-#: src/libaudgui/infowin.c:318
+#: src/libaudgui/infowin.c:320
 msgid "Track Information"
 msgstr "Информация о дорожке"
 
-#: src/libaudgui/infowin.c:350
+#: src/libaudgui/infowin.c:352
 msgid "Format:"
 msgstr "Формат:"
 
-#: src/libaudgui/infowin.c:354
+#: src/libaudgui/infowin.c:356
 msgid "Quality:"
 msgstr "Качество:"
 
-#: src/libaudgui/infowin.c:357
+#: src/libaudgui/infowin.c:359
 msgid "Bitrate:"
 msgstr "Битрейт:"
 
-#: src/libaudgui/infowin.c:387
+#: src/libaudgui/infowin.c:389
 msgid "Title"
 msgstr "Название"
 
-#: src/libaudgui/infowin.c:399
+#: src/libaudgui/infowin.c:401
 msgid "Artist"
 msgstr "Исполнитель"
 
-#: src/libaudgui/infowin.c:411
+#: src/libaudgui/infowin.c:413
 msgid "Album"
 msgstr "Альбом"
 
-#: src/libaudgui/infowin.c:423
+#: src/libaudgui/infowin.c:425
 msgid "Comment"
 msgstr "Комментарии"
 
-#: src/libaudgui/infowin.c:435
+#: src/libaudgui/infowin.c:437
 msgid "Genre"
 msgstr "Жанр"
 
-#: src/libaudgui/infowin.c:456
+#: src/libaudgui/infowin.c:458
 msgid "Year"
 msgstr "Год"
 
-#: src/libaudgui/infowin.c:467
+#: src/libaudgui/infowin.c:469
 msgid "Track Number"
 msgstr "Номер дорожки"
 
-#: src/libaudgui/infowin.c:549
+#: src/libaudgui/infowin.c:548
 #, c-format
 msgid "%d kb/s"
 msgstr "%d кб/с"
 
-#: src/libaudgui/infowin.c:579
+#: src/libaudgui/infowin.c:575
 #, c-format
 msgid "No info available for %s.\n"
 msgstr "Нет информации для %s.\n"
 
-#: src/libaudgui/jump-to-time.c:75
-#, fuzzy
+#: src/libaudgui/jump-to-time.c:72
 msgid "Jump to Time"
-msgstr "Перейти к дорожке"
+msgstr "Джамп ту тайм"
 
-#: src/libaudgui/jump-to-time.c:90
+#: src/libaudgui/jump-to-time.c:87
 msgid "mm:ss"
-msgstr ""
+msgstr "мин:сек"
 
-#: src/libaudgui/playlists.c:39
-#, fuzzy
+#: src/libaudgui/playlists.c:33
 msgid "Export Playlist"
-msgstr "Временный список воспроизведения"
+msgstr "Экспортировать Список"
 
-#: src/libaudgui/playlists.c:39
-#, fuzzy
+#: src/libaudgui/playlists.c:33
 msgid "Import Playlist"
-msgstr "Временный список воспроизведения"
+msgstr "Импортировать Список"
 
-#: src/libaudgui/playlists.c:71
+#: src/libaudgui/playlists.c:66
 #, c-format
 msgid "Overwrite %s?"
-msgstr ""
-
-#: src/libaudgui/ui_about.c:71
-msgid "About Audacious"
-msgstr "Об Audacious"
+msgstr "Перезаписать %s?"
 
-#: src/libaudgui/ui_about.c:93 src/libaudgui/ui_credits.c:122
-msgid "Credits"
-msgstr "Авторы"
+#: src/libaudgui/queue-manager.c:196
+msgid "Queue Manager"
+msgstr "Менеджер Очереди"
 
-#: src/libaudgui/ui_credits.c:126
-msgid "Translators"
-msgstr "Переводчики"
-
-#: src/libaudgui/ui_fileopener.c:108
+#: src/libaudgui/ui_fileopener.c:109
 msgid "Open Files"
 msgstr "Открыть файлы"
 
-#: src/libaudgui/ui_fileopener.c:108
+#: src/libaudgui/ui_fileopener.c:109
 msgid "Add Files"
 msgstr "Добавить файлы"
 
-#: src/libaudgui/ui_fileopener.c:110
+#: src/libaudgui/ui_fileopener.c:111
 msgid "Close dialog on Open"
 msgstr "Закрыть окно при открытии"
 
-#: src/libaudgui/ui_fileopener.c:110
+#: src/libaudgui/ui_fileopener.c:111
 msgid "Close dialog on Add"
 msgstr "Закрыть окно при добавлении"
 
-#: src/libaudgui/ui_jumptotrack.c:133
-msgid "Un_queue"
-msgstr "Убрать из очереди"
-
-#: src/libaudgui/ui_jumptotrack.c:135 src/libaudgui/ui_jumptotrack.c:512
+#: src/libaudgui/ui_jumptotrack.c:109 src/libaudgui/ui_jumptotrack.c:117
+#: src/libaudgui/ui_jumptotrack.c:326
 msgid "_Queue"
 msgstr "В очередь"
 
-#: src/libaudgui/ui_jumptotrack.c:399
-msgid "Jump to Track"
-msgstr "Перейти к дорожке"
+#: src/libaudgui/ui_jumptotrack.c:115
+msgid "Un_queue"
+msgstr "Убрать из очереди"
 
-#: src/libaudgui/ui_jumptotrack.c:442
+#: src/libaudgui/ui_jumptotrack.c:258
+msgid "Jump to Song"
+msgstr "Прыжок к Песне"
+
+#: src/libaudgui/ui_jumptotrack.c:281
 msgid "Filter: "
 msgstr "Фильтр: "
 
-#: src/libaudgui/ui_jumptotrack.c:443
+#: src/libaudgui/ui_jumptotrack.c:282
 msgid "_Filter:"
 msgstr "Фильтр:"
 
-#: src/libaudgui/ui_jumptotrack.c:461
+#: src/libaudgui/ui_jumptotrack.c:292
 msgid "Remember"
 msgstr "Запомнить"
 
-#: src/libaudgui/ui_jumptotrack.c:470
+#: src/libaudgui/ui_jumptotrack.c:299
 msgid "Clea_r"
 msgstr "Очистить"
 
-#: src/libaudgui/ui_jumptotrack.c:504
+#: src/libaudgui/ui_jumptotrack.c:319
 msgid "Close on Jump"
 msgstr "Закрыть после перехода"
 
-#: src/libaudgui/ui_playlist_manager.c:240
+#: src/libaudgui/ui_playlist_manager.c:253
 msgid "Playlist Manager"
 msgstr "Менеджер списков"
 
-#: src/libaudgui/ui_playlist_manager.c:264
+#: src/libaudgui/ui_playlist_manager.c:280
 msgid "Entries"
 msgstr "Элементов"
 
-#: src/libaudgui/ui_playlist_manager.c:285
+#: src/libaudgui/ui_playlist_manager.c:301
 msgid "_Rename"
 msgstr "Переименовать"
 
-#: src/libaudgui/ui_playlist_manager.c:309
+#: src/libaudgui/ui_playlist_manager.c:325
 msgid "_Close dialog on activating playlist"
 msgstr "Закрыть окно при выборе списка"
 
-#: src/libaudgui/ui_urlopener.c:58
+#: src/libaudgui/ui_urlopener.c:48
 msgid "Open URL"
 msgstr "Открыть адрес"
 
-#: src/libaudgui/ui_urlopener.c:58
+#: src/libaudgui/ui_urlopener.c:48
 msgid "Add URL"
 msgstr "Добавить адрес"
 
@@ -1202,37 +1180,40 @@
 "\n"
 "(Further messages have been hidden.)"
 msgstr ""
+"\n"
+"(Дальнейшие сообщения были скрыты.)"
 
 #: src/libeggsmclient/eggdesktopfile.c:165
 msgid "File is not a valid .desktop file"
 msgstr "Этот файл не является корректным файлом .desktop"
 
-#: src/libeggsmclient/eggdesktopfile.c:188
+#: src/libeggsmclient/eggdesktopfile.c:191
 #, c-format
 msgid "Unrecognized desktop file Version '%s'"
 msgstr "Данный .desktop файл имеет неизвестную версию '%s'"
 
-#: src/libeggsmclient/eggdesktopfile.c:967
+#: src/libeggsmclient/eggdesktopfile.c:974
 #, c-format
 msgid "Starting %s"
 msgstr "Запускается %s"
 
-#: src/libeggsmclient/eggdesktopfile.c:1108
+#: src/libeggsmclient/eggdesktopfile.c:1116
 msgid "Application does not accept documents on command line"
-msgstr "Приложение не поддерживает указание имени документа в командной строке"
+msgstr ""
+"Приложение не поддерживает указание имени документа в командной строке"
 
-#: src/libeggsmclient/eggdesktopfile.c:1176
+#: src/libeggsmclient/eggdesktopfile.c:1184
 #, c-format
 msgid "Unrecognized launch option: %d"
 msgstr "Неизвестный параметр: %d"
 
-#: src/libeggsmclient/eggdesktopfile.c:1375
+#: src/libeggsmclient/eggdesktopfile.c:1391
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
 msgstr ""
-"Невозможно передать URI документа при использовании записи 'Type=Link' в ."
-"desktop файле."
+"Невозможно передать URI документа при использовании записи 'Type=Link' в "
+".desktop файле."
 
-#: src/libeggsmclient/eggdesktopfile.c:1396
+#: src/libeggsmclient/eggdesktopfile.c:1412
 msgid "Not a launchable item"
 msgstr "Этот элемент нельзя запустить"
 
@@ -1257,588 +1238,11 @@
 msgstr "ID"
 
 #: src/libeggsmclient/eggsmclient.c:253
-#, fuzzy
 msgid "Session management options:"
-msgstr "Параметры управления сессиями"
+msgstr "Управление опциями сессий:"
 
 #: src/libeggsmclient/eggsmclient.c:254
-#, fuzzy
 msgid "Show session management options"
-msgstr "Показать параметры управления сессиями"
-
-#~ msgid "Replay Gain"
-#~ msgstr "Replay Gain"
-
-#~ msgid "Bit Depth"
-#~ msgstr "Разрядность"
-
-#~ msgid ""
-#~ "All streams will be converted to this bit depth.\n"
-#~ "This should be the max supported bit depth of\n"
-#~ "the sound card or output plugin."
-#~ msgstr ""
-#~ "Все потоки будут преобразованы к этой разрядности,\n"
-#~ "которая должна быть максимальной поддерживаемой\n"
-#~ "разрядностью звуковой карты или выходного модуля."
-
-#~ msgid "Volume Control"
-#~ msgstr "Регулировка громкости"
-
-#~ msgid ""
-#~ "Use software volume control. This may be useful for situations where your "
-#~ "audio system does not support controlling the playback volume."
-#~ msgstr ""
-#~ "Использовать программное управление громкостью. Это может быть полезно, "
-#~ "если ваша звуковая система не поддерживает управление громкостью."
-
-#, fuzzy
-#~ msgid "Mode"
-#~ msgstr "Мета-информация о дорожке"
-
-#, fuzzy
-#~ msgid "Clipping Prevention"
-#~ msgstr "Всплывающее информационное окно"
-
-#, fuzzy
-#~ msgid "Enable clipping prevention"
-#~ msgstr "Использовать пиковое значение для предотвращения срезания"
-
-#~ msgid "Audio System"
-#~ msgstr "Звуковая система"
-
-#~ msgid "Display all open Audacious windows"
-#~ msgstr "Показать все открытые окна Audacious"
-
-#~ msgid "%s: Unable to open display, exiting.\n"
-#~ msgstr "%s: Невозможно открыть экран, выход.\n"
-
-#~ msgid "Preamp:"
-#~ msgstr "Предварительное усиление:"
-
-#~ msgid "Default gain:"
-#~ msgstr "Усиление по умолчанию:"
-
-#~ msgid "This gain will be used if file doesn't contain Replay Gain metadata."
-#~ msgstr ""
-#~ "Это значение будет использовано в случае, если дорожка\n"
-#~ "не содержит данных Replay Gain."
-
-#~ msgid ""
-#~ "Please remember that the most efficient way to "
-#~ "prevent signal clipping is not to use positive values above."
-#~ msgstr ""
-#~ "Помните, что наиболее эффективный способ избежать "
-#~ "срезания, ― не использовать положительные значения."
-
-#~ msgid "Replay Gain configuration"
-#~ msgstr "Параметры Replay Gain"
-
-#~ msgid "Track gain/peak"
-#~ msgstr "Усиление и пиковое значение дорожки"
-
-#~ msgid "Album gain/peak"
-#~ msgstr "Усиление и пиковое значение альбома"
-
-#~ msgid "Use peak value from Replay Gain info for clipping prevention"
-#~ msgstr ""
-#~ "Использовать значение пика из метаданных Replay Gain для предотвращения "
-#~ "срезания"
-
-#~ msgid "Classic Rock"
-#~ msgstr "Classic Rock"
-
-#~ msgid "Dance"
-#~ msgstr "Dance"
-
-#~ msgid "Oldies"
-#~ msgstr "Oldies"
-
-#~ msgid "Other"
-#~ msgstr "Other"
-
-#~ msgid "R&B"
-#~ msgstr "R&B"
-
-#~ msgid "Industrial"
-#~ msgstr "Industrial"
-
-#~ msgid "Alternative"
-#~ msgstr "Alternative"
-
-#~ msgid "Pranks"
-#~ msgstr "Pranks"
-
-#~ msgid "Soundtrack"
-#~ msgstr "Soundtrack"
-
-#~ msgid "Euro-Techno"
-#~ msgstr "Euro-Techno"
-
-#~ msgid "Vocal"
-#~ msgstr "Vocal"
-
-#~ msgid "Jazz+Funk"
-#~ msgstr "Jazz+Funk"
-
-#~ msgid "Fusion"
-#~ msgstr "Fusion"
-
-#~ msgid "Trance"
-#~ msgstr "Trance"
-
-#~ msgid "Instrumental"
-#~ msgstr "Instrumental"
-
-#~ msgid "Acid"
-#~ msgstr "Acid"
-
-#~ msgid "Game"
-#~ msgstr "Game"
-
-#~ msgid "Sound Clip"
-#~ msgstr "Sound Clip"
-
-#~ msgid "AlternRock"
-#~ msgstr "AlternRock"
-
-#~ msgid "Bass"
-#~ msgstr "Bass"
-
-#~ msgid "Punk"
-#~ msgstr "Punk"
-
-#~ msgid "Space"
-#~ msgstr "Space"
-
-#~ msgid "Meditative"
-#~ msgstr "Meditative"
-
-#~ msgid "Instrumental Pop"
-#~ msgstr "Instrumental Pop"
-
-#~ msgid "Instrumental Rock"
-#~ msgstr "Instrumental Rock"
-
-#~ msgid "Ethnic"
-#~ msgstr "Ethnic"
-
-#~ msgid "Gothic"
-#~ msgstr "Gothic"
-
-#~ msgid "Darkwave"
-#~ msgstr "Darkwave"
-
-#~ msgid "Techno-Industrial"
-#~ msgstr "Techno-Industrial"
-
-#~ msgid "Electronic"
-#~ msgstr "Electronic"
-
-#~ msgid "Pop-Folk"
-#~ msgstr "Pop-Folk"
-
-#~ msgid "Eurodance"
-#~ msgstr "Eurodance"
-
-#~ msgid "Dream"
-#~ msgstr "Dream"
-
-#~ msgid "Southern Rock"
-#~ msgstr "Southern Rock"
-
-#~ msgid "Comedy"
-#~ msgstr "Comedy"
-
-#~ msgid "Cult"
-#~ msgstr "Cult"
-
-#~ msgid "Top 40"
-#~ msgstr "Top 40"
-
-#~ msgid "Christian Rap"
-#~ msgstr "Christian Rap"
-
-#~ msgid "Pop/Funk"
-#~ msgstr "Pop/Funk"
-
-#~ msgid "Native American"
-#~ msgstr "Native American"
-
-#~ msgid "Cabaret"
-#~ msgstr "Cabaret"
-
-#~ msgid "Psychedelic"
-#~ msgstr "Psychedelic"
-
-#~ msgid "Rave"
-#~ msgstr "Rave"
-
-#~ msgid "Showtunes"
-#~ msgstr "Showtunes"
-
-#~ msgid "Trailer"
-#~ msgstr "Trailer"
-
-#~ msgid "Lo-Fi"
-#~ msgstr "Lo-Fi"
-
-#~ msgid "Tribal"
-#~ msgstr "Tribal"
-
-#~ msgid "Acid Punk"
-#~ msgstr "Acid Punk"
-
-#~ msgid "Polka"
-#~ msgstr "Polka"
-
-#~ msgid "Retro"
-#~ msgstr "Retro"
-
-#~ msgid "Musical"
-#~ msgstr "Musical"
-
-#~ msgid "Folk/Rock"
-#~ msgstr "Folk/Rock"
-
-#~ msgid "National Folk"
-#~ msgstr "National Folk"
-
-#~ msgid "Fast-Fusion"
-#~ msgstr "Fast-Fusion"
-
-#~ msgid "Latin"
-#~ msgstr "Latin"
-
-#~ msgid "Revival"
-#~ msgstr "Revival"
-
-#~ msgid "Celtic"
-#~ msgstr "Celtic"
-
-#~ msgid "Avantgarde"
-#~ msgstr "Avantgarde"
-
-#~ msgid "Gothic Rock"
-#~ msgstr "Gothic Rock"
-
-#~ msgid "Progressive Rock"
-#~ msgstr "Progressive Rock"
-
-#~ msgid "Psychedelic Rock"
-#~ msgstr "Psychedelic Rock"
-
-#~ msgid "Symphonic Rock"
-#~ msgstr "Symphonic Rock"
-
-#~ msgid "Slow Rock"
-#~ msgstr "Slow Rock"
-
-#~ msgid "Big Band"
-#~ msgstr "Big Band"
-
-#~ msgid "Chorus"
-#~ msgstr "Chorus"
-
-#~ msgid "Acoustic"
-#~ msgstr "Acoustic"
-
-#~ msgid "Humour"
-#~ msgstr "Humour"
-
-#~ msgid "Speech"
-#~ msgstr "Speech"
-
-#~ msgid "Chanson"
-#~ msgstr "Chanson"
-
-#~ msgid "Opera"
-#~ msgstr "Opera"
-
-#~ msgid "Sonata"
-#~ msgstr "Sonata"
-
-#~ msgid "Symphony"
-#~ msgstr "Symphony"
-
-#~ msgid "Booty Bass"
-#~ msgstr "Booty Bass"
-
-#~ msgid "Primus"
-#~ msgstr "Primus"
-
-#~ msgid "Porn Groove"
-#~ msgstr "Porn Groove"
-
-#~ msgid "Satire"
-#~ msgstr "Satire"
-
-#~ msgid "Slow Jam"
-#~ msgstr "Slow Jam"
-
-#~ msgid "Club"
-#~ msgstr "Club"
-
-#~ msgid "Tango"
-#~ msgstr "Tango"
-
-#~ msgid "Samba"
-#~ msgstr "Samba"
-
-#~ msgid "Folklore"
-#~ msgstr "Folklore"
-
-#~ msgid "Ballad"
-#~ msgstr "Ballad"
-
-#~ msgid "Power Ballad"
-#~ msgstr "Power Ballad"
-
-#~ msgid "Rhythmic Soul"
-#~ msgstr "Rhythmic Soul"
-
-#~ msgid "Freestyle"
-#~ msgstr "Freestyle"
-
-#~ msgid "Duet"
-#~ msgstr "Duet"
-
-#~ msgid "Drum Solo"
-#~ msgstr "Drum Solo"
-
-#~ msgid "A Cappella"
-#~ msgstr "A Cappella"
-
-#~ msgid "Euro-House"
-#~ msgstr "Euro-House"
-
-#~ msgid "Dance Hall"
-#~ msgstr "Dance Hall"
-
-#~ msgid "Goa"
-#~ msgstr "Goa"
-
-#~ msgid "Drum & Bass"
-#~ msgstr "Drum & Bass"
-
-#~ msgid "Club-House"
-#~ msgstr "Club-House"
-
-#~ msgid "Hardcore"
-#~ msgstr "Hardcore"
-
-#~ msgid "Terror"
-#~ msgstr "Terror"
-
-#~ msgid "Indie"
-#~ msgstr "Indie"
-
-#~ msgid "BritPop"
-#~ msgstr "BritPop"
-
-#~ msgid "Negerpunk"
-#~ msgstr "Negerpunk"
-
-#~ msgid "Polsk Punk"
-#~ msgstr "Polsk Punk"
-
-#~ msgid "Beat"
-#~ msgstr "Beat"
-
-#~ msgid "Christian Gangsta Rap"
-#~ msgstr "Christian Gangsta Rap"
-
-#~ msgid "Black Metal"
-#~ msgstr "Black Metal"
-
-#~ msgid "Crossover"
-#~ msgstr "Crossover"
-
-#~ msgid "Contemporary Christian"
-#~ msgstr "Contemporary Christian"
-
-#~ msgid "Christian Rock"
-#~ msgstr "Christian Rock"
-
-#~ msgid "Merengue"
-#~ msgstr "Merengue"
-
-#~ msgid "Salsa"
-#~ msgstr "Salsa"
-
-#~ msgid "Thrash Metal"
-#~ msgstr "Thrash Metal"
-
-#~ msgid "Anime"
-#~ msgstr "Anime"
-
-#~ msgid "JPop"
-#~ msgstr "JPop"
-
-#~ msgid "Synthpop"
-#~ msgstr "Synthpop"
-
-#, fuzzy
-#~ msgid ""
-#~ "<big>Audacious %s</big>\n"
-#~ "An audio player for many platforms.\n"
-#~ "Copyright (C) 2005-2011 Audacious Development Team"
-#~ msgstr ""
-#~ "<big>Audacious %s</big>\n"
-#~ "Звуковой проигрыватель для различных платформ.\n"
-#~ "Copyright (C) 2005-2010 команда разработчиков Audacious"
-
-#~ msgid "Unable to create log file (%s)!\n"
-#~ msgstr "Невозможно создать файл журнала (%s)!\n"
-
-#~ msgid "Print all errors and warnings to stdout"
-#~ msgstr "Выводить все ошибки и предупреждения в стандартный вывод"
-
-#~ msgid "Used in macpacking"
-#~ msgstr "Для внутреннего использования под OS X"
-
-#~ msgid "Sorry, threads aren't supported on your platform.\n"
-#~ msgstr ""
-#~ "К сожалению, многопоточность не поддерживается на данной платформе.\n"
-
-#~ msgid "Module loading not supported! Plugins will not be loaded.\n"
-#~ msgstr "Загрузка модулей не поддерживается! Модули не будут использованы.\n"
-
-#~ msgid "Audacious - Unsupported Version Warning"
-#~ msgstr "Audacious - предупреждение о неподдерживаемой версии"
-
-#~ msgid "<big>Audacious2 is not ready yet!</big>"
-#~ msgstr "<big>Audacious2 всё ещё не готова!</big>"
-
-#~ msgid ""
-#~ "Please don't file bugs at this point unless they represent major "
-#~ "problems."
-#~ msgstr ""
-#~ "Пожалуйста, не уведомляйте пока что об ошибках, если они не являются "
-#~ "критическими."
-
-#~ msgid ""
-#~ "This is an alpha build of Audacious2. It is still fairly "
-#~ "incomplete and unpolished.\n"
-#~ "We suspect that most minor bugs reported during this time will be "
-#~ "resolved once more things\n"
-#~ "stablize. However, if there is a major bug, such as a crash on playing a "
-#~ "specific file, we\n"
-#~ "need to know about it.\n"
-#~ "\n"
-#~ "However, we ask you to be aware that dealing with trivial bugs is "
-#~ "distracting at this point,\n"
-#~ "and to please refrain from doing so. Thanks in advance!"
-#~ msgstr ""
-#~ "Это альфа версия Audacious2. Она пока ещё не закончена и не "
-#~ "отполирована.\n"
-#~ "Мы ожидаем, что многие мелкие ошибки, о которых было сообщено за это "
-#~ "время, будут устранены.\n"
-#~ "Однако, если есть серьёзная ошибка, такая, как аварийное завершение во "
-#~ "время воспроизведения конкретного файла, то мы\n"
-#~ " хотели бы знать об этом.\n"
-#~ "\n"
-#~ "Однако, мы просим вас воздержаться от уведомления о простых ошибках.\n"
-#~ "Заранее благодарим!"
-
-#~ msgid "Blogging about bugs in it is also not helpful."
-#~ msgstr "Описание ошибок в блогах также мало полезно."
-
-#~ msgid ""
-#~ "Likewise, we're developers. We don't read blogs on a regular basis. If "
-#~ "there is a major bug,\n"
-#~ "we ask you to bring it to our attention via our bugtracking instance at "
-#~ "http://jira.atheme.org/,\n"
-#~ "or via the forums that are on the website.\n"
-#~ "\n"
-#~ "This will help us find out more information about your concerns, which we "
-#~ "would likely\n"
-#~ "not know about otherwise."
-#~ msgstr ""
-#~ "Более того, мы ― разработчики. Мы не читаем блоги на регулярной основе. "
-#~ "Если обнаружена серьёзная ошибка,\n"
-#~ "мы просим вас представить её нашему вниманию через систему отслеживания "
-#~ "ошибок на сайте http://jira.atheme.org/,\n"
-#~ "или же через форум на этом сайте.\n"
-#~ "\n"
-#~ "Это поможет нам получить больше информации о ваших проблемах, о которых "
-#~ "мы, вероятно,\n"
-#~ "не узнаем иным способом."
-
-#~ msgid "Playback"
-#~ msgstr "Воспроизведение"
-
-#~ msgid "Playback"
-#~ msgstr "Воспроизведение"
-
-#~ msgid ""
-#~ "When Audacious starts, automatically begin playing from the point where "
-#~ "we stopped before."
-#~ msgstr ""
-#~ "После запуска Audacious, автоматически продолжать проигрывание с момента "
-#~ "остановки."
-
-#~ msgid "Don't advance in the playlist"
-#~ msgstr "Не продвигаться по списку воспроизведения"
-
-#~ msgid ""
-#~ "When finished playing a song, don't automatically advance to the next."
-#~ msgstr ""
-#~ "После завершения проигрывания дорожки не передвигаться автоматически на "
-#~ "следующую."
-
-#~ msgid "Enabled"
-#~ msgstr "Включён"
-
-#~ msgid "Description"
-#~ msgstr "Описание"
-
-#~ msgid "Output Plugin Preferences"
-#~ msgstr "Параметры модуля вывода звука"
-
-#~ msgid "Output Plugin Information"
-#~ msgstr "Информация о модуле вывода звука"
-
-#~ msgid "_Decoder list:"
-#~ msgstr "Список модулей декодеров:"
-
-#~ msgid "Decoders"
-#~ msgstr "Декодеры"
-
-#~ msgid "_General plugin list:"
-#~ msgstr "Список модулей общего назначения:"
-
-#~ msgid "General"
-#~ msgstr "Общие"
-
-#~ msgid "_Visualization plugin list:"
-#~ msgstr "Список модулей визуализации:"
-
-#~ msgid "Effect plugins:"
-#~ msgstr "Список модулей эффектов:"
-
-#~ msgid "General"
-#~ msgstr "Основное"
-
-#~ msgid "Location"
-#~ msgstr "Расположение"
-
-#~ msgid "Raw Metadata"
-#~ msgstr "Метаданные"
-
-#~ msgid "Key"
-#~ msgstr "Ключ"
-
-#~ msgid "Value"
-#~ msgstr "Значение"
-
-#~ msgid "170 Hz"
-#~ msgstr "170 Гц"
-
-#~ msgid "310 Hz"
-#~ msgstr "310 Гц"
+msgstr "Показать опции управления сессиями"
 
-#~ msgid "3 kHz"
-#~ msgstr "3 кГц"
 
-#~ msgid "6 kHz"
-#~ msgstr "6 кГц"

audacious-3.1.1.tar.bz2/po/sk.po -> audacious-3.2.4.tar.bz2/po/sk.po Changed

@@ -1,1177 +1,1158 @@
-# translation of sk.po to Slovak
 # Slovak translation for Audacious
-# Copyright (C) 2007, 2009, 2010, 2011 Andrej Herceg <herceg.andrej@zoznam.sk>
+# Copyright (C) Audacious translators
 # This file is distributed under the same license as the Audacious package.
 #
-#
+# Translators:
 # Andrej Herceg <herceg.andrej@zoznam.sk>, 2007, 2009, 2010, 2011.
+# Tomáš Vadina <kyberdev@gmail.com>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: sk\n"
-"Report-Msgid-Bugs-To: http://jira.atheme.org/\n"
-"POT-Creation-Date: 2011-07-05 22:45+0200\n"
-"PO-Revision-Date: 2011-03-13 20:31+0100\n"
-"Last-Translator: Andrej Herceg <herceg.andrej@zoznam.sk>\n"
-"Language-Team: Slovak <Slovak <sk-i18n@lists.linux.sk>>\n"
-"Language: sk\n"
+"Project-Id-Version: Audacious\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2012-01-11 08:54-0500\n"
+"PO-Revision-Date: 2012-02-13 14:42+0000\n"
+"Last-Translator: Tomáš Vadina <kyberdev@gmail.com>\n"
+"Language-Team: Slovak\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"
-"X-Generator: KBabel 1.11.4\n"
+"Language: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
-#: src/audacious/adder.c:71
+#: src/audacious/adder.c:77
 msgid "Searching ..."
 msgstr "Vyhľadáva sa …"
 
-#: src/audacious/adder.c:99
+#: src/audacious/adder.c:113
 #, c-format
 msgid "%d file found"
 msgid_plural "%d files found"
-msgstr[0] "Nájdený jeden súbor"
-msgstr[1] "Nájdené %d súbory"
-msgstr[2] "Nájdených %d súborov"
+msgstr[0] "Nájdených %d súborov"
+msgstr[1] "Nájdený %d súbor"
+msgstr[2] "Nájdené %d súbory"
 
-#: src/audacious/chardet.c:37
+#: src/audacious/chardet.c:39
 msgid " (invalid UTF-8)"
 msgstr " (neplatné UTF-8)"
 
-#: src/audacious/credits.c:35
+#: src/audacious/credits.c:37
 msgid "Core developers:"
 msgstr "Hlavní vývojári:"
 
-#: src/audacious/credits.c:49
+#: src/audacious/credits.c:51
 msgid "Graphics:"
 msgstr "Grafika:"
 
-#: src/audacious/credits.c:54
+#: src/audacious/credits.c:56
 msgid "Default skin:"
 msgstr "Štandardný vzhľad:"
 
-#: src/audacious/credits.c:60
+#: src/audacious/credits.c:62
 msgid "Plugin development:"
 msgstr "Vývoj zásuvných modulov:"
 
-#: src/audacious/credits.c:83
+#: src/audacious/credits.c:85
 msgid "Patch authors:"
 msgstr "Autori záplat:"
 
-#: src/audacious/credits.c:126
+#: src/audacious/credits.c:131
 msgid "1.x developers:"
 msgstr "Vývojári verzie 1.x:"
 
-#: src/audacious/credits.c:148
+#: src/audacious/credits.c:153
 msgid "BMP Developers:"
 msgstr "Vývojári BMP:"
 
-#: src/audacious/credits.c:180
+#: src/audacious/credits.c:185
 msgid "Belarusian:"
 msgstr "Bieloruština:"
 
-#: src/audacious/credits.c:183
+#: src/audacious/credits.c:188
 msgid "Basque:"
 msgstr "Baskičtina:"
 
-#: src/audacious/credits.c:186
+#: src/audacious/credits.c:191
 msgid "Brazilian Portuguese:"
 msgstr "Brazílska portugalčina:"
 
-#: src/audacious/credits.c:190
+#: src/audacious/credits.c:196
 msgid "Breton:"
 msgstr "Bretónčina:"
 
-#: src/audacious/credits.c:193
+#: src/audacious/credits.c:199
 msgid "Bulgarian:"
 msgstr "Bulharčina:"
 
-#: src/audacious/credits.c:196
+#: src/audacious/credits.c:202
 msgid "Catalan:"
 msgstr "Katalánčina:"
 
-#: src/audacious/credits.c:199
+#: src/audacious/credits.c:206
 msgid "Chinese:"
 msgstr "Čínština:"
 
-#: src/audacious/credits.c:202
+#: src/audacious/credits.c:209
 msgid "Croatian:"
 msgstr "Chorvátčina:"
 
-#: src/audacious/credits.c:205
+#: src/audacious/credits.c:212
 msgid "Czech:"
 msgstr "Čeština:"
 
-#: src/audacious/credits.c:208
+#: src/audacious/credits.c:215
 msgid "Dutch:"
 msgstr "Holandčina:"
 
-#: src/audacious/credits.c:212
+#: src/audacious/credits.c:219
 msgid "Estonian:"
 msgstr "Estónčina:"
 
-#: src/audacious/credits.c:215
+#: src/audacious/credits.c:222
 msgid "Finnish:"
 msgstr "Fínčina:"
 
-#: src/audacious/credits.c:220
+#: src/audacious/credits.c:227
 msgid "French:"
 msgstr "Francúzščina:"
 
-#: src/audacious/credits.c:226
+#: src/audacious/credits.c:233
 msgid "German:"
 msgstr "Nemčina:"
 
-#: src/audacious/credits.c:233
+#: src/audacious/credits.c:240
 msgid "Georgian:"
 msgstr "Gruzínčina:"
 
-#: src/audacious/credits.c:236
+#: src/audacious/credits.c:243
 msgid "Greek:"
 msgstr "Gréčtina:"
 
-#: src/audacious/credits.c:241
+#: src/audacious/credits.c:248
 msgid "Hindi:"
 msgstr "Hindčina:"
 
-#: src/audacious/credits.c:244
+#: src/audacious/credits.c:251
 msgid "Hungarian:"
 msgstr "Maďarčina:"
 
-#: src/audacious/credits.c:248
+#: src/audacious/credits.c:255
 msgid "Italian:"
 msgstr "Taliančina:"
 
-#: src/audacious/credits.c:252
+#: src/audacious/credits.c:260
 msgid "Japanese:"
 msgstr "Japončina:"
 
-#: src/audacious/credits.c:255
+#: src/audacious/credits.c:263
 msgid "Korean:"
 msgstr "Kórejčina:"
 
-#: src/audacious/credits.c:258
+#: src/audacious/credits.c:266
 msgid "Latvian:"
 msgstr "Lotyština:"
 
-#: src/audacious/credits.c:261
+#: src/audacious/credits.c:269
 msgid "Lithuanian:"
 msgstr "Litovčina:"
 
-#: src/audacious/credits.c:265
+#: src/audacious/credits.c:274
 msgid "Macedonian:"
 msgstr "Macedónčina:"
 
-#: src/audacious/credits.c:268
+#: src/audacious/credits.c:277
+msgid "Mexican Spanish:"
+msgstr ""
+
+#: src/audacious/credits.c:280
 msgid "Polish:"
 msgstr "Poľština:"
 
-#: src/audacious/credits.c:274
+#: src/audacious/credits.c:287
 msgid "Portuguese:"
 msgstr "Portugalčina:"
 
-#: src/audacious/credits.c:277
+#: src/audacious/credits.c:290
 msgid "Romanian:"
 msgstr "Rumunčina:"
 
-#: src/audacious/credits.c:281
+#: src/audacious/credits.c:294
 msgid "Russian:"
 msgstr "Ruština:"
 
-#: src/audacious/credits.c:285
+#: src/audacious/credits.c:298
 msgid "Serbian (Latin):"
 msgstr "Srbščina (latinka):"
 
-#: src/audacious/credits.c:288
+#: src/audacious/credits.c:301
 msgid "Serbian (Cyrillic):"
 msgstr "Srbščina (cyrilika):"
 
-#: src/audacious/credits.c:291
+#: src/audacious/credits.c:305
 msgid "Simplified Chinese:"
 msgstr "Zjednodušená čínština:"
 
-#: src/audacious/credits.c:294
+#: src/audacious/credits.c:308
 msgid "Slovak:"
 msgstr "Slovenčina:"
 
-#: src/audacious/credits.c:297
+#: src/audacious/credits.c:312
 msgid "Spanish:"
 msgstr "Španielčina:"
 
-#: src/audacious/credits.c:304
+#: src/audacious/credits.c:320
 msgid "Swedish:"
 msgstr "Švédčina:"
 
-#: src/audacious/credits.c:307
+#: src/audacious/credits.c:323
 msgid "Traditional Chinese:"
 msgstr "Tradičná čínština:"
 
-#: src/audacious/credits.c:312
+#: src/audacious/credits.c:329
 msgid "Turkish:"
 msgstr "Turečtina:"
 
-#: src/audacious/credits.c:316
+#: src/audacious/credits.c:333
 msgid "Ukrainian:"
 msgstr "Ukrajinčina:"
 
-#: src/audacious/credits.c:319
+#: src/audacious/credits.c:338
+msgid "Vietnamese:"
+msgstr "Vietnamčina:"
+
+#: src/audacious/credits.c:341
 msgid "Welsh:"
 msgstr "Welsčina:"
 
-#: src/audacious/drct.c:256
-msgid "Temporary Playlist"
-msgstr "Dočasný zoznam skladieb"
-
-#: src/audacious/equalizer_preset.c:186
+#: src/audacious/equalizer_preset.c:180
 #, c-format
 msgid "Error importing Winamp EQF file '%s'"
 msgstr "Chyba pri importovaní WinAMP EQF súboru '%s'"
 
-#: src/audacious/main.c:256
+#: src/audacious/main.c:243
 msgid "Skip backwards in playlist"
 msgstr "Preskočí na predchádzajúcu skladbu"
 
-#: src/audacious/main.c:257
+#: src/audacious/main.c:244
 msgid "Start playing current playlist"
 msgstr "Začne prehrávať aktuálny zoznam skladieb"
 
-#: src/audacious/main.c:258
+#: src/audacious/main.c:245
 msgid "Pause current song"
 msgstr "Pozastaví prehrávanú skladbu"
 
-#: src/audacious/main.c:259
+#: src/audacious/main.c:246
 msgid "Stop current song"
 msgstr "Zastaví prehrávanú skladbu"
 
-#: src/audacious/main.c:260
+#: src/audacious/main.c:247
 msgid "Pause if playing, play otherwise"
 msgstr "Pri prehrávaní pozastaví, inak začne prehrávať"
 
-#: src/audacious/main.c:261
+#: src/audacious/main.c:248
 msgid "Skip forward in playlist"
 msgstr "Preskočí na nasledujúcu skladbu"
 
-#: src/audacious/main.c:262
+#: src/audacious/main.c:249
 msgid "Display Jump to File dialog"
 msgstr "Zobrazí okno \"Presun na súbor\""
 
-#: src/audacious/main.c:263
+#: src/audacious/main.c:250
 msgid "Add files to the playlist"
 msgstr "Pridá súbory do zoznamu skladieb"
 
-#: src/audacious/main.c:264
+#: src/audacious/main.c:251
 msgid "Add new files to a temporary playlist"
 msgstr "Pridá súbory do dočasného zoznamu skladieb"
 
-#: src/audacious/main.c:265
+#: src/audacious/main.c:252
 msgid "Display the main window"
 msgstr "Zobrazí hlavné okno"
 
-#: src/audacious/main.c:266
+#: src/audacious/main.c:253
 msgid "Show version"
 msgstr "Zobrazí verziu"
 
-#: src/audacious/main.c:267
+#: src/audacious/main.c:254
 msgid "Print debugging messages"
 msgstr "Vypisuje ladiace hlásenia"
 
-#: src/audacious/main.c:268
+#: src/audacious/main.c:255
+msgid "Headless mode (beta)"
+msgstr "Bezhlavý režim (beta)"
+
+#: src/audacious/main.c:256
 msgid "FILE..."
 msgstr "SÚBOR..."
 
-#: src/audacious/main.c:280
+#: src/audacious/main.c:268
 msgid "- play multimedia files"
 msgstr "- prehrať multimediálne súbory"
 
-#: src/audacious/main.c:290
+#: src/audacious/main.c:278
 #, c-format
 msgid ""
 "%s: %s\n"
 "Try `%s --help' for more information.\n"
-msgstr ""
-"%s: %s\n"
-"Ak chcete viac informácií vyskúšajte \"%s --help\".\n"
-
-#: src/audacious/main.c:407
-msgid ""
-"Audacious seems to be already running but is not responding. You can start "
-"another instance of the program, but please be warned that this can cause "
-"data loss. If Audacious is not running, you can safely ignore this "
-"message. Press OK to start Audacious or Cancel to quit."
-msgstr ""
+msgstr "%s: %s\nAk chcete viac informácií vyskúšajte \"%s --help\".\n"
 
-#: src/audacious/main.c:572
+#: src/audacious/main.c:573
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/audacious/playback.c:381
+#: src/audacious/playback.c:307
 #, c-format
 msgid "No decoder found for %s."
 msgstr "Pre %s nebol nájdený žiadny dekodér."
 
-#: src/audacious/playback.c:531
-msgid "Buffering ..."
-msgstr "Napĺňanie vyrovnávacej pamäte …"
+#: src/audacious/playlist-files.c:53
+#, c-format
+msgid "Cannot %s %s: unsupported file extension."
+msgstr "Nie je možné %s %s: nepodporovaný typ súboru."
+
+#: src/audacious/playlist-files.c:54
+msgid "save"
+msgstr "uložiť"
+
+#: src/audacious/playlist-files.c:54
+msgid "load"
+msgstr "načítať"
+
+#: src/audacious/playlist-new.c:131
+msgid "New Playlist"
+msgstr "Nový zoznam skladieb"
 
-#: src/audacious/playlist-new.c:303
-msgid "Untitled Playlist"
-msgstr "Nepomenovaný zoznam skladieb"
+#: src/audacious/playlist-new.c:132
+msgid "Now Playing"
+msgstr "Práve hrá"
 
-#: src/audacious/ui_preferences.c:87
+#: src/audacious/playlist-new.c:1630
+msgid ""
+"The playlist cannot be sorted because metadata scanning is still in progress"
+" (or has been disabled)."
+msgstr "Zoznam skladieb nie je možné triediť, pretože skenovanie metadát stále prebieha (alebo boli zakázané)."
+
+#: src/audacious/ui_preferences.c:85
 msgid "Audio"
 msgstr "Zvuk"
 
-#: src/audacious/ui_preferences.c:88
+#: src/audacious/ui_preferences.c:86
 msgid "Network"
 msgstr "Sieť"
 
-#: src/audacious/ui_preferences.c:89 src/audacious/ui_preferences.c:1556
+#: src/audacious/ui_preferences.c:87 src/audacious/ui_preferences.c:1603
 msgid "Playlist"
 msgstr "Zoznam skladieb"
 
-#: src/audacious/ui_preferences.c:90
+#: src/audacious/ui_preferences.c:88
 msgid "Plugins"
 msgstr "Moduly"
 
-#: src/audacious/ui_preferences.c:96 src/libaudgui/infopopup.c:204
+#: src/audacious/ui_preferences.c:94 src/libaudgui/infopopup.c:199
 msgid "Artist"
 msgstr "Umelec"
 
-#: src/audacious/ui_preferences.c:97 src/libaudgui/infopopup.c:206
+#: src/audacious/ui_preferences.c:95 src/libaudgui/infopopup.c:201
 msgid "Album"
 msgstr "Album"
 
-#: src/audacious/ui_preferences.c:98 src/libaudgui/infopopup.c:202
-#: src/libaudgui/ui_playlist_manager.c:263
+#: src/audacious/ui_preferences.c:96 src/libaudgui/infopopup.c:197
+#: src/libaudgui/ui_playlist_manager.c:279
 msgid "Title"
 msgstr "Názov"
 
-#: src/audacious/ui_preferences.c:99
+#: src/audacious/ui_preferences.c:97
 msgid "Tracknumber"
 msgstr "Číslo stopy"
 
-#: src/audacious/ui_preferences.c:100 src/libaudgui/infopopup.c:208
+#: src/audacious/ui_preferences.c:98 src/libaudgui/infopopup.c:203
 msgid "Genre"
 msgstr "Žáner"
 
-#: src/audacious/ui_preferences.c:101
+#: src/audacious/ui_preferences.c:99
 msgid "Filename"
 msgstr "Názov súboru"
 
-#: src/audacious/ui_preferences.c:102
+#: src/audacious/ui_preferences.c:100
 msgid "Filepath"
 msgstr "Cesta k súboru"
 
-#: src/audacious/ui_preferences.c:103
+#: src/audacious/ui_preferences.c:101
 msgid "Date"
 msgstr "Dátum"
 
-#: src/audacious/ui_preferences.c:104 src/libaudgui/infopopup.c:210
+#: src/audacious/ui_preferences.c:102 src/libaudgui/infopopup.c:205
 msgid "Year"
 msgstr "Rok"
 
-#: src/audacious/ui_preferences.c:105
+#: src/audacious/ui_preferences.c:103
 msgid "Comment"
 msgstr "Komentár"
 
-#: src/audacious/ui_preferences.c:106
+#: src/audacious/ui_preferences.c:104
 msgid "Codec"
 msgstr "Kodér"
 
-#: src/audacious/ui_preferences.c:107
+#: src/audacious/ui_preferences.c:105
 msgid "Quality"
 msgstr "Kvalita"
 
-#: src/audacious/ui_preferences.c:112
+#: src/audacious/ui_preferences.c:111
 msgid "None"
 msgstr "Žiadne"
 
+#: src/audacious/ui_preferences.c:112
+msgid "Arabic"
+msgstr "Arabština"
+
 #: src/audacious/ui_preferences.c:113
-msgid "Japanese"
-msgstr "Japončina"
+msgid "Baltic"
+msgstr "Baltské jazyky"
 
 #: src/audacious/ui_preferences.c:114
-msgid "Taiwanese"
-msgstr "Taiwančina"
-
-#: src/audacious/ui_preferences.c:115
 msgid "Chinese"
 msgstr "Čínština"
 
-#: src/audacious/ui_preferences.c:116
-msgid "Korean"
-msgstr "Kórejčina"
-
-#: src/audacious/ui_preferences.c:117
-msgid "Russian"
-msgstr "Ruština"
-
-#: src/audacious/ui_preferences.c:118
+#: src/audacious/ui_preferences.c:115
 msgid "Greek"
 msgstr "Gréčtina"
 
-#: src/audacious/ui_preferences.c:119
+#: src/audacious/ui_preferences.c:116
 msgid "Hebrew"
 msgstr "Hebrejčina"
 
-#: src/audacious/ui_preferences.c:120
-msgid "Turkish"
-msgstr "Turečtina"
+#: src/audacious/ui_preferences.c:117
+msgid "Japanese"
+msgstr "Japončina"
 
-#: src/audacious/ui_preferences.c:121
-msgid "Arabic"
-msgstr "Arabština"
+#: src/audacious/ui_preferences.c:118
+msgid "Korean"
+msgstr "Kórejčina"
 
-#: src/audacious/ui_preferences.c:122
+#: src/audacious/ui_preferences.c:119
 msgid "Polish"
 msgstr "Poľština"
 
-#: src/audacious/ui_preferences.c:123
-msgid "Baltic"
-msgstr "Baltské jazyky"
+#: src/audacious/ui_preferences.c:120
+msgid "Russian"
+msgstr "Ruština"
 
-#: src/audacious/ui_preferences.c:124
-msgid "Universal"
-msgstr "Univerzálne"
+#: src/audacious/ui_preferences.c:121
+msgid "Taiwanese"
+msgstr "Taiwančina"
 
-#: src/audacious/ui_preferences.c:146
-msgid "Single track mode"
-msgstr ""
+#: src/audacious/ui_preferences.c:122
+msgid "Turkish"
+msgstr "Turečtina"
 
-#: src/audacious/ui_preferences.c:147
-#, fuzzy
+#: src/audacious/ui_preferences.c:144
 msgid "Album mode"
-msgstr "Album"
+msgstr "Režim albumu"
 
-#: src/audacious/ui_preferences.c:150
+#: src/audacious/ui_preferences.c:147
 msgid "Output Settings"
-msgstr ""
+msgstr "Nastavenia výstupu"
 
-#: src/audacious/ui_preferences.c:152
-#, fuzzy
+#: src/audacious/ui_preferences.c:149
 msgid "Bit depth:"
-msgstr "Bitová hĺbka výstupu:"
+msgstr "Bitová hĺbka:"
 
-#: src/audacious/ui_preferences.c:155
+#: src/audacious/ui_preferences.c:152
 msgid "Buffer size:"
 msgstr "Veľkosť vyrovnávacej pamäte:"
 
-#: src/audacious/ui_preferences.c:157
+#: src/audacious/ui_preferences.c:154
 msgid "ms"
-msgstr ""
+msgstr "ms"
 
-#: src/audacious/ui_preferences.c:158
-#, fuzzy
+#: src/audacious/ui_preferences.c:155
 msgid "Use software volume control (not recommended)"
-msgstr "Použiť softvérové ovládanie hlasitosti"
+msgstr "Použiť softvérové ovládanie hlasitosti (neodporúča sa)"
 
-#: src/audacious/ui_preferences.c:160
-#, fuzzy
+#: src/audacious/ui_preferences.c:157
 msgid "Replay Gain"
-msgstr "Režim zosilnenia pri prehrávaní"
+msgstr "Zosilnenie pri prehrávaní"
 
-#: src/audacious/ui_preferences.c:161
+#: src/audacious/ui_preferences.c:158
 msgid "Enable Replay Gain"
 msgstr "Povoliť zosilnenie pri prehrávaní"
 
-#: src/audacious/ui_preferences.c:164
+#: src/audacious/ui_preferences.c:161
 msgid "Prevent clipping (recommended)"
-msgstr ""
+msgstr "Predchádzať orezávaniu (odporúča sa)"
 
-#: src/audacious/ui_preferences.c:166
-#, fuzzy
+#: src/audacious/ui_preferences.c:163
 msgid "Adjust Levels"
-msgstr "Zvukový systém"
+msgstr "Nastavenie úrovní"
 
-#: src/audacious/ui_preferences.c:167
+#: src/audacious/ui_preferences.c:164
 msgid "Amplify all files:"
-msgstr ""
+msgstr "Zosilniť všetky súbory:"
 
-#: src/audacious/ui_preferences.c:169 src/audacious/ui_preferences.c:172
+#: src/audacious/ui_preferences.c:166 src/audacious/ui_preferences.c:169
 msgid "dB"
 msgstr "dB"
 
-#: src/audacious/ui_preferences.c:170
-#, fuzzy
+#: src/audacious/ui_preferences.c:167
 msgid "Amplify untagged files:"
-msgstr "- prehrať multimediálne súbory"
+msgstr "Zosilniť súbory bez popisov:"
 
-#: src/audacious/ui_preferences.c:175
+#: src/audacious/ui_preferences.c:172
 msgid "Proxy hostname:"
 msgstr "Meno počítača:"
 
-#: src/audacious/ui_preferences.c:176
+#: src/audacious/ui_preferences.c:173
 msgid "Proxy port:"
 msgstr "Port:"
 
-#: src/audacious/ui_preferences.c:179
+#: src/audacious/ui_preferences.c:176
 msgid "Proxy username:"
 msgstr "Používateľ:"
 
-#: src/audacious/ui_preferences.c:180
+#: src/audacious/ui_preferences.c:177
 msgid "Proxy password:"
 msgstr "Heslo:"
 
-#: src/audacious/ui_preferences.c:184
+#: src/audacious/ui_preferences.c:181
 msgid "Proxy Configuration"
 msgstr "Nastavenie proxy"
 
-#: src/audacious/ui_preferences.c:185
+#: src/audacious/ui_preferences.c:182
 msgid "Enable proxy usage"
 msgstr "Používať proxy"
 
-#: src/audacious/ui_preferences.c:187
+#: src/audacious/ui_preferences.c:185
 msgid "Use authentication with proxy"
 msgstr "Používať autentifikáciu"
 
-#: src/audacious/ui_preferences.c:189
-msgid ""
-"Changing these settings will require a restart of "
-"Audacious."
-msgstr ""
-"Zmena týchto nastavení sa prejaví až po reštarte "
-"Audacious."
-
 #: src/audacious/ui_preferences.c:193
 msgid "Auto character encoding detector for:"
 msgstr "Automatické rozoznávanie kódovania znakov:"
 
-#: src/audacious/ui_preferences.c:201
+#: src/audacious/ui_preferences.c:198
 msgid "Fallback character encodings:"
 msgstr "Záložné kódovanie znakov:"
 
-#: src/audacious/ui_preferences.c:201
-msgid ""
-"List of character encodings used for fall back conversion of metadata. If "
-"automatic character encoding detector failed or has been disabled, encodings "
-"in this list would be treated as candidates of the encoding of metadata, and "
-"fall back conversion from these encodings to UTF-8 would be attempted."
-msgstr ""
-"Zoznam kódovaní znakov použitých pri konverzii metadát, ak je automatické "
-"rozpoznávanie zakázané alebo neuspeje. Kódovania z tohoto zoznamu budú "
-"použité na konverziu metadát do UTF-8."
-
-#: src/audacious/ui_preferences.c:205
+#: src/audacious/ui_preferences.c:202
 msgid "Behavior"
 msgstr "Správanie"
 
-#: src/audacious/ui_preferences.c:206
+#: src/audacious/ui_preferences.c:203
 msgid "Continue playback on startup"
 msgstr "Po spustení pokračovať v prehrávaní"
 
-#: src/audacious/ui_preferences.c:208
+#: src/audacious/ui_preferences.c:205
 msgid "Advance when the current song is deleted"
 msgstr "Prejsť na nasledujúcu skladbu ak je aktuálna skladba vymazaná"
 
-#: src/audacious/ui_preferences.c:210
+#: src/audacious/ui_preferences.c:207
 msgid "Clear the playlist when opening files"
 msgstr "Pri otvorení súborov vyprázdniť zoznam skladieb"
 
-#: src/audacious/ui_preferences.c:212
+#: src/audacious/ui_preferences.c:209
 msgid "Open files in a temporary playlist"
 msgstr "Otvoriť súbory do dočasného zoznamu skladieb"
 
-#: src/audacious/ui_preferences.c:214
+#: src/audacious/ui_preferences.c:211
 msgid "Metadata"
 msgstr "Metadáta"
 
-#: src/audacious/ui_preferences.c:454
+#: src/audacious/ui_preferences.c:212
+msgid "Do not load metadata for songs until played"
+msgstr "Nenačítať metadáta skladieb pred prehraním"
+
+#: src/audacious/ui_preferences.c:230
+msgid "TITLE"
+msgstr "NÁZOV"
+
+#: src/audacious/ui_preferences.c:231
+msgid "ARTIST - TITLE"
+msgstr "UMELEC - NÁZOV"
+
+#: src/audacious/ui_preferences.c:232
+msgid "ARTIST - ALBUM - TITLE"
+msgstr "UMELEC - ALBUM - NÁZOV"
+
+#: src/audacious/ui_preferences.c:233
+msgid "ARTIST - ALBUM - TRACK. TITLE"
+msgstr "UMELEC - ALBUM - STOPA. NÁZOV"
+
+#: src/audacious/ui_preferences.c:234
+msgid "ARTIST [ ALBUM ] - TRACK. TITLE"
+msgstr "UMELEC [ALBUM] - STOPA. NÁZOV"
+
+#: src/audacious/ui_preferences.c:235
+msgid "ALBUM - TITLE"
+msgstr "ALBUM - NÁZOV"
+
+#: src/audacious/ui_preferences.c:556
 msgid "Category"
 msgstr "Kategória"
 
-#: src/audacious/ui_preferences.c:682
+#: src/audacious/ui_preferences.c:780
 msgid "Popup Information Settings"
 msgstr "Nastavenie vyskakovacieho okna s informáciami"
 
-#: src/audacious/ui_preferences.c:691
+#: src/audacious/ui_preferences.c:789
 msgid "Cover image retrieve"
 msgstr "Získanie obrázku obalu"
 
-#: src/audacious/ui_preferences.c:696
+#: src/audacious/ui_preferences.c:794
 msgid ""
 "While searching for the album's cover, Audacious looks for certain words in "
 "the filename. You can specify those words in the lists below, separated "
 "using commas."
-msgstr ""
-"Pri hľadaní obalu albumu hľadá Audacious určité slová v názve súboru. Tieto "
-"slová môžete zadať, oddelené čiarkou, do nižšie uvedených zoznamov."
+msgstr "Pri hľadaní obalu albumu hľadá Audacious určité slová v názve súboru. Tieto slová môžete zadať, oddelené čiarkou, do nižšie uvedených zoznamov."
 
-#: src/audacious/ui_preferences.c:713
+#: src/audacious/ui_preferences.c:811
 msgid "Exclude:"
 msgstr "Vylúčiť:"
 
-#: src/audacious/ui_preferences.c:720
+#: src/audacious/ui_preferences.c:818
 msgid "Include:"
 msgstr "Zahrnúť:"
 
-#: src/audacious/ui_preferences.c:737
+#: src/audacious/ui_preferences.c:835
 msgid "Recursively search for cover"
 msgstr "Rekurzívne hľadanie obalu"
 
-#: src/audacious/ui_preferences.c:747
+#: src/audacious/ui_preferences.c:845
 msgid "Search depth: "
 msgstr "Hĺbka hľadania: "
 
-#: src/audacious/ui_preferences.c:761
+#: src/audacious/ui_preferences.c:859
 msgid "Use per-file cover"
 msgstr "Obrázok obalu pre každý súbor zvlášť"
 
-#: src/audacious/ui_preferences.c:764
+#: src/audacious/ui_preferences.c:862
 msgid "Miscellaneous"
 msgstr "Rôzne"
 
-#: src/audacious/ui_preferences.c:773
+#: src/audacious/ui_preferences.c:871
 msgid "Show Progress bar for the current track"
 msgstr "Zobraziť pruh priebehu pre pozíciu v prehrávanej skladbe"
 
-#: src/audacious/ui_preferences.c:783
+#: src/audacious/ui_preferences.c:881
 msgid "Delay until filepopup comes up: "
 msgstr "Oneskorenie zobrazenia vyskakovacieho okna: "
 
-#: src/audacious/ui_preferences.c:1283
+#: src/audacious/ui_preferences.c:1309
+msgid "Custom"
+msgstr "Vlastné"
+
+#: src/audacious/ui_preferences.c:1352
 msgid "Song Display"
 msgstr "Zobrazenie skladby"
 
-#: src/audacious/ui_preferences.c:1292
+#: src/audacious/ui_preferences.c:1361
 msgid "Show song numbers"
 msgstr "Zobraziť čísla skladieb"
 
-#: src/audacious/ui_preferences.c:1303
+#: src/audacious/ui_preferences.c:1372
 msgid "Show leading zeroes (02:00 instead of 2:00)"
 msgstr "Zobrazovať úvodné nuly (02:00 namiesto 2:00)"
 
-#: src/audacious/ui_preferences.c:1325
+#: src/audacious/ui_preferences.c:1394
 msgid "Show information about titlestring format"
 msgstr "Zobraziť informácie o formáte názvu"
 
-#: src/audacious/ui_preferences.c:1339
-msgid "TITLE"
-msgstr "NÁZOV"
-
-#: src/audacious/ui_preferences.c:1340
-msgid "ARTIST - TITLE"
-msgstr "UMELEC - NÁZOV"
-
-#: src/audacious/ui_preferences.c:1341
-msgid "ARTIST - ALBUM - TITLE"
-msgstr "UMELEC - ALBUM - NÁZOV"
-
-#: src/audacious/ui_preferences.c:1342
-msgid "ARTIST - ALBUM - TRACK. TITLE"
-msgstr "UMELEC - ALBUM - STOPA. NÁZOV"
-
-#: src/audacious/ui_preferences.c:1343
-msgid "ARTIST [ ALBUM ] - TRACK. TITLE"
-msgstr "UMELEC [ALBUM] - STOPA. NÁZOV"
-
-#: src/audacious/ui_preferences.c:1344
-msgid "ALBUM - TITLE"
-msgstr "ALBUM - NÁZOV"
-
-#: src/audacious/ui_preferences.c:1345
-msgid "Custom"
-msgstr "Vlastné"
-
-#: src/audacious/ui_preferences.c:1354
+#: src/audacious/ui_preferences.c:1410
 msgid "Custom string:"
 msgstr "Vlastný reťazec:"
 
-#: src/audacious/ui_preferences.c:1361
+#: src/audacious/ui_preferences.c:1417
 msgid "Title format:"
 msgstr "Formát názvu:"
 
-#: src/audacious/ui_preferences.c:1372
+#: src/audacious/ui_preferences.c:1428
 msgid "Popup Information"
 msgstr "Vyskakovacie okno s podrobnosťami"
 
-#: src/audacious/ui_preferences.c:1387
+#: src/audacious/ui_preferences.c:1443
 msgid "Show popup information for playlist entries"
 msgstr "Zobrazovať okno s informáciami pre položky v zozname skladieb"
 
-#: src/audacious/ui_preferences.c:1388
+#: src/audacious/ui_preferences.c:1444
 msgid ""
 "Toggles popup information window for the pointed entry in the playlist. The "
 "window shows title of song, name of album, genre, year of publish, track "
 "number, track length, and artwork."
-msgstr ""
-"Prepne zobrazovanie vyskakovacieho okna s podrobnosťami o vybranej položke v "
-"zozname skladieb. V okne sa zobrazí názov skladby, názov albumu, žáner, rok "
-"vydania, číslo stopy, dĺžka stopy a obal."
+msgstr "Prepne zobrazovanie vyskakovacieho okna s podrobnosťami o vybranej položke v zozname skladieb. V okne sa zobrazí názov skladby, názov albumu, žáner, rok vydania, číslo stopy, dĺžka stopy a obal."
 
-#: src/audacious/ui_preferences.c:1397
+#: src/audacious/ui_preferences.c:1455
 msgid "Edit settings for popup information"
 msgstr "Upraviť nastavenia pre vyskakovacie okno s informáciami"
 
-#: src/audacious/ui_preferences.c:1497
-#, fuzzy
+#: src/audacious/ui_preferences.c:1544
 msgid "Output plugin:"
-msgstr "Aktuálny výstupný modul:"
+msgstr "Výstupný modul:"
 
-#: src/audacious/ui_preferences.c:1556
+#: src/audacious/ui_preferences.c:1603
 msgid "Transport"
 msgstr "Prenos"
 
-#: src/audacious/ui_preferences.c:1556
+#: src/audacious/ui_preferences.c:1603
 msgid "Input"
 msgstr "Vstup"
 
-#: src/audacious/ui_preferences.c:1557
+#: src/audacious/ui_preferences.c:1604
 msgid "Effect"
 msgstr "Efekt"
 
-#: src/audacious/ui_preferences.c:1557
+#: src/audacious/ui_preferences.c:1604
 msgid "Visualization"
 msgstr "Vizualizácia"
 
-#: src/audacious/ui_preferences.c:1557
+#: src/audacious/ui_preferences.c:1604
 msgid "General"
 msgstr "Všeobecné"
 
-#: src/audacious/ui_preferences.c:1597
+#: src/audacious/ui_preferences.c:1644
 msgid "Audacious Preferences"
 msgstr "Nastavenia programu"
 
-#: src/audacious/util.c:155
+#: src/audacious/util.c:120
 #, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr "Nepodarilo sa vytvoriť adresár (%s): %s\n"
 
-#: src/audtool/handlers_playlist.c:264
+#: src/audtool/handlers_playlist.c:273
 msgid "Position not found."
 msgstr "Pozícia nenájdená."
 
-#: src/audtool/handlers_vitals.c:64
+#: src/audtool/handlers_vitals.c:63
 msgid "No song playing."
 msgstr "Nehrá žiadna skladba."
 
-#: src/libaudcore/tuple.c:685
+#: src/libaudcore/audstrings.c:199
+#, c-format
+msgid "Audio CD, track %s"
+msgstr "Zvukové CD, stopa %s"
+
+#: src/libaudcore/tuple.c:536
 msgid "Mono"
 msgstr "Mono"
 
-#: src/libaudcore/tuple.c:687
+#: src/libaudcore/tuple.c:538
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/libaudcore/tuple.c:689
-#, fuzzy, c-format
+#: src/libaudcore/tuple.c:540
+#, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d kanálov"
-msgstr[1] "%d kanálov"
-msgstr[2] "%d kanálov"
+msgstr[1] "%d kanál"
+msgstr[2] "%d kanály"
+
+#: src/libaudgui/about.c:52 src/libaudgui/about.c:115
+msgid "Credits"
+msgstr "Zásluhy"
+
+#: src/libaudgui/about.c:52
+msgid "Translators"
+msgstr "Prekladatelia"
+
+#: src/libaudgui/about.c:91
+msgid "About Audacious"
+msgstr "O Audacious"
 
-#: src/libaudgui/confirm.c:73
+#: src/libaudgui/confirm.c:76
 #, c-format
 msgid ""
 "Are you sure you want to close %s? If you do, any changes made since the "
 "playlist was exported will be lost."
-msgstr ""
-"Ste si istý, že chcete zatvoriť %s? Ak tak urobíte, akékoľvek zmeny urobené "
-"od posledného exportu budú stratené."
+msgstr "Ste si istý, že chcete zatvoriť %s? Ak tak urobíte, akékoľvek zmeny urobené od posledného exportu budú stratené."
 
-#: src/libaudgui/confirm.c:86
+#: src/libaudgui/confirm.c:89
 msgid "_Don't show this message again"
 msgstr "_Túto správu už nezobrazovať"
 
-#: src/libaudgui/confirm.c:124
+#: src/libaudgui/confirm.c:126
 msgid "Rename Playlist"
 msgstr "Premenovať zoznam skladieb"
 
-#: src/libaudgui/effects-menu.c:76
+#: src/libaudgui/effects-menu.c:74
 msgid "settings ..."
 msgstr "nastavenia …"
 
-#: src/libaudgui/equalizer.c:68
+#: src/libaudgui/equalizer.c:51
 msgid "_Enable"
 msgstr "_Povoliť"
 
-#: src/libaudgui/equalizer.c:140
+#: src/libaudgui/equalizer.c:123
 msgid "31 Hz"
 msgstr "31 Hz"
 
-#: src/libaudgui/equalizer.c:140
+#: src/libaudgui/equalizer.c:123
 msgid "63 Hz"
 msgstr "63 Hz"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "125 Hz"
 msgstr "125 Hz"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "250 Hz"
 msgstr "250 Hz"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "500 Hz"
 msgstr "500 Hz"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "1 kHz"
 msgstr "1 kHz"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "2 kHz"
 msgstr "2 kHz"
 
-#: src/libaudgui/equalizer.c:142
+#: src/libaudgui/equalizer.c:125
 msgid "4 kHz"
 msgstr "4 kHz"
 
-#: src/libaudgui/equalizer.c:142
+#: src/libaudgui/equalizer.c:125
 msgid "8 kHz"
 msgstr "8 kHz"
 
-#: src/libaudgui/equalizer.c:142
+#: src/libaudgui/equalizer.c:125
 msgid "16 kHz"
 msgstr "16 kHz"
 
-#: src/libaudgui/equalizer.c:147
+#: src/libaudgui/equalizer.c:130
 msgid "Equalizer"
 msgstr "Ekvalizér"
 
-#: src/libaudgui/equalizer.c:163
+#: src/libaudgui/equalizer.c:146
 msgid "Preamp"
 msgstr "Predzosilnenie"
 
-#: src/libaudgui/infopopup.c:212
+#: src/libaudgui/infopopup.c:207
 msgid "Track Number"
 msgstr "Číslo stopy"
 
-#: src/libaudgui/infopopup.c:214
+#: src/libaudgui/infopopup.c:209
 msgid "Track Length"
 msgstr "Dĺžka stopy"
 
-#: src/libaudgui/infowin.c:77
+#: src/libaudgui/infowin.c:75
 msgid "Acid Jazz"
 msgstr "Acid Jazz"
 
-#: src/libaudgui/infowin.c:78
-#, fuzzy
+#: src/libaudgui/infowin.c:76
 msgid "Acid Rock"
-msgstr "Hard Rock"
+msgstr "Acid Rock"
 
-#: src/libaudgui/infowin.c:79
+#: src/libaudgui/infowin.c:77
 msgid "Ambient"
 msgstr "Ambient"
 
-#: src/libaudgui/infowin.c:80
-#, fuzzy
+#: src/libaudgui/infowin.c:78
 msgid "Bebop"
-msgstr "Bebob"
+msgstr "Bebop"
 
-#: src/libaudgui/infowin.c:81
+#: src/libaudgui/infowin.c:79
 msgid "Bluegrass"
 msgstr "Bluegrass"
 
-#: src/libaudgui/infowin.c:82
+#: src/libaudgui/infowin.c:80
 msgid "Blues"
 msgstr "Blues"
 
-#: src/libaudgui/infowin.c:83
+#: src/libaudgui/infowin.c:81
 msgid "Chamber Music"
 msgstr "Komorná hudba"
 
-#: src/libaudgui/infowin.c:84
+#: src/libaudgui/infowin.c:82
 msgid "Classical"
 msgstr "Klasika"
 
-#: src/libaudgui/infowin.c:85
+#: src/libaudgui/infowin.c:83
 msgid "Country"
 msgstr "Country"
 
-#: src/libaudgui/infowin.c:86
+#: src/libaudgui/infowin.c:84
 msgid "Death Metal"
 msgstr "Death Metal"
 
-#: src/libaudgui/infowin.c:87
+#: src/libaudgui/infowin.c:85
 msgid "Disco"
 msgstr "Disco"
 
-#: src/libaudgui/infowin.c:88
+#: src/libaudgui/infowin.c:86
 msgid "Easy Listening"
 msgstr "Príjemné počúvanie"
 
-#: src/libaudgui/infowin.c:89
+#: src/libaudgui/infowin.c:87
 msgid "Folk"
 msgstr "Folk"
 
-#: src/libaudgui/infowin.c:90
+#: src/libaudgui/infowin.c:88
 msgid "Funk"
 msgstr "Funk"
 
-#: src/libaudgui/infowin.c:91
+#: src/libaudgui/infowin.c:89
 msgid "Gangsta Rap"
 msgstr "Gangsta Rap"
 
-#: src/libaudgui/infowin.c:92
+#: src/libaudgui/infowin.c:90
 msgid "Gospel"
 msgstr "Gospel"
 
-#: src/libaudgui/infowin.c:93
+#: src/libaudgui/infowin.c:91
 msgid "Grunge"
 msgstr "Grunge"
 
-#: src/libaudgui/infowin.c:94
+#: src/libaudgui/infowin.c:92
 msgid "Hard Rock"
 msgstr "Hard Rock"
 
-#: src/libaudgui/infowin.c:95
+#: src/libaudgui/infowin.c:93
 msgid "Heavy Metal"
 msgstr "Heavy Metal"
 
-#: src/libaudgui/infowin.c:96
-#, fuzzy
+#: src/libaudgui/infowin.c:94
 msgid "Hip-hop"
-msgstr "Hip-Hop"
+msgstr "Hip-hop"
 
-#: src/libaudgui/infowin.c:97
+#: src/libaudgui/infowin.c:95
 msgid "House"
 msgstr "House"
 
-#: src/libaudgui/infowin.c:98
+#: src/libaudgui/infowin.c:96
 msgid "Jazz"
 msgstr "Jazz"
 
-#: src/libaudgui/infowin.c:99
+#: src/libaudgui/infowin.c:97
 msgid "Jungle"
 msgstr "Jungle"
 
-#: src/libaudgui/infowin.c:100
+#: src/libaudgui/infowin.c:98
 msgid "Metal"
 msgstr "Metal"
 
-#: src/libaudgui/infowin.c:101
+#: src/libaudgui/infowin.c:99
 msgid "New Age"
 msgstr "New Age"
 
-#: src/libaudgui/infowin.c:102
+#: src/libaudgui/infowin.c:100
 msgid "New Wave"
 msgstr "Nová vlna"
 
-#: src/libaudgui/infowin.c:103
+#: src/libaudgui/infowin.c:101
 msgid "Noise"
 msgstr "Ruch"
 
-#: src/libaudgui/infowin.c:104
+#: src/libaudgui/infowin.c:102
 msgid "Pop"
 msgstr "Pop"
 
-#: src/libaudgui/infowin.c:105
+#: src/libaudgui/infowin.c:103
 msgid "Punk Rock"
 msgstr "Punk Rock"
 
-#: src/libaudgui/infowin.c:106
+#: src/libaudgui/infowin.c:104
 msgid "Rap"
 msgstr "Rap"
 
-#: src/libaudgui/infowin.c:107
+#: src/libaudgui/infowin.c:105
 msgid "Reggae"
 msgstr "Reggae"
 
-#: src/libaudgui/infowin.c:108
+#: src/libaudgui/infowin.c:106
 msgid "Rock"
 msgstr "Rock"
 
-#: src/libaudgui/infowin.c:109
-#, fuzzy
+#: src/libaudgui/infowin.c:107
 msgid "Rock and Roll"
-msgstr "Rock & Roll"
+msgstr "Rock and Roll"
 
-#: src/libaudgui/infowin.c:110
+#: src/libaudgui/infowin.c:108
 msgid "Rhythm and Blues"
-msgstr ""
+msgstr "Rhythm and Blues"
 
-#: src/libaudgui/infowin.c:111
+#: src/libaudgui/infowin.c:109
 msgid "Ska"
 msgstr "Ska"
 
-#: src/libaudgui/infowin.c:112
+#: src/libaudgui/infowin.c:110
 msgid "Soul"
 msgstr "Soul"
 
-#: src/libaudgui/infowin.c:113
+#: src/libaudgui/infowin.c:111
 msgid "Swing"
 msgstr "Swing"
 
-#: src/libaudgui/infowin.c:114
+#: src/libaudgui/infowin.c:112
 msgid "Techno"
 msgstr "Techno"
 
-#: src/libaudgui/infowin.c:115
-#, fuzzy
+#: src/libaudgui/infowin.c:113
 msgid "Trip-hop"
-msgstr "Trip-Hop"
+msgstr "Trip-hop"
 
-#: src/libaudgui/infowin.c:175 src/libaudgui/infowin.c:361
-#: src/libaudgui/infowin.c:364 src/libaudgui/infowin.c:367
+#: src/libaudgui/infowin.c:177 src/libaudgui/infowin.c:363
+#: src/libaudgui/infowin.c:366 src/libaudgui/infowin.c:369
 msgid "n/a"
 msgstr "-"
 
-#: src/libaudgui/infowin.c:265
+#: src/libaudgui/infowin.c:267
 msgid "Metadata updated successfully"
 msgstr "Matadáta boli úspešne aktualizované"
 
-#: src/libaudgui/infowin.c:270
+#: src/libaudgui/infowin.c:272
 msgid "Metadata updating failed"
 msgstr "Aktualizácia metadát zlyhala"
 
-#: src/libaudgui/infowin.c:318
+#: src/libaudgui/infowin.c:320
 msgid "Track Information"
 msgstr "Informácie o stope"
 
-#: src/libaudgui/infowin.c:350
+#: src/libaudgui/infowin.c:352
 msgid "Format:"
 msgstr "Formát:"
 
-#: src/libaudgui/infowin.c:354
+#: src/libaudgui/infowin.c:356
 msgid "Quality:"
 msgstr "Kvalita:"
 
-#: src/libaudgui/infowin.c:357
+#: src/libaudgui/infowin.c:359
 msgid "Bitrate:"
 msgstr "Dátový tok:"
 
-#: src/libaudgui/infowin.c:387
+#: src/libaudgui/infowin.c:389
 msgid "Title"
 msgstr "Názov"
 
-#: src/libaudgui/infowin.c:399
+#: src/libaudgui/infowin.c:401
 msgid "Artist"
 msgstr "Umelec"
 
-#: src/libaudgui/infowin.c:411
+#: src/libaudgui/infowin.c:413
 msgid "Album"
 msgstr "Album"
 
-#: src/libaudgui/infowin.c:423
+#: src/libaudgui/infowin.c:425
 msgid "Comment"
 msgstr "Komentár"
 
-#: src/libaudgui/infowin.c:435
+#: src/libaudgui/infowin.c:437
 msgid "Genre"
 msgstr "Žáner"
 
-#: src/libaudgui/infowin.c:456
+#: src/libaudgui/infowin.c:458
 msgid "Year"
 msgstr "Rok"
 
-#: src/libaudgui/infowin.c:467
+#: src/libaudgui/infowin.c:469
 msgid "Track Number"
 msgstr "Číslo stopy"
 
-#: src/libaudgui/infowin.c:549
+#: src/libaudgui/infowin.c:548
 #, c-format
 msgid "%d kb/s"
 msgstr "%d kb/s"
 
-#: src/libaudgui/infowin.c:579
+#: src/libaudgui/infowin.c:575
 #, c-format
 msgid "No info available for %s.\n"
 msgstr "Pre %s nie sú dostupné žiadne informácie.\n"
 
-#: src/libaudgui/jump-to-time.c:75
-#, fuzzy
+#: src/libaudgui/jump-to-time.c:72
 msgid "Jump to Time"
-msgstr "Skok na stopu"
+msgstr "Skočiť na čas"
 
-#: src/libaudgui/jump-to-time.c:90
+#: src/libaudgui/jump-to-time.c:87
 msgid "mm:ss"
-msgstr ""
+msgstr "mm:ss"
 
-#: src/libaudgui/playlists.c:39
-#, fuzzy
+#: src/libaudgui/playlists.c:33
 msgid "Export Playlist"
-msgstr "Dočasný zoznam skladieb"
+msgstr "Exportovať zoznam skladieb"
 
-#: src/libaudgui/playlists.c:39
-#, fuzzy
+#: src/libaudgui/playlists.c:33
 msgid "Import Playlist"
-msgstr "Dočasný zoznam skladieb"
+msgstr "Importovať zoznam skladieb"
 
-#: src/libaudgui/playlists.c:71
+#: src/libaudgui/playlists.c:66
 #, c-format
 msgid "Overwrite %s?"
-msgstr ""
+msgstr "Prepísať %s?"
 
-#: src/libaudgui/ui_about.c:71
-msgid "About Audacious"
-msgstr "O Audacious"
-
-#: src/libaudgui/ui_about.c:93 src/libaudgui/ui_credits.c:122
-msgid "Credits"
-msgstr "Zásluhy"
+#: src/libaudgui/queue-manager.c:196
+msgid "Queue Manager"
+msgstr "Správca fronty"
 
-#: src/libaudgui/ui_credits.c:126
-msgid "Translators"
-msgstr "Prekladatelia"
-
-#: src/libaudgui/ui_fileopener.c:108
+#: src/libaudgui/ui_fileopener.c:109
 msgid "Open Files"
 msgstr "Otvoriť súbory"
 
-#: src/libaudgui/ui_fileopener.c:108
+#: src/libaudgui/ui_fileopener.c:109
 msgid "Add Files"
 msgstr "Pridať súbory"
 
-#: src/libaudgui/ui_fileopener.c:110
+#: src/libaudgui/ui_fileopener.c:111
 msgid "Close dialog on Open"
 msgstr "Zatvoriť okno po otvorení"
 
-#: src/libaudgui/ui_fileopener.c:110
+#: src/libaudgui/ui_fileopener.c:111
 msgid "Close dialog on Add"
 msgstr "Zatvoriť okno po pridaní"
 
-#: src/libaudgui/ui_jumptotrack.c:133
-msgid "Un_queue"
-msgstr "O_dobrať z fronty"
-
-#: src/libaudgui/ui_jumptotrack.c:135 src/libaudgui/ui_jumptotrack.c:512
+#: src/libaudgui/ui_jumptotrack.c:109 src/libaudgui/ui_jumptotrack.c:117
+#: src/libaudgui/ui_jumptotrack.c:326
 msgid "_Queue"
 msgstr "Pri_dať do fronty"
 
-#: src/libaudgui/ui_jumptotrack.c:399
-msgid "Jump to Track"
-msgstr "Skok na stopu"
+#: src/libaudgui/ui_jumptotrack.c:115
+msgid "Un_queue"
+msgstr "O_dobrať z fronty"
 
-#: src/libaudgui/ui_jumptotrack.c:442
+#: src/libaudgui/ui_jumptotrack.c:258
+msgid "Jump to Song"
+msgstr "Skočiť na skladbu"
+
+#: src/libaudgui/ui_jumptotrack.c:281
 msgid "Filter: "
 msgstr "Filter: "
 
-#: src/libaudgui/ui_jumptotrack.c:443
+#: src/libaudgui/ui_jumptotrack.c:282
 msgid "_Filter:"
 msgstr "_Filter:"
 
-#: src/libaudgui/ui_jumptotrack.c:461
+#: src/libaudgui/ui_jumptotrack.c:292
 msgid "Remember"
 msgstr "Zapamätať si filter"
 
-#: src/libaudgui/ui_jumptotrack.c:470
+#: src/libaudgui/ui_jumptotrack.c:299
 msgid "Clea_r"
 msgstr "Vyči_stiť"
 
-#: src/libaudgui/ui_jumptotrack.c:504
+#: src/libaudgui/ui_jumptotrack.c:319
 msgid "Close on Jump"
 msgstr "Zatvoriť po skoku"
 
-#: src/libaudgui/ui_playlist_manager.c:240
+#: src/libaudgui/ui_playlist_manager.c:253
 msgid "Playlist Manager"
 msgstr "Správca zoznamu skladieb"
 
-#: src/libaudgui/ui_playlist_manager.c:264
+#: src/libaudgui/ui_playlist_manager.c:280
 msgid "Entries"
 msgstr "Položky"
 
-#: src/libaudgui/ui_playlist_manager.c:285
+#: src/libaudgui/ui_playlist_manager.c:301
 msgid "_Rename"
 msgstr "P_remenovať"
 
-#: src/libaudgui/ui_playlist_manager.c:309
+#: src/libaudgui/ui_playlist_manager.c:325
 msgid "_Close dialog on activating playlist"
 msgstr "_Zatvoriť okno po aktivácii zoznamu skladieb"
 
-#: src/libaudgui/ui_urlopener.c:58
+#: src/libaudgui/ui_urlopener.c:48
 msgid "Open URL"
 msgstr "Otvoriť URL"
 
-#: src/libaudgui/ui_urlopener.c:58
+#: src/libaudgui/ui_urlopener.c:48
 msgid "Add URL"
 msgstr "Pridať URL"
 
@@ -1179,37 +1160,36 @@
 msgid ""
 "\n"
 "(Further messages have been hidden.)"
-msgstr ""
+msgstr "\n(Ďalšie správy boli skryté.)"
 
 #: src/libeggsmclient/eggdesktopfile.c:165
 msgid "File is not a valid .desktop file"
 msgstr "Súbor nie je platný .desktop súbor"
 
-#: src/libeggsmclient/eggdesktopfile.c:188
+#: src/libeggsmclient/eggdesktopfile.c:191
 #, c-format
 msgid "Unrecognized desktop file Version '%s'"
 msgstr "Nerozpoznaná verzia '%s' súboru pracovnej plochy"
 
-#: src/libeggsmclient/eggdesktopfile.c:967
+#: src/libeggsmclient/eggdesktopfile.c:974
 #, c-format
 msgid "Starting %s"
 msgstr "Spúšťa sa %s"
 
-#: src/libeggsmclient/eggdesktopfile.c:1108
+#: src/libeggsmclient/eggdesktopfile.c:1116
 msgid "Application does not accept documents on command line"
 msgstr "Aplikácia neprijíma dokumenty v príkazovom riadku"
 
-#: src/libeggsmclient/eggdesktopfile.c:1176
+#: src/libeggsmclient/eggdesktopfile.c:1184
 #, c-format
 msgid "Unrecognized launch option: %d"
 msgstr "Nerozpoznaná spúšťacia voľba: %d"
 
-#: src/libeggsmclient/eggdesktopfile.c:1375
+#: src/libeggsmclient/eggdesktopfile.c:1391
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
-msgstr ""
-"URI adresa dokumentu sa nedá predať položke pracovnej plochy 'Type=Link'"
+msgstr "URI adresa dokumentu sa nedá predať položke pracovnej plochy 'Type=Link'"
 
-#: src/libeggsmclient/eggdesktopfile.c:1396
+#: src/libeggsmclient/eggdesktopfile.c:1412
 msgid "Not a launchable item"
 msgstr "Nespustiteľná položka"
 
@@ -1234,434 +1214,9 @@
 msgstr "IDENTIFIKÁTOR"
 
 #: src/libeggsmclient/eggsmclient.c:253
-#, fuzzy
 msgid "Session management options:"
-msgstr "Možnosti správy relácie"
+msgstr "Možnosti správcu relácie:"
 
 #: src/libeggsmclient/eggsmclient.c:254
-#, fuzzy
 msgid "Show session management options"
-msgstr "Zobraziť možnosti správy relácie"
-
-#~ msgid "Replay Gain"
-#~ msgstr "Zosilnenie pri prehrávaní"
-
-#~ msgid "Bit Depth"
-#~ msgstr "Bitová hĺbka"
-
-#~ msgid ""
-#~ "All streams will be converted to this bit depth.\n"
-#~ "This should be the max supported bit depth of\n"
-#~ "the sound card or output plugin."
-#~ msgstr ""
-#~ "Všetky prúdy budú skonvertované na túto bitovú hĺbku.\n"
-#~ "Mala by to byť najväčšia podporovaná bitová hĺbka zvukovej\n"
-#~ "karty alebo výstupného modulu."
-
-#~ msgid "Volume Control"
-#~ msgstr "Ovládanie hlasitosti"
-
-#~ msgid ""
-#~ "Use software volume control. This may be useful for situations where your "
-#~ "audio system does not support controlling the playback volume."
-#~ msgstr ""
-#~ "Použije sa softvérové ovládanie hlasitosti. Toto môže byť užitočné v "
-#~ "prípade, že zvukový systém nepodporuje ovládanie hlasitosti prehrávania."
-
-#, fuzzy
-#~ msgid "Mode"
-#~ msgstr "Metadáta"
-
-#, fuzzy
-#~ msgid "Clipping Prevention"
-#~ msgstr "Vyskakovacie okno s podrobnosťami"
-
-#, fuzzy
-#~ msgid "Enable clipping prevention"
-#~ msgstr "Použiť informácie o vrchole na ochranu pred orezaním signálu"
-
-#~ msgid "Audio System"
-#~ msgstr "Zvukový systém"
-
-#~ msgid "Display all open Audacious windows"
-#~ msgstr "Zobrazí všetky otvorené okná Audacious"
-
-#~ msgid ""
-#~ "Running multiple instances of Audacious can lead to corrupted "
-#~ "configuration files. If Audacious is not already running, or if you want "
-#~ "to run another instance anyway, please delete the file %s and run "
-#~ "Audacious again. Audacious will now close."
-#~ msgstr ""
-#~ "Spúšťanie viacerých inštancií Audacious môže viesť k poškodeniu "
-#~ "konfiguračných súborov. Ak Audacious ešte nie je spustený, alebo chcete "
-#~ "aj tak spustiť ďalšiu inštanciu, prosím, vymažte súbor %s a spuste "
-#~ "Audacious znova. Audacious sa teraz ukončí."
-
-#~ msgid "%s: Unable to open display, exiting.\n"
-#~ msgstr "%s: Nepodarilo sa otvoriť displej, ukončujem sa.\n"
-
-#~ msgid "Preamp:"
-#~ msgstr "Predzosilnenie:"
-
-#~ msgid "Default gain:"
-#~ msgstr "Štandardné zosilnenie:"
-
-#~ msgid "This gain will be used if file doesn't contain Replay Gain metadata."
-#~ msgstr ""
-#~ "Toto zosilnenie bude použité v prípade, že súbor neobsahuje informácie o "
-#~ "zosilnení pri prehrávaní."
-
-#~ msgid ""
-#~ "Please remember that the most efficient way to "
-#~ "prevent signal clipping is not to use positive values above."
-#~ msgstr ""
-#~ "Prosím, zapamätajte si, že najlepšou ochranou proti "
-#~ "orezaniu signálu je nepoužívať kladné hodnoty vyššie uvedených parametrov."
-#~ ""
-
-#~ msgid "Replay Gain configuration"
-#~ msgstr "Nastavenie zosilnenia pri prehrávaní"
-
-#~ msgid "Track gain/peak"
-#~ msgstr "Zosilnenie/vrchol skladby"
-
-#~ msgid "Album gain/peak"
-#~ msgstr "Zosilnenie/vrchol albumu"
-
-#~ msgid "Use peak value from Replay Gain info for clipping prevention"
-#~ msgstr ""
-#~ "Použije hodnotu vrcholu z informácii o zosilnení pri prehrávaní na "
-#~ "ochranu proti orezaniu signálu"
-
-#~ msgid "Classic Rock"
-#~ msgstr "Klasický rok"
-
-#~ msgid "Dance"
-#~ msgstr "Tanečná"
-
-#~ msgid "Oldies"
-#~ msgstr "Oldies"
-
-#~ msgid "Other"
-#~ msgstr "Iná"
-
-#~ msgid "R&B"
-#~ msgstr "R&B"
-
-#~ msgid "Industrial"
-#~ msgstr "Industrial"
-
-#~ msgid "Alternative"
-#~ msgstr "Alternatívna hudba"
-
-#~ msgid "Pranks"
-#~ msgstr "Pranks"
-
-#~ msgid "Soundtrack"
-#~ msgstr "Soundtrack"
-
-#~ msgid "Euro-Techno"
-#~ msgstr "Euro-Techno"
-
-#~ msgid "Vocal"
-#~ msgstr "Vokálna"
-
-#~ msgid "Jazz+Funk"
-#~ msgstr "Jazz+Funk"
-
-#~ msgid "Fusion"
-#~ msgstr "Fúzia"
-
-#~ msgid "Trance"
-#~ msgstr "Trance"
-
-#~ msgid "Instrumental"
-#~ msgstr "Inštrumentálna"
-
-#~ msgid "Acid"
-#~ msgstr "Acid"
-
-#~ msgid "Game"
-#~ msgstr "Game"
-
-#~ msgid "Sound Clip"
-#~ msgstr "Zvukový klip"
-
-#~ msgid "AlternRock"
-#~ msgstr "AlternRock"
-
-#~ msgid "Bass"
-#~ msgstr "Bass"
-
-#~ msgid "Punk"
-#~ msgstr "Punk"
-
-#~ msgid "Space"
-#~ msgstr "Space"
-
-#~ msgid "Meditative"
-#~ msgstr "Meditatívna"
-
-#~ msgid "Instrumental Pop"
-#~ msgstr "Inštrumentálny pop"
-
-#~ msgid "Instrumental Rock"
-#~ msgstr "Inštrumentálny rock"
-
-#~ msgid "Ethnic"
-#~ msgstr "Etnická hudba"
-
-#~ msgid "Gothic"
-#~ msgstr "Gotická hudba"
-
-#~ msgid "Darkwave"
-#~ msgstr "Darkwave"
-
-#~ msgid "Techno-Industrial"
-#~ msgstr "Techno-Industrial"
-
-#~ msgid "Electronic"
-#~ msgstr "Elektronická"
-
-#~ msgid "Pop-Folk"
-#~ msgstr "Pop-Folk"
-
-#~ msgid "Eurodance"
-#~ msgstr "Eurodance"
-
-#~ msgid "Dream"
-#~ msgstr "Dream"
-
-#~ msgid "Southern Rock"
-#~ msgstr "Južanský rock"
-
-#~ msgid "Comedy"
-#~ msgstr "Komédia"
-
-#~ msgid "Cult"
-#~ msgstr "Cult"
-
-#~ msgid "Top 40"
-#~ msgstr "Top 40"
-
-#~ msgid "Christian Rap"
-#~ msgstr "Kresťanský rap"
-
-#~ msgid "Pop/Funk"
-#~ msgstr "Pop/Funk"
-
-#~ msgid "Native American"
-#~ msgstr "Indiánska hudba"
-
-#~ msgid "Cabaret"
-#~ msgstr "Kabaret"
-
-#~ msgid "Psychedelic"
-#~ msgstr "Psychedelic"
-
-#~ msgid "Rave"
-#~ msgstr "Rave"
-
-#~ msgid "Showtunes"
-#~ msgstr "Showtunes"
-
-#~ msgid "Trailer"
-#~ msgstr "Upútavka"
-
-#~ msgid "Lo-Fi"
-#~ msgstr "Lo-Fi"
-
-#~ msgid "Tribal"
-#~ msgstr "Tribal"
-
-#~ msgid "Acid Punk"
-#~ msgstr "Acid Punk"
-
-#~ msgid "Polka"
-#~ msgstr "Polka"
-
-#~ msgid "Retro"
-#~ msgstr "Retro"
-
-#~ msgid "Musical"
-#~ msgstr "Muzikál"
-
-#~ msgid "Folk/Rock"
-#~ msgstr "Folk/Rock"
-
-#~ msgid "National Folk"
-#~ msgstr "Národná ľudová"
-
-#~ msgid "Fast-Fusion"
-#~ msgstr "Fast-Fusion"
-
-#~ msgid "Latin"
-#~ msgstr "Latinská"
-
-#~ msgid "Revival"
-#~ msgstr "Revival"
-
-#~ msgid "Celtic"
-#~ msgstr "Keltská"
-
-#~ msgid "Avantgarde"
-#~ msgstr "Avantgardná"
-
-#~ msgid "Gothic Rock"
-#~ msgstr "Gotický rock"
-
-#~ msgid "Progressive Rock"
-#~ msgstr "Progresívny rock"
-
-#~ msgid "Psychedelic Rock"
-#~ msgstr "Psychedelic Rock"
-
-#~ msgid "Symphonic Rock"
-#~ msgstr "Symfonický rock"
-
-#~ msgid "Slow Rock"
-#~ msgstr "Slow Rock"
-
-#~ msgid "Big Band"
-#~ msgstr "Big Band"
-
-#~ msgid "Chorus"
-#~ msgstr "Chorus"
-
-#~ msgid "Acoustic"
-#~ msgstr "Akustická"
-
-#~ msgid "Humour"
-#~ msgstr "Humor"
-
-#~ msgid "Speech"
-#~ msgstr "Hovorené slovo"
-
-#~ msgid "Chanson"
-#~ msgstr "Šansón"
-
-#~ msgid "Opera"
-#~ msgstr "Opera"
-
-#~ msgid "Sonata"
-#~ msgstr "Sonáta"
-
-#~ msgid "Symphony"
-#~ msgstr "Symfónia"
-
-#~ msgid "Booty Bass"
-#~ msgstr "Booty Bass"
-
-#~ msgid "Primus"
-#~ msgstr "Primus"
-
-#~ msgid "Porn Groove"
-#~ msgstr "Porn Groove"
-
-#~ msgid "Satire"
-#~ msgstr "Satira"
-
-#~ msgid "Slow Jam"
-#~ msgstr "Slow Jam"
-
-#~ msgid "Club"
-#~ msgstr "Club"
-
-#~ msgid "Tango"
-#~ msgstr "Tango"
-
-#~ msgid "Samba"
-#~ msgstr "Samba"
-
-#~ msgid "Folklore"
-#~ msgstr "Folklór"
-
-#~ msgid "Ballad"
-#~ msgstr "Balada"
-
-#~ msgid "Power Ballad"
-#~ msgstr "Rocková balada"
-
-#~ msgid "Rhythmic Soul"
-#~ msgstr "Rytmický soul"
-
-#~ msgid "Freestyle"
-#~ msgstr "Freestyle"
-
-#~ msgid "Duet"
-#~ msgstr "Duet"
-
-#~ msgid "Drum Solo"
-#~ msgstr "Drum Solo"
-
-#~ msgid "A Cappella"
-#~ msgstr "A Cappella"
-
-#~ msgid "Euro-House"
-#~ msgstr "Euro-House"
-
-#~ msgid "Dance Hall"
-#~ msgstr "Dance Hall"
-
-#~ msgid "Goa"
-#~ msgstr "Goa"
-
-#~ msgid "Drum & Bass"
-#~ msgstr "Drum & Bass"
-
-#~ msgid "Club-House"
-#~ msgstr "Club-House"
-
-#~ msgid "Hardcore"
-#~ msgstr "Hardcore"
-
-#~ msgid "Terror"
-#~ msgstr "Terror"
-
-#~ msgid "Indie"
-#~ msgstr "Indie"
-
-#~ msgid "BritPop"
-#~ msgstr "BritPop"
-
-#~ msgid "Negerpunk"
-#~ msgstr "Negerpunk"
-
-#~ msgid "Polsk Punk"
-#~ msgstr "Polsk Punk"
-
-#~ msgid "Beat"
-#~ msgstr "Beat"
-
-#~ msgid "Christian Gangsta Rap"
-#~ msgstr "Kresťanský gangsta rap"
-
-#~ msgid "Black Metal"
-#~ msgstr "Black Metal"
-
-#~ msgid "Crossover"
-#~ msgstr "Crossover"
-
-#~ msgid "Contemporary Christian"
-#~ msgstr "Contemporary Christian"
-
-#~ msgid "Christian Rock"
-#~ msgstr "Kresťanský rock"
-
-#~ msgid "Merengue"
-#~ msgstr "Merengue"
-
-#~ msgid "Salsa"
-#~ msgstr "Salsa"
-
-#~ msgid "Thrash Metal"
-#~ msgstr "Thrash Metal"
-
-#~ msgid "Anime"
-#~ msgstr "Anime"
-
-#~ msgid "JPop"
-#~ msgstr "JPop"
-
-#~ msgid "Synthpop"
-#~ msgstr "Synthpop"
+msgstr "Zobraziť možnosti správcu relácie"

audacious-3.1.1.tar.bz2/po/sr.po -> audacious-3.2.4.tar.bz2/po/sr.po Changed

@@ -4,13 +4,13 @@
 #
 # Translators:
 # Strahinja Kustudic <kustudic@gmail.com>, 2007, 2008.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2011.
+# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious\n"
-"Report-Msgid-Bugs-To: http://jira.atheme.org/browse/AUD\n"
-"POT-Creation-Date: 2011-10-19 21:32-0400\n"
-"PO-Revision-Date: 2011-11-04 19:37+0000\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2012-01-11 08:54-0500\n"
+"PO-Revision-Date: 2012-04-30 05:12+0000\n"
 "Last-Translator: MirosNik <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian\n"
 "MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@
 "Language: sr\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/audacious/adder.c:71
+#: src/audacious/adder.c:77
 msgid "Searching ..."
 msgstr "Тражим ..."
 
-#: src/audacious/adder.c:97
+#: src/audacious/adder.c:113
 #, c-format
 msgid "%d file found"
 msgid_plural "%d files found"
@@ -31,699 +31,712 @@
 msgstr[1] "Пронашао сам %d датотеке"
 msgstr[2] "Пронашао сам %d датотека"
 
-#: src/audacious/chardet.c:38
+#: src/audacious/chardet.c:39
 msgid " (invalid UTF-8)"
 msgstr " (неисправан УТФ-8)"
 
-#: src/audacious/credits.c:35
+#: src/audacious/credits.c:37
 msgid "Core developers:"
 msgstr "Програмери језгра:"
 
-#: src/audacious/credits.c:49
+#: src/audacious/credits.c:51
 msgid "Graphics:"
 msgstr "Графика:"
 
-#: src/audacious/credits.c:54
+#: src/audacious/credits.c:56
 msgid "Default skin:"
 msgstr "Основна маска:"
 
-#: src/audacious/credits.c:60
+#: src/audacious/credits.c:62
 msgid "Plugin development:"
 msgstr "Развој прикључка:"
 
-#: src/audacious/credits.c:83
+#: src/audacious/credits.c:85
 msgid "Patch authors:"
 msgstr "Аутори закрпа:"
 
-#: src/audacious/credits.c:126
+#: src/audacious/credits.c:131
 msgid "1.x developers:"
 msgstr "0.1.x ствараоци:"
 
-#: src/audacious/credits.c:148
+#: src/audacious/credits.c:153
 msgid "BMP Developers:"
 msgstr "БМП програмери:"
 
-#: src/audacious/credits.c:180
+#: src/audacious/credits.c:185
 msgid "Belarusian:"
 msgstr "Белоруски:"
 
-#: src/audacious/credits.c:183
+#: src/audacious/credits.c:188
 msgid "Basque:"
 msgstr "Баскијски:"
 
-#: src/audacious/credits.c:186
+#: src/audacious/credits.c:191
 msgid "Brazilian Portuguese:"
 msgstr "Бразилски-португалски:"
 
-#: src/audacious/credits.c:191
+#: src/audacious/credits.c:196
 msgid "Breton:"
 msgstr "Бретонски:"
 
-#: src/audacious/credits.c:194
+#: src/audacious/credits.c:199
 msgid "Bulgarian:"
 msgstr "Бугарски:"
 
-#: src/audacious/credits.c:197
+#: src/audacious/credits.c:202
 msgid "Catalan:"
 msgstr "Каталонски:"
 
-#: src/audacious/credits.c:200
+#: src/audacious/credits.c:206
 msgid "Chinese:"
 msgstr "Кинески:"
 
-#: src/audacious/credits.c:203
+#: src/audacious/credits.c:209
 msgid "Croatian:"
 msgstr "Хрватски:"
 
-#: src/audacious/credits.c:206
+#: src/audacious/credits.c:212
 msgid "Czech:"
 msgstr "Чешки:"
 
-#: src/audacious/credits.c:209
+#: src/audacious/credits.c:215
 msgid "Dutch:"
 msgstr "Холандски:"
 
-#: src/audacious/credits.c:213
+#: src/audacious/credits.c:219
 msgid "Estonian:"
 msgstr "Естонски:"
 
-#: src/audacious/credits.c:216
+#: src/audacious/credits.c:222
 msgid "Finnish:"
 msgstr "Фински:"
 
-#: src/audacious/credits.c:221
+#: src/audacious/credits.c:227
 msgid "French:"
 msgstr "Француски:"
 
-#: src/audacious/credits.c:227
+#: src/audacious/credits.c:233
 msgid "German:"
 msgstr "Немачки:"
 
-#: src/audacious/credits.c:234
+#: src/audacious/credits.c:240
 msgid "Georgian:"
 msgstr "Арменски:"
 
-#: src/audacious/credits.c:237
+#: src/audacious/credits.c:243
 msgid "Greek:"
 msgstr "Грчки:"
 
-#: src/audacious/credits.c:242
+#: src/audacious/credits.c:248
 msgid "Hindi:"
 msgstr "Хинду:"
 
-#: src/audacious/credits.c:245
+#: src/audacious/credits.c:251
 msgid "Hungarian:"
 msgstr "Мађарски:"
 
-#: src/audacious/credits.c:249
+#: src/audacious/credits.c:255
 msgid "Italian:"
 msgstr "Италијански:"
 
-#: src/audacious/credits.c:253
+#: src/audacious/credits.c:260
 msgid "Japanese:"
 msgstr "Јапански:"
 
-#: src/audacious/credits.c:256
+#: src/audacious/credits.c:263
 msgid "Korean:"
 msgstr "Корејски:"
 
-#: src/audacious/credits.c:259
+#: src/audacious/credits.c:266
 msgid "Latvian:"
 msgstr "Летонски:"
 
-#: src/audacious/credits.c:262
+#: src/audacious/credits.c:269
 msgid "Lithuanian:"
 msgstr "Литвански:"
 
-#: src/audacious/credits.c:267
+#: src/audacious/credits.c:274
 msgid "Macedonian:"
 msgstr "Македонски:"
 
-#: src/audacious/credits.c:270
+#: src/audacious/credits.c:277
+msgid "Mexican Spanish:"
+msgstr "Мексички шпански"
+
+#: src/audacious/credits.c:280
 msgid "Polish:"
 msgstr "Пољски:"
 
-#: src/audacious/credits.c:276
+#: src/audacious/credits.c:287
 msgid "Portuguese:"
 msgstr "Португалски:"
 
-#: src/audacious/credits.c:279
+#: src/audacious/credits.c:290
 msgid "Romanian:"
 msgstr "Румунски:"
 
-#: src/audacious/credits.c:283
+#: src/audacious/credits.c:294
 msgid "Russian:"
 msgstr "Руски:"
 
-#: src/audacious/credits.c:287
+#: src/audacious/credits.c:298
 msgid "Serbian (Latin):"
 msgstr "Српски (Латиница):"
 
-#: src/audacious/credits.c:290
+#: src/audacious/credits.c:301
 msgid "Serbian (Cyrillic):"
 msgstr "Српски (Ћирилица):"
 
-#: src/audacious/credits.c:293
+#: src/audacious/credits.c:305
 msgid "Simplified Chinese:"
 msgstr "Упроштени кинески:"
 
-#: src/audacious/credits.c:296
+#: src/audacious/credits.c:308
 msgid "Slovak:"
 msgstr "Словеначки:"
 
-#: src/audacious/credits.c:299
+#: src/audacious/credits.c:312
 msgid "Spanish:"
 msgstr "Шпански:"
 
-#: src/audacious/credits.c:306
+#: src/audacious/credits.c:320
 msgid "Swedish:"
 msgstr "Шведски:"
 
-#: src/audacious/credits.c:309
+#: src/audacious/credits.c:323
 msgid "Traditional Chinese:"
 msgstr "Традиционални кинески:"
 
-#: src/audacious/credits.c:315
+#: src/audacious/credits.c:329
 msgid "Turkish:"
 msgstr "Турски:"
 
-#: src/audacious/credits.c:319
+#: src/audacious/credits.c:333
 msgid "Ukrainian:"
 msgstr "Украински:"
 
-#: src/audacious/credits.c:323
+#: src/audacious/credits.c:338
 msgid "Vietnamese:"
 msgstr "Вијетнамски:"
 
-#: src/audacious/credits.c:326
+#: src/audacious/credits.c:341
 msgid "Welsh:"
 msgstr "Велшки:"
 
-#: src/audacious/drct.c:234
-msgid "Temporary Playlist"
-msgstr "Привремена листа пуштања"
-
-#: src/audacious/equalizer_preset.c:186
+#: src/audacious/equalizer_preset.c:180
 #, c-format
 msgid "Error importing Winamp EQF file '%s'"
 msgstr "Грешка приликом увоза ВинАМП ЕКуФ датотеке „%s“"
 
-#: src/audacious/main.c:239
+#: src/audacious/main.c:243
 msgid "Skip backwards in playlist"
 msgstr "Прескаче уназад у списку нумера"
 
-#: src/audacious/main.c:240
+#: src/audacious/main.c:244
 msgid "Start playing current playlist"
 msgstr "Пушта текући списак нумера"
 
-#: src/audacious/main.c:241
+#: src/audacious/main.c:245
 msgid "Pause current song"
 msgstr "Паузира текућу песму"
 
-#: src/audacious/main.c:242
+#: src/audacious/main.c:246
 msgid "Stop current song"
 msgstr "Зауставља текућу песму"
 
-#: src/audacious/main.c:243
+#: src/audacious/main.c:247
 msgid "Pause if playing, play otherwise"
 msgstr "Паузира ако свира, иначе пушта"
 
-#: src/audacious/main.c:244
+#: src/audacious/main.c:248
 msgid "Skip forward in playlist"
 msgstr "Прескаче унапред у списку нумера"
 
-#: src/audacious/main.c:245
+#: src/audacious/main.c:249
 msgid "Display Jump to File dialog"
 msgstr "Приказује прозорче „Пређи на датотеку“"
 
-#: src/audacious/main.c:246
+#: src/audacious/main.c:250
 msgid "Add files to the playlist"
 msgstr "Додаје датотеке на списак нумера"
 
-#: src/audacious/main.c:247
+#: src/audacious/main.c:251
 msgid "Add new files to a temporary playlist"
 msgstr "Додаје нове датотеке у привремени списак нумера"
 
-#: src/audacious/main.c:248
+#: src/audacious/main.c:252
 msgid "Display the main window"
 msgstr "Приказује главни прозор"
 
-#: src/audacious/main.c:249
+#: src/audacious/main.c:253
 msgid "Show version"
 msgstr "Приказује издање"
 
-#: src/audacious/main.c:250
+#: src/audacious/main.c:254
 msgid "Print debugging messages"
 msgstr "Исписује поруке за исправљање грешака"
 
-#: src/audacious/main.c:251
+#: src/audacious/main.c:255
 msgid "Headless mode (beta)"
 msgstr "Безглави режим (бета)"
 
-#: src/audacious/main.c:252
+#: src/audacious/main.c:256
 msgid "FILE..."
 msgstr "ДАТОТЕКА..."
 
-#: src/audacious/main.c:264
+#: src/audacious/main.c:268
 msgid "- play multimedia files"
 msgstr "— пушта мултимедијалне датотеке"
 
-#: src/audacious/main.c:274
+#: src/audacious/main.c:278
 #, c-format
 msgid ""
 "%s: %s\n"
 "Try `%s --help' for more information.\n"
-msgstr ""
-"%s: %s\n"
-"Пробајте „%s --help“ за више информација.\n"
+msgstr "%s: %s\nПробајте „%s --help“ за више информација.\n"
 
-#: src/audacious/main.c:547
+#: src/audacious/main.c:573
 msgid "Audacious"
 msgstr "Безочник"
 
-#: src/audacious/playback.c:303
+#: src/audacious/playback.c:307
 #, c-format
 msgid "No decoder found for %s."
 msgstr "Нисам пронашао декодер за %s."
 
-#: src/audacious/playlist-new.c:315
-msgid "Untitled Playlist"
-msgstr "Неименована листа нумера"
+#: src/audacious/playlist-files.c:53
+#, c-format
+msgid "Cannot %s %s: unsupported file extension."
+msgstr "Не могу да %s %s: није подржано проширење датотеке"
+
+#: src/audacious/playlist-files.c:54
+msgid "save"
+msgstr "сачувам"
+
+#: src/audacious/playlist-files.c:54
+msgid "load"
+msgstr "учитам"
+
+#: src/audacious/playlist-new.c:131
+msgid "New Playlist"
+msgstr "Нови списак нумера"
 
-#: src/audacious/playlist-new.c:1496
+#: src/audacious/playlist-new.c:132
+msgid "Now Playing"
+msgstr "Сад пуштам"
+
+#: src/audacious/playlist-new.c:1630
 msgid ""
 "The playlist cannot be sorted because metadata scanning is still in progress"
 " (or has been disabled)."
-msgstr ""
-"Листа нумера не може бити поређана зато што је прегледање метаподатака још "
-"увек у току (или је искључено)."
+msgstr "Листа нумера не може бити поређана зато што је прегледање метаподатака још увек у току (или је искључено)."
 
-#: src/audacious/ui_preferences.c:88
+#: src/audacious/ui_preferences.c:85
 msgid "Audio"
 msgstr "Аудио"
 
-#: src/audacious/ui_preferences.c:89
+#: src/audacious/ui_preferences.c:86
 msgid "Network"
 msgstr "Мрежа"
 
-#: src/audacious/ui_preferences.c:90 src/audacious/ui_preferences.c:1634
+#: src/audacious/ui_preferences.c:87 src/audacious/ui_preferences.c:1603
 msgid "Playlist"
-msgstr "Листа нумера"
+msgstr "Списак нумера"
 
-#: src/audacious/ui_preferences.c:91
+#: src/audacious/ui_preferences.c:88
 msgid "Plugins"
 msgstr "Прикључци"
 
-#: src/audacious/ui_preferences.c:97 src/libaudgui/infopopup.c:203
+#: src/audacious/ui_preferences.c:94 src/libaudgui/infopopup.c:199
 msgid "Artist"
 msgstr "Извођач"
 
-#: src/audacious/ui_preferences.c:98 src/libaudgui/infopopup.c:205
+#: src/audacious/ui_preferences.c:95 src/libaudgui/infopopup.c:201
 msgid "Album"
 msgstr "Албум"
 
-#: src/audacious/ui_preferences.c:99 src/libaudgui/infopopup.c:201
-#: src/libaudgui/ui_playlist_manager.c:276
+#: src/audacious/ui_preferences.c:96 src/libaudgui/infopopup.c:197
+#: src/libaudgui/ui_playlist_manager.c:279
 msgid "Title"
 msgstr "Наслов"
 
-#: src/audacious/ui_preferences.c:100
+#: src/audacious/ui_preferences.c:97
 msgid "Tracknumber"
 msgstr "Број нумере"
 
-#: src/audacious/ui_preferences.c:101 src/libaudgui/infopopup.c:207
+#: src/audacious/ui_preferences.c:98 src/libaudgui/infopopup.c:203
 msgid "Genre"
 msgstr "Жанр"
 
-#: src/audacious/ui_preferences.c:102
+#: src/audacious/ui_preferences.c:99
 msgid "Filename"
 msgstr "Назив датотеке"
 
-#: src/audacious/ui_preferences.c:103
+#: src/audacious/ui_preferences.c:100
 msgid "Filepath"
 msgstr "Путања датотеке"
 
-#: src/audacious/ui_preferences.c:104
+#: src/audacious/ui_preferences.c:101
 msgid "Date"
 msgstr "Датум"
 
-#: src/audacious/ui_preferences.c:105 src/libaudgui/infopopup.c:209
+#: src/audacious/ui_preferences.c:102 src/libaudgui/infopopup.c:205
 msgid "Year"
 msgstr "Година"
 
-#: src/audacious/ui_preferences.c:106
+#: src/audacious/ui_preferences.c:103
 msgid "Comment"
 msgstr "Коментар"
 
-#: src/audacious/ui_preferences.c:107
+#: src/audacious/ui_preferences.c:104
 msgid "Codec"
 msgstr "Кодек"
 
-#: src/audacious/ui_preferences.c:108
+#: src/audacious/ui_preferences.c:105
 msgid "Quality"
 msgstr "Квалитет"
 
-#: src/audacious/ui_preferences.c:114
+#: src/audacious/ui_preferences.c:111
 msgid "None"
 msgstr "Ништа"
 
-#: src/audacious/ui_preferences.c:115
+#: src/audacious/ui_preferences.c:112
 msgid "Arabic"
 msgstr "Арапски"
 
-#: src/audacious/ui_preferences.c:116
+#: src/audacious/ui_preferences.c:113
 msgid "Baltic"
 msgstr "Балтички"
 
-#: src/audacious/ui_preferences.c:117
+#: src/audacious/ui_preferences.c:114
 msgid "Chinese"
 msgstr "Кинески"
 
-#: src/audacious/ui_preferences.c:118
+#: src/audacious/ui_preferences.c:115
 msgid "Greek"
 msgstr "Грчки"
 
-#: src/audacious/ui_preferences.c:119
+#: src/audacious/ui_preferences.c:116
 msgid "Hebrew"
 msgstr "Јеврејски"
 
-#: src/audacious/ui_preferences.c:120
+#: src/audacious/ui_preferences.c:117
 msgid "Japanese"
 msgstr "Јапански"
 
-#: src/audacious/ui_preferences.c:121
+#: src/audacious/ui_preferences.c:118
 msgid "Korean"
 msgstr "Корејски"
 
-#: src/audacious/ui_preferences.c:122
+#: src/audacious/ui_preferences.c:119
 msgid "Polish"
 msgstr "Пољски"
 
-#: src/audacious/ui_preferences.c:123
+#: src/audacious/ui_preferences.c:120
 msgid "Russian"
 msgstr "Руски"
 
-#: src/audacious/ui_preferences.c:124
+#: src/audacious/ui_preferences.c:121
 msgid "Taiwanese"
 msgstr "Тајвански"
 
-#: src/audacious/ui_preferences.c:125
+#: src/audacious/ui_preferences.c:122
 msgid "Turkish"
 msgstr "Турски"
 
-#: src/audacious/ui_preferences.c:147
+#: src/audacious/ui_preferences.c:144
 msgid "Album mode"
 msgstr "Режим албума"
 
-#: src/audacious/ui_preferences.c:150
+#: src/audacious/ui_preferences.c:147
 msgid "Output Settings"
 msgstr "Подешавања излаза"
 
-#: src/audacious/ui_preferences.c:152
+#: src/audacious/ui_preferences.c:149
 msgid "Bit depth:"
 msgstr "Дубина бита:"
 
-#: src/audacious/ui_preferences.c:155
+#: src/audacious/ui_preferences.c:152
 msgid "Buffer size:"
 msgstr "Величина бафера:"
 
-#: src/audacious/ui_preferences.c:157
+#: src/audacious/ui_preferences.c:154
 msgid "ms"
 msgstr "ms"
 
-#: src/audacious/ui_preferences.c:158
+#: src/audacious/ui_preferences.c:155
 msgid "Use software volume control (not recommended)"
 msgstr "Користи софтверско управљање јачином звука (није препоручљиво)"
 
-#: src/audacious/ui_preferences.c:160
+#: src/audacious/ui_preferences.c:157
 msgid "Replay Gain"
 msgstr "Појачање понављања"
 
-#: src/audacious/ui_preferences.c:161
+#: src/audacious/ui_preferences.c:158
 msgid "Enable Replay Gain"
 msgstr "Укључи појачање понављања"
 
-#: src/audacious/ui_preferences.c:164
+#: src/audacious/ui_preferences.c:161
 msgid "Prevent clipping (recommended)"
 msgstr "Спречи одсецање (препоручљиво)"
 
-#: src/audacious/ui_preferences.c:166
+#: src/audacious/ui_preferences.c:163
 msgid "Adjust Levels"
 msgstr "Подеси нивое"
 
-#: src/audacious/ui_preferences.c:167
+#: src/audacious/ui_preferences.c:164
 msgid "Amplify all files:"
 msgstr "Појачај све датотеке:"
 
-#: src/audacious/ui_preferences.c:169 src/audacious/ui_preferences.c:172
+#: src/audacious/ui_preferences.c:166 src/audacious/ui_preferences.c:169
 msgid "dB"
 msgstr "dB"
 
-#: src/audacious/ui_preferences.c:170
+#: src/audacious/ui_preferences.c:167
 msgid "Amplify untagged files:"
 msgstr "Појачај датотеке без ознака:"
 
-#: src/audacious/ui_preferences.c:175
+#: src/audacious/ui_preferences.c:172
 msgid "Proxy hostname:"
 msgstr "Назив домаћина посредника:"
 
-#: src/audacious/ui_preferences.c:176
+#: src/audacious/ui_preferences.c:173
 msgid "Proxy port:"
 msgstr "Порт посредника:"
 
-#: src/audacious/ui_preferences.c:179
+#: src/audacious/ui_preferences.c:176
 msgid "Proxy username:"
 msgstr "Корисничко име посредника:"
 
-#: src/audacious/ui_preferences.c:180
+#: src/audacious/ui_preferences.c:177
 msgid "Proxy password:"
 msgstr "Лозинка посредника:"
 
-#: src/audacious/ui_preferences.c:184
+#: src/audacious/ui_preferences.c:181
 msgid "Proxy Configuration"
 msgstr "Подешавања посредника"
 
-#: src/audacious/ui_preferences.c:185
+#: src/audacious/ui_preferences.c:182
 msgid "Enable proxy usage"
 msgstr "Укључи коришћење посредника"
 
-#: src/audacious/ui_preferences.c:188
+#: src/audacious/ui_preferences.c:185
 msgid "Use authentication with proxy"
 msgstr "Користи потврђивање идентитета са посредником"
 
-#: src/audacious/ui_preferences.c:196
+#: src/audacious/ui_preferences.c:193
 msgid "Auto character encoding detector for:"
 msgstr "Детектор аутоматског кодирања знакова за:"
 
-#: src/audacious/ui_preferences.c:201
+#: src/audacious/ui_preferences.c:198
 msgid "Fallback character encodings:"
 msgstr "Резервно кодирање знакова:"
 
-#: src/audacious/ui_preferences.c:205
+#: src/audacious/ui_preferences.c:202
 msgid "Behavior"
 msgstr "Понашање"
 
-#: src/audacious/ui_preferences.c:206
+#: src/audacious/ui_preferences.c:203
 msgid "Continue playback on startup"
 msgstr "Настави репродуковање на почетку"
 
-#: src/audacious/ui_preferences.c:208
+#: src/audacious/ui_preferences.c:205
 msgid "Advance when the current song is deleted"
 msgstr "Напредуј када је обрисана текућа песма"
 
-#: src/audacious/ui_preferences.c:210
+#: src/audacious/ui_preferences.c:207
 msgid "Clear the playlist when opening files"
 msgstr "Очисти листу нумера приликом отварања датотека"
 
-#: src/audacious/ui_preferences.c:212
+#: src/audacious/ui_preferences.c:209
 msgid "Open files in a temporary playlist"
 msgstr "Отвори датотеке у привременој листи нумера"
 
-#: src/audacious/ui_preferences.c:214
+#: src/audacious/ui_preferences.c:211
 msgid "Metadata"
 msgstr "Метаподаци"
 
-#: src/audacious/ui_preferences.c:215
+#: src/audacious/ui_preferences.c:212
 msgid "Do not load metadata for songs until played"
 msgstr "Не учитавај метаподатке за песме док се не пусте"
 
-#: src/audacious/ui_preferences.c:233
+#: src/audacious/ui_preferences.c:230
 msgid "TITLE"
 msgstr "НАСЛОВ"
 
-#: src/audacious/ui_preferences.c:234
+#: src/audacious/ui_preferences.c:231
 msgid "ARTIST - TITLE"
 msgstr "ИЗВОЂАЧ — НАСЛОВ"
 
-#: src/audacious/ui_preferences.c:235
+#: src/audacious/ui_preferences.c:232
 msgid "ARTIST - ALBUM - TITLE"
 msgstr "ИЗВОЂАЧ — АЛБУМ — НАСЛОВ"
 
-#: src/audacious/ui_preferences.c:236
+#: src/audacious/ui_preferences.c:233
 msgid "ARTIST - ALBUM - TRACK. TITLE"
 msgstr "ИЗВОЂАЧ — АЛБУМ — БРОЈ. НАСЛОВ"
 
-#: src/audacious/ui_preferences.c:237
+#: src/audacious/ui_preferences.c:234
 msgid "ARTIST [ ALBUM ] - TRACK. TITLE"
 msgstr "ИЗВОЂАЧ [ АЛБУМ ] — БРОЈ. НАСЛОВ"
 
-#: src/audacious/ui_preferences.c:238
+#: src/audacious/ui_preferences.c:235
 msgid "ALBUM - TITLE"
 msgstr "АЛБУМ — НАСЛОВ"
 
-#: src/audacious/ui_preferences.c:577
+#: src/audacious/ui_preferences.c:556
 msgid "Category"
 msgstr "Категорија"
 
-#: src/audacious/ui_preferences.c:801
+#: src/audacious/ui_preferences.c:780
 msgid "Popup Information Settings"
 msgstr "Поставке облачића информација"
 
-#: src/audacious/ui_preferences.c:810
+#: src/audacious/ui_preferences.c:789
 msgid "Cover image retrieve"
 msgstr "Учитавање слике омота"
 
-#: src/audacious/ui_preferences.c:815
+#: src/audacious/ui_preferences.c:794
 msgid ""
 "While searching for the album's cover, Audacious looks for certain words in "
 "the filename. You can specify those words in the lists below, separated "
 "using commas."
-msgstr ""
-"Док тражи слике омота албума, Безочник тражи одређене речи у називу "
-"датотеке. Можете навести те речи у списку доле, раздвојене зарезима."
+msgstr "Док тражи слике омота албума, Безочник тражи одређене речи у називу датотеке. Можете навести те речи у списку доле, раздвојене зарезима."
 
-#: src/audacious/ui_preferences.c:832
+#: src/audacious/ui_preferences.c:811
 msgid "Exclude:"
 msgstr "Искључи:"
 
-#: src/audacious/ui_preferences.c:839
+#: src/audacious/ui_preferences.c:818
 msgid "Include:"
 msgstr "Укључи:"
 
-#: src/audacious/ui_preferences.c:856
+#: src/audacious/ui_preferences.c:835
 msgid "Recursively search for cover"
 msgstr "Рекурзивно тражи слику омота"
 
-#: src/audacious/ui_preferences.c:866
+#: src/audacious/ui_preferences.c:845
 msgid "Search depth: "
 msgstr "Дубина претраге: "
 
-#: src/audacious/ui_preferences.c:880
+#: src/audacious/ui_preferences.c:859
 msgid "Use per-file cover"
 msgstr "Користи један омот по датотеци"
 
-#: src/audacious/ui_preferences.c:883
+#: src/audacious/ui_preferences.c:862
 msgid "Miscellaneous"
 msgstr "Разно"
 
-#: src/audacious/ui_preferences.c:892
+#: src/audacious/ui_preferences.c:871
 msgid "Show Progress bar for the current track"
 msgstr "Прикажи индикатор напредовања за текућу нумеру"
 
-#: src/audacious/ui_preferences.c:902
+#: src/audacious/ui_preferences.c:881
 msgid "Delay until filepopup comes up: "
 msgstr "Кашњење до појављивања облачића датотеке: "
 
-#: src/audacious/ui_preferences.c:1340
+#: src/audacious/ui_preferences.c:1309
 msgid "Custom"
 msgstr "Произвољно"
 
-#: src/audacious/ui_preferences.c:1383
+#: src/audacious/ui_preferences.c:1352
 msgid "Song Display"
 msgstr "Приказ песме"
 
-#: src/audacious/ui_preferences.c:1392
+#: src/audacious/ui_preferences.c:1361
 msgid "Show song numbers"
 msgstr "Прикажи бројеве песама"
 
-#: src/audacious/ui_preferences.c:1403
+#: src/audacious/ui_preferences.c:1372
 msgid "Show leading zeroes (02:00 instead of 2:00)"
 msgstr "Прикажи почетне нуле (02:00 уместо 2:00)"
 
-#: src/audacious/ui_preferences.c:1425
+#: src/audacious/ui_preferences.c:1394
 msgid "Show information about titlestring format"
 msgstr "Прикажи информације о формату наслова"
 
-#: src/audacious/ui_preferences.c:1441
+#: src/audacious/ui_preferences.c:1410
 msgid "Custom string:"
 msgstr "Произвољна ниска:"
 
-#: src/audacious/ui_preferences.c:1448
+#: src/audacious/ui_preferences.c:1417
 msgid "Title format:"
 msgstr "Формат наслова:"
 
-#: src/audacious/ui_preferences.c:1459
+#: src/audacious/ui_preferences.c:1428
 msgid "Popup Information"
 msgstr "Облачић информација"
 
-#: src/audacious/ui_preferences.c:1474
+#: src/audacious/ui_preferences.c:1443
 msgid "Show popup information for playlist entries"
 msgstr "Прикажи облачић информација за ставке на списку нумера"
 
-#: src/audacious/ui_preferences.c:1475
+#: src/audacious/ui_preferences.c:1444
 msgid ""
 "Toggles popup information window for the pointed entry in the playlist. The "
 "window shows title of song, name of album, genre, year of publish, track "
 "number, track length, and artwork."
-msgstr ""
-"Укључује/искључује прозор облачића информација за указану ставку на списку "
-"нумера. Прозор приказује наслов песме, име албума, жанр, годину издавања, "
-"број нумере, дужину нумере и слику омота."
+msgstr "Укључује/искључује прозор облачића информација за указану ставку на списку нумера. Прозор приказује наслов песме, име албума, жанр, годину издавања, број нумере, дужину нумере и слику омота."
 
-#: src/audacious/ui_preferences.c:1486
+#: src/audacious/ui_preferences.c:1455
 msgid "Edit settings for popup information"
 msgstr "Уредите поставке за облачић информација"
 
-#: src/audacious/ui_preferences.c:1575
+#: src/audacious/ui_preferences.c:1544
 msgid "Output plugin:"
 msgstr "Прикључак излаза:"
 
-#: src/audacious/ui_preferences.c:1634
+#: src/audacious/ui_preferences.c:1603
 msgid "Transport"
 msgstr "Пренос"
 
-#: src/audacious/ui_preferences.c:1634
+#: src/audacious/ui_preferences.c:1603
 msgid "Input"
 msgstr "Унос"
 
-#: src/audacious/ui_preferences.c:1635
+#: src/audacious/ui_preferences.c:1604
 msgid "Effect"
 msgstr "Ефекат"
 
-#: src/audacious/ui_preferences.c:1635
+#: src/audacious/ui_preferences.c:1604
 msgid "Visualization"
 msgstr "Приказивање"
 
-#: src/audacious/ui_preferences.c:1635
+#: src/audacious/ui_preferences.c:1604
 msgid "General"
 msgstr "Опште"
 
-#: src/audacious/ui_preferences.c:1675
+#: src/audacious/ui_preferences.c:1644
 msgid "Audacious Preferences"
 msgstr "Поставке Безочника"
 
-#: src/audacious/util.c:123
+#: src/audacious/util.c:120
 #, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr "Не могу да направим фасциклу (%s): %s\n"
 
-#: src/audtool/handlers_playlist.c:274
+#: src/audtool/handlers_playlist.c:273
 msgid "Position not found."
 msgstr "Положај није нађен."
 
-#: src/audtool/handlers_vitals.c:64
+#: src/audtool/handlers_vitals.c:63
 msgid "No song playing."
 msgstr "Није пуштена ниједна песма."
 
-#: src/libaudcore/tuple.c:685
+#: src/libaudcore/audstrings.c:199
+#, c-format
+msgid "Audio CD, track %s"
+msgstr "Звучни ЦД, нумера %s"
+
+#: src/libaudcore/tuple.c:536
 msgid "Mono"
 msgstr "Моно"
 
-#: src/libaudcore/tuple.c:687
+#: src/libaudcore/tuple.c:538
 msgid "Stereo"
 msgstr "Стерео"
 
-#: src/libaudcore/tuple.c:689
+#: src/libaudcore/tuple.c:540
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
@@ -731,347 +744,345 @@
 msgstr[1] "%d канала"
 msgstr[2] "%d канала"
 
-#: src/libaudgui/confirm.c:78
+#: src/libaudgui/about.c:52 src/libaudgui/about.c:115
+msgid "Credits"
+msgstr "Заслуге"
+
+#: src/libaudgui/about.c:52
+msgid "Translators"
+msgstr "Преводиоци"
+
+#: src/libaudgui/about.c:91
+msgid "About Audacious"
+msgstr "О Безочнику"
+
+#: src/libaudgui/confirm.c:76
 #, c-format
 msgid ""
 "Are you sure you want to close %s? If you do, any changes made since the "
 "playlist was exported will be lost."
-msgstr ""
-"Да ли сте сигурни да желите да затворите %s? Ако то урадите, све измене "
-"направљене од када је извежен списак нумера биће изгубљене."
+msgstr "Да ли сте сигурни да желите да затворите %s? Ако то урадите, све измене направљене од када је извежен списак нумера биће изгубљене."
 
-#: src/libaudgui/confirm.c:91
+#: src/libaudgui/confirm.c:89
 msgid "_Don't show this message again"
 msgstr "_Не приказуј више ову поруку"
 
-#: src/libaudgui/confirm.c:128
+#: src/libaudgui/confirm.c:126
 msgid "Rename Playlist"
 msgstr "Преименуј списак нумера"
 
-#: src/libaudgui/effects-menu.c:76
+#: src/libaudgui/effects-menu.c:74
 msgid "settings ..."
 msgstr "подешавања ..."
 
-#: src/libaudgui/equalizer.c:52
+#: src/libaudgui/equalizer.c:51
 msgid "_Enable"
 msgstr "_Укључи"
 
-#: src/libaudgui/equalizer.c:124
+#: src/libaudgui/equalizer.c:123
 msgid "31 Hz"
 msgstr "31 Hz"
 
-#: src/libaudgui/equalizer.c:124
+#: src/libaudgui/equalizer.c:123
 msgid "63 Hz"
 msgstr "63 Hz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "125 Hz"
 msgstr "125 Hz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "250 Hz"
 msgstr "250 Hz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "500 Hz"
 msgstr "500 Hz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "1 kHz"
 msgstr "1 kHz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "2 kHz"
 msgstr "2 kHz"
 
-#: src/libaudgui/equalizer.c:126
+#: src/libaudgui/equalizer.c:125
 msgid "4 kHz"
 msgstr "4 kHz"
 
-#: src/libaudgui/equalizer.c:126
+#: src/libaudgui/equalizer.c:125
 msgid "8 kHz"
 msgstr "8 kHz"
 
-#: src/libaudgui/equalizer.c:126
+#: src/libaudgui/equalizer.c:125
 msgid "16 kHz"
 msgstr "16 kHz"
 
-#: src/libaudgui/equalizer.c:131
+#: src/libaudgui/equalizer.c:130
 msgid "Equalizer"
 msgstr "Уједначавач"
 
-#: src/libaudgui/equalizer.c:147
+#: src/libaudgui/equalizer.c:146
 msgid "Preamp"
 msgstr "Претпојачање"
 
-#: src/libaudgui/infopopup.c:211
+#: src/libaudgui/infopopup.c:207
 msgid "Track Number"
 msgstr "Број нумере"
 
-#: src/libaudgui/infopopup.c:213
+#: src/libaudgui/infopopup.c:209
 msgid "Track Length"
 msgstr "Дужина нумере"
 
-#: src/libaudgui/infowin.c:77
+#: src/libaudgui/infowin.c:75
 msgid "Acid Jazz"
 msgstr "Кисели џез"
 
-#: src/libaudgui/infowin.c:78
+#: src/libaudgui/infowin.c:76
 msgid "Acid Rock"
 msgstr "Кисели рок"
 
-#: src/libaudgui/infowin.c:79
+#: src/libaudgui/infowin.c:77
 msgid "Ambient"
 msgstr "Амбијентална"
 
-#: src/libaudgui/infowin.c:80
+#: src/libaudgui/infowin.c:78
 msgid "Bebop"
 msgstr "Бебоп"
 
-#: src/libaudgui/infowin.c:81
+#: src/libaudgui/infowin.c:79
 msgid "Bluegrass"
 msgstr "Блуграс"
 
-#: src/libaudgui/infowin.c:82
+#: src/libaudgui/infowin.c:80
 msgid "Blues"
 msgstr "Блуз"
 
-#: src/libaudgui/infowin.c:83
+#: src/libaudgui/infowin.c:81
 msgid "Chamber Music"
 msgstr "Камерна музика"
 
-#: src/libaudgui/infowin.c:84
+#: src/libaudgui/infowin.c:82
 msgid "Classical"
 msgstr "Класична"
 
-#: src/libaudgui/infowin.c:85
+#: src/libaudgui/infowin.c:83
 msgid "Country"
 msgstr "Кантри"
 
-#: src/libaudgui/infowin.c:86
+#: src/libaudgui/infowin.c:84
 msgid "Death Metal"
 msgstr "Мртви метал"
 
-#: src/libaudgui/infowin.c:87
+#: src/libaudgui/infowin.c:85
 msgid "Disco"
 msgstr "Диско"
 
-#: src/libaudgui/infowin.c:88
+#: src/libaudgui/infowin.c:86
 msgid "Easy Listening"
 msgstr "Лако слушање"
 
-#: src/libaudgui/infowin.c:89
+#: src/libaudgui/infowin.c:87
 msgid "Folk"
 msgstr "Народна"
 
-#: src/libaudgui/infowin.c:90
+#: src/libaudgui/infowin.c:88
 msgid "Funk"
 msgstr "Фанки"
 
-#: src/libaudgui/infowin.c:91
+#: src/libaudgui/infowin.c:89
 msgid "Gangsta Rap"
 msgstr "Гангста реп"
 
-#: src/libaudgui/infowin.c:92
+#: src/libaudgui/infowin.c:90
 msgid "Gospel"
 msgstr "Верска"
 
-#: src/libaudgui/infowin.c:93
+#: src/libaudgui/infowin.c:91
 msgid "Grunge"
 msgstr "Гранџ"
 
-#: src/libaudgui/infowin.c:94
+#: src/libaudgui/infowin.c:92
 msgid "Hard Rock"
 msgstr "Хард рок"
 
-#: src/libaudgui/infowin.c:95
+#: src/libaudgui/infowin.c:93
 msgid "Heavy Metal"
 msgstr "Хеви метал"
 
-#: src/libaudgui/infowin.c:96
+#: src/libaudgui/infowin.c:94
 msgid "Hip-hop"
 msgstr "Хип-Хоп"
 
-#: src/libaudgui/infowin.c:97
+#: src/libaudgui/infowin.c:95
 msgid "House"
 msgstr "Хаус"
 
-#: src/libaudgui/infowin.c:98
+#: src/libaudgui/infowin.c:96
 msgid "Jazz"
 msgstr "Џез"
 
-#: src/libaudgui/infowin.c:99
+#: src/libaudgui/infowin.c:97
 msgid "Jungle"
 msgstr "Џунгла"
 
-#: src/libaudgui/infowin.c:100
+#: src/libaudgui/infowin.c:98
 msgid "Metal"
 msgstr "Метал"
 
-#: src/libaudgui/infowin.c:101
+#: src/libaudgui/infowin.c:99
 msgid "New Age"
 msgstr "Ново доба"
 
-#: src/libaudgui/infowin.c:102
+#: src/libaudgui/infowin.c:100
 msgid "New Wave"
 msgstr "Нови талас"
 
-#: src/libaudgui/infowin.c:103
+#: src/libaudgui/infowin.c:101
 msgid "Noise"
 msgstr "Бука"
 
-#: src/libaudgui/infowin.c:104
+#: src/libaudgui/infowin.c:102
 msgid "Pop"
 msgstr "Поп"
 
-#: src/libaudgui/infowin.c:105
+#: src/libaudgui/infowin.c:103
 msgid "Punk Rock"
 msgstr "Панк Рок"
 
-#: src/libaudgui/infowin.c:106
+#: src/libaudgui/infowin.c:104
 msgid "Rap"
 msgstr "Реп"
 
-#: src/libaudgui/infowin.c:107
+#: src/libaudgui/infowin.c:105
 msgid "Reggae"
 msgstr "Реге"
 
-#: src/libaudgui/infowin.c:108
+#: src/libaudgui/infowin.c:106
 msgid "Rock"
 msgstr "Рок"
 
-#: src/libaudgui/infowin.c:109
+#: src/libaudgui/infowin.c:107
 msgid "Rock and Roll"
 msgstr "Рокенрол"
 
-#: src/libaudgui/infowin.c:110
+#: src/libaudgui/infowin.c:108
 msgid "Rhythm and Blues"
 msgstr "Ритам и Блуз"
 
-#: src/libaudgui/infowin.c:111
+#: src/libaudgui/infowin.c:109
 msgid "Ska"
 msgstr "Ска"
 
-#: src/libaudgui/infowin.c:112
+#: src/libaudgui/infowin.c:110
 msgid "Soul"
 msgstr "Соул"
 
-#: src/libaudgui/infowin.c:113
+#: src/libaudgui/infowin.c:111
 msgid "Swing"
 msgstr "Свинг"
 
-#: src/libaudgui/infowin.c:114
+#: src/libaudgui/infowin.c:112
 msgid "Techno"
 msgstr "Техно"
 
-#: src/libaudgui/infowin.c:115
+#: src/libaudgui/infowin.c:113
 msgid "Trip-hop"
 msgstr "Трип-Хоп"
 
-#: src/libaudgui/infowin.c:175 src/libaudgui/infowin.c:361
-#: src/libaudgui/infowin.c:364 src/libaudgui/infowin.c:367
+#: src/libaudgui/infowin.c:177 src/libaudgui/infowin.c:363
+#: src/libaudgui/infowin.c:366 src/libaudgui/infowin.c:369
 msgid "n/a"
 msgstr "недоступно"
 
-#: src/libaudgui/infowin.c:265
+#: src/libaudgui/infowin.c:267
 msgid "Metadata updated successfully"
 msgstr "Метаподаци су успешно освежени"
 
-#: src/libaudgui/infowin.c:270
+#: src/libaudgui/infowin.c:272
 msgid "Metadata updating failed"
 msgstr "Освежавање метаподатака није успело"
 
-#: src/libaudgui/infowin.c:318
+#: src/libaudgui/infowin.c:320
 msgid "Track Information"
 msgstr "Информације о нумери"
 
-#: src/libaudgui/infowin.c:350
+#: src/libaudgui/infowin.c:352
 msgid "Format:"
 msgstr "Формат:"
 
-#: src/libaudgui/infowin.c:354
+#: src/libaudgui/infowin.c:356
 msgid "Quality:"
 msgstr "Квалитет:"
 
-#: src/libaudgui/infowin.c:357
+#: src/libaudgui/infowin.c:359
 msgid "Bitrate:"
 msgstr "Проток бита:"
 
-#: src/libaudgui/infowin.c:387
+#: src/libaudgui/infowin.c:389
 msgid "Title"
 msgstr "Наслов"
 
-#: src/libaudgui/infowin.c:399
+#: src/libaudgui/infowin.c:401
 msgid "Artist"
 msgstr "Извођач"
 
-#: src/libaudgui/infowin.c:411
+#: src/libaudgui/infowin.c:413
 msgid "Album"
 msgstr "Албум"
 
-#: src/libaudgui/infowin.c:423
+#: src/libaudgui/infowin.c:425
 msgid "Comment"
 msgstr "Коментар"
 
-#: src/libaudgui/infowin.c:435
+#: src/libaudgui/infowin.c:437
 msgid "Genre"
 msgstr "Жанр"
 
-#: src/libaudgui/infowin.c:456
+#: src/libaudgui/infowin.c:458
 msgid "Year"
 msgstr "Година"
 
-#: src/libaudgui/infowin.c:467
+#: src/libaudgui/infowin.c:469
 msgid "Track Number"
 msgstr "Број нумере"
 
-#: src/libaudgui/infowin.c:549
+#: src/libaudgui/infowin.c:548
 #, c-format
 msgid "%d kb/s"
 msgstr "%d kb/s"
 
-#: src/libaudgui/infowin.c:579
+#: src/libaudgui/infowin.c:575
 #, c-format
 msgid "No info available for %s.\n"
 msgstr "Нису доступни подаци за %s.\n"
 
-#: src/libaudgui/jump-to-time.c:75
+#: src/libaudgui/jump-to-time.c:72
 msgid "Jump to Time"
 msgstr "Пређи на време"
 
-#: src/libaudgui/jump-to-time.c:90
+#: src/libaudgui/jump-to-time.c:87
 msgid "mm:ss"
 msgstr "мм:сс"
 
-#: src/libaudgui/playlists.c:39
+#: src/libaudgui/playlists.c:33
 msgid "Export Playlist"
 msgstr "Извези листу"
 
-#: src/libaudgui/playlists.c:39
+#: src/libaudgui/playlists.c:33
 msgid "Import Playlist"
 msgstr "Увези листу"
 
-#: src/libaudgui/playlists.c:72
+#: src/libaudgui/playlists.c:66
 #, c-format
 msgid "Overwrite %s?"
 msgstr "Да препишем %s?"
 
-#: src/libaudgui/queue-manager.c:185
+#: src/libaudgui/queue-manager.c:196
 msgid "Queue Manager"
 msgstr "Управник редоследа"
 
-#: src/libaudgui/ui_about.c:69
-msgid "About Audacious"
-msgstr "О Безочнику"
-
-#: src/libaudgui/ui_about.c:90 src/libaudgui/ui_credits.c:122
-msgid "Credits"
-msgstr "Заслуге"
-
-#: src/libaudgui/ui_credits.c:126
-msgid "Translators"
-msgstr "Преводиоци"
-
 #: src/libaudgui/ui_fileopener.c:109
 msgid "Open Files"
 msgstr "Отвори датотеке"
@@ -1088,60 +1099,60 @@
 msgid "Close dialog on Add"
 msgstr "Затвори прозорче на „Додај“"
 
-#: src/libaudgui/ui_jumptotrack.c:103 src/libaudgui/ui_jumptotrack.c:111
-#: src/libaudgui/ui_jumptotrack.c:322
+#: src/libaudgui/ui_jumptotrack.c:109 src/libaudgui/ui_jumptotrack.c:117
+#: src/libaudgui/ui_jumptotrack.c:326
 msgid "_Queue"
 msgstr "Стави у _ред"
 
-#: src/libaudgui/ui_jumptotrack.c:109
+#: src/libaudgui/ui_jumptotrack.c:115
 msgid "Un_queue"
 msgstr "Избаци из _реда"
 
-#: src/libaudgui/ui_jumptotrack.c:239
-msgid "Jump to Track"
-msgstr "Пређи на нумеру"
+#: src/libaudgui/ui_jumptotrack.c:258
+msgid "Jump to Song"
+msgstr "Пређи на песму"
 
-#: src/libaudgui/ui_jumptotrack.c:277
+#: src/libaudgui/ui_jumptotrack.c:281
 msgid "Filter: "
 msgstr "Филтер: "
 
-#: src/libaudgui/ui_jumptotrack.c:278
+#: src/libaudgui/ui_jumptotrack.c:282
 msgid "_Filter:"
 msgstr "_Филтер:"
 
-#: src/libaudgui/ui_jumptotrack.c:288
+#: src/libaudgui/ui_jumptotrack.c:292
 msgid "Remember"
 msgstr "Запамти"
 
-#: src/libaudgui/ui_jumptotrack.c:295
+#: src/libaudgui/ui_jumptotrack.c:299
 msgid "Clea_r"
 msgstr "Очис_ти"
 
-#: src/libaudgui/ui_jumptotrack.c:315
+#: src/libaudgui/ui_jumptotrack.c:319
 msgid "Close on Jump"
 msgstr "Затвори после скока"
 
-#: src/libaudgui/ui_playlist_manager.c:250
+#: src/libaudgui/ui_playlist_manager.c:253
 msgid "Playlist Manager"
 msgstr "Управник списка нумера"
 
-#: src/libaudgui/ui_playlist_manager.c:277
+#: src/libaudgui/ui_playlist_manager.c:280
 msgid "Entries"
 msgstr "Ставке"
 
-#: src/libaudgui/ui_playlist_manager.c:298
+#: src/libaudgui/ui_playlist_manager.c:301
 msgid "_Rename"
 msgstr "_Преименуј"
 
-#: src/libaudgui/ui_playlist_manager.c:322
+#: src/libaudgui/ui_playlist_manager.c:325
 msgid "_Close dialog on activating playlist"
 msgstr "_Затвори прозорче након активирања списка нумера"
 
-#: src/libaudgui/ui_urlopener.c:51
+#: src/libaudgui/ui_urlopener.c:48
 msgid "Open URL"
 msgstr "Отвори адресу"
 
-#: src/libaudgui/ui_urlopener.c:51
+#: src/libaudgui/ui_urlopener.c:48
 msgid "Add URL"
 msgstr "Додај адресу"
 
@@ -1149,39 +1160,36 @@
 msgid ""
 "\n"
 "(Further messages have been hidden.)"
-msgstr ""
-"\n"
-"(Додатне поруке су скривене.)"
+msgstr "\n(Додатне поруке су скривене.)"
 
 #: src/libeggsmclient/eggdesktopfile.c:165
 msgid "File is not a valid .desktop file"
 msgstr "Датотека није исправна „.desktop“ датотека"
 
-#: src/libeggsmclient/eggdesktopfile.c:188
+#: src/libeggsmclient/eggdesktopfile.c:191
 #, c-format
 msgid "Unrecognized desktop file Version '%s'"
 msgstr "Није познато издање „%s“ датотеке за радну површ"
 
-#: src/libeggsmclient/eggdesktopfile.c:967
+#: src/libeggsmclient/eggdesktopfile.c:974
 #, c-format
 msgid "Starting %s"
 msgstr "Покрећем %s"
 
-#: src/libeggsmclient/eggdesktopfile.c:1108
+#: src/libeggsmclient/eggdesktopfile.c:1116
 msgid "Application does not accept documents on command line"
 msgstr "Програм не прихвата документа из линије наредби"
 
-#: src/libeggsmclient/eggdesktopfile.c:1176
+#: src/libeggsmclient/eggdesktopfile.c:1184
 #, c-format
 msgid "Unrecognized launch option: %d"
 msgstr "Непозната опција покретања: %d"
 
-#: src/libeggsmclient/eggdesktopfile.c:1375
+#: src/libeggsmclient/eggdesktopfile.c:1391
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
-msgstr ""
-"Не могу да проследим адресе документа у ставку радне површи „Type=Link“"
+msgstr "Не могу да проследим адресе документа у ставку радне површи „Type=Link“"
 
-#: src/libeggsmclient/eggdesktopfile.c:1396
+#: src/libeggsmclient/eggdesktopfile.c:1412
 msgid "Not a launchable item"
 msgstr "Није ставка за покретање"
 
@@ -1212,5 +1220,3 @@
 #: src/libeggsmclient/eggsmclient.c:254
 msgid "Show session management options"
 msgstr "Приказује могућности управљања сесијом"
-
-

audacious-3.1.1.tar.bz2/po/uk.po -> audacious-3.2.4.tar.bz2/po/uk.po Changed

@@ -1,30 +1,30 @@
-# Translation of audacious.pot to Ukrainian for Beep Media Player.
-# Copyright (C) 2005 Mykola Lynnyk <definer@users.sf.net> 
-# Переклад здійснено на основі перекладу XMMS 
-# Дмитра Ковальова 
-# Based on XMMS translation by Dmytro Koval'ov <kov@tokyo.email.ne.jp>
-# Kostyantyn Fedenko <fedenko@ukr.net>, 2011.
+# Ukrainian translation for Audacious
+# Copyright (C) Audacious translators
+# This file is distributed under the same license as the Audacious package.
 #
+# Translators:
+# Kostyantyn Fedenko <fedenko@ukr.net>, 2011.
+# NaiLi Rootaerc <theism@mail.ru>, 2012.
+# Rax Garfield (http://biokillaz.com/), 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: audacious 3\n"
-"Report-Msgid-Bugs-To: http://jira.atheme.org/\n"
-"POT-Creation-Date: 2011-07-15 08:05-0400\n"
-"PO-Revision-Date: 2011-07-15 11:24+0300\n"
-"Last-Translator: Kostyantyn Fedenko <fedenko@ukr.net>\n"
-"Language-Team: Ukrainian <translation@linux.org.ua>\n"
-"Language: uk\n"
+"Project-Id-Version: Audacious\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2012-01-11 08:54-0500\n"
+"PO-Revision-Date: 2012-01-13 11:46+0000\n"
+"Last-Translator: NaiLi Rootaerc <theism@mail.ru>\n"
+"Language-Team: Ukrainian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: src/audacious/adder.c:71
+#: src/audacious/adder.c:77
 msgid "Searching ..."
 msgstr "Пошук ..."
 
-#: src/audacious/adder.c:99
+#: src/audacious/adder.c:113
 #, c-format
 msgid "%d file found"
 msgid_plural "%d files found"
@@ -32,256 +32,264 @@
 msgstr[1] "Знайдено %d файли"
 msgstr[2] "Знайдено %d файлів"
 
-#: src/audacious/chardet.c:37
+#: src/audacious/chardet.c:39
 msgid " (invalid UTF-8)"
 msgstr " (недопустима послідовність Юнікод)"
 
-#: src/audacious/credits.c:35
+#: src/audacious/credits.c:37
 msgid "Core developers:"
 msgstr "Основні розробники:"
 
-#: src/audacious/credits.c:49
+#: src/audacious/credits.c:51
 msgid "Graphics:"
 msgstr "Графіка:"
 
-#: src/audacious/credits.c:54
+#: src/audacious/credits.c:56
 msgid "Default skin:"
 msgstr "Стандартна обкладинка:"
 
-#: src/audacious/credits.c:60
+#: src/audacious/credits.c:62
 msgid "Plugin development:"
 msgstr "Розробка модулів:"
 
-#: src/audacious/credits.c:83
+#: src/audacious/credits.c:85
 msgid "Patch authors:"
 msgstr "Автори патчів:"
 
-#: src/audacious/credits.c:126
+#: src/audacious/credits.c:131
 msgid "1.x developers:"
 msgstr "Розробники версії 1.x:"
 
-#: src/audacious/credits.c:148
+#: src/audacious/credits.c:153
 msgid "BMP Developers:"
 msgstr "Розробники BMP:"
 
-#: src/audacious/credits.c:180
+#: src/audacious/credits.c:185
 msgid "Belarusian:"
 msgstr "Білоруська:"
 
-#: src/audacious/credits.c:183
+#: src/audacious/credits.c:188
 msgid "Basque:"
 msgstr "Баскська:"
 
-#: src/audacious/credits.c:186
+#: src/audacious/credits.c:191
 msgid "Brazilian Portuguese:"
 msgstr "Бразильська португальська:"
 
-#: src/audacious/credits.c:190
+#: src/audacious/credits.c:196
 msgid "Breton:"
 msgstr "Бретонська:"
 
-#: src/audacious/credits.c:193
+#: src/audacious/credits.c:199
 msgid "Bulgarian:"
 msgstr "Болгарська:"
 
-#: src/audacious/credits.c:196
+#: src/audacious/credits.c:202
 msgid "Catalan:"
 msgstr "Каталонська:"
 
-#: src/audacious/credits.c:199
+#: src/audacious/credits.c:206
 msgid "Chinese:"
 msgstr "Китайська:"
 
-#: src/audacious/credits.c:202
+#: src/audacious/credits.c:209
 msgid "Croatian:"
 msgstr "Хорватська:"
 
-#: src/audacious/credits.c:205
+#: src/audacious/credits.c:212
 msgid "Czech:"
 msgstr "Чеська:"
 
-#: src/audacious/credits.c:208
+#: src/audacious/credits.c:215
 msgid "Dutch:"
 msgstr "Нідерландська:"
 
-#: src/audacious/credits.c:212
+#: src/audacious/credits.c:219
 msgid "Estonian:"
 msgstr "Естонська:"
 
-#: src/audacious/credits.c:215
+#: src/audacious/credits.c:222
 msgid "Finnish:"
 msgstr "Фінська:"
 
-#: src/audacious/credits.c:220
+#: src/audacious/credits.c:227
 msgid "French:"
 msgstr "Французька:"
 
-#: src/audacious/credits.c:226
+#: src/audacious/credits.c:233
 msgid "German:"
 msgstr "Німецька:"
 
-#: src/audacious/credits.c:233
+#: src/audacious/credits.c:240
 msgid "Georgian:"
 msgstr "Грузинська:"
 
-#: src/audacious/credits.c:236
+#: src/audacious/credits.c:243
 msgid "Greek:"
 msgstr "Грецька:"
 
-#: src/audacious/credits.c:241
+#: src/audacious/credits.c:248
 msgid "Hindi:"
 msgstr "Хінді:"
 
-#: src/audacious/credits.c:244
+#: src/audacious/credits.c:251
 msgid "Hungarian:"
 msgstr "Угорська:"
 
-#: src/audacious/credits.c:248
+#: src/audacious/credits.c:255
 msgid "Italian:"
 msgstr "Італійська:"
 
-#: src/audacious/credits.c:252
+#: src/audacious/credits.c:260
 msgid "Japanese:"
 msgstr "Японська:"
 
-#: src/audacious/credits.c:255
+#: src/audacious/credits.c:263
 msgid "Korean:"
 msgstr "Корейська:"
 
-#: src/audacious/credits.c:258
+#: src/audacious/credits.c:266
 msgid "Latvian:"
 msgstr "Латиська:"
 
-#: src/audacious/credits.c:261
+#: src/audacious/credits.c:269
 msgid "Lithuanian:"
 msgstr "Литовська:"
 
-#: src/audacious/credits.c:265
+#: src/audacious/credits.c:274
 msgid "Macedonian:"
 msgstr "Македонська:"
 
-#: src/audacious/credits.c:268
+#: src/audacious/credits.c:277
+msgid "Mexican Spanish:"
+msgstr "Іспанська мова, Мексика:"
+
+#: src/audacious/credits.c:280
 msgid "Polish:"
 msgstr "Польська:"
 
-#: src/audacious/credits.c:274
+#: src/audacious/credits.c:287
 msgid "Portuguese:"
 msgstr "Португальська:"
 
-#: src/audacious/credits.c:277
+#: src/audacious/credits.c:290
 msgid "Romanian:"
 msgstr "Румунська:"
 
-#: src/audacious/credits.c:281
+#: src/audacious/credits.c:294
 msgid "Russian:"
 msgstr "Російська:"
 
-#: src/audacious/credits.c:285
+#: src/audacious/credits.c:298
 msgid "Serbian (Latin):"
 msgstr "Сербська (латиниця):"
 
-#: src/audacious/credits.c:288
+#: src/audacious/credits.c:301
 msgid "Serbian (Cyrillic):"
 msgstr "Сербська (кирилиця):"
 
-#: src/audacious/credits.c:291
+#: src/audacious/credits.c:305
 msgid "Simplified Chinese:"
 msgstr "Спрощена китайська:"
 
-#: src/audacious/credits.c:294
+#: src/audacious/credits.c:308
 msgid "Slovak:"
 msgstr "Словацька:"
 
-#: src/audacious/credits.c:297
+#: src/audacious/credits.c:312
 msgid "Spanish:"
 msgstr "Іспанська:"
 
-#: src/audacious/credits.c:304
+#: src/audacious/credits.c:320
 msgid "Swedish:"
 msgstr "Шведська:"
 
-#: src/audacious/credits.c:307
+#: src/audacious/credits.c:323
 msgid "Traditional Chinese:"
 msgstr "Традиційна китайська:"
 
-#: src/audacious/credits.c:312
+#: src/audacious/credits.c:329
 msgid "Turkish:"
 msgstr "Турецька:"
 
-#: src/audacious/credits.c:316
+#: src/audacious/credits.c:333
 msgid "Ukrainian:"
 msgstr "Українська:"
 
-#: src/audacious/credits.c:319
+#: src/audacious/credits.c:338
+msgid "Vietnamese:"
+msgstr "В’єтнамська:"
+
+#: src/audacious/credits.c:341
 msgid "Welsh:"
 msgstr "Валлійська:"
 
-#: src/audacious/drct.c:256
-msgid "Temporary Playlist"
-msgstr "Тимчасовий список відтворення"
-
-#: src/audacious/equalizer_preset.c:186
+#: src/audacious/equalizer_preset.c:180
 #, c-format
 msgid "Error importing Winamp EQF file '%s'"
 msgstr "Не вдалося імпортувати Winamp EQF файл '%s'"
 
-#: src/audacious/main.c:256
+#: src/audacious/main.c:243
 msgid "Skip backwards in playlist"
 msgstr "Перейти до попередньої доріжки у списку"
 
-#: src/audacious/main.c:257
+#: src/audacious/main.c:244
 msgid "Start playing current playlist"
 msgstr "Почати програвати поточний список"
 
-#: src/audacious/main.c:258
+#: src/audacious/main.c:245
 msgid "Pause current song"
 msgstr "Призупинити поточну пісню"
 
-#: src/audacious/main.c:259
+#: src/audacious/main.c:246
 msgid "Stop current song"
 msgstr "Зупинити поточну пісню"
 
-#: src/audacious/main.c:260
+#: src/audacious/main.c:247
 msgid "Pause if playing, play otherwise"
 msgstr "Призупинити, якщо що-небуть програється, в іншому випадку програвати"
 
-#: src/audacious/main.c:261
+#: src/audacious/main.c:248
 msgid "Skip forward in playlist"
 msgstr "Перейти до наступної доріжки у списку відтворення"
 
-#: src/audacious/main.c:262
+#: src/audacious/main.c:249
 msgid "Display Jump to File dialog"
 msgstr "Показати діалог переходу до файлу"
 
-#: src/audacious/main.c:263
+#: src/audacious/main.c:250
 msgid "Add files to the playlist"
 msgstr "Додати файли до списку відтворення"
 
-#: src/audacious/main.c:264
+#: src/audacious/main.c:251
 msgid "Add new files to a temporary playlist"
 msgstr "Додати нові файли до тимчасового списку відтворення"
 
-#: src/audacious/main.c:265
+#: src/audacious/main.c:252
 msgid "Display the main window"
 msgstr "Показати головне вікно"
 
-#: src/audacious/main.c:266
+#: src/audacious/main.c:253
 msgid "Show version"
 msgstr "Показати версію"
 
-#: src/audacious/main.c:267
+#: src/audacious/main.c:254
 msgid "Print debugging messages"
 msgstr "Друкувати повідомлення про налагодження"
 
-#: src/audacious/main.c:268
+#: src/audacious/main.c:255
+msgid "Headless mode (beta)"
+msgstr "Headless-режим (як демон і без X11, бета)"
+
+#: src/audacious/main.c:256
 msgid "FILE..."
 msgstr "ФАЙЛ..."
 
-#: src/audacious/main.c:280
+#: src/audacious/main.c:268
 msgid "- play multimedia files"
 msgstr "- програти мультимедійні файли"
 
-#: src/audacious/main.c:290
+#: src/audacious/main.c:278
 #, c-format
 msgid ""
 "%s: %s\n"
@@ -290,305 +298,310 @@
 "%s: %s\n"
 "Спробуйте `%s --help' для отримання докладнішого опису.\n"
 
-# TODO
-#: src/audacious/main.c:407
-msgid ""
-"Audacious seems to be already running but is not responding. You can start "
-"another instance of the program, but please be warned that this can cause "
-"data loss. If Audacious is not running, you can safely ignore this "
-"message. Press OK to start Audacious or Cancel to quit."
-msgstr ""
-"Audacious, здається, вже запущений, але не відповідає. Ви можете запустити "
-"ще один екземпляр програми, але, майте на увазі, що це може привести до "
-"втрати даних. Якщо Audacious не запущений, ви можете проігнорувати це "
-"повідомлення. Натисніть Гаразд, щоб почати Audacious або Відмінити для "
-"виходу."
-
-#: src/audacious/main.c:572
+#: src/audacious/main.c:573
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/audacious/playback.c:381
+#: src/audacious/playback.c:307
 #, c-format
 msgid "No decoder found for %s."
 msgstr "Не знайдено декодер для %s."
 
-#: src/audacious/playback.c:531
-msgid "Buffering ..."
-msgstr "Буферизація ..."
+#: src/audacious/playlist-files.c:53
+#, c-format
+msgid "Cannot %s %s: unsupported file extension."
+msgstr "Неможливо %s %s: розширення файлу не підтримується."
 
-#: src/audacious/playlist-new.c:303
-msgid "Untitled Playlist"
+#: src/audacious/playlist-files.c:54
+msgid "save"
+msgstr "зберегти"
+
+#: src/audacious/playlist-files.c:54
+msgid "load"
+msgstr "завантажити"
+
+#: src/audacious/playlist-new.c:131
+msgid "New Playlist"
 msgstr "Новий список відтворення"
 
-#: src/audacious/ui_preferences.c:87
+#: src/audacious/playlist-new.c:132
+msgid "Now Playing"
+msgstr "Зараз відтворюється"
+
+#: src/audacious/playlist-new.c:1630
+msgid ""
+"The playlist cannot be sorted because metadata scanning is still in progress"
+" (or has been disabled)."
+msgstr ""
+"Список відтворення неможливо відсортувати, поки сканування метаданих триває "
+"або вимкнено."
+
+#: src/audacious/ui_preferences.c:85
 msgid "Audio"
 msgstr "Звук"
 
-#: src/audacious/ui_preferences.c:88
+#: src/audacious/ui_preferences.c:86
 msgid "Network"
 msgstr "Мережа"
 
-#: src/audacious/ui_preferences.c:89 src/audacious/ui_preferences.c:1556
+#: src/audacious/ui_preferences.c:87 src/audacious/ui_preferences.c:1603
 msgid "Playlist"
 msgstr "Список відтворення"
 
-#: src/audacious/ui_preferences.c:90
+#: src/audacious/ui_preferences.c:88
 msgid "Plugins"
 msgstr "Модулі"
 
-#: src/audacious/ui_preferences.c:96 src/libaudgui/infopopup.c:204
+#: src/audacious/ui_preferences.c:94 src/libaudgui/infopopup.c:199
 msgid "Artist"
 msgstr "Виконавець"
 
-#: src/audacious/ui_preferences.c:97 src/libaudgui/infopopup.c:206
+#: src/audacious/ui_preferences.c:95 src/libaudgui/infopopup.c:201
 msgid "Album"
 msgstr "Альбом"
 
-#: src/audacious/ui_preferences.c:98 src/libaudgui/infopopup.c:202
-#: src/libaudgui/ui_playlist_manager.c:263
+#: src/audacious/ui_preferences.c:96 src/libaudgui/infopopup.c:197
+#: src/libaudgui/ui_playlist_manager.c:279
 msgid "Title"
 msgstr "Заголовок"
 
-#: src/audacious/ui_preferences.c:99
+#: src/audacious/ui_preferences.c:97
 msgid "Tracknumber"
 msgstr "Номер доріжки"
 
-#: src/audacious/ui_preferences.c:100 src/libaudgui/infopopup.c:208
+#: src/audacious/ui_preferences.c:98 src/libaudgui/infopopup.c:203
 msgid "Genre"
 msgstr "Стиль"
 
-#: src/audacious/ui_preferences.c:101
+#: src/audacious/ui_preferences.c:99
 msgid "Filename"
 msgstr "Ім'я файлу"
 
-#: src/audacious/ui_preferences.c:102
+#: src/audacious/ui_preferences.c:100
 msgid "Filepath"
 msgstr "Шлях до файлу"
 
-#: src/audacious/ui_preferences.c:103
+#: src/audacious/ui_preferences.c:101
 msgid "Date"
 msgstr "Дата"
 
-#: src/audacious/ui_preferences.c:104 src/libaudgui/infopopup.c:210
+#: src/audacious/ui_preferences.c:102 src/libaudgui/infopopup.c:205
 msgid "Year"
 msgstr "Рік"
 
-#: src/audacious/ui_preferences.c:105
+#: src/audacious/ui_preferences.c:103
 msgid "Comment"
 msgstr "Коментар"
 
-#: src/audacious/ui_preferences.c:106
+#: src/audacious/ui_preferences.c:104
 msgid "Codec"
 msgstr "Кодек"
 
-#: src/audacious/ui_preferences.c:107
+#: src/audacious/ui_preferences.c:105
 msgid "Quality"
 msgstr "Якість"
 
-#: src/audacious/ui_preferences.c:112
+#: src/audacious/ui_preferences.c:111
 msgid "None"
 msgstr "Нічого"
 
+#: src/audacious/ui_preferences.c:112
+msgid "Arabic"
+msgstr "Арабська"
+
 #: src/audacious/ui_preferences.c:113
-msgid "Japanese"
-msgstr "Японська"
+msgid "Baltic"
+msgstr "Балтійські мови"
 
 #: src/audacious/ui_preferences.c:114
-msgid "Taiwanese"
-msgstr "Тайванська"
-
-#: src/audacious/ui_preferences.c:115
 msgid "Chinese"
 msgstr "Китайська"
 
+#: src/audacious/ui_preferences.c:115
+msgid "Greek"
+msgstr "Грецька"
+
 #: src/audacious/ui_preferences.c:116
-msgid "Korean"
-msgstr "Корейська"
+msgid "Hebrew"
+msgstr "Іврит"
 
 #: src/audacious/ui_preferences.c:117
-msgid "Russian"
-msgstr "Російська"
+msgid "Japanese"
+msgstr "Японська"
 
 #: src/audacious/ui_preferences.c:118
-msgid "Greek"
-msgstr "Грецька"
+msgid "Korean"
+msgstr "Корейська"
 
 #: src/audacious/ui_preferences.c:119
-msgid "Hebrew"
-msgstr "Іврит"
+msgid "Polish"
+msgstr "Польська"
 
 #: src/audacious/ui_preferences.c:120
-msgid "Turkish"
-msgstr "Турецька"
+msgid "Russian"
+msgstr "Російська"
 
 #: src/audacious/ui_preferences.c:121
-msgid "Arabic"
-msgstr "Арабська"
+msgid "Taiwanese"
+msgstr "Тайванська"
 
 #: src/audacious/ui_preferences.c:122
-msgid "Polish"
-msgstr "Польська"
-
-#: src/audacious/ui_preferences.c:123
-msgid "Baltic"
-msgstr "Балтійські мови"
-
-#: src/audacious/ui_preferences.c:124
-msgid "Universal"
-msgstr "Універсальний режим"
-
-#: src/audacious/ui_preferences.c:146
-msgid "Single track mode"
-msgstr "Режим одного треку"
+msgid "Turkish"
+msgstr "Турецька"
 
-#: src/audacious/ui_preferences.c:147
+#: src/audacious/ui_preferences.c:144
 msgid "Album mode"
 msgstr "Режим альбому"
 
-#: src/audacious/ui_preferences.c:150
+#: src/audacious/ui_preferences.c:147
 msgid "Output Settings"
-msgstr ""
+msgstr "Параметри виводу"
 
-#: src/audacious/ui_preferences.c:152
-#, fuzzy
+#: src/audacious/ui_preferences.c:149
 msgid "Bit depth:"
-msgstr "Вихідна розрядність:"
+msgstr "Амплітудна розрядність:"
 
-#: src/audacious/ui_preferences.c:155
+#: src/audacious/ui_preferences.c:152
 msgid "Buffer size:"
 msgstr "Розмір буфера:"
 
-#: src/audacious/ui_preferences.c:157
+#: src/audacious/ui_preferences.c:154
 msgid "ms"
-msgstr ""
+msgstr "мс"
 
-#: src/audacious/ui_preferences.c:158
-#, fuzzy
+#: src/audacious/ui_preferences.c:155
 msgid "Use software volume control (not recommended)"
-msgstr "Програмне керування гучністю"
+msgstr "Програмно керувати гучністю (не рекомендовано)"
 
-#: src/audacious/ui_preferences.c:160
+#: src/audacious/ui_preferences.c:157
 msgid "Replay Gain"
 msgstr "Replay Gain"
 
-#: src/audacious/ui_preferences.c:161
+#: src/audacious/ui_preferences.c:158
 msgid "Enable Replay Gain"
 msgstr "Увімкнути Replay Gain"
 
-#: src/audacious/ui_preferences.c:164
+#: src/audacious/ui_preferences.c:161
 msgid "Prevent clipping (recommended)"
-msgstr ""
+msgstr "Запобігати зрізанню (рекомендовано)"
 
-#: src/audacious/ui_preferences.c:166
+#: src/audacious/ui_preferences.c:163
 msgid "Adjust Levels"
 msgstr "Регулювати рівні"
 
-#: src/audacious/ui_preferences.c:167
+#: src/audacious/ui_preferences.c:164
 msgid "Amplify all files:"
 msgstr "Підсилювати всі файли:"
 
-#: src/audacious/ui_preferences.c:169 src/audacious/ui_preferences.c:172
+#: src/audacious/ui_preferences.c:166 src/audacious/ui_preferences.c:169
 msgid "dB"
 msgstr "дБ"
 
-# untagged???
-#: src/audacious/ui_preferences.c:170
+#: src/audacious/ui_preferences.c:167
 msgid "Amplify untagged files:"
 msgstr "Підсилювати непозначені файли:"
 
-#: src/audacious/ui_preferences.c:175
+#: src/audacious/ui_preferences.c:172
 msgid "Proxy hostname:"
 msgstr "Адреса проксі-сервера:"
 
-#: src/audacious/ui_preferences.c:176
+#: src/audacious/ui_preferences.c:173
 msgid "Proxy port:"
 msgstr "Порт:"
 
-#: src/audacious/ui_preferences.c:179
+#: src/audacious/ui_preferences.c:176
 msgid "Proxy username:"
 msgstr "Ім'я користувача:"
 
-#: src/audacious/ui_preferences.c:180
+#: src/audacious/ui_preferences.c:177
 msgid "Proxy password:"
 msgstr "Пароль:"
 
-#: src/audacious/ui_preferences.c:184
+#: src/audacious/ui_preferences.c:181
 msgid "Proxy Configuration"
 msgstr "Конфігурація проксі"
 
-#: src/audacious/ui_preferences.c:185
+#: src/audacious/ui_preferences.c:182
 msgid "Enable proxy usage"
 msgstr "Використовувати проксі"
 
-#: src/audacious/ui_preferences.c:187
+#: src/audacious/ui_preferences.c:185
 msgid "Use authentication with proxy"
 msgstr "Використовувати автентифікацію"
 
-#: src/audacious/ui_preferences.c:189
-msgid ""
-"Changing these settings will require a restart of "
-"Audacious."
-msgstr ""
-"Зміна цих налаштувань потребує перезапуску Audacious.</"
-"span>"
-
 #: src/audacious/ui_preferences.c:193
 msgid "Auto character encoding detector for:"
 msgstr "Автоматичне визначення кодування символів для:"
 
-#: src/audacious/ui_preferences.c:201
+#: src/audacious/ui_preferences.c:198
 msgid "Fallback character encodings:"
 msgstr "Стандартне кодування символів:"
 
-#: src/audacious/ui_preferences.c:201
-msgid ""
-"List of character encodings used for fall back conversion of metadata. If "
-"automatic character encoding detector failed or has been disabled, encodings "
-"in this list would be treated as candidates of the encoding of metadata, and "
-"fall back conversion from these encodings to UTF-8 would be attempted."
-msgstr ""
-"Список кодувань, що використовуються при відображенні метаданих. Якщо "
-"автоматичне визначення кодування відключено або не спрацює, то для "
-"перетворення метаданих в UTF-8 будуть використані кодування з цього списку."
-
-#: src/audacious/ui_preferences.c:205
+#: src/audacious/ui_preferences.c:202
 msgid "Behavior"
 msgstr "Поведінка"
 
-#: src/audacious/ui_preferences.c:206
+#: src/audacious/ui_preferences.c:203
 msgid "Continue playback on startup"
 msgstr "Продовжити відтворення під час запуску"
 
-#: src/audacious/ui_preferences.c:208
+#: src/audacious/ui_preferences.c:205
 msgid "Advance when the current song is deleted"
 msgstr "Заздалегідь, коли поточна пісня буде видалена"
 
-#: src/audacious/ui_preferences.c:210
+#: src/audacious/ui_preferences.c:207
 msgid "Clear the playlist when opening files"
 msgstr "Очищати список відтворення під час відкриття файлів"
 
-#: src/audacious/ui_preferences.c:212
+#: src/audacious/ui_preferences.c:209
 msgid "Open files in a temporary playlist"
 msgstr "Відкривати файли у тимчасовому списку відтворення"
 
-#: src/audacious/ui_preferences.c:214
+#: src/audacious/ui_preferences.c:211
 msgid "Metadata"
 msgstr "Метадані"
 
-#: src/audacious/ui_preferences.c:454
+#: src/audacious/ui_preferences.c:212
+msgid "Do not load metadata for songs until played"
+msgstr "Не завантажувати метадані доріжок до відтворення"
+
+#: src/audacious/ui_preferences.c:230
+msgid "TITLE"
+msgstr "НАЗВА"
+
+#: src/audacious/ui_preferences.c:231
+msgid "ARTIST - TITLE"
+msgstr "ВИКОНАВЕЦЬ - НАЗВА"
+
+#: src/audacious/ui_preferences.c:232
+msgid "ARTIST - ALBUM - TITLE"
+msgstr "ВИКОНАВЕЦЬ - АЛЬБОМ - НАЗВА"
+
+#: src/audacious/ui_preferences.c:233
+msgid "ARTIST - ALBUM - TRACK. TITLE"
+msgstr "ВИКОНАВЕЦЬ - АЛЬБОМ - ДОРІЖКА. НАЗВА"
+
+#: src/audacious/ui_preferences.c:234
+msgid "ARTIST [ ALBUM ] - TRACK. TITLE"
+msgstr "ВИКОНАВЕЦЬ [ АЛЬБОМ ] ДОРІЖКА. НАЗВА"
+
+#: src/audacious/ui_preferences.c:235
+msgid "ALBUM - TITLE"
+msgstr "АЛЬБОМ - НАЗВА"
+
+#: src/audacious/ui_preferences.c:556
 msgid "Category"
 msgstr "Категорія"
 
-#: src/audacious/ui_preferences.c:682
+#: src/audacious/ui_preferences.c:780
 msgid "Popup Information Settings"
 msgstr "Налаштування спливаючої інформації"
 
-#: src/audacious/ui_preferences.c:691
+#: src/audacious/ui_preferences.c:789
 msgid "Cover image retrieve"
 msgstr "Пошук обкладинки"
 
-#: src/audacious/ui_preferences.c:696
+#: src/audacious/ui_preferences.c:794
 msgid ""
 "While searching for the album's cover, Audacious looks for certain words in "
 "the filename. You can specify those words in the lists below, separated "
@@ -597,99 +610,75 @@
 "Під час пошуку обкладинки Audacious шукає певні слова в іменах файлів. Ви "
 "можете вказати ці слова у списку нижче, розділивши їх комами."
 
-#: src/audacious/ui_preferences.c:713
+#: src/audacious/ui_preferences.c:811
 msgid "Exclude:"
 msgstr "Включаючи:"
 
-#: src/audacious/ui_preferences.c:720
+#: src/audacious/ui_preferences.c:818
 msgid "Include:"
 msgstr "Виключаючи:"
 
-#: src/audacious/ui_preferences.c:737
+#: src/audacious/ui_preferences.c:835
 msgid "Recursively search for cover"
 msgstr "Рекурсивний пошук обкладинки"
 
-#: src/audacious/ui_preferences.c:747
+#: src/audacious/ui_preferences.c:845
 msgid "Search depth: "
 msgstr "Глибина пошуку:"
 
-#: src/audacious/ui_preferences.c:761
+#: src/audacious/ui_preferences.c:859
 msgid "Use per-file cover"
 msgstr "Шукати обкладинку для кожного файлу"
 
-#: src/audacious/ui_preferences.c:764
+#: src/audacious/ui_preferences.c:862
 msgid "Miscellaneous"
 msgstr "Різне"
 
-#: src/audacious/ui_preferences.c:773
+#: src/audacious/ui_preferences.c:871
 msgid "Show Progress bar for the current track"
 msgstr "Показувати індикатор для поточної доріжки"
 
-#: src/audacious/ui_preferences.c:783
+#: src/audacious/ui_preferences.c:881
 msgid "Delay until filepopup comes up: "
 msgstr "Затримка до появи спливаючої інформації:"
 
-#: src/audacious/ui_preferences.c:1283
+#: src/audacious/ui_preferences.c:1309
+msgid "Custom"
+msgstr "Власні налаштування"
+
+#: src/audacious/ui_preferences.c:1352
 msgid "Song Display"
 msgstr "Відображення пісні"
 
-#: src/audacious/ui_preferences.c:1292
+#: src/audacious/ui_preferences.c:1361
 msgid "Show song numbers"
 msgstr "Показувати номер пісні"
 
-#: src/audacious/ui_preferences.c:1303
+#: src/audacious/ui_preferences.c:1372
 msgid "Show leading zeroes (02:00 instead of 2:00)"
 msgstr "Показувати нульові старші розряди (02:00 замість 2:00)"
 
-#: src/audacious/ui_preferences.c:1325
+#: src/audacious/ui_preferences.c:1394
 msgid "Show information about titlestring format"
 msgstr "Показувати інформацію про формат назви"
 
-#: src/audacious/ui_preferences.c:1339
-msgid "TITLE"
-msgstr "НАЗВА"
-
-#: src/audacious/ui_preferences.c:1340
-msgid "ARTIST - TITLE"
-msgstr "ВИКОНАВЕЦЬ - НАЗВА"
-
-#: src/audacious/ui_preferences.c:1341
-msgid "ARTIST - ALBUM - TITLE"
-msgstr "ВИКОНАВЕЦЬ - АЛЬБОМ - НАЗВА"
-
-#: src/audacious/ui_preferences.c:1342
-msgid "ARTIST - ALBUM - TRACK. TITLE"
-msgstr "ВИКОНАВЕЦЬ - АЛЬБОМ - ДОРІЖКА. НАЗВА"
-
-#: src/audacious/ui_preferences.c:1343
-msgid "ARTIST [ ALBUM ] - TRACK. TITLE"
-msgstr "ВИКОНАВЕЦЬ [ АЛЬБОМ ] ДОРІЖКА. НАЗВА"
-
-#: src/audacious/ui_preferences.c:1344
-msgid "ALBUM - TITLE"
-msgstr "АЛЬБОМ - НАЗВА"
-
-#: src/audacious/ui_preferences.c:1345
-msgid "Custom"
-msgstr "Власні налаштування"
-
-#: src/audacious/ui_preferences.c:1354
+#: src/audacious/ui_preferences.c:1410
 msgid "Custom string:"
 msgstr "Власний формат:"
 
-#: src/audacious/ui_preferences.c:1361
+#: src/audacious/ui_preferences.c:1417
 msgid "Title format:"
 msgstr "Формат назви:"
 
-#: src/audacious/ui_preferences.c:1372
+#: src/audacious/ui_preferences.c:1428
 msgid "Popup Information"
 msgstr "Спливаюча інформація"
 
-#: src/audacious/ui_preferences.c:1387
+#: src/audacious/ui_preferences.c:1443
 msgid "Show popup information for playlist entries"
 msgstr "Показувати спливаючу інформацію для доріжок списку відтворення"
 
-#: src/audacious/ui_preferences.c:1388
+#: src/audacious/ui_preferences.c:1444
 msgid ""
 "Toggles popup information window for the pointed entry in the playlist. The "
 "window shows title of song, name of album, genre, year of publish, track "
@@ -699,61 +688,65 @@
 "відтворення. Вікно містить назву пісні, альбому, жанр, рік, номер доріжки, "
 "тривалість пісні й обкладинку альбому."
 
-#: src/audacious/ui_preferences.c:1397
+#: src/audacious/ui_preferences.c:1455
 msgid "Edit settings for popup information"
 msgstr "Змінити налаштування спливаючої інформації"
 
-#: src/audacious/ui_preferences.c:1497
-#, fuzzy
+#: src/audacious/ui_preferences.c:1544
 msgid "Output plugin:"
-msgstr "Модуль вводу: %s"
+msgstr "Модуль виведення:"
 
-#: src/audacious/ui_preferences.c:1556
+#: src/audacious/ui_preferences.c:1603
 msgid "Transport"
 msgstr "Засоби сполучення"
 
-#: src/audacious/ui_preferences.c:1556
+#: src/audacious/ui_preferences.c:1603
 msgid "Input"
 msgstr "Вхід"
 
-#: src/audacious/ui_preferences.c:1557
+#: src/audacious/ui_preferences.c:1604
 msgid "Effect"
 msgstr "Ефекти"
 
-#: src/audacious/ui_preferences.c:1557
+#: src/audacious/ui_preferences.c:1604
 msgid "Visualization"
 msgstr "Визуализация"
 
-#: src/audacious/ui_preferences.c:1557
+#: src/audacious/ui_preferences.c:1604
 msgid "General"
 msgstr "Загальна"
 
-#: src/audacious/ui_preferences.c:1597
+#: src/audacious/ui_preferences.c:1644
 msgid "Audacious Preferences"
 msgstr "Налаштування Audacious"
 
-#: src/audacious/util.c:155
+#: src/audacious/util.c:120
 #, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr "Не можу створити директорію (%s): %s\n"
 
-#: src/audtool/handlers_playlist.c:264
+#: src/audtool/handlers_playlist.c:273
 msgid "Position not found."
 msgstr "Позицію не знайдено."
 
-#: src/audtool/handlers_vitals.c:64
+#: src/audtool/handlers_vitals.c:63
 msgid "No song playing."
 msgstr "Нічого не програється."
 
-#: src/libaudcore/tuple.c:685
+#: src/libaudcore/audstrings.c:199
+#, c-format
+msgid "Audio CD, track %s"
+msgstr "Звуковий CD, доріжка %s"
+
+#: src/libaudcore/tuple.c:536
 msgid "Mono"
 msgstr "Моно"
 
-#: src/libaudcore/tuple.c:687
+#: src/libaudcore/tuple.c:538
 msgid "Stereo"
 msgstr "Стерео"
 
-#: src/libaudcore/tuple.c:689
+#: src/libaudcore/tuple.c:540
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
@@ -761,416 +754,419 @@
 msgstr[1] "%d канали"
 msgstr[2] "%d каналів"
 
-#: src/libaudgui/confirm.c:73
+#: src/libaudgui/about.c:52 src/libaudgui/about.c:115
+msgid "Credits"
+msgstr "Автори"
+
+#: src/libaudgui/about.c:52
+msgid "Translators"
+msgstr "Перекладачі"
+
+#: src/libaudgui/about.c:91
+msgid "About Audacious"
+msgstr "Про Audacious"
+
+#: src/libaudgui/confirm.c:76
 #, c-format
 msgid ""
 "Are you sure you want to close %s? If you do, any changes made since the "
 "playlist was exported will be lost."
 msgstr ""
-"Ви впевнені, що хочете закрити %s? Якщо так, то всі зміни з моменту експорту "
-"списку відтворення будуть втрачені."
+"Ви впевнені, що хочете закрити %s? Якщо так, то всі зміни з моменту експорту"
+" списку відтворення будуть втрачені."
 
-#: src/libaudgui/confirm.c:86
+#: src/libaudgui/confirm.c:89
 msgid "_Don't show this message again"
 msgstr "Більше не показувати це попередження"
 
-#: src/libaudgui/confirm.c:124
+#: src/libaudgui/confirm.c:126
 msgid "Rename Playlist"
 msgstr "Перейменувати список програвання"
 
-#: src/libaudgui/effects-menu.c:76
+#: src/libaudgui/effects-menu.c:74
 msgid "settings ..."
 msgstr "налаштування ..."
 
-#: src/libaudgui/equalizer.c:68
+#: src/libaudgui/equalizer.c:51
 msgid "_Enable"
 msgstr "Увімкнути"
 
-#: src/libaudgui/equalizer.c:140
+#: src/libaudgui/equalizer.c:123
 msgid "31 Hz"
 msgstr "31 Гц"
 
-#: src/libaudgui/equalizer.c:140
+#: src/libaudgui/equalizer.c:123
 msgid "63 Hz"
 msgstr "63 Гц"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "125 Hz"
 msgstr "125 Гц"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "250 Hz"
 msgstr "250 Гц"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "500 Hz"
 msgstr "500 Гц"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "1 kHz"
 msgstr "1 кГц"
 
-#: src/libaudgui/equalizer.c:141
+#: src/libaudgui/equalizer.c:124
 msgid "2 kHz"
 msgstr "2 кГц"
 
-#: src/libaudgui/equalizer.c:142
+#: src/libaudgui/equalizer.c:125
 msgid "4 kHz"
 msgstr "4 кГц"
 
-#: src/libaudgui/equalizer.c:142
+#: src/libaudgui/equalizer.c:125
 msgid "8 kHz"
 msgstr "8 кГц"
 
-#: src/libaudgui/equalizer.c:142
+#: src/libaudgui/equalizer.c:125
 msgid "16 kHz"
 msgstr "18 кГц"
 
-#: src/libaudgui/equalizer.c:147
+#: src/libaudgui/equalizer.c:130
 msgid "Equalizer"
 msgstr "Еквалайзер"
 
-#: src/libaudgui/equalizer.c:163
+#: src/libaudgui/equalizer.c:146
 msgid "Preamp"
 msgstr ""
 "Попереднє\n"
 "підсилення"
 
-#: src/libaudgui/infopopup.c:212
+#: src/libaudgui/infopopup.c:207
 msgid "Track Number"
 msgstr "Номер доріжкии"
 
-#: src/libaudgui/infopopup.c:214
+#: src/libaudgui/infopopup.c:209
 msgid "Track Length"
 msgstr "Довжина доріжки"
 
-#: src/libaudgui/infowin.c:77
+#: src/libaudgui/infowin.c:75
 msgid "Acid Jazz"
 msgstr "Acid Jazz"
 
-#: src/libaudgui/infowin.c:78
+#: src/libaudgui/infowin.c:76
 msgid "Acid Rock"
 msgstr "Acid Rock"
 
-#: src/libaudgui/infowin.c:79
+#: src/libaudgui/infowin.c:77
 msgid "Ambient"
 msgstr "Ambient"
 
-#: src/libaudgui/infowin.c:80
+#: src/libaudgui/infowin.c:78
 msgid "Bebop"
 msgstr "Bebop"
 
-#: src/libaudgui/infowin.c:81
+#: src/libaudgui/infowin.c:79
 msgid "Bluegrass"
 msgstr "Bluegrass"
 
-#: src/libaudgui/infowin.c:82
+#: src/libaudgui/infowin.c:80
 msgid "Blues"
 msgstr "Blues"
 
-#: src/libaudgui/infowin.c:83
+#: src/libaudgui/infowin.c:81
 msgid "Chamber Music"
 msgstr "Chamber Music"
 
-#: src/libaudgui/infowin.c:84
+#: src/libaudgui/infowin.c:82
 msgid "Classical"
 msgstr "Classical"
 
-#: src/libaudgui/infowin.c:85
+#: src/libaudgui/infowin.c:83
 msgid "Country"
 msgstr "Country"
 
-#: src/libaudgui/infowin.c:86
+#: src/libaudgui/infowin.c:84
 msgid "Death Metal"
 msgstr "Death Metal"
 
-#: src/libaudgui/infowin.c:87
+#: src/libaudgui/infowin.c:85
 msgid "Disco"
 msgstr "Disco"
 
-#: src/libaudgui/infowin.c:88
+#: src/libaudgui/infowin.c:86
 msgid "Easy Listening"
 msgstr "Easy Listening"
 
-#: src/libaudgui/infowin.c:89
+#: src/libaudgui/infowin.c:87
 msgid "Folk"
 msgstr "Folk"
 
-#: src/libaudgui/infowin.c:90
+#: src/libaudgui/infowin.c:88
 msgid "Funk"
 msgstr "Funk"
 
-#: src/libaudgui/infowin.c:91
+#: src/libaudgui/infowin.c:89
 msgid "Gangsta Rap"
 msgstr "Gangsta Rap"
 
-#: src/libaudgui/infowin.c:92
+#: src/libaudgui/infowin.c:90
 msgid "Gospel"
 msgstr "Gospel"
 
-#: src/libaudgui/infowin.c:93
+#: src/libaudgui/infowin.c:91
 msgid "Grunge"
 msgstr "Grunge"
 
-#: src/libaudgui/infowin.c:94
+#: src/libaudgui/infowin.c:92
 msgid "Hard Rock"
 msgstr "Hard Rock"
 
-#: src/libaudgui/infowin.c:95
+#: src/libaudgui/infowin.c:93
 msgid "Heavy Metal"
 msgstr "Heavy Metal"
 
-#: src/libaudgui/infowin.c:96
+#: src/libaudgui/infowin.c:94
 msgid "Hip-hop"
 msgstr "Hip-hop"
 
-#: src/libaudgui/infowin.c:97
+#: src/libaudgui/infowin.c:95
 msgid "House"
 msgstr "House"
 
-#: src/libaudgui/infowin.c:98
+#: src/libaudgui/infowin.c:96
 msgid "Jazz"
 msgstr "Jazz"
 
-#: src/libaudgui/infowin.c:99
+#: src/libaudgui/infowin.c:97
 msgid "Jungle"
 msgstr "Jungle"
 
-#: src/libaudgui/infowin.c:100
+#: src/libaudgui/infowin.c:98
 msgid "Metal"
 msgstr "Metal"
 
-#: src/libaudgui/infowin.c:101
+#: src/libaudgui/infowin.c:99
 msgid "New Age"
 msgstr "New Age"
 
-#: src/libaudgui/infowin.c:102
+#: src/libaudgui/infowin.c:100
 msgid "New Wave"
 msgstr "New Wave"
 
-#: src/libaudgui/infowin.c:103
+#: src/libaudgui/infowin.c:101
 msgid "Noise"
 msgstr "Noise"
 
-#: src/libaudgui/infowin.c:104
+#: src/libaudgui/infowin.c:102
 msgid "Pop"
 msgstr "Pop"
 
-#: src/libaudgui/infowin.c:105
+#: src/libaudgui/infowin.c:103
 msgid "Punk Rock"
 msgstr "Punk Rock"
 
-#: src/libaudgui/infowin.c:106
+#: src/libaudgui/infowin.c:104
 msgid "Rap"
 msgstr "Rap"
 
-#: src/libaudgui/infowin.c:107
+#: src/libaudgui/infowin.c:105
 msgid "Reggae"
 msgstr "Reggae"
 
-#: src/libaudgui/infowin.c:108
+#: src/libaudgui/infowin.c:106
 msgid "Rock"
 msgstr "Rock"
 
-#: src/libaudgui/infowin.c:109
+#: src/libaudgui/infowin.c:107
 msgid "Rock and Roll"
 msgstr "Rock and Roll"
 
-#: src/libaudgui/infowin.c:110
+#: src/libaudgui/infowin.c:108
 msgid "Rhythm and Blues"
 msgstr "Rhythm and Blues"
 
-#: src/libaudgui/infowin.c:111
+#: src/libaudgui/infowin.c:109
 msgid "Ska"
 msgstr "Ska"
 
-#: src/libaudgui/infowin.c:112
+#: src/libaudgui/infowin.c:110
 msgid "Soul"
 msgstr "Soul"
 
-#: src/libaudgui/infowin.c:113
+#: src/libaudgui/infowin.c:111
 msgid "Swing"
 msgstr "Swing"
 
-#: src/libaudgui/infowin.c:114
+#: src/libaudgui/infowin.c:112
 msgid "Techno"
 msgstr "Techno"
 
-#: src/libaudgui/infowin.c:115
+#: src/libaudgui/infowin.c:113
 msgid "Trip-hop"
 msgstr "Trip-hop"
 
-#: src/libaudgui/infowin.c:175 src/libaudgui/infowin.c:361
-#: src/libaudgui/infowin.c:364 src/libaudgui/infowin.c:367
+#: src/libaudgui/infowin.c:177 src/libaudgui/infowin.c:363
+#: src/libaudgui/infowin.c:366 src/libaudgui/infowin.c:369
 msgid "n/a"
 msgstr "невідомо"
 
-#: src/libaudgui/infowin.c:265
+#: src/libaudgui/infowin.c:267
 msgid "Metadata updated successfully"
 msgstr "Метадані успішно оновлені"
 
-#: src/libaudgui/infowin.c:270
+#: src/libaudgui/infowin.c:272
 msgid "Metadata updating failed"
 msgstr "Не вдалося оновити метадані"
 
-#: src/libaudgui/infowin.c:318
+#: src/libaudgui/infowin.c:320
 msgid "Track Information"
 msgstr "Інформація про доріжку"
 
-#: src/libaudgui/infowin.c:350
+#: src/libaudgui/infowin.c:352
 msgid "Format:"
 msgstr "Формат:"
 
-#: src/libaudgui/infowin.c:354
+#: src/libaudgui/infowin.c:356
 msgid "Quality:"
 msgstr "Якість:"
 
-#: src/libaudgui/infowin.c:357
+#: src/libaudgui/infowin.c:359
 msgid "Bitrate:"
 msgstr "Бітрейт:"
 
-#: src/libaudgui/infowin.c:387
+#: src/libaudgui/infowin.c:389
 msgid "Title"
 msgstr "Назва"
 
-#: src/libaudgui/infowin.c:399
+#: src/libaudgui/infowin.c:401
 msgid "Artist"
 msgstr "Виконавець"
 
-#: src/libaudgui/infowin.c:411
+#: src/libaudgui/infowin.c:413
 msgid "Album"
 msgstr "Альбом"
 
-#: src/libaudgui/infowin.c:423
+#: src/libaudgui/infowin.c:425
 msgid "Comment"
 msgstr "Коментар"
 
-#: src/libaudgui/infowin.c:435
+#: src/libaudgui/infowin.c:437
 msgid "Genre"
 msgstr "Жанр"
 
-#: src/libaudgui/infowin.c:456
+#: src/libaudgui/infowin.c:458
 msgid "Year"
 msgstr "Рік"
 
-#: src/libaudgui/infowin.c:467
+#: src/libaudgui/infowin.c:469
 msgid "Track Number"
 msgstr "Номер доріжки"
 
-#: src/libaudgui/infowin.c:549
+#: src/libaudgui/infowin.c:548
 #, c-format
 msgid "%d kb/s"
 msgstr "%d кб/с"
 
-#: src/libaudgui/infowin.c:579
+#: src/libaudgui/infowin.c:575
 #, c-format
 msgid "No info available for %s.\n"
 msgstr "Інформація недоступна для %s.\n"
 
-#: src/libaudgui/jump-to-time.c:75
+#: src/libaudgui/jump-to-time.c:72
 msgid "Jump to Time"
 msgstr "Перейти до часу"
 
-#: src/libaudgui/jump-to-time.c:90
+#: src/libaudgui/jump-to-time.c:87
 msgid "mm:ss"
-msgstr ""
+msgstr "хх:сс"
 
-#: src/libaudgui/playlists.c:39
-#, fuzzy
+#: src/libaudgui/playlists.c:33
 msgid "Export Playlist"
-msgstr "Тимчасовий список відтворення"
+msgstr "Експортувати список відтворення"
 
-#: src/libaudgui/playlists.c:39
-#, fuzzy
+#: src/libaudgui/playlists.c:33
 msgid "Import Playlist"
-msgstr "Тимчасовий список відтворення"
+msgstr "Імпортувати список відтворення"
 
-#: src/libaudgui/playlists.c:71
+#: src/libaudgui/playlists.c:66
 #, c-format
 msgid "Overwrite %s?"
-msgstr ""
-
-#: src/libaudgui/ui_about.c:71
-msgid "About Audacious"
-msgstr "Про Audacious"
+msgstr "Перезаписати %s?"
 
-#: src/libaudgui/ui_about.c:93 src/libaudgui/ui_credits.c:122
-msgid "Credits"
-msgstr "Автори"
+#: src/libaudgui/queue-manager.c:196
+msgid "Queue Manager"
+msgstr "Керування чергою"
 
-#: src/libaudgui/ui_credits.c:126
-msgid "Translators"
-msgstr "Перекладачі"
-
-#: src/libaudgui/ui_fileopener.c:108
+#: src/libaudgui/ui_fileopener.c:109
 msgid "Open Files"
 msgstr "Відкрити файли"
 
-#: src/libaudgui/ui_fileopener.c:108
+#: src/libaudgui/ui_fileopener.c:109
 msgid "Add Files"
 msgstr "Додати файли"
 
-#: src/libaudgui/ui_fileopener.c:110
+#: src/libaudgui/ui_fileopener.c:111
 msgid "Close dialog on Open"
 msgstr "Закрити вікно після відкриття"
 
-#: src/libaudgui/ui_fileopener.c:110
+#: src/libaudgui/ui_fileopener.c:111
 msgid "Close dialog on Add"
 msgstr "Закрити вікно після додавання"
 
-#: src/libaudgui/ui_jumptotrack.c:133
-msgid "Un_queue"
-msgstr "В_илучити зі списку"
-
-#: src/libaudgui/ui_jumptotrack.c:135 src/libaudgui/ui_jumptotrack.c:512
+#: src/libaudgui/ui_jumptotrack.c:109 src/libaudgui/ui_jumptotrack.c:117
+#: src/libaudgui/ui_jumptotrack.c:326
 msgid "_Queue"
 msgstr "_Додати до списку"
 
-#: src/libaudgui/ui_jumptotrack.c:399
-msgid "Jump to Track"
+#: src/libaudgui/ui_jumptotrack.c:115
+msgid "Un_queue"
+msgstr "В_илучити зі списку"
+
+#: src/libaudgui/ui_jumptotrack.c:258
+msgid "Jump to Song"
 msgstr "Перейти до доріжки"
 
-#: src/libaudgui/ui_jumptotrack.c:442
+#: src/libaudgui/ui_jumptotrack.c:281
 msgid "Filter: "
 msgstr "Фільтр: "
 
-#: src/libaudgui/ui_jumptotrack.c:443
+#: src/libaudgui/ui_jumptotrack.c:282
 msgid "_Filter:"
 msgstr "_Фільтр: "
 
-#: src/libaudgui/ui_jumptotrack.c:461
+#: src/libaudgui/ui_jumptotrack.c:292
 msgid "Remember"
 msgstr "Запам'ятати"
 
-#: src/libaudgui/ui_jumptotrack.c:470
+#: src/libaudgui/ui_jumptotrack.c:299
 msgid "Clea_r"
 msgstr "Очистити"
 
-#: src/libaudgui/ui_jumptotrack.c:504
+#: src/libaudgui/ui_jumptotrack.c:319
 msgid "Close on Jump"
 msgstr "Закрити після переходу"
 
-#: src/libaudgui/ui_playlist_manager.c:240
+#: src/libaudgui/ui_playlist_manager.c:253
 msgid "Playlist Manager"
 msgstr "Менеджер списків"
 
-#: src/libaudgui/ui_playlist_manager.c:264
+#: src/libaudgui/ui_playlist_manager.c:280
 msgid "Entries"
 msgstr "Елементи"
 
-#: src/libaudgui/ui_playlist_manager.c:285
+#: src/libaudgui/ui_playlist_manager.c:301
 msgid "_Rename"
 msgstr "Перейменувати"
 
-#: src/libaudgui/ui_playlist_manager.c:309
+#: src/libaudgui/ui_playlist_manager.c:325
 msgid "_Close dialog on activating playlist"
 msgstr "Закрити вікно після вибору списку"
 
-#: src/libaudgui/ui_urlopener.c:58
+#: src/libaudgui/ui_urlopener.c:48
 msgid "Open URL"
 msgstr "Відкрити адресу"
 
-#: src/libaudgui/ui_urlopener.c:58
+#: src/libaudgui/ui_urlopener.c:48
 msgid "Add URL"
 msgstr "Додати адресу"
 
@@ -1179,37 +1175,39 @@
 "\n"
 "(Further messages have been hidden.)"
 msgstr ""
+"\n"
+"(Наступні повідомлення були приховані.)"
 
 #: src/libeggsmclient/eggdesktopfile.c:165
 msgid "File is not a valid .desktop file"
 msgstr "Файл не є коректним файлом .desktop "
 
-#: src/libeggsmclient/eggdesktopfile.c:188
+#: src/libeggsmclient/eggdesktopfile.c:191
 #, c-format
 msgid "Unrecognized desktop file Version '%s'"
 msgstr "Невідома версія desktop файлу '%s'"
 
-#: src/libeggsmclient/eggdesktopfile.c:967
+#: src/libeggsmclient/eggdesktopfile.c:974
 #, c-format
 msgid "Starting %s"
 msgstr "Запускається %s"
 
-#: src/libeggsmclient/eggdesktopfile.c:1108
+#: src/libeggsmclient/eggdesktopfile.c:1116
 msgid "Application does not accept documents on command line"
 msgstr "Програма підтримує передачу імені документу через командний рядок"
 
-#: src/libeggsmclient/eggdesktopfile.c:1176
+#: src/libeggsmclient/eggdesktopfile.c:1184
 #, c-format
 msgid "Unrecognized launch option: %d"
 msgstr "Невідомий параметр запуску: %d"
 
-#: src/libeggsmclient/eggdesktopfile.c:1375
+#: src/libeggsmclient/eggdesktopfile.c:1391
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
 msgstr ""
-"Не можу передати URI документа з допомогою запису 'Type = Link' у файлі ."
-"desktop"
+"Не можу передати URI документа з допомогою запису 'Type = Link' у файлі "
+".desktop"
 
-#: src/libeggsmclient/eggdesktopfile.c:1396
+#: src/libeggsmclient/eggdesktopfile.c:1412
 msgid "Not a launchable item"
 msgstr "Елемент не запускається"
 
@@ -1241,3351 +1239,4 @@
 msgid "Show session management options"
 msgstr "Показати параметри керування сеансами"
 
-#~ msgid "Display all open Audacious windows"
-#~ msgstr "Показати всі відкриті вікна Audacious"
-
-#~ msgid "Replay Gain"
-#~ msgstr "Replay Gain"
-
-#~ msgid "Bit Depth"
-#~ msgstr "Амплітудна розрядність"
-
-#~ msgid ""
-#~ "All streams will be converted to this bit depth.\n"
-#~ "This should be the max supported bit depth of\n"
-#~ "the sound card or output plugin."
-#~ msgstr ""
-#~ "Всі потоки будуть перетворені до цієї розрядності,\n"
-#~ "яка повинна бути максимальною підтримуваною\n"
-#~ "розрядністю звукової карти або вихідного модуля."
-
-#~ msgid "Volume Control"
-#~ msgstr "Керування гучністю"
-
-#~ msgid ""
-#~ "Use software volume control. This may be useful for situations where your "
-#~ "audio system does not support controlling the playback volume."
-#~ msgstr ""
-#~ "Використовувати програмне керування гучністю. Це може бути корисно в "
-#~ "ситуаціях, коли ваша звукова система не підтримує контроль гучності."
-
-#~ msgid "Mode"
-#~ msgstr "Режим"
-
-#~ msgid "Clipping Prevention"
-#~ msgstr "Запобігання зрізанню"
-
-# зрізання (обмеження) сигналу
-#~ msgid "Enable clipping prevention"
-#~ msgstr "Запобігати зрізанню"
-
-#~ msgid "Audio System"
-#~ msgstr "Звукова система"
-
-#~ msgid "Current output plugin:"
-#~ msgstr "Поточний модуль виводу звуку:"
-
-#~ msgid ""
-#~ "<big>Audacious %s</big>\n"
-#~ "An audio player for many platforms.\n"
-#~ "Copyright (C) 2005-2010 Audacious Development Team"
-#~ msgstr ""
-#~ "<big>Audacious %s</big>\n"
-#~ "Звуковий програвач для багатьох платформ.\n"
-#~ "Copyright (C) 2005-2010 Команда розробників Audacious"
-
-#~ msgid ""
-#~ "Running multiple instances of Audacious can lead to corrupted "
-#~ "configuration files. If Audacious is not already running, or if you want "
-#~ "to run another instance anyway, please delete the file %s and run "
-#~ "Audacious again. Audacious will now close."
-#~ msgstr ""
-#~ "Запуск декількох екземплярів Audacious може призвести до пошкодження "
-#~ "файлів конфігурації. Якщо Audacious ще не запущений, або якщо ви хочете "
-#~ "запустити ще один екземпляр в будь-якому випадку, будь ласка, вилучіть "
-#~ "файл %s і запустіть Audacious знову. Audacious буде закрито."
-
-#~ msgid "%s: Unable to open display, exiting.\n"
-#~ msgstr "%s: Не можу відкрити екран для показу, вихід.\n"
-
-#~ msgid "Preamp:"
-#~ msgstr "Попереднє підсилення:"
-
-#~ msgid "Default gain:"
-#~ msgstr "Стандартне підсилення:"
-
-#~ msgid "This gain will be used if file doesn't contain Replay Gain metadata."
-#~ msgstr ""
-#~ "Це значення буде використане у випадку, якщо доріжка\n"
-#~ "не містить даних Replay Gain."
-
-#~ msgid ""
-#~ "Please remember that the most efficient way to "
-#~ "prevent signal clipping is not to use positive values above."
-#~ msgstr ""
-#~ "Пам'ятайте, що найефективніший спосіб уникнути "
-#~ "зрізання, це не використовувати позитивні значення."
-
-#~ msgid "Replay Gain configuration"
-#~ msgstr "Конфігурація Replay Gain"
-
-#~ msgid "Track gain/peak"
-#~ msgstr "Підсилення і пікове значення доріжки"
-
-#~ msgid "Album gain/peak"
-#~ msgstr "Підсилення і пікове значення альбому"
-
-#~ msgid "Use peak value from Replay Gain info for clipping prevention"
-#~ msgstr ""
-#~ "Використовувати значення піку з метаданих Replay Gain для запобігання "
-#~ "зрізанню"
-
-#~ msgid "Surround"
-#~ msgstr "Об'ємний звук"
-
-#~ msgid "Classic Rock"
-#~ msgstr "Класичний рок"
-
-#~ msgid "Dance"
-#~ msgstr "Танцювальна музика"
-
-#~ msgid "Oldies"
-#~ msgstr "Oldies"
-
-#~ msgid "Other"
-#~ msgstr "Інше"
-
-#~ msgid "R&B"
-#~ msgstr "Ритм-енд-блюз"
-
-#~ msgid "Industrial"
-#~ msgstr "Індастріал"
-
-#~ msgid "Alternative"
-#~ msgstr "Альтернативна"
-
-#~ msgid "Pranks"
-#~ msgstr "Pranks"
-
-#~ msgid "Soundtrack"
-#~ msgstr "Звукова доріжка"
-
-#~ msgid "Euro-Techno"
-#~ msgstr "Євро-техно"
-
-#~ msgid "Vocal"
-#~ msgstr "Вокал"
-
-#~ msgid "Jazz+Funk"
-#~ msgstr "Джаз+Фанк"
-
-#~ msgid "Fusion"
-#~ msgstr "Ф'южн"
-
-#~ msgid "Trance"
-#~ msgstr "Транс"
-
-#~ msgid "Instrumental"
-#~ msgstr "Інструментальна"
-
-#~ msgid "Acid"
-#~ msgstr "Ейсид"
-
-#~ msgid "Game"
-#~ msgstr "Гра"
-
-#~ msgid "Sound Clip"
-#~ msgstr "Звуковий кліп"
-
-#~ msgid "AlternRock"
-#~ msgstr "Альтернативний рок"
-
-#~ msgid "Bass"
-#~ msgstr "Бас"
-
-#~ msgid "Punk"
-#~ msgstr "Панк"
-
-#~ msgid "Space"
-#~ msgstr "Космічна"
-
-#~ msgid "Meditative"
-#~ msgstr "Медитація"
-
-#~ msgid "Instrumental Pop"
-#~ msgstr "Інструментальний поп"
-
-#~ msgid "Instrumental Rock"
-#~ msgstr "Інструментальний рок"
-
-#~ msgid "Ethnic"
-#~ msgstr "Етнічна"
-
-#~ msgid "Gothic"
-#~ msgstr "Готична"
-
-#~ msgid "Darkwave"
-#~ msgstr "Чорна хвиля"
-
-#~ msgid "Techno-Industrial"
-#~ msgstr "Техно-індастріал"
-
-#~ msgid "Electronic"
-#~ msgstr "Електронна"
-
-#~ msgid "Pop-Folk"
-#~ msgstr "Поп-фолк"
-
-#~ msgid "Eurodance"
-#~ msgstr "Євроданс"
-
-#~ msgid "Dream"
-#~ msgstr "Мрія"
-
-#~ msgid "Southern Rock"
-#~ msgstr "Південний рок"
-
-#~ msgid "Comedy"
-#~ msgstr "Комедійна"
-
-#~ msgid "Cult"
-#~ msgstr "Культова"
-
-#~ msgid "Top 40"
-#~ msgstr "40 найкращих"
-
-#~ msgid "Christian Rap"
-#~ msgstr "Християнський реп"
-
-#~ msgid "Pop/Funk"
-#~ msgstr "Поп/Фанк"
-
-#~ msgid "Native American"
-#~ msgstr "Американська аборигенська"
-
-#~ msgid "Cabaret"
-#~ msgstr "Кабаре"
-
-#~ msgid "Psychedelic"
-#~ msgstr "Психоделічна"
-
-#~ msgid "Rave"
-#~ msgstr "Рейв"
-
-#~ msgid "Showtunes"
-#~ msgstr "Showtunes"
-
-#~ msgid "Trailer"
-#~ msgstr "Анонс"
-
-#~ msgid "Lo-Fi"
-#~ msgstr "Lo-Fi"
-
-#~ msgid "Tribal"
-#~ msgstr "Племінна"
-
-#~ msgid "Acid Punk"
-#~ msgstr "Есид-панк"
-
-#~ msgid "Polka"
-#~ msgstr "Полька"
-
-#~ msgid "Retro"
-#~ msgstr "Ретро"
-
-#~ msgid "Musical"
-#~ msgstr "Музична"
-
-#~ msgid "Folk/Rock"
-#~ msgstr "Фолк/Рок"
-
-#~ msgid "National Folk"
-#~ msgstr "Національний фолк"
-
-#~ msgid "Fast-Fusion"
-#~ msgstr "Швидкий ф'южн"
-
-#~ msgid "Latin"
-#~ msgstr "Латиноамериканська"
-
-#~ msgid "Revival"
-#~ msgstr "Відродження"
-
-#~ msgid "Celtic"
-#~ msgstr "Кельтська"
-
-#~ msgid "Avantgarde"
-#~ msgstr "Авангард"
-
-#~ msgid "Gothic Rock"
-#~ msgstr "Готичний рок"
-
-#~ msgid "Progressive Rock"
-#~ msgstr "Прогресивний рок"
-
-#~ msgid "Psychedelic Rock"
-#~ msgstr "Психоделічний рок"
-
-#~ msgid "Symphonic Rock"
-#~ msgstr "Симфонічний рок"
-
-#~ msgid "Slow Rock"
-#~ msgstr "Повільний рок"
-
-#~ msgid "Big Band"
-#~ msgstr "Біґ-бенд"
-
-#~ msgid "Chorus"
-#~ msgstr "Хор"
-
-#~ msgid "Acoustic"
-#~ msgstr "Акустична"
-
-#~ msgid "Humour"
-#~ msgstr "Гумор"
-
-#~ msgid "Speech"
-#~ msgstr "Промова"
-
-#~ msgid "Chanson"
-#~ msgstr "Шансон"
-
-#~ msgid "Opera"
-#~ msgstr "Опера"
-
-#~ msgid "Sonata"
-#~ msgstr "Соната"
-
-#~ msgid "Symphony"
-#~ msgstr "Симфонія"
-
-#~ msgid "Booty Bass"
-#~ msgstr "Booty Bass"
-
-#~ msgid "Primus"
-#~ msgstr "Прима"
-
-#~ msgid "Porn Groove"
-#~ msgstr "Порн грув"
-
-#~ msgid "Satire"
-#~ msgstr "Сатира"
-
-#~ msgid "Slow Jam"
-#~ msgstr "Повільний джем"
-
-#~ msgid "Club"
-#~ msgstr "Клуб"
-
-#~ msgid "Tango"
-#~ msgstr "Танґо"
-
-#~ msgid "Samba"
-#~ msgstr "Самба"
-
-#~ msgid "Folklore"
-#~ msgstr "Фольклор"
-
-#~ msgid "Ballad"
-#~ msgstr "Балада"
-
-#~ msgid "Power Ballad"
-#~ msgstr "Потужна балада"
-
-#~ msgid "Rhythmic Soul"
-#~ msgstr "Ритмічний соул"
-
-#~ msgid "Freestyle"
-#~ msgstr "Вільний стиль"
-
-#~ msgid "Duet"
-#~ msgstr "Дует"
-
-#~ msgid "Drum Solo"
-#~ msgstr "Соло на ударних"
-
-#~ msgid "A Cappella"
-#~ msgstr "Акапелла"
-
-#~ msgid "Euro-House"
-#~ msgstr "Євро-хауз"
-
-#~ msgid "Dance Hall"
-#~ msgstr "Танцювальний зал"
-
-#~ msgid "Goa"
-#~ msgstr "Гоа"
-
-#~ msgid "Drum & Bass"
-#~ msgstr "Драм-енд-бейс"
-
-#~ msgid "Club-House"
-#~ msgstr "Клаб-хауз"
-
-#~ msgid "Hardcore"
-#~ msgstr "Нардкор"
-
-#~ msgid "Terror"
-#~ msgstr "Терор"
-
-#~ msgid "Indie"
-#~ msgstr "Інді"
-
-#~ msgid "BritPop"
-#~ msgstr "Бритпоп"
-
-#~ msgid "Negerpunk"
-#~ msgstr "Негро-панк"
-
-#~ msgid "Polsk Punk"
-#~ msgstr "Польский панк"
-
-#~ msgid "Beat"
-#~ msgstr "Біт"
-
-#~ msgid "Christian Gangsta Rap"
-#~ msgstr "Чорний християнський реп"
-
-#~ msgid "Black Metal"
-#~ msgstr "Чорний метал"
-
-#~ msgid "Crossover"
-#~ msgstr "Перехідний"
-
-#~ msgid "Contemporary Christian"
-#~ msgstr "Сучасна християнська"
-
-#~ msgid "Christian Rock"
-#~ msgstr "Християнський рок"
-
-#~ msgid "Merengue"
-#~ msgstr "Меренга"
-
-#~ msgid "Salsa"
-#~ msgstr "Сальса"
-
-#~ msgid "Thrash Metal"
-#~ msgstr "Треш метал"
-
-#~ msgid "Anime"
-#~ msgstr "Аніме"
-
-#~ msgid "JPop"
-#~ msgstr "Японський поп"
-
-#~ msgid "Synthpop"
-#~ msgstr "Електронний поп"
-
-#~ msgid "Unable to create log file (%s)!\n"
-#~ msgstr "Не можу створити файл журналу (%s)!\n"
-
-#, fuzzy
-#~ msgid "Playback"
-#~ msgstr "/_Програвання"
-
-#~ msgid "Playback"
-#~ msgstr "Відтворення"
-
-#~ msgid "Don't advance in the playlist"
-#~ msgstr "Не просуватись в списку програвання"
-
-#~ msgid ""
-#~ "When finished playing a song, don't automatically advance to the next."
-#~ msgstr ""
-#~ "По завершенню програвання пісні, не пересуватись автоматично до наступної."
-
-#~ msgid "Enabled"
-#~ msgstr "Вмикнено"
-
-#~ msgid "Description"
-#~ msgstr "Опис"
-
-#, fuzzy
-#~ msgid "Output Plugin Preferences"
-#~ msgstr "Модуль виводу звуку OSS"
-
-#, fuzzy
-#~ msgid "Output Plugin Information"
-#~ msgstr "Конфіґурація модуля виводу ESD"
-
-#, fuzzy
-#~ msgid "_Decoder list:"
-#~ msgstr "Декодування"
-
-#, fuzzy
-#~ msgid "Decoders"
-#~ msgstr "Загальні"
-
-#~ msgid "_General plugin list:"
-#~ msgstr "_Список модулів загального призначення:"
-
-#~ msgid "General"
-#~ msgstr "Загальні"
-
-#~ msgid "_Visualization plugin list:"
-#~ msgstr "Список модулів _візуалізації:"
-
-#~ msgid "Visualization"
-#~ msgstr "Візуалізація"
-
-#, fuzzy
-#~ msgid "Effect plugins:"
-#~ msgstr "Список модулів _ефектів:"
-
-#~ msgid "Effects"
-#~ msgstr "Ефекти"
-
-#, fuzzy
-#~ msgid "General"
-#~ msgstr "Загальні"
-
-#, fuzzy
-#~ msgid "Location"
-#~ msgstr "Миша"
-
-#, fuzzy
-#~ msgid "Raw Metadata"
-#~ msgstr "Медіа"
-
-#, fuzzy
-#~ msgid "Value"
-#~ msgstr "Блюз"
-
-#, fuzzy
-#~ msgid "3 kHz"
-#~ msgstr "1:1 (44 кГц)"
-
-#, fuzzy
-#~ msgid "6 kHz"
-#~ msgstr "1:1 (44 кГц)"
-
-#, fuzzy
-#~ msgid ""
-#~ "Available interfaces:\n"
-#~ "\n"
-#~ msgstr "Доступні _попередні установки:"
-
-#, fuzzy
-#~ msgid "Available Plugin Preferences:\n"
-#~ msgstr "Доступні _попередні установки:"
-
-#, fuzzy
-#~ msgid "Add/Open URL Dialog"
-#~ msgstr "Вікно додавання файлів"
-
-#~ msgid "Don't clear the playlist"
-#~ msgstr "Не очищати список програвання"
-
-#~ msgid "Filename:"
-#~ msgstr "Ім'я файлу:"
-
-#~ msgid "No input plugin recognized this file"
-#~ msgstr "Жоден модуль вводу не розпізнає цей файл"
-
-#, fuzzy
-#~ msgid "ZOH Interpolation"
-#~ msgstr "Використовувати автентикацію"
-
-#, fuzzy
-#~ msgid "Linear Interpolation"
-#~ msgstr "Використовувати автентикацію"
-
-#, fuzzy
-#~ msgid "Sampling Rate [Hz]:"
-#~ msgstr "Частота:"
-
-#, fuzzy
-#~ msgid "Interpolation Engine:"
-#~ msgstr "Використовувати автентикацію"
-
-#, fuzzy
-#~ msgid "Detect file formats by extension."
-#~ msgstr "Не позбавляти файли розширення"
-
-#, fuzzy
-#~ msgid "Sampling Rate Converter"
-#~ msgstr "Частота:"
-
-#, fuzzy
-#~ msgid "Enable Sampling Rate Converter"
-#~ msgstr "Частота:"
-
-#, fuzzy
-#~ msgid "Advanced"
-#~ msgstr "Ім'я файлу"
-
-#, fuzzy
-#~ msgid ""
-#~ "<big>Audacious %s</big>\n"
-#~ "\n"
-#~ "Copyright (C) 2005-2009 Audacious Development Team"
-#~ msgstr ""
-#~ "<big>Beep Media Player %s</big>\n"
-#~ "Мультимедійний програвач на основі BMP та XMMS\n"
-#~ "\n"
-#~ "Copyright (C) 2005 Команда розробників Audacious\n"
-
-#~ msgid "Load metadata from playlists and files"
-#~ msgstr ""
-#~ "Завантажувати інформацію про пісні з музичних файлів і списків програвання"
-
-#~ msgid "Load metadata (tag information) from music files."
-#~ msgstr ""
-#~ "Завантажувати інформацію про пісню та виконавця (інформаційний тег) з "
-#~ "музичних файлів."
-
-#~ msgid "minutes:seconds"
-#~ msgstr "хвилин:секунд"
-
-#~ msgid "Track length:"
-#~ msgstr "Довжина доріжки:"
-
-#, fuzzy
-#~ msgid "Save as Static Playlist"
-#~ msgstr "Зберегти список програвання"
-
-#~ msgid "Error writing playlist \"%s\": %s"
-#~ msgstr "Помилка при записі списку програвання \"%s\": %s"
-
-#~ msgid "%s already exist. Continue?"
-#~ msgstr "%s вже існує. Продовжити?"
-
-#, fuzzy
-#~ msgid ""
-#~ "<big>Unable to save playlist.</big>\n"
-#~ "\n"
-#~ "Unknown file type for '%s'.\n"
-#~ msgstr ""
-#~ "<big>Не можу зберегти список програвання.</big>\n"
-#~ "\n"
-
-#~ msgid "Presets"
-#~ msgstr "Попередні установки"
-
-#~ msgid "Mouse"
-#~ msgstr "Миша"
-
-#~ msgid "Pause between songs"
-#~ msgstr "Пауза між піснями"
-
-#~ msgid "Pause for"
-#~ msgstr "Призупиняти на"
-
-#~ msgid "seconds"
-#~ msgstr "секунд"
-
-#~ msgid "Filename"
-#~ msgstr "Ім'я файлу"
-
-#~ msgid "Convert underscores to blanks"
-#~ msgstr "Перетворювати підкреслення в пробіл"
-
-#~ msgid "Convert %20 to blanks"
-#~ msgstr "Перетворювати %20 в пробіл"
-
-#, fuzzy
-#~ msgid "File Dialog"
-#~ msgstr "Ім'я файлу"
-
-#~ msgid "Changes volume by"
-#~ msgstr "Змінює гучність на"
-
-#~ msgid "percent"
-#~ msgstr "відсотків"
-
-#~ msgid "Scrolls playlist by"
-#~ msgstr "Поворот колеса миші прокручує список програвання на"
-
-#~ msgid "lines"
-#~ msgstr "рядків"
-
-#, fuzzy
-#~ msgid "Stop after Current Song"
-#~ msgstr "Зупинити поточну пісню"
-
-#, fuzzy
-#~ msgid "Peaks"
-#~ msgstr "Pranks"
-
-#, fuzzy
-#~ msgid "Repeat"
-#~ msgstr "/Повторювати"
-
-#, fuzzy
-#~ msgid "Shuffle"
-#~ msgstr "/Випадково"
-
-#, fuzzy
-#~ msgid "No Playlist Advance"
-#~ msgstr "/Не просуватись у списку пісень"
-
-#, fuzzy
-#~ msgid "Play"
-#~ msgstr "/Грати"
-
-#, fuzzy
-#~ msgid "Pause"
-#~ msgstr "/Призупинити"
-
-#, fuzzy
-#~ msgid "Stop"
-#~ msgstr "/Зупинити"
-
-#, fuzzy
-#~ msgid "Previous"
-#~ msgstr "/Попередня пісня"
-
-#, fuzzy
-#~ msgid "Next"
-#~ msgstr "/Наступна пісня"
-
-#, fuzzy
-#~ msgid "Visualization Mode"
-#~ msgstr "/Режим візуалізації"
-
-#, fuzzy
-#~ msgid "Analyzer Mode"
-#~ msgstr "/Режим аналізатора/Полум'я"
-
-#, fuzzy
-#~ msgid "Scope Mode"
-#~ msgstr "/Режим графіка"
-
-#, fuzzy
-#~ msgid "Voiceprint Mode"
-#~ msgstr "/Режим аналізатора/Полум'я"
-
-#, fuzzy
-#~ msgid "WindowShade VU Mode"
-#~ msgstr "/При мінімізованому вікні"
-
-#, fuzzy
-#~ msgid "Refresh Rate"
-#~ msgstr "/Частота поновлення"
-
-#, fuzzy
-#~ msgid "Analyzer Falloff"
-#~ msgstr "/Падіння аналізатора"
-
-#, fuzzy
-#~ msgid "Peaks Falloff"
-#~ msgstr "/Падіння піків"
-
-#, fuzzy
-#~ msgid "New Playlist"
-#~ msgstr "Зберегти список програвання"
-
-#, fuzzy
-#~ msgid "Select Next Playlist"
-#~ msgstr "Вибір шрифту для списку програвання"
-
-#, fuzzy
-#~ msgid "Select Previous Playlist"
-#~ msgstr "/Сортувати вибране/За назвою"
-
-#, fuzzy
-#~ msgid "Delete Playlist"
-#~ msgstr "Вибір шрифту для списку програвання"
-
-#, fuzzy
-#~ msgid "Load List"
-#~ msgstr "/Сортувати список"
-
-#, fuzzy
-#~ msgid "Loads a playlist file into the selected playlist."
-#~ msgstr ""
-#~ "Завантажувати інформацію про пісню та виконавця при відображенні файлу в "
-#~ "списку програвання"
-
-#, fuzzy
-#~ msgid "Save List"
-#~ msgstr "/Новий список"
-
-#, fuzzy
-#~ msgid "Saves the selected playlist."
-#~ msgstr "Вибір шрифту для списку програвання"
-
-#, fuzzy
-#~ msgid "Save Default List"
-#~ msgstr "/Зберегти/Стандартні "
-
-#, fuzzy
-#~ msgid "Saves the selected playlist to the default location."
-#~ msgstr "Вибір шрифту для списку програвання"
-
-#, fuzzy
-#~ msgid "Refresh List"
-#~ msgstr "/Частота поновлення"
-
-#, fuzzy
-#~ msgid "List Manager"
-#~ msgstr "/Не просуватись у списку пісень"
-
-#, fuzzy
-#~ msgid "Opens the playlist manager."
-#~ msgstr "Не очищати список програвання"
-
-#, fuzzy
-#~ msgid "View"
-#~ msgstr "/Вигляд"
-
-#, fuzzy
-#~ msgid "Add Internet Address..."
-#~ msgstr "/Додати адресу інтернет..."
-
-#, fuzzy
-#~ msgid "Adds a remote track to the playlist."
-#~ msgstr "Не очищати список програвання"
-
-#, fuzzy
-#~ msgid "Add Files..."
-#~ msgstr "/Додати файли..."
-
-#, fuzzy
-#~ msgid "Search and Select"
-#~ msgstr "/Сортувати вибране"
-
-#, fuzzy
-#~ msgid "Invert Selection"
-#~ msgstr "/Інвертувати вибране"
-
-#, fuzzy
-#~ msgid "Inverts the selected and unselected entries."
-#~ msgstr "Вибір шрифту для списку програвання"
-
-#~ msgid "Select All"
-#~ msgstr "Вибрати все"
-
-#, fuzzy
-#~ msgid "Select None"
-#~ msgstr "/Сортувати вибране"
-
-#, fuzzy
-#~ msgid "Deselects all of the playlist entries."
-#~ msgstr "Не очищати список програвання"
-
-#, fuzzy
-#~ msgid "Remove All"
-#~ msgstr "/Видалити все"
-
-#, fuzzy
-#~ msgid "Removes all entries from the playlist."
-#~ msgstr "/Видалити недоступні файли"
-
-#, fuzzy
-#~ msgid "Clear Queue"
-#~ msgstr "/Очистити чергу"
-
-#, fuzzy
-#~ msgid "Clears the queue associated with this playlist."
-#~ msgstr "Вибір шрифту для списку програвання"
-
-#, fuzzy
-#~ msgid "Remove Unavailable Files"
-#~ msgstr "/Видалити недоступні файли"
-
-#, fuzzy
-#~ msgid "Removes unavailable files from the playlist."
-#~ msgstr "/Видалити недоступні файли"
-
-#, fuzzy
-#~ msgid "Remove Duplicates"
-#~ msgstr "/Видалити вибране"
-
-#, fuzzy
-#~ msgid "By Title"
-#~ msgstr "Заголовок"
-
-#, fuzzy
-#~ msgid "Removes duplicate entries from the playlist by title."
-#~ msgstr "/Сортувати список/За шляхом й іменем файлу"
-
-#, fuzzy
-#~ msgid "By Filename"
-#~ msgstr "Ім'я файлу"
-
-#, fuzzy
-#~ msgid "Removes duplicate entries from the playlist by filename."
-#~ msgstr "/Сортувати список/За шляхом й іменем файлу"
-
-#, fuzzy
-#~ msgid "By Path + Filename"
-#~ msgstr "/Сортувати список/За шляхом й іменем файлу"
-
-#, fuzzy
-#~ msgid "Removes duplicate entries from the playlist by their full path."
-#~ msgstr "/Сортувати список/За шляхом й іменем файлу"
-
-#, fuzzy
-#~ msgid "Remove Unselected"
-#~ msgstr "/Видалити НЕ вибране"
-
-#, fuzzy
-#~ msgid "Remove unselected entries from the playlist."
-#~ msgstr "/Сортувати список/За шляхом й іменем файлу"
-
-#, fuzzy
-#~ msgid "Remove Selected"
-#~ msgstr "/Видалити вибране"
-
-#, fuzzy
-#~ msgid "Remove selected entries from the playlist."
-#~ msgstr "/Сортувати список/За шляхом й іменем файлу"
-
-#, fuzzy
-#~ msgid "Randomize List"
-#~ msgstr "/Перемішати список"
-
-#, fuzzy
-#~ msgid "Randomizes the playlist."
-#~ msgstr "/Перемішати список"
-
-#, fuzzy
-#~ msgid "Reverse List"
-#~ msgstr "/Інвертувати список"
-
-#, fuzzy
-#~ msgid "Reverses the playlist."
-#~ msgstr "Не очищати список програвання"
-
-#, fuzzy
-#~ msgid "Sort List"
-#~ msgstr "/Сортувати список"
-
-#, fuzzy
-#~ msgid "Sorts the list by title."
-#~ msgstr "/Сортувати список/За назвою"
-
-#, fuzzy
-#~ msgid "By Album"
-#~ msgstr "Альбом"
-
-#, fuzzy
-#~ msgid "Sorts the list by album."
-#~ msgstr "/Сортувати список/За назвою"
-
-#, fuzzy
-#~ msgid "By Artist"
-#~ msgstr "Виконавець"
-
-#, fuzzy
-#~ msgid "Sorts the list by artist."
-#~ msgstr "/Сортувати список/За назвою"
-
-#, fuzzy
-#~ msgid "Sorts the list by filename."
-#~ msgstr "/Сортувати список/За іменем файлу"
-
-#, fuzzy
-#~ msgid "Sorts the list by full pathname."
-#~ msgstr "/Сортувати список/За іменем файлу"
-
-#, fuzzy
-#~ msgid "By Date"
-#~ msgstr "Дата"
-
-#, fuzzy
-#~ msgid "Sorts the list by modification time."
-#~ msgstr "/Сортувати список/За назвою"
-
-#, fuzzy
-#~ msgid "By Track Number"
-#~ msgstr "Номер доріжкии"
-
-#, fuzzy
-#~ msgid "Sorts the list by track number."
-#~ msgstr "/Сортувати список/За датою"
-
-#, fuzzy
-#~ msgid "By Playlist Entry"
-#~ msgstr "/Сортувати список/За назвою"
-
-#, fuzzy
-#~ msgid "Sorts the list by playlist entry."
-#~ msgstr "/Сортувати список/За назвою"
-
-#, fuzzy
-#~ msgid "Sort Selected"
-#~ msgstr "/Сортувати вибране"
-
-#, fuzzy
-#~ msgid "File"
-#~ msgstr "Сатира"
-
-#, fuzzy
-#~ msgid "Components"
-#~ msgstr "Коментар"
-
-#, fuzzy
-#~ msgid "View Track Details"
-#~ msgstr "/Інформація про пісню"
-
-#, fuzzy
-#~ msgid "Play File"
-#~ msgstr "/Програвати файли"
-
-#, fuzzy
-#~ msgid "Load and play a file"
-#~ msgstr ""
-#~ "Завантажувати інформацію про пісні з музичних файлів і списків програвання"
-
-#, fuzzy
-#~ msgid "Play Location"
-#~ msgstr "/Програвати знаходження"
-
-#, fuzzy
-#~ msgid "Plugin services"
-#~ msgstr "Модулі"
-
-#, fuzzy
-#~ msgid "Preferences"
-#~ msgstr "/Налаштування"
-
-#, fuzzy
-#~ msgid "Open preferences window"
-#~ msgstr "Вікно налаштувань"
-
-#, fuzzy
-#~ msgid "_Quit"
-#~ msgstr "/_Вийти"
-
-#, fuzzy
-#~ msgid "Quit Audacious"
-#~ msgstr "Про Audacious"
-
-#, fuzzy
-#~ msgid "Set A-B"
-#~ msgstr "Вибрати все"
-
-#, fuzzy
-#~ msgid "Clear A-B"
-#~ msgstr "/Очистити чергу"
-
-#, fuzzy
-#~ msgid "Jump to Playlist Start"
-#~ msgstr "/Перейти до першої пісні у списку"
-
-#, fuzzy
-#~ msgid "Jump to File"
-#~ msgstr "/Перейти до файлу"
-
-#, fuzzy
-#~ msgid "Queue Toggle"
-#~ msgstr "/Поставити пісню в чергу"
-
-#, fuzzy
-#~ msgid "Load"
-#~ msgstr "/Завантажити"
-
-#, fuzzy
-#~ msgid "Import"
-#~ msgstr "/Імпорт"
-
-#, fuzzy
-#~ msgid "Save"
-#~ msgstr "/Зберегти"
-
-#, fuzzy
-#~ msgid "Delete"
-#~ msgstr "/Стерти"
-
-#~ msgid "Preset"
-#~ msgstr "Попередня установка"
-
-#~ msgid "Load preset"
-#~ msgstr "Завантажити установки"
-
-#, fuzzy
-#~ msgid "Auto-load preset"
-#~ msgstr "/Завантажити/Автоматичні установки"
-
-#, fuzzy
-#~ msgid "Load auto-load preset"
-#~ msgstr "/Завантажити/Автоматичні установки"
-
-#~ msgid "Default"
-#~ msgstr "Основна"
-
-#, fuzzy
-#~ msgid "Load default preset into equalizer"
-#~ msgstr "Зберегти автоматичні установки"
-
-#, fuzzy
-#~ msgid "Zero"
-#~ msgstr "Ретро"
-
-#, fuzzy
-#~ msgid "Set equalizer preset levels to zero"
-#~ msgstr "Зберегти установки еквалайзера"
-
-#, fuzzy
-#~ msgid "From file"
-#~ msgstr "/Завантажити/З файлу"
-
-#, fuzzy
-#~ msgid "Load preset from file"
-#~ msgstr "Завантажити установки"
-
-#, fuzzy
-#~ msgid "From WinAMP EQF file"
-#~ msgstr "/Завантажити/З файлу EQF WinAMP"
-
-#, fuzzy
-#~ msgid "Load preset from WinAMP EQF file"
-#~ msgstr "/Завантажити/З файлу EQF WinAMP"
-
-#, fuzzy
-#~ msgid "WinAMP Presets"
-#~ msgstr "/Імпорт/Установки WinAMP"
-
-#, fuzzy
-#~ msgid "Import WinAMP presets"
-#~ msgstr "/Імпорт/Установки WinAMP"
-
-#~ msgid "Save preset"
-#~ msgstr "Зберегти установки"
-
-#, fuzzy
-#~ msgid "Save auto-load preset"
-#~ msgstr "/Зберегти/Автоматичні установки"
-
-#, fuzzy
-#~ msgid "Save default preset"
-#~ msgstr "Зберегти автоматичні установки"
-
-#, fuzzy
-#~ msgid "To file"
-#~ msgstr "/Завантажити/З файлу"
-
-#, fuzzy
-#~ msgid "Save preset to file"
-#~ msgstr "Зберегти установки"
-
-#, fuzzy
-#~ msgid "To WinAMP EQF file"
-#~ msgstr "/Зберегти/В файл EQF WinAMP"
-
-#, fuzzy
-#~ msgid "Save preset to WinAMP EQF file"
-#~ msgstr "/Зберегти/В файл EQF WinAMP"
-
-#~ msgid "Delete preset"
-#~ msgstr "Стерти установки"
-
-#, fuzzy
-#~ msgid "Delete auto-load preset"
-#~ msgstr "/Стерти/Автоматичні установки"
-
-#~ msgid ""
-#~ "<big>Unable to load skin.</big>\n"
-#~ "\n"
-#~ "Check that skin at '%s' is usable and default skin is properly installed "
-#~ "at '%s'\n"
-#~ msgstr ""
-#~ "<big>Не можу завантажити тему.</big>\n"
-#~ "\n"
-#~ "Перевірте,чи придатна до використання тема '%s' і встановлена типова тема "
-#~ "в '%s'\n"
-
-#, fuzzy
-#~ msgid "Audacious core developers:"
-#~ msgstr "Налаштування Audacious"
-
-#~ msgid "Audacious Equalizer"
-#~ msgstr "Еквалайзер Audacious"
-
-#, fuzzy
-#~ msgid "Play files"
-#~ msgstr "/Програвати файли"
-
-#, fuzzy
-#~ msgid "Load files"
-#~ msgstr "/Завантажити/З файлу"
-
-#~ msgid "VBR"
-#~ msgstr "VBR"
-
-#, fuzzy
-#~ msgid "mono"
-#~ msgstr "Моно"
-
-#, fuzzy
-#~ msgid "Show main player window"
-#~ msgstr "Вибір шрифту для головного вікна"
-
-#, fuzzy
-#~ msgid "Ignore"
-#~ msgstr "Нічого"
-
-#, fuzzy
-#~ msgid "Seek to: %d:%-2.2d/%d:%-2.2d (%d%%)"
-#~ msgstr "ПЕРЕМОТАТИ НА: %d:%-2.2d/%d:%-2.2d (%d%%)"
-
-#, fuzzy
-#~ msgid "Options Menu"
-#~ msgstr "Параметри"
-
-#, fuzzy
-#~ msgid "Disable 'Always On Top'"
-#~ msgstr "/Завжди згори"
-
-#, fuzzy
-#~ msgid "Enable 'Always On Top'"
-#~ msgstr "/Завжди згори"
-
-#, fuzzy
-#~ msgid "File Info Box"
-#~ msgstr "Інформація про файл"
-
-#, fuzzy
-#~ msgid "Disable 'GUI Scaling'"
-#~ msgstr "Заборонити теги ID3V2"
-
-#, fuzzy
-#~ msgid "Visualization Menu"
-#~ msgstr "/Режим візуалізації"
-
-#~ msgid ""
-#~ "<big>Couldn't open audio.</big>\n"
-#~ "\n"
-#~ "Please check that:\n"
-#~ "1. You have the correct output plugin selected.\n"
-#~ "2. No other programs is blocking the soundcard.\n"
-#~ "3. Your soundcard is configured properly.\n"
-#~ msgstr ""
-#~ "<big>Не можу відкрити аудіопристрій</big>\n"
-#~ "\n"
-#~ "Будь-ласка впевніться, що:\n"
-#~ "1. Ви вибрали вірний вихідний модуль\n"
-#~ "2. Інші програми не блокують звукову плату\n"
-#~ "3. Ваша звукова плата сконфіґурована вірно \n"
-
-#, fuzzy
-#~ msgid "Autoscroll Songname"
-#~ msgstr "/Автоматична прокрутка назви пісні"
-
-#, fuzzy
-#~ msgid "Show Player"
-#~ msgstr "/Показати редактор списку пісень"
-
-#, fuzzy
-#~ msgid "Show Playlist Editor"
-#~ msgstr "/Показати редактор списку пісень"
-
-#, fuzzy
-#~ msgid "Show Equalizer"
-#~ msgstr "/Еквалайзер"
-
-#, fuzzy
-#~ msgid "Always on Top"
-#~ msgstr "/Завжди згори"
-
-#, fuzzy
-#~ msgid "Put on All Workspaces"
-#~ msgstr "/На всі стільниці"
-
-#, fuzzy
-#~ msgid "Roll up Player"
-#~ msgstr "/Згорнути програвач"
-
-#, fuzzy
-#~ msgid "Roll up Playlist Editor"
-#~ msgstr "/Згорнути редактор списку програвання"
-
-#, fuzzy
-#~ msgid "Roll up Equalizer"
-#~ msgstr "/Згорнути еквалайзер"
-
-#, fuzzy
-#~ msgid "Scale"
-#~ msgstr "/Зберегти"
-
-#, fuzzy
-#~ msgid "Analyzer"
-#~ msgstr "/Режим аналізатора"
-
-#, fuzzy
-#~ msgid "Scope"
-#~ msgstr "/Режим графіка"
-
-#, fuzzy
-#~ msgid "Voiceprint"
-#~ msgstr "/Режим аналізатора/Полум'я"
-
-#, fuzzy
-#~ msgid "Normal"
-#~ msgstr "Формат ID3-тегу:"
-
-#, fuzzy
-#~ msgid "Fire"
-#~ msgstr "Сатира"
-
-#, fuzzy
-#~ msgid "Vertical Lines"
-#~ msgstr "/Режим аналізатора/Вертикальні лінії"
-
-#, fuzzy
-#~ msgid "Lines"
-#~ msgstr "рядків"
-
-#, fuzzy
-#~ msgid "Bars"
-#~ msgstr "Бас"
-
-#, fuzzy
-#~ msgid "Dot Scope"
-#~ msgstr "/Режим графіка/Точки"
-
-#, fuzzy
-#~ msgid "Line Scope"
-#~ msgstr "/Режим графіка/Лінії"
-
-#, fuzzy
-#~ msgid "Solid Scope"
-#~ msgstr "/Режим графіка/Заливка"
-
-#, fuzzy
-#~ msgid "Smooth"
-#~ msgstr "Моно"
-
-#, fuzzy
-#~ msgid "Full (~50 fps)"
-#~ msgstr "/Частота поновлення/Повна (~50 fps)"
-
-#, fuzzy
-#~ msgid "Half (~25 fps)"
-#~ msgstr "/Частота поновлення/Половина (~25 fps)"
-
-#, fuzzy
-#~ msgid "Quarter (~13 fps)"
-#~ msgstr "/Частота поновлення/Четверть (~13 fps)"
-
-#, fuzzy
-#~ msgid "Eighth (~6 fps)"
-#~ msgstr "/Частота поновлення/Восьма (~6 fps)"
-
-#, fuzzy
-#~ msgid "Slowest"
-#~ msgstr "Імпровізація"
-
-#, fuzzy
-#~ msgid "Slow"
-#~ msgstr "низьке"
-
-#, fuzzy
-#~ msgid "Medium"
-#~ msgstr "середнє"
-
-#, fuzzy
-#~ msgid "Time Elapsed"
-#~ msgstr "/Час від початку"
-
-#, fuzzy
-#~ msgid "Time Remaining"
-#~ msgstr "/Час, що залишився"
-
-#, fuzzy
-#~ msgid "Plugin Services"
-#~ msgstr "Модулі"
-
-#, fuzzy
-#~ msgid "Search entries in active playlist"
-#~ msgstr "Показувати номери пісень у списку програвання"
-
-#, fuzzy
-#~ msgid "Title: "
-#~ msgstr "Назва:"
-
-#, fuzzy
-#~ msgid "Album: "
-#~ msgstr "Альбом:"
-
-#, fuzzy
-#~ msgid "Artist: "
-#~ msgstr "Виконавець:"
-
-#, fuzzy
-#~ msgid "Filename: "
-#~ msgstr "Ім'я файлу:"
-
-#~ msgid "Audacious Playlist Editor"
-#~ msgstr "/Показати редактор списку пісень"
-
-#~ msgid "Appearance"
-#~ msgstr "Зовнішній вигляд"
-
-#~ msgid "_Fonts"
-#~ msgstr "_Шрифти"
-
-#~ msgid "_Player:"
-#~ msgstr "_Головне вікно програвача:"
-
-#~ msgid "Select main player window font:"
-#~ msgstr "Вибір шрифту для головного вікна"
-
-#~ msgid "_Playlist:"
-#~ msgstr "_Список програвання:"
-
-#, fuzzy
-#~ msgid "Select playlist font:"
-#~ msgstr "Вибір шрифту для головного вікна"
-
-#~ msgid "Use Bitmap fonts if available"
-#~ msgstr "Використовувати растрові шрифти (якщо наявні)"
-
-#~ msgid "_Miscellaneous"
-#~ msgstr "_Різне"
-
-#~ msgid "Show track numbers in playlist"
-#~ msgstr "Показувати номери пісень у списку програвання"
-
-#, fuzzy
-#~ msgid "Show separators in playlist"
-#~ msgstr "Показувати номери пісень у списку програвання"
-
-#~ msgid "On load"
-#~ msgstr "При відкритті"
-
-#~ msgid "Load metadata when adding the file to the playlist or opening it"
-#~ msgstr ""
-#~ "Завантажувати інформацію про пісню та виконавця при додаванні файлу в "
-#~ "список програвання або відкритті"
-
-#~ msgid "On display"
-#~ msgstr "При відображенні"
-
-#, fuzzy
-#~ msgid ""
-#~ "Load metadata on demand when displaying the file in the playlist. You may "
-#~ "need to set \"Detect file formats on demand\" in Audio page for full "
-#~ "benefit."
-#~ msgstr ""
-#~ "Завантажувати інформацію про пісню та виконавця при додаванні файлу в "
-#~ "список програвання або відкритті"
-
-#, fuzzy
-#~ msgid "Blue"
-#~ msgstr "Блюз"
-
-#, fuzzy
-#~ msgid "Green"
-#~ msgstr "Грецький:"
-
-#~ msgid "_Skin"
-#~ msgstr "_Тема"
-
-#, fuzzy
-#~ msgid "Refresh skin list"
-#~ msgstr "/Частота поновлення"
-
-#~ msgid "PREAMP"
-#~ msgstr "PREAMP"
-
-#~ msgid "60HZ"
-#~ msgstr "60 Гц"
-
-#~ msgid "170HZ"
-#~ msgstr "170 Гц"
-
-#~ msgid "310HZ"
-#~ msgstr "310 Гц"
-
-#~ msgid "600HZ"
-#~ msgstr "600 Гц"
-
-#~ msgid "1KHZ"
-#~ msgstr "1 кГц"
-
-#~ msgid "3KHZ"
-#~ msgstr "3 кГц"
-
-#~ msgid "6KHZ"
-#~ msgstr "6 кГц"
-
-#~ msgid "12KHZ"
-#~ msgstr "12 кГц"
-
-#~ msgid "14KHZ"
-#~ msgstr "14 кГц"
-
-#~ msgid "16KHZ"
-#~ msgstr "16 кГц"
-
-#~ msgid "Use custom cursors"
-#~ msgstr "Використовувати курсори, встановлені темою"
-
-#, fuzzy
-#~ msgid "Reload Plugins"
-#~ msgstr "Модулі"
-
-#~ msgid ""
-#~ "Sorry, threads isn't supported on your platform.\n"
-#~ "\n"
-#~ "If you're on a libc5 based linux system and installed Glib & GTK+ before "
-#~ "you\n"
-#~ "installed LinuxThreads you need to recompile Glib & GTK+.\n"
-#~ msgstr ""
-#~ "Вибачте, гілки не підтрумуються на вашій платформі.\n"
-#~ "\n"
-#~ "Якщо ви використовуєте лінукс систему на основі libc5 і встановленими "
-#~ "Glib і GTK+ вам\n"
-#~ "перед встановленням LinuxThreads слід перекомпілювати Glib і GTK+.\n"
-
-#, fuzzy
-#~ msgid "Error in Audacious."
-#~ msgstr "Про Audacious"
-
-#, fuzzy
-#~ msgid "Enable 6 dB hard limiter"
-#~ msgstr "Дозволити підсилення 6дБ + жорстке обмеження"
-
-#, fuzzy
-#~ msgid "Select which Audacious session ID to use"
-#~ msgstr "Встановити сесію для audacious/ВМР/XMMS (типова: 0)"
-
-#~ msgid "Presets"
-#~ msgstr "Попередні установки"
-
-#~ msgid "File preset extension:"
-#~ msgstr "Розширення файлу попередніх установок:"
-
-#~ msgid "Directory preset file:"
-#~ msgstr "Каталогу попередніх установок:"
-
-#, fuzzy
-#~ msgid ""
-#~ "TITLE\n"
-#~ "ARTIST - TITLE\n"
-#~ "ARTIST - ALBUM - TITLE\n"
-#~ "ARTIST - ALBUM - TRACK. TITLE\n"
-#~ "ARTIST [ ALBUM ] - TRACK. TITLE\n"
-#~ "ALBUM - TITLE\n"
-#~ "Custom"
-#~ msgstr ""
-#~ "Назва\n"
-#~ "Виконавець - Назва\n"
-#~ "Виконавець - Альбом - Назва\n"
-#~ "Альбом - Назва\n"
-#~ "Особливе"
-
-#, fuzzy
-#~ msgid "Track Information Window"
-#~ msgstr "Підсилення доріжок:"
-
-#~ msgid "Preferences Window"
-#~ msgstr "Вікно налаштувань"
-
-#, fuzzy
-#~ msgid "Close"
-#~ msgstr "/Закрити"
-
-#, fuzzy
-#~ msgid "Artist: %s"
-#~ msgstr "Виконавець"
-
-#, fuzzy
-#~ msgid "Title: %s"
-#~ msgstr "Ім'я файлу"
-
-#, fuzzy
-#~ msgid "Album: %s"
-#~ msgstr "Ім'я файлу"
-
-#, fuzzy
-#~ msgid "Audacious last.fm radio tuner"
-#~ msgstr "/Показати редактор списку пісень"
-
-#, fuzzy
-#~ msgid "Artist:"
-#~ msgstr "Виконавець"
-
-#, fuzzy
-#~ msgid "Title:"
-#~ msgstr "Ім'я файлу"
-
-#, fuzzy
-#~ msgid "Album:"
-#~ msgstr "Ім'я файлу"
-
-#~ msgid "VOLUME: %d%%"
-#~ msgstr "ГУЧНІСТЬ: %d%%"
-
-#~ msgid "BALANCE: %d%% LEFT"
-#~ msgstr "БАЛАНС: %d%% ЛІВОРУЧ"
-
-#~ msgid "BALANCE: CENTER"
-#~ msgstr "БАЛАНС: ЦЕНТР"
-
-#~ msgid "BALANCE: %d%% RIGHT"
-#~ msgstr "БАЛАНС: %d%% ПРАВОРУЧ"
-
-#, fuzzy
-#~ msgid "Last.fm radio"
-#~ msgstr "/Програвати знаходження"
-
-#, fuzzy
-#~ msgid "Play Last.fm radio"
-#~ msgstr "/Програвати знаходження"
-
-#, fuzzy
-#~ msgid "Converter Type:"
-#~ msgstr "Перетворити кодування"
-
-#~ msgid ""
-#~ "<big>No playable CD found.</big>\n"
-#~ "\n"
-#~ "No CD inserted, or inserted CD is not an audio CD.\n"
-#~ msgstr ""
-#~ "<big>Не знайдено звукового CD.</big>\n"
-#~ "\n"
-#~ "Компакт-диск відсутній або не містить аудіодоріжок.\n"
-
-#, fuzzy
-#~ msgid "Add CD..."
-#~ msgstr "/Додати CD..."
-
-#, fuzzy
-#~ msgid "Play CD"
-#~ msgstr "/Грати"
-
-#~ msgid "Performer/Artist"
-#~ msgstr "Виконавець/Артист"
-
-#~ msgid "File name"
-#~ msgstr "Назва файлу"
-
-#~ msgid "File path"
-#~ msgstr "Маршрут до файлу"
-
-#~ msgid "File extension"
-#~ msgstr "Розширення файлу"
-
-#~ msgid "Track name"
-#~ msgstr "Назва доріжки"
-
-#~ msgid "Track number"
-#~ msgstr "Номер доріжкии"
-
-#~ msgid "%{n:...%}: Display \"...\" only if element %n is present"
-#~ msgstr "%{n:...%}: Відображати \"...\", коли елемент %n присутній"
-
-#, fuzzy
-#~ msgid ""
-#~ "Sorry, your GTK+ version (%d.%d.%d) does not work with Audacious.\n"
-#~ "Please use GTK+ %s or newer.\n"
-#~ msgstr ""
-#~ "Вибачте, ваша GTK+ версія (%d.%d.%d) не працюватиме з BMP.\n"
-#~ "Будь-ласка, викоритовуйте GTK+ %s або кращу.\n"
-
-#~ msgid "OPTIONS MENU"
-#~ msgstr "МЕНЮ ОПЦІЙ"
-
-#~ msgid "DISABLE ALWAYS ON TOP"
-#~ msgstr "ЗАБОРОНИТИ СПЛИВАННЯ НАГОРУ"
-
-#~ msgid "ENABLE ALWAYS ON TOP"
-#~ msgstr "ДОЗВОЛИТИ СПЛИВАННЯ НАГОРУ "
-
-#~ msgid "FILE INFO BOX"
-#~ msgstr "ВІКНО ІНФОРМАЦІЇ ФАЙЛУ"
-
-#~ msgid "VISUALIZATION MENU"
-#~ msgstr "МЕНЮ ВІЗУАЛІЗАЦІЇ"
-
-#, fuzzy
-#~ msgid "Track name: "
-#~ msgstr "Назви доріжок:"
-
-#~ msgid ""
-#~ "<big>Unable to play files.</big>\n"
-#~ "\n"
-#~ "The following files could not be played. Please check that:\n"
-#~ "1. they are accessible.\n"
-#~ "2. you have enabled the media plugins required."
-#~ msgstr ""
-#~ "<big>Не можу грати файли.</big>\n"
-#~ "\n"
-#~ "Певні файли не можуть бути відтворені. Будь-ласка, перевірте :\n"
-#~ "1. Наявність цих файлів.\n"
-#~ "2. Увімкнення необхідних аудіо-модулів."
-
-#~ msgid "Show more _details"
-#~ msgstr "_Докладніше"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Received SIGSEGV\n"
-#~ "\n"
-#~ "This could be a bug in Audacious. If you don't know why this happened, "
-#~ "file a bug at http://bugs-meta.atheme.org/\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Отрмано SIGSEGV\n"
-#~ "\n"
-#~ "Можливо, це помилка в Audacious. Якщо ви не знаєте, чому це сталось, "
-#~ "відправте повідомлення на at http://bugs.nenolod.net/\n"
-#~ "\n"
-
-#, fuzzy
-#~ msgid "Enable playlist transparency"
-#~ msgstr "Вмикнути підсилення програвання"
-
-#~ msgid "%s: option `%s' is ambiguous\n"
-#~ msgstr "%s: параметр `%s' - неоднозначний\n"
-
-#~ msgid "%s: option `--%s' doesn't allow an argument\n"
-#~ msgstr "%s: параметр `--%s' не може мати аргументів\n"
-
-#~ msgid "%s: option `%c%s' doesn't allow an argument\n"
-#~ msgstr "%s: параметр `%c%s' не може мати аргументу\n"
-
-#~ msgid "%s: option `%s' requires an argument\n"
-#~ msgstr "%s: параметру `%s' необхідний аргумент\n"
-
-#~ msgid "%s: unrecognized option `%c%s'\n"
-#~ msgstr "%s: не розпізнано параметру `%c%s'\n"
-
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: невірний параметр -- %c\n"
-
-#~ msgid "%s: invalid option -- %c\n"
-#~ msgstr "%s: невірний параметр -- %c\n"
-
-#~ msgid "%s: option requires an argument -- %c\n"
-#~ msgstr "%s: параметру необхідний аргумент -- %c\n"
-
-#~ msgid "%s: option `-W %s' is ambiguous\n"
-#~ msgstr "%s: параметр `-W %s' неоднозначний\n"
-
-#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
-#~ msgstr "%s: опція `-W %s' не повинна мати аргумента\n"
-
-#~ msgid ""
-#~ "Usage: audacious [options] [files] ...\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "--------\n"
-#~ msgstr ""
-#~ "Використання: audacious [параметри] [файли] ...\n"
-#~ "\n"
-#~ "Параметри:\n"
-#~ "--------\n"
-
-#~ msgid "Display this text and exit"
-#~ msgstr "Надрукувати цей текст і вийти"
-
-#, fuzzy
-#~ msgid "Activate Audacious"
-#~ msgstr "Активувати audacious"
-
-#~ msgid "Previous session ID"
-#~ msgstr "Ідентифікатор попередньго сеансу"
-
-#~ msgid "Print version number and exit\n"
-#~ msgstr "Надрукувати номер версії і завершити роботу.\n"
-
-#~ msgid "Add/Open Files dialog"
-#~ msgstr "Вікно додавання файлів"
-
-#~ msgid "Close Dialog on Add"
-#~ msgstr "Закрити вікно після додавання"
-
-#~ msgid "Deselect All"
-#~ msgstr "Скасувати виділення"
-
-#, fuzzy
-#~ msgid "Artist Popup"
-#~ msgstr "Виконавець"
-
-#, fuzzy
-#~ msgid "Genre"
-#~ msgstr "Ім'я файлу"
-
-#, fuzzy
-#~ msgid "Year"
-#~ msgstr "Ім'я файлу"
-
-#, fuzzy
-#~ msgid "Track Number"
-#~ msgstr "Номер доріжкии"
-
-#, fuzzy
-#~ msgid "Track Length"
-#~ msgstr "Довжина доріжки:"
-
-#~ msgid "/View Track Details"
-#~ msgstr "/Інформація про пісню"
-
-#~ msgid "/Visualization Mode/Analyzer"
-#~ msgstr "/Режим візуалізації/Аналізатор"
-
-#~ msgid "/Visualization Mode/Scope"
-#~ msgstr "/Режим візуалізації/Графік"
-
-#, fuzzy
-#~ msgid "/Visualization Mode/Voiceprint"
-#~ msgstr "/Режим візуалізації/Графік"
-
-#~ msgid "/Visualization Mode/Off"
-#~ msgstr "/Режим візуализації/Вимкнено"
-
-#~ msgid "/Analyzer Mode/Normal"
-#~ msgstr "/Режим аналізатора/Звичайний"
-
-#~ msgid "/Analyzer Mode/Lines"
-#~ msgstr "/Режим аналізатора/Лінії"
-
-#~ msgid "/Analyzer Mode/Bars"
-#~ msgstr "/Режим аналізатора/Смуги"
-
-#~ msgid "/Analyzer Mode/Peaks"
-#~ msgstr "/Режим аналізатора/Піки"
-
-#, fuzzy
-#~ msgid "/Voiceprint mode/Normal"
-#~ msgstr "/Режим аналізатора/Звичайний"
-
-#~ msgid "/WindowShade VU Mode/Normal"
-#~ msgstr "/При мінімізованому окне/Звичайний"
-
-#~ msgid "/WindowShade VU Mode/Smooth"
-#~ msgstr "/При мінімізованому вікні/Плавний"
-
-#~ msgid "/Analyzer Falloff/Slowest"
-#~ msgstr "/Падіння Аналізатора/Найповільніше"
-
-#~ msgid "/Analyzer Falloff/Slow"
-#~ msgstr "/Падіння Аналізатора/Повільне"
-
-#~ msgid "/Analyzer Falloff/Medium"
-#~ msgstr "/Падіння Аналізатора/Середнє"
-
-#~ msgid "/Analyzer Falloff/Fast"
-#~ msgstr "/Падіння Аналізатора/Швидке"
-
-#~ msgid "/Analyzer Falloff/Fastest"
-#~ msgstr "/Падіння Аналізатора/Найшвидше"
-
-#~ msgid "/Peaks Falloff/Slowest"
-#~ msgstr "/Падіння піків/Найповільніше"
-
-#~ msgid "/Peaks Falloff/Slow"
-#~ msgstr "/Падіння піків/Повільне"
-
-#~ msgid "/Peaks Falloff/Medium"
-#~ msgstr "/Падіння піків/Середнє"
-
-#~ msgid "/Peaks Falloff/Fast"
-#~ msgstr "/Падіння піків/Швидке"
-
-#~ msgid "/Peaks Falloff/Fastest"
-#~ msgstr "/Падіння піків/Найшвидше"
-
-#~ msgid "/-"
-#~ msgstr "/-"
-
-#~ msgid "/Jump to Time"
-#~ msgstr "/Перейти до часу"
-
-#~ msgid "/About Audacious"
-#~ msgstr "/Про Audacious"
-
-#~ msgid "/Files..."
-#~ msgstr "/Додати Файли..."
-
-#~ msgid "/Internet location..."
-#~ msgstr "/Додати Адресу в інтернет..."
-
-#, fuzzy
-#~ msgid "New List"
-#~ msgstr "/Новий список"
-
-#, fuzzy
-#~ msgid "Creates a new playlist."
-#~ msgstr "Показувати номери пісень у списку програвання"
-
-#, fuzzy
-#~ msgid "Displays track information."
-#~ msgstr "Підсилення доріжок:"
-
-#~ msgid "/Load/Preset"
-#~ msgstr "/Завантажити/Попередні установки"
-
-#~ msgid "/Load/Default"
-#~ msgstr "/Завантажити/По замовчанню"
-
-#~ msgid "/Load/Zero"
-#~ msgstr "/Завантажити/Нуль"
-
-#~ msgid "/Save"
-#~ msgstr "/Зберегти"
-
-#~ msgid "/Save/Preset"
-#~ msgstr "/Зберегти/Установки"
-
-#~ msgid "/Save/Default"
-#~ msgstr "/Зберегти/Стандартні "
-
-#~ msgid "/Save/To file"
-#~ msgstr "/Зберегти/В файл"
-
-#~ msgid "/Delete/Preset"
-#~ msgstr "/Стерти/Установки"
-
-#~ msgid "Load auto-preset"
-#~ msgstr "Завантажити автоматичні установкии"
-
-#~ msgid "Load equalizer preset"
-#~ msgstr "Завантажити установки еквалайзера"
-
-#~ msgid "Delete auto-preset"
-#~ msgstr "Стерти автоматичні установки"
-
-#, fuzzy
-#~ msgid "/Remove Duplicates/By Title"
-#~ msgstr "/Сортувати список/За назвою"
-
-#, fuzzy
-#~ msgid "/Remove Duplicates/By Filename"
-#~ msgstr "/Сортувати список/За іменем файлу"
-
-#~ msgid "/Update View"
-#~ msgstr "/Обновити видимий список"
-
-#~ msgid "/Select All"
-#~ msgstr "Вибрати все"
-
-#~ msgid "/Sort List/By Date"
-#~ msgstr "/Сортувати список/За датою"
-
-#~ msgid "/Sort Selection/By Title"
-#~ msgstr "/Сортувати вибране/За назвою"
-
-#, fuzzy
-#~ msgid "/Sort Selection/By Artist"
-#~ msgstr "/Сортувати вибране/За назвою"
-
-#~ msgid "/Sort Selection/By Filename"
-#~ msgstr "/Сортувати вибране/За іменем файлу"
-
-#~ msgid "/Sort Selection/By Path + Filename"
-#~ msgstr "/Сортувати вибране/За шляхом й іменем файлу"
-
-#~ msgid "/Sort Selection/By Date"
-#~ msgstr "/Сортувати вибране/За датою"
-
-#, fuzzy
-#~ msgid "/Sort Selection/By Track Number"
-#~ msgstr "/Сортувати вибране/За датою"
-
-#, fuzzy
-#~ msgid "/Sort Selection/By Playlist Entry"
-#~ msgstr "/Сортувати вибране/За назвою"
-
-#, fuzzy
-#~ msgid "_Miscillaneous UI Features"
-#~ msgstr "_Різне"
-
-#, fuzzy
-#~ msgid "About AudioCompress"
-#~ msgstr "Про Audacious"
-
-#~ msgid "Ok"
-#~ msgstr "ОК"
-
-#, fuzzy
-#~ msgid "Extra Stereo Plugin %s"
-#~ msgstr "Модуль запису на диск %s"
-
-#, fuzzy
-#~ msgid "About Extra Stereo Plugin"
-#~ msgstr "Про модуль ESounD"
-
-#, fuzzy
-#~ msgid "Effect intensity:"
-#~ msgstr "Список модулів _ефектів:"
-
-#~ msgid "Cancel"
-#~ msgstr "Скасувати"
-
-#~ msgid "Apply"
-#~ msgstr "Застосувати"
-
-#, fuzzy
-#~ msgid "About LIRC Audacious Plugin"
-#~ msgstr "Про модуль підтримки формату MPEG"
-
-#, fuzzy
-#~ msgid "LIRC Plugin "
-#~ msgstr "Модулі"
-
-#, fuzzy
-#~ msgid "LIRC Plugin"
-#~ msgstr "Модулі"
-
-#~ msgid "Username:"
-#~ msgstr "Ім'я користувача:"
-
-#~ msgid "Password:"
-#~ msgstr "Пароль:"
-
-#, fuzzy
-#~ msgid "About Scrobbler Plugin"
-#~ msgstr "Про модуль ESounD"
-
-#, fuzzy
-#~ msgid "Scrobbler Plugin"
-#~ msgstr "Модулі"
-
-#~ msgid "Song Change %s"
-#~ msgstr "Зміна пісні %s"
-
-#~ msgid "Commands"
-#~ msgstr "Коментар"
-
-#~ msgid "Command:"
-#~ msgstr "Коментар:"
-
-#, fuzzy
-#~ msgid "Command to run when Audacious reaches the end of the playlist."
-#~ msgstr ""
-#~ "Завантажувати інформацію про пісню та виконавця при відображенні файлу в "
-#~ "списку програвання"
-
-#, fuzzy
-#~ msgid "About "
-#~ msgstr "Про програму"
-
-#, fuzzy
-#~ msgid "AMIDI-Plug - warning"
-#~ msgstr "Зміна налаштувань модуля підтримки MikMod"
-
-#, fuzzy
-#~ msgid "AMIDI-Plug - select file"
-#~ msgstr "Зміна налаштувань модуля підтримки MikMod"
-
-#, fuzzy
-#~ msgid "AMIDI-Plug - configuration"
-#~ msgstr "Зміна налаштувань модуля підтримки MikMod"
-
-#~ msgid "Name:"
-#~ msgstr "Ім'я:"
-
-#, fuzzy
-#~ msgid " MIDI Info "
-#~ msgstr "Інформація про компакт"
-
-#, fuzzy
-#~ msgid "Length (msec):"
-#~ msgstr "Довжина:"
-
-#, fuzzy
-#~ msgid "Num of Tracks:"
-#~ msgstr "Перейти до доріжки"
-
-#~ msgid "CD Audio Plugin"
-#~ msgstr "Модуль підтримки аудіо компакт-дисків"
-
-#~ msgid "CD Audio Track %02u"
-#~ msgstr "CD аудіо доріжка %02u"
-
-#~ msgid "(unknown)"
-#~ msgstr "(невідомо)"
-
-#~ msgid "Drive %d"
-#~ msgstr "Пристрій %d"
-
-#~ msgid ""
-#~ "Failed to open device %s\n"
-#~ "Error: %s\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Не можу відкрити пристрій %s\n"
-#~ "Помилка: %s\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Failed to read \"Table of Contents\"\n"
-#~ "Maybe no disc in the drive?\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Не можу прочитати \"Оглавление\"\n"
-#~ "Може диск не вставлений в привід?\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Device %s OK.\n"
-#~ "Disc has %d tracks"
-#~ msgstr ""
-#~ "Привід %s: ОК.\n"
-#~ "На дискі %d доріжок"
-
-#~ msgid " (%d data tracks)"
-#~ msgstr " (%d доріжок з даними)"
-
-#~ msgid ""
-#~ "\n"
-#~ "Total length: %d:%d\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Загальна довжина: %d:%d\n"
-
-#~ msgid ""
-#~ "Digital audio extraction not tested as the disc has no audio tracks\n"
-#~ msgstr ""
-#~ "Цифрове зчитування аудіо не тестовано, оскільки на диску нема "
-#~ "аудіодоріжок\n"
-
-#~ msgid ""
-#~ "Digital audio extraction test: OK\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Тестування цифрового зчитування: OK\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Digital audio extraction test failed: %s\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Тестування цифрового зчитування не вдалось: %s\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Failed to check directory %s\n"
-#~ "Error: %s"
-#~ msgstr ""
-#~ "Не можу перевірити каталог %s\n"
-#~ "Помилка: %s"
-
-#~ msgid "Error: %s exist, but is not a directory"
-#~ msgstr "Помилка: %s існує, але не каталог"
-
-#~ msgid "Directory %s OK."
-#~ msgstr "Каталог %s в порядку.."
-
-#~ msgid "Device:"
-#~ msgstr "Пристрій:"
-
-#~ msgid "_Device:"
-#~ msgstr "_Пристрій:"
-
-#~ msgid "Dir_ectory:"
-#~ msgstr "_Каталог:"
-
-#~ msgid "Play mode:"
-#~ msgstr "Режим програвання:"
-
-#~ msgid "Analog"
-#~ msgstr "Аналоговий"
-
-#~ msgid "Digital audio extraction"
-#~ msgstr "Цифрове зчитування аудіо"
-
-#~ msgid "No mixer"
-#~ msgstr "Немає мікшера"
-
-#~ msgid "CDROM drive"
-#~ msgstr "Компакт-диск"
-
-#~ msgid "OSS mixer"
-#~ msgstr "Мікшер OSS"
-
-#~ msgid "Check drive..."
-#~ msgstr "Перевірити пристрій..."
-
-#~ msgid "Remove drive"
-#~ msgstr "Прибрати пристрій"
-
-#~ msgid "CD Audio Player Configuration"
-#~ msgstr "Конфігурація програвача компакт-дисків"
-
-#~ msgid "Add drive"
-#~ msgstr "Додати пристрій"
-
-#~ msgid "Device"
-#~ msgstr "Пристрій"
-
-#~ msgid "CDDB:"
-#~ msgstr "CDDB:"
-
-#~ msgid "Use CDDB"
-#~ msgstr "Використовувати CDDB"
-
-#~ msgid "Get server list"
-#~ msgstr "Отримати список серверів"
-
-#~ msgid "Show network window"
-#~ msgstr "Показати вікно мережі"
-
-#~ msgid "CDDB server:"
-#~ msgstr "Cервер CDDB :"
-
-#~ msgid "CD Index:"
-#~ msgstr "Індекс CD:"
-
-#~ msgid "Use CD Index"
-#~ msgstr "Використовувати індекс компакт-дисків"
-
-#~ msgid "CD Index server:"
-#~ msgstr "Сервер індексів CD:"
-
-#~ msgid "Override generic titles"
-#~ msgstr "Має перевагу над загальними заголовками"
-
-#~ msgid "Name format:"
-#~ msgstr "Формат назви:"
-
-#~ msgid "CD Info"
-#~ msgstr "Інформація про компакт"
-
-#, fuzzy
-#~ msgid "Japanese (EUC-JP)"
-#~ msgstr "Японський:"
-
-#, fuzzy
-#~ msgid "Unicode (UTF-8)"
-#~ msgstr " (недопустима послідовність Юнікод)"
-
-#, fuzzy
-#~ msgid "Korean (UHC)"
-#~ msgstr "Корейський:"
-
-#~ msgid "Select the directory where you want to store the MPEG streams:"
-#~ msgstr "Виберіть директорію для запису потоків MPEG:"
-
-#, fuzzy
-#~ msgid "Flac Configuration"
-#~ msgstr "Конфігурація програвача компакт-дисків"
-
-#~ msgid "Convert character set from :"
-#~ msgstr "Перетворити кодування із:"
-
-#~ msgid "to :"
-#~ msgstr "на :"
-
-#, fuzzy
-#~ msgid "Enable ReplayGain processing"
-#~ msgstr "Вмикнути підсилення програвання"
-
-#~ msgid "Resolution"
-#~ msgstr "Роздільність:"
-
-#~ msgid "Without ReplayGain"
-#~ msgstr "Без підсилення при програванні"
-
-#~ msgid "Dither 24bps to 16bps"
-#~ msgstr "Змішувати 24bps до 16bps"
-
-#~ msgid "With ReplayGain"
-#~ msgstr "З підсиленням при програванні"
-
-#, fuzzy
-#~ msgid "Enable dithering"
-#~ msgstr "Вмикнено"
-
-#~ msgid "Noise shaping"
-#~ msgstr "Фомування шуму"
-
-#~ msgid "high"
-#~ msgstr "високе"
-
-#~ msgid "Dither to"
-#~ msgstr "Змішувати до"
-
-#~ msgid "16 bps"
-#~ msgstr "16 біт"
-
-#~ msgid "24 bps"
-#~ msgstr "24 біт"
-
-#~ msgid "Output"
-#~ msgstr "Вивід"
-
-#~ msgid "Buffering:"
-#~ msgstr "Буфер:"
-
-#~ msgid "Buffer size (kb):"
-#~ msgstr "Розмір буфера (кбайт):"
-
-#~ msgid "Pre-buffer (percent):"
-#~ msgstr "Попереднє буферування (відсотків):"
-
-#~ msgid "Save stream to disk:"
-#~ msgstr "Записати потік на диск:"
-
-#~ msgid "Save stream to disk"
-#~ msgstr "Записати потік на диск:"
-
-#~ msgid "Path:"
-#~ msgstr "Маршрут:"
-
-#~ msgid "Browse"
-#~ msgstr "Переглянути"
-
-#~ msgid "SHOUT/Icecast:"
-#~ msgstr "SHOUT/Icecast:"
-
-#~ msgid "Enable Icecast Metadata UDP Channel"
-#~ msgstr "Вмикнути потік заголовків SHOUT/Icecast"
-
-#~ msgid "Streaming"
-#~ msgstr "Потік"
-
-#, fuzzy
-#~ msgid "About Flac Plugin"
-#~ msgstr "Про модуль ESounD"
-
-#, fuzzy
-#~ msgid "Samplerate: %d Hz"
-#~ msgstr "Частота:"
-
-#, fuzzy
-#~ msgid "Channels: %d"
-#~ msgstr "Канали:"
-
-#, fuzzy
-#~ msgid ""
-#~ "Samples: %llu\n"
-#~ "Length: %d:%.2d"
-#~ msgstr ""
-#~ "\n"
-#~ "Загальна довжина: %d:%d\n"
-
-#, fuzzy
-#~ msgid "Filesize: %ld B"
-#~ msgstr "Розмір файлу:"
-
-#~ msgid "Comment:"
-#~ msgstr "Коментар:"
-
-#~ msgid "Date:"
-#~ msgstr "Дата:"
-
-#~ msgid "Track number:"
-#~ msgstr "Номер доріжки:"
-
-#~ msgid "Genre:"
-#~ msgstr "Стиль:"
-
-#, fuzzy
-#~ msgid "Remove Tag"
-#~ msgstr "/Видалити все"
-
-#, fuzzy
-#~ msgid "FLAC Info:"
-#~ msgstr "Інформація про компакт"
-
-#, fuzzy
-#~ msgid "File Info - %s"
-#~ msgstr "Інформація про файл"
-
-#~ msgid "Error"
-#~ msgstr "Помилка"
-
-#~ msgid "LOOKING UP %s"
-#~ msgstr "ШУКАЮ %s"
-
-#~ msgid "Couldn't look up host %s"
-#~ msgstr "Не можу знайти хост %s"
-
-#~ msgid "CONNECTING TO %s:%d"
-#~ msgstr "З'ЄДНУЮСЬ З %s:%d"
-
-#~ msgid "Couldn't connect to host %s"
-#~ msgstr "Не можу під'єднатись до хосту %s"
-
-#~ msgid "CONNECTED: WAITING FOR REPLY"
-#~ msgstr "ПЗ'ЄДНАНО: ЧЕКАЮ НА ВІДПОВІДЬ"
-
-#~ msgid ""
-#~ "Couldn't connect to host %s\n"
-#~ "Server reported: %s"
-#~ msgstr ""
-#~ "Не можу підключитись до хоста %s\n"
-#~ "Сервер повідомив: %s"
-
-#~ msgid "PRE-BUFFERING: %dKB/%dKB"
-#~ msgstr "ПРЕ-БУФЕР: %dКб/%dКб"
-
-#, fuzzy
-#~ msgid "FLAC Audio Plugin"
-#~ msgstr "Модуль підтримки аудіо компакт-дисків"
-
-#, fuzzy
-#~ msgid "ModPlug Configuration"
-#~ msgstr "Зміна налаштувань модуля підтримки MikMod"
-
-#~ msgid "16 bit"
-#~ msgstr "16 біт"
-
-#~ msgid "8 bit"
-#~ msgstr "8 біт"
-
-#, fuzzy
-#~ msgid "Channels"
-#~ msgstr "Канали:"
-
-#, fuzzy
-#~ msgid "Resampling"
-#~ msgstr "Потік"
-
-#, fuzzy
-#~ msgid "Fast Playlist Info"
-#~ msgstr "Завантажии список програвання"
-
-#, fuzzy
-#~ msgid "Reverb"
-#~ msgstr "Сервер"
-
-#, fuzzy
-#~ msgid "Depth"
-#~ msgstr "Дует"
-
-#, fuzzy
-#~ msgid "Amount"
-#~ msgstr "Про програму"
-
-#, fuzzy
-#~ msgid "Range"
-#~ msgstr "Рейв"
-
-#, fuzzy
-#~ msgid "MOD Info"
-#~ msgstr "Інформація про компакт"
-
-#, fuzzy
-#~ msgid "Samples"
-#~ msgstr "Сальса"
-
-#, fuzzy
-#~ msgid "Instruments"
-#~ msgstr "Інструментальна"
-
-#, fuzzy
-#~ msgid "About Modplug"
-#~ msgstr "Про модуль ESounD"
-
-#~ msgid "MPEG Audio Plugin Configuration"
-#~ msgstr "Зміна налаштувань модуля підтримки формату MPEG"
-
-#~ msgid "Resolution:"
-#~ msgstr "Роздільність:"
-
-#~ msgid "Channels:"
-#~ msgstr "Канали:"
-
-#~ msgid "Stereo (if available)"
-#~ msgstr "Стерео (якщо наявне)"
-
-#~ msgid "Down sample:"
-#~ msgstr "Зменшити частоту тактування:"
-
-#~ msgid "1:1 (44 kHz)"
-#~ msgstr "1:1 (44 кГц)"
-
-#~ msgid "1:2 (22 kHz)"
-#~ msgstr "1:2 (22 кГц)"
-
-#~ msgid "1:4 (11 kHz)"
-#~ msgstr "1:4 (11 кГц)"
-
-#~ msgid "Decoder"
-#~ msgstr "Декодування"
-
-#~ msgid "ID3 Tags:"
-#~ msgstr "ID3-теги:"
-
-#~ msgid "ID3 format:"
-#~ msgstr "Формат ID3-тегу:"
-
-#~ msgid "Joint stereo"
-#~ msgstr "Об'єднане стерео"
-
-#~ msgid "Single channel"
-#~ msgstr "Одинарний канал"
-
-#~ msgid "%d KBit/s"
-#~ msgstr "%d кБіт/с"
-
-#~ msgid "%ld Hz"
-#~ msgstr "%ld Гц"
-
-#~ msgid "50/15 ms"
-#~ msgstr "50/15 мс"
-
-#~ msgid "CCIT J.17"
-#~ msgstr "CCIT J.17"
-
-#~ msgid "No"
-#~ msgstr "Ні"
-
-#~ msgid "Yes"
-#~ msgstr "Так"
-
-#~ msgid " MPEG Info "
-#~ msgstr " Інформація MPEG: "
-
-#~ msgid "MPEG Level:"
-#~ msgstr "MPEG рівень:"
-
-#~ msgid "Bit rate:"
-#~ msgstr "Бітова частота:"
-
-#~ msgid "Sample rate:"
-#~ msgstr "Частота:"
-
-#~ msgid "File size:"
-#~ msgstr "Розмір файлу:"
-
-#, fuzzy
-#~ msgid "Mode:"
-#~ msgstr "Миша"
-
-#~ msgid "Error Protection:"
-#~ msgstr "Захист від помилок:"
-
-#~ msgid "Copyright:"
-#~ msgstr "Авторське право:"
-
-#~ msgid "Original:"
-#~ msgstr "Оригінальний:"
-
-#~ msgid "Emphasis:"
-#~ msgstr "Виразний:"
-
-#~ msgid " ID3 Tag "
-#~ msgstr " ID3-тег "
-
-#~ msgid "Year:"
-#~ msgstr "Рік:"
-
-#~ msgid "N/A"
-#~ msgstr "N/A"
-
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#~ msgid "%lu Bytes"
-#~ msgstr "%lu байт"
-
-#, fuzzy
-#~ msgid "Couldn't connect to host %s:%d"
-#~ msgstr "Не можу під'єднатись до хосту %s"
-
-#, fuzzy
-#~ msgid "PRE-BUFFERING: %zuKB/%zuKB"
-#~ msgstr "ПРЕ-БУФЕР: %dКб/%dКб"
-
-#~ msgid "About MPEG Audio Plugin"
-#~ msgstr "Про модуль підтримки формату MPEG"
-
-#~ msgid "MPEG Audio Plugin"
-#~ msgstr "Модуль підтримки MPEG"
-
-#, fuzzy
-#~ msgid "TiMidity Configuration"
-#~ msgstr "Зміна налаштувань модуля підтримки MikMod"
-
-#, fuzzy
-#~ msgid "Sample Width"
-#~ msgstr "Частота:"
-
-#, fuzzy
-#~ msgid "TiMidity Configuration File"
-#~ msgstr "Зміна налаштувань модуля підтримки MikMod"
-
-#, fuzzy
-#~ msgid "TiMidity Player %s"
-#~ msgstr "Програвач MikMod %s"
-
-#, fuzzy
-#~ msgid "TiMidity Plugin %s"
-#~ msgstr "Модуль запису на диск %s"
-
-#, fuzzy
-#~ msgid "Couldn't load MIDI file"
-#~ msgstr "Не можу завантижити специфікатор вирівнювання"
-
-#~ msgid "Select the directory where you want to store the Ogg Vorbis streams:"
-#~ msgstr "Виберіть директорію для запису потоків Ogg Vorbis:"
-
-#~ msgid "Ogg Vorbis Audio Plugin Configuration"
-#~ msgstr "Зміна налаштувань модуля підтримки формату Ogg Vorbis"
-
-#~ msgid "Ogg Vorbis Tags:"
-#~ msgstr "Теги Ogg Vorbis:"
-
-#~ msgid "ReplayGain Settings:"
-#~ msgstr "Установки для підсилення програвання"
-
-#~ msgid "ReplayGain Type:"
-#~ msgstr "Тип підсилення прогавання:"
-
-#~ msgid "use Track Gain/Peak"
-#~ msgstr "користуватись підсиленням/піковими рівнями для доріжок"
-
-#~ msgid "use Album Gain/Peak"
-#~ msgstr "користуватись підсиленням/піковими рівнями для альбому"
-
-#~ msgid "Enable 6dB Boost + Hard Limiting"
-#~ msgstr "Дозволити підсилення 6дБ + жорстке обмеження"
-
-#~ msgid ""
-#~ "An error occured:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Сталася помилка:\n"
-#~ "%s"
-
-#~ msgid "Error!"
-#~ msgstr "Помилка!"
-
-#~ msgid "Failed to modify tag (open)"
-#~ msgstr "Не можу змінити тег(відкрити)"
-
-#~ msgid "Failed to modify tag (close)"
-#~ msgstr "Не можу змінити тег(закрити)"
-
-#~ msgid "Failed to modify tag"
-#~ msgstr "Не можу змінити тег"
-
-#~ msgid " Ogg Vorbis Tag "
-#~ msgstr " Тег Ogg Vorbis "
-
-#~ msgid "Description:"
-#~ msgstr "Опис:"
-
-#~ msgid "Version:"
-#~ msgstr "Версія:"
-
-#~ msgid "ISRC number:"
-#~ msgstr "Номер ISRC:"
-
-#~ msgid "Organization:"
-#~ msgstr "Організація:"
-
-#~ msgid " Ogg Vorbis ReplayGain "
-#~ msgstr " Ogg Vorbis ReplayGain"
-
-#~ msgid "Album peak:"
-#~ msgstr "Піковий рівень альбома:"
-
-#~ msgid " Ogg Vorbis Info "
-#~ msgstr "Інформація Ogg Vorbis: "
-
-#~ msgid "Length:"
-#~ msgstr "Довжина:"
-
-#~ msgid "%d KBit/s (nominal)"
-#~ msgstr "%d кБіт/с (номінал)"
-
-#~ msgid "%d Hz"
-#~ msgstr "%d Гц"
-
-#~ msgid "%d"
-#~ msgstr "%d"
-
-#~ msgid "%d:%.2d"
-#~ msgstr "%d:%.2d"
-
-#~ msgid "%d Bytes"
-#~ msgstr "%d байт"
-
-#~ msgid "Ogg Vorbis Audio Plugin"
-#~ msgstr "Модуль підтримки Ogg Vorbis"
-
-#~ msgid "About Ogg Vorbis Audio Plugin"
-#~ msgstr "Про модуль піддтримки формату Ogg Vorbis"
-
-#~ msgid ""
-#~ "Ogg Vorbis Plugin by the Xiph.org Foundation\n"
-#~ "\n"
-#~ "Original code by\n"
-#~ "Tony Arcieri <bascule@inferno.tusculum.edu>\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"
-#~ "Haavard Kvaalen <havardk@xmms.org>\n"
-#~ "Gian-Carlo Pascutto <gcp@sjeng.org>\n"
-#~ "\n"
-#~ "Visit the Xiph.org Foundation at http://www.xiph.org/\n"
-#~ msgstr ""
-#~ "Модуль Ogg Vorbis від Фундації Xing.org\n"
-#~ "\n"
-#~ "Програмування\n"
-#~ "Tony Arcieri <bascule@inferno.tusculum.edu>\n"
-#~ "Внески від\n"
-#~ "Chris Montgomery <monty@xiph.org>\n"
-#~ "Peter Alm <peter@xmms.org>\n"
-#~ "Michael Smith <msmith@labyrinth.edu.au>\n"
-#~ "Jack Moffitt <jack@icecast.org>\n"
-#~ "Jorn Baayen <jorn@nl.linux.org>\n"
-#~ "Haavard Kvaalen <havardk@xmms.org>\n"
-#~ "Gian-Carlo Pascutto <gcp@sjeng.org>\n"
-#~ "\n"
-#~ "Відвідайте майданчик фундації Xing.org за адресою http://www.xiph.org/\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "Adapted for Audacious usage by Tony Vroon <chainsaw@gentoo.org>\n"
-#~ "from the xmms_sndfile plugin which is:\n"
-#~ "Copyright (C) 2000, 2002 Erik de Castro Lopo\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. \n"
-#~ "See the GNU General Public License for more details. \n"
-#~ "\n"
-#~ "You should have received a copy of the GNU General Public \n"
-#~ "License along with this program ; if not, write to \n"
-#~ "the Free Software Foundation, Inc., \n"
-#~ "51 Franklin Street, Fifth Floor, \n"
-#~ "Boston, MA 02110-1301 USA"
-#~ msgstr ""
-#~ "Модуль XMMS ESounD\n"
-#~ "\n"
-#~ "Ця програма належить до вільного програмного забезпечення. Ви маєте\n"
-#~ "право розповсюджувати та/або видозмінювати її керуючись при цьому\n"
-#~ "умовами Загальної Публічної Ліцензії GNU у такому вигляді, як вона\n"
-#~ "була опублікована Фундацією Вільного Програмного забезпечення (Free\n"
-#~ "Software Foundation) або версією 2 Ліцензії, або (на Ваш вибір)\n"
-#~ "будь-якою пізнішою версією.\n"
-#~ "\n"
-#~ "Ця програма розповсюджується із сподіваннями, що вона може бути\n"
-#~ "корисною, але БЕЗ НІЯКОЇ ГАРАНТІЇ, навіть без уявної гарантії того, що\n"
-#~ "ця програма може бути КУПЛЕНОЮ або ПІДХОДИТЬ ПІД ЯКУСЬ ПЕВНУ\n"
-#~ "МЕТУ. Подальші подробиці дивіться у Загальній Публічній Ліцензії GNU.\n"
-#~ "\n"
-#~ "Ви маєте отримати копію Загальної Публічної Ліцензії GNU разом з цією\n"
-#~ "програмою. Якщо ж ні напишіть у Фундацію Вільного Програмного\n"
-#~ "забезпечення за адресою 59 Temple Place - Suite 330, Boston, MA\n"
-#~ "02111-1307, USA."
-
-#~ msgid "WAV Audio Plugin"
-#~ msgstr "Модуль підтримки WAV"
-
-#, fuzzy
-#~ msgid "WMA Player %s"
-#~ msgstr "Програвач MikMod %s"
-
-#, fuzzy
-#~ msgid "About %s"
-#~ msgstr "Про програму"
-
-#, fuzzy
-#~ msgid " Close "
-#~ msgstr "/Закрити"
-
-#~ msgid "About OSS Driver"
-#~ msgstr "Про модуль виводу OSS"
-
-#, fuzzy
-#~ msgid ""
-#~ "Audacious OSS Driver\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 ""
-#~ "Драйвер XMMS OSS \n"
-#~ "\n"
-#~ "Ця програма належить до вільного програмного забезпечення. Ви маєте\n"
-#~ "право розповсюджувати та/або видозмінювати її керуючись при цьому\n"
-#~ "умовами Загальної Публічної Ліцензії GNU у такому вигляді, як вона\n"
-#~ "була опублікована Фундацією Вільного Програмного забезпечення (Free\n"
-#~ "Software Foundation) або версією 2 Ліцензії, або (на Ваш вибір)\n"
-#~ "будь-якою пізнішою версією.\n"
-#~ "\n"
-#~ "Ця програма розповсюджується із сподіваннями, що вона може бути\n"
-#~ "корисною, але БЕЗ НІЯКОЇ ГАРАНТІЇ, навіть без уявної гарантії того, що\n"
-#~ "ця програма може бути КУПЛЕНОЮ або ПІДХОДИТЬ ПІД ЯКУСЬ ПЕВНУ\n"
-#~ "МЕТУ. Подальші подробиці дивіться у Загальній Публічній Ліцензії GNU.\n"
-#~ "\n"
-#~ "Ви маєте отримати копію Загальної Публічної Ліцензії GNU разом з цією\n"
-#~ "програмою. Якщо ж ні напишіть у Фундацію Вільного Програмного\n"
-#~ "забезпечення за адресою 59 Temple Place - Suite 330, Boston, MA\n"
-#~ "02111-1307, USA."
-
-#~ msgid "Default (%s)"
-#~ msgstr "Основний (%s)"
-
-#~ msgid "OSS Driver configuration"
-#~ msgstr "Конфігурація драйвера OSS"
-
-#~ msgid "Audio device:"
-#~ msgstr "Звуковий пристрій:"
-
-#~ msgid "Use alternate device:"
-#~ msgstr "Користуватися іншим пристроєм:"
-
-#~ msgid "Mixer device:"
-#~ msgstr "Пристрій мікшера:"
-
-#~ msgid "Devices"
-#~ msgstr "Пристрої"
-
-#~ msgid "Buffer size (ms):"
-#~ msgstr "Розмір буфера (мс):"
-
-#~ msgid "Mixer Settings:"
-#~ msgstr "Установки мікшера:"
-
-#~ msgid "Volume controls Master not PCM"
-#~ msgstr "Гучністю керує Master, а не PCM"
-
-#~ msgid "Mixer"
-#~ msgstr "Мікшер"
-
-#~ msgid "About ALSA Driver"
-#~ msgstr "Про драйвер ALSA"
-
-#, fuzzy
-#~ msgid ""
-#~ "Audacious ALSA Driver\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.\n"
-#~ "Author: Matthieu Sozeau (mattam@altern.org)"
-#~ msgstr ""
-#~ "Драйвер XMMS ALSA \n"
-#~ "\n"
-#~ "Ця програма належить до вільного програмного забезпечення. Ви маєте\n"
-#~ "право розповсюджувати та/або видозмінювати її керуючись при цьому\n"
-#~ "умовами Загальної Публічної Ліцензії GNU у такому вигляді, як вона\n"
-#~ "була опублікована Фундацією Вільного Програмного забезпечення (Free\n"
-#~ "Software Foundation) або версією 2 Ліцензії, або (на Ваш вибір)\n"
-#~ "будь-якою пізнішою версією.\n"
-#~ "\n"
-#~ "Ця програма розповсюджується із сподіваннями, що вона може бути\n"
-#~ "корисною, але БЕЗ НІЯКОЇ ГАРАНТІЇ, навіть без уявної гарантії того, що\n"
-#~ "ця програма може бути КУПЛЕНОЮ або ПІДХОДИТЬ ПІД ЯКУСЬ ПЕВНУ\n"
-#~ "МЕТУ. Подальші подробиці дивіться у Загальній Публічній Ліцензії GNU.\n"
-#~ "\n"
-#~ "Ви маєте отримати копію Загальної Публічної Ліцензії GNU разом з цією\n"
-#~ "програмою. Якщо ж ні напишіть у Фундацію Вільного Програмного\n"
-#~ "забезпечення за адресою 59 Temple Place - Suite 330, Boston, MA\n"
-#~ "02111-1307, USA."
-
-#~ msgid "ALSA %s output plugin"
-#~ msgstr "Модуль виводу звуку ALSA %s"
-
-#~ msgid "Unknown soundcard"
-#~ msgstr "Невідома звукова карта"
-
-#~ msgid "Default PCM device (%s)"
-#~ msgstr "Основний PCM пристрій (%s)"
-
-#~ msgid "ALSA Driver configuration"
-#~ msgstr "Конфігурація драйвера ALSA"
-
-#~ msgid "Mixer:"
-#~ msgstr "Мікшер:"
-
-#~ msgid "Mixer card:"
-#~ msgstr "Пристрій мікшера:"
-
-#~ msgid "Device settings"
-#~ msgstr "Установки мікшера"
-
-#, fuzzy
-#~ msgid "Soundcard:"
-#~ msgstr "Звукова доріжка"
-
-#~ msgid "Buffer time (ms):"
-#~ msgstr "Час буфера (мс):"
-
-#~ msgid "Period time (ms):"
-#~ msgstr "Розмір періоду (мс):"
-
-#~ msgid "Advanced settings"
-#~ msgstr "Додаткові установки"
-
-#, fuzzy
-#~ msgid "aRts Driver configuration"
-#~ msgstr "Конфігурація драйвера OSS"
-
-#~ msgid "Disk Writer Plugin %s"
-#~ msgstr "Модуль запису на диск %s"
-
-#~ msgid ""
-#~ "You cannot use the Disk Writer plugin\n"
-#~ "when you're running in realtime mode."
-#~ msgstr ""
-#~ "Ви не можете використовувати модуль запису на диск\n"
-#~ "працюючи в режимі реального часу."
-
-#~ msgid "Select the directory where you want to store the output files:"
-#~ msgstr "Виберіть директорію для запису потоків MPEG:"
-
-#~ msgid "Disk Writer Configuration"
-#~ msgstr "Конфігурація модуля запису на диск"
-
-#~ msgid "About ESounD Plugin"
-#~ msgstr "Про модуль ESounD"
-
-#, fuzzy
-#~ msgid ""
-#~ "Audacious ESounD 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 ""
-#~ "Модуль XMMS ESounD\n"
-#~ "\n"
-#~ "Ця програма належить до вільного програмного забезпечення. Ви маєте\n"
-#~ "право розповсюджувати та/або видозмінювати її керуючись при цьому\n"
-#~ "умовами Загальної Публічної Ліцензії GNU у такому вигляді, як вона\n"
-#~ "була опублікована Фундацією Вільного Програмного забезпечення (Free\n"
-#~ "Software Foundation) або версією 2 Ліцензії, або (на Ваш вибір)\n"
-#~ "будь-якою пізнішою версією.\n"
-#~ "\n"
-#~ "Ця програма розповсюджується із сподіваннями, що вона може бути\n"
-#~ "корисною, але БЕЗ НІЯКОЇ ГАРАНТІЇ, навіть без уявної гарантії того, що\n"
-#~ "ця програма може бути КУПЛЕНОЮ або ПІДХОДИТЬ ПІД ЯКУСЬ ПЕВНУ\n"
-#~ "МЕТУ. Подальші подробиці дивіться у Загальній Публічній Ліцензії GNU.\n"
-#~ "\n"
-#~ "Ви маєте отримати копію Загальної Публічної Ліцензії GNU разом з цією\n"
-#~ "програмою. Якщо ж ні напишіть у Фундацію Вільного Програмного\n"
-#~ "забезпечення за адресою 59 Temple Place - Suite 330, Boston, MA\n"
-#~ "02111-1307, USA."
-
-#~ msgid "Host:"
-#~ msgstr "Хост:"
-
-#~ msgid "Use remote host"
-#~ msgstr "Користуватися віддаленим хостом"
-
-#~ msgid "Volume controls OSS mixer"
-#~ msgstr "Гучністю керує мікшер OSS"
-
-#~ msgid "Server"
-#~ msgstr "Сервер"
-
-#~ msgid "eSound Output Plugin"
-#~ msgstr "Вихідний модуль ESounD"
-
-#, fuzzy
-#~ msgid "About JACK Output Plugin 0.15"
-#~ msgstr "Вихідний модуль ESounD"
-
-#, fuzzy
-#~ msgid "About the Sun Driver"
-#~ msgstr "Про модуль виводу OSS"
-
-#, fuzzy
-#~ msgid "Audio control device:"
-#~ msgstr "Звуковий пристрій:"
-
-#, fuzzy
-#~ msgid "Volume controls device:"
-#~ msgstr "Керування гучністю:"
-
-#, fuzzy
-#~ msgid "Sun driver configuration"
-#~ msgstr "Конфігурація драйвера OSS"
-
-#~ msgid "/Toggle Decorations"
-#~ msgstr "/Перемикнути відображення обрамлення"
-
-#~ msgid "Blur scope"
-#~ msgstr "Розмитий осцилоскоп"
-
-#~ msgid "Blur Scope: Color selection"
-#~ msgstr "Розмитий осцилоскоп: вибір кольору"
-
-#~ msgid "Options:"
-#~ msgstr "Параметри:"
-
-#~ msgid "** DOUBLESIZE HAS BEEN REMOVED **"
-#~ msgstr "** ПОДВІЙНИЙ РОЗМІР УСУНУТО **"
-
-#, fuzzy
-#~ msgid "_Transparency"
-#~ msgstr "Відтворення"
-
-#, fuzzy
-#~ msgid "Scrobbler Configuration"
-#~ msgstr "Конфігурація програвача компакт-дисків"
-
-#~ msgid "Warning"
-#~ msgstr "Застереження"
-
-#~ msgid "Song Change Configuration"
-#~ msgstr "Конфігурація програвача компакт-дисків"
-
-#, fuzzy
-#~ msgid "Song Metadata"
-#~ msgstr "Соната"
-
-#, fuzzy
-#~ msgid "Port"
-#~ msgstr "Порт:"
-
-#, fuzzy
-#~ msgid "Client name"
-#~ msgstr "Назва файлу"
-
-#, fuzzy
-#~ msgid "Port name"
-#~ msgstr "Назва доріжки"
-
-#, fuzzy
-#~ msgid "ALSA output ports"
-#~ msgstr "Модуль виводу звуку ALSA %s"
-
-#~ msgid "Convert non-UTF8 ID3 tags to UTF8"
-#~ msgstr ""
-#~ "Перетворювати ID3-теги (назви пісень тощо) з локального кодування в Юнікод"
-
-#~ msgid "ID3 encoding:"
-#~ msgstr "Кодування ID3-тегів:"
-
-#, fuzzy
-#~ msgid "Convert non-UTF8 Vorbis tags to UTF8"
-#~ msgstr ""
-#~ "Перетворювати ID3-теги (назви пісень тощо) з локального кодування в Юнікод"
-
-#, fuzzy
-#~ msgid "Vorbis encoding:"
-#~ msgstr "Кодування ID3-тегів:"
-
-#, fuzzy
-#~ msgid "WMA Version:"
-#~ msgstr "Візуалізація"
-
-#, fuzzy
-#~ msgid "Channels:"
-#~ msgstr "Канали:"
-
-#, fuzzy
-#~ msgid "Filesize:"
-#~ msgstr "Ім'я файлу"
-
-#, fuzzy
-#~ msgid "WMA Info"
-#~ msgstr "Інформація про компакт"
-
-#, fuzzy
-#~ msgid "Comments:"
-#~ msgstr "_Шрифти"
-
-#, fuzzy
-#~ msgid "Track:"
-#~ msgstr "Відтворення"
-
-#, fuzzy
-#~ msgid "Tags"
-#~ msgstr "Танґо"
-
-#~ msgid "Edward Brocklesby"
-#~ msgstr "Edward Brocklesby"
-
-#~ msgid "Chong Kai Xiong"
-#~ msgstr "Chong Kai Xiong"
-
-#~ msgid "Milosz Derezynski"
-#~ msgstr "Milosz Derezynski"
-
-#~ msgid "David Lau"
-#~ msgstr "David Lau"
-
-#~ msgid "Ole Andre Vadla Ravnaas"
-#~ msgstr "Ole Andre Vadla Ravnaas"
-
-#~ msgid "Michiel Sikkes"
-#~ msgstr "Michiel Sikkes"
-
-#~ msgid "Bernard Blackham"
-#~ msgstr "Bernard Blackham"
-
-#~ msgid "Oliver Blin"
-#~ msgstr "Oliver Blin"
-
-#~ msgid "Tomas Bzatek"
-#~ msgstr "Tomas Bzatek"
-
-#~ msgid "Jon Dowland"
-#~ msgstr "Jon Dowland"
-
-#~ msgid "Artur Frysiak"
-#~ msgstr "Artur Frysiak"
-
-#~ msgid "Sebastian Kapfer"
-#~ msgstr "Sebastian Kapfer"
-
-#~ msgid "Lukas Koberstein"
-#~ msgstr "Lukas Koberstein"
-
-#~ msgid "Dan Korostelev"
-#~ msgstr "Dan Korostelev <dan@ats.energo.ru>"
-
-#~ msgid "Michael Marineau"
-#~ msgstr "Michiel Sikkes"
-
-#~ msgid "Tim-Philipp Muller"
-#~ msgstr "Tim-Philipp Muller"
-
-#~ msgid "Olivier Samyn"
-#~ msgstr "Olivier Samyn"
-
-#~ msgid "Martijn Vernooij"
-#~ msgstr "Martijn Vernooij"
-
-#~ msgid "Laurens Buhler"
-#~ msgstr "Laurens Buhler"
-
-#~ msgid "David Le Brun"
-#~ msgstr "David Le Brun"
-
-#~ msgid "Matthias Debus"
-#~ msgstr "Matthias Debus"
-
-#~ msgid "Alessio D'Ascanio"
-#~ msgstr "Alessio D'Ascanio"
-
-#~ msgid "DongCheon Park"
-#~ msgstr "DongCheon Park"
-
-#~ msgid "Rimas Kudelis"
-#~ msgstr "Rimas Kudelis"
-
-#~ msgid "Jacek Wolszczak"
-#~ msgstr "Jacek Wolszczak"
-
-#~ msgid "Pavlo Bohmat"
-#~ msgstr "Pavlo Bohmat"
-
-#~ msgid "Martin Persenius"
-#~ msgstr "Martin Persenius"
-
-#~ msgid "Plugins"
-#~ msgstr "Модулі"
-
-#~ msgid "_Media plugin list:"
-#~ msgstr "_Список модулів підтримки музичних форматів:"
-
-#, fuzzy
-#~ msgid ""
-#~ "The change is now effective in Audacious' configuration database, but "
-#~ "won't take effect for playback until the next song!\n"
-#~ "\n"
-#~ "Optionally, you can stop and restart playback for the change to take "
-#~ "effect."
-#~ msgstr ""
-#~ "Зміни задіяні в конфигурації бази даних BMP, але не матимуть ефекту під "
-#~ "час програвання до наступної пісні!\n"
-#~ "\n"
-#~ "Щоб зміни подіяли, ви можете перезапустити програвання."
-
-#~ msgid "Appearance"
-#~ msgstr "Зовнішній вигляд"
-
-#~ msgid "Mouse"
-#~ msgstr "Миша"
-
-#~ msgid "Playlist"
-#~ msgstr "Список програвання"
-
-#~ msgid "Equalizer"
-#~ msgstr "Еквалайзер"
-
-#~ msgid "Use proxy"
-#~ msgstr "Користуватися проксі"
-
-#~ msgid "Frames:"
-#~ msgstr "Кадрів:"
-
-#~ msgid ""
-#~ "Variable,\n"
-#~ "avg. bitrate: %d KBit/s"
-#~ msgstr ""
-#~ "Змінна,\n"
-#~ "Cередня бітова частота:: %d кб/с"
-
-#~ msgid "Francisco Javier F. Serrador"
-#~ msgstr "Francisco Javier F. Serrador"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "Unable to write to file: %s"
-#~ msgstr ""
-#~ "%s\n"
-#~ "Не можу записати в файл: %s"
-
-#~ msgid "Couldn't write tag!"
-#~ msgstr "Не можу записати тег!"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "Unable to open file: %s"
-#~ msgstr ""
-#~ "%s\n"
-#~ "Не можу відкрити файл: %s"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "Unable to truncate file: %s"
-#~ msgstr ""
-#~ "%s\n"
-#~ "Неможливо обрізати файл: %s"
-
-#~ msgid "Couldn't remove tag!"
-#~ msgstr "Не можу стерти тег!"
-
-#~ msgid "No tag to remove!"
-#~ msgstr "Немає тегу для стирання!"
-
-#~ msgid "Copy album tags"
-#~ msgstr "Копіювати теги альбому"
-
-#~ msgid "Paste album tags"
-#~ msgstr "Вставити теги альбому"
-
-#, fuzzy
-#~ msgid "About TiMidity Plugin"
-#~ msgstr "Про модуль підтримки формату MPEG"
-
-#, fuzzy
-#~ msgid "TiMidity Plugin"
-#~ msgstr "Модуль підтримки MPEG"
-
-#, fuzzy
-#~ msgid "Downsample:"
-#~ msgstr "Зменшити частоту тактування:"
-
-#~ msgid "Look for hidden patterns in modules "
-#~ msgstr "Шукати приховані зразки в модулях"
-
-#~ msgid "Content"
-#~ msgstr "Визначати тип по вмісту"
-
-#~ msgid "Extension"
-#~ msgstr "Визначати тип по розширенню"
-
-#~ msgid "Extension and content"
-#~ msgstr "Визначати тип по розширенню і вмісту"
-
-#~ msgid "%s - BMP"
-#~ msgstr "%s - BMP"
-
-#, fuzzy
-#~ msgid "About Libvisual XMMS Plugin"
-#~ msgstr "Про модуль ESounD"
-
-#, fuzzy
-#~ msgid "Visualization Plugins"
-#~ msgstr "Список модулів _візуалізації:"
-
-#~ msgid "All plugins"
-#~ msgstr "Модулі"
-
-#~ msgid "Only non GL plugins"
-#~ msgstr "Тільки НЕ GL модулі"
-
-#~ msgid "Only GL plugins"
-#~ msgstr "Тільки GL модулі"
-
-#~ msgid "Accept"
-#~ msgstr "Прийняти"
-
-#, fuzzy
-#~ msgid " (enabled)"
-#~ msgstr "Вмикнено"
-
-#, fuzzy
-#~ msgid "Version: "
-#~ msgstr "Версія:"
-
-#~ msgid "Author: "
-#~ msgstr "Автор: "
-
-#~ msgid " error"
-#~ msgstr " помилка"
-
-#~ msgid "There is no info for this plugin"
-#~ msgstr "Інформація для цього модулю не наявна"
-
-#~ msgid "The list of input plugins is empty."
-#~ msgstr "Сисок модулів вводу порожній"
-
-#~ msgid "Cannot initialize SDL!\n"
-#~ msgstr "Не можу ініціалізувати SDL!\n"
-
-#~ msgid " will not be loaded."
-#~ msgstr " не буде завантажено"
-
-#~ msgid "Last plugin: (none)"
-#~ msgstr "Останній модуль: (відсутній)"
-
-#~ msgid "Last plugin: %s"
-#~ msgstr "Останній модуль: %s"
-
-#~ msgid "Special thanks to:"
-#~ msgstr "Особливі подяки:"
-
-#~ msgid "bmp: %s"
-#~ msgstr "BMP: %s"
-
-#~ msgid "/Play Directory"
-#~ msgstr "/Програвати каталог"
-
-#~ msgid "Add Folders"
-#~ msgstr "Додати каталог"
-
-#~ msgid "DISABLE ALWAYS ON TOP (N/A)"
-#~ msgstr "ЗАБОРОНИТИ СПЛИВАННЯ НАГОРУ (N/A)"
-
-#~ msgid "ENABLE ALWAYS ON TOP (N/A)"
-#~ msgstr "ДОЗВОЛИТИ СПЛИВАННЯ НАГОРУ (N/A)"
 
-#, fuzzy
-#~ msgid "/Add Folders..."
-#~ msgstr "/Додати файли..."

audacious-3.1.1.tar.bz2/po/vi.po -> audacious-3.2.4.tar.bz2/po/vi.po Changed

@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the Audacious package.
 #
 # Translators:
-# Lê Trường An <truongan@linuxmail.org>, 2011.
+# Lê Trường An <truongan@linuxmail.org>, 2011, 2012.
 # Lê Trường An <truongan@linuxmail.org>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious\n"
-"Report-Msgid-Bugs-To: http://jira.atheme.org/browse/AUD\n"
-"POT-Creation-Date: 2011-10-19 21:32-0400\n"
-"PO-Revision-Date: 2011-11-03 08:44+0000\n"
-"Last-Translator: anix <truongan@linuxmail.org>\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2012-01-11 08:54-0500\n"
+"PO-Revision-Date: 2012-02-28 08:29+0000\n"
+"Last-Translator: Giận dỗi An <truongan@linuxmail.org>\n"
 "Language-Team: Vietnamese\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,1056 +19,1066 @@
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: src/audacious/adder.c:71
+#: src/audacious/adder.c:77
 msgid "Searching ..."
 msgstr "Đang tìm ..."
 
-#: src/audacious/adder.c:97
+#: src/audacious/adder.c:113
 #, c-format
 msgid "%d file found"
 msgid_plural "%d files found"
 msgstr[0] "%d tập tin được tìm thấy"
 
-#: src/audacious/chardet.c:38
+#: src/audacious/chardet.c:39
 msgid " (invalid UTF-8)"
 msgstr " (UTF-8 không hợp lệ)"
 
-#: src/audacious/credits.c:35
+#: src/audacious/credits.c:37
 msgid "Core developers:"
 msgstr "Phát triển chính:"
 
-#: src/audacious/credits.c:49
+#: src/audacious/credits.c:51
 msgid "Graphics:"
 msgstr "Đồ họa:"
 
-#: src/audacious/credits.c:54
+#: src/audacious/credits.c:56
 msgid "Default skin:"
 msgstr "Giao diện mặc định:"
 
-#: src/audacious/credits.c:60
+#: src/audacious/credits.c:62
 msgid "Plugin development:"
 msgstr "Phát triển trình cắm:"
 
-#: src/audacious/credits.c:83
+#: src/audacious/credits.c:85
 msgid "Patch authors:"
 msgstr "Tác giả bản vá:"
 
-#: src/audacious/credits.c:126
+#: src/audacious/credits.c:131
 msgid "1.x developers:"
 msgstr "Phát triển phiên bản 1.x:"
 
-#: src/audacious/credits.c:148
+#: src/audacious/credits.c:153
 msgid "BMP Developers:"
 msgstr "Phát triển BPM:"
 
-#: src/audacious/credits.c:180
+#: src/audacious/credits.c:185
 msgid "Belarusian:"
 msgstr "Tiếng Belarus:"
 
-#: src/audacious/credits.c:183
+#: src/audacious/credits.c:188
 msgid "Basque:"
 msgstr "Tiếng Basque:"
 
-#: src/audacious/credits.c:186
+#: src/audacious/credits.c:191
 msgid "Brazilian Portuguese:"
 msgstr "Tiếng Bra-xin (Bồ Đào Nha)"
 
-#: src/audacious/credits.c:191
+#: src/audacious/credits.c:196
 msgid "Breton:"
 msgstr "Tiếng Breton:"
 
-#: src/audacious/credits.c:194
+#: src/audacious/credits.c:199
 msgid "Bulgarian:"
 msgstr "Tiếng Bun-ga-ri:"
 
-#: src/audacious/credits.c:197
+#: src/audacious/credits.c:202
 msgid "Catalan:"
 msgstr "Tiếng Catalan:"
 
-#: src/audacious/credits.c:200
+#: src/audacious/credits.c:206
 msgid "Chinese:"
 msgstr "Tiếng Trung Quốc:"
 
-#: src/audacious/credits.c:203
+#: src/audacious/credits.c:209
 msgid "Croatian:"
 msgstr "Tiếng Croatia:"
 
-#: src/audacious/credits.c:206
+#: src/audacious/credits.c:212
 msgid "Czech:"
 msgstr "Tiếng Séc:"
 
-#: src/audacious/credits.c:209
+#: src/audacious/credits.c:215
 msgid "Dutch:"
 msgstr "Tiếng Hà Lan:"
 
-#: src/audacious/credits.c:213
+#: src/audacious/credits.c:219
 msgid "Estonian:"
 msgstr "Tiếng És-tô-ni-a:"
 
-#: src/audacious/credits.c:216
+#: src/audacious/credits.c:222
 msgid "Finnish:"
 msgstr "Tiếng Phần Lan:"
 
-#: src/audacious/credits.c:221
+#: src/audacious/credits.c:227
 msgid "French:"
 msgstr "Tiếng Pháp:"
 
-#: src/audacious/credits.c:227
+#: src/audacious/credits.c:233
 msgid "German:"
 msgstr "Tiếng Đức:"
 
-#: src/audacious/credits.c:234
+#: src/audacious/credits.c:240
 msgid "Georgian:"
 msgstr "Tiếng Georgian:"
 
-#: src/audacious/credits.c:237
+#: src/audacious/credits.c:243
 msgid "Greek:"
 msgstr "Tiếng Hy Lạp:"
 
-#: src/audacious/credits.c:242
+#: src/audacious/credits.c:248
 msgid "Hindi:"
 msgstr "Tiếng Hin-đi:"
 
-#: src/audacious/credits.c:245
+#: src/audacious/credits.c:251
 msgid "Hungarian:"
 msgstr "Tiếng Hun-ga-ri:"
 
-#: src/audacious/credits.c:249
+#: src/audacious/credits.c:255
 msgid "Italian:"
 msgstr "Tiếng Ý:"
 
-#: src/audacious/credits.c:253
+#: src/audacious/credits.c:260
 msgid "Japanese:"
 msgstr "Tiếng Nhật:"
 
-#: src/audacious/credits.c:256
+#: src/audacious/credits.c:263
 msgid "Korean:"
 msgstr "Tiếng Hàn:"
 
-#: src/audacious/credits.c:259
+#: src/audacious/credits.c:266
 msgid "Latvian:"
 msgstr "Tiếng Lat-vi-a:"
 
-#: src/audacious/credits.c:262
+#: src/audacious/credits.c:269
 msgid "Lithuanian:"
 msgstr "Tiếng Lithuania:"
 
-#: src/audacious/credits.c:267
+#: src/audacious/credits.c:274
 msgid "Macedonian:"
 msgstr "Tiếng Macedonia:"
 
-#: src/audacious/credits.c:270
+#: src/audacious/credits.c:277
+msgid "Mexican Spanish:"
+msgstr "Tiếng Tây Ban Nha (Mêxicô):"
+
+#: src/audacious/credits.c:280
 msgid "Polish:"
 msgstr "Tiếng Ba Lan:"
 
-#: src/audacious/credits.c:276
+#: src/audacious/credits.c:287
 msgid "Portuguese:"
 msgstr "Tiếng Bồ Đào Nha:"
 
-#: src/audacious/credits.c:279
+#: src/audacious/credits.c:290
 msgid "Romanian:"
 msgstr "Tiếng Rumani:"
 
-#: src/audacious/credits.c:283
+#: src/audacious/credits.c:294
 msgid "Russian:"
 msgstr "Tiếng Nga:"
 
-#: src/audacious/credits.c:287
+#: src/audacious/credits.c:298
 msgid "Serbian (Latin):"
 msgstr "Tiếng Séc-bi-a (Latinh):"
 
-#: src/audacious/credits.c:290
+#: src/audacious/credits.c:301
 msgid "Serbian (Cyrillic):"
 msgstr "Tiếng Séc-bi-a (Kirin):"
 
-#: src/audacious/credits.c:293
+#: src/audacious/credits.c:305
 msgid "Simplified Chinese:"
 msgstr "Tiếng Trung giản thể:"
 
-#: src/audacious/credits.c:296
+#: src/audacious/credits.c:308
 msgid "Slovak:"
 msgstr "Tiếng Slovak:"
 
-#: src/audacious/credits.c:299
+#: src/audacious/credits.c:312
 msgid "Spanish:"
 msgstr "Tiếng Tây Ban Nha:"
 
-#: src/audacious/credits.c:306
+#: src/audacious/credits.c:320
 msgid "Swedish:"
 msgstr "Tiếng Thụy Điển:"
 
-#: src/audacious/credits.c:309
+#: src/audacious/credits.c:323
 msgid "Traditional Chinese:"
 msgstr "Tiếng Trung (phồn thể):"
 
-#: src/audacious/credits.c:315
+#: src/audacious/credits.c:329
 msgid "Turkish:"
 msgstr "Tiếng Thổ Nhĩ Kỳ:"
 
-#: src/audacious/credits.c:319
+#: src/audacious/credits.c:333
 msgid "Ukrainian:"
 msgstr "Tiếng U-crai-na:"
 
-#: src/audacious/credits.c:323
+#: src/audacious/credits.c:338
 msgid "Vietnamese:"
 msgstr "Tiếng Việt:"
 
-#: src/audacious/credits.c:326
+#: src/audacious/credits.c:341
 msgid "Welsh:"
 msgstr "Tiếng xứ Wales:"
 
-#: src/audacious/drct.c:234
-msgid "Temporary Playlist"
-msgstr "Thư mục tạm thời"
-
-#: src/audacious/equalizer_preset.c:186
+#: src/audacious/equalizer_preset.c:180
 #, c-format
 msgid "Error importing Winamp EQF file '%s'"
 msgstr "Lỗi khi nhập tập tin EQF của Winamp '%s'"
 
-#: src/audacious/main.c:239
+#: src/audacious/main.c:243
 msgid "Skip backwards in playlist"
 msgstr "Không xả ngược trong danh sách"
 
-#: src/audacious/main.c:240
+#: src/audacious/main.c:244
 msgid "Start playing current playlist"
 msgstr "Bắt đầu phát danh sách hiện tại"
 
-#: src/audacious/main.c:241
+#: src/audacious/main.c:245
 msgid "Pause current song"
 msgstr "Tạm dừng bài đang phát"
 
-#: src/audacious/main.c:242
+#: src/audacious/main.c:246
 msgid "Stop current song"
 msgstr "Dừng phát"
 
-#: src/audacious/main.c:243
+#: src/audacious/main.c:247
 msgid "Pause if playing, play otherwise"
 msgstr "Tạm dừng nếu đang phát, phát trở lại nếu đang tạm dừng"
 
-#: src/audacious/main.c:244
+#: src/audacious/main.c:248
 msgid "Skip forward in playlist"
 msgstr "Không tự chuyển bài trong danh sách"
 
-#: src/audacious/main.c:245
+#: src/audacious/main.c:249
 msgid "Display Jump to File dialog"
 msgstr "Hiện hộp thoại Chuyển đến tập tin"
 
-#: src/audacious/main.c:246
+#: src/audacious/main.c:250
 msgid "Add files to the playlist"
 msgstr "Thêm tập tin vào danh sách"
 
-#: src/audacious/main.c:247
+#: src/audacious/main.c:251
 msgid "Add new files to a temporary playlist"
 msgstr "Thêm tập tin mới vào danh sách tạm thời"
 
-#: src/audacious/main.c:248
+#: src/audacious/main.c:252
 msgid "Display the main window"
 msgstr "Hiện cửa sổ chính"
 
-#: src/audacious/main.c:249
+#: src/audacious/main.c:253
 msgid "Show version"
 msgstr "Hiện phiên bản"
 
-#: src/audacious/main.c:250
+#: src/audacious/main.c:254
 msgid "Print debugging messages"
 msgstr "Hiện thông báo gỡ lỗi"
 
-#: src/audacious/main.c:251
+#: src/audacious/main.c:255
 msgid "Headless mode (beta)"
 msgstr ""
 
-#: src/audacious/main.c:252
+#: src/audacious/main.c:256
 msgid "FILE..."
 msgstr "T.TIN..."
 
-#: src/audacious/main.c:264
+#: src/audacious/main.c:268
 msgid "- play multimedia files"
 msgstr "- phát tập tin đa phương tiện"
 
-#: src/audacious/main.c:274
+#: src/audacious/main.c:278
 #, c-format
 msgid ""
 "%s: %s\n"
 "Try `%s --help' for more information.\n"
-msgstr ""
-"%s: %s\n"
-"Chạy `%s --help' để biết thêm thông tin.\n"
+msgstr "%s: %s\nChạy `%s --help' để biết thêm thông tin.\n"
 
-#: src/audacious/main.c:547
+#: src/audacious/main.c:573
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/audacious/playback.c:303
+#: src/audacious/playback.c:307
 #, c-format
 msgid "No decoder found for %s."
 msgstr "Không tìm thấy bộ giải mã cho %s."
 
-#: src/audacious/playlist-new.c:315
-msgid "Untitled Playlist"
-msgstr "D.sách chưa có tên"
+#: src/audacious/playlist-files.c:53
+#, c-format
+msgid "Cannot %s %s: unsupported file extension."
+msgstr "Không thể %s %s: tập tin không được hỗ trợ."
+
+#: src/audacious/playlist-files.c:54
+msgid "save"
+msgstr "lưu"
+
+#: src/audacious/playlist-files.c:54
+msgid "load"
+msgstr "nạp"
 
-#: src/audacious/playlist-new.c:1496
+#: src/audacious/playlist-new.c:131
+msgid "New Playlist"
+msgstr "D.sách mới"
+
+#: src/audacious/playlist-new.c:132
+msgid "Now Playing"
+msgstr "Đang phát"
+
+#: src/audacious/playlist-new.c:1630
 msgid ""
 "The playlist cannot be sorted because metadata scanning is still in progress"
 " (or has been disabled)."
-msgstr ""
-"Danh sách không thể được sắp xếp vì quá trình quét thông tin đang diễn ra "
-"(hoặc bị tắt)."
+msgstr "Danh sách không thể được sắp xếp vì quá trình quét thông tin đang diễn ra (hoặc bị tắt)."
 
-#: src/audacious/ui_preferences.c:88
+#: src/audacious/ui_preferences.c:85
 msgid "Audio"
 msgstr "Âm thanh"
 
-#: src/audacious/ui_preferences.c:89
+#: src/audacious/ui_preferences.c:86
 msgid "Network"
 msgstr "Mạng"
 
-#: src/audacious/ui_preferences.c:90 src/audacious/ui_preferences.c:1634
+#: src/audacious/ui_preferences.c:87 src/audacious/ui_preferences.c:1603
 msgid "Playlist"
 msgstr "Danh sách"
 
-#: src/audacious/ui_preferences.c:91
+#: src/audacious/ui_preferences.c:88
 msgid "Plugins"
 msgstr "Trình cắm"
 
-#: src/audacious/ui_preferences.c:97 src/libaudgui/infopopup.c:203
+#: src/audacious/ui_preferences.c:94 src/libaudgui/infopopup.c:199
 msgid "Artist"
 msgstr "Nghệ sĩ"
 
-#: src/audacious/ui_preferences.c:98 src/libaudgui/infopopup.c:205
+#: src/audacious/ui_preferences.c:95 src/libaudgui/infopopup.c:201
 msgid "Album"
 msgstr "Album"
 
-#: src/audacious/ui_preferences.c:99 src/libaudgui/infopopup.c:201
-#: src/libaudgui/ui_playlist_manager.c:276
+#: src/audacious/ui_preferences.c:96 src/libaudgui/infopopup.c:197
+#: src/libaudgui/ui_playlist_manager.c:279
 msgid "Title"
 msgstr "Tựa đề"
 
-#: src/audacious/ui_preferences.c:100
+#: src/audacious/ui_preferences.c:97
 msgid "Tracknumber"
 msgstr "Bài số"
 
-#: src/audacious/ui_preferences.c:101 src/libaudgui/infopopup.c:207
+#: src/audacious/ui_preferences.c:98 src/libaudgui/infopopup.c:203
 msgid "Genre"
 msgstr "Thể loại"
 
-#: src/audacious/ui_preferences.c:102
+#: src/audacious/ui_preferences.c:99
 msgid "Filename"
 msgstr "Tên tập tin"
 
-#: src/audacious/ui_preferences.c:103
+#: src/audacious/ui_preferences.c:100
 msgid "Filepath"
 msgstr "Đường dẫn tập tin"
 
-#: src/audacious/ui_preferences.c:104
+#: src/audacious/ui_preferences.c:101
 msgid "Date"
 msgstr "Ngày"
 
-#: src/audacious/ui_preferences.c:105 src/libaudgui/infopopup.c:209
+#: src/audacious/ui_preferences.c:102 src/libaudgui/infopopup.c:205
 msgid "Year"
 msgstr "Năm"
 
-#: src/audacious/ui_preferences.c:106
+#: src/audacious/ui_preferences.c:103
 msgid "Comment"
 msgstr "Bình luận"
 
-#: src/audacious/ui_preferences.c:107
+#: src/audacious/ui_preferences.c:104
 msgid "Codec"
 msgstr "Bộ giải mã"
 
-#: src/audacious/ui_preferences.c:108
+#: src/audacious/ui_preferences.c:105
 msgid "Quality"
 msgstr "Chất lượng"
 
-#: src/audacious/ui_preferences.c:114
+#: src/audacious/ui_preferences.c:111
 msgid "None"
 msgstr "Không"
 
-#: src/audacious/ui_preferences.c:115
+#: src/audacious/ui_preferences.c:112
 msgid "Arabic"
 msgstr "Tiếng Ả Rập"
 
-#: src/audacious/ui_preferences.c:116
+#: src/audacious/ui_preferences.c:113
 msgid "Baltic"
 msgstr "Tiếng Ban-tic"
 
-#: src/audacious/ui_preferences.c:117
+#: src/audacious/ui_preferences.c:114
 msgid "Chinese"
 msgstr "Tiếng Trung"
 
-#: src/audacious/ui_preferences.c:118
+#: src/audacious/ui_preferences.c:115
 msgid "Greek"
 msgstr "Tiếng Hy Lạp"
 
-#: src/audacious/ui_preferences.c:119
+#: src/audacious/ui_preferences.c:116
 msgid "Hebrew"
 msgstr "Tiếng Do Thái"
 
-#: src/audacious/ui_preferences.c:120
+#: src/audacious/ui_preferences.c:117
 msgid "Japanese"
 msgstr "Tiếng Nhật"
 
-#: src/audacious/ui_preferences.c:121
+#: src/audacious/ui_preferences.c:118
 msgid "Korean"
 msgstr "Tiếng Hàn"
 
-#: src/audacious/ui_preferences.c:122
+#: src/audacious/ui_preferences.c:119
 msgid "Polish"
 msgstr "Tiếng Ba Lan"
 
-#: src/audacious/ui_preferences.c:123
+#: src/audacious/ui_preferences.c:120
 msgid "Russian"
 msgstr "Tiếng Nga"
 
-#: src/audacious/ui_preferences.c:124
+#: src/audacious/ui_preferences.c:121
 msgid "Taiwanese"
 msgstr "Tiếng Đài Loan"
 
-#: src/audacious/ui_preferences.c:125
+#: src/audacious/ui_preferences.c:122
 msgid "Turkish"
 msgstr "Tiếng Thổ Nhĩ Kỳ"
 
-#: src/audacious/ui_preferences.c:147
+#: src/audacious/ui_preferences.c:144
 msgid "Album mode"
 msgstr "Chế độ album"
 
-#: src/audacious/ui_preferences.c:150
+#: src/audacious/ui_preferences.c:147
 msgid "Output Settings"
 msgstr "Thiết lập xuất âm thanh"
 
-#: src/audacious/ui_preferences.c:152
+#: src/audacious/ui_preferences.c:149
 msgid "Bit depth:"
 msgstr "Chiều sâu âm thanh:"
 
-#: src/audacious/ui_preferences.c:155
+#: src/audacious/ui_preferences.c:152
 msgid "Buffer size:"
 msgstr "Dung lượng bộ đệm:"
 
-#: src/audacious/ui_preferences.c:157
+#: src/audacious/ui_preferences.c:154
 msgid "ms"
 msgstr "ms"
 
-#: src/audacious/ui_preferences.c:158
+#: src/audacious/ui_preferences.c:155
 msgid "Use software volume control (not recommended)"
 msgstr "Sử dụng kiểm soát âm lượng của phần mềm (không nên)"
 
-#: src/audacious/ui_preferences.c:160
+#: src/audacious/ui_preferences.c:157
 msgid "Replay Gain"
 msgstr "Tăng âm"
 
-#: src/audacious/ui_preferences.c:161
+#: src/audacious/ui_preferences.c:158
 msgid "Enable Replay Gain"
 msgstr "Bật chế độ tăng thêm âm lượng"
 
-#: src/audacious/ui_preferences.c:164
+#: src/audacious/ui_preferences.c:161
 msgid "Prevent clipping (recommended)"
 msgstr "Tránh tổn thất (khuyên dùng)"
 
-#: src/audacious/ui_preferences.c:166
+#: src/audacious/ui_preferences.c:163
 msgid "Adjust Levels"
 msgstr "Các mức điều chỉnh"
 
-#: src/audacious/ui_preferences.c:167
+#: src/audacious/ui_preferences.c:164
 msgid "Amplify all files:"
 msgstr "Khuếch đại mọi tập tin:"
 
-#: src/audacious/ui_preferences.c:169 src/audacious/ui_preferences.c:172
+#: src/audacious/ui_preferences.c:166 src/audacious/ui_preferences.c:169
 msgid "dB"
 msgstr "dB"
 
-#: src/audacious/ui_preferences.c:170
+#: src/audacious/ui_preferences.c:167
 msgid "Amplify untagged files:"
 msgstr "Khuếch đại tập tin chưa gán thẻ:"
 
-#: src/audacious/ui_preferences.c:175
+#: src/audacious/ui_preferences.c:172
 msgid "Proxy hostname:"
 msgstr "Tên máy chủ proxy:"
 
-#: src/audacious/ui_preferences.c:176
+#: src/audacious/ui_preferences.c:173
 msgid "Proxy port:"
 msgstr "Cổng proxy:"
 
-#: src/audacious/ui_preferences.c:179
+#: src/audacious/ui_preferences.c:176
 msgid "Proxy username:"
 msgstr "Tên người dùng proxy:"
 
-#: src/audacious/ui_preferences.c:180
+#: src/audacious/ui_preferences.c:177
 msgid "Proxy password:"
 msgstr "Mật khẩu proxy:"
 
-#: src/audacious/ui_preferences.c:184
+#: src/audacious/ui_preferences.c:181
 msgid "Proxy Configuration"
 msgstr "Cấu hình Proxy"
 
-#: src/audacious/ui_preferences.c:185
+#: src/audacious/ui_preferences.c:182
 msgid "Enable proxy usage"
 msgstr "Cho phép dùng proxy"
 
-#: src/audacious/ui_preferences.c:188
+#: src/audacious/ui_preferences.c:185
 msgid "Use authentication with proxy"
 msgstr "Xác thực với proxy"
 
-#: src/audacious/ui_preferences.c:196
+#: src/audacious/ui_preferences.c:193
 msgid "Auto character encoding detector for:"
 msgstr "Tự động nhận diện bảng mã kí tự cho:"
 
-#: src/audacious/ui_preferences.c:201
+#: src/audacious/ui_preferences.c:198
 msgid "Fallback character encodings:"
 msgstr "Bảng mã kí tự dự phòng:"
 
-#: src/audacious/ui_preferences.c:205
+#: src/audacious/ui_preferences.c:202
 msgid "Behavior"
 msgstr "Hành động"
 
-#: src/audacious/ui_preferences.c:206
+#: src/audacious/ui_preferences.c:203
 msgid "Continue playback on startup"
 msgstr "Tiếp tục phát khi khởi động"
 
-#: src/audacious/ui_preferences.c:208
+#: src/audacious/ui_preferences.c:205
 msgid "Advance when the current song is deleted"
 msgstr "Đến bài kế tiếp khi xóa bài hiện tại"
 
-#: src/audacious/ui_preferences.c:210
+#: src/audacious/ui_preferences.c:207
 msgid "Clear the playlist when opening files"
 msgstr "Dọn sạch danh sách khi mở các tập tin"
 
-#: src/audacious/ui_preferences.c:212
+#: src/audacious/ui_preferences.c:209
 msgid "Open files in a temporary playlist"
 msgstr "Mở các tập tin trong một danh sách tạm"
 
-#: src/audacious/ui_preferences.c:214
+#: src/audacious/ui_preferences.c:211
 msgid "Metadata"
 msgstr "Thông tin"
 
-#: src/audacious/ui_preferences.c:215
+#: src/audacious/ui_preferences.c:212
 msgid "Do not load metadata for songs until played"
 msgstr "Không nạp thông tin bài hát cho đến khi nó được phát"
 
-#: src/audacious/ui_preferences.c:233
+#: src/audacious/ui_preferences.c:230
 msgid "TITLE"
 msgstr "TỰA ĐỀ"
 
-#: src/audacious/ui_preferences.c:234
+#: src/audacious/ui_preferences.c:231
 msgid "ARTIST - TITLE"
 msgstr "NGHỆ SĨ - TỰA ĐỀ"
 
-#: src/audacious/ui_preferences.c:235
+#: src/audacious/ui_preferences.c:232
 msgid "ARTIST - ALBUM - TITLE"
 msgstr "NGHỆ SĨ - ALBUM - TỰA"
 
-#: src/audacious/ui_preferences.c:236
+#: src/audacious/ui_preferences.c:233
 msgid "ARTIST - ALBUM - TRACK. TITLE"
 msgstr "NGHỆ SĨ - ALBUM - BÀI. TỰA"
 
-#: src/audacious/ui_preferences.c:237
+#: src/audacious/ui_preferences.c:234
 msgid "ARTIST [ ALBUM ] - TRACK. TITLE"
 msgstr "NGHỆ SĨ [ALBUM ] - BÀI. TỰA"
 
-#: src/audacious/ui_preferences.c:238
+#: src/audacious/ui_preferences.c:235
 msgid "ALBUM - TITLE"
 msgstr "ALBUM - TỰA ĐỀ"
 
-#: src/audacious/ui_preferences.c:577
+#: src/audacious/ui_preferences.c:556
 msgid "Category"
 msgstr "Danh mục"
 
-#: src/audacious/ui_preferences.c:801
+#: src/audacious/ui_preferences.c:780
 msgid "Popup Information Settings"
 msgstr "Thiết lập thông tin cửa sổ bật lên"
 
-#: src/audacious/ui_preferences.c:810
+#: src/audacious/ui_preferences.c:789
 msgid "Cover image retrieve"
 msgstr "Lấy ảnh bìa"
 
-#: src/audacious/ui_preferences.c:815
+#: src/audacious/ui_preferences.c:794
 msgid ""
 "While searching for the album's cover, Audacious looks for certain words in "
 "the filename. You can specify those words in the lists below, separated "
 "using commas."
-msgstr ""
-"Khi tìm ảnh bìa của album, Audacious xem xét một số từ nhất định trong tên "
-"tập tin. Bạn có thể chỉ định những từ này trong danh sách bên dưới, dừng dấu"
-" phẩy để ngăn cách các từ."
+msgstr "Khi tìm ảnh bìa của album, Audacious xem xét một số từ nhất định trong tên tập tin. Bạn có thể chỉ định những từ này trong danh sách bên dưới, dừng dấu phẩy để ngăn cách các từ."
 
-#: src/audacious/ui_preferences.c:832
+#: src/audacious/ui_preferences.c:811
 msgid "Exclude:"
 msgstr "Loại trừ:"
 
-#: src/audacious/ui_preferences.c:839
+#: src/audacious/ui_preferences.c:818
 msgid "Include:"
 msgstr "Bao gồm:"
 
-#: src/audacious/ui_preferences.c:856
+#: src/audacious/ui_preferences.c:835
 msgid "Recursively search for cover"
 msgstr "Tìm ảnh bìa trong thư mục con"
 
-#: src/audacious/ui_preferences.c:866
+#: src/audacious/ui_preferences.c:845
 msgid "Search depth: "
 msgstr "Độ sâu:"
 
-#: src/audacious/ui_preferences.c:880
+#: src/audacious/ui_preferences.c:859
 msgid "Use per-file cover"
 msgstr "Mỗi tập tin một ảnh bìa riêng"
 
-#: src/audacious/ui_preferences.c:883
+#: src/audacious/ui_preferences.c:862
 msgid "Miscellaneous"
 msgstr "Khác"
 
-#: src/audacious/ui_preferences.c:892
+#: src/audacious/ui_preferences.c:871
 msgid "Show Progress bar for the current track"
 msgstr "Hiện thanh tiến trình cho bài hiện tại"
 
-#: src/audacious/ui_preferences.c:902
+#: src/audacious/ui_preferences.c:881
 msgid "Delay until filepopup comes up: "
 msgstr "Chờ cho đến khi cửa sổ bật lên hiện ra:"
 
-#: src/audacious/ui_preferences.c:1340
+#: src/audacious/ui_preferences.c:1309
 msgid "Custom"
 msgstr "Tùy chọn"
 
-#: src/audacious/ui_preferences.c:1383
+#: src/audacious/ui_preferences.c:1352
 msgid "Song Display"
 msgstr "Hiển thị bài hát"
 
-#: src/audacious/ui_preferences.c:1392
+#: src/audacious/ui_preferences.c:1361
 msgid "Show song numbers"
 msgstr "Hiện số thứ tự trong danh sách của bài hát"
 
-#: src/audacious/ui_preferences.c:1403
+#: src/audacious/ui_preferences.c:1372
 msgid "Show leading zeroes (02:00 instead of 2:00)"
 msgstr "Hiện số không ở đầu (02:00 thay vì of 2:00)"
 
-#: src/audacious/ui_preferences.c:1425
+#: src/audacious/ui_preferences.c:1394
 msgid "Show information about titlestring format"
 msgstr "Hiện thông tin về định dạng tựa đề"
 
-#: src/audacious/ui_preferences.c:1441
+#: src/audacious/ui_preferences.c:1410
 msgid "Custom string:"
 msgstr "Chuỗi tùy chọn:"
 
-#: src/audacious/ui_preferences.c:1448
+#: src/audacious/ui_preferences.c:1417
 msgid "Title format:"
 msgstr "Định dạng tựa đề:"
 
-#: src/audacious/ui_preferences.c:1459
+#: src/audacious/ui_preferences.c:1428
 msgid "Popup Information"
 msgstr "Cửa sổ thông tin bật lên"
 
-#: src/audacious/ui_preferences.c:1474
+#: src/audacious/ui_preferences.c:1443
 msgid "Show popup information for playlist entries"
 msgstr "Hiện cửa sổ thông tin bật lên cho các mục trong danh sách"
 
-#: src/audacious/ui_preferences.c:1475
+#: src/audacious/ui_preferences.c:1444
 msgid ""
 "Toggles popup information window for the pointed entry in the playlist. The "
 "window shows title of song, name of album, genre, year of publish, track "
 "number, track length, and artwork."
-msgstr ""
-"Bật/tắt cửa sổ thông tin bật lên cho mục được trỏ vào trong danh sách. Cửa "
-"sổ hiện tựa đề bài hát, tên album, thể loại, năm phát hành, số thứ tự của "
-"bài, thời lượng, và ảnh bìa."
+msgstr "Bật/tắt cửa sổ thông tin bật lên cho mục được trỏ vào trong danh sách. Cửa sổ hiện tựa đề bài hát, tên album, thể loại, năm phát hành, số thứ tự của bài, thời lượng, và ảnh bìa."
 
-#: src/audacious/ui_preferences.c:1486
+#: src/audacious/ui_preferences.c:1455
 msgid "Edit settings for popup information"
 msgstr "Chỉnh sửa thiết lập cho cửa sổ thông tin bật lên"
 
-#: src/audacious/ui_preferences.c:1575
+#: src/audacious/ui_preferences.c:1544
 msgid "Output plugin:"
 msgstr "Trình cắm xuất ra:"
 
-#: src/audacious/ui_preferences.c:1634
+#: src/audacious/ui_preferences.c:1603
 msgid "Transport"
 msgstr "Truyền tải"
 
-#: src/audacious/ui_preferences.c:1634
+#: src/audacious/ui_preferences.c:1603
 msgid "Input"
 msgstr "Đầu vào"
 
-#: src/audacious/ui_preferences.c:1635
+#: src/audacious/ui_preferences.c:1604
 msgid "Effect"
 msgstr "Hiệu ứng"
 
-#: src/audacious/ui_preferences.c:1635
+#: src/audacious/ui_preferences.c:1604
 msgid "Visualization"
 msgstr "Hình ảnh ảo"
 
-#: src/audacious/ui_preferences.c:1635
+#: src/audacious/ui_preferences.c:1604
 msgid "General"
 msgstr "Tổng quát"
 
-#: src/audacious/ui_preferences.c:1675
+#: src/audacious/ui_preferences.c:1644
 msgid "Audacious Preferences"
 msgstr "Tùy chỉnh Audacious"
 
-#: src/audacious/util.c:123
+#: src/audacious/util.c:120
 #, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr "Không thể tạo thư mục (%s): %s\n"
 
-#: src/audtool/handlers_playlist.c:274
+#: src/audtool/handlers_playlist.c:273
 msgid "Position not found."
 msgstr "Không tìm thấy vị trí."
 
-#: src/audtool/handlers_vitals.c:64
+#: src/audtool/handlers_vitals.c:63
 msgid "No song playing."
 msgstr "Hiện không phát nhạc."
 
-#: src/libaudcore/tuple.c:685
+#: src/libaudcore/audstrings.c:199
+#, c-format
+msgid "Audio CD, track %s"
+msgstr "Đĩa nhạc, bài %s"
+
+#: src/libaudcore/tuple.c:536
 msgid "Mono"
 msgstr "Mono"
 
-#: src/libaudcore/tuple.c:687
+#: src/libaudcore/tuple.c:538
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/libaudcore/tuple.c:689
+#: src/libaudcore/tuple.c:540
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d kênh"
 
-#: src/libaudgui/confirm.c:78
+#: src/libaudgui/about.c:52 src/libaudgui/about.c:115
+msgid "Credits"
+msgstr "Đóng góp"
+
+#: src/libaudgui/about.c:52
+msgid "Translators"
+msgstr "Người dịch"
+
+#: src/libaudgui/about.c:91
+msgid "About Audacious"
+msgstr "Giới thiệu Audacious"
+
+#: src/libaudgui/confirm.c:76
 #, c-format
 msgid ""
 "Are you sure you want to close %s? If you do, any changes made since the "
 "playlist was exported will be lost."
-msgstr ""
-"Bạn có chắc là muốn đóng %s? Nếu bạn làm vậy, các thay đổi kể từ khi danh "
-"sách được xuất ra sẽ bị mất."
+msgstr "Bạn có chắc là muốn đóng %s? Nếu bạn làm vậy, các thay đổi kể từ khi danh sách được xuất ra sẽ bị mất."
 
-#: src/libaudgui/confirm.c:91
+#: src/libaudgui/confirm.c:89
 msgid "_Don't show this message again"
 msgstr "_Không hiện tin nhắn này nữa"
 
-#: src/libaudgui/confirm.c:128
+#: src/libaudgui/confirm.c:126
 msgid "Rename Playlist"
 msgstr "Đổi tên danh sách"
 
-#: src/libaudgui/effects-menu.c:76
+#: src/libaudgui/effects-menu.c:74
 msgid "settings ..."
 msgstr "thiết lập ..."
 
-#: src/libaudgui/equalizer.c:52
+#: src/libaudgui/equalizer.c:51
 msgid "_Enable"
 msgstr "_Bật"
 
-#: src/libaudgui/equalizer.c:124
+#: src/libaudgui/equalizer.c:123
 msgid "31 Hz"
 msgstr "31 Hz"
 
-#: src/libaudgui/equalizer.c:124
+#: src/libaudgui/equalizer.c:123
 msgid "63 Hz"
 msgstr "63 Hz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "125 Hz"
 msgstr "125 Hz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "250 Hz"
 msgstr "250 Hz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "500 Hz"
 msgstr "500 Hz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "1 kHz"
 msgstr "1 kHz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "2 kHz"
 msgstr "2 kHz"
 
-#: src/libaudgui/equalizer.c:126
+#: src/libaudgui/equalizer.c:125
 msgid "4 kHz"
 msgstr "4 kHz"
 
-#: src/libaudgui/equalizer.c:126
+#: src/libaudgui/equalizer.c:125
 msgid "8 kHz"
 msgstr "8 kHz"
 
-#: src/libaudgui/equalizer.c:126
+#: src/libaudgui/equalizer.c:125
 msgid "16 kHz"
 msgstr "16 kHz"
 
-#: src/libaudgui/equalizer.c:131
+#: src/libaudgui/equalizer.c:130
 msgid "Equalizer"
 msgstr "Bộ cân chỉnh âm"
 
-#: src/libaudgui/equalizer.c:147
+#: src/libaudgui/equalizer.c:146
 msgid "Preamp"
 msgstr "Độ lớn"
 
-#: src/libaudgui/infopopup.c:211
+#: src/libaudgui/infopopup.c:207
 msgid "Track Number"
 msgstr "Số thứ tự"
 
-#: src/libaudgui/infopopup.c:213
+#: src/libaudgui/infopopup.c:209
 msgid "Track Length"
 msgstr "Thời lượng"
 
-#: src/libaudgui/infowin.c:77
+#: src/libaudgui/infowin.c:75
 msgid "Acid Jazz"
 msgstr "Acid Jazz"
 
-#: src/libaudgui/infowin.c:78
+#: src/libaudgui/infowin.c:76
 msgid "Acid Rock"
 msgstr "Acid Rock"
 
-#: src/libaudgui/infowin.c:79
+#: src/libaudgui/infowin.c:77
 msgid "Ambient"
 msgstr "Ambient"
 
-#: src/libaudgui/infowin.c:80
+#: src/libaudgui/infowin.c:78
 msgid "Bebop"
 msgstr "Bebop"
 
-#: src/libaudgui/infowin.c:81
+#: src/libaudgui/infowin.c:79
 msgid "Bluegrass"
 msgstr "Bluegrass"
 
-#: src/libaudgui/infowin.c:82
+#: src/libaudgui/infowin.c:80
 msgid "Blues"
 msgstr "Blues"
 
-#: src/libaudgui/infowin.c:83
+#: src/libaudgui/infowin.c:81
 msgid "Chamber Music"
 msgstr "Chamber Music"
 
-#: src/libaudgui/infowin.c:84
+#: src/libaudgui/infowin.c:82
 msgid "Classical"
 msgstr "Classical"
 
-#: src/libaudgui/infowin.c:85
+#: src/libaudgui/infowin.c:83
 msgid "Country"
 msgstr "Country"
 
-#: src/libaudgui/infowin.c:86
+#: src/libaudgui/infowin.c:84
 msgid "Death Metal"
 msgstr "Death Metal"
 
-#: src/libaudgui/infowin.c:87
+#: src/libaudgui/infowin.c:85
 msgid "Disco"
 msgstr "Disco"
 
-#: src/libaudgui/infowin.c:88
+#: src/libaudgui/infowin.c:86
 msgid "Easy Listening"
 msgstr "Easy Listening"
 
-#: src/libaudgui/infowin.c:89
+#: src/libaudgui/infowin.c:87
 msgid "Folk"
 msgstr "Folk"
 
-#: src/libaudgui/infowin.c:90
+#: src/libaudgui/infowin.c:88
 msgid "Funk"
 msgstr "Funk"
 
-#: src/libaudgui/infowin.c:91
+#: src/libaudgui/infowin.c:89
 msgid "Gangsta Rap"
 msgstr "Gangsta Rap"
 
-#: src/libaudgui/infowin.c:92
+#: src/libaudgui/infowin.c:90
 msgid "Gospel"
 msgstr "Gospel"
 
-#: src/libaudgui/infowin.c:93
+#: src/libaudgui/infowin.c:91
 msgid "Grunge"
 msgstr "Grunge"
 
-#: src/libaudgui/infowin.c:94
+#: src/libaudgui/infowin.c:92
 msgid "Hard Rock"
 msgstr "Hard Rock"
 
-#: src/libaudgui/infowin.c:95
+#: src/libaudgui/infowin.c:93
 msgid "Heavy Metal"
 msgstr "Heavy Metal"
 
-#: src/libaudgui/infowin.c:96
+#: src/libaudgui/infowin.c:94
 msgid "Hip-hop"
 msgstr "Hip-hop"
 
-#: src/libaudgui/infowin.c:97
+#: src/libaudgui/infowin.c:95
 msgid "House"
 msgstr "House"
 
-#: src/libaudgui/infowin.c:98
+#: src/libaudgui/infowin.c:96
 msgid "Jazz"
 msgstr "Jazz"
 
-#: src/libaudgui/infowin.c:99
+#: src/libaudgui/infowin.c:97
 msgid "Jungle"
 msgstr "Jungle"
 
-#: src/libaudgui/infowin.c:100
+#: src/libaudgui/infowin.c:98
 msgid "Metal"
 msgstr "Metal"
 
-#: src/libaudgui/infowin.c:101
+#: src/libaudgui/infowin.c:99
 msgid "New Age"
 msgstr "New Age"
 
-#: src/libaudgui/infowin.c:102
+#: src/libaudgui/infowin.c:100
 msgid "New Wave"
 msgstr "New Wave"
 
-#: src/libaudgui/infowin.c:103
+#: src/libaudgui/infowin.c:101
 msgid "Noise"
 msgstr "Noise"
 
-#: src/libaudgui/infowin.c:104
+#: src/libaudgui/infowin.c:102
 msgid "Pop"
 msgstr "Pop"
 
-#: src/libaudgui/infowin.c:105
+#: src/libaudgui/infowin.c:103
 msgid "Punk Rock"
 msgstr "Punk Rock"
 
-#: src/libaudgui/infowin.c:106
+#: src/libaudgui/infowin.c:104
 msgid "Rap"
 msgstr "Rap"
 
-#: src/libaudgui/infowin.c:107
+#: src/libaudgui/infowin.c:105
 msgid "Reggae"
 msgstr "Reggae"
 
-#: src/libaudgui/infowin.c:108
+#: src/libaudgui/infowin.c:106
 msgid "Rock"
 msgstr "Rock"
 
-#: src/libaudgui/infowin.c:109
+#: src/libaudgui/infowin.c:107
 msgid "Rock and Roll"
 msgstr "Rock and Roll"
 
-#: src/libaudgui/infowin.c:110
+#: src/libaudgui/infowin.c:108
 msgid "Rhythm and Blues"
 msgstr "Rhythm and Blues"
 
-#: src/libaudgui/infowin.c:111
+#: src/libaudgui/infowin.c:109
 msgid "Ska"
 msgstr "Ska"
 
-#: src/libaudgui/infowin.c:112
+#: src/libaudgui/infowin.c:110
 msgid "Soul"
 msgstr "Soul"
 
-#: src/libaudgui/infowin.c:113
+#: src/libaudgui/infowin.c:111
 msgid "Swing"
 msgstr "Swing"
 
-#: src/libaudgui/infowin.c:114
+#: src/libaudgui/infowin.c:112
 msgid "Techno"
 msgstr "Techno"
 
-#: src/libaudgui/infowin.c:115
+#: src/libaudgui/infowin.c:113
 msgid "Trip-hop"
 msgstr "Trip-hop"
 
-#: src/libaudgui/infowin.c:175 src/libaudgui/infowin.c:361
-#: src/libaudgui/infowin.c:364 src/libaudgui/infowin.c:367
+#: src/libaudgui/infowin.c:177 src/libaudgui/infowin.c:363
+#: src/libaudgui/infowin.c:366 src/libaudgui/infowin.c:369
 msgid "n/a"
 msgstr "n/a"
 
-#: src/libaudgui/infowin.c:265
+#: src/libaudgui/infowin.c:267
 msgid "Metadata updated successfully"
 msgstr "Đã cập nhật thông tin"
 
-#: src/libaudgui/infowin.c:270
+#: src/libaudgui/infowin.c:272
 msgid "Metadata updating failed"
 msgstr "Không thể cập nhật thông tin"
 
-#: src/libaudgui/infowin.c:318
+#: src/libaudgui/infowin.c:320
 msgid "Track Information"
 msgstr "Thông tin"
 
-#: src/libaudgui/infowin.c:350
+#: src/libaudgui/infowin.c:352
 msgid "Format:"
 msgstr "Định dạng:"
 
-#: src/libaudgui/infowin.c:354
+#: src/libaudgui/infowin.c:356
 msgid "Quality:"
 msgstr "Chất lượng:"
 
-#: src/libaudgui/infowin.c:357
+#: src/libaudgui/infowin.c:359
 msgid "Bitrate:"
 msgstr "Tỉ lệ bit:"
 
-#: src/libaudgui/infowin.c:387
+#: src/libaudgui/infowin.c:389
 msgid "Title"
 msgstr "Tựa đề"
 
-#: src/libaudgui/infowin.c:399
+#: src/libaudgui/infowin.c:401
 msgid "Artist"
 msgstr "Nghệ sĩ"
 
-#: src/libaudgui/infowin.c:411
+#: src/libaudgui/infowin.c:413
 msgid "Album"
 msgstr "Album"
 
-#: src/libaudgui/infowin.c:423
+#: src/libaudgui/infowin.c:425
 msgid "Comment"
 msgstr "Bình luận"
 
-#: src/libaudgui/infowin.c:435
+#: src/libaudgui/infowin.c:437
 msgid "Genre"
 msgstr "Thể loại"
 
-#: src/libaudgui/infowin.c:456
+#: src/libaudgui/infowin.c:458
 msgid "Year"
 msgstr "Năm"
 
-#: src/libaudgui/infowin.c:467
+#: src/libaudgui/infowin.c:469
 msgid "Track Number"
 msgstr "Số thứ tự"
 
-#: src/libaudgui/infowin.c:549
+#: src/libaudgui/infowin.c:548
 #, c-format
 msgid "%d kb/s"
 msgstr "%d kb/giây"
 
-#: src/libaudgui/infowin.c:579
+#: src/libaudgui/infowin.c:575
 #, c-format
 msgid "No info available for %s.\n"
 msgstr "Không có thông tin của %s.\n"
 
-#: src/libaudgui/jump-to-time.c:75
+#: src/libaudgui/jump-to-time.c:72
 msgid "Jump to Time"
 msgstr "Định mốc t.gian phát nhạc"
 
-#: src/libaudgui/jump-to-time.c:90
+#: src/libaudgui/jump-to-time.c:87
 msgid "mm:ss"
 msgstr "mm:ss"
 
-#: src/libaudgui/playlists.c:39
+#: src/libaudgui/playlists.c:33
 msgid "Export Playlist"
 msgstr "Xuất danh sách"
 
-#: src/libaudgui/playlists.c:39
+#: src/libaudgui/playlists.c:33
 msgid "Import Playlist"
 msgstr "Nhập danh sách"
 
-#: src/libaudgui/playlists.c:72
+#: src/libaudgui/playlists.c:66
 #, c-format
 msgid "Overwrite %s?"
 msgstr "Ghi đè %s?"
 
-#: src/libaudgui/queue-manager.c:185
+#: src/libaudgui/queue-manager.c:196
 msgid "Queue Manager"
 msgstr "Trình quản lí hàng đợi"
 
-#: src/libaudgui/ui_about.c:69
-msgid "About Audacious"
-msgstr "Giới thiệu Audacious"
-
-#: src/libaudgui/ui_about.c:90 src/libaudgui/ui_credits.c:122
-msgid "Credits"
-msgstr "Đóng góp"
-
-#: src/libaudgui/ui_credits.c:126
-msgid "Translators"
-msgstr "Người dịch"
-
 #: src/libaudgui/ui_fileopener.c:109
 msgid "Open Files"
 msgstr "Mở tập tin"
@@ -1085,60 +1095,60 @@
 msgid "Close dialog on Add"
 msgstr "Đóng hộp thoại khi Thêm"
 
-#: src/libaudgui/ui_jumptotrack.c:103 src/libaudgui/ui_jumptotrack.c:111
-#: src/libaudgui/ui_jumptotrack.c:322
+#: src/libaudgui/ui_jumptotrack.c:109 src/libaudgui/ui_jumptotrack.c:117
+#: src/libaudgui/ui_jumptotrack.c:326
 msgid "_Queue"
 msgstr "_Hàng đợi"
 
-#: src/libaudgui/ui_jumptotrack.c:109
+#: src/libaudgui/ui_jumptotrack.c:115
 msgid "Un_queue"
 msgstr "Bỏ khỏi _hàng đợi"
 
-#: src/libaudgui/ui_jumptotrack.c:239
-msgid "Jump to Track"
-msgstr "Chọn bài"
+#: src/libaudgui/ui_jumptotrack.c:258
+msgid "Jump to Song"
+msgstr "Chuyển đến bài hát"
 
-#: src/libaudgui/ui_jumptotrack.c:277
+#: src/libaudgui/ui_jumptotrack.c:281
 msgid "Filter: "
 msgstr "Bộ lọc:"
 
-#: src/libaudgui/ui_jumptotrack.c:278
+#: src/libaudgui/ui_jumptotrack.c:282
 msgid "_Filter:"
 msgstr "_Bộ lọc:"
 
-#: src/libaudgui/ui_jumptotrack.c:288
+#: src/libaudgui/ui_jumptotrack.c:292
 msgid "Remember"
 msgstr "Ghi nhớ"
 
-#: src/libaudgui/ui_jumptotrack.c:295
+#: src/libaudgui/ui_jumptotrack.c:299
 msgid "Clea_r"
 msgstr "_Xóa trắng"
 
-#: src/libaudgui/ui_jumptotrack.c:315
+#: src/libaudgui/ui_jumptotrack.c:319
 msgid "Close on Jump"
 msgstr "Đóng khi chọn xong"
 
-#: src/libaudgui/ui_playlist_manager.c:250
+#: src/libaudgui/ui_playlist_manager.c:253
 msgid "Playlist Manager"
 msgstr "Quản lý danh sách"
 
-#: src/libaudgui/ui_playlist_manager.c:277
+#: src/libaudgui/ui_playlist_manager.c:280
 msgid "Entries"
 msgstr "Số mục"
 
-#: src/libaudgui/ui_playlist_manager.c:298
+#: src/libaudgui/ui_playlist_manager.c:301
 msgid "_Rename"
 msgstr "Đổi _tên"
 
-#: src/libaudgui/ui_playlist_manager.c:322
+#: src/libaudgui/ui_playlist_manager.c:325
 msgid "_Close dialog on activating playlist"
 msgstr "Đóng hộp thoại khi _kích hoạt danh sách"
 
-#: src/libaudgui/ui_urlopener.c:51
+#: src/libaudgui/ui_urlopener.c:48
 msgid "Open URL"
 msgstr "Mở địa chỉ URL"
 
-#: src/libaudgui/ui_urlopener.c:51
+#: src/libaudgui/ui_urlopener.c:48
 msgid "Add URL"
 msgstr "Thêm URL"
 
@@ -1146,38 +1156,36 @@
 msgid ""
 "\n"
 "(Further messages have been hidden.)"
-msgstr ""
-"\n"
-"(Các thông báo khác đã bị ẩn.)"
+msgstr "\n(Các thông báo khác đã bị ẩn.)"
 
 #: src/libeggsmclient/eggdesktopfile.c:165
 msgid "File is not a valid .desktop file"
 msgstr "Không phải là một tập tin .desktop hợp lệ"
 
-#: src/libeggsmclient/eggdesktopfile.c:188
+#: src/libeggsmclient/eggdesktopfile.c:191
 #, c-format
 msgid "Unrecognized desktop file Version '%s'"
 msgstr "Phiên bản tập tin desktop không được công nhận '%s'"
 
-#: src/libeggsmclient/eggdesktopfile.c:967
+#: src/libeggsmclient/eggdesktopfile.c:974
 #, c-format
 msgid "Starting %s"
 msgstr "Đang khởi động %s"
 
-#: src/libeggsmclient/eggdesktopfile.c:1108
+#: src/libeggsmclient/eggdesktopfile.c:1116
 msgid "Application does not accept documents on command line"
 msgstr "Ứng dụng không chấp nhận tài liệu trên dòng lệnh"
 
-#: src/libeggsmclient/eggdesktopfile.c:1176
+#: src/libeggsmclient/eggdesktopfile.c:1184
 #, c-format
 msgid "Unrecognized launch option: %d"
 msgstr "Tùy chọn khởi chạy không được công nhận: %d"
 
-#: src/libeggsmclient/eggdesktopfile.c:1375
+#: src/libeggsmclient/eggdesktopfile.c:1391
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
 msgstr "Không thể truyền URI tài liệu đến mục màn hình 'Type=Link'"
 
-#: src/libeggsmclient/eggdesktopfile.c:1396
+#: src/libeggsmclient/eggdesktopfile.c:1412
 msgid "Not a launchable item"
 msgstr "Không phải mục có thể khởi chạy"
 
@@ -1208,5 +1216,3 @@
 #: src/libeggsmclient/eggsmclient.c:254
 msgid "Show session management options"
 msgstr "Hiện các tùy chọn quản lí phiên"
-
-

audacious-3.1.1.tar.bz2/po/zh_TW.po -> audacious-3.2.4.tar.bz2/po/zh_TW.po Changed

@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: audacious 3.1\n"
-"Report-Msgid-Bugs-To: http://jira.atheme.org/\n"
-"POT-Creation-Date: 2011-10-19 21:32-0400\n"
-"PO-Revision-Date: 2011-11-10 11:36+0800\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2012-02-17 11:58-0500\n"
+"PO-Revision-Date: 2012-04-23 23:28+0800\n"
 "Last-Translator: Ruei-Yuan Lu <RueiYuan.Lu@gmail.com>\n"
 "Language-Team: Chinese (traditional)\n"
 "Language: \n"
@@ -17,274 +17,278 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/audacious/adder.c:71
+#: src/audacious/adder.c:77
 msgid "Searching ..."
 msgstr "搜尋中 ..."
 
-#: src/audacious/adder.c:97
+#: src/audacious/adder.c:113
 #, c-format
 msgid "%d file found"
 msgid_plural "%d files found"
 msgstr[0] "找到 %d 個檔案"
 
-#: src/audacious/chardet.c:38
+#: src/audacious/chardet.c:39
 msgid " (invalid UTF-8)"
 msgstr " (無效的 UTF-8 字串)"
 
-#: src/audacious/credits.c:35
+#: src/audacious/credits.c:37
 msgid "Core developers:"
 msgstr "核心開發人員:"
 
-#: src/audacious/credits.c:49
+#: src/audacious/credits.c:51
 msgid "Graphics:"
 msgstr "美工:"
 
-#: src/audacious/credits.c:54
+#: src/audacious/credits.c:56
 msgid "Default skin:"
 msgstr "預設面板:"
 
-#: src/audacious/credits.c:60
+#: src/audacious/credits.c:62
 msgid "Plugin development:"
 msgstr "外掛開發:"
 
-#: src/audacious/credits.c:83
+#: src/audacious/credits.c:85
 msgid "Patch authors:"
 msgstr "修正檔作者:"
 
-#: src/audacious/credits.c:126
+#: src/audacious/credits.c:131
 msgid "1.x developers:"
 msgstr "1.x 開發人員:"
 
-#: src/audacious/credits.c:148
+#: src/audacious/credits.c:153
 msgid "BMP Developers:"
 msgstr "BMP 開發人員:"
 
-#: src/audacious/credits.c:180
+#: src/audacious/credits.c:185
+msgid "Argentinian Spanish:"
+msgstr "阿根廷西班牙語:"
+
+#: src/audacious/credits.c:188
 msgid "Belarusian:"
 msgstr "白俄羅斯文:"
 
-#: src/audacious/credits.c:183
+#: src/audacious/credits.c:191
 msgid "Basque:"
 msgstr "巴斯克語:"
 
-#: src/audacious/credits.c:186
+#: src/audacious/credits.c:194
 msgid "Brazilian Portuguese:"
 msgstr "巴西葡萄牙語:"
 
-#: src/audacious/credits.c:191
+#: src/audacious/credits.c:199
 msgid "Breton:"
 msgstr "布列塔尼語:"
 
-#: src/audacious/credits.c:194
+#: src/audacious/credits.c:202
 msgid "Bulgarian:"
 msgstr "保加利亞語:"
 
-#: src/audacious/credits.c:197
+#: src/audacious/credits.c:205
 msgid "Catalan:"
 msgstr "加泰羅尼亞語:"
 
-#: src/audacious/credits.c:200
+#: src/audacious/credits.c:210
 msgid "Chinese:"
 msgstr "中文:"
 
-#: src/audacious/credits.c:203
+#: src/audacious/credits.c:213
 msgid "Croatian:"
 msgstr "克羅埃西亞語:"
 
-#: src/audacious/credits.c:206
+#: src/audacious/credits.c:216
 msgid "Czech:"
 msgstr "捷克語:"
 
-#: src/audacious/credits.c:209
+#: src/audacious/credits.c:219
 msgid "Dutch:"
 msgstr "荷蘭語:"
 
-#: src/audacious/credits.c:213
+#: src/audacious/credits.c:223
 msgid "Estonian:"
 msgstr "愛沙尼亞語:"
 
-#: src/audacious/credits.c:216
+#: src/audacious/credits.c:226
 msgid "Finnish:"
 msgstr "芬蘭語:"
 
-#: src/audacious/credits.c:221
+#: src/audacious/credits.c:232
 msgid "French:"
 msgstr "法語:"
 
-#: src/audacious/credits.c:227
+#: src/audacious/credits.c:238
 msgid "German:"
 msgstr "德語:"
 
-#: src/audacious/credits.c:234
+#: src/audacious/credits.c:245
 msgid "Georgian:"
 msgstr "喬治亞語:"
 
-#: src/audacious/credits.c:237
+#: src/audacious/credits.c:248
 msgid "Greek:"
 msgstr "希臘語:"
 
-#: src/audacious/credits.c:242
+#: src/audacious/credits.c:253
 msgid "Hindi:"
 msgstr "印地語:"
 
-#: src/audacious/credits.c:245
+#: src/audacious/credits.c:256
 msgid "Hungarian:"
 msgstr "匈牙利語:"
 
-#: src/audacious/credits.c:249
+#: src/audacious/credits.c:260
 msgid "Italian:"
 msgstr "義大利語:"
 
-#: src/audacious/credits.c:253
+#: src/audacious/credits.c:265
 msgid "Japanese:"
 msgstr "日本語:"
 
-#: src/audacious/credits.c:256
+#: src/audacious/credits.c:268
 msgid "Korean:"
 msgstr "韓語:"
 
-#: src/audacious/credits.c:259
+#: src/audacious/credits.c:271
 msgid "Latvian:"
 msgstr "拉脫維亞語:"
 
-#: src/audacious/credits.c:262
+#: src/audacious/credits.c:274
 msgid "Lithuanian:"
 msgstr "立陶宛語:"
 
-#: src/audacious/credits.c:267
+#: src/audacious/credits.c:279
 msgid "Macedonian:"
 msgstr "馬其頓語:"
 
-#: src/audacious/credits.c:270
+#: src/audacious/credits.c:282
+msgid "Mexican Spanish:"
+msgstr "墨西哥西班牙語:"
+
+#: src/audacious/credits.c:285
 msgid "Polish:"
 msgstr "波蘭語:"
 
-#: src/audacious/credits.c:276
+#: src/audacious/credits.c:292
 msgid "Portuguese:"
 msgstr "葡萄牙文:"
 
-#: src/audacious/credits.c:279
+#: src/audacious/credits.c:295
 msgid "Romanian:"
 msgstr "羅馬尼亞語:"
 
-#: src/audacious/credits.c:283
+#: src/audacious/credits.c:299
 msgid "Russian:"
 msgstr "俄語:"
 
-#: src/audacious/credits.c:287
+#: src/audacious/credits.c:303
 msgid "Serbian (Latin):"
 msgstr "塞爾維亞語 (拉丁):"
 
-#: src/audacious/credits.c:290
+#: src/audacious/credits.c:306
 msgid "Serbian (Cyrillic):"
 msgstr "塞爾維亞語 (西里爾):"
 
-#: src/audacious/credits.c:293
+#: src/audacious/credits.c:310
 msgid "Simplified Chinese:"
 msgstr "簡體中文:"
 
-#: src/audacious/credits.c:296
+#: src/audacious/credits.c:313
 msgid "Slovak:"
 msgstr "斯洛伐克語:"
 
-#: src/audacious/credits.c:299
+#: src/audacious/credits.c:317
 msgid "Spanish:"
 msgstr "西班牙語:"
 
-#: src/audacious/credits.c:306
+#: src/audacious/credits.c:326
 msgid "Swedish:"
 msgstr "瑞典語:"
 
-#: src/audacious/credits.c:309
+#: src/audacious/credits.c:329
 msgid "Traditional Chinese:"
 msgstr "正體中文:"
 
-#: src/audacious/credits.c:315
+#: src/audacious/credits.c:335
 msgid "Turkish:"
 msgstr "土耳其語:"
 
-#: src/audacious/credits.c:319
+#: src/audacious/credits.c:339
 msgid "Ukrainian:"
 msgstr "烏克蘭語:"
 
-#: src/audacious/credits.c:323
+#: src/audacious/credits.c:344
 msgid "Vietnamese:"
 msgstr "越南語:"
 
-#: src/audacious/credits.c:326
+#: src/audacious/credits.c:347
 msgid "Welsh:"
 msgstr "威爾士語:"
 
-#: src/audacious/drct.c:234
-msgid "Temporary Playlist"
-msgstr "暫存播放清單"
-
-#: src/audacious/equalizer_preset.c:186
+#: src/audacious/equalizer_preset.c:180
 #, c-format
 msgid "Error importing Winamp EQF file '%s'"
 msgstr "匯入 Winamp EQF 檔時發生錯誤 '%s'"
 
-#: src/audacious/main.c:239
+#: src/audacious/main.c:243
 msgid "Skip backwards in playlist"
 msgstr "切換到播放清單的上一個"
 
-#: src/audacious/main.c:240
+#: src/audacious/main.c:244
 msgid "Start playing current playlist"
 msgstr "開始播放目前的播放清單"
 
-#: src/audacious/main.c:241
+#: src/audacious/main.c:245
 msgid "Pause current song"
 msgstr "暫停播放目前歌曲"
 
-#: src/audacious/main.c:242
+#: src/audacious/main.c:246
 msgid "Stop current song"
 msgstr "停止播放目前歌曲"
 
-#: src/audacious/main.c:243
+#: src/audacious/main.c:247
 msgid "Pause if playing, play otherwise"
 msgstr "若播放中則暫停，否則繼續播放"
 
-#: src/audacious/main.c:244
+#: src/audacious/main.c:248
 msgid "Skip forward in playlist"
 msgstr "切換到播放清單的下一個"
 
-#: src/audacious/main.c:245
+#: src/audacious/main.c:249
 msgid "Display Jump to File dialog"
 msgstr "顯示跳至檔案對話視窗"
 
-#: src/audacious/main.c:246
+#: src/audacious/main.c:250
 msgid "Add files to the playlist"
 msgstr "加入檔案到播放清單"
 
-#: src/audacious/main.c:247
+#: src/audacious/main.c:251
 msgid "Add new files to a temporary playlist"
 msgstr "加入檔案到暫存播放清單"
 
-#: src/audacious/main.c:248
+#: src/audacious/main.c:252
 msgid "Display the main window"
 msgstr "顯示主視窗"
 
-#: src/audacious/main.c:249
+#: src/audacious/main.c:253
 msgid "Show version"
 msgstr "顯示版本資訊"
 
-#: src/audacious/main.c:250
+#: src/audacious/main.c:254
 msgid "Print debugging messages"
 msgstr "顯示除錯訊息"
 
-#: src/audacious/main.c:251
+#: src/audacious/main.c:255
 msgid "Headless mode (beta)"
 msgstr "無頭模式 (beta)"
 
-#: src/audacious/main.c:252
+#: src/audacious/main.c:256
 msgid "FILE..."
 msgstr "檔案..."
 
-#: src/audacious/main.c:264
+#: src/audacious/main.c:268
 msgid "- play multimedia files"
 msgstr "- 播放多媒體檔案"
 
-#: src/audacious/main.c:274
+#: src/audacious/main.c:278
 #, c-format
 msgid ""
 "%s: %s\n"
@@ -293,773 +297,795 @@
 "%s: %s\n"
 "請嘗試用 `%s --help' 取得更多資訊。\n"
 
-#: src/audacious/main.c:547
+#: src/audacious/main.c:573
 msgid "Audacious"
-msgstr ""
+msgstr "Audacious"
 
-#: src/audacious/playback.c:303
+#: src/audacious/playback.c:307
 #, c-format
 msgid "No decoder found for %s."
 msgstr "找不到適用於 %s 的解碼器。"
 
-#: src/audacious/playlist-new.c:315
-msgid "Untitled Playlist"
-msgstr "未命名的播放清單"
+#: src/audacious/playlist-files.c:53
+#, c-format
+msgid "Cannot %s %s: unsupported file extension."
+msgstr "無法%s %s: 未支援的副檔名。"
+
+#: src/audacious/playlist-files.c:54
+msgid "save"
+msgstr "儲存"
 
-#: src/audacious/playlist-new.c:1496
+#: src/audacious/playlist-files.c:54
+msgid "load"
+msgstr "載入"
+
+#: src/audacious/playlist-new.c:131
+msgid "New Playlist"
+msgstr "新播放清單"
+
+#: src/audacious/playlist-new.c:132
+msgid "Now Playing"
+msgstr "正在播放"
+
+#: src/audacious/playlist-new.c:1630
 msgid "The playlist cannot be sorted because metadata scanning is still in progress (or has been disabled)."
 msgstr "因為正在進行詮釋資料的掃描，無法對播放清單進行排序。（或者已經被關閉）"
 
-#: src/audacious/ui_preferences.c:88
+#: src/audacious/ui_preferences.c:85
 msgid "Audio"
 msgstr "音訊"
 
-#: src/audacious/ui_preferences.c:89
+#: src/audacious/ui_preferences.c:86
 msgid "Network"
 msgstr "網路"
 
-#: src/audacious/ui_preferences.c:90
-#: src/audacious/ui_preferences.c:1634
+#: src/audacious/ui_preferences.c:87
+#: src/audacious/ui_preferences.c:1603
 msgid "Playlist"
 msgstr "播放清單"
 
-#: src/audacious/ui_preferences.c:91
+#: src/audacious/ui_preferences.c:88
 msgid "Plugins"
 msgstr "外掛"
 
-#: src/audacious/ui_preferences.c:97
-#: src/libaudgui/infopopup.c:203
+#: src/audacious/ui_preferences.c:94
+#: src/libaudgui/infopopup.c:199
 msgid "Artist"
 msgstr "藝人"
 
-#: src/audacious/ui_preferences.c:98
-#: src/libaudgui/infopopup.c:205
+#: src/audacious/ui_preferences.c:95
+#: src/libaudgui/infopopup.c:201
 msgid "Album"
 msgstr "專輯"
 
-#: src/audacious/ui_preferences.c:99
-#: src/libaudgui/infopopup.c:201
-#: src/libaudgui/ui_playlist_manager.c:276
+#: src/audacious/ui_preferences.c:96
+#: src/libaudgui/infopopup.c:197
+#: src/libaudgui/ui_playlist_manager.c:279
 msgid "Title"
 msgstr "標題"
 
-#: src/audacious/ui_preferences.c:100
+#: src/audacious/ui_preferences.c:97
 msgid "Tracknumber"
 msgstr "音軌編號"
 
-#: src/audacious/ui_preferences.c:101
-#: src/libaudgui/infopopup.c:207
+#: src/audacious/ui_preferences.c:98
+#: src/libaudgui/infopopup.c:203
 msgid "Genre"
 msgstr "類型"
 
-#: src/audacious/ui_preferences.c:102
+#: src/audacious/ui_preferences.c:99
 msgid "Filename"
 msgstr "檔案名稱"
 
-#: src/audacious/ui_preferences.c:103
+#: src/audacious/ui_preferences.c:100
 msgid "Filepath"
 msgstr "檔案路徑"
 
-#: src/audacious/ui_preferences.c:104
+#: src/audacious/ui_preferences.c:101
 msgid "Date"
 msgstr "日期"
 
-#: src/audacious/ui_preferences.c:105
-#: src/libaudgui/infopopup.c:209
+#: src/audacious/ui_preferences.c:102
+#: src/libaudgui/infopopup.c:205
 msgid "Year"
 msgstr "年份"
 
-#: src/audacious/ui_preferences.c:106
+#: src/audacious/ui_preferences.c:103
 msgid "Comment"
 msgstr "備註"
 
-#: src/audacious/ui_preferences.c:107
+#: src/audacious/ui_preferences.c:104
 msgid "Codec"
 msgstr "編解碼器"
 
-#: src/audacious/ui_preferences.c:108
+#: src/audacious/ui_preferences.c:105
 msgid "Quality"
 msgstr "品質"
 
-#: src/audacious/ui_preferences.c:114
+#: src/audacious/ui_preferences.c:111
 msgid "None"
 msgstr "無"
 
-#: src/audacious/ui_preferences.c:115
+#: src/audacious/ui_preferences.c:112
 msgid "Arabic"
 msgstr "阿拉伯語"
 
-#: src/audacious/ui_preferences.c:116
+#: src/audacious/ui_preferences.c:113
 msgid "Baltic"
 msgstr "波羅的海"
 
-#: src/audacious/ui_preferences.c:117
+#: src/audacious/ui_preferences.c:114
 msgid "Chinese"
 msgstr "中文"
 
-#: src/audacious/ui_preferences.c:118
+#: src/audacious/ui_preferences.c:115
 msgid "Greek"
 msgstr "希臘語"
 
-#: src/audacious/ui_preferences.c:119
+#: src/audacious/ui_preferences.c:116
 msgid "Hebrew"
 msgstr "希伯來語"
 
-#: src/audacious/ui_preferences.c:120
+#: src/audacious/ui_preferences.c:117
 msgid "Japanese"
 msgstr "日本語"
 
-#: src/audacious/ui_preferences.c:121
+#: src/audacious/ui_preferences.c:118
 msgid "Korean"
 msgstr "韓文"
 
-#: src/audacious/ui_preferences.c:122
+#: src/audacious/ui_preferences.c:119
 msgid "Polish"
 msgstr "波蘭語"
 
-#: src/audacious/ui_preferences.c:123
+#: src/audacious/ui_preferences.c:120
 msgid "Russian"
 msgstr "俄語"
 
-#: src/audacious/ui_preferences.c:124
+#: src/audacious/ui_preferences.c:121
 msgid "Taiwanese"
 msgstr "正體中文"
 
-#: src/audacious/ui_preferences.c:125
+#: src/audacious/ui_preferences.c:122
 msgid "Turkish"
 msgstr "土耳其語"
 
-#: src/audacious/ui_preferences.c:147
+#: src/audacious/ui_preferences.c:144
 msgid "Album mode"
 msgstr "專輯模式"
 
-#: src/audacious/ui_preferences.c:150
+#: src/audacious/ui_preferences.c:147
 msgid "Output Settings"
 msgstr "輸出設定"
 
-#: src/audacious/ui_preferences.c:152
+#: src/audacious/ui_preferences.c:149
 msgid "Bit depth:"
 msgstr "取樣格式:"
 
-#: src/audacious/ui_preferences.c:155
+#: src/audacious/ui_preferences.c:152
 msgid "Buffer size:"
 msgstr "緩衝區大小:"
 
-#: src/audacious/ui_preferences.c:157
+#: src/audacious/ui_preferences.c:154
 msgid "ms"
 msgstr "毫秒"
 
-#: src/audacious/ui_preferences.c:158
+#: src/audacious/ui_preferences.c:155
 msgid "Use software volume control (not recommended)"
 msgstr "使用軟體音量控制 (不建議開啟)"
 
-#: src/audacious/ui_preferences.c:160
+#: src/audacious/ui_preferences.c:157
 msgid "Replay Gain"
 msgstr "播放增益"
 
-#: src/audacious/ui_preferences.c:161
+#: src/audacious/ui_preferences.c:158
 msgid "Enable Replay Gain"
 msgstr "啟用播放增益"
 
-#: src/audacious/ui_preferences.c:164
+#: src/audacious/ui_preferences.c:161
 msgid "Prevent clipping (recommended)"
 msgstr "防止訊號裁剪 (建議開啟)"
 
-#: src/audacious/ui_preferences.c:166
+#: src/audacious/ui_preferences.c:163
 msgid "Adjust Levels"
 msgstr "調整音量"
 
-#: src/audacious/ui_preferences.c:167
+#: src/audacious/ui_preferences.c:164
 msgid "Amplify all files:"
 msgstr "放大所有檔案的音量:"
 
+#: src/audacious/ui_preferences.c:166
 #: src/audacious/ui_preferences.c:169
-#: src/audacious/ui_preferences.c:172
 msgid "dB"
 msgstr "分貝"
 
-#: src/audacious/ui_preferences.c:170
+#: src/audacious/ui_preferences.c:167
 msgid "Amplify untagged files:"
 msgstr "放大無標籤檔案的音量:"
 
-#: src/audacious/ui_preferences.c:175
+#: src/audacious/ui_preferences.c:172
 msgid "Proxy hostname:"
 msgstr "代理伺服器名稱:"
 
-#: src/audacious/ui_preferences.c:176
+#: src/audacious/ui_preferences.c:173
 msgid "Proxy port:"
 msgstr "代理伺服器連接埠:"
 
-#: src/audacious/ui_preferences.c:179
+#: src/audacious/ui_preferences.c:176
 msgid "Proxy username:"
 msgstr "代理伺服器使用者名稱:"
 
-#: src/audacious/ui_preferences.c:180
+#: src/audacious/ui_preferences.c:177
 msgid "Proxy password:"
 msgstr "代理伺服器密碼:"
 
-#: src/audacious/ui_preferences.c:184
+#: src/audacious/ui_preferences.c:181
 msgid "Proxy Configuration"
 msgstr "代理伺服器設定"
 
-#: src/audacious/ui_preferences.c:185
+#: src/audacious/ui_preferences.c:182
 msgid "Enable proxy usage"
 msgstr "啟用代理伺服器"
 
-#: src/audacious/ui_preferences.c:188
+#: src/audacious/ui_preferences.c:185
 msgid "Use authentication with proxy"
 msgstr "需要認證"
 
-#: src/audacious/ui_preferences.c:196
+#: src/audacious/ui_preferences.c:193
 msgid "Auto character encoding detector for:"
 msgstr "自動偵測字元編碼:"
 
-#: src/audacious/ui_preferences.c:201
+#: src/audacious/ui_preferences.c:198
 msgid "Fallback character encodings:"
 msgstr "備用字元編碼:"
 
-#: src/audacious/ui_preferences.c:205
+#: src/audacious/ui_preferences.c:202
 msgid "Behavior"
 msgstr "行為"
 
-#: src/audacious/ui_preferences.c:206
+#: src/audacious/ui_preferences.c:203
 msgid "Continue playback on startup"
 msgstr "啟動後繼續之前的播放"
 
-#: src/audacious/ui_preferences.c:208
+#: src/audacious/ui_preferences.c:205
 msgid "Advance when the current song is deleted"
 msgstr "目前的歌曲被刪除時移到下一個"
 
-#: src/audacious/ui_preferences.c:210
+#: src/audacious/ui_preferences.c:207
 msgid "Clear the playlist when opening files"
 msgstr "開啟檔案後清除播放清單"
 
-#: src/audacious/ui_preferences.c:212
+#: src/audacious/ui_preferences.c:209
 msgid "Open files in a temporary playlist"
 msgstr "在暫存播放清單中開啟檔案"
 
-#: src/audacious/ui_preferences.c:214
+#: src/audacious/ui_preferences.c:211
 msgid "Metadata"
 msgstr "詮釋資料"
 
-#: src/audacious/ui_preferences.c:215
+#: src/audacious/ui_preferences.c:212
 msgid "Do not load metadata for songs until played"
 msgstr "在歌曲播放以前不要載入詮釋資料"
 
-#: src/audacious/ui_preferences.c:233
+#: src/audacious/ui_preferences.c:230
 msgid "TITLE"
 msgstr "標題"
 
-#: src/audacious/ui_preferences.c:234
+#: src/audacious/ui_preferences.c:231
 msgid "ARTIST - TITLE"
 msgstr "藝人 - 標題"
 
-#: src/audacious/ui_preferences.c:235
+#: src/audacious/ui_preferences.c:232
 msgid "ARTIST - ALBUM - TITLE"
 msgstr "藝人 - 專輯 - 標題"
 
-#: src/audacious/ui_preferences.c:236
+#: src/audacious/ui_preferences.c:233
 msgid "ARTIST - ALBUM - TRACK. TITLE"
 msgstr "藝人 - 專輯 - 音軌. 標題"
 
-#: src/audacious/ui_preferences.c:237
+#: src/audacious/ui_preferences.c:234
 msgid "ARTIST [ ALBUM ] - TRACK. TITLE"
 msgstr "藝人 [ 專輯 ] - 音軌. 標題"
 
-#: src/audacious/ui_preferences.c:238
+#: src/audacious/ui_preferences.c:235
 msgid "ALBUM - TITLE"
 msgstr "專輯 - 標題"
 
-#: src/audacious/ui_preferences.c:577
+#: src/audacious/ui_preferences.c:556
 msgid "Category"
 msgstr "目錄"
 
-#: src/audacious/ui_preferences.c:801
+#: src/audacious/ui_preferences.c:780
 msgid "Popup Information Settings"
 msgstr "彈出式資訊視窗設定"
 
-#: src/audacious/ui_preferences.c:810
+#: src/audacious/ui_preferences.c:789
 msgid "Cover image retrieve"
 msgstr "擷取封面圖片"
 
-#: src/audacious/ui_preferences.c:815
+#: src/audacious/ui_preferences.c:794
 msgid "While searching for the album's cover, Audacious looks for certain words in the filename. You can specify those words in the lists below, separated using commas."
 msgstr "搜尋專輯封面時，Audacious 會從檔名中尋找特定單字。你可以在底下清單中指定這些單字，各單字之間用逗點隔開。"
 
-#: src/audacious/ui_preferences.c:832
+#: src/audacious/ui_preferences.c:811
 msgid "Exclude:"
 msgstr "排除:"
 
-#: src/audacious/ui_preferences.c:839
+#: src/audacious/ui_preferences.c:818
 msgid "Include:"
 msgstr "包含:"
 
-#: src/audacious/ui_preferences.c:856
+#: src/audacious/ui_preferences.c:835
 msgid "Recursively search for cover"
 msgstr "遞迴地搜尋封面"
 
-#: src/audacious/ui_preferences.c:866
+#: src/audacious/ui_preferences.c:845
 msgid "Search depth: "
 msgstr "搜尋深度:"
 
-#: src/audacious/ui_preferences.c:880
+#: src/audacious/ui_preferences.c:859
 msgid "Use per-file cover"
 msgstr "各檔案使用獨立的封面"
 
-#: src/audacious/ui_preferences.c:883
+#: src/audacious/ui_preferences.c:862
 msgid "Miscellaneous"
 msgstr "雜項"
 
-#: src/audacious/ui_preferences.c:892
+#: src/audacious/ui_preferences.c:871
 msgid "Show Progress bar for the current track"
 msgstr "顯示目前歌曲的進度條"
 
-#: src/audacious/ui_preferences.c:902
+#: src/audacious/ui_preferences.c:881
 msgid "Delay until filepopup comes up: "
 msgstr "顯示彈出式視窗的延遲時間:"
 
-#: src/audacious/ui_preferences.c:1340
+#: src/audacious/ui_preferences.c:1309
 msgid "Custom"
 msgstr "自訂"
 
-#: src/audacious/ui_preferences.c:1383
+#: src/audacious/ui_preferences.c:1352
 msgid "Song Display"
 msgstr "顯示歌曲"
 
-#: src/audacious/ui_preferences.c:1392
+#: src/audacious/ui_preferences.c:1361
 msgid "Show song numbers"
 msgstr "顯示歌曲編號"
 
-#: src/audacious/ui_preferences.c:1403
+#: src/audacious/ui_preferences.c:1372
 msgid "Show leading zeroes (02:00 instead of 2:00)"
 msgstr "顯示開頭的數字零 (例：02:00 而不是 2:00)"
 
-#: src/audacious/ui_preferences.c:1425
+#: src/audacious/ui_preferences.c:1394
 msgid "Show information about titlestring format"
 msgstr "顯示關於標題字串格式的資訊"
 
-#: src/audacious/ui_preferences.c:1441
+#: src/audacious/ui_preferences.c:1410
 msgid "Custom string:"
 msgstr "自訂字串:"
 
-#: src/audacious/ui_preferences.c:1448
+#: src/audacious/ui_preferences.c:1417
 msgid "Title format:"
 msgstr "標題格式:"
 
-#: src/audacious/ui_preferences.c:1459
+#: src/audacious/ui_preferences.c:1428
 msgid "Popup Information"
 msgstr "彈出式資訊視窗"
 
-#: src/audacious/ui_preferences.c:1474
+#: src/audacious/ui_preferences.c:1443
 msgid "Show popup information for playlist entries"
 msgstr "顯示播放清單項目的彈出式資訊視窗"
 
-#: src/audacious/ui_preferences.c:1475
+#: src/audacious/ui_preferences.c:1444
 msgid "Toggles popup information window for the pointed entry in the playlist. The window shows title of song, name of album, genre, year of publish, track number, track length, and artwork."
 msgstr "切換是否顯示彈出式資訊視窗。視窗將會顯示標題、專輯、類型、發行年份、音軌編號、長度和美工等資訊。"
 
-#: src/audacious/ui_preferences.c:1486
+#: src/audacious/ui_preferences.c:1455
 msgid "Edit settings for popup information"
 msgstr "編輯彈出式資訊視窗的設定值"
 
-#: src/audacious/ui_preferences.c:1575
+#: src/audacious/ui_preferences.c:1544
 msgid "Output plugin:"
 msgstr "輸出外掛:"
 
-#: src/audacious/ui_preferences.c:1634
+#: src/audacious/ui_preferences.c:1603
 msgid "Transport"
 msgstr "傳輸"
 
-#: src/audacious/ui_preferences.c:1634
+#: src/audacious/ui_preferences.c:1603
 msgid "Input"
 msgstr "輸入"
 
-#: src/audacious/ui_preferences.c:1635
+#: src/audacious/ui_preferences.c:1604
 msgid "Effect"
 msgstr "特效"
 
-#: src/audacious/ui_preferences.c:1635
+#: src/audacious/ui_preferences.c:1604
 msgid "Visualization"
-msgstr "視覺化"
+msgstr "視覺特效"
 
-#: src/audacious/ui_preferences.c:1635
+#: src/audacious/ui_preferences.c:1604
 msgid "General"
 msgstr "一般"
 
-#: src/audacious/ui_preferences.c:1675
+#: src/audacious/ui_preferences.c:1644
 msgid "Audacious Preferences"
 msgstr "Audacious 偏好設定"
 
-#: src/audacious/util.c:123
+#: src/audacious/util.c:121
 #, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr "無法建立資料夾 (%s): %s\n"
 
-#: src/audtool/handlers_playlist.c:274
+#: src/audtool/handlers_playlist.c:273
 msgid "Position not found."
 msgstr "找不到位址。"
 
-#: src/audtool/handlers_vitals.c:64
+#: src/audtool/handlers_vitals.c:63
 msgid "No song playing."
 msgstr "無播放中歌曲。"
 
-#: src/libaudcore/tuple.c:685
+#: src/libaudcore/audstrings.c:199
+#, c-format
+msgid "Audio CD, track %s"
+msgstr "音樂 CD, 音軌 %s"
+
+#: src/libaudcore/tuple.c:542
 msgid "Mono"
 msgstr "單聲道"
 
-#: src/libaudcore/tuple.c:687
+#: src/libaudcore/tuple.c:544
 msgid "Stereo"
 msgstr "立體聲"
 
-#: src/libaudcore/tuple.c:689
+#: src/libaudcore/tuple.c:546
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d 聲道"
 
+#: src/libaudgui/about.c:52
+#: src/libaudgui/about.c:115
+msgid "Credits"
+msgstr "開發團隊"
+
+#: src/libaudgui/about.c:52
+msgid "Translators"
+msgstr "翻譯人員"
+
+#: src/libaudgui/about.c:91
+msgid "About Audacious"
+msgstr "關於 Audacious"
+
 # msgid_plural "%d channels"
 # msgstr[0] ""
 # msgstr[1] ""
-#: src/libaudgui/confirm.c:78
+#: src/libaudgui/confirm.c:76
 #, c-format
 msgid "Are you sure you want to close %s? If you do, any changes made since the playlist was exported will be lost."
 msgstr "您確定要關閉 %s? 所有未匯出的資料將會遺失。"
 
-#: src/libaudgui/confirm.c:91
+#: src/libaudgui/confirm.c:89
 msgid "_Don't show this message again"
 msgstr "不要再顯示這個訊息(_D)"
 
-#: src/libaudgui/confirm.c:128
+#: src/libaudgui/confirm.c:126
 msgid "Rename Playlist"
 msgstr "重新命名播放清單"
 
-#: src/libaudgui/effects-menu.c:76
+#: src/libaudgui/effects-menu.c:74
 msgid "settings ..."
 msgstr "設定 ..."
 
-#: src/libaudgui/equalizer.c:52
+#: src/libaudgui/equalizer.c:51
 msgid "_Enable"
 msgstr "啟用(_E)"
 
-#: src/libaudgui/equalizer.c:124
+#: src/libaudgui/equalizer.c:123
 msgid "31 Hz"
-msgstr ""
+msgstr "31 Hz"
 
-#: src/libaudgui/equalizer.c:124
+#: src/libaudgui/equalizer.c:123
 msgid "63 Hz"
-msgstr ""
+msgstr "63 Hz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "125 Hz"
-msgstr ""
+msgstr "125 Hz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "250 Hz"
-msgstr ""
+msgstr "250 Hz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "500 Hz"
-msgstr ""
+msgstr "500 Hz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "1 kHz"
-msgstr ""
+msgstr "1 kHz"
 
-#: src/libaudgui/equalizer.c:125
+#: src/libaudgui/equalizer.c:124
 msgid "2 kHz"
-msgstr ""
+msgstr "2 kHz"
 
-#: src/libaudgui/equalizer.c:126
+#: src/libaudgui/equalizer.c:125
 msgid "4 kHz"
-msgstr ""
+msgstr "4 kHz"
 
-#: src/libaudgui/equalizer.c:126
+#: src/libaudgui/equalizer.c:125
 msgid "8 kHz"
-msgstr ""
+msgstr "8 kHz"
 
-#: src/libaudgui/equalizer.c:126
+#: src/libaudgui/equalizer.c:125
 msgid "16 kHz"
-msgstr ""
+msgstr "16 kHz"
 
-#: src/libaudgui/equalizer.c:131
+#: src/libaudgui/equalizer.c:130
 msgid "Equalizer"
 msgstr "等化器"
 
-#: src/libaudgui/equalizer.c:147
+#: src/libaudgui/equalizer.c:146
 msgid "Preamp"
 msgstr "前置放大"
 
-#: src/libaudgui/infopopup.c:211
+#: src/libaudgui/infopopup.c:207
 msgid "Track Number"
 msgstr "音軌編號"
 
-#: src/libaudgui/infopopup.c:213
+#: src/libaudgui/infopopup.c:209
 msgid "Track Length"
 msgstr "音軌長度"
 
-#: src/libaudgui/infowin.c:77
+#: src/libaudgui/infowin.c:75
 msgid "Acid Jazz"
-msgstr ""
+msgstr "迷幻爵士"
 
-#: src/libaudgui/infowin.c:78
+#: src/libaudgui/infowin.c:76
 msgid "Acid Rock"
-msgstr ""
+msgstr "迷幻搖滾"
 
-#: src/libaudgui/infowin.c:79
+#: src/libaudgui/infowin.c:77
 msgid "Ambient"
-msgstr ""
+msgstr "氛圍音樂"
 
-#: src/libaudgui/infowin.c:80
+#: src/libaudgui/infowin.c:78
 msgid "Bebop"
-msgstr ""
+msgstr "Bebop"
 
-#: src/libaudgui/infowin.c:81
+#: src/libaudgui/infowin.c:79
 msgid "Bluegrass"
-msgstr ""
+msgstr "藍草"
 
-#: src/libaudgui/infowin.c:82
+#: src/libaudgui/infowin.c:80
 msgid "Blues"
-msgstr ""
+msgstr "藍調"
 
-#: src/libaudgui/infowin.c:83
+#: src/libaudgui/infowin.c:81
 msgid "Chamber Music"
-msgstr ""
+msgstr "室內樂"
 
-#: src/libaudgui/infowin.c:84
+#: src/libaudgui/infowin.c:82
 msgid "Classical"
-msgstr ""
+msgstr "古典"
 
-#: src/libaudgui/infowin.c:85
+#: src/libaudgui/infowin.c:83
 msgid "Country"
-msgstr ""
+msgstr "鄉村"
 
-#: src/libaudgui/infowin.c:86
+#: src/libaudgui/infowin.c:84
 msgid "Death Metal"
-msgstr ""
+msgstr "死亡金屬"
 
-#: src/libaudgui/infowin.c:87
+#: src/libaudgui/infowin.c:85
 msgid "Disco"
-msgstr ""
+msgstr "迪斯可"
 
-#: src/libaudgui/infowin.c:88
+#: src/libaudgui/infowin.c:86
 msgid "Easy Listening"
-msgstr ""
+msgstr "輕音樂"
 
-#: src/libaudgui/infowin.c:89
+#: src/libaudgui/infowin.c:87
 msgid "Folk"
-msgstr ""
+msgstr "民謠"
 
-#: src/libaudgui/infowin.c:90
+#: src/libaudgui/infowin.c:88
 msgid "Funk"
-msgstr ""
+msgstr "放客"
 
-#: src/libaudgui/infowin.c:91
+#: src/libaudgui/infowin.c:89
 msgid "Gangsta Rap"
-msgstr ""
+msgstr "黑幫說唱"
 
-#: src/libaudgui/infowin.c:92
+#: src/libaudgui/infowin.c:90
 msgid "Gospel"
-msgstr ""
+msgstr "福音音樂"
 
-#: src/libaudgui/infowin.c:93
+#: src/libaudgui/infowin.c:91
 msgid "Grunge"
-msgstr ""
+msgstr "垃圾搖滾"
 
-#: src/libaudgui/infowin.c:94
+#: src/libaudgui/infowin.c:92
 msgid "Hard Rock"
-msgstr ""
+msgstr "硬式搖滾"
 
-#: src/libaudgui/infowin.c:95
+#: src/libaudgui/infowin.c:93
 msgid "Heavy Metal"
-msgstr ""
+msgstr "重金屬"
 
-#: src/libaudgui/infowin.c:96
+#: src/libaudgui/infowin.c:94
 msgid "Hip-hop"
-msgstr ""
+msgstr "嘻哈"
 
-#: src/libaudgui/infowin.c:97
+#: src/libaudgui/infowin.c:95
 msgid "House"
-msgstr ""
+msgstr "House"
 
-#: src/libaudgui/infowin.c:98
+#: src/libaudgui/infowin.c:96
 msgid "Jazz"
-msgstr ""
+msgstr "爵士"
 
-#: src/libaudgui/infowin.c:99
+#: src/libaudgui/infowin.c:97
 msgid "Jungle"
-msgstr ""
+msgstr "叢林"
 
-#: src/libaudgui/infowin.c:100
+#: src/libaudgui/infowin.c:98
 msgid "Metal"
-msgstr ""
+msgstr "金屬"
 
-#: src/libaudgui/infowin.c:101
+#: src/libaudgui/infowin.c:99
 msgid "New Age"
-msgstr ""
+msgstr "新世紀"
 
-#: src/libaudgui/infowin.c:102
+#: src/libaudgui/infowin.c:100
 msgid "New Wave"
-msgstr ""
+msgstr "新浪潮"
 
-#: src/libaudgui/infowin.c:103
+#: src/libaudgui/infowin.c:101
 msgid "Noise"
-msgstr ""
+msgstr "噪音"
 
-#: src/libaudgui/infowin.c:104
+#: src/libaudgui/infowin.c:102
 msgid "Pop"
-msgstr ""
+msgstr "流行"
 
-#: src/libaudgui/infowin.c:105
+#: src/libaudgui/infowin.c:103
 msgid "Punk Rock"
-msgstr ""
+msgstr "龐克搖滾"
 
-#: src/libaudgui/infowin.c:106
+#: src/libaudgui/infowin.c:104
 msgid "Rap"
-msgstr ""
+msgstr "說唱"
 
-#: src/libaudgui/infowin.c:107
+#: src/libaudgui/infowin.c:105
 msgid "Reggae"
-msgstr ""
+msgstr "雷鬼"
 
-#: src/libaudgui/infowin.c:108
+#: src/libaudgui/infowin.c:106
 msgid "Rock"
-msgstr ""
+msgstr "搖滾(Rock)"
 
-#: src/libaudgui/infowin.c:109
+#: src/libaudgui/infowin.c:107
 msgid "Rock and Roll"
-msgstr ""
+msgstr "搖滾(Rock&Roll)"
 
-#: src/libaudgui/infowin.c:110
+#: src/libaudgui/infowin.c:108
 msgid "Rhythm and Blues"
-msgstr ""
+msgstr "R&B"
 
-#: src/libaudgui/infowin.c:111
+#: src/libaudgui/infowin.c:109
 msgid "Ska"
-msgstr ""
+msgstr "Ska"
 
-#: src/libaudgui/infowin.c:112
+#: src/libaudgui/infowin.c:110
 msgid "Soul"
-msgstr ""
+msgstr "靈魂"
 
-#: src/libaudgui/infowin.c:113
+#: src/libaudgui/infowin.c:111
 msgid "Swing"
-msgstr ""
+msgstr "搖擺樂"
 
-#: src/libaudgui/infowin.c:114
+#: src/libaudgui/infowin.c:112
 msgid "Techno"
-msgstr ""
+msgstr "數位"
 
-#: src/libaudgui/infowin.c:115
+#: src/libaudgui/infowin.c:113
 msgid "Trip-hop"
-msgstr ""
+msgstr "迷幻舞曲"
 
-#: src/libaudgui/infowin.c:175
-#: src/libaudgui/infowin.c:361
-#: src/libaudgui/infowin.c:364
-#: src/libaudgui/infowin.c:367
+#: src/libaudgui/infowin.c:177
+#: src/libaudgui/infowin.c:363
+#: src/libaudgui/infowin.c:366
+#: src/libaudgui/infowin.c:369
 msgid "n/a"
-msgstr ""
+msgstr "n/a"
 
-#: src/libaudgui/infowin.c:265
+#: src/libaudgui/infowin.c:267
 msgid "Metadata updated successfully"
 msgstr "成功地更新了詮釋資料"
 
-#: src/libaudgui/infowin.c:270
+#: src/libaudgui/infowin.c:272
 msgid "Metadata updating failed"
 msgstr "詮釋資料更新失敗"
 
-#: src/libaudgui/infowin.c:318
+#: src/libaudgui/infowin.c:320
 msgid "Track Information"
 msgstr "音軌資訊"
 
-#: src/libaudgui/infowin.c:350
+#: src/libaudgui/infowin.c:352
 msgid "Format:"
 msgstr "格式:"
 
-#: src/libaudgui/infowin.c:354
+#: src/libaudgui/infowin.c:356
 msgid "Quality:"
 msgstr "品質:"
 
-#: src/libaudgui/infowin.c:357
+#: src/libaudgui/infowin.c:359
 msgid "Bitrate:"
 msgstr "位元率:"
 
-#: src/libaudgui/infowin.c:387
+#: src/libaudgui/infowin.c:389
 msgid "Title"
 msgstr "標題"
 
-#: src/libaudgui/infowin.c:399
+#: src/libaudgui/infowin.c:401
 msgid "Artist"
 msgstr "藝人"
 
-#: src/libaudgui/infowin.c:411
+#: src/libaudgui/infowin.c:413
 msgid "Album"
 msgstr "專輯"
 
-#: src/libaudgui/infowin.c:423
+#: src/libaudgui/infowin.c:425
 msgid "Comment"
 msgstr "備註"
 
-#: src/libaudgui/infowin.c:435
+#: src/libaudgui/infowin.c:437
 msgid "Genre"
 msgstr "類型"
 
-#: src/libaudgui/infowin.c:456
+#: src/libaudgui/infowin.c:458
 msgid "Year"
 msgstr "年份"
 
-#: src/libaudgui/infowin.c:467
+#: src/libaudgui/infowin.c:469
 msgid "Track Number"
 msgstr "音軌編號"
 
-#: src/libaudgui/infowin.c:549
+#: src/libaudgui/infowin.c:548
 #, c-format
 msgid "%d kb/s"
-msgstr ""
+msgstr "%d kb/s"
 
-#: src/libaudgui/infowin.c:579
+#: src/libaudgui/infowin.c:575
 #, c-format
 msgid "No info available for %s.\n"
 msgstr "無關於 %s 的資訊。\n"
 
-#: src/libaudgui/jump-to-time.c:75
+#: src/libaudgui/jump-to-time.c:72
 msgid "Jump to Time"
 msgstr "跳至時間"
 
-#: src/libaudgui/jump-to-time.c:90
+#: src/libaudgui/jump-to-time.c:87
 msgid "mm:ss"
-msgstr ""
+msgstr "mm:ss"
 
-#: src/libaudgui/playlists.c:39
+#: src/libaudgui/playlists.c:33
 msgid "Export Playlist"
 msgstr "匯出播放清單"
 
-#: src/libaudgui/playlists.c:39
+#: src/libaudgui/playlists.c:33
 msgid "Import Playlist"
 msgstr "匯入播放清單"
 
-#: src/libaudgui/playlists.c:72
+#: src/libaudgui/playlists.c:66
 #, c-format
 msgid "Overwrite %s?"
 msgstr "覆寫 %s?"
 
-#: src/libaudgui/queue-manager.c:185
+#: src/libaudgui/queue-manager.c:196
 msgid "Queue Manager"
 msgstr "佇列管理"
 
-#: src/libaudgui/ui_about.c:69
-msgid "About Audacious"
-msgstr "關於 Audacious"
-
-#: src/libaudgui/ui_about.c:90
-#: src/libaudgui/ui_credits.c:122
-msgid "Credits"
-msgstr "開發團隊"
-
-#: src/libaudgui/ui_credits.c:126
-msgid "Translators"
-msgstr "翻譯人員"
-
 #: src/libaudgui/ui_fileopener.c:109
 msgid "Open Files"
 msgstr "開啟檔案"
@@ -1076,61 +1102,61 @@
 msgid "Close dialog on Add"
 msgstr "加入後關閉對話視窗"
 
-#: src/libaudgui/ui_jumptotrack.c:103
-#: src/libaudgui/ui_jumptotrack.c:111
-#: src/libaudgui/ui_jumptotrack.c:322
+#: src/libaudgui/ui_jumptotrack.c:109
+#: src/libaudgui/ui_jumptotrack.c:117
+#: src/libaudgui/ui_jumptotrack.c:326
 msgid "_Queue"
 msgstr "排入佇列 (_Q)"
 
-#: src/libaudgui/ui_jumptotrack.c:109
+#: src/libaudgui/ui_jumptotrack.c:115
 msgid "Un_queue"
 msgstr "移出佇列 (_q)"
 
-#: src/libaudgui/ui_jumptotrack.c:239
-msgid "Jump to Track"
-msgstr "跳至音軌"
+#: src/libaudgui/ui_jumptotrack.c:258
+msgid "Jump to Song"
+msgstr "跳至歌曲"
 
-#: src/libaudgui/ui_jumptotrack.c:277
+#: src/libaudgui/ui_jumptotrack.c:281
 msgid "Filter: "
 msgstr "過濾器: "
 
-#: src/libaudgui/ui_jumptotrack.c:278
+#: src/libaudgui/ui_jumptotrack.c:282
 msgid "_Filter:"
 msgstr "過濾器(_F):"
 
-#: src/libaudgui/ui_jumptotrack.c:288
+#: src/libaudgui/ui_jumptotrack.c:292
 msgid "Remember"
 msgstr "記住"
 
-#: src/libaudgui/ui_jumptotrack.c:295
+#: src/libaudgui/ui_jumptotrack.c:299
 msgid "Clea_r"
 msgstr "清除(_R)"
 
-#: src/libaudgui/ui_jumptotrack.c:315
+#: src/libaudgui/ui_jumptotrack.c:319
 msgid "Close on Jump"
 msgstr "切換後關閉"
 
-#: src/libaudgui/ui_playlist_manager.c:250
+#: src/libaudgui/ui_playlist_manager.c:253
 msgid "Playlist Manager"
 msgstr "播放清單管理"
 
-#: src/libaudgui/ui_playlist_manager.c:277
+#: src/libaudgui/ui_playlist_manager.c:280
 msgid "Entries"
 msgstr "數量"
 
-#: src/libaudgui/ui_playlist_manager.c:298
+#: src/libaudgui/ui_playlist_manager.c:301
 msgid "_Rename"
 msgstr "重新命名(_R)"
 
-#: src/libaudgui/ui_playlist_manager.c:322
+#: src/libaudgui/ui_playlist_manager.c:325
 msgid "_Close dialog on activating playlist"
 msgstr "啟用播放清單後關閉對話視窗(_C)"
 
-#: src/libaudgui/ui_urlopener.c:51
+#: src/libaudgui/ui_urlopener.c:45
 msgid "Open URL"
 msgstr "開啟 URL"
 
-#: src/libaudgui/ui_urlopener.c:51
+#: src/libaudgui/ui_urlopener.c:45
 msgid "Add URL"
 msgstr "加入 URL"
 
@@ -1146,30 +1172,30 @@
 msgid "File is not a valid .desktop file"
 msgstr "無效的 .desktop 檔案"
 
-#: src/libeggsmclient/eggdesktopfile.c:188
+#: src/libeggsmclient/eggdesktopfile.c:191
 #, c-format
 msgid "Unrecognized desktop file Version '%s'"
 msgstr "無法辨識捷徑版本 '%s'"
 
-#: src/libeggsmclient/eggdesktopfile.c:967
+#: src/libeggsmclient/eggdesktopfile.c:974
 #, c-format
 msgid "Starting %s"
 msgstr "啟動 %s 中"
 
-#: src/libeggsmclient/eggdesktopfile.c:1108
+#: src/libeggsmclient/eggdesktopfile.c:1116
 msgid "Application does not accept documents on command line"
 msgstr "應用程式不接受來自命令列的檔案參數"
 
-#: src/libeggsmclient/eggdesktopfile.c:1176
+#: src/libeggsmclient/eggdesktopfile.c:1184
 #, c-format
 msgid "Unrecognized launch option: %d"
 msgstr "無效的啟動選項: %d"
 
-#: src/libeggsmclient/eggdesktopfile.c:1375
+#: src/libeggsmclient/eggdesktopfile.c:1391
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
 msgstr "無法將檔案的 URI 參數傳給一個類型為連結的捷徑"
 
-#: src/libeggsmclient/eggdesktopfile.c:1396
+#: src/libeggsmclient/eggdesktopfile.c:1412
 msgid "Not a launchable item"
 msgstr "非可執行檔"
 
@@ -1191,7 +1217,7 @@
 
 #: src/libeggsmclient/eggsmclient.c:232
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #: src/libeggsmclient/eggsmclient.c:253
 msgid "Session management options:"

audacious-3.1.1.tar.bz2/src/audacious/Makefile -> audacious-3.2.4.tar.bz2/src/audacious/Makefile Changed

@@ -2,6 +2,7 @@
 
 PROG = audacious${PROG_SUFFIX}
 SRCS = adder.c \
+       art.c \
        chardet.c								\
        config.c \
        credits.c							\
@@ -89,17 +90,16 @@
 include ../../buildsys.mk
 
 ifeq ($(USE_DBUS),yes)
-CPPFLAGS += -I../libaudclient
 DBUS_BINDINGS = dbus-server-bindings.h dbus-client-bindings.h
-LIBS += -L../libaudclient -laudclient
+LIBS := -L../libaudclient -laudclient ${LIBS}
 endif
 
 pre-depend: ${DBUS_BINDINGS}
 
-CPPFLAGS += -std=gnu99 \
-            -DHAVE_CONFIG_H \
-		${MOWGLI_CFLAGS}		\
+CPPFLAGS := -I.. -I../.. \
+            ${CPPFLAGS} \
 		${GLIB_CFLAGS}			\
+		${GMODULE_LIBS} \
 		${GTHREAD_CFLAGS} \
 		${GTK_CFLAGS}			\
 		${AUDACIOUS_DEFINES}	\
@@ -108,24 +108,22 @@
 		${PTHREAD_CFLAGS}		\
 		-D_AUDACIOUS_CORE		\
 		${EGGSM_CFLAGS}			\
-		${LIBGUESS_CFLAGS}		\
-		-I.. -I../..
+		${LIBGUESS_CFLAGS}
 
 # Essential for efficient FFTs. --jlindgren
 CFLAGS += -ffast-math
 
-LIBS += ${LDADD}						\
-        -lm \
-		-L../libaudcore -laudcore	\
-		-L../libaudgui -laudgui \
-		-L../libaudtag -laudtag		\
+LIBS := -L../libaudcore -laudcore \
+        -L../libaudgui -laudgui \
+        -L../libaudtag -laudtag \
+        ${LIBS} -lm \
 		${LIBINTL}						\
 		${EGGSM_LIBS}					\
 		${GLIB_LIBS}					\
+		${GMODULE_LIBS} \
 		${GTHREAD_LIBS} \
 		${GTK_LIBS}						\
 		${DBUS_LIBS}					\
-		${MOWGLI_LIBS}					\
 		${REGEX_LIBS}					\
 		${PTHREAD_LIBS}					\
 		${LIBGUESS_LIBS}

audacious-3.1.1.tar.bz2/src/audacious/adder.c -> audacious-3.2.4.tar.bz2/src/audacious/adder.c Changed

@@ -20,11 +20,14 @@
 */
 
 #include <dirent.h>
+#include <pthread.h>
+#include <string.h>
 #include <sys/stat.h>
 
 #include <gtk/gtk.h>
 
 #include <libaudcore/audstrings.h>
+#include <libaudcore/hook.h>
 
 #include "config.h"
 #include "i18n.h"
@@ -35,33 +38,36 @@
 #include "misc.h"
 
 typedef struct {
- gint playlist_id, at;
- gboolean play;
- struct index * filenames, * tuples;
+ int playlist_id, at;
+ bool_t play;
+ Index * filenames, * tuples;
+ PlaylistFilterFunc filter;
+ void * user;
 } AddTask;
 
 typedef struct {
- gint playlist_id, at;
- gboolean play;
- struct index * filenames, * tuples, * decoders;
+ int playlist_id, at;
+ bool_t play;
+ Index * filenames, * tuples, * decoders;
 } AddResult;
 
 static GList * add_tasks = NULL;
 static GList * add_results = NULL;
+static int current_playlist_id = -1;
 
-static GMutex * mutex;
-static GCond * cond;
-static gboolean add_quit;
-static GThread * add_thread;
-static gint add_source = 0;
+static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
+static bool_t add_quit;
+static pthread_t add_thread;
+static int add_source = 0;
 
-static gint status_source = 0;
-static gchar status_path[512];
-static gint status_count;
+static int status_source = 0;
+static char status_path[512];
+static int status_count;
 static GtkWidget * status_window = NULL, * status_path_label,
 * status_count_label;
 
-static gboolean status_cb (void * unused)
+static bool_t status_cb (void * unused)
 {
 if (! headless && ! status_window)
 {
@@ -76,13 +82,23 @@
 gtk_container_add ((GtkContainer *) status_window, vbox);
 
 status_path_label = gtk_label_new (NULL);
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gtk_label_set_width_chars ((GtkLabel *) status_path_label, 40);
+ gtk_label_set_max_width_chars ((GtkLabel *) status_path_label, 40);
+#else
 gtk_widget_set_size_request (status_path_label, 320, -1);
+#endif
 gtk_label_set_ellipsize ((GtkLabel *) status_path_label,
 PANGO_ELLIPSIZE_MIDDLE);
 gtk_box_pack_start ((GtkBox *) vbox, status_path_label, FALSE, FALSE, 0);
 
 status_count_label = gtk_label_new (NULL);
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gtk_label_set_width_chars ((GtkLabel *) status_count_label, 40);
+ gtk_label_set_max_width_chars ((GtkLabel *) status_count_label, 40);
+#else
 gtk_widget_set_size_request (status_count_label, 320, -1);
+#endif
 gtk_box_pack_start ((GtkBox *) vbox, status_count_label, FALSE, FALSE, 0);
 
 gtk_widget_show_all (status_window);
@@ -91,9 +107,9 @@
 gtk_widget_destroyed, & status_window);
 }
 
- g_mutex_lock (mutex);
+ pthread_mutex_lock (& mutex);
 
- gchar scratch[128];
+ char scratch[128];
 snprintf (scratch, sizeof scratch, dngettext (PACKAGE, "%d file found",
 "%d files found", status_count), status_count);
 
@@ -108,13 +124,13 @@
 gtk_label_set_text ((GtkLabel *) status_count_label, scratch);
 }
 
- g_mutex_unlock (mutex);
+ pthread_mutex_unlock (& mutex);
 return TRUE;
 }
 
-static void status_update (const gchar * filename, gint found)
+static void status_update (const char * filename, int found)
 {
- g_mutex_lock (mutex);
+ pthread_mutex_lock (& mutex);
 
 snprintf (status_path, sizeof status_path, "%s", filename);
 status_count = found;
@@ -122,7 +138,7 @@
 if (! status_source)
 status_source = g_timeout_add (250, status_cb, NULL);
 
- g_mutex_unlock (mutex);
+ pthread_mutex_unlock (& mutex);
 }
 
 static void status_done_locked (void)
@@ -139,41 +155,40 @@
 gtk_widget_destroy (status_window);
 }
 
-static void index_free_filenames (struct index * filenames)
+static void index_free_filenames (Index * filenames)
 {
- gint count = index_count (filenames);
- for (gint i = 0; i < count; i ++)
- {
- gchar * filename = index_get (filenames, i);
- if (filename)
- g_free (filename);
- }
+ int count = index_count (filenames);
+ for (int i = 0; i < count; i ++)
+ str_unref (index_get (filenames, i));
 
 index_free (filenames);
 }
 
-static void index_free_tuples (struct index * tuples)
+static void index_free_tuples (Index * tuples)
 {
- gint count = index_count (tuples);
- for (gint i = 0; i < count; i ++)
+ int count = index_count (tuples);
+ for (int i = 0; i < count; i ++)
 {
 Tuple * tuple = index_get (tuples, i);
 if (tuple)
- tuple_free (tuple);
+ tuple_unref (tuple);
 }
 
 index_free (tuples);
 }
 
-static AddTask * add_task_new (gint playlist_id, gint at, gboolean play,
- struct index * filenames, struct index * tuples)
+static AddTask * add_task_new (int playlist_id, int at, bool_t play,
+ Index * filenames, Index * tuples, PlaylistFilterFunc filter,
+ void * user)
 {
- AddTask * task = g_malloc (sizeof (AddTask));
+ AddTask * task = g_slice_new (AddTask);
 task->playlist_id = playlist_id;
 task->at = at;
 task->play = play;
 task->filenames = filenames;
 task->tuples = tuples;
+ task->filter = filter;
+ task->user = user;
 return task;
 }
 
@@ -184,12 +199,12 @@
 if (task->tuples)
 index_free_tuples (task->tuples);
 
- g_free (task);
+ g_slice_free (AddTask, task);
 }
 
-static AddResult * add_result_new (gint playlist_id, gint at, gboolean play)
+static AddResult * add_result_new (int playlist_id, int at, bool_t play)
 {
- AddResult * result = g_malloc (sizeof (AddResult));
+ AddResult * result = g_slice_new (AddResult);
 result->playlist_id = playlist_id;
 result->at = at;
 result->play = play;
@@ -208,21 +223,27 @@
 if (result->decoders)
 index_free (result->decoders);
 
- g_free (result);
+ g_slice_free (AddResult, result);
 }
 
-static void add_file (gchar * filename, Tuple * tuple, PluginHandle * decoder,
- AddResult * result, gboolean filter)
+static void add_file (char * filename, Tuple * tuple, PluginHandle * decoder,
+ PlaylistFilterFunc filter, void * user, AddResult * result, bool_t validate)
 {
 g_return_if_fail (filename);
+ if (filter && ! filter (filename, user))
+ {
+ str_unref (filename);
+ return;
+ }
+
 status_update (filename, index_count (result->filenames));
 
 if (! tuple && ! decoder)
 {
 decoder = file_find_decoder (filename, TRUE);
- if (filter && ! decoder)
+ if (validate && ! decoder)
 {
- g_free (filename);
+ str_unref (filename);
 return;
 }
 }
@@ -231,17 +252,19 @@
 (filename, '?'))
 tuple = file_read_tuple (filename, decoder);
 
- if (tuple && tuple->nsubtunes > 0)
+ int n_subtunes = tuple ? tuple_get_n_subtunes (tuple) : 0;
+
+ if (n_subtunes)
 {
- for (gint sub = 0; sub < tuple->nsubtunes; sub ++)
+ for (int sub = 0; sub < n_subtunes; sub ++)
 {
- gchar * subname = g_strdup_printf ("%s?%d", filename, tuple->subtunes ?
- tuple->subtunes[sub] : 1 + sub);
- add_file (subname, NULL, decoder, result, FALSE);
+ char * subname = str_printf ("%s?%d", filename,
+ tuple_get_nth_subtune (tuple, sub));
+ add_file (subname, NULL, decoder, filter, user, result, FALSE);
 }
 
- g_free (filename);
- tuple_free (tuple);
+ str_unref (filename);
+ tuple_unref (tuple);
 return;
 }
 
@@ -250,13 +273,25 @@
 index_append (result->decoders, decoder);
 }
 
-static void add_folder (gchar * filename, AddResult * result)
+static void add_folder (char * filename, PlaylistFilterFunc filter,
+ void * user, AddResult * result)
 {
 g_return_if_fail (filename);
+ if (filter && ! filter (filename, user))
+ {
+ str_unref (filename);
+ return;
+ }
+
 status_update (filename, index_count (result->filenames));
 
- gchar * unix_name = uri_to_filename (filename);
- g_return_if_fail (unix_name);
+ char * unix_name = uri_to_filename (filename);
+ if (! unix_name)
+ {
+ str_unref (filename);
+ return;
+ }
+
 if (unix_name[strlen (unix_name) - 1] == '/')
 unix_name[strlen (unix_name) - 1] = 0;
 
@@ -284,13 +319,21 @@
 
 if (S_ISREG (info.st_mode))
 {
- gchar * item_name = filename_to_uri (files->data);
- add_file (item_name, NULL, NULL, result, TRUE);
+ char * item_name = filename_to_uri (files->data);
+ if (item_name)
+ {
+ add_file (str_get (item_name), NULL, NULL, filter, user, result, TRUE);
+ g_free (item_name);
+ }
 }
 else if (S_ISDIR (info.st_mode))
 {
- gchar * item_name = filename_to_uri (files->data);
- add_folder (item_name, result);
+ char * item_name = filename_to_uri (files->data);
+ if (item_name)
+ {
+ add_folder (str_get (item_name), filter, user, result);
+ g_free (item_name);
+ }
 }
 
 NEXT:
@@ -299,64 +342,71 @@
 }
 
 FREE:
- g_free (filename);
+ str_unref (filename);
 g_free (unix_name);
 }
 
-static void add_playlist (gchar * filename, AddResult * result)
+static void add_playlist (char * filename, PlaylistFilterFunc filter,
+ void * user, AddResult * result)
 {
 g_return_if_fail (filename);
+ if (filter && ! filter (filename, user))
+ {
+ str_unref (filename);
+ return;
+ }
+
 status_update (filename, index_count (result->filenames));
 
- gchar * title = NULL;
- struct index * filenames, * tuples;
+ char * title = NULL;
+ Index * filenames, * tuples;
 if (! playlist_load (filename, & title, & filenames, & tuples))
 {
- g_free (filename);
+ str_unref (filename);
 return;
 }
 
- gint count = index_count (filenames);
- for (gint i = 0; i < count; i ++)
+ int count = index_count (filenames);
+ for (int i = 0; i < count; i ++)
 add_file (index_get (filenames, i), tuples ? index_get (tuples, i) :
- NULL, NULL, result, FALSE);
+ NULL, NULL, filter, user, result, FALSE);
 
- g_free (filename);
- g_free (title);
+ str_unref (filename);
+ str_unref (title);
 index_free (filenames);
 if (tuples)
 index_free (tuples);
 }
 
-static void add_generic (gchar * filename, Tuple * tuple, AddResult * result,
- gboolean filter)
+static void add_generic (char * filename, Tuple * tuple,
+ PlaylistFilterFunc filter, void * user, AddResult * result)
 {
 g_return_if_fail (filename);
 
 if (tuple)
- add_file (filename, tuple, NULL, result, filter);
+ add_file (filename, tuple, NULL, filter, user, result, FALSE);
 else if (vfs_file_test (filename, G_FILE_TEST_IS_DIR))
- add_folder (filename, result);
+ add_folder (filename, filter, user, result);
 else if (filename_is_playlist (filename))
- add_playlist (filename, result);
+ add_playlist (filename, filter, user, result);
 else
- add_file (filename, NULL, NULL, result, filter);
+ add_file (filename, NULL, NULL, filter, user, result, FALSE);
 }
 
-static gboolean add_finish (void * unused)
+static bool_t add_finish (void * unused)
 {
- g_mutex_lock (mutex);
+ pthread_mutex_lock (& mutex);
 
 while (add_results)
 {
 AddResult * result = add_results->data;
 add_results = g_list_delete_link (add_results, add_results);
 
- gint playlist = playlist_by_unique_id (result->playlist_id);
+ int playlist = playlist_by_unique_id (result->playlist_id);
 if (playlist < 0) /* playlist deleted */
 goto FREE;
 
- gint count = playlist_entry_count (playlist);
+ int count = playlist_entry_count (playlist);
 if (result->at < 0 || result->at > count)
 result->at = count;
 
@@ -388,39 +438,43 @@
 if (! add_tasks)
 status_done_locked ();
 
- g_mutex_unlock (mutex);
+ pthread_mutex_unlock (& mutex);
+
+ hook_call ("playlist add complete", NULL);
 return FALSE;
 }
 
 static void * add_worker (void * unused)
 {
- g_mutex_lock (mutex);
- g_cond_broadcast (cond);
+ pthread_mutex_lock (& mutex);
 
 while (! add_quit)
 {
 if (! add_tasks)
 {
- g_cond_wait (cond, mutex);
+ pthread_cond_wait (& cond, & mutex);
 continue;
 }
 
 AddTask * task = add_tasks->data;
 add_tasks = g_list_delete_link (add_tasks, add_tasks);
 
- g_mutex_unlock (mutex);
+ current_playlist_id = task->playlist_id;
+ pthread_mutex_unlock (& mutex);
 
 AddResult * result = add_result_new (task->playlist_id, task->at,
 task->play);
 
- gint count = index_count (task->filenames);
+ int count = index_count (task->filenames);
 if (task->tuples)
 count = MIN (count, index_count (task->tuples));
 
- for (gint i = 0; i < count; i ++)
+ for (int i = 0; i < count; i ++)
 {
 add_generic (index_get (task->filenames, i), task->tuples ?
- index_get (task->tuples, i) : NULL, result, FALSE);
+ index_get (task->tuples, i) : NULL, task->filter, task->user,
+ result);
+
 index_set (task->filenames, i, NULL);
 if (task->tuples)
 index_set (task->tuples, i, NULL);
@@ -428,7 +482,8 @@
 
 add_task_free (task);
 
- g_mutex_lock (mutex);
+ pthread_mutex_lock (& mutex);
+ current_playlist_id = -1;
 
 add_results = g_list_append (add_results, result);
 
@@ -436,30 +491,25 @@
 add_source = g_timeout_add (0, add_finish, NULL);
 }
 
- g_mutex_unlock (mutex);
+ pthread_mutex_unlock (& mutex);
 return NULL;
 }
 
 void adder_init (void)
 {
- mutex = g_mutex_new ();
- cond = g_cond_new ();
- g_mutex_lock (mutex);
+ pthread_mutex_lock (& mutex);
 add_quit = FALSE;
- add_thread = g_thread_create (add_worker, NULL, TRUE, NULL);
- g_cond_wait (cond, mutex);
- g_mutex_unlock (mutex);
+ pthread_create (& add_thread, NULL, add_worker, NULL);
+ pthread_mutex_unlock (& mutex);
 }
 
 void adder_cleanup (void)
 {
- g_mutex_lock (mutex);
+ pthread_mutex_lock (& mutex);
 add_quit = TRUE;
- g_cond_broadcast (cond);
- g_mutex_unlock (mutex);
- g_thread_join (add_thread);
- g_mutex_free (mutex);
- g_cond_free (cond);
+ pthread_cond_broadcast (& cond);
+ pthread_mutex_unlock (& mutex);
+ pthread_join (add_thread, NULL);
 
 if (add_source)
 {
@@ -470,27 +520,64 @@
 status_done_locked ();
 }
 
-void playlist_entry_insert (gint playlist, gint at, gchar * filename,
- Tuple * tuple, gboolean play)
+void playlist_entry_insert (int playlist, int at, const char * filename,
+ Tuple * tuple, bool_t play)
 {
- struct index * filenames = index_new ();
- struct index * tuples = index_new ();
- index_append (filenames, filename);
+ Index * filenames = index_new ();
+ Index * tuples = index_new ();
+ index_append (filenames, str_get (filename));
 index_append (tuples, tuple);
 
 playlist_entry_insert_batch (playlist, at, filenames, tuples, play);
 }
 
-void playlist_entry_insert_batch (gint playlist, gint at,
- struct index * filenames, struct index * tuples, gboolean play)
+void playlist_entry_insert_batch (int playlist, int at,
+ Index * filenames, Index * tuples, bool_t play)
 {
- gint playlist_id = playlist_get_unique_id (playlist);
+ playlist_entry_insert_filtered (playlist, at, filenames, tuples, NULL, NULL, play);
+}
+
+void playlist_entry_insert_filtered (int playlist, int at,
+ Index * filenames, Index * tuples, PlaylistFilterFunc filter,
+ void * user, bool_t play)
+{
+ int playlist_id = playlist_get_unique_id (playlist);
 g_return_if_fail (playlist_id >= 0);
 
- AddTask * task = add_task_new (playlist_id, at, play, filenames, tuples);
+ AddTask * task = add_task_new (playlist_id, at, play, filenames, tuples, filter, user);
 
- g_mutex_lock (mutex);
+ pthread_mutex_lock (& mutex);
 add_tasks = g_list_append (add_tasks, task);
- g_cond_broadcast (cond);
- g_mutex_unlock (mutex);
+ pthread_cond_broadcast (& cond);
+ pthread_mutex_unlock (& mutex);
+}
+
+bool_t playlist_add_in_progress (int playlist)
+{
+ int playlist_id = playlist_get_unique_id (playlist);
+ g_return_val_if_fail (playlist_id >= 0, FALSE);
+
+ pthread_mutex_lock (& mutex);
+
+ for (GList * node = add_tasks; node; node = node->next)
+ {
+ if (((AddTask *) node->data)->playlist_id == playlist_id)
+ goto YES;
+ }
+
+ if (current_playlist_id == playlist_id)
+ goto YES;
+
+ for (GList * node = add_results; node; node = node->next)
+ {
+ if (((AddResult *) node->data)->playlist_id == playlist_id)
+ goto YES;
+ }
+
+ pthread_mutex_unlock (& mutex);
+ return FALSE;
+
+YES:
+ pthread_mutex_unlock (& mutex);
+ return TRUE;
 }

audacious-3.1.1.tar.bz2/src/audacious/api-alias-begin.h -> audacious-3.2.4.tar.bz2/src/audacious/api-alias-begin.h Changed

@@ -34,3 +34,15 @@
 #define AUD_FUNC4(t,n,t1,n1,t2,n2,t3,n3,t4,n4) static inline t aud_##n(t1 n1, t2 n2, t3 n3, t4 n4) {return _aud_api_table->AUD_API_SYMBOL->n(n1,n2,n3,n4);}
 #define AUD_FUNC5(t,n,t1,n1,t2,n2,t3,n3,t4,n4,t5,n5) static inline t aud_##n(t1 n1, t2 n2, t3 n3, t4 n4, t5 n5) {return _aud_api_table->AUD_API_SYMBOL->n(n1,n2,n3,n4,n5);}
 #define AUD_FUNC6(t,n,t1,n1,t2,n2,t3,n3,t4,n4,t5,n5,t6,n6) static inline t aud_##n(t1 n1, t2 n2, t3 n3, t4 n4, t5 n5, t6 n6) {return _aud_api_table->AUD_API_SYMBOL->n(n1,n2,n3,n4,n5,n6);}
+#define AUD_FUNC7(t,n,t1,n1,t2,n2,t3,n3,t4,n4,t5,n5,t6,n6,t7,n7) static inline t aud_##n(t1 n1, t2 n2, t3 n3, t4 n4, t5 n5, t6 n6, t7 n7) {return _aud_api_table->AUD_API_SYMBOL->n(n1,n2,n3,n4,n5,n6,n7);}
+#define AUD_FUNC8(t,n,t1,n1,t2,n2,t3,n3,t4,n4,t5,n5,t6,n6,t7,n7,t8,n8) static inline t aud_##n(t1 n1, t2 n2, t3 n3, t4 n4, t5 n5, t6 n6, t7 n7, t8 n8) {return _aud_api_table->AUD_API_SYMBOL->n(n1,n2,n3,n4,n5,n6,n7,n8);}
+
+#define AUD_VFUNC0(n) static inline void aud_##n(void) {_aud_api_table->AUD_API_SYMBOL->n();}
+#define AUD_VFUNC1(n,t1,n1) static inline void aud_##n(t1 n1) {_aud_api_table->AUD_API_SYMBOL->n(n1);}
+#define AUD_VFUNC2(n,t1,n1,t2,n2) static inline void aud_##n(t1 n1, t2 n2) {_aud_api_table->AUD_API_SYMBOL->n(n1,n2);}
+#define AUD_VFUNC3(n,t1,n1,t2,n2,t3,n3) static inline void aud_##n(t1 n1, t2 n2, t3 n3) {_aud_api_table->AUD_API_SYMBOL->n(n1,n2,n3);}
+#define AUD_VFUNC4(n,t1,n1,t2,n2,t3,n3,t4,n4) static inline void aud_##n(t1 n1, t2 n2, t3 n3, t4 n4) {_aud_api_table->AUD_API_SYMBOL->n(n1,n2,n3,n4);}
+#define AUD_VFUNC5(n,t1,n1,t2,n2,t3,n3,t4,n4,t5,n5) static inline void aud_##n(t1 n1, t2 n2, t3 n3, t4 n4, t5 n5) {_aud_api_table->AUD_API_SYMBOL->n(n1,n2,n3,n4,n5);}
+#define AUD_VFUNC6(n,t1,n1,t2,n2,t3,n3,t4,n4,t5,n5,t6,n6) static inline void aud_##n(t1 n1, t2 n2, t3 n3, t4 n4, t5 n5, t6 n6) {_aud_api_table->AUD_API_SYMBOL->n(n1,n2,n3,n4,n5,n6);}
+#define AUD_VFUNC7(n,t1,n1,t2,n2,t3,n3,t4,n4,t5,n5,t6,n6,t7,n7) static inline void aud_##n(t1 n1, t2 n2, t3 n3, t4 n4, t5 n5, t6 n6, t7 n7) {_aud_api_table->AUD_API_SYMBOL->n(n1,n2,n3,n4,n5,n6,n7);}
+#define AUD_VFUNC8(n,t1,n1,t2,n2,t3,n3,t4,n4,t5,n5,t6,n6,t7,n7,t8,n8) static inline void aud_##n(t1 n1, t2 n2, t3 n3, t4 n4, t5 n5, t6 n6, t7 n7, t8 n8) {_aud_api_table->AUD_API_SYMBOL->n(n1,n2,n3,n4,n5,n6,n7,n8);}

audacious-3.1.1.tar.bz2/src/audacious/api-alias-end.h -> audacious-3.2.4.tar.bz2/src/audacious/api-alias-end.h Changed

audacious-3.1.1.tar.bz2/src/audacious/api-declare-begin.h -> audacious-3.2.4.tar.bz2/src/audacious/api-declare-begin.h Changed

audacious-3.1.1.tar.bz2/src/audacious/api-declare-end.h -> audacious-3.2.4.tar.bz2/src/audacious/api-declare-end.h Changed

audacious-3.1.1.tar.bz2/src/audacious/api-define-begin.h -> audacious-3.2.4.tar.bz2/src/audacious/api-define-begin.h Changed

@@ -32,5 +32,17 @@
 #define AUD_FUNC4(t,n,t1,n1,t2,n2,t3,n3,t4,n4) t (* n) (t1 n1, t2 n2, t3 n3, t4 n4);
 #define AUD_FUNC5(t,n,t1,n1,t2,n2,t3,n3,t4,n4,t5,n5) t (* n) (t1 n1, t2 n2, t3 n3, t4 n4, t5 n5);
 #define AUD_FUNC6(t,n,t1,n1,t2,n2,t3,n3,t4,n4,t5,n5,t6,n6) t (* n) (t1 n1, t2 n2, t3 n3, t4 n4, t5 n5, t6 n6);
+#define AUD_FUNC7(t,n,t1,n1,t2,n2,t3,n3,t4,n4,t5,n5,t6,n6,t7,n7) t (* n) (t1 n1, t2 n2, t3 n3, t4 n4, t5 n5, t6 n6, t7 n7);
+#define AUD_FUNC8(t,n,t1,n1,t2,n2,t3,n3,t4,n4,t5,n5,t6,n6,t7,n7,t8,n8) t (* n) (t1 n1, t2 n2, t3 n3, t4 n4, t5 n5, t6 n6, t7 n7, t8 n8);
+
+#define AUD_VFUNC0(n) void (* n) (void);
+#define AUD_VFUNC1(n,t1,n1) void (* n) (t1 n1);
+#define AUD_VFUNC2(n,t1,n1,t2,n2) void (* n) (t1 n1, t2 n2);
+#define AUD_VFUNC3(n,t1,n1,t2,n2,t3,n3) void (* n) (t1 n1, t2 n2, t3 n3);
+#define AUD_VFUNC4(n,t1,n1,t2,n2,t3,n3,t4,n4) void (* n) (t1 n1, t2 n2, t3 n3, t4 n4);
+#define AUD_VFUNC5(n,t1,n1,t2,n2,t3,n3,t4,n4,t5,n5) void (* n) (t1 n1, t2 n2, t3 n3, t4 n4, t5 n5);
+#define AUD_VFUNC6(n,t1,n1,t2,n2,t3,n3,t4,n4,t5,n5,t6,n6) void (* n) (t1 n1, t2 n2, t3 n3, t4 n4, t5 n5, t6 n6);
+#define AUD_VFUNC7(n,t1,n1,t2,n2,t3,n3,t4,n4,t5,n5,t6,n6,t7,n7) void (* n) (t1 n1, t2 n2, t3 n3, t4 n4, t5 n5, t6 n6, t7 n7);
+#define AUD_VFUNC8(n,t1,n1,t2,n2,t3,n3,t4,n4,t5,n5,t6,n6,t7,n7,t8,n8) void (* n) (t1 n1, t2 n2, t3 n3, t4 n4, t5 n5, t6 n6, t7 n7, t8 n8);
 
 struct AUD_API_NAME {

audacious-3.1.1.tar.bz2/src/audacious/api-define-end.h -> audacious-3.2.4.tar.bz2/src/audacious/api-define-end.h Changed

audacious-3.1.1.tar.bz2/src/audacious/api-local-begin.h -> audacious-3.2.4.tar.bz2/src/audacious/api-local-begin.h Changed

@@ -32,3 +32,15 @@
 #define AUD_FUNC4(t,n,t1,n1,t2,n2,t3,n3,t4,n4) t n (t1 n1, t2 n2, t3 n3, t4 n4);
 #define AUD_FUNC5(t,n,t1,n1,t2,n2,t3,n3,t4,n4,t5,n5) t n (t1 n1, t2 n2, t3 n3, t4 n4, t5 n5);
 #define AUD_FUNC6(t,n,t1,n1,t2,n2,t3,n3,t4,n4,t5,n5,t6,n6) t n (t1 n1, t2 n2, t3 n3, t4 n4, t5 n5, t6 n6);
+#define AUD_FUNC7(t,n,t1,n1,t2,n2,t3,n3,t4,n4,t5,n5,t6,n6,t7,n7) t n (t1 n1, t2 n2, t3 n3, t4 n4, t5 n5, t6 n6, t7 n7);
+#define AUD_FUNC8(t,n,t1,n1,t2,n2,t3,n3,t4,n4,t5,n5,t6,n6,t7,n7,t8,n8) t n (t1 n1, t2 n2, t3 n3, t4 n4, t5 n5, t6 n6, t7 n7, t8 n8);
+
+#define AUD_VFUNC0(n) void n (void);
+#define AUD_VFUNC1(n,t1,n1) void n (t1 n1);
+#define AUD_VFUNC2(n,t1,n1,t2,n2) void n (t1 n1, t2 n2);
+#define AUD_VFUNC3(n,t1,n1,t2,n2,t3,n3) void n (t1 n1, t2 n2, t3 n3);
+#define AUD_VFUNC4(n,t1,n1,t2,n2,t3,n3,t4,n4) void n (t1 n1, t2 n2, t3 n3, t4 n4);
+#define AUD_VFUNC5(n,t1,n1,t2,n2,t3,n3,t4,n4,t5,n5) void n (t1 n1, t2 n2, t3 n3, t4 n4, t5 n5);
+#define AUD_VFUNC6(n,t1,n1,t2,n2,t3,n3,t4,n4,t5,n5,t6,n6) void n (t1 n1, t2 n2, t3 n3, t4 n4, t5 n5, t6 n6);
+#define AUD_VFUNC7(n,t1,n1,t2,n2,t3,n3,t4,n4,t5,n5,t6,n6,t7,n7) void n (t1 n1, t2 n2, t3 n3, t4 n4, t5 n5, t6 n6, t7 n7);
+#define AUD_VFUNC8(n,t1,n1,t2,n2,t3,n3,t4,n4,t5,n5,t6,n6,t7,n7,t8,n8) void n (t1 n1, t2 n2, t3 n3, t4 n4, t5 n5, t6 n6, t7 n7, t8 n8);

audacious-3.1.1.tar.bz2/src/audacious/api-local-end.h -> audacious-3.2.4.tar.bz2/src/audacious/api-local-end.h Changed

audacious-3.2.4.tar.bz2/src/audacious/art.c Added

@@ -0,0 +1,243 @@
+/*
+ * art.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 <errno.h>
+#include <glib.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <libaudcore/audstrings.h>
+#include <libaudcore/hook.h>
+
+#include "main.h"
+#include "misc.h"
+#include "playlist.h"
+#include "util.h"
+
+typedef struct {
+ char * song_file; /* pooled */
+ int refcount;
+
+ /* album art as JPEG or PNG data */
+ void * data;
+ int64_t len;
+
+ /* album art as (possibly a temporary) file */
+ char * art_file;
+ bool_t is_temp;
+} ArtItem;
+
+static GHashTable * art_items;
+static char * current_file; /* pooled */
+
+static void art_item_free (ArtItem * item)
+{
+ /* delete temporary file */
+ if (item->art_file && item->is_temp)
+ {
+ char * unixname = uri_to_filename (item->art_file);
+ if (unixname)
+ {
+ unlink (unixname);
+ g_free (unixname);
+ }
+ }
+
+ str_unref (item->song_file);
+ g_free (item->data);
+ g_free (item->art_file);
+ g_slice_free (ArtItem, item);
+}
+
+static ArtItem * art_item_new (const char * file)
+{
+ /* local files only */
+ if (strncmp (file, "file://", 7))
+ return NULL;
+
+ ArtItem * item = g_slice_new0 (ArtItem);
+ item->song_file = str_get (file);
+
+ /* try to load embedded album art */
+ PluginHandle * decoder = file_find_decoder (file, FALSE);
+ if (decoder)
+ file_read_image (file, decoder, & item->data, & item->len);
+
+ if (item->data)
+ return item;
+
+ /* try to find external image file */
+ char * unixname = get_associated_image_file (file);
+ if (unixname)
+ {
+ item->art_file = filename_to_uri (unixname);
+ g_free (unixname);
+ }
+
+ if (item->art_file)
+ return item;
+
+ /* failed */
+ art_item_free (item);
+ return NULL;
+}
+
+static ArtItem * art_item_get (const char * file)
+{
+ if (! art_items)
+ art_items = g_hash_table_new_full (g_str_hash, g_str_equal,
+ NULL, (GDestroyNotify) art_item_free);
+
+ ArtItem * item = g_hash_table_lookup (art_items, file);
+ if (item)
+ {
+ item->refcount ++;
+ return item;
+ }
+
+ item = art_item_new (file);
+ if (! item)
+ return NULL;
+
+ g_hash_table_insert (art_items, item->song_file, item);
+ item->refcount = 1;
+ return item;
+}
+
+static void art_item_unref (ArtItem * item)
+{
+ if (! -- item->refcount)
+ {
+ /* keep album art for current entry */
+ if (current_file && ! strcmp (current_file, item->song_file))
+ return;
+
+ g_hash_table_remove (art_items, item->song_file);
+ }
+}
+
+static void release_current (void)
+{
+ if (! art_items || ! current_file)
+ return;
+
+ /* free album art for previous entry */
+ ArtItem * item = g_hash_table_lookup (art_items, current_file);
+ if (item && ! item->refcount)
+ g_hash_table_remove (art_items, current_file);
+}
+
+static void position_hook (void * data, void * user)
+{
+ release_current ();
+ str_unref (current_file);
+
+ int list = playlist_get_playing ();
+ int entry = (list >= 0) ? playlist_get_position (list) : -1;
+ current_file = (entry >= 0) ? playlist_entry_get_filename (list, entry) : NULL;
+}
+
+void art_init (void)
+{
+ hook_associate ("playlist position", position_hook, NULL);
+ hook_associate ("playlist set playing", position_hook, NULL);
+}
+
+void art_cleanup (void)
+{
+ hook_dissociate ("playlist position", position_hook);
+ hook_dissociate ("playlist set playing", position_hook);
+
+ release_current ();
+ str_unref (current_file);
+ current_file = NULL;
+
+ if (art_items && g_hash_table_size (art_items))
+ {
+ fprintf (stderr, "Album art not freed\n");
+ abort ();
+ }
+
+ if (art_items)
+ {
+ g_hash_table_destroy (art_items);
+ art_items = NULL;
+ }
+}
+
+void art_get_data (const char * file, const void * * data, int64_t * len)
+{
+ * data = NULL;
+ * len = 0;
+
+ ArtItem * item = art_item_get (file);
+ if (! item)
+ return;
+
+ /* load data from external image file */
+ if (! item->data && item->art_file)
+ vfs_file_get_contents (item->art_file, & item->data, & item->len);
+
+ if (! item->data)
+ {
+ art_item_unref (item);
+ return;
+ }
+
+ * data = item->data;
+ * len = item->len;
+}
+
+const char * art_get_file (const char * file)
+{
+ ArtItem * item = art_item_get (file);
+ if (! item)
+ return NULL;
+
+ /* save data to temporary file */
+ if (item->data && ! item->art_file)
+ {
+ char * unixname = write_temp_file (item->data, item->len);
+ if (unixname)
+ {
+ item->art_file = filename_to_uri (unixname);
+ item->is_temp = TRUE;
+ g_free (unixname);
+ }
+ }
+
+ if (! item->art_file)
+ {
+ art_item_unref (item);
+ return NULL;
+ }
+
+ return item->art_file;
+}
+
+void art_unref (const char * file)
+{
+ ArtItem * item = art_items ? g_hash_table_lookup (art_items, file) : NULL;
+ if (item)
+ art_item_unref (item);
+}

audacious-3.1.1.tar.bz2/src/audacious/chardet.c -> audacious-3.2.4.tar.bz2/src/audacious/chardet.c Changed

@@ -17,6 +17,7 @@
 * Audacious or using our public API to be a derived work.
 */
 
+#include <glib.h>
 #include <string.h>
 #include <libaudcore/audstrings.h>
 
@@ -30,14 +31,14 @@
 # include <libguess.h>
 #endif
 
-static gchar * cd_chardet_to_utf8 (const gchar * str, gssize len,
- gsize * arg_bytes_read, gsize * arg_bytes_write, GError ** error);
+static char * cd_chardet_to_utf8 (const char * str, int len,
+ int * arg_bytes_read, int * arg_bytes_written);
 
-static gchar * str_to_utf8_fallback (const gchar * str)
+static char * str_to_utf8_fallback (const char * str)
 {
- gchar * out = g_strconcat (str, _(" (invalid UTF-8)"), NULL);
+ char * out = g_strconcat (str, _(" (invalid UTF-8)"), NULL);
 
- for (gchar * c = out; * c; c ++)
+ for (char * c = out; * c; c ++)
 {
 if (* c & 0x80)
 * c = '?';
@@ -46,9 +47,9 @@
 return out;
 }
 
-static gchar * cd_str_to_utf8 (const gchar * str)
+static char * cd_str_to_utf8 (const char * str)
 {
- gchar *out_str;
+ char *out_str;
 
 if (str == NULL)
 return NULL;
@@ -85,22 +86,19 @@
 #endif
 
 /* chardet encoding detector */
- if ((out_str = cd_chardet_to_utf8(str, strlen(str), NULL, NULL, NULL)) != NULL)
+ if ((out_str = cd_chardet_to_utf8 (str, strlen (str), NULL, NULL)))
 return out_str;
 
 /* all else fails, we mask off character codes >= 128, replace with '?' */
 return str_to_utf8_fallback(str);
 }
 
-static gchar * cd_chardet_to_utf8 (const gchar * str, gssize len,
- gsize * arg_bytes_read, gsize * arg_bytes_write, GError ** error)
+static char * cd_chardet_to_utf8 (const char * str, int len,
+ int * arg_bytes_read, int * arg_bytes_write)
 {
- if (error)
- * error = NULL;
-
- gchar *ret = NULL;
- gsize *bytes_read, *bytes_write;
- gsize my_bytes_read, my_bytes_write;
+ char *ret = NULL;
+ int * bytes_read, * bytes_write;
+ int my_bytes_read, my_bytes_write;
 
 bytes_read = arg_bytes_read != NULL ? arg_bytes_read : &my_bytes_read;
 bytes_write = arg_bytes_write != NULL ? arg_bytes_write : &my_bytes_write;
@@ -129,16 +127,20 @@
 }
 
 #ifdef USE_CHARDET
- gchar * det = get_string (NULL, "chardet_detector");
+ char * det = get_string (NULL, "chardet_detector");
 
 if (det[0])
 {
 AUDDBG("guess encoding (%s) %s\n", det, str);
- const gchar * encoding = libguess_determine_encoding (str, len, det);
+ const char * encoding = libguess_determine_encoding (str, len, det);
 AUDDBG("encoding = %s\n", encoding);
 if (encoding)
- ret = g_convert (str, len, "UTF-8", encoding, bytes_read,
- bytes_write, (error && * error) ? NULL : error);
+ {
+ gsize read_gsize = 0, written_gsize = 0;
+ ret = g_convert (str, len, "UTF-8", encoding, & read_gsize, & written_gsize, NULL);
+ * bytes_read = read_gsize;
+ * bytes_write = written_gsize;
+ }
 }
 
 g_free (det);
@@ -147,13 +149,16 @@
 /* If detection failed or was not enabled, try fallbacks (if there are any) */
 if (! ret)
 {
- gchar * fallbacks = get_string (NULL, "chardet_fallback");
- gchar * * split = g_strsplit_set (fallbacks, " ,:;|/", -1);
+ char * fallbacks = get_string (NULL, "chardet_fallback");
+ char * * split = g_strsplit_set (fallbacks, " ,:;|/", -1);
 
- for (gchar * * enc = split; * enc; enc ++)
+ for (char * * enc = split; * enc; enc ++)
 {
- ret = g_convert (str, len, "UTF-8", * enc, bytes_read, bytes_write,
- (error && * error) ? NULL : error);
+ gsize read_gsize = 0, written_gsize = 0;
+ ret = g_convert (str, len, "UTF-8", * enc, & read_gsize, & written_gsize, NULL);
+ * bytes_read = read_gsize;
+ * bytes_write = written_gsize;
+
 if (len == *bytes_read)
 break;
 else {
@@ -168,13 +173,21 @@
 
 /* First fallback: locale (duh!) */
 if (ret == NULL)
- ret = g_locale_to_utf8 (str, len, bytes_read, bytes_write,
- (error && * error) ? NULL : error);
+ {
+ gsize read_gsize = 0, written_gsize = 0;
+ ret = g_locale_to_utf8 (str, len, & read_gsize, & written_gsize, NULL);
+ * bytes_read = read_gsize;
+ * bytes_write = written_gsize;
+ }
 
 /* The final fallback is ISO-8859-1, if no other is specified or conversions fail */
 if (ret == NULL)
- ret = g_convert (str, len, "UTF-8", "ISO-8859-1", bytes_read,
- bytes_write, (error && * error) ? NULL : error);
+ {
+ gsize read_gsize = 0, written_gsize = 0;
+ ret = g_convert (str, len, "UTF-8", "ISO-8859-1", & read_gsize, & written_gsize, NULL);
+ * bytes_read = read_gsize;
+ * bytes_write = written_gsize;
+ }
 
 if (ret != NULL)
 {
@@ -193,5 +206,8 @@
 
 void chardet_init (void)
 {
+#ifdef USE_CHARDET
+ libguess_determine_encoding(NULL, -1, "");
+#endif
 str_set_utf8_impl (cd_str_to_utf8, cd_chardet_to_utf8);
 }

audacious-3.1.1.tar.bz2/src/audacious/config.c -> audacious-3.2.4.tar.bz2/src/audacious/config.c Changed

@@ -20,23 +20,24 @@
 */
 
 #include <glib.h>
+#include <pthread.h>
 #include <stdio.h>
+#include <string.h>
 
 #include <libaudcore/audstrings.h>
-#include <libaudcore/eventqueue.h>
-#include <libaudcore/stringpool.h>
+#include <libaudcore/hook.h>
 
 #include "main.h"
 #include "misc.h"
 
 #define DEFAULT_SECTION "audacious"
 
-static const gchar * const core_defaults[] = {
+static const char * const core_defaults[] = {
 
 /* general */
 "advance_on_delete", "FALSE",
 "clear_playlist", "TRUE",
- "open_to_temporary", "FALSE",
+ "open_to_temporary", "TRUE",
 "resume_playback_on_startup", "FALSE",
 
 /* equalizer */
@@ -49,7 +50,7 @@
 
 /* info popup / info window */
 "cover_name_exclude", "back",
- "cover_name_include", "album,folder",
+ "cover_name_include", "album,cover,front,folder",
 "filepopup_delay", "5",
 "filepopup_showprogressbar", "TRUE",
 "recurse_for_cover", "FALSE",
@@ -83,25 +84,31 @@
 "generic_title_format", "${?artist:${artist} - }${?album:${album} - }${title}",
 "leading_zero", "FALSE",
 "metadata_on_play", "FALSE",
- "show_numbers_in_pl", "TRUE",
+ "show_numbers_in_pl", "FALSE",
 
 NULL};
 
-static GStaticMutex mutex = G_STATIC_MUTEX_INIT;
+static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
 static GHashTable * defaults;
 static GKeyFile * keyfile;
-static gboolean modified;
+static bool_t modified;
+
+/* str_unref() may be a macro */
+static void str_unref_cb (void * str)
+{
+ str_unref (str);
+}
 
 void config_load (void)
 {
 g_return_if_fail (! defaults && ! keyfile);
- g_static_mutex_lock (& mutex);
+ pthread_mutex_lock (& mutex);
 
 defaults = g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
 (GDestroyNotify) g_hash_table_destroy);
 keyfile = g_key_file_new ();
 
- gchar * path = g_strdup_printf ("%s/config", get_path (AUD_PATH_USER_DIR));
+ char * path = g_strdup_printf ("%s/config", get_path (AUD_PATH_USER_DIR));
 if (g_file_test (path, G_FILE_TEST_EXISTS))
 {
 GError * error = NULL;
@@ -114,7 +121,7 @@
 g_free (path);
 
 modified = FALSE;
- g_static_mutex_unlock (& mutex);
+ pthread_mutex_unlock (& mutex);
 
 config_set_defaults (NULL, core_defaults);
 }
@@ -122,16 +129,16 @@
 void config_save (void)
 {
 g_return_if_fail (defaults && keyfile);
- g_static_mutex_lock (& mutex);
+ pthread_mutex_lock (& mutex);
 
 if (! modified)
 {
- g_static_mutex_unlock (& mutex);
+ pthread_mutex_unlock (& mutex);
 return;
 }
 
- gchar * path = g_strdup_printf ("%s/config", get_path (AUD_PATH_USER_DIR));
- gchar * data = g_key_file_to_data (keyfile, NULL, NULL);
+ char * path = g_strdup_printf ("%s/config", get_path (AUD_PATH_USER_DIR));
+ char * data = g_key_file_to_data (keyfile, NULL, NULL);
 
 GError * error = NULL;
 if (! g_file_set_contents (path, data, -1, & error))
@@ -144,26 +151,26 @@
 g_free (path);
 
 modified = FALSE;
- g_static_mutex_unlock (& mutex);
+ pthread_mutex_unlock (& mutex);
 }
 
 void config_cleanup (void)
 {
 g_return_if_fail (defaults && keyfile);
- g_static_mutex_lock (& mutex);
+ pthread_mutex_lock (& mutex);
 
 g_key_file_free (keyfile);
 keyfile = NULL;
 g_hash_table_destroy (defaults);
 defaults = NULL;
 
- g_static_mutex_unlock (& mutex);
+ pthread_mutex_unlock (& mutex);
 }
 
-void config_clear_section (const gchar * section)
+void config_clear_section (const char * section)
 {
 g_return_if_fail (defaults && keyfile);
- g_static_mutex_lock (& mutex);
+ pthread_mutex_lock (& mutex);
 
 if (! section)
 section = DEFAULT_SECTION;
@@ -174,13 +181,13 @@
 modified = TRUE;
 }
 
- g_static_mutex_unlock (& mutex);
+ pthread_mutex_unlock (& mutex);
 }
 
-void config_set_defaults (const gchar * section, const gchar * const * entries)
+void config_set_defaults (const char * section, const char * const * entries)
 {
 g_return_if_fail (defaults && keyfile);
- g_static_mutex_lock (& mutex);
+ pthread_mutex_lock (& mutex);
 
 if (! section)
 section = DEFAULT_SECTION;
@@ -188,42 +195,41 @@
 GHashTable * table = g_hash_table_lookup (defaults, section);
 if (! table)
 {
- table = g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
- (GDestroyNotify) stringpool_unref);
+ table = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, str_unref_cb);
 g_hash_table_replace (defaults, g_strdup (section), table);
 }
 
 while (1)
 {
- const gchar * name = * entries ++;
- const gchar * value = * entries ++;
+ const char * name = * entries ++;
+ const char * value = * entries ++;
 if (! name || ! value)
 break;
 
- g_hash_table_replace (table, g_strdup (name), stringpool_get ((gchar *) value, FALSE));
+ g_hash_table_replace (table, g_strdup (name), str_get (value));
 }
 
- g_static_mutex_unlock (& mutex);
+ pthread_mutex_unlock (& mutex);
 }
 
-static const gchar * get_default (const gchar * section, const gchar * name)
+static const char * get_default (const char * section, const char * name)
 {
 GHashTable * table = g_hash_table_lookup (defaults, section);
- const gchar * def = table ? g_hash_table_lookup (table, name) : NULL;
+ const char * def = table ? g_hash_table_lookup (table, name) : NULL;
 return def ? def : "";
 }
 
-void set_string (const gchar * section, const gchar * name, const gchar * value)
+void set_string (const char * section, const char * name, const char * value)
 {
 g_return_if_fail (defaults && keyfile);
 g_return_if_fail (name && value);
- g_static_mutex_lock (& mutex);
+ pthread_mutex_lock (& mutex);
 
 if (! section)
 section = DEFAULT_SECTION;
 
- const gchar * def = get_default (section, name);
- gboolean changed = FALSE;
+ const char * def = get_default (section, name);
+ bool_t changed = FALSE;
 
 if (! strcmp (value, def))
 {
@@ -235,7 +241,7 @@
 }
 else
 {
- gchar * old = g_key_file_has_key (keyfile, section, name, NULL) ?
+ char * old = g_key_file_has_key (keyfile, section, name, NULL) ?
 g_key_file_get_value (keyfile, section, name, NULL) : NULL;
 
 if (! old || strcmp (value, old))
@@ -253,76 +259,76 @@
 
 if (! strcmp (section, DEFAULT_SECTION))
 {
- gchar * event = g_strdup_printf ("set %s", name);
+ char * event = g_strdup_printf ("set %s", name);
 event_queue (event, NULL);
 g_free (event);
 }
 }
 
- g_static_mutex_unlock (& mutex);
+ pthread_mutex_unlock (& mutex);
 }
 
-gchar * get_string (const gchar * section, const gchar * name)
+char * get_string (const char * section, const char * name)
 {
 g_return_val_if_fail (defaults && keyfile, g_strdup (""));
 g_return_val_if_fail (name, g_strdup (""));
- g_static_mutex_lock (& mutex);
+ pthread_mutex_lock (& mutex);
 
 if (! section)
 section = DEFAULT_SECTION;
 
- gchar * value = g_key_file_has_key (keyfile, section, name, NULL) ?
+ char * value = g_key_file_has_key (keyfile, section, name, NULL) ?
 g_key_file_get_value (keyfile, section, name, NULL) : NULL;
 
 if (! value)
 value = g_strdup (get_default (section, name));
 
- g_static_mutex_unlock (& mutex);
+ pthread_mutex_unlock (& mutex);
 return value;
 }
 
-void set_bool (const gchar * section, const gchar * name, gboolean value)
+void set_bool (const char * section, const char * name, bool_t value)
 {
 set_string (section, name, value ? "TRUE" : "FALSE");
 }
 
-gboolean get_bool (const gchar * section, const gchar * name)
+bool_t get_bool (const char * section, const char * name)
 {
- gchar * string = get_string (section, name);
- gboolean value = ! strcmp (string, "TRUE");
+ char * string = get_string (section, name);
+ bool_t value = ! strcmp (string, "TRUE");
 g_free (string);
 return value;
 }
 
-void set_int (const gchar * section, const gchar * name, gint value)
+void set_int (const char * section, const char * name, int value)
 {
- gchar * string = int_to_string (value);
+ char * string = int_to_string (value);
 g_return_if_fail (string);
 set_string (section, name, string);
 g_free (string);
 }
 
-gint get_int (const gchar * section, const gchar * name)
+int get_int (const char * section, const char * name)
 {
- gint value = 0;
- gchar * string = get_string (section, name);
+ int value = 0;
+ char * string = get_string (section, name);
 string_to_int (string, & value);
 g_free (string);
 return value;
 }
 
-void set_double (const gchar * section, const gchar * name, gdouble value)
+void set_double (const char * section, const char * name, double value)
 {
- gchar * string = double_to_string (value);
+ char * string = double_to_string (value);
 g_return_if_fail (string);
 set_string (section, name, string);
 g_free (string);
 }
 
-gdouble get_double (const gchar * section, const gchar * name)
+double get_double (const char * section, const char * name)
 {
- gdouble value = 0;
- gchar * string = get_string (section, name);
+ double value = 0;
+ char * string = get_string (section, name);
 string_to_double (string, & value);
 g_free (string);
 return value;

audacious-3.1.1.tar.bz2/src/audacious/credits.c -> audacious-3.2.4.tar.bz2/src/audacious/credits.c Changed

@@ -23,15 +23,17 @@
 * Audacious or using our public API to be a derived work.
 */
 
+#include <stddef.h>
+
 #include "config.h"
 #include "i18n.h"
 #include "misc.h"
 
-static const gchar *audacious_brief =
+static const char * audacious_brief =
 "<big>Audacious %s</big>\n"
- "Copyright (C) 2005-2011 Audacious Team";
+ "Copyright (C) 2005-2012 Audacious Team";
 
-static const gchar *credit_text[] = {
+static const char * const credit_text[] = {
 N_("Core developers:"),
 "Christian Birchinger",
 "Michael Färber",
@@ -82,6 +84,7 @@
 
 N_("Patch authors:"),
 "Chris Arepantis",
+ "Anatoly Arzhnikov",
 "Alexis Ballier",
 "Eric Barch",
 "Carlo Bramini",
@@ -101,6 +104,7 @@
 "Jussi Judin",
 "Teru Kamogashira",
 "Chris Kehler",
+ "Thomas Lange",
 "Mark Loeser",
 "Alex Maclean",
 "Mikael Magnusson",
@@ -177,7 +181,10 @@
 NULL
 };
 
-static const gchar *translators_text[] = {
+static const char * const translators_text[] = {
+ N_("Argentinian Spanish:"),
+ "Adrián Ramirez Escalante",
+ NULL,
 N_("Belarusian:"),
 "Darafei Praliaskouski",
 NULL,
@@ -187,6 +194,7 @@
 N_("Brazilian Portuguese:"),
 "Fábio Antunes",
 "Karen Eliot",
+ "Rafael Ferreira",
 "Philipi Pinto",
 NULL,
 N_("Breton:"),
@@ -197,6 +205,8 @@
 NULL,
 N_("Catalan:"),
 "Ernest Adrogué",
+ "Jordi Amenós",
+ "Juanma Hernández",
 NULL,
 N_("Chinese:"),
 "Tse Chih Chiu",
@@ -209,6 +219,7 @@
 NULL,
 N_("Dutch:"),
 "Laurens Buhler",
+ "Bjorn Roesbeke",
 "Tony Vroon",
 NULL,
 N_("Estonian:"),
@@ -217,13 +228,15 @@
 N_("Finnish:"),
 "Matti Hämäläinen",
 "Elias Julkunen",
+ "Tuomas Lähteenmäki",
 "Pauli Virtanen",
 NULL,
 N_("French:"),
+ "Alain-Olivier Breysse",
 "Adam Cecile",
- "Stanislas Zeller",
- "Stany Henry",
 "Jean-Alexandre Anglès d'Auriac",
+ "Stany Henry",
+ "Stanislas Zeller",
 NULL,
 N_("German:"),
 "Matthias Debus",
@@ -249,10 +262,12 @@
 NULL,
 N_("Italian:"),
 "Alessio D'Ascanio",
+ "Jacopo Lorenzetti",
 "Diego Pettenò",
 NULL,
 N_("Japanese:"),
 "Dai",
+ "Shuuji Takahashi",
 NULL,
 N_("Korean:"),
 "DongCheon Park",
@@ -268,13 +283,18 @@
 N_("Macedonian:"),
 "Arangel Angov",
 NULL,
+ N_("Mexican Spanish:"),
+ "Jorge A. García Sosa",
+ NULL,
 N_("Polish:"),
 "Artur Czechowski",
 "Michał Kiedrowicz",
 "Wojciech Myrda",
+ "Piotr Sokół",
 "Szymon Weihs",
 NULL,
 N_("Portuguese:"),
+ "Sérgio Marques",
 "Luís Picciochi Oliveira",
 NULL,
 N_("Romanian:"),
@@ -297,13 +317,16 @@
 NULL,
 N_("Slovak:"),
 "Andrej Herceg",
+ "Tomáš Vadina",
 NULL,
 N_("Spanish:"),
+ "Jordi Amenós",
+ "Jorge Andrés",
 "Cosme Domínguez Díaz",
+ "Adrián Ramirez Escalante",
 "Jeki Sinneo Leinos",
 "Francisco Javier F. Serrador",
 "Gustavo D. Vranjes",
- "Jorge Andrés",
 NULL,
 N_("Swedish:"),
 "Martin Persenius",
@@ -319,7 +342,9 @@
 "Eren Turkay",
 NULL,
 N_("Ukrainian:"),
+ "Yuri Chornoivan",
 "Kostyantyn Fedenko",
+ "Rax Garfield",
 "Mykola Lynnyk",
 NULL,
 N_("Vietnamese:"),
@@ -333,8 +358,8 @@
 NULL
 };
 
-void
-get_audacious_credits(const gchar ** brief, const gchar *** credits, const gchar ***translators)
+void get_audacious_credits (const char * * brief, const char * const * *
+ credits, const char * const * * translators)
 {
 if (brief != NULL)
 *brief = audacious_brief;

audacious-3.1.1.tar.bz2/src/audacious/dbus-service.h -> audacious-3.2.4.tar.bz2/src/audacious/dbus-service.h Changed

@@ -22,6 +22,7 @@
 #define AUDACIOUS_DBUS_SERVICE_H
 
 #include <glib.h>
+#include <libaudcore/core.h>
 
 #define DBUS_API_SUBJECT_TO_CHANGE
 #include <dbus/dbus-glib.h>
@@ -35,10 +36,6 @@
 GObjectClass parent_class;
 } RemoteObjectClass, MprisRootClass, MprisPlayerClass, MprisTrackListClass;
 
-void init_dbus();
-void free_dbus();
-DBusGProxy *audacious_get_dbus_proxy();
-
 /* MPRIS API */
 // Capabilities
 enum {
@@ -63,28 +60,28 @@
 extern MprisPlayer * mpris;
 
 // MPRIS /
-gboolean mpris_root_identity(MprisRoot *obj, gchar **identity,
+bool_t mpris_root_identity(MprisRoot *obj, char **identity,
 GError **error);
-gboolean mpris_root_quit(MprisPlayer *obj, GError **error);
+bool_t mpris_root_quit(MprisPlayer *obj, GError **error);
 
 // MPRIS /Player
-gboolean mpris_player_next(MprisPlayer *obj, GError **error);
-gboolean mpris_player_prev(MprisPlayer *obj, GError **error);
-gboolean mpris_player_pause(MprisPlayer *obj, GError **error);
-gboolean mpris_player_stop(MprisPlayer *obj, GError **error);
-gboolean mpris_player_play(MprisPlayer *obj, GError **error);
-gboolean mpris_player_repeat(MprisPlayer *obj, gboolean rpt, GError **error);
-gboolean mpris_player_get_status(MprisPlayer *obj, GValueArray **status,
+bool_t mpris_player_next(MprisPlayer *obj, GError **error);
+bool_t mpris_player_prev(MprisPlayer *obj, GError **error);
+bool_t mpris_player_pause(MprisPlayer *obj, GError **error);
+bool_t mpris_player_stop(MprisPlayer *obj, GError **error);
+bool_t mpris_player_play(MprisPlayer *obj, GError **error);
+bool_t mpris_player_repeat(MprisPlayer *obj, bool_t rpt, GError **error);
+bool_t mpris_player_get_status(MprisPlayer *obj, GValueArray **status,
 GError **error);
-gboolean mpris_player_get_metadata(MprisPlayer *obj, GHashTable **metadata,
+bool_t mpris_player_get_metadata(MprisPlayer *obj, GHashTable **metadata,
 GError **error);
-gboolean mpris_player_get_caps(MprisPlayer *obj, gint *capabilities,
+bool_t mpris_player_get_caps(MprisPlayer *obj, int *capabilities,
 GError **error);
-gboolean mpris_player_volume_set(MprisPlayer *obj, gint vol, GError **error);
-gboolean mpris_player_volume_get(MprisPlayer *obj, gint *vol,
+bool_t mpris_player_volume_set(MprisPlayer *obj, int vol, GError **error);
+bool_t mpris_player_volume_get(MprisPlayer *obj, int *vol,
 GError **error);
-gboolean mpris_player_position_set(MprisPlayer *obj, gint pos, GError **error);
-gboolean mpris_player_position_get(MprisPlayer *obj, gint *pos,
+bool_t mpris_player_position_set(MprisPlayer *obj, int pos, GError **error);
+bool_t mpris_player_position_get(MprisPlayer *obj, int *pos,
 GError **error);
 enum {
 TRACK_CHANGE_SIG,
@@ -98,143 +95,143 @@
 LAST_TRACKLIST_SIG
 };
 
-gboolean mpris_emit_track_change(MprisPlayer *obj);
-gboolean mpris_emit_status_change(MprisPlayer *obj, PlaybackStatus status);
-gboolean mpris_emit_caps_change(MprisPlayer *obj);
-gboolean mpris_emit_tracklist_change(MprisTrackList *obj, gint playlist);
+bool_t mpris_emit_track_change(MprisPlayer *obj);
+bool_t mpris_emit_status_change(MprisPlayer *obj, PlaybackStatus status);
+bool_t mpris_emit_caps_change(MprisPlayer *obj);
+bool_t mpris_emit_tracklist_change(MprisTrackList *obj, int playlist);
 
 // MPRIS /TrackList
-gboolean mpris_tracklist_get_metadata(MprisTrackList *obj, gint pos,
+bool_t mpris_tracklist_get_metadata(MprisTrackList *obj, int pos,
 GHashTable **metadata, GError **error);
-gboolean mpris_tracklist_get_current_track(MprisTrackList *obj, gint *pos,
+bool_t mpris_tracklist_get_current_track(MprisTrackList *obj, int *pos,
 GError **error);
-gboolean mpris_tracklist_get_length(MprisTrackList *obj, gint *length,
+bool_t mpris_tracklist_get_length(MprisTrackList *obj, int *length,
 GError **error);
-gboolean mpris_tracklist_add_track(MprisTrackList *obj, gchar *uri,
- gboolean play, GError **error);
-gboolean mpris_tracklist_del_track(MprisTrackList *obj, gint pos,
+bool_t mpris_tracklist_add_track(MprisTrackList *obj, char *uri,
+ bool_t play, GError **error);
+bool_t mpris_tracklist_del_track(MprisTrackList *obj, int pos,
 GError **error);
-gboolean mpris_tracklist_loop(MprisTrackList *obj, gboolean loop,
+bool_t mpris_tracklist_loop(MprisTrackList *obj, bool_t loop,
 GError **error);
-gboolean mpris_tracklist_random(MprisTrackList *obj, gboolean random,
+bool_t mpris_tracklist_random(MprisTrackList *obj, bool_t random,
 GError **error);
 
 /* Legacy API */
 // Audacious General Information
-gboolean audacious_rc_version(RemoteObject *obj, gchar **version, GError **error);
-gboolean audacious_rc_quit(RemoteObject *obj, GError **error);
-gboolean audacious_rc_eject(RemoteObject *obj, GError **error);
-gboolean audacious_rc_main_win_visible(RemoteObject *obj,
- gboolean *is_main_win, GError **error);
-gboolean audacious_rc_show_main_win(RemoteObject *obj, gboolean show,
+bool_t audacious_rc_version(RemoteObject *obj, char **version, GError **error);
+bool_t audacious_rc_quit(RemoteObject *obj, GError **error);
+bool_t audacious_rc_eject(RemoteObject *obj, GError **error);
+bool_t audacious_rc_main_win_visible(RemoteObject *obj,
+ bool_t *is_main_win, GError **error);
+bool_t audacious_rc_show_main_win(RemoteObject *obj, bool_t show,
 GError **error);
-gboolean audacious_rc_equalizer_visible(RemoteObject *obj, gboolean *is_eq_win,
+bool_t audacious_rc_equalizer_visible(RemoteObject *obj, bool_t *is_eq_win,
 GError **error);
-gboolean audacious_rc_show_equalizer(RemoteObject *obj, gboolean show,
+bool_t audacious_rc_show_equalizer(RemoteObject *obj, bool_t show,
 GError **error);
-gboolean audacious_rc_playlist_visible(RemoteObject *obj,
- gboolean *is_pl_win,
+bool_t audacious_rc_playlist_visible(RemoteObject *obj,
+ bool_t *is_pl_win,
 GError **error);
-gboolean audacious_rc_show_playlist(RemoteObject *obj, gboolean show,
+bool_t audacious_rc_show_playlist(RemoteObject *obj, bool_t show,
 GError **error);
-gboolean audacious_rc_get_tuple_fields(RemoteObject *obj, gchar ***fields,
+bool_t audacious_rc_get_tuple_fields(RemoteObject *obj, char ***fields,
 GError **error);
 
 // Playback Information/Manipulation
-gboolean audacious_rc_play(RemoteObject *obj, GError **error);
-gboolean audacious_rc_pause(RemoteObject *obj, GError **error);
-gboolean audacious_rc_stop(RemoteObject *obj, GError **error);
-gboolean audacious_rc_playing(RemoteObject *obj, gboolean *is_playing,
+bool_t audacious_rc_play(RemoteObject *obj, GError **error);
+bool_t audacious_rc_pause(RemoteObject *obj, GError **error);
+bool_t audacious_rc_stop(RemoteObject *obj, GError **error);
+bool_t audacious_rc_playing(RemoteObject *obj, bool_t *is_playing,
 GError **error);
-gboolean audacious_rc_paused(RemoteObject *obj, gboolean *is_paused,
+bool_t audacious_rc_paused(RemoteObject *obj, bool_t *is_paused,
 GError **error);
-gboolean audacious_rc_stopped(RemoteObject *obj, gboolean *is_stopped,
+bool_t audacious_rc_stopped(RemoteObject *obj, bool_t *is_stopped,
 GError **error);
-gboolean audacious_rc_status(RemoteObject *obj, gchar **status,
+bool_t audacious_rc_status(RemoteObject *obj, char **status,
 GError **error);
-gboolean audacious_rc_info(RemoteObject *obj, gint *rate, gint *freq,
- gint *nch, GError **error);
-gboolean audacious_rc_time(RemoteObject *obj, gint *time, GError **error);
-gboolean audacious_rc_seek(RemoteObject *obj, guint pos, GError **error);
-gboolean audacious_rc_volume(RemoteObject *obj, gint *vl, gint *vr,
+bool_t audacious_rc_info(RemoteObject *obj, int *rate, int *freq,
+ int *nch, GError **error);
+bool_t audacious_rc_time(RemoteObject *obj, int *time, GError **error);
+bool_t audacious_rc_seek(RemoteObject *obj, unsigned int pos, GError **error);
+bool_t audacious_rc_volume(RemoteObject *obj, int *vl, int *vr,
 GError **error);
-gboolean audacious_rc_set_volume(RemoteObject *obj, gint vl, gint vr,
+bool_t audacious_rc_set_volume(RemoteObject *obj, int vl, int vr,
 GError **error);
-gboolean audacious_rc_balance(RemoteObject *obj, gint *balance,
+bool_t audacious_rc_balance(RemoteObject *obj, int *balance,
 GError **error);
 
 // Playlist Information/Manipulation
-gboolean audacious_rc_position(RemoteObject *obj, int *pos, GError **error);
-gboolean audacious_rc_advance(RemoteObject *obj, GError **error);
-gboolean audacious_rc_reverse(RemoteObject *obj, GError **error);
-gboolean audacious_rc_length(RemoteObject *obj, int *length,
+bool_t audacious_rc_position(RemoteObject *obj, int *pos, GError **error);
+bool_t audacious_rc_advance(RemoteObject *obj, GError **error);
+bool_t audacious_rc_reverse(RemoteObject *obj, GError **error);
+bool_t audacious_rc_length(RemoteObject *obj, int *length,
 GError **error);
-gboolean audacious_rc_song_title(RemoteObject *obj, guint pos,
- gchar **title, GError **error);
-gboolean audacious_rc_song_filename(RemoteObject *obj, guint pos,
- gchar **filename, GError **error);
-gboolean audacious_rc_song_length(RemoteObject *obj, guint pos, int *length,
+bool_t audacious_rc_song_title(RemoteObject *obj, unsigned int pos,
+ char **title, GError **error);
+bool_t audacious_rc_song_filename(RemoteObject *obj, unsigned int pos,
+ char **filename, GError **error);
+bool_t audacious_rc_song_length(RemoteObject *obj, unsigned int pos, int *length,
 GError **error);
-gboolean audacious_rc_song_frames(RemoteObject *obj, guint pos, int *length,
+bool_t audacious_rc_song_frames(RemoteObject *obj, unsigned int pos, int *length,
 GError **error);
-gboolean audacious_rc_song_tuple(RemoteObject *obj, guint pos, gchar *tuple,
+bool_t audacious_rc_song_tuple(RemoteObject *obj, unsigned int pos, char *tuple,
 GValue *value, GError **error);
-gboolean audacious_rc_jump(RemoteObject *obj, guint pos, GError **error);
-gboolean audacious_rc_add(RemoteObject *obj, gchar *file, GError **error);
-gboolean audacious_rc_add_url(RemoteObject *obj, gchar *url,
+bool_t audacious_rc_jump(RemoteObject *obj, unsigned int pos, GError **error);
+bool_t audacious_rc_add(RemoteObject *obj, char *file, GError **error);
+bool_t audacious_rc_add_url(RemoteObject *obj, char *url,
 GError **error);
-gboolean audacious_rc_add_list (RemoteObject * obj, gchar * * filenames,
+bool_t audacious_rc_add_list (RemoteObject * obj, char * * filenames,
 GError * * error);
-gboolean audacious_rc_open_list (RemoteObject * obj, gchar * * filenames,
+bool_t audacious_rc_open_list (RemoteObject * obj, char * * filenames,
 GError * * error);
-gboolean audacious_rc_open_list_to_temp (RemoteObject * obj, gchar * *
+bool_t audacious_rc_open_list_to_temp (RemoteObject * obj, char * *
 filenames, GError * * error);
-gboolean audacious_rc_delete(RemoteObject *obj, guint pos, GError **error);
-gboolean audacious_rc_clear(RemoteObject *obj, GError **error);
-gboolean audacious_rc_auto_advance(RemoteObject *obj, gboolean *is_advance,
+bool_t audacious_rc_delete(RemoteObject *obj, unsigned int pos, GError **error);
+bool_t audacious_rc_clear(RemoteObject *obj, GError **error);
+bool_t audacious_rc_auto_advance(RemoteObject *obj, bool_t *is_advance,
 GError **error);
-gboolean audacious_rc_toggle_auto_advance(RemoteObject *obj, GError **error);
-gboolean audacious_rc_repeat(RemoteObject *obj, gboolean *is_repeat,
+bool_t audacious_rc_toggle_auto_advance(RemoteObject *obj, GError **error);
+bool_t audacious_rc_repeat(RemoteObject *obj, bool_t *is_repeat,
 GError **error);
-gboolean audacious_rc_toggle_repeat(RemoteObject *obj, GError **error);
-gboolean audacious_rc_shuffle(RemoteObject *obj, gboolean *is_shuffle,
+bool_t audacious_rc_toggle_repeat(RemoteObject *obj, GError **error);
+bool_t audacious_rc_shuffle(RemoteObject *obj, bool_t *is_shuffle,
 GError **error);
-gboolean audacious_rc_toggle_shuffle(RemoteObject *obj, GError **error);
+bool_t audacious_rc_toggle_shuffle(RemoteObject *obj, GError **error);
 
 /* new */
-gboolean audacious_rc_show_prefs_box(RemoteObject *obj, gboolean show, GError **error);
-gboolean audacious_rc_show_about_box(RemoteObject *obj, gboolean show, GError **error);
-gboolean audacious_rc_show_jtf_box(RemoteObject *obj, gboolean show, GError **error);
-gboolean audacious_rc_show_filebrowser(RemoteObject *obj, gboolean show, GError **error); //new Nov 8
-gboolean audacious_rc_play_pause(RemoteObject *obj, GError **error);
-gboolean audacious_rc_activate(RemoteObject *obj, GError **error);
-gboolean audacious_rc_queue_get_list_pos(RemoteObject *obj, gint qpos, gint *pos, GError **error);
-gboolean audacious_rc_queue_get_queue_pos(RemoteObject *obj, gint pos, gint *qpos, GError **error);
-gboolean audacious_rc_get_info(RemoteObject *obj, gint *rate, gint *freq, gint *nch, GError **error);
-gboolean audacious_rc_toggle_aot(RemoteObject *obj, gboolean ontop, GError **error);
-gboolean audacious_rc_get_playqueue_length(RemoteObject *obj, gint *length, GError **error);
-gboolean audacious_rc_playqueue_add(RemoteObject *obj, gint pos, GError **error);
-gboolean audacious_rc_playqueue_remove(RemoteObject *obj, gint pos, GError **error);
-gboolean audacious_rc_playqueue_clear(RemoteObject *obj, GError **error);
-gboolean audacious_rc_playqueue_is_queued(RemoteObject *obj, gint pos, gboolean *is_queued, GError **error);
-gboolean audacious_rc_playlist_ins_url_string(RemoteObject *obj, gchar *url, gint pos, GError **error);
-gboolean audacious_rc_playlist_enqueue_to_temp(RemoteObject *obj, gchar *url, GError **error);
-gboolean audacious_rc_playlist_add(RemoteObject *obj, gpointer list, GError **error);
+bool_t audacious_rc_show_prefs_box(RemoteObject *obj, bool_t show, GError **error);
+bool_t audacious_rc_show_about_box(RemoteObject *obj, bool_t show, GError **error);
+bool_t audacious_rc_show_jtf_box(RemoteObject *obj, bool_t show, GError **error);
+bool_t audacious_rc_show_filebrowser(RemoteObject *obj, bool_t show, GError **error); //new Nov 8
+bool_t audacious_rc_play_pause(RemoteObject *obj, GError **error);
+bool_t audacious_rc_activate(RemoteObject *obj, GError **error);
+bool_t audacious_rc_queue_get_list_pos(RemoteObject *obj, int qpos, int *pos, GError **error);
+bool_t audacious_rc_queue_get_queue_pos(RemoteObject *obj, int pos, int *qpos, GError **error);
+bool_t audacious_rc_get_info(RemoteObject *obj, int *rate, int *freq, int *nch, GError **error);
+bool_t audacious_rc_toggle_aot(RemoteObject *obj, bool_t ontop, GError **error);
+bool_t audacious_rc_get_playqueue_length(RemoteObject *obj, int *length, GError **error);
+bool_t audacious_rc_playqueue_add(RemoteObject *obj, int pos, GError **error);
+bool_t audacious_rc_playqueue_remove(RemoteObject *obj, int pos, GError **error);
+bool_t audacious_rc_playqueue_clear(RemoteObject *obj, GError **error);
+bool_t audacious_rc_playqueue_is_queued(RemoteObject *obj, int pos, bool_t *is_queued, GError **error);
+bool_t audacious_rc_playlist_ins_url_string(RemoteObject *obj, char *url, int pos, GError **error);
+bool_t audacious_rc_playlist_enqueue_to_temp(RemoteObject *obj, char *url, GError **error);
+bool_t audacious_rc_playlist_add(RemoteObject *obj, gpointer list, GError **error);
 
 /* new on nov 7 */
-gboolean audacious_rc_get_eq(RemoteObject *obj, gdouble *preamp, GArray **bands, GError **error);
-gboolean audacious_rc_get_eq_preamp(RemoteObject *obj, gdouble *preamp, GError **error);
-gboolean audacious_rc_get_eq_band(RemoteObject *obj, gint band, gdouble *value, GError **error);
-gboolean audacious_rc_set_eq(RemoteObject *obj, gdouble preamp, GArray *bands, GError **error);
-gboolean audacious_rc_set_eq_preamp(RemoteObject *obj, gdouble preamp, GError **error);
-gboolean audacious_rc_set_eq_band(RemoteObject *obj, gint band, gdouble value, GError **error);
-gboolean audacious_rc_equalizer_activate(RemoteObject *obj, gboolean active, GError **error);
+bool_t audacious_rc_get_eq(RemoteObject *obj, double *preamp, GArray **bands, GError **error);
+bool_t audacious_rc_get_eq_preamp(RemoteObject *obj, double *preamp, GError **error);
+bool_t audacious_rc_get_eq_band(RemoteObject *obj, int band, double *value, GError **error);
+bool_t audacious_rc_set_eq(RemoteObject *obj, double preamp, GArray *bands, GError **error);
+bool_t audacious_rc_set_eq_preamp(RemoteObject *obj, double preamp, GError **error);
+bool_t audacious_rc_set_eq_band(RemoteObject *obj, int band, double value, GError **error);
+bool_t audacious_rc_equalizer_activate(RemoteObject *obj, bool_t active, GError **error);
 
 /* new in 2.4 */
-gboolean audacious_rc_get_active_playlist_name(RemoteObject *obj, gchar **title, GError **error);
+bool_t audacious_rc_get_active_playlist_name(RemoteObject *obj, char **title, GError **error);
 
 /* new in 3.1 */
-gboolean audacious_rc_stop_after (RemoteObject * obj, gboolean * is_stopping, GError * * error);
-gboolean audacious_rc_toggle_stop_after (RemoteObject * obj, GError * * error);
+bool_t audacious_rc_stop_after (RemoteObject * obj, bool_t * is_stopping, GError * * error);
+bool_t audacious_rc_toggle_stop_after (RemoteObject * obj, GError * * error);
 
 #endif /* AUDACIOUS_DBUS_SERVICE_H */

audacious-3.1.1.tar.bz2/src/audacious/dbus.c -> audacious-3.2.4.tar.bz2/src/audacious/dbus.c Changed

@@ -22,6 +22,8 @@
 #include "config.h"
 
 #include <glib.h>
+#include <string.h>
+
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-bindings.h>
@@ -31,69 +33,21 @@
 #include "dbus-server-bindings.h"
 
 #include <math.h>
-#include <libaudcore/eventqueue.h>
+
 #include <libaudcore/hook.h>
 
 #include "debug.h"
 #include "drct.h"
-#include "playback.h"
 #include "playlist.h"
 #include "interface.h"
 #include "misc.h"
 
-struct StatusRequest
-{
- gboolean playing, paused;
- gint time, length;
- gint bitrate, samplerate, channels;
-};
-
-struct PositionRequest
-{
- gint playlist; /* -1 = active, -2 = playing */
- gint entry; /* -1 = current */
- gint entry_count, queue_count;
-};
-
-struct InfoRequest
-{
- gint playlist; /* -1 = active, -2 = playing */
- gint entry; /* -1 = current */
- gchar *filename, *title, *pltitle;
- gint length;
-};
-
-struct FieldRequest
-{
- gint playlist; /* -1 = active, -2 = playing */
- gint entry; /* -1 = current */
- const gchar *field;
- GValue *value;
-};
-
-struct AddRequest
-{
- gint position; /* -1 = at end */
- gchar *filename;
- gboolean play;
-};
-
-struct MprisMetadataRequest
-{
- gint playlist; /* -1 = active, -2 = playing */
- gint entry; /* -1 = current */
- GHashTable *metadata;
-};
-
 static DBusGConnection *dbus_conn = NULL;
-static guint signals[LAST_SIG] = { 0 };
-static guint tracklist_signals[LAST_TRACKLIST_SIG] = { 0 };
+static unsigned int signals[LAST_SIG] = { 0 };
+static unsigned int tracklist_signals[LAST_TRACKLIST_SIG] = { 0 };
 
 MprisPlayer * mpris = NULL;
-
-static GThread *main_thread;
-static GMutex *info_mutex;
-static GCond *info_cond;
+MprisTrackList * mpris_tracklist = NULL;
 
 G_DEFINE_TYPE (RemoteObject, audacious_rc, G_TYPE_OBJECT)
 G_DEFINE_TYPE (MprisRoot, mpris_root, G_TYPE_OBJECT)
@@ -137,7 +91,7 @@
 {
 GError *error = NULL;
 DBusGProxy *driver_proxy;
- guint request_ret;
+ unsigned int request_ret;
 
 AUDDBG ("Registering remote D-Bus interfaces.\n");
 
@@ -215,8 +169,6 @@
 /* XXX / FIXME: Why does this happen? -- ccr */
 AUDDBG ("object->proxy == NULL, not adding some signals.\n");
 }
-
- hook_associate("playlist update", (HookFunction) mpris_playlist_update_hook, object);
 }
 
 void init_dbus()
@@ -224,10 +176,6 @@
 GError *error = NULL;
 DBusConnection *local_conn;
 
- main_thread = g_thread_self();
- info_mutex = g_mutex_new();
- info_cond = g_cond_new();
-
 AUDDBG ("Trying to initialize D-Bus.\n");
 dbus_conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
 if (dbus_conn == NULL)
@@ -241,29 +189,40 @@
 g_object_new(audacious_rc_get_type(), NULL);
 g_object_new(mpris_root_get_type(), NULL);
 mpris = g_object_new(mpris_player_get_type(), NULL);
- g_object_new(mpris_tracklist_get_type(), NULL);
+ mpris_tracklist = g_object_new(mpris_tracklist_get_type(), NULL);
 
 local_conn = dbus_g_connection_get_connection(dbus_conn);
 dbus_connection_set_exit_on_disconnect(local_conn, FALSE);
+
+ hook_associate ("playlist update",
+ (HookFunction) mpris_playlist_update_hook, mpris_tracklist);
 }
 
-static GValue *tuple_value_to_gvalue(const Tuple * tuple, const gchar * key)
+void cleanup_dbus (void)
+{
+ hook_dissociate ("playlist update", (HookFunction) mpris_playlist_update_hook);
+}
+
+static GValue *tuple_value_to_gvalue(const Tuple * tuple, const char * key)
 {
 GValue *val;
- TupleValueType type = tuple_get_value_type((Tuple *) tuple, -1, key);
+ TupleValueType type = tuple_get_value_type (tuple, -1, key);
 
 if (type == TUPLE_STRING)
 {
 val = g_new0(GValue, 1);
 g_value_init(val, G_TYPE_STRING);
- g_value_take_string(val, g_strdup(tuple_get_string((Tuple *) tuple, -1, key)));
+ char * str = tuple_get_str (tuple, -1, key);
+ g_value_set_string (val, str);
+ str_unref (str);
 return val;
 }
 else if (type == TUPLE_INT)
 {
 val = g_new0(GValue, 1);
 g_value_init(val, G_TYPE_INT);
- g_value_set_int(val, tuple_get_int((Tuple *) tuple, -1, key));
+ int x = tuple_get_int (tuple, -1, key);
+ g_value_set_int (val, x);
 return val;
 }
 return NULL;
@@ -278,7 +237,7 @@
 * @param[in] key key used for inserting into hash table.
 */
 static void tuple_insert_to_hash_full(GHashTable * md, const Tuple * tuple,
- const gchar * tuple_key, const gchar *key)
+ const char * tuple_key, const char *key)
 {
 GValue *value = tuple_value_to_gvalue(tuple, tuple_key);
 if (value != NULL)
@@ -286,7 +245,7 @@
 }
 
 static void tuple_insert_to_hash(GHashTable * md, const Tuple * tuple,
- const gchar *key)
+ const char *key)
 {
 tuple_insert_to_hash_full(md, tuple, key, key);
 }
@@ -297,7 +256,7 @@
 g_free((GValue *) value);
 }
 
-static GHashTable *make_mpris_metadata(const gchar * filename, const Tuple * tuple)
+static GHashTable *make_mpris_metadata(const char * filename, const Tuple * tuple)
 {
 GHashTable *md = NULL;
 gpointer value;
@@ -328,346 +287,42 @@
 return md;
 }
 
-static void real_position(gint * playlist, gint * entry)
-{
- if (*playlist == -2)
- *playlist = playlist_get_playing();
- if (*playlist == -1)
- *playlist = playlist_get_active();
- if (*entry == -1)
- *entry = playlist_get_position(*playlist);
-}
-
-static gboolean get_status_cb(void *data)
-{
- struct StatusRequest *request = data;
-
- g_mutex_lock(info_mutex);
-
- memset (request, 0, sizeof (* request));
- request->playing = playback_get_playing();
-
- if (request->playing)
- {
- request->paused = playback_get_paused ();
- request->time = playback_get_time ();
- request->length = playback_get_length ();
- playback_get_info (& request->bitrate, & request->samplerate,
- & request->channels);
- }
-
- g_cond_signal(info_cond);
- g_mutex_unlock(info_mutex);
- return FALSE;
-}
-
-static void get_status(struct StatusRequest *request)
-{
- if (g_thread_self() == main_thread)
- get_status_cb(request);
- else
- {
- g_mutex_lock(info_mutex);
- g_timeout_add(0, get_status_cb, request);
- g_cond_wait(info_cond, info_mutex);
- g_mutex_unlock(info_mutex);
- }
-}
-
-static gboolean get_position_cb(void *data)
-{
- struct PositionRequest *request = data;
-
- g_mutex_lock(info_mutex);
-
- real_position(&request->playlist, &request->entry);
- request->entry_count = playlist_entry_count(request->playlist);
- request->queue_count = playlist_queue_count(request->playlist);
-
- g_cond_signal(info_cond);
- g_mutex_unlock(info_mutex);
- return FALSE;
-}
-
-static void get_position(struct PositionRequest *request)
-{
- if (g_thread_self() == main_thread)
- get_position_cb(request);
- else
- {
- g_mutex_lock(info_mutex);
- g_timeout_add(0, get_position_cb, request);
- g_cond_wait(info_cond, info_mutex);
- g_mutex_unlock(info_mutex);
- }
-}
-
-static gboolean get_info_cb(void *data)
-{
- struct InfoRequest *request = data;
-
- g_mutex_lock(info_mutex);
-
- real_position(&request->playlist, &request->entry);
- request->filename = playlist_entry_get_filename (request->playlist,
- request->entry);
- request->title = playlist_entry_get_title (request->playlist,
- request->entry, FALSE);
- request->length = playlist_entry_get_length (request->playlist,
- request->entry, FALSE);
- request->pltitle = playlist_get_title (request->playlist);
-
- g_cond_signal(info_cond);
- g_mutex_unlock(info_mutex);
- return FALSE;
-}
-
-static void get_info(struct InfoRequest *request)
-{
- if (g_thread_self() == main_thread)
- get_info_cb(request);
- else
- {
- g_mutex_lock(info_mutex);
- g_timeout_add(0, get_info_cb, request);
- g_cond_wait(info_cond, info_mutex);
- g_mutex_unlock(info_mutex);
- }
-}
-
-static gboolean get_field_cb(void *data)
+static GValue * get_field (int playlist, int entry, const char * field)
 {
- struct FieldRequest *request = data;
-
- g_mutex_lock(info_mutex);
+ Tuple * tuple = playlist_entry_get_tuple (playlist, entry, FALSE);
+ GValue * value = tuple ? tuple_value_to_gvalue (tuple, field) : NULL;
 
- real_position(&request->playlist, &request->entry);
- Tuple * tuple = playlist_entry_get_tuple (request->playlist, request->entry, FALSE);
- request->value = (tuple == NULL) ? NULL : tuple_value_to_gvalue(tuple, request->field);
 if (tuple)
- tuple_free (tuple)
-
- g_cond_signal(info_cond);
- g_mutex_unlock(info_mutex);
- return FALSE;
-}
+ tuple_unref (tuple);
 
-static void get_field(struct FieldRequest *request)
-{
- if (g_thread_self() == main_thread)
- get_field_cb(request);
- else
- {
- g_mutex_lock(info_mutex);
- g_timeout_add(0, get_field_cb, request);
- g_cond_wait(info_cond, info_mutex);
- g_mutex_unlock(info_mutex);
- }
-}
-
-static gboolean play_cb(void *unused)
-{
- /* Only the active playlist is visible through DBUS interface, so make sure
- * to play from it, not another playlist. --jlindgren */
- if (playlist_get_playing () != playlist_get_active ())
- playlist_set_playing (playlist_get_active ());
-
- drct_play();
- return FALSE;
-}
-
-static gboolean pause_cb(void *unused)
-{
- playback_pause();
- return FALSE;
-}
-
-static gboolean play_pause_cb(void *unused)
-{
- if (playback_get_playing())
- playback_pause();
- else
- playback_play (0, FALSE);
-
- return FALSE;
-}
-
-static gboolean seek_cb(void *data)
-{
- playback_seek (GPOINTER_TO_INT (data));
- return FALSE;
-}
-
-static gboolean stop_cb(void *unused)
-{
- playback_stop();
- return FALSE;
-}
-
-static gboolean prev_cb(void *unused)
-{
- drct_pl_prev();
- return FALSE;
-}
-
-static gboolean next_cb(void *unused)
-{
- drct_pl_next();
- return FALSE;
-}
-
-static gboolean jump_cb(void *data)
-{
- drct_pl_set_pos(GPOINTER_TO_INT(data));
- return FALSE;
-}
-
-static gboolean add_cb(void *data)
-{
- struct AddRequest *request = data;
- playlist_entry_insert (playlist_get_active (), request->position,
- request->filename, NULL, request->play);
- g_free(request);
- return FALSE;
+ return value;
 }
 
-static gboolean delete_cb(void *data)
+static GHashTable * get_mpris_metadata (int playlist, int entry)
 {
- drct_pl_delete(GPOINTER_TO_INT(data));
- return FALSE;
-}
-
-static gboolean clear_cb(void *unused)
-{
- drct_pl_clear();
- return FALSE;
-}
-
-static gboolean add_to_queue_cb(void *data)
-{
- drct_pq_add(GPOINTER_TO_INT(data));
- return FALSE;
-}
-
-static gboolean remove_from_queue_cb(void *data)
-{
- drct_pq_remove(GPOINTER_TO_INT(data));
- return FALSE;
-}
-
-static gboolean clear_queue_cb(void *unused)
-{
- drct_pq_clear();
- return FALSE;
-}
-
-static gboolean queue_get_entry_cb(void *data)
-{
- g_mutex_lock(info_mutex);
-
- * (gint *) data = drct_pq_get_entry (* (gint *) data);
-
- g_cond_signal(info_cond);
- g_mutex_unlock(info_mutex);
- return FALSE;
-}
-
-static gint queue_get_entry(gint position)
-{
- if (g_thread_self() == main_thread)
- queue_get_entry_cb(&position);
- else
- {
- g_mutex_lock(info_mutex);
- g_timeout_add(0, queue_get_entry_cb, &position);
- g_cond_wait(info_cond, info_mutex);
- g_mutex_unlock(info_mutex);
- }
-
- return position;
-}
-
-static gboolean queue_find_entry_cb(void *data)
-{
- g_mutex_lock(info_mutex);
-
- *(gint *) data = drct_pq_get_queue_position(*(gint *) data);
-
- g_cond_signal(info_cond);
- g_mutex_unlock(info_mutex);
- return FALSE;
-}
-
-static gint queue_find_entry(gint position)
-{
- if (g_thread_self() == main_thread)
- queue_find_entry_cb(&position);
- else
- {
- g_mutex_lock(info_mutex);
- g_timeout_add(0, queue_find_entry_cb, &position);
- g_cond_wait(info_cond, info_mutex);
- g_mutex_unlock(info_mutex);
- }
-
- return position;
-}
-
-gboolean add_to_new_playlist_cb(void *data)
-{
- drct_pl_open_temp (data);
- g_free(data);
- return FALSE;
-}
-
-static gboolean get_mpris_metadata_cb(void *data)
-{
- struct MprisMetadataRequest *request = data;
-
- g_mutex_lock(info_mutex);
-
- real_position(&request->playlist, &request->entry);
- gchar * filename = playlist_entry_get_filename (request->playlist,
- request->entry);
- Tuple * tuple = playlist_entry_get_tuple (request->playlist, request->entry,
- FALSE);
+ char * filename = playlist_entry_get_filename (playlist, entry);
+ Tuple * tuple = playlist_entry_get_tuple (playlist, entry, FALSE);
 
+ GHashTable * metadata = NULL;
 if (filename && tuple)
- request->metadata = make_mpris_metadata (filename, tuple);
- else
- request->metadata = NULL;
+ metadata = make_mpris_metadata (filename, tuple);
 
- g_free (filename);
+ str_unref (filename);
 if (tuple)
- tuple_free (tuple);
+ tuple_unref (tuple);
 
- g_cond_signal(info_cond);
- g_mutex_unlock(info_mutex);
- return FALSE;
-}
-
-static void get_mpris_metadata(struct MprisMetadataRequest *request)
-{
- if (g_thread_self() == main_thread)
- get_mpris_metadata_cb(request);
- else
- {
- g_mutex_lock(info_mutex);
- g_timeout_add(0, get_mpris_metadata_cb, request);
- g_cond_wait(info_cond, info_mutex);
- g_mutex_unlock(info_mutex);
- }
+ return metadata;
 }
 
 /* MPRIS API */
 // MPRIS /
-gboolean mpris_root_identity(MprisRoot * obj, gchar ** identity, GError ** error)
+bool_t mpris_root_identity(MprisRoot * obj, char ** identity, GError ** error)
 {
 *identity = g_strdup_printf("Audacious %s", VERSION);
 return TRUE;
 }
 
-gboolean mpris_root_quit(MprisPlayer * obj, GError ** error)
+bool_t mpris_root_quit(MprisPlayer * obj, GError ** error)
 {
 event_queue("quit", NULL);
 return TRUE;
@@ -675,43 +330,43 @@
 
 // MPRIS /Player
 
-gboolean mpris_player_next(MprisPlayer * obj, GError * *error)
+bool_t mpris_player_next (MprisPlayer * obj, GError * * error)
 {
- g_timeout_add(0, next_cb, NULL);
+ drct_pl_next ();
 return TRUE;
 }
 
-gboolean mpris_player_prev(MprisPlayer * obj, GError * *error)
+bool_t mpris_player_prev (MprisPlayer * obj, GError * * error)
 {
- g_timeout_add(0, prev_cb, NULL);
+ drct_pl_prev ();
 return TRUE;
 }
 
-gboolean mpris_player_pause(MprisPlayer * obj, GError * *error)
+bool_t mpris_player_pause (MprisPlayer * obj, GError * * error)
 {
- g_timeout_add(0, pause_cb, NULL);
+ drct_pause ();
 return TRUE;
 }
 
-gboolean mpris_player_stop(MprisPlayer * obj, GError * *error)
+bool_t mpris_player_stop (MprisPlayer * obj, GError * * error)
 {
- g_timeout_add(0, stop_cb, NULL);
+ drct_stop ();
 return TRUE;
 }
 
-gboolean mpris_player_play(MprisPlayer * obj, GError * *error)
+bool_t mpris_player_play (MprisPlayer * obj, GError * * error)
 {
- g_timeout_add(0, play_cb, NULL);
+ drct_play ();
 return TRUE;
 }
 
-gboolean mpris_player_repeat(MprisPlayer * obj, gboolean rpt, GError ** error)
+bool_t mpris_player_repeat(MprisPlayer * obj, bool_t rpt, GError ** error)
 {
 fprintf (stderr, "implement me\n");
 return TRUE;
 }
 
-static void append_int_value(GValueArray * ar, gint tmp)
+static void append_int_value(GValueArray * ar, int tmp)
 {
 GValue value;
 memset(&value, 0, sizeof(value));
@@ -720,86 +375,83 @@
 g_value_array_append(ar, &value);
 }
 
-static gint get_playback_status(void)
+static int get_playback_status (void)
 {
- struct StatusRequest request;
- get_status(&request);
+ if (! drct_get_playing ())
+ return MPRIS_STATUS_STOP;
 
- return (!request.playing ? MPRIS_STATUS_STOP : request.paused ? MPRIS_STATUS_PAUSE : MPRIS_STATUS_PLAY);
+ return drct_get_paused () ? MPRIS_STATUS_PAUSE : MPRIS_STATUS_PLAY;
 }
 
-gboolean mpris_player_get_status(MprisPlayer * obj, GValueArray * *status, GError * *error)
+bool_t mpris_player_get_status(MprisPlayer * obj, GValueArray * *status, GError * *error)
 {
 *status = g_value_array_new(4);
 
- append_int_value(*status, (gint) get_playback_status());
+ append_int_value(*status, (int) get_playback_status());
 append_int_value (* status, get_bool (NULL, "shuffle"));
 append_int_value (* status, get_bool (NULL, "no_playlist_advance"));
 append_int_value (* status, get_bool (NULL, "repeat"));
 return TRUE;
 }
 
-gboolean mpris_player_get_metadata(MprisPlayer * obj, GHashTable * *metadata, GError * *error)
+bool_t mpris_player_get_metadata (MprisPlayer * obj, GHashTable * * metadata,
+ GError * * error)
 {
- struct MprisMetadataRequest request = {.playlist = -1,.entry = -1 };
-
- get_mpris_metadata(&request);
- *metadata = request.metadata;
+ int playlist = playlist_get_playing ();
+ int entry = (playlist >= 0) ? playlist_get_position (playlist) : -1;
 
+ * metadata = (entry >= 0) ? get_mpris_metadata (playlist, entry) : NULL;
 if (! * metadata)
 * metadata = g_hash_table_new (g_str_hash, g_str_equal);
 
 return TRUE;
 }
 
-gboolean mpris_player_get_caps(MprisPlayer * obj, gint * capabilities, GError ** error)
+bool_t mpris_player_get_caps(MprisPlayer * obj, int * capabilities, GError ** error)
 {
 *capabilities = MPRIS_CAPS_CAN_GO_NEXT | MPRIS_CAPS_CAN_GO_PREV | MPRIS_CAPS_CAN_PAUSE | MPRIS_CAPS_CAN_PLAY | MPRIS_CAPS_CAN_SEEK | MPRIS_CAPS_CAN_PROVIDE_METADATA | MPRIS_CAPS_PROVIDES_TIMING;
 return TRUE;
 }
 
-gboolean mpris_player_volume_set(MprisPlayer * obj, gint vol, GError ** error)
+bool_t mpris_player_volume_set(MprisPlayer * obj, int vol, GError ** error)
 {
 drct_set_volume_main (vol);
 return TRUE;
 }
 
-gboolean mpris_player_volume_get(MprisPlayer * obj, gint * vol, GError ** error)
+bool_t mpris_player_volume_get(MprisPlayer * obj, int * vol, GError ** error)
 {
 drct_get_volume_main (vol);
 return TRUE;
 }
 
-gboolean mpris_player_position_set(MprisPlayer * obj, gint pos, GError * *error)
+bool_t mpris_player_position_set (MprisPlayer * obj, int pos, GError * * error)
 {
- g_timeout_add(0, seek_cb, GINT_TO_POINTER(pos));
+ drct_seek (pos);
 return TRUE;
 }
 
-gboolean mpris_player_position_get(MprisPlayer * obj, gint * pos, GError * *error)
+bool_t mpris_player_position_get (MprisPlayer * obj, int * pos, GError * * error)
 {
- struct StatusRequest request;
-
- get_status(&request);
- *pos = request.time;
+ * pos = drct_get_time ();
 return TRUE;
 }
 
 // MPRIS /Player signals
-gboolean mpris_emit_caps_change(MprisPlayer * obj)
+bool_t mpris_emit_caps_change(MprisPlayer * obj)
 {
 g_signal_emit(obj, signals[CAPS_CHANGE_SIG], 0, 0);
 return TRUE;
 }
 
-gboolean mpris_emit_track_change(MprisPlayer * obj)
+bool_t mpris_emit_track_change(MprisPlayer * obj)
 {
- gint playlist, entry;
+ int playlist, entry;
 GHashTable *metadata;
 
 playlist = playlist_get_playing();
 entry = playlist_get_position(playlist);
- gchar * filename = playlist_entry_get_filename (playlist, entry);
+ char * filename = playlist_entry_get_filename (playlist, entry);
 Tuple * tuple = playlist_entry_get_tuple (playlist, entry, FALSE);
 
 if (filename && tuple)
@@ -809,21 +461,21 @@
 g_hash_table_destroy (metadata);
 }
 
- g_free (filename);
+ str_unref (filename);
 if (tuple)
- tuple_free (tuple);
+ tuple_unref (tuple);
 
 return (filename && tuple);
 }
 
-gboolean mpris_emit_status_change(MprisPlayer * obj, PlaybackStatus status)
+bool_t mpris_emit_status_change(MprisPlayer * obj, PlaybackStatus status)
 {
 GValueArray *ar = g_value_array_new(4);
 
 if (status == MPRIS_STATUS_INVALID)
 status = get_playback_status ();
 
- append_int_value(ar, (gint) status);
+ append_int_value(ar, (int) status);
 append_int_value (ar, get_bool (NULL, "shuffle"));
 append_int_value (ar, get_bool (NULL, "no_playlist_advance"));
 append_int_value (ar, get_bool (NULL, "repeat"));
@@ -834,7 +486,7 @@
 }
 
 // MPRIS /TrackList
-gboolean mpris_emit_tracklist_change(MprisTrackList * obj, gint playlist)
+bool_t mpris_emit_tracklist_change(MprisTrackList * obj, int playlist)
 {
 g_signal_emit(obj, tracklist_signals[TRACKLIST_CHANGE_SIG], 0, playlist_entry_count(playlist));
 return TRUE;
@@ -842,64 +494,55 @@
 
 static void mpris_playlist_update_hook(gpointer unused, MprisTrackList * obj)
 {
- gint playlist = playlist_get_active();
+ int playlist = playlist_get_active();
 
 mpris_emit_tracklist_change(obj, playlist);
 }
 
-gboolean mpris_tracklist_get_metadata(MprisTrackList * obj, gint pos, GHashTable * *metadata, GError * *error)
+bool_t mpris_tracklist_get_metadata (MprisTrackList * obj, int pos,
+ GHashTable * * metadata, GError * * error)
 {
- struct MprisMetadataRequest request = {.playlist = -1,.entry = pos };
+ * metadata = get_mpris_metadata (playlist_get_active (), pos);
+ if (! * metadata)
+ * metadata = g_hash_table_new (g_str_hash, g_str_equal);
 
- get_mpris_metadata(&request);
- *metadata = request.metadata;
 return TRUE;
 }
 
-gboolean mpris_tracklist_get_current_track(MprisTrackList * obj, gint * pos, GError * *error)
+bool_t mpris_tracklist_get_current_track (MprisTrackList * obj, int * pos,
+ GError * * error)
 {
- struct PositionRequest request = {.playlist = -1,.entry = -1 };
-
- get_position(&request);
- *pos = request.entry;
+ * pos = playlist_get_position (playlist_get_active ());
 return TRUE;
 }
 
-gboolean mpris_tracklist_get_length(MprisTrackList * obj, gint * length, GError * *error)
+bool_t mpris_tracklist_get_length (MprisTrackList * obj, int * length, GError * * error)
 {
- struct PositionRequest request = {.playlist = -1,.entry = -1 };
-
- get_position(&request);
- *length = request.entry_count;
+ * length = playlist_entry_count (playlist_get_active ());
 return TRUE;
 }
 
-gboolean mpris_tracklist_add_track(MprisTrackList * obj, gchar * uri, gboolean play, GError * *error)
+bool_t mpris_tracklist_add_track (MprisTrackList * obj, char * uri, bool_t play,
+ GError * * error)
 {
- struct AddRequest *request = g_malloc(sizeof(struct AddRequest));
-
- request->position = -1;
- request->filename = g_strdup(uri);
- request->play = play;
-
- g_timeout_add(0, add_cb, request);
+ playlist_entry_insert (playlist_get_active (), -1, uri, NULL, play);
 return TRUE;
 }
 
-gboolean mpris_tracklist_del_track(MprisTrackList * obj, gint pos, GError * *error)
+bool_t mpris_tracklist_del_track (MprisTrackList * obj, int pos, GError * * error)
 {
- g_timeout_add(0, delete_cb, GINT_TO_POINTER(pos));
+ playlist_entry_delete (playlist_get_active (), pos, 1);
 return TRUE;
 }
 
-gboolean mpris_tracklist_loop (MprisTrackList * obj, gboolean loop, GError * *
+bool_t mpris_tracklist_loop (MprisTrackList * obj, bool_t loop, GError * *
 error)
 {
 set_bool (NULL, "repeat", loop);
 return TRUE;
 }
 
-gboolean mpris_tracklist_random (MprisTrackList * obj, gboolean random,
+bool_t mpris_tracklist_random (MprisTrackList * obj, bool_t random,
 GError * * error)
 {
 set_bool (NULL, "shuffle", random);
@@ -907,147 +550,130 @@
 }
 
 // Audacious General Information
-gboolean audacious_rc_version(RemoteObject * obj, gchar ** version, GError ** error)
+bool_t audacious_rc_version(RemoteObject * obj, char ** version, GError ** error)
 {
 *version = g_strdup(VERSION);
 return TRUE;
 }
 
-gboolean audacious_rc_quit(RemoteObject * obj, GError * *error)
+bool_t audacious_rc_quit(RemoteObject * obj, GError * *error)
 {
 event_queue("quit", NULL);
 return TRUE;
 }
 
-gboolean audacious_rc_eject(RemoteObject * obj, GError ** error)
+bool_t audacious_rc_eject(RemoteObject * obj, GError ** error)
 {
 interface_show_filebrowser (TRUE);
 return TRUE;
 }
 
-gboolean audacious_rc_main_win_visible (RemoteObject * obj,
- gboolean * visible, GError ** error)
+bool_t audacious_rc_main_win_visible (RemoteObject * obj,
+ bool_t * visible, GError ** error)
 {
 * visible = interface_is_shown ();
 return TRUE;
 }
 
-gboolean audacious_rc_show_main_win (RemoteObject * obj, gboolean show,
+bool_t audacious_rc_show_main_win (RemoteObject * obj, bool_t show,
 GError * * error)
 {
 interface_show (show);
 return TRUE;
 }
 
-gboolean audacious_rc_get_tuple_fields(RemoteObject * obj, gchar *** fields, GError ** error)
+bool_t audacious_rc_get_tuple_fields(RemoteObject * obj, char *** fields, GError ** error)
 {
- gchar **res = g_new0(gchar *, FIELD_LAST + 1);
- gint i;
- for (i = 0; i < FIELD_LAST; i++)
- {
- res[i] = g_strdup(tuple_fields[i].name);
- }
- *fields = res;
+ * fields = g_new (char *, TUPLE_FIELDS);
+
+ for (int i = 0; i < TUPLE_FIELDS; i ++)
+ (* fields)[i] = g_strdup (tuple_field_get_name (i));
 
+ (* fields)[TUPLE_FIELDS] = NULL;
 return TRUE;
 }
 
 
 // Playback Information/Manipulation
 
-gboolean audacious_rc_play(RemoteObject * obj, GError * *error)
+bool_t audacious_rc_play (RemoteObject * obj, GError * * error)
 {
- g_timeout_add(0, play_cb, NULL);
+ drct_play ();
 return TRUE;
 }
 
-gboolean audacious_rc_pause(RemoteObject * obj, GError * *error)
+bool_t audacious_rc_pause (RemoteObject * obj, GError * * error)
 {
- g_timeout_add(0, pause_cb, NULL);
+ drct_pause ();
 return TRUE;
 }
 
-gboolean audacious_rc_stop(RemoteObject * obj, GError * *error)
+bool_t audacious_rc_stop (RemoteObject * obj, GError * * error)
 {
- g_timeout_add(0, stop_cb, NULL);
+ drct_stop ();
 return TRUE;
 }
 
-gboolean audacious_rc_playing(RemoteObject * obj, gboolean * is_playing, GError * *error)
+bool_t audacious_rc_playing (RemoteObject * obj, bool_t * is_playing, GError * * error)
 {
- struct StatusRequest request;
-
- get_status(&request);
- *is_playing = request.playing;
+ * is_playing = drct_get_playing ();
 return TRUE;
 }
 
-gboolean audacious_rc_paused(RemoteObject * obj, gboolean * is_paused, GError * *error)
+bool_t audacious_rc_paused (RemoteObject * obj, bool_t * is_paused, GError * * error)
 {
- struct StatusRequest request;
-
- get_status(&request);
- *is_paused = request.paused;
+ * is_paused = drct_get_paused ();
 return TRUE;
 }
 
-gboolean audacious_rc_stopped(RemoteObject * obj, gboolean * is_stopped, GError * *error)
+bool_t audacious_rc_stopped (RemoteObject * obj, bool_t * is_stopped, GError * * error)
 {
- struct StatusRequest request;
-
- get_status(&request);
- *is_stopped = !request.playing;
+ * is_stopped = ! drct_get_playing ();
 return TRUE;
 }
 
-gboolean audacious_rc_status(RemoteObject * obj, gchar * *status, GError * *error)
+bool_t audacious_rc_status (RemoteObject * obj, char * * status, GError * * error)
 {
- struct StatusRequest request;
+ if (drct_get_playing ())
+ * status = strdup (drct_get_paused () ? "paused" : "playing");
+ else
+ * status = strdup ("stopped");
 
- get_status(&request);
- *status = g_strdup(!request.playing ? "stopped" : request.paused ? "paused" : "playing");
 return TRUE;
 }
 
-gboolean audacious_rc_info(RemoteObject * obj, gint * rate, gint * freq, gint * nch, GError * *error)
+bool_t audacious_rc_info (RemoteObject * obj, int * rate, int * freq, int * nch,
+ GError * * error)
 {
- struct StatusRequest request;
-
- get_status(&request);
- *rate = request.bitrate;
- *freq = request.samplerate;
- *nch = request.channels;
+ drct_get_info (rate, freq, nch);
 return TRUE;
 }
 
-gboolean audacious_rc_time(RemoteObject * obj, gint * time, GError * *error)
+bool_t audacious_rc_time (RemoteObject * obj, int * time, GError * * error)
 {
- struct StatusRequest request;
-
- get_status(&request);
- *time = request.time;
+ * time = drct_get_time ();
 return TRUE;
 }
 
-gboolean audacious_rc_seek(RemoteObject * obj, guint pos, GError * *error)
+bool_t audacious_rc_seek (RemoteObject * obj, unsigned int pos, GError * * error)
 {
- g_timeout_add(0, seek_cb, GINT_TO_POINTER(pos));
+ drct_seek (pos);
 return TRUE;
 }
 
-gboolean audacious_rc_volume(RemoteObject * obj, gint * vl, gint * vr, GError ** error)
+bool_t audacious_rc_volume(RemoteObject * obj, int * vl, int * vr, GError ** error)
 {
 drct_get_volume (vl, vr);
 return TRUE;
 }
 
-gboolean audacious_rc_set_volume(RemoteObject * obj, gint vl, gint vr, GError ** error)
+bool_t audacious_rc_set_volume(RemoteObject * obj, int vl, int vr, GError ** error)
 {
 drct_set_volume (vl, vr);
 return TRUE;
 }
 
-gboolean audacious_rc_balance(RemoteObject * obj, gint * balance, GError ** error)
+bool_t audacious_rc_balance(RemoteObject * obj, int * balance, GError ** error)
 {
 drct_get_volume_balance (balance);
 return TRUE;
@@ -1055,388 +681,362 @@
 
 // Playlist Information/Manipulation
 
-gboolean audacious_rc_position(RemoteObject * obj, gint * pos, GError * *error)
+bool_t audacious_rc_position (RemoteObject * obj, int * pos, GError * * error)
 {
- struct PositionRequest request = {.playlist = -1,.entry = -1 };
-
- get_position(&request);
- *pos = request.entry;
+ * pos = playlist_get_position (playlist_get_active ());
 return TRUE;
 }
 
-gboolean audacious_rc_advance(RemoteObject * obj, GError * *error)
+bool_t audacious_rc_advance(RemoteObject * obj, GError * *error)
 {
- g_timeout_add(0, next_cb, NULL);
+ drct_pl_next ();
 return TRUE;
 }
 
-gboolean audacious_rc_reverse(RemoteObject * obj, GError * *error)
+bool_t audacious_rc_reverse (RemoteObject * obj, GError * * error)
 {
- g_timeout_add(0, prev_cb, NULL);
+ drct_pl_prev ();
 return TRUE;
 }
 
-gboolean audacious_rc_length(RemoteObject * obj, gint * length, GError * *error)
+bool_t audacious_rc_length (RemoteObject * obj, int * length, GError * * error)
 {
- struct PositionRequest request = {.playlist = -1,.entry = -1 };
-
- get_position(&request);
- *length = request.entry_count;
+ * length = playlist_entry_count (playlist_get_active ());
 return TRUE;
 }
 
-gboolean audacious_rc_song_title(RemoteObject * obj, guint pos, gchar * *title, GError * *error)
+bool_t audacious_rc_song_title (RemoteObject * obj, unsigned int pos, char * *
+ title, GError * * error)
 {
- struct InfoRequest request = {.playlist = -1,.entry = pos };
-
- get_info(&request);
- g_free(request.filename);
- g_free(request.pltitle);
- *title = request.title;
+ char * title2 = playlist_entry_get_title (playlist_get_active (), pos, FALSE);
+ * title = strdup (title2);
+ str_unref (title2);
 return TRUE;
 }
 
-gboolean audacious_rc_song_filename(RemoteObject * obj, guint pos, gchar * *filename, GError * *error)
+bool_t audacious_rc_song_filename (RemoteObject * obj, unsigned int pos,
+ char * * filename, GError * * error)
 {
- struct InfoRequest request = {.playlist = -1,.entry = pos };
-
- get_info(&request);
- *filename = request.filename;
- g_free(request.title);
- g_free(request.pltitle);
+ char * filename2 = playlist_entry_get_filename (playlist_get_active (), pos);
+ * filename = strdup (filename2);
+ str_unref (filename2);
 return TRUE;
 }
 
-gboolean audacious_rc_song_length(RemoteObject * obj, guint pos, gint * length, GError * *error)
+bool_t audacious_rc_song_length(RemoteObject * obj, unsigned int pos, int * length, GError * *error)
 {
 audacious_rc_song_frames(obj, pos, length, error);
 *length /= 1000;
 return TRUE;
 }
 
-gboolean audacious_rc_song_frames(RemoteObject * obj, guint pos, gint * length, GError * *error)
+bool_t audacious_rc_song_frames (RemoteObject * obj, unsigned int pos, int *
+ length, GError * * error)
 {
- struct InfoRequest request = {.playlist = -1,.entry = pos };
-
- get_info(&request);
- g_free(request.filename);
- g_free(request.title);
- g_free(request.pltitle);
- *length = request.length;
+ * length = playlist_entry_get_length (playlist_get_active (), pos, FALSE);
 return TRUE;
 }
 
-gboolean audacious_rc_song_tuple(RemoteObject * obj, guint pos, gchar * field, GValue * value, GError * *error)
+bool_t audacious_rc_song_tuple (RemoteObject * obj, unsigned int pos, char *
+ field, GValue * value, GError * * error)
 {
- struct FieldRequest request = {.playlist = -1,.entry = pos,.field = field };
-
- get_field(&request);
-
- if (request.value == NULL)
+ GValue * value2 = get_field (playlist_get_active (), pos, field);
+ if (! value2)
 return FALSE;
 
- memset(value, 0, sizeof(GValue));
- g_value_init(value, G_VALUE_TYPE(request.value));
- g_value_copy(request.value, value);
- g_value_unset(request.value);
- g_free(request.value);
+ memset (value, 0, sizeof (GValue));
+ g_value_init (value, G_VALUE_TYPE (value2));
+ g_value_copy (value2, value);
+ g_value_unset (value2);
+ g_free (value2);
 return TRUE;
 }
 
-gboolean audacious_rc_jump(RemoteObject * obj, guint pos, GError * *error)
+bool_t audacious_rc_jump (RemoteObject * obj, unsigned int pos, GError * * error)
 {
- g_timeout_add(0, jump_cb, GINT_TO_POINTER(pos));
+ playlist_set_position (playlist_get_active (), pos);
 return TRUE;
 }
 
-gboolean audacious_rc_add(RemoteObject * obj, gchar * file, GError * *error)
+bool_t audacious_rc_add(RemoteObject * obj, char * file, GError * *error)
 {
 return audacious_rc_playlist_ins_url_string(obj, file, -1, error);
 }
 
-gboolean audacious_rc_add_url(RemoteObject * obj, gchar * file, GError * *error)
+bool_t audacious_rc_add_url(RemoteObject * obj, char * file, GError * *error)
 {
 return audacious_rc_playlist_ins_url_string(obj, file, -1, error);
 }
 
-static GList * string_array_to_list (gchar * * strings)
+static Index * strings_to_index (char * * strings)
 {
- GList * list = NULL;
+ Index * index = index_new ();
 
- while (* strings != NULL)
- list = g_list_prepend (list, * strings ++);
+ while (* strings)
+ index_append (index, str_get (* strings ++));
 
- return g_list_reverse (list);
+ return index;
 }
 
-gboolean audacious_rc_add_list (RemoteObject * obj, gchar * * filenames,
+bool_t audacious_rc_add_list (RemoteObject * obj, char * * filenames,
 GError * * error)
 {
- GList * list = string_array_to_list (filenames);
-
- drct_pl_add_list (list, -1);
- g_list_free (list);
+ drct_pl_add_list (strings_to_index (filenames), -1);
 return TRUE;
 }
 
-gboolean audacious_rc_open_list (RemoteObject * obj, gchar * * filenames,
+bool_t audacious_rc_open_list (RemoteObject * obj, char * * filenames,
 GError * * error)
 {
- GList * list = string_array_to_list (filenames);
-
- drct_pl_open_list (list);
- g_list_free (list);
+ drct_pl_open_list (strings_to_index (filenames));
 return TRUE;
 }
 
-gboolean audacious_rc_open_list_to_temp (RemoteObject * obj, gchar * *
+bool_t audacious_rc_open_list_to_temp (RemoteObject * obj, char * *
 filenames, GError * * error)
 {
- GList * list = string_array_to_list (filenames);
-
- drct_pl_open_temp_list (list);
- g_list_free (list);
+ drct_pl_open_temp_list (strings_to_index (filenames));
 return TRUE;
 }
 
-gboolean audacious_rc_delete(RemoteObject * obj, guint pos, GError * *error)
+bool_t audacious_rc_delete (RemoteObject * obj, unsigned int pos, GError * * error)
 {
- g_timeout_add(0, delete_cb, GINT_TO_POINTER(pos));
+ playlist_entry_delete (playlist_get_active (), pos, 1);
 return TRUE;
 }
 
-gboolean audacious_rc_clear(RemoteObject * obj, GError * *error)
+bool_t audacious_rc_clear (RemoteObject * obj, GError * * error)
 {
- g_timeout_add(0, clear_cb, NULL);
+ int playlist = playlist_get_active ();
+ playlist_entry_delete (playlist, 0, playlist_entry_count (playlist));
 return TRUE;
 }
 
-gboolean audacious_rc_auto_advance(RemoteObject * obj, gboolean * is_advance, GError ** error)
+bool_t audacious_rc_auto_advance(RemoteObject * obj, bool_t * is_advance, GError ** error)
 {
 * is_advance = ! get_bool (NULL, "no_playlist_advance");
 return TRUE;
 }
 
-gboolean audacious_rc_toggle_auto_advance(RemoteObject * obj, GError ** error)
+bool_t audacious_rc_toggle_auto_advance(RemoteObject * obj, GError ** error)
 {
 set_bool (NULL, "no_playlist_advance", ! get_bool (NULL, "no_playlist_advance"));
 return TRUE;
 }
 
-gboolean audacious_rc_repeat(RemoteObject * obj, gboolean * is_repeating, GError ** error)
+bool_t audacious_rc_repeat(RemoteObject * obj, bool_t * is_repeating, GError ** error)
 {
 *is_repeating = get_bool (NULL, "repeat");
 return TRUE;
 }
 
-gboolean audacious_rc_toggle_repeat (RemoteObject * obj, GError * * error)
+bool_t audacious_rc_toggle_repeat (RemoteObject * obj, GError * * error)
 {
 set_bool (NULL, "repeat", ! get_bool (NULL, "repeat"));
 return TRUE;
 }
 
-gboolean audacious_rc_shuffle(RemoteObject * obj, gboolean * is_shuffling, GError ** error)
+bool_t audacious_rc_shuffle(RemoteObject * obj, bool_t * is_shuffling, GError ** error)
 {
 *is_shuffling = get_bool (NULL, "shuffle");
 return TRUE;
 }
 
-gboolean audacious_rc_toggle_shuffle (RemoteObject * obj, GError * * error)
+bool_t audacious_rc_toggle_shuffle (RemoteObject * obj, GError * * error)
 {
 set_bool (NULL, "shuffle", ! get_bool (NULL, "shuffle"));
 return TRUE;
 }
 
-gboolean audacious_rc_stop_after (RemoteObject * obj, gboolean * is_stopping, GError * * error)
+bool_t audacious_rc_stop_after (RemoteObject * obj, bool_t * is_stopping, GError * * error)
 {
 * is_stopping = get_bool (NULL, "stop_after_current_song");
 return TRUE;
 }
 
-gboolean audacious_rc_toggle_stop_after (RemoteObject * obj, GError * * error)
+bool_t audacious_rc_toggle_stop_after (RemoteObject * obj, GError * * error)
 {
 set_bool (NULL, "stop_after_current_song", ! get_bool (NULL, "stop_after_current_song"));
 return TRUE;
 }
 
 /* New on Oct 5 */
-gboolean audacious_rc_show_prefs_box(RemoteObject * obj, gboolean show, GError ** error)
+bool_t audacious_rc_show_prefs_box(RemoteObject * obj, bool_t show, GError ** error)
 {
 event_queue("prefswin show", GINT_TO_POINTER(show));
 return TRUE;
 }
 
-gboolean audacious_rc_show_about_box(RemoteObject * obj, gboolean show, GError ** error)
+bool_t audacious_rc_show_about_box(RemoteObject * obj, bool_t show, GError ** error)
 {
 event_queue("aboutwin show", GINT_TO_POINTER(show));
 return TRUE;
 }
 
-gboolean audacious_rc_show_jtf_box(RemoteObject * obj, gboolean show, GError ** error)
+bool_t audacious_rc_show_jtf_box(RemoteObject * obj, bool_t show, GError ** error)
 {
 if (show)
- event_queue("interface show jump to track", NULL);
- else
- event_queue("interface hide jump to track", NULL);
+ interface_show_jump_to_track ();
+
 return TRUE;
 }
 
-gboolean audacious_rc_show_filebrowser(RemoteObject * obj, gboolean show, GError ** error)
+bool_t audacious_rc_show_filebrowser(RemoteObject * obj, bool_t show, GError ** error)
 {
 if (show)
- event_queue("filebrowser show", GINT_TO_POINTER(FALSE));
- else
- event_queue("filebrowser hide", NULL);
+ interface_show_filebrowser (FALSE);
+
 return TRUE;
 }
 
-gboolean audacious_rc_play_pause(RemoteObject * obj, GError * *error)
+bool_t audacious_rc_play_pause (RemoteObject * obj, GError * * error)
 {
- g_timeout_add(0, play_pause_cb, NULL);
+ if (drct_get_playing ())
+ drct_pause ();
+ else
+ drct_play ();
+
 return TRUE;
 }
 
-gboolean audacious_rc_get_info(RemoteObject * obj, gint * rate, gint * freq, gint * nch, GError * *error)
+bool_t audacious_rc_get_info (RemoteObject * obj, int * rate, int * freq,
+ int * nch, GError * * error)
 {
- struct StatusRequest request;
-
- get_status(&request);
- *rate = request.bitrate;
- *freq = request.samplerate;
- *nch = request.channels;
+ drct_get_info (rate, freq, nch);
 return TRUE;
 }
 
-gboolean audacious_rc_toggle_aot(RemoteObject * obj, gboolean ontop, GError ** error)
+bool_t audacious_rc_toggle_aot(RemoteObject * obj, bool_t ontop, GError ** error)
 {
 hook_call("mainwin set always on top", &ontop);
 return TRUE;
 }
 
-gboolean audacious_rc_playqueue_add(RemoteObject * obj, gint pos, GError * *error)
+bool_t audacious_rc_playqueue_add (RemoteObject * obj, int pos, GError * * error)
 {
- g_timeout_add(0, add_to_queue_cb, GINT_TO_POINTER(pos));
+ playlist_queue_insert (playlist_get_active (), -1, pos);
 return TRUE;
 }
 
-gboolean audacious_rc_playqueue_remove(RemoteObject * obj, gint pos, GError * *error)
+bool_t audacious_rc_playqueue_remove (RemoteObject * obj, int pos, GError * * error)
 {
- g_timeout_add(0, remove_from_queue_cb, GINT_TO_POINTER(pos));
+ int playlist = playlist_get_active ();
+ int at = playlist_queue_find_entry (playlist, pos);
+
+ if (at >= 0)
+ playlist_queue_delete (playlist, at, 1);
+
 return TRUE;
 }
 
-gboolean audacious_rc_playqueue_clear(RemoteObject * obj, GError * *error)
+bool_t audacious_rc_playqueue_clear (RemoteObject * obj, GError * * error)
 {
- g_timeout_add(0, clear_queue_cb, NULL);
+ int playlist = playlist_get_active ();
+ playlist_queue_delete (playlist, 0, playlist_queue_count (playlist));
 return TRUE;
 }
 
-gboolean audacious_rc_get_playqueue_length(RemoteObject * obj, gint * length, GError * *error)
+bool_t audacious_rc_get_playqueue_length (RemoteObject * obj, int * length,
+ GError * * error)
 {
- struct PositionRequest request = {.playlist = -1,.entry = -1 };
-
- get_position(&request);
- *length = request.queue_count;
+ * length = playlist_queue_count (playlist_get_active ());
 return TRUE;
 }
 
-gboolean audacious_rc_queue_get_list_pos(RemoteObject * obj, gint qpos, gint * pos, GError * *error)
+bool_t audacious_rc_queue_get_list_pos (RemoteObject * obj, int qpos, int * pos,
+ GError * * error)
 {
- *pos = queue_get_entry(qpos);
+ * pos = playlist_queue_get_entry (playlist_get_active (), qpos);
 return TRUE;
 }
 
-gboolean audacious_rc_queue_get_queue_pos(RemoteObject * obj, gint pos, gint * qpos, GError * *error)
+bool_t audacious_rc_queue_get_queue_pos (RemoteObject * obj, int pos, int *
+ qpos, GError * * error)
 {
- *qpos = queue_find_entry(pos);
+ * qpos = playlist_queue_find_entry (playlist_get_active (), pos);
 return TRUE;
 }
 
-gboolean audacious_rc_playqueue_is_queued(RemoteObject * obj, gint pos, gboolean * is_queued, GError * *error)
+bool_t audacious_rc_playqueue_is_queued (RemoteObject * obj, int pos, bool_t *
+ is_queued, GError * * error)
 {
- *is_queued = (queue_find_entry(pos) != -1);
+ * is_queued = (playlist_queue_find_entry (playlist_get_active (), pos) >= 0);
 return TRUE;
 }
 
-gboolean audacious_rc_playlist_ins_url_string(RemoteObject * obj, gchar * url, gint pos, GError * *error)
+bool_t audacious_rc_playlist_ins_url_string (RemoteObject * obj, char * url, int
+ pos, GError * * error)
 {
- struct AddRequest *request = g_malloc(sizeof(struct AddRequest));
-
- request->position = pos;
- request->filename = g_strdup(url);
- request->play = FALSE;
-
- g_timeout_add(0, add_cb, request);
+ playlist_entry_insert (playlist_get_active (), pos, url, NULL, FALSE);
 return TRUE;
 }
 
-gboolean audacious_rc_playlist_add(RemoteObject * obj, void *list, GError * *error)
+bool_t audacious_rc_playlist_add(RemoteObject * obj, void *list, GError * *error)
 {
 return audacious_rc_playlist_ins_url_string(obj, list, -1, error);
 }
 
-gboolean audacious_rc_playlist_enqueue_to_temp(RemoteObject * obj, gchar * url, GError * *error)
+bool_t audacious_rc_playlist_enqueue_to_temp (RemoteObject * obj, char * url,
+ GError * * error)
 {
- g_timeout_add(0, add_to_new_playlist_cb, g_strdup(url));
+ drct_pl_open_temp (url);
 return TRUE;
 }
 
 /* New on Nov 7: Equalizer */
-gboolean audacious_rc_get_eq(RemoteObject * obj, gdouble * preamp, GArray ** bands, GError ** error)
+bool_t audacious_rc_get_eq(RemoteObject * obj, double * preamp, GArray ** bands, GError ** error)
 {
 * preamp = get_double (NULL, "equalizer_preamp");
- * bands = g_array_new (FALSE, FALSE, sizeof (gdouble));
+ * bands = g_array_new (FALSE, FALSE, sizeof (double));
 g_array_set_size (* bands, AUD_EQUALIZER_NBANDS);
- eq_get_bands ((gdouble *) (* bands)->data);
+ eq_get_bands ((double *) (* bands)->data);
 
 return TRUE;
 }
 
-gboolean audacious_rc_get_eq_preamp(RemoteObject * obj, gdouble * preamp, GError ** error)
+bool_t audacious_rc_get_eq_preamp(RemoteObject * obj, double * preamp, GError ** error)
 {
 * preamp = get_double (NULL, "equalizer_preamp");
 return TRUE;
 }
 
-gboolean audacious_rc_get_eq_band(RemoteObject * obj, gint band, gdouble * value, GError ** error)
+bool_t audacious_rc_get_eq_band(RemoteObject * obj, int band, double * value, GError ** error)
 {
 * value = eq_get_band (band);
 return TRUE;
 }
 
-gboolean audacious_rc_set_eq(RemoteObject * obj, gdouble preamp, GArray * bands, GError ** error)
+bool_t audacious_rc_set_eq(RemoteObject * obj, double preamp, GArray * bands, GError ** error)
 {
 set_double (NULL, "equalizer_preamp", preamp);
- eq_set_bands ((gdouble *) bands->data);
+ eq_set_bands ((double *) bands->data);
 return TRUE;
 }
 
-gboolean audacious_rc_set_eq_preamp(RemoteObject * obj, gdouble preamp, GError ** error)
+bool_t audacious_rc_set_eq_preamp(RemoteObject * obj, double preamp, GError ** error)
 {
 set_double (NULL, "equalizer_preamp", preamp);
 return TRUE;
 }
 
-gboolean audacious_rc_set_eq_band(RemoteObject * obj, gint band, gdouble value, GError ** error)
+bool_t audacious_rc_set_eq_band(RemoteObject * obj, int band, double value, GError ** error)
 {
 eq_set_band (band, value);
 return TRUE;
 }
 
-gboolean audacious_rc_equalizer_activate(RemoteObject * obj, gboolean active, GError ** error)
+bool_t audacious_rc_equalizer_activate(RemoteObject * obj, bool_t active, GError ** error)
 {
 set_bool (NULL, "equalizer_active", active);
 return TRUE;
 }
 
-gboolean audacious_rc_get_active_playlist_name(RemoteObject * obj, gchar * *title, GError * *error)
+bool_t audacious_rc_get_active_playlist_name (RemoteObject * obj, char * *
+ title, GError * * error)
 {
- struct InfoRequest request = {.playlist = -2 };
-
- get_info(&request);
- g_free(request.title);
- g_free(request.filename);
- *title = request.pltitle;
+ char * title2 = playlist_get_title (playlist_get_active ());
+ * title = strdup (title2);
+ str_unref (title2);
 return TRUE;
 }

audacious-3.1.1.tar.bz2/src/audacious/dbus.h -> audacious-3.2.4.tar.bz2/src/audacious/dbus.h Changed

audacious-3.1.1.tar.bz2/src/audacious/drct-api.h -> audacious-3.2.4.tar.bz2/src/audacious/drct-api.h Changed

@@ -25,63 +25,49 @@
 
 /* --- PROGRAM CONTROL --- */
 
-AUD_FUNC0 (void, drct_quit)
+AUD_VFUNC0 (drct_quit)
 
 /* --- PLAYBACK CONTROL --- */
 
-AUD_FUNC0 (void, drct_play)
-AUD_FUNC0 (void, drct_pause)
-AUD_FUNC0 (void, drct_stop)
-AUD_FUNC0 (gboolean, drct_get_playing)
-AUD_FUNC0 (gboolean, drct_get_paused)
-AUD_FUNC0 (gchar *, drct_get_title)
-AUD_FUNC3 (void, drct_get_info, gint *, bitrate, gint *, samplerate, gint *,
- channels)
-AUD_FUNC0 (gint, drct_get_time)
-AUD_FUNC0 (gint, drct_get_length)
-AUD_FUNC1 (void, drct_seek, gint, time)
+/* The strings returned by drct_get_filename() and drct_get_title() are pooled
+ * and must be freed with str_unref(). */
+
+AUD_VFUNC0 (drct_play)
+AUD_VFUNC0 (drct_pause)
+AUD_VFUNC0 (drct_stop)
+AUD_FUNC0 (bool_t, drct_get_playing)
+AUD_FUNC0 (bool_t, drct_get_ready)
+AUD_FUNC0 (bool_t, drct_get_paused)
+AUD_FUNC0 (char *, drct_get_filename)
+AUD_FUNC0 (char *, drct_get_title)
+AUD_VFUNC3 (drct_get_info, int *, bitrate, int *, samplerate, int *, channels)
+AUD_FUNC0 (int, drct_get_time)
+AUD_FUNC0 (int, drct_get_length)
+AUD_VFUNC1 (drct_seek, int, time)
 
 /* --- VOLUME CONTROL --- */
 
-AUD_FUNC2 (void, drct_get_volume, gint *, left, gint *, right)
-AUD_FUNC2 (void, drct_set_volume, gint, left, gint, right)
-AUD_FUNC1 (void, drct_get_volume_main, gint *, volume)
-AUD_FUNC1 (void, drct_set_volume_main, gint, volume)
-AUD_FUNC1 (void, drct_get_volume_balance, gint *, balance)
-AUD_FUNC1 (void, drct_set_volume_balance, gint, balance)
+AUD_VFUNC2 (drct_get_volume, int *, left, int *, right)
+AUD_VFUNC2 (drct_set_volume, int, left, int, right)
+AUD_VFUNC1 (drct_get_volume_main, int *, volume)
+AUD_VFUNC1 (drct_set_volume_main, int, volume)
+AUD_VFUNC1 (drct_get_volume_balance, int *, balance)
+AUD_VFUNC1 (drct_set_volume_balance, int, balance)
 
 /* --- PLAYLIST CONTROL --- */
 
-AUD_FUNC0 (gint, drct_pl_get_length)
-AUD_FUNC0 (void, drct_pl_next)
-AUD_FUNC0 (void, drct_pl_prev)
-AUD_FUNC0 (gint, drct_pl_get_pos)
-AUD_FUNC1 (void, drct_pl_set_pos, gint, pos)
+/* The indexes passed to drct_pl_add_list(), drct_pl_open_list(), and
+ * drct_pl_open_temp_list() contain pooled strings to which the caller gives up
+ * one reference.  The indexes themselves are freed by these functions. */
 
-AUD_FUNC1 (gchar *, drct_pl_get_file, gint, entry)
-AUD_FUNC1 (gchar *, drct_pl_get_title, gint, entry)
-AUD_FUNC1 (gint, drct_pl_get_time, gint, entry)
+AUD_VFUNC0 (drct_pl_next)
+AUD_VFUNC0 (drct_pl_prev)
 
-AUD_FUNC2 (void, drct_pl_add, const gchar *, filename, gint, at)
-AUD_FUNC2 (void, drct_pl_add_list, GList *, list, gint, at)
-AUD_FUNC1 (void, drct_pl_open, const gchar *, filename)
-AUD_FUNC1 (void, drct_pl_open_list, GList *, list)
-AUD_FUNC1 (void, drct_pl_open_temp, const gchar *, filename)
-AUD_FUNC1 (void, drct_pl_open_temp_list, GList *, list)
+AUD_VFUNC2 (drct_pl_add, const char *, filename, int, at)
+AUD_VFUNC2 (drct_pl_add_list, Index *, filenames, int, at)
+AUD_VFUNC1 (drct_pl_open, const char *, filename)
+AUD_VFUNC1 (drct_pl_open_list, Index *, filenames)
+AUD_VFUNC1 (drct_pl_open_temp, const char *, filename)
+AUD_VFUNC1 (drct_pl_open_temp_list, Index *, filenames)
 
-AUD_FUNC1 (void, drct_pl_delete, gint, entry)
-AUD_FUNC0 (void, drct_pl_delete_selected)
-AUD_FUNC0 (void, drct_pl_clear)
-
-/* --- PLAYLIST QUEUE CONTROL --- */
-
-AUD_FUNC0 (gint, drct_pq_get_length)
-AUD_FUNC1 (gint, drct_pq_get_entry, gint, queue_position)
-AUD_FUNC1 (gboolean, drct_pq_is_queued, gint, entry)
-AUD_FUNC1 (gint, drct_pq_get_queue_position, gint, entry)
-AUD_FUNC1 (void, drct_pq_add, gint, entry)
-AUD_FUNC1 (void, drct_pq_remove, gint, entry)
-AUD_FUNC0 (void, drct_pq_clear)
-
-/* New in 2.5-alpha2 */
-AUD_FUNC0 (gboolean, drct_get_ready)
+AUD_VFUNC1 (drct_pl_delete_selected, int, playlist)

audacious-3.1.1.tar.bz2/src/audacious/drct.c -> audacious-3.2.4.tar.bz2/src/audacious/drct.c Changed

@@ -67,70 +67,75 @@
 playback_stop ();
 }
 
-gboolean drct_get_playing (void)
+bool_t drct_get_playing (void)
 {
 return playback_get_playing ();
 }
 
-gboolean drct_get_ready (void)
+bool_t drct_get_ready (void)
 {
 return playback_get_ready ();
 }
 
-gboolean drct_get_paused (void)
+bool_t drct_get_paused (void)
 {
 return playback_get_paused ();
 }
 
-gchar * drct_get_title (void)
+char * drct_get_filename (void)
+{
+ return playback_get_filename ();
+}
+
+char * drct_get_title (void)
 {
 return playback_get_title ();
 }
 
-void drct_get_info (gint * bitrate, gint * samplerate, gint * channels)
+void drct_get_info (int * bitrate, int * samplerate, int * channels)
 {
 playback_get_info (bitrate, samplerate, channels);
 }
 
-gint drct_get_time (void)
+int drct_get_time (void)
 {
 return playback_get_time ();
 }
 
-gint drct_get_length (void)
+int drct_get_length (void)
 {
 return playback_get_length ();
 }
 
-void drct_seek (gint time)
+void drct_seek (int time)
 {
 playback_seek (time);
 }
 
 /* --- VOLUME CONTROL --- */
 
-void drct_get_volume (gint * left, gint * right)
+void drct_get_volume (int * left, int * right)
 {
 playback_get_volume (left, right);
 * left = CLAMP (* left, 0, 100);
 * right = CLAMP (* right, 0, 100);
 }
 
-void drct_set_volume (gint left, gint right)
+void drct_set_volume (int left, int right)
 {
 playback_set_volume (CLAMP (left, 0, 100), CLAMP (right, 0, 100));
 }
 
-void drct_get_volume_main (gint * volume)
+void drct_get_volume_main (int * volume)
 {
- gint left, right;
+ int left, right;
 drct_get_volume (& left, & right);
 * volume = MAX (left, right);
 }
 
-void drct_set_volume_main (gint volume)
+void drct_set_volume_main (int volume)
 {
- gint left, right, current;
+ int left, right, current;
 drct_get_volume (& left, & right);
 current = MAX (left, right);
 
@@ -140,9 +145,9 @@
 drct_set_volume (volume, volume);
 }
 
-void drct_get_volume_balance (gint * balance)
+void drct_get_volume_balance (int * balance)
 {
- gint left, right;
+ int left, right;
 drct_get_volume (& left, & right);
 
 if (left == right)
@@ -153,9 +158,9 @@
 * balance = 100 - left * 100 / right;
 }
 
-void drct_set_volume_balance (gint balance)
+void drct_set_volume_balance (int balance)
 {
- gint left, right;
+ int left, right;
 drct_get_volume_main (& left);
 
 if (balance < 0)
@@ -171,14 +176,9 @@
 
 /* --- PLAYLIST CONTROL --- */
 
-gint drct_pl_get_length (void)
-{
- return playlist_entry_count (playlist_get_active ());
-}
-
 void drct_pl_next (void)
 {
- gboolean play = playback_get_playing ();
+ bool_t play = playback_get_playing ();
 if (playlist_get_playing () < 0)
 playlist_set_playing (playlist_get_active ());
 if (playlist_next_song (playlist_get_playing (), get_bool (NULL, "repeat")) && play)
@@ -187,80 +187,19 @@
 
 void drct_pl_prev (void)
 {
- gboolean play = playback_get_playing ();
+ bool_t play = playback_get_playing ();
 if (playlist_get_playing () < 0)
 playlist_set_playing (playlist_get_active ());
 if (playlist_prev_song (playlist_get_playing ()) && play)
 playback_play (0, FALSE);
 }
 
-gint drct_pl_get_pos (void)
-{
- return playlist_get_position (playlist_get_active ());
-}
-
-void drct_pl_set_pos (gint pos)
-{
- gint playlist = playlist_get_active ();
- gboolean play = playback_get_playing ();
-
- playlist_set_position (playlist, pos);
-
- if (play)
- {
- playlist_set_playing (playlist);
- playback_play (0, FALSE);
- }
-}
-
-gchar * drct_pl_get_file (gint entry)
-{
- return playlist_entry_get_filename (playlist_get_active (), entry);
-}
-
-gchar * drct_pl_get_title (gint entry)
-{
- return playlist_entry_get_title (playlist_get_active (), entry, FALSE);
-}
-
-gint drct_pl_get_time (gint pos)
-{
- return playlist_entry_get_length (playlist_get_active (), pos, FALSE);
-}
-
-static void activate_temp (void)
-{
- gint playlists = playlist_count ();
- const gchar * title = _("Temporary Playlist");
-
- for (gint playlist = 0; playlist < playlists; playlist ++)
- {
- gchar * title2 = playlist_get_title (playlist);
- if (! strcmp (title2, title))
- {
- playlist_set_active (playlist);
- g_free (title2);
- return;
- }
- g_free (title2);
- }
-
- if (! playlist_entry_count (playlist_get_active ()))
- playlist_set_title (playlist_get_active (), title);
- else
- {
- playlist_insert (playlists);
- playlist_set_title (playlists, title);
- playlist_set_active (playlists);
- }
-}
-
-static void add_list (GList * list, gint at, gboolean to_temp, gboolean play)
+static void add_list (Index * filenames, int at, bool_t to_temp, bool_t play)
 {
 if (to_temp)
- activate_temp ();
+ playlist_set_active (playlist_get_temporary ());
 
- gint playlist = playlist_get_active ();
+ int playlist = playlist_get_active ();
 
 if (play)
 {
@@ -270,52 +209,43 @@
 playlist_queue_delete (playlist, 0, playlist_queue_count (playlist));
 }
 
- struct index * filenames = index_new ();
- for (; list != NULL; list = list->next)
- index_append (filenames, g_strdup (list->data));
-
 playlist_entry_insert_batch (playlist, at, filenames, NULL, play);
 }
 
-void drct_pl_add (const gchar * filename, gint at)
+void drct_pl_add (const char * filename, int at)
 {
- GList * list = g_list_prepend (NULL, (void *) filename);
- add_list (list, at, FALSE, FALSE);
- g_list_free (list);
+ Index * filenames = index_new ();
+ index_append (filenames, str_get (filename));
+ add_list (filenames, at, FALSE, FALSE);
 }
 
-void drct_pl_add_list (GList * list, gint at)
+void drct_pl_add_list (Index * filenames, int at)
 {
- add_list (list, at, FALSE, FALSE);
+ add_list (filenames, at, FALSE, FALSE);
 }
 
-void drct_pl_open (const gchar * filename)
+void drct_pl_open (const char * filename)
 {
- GList * list = g_list_prepend (NULL, (void *) filename);
- add_list (list, -1, get_bool (NULL, "open_to_temporary"), TRUE);
- g_list_free (list);
+ Index * filenames = index_new ();
+ index_append (filenames, str_get (filename));
+ add_list (filenames, -1, get_bool (NULL, "open_to_temporary"), TRUE);
 }
 
-void drct_pl_open_list (GList * list)
+void drct_pl_open_list (Index * filenames)
 {
- add_list (list, -1, get_bool (NULL, "open_to_temporary"), TRUE);
+ add_list (filenames, -1, get_bool (NULL, "open_to_temporary"), TRUE);
 }
 
-void drct_pl_open_temp (const gchar * filename)
+void drct_pl_open_temp (const char * filename)
 {
- GList * list = g_list_prepend (NULL, (void *) filename);
- add_list (list, -1, TRUE, TRUE);
- g_list_free (list);
+ Index * filenames = index_new ();
+ index_append (filenames, str_get (filename));
+ add_list (filenames, -1, TRUE, TRUE);
 }
 
-void drct_pl_open_temp_list (GList * list)
+void drct_pl_open_temp_list (Index * filenames)
 {
- add_list (list, -1, TRUE, TRUE);
-}
-
-void drct_pl_delete (gint entry)
-{
- playlist_entry_delete (playlist_get_active (), entry, 1);
+ add_list (filenames, -1, TRUE, TRUE);
 }
 
 /* Advancing to the next song when the current one is deleted is tricky. First,
@@ -323,10 +253,9 @@
 * to a new song without worrying about picking one that is also selected.
 * Finally, we can delete the former current song without stopping playback. */
 
-void drct_pl_delete_selected (void)
+void drct_pl_delete_selected (int list)
 {
- gint list = playlist_get_active ();
- gint pos = playlist_get_position (list);
+ int pos = playlist_get_position (list);
 
 if (get_bool (NULL, "advance_on_delete")
 && ! get_bool (NULL, "no_playlist_advance")
@@ -346,49 +275,3 @@
 else
 playlist_delete_selected (list);
 }
-
-void drct_pl_clear (void)
-{
- gint playlist = playlist_get_active ();
- playlist_entry_delete (playlist, 0, playlist_entry_count (playlist));
-}
-
-/* --- PLAYLIST QUEUE CONTROL --- */
-
-gint drct_pq_get_length (void)
-{
- return playlist_queue_count (playlist_get_active ());
-}
-
-gint drct_pq_get_entry (gint queue_position)
-{
- return playlist_queue_get_entry (playlist_get_active (), queue_position);
-}
-
-gboolean drct_pq_is_queued (gint entry)
-{
- return (drct_pq_get_queue_position (entry) >= 0);
-}
-
-gint drct_pq_get_queue_position (gint entry)
-{
- return playlist_queue_find_entry (playlist_get_active (), entry);
-}
-
-void drct_pq_add (gint entry)
-{
- playlist_queue_insert (playlist_get_active (), -1, entry);
-}
-
-void drct_pq_remove (gint entry)
-{
- gint playlist = playlist_get_active ();
- playlist_queue_delete (playlist, playlist_queue_find_entry (playlist,
- entry), 1);
-}
-
-void drct_pq_clear (void)
-{
- gint playlist = playlist_get_active ();
- playlist_queue_delete (playlist, 0, playlist_queue_count (playlist));
-}

audacious-3.1.1.tar.bz2/src/audacious/drct.h -> audacious-3.2.4.tar.bz2/src/audacious/drct.h Changed

audacious-3.1.1.tar.bz2/src/audacious/effect.c -> audacious-3.2.4.tar.bz2/src/audacious/effect.c Changed

@@ -20,6 +20,7 @@
 */
 
 #include <glib.h>
+#include <pthread.h>
 
 #include "debug.h"
 #include "effect.h"
@@ -30,19 +31,19 @@
 typedef struct {
 PluginHandle * plugin;
 EffectPlugin * header;
- gint channels_returned, rate_returned;
- gboolean remove_flag;
+ int channels_returned, rate_returned;
+ bool_t remove_flag;
 } RunningEffect;
 
-static GStaticMutex mutex = G_STATIC_MUTEX_INIT;
+static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
 static GList * running_effects = NULL; /* (RunningEffect *) */
-static gint input_channels, input_rate;
+static int input_channels, input_rate;
 
 typedef struct {
- gint * channels, * rate;
+ int * channels, * rate;
 } EffectStartState;
 
-static gboolean effect_start_cb (PluginHandle * plugin, EffectStartState * state)
+static bool_t effect_start_cb (PluginHandle * plugin, EffectStartState * state)
 {
 AUDDBG ("Starting %s at %d channels, %d Hz.\n", plugin_get_name (plugin),
 * state->channels, * state->rate);
@@ -61,9 +62,9 @@
 return TRUE;
 }
 
-void effect_start (gint * channels, gint * rate)
+void effect_start (int * channels, int * rate)
 {
- g_static_mutex_lock (& mutex);
+ pthread_mutex_lock (& mutex);
 
 AUDDBG ("Starting effects.\n");
 g_list_foreach (running_effects, (GFunc) g_free, NULL);
@@ -78,12 +79,12 @@
 & state);
 running_effects = g_list_reverse (running_effects);
 
- g_static_mutex_unlock (& mutex);
+ pthread_mutex_unlock (& mutex);
 }
 
 typedef struct {
- gfloat * * data;
- gint * samples;
+ float * * data;
+ int * samples;
 } EffectProcessState;
 
 static void effect_process_cb (RunningEffect * effect, EffectProcessState *
@@ -100,39 +101,42 @@
 effect->header->process (state->data, state->samples);
 }
 
-void effect_process (gfloat * * data, gint * samples)
+void effect_process (float * * data, int * samples)
 {
- g_static_mutex_lock (& mutex);
+ pthread_mutex_lock (& mutex);
 
 EffectProcessState state = {data, samples};
 g_list_foreach (running_effects, (GFunc) effect_process_cb, & state);
 
- g_static_mutex_unlock (& mutex);
+ pthread_mutex_unlock (& mutex);
 }
 
 void effect_flush (void)
 {
- g_static_mutex_lock (& mutex);
+ pthread_mutex_lock (& mutex);
 
 for (GList * node = running_effects; node != NULL; node = node->next)
- ((RunningEffect *) node->data)->header->flush ();
+ {
+ if (PLUGIN_HAS_FUNC (((RunningEffect *) node->data)->header, flush))
+ ((RunningEffect *) node->data)->header->flush ();
+ }
 
- g_static_mutex_unlock (& mutex);
+ pthread_mutex_unlock (& mutex);
 }
 
-void effect_finish (gfloat * * data, gint * samples)
+void effect_finish (float * * data, int * samples)
 {
- g_static_mutex_lock (& mutex);
+ pthread_mutex_lock (& mutex);
 
 for (GList * node = running_effects; node != NULL; node = node->next)
 ((RunningEffect *) node->data)->header->finish (data, samples);
 
- g_static_mutex_unlock (& mutex);
+ pthread_mutex_unlock (& mutex);
 }
 
-gint effect_decoder_to_output_time (gint time)
+int effect_decoder_to_output_time (int time)
 {
- g_static_mutex_lock (& mutex);
+ pthread_mutex_lock (& mutex);
 
 for (GList * node = running_effects; node != NULL; node = node->next)
 {
@@ -140,13 +144,13 @@
 time = ((RunningEffect *) node->data)->header->decoder_to_output_time (time);
 }
 
- g_static_mutex_unlock (& mutex);
+ pthread_mutex_unlock (& mutex);
 return time;
 }
 
-gint effect_output_to_decoder_time (gint time)
+int effect_output_to_decoder_time (int time)
 {
- g_static_mutex_lock (& mutex);
+ pthread_mutex_lock (& mutex);
 
 for (GList * node = g_list_last (running_effects); node != NULL; node = node->prev)
 {
@@ -154,16 +158,16 @@
 time = ((RunningEffect *) node->data)->header->output_to_decoder_time (time);
 }
 
- g_static_mutex_unlock (& mutex);
+ pthread_mutex_unlock (& mutex);
 return time;
 }
 
-static gint effect_find_cb (RunningEffect * effect, PluginHandle * plugin)
+static int effect_find_cb (RunningEffect * effect, PluginHandle * plugin)
 {
 return (effect->plugin == plugin) ? 0 : -1;
 }
 
-static gint effect_compare (RunningEffect * a, RunningEffect * b)
+static int effect_compare (RunningEffect * a, RunningEffect * b)
 {
 return plugin_compare (a->plugin, b->plugin);
 }
@@ -184,7 +188,7 @@
 (GCompareFunc) effect_compare);
 GList * node = g_list_find (running_effects, effect);
 
- gint channels, rate;
+ int channels, rate;
 if (node->prev != NULL)
 {
 RunningEffect * prev = node->prev->data;
@@ -218,31 +222,31 @@
 ((RunningEffect *) node->data)->remove_flag = TRUE;
 }
 
-static void effect_enable (PluginHandle * plugin, EffectPlugin * ep, gboolean
+static void effect_enable (PluginHandle * plugin, EffectPlugin * ep, bool_t
 enable)
 {
 if (ep->preserves_format)
 {
- g_static_mutex_lock (& mutex);
+ pthread_mutex_lock (& mutex);
 
 if (enable)
 effect_insert (plugin, ep);
 else
 effect_remove (plugin);
 
- g_static_mutex_unlock (& mutex);
+ pthread_mutex_unlock (& mutex);
 }
 else
 {
 AUDDBG ("Reset to add/remove %s.\n", plugin_get_name (plugin));
- gint time = playback_get_time ();
- gboolean paused = playback_get_paused ();
+ int time = playback_get_time ();
+ bool_t paused = playback_get_paused ();
 playback_stop ();
 playback_play (time, paused);
 }
 }
 
-gboolean effect_plugin_start (PluginHandle * plugin)
+bool_t effect_plugin_start (PluginHandle * plugin)
 {
 if (playback_get_playing ())
 {

audacious-3.1.1.tar.bz2/src/audacious/effect.h -> audacious-3.2.4.tar.bz2/src/audacious/effect.h Changed

audacious-3.1.1.tar.bz2/src/audacious/equalizer.c -> audacious-3.2.4.tar.bz2/src/audacious/equalizer.c Changed

@@ -13,6 +13,7 @@
 
 #include <glib.h>
 #include <math.h>
+#include <pthread.h>
 #include <string.h>
 
 #include <libaudcore/audstrings.h>
@@ -20,6 +21,7 @@
 
 #include "equalizer.h"
 #include "misc.h"
+#include "types.h"
 
 #define EQ_BANDS AUD_EQUALIZER_NBANDS
 #define MAX_CHANNELS 10
@@ -32,23 +34,23 @@
 /* These are not the historical WinAmp frequencies, because the IIR filters used
 * here are designed for each frequency to be twice the previous. Using WinAmp
 * frequencies leads to too much gain in some bands and too little in others. */
-static const gfloat CF[EQ_BANDS] = {31.25, 62.5, 125, 250, 500, 1000, 2000,
+static const float CF[EQ_BANDS] = {31.25, 62.5, 125, 250, 500, 1000, 2000,
 4000, 8000, 16000};
 
-static GStaticMutex mutex = G_STATIC_MUTEX_INIT;
-static gboolean active;
-static gint channels, rate;
-static gfloat a[EQ_BANDS][2]; /* A weights */
-static gfloat b[EQ_BANDS][2]; /* B weights */
-static gfloat wqv[MAX_CHANNELS][EQ_BANDS][2]; /* Circular buffer for W data */
-static gfloat gv[MAX_CHANNELS][EQ_BANDS]; /* Gain factor for each channel and band */
-static gint K; /* Number of used eq bands */
+static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+static bool_t active;
+static int channels, rate;
+static float a[EQ_BANDS][2]; /* A weights */
+static float b[EQ_BANDS][2]; /* B weights */
+static float wqv[MAX_CHANNELS][EQ_BANDS][2]; /* Circular buffer for W data */
+static float gv[MAX_CHANNELS][EQ_BANDS]; /* Gain factor for each channel and band */
+static int K; /* Number of used eq bands */
 
 /* 2nd order band-pass filter design */
-static void bp2 (gfloat * a, gfloat * b, gfloat fc, gfloat q)
+static void bp2 (float * a, float * b, float fc, float q)
 {
- gfloat th = 2 * M_PI * fc;
- gfloat C = (1 - tanf (th * q / 2)) / (1 + tanf (th * q / 2));
+ float th = 2 * M_PI * fc;
+ float C = (1 - tanf (th * q / 2)) / (1 + tanf (th * q / 2));
 
 a[0] = (1 + C) * cosf (th);
 a[1] = -C;
@@ -56,11 +58,11 @@
 b[1] = -1.005;
 }
 
-void eq_set_format (gint new_channels, gint new_rate)
+void eq_set_format (int new_channels, int new_rate)
 {
- gint k;
+ int k;
 
- g_static_mutex_lock (& mutex);
+ pthread_mutex_lock (& mutex);
 
 channels = new_channels;
 rate = new_rate;
@@ -68,59 +70,59 @@
 /* Calculate number of active filters */
 K = EQ_BANDS;
 
- while (CF[K - 1] > (gfloat) rate / 2.2)
+ while (CF[K - 1] > (float) rate / 2.2)
 K --;
 
 /* Generate filter taps */
 for (k = 0; k < K; k ++)
- bp2 (a[k], b[k], CF[k] / (gfloat) rate, Q);
+ bp2 (a[k], b[k], CF[k] / (float) rate, Q);
 
 /* Reset state */
 memset (wqv[0][0], 0, sizeof wqv);
 
- g_static_mutex_unlock (& mutex);
+ pthread_mutex_unlock (& mutex);
 }
 
-static void eq_set_bands_real (gdouble preamp, gdouble * values)
+static void eq_set_bands_real (double preamp, double * values)
 {
- gfloat adj[EQ_BANDS];
- for (gint i = 0; i < EQ_BANDS; i ++)
+ float adj[EQ_BANDS];
+ for (int i = 0; i < EQ_BANDS; i ++)
 adj[i] = preamp + values[i];
 
- for (gint c = 0; c < MAX_CHANNELS; c ++)
- for (gint i = 0; i < EQ_BANDS; i ++)
+ for (int c = 0; c < MAX_CHANNELS; c ++)
+ for (int i = 0; i < EQ_BANDS; i ++)
 gv[c][i] = pow (10, adj[i] / 20) - 1;
 }
 
-void eq_filter (gfloat * data, gint samples)
+void eq_filter (float * data, int samples)
 {
- gint channel;
+ int channel;
 
- g_static_mutex_lock (& mutex);
+ pthread_mutex_lock (& mutex);
 
 if (! active)
 {
- g_static_mutex_unlock (& mutex);
+ pthread_mutex_unlock (& mutex);
 return;
 }
 
 for (channel = 0; channel < channels; channel ++)
 {
- gfloat * g = gv[channel]; /* Gain factor */
- gfloat * end = data + samples;
- gfloat * f;
+ float * g = gv[channel]; /* Gain factor */
+ float * end = data + samples;
+ float * f;
 
 for (f = data + channel; f < end; f += channels)
 {
- gint k; /* Frequency band index */
- gfloat yt = * f; /* Current input sample */
+ int k; /* Frequency band index */
+ float yt = * f; /* Current input sample */
 
 for (k = 0; k < K; k ++)
 {
 /* Pointer to circular buffer wq */
- gfloat * wq = wqv[channel][k];
+ float * wq = wqv[channel][k];
 /* Calculate output from AR part of current filter */
- gfloat w = yt * b[k][0] + wq[0] * a[k][0] + wq[1] * a[k][1];
+ float w = yt * b[k][0] + wq[0] * a[k][0] + wq[1] * a[k][1];
 
 /* Calculate output from MA part of current filter */
 yt += (w + wq[1] * b[k][1]) * g[k];
@@ -135,20 +137,20 @@
 }
 }
 
- g_static_mutex_unlock (& mutex);
+ pthread_mutex_unlock (& mutex);
 }
 
 static void eq_update (void * data, void * user)
 {
- g_static_mutex_lock (& mutex);
+ pthread_mutex_lock (& mutex);
 
 active = get_bool (NULL, "equalizer_active");
 
- gdouble values[EQ_BANDS];
+ double values[EQ_BANDS];
 eq_get_bands (values);
 eq_set_bands_real (get_double (NULL, "equalizer_preamp"), values);
 
- g_static_mutex_unlock (& mutex);
+ pthread_mutex_unlock (& mutex);
 }
 
 void eq_init (void)
@@ -159,35 +161,42 @@
 hook_associate ("set equalizer_bands", eq_update, NULL);
 }
 
-void eq_set_bands (const gdouble * values)
+void eq_cleanup (void)
 {
- gchar * string = double_array_to_string (values, EQ_BANDS);
+ hook_dissociate ("set equalizer_active", eq_update);
+ hook_dissociate ("set equalizer_preamp", eq_update);
+ hook_dissociate ("set equalizer_bands", eq_update);
+}
+
+void eq_set_bands (const double * values)
+{
+ char * string = double_array_to_string (values, EQ_BANDS);
 g_return_if_fail (string);
 set_string (NULL, "equalizer_bands", string);
 g_free (string);
 }
 
-void eq_get_bands (gdouble * values)
+void eq_get_bands (double * values)
 {
- memset (values, 0, sizeof (gdouble) * EQ_BANDS);
- gchar * string = get_string (NULL, "equalizer_bands");
+ memset (values, 0, sizeof (double) * EQ_BANDS);
+ char * string = get_string (NULL, "equalizer_bands");
 string_to_double_array (string, values, EQ_BANDS);
 g_free (string);
 }
 
-void eq_set_band (gint band, gdouble value)
+void eq_set_band (int band, double value)
 {
 g_return_if_fail (band >= 0 && band < EQ_BANDS);
- gdouble values[EQ_BANDS];
+ double values[EQ_BANDS];
 eq_get_bands (values);
 values[band] = value;
 eq_set_bands (values);
 }
 
-gdouble eq_get_band (gint band)
+double eq_get_band (int band)
 {
 g_return_val_if_fail (band >= 0 && band < EQ_BANDS, 0);
- gdouble values[EQ_BANDS];
+ double values[EQ_BANDS];
 eq_get_bands (values);
 return values[band];
 }

audacious-3.1.1.tar.bz2/src/audacious/equalizer.h -> audacious-3.2.4.tar.bz2/src/audacious/equalizer.h Changed

audacious-3.1.1.tar.bz2/src/audacious/equalizer_preset.c -> audacious-3.2.4.tar.bz2/src/audacious/equalizer_preset.c Changed

@@ -1,5 +1,5 @@
 /* Audacious - Cross-platform multimedia player
- * Copyright (C) 2005-2008 Audacious team
+ * Copyright (C) 2005-2011 Audacious 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
@@ -18,6 +18,7 @@
 */
 
 #include <glib.h>
+#include <string.h>
 
 #include "config.h"
 #include "debug.h"
@@ -25,21 +26,19 @@
 #include "interface.h"
 #include "misc.h"
 
-static EqualizerPreset * equalizer_preset_new (const gchar * name)
+static EqualizerPreset * equalizer_preset_new (const char * name)
 {
 EqualizerPreset *preset = g_new0(EqualizerPreset, 1);
 preset->name = g_strdup(name);
 return preset;
 }
 
-GList *
-equalizer_read_presets(const gchar *basename)
+Index * equalizer_read_presets (const char * basename)
 {
- gchar *filename, *name;
+ char *filename, *name;
 GKeyFile *rcfile;
 GError *error = NULL;
- GList *list = NULL;
- gint i, p = 0;
+ int i, p = 0;
 EqualizerPreset *preset;
 
 filename = g_build_filename (get_path (AUD_PATH_USER_DIR), basename, NULL);
@@ -61,9 +60,11 @@
 
 g_free(filename);
 
+ Index * list = index_new ();
+
 for (;;)
 {
- gchar section[32];
+ char section[32];
 
 error = NULL;
 g_snprintf(section, sizeof(section), "Preset%d", p++);
@@ -78,7 +79,7 @@
 
 for (i = 0; i < AUD_EQUALIZER_NBANDS; i++)
 {
- gchar band[16];
+ char band[16];
 g_snprintf(band, sizeof(band), "Band%d", i);
 
 error = NULL;
@@ -86,37 +87,33 @@
 preset->bands[i] = g_key_file_get_double(rcfile, name, band, &error);
 }
 
- list = g_list_prepend(list, preset);
+ index_append (list, preset);
 }
 else
 break;
 }
 
- list = g_list_reverse(list);
 g_key_file_free(rcfile);
 
 return list;
 }
 
-gboolean equalizer_write_preset_file (GList * list, const gchar * basename)
+bool_t equalizer_write_preset_file (Index * list, const char * basename)
 {
- gchar *filename, *tmp;
- gint i, p;
- EqualizerPreset *preset;
+ char *filename;
+ int i;
 GKeyFile *rcfile;
- GList *node;
- gchar *data;
+ char *data;
 gsize len;
 GError *error = NULL;
 
 rcfile = g_key_file_new();
- p = 0;
 
- for (node = list; node; node = g_list_next(node))
+ for (int p = 0; p < index_count (list); p ++)
 {
- preset = node->data;
+ EqualizerPreset * preset = index_get (list, p);
 
- tmp = g_strdup_printf("Preset%d", p++);
+ char * tmp = g_strdup_printf ("Preset%d", p);
 g_key_file_set_string(rcfile, "Presets", tmp, preset->name);
 g_free(tmp);
 
@@ -134,7 +131,7 @@
 filename = g_build_filename (get_path (AUD_PATH_USER_DIR), basename, NULL);
 
 data = g_key_file_to_data(rcfile, &len, &error);
- gboolean success = g_file_set_contents (filename, data, len, & error);
+ bool_t success = g_file_set_contents (filename, data, len, & error);
 g_free(data);
 
 g_key_file_free(rcfile);
@@ -142,16 +139,14 @@
 return success;
 }
 
-GList *
-import_winamp_eqf(VFSFile * file)
+Index * import_winamp_eqf (VFSFile * file)
 {
- gchar header[31];
- gchar bands[11];
- gint i = 0;
+ char header[31];
+ char bands[11];
+ int i = 0;
 EqualizerPreset *preset = NULL;
- GList *list = NULL;
- gchar *markup;
- gchar preset_name[0xb4];
+ char *markup;
+ char preset_name[0xb4];
 
 if (vfs_fread (header, 1, sizeof header, file) != sizeof header || strncmp
 (header, "Winamp EQ library file v1.1", 27))
@@ -161,6 +156,8 @@
 
 if (vfs_fseek(file, 0x1f, SEEK_SET) == -1) goto error;
 
+ Index * list = index_new ();
+
 while (vfs_fread(preset_name, 1, 0xb4, file) == 0xb4) {
 AUDDBG("The preset name is '%s'\n", preset_name);
 if (vfs_fseek (file, 0x4d, SEEK_CUR)) /* unknown crap --asphyx */
@@ -174,28 +171,25 @@
 for (i = 0; i < 10; i++)
 preset->bands[i] = EQUALIZER_MAX_GAIN - ((bands[i] * EQUALIZER_MAX_GAIN * 2) / 64.0);
 
- list = g_list_prepend(list, preset);
+ index_append (list, preset);
 }
 
- list = g_list_reverse(list);
- if (list == NULL) goto error;
-
 return list;
 
 error:
 markup = g_strdup_printf (_("Error importing Winamp EQF file '%s'"),
- file->uri);
+ vfs_get_filename (file));
 interface_show_error(markup);
 
 g_free(markup);
 return NULL;
 }
 
-gboolean save_preset_file (EqualizerPreset * preset, const gchar * filename)
+bool_t save_preset_file (EqualizerPreset * preset, const char * filename)
 {
 GKeyFile *rcfile;
- gint i;
- gchar *data;
+ int i;
+ char *data;
 gsize len;
 GError *error = NULL;
 
@@ -203,7 +197,7 @@
 g_key_file_set_double(rcfile, "Equalizer preset", "Preamp", preset->preamp);
 
 for (i = 0; i < 10; i++) {
- gchar tmp[7];
+ char tmp[7];
 g_snprintf(tmp, sizeof(tmp), "Band%d", i);
 g_key_file_set_double(rcfile, "Equalizer preset", tmp,
 preset->bands[i]);
@@ -211,7 +205,7 @@
 
 data = g_key_file_to_data(rcfile, &len, &error);
 
- gboolean success = FALSE;
+ bool_t success = FALSE;
 
 VFSFile * file = vfs_fopen (filename, "w");
 if (file == NULL)
@@ -226,9 +220,9 @@
 return success;
 }
 
-static EqualizerPreset * equalizer_read_aud_preset (const gchar * filename)
+static EqualizerPreset * equalizer_read_aud_preset (const char * filename)
 {
- gint i;
+ int i;
 EqualizerPreset *preset;
 GKeyFile *rcfile;
 GError *error = NULL;
@@ -240,13 +234,15 @@
 if (!g_key_file_load_from_file(rcfile, filename, G_KEY_FILE_NONE, &error))
 {
 g_key_file_free(rcfile);
+ g_free(preset->name);
+ g_free(preset);
 return NULL;
 }
 
 preset->preamp = g_key_file_get_double(rcfile, "Equalizer preset", "Preamp", &error);
 for (i = 0; i < 10; i++)
 {
- gchar tmp[7];
+ char tmp[7];
 g_snprintf(tmp, sizeof(tmp), "Band%d", i);
 
 preset->bands[i] = g_key_file_get_double(rcfile, "Equalizer preset", tmp, &error);
@@ -257,7 +253,7 @@
 }
 
 EqualizerPreset *
-load_preset_file(const gchar *filename)
+load_preset_file(const char *filename)
 {
 if (filename) {
 EqualizerPreset *preset = equalizer_read_aud_preset(filename);

audacious-3.1.1.tar.bz2/src/audacious/general.c -> audacious-3.2.4.tar.bz2/src/audacious/general.c Changed

@@ -34,10 +34,10 @@
     GtkWidget * widget;
 } LoadedGeneral;
 
-static gint running = FALSE;
+static int running = FALSE;
 static GList * loaded_general_plugins = NULL;
 
-static gint general_find_cb (LoadedGeneral * general, PluginHandle * plugin)
+static int general_find_cb (LoadedGeneral * general, PluginHandle * plugin)
 {
     return (general->plugin == plugin) ? 0 : -1;
 }
@@ -93,7 +93,7 @@
     g_slice_free (LoadedGeneral, general);
 }
 
-static gboolean general_init_cb (PluginHandle * plugin)
+static bool_t general_init_cb (PluginHandle * plugin)
 {
     general_load (plugin);
     return TRUE;
@@ -121,7 +121,7 @@
     g_list_foreach (loaded_general_plugins, (GFunc) general_cleanup_cb, NULL);
 }
 
-gboolean general_plugin_start (PluginHandle * plugin)
+bool_t general_plugin_start (PluginHandle * plugin)
 {
     GeneralPlugin * gp = plugin_get_header (plugin);
     g_return_val_if_fail (gp != NULL, FALSE);
@@ -159,6 +159,6 @@
         if (general->widget == widget)
             return general->plugin;
     }
-    
+
     return NULL;
 }

audacious-3.1.1.tar.bz2/src/audacious/general.h -> audacious-3.2.4.tar.bz2/src/audacious/general.h Changed

audacious-3.1.1.tar.bz2/src/audacious/gtk-compat.h -> audacious-3.2.4.tar.bz2/src/audacious/gtk-compat.h Changed

audacious-3.1.1.tar.bz2/src/audacious/history.c -> audacious-3.2.4.tar.bz2/src/audacious/history.c Changed

@@ -21,14 +21,17 @@
 
 #include <glib.h>
 #include <stdio.h>
+#include <string.h>
 
-#include <audacious/misc.h>
 #include <libaudcore/hook.h>
 
+#include "main.h"
+#include "misc.h"
+
 #define MAX_ENTRIES 30
 
 static GQueue history = G_QUEUE_INIT;
-static gboolean loaded, modified;
+static bool_t loaded, modified;
 
 static void history_save (void)
 {
@@ -38,12 +41,12 @@
 config_clear_section ("history");
 
 GList * node = history.head;
- for (gint i = 0; i < MAX_ENTRIES; i ++)
+ for (int i = 0; i < MAX_ENTRIES; i ++)
 {
 if (! node)
 break;
 
- gchar name[32];
+ char name[32];
 snprintf (name, sizeof name, "entry%d", i);
 set_string ("history", name, node->data);
 
@@ -58,11 +61,11 @@
 if (loaded)
 return;
 
- for (gint i = 0; ; i ++)
+ for (int i = 0; ; i ++)
 {
- gchar name[32];
+ char name[32];
 snprintf (name, sizeof name, "entry%d", i);
- gchar * path = get_string ("history", name);
+ char * path = get_string ("history", name);
 
 if (! path[0])
 {
@@ -77,13 +80,27 @@
 hook_associate ("config save", (HookFunction) history_save, NULL);
 }
 
-const gchar * history_get (gint entry)
+void history_cleanup (void)
+{
+ if (! loaded)
+ return;
+
+ hook_dissociate ("config save", (HookFunction) history_save);
+
+ g_queue_foreach (& history, (GFunc) g_free, NULL);
+ g_queue_clear (& history);
+
+ loaded = FALSE;
+ modified = FALSE;
+}
+
+const char * history_get (int entry)
 {
 history_load ();
 return g_queue_peek_nth (& history, entry);
 }
 
-void history_add (const gchar * path)
+void history_add (const char * path)
 {
 history_load ();

audacious-3.1.1.tar.bz2/src/audacious/i18n.h -> audacious-3.2.4.tar.bz2/src/audacious/i18n.h Changed

audacious-3.1.1.tar.bz2/src/audacious/interface.c -> audacious-3.2.4.tar.bz2/src/audacious/interface.c Changed

@@ -21,6 +21,7 @@
 */
 
 #include <gtk/gtk.h>
+#include <pthread.h>
 
 #include <libaudcore/hook.h>
 
@@ -28,13 +29,18 @@
 #include "general.h"
 #include "interface.h"
 #include "main.h"
+#include "misc.h"
 #include "plugin.h"
 #include "plugins.h"
 #include "visualization.h"
 
 static IfacePlugin *current_interface = NULL;
 
-gboolean interface_load (PluginHandle * plugin)
+static pthread_mutex_t error_mutex = PTHREAD_MUTEX_INITIALIZER;
+static GQueue error_queue = G_QUEUE_INIT;
+static int error_source;
+
+bool_t interface_load (PluginHandle * plugin)
 {
 IfacePlugin * i = plugin_get_header (plugin);
 g_return_val_if_fail (i, FALSE);
@@ -56,7 +62,7 @@
 current_interface = NULL;
 }
 
-void interface_show (gboolean show)
+void interface_show (bool_t show)
 {
 g_return_if_fail (current_interface);
 
@@ -64,7 +70,7 @@
 current_interface->show (show);
 }
 
-gboolean interface_is_shown (void)
+bool_t interface_is_shown (void)
 {
 g_return_val_if_fail (current_interface, FALSE);
 
@@ -73,7 +79,7 @@
 return TRUE;
 }
 
-gboolean interface_is_focused (void)
+bool_t interface_is_focused (void)
 {
 g_return_val_if_fail (current_interface, FALSE);
 
@@ -82,26 +88,49 @@
 return TRUE;
 }
 
-void interface_show_error (const gchar * markup)
+static bool_t error_idle_func (void * unused)
 {
- if (headless)
+ pthread_mutex_lock (& error_mutex);
+
+ char * message;
+ while ((message = g_queue_pop_head (& error_queue)))
 {
- fprintf (stderr, "ERROR: %s\n", markup);
- return;
+ pthread_mutex_unlock (& error_mutex);
+
+ if (current_interface && PLUGIN_HAS_FUNC (current_interface, show_error))
+ current_interface->show_error (message);
+ else
+ fprintf (stderr, "ERROR: %s\n", message);
+
+ g_free (message);
+
+ pthread_mutex_lock (& error_mutex);
 }
 
- g_return_if_fail (current_interface);
+ error_source = 0;
 
- if (PLUGIN_HAS_FUNC (current_interface, show_error))
- current_interface->show_error (markup);
+ pthread_mutex_unlock (& error_mutex);
+ return FALSE;
+}
+
+void interface_show_error (const char * message)
+{
+ pthread_mutex_lock (& error_mutex);
+
+ g_queue_push_tail (& error_queue, g_strdup (message));
+
+ if (! error_source)
+ error_source = g_idle_add (error_idle_func, NULL);
+
+ pthread_mutex_unlock (& error_mutex);
 }
 
 /*
- * gboolean play_button
+ * bool_t play_button
 * TRUE - open files
 * FALSE - add files
 */
-void interface_show_filebrowser (gboolean play_button)
+void interface_show_filebrowser (bool_t play_button)
 {
 g_return_if_fail (current_interface);
 
@@ -117,7 +146,7 @@
 current_interface->show_jump_to_track ();
 }
 
-static gboolean delete_cb (GtkWidget * window, GdkEvent * event, PluginHandle *
+static bool_t delete_cb (GtkWidget * window, GdkEvent * event, PluginHandle *
 plugin)
 {
 plugin_enable (plugin, FALSE);
@@ -171,64 +200,7 @@
 g_object_unref (widget);
 }
 
-typedef enum {
- HOOK_SHOW,
- HOOK_SHOW_TOGGLE,
- HOOK_SHOW_ERROR,
- HOOK_SHOW_JUMPTOTRACK,
- HOOK_SHOW_FILEBROWSER,
-} IfaceHookID;
-
-void interface_hook_handler (void * hook_data, void * user_data)
-{
- switch (GPOINTER_TO_INT (user_data))
- {
- case HOOK_SHOW:
- interface_show (GPOINTER_TO_INT (hook_data));
- break;
- case HOOK_SHOW_TOGGLE:
- /* interface_is_focused() is unreliable, at least when global hotkeys
- * are involved; see http://jira.atheme.org/browse/AUD-369. */
- /* interface_show (! (interface_is_shown () && interface_is_focused ())); */
- interface_show (! interface_is_shown ());
- break;
- case HOOK_SHOW_ERROR:
- interface_show_error (hook_data);
- break;
- case HOOK_SHOW_FILEBROWSER:
- interface_show_filebrowser (GPOINTER_TO_INT (hook_data));
- break;
- case HOOK_SHOW_JUMPTOTRACK:
- interface_show_jump_to_track ();
- break;
- }
-}
-
-typedef struct {
- const gchar *name;
- IfaceHookID id;
-} IfaceHooks;
-
-static IfaceHooks hooks[] = {
- {"interface show", HOOK_SHOW},
- {"interface toggle visibility", HOOK_SHOW_TOGGLE},
- {"interface show error", HOOK_SHOW_ERROR},
- {"interface show filebrowser", HOOK_SHOW_FILEBROWSER},
- {"interface show jump to track", HOOK_SHOW_JUMPTOTRACK},
-};
-
-void
-register_interface_hooks(void)
-{
- gint i;
- for (i=0; i<G_N_ELEMENTS(hooks); i++)
- hook_associate(hooks[i].name,
- (HookFunction) interface_hook_handler,
- GINT_TO_POINTER(hooks[i].id));
-
-}
-
-static gboolean probe_cb (PluginHandle * p, PluginHandle * * pp)
+static bool_t probe_cb (PluginHandle * p, PluginHandle * * pp)
 {
 * pp = p;
 return FALSE;
@@ -248,7 +220,7 @@
 return current_plugin;
 }
 
-gboolean iface_plugin_set_current (PluginHandle * plugin)
+bool_t iface_plugin_set_current (PluginHandle * plugin)
 {
 hook_call ("config save", NULL); /* tell interface to save layout */

audacious-3.1.1.tar.bz2/src/audacious/interface.h -> audacious-3.2.4.tar.bz2/src/audacious/interface.h Changed

@@ -26,27 +26,14 @@
 #include <gtk/gtk.h>
 #include <audacious/plugins.h>
 
-gboolean interface_load (PluginHandle * plugin);
+bool_t interface_load (PluginHandle * plugin);
 void interface_unload (void);
 
-/* These functions have to be called from main thread
- Use event_queue if you need to call those from other threads */
-
-void interface_show (gboolean show);
-gboolean interface_is_shown (void);
-gboolean interface_is_focused (void);
-
-void interface_show_error (const gchar * markup);
-void interface_show_filebrowser (gboolean play_button);
-void interface_show_jump_to_track (void);
-
 void interface_add_plugin_widget (PluginHandle * plugin, GtkWidget * widget);
 void interface_remove_plugin_widget (PluginHandle * plugin, GtkWidget * widget);
 
-void register_interface_hooks (void);
-
 PluginHandle * iface_plugin_probe (void);
 PluginHandle * iface_plugin_get_current (void);
-gboolean iface_plugin_set_current (PluginHandle * plugin);
+bool_t iface_plugin_set_current (PluginHandle * plugin);
 
 #endif

audacious-3.1.1.tar.bz2/src/audacious/main.c -> audacious-3.2.4.tar.bz2/src/audacious/main.c Changed

@@ -24,6 +24,11 @@
 */
 
 #include <errno.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <unistd.h>
 
 #include <gtk/gtk.h>
 
@@ -34,8 +39,8 @@
 #include "config.h"
 
 #ifdef USE_DBUS
-#include "audctrl.h"
-#include "dbus-service.h"
+#include "../libaudclient/audctrl.h"
+#include "dbus.h"
 #endif
 
 #ifdef USE_EGGSM
@@ -57,20 +62,20 @@
 
 #define AUTOSAVE_INTERVAL 300 /* seconds */
 
-gboolean headless;
+bool_t headless;
 
 static struct {
- gchar **filenames;
- gint session;
- gboolean play, stop, pause, fwd, rew, play_pause, show_jump_box;
- gboolean enqueue, mainwin, remote;
- gboolean enqueue_to_temp;
- gboolean version;
- gboolean verbose;
- gchar *previous_session_id;
+ char **filenames;
+ int session;
+ bool_t play, stop, pause, fwd, rew, play_pause, show_jump_box;
+ bool_t enqueue, mainwin, remote;
+ bool_t enqueue_to_temp;
+ bool_t version;
+ bool_t verbose;
+ char *previous_session_id;
 } options;
 
-static gchar * aud_paths[AUD_PATH_COUNT];
+static char * aud_paths[AUD_PATH_COUNT];
 
 static void make_dirs(void)
 {
@@ -84,12 +89,12 @@
 make_directory(aud_paths[AUD_PATH_PLAYLISTS_DIR], mode755);
 }
 
-static void normalize_path (gchar * path)
+static void normalize_path (char * path)
 {
 #ifdef _WIN32
 string_replace_char (path, '/', '\\');
 #endif
- gint len = strlen (path);
+ int len = strlen (path);
 #ifdef _WIN32
 if (len > 3 && path[len - 1] == '\\') /* leave "C:\" */
 #else
@@ -98,13 +103,13 @@
 path[len - 1] = 0;
 }
 
-static gchar * last_path_element (gchar * path)
+static char * last_path_element (char * path)
 {
- gchar * slash = strrchr (path, G_DIR_SEPARATOR);
+ char * slash = strrchr (path, G_DIR_SEPARATOR);
 return (slash && slash[1]) ? slash + 1 : NULL;
 }
 
-static void strip_path_element (gchar * path, gchar * elem)
+static void strip_path_element (char * path, char * elem)
 {
 #ifdef _WIN32
 if (elem > path + 3)
@@ -116,11 +121,11 @@
 elem[0] = 0; /* leave [drive letter and] leading slash */
 }
 
-static void relocate_path (gchar * * pathp, const gchar * old, const gchar * new)
+static void relocate_path (char * * pathp, const char * old, const char * new)
 {
- gchar * path = * pathp;
- gint oldlen = strlen (old);
- gint newlen = strlen (new);
+ char * path = * pathp;
+ int oldlen = strlen (old);
+ int newlen = strlen (new);
 
 if (oldlen && old[oldlen - 1] == G_DIR_SEPARATOR)
 oldlen --;
@@ -160,8 +165,8 @@
 
 /* Compare the compile-time path to the executable and the actual path to
 * see if we have been moved. */
- gchar * old = g_strdup (aud_paths[AUD_PATH_BIN_DIR]);
- gchar * new = get_path_to_self ();
+ char * old = g_strdup (aud_paths[AUD_PATH_BIN_DIR]);
+ char * new = get_path_to_self ();
 if (! new)
 {
 ERR:
@@ -172,14 +177,14 @@
 normalize_path (new);
 
 /* Strip the name of the executable file, leaving the path. */
- gchar * base = last_path_element (new);
+ char * base = last_path_element (new);
 if (! base)
 goto ERR;
 strip_path_element (new, base);
 
 /* Strip innermost folder names from both paths as long as they match. This
 * leaves a compile-time prefix and a run-time one to replace it with. */
- gchar * a, * b;
+ char * a, * b;
 while ((a = last_path_element (old)) && (b = last_path_element (new)) &&
 #ifdef _WIN32
 ! strcasecmp (a, b))
@@ -207,8 +212,8 @@
 {
 relocate_paths ();
 
- const gchar * xdg_config_home = g_get_user_config_dir ();
- const gchar * xdg_data_home = g_get_user_data_dir ();
+ const char * xdg_config_home = g_get_user_config_dir ();
+ const char * xdg_data_home = g_get_user_data_dir ();
 
 #ifdef _WIN32
 /* Some libraries (libmcs) and plugins (filewriter) use these variables,
@@ -222,14 +227,13 @@
 aud_paths[AUD_PATH_USER_DIR] = g_build_filename(xdg_config_home, "audacious", NULL);
 aud_paths[AUD_PATH_USER_PLUGIN_DIR] = g_build_filename(xdg_data_home, "audacious", "Plugins", NULL);
 aud_paths[AUD_PATH_PLAYLISTS_DIR] = g_build_filename(aud_paths[AUD_PATH_USER_DIR], "playlists", NULL);
- aud_paths[AUD_PATH_PLAYLIST_FILE] = g_build_filename(aud_paths[AUD_PATH_USER_DIR], "playlist.xspf", NULL);
 aud_paths[AUD_PATH_GTKRC_FILE] = g_build_filename(aud_paths[AUD_PATH_USER_DIR], "gtkrc", NULL);
 
- for (gint i = 0; i < AUD_PATH_COUNT; i ++)
+ for (int i = 0; i < AUD_PATH_COUNT; i ++)
 AUDDBG ("Data path: %s\n", aud_paths[i]);
 }
 
-const gchar * get_path (gint id)
+const char * get_path (int id)
 {
 g_return_val_if_fail (id >= 0 && id < AUD_PATH_COUNT, NULL);
 return aud_paths[id];
@@ -253,7 +257,7 @@
 {NULL},
 };
 
-static void parse_options (gint * argc, gchar *** argv)
+static void parse_options (int * argc, char *** argv)
 {
 GOptionContext *context;
 GError *error = NULL;
@@ -281,9 +285,9 @@
 verbose = options.verbose;
 }
 
-static gboolean get_lock (void)
+static bool_t get_lock (void)
 {
- gchar * path = g_strdup_printf ("%s" G_DIR_SEPARATOR_S "lock", aud_paths[AUD_PATH_USER_DIR]);
+ char * path = g_strdup_printf ("%s" G_DIR_SEPARATOR_S "lock", aud_paths[AUD_PATH_USER_DIR]);
 int handle = open (path, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
 
 if (handle < 0)
@@ -302,40 +306,47 @@
 
 static void release_lock (void)
 {
- gchar * path = g_strdup_printf ("%s" G_DIR_SEPARATOR_S "lock", aud_paths[AUD_PATH_USER_DIR]);
+ char * path = g_strdup_printf ("%s" G_DIR_SEPARATOR_S "lock", aud_paths[AUD_PATH_USER_DIR]);
 unlink (path);
 g_free (path);
 }
 
-static GList * convert_filenames (void)
+static Index * convert_filenames (void)
 {
 if (! options.filenames)
 return NULL;
 
- gchar * * f = options.filenames;
- GList * list = NULL;
- gchar * cur = g_get_current_dir ();
+ Index * filenames = index_new ();
+ char * * f = options.filenames;
+ char * cur = g_get_current_dir ();
 
- for (gint i = 0; f[i]; i ++)
+ for (int i = 0; f[i]; i ++)
 {
- gchar * uri;
+ char * uri = NULL;
 
 if (strstr (f[i], "://"))
- uri = g_strdup (f[i]);
+ uri = str_get (f[i]);
 else if (g_path_is_absolute (f[i]))
- uri = filename_to_uri (f[i]);
+ {
+ char * tmp = filename_to_uri (f[i]);
+ uri = str_get (tmp);
+ free (tmp);
+ }
 else
 {
- gchar * tmp = g_build_filename (cur, f[i], NULL);
- uri = filename_to_uri (tmp);
- g_free (tmp);
+ char * tmp = g_build_filename (cur, f[i], NULL);
+ char * tmp2 = filename_to_uri (tmp);
+ uri = str_get (tmp2);
+ free (tmp);
+ free (tmp2);
 }
 
- list = g_list_prepend (list, uri);
+ if (uri)
+ index_append (filenames, uri);
 }
 
 g_free (cur);
- return g_list_reverse (list);
+ return filenames;
 }
 
 static void do_remote (void)
@@ -345,16 +356,21 @@
 
 if (session && audacious_remote_is_running (session))
 {
- GList * list = convert_filenames ();
+ Index * filenames = convert_filenames ();
 
 /* if no command line options, then present running instance */
- if (! (list || options.play || options.pause || options.play_pause ||
+ if (! (filenames || options.play || options.pause || options.play_pause ||
 options.stop || options.rew || options.fwd || options.show_jump_box ||
 options.mainwin))
 options.mainwin = TRUE;
 
- if (list)
+ if (filenames)
 {
+ GList * list = NULL;
+
+ for (int f = index_count (filenames); f --; )
+ list = g_list_prepend (list, index_get (filenames, f));
+
 if (options.enqueue_to_temp)
 audacious_remote_playlist_open_list_to_temp (session, list);
 else if (options.enqueue)
@@ -362,8 +378,12 @@
 else
 audacious_remote_playlist_open_list (session, list);
 
- g_list_foreach (list, (GFunc) g_free, NULL);
 g_list_free (list);
+
+ for (int f = 0; f < index_count (filenames); f ++)
+ str_unref (index_get (filenames, f));
+
+ index_free (filenames);
 }
 
 if (options.play)
@@ -392,26 +412,23 @@
 
 static void do_commands (void)
 {
- gboolean resume = get_bool (NULL, "resume_playback_on_startup");
+ bool_t resume = get_bool (NULL, "resume_playback_on_startup");
 
- GList * list = convert_filenames ();
- if (list)
+ Index * filenames = convert_filenames ();
+ if (filenames)
 {
 if (options.enqueue_to_temp)
 {
- drct_pl_open_temp_list (list);
+ drct_pl_open_temp_list (filenames);
 resume = FALSE;
 }
 else if (options.enqueue)
- drct_pl_add_list (list, -1);
+ drct_pl_add_list (filenames, -1);
 else
 {
- drct_pl_open_list (list);
+ drct_pl_open_list (filenames);
 resume = FALSE;
 }
-
- g_list_foreach (list, (GFunc) g_free, NULL);
- g_list_free (list);
 }
 
 if (resume)
@@ -442,29 +459,21 @@
 bind_textdomain_codeset (PACKAGE "-plugins", "UTF-8");
 textdomain (PACKAGE);
 
- mowgli_init ();
-
 #ifdef USE_EGGSM
 egg_sm_client_set_mode (EGG_SM_CLIENT_MODE_NORMAL);
 egg_set_desktop_file (aud_paths[AUD_PATH_DESKTOP_FILE]);
 #endif
 }
 
-static void init_two (gint * p_argc, gchar * * * p_argv)
+static void init_two (int * p_argc, char * * * p_argv)
 {
 if (! headless)
 {
 g_thread_init (NULL);
- gdk_threads_init ();
- gdk_threads_enter ();
-
 gtk_rc_add_default_file (aud_paths[AUD_PATH_GTKRC_FILE]);
 gtk_init (p_argc, p_argv);
 }
 
- hook_init ();
- tag_init ();
-
 config_load ();
 chardet_init ();
 
@@ -472,7 +481,6 @@
 vfs_set_verbose (verbose);
 
 eq_init ();
- register_interface_hooks ();
 
 #ifdef HAVE_SIGWAIT
 signals_init ();
@@ -486,6 +494,7 @@
 
 playlist_init ();
 adder_init ();
+ art_init ();
 load_playlists ();
 
 #ifdef USE_DBUS
@@ -514,12 +523,18 @@
 AUDDBG ("Stopping playback.\n");
 if (playback_get_playing ())
 {
- gboolean stop_after_song = get_bool (NULL, "stop_after_current_song");
+ bool_t stop_after_song = get_bool (NULL, "stop_after_current_song");
 playback_stop ();
 set_bool (NULL, "stop_after_current_song", stop_after_song);
 }
 
+#ifdef USE_DBUS
+ cleanup_dbus ();
+#endif
+
 adder_cleanup ();
+ art_cleanup ();
+ history_cleanup ();
 playlist_end ();
 
 AUDDBG ("Unloading lowlevel plugins.\n");
@@ -529,10 +544,12 @@
 config_save ();
 config_cleanup ();
 
- gdk_threads_leave ();
+ eq_cleanup ();
+
+ strpool_shutdown ();
 }
 
-gboolean do_autosave (void)
+bool_t do_autosave (void)
 {
 AUDDBG ("Saving configuration.\n");
 hook_call ("config save", NULL);
@@ -541,7 +558,7 @@
 return TRUE;
 }
 
-gint main(gint argc, gchar ** argv)
+int main(int argc, char ** argv)
 {
 init_one ();
 parse_options (& argc, & argv);
@@ -560,9 +577,10 @@
 
 AUDDBG ("Startup complete.\n");
 g_timeout_add_seconds (AUTOSAVE_INTERVAL, (GSourceFunc) do_autosave, NULL);
- hook_associate ("quit", (HookFunction) gtk_main_quit, NULL);
 
+ hook_associate ("quit", (HookFunction) gtk_main_quit, NULL);
 gtk_main ();
+ hook_dissociate ("quit", (HookFunction) gtk_main_quit);
 
 shut_down ();
 release_lock ();

audacious-3.1.1.tar.bz2/src/audacious/main.h -> audacious-3.2.4.tar.bz2/src/audacious/main.h Changed

audacious-3.1.1.tar.bz2/src/audacious/misc-api.h -> audacious-3.2.4.tar.bz2/src/audacious/misc-api.h Changed

@@ -23,81 +23,108 @@
 
 /* CAUTION: Many of these functions are not thread safe. */
 
+/* art.c */
+
+/* Fetches album art for <file> (the URI of a song file) as JPEG or PNG data.
+ * The data may be embedded in the song file, or it may be loaded from a
+ * separate file. When the data is no longer needed, art_unref() should be
+ * called. If an error occurs, <data> is set to NULL and art_unref() need not
+ * be called. */
+AUD_VFUNC3 (art_get_data, const char *, file, const void * *, data, int64_t *, len)
+
+/* Returns the URI of an image file containing album art for <file>. If the
+ * song file contains embedded album art, the data is saved to a temporary file
+ * and the URI of the temporary file is returned. When the image file is no
+ * longer needed, art_unref() should be called. If a temporary file was
+ * created, art_unref() deletes it. If an error occurs, returns NULL and
+ * art_unref() need not be called. */
+AUD_FUNC1 (const char *, art_get_file, const char *, file)
+
+/* Signals that the data or file returned by art_get_data() or art_get_file() is
+ * no longer needed. <file> must be the same URI passed to art_get_data() or
+ * art_get_file(). */
+AUD_VFUNC1 (art_unref, const char *, file)
+
 /* config.c */
 
-AUD_FUNC1 (void, config_clear_section, const gchar *, section)
-AUD_FUNC2 (void, config_set_defaults, const gchar *, section, const gchar * const *, entries)
+AUD_VFUNC1 (config_clear_section, const char *, section)
+AUD_VFUNC2 (config_set_defaults, const char *, section, const char * const *, entries)
 
-AUD_FUNC3 (void, set_string, const gchar *, section, const gchar *, name, const gchar *, value)
-AUD_FUNC2 (gchar *, get_string, const gchar *, section, const gchar *, name)
-AUD_FUNC3 (void, set_bool, const gchar *, section, const gchar *, name, gboolean, value)
-AUD_FUNC2 (gboolean, get_bool, const gchar *, section, const gchar *, name)
-AUD_FUNC3 (void, set_int, const gchar *, section, const gchar *, name, gint, value)
-AUD_FUNC2 (gint, get_int, const gchar *, section, const gchar *, name)
-AUD_FUNC3 (void, set_double, const gchar *, section, const gchar *, name, gdouble, value)
-AUD_FUNC2 (gdouble, get_double, const gchar *, section, const gchar *, name)
+AUD_VFUNC3 (set_string, const char *, section, const char *, name, const char *, value)
+AUD_FUNC2 (char *, get_string, const char *, section, const char *, name)
+AUD_VFUNC3 (set_bool, const char *, section, const char *, name, bool_t, value)
+AUD_FUNC2 (bool_t, get_bool, const char *, section, const char *, name)
+AUD_VFUNC3 (set_int, const char *, section, const char *, name, int, value)
+AUD_FUNC2 (int, get_int, const char *, section, const char *, name)
+AUD_VFUNC3 (set_double, const char *, section, const char *, name, double, value)
+AUD_FUNC2 (double, get_double, const char *, section, const char *, name)
 
 /* credits.c */
-AUD_FUNC3 (void, get_audacious_credits, const gchar * *, brief,
- const gchar * * *, credits, const gchar * * *, translators)
+AUD_VFUNC3 (get_audacious_credits, const char * *, brief,
+ const char * const * *, credits, const char * const * *, translators)
 
 /* equalizer.c */
-AUD_FUNC1 (void, eq_set_bands, const gdouble *, values)
-AUD_FUNC1 (void, eq_get_bands, gdouble *, values)
-AUD_FUNC2 (void, eq_set_band, gint, band, gdouble, value)
-AUD_FUNC1 (gdouble, eq_get_band, gint, band)
+AUD_VFUNC1 (eq_set_bands, const double *, values)
+AUD_VFUNC1 (eq_get_bands, double *, values)
+AUD_VFUNC2 (eq_set_band, int, band, double, value)
+AUD_FUNC1 (double, eq_get_band, int, band)
 
 /* equalizer_preset.c */
-AUD_FUNC1 (GList *, equalizer_read_presets, const gchar *, basename)
-AUD_FUNC2 (gboolean, equalizer_write_preset_file, GList *, list, const gchar *,
- basename)
-AUD_FUNC1 (EqualizerPreset *, load_preset_file, const gchar *, filename)
-AUD_FUNC2 (gboolean, save_preset_file, EqualizerPreset *, preset, const gchar *,
- filename)
-AUD_FUNC1 (GList *, import_winamp_eqf, VFSFile *, file)
+AUD_FUNC1 (Index *, equalizer_read_presets, const char *, basename)
+AUD_FUNC2 (bool_t, equalizer_write_preset_file, Index *, list, const char *, basename)
+AUD_FUNC1 (EqualizerPreset *, load_preset_file, const char *, filename)
+AUD_FUNC2 (bool_t, save_preset_file, EqualizerPreset *, preset, const char *, filename)
+AUD_FUNC1 (Index *, import_winamp_eqf, VFSFile *, file)
 
 /* history.c */
-AUD_FUNC1 (const gchar *, history_get, gint, entry)
-AUD_FUNC1 (void, history_add, const gchar *, path)
+AUD_FUNC1 (const char *, history_get, int, entry)
+AUD_VFUNC1 (history_add, const char *, path)
 
 /* interface.c */
-AUD_FUNC1 (void, interface_install_toolbar, void *, button)
-AUD_FUNC1 (void, interface_uninstall_toolbar, void *, button)
+AUD_VFUNC1 (interface_show, bool_t, show)
+AUD_FUNC0 (bool_t, interface_is_shown)
+AUD_FUNC0 (bool_t, interface_is_focused)
+
+/* interface_show_error() is safe to call from any thread */
+AUD_VFUNC1 (interface_show_error, const char *, message)
+
+AUD_VFUNC1 (interface_show_filebrowser, bool_t, play)
+AUD_VFUNC0 (interface_show_jump_to_track)
+
+AUD_VFUNC1 (interface_install_toolbar, void *, button)
+AUD_VFUNC1 (interface_uninstall_toolbar, void *, button)
 
 /* main.c */
-AUD_FUNC1 (const gchar *, get_path, gint, path)
+AUD_FUNC1 (const char *, get_path, int, path)
 
 /* probe.c */
-AUD_FUNC2 (PluginHandle *, file_find_decoder, const gchar *, filename, gboolean,
+AUD_FUNC2 (PluginHandle *, file_find_decoder, const char *, filename, bool_t,
 fast)
-AUD_FUNC2 (Tuple *, file_read_tuple, const gchar *, filename, PluginHandle *,
+AUD_FUNC2 (Tuple *, file_read_tuple, const char *, filename, PluginHandle *,
 decoder)
-AUD_FUNC4 (gboolean, file_read_image, const gchar *, filename, PluginHandle *,
- decoder, void * *, data, gint *, size)
-AUD_FUNC2 (gboolean, file_can_write_tuple, const gchar *, filename,
+AUD_FUNC4 (bool_t, file_read_image, const char *, filename, PluginHandle *,
+ decoder, void * *, data, int64_t *, size)
+AUD_FUNC2 (bool_t, file_can_write_tuple, const char *, filename,
 PluginHandle *, decoder)
-AUD_FUNC3 (gboolean, file_write_tuple, const gchar *, filename, PluginHandle *,
+AUD_FUNC3 (bool_t, file_write_tuple, const char *, filename, PluginHandle *,
 decoder, const Tuple *, tuple)
-AUD_FUNC2 (gboolean, custom_infowin, const gchar *, filename, PluginHandle *,
+AUD_FUNC2 (bool_t, custom_infowin, const char *, filename, PluginHandle *,
 decoder)
 
-/* ui_albumart.c */
-AUD_FUNC1 (gchar *, get_associated_image_file, const gchar *, filename)
-
 /* ui_plugin_menu.c */
-AUD_FUNC1 (/* GtkWidget * */ void *, get_plugin_menu, gint, id)
-AUD_FUNC4 (void, plugin_menu_add, gint, id, MenuFunc, func, const gchar *, name,
- const gchar *, icon)
-AUD_FUNC2 (void, plugin_menu_remove, gint, id, MenuFunc, func)
+AUD_FUNC1 (/* GtkWidget * */ void *, get_plugin_menu, int, id)
+AUD_VFUNC4 (plugin_menu_add, int, id, MenuFunc, func, const char *, name,
+ const char *, icon)
+AUD_VFUNC2 (plugin_menu_remove, int, id, MenuFunc, func)
 
 /* ui_preferences.c */
-AUD_FUNC4 (void, create_widgets_with_domain, /* GtkWidget * */ void *, box,
- PreferencesWidget *, widgets, gint, count, const gchar *, domain)
-AUD_FUNC0 (void, show_prefs_window)
+AUD_VFUNC4 (create_widgets_with_domain, /* GtkWidget * */ void *, box,
+ PreferencesWidget *, widgets, int, count, const char *, domain)
+AUD_VFUNC0 (show_prefs_window)
 
 /* util.c */
-AUD_FUNC2 (gchar *, construct_uri, const gchar *, base, const gchar *, reference)
+AUD_FUNC2 (char *, construct_uri, const char *, base, const char *, reference)
 
 /* visualization.c */
-AUD_FUNC2 (void, vis_func_add, gint, type, VisFunc, func)
-AUD_FUNC1 (void, vis_func_remove, VisFunc, func)
+AUD_VFUNC2 (vis_func_add, int, type, VisFunc, func)
+AUD_VFUNC1 (vis_func_remove, VisFunc, func)

audacious-3.1.1.tar.bz2/src/audacious/misc.h -> audacious-3.2.4.tar.bz2/src/audacious/misc.h Changed

audacious-3.1.1.tar.bz2/src/audacious/output.c -> audacious-3.2.4.tar.bz2/src/audacious/output.c Changed

@@ -19,8 +19,10 @@
 * using our public API to be a derived work.
 */
 
+#include <glib.h>
 #include <math.h>
-#include <libaudcore/audio.h>
+#include <pthread.h>
+#include <string.h>
 
 #include "debug.h"
 #include "effect.h"
@@ -35,7 +37,7 @@
 
 static OutputPlugin * cop = NULL;
 
-void output_get_volume (gint * l, gint * r)
+void output_get_volume (int * l, int * r)
 {
 if (get_bool (NULL, "software_volume_control"))
 {
@@ -51,7 +53,7 @@
 }
 }
 
-void output_set_volume (gint l, gint r)
+void output_set_volume (int l, int r)
 {
 if (get_bool (NULL, "software_volume_control"))
 {
@@ -62,11 +64,11 @@
 cop->set_volume (l, r);
 }
 
-static GStaticMutex mutex = G_STATIC_MUTEX_INIT;
-static gboolean locked = FALSE;
+static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+static bool_t locked = FALSE;
 
-#define LOCK do {g_static_mutex_lock (& mutex); locked = TRUE;} while (0)
-#define UNLOCK do {locked = FALSE; g_static_mutex_unlock (& mutex);} while (0)
+#define LOCK do {pthread_mutex_lock (& mutex); locked = TRUE;} while (0)
+#define UNLOCK do {locked = FALSE; pthread_mutex_unlock (& mutex);} while (0)
 #define LOCKED g_return_if_fail (locked)
 #define LOCKED_RET(a) g_return_val_if_fail (locked, a)
 #define LOCK_VIS do {vis_runner_lock (); LOCK;} while (0)
@@ -74,14 +76,14 @@
 #define LOCKED_VIS g_return_if_fail (locked && vis_runner_locked ())
 #define LOCKED_VIS_RET(a) g_return_val_if_fail (locked && vis_runner_locked (), a)
 
-static gboolean opened = FALSE;
-static gboolean leave_open = FALSE;
+static bool_t opened = FALSE;
+static bool_t leave_open = FALSE;
 
-static gboolean waiting, aborted, paused;
-static gint decoder_format, decoder_channels, decoder_rate, effect_channels,
+static bool_t waiting, aborted, paused;
+static int decoder_format, decoder_channels, decoder_rate, effect_channels,
 effect_rate, output_format, output_channels, output_rate;
-static gint64 frames_written;
-static gboolean have_replay_gain;
+static int64_t frames_written;
+static bool_t have_replay_gain;
 static ReplayGainInfo replay_gain_info;
 
 static void reset_time (void)
@@ -108,7 +110,7 @@
 leave_open = FALSE;
 }
 
-static gboolean open_audio (gint format, gint rate, gint channels)
+static bool_t open_audio (int format, int rate, int channels)
 {
 LOCKED_VIS_RET (FALSE);
 g_return_val_if_fail (! opened, FALSE);
@@ -135,7 +137,7 @@
 real_close ();
 }
 
- gint depth = get_int (NULL, "output_bit_depth");
+ int depth = get_int (NULL, "output_bit_depth");
 output_format = (depth == 32) ? FMT_S32_NE : (depth == 24) ? FMT_S24_NE
 : (depth == 16) ? FMT_S16_NE : FMT_FLOAT;
 output_channels = effect_channels;
@@ -158,11 +160,11 @@
 return opened;
 }
 
-static gboolean output_open_audio (gint format, gint rate, gint channels)
+static bool_t output_open_audio (int format, int rate, int channels)
 {
 g_return_val_if_fail (cop != NULL, FALSE);
 LOCK_VIS;
- gboolean success = open_audio (format, rate, channels);
+ bool_t success = open_audio (format, rate, channels);
 UNLOCK_VIS;
 return success;
 }
@@ -190,12 +192,12 @@
 UNLOCK;
 }
 
-static void apply_replay_gain (gfloat * data, gint samples)
+static void apply_replay_gain (float * data, int samples)
 {
 if (! get_bool (NULL, "enable_replay_gain"))
 return;
 
- gfloat factor = powf (10, get_double (NULL, "replay_gain_preamp") / 20);
+ float factor = powf (10, get_double (NULL, "replay_gain_preamp") / 20);
 
 if (have_replay_gain)
 {
@@ -223,22 +225,22 @@
 audio_amplify (data, 1, samples, & factor);
 }
 
-static void apply_software_volume (gfloat * data, gint channels, gint frames)
+static void apply_software_volume (float * data, int channels, int frames)
 {
- gfloat left_factor, right_factor;
- gfloat factors[channels];
- gint channel;
+ float left_factor, right_factor;
+ float factors[channels];
+ int channel;
 
 if (! get_bool (NULL, "software_volume_control"))
 return;
 
- gint l = get_int (NULL, "sw_volume_left");
- gint r = get_int (NULL, "sw_volume_right");
+ int l = get_int (NULL, "sw_volume_left");
+ int r = get_int (NULL, "sw_volume_right");
 if (l == 100 && r == 100)
 return;
 
- left_factor = (l == 0) ? 0 : powf (10, (gfloat) SW_VOLUME_RANGE * (l - 100) / 100 / 20);
- right_factor = (r == 0) ? 0 : powf (10, (gfloat) SW_VOLUME_RANGE * (r - 100) / 100 / 20);
+ left_factor = (l == 0) ? 0 : powf (10, (float) SW_VOLUME_RANGE * (l - 100) / 100 / 20);
+ right_factor = (r == 0) ? 0 : powf (10, (float) SW_VOLUME_RANGE * (r - 100) / 100 / 20);
 
 if (channels == 2)
 {
@@ -254,7 +256,7 @@
 audio_amplify (data, channels, frames, factors);
 }
 
-static void write_processed (void * data, gint samples)
+static void write_processed (void * data, int samples)
 {
 LOCKED_VIS;
 
@@ -279,7 +281,7 @@
 
 while (! aborted)
 {
- gint ready = (cop->buffer_free != NULL) ? cop->buffer_free () /
+ int ready = (cop->buffer_free != NULL) ? cop->buffer_free () /
 FMT_SIZEOF (output_format) : output_channels * (output_rate / 50);
 ready = MIN (ready, samples);
 cop->write_audio (data, FMT_SIZEOF (output_format) * ready);
@@ -304,19 +306,19 @@
 g_free (allocated);
 }
 
-static void write_audio (void * data, gint size)
+static void write_audio (void * data, int size)
 {
 LOCKED;
 g_return_if_fail (opened && ! waiting);
 
- gint samples = size / FMT_SIZEOF (decoder_format);
+ int samples = size / FMT_SIZEOF (decoder_format);
 frames_written += samples / decoder_channels;
 
 void * allocated = NULL;
 
 if (decoder_format != FMT_FLOAT)
 {
- gfloat * new = g_malloc (sizeof (gfloat) * samples);
+ float * new = g_malloc (sizeof (float) * samples);
 audio_from_int (data, decoder_format, new, samples);
 data = new;
 g_free (allocated);
@@ -324,7 +326,7 @@
 }
 
 apply_replay_gain (data, samples);
- gfloat * fdata = data;
+ float * fdata = data;
 effect_process (& fdata, & samples);
 data = fdata;
 
@@ -338,7 +340,7 @@
 g_free (allocated);
 }
 
-static void output_write_audio (void * data, gint size)
+static void output_write_audio (void * data, int size)
 {
 g_return_if_fail (cop != NULL);
 LOCK_VIS;
@@ -367,7 +369,7 @@
 UNLOCK_VIS;
 }
 
-static void do_pause (gboolean p)
+static void do_pause (bool_t p)
 {
 LOCKED_VIS;
 g_return_if_fail (opened);
@@ -376,7 +378,7 @@
 paused = p;
 }
 
-static void output_pause (gboolean p)
+static void output_pause (bool_t p)
 {
 g_return_if_fail (cop != NULL);
 LOCK_VIS;
@@ -384,7 +386,7 @@
 UNLOCK_VIS;
 }
 
-static void flush (gint time)
+static void flush (int time)
 {
 LOCKED_VIS;
 g_return_if_fail (opened);
@@ -408,10 +410,10 @@
 cop->flush (effect_decoder_to_output_time (time));
 }
 
- frames_written = time * (gint64) decoder_rate / 1000;
+ frames_written = time * (int64_t) decoder_rate / 1000;
 }
 
-static void output_flush (gint time)
+static void output_flush (int time)
 {
 g_return_if_fail (cop != NULL);
 LOCK_VIS;
@@ -419,18 +421,18 @@
 UNLOCK_VIS;
 }
 
-static gint written_time (void)
+static int written_time (void)
 {
 LOCKED_RET (0);
 g_return_val_if_fail (opened && ! waiting, 0);
- return frames_written * (gint64) 1000 / decoder_rate;
+ return frames_written * (int64_t) 1000 / decoder_rate;
 }
 
-static gint output_written_time (void)
+static int output_written_time (void)
 {
 g_return_val_if_fail (cop != NULL, 0);
 LOCK;
- gint time = written_time ();
+ int time = written_time ();
 UNLOCK;
 return time;
 }
@@ -438,8 +440,8 @@
 static void write_buffers (void)
 {
 LOCKED;
- gfloat * data = NULL;
- gint samples = 0;
+ float * data = NULL;
+ int samples = 0;
 effect_finish (& data, & samples);
 write_processed (data, samples);
 }
@@ -456,7 +458,7 @@
 }
 }
 
-static gboolean output_buffer_playing (void)
+static bool_t output_buffer_playing (void)
 {
 g_return_val_if_fail (cop != NULL, FALSE);
 LOCK_VIS;
@@ -495,19 +497,19 @@
 .abort_write = output_abort_write,
 };
 
-static gint output_time (void)
+static int output_time (void)
 {
 LOCKED_RET (0);
 g_return_val_if_fail (opened || leave_open, 0);
 return cop->output_time ();
 }
 
-gint get_output_time (void)
+int get_output_time (void)
 {
 g_return_val_if_fail (cop != NULL, 0);
 LOCK;
 
- gint time = 0;
+ int time = 0;
 if (opened)
 {
 time = effect_output_to_decoder_time (output_time ());
@@ -518,11 +520,11 @@
 return time;
 }
 
-gint get_raw_output_time (void)
+int get_raw_output_time (void)
 {
 g_return_val_if_fail (cop != NULL, 0);
 LOCK;
- gint time = output_time ();
+ int time = output_time ();
 UNLOCK;
 return time;
 }
@@ -542,7 +544,7 @@
 UNLOCK_VIS;
 }
 
-static gboolean probe_cb (PluginHandle * p, PluginHandle * * pp)
+static bool_t probe_cb (PluginHandle * p, PluginHandle * * pp)
 {
 OutputPlugin * op = plugin_get_header (p);
 g_return_val_if_fail (op != NULL && op->init != NULL, TRUE);
@@ -569,7 +571,7 @@
 return (cop != NULL) ? plugin_by_header (cop) : NULL;
 }
 
-gboolean output_plugin_set_current (PluginHandle * plugin)
+bool_t output_plugin_set_current (PluginHandle * plugin)
 {
 if (cop != NULL)
 {

audacious-3.1.1.tar.bz2/src/audacious/output.h -> audacious-3.2.4.tar.bz2/src/audacious/output.h Changed

audacious-3.1.1.tar.bz2/src/audacious/playback.c -> audacious-3.2.4.tar.bz2/src/audacious/playback.c Changed

@@ -21,9 +21,9 @@
 
 #include <glib.h>
 #include <pthread.h>
+#include <string.h>
 
 #include <libaudcore/audstrings.h>
-#include <libaudcore/eventqueue.h>
 #include <libaudcore/hook.h>
 
 #include "config.h"
@@ -34,35 +34,35 @@
 #include "playback.h"
 #include "playlist.h"
 
-static void playback_start (gint playlist, gint entry, gint seek_time, gboolean pause);
+static void playback_start (int playlist, int entry, int seek_time, bool_t pause);
 
 static InputPlayback playback_api;
 
-static gboolean playing = FALSE;
-static gboolean playback_error;
-static gint failed_entries;
+static bool_t playing = FALSE;
+static bool_t playback_error;
+static int failed_entries;
 
-static gchar * current_filename;
+static char * current_filename; /* pooled */
 
-static gint current_entry;
-static gchar * current_title;
-static gint current_length;
+static int current_entry;
+static char * current_title; /* pooled */
+static int current_length;
 
 static InputPlugin * current_decoder;
 static void * current_data;
-static gint current_bitrate, current_samplerate, current_channels;
+static int current_bitrate, current_samplerate, current_channels;
 
 static ReplayGainInfo gain_from_playlist;
 
-static gint time_offset, initial_seek;
-static gboolean paused;
+static int time_offset, initial_seek;
+static bool_t paused;
 
 static pthread_t playback_thread_handle;
-static gint end_source = 0;
+static int end_source = 0;
 
 static pthread_mutex_t ready_mutex = PTHREAD_MUTEX_INITIALIZER;
 static pthread_cond_t ready_cond = PTHREAD_COND_INITIALIZER;
-static gboolean ready_flag;
+static bool_t ready_flag;
 
 /* clears gain info if tuple == NULL */
 static void read_gain_from_tuple (const Tuple * tuple)
@@ -72,50 +72,50 @@
 if (tuple == NULL)
 return;
 
- gint album_gain = tuple_get_int (tuple, FIELD_GAIN_ALBUM_GAIN, NULL);
- gint album_peak = tuple_get_int (tuple, FIELD_GAIN_ALBUM_PEAK, NULL);
- gint track_gain = tuple_get_int (tuple, FIELD_GAIN_TRACK_GAIN, NULL);
- gint track_peak = tuple_get_int (tuple, FIELD_GAIN_TRACK_PEAK, NULL);
- gint gain_unit = tuple_get_int (tuple, FIELD_GAIN_GAIN_UNIT, NULL);
- gint peak_unit = tuple_get_int (tuple, FIELD_GAIN_PEAK_UNIT, NULL);
+ int album_gain = tuple_get_int (tuple, FIELD_GAIN_ALBUM_GAIN, NULL);
+ int album_peak = tuple_get_int (tuple, FIELD_GAIN_ALBUM_PEAK, NULL);
+ int track_gain = tuple_get_int (tuple, FIELD_GAIN_TRACK_GAIN, NULL);
+ int track_peak = tuple_get_int (tuple, FIELD_GAIN_TRACK_PEAK, NULL);
+ int gain_unit = tuple_get_int (tuple, FIELD_GAIN_GAIN_UNIT, NULL);
+ int peak_unit = tuple_get_int (tuple, FIELD_GAIN_PEAK_UNIT, NULL);
 
 if (gain_unit)
 {
- gain_from_playlist.album_gain = album_gain / (gfloat) gain_unit;
- gain_from_playlist.track_gain = track_gain / (gfloat) gain_unit;
+ gain_from_playlist.album_gain = album_gain / (float) gain_unit;
+ gain_from_playlist.track_gain = track_gain / (float) gain_unit;
 }
 
 if (peak_unit)
 {
- gain_from_playlist.album_peak = album_peak / (gfloat) peak_unit;
- gain_from_playlist.track_peak = track_peak / (gfloat) peak_unit;
+ gain_from_playlist.album_peak = album_peak / (float) peak_unit;
+ gain_from_playlist.track_peak = track_peak / (float) peak_unit;
 }
 }
 
-static gboolean update_from_playlist (void)
+static bool_t update_from_playlist (void)
 {
- gint entry = playback_entry_get_position ();
- gchar * title = playback_entry_get_title ();
- gint length = playback_entry_get_length ();
+ int entry = playback_entry_get_position ();
+ char * title = playback_entry_get_title ();
+ int length = playback_entry_get_length ();
 
 if (entry == current_entry && ! g_strcmp0 (title, current_title) && length == current_length)
 {
- g_free (title);
+ str_unref (title);
 return FALSE;
 }
 
 current_entry = entry;
- g_free (current_title);
+ str_unref (current_title);
 current_title = title;
 current_length = length;
 return TRUE;
 }
 
-gboolean playback_get_ready (void)
+bool_t playback_get_ready (void)
 {
 g_return_val_if_fail (playing, FALSE);
 pthread_mutex_lock (& ready_mutex);
- gboolean ready = ready_flag;
+ bool_t ready = ready_flag;
 pthread_mutex_unlock (& ready_mutex);
 return ready;
 }
@@ -153,15 +153,15 @@
 return;
 
 if (update_from_playlist ())
- hook_call ("title change", NULL);
+ event_queue ("title change", NULL);
 }
 
-gint playback_get_time (void)
+int playback_get_time (void)
 {
 g_return_val_if_fail (playing, 0);
 wait_until_ready ();
 
- gint time = -1;
+ int time = -1;
 
 if (current_decoder && current_decoder->get_time)
 time = current_decoder->get_time (& playback_api);
@@ -172,11 +172,11 @@
 return time - time_offset;
 }
 
-void playback_play (gint seek_time, gboolean pause)
+void playback_play (int seek_time, bool_t pause)
 {
 g_return_if_fail (! playing);
 
- gint playlist = playlist_get_playing ();
+ int playlist = playlist_get_playing ();
 
 if (playlist == -1)
 {
@@ -184,7 +184,7 @@
 playlist_set_playing (playlist);
 }
 
- gint entry = playlist_get_position (playlist);
+ int entry = playlist_get_position (playlist);
 
 if (entry == -1)
 {
@@ -225,6 +225,7 @@
 
 event_queue_cancel ("playback ready", NULL);
 event_queue_cancel ("info change", NULL);
+ event_queue_cancel ("title change", NULL);
 
 if (end_source)
 {
@@ -232,9 +233,9 @@
 end_source = 0;
 }
 
- g_free (current_filename);
+ str_unref (current_filename);
 current_filename = NULL;
- g_free (current_title);
+ str_unref (current_title);
 current_title = NULL;
 
 hook_dissociate ("playlist update", update_cb);
@@ -259,7 +260,7 @@
 complete_stop ();
 }
 
-static gboolean end_cb (void * unused)
+static bool_t end_cb (void * unused)
 {
 g_return_val_if_fail (playing, FALSE);
 
@@ -272,8 +273,8 @@
 
 playback_cleanup ();
 
- gint playlist = playlist_get_playing ();
- gboolean play;
+ int playlist = playlist_get_playing ();
+ bool_t play;
 
 if (get_bool (NULL, "no_playlist_advance"))
 play = get_bool (NULL, "repeat") && ! failed_entries;
@@ -303,9 +304,10 @@
 
 if (! current_decoder)
 {
- gchar * error = g_strdup_printf (_("No decoder found for %s."),
+ char * error = g_strdup_printf (_("No decoder found for %s."),
 current_filename);
- event_queue_with_data_free ("interface show error", error);
+ interface_show_error (error);
+ g_free (error);
 playback_error = TRUE;
 goto DONE;
 }
@@ -318,15 +320,16 @@
 Tuple * tuple = playback_entry_get_tuple ();
 read_gain_from_tuple (tuple);
 if (tuple)
- tuple_free (tuple);
+ tuple_unref (tuple);
 
- gchar * real = filename_split_subtune (current_filename, NULL);
- VFSFile * file = vfs_fopen (real, "r");
- g_free (real);
+ bool_t seekable = (playback_entry_get_length () > 0);
 
- time_offset = playback_entry_get_start_time ();
+ VFSFile * file = vfs_fopen (current_filename, "r");
+
+ time_offset = seekable ? playback_entry_get_start_time () : 0;
 playback_error = ! current_decoder->play (& playback_api, current_filename,
- file, time_offset + initial_seek, playback_entry_get_end_time (), paused);
+ file, seekable ? time_offset + initial_seek : 0,
+ seekable ? playback_entry_get_end_time () : -1, paused);
 
 if (file)
 vfs_fclose (file);
@@ -339,7 +342,7 @@
 return NULL;
 }
 
-static void playback_start (gint playlist, gint entry, gint seek_time, gboolean pause)
+static void playback_start (int playlist, int entry, int seek_time, bool_t pause)
 {
 g_return_if_fail (! playing);
 
@@ -363,18 +366,18 @@
 hook_call ("playback begin", NULL);
 }
 
-gboolean playback_get_playing (void)
+bool_t playback_get_playing (void)
 {
 return playing;
 }
 
-gboolean playback_get_paused (void)
+bool_t playback_get_paused (void)
 {
 g_return_val_if_fail (playing, FALSE);
 return paused;
 }
 
-void playback_seek (gint time)
+void playback_seek (int time)
 {
 g_return_if_fail (playing);
 wait_until_ready ();
@@ -400,8 +403,8 @@
 return current_data;
 }
 
-static void set_params (InputPlayback * p, gint bitrate, gint samplerate,
- gint channels)
+static void set_params (InputPlayback * p, int bitrate, int samplerate,
+ int channels)
 {
 g_return_if_fail (playing);
 
@@ -436,16 +439,22 @@
 .set_gain_from_playlist = set_gain_from_playlist,
 };
 
-gchar * playback_get_title (void)
+char * playback_get_filename (void)
+{
+ g_return_val_if_fail (playing, NULL);
+ return str_ref (current_filename);
+}
+
+char * playback_get_title (void)
 {
 g_return_val_if_fail (playing, NULL);
 wait_until_ready ();
 
- gchar s[32];
+ char s[32];
 
 if (current_length)
 {
- gint len = current_length / 1000;
+ int len = current_length / 1000;
 
 if (len < 3600)
 snprintf (s, sizeof s, get_bool (NULL, "leading_zero") ?
@@ -458,13 +467,13 @@
 s[0] = 0;
 
 if (get_bool (NULL, "show_numbers_in_pl"))
- return g_strdup_printf ("%d. %s%s", 1 + playlist_get_position
+ return str_printf ("%d. %s%s", 1 + playlist_get_position
 (playlist_get_playing ()), current_title, s);
 
- return g_strdup_printf ("%s%s", current_title, s);
+ return str_printf ("%s%s", current_title, s);
 }
 
-gint playback_get_length (void)
+int playback_get_length (void)
 {
 g_return_val_if_fail (playing, 0);
 wait_until_ready ();
@@ -472,7 +481,7 @@
 return current_length;
 }
 
-void playback_get_info (gint * bitrate, gint * samplerate, gint * channels)
+void playback_get_info (int * bitrate, int * samplerate, int * channels)
 {
 g_return_if_fail (playing);
 wait_until_ready ();
@@ -482,7 +491,7 @@
 * channels = current_channels;
 }
 
-void playback_get_volume (gint * l, gint * r)
+void playback_get_volume (int * l, int * r)
 {
 if (playing && playback_get_ready () && current_decoder &&
 current_decoder->get_volume && current_decoder->get_volume (l, r))
@@ -491,9 +500,9 @@
 output_get_volume (l, r);
 }
 
-void playback_set_volume (gint l, gint r)
+void playback_set_volume (int l, int r)
 {
- gint h_vol[2] = {l, r};
+ int h_vol[2] = {l, r};
 
 hook_call ("volume set", h_vol);

audacious-3.1.1.tar.bz2/src/audacious/playback.h -> audacious-3.2.4.tar.bz2/src/audacious/playback.h Changed

@@ -23,22 +23,23 @@
 #ifndef AUDACIOUS_PLAYBACK_H
 #define AUDACIOUS_PLAYBACK_H
 
-#include <glib.h>
+#include <libaudcore/core.h>
 
-void playback_play (gint seek_time, gboolean pause);
-gint playback_get_time(void);
+void playback_play (int seek_time, bool_t pause);
+int playback_get_time(void);
 void playback_pause(void);
 void playback_stop(void);
-gboolean playback_get_playing(void);
-gboolean playback_get_ready (void);
-gboolean playback_get_paused(void);
-void playback_seek(gint time);
+bool_t playback_get_playing(void);
+bool_t playback_get_ready (void);
+bool_t playback_get_paused(void);
+void playback_seek(int time);
 
-gchar * playback_get_title (void);
-gint playback_get_length (void);
-void playback_get_info (gint * bitrate, gint * samplerate, gint * channels);
+char * playback_get_filename (void); /* pooled */
+char * playback_get_title (void); /* pooled */
+int playback_get_length (void);
+void playback_get_info (int * bitrate, int * samplerate, int * channels);
 
-void playback_get_volume (gint * l, gint * r);
-void playback_set_volume (gint l, gint r);
+void playback_get_volume (int * l, int * r);
+void playback_set_volume (int l, int r);
 
 #endif /* AUDACIOUS_PLAYBACK_H */

audacious-3.1.1.tar.bz2/src/audacious/playlist-api.h -> audacious-3.2.4.tar.bz2/src/audacious/playlist-api.h Changed

@@ -21,19 +21,23 @@
 
 /* Do not include this file directly; use playlist.h instead. */
 
+/* Any functions in this API with a return type of (char *) return pooled
+ * strings that must not be modified and must be released with str_unref() when
+ * no longer needed. */
+
 /* --- PLAYLIST CORE API --- */
 
 /* Returns the number of playlists currently open. There will always be at
 * least one playlist open. The playlists are numbered starting from zero. */
-AUD_FUNC0 (gint, playlist_count)
+AUD_FUNC0 (int, playlist_count)
 
 /* Adds a new playlist before the one numbered <at>. If <at> is negative or
 * equal to the number of playlists, adds a new playlist after the last one. */
-AUD_FUNC1 (void, playlist_insert, gint, at)
+AUD_VFUNC1 (playlist_insert, int, at)
 
 /* Moves a contiguous block of <count> playlists starting with the one numbered
 * <from> such that that playlist ends up at the position <to>. */
-AUD_FUNC3 (void, playlist_reorder, gint, from, gint, to, gint, count)
+AUD_VFUNC3 (playlist_reorder, int, from, int, to, int, count)
 
 /* Closes a playlist. CAUTION: The playlist is not saved, and no confirmation
 * is presented to the user. If <playlist> is the only playlist, a new playlist
@@ -41,286 +45,309 @@
 * active. If <playlist> is the one from which the last song played was taken,
 * playback is stopped. In this case, calls to playlist_get_playing() will
 * return -1, and the behavior of drct_play() is unspecified. */
-AUD_FUNC1 (void, playlist_delete, gint, playlist)
+AUD_VFUNC1 (playlist_delete, int, playlist)
 
 /* Returns a unique non-negative integer which can be used to identify a given
 * playlist even if its numbering changes (as when playlists are reordered).
 * On error, returns -1. */
-AUD_FUNC1 (gint, playlist_get_unique_id, gint, playlist)
+AUD_FUNC1 (int, playlist_get_unique_id, int, playlist)
 
 /* Returns the number of the playlist identified by a given integer ID as
 * returned by playlist_get_unique_id(). If the playlist no longer exists,
 * returns -1. */
-AUD_FUNC1 (gint, playlist_by_unique_id, gint, id)
+AUD_FUNC1 (int, playlist_by_unique_id, int, id)
 
 /* Sets the filename associated with a playlist. (Audacious currently makes no
 * use of the filename.) */
-AUD_FUNC2 (void, playlist_set_filename, gint, playlist, const gchar *, filename)
+AUD_VFUNC2 (playlist_set_filename, int, playlist, const char *, filename)
 
-/* Returns the filename associated with a playlist. The filename should be
- * freed when no longer needed. */
-AUD_FUNC1 (gchar *, playlist_get_filename, gint, playlist)
+/* Returns the filename associated with a playlist. */
+AUD_FUNC1 (char *, playlist_get_filename, int, playlist)
 
 /* Sets the title associated with a playlist. */
-AUD_FUNC2 (void, playlist_set_title, gint, playlist, const gchar *, title)
+AUD_VFUNC2 (playlist_set_title, int, playlist, const char *, title)
 
-/* Returns the title associated with a playlist. The title should be freed when
- * no longer needed. */
-AUD_FUNC1 (gchar *, playlist_get_title, gint, playlist)
+/* Returns the title associated with a playlist. */
+AUD_FUNC1 (char *, playlist_get_title, int, playlist)
 
 /* Marks a playlist as active. This is the playlist which the user will see and
 * on which most DRCT functions will take effect. */
-AUD_FUNC1 (void, playlist_set_active, gint, playlist)
+AUD_VFUNC1 (playlist_set_active, int, playlist)
 
 /* Returns the number of the playlist marked active. */
-AUD_FUNC0 (gint, playlist_get_active)
+AUD_FUNC0 (int, playlist_get_active)
 
 /* Sets the playlist in which playback will begin when drct_play() is called.
 * This does not mark the playlist as active. If a song is already playing, it
 * will be stopped. If <playlist> is negative, calls to playlist_get_playing()
 * will return -1, and the behavior of drct_play() is unspecified. */
-AUD_FUNC1 (void, playlist_set_playing, gint, playlist)
+AUD_VFUNC1 (playlist_set_playing, int, playlist)
 
 /* Returns the number of the playlist from which the last song played was taken,
 * or -1 if that cannot be determined. Note that this playlist may not be
 * marked active. */
-AUD_FUNC0 (gint, playlist_get_playing)
+AUD_FUNC0 (int, playlist_get_playing)
+
+/* Returns the number of a "blank" playlist. The active playlist is returned if
+ * it has the default title and has no entries; otherwise, a new playlist is
+ * added and returned. */
+AUD_FUNC0 (int, playlist_get_blank)
+
+/* Returns the number of the "temporary" playlist (which is no different from
+ * any other playlist except in name). If the playlist does not exist, a
+ * "blank" playlist is obtained from playlist_get_blank() and is renamed to
+ * become the temporary playlist. */
+AUD_FUNC0 (int, playlist_get_temporary)
 
 /* Returns the number of entries in a playlist. The entries are numbered
 * starting from zero. */
-AUD_FUNC1 (gint, playlist_entry_count, gint, playlist)
+AUD_FUNC1 (int, playlist_entry_count, int, playlist)
 
 /* Adds a song file, playlist file, or folder to a playlist before the entry
 * numbered <at>. If <at> is negative or equal to the number of entries, the
 * item is added after the last entry. <tuple> may be NULL, in which case
- * Audacious will attempt to read metadata from the song file. Audacious will
- * free the memory used by the filename and the tuple when they are no longer
- * needed. Adding items to the playlist can be a slow process, and this
- * function may return before the process is complete. Hence, the caller must
- * not assume that there will be new entries in the playlist immediately after
- * this function is called. If <play> is nonzero, Audacious will begin playback
- * of the items once they have been added. */
-AUD_FUNC5 (void, playlist_entry_insert, gint, playlist, gint, at, gchar *,
- filename, Tuple *, tuple, gboolean, play)
+ * Audacious will attempt to read metadata from the song file. The caller gives
+ * up one reference count to <tuple>. If <play> is nonzero, Audacious will
+ * begin playback of the items once they have been added.
+ *
+ * Because adding items to the playlist can be a slow process, this function may
+ * return before the process is complete. Hence, the caller must not assume
+ * that there will be new entries in the playlist immediately. */
+AUD_VFUNC5 (playlist_entry_insert, int, playlist, int, at, const char *,
+ filename, Tuple *, tuple, bool_t, play)
 
 /* Similar to playlist_entry_insert, adds multiple song files, playlist files,
- * or folders to a playlist. The filenames are stored as (gchar *) in an index
- * (see libaudcore/index.h). Tuples are likewise stored as (Tuple *) in an
- * index of the same length. <tuples> may be NULL, or individual pointers
- * within it may be NULL. Audacious will free both indexes, the filenames, and
- * the tuples when they are no longer needed. */
-AUD_FUNC5 (void, playlist_entry_insert_batch, gint, playlist, gint, at,
- struct index *, filenames, struct index *, tuples, gboolean, play)
+ * or folders to a playlist. The filenames, stored as (char *) in an index
+ * (see libaudcore/index.h), must be pooled with str_get(); the caller gives up
+ * one reference count to each filename. Tuples are likewise stored as
+ * (Tuple *) in an index of the same length; the caller gives up one reference
+ * count to each tuple. <tuples> may be NULL, or individual pointers within it
+ * may be NULL. Finally, the caller also gives up ownership of the indexes
+ * themselves and should not access them after the call. */
+AUD_VFUNC5 (playlist_entry_insert_batch, int, playlist, int, at,
+ Index *, filenames, Index *, tuples, bool_t, play)
+
+/* Similar to playlist_entry_insert_batch, but allows the caller to prevent some
+ * items from being added by returning false from the <filter> callback. Useful
+ * for searching a folder and adding only new files to the playlist. <user> is
+ * an untyped pointer passed to the <filter> callback. */
+AUD_VFUNC7 (playlist_entry_insert_filtered, int, playlist, int, at,
+ Index *, filenames, Index *, tuples, PlaylistFilterFunc, filter,
+ void *, user, bool_t, play)
 
 /* Removes a contiguous block of <number> entries starting from the one numbered
 * <at> from a playlist. If the last song played is in this block, playback is
 * stopped. In this case, calls to playlist_get_position() will return -1, and
 * the behavior of drct_play() is unspecified. */
-AUD_FUNC3 (void, playlist_entry_delete, gint, playlist, gint, at, gint, number)
+AUD_VFUNC3 (playlist_entry_delete, int, playlist, int, at, int, number)
 
-/* Returns the filename of an entry. The filename should be freed when no
- * longer needed. */
-AUD_FUNC2 (gchar *, playlist_entry_get_filename, gint, playlist, gint, entry)
+/* Returns the filename of an entry. */
+AUD_FUNC2 (char *, playlist_entry_get_filename, int, playlist, int, entry)
 
 /* Returns a handle to the decoder plugin associated with an entry, or NULL if
 * none can be found. If <fast> is nonzero, returns NULL if no decoder plugin
 * has yet been found. */
-AUD_FUNC3 (PluginHandle *, playlist_entry_get_decoder, gint, playlist, gint,
- entry, gboolean, fast)
+AUD_FUNC3 (PluginHandle *, playlist_entry_get_decoder, int, playlist, int,
+ entry, bool_t, fast)
 
 /* Returns the tuple associated with an entry, or NULL if one is not available.
 * The reference count of the tuple is incremented. If <fast> is nonzero,
 * returns NULL if metadata for the entry has not yet been read from the song
 * file. */
-AUD_FUNC3 (Tuple *, playlist_entry_get_tuple, gint, playlist, gint, entry,
- gboolean, fast)
+AUD_FUNC3 (Tuple *, playlist_entry_get_tuple, int, playlist, int, entry,
+ bool_t, fast)
 
 /* Returns a formatted title string for an entry. This may include information
- * such as the filename, song title, and/or artist. The string should be freed
- * when no longer needed. If <fast> is nonzero, returns the entry's filename if
- * metadata for the entry has not yet been read. */
-AUD_FUNC3 (gchar *, playlist_entry_get_title, gint, playlist, gint, entry,
- gboolean, fast)
+ * such as the filename, song title, and/or artist. If <fast> is nonzero,
+ * returns a "best guess" based on the entry's filename if metadata for the
+ * entry has not yet been read. */
+AUD_FUNC3 (char *, playlist_entry_get_title, int, playlist, int, entry,
+ bool_t, fast)
 
 /* Returns three strings (title, artist, and album) describing an entry. The
- * strings should be freed when no longer needed. If <fast> is nonzero, returns
- * a "best guess" based on the entry's filename if metadata for the entry has
- * not yet been read. May return NULL for any and all values. */
-AUD_FUNC6 (void, playlist_entry_describe, gint, playlist, gint, entry,
- gchar * *, title, gchar * *, artist, gchar * *, album, gboolean, fast)
+ * strings are pooled, and the usual cautions apply. If <fast> is nonzero,
+ * returns a "best guess" based on the entry's filename if metadata for the
+ * entry has not yet been read. May return NULL for any and all values. */
+AUD_VFUNC6 (playlist_entry_describe, int, playlist, int, entry,
+ char * *, title, char * *, artist, char * *, album, bool_t, fast)
 
 /* Returns the length in milliseconds of an entry, or -1 if the length is not
 * known. <fast> is as in playlist_entry_get_tuple(). */
-AUD_FUNC3 (gint, playlist_entry_get_length, gint, playlist, gint, entry,
- gboolean, fast)
+AUD_FUNC3 (int, playlist_entry_get_length, int, playlist, int, entry,
+ bool_t, fast)
 
 /* Sets the entry which will be played (if this playlist is selected with
 * playlist_set_playing()) when drct_play() is called. If a song from this
 * playlist is already playing, it will be stopped. If <position> is negative,
 * calls to playlist_get_position() will return -1, and the behavior of
 * drct_play() is unspecified. */
-AUD_FUNC2 (void, playlist_set_position, gint, playlist, gint, position)
+AUD_VFUNC2 (playlist_set_position, int, playlist, int, position)
 
 /* Returns the number of the entry which was last played from this playlist, or
 * -1 if that cannot be determined. */
-AUD_FUNC1 (gint, playlist_get_position, gint, playlist)
+AUD_FUNC1 (int, playlist_get_position, int, playlist)
 
 /* Sets whether an entry is selected. */
-AUD_FUNC3 (void, playlist_entry_set_selected, gint, playlist, gint, entry,
- gboolean, selected)
+AUD_VFUNC3 (playlist_entry_set_selected, int, playlist, int, entry,
+ bool_t, selected)
 
 /* Returns whether an entry is selected. */
-AUD_FUNC2 (gboolean, playlist_entry_get_selected, gint, playlist, gint, entry)
+AUD_FUNC2 (bool_t, playlist_entry_get_selected, int, playlist, int, entry)
 
 /* Returns the number of selected entries in a playlist. */
-AUD_FUNC1 (gint, playlist_selected_count, gint, playlist)
+AUD_FUNC1 (int, playlist_selected_count, int, playlist)
 
 /* Selects all (or none) of the entries in a playlist. */
-AUD_FUNC2 (void, playlist_select_all, gint, playlist, gboolean, selected)
+AUD_VFUNC2 (playlist_select_all, int, playlist, bool_t, selected)
 
 /* Moves a selected entry within a playlist by an offset of <distance> entries.
 * Other selected entries are gathered around it. Returns the offset by which
 * the entry was actually moved, which may be less in absolute value than the
 * requested offset. */
-AUD_FUNC3 (gint, playlist_shift, gint, playlist, gint, position, gint, distance)
+AUD_FUNC3 (int, playlist_shift, int, playlist, int, position, int, distance)
 
 /* Removes the selected entries from a playlist. If the last song played is one
 * of these entries, playback is stopped. In this case, calls to
 * playlist_get_position() will return -1, and the behavior of drct_play() is
 * unspecified. */
-AUD_FUNC1 (void, playlist_delete_selected, gint, playlist)
+AUD_VFUNC1 (playlist_delete_selected, int, playlist)
 
 /* Sorts the entries in a playlist based on filename. The callback function
 * should return negative if the first filename comes before the second,
 * positive if it comes after, or zero if the two are indistinguishable. */
-AUD_FUNC2 (void, playlist_sort_by_filename, gint, playlist,
+AUD_VFUNC2 (playlist_sort_by_filename, int, playlist,
 PlaylistStringCompareFunc, compare)
 
 /* Sorts the entries in a playlist based on tuple. May fail if metadata
 * scanning is still in progress (or has been disabled). */
-AUD_FUNC2 (void, playlist_sort_by_tuple, gint, playlist,
+AUD_VFUNC2 (playlist_sort_by_tuple, int, playlist,
 PlaylistTupleCompareFunc, compare)
 
 /* Sorts the entries in a playlist based on formatted title string. May fail if
 * metadata scanning is still in progress (or has been disabled). */
-AUD_FUNC2 (void, playlist_sort_by_title, gint, playlist,
+AUD_VFUNC2 (playlist_sort_by_title, int, playlist,
 PlaylistStringCompareFunc, compare)
 
 /* Sorts only the selected entries in a playlist based on filename. */
-AUD_FUNC2 (void, playlist_sort_selected_by_filename, gint, playlist,
+AUD_VFUNC2 (playlist_sort_selected_by_filename, int, playlist,
 PlaylistStringCompareFunc, compare)
 
 /* Sorts only the selected entries in a playlist based on tuple. May fail if
 * metadata scanning is still in progress (or has been disabled). */
-AUD_FUNC2 (void, playlist_sort_selected_by_tuple, gint, playlist,
+AUD_VFUNC2 (playlist_sort_selected_by_tuple, int, playlist,
 PlaylistTupleCompareFunc, compare)
 
 /* Sorts only the selected entries in a playlist based on formatted title
 * string. May fail if metadata scanning is still in progress (or has been
 * disabled). */
-AUD_FUNC2 (void, playlist_sort_selected_by_title, gint, playlist,
+AUD_VFUNC2 (playlist_sort_selected_by_title, int, playlist,
 PlaylistStringCompareFunc, compare)
 
 /* Reverses the order of the entries in a playlist. */
-AUD_FUNC1 (void, playlist_reverse, gint, playlist)
+AUD_VFUNC1 (playlist_reverse, int, playlist)
 
 /* Reorders the entries in a playlist randomly. */
-AUD_FUNC1 (void, playlist_randomize, gint, playlist)
+AUD_VFUNC1 (playlist_randomize, int, playlist)
 
 /* Discards the metadata stored for all the entries in a playlist and starts
 * reading it afresh from the song files in the background. */
-AUD_FUNC1 (void, playlist_rescan, gint, playlist)
+AUD_VFUNC1 (playlist_rescan, int, playlist)
 
 /* Like playlist_rescan, but applies only to the selected entries in a playlist. */
-AUD_FUNC1 (void, playlist_rescan_selected, gint, playlist)
+AUD_VFUNC1 (playlist_rescan_selected, int, playlist)
 
 /* Discards the metadata stored for all the entries that refer to a particular
 * song file, in whatever playlist they appear, and starts reading it afresh
 * from that file in the background. */
-AUD_FUNC1 (void, playlist_rescan_file, const gchar *, filename)
+AUD_VFUNC1 (playlist_rescan_file, const char *, filename)
 
 /* Calculates the total length in milliseconds of all the entries in a playlist.
 * Only takes into account entries for which metadata has already been read. */
-AUD_FUNC1 (gint64, playlist_get_total_length, gint, playlist)
+AUD_FUNC1 (int64_t, playlist_get_total_length, int, playlist)
 
 /* Calculates the total length in milliseconds of only the selected entries in a
 * playlist. Only takes into account entries for which metadata has already
 * been read. */
-AUD_FUNC1 (gint64, playlist_get_selected_length, gint, playlist)
+AUD_FUNC1 (int64_t, playlist_get_selected_length, int, playlist)
 
 /* Returns the number of entries in a playlist queue. The entries are numbered
 * starting from zero, lower numbers being played first. */
-AUD_FUNC1 (gint, playlist_queue_count, gint, playlist)
+AUD_FUNC1 (int, playlist_queue_count, int, playlist)
 
 /* Adds an entry to a playlist's queue before the entry numbered <at> in the
 * queue. If <at> is negative or equal to the number of entries in the queue,
 * adds the entry after the last one in the queue. The same entry cannot be
 * added to the queue more than once. */
-AUD_FUNC3 (void, playlist_queue_insert, gint, playlist, gint, at, gint, entry)
+AUD_VFUNC3 (playlist_queue_insert, int, playlist, int, at, int, entry)
 
 /* Adds the selected entries in a playlist to the queue, if they are not already
 * in it. */
-AUD_FUNC2 (void, playlist_queue_insert_selected, gint, playlist, gint, at)
+AUD_VFUNC2 (playlist_queue_insert_selected, int, playlist, int, at)
 
 /* Returns the position in the playlist of the entry at a given position in the
 * queue. */
-AUD_FUNC2 (gint, playlist_queue_get_entry, gint, playlist, gint, at)
+AUD_FUNC2 (int, playlist_queue_get_entry, int, playlist, int, at)
 
 /* Returns the position in the queue of the entry at a given position in the
 * playlist. If it is not in the queue, returns -1. */
-AUD_FUNC2 (gint, playlist_queue_find_entry, gint, playlist, gint, entry)
+AUD_FUNC2 (int, playlist_queue_find_entry, int, playlist, int, entry)
 
 /* Removes a contiguous block of <number> entries starting with the one numbered
 * <at> from the queue. */
-AUD_FUNC3 (void, playlist_queue_delete, gint, playlist, gint, at, gint, number)
+AUD_VFUNC3 (playlist_queue_delete, int, playlist, int, at, int, number)
 
 /* Removes the selected entries in a playlist from the queue, if they are in it. */
-AUD_FUNC1 (void, playlist_queue_delete_selected, gint, playlist)
-
-/* Returns nonzero if any playlist has been changed since the last call of the
- * "playlist update" hook. If called from within the hook, returns nonzero. */
-AUD_FUNC0 (gboolean, playlist_update_pending)
-
-/* May be called within the "playlist update" hook to determine what range of
- * entries must be updated. If all entries in all playlists must be updated,
- * returns zero. If a limited range in a single playlist must be updated,
- * returns nonzero. In this case, stores the number of that playlist at
- * <playlist>, the number of the first entry to be updated at <at>, and the
- * number of contiguous entries to be updated at <count>. Note that entries may
- * have been added or removed within this range. */
-AUD_FUNC3 (gboolean, playlist_update_range, gint *, playlist, gint *, at,
- gint *, count)
+AUD_VFUNC1 (playlist_queue_delete_selected, int, playlist)
+
+/* Returns nonzero if a "playlist update" hook call is pending. If called from
+ * within the hook, the current hook call is not considered pending. */
+AUD_FUNC0 (bool_t, playlist_update_pending)
+
+/* May be called within the "playlist update" hook to determine the update level
+ * and number of entries changed in a playlist. Returns the update level for
+ * the playlist, storing the number of the first entry changed in <at> and the
+ * number of contiguous entries to be updated in <count>. Note that entries may
+ * have been added or removed within this range. If no entries in the playlist
+ * have changed, returns zero. */
+AUD_FUNC3 (int, playlist_updated_range, int, playlist, int *, at, int *, count)
+
+/* Returns nonzero if entries are being added to a playlist in the background. */
+AUD_FUNC1 (bool_t, playlist_add_in_progress, int, playlist)
+
+/* Returns nonzero if entries in a playlist are being scanned for metadata in
+ * the background. */
+AUD_FUNC1 (bool_t, playlist_scan_in_progress, int, playlist)
 
 /* --- PLAYLIST UTILITY API --- */
 
 /* Sorts the entries in a playlist according to one of the schemes listed in
 * playlist.h. */
-AUD_FUNC2 (void, playlist_sort_by_scheme, gint, playlist, gint, scheme)
+AUD_VFUNC2 (playlist_sort_by_scheme, int, playlist, int, scheme)
 
 /* Sorts only the selected entries in a playlist according to one of those
 * schemes. */
-AUD_FUNC2 (void, playlist_sort_selected_by_scheme, gint, playlist, gint, scheme)
+AUD_VFUNC2 (playlist_sort_selected_by_scheme, int, playlist, int, scheme)
 
 /* Removes duplicate entries in a playlist according to one of those schemes.
 * As currently implemented, first sorts the playlist. */
-AUD_FUNC2 (void, playlist_remove_duplicates_by_scheme, gint, playlist, gint,
+AUD_VFUNC2 (playlist_remove_duplicates_by_scheme, int, playlist, int,
 scheme)
 
 /* Removes all entries referring to unavailable files in a playlist. ("Remove
 * failed" is something of a misnomer for the current behavior.) As currently
 * implemented, only works for file:// URIs. */
-AUD_FUNC1 (void, playlist_remove_failed, gint, playlist)
+AUD_VFUNC1 (playlist_remove_failed, int, playlist)
 
 /* Selects all the entries in a playlist that match regular expressions stored
 * in the fields of a tuple. Does not free the memory used by the tuple.
 * Example: To select all the songs whose title starts with the letter "A",
 * create a blank tuple and set its title field to "^A". */
-AUD_FUNC2 (void, playlist_select_by_patterns, gint, playlist, const Tuple *,
+AUD_VFUNC2 (playlist_select_by_patterns, int, playlist, const Tuple *,
 patterns)
 
 /* Returns nonzero if <filename> refers to a playlist file. */
-AUD_FUNC1 (gboolean, filename_is_playlist, const gchar *, filename)
+AUD_FUNC1 (bool_t, filename_is_playlist, const char *, filename)
 
 /* Saves the entries in a playlist to a playlist file. The format of the file
 * is determined from the file extension. Returns nonzero on success. */
-AUD_FUNC2 (gboolean, playlist_save, gint, playlist, const gchar *, filename)
+AUD_FUNC2 (bool_t, playlist_save, int, playlist, const char *, filename)

audacious-3.1.1.tar.bz2/src/audacious/playlist-files.c -> audacious-3.2.4.tar.bz2/src/audacious/playlist-files.c Changed

@@ -19,69 +19,66 @@
 * using our public API to be a derived work.
 */
 
+#include <glib.h>
+#include <libaudcore/audstrings.h>
+
+#include "config.h"
 #include "debug.h"
+#include "i18n.h"
 #include "misc.h"
 #include "playlist.h"
 #include "plugin.h"
 #include "plugins.h"
 
-static const gchar * get_extension (const gchar * filename, gboolean quiet)
+static const char * get_extension (const char * filename)
 {
- const gchar * s = strrchr (filename, '/');
- if (! s)
- goto FAIL;
-
- const gchar * p = strrchr (s + 1, '.');
- if (! p)
- goto FAIL;
-
- return p + 1;
-
-FAIL:
- if (! quiet)
- fprintf (stderr, "Failed to parse playlist filename %s.\n", filename);
- return NULL;
+ const char * ext;
+ uri_parse (filename, NULL, & ext, NULL, NULL);
+ return (ext && ext[0] == '.') ? ext + 1 : NULL;
 }
 
-gboolean filename_is_playlist (const gchar * filename)
+bool_t filename_is_playlist (const char * filename)
 {
- const gchar * ext = get_extension (filename, TRUE);
- if (! ext)
- return FALSE;
-
- return playlist_plugin_for_extension (ext) ? TRUE : FALSE;
+ const char * ext = get_extension (filename);
+ return (ext && playlist_plugin_for_extension (ext)) ? TRUE : FALSE;
 }
 
-static PlaylistPlugin * get_plugin (const gchar * filename)
+static PluginHandle * get_plugin (const char * filename, bool_t saving)
 {
- const gchar * ext = get_extension (filename, FALSE);
- if (! ext)
- return NULL;
+ const char * ext = get_extension (filename);
+ PluginHandle * plugin = ext ? playlist_plugin_for_extension (ext) : NULL;
 
- PluginHandle * plugin = playlist_plugin_for_extension (ext);
 if (! plugin)
 {
- fprintf (stderr, "Unrecognized playlist file type \"%s\".\n", ext);
+ char * error = str_printf (_("Cannot %s %s: unsupported file "
+ "extension."), saving ? _("save") : _("load"), filename);
+ interface_show_error (error);
+ str_unref (error);
 return NULL;
 }
 
- return plugin_get_header (plugin);
+ return plugin;
 }
 
-gboolean playlist_load (const gchar * filename, gchar * * title,
- struct index * * filenames_p, struct index * * tuples_p)
+bool_t playlist_load (const char * filename, char * * title,
+ Index * * filenames_p, Index * * tuples_p)
 {
 AUDDBG ("Loading playlist %s.\n", filename);
- PlaylistPlugin * pp = get_plugin (filename);
+
+ PluginHandle * plugin = get_plugin (filename, FALSE);
+ if (! plugin)
+ return FALSE;
+
+ PlaylistPlugin * pp = plugin_get_header (plugin);
 g_return_val_if_fail (pp && PLUGIN_HAS_FUNC (pp, load), FALSE);
 
 VFSFile * file = vfs_fopen (filename, "r");
 if (! file)
 return FALSE;
 
- struct index * filenames = index_new ();
- struct index * tuples = index_new ();
- gboolean success = pp->load (filename, file, title, filenames, tuples);
+ Index * filenames = index_new ();
+ Index * tuples = index_new ();
+ bool_t success = pp->load (filename, file, title, filenames, tuples);
 
 vfs_fclose (file);
 
@@ -106,11 +103,11 @@
 return TRUE;
 }
 
-gboolean playlist_insert_playlist_raw (gint list, gint at,
- const gchar * filename)
+bool_t playlist_insert_playlist_raw (int list, int at,
+ const char * filename)
 {
- gchar * title = NULL;
- struct index * filenames, * tuples;
+ char * title = NULL;
+ Index * filenames, * tuples;
 
 if (! playlist_load (filename, & title, & filenames, & tuples))
 return FALSE;
@@ -120,47 +117,52 @@
 
 playlist_entry_insert_batch_raw (list, at, filenames, tuples, NULL);
 
- g_free (title);
+ str_unref (title);
 return TRUE;
 }
 
-gboolean playlist_save (gint list, const gchar * filename)
+bool_t playlist_save (int list, const char * filename)
 {
 AUDDBG ("Saving playlist %s.\n", filename);
- PlaylistPlugin * pp = get_plugin (filename);
- g_return_val_if_fail (pp && PLUGIN_HAS_FUNC (pp, save), FALSE);
 
- gboolean fast = get_bool (NULL, "metadata_on_play");
+ PluginHandle * plugin = get_plugin (filename, TRUE);
+ if (! plugin)
+ return FALSE;
+
+ PlaylistPlugin * pp = plugin_get_header (plugin);
+ g_return_val_if_fail (pp && PLUGIN_HAS_FUNC (pp, load), FALSE);
+
+ bool_t fast = get_bool (NULL, "metadata_on_play");
 
 VFSFile * file = vfs_fopen (filename, "w");
 if (! file)
 return FALSE;
 
- gchar * title = playlist_get_title (list);
+ char * title = playlist_get_title (list);
 
- gint entries = playlist_entry_count (list);
- struct index * filenames = index_new ();
+ int entries = playlist_entry_count (list);
+ Index * filenames = index_new ();
 index_allocate (filenames, entries);
- struct index * tuples = index_new ();
+ Index * tuples = index_new ();
 index_allocate (tuples, entries);
 
- for (gint i = 0; i < entries; i ++)
+ for (int i = 0; i < entries; i ++)
 {
- index_append (filenames, (void *) playlist_entry_get_filename (list, i));
- index_append (tuples, (void *) playlist_entry_get_tuple (list, i, fast));
+ index_append (filenames, playlist_entry_get_filename (list, i));
+ index_append (tuples, playlist_entry_get_tuple (list, i, fast));
 }
 
- gboolean success = pp->save (filename, file, title, filenames, tuples);
+ bool_t success = pp->save (filename, file, title, filenames, tuples);
 
 vfs_fclose (file);
- g_free (title);
+ str_unref (title);
 
- for (gint i = 0; i < entries; i ++)
+ for (int i = 0; i < entries; i ++)
 {
- g_free (index_get (filenames, i));
+ str_unref (index_get (filenames, i));
 Tuple * tuple = index_get (tuples, i);
 if (tuple)
- tuple_free (tuple);
+ tuple_unref (tuple);
 }
 
 index_free (filenames);

audacious-3.1.1.tar.bz2/src/audacious/playlist-new.c -> audacious-3.2.4.tar.bz2/src/audacious/playlist-new.c Changed

@@ -19,15 +19,17 @@
 * using our public API to be a derived work.
 */
 
+#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <time.h>
 
 #include <glib.h>
 
 #include <libaudcore/audstrings.h>
-#include <libaudcore/eventqueue.h>
 #include <libaudcore/hook.h>
-#include <libaudcore/stringpool.h>
-#include <libaudcore/tuple_formatter.h>
+#include <libaudcore/tuple.h>
 
 #include "config.h"
 #include "i18n.h"
@@ -39,19 +41,19 @@
 
 enum {RESUME_STOP, RESUME_PLAY, RESUME_PAUSE};
 
-#define SCAN_THREADS 4
+#define SCAN_THREADS 2
 #define STATE_FILE "playlist-state"
 
-#define ENTER g_mutex_lock (mutex)
-#define LEAVE g_mutex_unlock (mutex)
+#define ENTER pthread_mutex_lock (& mutex)
+#define LEAVE pthread_mutex_unlock (& mutex)
 
 #define LEAVE_RET_VOID do { \
- g_mutex_unlock (mutex); \
+ pthread_mutex_unlock (& mutex); \
 return; \
 } while (0)
 
 #define LEAVE_RET(ret) do { \
- g_mutex_unlock (mutex); \
+ pthread_mutex_unlock (& mutex); \
 return ret; \
 } while (0)
 
@@ -87,83 +89,85 @@
 #define SELECTION_HAS_CHANGED(p, a, c) \
 queue_update (PLAYLIST_UPDATE_SELECTION, p, a, c)
 
-#define METADATA_HAS_CHANGED(p, a, c) do { \
- scan_trigger (); \
- queue_update (PLAYLIST_UPDATE_METADATA, p, a, c); \
-} while (0)
+#define METADATA_HAS_CHANGED(p, a, c) \
+ queue_update (PLAYLIST_UPDATE_METADATA, p, a, c)
 
-#define PLAYLIST_HAS_CHANGED(p, a, c) do { \
- scan_trigger (); \
- queue_update (PLAYLIST_UPDATE_STRUCTURE, p, a, c); \
-} while (0)
+#define PLAYLIST_HAS_CHANGED(p, a, c) \
+ queue_update (PLAYLIST_UPDATE_STRUCTURE, p, a, c)
 
 typedef struct {
- gint number;
- gchar * filename;
+ int level, before, after;
+} Update;
+
+typedef struct {
+ int number;
+ char * filename;
 PluginHandle * decoder;
 Tuple * tuple;
- gchar * formatted, * title, * artist, * album;
- gint length;
- gboolean failed;
- gboolean selected;
- gint shuffle_num;
- gboolean queued;
- gboolean segmented;
- gint start, end;
+ char * formatted, * title, * artist, * album;
+ int length;
+ bool_t failed;
+ bool_t selected;
+ int shuffle_num;
+ bool_t queued;
+ bool_t segmented;
+ int start, end;
 } Entry;
 
 typedef struct {
- gint number, unique_id;
- gchar * filename, * title;
- struct index * entries;
+ int number, unique_id;
+ char * filename, * title;
+ bool_t modified;
+ Index * entries;
 Entry * position;
- gint selected_count;
- gint last_shuffle_num;
+ int selected_count;
+ int last_shuffle_num;
 GList * queued;
- gint64 total_length, selected_length;
+ int64_t total_length, selected_length;
+ bool_t scanning, scan_ending;
+ Update next_update, last_update;
 } Playlist;
 
-static GMutex * mutex;
-static GCond * cond;
+static const char * const default_title = N_("New Playlist");
+static const char * const temp_title = N_("Now Playing");
+
+static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
 
-static gint next_unique_id = 1000;
+/* The unique ID table contains pointers to Playlist for ID's in use and NULL
+ * for "dead" (previously used and therefore unavailable) ID's. */
+static GHashTable * unique_id_table = NULL;
+static int next_unique_id = 1000;
 
-static struct index * playlists = NULL;
+static Index * playlists = NULL;
 static Playlist * active_playlist = NULL;
 static Playlist * playing_playlist = NULL;
 
-static gint update_source = 0;
-
-struct {
- gboolean pending;
- gint level, playlist, before, after;
-} next_update, last_update;
-
-static gint resume_state, resume_time;
+static int update_source = 0, update_level;
+static int resume_state, resume_time;
 
 typedef struct {
 Playlist * playlist;
 Entry * entry;
 } ScanItem;
 
-static GThread * scan_threads[SCAN_THREADS];
-static gboolean scan_quit;
-static gint scan_playlist, scan_row;
+static pthread_t scan_threads[SCAN_THREADS];
+static bool_t scan_quit;
+static int scan_playlist, scan_row;
 static GQueue scan_queue = G_QUEUE_INIT;
 static ScanItem * scan_items[SCAN_THREADS];
 
 static void * scanner (void * unused);
+static void scan_trigger (void);
+
+static char * title_format;
 
-static gchar * title_from_tuple (Tuple * tuple)
+static char * title_from_tuple (Tuple * tuple)
 {
- const gchar * custom = tuple_get_string (tuple, FIELD_FORMATTER, NULL);
- if (custom)
- return tuple_formatter_make_title_string (tuple, custom);
+ if (! title_format)
+ title_format = get_string (NULL, "generic_title_format");
 
- gchar * generic = get_string (NULL, "generic_title_format");
- gchar * title = tuple_formatter_make_title_string (tuple, generic);
- g_free (generic);
- return title;
+ return tuple_format_title (tuple, title_format);
 }
 
 static void entry_set_tuple_real (Entry * entry, Tuple * tuple)
@@ -173,18 +177,18 @@
 if (entry->segmented && entry->tuple)
 {
 if (tuple)
- tuple_free (tuple);
+ tuple_unref (tuple);
 return;
 }
 
 if (entry->tuple)
- tuple_free (entry->tuple);
+ tuple_unref (entry->tuple);
 entry->tuple = tuple;
 
- g_free (entry->formatted);
- stringpool_unref (entry->title);
- stringpool_unref (entry->artist);
- stringpool_unref (entry->album);
+ str_unref (entry->formatted);
+ str_unref (entry->title);
+ str_unref (entry->artist);
+ str_unref (entry->album);
 
 describe_song (entry->filename, tuple, & entry->title, & entry->artist, & entry->album);
 
@@ -259,7 +263,7 @@
 }
 }
 
- for (gint i = 0; i < SCAN_THREADS; i ++)
+ for (int i = 0; i < SCAN_THREADS; i ++)
 {
 if (scan_items[i] && scan_items[i]->entry == entry)
 {
@@ -269,10 +273,10 @@
 }
 }
 
-static Entry * entry_new (gchar * filename, Tuple * tuple,
+static Entry * entry_new (char * filename, Tuple * tuple,
 PluginHandle * decoder)
 {
- Entry * entry = g_malloc (sizeof (Entry));
+ Entry * entry = g_slice_new (Entry);
 
 entry->filename = filename;
 entry->decoder = decoder;
@@ -298,25 +302,39 @@
 {
 entry_cancel_scan (entry);
 
- g_free (entry->filename);
+ str_unref (entry->filename);
 if (entry->tuple)
- tuple_free (entry->tuple);
+ tuple_unref (entry->tuple);
+
+ str_unref (entry->formatted);
+ str_unref (entry->title);
+ str_unref (entry->artist);
+ str_unref (entry->album);
+ g_slice_free (Entry, entry);
+}
 
- g_free (entry->formatted);
- stringpool_unref (entry->title);
- stringpool_unref (entry->artist);
- stringpool_unref (entry->album);
- g_free (entry);
+static int new_unique_id (int preferred)
+{
+ if (preferred >= 0 && ! g_hash_table_lookup_extended (unique_id_table,
+ GINT_TO_POINTER (preferred), NULL, NULL))
+ return preferred;
+
+ while (g_hash_table_lookup_extended (unique_id_table,
+ GINT_TO_POINTER (next_unique_id), NULL, NULL))
+ next_unique_id ++;
+
+ return next_unique_id ++;
 }
 
-static Playlist * playlist_new (void)
+static Playlist * playlist_new (int id)
 {
- Playlist * playlist = g_malloc (sizeof (Playlist));
+ Playlist * playlist = g_slice_new (Playlist);
 
 playlist->number = -1;
- playlist->unique_id = next_unique_id ++;
+ playlist->unique_id = new_unique_id (id);
 playlist->filename = NULL;
- playlist->title = g_strdup(_("Untitled Playlist"));
+ playlist->title = str_get (_(default_title));
+ playlist->modified = TRUE;
 playlist->entries = index_new();
 playlist->position = NULL;
 playlist->selected_count = 0;
@@ -324,134 +342,160 @@
 playlist->queued = NULL;
 playlist->total_length = 0;
 playlist->selected_length = 0;
+ playlist->scanning = FALSE;
+ playlist->scan_ending = FALSE;
 
+ memset (& playlist->last_update, 0, sizeof (Update));
+ memset (& playlist->next_update, 0, sizeof (Update));
+
+ g_hash_table_insert (unique_id_table, GINT_TO_POINTER (playlist->unique_id), playlist);
 return playlist;
 }
 
 static void playlist_free (Playlist * playlist)
 {
- g_free (playlist->filename);
- g_free (playlist->title);
+ g_hash_table_insert (unique_id_table, GINT_TO_POINTER (playlist->unique_id), NULL);
+
+ str_unref (playlist->filename);
+ str_unref (playlist->title);
 
- for (gint count = 0; count < index_count (playlist->entries); count ++)
+ for (int count = 0; count < index_count (playlist->entries); count ++)
 entry_free (index_get (playlist->entries, count));
 
 index_free (playlist->entries);
 g_list_free (playlist->queued);
- g_free (playlist);
+ g_slice_free (Playlist, playlist);
 }
 
-static void number_playlists (gint at, gint length)
+static void number_playlists (int at, int length)
 {
- for (gint count = 0; count < length; count ++)
+ for (int count = 0; count < length; count ++)
 {
 Playlist * playlist = index_get (playlists, at + count);
 playlist->number = at + count;
 }
 }
 
-static Playlist * lookup_playlist (gint playlist_num)
+static Playlist * lookup_playlist (int playlist_num)
 {
 return (playlists && playlist_num >= 0 && playlist_num < index_count
 (playlists)) ? index_get (playlists, playlist_num) : NULL;
 }
 
-static void number_entries (Playlist * playlist, gint at, gint length)
+static void number_entries (Playlist * playlist, int at, int length)
 {
- for (gint count = 0; count < length; count ++)
+ for (int count = 0; count < length; count ++)
 {
 Entry * entry = index_get (playlist->entries, at + count);
 entry->number = at + count;
 }
 }
 
-static Entry * lookup_entry (Playlist * playlist, gint entry_num)
+static Entry * lookup_entry (Playlist * playlist, int entry_num)
 {
 return (entry_num >= 0 && entry_num < index_count (playlist->entries)) ?
 index_get (playlist->entries, entry_num) : NULL;
 }
 
-static gboolean update (void * unused)
+static bool_t update (void * unused)
 {
 ENTER;
 
+ for (int i = 0; i < index_count (playlists); i ++)
+ {
+ Playlist * p = index_get (playlists, i);
+ memcpy (& p->last_update, & p->next_update, sizeof (Update));
+ memset (& p->next_update, 0, sizeof (Update));
+ }
+
+ int level = update_level;
+ update_level = 0;
+
 if (update_source)
 {
 g_source_remove (update_source);
 update_source = 0;
 }
 
- memcpy (& last_update, & next_update, sizeof last_update);
- memset (& next_update, 0, sizeof next_update);
-
 LEAVE;
 
- hook_call ("playlist update", GINT_TO_POINTER (last_update.level));
+ hook_call ("playlist update", GINT_TO_POINTER (level));
 return FALSE;
 }
 
-static void queue_update (gint level, gint list, gint at, gint count)
+static void queue_update (int level, int list, int at, int count)
 {
- Playlist * playlist = lookup_playlist (list);
+ Playlist * p = lookup_playlist (list);
 
- if (next_update.pending)
+ if (p)
 {
- next_update.level = MAX (next_update.level, level);
+ if (level >= PLAYLIST_UPDATE_METADATA)
+ {
+ p->modified = TRUE;
+
+ if (! get_bool (NULL, "metadata_on_play"))
+ {
+ p->scanning = TRUE;
+ p->scan_ending = FALSE;
+ scan_trigger ();
+ }
+ }
 
- if (playlist && list == next_update.playlist)
+ if (p->next_update.level)
 {
- next_update.before = MIN (next_update.before, at);
- next_update.after = MIN (next_update.after, index_count
- (playlist->entries) - at - count);
+ p->next_update.level = MAX (p->next_update.level, level);
+ p->next_update.before = MIN (p->next_update.before, at);
+ p->next_update.after = MIN (p->next_update.after,
+ index_count (p->entries) - at - count);
 }
 else
 {
- next_update.playlist = -1;
- next_update.before = 0;
- next_update.after = 0;
+ p->next_update.level = level;
+ p->next_update.before = at;
+ p->next_update.after = index_count (p->entries) - at - count;
 }
 }
- else
- {
- next_update.pending = TRUE;
- next_update.level = level;
- next_update.playlist = list;
- next_update.before = playlist ? at : 0;
- next_update.after = playlist ? index_count (playlist->entries)
- - at - count: 0;
- }
+
+ update_level = MAX (update_level, level);
 
 if (! update_source)
- update_source = g_idle_add_full (G_PRIORITY_HIGH_IDLE, update, NULL,
- NULL);
+ update_source = g_idle_add_full (G_PRIORITY_HIGH, update, NULL, NULL);
 }
 
-gboolean playlist_update_pending (void)
+bool_t playlist_update_pending (void)
 {
 ENTER;
- gboolean pending = next_update.pending;
+ bool_t pending = update_level ? TRUE : FALSE;
 LEAVE_RET (pending);
 }
 
-gboolean playlist_update_range (gint * playlist_num, gint * at, gint * count)
+int playlist_updated_range (int playlist_num, int * at, int * count)
 {
 ENTER;
+ DECLARE_PLAYLIST;
+ LOOKUP_PLAYLIST_RET (0);
 
- if (! last_update.pending)
- LEAVE_RET (FALSE);
+ Update * u = & playlist->last_update;
 
- Playlist * playlist = lookup_playlist (last_update.playlist);
- if (! playlist)
- LEAVE_RET (FALSE);
+ int level = u->level;
+ * at = u->before;
+ * count = index_count (playlist->entries) - u->before - u->after;
+
+ LEAVE_RET (level);
+}
+
+bool_t playlist_scan_in_progress (int playlist_num)
+{
+ ENTER;
+ DECLARE_PLAYLIST;
+ LOOKUP_PLAYLIST_RET (FALSE);
+
+ bool_t scanning = playlist->scanning || playlist->scan_ending;
 
- * playlist_num = last_update.playlist;
- * at = last_update.before;
- * count = index_count (playlist->entries) - last_update.before -
- last_update.after;
- LEAVE_RET (TRUE);
+ LEAVE_RET (scanning);
 }
 
-static gboolean entry_scan_is_queued (Entry * entry)
+static bool_t entry_scan_is_queued (Entry * entry)
 {
 for (GList * node = scan_queue.head; node; node = node->next)
 {
@@ -460,7 +504,7 @@
 return TRUE;
 }
 
- for (gint i = 0; i < SCAN_THREADS; i ++)
+ for (int i = 0; i < SCAN_THREADS; i ++)
 {
 if (scan_items[i] && scan_items[i]->entry == entry)
 return TRUE;
@@ -479,7 +523,31 @@
 item->entry = entry;
 g_queue_push_tail (& scan_queue, item);
 
- g_cond_broadcast (cond);
+ pthread_cond_broadcast (& cond);
+}
+
+static void check_scan_complete (Playlist * p)
+{
+ if (! p->scan_ending)
+ return;
+
+ for (GList * node = scan_queue.head; node; node = node->next)
+ {
+ ScanItem * item = node->data;
+ if (item->playlist == p)
+ return;
+ }
+
+ for (int i = 0; i < SCAN_THREADS; i ++)
+ {
+ if (scan_items[i] && scan_items[i]->playlist == p)
+ return;
+ }
+
+ p->scan_ending = FALSE;
+
+ event_queue_cancel ("playlist scan complete", NULL);
+ event_queue ("playlist scan complete", NULL);
 }
 
 static ScanItem * entry_find_to_scan (void)
@@ -488,40 +556,34 @@
 if (item)
 return item;
 
- if (get_bool (NULL, "metadata_on_play"))
- return NULL;
-
 while (scan_playlist < index_count (playlists))
 {
 Playlist * playlist = index_get (playlists, scan_playlist);
 
- if (scan_row < index_count (playlist->entries))
+ if (playlist->scanning)
 {
- Entry * entry = index_get (playlist->entries, scan_row);
-
- if (! entry->tuple && ! entry_scan_is_queued (entry))
+ while (scan_row < index_count (playlist->entries))
 {
- item = g_slice_new (ScanItem);
- item->playlist = playlist;
- item->entry = entry;
- return item;
- }
+ Entry * entry = index_get (playlist->entries, scan_row);
 
- scan_row ++;
- }
- else
- {
- /* scan the active playlist first, then all the others */
- if (scan_playlist == active_playlist->number)
- scan_playlist = 0;
- else
- scan_playlist ++;
+ if (! entry->tuple && ! entry_scan_is_queued (entry))
+ {
+ item = g_slice_new (ScanItem);
+ item->playlist = playlist;
+ item->entry = entry;
+ return item;
+ }
 
- if (scan_playlist == active_playlist->number)
- scan_playlist ++;
+ scan_row ++;
+ }
 
- scan_row = 0;
+ playlist->scanning = FALSE;
+ playlist->scan_ending = TRUE;
+ check_scan_complete (playlist);
 }
+
+ scan_playlist ++;
+ scan_row = 0;
 }
 
 return NULL;
@@ -531,7 +593,7 @@
 {
 ENTER;
 
- gint i = GPOINTER_TO_INT (data);
+ int i = GPOINTER_TO_INT (data);
 
 while (! scan_quit)
 {
@@ -540,15 +602,15 @@
 
 if (! scan_items[i])
 {
- g_cond_wait (cond, mutex);
+ pthread_cond_wait (& cond, & mutex);
 continue;
 }
 
 Playlist * playlist = scan_items[i]->playlist;
 Entry * entry = scan_items[i]->entry;
- gchar * filename = g_strdup (entry->filename);
+ char * filename = str_ref (entry->filename);
 PluginHandle * decoder = entry->decoder;
- gboolean need_tuple = entry->tuple ? FALSE : TRUE;
+ bool_t need_tuple = entry->tuple ? FALSE : TRUE;
 
 LEAVE;
 
@@ -559,12 +621,12 @@
 
 ENTER;
 
- g_free (filename);
+ str_unref (filename);
 
 if (! scan_items[i]) /* scan canceled */
 {
 if (tuple)
- tuple_free (tuple);
+ tuple_unref (tuple);
 continue;
 }
 
@@ -575,13 +637,17 @@
 entry_set_tuple (playlist, entry, tuple);
 queue_update (PLAYLIST_UPDATE_METADATA, playlist->number, entry->number, 1);
 }
- else if (need_tuple)
+ else if (need_tuple || ! decoder)
+ {
 entry_set_failed (playlist, entry);
+ queue_update (PLAYLIST_UPDATE_METADATA, playlist->number, entry->number, 1);
+ }
 
 g_slice_free (ScanItem, scan_items[i]);
 scan_items[i] = NULL;
 
- g_cond_broadcast (cond);
+ pthread_cond_broadcast (& cond);
+ check_scan_complete (playlist);
 }
 
 LEAVE_RET (NULL);
@@ -589,14 +655,14 @@
 
 static void scan_trigger (void)
 {
- scan_playlist = active_playlist->number;
+ scan_playlist = 0;
 scan_row = 0;
- g_cond_broadcast (cond);
+ pthread_cond_broadcast (& cond);
 }
 
 /* mutex may be unlocked during the call */
-static Entry * get_entry (gint playlist_num, gint entry_num,
- gboolean need_decoder, gboolean need_tuple)
+static Entry * get_entry (int playlist_num, int entry_num,
+ bool_t need_decoder, bool_t need_tuple)
 {
 while (1)
 {
@@ -609,7 +675,7 @@
 if ((need_decoder && ! entry->decoder) || (need_tuple && ! entry->tuple))
 {
 entry_queue_scan (playlist, entry);
- g_cond_wait (cond, mutex);
+ pthread_cond_wait (& cond, & mutex);
 continue;
 }
 
@@ -618,7 +684,7 @@
 }
 
 /* mutex may be unlocked during the call */
-static Entry * get_playback_entry (gboolean need_decoder, gboolean need_tuple)
+static Entry * get_playback_entry (bool_t need_decoder, bool_t need_tuple)
 {
 while (1)
 {
@@ -630,7 +696,7 @@
 if ((need_decoder && ! entry->decoder) || (need_tuple && ! entry->tuple))
 {
 entry_queue_scan (playing_playlist, entry);
- g_cond_wait (cond, mutex);
+ pthread_cond_wait (& cond, & mutex);
 continue;
 }
 
@@ -642,25 +708,18 @@
 {
 srand (time (NULL));
 
- mutex = g_mutex_new ();
- cond = g_cond_new ();
-
 ENTER;
 
+ unique_id_table = g_hash_table_new (g_direct_hash, g_direct_equal);
 playlists = index_new ();
- Playlist * playlist = playlist_new ();
- index_append (playlists, playlist);
- playlist->number = 0;
- active_playlist = playlist;
 
- memset (& last_update, 0, sizeof last_update);
- memset (& next_update, 0, sizeof next_update);
+ update_level = 0;
 
 scan_quit = FALSE;
 scan_playlist = scan_row = 0;
 
- for (gint i = 0; i < SCAN_THREADS; i ++)
- scan_threads[i] = g_thread_create (scanner, GINT_TO_POINTER (i), TRUE, NULL);
+ for (int i = 0; i < SCAN_THREADS; i ++)
+ pthread_create (& scan_threads[i], NULL, scanner, GINT_TO_POINTER (i));
 
 LEAVE;
 }
@@ -670,12 +729,12 @@
 ENTER;
 
 scan_quit = TRUE;
- g_cond_broadcast (cond);
+ pthread_cond_broadcast (& cond);
 
 LEAVE;
 
- for (gint i = 0; i < SCAN_THREADS; i ++)
- g_thread_join (scan_threads[i]);
+ for (int i = 0; i < SCAN_THREADS; i ++)
+ pthread_join (scan_threads[i], NULL);
 
 ENTER;
 
@@ -687,47 +746,55 @@
 
 active_playlist = playing_playlist = NULL;
 
- for (gint i = 0; i < index_count (playlists); i ++)
+ for (int i = 0; i < index_count (playlists); i ++)
 playlist_free (index_get (playlists, i));
 
 index_free (playlists);
 playlists = NULL;
 
- LEAVE;
+ g_hash_table_destroy (unique_id_table);
+ unique_id_table = NULL;
+
+ g_free (title_format);
+ title_format = NULL;
 
- g_mutex_free (mutex);
- g_cond_free (cond);
+ LEAVE;
 }
 
-gint playlist_count (void)
+int playlist_count (void)
 {
 ENTER;
- gint count = index_count (playlists);
+ int count = index_count (playlists);
 LEAVE_RET (count);
 }
 
-void playlist_insert (gint at)
+void playlist_insert_with_id (int at, int id)
 {
 ENTER;
 
 if (at < 0 || at > index_count (playlists))
 at = index_count (playlists);
 
- index_insert (playlists, at, playlist_new ());
+ index_insert (playlists, at, playlist_new (id));
 number_playlists (at, index_count (playlists) - at);
 
 PLAYLIST_HAS_CHANGED (-1, 0, 0);
 LEAVE;
 }
 
-void playlist_reorder (gint from, gint to, gint count)
+void playlist_insert (int at)
+{
+ playlist_insert_with_id (at, -1);
+}
+
+void playlist_reorder (int from, int to, int count)
 {
 ENTER;
 if (from < 0 || from + count > index_count (playlists) || to < 0 || to +
 count > index_count (playlists) || count < 0)
 LEAVE_RET_VOID;
 
- struct index * displaced = index_new ();
+ Index * displaced = index_new ();
 
 if (to < from)
 index_copy_append (playlists, to, displaced, from - to);
@@ -753,8 +820,9 @@
 LEAVE;
 }
 
-void playlist_delete (gint playlist_num)
+void playlist_delete (int playlist_num)
 {
+ /* stop playback before locking playlists */
 if (playback_get_playing () && playlist_num == playlist_get_playing ())
 playback_stop ();
 
@@ -766,7 +834,7 @@
 playlist_free (playlist);
 
 if (! index_count (playlists))
- index_insert (playlists, 0, playlist_new ());
+ index_insert (playlists, 0, playlist_new (-1));
 
 number_playlists (playlist_num, index_count (playlists) - playlist_num);
 
@@ -780,86 +848,106 @@
 LEAVE;
 }
 
-gint playlist_get_unique_id (gint playlist_num)
+int playlist_get_unique_id (int playlist_num)
 {
 ENTER;
 DECLARE_PLAYLIST;
 LOOKUP_PLAYLIST_RET (-1);
 
- gint unique_id = playlist->unique_id;
+ int unique_id = playlist->unique_id;
 
 LEAVE_RET (unique_id);
 }
 
-gint playlist_by_unique_id (gint id)
+int playlist_by_unique_id (int id)
 {
 ENTER;
 
- for (gint i = 0; i < index_count (playlists); i ++)
- {
- Playlist * p = index_get (playlists, i);
- if (p->unique_id == id)
- LEAVE_RET (p->number);
- }
+ Playlist * p = g_hash_table_lookup (unique_id_table, GINT_TO_POINTER (id));
+ int num = p ? p->number : -1;
 
- LEAVE_RET (-1);
+ LEAVE_RET (num);
 }
 
-void playlist_set_filename (gint playlist_num, const gchar * filename)
+void playlist_set_filename (int playlist_num, const char * filename)
 {
 ENTER;
 DECLARE_PLAYLIST;
 LOOKUP_PLAYLIST;
 
- g_free (playlist->filename);
- playlist->filename = g_strdup (filename);
+ str_unref (playlist->filename);
+ playlist->filename = str_get (filename);
+ playlist->modified = TRUE;
 
- METADATA_HAS_CHANGED (playlist_num, 0, 0);
+ METADATA_HAS_CHANGED (-1, 0, 0);
 LEAVE;
 }
 
-gchar * playlist_get_filename (gint playlist_num)
+char * playlist_get_filename (int playlist_num)
 {
 ENTER;
 DECLARE_PLAYLIST;
 LOOKUP_PLAYLIST_RET (NULL);
 
- gchar * filename = g_strdup (playlist->filename);
+ char * filename = str_ref (playlist->filename);
 
 LEAVE_RET (filename);
 }
 
-void playlist_set_title (gint playlist_num, const gchar * title)
+void playlist_set_title (int playlist_num, const char * title)
 {
 ENTER;
 DECLARE_PLAYLIST;
 LOOKUP_PLAYLIST;
 
- g_free (playlist->title);
- playlist->title = g_strdup (title);
+ str_unref (playlist->title);
+ playlist->title = str_get (title);
+ playlist->modified = TRUE;
 
- METADATA_HAS_CHANGED (playlist_num, 0, 0);
+ METADATA_HAS_CHANGED (-1, 0, 0);
 LEAVE;
 }
 
-gchar * playlist_get_title (gint playlist_num)
+char * playlist_get_title (int playlist_num)
 {
 ENTER;
 DECLARE_PLAYLIST;
 LOOKUP_PLAYLIST_RET (NULL);
 
- gchar * title = g_strdup (playlist->title);
+ char * title = str_ref (playlist->title);
 
 LEAVE_RET (title);
 }
 
-void playlist_set_active (gint playlist_num)
+void playlist_set_modified (int playlist_num, bool_t modified)
+{
+ ENTER;
+ DECLARE_PLAYLIST;
+ LOOKUP_PLAYLIST;
+
+ playlist->modified = modified;
+
+ LEAVE;
+}
+
+bool_t playlist_get_modified (int playlist_num)
+{
+ ENTER;
+ DECLARE_PLAYLIST;
+ LOOKUP_PLAYLIST_RET (FALSE);
+
+ bool_t modified = playlist->modified;
+
+ LEAVE_RET (modified);
+}
+
+void playlist_set_active (int playlist_num)
 {
 ENTER;
 DECLARE_PLAYLIST;
 LOOKUP_PLAYLIST;
 
- gboolean changed = FALSE;
+ bool_t changed = FALSE;
 
 if (playlist != active_playlist)
 {
@@ -873,15 +961,16 @@
 hook_call ("playlist activate", NULL);
 }
 
-gint playlist_get_active (void)
+int playlist_get_active (void)
 {
 ENTER;
- gint list = active_playlist->number;
+ int list = active_playlist ? active_playlist->number : -1;
 LEAVE_RET (list);
 }
 
-void playlist_set_playing (gint playlist_num)
+void playlist_set_playing (int playlist_num)
 {
+ /* stop playback before locking playlists */
 if (playback_get_playing ())
 playback_stop ();
 
@@ -900,13 +989,52 @@
 hook_call ("playlist set playing", NULL);
 }
 
-gint playlist_get_playing (void)
+int playlist_get_playing (void)
 {
 ENTER;
- gint list = playing_playlist ? playing_playlist->number: -1;
+ int list = playing_playlist ? playing_playlist->number: -1;
 LEAVE_RET (list);
 }
 
+int playlist_get_blank (void)
+{
+ int list = playlist_get_active ();
+ char * title = playlist_get_title (list);
+
+ if (strcmp (title, _(default_title)) || playlist_entry_count (list) > 0)
+ {
+ list = playlist_count ();
+ playlist_insert (list);
+ }
+
+ str_unref (title);
+ return list;
+}
+
+int playlist_get_temporary (void)
+{
+ int list, count = playlist_count ();
+ bool_t found = FALSE;
+
+ for (list = 0; list < count; list ++)
+ {
+ char * title = playlist_get_title (list);
+ found = ! strcmp (title, _(temp_title));
+ str_unref (title);
+
+ if (found)
+ break;
+ }
+
+ if (! found)
+ {
+ list = playlist_get_blank ();
+ playlist_set_title (list, _(temp_title));
+ }
+
+ return list;
+}
+
 /* If we are already at the song or it is already at the top of the shuffle
 * list, we let it be. Otherwise, we move it to the top. */
 static void set_position (Playlist * playlist, Entry * entry)
@@ -926,38 +1054,37 @@
 }
 }
 
-gint playlist_entry_count (gint playlist_num)
+int playlist_entry_count (int playlist_num)
 {
 ENTER;
 DECLARE_PLAYLIST;
 LOOKUP_PLAYLIST_RET (0);
 
- gint count = index_count (playlist->entries);
+ int count = index_count (playlist->entries);
 
 LEAVE_RET (count);
 }
 
-void playlist_entry_insert_batch_raw (gint playlist_num, gint at,
- struct index * filenames, struct index * tuples, struct index * decoders)
+void playlist_entry_insert_batch_raw (int playlist_num, int at,
+ Index * filenames, Index * tuples, Index * decoders)
 {
 ENTER;
 DECLARE_PLAYLIST;
 LOOKUP_PLAYLIST;
 
- gint entries = index_count (playlist->entries);
+ int entries = index_count (playlist->entries);
 
 if (at < 0 || at > entries)
 at = entries;
 
- gint number = index_count (filenames);
+ int number = index_count (filenames);
 
- struct index * add = index_new ();
+ Index * add = index_new ();
 index_allocate (add, number);
 
- for (gint i = 0; i < number; i ++)
+ for (int i = 0; i < number; i ++)
 {
- gchar * filename = index_get (filenames, i);
- uri_check_utf8 (& filename, TRUE);
+ char * filename = index_get (filenames, i);
 Tuple * tuple = tuples ? index_get (tuples, i) : NULL;
 PluginHandle * decoder = decoders ? index_get (decoders, i) : NULL;
 index_append (add, entry_new (filename, tuple, decoder));
@@ -975,7 +1102,7 @@
 
 number_entries (playlist, at, entries + number - at);
 
- for (gint count = 0; count < number; count ++)
+ for (int count = 0; count < number; count ++)
 {
 Entry * entry = index_get (playlist->entries, at + count);
 playlist->total_length += entry->length;
@@ -985,8 +1112,9 @@
 LEAVE;
 }
 
-void playlist_entry_delete (gint playlist_num, gint at, gint number)
+void playlist_entry_delete (int playlist_num, int at, int number)
 {
+ /* stop playback before locking playlists */
 if (playback_get_playing () && playlist_num == playlist_get_playing () &&
 playlist_get_position (playlist_num) >= at && playlist_get_position
 (playlist_num) < at + number)
@@ -996,7 +1124,7 @@
 DECLARE_PLAYLIST;
 LOOKUP_PLAYLIST;
 
- gint entries = index_count (playlist->entries);
+ int entries = index_count (playlist->entries);
 
 if (at < 0 || at > entries)
 at = entries;
@@ -1007,7 +1135,7 @@
 playlist->position->number < at + number)
 set_position (playlist, NULL);
 
- for (gint count = 0; count < number; count ++)
+ for (int count = 0; count < number; count ++)
 {
 Entry * entry = index_get (playlist->entries, at + count);
 
@@ -1031,18 +1159,18 @@
 LEAVE;
 }
 
-gchar * playlist_entry_get_filename (gint playlist_num, gint entry_num)
+char * playlist_entry_get_filename (int playlist_num, int entry_num)
 {
 ENTER;
 DECLARE_PLAYLIST_ENTRY;
 LOOKUP_PLAYLIST_ENTRY_RET (NULL);
 
- gchar * filename = g_strdup (entry->filename);
+ char * filename = str_ref (entry->filename);
 
 LEAVE_RET (filename);
 }
 
-PluginHandle * playlist_entry_get_decoder (gint playlist_num, gint entry_num, gboolean fast)
+PluginHandle * playlist_entry_get_decoder (int playlist_num, int entry_num, bool_t fast)
 {
 ENTER;
 
@@ -1052,7 +1180,7 @@
 LEAVE_RET (decoder);
 }
 
-Tuple * playlist_entry_get_tuple (gint playlist_num, gint entry_num, gboolean fast)
+Tuple * playlist_entry_get_tuple (int playlist_num, int entry_num, bool_t fast)
 {
 ENTER;
 
@@ -1060,46 +1188,47 @@
 Tuple * tuple = entry ? entry->tuple : NULL;
 
 if (tuple)
- mowgli_object_ref (tuple);
+ tuple_ref (tuple);
 
 LEAVE_RET (tuple);
 }
 
-gchar * playlist_entry_get_title (gint playlist_num, gint entry_num, gboolean fast)
+char * playlist_entry_get_title (int playlist_num, int entry_num, bool_t fast)
 {
 ENTER;
 
 Entry * entry = get_entry (playlist_num, entry_num, FALSE, ! fast);
- gchar * title = entry ? g_strdup (entry->formatted ? entry->formatted : entry->filename) : NULL;
+ char * title = entry ? str_ref (entry->formatted ? entry->formatted : entry->title) : NULL;
 
 LEAVE_RET (title);
 }
 
-void playlist_entry_describe (gint playlist_num, gint entry_num,
- gchar * * title, gchar * * artist, gchar * * album, gboolean fast)
+void playlist_entry_describe (int playlist_num, int entry_num,
+ char * * title, char * * artist, char * * album, bool_t fast)
 {
 ENTER;
 
 Entry * entry = get_entry (playlist_num, entry_num, FALSE, ! fast);
- * title = (entry && entry->title) ? g_strdup (entry->title) : NULL;
- * artist = (entry && entry->artist) ? g_strdup (entry->artist) : NULL;
- * album = (entry && entry->album) ? g_strdup (entry->album) : NULL;
+ * title = (entry && entry->title) ? str_ref (entry->title) : NULL;
+ * artist = (entry && entry->artist) ? str_ref (entry->artist) : NULL;
+ * album = (entry && entry->album) ? str_ref (entry->album) : NULL;
 
 LEAVE;
 }
 
-gint playlist_entry_get_length (gint playlist_num, gint entry_num, gboolean fast)
+int playlist_entry_get_length (int playlist_num, int entry_num, bool_t fast)
 {
 ENTER;
 
 Entry * entry = get_entry (playlist_num, entry_num, FALSE, ! fast);
- gint length = entry ? entry->length : 0;
+ int length = entry ? entry->length : 0;
 
 LEAVE_RET (length);
 }
 
-void playlist_set_position (gint playlist_num, gint entry_num)
+void playlist_set_position (int playlist_num, int entry_num)
 {
+ /* stop playback before locking playlists */
 if (playback_get_playing () && playlist_num == playlist_get_playing ())
 playback_stop ();
 
@@ -1120,19 +1249,19 @@
 hook_call ("playlist position", GINT_TO_POINTER (playlist_num));
 }
 
-gint playlist_get_position (gint playlist_num)
+int playlist_get_position (int playlist_num)
 {
 ENTER;
 DECLARE_PLAYLIST;
 LOOKUP_PLAYLIST_RET (-1);
 
- gint position = playlist->position ? playlist->position->number : -1;
+ int position = playlist->position ? playlist->position->number : -1;
 
 LEAVE_RET (position);
 }
 
-void playlist_entry_set_selected (gint playlist_num, gint entry_num,
- gboolean selected)
+void playlist_entry_set_selected (int playlist_num, int entry_num,
+ bool_t selected)
 {
 ENTER;
 DECLARE_PLAYLIST_ENTRY;
@@ -1158,38 +1287,38 @@
 LEAVE;
 }
 
-gboolean playlist_entry_get_selected (gint playlist_num, gint entry_num)
+bool_t playlist_entry_get_selected (int playlist_num, int entry_num)
 {
 ENTER;
 DECLARE_PLAYLIST_ENTRY;
 LOOKUP_PLAYLIST_ENTRY_RET (FALSE);
 
- gboolean selected = entry->selected;
+ bool_t selected = entry->selected;
 
 LEAVE_RET (selected);
 }
 
-gint playlist_selected_count (gint playlist_num)
+int playlist_selected_count (int playlist_num)
 {
 ENTER;
 DECLARE_PLAYLIST;
 LOOKUP_PLAYLIST_RET (0);
 
- gint selected_count = playlist->selected_count;
+ int selected_count = playlist->selected_count;
 
 LEAVE_RET (selected_count);
 }
 
-void playlist_select_all (gint playlist_num, gboolean selected)
+void playlist_select_all (int playlist_num, bool_t selected)
 {
 ENTER;
 DECLARE_PLAYLIST;
 LOOKUP_PLAYLIST;
 
- gint entries = index_count (playlist->entries);
- gint first = entries, last = 0;
+ int entries = index_count (playlist->entries);
+ int first = entries, last = 0;
 
- for (gint count = 0; count < entries; count ++)
+ for (int count = 0; count < entries; count ++)
 {
 Entry * entry = index_get (playlist->entries, count);
 
@@ -1218,7 +1347,7 @@
 LEAVE;
 }
 
-gint playlist_shift (gint playlist_num, gint entry_num, gint distance)
+int playlist_shift (int playlist_num, int entry_num, int distance)
 {
 ENTER;
 DECLARE_PLAYLIST_ENTRY;
@@ -1227,8 +1356,8 @@
 if (! entry->selected || ! distance)
 LEAVE_RET (0);
 
- gint entries = index_count (playlist->entries);
- gint shift = 0, center, top, bottom;
+ int entries = index_count (playlist->entries);
+ int shift = 0, center, top, bottom;
 
 if (distance < 0)
 {
@@ -1251,37 +1380,37 @@
 
 top = bottom = center;
 
- for (gint i = 0; i < top; i ++)
+ for (int i = 0; i < top; i ++)
 {
 entry = index_get (playlist->entries, i);
 if (entry->selected)
 top = i;
 }
 
- for (gint i = entries; i > bottom; i --)
+ for (int i = entries; i > bottom; i --)
 {
 entry = index_get (playlist->entries, i - 1);
 if (entry->selected)
 bottom = i;
 }
 
- struct index * temp = index_new ();
+ Index * temp = index_new ();
 
- for (gint i = top; i < center; i ++)
+ for (int i = top; i < center; i ++)
 {
 entry = index_get (playlist->entries, i);
 if (! entry->selected)
 index_append (temp, entry);
 }
 
- for (gint i = top; i < bottom; i ++)
+ for (int i = top; i < bottom; i ++)
 {
 entry = index_get (playlist->entries, i);
 if (entry->selected)
 index_append (temp, entry);
 }
 
- for (gint i = center; i < bottom; i ++)
+ for (int i = center; i < bottom; i ++)
 {
 entry = index_get (playlist->entries, i);
 if (! entry->selected)
@@ -1296,8 +1425,9 @@
 LEAVE_RET (shift);
 }
 
-void playlist_delete_selected (gint playlist_num)
+void playlist_delete_selected (int playlist_num)
 {
+ /* stop playback before locking playlists */
 if (playback_get_playing () && playlist_num == playlist_get_playing () &&
 playlist_get_position (playlist_num) >= 0 && playlist_entry_get_selected
 (playlist_num, playlist_get_position (playlist_num)))
@@ -1310,18 +1440,18 @@
 if (! playlist->selected_count)
 LEAVE_RET_VOID;
 
- gint entries = index_count (playlist->entries);
+ int entries = index_count (playlist->entries);
 
- struct index * others = index_new ();
+ Index * others = index_new ();
 index_allocate (others, entries - playlist->selected_count);
 
 if (playlist->position && playlist->position->selected)
 set_position (playlist, NULL);
 
- gint before = 0, after = 0;
- gboolean found = FALSE;
+ int before = 0, after = 0;
+ bool_t found = FALSE;
 
- for (gint count = 0; count < entries; count++)
+ for (int count = 0; count < entries; count++)
 {
 Entry * entry = index_get (playlist->entries, count);
 
@@ -1359,18 +1489,18 @@
 LEAVE;
 }
 
-void playlist_reverse (gint playlist_num)
+void playlist_reverse (int playlist_num)
 {
 ENTER;
 DECLARE_PLAYLIST;
 LOOKUP_PLAYLIST;
 
- gint entries = index_count (playlist->entries);
+ int entries = index_count (playlist->entries);
 
- struct index * reversed = index_new ();
+ Index * reversed = index_new ();
 index_allocate (reversed, entries);
 
- for (gint count = entries; count --; )
+ for (int count = entries; count --; )
 index_append (reversed, index_get (playlist->entries, count));
 
 index_free (playlist->entries);
@@ -1381,17 +1511,17 @@
 LEAVE;
 }
 
-void playlist_randomize (gint playlist_num)
+void playlist_randomize (int playlist_num)
 {
 ENTER;
 DECLARE_PLAYLIST;
 LOOKUP_PLAYLIST;
 
- gint entries = index_count (playlist->entries);
+ int entries = index_count (playlist->entries);
 
- for (gint i = 0; i < entries; i ++)
+ for (int i = 0; i < entries; i ++)
 {
- gint j = i + rand () % (entries - i);
+ int j = i + rand () % (entries - i);
 
 struct entry * entry = index_get (playlist->entries, j);
 index_set (playlist->entries, j, index_get (playlist->entries, i));
@@ -1403,12 +1533,13 @@
 LEAVE;
 }
 
-static gint filename_compare (const void * _a, const void * _b, void * _compare)
+static int filename_compare (const void * _a, const void * _b, void * compare)
 {
 const Entry * a = _a, * b = _b;
- gint (* compare) (const gchar * a, const gchar * b) = _compare;
 
- gint diff = compare (a->filename, b->filename);
+ int diff = ((int (*) (const char * a, const char * b)) compare)
+ (a->filename, b->filename);
+
 if (diff)
 return diff;
 
@@ -1416,17 +1547,18 @@
 return a->number - b->number;
 }
 
-static gint tuple_compare (const void * _a, const void * _b, void * _compare)
+static int tuple_compare (const void * _a, const void * _b, void * compare)
 {
 const Entry * a = _a, * b = _b;
- gint (* compare) (const Tuple * a, const Tuple * b) = _compare;
 
 if (! a->tuple)
 return b->tuple ? -1 : 0;
 if (! b->tuple)
 return 1;
 
- gint diff = compare (a->tuple, b->tuple);
+ int diff = ((int (*) (const Tuple * a, const Tuple * b)) compare)
+ (a->tuple, b->tuple);
+
 if (diff)
 return diff;
 
@@ -1434,13 +1566,14 @@
 return a->number - b->number;
 }
 
-static gint title_compare (const void * _a, const void * _b, void * _compare)
+static int title_compare (const void * _a, const void * _b, void * compare)
 {
 const Entry * a = _a, * b = _b;
- gint (* compare) (const gchar * a, const gchar * b) = _compare;
 
- gint diff = compare (a->formatted ? a->formatted : a->filename, b->formatted
- ? b->formatted : b->filename);
+ int diff = ((int (*) (const char * a, const char * b)) compare)
+ (a->formatted ? a->formatted : a->filename,
+ b->formatted ? b->formatted : b->filename);
+
 if (diff)
 return diff;
 
@@ -1448,7 +1581,7 @@
 return a->number - b->number;
 }
 
-static void sort (Playlist * playlist, gint (* compare) (const void * a,
+static void sort (Playlist * playlist, int (* compare) (const void * a,
 const void * b, void * inner), void * inner)
 {
 index_sort_with_data (playlist->entries, compare, inner);
@@ -1457,15 +1590,15 @@
 PLAYLIST_HAS_CHANGED (playlist->number, 0, index_count (playlist->entries));
 }
 
-static void sort_selected (Playlist * playlist, gint (* compare) (const void *
+static void sort_selected (Playlist * playlist, int (* compare) (const void *
 a, const void * b, void * inner), void * inner)
 {
- gint entries = index_count (playlist->entries);
+ int entries = index_count (playlist->entries);
 
- struct index * selected = index_new ();
+ Index * selected = index_new ();
 index_allocate (selected, playlist->selected_count);
 
- for (gint count = 0; count < entries; count++)
+ for (int count = 0; count < entries; count++)
 {
 Entry * entry = index_get (playlist->entries, count);
 if (entry->selected)
@@ -1474,8 +1607,8 @@
 
 index_sort_with_data (selected, compare, inner);
 
- gint count2 = 0;
- for (gint count = 0; count < entries; count++)
+ int count2 = 0;
+ for (int count = 0; count < entries; count++)
 {
 Entry * entry = index_get (playlist->entries, count);
 if (entry->selected)
@@ -1488,10 +1621,10 @@
 PLAYLIST_HAS_CHANGED (playlist->number, 0, entries);
 }
 
-static gboolean entries_are_scanned (Playlist * playlist, gboolean selected)
+static bool_t entries_are_scanned (Playlist * playlist, bool_t selected)
 {
- gint entries = index_count (playlist->entries);
- for (gint count = 0; count < entries; count ++)
+ int entries = index_count (playlist->entries);
+ for (int count = 0; count < entries; count ++)
 {
 Entry * entry = index_get (playlist->entries, count);
 if (selected && ! entry->selected)
@@ -1499,9 +1632,8 @@
 
 if (! entry->tuple)
 {
- event_queue ("interface show error", _("The playlist cannot be "
- "sorted because metadata scanning is still in progress (or has "
- "been disabled)."));
+ interface_show_error (_("The playlist cannot be sorted because "
+ "metadata scanning is still in progress (or has been disabled)."));
 return FALSE;
 }
 }
@@ -1509,19 +1641,19 @@
 return TRUE;
 }
 
-void playlist_sort_by_filename (gint playlist_num, gint (* compare)
- (const gchar * a, const gchar * b))
+void playlist_sort_by_filename (int playlist_num, int (* compare)
+ (const char * a, const char * b))
 {
 ENTER;
 DECLARE_PLAYLIST;
 LOOKUP_PLAYLIST;
 
- sort (playlist, filename_compare, compare);
+ sort (playlist, filename_compare, (void *) compare);
 
 LEAVE;
 }
 
-void playlist_sort_by_tuple (gint playlist_num, gint (* compare)
+void playlist_sort_by_tuple (int playlist_num, int (* compare)
 (const Tuple * a, const Tuple * b))
 {
 ENTER;
@@ -1529,37 +1661,37 @@
 LOOKUP_PLAYLIST;
 
 if (entries_are_scanned (playlist, FALSE))
- sort (playlist, tuple_compare, compare);
+ sort (playlist, tuple_compare, (void *) compare);
 
 LEAVE;
 }
 
-void playlist_sort_by_title (gint playlist_num, gint (* compare) (const gchar *
- a, const gchar * b))
+void playlist_sort_by_title (int playlist_num, int (* compare) (const char *
+ a, const char * b))
 {
 ENTER;
 DECLARE_PLAYLIST;
 LOOKUP_PLAYLIST;
 
 if (entries_are_scanned (playlist, FALSE))
- sort (playlist, title_compare, compare);
+ sort (playlist, title_compare, (void *) compare);
 
 LEAVE;
 }
 
-void playlist_sort_selected_by_filename (gint playlist_num, gint (* compare)
- (const gchar * a, const gchar * b))
+void playlist_sort_selected_by_filename (int playlist_num, int (* compare)
+ (const char * a, const char * b))
 {
 ENTER;
 DECLARE_PLAYLIST;
 LOOKUP_PLAYLIST;
 
- sort_selected (playlist, filename_compare, compare);
+ sort_selected (playlist, filename_compare, (void *) compare);
 
 LEAVE;
 }
 
-void playlist_sort_selected_by_tuple (gint playlist_num, gint (* compare)
+void playlist_sort_selected_by_tuple (int playlist_num, int (* compare)
 (const Tuple * a, const Tuple * b))
 {
 ENTER;
@@ -1567,20 +1699,20 @@
 LOOKUP_PLAYLIST;
 
 if (entries_are_scanned (playlist, TRUE))
- sort_selected (playlist, tuple_compare, compare);
+ sort_selected (playlist, tuple_compare, (void *) compare);
 
 LEAVE;
 }
 
-void playlist_sort_selected_by_title (gint playlist_num, gint (* compare)
- (const gchar * a, const gchar * b))
+void playlist_sort_selected_by_title (int playlist_num, int (* compare)
+ (const char * a, const char * b))
 {
 ENTER;
 DECLARE_PLAYLIST;
 LOOKUP_PLAYLIST;
 
 if (entries_are_scanned (playlist, TRUE))
- sort (playlist, title_compare, compare);
+ sort (playlist, title_compare, (void *) compare);
 
 LEAVE;
 }
@@ -1589,41 +1721,52 @@
 {
 ENTER;
 
- for (gint playlist_num = 0; playlist_num < index_count (playlists);
+ g_free (title_format);
+ title_format = NULL;
+
+ for (int playlist_num = 0; playlist_num < index_count (playlists);
 playlist_num ++)
 {
 Playlist * playlist = index_get (playlists, playlist_num);
- gint entries = index_count (playlist->entries);
+ int entries = index_count (playlist->entries);
 
- for (gint count = 0; count < entries; count++)
+ for (int count = 0; count < entries; count++)
 {
 Entry * entry = index_get (playlist->entries, count);
- g_free (entry->formatted);
- entry->formatted = entry->tuple ? title_from_tuple (entry->tuple) :
- NULL;
+ str_unref (entry->formatted);
+ entry->formatted = entry->tuple ? title_from_tuple (entry->tuple) : NULL;
 }
+
+ METADATA_HAS_CHANGED (playlist_num, 0, entries);
 }
 
- METADATA_HAS_CHANGED (-1, 0, 0);
 LEAVE;
 }
 
 void playlist_trigger_scan (void)
 {
 ENTER;
+
+ for (int i = 0; i < index_count (playlists); i ++)
+ {
+ Playlist * p = index_get (playlists, i);
+ p->scanning = TRUE;
+ }
+
 scan_trigger ();
+
 LEAVE;
 }
 
-static void playlist_rescan_real (gint playlist_num, gboolean selected)
+static void playlist_rescan_real (int playlist_num, bool_t selected)
 {
 ENTER;
 DECLARE_PLAYLIST;
 LOOKUP_PLAYLIST;
 
- gint entries = index_count (playlist->entries);
+ int entries = index_count (playlist->entries);
 
- for (gint count = 0; count < entries; count ++)
+ for (int count = 0; count < entries; count ++)
 {
 Entry * entry = index_get (playlist->entries, count);
 if (! selected || entry->selected)
@@ -1637,32 +1780,28 @@
 LEAVE;
 }
 
-void playlist_rescan (gint playlist_num)
+void playlist_rescan (int playlist_num)
 {
 playlist_rescan_real (playlist_num, FALSE);
 }
 
-void playlist_rescan_selected (gint playlist_num)
+void playlist_rescan_selected (int playlist_num)
 {
 playlist_rescan_real (playlist_num, TRUE);
 }
 
-void playlist_rescan_file (const gchar * filename)
+void playlist_rescan_file (const char * filename)
 {
 ENTER;
 
- gint num_playlists = index_count (playlists);
-
- gchar * copy = NULL;
- if (! uri_is_utf8 (filename, TRUE))
- filename = copy = uri_to_utf8 (filename);
+ int num_playlists = index_count (playlists);
 
- for (gint playlist_num = 0; playlist_num < num_playlists; playlist_num ++)
+ for (int playlist_num = 0; playlist_num < num_playlists; playlist_num ++)
 {
 Playlist * playlist = index_get (playlists, playlist_num);
- gint num_entries = index_count (playlist->entries);
+ int num_entries = index_count (playlist->entries);
 
- for (gint entry_num = 0; entry_num < num_entries; entry_num ++)
+ for (int entry_num = 0; entry_num < num_entries; entry_num ++)
 {
 Entry * entry = index_get (playlist->entries, entry_num);
 
@@ -1670,50 +1809,49 @@
 {
 entry_set_tuple (playlist, entry, NULL);
 entry->failed = FALSE;
+
+ METADATA_HAS_CHANGED (playlist_num, entry_num, 1);
 }
 }
 }
 
- g_free (copy);
-
- METADATA_HAS_CHANGED (-1, 0, 0);
 LEAVE;
 }
 
-gint64 playlist_get_total_length (gint playlist_num)
+int64_t playlist_get_total_length (int playlist_num)
 {
 ENTER;
 DECLARE_PLAYLIST;
 LOOKUP_PLAYLIST_RET (0);
 
- gint64 length = playlist->total_length;
+ int64_t length = playlist->total_length;
 
 LEAVE_RET (length);
 }
 
-gint64 playlist_get_selected_length (gint playlist_num)
+int64_t playlist_get_selected_length (int playlist_num)
 {
 ENTER;
 DECLARE_PLAYLIST;
 LOOKUP_PLAYLIST_RET (0);
 
- gint64 length = playlist->selected_length;
+ int64_t length = playlist->selected_length;
 
 LEAVE_RET (length);
 }
 
-gint playlist_queue_count (gint playlist_num)
+int playlist_queue_count (int playlist_num)
 {
 ENTER;
 DECLARE_PLAYLIST;
 LOOKUP_PLAYLIST_RET (0);
 
- gint count = g_list_length (playlist->queued);
+ int count = g_list_length (playlist->queued);
 
 LEAVE_RET (count);
 }
 
-void playlist_queue_insert (gint playlist_num, gint at, gint entry_num)
+void playlist_queue_insert (int playlist_num, int at, int entry_num)
 {
 ENTER;
 DECLARE_PLAYLIST_ENTRY;
@@ -1733,16 +1871,16 @@
 LEAVE;
 }
 
-void playlist_queue_insert_selected (gint playlist_num, gint at)
+void playlist_queue_insert_selected (int playlist_num, int at)
 {
 ENTER;
 DECLARE_PLAYLIST;
 LOOKUP_PLAYLIST;
 
- gint entries = index_count(playlist->entries);
- gint first = entries, last = 0;
+ int entries = index_count(playlist->entries);
+ int first = entries, last = 0;
 
- for (gint count = 0; count < entries; count++)
+ for (int count = 0; count < entries; count++)
 {
 Entry * entry = index_get (playlist->entries, count);
 
@@ -1765,37 +1903,37 @@
 LEAVE;
 }
 
-gint playlist_queue_get_entry (gint playlist_num, gint at)
+int playlist_queue_get_entry (int playlist_num, int at)
 {
 ENTER;
 DECLARE_PLAYLIST;
 LOOKUP_PLAYLIST_RET (-1);
 
 GList * node = g_list_nth (playlist->queued, at);
- gint entry_num = node ? ((Entry *) node->data)->number : -1;
+ int entry_num = node ? ((Entry *) node->data)->number : -1;
 
 LEAVE_RET (entry_num);
 }
 
-gint playlist_queue_find_entry (gint playlist_num, gint entry_num)
+int playlist_queue_find_entry (int playlist_num, int entry_num)
 {
 ENTER;
 DECLARE_PLAYLIST_ENTRY;
 LOOKUP_PLAYLIST_ENTRY_RET (-1);
 
- gint pos = entry->queued ? g_list_index (playlist->queued, entry) : -1;
+ int pos = entry->queued ? g_list_index (playlist->queued, entry) : -1;
 
 LEAVE_RET (pos);
 }
 
-void playlist_queue_delete (gint playlist_num, gint at, gint number)
+void playlist_queue_delete (int playlist_num, int at, int number)
 {
 ENTER;
 DECLARE_PLAYLIST;
 LOOKUP_PLAYLIST;
 
- gint entries = index_count (playlist->entries);
- gint first = entries, last = 0;
+ int entries = index_count (playlist->entries);
+ int first = entries, last = 0;
 
 if (at == 0)
 {
@@ -1835,14 +1973,14 @@
 LEAVE;
 }
 
-void playlist_queue_delete_selected (gint playlist_num)
+void playlist_queue_delete_selected (int playlist_num)
 {
 ENTER;
 DECLARE_PLAYLIST;
 LOOKUP_PLAYLIST;
 
- gint entries = index_count (playlist->entries);
- gint first = entries, last = 0;
+ int entries = index_count (playlist->entries);
+ int first = entries, last = 0;
 
 for (GList * node = playlist->queued; node; )
 {
@@ -1866,12 +2004,12 @@
 LEAVE;
 }
 
-static gboolean shuffle_prev (Playlist * playlist)
+static bool_t shuffle_prev (Playlist * playlist)
 {
- gint entries = index_count (playlist->entries);
+ int entries = index_count (playlist->entries);
 Entry * found = NULL;
 
- for (gint count = 0; count < entries; count ++)
+ for (int count = 0; count < entries; count ++)
 {
 Entry * entry = index_get (playlist->entries, count);
 
@@ -1888,8 +2026,9 @@
 return TRUE;
 }
 
-gboolean playlist_prev_song (gint playlist_num)
+bool_t playlist_prev_song (int playlist_num)
 {
+ /* stop playback before locking playlists */
 if (playback_get_playing () && playlist_num == playlist_get_playing ())
 playback_stop ();
 
@@ -1917,9 +2056,9 @@
 return TRUE;
 }
 
-static gboolean shuffle_next (Playlist * playlist)
+static bool_t shuffle_next (Playlist * playlist)
 {
- gint entries = index_count (playlist->entries), choice = 0, count;
+ int entries = index_count (playlist->entries), choice = 0, count;
 Entry * found = NULL;
 
 for (count = 0; count < entries; count ++)
@@ -1964,19 +2103,20 @@
 
 static void shuffle_reset (Playlist * playlist)
 {
- gint entries = index_count (playlist->entries);
+ int entries = index_count (playlist->entries);
 
 playlist->last_shuffle_num = 0;
 
- for (gint count = 0; count < entries; count ++)
+ for (int count = 0; count < entries; count ++)
 {
 Entry * entry = index_get (playlist->entries, count);
 entry->shuffle_num = 0;
 }
 }
 
-gboolean playlist_next_song (gint playlist_num, gboolean repeat)
+bool_t playlist_next_song (int playlist_num, bool_t repeat)
 {
+ /* stop playback before locking playlists */
 if (playback_get_playing () && playlist_num == playlist_get_playing ())
 playback_stop ();
 
@@ -1984,7 +2124,7 @@
 DECLARE_PLAYLIST;
 LOOKUP_PLAYLIST_RET (FALSE);
 
- gint entries = index_count(playlist->entries);
+ int entries = index_count(playlist->entries);
 
 if (! entries)
 LEAVE_RET (FALSE);
@@ -2030,12 +2170,12 @@
 return TRUE;
 }
 
-gint playback_entry_get_position (void)
+int playback_entry_get_position (void)
 {
 ENTER;
 
 Entry * entry = get_playback_entry (FALSE, FALSE);
- gint entry_num = entry ? entry->number : -1;
+ int entry_num = entry ? entry->number : -1;
 
 LEAVE_RET (entry_num);
 }
@@ -2058,27 +2198,28 @@
 Tuple * tuple = entry ? entry->tuple : NULL;
 
 if (tuple)
- mowgli_object_ref (tuple);
+ tuple_ref (tuple);
 
 LEAVE_RET (tuple);
 }
 
-gchar * playback_entry_get_title (void)
+char * playback_entry_get_title (void)
 {
 ENTER;
 
 Entry * entry = get_playback_entry (FALSE, TRUE);
- gchar * title = entry ? g_strdup (entry->formatted ? entry->formatted : entry->filename) : NULL;
+ char * title = entry ? str_ref (entry->formatted ? entry->formatted :
+ entry->title) : NULL;
 
 LEAVE_RET (title);
 }
 
-gint playback_entry_get_length (void)
+int playback_entry_get_length (void)
 {
 ENTER;
 
 Entry * entry = get_playback_entry (FALSE, TRUE);
- gint length = entry->length;
+ int length = entry->length;
 
 LEAVE_RET (length);
 }
@@ -2097,52 +2238,51 @@
 LEAVE;
 }
 
-gint playback_entry_get_start_time (void)
+int playback_entry_get_start_time (void)
 {
 ENTER;
 if (! playing_playlist || ! playing_playlist->position)
 LEAVE_RET (0);
 
- gint start = playing_playlist->position->start;
+ int start = playing_playlist->position->start;
 LEAVE_RET (start);
 }
 
-gint playback_entry_get_end_time (void)
+int playback_entry_get_end_time (void)
 {
 ENTER;
 if (! playing_playlist || ! playing_playlist->position)
 LEAVE_RET (-1);
 
- gint end = playing_playlist->position->end;
+ int end = playing_playlist->position->end;
 LEAVE_RET (end);
 }
 
 void playlist_save_state (void)
 {
+ /* get playback state before locking playlists */
+ resume_state = playback_get_playing () ? (playback_get_paused () ?
+ RESUME_PAUSE : RESUME_PLAY) : RESUME_STOP;
+ resume_time = playback_get_playing () ? playback_get_time () : 0;
+
 ENTER;
 
- gchar * path = g_strdup_printf ("%s/" STATE_FILE, get_path (AUD_PATH_USER_DIR));
+ char * path = g_strdup_printf ("%s/" STATE_FILE, get_path (AUD_PATH_USER_DIR));
 FILE * handle = fopen (path, "w");
 g_free (path);
 if (! handle)
 LEAVE_RET_VOID;
 
- resume_state = playback_get_playing () ? (playback_get_paused () ?
- RESUME_PAUSE : RESUME_PLAY) : RESUME_STOP;
- resume_time = playback_get_playing () ? playback_get_time () : 0;
-
 fprintf (handle, "resume-state %d\n", resume_state);
 fprintf (handle, "resume-time %d\n", resume_time);
 
- fprintf (handle, "active %d\n", active_playlist->number);
- fprintf (handle, "playing %d\n", playing_playlist ? playing_playlist->number
- : -1);
+ fprintf (handle, "active %d\n", active_playlist ? active_playlist->number : -1);
+ fprintf (handle, "playing %d\n", playing_playlist ? playing_playlist->number : -1);
 
- for (gint playlist_num = 0; playlist_num < index_count (playlists);
+ for (int playlist_num = 0; playlist_num < index_count (playlists);
 playlist_num ++)
 {
 Playlist * playlist = index_get (playlists, playlist_num);
- gint entries = index_count (playlist->entries);
 
 fprintf (handle, "playlist %d\n", playlist_num);
 
@@ -2151,21 +2291,14 @@
 
 fprintf (handle, "position %d\n", playlist->position ?
 playlist->position->number : -1);
- fprintf (handle, "last-shuffled %d\n", playlist->last_shuffle_num);
-
- for (gint count = 0; count < entries; count ++)
- {
- Entry * entry = index_get (playlist->entries, count);
- fprintf (handle, "S %d\n", entry->shuffle_num);
- }
 }
 
 fclose (handle);
 LEAVE;
 }
 
-static gchar parse_key[512];
-static gchar * parse_value;
+static char parse_key[512];
+static char * parse_value;
 
 static void parse_next (FILE * handle)
 {
@@ -2174,36 +2307,35 @@
 if (! fgets (parse_key, sizeof parse_key, handle))
 return;
 
- gchar * space = strchr (parse_key, ' ');
+ char * space = strchr (parse_key, ' ');
 if (! space)
 return;
 
 * space = 0;
 parse_value = space + 1;
 
- gchar * newline = strchr (parse_value, '\n');
+ char * newline = strchr (parse_value, '\n');
 if (newline)
 * newline = 0;
 }
 
-static gboolean parse_integer (const gchar * key, gint * value)
+static bool_t parse_integer (const char * key, int * value)
 {
 return (parse_value && ! strcmp (parse_key, key) && sscanf (parse_value,
 "%d", value) == 1);
 }
 
-static gchar * parse_string (const gchar * key)
+static char * parse_string (const char * key)
 {
- return (parse_value && ! strcmp (parse_key, key)) ? g_strdup (parse_value) :
- NULL;
+ return (parse_value && ! strcmp (parse_key, key)) ? str_get (parse_value) : NULL;
 }
 
 void playlist_load_state (void)
 {
 ENTER;
- gint playlist_num;
+ int playlist_num;
 
- gchar * path = g_strdup_printf ("%s/" STATE_FILE, get_path (AUD_PATH_USER_DIR));
+ char * path = g_strdup_printf ("%s/" STATE_FILE, get_path (AUD_PATH_USER_DIR));
 FILE * handle = fopen (path, "r");
 g_free (path);
 if (! handle)
@@ -2233,14 +2365,14 @@
 playlist_num < index_count (playlists))
 {
 Playlist * playlist = index_get (playlists, playlist_num);
- gint entries = index_count (playlist->entries), position, count;
- gchar * s;
+ int entries = index_count (playlist->entries), position;
+ char * s;
 
 parse_next (handle);
 
 if ((s = parse_string ("filename")))
 {
- g_free (playlist->filename);
+ str_unref (playlist->filename);
 playlist->filename = s;
 parse_next (handle);
 }
@@ -2249,32 +2381,28 @@
 parse_next (handle);
 
 if (position >= 0 && position < entries)
- playlist->position = index_get (playlist->entries, position);
-
- if (parse_integer ("last-shuffled", & playlist->last_shuffle_num))
- parse_next (handle);
-
- for (count = 0; count < entries; count ++)
- {
- Entry * entry = index_get (playlist->entries, count);
- if (parse_integer ("S", & entry->shuffle_num))
- parse_next (handle);
- }
+ set_position (playlist, index_get (playlist->entries, position));
 }
 
 fclose (handle);
 
 /* clear updates queued during init sequence */
 
+ for (int i = 0; i < index_count (playlists); i ++)
+ {
+ Playlist * p = index_get (playlists, i);
+ memset (& p->last_update, 0, sizeof (Update));
+ memset (& p->next_update, 0, sizeof (Update));
+ }
+
+ update_level = 0;
+
 if (update_source)
 {
 g_source_remove (update_source);
 update_source = 0;
 }
 
- memset (& last_update, 0, sizeof last_update);
- memset (& next_update, 0, sizeof next_update);
-
 LEAVE;
 }

audacious-3.1.1.tar.bz2/src/audacious/playlist-utils.c -> audacious-3.2.4.tar.bz2/src/audacious/playlist-utils.c Changed

@@ -19,8 +19,11 @@
 * using our public API to be a derived work.
 */
 
+#include <dirent.h>
 #include <glib.h>
 #include <regex.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include <libaudcore/audstrings.h>
@@ -29,65 +32,70 @@
 #include "misc.h"
 #include "playlist.h"
 
-static const gchar * get_basename (const gchar * filename)
+static const char * get_basename (const char * filename)
 {
- const gchar * slash = strrchr (filename, '/');
+ const char * slash = strrchr (filename, '/');
 
 return (slash == NULL) ? filename : slash + 1;
 }
 
-static gint filename_compare_basename (const gchar * a, const gchar * b)
+static int filename_compare_basename (const char * a, const char * b)
 {
 return string_compare_encoded (get_basename (a), get_basename (b));
 }
 
-static gint tuple_compare_string (const Tuple * a, const Tuple * b, gint field)
+static int tuple_compare_string (const Tuple * a, const Tuple * b, int field)
 {
- const gchar * string_a = tuple_get_string (a, field, NULL);
- const gchar * string_b = tuple_get_string (b, field, NULL);
+ char * string_a = tuple_get_str (a, field, NULL);
+ char * string_b = tuple_get_str (b, field, NULL);
+ int ret;
 
 if (string_a == NULL)
- return (string_b == NULL) ? 0 : -1;
- if (string_b == NULL)
- return 1;
-
- return string_compare (string_a, string_b);
+ ret = (string_b == NULL) ? 0 : -1;
+ else if (string_b == NULL)
+ ret = 1;
+ else
+ ret = string_compare (string_a, string_b);
+
+ str_unref (string_a);
+ str_unref (string_b);
+ return ret;
 }
 
-static gint tuple_compare_int (const Tuple * a, const Tuple * b, gint field)
+static int tuple_compare_int (const Tuple * a, const Tuple * b, int field)
 {
 if (tuple_get_value_type (a, field, NULL) != TUPLE_INT)
 return (tuple_get_value_type (b, field, NULL) != TUPLE_INT) ? 0 : -1;
 if (tuple_get_value_type (b, field, NULL) != TUPLE_INT)
 return 1;
 
- gint int_a = tuple_get_int (a, field, NULL);
- gint int_b = tuple_get_int (b, field, NULL);
+ int int_a = tuple_get_int (a, field, NULL);
+ int int_b = tuple_get_int (b, field, NULL);
 
 return (int_a < int_b) ? -1 : (int_a > int_b);
 }
 
-static gint tuple_compare_title (const Tuple * a, const Tuple * b)
+static int tuple_compare_title (const Tuple * a, const Tuple * b)
 {
 return tuple_compare_string (a, b, FIELD_TITLE);
 }
 
-static gint tuple_compare_album (const Tuple * a, const Tuple * b)
+static int tuple_compare_album (const Tuple * a, const Tuple * b)
 {
 return tuple_compare_string (a, b, FIELD_ALBUM);
 }
 
-static gint tuple_compare_artist (const Tuple * a, const Tuple * b)
+static int tuple_compare_artist (const Tuple * a, const Tuple * b)
 {
 return tuple_compare_string (a, b, FIELD_ARTIST);
 }
 
-static gint tuple_compare_date (const Tuple * a, const Tuple * b)
+static int tuple_compare_date (const Tuple * a, const Tuple * b)
 {
 return tuple_compare_int (a, b, FIELD_YEAR);
 }
 
-static gint tuple_compare_track (const Tuple * a, const Tuple * b)
+static int tuple_compare_track (const Tuple * a, const Tuple * b)
 {
 return tuple_compare_int (a, b, FIELD_TRACK_NUMBER);
 }
@@ -122,7 +130,7 @@
 [PLAYLIST_SORT_TRACK] = NULL,
 [PLAYLIST_SORT_FORMATTED_TITLE] = string_compare};
 
-void playlist_sort_by_scheme (gint playlist, gint scheme)
+void playlist_sort_by_scheme (int playlist, int scheme)
 {
 if (filename_comparisons[scheme] != NULL)
 playlist_sort_by_filename (playlist, filename_comparisons[scheme]);
@@ -132,7 +140,7 @@
 playlist_sort_by_title (playlist, title_comparisons[scheme]);
 }
 
-void playlist_sort_selected_by_scheme (gint playlist, gint scheme)
+void playlist_sort_selected_by_scheme (int playlist, int scheme)
 {
 if (filename_comparisons[scheme] != NULL)
 playlist_sort_selected_by_filename (playlist,
@@ -144,10 +152,10 @@
 }
 
 /* Fix me: This considers empty fields as duplicates. */
-void playlist_remove_duplicates_by_scheme (gint playlist, gint scheme)
+void playlist_remove_duplicates_by_scheme (int playlist, int scheme)
 {
- gint entries = playlist_entry_count (playlist);
- gint count;
+ int entries = playlist_entry_count (playlist);
+ int count;
 
 if (entries < 1)
 return;
@@ -156,28 +164,28 @@
 
 if (filename_comparisons[scheme] != NULL)
 {
- gint (* compare) (const gchar * a, const gchar * b) =
+ int (* compare) (const char * a, const char * b) =
 filename_comparisons[scheme];
 
 playlist_sort_by_filename (playlist, compare);
- gchar * last = playlist_entry_get_filename (playlist, 0);
+ char * last = playlist_entry_get_filename (playlist, 0);
 
 for (count = 1; count < entries; count ++)
 {
- gchar * current = playlist_entry_get_filename (playlist, count);
+ char * current = playlist_entry_get_filename (playlist, count);
 
 if (compare (last, current) == 0)
 playlist_entry_set_selected (playlist, count, TRUE);
 
- g_free (last);
+ str_unref (last);
 last = current;
 }
 
- g_free (last);
+ str_unref (last);
 }
 else if (tuple_comparisons[scheme] != NULL)
 {
- gint (* compare) (const Tuple * a, const Tuple * b) =
+ int (* compare) (const Tuple * a, const Tuple * b) =
 tuple_comparisons[scheme];
 
 playlist_sort_by_tuple (playlist, compare);
@@ -191,97 +199,85 @@
 playlist_entry_set_selected (playlist, count, TRUE);
 
 if (last)
- tuple_free (last);
+ tuple_unref (last);
 last = current;
 }
 
 if (last)
- tuple_free (last);
+ tuple_unref (last);
 }
 
 playlist_delete_selected (playlist);
 }
 
-void playlist_remove_failed (gint playlist)
+void playlist_remove_failed (int playlist)
 {
- gint entries = playlist_entry_count (playlist);
- gint count;
+ int entries = playlist_entry_count (playlist);
+ int count;
 
 playlist_select_all (playlist, FALSE);
 
 for (count = 0; count < entries; count ++)
 {
- gchar * filename = playlist_entry_get_filename (playlist, count);
+ char * filename = playlist_entry_get_filename (playlist, count);
 
 /* vfs_file_test() only works for file:// URIs currently */
 if (! strncmp (filename, "file://", 7) && ! vfs_file_test (filename,
 G_FILE_TEST_EXISTS))
 playlist_entry_set_selected (playlist, count, TRUE);
 
- g_free (filename);
+ str_unref (filename);
 }
 
 playlist_delete_selected (playlist);
 }
 
-void playlist_select_by_patterns (gint playlist, const Tuple * patterns)
+void playlist_select_by_patterns (int playlist, const Tuple * patterns)
 {
- const gint fields[] = {FIELD_TITLE, FIELD_ALBUM, FIELD_ARTIST,
+ const int fields[] = {FIELD_TITLE, FIELD_ALBUM, FIELD_ARTIST,
 FIELD_FILE_NAME};
 
- gint entries = playlist_entry_count (playlist);
- gint field, entry;
+ int entries = playlist_entry_count (playlist);
+ int field, entry;
 
 playlist_select_all (playlist, TRUE);
 
 for (field = 0; field < G_N_ELEMENTS (fields); field ++)
 {
- const gchar * pattern = tuple_get_string ((Tuple *) patterns,
- fields[field], NULL);
+ char * pattern = tuple_get_str (patterns, fields[field], NULL);
 regex_t regex;
 
- if (pattern == NULL || pattern[0] == 0)
- continue;
-
- if (regcomp (& regex, pattern, REG_ICASE) != 0)
+ if (! pattern || ! pattern[0] || regcomp (& regex, pattern, REG_ICASE))
+ {
+ str_unref (pattern);
 continue;
+ }
 
 for (entry = 0; entry < entries; entry ++)
 {
- const gchar * string;
-
 if (! playlist_entry_get_selected (playlist, entry))
 continue;
 
 Tuple * tuple = playlist_entry_get_tuple (playlist, entry, FALSE);
- if (! tuple)
- goto NO_MATCH;
-
- string = tuple_get_string (tuple, fields[field], NULL);
- if (! string)
- goto NO_MATCH;
+ char * string = tuple ? tuple_get_str (tuple, fields[field], NULL) : NULL;
 
- if (regexec (& regex, string, 0, NULL, 0) == 0)
- {
- tuple_free (tuple);
- continue;
- }
+ if (! string || regexec (& regex, string, 0, NULL, 0))
+ playlist_entry_set_selected (playlist, entry, FALSE);
 
- NO_MATCH:
- playlist_entry_set_selected (playlist, entry, FALSE);
+ str_unref (string);
 if (tuple)
- tuple_free (tuple);
+ tuple_unref (tuple);
 }
 
 regfree (& regex);
+ str_unref (pattern);
 }
 }
 
-/* The algorithm is a bit quirky for historical reasons. -jlindgren */
-static gchar * make_playlist_path (gint playlist)
+static char * make_playlist_path (int playlist)
 {
 if (! playlist)
- return g_strdup (get_path (AUD_PATH_PLAYLIST_FILE));
+ return g_strdup_printf ("%s/playlist.xspf", get_path (AUD_PATH_USER_DIR));
 
 return g_strdup_printf ("%s/playlist_%02d.xspf",
 get_path (AUD_PATH_PLAYLISTS_DIR), 1 + playlist);
@@ -289,64 +285,165 @@
 
 static void load_playlists_real (void)
 {
- gboolean done = FALSE;
- gint count;
+ /* old (v3.1 and earlier) naming scheme */
 
- for (count = 0; ! done; count ++)
+ int count;
+ for (count = 0; ; count ++)
 {
- gchar * path = make_playlist_path (count);
+ char * path = make_playlist_path (count);
 
- if (g_file_test (path, G_FILE_TEST_EXISTS))
+ if (! g_file_test (path, G_FILE_TEST_EXISTS))
 {
- gchar * uri = filename_to_uri (path);
+ g_free (path);
+ break;
+ }
 
- if (count)
- playlist_insert (count);
+ char * uri = filename_to_uri (path);
 
- playlist_insert_playlist_raw (count, 0, uri);
- g_free (uri);
+ playlist_insert (count);
+ playlist_insert_playlist_raw (count, 0, uri);
+ playlist_set_modified (count, TRUE);
+
+ g_free (path);
+ g_free (uri);
+ }
+
+ /* unique ID-based naming scheme */
+
+ char * order_path = g_strdup_printf ("%s/order", get_path (AUD_PATH_PLAYLISTS_DIR));
+ char * order_string;
+ g_file_get_contents (order_path, & order_string, NULL, NULL);
+ g_free (order_path);
+
+ if (! order_string)
+ goto DONE;
+
+ char * * order = g_strsplit (order_string, " ", -1);
+ g_free (order_string);
+
+ for (int i = 0; order[i]; i ++)
+ {
+ char * path = g_strdup_printf ("%s/%s.audpl", get_path (AUD_PATH_PLAYLISTS_DIR), order[i]);
+
+ if (! g_file_test (path, G_FILE_TEST_EXISTS))
+ {
+ g_free (path);
+ path = g_strdup_printf ("%s/%s.xspf", get_path (AUD_PATH_PLAYLISTS_DIR), order[i]);
 }
- else
- done = TRUE;
+
+ char * uri = filename_to_uri (path);
+
+ playlist_insert_with_id (count + i, atoi (order[i]));
+ playlist_insert_playlist_raw (count + i, 0, uri);
+ playlist_set_modified (count + i, FALSE);
+
+ if (g_str_has_suffix (path, ".xspf"))
+ playlist_set_modified (count + i, TRUE);
 
 g_free (path);
+ g_free (uri);
 }
+
+ g_strfreev (order);
+
+DONE:
+ if (! playlist_count ())
+ playlist_insert (0);
+
+ playlist_set_active (0);
 }
 
 static void save_playlists_real (void)
 {
- gint playlists = playlist_count ();
- gboolean done = FALSE;
- gint count;
+ int lists = playlist_count ();
+ const char * folder = get_path (AUD_PATH_PLAYLISTS_DIR);
 
- for (count = 0; ! done; count ++)
+ /* save playlists */
+
+ char * * order = g_malloc (sizeof (char *) * (lists + 1));
+ GHashTable * saved = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
+
+ for (int i = 0; i < lists; i ++)
 {
- gchar * path = make_playlist_path (count);
+ int id = playlist_get_unique_id (i);
+ order[i] = g_strdup_printf ("%d", id);
 
- if (count < playlists)
+ if (playlist_get_modified (i))
 {
- gchar * uri = filename_to_uri (path);
+ char * path = g_strdup_printf ("%s/%d.audpl", folder, id);
+ char * uri = filename_to_uri (path);
+
+ playlist_save (i, uri);
+ playlist_set_modified (i, FALSE);
 
- playlist_save (count, uri);
+ g_free (path);
 g_free (uri);
 }
- else if (g_file_test (path, G_FILE_TEST_EXISTS))
- remove (path);
- else
- done = TRUE;
 
- g_free (path);
+ g_hash_table_insert (saved, g_strdup_printf ("%d.audpl", id), NULL);
+ }
+
+ order[lists] = NULL;
+ char * order_string = g_strjoinv (" ", order);
+ g_strfreev (order);
+
+ GError * error = NULL;
+ char * order_path = g_strdup_printf ("%s/order", get_path (AUD_PATH_PLAYLISTS_DIR));
+
+ char * old_order_string;
+ g_file_get_contents (order_path, & old_order_string, NULL, NULL);
+
+ if (! old_order_string || strcmp (old_order_string, order_string))
+ {
+ if (! g_file_set_contents (order_path, order_string, -1, & error))
+ {
+ fprintf (stderr, "Cannot write to %s: %s\n", order_path, error->message);
+ g_error_free (error);
+ }
+ }
+
+ g_free (order_string);
+ g_free (order_path);
+ g_free (old_order_string);
+
+ /* clean up deleted playlists and files from old naming scheme */
+
+ char * path = make_playlist_path (0);
+ remove (path);
+ g_free (path);
+
+ DIR * dir = opendir (folder);
+ if (! dir)
+ goto DONE;
+
+ struct dirent * entry;
+ while ((entry = readdir (dir)))
+ {
+ if (! g_str_has_suffix (entry->d_name, ".audpl")
+ && ! g_str_has_suffix (entry->d_name, ".xspf"))
+ continue;
+
+ if (! g_hash_table_lookup_extended (saved, entry->d_name, NULL, NULL))
+ {
+ char * path = g_strdup_printf ("%s/%s", folder, entry->d_name);
+ remove (path);
+ g_free (path);
+ }
 }
+
+ closedir (dir);
+
+DONE:
+ g_hash_table_destroy (saved);
 }
 
-static gboolean hooks_added, playlists_changed, state_changed;
+static bool_t hooks_added, state_changed;
 
 static void update_cb (void * data, void * user)
 {
 if (GPOINTER_TO_INT (data) < PLAYLIST_UPDATE_METADATA)
 return;
 
- playlists_changed = TRUE;
 state_changed = TRUE;
 }
 
@@ -360,7 +457,6 @@
 load_playlists_real ();
 playlist_load_state ();
 
- playlists_changed = FALSE;
 state_changed = FALSE;
 
 if (! hooks_added)
@@ -373,13 +469,9 @@
 }
 }
 
-void save_playlists (gboolean exiting)
+void save_playlists (bool_t exiting)
 {
- if (playlists_changed)
- {
- save_playlists_real ();
- playlists_changed = FALSE;
- }
+ save_playlists_real ();
 
 /* on exit, save resume time if resume feature is enabled */
 if (state_changed || (exiting && get_bool (NULL, "resume_playback_on_startup")))
@@ -387,4 +479,13 @@
 playlist_save_state ();
 state_changed = FALSE;
 }
+
+ if (exiting && hooks_added)
+ {
+ hook_dissociate ("playlist update", update_cb);
+ hook_dissociate ("playlist activate", state_cb);
+ hook_dissociate ("playlist position", state_cb);
+
+ hooks_added = FALSE;
+ }
 }

audacious-3.1.1.tar.bz2/src/audacious/playlist.h -> audacious-3.2.4.tar.bz2/src/audacious/playlist.h Changed

@@ -22,7 +22,8 @@
 #ifndef AUDACIOUS_PLAYLIST_H
 #define AUDACIOUS_PLAYLIST_H
 
-#include <glib.h>
+#include <stdint.h>
+
 #include <audacious/api.h>
 #include <audacious/types.h>
 #include <libaudcore/index.h>
@@ -37,10 +38,9 @@
 * change not listed under the other types, and implies both
 * PLAYLIST_UPDATE_SELECTION and PLAYLIST_UPDATE_METADATA. */
 enum {
- PLAYLIST_UPDATE_SELECTION,
+ PLAYLIST_UPDATE_SELECTION = 1,
 PLAYLIST_UPDATE_METADATA,
- PLAYLIST_UPDATE_STRUCTURE,
- PLAYLIST_UPDATE_TYPES};
+ PLAYLIST_UPDATE_STRUCTURE};
 
 /* The values which can be passed to playlist_sort_by_scheme(),
 * playlist_sort_selected_by_scheme(), and
@@ -59,9 +59,9 @@
 PLAYLIST_SORT_FORMATTED_TITLE,
 PLAYLIST_SORT_SCHEMES};
 
-#define PlaylistFilenameCompareFunc PlaylistStringCompareFunc /* deprecated */
-typedef gint (* PlaylistStringCompareFunc) (const gchar * a, const gchar * b);
-typedef gint (* PlaylistTupleCompareFunc) (const Tuple * a, const Tuple * b);
+typedef bool_t (* PlaylistFilterFunc) (const char * filename, void * user);
+typedef int (* PlaylistStringCompareFunc) (const char * a, const char * b);
+typedef int (* PlaylistTupleCompareFunc) (const Tuple * a, const Tuple * b);
 
 #define AUD_API_NAME PlaylistAPI
 #define AUD_API_SYMBOL playlist_api
@@ -73,14 +73,19 @@
 #include "api-local-end.h"
 
 /* playlist-files.c */
-gboolean playlist_load (const gchar * filename, gchar * * title,
- struct index * * filenames, struct index * * tuples);
-gboolean playlist_insert_playlist_raw (gint list, gint at,
- const gchar * filename);
+bool_t playlist_load (const char * filename, char * * title,
+ Index * * filenames, Index * * tuples);
+bool_t playlist_insert_playlist_raw (int list, int at,
+ const char * filename);
 
 /* playlist-new.c */
 void playlist_init (void);
 void playlist_end (void);
+
+void playlist_insert_with_id (int at, int id);
+void playlist_set_modified (int playlist, bool_t modified);
+bool_t playlist_get_modified (int playlist);
+
 void playlist_load_state (void);
 void playlist_save_state (void);
 void playlist_resume (void);
@@ -88,26 +93,26 @@
 void playlist_reformat_titles (void);
 void playlist_trigger_scan (void);
 
-void playlist_entry_insert_batch_raw (gint playlist, gint at,
- struct index * filenames, struct index * tuples, struct index * decoders);
+void playlist_entry_insert_batch_raw (int playlist, int at,
+ Index * filenames, Index * tuples, Index * decoders);
 
-gboolean playlist_prev_song (gint playlist);
-gboolean playlist_next_song (gint playlist, gboolean repeat);
+bool_t playlist_prev_song (int playlist);
+bool_t playlist_next_song (int playlist, bool_t repeat);
 
-gint playback_entry_get_position (void);
+int playback_entry_get_position (void);
 PluginHandle * playback_entry_get_decoder (void);
 Tuple * playback_entry_get_tuple (void);
-gchar * playback_entry_get_title (void);
-gint playback_entry_get_length (void);
+char * playback_entry_get_title (void);
+int playback_entry_get_length (void);
 
 void playback_entry_set_tuple (Tuple * tuple);
 
-gint playback_entry_get_start_time (void);
-gint playback_entry_get_end_time (void);
+int playback_entry_get_start_time (void);
+int playback_entry_get_end_time (void);
 
 /* playlist-utils.c */
 void load_playlists (void);
-void save_playlists (gboolean exiting);
+void save_playlists (bool_t exiting);
 
 #else

audacious-3.1.1.tar.bz2/src/audacious/plugin-init.c -> audacious-3.2.4.tar.bz2/src/audacious/plugin-init.c Changed

@@ -19,6 +19,7 @@
 * using our public API to be a derived work.
 */
 
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -35,7 +36,7 @@
 #include "ui_preferences.h"
 #include "visualization.h"
 
-static gboolean dummy_plugin_start (PluginHandle * p)
+static bool_t dummy_plugin_start (PluginHandle * p)
 {
 return TRUE;
 }
@@ -45,19 +46,19 @@
 }
 
 static const struct {
- const gchar * name;
- gboolean is_managed, is_single;
+ const char * name;
+ bool_t is_managed, is_single;
 
 union {
 struct {
- gboolean (* start) (PluginHandle * plugin);
+ bool_t (* start) (PluginHandle * plugin);
 void (* stop) (PluginHandle * plugin);
 } m;
 
 struct {
 PluginHandle * (* probe) (void);
 PluginHandle * (* get_current) (void);
- gboolean (* set_current) (PluginHandle * plugin);
+ bool_t (* set_current) (PluginHandle * plugin);
 } s;
 } u;
 } table[PLUGIN_TYPES] = {
@@ -78,20 +79,20 @@
 [PLUGIN_TYPE_IFACE] = {"interface", TRUE, TRUE, .u.s = {iface_plugin_probe,
 iface_plugin_get_current, iface_plugin_set_current}}};
 
-static gboolean find_enabled_cb (PluginHandle * p, PluginHandle * * pp)
+static bool_t find_enabled_cb (PluginHandle * p, PluginHandle * * pp)
 {
 * pp = p;
 return FALSE;
 }
 
-static PluginHandle * find_enabled (gint type)
+static PluginHandle * find_enabled (int type)
 {
 PluginHandle * p = NULL;
 plugin_for_enabled (type, (PluginForEachFunc) find_enabled_cb, & p);
 return p;
 }
 
-static void start_single (gint type)
+static void start_single (int type)
 {
 PluginHandle * p;
 
@@ -126,7 +127,7 @@
 }
 }
 
-static gboolean start_multi_cb (PluginHandle * p, void * type)
+static bool_t start_multi_cb (PluginHandle * p, void * type)
 {
 AUDDBG ("Starting %s.\n", plugin_get_name (p));
 
@@ -139,7 +140,7 @@
 return TRUE;
 }
 
-static void start_plugins (gint type)
+static void start_plugins (int type)
 {
 if (! table[type].is_managed)
 return;
@@ -153,7 +154,7 @@
 GINT_TO_POINTER (type));
 }
 
-static VFSConstructor * lookup_transport (const gchar * scheme)
+static VFSConstructor * lookup_transport (const char * scheme)
 {
 PluginHandle * plugin = transport_plugin_for_scheme (scheme);
 if (! plugin)
@@ -168,24 +169,24 @@
 plugin_system_init ();
 vfs_set_lookup_func (lookup_transport);
 
- for (gint i = 0; i < PLUGIN_TYPE_GENERAL; i ++)
+ for (int i = 0; i < PLUGIN_TYPE_GENERAL; i ++)
 start_plugins (i);
 }
 
 void start_plugins_two (void)
 {
- for (gint i = PLUGIN_TYPE_GENERAL; i < PLUGIN_TYPES; i ++)
+ for (int i = PLUGIN_TYPE_GENERAL; i < PLUGIN_TYPES; i ++)
 start_plugins (i);
 }
 
-static gboolean stop_multi_cb (PluginHandle * p, void * type)
+static bool_t stop_multi_cb (PluginHandle * p, void * type)
 {
 AUDDBG ("Shutting down %s.\n", plugin_get_name (p));
 table[GPOINTER_TO_INT (type)].u.m.stop (p);
 return TRUE;
 }
 
-static void stop_plugins (gint type)
+static void stop_plugins (int type)
 {
 if (! table[type].is_managed)
 return;
@@ -205,26 +206,26 @@
 
 void stop_plugins_two (void)
 {
- for (gint i = PLUGIN_TYPES - 1; i >= PLUGIN_TYPE_GENERAL; i --)
+ for (int i = PLUGIN_TYPES - 1; i >= PLUGIN_TYPE_GENERAL; i --)
 stop_plugins (i);
 }
 
 void stop_plugins_one (void)
 {
- for (gint i = PLUGIN_TYPE_GENERAL - 1; i >= 0; i --)
+ for (int i = PLUGIN_TYPE_GENERAL - 1; i >= 0; i --)
 stop_plugins (i);
 
 vfs_set_lookup_func (NULL);
 plugin_system_cleanup ();
 }
 
-PluginHandle * plugin_get_current (gint type)
+PluginHandle * plugin_get_current (int type)
 {
 g_return_val_if_fail (table[type].is_managed && table[type].is_single, NULL);
 return table[type].u.s.get_current ();
 }
 
-static gboolean enable_single (gint type, PluginHandle * p)
+static bool_t enable_single (int type, PluginHandle * p)
 {
 PluginHandle * old = table[type].u.s.get_current ();
 
@@ -249,7 +250,7 @@
 exit (EXIT_FAILURE);
 }
 
-static gboolean enable_multi (gint type, PluginHandle * p, gboolean enable)
+static bool_t enable_multi (int type, PluginHandle * p, bool_t enable)
 {
 AUDDBG ("%sabling %s.\n", enable ? "En" : "Dis", plugin_get_name (p));
 plugin_set_enabled (p, enable);
@@ -269,7 +270,7 @@
 return TRUE;
 }
 
-gboolean plugin_enable (PluginHandle * plugin, gboolean enable)
+bool_t plugin_enable (PluginHandle * plugin, bool_t enable)
 {
 if (! enable == ! plugin_get_enabled (plugin))
 {
@@ -278,7 +279,7 @@
 return TRUE;
 }
 
- gint type = plugin_get_type (plugin);
+ int type = plugin_get_type (plugin);
 g_return_val_if_fail (table[type].is_managed, FALSE);
 
 if (table[type].is_single)
@@ -290,7 +291,8 @@
 return enable_multi (type, plugin, enable);
 }
 
-/* This doesn't really belong here, but it's a bit of an oddball. */
+/* Miscellaneous plugin-related functions ... */
+
 PluginHandle * plugin_by_widget (/* GtkWidget * */ void * widget)
 {
 PluginHandle * p;
@@ -300,3 +302,15 @@
 return p;
 return NULL;
 }
+
+int plugin_send_message (PluginHandle * plugin, const char * code, const void * data, int size)
+{
+ if (! plugin_get_enabled (plugin))
+ return ENOSYS;
+
+ Plugin * header = plugin_get_header (plugin);
+ if (! header || ! PLUGIN_HAS_FUNC (header, take_message))
+ return ENOSYS;
+
+ return header->take_message (code, data, size);
+}

audacious-3.1.1.tar.bz2/src/audacious/plugin-registry.c -> audacious-3.2.4.tar.bz2/src/audacious/plugin-registry.c Changed

@@ -27,6 +27,7 @@
 * loaded and while loading it. */
 
 #include <glib.h>
+#include <pthread.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -52,17 +53,17 @@
 
 typedef struct {
 GList * keys[INPUT_KEYS];
- gboolean has_images, has_subtunes, can_write_tuple, has_infowin;
+ bool_t has_images, has_subtunes, can_write_tuple, has_infowin;
 } InputPluginData;
 
 struct PluginHandle {
- gchar * path;
- gboolean confirmed, loaded;
- gint timestamp, type;
+ char * path;
+ bool_t confirmed, loaded;
+ int timestamp, type;
 Plugin * header;
- gchar * name;
- gint priority;
- gboolean has_about, has_configure, enabled;
+ char * name;
+ int priority;
+ bool_t has_about, has_configure, enabled;
 GList * watches;
 
 union {
@@ -77,7 +78,7 @@
 void * data;
 } PluginWatch;
 
-static const gchar * plugin_type_names[] = {
+static const char * plugin_type_names[] = {
 [PLUGIN_TYPE_TRANSPORT] = "transport",
 [PLUGIN_TYPE_PLAYLIST] = "playlist",
 [PLUGIN_TYPE_INPUT] = "input",
@@ -87,17 +88,17 @@
 [PLUGIN_TYPE_GENERAL] = "general",
 [PLUGIN_TYPE_IFACE] = "iface"};
 
-static const gchar * input_key_names[] = {
+static const char * input_key_names[] = {
 [INPUT_KEY_SCHEME] = "scheme",
 [INPUT_KEY_EXTENSION] = "ext",
 [INPUT_KEY_MIME] = "mime"};
 
 static GList * plugin_list = NULL;
-static gboolean registry_locked = TRUE;
-static GStaticMutex mutex = G_STATIC_MUTEX_INIT;
+static bool_t registry_locked = TRUE;
+static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
 
-static PluginHandle * plugin_new (gchar * path, gboolean confirmed, gboolean
- loaded, gint timestamp, gint type, Plugin * header)
+static PluginHandle * plugin_new (char * path, bool_t confirmed, bool_t
+ loaded, int timestamp, int type, Plugin * header)
 {
 PluginHandle * plugin = g_malloc (sizeof (PluginHandle));
 
@@ -157,7 +158,7 @@
 }
 else if (plugin->type == PLUGIN_TYPE_INPUT)
 {
- for (gint key = 0; key < INPUT_KEYS; key ++)
+ for (int key = 0; key < INPUT_KEYS; key ++)
 {
 g_list_foreach (plugin->u.i.keys[key], (GFunc) g_free, NULL);
 g_list_free (plugin->u.i.keys[key]);
@@ -169,9 +170,9 @@
 g_free (plugin);
 }
 
-static FILE * open_registry_file (const gchar * mode)
+static FILE * open_registry_file (const char * mode)
 {
- gchar * path = g_strdup_printf ("%s/" FILENAME, get_path (AUD_PATH_USER_DIR));
+ char * path = g_strdup_printf ("%s/" FILENAME, get_path (AUD_PATH_USER_DIR));
 FILE * file = fopen (path, mode);
 g_free (path);
 return file;
@@ -180,21 +181,21 @@
 static void transport_plugin_save (PluginHandle * plugin, FILE * handle)
 {
 for (GList * node = plugin->u.t.schemes; node; node = node->next)
- fprintf (handle, "scheme %s\n", (const gchar *) node->data);
+ fprintf (handle, "scheme %s\n", (const char *) node->data);
 }
 
 static void playlist_plugin_save (PluginHandle * plugin, FILE * handle)
 {
 for (GList * node = plugin->u.p.exts; node; node = node->next)
- fprintf (handle, "ext %s\n", (const gchar *) node->data);
+ fprintf (handle, "ext %s\n", (const char *) node->data);
 }
 
 static void input_plugin_save (PluginHandle * plugin, FILE * handle)
 {
- for (gint key = 0; key < INPUT_KEYS; key ++)
+ for (int key = 0; key < INPUT_KEYS; key ++)
 {
 for (GList * node = plugin->u.i.keys[key]; node; node = node->next)
- fprintf (handle, "%s %s\n", input_key_names[key], (const gchar *)
+ fprintf (handle, "%s %s\n", input_key_names[key], (const char *)
 node->data);
 }
 
@@ -236,8 +237,8 @@
 registry_locked = TRUE;
 }
 
-static gchar parse_key[512];
-static gchar * parse_value;
+static char parse_key[512];
+static char * parse_value;
 
 static void parse_next (FILE * handle)
 {
@@ -246,25 +247,25 @@
 if (! fgets (parse_key, sizeof parse_key, handle))
 return;
 
- gchar * space = strchr (parse_key, ' ');
+ char * space = strchr (parse_key, ' ');
 if (! space)
 return;
 
 * space = 0;
 parse_value = space + 1;
 
- gchar * newline = strchr (parse_value, '\n');
+ char * newline = strchr (parse_value, '\n');
 if (newline)
 * newline = 0;
 }
 
-static gboolean parse_integer (const gchar * key, gint * value)
+static bool_t parse_integer (const char * key, int * value)
 {
 return (parse_value && ! strcmp (parse_key, key) && sscanf (parse_value,
 "%d", value) == 1);
 }
 
-static gchar * parse_string (const gchar * key)
+static char * parse_string (const char * key)
 {
 return (parse_value && ! strcmp (parse_key, key)) ? g_strdup (parse_value) :
 NULL;
@@ -272,7 +273,7 @@
 
 static void transport_plugin_parse (PluginHandle * plugin, FILE * handle)
 {
- gchar * value;
+ char * value;
 while ((value = parse_string ("scheme")))
 {
 plugin->u.t.schemes = g_list_prepend (plugin->u.t.schemes, value);
@@ -282,7 +283,7 @@
 
 static void playlist_plugin_parse (PluginHandle * plugin, FILE * handle)
 {
- gchar * value;
+ char * value;
 while ((value = parse_string ("ext")))
 {
 plugin->u.p.exts = g_list_prepend (plugin->u.p.exts, value);
@@ -292,9 +293,9 @@
 
 static void input_plugin_parse (PluginHandle * plugin, FILE * handle)
 {
- for (gint key = 0; key < INPUT_KEYS; key ++)
+ for (int key = 0; key < INPUT_KEYS; key ++)
 {
- gchar * value;
+ char * value;
 while ((value = parse_string (input_key_names[key])))
 {
 plugin->u.i.keys[key] = g_list_prepend (plugin->u.i.keys[key],
@@ -313,11 +314,11 @@
 parse_next (handle);
 }
 
-static gboolean plugin_parse (FILE * handle)
+static bool_t plugin_parse (FILE * handle)
 {
- gchar * path = NULL;
+ char * path = NULL;
 
- gint type;
+ int type;
 for (type = 0; type < PLUGIN_TYPES; type ++)
 {
 if ((path = parse_string (plugin_type_names[type])))
@@ -329,7 +330,7 @@
 FOUND:
 parse_next (handle);
 
- gint timestamp;
+ int timestamp;
 if (! parse_integer ("stamp", & timestamp))
 {
 g_free (path);
@@ -369,7 +370,7 @@
 
 parse_next (handle);
 
- gint format;
+ int format;
 if (! parse_integer ("format", & format) || format != FORMAT)
 goto ERR;
 
@@ -393,7 +394,7 @@
 plugin_free (plugin);
 }
 
-gint plugin_compare (PluginHandle * a, PluginHandle * b)
+int plugin_compare (PluginHandle * a, PluginHandle * b)
 {
 if (a->type < b->type)
 return -1;
@@ -404,7 +405,7 @@
 if (a->priority > b->priority)
 return 1;
 
- gint diff;
+ int diff;
 if ((diff = string_compare (a->name, b->name)))
 return diff;
 
@@ -418,19 +419,42 @@
 registry_locked = TRUE;
 }
 
-static gint plugin_lookup_cb (PluginHandle * plugin, const gchar * path)
+static int plugin_lookup_cb (PluginHandle * plugin, const char * path)
 {
 return strcmp (plugin->path, path);
 }
 
-PluginHandle * plugin_lookup (const gchar * path)
+PluginHandle * plugin_lookup (const char * path)
 {
 GList * node = g_list_find_custom (plugin_list, path, (GCompareFunc)
 plugin_lookup_cb);
 return node ? node->data : NULL;
 }
 
-void plugin_register (const gchar * path)
+static int plugin_lookup_basename_cb (PluginHandle * plugin, const char * basename)
+{
+ char * test = g_path_get_basename (plugin->path);
+
+ char * dot = strrchr (test, '.');
+ if (dot)
+ * dot = 0;
+
+ int ret = strcmp (test, basename);
+
+ g_free (test);
+ return ret;
+}
+
+/* Note: If there are multiple plugins with the same basename, this returns only
+ * one of them. So give different plugins different basenames. --jlindgren */
+PluginHandle * plugin_lookup_basename (const char * basename)
+{
+ GList * node = g_list_find_custom (plugin_list, basename, (GCompareFunc)
+ plugin_lookup_basename_cb);
+ return node ? node->data : NULL;
+}
+
+void plugin_register (const char * path)
 {
 PluginHandle * plugin = plugin_lookup (path);
 if (! plugin)
@@ -440,7 +464,7 @@
 return;
 }
 
- gint timestamp = file_get_mtime (path);
+ int timestamp = file_get_mtime (path);
 g_return_if_fail (timestamp >= 0);
 
 AUDDBG ("Register plugin: %s\n", path);
@@ -454,11 +478,11 @@
 plugin_load (path);
 }
 
-void plugin_register_loaded (const gchar * path, Plugin * header)
+void plugin_register_loaded (const char * path, Plugin * header)
 {
 AUDDBG ("Loaded plugin: %s\n", path);
 PluginHandle * plugin = plugin_lookup (path);
- gboolean new = FALSE;
+ bool_t new = FALSE;
 
 if (plugin)
 {
@@ -474,7 +498,7 @@
 {
 g_return_if_fail (! registry_locked);
 
- gint timestamp = file_get_mtime (path);
+ int timestamp = file_get_mtime (path);
 g_return_if_fail (timestamp >= 0);
 
 plugin = plugin_new (g_strdup (path), TRUE, TRUE, timestamp,
@@ -491,14 +515,14 @@
 if (header->type == PLUGIN_TYPE_TRANSPORT)
 {
 TransportPlugin * tp = (TransportPlugin *) header;
- for (gint i = 0; tp->schemes[i]; i ++)
+ for (int i = 0; tp->schemes[i]; i ++)
 plugin->u.t.schemes = g_list_prepend (plugin->u.t.schemes, g_strdup
 (tp->schemes[i]));
 }
 else if (header->type == PLUGIN_TYPE_PLAYLIST)
 {
 PlaylistPlugin * pp = (PlaylistPlugin *) header;
- for (gint i = 0; pp->extensions[i]; i ++)
+ for (int i = 0; pp->extensions[i]; i ++)
 plugin->u.p.exts = g_list_prepend (plugin->u.p.exts, g_strdup
 (pp->extensions[i]));
 }
@@ -507,7 +531,7 @@
 InputPlugin * ip = (InputPlugin *) header;
 plugin->priority = ip->priority;
 
- for (gint key = 0; key < INPUT_KEYS; key ++)
+ for (int key = 0; key < INPUT_KEYS; key ++)
 {
 g_list_foreach (plugin->u.i.keys[key], (GFunc) g_free, NULL);
 g_list_free (plugin->u.i.keys[key]);
@@ -516,7 +540,7 @@
 
 if (PLUGIN_HAS_FUNC (ip, extensions))
 {
- for (gint i = 0; ip->extensions[i]; i ++)
+ for (int i = 0; ip->extensions[i]; i ++)
 plugin->u.i.keys[INPUT_KEY_EXTENSION] = g_list_prepend
 (plugin->u.i.keys[INPUT_KEY_EXTENSION], g_strdup
 (ip->extensions[i]));
@@ -524,14 +548,14 @@
 
 if (PLUGIN_HAS_FUNC (ip, mimes))
 {
- for (gint i = 0; ip->mimes[i]; i ++)
+ for (int i = 0; ip->mimes[i]; i ++)
 plugin->u.i.keys[INPUT_KEY_MIME] = g_list_prepend
 (plugin->u.i.keys[INPUT_KEY_MIME], g_strdup (ip->mimes[i]));
 }
 
 if (PLUGIN_HAS_FUNC (ip, schemes))
 {
- for (gint i = 0; ip->schemes[i]; i ++)
+ for (int i = 0; ip->schemes[i]; i ++)
 plugin->u.i.keys[INPUT_KEY_SCHEME] = g_list_prepend
 (plugin->u.i.keys[INPUT_KEY_SCHEME], g_strdup (ip->schemes[i]));
 }
@@ -559,19 +583,19 @@
 }
 }
 
-gint plugin_get_type (PluginHandle * plugin)
+int plugin_get_type (PluginHandle * plugin)
 {
 return plugin->type;
 }
 
-const gchar * plugin_get_filename (PluginHandle * plugin)
+const char * plugin_get_filename (PluginHandle * plugin)
 {
 return plugin->path;
 }
 
 const void * plugin_get_header (PluginHandle * plugin)
 {
- g_static_mutex_lock (& mutex);
+ pthread_mutex_lock (& mutex);
 
 if (! plugin->loaded)
 {
@@ -579,11 +603,11 @@
 plugin->loaded = TRUE;
 }
 
- g_static_mutex_unlock (& mutex);
+ pthread_mutex_unlock (& mutex);
 return plugin->header;
 }
 
-static gint plugin_by_header_cb (PluginHandle * plugin, const void * header)
+static int plugin_by_header_cb (PluginHandle * plugin, const void * header)
 {
 return (plugin->header == header) ? 0 : -1;
 }
@@ -595,7 +619,7 @@
 return node ? node->data : NULL;
 }
 
-void plugin_for_each (gint type, PluginForEachFunc func, void * data)
+void plugin_for_each (int type, PluginForEachFunc func, void * data)
 {
 for (GList * node = plugin_list; node; node = node->next)
 {
@@ -606,22 +630,22 @@
 }
 }
 
-const gchar * plugin_get_name (PluginHandle * plugin)
+const char * plugin_get_name (PluginHandle * plugin)
 {
 return plugin->name;
 }
 
-gboolean plugin_has_about (PluginHandle * plugin)
+bool_t plugin_has_about (PluginHandle * plugin)
 {
 return plugin->has_about;
 }
 
-gboolean plugin_has_configure (PluginHandle * plugin)
+bool_t plugin_has_configure (PluginHandle * plugin)
 {
 return plugin->has_configure;
 }
 
-gboolean plugin_get_enabled (PluginHandle * plugin)
+bool_t plugin_get_enabled (PluginHandle * plugin)
 {
 return plugin->enabled;
 }
@@ -643,7 +667,7 @@
 }
 }
 
-void plugin_set_enabled (PluginHandle * plugin, gboolean enabled)
+void plugin_set_enabled (PluginHandle * plugin, bool_t enabled)
 {
 plugin->enabled = enabled;
 plugin_call_watches (plugin);
@@ -654,7 +678,7 @@
 void * data;
 } PluginForEnabledState;
 
-static gboolean plugin_for_enabled_cb (PluginHandle * plugin,
+static bool_t plugin_for_enabled_cb (PluginHandle * plugin,
 PluginForEnabledState * state)
 {
 if (! plugin->enabled)
@@ -662,7 +686,7 @@
 return state->func (plugin, state->data);
 }
 
-void plugin_for_enabled (gint type, PluginForEachFunc func, void * data)
+void plugin_for_enabled (int type, PluginForEachFunc func, void * data)
 {
 PluginForEnabledState state = {func, data};
 plugin_for_each (type, (PluginForEachFunc) plugin_for_enabled_cb, & state);
@@ -696,22 +720,22 @@
 }
 
 typedef struct {
- const gchar * scheme;
+ const char * scheme;
 PluginHandle * plugin;
 } TransportPluginForSchemeState;
 
-static gboolean transport_plugin_for_scheme_cb (PluginHandle * plugin,
+static bool_t transport_plugin_for_scheme_cb (PluginHandle * plugin,
 TransportPluginForSchemeState * state)
 {
- if (! g_list_find_custom (plugin->u.t.schemes, state->scheme, (GCompareFunc)
- strcasecmp))
+ if (! g_list_find_custom (plugin->u.t.schemes, state->scheme,
+ (GCompareFunc) g_ascii_strcasecmp))
 return TRUE;
 
 state->plugin = plugin;
 return FALSE;
 }
 
-PluginHandle * transport_plugin_for_scheme (const gchar * scheme)
+PluginHandle * transport_plugin_for_scheme (const char * scheme)
 {
 TransportPluginForSchemeState state = {scheme, NULL};
 plugin_for_enabled (PLUGIN_TYPE_TRANSPORT, (PluginForEachFunc)
@@ -720,22 +744,22 @@
 }
 
 typedef struct {
- const gchar * ext;
+ const char * ext;
 PluginHandle * plugin;
 } PlaylistPluginForExtState;
 
-static gboolean playlist_plugin_for_ext_cb (PluginHandle * plugin,
+static bool_t playlist_plugin_for_ext_cb (PluginHandle * plugin,
 PlaylistPluginForExtState * state)
 {
- if (! g_list_find_custom (plugin->u.p.exts, state->ext, (GCompareFunc)
- strcasecmp))
+ if (! g_list_find_custom (plugin->u.p.exts, state->ext,
+ (GCompareFunc) g_ascii_strcasecmp))
 return TRUE;
 
 state->plugin = plugin;
 return FALSE;
 }
 
-PluginHandle * playlist_plugin_for_extension (const gchar * extension)
+PluginHandle * playlist_plugin_for_extension (const char * extension)
 {
 PlaylistPluginForExtState state = {extension, NULL};
 plugin_for_enabled (PLUGIN_TYPE_PLAYLIST, (PluginForEachFunc)
@@ -744,23 +768,23 @@
 }
 
 typedef struct {
- gint key;
- const gchar * value;
+ int key;
+ const char * value;
 PluginForEachFunc func;
 void * data;
 } InputPluginForKeyState;
 
-static gboolean input_plugin_for_key_cb (PluginHandle * plugin,
+static bool_t input_plugin_for_key_cb (PluginHandle * plugin,
 InputPluginForKeyState * state)
 {
 if (! g_list_find_custom (plugin->u.i.keys[state->key], state->value,
- (GCompareFunc) strcasecmp))
+ (GCompareFunc) g_ascii_strcasecmp))
 return TRUE;
 
 return state->func (plugin, state->data);
 }
 
-void input_plugin_for_key (gint key, const gchar * value, PluginForEachFunc
+void input_plugin_for_key (int key, const char * value, PluginForEachFunc
 func, void * data)
 {
 InputPluginForKeyState state = {key, value, func, data};
@@ -768,25 +792,25 @@
 input_plugin_for_key_cb, & state);
 }
 
-gboolean input_plugin_has_images (PluginHandle * plugin)
+bool_t input_plugin_has_images (PluginHandle * plugin)
 {
 g_return_val_if_fail (plugin->type == PLUGIN_TYPE_INPUT, FALSE);
 return plugin->u.i.has_images;
 }
 
-gboolean input_plugin_has_subtunes (PluginHandle * plugin)
+bool_t input_plugin_has_subtunes (PluginHandle * plugin)
 {
 g_return_val_if_fail (plugin->type == PLUGIN_TYPE_INPUT, FALSE);
 return plugin->u.i.has_subtunes;
 }
 
-gboolean input_plugin_can_write_tuple (PluginHandle * plugin)
+bool_t input_plugin_can_write_tuple (PluginHandle * plugin)
 {
 g_return_val_if_fail (plugin->type == PLUGIN_TYPE_INPUT, FALSE);
 return plugin->u.i.can_write_tuple;
 }
 
-gboolean input_plugin_has_infowin (PluginHandle * plugin)
+bool_t input_plugin_has_infowin (PluginHandle * plugin)
 {
 g_return_val_if_fail (plugin->type == PLUGIN_TYPE_INPUT, FALSE);
 return plugin->u.i.has_infowin;

audacious-3.1.1.tar.bz2/src/audacious/plugin-view.c -> audacious-3.2.4.tar.bz2/src/audacious/plugin-view.c Changed

@@ -44,6 +44,11 @@
 Node * n = NULL;
 
 GtkTreeSelection * sel = gtk_tree_view_get_selection (tree);
+
+ /* the treeview may not have a model yet */
+ if (! sel)
+ return NULL;
+
 GtkTreeModel * model;
 GtkTreeIter iter;
 if (gtk_tree_selection_get_selected (sel, & model, & iter))
@@ -60,7 +65,7 @@
 return plugin_get_header (p);
 }
 
-static void do_enable (GtkCellRendererToggle * cell, const gchar * path_str,
+static void do_enable (GtkCellRendererToggle * cell, const char * path_str,
 GtkTreeModel * model)
 {
 GtkTreePath * path = gtk_tree_path_new_from_string (path_str);
@@ -69,7 +74,7 @@
 gtk_tree_path_free (path);
 
 Node * n = NULL;
- gboolean enabled;
+ bool_t enabled;
 gtk_tree_model_get (model, & iter, PVIEW_COL_NODE, & n,
 PVIEW_COL_ENABLED, & enabled, -1);
 g_return_if_fail (n != NULL);
@@ -77,7 +82,7 @@
 plugin_enable (n->p, ! enabled);
 }
 
-static gboolean list_watcher (PluginHandle * p, Node * n)
+static bool_t list_watcher (PluginHandle * p, Node * n)
 {
 GtkTreeIter iter;
 gtk_tree_model_get_iter (n->model, & iter, n->path);
@@ -86,7 +91,7 @@
 return TRUE;
 }
 
-static gboolean fill_cb (PluginHandle * p, GtkTreeModel * model)
+static bool_t fill_cb (PluginHandle * p, GtkTreeModel * model)
 {
 Node * n = g_slice_new (Node);
 
@@ -122,7 +127,7 @@
 gtk_tree_view_column_set_attributes (col, rend, "active", PVIEW_COL_ENABLED,
 NULL);
 
- for (gint i = PVIEW_COL_NAME; i <= PVIEW_COL_PATH; i ++)
+ for (int i = PVIEW_COL_NAME; i <= PVIEW_COL_PATH; i ++)
 {
 col = gtk_tree_view_column_new ();
 gtk_tree_view_column_set_sizing (col, GTK_TREE_VIEW_COLUMN_GROW_ONLY);
@@ -162,14 +167,14 @@
 g_object_unref ((GObject *) model);
 }
 
-static gboolean config_watcher (PluginHandle * p, GtkWidget * config)
+static bool_t config_watcher (PluginHandle * p, GtkWidget * config)
 {
 gtk_widget_set_sensitive (config, plugin_has_configure (p) &&
 plugin_get_enabled (p));
 return TRUE;
 }
 
-static gboolean about_watcher (PluginHandle * p, GtkWidget * about)
+static bool_t about_watcher (PluginHandle * p, GtkWidget * about)
 {
 gtk_widget_set_sensitive (about, plugin_has_about (p) && plugin_get_enabled
 (p));
@@ -178,7 +183,8 @@
 
 static void button_update (GtkTreeView * tree, GtkWidget * b)
 {
- PluginForEachFunc watcher = g_object_get_data ((GObject *) b, "watcher");
+ PluginForEachFunc watcher = (PluginForEachFunc) g_object_get_data
+ ((GObject *) b, "watcher");
 g_return_if_fail (watcher != NULL);
 
 PluginHandle * p = g_object_steal_data ((GObject *) b, "plugin");
@@ -218,7 +224,8 @@
 
 static void button_destroy (GtkWidget * b)
 {
- PluginForEachFunc watcher = g_object_get_data ((GObject *) b, "watcher");
+ PluginForEachFunc watcher = (PluginForEachFunc) g_object_get_data
+ ((GObject *) b, "watcher");
 g_return_if_fail (watcher != NULL);
 
 PluginHandle * p = g_object_steal_data ((GObject *) b, "plugin");
@@ -226,7 +233,7 @@
 plugin_remove_watch (p, watcher, b);
 }
 
-GtkWidget * plugin_view_new (gint type)
+GtkWidget * plugin_view_new (int type)
 {
 GtkWidget * vbox = gtk_vbox_new (FALSE, 6);
 gtk_container_set_border_width ((GtkContainer *) vbox, 6);
@@ -251,7 +258,7 @@
 GtkWidget * config = gtk_button_new_from_stock (GTK_STOCK_PREFERENCES);
 gtk_box_pack_start ((GtkBox *) hbox, config, FALSE, FALSE, 0);
 gtk_widget_set_sensitive (config, FALSE);
- g_object_set_data ((GObject *) config, "watcher", config_watcher);
+ g_object_set_data ((GObject *) config, "watcher", (void *) config_watcher);
 g_signal_connect (tree, "cursor-changed", (GCallback) button_update, config);
 g_signal_connect_swapped (config, "clicked", (GCallback)
 do_config, tree);
@@ -260,7 +267,7 @@
 GtkWidget * about = gtk_button_new_from_stock (GTK_STOCK_ABOUT);
 gtk_box_pack_start ((GtkBox *) hbox, about, FALSE, FALSE, 0);
 gtk_widget_set_sensitive (about, FALSE);
- g_object_set_data ((GObject *) about, "watcher", about_watcher);
+ g_object_set_data ((GObject *) about, "watcher", (void *) about_watcher);
 g_signal_connect (tree, "cursor-changed", (GCallback) button_update, about);
 g_signal_connect_swapped (about, "clicked", (GCallback) do_about, tree);
 g_signal_connect (about, "destroy", (GCallback) button_destroy, NULL);

audacious-3.1.1.tar.bz2/src/audacious/plugin.h -> audacious-3.2.4.tar.bz2/src/audacious/plugin.h Changed

@@ -22,9 +22,6 @@
 #ifndef AUDACIOUS_PLUGIN_H
 #define AUDACIOUS_PLUGIN_H
 
-#include <glib.h>
-#include <gmodule.h>
-
 #include <audacious/api.h>
 #include <audacious/types.h>
 #include <libaudcore/audio.h>
@@ -48,8 +45,8 @@
 * the API tables), increment _AUD_PLUGIN_VERSION *and* set
 * _AUD_PLUGIN_VERSION_MIN to the same value. */
 
-#define _AUD_PLUGIN_VERSION_MIN 34 /* 3.1-beta3 */
-#define _AUD_PLUGIN_VERSION 34
+#define _AUD_PLUGIN_VERSION_MIN 38 /* 3.2-alpha2 */
+#define _AUD_PLUGIN_VERSION 38
 
 /* A NOTE ON THREADS
 *
@@ -76,14 +73,36 @@
 * Single-thread plugins: visualization, general, and interface. Functions
 * provided by these plugins will only be called from the main thread. */
 
+/* CROSS-PLUGIN MESSAGES
+ *
+ * Since 3.2, Audacious implements a basic messaging system between plugins.
+ * Messages are sent using aud_plugin_send_message() and received through the
+ * take_message() method specified in the header of the receiving plugin.
+ * Plugins that do not need to receive messages can set take_message() to NULL.
+ *
+ * Each message includes a code indicating the type of message, a pointer to
+ * some data, and a value indicating the size of that data. What the message
+ * data contains is entirely up to the two plugins involved. For this reason, it
+ * is crucial that both plugins agree on the meaning of the message codes used.
+ *
+ * Once the message is sent, an integer error code is returned. If the receiving
+ * plugin does not provide the take_message() method, ENOSYS is returned. If
+ * take_message() does not recognize the message code, it should ignore the
+ * message and return EINVAL. An error code of zero represents success. Other
+ * error codes may be used with more specific meanings.
+ *
+ * For the time being, aud_plugin_send_message() should only be called from the
+ * program's main thread. */
+
 #define PLUGIN_COMMON_FIELDS \
- gint magic; /* checked against _AUD_PLUGIN_MAGIC */ \
- gint version; /* checked against _AUD_PLUGIN_VERSION */ \
- gint type; /* PLUGIN_TYPE_XXX */ \
- gint size; /* size in bytes of the struct */ \
- const gchar * name; \
- gboolean (* init) (void); \
+ int magic; /* checked against _AUD_PLUGIN_MAGIC */ \
+ int version; /* checked against _AUD_PLUGIN_VERSION */ \
+ int type; /* PLUGIN_TYPE_XXX */ \
+ int size; /* size in bytes of the struct */ \
+ const char * name; \
+ bool_t (* init) (void); \
 void (* cleanup) (void); \
+ int (* take_message) (const char * code, const void * data, int size); \
 void (* about) (void); \
 void (* configure) (void); \
 PluginPreferences * settings;
@@ -96,20 +115,21 @@
 struct _TransportPlugin
 {
 PLUGIN_COMMON_FIELDS
- const gchar * const * schemes; /* array ending with NULL */
+ const char * const * schemes; /* array ending with NULL */
 const VFSConstructor * vtable;
 };
 
 struct _PlaylistPlugin
 {
 PLUGIN_COMMON_FIELDS
-	const gchar * const * extensions; /* array ending with NULL */
-	gboolean (* load) (const gchar * path, VFSFile * file, gchar * * title,
- struct index * filenames, /* of (gchar *) */
- struct index * tuples); /* of (Tuple *) */
-	gboolean (* save) (const gchar * path, VFSFile * file, const gchar * title,
- struct index * filenames, /* of (gchar *) */
- struct index * tuples); /* of (Tuple *) */
+	const char * const * extensions; /* array ending with NULL */
+	bool_t (* load) (const char * path, VFSFile * file,
+ char * * title, /* pooled */
+ Index * filenames, /* of (char *), pooled */
+ Index * tuples); /* of (Tuple *) */
+	bool_t (* save) (const char * path, VFSFile * file, const char * title,
+ Index * filenames, /* of (char *) */
+ Index * tuples); /* of (Tuple *) */
 };
 
 struct _OutputPlugin
@@ -117,25 +137,25 @@
 PLUGIN_COMMON_FIELDS
 
 /* During probing, plugins with higher priority (10 to 0) are tried first. */
- gint probe_priority;
+ int probe_priority;
 
 /* Returns current volume for left and right channels (0 to 100). */
- void (* get_volume) (gint * l, gint * r);
+ void (* get_volume) (int * l, int * r);
 
 /* Changes volume for left and right channels (0 to 100). */
- void (* set_volume) (gint l, gint r);
+ void (* set_volume) (int l, int r);
 
 /* Begins playback of a PCM stream. <format> is one of the FMT_*
 * enumeration values defined in libaudcore/audio.h. Returns nonzero on
 * success. */
- gboolean (* open_audio) (gint format, gint rate, gint chans);
+ bool_t (* open_audio) (int format, int rate, int chans);
 
 /* Ends playback. Any buffered audio data is discarded. */
 void (* close_audio) (void);
 
 /* Returns how many bytes of data may be passed to a following write_audio()
 * call. NULL if the plugin supports only blocking writes (not recommended). */
- gint (* buffer_free) (void);
+ int (* buffer_free) (void);
 
 /* Waits until buffer_free() will return a size greater than zero.
 * output_time(), pause(), and flush() may be called meanwhile; if flush()
@@ -144,31 +164,31 @@
 void (* period_wait) (void);
 
 /* Buffers <size> bytes of data, in the format given to open_audio(). */
- void (* write_audio) (void * data, gint size);
+ void (* write_audio) (void * data, int size);
 
 /* Waits until all buffered data has been heard by the user. */
 void (* drain) (void);
 
 /* Returns time count (in milliseconds) of how much data has been written. */
- gint (* written_time) (void);
+ int (* written_time) (void);
 
 /* Returns time count (in milliseconds) of how much data has been heard by
 * the user. */
- gint (* output_time) (void);
+ int (* output_time) (void);
 
 /* Pauses the stream if is nonzero; otherwise unpauses it.
 * write_audio() will not be called while the stream is paused. */
- void (* pause) (gboolean p);
+ void (* pause) (bool_t p);
 
 /* Discards any buffered audio data and sets the time counter (in
 * milliseconds) of data written. */
- void (* flush) (gint time);
+ void (* flush) (int time);
 
 /* Sets the time counter (in milliseconds) of data written without
 * discarding any buffered audio data. If <time> is less than the amount of
 * buffered data, following calls to output_time() will return negative
 * values. */
- void (* set_written_time) (gint time);
+ void (* set_written_time) (int time);
 };
 
 struct _EffectPlugin
@@ -178,34 +198,34 @@
 /* All processing is done in floating point. If the effect plugin wants to
 * change the channel count or sample rate, it can change the parameters
 * passed to start(). They cannot be changed in the middle of a song. */
- void (* start) (gint * channels, gint * rate);
+ void (* start) (int * channels, int * rate);
 
 /* process() has two options: modify the samples in place and leave the data
 * pointer unchanged or copy them into a buffer of its own. If it sets the
 * pointer to dynamically allocated memory, it is the plugin's job to free
 * that memory. process() may return different lengths of audio than it is
 * passed, even a zero length. */
- void (* process) (gfloat * * data, gint * samples);
+ void (* process) (float * * data, int * samples);
 
- /* A seek is taking place; any buffers should be discarded. */
+ /* Optional. A seek is taking place; any buffers should be discarded. */
 void (* flush) (void);
 
 /* Exactly like process() except that any buffers should be drained (i.e.
 * the data processed and returned). finish() will be called a second time
 * at the end of the last song in the playlist. */
- void (* finish) (gfloat * * data, gint * samples);
+ void (* finish) (float * * data, int * samples);
 
 /* Optional. For effects that change the length of the song, these
 * functions allow the correct time to be displayed. */
- gint (* decoder_to_output_time) (gint time);
- gint (* output_to_decoder_time) (gint time);
+ int (* decoder_to_output_time) (int time);
+ int (* output_to_decoder_time) (int time);
 
 /* Effects with lowest order (0 to 9) are applied first. */
- gint order;
+ int order;
 
 /* If the effect does not change the number of channels or the sampling
 * rate, it can be enabled and disabled more smoothly. */
- gboolean preserves_format;
+ bool_t preserves_format;
 };
 
 struct OutputAPI
@@ -216,7 +236,7 @@
 /* Prepare the output system for playback in the specified format. Returns
 * nonzero on success. If the call fails, no other output functions may be
 * called. */
- gint (* open_audio) (gint format, gint rate, gint channels);
+ int (* open_audio) (int format, int rate, int channels);
 
 /* Informs the output system of replay gain values for the current song so
 * that volume levels can be adjusted accordingly, if the user so desires.
@@ -229,7 +249,7 @@
 * been written (though it may not yet be heard by the user); if the output
 * system is paused; this may be indefinitely. See abort_write for a way to
 * interrupt a blocked call. */
- void (* write_audio) (void * data, gint length);
+ void (* write_audio) (void * data, int length);
 
 /* End playback. Any audio data currently buffered by the output system
 * will be discarded. After the call, no other output functions, except
@@ -239,12 +259,12 @@
 /* Pause or unpause playback. This function may be called during a call to
 * write_audio, in which write_audio will block until playback is unpaused
 * (but see abort_write to prevent the call from blocking). */
- void (* pause) (gboolean pause);
+ void (* pause) (bool_t pause);
 
 /* Discard any audio data currently buffered by the output system, and set
 * the time counter to a new value. This function is intended to be used
 * for seeking. */
- void (* flush) (gint time);
+ void (* flush) (int time);
 
 /* Returns the time counter. Note that this represents the amount of audio
 * data passed to the output system, not the amount actually heard by the
@@ -252,7 +272,7 @@
 * First, save the time counter using this function. Second, call
 * close_audio and then open_audio with the new format (note that the call
 * may fail). Finally, restore the time counter using flush. */
- gint (* written_time) (void);
+ int (* written_time) (void);
 
 /* Returns TRUE if there is data remaining in the output buffer; FALSE if
 * all data written to the output system has been heard by the user. This
@@ -260,7 +280,7 @@
 * calls) at the end of a song before calling close_audio. Once it returns
 * FALSE, close_audio can be called without cutting off any of the end of
 * the song. */
- gboolean (* buffer_playing) (void);
+ bool_t (* buffer_playing) (void);
 
 /* Interrupt a call to write_audio so that it returns immediately. This
 * works even when the call is blocked by pause. Buffered audio data is
@@ -294,8 +314,8 @@
 
 /* Updates attributes of the stream. "bitrate" is in bits per second.
 * "samplerate" is in hertz. */
- void (* set_params) (InputPlayback * p, gint bitrate, gint samplerate,
- gint channels);
+ void (* set_params) (InputPlayback * p, int bitrate, int samplerate,
+ int channels);
 
 /* Updates metadata for the stream. Caller gives up ownership of one
 * reference to the tuple. */
@@ -329,44 +349,44 @@
 * 3. When one of the songs is played, Audacious opens the file and calls
 * play() with a file name modified in this way.
 */
- gboolean have_subtune;
+ bool_t have_subtune;
 
 /* Pointer to an array (terminated with NULL) of file extensions associated
 * with file types the plugin can handle. */
- const gchar * const * extensions;
+ const char * const * extensions;
 /* Pointer to an array (terminated with NULL) of MIME types the plugin can
 * handle. */
- const gchar * const * mimes;
+ const char * const * mimes;
 /* Pointer to an array (terminated with NULL) of custom URI schemes the
 * plugin can handle. */
- const gchar * const * schemes;
+ const char * const * schemes;
 
 /* How quickly the plugin should be tried in searching for a plugin to
 * handle a file which could not be identified from its extension. Plugins
 * with priority 0 are tried first, 10 last. */
- gint priority;
+ int priority;
 
 /* Must return nonzero if the plugin can handle this file. If the file
 * could not be opened, "file" will be NULL. (This is normal in the case of
 * special URI schemes like cdda:// that do not represent actual files.) */
- gboolean (* is_our_file_from_vfs) (const gchar * filename, VFSFile * file);
+ bool_t (* is_our_file_from_vfs) (const char * filename, VFSFile * file);
 
 /* Must return a tuple containing metadata for this file, or NULL if no
 * metadata could be read. If the file could not be opened, "file" will be
 * NULL. Audacious takes over one reference to the tuple returned. */
- Tuple * (* probe_for_tuple) (const gchar * filename, VFSFile * file);
+ Tuple * (* probe_for_tuple) (const char * filename, VFSFile * file);
 
 /* Optional. Must write metadata from a tuple to this file. Must return
 * nonzero on success or zero on failure. "file" will never be NULL. */
 /* Bug: This function does not support special URI schemes like cdda://,
 * since no file name is passed. */
- gboolean (* update_song_tuple) (const Tuple * tuple, VFSFile * file);
+ bool_t (* update_song_tuple) (const Tuple * tuple, VFSFile * file);
 
 /* Optional, and not recommended. Must show a window with information about
 * this file. If this function is provided, update_song_tuple should not be. */
 /* Bug: Implementing this function duplicates user interface code and code
 * to open the file in each and every plugin. */
- void (* file_info_box) (const gchar * filename);
+ void (* file_info_box) (const char * filename);
 
 /* Optional. Must try to read an "album art" image embedded in this file.
 * Must return nonzero on success or zero on failure. If the file could not
@@ -374,8 +394,8 @@
 * pointer to a block of data allocated with g_malloc and "size" with the
 * size in bytes of that block. The data may be in any format supported by
 * GTK. Audacious will free the data when it is no longer needed. */
- gboolean (* get_song_image) (const gchar * filename, VFSFile * file,
- void * * data, gint * size);
+ bool_t (* get_song_image) (const char * filename, VFSFile * file,
+ void * * data, int64_t * size);
 
 /* Must try to play this file. "playback" is a structure containing output-
 * related functions which the plugin may make use of. It also contains a
@@ -388,19 +408,19 @@
 * file. "paused" specifies whether playback should immediately be paused.
 * Must return nonzero if some of the file was successfully played or zero
 * on failure. */
- gboolean (* play) (InputPlayback * playback, const gchar * filename,
- VFSFile * file, gint start_time, gint stop_time, gboolean pause);
+ bool_t (* play) (InputPlayback * playback, const char * filename,
+ VFSFile * file, int start_time, int stop_time, bool_t pause);
 
 /* Must pause or unpause a file currently being played. This function will
 * be called from a different thread than play, but it will not be called
 * before the plugin calls set_pb_ready or after stop is called. */
- void (* pause) (InputPlayback * playback, gboolean paused);
+ void (* pause) (InputPlayback * playback, bool_t paused);
 
 /* Optional. Must seek to the given position in milliseconds within a file
 * currently being played. This function will be called from a different
 * thread than play, but it will not be called before the plugin calls
 * set_pb_ready or after stop is called. */
- void (* mseek) (InputPlayback * playback, gint time);
+ void (* mseek) (InputPlayback * playback, int time);
 
 /* Must signal a currently playing song to stop and cause play to return.
 * This function will be called from a different thread than play. It will
@@ -410,16 +430,16 @@
 
 /* Advanced, for plugins that do not use Audacious's output system. Use at
 * your own risk. */
- gint (* get_time) (InputPlayback * playback);
- gint (* get_volume) (gint * l, gint * r);
- gint (* set_volume) (gint l, gint r);
+ int (* get_time) (InputPlayback * playback);
+ int (* get_volume) (int * l, int * r);
+ int (* set_volume) (int l, int r);
 };
 
 struct _GeneralPlugin
 {
 PLUGIN_COMMON_FIELDS
 
- gboolean enabled_by_default;
+ bool_t enabled_by_default;
 
 /* GtkWidget * (* get_widget) (void); */
 void * (* get_widget) (void);
@@ -433,13 +453,13 @@
 void (* clear) (void);
 
 /* 512 frames of a single-channel PCM signal */
- void (* render_mono_pcm) (const gfloat * pcm);
+ void (* render_mono_pcm) (const float * pcm);
 
 /* 512 frames of an interleaved multi-channel PCM signal */
- void (* render_multi_pcm) (const gfloat * pcm, gint channels);
+ void (* render_multi_pcm) (const float * pcm, int channels);
 
 /* intensity of frequencies 1/512, 2/512, ..., 256/512 of sample rate */
- void (* render_freq) (const gfloat * freq);
+ void (* render_freq) (const float * freq);
 
 /* GtkWidget * (* get_widget) (void); */
 void * (* get_widget) (void);
@@ -455,22 +475,21 @@
 * in X11, this should be determined by whether the interface has the
 * toplevel focus. show() should show and raise the interface, so that both
 * is_shown() and is_focused() will return nonzero. */
- void (* show) (gboolean show);
- gboolean (* is_shown) (void);
+ void (* show) (bool_t show);
+ bool_t (* is_shown) (void);
 
- void (* show_error) (const gchar * markup);
- void (* show_filebrowser) (gboolean play_button);
+ void (* show_error) (const char * markup);
+ void (* show_filebrowser) (bool_t play_button);
 void (* show_jump_to_track) (void);
 
- void /* GtkWidget */ * (* run_gtk_plugin) (void /* GtkWidget */ * widget,
- const gchar * name);
- void * (* stop_gtk_plugin) (void /* GtkWidget */ * widget);
+ void (* run_gtk_plugin) (void /* GtkWidget */ * widget, const char * name);
+ void (* stop_gtk_plugin) (void /* GtkWidget */ * widget);
 
 void (* install_toolbar) (void /* GtkWidget */ * button);
 void (* uninstall_toolbar) (void /* GtkWidget */ * button);
 
 /* added after 3.0-alpha1 */
- gboolean (* is_focused) (void);
+ bool_t (* is_focused) (void);
 };
 
 #undef PLUGIN_COMMON_FIELDS
@@ -483,7 +502,7 @@
 .type = itype, \
 .size = sizeof (stype), \
 __VA_ARGS__}; \
-G_MODULE_EXPORT stype * get_plugin_info (AudAPITable * table) { \
+stype * get_plugin_info (AudAPITable * table) { \
 _aud_api_table = table; \
 return & _aud_plugin_self; \
 }
@@ -498,6 +517,6 @@
 #define AUD_IFACE_PLUGIN(...) AUD_PLUGIN (IfacePlugin, PLUGIN_TYPE_IFACE, __VA_ARGS__)
 
 #define PLUGIN_HAS_FUNC(p, func) \
- ((p)->size > (void *) & (p)->func - (void *) (p) && (p)->func)
+ ((p)->size > (char *) & (p)->func - (char *) (p) && (p)->func)
 
 #endif /* AUDACIOUS_PLUGIN_H */

audacious-3.1.1.tar.bz2/src/audacious/pluginenum.c -> audacious-3.2.4.tar.bz2/src/audacious/pluginenum.c Changed

@@ -24,9 +24,9 @@
 */
 
 #include <assert.h>
-
 #include <glib.h>
 #include <gmodule.h>
+#include <pthread.h>
 
 #include <libaudcore/audstrings.h>
 #include <libaudgui/init.h>
@@ -49,9 +49,9 @@
 #include "plugins.h"
 #undef AUD_API_DECLARE
 
-static const gchar * plugin_dir_list[] = {PLUGINSUBS, NULL};
+static const char * plugin_dir_list[] = {PLUGINSUBS, NULL};
 
-gchar verbose = 0;
+char verbose = 0;
 
 AudAPITable api_table = {
 .drct_api = & drct_api,
@@ -66,9 +66,9 @@
 } LoadedModule;
 
 static GList * loaded_modules = NULL;
-static GStaticMutex mutex = G_STATIC_MUTEX_INIT;
+static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
 
-static void plugin2_process (Plugin * header, GModule * module, const gchar * filename)
+static void plugin2_process (Plugin * header, GModule * module, const char * filename)
 {
 if (header->magic != _AUD_PLUGIN_MAGIC)
 {
@@ -99,12 +99,12 @@
 break;
 }
 
- g_static_mutex_lock (& mutex);
+ pthread_mutex_lock (& mutex);
 LoadedModule * loaded = g_slice_new (LoadedModule);
 loaded->header = header;
 loaded->module = module;
 loaded_modules = g_list_prepend (loaded_modules, loaded);
- g_static_mutex_unlock (& mutex);
+ pthread_mutex_unlock (& mutex);
 
 plugin_register_loaded (filename, header);
 }
@@ -126,15 +126,15 @@
 break;
 }
 
- g_static_mutex_lock (& mutex);
+ pthread_mutex_lock (& mutex);
 g_module_close (loaded->module);
 g_slice_free (LoadedModule, loaded);
- g_static_mutex_unlock (& mutex);
+ pthread_mutex_unlock (& mutex);
 }
 
 /******************************************************************/
 
-void plugin_load (const gchar * filename)
+void plugin_load (const char * filename)
 {
 GModule *module;
 Plugin * (* func) (AudAPITable * table);
@@ -160,7 +160,7 @@
 g_module_close(module);
 }
 
-static gboolean scan_plugin_func(const gchar * path, const gchar * basename, gpointer data)
+static bool_t scan_plugin_func(const char * path, const char * basename, gpointer data)
 {
 if (!str_has_suffix_nocase(basename, SHARED_SUFFIX))
 return FALSE;
@@ -173,7 +173,7 @@
 return FALSE;
 }
 
-static void scan_plugins(const gchar * path)
+static void scan_plugins(const char * path)
 {
 dir_foreach (path, scan_plugin_func, NULL);
 }
@@ -182,8 +182,8 @@
 {
 assert (g_module_supported ());
 
- gchar *dir;
- gint dirsel = 0;
+ char *dir;
+ int dirsel = 0;
 
 audgui_init (& api_table);
 
@@ -226,4 +226,6 @@
 
 g_list_free (loaded_modules);
 loaded_modules = NULL;
+
+ audgui_cleanup ();
 }

audacious-3.1.1.tar.bz2/src/audacious/plugins-api.h -> audacious-3.2.4.tar.bz2/src/audacious/plugins-api.h Changed

@@ -24,31 +24,34 @@
 /* CAUTION: These functions are not thread safe. */
 
 /* plugin-init.c */
-AUD_FUNC1 (PluginHandle *, plugin_get_current, gint, type)
-AUD_FUNC2 (gboolean, plugin_enable, PluginHandle *, plugin, gboolean, enable)
+AUD_FUNC1 (PluginHandle *, plugin_get_current, int, type)
+AUD_FUNC2 (bool_t, plugin_enable, PluginHandle *, plugin, bool_t, enable)
 AUD_FUNC1 (PluginHandle *, plugin_by_widget, void /* GtkWidget */ *, widget)
+AUD_FUNC4 (int, plugin_send_message, PluginHandle *, plugin,
+ const char *, code, const void *, data, int, size)
 
 /* plugin-registry.c */
-AUD_FUNC1 (gint, plugin_get_type, PluginHandle *, plugin)
-AUD_FUNC1 (const gchar *, plugin_get_filename, PluginHandle *, plugin)
-AUD_FUNC1 (PluginHandle *, plugin_lookup, const gchar *, filename)
+AUD_FUNC1 (int, plugin_get_type, PluginHandle *, plugin)
+AUD_FUNC1 (const char *, plugin_get_filename, PluginHandle *, plugin)
+AUD_FUNC1 (PluginHandle *, plugin_lookup, const char *, filename)
+AUD_FUNC1 (PluginHandle *, plugin_lookup_basename, const char *, basename)
 
 AUD_FUNC1 (const void *, plugin_get_header, PluginHandle *, plugin)
 AUD_FUNC1 (PluginHandle *, plugin_by_header, const void *, header)
 
-AUD_FUNC2 (gint, plugin_compare, PluginHandle *, a, PluginHandle *, b)
-AUD_FUNC3 (void, plugin_for_each, gint, type, PluginForEachFunc, func, void *,
+AUD_FUNC2 (int, plugin_compare, PluginHandle *, a, PluginHandle *, b)
+AUD_VFUNC3 (plugin_for_each, int, type, PluginForEachFunc, func, void *,
  data)
 
-AUD_FUNC1 (gboolean, plugin_get_enabled, PluginHandle *, plugin)
-AUD_FUNC3 (void, plugin_for_enabled, gint, type, PluginForEachFunc, func,
+AUD_FUNC1 (bool_t, plugin_get_enabled, PluginHandle *, plugin)
+AUD_VFUNC3 (plugin_for_enabled, int, type, PluginForEachFunc, func,
  void *, data)
 
-AUD_FUNC1 (const gchar *, plugin_get_name, PluginHandle *, plugin)
-AUD_FUNC1 (gboolean, plugin_has_about, PluginHandle *, plugin)
-AUD_FUNC1 (gboolean, plugin_has_configure, PluginHandle *, plugin)
+AUD_FUNC1 (const char *, plugin_get_name, PluginHandle *, plugin)
+AUD_FUNC1 (bool_t, plugin_has_about, PluginHandle *, plugin)
+AUD_FUNC1 (bool_t, plugin_has_configure, PluginHandle *, plugin)
 
-AUD_FUNC3 (void, plugin_add_watch, PluginHandle *, plugin, PluginForEachFunc,
+AUD_VFUNC3 (plugin_add_watch, PluginHandle *, plugin, PluginForEachFunc,
  func, void *, data)
-AUD_FUNC3 (void, plugin_remove_watch, PluginHandle *, plugin, PluginForEachFunc,
+AUD_VFUNC3 (plugin_remove_watch, PluginHandle *, plugin, PluginForEachFunc,
  func, void *, data)

audacious-3.1.1.tar.bz2/src/audacious/plugins.h -> audacious-3.2.4.tar.bz2/src/audacious/plugins.h Changed

@@ -22,12 +22,11 @@
 #ifndef AUDACIOUS_PLUGINS_H
 #define AUDACIOUS_PLUGINS_H
 
-#include <glib.h>
-
 #include <audacious/api.h>
 #include <audacious/types.h>
+#include <libaudcore/core.h>
 
-typedef gboolean (* PluginForEachFunc) (PluginHandle * plugin, void * data);
+typedef bool_t (* PluginForEachFunc) (PluginHandle * plugin, void * data);
 
 #define AUD_API_NAME PluginsAPI
 #define AUD_API_SYMBOL plugins_api
@@ -55,24 +54,24 @@
 void plugin_registry_prune (void);
 void plugin_registry_save (void);
 
-void plugin_register (const gchar * path);
-void plugin_register_loaded (const gchar * path, Plugin * header);
+void plugin_register (const char * path);
+void plugin_register_loaded (const char * path, Plugin * header);
 
-void plugin_set_enabled (PluginHandle * plugin, gboolean enabled);
+void plugin_set_enabled (PluginHandle * plugin, bool_t enabled);
 
-PluginHandle * transport_plugin_for_scheme (const gchar * scheme);
-PluginHandle * playlist_plugin_for_extension (const gchar * extension);
-void input_plugin_for_key (gint key, const gchar * value, PluginForEachFunc
+PluginHandle * transport_plugin_for_scheme (const char * scheme);
+PluginHandle * playlist_plugin_for_extension (const char * extension);
+void input_plugin_for_key (int key, const char * value, PluginForEachFunc
 func, void * data);
-gboolean input_plugin_has_images (PluginHandle * plugin);
-gboolean input_plugin_has_subtunes (PluginHandle * plugin);
-gboolean input_plugin_can_write_tuple (PluginHandle * plugin);
-gboolean input_plugin_has_infowin (PluginHandle * plugin);
+bool_t input_plugin_has_images (PluginHandle * plugin);
+bool_t input_plugin_has_subtunes (PluginHandle * plugin);
+bool_t input_plugin_can_write_tuple (PluginHandle * plugin);
+bool_t input_plugin_has_infowin (PluginHandle * plugin);
 
 /* pluginenum.c */
 void plugin_system_init (void);
 void plugin_system_cleanup (void);
-void plugin_load (const gchar * path);
+void plugin_load (const char * path);
 
 #else

audacious-3.1.1.tar.bz2/src/audacious/preferences.h -> audacious-3.2.4.tar.bz2/src/audacious/preferences.h Changed

@@ -20,9 +20,6 @@
 #ifndef AUDACIOUS_PREFERENCES_H
 #define AUDACIOUS_PREFERENCES_H
 
-#include <glib.h>
-#include <audacious/types.h>
-
 typedef enum {
 WIDGET_NONE,
 WIDGET_CHK_BTN,
@@ -49,7 +46,7 @@
 
 typedef struct {
 gpointer value;
- const gchar *label;
+ const char *label;
 } ComboBoxElements;
 
 struct _NotebookTab;
@@ -60,25 +57,25 @@
 gpointer cfg; /* connected config value */
 void (*callback) (void); /* this func will be called after value change, can be NULL */
 char *tooltip; /* widget tooltip, can be NULL */
- gboolean child;
+ bool_t child;
 ValueType cfg_type; /* connected value type */
- const gchar * csect; /* config file section */
- const gchar * cname; /* config file key name */
+ const char * csect; /* config file section */
+ const char * cname; /* config file key name */
 
 union {
 struct {
- gdouble min, max, step;
+ double min, max, step;
 char *right_label; /* text right to widget */
 } spin_btn;
 
 struct {
 struct _PreferencesWidget *elem;
- gint rows;
+ int rows;
 } table;
 
 struct {
 char *stock_id;
- gboolean single_line; /* FALSE to enable line wrap */
+ bool_t single_line; /* FALSE to enable line wrap */
 } label;
 
 struct {
@@ -86,30 +83,30 @@
 } font_btn;
 
 struct {
- gboolean password;
+ bool_t password;
 } entry;
 
 struct {
 ComboBoxElements *elements;
- gint n_elements;
- gboolean enabled;
+ int n_elements;
+ bool_t enabled;
 } combo;
 
 struct {
 struct _PreferencesWidget *elem;
- gint n_elem;
+ int n_elem;
 
- gboolean horizontal; /* FALSE gives vertical, TRUE gives horizontal aligment of child widgets */
- gboolean frame; /* whether to draw frame around box */
+ bool_t horizontal; /* FALSE gives vertical, TRUE gives horizontal aligment of child widgets */
+ bool_t frame; /* whether to draw frame around box */
 } box;
 
 struct {
 struct _NotebookTab *tabs;
- gint n_tabs;
+ int n_tabs;
 } notebook;
 
 struct {
- gboolean horizontal; /* FALSE gives vertical, TRUE gives horizontal separator */
+ bool_t horizontal; /* FALSE gives vertical, TRUE gives horizontal separator */
 } separator;
 
 /* for WIDGET_CUSTOM --nenolod */
@@ -119,9 +116,9 @@
 };
 
 typedef struct _NotebookTab {
- gchar *name;
+ char *name;
 PreferencesWidget *settings;
- gint n_settings;
+ int n_settings;
 } NotebookTab;
 
 typedef enum {
@@ -129,12 +126,12 @@
 } PreferencesType;
 
 struct _PluginPreferences {
- const gchar * domain;
- const gchar * title;
- const gchar * imgurl;
+ const char * domain;
+ const char * title;
+ const char * imgurl;
 
 PreferencesWidget *prefs;
- gint n_prefs;
+ int n_prefs;
 
 PreferencesType type;

audacious-3.1.1.tar.bz2/src/audacious/probe-buffer.c -> audacious-3.2.4.tar.bz2/src/audacious/probe-buffer.c Changed

@@ -1,6 +1,6 @@
 /*
 * probe-buffer.c
- * Copyright 2010 John Lindgren
+ * Copyright 2010-2011 John Lindgren
 *
 * This file is part of Audacious.
 *
@@ -19,6 +19,7 @@
 * using our public API to be a derived work.
 */
 
+#include <glib.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -27,83 +28,65 @@
 
 typedef struct
 {
- const gchar * filename, * decoder;
 VFSFile * file;
- guchar buffer[16384];
- gint filled, at;
- const gchar * read_warned, * seek_warned;
+ unsigned char buffer[16384];
+ int filled, at;
 }
 ProbeBuffer;
 
-static gint probe_buffer_fclose (VFSFile * file)
+static int probe_buffer_fclose (VFSFile * file)
 {
- gint ret = vfs_fclose (((ProbeBuffer *) file->handle)->file);
- g_free (file->handle);
+ ProbeBuffer * p = vfs_get_handle (file);
+
+ int ret = vfs_fclose (p->file);
+ g_slice_free (ProbeBuffer, p);
 return ret;
 }
 
-static void increase_buffer (ProbeBuffer * p, gint64 size)
+static void increase_buffer (ProbeBuffer * p, int64_t size)
 {
 size = (size + 0xFF) & ~0xFF;
 
 if (size > sizeof p->buffer)
- {
- if (p->read_warned != p->decoder)
- {
- AUDDBG ("%s tried to read past end of buffer while probing %s.\n",
- p->decoder, p->filename);
- p->read_warned = p->decoder;
- }
-
 size = sizeof p->buffer;
- }
 
 if (p->filled < size)
 p->filled += vfs_fread (p->buffer + p->filled, 1, size - p->filled,
 p->file);
 }
 
-static gint64 probe_buffer_fread (void * buffer, gint64 size, gint64 count,
+static int64_t probe_buffer_fread (void * buffer, int64_t size, int64_t count,
 VFSFile * file)
 {
- ProbeBuffer * p = file->handle;
+ ProbeBuffer * p = vfs_get_handle (file);
 
 increase_buffer (p, p->at + size * count);
- gint readed = (size > 0) ? MIN (count, (p->filled - p->at) / size) : 0;
+ int readed = (size > 0) ? MIN (count, (p->filled - p->at) / size) : 0;
 memcpy (buffer, p->buffer + p->at, size * readed);
 
 p->at += size * readed;
 return readed;
 }
 
-static gint64 probe_buffer_fwrite (const void * data, gint64 size, gint64 count,
+static int64_t probe_buffer_fwrite (const void * data, int64_t size, int64_t count,
 VFSFile * file)
 {
 /* not implemented */
 return 0;
 }
 
-static gint probe_buffer_getc (VFSFile * file)
+static int probe_buffer_getc (VFSFile * file)
 {
- guchar c;
+ unsigned char c;
 return (probe_buffer_fread (& c, 1, 1, file) == 1) ? c : EOF;
 }
 
-static gint probe_buffer_fseek (VFSFile * file, gint64 offset, gint whence)
+static int probe_buffer_fseek (VFSFile * file, int64_t offset, int whence)
 {
- ProbeBuffer * p = file->handle;
+ ProbeBuffer * p = vfs_get_handle (file);
 
 if (whence == SEEK_END)
- {
- if (p->seek_warned != p->decoder)
- {
- AUDDBG ("%s tried to seek to end of file while probing %s.\n",
- p->decoder, p->filename);
- p->seek_warned = p->decoder;
- }
-
 return -1;
- }
 
 if (whence == SEEK_CUR)
 offset += p->at;
@@ -118,7 +101,7 @@
 return 0;
 }
 
-static gint probe_buffer_ungetc (gint c, VFSFile * file)
+static int probe_buffer_ungetc (int c, VFSFile * file)
 {
 return (! probe_buffer_fseek (file, -1, SEEK_CUR)) ? c : EOF;
 }
@@ -128,31 +111,31 @@
 probe_buffer_fseek (file, 0, SEEK_SET);
 }
 
-static gint64 probe_buffer_ftell (VFSFile * file)
+static int64_t probe_buffer_ftell (VFSFile * file)
 {
- return ((ProbeBuffer *) file->handle)->at;
+ return ((ProbeBuffer *) vfs_get_handle (file))->at;
 }
 
-static gboolean probe_buffer_feof (VFSFile * file)
+static bool_t probe_buffer_feof (VFSFile * file)
 {
- ProbeBuffer * p = file->handle;
+ ProbeBuffer * p = vfs_get_handle (file);
 return (p->at < p->filled) ? FALSE : vfs_feof (p->file);
 }
 
-static gint probe_buffer_ftruncate (VFSFile * file, gint64 size)
+static int probe_buffer_ftruncate (VFSFile * file, int64_t size)
 {
 /* not implemented */
 return -1;
 }
 
-static gint64 probe_buffer_fsize (VFSFile * file)
+static int64_t probe_buffer_fsize (VFSFile * file)
 {
- return vfs_fsize (((ProbeBuffer *) file->handle)->file);
+ return vfs_fsize (((ProbeBuffer *) vfs_get_handle (file))->file);
 }
 
-static gchar * probe_buffer_get_metadata (VFSFile * file, const gchar * field)
+static char * probe_buffer_get_metadata (VFSFile * file, const char * field)
 {
- return vfs_get_metadata (((ProbeBuffer *) file->handle)->file, field);
+ return vfs_get_metadata (((ProbeBuffer *) vfs_get_handle (file))->file, field);
 }
 
 static VFSConstructor probe_buffer_table =
@@ -172,34 +155,17 @@
 	.vfs_get_metadata_impl = probe_buffer_get_metadata,
 };
 
-VFSFile * probe_buffer_new (const gchar * filename)
+VFSFile * probe_buffer_new (const char * filename)
 {
 VFSFile * file = vfs_fopen (filename, "r");
 
 if (! file)
 return NULL;
 
- ProbeBuffer * p = g_malloc (sizeof (ProbeBuffer));
- p->decoder = NULL;
- p->filename = filename;
+ ProbeBuffer * p = g_slice_new (ProbeBuffer);
 p->file = file;
 p->filled = 0;
 p->at = 0;
- p->read_warned = NULL;
- p->seek_warned = NULL;
-
- VFSFile * file2 = g_malloc (sizeof (VFSFile));
- file2->base = & probe_buffer_table;
- file2->handle = p;
- file2->uri = g_strdup (filename);
- file2->ref = 1;
- file2->sig = VFS_SIG;
 
- return file2;
-}
-
-void probe_buffer_set_decoder (VFSFile * file, const gchar * decoder)
-{
- ProbeBuffer * p = file->handle;
- p->decoder = decoder;
+ return vfs_new (filename, & probe_buffer_table, p);
 }

audacious-3.1.1.tar.bz2/src/audacious/probe-buffer.h -> audacious-3.2.4.tar.bz2/src/audacious/probe-buffer.h Changed

audacious-3.1.1.tar.bz2/src/audacious/probe.c -> audacious-3.2.4.tar.bz2/src/audacious/probe.c Changed

@@ -19,6 +19,7 @@
 * using our public API to be a derived work.
 */
 
+#include <glib.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -33,17 +34,19 @@
 
 typedef struct
 {
- gchar * filename;
+ const char * filename;
 VFSFile * handle;
- gboolean buffered;
+ bool_t buffered, failed;
 PluginHandle * plugin;
 }
 ProbeState;
 
-static gboolean check_opened (ProbeState * state)
+static bool_t check_opened (ProbeState * state)
 {
 if (state->handle != NULL)
 return TRUE;
+ if (state->failed)
+ return FALSE;
 
 AUDDBG ("Opening %s.\n", state->filename);
 if ((state->buffered = vfs_is_remote (state->filename)))
@@ -55,10 +58,11 @@
 return TRUE;
 
 AUDDBG ("FAILED.\n");
+ state->failed = TRUE;
 return FALSE;
 }
 
-static gboolean probe_func (PluginHandle * plugin, ProbeState * state)
+static bool_t probe_func (PluginHandle * plugin, ProbeState * state)
 {
 AUDDBG ("Trying %s.\n", plugin_get_name (plugin));
 InputPlugin * decoder = plugin_get_header (plugin);
@@ -70,9 +74,6 @@
 if (! check_opened (state))
 return FALSE;
 
- if (state->buffered)
- probe_buffer_set_decoder (state->handle, plugin_get_name (plugin));
-
 if (decoder->is_our_file_from_vfs (state->filename, state->handle))
 {
 state->plugin = plugin;
@@ -98,7 +99,7 @@
 * similarly that the plugin passed in this call is the last one.
 */
 
-static gboolean probe_func_fast (PluginHandle * plugin, ProbeState * state)
+static bool_t probe_func_fast (PluginHandle * plugin, ProbeState * state)
 {
 if (state->plugin != NULL)
 {
@@ -116,40 +117,38 @@
 
 static void probe_by_scheme (ProbeState * state)
 {
- gchar * s = strstr (state->filename, "://");
+ const char * s = strstr (state->filename, "://");
 
 if (s == NULL)
 return;
 
 AUDDBG ("Probing by scheme.\n");
- * s = 0;
- input_plugin_for_key (INPUT_KEY_SCHEME, state->filename, (PluginForEachFunc)
- probe_func_fast, state);
- * s = ':';
+ char buf[s - state->filename + 1];
+ memcpy (buf, state->filename, s - state->filename);
+ buf[s - state->filename] = 0;
+
+ input_plugin_for_key (INPUT_KEY_SCHEME, buf, (PluginForEachFunc) probe_func_fast, state);
 }
 
 static void probe_by_extension (ProbeState * state)
 {
- gchar * s = strrchr (state->filename, '.');
+ const char * ext, * sub;
+ uri_parse (state->filename, NULL, & ext, & sub, NULL);
 
- if (s == NULL)
+ if (ext == sub)
 return;
 
 AUDDBG ("Probing by extension.\n");
- s = g_ascii_strdown (s + 1, -1);
-
- gchar * q = strrchr (s, '?');
- if (q != NULL)
- * q = 0;
+ char buf[sub - ext];
+ memcpy (buf, ext + 1, sub - ext - 1);
+ buf[sub - ext - 1] = 0;
 
- input_plugin_for_key (INPUT_KEY_EXTENSION, s, (PluginForEachFunc)
- probe_func_fast, state);
- g_free (s);
+ input_plugin_for_key (INPUT_KEY_EXTENSION, buf, (PluginForEachFunc) probe_func_fast, state);
 }
 
 static void probe_by_mime (ProbeState * state)
 {
- gchar * mime;
+ char * mime;
 
 if (! check_opened (state))
 return;
@@ -169,14 +168,15 @@
 plugin_for_enabled (PLUGIN_TYPE_INPUT, (PluginForEachFunc) probe_func, state);
 }
 
-PluginHandle * file_find_decoder (const gchar * filename, gboolean fast)
+PluginHandle * file_find_decoder (const char * filename, bool_t fast)
 {
 ProbeState state;
 
 AUDDBG ("Probing %s.\n", filename);
 state.plugin = NULL;
- state.filename = filename_split_subtune (filename, NULL);
+ state.filename = filename;
 state.handle = NULL;
+ state.failed = FALSE;
 
 probe_by_scheme (& state);
 
@@ -196,24 +196,19 @@
 probe_by_content (& state);
 
 DONE:
- g_free (state.filename);
-
 if (state.handle != NULL)
 vfs_fclose (state.handle);
 
 return state.plugin;
 }
 
-Tuple * file_read_tuple (const gchar * filename, PluginHandle * decoder)
+Tuple * file_read_tuple (const char * filename, PluginHandle * decoder)
 {
 InputPlugin * ip = plugin_get_header (decoder);
 g_return_val_if_fail (ip, NULL);
 g_return_val_if_fail (ip->probe_for_tuple, NULL);
 
- gchar * real = filename_split_subtune (filename, NULL);
- VFSFile * handle = vfs_fopen (real, "r");
- g_free (real);
-
+ VFSFile * handle = vfs_fopen (filename, "r");
 Tuple * tuple = ip->probe_for_tuple (filename, handle);
 
 if (handle)
@@ -222,8 +217,8 @@
 return tuple;
 }
 
-gboolean file_read_image (const gchar * filename, PluginHandle * decoder,
- void * * data, gint * size)
+bool_t file_read_image (const char * filename, PluginHandle * decoder,
+ void * * data, int64_t * size)
 {
 if (! input_plugin_has_images (decoder))
 return FALSE;
@@ -232,38 +227,39 @@
 g_return_val_if_fail (ip, FALSE);
 g_return_val_if_fail (ip->get_song_image, FALSE);
 
- gchar * real = filename_split_subtune (filename, NULL);
- VFSFile * handle = vfs_fopen (real, "r");
- g_free (real);
-
- gboolean success = ip->get_song_image (filename, handle, data, size);
+ VFSFile * handle = vfs_fopen (filename, "r");
+ bool_t success = ip->get_song_image (filename, handle, data, size);
 
 if (handle)
 vfs_fclose (handle);
 
+ if (! success)
+ {
+ * data = NULL;
+ * size = 0;
+ }
+
 return success;
 }
 
-gboolean file_can_write_tuple (const gchar * filename, PluginHandle * decoder)
+bool_t file_can_write_tuple (const char * filename, PluginHandle * decoder)
 {
 return input_plugin_can_write_tuple (decoder);
 }
 
-gboolean file_write_tuple (const gchar * filename, PluginHandle * decoder,
+bool_t file_write_tuple (const char * filename, PluginHandle * decoder,
 const Tuple * tuple)
 {
 InputPlugin * ip = plugin_get_header (decoder);
 g_return_val_if_fail (ip, FALSE);
 g_return_val_if_fail (ip->update_song_tuple, FALSE);
 
- gchar * real = filename_split_subtune (filename, NULL);
- VFSFile * handle = vfs_fopen (real, "r+");
- g_free (real);
+ VFSFile * handle = vfs_fopen (filename, "r+");
 
 if (! handle)
 return FALSE;
 
- gboolean success = ip->update_song_tuple (tuple, handle);
+ bool_t success = ip->update_song_tuple (tuple, handle);
 
 if (handle)
 vfs_fclose (handle);
@@ -274,7 +270,7 @@
 return success;
 }
 
-gboolean custom_infowin (const gchar * filename, PluginHandle * decoder)
+bool_t custom_infowin (const char * filename, PluginHandle * decoder)
 {
 if (! input_plugin_has_infowin (decoder))
 return FALSE;

audacious-3.1.1.tar.bz2/src/audacious/signals.c -> audacious-3.2.4.tar.bz2/src/audacious/signals.c Changed

audacious-3.1.1.tar.bz2/src/audacious/smclient.c -> audacious-3.2.4.tar.bz2/src/audacious/smclient.c Changed

audacious-3.1.1.tar.bz2/src/audacious/types.h -> audacious-3.2.4.tar.bz2/src/audacious/types.h Changed

audacious-3.1.1.tar.bz2/src/audacious/ui_albumart.c -> audacious-3.2.4.tar.bz2/src/audacious/ui_albumart.c Changed

@@ -28,8 +28,8 @@
 #include "i18n.h"
 #include "misc.h"
 
-static gboolean
-has_front_cover_extension(const gchar *name)
+static bool_t
+has_front_cover_extension(const char *name)
 {
     char *ext;
 
@@ -44,14 +44,14 @@
            g_strcasecmp(ext, ".png") == 0;
 }
 
-static gboolean
-cover_name_filter(const gchar *name, const gchar *filter, const gboolean ret_on_empty)
+static bool_t
+cover_name_filter(const char *name, const char *filter, const bool_t ret_on_empty)
 {
-    gboolean result = FALSE;
-    gchar **splitted;
-    gchar *current;
-    gchar *lname;
-    gint i;
+    bool_t result = FALSE;
+    char **splitted;
+    char *current;
+    char *lname;
+    int i;
 
     if (!filter || strlen(filter) == 0) {
         return ret_on_empty;
@@ -63,7 +63,7 @@
     g_strdown(lname);
 
     for (i = 0; !result && (current = splitted[i]); i++) {
-        gchar *stripped = g_strstrip(g_strdup(current));
+        char *stripped = g_strstrip(g_strdup(current));
         g_strdown(stripped);
 
         result = result || strstr(lname, stripped);
@@ -78,19 +78,19 @@
 }
 
 /* Check wether it's an image we want */
-static gboolean is_front_cover_image (const gchar * file)
+static bool_t is_front_cover_image (const char * file)
 {
-    gchar * include = get_string (NULL, "cover_name_include");
-    gchar * exclude = get_string (NULL, "cover_name_exclude");
-    gboolean accept = cover_name_filter (file, include, TRUE) &&
+    char * include = get_string (NULL, "cover_name_include");
+    char * exclude = get_string (NULL, "cover_name_exclude");
+    bool_t accept = cover_name_filter (file, include, TRUE) &&
      ! cover_name_filter (file, exclude, FALSE);
     g_free (include);
     g_free (exclude);
     return accept;
 }
 
-static gboolean
-is_file_image(const gchar *imgfile, const gchar *file_name)
+static bool_t
+is_file_image(const char *imgfile, const char *file_name)
 {
     char *imgfile_ext, *file_name_ext;
     size_t imgfile_len, file_name_len;
@@ -117,8 +117,8 @@
     }
 }
 
-static gchar * fileinfo_recursive_get_image (const gchar * path, const gchar *
- file_name, gint depth)
+static char * fileinfo_recursive_get_image (const char * path, const char *
+ file_name, int depth)
 {
     GDir *d;
 
@@ -128,13 +128,13 @@
     d = g_dir_open(path, 0, NULL);
 
     if (d) {
-        const gchar *f;
+        const char *f;
 
         if (get_bool (NULL, "use_file_cover") && file_name)
         {
             /* Look for images matching file name */
             while((f = g_dir_read_name(d))) {
-                gchar *newpath = g_strconcat(path, "/", f, NULL);
+                char *newpath = g_strconcat(path, "/", f, NULL);
 
                 if (!g_file_test(newpath, G_FILE_TEST_IS_DIR) &&
                     has_front_cover_extension(f) &&
@@ -150,7 +150,7 @@
 
         /* Search for files using filter */
         while ((f = g_dir_read_name(d))) {
-            gchar *newpath = g_strconcat(path, "/", f, NULL);
+            char *newpath = g_strconcat(path, "/", f, NULL);
 
             if (!g_file_test(newpath, G_FILE_TEST_IS_DIR) &&
                 has_front_cover_extension(f) &&
@@ -172,10 +172,10 @@
 
         /* Descend into directories recursively. */
         while ((f = g_dir_read_name(d))) {
-            gchar *newpath = g_strconcat(path, "/", f, NULL);
+            char *newpath = g_strconcat(path, "/", f, NULL);
 
             if(g_file_test(newpath, G_FILE_TEST_IS_DIR)) {
-                gchar *tmp = fileinfo_recursive_get_image(newpath,
+                char *tmp = fileinfo_recursive_get_image(newpath,
                     NULL, depth + 1);
                 if(tmp) {
                     g_free(newpath);
@@ -193,18 +193,18 @@
     return NULL;
 }
 
-gchar * get_associated_image_file (const gchar * filename)
+char * get_associated_image_file (const char * filename)
 {
     if (strncmp (filename, "file://", 7))
         return NULL;
 
-    gchar * unesc = uri_to_filename (filename);
+    char * unesc = uri_to_filename (filename);
     if (! unesc)
         return NULL;
 
-    gchar * path = g_path_get_dirname (unesc);
-    gchar * base = g_path_get_basename (unesc);
-    gchar * image_file = fileinfo_recursive_get_image (path, base, 0);
+    char * path = g_path_get_dirname (unesc);
+    char * base = g_path_get_basename (unesc);
+    char * image_file = fileinfo_recursive_get_image (path, base, 0);
 
     g_free (unesc);
     g_free (path);

audacious-3.1.1.tar.bz2/src/audacious/ui_plugin_menu.c -> audacious-3.2.4.tar.bz2/src/audacious/ui_plugin_menu.c Changed

@@ -26,8 +26,8 @@
 
 struct Item {
     MenuFunc func;
-    const gchar * name;
-    const gchar * icon;
+    const char * name;
+    const char * icon;
 };
 
 static GList * items[AUD_MENU_COUNT];
@@ -36,7 +36,7 @@
 static void add_to_menu (GtkWidget * menu, struct Item * item)
 {
     GtkWidget * widget = gtk_image_menu_item_new_with_mnemonic (item->name);
-    g_object_set_data ((GObject *) widget, "func", item->func);
+    g_object_set_data ((GObject *) widget, "func", (void *) item->func);
     g_signal_connect (widget, "activate", item->func, NULL);
 
     if (item->icon)
@@ -47,8 +47,8 @@
     gtk_menu_shell_append ((GtkMenuShell *) menu, widget);
 }
 
-/* GtkWidget * get_plugin_menu (gint id) */
-void * get_plugin_menu (gint id)
+/* GtkWidget * get_plugin_menu (int id) */
+void * get_plugin_menu (int id)
 {
     if (! menus[id])
     {
@@ -63,8 +63,8 @@
     return menus[id];
 }
 
-void plugin_menu_add (gint id, MenuFunc func, const gchar * name,
- const gchar * icon)
+void plugin_menu_add (int id, MenuFunc func, const char * name,
+ const char * icon)
 {
     struct Item * item = g_slice_new (struct Item);
     item->name = name;
@@ -79,15 +79,15 @@
 
 static void remove_cb (GtkWidget * widget, MenuFunc func)
 {
-    if (g_object_get_data ((GObject *) widget, "func") == func)
+    if ((MenuFunc) g_object_get_data ((GObject *) widget, "func") == func)
         gtk_widget_destroy (widget);
 }
 
-void plugin_menu_remove (gint id, MenuFunc func)
+void plugin_menu_remove (int id, MenuFunc func)
 {
     if (menus[id])
         gtk_container_foreach ((GtkContainer *) menus[id], (GtkCallback)
-         remove_cb, func);
+         remove_cb, (void *) func);
 
     GList * next;
     for (GList * node = items[id]; node; node = next)

audacious-3.1.1.tar.bz2/src/audacious/ui_preferences.c -> audacious-3.2.4.tar.bz2/src/audacious/ui_preferences.c Changed

@@ -52,13 +52,13 @@
 };
 
 typedef struct {
- const gchar *icon_path;
- const gchar *name;
+ const char *icon_path;
+ const char *name;
 } Category;
 
 typedef struct {
- const gchar *name;
- const gchar *tag;
+ const char *name;
+ const char *tag;
 } TitleFieldTag;
 
 static /* GtkWidget * */ void * prefswin = NULL;
@@ -88,7 +88,7 @@
 {"plugins.png", N_("Plugins")},
 };
 
-static gint n_categories = G_N_ELEMENTS(categories);
+static int n_categories = G_N_ELEMENTS(categories);
 
 static TitleFieldTag title_field_tags[] = {
 { N_("Artist") , "${artist}" },
@@ -104,7 +104,7 @@
 { N_("Codec") , "${codec}" },
 { N_("Quality") , "${quality}" },
 };
-static const guint n_title_field_tags = G_N_ELEMENTS(title_field_tags);
+static const unsigned int n_title_field_tags = G_N_ELEMENTS(title_field_tags);
 
 #ifdef USE_CHARDET
 static ComboBoxElements chardet_detector_presets[] = {
@@ -132,8 +132,8 @@
 typedef struct {
 void *next;
 GtkWidget *container;
- const gchar * pg_name;
- const gchar * img_url;
+ const char * pg_name;
+ const char * img_url;
 } CategoryQueueEntry;
 
 CategoryQueueEntry *category_queue = NULL;
@@ -218,7 +218,7 @@
 
 #define TITLESTRING_NPRESETS 6
 
-static const gchar * const titlestring_presets[TITLESTRING_NPRESETS] = {
+static const char * const titlestring_presets[TITLESTRING_NPRESETS] = {
 "${title}",
 "${?artist:${artist} - }${title}",
 "${?artist:${artist} - }${?album:${album} - }${title}",
@@ -226,7 +226,7 @@
 "${?artist:${artist} }${?album:[ ${album} ] }${?artist:- }${?track-number:${track-number}. }${title}",
 "${?album:${album} - }${title}"};
 
-static const gchar * const titlestring_preset_names[TITLESTRING_NPRESETS] = {
+static const char * const titlestring_preset_names[TITLESTRING_NPRESETS] = {
 N_("TITLE"),
 N_("ARTIST - TITLE"),
 N_("ARTIST - ALBUM - TITLE"),
@@ -242,7 +242,7 @@
 {
 GtkTreeModel *model;
 GtkTreeIter iter;
- gint index;
+ int index;
 
 if (!gtk_tree_selection_get_selected(selection, &model, &iter))
 return;
@@ -253,8 +253,8 @@
 
 static void
 editable_insert_text(GtkEditable * editable,
- const gchar * text,
- gint * pos)
+ const char * text,
+ int * pos)
 {
 gtk_editable_insert_text(editable, text, strlen(text), pos);
 }
@@ -263,9 +263,9 @@
 titlestring_tag_menu_callback(GtkMenuItem * menuitem,
 gpointer data)
 {
- const gchar *separator = " - ";
- gint item = GPOINTER_TO_INT(data);
- gint pos;
+ const char *separator = " - ";
+ int item = GPOINTER_TO_INT(data);
+ int pos;
 
 pos = gtk_editable_get_position(GTK_EDITABLE(titlestring_entry));
 
@@ -287,9 +287,9 @@
 gtk_menu_popup (menu, NULL, NULL, NULL, NULL, 0, GDK_CURRENT_TIME);
 }
 
-static void update_titlestring_cbox (GtkComboBox * cbox, const gchar * format)
+static void update_titlestring_cbox (GtkComboBox * cbox, const char * format)
 {
- gint preset;
+ int preset;
 for (preset = 0; preset < TITLESTRING_NPRESETS; preset ++)
 {
 if (! strcmp (titlestring_presets[preset], format))
@@ -302,7 +302,7 @@
 
 static void on_titlestring_entry_changed (GtkEntry * entry, GtkComboBox * cbox)
 {
- const gchar * format = gtk_entry_get_text (entry);
+ const char * format = gtk_entry_get_text (entry);
 set_string (NULL, "generic_title_format", format);
 update_titlestring_cbox (cbox, format);
 playlist_reformat_titles ();
@@ -310,17 +310,17 @@
 
 static void on_titlestring_cbox_changed (GtkComboBox * cbox, GtkEntry * entry)
 {
- gint preset = gtk_combo_box_get_active (cbox);
+ int preset = gtk_combo_box_get_active (cbox);
 if (preset < TITLESTRING_NPRESETS)
 gtk_entry_set_text (entry, titlestring_presets[preset]);
 }
 
-static void widget_set_bool (PreferencesWidget * widget, gboolean value)
+static void widget_set_bool (PreferencesWidget * widget, bool_t value)
 {
 g_return_if_fail (widget->cfg_type == VALUE_BOOLEAN);
 
 if (widget->cfg)
- * (gboolean *) widget->cfg = value;
+ * (bool_t *) widget->cfg = value;
 else if (widget->cname)
 set_bool (widget->csect, widget->cname, value);
 
@@ -328,24 +328,24 @@
 widget->callback ();
 }
 
-static gboolean widget_get_bool (PreferencesWidget * widget)
+static bool_t widget_get_bool (PreferencesWidget * widget)
 {
 g_return_val_if_fail (widget->cfg_type == VALUE_BOOLEAN, FALSE);
 
 if (widget->cfg)
- return * (gboolean *) widget->cfg;
+ return * (bool_t *) widget->cfg;
 else if (widget->cname)
 return get_bool (widget->csect, widget->cname);
 else
 return FALSE;
 }
 
-static void widget_set_int (PreferencesWidget * widget, gint value)
+static void widget_set_int (PreferencesWidget * widget, int value)
 {
 g_return_if_fail (widget->cfg_type == VALUE_INT);
 
 if (widget->cfg)
- * (gint *) widget->cfg = value;
+ * (int *) widget->cfg = value;
 else if (widget->cname)
 set_int (widget->csect, widget->cname, value);
 
@@ -353,24 +353,24 @@
 widget->callback ();
 }
 
-static gint widget_get_int (PreferencesWidget * widget)
+static int widget_get_int (PreferencesWidget * widget)
 {
 g_return_val_if_fail (widget->cfg_type == VALUE_INT, 0);
 
 if (widget->cfg)
- return * (gint *) widget->cfg;
+ return * (int *) widget->cfg;
 else if (widget->cname)
 return get_int (widget->csect, widget->cname);
 else
 return 0;
 }
 
-static void widget_set_double (PreferencesWidget * widget, gdouble value)
+static void widget_set_double (PreferencesWidget * widget, double value)
 {
 g_return_if_fail (widget->cfg_type == VALUE_FLOAT);
 
 if (widget->cfg)
- * (gfloat *) widget->cfg = value;
+ * (float *) widget->cfg = value;
 else if (widget->cname)
 set_double (widget->csect, widget->cname, value);
 
@@ -378,26 +378,26 @@
 widget->callback ();
 }
 
-static gdouble widget_get_double (PreferencesWidget * widget)
+static double widget_get_double (PreferencesWidget * widget)
 {
 g_return_val_if_fail (widget->cfg_type == VALUE_FLOAT, 0);
 
 if (widget->cfg)
- return * (gfloat *) widget->cfg;
+ return * (float *) widget->cfg;
 else if (widget->cname)
 return get_double (widget->csect, widget->cname);
 else
 return 0;
 }
 
-static void widget_set_string (PreferencesWidget * widget, const gchar * value)
+static void widget_set_string (PreferencesWidget * widget, const char * value)
 {
 g_return_if_fail (widget->cfg_type == VALUE_STRING);
 
 if (widget->cfg)
 {
- g_free (* (gchar * *) widget->cfg);
- * (gchar * *) widget->cfg = g_strdup (value);
+ g_free (* (char * *) widget->cfg);
+ * (char * *) widget->cfg = g_strdup (value);
 }
 else if (widget->cname)
 set_string (widget->csect, widget->cname, value);
@@ -406,12 +406,12 @@
 widget->callback ();
 }
 
-static gchar * widget_get_string (PreferencesWidget * widget)
+static char * widget_get_string (PreferencesWidget * widget)
 {
 g_return_val_if_fail (widget->cfg_type == VALUE_STRING, NULL);
 
 if (widget->cfg)
- return g_strdup (* (gchar * *) widget->cfg);
+ return g_strdup (* (char * *) widget->cfg);
 else if (widget->cname)
 return get_string (widget->csect, widget->cname);
 else
@@ -471,7 +471,7 @@
 if (settings->init)
 settings->init();
 
- const gchar * d = settings->domain;
+ const char * d = settings->domain;
 if (! d)
 {
 printf ("WARNING: PluginPreferences window with title \"%s\" did not "
@@ -550,7 +550,7 @@
 GtkTreeIter iter;
 GdkPixbuf *img;
 CategoryQueueEntry *qlist;
- gint i;
+ int i;
 
 column = gtk_tree_view_column_new();
 gtk_tree_view_column_set_title(column, _("Category"));
@@ -574,7 +574,7 @@
 
 for (i = 0; i < n_categories; i ++)
 {
- gchar * path = g_strdup_printf ("%s/images/%s",
+ char * path = g_strdup_printf ("%s/images/%s",
 get_path (AUD_PATH_DATA_DIR), categories[i].icon_path);
 img = gdk_pixbuf_new_from_file (path, NULL);
 g_free (path);
@@ -608,14 +608,14 @@
 
 static void on_show_filepopup_toggled (GtkToggleButton * button)
 {
- gboolean active = gtk_toggle_button_get_active (button);
+ bool_t active = gtk_toggle_button_get_active (button);
 set_bool (NULL, "show_filepopup_for_tuple", active);
 gtk_widget_set_sensitive (filepopup_settings_button, active);
 }
 
 static void on_filepopup_settings_clicked (void)
 {
- gchar * string = get_string (NULL, "cover_name_include");
+ char * string = get_string (NULL, "cover_name_include");
 gtk_entry_set_text ((GtkEntry *) filepopup_cover_name_include, string);
 g_free (string);
 
@@ -668,7 +668,7 @@
 
 static void on_toggle_button_toggled (GtkToggleButton * button, PreferencesWidget * widget)
 {
- gboolean active = gtk_toggle_button_get_active (button);
+ bool_t active = gtk_toggle_button_get_active (button);
 widget_set_bool (widget, active);
 
 GtkWidget * child = g_object_get_data ((GObject *) button, "child");
@@ -692,63 +692,58 @@
 
 static void on_cbox_changed_int (GtkComboBox * combobox, PreferencesWidget * widget)
 {
- gint position = gtk_combo_box_get_active (combobox);
+ int position = gtk_combo_box_get_active (combobox);
 widget_set_int (widget, GPOINTER_TO_INT (widget->data.combo.elements[position].value));
 }
 
 static void on_cbox_changed_string (GtkComboBox * combobox, PreferencesWidget * widget)
 {
- gint position = gtk_combo_box_get_active (combobox);
+ int position = gtk_combo_box_get_active (combobox);
 widget_set_string (widget, widget->data.combo.elements[position].value);
 }
 
-static void fill_cbox (GtkWidget * combobox, PreferencesWidget * widget)
+static void fill_cbox (GtkWidget * combobox, PreferencesWidget * widget, const char * domain)
 {
- guint i=0,index=0;
-
- for (i = 0; i < widget->data.combo.n_elements; i ++)
+ for (int i = 0; i < widget->data.combo.n_elements; i ++)
 gtk_combo_box_text_append_text ((GtkComboBoxText *) combobox,
- _(widget->data.combo.elements[i].label));
-
- if (widget->data.combo.enabled) {
- switch (widget->cfg_type) {
- case VALUE_INT:
- g_signal_connect(combobox, "changed",
- G_CALLBACK(on_cbox_changed_int), widget);
-
- gint ivalue = widget_get_int (widget);
-
- for(i=0; i<widget->data.combo.n_elements; i++) {
- if (GPOINTER_TO_INT (widget->data.combo.elements[i].value) == ivalue)
- {
- index = i;
- break;
- }
- }
- break;
- case VALUE_STRING:
- g_signal_connect(combobox, "changed",
- G_CALLBACK(on_cbox_changed_string), widget);
-
- gchar * value = widget_get_string (widget);
-
- for(i=0; i<widget->data.combo.n_elements; i++) {
- if (value && ! strcmp ((gchar *) widget->data.combo.elements[i].value, value))
- {
- index = i;
- break;
- }
- }
+ dgettext (domain, widget->data.combo.elements[i].label));
 
- g_free (value);
+ switch (widget->cfg_type)
+ {
+ case VALUE_INT:;
+ int ivalue = widget_get_int (widget);
+
+ for (int i = 0; i < widget->data.combo.n_elements; i++)
+ {
+ if (GPOINTER_TO_INT (widget->data.combo.elements[i].value) == ivalue)
+ {
+ gtk_combo_box_set_active ((GtkComboBox *) combobox, i);
 break;
- default:
+ }
+ }
+
+ g_signal_connect (combobox, "changed", (GCallback) on_cbox_changed_int, (void *) widget);
+ break;
+
+ case VALUE_STRING:;
+ char * value = widget_get_string (widget);
+
+ for(int i = 0; i < widget->data.combo.n_elements; i++)
+ {
+ if (value && ! strcmp (widget->data.combo.elements[i].value, value))
+ {
+ gtk_combo_box_set_active ((GtkComboBox *) combobox, i);
 break;
+ }
 }
- gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), index);
- } else {
- gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), -1);
- gtk_widget_set_sensitive(GTK_WIDGET(combobox), 0);
+
+ g_free (value);
+
+ g_signal_connect (combobox, "changed", (GCallback) on_cbox_changed_string, (void *) widget);
+ break;
+
+ default:
+ break;
 }
 }
 
@@ -915,7 +910,7 @@
 }
 
 static void create_spin_button (PreferencesWidget * widget, GtkWidget * *
- label_pre, GtkWidget * * spin_btn, GtkWidget * * label_past, const gchar *
+ label_pre, GtkWidget * * spin_btn, GtkWidget * * label_past, const char *
 domain)
 {
 g_return_if_fail(widget->type == WIDGET_SPIN_BTN);
@@ -953,7 +948,7 @@
 }
 
 void create_font_btn (PreferencesWidget * widget, GtkWidget * * label,
- GtkWidget * * font_btn, const gchar * domain)
+ GtkWidget * * font_btn, const char * domain)
 {
 *font_btn = gtk_font_button_new();
 gtk_font_button_set_use_font(GTK_FONT_BUTTON(*font_btn), TRUE);
@@ -970,7 +965,7 @@
 gtk_font_button_set_title (GTK_FONT_BUTTON (* font_btn),
 dgettext (domain, widget->data.font_btn.title));
 
- gchar * name = widget_get_string (widget);
+ char * name = widget_get_string (widget);
 if (name)
 {
 gtk_font_button_set_font_name ((GtkFontButton *) * font_btn, name);
@@ -981,7 +976,7 @@
 }
 
 static void create_entry (PreferencesWidget * widget, GtkWidget * * label,
- GtkWidget * * entry, const gchar * domain)
+ GtkWidget * * entry, const char * domain)
 {
 *entry = gtk_entry_new();
 gtk_entry_set_visibility(GTK_ENTRY(*entry), !widget->data.entry.password);
@@ -994,7 +989,7 @@
 
 if (widget->cfg_type == VALUE_STRING)
 {
- gchar * value = widget_get_string (widget);
+ char * value = widget_get_string (widget);
 if (value)
 {
 gtk_entry_set_text ((GtkEntry *) * entry, value);
@@ -1006,7 +1001,7 @@
 }
 
 static void create_label (PreferencesWidget * widget, GtkWidget * * label,
- GtkWidget * * icon, const gchar * domain)
+ GtkWidget * * icon, const char * domain)
 {
 if (widget->data.label.stock_id)
 *icon = gtk_image_new_from_stock(widget->data.label.stock_id, GTK_ICON_SIZE_BUTTON);
@@ -1021,7 +1016,7 @@
 }
 
 static void create_cbox (PreferencesWidget * widget, GtkWidget * * label,
- GtkWidget * * combobox, const gchar * domain)
+ GtkWidget * * combobox, const char * domain)
 {
 * combobox = gtk_combo_box_text_new ();
 
@@ -1029,13 +1024,13 @@
 * label = gtk_label_new (dgettext (domain, widget->label));
 }
 
- fill_cbox (* combobox, widget);
+ fill_cbox (* combobox, widget, domain);
 }
 
-static void fill_table (GtkWidget * table, PreferencesWidget * elements, gint
- amt, const gchar * domain)
+static void fill_table (GtkWidget * table, PreferencesWidget * elements, int
+ amt, const char * domain)
 {
- gint x;
+ int x;
 GtkWidget *widget_left, *widget_middle, *widget_right;
 GtkAttachOptions middle_policy = (GtkAttachOptions) (0);
 
@@ -1089,11 +1084,11 @@
 }
 
 /* void create_widgets_with_domain (GtkBox * box, PreferencesWidget * widgets,
- gint amt, const gchar * domain) */
-void create_widgets_with_domain (void * box, PreferencesWidget * widgets, gint
- amt, const gchar * domain)
+ int amt, const char * domain) */
+void create_widgets_with_domain (void * box, PreferencesWidget * widgets, int
+ amt, const char * domain)
 {
- gint x;
+ int x;
 GtkWidget *alignment = NULL, *widget = NULL;
 GtkWidget *child_box = NULL;
 GSList *radio_btn_group = NULL;
@@ -1233,7 +1228,7 @@
 
 widget = gtk_notebook_new();
 
- gint i;
+ int i;
 for (i = 0; i<widgets[x].data.notebook.n_tabs; i++) {
 GtkWidget *vbox;
 vbox = gtk_vbox_new(FALSE, 5);
@@ -1272,7 +1267,7 @@
 create_titlestring_tag_menu(void)
 {
 GtkWidget *titlestring_tag_menu, *menu_item;
- guint i;
+ unsigned int i;
 
 titlestring_tag_menu = gtk_menu_new();
 for(i = 0; i < n_title_field_tags; i++) {
@@ -1290,37 +1285,27 @@
 static void show_numbers_cb (GtkToggleButton * numbers, void * unused)
 {
 set_bool (NULL, "show_numbers_in_pl", gtk_toggle_button_get_active (numbers));
-
+ playlist_reformat_titles ();
 hook_call ("title change", NULL);
-
- /* trigger playlist update */
- gchar * t = playlist_get_title (playlist_get_active ());
- playlist_set_title (playlist_get_active (), t);
- g_free (t);
 }
 
 static void leading_zero_cb (GtkToggleButton * leading)
 {
 set_bool (NULL, "leading_zero", gtk_toggle_button_get_active (leading));
-
+ playlist_reformat_titles ();
 hook_call ("title change", NULL);
-
- /* trigger playlist update */
- gchar * t = playlist_get_title (playlist_get_active ());
- playlist_set_title (playlist_get_active (), t);
- g_free (t);
 }
 
 static void create_titlestring_widgets (GtkWidget * * cbox, GtkWidget * * entry)
 {
 * cbox = gtk_combo_box_text_new ();
- for (gint i = 0; i < TITLESTRING_NPRESETS; i ++)
+ for (int i = 0; i < TITLESTRING_NPRESETS; i ++)
 gtk_combo_box_text_append_text ((GtkComboBoxText *) * cbox, _(titlestring_preset_names[i]));
 gtk_combo_box_text_append_text ((GtkComboBoxText *) * cbox, _("Custom"));
 
 * entry = gtk_entry_new ();
 
- gchar * format = get_string (NULL, "generic_title_format");
+ char * format = get_string (NULL, "generic_title_format");
 update_titlestring_cbox ((GtkComboBox *) * cbox, format);
 gtk_entry_set_text ((GtkEntry *) * entry, format);
 g_free (format);
@@ -1487,7 +1472,7 @@
 
 static GtkWidget * output_config_button, * output_about_button;
 
-static gboolean output_enum_cb (PluginHandle * plugin, GList * * list)
+static bool_t output_enum_cb (PluginHandle * plugin, GList * * list)
 {
 * list = g_list_prepend (* list, plugin);
 return TRUE;
@@ -1538,6 +1523,8 @@
 g_return_if_fail (op != NULL);
 if (op->configure != NULL)
 op->configure ();
+ else if (op->settings != NULL)
+ plugin_preferences_show (op->settings);
 }
 
 static void output_do_about (void)
@@ -1608,17 +1595,17 @@
 GtkWidget * notebook = gtk_notebook_new ();
 gtk_container_add ((GtkContainer *) category_notebook, notebook);
 
- gint types[] = {PLUGIN_TYPE_TRANSPORT, PLUGIN_TYPE_PLAYLIST,
+ int types[] = {PLUGIN_TYPE_TRANSPORT, PLUGIN_TYPE_PLAYLIST,
 PLUGIN_TYPE_INPUT, PLUGIN_TYPE_EFFECT, PLUGIN_TYPE_VIS, PLUGIN_TYPE_GENERAL};
- const gchar * names[] = {N_("Transport"), N_("Playlist"), N_("Input"),
+ const char * names[] = {N_("Transport"), N_("Playlist"), N_("Input"),
 N_("Effect"), N_("Visualization"), N_("General")};
 
- for (gint i = 0; i < G_N_ELEMENTS (types); i ++)
+ for (int i = 0; i < G_N_ELEMENTS (types); i ++)
 gtk_notebook_append_page ((GtkNotebook *) notebook, plugin_view_new
 (types[i]), gtk_label_new (_(names[i])));
 }
 
-static gboolean
+static bool_t
 prefswin_destroy(GtkWidget *window, GdkEvent *event, gpointer data)
 {
 prefswin = NULL;
@@ -1632,7 +1619,7 @@
 /* GtkWidget * * create_prefs_window (void) */
 void * * create_prefs_window (void)
 {
- gchar *aud_version_string;
+ char *aud_version_string;
 
 GtkWidget *vbox;
 GtkWidget *hbox1;
@@ -1758,8 +1745,8 @@
 gtk_widget_hide(GTK_WIDGET(prefswin));
 }
 
-static void prefswin_page_queue_new (GtkWidget * container, const gchar * name,
- const gchar * imgurl)
+static void prefswin_page_queue_new (GtkWidget * container, const char * name,
+ const char * imgurl)
 {
 CategoryQueueEntry *ent = g_new0(CategoryQueueEntry, 1);
 
@@ -1791,16 +1778,16 @@
 *
 * - nenolod
 */
-/* gint prefswin_page_new (GtkWidget * container, const gchar * name,
- const gchar * imgurl) */
-gint prefswin_page_new (void * container, const gchar * name, const gchar *
+/* int prefswin_page_new (GtkWidget * container, const char * name,
+ const char * imgurl) */
+int prefswin_page_new (void * container, const char * name, const char *
 imgurl)
 {
 GtkTreeModel *model;
 GtkTreeIter iter;
 GdkPixbuf *img = NULL;
 GtkTreeView *treeview = GTK_TREE_VIEW(category_treeview);
- gint id;
+ int id;
 
 if (treeview == NULL || category_notebook == NULL)
 {
@@ -1844,9 +1831,9 @@
 GtkTreeModel *model;
 GtkTreeIter iter;
 GtkTreeView *treeview = GTK_TREE_VIEW(category_treeview);
- gboolean ret;
- gint id;
- gint index = -1;
+ bool_t ret;
+ int id;
+ int index = -1;
 
 if (category_notebook == NULL || treeview == NULL || container == NULL)
 return;
@@ -1888,7 +1875,7 @@
 
 static void sw_volume_toggled (void)
 {
- gint vol[2];
+ int vol[2];
 
 if (get_bool (NULL, "software_volume_control"))
 {

audacious-3.1.1.tar.bz2/src/audacious/ui_preferences.h -> audacious-3.2.4.tar.bz2/src/audacious/ui_preferences.h Changed

audacious-3.1.1.tar.bz2/src/audacious/util.c -> audacious-3.2.4.tar.bz2/src/audacious/util.c Changed

@@ -24,14 +24,15 @@
 */
 
 #include <dirent.h>
+#include <sys/stat.h>
 #include <unistd.h>
 
 #ifdef _WIN32
 #include <windows.h>
 #endif
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
+#ifdef __APPLE__
+#include <mach-o/dyld.h>
 #endif
 
 #include <glib.h>
@@ -42,15 +43,15 @@
 #include <errno.h>
 
 #include <libaudcore/audstrings.h>
-#include <libaudcore/stringpool.h>
 
+#include "config.h"
 #include "debug.h"
 #include "i18n.h"
 #include "misc.h"
 #include "plugins.h"
 #include "util.h"
 
-gboolean dir_foreach (const gchar * path, DirForeachFunc func, void * user)
+bool_t dir_foreach (const char * path, DirForeachFunc func, void * user)
 {
 DIR * dir = opendir (path);
 if (! dir)
@@ -62,8 +63,8 @@
 if (entry->d_name[0] == '.')
 continue;
 
- gchar * full = g_strdup_printf ("%s" G_DIR_SEPARATOR_S "%s", path, entry->d_name);
- gboolean stop = func (full, entry->d_name, user);
+ char * full = g_strdup_printf ("%s" G_DIR_SEPARATOR_S "%s", path, entry->d_name);
+ bool_t stop = func (full, entry->d_name, user);
 g_free (full);
 
 if (stop)
@@ -74,37 +75,34 @@
 return TRUE;
 }
 
-gchar * construct_uri (const gchar * string, const gchar * playlist_name)
+char * construct_uri (const char * string, const char * playlist_name)
 {
- gchar *filename = g_strdup(string);
- gchar *uri = NULL;
-
- /* try to translate dos path */
- convert_dos_path(filename); /* in place replacement */
-
- // make full path uri here
- // case 1: filename is raw full path or uri
- if (filename[0] == '/' || strstr(filename, "://")) {
- uri = g_filename_to_uri(filename, NULL, NULL);
- if(!uri)
- uri = g_strdup(filename);
- }
- // case 2: filename is not raw full path nor uri
- // make full path by replacing last part of playlist path with filename.
- else
- {
- const gchar * slash = strrchr (playlist_name, '/');
- if (slash)
- uri = g_strdup_printf ("%.*s/%s", (gint) (slash - playlist_name),
- playlist_name, filename);
- }
+ /* URI */
+ if (strstr (string, "://"))
+ return strdup (string);
+
+ /* absolute filename (assumed UTF-8) */
+#ifdef _WIN32
+ if (string[0] && string[1] == ':' && string[2] == '\\')
+#else
+ if (string[0] == '/')
+#endif
+ return filename_to_uri (string);
 
- g_free (filename);
- return uri;
+ /* relative filename (assumed UTF-8) */
+ const char * slash = strrchr (playlist_name, '/');
+ if (! slash)
+ return NULL;
+
+ int pathlen = slash + 1 - playlist_name;
+ char buf[pathlen + 3 * strlen (string) + 1];
+ memcpy (buf, playlist_name, pathlen);
+ str_encode_percent (string, -1, buf + pathlen);
+ return strdup (buf);
 }
 
 /* local files -- not URI's */
-gint file_get_mtime (const gchar * filename)
+int file_get_mtime (const char * filename)
 {
 struct stat info;
 
@@ -115,7 +113,7 @@
 }
 
 void
-make_directory(const gchar * path, mode_t mode)
+make_directory(const char * path, mode_t mode)
 {
 if (g_mkdir_with_parents(path, mode) == 0)
 return;
@@ -124,15 +122,52 @@
 g_strerror(errno));
 }
 
-gchar * get_path_to_self (void)
+char * write_temp_file (void * data, int64_t len)
+{
+ char * name = g_strdup_printf ("%s/audacious-temp-XXXXXX", g_get_tmp_dir ());
+
+ int handle = g_mkstemp (name);
+ if (handle < 0)
+ {
+ fprintf (stderr, "Error creating temporary file: %s\n", strerror (errno));
+ g_free (name);
+ return NULL;
+ }
+
+ while (len)
+ {
+ int64_t written = write (handle, data, len);
+ if (written < 0)
+ {
+ fprintf (stderr, "Error writing %s: %s\n", name, strerror (errno));
+ close (handle);
+ g_free (name);
+ return NULL;
+ }
+
+ data = (char *) data + written;
+ len -= written;
+ }
+
+ if (close (handle) < 0)
+ {
+ fprintf (stderr, "Error closing %s: %s\n", name, strerror (errno));
+ g_free (name);
+ return NULL;
+ }
+
+ return name;
+}
+
+char * get_path_to_self (void)
 {
 #if defined _WIN32 || defined HAVE_PROC_SELF_EXE
- gint size = 256;
- gchar * buf = g_malloc (size);
+ int size = 256;
+ char * buf = g_malloc (size);
 
 while (1)
 {
- gint len;
+ int len;
 
 #ifdef _WIN32
 if (! (len = GetModuleFileName (NULL, buf, size)))
@@ -164,40 +199,40 @@
 #endif
 }
 
-/* Strips various common top-level folders from a file name (not URI). The
- * string passed will not be modified, but the string returned will share the
- * same memory. Examples:
- * "/home/john/folder/file.mp3" -> "folder/file.mp3"
- * "/folder/file.mp3" -> "folder/file.mp3"
- * "C:\Users\John\folder\file.mp3" -> "folder\file.mp3"
- * "E:\folder\file.mp3" -> "folder\file.mp3" */
+/* Strips various common top-level folders from a URI. The string passed will
+ * not be modified, but the string returned will share the same memory.
+ * Examples:
+ * "file:///home/john/folder/file.mp3" -> "folder/file.mp3"
+ * "file:///folder/file.mp3" -> "folder/file.mp3" */
 
-static gchar * skip_top_folders (gchar * name)
+static char * skip_top_folders (char * name)
 {
- const gchar * home = getenv ("HOME");
+ static char * home;
+ static int len;
+
 if (! home)
- goto NO_HOME;
+ {
+ home = filename_to_uri (g_get_home_dir ());
+ len = strlen (home);
 
- gint len = strlen (home);
- if (len > 0 && home[len - 1] == G_DIR_SEPARATOR)
- len --;
+ if (len > 0 && home[len - 1] == '/')
+ len --;
+ }
 
 #ifdef _WIN32
- if (! strncasecmp (name, home, len) && name[len] == '\\')
+ if (! g_ascii_strncasecmp (name, home, len) && name[len] == '/')
 #else
 if (! strncmp (name, home, len) && name[len] == '/')
 #endif
 return name + len + 1;
 
-NO_HOME:
-#ifdef _WIN32
- return (name[0] && name[1] == ':' && name[2] == '\\') ? name + 3 : name;
-#else
- return (name[0] == '/') ? name + 1 : name;
-#endif
+ if (! strncmp (name, "file:///", 8))
+ return name + 8;
+
+ return name;
 }
 
-/* Divides a file name (not URI) into the base name, the lowest folder, and the
+/* Divides a URI into the base name, the lowest folder, and the
 * second lowest folder. The string passed will be modified, and the strings
 * returned will use the same memory. May return NULL for <first> and <second>.
 * Examples:
@@ -205,14 +240,14 @@
 * "d/e.mp3" -> "e", "d", NULL
 * "e.mp3" -> "e", NULL, NULL */
 
-static void split_filename (gchar * name, gchar * * base, gchar * * first,
- gchar * * second)
+static void split_filename (char * name, char * * base, char * * first,
+ char * * second)
 {
 * first = * second = NULL;
 
- gchar * c;
+ char * c;
 
- if ((c = strrchr (name, G_DIR_SEPARATOR)))
+ if ((c = strrchr (name, '/')))
 {
 * base = c + 1;
 * c = 0;
@@ -223,7 +258,7 @@
 goto DONE;
 }
 
- if ((c = strrchr (name, G_DIR_SEPARATOR)))
+ if ((c = strrchr (name, '/')))
 {
 * first = c + 1;
 * c = 0;
@@ -234,7 +269,7 @@
 goto DONE;
 }
 
- if ((c = strrchr (name, G_DIR_SEPARATOR)))
+ if ((c = strrchr (name, '/')))
 * second = c + 1;
 else
 * second = name;
@@ -250,7 +285,7 @@
 * "http://some.domain.org/folder/file.mp3" -> "some.domain.org"
 * "http://some.stream.fm:8000" -> "some.stream.fm" */
 
-static gchar * stream_name (gchar * name)
+static char * stream_name (char * name)
 {
 if (! strncmp (name, "http://", 7))
 name += 7;
@@ -261,7 +296,7 @@
 else
 return NULL;
 
- gchar * c;
+ char * c;
 
 if ((c = strchr (name, '/')))
 * c = 0;
@@ -273,47 +308,66 @@
 return name;
 }
 
+static char * get_nonblank_field (const Tuple * tuple, int field)
+{
+ char * str = tuple ? tuple_get_str (tuple, field, NULL) : NULL;
+
+ if (str && ! str[0])
+ {
+ str_unref (str);
+ str = NULL;
+ }
+
+ return str;
+}
+
+static char * str_get_decoded (char * str)
+{
+ if (! str)
+ return NULL;
+
+ str_decode_percent (str, -1, str);
+ return str_get (str);
+}
+
 /* Derives best guesses of title, artist, and album from a file name (URI) and
 * tuple (which may be NULL). The returned strings are stringpooled or NULL. */
 
-void describe_song (const gchar * name, const Tuple * tuple, gchar * * _title,
- gchar * * _artist, gchar * * _album)
+void describe_song (const char * name, const Tuple * tuple, char * * _title,
+ char * * _artist, char * * _album)
 {
 /* Common folder names to skip */
- static const gchar * const skip[] = {"music"};
-
- const gchar * title = tuple ? tuple_get_string (tuple, FIELD_TITLE, NULL) : NULL;
- const gchar * artist = tuple ? tuple_get_string (tuple, FIELD_ARTIST, NULL) : NULL;
- const gchar * album = tuple ? tuple_get_string (tuple, FIELD_ALBUM, NULL) : NULL;
+ static const char * const skip[] = {"music"};
 
- if (title && ! title[0])
- title = NULL;
- if (artist && ! artist[0])
- artist = NULL;
- if (album && ! album[0])
- album = NULL;
-
- gchar * copy = NULL;
+ char * title = get_nonblank_field (tuple, FIELD_TITLE);
+ char * artist = get_nonblank_field (tuple, FIELD_ARTIST);
+ char * album = get_nonblank_field (tuple, FIELD_ALBUM);
 
 if (title && artist && album)
- goto DONE;
+ {
+DONE:
+ * _title = title;
+ * _artist = artist;
+ * _album = album;
+ return;
+ }
 
- copy = uri_to_display (name);
+ char buf[strlen (name) + 1];
+ memcpy (buf, name, sizeof buf);
 
- if (! strncmp (name, "file://", 7))
+ if (! strncmp (buf, "file:///", 8))
 {
- gchar * base, * first, * second;
- split_filename (skip_top_folders (copy), & base, & first,
- & second);
+ char * base, * first, * second;
+ split_filename (skip_top_folders (buf), & base, & first, & second);
 
 if (! title)
- title = base;
+ title = str_get_decoded (base);
 
- for (gint i = 0; i < G_N_ELEMENTS (skip); i ++)
+ for (int i = 0; i < G_N_ELEMENTS (skip); i ++)
 {
- if (first && ! strcasecmp (first, skip[i]))
+ if (first && ! g_ascii_strcasecmp (first, skip[i]))
 first = NULL;
- if (second && ! strcasecmp (second, skip[i]))
+ if (second && ! g_ascii_strcasecmp (second, skip[i]))
 second = NULL;
 }
 
@@ -321,29 +375,29 @@
 {
 if (second && ! artist && ! album)
 {
- artist = second;
- album = first;
+ artist = str_get_decoded (second);
+ album = str_get_decoded (first);
 }
 else if (! artist)
- artist = first;
+ artist = str_get_decoded (first);
 else if (! album)
- album = first;
+ album = str_get_decoded (first);
 }
 }
 else
 {
 if (! title)
- title = stream_name (copy);
+ {
+ title = str_get_decoded (stream_name (buf));
+
+ if (! title)
+ title = str_get_decoded (buf);
+ }
 else if (! artist)
- artist = stream_name (copy);
+ artist = str_get_decoded (stream_name (buf));
 else if (! album)
- album = stream_name (copy);
+ album = str_get_decoded (stream_name (buf));
 }
 
-DONE:
- * _title = title ? stringpool_get ((gchar *) title, FALSE) : NULL;
- * _artist = artist ? stringpool_get ((gchar *) artist, FALSE) : NULL;
- * _album = album ? stringpool_get ((gchar *) album, FALSE) : NULL;
-
- g_free (copy);
+ goto DONE;
 }

audacious-3.1.1.tar.bz2/src/audacious/util.h -> audacious-3.2.4.tar.bz2/src/audacious/util.h Changed

@@ -27,20 +27,21 @@
 #define AUDACIOUS_UTIL_H
 
 #include <sys/types.h>
-#include <glib.h>
+#include <libaudcore/core.h>
 
-typedef gboolean(*DirForeachFunc) (const gchar * path,
- const gchar * basename,
+typedef bool_t(*DirForeachFunc) (const char * path,
+ const char * basename,
 gpointer user_data);
 
-gboolean dir_foreach (const gchar * path, DirForeachFunc func, void * user_data);
+bool_t dir_foreach (const char * path, DirForeachFunc func, void * user_data);
 
-gint file_get_mtime (const gchar * filename);
-void make_directory(const gchar * path, mode_t mode);
+int file_get_mtime (const char * filename);
+void make_directory(const char * path, mode_t mode);
+char * write_temp_file (void * data, int64_t len);
 
-gchar * get_path_to_self (void);
+char * get_path_to_self (void);
 
-void describe_song (const gchar * filename, const Tuple * tuple,
- gchar * * title, gchar * * artist, gchar * * album);
+void describe_song (const char * filename, const Tuple * tuple,
+ char * * title, char * * artist, char * * album);
 
 #endif /* AUDACIOUS_UTIL_H */

audacious-3.1.1.tar.bz2/src/audacious/vis_runner.c -> audacious-3.2.4.tar.bz2/src/audacious/vis_runner.c Changed

@@ -20,6 +20,8 @@
 */
 
 #include <glib.h>
+#include <pthread.h>
+#include <string.h>
 
 #include "output.h"
 #include "vis_runner.h"
@@ -28,18 +30,18 @@
 #define INTERVAL 30 /* milliseconds */
 
 typedef struct {
- gint time;
- gfloat * data;
- gint channels;
+ int time;
+ float * data;
+ int channels;
 } VisNode;
 
-G_LOCK_DEFINE_STATIC (mutex);
-static gboolean enabled = FALSE;
-static gboolean playing = FALSE, paused = FALSE, active = FALSE;
+static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+static bool_t enabled = FALSE;
+static bool_t playing = FALSE, paused = FALSE, active = FALSE;
 static VisNode * current_node = NULL;
-static gint current_frames;
+static int current_frames;
 static GQueue vis_list = G_QUEUE_INIT;
-static gint send_source = 0, clear_source = 0;
+static int send_source = 0, clear_source = 0;
 
 static void vis_node_free (VisNode * node)
 {
@@ -47,17 +49,17 @@
 g_free (node);
 }
 
-static gboolean send_audio (void * unused)
+static bool_t send_audio (void * unused)
 {
- G_LOCK (mutex);
+ pthread_mutex_lock (& mutex);
 
 if (! send_source)
 {
- G_UNLOCK (mutex);
+ pthread_mutex_unlock (& mutex);
 return FALSE;
 }
 
- gint outputted = get_raw_output_time ();
+ int outputted = get_raw_output_time ();
 
 VisNode * vis_node = NULL;
 VisNode * next;
@@ -77,7 +79,7 @@
 vis_node = g_queue_pop_head (& vis_list);
 }
 
- G_UNLOCK (mutex);
+ pthread_mutex_unlock (& mutex);
 
 if (! vis_node)
 return TRUE;
@@ -88,32 +90,32 @@
 return TRUE;
 }
 
-static gboolean send_clear (void * unused)
+static bool_t send_clear (void * unused)
 {
- G_LOCK (mutex);
+ pthread_mutex_lock (& mutex);
 clear_source = 0;
- G_UNLOCK (mutex);
+ pthread_mutex_unlock (& mutex);
 
 vis_send_clear ();
 
 return FALSE;
 }
 
-static gboolean locked = FALSE;
+static bool_t locked = FALSE;
 
 void vis_runner_lock (void)
 {
- G_LOCK (mutex);
+ pthread_mutex_lock (& mutex);
 locked = TRUE;
 }
 
 void vis_runner_unlock (void)
 {
 locked = FALSE;
- G_UNLOCK (mutex);
+ pthread_mutex_unlock (& mutex);
 }
 
-gboolean vis_runner_locked (void)
+bool_t vis_runner_locked (void)
 {
 return locked;
 }
@@ -133,7 +135,7 @@
 clear_source = g_timeout_add (0, send_clear, NULL);
 }
 
-void vis_runner_start_stop (gboolean new_playing, gboolean new_paused)
+void vis_runner_start_stop (bool_t new_playing, bool_t new_paused)
 {
 playing = new_playing;
 paused = new_paused;
@@ -157,8 +159,8 @@
 send_source = g_timeout_add (INTERVAL, send_audio, NULL);
 }
 
-void vis_runner_pass_audio (gint time, gfloat * data, gint samples, gint
- channels, gint rate)
+void vis_runner_pass_audio (int time, float * data, int samples, int
+ channels, int rate)
 {
 if (! active)
 return;
@@ -173,13 +175,13 @@
 current_node = NULL;
 }
 
- gint at = 0;
+ int at = 0;
 
 while (1)
 {
 if (! current_node)
 {
- gint node_time = time;
+ int node_time = time;
 VisNode * last;
 
 /* There is no partly-built node, so start a new one. Normally
@@ -192,7 +194,7 @@
 if ((last = g_queue_peek_tail (& vis_list)))
 node_time = last->time + INTERVAL;
 
- at = channels * (gint) ((gint64) (node_time - time) * rate / 1000);
+ at = channels * (int) ((int64_t) (node_time - time) * rate / 1000);
 
 if (at < 0)
 at = 0;
@@ -201,7 +203,7 @@
 
 current_node = g_malloc (sizeof (VisNode));
 current_node->time = node_time;
- current_node->data = g_malloc (sizeof (gfloat) * channels * 512);
+ current_node->data = g_malloc (sizeof (float) * channels * 512);
 current_node->channels = channels;
 current_frames = 0;
 }
@@ -211,8 +213,8 @@
 * wait for more data to be passed in the next call. If we do fill the
 * node, we loop and start building a new one. */
 
- gint copy = MIN (samples - at, channels * (512 - current_frames));
- memcpy (current_node->data + channels * current_frames, data + at, sizeof (gfloat) * copy);
+ int copy = MIN (samples - at, channels * (512 - current_frames));
+ memcpy (current_node->data + channels * current_frames, data + at, sizeof (float) * copy);
 current_frames += copy / channels;
 
 if (current_frames < 512)
@@ -228,7 +230,7 @@
 vis_node->time += GPOINTER_TO_INT (offset);
 }
 
-void vis_runner_time_offset (gint offset)
+void vis_runner_time_offset (int offset)
 {
 if (current_node)
 current_node->time += offset;
@@ -236,10 +238,10 @@
 g_queue_foreach (& vis_list, (GFunc) time_offset_cb, GINT_TO_POINTER (offset));
 }
 
-void vis_runner_enable (gboolean enable)
+void vis_runner_enable (bool_t enable)
 {
- G_LOCK (mutex);
+ pthread_mutex_lock (& mutex);
 enabled = enable;
 vis_runner_start_stop (playing, paused);
- G_UNLOCK (mutex);
+ pthread_mutex_unlock (& mutex);
 }

audacious-3.1.1.tar.bz2/src/audacious/vis_runner.h -> audacious-3.2.4.tar.bz2/src/audacious/vis_runner.h Changed

@@ -22,7 +22,7 @@
 #ifndef AUD_VIS_RUNNER_H
 #define AUD_VIS_RUNNER_H
 
-#include <glib.h>
+#include <libaudcore/core.h>
 
 /* When the decoder thread wants to send data to the vis runner, it must block
 * the vis timeout before blocking output functions; otherwise, the vis timeout
@@ -30,14 +30,14 @@
 * decoder thread hangs up waiting for the vis timeout to finish. */
 void vis_runner_lock (void);
 void vis_runner_unlock (void);
-gboolean vis_runner_locked (void);
+bool_t vis_runner_locked (void);
 
-void vis_runner_start_stop (gboolean playing, gboolean paused);
-void vis_runner_pass_audio (gint time, gfloat * data, gint samples, gint
- channels, gint rate);
-void vis_runner_time_offset (gint offset);
+void vis_runner_start_stop (bool_t playing, bool_t paused);
+void vis_runner_pass_audio (int time, float * data, int samples, int
+ channels, int rate);
+void vis_runner_time_offset (int offset);
 void vis_runner_flush (void);
 
-void vis_runner_enable (gboolean enable);
+void vis_runner_enable (bool_t enable);
 
 #endif

audacious-3.1.1.tar.bz2/src/audacious/visualization.c -> audacious-3.2.4.tar.bz2/src/audacious/visualization.c Changed

@@ -41,24 +41,24 @@
 GtkWidget * widget;
 } LoadedVis;
 
-static gint running = FALSE;
+static int running = FALSE;
 static GList * loaded_vis_plugins = NULL;
 
-void vis_func_add (gint type, GCallback func)
+void vis_func_add (int type, GCallback func)
 {
 g_return_if_fail (type >= 0 && type < AUD_VIS_TYPES);
- vis_funcs[type] = g_list_prepend (vis_funcs[type], func);
+ vis_funcs[type] = g_list_prepend (vis_funcs[type], (void *) func);
 
 vis_runner_enable (TRUE);
 }
 
 void vis_func_remove (GCallback func)
 {
- gboolean disable = TRUE;
+ bool_t disable = TRUE;
 
- for (gint i = 0; i < AUD_VIS_TYPES; i ++)
+ for (int i = 0; i < AUD_VIS_TYPES; i ++)
 {
- vis_funcs[i] = g_list_remove_all (vis_funcs[i], func);
+ vis_funcs[i] = g_list_remove_all (vis_funcs[i], (void *) func);
 if (vis_funcs[i])
 disable = FALSE;
 }
@@ -76,13 +76,13 @@
 }
 }
 
-static void pcm_to_mono (const gfloat * data, gfloat * mono, gint channels)
+static void pcm_to_mono (const float * data, float * mono, int channels)
 {
 if (channels == 1)
- memcpy (mono, data, sizeof (gfloat) * 512);
+ memcpy (mono, data, sizeof (float) * 512);
 else
 {
- gfloat * set = mono;
+ float * set = mono;
 while (set < & mono[512])
 {
 * set ++ = (data[0] + data[1]) / 2;
@@ -91,10 +91,10 @@
 }
 }
 
-void vis_send_audio (const gfloat * data, gint channels)
+void vis_send_audio (const float * data, int channels)
 {
- gfloat mono[512];
- gfloat freq[256];
+ float mono[512];
+ float freq[256];
 
 if (vis_funcs[AUD_VIS_TYPE_MONO_PCM] || vis_funcs[AUD_VIS_TYPE_FREQ])
 pcm_to_mono (data, mono, channels);
@@ -103,24 +103,24 @@
 
 for (GList * node = vis_funcs[AUD_VIS_TYPE_MONO_PCM]; node; node = node->next)
 {
- void (* func) (const gfloat *) = (void (*) (const gfloat *)) node->data;
+ void (* func) (const float *) = (void (*) (const float *)) node->data;
 func (mono);
 }
 
 for (GList * node = vis_funcs[AUD_VIS_TYPE_MULTI_PCM]; node; node = node->next)
 {
- void (* func) (const gfloat *, gint) = (void (*) (const gfloat *, gint)) node->data;
+ void (* func) (const float *, int) = (void (*) (const float *, int)) node->data;
 func (data, channels);
 }
 
 for (GList * node = vis_funcs[AUD_VIS_TYPE_FREQ]; node; node = node->next)
 {
- void (* func) (const gfloat *) = (void (*) (const gfloat *)) node->data;
+ void (* func) (const float *) = (void (*) (const float *)) node->data;
 func (freq);
 }
 }
 
-static gint vis_find_cb (LoadedVis * vis, PluginHandle * plugin)
+static int vis_find_cb (LoadedVis * vis, PluginHandle * plugin)
 {
 return (vis->plugin == plugin) ? 0 : -1;
 }
@@ -195,7 +195,7 @@
 g_slice_free (LoadedVis, vis);
 }
 
-static gboolean vis_init_cb (PluginHandle * plugin)
+static bool_t vis_init_cb (PluginHandle * plugin)
 {
 vis_load (plugin);
 return TRUE;
@@ -222,7 +222,7 @@
 g_list_foreach (loaded_vis_plugins, (GFunc) vis_cleanup_cb, NULL);
 }
 
-gboolean vis_plugin_start (PluginHandle * plugin)
+bool_t vis_plugin_start (PluginHandle * plugin)
 {
 VisPlugin * vp = plugin_get_header (plugin);
 g_return_val_if_fail (vp != NULL, FALSE);

audacious-3.1.1.tar.bz2/src/audacious/visualization.h -> audacious-3.2.4.tar.bz2/src/audacious/visualization.h Changed

audacious-3.1.1.tar.bz2/src/audtool/Makefile -> audacious-3.2.4.tar.bz2/src/audtool/Makefile Changed

audacious-3.1.1.tar.bz2/src/audtool/audtool.h -> audacious-3.2.4.tar.bz2/src/audtool/audtool.h Changed

audacious-3.1.1.tar.bz2/src/audtool/handlers_equalizer.c -> audacious-3.2.4.tar.bz2/src/audtool/handlers_equalizer.c Changed

audacious-3.1.1.tar.bz2/src/audtool/handlers_general.c -> audacious-3.2.4.tar.bz2/src/audtool/handlers_general.c Changed

audacious-3.1.1.tar.bz2/src/audtool/handlers_playback.c -> audacious-3.2.4.tar.bz2/src/audtool/handlers_playback.c Changed

audacious-3.1.1.tar.bz2/src/audtool/handlers_playlist.c -> audacious-3.2.4.tar.bz2/src/audtool/handlers_playlist.c Changed

audacious-3.1.1.tar.bz2/src/audtool/handlers_playqueue.c -> audacious-3.2.4.tar.bz2/src/audtool/handlers_playqueue.c Changed

audacious-3.1.1.tar.bz2/src/audtool/handlers_vitals.c -> audacious-3.2.4.tar.bz2/src/audtool/handlers_vitals.c Changed

audacious-3.1.1.tar.bz2/src/audtool/main.c -> audacious-3.2.4.tar.bz2/src/audtool/main.c Changed

@@ -29,10 +29,10 @@
 * POSSIBILITY OF SUCH DAMAGE.
 */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include <mowgli.h>
 #include <locale.h>
 #include "libaudclient/audctrl.h"
 #include "audtool.h"
@@ -143,7 +143,6 @@
 	{NULL, NULL, NULL, 0}
 };
 
-mowgli_error_context_t *e = NULL;
 DBusGProxy *dbus_proxy = NULL;
 static DBusGConnection *connection = NULL;
 
@@ -152,13 +151,13 @@
 {
 	GError *error = NULL;
 
-	mowgli_error_context_push(e, "While attempting to connect to the D-Bus session bus");
 	connection = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
 
 	if (connection == NULL)
-		mowgli_error_context_display_with_error(e, ":\n * ", g_strdup_printf("D-Bus Error: %s", error->message));
-
-	mowgli_error_context_pop(e);
+	{
+		fprintf (stderr, "D-Bus Error: %s\n", error->message);
+		exit (EXIT_FAILURE);
+	}
 
 	dbus_proxy = dbus_g_proxy_new_for_name(connection, AUDACIOUS_DBUS_SERVICE,
 AUDACIOUS_DBUS_PATH,
@@ -179,18 +178,14 @@
 
 	setlocale(LC_CTYPE, "");
 	g_type_init();
-	mowgli_init();
-
-	e = mowgli_error_context_create();
-	mowgli_error_context_push(e, "In program %s", argv[0]);
 
 	audtool_connect();
 
-	mowgli_error_context_push(e, "While processing the commandline");
-
 	if (argc < 2)
-		mowgli_error_context_display_with_error (e, ":\n * ", "not enough "
- "parameters, use \'audtool help\' for more information.");
+	{
+		fprintf (stderr, "Not enough parameters. Try \"audtool help\".\n");
+		exit (EXIT_FAILURE);
+	}
 
 	for (j = 1; j < argc; j++)
 	{
@@ -211,9 +206,10 @@
 	}
 
 	if (k == 0)
-		mowgli_error_context_display_with_error (e, ":\n * ", g_strdup_printf
- ("Unknown command '%s' encountered, use \'audtool help\' for a "
- "command list.", argv[1]));
+	{
+		fprintf (stderr, "Unknown command \"%s\". Try \"audtool help\".\n", argv[1]);
+		exit (EXIT_FAILURE);
+	}
 
 	audtool_disconnect();

audacious-3.1.1.tar.bz2/src/audtool/report.c -> audacious-3.2.4.tar.bz2/src/audtool/report.c Changed

audacious-3.1.1.tar.bz2/src/libaudclient/Makefile -> audacious-3.2.4.tar.bz2/src/libaudclient/Makefile Changed

audacious-3.1.1.tar.bz2/src/libaudclient/audctrl.c -> audacious-3.2.4.tar.bz2/src/libaudclient/audctrl.c Changed

@@ -15,10 +15,6 @@
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <stdlib.h>
 #include <glib.h>
 #include <string.h>
@@ -26,6 +22,7 @@
 #include "audacious/dbus.h"
 #include "audacious/dbus-client-bindings.h"
 #include "audctrl.h"
+#include "config.h"
 
 static GError *error = NULL; //it must be hidden from outside, otherwise symbol conflict likely to happen.
 
@@ -38,7 +35,7 @@
 * @param[in] num Number of URIs to add.
 * @param[in] enqueue Whether or not the new playlist should be added on, or replace the current playlist.
 **/
-void audacious_remote_playlist(DBusGProxy *proxy, gchar **list, gint num, gboolean enqueue) {
+EXPORT void audacious_remote_playlist(DBusGProxy *proxy, gchar **list, gint num, gboolean enqueue) {
 GList *glist = NULL;
 gchar **data = list;
 
@@ -69,7 +66,7 @@
 * @param[in] proxy DBus proxy for audacious
 * @return String describing the version of Audacious.
 **/
-gchar *audacious_remote_get_version(DBusGProxy *proxy) {
+EXPORT gchar *audacious_remote_get_version(DBusGProxy *proxy) {
 char *string = NULL;
 org_atheme_audacious_version(proxy, &string, &error);
 g_clear_error(&error);
@@ -83,7 +80,7 @@
 * @param[in] proxy DBus proxy for audacious
 * @param[in] list A GList of URIs to add to the playlist.
 **/
-void audacious_remote_playlist_add (DBusGProxy * proxy, GList * list)
+EXPORT void audacious_remote_playlist_add (DBusGProxy * proxy, GList * list)
 {
 const gchar * filenames[g_list_length (list) + 1];
 int count;
@@ -103,7 +100,7 @@
 * @param[in] proxy DBus proxy for audacious
 * @param[in] list A GList of URIs to open
 **/
-void audacious_remote_playlist_open_list (DBusGProxy * proxy, GList * list)
+EXPORT void audacious_remote_playlist_open_list (DBusGProxy * proxy, GList * list)
 {
 const gchar * filenames[g_list_length (list) + 1];
 int count;
@@ -124,7 +121,7 @@
 * @param[in] proxy DBus proxy for audacious
 * @param[in] list A GList of URIs to open
 **/
-void audacious_remote_playlist_open_list_to_temp (DBusGProxy * proxy, GList *
+EXPORT void audacious_remote_playlist_open_list_to_temp (DBusGProxy * proxy, GList *
 list)
 {
 const gchar * filenames[g_list_length (list) + 1];
@@ -145,7 +142,7 @@
 * @param[in] proxy DBus proxy for audacious
 * @param[in] pos The playlist position to delete.
 **/
-void audacious_remote_playlist_delete(DBusGProxy *proxy, guint pos) {
+EXPORT void audacious_remote_playlist_delete(DBusGProxy *proxy, guint pos) {
 org_atheme_audacious_delete(proxy, pos, &error);
 g_clear_error(&error);
 }
@@ -155,7 +152,7 @@
 *
 * @param[in] proxy DBus proxy for audacious
 **/
-void audacious_remote_play(DBusGProxy *proxy) {
+EXPORT void audacious_remote_play(DBusGProxy *proxy) {
 org_atheme_audacious_play(proxy, &error);
 g_clear_error(&error);
 }
@@ -165,7 +162,7 @@
 *
 * @param[in] proxy DBus proxy for audacious
 **/
-void audacious_remote_pause(DBusGProxy *proxy) {
+EXPORT void audacious_remote_pause(DBusGProxy *proxy) {
 org_atheme_audacious_pause(proxy, &error);
 g_clear_error(&error);
 }
@@ -175,7 +172,7 @@
 *
 * @param[in] proxy DBus proxy for audacious
 **/
-void audacious_remote_stop(DBusGProxy *proxy) {
+EXPORT void audacious_remote_stop(DBusGProxy *proxy) {
 org_atheme_audacious_stop(proxy, &error);
 g_clear_error(&error);
 }
@@ -186,7 +183,7 @@
 * @param[in] proxy DBus proxy for audacious
 * @return TRUE if playing, FALSE otherwise.
 **/
-gboolean audacious_remote_is_playing(DBusGProxy *proxy) {
+EXPORT gboolean audacious_remote_is_playing(DBusGProxy *proxy) {
 gboolean is_playing = FALSE;
 org_atheme_audacious_playing(proxy, &is_playing, &error);
 g_clear_error(&error);
@@ -201,7 +198,7 @@
 *
 * @return TRUE if playing, FALSE otherwise.
 **/
-gboolean audacious_remote_is_paused(DBusGProxy *proxy) {
+EXPORT gboolean audacious_remote_is_paused(DBusGProxy *proxy) {
 gboolean is_paused = FALSE;
 org_atheme_audacious_paused(proxy, &is_paused, &error);
 g_clear_error(&error);
@@ -216,7 +213,7 @@
 *
 * @return The current playlist position.
 **/
-gint audacious_remote_get_playlist_pos(DBusGProxy *proxy) {
+EXPORT gint audacious_remote_get_playlist_pos(DBusGProxy *proxy) {
 guint pos = 0;
 org_atheme_audacious_position(proxy, &pos, &error);
 g_clear_error(&error);
@@ -230,7 +227,7 @@
 *
 * Tells audacious to jump to a different playlist position.
 **/
-void audacious_remote_set_playlist_pos(DBusGProxy *proxy, guint pos) {
+EXPORT void audacious_remote_set_playlist_pos(DBusGProxy *proxy, guint pos) {
 org_atheme_audacious_jump (proxy, pos, &error);
 g_clear_error(&error);
 }
@@ -243,7 +240,7 @@
 *
 * @return The amount of entries in the playlist.
 **/
-gint audacious_remote_get_playlist_length(DBusGProxy *proxy) {
+EXPORT gint audacious_remote_get_playlist_length(DBusGProxy *proxy) {
 gint len = 0;
 org_atheme_audacious_length(proxy, &len, &error);
 g_clear_error(&error);
@@ -256,7 +253,7 @@
 *
 * Clears the playlist.
 **/
-void audacious_remote_playlist_clear(DBusGProxy *proxy) {
+EXPORT void audacious_remote_playlist_clear(DBusGProxy *proxy) {
 org_atheme_audacious_clear(proxy, &error);
 g_clear_error(&error);
 }
@@ -269,7 +266,7 @@
 *
 * @return The current output position.
 **/
-gint audacious_remote_get_output_time(DBusGProxy *proxy) {
+EXPORT gint audacious_remote_get_output_time(DBusGProxy *proxy) {
 guint time = 0;
 org_atheme_audacious_time(proxy, &time, &error);
 g_clear_error(&error);
@@ -283,7 +280,7 @@
 *
 * Tells audacious to seek to a new time position.
 **/
-void audacious_remote_jump_to_time(DBusGProxy *proxy, guint pos) {
+EXPORT void audacious_remote_jump_to_time(DBusGProxy *proxy, guint pos) {
 org_atheme_audacious_seek (proxy, pos, &error);
 g_clear_error(&error);
 }
@@ -295,7 +292,7 @@
 * @param[out] vl Pointer to integer containing the left channel's volume (0-100).
 * @param[out] vr Pointer to integer containing the right channel's volume (0-100).
 **/
-void audacious_remote_get_volume(DBusGProxy *proxy, gint * vl, gint * vr) {
+EXPORT void audacious_remote_get_volume(DBusGProxy *proxy, gint * vl, gint * vr) {
 org_atheme_audacious_volume(proxy, vl, vr, &error);
 g_clear_error(&error);
 }
@@ -306,7 +303,7 @@
 * @param[in] proxy DBus proxy for audacious
 * @return The current volume (0-100).
 **/
-gint audacious_remote_get_main_volume(DBusGProxy *proxy) {
+EXPORT gint audacious_remote_get_main_volume(DBusGProxy *proxy) {
 gint vl = 0, vr = 0;
 
 audacious_remote_get_volume(proxy, &vl, &vr);
@@ -320,7 +317,7 @@
 * @param[in] proxy DBus proxy for audacious
 * @return The current balance.
 **/
-gint audacious_remote_get_balance(DBusGProxy *proxy) {
+EXPORT gint audacious_remote_get_balance(DBusGProxy *proxy) {
 gint balance = 50;
 org_atheme_audacious_balance(proxy, &balance, &error);
 g_clear_error(&error);
@@ -334,7 +331,7 @@
 * @param[in] vl The volume for the left channel (0-100).
 * @param[in] vr The volume for the right channel (0-100).
 **/
-void audacious_remote_set_volume(DBusGProxy *proxy, gint vl, gint vr) {
+EXPORT void audacious_remote_set_volume(DBusGProxy *proxy, gint vl, gint vr) {
 org_atheme_audacious_set_volume(proxy, vl, vr, &error);
 g_clear_error(&error);
 }
@@ -346,7 +343,7 @@
 * @param[in] proxy DBus proxy for audacious
 * @param[in] v The volume to set (0-100).
 **/
-void audacious_remote_set_main_volume(DBusGProxy *proxy, gint v) {
+EXPORT void audacious_remote_set_main_volume(DBusGProxy *proxy, gint v) {
 gint b = 50, vl = 0, vr = 0;
 
 b = audacious_remote_get_balance(proxy);
@@ -368,7 +365,7 @@
 * @param[in] proxy DBus proxy for audacious
 * @param[in] b The balance to set.
 **/
-void audacious_remote_set_balance(DBusGProxy *proxy, gint b) {
+EXPORT void audacious_remote_set_balance(DBusGProxy *proxy, gint b) {
 gint v = 0, vl = 0, vr = 0;
 
 if (b < -100)
@@ -396,7 +393,7 @@
 * @param[in] pos The playlist position to query for.
 * @return A path to the file in the playlist at %pos position.
 **/
-gchar *audacious_remote_get_playlist_file(DBusGProxy *proxy, guint pos) {
+EXPORT gchar *audacious_remote_get_playlist_file(DBusGProxy *proxy, guint pos) {
 gchar *out = NULL;
 org_atheme_audacious_song_filename(proxy, pos, &out, &error);
 g_clear_error(&error);
@@ -410,7 +407,7 @@
 * @param[in] pos The playlist position to query for.
 * @return The title for the entry in the playlist at %pos position.
 **/
-gchar *audacious_remote_get_playlist_title(DBusGProxy *proxy, guint pos) {
+EXPORT gchar *audacious_remote_get_playlist_title(DBusGProxy *proxy, guint pos) {
 gchar *out = NULL;
 org_atheme_audacious_song_title(proxy, pos, &out, &error);
 g_clear_error(&error);
@@ -424,7 +421,7 @@
 * @param[in] pos The playlist position to query for.
 * @return The length of the entry in the playlist at %pos position.
 **/
-gint audacious_remote_get_playlist_time(DBusGProxy *proxy, guint pos) {
+EXPORT gint audacious_remote_get_playlist_time(DBusGProxy *proxy, guint pos) {
 gint out = 0;
 org_atheme_audacious_song_frames(proxy, pos, &out, &error);
 g_clear_error(&error);
@@ -439,7 +436,7 @@
 * @param[out] freq Pointer to an integer containing the frequency.
 * @param[out] nch Pointer to an integer containing the number of channels.
 **/
-void audacious_remote_get_info(DBusGProxy *proxy, gint *rate, gint *freq,
+EXPORT void audacious_remote_get_info(DBusGProxy *proxy, gint *rate, gint *freq,
 gint *nch) {
 org_atheme_audacious_info(proxy, rate, freq, nch, &error);
 g_clear_error(&error);
@@ -451,7 +448,7 @@
 * @param[in] proxy DBus proxy for audacious
 * @param[in] show Whether or not to show the main window.
 **/
-void audacious_remote_main_win_toggle(DBusGProxy *proxy, gboolean show) {
+EXPORT void audacious_remote_main_win_toggle(DBusGProxy *proxy, gboolean show) {
 org_atheme_audacious_show_main_win(proxy, show, &error);
 g_clear_error(&error);
 }
@@ -462,7 +459,7 @@
 * @param[in] proxy DBus proxy for audacious
 * @return TRUE if visible, FALSE otherwise.
 **/
-gboolean audacious_remote_is_main_win(DBusGProxy *proxy) {
+EXPORT gboolean audacious_remote_is_main_win(DBusGProxy *proxy) {
 gboolean visible = TRUE;
 org_atheme_audacious_main_win_visible(proxy, &visible, &error);
 g_clear_error(&error);
@@ -474,7 +471,7 @@
 *
 * @param[in] proxy DBus proxy for audacious
 **/
-void audacious_remote_show_prefs_box(DBusGProxy *proxy) {
+EXPORT void audacious_remote_show_prefs_box(DBusGProxy *proxy) {
 audacious_remote_toggle_prefs_box(proxy, TRUE);
 }
 
@@ -484,7 +481,7 @@
 * @param[in] proxy DBus proxy for audacious
 * @param[in] show shows/hides
 **/
-void audacious_remote_toggle_prefs_box(DBusGProxy *proxy, gboolean show) {
+EXPORT void audacious_remote_toggle_prefs_box(DBusGProxy *proxy, gboolean show) {
 org_atheme_audacious_show_prefs_box(proxy, show, &error);
 g_clear_error(&error);
 }
@@ -494,7 +491,7 @@
 *
 * @param[in] proxy DBus proxy for audacious
 **/
-void audacious_remote_show_about_box(DBusGProxy *proxy) {
+EXPORT void audacious_remote_show_about_box(DBusGProxy *proxy) {
 audacious_remote_toggle_about_box(proxy, TRUE);
 }
 
@@ -504,7 +501,7 @@
 * @param[in] proxy DBus proxy for audacious
 * @param[in] show shows/hides
 **/
-void audacious_remote_toggle_about_box(DBusGProxy *proxy, gboolean show) {
+EXPORT void audacious_remote_toggle_about_box(DBusGProxy *proxy, gboolean show) {
 org_atheme_audacious_show_about_box(proxy, show, &error);
 g_clear_error(&error);
 }
@@ -515,7 +512,7 @@
 * @param[in] proxy DBus proxy for audacious
 * @param[in] ontop Boolean value whether or not Audacious should be always-on-top.
 **/
-void audacious_remote_toggle_aot(DBusGProxy *proxy, gboolean ontop) {
+EXPORT void audacious_remote_toggle_aot(DBusGProxy *proxy, gboolean ontop) {
 org_atheme_audacious_toggle_aot(proxy, ontop, &error);
 	g_clear_error(&error);
 }
@@ -525,7 +522,7 @@
 *
 * @param[in] proxy DBus proxy for audacious
 **/
-void audacious_remote_eject(DBusGProxy *proxy) {
+EXPORT void audacious_remote_eject(DBusGProxy *proxy) {
 org_atheme_audacious_eject(proxy, &error);
 g_clear_error(&error);
 }
@@ -536,7 +533,7 @@
 *
 * Tells audacious to move backwards in the playlist.
 **/
-void audacious_remote_playlist_prev(DBusGProxy *proxy) {
+EXPORT void audacious_remote_playlist_prev(DBusGProxy *proxy) {
 org_atheme_audacious_reverse(proxy, &error);
 g_clear_error(&error);
 }
@@ -546,7 +543,7 @@
 *
 * @param[in] proxy DBus proxy for audacious
 **/
-void audacious_remote_playlist_next(DBusGProxy *proxy) {
+EXPORT void audacious_remote_playlist_next(DBusGProxy *proxy) {
 org_atheme_audacious_advance(proxy, &error);
 g_clear_error(&error);
 }
@@ -557,7 +554,7 @@
 * @param[in] proxy DBus proxy for audacious
 * @param[in] string The URI to add.
 **/
-void audacious_remote_playlist_add_url_string(DBusGProxy *proxy,
+EXPORT void audacious_remote_playlist_add_url_string(DBusGProxy *proxy,
 gchar *string) {
 org_atheme_audacious_add_url(proxy, string, &error);
 g_clear_error(&error);
@@ -569,7 +566,7 @@
 * @param[in] proxy DBus proxy for audacious
 * @return TRUE if yes, otherwise FALSE.
 **/
-gboolean audacious_remote_is_running(DBusGProxy *proxy) {
+EXPORT gboolean audacious_remote_is_running(DBusGProxy *proxy) {
 char *string = NULL;
 org_atheme_audacious_version(proxy, &string, &error);
 g_clear_error(&error);
@@ -586,7 +583,7 @@
 *
 * @param[in] proxy DBus proxy for audacious
 **/
-void audacious_remote_toggle_repeat(DBusGProxy *proxy) {
+EXPORT void audacious_remote_toggle_repeat(DBusGProxy *proxy) {
 org_atheme_audacious_toggle_repeat(proxy, &error);
 g_clear_error(&error);
 }
@@ -596,12 +593,12 @@
 *
 * @param[in] proxy DBus proxy for audacious
 **/
-void audacious_remote_toggle_shuffle(DBusGProxy *proxy) {
+EXPORT void audacious_remote_toggle_shuffle(DBusGProxy *proxy) {
 org_atheme_audacious_toggle_shuffle (proxy, &error);
 g_clear_error(&error);
 }
 
-void audacious_remote_toggle_stop_after (DBusGProxy * proxy)
+EXPORT void audacious_remote_toggle_stop_after (DBusGProxy * proxy)
 {
 org_atheme_audacious_toggle_stop_after (proxy, & error);
 g_clear_error (& error);
@@ -613,7 +610,7 @@
 * @param[in] proxy DBus proxy for audacious
 * @return TRUE if yes, otherwise FALSE.
 **/
-gboolean audacious_remote_is_repeat(DBusGProxy *proxy) {
+EXPORT gboolean audacious_remote_is_repeat(DBusGProxy *proxy) {
 gboolean is_repeat;
 org_atheme_audacious_repeat(proxy, &is_repeat, &error);
 g_clear_error(&error);
@@ -626,14 +623,14 @@
 * @param[in] proxy DBus proxy for audacious
 * @return TRUE if yes, otherwise FALSE.
 **/
-gboolean audacious_remote_is_shuffle(DBusGProxy *proxy) {
+EXPORT gboolean audacious_remote_is_shuffle(DBusGProxy *proxy) {
 gboolean is_shuffle;
 org_atheme_audacious_shuffle(proxy, &is_shuffle, &error);
 g_clear_error(&error);
 return is_shuffle;
 }
 
-gboolean audacious_remote_is_stop_after (DBusGProxy * proxy)
+EXPORT gboolean audacious_remote_is_stop_after (DBusGProxy * proxy)
 {
 gboolean is_stop_after;
 org_atheme_audacious_stop_after (proxy, & is_stop_after, & error);
@@ -648,7 +645,7 @@
 * @param[out] preamp Pointer to value for preamp setting.
 * @param[out] bands Pointer to array of band settings.
 **/
-void audacious_remote_get_eq(DBusGProxy *proxy, gdouble *preamp, GArray **bands) {
+EXPORT void audacious_remote_get_eq(DBusGProxy *proxy, gdouble *preamp, GArray **bands) {
 org_atheme_audacious_get_eq(proxy, preamp, bands, &error);
 g_clear_error(&error);
 }
@@ -659,7 +656,7 @@
 * @param[in] proxy DBus proxy for audacious
 * @return The equalizer preamp's setting.
 **/
-gdouble audacious_remote_get_eq_preamp(DBusGProxy *proxy) {
+EXPORT gdouble audacious_remote_get_eq_preamp(DBusGProxy *proxy) {
 gdouble preamp = 0.0;
 
 org_atheme_audacious_get_eq_preamp(proxy, &preamp, &error);
@@ -675,7 +672,7 @@
 * @param[in] band Which band to lookup the value for.
 * @return The equalizer band's value.
 **/
-gdouble audacious_remote_get_eq_band(DBusGProxy *proxy, gint band) {
+EXPORT gdouble audacious_remote_get_eq_band(DBusGProxy *proxy, gint band) {
 gdouble value = 0.0;
 
 org_atheme_audacious_get_eq_band(proxy, band, &value, &error);
@@ -691,7 +688,7 @@
 * @param[in] preamp Value for preamp setting.
 * @param[in] bands Array of band settings.
 **/
-void audacious_remote_set_eq(DBusGProxy *proxy, gdouble preamp, GArray *bands) {
+EXPORT void audacious_remote_set_eq(DBusGProxy *proxy, gdouble preamp, GArray *bands) {
 org_atheme_audacious_set_eq(proxy, preamp, bands, &error);
 g_clear_error(&error);
 }
@@ -702,7 +699,7 @@
 * @param[in] proxy DBus proxy for audacious
 * @param[in] preamp Value for preamp setting.
 **/
-void audacious_remote_set_eq_preamp(DBusGProxy *proxy, gdouble preamp) {
+EXPORT void audacious_remote_set_eq_preamp(DBusGProxy *proxy, gdouble preamp) {
 org_atheme_audacious_set_eq_preamp(proxy, preamp, &error);
 g_clear_error(&error);
 }
@@ -714,7 +711,7 @@
 * @param[in] band The band to set the value for.
 * @param[in] value The value to set that band to.
 **/
-void audacious_remote_set_eq_band(DBusGProxy *proxy, gint band, gdouble value) {
+EXPORT void audacious_remote_set_eq_band(DBusGProxy *proxy, gint band, gdouble value) {
 org_atheme_audacious_set_eq_band(proxy, band, value, &error);
 g_clear_error(&error);
 }
@@ -724,7 +721,7 @@
 *
 * @param[in] proxy DBus proxy for audacious
 **/
-void audacious_remote_quit(DBusGProxy *proxy) {
+EXPORT void audacious_remote_quit(DBusGProxy *proxy) {
 org_atheme_audacious_quit(proxy, &error);
 g_clear_error(&error);
 }
@@ -734,7 +731,7 @@
 *
 * @param[in] proxy DBus proxy for audacious
 **/
-void audacious_remote_play_pause(DBusGProxy *proxy) {
+EXPORT void audacious_remote_play_pause(DBusGProxy *proxy) {
 org_atheme_audacious_play_pause(proxy, &error);
 }
 
@@ -745,7 +742,7 @@
 * @param[in] string The URI to add.
 * @param[in] pos The position to add the URI at.
 **/
-void audacious_remote_playlist_ins_url_string(DBusGProxy *proxy,
+EXPORT void audacious_remote_playlist_ins_url_string(DBusGProxy *proxy,
 gchar *string, guint pos) {
 org_atheme_audacious_playlist_ins_url_string (proxy, string, pos, &error);
 g_clear_error(&error);
@@ -757,7 +754,7 @@
 * @param[in] proxy DBus proxy for audacious
 * @param[in] pos The playlist position to add to the queue.
 **/
-void audacious_remote_playqueue_add(DBusGProxy *proxy, guint pos) {
+EXPORT void audacious_remote_playqueue_add(DBusGProxy *proxy, guint pos) {
 org_atheme_audacious_playqueue_add (proxy, pos, &error);
 g_clear_error(&error);
 }
@@ -768,7 +765,7 @@
 * @param[in] proxy DBus proxy for audacious
 * @param[in] pos The playlist position to remove from the queue.
 **/
-void audacious_remote_playqueue_remove(DBusGProxy *proxy, guint pos) {
+EXPORT void audacious_remote_playqueue_remove(DBusGProxy *proxy, guint pos) {
 org_atheme_audacious_playqueue_remove (proxy, pos, &error);
 g_clear_error(&error);
 }
@@ -781,7 +778,7 @@
 * @param[in] proxy DBus proxy for audacious
 * @return The number of entries in the playqueue.
 **/
-gint audacious_remote_get_playqueue_length(DBusGProxy *proxy) {
+EXPORT gint audacious_remote_get_playqueue_length(DBusGProxy *proxy) {
 gint len = 0;
 org_atheme_audacious_length(proxy, &len, &error);
 g_clear_error(&error);
@@ -793,7 +790,7 @@
 *
 * @param[in] proxy DBus proxy for audacious
 **/
-void audacious_remote_toggle_advance(DBusGProxy *proxy) {
+EXPORT void audacious_remote_toggle_advance(DBusGProxy *proxy) {
 org_atheme_audacious_toggle_auto_advance(proxy, &error);
 g_clear_error(&error);
 }
@@ -806,7 +803,7 @@
 *
 * @return TRUE if yes, otherwise FALSE.
 **/
-gboolean audacious_remote_is_advance(DBusGProxy *proxy) {
+EXPORT gboolean audacious_remote_is_advance(DBusGProxy *proxy) {
 gboolean is_advance = FALSE;
 org_atheme_audacious_auto_advance(proxy, &is_advance, &error);
 g_clear_error(&error);
@@ -818,7 +815,7 @@
 *
 * @param[in] proxy DBus proxy for audacious
 **/
-void audacious_remote_show_jtf_box(DBusGProxy *proxy) {
+EXPORT void audacious_remote_show_jtf_box(DBusGProxy *proxy) {
 audacious_remote_toggle_jtf_box(proxy, TRUE);
 }
 
@@ -828,7 +825,7 @@
 * @param[in] proxy DBus proxy for audacious
 * @param[in] show shows/hides jtf pane
 **/
-void audacious_remote_toggle_jtf_box(DBusGProxy *proxy, gboolean show) {
+EXPORT void audacious_remote_toggle_jtf_box(DBusGProxy *proxy, gboolean show) {
 org_atheme_audacious_show_jtf_box(proxy, show, &error);
 g_clear_error(&error);
 }
@@ -839,7 +836,7 @@
 * @param[in] proxy DBus proxy for audacious
 * @param[in] show shows/hides filebrowser
 **/
-void audacious_remote_toggle_filebrowser(DBusGProxy *proxy, gboolean show) {
+EXPORT void audacious_remote_toggle_filebrowser(DBusGProxy *proxy, gboolean show) {
 org_atheme_audacious_show_filebrowser(proxy, show, &error);
 g_clear_error(&error);
 }
@@ -850,7 +847,7 @@
 *
 * Tells audacious to clear the playqueue.
 **/
-void audacious_remote_playqueue_clear(DBusGProxy *proxy) {
+EXPORT void audacious_remote_playqueue_clear(DBusGProxy *proxy) {
 org_atheme_audacious_playqueue_clear(proxy, &error);
 g_clear_error(&error);
 }
@@ -862,7 +859,7 @@
 * @param[in] pos Position to check queue for.
 * @return TRUE if yes, FALSE otherwise.
 **/
-gboolean audacious_remote_playqueue_is_queued(DBusGProxy *proxy, guint pos) {
+EXPORT gboolean audacious_remote_playqueue_is_queued(DBusGProxy *proxy, guint pos) {
 gboolean is_queued;
 org_atheme_audacious_playqueue_is_queued (proxy, pos, &is_queued, &error);
 g_clear_error(&error);
@@ -876,7 +873,7 @@
 * @param[in] pos Position to check queue for.
 * @return the playqueue position for a playlist entry
 **/
-gint audacious_remote_get_playqueue_queue_position(DBusGProxy *proxy, guint pos) {
+EXPORT gint audacious_remote_get_playqueue_queue_position(DBusGProxy *proxy, guint pos) {
 guint qpos = 0;
 org_atheme_audacious_queue_get_queue_pos (proxy, pos, &qpos, &error);
 g_clear_error(&error);
@@ -891,7 +888,7 @@
 *
 * @return the playlist position for a playqueue entry
 **/
-gint audacious_remote_get_playqueue_list_position(DBusGProxy *proxy, guint qpos) {
+EXPORT gint audacious_remote_get_playqueue_list_position(DBusGProxy *proxy, guint qpos) {
 guint pos = 0;
 org_atheme_audacious_queue_get_list_pos (proxy, qpos, &pos, &error);
 g_clear_error(&error);
@@ -904,7 +901,7 @@
 * @param[in] proxy DBus proxy for audacious
 * @param[in] string The URI to enqueue to a temporary playlist.
 **/
-void audacious_remote_playlist_enqueue_to_temp(DBusGProxy *proxy,
+EXPORT void audacious_remote_playlist_enqueue_to_temp(DBusGProxy *proxy,
 gchar *string) {
 org_atheme_audacious_playlist_enqueue_to_temp(proxy, string, &error);
 	g_clear_error(&error);
@@ -918,7 +915,7 @@
 * @param[in] pos The playlist position to query for.
 * @return The requested field's data for the entry in the playlist at %pos position.
 **/
-gchar *audacious_get_tuple_field_data(DBusGProxy *proxy, gchar *field,
+EXPORT gchar *audacious_get_tuple_field_data(DBusGProxy *proxy, gchar *field,
 guint pos) {
 GValue value = {0};
 gchar *s = NULL;
@@ -963,7 +960,7 @@
 * @param[in] proxy DBus proxy for audacious
 * @param[in] active Whether or not to activate the equalizer.
 **/
-void audacious_remote_eq_activate(DBusGProxy *proxy, gboolean active) {
+EXPORT void audacious_remote_eq_activate(DBusGProxy *proxy, gboolean active) {
 org_atheme_audacious_equalizer_activate (proxy, active, &error);
 g_clear_error(&error);
 }
@@ -974,7 +971,7 @@
 * @param[in] proxy DBus proxy for audacious
 * @return Array of strings.
 **/
-gchar **audacious_remote_get_tuple_fields(DBusGProxy *proxy) {
+EXPORT gchar **audacious_remote_get_tuple_fields(DBusGProxy *proxy) {
 gchar **res = NULL;
 org_atheme_audacious_get_tuple_fields (proxy, &res, &error);
 g_clear_error(&error);
@@ -984,7 +981,7 @@
 /**
 * Returns the active playlist name.
 */
-gchar *audacious_remote_playlist_get_active_name(DBusGProxy *proxy) {
+EXPORT gchar *audacious_remote_playlist_get_active_name(DBusGProxy *proxy) {
 char *string = NULL;
 org_atheme_audacious_get_active_playlist_name (proxy, &string, &error);
 g_clear_error(&error);

audacious-3.1.1.tar.bz2/src/libaudcore/Makefile -> audacious-3.2.4.tar.bz2/src/libaudcore/Makefile Changed

@@ -7,38 +7,33 @@
        eventqueue.c \
        hook.c \
        index.c \
-       stringpool.c \
+       strpool.c \
        tuple.c \
        tuple_compiler.c \
        tuple_formatter.c \
        vfs.c \
        vfs_async.c \
-       vfs_buffer.c \
-       vfs_buffered_file.c \
-       vfs_common.c \
-       md5.c
+       vfs_common.c
 
 INCLUDES = audio.h \
            audstrings.h \
-           eventqueue.h \
+           core.h \
            hook.h \
            index.h \
-           stringpool.h \
            tuple.h \
-           tuple_compiler.h \
-           tuple_formatter.h \
            vfs.h \
-           vfs_async.h \
-           vfs_buffer.h \
-           vfs_buffered_file.h \
-           md5.h
+           vfs_async.h
 
 include ../../buildsys.mk
 include ../../extra.mk
 
 includesubdir = libaudcore
 
-CPPFLAGS += -std=gnu99 -DHAVE_CONFIG_H ${PTHREAD_CFLAGS} ${GLIB_CFLAGS} ${MOWGLI_CFLAGS} -I.. -I../..
+CPPFLAGS := -I.. -I../.. \
+            ${CPPFLAGS} \
+            ${GLIB_CFLAGS} \
+            ${PTHREAD_CFLAGS}
+
 CFLAGS += ${LIB_CFLAGS}
 
-LIBS += ${PTHREAD_LIBS} ${GLIB_LIBS} ${MOWGLI_LIBS} -lm
+LIBS += ${PTHREAD_LIBS} ${GLIB_LIBS} -lm

audacious-3.1.1.tar.bz2/src/libaudcore/audio.c -> audacious-3.2.4.tar.bz2/src/libaudcore/audio.c Changed

@@ -1,92 +1,92 @@
 /*
 * audio.c
- * Copyright 2009 John Lindgren
+ * Copyright 2009-2011 John Lindgren
 *
- * This file is part of Audacious.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
 *
- * 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.
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions, and the following disclaimer.
 *
- * 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.
+ * 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.
 *
- * 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.
+ * 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 <stdint.h>
 
 #include "audio.h"
+#include "config.h"
 
 #define FROM_INT_LOOP(NAME, TYPE, SWAP, OFFSET, RANGE) \
-static void NAME (const TYPE * in, gfloat * out, gint samples) \
+static void NAME (const TYPE * in, float * out, int samples) \
 { \
 const TYPE * end = in + samples; \
 while (in < end) \
- * out ++ = (TYPE) (SWAP (* in ++) - OFFSET) / (gdouble) RANGE; \
+ * out ++ = (TYPE) (SWAP (* in ++) - OFFSET) / (double) RANGE; \
 }
 
 #define TO_INT_LOOP(NAME, TYPE, SWAP, OFFSET, RANGE) \
-static void NAME (const gfloat * in, TYPE * out, gint samples) \
+static void NAME (const float * in, TYPE * out, int samples) \
 { \
- const gfloat * end = in + samples; \
+ const float * end = in + samples; \
 while (in < end) \
 { \
- gdouble f = * in ++; \
- * out ++ = SWAP (OFFSET + (TYPE) (CLAMP (f, -1, 1) * (gdouble) RANGE)); \
+ double f = * in ++; \
+ * out ++ = SWAP (OFFSET + (TYPE) (CLAMP (f, -1, 1) * (double) RANGE)); \
 } \
 }
 
-static inline gint8 noop8 (gint8 i) {return i;}
-static inline gint16 noop16 (gint16 i) {return i;}
-static inline gint32 noop32 (gint32 i) {return i;}
-
-FROM_INT_LOOP (from_s8, gint8, noop8, 0x00, 0x7f)
-FROM_INT_LOOP (from_u8, gint8, noop8, 0x80, 0x7f)
-FROM_INT_LOOP (from_s16, gint16, noop16, 0x0000, 0x7fff)
-FROM_INT_LOOP (from_u16, gint16, noop16, 0x8000, 0x7fff)
-FROM_INT_LOOP (from_s24, gint32, noop32, 0x000000, 0x7fffff)
-FROM_INT_LOOP (from_u24, gint32, noop32, 0x800000, 0x7fffff)
-FROM_INT_LOOP (from_s32, gint32, noop32, 0x00000000, 0x7fffffff)
-FROM_INT_LOOP (from_u32, gint32, noop32, 0x80000000, 0x7fffffff)
-
-TO_INT_LOOP (to_s8, gint8, noop8, 0x00, 0x7f)
-TO_INT_LOOP (to_u8, gint8, noop8, 0x80, 0x7f)
-TO_INT_LOOP (to_s16, gint16, noop16, 0x0000, 0x7fff)
-TO_INT_LOOP (to_u16, gint16, noop16, 0x8000, 0x7fff)
-TO_INT_LOOP (to_s24, gint32, noop32, 0x000000, 0x7fffff)
-TO_INT_LOOP (to_u24, gint32, noop32, 0x800000, 0x7fffff)
-TO_INT_LOOP (to_s32, gint32, noop32, 0x00000000, 0x7fffffff)
-TO_INT_LOOP (to_u32, gint32, noop32, 0x80000000, 0x7fffffff)
-
-static inline gint16 swap16 (gint16 i) {return GUINT16_SWAP_LE_BE (i);}
-static inline gint32 swap32 (gint32 i) {return GUINT32_SWAP_LE_BE (i);}
-
-FROM_INT_LOOP (from_s16_swap, gint16, swap16, 0x0000, 0x7fff)
-FROM_INT_LOOP (from_u16_swap, gint16, swap16, 0x8000, 0x7fff)
-FROM_INT_LOOP (from_s24_swap, gint32, swap32, 0x000000, 0x7fffff)
-FROM_INT_LOOP (from_u24_swap, gint32, swap32, 0x800000, 0x7fffff)
-FROM_INT_LOOP (from_s32_swap, gint32, swap32, 0x00000000, 0x7fffffff)
-FROM_INT_LOOP (from_u32_swap, gint32, swap32, 0x80000000, 0x7fffffff)
-
-TO_INT_LOOP (to_s16_swap, gint16, swap16, 0x0000, 0x7fff)
-TO_INT_LOOP (to_u16_swap, gint16, swap16, 0x8000, 0x7fff)
-TO_INT_LOOP (to_s24_swap, gint32, swap32, 0x000000, 0x7fffff)
-TO_INT_LOOP (to_u24_swap, gint32, swap32, 0x800000, 0x7fffff)
-TO_INT_LOOP (to_s32_swap, gint32, swap32, 0x00000000, 0x7fffffff)
-TO_INT_LOOP (to_u32_swap, gint32, swap32, 0x80000000, 0x7fffffff)
-
-typedef void (* FromFunc) (const void * in, gfloat * out, gint samples);
-typedef void (* ToFunc) (const gfloat * in, void * out, gint samples);
+static inline int8_t NOOP8 (int8_t i) {return i;}
+static inline int16_t NOOP16 (int16_t i) {return i;}
+static inline int32_t NOOP32 (int32_t i) {return i;}
+
+FROM_INT_LOOP (from_s8, int8_t, NOOP8, 0x00, 0x7f)
+FROM_INT_LOOP (from_u8, int8_t, NOOP8, 0x80, 0x7f)
+FROM_INT_LOOP (from_s16, int16_t, NOOP16, 0x0000, 0x7fff)
+FROM_INT_LOOP (from_u16, int16_t, NOOP16, 0x8000, 0x7fff)
+FROM_INT_LOOP (from_s24, int32_t, NOOP32, 0x000000, 0x7fffff)
+FROM_INT_LOOP (from_u24, int32_t, NOOP32, 0x800000, 0x7fffff)
+FROM_INT_LOOP (from_s32, int32_t, NOOP32, 0x00000000, 0x7fffffff)
+FROM_INT_LOOP (from_u32, int32_t, NOOP32, 0x80000000, 0x7fffffff)
+
+TO_INT_LOOP (to_s8, int8_t, NOOP8, 0x00, 0x7f)
+TO_INT_LOOP (to_u8, int8_t, NOOP8, 0x80, 0x7f)
+TO_INT_LOOP (to_s16, int16_t, NOOP16, 0x0000, 0x7fff)
+TO_INT_LOOP (to_u16, int16_t, NOOP16, 0x8000, 0x7fff)
+TO_INT_LOOP (to_s24, int32_t, NOOP32, 0x000000, 0x7fffff)
+TO_INT_LOOP (to_u24, int32_t, NOOP32, 0x800000, 0x7fffff)
+TO_INT_LOOP (to_s32, int32_t, NOOP32, 0x00000000, 0x7fffffff)
+TO_INT_LOOP (to_u32, int32_t, NOOP32, 0x80000000, 0x7fffffff)
+
+static inline int16_t SWAP16 (int16_t i) {return GUINT16_SWAP_LE_BE (i);}
+static inline int32_t SWAP32 (int32_t i) {return GUINT32_SWAP_LE_BE (i);}
+
+FROM_INT_LOOP (from_s16_swap, int16_t, SWAP16, 0x0000, 0x7fff)
+FROM_INT_LOOP (from_u16_swap, int16_t, SWAP16, 0x8000, 0x7fff)
+FROM_INT_LOOP (from_s24_swap, int32_t, SWAP32, 0x000000, 0x7fffff)
+FROM_INT_LOOP (from_u24_swap, int32_t, SWAP32, 0x800000, 0x7fffff)
+FROM_INT_LOOP (from_s32_swap, int32_t, SWAP32, 0x00000000, 0x7fffffff)
+FROM_INT_LOOP (from_u32_swap, int32_t, SWAP32, 0x80000000, 0x7fffffff)
+
+TO_INT_LOOP (to_s16_swap, int16_t, SWAP16, 0x0000, 0x7fff)
+TO_INT_LOOP (to_u16_swap, int16_t, SWAP16, 0x8000, 0x7fff)
+TO_INT_LOOP (to_s24_swap, int32_t, SWAP32, 0x000000, 0x7fffff)
+TO_INT_LOOP (to_u24_swap, int32_t, SWAP32, 0x800000, 0x7fffff)
+TO_INT_LOOP (to_s32_swap, int32_t, SWAP32, 0x00000000, 0x7fffffff)
+TO_INT_LOOP (to_u32_swap, int32_t, SWAP32, 0x80000000, 0x7fffffff)
+
+typedef void (* FromFunc) (const void * in, float * out, int samples);
+typedef void (* ToFunc) (const float * in, void * out, int samples);
 
 struct
 {
- gint format;
+ int format;
 FromFunc from;
 ToFunc to;
 }
@@ -126,9 +126,9 @@
 #endif
 };
 
-void audio_from_int (const void * in, gint format, gfloat * out, gint samples)
+EXPORT void audio_from_int (const void * in, int format, float * out, int samples)
 {
- gint entry;
+ int entry;
 
 for (entry = 0; entry < G_N_ELEMENTS (convert_table); entry ++)
 {
@@ -140,9 +140,9 @@
 }
 }
 
-void audio_to_int (const gfloat * in, void * out, gint format, gint samples)
+EXPORT void audio_to_int (const float * in, void * out, int format, int samples)
 {
- gint entry;
+ int entry;
 
 for (entry = 0; entry < G_N_ELEMENTS (convert_table); entry ++)
 {
@@ -154,10 +154,10 @@
 }
 }
 
-void audio_amplify (gfloat * data, gint channels, gint frames, gfloat * factors)
+EXPORT void audio_amplify (float * data, int channels, int frames, float * factors)
 {
- gfloat * end = data + channels * frames;
- gint channel;
+ float * end = data + channels * frames;
+ int channel;
 
 while (data < end)
 {

audacious-3.2.4.tar.bz2/src/libaudcore/audio.h.in Added

@@ -0,0 +1,53 @@
+/*
+ * audio.h
+ * Copyright 2009-2011 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 LIBAUDCORE_AUDIO_H
+#define LIBAUDCORE_AUDIO_H
+
+/* 24-bit integer samples are padded to 32-bit; high byte is always 0 */
+enum {
+ FMT_FLOAT,
+ FMT_S8, FMT_U8,
+ FMT_S16_LE, FMT_S16_BE, FMT_U16_LE, FMT_U16_BE,
+ FMT_S24_LE, FMT_S24_BE, FMT_U24_LE, FMT_U24_BE,
+ FMT_S32_LE, FMT_S32_BE, FMT_U32_LE, FMT_U32_BE};
+
+#if @BIGENDIAN@
+#define FMT_S16_NE FMT_S16_BE
+#define FMT_U16_NE FMT_U16_BE
+#define FMT_S24_NE FMT_S24_BE
+#define FMT_U24_NE FMT_U24_BE
+#define FMT_S32_NE FMT_S32_BE
+#define FMT_U32_NE FMT_U32_BE
+#else
+#define FMT_S16_NE FMT_S16_LE
+#define FMT_U16_NE FMT_U16_LE
+#define FMT_S24_NE FMT_S24_LE
+#define FMT_U24_NE FMT_U24_LE
+#define FMT_S32_NE FMT_S32_LE
+#define FMT_U32_NE FMT_U32_LE
+#endif
+
+#define FMT_SIZEOF(f) ((f) == FMT_FLOAT ? sizeof (float) : (f) <= FMT_U8 ? 1 : (f) <= FMT_U16_BE ? 2 : 4)
+
+void audio_from_int (const void * in, int format, float * out, int samples);
+void audio_to_int (const float * in, void * out, int format, int samples);
+void audio_amplify (float * data, int channels, int frames, float * factors);
+
+#endif /* LIBAUDCORE_AUDIO_H */

audacious-3.1.1.tar.bz2/src/libaudcore/audstrings.c -> audacious-3.2.4.tar.bz2/src/libaudcore/audstrings.c Changed

@@ -1,548 +1,270 @@
-/* Audacious
- * Copyright (C) 2005-2009 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.
+/*
+ * audstrings.c
+ * Copyright 2009-2011 John Lindgren
+ * Copyright 2010 William Pitcock
 *
- * This program is free software; 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
 *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions, and the following disclaimer.
 *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses>.
+ * 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.
 *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
+ * 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.
 */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include "audstrings.h"
-
+#include <limits.h>
 #include <math.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <glib.h>
-#include <audacious/i18n.h>
 #include <string.h>
 #include <ctype.h>
 
-/**
- * Performs in place replacement of Windows-style drive letter with '/' (slash).
- *
- * @param str String to be manipulated.
- * @return Pointer to the string if succesful, NULL if failed or if input was NULL.
- */
-static gchar *
-str_replace_drive_letter(gchar * str)
-{
- gchar *match, *match_end;
-
- g_return_val_if_fail(str != NULL, NULL);
-
- while ((match = strstr(str, ":\\")) != NULL) {
- match--;
- match_end = match + 3;
- *match++ = '/';
- while (*match_end)
- *match++ = *match_end++;
- *match = 0; /* the end of line */
- }
-
- return str;
-}
-
-gchar *
-str_append(gchar * str, const gchar * add_str)
-{
- return str_replace(str, g_strconcat(str, add_str, NULL));
-}
-
-gchar *
-str_replace(gchar * str, gchar * new_str)
-{
- g_free(str);
- return new_str;
-}
+#include <audacious/i18n.h>
 
-void
-str_replace_in(gchar ** str, gchar * new_str)
-{
- *str = str_replace(*str, new_str);
-}
+#include "audstrings.h"
+#include "config.h"
 
-gboolean
-str_has_prefix_nocase(const gchar * str, const gchar * prefix)
-{
- /* strncasecmp causes segfaults when str is NULL*/
- return (str != NULL && (strncasecmp(str, prefix, strlen(prefix)) == 0));
-}
+#define FROM_HEX(c) ((c) < 'A' ? (c) - '0' : (c) < 'a' ? 10 + (c) - 'A' : 10 + (c) - 'a')
+#define TO_HEX(i) ((i) < 10 ? '0' + (i) : 'A' + (i) - 10)
+#define IS_LEGAL(c) (((c) >= 'A' && (c) <= 'Z') || ((c) >= 'a' && (c) <= 'z') \
+ || ((c) >= '0' && (c) <= '9') || (strchr ("-_.~/", (c))))
 
-gboolean str_has_suffix_nocase (const gchar * str, const gchar * suffix)
+EXPORT bool_t str_has_prefix_nocase (const char * str, const char * prefix)
 {
- return (str && strlen (str) >= strlen (suffix) && ! strcasecmp (str + strlen
- (str) - strlen (suffix), suffix));
+ return ! g_ascii_strncasecmp (str, prefix, strlen (prefix));
 }
 
-gboolean
-str_has_suffixes_nocase(const gchar * str, gchar * const *suffixes)
+EXPORT bool_t str_has_suffix_nocase (const char * str, const char * suffix)
 {
- gchar *const *suffix;
-
- g_return_val_if_fail(str != NULL, FALSE);
- g_return_val_if_fail(suffixes != NULL, FALSE);
+ int len1 = strlen (str);
+ int len2 = strlen (suffix);
 
- for (suffix = suffixes; *suffix; suffix++)
- if (str_has_suffix_nocase(str, *suffix))
- return TRUE;
+ if (len2 > len1)
+ return FALSE;
 
- return FALSE;
+ return ! g_ascii_strcasecmp (str + len1 - len2, suffix);
 }
 
-static gchar * (* str_to_utf8_impl) (const gchar *) = NULL;
-static gchar * (* str_to_utf8_full_impl) (const gchar *, gssize, gsize *,
- gsize *, GError * *) = NULL;
+static char * (* str_to_utf8_impl) (const char *) = NULL;
+static char * (* str_to_utf8_full_impl) (const char *, int, int *, int *) = NULL;
 
-void str_set_utf8_impl (gchar * (* stu_impl) (const gchar *),
- gchar * (* stuf_impl) (const gchar *, gssize, gsize *, gsize *, GError * *))
+EXPORT void str_set_utf8_impl (char * (* stu_impl) (const char *),
+ char * (* stuf_impl) (const char *, int, int *, int *))
 {
 str_to_utf8_impl = stu_impl;
 str_to_utf8_full_impl = stuf_impl;
 }
 
-/**
- * Convert given string from nearly any encoding to UTF-8 encoding.
- *
- * @param str Local filename/path to convert.
- * @return String in UTF-8 encoding. Must be freed with g_free().
- */
-
-gchar * str_to_utf8 (const gchar * str)
+EXPORT char * str_to_utf8 (const char * str)
 {
 g_return_val_if_fail (str_to_utf8_impl, NULL);
 return str_to_utf8_impl (str);
 }
 
-gchar * str_to_utf8_full (const gchar * str, gssize len, gsize * bytes_read,
- gsize * bytes_written, GError * * err)
+EXPORT char * str_to_utf8_full (const char * str, int len, int * bytes_read, int * bytes_written)
 {
 g_return_val_if_fail (str_to_utf8_full_impl, NULL);
- return str_to_utf8_full_impl (str, len, bytes_read, bytes_written, err);
-}
-
-#ifdef HAVE_EXECINFO_H
-# include <execinfo.h>
-#endif
-
-/**
- * This function can be used to assert that a given string is valid UTF-8.
- * If it is, a copy of the string is returned. However, if the string is NOT
- * valid UTF-8, a warning and a callstack backtrace is printed in order to
- * see where the problem occured.
- *
- * This is a temporary measure for removing useless str_to_utf8 etc. calls
- * and will be eventually removed. This function should be used in place of
- * #str_to_utf8() calls when it can be reasonably assumed that the input
- * should already be in unicode encoding.
- *
- * @param str String to be tested and converted to UTF-8 encoding.
- * @return String in UTF-8 encoding, or NULL if conversion failed or input was NULL.
- */
-gchar *
-str_assert_utf8(const gchar * str)
-{
- /* NULL in NULL out */
- if (str == NULL)
- return NULL;
-
- /* already UTF-8? */
- if (!g_utf8_validate(str, -1, NULL)) {
-#if defined(HAVE_EXECINFO_H) && defined(HAVE_BACKTRACE)
- gint i, nsymbols;
- const gint nsymmax = 50;
- void *addrbuf[nsymmax];
- gchar **symbols;
- nsymbols = backtrace(addrbuf, nsymmax);
- symbols = backtrace_symbols(addrbuf, nsymbols);
-
- fprintf(stderr, "String '%s' was not UTF-8! Backtrace (%d):\n", str, nsymbols);
-
- for (i = 0; i < nsymbols; i++)
- fprintf(stderr, " #%d: %s\n", i, symbols[i]);
-
- free(symbols);
-#else
- g_warning("String '%s' was not UTF-8!", str);
-#endif
- return str_to_utf8(str);
- } else
- return g_strdup(str);
-}
-
-
-const gchar *
-str_skip_chars(const gchar * str, const gchar * chars)
-{
- while (strchr(chars, *str) != NULL)
- str++;
- return str;
+ return str_to_utf8_full_impl (str, len, bytes_read, bytes_written);
 }
 
-gchar *
-convert_dos_path(gchar * path)
-{
- g_return_val_if_fail(path != NULL, NULL);
-
- /* replace drive letter with '/' */
- str_replace_drive_letter(path);
-
- /* replace '\' with '/' */
- string_replace_char (path, '\\', '/');
-
- return path;
-}
-
-/**
- * Checks if given URI contains a subtune indicator/number.
- * If it does, track is set to to it, and position of subtune
- * separator in the URI string is returned.
- *
- * @param filename Filename/URI to split.
- * @param track Pointer to variable where subtune number should be
- * assigned or NULL if it is not needed.
- * @return Position of subtune separator character in filename
- * or NULL if none found. Notice that this value should NOT be modified,
- * even though it is not declared const for technical reasons.
- */
-gchar *
-filename_get_subtune(const gchar * filename, gint * track)
-{
- gchar *pos;
-
- if ((pos = strrchr(filename, '?')) != NULL)
- {
- const gchar *s = pos + 1;
- while (*s != '\0' && g_ascii_isdigit(*s)) s++;
- if (*s == '\0') {
- if (track != NULL)
- *track = atoi(pos + 1);
- return pos;
- }
- }
-
- return NULL;
-}
-
-/**
- * Given file path/URI contains ending indicating subtune number
- * "?<number>", splits the string into filename without subtune value.
- * If given track pointer is non-NULL, subtune number is assigned into it.
- *
- * @param filename Filename/URI to split.
- * @param track Pointer to variable where subtune number should be
- * assigned or NULL if it is not needed.
- * @return Newly allocated splitted filename without the subtune indicator.
- * This string must be freed with g_free(). NULL will be returned if
- * there was any failure.
- */
-gchar *
-filename_split_subtune(const gchar * filename, gint * track)
-{
- gchar *result;
- gchar *pos;
-
- g_return_val_if_fail(filename != NULL, NULL);
-
- result = g_strdup(filename);
- g_return_val_if_fail(result != NULL, NULL);
-
- if ((pos = filename_get_subtune(result, track)) != NULL)
- *pos = '\0';
-
- return result;
-}
-
-void string_replace_char (gchar * string, gchar old_str, gchar new_str)
+EXPORT void string_replace_char (char * string, char old_str, char new_str)
 {
 while ((string = strchr (string, old_str)) != NULL)
 * string = new_str;
 }
 
-static inline gchar get_hex_digit (const gchar * * get)
-{
- gchar c = * * get;
-
- if (! c)
- return 0;
-
- (* get) ++;
-
- if (c < 'A')
- return c - '0';
- if (c < 'a')
- return c - 'A' + 10;
+/* Percent-decodes up to <len> bytes of <str> to <out>, which must be large
+ * enough to hold the decoded string (i.e., (len + 1) bytes). If <len> is
+ * negative, decodes all of <str>. */
 
- return c - 'a' + 10;
-}
-
-/* Requires that the destination be large enough to hold the decoded string.
- * The source and destination may be the same string. USE EXTREME CAUTION. */
-
-static void string_decode_percent_2 (const gchar * from, gchar * to)
+EXPORT void str_decode_percent (const char * str, int len, char * out)
 {
- gchar c;
- while ((c = * from ++))
- * to ++ = (c != '%') ? c : ((get_hex_digit (& from) << 4) | get_hex_digit
- (& from));
+ if (len < 0)
+ len = INT_MAX;
 
- * to = 0;
-}
+ while (len --)
+ {
+ char c = * str ++;
+ if (! c)
+ break;
 
-/* Decodes a percent-encoded string in-place. */
+ if (c == '%' && len >= 2 && str[0] && str[1])
+ {
+ c = (FROM_HEX (str[0]) << 4) | FROM_HEX (str[1]);
+ str += 2;
+ len -= 2;
+ }
 
-void string_decode_percent (gchar * s)
-{
- string_decode_percent_2 (s, s);
-}
+ * out ++ = c;
+ }
 
-/* We encode any character except the "unreserved" characters of RFC 3986 and
- * (optionally) the forward slash. On Windows, we also (optionally) do not
- * encode the colon. */
-static gboolean is_legal_char (gchar c, gboolean is_filename)
-{
- return (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || (c >= '0' && c <=
- '9') || (strchr ("-_.~", c) != NULL) ||
-#ifdef _WIN32
- (is_filename && strchr ("/:", c) != NULL);
-#else
- (is_filename && c == '/');
-#endif
+ * out = 0;
 }
 
-static gchar make_hex_digit (gint i)
-{
- if (i < 10)
- return '0' + i;
- else
- return ('A' - 10) + i;
-}
+/* Percent-encodes up to <len> bytes of <str> to <out>, which must be large
+ * enough to hold the encoded string (i.e., (3 * len + 1) bytes). If <len> is
+ * negative, decodes all of <str>. */
 
-/* is_filename specifies whether the forward slash should be left intact */
-/* returns string allocated with g_malloc */
-gchar * string_encode_percent (const gchar * string, gboolean is_filename)
+EXPORT void str_encode_percent (const char * str, int len, char * out)
 {
- gint length = 0;
- const gchar * get;
- gchar c;
- gchar * new, * set;
+ if (len < 0)
+ len = INT_MAX;
 
- for (get = string; (c = * get); get ++)
+ while (len --)
 {
- if (is_legal_char (c, is_filename))
- length ++;
- else
- length += 3;
- }
-
- new = g_malloc (length + 1);
- set = new;
+ char c = * str ++;
+ if (! c)
+ break;
 
- for (get = string; (c = * get); get ++)
- {
- if (is_legal_char (c, is_filename))
- * set ++ = c;
+ if (IS_LEGAL (c))
+ * out ++ = c;
 else
 {
- * set ++ = '%';
- * set ++ = make_hex_digit (((guchar) c) >> 4);
- * set ++ = make_hex_digit (c & 0xF);
+ * out ++ = '%';
+ * out ++ = TO_HEX ((unsigned char) c >> 4);
+ * out ++ = TO_HEX (c & 0xF);
 }
 }
 
- * set = 0;
- return new;
-}
-
-/* Determines whether a URI is valid UTF-8. If not and <warn> is nonzero,
- * prints a warning to stderr. */
-
-gboolean uri_is_utf8 (const gchar * uri, gboolean warn)
-{
- gchar buf[strlen (uri) + 1];
- string_decode_percent_2 (uri, buf);
-
- if (g_utf8_validate (buf, -1, NULL))
- return TRUE;
-
- if (warn)
- fprintf (stderr, "URI is not UTF-8: %s.\n", buf);
-
- return FALSE;
-}
-
-/* Converts a URI to UTF-8 encoding. The returned URI must be freed with g_free.
- *
- * Note: The function intentionally converts only URI's that are encoded in the
- * system locale and refer to local files.
- *
- * Rationale:
- *
- * 1. Local files. The URI was probably created by percent-encoding a raw
- * filename.
- * a. If that filename was in the system locale, then we can convert the URI
- * to a UTF-8 one, allowing us to display the name correctly and to access
- * the file by converting back to the system locale.
- * b. If that filename was in a different locale (perhaps copied from another
- * machine), then we do not want to convert it to UTF-8 (even assuming we
- * can do so correctly), because we will not know what encoding to convert
- * back to when we want to access the file.
- * 2. Remote files. The URI was probably created by percent-encoding a raw
- * filename in whatever locale the remote system is using. We do not want
- * to convert it to UTF-8 because we do not know whether the remote system
- * can handle UTF-8 requests. */
-
-gchar * uri_to_utf8 (const gchar * uri)
-{
- if (strncmp (uri, "file://", 7))
- return g_strdup (uri);
-
- /* recover the raw filename */
- gchar buf[strlen (uri + 7) + 1];
- string_decode_percent_2 (uri + 7, buf);
-
- /* convert it to a URI again, in UTF-8 if possible */
- return filename_to_uri (buf);
-}
-
-/* Check that a URI is valid UTF-8. If not, prints a warning to stderr if
- * <warn> is nonzero, frees the old URI with g_free, and sets <uri> to the
- * converted URI, which must be freed with g_free when no longer needed. */
-
-void uri_check_utf8 (gchar * * uri, gboolean warn)
-{
- if (uri_is_utf8 (* uri, warn))
- return;
-
- gchar * copy = uri_to_utf8 (* uri);
- g_free (* uri);
- * uri = copy;
+ * out = 0;
 }
 
 /* Like g_filename_to_uri, but converts the filename from the system locale to
 * UTF-8 before percent-encoding. On Windows, replaces '\' with '/' and adds a
 * leading '/'. */
 
-gchar * filename_to_uri (const gchar * name)
+EXPORT char * filename_to_uri (const char * name)
 {
- gchar * utf8 = g_locale_to_utf8 (name, -1, NULL, NULL, NULL);
+ char * utf8 = g_locale_to_utf8 (name, -1, NULL, NULL, NULL);
+ if (! utf8)
+ {
+ fprintf (stderr, "Cannot convert filename from system locale: %s\n", name);
+ return NULL;
+ }
+
 #ifdef _WIN32
 string_replace_char (utf8, '\\', '/');
 #endif
- gchar * enc = string_encode_percent (utf8 ? utf8 : name, TRUE);
+ char enc[3 * strlen (utf8) + 1];
+ str_encode_percent (utf8, -1, enc);
+
 g_free (utf8);
+
 #ifdef _WIN32
- gchar * uri = g_strdup_printf ("file:///%s", enc);
+ return g_strdup_printf ("file:///%s", enc);
 #else
- gchar * uri = g_strdup_printf ("file://%s", enc);
+ return g_strdup_printf ("file://%s", enc);
 #endif
- g_free (enc);
- return uri;
 }
 
 /* Like g_filename_from_uri, but converts the filename from UTF-8 to the system
 * locale after percent-decoding. On Windows, strips the leading '/' and
 * replaces '/' with '\'. */
 
-gchar * uri_to_filename (const gchar * uri)
+EXPORT char * uri_to_filename (const char * uri)
 {
 #ifdef _WIN32
 g_return_val_if_fail (! strncmp (uri, "file:///", 8), NULL);
- gchar buf[strlen (uri + 8) + 1];
- string_decode_percent_2 (uri + 8, buf);
+ char buf[strlen (uri + 8) + 1];
+ str_decode_percent (uri + 8, -1, buf);
 #else
 g_return_val_if_fail (! strncmp (uri, "file://", 7), NULL);
- gchar buf[strlen (uri + 7) + 1];
- string_decode_percent_2 (uri + 7, buf);
+ char buf[strlen (uri + 7) + 1];
+ str_decode_percent (uri + 7, -1, buf);
 #endif
 #ifdef _WIN32
 string_replace_char (buf, '/', '\\');
 #endif
- gchar * name = g_locale_from_utf8 (buf, -1, NULL, NULL, NULL);
- return name ? name : g_strdup (buf);
+
+ char * name = g_locale_from_utf8 (buf, -1, NULL, NULL, NULL);
+ if (! name)
+ fprintf (stderr, "Cannot convert filename to system locale: %s\n", buf);
+
+ return name;
 }
 
-/* Formats a URI for human-readable display. Percent-decodes and converts to
- * UTF-8 (more aggressively than uri_to_utf8). For file:// URI's, converts to
- * filename format (but in UTF-8). */
+/* Formats a URI for human-readable display. Percent-decodes and, for file://
+ * URI's, converts to filename format, but in UTF-8. */
 
-gchar * uri_to_display (const gchar * uri)
+EXPORT char * uri_to_display (const char * uri)
 {
- gchar buf[strlen (uri) + 1];
+ if (! strncmp (uri, "cdda://?", 8))
+ return g_strdup_printf (_("Audio CD, track %s"), uri + 8);
+
+ char buf[strlen (uri) + 1];
 
 #ifdef _WIN32
 if (! strncmp (uri, "file:///", 8))
 {
- string_decode_percent_2 (uri + 8, buf);
+ str_decode_percent (uri + 8, -1, buf);
 string_replace_char (buf, '/', '\\');
 }
 #else
 if (! strncmp (uri, "file://", 7))
- string_decode_percent_2 (uri + 7, buf);
+ str_decode_percent (uri + 7, -1, buf);
 #endif
 else
- string_decode_percent_2 (uri, buf);
+ str_decode_percent (uri, -1, buf);
 
- return str_to_utf8 (buf);
+ return g_strdup (buf);
 }
 
-gchar * uri_get_extension (const gchar * uri)
+EXPORT void uri_parse (const char * uri, const char * * base_p, const char * * ext_p,
+ const char * * sub_p, int * isub_p)
 {
- const gchar * slash = strrchr (uri, '/');
- if (! slash)
- return NULL;
+ const char * end = uri + strlen (uri);
+ const char * base, * ext, * sub, * c;
+ int isub = 0;
+ char junk;
 
- gchar * lower = g_ascii_strdown (slash + 1, -1);
-
- gchar * qmark = strchr (lower, '?');
- if (qmark)
- * qmark = 0;
+ if ((c = strrchr (uri, '/')))
+ base = c + 1;
+ else
+ base = end;
 
- gchar * dot = strrchr (lower, '.');
- gchar * ext = dot ? g_strdup (dot + 1) : NULL;
+ if ((c = strrchr (base, '?')) && sscanf (c + 1, "%d%c", & isub, & junk) == 1)
+ sub = c;
+ else
+ sub = end;
 
- g_free (lower);
- return ext;
-}
+ char buf[sub - base + 1];
+ memcpy (buf, base, sub - base);
+ buf[sub - base] = 0;
 
-void string_cut_extension(gchar *string)
-{
- gchar *period = strrchr(string, '.');
+ if ((c = strrchr (buf, '.')))
+ ext = base + (c - buf);
+ else
+ ext = sub;
 
- if (period != NULL)
- *period = 0;
+ if (base_p)
+ * base_p = base;
+ if (ext_p)
+ * ext_p = ext;
+ if (sub_p)
+ * sub_p = sub;
+ if (isub_p)
+ * isub_p = isub;
 }
 
 /* Like strcasecmp, but orders numbers correctly (2 before 10). */
 /* Non-ASCII characters are treated exactly as is. */
 /* Handles NULL gracefully. */
 
-gint string_compare (const gchar * ap, const gchar * bp)
+EXPORT int string_compare (const char * ap, const char * bp)
 {
 if (ap == NULL)
 return (bp == NULL) ? 0 : -1;
 if (bp == NULL)
 return 1;
 
- guchar a = * ap ++, b = * bp ++;
+ unsigned char a = * ap ++, b = * bp ++;
 for (; a || b; a = * ap ++, b = * bp ++)
 {
 if (a > '9' || b > '9' || a < '0' || b < '0')
@@ -559,11 +281,11 @@
 }
 else
 {
- gint x = a - '0';
+ int x = a - '0';
 for (; (a = * ap) <= '9' && a >= '0'; ap ++)
 x = 10 * x + (a - '0');
 
- gint y = b - '0';
+ int y = b - '0';
 for (; (b = * bp) >= '0' && b <= '9'; bp ++)
 y = 10 * y + (b - '0');
 
@@ -579,20 +301,26 @@
 
 /* Decodes percent-encoded strings, then compares then with string_compare. */
 
-gint string_compare_encoded (const gchar * ap, const gchar * bp)
+EXPORT int string_compare_encoded (const char * ap, const char * bp)
 {
 if (ap == NULL)
 return (bp == NULL) ? 0 : -1;
 if (bp == NULL)
 return 1;
 
- guchar a = * ap ++, b = * bp ++;
+ unsigned char a = * ap ++, b = * bp ++;
 for (; a || b; a = * ap ++, b = * bp ++)
 {
- if (a == '%')
- a = (get_hex_digit (& ap) << 4) | get_hex_digit (& ap);
- if (b == '%')
- b = (get_hex_digit (& bp) << 4) | get_hex_digit (& bp);
+ if (a == '%' && ap[0] && ap[1])
+ {
+ a = (FROM_HEX (ap[0]) << 4) | FROM_HEX (ap[1]);
+ ap += 2;
+ }
+ if (b == '%' && bp[0] && bp[1])
+ {
+ b = (FROM_HEX (bp[0]) << 4) | FROM_HEX (bp[1]);
+ bp += 2;
+ }
 
 if (a > '9' || b > '9' || a < '0' || b < '0')
 {
@@ -608,11 +336,11 @@
 }
 else
 {
- gint x = a - '0';
+ int x = a - '0';
 for (; (a = * ap) <= '9' && a >= '0'; ap ++)
 x = 10 * x + (a - '0');
 
- gint y = b - '0';
+ int y = b - '0';
 for (; (b = * bp) >= '0' && b <= '9'; bp ++)
 y = 10 * y + (b - '0');
 
@@ -626,40 +354,15 @@
 return 0;
 }
 
-const void * memfind (const void * mem, gint size, const void * token, gint
- length)
-{
- if (! length)
- return mem;
-
- size -= length - 1;
-
- while (size > 0)
- {
- const void * maybe = memchr (mem, * (guchar *) token, size);
-
- if (maybe == NULL)
- return NULL;
-
- if (! memcmp (maybe, token, length))
- return maybe;
-
- size -= (guchar *) maybe + 1 - (guchar *) mem;
- mem = (guchar *) maybe + 1;
- }
-
- return NULL;
-}
-
-gchar *
-str_replace_fragment(gchar *s, gint size, const gchar *old, const gchar *new)
+EXPORT char *
+str_replace_fragment(char *s, int size, const char *old, const char *new)
 {
- gchar *ptr = s;
- gint left = strlen(s);
- gint avail = size - (left + 1);
- gint oldlen = strlen(old);
- gint newlen = strlen(new);
- gint diff = newlen - oldlen;
+ char *ptr = s;
+ int left = strlen(s);
+ int avail = size - (left + 1);
+ int oldlen = strlen(old);
+ int newlen = strlen(new);
+ int diff = newlen - oldlen;
 
 while (left >= oldlen)
 {
@@ -684,16 +387,6 @@
 return s;
 }
 
-void
-string_canonize_case(gchar *str)
-{
- while (*str)
- {
- *str = g_ascii_toupper(*str);
- str++;
- }
-}
-
 /*
 * Routines to convert numbers between string and binary representations.
 *
@@ -709,14 +402,14 @@
 * have an accuracy of 6 decimal places.
 */
 
-gboolean string_to_int (const gchar * string, gint * addr)
+EXPORT bool_t string_to_int (const char * string, int * addr)
 {
- gboolean neg = (string[0] == '-');
+ bool_t neg = (string[0] == '-');
 if (neg)
 string ++;
 
- gint val = 0;
- gchar c;
+ int val = 0;
+ char c;
 
 while ((c = * string ++))
 {
@@ -736,19 +429,19 @@
 return FALSE;
 }
 
-gboolean string_to_double (const gchar * string, gdouble * addr)
+EXPORT bool_t string_to_double (const char * string, double * addr)
 {
- gboolean neg = (string[0] == '-');
+ bool_t neg = (string[0] == '-');
 if (neg)
 string ++;
 
- const gchar * p = strchr (string, '.');
- gint i, f;
+ const char * p = strchr (string, '.');
+ int i, f;
 
 if (p)
 {
- gchar buf[11];
- gint len;
+ char buf[11];
+ int len;
 
 len = p - string;
 if (len > 10)
@@ -779,7 +472,7 @@
 f = 0;
 }
 
- gdouble val = i + (gdouble) f / 1000000;
+ double val = i + (double) f / 1000000;
 if (val > 1000000000)
 goto ERR;
 
@@ -790,22 +483,22 @@
 return FALSE;
 }
 
-gchar * int_to_string (gint val)
+EXPORT char * int_to_string (int val)
 {
 g_return_val_if_fail (val >= -1000000000 && val <= 1000000000, NULL);
 return g_strdup_printf ("%d", val);
 }
 
-gchar * double_to_string (gdouble val)
+EXPORT char * double_to_string (double val)
 {
 g_return_val_if_fail (val >= -1000000000 && val <= 1000000000, NULL);
 
- gboolean neg = (val < 0);
+ bool_t neg = (val < 0);
 if (neg)
 val = -val;
 
- gint i = floor (val);
- gint f = round ((val - i) * 1000000);
+ int i = floor (val);
+ int f = round ((val - i) * 1000000);
 
 if (f == 1000000)
 {
@@ -813,9 +506,9 @@
 f = 0;
 }
 
- gchar * s = neg ? g_strdup_printf ("-%d.%06d", i, f) : g_strdup_printf ("%d.%06d", i, f);
+ char * s = neg ? g_strdup_printf ("-%d.%06d", i, f) : g_strdup_printf ("%d.%06d", i, f);
 
- gchar * c = s + strlen (s);
+ char * c = s + strlen (s);
 while (* (c - 1) == '0')
 c --;
 if (* (c - 1) == '.')
@@ -825,13 +518,13 @@
 return s;
 }
 
-gboolean string_to_double_array (const gchar * string, gdouble * array, gint count)
+EXPORT bool_t string_to_double_array (const char * string, double * array, int count)
 {
- gchar * * split = g_strsplit (string, ",", -1);
+ char * * split = g_strsplit (string, ",", -1);
 if (g_strv_length (split) != count)
 goto ERR;
 
- for (gint i = 0; i < count; i ++)
+ for (int i = 0; i < count; i ++)
 {
 if (! string_to_double (split[i], & array[i]))
 goto ERR;
@@ -845,18 +538,18 @@
 return FALSE;
 }
 
-gchar * double_array_to_string (const gdouble * array, gint count)
+EXPORT char * double_array_to_string (const double * array, int count)
 {
- gchar * * split = g_malloc0 (sizeof (gchar *) * (count + 1));
+ char * * split = g_malloc0 (sizeof (char *) * (count + 1));
 
- for (gint i = 0; i < count; i ++)
+ for (int i = 0; i < count; i ++)
 {
 split[i] = double_to_string (array[i]);
 if (! split[i])
 goto ERR;
 }
 
- gchar * string = g_strjoinv (",", split);
+ char * string = g_strjoinv (",", split);
 g_strfreev (split);
 return string;

audacious-3.1.1.tar.bz2/src/libaudcore/audstrings.h -> audacious-3.2.4.tar.bz2/src/libaudcore/audstrings.h Changed

@@ -1,91 +1,59 @@
-/* Audacious
- * Copyright (C) 2005-2007 Audacious development team.
+/*
+ * audstrings.h
+ * Copyright 2009-2011 John Lindgren
+ * Copyright 2010 William Pitcock
 *
- * BMP - Cross-platform multimedia player
- * Copyright (C) 2003-2004 BMP development team.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
 *
- * Based on XMMS:
- * Copyright (C) 1998-2003 XMMS development team.
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions, and the following disclaimer.
 *
- * This program is free software; 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.
+ * 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 program is distributed in the hope that it will be useful,
- * but WITHOUT 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.
+ * 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 AUDACIOUS_STRINGS_H
-#define AUDACIOUS_STRINGS_H
-
-#include <stdlib.h>
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-gchar *str_append(gchar * str, const gchar * add_str);
-gchar *str_replace(gchar * str, gchar * new_str);
-void str_replace_in(gchar ** str, gchar * new_str);
-
-gboolean str_has_prefix_nocase(const gchar * str, const gchar * prefix);
-gboolean str_has_suffix_nocase(const gchar * str, const gchar * suffix);
-gboolean str_has_suffixes_nocase(const gchar * str, gchar * const *suffixes);
-
-gchar *str_assert_utf8(const gchar *str);
-
-void str_set_utf8_impl (gchar * (* stu_impl) (const gchar *),
- gchar * (* stuf_impl) (const gchar *, gssize, gsize *, gsize *, GError * *));
-gchar * str_to_utf8 (const gchar * str);
-gchar * str_to_utf8_full (const gchar * str, gssize len, gsize * bytes_read,
- gsize * bytes_written, GError * * err);
-
-const gchar *str_skip_chars(const gchar * str, const gchar * chars);
-
-gchar *convert_dos_path(gchar * text);
+#ifndef LIBAUDCORE_STRINGS_H
+#define LIBAUDCORE_STRINGS_H
 
-gchar *filename_get_subtune(const gchar * filename, gint * track);
-gchar *filename_split_subtune(const gchar * filename, gint * track);
+#include <libaudcore/core.h>
 
-void string_replace_char (gchar * string, gchar old_str, gchar new_str);
-void string_decode_percent (gchar * string);
-gchar * string_encode_percent (const gchar * string, gboolean is_filename);
+bool_t str_has_prefix_nocase(const char * str, const char * prefix);
+bool_t str_has_suffix_nocase(const char * str, const char * suffix);
 
-gboolean uri_is_utf8 (const gchar * uri, gboolean warn);
-gchar * uri_to_utf8 (const gchar * uri);
-void uri_check_utf8 (gchar * * uri, gboolean warn);
-gchar * filename_to_uri (const gchar * filename);
-gchar * uri_to_filename (const gchar * uri);
-gchar * uri_to_display (const gchar * uri);
+void str_set_utf8_impl (char * (* stu_impl) (const char *),
+ char * (* stuf_impl) (const char *, int, int *, int *));
+char * str_to_utf8 (const char * str);
+char * str_to_utf8_full (const char * str, int len, int * bytes_read, int * bytes_written);
 
-gchar * uri_get_extension (const gchar * uri);
+void string_replace_char (char * string, char old_str, char new_str);
 
-void string_cut_extension(gchar *string);
-gint string_compare (const gchar * a, const gchar * b);
-gint string_compare_encoded (const gchar * a, const gchar * b);
+void str_decode_percent (const char * str, int len, char * out);
+void str_encode_percent (const char * str, int len, char * out);
 
-const void * memfind (const void * mem, gint size, const void * token, gint
- length);
+char * filename_to_uri (const char * filename);
+char * uri_to_filename (const char * uri);
+char * uri_to_display (const char * uri);
 
-gchar *str_replace_fragment(gchar *s, gint size, const gchar *old_str, const gchar *new_str);
+void uri_parse (const char * uri, const char * * base_p, const char * * ext_p,
+ const char * * sub_p, int * isub_p);
 
-void string_canonize_case(gchar *string);
+int string_compare (const char * a, const char * b);
+int string_compare_encoded (const char * a, const char * b);
 
-gboolean string_to_int (const gchar * string, gint * addr);
-gboolean string_to_double (const gchar * string, gdouble * addr);
-gchar * int_to_string (gint val);
-gchar * double_to_string (gdouble val);
+char *str_replace_fragment(char *s, int size, const char *old_str, const char *new_str);
 
-gboolean string_to_double_array (const gchar * string, gdouble * array, gint count);
-gchar * double_array_to_string (const gdouble * array, gint count);
+bool_t string_to_int (const char * string, int * addr);
+bool_t string_to_double (const char * string, double * addr);
+char * int_to_string (int val);
+char * double_to_string (double val);
 
-G_END_DECLS
+bool_t string_to_double_array (const char * string, double * array, int count);
+char * double_array_to_string (const double * array, int count);
 
-#endif /* AUDACIOUS_STRINGS_H */
+#endif /* LIBAUDCORE_STRINGS_H */

audacious-3.2.4.tar.bz2/src/libaudcore/core.h Added

@@ -0,0 +1,94 @@
+/*
+ * core.h
+ * Copyright 2011 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 LIBAUDCORE_CORE_H
+#define LIBAUDCORE_CORE_H
+
+/* #define STRPOOL_DEBUG */
+
+#undef NULL
+#ifdef __cplusplus /* *sigh* */
+#define NULL 0
+#else
+#define NULL ((void *) 0)
+#endif
+
+/* "bool_t" means "int" for compatibility with GLib */
+#undef bool_t
+#define bool_t int
+
+#undef FALSE
+#define FALSE ((bool_t) 0)
+#undef TRUE
+#define TRUE ((bool_t) 1)
+
+/* Simple sanity check to catch (1) strings that are still in use after their
+ * reference count has dropped to zero and (2) strings that should have been
+ * pooled but never were. If the check fails, the program is aborted. */
+#define STR_CHECK(str) do {if ((str) && (str)[-1] != '@') strpool_abort (str);} while (0)
+
+/* If the pool contains a copy of <str>, increments its reference count.
+ * Otherwise, adds a copy of <str> to the pool with a reference count of one.
+ * In either case, returns the copy. Because this copy may be shared by other
+ * parts of the code, it should not be modified. If <str> is NULL, simply
+ * returns NULL with no side effects. */
+#ifdef STRPOOL_DEBUG
+char * str_get_debug (const char * str, const char * file, int line);
+#define str_get(str) str_get_debug (str, __FILE__, __LINE__)
+#else
+char * str_get (const char * str);
+#endif
+
+/* Increments the reference count of <str>, where <str> is the address of a
+ * string already in the pool. Faster than calling str_get() a second time.
+ * Returns <str> for convenience. If <str> is NULL, simply returns NULL with no
+ * side effects. */
+#ifdef STRPOOL_DEBUG
+char * str_ref_debug (char * str, const char * file, int line);
+#define str_ref(str) str_ref_debug (str, __FILE__, __LINE__)
+#else
+char * str_ref (char * str);
+#endif
+
+/* Decrements the reference count of <str>, where <str> is the address of a
+ * string in the pool. If the reference count drops to zero, releases the
+ * memory used by <str>. If <str> is NULL, simply returns NULL with no side
+ * effects. */
+#ifdef STRPOOL_DEBUG
+void str_unref_debug (char * str, const char * file, int line);
+#define str_unref(str) str_unref_debug (str, __FILE__, __LINE__)
+#else
+void str_unref (char * str);
+#endif
+
+/* Calls str_get() on the first <len> characters of <str>. If <str> has less
+ * than or equal to <len> characters, equivalent to str_get(). */
+char * str_nget (const char * str, int len);
+
+/* Calls sprintf() internally, then pools the produced string with str_get(). */
+char * str_printf (const char * format, ...);
+
+/* Used by STR_CHECK; should not be called directly. */
+void strpool_abort (char * str);
+
+/* Releases all memory used by the string pool. If strings remain in the pool,
+ * a warning may be printed to stderr in order to reveal memory leaks. */
+void strpool_shutdown (void);
+
+#endif /* LIBAUDCORE_CORE_H */

audacious-3.1.1.tar.bz2/src/libaudcore/eventqueue.c -> audacious-3.2.4.tar.bz2/src/libaudcore/eventqueue.c Changed

@@ -2,40 +2,40 @@
 * eventqueue.c
 * Copyright 2011 John Lindgren
 *
- * This file is part of Audacious.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
 *
- * 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.
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions, and the following disclaimer.
 *
- * 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.
+ * 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.
 *
- * 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.
+ * 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 <pthread.h>
 #include <string.h>
 
-#include "eventqueue.h"
+#include "config.h"
+#include "core.h"
 #include "hook.h"
 
 typedef struct {
- gchar * name;
+ char * name;
 void * data;
- gboolean free_data;
- gint source;
+ void (* destroy) (void *);
+ int source;
 } Event;
 
 static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
 static GList * events;
 
-static gboolean event_execute (Event * event)
+static bool_t event_execute (Event * event)
 {
 pthread_mutex_lock (& mutex);
 
@@ -47,19 +47,19 @@
 hook_call (event->name, event->data);
 
 g_free (event->name);
- if (event->free_data)
- g_free (event->data);
+ if (event->destroy)
+ event->destroy (event->data);
 
 g_slice_free (Event, event);
 return FALSE;
 }
 
-void event_queue_full (gint time, const gchar * name, void * data, gboolean free_data)
+EXPORT void event_queue_full (int time, const char * name, void * data, void (* destroy) (void *))
 {
 Event * event = g_slice_new (Event);
 event->name = g_strdup (name);
 event->data = data;
- event->free_data = free_data;
+ event->destroy = destroy;
 
 pthread_mutex_lock (& mutex);
 
@@ -69,7 +69,7 @@
 pthread_mutex_unlock (& mutex);
 }
 
-void event_queue_cancel (const gchar * name, void * data)
+EXPORT void event_queue_cancel (const char * name, void * data)
 {
 pthread_mutex_lock (& mutex);
 
@@ -85,8 +85,8 @@
 events = g_list_delete_link (events, node);
 
 g_free (event->name);
- if (event->free_data)
- g_free (event->data);
+ if (event->destroy)
+ event->destroy (event->data);
 
 g_slice_free (Event, event);
 }

audacious-3.1.1.tar.bz2/src/libaudcore/hook.c -> audacious-3.2.4.tar.bz2/src/libaudcore/hook.c Changed

@@ -1,182 +1,110 @@
-/* Audacious
- * Copyright (c) 2006-2007 William Pitcock
+/*
+ * hook.c
+ * Copyright 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
 *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions, and the following disclaimer.
 *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses>.
+ * 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.
 *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
+ * This software is provided "as is" and without any warranty, express or
+ * implied. In no event shall the authors be liable for any damages arising from
+ * the use of this software.
 */
 
-#include <stdio.h>
+#include <glib.h>
+#include <pthread.h>
 #include <string.h>
 
-#include <glib.h>
+#include "config.h"
+#include "core.h"
 #include "hook.h"
 
-static GThread * hook_thread;
-static GSList *hook_list;
+typedef struct {
+ HookFunction func;
+ void * user;
+} HookItem;
 
-void hook_init (void)
-{
- hook_thread = g_thread_self ();
-}
+static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+static GHashTable * hooks;
 
-static Hook *
-hook_find(const gchar *name)
+/* str_unref() may be a macro */
+static void str_unref_cb (void * str)
 {
- GSList *list;
-
- for (list = hook_list; list != NULL; list = g_slist_next(list))
- {
- Hook *hook = (Hook *) list->data;
-
- if (!g_ascii_strcasecmp(hook->name, name))
- return hook;
- }
-
- return NULL;
+ str_unref (str);
 }
 
-void
-hook_register(const gchar *name)
+EXPORT void hook_associate (const char * name, HookFunction func, void * user)
 {
- Hook *hook;
+ pthread_mutex_lock (& mutex);
 
- g_return_if_fail(name != NULL);
+ if (! hooks)
+ hooks = g_hash_table_new_full (g_str_hash, g_str_equal, str_unref_cb, NULL);
 
- if (hook_find(name) != NULL)
- return;
+ HookItem * item = g_slice_new (HookItem);
+ item->func = func;
+ item->user = user;
 
- hook = g_new0(Hook, 1);
- hook->name = g_strdup(name);
- hook->items = NULL;
+ GList * items = g_hash_table_lookup (hooks, name);
+ items = g_list_prepend (items, item);
+ g_hash_table_insert (hooks, str_get (name), items);
 
- hook_list = g_slist_append(hook_list, hook);
+ pthread_mutex_unlock (& mutex);
 }
 
-gint
-hook_associate(const gchar *name, HookFunction func, gpointer user_data)
+EXPORT void hook_dissociate_full (const char * name, HookFunction func, void * user)
 {
- Hook *hook;
- HookItem *hookitem;
+ pthread_mutex_lock (& mutex);
 
- g_return_val_if_fail(name != NULL, -1);
- g_return_val_if_fail(func != NULL, -1);
+ if (! hooks)
+ goto DONE;
 
- hook = hook_find(name);
+ GList * items = g_hash_table_lookup (hooks, name);
 
- if (hook == NULL)
+ GList * node = items;
+ while (node)
 {
- hook_register(name);
- hook = hook_find(name);
- }
-
- /* this *cant* happen */
- g_return_val_if_fail(hook != NULL, -1);
-
- hookitem = g_new0(HookItem, 1);
- hookitem->func = func;
- hookitem->user_data = user_data;
-
- hook->items = g_slist_append(hook->items, hookitem);
- return 0;
-}
-
-gint
-hook_dissociate(const gchar *name, HookFunction func)
-{
- Hook *hook;
- GSList *iter;
-
- g_return_val_if_fail(name != NULL, -1);
- g_return_val_if_fail(func != NULL, -1);
-
- hook = hook_find(name);
+ HookItem * item = node->data;
+ GList * next = node->next;
 
- if (hook == NULL)
- return -1;
-
- iter = hook->items;
- while (iter != NULL)
- {
- HookItem *hookitem = (HookItem*)iter->data;
- if (hookitem->func == func)
+ if (item->func == func && (! user || item->user == user))
 {
- hook->items = g_slist_delete_link(hook->items, iter);
- g_free( hookitem );
- return 0;
+ items = g_list_delete_link (items, node);
+ g_slice_free (HookItem, item);
 }
- iter = g_slist_next(iter);
- }
- return -1;
-}
 
-gint
-hook_dissociate_full(const gchar *name, HookFunction func, gpointer user_data)
-{
- Hook *hook;
- GSList *iter;
-
- g_return_val_if_fail(name != NULL, -1);
- g_return_val_if_fail(func != NULL, -1);
-
- hook = hook_find(name);
+ node = next;
+ }
 
- if (hook == NULL)
- return -1;
+ if (items)
+ g_hash_table_insert (hooks, str_get (name), items);
+ else
+ g_hash_table_remove (hooks, name);
 
- iter = hook->items;
- while (iter != NULL)
- {
- HookItem *hookitem = (HookItem*)iter->data;
- if (hookitem->func == func && hookitem->user_data == user_data)
- {
- hook->items = g_slist_delete_link(hook->items, iter);
- g_free( hookitem );
- return 0;
- }
- iter = g_slist_next(iter);
- }
- return -1;
+DONE:
+ pthread_mutex_unlock (& mutex);
 }
 
-void
-hook_call(const gchar *name, gpointer hook_data)
+EXPORT void hook_call (const char * name, void * data)
 {
- Hook *hook;
- GSList *iter;
+ pthread_mutex_lock (& mutex);
 
- // Some plugins (skins, cdaudio-ng, maybe others) set up hooks that are not
- // thread safe. We can disagree about whether that's the way it should be;
- // but that's the way it is, so live with it. -jlindgren
- if (g_thread_self () != hook_thread)
- {
- fprintf (stderr, "Warning: Unsafe hook_call of \"%s\" from secondary "
- "thread. (Use event_queue instead.)\n", name);
- return;
- }
+ if (! hooks)
+ goto DONE;
 
- hook = hook_find(name);
+ GList * node = g_hash_table_lookup (hooks, name);
 
- if (hook == NULL)
- return;
-
- for (iter = hook->items; iter != NULL; iter = g_slist_next(iter))
+ for (; node; node = node->next)
 {
- HookItem *hookitem = (HookItem*)iter->data;
-
- g_return_if_fail(hookitem->func != NULL);
-
- hookitem->func(hook_data, hookitem->user_data);
+ HookItem * item = node->data;
+ item->func (data, item->user);
 }
+
+DONE:
+ pthread_mutex_unlock (& mutex);
 }

audacious-3.1.1.tar.bz2/src/libaudcore/hook.h -> audacious-3.2.4.tar.bz2/src/libaudcore/hook.h Changed

@@ -1,44 +1,50 @@
-/* Audacious
- * Copyright (c) 2006-2007 William Pitcock
+/*
+ * hook.h
+ * Copyright 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
 *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions, and the following disclaimer.
 *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses>.
+ * 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.
 *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
+ * 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 AUDACIOUS_HOOK_H
-#define AUDACIOUS_HOOK_H
+#ifndef LIBAUDCORE_HOOK_H
+#define LIBAUDCORE_HOOK_H
 
-#include <glib.h>
+typedef void (* HookFunction) (void * data, void * user);
 
-typedef void (*HookFunction)(gpointer hook_data, gpointer user_data);
+/* Adds <func> to the list of functions to be called when the hook <name> is
+ * triggered. */
+void hook_associate (const char * name, HookFunction func, void * user);
 
-typedef struct {
- HookFunction func;
- gpointer user_data;
-} HookItem;
+/* Removes all instances matching <func> and <user> from the list of functions
+ * to be called when the hook <name> is triggered. If <user> is NULL, all
+ * instances matching <func> are removed. */
+void hook_dissociate_full (const char * name, HookFunction func, void * user);
 
-typedef struct {
- const gchar *name;
- GSList *items;
-} Hook;
+#define hook_dissociate(n, f) hook_dissociate_full (n, f, NULL)
 
-void hook_init (void);
-void hook_register(const gchar *name);
-gint hook_associate(const gchar *name, HookFunction func, gpointer user_data);
-gint hook_dissociate(const gchar *name, HookFunction func);
-gint hook_dissociate_full(const gchar *name, HookFunction func, gpointer user_data);
-void hook_call(const gchar *name, gpointer hook_data);
+/* Triggers the hook <name>. */
+void hook_call (const char * name, void * data);
 
-#endif /* AUDACIOUS_HOOK_H */
+/* Schedules a call of the hook <name> from the program's main loop, to be
+ * executed in <time> milliseconds. If <destroy> is not NULL, it will be called
+ * on <data> after the hook is called. */
+void event_queue_full (int time, const char * name, void * data, void (* destroy) (void *));
+
+#define event_queue(n, d) event_queue_full (0, n, d, NULL)
+
+/* Cancels pending hook calls matching <name> and <data>. If <data> is NULL,
+ * all hook calls matching <name> are canceled. */
+void event_queue_cancel (const char * name, void * data);
+
+#endif /* LIBAUDCORE_HOOK_H */

audacious-3.1.1.tar.bz2/src/libaudcore/index.c -> audacious-3.2.4.tar.bz2/src/libaudcore/index.c Changed

@@ -1,22 +1,20 @@
 /*
 * index.c
- * Copyright 2009-2010 John Lindgren
+ * Copyright 2009-2011 John Lindgren
 *
- * This file is part of Audacious.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
 *
- * 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.
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions, and the following disclaimer.
 *
- * 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.
+ * 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.
 *
- * 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.
+ * 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>
@@ -24,41 +22,46 @@
 
 #include <glib.h>
 
+#include "config.h"
 #include "index.h"
 
-struct index
-{
+struct _Index {
 void * * data;
- gint count, size;
- gint (* compare) (const void * a, const void * b, void * data);
- void * compare_data;
+ int count, size;
 };
 
-struct index * index_new (void)
+typedef struct {
+ int (* compare) (const void * a, const void * b);
+} CompareWrapper;
+
+typedef struct {
+ int (* compare) (const void * a, const void * b, void * data);
+ void * data;
+} CompareWrapper2;
+
+EXPORT Index * index_new (void)
 {
- struct index * index = g_slice_new (struct index);
+ Index * index = g_slice_new (Index);
 
 index->data = NULL;
 index->count = 0;
 index->size = 0;
- index->compare = NULL;
- index->compare_data = NULL;
 
 return index;
 }
 
-void index_free (struct index * index)
+EXPORT void index_free (Index * index)
 {
 g_free (index->data);
- g_slice_free (struct index, index);
+ g_slice_free (Index, index);
 }
 
-gint index_count (struct index * index)
+EXPORT int index_count (Index * index)
 {
 return index->count;
 }
 
-void index_allocate (struct index * index, gint size)
+EXPORT void index_allocate (Index * index, int size)
 {
 if (size <= index->size)
 return;
@@ -72,17 +75,17 @@
 index->data = g_realloc (index->data, sizeof (void *) * index->size);
 }
 
-void index_set (struct index * index, gint at, void * value)
+EXPORT void index_set (Index * index, int at, void * value)
 {
 index->data[at] = value;
 }
 
-void * index_get (struct index * index, gint at)
+EXPORT void * index_get (Index * index, int at)
 {
 return index->data[at];
 }
 
-static void make_room (struct index * index, gint at, gint count)
+static void make_room (Index * index, int at, int count)
 {
 index_allocate (index, index->count + count);
 
@@ -93,88 +96,81 @@
 index->count += count;
 }
 
-void index_insert (struct index * index, gint at, void * value)
+EXPORT void index_insert (Index * index, int at, void * value)
 {
 make_room (index, at, 1);
 index->data[at] = value;
 }
 
-void index_append (struct index * index, void * value)
+EXPORT void index_append (Index * index, void * value)
 {
 index_insert (index, index->count, value);
 }
 
-void index_copy_set (struct index * source, gint from, struct index * target,
- gint to, gint count)
+EXPORT void index_copy_set (Index * source, int from, Index * target,
+ int to, int count)
 {
 memcpy (target->data + to, source->data + from, sizeof (void *) * count);
 }
 
-void index_copy_insert (struct index * source, gint from, struct index * target,
- gint to, gint count)
+EXPORT void index_copy_insert (Index * source, int from, Index * target,
+ int to, int count)
 {
 make_room (target, to, count);
 memcpy (target->data + to, source->data + from, sizeof (void *) * count);
 }
 
-void index_copy_append (struct index * source, gint from, struct index * target,
- gint count)
+EXPORT void index_copy_append (Index * source, int from, Index * target,
+ int count)
 {
 index_copy_insert (source, from, target, target->count, count);
 }
 
-void index_merge_insert (struct index * first, gint at, struct index * second)
+EXPORT void index_merge_insert (Index * first, int at, Index * second)
 {
 index_copy_insert (second, 0, first, at, second->count);
 }
 
-void index_merge_append (struct index * first, struct index * second)
+EXPORT void index_merge_append (Index * first, Index * second)
 {
 index_copy_insert (second, 0, first, first->count, second->count);
 }
 
-void index_move (struct index * index, gint from, gint to, gint count)
+EXPORT void index_move (Index * index, int from, int to, int count)
 {
 memmove (index->data + to, index->data + from, sizeof (void *) * count);
 }
 
-void index_delete (struct index * index, gint at, gint count)
+EXPORT void index_delete (Index * index, int at, int count)
 {
 index->count -= count;
 memmove (index->data + at, index->data + at + count, sizeof (void *) *
 (index->count - at));
 }
 
-static gint index_compare (const void * a, const void * b, void * _compare)
+static int index_compare (const void * ap, const void * bp, void * _wrapper)
 {
- gint (* compare) (const void *, const void *) = _compare;
-
- return compare (* (const void * *) a, * (const void * *) b);
+ CompareWrapper * wrapper = _wrapper;
+ return wrapper->compare (* (const void * *) ap, * (const void * *) bp);
 }
 
-void index_sort (struct index * index, gint (* compare) (const void *, const
- void *))
+EXPORT void index_sort (Index * index, int (* compare) (const void *, const void *))
 {
+ CompareWrapper wrapper = {compare};
 g_qsort_with_data (index->data, index->count, sizeof (void *),
- index_compare, compare);
+ index_compare, & wrapper);
 }
 
-static gint index_compare_with_data (const void * a, const void * b, void *
- _index)
+static int index_compare2 (const void * ap, const void * bp, void * _wrapper)
 {
- struct index * index = _index;
-
- return index->compare (* (const void * *) a, * (const void * *) b,
- index->compare_data);
+ CompareWrapper2 * wrapper = _wrapper;
+ return wrapper->compare (* (const void * *) ap, * (const void * *) bp, wrapper->data);
 }
 
-void index_sort_with_data (struct index * index, gint (* compare)
+EXPORT void index_sort_with_data (Index * index, int (* compare)
 (const void * a, const void * b, void * data), void * data)
 {
- index->compare = compare;
- index->compare_data = data;
+ CompareWrapper2 wrapper = {compare, data};
 g_qsort_with_data (index->data, index->count, sizeof (void *),
- index_compare_with_data, index);
- index->compare = NULL;
- index->compare_data = NULL;
+ index_compare2, & wrapper);
 }

audacious-3.1.1.tar.bz2/src/libaudcore/index.h -> audacious-3.2.4.tar.bz2/src/libaudcore/index.h Changed

@@ -1,50 +1,45 @@
 /*
 * index.h
- * Copyright 2009-2010 John Lindgren
+ * Copyright 2009-2011 John Lindgren
 *
- * This file is part of Audacious.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
 *
- * 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.
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions, and the following disclaimer.
 *
- * 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.
+ * 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.
 *
- * 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.
+ * 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 AUDACIOUS_INDEX_H
-#define AUDACIOUS_INDEX_H
+#ifndef LIBAUDCORE_INDEX_H
+#define LIBAUDCORE_INDEX_H
 
-struct index;
+struct _Index;
+typedef struct _Index Index;
 
-struct index * index_new (void);
-void index_free (struct index * index);
-gint index_count (struct index * index);
-void index_allocate (struct index * index, gint size);
-void index_set (struct index * index, gint at, void * value);
-void * index_get (struct index * index, gint at);
-void index_insert (struct index * index, gint at, void * value);
-void index_append (struct index * index, void * value);
-void index_copy_set (struct index * source, gint from, struct index * target,
- gint to, gint count);
-void index_copy_insert (struct index * source, gint from, struct index * target,
- gint to, gint count);
-void index_copy_append (struct index * source, gint from, struct index * target,
- gint count);
-void index_merge_insert (struct index * first, gint at, struct index * second);
-void index_merge_append (struct index * first, struct index * second);
-void index_move (struct index * index, gint from, gint to, gint count);
-void index_delete (struct index * index, gint at, gint count);
-void index_sort (struct index * index, gint (* compare) (const void * a,
- const void * b));
-void index_sort_with_data (struct index * index, gint (* compare)
- (const void * a, const void * b, void * data), void * data);
+Index * index_new (void);
+void index_free (Index * index);
+int index_count (Index * index);
+void index_allocate (Index * index, int size);
+void index_set (Index * index, int at, void * value);
+void * index_get (Index * index, int at);
+void index_insert (Index * index, int at, void * value);
+void index_append (Index * index, void * value);
+void index_copy_set (Index * source, int from, Index * target, int to, int count);
+void index_copy_insert (Index * source, int from, Index * target, int to, int count);
+void index_copy_append (Index * source, int from, Index * target, int count);
+void index_merge_insert (Index * first, int at, Index * second);
+void index_merge_append (Index * first, Index * second);
+void index_move (Index * index, int from, int to, int count);
+void index_delete (Index * index, int at, int count);
+void index_sort (Index * index, int (* compare) (const void * a, const void * b));
+void index_sort_with_data (Index * index, int (* compare) (const void * a,
+ const void * b, void * data), void * data);
 
-#endif
+#endif /* LIBAUDCORE_INDEX_H */

audacious-3.2.4.tar.bz2/src/libaudcore/strpool.c Added

@@ -0,0 +1,206 @@
+/*
+ * strpool.c
+ * Copyright 2011 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 <glib.h>
+#include <pthread.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "config.h"
+#include "core.h"
+
+/* Each string in the pool is allocated with five leading bytes: a 32-bit
+ * reference count and a one-byte signature, the '@' character. */
+
+static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+static GHashTable * table;
+
+#ifdef STRPOOL_DEBUG
+static GHashTable * logged;
+
+static void str_log (const char * str, const char * op, const char * file, int line)
+{
+ if (! logged)
+ logged = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
+
+ GList * list = g_hash_table_lookup (logged, str);
+ list = g_list_prepend (list, g_strdup_printf ("%s by %s:%d", op, file, line));
+ g_hash_table_insert (logged, g_strdup (str), list);
+}
+
+static void str_log_dump (const char * str)
+{
+ if (! logged)
+ return;
+
+ for (GList * node = g_hash_table_lookup (logged, str); node; node = node->next)
+ printf (" - %s\n", (char *) node->data);
+}
+#endif
+
+static void str_destroy (void * str)
+{
+ * ((char *) str - 1) = 0;
+ free ((char *) str - 5);
+}
+
+#ifdef STRPOOL_DEBUG
+EXPORT char * str_get_debug (const char * str, const char * file, int line)
+#else
+EXPORT char * str_get (const char * str)
+#endif
+{
+ if (! str)
+ return NULL;
+
+ char * copy;
+ pthread_mutex_lock (& mutex);
+
+#ifdef STRPOOL_DEBUG
+ str_log (str, "get", file, line);
+#endif
+
+ if (! table)
+ table = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, str_destroy);
+
+ if ((copy = g_hash_table_lookup (table, str)))
+ {
+ void * mem = copy - 5;
+ (* (int32_t *) mem) ++;
+ }
+ else
+ {
+ void * mem = malloc (6 + strlen (str));
+ (* (int32_t *) mem) = 1;
+
+ copy = (char *) mem + 5;
+ copy[-1] = '@';
+ strcpy (copy, str);
+
+ g_hash_table_insert (table, copy, copy);
+ }
+
+ pthread_mutex_unlock (& mutex);
+ return copy;
+}
+
+#ifdef STRPOOL_DEBUG
+EXPORT char * str_ref_debug (char * str, const char * file, int line)
+#else
+EXPORT char * str_ref (char * str)
+#endif
+{
+ if (! str)
+ return NULL;
+
+ pthread_mutex_lock (& mutex);
+ STR_CHECK (str);
+
+#ifdef STRPOOL_DEBUG
+ str_log (str, "ref", file, line);
+#endif
+
+ void * mem = str - 5;
+ (* (int32_t *) mem) ++;
+
+ pthread_mutex_unlock (& mutex);
+ return str;
+}
+
+#ifdef STRPOOL_DEBUG
+EXPORT void str_unref_debug (char * str, const char * file, int line)
+#else
+EXPORT void str_unref (char * str)
+#endif
+{
+ if (! str)
+ return;
+
+ pthread_mutex_lock (& mutex);
+ STR_CHECK (str);
+
+#ifdef STRPOOL_DEBUG
+ str_log (str, "unref", file, line);
+#endif
+
+ void * mem = str - 5;
+ if (! -- (* (int32_t *) mem))
+ g_hash_table_remove (table, str);
+
+ pthread_mutex_unlock (& mutex);
+}
+
+EXPORT char * str_nget (const char * str, int len)
+{
+ if (strlen (str) <= len)
+ return str_get (str);
+
+ char buf[len + 1];
+ memcpy (buf, str, len);
+ buf[len] = 0;
+
+ return str_get (buf);
+}
+
+EXPORT char * str_printf (const char * format, ...)
+{
+ va_list args;
+
+ va_start (args, format);
+ int len = vsnprintf (NULL, 0, format, args);
+ va_end (args);
+
+ char buf[len + 1];
+
+ va_start (args, format);
+ vsnprintf (buf, sizeof buf, format, args);
+ va_end (args);
+
+ return str_get (buf);
+}
+
+EXPORT void strpool_abort (char * str)
+{
+ fprintf (stderr, "String not in pool: %s\n", str);
+#ifdef STRPOOL_DEBUG
+ str_log_dump (str);
+#endif
+ abort ();
+}
+
+static void str_leaked (void * key, void * str, void * unused)
+{
+ fprintf (stderr, "String not freed: %s\n", (char *) str);
+#ifdef STRPOOL_DEBUG
+ str_log_dump (str);
+#endif
+}
+
+EXPORT void strpool_shutdown (void)
+{
+ if (! table)
+ return;
+
+ g_hash_table_foreach (table, str_leaked, NULL);
+ g_hash_table_destroy (table);
+ table = NULL;
+}

audacious-3.1.1.tar.bz2/src/libaudcore/tuple.c -> audacious-3.2.4.tar.bz2/src/libaudcore/tuple.c Changed

@@ -1,6 +1,7 @@
 /*
- * Audacious
- * Copyright (c) 2006-2007 Audacious team
+ * tuple.c
+ * Copyright 2007-2011 William Pitcock, Christian Birchinger, Matti Hämäläinen,
+ * Giacomo Lozito, Eugene Zagidullin, and 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
@@ -17,34 +18,74 @@
 * The Audacious team does not consider modular code linking to
 * Audacious or using our public API to be a derived work.
 */
+
 /**
 * @file tuple.c
 * @brief Basic Tuple handling API.
 */
 
 #include <glib.h>
-#include <mowgli.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include <audacious/i18n.h>
 
+#include "audstrings.h"
 #include "config.h"
 #include "tuple.h"
-#include "audstrings.h"
-#include "stringpool.h"
+#include "tuple_formatter.h"
+
+#define BLOCK_VALS 4
+
+typedef struct {
+ char *name;
+ TupleValueType type;
+} TupleBasicType;
+
+typedef union {
+ char * str;
+ int x;
+} TupleVal;
+
+typedef struct _TupleBlock TupleBlock;
 
-static gboolean set_string (Tuple * tuple, const gint nfield,
- const gchar * field, gchar * string, gboolean take);
+struct _TupleBlock {
+ TupleBlock * next;
+ char fields[BLOCK_VALS];
+ TupleVal vals[BLOCK_VALS];
+};
+
+/**
+ * Structure for holding and passing around miscellaneous track
+ * metadata. This is not the same as a playlist entry, though.
+ */
+struct _Tuple {
+ int refcount;
+ int64_t setmask;
+ TupleBlock * blocks;
+
+ int nsubtunes; /**< Number of subtunes, if any. Values greater than 0
+ mean that there are subtunes and #subtunes array
+ may be set. */
+ int *subtunes; /**< Array of int containing subtune index numbers.
+ Can be NULL if indexing is linear or if
+ there are no subtunes. */
+};
+
+#define BIT(i) ((int64_t) 1 << (i))
 
 /** Ordered table of basic #Tuple field names and their #TupleValueType.
 */
-const TupleBasicType tuple_fields[FIELD_LAST] = {
+static const TupleBasicType tuple_fields[TUPLE_FIELDS] = {
 { "artist", TUPLE_STRING },
 { "title", TUPLE_STRING },
 { "album", TUPLE_STRING },
 { "comment", TUPLE_STRING },
 { "genre", TUPLE_STRING },
 
- { "track", TUPLE_STRING },
 { "track-number", TUPLE_INT },
 { "length", TUPLE_INT },
 { "year", TUPLE_INT },
@@ -54,10 +95,9 @@
 { "file-name", TUPLE_STRING },
 { "file-path", TUPLE_STRING },
 { "file-ext", TUPLE_STRING },
- { "song-artist", TUPLE_STRING },
 
- { "mtime", TUPLE_INT },
- { "formatter", TUPLE_STRING },
+ { "song-artist", TUPLE_STRING },
+ { "composer", TUPLE_STRING },
 { "performer", TUPLE_STRING },
 { "copyright", TUPLE_STRING },
 { "date", TUPLE_STRING },
@@ -76,113 +116,182 @@
 { "gain-track-peak", TUPLE_INT },
 { "gain-gain-unit", TUPLE_INT },
 { "gain-peak-unit", TUPLE_INT },
-
- { "composer", TUPLE_STRING },
 };
 
+typedef struct {
+ const char * name;
+ int field;
+} FieldDictEntry;
+
+/* used for binary search, MUST be in alphabetical order */
+static const FieldDictEntry field_dict[TUPLE_FIELDS] = {
+ {"album", FIELD_ALBUM},
+ {"artist", FIELD_ARTIST},
+ {"bitrate", FIELD_BITRATE},
+ {"codec", FIELD_CODEC},
+ {"comment", FIELD_COMMENT},
+ {"composer", FIELD_COMPOSER},
+ {"copyright", FIELD_COPYRIGHT},
+ {"date", FIELD_DATE},
+ {"file-ext", FIELD_FILE_EXT},
+ {"file-name", FIELD_FILE_NAME},
+ {"file-path", FIELD_FILE_PATH},
+ {"gain-album-gain", FIELD_GAIN_ALBUM_GAIN},
+ {"gain-album-peak", FIELD_GAIN_ALBUM_PEAK},
+ {"gain-gain-unit", FIELD_GAIN_GAIN_UNIT},
+ {"gain-peak-unit", FIELD_GAIN_PEAK_UNIT},
+ {"gain-track-gain", FIELD_GAIN_TRACK_GAIN},
+ {"gain-track-peak", FIELD_GAIN_TRACK_PEAK},
+ {"genre", FIELD_GENRE},
+ {"length", FIELD_LENGTH},
+ {"mime-type", FIELD_MIMETYPE},
+ {"performer", FIELD_PERFORMER},
+ {"quality", FIELD_QUALITY},
+ {"segment-end", FIELD_SEGMENT_END},
+ {"segment-start", FIELD_SEGMENT_START},
+ {"song-artist", FIELD_SONG_ARTIST},
+ {"subsong-id", FIELD_SUBSONG_ID},
+ {"subsong-num", FIELD_SUBSONG_NUM},
+ {"title", FIELD_TITLE},
+ {"track-number", FIELD_TRACK_NUMBER},
+ {"year", FIELD_YEAR}};
+
+static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+
+
+static int field_dict_compare (const void * a, const void * b)
+{
+ return strcmp (((FieldDictEntry *) a)->name, ((FieldDictEntry *) b)->name);
+}
 
-/** A mowgli heap containing all the allocated tuples. */
-static mowgli_heap_t *tuple_heap = NULL;
-
-/** A mowgli heap containing values contained by tuples. */
-static mowgli_heap_t *tuple_value_heap = NULL;
-static mowgli_object_class_t tuple_klass;
+EXPORT int tuple_field_by_name (const char * name)
+{
+ FieldDictEntry find = {name, -1};
+ FieldDictEntry * found = bsearch (& find, field_dict, TUPLE_FIELDS,
+ sizeof (FieldDictEntry), field_dict_compare);
 
-/** Global lock to preserve data consistency of heaps */
-static GStaticMutex tuple_mutex = G_STATIC_MUTEX_INIT;
+ if (found)
+ return found->field;
 
-//@{
-/**
- * Convenience macros to lock the globally
- * used internal Tuple system structures.
- */
-#define TUPLE_LOCK_WRITE(X) g_static_mutex_lock (& tuple_mutex)
-#define TUPLE_UNLOCK_WRITE(X) g_static_mutex_unlock (& tuple_mutex)
-#define TUPLE_LOCK_READ(X) g_static_mutex_lock (& tuple_mutex)
-#define TUPLE_UNLOCK_READ(X) g_static_mutex_unlock (& tuple_mutex)
-//@}
+ fprintf (stderr, "Unknown tuple field name \"%s\".\n", name);
+ return -1;
+}
 
-static void tuple_value_destroy (TupleValue * value)
+EXPORT const char * tuple_field_get_name (int field)
 {
- if (value->type == TUPLE_STRING)
- stringpool_unref (value->value.string);
+ if (field < 0 || field >= TUPLE_FIELDS)
+ return NULL;
 
- memset (value, 0, sizeof (TupleValue));
- mowgli_heap_free (tuple_value_heap, value);
+ return tuple_fields[field].name;
 }
 
-/* iterative destructor of tuple values. */
-static void tuple_value_destroy_cb (const gchar * key, void * data, void * priv)
+EXPORT TupleValueType tuple_field_get_type (int field)
 {
- tuple_value_destroy (data);
+ if (field < 0 || field >= TUPLE_FIELDS)
+ return TUPLE_UNKNOWN;
+
+ return tuple_fields[field].type;
 }
 
-static void
-tuple_destroy(gpointer data)
+static TupleVal * lookup_val (Tuple * tuple, int field, bool_t add, bool_t remove)
 {
- Tuple *tuple = (Tuple *) data;
- gint i;
+ if ((tuple->setmask & BIT (field)))
+ {
+ for (TupleBlock * block = tuple->blocks; block; block = block->next)
+ {
+ for (int i = 0; i < BLOCK_VALS; i ++)
+ {
+ if (block->fields[i] == field)
+ {
+ if (remove)
+ {
+ tuple->setmask &= ~BIT (field);
+ block->fields[i] = -1;
+ }
+
+ return & block->vals[i];
+ }
+ }
+ }
+ }
+
+ if (! add)
+ return NULL;
 
- TUPLE_LOCK_WRITE();
- mowgli_patricia_destroy(tuple->dict, tuple_value_destroy_cb, NULL);
+ tuple->setmask |= BIT (field);
 
- for (i = 0; i < FIELD_LAST; i++)
+ for (TupleBlock * block = tuple->blocks; block; block = block->next)
 {
- if (tuple->values[i])
- tuple_value_destroy (tuple->values[i]);
+ for (int i = 0; i < BLOCK_VALS; i ++)
+ {
+ if (block->fields[i] < 0)
+ {
+ block->fields[i] = field;
+ return & block->vals[i];
+ }
+ }
 }
 
- g_free(tuple->subtunes);
+ TupleBlock * block = g_slice_new0 (TupleBlock);
+ memset (block->fields, -1, BLOCK_VALS);
 
- memset (tuple, 0, sizeof (Tuple));
- mowgli_heap_free(tuple_heap, tuple);
- TUPLE_UNLOCK_WRITE();
+ block->next = tuple->blocks;
+ tuple->blocks = block;
+
+ block->fields[0] = field;
+ return & block->vals[0];
 }
 
-static Tuple *
-tuple_new_unlocked(void)
+static void tuple_destroy_unlocked (Tuple * tuple)
 {
- Tuple *tuple;
-
- if (tuple_heap == NULL)
+ TupleBlock * next;
+ for (TupleBlock * block = tuple->blocks; block; block = next)
 {
- tuple_heap = mowgli_heap_create(sizeof(Tuple), 512, BH_NOW);
- tuple_value_heap = mowgli_heap_create(sizeof(TupleValue), 1024, BH_NOW);
- mowgli_object_class_init(&tuple_klass, "audacious.tuple", tuple_destroy, FALSE);
+ next = block->next;
+
+ for (int i = 0; i < BLOCK_VALS; i ++)
+ {
+ int field = block->fields[i];
+ if (field >= 0 && tuple_fields[field].type == TUPLE_STRING)
+ str_unref (block->vals[i].str);
+ }
+
+ memset (block, 0, sizeof (TupleBlock));
+ g_slice_free (TupleBlock, block);
 }
 
- /* FIXME: use mowgli_object_bless_from_class() in mowgli 0.4
- when it is released --nenolod */
- tuple = mowgli_heap_alloc(tuple_heap);
- memset(tuple, 0, sizeof(Tuple));
- mowgli_object_init(mowgli_object(tuple), NULL, &tuple_klass, NULL);
+ g_free(tuple->subtunes);
 
- tuple->dict = mowgli_patricia_create(string_canonize_case);
+ memset (tuple, 0, sizeof (Tuple));
+ g_slice_free (Tuple, tuple);
+}
 
+EXPORT Tuple * tuple_new (void)
+{
+ Tuple * tuple = g_slice_new0 (Tuple);
+ tuple->refcount = 1;
 return tuple;
 }
 
-/**
- * Allocates a new empty #Tuple structure. Must be freed via tuple_free().
- *
- * @return Pointer to newly allocated Tuple.
- */
-Tuple *
-tuple_new(void)
+EXPORT Tuple * tuple_ref (Tuple * tuple)
 {
- Tuple *tuple;
-
- TUPLE_LOCK_WRITE();
+ pthread_mutex_lock (& mutex);
 
- tuple = tuple_new_unlocked();
+ tuple->refcount ++;
 
- TUPLE_UNLOCK_WRITE();
+ pthread_mutex_unlock (& mutex);
 return tuple;
 }
 
-static TupleValue *
-tuple_associate_data(Tuple *tuple, const gint cnfield, const gchar *field, TupleValueType ftype);
+EXPORT void tuple_unref (Tuple * tuple)
+{
+ pthread_mutex_lock (& mutex);
+
+ if (! -- tuple->refcount)
+ tuple_destroy_unlocked (tuple);
 
+ pthread_mutex_unlock (& mutex);
+}
 
 /**
 * Sets filename/URI related fields of a #Tuple structure, based
@@ -192,70 +301,30 @@
 * @param[in] filename Filename URI.
 * @param[in,out] tuple Tuple structure to manipulate.
 */
-void tuple_set_filename (Tuple * tuple, const gchar * name)
+EXPORT void tuple_set_filename (Tuple * tuple, const char * filename)
 {
- const gchar * slash;
- if ((slash = strrchr (name, '/')))
- {
- gchar path[slash - name + 2];
- memcpy (path, name, slash - name + 1);
- path[slash - name + 1] = 0;
+ const char * base, * ext, * sub;
+ int isub;
 
- set_string (tuple, FIELD_FILE_PATH, NULL, uri_to_display (path), TRUE);
- name = slash + 1;
- }
+ uri_parse (filename, & base, & ext, & sub, & isub);
 
- gchar buf[strlen (name) + 1];
- strcpy (buf, name);
+ char path[base - filename + 1];
+ str_decode_percent (filename, base - filename, path);
+ tuple_set_str (tuple, FIELD_FILE_PATH, NULL, path);
 
- gchar * c;
- if ((c = strrchr (buf, '?')))
- {
- gint sub;
- if (sscanf (c + 1, "%d", & sub) == 1)
- tuple_associate_int (tuple, FIELD_SUBSONG_ID, NULL, sub);
+ char name[ext - base + 1];
+ str_decode_percent (base, ext - base, name);
+ tuple_set_str (tuple, FIELD_FILE_NAME, NULL, name);
 
- * c = 0;
+ if (ext < sub)
+ {
+ char extbuf[sub - ext];
+ str_decode_percent (ext + 1, sub - ext - 1, extbuf);
+ tuple_set_str (tuple, FIELD_FILE_EXT, NULL, extbuf);
 }
 
- gchar * base = uri_to_display (buf);
-
- if ((c = strrchr (base, '.')))
- set_string (tuple, FIELD_FILE_EXT, NULL, c + 1, FALSE);
-
- set_string (tuple, FIELD_FILE_NAME, NULL, base, TRUE);
-}
-
-/**
- * Creates a copy of given TupleValue structure, with copied data.
- *
- * @param[in] src TupleValue structure to be made a copy of.
- * @return Pointer to newly allocated TupleValue or NULL
- * if error occured or source was NULL.
- */
-static TupleValue *
-tuple_copy_value(TupleValue *src)
-{
- TupleValue *res;
-
- if (src == NULL) return NULL;
-
- res = mowgli_heap_alloc(tuple_value_heap);
- g_strlcpy(res->name, src->name, TUPLE_NAME_MAX);
- res->type = src->type;
-
- switch (src->type) {
- case TUPLE_STRING:
- res->value.string = stringpool_get (src->value.string, FALSE);
- break;
- case TUPLE_INT:
- res->value.integer = src->value.integer;
- break;
- default:
- mowgli_heap_free (tuple_value_heap, res);
- return NULL;
- }
- return res;
+ if (sub[0])
+ tuple_set_int (tuple, FIELD_SUBSONG_ID, NULL, isub);
 }
 
 /**
@@ -264,41 +333,32 @@
 * @param[in] src Tuple structure to be made a copy of.
 * @return Pointer to newly allocated Tuple.
 */
-Tuple *
-tuple_copy(const Tuple *src)
+EXPORT Tuple * tuple_copy (const Tuple * old)
 {
- Tuple *dst;
- TupleValue * tv, * copied;
- mowgli_patricia_iteration_state_t state;
- gint i;
-
- g_return_val_if_fail(src != NULL, NULL);
-
- TUPLE_LOCK_WRITE();
+ pthread_mutex_lock (& mutex);
 
- dst = tuple_new_unlocked();
+ Tuple * new = tuple_new ();
 
- /* Copy basic fields */
- for (i = 0; i < FIELD_LAST; i++)
- dst->values[i] = tuple_copy_value(src->values[i]);
-
- /* Copy dictionary contents */
- MOWGLI_PATRICIA_FOREACH (tv, & state, src->dict)
+ for (int f = 0; f < TUPLE_FIELDS; f ++)
 {
- if ((copied = tuple_copy_value (tv)) != NULL)
- mowgli_patricia_add (dst->dict, copied->name, copied);
+ TupleVal * oldval = lookup_val ((Tuple *) old, f, FALSE, FALSE);
+ if (oldval)
+ {
+ TupleVal * newval = lookup_val (new, f, TRUE, FALSE);
+ if (tuple_fields[f].type == TUPLE_STRING)
+ newval->str = str_ref (oldval->str);
+ else
+ newval->x = oldval->x;
+ }
 }
 
- /* Copy subtune number information */
- if (src->subtunes && src->nsubtunes > 0)
- {
- dst->nsubtunes = src->nsubtunes;
- dst->subtunes = g_new(gint, dst->nsubtunes);
- memcpy(dst->subtunes, src->subtunes, sizeof(gint) * dst->nsubtunes);
- }
+ new->nsubtunes = old->nsubtunes;
+
+ if (old->subtunes)
+ new->subtunes = g_memdup (old->subtunes, sizeof (int) * old->nsubtunes);
 
- TUPLE_UNLOCK_WRITE();
- return dst;
+ pthread_mutex_unlock (& mutex);
+ return new;
 }
 
 /**
@@ -308,8 +368,8 @@
 * @param[in] filename Filename URI.
 * @return Pointer to newly allocated Tuple.
 */
-Tuple *
-tuple_new_from_filename(const gchar *filename)
+EXPORT Tuple *
+tuple_new_from_filename(const char *filename)
 {
 Tuple *tuple = tuple_new();
 
@@ -317,236 +377,72 @@
 return tuple;
 }
 
-
-static gint
-tuple_get_nfield(const gchar *field)
-{
- gint i;
- for (i = 0; i < FIELD_LAST; i++)
- if (!strcmp(field, tuple_fields[i].name))
- return i;
- return -1;
-}
-
-
-/**
- * (Re)associates data into given #Tuple field.
- * If specified field already exists in the #Tuple, any data from it
- * is freed and this current TupleValue struct is returned.
- *
- * If field does NOT exist, a new structure is allocated from global
- * heap, added to Tuple and returned.
- *
- * @attention This function has (unbalanced) Tuple structure unlocking,
- * so please make sure you use it only exactly like it is used in
- * #tuple_associate_string(), etc.
- *
- * @param[in] tuple Tuple structure to be manipulated.
- * @param[in] cnfield #TupleBasicType index or -1 if key name is to be used instead.
- * @param[in] field String acting as key name or NULL if nfield is used.
- * @param[in] ftype Type of the field to be associated.
- * @return Pointer to associated TupleValue structure.
- */
-static TupleValue *
-tuple_associate_data(Tuple *tuple, const gint cnfield, const gchar *field, TupleValueType ftype)
-{
- const gchar *tfield = field;
- gint nfield = cnfield;
- TupleValue *value = NULL;
-
- g_return_val_if_fail(tuple != NULL, NULL);
- g_return_val_if_fail(cnfield < FIELD_LAST, NULL);
-
- /* Check for known fields */
- if (nfield < 0) {
- nfield = tuple_get_nfield(field);
- if (nfield >= 0)
- g_warning("Tuple FIELD_* not used for '%s'!\n", field);
- }
-
- /* Check if field was known */
- if (nfield >= 0) {
- tfield = tuple_fields[nfield].name;
- value = tuple->values[nfield];
-
- if (ftype != tuple_fields[nfield].type) {
- g_warning("Invalid type for [%s](%d->%d), %d != %d\n",
- tfield, cnfield, nfield, ftype, tuple_fields[nfield].type);
- //mowgli_throw_exception_val(audacious.tuple.invalid_type_request, 0);
- TUPLE_UNLOCK_WRITE();
- return NULL;
- }
- } else {
- value = mowgli_patricia_retrieve(tuple->dict, tfield);
- }
-
- if (value != NULL) {
- /* Value exists, just delete old associated data */
- if (value->type == TUPLE_STRING) {
- stringpool_unref(value->value.string);
- value->value.string = NULL;
- }
- } else {
- /* Allocate a new value */
- value = mowgli_heap_alloc(tuple_value_heap);
- value->type = ftype;
-
- if (nfield >= 0)
- {
- value->name[0] = 0;
- tuple->values[nfield] = value;
- }
- else
- {
- g_strlcpy (value->name, tfield, TUPLE_NAME_MAX);
- mowgli_patricia_add(tuple->dict, tfield, value);
- }
- }
-
- return value;
-}
-
-static gboolean set_string (Tuple * tuple, const gint nfield,
- const gchar * field, gchar * string, gboolean take)
+EXPORT void tuple_set_int (Tuple * tuple, int nfield, const char * field, int x)
 {
- TUPLE_LOCK_WRITE ();
+ if (nfield < 0)
+ nfield = tuple_field_by_name (field);
+ if (nfield < 0 || nfield >= TUPLE_FIELDS || tuple_fields[nfield].type != TUPLE_INT)
+ return;
 
- TupleValue * value = tuple_associate_data (tuple, nfield, field,
- TUPLE_STRING);
- if (! value)
- {
- if (take)
- g_free (string);
- return FALSE;
- }
+ pthread_mutex_lock (& mutex);
 
- value->value.string = stringpool_get (string, take);
+ TupleVal * val = lookup_val (tuple, nfield, TRUE, FALSE);
+ val->x = x;
 
- TUPLE_UNLOCK_WRITE ();
- return TRUE;
+ pthread_mutex_unlock (& mutex);
 }
 
-/**
- * Associates copy of given string to a field in specified #Tuple.
- * If field already exists, old value is freed and replaced.
- *
- * Desired field can be specified either by key name or if it is
- * one of basic fields, by #TupleBasicType index.
- *
- * @param[in] tuple #Tuple structure pointer.
- * @param[in] nfield #TupleBasicType index or -1 if key name is to be used instead.
- * @param[in] field String acting as key name or NULL if nfield is used.
- * @param[in] string String to be associated to given field in Tuple.
- * @return TRUE if operation was succesful, FALSE if not.
- */
-
-gboolean tuple_associate_string (Tuple * tuple, const gint nfield,
- const gchar * field, const gchar * string)
+EXPORT void tuple_set_str (Tuple * tuple, int nfield, const char * field, const char * str)
 {
- g_return_val_if_fail (string, FALSE);
-
- if (! g_utf8_validate (string, -1, NULL))
+ if (! str)
 {
- fprintf (stderr, "Invalid UTF-8: %s.\n", string);
- return set_string (tuple, nfield, field, str_to_utf8 (string), TRUE);
+ tuple_unset (tuple, nfield, field);
+ return;
 }
 
- return set_string (tuple, nfield, field, (gchar *) string, FALSE);
-}
-
-/**
- * Associates given string to a field in specified #Tuple. The caller
- * gives up ownership of the string. If field already exists, old
- * value is freed and replaced.
- *
- * Desired field can be specified either by key name or if it is
- * one of basic fields, by #TupleBasicType index.
- *
- * @param[in] tuple #Tuple structure pointer.
- * @param[in] nfield #TupleBasicType index or -1 if key name is to be used instead.
- * @param[in] field String acting as key name or NULL if nfield is used.
- * @param[in] string String to be associated to given field in Tuple.
- * @return TRUE if operation was succesful, FALSE if not.
- */
-
-gboolean tuple_associate_string_rel (Tuple * tuple, const gint nfield,
- const gchar * field, gchar * string)
-{
- g_return_val_if_fail (string, FALSE);
-
- if (g_utf8_validate (string, -1, NULL))
+ if (! g_utf8_validate (str, -1, NULL))
 {
- fprintf (stderr, "Invalid UTF-8: %s.\n", string);
- gchar * copy = str_to_utf8 (string);
- g_free (string);
- string = copy;
+ fprintf (stderr, "Invalid UTF-8: %s\n", str);
+ return;
 }
 
- return set_string (tuple, nfield, field, string, TRUE);
-}
-
-/**
- * Associates given integer to a field in specified #Tuple.
- * If field already exists, old value is freed and replaced.
- *
- * Desired field can be specified either by key name or if it is
- * one of basic fields, by #TupleBasicType index.
- *
- * @param[in] tuple #Tuple structure pointer.
- * @param[in] nfield #TupleBasicType index or -1 if key name is to be used instead.
- * @param[in] field String acting as key name or NULL if nfield is used.
- * @param[in] integer Integer to be associated to given field in Tuple.
- * @return TRUE if operation was succesful, FALSE if not.
- */
-gboolean
-tuple_associate_int(Tuple *tuple, const gint nfield, const gchar *field, gint integer)
-{
- TupleValue *value;
+ if (nfield < 0)
+ nfield = tuple_field_by_name (field);
+ if (nfield < 0 || nfield >= TUPLE_FIELDS || tuple_fields[nfield].type != TUPLE_STRING)
+ return;
 
- TUPLE_LOCK_WRITE();
- if ((value = tuple_associate_data(tuple, nfield, field, TUPLE_INT)) == NULL)
- return FALSE;
+ pthread_mutex_lock (& mutex);
 
- value->value.integer = integer;
+ TupleVal * val = lookup_val (tuple, nfield, TRUE, FALSE);
+ if (val->str)
+ str_unref (val->str);
+ val->str = str_get (str);
 
- TUPLE_UNLOCK_WRITE();
- return TRUE;
+ pthread_mutex_unlock (& mutex);
 }
 
-/**
- * Disassociates given field from specified #Tuple structure.
- * Desired field can be specified either by key name or if it is
- * one of basic fields, by #TupleBasicType index.
- *
- * @param[in] tuple #Tuple structure pointer.
- * @param[in] cnfield #TupleBasicType index or -1 if key name is to be used instead.
- * @param[in] field String acting as key name or NULL if nfield is used.
- */
-void
-tuple_disassociate(Tuple *tuple, const gint cnfield, const gchar *field)
+EXPORT void tuple_unset (Tuple * tuple, int nfield, const char * field)
 {
- TupleValue *value;
- gint nfield = cnfield;
-
- g_return_if_fail(tuple != NULL);
- g_return_if_fail(nfield < FIELD_LAST);
-
 if (nfield < 0)
- nfield = tuple_get_nfield(field);
+ nfield = tuple_field_by_name (field);
+ if (nfield < 0 || nfield >= TUPLE_FIELDS)
+ return;
 
- TUPLE_LOCK_WRITE();
- if (nfield < 0)
- /* why _delete()? because _delete() returns the dictnode's data on success */
- value = mowgli_patricia_delete(tuple->dict, field);
- else {
- value = tuple->values[nfield];
- tuple->values[nfield] = NULL;
- }
+ pthread_mutex_lock (& mutex);
 
- if (value)
- tuple_value_destroy (value);
+ TupleVal * val = lookup_val (tuple, nfield, FALSE, TRUE);
+ if (val)
+ {
+ if (tuple_fields[nfield].type == TUPLE_STRING)
+ {
+ str_unref (val->str);
+ val->str = NULL;
+ }
+ else
+ val->x = 0;
+ }
 
- TUPLE_UNLOCK_WRITE();
+ pthread_mutex_unlock (& mutex);
 }
 
 /**
@@ -559,71 +455,42 @@
 * @param[in] field String acting as key name or NULL if nfield is used.
 * @return #TupleValueType of the field or TUPLE_UNKNOWN if there was an error.
 */
-TupleValueType tuple_get_value_type (const Tuple * tuple, gint cnfield,
- const gchar * field)
+EXPORT TupleValueType tuple_get_value_type (const Tuple * tuple, int nfield, const char * field)
 {
- TupleValueType type = TUPLE_UNKNOWN;
- gint nfield = cnfield;
+ if (nfield < 0)
+ nfield = tuple_field_by_name (field);
+ if (nfield < 0 || nfield >= TUPLE_FIELDS)
+ return TUPLE_UNKNOWN;
 
- g_return_val_if_fail(tuple != NULL, TUPLE_UNKNOWN);
- g_return_val_if_fail(nfield < FIELD_LAST, TUPLE_UNKNOWN);
+ pthread_mutex_lock (& mutex);
 
- if (nfield < 0)
- nfield = tuple_get_nfield(field);
-
- TUPLE_LOCK_READ();
- if (nfield < 0) {
- TupleValue *value;
- if ((value = mowgli_patricia_retrieve(tuple->dict, field)) != NULL)
- type = value->type;
- } else {
- if (tuple->values[nfield])
- type = tuple->values[nfield]->type;
- }
+ TupleValueType type = TUPLE_UNKNOWN;
+
+ TupleVal * val = lookup_val ((Tuple *) tuple, nfield, FALSE, FALSE);
+ if (val)
+ type = tuple_fields[nfield].type;
 
- TUPLE_UNLOCK_READ();
+ pthread_mutex_unlock (& mutex);
 return type;
 }
 
-/**
- * Returns pointer to a string associated to #Tuple field.
- * Desired field can be specified either by key name or if it is
- * one of basic fields, by #TupleBasicType index.
- *
- * @param[in] tuple #Tuple structure pointer.
- * @param[in] cnfield #TupleBasicType index or -1 if key name is to be used instead.
- * @param[in] field String acting as key name or NULL if nfield is used.
- * @return Pointer to string or NULL if the field/key did not exist.
- * The returned string is const, and must not be freed or modified.
- */
-const gchar * tuple_get_string (const Tuple * tuple, gint cnfield, const gchar *
- field)
+EXPORT char * tuple_get_str (const Tuple * tuple, int nfield, const char * field)
 {
- TupleValue *value;
- gint nfield = cnfield;
+ if (nfield < 0)
+ nfield = tuple_field_by_name (field);
+ if (nfield < 0 || nfield >= TUPLE_FIELDS || tuple_fields[nfield].type != TUPLE_STRING)
+ return NULL;
 
- g_return_val_if_fail(tuple != NULL, NULL);
- g_return_val_if_fail(nfield < FIELD_LAST, NULL);
+ pthread_mutex_lock (& mutex);
 
- if (nfield < 0)
- nfield = tuple_get_nfield(field);
+ char * str = NULL;
 
- TUPLE_LOCK_READ();
- if (nfield < 0)
- value = mowgli_patricia_retrieve(tuple->dict, field);
- else
- value = tuple->values[nfield];
-
- if (value) {
- if (value->type != TUPLE_STRING)
- mowgli_throw_exception_val(audacious.tuple.invalid_type_request, NULL);
-
- TUPLE_UNLOCK_READ();
- return value->value.string;
- } else {
- TUPLE_UNLOCK_READ();
- return NULL;
- }
+ TupleVal * val = lookup_val ((Tuple *) tuple, nfield, FALSE, FALSE);
+ if (val)
+ str = str_ref (val->str);
+
+ pthread_mutex_unlock (& mutex);
+ return str;
 }
 
 /**
@@ -638,45 +505,35 @@
 *
 * @bug There is no way to distinguish error situations if the associated value is zero.
 */
-gint tuple_get_int (const Tuple * tuple, gint cnfield, const gchar * field)
+EXPORT int tuple_get_int (const Tuple * tuple, int nfield, const char * field)
 {
- TupleValue *value;
- gint nfield = cnfield;
+ if (nfield < 0)
+ nfield = tuple_field_by_name (field);
+ if (nfield < 0 || nfield >= TUPLE_FIELDS || tuple_fields[nfield].type != TUPLE_INT)
+ return 0;
 
- g_return_val_if_fail(tuple != NULL, 0);
- g_return_val_if_fail(nfield < FIELD_LAST, 0);
+ pthread_mutex_lock (& mutex);
 
- if (nfield < 0)
- nfield = tuple_get_nfield(field);
+ int x = 0;
 
- TUPLE_LOCK_READ();
- if (nfield < 0)
- value = mowgli_patricia_retrieve(tuple->dict, field);
- else
- value = tuple->values[nfield];
-
- if (value) {
- if (value->type != TUPLE_INT)
- mowgli_throw_exception_val(audacious.tuple.invalid_type_request, 0);
-
- TUPLE_UNLOCK_READ();
- return value->value.integer;
- } else {
- TUPLE_UNLOCK_READ();
- return 0;
- }
+ TupleVal * val = lookup_val ((Tuple *) tuple, nfield, FALSE, FALSE);
+ if (val)
+ x = val->x;
+
+ pthread_mutex_unlock (& mutex);
+ return x;
 }
 
 #define APPEND(b, ...) snprintf (b + strlen (b), sizeof b - strlen (b), \
 __VA_ARGS__)
 
-void tuple_set_format (Tuple * t, const gchar * format, gint chans, gint rate,
- gint brate)
+EXPORT void tuple_set_format (Tuple * t, const char * format, int chans, int rate,
+ int brate)
 {
 if (format)
- tuple_associate_string (t, FIELD_CODEC, NULL, format);
+ tuple_set_str (t, FIELD_CODEC, NULL, format);
 
- gchar buf[32];
+ char buf[32];
 buf[0] = 0;
 
 if (chans > 0)
@@ -697,8 +554,62 @@
 APPEND (buf, "%d kHz", rate / 1000);
 
 if (buf[0])
- tuple_associate_string (t, FIELD_QUALITY, NULL, buf);
+ tuple_set_str (t, FIELD_QUALITY, NULL, buf);
 
 if (brate > 0)
- tuple_associate_int (t, FIELD_BITRATE, NULL, brate);
+ tuple_set_int (t, FIELD_BITRATE, NULL, brate);
+}
+
+EXPORT void tuple_set_subtunes (Tuple * tuple, int n_subtunes, const int * subtunes)
+{
+ pthread_mutex_lock (& mutex);
+
+ g_free (tuple->subtunes);
+ tuple->subtunes = NULL;
+
+ tuple->nsubtunes = n_subtunes;
+ if (subtunes)
+ tuple->subtunes = g_memdup (subtunes, sizeof (int) * n_subtunes);
+
+ pthread_mutex_unlock (& mutex);
+}
+
+EXPORT int tuple_get_n_subtunes (Tuple * tuple)
+{
+ pthread_mutex_lock (& mutex);
+
+ int n_subtunes = tuple->nsubtunes;
+
+ pthread_mutex_unlock (& mutex);
+ return n_subtunes;
+}
+
+EXPORT int tuple_get_nth_subtune (Tuple * tuple, int n)
+{
+ pthread_mutex_lock (& mutex);
+
+ int subtune = -1;
+ if (n >= 0 && n < tuple->nsubtunes)
+ subtune = tuple->subtunes ? tuple->subtunes[n] : 1 + n;
+
+ pthread_mutex_unlock (& mutex);
+ return subtune;
+}
+
+EXPORT char * tuple_format_title (Tuple * tuple, const char * format)
+{
+ static const gint fallbacks[] = {FIELD_TITLE, FIELD_FILE_NAME, FIELD_FILE_PATH};
+
+ char * title = tuple_formatter_process_string (tuple, format);
+
+ for (int i = 0; i < G_N_ELEMENTS (fallbacks); i ++)
+ {
+ if (title && title[0])
+ break;
+
+ str_unref (title);
+ title = tuple_get_str (tuple, fallbacks[i], NULL);
+ }
+
+ return title ? title : str_get ("");
 }

audacious-3.1.1.tar.bz2/src/libaudcore/tuple.h -> audacious-3.2.4.tar.bz2/src/libaudcore/tuple.h Changed

@@ -1,6 +1,7 @@
 /*
- * Audacious
- * Copyright (c) 2006-2007 Audacious team
+ * tuple.h
+ * Copyright 2007-2011 William Pitcock, Christian Birchinger, Matti Hämäläinen,
+ * Giacomo Lozito, Eugene Zagidullin, and 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
@@ -17,18 +18,16 @@
 * The Audacious team does not consider modular code linking to
 * Audacious or using our public API to be a derived work.
 */
+
 /**
 * @file tuple.h
 * @brief Basic Tuple handling API.
 */
 
-#ifndef AUDACIOUS_TUPLE_H
-#define AUDACIOUS_TUPLE_H
-
-#include <glib.h>
-#include <mowgli.h>
+#ifndef LIBAUDCORE_TUPLE_H
+#define LIBAUDCORE_TUPLE_H
 
-G_BEGIN_DECLS
+#include <libaudcore/core.h>
 
 /** Ordered enum for basic #Tuple fields.
 * @sa TupleBasicType
@@ -40,7 +39,6 @@
 FIELD_COMMENT, /**< Freeform comment */
 FIELD_GENRE, /**< Song's genre */
 
- FIELD_TRACK,
 FIELD_TRACK_NUMBER,
 FIELD_LENGTH, /**< Track length in milliseconds */
 FIELD_YEAR, /**< Year of production/performance/etc */
@@ -51,10 +49,9 @@
 FIELD_FILE_NAME, /**< File name part of the location URI */
 FIELD_FILE_PATH, /**< Path part of the location URI */
 FIELD_FILE_EXT, /**< Filename extension part of the location URI */
- FIELD_SONG_ARTIST,
 
- FIELD_MTIME, /**< Playlist entry modification time for internal use */
- FIELD_FORMATTER, /**< Playlist entry Tuplez formatting string */
+ FIELD_SONG_ARTIST,
+ FIELD_COMPOSER, /**< Composer of song, if different than artist. */
 FIELD_PERFORMER,
 FIELD_COPYRIGHT,
 FIELD_DATE,
@@ -80,10 +77,7 @@
 FIELD_GAIN_GAIN_UNIT,
 FIELD_GAIN_PEAK_UNIT,
 
- FIELD_COMPOSER, /**< Composer of song, if different than artist. */
-
- /* Special field, must always be last */
- FIELD_LAST
+ TUPLE_FIELDS
 };
 
 typedef enum {
@@ -92,66 +86,92 @@
 TUPLE_UNKNOWN
 } TupleValueType;
 
-typedef struct {
- gchar *name;
- TupleValueType type;
-} TupleBasicType;
+int tuple_field_by_name (const char * name);
+const char * tuple_field_get_name (int field);
+TupleValueType tuple_field_get_type (int field);
 
-extern const TupleBasicType tuple_fields[FIELD_LAST];
+typedef struct _Tuple Tuple;
 
-#define TUPLE_NAME_MAX 20
+/* Creates a new, blank tuple with a reference count of one. */
+Tuple * tuple_new (void);
 
-typedef struct {
- gchar name[TUPLE_NAME_MAX]; /* for standard fields, the empty string */
- TupleValueType type;
- union {
- gchar *string;
- gint integer;
- } value;
-} TupleValue;
+/* Increments the reference count of <tuple> by one. */
+Tuple * tuple_ref (Tuple * tuple);
 
-/**
- * Structure for holding and passing around miscellaneous track
- * metadata. This is not the same as a playlist entry, though.
- */
-typedef struct _Tuple {
- mowgli_object_t parent;
- mowgli_patricia_t *dict; /**< Mowgli dictionary for holding other than basic values. */
- TupleValue *values[FIELD_LAST]; /**< Basic #Tuple values, entry is NULL if not set. */
- gint nsubtunes; /**< Number of subtunes, if any. Values greater than 0
- mean that there are subtunes and #subtunes array
- may be set. */
- gint *subtunes; /**< Array of gint containing subtune index numbers.
- Can be NULL if indexing is linear or if
- there are no subtunes. */
-} Tuple;
-
-
-Tuple *tuple_new(void);
+/* Decrements the reference count of <tuple> by one. If the reference count
+ * drops to zero, releases all memory used by <tuple>. */
+void tuple_unref (Tuple * tuple);
+
+/* Makes a copy of <tuple>. Only use tuple_copy() if you need to modify one
+ * copy of the tuple while not modifying the other. In most cases, tuple_ref()
+ * is more appropriate. */
 Tuple *tuple_copy(const Tuple *);
-void tuple_set_filename(Tuple *tuple, const gchar *filename);
-Tuple *tuple_new_from_filename(const gchar *filename);
-gboolean tuple_associate_string_rel(Tuple *tuple, const gint nfield, const gchar *field, gchar *string);
-gboolean tuple_associate_string(Tuple *tuple, const gint nfield, const gchar *field, const gchar *string);
-gboolean tuple_associate_int(Tuple *tuple, const gint nfield, const gchar *field, gint integer);
-void tuple_disassociate(Tuple *tuple, const gint nfield, const gchar *field);
-void tuple_disassociate_now(TupleValue *value);
-TupleValueType tuple_get_value_type (const Tuple * tuple, gint nfield,
- const gchar * field);
-const gchar * tuple_get_string (const Tuple * tuple, gint nfield, const gchar *
- field);
-gint tuple_get_int (const Tuple * tuple, gint nfield, const gchar * field);
-#define tuple_free(x) mowgli_object_unref(x);
+
+/* Parses the URI <filename> and sets FIELD_FILE_NAME, FIELD_FILE_PATH,
+ * FIELD_FILE_EXT, and FIELD_SUBSONG_ID accordingly. */
+void tuple_set_filename(Tuple *tuple, const char *filename);
+
+/* Convenience function, equivalent to calling tuple_new() and then
+ * tuple_set_filename(). */
+Tuple *tuple_new_from_filename(const char *filename);
+
+/* Sets a field to the integer value <x>. */
+void tuple_set_int (Tuple * tuple, int nfield, const char * field, int x);
+
+/* Sets the field specified by <nfield> (one of the FIELD_* constants) or
+ * <field> (one of the names returned by tuple_field_get_name() to the string
+ * value <str>. Only one of <nfield> or <field> may be set. If <nfield> is
+ * set, <field> must be NULL; if <field> is set, <nfield> must be -1. As a
+ * special case, if <str> is NULL, the result is equivalent to calling
+ * tuple_unset(). */
+void tuple_set_str (Tuple * tuple, int nfield, const char * field, const char * str);
+
+/* Clears any value that a field is currently set to. */
+void tuple_unset (Tuple * tuple, int nfield, const char * field);
+
+/* Returns the value type of a field, or TUPLE_UNKNOWN if the field has not been
+ * set to any value. */
+TupleValueType tuple_get_value_type (const Tuple * tuple, int nfield,
+ const char * field);
+
+/* Returns the string value of a field. The returned string is pooled and must
+ * be released with str_unref() when no longer needed. If the field has not
+ * been set to any value, returns NULL. */
+char * tuple_get_str (const Tuple * tuple, int nfield, const char * field);
+
+/* Returns the integer value of a field. If the field has not been set to any
+ * value, returns 0. (In hindsight, it would have been better to return -1 in
+ * this case. If you need to distinguish between a value of 0 and a field not
+ * set to any value, use tuple_get_value_type().) */
+int tuple_get_int (const Tuple * tuple, int nfield, const char * field);
 
 /* Fills in format-related fields (specifically FIELD_CODEC, FIELD_QUALITY, and
- * FIELD_BITRATE. Plugins should use this function instead of setting these
+ * FIELD_BITRATE). Plugins should use this function instead of setting these
 * fields individually so that the style is consistent across file formats.
 * <format> should be a brief description such as "Microsoft WAV", "MPEG-1 layer
 * 3", "Audio CD", and so on. <samplerate> is in Hertz. <bitrate> is in 1000
 * bits per second. */
-void tuple_set_format (Tuple * tuple, const gchar * format, gint channels, gint
- samplerate, gint bitrate);
-
-G_END_DECLS
-
-#endif /* AUDACIOUS_TUPLE_H */
+void tuple_set_format (Tuple * tuple, const char * format, int channels, int
+ samplerate, int bitrate);
+
+/* In addition to the normal fields, tuples contain an integer array of subtune
+ * ID numbers. This function sets that array. It also sets FIELD_SUBSONG_NUM
+ * to the value <n_subtunes>. */
+void tuple_set_subtunes (Tuple * tuple, int n_subtunes, const int * subtunes);
+
+/* Returns the length of the subtune array. If the array has not been set,
+ * returns zero. Note that if FIELD_SUBSONG_NUM is changed after
+ * tuple_set_subtunes() is called, this function returns the value <n_subtunes>
+ * passed to tuple_set_subtunes(), not the value of FIELD_SUBSONG_NUM. */
+int tuple_get_n_subtunes (Tuple * tuple);
+
+/* Returns the <n>th member of the subtune array. */
+int tuple_get_nth_subtune (Tuple * tuple, int n);
+
+/* Generates a formatted title string for <tuple> according to <format>. The
+ * syntax of <format> is documented in tuple_formatter.c. The returned string
+ * is pooled and must be released with str_unref() when no longer need. The
+ * returned string is never NULL, though it may be the empty string. */
+char * tuple_format_title (Tuple * tuple, const char * format);
+
+#endif /* LIBAUDCORE_TUPLE_H */

audacious-3.1.1.tar.bz2/src/libaudcore/tuple_compiler.c -> audacious-3.2.4.tar.bz2/src/libaudcore/tuple_compiler.c Changed

@@ -1,6 +1,7 @@
 /*
 * Audacious - Tuplez compiler
 * Copyright (c) 2007 Matti 'ccr' Hämäläinen
+ * 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
@@ -31,46 +32,73 @@
 * currently there is just a single context, is a "global" context needed?
 */
 
-#include "config.h"
-#include <assert.h>
+#include <ctype.h>
 #include <stdarg.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <glib.h>
+
 #include "tuple_compiler.h"
 
 #define MAX_STR		(256)
 #define MIN_ALLOC_NODES (8)
 #define MIN_ALLOC_BUF	(64)
-
-
-void tuple_error(TupleEvalContext *ctx, const gchar *fmt, ...)
-{
- va_list ap;
- g_free(ctx->errmsg);
- va_start(ap, fmt);
- ctx->errmsg = g_strdup_vprintf(fmt, ap);
- va_end(ap);
- ctx->iserror = TRUE;
-}
+#define TUPLEZ_MAX_VARS (4)
+
+#define tuple_error(ctx, ...) fprintf (stderr, "Tuple compiler: " __VA_ARGS__)
+
+enum {
+ OP_RAW = 0,		/* plain text */
+ OP_FIELD,		/* a field/variable */
+ OP_EXISTS,
+ OP_EQUALS,
+ OP_NOT_EQUALS,
+ OP_GT,
+ OP_GTEQ,
+ OP_LT,
+ OP_LTEQ,
+ OP_IS_EMPTY
+};
+
+enum {
+ TUPLE_VAR_FIELD = 0,
+ TUPLE_VAR_CONST
+};
+
+struct _TupleEvalNode {
+ int opcode;		/* operator, see OP_ enums */
+ int var[TUPLEZ_MAX_VARS];	/* tuple variable references */
+ char *text;		/* raw text, if any (OP_RAW) */
+ struct _TupleEvalNode *children, *next, *prev; /* children of this struct, and pointer to next node. */
+};
+
+typedef struct {
+ char *name;
+ int type;			/* Type of variable, see VAR_* */
+ int defvali;
+ TupleValueType ctype;	/* Type of constant/def value */
+
+ int fieldidx;		/* if >= 0: Index # of "pre-defined" Tuple fields */
+ bool_t fieldread, fieldvalid;
+ char * fieldstr;
+} TupleEvalVar;
+
+struct _TupleEvalContext {
+ int nvariables;
+ TupleEvalVar **variables;
+};
 
 
 static void tuple_evalctx_free_var(TupleEvalVar *var)
 {
- assert(var != NULL);
- var->fieldidx = -1;
- g_free(var->defvals);
 g_free(var->name);
+ str_unref (var->fieldstr);
 g_free(var);
 }
 
 
-static void tuple_evalctx_free_function(TupleEvalFunc *func)
-{
- assert(func != NULL);
-
- g_free(func->name);
- g_free(func);
-}
-
-
 /* Initialize an evaluation context
 */
 TupleEvalContext * tuple_evalctx_new(void)
@@ -79,21 +107,19 @@
 }
 
 
-/* "Reset" the evaluation context, clean up temporary variables.
+/* "Reset" the evaluation context
 */
 void tuple_evalctx_reset(TupleEvalContext *ctx)
 {
- gint i;
+ int i;
 
 for (i = 0; i < ctx->nvariables; i++)
 if (ctx->variables[i]) {
- ctx->variables[i]->fieldref = NULL;
-
- if (ctx->variables[i]->istemp)
- tuple_evalctx_free_var(ctx->variables[i]);
+ ctx->variables[i]->fieldread = FALSE;
+ ctx->variables[i]->fieldvalid = FALSE;
+ str_unref (ctx->variables[i]->fieldstr);
+ ctx->variables[i]->fieldstr = NULL;
 }
-
- ctx->iserror = FALSE;
 }
 
 
@@ -101,7 +127,7 @@
 */
 void tuple_evalctx_free(TupleEvalContext *ctx)
 {
- gint i;
+ int i;
 
 if (!ctx) return;
 
@@ -111,36 +137,26 @@
 tuple_evalctx_free_var(ctx->variables[i]);
 
 g_free(ctx->variables);
-
- /* Deallocate functions */
- for (i = 0; i < ctx->nfunctions; i++)
- if (ctx->functions[i])
- tuple_evalctx_free_function(ctx->functions[i]);
-
- g_free(ctx->functions);
 g_free(ctx);
 }
 
 
-gint tuple_evalctx_add_var(TupleEvalContext *ctx, const gchar *name, const gboolean istemp, const gint type, const TupleValueType ctype)
+static int tuple_evalctx_add_var (TupleEvalContext * ctx, const char * name,
+ const int type, const TupleValueType ctype)
 {
- gint i, ref = -1;
+ int i;
 TupleEvalVar *tmp = g_new0(TupleEvalVar, 1);
- assert(tmp != NULL);
 
 tmp->name = g_strdup(name);
- tmp->istemp = istemp;
 tmp->type = type;
- tmp->fieldidx = ref;
+ tmp->fieldidx = -1;
 tmp->ctype = ctype;
 
 /* Find fieldidx, if any */
 switch (type) {
 case TUPLE_VAR_FIELD:
- for (i = 0; i < FIELD_LAST && ref < 0; i++)
- if (strcmp(tuple_fields[i].name, name) == 0) ref = i;
-
- tmp->fieldidx = ref;
+ tmp->fieldidx = tuple_field_by_name (name);
+ tmp->ctype = tuple_field_get_type (tmp->fieldidx);
 break;
 
 case TUPLE_VAR_CONST:
@@ -166,20 +182,8 @@
 }
 
 
-gint tuple_evalctx_add_function(TupleEvalContext *ctx, gchar *name)
-{
- assert(ctx != NULL);
- assert(name != NULL);
-
- return -1;
-}
-
-
 static void tuple_evalnode_insert(TupleEvalNode **nodes, TupleEvalNode *node)
 {
- assert(nodes != NULL);
- assert(node != NULL);
-
 if (*nodes) {
 node->prev = (*nodes)->prev;
 (*nodes)->prev->next = node;
@@ -218,17 +222,15 @@
 }
 
 
-static TupleEvalNode *tuple_compiler_pass1(gint *level, TupleEvalContext *ctx, gchar **expression);
+static TupleEvalNode *tuple_compiler_pass1(int *level, TupleEvalContext *ctx, char **expression);
 
 
-static gboolean tc_get_item(TupleEvalContext *ctx,
- gchar **str, gchar *buf, gssize max,
- gchar endch, gboolean *literal, gchar *errstr, gchar *item)
+static bool_t tc_get_item(TupleEvalContext *ctx,
+ char **str, char *buf, gssize max,
+ char endch, bool_t *literal, char *errstr, char *item)
 {
 gssize i = 0;
- gchar *s = *str, tmpendch;
- assert(str != NULL);
- assert(buf != NULL);
+ char *s = *str, tmpendch;
 
 if (*s == '"') {
 if (*literal == FALSE) {
@@ -282,9 +284,9 @@
 }
 
 
-static gint tc_get_variable(TupleEvalContext *ctx, gchar *name, gint type)
+static int tc_get_variable(TupleEvalContext *ctx, char *name, int type)
 {
- gint i;
+ int i;
 TupleValueType ctype = TUPLE_UNKNOWN;
 
 if (name == '\0') return -1;
@@ -301,14 +303,14 @@
 return i;
 }
 
- return tuple_evalctx_add_var(ctx, name, FALSE, type, ctype);
+ return tuple_evalctx_add_var(ctx, name, type, ctype);
 }
 
 
-static gboolean tc_parse_construct(TupleEvalContext *ctx, TupleEvalNode **res, gchar *item, gchar **c, gint *level, gint opcode)
+static bool_t tc_parse_construct(TupleEvalContext *ctx, TupleEvalNode **res, char *item, char **c, int *level, int opcode)
 {
- gchar tmps1[MAX_STR], tmps2[MAX_STR];
- gboolean literal1 = TRUE, literal2 = TRUE;
+ char tmps1[MAX_STR], tmps2[MAX_STR];
+ bool_t literal1 = TRUE, literal2 = TRUE;
 
 (*c)++;
 if (tc_get_item(ctx, c, tmps1, MAX_STR, ',', &literal1, "tag1", item)) {
@@ -343,13 +345,11 @@
 * A "simple" straight compilation is sufficient in first pass, later
 * passes can perform subexpression removal and other optimizations.
 */
-static TupleEvalNode *tuple_compiler_pass1(gint *level, TupleEvalContext *ctx, gchar **expression)
+static TupleEvalNode *tuple_compiler_pass1(int *level, TupleEvalContext *ctx, char **expression)
 {
 TupleEvalNode *res = NULL, *tmp = NULL;
- gchar *c = *expression, *item, tmps1[MAX_STR];
- gboolean literal, end = FALSE;
- assert(ctx != NULL);
- assert(expression != NULL);
+ char *c = *expression, *item, tmps1[MAX_STR];
+ bool_t literal, end = FALSE;
 
 (*level)++;
 
@@ -363,8 +363,8 @@
 /* Expression? */
 item = c++;
 if (*c == '{') {
- gint opcode;
- gchar *expr = ++c;
+ int opcode;
+ char *expr = ++c;
 
 switch (*c) {
 case '?': c++;
@@ -536,22 +536,11 @@
 }
 
 
-static TupleEvalNode *tuple_compiler_pass2(gboolean *changed, TupleEvalContext *ctx, TupleEvalNode *expr)
-{
- /* TupleEvalNode *curr = expr; */
- TupleEvalNode *res = NULL;
- assert(ctx != NULL);
-
- return res;
-}
-
-
-TupleEvalNode *tuple_formatter_compile(TupleEvalContext *ctx, gchar *expr)
+TupleEvalNode *tuple_formatter_compile(TupleEvalContext *ctx, char *expr)
 {
- gint level = 0;
- gboolean changed = FALSE;
- gchar *tmpexpr = expr;
- TupleEvalNode *res1, *res2;
+ int level = 0;
+ char *tmpexpr = expr;
+ TupleEvalNode *res1;
 
 res1 = tuple_compiler_pass1(&level, ctx, &tmpexpr);
 
@@ -561,38 +550,40 @@
 return NULL;
 }
 
- res2 = tuple_compiler_pass2(&changed, ctx, res1);
-
- if (changed) {
- tuple_evalnode_free(res1);
- return res2;
- } else {
- tuple_evalnode_free(res2);
- return res1;
- }
+ return res1;
 }
 
 
-/* Fetch a reference to a tuple field for given variable by fieldidx or dict.
- * Return pointer to field, NULL if not available.
- */
-static TupleValue * tf_get_fieldref (TupleEvalVar * var, const Tuple * tuple)
+/* Fetch a tuple field value. Return TRUE if found. */
+static bool_t tf_get_fieldval (TupleEvalVar * var, const Tuple * tuple)
 {
- if (var->type == TUPLE_VAR_FIELD && var->fieldref == NULL) {
- if (var->fieldidx < 0)
- var->fieldref = mowgli_patricia_retrieve(tuple->dict, var->name);
- else
- var->fieldref = tuple->values[var->fieldidx];
+ if (var->type != TUPLE_VAR_FIELD || var->fieldidx < 0)
+ return FALSE;
+
+ if (var->fieldread)
+ return var->fieldvalid;
+
+ if (tuple_get_value_type (tuple, var->fieldidx, NULL) != var->ctype) {
+ var->fieldread = TRUE;
+ var->fieldvalid = FALSE;
+ return FALSE;
 }
 
- return var->fieldref;
+ if (var->ctype == TUPLE_INT)
+ var->defvali = tuple_get_int (tuple, var->fieldidx, NULL);
+ else if (var->ctype == TUPLE_STRING)
+ var->fieldstr = tuple_get_str (tuple, var->fieldidx, NULL);
+
+ var->fieldread = TRUE;
+ var->fieldvalid = TRUE;
+ return TRUE;
 }
 
 
 /* Fetch string or int value of given variable, whatever type it might be.
 * Return VAR_* type for the variable.
 */
-static TupleValueType tf_get_var (gchar * * tmps, gint * tmpi, TupleEvalVar *
+static TupleValueType tf_get_var (char * * tmps, int * tmpi, TupleEvalVar *
 var, const Tuple * tuple)
 {
 TupleValueType type = TUPLE_UNKNOWN;
@@ -600,15 +591,6 @@
 *tmpi = 0;
 
 switch (var->type) {
- case TUPLE_VAR_DEF:
- switch (var->ctype) {
- case TUPLE_STRING: *tmps = var->defvals; break;
- case TUPLE_INT: *tmpi = var->defvali; break;
- default: /* Possible, but should be prevented elsewhere */ break;
- }
- type = var->ctype;
- break;
-
 case TUPLE_VAR_CONST:
 switch (var->ctype) {
 case TUPLE_STRING: *tmps = var->name; break;
@@ -619,12 +601,12 @@
 break;
 
 case TUPLE_VAR_FIELD:
- if (tf_get_fieldref(var, tuple)) {
- if (var->fieldref->type == TUPLE_STRING)
- *tmps = var->fieldref->value.string;
- else
- *tmpi = var->fieldref->value.integer;
- type = var->fieldref->type;
+ if (tf_get_fieldval (var, tuple)) {
+ type = var->ctype;
+ if (type == TUPLE_INT)
+ * tmpi = var->defvali;
+ else if (type == TUPLE_STRING)
+ * tmps = var->fieldstr;
 }
 break;
 }
@@ -636,21 +618,21 @@
 /* Evaluate tuple in given TupleEval expression in given
 * context and return resulting string.
 */
-static gboolean tuple_formatter_eval_do (TupleEvalContext * ctx, TupleEvalNode *
- expr, const Tuple * tuple, gchar * * res, gssize * resmax, gssize * reslen)
+static bool_t tuple_formatter_eval_do (TupleEvalContext * ctx, TupleEvalNode *
+ expr, const Tuple * tuple, GString * out)
 {
 TupleEvalNode *curr = expr;
 TupleEvalVar *var0, *var1;
 TupleValueType type0, type1;
- gint tmpi0, tmpi1;
- gchar tmps[MAX_STR], *tmps0, *tmps1, *tmps2;
- gboolean result;
- gint resulti;
+ int tmpi0, tmpi1;
+ char tmps[MAX_STR], *tmps0, *tmps1, *tmps2;
+ bool_t result;
+ int resulti;
 
 if (!expr) return FALSE;
 
 while (curr) {
- const gchar *str = NULL;
+ const char *str = NULL;
 
 switch (curr->opcode) {
 case OP_RAW:
@@ -661,31 +643,15 @@
 var0 = ctx->variables[curr->var[0]];
 
 switch (var0->type) {
- case TUPLE_VAR_DEF:
- switch (var0->ctype) {
- case TUPLE_STRING:
- str = var0->defvals;
- break;
-
- case TUPLE_INT:
- g_snprintf(tmps, sizeof(tmps), "%d", var0->defvali);
- str = tmps;
- break;
-
- default:
- break;
- }
- break;
-
 case TUPLE_VAR_FIELD:
- if (tf_get_fieldref(var0, tuple)) {
- switch (var0->fieldref->type) {
+ if (tf_get_fieldval (var0, tuple)) {
+ switch (var0->ctype) {
 case TUPLE_STRING:
- str = var0->fieldref->value.string;
+ str = var0->fieldstr;
 break;
 
 case TUPLE_INT:
- g_snprintf(tmps, sizeof(tmps), "%d", var0->fieldref->value.integer);
+ g_snprintf (tmps, sizeof (tmps), "%d", var0->defvali);
 str = tmps;
 break;
 
@@ -732,32 +698,29 @@
 }
 }
 
- if (result && !tuple_formatter_eval_do(ctx, curr->children, tuple, res, resmax, reslen))
+ if (result && ! tuple_formatter_eval_do (ctx, curr->children, tuple, out))
 return FALSE;
 break;
 
 case OP_EXISTS:
-#ifdef NO_EXISTS_HACK
- if (tf_get_fieldref(ctx->variables[curr->var[0]], tuple)) {
- if (!tuple_formatter_eval_do(ctx, curr->children, tuple, res, resmax, reslen))
+ if (tf_get_fieldval (ctx->variables[curr->var[0]], tuple)) {
+ if (! tuple_formatter_eval_do (ctx, curr->children, tuple, out))
 return FALSE;
 }
 break;
-#endif
 
 case OP_IS_EMPTY:
 var0 = ctx->variables[curr->var[0]];
 
- if (tf_get_fieldref(var0, tuple)) {
-
- switch (var0->fieldref->type) {
+ if (tf_get_fieldval (var0, tuple)) {
+ switch (var0->ctype) {
 case TUPLE_INT:
- result = (var0->fieldref->value.integer == 0);
+ result = (var0->defvali == 0);
 break;
 
 case TUPLE_STRING:
 result = TRUE;
- tmps2 = var0->fieldref->value.string;
+ tmps2 = var0->fieldstr;
 
 while (result && tmps2 && *tmps2 != '\0') {
 gunichar uc = g_utf8_get_char(tmps2);
@@ -774,15 +737,8 @@
 } else
 result = TRUE;
 
-#ifdef NO_EXISTS_HACK
- if (result && !tuple_formatter_eval_do(ctx, curr->children, tuple, res, resmax, reslen))
+ if (result && ! tuple_formatter_eval_do (ctx, curr->children, tuple, out))
 return FALSE;
-#else
- if ((curr->opcode == OP_EXISTS && !result) || (curr->opcode == OP_IS_EMPTY && result)) {
- if (!tuple_formatter_eval_do(ctx, curr->children, tuple, res, resmax, reslen))
- return FALSE;
- }
-#endif
 break;
 
 default:
@@ -791,23 +747,8 @@
 break;
 }
 
- if (str) {
- /* (Re)allocate res for more space, if needed. */
- *reslen += strlen(str);
- if (*res) {
- if (*reslen >= *resmax) {
- *resmax += *reslen + MIN_ALLOC_BUF;
- *res = g_realloc(*res, *resmax);
- }
-
- strcat(*res, str);
- } else {
- *resmax = *reslen + MIN_ALLOC_BUF;
- *res = g_malloc(*resmax);
-
- g_strlcpy(*res, str, *resmax);
- }
- }
+ if (str)
+ g_string_append (out, str);
 
 curr = curr->next;
 }
@@ -815,120 +756,9 @@
 return TRUE;
 }
 
-
-gchar * tuple_formatter_eval (TupleEvalContext * ctx, TupleEvalNode * expr,
- const Tuple * tuple)
-{
- gchar *res = NULL;
- gssize resmax = 0, reslen = 0;
- assert(ctx != NULL);
- assert(tuple != NULL);
-
- if (!expr) return res;
-
- tuple_formatter_eval_do(ctx, expr, tuple, &res, &resmax, &reslen);
-
- return res;
-}
-
-
-static void print_vars(FILE *f, TupleEvalContext *ctx, TupleEvalNode *node, gint start, gint end)
-{
- gint i;
-
- for (i = start; i <= end; i++) {
- TupleEvalVar *v = NULL;
- gchar *s = NULL;
- gint n = node->var[i];
-
- if (n >= 0) {
- v = ctx->variables[n];
- if (v) {
- s = v->name;
-
- if (v->type == TUPLE_VAR_CONST)
- fprintf(f, "(const)");
- else if (v->type == TUPLE_VAR_DEF)
- fprintf(f, "(def)");
- }
- }
-
- fprintf(f, "var[%d]=(%d),\"%s\" ", i, n, s);
- }
-}
-
-
-gint tuple_formatter_print(FILE *f, gint *level, TupleEvalContext *ctx, TupleEvalNode *expr)
+void tuple_formatter_eval (TupleEvalContext * ctx, TupleEvalNode * expr,
+ const Tuple * tuple, GString * out)
 {
- TupleEvalNode *curr = expr;
-
- if (!expr) return -1;
-
- (*level)++;
-
- while (curr) {
- gint i;
- for (i = 0; i < *level; i++)
- fprintf(f, " ");
-
- switch (curr->opcode) {
- case OP_RAW:
- fprintf(f, "OP_RAW text=\"%s\"\n", curr->text);
- break;
-
- case OP_FIELD:
- fprintf(f, "OP_FIELD ");
- print_vars(f, ctx, curr, 0, 0);
- fprintf(f, "\n");
- break;
-
- case OP_EXISTS:
- fprintf(f, "OP_EXISTS ");
- print_vars(f, ctx, curr, 0, 0);
- fprintf(f, "\n");
- tuple_formatter_print(f, level, ctx, curr->children);
- break;
-
- case OP_DEF_STRING:
- fprintf(f, "OP_DEF_STRING ");
- fprintf(f, "\n");
- break;
-
- case OP_DEF_INT:
- fprintf(f, "OP_DEF_INT ");
- fprintf(f, "\n");
- break;
-
- case OP_EQUALS:
- fprintf(f, "OP_EQUALS ");
- print_vars(f, ctx, curr, 0, 1);
- fprintf(f, "\n");
- tuple_formatter_print(f, level, ctx, curr->children);
- break;
-
- case OP_NOT_EQUALS:
- fprintf(f, "OP_NOT_EQUALS ");
- print_vars(f, ctx, curr, 0, 1);
- fprintf(f, "\n");
- tuple_formatter_print(f, level, ctx, curr->children);
- break;
-
- case OP_IS_EMPTY:
- fprintf(f, "OP_IS_EMPTY ");
- print_vars(f, ctx, curr, 0, 0);
- fprintf(f, "\n");
- tuple_formatter_print(f, level, ctx, curr->children);
- break;
-
- default:
- fprintf(f, "Unimplemented opcode %d!\n", curr->opcode);
- break;
- }
-
- curr = curr->next;
- }
-
- (*level)--;
-
- return 0;
+ g_string_truncate (out, 0);
+ tuple_formatter_eval_do (ctx, expr, tuple, out);
 }

audacious-3.1.1.tar.bz2/src/libaudcore/tuple_compiler.h -> audacious-3.2.4.tar.bz2/src/libaudcore/tuple_compiler.h Changed

@@ -17,100 +17,27 @@
 * The Audacious team does not consider modular code linking to
 * Audacious or using our public API to be a derived work.
 */
-#ifndef AUDACIOUS_TUPLE_COMPILER_H
-#define AUDACIOUS_TUPLE_COMPILER_H
-
-#include <glib.h>
-#include <mowgli.h>
-#include "tuple.h"
-
-G_BEGIN_DECLS
-
-#define TUPLEZ_MAX_VARS (4)
-
-
-enum {
- OP_RAW = 0,		/* plain text */
- OP_FIELD,		/* a field/variable */
- OP_EXISTS,
- OP_DEF_STRING,
- OP_DEF_INT,
- OP_EQUALS,
- OP_NOT_EQUALS,
- OP_GT,
- OP_GTEQ,
- OP_LT,
- OP_LTEQ,
- OP_IS_EMPTY,
-
- OP_FUNCTION,	/* function */
- OP_EXPRESSION	/* additional registered expressions */
-};
-
-
-enum {
- TUPLE_VAR_FIELD = 0,
- TUPLE_VAR_CONST,
- TUPLE_VAR_DEF
-};
-
-
-/* Caching structure for deterministic functions
- */
-typedef struct {
- gchar *name;
- gboolean istemp;		/* Scope of variable - TRUE = temporary */
- gint type;			/* Type of variable, see VAR_* */
- gchar *defvals;		/* Defined value ${=foo,bar} */
- gint defvali;
- TupleValueType ctype;	/* Type of constant/def value */
-
- gint fieldidx;		/* if >= 0: Index # of "pre-defined" Tuple fields */
- TupleValue *fieldref;	/* Cached tuple field ref */
-} TupleEvalVar;
-
-
-typedef struct {
- gchar *name;
- gboolean isdeterministic;
- gchar *(*func)(Tuple *tuple, TupleEvalVar **argument);
-} TupleEvalFunc;
 
+#ifndef LIBAUDCORE_TUPLE_COMPILER_H
+#define LIBAUDCORE_TUPLE_COMPILER_H
 
-typedef struct _TupleEvalNode {
- gint opcode;		/* operator, see OP_ enums */
- gint var[TUPLEZ_MAX_VARS];	/* tuple / global variable references */
- gboolean global[TUPLEZ_MAX_VARS];
- gchar *text;		/* raw text, if any (OP_RAW) */
- gint function, expression;	/* for OP_FUNCTION and OP_EXPRESSION */
- struct _TupleEvalNode *children, *next, *prev; /* children of this struct, and pointer to next node. */
-} TupleEvalNode;
-
-
-typedef struct {
- gint nvariables, nfunctions, nexpressions;
- TupleEvalVar **variables;
- TupleEvalFunc **functions;
+#include <glib.h>
+#include <libaudcore/tuple.h>
 
- /* Error context */
- gboolean iserror;
- gchar *errmsg;
-} TupleEvalContext;
+struct _TupleEvalNode;
+typedef struct _TupleEvalNode TupleEvalNode;
 
+struct _TupleEvalContext;
+typedef struct _TupleEvalContext TupleEvalContext;
 
 TupleEvalContext * tuple_evalctx_new(void);
 void tuple_evalctx_reset(TupleEvalContext *ctx);
 void tuple_evalctx_free(TupleEvalContext *ctx);
-gint tuple_evalctx_add_var(TupleEvalContext *ctx, const gchar *name, const gboolean istemp, const gint type, const TupleValueType ctype);
 
 void tuple_evalnode_free(TupleEvalNode *expr);
 
-gint tuple_formatter_print(FILE *f, gint *level, TupleEvalContext *ctx, TupleEvalNode *expr);
-TupleEvalNode *tuple_formatter_compile(TupleEvalContext *ctx, gchar *expr);
-gchar * tuple_formatter_eval (TupleEvalContext * ctx, TupleEvalNode * expr,
- const Tuple * tuple);
-
-
-G_END_DECLS
+TupleEvalNode *tuple_formatter_compile(TupleEvalContext *ctx, char *expr);
+void tuple_formatter_eval (TupleEvalContext * ctx, TupleEvalNode * expr,
+ const Tuple * tuple, GString * out);
 
-#endif /* AUDACIOUS_TUPLE_COMPILER_H */
+#endif /* LIBAUDCORE_TUPLE_COMPILER_H */

audacious-3.1.1.tar.bz2/src/libaudcore/tuple_formatter.c -> audacious-3.2.4.tar.bz2/src/libaudcore/tuple_formatter.c Changed

@@ -1,55 +1,28 @@
 /*
- * Audacious
+ * tuple_formatter.c
 * Copyright (c) 2007 William Pitcock
 *
- * This program is free software; 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
 *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions, and the following disclaimer.
 *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses>.
+ * 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.
 *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
+ * 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 <mowgli.h>
+#include <pthread.h>
+#include <string.h>
 
-#include "config.h"
-#include "tuple.h"
+#include "tuple_compiler.h"
 #include "tuple_formatter.h"
-#include "audstrings.h"
-
-/*
- * TUPLE_USE_COMPILER:
- * Undefine this to disable usage of the Tuplez compiler implementation.
- * This may be useful for prototyping new features of the language.
- */
-#define TUPLE_USE_COMPILER
-
-/*
- * TUPLE_COMPILER_DEBUG:
- * Define this to debug the execution process of the Tuplez compiled
- * bytecode. This may be useful if bugs creep in.
- */
-#undef TUPLE_COMPILER_DEBUG
-
-#ifdef TUPLE_USE_COMPILER
-# include "tuple_compiler.h"
-static GStaticMutex tuplec_mutex = G_STATIC_MUTEX_INIT;
-#endif
-
-#ifdef _DEBUG
-# define _TRACE(fmt, ...) g_print("[tuple-fmt] %s(%d) " fmt "\n", __FILE__, __LINE__, __VA_ARGS__);
-#else
-# define _TRACE(fmt, ...)
-#endif
 
 /*
 * the tuple formatter:
@@ -77,477 +50,22 @@
 * additionally, plugins can add additional instructions and functions!
 */
 
-typedef struct {
- Tuple *tuple;
- GString *str;
-} TupleFormatterContext;
-
-/* processes a construct, e.g. "${?artist:artist is defined}" would
- return "artist is defined" if artist is defined. */
-gchar *
-tuple_formatter_process_construct(Tuple *tuple, const gchar *string)
-{
- TupleFormatterContext *ctx;
- const gchar *iter;
- gchar *out;
- gint level = 0;
-
- g_return_val_if_fail(tuple != NULL, NULL);
- g_return_val_if_fail(string != NULL, NULL);
-
- ctx = g_new0(TupleFormatterContext, 1);
- ctx->str = g_string_new("");
-
- _TRACE("parsing <%s>", string);
-
- /* parsers are ugly */
- for (iter = string; *iter != '\0'; iter++)
- {
- /* if it's raw text, just copy the byte */
- if (*iter != '$' && *iter != '%' && *iter != '}' )
- {
- g_string_append_c(ctx->str, *iter);
- }
- else if (*iter == '}' && level > 0)
- {
- level--;
- }
- else if (g_str_has_prefix(iter, "${") == TRUE)
- {
- GString *expression = g_string_new("");
- GString *argument = g_string_new("");
- GString *sel = expression;
- gchar *result;
- level++;
-
- for (iter += 2; *iter != '\0'; iter++)
- {
- if (*iter == ':')
- {
- if (sel != argument)
- {
- sel = argument;
- continue;
- }
- else
- g_string_append_c(sel, *iter);
- continue;
- }
-
- if (g_str_has_prefix(iter, "${") == TRUE || g_str_has_prefix(iter, "%{") == TRUE)
- {
- if (sel == argument)
- {
- g_string_append_c(sel, *iter);
- level++;
- }
- }
- else if (*iter == '}')
- {
- level--;
- if (sel == argument)
- {
- if (level == 0)
- break;
- else
- g_string_append_c(sel, *iter);
- }
- else
- break;
- }
- else
- g_string_append_c(sel, *iter);
- }
-
- if (expression->len == 0)
- {
- g_string_free(expression, TRUE);
- g_string_free(argument, TRUE);
- continue;
- }
-
- result = tuple_formatter_process_expr(tuple, expression->str, argument->len ? argument->str : NULL);
- if (result != NULL)
- {
- g_string_append(ctx->str, result);
- g_free(result);
- }
-
- g_string_free(expression, TRUE);
- g_string_free(argument, TRUE);
-
- if (*iter == '\0')
- break;
- }
- else if (g_str_has_prefix(iter, "%{") == TRUE)
- {
- GString *expression = g_string_new("");
- GString *argument = g_string_new("");
- GString *sel = expression;
- gchar *result;
- level++;
-
- for (iter += 2; *iter != '\0'; iter++)
- {
- if (*iter == ':')
- {
- if (sel != argument)
- {
- sel = argument;
- continue;
- }
- else
- g_string_append_c(sel, *iter);
- continue;
- }
-
- if (g_str_has_prefix(iter, "${") == TRUE || g_str_has_prefix(iter, "%{") == TRUE)
- {
- if (sel == argument)
- {
- g_string_append_c(sel, *iter);
- level++;
- }
- }
- else if (*iter == '}')
- {
- level--;
- if (sel == argument)
- {
- if (level == 0)
- break;
- else
- g_string_append_c(sel, *iter);
- }
- else
- break;
- }
- else
- g_string_append_c(sel, *iter);
- }
-
- if (expression->len == 0)
- {
- g_string_free(expression, TRUE);
- g_string_free(argument, TRUE);
- continue;
- }
-
- result = tuple_formatter_process_function(tuple, expression->str, argument->len ? argument->str : NULL);
- if (result != NULL)
- {
- g_string_append(ctx->str, result);
- g_free(result);
- }
-
- g_string_free(expression, TRUE);
- g_string_free(argument, TRUE);
-
- if (*iter == '\0')
- break;
- }
- }
-
- out = g_strdup(ctx->str->str);
- g_string_free(ctx->str, TRUE);
- g_free(ctx);
-
- _TRACE("parsed <%s> as <%s>", string, out);
-
- return out;
-}
-
-static GList *tuple_formatter_expr_list = NULL;
-
-typedef struct {
- const gchar *name;
- gboolean (*func)(Tuple *tuple, const gchar *expression);
-} TupleFormatterExpression;
-
-/* processes an expression and optional argument pair. */
-gchar *
-tuple_formatter_process_expr(Tuple *tuple, const gchar *expression,
- const gchar *argument)
-{
- TupleFormatterExpression *expr = NULL;
- GList *iter;
-
- g_return_val_if_fail(tuple != NULL, NULL);
- g_return_val_if_fail(expression != NULL, NULL);
-
- for (iter = tuple_formatter_expr_list; iter != NULL; iter = iter->next)
- {
- TupleFormatterExpression *tmp = (TupleFormatterExpression *) iter->data;
-
- if (g_str_has_prefix(expression, tmp->name) == TRUE)
- {
- expr = tmp;
- expression += strlen(tmp->name);
- }
- }
-
- /* ${artist} */
- if (expr == NULL && argument == NULL)
- {
- TupleValueType type = tuple_get_value_type(tuple, -1, expression);
-
- switch(type)
- {
- case TUPLE_STRING:
- return g_strdup(tuple_get_string(tuple, -1, expression));
- break;
- case TUPLE_INT:
- return g_strdup_printf("%d", tuple_get_int(tuple, -1, expression));
- break;
- case TUPLE_UNKNOWN:
- default:
- return NULL;
- }
- }
- else if (expr != NULL)
- {
- if (expr->func(tuple, expression) == TRUE && argument != NULL)
- return tuple_formatter_process_construct(tuple, argument);
- }
-
- return NULL;
-}
-
-static GList *tuple_formatter_func_list = NULL;
-
-typedef struct {
- const gchar *name;
- gchar *(*func)(Tuple *tuple, gchar **args);
-} TupleFormatterFunction;
-
-/* processes a function */
-gchar *
-tuple_formatter_process_function(Tuple *tuple, const gchar *expression,
- const gchar *argument)
-{
- TupleFormatterFunction *expr = NULL;
- GList *iter;
-
- g_return_val_if_fail(tuple != NULL, NULL);
- g_return_val_if_fail(expression != NULL, NULL);
-
- for (iter = tuple_formatter_func_list; iter != NULL; iter = iter->next)
- {
- TupleFormatterFunction *tmp = (TupleFormatterFunction *) iter->data;
-
- if (g_str_has_prefix(expression, tmp->name) == TRUE)
- {
- expr = tmp;
- expression += strlen(tmp->name);
- }
- }
-
- if (expr != NULL)
- {
- gchar **args;
- gchar *ret;
-
- if (argument)
- args = g_strsplit(argument, ",", 10);
- else
- args = NULL;
-
- ret = expr->func(tuple, args);
-
- if (args)
- g_strfreev(args);
-
- return ret;
- }
-
- return NULL;
-}
-
-/* registers a formatter */
-void
-tuple_formatter_register_expression(const gchar *keyword,
-	gboolean (*func)(Tuple *tuple, const gchar *argument))
-{
- TupleFormatterExpression *expr;
-
- g_return_if_fail(keyword != NULL);
- g_return_if_fail(func != NULL);
-
- expr = g_new0(TupleFormatterExpression, 1);
- expr->name = keyword;
- expr->func = func;
-
- tuple_formatter_expr_list = g_list_append(tuple_formatter_expr_list, expr);
-}
-
-/* registers a function */
-void
-tuple_formatter_register_function(const gchar *keyword,
-	gchar *(*func)(Tuple *tuple, gchar **argument))
-{
- TupleFormatterFunction *expr;
-
- g_return_if_fail(keyword != NULL);
- g_return_if_fail(func != NULL);
-
- expr = g_new0(TupleFormatterFunction, 1);
- expr->name = keyword;
- expr->func = func;
-
- tuple_formatter_func_list = g_list_append(tuple_formatter_func_list, expr);
-}
-
-/* builtin-keyword: ${==arg1,arg2}, returns TRUE if <arg1> and <arg2> match.
- <arg1> and <arg2> can also be raw text, which should be enclosed in "double quotes". */
-static gboolean
-tuple_formatter_expression_match(Tuple *tuple, const gchar *expression)
-{
- gchar **args = g_strsplit(expression, ",", 2);
- gchar *arg1 = NULL, *arg2 = NULL;
- gint ret;
-
- if (args[0][0] == '\"') /* check if arg1 is "raw text" */
- {
- if ( strlen(args[0]) > 1 )
- {
- args[0][strlen(args[0]) - 1] = '\0';
- arg1 = g_strdup(&(args[0][1]));
- args[0][strlen(args[0]) - 1] = '\"';
- }
- else /* bad formatted arg */
- return FALSE;
- }
- else if (tuple_get_value_type(tuple, -1, args[0]) == TUPLE_UNKNOWN)
- {
- g_strfreev(args);
- return FALSE;
- }
-
- if (args[1][0] == '\"') /* check if arg2 is "raw text" */
- {
- if ( strlen(args[1]) > 1 )
- {
- args[1][strlen(args[1]) - 1] = '\0';
- arg2 = g_strdup(&(args[1][1]));
- args[1][strlen(args[1]) - 1] = '\"';
- }
- else /* bad formatted arg */
- return FALSE;
- }
- else if (tuple_get_value_type(tuple, -1, args[1]) == TUPLE_UNKNOWN)
- {
- g_strfreev(args);
- return FALSE;
- }
-
- if (!arg1) /* if arg1 is not "raw text", get the tuple value */
- {
- if (tuple_get_value_type(tuple, -1, args[0]) == TUPLE_STRING)
- arg1 = g_strdup(tuple_get_string(tuple, -1, args[0]));
- else
- arg1 = g_strdup_printf("%d", tuple_get_int(tuple, -1, args[0]));
- }
-
- if (!arg2) /* if arg2 is not "raw text", get the tuple value */
- {
- if (tuple_get_value_type(tuple, -1, args[1]) == TUPLE_STRING)
- arg2 = g_strdup(tuple_get_string(tuple, -1, args[1]));
- else
- arg2 = g_strdup_printf("%d", tuple_get_int(tuple, -1, args[1]));
- }
-
- ret = g_ascii_strcasecmp(arg1, arg2);
- g_free(arg1);
- g_free(arg2);
- g_strfreev(args);
-
- return ret ? FALSE : TRUE;
-}
-
-/* builtin-keyword: ${!=arg1,arg2}. returns TRUE if <arg1> and <arg2> don't match.
- <arg1> and <arg2> can also be raw text, which should be enclosed in "double quotes". */
-static gboolean
-tuple_formatter_expression_nonmatch(Tuple *tuple, const gchar *expression)
-{
- return tuple_formatter_expression_match(tuple, expression) ^ 1;
-}
-
-/* builtin-keyword: ${(empty)?}. returns TRUE if <arg> is empty. */
-static gboolean
-tuple_formatter_expression_empty(Tuple *tuple, const gchar *expression)
-{
- gboolean ret = TRUE;
- const gchar *iter;
- TupleValueType type = tuple_get_value_type(tuple, -1, expression);
-
- if (type == TUPLE_UNKNOWN)
- return TRUE;
-
- if (type == TUPLE_INT)
- return (tuple_get_int(tuple, -1, expression) == 0);
-
- iter = tuple_get_string(tuple, -1, expression);
- if (!iter)
- return TRUE;
-
- while (ret && *iter != '\0')
- {
- if (*iter == ' ')
- iter++;
- else
- ret = FALSE;
- }
-
- return ret;
-}
-
-/* builtin-keyword: ${?arg}, returns TRUE if <arg> exists. */
-static gboolean
-tuple_formatter_expression_exists(Tuple *tuple, const gchar *expression)
-{
- return !tuple_formatter_expression_empty(tuple, expression);
-}
-
-/* builtin function: %{audacious-version} */
-static gchar *
-tuple_formatter_function_version(Tuple *tuple, gchar **args)
-{
- return g_strdup(PACKAGE " " VERSION);
-}
-
 /*
 * Compile a tuplez string and cache the result.
 * This caches the result for the last string, so that
 * successive calls are sped up.
- *
- * TODO/1.5: Implement a more efficient use of the compiler.
 */
-gchar * tuple_formatter_process_string (const Tuple * tuple, const gchar * string)
+
+char * tuple_formatter_process_string (const Tuple * tuple, const char * string)
 {
- static gboolean initialized = FALSE;
- static gchar *last_string = NULL;
-#ifdef TUPLE_USE_COMPILER
+ static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+ pthread_mutex_lock (& mutex);
+
+ static char *last_string = NULL;
 static TupleEvalContext *last_ctx = NULL;
 static TupleEvalNode *last_ev = NULL;
- gchar *result = NULL;
-#endif
 
- if (initialized == FALSE)
- {
- tuple_formatter_register_expression("?", tuple_formatter_expression_exists);
- tuple_formatter_register_expression("==", tuple_formatter_expression_match);
- tuple_formatter_register_expression("!=", tuple_formatter_expression_nonmatch);
- tuple_formatter_register_expression("(empty)?", tuple_formatter_expression_empty);
-
- tuple_formatter_register_function("audacious-version", tuple_formatter_function_version);
- initialized = TRUE;
- }
-
-#ifdef TUPLE_USE_COMPILER
- g_static_mutex_lock (& tuplec_mutex);
-
- if (last_string == NULL ||
- (last_string != NULL && strcmp(last_string, string)))
+ if (! last_string || strcmp (string, last_string))
 {
 g_free(last_string);
 
@@ -560,50 +78,17 @@
 last_ctx = tuple_evalctx_new();
 last_string = g_strdup(string);
 last_ev = tuple_formatter_compile(last_ctx, last_string);
- if (last_ctx->iserror) {
- g_warning("[TuplezCC]: %s", last_ctx->errmsg);
- }
- if (!last_ev) {
- g_warning("[TuplezCC]: Compilation failed!\n");
- }
- }
-
-#ifdef TUPLE_COMPILER_DEBUG
- {
- gint level = 0;
-
- tuple_formatter_print(stderr, &level, last_ctx, last_ev);
 }
-#endif
 
- tuple_evalctx_reset(last_ctx);
+ static GString * buf;
+ if (! buf)
+ buf = g_string_sized_new (255);
 
- result = tuple_formatter_eval(last_ctx, last_ev, tuple);
- if (last_ctx->iserror) {
- g_warning("[TuplezEV]: %s", last_ctx->errmsg);
- }
+ tuple_formatter_eval (last_ctx, last_ev, tuple, buf);
+ tuple_evalctx_reset (last_ctx);
 
- g_static_mutex_unlock (& tuplec_mutex);
+ char * result = str_get (buf->str);
 
+ pthread_mutex_unlock (& mutex);
 return result;
-#else
- return tuple_formatter_process_construct(tuple, string);
-#endif
-}
-
-gchar * tuple_formatter_make_title_string (const Tuple * tuple, const gchar *
- string)
-{
- gchar *title = tuple_formatter_process_string(tuple, string);
-
- if (title == NULL || !title[0])
- {
- const char *filename = tuple_get_string(tuple, FIELD_FILE_NAME, NULL);
-
- g_free(title);
- title = g_strdup((filename != NULL) ? filename : "");
- string_cut_extension(title);
- }
-
- return title;
 }

audacious-3.1.1.tar.bz2/src/libaudcore/tuple_formatter.h -> audacious-3.2.4.tar.bz2/src/libaudcore/tuple_formatter.h Changed

@@ -1,47 +1,28 @@
 /*
- * Audacious
+ * tuple_formatter.h
 * Copyright (c) 2007 William Pitcock
 *
- * This program is free software; 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
 *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions, and the following disclaimer.
 *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses>.
+ * 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.
 *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
+ * 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 AUDACIOUS_TUPLE_FORMATTER_H
-#define AUDACIOUS_TUPLE_FORMATTER_H
+#ifndef LIBAUDCORE_TUPLE_FORMATTER_H
+#define LIBAUDCORE_TUPLE_FORMATTER_H
 
-#include <glib.h>
-#include <mowgli.h>
+#include <libaudcore/tuple.h>
 
-#include "tuple.h"
+/* returned string be released with str_unref() */
+char * tuple_formatter_process_string (const Tuple * tuple, const char * string);
 
-G_BEGIN_DECLS
-
-gchar * tuple_formatter_process_string (const Tuple * tuple, const gchar *
- string);
-gchar * tuple_formatter_make_title_string (const Tuple * tuple, const gchar *
- string);
-void tuple_formatter_register_expression(const gchar *keyword,
- gboolean (*func)(Tuple *tuple, const gchar *argument));
-void tuple_formatter_register_function(const gchar *keyword,
- gchar *(*func)(Tuple *tuple, gchar **argument));
-gchar *tuple_formatter_process_expr(Tuple *tuple, const gchar *expression,
- const gchar *argument);
-gchar *tuple_formatter_process_function(Tuple *tuple, const gchar *expression,
- const gchar *argument);
-gchar *tuple_formatter_process_construct(Tuple *tuple, const gchar *string);
-
-G_END_DECLS
-
-#endif /* AUDACIOUS_TUPLE_FORMATTER_H */
+#endif /* LIBAUDCORE_TUPLE_FORMATTER_H */

audacious-3.1.1.tar.bz2/src/libaudcore/vfs.c -> audacious-3.2.4.tar.bz2/src/libaudcore/vfs.c Changed

@@ -1,5 +1,7 @@
-/* Audacious
- * Copyright (c) 2006-2007 William Pitcock
+/*
+ * vfs.c
+ * Copyright 2006-2011 William Pitcock, Daniel Barkalow, Ralf Ertzinger,
+ * Yoshiki Yazawa, Matti Hämäläinen, and 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
@@ -17,6 +19,7 @@
 * Audacious or using our public API to be a derived work.
 */
 
+#include <glib.h>
 #include <inttypes.h>
 
 #include "vfs.h"
@@ -27,7 +30,21 @@
 #include <sys/types.h>
 #include <string.h>
 
-#include <mowgli.h>
+#include "config.h"
+
+#define VFS_SIG ('V' | ('F' << 8) | ('S' << 16))
+
+/**
+ * @struct _VFSFile
+ * #VFSFile objects describe an opened VFS stream, basically being
+ * similar in purpose as stdio FILE
+ */
+struct _VFSFile {
+ char * uri; /**< The URI of the stream */
+ VFSConstructor * base; /**< The base vtable used for VFS functions */
+ void * handle; /**< Opaque data used by the transport plugins */
+ int sig; /**< Used to detect invalid or twice-closed objects */
+};
 
 /* Audacious core provides us with a function that looks up a VFS transport for
 * a given URI scheme. Since this function will load plugins as needed, it can
@@ -35,26 +52,26 @@
 * vfs_prepare must be called from the main thread to look up any needed
 * transports beforehand. */
 
-static VFSConstructor * (* lookup_func) (const gchar * scheme) = NULL;
+static VFSConstructor * (* lookup_func) (const char * scheme) = NULL;
 
-void vfs_set_lookup_func (VFSConstructor * (* func) (const gchar * scheme))
+EXPORT void vfs_set_lookup_func (VFSConstructor * (* func) (const char * scheme))
 {
 lookup_func = func;
 }
 
-static gboolean verbose = FALSE;
+static bool_t verbose = FALSE;
 
-void vfs_set_verbose (gboolean set)
+EXPORT void vfs_set_verbose (bool_t set)
 {
 verbose = set;
 }
 
-static void logger (const gchar * format, ...)
+static void logger (const char * format, ...)
 {
- static gchar last[256] = "";
- static gint repeated = 0;
+ static char last[256] = "";
+ static int repeated = 0;
 
- gchar buf[256];
+ char buf[256];
 
 va_list args;
 va_start (args, format);
@@ -76,6 +93,26 @@
 }
 }
 
+EXPORT VFSFile * vfs_new (const char * path, VFSConstructor * vtable, void * handle)
+{
+ VFSFile * file = g_slice_new (VFSFile);
+ file->uri = str_get (path);
+ file->base = vtable;
+ file->handle = handle;
+ file->sig = VFS_SIG;
+ return file;
+}
+
+EXPORT const char * vfs_get_filename (VFSFile * file)
+{
+ return file->uri;
+}
+
+EXPORT void * vfs_get_handle (VFSFile * file)
+{
+ return file->handle;
+}
+
 /**
 * Opens a stream from a VFS transport using one of the registered
 * #VFSConstructor handlers.
@@ -84,38 +121,38 @@
 * @param mode The preferred access privileges (not guaranteed).
 * @return On success, a #VFSFile object representing the stream.
 */
-VFSFile *
-vfs_fopen(const gchar * path,
- const gchar * mode)
+EXPORT VFSFile *
+vfs_fopen(const char * path,
+ const char * mode)
 {
 g_return_val_if_fail (path && mode, NULL);
 g_return_val_if_fail (lookup_func, NULL);
 
- VFSFile *file;
- VFSConstructor *vtable = NULL;
-
- const gchar * s = strstr (path, "://");
+ const char * s = strstr (path, "://");
 g_return_val_if_fail (s, NULL);
- gchar scheme[s - path + 1];
+ char scheme[s - path + 1];
 strncpy (scheme, path, s - path);
 scheme[s - path] = 0;
 
- vtable = lookup_func (scheme);
+ VFSConstructor * vtable = lookup_func (scheme);
 if (! vtable)
 return NULL;
 
- file = vtable->vfs_fopen_impl(path, mode);
+ const gchar * sub;
+ uri_parse (path, NULL, NULL, & sub, NULL);
 
- if (verbose)
- logger ("VFS: <%p> open (mode %s) %s\n", file, mode, path);
+ gchar buf[sub - path + 1];
+ memcpy (buf, path, sub - path);
+ buf[sub - path] = 0;
 
- if (file == NULL)
+ void * handle = vtable->vfs_fopen_impl (buf, mode);
+ if (! handle)
 return NULL;
 
- file->uri = g_strdup(path);
- file->base = vtable;
- file->ref = 1;
- file->sig = VFS_SIG;
+ VFSFile * file = vfs_new (path, vtable, handle);
+
+ if (verbose)
+ logger ("VFS: <%p> open (mode %s) %s\n", file, mode, path);
 
 return file;
 }
@@ -126,7 +163,7 @@
 * @param file A #VFSFile object to destroy.
 * @return -1 on failure, 0 on success.
 */
-gint
+EXPORT int
 vfs_fclose(VFSFile * file)
 {
 g_return_val_if_fail (file && file->sig == VFS_SIG, -1);
@@ -134,18 +171,15 @@
 if (verbose)
 logger ("VFS: <%p> close\n", file);
 
- gint ret = 0;
-
- if (--file->ref > 0)
- return -1;
+ int ret = 0;
 
 if (file->base->vfs_fclose_impl(file) != 0)
 ret = -1;
 
- g_free(file->uri);
+ str_unref (file->uri);
 
 memset (file, 0, sizeof (VFSFile));
- g_free (file);
+ g_slice_free (VFSFile, file);
 
 return ret;
 }
@@ -159,15 +193,15 @@
 * @param file #VFSFile object that represents the VFS stream.
 * @return The number of elements succesfully read.
 */
-gint64 vfs_fread (void * ptr, gint64 size, gint64 nmemb, VFSFile * file)
+EXPORT int64_t vfs_fread (void * ptr, int64_t size, int64_t nmemb, VFSFile * file)
 {
 g_return_val_if_fail (file && file->sig == VFS_SIG, 0);
 
- gint64 readed = file->base->vfs_fread_impl (ptr, size, nmemb, file);
+ int64_t readed = file->base->vfs_fread_impl (ptr, size, nmemb, file);
 
- if (verbose)
+/* if (verbose)
 logger ("VFS: <%p> read %"PRId64" elements of size %"PRId64" = "
- "%"PRId64"\n", file, nmemb, size, readed);
+ "%"PRId64"\n", file, nmemb, size, readed); */
 
 return readed;
 }
@@ -181,11 +215,11 @@
 * @param file #VFSFile object that represents the VFS stream.
 * @return The number of elements succesfully written.
 */
-gint64 vfs_fwrite (const void * ptr, gint64 size, gint64 nmemb, VFSFile * file)
+EXPORT int64_t vfs_fwrite (const void * ptr, int64_t size, int64_t nmemb, VFSFile * file)
 {
 g_return_val_if_fail (file && file->sig == VFS_SIG, 0);
 
- gint64 written = file->base->vfs_fwrite_impl (ptr, size, nmemb, file);
+ int64_t written = file->base->vfs_fwrite_impl (ptr, size, nmemb, file);
 
 if (verbose)
 logger ("VFS: <%p> write %"PRId64" elements of size %"PRId64" = "
@@ -200,7 +234,7 @@
 * @param file #VFSFile object that represents the VFS stream.
 * @return On success, a character. Otherwise, EOF.
 */
-gint
+EXPORT int
 vfs_getc(VFSFile *file)
 {
 g_return_val_if_fail (file && file->sig == VFS_SIG, EOF);
@@ -218,8 +252,8 @@
 * @param file #VFSFile object that represents the VFS stream.
 * @return On success, 0. Otherwise, EOF.
 */
-gint
-vfs_ungetc(gint c, VFSFile *file)
+EXPORT int
+vfs_ungetc(int c, VFSFile *file)
 {
 g_return_val_if_fail (file && file->sig == VFS_SIG, EOF);
 
@@ -242,10 +276,10 @@
 * @param whence Type of the seek: SEEK_CUR, SEEK_SET or SEEK_END.
 * @return On success, 0. Otherwise, -1.
 */
-gint
+EXPORT int
 vfs_fseek(VFSFile * file,
- gint64 offset,
- gint whence)
+ int64_t offset,
+ int whence)
 {
 g_return_val_if_fail (file && file->sig == VFS_SIG, -1);
 
@@ -262,7 +296,7 @@
 *
 * @param file #VFSFile object that represents the VFS stream.
 */
-void
+EXPORT void
 vfs_rewind(VFSFile * file)
 {
 g_return_if_fail (file && file->sig == VFS_SIG);
@@ -279,12 +313,12 @@
 * @param file #VFSFile object that represents the VFS stream.
 * @return On success, the current position. Otherwise, -1.
 */
-gint64
+EXPORT int64_t
 vfs_ftell(VFSFile * file)
 {
 g_return_val_if_fail (file && file->sig == VFS_SIG, -1);
 
- gint64 told = file->base->vfs_ftell_impl (file);
+ int64_t told = file->base->vfs_ftell_impl (file);
 
 if (verbose)
 logger ("VFS: <%p> tell = %"PRId64"\n", file, told);
@@ -298,12 +332,12 @@
 * @param file #VFSFile object that represents the VFS stream.
 * @return On success, whether or not the VFS stream is at EOF. Otherwise, FALSE.
 */
-gboolean
+EXPORT bool_t
 vfs_feof(VFSFile * file)
 {
 g_return_val_if_fail (file && file->sig == VFS_SIG, TRUE);
 
- gboolean eof = file->base->vfs_feof_impl (file);
+ bool_t eof = file->base->vfs_feof_impl (file);
 
 if (verbose)
 logger ("VFS: <%p> eof = %s\n", file, eof ? "yes" : "no");
@@ -318,7 +352,7 @@
 * @param length The length to truncate at.
 * @return On success, 0. Otherwise, -1.
 */
-gint vfs_ftruncate (VFSFile * file, gint64 length)
+EXPORT int vfs_ftruncate (VFSFile * file, int64_t length)
 {
 g_return_val_if_fail (file && file->sig == VFS_SIG, -1);
 
@@ -334,11 +368,11 @@
 * @param file #VFSFile object that represents the VFS stream.
 * @return On success, the size of the file in bytes. Otherwise, -1.
 */
-gint64 vfs_fsize (VFSFile * file)
+EXPORT int64_t vfs_fsize (VFSFile * file)
 {
 g_return_val_if_fail (file && file->sig == VFS_SIG, -1);
 
- gint64 size = file->base->vfs_fsize_impl (file);
+ int64_t size = file->base->vfs_fsize_impl (file);
 
 if (verbose)
 logger ("VFS: <%p> size = %"PRId64"\n", file, size);
@@ -353,8 +387,8 @@
 * @param field The string constant field name to get.
 * @return On success, a copy of the value of the field. Otherwise, NULL.
 */
-gchar *
-vfs_get_metadata(VFSFile * file, const gchar * field)
+EXPORT char *
+vfs_get_metadata(VFSFile * file, const char * field)
 {
 if (file == NULL)
 return NULL;
@@ -371,18 +405,18 @@
 * @param test A GFileTest to run.
 * @return The result of g_file_test().
 */
-gboolean
-vfs_file_test(const gchar * path, GFileTest test)
+EXPORT bool_t
+vfs_file_test(const char * path, int test)
 {
 if (strncmp (path, "file://", 7))
 return FALSE; /* only local files are handled */
 
- gchar * path2 = uri_to_filename (path);
+ char * path2 = uri_to_filename (path);
 
 if (path2 == NULL)
 path2 = g_strdup(path);
 
- gboolean ret = g_file_test (path2, test);
+ bool_t ret = g_file_test (path2, test);
 
 g_free(path2);
 
@@ -395,11 +429,11 @@
 * @param path A path to test.
 * @return TRUE if the file is writeable, otherwise FALSE.
 */
-gboolean
-vfs_is_writeable(const gchar * path)
+EXPORT bool_t
+vfs_is_writeable(const char * path)
 {
 struct stat info;
- gchar * realfn = uri_to_filename (path);
+ char * realfn = uri_to_filename (path);
 
 if (stat(realfn, &info) == -1)
 return FALSE;
@@ -410,31 +444,12 @@
 }
 
 /**
- * Increments the amount of references that are using this FD.
- * References are removed by calling vfs_fclose on the handle returned
- * from this function. If the amount of references reaches zero, then
- * the file will be closed.
- *
- * @param in The VFSFile handle to mark as duplicated.
- * @return VFSFile handle, which is same as given input.
- */
-VFSFile *
-vfs_dup(VFSFile *in)
-{
- g_return_val_if_fail(in != NULL, NULL);
-
- in->ref++;
-
- return in;
-}
-
-/**
 * Tests if a path is remote uri.
 *
 * @param path A path to test.
 * @return TRUE if the file is remote, otherwise FALSE.
 */
-gboolean vfs_is_remote (const char * path)
+EXPORT bool_t vfs_is_remote (const char * path)
 {
 return strncmp (path, "file://", 7) ? TRUE : FALSE;
 }
@@ -445,18 +460,7 @@
 * @param file A #VFSFile object to test.
 * @return TRUE if the file is streaming, otherwise FALSE.
 */
-gboolean
-vfs_is_streaming(VFSFile *file)
+EXPORT bool_t vfs_is_streaming (VFSFile * file)
 {
- off_t size = 0;
-
- if (file == NULL)
- return FALSE;
-
- size = file->base->vfs_fsize_impl(file);
-
- if (size == -1)
- return TRUE;
- else
- return FALSE;
+ return (vfs_fsize (file) < 0);
 }

audacious-3.1.1.tar.bz2/src/libaudcore/vfs.h -> audacious-3.2.4.tar.bz2/src/libaudcore/vfs.h Changed

@@ -1,6 +1,7 @@
 /*
- * Audacious
- * Copyright (c) 2006-2010 Audacious team
+ * vfs.h
+ * Copyright 2006-2011 William Pitcock, Daniel Barkalow, Ralf Ertzinger,
+ * Yoshiki Yazawa, Matti Hämäläinen, and 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
@@ -24,35 +25,18 @@
 * file access.
 */
 
-#ifndef AUDACIOUS_VFS_H
-#define AUDACIOUS_VFS_H
+#ifndef LIBAUDCORE_VFS_H
+#define LIBAUDCORE_VFS_H
 
-#include <glib.h>
-#include <stdio.h>
-#include <sys/types.h>
+#include <stdint.h>
 
-G_BEGIN_DECLS
+#include <libaudcore/core.h>
 
 /** @struct VFSFile */
 typedef struct _VFSFile VFSFile;
 /** @struct VFSConstructor */
 typedef const struct _VFSConstructor VFSConstructor;
 
-#define VFS_SIG ('V' | ('F' << 8) | ('S' << 16))
-
-/**
- * @struct _VFSFile
- * #VFSFile objects describe an opened VFS stream, basically being
- * similar in purpose as stdio FILE
- */
-struct _VFSFile {
- gchar *uri; /**< The URI of the stream */
- gpointer handle; /**< Opaque data used by the transport plugins */
- VFSConstructor *base; /**< The base vtable used for VFS functions */
- gint ref; /**< The amount of references that the VFSFile object has */
- gint sig; /**< Used to detect invalid or twice-closed objects */
-};
-
 /**
 * @struct _VFSConstructor
 * #VFSConstructor objects contain the base vtables used for extrapolating
@@ -61,37 +45,37 @@
 */
 struct _VFSConstructor {
 /** A function pointer which points to a fopen implementation. */
- VFSFile * (* vfs_fopen_impl) (const gchar * filename, const gchar * mode);
+ void * (* vfs_fopen_impl) (const char * filename, const char * mode);
 /** A function pointer which points to a fclose implementation. */
- gint (* vfs_fclose_impl) (VFSFile * file);
+ int (* vfs_fclose_impl) (VFSFile * file);
 
 /** A function pointer which points to a fread implementation. */
- gint64 (* vfs_fread_impl) (void * ptr, gint64 size, gint64 nmemb, VFSFile *
+ int64_t (* vfs_fread_impl) (void * ptr, int64_t size, int64_t nmemb, VFSFile *
 file);
 /** A function pointer which points to a fwrite implementation. */
- gint64 (* vfs_fwrite_impl) (const void * ptr, gint64 size, gint64 nmemb,
+ int64_t (* vfs_fwrite_impl) (const void * ptr, int64_t size, int64_t nmemb,
 VFSFile * file);
 
 /** A function pointer which points to a getc implementation. */
- gint (* vfs_getc_impl) (VFSFile * stream);
+ int (* vfs_getc_impl) (VFSFile * stream);
 /** A function pointer which points to an ungetc implementation. */
- gint (* vfs_ungetc_impl) (gint c, VFSFile * stream);
+ int (* vfs_ungetc_impl) (int c, VFSFile * stream);
 
 /** A function pointer which points to a fseek implementation. */
- gint (* vfs_fseek_impl) (VFSFile * file, gint64 offset, gint whence);
+ int (* vfs_fseek_impl) (VFSFile * file, int64_t offset, int whence);
 /** function pointer which points to a rewind implementation. */
 void (* vfs_rewind_impl) (VFSFile * file);
 /** A function pointer which points to a ftell implementation. */
- gint64 (* vfs_ftell_impl) (VFSFile * file);
+ int64_t (* vfs_ftell_impl) (VFSFile * file);
 /** A function pointer which points to a feof implementation. */
- gboolean (* vfs_feof_impl) (VFSFile * file);
+ bool_t (* vfs_feof_impl) (VFSFile * file);
 /** A function pointer which points to a ftruncate implementation. */
- gint (* vfs_ftruncate_impl) (VFSFile * file, gint64 length);
+ int (* vfs_ftruncate_impl) (VFSFile * file, int64_t length);
 /** A function pointer which points to a fsize implementation. */
- gint64 (* vfs_fsize_impl) (VFSFile * file);
+ int64_t (* vfs_fsize_impl) (VFSFile * file);
 
 /** A function pointer which points to a (stream) metadata fetching implementation. */
- gchar * (* vfs_get_metadata_impl) (VFSFile * file, const gchar * field);
+ char * (* vfs_get_metadata_impl) (VFSFile * file, const char * field);
 };
 
 #ifdef __GNUC__
@@ -100,57 +84,58 @@
 #define WARN_RETURN
 #endif
 
-VFSFile * vfs_fopen (const gchar * path, const gchar * mode) WARN_RETURN;
-VFSFile * vfs_dup (VFSFile * in) WARN_RETURN;
-gint vfs_fclose (VFSFile * file);
+VFSFile * vfs_new (const char * path, VFSConstructor * vtable, void * handle) WARN_RETURN;
+const char * vfs_get_filename (VFSFile * file) WARN_RETURN;
+void * vfs_get_handle (VFSFile * file) WARN_RETURN;
+
+VFSFile * vfs_fopen (const char * path, const char * mode) WARN_RETURN;
+int vfs_fclose (VFSFile * file);
 
-gint64 vfs_fread (void * ptr, gint64 size, gint64 nmemb, VFSFile * file)
+int64_t vfs_fread (void * ptr, int64_t size, int64_t nmemb, VFSFile * file)
 WARN_RETURN;
-gint64 vfs_fwrite (const void * ptr, gint64 size, gint64 nmemb, VFSFile * file)
+int64_t vfs_fwrite (const void * ptr, int64_t size, int64_t nmemb, VFSFile * file)
 WARN_RETURN;
 
-gint vfs_getc (VFSFile * stream) WARN_RETURN;
-gint vfs_ungetc (gint c, VFSFile * stream) WARN_RETURN;
-gchar * vfs_fgets (gchar * s, gint n, VFSFile * stream) WARN_RETURN;
-gboolean vfs_feof (VFSFile * file) WARN_RETURN;
-gint vfs_fprintf (VFSFile * stream, gchar const * format, ...) __attribute__
+int vfs_getc (VFSFile * stream) WARN_RETURN;
+int vfs_ungetc (int c, VFSFile * stream) WARN_RETURN;
+char * vfs_fgets (char * s, int n, VFSFile * stream) WARN_RETURN;
+bool_t vfs_feof (VFSFile * file) WARN_RETURN;
+int vfs_fprintf (VFSFile * stream, char const * format, ...) __attribute__
 ((__format__ (__printf__, 2, 3)));
 
-gint vfs_fseek (VFSFile * file, gint64 offset, gint whence) WARN_RETURN;
+int vfs_fseek (VFSFile * file, int64_t offset, int whence) WARN_RETURN;
 void vfs_rewind (VFSFile * file);
-gint64 vfs_ftell (VFSFile * file) WARN_RETURN;
-gint64 vfs_fsize (VFSFile * file) WARN_RETURN;
-gint vfs_ftruncate (VFSFile * file, gint64 length) WARN_RETURN;
-
-gboolean vfs_fget_le16 (guint16 * value, VFSFile * stream) WARN_RETURN;
-gboolean vfs_fget_le32 (guint32 * value, VFSFile * stream) WARN_RETURN;
-gboolean vfs_fget_le64 (guint64 * value, VFSFile * stream) WARN_RETURN;
-gboolean vfs_fget_be16 (guint16 * value, VFSFile * stream) WARN_RETURN;
-gboolean vfs_fget_be32 (guint32 * value, VFSFile * stream) WARN_RETURN;
-gboolean vfs_fget_be64 (guint64 * value, VFSFile * stream) WARN_RETURN;
-
-gboolean vfs_fput_le16 (guint16 value, VFSFile * stream) WARN_RETURN;
-gboolean vfs_fput_le32 (guint32 value, VFSFile * stream) WARN_RETURN;
-gboolean vfs_fput_le64 (guint64 value, VFSFile * stream) WARN_RETURN;
-gboolean vfs_fput_be16 (guint16 value, VFSFile * stream) WARN_RETURN;
-gboolean vfs_fput_be32 (guint32 value, VFSFile * stream) WARN_RETURN;
-gboolean vfs_fput_be64 (guint64 value, VFSFile * stream) WARN_RETURN;
-
-gboolean vfs_is_streaming (VFSFile * file) WARN_RETURN;
-gchar * vfs_get_metadata (VFSFile * file, const gchar * field) WARN_RETURN;
-
-gboolean vfs_file_test (const gchar * path, GFileTest test) WARN_RETURN;
-gboolean vfs_is_writeable (const gchar * path) WARN_RETURN;
-gboolean vfs_is_remote (const gchar * path) WARN_RETURN;
-
-void vfs_file_get_contents (const gchar * filename, void * * buf, gint64 *
+int64_t vfs_ftell (VFSFile * file) WARN_RETURN;
+int64_t vfs_fsize (VFSFile * file) WARN_RETURN;
+int vfs_ftruncate (VFSFile * file, int64_t length) WARN_RETURN;
+
+bool_t vfs_fget_le16 (uint16_t * value, VFSFile * stream) WARN_RETURN;
+bool_t vfs_fget_le32 (uint32_t * value, VFSFile * stream) WARN_RETURN;
+bool_t vfs_fget_le64 (uint64_t * value, VFSFile * stream) WARN_RETURN;
+bool_t vfs_fget_be16 (uint16_t * value, VFSFile * stream) WARN_RETURN;
+bool_t vfs_fget_be32 (uint32_t * value, VFSFile * stream) WARN_RETURN;
+bool_t vfs_fget_be64 (uint64_t * value, VFSFile * stream) WARN_RETURN;
+
+bool_t vfs_fput_le16 (uint16_t value, VFSFile * stream) WARN_RETURN;
+bool_t vfs_fput_le32 (uint32_t value, VFSFile * stream) WARN_RETURN;
+bool_t vfs_fput_le64 (uint64_t value, VFSFile * stream) WARN_RETURN;
+bool_t vfs_fput_be16 (uint16_t value, VFSFile * stream) WARN_RETURN;
+bool_t vfs_fput_be32 (uint32_t value, VFSFile * stream) WARN_RETURN;
+bool_t vfs_fput_be64 (uint64_t value, VFSFile * stream) WARN_RETURN;
+
+bool_t vfs_is_streaming (VFSFile * file) WARN_RETURN;
+char * vfs_get_metadata (VFSFile * file, const char * field) WARN_RETURN;
+
+bool_t vfs_file_test (const char * path, int test) WARN_RETURN;
+bool_t vfs_is_writeable (const char * path) WARN_RETURN;
+bool_t vfs_is_remote (const char * path) WARN_RETURN;
+
+void vfs_file_get_contents (const char * filename, void * * buf, int64_t *
 size);
 
-void vfs_set_lookup_func (VFSConstructor * (* func) (const gchar * scheme));
-void vfs_set_verbose (gboolean verbose);
+void vfs_set_lookup_func (VFSConstructor * (* func) (const char * scheme));
+void vfs_set_verbose (bool_t verbose);
 
 #undef WARN_RETURN
 
-G_END_DECLS
-
-#endif /* AUDACIOUS_VFS_H */
+#endif /* LIBAUDCORE_VFS_H */

audacious-3.1.1.tar.bz2/src/libaudcore/vfs_async.c -> audacious-3.2.4.tar.bz2/src/libaudcore/vfs_async.c Changed

@@ -1,37 +1,39 @@
 /*
- * Audacious
- * Copyright (c) 2010 William Pitcock <nenolod@dereferenced.org>
+ * vfs_async.c
+ * Copyright 2010 William Pitcock
 *
- * This program is free software; 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
 *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions, and the following disclaimer.
 *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses>.
+ * 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.
 *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
+ * 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/vfs_async.h>
+#include <glib.h>
+
+#include "config.h"
+#include "vfs_async.h"
 
 typedef struct {
- gchar *filename;
+ char *filename;
 void *buf;
- gint64 size;
+ int64_t size;
 GThread *thread;
- gpointer userdata;
+ void * userdata;
 
 VFSConsumer cons_f;
 } VFSAsyncTrampoline;
 
-gboolean
-vfs_async_file_get_contents_trampoline(gpointer data)
+bool_t
+vfs_async_file_get_contents_trampoline(void * data)
 {
 VFSAsyncTrampoline *tr = data;
 
@@ -41,8 +43,8 @@
 return FALSE;
 }
 
-gpointer
-vfs_async_file_get_contents_worker(gpointer data)
+void *
+vfs_async_file_get_contents_worker(void * data)
 {
 VFSAsyncTrampoline *tr = data;
 
@@ -53,8 +55,8 @@
 return NULL;
 }
 
-void
-vfs_async_file_get_contents(const gchar *filename, VFSConsumer cons_f, gpointer userdata)
+EXPORT void
+vfs_async_file_get_contents(const char *filename, VFSConsumer cons_f, void * userdata)
 {
 VFSAsyncTrampoline *tr;

audacious-3.1.1.tar.bz2/src/libaudcore/vfs_async.h -> audacious-3.2.4.tar.bz2/src/libaudcore/vfs_async.h Changed

@@ -1,30 +1,29 @@
 /*
- * Audacious
- * Copyright (c) 2010 William Pitcock <nenolod@dereferenced.org>
+ * vfs_async.c
+ * Copyright 2010 William Pitcock
 *
- * This program is free software; 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
 *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions, and the following disclaimer.
 *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses>.
+ * 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.
 *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
+ * 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 AUDACIOUS_VFS_ASYNC_H
-#define AUDACIOUS_VFS_ASYNC_H
+#ifndef LIBAUDCORE_VFS_ASYNC_H
+#define LIBAUDCORE_VFS_ASYNC_H
 
 #include <libaudcore/vfs.h>
 
-typedef gboolean (*VFSConsumer)(gpointer buf, gint64 size, gpointer userdata);
+typedef bool_t (*VFSConsumer)(void * buf, int64_t size, void * userdata);
 
-void vfs_async_file_get_contents(const gchar *filename, VFSConsumer cons_f, gpointer userdata);
+void vfs_async_file_get_contents(const char *filename, VFSConsumer cons_f, void * userdata);
 
 #endif

audacious-3.1.1.tar.bz2/src/libaudcore/vfs_common.c -> audacious-3.2.4.tar.bz2/src/libaudcore/vfs_common.c Changed

@@ -1,4 +1,9 @@
-/* This program is free software; you can redistribute it and/or modify
+/*
+ * vfs_common.c
+ * Copyright 2006-2010 Tony Vroon, William Pitcock, Maciej Grela,
+ * Matti Hämäläinen, and 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.
 *
@@ -13,10 +18,16 @@
 * The Audacious team does not consider modular code linking to
 * Audacious or using our public API to be a derived work.
 */
-#include "vfs.h"
-#include <string.h>
-#include <stdlib.h>
+
+#include <glib.h>
 #include <glib/gprintf.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "config.h"
+#include "vfs.h"
+
 /**
 * @file vfs_common.c
 * Common code for various VFS-stream related operations.
@@ -32,9 +43,9 @@
 * @param stream A #VFSFile object representing the stream.
 * @return The character on success, or EOF.
 */
-gint vfs_fputc(gint c, VFSFile *stream)
+EXPORT int vfs_fputc(int c, VFSFile *stream)
 {
- guchar uc = (guchar) c;
+ unsigned char uc = (unsigned char) c;
 
 if (!vfs_fwrite(&uc, 1, 1, stream)) {
 return EOF;
@@ -51,10 +62,10 @@
 * @param stream A #VFSFile object representing the stream.
 * @return The string on success, or NULL.
 */
-gchar *vfs_fgets(gchar *s, gint n, VFSFile *stream)
+EXPORT char *vfs_fgets(char *s, int n, VFSFile *stream)
 {
- gint c;
- register gchar *p;
+ int c;
+ register char *p;
 
 if (n <= 0) return NULL;
 
@@ -83,7 +94,7 @@
 * @param stream A #VFSFile object representing the stream.
 * @return The amount of bytes written.
 */
-gint vfs_fputs(const gchar *s, VFSFile *stream)
+EXPORT int vfs_fputs(const char *s, VFSFile *stream)
 {
 gsize n = strlen(s);
 
@@ -98,10 +109,10 @@
 * @param args A va_list of args to use.
 * @return value The amount of bytes written.
 */
-gint vfs_vfprintf(VFSFile *stream, gchar const *format, va_list args)
+EXPORT int vfs_vfprintf(VFSFile *stream, char const *format, va_list args)
 {
- gchar *string;
- gint rv = g_vasprintf(&string, format, args);
+ char *string;
+ int rv = g_vasprintf(&string, format, args);
 if (rv < 0) return rv;
 rv = vfs_fputs(string, stream);
 g_free(string);
@@ -116,10 +127,10 @@
 * @param ... Optional list of arguments.
 * @return The amount of bytes written.
 */
-gint vfs_fprintf(VFSFile *stream, gchar const *format, ...)
+EXPORT int vfs_fprintf(VFSFile *stream, char const *format, ...)
 {
 va_list arg;
- gint rv;
+ int rv;
 
 va_start(arg, format);
 rv = vfs_vfprintf(stream, format, arg);
@@ -137,14 +148,14 @@
 * @param size Pointer to gsize variable that will hold the amount of
 * read data e.g. filesize.
 */
-void vfs_file_get_contents (const gchar * filename, void * * buf, gint64 * size)
+EXPORT void vfs_file_get_contents (const char * filename, void * * buf, int64_t * size)
 {
 * buf = NULL;
 * size = 0;
 
 VFSFile *fd;
 gsize filled_size = 0, buf_size = 4096;
- guchar * ptr;
+ unsigned char * ptr;
 
 if ((fd = vfs_fopen(filename, "rb")) == NULL)
 return;
@@ -175,7 +186,7 @@
 if (*buf == NULL)
 goto close_handle;
 
- ptr = *buf + filled_size;
+ ptr = (unsigned char *) (* buf) + filled_size;
 }
 }
 
@@ -194,9 +205,9 @@
 * @param stream A #VFSFile object representing the stream.
 * @return TRUE if read was succesful, FALSE if there was an error.
 */
-gboolean vfs_fget_le16(guint16 *value, VFSFile *stream)
+EXPORT bool_t vfs_fget_le16(uint16_t *value, VFSFile *stream)
 {
- guint16 tmp;
+ uint16_t tmp;
 if (vfs_fread(&tmp, sizeof(tmp), 1, stream) != 1)
 return FALSE;
 *value = GUINT16_FROM_LE(tmp);
@@ -210,9 +221,9 @@
 * @param stream A #VFSFile object representing the stream.
 * @return TRUE if read was succesful, FALSE if there was an error.
 */
-gboolean vfs_fget_le32(guint32 *value, VFSFile *stream)
+EXPORT bool_t vfs_fget_le32(uint32_t *value, VFSFile *stream)
 {
- guint32 tmp;
+ uint32_t tmp;
 if (vfs_fread(&tmp, sizeof(tmp), 1, stream) != 1)
 return FALSE;
 *value = GUINT32_FROM_LE(tmp);
@@ -226,9 +237,9 @@
 * @param stream A #VFSFile object representing the stream.
 * @return TRUE if read was succesful, FALSE if there was an error.
 */
-gboolean vfs_fget_le64(guint64 *value, VFSFile *stream)
+EXPORT bool_t vfs_fget_le64(uint64_t *value, VFSFile *stream)
 {
- guint64 tmp;
+ uint64_t tmp;
 if (vfs_fread(&tmp, sizeof(tmp), 1, stream) != 1)
 return FALSE;
 *value = GUINT64_FROM_LE(tmp);
@@ -243,9 +254,9 @@
 * @param stream A #VFSFile object representing the stream.
 * @return TRUE if read was succesful, FALSE if there was an error.
 */
-gboolean vfs_fget_be16(guint16 *value, VFSFile *stream)
+EXPORT bool_t vfs_fget_be16(uint16_t *value, VFSFile *stream)
 {
- guint16 tmp;
+ uint16_t tmp;
 if (vfs_fread(&tmp, sizeof(tmp), 1, stream) != 1)
 return FALSE;
 *value = GUINT16_FROM_BE(tmp);
@@ -259,9 +270,9 @@
 * @param stream A #VFSFile object representing the stream.
 * @return TRUE if read was succesful, FALSE if there was an error.
 */
-gboolean vfs_fget_be32(guint32 *value, VFSFile *stream)
+EXPORT bool_t vfs_fget_be32(uint32_t *value, VFSFile *stream)
 {
- guint32 tmp;
+ uint32_t tmp;
 if (vfs_fread(&tmp, sizeof(tmp), 1, stream) != 1)
 return FALSE;
 *value = GUINT32_FROM_BE(tmp);
@@ -275,9 +286,9 @@
 * @param stream A #VFSFile object representing the stream.
 * @return TRUE if read was succesful, FALSE if there was an error.
 */
-gboolean vfs_fget_be64(guint64 *value, VFSFile *stream)
+EXPORT bool_t vfs_fget_be64(uint64_t *value, VFSFile *stream)
 {
- guint64 tmp;
+ uint64_t tmp;
 if (vfs_fread(&tmp, sizeof(tmp), 1, stream) != 1)
 return FALSE;
 *value = GUINT64_FROM_BE(tmp);
@@ -292,9 +303,9 @@
 * @param stream A #VFSFile object representing the stream.
 * @return TRUE if read was succesful, FALSE if there was an error.
 */
-gboolean vfs_fput_le16(guint16 value, VFSFile *stream)
+EXPORT bool_t vfs_fput_le16(uint16_t value, VFSFile *stream)
 {
- guint16 tmp = GUINT16_TO_LE(value);
+ uint16_t tmp = GUINT16_TO_LE(value);
 return vfs_fwrite(&tmp, sizeof(tmp), 1, stream) == 1;
 }
 
@@ -306,9 +317,9 @@
 * @param stream A #VFSFile object representing the stream.
 * @return TRUE if read was succesful, FALSE if there was an error.
 */
-gboolean vfs_fput_le32(guint32 value, VFSFile *stream)
+EXPORT bool_t vfs_fput_le32(uint32_t value, VFSFile *stream)
 {
- guint32 tmp = GUINT32_TO_LE(value);
+ uint32_t tmp = GUINT32_TO_LE(value);
 return vfs_fwrite(&tmp, sizeof(tmp), 1, stream) == 1;
 }
 
@@ -320,9 +331,9 @@
 * @param stream A #VFSFile object representing the stream.
 * @return TRUE if read was succesful, FALSE if there was an error.
 */
-gboolean vfs_fput_le64(guint64 value, VFSFile *stream)
+EXPORT bool_t vfs_fput_le64(uint64_t value, VFSFile *stream)
 {
- guint64 tmp = GUINT64_TO_LE(value);
+ uint64_t tmp = GUINT64_TO_LE(value);
 return vfs_fwrite(&tmp, sizeof(tmp), 1, stream) == 1;
 }
 
@@ -334,9 +345,9 @@
 * @param stream A #VFSFile object representing the stream.
 * @return TRUE if read was succesful, FALSE if there was an error.
 */
-gboolean vfs_fput_be16(guint16 value, VFSFile *stream)
+EXPORT bool_t vfs_fput_be16(uint16_t value, VFSFile *stream)
 {
- guint16 tmp = GUINT16_TO_BE(value);
+ uint16_t tmp = GUINT16_TO_BE(value);
 return vfs_fwrite(&tmp, sizeof(tmp), 1, stream) == 1;
 }
 
@@ -348,9 +359,9 @@
 * @param stream A #VFSFile object representing the stream.
 * @return TRUE if read was succesful, FALSE if there was an error.
 */
-gboolean vfs_fput_be32(guint32 value, VFSFile *stream)
+EXPORT bool_t vfs_fput_be32(uint32_t value, VFSFile *stream)
 {
- guint32 tmp = GUINT32_TO_BE(value);
+ uint32_t tmp = GUINT32_TO_BE(value);
 return vfs_fwrite(&tmp, sizeof(tmp), 1, stream) == 1;
 }
 
@@ -362,8 +373,8 @@
 * @param stream A #VFSFile object representing the stream.
 * @return TRUE if read was succesful, FALSE if there was an error.
 */
-gboolean vfs_fput_be64(guint64 value, VFSFile *stream)
+EXPORT bool_t vfs_fput_be64(uint64_t value, VFSFile *stream)
 {
- guint64 tmp = GUINT64_TO_BE(value);
+ uint64_t tmp = GUINT64_TO_BE(value);
 return vfs_fwrite(&tmp, sizeof(tmp), 1, stream) == 1;
 }

audacious-3.1.1.tar.bz2/src/libaudgui/Makefile -> audacious-3.2.4.tar.bz2/src/libaudgui/Makefile Changed

@@ -2,7 +2,8 @@
 LIB_MAJOR = 1
 LIB_MINOR = 0
 
-SRCS = confirm.c \
+SRCS = about.c \
+       confirm.c \
        effects-menu.c \
        equalizer.c \
        iface-menu.c \
@@ -13,14 +14,11 @@
        list.c \
        playlists.c \
        queue-manager.c \
-       ui_gtk.c \
        ui_fileopener.c \
        ui_urlopener.c \
        ui_jumptotrack.c \
        ui_jumptotrack_cache.c \
        icons-stock.c \
-       ui_about.c \
-       ui_credits.c \
        ui_playlist_manager.c \
        urilist.c \
        util.c
@@ -34,6 +32,16 @@
 
 includesubdir = libaudgui
 
-CPPFLAGS += -DHAVE_CONFIG_H -I.. -I../.. ${GLIB_CFLASG} ${GTK_CFLAGS} ${DBUS_CFLAGS} ${MOWGLI_CFLAGS} ${AUDACIOUS_DEFINES} ${REGEX_CFLAGS}
-CFLAGS += -std=gnu99 ${LIB_CFLAGS}
-LIBS += -lm ${GLIB_LIBS} ${MOWGLI_LIBS} ${GTK_LIBS} ${REGEX_LIBS} -L../libaudcore -laudcore
+CPPFLAGS := -I.. -I../.. \
+            ${CPPFLAGS} \
+            ${GLIB_CFLASG} \
+            ${GTK_CFLAGS} \
+            ${REGEX_CFLAGS}
+
+CFLAGS += ${LIB_CFLAGS}
+
+LIBS := -L../libaudcore -laudcore \
+        ${LIBS} -lm \
+        ${GLIB_LIBS} \
+        ${GTK_LIBS} \
+        ${REGEX_LIBS}

audacious-3.2.4.tar.bz2/src/libaudgui/about.c Added

@@ -0,0 +1,119 @@
+/*
+ * about.c
+ * Copyright 2011-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 <gtk/gtk.h>
+
+#include <audacious/gtk-compat.h>
+#include <audacious/i18n.h>
+#include <audacious/misc.h>
+
+#include "config.h"
+#include "libaudgui-gtk.h"
+
+static GtkWidget * about_window;
+
+static GtkTextBuffer * create_text_buffer (const char * const * items)
+{
+ GString * string = g_string_new ("");
+
+ for (; items[0] || items[1]; items ++)
+ {
+ if (items[0])
+ g_string_append (string, _(items[0]));
+
+ g_string_append_c (string, '\n');
+ }
+
+ GtkTextBuffer * buffer = gtk_text_buffer_new (NULL);
+ gtk_text_buffer_set_text (buffer, string->str, string->len - 1);
+ g_string_free (string, TRUE);
+ return buffer;
+}
+
+static GtkWidget * create_credits_notebook (const char * const * credits,
+ const char * const * translators)
+{
+ const char * titles[2] = {_("Credits"), _("Translators")};
+ const char * const * lists[2] = {credits, translators};
+
+ GtkWidget * notebook = gtk_notebook_new ();
+
+ for (int i = 0; i < 2; i ++)
+ {
+ GtkWidget * label = gtk_label_new (titles[i]);
+
+ GtkWidget * scrolled = gtk_scrolled_window_new (NULL, NULL);
+ gtk_widget_set_size_request (scrolled, -1, 200);
+
+ GtkWidget * text = gtk_text_view_new_with_buffer (create_text_buffer (lists[i]));
+ gtk_text_view_set_editable ((GtkTextView *) text, FALSE);
+ gtk_text_view_set_cursor_visible ((GtkTextView *) text, FALSE);
+ gtk_text_view_set_left_margin ((GtkTextView *) text, 6);
+ gtk_text_view_set_right_margin ((GtkTextView *) text, 6);
+ gtk_container_add ((GtkContainer *) scrolled, text);
+
+ gtk_notebook_append_page ((GtkNotebook *) notebook, scrolled, label);
+ }
+
+ return notebook;
+}
+
+EXPORT void audgui_show_about_window (void)
+{
+ if (about_window)
+ {
+ gtk_window_present ((GtkWindow *) about_window);
+ return;
+ }
+
+ const char * brief, * const * credits, * const * translators;
+ aud_get_audacious_credits (& brief, & credits, & translators);
+
+ about_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_title ((GtkWindow *) about_window, _("About Audacious"));
+ gtk_window_set_resizable ((GtkWindow *) about_window, FALSE);
+ gtk_container_set_border_width ((GtkContainer *) about_window, 3);
+
+ audgui_destroy_on_escape (about_window);
+ g_signal_connect (about_window, "destroy", (GCallback) gtk_widget_destroyed,
+ & about_window);
+
+ GtkWidget * vbox = gtk_vbox_new (FALSE, 6);
+ gtk_container_add ((GtkContainer *) about_window, vbox);
+
+ char * name = g_strdup_printf ("%s/images/about-logo.png", aud_get_path
+ (AUD_PATH_DATA_DIR));
+ GtkWidget * image = gtk_image_new_from_file (name);
+ gtk_box_pack_start ((GtkBox *) vbox, image, FALSE, FALSE, 0);
+ g_free (name);
+
+ char * markup = g_strdup_printf (brief, VERSION);
+ GtkWidget * label = gtk_label_new (NULL);
+ gtk_label_set_markup ((GtkLabel *) label, markup);
+ gtk_label_set_justify ((GtkLabel *) label, GTK_JUSTIFY_CENTER);
+ gtk_box_pack_start ((GtkBox *) vbox, label, FALSE, FALSE, 0);
+ g_free (markup);
+
+ GtkWidget * exp = gtk_expander_new (_("Credits"));
+ GtkWidget * notebook = create_credits_notebook (credits, translators);
+ gtk_container_add ((GtkContainer *) exp, notebook);
+ gtk_box_pack_start ((GtkBox *) vbox, exp, TRUE, TRUE, 0);
+
+ gtk_widget_show_all (about_window);
+}

audacious-3.1.1.tar.bz2/src/libaudgui/confirm.c -> audacious-3.2.4.tar.bz2/src/libaudgui/confirm.c Changed

@@ -1,22 +1,20 @@
 /*
- * libaudgui/confirm.c
+ * confirm.c
 * Copyright 2010-2011 John Lindgren
 *
- * This file is part of Audacious.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
 *
- * 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.
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions, and the following disclaimer.
 *
- * 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.
+ * 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.
 *
- * 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.
+ * 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>
@@ -36,7 +34,7 @@
 
 static void confirm_delete_cb (GtkButton * button, void * data)
 {
- gint list = aud_playlist_by_unique_id (GPOINTER_TO_INT (data));
+ int list = aud_playlist_by_unique_id (GPOINTER_TO_INT (data));
 if (list < 0)
 return;
 
@@ -45,10 +43,10 @@
 aud_playlist_set_active (list - 1);
 }
 
-void audgui_confirm_playlist_delete (gint playlist)
+EXPORT void audgui_confirm_playlist_delete (int playlist)
 {
 GtkWidget * window, * vbox, * hbox, * label, * button;
- gchar * message;
+ char * message;
 
 if (aud_get_bool ("audgui", "no_confirm_playlist_delete"))
 {
@@ -74,11 +72,11 @@
 gtk_box_pack_start ((GtkBox *) hbox, gtk_image_new_from_stock
 (GTK_STOCK_DIALOG_QUESTION, GTK_ICON_SIZE_DIALOG), FALSE, FALSE, 0);
 
- gchar * title = aud_playlist_get_title (playlist);
+ char * title = aud_playlist_get_title (playlist);
 message = g_strdup_printf (_("Are you sure you want to close %s? If you "
 "do, any changes made since the playlist was exported will be lost."),
 title);
- g_free (title);
+ str_unref (title);
 label = gtk_label_new (message);
 g_free (message);
 gtk_label_set_line_wrap ((GtkLabel *) label, TRUE);
@@ -113,7 +111,7 @@
 gtk_widget_show_all (window);
 }
 
-static void rename_cb (GtkDialog * dialog, gint resp, void * list)
+static void rename_cb (GtkDialog * dialog, int resp, void * list)
 {
 if (resp == GTK_RESPONSE_ACCEPT && GPOINTER_TO_INT (list) <
 aud_playlist_count ())
@@ -123,7 +121,7 @@
 gtk_widget_destroy ((GtkWidget *) dialog);
 }
 
-void audgui_show_playlist_rename (gint playlist)
+EXPORT void audgui_show_playlist_rename (int playlist)
 {
 GtkWidget * dialog = gtk_dialog_new_with_buttons (_("Rename Playlist"),
 NULL, 0, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, GTK_STOCK_CANCEL,
@@ -131,9 +129,9 @@
 gtk_dialog_set_default_response ((GtkDialog *) dialog, GTK_RESPONSE_ACCEPT);
 
 GtkWidget * entry = gtk_entry_new ();
- gchar * title = aud_playlist_get_title (playlist);
+ char * title = aud_playlist_get_title (playlist);
 gtk_entry_set_text ((GtkEntry *) entry, title);
- g_free (title);
+ str_unref (title);
 gtk_entry_set_activates_default ((GtkEntry *) entry, TRUE);
 gtk_box_pack_start ((GtkBox *) gtk_dialog_get_content_area ((GtkDialog *)
 dialog), entry, FALSE, FALSE, 0);

audacious-3.1.1.tar.bz2/src/libaudgui/effects-menu.c -> audacious-3.2.4.tar.bz2/src/libaudgui/effects-menu.c Changed

@@ -1,22 +1,20 @@
 /*
 * effects-menu.c
- * Copyright 2010 John Lindgren
+ * Copyright 2010-2011 John Lindgren
 *
- * This file is part of Audacious.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
 *
- * 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.
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions, and the following disclaimer.
 *
- * 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.
+ * 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.
 *
- * 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.
+ * This software is provided "as is" and without any warranty, express or
+ * implied. In no event shall the authors be liable for any damages arising from
+ * the use of this software.
 */
 
 #include "config.h"
@@ -27,9 +25,9 @@
 
 #include "libaudgui-gtk.h"
 
-static gboolean watch_cb (PluginHandle * plugin, GtkCheckMenuItem * item)
+static bool_t watch_cb (PluginHandle * plugin, GtkCheckMenuItem * item)
 {
- gboolean enabled = aud_plugin_get_enabled (plugin);
+ bool_t enabled = aud_plugin_get_enabled (plugin);
 gtk_check_menu_item_set_active (item, enabled);
 
 GtkWidget * settings = g_object_get_data ((GObject *) item, "settings");
@@ -54,12 +52,12 @@
 if (! aud_plugin_get_enabled (plugin))
 return;
 
- EffectPlugin * header = aud_plugin_get_header (plugin);
+ Plugin * header = aud_plugin_get_header (plugin);
 g_return_if_fail (header != NULL);
 header->configure ();
 }
 
-static gboolean add_item_cb (PluginHandle * plugin, GtkWidget * menu)
+static bool_t add_item_cb (PluginHandle * plugin, GtkWidget * menu)
 {
 GtkWidget * item = gtk_check_menu_item_new_with_label (aud_plugin_get_name
 (plugin));
@@ -84,10 +82,17 @@
 return TRUE;
 }
 
-GtkWidget * audgui_create_effects_menu (void)
+EXPORT GtkWidget * audgui_create_effects_menu (void)
 {
 GtkWidget * menu = gtk_menu_new ();
 aud_plugin_for_each (PLUGIN_TYPE_EFFECT, (PluginForEachFunc) add_item_cb,
 menu);
 return menu;
 }
+
+EXPORT GtkWidget * audgui_create_vis_menu (void)
+{
+ GtkWidget * menu = gtk_menu_new ();
+ aud_plugin_for_each (PLUGIN_TYPE_VIS, (PluginForEachFunc) add_item_cb, menu);
+ return menu;
+}

audacious-3.1.1.tar.bz2/src/libaudgui/equalizer.c -> audacious-3.2.4.tar.bz2/src/libaudgui/equalizer.c Changed

@@ -1,22 +1,20 @@
 /*
- * libaudgui/equalizer.c
+ * equalizer.c
 * Copyright 2010-2011 John Lindgren
 *
- * This file is part of Audacious.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
 *
- * 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.
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions, and the following disclaimer.
 *
- * 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.
+ * 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.
 *
- * 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.
+ * 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.
 */
 
 /*
@@ -27,8 +25,9 @@
 
 #include <math.h>
 
-#include <audacious/misc.h>
 #include <audacious/i18n.h>
+#include <audacious/misc.h>
+#include <audacious/types.h>
 #include <libaudcore/hook.h>
 
 #include "config.h"
@@ -59,8 +58,8 @@
 
 static void slider_moved (GtkRange * slider, void * unused)
 {
- gint band = GPOINTER_TO_INT (g_object_get_data ((GObject *) slider, "band"));
- gdouble value = round (-gtk_range_get_value (slider));
+ int band = GPOINTER_TO_INT (g_object_get_data ((GObject *) slider, "band"));
+ double value = round (-gtk_range_get_value (slider));
 
 if (band == -1)
 aud_set_double (NULL, "equalizer_preamp", value);
@@ -70,25 +69,25 @@
 
 static void slider_update (void * unused, GtkRange * slider)
 {
- gint band = GPOINTER_TO_INT (g_object_get_data ((GObject *) slider, "band"));
- gdouble value;
+ int band = GPOINTER_TO_INT (g_object_get_data ((GObject *) slider, "band"));
+ double value;
 
 if (band == -1)
 value = round (aud_get_double (NULL, "equalizer_preamp"));
 else
 value = round (aud_eq_get_band (band));
 
- g_signal_handlers_block_by_func (slider, (GCallback) slider_moved, NULL);
+ g_signal_handlers_block_by_func (slider, (void *) slider_moved, NULL);
 gtk_range_set_value (slider, -value);
- g_signal_handlers_unblock_by_func (slider, (GCallback) slider_moved, NULL);
+ g_signal_handlers_unblock_by_func (slider, (void *) slider_moved, NULL);
 }
 
-static gchar * format_value (GtkScale * slider, gdouble value, void * unused)
+static char * format_value (GtkScale * slider, double value, void * unused)
 {
- return g_strdup_printf ("%d", (gint) -value);
+ return g_strdup_printf ("%d", (int) -value);
 }
 
-static GtkWidget * create_slider (const gchar * name, gint band)
+static GtkWidget * create_slider (const char * name, int band)
 {
 GtkWidget * vbox, * slider, * label;
 
@@ -121,11 +120,11 @@
 
 static GtkWidget * create_window (void)
 {
- const gchar * const names[AUD_EQUALIZER_NBANDS] = {N_("31 Hz"), N_("63 Hz"),
+ const char * const names[AUD_EQUALIZER_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")};
 GtkWidget * window, * vbox, * hbox;
- gint i;
+ int i;
 
 window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 gtk_window_set_title ((GtkWindow *) window, _("Equalizer"));
@@ -156,7 +155,7 @@
 
 static GtkWidget * equalizer_window = NULL;
 
-void audgui_show_equalizer_window (void)
+EXPORT void audgui_show_equalizer_window (void)
 {
 if (equalizer_window == NULL)
 equalizer_window = create_window ();
@@ -164,8 +163,15 @@
 gtk_window_present ((GtkWindow *) equalizer_window);
 }
 
-void audgui_hide_equalizer_window (void)
+EXPORT void audgui_hide_equalizer_window (void)
 {
- if (equalizer_window != NULL)
- gtk_widget_hide (equalizer_window);
+ if (! equalizer_window)
+ return;
+
+ hook_dissociate ("set equalizer_active", (HookFunction) on_off_update);
+ hook_dissociate ("set equalizer_bands", (HookFunction) slider_update);
+ hook_dissociate ("set equalizer_preamp", (HookFunction) slider_update);
+
+ gtk_widget_destroy (equalizer_window);
+ equalizer_window = NULL;
 }

audacious-3.1.1.tar.bz2/src/libaudgui/icons-stock.c -> audacious-3.2.4.tar.bz2/src/libaudgui/icons-stock.c Changed

@@ -1,34 +1,33 @@
-/* Audacious - Cross-platform multimedia player
- * Copyright (C) 2005-2008 Audacious development team.
+/*
+ * icons-stock.c
+ * Copyright 2007-2010 Michael Färber and 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 free software; 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT 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>.
+ * 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.
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
 */
 
-
-#include "icons-stock.h"
-
-#include <gdk/gdk.h>
 #include <gtk/gtk.h>
-
 #include <audacious/misc.h>
 
-static void load_stock_icon (gchar * id, gchar * filename,
+#include "config.h"
+#include "libaudgui.h"
+
+static void load_stock_icon (char * id, char * filename,
 GtkIconFactory * iconfactory)
 {
- gchar * path = g_strdup_printf ("%s/images/%s",
+ char * path = g_strdup_printf ("%s/images/%s",
 aud_get_path (AUD_PATH_DATA_DIR), filename);
 
 GdkPixbuf * pixbuf = gdk_pixbuf_new_from_file (path, NULL);
@@ -44,7 +43,7 @@
 g_free (path);
 }
 
-void
+EXPORT void
 audgui_register_stock_icons(void)
 {
 GtkIconFactory *iconfactory = gtk_icon_factory_new();
@@ -61,4 +60,3 @@
 gtk_icon_factory_add_default( iconfactory );
 g_object_unref( iconfactory );
 }
-

audacious-3.1.1.tar.bz2/src/libaudgui/iface-menu.c -> audacious-3.2.4.tar.bz2/src/libaudgui/iface-menu.c Changed

@@ -2,21 +2,19 @@
 * iface-menu.c
 * Copyright 2010 John Lindgren
 *
- * This file is part of Audacious.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
 *
- * 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.
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions, and the following disclaimer.
 *
- * 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.
+ * 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.
 *
- * 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.
+ * 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>
@@ -36,7 +34,7 @@
 GSList * group;
 } IfaceMenuAddState;
 
-static gboolean add_item_cb (PluginHandle * plugin, IfaceMenuAddState * state)
+static bool_t add_item_cb (PluginHandle * plugin, IfaceMenuAddState * state)
 {
 GtkWidget * item = gtk_radio_menu_item_new_with_label (state->group,
 aud_plugin_get_name (plugin));
@@ -49,7 +47,7 @@
 return TRUE;
 }
 
-GtkWidget * audgui_create_iface_menu (void)
+EXPORT GtkWidget * audgui_create_iface_menu (void)
 {
 IfaceMenuAddState state = {gtk_menu_new (), NULL};
 aud_plugin_for_each (PLUGIN_TYPE_IFACE, (PluginForEachFunc) add_item_cb,

audacious-3.1.1.tar.bz2/src/libaudgui/infopopup.c -> audacious-3.2.4.tar.bz2/src/libaudgui/infopopup.c Changed

@@ -1,24 +1,20 @@
 /*
- * libaudgui/infopopup.c
- * Copyright 2006 William Pitcock, Tony Vroon, George Averill, Giacomo Lozito,
- * Derek Pomery, and Yoshiki Yazawa
- * Copyright 2010-2011 John Lindgren
+ * infopopup.c
+ * Copyright 2006-2011 William Pitcock, Giacomo Lozito, and John Lindgren
 *
- * This file is part of Audacious.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
 *
- * 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.
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions, and the following disclaimer.
 *
- * 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.
+ * 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.
 *
- * 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.
+ * 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>
@@ -36,7 +32,7 @@
 
 static GtkWidget * infopopup = NULL;
 
-static void infopopup_entry_set_text (const gchar * entry_name, const gchar *
+static void infopopup_entry_set_text (const char * entry_name, const char *
 text)
 {
 GtkWidget * widget = g_object_get_data ((GObject *) infopopup, entry_name);
@@ -45,7 +41,7 @@
 gtk_label_set_text ((GtkLabel *) widget, text);
 }
 
-static void infopopup_entry_set_image (gint playlist, gint entry)
+static void infopopup_entry_set_image (int playlist, int entry)
 {
 GtkWidget * widget = g_object_get_data ((GObject *) infopopup, "image");
 g_return_if_fail (widget);
@@ -62,15 +58,15 @@
 gtk_image_clear ((GtkImage *) widget);
 }
 
-static gboolean infopopup_progress_cb (void * unused)
+static bool_t infopopup_progress_cb (void * unused)
 {
 GtkWidget * progressbar = g_object_get_data ((GObject *) infopopup,
 "progressbar");
- gchar * tooltip_file = g_object_get_data ((GObject *) infopopup, "file");
- gint length = GPOINTER_TO_INT (g_object_get_data ((GObject *) infopopup,
+ char * tooltip_file = g_object_get_data ((GObject *) infopopup, "file");
+ int length = GPOINTER_TO_INT (g_object_get_data ((GObject *) infopopup,
 "length"));
- gint playlist, entry, time;
- gchar * progress_time;
+ int playlist, entry, time;
+ char * progress_time;
 
 g_return_val_if_fail (tooltip_file != NULL, FALSE);
 g_return_val_if_fail (length > 0, FALSE);
@@ -88,17 +84,17 @@
 if (entry == -1)
 goto HIDE;
 
- gchar * filename = aud_playlist_entry_get_filename (playlist, entry);
+ char * filename = aud_playlist_entry_get_filename (playlist, entry);
 if (strcmp (filename, tooltip_file))
 {
- g_free (filename);
+ str_unref (filename);
 goto HIDE;
 }
- g_free (filename);
+ str_unref (filename);
 
 time = aud_drct_get_time ();
 gtk_progress_bar_set_fraction ((GtkProgressBar *) progressbar, time /
- (gfloat) length);
+ (float) length);
 progress_time = g_strdup_printf ("%d:%02d", time / 60000, (time / 1000) % 60);
 gtk_progress_bar_set_text ((GtkProgressBar *) progressbar, progress_time);
 g_free (progress_time);
@@ -120,7 +116,7 @@
 
 static void infopopup_progress_start (void)
 {
- gint sid = g_timeout_add (500, (GSourceFunc) infopopup_progress_cb, NULL);
+ int sid = g_timeout_add (500, (GSourceFunc) infopopup_progress_cb, NULL);
 
 g_object_set_data ((GObject *) infopopup, "progress_sid", GINT_TO_POINTER
 (sid));
@@ -128,7 +124,7 @@
 
 static void infopopup_progress_stop (void)
 {
- gint sid = GPOINTER_TO_INT (g_object_get_data ((GObject *) infopopup,
+ int sid = GPOINTER_TO_INT (g_object_get_data ((GObject *) infopopup,
 "progress_sid"));
 
 if (! sid)
@@ -140,12 +136,12 @@
 }
 
 static void infopopup_add_category (GtkWidget * infopopup_data_table,
- const gchar * category, const gchar * header_data, const gchar * label_data,
- gint position)
+ const char * category, const char * header_data, const char * label_data,
+ int position)
 {
 GtkWidget * infopopup_data_info_header = gtk_label_new ("");
 GtkWidget * infopopup_data_info_label = gtk_label_new ("");
- gchar * markup;
+ char * markup;
 
 gtk_misc_set_alignment ((GtkMisc *) infopopup_data_info_header, 0, 0.5);
 gtk_misc_set_alignment ((GtkMisc *) infopopup_data_info_label, 0, 0.5);
@@ -229,12 +225,15 @@
 gtk_widget_show_all (infopopup_hbox);
 }
 
-static void infopopup_update_data (const gchar * text, const gchar * label_data,
- const gchar * header_data)
+/* calls str_unref() on <text> */
+static void infopopup_update_data (char * text, const char * label_data,
+ const char * header_data)
 {
- if (text != NULL)
+ if (text)
 {
 infopopup_entry_set_text (label_data, text);
+ str_unref (text);
+
 gtk_widget_show ((GtkWidget *) g_object_get_data ((GObject *) infopopup,
 header_data));
 gtk_widget_show ((GtkWidget *) g_object_get_data ((GObject *) infopopup,
@@ -264,13 +263,12 @@
 gtk_window_resize ((GtkWindow *) infopopup, 1, 1);
 }
 
-static void infopopup_show (gint playlist, gint entry, const gchar * filename,
- const Tuple * tuple, const gchar * title)
+static void infopopup_show (int playlist, int entry, const char * filename,
+ const Tuple * tuple, const char * title)
 {
- gint x, y, h, w;
- gint length, value;
- gchar * tmp;
- const gchar * title2;
+ int x, y, h, w;
+ int length, value;
+ char * tmp;
 
 if (infopopup == NULL)
 infopopup_create ();
@@ -281,34 +279,28 @@
 g_object_set_data ((GObject *) infopopup, "file", g_strdup (filename));
 
 /* use title from tuple if possible */
- if ((title2 = tuple_get_string (tuple, FIELD_TITLE, NULL)))
- title = title2;
+ char * title2 = tuple_get_str (tuple, FIELD_TITLE, NULL);
+ if (! title2)
+ title2 = str_get (title);
 
- infopopup_update_data (title, "label_title", "header_title");
- infopopup_update_data (tuple_get_string (tuple, FIELD_ARTIST, NULL),
- "label_artist", "header_artist");
- infopopup_update_data (tuple_get_string (tuple, FIELD_ALBUM, NULL),
- "label_album", "header_album");
- infopopup_update_data (tuple_get_string (tuple, FIELD_GENRE, NULL),
- "label_genre", "header_genre");
+ infopopup_update_data (title2, "label_title", "header_title");
+ infopopup_update_data (tuple_get_str (tuple, FIELD_ARTIST, NULL), "label_artist", "header_artist");
+ infopopup_update_data (tuple_get_str (tuple, FIELD_ALBUM, NULL), "label_album", "header_album");
+ infopopup_update_data (tuple_get_str (tuple, FIELD_GENRE, NULL), "label_genre", "header_genre");
 
 length = tuple_get_int (tuple, FIELD_LENGTH, NULL);
- tmp = (length > 0) ? g_strdup_printf ("%d:%02d", length / 60000, length /
- 1000 % 60) : NULL;
+ tmp = (length > 0) ? str_printf ("%d:%02d", length / 60000, length / 1000 % 60) : NULL;
 infopopup_update_data (tmp, "label_tracklen", "header_tracklen");
- g_free (tmp);
 
 g_object_set_data ((GObject *) infopopup, "length" , GINT_TO_POINTER (length));
 
 value = tuple_get_int (tuple, FIELD_YEAR, NULL);
- tmp = (value > 0) ? g_strdup_printf ("%d", value) : NULL;
+ tmp = (value > 0) ? str_printf ("%d", value) : NULL;
 infopopup_update_data (tmp, "label_year", "header_year");
- g_free (tmp);
 
 value = tuple_get_int (tuple, FIELD_TRACK_NUMBER, NULL);
- tmp = (value > 0) ? g_strdup_printf ("%d", value) : NULL;
+ tmp = (value > 0) ? str_printf ("%d", value) : NULL;
 infopopup_update_data (tmp, "label_tracknum", "header_tracknum");
- g_free (tmp);
 
 infopopup_entry_set_image (playlist, entry);
 
@@ -341,25 +333,25 @@
 gtk_widget_show (infopopup);
 }
 
-void audgui_infopopup_show (gint playlist, gint entry)
+EXPORT void audgui_infopopup_show (int playlist, int entry)
 {
- gchar * filename = aud_playlist_entry_get_filename (playlist, entry);
- gchar * title = aud_playlist_entry_get_title (playlist, entry, FALSE);
+ char * filename = aud_playlist_entry_get_filename (playlist, entry);
+ char * title = aud_playlist_entry_get_title (playlist, entry, FALSE);
 Tuple * tuple = aud_playlist_entry_get_tuple (playlist, entry, FALSE);
 
 if (filename && title && tuple)
 infopopup_show (playlist, entry, filename, tuple, title);
 
- g_free (filename);
- g_free (title);
+ str_unref (filename);
+ str_unref (title);
 if (tuple)
- tuple_free (tuple);
+ tuple_unref (tuple);
 }
 
-void audgui_infopopup_show_current (void)
+EXPORT void audgui_infopopup_show_current (void)
 {
- gint playlist = aud_playlist_get_playing ();
- gint position;
+ int playlist = aud_playlist_get_playing ();
+ int position;
 
 if (playlist == -1)
 playlist = aud_playlist_get_active ();
@@ -372,7 +364,7 @@
 audgui_infopopup_show (playlist, position);
 }
 
-void audgui_infopopup_hide (void)
+EXPORT void audgui_infopopup_hide (void)
 {
 if (! infopopup)
 return;

audacious-3.1.1.tar.bz2/src/libaudgui/infowin.c -> audacious-3.2.4.tar.bz2/src/libaudgui/infowin.c Changed

@@ -1,29 +1,27 @@
 /*
 * libaudgui/infowin.c
- * Copyright 2006 William Pitcock, Tony Vroon, George Averill, Giacomo Lozito,
- * Derek Pomery and Yoshiki Yazawa.
- * Copyright 2008 Eugene Zagidullin
- * Copyright 2010 John Lindgren
+ * Copyright 2006-2011 William Pitcock, Tomasz Moń, Eugene Zagidullin, and
+ * John Lindgren
 *
- * This file is part of Audacious.
+ * This program is free software; 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.
 *
- * 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
 *
- * 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 this program. If not, see <http://www.gnu.org/licenses>.
 *
- * 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.
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
 */
 
 #include <gtk/gtk.h>
 #include <stdarg.h>
+#include <stdlib.h>
 
 #include <audacious/gtk-compat.h>
 #include <audacious/i18n.h>
@@ -65,15 +63,15 @@
 RAWDATA_N_COLS
 };
 
-static gchar * current_file = NULL;
+static char * current_file = NULL;
 static PluginHandle * current_decoder = NULL;
-static gboolean can_write = FALSE, something_changed = FALSE;
+static bool_t can_write = FALSE, something_changed = FALSE;
 
 /* This is by no means intended to be a complete list. If it is not short, it
 * is useless: scrolling through ten pages of dropdown list is more work than
 * typing out the genre. */
 
-static const gchar * genre_table[] = {
+static const char * genre_table[] = {
 N_("Acid Jazz"),
 N_("Acid Rock"),
 N_("Ambient"),
@@ -115,18 +113,20 @@
 N_("Trip-hop")};
 
 static void set_entry_str_from_field (GtkWidget * widget, const Tuple * tuple,
- gint fieldn, gboolean editable)
+ int fieldn, bool_t editable)
 {
- const gchar * text = tuple_get_string (tuple, fieldn, NULL);
+ char * text = tuple_get_str (tuple, fieldn, NULL);
 
 gtk_entry_set_text ((GtkEntry *) widget, text != NULL ? text : "");
 gtk_editable_set_editable ((GtkEditable *) widget, editable);
+
+ str_unref (text);
 }
 
 static void set_entry_int_from_field (GtkWidget * widget, const Tuple * tuple,
- gint fieldn, gboolean editable)
+ int fieldn, bool_t editable)
 {
- gchar scratch[32];
+ char scratch[32];
 
 if (tuple_get_value_type (tuple, fieldn, NULL) == TUPLE_INT)
 snprintf (scratch, sizeof scratch, "%d", tuple_get_int (tuple, fieldn,
@@ -138,37 +138,39 @@
 gtk_editable_set_editable ((GtkEditable *) widget, editable);
 }
 
-static void set_field_str_from_entry (Tuple * tuple, gint fieldn, GtkWidget *
+static void set_field_str_from_entry (Tuple * tuple, int fieldn, GtkWidget *
 widget)
 {
- const gchar * text = gtk_entry_get_text ((GtkEntry *) widget);
+ const char * text = gtk_entry_get_text ((GtkEntry *) widget);
 
 if (text[0])
- tuple_associate_string (tuple, fieldn, NULL, text);
+ tuple_set_str (tuple, fieldn, NULL, text);
 else
- tuple_disassociate (tuple, fieldn, NULL);
+ tuple_unset (tuple, fieldn, NULL);
 }
 
-static void set_field_int_from_entry (Tuple * tuple, gint fieldn, GtkWidget *
+static void set_field_int_from_entry (Tuple * tuple, int fieldn, GtkWidget *
 widget)
 {
- const gchar * text = gtk_entry_get_text ((GtkEntry *) widget);
+ const char * text = gtk_entry_get_text ((GtkEntry *) widget);
 
 if (text[0])
- tuple_associate_int (tuple, fieldn, NULL, atoi (text));
+ tuple_set_int (tuple, fieldn, NULL, atoi (text));
 else
- tuple_disassociate (tuple, fieldn, NULL);
+ tuple_unset (tuple, fieldn, NULL);
 }
 
-static void infowin_label_set_text (GtkWidget * widget, const gchar * text)
+/* call str_unref() on <text> */
+static void infowin_label_set_text (GtkWidget * widget, char * text)
 {
- gchar * tmp;
+ char * tmp;
 
- if (text != NULL)
+ if (text)
 {
 tmp = g_strdup_printf("%s", text);
 gtk_label_set_text ((GtkLabel *) widget, tmp);
 g_free (tmp);
+ str_unref (text);
 }
 else
 gtk_label_set_text ((GtkLabel *) widget,
@@ -177,7 +179,7 @@
 gtk_label_set_use_markup ((GtkLabel *) widget, TRUE);
 }
 
-static void infowin_entry_set_image (GtkWidget * widget, gint list, gint entry)
+static void infowin_entry_set_image (GtkWidget * widget, int list, int entry)
 {
 GdkPixbuf * p = audgui_pixbuf_for_entry (list, entry);
 g_return_if_fail (p);
@@ -225,7 +227,7 @@
 }
 }
 
-static gboolean ministatus_timeout_proc (void * data)
+static bool_t ministatus_timeout_proc (void * data)
 {
 GtkLabel * status = data;
 
@@ -235,9 +237,9 @@
 return FALSE;
 }
 
-static void ministatus_display_message (const gchar * text)
+static void ministatus_display_message (const char * text)
 {
- gchar * tmp = g_strdup_printf ("%s", text);
+ char * tmp = g_strdup_printf ("%s", text);
 
 gtk_label_set_text ((GtkLabel *) label_mini_status, tmp);
 gtk_label_set_use_markup ((GtkLabel *) label_mini_status, TRUE);
@@ -269,14 +271,14 @@
 else
 ministatus_display_message (_("Metadata updating failed"));
 
- mowgli_object_unref (tuple);
+ tuple_unref (tuple);
 }
 
-gboolean genre_fill (GtkWidget * combo)
+static bool_t genre_fill (GtkWidget * combo)
 {
 GList * list = NULL;
 GList * node;
- gint i;
+ int i;
 
 for (i = 0; i < G_N_ELEMENTS (genre_table); i ++)
 list = g_list_prepend (list, _(genre_table[i]));
@@ -290,7 +292,7 @@
 return FALSE;
 }
 
-void create_infowin (void)
+static void create_infowin (void)
 {
 GtkWidget * hbox;
 GtkWidget * hbox_status_and_bbox;
@@ -508,10 +510,10 @@
 gtk_widget_grab_focus (entry_title);
 }
 
-static void infowin_show (gint list, gint entry, const gchar * filename,
- const Tuple * tuple, PluginHandle * decoder, gboolean updating_enabled)
+static void infowin_show (int list, int entry, const char * filename,
+ const Tuple * tuple, PluginHandle * decoder, bool_t updating_enabled)
 {
- gchar * tmp;
+ char * tmp;
 
 if (infowin == NULL)
 create_infowin ();
@@ -539,18 +541,12 @@
 set_entry_int_from_field (entry_track, tuple, FIELD_TRACK_NUMBER,
 updating_enabled);
 
- infowin_label_set_text (label_format_name, tuple_get_string (tuple,
- FIELD_CODEC, NULL));
- infowin_label_set_text (label_quality, tuple_get_string (tuple,
- FIELD_QUALITY, NULL));
+ infowin_label_set_text (label_format_name, tuple_get_str (tuple, FIELD_CODEC, NULL));
+ infowin_label_set_text (label_quality, tuple_get_str (tuple, FIELD_QUALITY, NULL));
 
 if (tuple_get_value_type (tuple, FIELD_BITRATE, NULL) == TUPLE_INT)
- {
- tmp = g_strdup_printf (_("%d kb/s"), tuple_get_int (tuple,
- FIELD_BITRATE, NULL));
- infowin_label_set_text (label_bitrate, tmp);
- g_free (tmp);
- }
+ infowin_label_set_text (label_bitrate, str_printf (_("%d kb/s"),
+ tuple_get_int (tuple, FIELD_BITRATE, NULL)));
 else
 infowin_label_set_text (label_bitrate, NULL);
 
@@ -559,9 +555,9 @@
 gtk_window_present ((GtkWindow *) infowin);
 }
 
-void audgui_infowin_show (gint playlist, gint entry)
+EXPORT void audgui_infowin_show (int playlist, int entry)
 {
- gchar * filename = aud_playlist_entry_get_filename (playlist, entry);
+ char * filename = aud_playlist_entry_get_filename (playlist, entry);
 g_return_if_fail (filename != NULL);
 
 PluginHandle * decoder = aud_playlist_entry_get_decoder (playlist, entry,
@@ -576,25 +572,25 @@
 
 if (tuple == NULL)
 {
- gchar * message = g_strdup_printf (_("No info available for %s.\n"),
+ char * message = g_strdup_printf (_("No info available for %s.\n"),
 filename);
- hook_call ("interface show error", message);
+ aud_interface_show_error (message);
 g_free (message);
 goto FREE;
 }
 
 infowin_show (playlist, entry, filename, tuple, decoder,
 aud_file_can_write_tuple (filename, decoder));
- tuple_free (tuple);
+ tuple_unref (tuple);
 
 FREE:
- g_free (filename);
+ str_unref (filename);
 }
 
-void audgui_infowin_show_current (void)
+EXPORT void audgui_infowin_show_current (void)
 {
- gint playlist = aud_playlist_get_playing ();
- gint position;
+ int playlist = aud_playlist_get_playing ();
+ int position;
 
 if (playlist == -1)
 playlist = aud_playlist_get_active ();

audacious-3.1.1.tar.bz2/src/libaudgui/init.c -> audacious-3.2.4.tar.bz2/src/libaudgui/init.c Changed

@@ -1,27 +1,33 @@
 /*
- * libaudgui/init.c
+ * init.c
 * Copyright 2010-2011 John Lindgren
 *
- * This file is part of Audacious.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
 *
- * 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.
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions, and the following disclaimer.
 *
- * 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.
+ * 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.
 *
- * 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.
+ * 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 <audacious/misc.h>
+#include <audacious/playlist.h>
+#include <libaudcore/hook.h>
+
+#include "config.h"
+#include "init.h"
+#include "libaudgui.h"
+#include "libaudgui-gtk.h"
 
-static const gchar * const audgui_defaults[] = {
+static const char * const audgui_defaults[] = {
+ "close_dialog_add", "FALSE",
 "close_dialog_open", "TRUE",
 "close_jtf_dialog", "TRUE",
 "playlist_manager_close_on_activate", "FALSE",
@@ -30,8 +36,36 @@
 
 AudAPITable * _aud_api_table = NULL;
 
-void audgui_init (AudAPITable * table)
+static void playlist_set_playing_cb (void * unused, void * unused2)
+{
+ audgui_pixbuf_uncache ();
+}
+
+static void playlist_position_cb (void * list, void * unused)
+{
+ if (GPOINTER_TO_INT (list) == aud_playlist_get_playing ())
+ audgui_pixbuf_uncache ();
+}
+
+EXPORT void audgui_init (AudAPITable * table)
 {
 _aud_api_table = table;
 aud_config_set_defaults ("audgui", audgui_defaults);
+
+ hook_associate ("playlist set playing", playlist_set_playing_cb, NULL);
+ hook_associate ("playlist position", playlist_position_cb, NULL);
+}
+
+EXPORT void audgui_cleanup (void)
+{
+ hook_dissociate ("playlist set playing", playlist_set_playing_cb);
+ hook_dissociate ("playlist position", playlist_position_cb);
+
+ audgui_hide_equalizer_window ();
+ audgui_jump_to_track_hide ();
+ audgui_pixbuf_uncache ();
+ audgui_playlist_manager_cleanup ();
+ audgui_queue_manager_cleanup ();
+
+ _aud_api_table = NULL;
 }

audacious-3.1.1.tar.bz2/src/libaudgui/init.h -> audacious-3.2.4.tar.bz2/src/libaudgui/init.h Changed

@@ -1,24 +1,33 @@
 /*
- * libaudgui/init.h
- * Copyright 2010 John Lindgren
+ * init.h
+ * Copyright 2010-2011 John Lindgren
 *
- * This file is part of Audacious.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
 *
- * 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.
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions, and the following disclaimer.
 *
- * 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.
+ * 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.
 *
- * 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.
+ * 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 <audacious/plugin.h>
 
+/* init.c */
 void audgui_init (AudAPITable * table);
+void audgui_cleanup (void);
+
+/* queue-manager.c */
+void audgui_queue_manager_cleanup (void);
+
+/* ui_playlist_manager.c */
+void audgui_playlist_manager_cleanup (void);
+
+/* util.c */
+void audgui_pixbuf_uncache (void);

audacious-3.1.1.tar.bz2/src/libaudgui/jump-to-time.c -> audacious-3.2.4.tar.bz2/src/libaudgui/jump-to-time.c Changed

@@ -1,26 +1,23 @@
 /*
- * Audacious
- * Copyright (C) 2005-2011 Audacious Team
+ * jump-to-time.c
+ * Copyright 1998-2003 XMMS development team
+ * Copyright 2003-2004 BMP development team
+ * Copyright 2011 John Lindgren
 *
- * Based on BMP:
- * Copyright (C) 2003-2004 BMP 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 2 or version 3 of the License.
 *
- * Based on XMMS:
- * Copyright (C) 1998-2003 XMMS Development Team
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
 *
- * 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.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses>.
 *
- * 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.
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
 */
 
 #include <stdio.h>
@@ -38,11 +35,11 @@
 
 static void jump_to_time_cb (GtkWidget * widget, GtkWidget * entry)
 {
- guint min = 0, sec = 0;
- gint params = sscanf (gtk_entry_get_text ((GtkEntry *) entry), "%u:%u", & min,
+ unsigned int min = 0, sec = 0;
+ int params = sscanf (gtk_entry_get_text ((GtkEntry *) entry), "%u:%u", & min,
 & sec);
 
- gint time;
+ int time;
 if (params == 2)
 time = 60 * min + sec;
 else if (params == 1)
@@ -57,7 +54,7 @@
 gtk_widget_destroy (window);
 }
 
-void audgui_jump_to_time (void)
+EXPORT void audgui_jump_to_time (void)
 {
 if (! aud_drct_get_playing ())
 return;
@@ -105,8 +102,8 @@
 gtk_container_add ((GtkContainer *) bbox, jump);
 g_signal_connect (jump, "clicked", (GCallback) jump_to_time_cb, time_entry);
 
- guint tindex = aud_drct_get_time () / 1000;
- gchar time_str[10];
+ unsigned int tindex = aud_drct_get_time () / 1000;
+ char time_str[10];
 snprintf (time_str, sizeof time_str, "%u:%2.2u", tindex / 60, tindex % 60);
 gtk_entry_set_text ((GtkEntry *) time_entry, time_str);
 gtk_editable_select_region ((GtkEditable *) time_entry, 0, -1);

audacious-3.1.1.tar.bz2/src/libaudgui/libaudgui-gtk.h -> audacious-3.2.4.tar.bz2/src/libaudgui/libaudgui-gtk.h Changed

@@ -1,31 +1,32 @@
 /*
 * libaudgui-gtk.h
- * Copyright 2010 Audacious Development Team
+ * Copyright 2010-2011 John Lindgren
 *
- * This file is part of Audacious.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
 *
- * 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.
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions, and the following disclaimer.
 *
- * 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.
+ * 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.
 *
- * 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.
+ * 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 LIBAUDGUI_GTK_H
 #define LIBAUDGUI_GTK_H
 
+#include <stdint.h>
 #include <gtk/gtk.h>
+#include <libaudcore/core.h>
 
 /* effects-menu.c */
 GtkWidget * audgui_create_effects_menu (void);
+GtkWidget * audgui_create_vis_menu (void);
 
 /* iface-menu.c */
 GtkWidget * audgui_create_iface_menu (void);
@@ -35,12 +36,12 @@
 void audgui_hide_on_escape (GtkWidget * widget);
 void audgui_destroy_on_escape (GtkWidget * widget);
 void audgui_simple_message (GtkWidget * * widget, GtkMessageType type,
- const gchar * title, const gchar * text);
-void audgui_connect_check_box (GtkWidget * box, gboolean * setting);
+ const char * title, const char * text);
+void audgui_connect_check_box (GtkWidget * box, bool_t * setting);
 
-GdkPixbuf * audgui_pixbuf_from_data (void * data, gint size);
-GdkPixbuf * audgui_pixbuf_for_entry (gint playlist, gint entry);
+GdkPixbuf * audgui_pixbuf_from_data (const void * data, int64_t size);
+GdkPixbuf * audgui_pixbuf_for_entry (int playlist, int entry);
 GdkPixbuf * audgui_pixbuf_for_current (void);
-void audgui_pixbuf_scale_within (GdkPixbuf * * pixbuf, gint size);
+void audgui_pixbuf_scale_within (GdkPixbuf * * pixbuf, int size);
 
 #endif

audacious-3.1.1.tar.bz2/src/libaudgui/libaudgui.h -> audacious-3.2.4.tar.bz2/src/libaudgui/libaudgui.h Changed

@@ -1,26 +1,27 @@
-/* Audacious - Cross-platform multimedia player
- * Copyright (C) 2005-2010 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.
+/*
+ * libaudgui.h
+ * Copyright 2007-2009 Giacomo Lozito and 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT 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>.
+ * 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.
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
 */
 
 #ifndef LIBAUDGUI_H
 #define LIBAUDGUI_H
 
-#include <glib.h>
+#include <libaudcore/core.h>
 
 /* macro defines for Audacious stock icons */
 #define AUD_STOCK_PLAYLIST "aud-playlist"
@@ -30,34 +31,32 @@
 
 void audgui_register_stock_icons(void);
 
-void audgui_show_add_url_window(gboolean open);
+void audgui_show_add_url_window(bool_t open);
 
 void audgui_jump_to_track(void);
 void audgui_jump_to_track_hide(void);
 
-void audgui_set_default_icon(void);
-
-void audgui_run_filebrowser(gboolean clear_pl_on_ok);
+void audgui_run_filebrowser(bool_t clear_pl_on_ok);
 void audgui_hide_filebrowser(void);
 
-void audgui_show_about_window(void);
-void audgui_hide_about_window(void);
+/* about.c */
+void audgui_show_about_window (void);
 
 /* confirm.c */
-void audgui_confirm_playlist_delete (gint playlist);
-void audgui_show_playlist_rename (gint playlist);
+void audgui_confirm_playlist_delete (int playlist);
+void audgui_show_playlist_rename (int playlist);
 
 /* equalizer.c */
 void audgui_show_equalizer_window (void);
 void audgui_hide_equalizer_window (void);
 
 /* infopopup.c */
-void audgui_infopopup_show (gint playlist, gint entry);
+void audgui_infopopup_show (int playlist, int entry);
 void audgui_infopopup_show_current (void);
 void audgui_infopopup_hide (void);
 
 /* infowin.c */
-void audgui_infowin_show (gint playlist, gint entry);
+void audgui_infowin_show (int playlist, int entry);
 void audgui_infowin_show_current (void);
 
 /* jump-to-time.c */
@@ -74,8 +73,11 @@
 void audgui_playlist_manager (void);
 
 /* urilist.c */
-void audgui_urilist_open (const gchar * list);
-void audgui_urilist_insert (gint playlist, gint position, const gchar * list);
-gchar * audgui_urilist_create_from_selected (gint playlist);
+void audgui_urilist_open (const char * list);
+void audgui_urilist_insert (int playlist, int position, const char * list);
+char * audgui_urilist_create_from_selected (int playlist);
+
+/* util.c */
+void audgui_set_default_icon (void);
 
 #endif /* LIBAUDGUI_H */

audacious-3.1.1.tar.bz2/src/libaudgui/list.c -> audacious-3.2.4.tar.bz2/src/libaudgui/list.c Changed

@@ -2,27 +2,29 @@
 * list.c
 * Copyright 2011 John Lindgren
 *
- * This file is part of Audacious.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
 *
- * 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.
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions, and the following disclaimer.
 *
- * 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.
+ * 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.
 *
- * 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.
+ * This software is provided "as is" and without any warranty, express or
+ * implied. In no event shall the authors be liable for any damages arising from
+ * the use of this software.
 */
 
+#include "config.h"
 #include "list.h"
 
 #include <audacious/gtk-compat.h>
 
+#define CHAR_WIDTH 12
+#define SPACING 4
+
 enum {HIGHLIGHT_COLUMN, RESERVED_COLUMNS};
 
 #define PATH_IS_SELECTED(w, p) (gtk_tree_selection_path_is_selected \
@@ -32,13 +34,13 @@
 GObject parent;
 const AudguiListCallbacks * cbs;
 void * user;
- gint rows, highlight;
- gint columns;
+ int rows, highlight;
+ int columns;
 GList * column_types;
- gboolean frozen, blocked;
- gboolean dragging;
- gboolean clicked_row, receive_row;
- gint scroll_source, scroll_speed;
+ bool_t frozen, blocked;
+ bool_t dragging;
+ bool_t clicked_row, receive_row;
+ int scroll_source, scroll_speed;
 } ListModel;
 
 /* ==== MODEL ==== */
@@ -48,12 +50,12 @@
 return GTK_TREE_MODEL_LIST_ONLY;
 }
 
-static gint list_model_get_n_columns (GtkTreeModel * model)
+static int list_model_get_n_columns (GtkTreeModel * model)
 {
 return ((ListModel *) model)->columns;
 }
 
-static GType list_model_get_column_type (GtkTreeModel * _model, gint column)
+static GType list_model_get_column_type (GtkTreeModel * _model, int column)
 {
 ListModel * model = (ListModel *) _model;
 g_return_val_if_fail (column >= 0 && column < model->columns, G_TYPE_INVALID);
@@ -65,10 +67,10 @@
 RESERVED_COLUMNS));
 }
 
-static gboolean list_model_get_iter (GtkTreeModel * model, GtkTreeIter * iter,
+static bool_t list_model_get_iter (GtkTreeModel * model, GtkTreeIter * iter,
 GtkTreePath * path)
 {
- gint row = gtk_tree_path_get_indices (path)[0];
+ int row = gtk_tree_path_get_indices (path)[0];
 if (row < 0 || row >= ((ListModel *) model)->rows)
 return FALSE;
 iter->user_data = GINT_TO_POINTER (row);
@@ -78,16 +80,16 @@
 static GtkTreePath * list_model_get_path (GtkTreeModel * model,
 GtkTreeIter * iter)
 {
- gint row = GPOINTER_TO_INT (iter->user_data);
+ int row = GPOINTER_TO_INT (iter->user_data);
 g_return_val_if_fail (row >= 0 && row < ((ListModel *) model)->rows, NULL);
 return gtk_tree_path_new_from_indices (row, -1);
 }
 
 static void list_model_get_value (GtkTreeModel * _model, GtkTreeIter * iter,
- gint column, GValue * value)
+ int column, GValue * value)
 {
 ListModel * model = (ListModel *) _model;
- gint row = GPOINTER_TO_INT (iter->user_data);
+ int row = GPOINTER_TO_INT (iter->user_data);
 g_return_if_fail (column >= 0 && column < model->columns);
 g_return_if_fail (row >= 0 && row < model->rows);
 
@@ -104,10 +106,10 @@
 model->cbs->get_value (model->user, row, column - RESERVED_COLUMNS, value);
 }
 
-static gboolean list_model_iter_next (GtkTreeModel * _model, GtkTreeIter * iter)
+static bool_t list_model_iter_next (GtkTreeModel * _model, GtkTreeIter * iter)
 {
 ListModel * model = (ListModel *) _model;
- gint row = GPOINTER_TO_INT (iter->user_data);
+ int row = GPOINTER_TO_INT (iter->user_data);
 g_return_val_if_fail (row >= 0 && row < model->rows, FALSE);
 if (row + 1 >= model->rows)
 return FALSE;
@@ -115,7 +117,7 @@
 return TRUE;
 }
 
-static gboolean list_model_iter_children (GtkTreeModel * model,
+static bool_t list_model_iter_children (GtkTreeModel * model,
 GtkTreeIter * iter, GtkTreeIter * parent)
 {
 if (parent || ((ListModel *) model)->rows < 1)
@@ -124,19 +126,19 @@
 return TRUE;
 }
 
-static gboolean list_model_iter_has_child (GtkTreeModel * model,
+static bool_t list_model_iter_has_child (GtkTreeModel * model,
 GtkTreeIter * iter)
 {
 return FALSE;
 }
 
-static gint list_model_iter_n_children (GtkTreeModel * model, GtkTreeIter * iter)
+static int list_model_iter_n_children (GtkTreeModel * model, GtkTreeIter * iter)
 {
 return iter ? 0 : ((ListModel *) model)->rows;
 }
 
-static gboolean list_model_iter_nth_child (GtkTreeModel * model,
- GtkTreeIter * iter, GtkTreeIter * parent, gint n)
+static bool_t list_model_iter_nth_child (GtkTreeModel * model,
+ GtkTreeIter * iter, GtkTreeIter * parent, int n)
 {
 if (parent || n < 0 || n >= ((ListModel *) model)->rows)
 return FALSE;
@@ -144,7 +146,7 @@
 return TRUE;
 }
 
-static gboolean list_model_iter_parent (GtkTreeModel * model,
+static bool_t list_model_iter_parent (GtkTreeModel * model,
 GtkTreeIter * iter, GtkTreeIter * child)
 {
 return FALSE;
@@ -187,8 +189,8 @@
 
 /* ==== CALLBACKS ==== */
 
-static gboolean select_allow_cb (GtkTreeSelection * sel, GtkTreeModel * model,
- GtkTreePath * path, gboolean was, void * user)
+static bool_t select_allow_cb (GtkTreeSelection * sel, GtkTreeModel * model,
+ GtkTreePath * path, bool_t was, void * user)
 {
 return ! ((ListModel *) model)->frozen;
 }
@@ -197,7 +199,7 @@
 GtkTreeIter * iter, void * user)
 {
 ListModel * model = (ListModel *) _model;
- gint row = gtk_tree_path_get_indices (path)[0];
+ int row = gtk_tree_path_get_indices (path)[0];
 g_return_if_fail (row >= 0 && row < model->rows);
 model->cbs->set_selected (model->user, row, TRUE);
 }
@@ -213,12 +215,12 @@
 static void activate_cb (GtkTreeView * tree, GtkTreePath * path,
 GtkTreeViewColumn * col, ListModel * model)
 {
- gint row = gtk_tree_path_get_indices (path)[0];
+ int row = gtk_tree_path_get_indices (path)[0];
 g_return_if_fail (row >= 0 && row < model->rows);
 model->cbs->activate_row (model->user, row);
 }
 
-static gboolean button_press_cb (GtkWidget * widget, GdkEventButton * event,
+static bool_t button_press_cb (GtkWidget * widget, GdkEventButton * event,
 ListModel * model)
 {
 GtkTreePath * path = NULL;
@@ -264,7 +266,7 @@
 return FALSE;
 }
 
-static gboolean button_release_cb (GtkWidget * widget, GdkEventButton * event,
+static bool_t button_release_cb (GtkWidget * widget, GdkEventButton * event,
 ListModel * model)
 {
 /* If button_press_cb set "frozen", and we were not dragging, we need to
@@ -282,6 +284,15 @@
 return FALSE;
 }
 
+static bool_t key_press_cb (GtkWidget * widget, GdkEventKey * event, ListModel * model)
+{
+ /* GTK thinks the spacebar should activate a row; I (jlindgren) disagree */
+ if (event->keyval == ' ' && ! (event->state & GDK_CONTROL_MASK))
+ return TRUE;
+
+ return FALSE;
+}
+
 /* ==== DRAG AND DROP ==== */
 
 static void drag_begin (GtkWidget * widget, GdkDragContext * context,
@@ -302,21 +313,21 @@
 }
 
 static void drag_data_get (GtkWidget * widget, GdkDragContext * context,
- GtkSelectionData * sel, guint info, guint time, ListModel * model)
+ GtkSelectionData * sel, unsigned int info, unsigned int time, ListModel * model)
 {
 g_signal_stop_emission_by_name (widget, "drag-data-get");
 
 void * data = NULL;
- gint length = 0;
+ int length = 0;
 model->cbs->get_data (model->user, & data, & length);
 gtk_selection_data_set (sel, gdk_atom_intern (model->cbs->data_type, FALSE),
 8, data, length);
 g_free (data);
 }
 
-static gint calc_drop_row (ListModel * model, GtkWidget * widget, gint x, gint y)
+static int calc_drop_row (ListModel * model, GtkWidget * widget, int x, int y)
 {
- gint row = audgui_list_row_at_point (widget, x, y);
+ int row = audgui_list_row_at_point (widget, x, y);
 if (row < 0)
 row = model->rows;
 return row;
@@ -332,7 +343,7 @@
 model->scroll_speed = 0;
 }
 
-static gboolean autoscroll (GtkWidget * widget)
+static bool_t autoscroll (GtkWidget * widget)
 {
 ListModel * model = (ListModel *) gtk_tree_view_get_model
 ((GtkTreeView *) widget);
@@ -341,8 +352,8 @@
 if (! adj)
 return FALSE;
 
- gint new = gtk_adjustment_get_value (adj) + model->scroll_speed;
- gint clamped = CLAMP (new, 0, gtk_adjustment_get_upper (adj) -
+ int new = gtk_adjustment_get_value (adj) + model->scroll_speed;
+ int clamped = CLAMP (new, 0, gtk_adjustment_get_upper (adj) -
 gtk_adjustment_get_page_size (adj));
 gtk_adjustment_set_value (adj, clamped);
 
@@ -357,7 +368,7 @@
 return TRUE;
 }
 
-static void start_autoscroll (ListModel * model, GtkWidget * widget, gint speed)
+static void start_autoscroll (ListModel * model, GtkWidget * widget, int speed)
 {
 if (model->scroll_source)
 return;
@@ -366,8 +377,8 @@
 model->scroll_speed = speed;
 }
 
-static gboolean drag_motion (GtkWidget * widget, GdkDragContext * context,
- gint x, gint y, guint time, ListModel * model)
+static bool_t drag_motion (GtkWidget * widget, GdkDragContext * context,
+ int x, int y, unsigned int time, ListModel * model)
 {
 g_signal_stop_emission_by_name (widget, "drag-motion");
 
@@ -384,7 +395,7 @@
 
 if (model->rows > 0)
 {
- gint row = calc_drop_row (model, widget, x, y);
+ int row = calc_drop_row (model, widget, x, y);
 if (row == model->rows)
 {
 GtkTreePath * path = gtk_tree_path_new_from_indices (row - 1, -1);
@@ -401,7 +412,7 @@
 }
 }
 
- gint height;
+ int height;
 gdk_window_get_geometry (gtk_tree_view_get_bin_window ((GtkTreeView *)
 widget), NULL, NULL, NULL, & height);
 gtk_tree_view_convert_widget_to_bin_window_coords ((GtkTreeView *) widget,
@@ -418,7 +429,7 @@
 }
 
 static void drag_leave (GtkWidget * widget, GdkDragContext * context,
- guint time, ListModel * model)
+ unsigned int time, ListModel * model)
 {
 g_signal_stop_emission_by_name (widget, "drag-leave");
 
@@ -426,13 +437,13 @@
 stop_autoscroll (model);
 }
 
-static gboolean drag_drop (GtkWidget * widget, GdkDragContext * context, gint x,
- gint y, guint time, ListModel * model)
+static bool_t drag_drop (GtkWidget * widget, GdkDragContext * context, int x,
+ int y, unsigned int time, ListModel * model)
 {
 g_signal_stop_emission_by_name (widget, "drag-drop");
 
- gboolean success = TRUE;
- gint row = calc_drop_row (model, widget, x, y);
+ bool_t success = TRUE;
+ int row = calc_drop_row (model, widget, x, y);
 
 if (model->dragging && model->cbs->shift_rows) /* dragging within same list */
 {
@@ -456,16 +467,16 @@
 return TRUE;
 }
 
-static void drag_data_received (GtkWidget * widget, GdkDragContext * context, gint x,
- gint y, GtkSelectionData * sel, guint info, guint time, ListModel * model)
+static void drag_data_received (GtkWidget * widget, GdkDragContext * context, int x,
+ int y, GtkSelectionData * sel, unsigned int info, unsigned int time, ListModel * model)
 {
 g_signal_stop_emission_by_name (widget, "drag-data-received");
 
 g_return_if_fail (model->receive_row >= 0 && model->receive_row <=
 model->rows);
 
- const guchar * data = gtk_selection_data_get_data (sel);
- gint length = gtk_selection_data_get_length (sel);
+ const unsigned char * data = gtk_selection_data_get_data (sel);
+ int length = gtk_selection_data_get_length (sel);
 
 if (data && length)
 model->cbs->receive_data (model->user, model->receive_row, data, length);
@@ -481,13 +492,13 @@
 g_object_unref (model);
 }
 
-static void update_selection (GtkWidget * list, ListModel * model, gint at,
- gint rows)
+static void update_selection (GtkWidget * list, ListModel * model, int at,
+ int rows)
 {
 model->blocked = TRUE;
 GtkTreeSelection * sel = gtk_tree_view_get_selection ((GtkTreeView *) list);
 
- for (gint i = at; i < at + rows; i ++)
+ for (int i = at; i < at + rows; i ++)
 {
 GtkTreeIter iter = {.user_data = GINT_TO_POINTER (i)};
 if (model->cbs->get_selected (model->user, i))
@@ -499,8 +510,8 @@
 model->blocked = FALSE;
 }
 
-GtkWidget * audgui_list_new (const AudguiListCallbacks * cbs, void * user,
- gint rows)
+EXPORT GtkWidget * audgui_list_new (const AudguiListCallbacks * cbs, void * user,
+ int rows)
 {
 g_return_val_if_fail (cbs->get_value, NULL);
 if (cbs->get_selected)
@@ -524,6 +535,7 @@
 model->scroll_speed = 0;
 
 GtkWidget * list = gtk_tree_view_new_with_model ((GtkTreeModel *) model);
+ gtk_tree_view_set_fixed_height_mode ((GtkTreeView *) list, TRUE);
 g_signal_connect_swapped (list, "destroy", (GCallback) destroy_cb, model);
 
 if (cbs->get_selected)
@@ -540,14 +552,13 @@
 if (cbs->activate_row)
 g_signal_connect (list, "row-activated", (GCallback) activate_cb, model);
 
- g_signal_connect (list, "button-press-event", (GCallback) button_press_cb,
- model);
- g_signal_connect (list, "button-release-event", (GCallback)
- button_release_cb, model);
+ g_signal_connect (list, "button-press-event", (GCallback) button_press_cb, model);
+ g_signal_connect (list, "button-release-event", (GCallback) button_release_cb, model);
+ g_signal_connect (list, "key-press-event", (GCallback) key_press_cb, model);
 
 if (cbs->data_type)
 {
- const GtkTargetEntry target = {(gchar *) cbs->data_type, 0, 0};
+ const GtkTargetEntry target = {(char *) cbs->data_type, 0, 0};
 
 gtk_drag_source_set (list, GDK_BUTTON1_MASK, & target, 1,
 GDK_ACTION_COPY);
@@ -576,15 +587,15 @@
 return list;
 }
 
-void * audgui_list_get_user (GtkWidget * list)
+EXPORT void * audgui_list_get_user (GtkWidget * list)
 {
 ListModel * model = (ListModel *) gtk_tree_view_get_model
 ((GtkTreeView *) list);
 return model->user;
 }
 
-void audgui_list_add_column (GtkWidget * list, const gchar * title,
- gint column, GType type, gboolean expand)
+EXPORT void audgui_list_add_column (GtkWidget * list, const char * title,
+ int column, GType type, int width)
 {
 ListModel * model = (ListModel *) gtk_tree_view_get_model
 ((GtkTreeView *) list);
@@ -598,30 +609,30 @@
 GtkTreeViewColumn * tree_column = gtk_tree_view_column_new_with_attributes
 (title, renderer, "text", RESERVED_COLUMNS + column, "weight",
 HIGHLIGHT_COLUMN, NULL);
+ gtk_tree_view_column_set_sizing (tree_column, GTK_TREE_VIEW_COLUMN_FIXED);
 
- if (expand)
+ if (width < 1)
 {
- gtk_tree_view_column_set_resizable (tree_column, TRUE);
+ gtk_tree_view_column_set_fixed_width (tree_column, 6 * CHAR_WIDTH + SPACING);
 gtk_tree_view_column_set_expand (tree_column, TRUE);
 g_object_set ((GObject *) renderer, "ellipsize-set", TRUE, "ellipsize",
 PANGO_ELLIPSIZE_END, NULL);
 }
 else
 {
- gtk_tree_view_column_set_sizing (tree_column,
- GTK_TREE_VIEW_COLUMN_GROW_ONLY);
- g_object_set ((GObject *) renderer, "xalign", (gfloat) 1, NULL);
+ gtk_tree_view_column_set_fixed_width (tree_column, width * CHAR_WIDTH + SPACING);
+ g_object_set ((GObject *) renderer, "xalign", (float) 1, NULL);
 }
 
 gtk_tree_view_append_column ((GtkTreeView *) list, tree_column);
 }
 
-gint audgui_list_row_count (GtkWidget * list)
+EXPORT int audgui_list_row_count (GtkWidget * list)
 {
 return ((ListModel *) gtk_tree_view_get_model ((GtkTreeView *) list))->rows;
 }
 
-void audgui_list_insert_rows (GtkWidget * list, gint at, gint rows)
+EXPORT void audgui_list_insert_rows (GtkWidget * list, int at, int rows)
 {
 ListModel * model = (ListModel *) gtk_tree_view_get_model
 ((GtkTreeView *) list);
@@ -634,7 +645,7 @@
 GtkTreeIter iter = {.user_data = GINT_TO_POINTER (at)};
 GtkTreePath * path = gtk_tree_path_new_from_indices (at, -1);
 
- for (gint i = rows; i --; )
+ for (int i = rows; i --; )
 gtk_tree_model_row_inserted ((GtkTreeModel *) model, path, & iter);
 
 gtk_tree_path_free (path);
@@ -643,7 +654,7 @@
 update_selection (list, model, at, rows);
 }
 
-void audgui_list_update_rows (GtkWidget * list, gint at, gint rows)
+EXPORT void audgui_list_update_rows (GtkWidget * list, int at, int rows)
 {
 ListModel * model = (ListModel *) gtk_tree_view_get_model
 ((GtkTreeView *) list);
@@ -662,12 +673,25 @@
 gtk_tree_path_free (path);
 }
 
-void audgui_list_delete_rows (GtkWidget * list, gint at, gint rows)
+EXPORT void audgui_list_delete_rows (GtkWidget * list, int at, int rows)
 {
 ListModel * model = (ListModel *) gtk_tree_view_get_model
 ((GtkTreeView *) list);
 g_return_if_fail (at >= 0 && rows >= 0 && at + rows <= model->rows);
 
+ /* If we delete the last selected row, GtkTreeView tries to be helpful by
+ * selecting another one near it. As a workaround, detect this case and
+ * clear the selection when it occurs. */
+ GtkTreeSelection * sel = gtk_tree_view_get_selection ((GtkTreeView *) list);
+ int selected = gtk_tree_selection_count_selected_rows (sel);
+
+ for (int i = at; i < at + rows; i ++)
+ {
+ GtkTreeIter iter = {.user_data = GINT_TO_POINTER (i)};
+ if (gtk_tree_selection_iter_is_selected (sel, & iter))
+ selected --;
+ }
+
 model->rows -= rows;
 if (model->highlight >= at + rows)
 model->highlight -= rows;
@@ -680,11 +704,14 @@
 while (rows --)
 gtk_tree_model_row_deleted ((GtkTreeModel *) model, path);
 
+ if (! selected)
+ gtk_tree_selection_unselect_all (sel);
+
 gtk_tree_path_free (path);
 model->blocked = FALSE;
 }
 
-void audgui_list_update_selection (GtkWidget * list, gint at, gint rows)
+EXPORT void audgui_list_update_selection (GtkWidget * list, int at, int rows)
 {
 ListModel * model = (ListModel *) gtk_tree_view_get_model
 ((GtkTreeView *) list);
@@ -693,20 +720,20 @@
 update_selection (list, model, at, rows);
 }
 
-gint audgui_list_get_highlight (GtkWidget * list)
+EXPORT int audgui_list_get_highlight (GtkWidget * list)
 {
 ListModel * model = (ListModel *) gtk_tree_view_get_model
 ((GtkTreeView *) list);
 return model->highlight;
 }
 
-void audgui_list_set_highlight (GtkWidget * list, gint row)
+EXPORT void audgui_list_set_highlight (GtkWidget * list, int row)
 {
 ListModel * model = (ListModel *) gtk_tree_view_get_model
 ((GtkTreeView *) list);
 g_return_if_fail (row >= -1 && row < model->rows);
 
- gint old = model->highlight;
+ int old = model->highlight;
 if (row == old)
 return;
 model->highlight = row;
@@ -717,7 +744,7 @@
 audgui_list_update_rows (list, row, 1);
 }
 
-gint audgui_list_get_focus (GtkWidget * list)
+EXPORT int audgui_list_get_focus (GtkWidget * list)
 {
 GtkTreePath * path = NULL;
 gtk_tree_view_get_cursor ((GtkTreeView *) list, & path, NULL);
@@ -725,13 +752,13 @@
 if (! path)
 return -1;
 
- gint row = gtk_tree_path_get_indices (path)[0];
+ int row = gtk_tree_path_get_indices (path)[0];
 
 gtk_tree_path_free (path);
 return row;
 }
 
-void audgui_list_set_focus (GtkWidget * list, gint row)
+EXPORT void audgui_list_set_focus (GtkWidget * list, int row)
 {
 ListModel * model = (ListModel *) gtk_tree_view_get_model
 ((GtkTreeView *) list);
@@ -752,7 +779,7 @@
 model->frozen = FALSE;
 }
 
-gint audgui_list_row_at_point (GtkWidget * list, gint x, gint y)
+EXPORT int audgui_list_row_at_point (GtkWidget * list, int x, int y)
 {
 ListModel * model = (ListModel *) gtk_tree_view_get_model ((GtkTreeView *)
 list);
@@ -766,7 +793,7 @@
 if (! path)
 return -1;
 
- gint row = gtk_tree_path_get_indices (path)[0];
+ int row = gtk_tree_path_get_indices (path)[0];
 g_return_val_if_fail (row >= 0 && row < model->rows, -1);
 
 GdkRectangle rect;

audacious-3.1.1.tar.bz2/src/libaudgui/list.h -> audacious-3.2.4.tar.bz2/src/libaudgui/list.h Changed

@@ -2,64 +2,63 @@
 * list.h
 * Copyright 2011 John Lindgren
 *
- * This file is part of Audacious.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
 *
- * 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.
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions, and the following disclaimer.
 *
- * 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.
+ * 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.
 *
- * 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.
+ * 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 AUDGUI_LIST_H
 #define AUDGUI_LIST_H
 
 #include <gtk/gtk.h>
+#include <libaudcore/core.h>
 
 typedef struct {
- void (* get_value) (void * user, gint row, gint column, GValue * value);
+ void (* get_value) (void * user, int row, int column, GValue * value);
 
 /* selection (optional) */
- gboolean (* get_selected) (void * user, gint row);
- void (* set_selected) (void * user, gint row, gboolean selected);
- void (* select_all) (void * user, gboolean selected);
+ bool_t (* get_selected) (void * user, int row);
+ void (* set_selected) (void * user, int row, bool_t selected);
+ void (* select_all) (void * user, bool_t selected);
 
- void (* activate_row) (void * user, gint row); /* optional */
+ void (* activate_row) (void * user, int row); /* optional */
 void (* right_click) (void * user, GdkEventButton * event); /* optional */
- void (* shift_rows) (void * user, gint row, gint before); /* optional */
+ void (* shift_rows) (void * user, int row, int before); /* optional */
 
 /* cross-widget drag and drop (optional) */
- const gchar * data_type;
- void (* get_data) (void * user, void * * data, gint * length); /* data will
+ const char * data_type;
+ void (* get_data) (void * user, void * * data, int * length); /* data will
 be freed */
- void (* receive_data) (void * user, gint row, const void * data, gint length);
+ void (* receive_data) (void * user, int row, const void * data, int length);
 } AudguiListCallbacks;
 
 GtkWidget * audgui_list_new (const AudguiListCallbacks * cbs, void * user,
- gint rows);
+ int rows);
 void * audgui_list_get_user (GtkWidget * list);
-void audgui_list_add_column (GtkWidget * list, const gchar * title,
- gint column, GType type, gboolean expand);
+void audgui_list_add_column (GtkWidget * list, const char * title,
+ int column, GType type, int width);
 
-gint audgui_list_row_count (GtkWidget * list);
-void audgui_list_insert_rows (GtkWidget * list, gint at, gint rows);
-void audgui_list_update_rows (GtkWidget * list, gint at, gint rows);
-void audgui_list_delete_rows (GtkWidget * list, gint at, gint rows);
-void audgui_list_update_selection (GtkWidget * list, gint at, gint rows);
+int audgui_list_row_count (GtkWidget * list);
+void audgui_list_insert_rows (GtkWidget * list, int at, int rows);
+void audgui_list_update_rows (GtkWidget * list, int at, int rows);
+void audgui_list_delete_rows (GtkWidget * list, int at, int rows);
+void audgui_list_update_selection (GtkWidget * list, int at, int rows);
 
-gint audgui_list_get_highlight (GtkWidget * list);
-void audgui_list_set_highlight (GtkWidget * list, gint row);
-gint audgui_list_get_focus (GtkWidget * list);
-void audgui_list_set_focus (GtkWidget * list, gint row);
+int audgui_list_get_highlight (GtkWidget * list);
+void audgui_list_set_highlight (GtkWidget * list, int row);
+int audgui_list_get_focus (GtkWidget * list);
+void audgui_list_set_focus (GtkWidget * list, int row);
 
-gint audgui_list_row_at_point (GtkWidget * list, gint x, gint y);
+int audgui_list_row_at_point (GtkWidget * list, int x, int y);
 
 #endif

audacious-3.1.1.tar.bz2/src/libaudgui/playlists.c -> audacious-3.2.4.tar.bz2/src/libaudgui/playlists.c Changed

@@ -1,26 +1,20 @@
 /*
- * Audacious
- * Copyright (C) 2005-2011 Audacious Team
+ * playlists.c
+ * Copyright 2011 John Lindgren
 *
- * Based on BMP:
- * Copyright (C) 2003-2004 BMP Development Team
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
 *
- * Based on XMMS:
- * Copyright (C) 1998-2003 XMMS Development Team
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions, and the following disclaimer.
 *
- * 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.
+ * 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.
 *
- * 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.
+ * 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>
@@ -33,7 +27,7 @@
 #include "config.h"
 #include "libaudgui.h"
 
-static gchar * select_file (gboolean save, const gchar * default_filename)
+static char * select_file (bool_t save, const char * default_filename)
 {
 GtkWidget * dialog = gtk_file_chooser_dialog_new (save ?
 _("Export Playlist") : _("Import Playlist"), NULL, save ?
@@ -49,12 +43,12 @@
 
 gtk_dialog_set_default_response ((GtkDialog *) dialog, GTK_RESPONSE_ACCEPT);
 
- gchar * path = aud_get_string ("audgui", "playlist_path");
+ char * path = aud_get_string ("audgui", "playlist_path");
 if (path[0])
 gtk_file_chooser_set_current_folder_uri ((GtkFileChooser *) dialog, path);
 g_free (path);
 
- gchar * filename = NULL;
+ char * filename = NULL;
 if (gtk_dialog_run ((GtkDialog *) dialog) == GTK_RESPONSE_ACCEPT)
 filename = gtk_file_chooser_get_uri ((GtkFileChooser *) dialog);
 
@@ -66,22 +60,22 @@
 return filename;
 }
 
-static gboolean confirm_overwrite (const gchar * filename)
+static bool_t confirm_overwrite (const char * filename)
 {
 GtkWidget * dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_QUESTION,
 GTK_BUTTONS_YES_NO, _("Overwrite %s?"), filename);
 
- gint result = gtk_dialog_run ((GtkDialog *) dialog);
+ int result = gtk_dialog_run ((GtkDialog *) dialog);
 gtk_widget_destroy (dialog);
 return (result == GTK_RESPONSE_YES);
 }
 
-void audgui_import_playlist (void)
+EXPORT void audgui_import_playlist (void)
 {
- gint list = aud_playlist_get_active ();
- gint id = aud_playlist_get_unique_id (list);
+ int list = aud_playlist_get_active ();
+ int id = aud_playlist_get_unique_id (list);
 
- gchar * filename = select_file (FALSE, NULL);
+ char * filename = select_file (FALSE, NULL);
 if (! filename)
 return;
 
@@ -91,16 +85,17 @@
 aud_playlist_entry_delete (list, 0, aud_playlist_entry_count (list));
 aud_playlist_entry_insert (list, 0, filename, NULL, FALSE);
 aud_playlist_set_filename (list, filename);
+ g_free (filename);
 }
 
-void audgui_export_playlist (void)
+EXPORT void audgui_export_playlist (void)
 {
- gint list = aud_playlist_get_active ();
- gint id = aud_playlist_get_unique_id (list);
+ int list = aud_playlist_get_active ();
+ int id = aud_playlist_get_unique_id (list);
 
- gchar * def = aud_playlist_get_filename (list);
- gchar * filename = select_file (TRUE, def);
- g_free (def);
+ char * def = aud_playlist_get_filename (list);
+ char * filename = select_file (TRUE, def);
+ str_unref (def);
 
 if (! filename || (vfs_file_test (filename, G_FILE_TEST_EXISTS) &&
 ! confirm_overwrite (filename)))

audacious-3.1.1.tar.bz2/src/libaudgui/queue-manager.c -> audacious-3.2.4.tar.bz2/src/libaudgui/queue-manager.c Changed

@@ -2,21 +2,19 @@
 * queue-manager.c
 * Copyright 2011 John Lindgren
 *
- * This file is part of Audacious.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
 *
- * 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.
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions, and the following disclaimer.
 *
- * 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.
+ * 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.
 *
- * 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.
+ * 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 <gdk/gdkkeysyms.h>
@@ -28,6 +26,7 @@
 #include <libaudcore/hook.h>
 
 #include "config.h"
+#include "init.h"
 #include "libaudgui.h"
 #include "list.h"
 
@@ -40,10 +39,10 @@
 static GtkWidget * qm_win;
 static GtkWidget * qm_list;
 
-static void get_value (void * user, gint row, gint column, GValue * value)
+static void get_value (void * user, int row, int column, GValue * value)
 {
- gint list = aud_playlist_get_active ();
- gint entry = aud_playlist_queue_get_entry (list, row);
+ int list = aud_playlist_get_active ();
+ int entry = aud_playlist_queue_get_entry (list, row);
 
 switch (column)
 {
@@ -51,42 +50,43 @@
 g_value_set_int (value, 1 + entry);
 break;
 case COLUMN_TITLE:;
- gchar * title = aud_playlist_entry_get_title (list, entry, TRUE);
- g_value_take_string (value, title);
+ char * title = aud_playlist_entry_get_title (list, entry, TRUE);
+ g_value_set_string (value, title);
+ str_unref (title);
 break;
 }
 }
 
-static gboolean get_selected (void * user, gint row)
+static bool_t get_selected (void * user, int row)
 {
- gint list = aud_playlist_get_active ();
+ int list = aud_playlist_get_active ();
 return aud_playlist_entry_get_selected (list, aud_playlist_queue_get_entry (list, row));
 }
 
-static void set_selected (void * user, gint row, gboolean selected)
+static void set_selected (void * user, int row, bool_t selected)
 {
- gint list = aud_playlist_get_active ();
+ int list = aud_playlist_get_active ();
 aud_playlist_entry_set_selected (list, aud_playlist_queue_get_entry (list, row), selected);
 }
 
-static void select_all (void * user, gboolean selected)
+static void select_all (void * user, bool_t selected)
 {
- gint list = aud_playlist_get_active ();
- gint count = aud_playlist_queue_count (list);
+ int list = aud_playlist_get_active ();
+ int count = aud_playlist_queue_count (list);
 
- for (gint i = 0; i < count; i ++)
+ for (int i = 0; i < count; i ++)
 aud_playlist_entry_set_selected (list, aud_playlist_queue_get_entry (list, i), selected);
 }
 
-static void shift_rows (void * user, gint row, gint before)
+static void shift_rows (void * user, int row, int before)
 {
- GArray * shift = g_array_new (FALSE, FALSE, sizeof (gint));
- gint list = aud_playlist_get_active ();
- gint count = aud_playlist_queue_count (list);
+ GArray * shift = g_array_new (FALSE, FALSE, sizeof (int));
+ int list = aud_playlist_get_active ();
+ int count = aud_playlist_queue_count (list);
 
- for (gint i = 0; i < count; i ++)
+ for (int i = 0; i < count; i ++)
 {
- gint entry = aud_playlist_queue_get_entry (list, i);
+ int entry = aud_playlist_queue_get_entry (list, i);
 
 if (aud_playlist_entry_get_selected (list, entry))
 {
@@ -99,8 +99,8 @@
 
 aud_playlist_queue_delete_selected (list);
 
- for (gint i = 0; i < shift->len; i ++)
- aud_playlist_queue_insert (list, before + i, g_array_index (shift, gint, i));
+ for (int i = 0; i < shift->len; i ++)
+ aud_playlist_queue_insert (list, before + i, g_array_index (shift, int, i));
 
 g_array_free (shift, TRUE);
 }
@@ -114,12 +114,12 @@
 
 static void remove_selected (void)
 {
- gint list = aud_playlist_get_active ();
- gint count = aud_playlist_queue_count (list);
+ int list = aud_playlist_get_active ();
+ int count = aud_playlist_queue_count (list);
 
- for (gint i = 0; i < count; )
+ for (int i = 0; i < count; )
 {
- gint entry = aud_playlist_queue_get_entry (list, i);
+ int entry = aud_playlist_queue_get_entry (list, i);
 
 if (aud_playlist_entry_get_selected (list, entry))
 {
@@ -134,8 +134,20 @@
 
 static void update_hook (void * data, void * user)
 {
- audgui_list_delete_rows (qm_list, 0, audgui_list_row_count (qm_list));
- audgui_list_insert_rows (qm_list, 0, aud_playlist_queue_count (aud_playlist_get_active ()));
+ int oldrows = audgui_list_row_count (qm_list);
+ int newrows = aud_playlist_queue_count (aud_playlist_get_active ());
+ int focus = audgui_list_get_focus (qm_list);
+
+ audgui_list_update_rows (qm_list, 0, MIN (oldrows, newrows));
+ audgui_list_update_selection (qm_list, 0, MIN (oldrows, newrows));
+
+ if (newrows > oldrows)
+ audgui_list_insert_rows (qm_list, oldrows, newrows - oldrows);
+ if (newrows < oldrows)
+ audgui_list_delete_rows (qm_list, newrows, oldrows - newrows);
+
+ if (focus > newrows - 1)
+ audgui_list_set_focus (qm_list, newrows - 1);
 }
 
 static void destroy_cb (void)
@@ -147,9 +159,9 @@
 qm_list = NULL;
 }
 
-static gboolean keypress_cb (GtkWidget * widget, GdkEventKey * event)
+static bool_t keypress_cb (GtkWidget * widget, GdkEventKey * event)
 {
- if (event->keyval == GDK_A && (event->state && GDK_CONTROL_MASK))
+ if (event->keyval == GDK_A && (event->state & GDK_CONTROL_MASK))
 select_all (NULL, TRUE);
 else if (event->keyval == GDK_Delete)
 remove_selected ();
@@ -161,7 +173,7 @@
 return TRUE;
 }
 
-static void response_cb (GtkDialog * dialog, gint response)
+static void response_cb (GtkDialog * dialog, int response)
 {
 switch (response)
 {
@@ -174,7 +186,7 @@
 }
 }
 
-void audgui_queue_manager_show (void)
+EXPORT void audgui_queue_manager_show (void)
 {
 if (qm_win)
 {
@@ -185,18 +197,19 @@
 qm_win = gtk_dialog_new_with_buttons (_("Queue Manager"), NULL, 0,
 GTK_STOCK_REMOVE, RESPONSE_REMOVE, GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
 NULL);
- gtk_window_set_default_size ((GtkWindow *) qm_win, 250, 250);
+ gtk_window_set_default_size ((GtkWindow *) qm_win, 400, 250);
 
 GtkWidget * vbox = gtk_dialog_get_content_area ((GtkDialog *) qm_win);
 
 GtkWidget * scrolled = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_shadow_type ((GtkScrolledWindow *) scrolled, GTK_SHADOW_IN);
 gtk_box_pack_start ((GtkBox *) vbox, scrolled, TRUE, TRUE, 0);
 
- gint count = aud_playlist_queue_count (aud_playlist_get_active ());
+ int count = aud_playlist_queue_count (aud_playlist_get_active ());
 qm_list = audgui_list_new (& callbacks, NULL, count);
 gtk_tree_view_set_headers_visible ((GtkTreeView *) qm_list, FALSE);
- audgui_list_add_column (qm_list, NULL, 0, G_TYPE_INT, FALSE);
- audgui_list_add_column (qm_list, NULL, 1, G_TYPE_STRING, TRUE);
+ audgui_list_add_column (qm_list, NULL, 0, G_TYPE_INT, 7);
+ audgui_list_add_column (qm_list, NULL, 1, G_TYPE_STRING, -1);
 gtk_container_add ((GtkContainer *) scrolled, qm_list);
 
 hook_associate ("playlist activate", update_hook, NULL);
@@ -208,3 +221,9 @@
 
 gtk_widget_show_all (qm_win);
 }
+
+void audgui_queue_manager_cleanup (void)
+{
+ if (qm_win)
+ gtk_widget_destroy (qm_win);
+}

audacious-3.1.1.tar.bz2/src/libaudgui/ui_fileopener.c -> audacious-3.2.4.tar.bz2/src/libaudgui/ui_fileopener.c Changed

@@ -1,20 +1,21 @@
-/* Audacious - Cross-platform multimedia player
- * Copyright (C) 2005-2007 Audacious development team
+/*
+ * ui_fileopener.c
+ * Copyright 2007-2011 Michael Färber and 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 free software; 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT 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>.
+ * 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.
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
 */
 
 #include <gtk/gtk.h>
@@ -29,26 +30,24 @@
 #include "libaudgui-gtk.h"
 
 static void filebrowser_add_files (GtkFileChooser * browser, GSList * files,
- gboolean play)
+ bool_t play)
 {
- GSList * node;
- GList * list = NULL;
-
- for (node = files; node != NULL; node = node->next)
- list = g_list_prepend (list, node->data);
+ Index * list = index_new ();
 
- list = g_list_reverse (list);
+ for (GSList * node = files; node; node = node->next)
+ index_append (list, str_get (node->data));
 
 if (play)
 aud_drct_pl_open_list (list);
 else
 aud_drct_pl_add_list (list, -1);
 
- g_list_free (list);
-
- gchar * path = gtk_file_chooser_get_current_folder (browser);
- aud_set_string ("audgui", "filesel_path", path);
- g_free (path);
+ char * path = gtk_file_chooser_get_current_folder (browser);
+ if (path)
+ {
+ aud_set_string ("audgui", "filesel_path", path);
+ g_free (path);
+ }
 }
 
 static void
@@ -60,19 +59,20 @@
 
 GSList * files = gtk_file_chooser_get_uris ((GtkFileChooser *) chooser);
 
- filebrowser_add_files ((GtkFileChooser *) chooser, files, GPOINTER_TO_INT
- (g_object_get_data (data, "play-button")));
+ bool_t play = GPOINTER_TO_INT (g_object_get_data (data, "play-button"));
+ filebrowser_add_files ((GtkFileChooser *) chooser, files, play);
 
 g_slist_foreach(files, (GFunc) g_free, NULL);
 g_slist_free(files);
 
- gboolean close_dialog = gtk_toggle_button_get_active ((GtkToggleButton *) toggle);
- aud_set_bool ("audgui", "close_dialog_open", close_dialog);
-
- if (close_dialog)
+ if (gtk_toggle_button_get_active ((GtkToggleButton *) toggle))
 gtk_widget_destroy (window);
 }
 
+static void toggled_cb (GtkToggleButton * toggle, void * option)
+{
+ aud_set_bool ("audgui", (const char *) option, gtk_toggle_button_get_active (toggle));
+}
 
 static void
 close_button_cb(GtkWidget *widget, gpointer data)
@@ -81,14 +81,14 @@
 }
 
 static void
-run_filebrowser_gtk2style(gboolean play_button, gboolean show)
+run_filebrowser_gtk2style(bool_t play_button, bool_t show)
 {
 static GtkWidget *window = NULL;
 GtkWidget *vbox, *hbox, *bbox;
 GtkWidget *chooser;
 GtkWidget *action_button, *close_button;
 GtkWidget *toggle;
- gchar *window_title, *toggle_text;
+ char *window_title, *toggle_text;
 gpointer action_stock, storage;
 
 if (!show) {
@@ -124,7 +124,7 @@
 chooser = gtk_file_chooser_widget_new(GTK_FILE_CHOOSER_ACTION_OPEN);
 gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(chooser), TRUE);
 
- gchar * path = aud_get_string ("audgui", "filesel_path");
+ char * path = aud_get_string ("audgui", "filesel_path");
 if (path[0])
 gtk_file_chooser_set_current_folder ((GtkFileChooser *) chooser, path);
 g_free (path);
@@ -134,9 +134,11 @@
 hbox = gtk_hbox_new(TRUE, 0);
 gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 3);
 
+ const char * option = play_button ? "close_dialog_open" : "close_dialog_add";
 toggle = gtk_check_button_new_with_label(toggle_text);
 gtk_toggle_button_set_active ((GtkToggleButton *) toggle, aud_get_bool
- ("audgui", "close_dialog_open"));
+ ("audgui", option));
+ g_signal_connect (toggle, "toggled", (GCallback) toggled_cb, (void *) option);
 gtk_box_pack_start(GTK_BOX(hbox), toggle, TRUE, TRUE, 3);
 
 bbox = gtk_hbutton_box_new();
@@ -144,7 +146,7 @@
 gtk_box_set_spacing(GTK_BOX(bbox), 6);
 gtk_box_pack_end(GTK_BOX(hbox), bbox, TRUE, TRUE, 3);
 
- close_button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
+ close_button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
 action_button = gtk_button_new_from_stock(action_stock);
 gtk_container_add(GTK_CONTAINER(bbox), close_button);
 gtk_container_add(GTK_CONTAINER(bbox), action_button);
@@ -175,23 +177,23 @@
 }
 
 /*
- * run_filebrowser(gboolean play_button)
+ * run_filebrowser(bool_t play_button)
 *
 * Inputs:
- * - gboolean play_button
+ * - bool_t play_button
 * TRUE - open files
 * FALSE - add files
 *
 * Outputs:
 * - none
 */
-void
-audgui_run_filebrowser(gboolean play_button)
+EXPORT void
+audgui_run_filebrowser(bool_t play_button)
 {
 run_filebrowser_gtk2style(play_button, TRUE);
 }
 
-void
+EXPORT void
 audgui_hide_filebrowser(void)
 {
 run_filebrowser_gtk2style(FALSE, FALSE);

audacious-3.1.1.tar.bz2/src/libaudgui/ui_jumptotrack.c -> audacious-3.2.4.tar.bz2/src/libaudgui/ui_jumptotrack.c Changed

@@ -1,26 +1,23 @@
-/* Audacious - Cross-platform multimedia player
- * Copyright (C) 2005-2011 Audacious development team.
+/*
+ * ui_jumptotrack.c
+ * Copyright 1998-2003 XMMS development team
+ * Copyright 2003-2004 BMP development team
+ * Copyright 2007-2011 Yoshiki Yazawa and John Lindgren
 *
- * BMP - Cross-platform multimedia player
- * Copyright (C) 2003-2004 BMP 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.
 *
- * Based on XMMS:
- * Copyright (C) 1998-2003 XMMS development team.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT 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 program is free software; 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.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses>.
 *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT 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.
+ * 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>
@@ -34,22 +31,26 @@
 #include <libaudcore/hook.h>
 
 #include "config.h"
-#include "icons-stock.h"
+#include "libaudgui.h"
+#include "list.h"
 #include "ui_jumptotrack_cache.h"
 
-static void watchdog (void * hook_data, void * user_data);
+static void update_cb (void * data, void * user);
+static void activate_cb (void * data, void * user);
 
 static GtkWidget *jump_to_track_win = NULL;
 static JumpToTrackCache* cache = NULL;
+static const GArray * search_matches;
 static GtkWidget * treeview, * filter_entry, * queue_button;
-static gboolean watching = FALSE;
+static bool_t watching = FALSE;
 
-void
+EXPORT void
 audgui_jump_to_track_hide(void)
 {
 if (watching)
 {
- hook_dissociate ("playlist update", watchdog);
+ hook_dissociate ("playlist update", update_cb);
+ hook_dissociate ("playlist activate", activate_cb);
 watching = FALSE;
 }
 
@@ -61,31 +62,36 @@
 ui_jump_to_track_cache_free (cache);
 cache = NULL;
 }
+
+ search_matches = NULL;
 }
 
-static gint get_selected_entry (void)
+static int get_selected_entry (void)
 {
- g_return_val_if_fail (treeview, -1);
+ g_return_val_if_fail (treeview && search_matches, -1);
 
 GtkTreeModel * model = gtk_tree_view_get_model ((GtkTreeView *) treeview);
 GtkTreeSelection * selection = gtk_tree_view_get_selection ((GtkTreeView *) treeview);
 GtkTreeIter iter;
- gint entry;
 
 if (! gtk_tree_selection_get_selected (selection, NULL, & iter))
 return -1;
 
- gtk_tree_model_get (model, & iter, 0, & entry, -1);
- return entry - 1;
+ GtkTreePath * path = gtk_tree_model_get_path (model, & iter);
+ int row = gtk_tree_path_get_indices (path)[0];
+ gtk_tree_path_free (path);
+
+ g_return_val_if_fail (row >= 0 && row < search_matches->len, -1);
+ return g_array_index (search_matches, int, row);
 }
 
 static void do_jump (void)
 {
- gint entry = get_selected_entry ();
+ int entry = get_selected_entry ();
 if (entry < 0)
 return;
 
- gint playlist = aud_playlist_get_active ();
+ int playlist = aud_playlist_get_active ();
 aud_playlist_set_playing (playlist);
 aud_playlist_set_position (playlist, entry);
 aud_drct_play ();
@@ -94,7 +100,7 @@
 audgui_jump_to_track_hide();
 }
 
-static void update_queue_button (gint entry)
+static void update_queue_button (int entry)
 {
 g_return_if_fail (queue_button);
 
@@ -116,14 +122,16 @@
 
 static void do_queue (void)
 {
- gint entry = get_selected_entry ();
+ int playlist = aud_playlist_get_active ();
+ int entry = get_selected_entry ();
 if (entry < 0)
 return;
 
- if (aud_drct_pq_is_queued (entry))
- aud_drct_pq_remove (entry);
+ int queued = aud_playlist_queue_find_entry (playlist, entry);
+ if (queued >= 0)
+ aud_playlist_queue_delete (playlist, queued, 1);
 else
- aud_drct_pq_add (entry);
+ aud_playlist_queue_insert (playlist, -1, entry);
 
 update_queue_button (entry);
 }
@@ -133,7 +141,7 @@
 update_queue_button (get_selected_entry ());
 }
 
-static gboolean keypress_cb (GtkWidget * widget, GdkEventKey * event)
+static bool_t keypress_cb (GtkWidget * widget, GdkEventKey * event)
 {
 if (event->keyval == GDK_Escape)
 {
@@ -151,31 +159,19 @@
 if (! cache)
 cache = ui_jump_to_track_cache_new();
 
- GtkListStore * store = (GtkListStore *) gtk_tree_view_get_model ((GtkTreeView *) treeview);
- GtkTreeIter iter;
-
- gtk_list_store_clear(store);
+ search_matches = ui_jump_to_track_cache_search (cache, gtk_entry_get_text
+ ((GtkEntry *) filter_entry));
 
- const GArray * search_matches = ui_jump_to_track_cache_search (cache,
- gtk_entry_get_text ((GtkEntry *) filter_entry));
+ audgui_list_delete_rows (treeview, 0, audgui_list_row_count (treeview));
+ audgui_list_insert_rows (treeview, 0, search_matches->len);
 
- gint playlist = aud_playlist_get_active ();
-
- for (gint i = 0; i < search_matches->len; i ++)
+ if (search_matches->len >= 1)
 {
- gint entry = g_array_index (search_matches, gint, i);
- gchar * title = aud_playlist_entry_get_title (playlist, entry, TRUE);
- if (! title)
- continue;
-
- gtk_list_store_append(store, &iter);
- gtk_list_store_set (store, & iter, 0, 1 + entry, 1, title, -1);
- g_free (title);
+ GtkTreeSelection * sel = gtk_tree_view_get_selection ((GtkTreeView *) treeview);
+ GtkTreePath * path = gtk_tree_path_new_from_indices (0, -1);
+ gtk_tree_selection_select_path (sel, path);
+ gtk_tree_path_free (path);
 }
-
- if (gtk_tree_model_get_iter_first ((GtkTreeModel *) store, & iter))
- gtk_tree_selection_select_iter (gtk_tree_view_get_selection
- ((GtkTreeView *) treeview), & iter);
 }
 
 static void clear_cb (GtkWidget * widget)
@@ -185,7 +181,7 @@
 gtk_widget_grab_focus (filter_entry);
 }
 
-static void watchdog (void * hook_data, void * user_data)
+static void update_cb (void * data, void * user)
 {
 g_return_if_fail (treeview);
 
@@ -193,7 +189,7 @@
 GtkTreeIter iter;
 GtkTreePath * path = NULL;
 
- if (GPOINTER_TO_INT (hook_data) <= PLAYLIST_UPDATE_SELECTION)
+ if (GPOINTER_TO_INT (data) <= PLAYLIST_UPDATE_SELECTION)
 return;
 
 if (cache != NULL)
@@ -203,7 +199,7 @@
 }
 
 /* If it's only a metadata update, save and restore the cursor position. */
- if (GPOINTER_TO_INT (hook_data) <= PLAYLIST_UPDATE_METADATA &&
+ if (GPOINTER_TO_INT (data) <= PLAYLIST_UPDATE_METADATA &&
 gtk_tree_selection_get_selected (gtk_tree_view_get_selection
 ((GtkTreeView *) treeview), & model, & iter))
 path = gtk_tree_model_get_path (model, & iter);
@@ -219,24 +215,55 @@
 }
 }
 
-static void toggle_button_cb (GtkToggleButton * toggle, const gchar * setting)
+static void activate_cb (void * data, void * user)
+{
+ update_cb (GINT_TO_POINTER (PLAYLIST_UPDATE_STRUCTURE), NULL);
+}
+
+static void toggle_button_cb (GtkToggleButton * toggle, const char * setting)
 {
 aud_set_bool ("audgui", setting, gtk_toggle_button_get_active (toggle));
 }
 
-static gboolean delete_cb (void)
+static bool_t delete_cb (void)
 {
 audgui_jump_to_track_hide ();
 return TRUE;
 }
 
+static void list_get_value (void * user, int row, int column, GValue * value)
+{
+ g_return_if_fail (search_matches);
+ g_return_if_fail (column >= 0 && column < 2);
+ g_return_if_fail (row >= 0 && row < search_matches->len);
+
+ int playlist = aud_playlist_get_active ();
+ int entry = g_array_index (search_matches, int, row);
+
+ switch (column)
+ {
+ case 0:
+ g_value_set_int (value, 1 + entry);
+ break;
+ case 1:;
+ char * title = aud_playlist_entry_get_title (playlist, entry, TRUE);
+ g_return_if_fail (title);
+ g_value_set_string (value, title);
+ str_unref (title);
+ break;
+ }
+}
+
+static const AudguiListCallbacks callbacks = {
+ .get_value = list_get_value};
+
 static void create_window (void)
 {
 jump_to_track_win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 gtk_window_set_type_hint(GTK_WINDOW(jump_to_track_win),
 GDK_WINDOW_TYPE_HINT_DIALOG);
 
- gtk_window_set_title(GTK_WINDOW(jump_to_track_win), _("Jump to Track"));
+ gtk_window_set_title(GTK_WINDOW(jump_to_track_win), _("Jump to Song"));
 
 g_signal_connect (jump_to_track_win, "key_press_event", (GCallback) keypress_cb, NULL);
 g_signal_connect (jump_to_track_win, "delete-event", (GCallback) delete_cb, NULL);
@@ -247,24 +274,11 @@
 GtkWidget * vbox = gtk_vbox_new (FALSE, 5);
 gtk_container_add(GTK_CONTAINER(jump_to_track_win), vbox);
 
- GtkListStore * jtf_store = gtk_list_store_new (2, G_TYPE_INT, G_TYPE_STRING);
- treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(jtf_store));
- g_object_unref(jtf_store);
-
- GtkTreeViewColumn * column = gtk_tree_view_column_new ();
- gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(treeview), FALSE);
- gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
-
- GtkCellRenderer * renderer = gtk_cell_renderer_text_new ();
- gtk_tree_view_column_pack_start(column, renderer, FALSE);
- gtk_tree_view_column_set_attributes(column, renderer, "text", 0, NULL);
-
- renderer = gtk_cell_renderer_text_new();
- gtk_tree_view_column_pack_start(column, renderer, FALSE);
- gtk_tree_view_column_set_attributes(column, renderer, "text", 1, NULL);
- gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), column);
+ treeview = audgui_list_new (& callbacks, NULL, 0);
+ gtk_tree_view_set_headers_visible ((GtkTreeView *) treeview, FALSE);
 
- gtk_tree_view_set_search_column(GTK_TREE_VIEW(treeview), 1);
+ audgui_list_add_column (treeview, NULL, 0, G_TYPE_INT, 7);
+ audgui_list_add_column (treeview, NULL, 1, G_TYPE_STRING, -1);
 
 g_signal_connect (gtk_tree_view_get_selection ((GtkTreeView *) treeview),
 "changed", (GCallback) selection_changed, NULL);
@@ -343,9 +357,9 @@
 gtk_widget_set_can_default(close, TRUE);
 }
 
-void audgui_jump_to_track (void)
+EXPORT void audgui_jump_to_track (void)
 {
- gboolean create = (! jump_to_track_win);
+ bool_t create = (! jump_to_track_win);
 if (create)
 create_window ();
 
@@ -359,7 +373,8 @@
 if (! watching)
 {
 fill_list ();
- hook_associate ("playlist update", watchdog, NULL);
+ hook_associate ("playlist update", update_cb, NULL);
+ hook_associate ("playlist activate", activate_cb, NULL);
 watching = TRUE;
 }

audacious-3.1.1.tar.bz2/src/libaudgui/ui_jumptotrack_cache.c -> audacious-3.2.4.tar.bz2/src/libaudgui/ui_jumptotrack_cache.c Changed

@@ -1,27 +1,26 @@
-/* Audacious - Cross-platform multimedia player
- * Copyright (C) 2008 Audacious development team.
+/*
+ * ui_jumptotrack_cache.c
+ * Copyright 2008-2011 Jussi Judin and 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 free software; 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT 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>.
+ * 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.
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
 */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <glib.h>
+
+#include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 #ifdef HAVE_SYS_TYPES_H
@@ -30,15 +29,17 @@
 
 #include <audacious/debug.h>
 #include <audacious/playlist.h>
+#include <libaudcore/audstrings.h>
 
+#include "config.h"
 #include "ui_jumptotrack_cache.h"
 #include "ui_regex.h"
 
 // Struct to keep information about matches from searches.
 typedef struct
 {
- GArray * entries; // gint
- GArray * titles, * artists, * albums, * paths, * filenames; // gchar *
+ GArray * entries; // int
+ GArray * titles, * artists, * albums, * paths; // char *
 } KeywordMatches;
 
 static void ui_jump_to_track_cache_init (JumpToTrackCache * cache);
@@ -46,12 +47,11 @@
 static KeywordMatches * keyword_matches_new (void)
 {
 KeywordMatches * k = g_malloc (sizeof (KeywordMatches));
- k->entries = g_array_new (FALSE, FALSE, sizeof (gint));
- k->titles = g_array_new (FALSE, FALSE, sizeof (gchar *));
- k->artists = g_array_new (FALSE, FALSE, sizeof (gchar *));
- k->albums = g_array_new (FALSE, FALSE, sizeof (gchar *));
- k->paths = g_array_new (FALSE, FALSE, sizeof (gchar *));
- k->filenames = g_array_new (FALSE, FALSE, sizeof (gchar *));
+ k->entries = g_array_new (FALSE, FALSE, sizeof (int));
+ k->titles = g_array_new (FALSE, FALSE, sizeof (char *));
+ k->artists = g_array_new (FALSE, FALSE, sizeof (char *));
+ k->albums = g_array_new (FALSE, FALSE, sizeof (char *));
+ k->paths = g_array_new (FALSE, FALSE, sizeof (char *));
 return k;
 }
 
@@ -62,7 +62,6 @@
 g_array_free (k->artists, TRUE);
 g_array_free (k->albums, TRUE);
 g_array_free (k->paths, TRUE);
- g_array_free (k->filenames, TRUE);
 g_free (k);
 }
 
@@ -80,7 +79,7 @@
 ui_jump_to_track_cache_regex_list_create(const GString* keyword)
 {
 GSList *regex_list = NULL;
- gchar **words = NULL;
+ char **words = NULL;
 int i = -1;
 /* Chop the key string into ' '-separated key regex-pattern strings */
 words = g_strsplit(keyword->str, " ", 0);
@@ -131,8 +130,8 @@
 /**
 * Checks if 'song' matches all regular expressions in 'regex_list'.
 */
-static gboolean
-ui_jump_to_track_match(const gchar * song, GSList *regex_list)
+static bool_t
+ui_jump_to_track_match(const char * song, GSList *regex_list)
 {
 if ( song == NULL )
 return FALSE;
@@ -166,31 +165,28 @@
 
 KeywordMatches * k = keyword_matches_new ();
 
- for (gint i = 0; i < search_space->entries->len; i ++)
+ for (int i = 0; i < search_space->entries->len; i ++)
 {
- gchar * title = g_array_index (search_space->titles, gchar *, i);
- gchar * artist = g_array_index (search_space->artists, gchar *, i);
- gchar * album = g_array_index (search_space->albums, gchar *, i);
- gchar * path = g_array_index (search_space->paths, gchar *, i);
- gchar * filename = g_array_index (search_space->filenames, gchar *, i);
- gboolean match;
+ char * title = g_array_index (search_space->titles, char *, i);
+ char * artist = g_array_index (search_space->artists, char *, i);
+ char * album = g_array_index (search_space->albums, char *, i);
+ char * path = g_array_index (search_space->paths, char *, i);
+ bool_t match;
 
 if (regex_list != NULL)
 match = ui_jump_to_track_match (title, regex_list)
 || ui_jump_to_track_match (artist, regex_list)
 || ui_jump_to_track_match (album, regex_list)
- || ui_jump_to_track_match (path, regex_list)
- || ui_jump_to_track_match (filename, regex_list);
+ || ui_jump_to_track_match (path, regex_list);
 else
 match = TRUE;
 
 if (match) {
- g_array_append_val (k->entries, g_array_index (search_space->entries, gint, i));
+ g_array_append_val (k->entries, g_array_index (search_space->entries, int, i));
 g_array_append_val (k->titles, title);
 g_array_append_val (k->artists, artist);
 g_array_append_val (k->albums, album);
 g_array_append_val (k->paths, path);
- g_array_append_val (k->filenames, filename);
 }
 }
 
@@ -200,25 +196,26 @@
 return k->entries;
 }
 
-/**
- * Normalizes the search string to be more suitable for searches.
- *
- * Basically this does Unicode NFKD normalization to for example match
- * half-width and full-width characters and case folding mainly to match
- * upper- and lowercase letters.
- *
- * String returned by this function should be freed manually.
- */
-static gchar *
-normalize_search_string(const gchar* string)
+/* calls str_unref() on <string> */
+/* returned string must be freed */
+static char * process_string (char * string, bool_t decode)
 {
 if (! string)
 return NULL;
 
- gchar* normalized_string = g_utf8_normalize(string, -1, G_NORMALIZE_NFKD);
- gchar* folded_string = g_utf8_casefold(normalized_string, -1);
- g_free(normalized_string);
- return folded_string;
+ char * normal;
+
+ if (decode)
+ {
+ char temp[strlen (string) + 1];
+ str_decode_percent (string, -1, temp);
+ normal = g_utf8_casefold (temp, -1);
+ }
+ else
+ normal = g_utf8_casefold (string, -1);
+
+ str_unref (string);
+ return normal;
 }
 
 /**
@@ -227,13 +224,12 @@
 static void
 ui_jump_to_track_cache_free_keywordmatch_data(KeywordMatches* match_entry)
 {
- for (gint i = 0; i < match_entry->entries->len; i ++)
+ for (int i = 0; i < match_entry->entries->len; i ++)
 {
- g_free (g_array_index (match_entry->titles, gchar *, i));
- g_free (g_array_index (match_entry->artists, gchar *, i));
- g_free (g_array_index (match_entry->albums, gchar *, i));
- g_free (g_array_index (match_entry->paths, gchar *, i));
- g_free (g_array_index (match_entry->filenames, gchar *, i));
+ g_free (g_array_index (match_entry->titles, char *, i));
+ g_free (g_array_index (match_entry->artists, char *, i));
+ g_free (g_array_index (match_entry->albums, char *, i));
+ g_free (g_array_index (match_entry->paths, char *, i));
 }
 }
 
@@ -286,28 +282,27 @@
 ui_jump_to_track_cache_clear(cache);
 
 // Initialize cache with playlist data
- gint playlist = aud_playlist_get_active ();
- gint entries = aud_playlist_entry_count (playlist);
+ int playlist = aud_playlist_get_active ();
+ int entries = aud_playlist_entry_count (playlist);
 
 KeywordMatches * k = keyword_matches_new ();
 
- for (gint entry = 0; entry < entries; entry ++)
+ for (int entry = 0; entry < entries; entry ++)
 {
- Tuple * tuple = aud_playlist_entry_get_tuple (playlist, entry, TRUE);
- gchar * title = normalize_search_string (tuple ? tuple_get_string (tuple, FIELD_TITLE, NULL) : NULL);
- gchar * artist = normalize_search_string (tuple ? tuple_get_string (tuple, FIELD_ARTIST, NULL) : NULL);
- gchar * album = normalize_search_string (tuple ? tuple_get_string (tuple, FIELD_ALBUM, NULL) : NULL);
- gchar * path = normalize_search_string (tuple ? tuple_get_string (tuple, FIELD_FILE_PATH, NULL) : NULL);
- gchar * filename = normalize_search_string (tuple ? tuple_get_string (tuple, FIELD_FILE_NAME, NULL) : NULL);
- if (tuple)
- tuple_free (tuple);
+ char * title, * artist, * album, * path;
+ aud_playlist_entry_describe (playlist, entry, & title, & artist, & album, TRUE);
+ path = aud_playlist_entry_get_filename (playlist, entry);
+
+ title = process_string (title, FALSE);
+ artist = process_string (artist, FALSE);
+ album = process_string (album, FALSE);
+ path = process_string (path, TRUE);
 
 g_array_append_val (k->entries, entry);
 g_array_append_val (k->titles, title);
 g_array_append_val (k->artists, artist);
 g_array_append_val (k->albums, album);
 g_array_append_val (k->paths, path);
- g_array_append_val (k->filenames, filename);
 }
 
 // Finally insert all titles into cache into an empty key "" so that
@@ -365,15 +360,15 @@
 * after a few letters typed on playlists with thousands of songs and
 * reduce useless iteration quite a lot.
 *
- * Return: GArray of gint
+ * Return: GArray of int
 */
 const GArray * ui_jump_to_track_cache_search (JumpToTrackCache * cache, const
- gchar * keyword)
+ char * keyword)
 {
- gchar* normalized_keyword = normalize_search_string(keyword);
+ char * normalized_keyword = g_utf8_casefold (keyword, -1);
 GString* keyword_string = g_string_new(normalized_keyword);
 GString* match_string = g_string_new(normalized_keyword);
- gint match_string_length = keyword_string->len;
+ int match_string_length = keyword_string->len;
 
 while (match_string_length >= 0)
 {

audacious-3.1.1.tar.bz2/src/libaudgui/ui_jumptotrack_cache.h -> audacious-3.2.4.tar.bz2/src/libaudgui/ui_jumptotrack_cache.h Changed

@@ -1,24 +1,25 @@
-/* Audacious - Cross-platform multimedia player
- * Copyright (C) 2008 Audacious development team.
+/*
+ * ui_jumptotrack_cache.h
+ * Copyright 2008 Jussi Judin
 *
- * This program is free software; 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 free software; 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT 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>.
+ * 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.
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
 */
 
-#ifndef AUDACIOUS_UI_JUMPTOTRACK_CACHE_H
-#define AUDACIOUS_UI_JUMPTOTRACK_CACHE_H
+#ifndef LIBAUDGUI_UI_JUMPTOTRACK_CACHE_H
+#define LIBAUDGUI_UI_JUMPTOTRACK_CACHE_H
 
 #include <glib.h>
 
@@ -31,7 +32,7 @@
 
 extern JumpToTrackCache* ui_jump_to_track_cache_new(void);
 extern const GArray * ui_jump_to_track_cache_search (JumpToTrackCache * cache,
- const gchar * keyword);
+ const char * keyword);
 extern void ui_jump_to_track_cache_free(JumpToTrackCache* cache);
 
-#endif /* AUDACIOUS_UI_JUMPTOTRACK_CACHE_H */
+#endif

audacious-3.1.1.tar.bz2/src/libaudgui/ui_playlist_manager.c -> audacious-3.2.4.tar.bz2/src/libaudgui/ui_playlist_manager.c Changed

@@ -1,20 +1,20 @@
-/* Audacious - Cross-platform multimedia player
- * Copyright (C) 2005-2011 Audacious development team.
+/*
+ * ui_playlist_manager.c
+ * Copyright 2006-2011 Giacomo Lozito and 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
 *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions, and the following disclaimer.
 *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses>.
+ * 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.
 *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
+ * 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>
@@ -26,6 +26,7 @@
 #include <libaudcore/hook.h>
 
 #include "config.h"
+#include "init.h"
 #include "libaudgui.h"
 #include "libaudgui-gtk.h"
 #include "list.h"
@@ -34,7 +35,7 @@
 
 static void save_position (GtkWidget * window)
 {
- gint x, y, w, h;
+ int x, y, w, h;
 gtk_window_get_position ((GtkWindow *) window, & x, & y);
 gtk_window_get_size ((GtkWindow *) window, & w, & h);
 
@@ -44,7 +45,7 @@
 aud_set_int ("audgui", "playlist_manager_h", h);
 }
 
-static gboolean hide_cb (GtkWidget * window)
+static bool_t hide_cb (GtkWidget * window)
 {
 save_position (window);
 gtk_widget_hide (window);
@@ -73,12 +74,14 @@
 save_position ((GtkWidget *) user_data);
 }
 
-static void get_value (void * user, gint row, gint column, GValue * value)
+static void get_value (void * user, int row, int column, GValue * value)
 {
 switch (column)
 {
- case 0:
- g_value_take_string (value, aud_playlist_get_title (row));
+ case 0:;
+ char * title = aud_playlist_get_title (row);
+ g_value_set_string (value, title);
+ str_unref (title);
 break;
 case 1:
 g_value_set_int (value, aud_playlist_entry_count (row));
@@ -86,22 +89,22 @@
 }
 }
 
-static gboolean get_selected (void * user, gint row)
+static bool_t get_selected (void * user, int row)
 {
 return (row == aud_playlist_get_active ());
 }
 
-static void set_selected (void * user, gint row, gboolean selected)
+static void set_selected (void * user, int row, bool_t selected)
 {
 if (selected)
 aud_playlist_set_active (row);
 }
 
-static void select_all (void * user, gboolean selected)
+static void select_all (void * user, bool_t selected)
 {
 }
 
-static void activate_row (void * user, gint row)
+static void activate_row (void * user, int row)
 {
 aud_playlist_set_active (row);
 
@@ -109,7 +112,7 @@
 hide_cb (playman_win);
 }
 
-static void shift_rows (void * user, gint row, gint before)
+static void shift_rows (void * user, int row, int before)
 {
 if (before < row)
 aud_playlist_reorder (row, before, 1);
@@ -129,26 +132,26 @@
 .get_data = NULL,
 .receive_data = NULL};
 
-static gboolean search_cb (GtkTreeModel * model, gint column, const gchar * key,
+static bool_t search_cb (GtkTreeModel * model, int column, const char * key,
 GtkTreeIter * iter, void * user)
 {
 GtkTreePath * path = gtk_tree_model_get_path (model, iter);
 g_return_val_if_fail (path, TRUE);
- gint row = gtk_tree_path_get_indices (path)[0];
+ int row = gtk_tree_path_get_indices (path)[0];
 gtk_tree_path_free (path);
 
- gchar * temp = aud_playlist_get_title (row);
+ char * temp = aud_playlist_get_title (row);
 g_return_val_if_fail (temp, TRUE);
- gchar * title = g_utf8_strdown (temp, -1);
- g_free (temp);
+ char * title = g_utf8_strdown (temp, -1);
+ str_unref (temp);
 
 temp = g_utf8_strdown (key, -1);
- gchar * * keys = g_strsplit (temp, " ", 0);
+ char * * keys = g_strsplit (temp, " ", 0);
 g_free (temp);
 
- gboolean match = FALSE;
+ bool_t match = FALSE;
 
- for (gint i = 0; keys[i]; i ++)
+ for (int i = 0; keys[i]; i ++)
 {
 if (! keys[i][0])
 continue;
@@ -168,16 +171,16 @@
 return ! match; /* TRUE == not matched, FALSE == matched */
 }
 
-static gboolean position_changed = FALSE;
-static gboolean playlist_activated = FALSE;
+static bool_t position_changed = FALSE;
+static bool_t playlist_activated = FALSE;
 
 static void update_hook (void * data, void * list)
 {
- gint rows = aud_playlist_count ();
+ int rows = aud_playlist_count ();
 
 if (GPOINTER_TO_INT (data) == PLAYLIST_UPDATE_STRUCTURE)
 {
- gint old_rows = audgui_list_row_count (list);
+ int old_rows = audgui_list_row_count (list);
 
 if (rows < old_rows)
 audgui_list_delete_rows (list, rows, old_rows - rows);
@@ -230,7 +233,7 @@
 gtk_toggle_button_get_active (toggle));
 }
 
-void audgui_playlist_manager (void)
+EXPORT void audgui_playlist_manager (void)
 {
 GtkWidget *playman_vbox;
 GtkWidget * playman_pl_lv, * playman_pl_lv_sw;
@@ -254,10 +257,10 @@
 gtk_window_set_geometry_hints( GTK_WINDOW(playman_win) , GTK_WIDGET(playman_win) ,
 &playman_win_hints , GDK_HINT_MIN_SIZE );
 
- gint x = aud_get_int ("audgui", "playlist_manager_x");
- gint y = aud_get_int ("audgui", "playlist_manager_y");
- gint w = aud_get_int ("audgui", "playlist_manager_w");
- gint h = aud_get_int ("audgui", "playlist_manager_h");
+ int x = aud_get_int ("audgui", "playlist_manager_x");
+ int y = aud_get_int ("audgui", "playlist_manager_y");
+ int w = aud_get_int ("audgui", "playlist_manager_w");
+ int h = aud_get_int ("audgui", "playlist_manager_h");
 
 if (w && h)
 {
@@ -273,8 +276,8 @@
 gtk_container_add( GTK_CONTAINER(playman_win) , playman_vbox );
 
 playman_pl_lv = audgui_list_new (& callbacks, NULL, aud_playlist_count ());
- audgui_list_add_column (playman_pl_lv, _("Title"), 0, G_TYPE_STRING, TRUE);
- audgui_list_add_column (playman_pl_lv, _("Entries"), 1, G_TYPE_INT, FALSE);
+ 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 ());
 gtk_tree_view_set_search_equal_func ((GtkTreeView *) playman_pl_lv,
 search_cb, NULL, NULL);
@@ -329,3 +332,17 @@
 
 hook_associate ("config save", save_config_cb, playman_win);
 }
+
+void audgui_playlist_manager_cleanup (void)
+{
+ if (! playman_win)
+ return;
+
+ hook_dissociate ("playlist update", update_hook);
+ hook_dissociate ("playlist activate", activate_hook);
+ hook_dissociate ("playlist set playing", position_hook);
+ hook_dissociate ("config save", save_config_cb);
+
+ gtk_widget_destroy (playman_win);
+ playman_win = NULL;
+}

audacious-3.1.1.tar.bz2/src/libaudgui/ui_regex.h -> audacious-3.2.4.tar.bz2/src/libaudgui/ui_regex.h Changed

@@ -1,20 +1,21 @@
-/* Audacious - Cross-platform multimedia player
- * Copyright (C) 2005-2006 Audacious development team.
+/*
+ * ui_regex.h
+ * Copyright 2010 Carlo Bramini
 *
- * This program is free software; 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 free software; 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.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT 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>.
+ * 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.
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
 */
 
 #ifndef __UI_REGEX_H__

audacious-3.1.1.tar.bz2/src/libaudgui/ui_urlopener.c -> audacious-3.2.4.tar.bz2/src/libaudgui/ui_urlopener.c Changed

@@ -1,32 +1,25 @@
-/* Audacious - Cross-platform multimedia player
- * Copyright (C) 2005-2010 Audacious development team
+/*
+ * ui_urlopener.c
+ * Copyright 1998-2003 XMMS development team
+ * Copyright 2003-2004 BMP development team
+ * Copyright 2008-2011 Tomasz Moń and John Lindgren
 *
- * Based on BMP:
- * Copyright (C) 2003-2004 BMP 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.
 *
- * Based on XMMS:
- * Copyright (C) 1998-2003 XMMS development team.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT 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 program is free software; 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.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses>.
 *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT 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.
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
 */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <glib.h>
 #include <gtk/gtk.h>
 
@@ -35,6 +28,7 @@
 #include <audacious/drct.h>
 #include <audacious/misc.h>
 
+#include "config.h"
 #include "libaudgui.h"
 #include "libaudgui-gtk.h"
 
@@ -43,7 +37,7 @@
 aud_history_add (gtk_entry_get_text (entry));
 }
 
-GtkWidget * urlopener_add_url_dialog_new (GCallback func, gboolean open)
+static GtkWidget * urlopener_add_url_dialog_new (GCallback func, bool_t open)
 {
 GtkWidget * win, * vbox, * bbox, * cancel, * ok, * combo, * entry;
 
@@ -64,8 +58,8 @@
 gtk_window_set_focus(GTK_WINDOW(win), entry);
 gtk_entry_set_text(GTK_ENTRY(entry), "");
 
- const gchar * path;
- for (gint i = 0; (path = aud_history_get (i)); i ++)
+ const char * path;
+ for (int i = 0; (path = aud_history_get (i)); i ++)
 gtk_combo_box_text_append_text ((GtkComboBoxText *) combo, path);
 
 g_signal_connect(entry, "activate",
@@ -107,7 +101,7 @@
 on_add_url_add_clicked(GtkWidget * widget,
 GtkWidget * entry)
 {
- const gchar *text = gtk_entry_get_text(GTK_ENTRY(entry));
+ const char *text = gtk_entry_get_text(GTK_ENTRY(entry));
 
 if (text != NULL && * text)
 aud_drct_pl_add (text, -1);
@@ -117,13 +111,13 @@
 on_add_url_ok_clicked(GtkWidget * widget,
 GtkWidget * entry)
 {
- const gchar *text = gtk_entry_get_text(GTK_ENTRY(entry));
+ const char *text = gtk_entry_get_text(GTK_ENTRY(entry));
 
 if (text != NULL && * text)
 aud_drct_pl_open (text);
 }
 
-void audgui_show_add_url_window (gboolean open)
+EXPORT void audgui_show_add_url_window (bool_t open)
 {
 static GtkWidget *url_window = NULL;

audacious-3.1.1.tar.bz2/src/libaudgui/urilist.c -> audacious-3.2.4.tar.bz2/src/libaudgui/urilist.c Changed

@@ -1,22 +1,20 @@
 /*
- * libaudgui/urilist.c
+ * urilist.c
 * Copyright 2010 John Lindgren
 *
- * This file is part of Audacious.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
 *
- * 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.
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions, and the following disclaimer.
 *
- * 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.
+ * 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.
 *
- * 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.
+ * 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 <string.h>
@@ -27,20 +25,14 @@
 #include <libaudcore/audstrings.h>
 #include <libaudcore/vfs.h>
 
+#include "config.h"
 #include "libaudgui.h"
 
-typedef void (* ForEachFunc) (gchar *, void *);
-
-typedef struct
-{
- gint playlist, at;
- struct index * index;
-}
-AddState;
+typedef void (* ForEachFunc) (char *, void *);
 
-static gchar * check_uri (gchar * name)
+static char * check_uri (char * name)
 {
- gchar * new;
+ char * new;
 
 if (strstr (name, "://") || ! (new = filename_to_uri (name)))
 return name;
@@ -49,9 +41,9 @@
 return new;
 }
 
-static void urilist_for_each (const gchar * list, ForEachFunc func, void * user)
+static void urilist_for_each (const char * list, ForEachFunc func, void * user)
 {
- const gchar * end, * next;
+ const char * end, * next;
 
 while (list[0])
 {
@@ -67,45 +59,33 @@
 }
 }
 
-static void add_to_glist (gchar * name, GList * * listp)
-{
- * listp = g_list_prepend (* listp, name);
-}
-
-void audgui_urilist_open (const gchar * list)
+static void add_to_index (char * name, Index * index)
 {
- GList * glist = NULL;
-
- urilist_for_each (list, (ForEachFunc) add_to_glist, & glist);
- glist = g_list_reverse (glist);
-
- aud_drct_pl_open_list (glist);
-
- g_list_foreach (glist, (GFunc) g_free, NULL);
- g_list_free (glist);
+ index_append (index, str_get (name));
+ g_free (name);
 }
 
-static void add_full (gchar * name, AddState * state)
+EXPORT void audgui_urilist_open (const char * list)
 {
- index_append (state->index, name);
+ Index * filenames = index_new ();
+ urilist_for_each (list, (ForEachFunc) add_to_index, filenames);
+ aud_drct_pl_open_list (filenames);
 }
 
-void audgui_urilist_insert (gint playlist, gint at, const gchar * list)
+EXPORT void audgui_urilist_insert (int playlist, int at, const char * list)
 {
- AddState state = {playlist, at, index_new ()};
-
- urilist_for_each (list, (ForEachFunc) add_full, & state);
- aud_playlist_entry_insert_batch (playlist, state.at, state.index, NULL,
- FALSE);
+ Index * filenames = index_new ();
+ urilist_for_each (list, (ForEachFunc) add_to_index, filenames);
+ aud_playlist_entry_insert_batch (playlist, at, filenames, NULL, FALSE);
 }
 
-gchar * audgui_urilist_create_from_selected (gint playlist)
+EXPORT char * audgui_urilist_create_from_selected (int playlist)
 {
- gint entries = aud_playlist_entry_count (playlist);
- gint space = 0;
- gint count, length;
- gchar * name;
- gchar * buffer, * set;
+ int entries = aud_playlist_entry_count (playlist);
+ int space = 0;
+ int count, length;
+ char * name;
+ char * buffer, * set;
 
 for (count = 0; count < entries; count ++)
 {
@@ -115,7 +95,7 @@
 name = aud_playlist_entry_get_filename (playlist, count);
 g_return_val_if_fail (name != NULL, NULL);
 space += strlen (name) + 1;
- g_free (name);
+ str_unref (name);
 }
 
 if (! space)
@@ -137,7 +117,7 @@
 set += length;
 * set ++ = '\n';
 space -= length + 1;
- g_free (name);
+ str_unref (name);
 }
 
 * -- set = 0; /* last newline replaced with null */

audacious-3.1.1.tar.bz2/src/libaudgui/util.c -> audacious-3.2.4.tar.bz2/src/libaudgui/util.c Changed

@@ -1,22 +1,20 @@
 /*
- * libaudgui/util.c
- * Copyright 2010 John Lindgren
+ * util.c
+ * Copyright 2010-2011 John Lindgren
 *
- * This file is part of Audacious.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
 *
- * 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.
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions, and the following disclaimer.
 *
- * 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.
+ * 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.
 *
- * 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.
+ * 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 <gdk/gdkkeysyms.h>
@@ -27,22 +25,24 @@
 #include <audacious/gtk-compat.h>
 #include <audacious/i18n.h>
 #include <audacious/playlist.h>
-#include <audacious/plugin.h>
 #include <audacious/misc.h>
 #include <libaudcore/audstrings.h>
 #include <libaudcore/hook.h>
 
 #include "config.h"
+#include "init.h"
 #include "libaudgui.h"
 #include "libaudgui-gtk.h"
 
-void audgui_hide_on_delete (GtkWidget * widget)
+static GdkPixbuf * current_pixbuf;
+
+EXPORT void audgui_hide_on_delete (GtkWidget * widget)
 {
 g_signal_connect (widget, "delete-event", (GCallback)
 gtk_widget_hide_on_delete, NULL);
 }
 
-static gboolean escape_cb (GtkWidget * widget, GdkEventKey * event, void
+static bool_t escape_cb (GtkWidget * widget, GdkEventKey * event, void
 (* action) (GtkWidget * widget))
 {
 if (event->keyval == GDK_Escape)
@@ -54,41 +54,41 @@
 return FALSE;
 }
 
-void audgui_hide_on_escape (GtkWidget * widget)
+EXPORT void audgui_hide_on_escape (GtkWidget * widget)
 {
 g_signal_connect (widget, "key-press-event", (GCallback) escape_cb,
- gtk_widget_hide);
+ (void *) gtk_widget_hide);
 }
 
-void audgui_destroy_on_escape (GtkWidget * widget)
+EXPORT void audgui_destroy_on_escape (GtkWidget * widget)
 {
 g_signal_connect (widget, "key-press-event", (GCallback) escape_cb,
- gtk_widget_destroy);
+ (void *) gtk_widget_destroy);
 }
 
-static void toggle_cb (GtkToggleButton * toggle, gboolean * setting)
+static void toggle_cb (GtkToggleButton * toggle, bool_t * setting)
 {
 * setting = gtk_toggle_button_get_active (toggle);
 }
 
-void audgui_connect_check_box (GtkWidget * box, gboolean * setting)
+EXPORT void audgui_connect_check_box (GtkWidget * box, bool_t * setting)
 {
 gtk_toggle_button_set_active ((GtkToggleButton *) box, * setting);
 g_signal_connect ((GObject *) box, "toggled", (GCallback) toggle_cb, setting);
 }
 
-void audgui_simple_message (GtkWidget * * widget, GtkMessageType type,
- const gchar * title, const gchar * text)
+EXPORT void audgui_simple_message (GtkWidget * * widget, GtkMessageType type,
+ const char * title, const char * text)
 {
 AUDDBG ("%s\n", text);
 
 if (* widget != NULL)
 {
- const gchar * old = NULL;
+ const char * old = NULL;
 g_object_get ((GObject *) * widget, "text", & old, NULL);
 g_return_if_fail (old);
 
- gint messages = GPOINTER_TO_INT (g_object_get_data ((GObject *)
+ int messages = GPOINTER_TO_INT (g_object_get_data ((GObject *)
 * widget, "messages"));
 
 if (messages > 10)
@@ -97,7 +97,7 @@
 if (strstr (old, text))
 goto CREATED;
 
- gchar both[strlen (old) + strlen (text) + 2];
+ char both[strlen (old) + strlen (text) + 2];
 snprintf (both, sizeof both, "%s\n%s", old, text);
 g_object_set ((GObject *) * widget, "text", both, NULL);
 
@@ -121,7 +121,7 @@
 gtk_window_present ((GtkWindow *) * widget);
 }
 
-GdkPixbuf * audgui_pixbuf_from_data (void * data, gint size)
+EXPORT GdkPixbuf * audgui_pixbuf_from_data (const void * data, int64_t size)
 {
 GdkPixbuf * pixbuf = NULL;
 GdkPixbufLoader * loader = gdk_pixbuf_loader_new ();
@@ -140,56 +140,35 @@
 return pixbuf;
 }
 
-GdkPixbuf * audgui_pixbuf_for_entry (gint list, gint entry)
+EXPORT GdkPixbuf * audgui_pixbuf_for_entry (int list, int entry)
 {
- gchar * name = aud_playlist_entry_get_filename (list, entry);
+ char * name = aud_playlist_entry_get_filename (list, entry);
 g_return_val_if_fail (name, NULL);
 
- /* Don't get album art for network files -- too slow. */
- if (! strncmp (name, "http://", 7) || ! strncmp (name, "https://", 8) ||
- ! strncmp (name, "mms://", 6))
- goto FALLBACK;
-
- AUDDBG ("Trying to load pixbuf for %s.\n", name);
- PluginHandle * decoder = aud_playlist_entry_get_decoder (list, entry, FALSE);
- if (! decoder)
- goto FALLBACK;
+ const void * data;
+ int64_t size;
 
- void * data;
- gint size;
+ aud_art_get_data (name, & data, & size);
 
- if (aud_file_read_image (name, decoder, & data, & size))
+ if (data)
 {
 GdkPixbuf * p = audgui_pixbuf_from_data (data, size);
- g_free (data);
- if (p)
- {
- g_free (name);
- return p;
- }
- }
+ aud_art_unref (name);
 
- gchar * assoc = aud_get_associated_image_file (name);
-
- if (assoc)
- {
- GdkPixbuf * p = gdk_pixbuf_new_from_file (assoc, NULL);
- g_free (assoc);
 if (p)
 {
- g_free (name);
+ str_unref (name);
 return p;
 }
 }
 
- g_free (name);
+ str_unref (name);
 
-FALLBACK:;
 AUDDBG ("Using fallback pixbuf.\n");
 static GdkPixbuf * fallback = NULL;
 if (! fallback)
 {
- gchar * path = g_strdup_printf ("%s/images/album.png",
+ char * path = g_strdup_printf ("%s/images/album.png",
 aud_get_path (AUD_PATH_DATA_DIR));
 fallback = gdk_pixbuf_new_from_file (path, NULL);
 g_free (path);
@@ -199,49 +178,33 @@
 return fallback;
 }
 
-static void pixbuf_clear_cb (void * unused, GdkPixbuf * * pixbuf)
+void audgui_pixbuf_uncache (void)
 {
- if (* pixbuf)
+ if (current_pixbuf)
 {
- AUDDBG ("Clearing cached pixbuf.\n");
- g_object_unref ((GObject *) * pixbuf);
- * pixbuf = NULL;
+ g_object_unref ((GObject *) current_pixbuf);
+ current_pixbuf = NULL;
 }
 }
 
-static void pixbuf_position_cb (void * list, GdkPixbuf * * pixbuf)
+EXPORT GdkPixbuf * audgui_pixbuf_for_current (void)
 {
- if (GPOINTER_TO_INT (list) == aud_playlist_get_playing ())
- pixbuf_clear_cb (NULL, pixbuf);
-}
-
-GdkPixbuf * audgui_pixbuf_for_current (void)
-{
- static GdkPixbuf * pixbuf = NULL;
- static gboolean hooked = FALSE;
-
- if (! hooked)
+ if (! current_pixbuf)
 {
- hook_associate ("playlist set playing", (HookFunction) pixbuf_clear_cb, & pixbuf);
- hook_associate ("playlist position", (HookFunction) pixbuf_position_cb, & pixbuf);
- hooked = TRUE;
+ int list = aud_playlist_get_playing ();
+ current_pixbuf = audgui_pixbuf_for_entry (list, aud_playlist_get_position (list));
 }
 
- if (! pixbuf)
- {
- gint list = aud_playlist_get_playing ();
- pixbuf = audgui_pixbuf_for_entry (list, aud_playlist_get_position (list));
- }
+ if (current_pixbuf)
+ g_object_ref ((GObject *) current_pixbuf);
 
- if (pixbuf)
- g_object_ref ((GObject *) pixbuf);
- return pixbuf;
+ return current_pixbuf;
 }
 
-void audgui_pixbuf_scale_within (GdkPixbuf * * pixbuf, gint size)
+EXPORT void audgui_pixbuf_scale_within (GdkPixbuf * * pixbuf, int size)
 {
- gint width = gdk_pixbuf_get_width (* pixbuf);
- gint height = gdk_pixbuf_get_height (* pixbuf);
+ int width = gdk_pixbuf_get_width (* pixbuf);
+ int height = gdk_pixbuf_get_height (* pixbuf);
 GdkPixbuf * pixbuf2;
 
 if (width > height)
@@ -265,3 +228,10 @@
 g_object_unref (* pixbuf);
 * pixbuf = pixbuf2;
 }
+
+EXPORT void audgui_set_default_icon (void)
+{
+#ifndef _WIN32
+ gtk_window_set_default_icon_name ("audacious");
+#endif
+}

audacious-3.1.1.tar.bz2/src/libaudtag/Makefile -> audacious-3.2.4.tar.bz2/src/libaudtag/Makefile Changed

audacious-3.1.1.tar.bz2/src/libaudtag/ape/ape.c -> audacious-3.2.4.tar.bz2/src/libaudtag/ape/ape.c Changed

@@ -35,19 +35,19 @@
 #pragma pack(1)
 typedef struct
 {
- gchar magic[8];
- guint32 version; /* LE */
- guint32 length; /* LE */
- guint32 items; /* LE */
- guint32 flags; /* LE */
- guint64 reserved;
+ char magic[8];
+ uint32_t version; /* LE */
+ uint32_t length; /* LE */
+ uint32_t items; /* LE */
+ uint32_t flags; /* LE */
+ uint64_t reserved;
 }
 APEHeader;
 #pragma pack(pop)
 
 typedef struct
 {
- gchar * key, * value;
+ char * key, * value;
 }
 ValuePair;
 
@@ -55,7 +55,7 @@
 #define APE_FLAG_HAS_NO_FOOTER (1 << 30)
 #define APE_FLAG_IS_HEADER (1 << 29)
 
-static gboolean ape_read_header (VFSFile * handle, APEHeader * header)
+static bool_t ape_read_header (VFSFile * handle, APEHeader * header)
 {
 if (vfs_fread (header, 1, sizeof (APEHeader), handle) != sizeof (APEHeader))
 return FALSE;
@@ -74,8 +74,8 @@
 return TRUE;
 }
 
-static gboolean ape_find_header (VFSFile * handle, APEHeader * header, gint *
- start, gint * length, gint * data_start, gint * data_length)
+static bool_t ape_find_header (VFSFile * handle, APEHeader * header, int *
+ start, int * length, int * data_start, int * data_length)
 {
 APEHeader secondary;
 
@@ -84,8 +84,8 @@
 
 if (ape_read_header (handle, header))
 {
- TAGDBG ("Found header at 0, length = %d, version = %d.\n", (gint)
- header->length, (gint) header->version);
+ TAGDBG ("Found header at 0, length = %d, version = %d.\n", (int)
+ header->length, (int) header->version);
 * start = 0;
 * length = header->length;
 * data_start = sizeof (APEHeader);
@@ -94,7 +94,7 @@
 if (! (header->flags & APE_FLAG_HAS_HEADER) || ! (header->flags &
 APE_FLAG_IS_HEADER))
 {
- TAGDBG ("Invalid header flags (%u).\n", (guint) header->flags);
+ TAGDBG ("Invalid header flags (%u).\n", (unsigned int) header->flags);
 return FALSE;
 }
 
@@ -115,14 +115,14 @@
 return TRUE;
 }
 
- if (vfs_fseek (handle, -(gint) sizeof (APEHeader), SEEK_END))
+ if (vfs_fseek (handle, -(int) sizeof (APEHeader), SEEK_END))
 return FALSE;
 
 if (ape_read_header (handle, header))
 {
- TAGDBG ("Found footer at %d, length = %d, version = %d.\n", (gint)
- vfs_ftell (handle) - (gint) sizeof (APEHeader), (gint) header->length,
- (gint) header->version);
+ TAGDBG ("Found footer at %d, length = %d, version = %d.\n", (int)
+ vfs_ftell (handle) - (int) sizeof (APEHeader), (int) header->length,
+ (int) header->version);
 * start = vfs_ftell (handle) - header->length;
 * length = header->length;
 * data_start = vfs_ftell (handle) - header->length;
@@ -131,13 +131,13 @@
 if ((header->flags & APE_FLAG_HAS_NO_FOOTER) || (header->flags &
 APE_FLAG_IS_HEADER))
 {
- TAGDBG ("Invalid footer flags (%u).\n", (guint) header->flags);
+ TAGDBG ("Invalid footer flags (%u).\n", (unsigned int) header->flags);
 return FALSE;
 }
 
 if (header->flags & APE_FLAG_HAS_HEADER)
 {
- if (vfs_fseek (handle, -(gint) header->length - sizeof (APEHeader),
+ if (vfs_fseek (handle, -(int) header->length - sizeof (APEHeader),
 SEEK_CUR))
 return FALSE;
 
@@ -158,19 +158,19 @@
 return FALSE;
 }
 
-static gboolean ape_is_our_file (VFSFile * handle)
+static bool_t ape_is_our_file (VFSFile * handle)
 {
 APEHeader header;
- gint start, length, data_start, data_length;
+ int start, length, data_start, data_length;
 
 return ape_find_header (handle, & header, & start, & length, & data_start,
 & data_length);
 }
 
-static ValuePair * ape_read_item (void * * data, gint length)
+static ValuePair * ape_read_item (void * * data, int length)
 {
- guint32 * header = * data;
- gchar * value;
+ uint32_t * header = * data;
+ char * value;
 ValuePair * pair;
 
 if (length < 8)
@@ -179,7 +179,7 @@
 return NULL;
 }
 
- value = memchr ((gchar *) (* data) + 8, 0, length - 8);
+ value = memchr ((char *) (* data) + 8, 0, length - 8);
 
 if (value == NULL)
 {
@@ -189,15 +189,15 @@
 
 value ++;
 
- if (header[0] > (gchar *) (* data) + length - value)
+ if (header[0] > (char *) (* data) + length - value)
 {
 TAGDBG ("Item value of length %d, but only %d bytes remain in tag.\n",
- (gint) header[0], (gint) ((gchar *) (* data) + length - value));
+ (int) header[0], (int) ((char *) (* data) + length - value));
 return NULL;
 }
 
 pair = g_malloc (sizeof (ValuePair));
- pair->key = g_strdup ((gchar *) (* data) + 8);
+ pair->key = g_strdup ((char *) (* data) + 8);
 pair->value = g_strndup (value, header[0]);
 
 * data = value + header[0];
@@ -209,7 +209,7 @@
 {
 GList * list = NULL;
 APEHeader header;
- gint start, length, data_start, data_length;
+ int start, length, data_start, data_length;
 void * data, * item;
 
 if (! ape_find_header (handle, & header, & start, & length, & data_start,
@@ -232,8 +232,8 @@
 
 while (header.items --)
 {
- ValuePair * pair = ape_read_item (& item, (gchar *) data + data_length -
- (gchar *) item);
+ ValuePair * pair = ape_read_item (& item, (char *) data + data_length -
+ (char *) item);
 
 if (pair == NULL)
 break;
@@ -257,9 +257,9 @@
 }
 }
 
-static void parse_gain_text (const gchar * text, gint * value, gint * unit)
+static void parse_gain_text (const char * text, int * value, int * unit)
 {
- gint sign = 1;
+ int sign = 1;
 
 * value = 0;
 * unit = 1;
@@ -291,54 +291,54 @@
 * value = * value * sign;
 }
 
-static void set_gain_info (Tuple * tuple, gint field, gint unit_field,
- const gchar * text)
+static void set_gain_info (Tuple * tuple, int field, int unit_field,
+ const char * text)
 {
- gint value, unit;
+ int value, unit;
 
 parse_gain_text (text, & value, & unit);
 
 if (tuple_get_value_type (tuple, unit_field, NULL) == TUPLE_INT)
- value = value * (gint64) tuple_get_int (tuple, unit_field, NULL) / unit;
+ value = value * (int64_t) tuple_get_int (tuple, unit_field, NULL) / unit;
 else
- tuple_associate_int (tuple, unit_field, NULL, unit);
+ tuple_set_int (tuple, unit_field, NULL, unit);
 
- tuple_associate_int (tuple, field, NULL, value);
+ tuple_set_int (tuple, field, NULL, value);
 }
 
-static gboolean ape_read_tag (Tuple * tuple, VFSFile * handle)
+static bool_t ape_read_tag (Tuple * tuple, VFSFile * handle)
 {
 GList * list = ape_read_items (handle), * node;
 
 for (node = list; node != NULL; node = node->next)
 {
- gchar * key = ((ValuePair *) node->data)->key;
- gchar * value = ((ValuePair *) node->data)->value;
+ char * key = ((ValuePair *) node->data)->key;
+ char * value = ((ValuePair *) node->data)->value;
 
 if (! strcmp (key, "Artist"))
- tuple_associate_string (tuple, FIELD_ARTIST, NULL, value);
+ tuple_set_str (tuple, FIELD_ARTIST, NULL, value);
 else if (! strcmp (key, "Title"))
- tuple_associate_string (tuple, FIELD_TITLE, NULL, value);
+ tuple_set_str (tuple, FIELD_TITLE, NULL, value);
 else if (! strcmp (key, "Album"))
- tuple_associate_string (tuple, FIELD_ALBUM, NULL, value);
+ tuple_set_str (tuple, FIELD_ALBUM, NULL, value);
 else if (! strcmp (key, "Comment"))
- tuple_associate_string (tuple, FIELD_COMMENT, NULL, value);
+ tuple_set_str (tuple, FIELD_COMMENT, NULL, value);
 else if (! strcmp (key, "Genre"))
- tuple_associate_string (tuple, FIELD_GENRE, NULL, value);
+ tuple_set_str (tuple, FIELD_GENRE, NULL, value);
 else if (! strcmp (key, "Track"))
- tuple_associate_int (tuple, FIELD_TRACK_NUMBER, NULL, atoi (value));
+ tuple_set_int (tuple, FIELD_TRACK_NUMBER, NULL, atoi (value));
 else if (! strcmp (key, "Year"))
- tuple_associate_int (tuple, FIELD_YEAR, NULL, atoi (value));
- else if (! strcasecmp (key, "REPLAYGAIN_TRACK_GAIN"))
+ tuple_set_int (tuple, FIELD_YEAR, NULL, atoi (value));
+ else if (! g_ascii_strcasecmp (key, "REPLAYGAIN_TRACK_GAIN"))
 set_gain_info (tuple, FIELD_GAIN_TRACK_GAIN, FIELD_GAIN_GAIN_UNIT,
 value);
- else if (! strcasecmp (key, "REPLAYGAIN_TRACK_PEAK"))
+ else if (! g_ascii_strcasecmp (key, "REPLAYGAIN_TRACK_PEAK"))
 set_gain_info (tuple, FIELD_GAIN_TRACK_PEAK, FIELD_GAIN_PEAK_UNIT,
 value);
- else if (! strcasecmp (key, "REPLAYGAIN_ALBUM_GAIN"))
+ else if (! g_ascii_strcasecmp (key, "REPLAYGAIN_ALBUM_GAIN"))
 set_gain_info (tuple, FIELD_GAIN_ALBUM_GAIN, FIELD_GAIN_GAIN_UNIT,
 value);
- else if (! strcasecmp (key, "REPLAYGAIN_ALBUM_PEAK"))
+ else if (! g_ascii_strcasecmp (key, "REPLAYGAIN_ALBUM_PEAK"))
 set_gain_info (tuple, FIELD_GAIN_ALBUM_PEAK, FIELD_GAIN_PEAK_UNIT,
 value);
 }
@@ -347,12 +347,12 @@
 return TRUE;
 }
 
-static gboolean ape_write_item (VFSFile * handle, const gchar * key,
- const gchar * value, int * written_length)
+static bool_t ape_write_item (VFSFile * handle, const char * key,
+ const char * value, int * written_length)
 {
- gint key_len = strlen (key) + 1;
- gint value_len = strlen (value);
- guint32 header[2];
+ int key_len = strlen (key) + 1;
+ int value_len = strlen (value);
+ uint32_t header[2];
 
 TAGDBG ("Write: %s = %s.\n", key, value);
 
@@ -372,26 +372,28 @@
 return TRUE;
 }
 
-static gboolean write_string_item (const Tuple * tuple, int field, VFSFile *
- handle, const gchar * key, int * written_length, int * written_items)
+static bool_t write_string_item (const Tuple * tuple, int field, VFSFile *
+ handle, const char * key, int * written_length, int * written_items)
 {
- const gchar * value = tuple_get_string (tuple, field, NULL);
+ char * value = tuple_get_str (tuple, field, NULL);
 
 if (value == NULL)
 return TRUE;
 
- if (! ape_write_item (handle, key, value, written_length))
- return FALSE;
+ bool_t success = ape_write_item (handle, key, value, written_length);
 
- (* written_items) ++;
- return TRUE;
+ if (success)
+ (* written_items) ++;
+
+ str_unref (value);
+ return success;
 }
 
-static gboolean write_integer_item (const Tuple * tuple, int field, VFSFile *
- handle, const gchar * key, int * written_length, int * written_items)
+static bool_t write_integer_item (const Tuple * tuple, int field, VFSFile *
+ handle, const char * key, int * written_length, int * written_items)
 {
- gint value = tuple_get_int (tuple, field, NULL);
- gchar scratch[32];
+ int value = tuple_get_int (tuple, field, NULL);
+ char scratch[32];
 
 if (! value)
 return TRUE;
@@ -405,7 +407,7 @@
 return TRUE;
 }
 
-static gboolean write_header (gint data_length, gint items, gboolean is_header,
+static bool_t write_header (int data_length, int items, bool_t is_header,
 VFSFile * handle)
 {
 APEHeader header;
@@ -422,11 +424,11 @@
 (APEHeader);
 }
 
-static gboolean ape_write_tag (const Tuple * tuple, VFSFile * handle)
+static bool_t ape_write_tag (const Tuple * tuple, VFSFile * handle)
 {
 GList * list = ape_read_items (handle), * node;
 APEHeader header;
- gint start, length, data_start, data_length, items;
+ int start, length, data_start, data_length, items;
 
 if (ape_find_header (handle, & header, & start, & length, & data_start,
 & data_length))
@@ -467,8 +469,8 @@
 
 for (node = list; node != NULL; node = node->next)
 {
- gchar * key = ((ValuePair *) node->data)->key;
- gchar * value = ((ValuePair *) node->data)->value;
+ char * key = ((ValuePair *) node->data)->key;
+ char * value = ((ValuePair *) node->data)->value;
 
 if (! strcmp (key, "Artist") || ! strcmp (key, "Title") || ! strcmp
 (key, "Album") || ! strcmp (key, "Comment") || ! strcmp (key, "Genre")

audacious-3.1.1.tar.bz2/src/libaudtag/audtag.c -> audacious-3.2.4.tar.bz2/src/libaudtag/audtag.c Changed

@@ -18,26 +18,25 @@
 * using our public API to be a derived work.
 */
 
-#include "libaudcore/tuple.h"
+#include <glib.h>
+
+#include <libaudcore/tuple.h>
+
 #include "audtag.h"
+#include "config.h"
 #include "tag_module.h"
 #include "util.h"
 
-gboolean tag_verbose = FALSE;
-
-void tag_init(void)
-{
- init_tag_modules();
-}
+bool_t tag_verbose = FALSE;
 
-void tag_set_verbose (gboolean verbose)
+EXPORT void tag_set_verbose (bool_t verbose)
 {
 tag_verbose = verbose;
 }
 
 /* The tuple's file-related attributes are already set */
 
-gboolean tag_tuple_read (Tuple * tuple, VFSFile * handle)
+EXPORT bool_t tag_tuple_read (Tuple * tuple, VFSFile * handle)
 {
 tag_module_t * module = find_tag_module (handle, TAG_TYPE_NONE);
 
@@ -47,7 +46,7 @@
 return module->read_tag (tuple, handle);
 }
 
-gboolean tag_image_read (VFSFile * handle, void * * data, gint * size)
+EXPORT bool_t tag_image_read (VFSFile * handle, void * * data, int64_t * size)
 {
 tag_module_t * module = find_tag_module (handle, TAG_TYPE_NONE);
 
@@ -57,7 +56,7 @@
 return module->read_image (handle, data, size);
 }
 
-gboolean tag_tuple_write (const Tuple * tuple, VFSFile * handle, gint new_type)
+EXPORT bool_t tag_tuple_write (const Tuple * tuple, VFSFile * handle, int new_type)
 {
 tag_module_t * module = find_tag_module (handle, new_type);
 
@@ -68,7 +67,7 @@
 }
 
 /* deprecated */
-gboolean tag_tuple_write_to_file (Tuple * tuple, VFSFile * handle)
+EXPORT bool_t tag_tuple_write_to_file (Tuple * tuple, VFSFile * handle)
 {
 return tag_tuple_write (tuple, handle, TAG_TYPE_NONE);
 }

audacious-3.1.1.tar.bz2/src/libaudtag/audtag.h -> audacious-3.2.4.tar.bz2/src/libaudtag/audtag.h Changed

@@ -23,10 +23,6 @@
 #ifndef AUDTAG_H
 #define AUDTAG_H
 
-G_BEGIN_DECLS
-
-#include <glib.h>
-#include <mowgli.h>
 #include <libaudcore/tuple.h>
 #include <libaudcore/vfs.h>
 
@@ -36,18 +32,16 @@
 TAG_TYPE_APE,
 };
 
-void tag_init (void);
-void tag_set_verbose (gboolean verbose);
+void tag_set_verbose (bool_t verbose);
 
-gboolean tag_tuple_read (Tuple * tuple, VFSFile *fd);
-gboolean tag_image_read (VFSFile * handle, void * * data, gint * size);
+bool_t tag_tuple_read (Tuple * tuple, VFSFile *fd);
+bool_t tag_image_read (VFSFile * handle, void * * data, int64_t * size);
 
 /* new_type specifies the type of tag (see the TAG_TYPE_* enum) that should be
 * written if the file does not have any existing tag. */
-gboolean tag_tuple_write (const Tuple * tuple, VFSFile * handle, gint new_type);
+bool_t tag_tuple_write (const Tuple * tuple, VFSFile * handle, int new_type);
 
 /* deprecated, use tag_tuple_write */
-gboolean tag_tuple_write_to_file (Tuple * tuple, VFSFile * handle);
+bool_t tag_tuple_write_to_file (Tuple * tuple, VFSFile * handle);
 
-G_END_DECLS
 #endif /* AUDTAG_H */

audacious-3.1.1.tar.bz2/src/libaudtag/id3/id3-common.c -> audacious-3.2.4.tar.bz2/src/libaudtag/id3/id3-common.c Changed

@@ -1,6 +1,6 @@
 /*
 * id3-common.c
- * Copyright 2010 John Lindgren
+ * Copyright 2010-2011 John Lindgren
 *
 * This file is part of Audacious.
 *
@@ -19,6 +19,7 @@
 * using our public API to be a derived work.
 */
 
+#include <stdio.h>
 #include <string.h>
 
 #include <glib.h>
@@ -28,10 +29,24 @@
 #include "../util.h"
 #include "id3-common.h"
 
-gchar * convert_text (const gchar * text, gint length, gint encoding, gboolean
- nulled, gint * _converted, const gchar * * after)
+static void * memchr16 (const void * mem, int16_t chr, int len)
 {
- gchar * buffer = NULL;
+ while (len >= 2)
+ {
+ if (* (int16_t *) mem == chr)
+ return (void *) mem;
+
+ mem = (char *) mem + 2;
+ len -= 2;
+ }
+
+ return NULL;
+}
+
+char * convert_text (const char * text, int length, int encoding, bool_t
+ nulled, int * _converted, const char * * after)
+{
+ char * buffer = NULL;
 gsize converted = 0;
 
 TAGDBG ("length = %d, encoding = %d, nulled = %d\n", length, encoding,
@@ -39,8 +54,7 @@
 
 if (nulled)
 {
- const guchar null16[] = {0, 0};
- const gchar * null;
+ const char * null;
 
 switch (encoding)
 {
@@ -58,7 +72,7 @@
 break;
 case 1:
 case 2:
- if ((null = memfind (text, length, null16, 2)) == NULL)
+ if ((null = memchr16 (text, 0, length)) == NULL)
 return NULL;
 
 length = null - text;
@@ -74,11 +88,13 @@
 switch (encoding)
 {
 case 0:
- case 3:
- buffer = str_to_utf8_full (text, length, NULL, & converted, NULL);
+ case 3:;
+ int converted_int = 0;
+ buffer = str_to_utf8_full (text, length, NULL, & converted_int);
+ converted = converted_int;
 break;
 case 1:
- if (text[0] == (gchar) 0xff)
+ if (text[0] == (char) 0xff)
 buffer = g_convert (text + 2, length - 2, "UTF-8", "UTF-16LE", NULL,
 & converted, NULL);
 else
@@ -92,7 +108,7 @@
 break;
 }
 
- TAGDBG ("length converted: %d\n", (gint) converted);
+ TAGDBG ("length converted: %d\n", (int) converted);
 TAGDBG ("string: %s\n", buffer);
 
 if (_converted != NULL)

audacious-3.1.1.tar.bz2/src/libaudtag/id3/id3-common.h -> audacious-3.2.4.tar.bz2/src/libaudtag/id3/id3-common.h Changed

audacious-3.1.1.tar.bz2/src/libaudtag/id3/id3v1.c -> audacious-3.2.4.tar.bz2/src/libaudtag/id3/id3v1.c Changed

@@ -21,6 +21,8 @@
 
 #include <glib.h>
 #include <glib/gstdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include <libaudcore/audstrings.h>
 
@@ -29,12 +31,12 @@
 #include <inttypes.h>
 #include "../tag_module.h"
 
-gboolean id3v1_can_handle_file(VFSFile *f)
+bool_t id3v1_can_handle_file(VFSFile *f)
 {
 if (vfs_fseek(f, -128, SEEK_END))
 return FALSE;
 
- gchar *tag = read_char_data(f, 3);
+ char *tag = read_char_data(f, 3);
 
 if (tag && !strncmp(tag, "TAG", 3))
 {
@@ -46,32 +48,32 @@
 return FALSE;
 }
 
-static gchar *convert_to_utf8(gchar *str)
+static char *convert_to_utf8(char *str)
 {
 if (!str)
 return NULL;
 
- gchar *tmp = str;
+ char *tmp = str;
 str = str_to_utf8(str);
 g_free(tmp);
 
 return g_strchomp(str);
 }
 
-gboolean id3v1_read_tag (Tuple * tuple, VFSFile * f)
+bool_t id3v1_read_tag (Tuple * tuple, VFSFile * f)
 {
- gboolean genre_set = FALSE;
+ bool_t genre_set = FALSE;
 
 if (vfs_fseek(f, -125, SEEK_END))
 return FALSE;
 
- gchar *title = read_char_data(f, 30);
- gchar *artist = read_char_data(f, 30);
- gchar *album = read_char_data(f, 30);
- gchar *year = read_char_data(f, 4);
- gchar *comment = read_char_data(f, 30);
- gchar *genre = read_char_data(f, 1);
- gchar track = 0;
+ char *title = read_char_data(f, 30);
+ char *artist = read_char_data(f, 30);
+ char *album = read_char_data(f, 30);
+ char *year = read_char_data(f, 4);
+ char *comment = read_char_data(f, 30);
+ char *genre = read_char_data(f, 1);
+ char track = 0;
 
 if (comment && comment[28] == 0 && comment[29] != 0)
 track = comment[29];
@@ -84,16 +86,16 @@
 if (vfs_fseek(f, -355, SEEK_END))
 return FALSE;
 
- gchar *tag = read_char_data(f, 4);
+ char *tag = read_char_data(f, 4);
 
 if (tag && ! strncmp (tag, "TAG+", 4))
 {
- gchar *ext_title = convert_to_utf8(read_char_data(f, 60));
- gchar *ext_artist = convert_to_utf8(read_char_data(f, 60));
- gchar *ext_album = convert_to_utf8(read_char_data(f, 60));
- gchar *tmp_title = title ? g_strconcat(title, ext_title, NULL) : NULL;
- gchar *tmp_artist = artist ? g_strconcat(artist, ext_artist, NULL) : NULL;
- gchar *tmp_album = album ? g_strconcat(album, ext_album, NULL) : NULL;
+ char *ext_title = convert_to_utf8(read_char_data(f, 60));
+ char *ext_artist = convert_to_utf8(read_char_data(f, 60));
+ char *ext_album = convert_to_utf8(read_char_data(f, 60));
+ char *tmp_title = title ? g_strconcat(title, ext_title, NULL) : NULL;
+ char *tmp_artist = artist ? g_strconcat(artist, ext_artist, NULL) : NULL;
+ char *tmp_album = album ? g_strconcat(album, ext_album, NULL) : NULL;
 g_free(title);
 g_free(artist);
 g_free(album);
@@ -107,31 +109,31 @@
 if (vfs_fseek (f, -170, SEEK_END))
 goto ERR;
 
- gchar *ext_genre = convert_to_utf8(read_char_data(f, 30));
+ char *ext_genre = convert_to_utf8(read_char_data(f, 30));
 
 if (ext_genre)
 {
- tuple_associate_string(tuple, FIELD_GENRE, NULL, ext_genre);
+ tuple_set_str(tuple, FIELD_GENRE, NULL, ext_genre);
 genre_set = TRUE;
 g_free(ext_genre);
 }
 }
 
 if (title)
- tuple_associate_string(tuple, FIELD_TITLE, NULL, title);
+ tuple_set_str(tuple, FIELD_TITLE, NULL, title);
 if (artist)
- tuple_associate_string(tuple, FIELD_ARTIST, NULL, artist);
+ tuple_set_str(tuple, FIELD_ARTIST, NULL, artist);
 if (album)
- tuple_associate_string(tuple, FIELD_ALBUM, NULL, album);
+ tuple_set_str(tuple, FIELD_ALBUM, NULL, album);
 if (year)
- tuple_associate_int(tuple, FIELD_YEAR, NULL, atoi(year));
+ tuple_set_int(tuple, FIELD_YEAR, NULL, atoi(year));
 if (comment)
- tuple_associate_string(tuple, FIELD_COMMENT, NULL, comment);
+ tuple_set_str(tuple, FIELD_COMMENT, NULL, comment);
 if (track)
- tuple_associate_int(tuple, FIELD_TRACK_NUMBER, NULL, track);
+ tuple_set_int(tuple, FIELD_TRACK_NUMBER, NULL, track);
 
 if (genre && !genre_set)
- tuple_associate_string(tuple, FIELD_GENRE, NULL, convert_numericgenre_to_text(*genre));
+ tuple_set_str(tuple, FIELD_GENRE, NULL, convert_numericgenre_to_text(*genre));
 
 g_free(title);
 g_free(artist);
@@ -152,7 +154,7 @@
 return FALSE;
 }
 
-static gboolean id3v1_write_tag (const Tuple * tuple, VFSFile * handle)
+static bool_t id3v1_write_tag (const Tuple * tuple, VFSFile * handle)
 {
 fprintf (stderr, "Writing ID3v1 tags is not implemented yet, sorry.\n");
 return FALSE;

audacious-3.1.1.tar.bz2/src/libaudtag/id3/id3v22.c -> audacious-3.2.4.tar.bz2/src/libaudtag/id3/id3v22.c Changed

@@ -22,6 +22,9 @@
 */
 
 #include <glib.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include <libaudcore/audstrings.h>
 
@@ -49,34 +52,34 @@
 ID3_TAGS_NO
 };
 
-static const gchar * id3_frames[ID3_TAGS_NO] = {"TAL", "TT2", "TCM", "TCR",
+static const char * id3_frames[ID3_TAGS_NO] = {"TAL", "TT2", "TCM", "TCR",
 "TDA", "TLE", "TPE", "TRK", "TYE", "TCO", "COM", "TSS", "TXX", "RVA", "TP1"};
 
 #pragma pack(push) /* must be byte-aligned */
 #pragma pack(1)
 typedef struct
 {
- gchar magic[3];
- guchar version;
- guchar revision;
- guchar flags;
- guint32 size;
+ char magic[3];
+ unsigned char version;
+ unsigned char revision;
+ unsigned char flags;
+ uint32_t size;
 }
 ID3v2Header;
 
 typedef struct
 {
- guchar key[3];
- guchar size[3];
+ unsigned char key[3];
+ unsigned char size[3];
 }
 ID3v2FrameHeader;
 #pragma pack(pop)
 
 typedef struct
 {
- gchar key[5];
- guchar * data;
- gint size;
+ char key[5];
+ unsigned char * data;
+ int size;
 }
 GenericFrame;
 
@@ -87,7 +90,7 @@
 
 #define write_syncsafe_int32(x) vfs_fput_be32 (syncsafe32 (x))
 
-static gboolean validate_header (ID3v2Header * header)
+static bool_t validate_header (ID3v2Header * header)
 {
 if (memcmp (header->magic, "ID3", 3))
 return FALSE;
@@ -99,15 +102,15 @@
 
 TAGDBG ("Found ID3v2 header:\n");
 TAGDBG (" magic = %.3s\n", header->magic);
- TAGDBG (" version = %d\n", (gint) header->version);
- TAGDBG (" revision = %d\n", (gint) header->revision);
- TAGDBG (" flags = %x\n", (gint) header->flags);
- TAGDBG (" size = %d\n", (gint) header->size);
+ TAGDBG (" version = %d\n", (int) header->version);
+ TAGDBG (" revision = %d\n", (int) header->revision);
+ TAGDBG (" flags = %x\n", (int) header->flags);
+ TAGDBG (" size = %d\n", (int) header->size);
 return TRUE;
 }
 
-static gboolean read_header (VFSFile * handle, gint * version, gboolean *
- syncsafe, gsize * offset, gint * header_size, gint * data_size)
+static bool_t read_header (VFSFile * handle, int * version, bool_t *
+ syncsafe, gsize * offset, int * header_size, int * data_size)
 {
 ID3v2Header header;
 
@@ -129,17 +132,17 @@
 * syncsafe = (header.flags & ID3_HEADER_SYNCSAFE) ? TRUE : FALSE;
 
 TAGDBG ("Offset = %d, header size = %d, data size = %d\n",
- (gint) * offset, * header_size, * data_size);
+ (int) * offset, * header_size, * data_size);
 
 return TRUE;
 }
 
-static gboolean read_frame (VFSFile * handle, gint max_size, gint version,
- gboolean syncsafe, gint * frame_size, gchar * key, guchar * * data, gint * size)
+static bool_t read_frame (VFSFile * handle, int max_size, int version,
+ bool_t syncsafe, int * frame_size, char * key, unsigned char * * data, int * size)
 {
 ID3v2FrameHeader header;
- gint i;
- guint32 hdrsz = 0;
+ int i;
+ uint32_t hdrsz = 0;
 
 if ((max_size -= sizeof (ID3v2FrameHeader)) < 0)
 return FALSE;
@@ -153,7 +156,7 @@
 
 for (i = 0; i < 3; i++)
 {
- hdrsz |= (guint32) header.size[i] << ((2 - i) * 8);
+ hdrsz |= (uint32_t) header.size[i] << ((2 - i) * 8);
 TAGDBG("header.size[%d] = %d hdrsz %d slot %d\n", i, header.size[i], hdrsz, 2 - i);
 }
 
@@ -163,7 +166,7 @@
 
 TAGDBG ("Found frame:\n");
 TAGDBG (" key = %.3s\n", header.key);
- TAGDBG (" size = %d\n", (gint) hdrsz);
+ TAGDBG (" size = %d\n", (int) hdrsz);
 
 * frame_size = sizeof (ID3v2FrameHeader) + hdrsz;
 sprintf (key, "%.3s", header.key);
@@ -178,18 +181,18 @@
 return TRUE;
 }
 
-static gchar * decode_text_frame (const guchar * data, gint size)
+static char * decode_text_frame (const unsigned char * data, int size)
 {
- return convert_text ((const gchar *) data + 1, size - 1, data[0], FALSE,
+ return convert_text ((const char *) data + 1, size - 1, data[0], FALSE,
 NULL, NULL);
 }
 
-static gboolean decode_comment_frame (const guchar * _data, gint size, gchar * *
- lang, gchar * * type, gchar * * value)
+static bool_t decode_comment_frame (const unsigned char * _data, int size, char * *
+ lang, char * * type, char * * value)
 {
- const gchar * data = (const gchar *) _data;
- gchar * pair, * sep;
- gint converted;
+ const char * data = (const char *) _data;
+ char * pair, * sep;
+ int converted;
 
 pair = convert_text (data + 4, size - 4, data[0], FALSE, & converted, NULL);
 
@@ -204,9 +207,9 @@
 return TRUE;
 }
 
-static gint get_frame_id (const gchar * key)
+static int get_frame_id (const char * key)
 {
- gint id;
+ int id;
 
 for (id = 0; id < ID3_TAGS_NO; id ++)
 {
@@ -217,10 +220,10 @@
 return -1;
 }
 
-static void associate_string (Tuple * tuple, gint field, const gchar *
- customfield, const guchar * data, gint size)
+static void associate_string (Tuple * tuple, int field, const char *
+ customfield, const unsigned char * data, int size)
 {
- gchar * text = decode_text_frame (data, size);
+ char * text = decode_text_frame (data, size);
 
 if (text == NULL || ! text[0])
 {
@@ -233,14 +236,14 @@
 else
 TAGDBG ("Field %i = %s.\n", field, text);
 
- tuple_associate_string (tuple, field, customfield, text);
+ tuple_set_str (tuple, field, customfield, text);
 g_free (text);
 }
 
-static void associate_int (Tuple * tuple, gint field, const gchar *
- customfield, const guchar * data, gint size)
+static void associate_int (Tuple * tuple, int field, const char *
+ customfield, const unsigned char * data, int size)
 {
- gchar * text = decode_text_frame (data, size);
+ char * text = decode_text_frame (data, size);
 
 if (text == NULL || atoi (text) < 1)
 {
@@ -253,13 +256,13 @@
 else
 TAGDBG ("Field %i = %s.\n", field, text);
 
- tuple_associate_int (tuple, field, customfield, atoi (text));
+ tuple_set_int (tuple, field, customfield, atoi (text));
 g_free (text);
 }
 
-static void decode_comment (Tuple * tuple, const guchar * data, gint size)
+static void decode_comment (Tuple * tuple, const unsigned char * data, int size)
 {
- gchar * lang, * type, * value;
+ char * lang, * type, * value;
 
 if (! decode_comment_frame (data, size, & lang, & type, & value))
 return;
@@ -267,45 +270,45 @@
 TAGDBG ("Comment: lang = %s, type = %s, value = %s.\n", lang, type, value);
 
 if (! type[0]) /* blank type == actual comment */
- tuple_associate_string (tuple, FIELD_COMMENT, NULL, value);
+ tuple_set_str (tuple, FIELD_COMMENT, NULL, value);
 
 g_free (lang);
 g_free (type);
 g_free (value);
 }
 
-static void decode_txx (Tuple * tuple, const guchar * data, gint size)
+static void decode_txx (Tuple * tuple, const unsigned char * data, int size)
 {
- gchar * text = decode_text_frame (data, size);
+ char * text = decode_text_frame (data, size);
 
 if (text == NULL)
 return;
 
- gchar *separator = strchr(text, 0);
+ char *separator = strchr(text, 0);
 
 if (separator == NULL)
 return;
 
- gchar * value = separator + 1;
+ char * value = separator + 1;
 TAGDBG ("TXX: %s = %s.\n", text, value);
- tuple_associate_string (tuple, -1, text, value);
+ tuple_set_str (tuple, -1, text, value);
 
 g_free (text);
 }
 
-static gboolean decode_rva_block (const guchar * * _data, gint * _size, gint *
- channel, gint * adjustment, gint * adjustment_unit, gint * peak, gint *
+static bool_t decode_rva_block (const unsigned char * * _data, int * _size, int *
+ channel, int * adjustment, int * adjustment_unit, int * peak, int *
 peak_unit)
 {
- const guchar * data = * _data;
- gint size = * _size;
- gint peak_bits;
+ const unsigned char * data = * _data;
+ int size = * _size;
+ int peak_bits;
 
 if (size < 4)
 return FALSE;
 
 * channel = data[0];
- * adjustment = (gchar) data[1]; /* first byte is signed */
+ * adjustment = (char) data[1]; /* first byte is signed */
 * adjustment = (* adjustment << 8) | data[2];
 * adjustment_unit = 512;
 peak_bits = data[3];
@@ -316,10 +319,10 @@
 TAGDBG ("RVA block: channel = %d, adjustment = %d/%d, peak bits = %d\n",
 * channel, * adjustment, * adjustment_unit, peak_bits);
 
- if (peak_bits > 0 && peak_bits < sizeof (gint) * 8)
+ if (peak_bits > 0 && peak_bits < sizeof (int) * 8)
 {
- gint bytes = (peak_bits + 7) / 8;
- gint count;
+ int bytes = (peak_bits + 7) / 8;
+ int count;
 
 if (bytes > size)
 return FALSE;
@@ -346,15 +349,15 @@
 return TRUE;
 }
 
-static void decode_rva (Tuple * tuple, const guchar * data, gint size)
+static void decode_rva (Tuple * tuple, const unsigned char * data, int size)
 {
- const gchar * domain;
- gint channel, adjustment, adjustment_unit, peak, peak_unit;
+ const char * domain;
+ int channel, adjustment, adjustment_unit, peak, peak_unit;
 
 if (memchr (data, 0, size) == NULL)
 return;
 
- domain = (const gchar *) data;
+ domain = (const char *) data;
 
 TAGDBG ("RVA domain: %s\n", domain);
 
@@ -372,44 +375,44 @@
 
 if (tuple_get_value_type (tuple, FIELD_GAIN_GAIN_UNIT, NULL) ==
 TUPLE_INT)
- adjustment = adjustment * (gint64) tuple_get_int (tuple,
+ adjustment = adjustment * (int64_t) tuple_get_int (tuple,
 FIELD_GAIN_GAIN_UNIT, NULL) / adjustment_unit;
 else
- tuple_associate_int (tuple, FIELD_GAIN_GAIN_UNIT, NULL,
+ tuple_set_int (tuple, FIELD_GAIN_GAIN_UNIT, NULL,
 adjustment_unit);
 
 if (peak_unit)
 {
 if (tuple_get_value_type (tuple, FIELD_GAIN_PEAK_UNIT, NULL) ==
 TUPLE_INT)
- peak = peak * (gint64) tuple_get_int (tuple,
+ peak = peak * (int64_t) tuple_get_int (tuple,
 FIELD_GAIN_PEAK_UNIT, NULL) / peak_unit;
 else
- tuple_associate_int (tuple, FIELD_GAIN_PEAK_UNIT, NULL,
+ tuple_set_int (tuple, FIELD_GAIN_PEAK_UNIT, NULL,
 peak_unit);
 }
 
- if (! strcasecmp (domain, "album"))
+ if (! g_ascii_strcasecmp (domain, "album"))
 {
- tuple_associate_int (tuple, FIELD_GAIN_ALBUM_GAIN, NULL, adjustment);
+ tuple_set_int (tuple, FIELD_GAIN_ALBUM_GAIN, NULL, adjustment);
 
 if (peak_unit)
- tuple_associate_int (tuple, FIELD_GAIN_ALBUM_PEAK, NULL, peak);
+ tuple_set_int (tuple, FIELD_GAIN_ALBUM_PEAK, NULL, peak);
 }
- else if (! strcasecmp (domain, "track"))
+ else if (! g_ascii_strcasecmp (domain, "track"))
 {
- tuple_associate_int (tuple, FIELD_GAIN_TRACK_GAIN, NULL, adjustment);
+ tuple_set_int (tuple, FIELD_GAIN_TRACK_GAIN, NULL, adjustment);
 
 if (peak_unit)
- tuple_associate_int (tuple, FIELD_GAIN_TRACK_PEAK, NULL, peak);
+ tuple_set_int (tuple, FIELD_GAIN_TRACK_PEAK, NULL, peak);
 }
 }
 }
 
-static void decode_genre (Tuple * tuple, const guchar * data, gint size)
+static void decode_genre (Tuple * tuple, const unsigned char * data, int size)
 {
- gint numericgenre;
- gchar * text = decode_text_frame (data, size);
+ int numericgenre;
+ char * text = decode_text_frame (data, size);
 
 if (text == NULL)
 return;
@@ -421,42 +424,43 @@
 
 if (numericgenre > 0)
 {
- tuple_associate_string(tuple, FIELD_GENRE, NULL, convert_numericgenre_to_text(numericgenre));
+ tuple_set_str(tuple, FIELD_GENRE, NULL, convert_numericgenre_to_text(numericgenre));
 return;
 }
- tuple_associate_string(tuple, FIELD_GENRE, NULL, text);
+ tuple_set_str(tuple, FIELD_GENRE, NULL, text);
 g_free (text);
 return;
 }
 
-static gboolean id3v22_can_handle_file (VFSFile * handle)
+static bool_t id3v22_can_handle_file (VFSFile * handle)
 {
- gint version, header_size, data_size;
- gboolean syncsafe;
+ int version, header_size, data_size;
+ bool_t syncsafe;
 gsize offset;
 
 return read_header (handle, & version, & syncsafe, & offset, & header_size,
 & data_size);
 }
 
-gboolean id3v22_read_tag (Tuple * tuple, VFSFile * handle)
+bool_t id3v22_read_tag (Tuple * tuple, VFSFile * handle)
 {
- gint version, header_size, data_size;
- gboolean syncsafe;
+ int version, header_size, data_size;
+ bool_t syncsafe;
 gsize offset;
- gint pos;
+ int pos;
 
 if (! read_header (handle, & version, & syncsafe, & offset, & header_size,
 & data_size))
 return FALSE;
 
- TAGDBG("Reading tags from %i bytes of ID3 data in %s\n", data_size, handle->uri);
+ TAGDBG ("Reading tags from %i bytes of ID3 data in %s\n", data_size,
+ vfs_get_filename (handle));
 
 for (pos = 0; pos < data_size; )
 {
- gint frame_size, size, id;
- gchar key[5];
- guchar * data;
+ int frame_size, size, id;
+ char key[5];
+ unsigned char * data;
 
 if (! read_frame (handle, data_size - pos, version, syncsafe,
 & frame_size, key, & data, & size))
@@ -503,9 +507,6 @@
 case ID3_COMMENT:
 decode_comment (tuple, data, size);
 break;
- case ID3_ENCODER:
- associate_string (tuple, -1, "encoder", data, size);
- break;
 case ID3_TXX:
 decode_txx (tuple, data, size);
 break;
@@ -524,17 +525,17 @@
 return TRUE;
 }
 
-static gboolean parse_pic (const guchar * data, gint size, gchar * * mime,
- gint * type, void * * image_data, gint * image_size)
+static bool_t parse_pic (const unsigned char * data, int size, char * * mime,
+ int * type, void * * image_data, int * image_size)
 {
- const guchar * sep;
- const guchar * after;
+ const unsigned char * sep;
+ const unsigned char * after;
 
 if (size < 2 || (sep = memchr (data + 1, 0, size - 2)) == NULL)
 return FALSE;
 
 after = sep + 2;
- * mime = g_strdup ((const gchar *) data + 1);
+ * mime = g_strdup ((const char *) data + 1);
 * type = sep[1];
 * image_data = g_memdup (after, data + size - after);
 * image_size = data + size - after;
@@ -544,13 +545,13 @@
 return TRUE;
 }
 
-static gboolean id3v22_read_image (VFSFile * handle, void * * image_data, gint *
- image_size)
+static bool_t id3v22_read_image (VFSFile * handle, void * * image_data,
+ int64_t * image_size64)
 {
- gint version, header_size, data_size, parsed;
- gboolean syncsafe;
+ int version, header_size, data_size, parsed, image_size = 0;
+ bool_t syncsafe;
 gsize offset;
- gboolean found = FALSE;
+ bool_t found = FALSE;
 
 if (! read_header (handle, & version, & syncsafe, & offset, & header_size,
 & data_size))
@@ -558,11 +559,11 @@
 
 for (parsed = 0; parsed < data_size && ! found; )
 {
- gint frame_size, size, type;
- gchar key[5];
- guchar * data;
- gchar * mime;
- gint frame_length;
+ int frame_size, size, type;
+ char key[5];
+ unsigned char * data;
+ char * mime;
+ int frame_length;
 
 if (! read_frame (handle, data_size - parsed, version, syncsafe,
 & frame_size, key, & data, & size))
@@ -571,7 +572,7 @@
 frame_length = size;
 
 if (! strcmp (key, "PIC") && parse_pic (data, frame_length, & mime, & type,
- image_data, image_size))
+ image_data, & image_size))
 {
 g_free (mime);
 
@@ -590,10 +591,13 @@
 parsed += frame_size;
 }
 
+ if (found)
+ * image_size64 = image_size;
+
 return found;
 }
 
-static gboolean id3v22_write_tag (const Tuple * tuple, VFSFile * f)
+static bool_t id3v22_write_tag (const Tuple * tuple, VFSFile * f)
 {
 fprintf (stderr, "Writing ID3v2.2 tags is not implemented yet, sorry.\n");
 return FALSE;

audacious-3.1.1.tar.bz2/src/libaudtag/id3/id3v24.c -> audacious-3.2.4.tar.bz2/src/libaudtag/id3/id3v24.c Changed

@@ -20,6 +20,9 @@
 */
 
 #include <glib.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include <libaudcore/audstrings.h>
 
@@ -49,53 +52,53 @@
 ID3_TAGS_NO
 };
 
-static const gchar * id3_frames[ID3_TAGS_NO] = {"TALB","TIT2","TCOM", "TCOP",
+static const char * id3_frames[ID3_TAGS_NO] = {"TALB","TIT2","TCOM", "TCOP",
 "TDAT", "TIME", "TLEN", "TPE1", "TRCK", "TYER","TCON", "COMM", "PRIV", "TSSE",
 "TDRC", "TXXX", "RVA2"};
 
-static const guchar PRIMARY_CLASS_MUSIC[16] = {0xBC, 0x7D, 0x60, 0xD1, 0x23,
+static const unsigned char PRIMARY_CLASS_MUSIC[16] = {0xBC, 0x7D, 0x60, 0xD1, 0x23,
 0xE3, 0xE2, 0x4B, 0x86, 0xA1, 0x48, 0xA4, 0x2A, 0x28, 0x44, 0x1E};
-static const guchar PRIMARY_CLASS_AUDIO[16] = {0x29, 0x0F, 0xCD, 0x01, 0x4E,
+static const unsigned char PRIMARY_CLASS_AUDIO[16] = {0x29, 0x0F, 0xCD, 0x01, 0x4E,
 0xDA, 0x57, 0x41, 0x89, 0x7B, 0x62, 0x75, 0xD5, 0x0C, 0x4F, 0x11};
-static const guchar SECONDARY_CLASS_AUDIOBOOK[16] = {0xEB, 0x6B, 0x23, 0xE0,
+static const unsigned char SECONDARY_CLASS_AUDIOBOOK[16] = {0xEB, 0x6B, 0x23, 0xE0,
 0x81, 0xC2, 0xDE, 0x4E, 0xA3, 0x6D, 0x7A, 0xF7, 0x6A, 0x3D, 0x45, 0xB5};
-static const guchar SECONDARY_CLASS_SPOKENWORD[16] = {0x13, 0x2A, 0x17, 0x3A,
+static const unsigned char SECONDARY_CLASS_SPOKENWORD[16] = {0x13, 0x2A, 0x17, 0x3A,
 0xD9, 0x2B, 0x31, 0x48, 0x83, 0x5B, 0x11, 0x4F, 0x6A, 0x95, 0x94, 0x3F};
-static const guchar SECONDARY_CLASS_NEWS[16] = {0x9B, 0xDB, 0x77, 0x66, 0xA0,
+static const unsigned char SECONDARY_CLASS_NEWS[16] = {0x9B, 0xDB, 0x77, 0x66, 0xA0,
 0xE5, 0x63, 0x40, 0xA1, 0xAD, 0xAC, 0xEB, 0x52, 0x84, 0x0C, 0xF1};
-static const guchar SECONDARY_CLASS_TALKSHOW[16] = {0x67, 0x4A, 0x82, 0x1B,
+static const unsigned char SECONDARY_CLASS_TALKSHOW[16] = {0x67, 0x4A, 0x82, 0x1B,
 0x80, 0x3F, 0x3E, 0x4E, 0x9C, 0xDE, 0xF7, 0x36, 0x1B, 0x0F, 0x5F, 0x1B};
-static const guchar SECONDARY_CLASS_GAMES_CLIP[16] = {0x68, 0x33, 0x03, 0x00,
+static const unsigned char SECONDARY_CLASS_GAMES_CLIP[16] = {0x68, 0x33, 0x03, 0x00,
 0x09, 0x50, 0xC3, 0x4A, 0xA8, 0x20, 0x5D, 0x2D, 0x09, 0xA4, 0xE7, 0xC1};
-static const guchar SECONDARY_CLASS_GAMES_SONG[16] = {0x31, 0xF7, 0x4F, 0xF2,
+static const unsigned char SECONDARY_CLASS_GAMES_SONG[16] = {0x31, 0xF7, 0x4F, 0xF2,
 0xFC, 0x96, 0x0F, 0x4D, 0xA2, 0xF5, 0x5A, 0x34, 0x83, 0x68, 0x2B, 0x1A};
 
 #pragma pack(push) /* must be byte-aligned */
 #pragma pack(1)
 typedef struct
 {
- gchar magic[3];
- guchar version;
- guchar revision;
- guchar flags;
- guint32 size;
+ char magic[3];
+ unsigned char version;
+ unsigned char revision;
+ unsigned char flags;
+ uint32_t size;
 }
 ID3v2Header;
 
 typedef struct
 {
- gchar key[4];
- guint32 size;
- guint16 flags;
+ char key[4];
+ uint32_t size;
+ uint16_t flags;
 }
 ID3v2FrameHeader;
 #pragma pack(pop)
 
 typedef struct
 {
- gchar key[5];
- guchar * data;
- gint size;
+ char key[5];
+ unsigned char * data;
+ int size;
 }
 GenericFrame;
 
@@ -109,16 +112,22 @@
 #define ID3_FRAME_SYNCSAFE 0x0002
 #define ID3_FRAME_HAS_LENGTH 0x0001
 
-static gboolean skip_extended_header_3 (VFSFile * handle, gint * _size)
+/* str_unref() may be a macro */
+static void str_unref_cb (void * str)
 {
- guint32 size;
+ str_unref (str);
+}
+
+static bool_t skip_extended_header_3 (VFSFile * handle, int * _size)
+{
+ uint32_t size;
 
 if (vfs_fread (& size, 1, 4, handle) != 4)
 return FALSE;
 
 size = GUINT32_FROM_BE (size);
 
- TAGDBG ("Found v2.3 extended header, size = %d.\n", (gint) size);
+ TAGDBG ("Found v2.3 extended header, size = %d.\n", (int) size);
 
 if (vfs_fseek (handle, size, SEEK_CUR))
 return FALSE;
@@ -127,16 +136,16 @@
 return TRUE;
 }
 
-static gboolean skip_extended_header_4 (VFSFile * handle, gint * _size)
+static bool_t skip_extended_header_4 (VFSFile * handle, int * _size)
 {
- guint32 size;
+ uint32_t size;
 
 if (vfs_fread (& size, 1, 4, handle) != 4)
 return FALSE;
 
 size = unsyncsafe32 (GUINT32_FROM_BE (size));
 
- TAGDBG ("Found v2.4 extended header, size = %d.\n", (gint) size);
+ TAGDBG ("Found v2.4 extended header, size = %d.\n", (int) size);
 
 if (vfs_fseek (handle, size - 4, SEEK_CUR))
 return FALSE;
@@ -145,7 +154,7 @@
 return TRUE;
 }
 
-static gboolean validate_header (ID3v2Header * header, gboolean is_footer)
+static bool_t validate_header (ID3v2Header * header, bool_t is_footer)
 {
 if (memcmp (header->magic, is_footer ? "3DI" : "ID3", 3))
 return FALSE;
@@ -157,15 +166,15 @@
 
 TAGDBG ("Found ID3v2 %s:\n", is_footer ? "footer" : "header");
 TAGDBG (" magic = %.3s\n", header->magic);
- TAGDBG (" version = %d\n", (gint) header->version);
- TAGDBG (" revision = %d\n", (gint) header->revision);
- TAGDBG (" flags = %x\n", (gint) header->flags);
- TAGDBG (" size = %d\n", (gint) header->size);
+ TAGDBG (" version = %d\n", (int) header->version);
+ TAGDBG (" revision = %d\n", (int) header->revision);
+ TAGDBG (" flags = %x\n", (int) header->flags);
+ TAGDBG (" size = %d\n", (int) header->size);
 return TRUE;
 }
 
-static gboolean read_header (VFSFile * handle, gint * version, gboolean *
- syncsafe, gint64 * offset, gint * header_size, gint * data_size, gint *
+static bool_t read_header (VFSFile * handle, int * version, bool_t *
+ syncsafe, int64_t * offset, int * header_size, int * data_size, int *
 footer_size)
 {
 ID3v2Header header, footer;
@@ -203,7 +212,7 @@
 }
 else
 {
- gint64 end = vfs_fsize (handle);
+ int64_t end = vfs_fsize (handle);
 
 if (end < 0)
 return FALSE;
@@ -239,7 +248,7 @@
 
 if (header.flags & ID3_HEADER_HAS_EXTENDED_HEADER)
 {
- gint extended_size = 0;
+ int extended_size = 0;
 
 if (header.version == 3)
 {
@@ -257,18 +266,18 @@
 }
 
 TAGDBG ("Offset = %d, header size = %d, data size = %d, footer size = "
- "%d.\n", (gint) * offset, * header_size, * data_size, * footer_size);
+ "%d.\n", (int) * offset, * header_size, * data_size, * footer_size);
 
 return TRUE;
 }
 
-static gint unsyncsafe (guchar * data, gint size)
+static int unsyncsafe (unsigned char * data, int size)
 {
- guchar * get = data, * set = data;
+ unsigned char * get = data, * set = data;
 
 while (size --)
 {
- guchar c = * set ++ = * get ++;
+ unsigned char c = * set ++ = * get ++;
 
 if (c == 0xff && size && ! get[0])
 {
@@ -280,11 +289,11 @@
 return set - data;
 }
 
-static gboolean read_frame (VFSFile * handle, gint max_size, gint version,
- gboolean syncsafe, gint * frame_size, gchar * key, guchar * * data, gint * size)
+static bool_t read_frame (VFSFile * handle, int max_size, int version,
+ bool_t syncsafe, int * frame_size, char * key, unsigned char * * data, int * size)
 {
 ID3v2FrameHeader header;
- gint skip = 0;
+ int skip = 0;
 
 if ((max_size -= sizeof (ID3v2FrameHeader)) < 0)
 return FALSE;
@@ -305,8 +314,8 @@
 
 TAGDBG ("Found frame:\n");
 TAGDBG (" key = %.4s\n", header.key);
- TAGDBG (" size = %d\n", (gint) header.size);
- TAGDBG (" flags = %x\n", (gint) header.flags);
+ TAGDBG (" size = %d\n", (int) header.size);
+ TAGDBG (" flags = %x\n", (int) header.flags);
 
 * frame_size = sizeof (ID3v2FrameHeader) + header.size;
 sprintf (key, "%.4s", header.key);
@@ -338,18 +347,18 @@
 return TRUE;
 }
 
-static gchar * decode_text_frame (const guchar * data, gint size)
+static char * decode_text_frame (const unsigned char * data, int size)
 {
- return convert_text ((const gchar *) data + 1, size - 1, data[0], FALSE,
+ return convert_text ((const char *) data + 1, size - 1, data[0], FALSE,
 NULL, NULL);
 }
 
-static gboolean decode_comment_frame (const guchar * _data, gint size, gchar * *
- lang, gchar * * type, gchar * * value)
+static bool_t decode_comment_frame (const unsigned char * _data, int size, char * *
+ lang, char * * type, char * * value)
 {
- const gchar * data = (const gchar *) _data;
- gchar * pair, * sep;
- gint converted;
+ const char * data = (const char *) _data;
+ char * pair, * sep;
+ int converted;
 
 pair = convert_text (data + 4, size - 4, data[0], FALSE, & converted, NULL);
 
@@ -364,22 +373,30 @@
 return TRUE;
 }
 
-static void free_generic_frame (GenericFrame * frame)
+static void free_frame (GenericFrame * frame)
 {
 g_free (frame->data);
 g_free (frame);
 }
 
-static void read_all_frames (VFSFile * handle, gint version, gboolean syncsafe,
- gint data_size, mowgli_patricia_t * dict)
+static void free_frame_list (GList * list)
+{
+ for (GList * node = list; node; node = node->next)
+ free_frame (node->data);
+
+ g_list_free (list);
+}
+
+static void read_all_frames (VFSFile * handle, int version, bool_t syncsafe,
+ int data_size, GHashTable * dict)
 {
- gint pos;
+ int pos;
 
 for (pos = 0; pos < data_size; )
 {
- gint frame_size, size;
- gchar key[5];
- guchar * data;
+ int frame_size, size;
+ char key[5];
+ unsigned char * data;
 GenericFrame * frame;
 
 if (! read_frame (handle, data_size - pos, version, syncsafe,
@@ -388,23 +405,24 @@
 
 pos += frame_size;
 
- if (mowgli_patricia_retrieve (dict, key) != NULL)
- {
- TAGDBG ("Discarding duplicate frame %s.\n", key);
- g_free (data);
- continue;
- }
-
 frame = g_malloc (sizeof (GenericFrame));
 strcpy (frame->key, key);
 frame->data = data;
 frame->size = size;
 
- mowgli_patricia_add (dict, key, frame);
+ void * key2, * list = NULL;
+
+ if (g_hash_table_lookup_extended (dict, key, & key2, & list))
+ g_hash_table_steal (dict, key);
+ else
+ key2 = str_get (key);
+
+ list = g_list_append (list, frame);
+ g_hash_table_insert (dict, key2, list);
 }
 }
 
-static gboolean write_frame (VFSFile * handle, GenericFrame * frame, gint *
+static bool_t write_frame (VFSFile * handle, GenericFrame * frame, int *
 frame_size)
 {
 TAGDBG ("Writing frame %s, size %d\n", frame->key, frame->size);
@@ -429,29 +447,31 @@
 
 typedef struct {
 VFSFile * file;
- gint written_size;
+ int written_size;
 } WriteState;
 
-static gint write_frame_cb (const gchar * key, void * data, void * user)
+static void write_frame_list (void * key, void * list, void * user)
 {
 WriteState * state = user;
- gint size;
- if (! write_frame (state->file, data, & size))
- return -1;
- state->written_size += size;
- return 0;
+
+ for (GList * node = list; node; node = node->next)
+ {
+ int size;
+ if (write_frame (state->file, node->data, & size))
+ state->written_size += size;
+ }
 }
 
-static gint writeAllFramesToFile (VFSFile * fd, mowgli_patricia_t * dict)
+static int write_all_frames (VFSFile * handle, GHashTable * dict)
 {
- WriteState state = {fd, 0};
- mowgli_patricia_foreach (dict, write_frame_cb, & state);
+ WriteState state = {handle, 0};
+ g_hash_table_foreach (dict, write_frame_list, & state);
 
 TAGDBG ("Total frame bytes written = %d.\n", state.written_size);
 return state.written_size;
 }
 
-static gboolean write_header (VFSFile * handle, gint size, gboolean is_footer)
+static bool_t write_header (VFSFile * handle, int size, bool_t is_footer)
 {
 ID3v2Header header;
 
@@ -466,9 +486,9 @@
 (ID3v2Header);
 }
 
-static gint get_frame_id (const gchar * key)
+static int get_frame_id (const char * key)
 {
- gint id;
+ int id;
 
 for (id = 0; id < ID3_TAGS_NO; id ++)
 {
@@ -479,10 +499,10 @@
 return -1;
 }
 
-static void associate_string (Tuple * tuple, gint field, const gchar *
- customfield, const guchar * data, gint size)
+static void associate_string (Tuple * tuple, int field, const char *
+ customfield, const unsigned char * data, int size)
 {
- gchar * text = decode_text_frame (data, size);
+ char * text = decode_text_frame (data, size);
 
 if (text == NULL || ! text[0])
 {
@@ -495,14 +515,14 @@
 else
 TAGDBG ("Field %i = %s.\n", field, text);
 
- tuple_associate_string (tuple, field, customfield, text);
+ tuple_set_str (tuple, field, customfield, text);
 g_free (text);
 }
 
-static void associate_int (Tuple * tuple, gint field, const gchar *
- customfield, const guchar * data, gint size)
+static void associate_int (Tuple * tuple, int field, const char *
+ customfield, const unsigned char * data, int size)
 {
- gchar * text = decode_text_frame (data, size);
+ char * text = decode_text_frame (data, size);
 
 if (text == NULL || atoi (text) < 1)
 {
@@ -515,41 +535,41 @@
 else
 TAGDBG ("Field %i = %s.\n", field, text);
 
- tuple_associate_int (tuple, field, customfield, atoi (text));
+ tuple_set_int (tuple, field, customfield, atoi (text));
 g_free (text);
 }
 
-static void decode_private_info (Tuple * tuple, const guchar * data, gint size)
+static void decode_private_info (Tuple * tuple, const unsigned char * data, int size)
 {
- gchar * text = g_strndup ((const gchar *) data, size);
+ char * text = g_strndup ((const char *) data, size);
 
 if (!strncmp(text, "WM/", 3))
 {
- gchar *separator = strchr(text, 0);
+ char *separator = strchr(text, 0);
 if (separator == NULL)
 goto DONE;
 
- gchar * value = separator + 1;
+ char * value = separator + 1;
 if (!strncmp(text, "WM/MediaClassPrimaryID", 22))
 {
 if (!memcmp(value, PRIMARY_CLASS_MUSIC, 16))
- tuple_associate_string (tuple, -1, "media-class", "Music");
+ tuple_set_str (tuple, -1, "media-class", "Music");
 if (!memcmp(value, PRIMARY_CLASS_AUDIO, 16))
- tuple_associate_string (tuple, -1, "media-class", "Audio (non-music)");
+ tuple_set_str (tuple, -1, "media-class", "Audio (non-music)");
 } else if (!strncmp(text, "WM/MediaClassSecondaryID", 24))
 {
 if (!memcmp(value, SECONDARY_CLASS_AUDIOBOOK, 16))
- tuple_associate_string (tuple, -1, "media-class", "Audio Book");
+ tuple_set_str (tuple, -1, "media-class", "Audio Book");
 if (!memcmp(value, SECONDARY_CLASS_SPOKENWORD, 16))
- tuple_associate_string (tuple, -1, "media-class", "Spoken Word");
+ tuple_set_str (tuple, -1, "media-class", "Spoken Word");
 if (!memcmp(value, SECONDARY_CLASS_NEWS, 16))
- tuple_associate_string (tuple, -1, "media-class", "News");
+ tuple_set_str (tuple, -1, "media-class", "News");
 if (!memcmp(value, SECONDARY_CLASS_TALKSHOW, 16))
- tuple_associate_string (tuple, -1, "media-class", "Talk Show");
+ tuple_set_str (tuple, -1, "media-class", "Talk Show");
 if (!memcmp(value, SECONDARY_CLASS_GAMES_CLIP, 16))
- tuple_associate_string (tuple, -1, "media-class", "Game Audio (clip)");
+ tuple_set_str (tuple, -1, "media-class", "Game Audio (clip)");
 if (!memcmp(value, SECONDARY_CLASS_GAMES_SONG, 16))
- tuple_associate_string (tuple, -1, "media-class", "Game Soundtrack");
+ tuple_set_str (tuple, -1, "media-class", "Game Soundtrack");
 } else {
 TAGDBG("Unrecognised tag %s (Windows Media) ignored\n", text);
 }
@@ -561,9 +581,9 @@
 g_free (text);
 }
 
-static void decode_comment (Tuple * tuple, const guchar * data, gint size)
+static void decode_comment (Tuple * tuple, const unsigned char * data, int size)
 {
- gchar * lang, * type, * value;
+ char * lang, * type, * value;
 
 if (! decode_comment_frame (data, size, & lang, & type, & value))
 return;
@@ -571,45 +591,26 @@
 TAGDBG ("Comment: lang = %s, type = %s, value = %s.\n", lang, type, value);
 
 if (! type[0]) /* blank type == actual comment */
- tuple_associate_string (tuple, FIELD_COMMENT, NULL, value);
+ tuple_set_str (tuple, FIELD_COMMENT, NULL, value);
 
 g_free (lang);
 g_free (type);
 g_free (value);
 }
 
-static void decode_txxx (Tuple * tuple, const guchar * data, gint size)
-{
- gchar * text = decode_text_frame (data, size);
-
- if (text == NULL)
- return;
-
- gchar *separator = strchr(text, 0);
-
- if (separator == NULL)
- return;
-
- gchar * value = separator + 1;
- TAGDBG ("TXXX: %s = %s.\n", text, value);
- tuple_associate_string (tuple, -1, text, value);
-
- g_free (text);
-}
-
-static gboolean decode_rva2_block (const guchar * * _data, gint * _size, gint *
- channel, gint * adjustment, gint * adjustment_unit, gint * peak, gint *
+static bool_t decode_rva2_block (const unsigned char * * _data, int * _size, int *
+ channel, int * adjustment, int * adjustment_unit, int * peak, int *
 peak_unit)
 {
- const guchar * data = * _data;
- gint size = * _size;
- gint peak_bits;
+ const unsigned char * data = * _data;
+ int size = * _size;
+ int peak_bits;
 
 if (size < 4)
 return FALSE;
 
 * channel = data[0];
- * adjustment = (gchar) data[1]; /* first byte is signed */
+ * adjustment = (char) data[1]; /* first byte is signed */
 * adjustment = (* adjustment << 8) | data[2];
 * adjustment_unit = 512;
 peak_bits = data[3];
@@ -620,10 +621,10 @@
 TAGDBG ("RVA2 block: channel = %d, adjustment = %d/%d, peak bits = %d\n",
 * channel, * adjustment, * adjustment_unit, peak_bits);
 
- if (peak_bits > 0 && peak_bits < sizeof (gint) * 8)
+ if (peak_bits > 0 && peak_bits < sizeof (int) * 8)
 {
- gint bytes = (peak_bits + 7) / 8;
- gint count;
+ int bytes = (peak_bits + 7) / 8;
+ int count;
 
 if (bytes > size)
 return FALSE;
@@ -650,15 +651,15 @@
 return TRUE;
 }
 
-static void decode_rva2 (Tuple * tuple, const guchar * data, gint size)
+static void decode_rva2 (Tuple * tuple, const unsigned char * data, int size)
 {
- const gchar * domain;
- gint channel, adjustment, adjustment_unit, peak, peak_unit;
+ const char * domain;
+ int channel, adjustment, adjustment_unit, peak, peak_unit;
 
 if (memchr (data, 0, size) == NULL)
 return;
 
- domain = (const gchar *) data;
+ domain = (const char *) data;
 
 TAGDBG ("RVA2 domain: %s\n", domain);
 
@@ -676,44 +677,44 @@
 
 if (tuple_get_value_type (tuple, FIELD_GAIN_GAIN_UNIT, NULL) ==
 TUPLE_INT)
- adjustment = adjustment * (gint64) tuple_get_int (tuple,
+ adjustment = adjustment * (int64_t) tuple_get_int (tuple,
 FIELD_GAIN_GAIN_UNIT, NULL) / adjustment_unit;
 else
- tuple_associate_int (tuple, FIELD_GAIN_GAIN_UNIT, NULL,
+ tuple_set_int (tuple, FIELD_GAIN_GAIN_UNIT, NULL,
 adjustment_unit);
 
 if (peak_unit)
 {
 if (tuple_get_value_type (tuple, FIELD_GAIN_PEAK_UNIT, NULL) ==
 TUPLE_INT)
- peak = peak * (gint64) tuple_get_int (tuple,
+ peak = peak * (int64_t) tuple_get_int (tuple,
 FIELD_GAIN_PEAK_UNIT, NULL) / peak_unit;
 else
- tuple_associate_int (tuple, FIELD_GAIN_PEAK_UNIT, NULL,
+ tuple_set_int (tuple, FIELD_GAIN_PEAK_UNIT, NULL,
 peak_unit);
 }
 
- if (! strcasecmp (domain, "album"))
+ if (! g_ascii_strcasecmp (domain, "album"))
 {
- tuple_associate_int (tuple, FIELD_GAIN_ALBUM_GAIN, NULL, adjustment);
+ tuple_set_int (tuple, FIELD_GAIN_ALBUM_GAIN, NULL, adjustment);
 
 if (peak_unit)
- tuple_associate_int (tuple, FIELD_GAIN_ALBUM_PEAK, NULL, peak);
+ tuple_set_int (tuple, FIELD_GAIN_ALBUM_PEAK, NULL, peak);
 }
- else if (! strcasecmp (domain, "track"))
+ else if (! g_ascii_strcasecmp (domain, "track"))
 {
- tuple_associate_int (tuple, FIELD_GAIN_TRACK_GAIN, NULL, adjustment);
+ tuple_set_int (tuple, FIELD_GAIN_TRACK_GAIN, NULL, adjustment);
 
 if (peak_unit)
- tuple_associate_int (tuple, FIELD_GAIN_TRACK_PEAK, NULL, peak);
+ tuple_set_int (tuple, FIELD_GAIN_TRACK_PEAK, NULL, peak);
 }
 }
 }
 
-static void decode_genre (Tuple * tuple, const guchar * data, gint size)
+static void decode_genre (Tuple * tuple, const unsigned char * data, int size)
 {
- gint numericgenre;
- gchar * text = decode_text_frame (data, size);
+ int numericgenre;
+ char * text = decode_text_frame (data, size);
 
 if (text == NULL)
 return;
@@ -724,47 +725,37 @@
 numericgenre = atoi (text);
 
 if (numericgenre > 0)
- tuple_associate_string (tuple, FIELD_GENRE, NULL,
+ tuple_set_str (tuple, FIELD_GENRE, NULL,
 convert_numericgenre_to_text (numericgenre));
 else
- tuple_associate_string (tuple, FIELD_GENRE, NULL, text);
+ tuple_set_str (tuple, FIELD_GENRE, NULL, text);
 
 g_free (text);
 return;
 }
 
-static GenericFrame * add_generic_frame (gint id, gint size,
- mowgli_patricia_t * dict)
+static GenericFrame * add_generic_frame (int id, int size,
+ GHashTable * dict)
 {
- GenericFrame * frame = mowgli_patricia_retrieve (dict, id3_frames[id]);
-
- if (frame == NULL)
- {
- frame = g_malloc (sizeof (GenericFrame));
- strcpy (frame->key, id3_frames[id]);
- mowgli_patricia_add (dict, frame->key, frame);
- }
- else
- g_free (frame->data);
+ GenericFrame * frame = g_malloc (sizeof (GenericFrame));
 
+ strcpy (frame->key, id3_frames[id]);
 frame->data = g_malloc (size);
 frame->size = size;
+
+ GList * list = g_list_append (NULL, frame);
+ g_hash_table_insert (dict, str_get (id3_frames[id]), list);
+
 return frame;
 }
 
-static void remove_frame (gint id, mowgli_patricia_t * dict)
+static void remove_frame (int id, GHashTable * dict)
 {
- GenericFrame * frame = mowgli_patricia_retrieve (dict, id3_frames[id]);
- if (frame == NULL)
- return;
-
 TAGDBG ("Deleting frame %s.\n", id3_frames[id]);
- mowgli_patricia_delete (dict, id3_frames[id]);
- free_generic_frame (frame);
+ g_hash_table_remove (dict, id3_frames[id]);
 }
 
-static void add_text_frame (gint id, const gchar * text, mowgli_patricia_t *
- dict)
+static void add_text_frame (int id, const char * text, GHashTable * dict)
 {
 if (text == NULL)
 {
@@ -773,14 +764,14 @@
 }
 
 TAGDBG ("Adding text frame %s = %s.\n", id3_frames[id], text);
- gint length = strlen (text);
+ int length = strlen (text);
 
 GenericFrame * frame = add_generic_frame (id, length + 1, dict);
 frame->data[0] = 3; /* UTF-8 encoding */
 memcpy (frame->data + 1, text, length);
 }
 
-static void add_comment_frame (const gchar * text, mowgli_patricia_t * dict)
+static void add_comment_frame (const char * text, GHashTable * dict)
 {
 if (text == NULL)
 {
@@ -789,22 +780,24 @@
 }
 
 TAGDBG ("Adding comment frame = %s.\n", text);
- gint length = strlen (text);
+ int length = strlen (text);
 GenericFrame * frame = add_generic_frame (ID3_COMMENT, length + 5, dict);
 
 frame->data[0] = 3; /* UTF-8 encoding */
- strcpy ((gchar *) frame->data + 1, "eng"); /* well, it *might* be English */
+ strcpy ((char *) frame->data + 1, "eng"); /* well, it *might* be English */
 memcpy (frame->data + 5, text, length);
 }
 
-static void add_frameFromTupleStr (const Tuple * tuple, gint field, gint
- id3_field, mowgli_patricia_t * dict)
+static void add_frameFromTupleStr (const Tuple * tuple, int field, int
+ id3_field, GHashTable * dict)
 {
- add_text_frame (id3_field, tuple_get_string (tuple, field, NULL), dict);
+ char * str = tuple_get_str (tuple, field, NULL);
+ add_text_frame (id3_field, str, dict);
+ str_unref (str);
 }
 
-static void add_frameFromTupleInt (const Tuple * tuple, gint field, gint
- id3_field, mowgli_patricia_t * dict)
+static void add_frameFromTupleInt (const Tuple * tuple, int field, int
+ id3_field, GHashTable * dict)
 {
 if (tuple_get_value_type (tuple, field, NULL) != TUPLE_INT)
 {
@@ -812,27 +805,27 @@
 return;
 }
 
- gchar scratch[16];
+ char scratch[16];
 snprintf (scratch, sizeof scratch, "%d", tuple_get_int (tuple, field, NULL));
 add_text_frame (id3_field, scratch, dict);
 }
 
-static gboolean id3v24_can_handle_file (VFSFile * handle)
+static bool_t id3v24_can_handle_file (VFSFile * handle)
 {
- gint version, header_size, data_size, footer_size;
- gboolean syncsafe;
- gint64 offset;
+ int version, header_size, data_size, footer_size;
+ bool_t syncsafe;
+ int64_t offset;
 
 return read_header (handle, & version, & syncsafe, & offset, & header_size,
 & data_size, & footer_size);
 }
 
-static gboolean id3v24_read_tag (Tuple * tuple, VFSFile * handle)
+static bool_t id3v24_read_tag (Tuple * tuple, VFSFile * handle)
 {
- gint version, header_size, data_size, footer_size;
- gboolean syncsafe;
- gint64 offset;
- gint pos;
+ int version, header_size, data_size, footer_size;
+ bool_t syncsafe;
+ int64_t offset;
+ int pos;
 
 if (! read_header (handle, & version, & syncsafe, & offset, & header_size,
 & data_size, & footer_size))
@@ -840,9 +833,9 @@
 
 for (pos = 0; pos < data_size; )
 {
- gint frame_size, size, id;
- gchar key[5];
- guchar * data;
+ int frame_size, size, id;
+ char key[5];
+ unsigned char * data;
 
 if (! read_frame (handle, data_size - pos, version, syncsafe,
 & frame_size, key, & data, & size))
@@ -892,12 +885,6 @@
 case ID3_PRIVATE:
 decode_private_info (tuple, data, size);
 break;
- case ID3_ENCODER:
- associate_string (tuple, -1, "encoder", data, size);
- break;
- case ID3_TXXX:
- decode_txxx (tuple, data, size);
- break;
 case ID3_RVA2:
 decode_rva2 (tuple, data, size);
 break;
@@ -913,11 +900,11 @@
 return TRUE;
 }
 
-static gboolean parse_apic (const guchar * _data, gint size, gchar * * mime,
- gint * type, gchar * * desc, void * * image_data, gint * image_size)
+static bool_t parse_apic (const unsigned char * _data, int size, char * * mime,
+ int * type, char * * desc, void * * image_data, int * image_size)
 {
- const gchar * data = (const gchar *) _data;
- const gchar * sep, * after;
+ const char * data = (const char *) _data;
+ const char * sep, * after;
 
 if (size < 2 || (sep = memchr (data + 1, 0, size - 2)) == NULL)
 return FALSE;
@@ -936,13 +923,13 @@
 return TRUE;
 }
 
-static gboolean id3v24_read_image (VFSFile * handle, void * * image_data, gint *
- image_size)
+static bool_t id3v24_read_image (VFSFile * handle, void * * image_data,
+ int64_t * image_size64)
 {
- gint version, header_size, data_size, footer_size, parsed;
- gboolean syncsafe;
- gint64 offset;
- gboolean found = FALSE;
+ int version, header_size, data_size, footer_size, parsed, image_size = 0;
+ bool_t syncsafe;
+ int64_t offset;
+ bool_t found = FALSE;
 
 if (! read_header (handle, & version, & syncsafe, & offset, & header_size,
 & data_size, & footer_size))
@@ -950,17 +937,17 @@
 
 for (parsed = 0; parsed < data_size && ! found; )
 {
- gint frame_size, size, type;
- gchar key[5];
- guchar * data;
- gchar * mime, * desc;
+ int frame_size, size, type;
+ char key[5];
+ unsigned char * data;
+ char * mime, * desc;
 
 if (! read_frame (handle, data_size - parsed, version, syncsafe,
 & frame_size, key, & data, & size))
 break;
 
 if (! strcmp (key, "APIC") && parse_apic (data, size, & mime, & type,
- & desc, image_data, image_size))
+ & desc, image_data, & image_size))
 {
 g_free (mime);
 g_free (desc);
@@ -980,26 +967,25 @@
 parsed += frame_size;
 }
 
- return found;
-}
+ if (found)
+ * image_size64 = image_size;
 
-static void free_frame_cb (const gchar * key, void * data, void * unused)
-{
- free_generic_frame (data);
+ return found;
 }
 
-static gboolean id3v24_write_tag (const Tuple * tuple, VFSFile * f)
+static bool_t id3v24_write_tag (const Tuple * tuple, VFSFile * f)
 {
- gint version, header_size, data_size, footer_size;
- gboolean syncsafe;
- gint64 offset;
+ int version, header_size, data_size, footer_size;
+ bool_t syncsafe;
+ int64_t offset;
 
 if (! read_header (f, & version, & syncsafe, & offset, & header_size,
 & data_size, & footer_size))
 return FALSE;
 
 //read all frames into generic frames;
- mowgli_patricia_t * dict = mowgli_patricia_create (NULL);
+ GHashTable * dict = g_hash_table_new_full (g_str_hash, g_str_equal,
+ str_unref_cb, (GDestroyNotify) free_frame_list);
 read_all_frames (f, version, syncsafe, data_size, dict);
 
 //make the new frames from tuple and replace in the dictionary the old frames with the new ones
@@ -1009,7 +995,10 @@
 add_frameFromTupleInt (tuple, FIELD_YEAR, ID3_YEAR, dict);
 add_frameFromTupleInt (tuple, FIELD_TRACK_NUMBER, ID3_TRACKNR, dict);
 add_frameFromTupleStr (tuple, FIELD_GENRE, ID3_GENRE, dict);
- add_comment_frame (tuple_get_string (tuple, FIELD_COMMENT, NULL), dict);
+
+ char * comment = tuple_get_str (tuple, FIELD_COMMENT, NULL);
+ add_comment_frame (comment, dict);
+ str_unref (comment);
 
 if (! offset)
 {
@@ -1030,17 +1019,17 @@
 FALSE))
 goto ERR;
 
- data_size = writeAllFramesToFile (f, dict);
+ data_size = write_all_frames (f, dict);
 
 if (! write_header (f, data_size, TRUE) || vfs_fseek (f, offset, SEEK_SET)
 || ! write_header (f, data_size, FALSE))
 goto ERR;
 
- mowgli_patricia_destroy (dict, free_frame_cb, NULL);
+ g_hash_table_destroy (dict);
 return TRUE;
 
 ERR:
- mowgli_patricia_destroy (dict, free_frame_cb, NULL);
+ g_hash_table_destroy (dict);
 return FALSE;
 }

audacious-3.1.1.tar.bz2/src/libaudtag/tag_module.c -> audacious-3.2.4.tar.bz2/src/libaudtag/tag_module.c Changed

@@ -19,31 +19,27 @@
 */
 
 #include <glib.h>
+#include <stdio.h>
+
 #include <libaudcore/tuple.h>
 #include <libaudcore/vfs.h>
 
 #include "audtag.h"
 #include "util.h"
 #include "tag_module.h"
-#include "wma/module.h"
 #include "id3/id3v1.h"
 #include "id3/id3v22.h"
 #include "id3/id3v24.h"
 #include "ape/ape.h"
-/* #include "aac/aac.h" */
 
-void init_tag_modules(void)
-{
- mowgli_node_add((void *)&id3v24, &id3v24.node, &tag_modules);
- mowgli_node_add((void *)&id3v22, &id3v22.node, &tag_modules);
- mowgli_node_add((void *)&ape, &ape.node, &tag_modules);
- mowgli_node_add((void *)&id3v1, &id3v1.node, &tag_modules);
-}
+static tag_module_t * const modules[] = {& id3v24, & id3v22, & ape, & id3v1};
+#define N_MODULES (sizeof modules / sizeof modules[0])
 
-tag_module_t * find_tag_module (VFSFile * fd, gint new_type)
+tag_module_t * find_tag_module (VFSFile * fd, int new_type)
 {
- mowgli_node_t *mod, *tmod;
- MOWGLI_LIST_FOREACH_SAFE(mod, tmod, tag_modules.head)
+ int i;
+
+ for (i = 0; i < N_MODULES; i ++)
 {
 if (vfs_fseek(fd, 0, SEEK_SET))
 {
@@ -51,21 +47,20 @@
 return NULL;
 }
 
- if (((tag_module_t *) mod->data)->can_handle_file (fd))
+ if (modules[i]->can_handle_file (fd))
 {
- TAGDBG ("Module %s accepted file.\n", ((tag_module_t *)
- mod->data)->name);
- return mod->data;
+ TAGDBG ("Module %s accepted file.\n", modules[i]->name);
+ return modules[i];
 }
 }
 
 /* No existing tag; see if we can create a new one. */
 if (new_type != TAG_TYPE_NONE)
 {
- MOWGLI_LIST_FOREACH_SAFE (mod, tmod, tag_modules.head)
+ for (i = 0; i < N_MODULES; i ++)
 {
- if (((tag_module_t *) (mod->data))->type == new_type)
- return mod->data;
+ if (modules[i]->type == new_type)
+ return modules[i];
 }
 }

audacious-3.1.1.tar.bz2/src/libaudtag/tag_module.h -> audacious-3.2.4.tar.bz2/src/libaudtag/tag_module.h Changed

@@ -23,32 +23,20 @@
 #ifndef TAG_MODULE_H
 #define TAG_MODULE_H
 
-G_BEGIN_DECLS
-
-#include <glib.h>
-#include <mowgli.h>
 #include "libaudcore/tuple.h"
 #include "libaudcore/vfs.h"
 
-mowgli_list_t tag_modules;
-int number_of_modules;
 typedef Tuple* pTuple;
 
 typedef struct _module {
- gchar *name;
- gint type; /* set to TAG_TYPE_NONE if the module cannot create new tags */
- gboolean(*can_handle_file) (VFSFile *fd);
- gboolean (* read_tag) (Tuple * tuple, VFSFile * handle);
- gboolean (* read_image) (VFSFile * handle, void * * data, gint * size);
- gboolean (* write_tag) (const Tuple * tuple, VFSFile * handle);
-
- mowgli_node_t node;
+ char *name;
+ int type; /* set to TAG_TYPE_NONE if the module cannot create new tags */
+ bool_t(*can_handle_file) (VFSFile *fd);
+ bool_t (* read_tag) (Tuple * tuple, VFSFile * handle);
+ bool_t (* read_image) (VFSFile * handle, void * * data, int64_t * size);
+ bool_t (* write_tag) (const Tuple * tuple, VFSFile * handle);
 } tag_module_t;
 
-/* this function must be modified when including new modules */
-void init_tag_modules(void);
-
-tag_module_t * find_tag_module (VFSFile * handle, gint new_type);
+tag_module_t * find_tag_module (VFSFile * handle, int new_type);
 
-G_END_DECLS
 #endif /* TAG_MODULE_H */

audacious-3.1.1.tar.bz2/src/libaudtag/util.c -> audacious-3.2.4.tar.bz2/src/libaudtag/util.c Changed

@@ -19,114 +19,30 @@
 */
 
 #include <glib.h>
+#include <stdio.h>
+
 #include "util.h"
 #include <inttypes.h>
 
 /* convert windows time to unix time */
-time_t unix_time(guint64 win_time)
+time_t unix_time(uint64_t win_time)
 {
- guint64 t = (guint64) ((win_time / 10000000LL) - 11644473600LL);
+ uint64_t t = (uint64_t) ((win_time / 10000000LL) - 11644473600LL);
 return (time_t) t;
 }
 
-guint16 get_year(guint64 win_time)
+uint16_t get_year(uint64_t win_time)
 {
 GDate *d = g_date_new();
 g_date_set_time_t(d, unix_time(win_time));
- guint16 year = g_date_get_year(d);
+ uint16_t year = g_date_get_year(d);
 g_date_free(d);
 return year;
 }
 
-Tuple *makeTuple(Tuple * tuple, const gchar * title, const gchar * artist, const gchar * comment, const gchar * album, const gchar * genre, const gchar * year, const gchar * filePath, int tracnr)
-{
-
- tuple_associate_string(tuple, FIELD_ARTIST, NULL, artist);
- tuple_associate_string(tuple, FIELD_TITLE, NULL, title);
- tuple_associate_string(tuple, FIELD_COMMENT, NULL, comment);
- tuple_associate_string(tuple, FIELD_ALBUM, NULL, album);
- tuple_associate_string(tuple, FIELD_GENRE, NULL, genre);
- tuple_associate_string(tuple, FIELD_YEAR, NULL, year);
- tuple_associate_int(tuple, FIELD_TRACK_NUMBER, NULL, tracnr);
- tuple_associate_string(tuple, FIELD_FILE_PATH, NULL, filePath);
- return tuple;
-}
-
-const gchar *get_complete_filepath(Tuple * tuple)
-{
- const gchar *filepath;
- const gchar *dir;
- const gchar *file;
-
- dir = tuple_get_string(tuple, FIELD_FILE_PATH, NULL);
- file = tuple_get_string(tuple, FIELD_FILE_NAME, NULL);
- filepath = g_strdup_printf("%s/%s", dir, file);
- TAGDBG("file path = %s\n", filepath);
- return filepath;
-}
-
-void print_tuple(Tuple * tuple)
-{
-#if WMA_DEBUG
- TAGDBG("--------------TUPLE PRINT --------------------\n");
- const gchar *title = tuple_get_string(tuple, FIELD_TITLE, NULL);
- TAGDBG("title = %s\n", title);
- /* artist */
- const gchar *artist = tuple_get_string(tuple, FIELD_ARTIST, NULL);
- TAGDBG("artist = %s\n", artist);
-
- /* copyright */
- const gchar *copyright = tuple_get_string(tuple, FIELD_COPYRIGHT, NULL);
- TAGDBG("copyright = %s\n", copyright);
-
- /* comment / description */
-
- const gchar *comment = tuple_get_string(tuple, FIELD_COMMENT, NULL);
- TAGDBG("comment = %s\n", comment);
-
- /* codec name */
- const gchar *codec_name = tuple_get_string(tuple, FIELD_CODEC, NULL);
- TAGDBG("codec = %s\n", codec_name);
-
- /* album */
- const gchar *album = tuple_get_string(tuple, FIELD_ALBUM, NULL);
- TAGDBG("Album = %s\n", album);
-
- /*track number */
- gint track_nr = tuple_get_int(tuple, FIELD_TRACK_NUMBER, NULL);
- TAGDBG("Track nr = %d\n", track_nr);
-
- /* genre */
- const gchar *genre = tuple_get_string(tuple, FIELD_GENRE, NULL);
- TAGDBG("Genre = %s \n", genre);
-
- /* length */
- gint length = tuple_get_int(tuple, FIELD_LENGTH, NULL);
- TAGDBG("Length = %d\n", length);
-
- /* year */
- gint year = tuple_get_int(tuple, FIELD_YEAR, NULL);
- TAGDBG("Year = %d\n", year);
-
- /* quality */
- const gchar *quality = tuple_get_string(tuple, FIELD_QUALITY, NULL);
- TAGDBG("quality = %s\n", quality);
-
- /* path */
- const gchar *path = tuple_get_string(tuple, FIELD_FILE_PATH, NULL);
- TAGDBG("path = %s\n", path);
-
- /* filename */
- const gchar *filename = tuple_get_string(tuple, FIELD_FILE_NAME, NULL);
- TAGDBG("filename = %s\n", filename);
-
- TAGDBG("-----------------END---------------------\n");
-#endif
-}
-
-gchar * read_char_data (VFSFile * file, int size)
+char * read_char_data (VFSFile * file, int size)
 {
- gchar * value = g_malloc (size + 1);
+ char * value = g_malloc (size + 1);
 if (vfs_fread (value, 1, size, file) < size)
 {
 g_free (value);
@@ -136,39 +52,14 @@
 return value;
 }
 
-gboolean write_char_data(VFSFile * f, gchar * data, size_t i)
-{
- return (vfs_fwrite(data, i, 1, f) == i);
-}
-
-gchar *utf8(gunichar2 * s)
-{
- g_return_val_if_fail(s != NULL, NULL);
- return g_utf16_to_utf8(s, -1, NULL, NULL, NULL);
-}
-
-gunichar2 *fread_utf16(VFSFile * f, guint64 size)
-{
- gunichar2 *p = (gunichar2 *) g_malloc0(size);
- if (vfs_fread(p, 1, size, f) != size)
- {
- g_free(p);
- p = NULL;
- }
- gchar *s = utf8(p);
- TAGDBG("Converted to UTF8: '%s'\n", s);
- g_free(s);
- return p;
-}
-
-gboolean write_utf16(VFSFile * f, gunichar2 * data, size_t i)
+bool_t write_char_data(VFSFile * f, char * data, size_t i)
 {
 return (vfs_fwrite(data, i, 1, f) == i);
 }
 
-guint8 read_uint8(VFSFile * fd)
+uint8_t read_uint8(VFSFile * fd)
 {
- guint16 i;
+ uint16_t i;
 if (vfs_fread(&i, 1, 1, fd) == 1)
 {
 return i;
@@ -176,92 +67,92 @@
 return -1;
 }
 
-guint16 read_LEuint16(VFSFile * fd)
+uint16_t read_LEuint16(VFSFile * fd)
 {
- guint16 a;
+ uint16_t a;
 if (vfs_fget_le16(&a, fd))
 return a;
 else
 return -1;
 }
 
-guint16 read_BEuint16(VFSFile * fd)
+uint16_t read_BEuint16(VFSFile * fd)
 {
- guint16 a;
+ uint16_t a;
 if (vfs_fget_be16(&a, fd))
 return a;
 else
 return -1;
 }
 
-guint32 read_LEuint32(VFSFile * fd)
+uint32_t read_LEuint32(VFSFile * fd)
 {
- guint32 a;
+ uint32_t a;
 if (vfs_fget_le32(&a, fd))
 return a;
 else
 return -1;
 }
 
-guint32 read_BEuint32(VFSFile * fd)
+uint32_t read_BEuint32(VFSFile * fd)
 {
- guint32 a;
+ uint32_t a;
 if (vfs_fget_be32(&a, fd))
 return a;
 else
 return -1;
 }
 
-guint64 read_LEuint64(VFSFile * fd)
+uint64_t read_LEuint64(VFSFile * fd)
 {
- guint64 a;
+ uint64_t a;
 if (vfs_fget_le64(&a, fd))
 return a;
 else
 return -1;
 }
 
-guint64 read_BEuint64(VFSFile * fd)
+uint64_t read_BEuint64(VFSFile * fd)
 {
- guint64 a;
+ uint64_t a;
 if (vfs_fget_be64(&a, fd))
 return a;
 else
 return 1;
 }
 
-gboolean write_uint8(VFSFile * fd, guint8 val)
+bool_t write_uint8(VFSFile * fd, uint8_t val)
 {
 return (vfs_fwrite(&val, 1, 1, fd) == 1);
 }
 
-gboolean write_LEuint16(VFSFile * fd, guint16 val)
+bool_t write_LEuint16(VFSFile * fd, uint16_t val)
 {
- guint16 le_val = GUINT32_TO_LE(val);
+ uint16_t le_val = GUINT32_TO_LE(val);
 return (vfs_fwrite(&le_val, 2, 1, fd) == 2);
 }
 
-gboolean write_BEuint32(VFSFile * fd, guint32 val)
+bool_t write_BEuint32(VFSFile * fd, uint32_t val)
 {
- guint32 be_val = GUINT32_TO_BE(val);
+ uint32_t be_val = GUINT32_TO_BE(val);
 return (vfs_fwrite(&be_val, 4, 1, fd) == 4);
 }
 
-gboolean write_LEuint32(VFSFile * fd, guint32 val)
+bool_t write_LEuint32(VFSFile * fd, uint32_t val)
 {
- guint32 le_val = GUINT32_TO_LE(val);
+ uint32_t le_val = GUINT32_TO_LE(val);
 return (vfs_fwrite(&le_val, 4, 1, fd) == 4);
 }
 
-gboolean write_LEuint64(VFSFile * fd, guint64 val)
+bool_t write_LEuint64(VFSFile * fd, uint64_t val)
 {
- guint64 le_val = GUINT64_TO_LE(val);
+ uint64_t le_val = GUINT64_TO_LE(val);
 return (vfs_fwrite(&le_val, 8, 1, fd) == 8);
 }
 
-gboolean cut_beginning_tag (VFSFile * handle, gsize tag_size)
+bool_t cut_beginning_tag (VFSFile * handle, int64_t tag_size)
 {
- guchar buffer[16384];
+ unsigned char buffer[16384];
 gsize offset = 0, readed;
 
 if (! tag_size)
@@ -287,12 +178,12 @@
 return vfs_ftruncate (handle, offset) == 0;
 }
 
-gchar *convert_numericgenre_to_text(gint numericgenre)
+char *convert_numericgenre_to_text(int numericgenre)
 {
 const struct
 {
- gint numericgenre;
- gchar *genre;
+ int numericgenre;
+ char *genre;
 }
 table[] =
 {
@@ -423,7 +314,7 @@
 {GENRE_EURO_HOUSE, "Euro-House"},
 };
 
- gint count;
+ int count;
 
 for (count = 0; count < G_N_ELEMENTS(table); count++)
 {
@@ -436,13 +327,13 @@
 return "Unknown";
 }
 
-guint32 unsyncsafe32 (guint32 x)
+uint32_t unsyncsafe32 (uint32_t x)
 {
 return (x & 0x7f) | ((x & 0x7f00) >> 1) | ((x & 0x7f0000) >> 2) | ((x &
 0x7f000000) >> 3);
 }
 
-guint32 syncsafe32 (guint32 x)
+uint32_t syncsafe32 (uint32_t x)
 {
 return (x & 0x7f) | ((x & 0x3f80) << 1) | ((x & 0x1fc000) << 2) | ((x &
 0xfe00000) << 3);

audacious-3.1.1.tar.bz2/src/libaudtag/util.h -> audacious-3.2.4.tar.bz2/src/libaudtag/util.h Changed

@@ -22,7 +22,8 @@
 
 #define TAGUTIL_H
 
-#include <glib.h>
+#include <stdint.h>
+#include <time.h>
 
 #include "libaudcore/tuple.h"
 #include "libaudcore/vfs.h"
@@ -157,53 +158,40 @@
 GENRE_EURO_HOUSE
 };
 
-extern gboolean tag_verbose;
+extern bool_t tag_verbose;
 
 #define TAGDBG(...) do {if (tag_verbose) {printf ("%s:%d [%s]: ", __FILE__, __LINE__, __FUNCTION__); printf (__VA_ARGS__);}} while (0)
 
-time_t unix_time(guint64 win_time);
+time_t unix_time(uint64_t win_time);
 
-guint16 get_year(guint64 win_time);
+uint16_t get_year(uint64_t win_time);
 
-void print_tuple(Tuple *tuple);
+char *read_char_data(VFSFile *fd, int size);
+bool_t write_char_data(VFSFile *f, char *data, size_t i);
 
-//Tuple *makeTuple(Tuple *tuple, const gchar* title, const gchar* artist,
-// const gchar* comment, const gchar* album,
-// const gchar * genre, const gchar* year,
-// const gchar* filePath, int tracnr);
+uint8_t read_uint8(VFSFile *fd);
+uint16_t read_LEuint16(VFSFile *fd);
+uint16_t read_BEuint16(VFSFile *fd);
+uint32_t read_LEuint32(VFSFile *fd);
+uint32_t read_BEuint32(VFSFile *fd);
+uint64_t read_LEuint64(VFSFile *fd);
+uint64_t read_BEuint64(VFSFile *fd);
 
-gchar *utf8(gunichar2* s);
-const gchar* get_complete_filepath(Tuple *tuple);
 
-gchar *read_char_data(VFSFile *fd, int size);
-gboolean write_char_data(VFSFile *f, gchar *data, size_t i);
+bool_t write_uint8(VFSFile *fd, uint8_t val);
+bool_t write_BEuint16(VFSFile *fd, uint16_t val);
+bool_t write_LEuint16(VFSFile *fd, uint16_t val);
+bool_t write_BEuint32(VFSFile *fd, uint32_t val);
+bool_t write_LEuint32(VFSFile *fd, uint32_t val);
+bool_t write_BEuint64(VFSFile *fd, uint64_t val);
+bool_t write_LEuint64(VFSFile *fd, uint64_t val);
 
-gunichar2 *fread_utf16(VFSFile* f, guint64 size);
-gboolean write_utf16(VFSFile *f, gunichar2 *data, size_t i);
+uint64_t read_LEint64(VFSFile *fd);
+bool_t cut_beginning_tag (VFSFile * handle, int64_t tag_size);
 
-guint8 read_uint8(VFSFile *fd);
-guint16 read_LEuint16(VFSFile *fd);
-guint16 read_BEuint16(VFSFile *fd);
-guint32 read_LEuint32(VFSFile *fd);
-guint32 read_BEuint32(VFSFile *fd);
-guint64 read_LEuint64(VFSFile *fd);
-guint64 read_BEuint64(VFSFile *fd);
+char *convert_numericgenre_to_text(int numericgenre);
 
-
-gboolean write_uint8(VFSFile *fd, guint8 val);
-gboolean write_BEuint16(VFSFile *fd, guint16 val);
-gboolean write_LEuint16(VFSFile *fd, guint16 val);
-gboolean write_BEuint32(VFSFile *fd, guint32 val);
-gboolean write_LEuint32(VFSFile *fd, guint32 val);
-gboolean write_BEuint64(VFSFile *fd, guint64 val);
-gboolean write_LEuint64(VFSFile *fd, guint64 val);
-
-guint64 read_LEint64(VFSFile *fd);
-gboolean cut_beginning_tag (VFSFile * handle, gsize tag_size);
-
-gchar *convert_numericgenre_to_text(gint numericgenre);
-
-guint32 unsyncsafe32 (guint32 x);
-guint32 syncsafe32 (guint32 x);
+uint32_t unsyncsafe32 (uint32_t x);
+uint32_t syncsafe32 (uint32_t x);
 
 #endif

audacious-3.1.1.tar.bz2/src/libeggsmclient/Makefile -> audacious-3.2.4.tar.bz2/src/libeggsmclient/Makefile Changed

audacious-3.1.1.tar.bz2/src/libeggsmclient/eggdesktopfile.c -> audacious-3.2.4.tar.bz2/src/libeggsmclient/eggdesktopfile.c Changed

@@ -185,6 +185,9 @@
 	{
 	  g_set_error (error, EGG_DESKTOP_FILE_ERROR,
 		       EGG_DESKTOP_FILE_ERROR_INVALID,
+		       /* translators: 'Version' is from a desktop file, and
+			* should not be translated. '%s' would probably be a
+			* version number. */
 		       _("Unrecognized desktop file Version '%s'"), version);
 	  g_free (version);
 	  g_key_file_free (key_file);
@@ -201,8 +204,11 @@
   else
     desktop_file->source = g_strdup (source);
 
-  desktop_file->name = g_key_file_get_string (key_file, EGG_DESKTOP_FILE_GROUP,
-					      EGG_DESKTOP_FILE_KEY_NAME, error);
+  desktop_file->name = g_key_file_get_locale_string (key_file,
+						     EGG_DESKTOP_FILE_GROUP,
+						     EGG_DESKTOP_FILE_KEY_NAME,
+						     NULL,
+						     error);
   if (!desktop_file->name)
     {
       egg_desktop_file_free (desktop_file);
@@ -919,6 +925,7 @@
   return TRUE;
 }
 
+#if GTK_CHECK_VERSION (2, 12, 0)
 static char *
 start_startup_notification (GdkDisplay     *display,
 			    EggDesktopFile *desktop_file,
@@ -1029,6 +1036,7 @@
   g_timeout_add_seconds (EGG_DESKTOP_FILE_SN_TIMEOUT_LENGTH,
 			 startup_notification_timeout, sn_data);
 }
+#endif /* GTK 2.12 */
 
 static GPtrArray *
 array_putenv (GPtrArray *env, char *variable)
@@ -1215,6 +1223,7 @@
 	}
       g_free (command);
 
+#if GTK_CHECK_VERSION (2, 12, 0)
       startup_id = start_startup_notification (display, desktop_file,
 					       argv[0], screen_num,
 					       workspace, launch_time);
@@ -1225,6 +1234,9 @@
 	  env = array_putenv (env, startup_id_env);
 	  g_free (startup_id_env);
 	}
+#else
+      startup_id = NULL;
+#endif /* GTK 2.12 */
 
       if (env != NULL)
 	g_ptr_array_add (env, NULL);
@@ -1242,6 +1254,7 @@
 
       if (startup_id)
 	{
+#if GTK_CHECK_VERSION (2, 12, 0)
 	  if (current_success)
 	    {
 	      set_startup_notification_timeout (display, startup_id);
@@ -1252,6 +1265,7 @@
 		g_free (startup_id);
 	    }
 	  else
+#endif /* GTK 2.12 */
 	    g_free (startup_id);
 	}
       else if (ret_startup_id)
@@ -1372,9 +1386,11 @@
 	{
 	  g_set_error (error, EGG_DESKTOP_FILE_ERROR,
 		       EGG_DESKTOP_FILE_ERROR_NOT_LAUNCHABLE,
+		       /* translators: The 'Type=Link' string is found in a
+			* desktop file, and should not be translated. */
 		       _("Can't pass document URIs to a 'Type=Link' desktop entry"));
 	  return FALSE;
-	}
+	}	  
 
       if (!parse_link (desktop_file, &app_desktop_file, &documents, error))
 	return FALSE;
@@ -1493,10 +1509,10 @@
 
 /**
  * egg_get_desktop_file:
- *
+ * 
  * Gets the application's #EggDesktopFile, as set by
  * egg_set_desktop_file().
- *
+ * 
  * Return value: the #EggDesktopFile, or %NULL if it hasn't been set.
  **/
 EggDesktopFile *

audacious-3.1.1.tar.bz2/src/libeggsmclient/eggsmclient-xsmp.c -> audacious-3.2.4.tar.bz2/src/libeggsmclient/eggsmclient-xsmp.c Changed

@@ -193,6 +193,11 @@
 EggSMClient *
 egg_sm_client_xsmp_new (void)
 {
+#if GTK_CHECK_VERSION(3,0,0)
+  if (!GDK_IS_X11_DISPLAY_MANAGER (gdk_display_manager_get ()))
+    return NULL;
+#endif
+
   if (!g_getenv ("SESSION_MANAGER"))
     return NULL;
 
@@ -227,7 +232,7 @@
 
       if (xsmp->restart_style == SmRestartIfRunning)
 	{
-	  if (egg_desktop_file_get_boolean (desktop_file,
+	  if (egg_desktop_file_get_boolean (desktop_file, 
 					    "X-GNOME-AutoRestart", NULL))
 	    xsmp->restart_style = SmRestartImmediately;
 	}
@@ -367,11 +372,13 @@
       xsmp->client_id = g_strdup (ret_client_id);
       free (ret_client_id);
 
-#if !GTK_CHECK_VERSION(2,91,7) && !GTK_CHECK_VERSION(3,0,0)
+      gdk_threads_enter ();
+#if !GTK_CHECK_VERSION(2,23,3) && !GTK_CHECK_VERSION(3,0,0)
       gdk_set_sm_client_id (xsmp->client_id);
 #else
       gdk_x11_set_sm_client_id (xsmp->client_id);
 #endif
+      gdk_threads_leave ();
 
       g_debug ("Got client ID \"%s\"", xsmp->client_id);
     }
@@ -539,6 +546,8 @@
   EggSMClientXSMP *xsmp = data;
   EggSMClient *client = data;
 
+  gdk_threads_enter ();
+
   xsmp->idle = 0;
 
   if (xsmp->waiting_to_emit_quit)
@@ -562,6 +571,7 @@
     }
 
  out:
+  gdk_threads_leave ();
   return FALSE;
 }
 
@@ -1131,7 +1141,7 @@
  * until you're done with the SmProp.
  */
 static SmProp *
-array_prop (const char *name, ...)
+array_prop (const char *name, ...) 
 {
   SmProp *prop;
   SmPropValue pv;
@@ -1282,7 +1292,9 @@
 {
   IceProcessMessagesStatus status;
 
+  gdk_threads_enter ();
   status = IceProcessMessages (ice_conn, NULL, NULL);
+  gdk_threads_leave ();
 
   switch (status)
     {
@@ -1347,13 +1359,13 @@
 		   IcePointer    values)
 {
   /* Do nothing */
-}
+} 
 
 static void
 ice_io_error_handler (IceConn ice_conn)
 {
   /* Do nothing */
-}
+} 
 
 static void
 smc_error_handler (SmcConn       smc_conn,

Build Results
RPM Lint

Refresh

Comments for request 260 0

Request History

seife created request over 11 years ago

update to current version 3.2.4, needed for current plugins to fix build on 12.2

mrdocs accepted request over 12 years ago

Looks sane to me