[Pkg-cli-apps-commits] [SCM] banshee branch, experimental, updated. debian/1.9.0-1-10-g93a69ad
Iain Lane
laney at ubuntu.com
Sun Dec 19 20:34:31 UTC 2010
The following commit has been merged in the experimental branch:
commit 1daf2e65c947357eeb6ff45ddc73d93860ab88fe
Author: Iain Lane <laney at ubuntu.com>
Date: Wed Dec 15 19:13:02 2010 +0000
Imported Upstream version 1.9.1
diff --git a/AUTHORS b/AUTHORS
index 470d6ea..d506023 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -19,6 +19,7 @@ Contributors:
Andrew Conkling
Andrés G. Aragoneses
Andy Midgette
+ Aran Cox
Arthur Carli
Arun Raghavan
Aurélien Mino
@@ -117,7 +118,7 @@ Contributors:
Nicolò Chieffo
Nils Naumann
Oben Sonne
- Olivier Duff
+ Olivier Dufour
Oscar Forero
Pacho Ramos
Patrick van Staveren
@@ -132,8 +133,10 @@ Contributors:
Raimo Radczewski
Robin Stocker
Roderich Schupp
+ Rodney Dawes
Romain Tartière
Ruben Vermeersch
+ Samuel Gyger
Sandy Armstrong
Scott Peterson
Sebastian Dröge
@@ -147,6 +150,7 @@ Contributors:
Trey Ethridge
Valentin Sawadski
Will Farrington
+ William Friesen
William Pettersson
Wouter Bolsterlee
Zhou Ting
diff --git a/ChangeLog b/ChangeLog
index cb03048..8c3a4e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
-2010-11-21 The Banshee Project <http://banshee.fm>
+2010-12-15 The Banshee Project <http://banshee.fm>
- Banshee 1.9.0
+ Banshee 1.9.1
You probably are looking for the useful change summary detailed
in the NEWS file, perfect for downstream maintainers.
diff --git a/Makefile.in b/Makefile.in
index 6bf0230..fab717d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
install-sh ltmain.sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -229,6 +231,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -248,6 +252,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -355,6 +361,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -401,7 +409,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/NEWS b/NEWS
index 3dde191..ed24b3c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,5 @@
===============================================================================
-WELCOME TO BANSHEE 1.9.0 - Released November 10, 2010
+WELCOME TO BANSHEE 1.9.1 - Released December 15, 2010
===============================================================================
* Banshee is a multimedia management and playback application for GNOME.
@@ -8,80 +8,56 @@ WELCOME TO BANSHEE 1.9.0 - Released November 10, 2010
and video podcasts. Sync your Android, iPod, and other devices. We think
you'll love the new Banshee!"
- * Learn More: http://banshee.fm/download/archives/1.9.0
+ * Learn More: http://banshee.fm/download/archives/1.9.1
===============================================================================
NEW AWESOME FEATURES AND ENHANCEMENTS
===============================================================================
- Banshee 1.9.0 is a development release, the first of the 1.9.x series
+ Banshee 1.9.1 is a development release, the second of the 1.9.x series
leading up to Banshee 2.0.
- New Features Since 1.8.0:
+ New Features Since 1.9.0:
- * Artist/Album Browser Track Actions
+ * Ubuntu One Music Store and SoundMenu Extensions
- Track actions (play, queue, remove, delete, edit, properties)
- now work for the artist and album browser too! Right click an
- artist or album to act on it, or click an album and press 'q' to
- queue it.
+ These two extensions have been moved from Banshee Community
+ Extensions and are now core Banshee extensions.
- * 'Play After' Queue Options
+ * Subtitles
- Want to listen to a track, album, or artist right after the playing
- track, album, or artist? The 'Play After' option will insert it
- into the queue to make it happen.
-
- * User Interface Improvements
-
- We have made several changes toward a cleaner and more usable UI.
- We got rid of the active source's title bar. Search is now beside
- the volume button. The source list has smaller icons, hidden
- counts for the libraries, and named group-separators. The seek
- slider and search entry are resizable via their grips.
-
- Podcasts episodes are now shown in a grid, with several lines of
- description shown to help you find an appealing episode to enjoy.
+ Added support for embedded and external subtitles.
Enhancements:
- * Album grid has tooltips for ellipsized text
- * Subscribe to Internet Archive searches as podcasts
- * MusicBrainz cover art search supports CDBaby and Jamendo
- * Support Huawei Ideos Android phones
-
- Notable Bugs Fixed (51 fixed since 1.8.0):
-
- * Remove unused Mono.Addins.Gui dependency
- * Fix checkbox hover prelight in Fixup
- * Always grab search entry focus on ctrl+f
- * [TrackEditor] Don't try to load metadata over HTTP
- * [AppleDevice] Add a matching 'StopSync' call. We had an unmatched StartSync call which meant that the Sync dialog would be displayed forever.
- * bgo#587936: [AppleDevice] Sync the Sort* fields
- * bgo#631172: [AppleDevice] Fix podcast support
- * bgo#540503: Remove Jump... from context menu
- * bgo#540525: Stop when the playing track is deleted
- * bgo#545998: Sensitize and pluralize podcast actions appropriately
- * bgo#609463: Equalizer distortion
- * bgo#620010: Displaying random image for "All Albums"
- * bgo#623441: Duplicates on import due to character encoding
- * bgo#624734: Allow editing Radio stations again
- * bgo#629005: Full-screen on multi-head displays
- * bgo#629534: TaskStatusIcon missing-ctor crash
- * bgo#630039: Concatenated and untranslatable string
- * bgo#631277: Crash in when editing some tracks' metadata
- * bgo#631687: Non-local tracks added to DAP without extensions
- * bgo#631961: [Gio] Invalid cast exception
- * bgo#632114: Hang when replaying video
- * bgo#632246: Missing-ctor issue in SourceComboBox
- * bgo#632420: [Booter] Use the MeeGo client if appropriate
- * bgo#632715: [Bookmarks] UI not getting loaded
- * bgo#633579: Fixup not getting reloaded correctly
- * bgo#633764: [Dap] not transcoding some files when we should
- * bgo#633841: Recognize webm as video
- * bgo#634096: Empty track # in filename patterns
- * bnc#642505: Insecure LD_LIBRARY_PATH
+ * Massively rework the podcast edit dialog
+ * Let line wrap in properties table
+ * Add 'Podcast Properties' to episode menu
+ * Show context menu even for 'All' filters
+ * Only show tabs if there is more than one
+ * Make Play/Pause action tooltip only show play or pause
+ * Add support for the LG Ally phone
+ * Add dbus method to clear the play queue
+ * Allow to clear the play queue while in Populate mode
+ * Add back podcast browser
+ * Add a new 'Recently Played' default smart playlist
+ * Remember sources' column configuration
+ * Blank track editor spin buttons when 0
+ * Remove Home and Photo folder import sources
+
+ Notable Bugs Fixed (79 fixed since 1.9.0):
+
+ * bgo#637202: Initialize the ipod each time we load
+ * bgo#630209: Fix podcast flag for video podcasts
+ * bgo#635780: Prevent GroupSources from being selected
+ * bgo#540394: Don't overwrite existing files when ripping
+ * bgo#635776: Ensure karma-sharp's DLLmap is copied in the build
+ * bgo#634662: Make search entry in MeeGo panel correctly show query
+ * bgo#634686: Fix streaming broken after first play
+ * bgo#635426: Ensure track filter actions updated
+ * bgo#635453: Fix regression with importing mkv
+ * bgo#608778: 'Random by' skips user-selected artist/album
===============================================================================
SOURCES / PACKAGES
@@ -90,10 +66,10 @@ SOURCES / PACKAGES
Sources
-------
- * Banshee 1.9.0 Tarballs:
- http://download.banshee.fm/banshee/unstable/1.9.0/banshee-1-1.9.0.tar.bz2
- http://download.banshee.fm/banshee/unstable/1.9.0/banshee-1-1.9.0.tar.gz
- * http://download.banshee.fm/banshee/unstable/1.9.0/banshee-1-1.9.0.sha256sum
+ * Banshee 1.9.1 Tarballs:
+ http://download.banshee.fm/banshee/unstable/1.9.1/banshee-1-1.9.1.tar.bz2
+ http://download.banshee.fm/banshee/unstable/1.9.1/banshee-1-1.9.1.tar.gz
+ * http://download.banshee.fm/banshee/unstable/1.9.1/banshee-1-1.9.1.sha256sum
Packages
--------
@@ -119,7 +95,7 @@ DEPENDENCIES
* Mono 1.9.1 (.NET 2.0 Profile / gmcs)
* SQlite 3.4
* Gtk# 2.12
- * GStreamer 0.10.12
+ * GStreamer 0.10.23
* NDesk DBus (ndesk-dbus) 0.5
* NDesk DBus GLib (ndesk-dbus-glib) 0.3
@@ -180,7 +156,7 @@ REPORT BUGS - HELP THE PROJECT - GROW THE COMMUNITY
hesitate to file bugs!
* http://banshee.fm/contribute/file-bugs
- * http://bugzilla.gnome.org/enter_bug.cgi?product=banshee&version=1.9.0
+ * http://bugzilla.gnome.org/enter_bug.cgi?product=banshee&version=1.9.1
===============================================================================
@@ -193,18 +169,16 @@ Contributors For This Release
The following people directly contributed to the release of this version
of Banshee. Without their help, there would be no release!
- Aaron Bockover, Alan McGovern, Alex Launi, Alexander Kojevnikov,
- Andreas Nilsson, Andrés G. Aragoneses, Aurélien Mino, Bertrand Lorentz,
- Dougal Stanton, Gabriel Burt, Ghislain Lacroix, Kentaro KAZUHAMA,
- Michał Sawicz, Pete Johanson, Raimo Radczewski, Tim Fisken, Zhou Ting
+ Aaron Bockover, Alex Launi, Alexander Kojevnikov, Aran Cox,
+ Bertrand Lorentz, David Nielsen, Gabriel Burt, Iain Lane, Olivier Dufour,
+ Raimo Radczewski, Rodney Dawes, Samuel Gyger, William Friesen, Zhou Ting
The following people contributed updated translations to this release.
Without them, our project's reach would be much more limited.
- Andrej Žnidaršič, Benjamín Valero Espinosa, Carles Ferrando,
- Daniel Nylander, Inaki Larranaga Murgoitio, Joe Hansen, Jorge González,
- Kjartan Maraas, Mario Blättermann, Matej Urbančič, Maxim V. Dziumanenko,
- Michael Kotsarinis, Petr Kovar, Takayuki KUSANO, Χάρης Κουζινόπουλος
+ Andrej Žnidaršič, Aron Xu, Benjamín Valero Espinosa, Bruno Brouard,
+ Fran Dieguez, Gabor Kelemen, Inaki Larranaga Murgoitio, Jordi Mas,
+ Jorge González, Michael Kotsarinis, Petr Kovar, Sira Nokyoongtong
Contributors In Past Releases
-----------------------------
@@ -213,35 +187,37 @@ Contributors In Past Releases
Alex Mauer, Alexander Hixon, Alexander Kojevnikov, Alexandros Frantzis,
Alp Toker, Anders Petersson, Andrea Cimitan, Andreas Neustifter,
Andreas Nilsson, Andrew Conkling, Andrés G. Aragoneses, Andy Midgette,
- Arthur Carli, Arun Raghavan, Aurélien Mino, Aydemir Ulaş Şahin,
- Ben Maurer, Benjamín Valero Espinosa, Bertrand Lorentz, Bill Dawson,
- Bob Copeland, Bojan Rajkovic, Brad Taylor, Brandon Perry, Brian Lucas,
- Brian Nickel, Brian Teague, Chow Loong Jin, Chris Howie, Chris Jones,
- Chris Lahey, Chris Toshok, Chris Turchin, Christian Hergert,
- Christian Krause, Christoph Burgdorf, Christopher James Halse Rogers,
- Claude Paroz, Cody Russell, Cosmin Banu, Dan Wilson, Dan Winship,
- Daniel Munkton, Daniel Siegel, David Nielsen, David Spreen, David Stone,
- Diego E. Pettenò, Dougal Stanton, Eitan Isaacson, Elena Grassi,
- Eoin Hennessy, Eric Butler, Erik Schmidt, Fabian Jost,
- Felipe Almeida Lessa, Fernando Casanova, Florent Thoumie, Fredrik Hedberg,
- Félix Velasco, Gabriel Burt, Garrett LeSage, Ghislain Lacroix,
- Götz Waschk, Haitao Feng, Hans Petter Jansson, Harold Schreckengost,
- Iain Lane, Igor Guerrero Fonseca, Ilya Konstantinov, Ivan N. Zlatev,
- Jack Deslippe, Jakub Steiner, James Willcox, Jan Arne Petersen,
- Jason Conti, Jason Taylor, Jeff Tickle, Jeff Wheeler, Jensen Somers,
- Jeroen Budts, Jo Shields, Johannes Kuhn, John Millikin, Jordi Mas,
- Jorge Castro, Julien Moutte, Juri Pakaste, Ján Sokoly, Jérémie Laval,
- K. Vishnoo Charan Reddy, Ken Vandine, Kentaro KAZUHAMA, Kevin Duffus,
- Konstantin Oshiyko, Larry Ewing, Lauri Kotilainen, Lukas Lipka, Marijn Ros,
- Matt Enright, Michael Kaiser, Michael Martin-Smucker, Michael Monreal,
- Michael Monreal, Michał Sawicz, Miguel de Icaza, Mike Gemünde,
- Mike Urbanski, Moritz Schallaböck, Nathan Palmer, Neil Loknath,
- Nicholas Doyle, Nicholas Parker, Nicolò Chieffo, Nils Naumann, Oben Sonne,
- Olivier Duff, Oscar Forero, Pacho Ramos, Patrick van Staveren, Paul Cutler,
- Paul Lange, Pavel Antonov, Pepijn van de Geer, Pete Johanson,
- Peter de Kraker, Pratik Patel, Przemysław Grzegorczyk, Raimo Radczewski,
- Robin Stocker, Roderich Schupp, Romain Tartière, Ruben Vermeersch,
- Ryan Collier, Sandy Armstrong, Scott Peterson, Sebastian Dröge,
+ Aran Cox, Arthur Carli, Arun Raghavan, Aurélien Mino,
+ Aydemir Ulaş Şahin, Ben Maurer, Benjamín Valero Espinosa,
+ Bertrand Lorentz, Bill Dawson, Bob Copeland, Bojan Rajkovic, Brad Taylor,
+ Brandon Perry, Brian Lucas, Brian Nickel, Brian Teague, Chow Loong Jin,
+ Chris Howie, Chris Jones, Chris Lahey, Chris Toshok, Chris Turchin,
+ Christian Hergert, Christian Krause, Christoph Burgdorf,
+ Christopher James Halse Rogers, Claude Paroz, Cody Russell, Cosmin Banu,
+ Dan Wilson, Dan Winship, Daniel Munkton, Daniel Siegel, David Nielsen,
+ David Spreen, David Stone, Diego E. Pettenò, Dougal Stanton,
+ Eitan Isaacson, Elena Grassi, Eoin Hennessy, Eric Butler, Erik Schmidt,
+ Fabian Jost, Felipe Almeida Lessa, Fernando Casanova, Florent Thoumie,
+ Fredrik Hedberg, Félix Velasco, Gabriel Burt, Garrett LeSage,
+ Ghislain Lacroix, Götz Waschk, Haitao Feng, Hans Petter Jansson,
+ Harold Schreckengost, Iain Lane, Igor Guerrero Fonseca, Ilya Konstantinov,
+ Ivan N. Zlatev, Jack Deslippe, Jakub Steiner, James Willcox,
+ Jan Arne Petersen, Jason Conti, Jason Taylor, Jeff Tickle, Jeff Wheeler,
+ Jensen Somers, Jeroen Budts, Jo Shields, Johannes Kuhn, John Millikin,
+ Jordi Mas, Jorge Castro, Julien Moutte, Juri Pakaste, Ján Sokoly,
+ Jérémie Laval, K. Vishnoo Charan Reddy, Ken Vandine, Kentaro KAZUHAMA,
+ Kevin Duffus, Konstantin Oshiyko, Larry Ewing, Lauri Kotilainen,
+ Lukas Lipka, Marijn Ros, Matt Enright, Michael Kaiser,
+ Michael Martin-Smucker, Michael Monreal, Michael Monreal, Michał Sawicz,
+ Miguel de Icaza, Mike Gemünde, Mike Urbanski, Moritz Schallaböck,
+ Nathan Palmer, Neil Loknath, Nicholas Doyle, Nicholas Parker,
+ Nicolò Chieffo, Nils Naumann, Oben Sonne, Olivier Dufour, Oscar Forero,
+ Pacho Ramos, Patrick van Staveren, Paul Cutler, Paul Lange, Pavel Antonov,
+ Pepijn van de Geer, Pete Johanson, Peter de Kraker, Pratik Patel,
+ Przemysław Grzegorczyk, Raimo Radczewski, Robin Stocker, Roderich Schupp,
+ Rodney Dawes, Romain Tartière, Ruben Vermeersch, Ryan Collier,
+ Samuel Gyger, Sandy Armstrong, Scott Peterson, Sebastian Dröge,
Shaun McCance, Tim Fisken, Tim Yamin, Tobias Mueller, Todd Berman,
Travis Glenn Hansen, Travis Reitter, Trey Ethridge, Valentin Sawadski,
- Will Farrington, William Pettersson, Wouter Bolsterlee, Zhou Ting
+ Will Farrington, William Friesen, William Pettersson, Wouter Bolsterlee,
+ Zhou Ting
diff --git a/aclocal.m4 b/aclocal.m4
index d96df47..8176de8 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
-[m4_warning([this file was generated for autoconf 2.67.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
+[m4_warning([this file was generated for autoconf 2.68.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
@@ -906,7 +906,8 @@ AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+# Inc.
# Written by Gordon Matzigkeit, 1996
#
# This file is free software; the Free Software Foundation gives
@@ -915,7 +916,8 @@ AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
m4_define([_LT_COPYING], [dnl
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+# Inc.
# Written by Gordon Matzigkeit, 1996
#
# This file is part of GNU Libtool.
@@ -942,7 +944,7 @@ m4_define([_LT_COPYING], [dnl
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
])
-# serial 56 LT_INIT
+# serial 57 LT_INIT
# LT_PREREQ(VERSION)
@@ -971,6 +973,7 @@ esac
# ------------------
AC_DEFUN([LT_INIT],
[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
+AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
AC_BEFORE([$0], [LT_LANG])dnl
AC_BEFORE([$0], [LT_OUTPUT])dnl
AC_BEFORE([$0], [LTDL_INIT])dnl
@@ -987,6 +990,8 @@ AC_REQUIRE([LTVERSION_VERSION])dnl
AC_REQUIRE([LTOBSOLETE_VERSION])dnl
m4_require([_LT_PROG_LTMAIN])dnl
+_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
+
dnl Parse OPTIONS
_LT_SET_OPTIONS([$0], [$1])
@@ -1023,7 +1028,7 @@ m4_defun([_LT_CC_BASENAME],
*) break;;
esac
done
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
])
@@ -1043,6 +1048,9 @@ m4_defun([_LT_FILEUTILS_DEFAULTS],
m4_defun([_LT_SETUP],
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+
_LT_DECL([], [host_alias], [0], [The host system])dnl
_LT_DECL([], [host], [0])dnl
_LT_DECL([], [host_os], [0])dnl
@@ -1084,7 +1092,6 @@ fi
_LT_CHECK_OBJDIR
m4_require([_LT_TAG_COMPILER])dnl
-_LT_PROG_ECHO_BACKSLASH
case $host_os in
aix3*)
@@ -1098,23 +1105,6 @@ aix3*)
;;
esac
-# Sed substitution that helps us do robust quoting. It backslashifies
-# metacharacters that are still active within double-quoted strings.
-sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\([["`\\]]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
# Global variables:
ofile=libtool
can_build_shared=yes
@@ -1155,6 +1145,28 @@ _LT_CONFIG_COMMANDS
])# _LT_SETUP
+# _LT_PREPARE_SED_QUOTE_VARS
+# --------------------------
+# Define a few sed substitution that help us do robust quoting.
+m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
+[# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+])
+
# _LT_PROG_LTMAIN
# ---------------
# Note that this code is called both from `configure', and `config.status'
@@ -1307,7 +1319,7 @@ m4_define([_lt_decl_all_varnames],
# declaration there will have the same value as in `configure'. VARNAME
# must have a single quote delimited value for this to work.
m4_define([_LT_CONFIG_STATUS_DECLARE],
-[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
+[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
# _LT_CONFIG_STATUS_DECLARATIONS
@@ -1317,7 +1329,7 @@ m4_define([_LT_CONFIG_STATUS_DECLARE],
# embedded single quotes properly. In configure, this macro expands
# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
#
-# <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
+# <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
[m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
@@ -1416,12 +1428,20 @@ LTCC='$LTCC'
LTCFLAGS='$LTCFLAGS'
compiler='$compiler_DEFAULT'
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+ eval 'cat <<_LTECHO_EOF
+\$[]1
+_LTECHO_EOF'
+}
+
# Quote evaled strings.
for var in lt_decl_all_varnames([[ \
]], lt_decl_quote_varnames); do
- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[[\\\\\\\`\\"\\\$]]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -1432,9 +1452,9 @@ done
# Double-quote double-evaled strings.
for var in lt_decl_all_varnames([[ \
]], lt_decl_dquote_varnames); do
- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[[\\\\\\\`\\"\\\$]]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -1442,16 +1462,38 @@ for var in lt_decl_all_varnames([[ \
esac
done
-# Fix-up fallback echo if it was mangled by the above quoting rules.
-case \$lt_ECHO in
-*'\\\[$]0 --fallback-echo"')dnl "
- lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
- ;;
-esac
-
_LT_OUTPUT_LIBTOOL_INIT
])
+# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
+# ------------------------------------
+# Generate a child script FILE with all initialization necessary to
+# reuse the environment learned by the parent script, and make the
+# file executable. If COMMENT is supplied, it is inserted after the
+# `#!' sequence but before initialization text begins. After this
+# macro, additional text can be appended to FILE to form the body of
+# the child script. The macro ends with non-zero status if the
+# file could not be fully written (such as if the disk is full).
+m4_ifdef([AS_INIT_GENERATED],
+[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
+[m4_defun([_LT_GENERATED_FILE_INIT],
+[m4_require([AS_PREPARE])]dnl
+[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
+[lt_write_fail=0
+cat >$1 <<_ASEOF || lt_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+$2
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$1 <<\_ASEOF || lt_write_fail=1
+AS_SHELL_SANITIZE
+_AS_PREPARE
+exec AS_MESSAGE_FD>&1
+_ASEOF
+test $lt_write_fail = 0 && chmod +x $1[]dnl
+m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
# LT_OUTPUT
# ---------
@@ -1461,20 +1503,11 @@ _LT_OUTPUT_LIBTOOL_INIT
AC_DEFUN([LT_OUTPUT],
[: ${CONFIG_LT=./config.lt}
AC_MSG_NOTICE([creating $CONFIG_LT])
-cat >"$CONFIG_LT" <<_LTEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate a libtool stub with the current configuration.
-
-lt_cl_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_LTEOF
+_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
+[# Run this file to recreate a libtool stub with the current configuration.])
cat >>"$CONFIG_LT" <<\_LTEOF
-AS_SHELL_SANITIZE
-_AS_PREPARE
-
-exec AS_MESSAGE_FD>&1
+lt_cl_silent=false
exec AS_MESSAGE_LOG_FD>>config.log
{
echo
@@ -1500,7 +1533,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
configured by $[0], generated by m4_PACKAGE_STRING.
-Copyright (C) 2008 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
This config.lt script is free software; the Free Software Foundation
gives unlimited permision to copy, distribute and modify it."
@@ -1545,15 +1578,13 @@ chmod +x "$CONFIG_LT"
# appending to config.log, which fails on DOS, as config.log is still kept
# open by configure. Here we exec the FD to /dev/null, effectively closing
# config.log, so it can be properly (re)opened and appended to by config.lt.
-if test "$no_create" != yes; then
- lt_cl_success=:
- test "$silent" = yes &&
- lt_config_lt_args="$lt_config_lt_args --quiet"
- exec AS_MESSAGE_LOG_FD>/dev/null
- $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
- exec AS_MESSAGE_LOG_FD>>config.log
- $lt_cl_success || AS_EXIT(1)
-fi
+lt_cl_success=:
+test "$silent" = yes &&
+ lt_config_lt_args="$lt_config_lt_args --quiet"
+exec AS_MESSAGE_LOG_FD>/dev/null
+$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
+exec AS_MESSAGE_LOG_FD>>config.log
+$lt_cl_success || AS_EXIT(1)
])# LT_OUTPUT
@@ -1730,11 +1761,13 @@ AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
+AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
dnl aclocal-1.4 backwards compatibility:
dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
dnl AC_DEFUN([AC_LIBTOOL_F77], [])
dnl AC_DEFUN([AC_LIBTOOL_FC], [])
dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
+dnl AC_DEFUN([AC_LIBTOOL_RC], [])
# _LT_TAG_COMPILER
@@ -1839,6 +1872,31 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
[lt_cv_ld_exported_symbols_list=no])
LDFLAGS="$save_LDFLAGS"
])
+ AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
+ [lt_cv_ld_force_load=no
+ cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+ echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
+ $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
+ echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+ $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+ echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
+ $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
+ cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
+ $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+ _lt_result=$?
+ if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+ lt_cv_ld_force_load=yes
+ else
+ cat conftest.err >&AS_MESSAGE_LOG_FD
+ fi
+ rm -f conftest.err libconftest.a conftest conftest.c
+ rm -rf conftest.dSYM
+ ])
case $host_os in
rhapsody* | darwin1.[[012]])
_lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
@@ -1866,7 +1924,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
else
_lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
fi
- if test "$DSYMUTIL" != ":"; then
+ if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
_lt_dsymutil='~$DSYMUTIL $lib || :'
else
_lt_dsymutil=
@@ -1886,7 +1944,11 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_automatic, $1)=yes
_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
- _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+ if test "$lt_cv_ld_force_load" = "yes"; then
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+ else
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+ fi
_LT_TAGVAR(link_all_deplibs, $1)=yes
_LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
case $cc_basename in
@@ -1894,7 +1956,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
*) _lt_dar_can_shared=$GCC ;;
esac
if test "$_lt_dar_can_shared" = "yes"; then
- output_verbose_link_cmd=echo
+ output_verbose_link_cmd=func_echo_all
_LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
_LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
_LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
@@ -1940,170 +2002,65 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# _LT_SHELL_INIT(ARG)
# -------------------
m4_define([_LT_SHELL_INIT],
-[ifdef([AC_DIVERSION_NOTICE],
- [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
- [AC_DIVERT_PUSH(NOTICE)])
-$1
-AC_DIVERT_POP
-])# _LT_SHELL_INIT
+[m4_divert_text([M4SH-INIT], [$1
+])])# _LT_SHELL_INIT
+
# _LT_PROG_ECHO_BACKSLASH
# -----------------------
-# Add some code to the start of the generated configure script which
-# will find an echo command which doesn't interpret backslashes.
+# Find how we can fake an echo command that does not interpret backslash.
+# In particular, with Autoconf 2.60 or later we add some code to the start
+# of the generated configure script which will find a shell with a builtin
+# printf (which we can use as an echo command).
m4_defun([_LT_PROG_ECHO_BACKSLASH],
-[_LT_SHELL_INIT([
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-case X$lt_ECHO in
-X*--fallback-echo)
- # Remove one level of quotation (which was required for Make).
- ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
- ;;
-esac
-
-ECHO=${lt_ECHO-echo}
-if test "X[$]1" = X--no-reexec; then
- # Discard the --no-reexec flag, and continue.
- shift
-elif test "X[$]1" = X--fallback-echo; then
- # Avoid inline document here, it may be left over
- :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
- # Yippee, $ECHO works!
- :
+[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+AC_MSG_CHECKING([how to print strings])
+# Test print first, because it will be a builtin if present.
+if test "X`print -r -- -n 2>/dev/null`" = X-n && \
+ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+ ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+ ECHO='printf %s\n'
else
- # Restart under the correct shell.
- exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
-fi
-
-if test "X[$]1" = X--fallback-echo; then
- # used as fallback echo
- shift
- cat <<_LT_EOF
-[$]*
-_LT_EOF
- exit 0
+ # Use this function as a fallback that always works.
+ func_fallback_echo ()
+ {
+ eval 'cat <<_LTECHO_EOF
+$[]1
+_LTECHO_EOF'
+ }
+ ECHO='func_fallback_echo'
fi
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test -z "$lt_ECHO"; then
- if test "X${echo_test_string+set}" != Xset; then
- # find a string as large as possible, as long as the shell can cope with it
- for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
- if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
- { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
- then
- break
- fi
- done
- fi
-
- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- :
- else
- # The Solaris, AIX, and Digital Unix default echo programs unquote
- # backslashes. This makes it impossible to quote backslashes using
- # echo "$something" | sed 's/\\/\\\\/g'
- #
- # So, first we look for a working echo in the user's PATH.
-
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- for dir in $PATH /usr/ucb; do
- IFS="$lt_save_ifs"
- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- ECHO="$dir/echo"
- break
- fi
- done
- IFS="$lt_save_ifs"
-
- if test "X$ECHO" = Xecho; then
- # We didn't find a better echo, so look for alternatives.
- if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- # This shell has a builtin print -r that does the trick.
- ECHO='print -r'
- elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
- test "X$CONFIG_SHELL" != X/bin/ksh; then
- # If we have ksh, try running configure again with it.
- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
- export ORIGINAL_CONFIG_SHELL
- CONFIG_SHELL=/bin/ksh
- export CONFIG_SHELL
- exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
- else
- # Try using printf.
- ECHO='printf %s\n'
- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- # Cool, printf works
- :
- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
- test "X$echo_testing_string" = 'X\t' &&
- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
- export CONFIG_SHELL
- SHELL="$CONFIG_SHELL"
- export SHELL
- ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
- elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
- test "X$echo_testing_string" = 'X\t' &&
- echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
- else
- # maybe with a smaller string...
- prev=:
-
- for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
- if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
- then
- break
- fi
- prev="$cmd"
- done
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+ $ECHO "$*"
+}
- if test "$prev" != 'sed 50q "[$]0"'; then
- echo_test_string=`eval $prev`
- export echo_test_string
- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
- else
- # Oops. We lost completely, so just stick with echo.
- ECHO=echo
- fi
- fi
- fi
- fi
- fi
-fi
+case "$ECHO" in
+ printf*) AC_MSG_RESULT([printf]) ;;
+ print*) AC_MSG_RESULT([print -r]) ;;
+ *) AC_MSG_RESULT([cat]) ;;
+esac
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-lt_ECHO=$ECHO
-if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
- lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
-fi
+m4_ifdef([_AS_DETECT_SUGGESTED],
+[_AS_DETECT_SUGGESTED([
+ test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
+ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+ PATH=/empty FPATH=/empty; export PATH FPATH
+ test "X`printf %s $ECHO`" = "X$ECHO" \
+ || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
-AC_SUBST(lt_ECHO)
-])
_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
-_LT_DECL([], [ECHO], [1],
- [An echo program that does not interpret backslashes])
+_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
])# _LT_PROG_ECHO_BACKSLASH
@@ -2135,7 +2092,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+ echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
@@ -2287,10 +2244,19 @@ if test -n "$RANLIB"; then
esac
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
fi
+
+case $host_os in
+ darwin*)
+ lock_old_archive_extraction=yes ;;
+ *)
+ lock_old_archive_extraction=no ;;
+esac
_LT_DECL([], [old_postinstall_cmds], [2])
_LT_DECL([], [old_postuninstall_cmds], [2])
_LT_TAGDECL([], [old_archive_cmds], [2],
[Commands used to build an old-style archive])
+_LT_DECL([], [lock_old_archive_extraction], [0],
+ [Whether to use a lock for old archive extraction])
])# _LT_CMD_OLD_ARCHIVE
@@ -2315,15 +2281,15 @@ AC_CACHE_CHECK([$1], [$2],
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&AS_MESSAGE_LOG_FD
- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
$2=yes
@@ -2363,7 +2329,7 @@ AC_CACHE_CHECK([$1], [$2],
if test -s conftest.err; then
# Append any errors to the config.log.
cat conftest.err 1>&AS_MESSAGE_LOG_FD
- $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
$2=yes
@@ -2426,6 +2392,11 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
lt_cv_sys_max_cmd_len=8192;
;;
+ mint*)
+ # On MiNT this can take a long time and run out of memory.
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
+
amigaos*)
# On AmigaOS with pdksh, this test takes hours, literally.
# So we just punt and use a minimum line length of 8192.
@@ -2490,8 +2461,8 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
# we can't tell.
- while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
- = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
+ while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+ = "X$teststring$teststring"; } >/dev/null 2>&1 &&
test $i != 17 # 1/2 MB should be enough
do
i=`expr $i + 1`
@@ -2542,7 +2513,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-[#line __oline__ "configure"
+[#line $LINENO "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -2583,7 +2554,13 @@ else
# endif
#endif
-void fnord() { int i=42;}
+/* When -fvisbility=hidden is used, assume the code has been annotated
+ correspondingly for the symbols needed. */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+void fnord () __attribute__((visibility("default")));
+#endif
+
+void fnord () { int i=42; }
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -2592,7 +2569,11 @@ int main ()
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ else
+ {
+ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ else puts (dlerror ());
+ }
/* dlclose (self); */
}
else
@@ -2768,16 +2749,16 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&AS_MESSAGE_LOG_FD
- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
@@ -2936,6 +2917,7 @@ m4_require([_LT_DECL_EGREP])dnl
m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_DECL_OBJDUMP])dnl
m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
AC_MSG_CHECKING([dynamic linker characteristics])
m4_if([$1],
[], [
@@ -2944,16 +2926,23 @@ if test "$GCC" = yes; then
darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
*) lt_awk_arg="/^libraries:/" ;;
esac
- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
+ case $host_os in
+ mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
+ *) lt_sed_strip_eq="s,=/,/,g" ;;
+ esac
+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+ case $lt_search_path_spec in
+ *\;*)
# if the path contains ";" then we assume it to be the separator
# otherwise default to the standard path separator (i.e. ":") - it is
# assumed that no part of a normal pathname contains ";" but that should
# okay in the real world where ";" in dirpaths is itself problematic.
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
- else
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+ ;;
+ *)
+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+ ;;
+ esac
# Ok, now we have the path, separated by spaces, we can step through it
# and add multilib dir if necessary.
lt_tmp_lt_search_path_spec=
@@ -2966,7 +2955,7 @@ if test "$GCC" = yes; then
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
fi
done
- lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
+ lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
BEGIN {RS=" "; FS="/|\n";} {
lt_foo="";
lt_count=0;
@@ -2986,7 +2975,13 @@ BEGIN {RS=" "; FS="/|\n";} {
if (lt_foo != "") { lt_freq[[lt_foo]]++; }
if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
}'`
- sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
+ # AWK program above erroneously prepends '/' to C:/dos/paths
+ # for these hosts.
+ case $host_os in
+ mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+ $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
+ esac
+ sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi])
@@ -3074,7 +3069,7 @@ amigaos*)
m68k)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
;;
esac
;;
@@ -3127,23 +3122,12 @@ cygwin* | mingw* | pw32* | cegcc*)
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+m4_if([$1], [],[
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
;;
mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
- # It is most probably a Windows format PATH printed by
- # mingw gcc, but we are running on Cygwin. Gcc prints its search
- # path with ; separators, and with drive letters. We can handle the
- # drive letters (cygwin fileutils understands them), so leave them,
- # especially as we might pass files found there to a mingw objdump,
- # which wouldn't understand a cygwinified path. Ahh.
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
- else
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -3243,6 +3227,19 @@ gnu*)
hardcode_into_libs=yes
;;
+haiku*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ dynamic_linker="$host_os runtime_loader"
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+ hardcode_into_libs=yes
+ ;;
+
hpux9* | hpux10* | hpux11*)
# Give a soname corresponding to the major version so that dld.sl refuses to
# link against other versions.
@@ -3285,8 +3282,10 @@ hpux9* | hpux10* | hpux11*)
soname_spec='${libname}${release}${shared_ext}$major'
;;
esac
- # HP-UX runs *really* slowly unless shared libraries are mode 555.
+ # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
postinstall_cmds='chmod 555 $lib'
+ # or fails outright, so override atomically:
+ install_override_mode=555
;;
interix[[3-9]]*)
@@ -3353,16 +3352,21 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
+
# Some binutils ld are patched to set DT_RUNPATH
- save_LDFLAGS=$LDFLAGS
- save_libdir=$libdir
- eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
- LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
- AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
- [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
- [shlibpath_overrides_runpath=yes])])
- LDFLAGS=$save_LDFLAGS
- libdir=$save_libdir
+ AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
+ [lt_cv_shlibpath_overrides_runpath=no
+ save_LDFLAGS=$LDFLAGS
+ save_libdir=$libdir
+ eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
+ LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+ [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
+ [lt_cv_shlibpath_overrides_runpath=yes])])
+ LDFLAGS=$save_LDFLAGS
+ libdir=$save_libdir
+ ])
+ shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
# This implies no fast_install, which is unacceptable.
# Some rework will be needed to allow for fast_install
@@ -3371,7 +3375,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
@@ -3384,18 +3388,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
dynamic_linker='GNU/Linux ld.so'
;;
-netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -3616,6 +3608,8 @@ _LT_DECL([], [library_names_spec], [1],
The last name is the one that the linker finds with -lNAME]])
_LT_DECL([], [soname_spec], [1],
[[The coded name of the library, if different from the real name]])
+_LT_DECL([], [install_override_mode], [1],
+ [Permission mode override for installation of shared libraries])
_LT_DECL([], [postinstall_cmds], [2],
[Command to use after installation of a shared archive])
_LT_DECL([], [postuninstall_cmds], [2],
@@ -3728,6 +3722,7 @@ AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([AC_CANONICAL_BUILD])dnl
m4_require([_LT_DECL_SED])dnl
m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
AC_ARG_WITH([gnu-ld],
[AS_HELP_STRING([--with-gnu-ld],
@@ -3857,8 +3852,8 @@ case $host_os in
fi
;;
esac
-_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
-_LT_DECL([], [reload_cmds], [2])dnl
+_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
+_LT_TAGDECL([], [reload_cmds], [2])dnl
])# _LT_CMD_RELOAD
@@ -3910,16 +3905,18 @@ mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
# func_win32_libid shell function, so use a weaker test based on 'objdump',
# unless we find 'file', for example because we are cross-compiling.
- if ( file / ) >/dev/null 2>&1; then
+ # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
+ if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
lt_cv_file_magic_cmd='func_win32_libid'
else
- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+ # Keep this pattern in sync with the one in func_win32_libid.
+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
lt_cv_file_magic_cmd='$OBJDUMP -f'
fi
;;
-cegcc)
+cegcc*)
# use the weaker test based on 'objdump'. See mingw*.
lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
lt_cv_file_magic_cmd='$OBJDUMP -f'
@@ -3949,6 +3946,10 @@ gnu*)
lt_cv_deplibs_check_method=pass_all
;;
+haiku*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
case $host_cpu in
@@ -3957,11 +3958,11 @@ hpux10.20* | hpux11*)
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
;;
hppa*64*)
- [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
+ [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
;;
*)
- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
+ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
lt_cv_file_magic_test_file=/usr/lib/libc.sl
;;
esac
@@ -3987,7 +3988,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
-netbsd* | netbsdelf*-gnu)
+netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
@@ -4125,7 +4126,19 @@ if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
else
# Didn't find any BSD compatible name lister, look for dumpbin.
- AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
+ if test -n "$DUMPBIN"; then :
+ # Let the user override the test.
+ else
+ AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
+ case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+ *COFF*)
+ DUMPBIN="$DUMPBIN -symbols"
+ ;;
+ *)
+ DUMPBIN=:
+ ;;
+ esac
+ fi
AC_SUBST([DUMPBIN])
if test "$DUMPBIN" != ":"; then
NM="$DUMPBIN"
@@ -4138,13 +4151,13 @@ _LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
[lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
+ (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&AS_MESSAGE_LOG_FD
- (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
+ (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&AS_MESSAGE_LOG_FD
- (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD)
+ (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
cat conftest.out >&AS_MESSAGE_LOG_FD
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -4167,7 +4180,7 @@ AC_DEFUN([LT_LIB_M],
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
LIBM=
case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
# These system don't have libm, or don't need it
;;
*-ncr-sysv4.3*)
@@ -4195,7 +4208,12 @@ m4_defun([_LT_COMPILER_NO_RTTI],
_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
if test "$GCC" = yes; then
- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+ case $cc_basename in
+ nvcc*)
+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
+ *)
+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
+ esac
_LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
lt_cv_prog_compiler_rtti_exceptions,
@@ -4212,6 +4230,7 @@ _LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([LT_PATH_NM])dnl
AC_REQUIRE([LT_PATH_LD])dnl
m4_require([_LT_DECL_SED])dnl
@@ -4337,7 +4356,7 @@ _LT_EOF
if AC_TRY_EVAL(ac_compile); then
# Now try to grab the symbols.
nlist=conftest.nm
- if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
+ if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
@@ -4499,6 +4518,11 @@ m4_if([$1], [CXX], [
# DJGPP does not support shared libraries at all
_LT_TAGVAR(lt_prog_compiler_pic, $1)=
;;
+ haiku*)
+ # PIC is the default for Haiku.
+ # The "-static" flag exists, but is broken.
+ _LT_TAGVAR(lt_prog_compiler_static, $1)=
+ ;;
interix[[3-9]]*)
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
@@ -4637,8 +4661,8 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)=
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
- xlc* | xlC*)
- # IBM XL 8.0 on PPC
+ xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
+ # IBM XL 8.0, 9.0 on PPC and BlueGene
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
@@ -4668,7 +4692,7 @@ m4_if([$1], [CXX], [
;;
esac
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -4700,7 +4724,7 @@ m4_if([$1], [CXX], [
;;
solaris*)
case $cc_basename in
- CC*)
+ CC* | sunCC*)
# Sun C++ 4.2, 5.x and Centerline C++
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
@@ -4804,6 +4828,12 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
;;
+ haiku*)
+ # PIC is the default for Haiku.
+ # The "-static" flag exists, but is broken.
+ _LT_TAGVAR(lt_prog_compiler_static, $1)=
+ ;;
+
hpux*)
# PIC is the default for 64-bit PA HP-UX, but not for 32-bit
# PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
@@ -4846,6 +4876,13 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
esac
+
+ case $cc_basename in
+ nvcc*) # Cuda Compiler Driver 2.2
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
+ ;;
+ esac
else
# PORTME Check for flag to pass linker flags through the system compiler.
case $host_os in
@@ -4909,7 +4946,7 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
;;
- pgcc* | pgf77* | pgf90* | pgf95*)
+ pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -4921,25 +4958,25 @@ m4_if([$1], [CXX], [
# All Alpha code is PIC.
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
- xl*)
- # IBM XL C 8.0/Fortran 10.1 on PPC
+ xl* | bgxl* | bgf* | mpixl*)
+ # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
;;
*)
case `$CC -V 2>&1 | sed 5q` in
- *Sun\ C*)
- # Sun C 5.9
+ *Sun\ F* | *Sun*Fortran*)
+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
;;
- *Sun\ F*)
- # Sun Fortran 8.3 passes all unrecognized flags to the linker
+ *Sun\ C*)
+ # Sun C 5.9
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
;;
esac
;;
@@ -4971,7 +5008,7 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
case $cc_basename in
- f77* | f90* | f95*)
+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
@@ -5081,8 +5118,10 @@ m4_if([$1], [CXX], [
aix[[4-9]]*)
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
+ # Also, AIX nm treats weak defined symbols like other global defined
+ # symbols, whereas GNU nm marks them as "W".
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
else
_LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
fi
@@ -5093,9 +5132,6 @@ m4_if([$1], [CXX], [
cygwin* | mingw* | cegcc*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
;;
- linux* | k*bsd*-gnu)
- _LT_TAGVAR(link_all_deplibs, $1)=no
- ;;
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -5160,13 +5196,36 @@ dnl Note also adjust exclude_expsyms for C++ above.
openbsd*)
with_gnu_ld=no
;;
- linux* | k*bsd*-gnu)
- _LT_TAGVAR(link_all_deplibs, $1)=no
- ;;
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
+
+ # On some targets, GNU ld is compatible enough with the native linker
+ # that we're better off using the native interface for both.
+ lt_use_gnu_ld_interface=no
if test "$with_gnu_ld" = yes; then
+ case $host_os in
+ aix*)
+ # The AIX port of GNU ld has always aspired to compatibility
+ # with the native linker. However, as the warning in the GNU ld
+ # block says, versions before 2.19.5* couldn't really create working
+ # shared libraries, regardless of the interface used.
+ case `$LD -v 2>&1` in
+ *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+ *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
+ *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
+ *)
+ lt_use_gnu_ld_interface=yes
+ ;;
+ esac
+ ;;
+ *)
+ lt_use_gnu_ld_interface=yes
+ ;;
+ esac
+ fi
+
+ if test "$lt_use_gnu_ld_interface" = yes; then
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -5200,11 +5259,12 @@ dnl Note also adjust exclude_expsyms for C++ above.
_LT_TAGVAR(ld_shlibs, $1)=no
cat <<_LT_EOF 1>&2
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** Warning: the GNU linker, at least up to release 2.19, is reported
*** to be unable to reliably create shared libraries on AIX.
*** Therefore, libtool is disabling shared libraries support. If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
_LT_EOF
fi
@@ -5240,6 +5300,7 @@ _LT_EOF
# _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
_LT_TAGVAR(always_export_symbols, $1)=no
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
@@ -5261,6 +5322,11 @@ _LT_EOF
fi
;;
+ haiku*)
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
+
interix[[3-9]]*)
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -5290,11 +5356,12 @@ _LT_EOF
tmp_sharedflag='-shared'
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
tmp_addflag=' $pic_flag'
;;
- pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ pgf77* | pgf90* | pgf95* | pgfortran*)
+ # Portland Group f77 and f90 compilers
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
@@ -5305,13 +5372,17 @@ _LT_EOF
lf95*) # Lahey Fortran 8.1
_LT_TAGVAR(whole_archive_flag_spec, $1)=
tmp_sharedflag='--shared' ;;
- xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+ xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
tmp_sharedflag='-qmkshrobj'
tmp_addflag= ;;
+ nvcc*) # Cuda Compiler Driver 2.2
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(compiler_needs_object, $1)=yes
+ ;;
esac
case `$CC -V 2>&1 | sed 5q` in
*Sun\ C*) # Sun C 5.9
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
_LT_TAGVAR(compiler_needs_object, $1)=yes
tmp_sharedflag='-G' ;;
*Sun\ F*) # Sun Fortran 8.3
@@ -5327,17 +5398,17 @@ _LT_EOF
fi
case $cc_basename in
- xlf*)
+ xlf* | bgf* | bgxlf* | mpixlf*)
# IBM XL Fortran 10.1 on PPC cannot create shared libs itself
_LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
if test "x$supports_anon_versioning" = xyes; then
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
echo "local: *; };" >> $output_objdir/$libname.ver~
- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
fi
;;
esac
@@ -5346,7 +5417,7 @@ _LT_EOF
fi
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -5458,8 +5529,10 @@ _LT_EOF
else
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
+ # Also, AIX nm treats weak defined symbols like other global
+ # defined symbols, whereas GNU nm marks them as "W".
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
else
_LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
fi
@@ -5521,7 +5594,6 @@ _LT_EOF
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
- _LT_TAGVAR(link_all_deplibs, $1)=no
else
# not using gcc
if test "$host_cpu" = ia64; then
@@ -5549,7 +5621,7 @@ _LT_EOF
# empty executable.
_LT_SYS_MODULE_PATH_AIX
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
if test "$host_cpu" = ia64; then
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
@@ -5564,8 +5636,13 @@ _LT_EOF
# -berok will link without error, but may produce a broken library.
_LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
- # Exported symbols can be pulled into shared objects from archives
- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+ if test "$with_gnu_ld" = yes; then
+ # We only use this code for GNU lds that support --whole-archive.
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ else
+ # Exported symbols can be pulled into shared objects from archives
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+ fi
_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds its shared libraries.
_LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
@@ -5604,7 +5681,7 @@ _LT_EOF
# Tell ltmain to make .dll files, not .so files.
shrext_cmds=".dll"
# FIXME: Setting linknames here is a bad hack.
- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
# The linker will automatically build a .lib file if we build a DLL.
_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
# FIXME: Should let the user specify the lib program.
@@ -5671,7 +5748,7 @@ _LT_EOF
;;
hpux10*)
- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
_LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
else
_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
@@ -5690,7 +5767,7 @@ _LT_EOF
;;
hpux11*)
- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
case $host_cpu in
hppa*64*)
_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -5711,7 +5788,14 @@ _LT_EOF
_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ m4_if($1, [], [
+ # Older versions of the 11.00 compiler do not understand -b yet
+ # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+ _LT_LINKER_OPTION([if $CC understands -b],
+ _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
+ [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
+ [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
+ [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
;;
esac
fi
@@ -5739,19 +5823,19 @@ _LT_EOF
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
# Try to use the -exported_symbol ld option, if it does not
# work, assume that -exports_file does not work either and
# implicitly export all symbols.
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
AC_LINK_IFELSE(int foo(void) {},
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
)
LDFLAGS="$save_LDFLAGS"
else
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)='no'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
@@ -5760,7 +5844,7 @@ _LT_EOF
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -5813,17 +5897,17 @@ _LT_EOF
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_TAGVAR(hardcode_minus_L, $1)=yes
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
_LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
;;
osf3*)
if test "$GCC" = yes; then
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
else
_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)='no'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
@@ -5833,13 +5917,13 @@ _LT_EOF
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
else
_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
# Both c and cxx compiler support -rpath directly
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -6030,36 +6114,38 @@ x|xyes)
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
- AC_MSG_CHECKING([whether -lc should be explicitly linked in])
- $RM conftest*
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
- soname=conftest
- lib=conftest
- libobjs=conftest.$ac_objext
- deplibs=
- wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
- pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
- compiler_flags=-v
- linker_flags=-v
- verstring=
- output_objdir=.
- libname=conftest
- lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
- _LT_TAGVAR(allow_undefined_flag, $1)=
- if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
- then
- _LT_TAGVAR(archive_cmds_need_lc, $1)=no
- else
- _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
- fi
- _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
- else
- cat conftest.err 1>&5
- fi
- $RM conftest*
- AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])
+ AC_CACHE_CHECK([whether -lc should be explicitly linked in],
+ [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
+ [$RM conftest*
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+ soname=conftest
+ lib=conftest
+ libobjs=conftest.$ac_objext
+ deplibs=
+ wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
+ pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
+ compiler_flags=-v
+ linker_flags=-v
+ verstring=
+ output_objdir=.
+ libname=conftest
+ lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
+ _LT_TAGVAR(allow_undefined_flag, $1)=
+ if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
+ then
+ lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+ else
+ lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+ fi
+ _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+ else
+ cat conftest.err 1>&5
+ fi
+ $RM conftest*
+ ])
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
;;
esac
fi
@@ -6225,37 +6311,21 @@ CC="$lt_save_CC"
])# _LT_LANG_C_CONFIG
-# _LT_PROG_CXX
-# ------------
-# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
-# compiler, we have our own version here.
-m4_defun([_LT_PROG_CXX],
-[
-pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
-AC_PROG_CXX
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
- (test "X$CXX" != "Xg++"))) ; then
- AC_PROG_CXXCPP
-else
- _lt_caught_CXX_error=yes
-fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_CXX
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([_LT_PROG_CXX], [])
-
-
# _LT_LANG_CXX_CONFIG([TAG])
# --------------------------
# Ensure that the configuration variables for a C++ compiler are suitably
# defined. These variables are subsequently used by _LT_CONFIG to write
# the compiler configuration to `libtool'.
m4_defun([_LT_LANG_CXX_CONFIG],
-[AC_REQUIRE([_LT_PROG_CXX])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_DECL_EGREP])dnl
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+ (test "X$CXX" != "Xg++"))) ; then
+ AC_PROG_CXXCPP
+else
+ _lt_caught_CXX_error=yes
+fi
AC_LANG_PUSH(C++)
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
@@ -6277,6 +6347,8 @@ _LT_TAGVAR(module_cmds, $1)=
_LT_TAGVAR(module_expsym_cmds, $1)=
_LT_TAGVAR(link_all_deplibs, $1)=unknown
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
_LT_TAGVAR(no_undefined_flag, $1)=
_LT_TAGVAR(whole_archive_flag_spec, $1)=
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
@@ -6379,7 +6451,7 @@ if test "$_lt_caught_CXX_error" != yes; then
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
else
GXX=no
@@ -6491,7 +6563,7 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_SYS_MODULE_PATH_AIX
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
if test "$host_cpu" = ia64; then
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
@@ -6506,8 +6578,13 @@ if test "$_lt_caught_CXX_error" != yes; then
# -berok will link without error, but may produce a broken library.
_LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
- # Exported symbols can be pulled into shared objects from archives
- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+ if test "$with_gnu_ld" = yes; then
+ # We only use this code for GNU lds that support --whole-archive.
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ else
+ # Exported symbols can be pulled into shared objects from archives
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+ fi
_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds its shared
# libraries.
@@ -6540,6 +6617,7 @@ if test "$_lt_caught_CXX_error" != yes; then
# _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
_LT_TAGVAR(always_export_symbols, $1)=no
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
@@ -6600,6 +6678,11 @@ if test "$_lt_caught_CXX_error" != yes; then
gnu*)
;;
+ haiku*)
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
+
hpux9*)
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
@@ -6624,7 +6707,7 @@ if test "$_lt_caught_CXX_error" != yes; then
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
;;
*)
if test "$GXX" = yes; then
@@ -6689,7 +6772,7 @@ if test "$_lt_caught_CXX_error" != yes; then
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
;;
*)
if test "$GXX" = yes; then
@@ -6732,7 +6815,7 @@ if test "$_lt_caught_CXX_error" != yes; then
case $cc_basename in
CC*)
# SGI C++
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
@@ -6743,9 +6826,9 @@ if test "$_lt_caught_CXX_error" != yes; then
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
else
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
fi
fi
_LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -6774,7 +6857,7 @@ if test "$_lt_caught_CXX_error" != yes; then
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -6811,26 +6894,26 @@ if test "$_lt_caught_CXX_error" != yes; then
pgCC* | pgcpp*)
# Portland Group C++ compiler
case `$CC -V` in
- *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)
+ *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
_LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
rm -rf $tpldir~
$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
_LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
rm -rf $tpldir~
$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
$RANLIB $oldlib'
_LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
rm -rf $tpldir~
$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
rm -rf $tpldir~
$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
;;
- *) # Version 6 will use weak symbols
+ *) # Version 6 and above use weak symbols
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
;;
@@ -6838,7 +6921,7 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
;;
cxx*)
# Compaq C++
@@ -6857,9 +6940,9 @@ if test "$_lt_caught_CXX_error" != yes; then
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
;;
- xl*)
+ xl* | mpixl* | bgxl*)
# IBM XL 8.0 on PPC, with GNU ld
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -6879,13 +6962,13 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
_LT_TAGVAR(compiler_needs_object, $1)=yes
# Not sure whether something based on
# $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
# would be better.
- output_verbose_link_cmd='echo'
+ output_verbose_link_cmd='func_echo_all'
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
@@ -6954,7 +7037,7 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
_LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
fi
- output_verbose_link_cmd=echo
+ output_verbose_link_cmd=func_echo_all
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
@@ -6989,15 +7072,15 @@ if test "$_lt_caught_CXX_error" != yes; then
case $host in
osf3*)
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
;;
*)
_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
echo "-hidden">> $lib.exp~
- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
$RM $lib.exp'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
;;
@@ -7013,17 +7096,17 @@ if test "$_lt_caught_CXX_error" != yes; then
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
;;
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
case $host in
osf3*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
;;
esac
@@ -7033,7 +7116,7 @@ if test "$_lt_caught_CXX_error" != yes; then
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
else
# FIXME: insert proper C++ library support
@@ -7069,7 +7152,7 @@ if test "$_lt_caught_CXX_error" != yes; then
solaris*)
case $cc_basename in
- CC*)
+ CC* | sunCC*)
# Sun C++ 4.2, 5.x and Centerline C++
_LT_TAGVAR(archive_cmds_need_lc,$1)=yes
_LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
@@ -7090,7 +7173,7 @@ if test "$_lt_caught_CXX_error" != yes; then
esac
_LT_TAGVAR(link_all_deplibs, $1)=yes
- output_verbose_link_cmd='echo'
+ output_verbose_link_cmd='func_echo_all'
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
@@ -7117,7 +7200,7 @@ if test "$_lt_caught_CXX_error" != yes; then
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -7128,7 +7211,7 @@ if test "$_lt_caught_CXX_error" != yes; then
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
- output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
fi
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
@@ -7182,6 +7265,10 @@ if test "$_lt_caught_CXX_error" != yes; then
CC*)
_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
+ '"$_LT_TAGVAR(old_archive_cmds, $1)"
+ _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
+ '"$_LT_TAGVAR(reload_cmds, $1)"
;;
*)
_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -7428,7 +7515,7 @@ linux*)
solaris*)
case $cc_basename in
- CC*)
+ CC* | sunCC*)
# The more standards-conforming stlport4 library is
# incompatible with the Cstd library. Avoid specifying
# it if it's in CXXFLAGS. Ignore libCrun as
@@ -7472,32 +7559,16 @@ _LT_TAGDECL([], [compiler_lib_search_path], [1],
])# _LT_SYS_HIDDEN_LIBDEPS
-# _LT_PROG_F77
-# ------------
-# Since AC_PROG_F77 is broken, in that it returns the empty string
-# if there is no fortran compiler, we have our own version here.
-m4_defun([_LT_PROG_F77],
-[
-pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
-AC_PROG_F77
-if test -z "$F77" || test "X$F77" = "Xno"; then
- _lt_disable_F77=yes
-fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_F77
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([_LT_PROG_F77], [])
-
-
# _LT_LANG_F77_CONFIG([TAG])
# --------------------------
# Ensure that the configuration variables for a Fortran 77 compiler are
# suitably defined. These variables are subsequently used by _LT_CONFIG
# to write the compiler configuration to `libtool'.
m4_defun([_LT_LANG_F77_CONFIG],
-[AC_REQUIRE([_LT_PROG_F77])dnl
-AC_LANG_PUSH(Fortran 77)
+[AC_LANG_PUSH(Fortran 77)
+if test -z "$F77" || test "X$F77" = "Xno"; then
+ _lt_disable_F77=yes
+fi
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(allow_undefined_flag, $1)=
@@ -7516,6 +7587,8 @@ _LT_TAGVAR(module_cmds, $1)=
_LT_TAGVAR(module_expsym_cmds, $1)=
_LT_TAGVAR(link_all_deplibs, $1)=unknown
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
_LT_TAGVAR(no_undefined_flag, $1)=
_LT_TAGVAR(whole_archive_flag_spec, $1)=
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
@@ -7615,32 +7688,17 @@ AC_LANG_POP
])# _LT_LANG_F77_CONFIG
-# _LT_PROG_FC
-# -----------
-# Since AC_PROG_FC is broken, in that it returns the empty string
-# if there is no fortran compiler, we have our own version here.
-m4_defun([_LT_PROG_FC],
-[
-pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
-AC_PROG_FC
-if test -z "$FC" || test "X$FC" = "Xno"; then
- _lt_disable_FC=yes
-fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_FC
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([_LT_PROG_FC], [])
-
-
# _LT_LANG_FC_CONFIG([TAG])
# -------------------------
# Ensure that the configuration variables for a Fortran compiler are
# suitably defined. These variables are subsequently used by _LT_CONFIG
# to write the compiler configuration to `libtool'.
m4_defun([_LT_LANG_FC_CONFIG],
-[AC_REQUIRE([_LT_PROG_FC])dnl
-AC_LANG_PUSH(Fortran)
+[AC_LANG_PUSH(Fortran)
+
+if test -z "$FC" || test "X$FC" = "Xno"; then
+ _lt_disable_FC=yes
+fi
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(allow_undefined_flag, $1)=
@@ -7659,6 +7717,8 @@ _LT_TAGVAR(module_cmds, $1)=
_LT_TAGVAR(module_expsym_cmds, $1)=
_LT_TAGVAR(link_all_deplibs, $1)=unknown
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
_LT_TAGVAR(no_undefined_flag, $1)=
_LT_TAGVAR(whole_archive_flag_spec, $1)=
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
@@ -7804,6 +7864,8 @@ _LT_CC_BASENAME([$compiler])
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
if test -n "$compiler"; then
_LT_COMPILER_NO_RTTI($1)
@@ -8165,7 +8227,7 @@ _LT_EOF
func_dirname ()
{
# Extract subdirectory from the argument.
- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
if test "X$func_dirname_result" = "X${1}"; then
func_dirname_result="${3}"
else
@@ -8176,7 +8238,7 @@ func_dirname ()
# func_basename file
func_basename ()
{
- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+ func_basename_result=`$ECHO "${1}" | $SED "$basename"`
}
dnl func_dirname_and_basename
@@ -8192,10 +8254,8 @@ dnl so there is no need for it here.
func_stripname ()
{
case ${2} in
- .*) func_stripname_result=`$ECHO "X${3}" \
- | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
- *) func_stripname_result=`$ECHO "X${3}" \
- | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
esac
}
@@ -8206,20 +8266,20 @@ my_sed_long_arg='1s/^-[[^=]]*=//'
# func_opt_split
func_opt_split ()
{
- func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
- func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
+ func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
+ func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
}
# func_lo2o object
func_lo2o ()
{
- func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
+ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
}
# func_xform libobj-or-source
func_xform ()
{
- func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
+ func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'`
}
# func_arith arithmetic-term...
@@ -8267,14 +8327,15 @@ _LT_EOF
# Helper functions for option handling. -*- Autoconf -*-
#
-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# Written by Gary V. Vaughan, 2004
#
# This file is free software; the Free Software Foundation gives
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
-# serial 6 ltoptions.m4
+# serial 7 ltoptions.m4
# This is to help aclocal find these macros, as it can't see m4_define.
AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
@@ -8389,7 +8450,7 @@ LT_OPTION_DEFINE([LT_INIT], [win32-dll],
[enable_win32_dll=yes
case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
AC_CHECK_TOOL(AS, as, false)
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
AC_CHECK_TOOL(OBJDUMP, objdump, false)
@@ -8397,13 +8458,13 @@ case $host in
esac
test -z "$AS" && AS=as
-_LT_DECL([], [AS], [0], [Assembler program])dnl
+_LT_DECL([], [AS], [1], [Assembler program])dnl
test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
+_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
])# win32-dll
AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
@@ -8763,29 +8824,29 @@ m4_define([lt_dict_filter],
# Generated from ltversion.in.
-# serial 3017 ltversion.m4
+# serial 3175 ltversion.m4
# This file is part of GNU Libtool
-m4_define([LT_PACKAGE_VERSION], [2.2.6b])
-m4_define([LT_PACKAGE_REVISION], [1.3017])
+m4_define([LT_PACKAGE_VERSION], [2.2.10])
+m4_define([LT_PACKAGE_REVISION], [1.3175])
AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.2.6b'
-macro_revision='1.3017'
+[macro_version='2.2.10'
+macro_revision='1.3175'
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0)
])
# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
#
-# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
# Written by Scott James Remnant, 2004.
#
# 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 lt~obsolete.m4
+# serial 5 lt~obsolete.m4
# These exist entirely to fool aclocal when bootstrapping libtool.
#
@@ -8855,7 +8916,6 @@ m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])])
m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])])
m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])])
-m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])])
m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
@@ -8868,6 +8928,13 @@ m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])
m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
+m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
+m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])])
+m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
+m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])])
+m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])])
+m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
# nls.m4 serial 5 (gettext-0.18)
dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
@@ -9039,7 +9106,7 @@ $$1_PKG_ERRORS
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
-_PKG_TEXT])dnl
+_PKG_TEXT])[]dnl
])
elif test $pkg_failed = untried; then
AC_MSG_RESULT([no])
@@ -10060,14 +10127,6 @@ AC_SUBST([am__untar])
]) # _AM_PROG_TAR
m4_include([build/m4/shave/shave.m4])
-m4_include([build/m4/shamrock/expansions.m4])
-m4_include([build/m4/shamrock/gnome-doc.m4])
-m4_include([build/m4/shamrock/i18n.m4])
-m4_include([build/m4/shamrock/mono.m4])
-m4_include([build/m4/shamrock/monodoc.m4])
-m4_include([build/m4/shamrock/nunit.m4])
-m4_include([build/m4/shamrock/programs.m4])
-m4_include([build/m4/shamrock/util.m4])
m4_include([build/m4/banshee/bnpx11.m4])
m4_include([build/m4/banshee/boo.m4])
m4_include([build/m4/banshee/daap.m4])
@@ -10091,6 +10150,16 @@ m4_include([build/m4/banshee/moonlight.m4])
m4_include([build/m4/banshee/notify-sharp.m4])
m4_include([build/m4/banshee/osx.m4])
m4_include([build/m4/banshee/remote-audio.m4])
+m4_include([build/m4/banshee/soundmenu.m4])
m4_include([build/m4/banshee/taglib.m4])
m4_include([build/m4/banshee/torrent.m4])
+m4_include([build/m4/banshee/ubuntuonemusicstore.m4])
m4_include([build/m4/banshee/youtube.m4])
+m4_include([build/m4/shamrock/expansions.m4])
+m4_include([build/m4/shamrock/gnome-doc.m4])
+m4_include([build/m4/shamrock/i18n.m4])
+m4_include([build/m4/shamrock/mono.m4])
+m4_include([build/m4/shamrock/monodoc.m4])
+m4_include([build/m4/shamrock/nunit.m4])
+m4_include([build/m4/shamrock/programs.m4])
+m4_include([build/m4/shamrock/util.m4])
diff --git a/build/Makefile.in b/build/Makefile.in
index f9f6e9d..750c1c1 100644
--- a/build/Makefile.in
+++ b/build/Makefile.in
@@ -39,14 +39,6 @@ subdir = build
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -70,9 +62,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -237,6 +239,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -256,6 +260,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -363,6 +369,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -409,7 +417,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/build/build.environment.mk b/build/build.environment.mk
index dfd6e7b..5dd05ae 100644
--- a/build/build.environment.mk
+++ b/build/build.environment.mk
@@ -28,6 +28,8 @@ LINK_GDATA = $(GDATASHARP_LIBS)
LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
DIR_BIN = $(top_builddir)/bin
@@ -147,6 +149,7 @@ REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -159,6 +162,7 @@ REF_EXTENSION_PODCASTING = $(LINK_MIGO_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+REF_EXTENSION_UBUNTUONEMUSICSTORE= $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
REF_EXTENSION_WIKIPEDIA= $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/build/m4/Makefile.in b/build/m4/Makefile.in
index cf6c4ca..8ebed17 100644
--- a/build/m4/Makefile.in
+++ b/build/m4/Makefile.in
@@ -37,14 +37,6 @@ subdir = build/m4
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -68,9 +60,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -172,6 +174,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -191,6 +195,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -298,6 +304,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -344,7 +352,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/build/m4/banshee/dap-karma.m4 b/build/m4/banshee/dap-karma.m4
index ddb05b3..202fd10 100644
--- a/build/m4/banshee/dap-karma.m4
+++ b/build/m4/banshee/dap-karma.m4
@@ -12,7 +12,12 @@ AC_DEFUN([BANSHEE_CHECK_DAP_KARMA],
enable_karmasharp="$enable_karmasharp", enable_karmasharp=no)
if test "x$enable_karmasharp" = "xyes"; then
- KARMASHARP_ASSEMBLIES="`$PKG_CONFIG --variable=Libraries karma-sharp`"
+ asms="`$PKG_CONFIG --variable=Libraries karma-sharp`"
+ for asm in $asms; do
+ KARMASHARP_ASSEMBLIES="$KARMASHARP_ASSEMBLIES $asm"
+ [[ -r "$asm.config" ]] && KARMASHARP_ASSEMBLIES="$KARMASHARP_ASSEMBLIES $asm.config"
+ [[ -r "$asm.mdb" ]] && KARMASHARP_ASSEMBLIES="$KARMASHARP_ASSEMBLIES $asm.mdb"
+ done
AC_SUBST(KARMASHARP_ASSEMBLIES)
AC_SUBST(KARMASHARP_LIBS)
fi
diff --git a/build/m4/banshee/gstreamer.m4 b/build/m4/banshee/gstreamer.m4
index a9b9130..3420f0c 100644
--- a/build/m4/banshee/gstreamer.m4
+++ b/build/m4/banshee/gstreamer.m4
@@ -1,6 +1,6 @@
AC_DEFUN([BANSHEE_CHECK_GSTREAMER],
[
- GSTREAMER_REQUIRED_VERSION=0.10.12
+ GSTREAMER_REQUIRED_VERSION=0.10.23
AC_SUBST(GSTREAMER_REQUIRED_VERSION)
PKG_CHECK_MODULES(GST,
@@ -11,11 +11,16 @@ AC_DEFUN([BANSHEE_CHECK_GSTREAMER],
gstreamer-dataprotocol-0.10 >= $GSTREAMER_REQUIRED_VERSION
gstreamer-fft-0.10 >= $GSTREAMER_REQUIRED_VERSION)
- GST_LIBS="$GST_LIBS -lgstvideo-0.10 -lgstinterfaces-0.10 -lgstcdda-0.10 -lgstpbutils-0.10"
+ GST_LIBS="$GST_LIBS -lgstvideo-0.10 -lgstinterfaces-0.10 -lgstcdda-0.10 -lgstpbutils-0.10 -lgsttag-0.10"
AC_SUBST(GST_CFLAGS)
AC_SUBST(GST_LIBS)
+ PKG_CHECK_MODULES(GST_0_10_26,
+ gstreamer-plugins-base-0.10 >= 0.10.26,
+ has_gst_0_10_26=yes, has_gst_0_10_26=no)
+ AM_CONDITIONAL(HAVE_GST_0_10_26, test "x$has_gst_0_10_26" = "xyes")
+
dnl Builtin equalizer (optional)
AC_ARG_ENABLE(builtin-equalizer,
AC_HELP_STRING([--disable-builtin-equalizer],
diff --git a/build/m4/banshee/soundmenu.m4 b/build/m4/banshee/soundmenu.m4
new file mode 100644
index 0000000..afcd33e
--- /dev/null
+++ b/build/m4/banshee/soundmenu.m4
@@ -0,0 +1,22 @@
+AC_DEFUN([BANSHEE_CHECK_SOUNDMENU],
+[
+ LIBINDICATESHARP_REQUIRED=0.4.1
+
+ AC_ARG_ENABLE([soundmenu],
+ AS_HELP_STRING([--enable-soundmenu], [Enable sound menu support]),
+ enable_soundmenu=$enableval, enable_soundmenu=no
+ )
+
+ if test "x$enable_soundmenu" = "xyes"; then
+ has_indicatesharp=no
+ PKG_CHECK_MODULES(INDICATESHARP,
+ indicate-sharp-0.1 >= $LIBINDICATESHARP_REQUIRED,
+ has_indicatesharp=yes, has_indicatesharp=no)
+ if test "x$has_indicatesharp" = "xno"; then
+ AC_MSG_ERROR([indicate-sharp was not found or is not up to date. Please install indicate-sharp of at least version $LIBINDICATESHARP_REQUIRED, or disable sound menu support by passing --disable-soundmenu])
+ fi
+ fi
+
+ AM_CONDITIONAL(ENABLE_SOUNDMENU, test "x$enable_soundmenu" = "xyes")
+])
+
diff --git a/build/m4/banshee/ubuntuonemusicstore.m4 b/build/m4/banshee/ubuntuonemusicstore.m4
new file mode 100644
index 0000000..2ff4a67
--- /dev/null
+++ b/build/m4/banshee/ubuntuonemusicstore.m4
@@ -0,0 +1,20 @@
+AC_DEFUN([BANSHEE_CHECK_UBUNTUONE],
+[
+ AC_ARG_ENABLE([ubuntuone],
+ AS_HELP_STRING([--enable-ubuntuone], [Enable Ubuntu One Music Store support]),
+ enable_ubuntuone=$enableval, enable_ubuntuone=no
+ )
+
+ if test "x$enable_ubuntuone" = "xyes"; then
+ has_ubuntuonesharp=no
+ PKG_CHECK_MODULES(UBUNTUONESHARP,
+ [ubuntuone-sharp-1.0],
+ has_ubuntuonesharp=yes, has_ubuntuonesharp=no)
+ if test "x$has_ubuntuonesharp" = "xno"; then
+ AC_MSG_ERROR([ubuntuone-sharp was not found. Please install ubuntuone-sharp, or disable Ubuntu One support by passing --disable-ubuntuone])
+ fi
+ fi
+
+ AM_CONDITIONAL(ENABLE_UBUNTUONE, test "x$enable_ubuntuone" = "xyes")
+])
+
diff --git a/build/pkg-config/Makefile.in b/build/pkg-config/Makefile.in
index 05c0dbd..1f586cd 100644
--- a/build/pkg-config/Makefile.in
+++ b/build/pkg-config/Makefile.in
@@ -38,14 +38,6 @@ subdir = build/pkg-config
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -69,9 +61,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -196,6 +198,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -215,6 +219,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -322,6 +328,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -368,7 +376,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/config.guess b/config.guess
index c2246a4..0e30d56 100755
--- a/config.guess
+++ b/config.guess
@@ -1,10 +1,9 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-# Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-timestamp='2009-12-30'
+timestamp='2003-07-02'
# 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
@@ -18,25 +17,23 @@ timestamp='2009-12-30'
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Per Bothner. Please send patches (context
-# diff format) to <config-patches at gnu.org> and include a ChangeLog
-# entry.
+# Originally written by Per Bothner <per at bothner.com>.
+# Please send patches to <config-patches at gnu.org>. Submit a context
+# diff and a properly formatted 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.
#
-# 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
+# The plan is that this can be called by configure scripts if you
+# don't specify an explicit build system type.
me=`echo "$0" | sed -e 's,.*/,,'`
@@ -56,9 +53,8 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
-Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+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."
@@ -70,11 +66,11 @@ Try \`$me --help' for more information."
while test $# -gt 0 ; do
case $1 in
--time-stamp | --time* | -t )
- echo "$timestamp" ; exit ;;
+ echo "$timestamp" ; exit 0 ;;
--version | -v )
- echo "$version" ; exit ;;
+ echo "$version" ; exit 0 ;;
--help | --h* | -h )
- echo "$usage"; exit ;;
+ echo "$usage"; exit 0 ;;
-- ) # Stop option processing
shift; break ;;
- ) # Use stdin as input.
@@ -108,7 +104,7 @@ set_cc_for_build='
trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
@@ -127,7 +123,7 @@ case $CC_FOR_BUILD,$HOST_CC,$CC in
;;
,,*) CC_FOR_BUILD=$CC ;;
,*,*) CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
+esac ;'
# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
# (ghazi at noc.rutgers.edu 1994-08-24)
@@ -162,7 +158,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
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
@@ -171,7 +166,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
- | grep -q __ELF__
+ | grep __ELF__ >/dev/null
then
# Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
# Return netbsd for either. FIX?
@@ -201,32 +196,50 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# contains redundant information, the shorter form:
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
echo "${machine}-${os}${release}"
- exit ;;
+ exit 0 ;;
+ amiga:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ arc:OpenBSD:*:*)
+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ hp300:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ mac68k:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ macppc:OpenBSD:*:*)
+ echo powerpc-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ mvme68k:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ mvme88k:OpenBSD:*:*)
+ echo m88k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ mvmeppc:OpenBSD:*:*)
+ echo powerpc-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ pmax:OpenBSD:*:*)
+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ sgi:OpenBSD:*:*)
+ echo mipseb-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ sun3:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ wgrisc:OpenBSD:*:*)
+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
*:OpenBSD:*:*)
- UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
- echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
- exit ;;
- *:ekkoBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
- exit ;;
- *:SolidBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
- exit ;;
- macppc:MirBSD:*:*)
- echo powerpc-unknown-mirbsd${UNAME_RELEASE}
- exit ;;
- *:MirBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
- exit ;;
+ echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
alpha:OSF1:*:*)
- case $UNAME_RELEASE in
- *4.0)
+ if test $UNAME_RELEASE = "V4.0"; then
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
- ;;
- *5.*)
- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
- ;;
- esac
+ fi
# According to Compaq, /usr/sbin/psrinfo has been available on
# OSF/1 and Tru64 systems produced since 1995. I hope that
# covers most systems running today. This code pipes the CPU
@@ -264,49 +277,42 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
"EV7.9 (21364A)")
UNAME_MACHINE="alphaev79" ;;
esac
- # A Pn.n version is a patched version.
# A Vn.n version is a released version.
# A Tn.n version is a released field test version.
# A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r.
- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- exit ;;
+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ exit 0 ;;
+ Alpha*:OpenVMS:*:*)
+ echo alpha-hp-vms
+ exit 0 ;;
Alpha\ *:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# Should we change UNAME_MACHINE based on the output of uname instead
# of the specific Alpha model?
echo alpha-pc-interix
- exit ;;
+ exit 0 ;;
21064:Windows_NT:50:3)
echo alpha-dec-winnt3.5
- exit ;;
+ exit 0 ;;
Amiga*:UNIX_System_V:4.0:*)
echo m68k-unknown-sysv4
- exit ;;
+ exit 0;;
*:[Aa]miga[Oo][Ss]:*:*)
echo ${UNAME_MACHINE}-unknown-amigaos
- exit ;;
+ exit 0 ;;
*:[Mm]orph[Oo][Ss]:*:*)
echo ${UNAME_MACHINE}-unknown-morphos
- exit ;;
+ exit 0 ;;
*:OS/390:*:*)
echo i370-ibm-openedition
- exit ;;
- *:z/VM:*:*)
- echo s390-ibm-zvmoe
- exit ;;
- *:OS400:*:*)
- echo powerpc-ibm-os400
- exit ;;
+ exit 0 ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
- exit ;;
- arm:riscos:*:*|arm:RISCOS:*:*)
- echo arm-unknown-riscos
- exit ;;
+ exit 0;;
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
echo hppa1.1-hitachi-hiuxmpp
- exit ;;
+ exit 0;;
Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
# akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
if test "`(/bin/universe) 2>/dev/null`" = att ; then
@@ -314,51 +320,32 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
else
echo pyramid-pyramid-bsd
fi
- exit ;;
+ exit 0 ;;
NILE*:*:*:dcosx)
echo pyramid-pyramid-svr4
- exit ;;
+ exit 0 ;;
DRS?6000:unix:4.0:6*)
echo sparc-icl-nx6
- exit ;;
- DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+ exit 0 ;;
+ DRS?6000:UNIX_SV:4.2*:7*)
case `/usr/bin/uname -p` in
- sparc) echo sparc-icl-nx7; exit ;;
+ sparc) echo sparc-icl-nx7 && exit 0 ;;
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 ;;
+ exit 0 ;;
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
- 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 ;;
+ exit 0 ;;
+ i86pc:SunOS:5.*:*)
+ echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit 0 ;;
sun4*:SunOS:6*:*)
# According to config.sub, this is the proper way to canonicalize
# SunOS6. Hard to guess exactly what SunOS6 will be like, but
# it's likely to be more like Solaris than SunOS4.
echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
+ exit 0 ;;
sun4*:SunOS:*:*)
case "`/usr/bin/arch -k`" in
Series*|S4*)
@@ -367,10 +354,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
esac
# Japanese Language versions have a version number like `4.1.3-JL'.
echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
- exit ;;
+ exit 0 ;;
sun3*:SunOS:*:*)
echo m68k-sun-sunos${UNAME_RELEASE}
- exit ;;
+ exit 0 ;;
sun*:*:4.2BSD:*)
UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
@@ -382,10 +369,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
echo sparc-sun-sunos${UNAME_RELEASE}
;;
esac
- exit ;;
+ exit 0 ;;
aushp:SunOS:*:*)
echo sparc-auspex-sunos${UNAME_RELEASE}
- exit ;;
+ exit 0 ;;
# The situation for MiNT is a little confusing. The machine name
# can be virtually everything (everything which is not
# "atarist" or "atariste" at least should have a processor
@@ -396,40 +383,37 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# be no problem.
atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
- exit ;;
+ exit 0 ;;
atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
- exit ;;
+ exit 0 ;;
*falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
- exit ;;
+ exit 0 ;;
milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
echo m68k-milan-mint${UNAME_RELEASE}
- exit ;;
+ exit 0 ;;
hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
echo m68k-hades-mint${UNAME_RELEASE}
- exit ;;
+ exit 0 ;;
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
echo m68k-unknown-mint${UNAME_RELEASE}
- exit ;;
- m68k:machten:*:*)
- echo m68k-apple-machten${UNAME_RELEASE}
- exit ;;
+ exit 0 ;;
powerpc:machten:*:*)
echo powerpc-apple-machten${UNAME_RELEASE}
- exit ;;
+ exit 0 ;;
RISC*:Mach:*:*)
echo mips-dec-mach_bsd4.3
- exit ;;
+ exit 0 ;;
RISC*:ULTRIX:*:*)
echo mips-dec-ultrix${UNAME_RELEASE}
- exit ;;
+ exit 0 ;;
VAX*:ULTRIX*:*:*)
echo vax-dec-ultrix${UNAME_RELEASE}
- exit ;;
+ exit 0 ;;
2020:CLIX:*:* | 2430:CLIX:*:*)
echo clipper-intergraph-clix${UNAME_RELEASE}
- exit ;;
+ exit 0 ;;
mips:*:*:UMIPS | mips:*:*:RISCos)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
@@ -453,33 +437,32 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
exit (-1);
}
EOF
- $CC_FOR_BUILD -o $dummy $dummy.c &&
- dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
- SYSTEM_NAME=`$dummy $dummyarg` &&
- { echo "$SYSTEM_NAME"; exit; }
+ $CC_FOR_BUILD -o $dummy $dummy.c \
+ && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+ && exit 0
echo mips-mips-riscos${UNAME_RELEASE}
- exit ;;
+ exit 0 ;;
Motorola:PowerMAX_OS:*:*)
echo powerpc-motorola-powermax
- exit ;;
+ exit 0 ;;
Motorola:*:4.3:PL8-*)
echo powerpc-harris-powermax
- exit ;;
+ exit 0 ;;
Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
echo powerpc-harris-powermax
- exit ;;
+ exit 0 ;;
Night_Hawk:Power_UNIX:*:*)
echo powerpc-harris-powerunix
- exit ;;
+ exit 0 ;;
m88k:CX/UX:7*:*)
echo m88k-harris-cxux7
- exit ;;
+ exit 0 ;;
m88k:*:4*:R4*)
echo m88k-motorola-sysv4
- exit ;;
+ exit 0 ;;
m88k:*:3*:R3*)
echo m88k-motorola-sysv3
- exit ;;
+ exit 0 ;;
AViiON:dgux:*:*)
# DG/UX returns AViiON for all architectures
UNAME_PROCESSOR=`/usr/bin/uname -p`
@@ -495,29 +478,29 @@ EOF
else
echo i586-dg-dgux${UNAME_RELEASE}
fi
- exit ;;
+ exit 0 ;;
M88*:DolphinOS:*:*) # DolphinOS (SVR3)
echo m88k-dolphin-sysv3
- exit ;;
+ exit 0 ;;
M88*:*:R3*:*)
# Delta 88k system running SVR3
echo m88k-motorola-sysv3
- exit ;;
+ exit 0 ;;
XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
echo m88k-tektronix-sysv3
- exit ;;
+ exit 0 ;;
Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
echo m68k-tektronix-bsd
- exit ;;
+ exit 0 ;;
*:IRIX*:*:*)
echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
- exit ;;
+ exit 0 ;;
????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
- exit ;; # Note that: echo "'`uname -s`'" gives 'AIX '
+ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
+ exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX '
i*86:AIX:*:*)
echo i386-ibm-aix
- exit ;;
+ exit 0 ;;
ia64:AIX:*:*)
if [ -x /usr/bin/oslevel ] ; then
IBM_REV=`/usr/bin/oslevel`
@@ -525,7 +508,7 @@ EOF
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi
echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
- exit ;;
+ exit 0 ;;
*:AIX:2:3)
if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
eval $set_cc_for_build
@@ -540,19 +523,15 @@ EOF
exit(0);
}
EOF
- if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
- then
- echo "$SYSTEM_NAME"
- else
- echo rs6000-ibm-aix3.2.5
- fi
+ $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+ echo rs6000-ibm-aix3.2.5
elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
echo rs6000-ibm-aix3.2.4
else
echo rs6000-ibm-aix3.2
fi
- exit ;;
- *:AIX:*:[456])
+ exit 0 ;;
+ *:AIX:*:[45])
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
@@ -565,28 +544,28 @@ EOF
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi
echo ${IBM_ARCH}-ibm-aix${IBM_REV}
- exit ;;
+ exit 0 ;;
*:AIX:*:*)
echo rs6000-ibm-aix
- exit ;;
+ exit 0 ;;
ibmrt:4.4BSD:*|romp-ibm:BSD:*)
echo romp-ibm-bsd4.4
- exit ;;
+ exit 0 ;;
ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
- exit ;; # report: romp-ibm BSD 4.3
+ exit 0 ;; # report: romp-ibm BSD 4.3
*:BOSX:*:*)
echo rs6000-bull-bosx
- exit ;;
+ exit 0 ;;
DPX/2?00:B.O.S.:*:*)
echo m68k-bull-sysv3
- exit ;;
+ exit 0 ;;
9000/[34]??:4.3bsd:1.*:*)
echo m68k-hp-bsd
- exit ;;
+ exit 0 ;;
hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
echo m68k-hp-bsd4.4
- exit ;;
+ exit 0 ;;
9000/[34678]??:HP-UX:*:*)
HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
case "${UNAME_MACHINE}" in
@@ -648,19 +627,9 @@ EOF
esac
if [ ${HP_ARCH} = "hppa2.0w" ]
then
- eval $set_cc_for_build
-
- # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
- # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
- # generating 64-bit code. GNU and HP use different nomenclature:
- #
- # $ CC_FOR_BUILD=cc ./config.guess
- # => hppa2.0w-hp-hpux11.23
- # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
- # => hppa64-hp-hpux11.23
-
- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
- grep -q __LP64__
+ # avoid double evaluation of $set_cc_for_build
+ test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
then
HP_ARCH="hppa2.0w"
else
@@ -668,11 +637,11 @@ EOF
fi
fi
echo ${HP_ARCH}-hp-hpux${HPUX_REV}
- exit ;;
+ exit 0 ;;
ia64:HP-UX:*:*)
HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
echo ia64-hp-hpux${HPUX_REV}
- exit ;;
+ exit 0 ;;
3050*:HI-UX:*:*)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
@@ -700,248 +669,211 @@ EOF
exit (0);
}
EOF
- $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
- { echo "$SYSTEM_NAME"; exit; }
+ $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
echo unknown-hitachi-hiuxwe2
- exit ;;
+ exit 0 ;;
9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
echo hppa1.1-hp-bsd
- exit ;;
+ exit 0 ;;
9000/8??:4.3bsd:*:*)
echo hppa1.0-hp-bsd
- exit ;;
+ exit 0 ;;
*9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
echo hppa1.0-hp-mpeix
- exit ;;
+ exit 0 ;;
hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
echo hppa1.1-hp-osf
- exit ;;
+ exit 0 ;;
hp8??:OSF1:*:*)
echo hppa1.0-hp-osf
- exit ;;
+ exit 0 ;;
i*86:OSF1:*:*)
if [ -x /usr/sbin/sysversion ] ; then
echo ${UNAME_MACHINE}-unknown-osf1mk
else
echo ${UNAME_MACHINE}-unknown-osf1
fi
- exit ;;
+ exit 0 ;;
parisc*:Lites*:*:*)
echo hppa1.1-hp-lites
- exit ;;
+ exit 0 ;;
C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
echo c1-convex-bsd
- exit ;;
+ exit 0 ;;
C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
if getsysinfo -f scalar_acc
then echo c32-convex-bsd
else echo c2-convex-bsd
fi
- exit ;;
+ exit 0 ;;
C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
echo c34-convex-bsd
- exit ;;
+ exit 0 ;;
C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
echo c38-convex-bsd
- exit ;;
+ exit 0 ;;
C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
echo c4-convex-bsd
- exit ;;
+ exit 0 ;;
CRAY*Y-MP:*:*:*)
echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit ;;
+ exit 0 ;;
CRAY*[A-Z]90:*:*:*)
echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-e 's/\.[^.]*$/.X/'
- exit ;;
+ exit 0 ;;
CRAY*TS:*:*:*)
echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit ;;
+ exit 0 ;;
CRAY*T3E:*:*:*)
echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit ;;
+ exit 0 ;;
CRAY*SV1:*:*:*)
echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit ;;
+ exit 0 ;;
*:UNICOS/mp:*:*)
- echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit ;;
+ echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit 0 ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit ;;
- 5000:UNIX_System_V:4.*:*)
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit ;;
+ exit 0 ;;
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
- exit ;;
+ exit 0 ;;
sparc*:BSD/OS:*:*)
echo sparc-unknown-bsdi${UNAME_RELEASE}
- exit ;;
+ exit 0 ;;
*:BSD/OS:*:*)
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
- exit ;;
- *:FreeBSD:*:*)
- case ${UNAME_MACHINE} in
- pc98)
- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
- amd64)
- echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
- *)
- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
- esac
- exit ;;
+ exit 0 ;;
+ *:FreeBSD:*:*|*:GNU/FreeBSD:*:*)
+ # Determine whether the default compiler uses glibc.
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #include <features.h>
+ #if __GLIBC__ >= 2
+ LIBC=gnu
+ #else
+ LIBC=
+ #endif
+EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+ # GNU/FreeBSD systems have a "k" prefix to indicate we are using
+ # FreeBSD's kernel, but not the complete OS.
+ case ${LIBC} in gnu) kernel_only='k' ;; esac
+ echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
+ exit 0 ;;
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
- exit ;;
- *:MINGW*:*)
+ exit 0 ;;
+ i*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
- exit ;;
- i*:windows32*:*)
- # uname -m includes "-pc" on this system.
- echo ${UNAME_MACHINE}-mingw32
- exit ;;
+ exit 0 ;;
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
- 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 ;;
+ exit 0 ;;
+ x86:Interix*:[34]*)
+ echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+ exit 0 ;;
[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 ;;
+ exit 0 ;;
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
# UNAME_MACHINE based on the output of uname instead of i386?
echo i586-pc-interix
- exit ;;
+ exit 0 ;;
i*:UWIN*:*)
echo ${UNAME_MACHINE}-pc-uwin
- exit ;;
- amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- echo x86_64-unknown-cygwin
- exit ;;
+ exit 0 ;;
p*:CYGWIN*:*)
echo powerpcle-unknown-cygwin
- exit ;;
+ exit 0 ;;
prep*:SunOS:5.*:*)
echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
+ exit 0 ;;
*:GNU:*:*)
- # the GNU system
echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
- exit ;;
- *:GNU/*:*:*)
- # other systems with GNU libc and userland
- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
- exit ;;
+ exit 0 ;;
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 ;;
+ exit 0 ;;
arm*:Linux:*:*)
- eval $set_cc_for_build
- if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
- | grep -q __ARM_EABI__
- then
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- else
- echo ${UNAME_MACHINE}-unknown-linux-gnueabi
- fi
- exit ;;
- avr32*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
+ exit 0 ;;
cris:Linux:*:*)
echo cris-axis-linux-gnu
- exit ;;
- crisv32:Linux:*:*)
- echo crisv32-axis-linux-gnu
- exit ;;
- frv:Linux:*:*)
- 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 ;;
+ exit 0 ;;
ia64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- m32r*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
+ exit 0 ;;
m68*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- mips:Linux:*:* | mips64:Linux:*:*)
+ exit 0 ;;
+ mips:Linux:*:*)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
#undef CPU
- #undef ${UNAME_MACHINE}
- #undef ${UNAME_MACHINE}el
+ #undef mips
+ #undef mipsel
#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
- CPU=${UNAME_MACHINE}el
+ CPU=mipsel
#else
#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
- CPU=${UNAME_MACHINE}
+ CPU=mips
#else
CPU=
#endif
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+ test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
;;
- or32:Linux:*:*)
- echo or32-unknown-linux-gnu
- exit ;;
- padre:Linux:*:*)
- echo sparc-unknown-linux-gnu
- exit ;;
- parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-unknown-linux-gnu
- 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 | grep ^CPU=`
+ test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+ ;;
+ ppc:Linux:*:*)
+ echo powerpc-unknown-linux-gnu
+ exit 0 ;;
+ ppc64:Linux:*:*)
+ echo powerpc64-unknown-linux-gnu
+ exit 0 ;;
+ 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="libc1" ; else LIBC="" ; fi
+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ exit 0 ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -949,40 +881,84 @@ EOF
PA8*) echo hppa2.0-unknown-linux-gnu ;;
*) echo hppa-unknown-linux-gnu ;;
esac
- exit ;;
- ppc64:Linux:*:*)
- echo powerpc64-unknown-linux-gnu
- exit ;;
- ppc:Linux:*:*)
- echo powerpc-unknown-linux-gnu
- exit ;;
+ exit 0 ;;
+ parisc64:Linux:*:* | hppa64:Linux:*:*)
+ echo hppa64-unknown-linux-gnu
+ exit 0 ;;
s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-ibm-linux
- exit ;;
+ exit 0 ;;
sh64*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
+ exit 0 ;;
sh*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
+ exit 0 ;;
sparc:Linux:*:* | sparc64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- vax:Linux:*:*)
- echo ${UNAME_MACHINE}-dec-linux-gnu
- exit ;;
+ exit 0 ;;
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
- exit ;;
- xtensa*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
+ exit 0 ;;
+ 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-gnu"
+ ;;
+ a.out-i386-linux)
+ echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+ exit 0 ;;
+ coff-i386)
+ echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+ exit 0 ;;
+ "")
+ # Either a pre-BFD a.out linker (linux-gnuoldld) or
+ # one that does not give us useful --help.
+ echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+ exit 0 ;;
+ esac
+ # 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
+ #ifdef __INTEL_COMPILER
+ LIBC=gnu
+ #else
+ LIBC=gnuaout
+ #endif
+ #endif
+EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+ test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
+ test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+ ;;
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
# sysname and nodename.
echo i386-sequent-sysv4
- exit ;;
+ exit 0 ;;
i*86:UNIX_SV:4.2MP:2.*)
# Unixware is an offshoot of SVR4, but it has its own version
# number series starting with 2...
@@ -990,27 +966,24 @@ EOF
# I just have to hope. -- rms.
# Use sysv4.2uw... so that sysv4* matches it.
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
- exit ;;
+ exit 0 ;;
i*86:OS/2:*:*)
# If we were able to find `uname', then EMX Unix compatibility
# is probably installed.
echo ${UNAME_MACHINE}-pc-os2-emx
- exit ;;
+ exit 0 ;;
i*86:XTS-300:*:STOP)
echo ${UNAME_MACHINE}-unknown-stop
- exit ;;
+ exit 0 ;;
i*86:atheos:*:*)
echo ${UNAME_MACHINE}-unknown-atheos
- exit ;;
- i*86:syllable:*:*)
- echo ${UNAME_MACHINE}-pc-syllable
- exit ;;
- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+ exit 0 ;;
+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
echo i386-unknown-lynxos${UNAME_RELEASE}
- exit ;;
+ exit 0 ;;
i*86:*DOS:*:*)
echo ${UNAME_MACHINE}-pc-msdosdjgpp
- exit ;;
+ exit 0 ;;
i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
@@ -1018,16 +991,15 @@ EOF
else
echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
fi
- exit ;;
- i*86:*:5:[678]*)
- # UnixWare 7.x, OpenUNIX and OpenServer 6.
+ exit 0 ;;
+ i*86:*:5:[78]*)
case `/bin/uname -X | grep "^Machine"` in
*486*) UNAME_MACHINE=i486 ;;
*Pentium) UNAME_MACHINE=i586 ;;
*Pent*|*Celeron) UNAME_MACHINE=i686 ;;
esac
echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
- exit ;;
+ exit 0 ;;
i*86:*:3.2:*)
if test -f /usr/options/cb.name; then
UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
@@ -1045,86 +1017,73 @@ EOF
else
echo ${UNAME_MACHINE}-pc-sysv32
fi
- exit ;;
+ exit 0 ;;
pc:*:*:*)
# Left here for compatibility:
# uname -m prints for DJGPP always 'pc', but it prints nothing about
- # the processor, so we play safe by assuming i586.
- # 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 ;;
+ # the processor, so we play safe by assuming i386.
+ echo i386-pc-msdosdjgpp
+ exit 0 ;;
Intel:Mach:3*:*)
echo i386-pc-mach3
- exit ;;
+ exit 0 ;;
paragon:*:*:*)
echo i860-intel-osf1
- exit ;;
+ exit 0 ;;
i860:*:4.*:*) # i860-SVR4
if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
else # Add other i860-SVR4 vendors below as they are discovered.
echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
fi
- exit ;;
+ exit 0 ;;
mini*:CTIX:SYS*5:*)
# "miniframe"
echo m68010-convergent-sysv
- exit ;;
+ exit 0 ;;
mc68k:UNIX:SYSTEM5:3.51m)
echo m68k-convergent-sysv
- exit ;;
+ exit 0 ;;
M680?0:D-NIX:5.3:*)
echo m68k-diab-dnix
- exit ;;
- M68*:*:R3V[5678]*:*)
- test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
- 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
+ exit 0 ;;
+ M68*:*:R3V[567]*:*)
+ test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+ 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
OS_REL=''
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; }
+ && echo i486-ncr-sysv4.3${OS_REL} && exit 0
/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
- && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+ && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
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; } ;;
+ && echo i486-ncr-sysv4 && exit 0 ;;
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
echo m68k-unknown-lynxos${UNAME_RELEASE}
- exit ;;
+ exit 0 ;;
mc68030:UNIX_System_V:4.*:*)
echo m68k-atari-sysv4
- exit ;;
+ exit 0 ;;
TSUNAMI:LynxOS:2.*:*)
echo sparc-unknown-lynxos${UNAME_RELEASE}
- exit ;;
+ exit 0 ;;
rs6000:LynxOS:2.*:*)
echo rs6000-unknown-lynxos${UNAME_RELEASE}
- exit ;;
- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+ exit 0 ;;
+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
echo powerpc-unknown-lynxos${UNAME_RELEASE}
- exit ;;
+ exit 0 ;;
SM[BE]S:UNIX_SV:*:*)
echo mips-dde-sysv${UNAME_RELEASE}
- exit ;;
+ exit 0 ;;
RM*:ReliantUNIX-*:*:*)
echo mips-sni-sysv4
- exit ;;
+ exit 0 ;;
RM*:SINIX-*:*:*)
echo mips-sni-sysv4
- exit ;;
+ exit 0 ;;
*:SINIX-*:*:*)
if uname -p 2>/dev/null >/dev/null ; then
UNAME_MACHINE=`(uname -p) 2>/dev/null`
@@ -1132,94 +1091,68 @@ EOF
else
echo ns32k-sni-sysv
fi
- exit ;;
+ exit 0 ;;
PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
# says <Richard.M.Bartel at ccMail.Census.GOV>
echo i586-unisys-sysv4
- exit ;;
+ exit 0 ;;
*:UNIX_System_V:4*:FTX*)
# From Gerald Hewes <hewes at openmarket.com>.
# How about differentiating between stratus architectures? -djm
echo hppa1.1-stratus-sysv4
- exit ;;
+ exit 0 ;;
*:*:*:FTX*)
# From seanf at swdc.stratus.com.
echo i860-stratus-sysv4
- exit ;;
- i*86:VOS:*:*)
- # From Paul.Green at stratus.com.
- echo ${UNAME_MACHINE}-stratus-vos
- exit ;;
+ exit 0 ;;
*:VOS:*:*)
# From Paul.Green at stratus.com.
echo hppa1.1-stratus-vos
- exit ;;
+ exit 0 ;;
mc68*:A/UX:*:*)
echo m68k-apple-aux${UNAME_RELEASE}
- exit ;;
+ exit 0 ;;
news*:NEWS-OS:6*:*)
echo mips-sony-newsos6
- exit ;;
+ exit 0 ;;
R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
if [ -d /usr/nec ]; then
echo mips-nec-sysv${UNAME_RELEASE}
else
echo mips-unknown-sysv${UNAME_RELEASE}
fi
- exit ;;
+ exit 0 ;;
BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
echo powerpc-be-beos
- exit ;;
+ exit 0 ;;
BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only.
echo powerpc-apple-beos
- exit ;;
+ exit 0 ;;
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 ;;
+ exit 0 ;;
SX-4:SUPER-UX:*:*)
echo sx4-nec-superux${UNAME_RELEASE}
- exit ;;
+ exit 0 ;;
SX-5:SUPER-UX:*:*)
echo sx5-nec-superux${UNAME_RELEASE}
- exit ;;
+ exit 0 ;;
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 ;;
+ exit 0 ;;
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
- exit ;;
+ exit 0 ;;
*:Rhapsody:*:*)
echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
- exit ;;
+ exit 0 ;;
*: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 ;;
+ case `uname -p` in
+ *86) UNAME_PROCESSOR=i686 ;;
+ powerpc) UNAME_PROCESSOR=powerpc ;;
esac
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
- exit ;;
+ exit 0 ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*)
UNAME_PROCESSOR=`uname -p`
if test "$UNAME_PROCESSOR" = "x86"; then
@@ -1227,25 +1160,22 @@ EOF
UNAME_MACHINE=pc
fi
echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
- exit ;;
+ exit 0 ;;
*:QNX:*:4*)
echo i386-pc-qnx
- exit ;;
- NSE-?:NONSTOP_KERNEL:*:*)
- echo nse-tandem-nsk${UNAME_RELEASE}
- exit ;;
- NSR-?:NONSTOP_KERNEL:*:*)
+ exit 0 ;;
+ NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
echo nsr-tandem-nsk${UNAME_RELEASE}
- exit ;;
+ exit 0 ;;
*:NonStop-UX:*:*)
echo mips-compaq-nonstopux
- exit ;;
+ exit 0 ;;
BS2000:POSIX*:*:*)
echo bs2000-siemens-sysv
- exit ;;
+ exit 0 ;;
DS/*:UNIX_System_V:*:*)
echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
- exit ;;
+ exit 0 ;;
*:Plan9:*:*)
# "uname -m" is not consistent, so use $cputype instead. 386
# is converted to i386 for consistency with other x86
@@ -1256,50 +1186,28 @@ EOF
UNAME_MACHINE="$cputype"
fi
echo ${UNAME_MACHINE}-unknown-plan9
- exit ;;
+ exit 0 ;;
*:TOPS-10:*:*)
echo pdp10-unknown-tops10
- exit ;;
+ exit 0 ;;
*:TENEX:*:*)
echo pdp10-unknown-tenex
- exit ;;
+ exit 0 ;;
KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
echo pdp10-dec-tops20
- exit ;;
+ exit 0 ;;
XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
echo pdp10-xkl-tops20
- exit ;;
+ exit 0 ;;
*:TOPS-20:*:*)
echo pdp10-unknown-tops20
- exit ;;
+ exit 0 ;;
*:ITS:*:*)
echo pdp10-unknown-its
- exit ;;
+ exit 0 ;;
SEI:*:*:SEIUX)
echo mips-sei-seiux${UNAME_RELEASE}
- exit ;;
- *:DragonFly:*:*)
- echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
- exit ;;
- *:*VMS:*:*)
- UNAME_MACHINE=`(uname -p) 2>/dev/null`
- case "${UNAME_MACHINE}" in
- A*) echo alpha-dec-vms ; exit ;;
- I*) echo ia64-dec-vms ; exit ;;
- V*) echo vax-dec-vms ; exit ;;
- esac ;;
- *:XENIX:*:SysV)
- echo i386-pc-xenix
- exit ;;
- i*86:skyos:*:*)
- echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
- exit ;;
- i*86:rdos:*:*)
- echo ${UNAME_MACHINE}-pc-rdos
- exit ;;
- i*86:AROS:*:*)
- echo ${UNAME_MACHINE}-pc-aros
- exit ;;
+ exit 0 ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1331,7 +1239,7 @@ main ()
#endif
#if defined (__arm) && defined (__acorn) && defined (__unix)
- printf ("arm-acorn-riscix\n"); exit (0);
+ printf ("arm-acorn-riscix"); exit (0);
#endif
#if defined (hp300) && !defined (hpux)
@@ -1420,12 +1328,11 @@ main ()
}
EOF
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
- { echo "$SYSTEM_NAME"; exit; }
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
# Apollos put the system type in the environment.
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
# Convex versions that predate uname can use getsysinfo(1)
@@ -1434,22 +1341,22 @@ then
case `getsysinfo -f cpu_type` in
c1*)
echo c1-convex-bsd
- exit ;;
+ exit 0 ;;
c2*)
if getsysinfo -f scalar_acc
then echo c32-convex-bsd
else echo c2-convex-bsd
fi
- exit ;;
+ exit 0 ;;
c34*)
echo c34-convex-bsd
- exit ;;
+ exit 0 ;;
c38*)
echo c38-convex-bsd
- exit ;;
+ exit 0 ;;
c4*)
echo c4-convex-bsd
- exit ;;
+ exit 0 ;;
esac
fi
@@ -1460,9 +1367,7 @@ This script, last modified $timestamp, has failed to recognize
the operating system you are using. It is advised that you
download the most up to date version of the config scripts from
- http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-and
- http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+ ftp://ftp.gnu.org/pub/gnu/config/
If the version you run ($0) is already up to date, please
send the following data and any information you think might be
diff --git a/config.sub b/config.sub
index c2d1257..9d7f733 100755
--- a/config.sub
+++ b/config.sub
@@ -1,10 +1,9 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-# Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-timestamp='2010-01-22'
+timestamp='2003-07-04'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -22,26 +21,22 @@ timestamp='2010-01-22'
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
+# Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
-
# Please send patches to <config-patches at gnu.org>. Submit a context
-# diff and a properly formatted GNU ChangeLog entry.
+# diff and a properly formatted ChangeLog entry.
#
# Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument.
# If it is invalid, we print an error message on stderr and exit with code 1.
# Otherwise, we print the canonical config type on stdout and succeed.
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
# This file is supposed to be the same for all GNU packages
# and recognize all the CPU types, system types and aliases
# that are meaningful with *any* GNU software.
@@ -75,9 +70,8 @@ Report bugs and patches to <config-patches at gnu.org>."
version="\
GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
-Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+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."
@@ -89,11 +83,11 @@ Try \`$me --help' for more information."
while test $# -gt 0 ; do
case $1 in
--time-stamp | --time* | -t )
- echo "$timestamp" ; exit ;;
+ echo "$timestamp" ; exit 0 ;;
--version | -v )
- echo "$version" ; exit ;;
+ echo "$version" ; exit 0 ;;
--help | --h* | -h )
- echo "$usage"; exit ;;
+ echo "$usage"; exit 0 ;;
-- ) # Stop option processing
shift; break ;;
- ) # Use stdin as input.
@@ -105,7 +99,7 @@ while test $# -gt 0 ; do
*local*)
# First pass through any local machine types.
echo $1
- exit ;;
+ exit 0;;
* )
break ;;
@@ -124,10 +118,7 @@ esac
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
- kopensolaris*-gnu* | \
- storm-chaos* | os2-emx* | rtmk-nova*)
+ nto-qnx* | linux-gnu* | kfreebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
@@ -153,13 +144,10 @@ case $os in
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
- -apple | -axis | -knuth | -cray | -microblaze)
+ -apple | -axis)
os=
basic_machine=$1
;;
- -bluegene*)
- os=-cnk
- ;;
-sim | -cisco | -oki | -wec | -winbond)
os=
basic_machine=$1
@@ -181,10 +169,6 @@ case $os in
-hiux*)
os=-hiuxwe2
;;
- -sco6)
- os=-sco5v6
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
-sco5)
os=-sco3.2v5
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -201,10 +185,6 @@ case $os in
# Don't forget version if it is 3.2v4 or newer.
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
- -sco5v6*)
- # Don't forget version if it is 3.2v4 or newer.
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
-sco*)
os=-sco3.2v2
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -248,71 +228,53 @@ case $basic_machine in
| a29k \
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- | am33_2.0 \
- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
- | bfin \
+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
- | fido | fr30 | frv \
+ | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
- | ip2k | iq2000 \
- | lm32 \
- | m32c | m32r | m32rle | m68000 | m68k | m88k \
- | maxq | mb | microblaze | mcore | mep | metag \
+ | ip2k \
+ | m32r | m68000 | m68k | m88k | mcore \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
- | mips64octeon | mips64octeonel \
- | mips64orion | mips64orionel \
- | mips64r5900 | mips64r5900el \
| mips64vr | mips64vrel \
+ | mips64orion | mips64orionel \
| mips64vr4100 | mips64vr4100el \
| mips64vr4300 | mips64vr4300el \
| mips64vr5000 | mips64vr5000el \
- | mips64vr5900 | mips64vr5900el \
| mipsisa32 | mipsisa32el \
| mipsisa32r2 | mipsisa32r2el \
| mipsisa64 | mipsisa64el \
- | mipsisa64r2 | mipsisa64r2el \
| mipsisa64sb1 | mipsisa64sb1el \
| mipsisa64sr71k | mipsisa64sr71kel \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
- | moxie \
- | mt \
| msp430 \
- | nios | nios2 \
| ns16k | ns32k \
- | or32 \
+ | openrisc | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
- | rx \
- | score \
- | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
- | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
- | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
- | spu | strongarm \
+ | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
+ | strongarm \
| tahoe | thumb | tic4x | tic80 | tron \
- | ubicom32 \
| v850 | v850e \
| we32k \
- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
- | z8k | z80)
+ | x86 | xscale | xstormy16 | xtensa \
+ | z8k)
basic_machine=$basic_machine-unknown
;;
- m6811 | m68hc11 | m6812 | m68hc12 | picochip)
+ m6811 | m68hc11 | m6812 | m68hc12)
# Motorola 68HC11/12.
basic_machine=$basic_machine-unknown
os=-none
;;
m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
;;
- ms1)
- basic_machine=mt-unknown
- ;;
# We use `pc' rather than `unknown'
# because (1) that's what they normally are, and
@@ -330,71 +292,56 @@ case $basic_machine in
| a29k-* \
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+ | alphapca5[67]-* | alpha64pca5[67]-* | amd64-* | arc-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
- | avr-* | avr32-* \
- | bfin-* | bs2000-* \
+ | avr-* \
+ | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
- | clipper-* | craynv-* | cydra-* \
+ | clipper-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
- | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+ | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
- | ip2k-* | iq2000-* \
- | lm32-* \
- | m32c-* | m32r-* | m32rle-* \
+ | ip2k-* \
+ | m32r-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+ | m88110-* | m88k-* | mcore-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
- | mips64octeon-* | mips64octeonel-* \
- | mips64orion-* | mips64orionel-* \
- | mips64r5900-* | mips64r5900el-* \
| mips64vr-* | mips64vrel-* \
+ | mips64orion-* | mips64orionel-* \
| mips64vr4100-* | mips64vr4100el-* \
| mips64vr4300-* | mips64vr4300el-* \
| mips64vr5000-* | mips64vr5000el-* \
- | mips64vr5900-* | mips64vr5900el-* \
| mipsisa32-* | mipsisa32el-* \
| mipsisa32r2-* | mipsisa32r2el-* \
| mipsisa64-* | mipsisa64el-* \
- | mipsisa64r2-* | mipsisa64r2el-* \
| mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
| mipstx39-* | mipstx39el-* \
- | mmix-* \
- | mt-* \
| msp430-* \
- | nios-* | nios2-* \
- | none-* | np1-* | ns16k-* | ns32k-* \
+ | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
| pyramid-* \
- | romp-* | rs6000-* | rx-* \
- | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ | romp-* | rs6000-* \
+ | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
- | sparclite-* \
- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+ | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
+ | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
| tahoe-* | thumb-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
- | tile-* | tilegx-* \
| tron-* \
- | ubicom32-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
- | xstormy16-* | xtensa*-* \
+ | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
+ | xtensa-* \
| ymp-* \
- | z8k-* | z80-*)
- ;;
- # Recognize the basic CPU types without company name, with glob match.
- xtensa*)
- basic_machine=$basic_machine-unknown
+ | z8k-*)
;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
@@ -412,9 +359,6 @@ case $basic_machine in
basic_machine=a29k-amd
os=-udi
;;
- abacus)
- basic_machine=abacus-unknown
- ;;
adobe68k)
basic_machine=m68010-adobe
os=-scout
@@ -432,9 +376,6 @@ case $basic_machine in
amd64)
basic_machine=x86_64-pc
;;
- amd64-*)
- basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
amdahl)
basic_machine=580-amdahl
os=-sysv
@@ -458,10 +399,6 @@ case $basic_machine in
basic_machine=m68k-apollo
os=-bsd
;;
- aros)
- basic_machine=i386-pc
- os=-aros
- ;;
aux)
basic_machine=m68k-apple
os=-aux
@@ -470,26 +407,10 @@ case $basic_machine in
basic_machine=ns32k-sequent
os=-dynix
;;
- blackfin)
- basic_machine=bfin-unknown
- os=-linux
- ;;
- blackfin-*)
- basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
- os=-linux
- ;;
- bluegene*)
- basic_machine=powerpc-ibm
- os=-cnk
- ;;
c90)
basic_machine=c90-cray
os=-unicos
;;
- cegcc)
- basic_machine=arm-unknown
- os=-cegcc
- ;;
convex-c1)
basic_machine=c1-convex
os=-bsd
@@ -514,27 +435,12 @@ case $basic_machine in
basic_machine=j90-cray
os=-unicos
;;
- craynv)
- basic_machine=craynv-cray
- os=-unicosmp
- ;;
- cr16)
- basic_machine=cr16-unknown
- os=-elf
- ;;
crds | unos)
basic_machine=m68k-crds
;;
- crisv32 | crisv32-* | etraxfs*)
- basic_machine=crisv32-axis
- ;;
cris | cris-* | etrax*)
basic_machine=cris-axis
;;
- crx)
- basic_machine=crx-unknown
- os=-elf
- ;;
da30 | da30-*)
basic_machine=m68k-da30
;;
@@ -557,14 +463,6 @@ case $basic_machine in
basic_machine=m88k-motorola
os=-sysv3
;;
- dicos)
- basic_machine=i686-pc
- os=-dicos
- ;;
- djgpp)
- basic_machine=i586-pc
- os=-msdosdjgpp
- ;;
dpx20 | dpx20-*)
basic_machine=rs6000-bull
os=-bosx
@@ -715,14 +613,6 @@ case $basic_machine in
basic_machine=m68k-isi
os=-sysv
;;
- m68knommu)
- basic_machine=m68k-unknown
- os=-linux
- ;;
- m68knommu-*)
- basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
- os=-linux
- ;;
m88k-omron*)
basic_machine=m88k-omron
;;
@@ -734,17 +624,10 @@ case $basic_machine in
basic_machine=ns32k-utek
os=-sysv
;;
- microblaze)
- basic_machine=microblaze-xilinx
- ;;
mingw32)
basic_machine=i386-pc
os=-mingw32
;;
- mingw32ce)
- basic_machine=arm-unknown
- os=-mingw32ce
- ;;
miniframe)
basic_machine=m68000-convergent
;;
@@ -758,6 +641,10 @@ case $basic_machine in
mips3*)
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
;;
+ mmix*)
+ basic_machine=mmix-knuth
+ os=-mmixware
+ ;;
monitor)
basic_machine=m68k-rom68k
os=-coff
@@ -770,9 +657,6 @@ case $basic_machine in
basic_machine=i386-pc
os=-msdos
;;
- ms1-*)
- basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
- ;;
mvs)
basic_machine=i370-ibm
os=-mvs
@@ -841,6 +725,10 @@ case $basic_machine in
np1)
basic_machine=np1-gould
;;
+ nv1)
+ basic_machine=nv1-cray
+ os=-unicosmp
+ ;;
nsr-tandem)
basic_machine=nsr-tandem
;;
@@ -848,12 +736,9 @@ case $basic_machine in
basic_machine=hppa1.1-oki
os=-proelf
;;
- openrisc | openrisc-*)
+ or32 | or32-*)
basic_machine=or32-unknown
- ;;
- os400)
- basic_machine=powerpc-ibm
- os=-os400
+ os=-coff
;;
OSE68000 | ose68000)
basic_machine=m68000-ericsson
@@ -871,14 +756,6 @@ case $basic_machine in
basic_machine=i860-intel
os=-osf
;;
- parisc)
- basic_machine=hppa-unknown
- os=-linux
- ;;
- parisc-*)
- basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
- os=-linux
- ;;
pbd)
basic_machine=sparc-tti
;;
@@ -888,12 +765,6 @@ case $basic_machine in
pc532 | pc532-*)
basic_machine=ns32k-pc532
;;
- pc98)
- basic_machine=i386-pc
- ;;
- pc98-*)
- basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
pentium | p5 | k5 | k6 | nexgen | viac3)
basic_machine=i586-pc
;;
@@ -950,10 +821,6 @@ case $basic_machine in
basic_machine=i586-unknown
os=-pw32
;;
- rdos)
- basic_machine=i386-pc
- os=-rdos
- ;;
rom68k)
basic_machine=m68k-rom68k
os=-coff
@@ -980,10 +847,6 @@ case $basic_machine in
sb1el)
basic_machine=mipsisa64sb1el-unknown
;;
- sde)
- basic_machine=mipsisa32-sde
- os=-elf
- ;;
sei)
basic_machine=mips-sei
os=-seiux
@@ -995,9 +858,6 @@ case $basic_machine in
basic_machine=sh-hitachi
os=-hms
;;
- sh5el)
- basic_machine=sh5le-unknown
- ;;
sh64)
basic_machine=sh64-unknown
;;
@@ -1087,15 +947,6 @@ case $basic_machine in
basic_machine=tic6x-unknown
os=-coff
;;
- # This must be matched before tile*.
- tilegx*)
- basic_machine=tilegx-unknown
- os=-linux-gnu
- ;;
- tile*)
- basic_machine=tile-unknown
- os=-linux-gnu
- ;;
tx39)
basic_machine=mipstx39-unknown
;;
@@ -1109,10 +960,6 @@ case $basic_machine in
tower | tower-32)
basic_machine=m68k-ncr
;;
- tpf)
- basic_machine=s390x-ibm
- os=-tpf
- ;;
udi29k)
basic_machine=a29k-amd
os=-udi
@@ -1156,10 +1003,6 @@ case $basic_machine in
basic_machine=hppa1.1-winbond
os=-proelf
;;
- xbox)
- basic_machine=i686-pc
- os=-mingw32
- ;;
xps | xps100)
basic_machine=xps100-honeywell
;;
@@ -1171,10 +1014,6 @@ case $basic_machine in
basic_machine=z8k-unknown
os=-sim
;;
- z80-*-coff)
- basic_machine=z80-unknown
- os=-sim
- ;;
none)
basic_machine=none-none
os=-none
@@ -1194,9 +1033,6 @@ case $basic_machine in
romp)
basic_machine=romp-ibm
;;
- mmix)
- basic_machine=mmix-knuth
- ;;
rs6000)
basic_machine=rs6000-ibm
;;
@@ -1213,10 +1049,13 @@ case $basic_machine in
we32k)
basic_machine=we32k-att
;;
- sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+ sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
basic_machine=sh-unknown
;;
- sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+ sh64)
+ basic_machine=sh64-unknown
+ ;;
+ sparc | sparcv9 | sparcv9b)
basic_machine=sparc-sun
;;
cydra)
@@ -1263,9 +1102,6 @@ case $os in
# First match some system type aliases
# that might get confused with valid system types.
# -solaris* is a basic system type, with this one exception.
- -auroraux)
- os=-auroraux
- ;;
-solaris1 | -solaris1.*)
os=`echo $os | sed -e 's|solaris1|sunos4|'`
;;
@@ -1286,30 +1122,25 @@ case $os in
# Each alternative MUST END IN A *, to match a version number.
# -sysv* is not here because it comes later, after sysvr4.
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
- | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- | -sym* | -kopensolaris* \
+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
- | -aos* | -aros* \
+ | -aos* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
- | -openbsd* | -solidbsd* \
- | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
- | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ | -hiux* | -386bsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
+ | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -chorusos* | -chorusrdb* | -cegcc* \
+ | -chorusos* | -chorusrdb* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
- | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1327,15 +1158,12 @@ case $os in
os=`echo $os | sed -e 's|nto|nto-qnx|'`
;;
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
- | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+ | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
| -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
;;
-mac*)
os=`echo $os | sed -e 's|mac|macos|'`
;;
- -linux-dietlibc)
- os=-linux-dietlibc
- ;;
-linux*)
os=`echo $os | sed -e 's|linux|linux-gnu|'`
;;
@@ -1348,9 +1176,6 @@ case $os in
-opened*)
os=-openedition
;;
- -os400*)
- os=-os400
- ;;
-wince*)
os=-wince
;;
@@ -1372,9 +1197,6 @@ case $os in
-atheos*)
os=-atheos
;;
- -syllable*)
- os=-syllable
- ;;
-386bsd)
os=-bsd
;;
@@ -1397,9 +1219,6 @@ case $os in
-sinix*)
os=-sysv4
;;
- -tpf*)
- os=-tpf
- ;;
-triton*)
os=-sysv3
;;
@@ -1436,14 +1255,6 @@ case $os in
-kaos*)
os=-kaos
;;
- -zvmoe)
- os=-zvmoe
- ;;
- -dicos*)
- os=-dicos
- ;;
- -nacl*)
- ;;
-none)
;;
*)
@@ -1466,12 +1277,6 @@ else
# system, and we'll never get to this point.
case $basic_machine in
- score-*)
- os=-elf
- ;;
- spu-*)
- os=-elf
- ;;
*-acorn)
os=-riscix1.2
;;
@@ -1481,9 +1286,9 @@ case $basic_machine in
arm*-semi)
os=-aout
;;
- c4x-* | tic4x-*)
- os=-coff
- ;;
+ c4x-* | tic4x-*)
+ os=-coff
+ ;;
# This must come before the *-dec entry.
pdp10-*)
os=-tops20
@@ -1509,9 +1314,6 @@ case $basic_machine in
m68*-cisco)
os=-aout
;;
- mep-*)
- os=-elf
- ;;
mips*-cisco)
os=-elf
;;
@@ -1530,15 +1332,9 @@ case $basic_machine in
*-be)
os=-beos
;;
- *-haiku)
- os=-haiku
- ;;
*-ibm)
os=-aix
;;
- *-knuth)
- os=-mmixware
- ;;
*-wec)
os=-proelf
;;
@@ -1641,7 +1437,7 @@ case $basic_machine in
-sunos*)
vendor=sun
;;
- -cnk*|-aix*)
+ -aix*)
vendor=ibm
;;
-beos*)
@@ -1671,15 +1467,9 @@ case $basic_machine in
-mvs* | -opened*)
vendor=ibm
;;
- -os400*)
- vendor=ibm
- ;;
-ptx*)
vendor=sequent
;;
- -tpf*)
- vendor=ibm
- ;;
-vxsim* | -vxworks* | -windiss*)
vendor=wrs
;;
@@ -1704,7 +1494,7 @@ case $basic_machine in
esac
echo $basic_machine$os
-exit
+exit 0
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
diff --git a/configure b/configure
index 25851b4..49332bc 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for banshee-1 1.9.0.
+# Generated by GNU Autoconf 2.68 for banshee-1 1.9.1.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=banshee>.
#
@@ -91,6 +91,7 @@ fi
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
+as_myself=
case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -173,6 +174,14 @@ test x\$exitcode = x0 || exit 1"
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+
+ test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
+ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+ ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+ PATH=/empty FPATH=/empty; export PATH FPATH
+ test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
+ || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1
test \$(( 1 + 1 )) = 2 || exit 1"
if (eval "$as_required") 2>/dev/null; then :
as_have_required=yes
@@ -216,11 +225,18 @@ IFS=$as_save_IFS
# 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
- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+ 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+"$@"}
fi
if test x$as_have_required = xno; then :
@@ -529,155 +545,8 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
# Sed expression to map a string onto a valid variable name.
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# Check that we are running under the correct shell.
SHELL=${CONFIG_SHELL-/bin/sh}
-case X$lt_ECHO in
-X*--fallback-echo)
- # Remove one level of quotation (which was required for Make).
- ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
- ;;
-esac
-
-ECHO=${lt_ECHO-echo}
-if test "X$1" = X--no-reexec; then
- # Discard the --no-reexec flag, and continue.
- shift
-elif test "X$1" = X--fallback-echo; then
- # Avoid inline document here, it may be left over
- :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
- # Yippee, $ECHO works!
- :
-else
- # Restart under the correct shell.
- exec $SHELL "$0" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
- # used as fallback echo
- shift
- cat <<_LT_EOF
-$*
-_LT_EOF
- exit 0
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test -z "$lt_ECHO"; then
- if test "X${echo_test_string+set}" != Xset; then
- # find a string as large as possible, as long as the shell can cope with it
- for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
- if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
- { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
- then
- break
- fi
- done
- fi
-
- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- :
- else
- # The Solaris, AIX, and Digital Unix default echo programs unquote
- # backslashes. This makes it impossible to quote backslashes using
- # echo "$something" | sed 's/\\/\\\\/g'
- #
- # So, first we look for a working echo in the user's PATH.
-
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- for dir in $PATH /usr/ucb; do
- IFS="$lt_save_ifs"
- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- ECHO="$dir/echo"
- break
- fi
- done
- IFS="$lt_save_ifs"
-
- if test "X$ECHO" = Xecho; then
- # We didn't find a better echo, so look for alternatives.
- if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- # This shell has a builtin print -r that does the trick.
- ECHO='print -r'
- elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
- test "X$CONFIG_SHELL" != X/bin/ksh; then
- # If we have ksh, try running configure again with it.
- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
- export ORIGINAL_CONFIG_SHELL
- CONFIG_SHELL=/bin/ksh
- export CONFIG_SHELL
- exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
- else
- # Try using printf.
- ECHO='printf %s\n'
- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- # Cool, printf works
- :
- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
- test "X$echo_testing_string" = 'X\t' &&
- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
- export CONFIG_SHELL
- SHELL="$CONFIG_SHELL"
- export SHELL
- ECHO="$CONFIG_SHELL $0 --fallback-echo"
- elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
- test "X$echo_testing_string" = 'X\t' &&
- echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- ECHO="$CONFIG_SHELL $0 --fallback-echo"
- else
- # maybe with a smaller string...
- prev=:
-
- for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
- if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
- then
- break
- fi
- prev="$cmd"
- done
-
- if test "$prev" != 'sed 50q "$0"'; then
- echo_test_string=`eval $prev`
- export echo_test_string
- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
- else
- # Oops. We lost completely, so just stick with echo.
- ECHO=echo
- fi
- fi
- fi
- fi
- fi
-fi
-
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-lt_ECHO=$ECHO
-if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
- lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
-fi
-
-
-
test -n "$DJDIR" || exec 7<&0 </dev/null
exec 6>&1
@@ -702,8 +571,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='banshee-1'
PACKAGE_TARNAME='banshee-1'
-PACKAGE_VERSION='1.9.0'
-PACKAGE_STRING='banshee-1 1.9.0'
+PACKAGE_VERSION='1.9.1'
+PACKAGE_STRING='banshee-1 1.9.1'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=banshee'
PACKAGE_URL=''
@@ -785,6 +654,14 @@ ENABLE_GAPLESS_FALSE
ENABLE_GAPLESS_TRUE
GST_PLUGINS_BASE_LIBS
GST_PLUGINS_BASE_CFLAGS
+ENABLE_UBUNTUONE_FALSE
+ENABLE_UBUNTUONE_TRUE
+UBUNTUONESHARP_LIBS
+UBUNTUONESHARP_CFLAGS
+ENABLE_SOUNDMENU_FALSE
+ENABLE_SOUNDMENU_TRUE
+INDICATESHARP_LIBS
+INDICATESHARP_CFLAGS
HAVE_MEEGO_FALSE
HAVE_MEEGO_TRUE
HAVE_MONOTORRENT_DBUS_FALSE
@@ -950,6 +827,10 @@ GST_SHARP_LIBS
GST_SHARP_CFLAGS
ENABLE_BUILTIN_EQUALIZER_FALSE
ENABLE_BUILTIN_EQUALIZER_TRUE
+HAVE_GST_0_10_26_FALSE
+HAVE_GST_0_10_26_TRUE
+GST_0_10_26_LIBS
+GST_0_10_26_CFLAGS
GST_LIBS
GST_CFLAGS
GSTREAMER_REQUIRED_VERSION
@@ -991,7 +872,6 @@ OTOOL
LIPO
NMEDIT
DSYMUTIL
-lt_ECHO
RANLIB
AR
OBJDUMP
@@ -1166,6 +1046,8 @@ enable_daap
enable_remote_audio
enable_torrent
enable_meego
+enable_soundmenu
+enable_ubuntuone
enable_gapless_playback
enable_podcast
enable_release
@@ -1181,6 +1063,11 @@ LDFLAGS
LIBS
CPPFLAGS
CPP
+CPPFLAGS
+CC
+LDFLAGS
+LIBS
+CPPFLAGS
PKG_CONFIG
PKG_CONFIG_PATH
PKG_CONFIG_LIBDIR
@@ -1194,6 +1081,8 @@ CLUTTER_CFLAGS
CLUTTER_LIBS
GST_CFLAGS
GST_LIBS
+GST_0_10_26_CFLAGS
+GST_0_10_26_LIBS
GST_SHARP_CFLAGS
GST_SHARP_LIBS
BNPX_GTK_CFLAGS
@@ -1203,6 +1092,7 @@ XVIDMODE_CFLAGS
XVIDMODE_LIBS
GNOME_DOC_UTILS_CFLAGS
GNOME_DOC_UTILS_LIBS
+GNOME_DOC_UTILS_LIBS
MONO_MODULE_CFLAGS
MONO_MODULE_LIBS
MONO_2_4_3_CFLAGS
@@ -1229,6 +1119,10 @@ LIBSOUP_GNOME_CFLAGS
LIBSOUP_GNOME_LIBS
GDATASHARP_CFLAGS
GDATASHARP_LIBS
+GDATASHARP_CFLAGS
+GDATASHARP_LIBS
+GDATASHARP_CFLAGS
+GDATASHARP_LIBS
GTKSHARP_BEANS_CFLAGS
GTKSHARP_BEANS_LIBS
GIOSHARP_CFLAGS
@@ -1243,6 +1137,8 @@ MOONLIGHT_CFLAGS
MOONLIGHT_LIBS
NUNIT_CFLAGS
NUNIT_LIBS
+NUNIT_CFLAGS
+NUNIT_LIBS
TAGLIB_SHARP_CFLAGS
TAGLIB_SHARP_LIBS
GTKSHARP_CFLAGS
@@ -1269,8 +1165,14 @@ KARMASHARP_CFLAGS
KARMASHARP_LIBS
MONO_ZEROCONF_CFLAGS
MONO_ZEROCONF_LIBS
+MONO_ZEROCONF_CFLAGS
+MONO_ZEROCONF_LIBS
MONOTORRENT_DBUS_CFLAGS
MONOTORRENT_DBUS_LIBS
+INDICATESHARP_CFLAGS
+INDICATESHARP_LIBS
+UBUNTUONESHARP_CFLAGS
+UBUNTUONESHARP_LIBS
GST_PLUGINS_BASE_CFLAGS
GST_PLUGINS_BASE_LIBS'
@@ -1677,7 +1579,7 @@ Try \`$0 --help' for more information"
$as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
$as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
;;
esac
@@ -1815,7 +1717,7 @@ if test "$ac_init_help" = "long"; then
# 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 banshee-1 1.9.0 to adapt to many kinds of systems.
+\`configure' configures banshee-1 1.9.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1889,7 +1791,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of banshee-1 1.9.0:";;
+ short | recursive ) echo "Configuration of banshee-1 1.9.1:";;
esac
cat <<\_ACEOF
@@ -1934,6 +1836,8 @@ Optional Features:
--disable-remote-audio Disable Remote Audio support
--enable-torrent Enable BitTorrent support - still in development
--enable-meego Enable MeeGo integration
+ --enable-soundmenu Enable sound menu support
+ --enable-ubuntuone Enable Ubuntu One Music Store support
--enable-gapless-playback
Enable gapless playback engine (requires
gst-plugins-base > 0.10.25.2)
@@ -1989,6 +1893,10 @@ Some influential environment variables:
linker flags for CLUTTER, overriding pkg-config
GST_CFLAGS C compiler flags for GST, overriding pkg-config
GST_LIBS linker flags for GST, overriding pkg-config
+ GST_0_10_26_CFLAGS
+ C compiler flags for GST_0_10_26, overriding pkg-config
+ GST_0_10_26_LIBS
+ linker flags for GST_0_10_26, overriding pkg-config
GST_SHARP_CFLAGS
C compiler flags for GST_SHARP, overriding pkg-config
GST_SHARP_LIBS
@@ -2137,6 +2045,14 @@ Some influential environment variables:
C compiler flags for MONOTORRENT_DBUS, overriding pkg-config
MONOTORRENT_DBUS_LIBS
linker flags for MONOTORRENT_DBUS, overriding pkg-config
+ INDICATESHARP_CFLAGS
+ C compiler flags for INDICATESHARP, overriding pkg-config
+ INDICATESHARP_LIBS
+ linker flags for INDICATESHARP, overriding pkg-config
+ UBUNTUONESHARP_CFLAGS
+ C compiler flags for UBUNTUONESHARP, overriding pkg-config
+ UBUNTUONESHARP_LIBS
+ linker flags for UBUNTUONESHARP, overriding pkg-config
GST_PLUGINS_BASE_CFLAGS
C compiler flags for GST_PLUGINS_BASE, overriding pkg-config
GST_PLUGINS_BASE_LIBS
@@ -2208,8 +2124,8 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-banshee-1 configure 1.9.0
-generated by GNU Autoconf 2.67
+banshee-1 configure 1.9.1
+generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
@@ -2255,7 +2171,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_retval=1
fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
as_fn_set_status $ac_retval
} # ac_fn_c_try_compile
@@ -2301,7 +2217,7 @@ fi
# interfere with the next link command; also delete a directory that is
# left behind by Apple's compiler. We do this before executing the actions.
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
as_fn_set_status $ac_retval
} # ac_fn_c_try_link
@@ -2314,7 +2230,7 @@ ac_fn_c_check_func ()
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2369,7 +2285,7 @@ fi
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
} # ac_fn_c_check_func
@@ -2382,7 +2298,7 @@ ac_fn_c_check_header_compile ()
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2400,7 +2316,7 @@ fi
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
} # ac_fn_c_check_header_compile
@@ -2436,7 +2352,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_retval=1
fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
as_fn_set_status $ac_retval
} # ac_fn_c_try_cpp
@@ -2478,7 +2394,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_retval=$ac_status
fi
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
as_fn_set_status $ac_retval
} # ac_fn_c_try_run
@@ -2492,7 +2408,7 @@ ac_fn_c_check_member ()
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
$as_echo_n "checking for $2.$3... " >&6; }
-if eval "test \"\${$4+set}\"" = set; then :
+if eval \${$4+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2536,7 +2452,7 @@ fi
eval ac_res=\$$4
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
} # ac_fn_c_check_member
@@ -2713,7 +2629,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
rm -f conftest.val
fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
as_fn_set_status $ac_retval
} # ac_fn_c_compute_int
@@ -2726,10 +2642,10 @@ rm -f conftest.val
ac_fn_c_check_header_mongrel ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if eval "test \"\${$3+set}\"" = set; then :
+ if eval \${$3+:} false; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
$as_echo_n "(cached) " >&6
fi
eval ac_res=\$$3
@@ -2796,7 +2712,7 @@ $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
$as_echo_n "(cached) " >&6
else
eval "$3=\$ac_header_compiler"
@@ -2805,15 +2721,15 @@ eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
} # ac_fn_c_check_header_mongrel
cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by banshee-1 $as_me 1.9.0, which was
-generated by GNU Autoconf 2.67. Invocation command line was
+It was created by banshee-1 $as_me 1.9.1, which was
+generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -3071,7 +2987,7 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
|| { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
fi
done
@@ -3209,7 +3125,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
$as_echo_n "checking for a BSD-compatible install... " >&6; }
if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then :
+if ${ac_cv_path_install+:} false; then :
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -3296,11 +3212,11 @@ am_lf='
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
- as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
+ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
esac
case $srcdir in
*[\\\"\#\$\&\'\`$am_lf\ \ ]*)
- as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
+ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
esac
# Do `set' in a subshell so we don't clobber the current shell's
@@ -3386,7 +3302,7 @@ if test "$cross_compiling" != no; then
set dummy ${ac_tool_prefix}strip; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then :
+if ${ac_cv_prog_STRIP+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
@@ -3426,7 +3342,7 @@ if test -z "$ac_cv_prog_STRIP"; then
set dummy strip; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
@@ -3479,7 +3395,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
if test -z "$MKDIR_P"; then
- if test "${ac_cv_path_mkdir+set}" = set; then :
+ if ${ac_cv_path_mkdir+:} false; then :
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -3530,7 +3446,7 @@ do
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then :
+if ${ac_cv_prog_AWK+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
@@ -3570,7 +3486,7 @@ done
$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
set x ${MAKE-make}
ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
@@ -3628,7 +3544,7 @@ fi
# Define the identity of the package.
PACKAGE='banshee-1'
- VERSION='1.9.0'
+ VERSION='1.9.1'
cat >>confdefs.h <<_ACEOF
@@ -3736,7 +3652,7 @@ do
done
rm -rf conftest.dir
-if test "${am_cv_prog_tar_ustar+set}" = set; then :
+if ${am_cv_prog_tar_ustar+:} false; then :
$as_echo_n "(cached) " >&6
else
am_cv_prog_tar_ustar=$_am_tool
@@ -3864,7 +3780,7 @@ if test -n "$ac_tool_prefix"; then
set dummy ${ac_tool_prefix}gcc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -3904,7 +3820,7 @@ if test -z "$ac_cv_prog_CC"; then
set dummy gcc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
@@ -3957,7 +3873,7 @@ if test -z "$CC"; then
set dummy ${ac_tool_prefix}cc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -3997,7 +3913,7 @@ if test -z "$CC"; then
set dummy cc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -4056,7 +3972,7 @@ if test -z "$CC"; then
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -4100,7 +4016,7 @@ do
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
@@ -4155,7 +4071,7 @@ fi
test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
# Provide some information about the compiler.
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -4270,7 +4186,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -4313,7 +4229,7 @@ else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
fi
rm -f conftest conftest$ac_cv_exeext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -4372,7 +4288,7 @@ $as_echo "$ac_try_echo"; } >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot run C compiled programs.
If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
fi
fi
fi
@@ -4383,7 +4299,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
ac_clean_files=$ac_clean_files_save
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
$as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then :
+if ${ac_cv_objext+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4424,7 +4340,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
@@ -4434,7 +4350,7 @@ OBJEXT=$ac_cv_objext
ac_objext=$OBJEXT
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+if ${ac_cv_c_compiler_gnu+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4471,7 +4387,7 @@ ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
+if ${ac_cv_prog_cc_g+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_save_c_werror_flag=$ac_c_werror_flag
@@ -4549,7 +4465,7 @@ else
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+if ${ac_cv_prog_cc_c89+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_cv_prog_cc_c89=no
@@ -4648,7 +4564,7 @@ depcc="$CC" am_compiler_list=
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
$as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -4800,7 +4716,7 @@ fi
set dummy intltool-update; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then :
+if ${ac_cv_path_INTLTOOL_UPDATE+:} false; then :
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_UPDATE in
@@ -4840,7 +4756,7 @@ fi
set dummy intltool-merge; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then :
+if ${ac_cv_path_INTLTOOL_MERGE+:} false; then :
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_MERGE in
@@ -4880,7 +4796,7 @@ fi
set dummy intltool-extract; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then :
+if ${ac_cv_path_INTLTOOL_EXTRACT+:} false; then :
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_EXTRACT in
@@ -5041,7 +4957,7 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcar
set dummy xgettext; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_XGETTEXT+set}" = set; then :
+if ${ac_cv_path_XGETTEXT+:} false; then :
$as_echo_n "(cached) " >&6
else
case $XGETTEXT in
@@ -5081,7 +4997,7 @@ fi
set dummy msgmerge; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSGMERGE+set}" = set; then :
+if ${ac_cv_path_MSGMERGE+:} false; then :
$as_echo_n "(cached) " >&6
else
case $MSGMERGE in
@@ -5121,7 +5037,7 @@ fi
set dummy msgfmt; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSGFMT+set}" = set; then :
+if ${ac_cv_path_MSGFMT+:} false; then :
$as_echo_n "(cached) " >&6
else
case $MSGFMT in
@@ -5161,7 +5077,7 @@ fi
set dummy gmsgfmt; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GMSGFMT+set}" = set; then :
+if ${ac_cv_path_GMSGFMT+:} false; then :
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
@@ -5212,7 +5128,7 @@ fi
set dummy perl; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then :
+if ${ac_cv_path_INTLTOOL_PERL+:} false; then :
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_PERL in
@@ -5296,7 +5212,7 @@ else
case $host in
*-*-solaris*)
ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
+if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
DATADIRNAME=share
else
DATADIRNAME=lib
@@ -5324,8 +5240,8 @@ esac
-macro_version='2.2.6b'
-macro_revision='1.3017'
+macro_version='2.2.10'
+macro_revision='1.3175'
@@ -5347,7 +5263,7 @@ $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
$as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then :
+if ${ac_cv_build+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_build_alias=$build_alias
@@ -5363,7 +5279,7 @@ fi
$as_echo "$ac_cv_build" >&6; }
case $ac_cv_build in
*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
@@ -5381,7 +5297,7 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
$as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then :
+if ${ac_cv_host+:} false; then :
$as_echo_n "(cached) " >&6
else
if test "x$host_alias" = x; then
@@ -5396,7 +5312,7 @@ fi
$as_echo "$ac_cv_host" >&6; }
case $ac_cv_host in
*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
@@ -5412,9 +5328,78 @@ IFS=$ac_save_IFS
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
+$as_echo_n "checking how to print strings... " >&6; }
+# Test print first, because it will be a builtin if present.
+if test "X`print -r -- -n 2>/dev/null`" = X-n && \
+ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+ ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+ ECHO='printf %s\n'
+else
+ # Use this function as a fallback that always works.
+ func_fallback_echo ()
+ {
+ eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+ }
+ ECHO='func_fallback_echo'
+fi
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+ $ECHO ""
+}
+
+case "$ECHO" in
+ printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
+$as_echo "printf" >&6; } ;;
+ print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
+$as_echo "print -r" >&6; } ;;
+ *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
+$as_echo "cat" >&6; } ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if test "${ac_cv_path_SED+set}" = set; then :
+if ${ac_cv_path_SED+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
@@ -5496,7 +5481,7 @@ Xsed="$SED -e 1s/^X//"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then :
+if ${ac_cv_path_GREP+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
@@ -5559,7 +5544,7 @@ $as_echo "$ac_cv_path_GREP" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
$as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then :
+if ${ac_cv_path_EGREP+:} false; then :
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -5626,7 +5611,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
$as_echo_n "checking for fgrep... " >&6; }
-if test "${ac_cv_path_FGREP+set}" = set; then :
+if ${ac_cv_path_FGREP+:} false; then :
$as_echo_n "(cached) " >&6
else
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
@@ -5757,7 +5742,7 @@ else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
$as_echo_n "checking for non-GNU ld... " >&6; }
fi
-if test "${lt_cv_path_LD+set}" = set; then :
+if ${lt_cv_path_LD+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
@@ -5797,7 +5782,7 @@ fi
test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if test "${lt_cv_prog_gnu_ld+set}" = set; then :
+if ${lt_cv_prog_gnu_ld+:} false; then :
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
@@ -5824,7 +5809,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
-if test "${lt_cv_path_NM+set}" = set; then :
+if ${lt_cv_path_NM+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
@@ -5877,14 +5862,17 @@ if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
else
# Didn't find any BSD compatible name lister, look for dumpbin.
- if test -n "$ac_tool_prefix"; then
- for ac_prog in "dumpbin -symbols" "link -dump -symbols"
+ if test -n "$DUMPBIN"; then :
+ # Let the user override the test.
+ else
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in dumpbin "link -dump"
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
+if ${ac_cv_prog_DUMPBIN+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$DUMPBIN"; then
@@ -5922,13 +5910,13 @@ fi
fi
if test -z "$DUMPBIN"; then
ac_ct_DUMPBIN=$DUMPBIN
- for ac_prog in "dumpbin -symbols" "link -dump -symbols"
+ for ac_prog in dumpbin "link -dump"
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
+if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DUMPBIN"; then
@@ -5977,6 +5965,15 @@ esac
fi
fi
+ case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+ *COFF*)
+ DUMPBIN="$DUMPBIN -symbols"
+ ;;
+ *)
+ DUMPBIN=:
+ ;;
+ esac
+ fi
if test "$DUMPBIN" != ":"; then
NM="$DUMPBIN"
@@ -5991,18 +5988,18 @@ test -z "$NM" && NM=nm
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
$as_echo_n "checking the name lister ($NM) interface... " >&6; }
-if test "${lt_cv_nm_interface+set}" = set; then :
+if ${lt_cv_nm_interface+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:5999: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:6002: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:6005: output\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -6026,7 +6023,7 @@ fi
# find the maximum length of command line arguments
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
$as_echo_n "checking the maximum length of command line arguments... " >&6; }
-if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
+if ${lt_cv_sys_max_cmd_len+:} false; then :
$as_echo_n "(cached) " >&6
else
i=0
@@ -6059,6 +6056,11 @@ else
lt_cv_sys_max_cmd_len=8192;
;;
+ mint*)
+ # On MiNT this can take a long time and run out of memory.
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
+
amigaos*)
# On AmigaOS with pdksh, this test takes hours, literally.
# So we just punt and use a minimum line length of 8192.
@@ -6123,8 +6125,8 @@ else
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
# we can't tell.
- while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
- = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
+ while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+ = "X$teststring$teststring"; } >/dev/null 2>&1 &&
test $i != 17 # 1/2 MB should be enough
do
i=`expr $i + 1`
@@ -6218,7 +6220,7 @@ esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
$as_echo_n "checking for $LD option to reload object files... " >&6; }
-if test "${lt_cv_ld_reload_flag+set}" = set; then :
+if ${lt_cv_ld_reload_flag+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_ld_reload_flag='-r'
@@ -6254,7 +6256,7 @@ if test -n "$ac_tool_prefix"; then
set dummy ${ac_tool_prefix}objdump; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
+if ${ac_cv_prog_OBJDUMP+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
@@ -6294,7 +6296,7 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
set dummy objdump; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
+if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
@@ -6353,7 +6355,7 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
$as_echo_n "checking how to recognize dependent libraries... " >&6; }
-if test "${lt_cv_deplibs_check_method+set}" = set; then :
+if ${lt_cv_deplibs_check_method+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
@@ -6395,16 +6397,18 @@ mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
# func_win32_libid shell function, so use a weaker test based on 'objdump',
# unless we find 'file', for example because we are cross-compiling.
- if ( file / ) >/dev/null 2>&1; then
+ # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
+ if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
lt_cv_file_magic_cmd='func_win32_libid'
else
- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+ # Keep this pattern in sync with the one in func_win32_libid.
+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
lt_cv_file_magic_cmd='$OBJDUMP -f'
fi
;;
-cegcc)
+cegcc*)
# use the weaker test based on 'objdump'. See mingw*.
lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
lt_cv_file_magic_cmd='$OBJDUMP -f'
@@ -6434,6 +6438,10 @@ gnu*)
lt_cv_deplibs_check_method=pass_all
;;
+haiku*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
case $host_cpu in
@@ -6442,11 +6450,11 @@ hpux10.20* | hpux11*)
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
;;
hppa*64*)
- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
;;
*)
- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
lt_cv_file_magic_test_file=/usr/lib/libc.sl
;;
esac
@@ -6472,7 +6480,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
-netbsd* | netbsdelf*-gnu)
+netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
@@ -6569,7 +6577,7 @@ if test -n "$ac_tool_prefix"; then
set dummy ${ac_tool_prefix}ar; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AR+set}" = set; then :
+if ${ac_cv_prog_AR+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$AR"; then
@@ -6609,7 +6617,7 @@ if test -z "$ac_cv_prog_AR"; then
set dummy ar; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AR"; then
@@ -6674,7 +6682,7 @@ if test -n "$ac_tool_prefix"; then
set dummy ${ac_tool_prefix}strip; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then :
+if ${ac_cv_prog_STRIP+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
@@ -6714,7 +6722,7 @@ if test -z "$ac_cv_prog_STRIP"; then
set dummy strip; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
@@ -6773,7 +6781,7 @@ if test -n "$ac_tool_prefix"; then
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then :
+if ${ac_cv_prog_RANLIB+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
@@ -6813,7 +6821,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
set dummy ranlib; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
@@ -6884,6 +6892,18 @@ if test -n "$RANLIB"; then
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
fi
+case $host_os in
+ darwin*)
+ lock_old_archive_extraction=yes ;;
+ *)
+ lock_old_archive_extraction=no ;;
+esac
+
+
+
+
+
+
@@ -6930,7 +6950,7 @@ compiler=$CC
# Check for command to grab the raw symbol name followed by C symbol from nm.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
+if ${lt_cv_sys_global_symbol_pipe+:} false; then :
$as_echo_n "(cached) " >&6
else
@@ -7053,8 +7073,8 @@ _LT_EOF
test $ac_status = 0; }; then
# Now try to grab the symbols.
nlist=conftest.nm
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
- (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
+ (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; } && test -s "$nlist"; then
@@ -7207,7 +7227,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 7210 "configure"' > conftest.$ac_ext
+ echo '#line '$LINENO' "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7301,7 +7321,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
CFLAGS="$CFLAGS -belf"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
-if test "${lt_cv_cc_needs_belf+set}" = set; then :
+if ${lt_cv_cc_needs_belf+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_ext=c
@@ -7377,7 +7397,7 @@ need_locks="$enable_libtool_lock"
set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
+if ${ac_cv_prog_DSYMUTIL+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$DSYMUTIL"; then
@@ -7417,7 +7437,7 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
set dummy dsymutil; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
+if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DSYMUTIL"; then
@@ -7469,7 +7489,7 @@ fi
set dummy ${ac_tool_prefix}nmedit; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_NMEDIT+set}" = set; then :
+if ${ac_cv_prog_NMEDIT+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$NMEDIT"; then
@@ -7509,7 +7529,7 @@ if test -z "$ac_cv_prog_NMEDIT"; then
set dummy nmedit; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
+if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_NMEDIT"; then
@@ -7561,7 +7581,7 @@ fi
set dummy ${ac_tool_prefix}lipo; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_LIPO+set}" = set; then :
+if ${ac_cv_prog_LIPO+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$LIPO"; then
@@ -7601,7 +7621,7 @@ if test -z "$ac_cv_prog_LIPO"; then
set dummy lipo; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
+if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_LIPO"; then
@@ -7653,7 +7673,7 @@ fi
set dummy ${ac_tool_prefix}otool; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OTOOL+set}" = set; then :
+if ${ac_cv_prog_OTOOL+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL"; then
@@ -7693,7 +7713,7 @@ if test -z "$ac_cv_prog_OTOOL"; then
set dummy otool; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
+if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL"; then
@@ -7745,7 +7765,7 @@ fi
set dummy ${ac_tool_prefix}otool64; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OTOOL64+set}" = set; then :
+if ${ac_cv_prog_OTOOL64+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL64"; then
@@ -7785,7 +7805,7 @@ if test -z "$ac_cv_prog_OTOOL64"; then
set dummy otool64; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
+if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL64"; then
@@ -7860,7 +7880,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
$as_echo_n "checking for -single_module linker flag... " >&6; }
-if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
+if ${lt_cv_apple_cc_single_mod+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
@@ -7889,7 +7909,7 @@ fi
$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
+if ${lt_cv_ld_exported_symbols_list+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_ld_exported_symbols_list=no
@@ -7919,6 +7939,38 @@ rm -f core conftest.err conftest.$ac_objext \
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+$as_echo_n "checking for -force_load linker flag... " >&6; }
+if ${lt_cv_ld_force_load+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_ld_force_load=no
+ cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+ echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
+ $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
+ echo "$AR cru libconftest.a conftest.o" >&5
+ $AR cru libconftest.a conftest.o 2>&5
+ echo "$RANLIB libconftest.a" >&5
+ $RANLIB libconftest.a 2>&5
+ cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
+ $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+ _lt_result=$?
+ if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+ lt_cv_ld_force_load=yes
+ else
+ cat conftest.err >&5
+ fi
+ rm -f conftest.err libconftest.a conftest conftest.c
+ rm -rf conftest.dSYM
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
+$as_echo "$lt_cv_ld_force_load" >&6; }
case $host_os in
rhapsody* | darwin1.[012])
_lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
@@ -7946,7 +7998,7 @@ $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
else
_lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
fi
- if test "$DSYMUTIL" != ":"; then
+ if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
_lt_dsymutil='~$DSYMUTIL $lib || :'
else
_lt_dsymutil=
@@ -7966,7 +8018,7 @@ if test -n "$CPP" && test -d "$CPP"; then
CPP=
fi
if test -z "$CPP"; then
- if test "${ac_cv_prog_CPP+set}" = set; then :
+ if ${ac_cv_prog_CPP+:} false; then :
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
@@ -8082,7 +8134,7 @@ else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
fi
ac_ext=c
@@ -8094,7 +8146,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
$as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
+if ${ac_cv_header_stdc+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8225,7 +8277,7 @@ for ac_header in dlfcn.h
do :
ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
"
-if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
+if test "x$ac_cv_header_dlfcn_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_DLFCN_H 1
_ACEOF
@@ -8236,6 +8288,8 @@ done
+
+
# Set options
@@ -8388,6 +8442,7 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+
test -z "$LN_S" && LN_S="ln -s"
@@ -8409,7 +8464,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
$as_echo_n "checking for objdir... " >&6; }
-if test "${lt_cv_objdir+set}" = set; then :
+if ${lt_cv_objdir+:} false; then :
$as_echo_n "(cached) " >&6
else
rm -f .libs 2>/dev/null
@@ -8437,19 +8492,6 @@ _ACEOF
-
-
-
-
-
-
-
-
-
-
-
-
-
case $host_os in
aix3*)
# AIX sometimes has problems with the GCC collect2 program. For some
@@ -8462,23 +8504,6 @@ aix3*)
;;
esac
-# Sed substitution that helps us do robust quoting. It backslashifies
-# metacharacters that are still active within double-quoted strings.
-sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
# Global variables:
ofile=libtool
can_build_shared=yes
@@ -8507,7 +8532,7 @@ for cc_temp in $compiler""; do
*) break;;
esac
done
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
# Only perform the check for file, if the check method requires it
@@ -8517,7 +8542,7 @@ file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
@@ -8583,7 +8608,7 @@ if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
$as_echo_n "checking for file... " >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
@@ -8712,11 +8737,16 @@ if test -n "$compiler"; then
lt_prog_compiler_no_builtin_flag=
if test "$GCC" = yes; then
- lt_prog_compiler_no_builtin_flag=' -fno-builtin'
+ case $cc_basename in
+ nvcc*)
+ lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
+ *)
+ lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
+ esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
+if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_rtti_exceptions=no
@@ -8732,15 +8762,15 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8735: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8739: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_rtti_exceptions=yes
@@ -8818,6 +8848,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
lt_prog_compiler_pic='-fno-common'
;;
+ haiku*)
+ # PIC is the default for Haiku.
+ # The "-static" flag exists, but is broken.
+ lt_prog_compiler_static=
+ ;;
+
hpux*)
# PIC is the default for 64-bit PA HP-UX, but not for 32-bit
# PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
@@ -8860,6 +8896,13 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
lt_prog_compiler_pic='-fPIC'
;;
esac
+
+ case $cc_basename in
+ nvcc*) # Cuda Compiler Driver 2.2
+ lt_prog_compiler_wl='-Xlinker '
+ lt_prog_compiler_pic='-Xcompiler -fPIC'
+ ;;
+ esac
else
# PORTME Check for flag to pass linker flags through the system compiler.
case $host_os in
@@ -8922,7 +8965,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
lt_prog_compiler_pic='--shared'
lt_prog_compiler_static='--static'
;;
- pgcc* | pgf77* | pgf90* | pgf95*)
+ pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
lt_prog_compiler_wl='-Wl,'
@@ -8934,25 +8977,25 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
# All Alpha code is PIC.
lt_prog_compiler_static='-non_shared'
;;
- xl*)
- # IBM XL C 8.0/Fortran 10.1 on PPC
+ xl* | bgxl* | bgf* | mpixl*)
+ # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-qpic'
lt_prog_compiler_static='-qstaticlink'
;;
*)
case `$CC -V 2>&1 | sed 5q` in
- *Sun\ C*)
- # Sun C 5.9
+ *Sun\ F* | *Sun*Fortran*)
+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
- lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_wl=''
;;
- *Sun\ F*)
- # Sun Fortran 8.3 passes all unrecognized flags to the linker
+ *Sun\ C*)
+ # Sun C 5.9
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
- lt_prog_compiler_wl=''
+ lt_prog_compiler_wl='-Wl,'
;;
esac
;;
@@ -8984,7 +9027,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
case $cc_basename in
- f77* | f90* | f95*)
+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
lt_prog_compiler_wl='-Qoption ld ';;
*)
lt_prog_compiler_wl='-Wl,';;
@@ -9055,7 +9098,7 @@ $as_echo "$lt_prog_compiler_pic" >&6; }
if test -n "$lt_prog_compiler_pic"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
+if ${lt_cv_prog_compiler_pic_works+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works=no
@@ -9071,15 +9114,15 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9074: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9078: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_pic_works=yes
@@ -9114,7 +9157,7 @@ fi
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
+if ${lt_cv_prog_compiler_static_works+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
@@ -9127,7 +9170,7 @@ else
if test -s conftest.err; then
# Append any errors to the config.log.
cat conftest.err 1>&5
- $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_static_works=yes
@@ -9157,7 +9200,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
+if ${lt_cv_prog_compiler_c_o+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
@@ -9176,16 +9219,16 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9179: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9183: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o=yes
@@ -9212,7 +9255,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
+if ${lt_cv_prog_compiler_c_o+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
@@ -9231,16 +9274,16 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9234: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9238: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o=yes
@@ -9350,13 +9393,36 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
openbsd*)
with_gnu_ld=no
;;
- linux* | k*bsd*-gnu)
- link_all_deplibs=no
- ;;
esac
ld_shlibs=yes
+
+ # On some targets, GNU ld is compatible enough with the native linker
+ # that we're better off using the native interface for both.
+ lt_use_gnu_ld_interface=no
if test "$with_gnu_ld" = yes; then
+ case $host_os in
+ aix*)
+ # The AIX port of GNU ld has always aspired to compatibility
+ # with the native linker. However, as the warning in the GNU ld
+ # block says, versions before 2.19.5* couldn't really create working
+ # shared libraries, regardless of the interface used.
+ case `$LD -v 2>&1` in
+ *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+ *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
+ *\ \(GNU\ Binutils\)\ [3-9]*) ;;
+ *)
+ lt_use_gnu_ld_interface=yes
+ ;;
+ esac
+ ;;
+ *)
+ lt_use_gnu_ld_interface=yes
+ ;;
+ esac
+ fi
+
+ if test "$lt_use_gnu_ld_interface" = yes; then
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -9390,11 +9456,12 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
ld_shlibs=no
cat <<_LT_EOF 1>&2
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** Warning: the GNU linker, at least up to release 2.19, is reported
*** to be unable to reliably create shared libraries on AIX.
*** Therefore, libtool is disabling shared libraries support. If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
_LT_EOF
fi
@@ -9430,6 +9497,7 @@ _LT_EOF
# _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
+ export_dynamic_flag_spec='${wl}--export-all-symbols'
allow_undefined_flag=unsupported
always_export_symbols=no
enable_shared_with_static_runtimes=yes
@@ -9451,6 +9519,11 @@ _LT_EOF
fi
;;
+ haiku*)
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ link_all_deplibs=yes
+ ;;
+
interix[3-9]*)
hardcode_direct=no
hardcode_shlibpath_var=no
@@ -9480,11 +9553,12 @@ _LT_EOF
tmp_sharedflag='-shared'
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
tmp_addflag=' $pic_flag'
;;
- pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ pgf77* | pgf90* | pgf95* | pgfortran*)
+ # Portland Group f77 and f90 compilers
+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
@@ -9495,13 +9569,17 @@ _LT_EOF
lf95*) # Lahey Fortran 8.1
whole_archive_flag_spec=
tmp_sharedflag='--shared' ;;
- xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+ xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
tmp_sharedflag='-qmkshrobj'
tmp_addflag= ;;
+ nvcc*) # Cuda Compiler Driver 2.2
+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ compiler_needs_object=yes
+ ;;
esac
case `$CC -V 2>&1 | sed 5q` in
*Sun\ C*) # Sun C 5.9
- whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
compiler_needs_object=yes
tmp_sharedflag='-G' ;;
*Sun\ F*) # Sun Fortran 8.3
@@ -9517,17 +9595,17 @@ _LT_EOF
fi
case $cc_basename in
- xlf*)
+ xlf* | bgf* | bgxlf* | mpixlf*)
# IBM XL Fortran 10.1 on PPC cannot create shared libs itself
whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
hardcode_libdir_flag_spec=
hardcode_libdir_flag_spec_ld='-rpath $libdir'
- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
if test "x$supports_anon_versioning" = xyes; then
archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
echo "local: *; };" >> $output_objdir/$libname.ver~
- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
fi
;;
esac
@@ -9536,7 +9614,7 @@ _LT_EOF
fi
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -9648,8 +9726,10 @@ _LT_EOF
else
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
+ # Also, AIX nm treats weak defined symbols like other global
+ # defined symbols, whereas GNU nm marks them as "W".
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
else
export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
fi
@@ -9711,7 +9791,6 @@ _LT_EOF
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
- link_all_deplibs=no
else
# not using gcc
if test "$host_cpu" = ia64; then
@@ -9768,7 +9847,7 @@ rm -f core conftest.err conftest.$ac_objext \
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
- archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
if test "$host_cpu" = ia64; then
hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
@@ -9812,8 +9891,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# -berok will link without error, but may produce a broken library.
no_undefined_flag=' ${wl}-bernotok'
allow_undefined_flag=' ${wl}-berok'
- # Exported symbols can be pulled into shared objects from archives
- whole_archive_flag_spec='$convenience'
+ if test "$with_gnu_ld" = yes; then
+ # We only use this code for GNU lds that support --whole-archive.
+ whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ else
+ # Exported symbols can be pulled into shared objects from archives
+ whole_archive_flag_spec='$convenience'
+ fi
archive_cmds_need_lc=yes
# This is similar to how AIX traditionally builds its shared libraries.
archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
@@ -9852,7 +9936,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# Tell ltmain to make .dll files, not .so files.
shrext_cmds=".dll"
# FIXME: Setting linknames here is a bad hack.
- archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
# The linker will automatically build a .lib file if we build a DLL.
old_archive_from_new_cmds='true'
# FIXME: Should let the user specify the lib program.
@@ -9868,7 +9952,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_direct=no
hardcode_automatic=yes
hardcode_shlibpath_var=unsupported
- whole_archive_flag_spec=''
+ if test "$lt_cv_ld_force_load" = "yes"; then
+ whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+ else
+ whole_archive_flag_spec=''
+ fi
link_all_deplibs=yes
allow_undefined_flag="$_lt_dar_allow_undefined"
case $cc_basename in
@@ -9876,7 +9964,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
*) _lt_dar_can_shared=$GCC ;;
esac
if test "$_lt_dar_can_shared" = "yes"; then
- output_verbose_link_cmd=echo
+ output_verbose_link_cmd=func_echo_all
archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
@@ -9942,7 +10030,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
;;
hpux10*)
- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
else
archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
@@ -9961,7 +10049,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
;;
hpux11*)
- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
case $host_cpu in
hppa*64*)
archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -9982,7 +10070,46 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+
+ # Older versions of the 11.00 compiler do not understand -b yet
+ # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
+$as_echo_n "checking if $CC understands -b... " >&6; }
+if ${lt_cv_prog_compiler__b+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_prog_compiler__b=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS -b"
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+ # The linker can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ if test -s conftest.err; then
+ # Append any errors to the config.log.
+ cat conftest.err 1>&5
+ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if diff conftest.exp conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler__b=yes
+ fi
+ else
+ lt_cv_prog_compiler__b=yes
+ fi
+ fi
+ $RM -r conftest*
+ LDFLAGS="$save_LDFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
+$as_echo "$lt_cv_prog_compiler__b" >&6; }
+
+if test x"$lt_cv_prog_compiler__b" = xyes; then
+ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+else
+ archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+fi
+
;;
esac
fi
@@ -10010,7 +10137,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
# Try to use the -exported_symbol ld option, if it does not
# work, assume that -exports_file does not work either and
# implicitly export all symbols.
@@ -10021,15 +10148,15 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
int foo(void) {}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LDFLAGS="$save_LDFLAGS"
else
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
fi
archive_cmds_need_lc='no'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
@@ -10038,7 +10165,7 @@ rm -f core conftest.err conftest.$ac_objext \
link_all_deplibs=yes
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -10091,17 +10218,17 @@ rm -f core conftest.err conftest.$ac_objext \
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
- archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+ archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
;;
osf3*)
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
else
allow_undefined_flag=' -expect_unresolved \*'
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
fi
archive_cmds_need_lc='no'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
@@ -10111,13 +10238,13 @@ rm -f core conftest.err conftest.$ac_objext \
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
else
allow_undefined_flag=' -expect_unresolved \*'
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
@@ -10320,44 +10447,50 @@ x|xyes)
# to ld, don't add -lc before -lgcc.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
- $RM conftest*
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+if ${lt_cv_archive_cmds_need_lc+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ $RM conftest*
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; } 2>conftest.err; then
- soname=conftest
- lib=conftest
- libobjs=conftest.$ac_objext
- deplibs=
- wl=$lt_prog_compiler_wl
- pic_flag=$lt_prog_compiler_pic
- compiler_flags=-v
- linker_flags=-v
- verstring=
- output_objdir=.
- libname=conftest
- lt_save_allow_undefined_flag=$allow_undefined_flag
- allow_undefined_flag=
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+ soname=conftest
+ lib=conftest
+ libobjs=conftest.$ac_objext
+ deplibs=
+ wl=$lt_prog_compiler_wl
+ pic_flag=$lt_prog_compiler_pic
+ compiler_flags=-v
+ linker_flags=-v
+ verstring=
+ output_objdir=.
+ libname=conftest
+ lt_save_allow_undefined_flag=$allow_undefined_flag
+ allow_undefined_flag=
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
(eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
- then
- archive_cmds_need_lc=no
- else
- archive_cmds_need_lc=yes
- fi
- allow_undefined_flag=$lt_save_allow_undefined_flag
- else
- cat conftest.err 1>&5
- fi
- $RM conftest*
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
-$as_echo "$archive_cmds_need_lc" >&6; }
+ then
+ lt_cv_archive_cmds_need_lc=no
+ else
+ lt_cv_archive_cmds_need_lc=yes
+ fi
+ allow_undefined_flag=$lt_save_allow_undefined_flag
+ else
+ cat conftest.err 1>&5
+ fi
+ $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
+$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
+ archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
;;
esac
fi
@@ -10528,16 +10661,23 @@ if test "$GCC" = yes; then
darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
*) lt_awk_arg="/^libraries:/" ;;
esac
- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
+ case $host_os in
+ mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;;
+ *) lt_sed_strip_eq="s,=/,/,g" ;;
+ esac
+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+ case $lt_search_path_spec in
+ *\;*)
# if the path contains ";" then we assume it to be the separator
# otherwise default to the standard path separator (i.e. ":") - it is
# assumed that no part of a normal pathname contains ";" but that should
# okay in the real world where ";" in dirpaths is itself problematic.
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
- else
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+ ;;
+ *)
+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+ ;;
+ esac
# Ok, now we have the path, separated by spaces, we can step through it
# and add multilib dir if necessary.
lt_tmp_lt_search_path_spec=
@@ -10550,7 +10690,7 @@ if test "$GCC" = yes; then
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
fi
done
- lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
+ lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
BEGIN {RS=" "; FS="/|\n";} {
lt_foo="";
lt_count=0;
@@ -10570,7 +10710,13 @@ BEGIN {RS=" "; FS="/|\n";} {
if (lt_foo != "") { lt_freq[lt_foo]++; }
if (lt_freq[lt_foo] == 1) { print lt_foo; }
}'`
- sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
+ # AWK program above erroneously prepends '/' to C:/dos/paths
+ # for these hosts.
+ case $host_os in
+ mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+ $SED 's,/\([A-Za-z]:\),\1,g'` ;;
+ esac
+ sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi
@@ -10658,7 +10804,7 @@ amigaos*)
m68k)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
;;
esac
;;
@@ -10711,23 +10857,12 @@ cygwin* | mingw* | pw32* | cegcc*)
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
;;
mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
- # It is most probably a Windows format PATH printed by
- # mingw gcc, but we are running on Cygwin. Gcc prints its search
- # path with ; separators, and with drive letters. We can handle the
- # drive letters (cygwin fileutils understands them), so leave them,
- # especially as we might pass files found there to a mingw objdump,
- # which wouldn't understand a cygwinified path. Ahh.
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
- else
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -10827,6 +10962,19 @@ gnu*)
hardcode_into_libs=yes
;;
+haiku*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ dynamic_linker="$host_os runtime_loader"
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+ hardcode_into_libs=yes
+ ;;
+
hpux9* | hpux10* | hpux11*)
# Give a soname corresponding to the major version so that dld.sl refuses to
# link against other versions.
@@ -10869,8 +11017,10 @@ hpux9* | hpux10* | hpux11*)
soname_spec='${libname}${release}${shared_ext}$major'
;;
esac
- # HP-UX runs *really* slowly unless shared libraries are mode 555.
+ # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
postinstall_cmds='chmod 555 $lib'
+ # or fails outright, so override atomically:
+ install_override_mode=555
;;
interix[3-9]*)
@@ -10937,12 +11087,17 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
+
# Some binutils ld are patched to set DT_RUNPATH
- save_LDFLAGS=$LDFLAGS
- save_libdir=$libdir
- eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
- LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_shlibpath_overrides_runpath=no
+ save_LDFLAGS=$LDFLAGS
+ save_libdir=$libdir
+ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
+ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -10955,13 +11110,17 @@ main ()
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
- shlibpath_overrides_runpath=yes
+ lt_cv_shlibpath_overrides_runpath=yes
fi
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
- LDFLAGS=$save_LDFLAGS
- libdir=$save_libdir
+ LDFLAGS=$save_LDFLAGS
+ libdir=$save_libdir
+
+fi
+
+ shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
# This implies no fast_install, which is unacceptable.
# Some rework will be needed to allow for fast_install
@@ -10970,7 +11129,7 @@ rm -f core conftest.err conftest.$ac_objext \
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
@@ -10983,18 +11142,6 @@ rm -f core conftest.err conftest.$ac_objext \
dynamic_linker='GNU/Linux ld.so'
;;
-netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -11285,6 +11432,11 @@ fi
+
+
+
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
@@ -11357,7 +11509,7 @@ else
# if libdl is installed we need to link against it
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+if ${ac_cv_lib_dl_dlopen+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -11391,7 +11543,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
@@ -11405,12 +11557,12 @@ fi
*)
ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-if test "x$ac_cv_func_shl_load" = x""yes; then :
+if test "x$ac_cv_func_shl_load" = xyes; then :
lt_cv_dlopen="shl_load"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
$as_echo_n "checking for shl_load in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
+if ${ac_cv_lib_dld_shl_load+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -11444,16 +11596,16 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
+if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
else
ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = x""yes; then :
+if test "x$ac_cv_func_dlopen" = xyes; then :
lt_cv_dlopen="dlopen"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+if ${ac_cv_lib_dl_dlopen+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -11487,12 +11639,12 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
$as_echo_n "checking for dlopen in -lsvld... " >&6; }
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
+if ${ac_cv_lib_svld_dlopen+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -11526,12 +11678,12 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
+if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
$as_echo_n "checking for dld_link in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
+if ${ac_cv_lib_dld_dld_link+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -11565,7 +11717,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
+if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
@@ -11606,7 +11758,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
$as_echo_n "checking whether a program can dlopen itself... " >&6; }
-if test "${lt_cv_dlopen_self+set}" = set; then :
+if ${lt_cv_dlopen_self+:} false; then :
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
@@ -11615,7 +11767,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11618 "configure"
+#line $LINENO "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11656,7 +11808,13 @@ else
# endif
#endif
-void fnord() { int i=42;}
+/* When -fvisbility=hidden is used, assume the code has been annotated
+ correspondingly for the symbols needed. */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+void fnord () __attribute__((visibility("default")));
+#endif
+
+void fnord () { int i=42; }
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -11665,7 +11823,11 @@ int main ()
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ else
+ {
+ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ else puts (dlerror ());
+ }
/* dlclose (self); */
}
else
@@ -11702,7 +11864,7 @@ $as_echo "$lt_cv_dlopen_self" >&6; }
wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
-if test "${lt_cv_dlopen_self_static+set}" = set; then :
+if ${lt_cv_dlopen_self_static+:} false; then :
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
@@ -11711,7 +11873,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11714 "configure"
+#line $LINENO "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11752,7 +11914,13 @@ else
# endif
#endif
-void fnord() { int i=42;}
+/* When -fvisbility=hidden is used, assume the code has been annotated
+ correspondingly for the symbols needed. */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+void fnord () __attribute__((visibility("default")));
+#endif
+
+void fnord () { int i=42; }
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -11761,7 +11929,11 @@ int main ()
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ else
+ {
+ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ else puts (dlerror ());
+ }
/* dlclose (self); */
}
else
@@ -11947,7 +12119,7 @@ API_VERSION=1.9
ASM_VERSION=1.9.0.0
-DISPLAY_VERSION="1.9.0"
+DISPLAY_VERSION="1.9.1"
@@ -11998,7 +12170,7 @@ DISPLAY_VERSION="1.9.0"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
$as_echo_n "checking for library containing strerror... " >&6; }
-if test "${ac_cv_search_strerror+set}" = set; then :
+if ${ac_cv_search_strerror+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
@@ -12032,11 +12204,11 @@ for ac_lib in '' cposix; do
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
- if test "${ac_cv_search_strerror+set}" = set; then :
+ if ${ac_cv_search_strerror+:} false; then :
break
fi
done
-if test "${ac_cv_search_strerror+set}" = set; then :
+if ${ac_cv_search_strerror+:} false; then :
else
ac_cv_search_strerror=no
@@ -12062,7 +12234,7 @@ if test -n "$ac_tool_prefix"; then
set dummy ${ac_tool_prefix}gcc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -12102,7 +12274,7 @@ if test -z "$ac_cv_prog_CC"; then
set dummy gcc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
@@ -12155,7 +12327,7 @@ if test -z "$CC"; then
set dummy ${ac_tool_prefix}cc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -12195,7 +12367,7 @@ if test -z "$CC"; then
set dummy cc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -12254,7 +12426,7 @@ if test -z "$CC"; then
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -12298,7 +12470,7 @@ do
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
@@ -12353,7 +12525,7 @@ fi
test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
# Provide some information about the compiler.
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -12382,7 +12554,7 @@ done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+if ${ac_cv_c_compiler_gnu+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12419,7 +12591,7 @@ ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
+if ${ac_cv_prog_cc_g+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_save_c_werror_flag=$ac_c_werror_flag
@@ -12497,7 +12669,7 @@ else
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+if ${ac_cv_prog_cc_c89+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_cv_prog_cc_c89=no
@@ -12596,7 +12768,7 @@ depcc="$CC" am_compiler_list=
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
$as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -12722,7 +12894,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
$as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
+if ${ac_cv_header_stdc+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12875,7 +13047,7 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
@@ -12918,7 +13090,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
set dummy pkg-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
@@ -13274,7 +13446,7 @@ and GDK_X11_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
else
GDK_X11_CFLAGS=$pkg_cv_GDK_X11_CFLAGS
GDK_X11_LIBS=$pkg_cv_GDK_X11_LIBS
@@ -13373,7 +13545,7 @@ and GDK_QUARTZ_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
else
GDK_QUARTZ_CFLAGS=$pkg_cv_GDK_QUARTZ_CFLAGS
GDK_QUARTZ_LIBS=$pkg_cv_GDK_QUARTZ_LIBS
@@ -13472,7 +13644,7 @@ and GTK_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
else
GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
GTK_LIBS=$pkg_cv_GTK_LIBS
@@ -13572,7 +13744,7 @@ and CLUTTER_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
else
CLUTTER_CFLAGS=$pkg_cv_CLUTTER_CFLAGS
CLUTTER_LIBS=$pkg_cv_CLUTTER_LIBS
@@ -13623,7 +13795,7 @@ fi
- GSTREAMER_REQUIRED_VERSION=0.10.12
+ GSTREAMER_REQUIRED_VERSION=0.10.23
@@ -13752,7 +13924,7 @@ and GST_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
else
GST_CFLAGS=$pkg_cv_GST_CFLAGS
GST_LIBS=$pkg_cv_GST_LIBS
@@ -13761,10 +13933,88 @@ $as_echo "yes" >&6; }
fi
- GST_LIBS="$GST_LIBS -lgstvideo-0.10 -lgstinterfaces-0.10 -lgstcdda-0.10 -lgstpbutils-0.10"
+ GST_LIBS="$GST_LIBS -lgstvideo-0.10 -lgstinterfaces-0.10 -lgstcdda-0.10 -lgstpbutils-0.10 -lgsttag-0.10"
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GST_0_10_26" >&5
+$as_echo_n "checking for GST_0_10_26... " >&6; }
+
+if test -n "$GST_0_10_26_CFLAGS"; then
+ pkg_cv_GST_0_10_26_CFLAGS="$GST_0_10_26_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-plugins-base-0.10 >= 0.10.26\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gstreamer-plugins-base-0.10 >= 0.10.26") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GST_0_10_26_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-plugins-base-0.10 >= 0.10.26" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$GST_0_10_26_LIBS"; then
+ pkg_cv_GST_0_10_26_LIBS="$GST_0_10_26_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-plugins-base-0.10 >= 0.10.26\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gstreamer-plugins-base-0.10 >= 0.10.26") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GST_0_10_26_LIBS=`$PKG_CONFIG --libs "gstreamer-plugins-base-0.10 >= 0.10.26" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ GST_0_10_26_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gstreamer-plugins-base-0.10 >= 0.10.26" 2>&1`
+ else
+ GST_0_10_26_PKG_ERRORS=`$PKG_CONFIG --print-errors "gstreamer-plugins-base-0.10 >= 0.10.26" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GST_0_10_26_PKG_ERRORS" >&5
+
+ has_gst_0_10_26=no
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ has_gst_0_10_26=no
+else
+ GST_0_10_26_CFLAGS=$pkg_cv_GST_0_10_26_CFLAGS
+ GST_0_10_26_LIBS=$pkg_cv_GST_0_10_26_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ has_gst_0_10_26=yes
+fi
+ if test "x$has_gst_0_10_26" = "xyes"; then
+ HAVE_GST_0_10_26_TRUE=
+ HAVE_GST_0_10_26_FALSE='#'
+else
+ HAVE_GST_0_10_26_TRUE='#'
+ HAVE_GST_0_10_26_FALSE=
+fi
+
# Check whether --enable-builtin-equalizer was given.
if test "${enable_builtin_equalizer+set}" = set; then :
@@ -13874,7 +14124,7 @@ and GST_SHARP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
else
GST_SHARP_CFLAGS=$pkg_cv_GST_SHARP_CFLAGS
GST_SHARP_LIBS=$pkg_cv_GST_SHARP_LIBS
@@ -13988,7 +14238,7 @@ and BNPX_GTK_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
else
BNPX_GTK_CFLAGS=$pkg_cv_BNPX_GTK_CFLAGS
BNPX_GTK_LIBS=$pkg_cv_BNPX_GTK_LIBS
@@ -14012,8 +14262,8 @@ if test "x$with_x" = xno; then
have_x=disabled
else
case $x_includes,$x_libraries in #(
- *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #(
- *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
+ *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #(
+ *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then :
$as_echo_n "(cached) " >&6
else
# One or both of the vars are not set, and there is no cached value.
@@ -14453,7 +14703,7 @@ and GNOME_DOC_UTILS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
else
GNOME_DOC_UTILS_CFLAGS=$pkg_cv_GNOME_DOC_UTILS_CFLAGS
GNOME_DOC_UTILS_LIBS=$pkg_cv_GNOME_DOC_UTILS_LIBS
@@ -14658,7 +14908,7 @@ and MONO_MODULE_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
else
MONO_MODULE_CFLAGS=$pkg_cv_MONO_MODULE_CFLAGS
MONO_MODULE_LIBS=$pkg_cv_MONO_MODULE_LIBS
@@ -14675,7 +14925,7 @@ fi
set dummy gmcs; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MCS+set}" = set; then :
+if ${ac_cv_path_MCS+:} false; then :
$as_echo_n "(cached) " >&6
else
case $MCS in
@@ -14726,7 +14976,7 @@ fi
set dummy mono; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MONO+set}" = set; then :
+if ${ac_cv_path_MONO+:} false; then :
$as_echo_n "(cached) " >&6
else
case $MONO in
@@ -15099,7 +15349,7 @@ and NDESK_DBUS_GLIB_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
else
NDESK_DBUS_GLIB_CFLAGS=$pkg_cv_NDESK_DBUS_GLIB_CFLAGS
NDESK_DBUS_GLIB_LIBS=$pkg_cv_NDESK_DBUS_GLIB_LIBS
@@ -15190,7 +15440,7 @@ and NDESK_DBUS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
else
NDESK_DBUS_CFLAGS=$pkg_cv_NDESK_DBUS_CFLAGS
NDESK_DBUS_LIBS=$pkg_cv_NDESK_DBUS_LIBS
@@ -15283,7 +15533,7 @@ and MONO_ADDINS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
else
MONO_ADDINS_CFLAGS=$pkg_cv_MONO_ADDINS_CFLAGS
MONO_ADDINS_LIBS=$pkg_cv_MONO_ADDINS_LIBS
@@ -15374,7 +15624,7 @@ and MONO_ADDINS_SETUP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
else
MONO_ADDINS_SETUP_CFLAGS=$pkg_cv_MONO_ADDINS_SETUP_CFLAGS
MONO_ADDINS_SETUP_LIBS=$pkg_cv_MONO_ADDINS_SETUP_LIBS
@@ -15577,7 +15827,7 @@ and BOO_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
else
BOO_CFLAGS=$pkg_cv_BOO_CFLAGS
BOO_LIBS=$pkg_cv_BOO_LIBS
@@ -15620,7 +15870,7 @@ fi
set dummy monodocer; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MONODOCER+set}" = set; then :
+if ${ac_cv_path_MONODOCER+:} false; then :
$as_echo_n "(cached) " >&6
else
case $MONODOCER in
@@ -15665,7 +15915,7 @@ fi
set dummy mdassembler; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MDASSEMBLER+set}" = set; then :
+if ${ac_cv_path_MDASSEMBLER+:} false; then :
$as_echo_n "(cached) " >&6
else
case $MDASSEMBLER in
@@ -16061,7 +16311,7 @@ and GDATASHARP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
else
GDATASHARP_CFLAGS=$pkg_cv_GDATASHARP_CFLAGS
GDATASHARP_LIBS=$pkg_cv_GDATASHARP_LIBS
@@ -16162,7 +16412,7 @@ and GDATASHARP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
else
GDATASHARP_CFLAGS=$pkg_cv_GDATASHARP_CFLAGS
GDATASHARP_LIBS=$pkg_cv_GDATASHARP_LIBS
@@ -16766,7 +17016,7 @@ and MOONLIGHT_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
else
MOONLIGHT_CFLAGS=$pkg_cv_MOONLIGHT_CFLAGS
MOONLIGHT_LIBS=$pkg_cv_MOONLIGHT_LIBS
@@ -17068,7 +17318,7 @@ and TAGLIB_SHARP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
else
TAGLIB_SHARP_CFLAGS=$pkg_cv_TAGLIB_SHARP_CFLAGS
TAGLIB_SHARP_LIBS=$pkg_cv_TAGLIB_SHARP_LIBS
@@ -17163,7 +17413,7 @@ and GTKSHARP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
else
GTKSHARP_CFLAGS=$pkg_cv_GTKSHARP_CFLAGS
GTKSHARP_LIBS=$pkg_cv_GTKSHARP_LIBS
@@ -17254,7 +17504,7 @@ and GLIBSHARP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
else
GLIBSHARP_CFLAGS=$pkg_cv_GLIBSHARP_CFLAGS
GLIBSHARP_LIBS=$pkg_cv_GLIBSHARP_LIBS
@@ -17507,7 +17757,7 @@ and IGEMACINTEGRATION_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
else
IGEMACINTEGRATION_CFLAGS=$pkg_cv_IGEMACINTEGRATION_CFLAGS
IGEMACINTEGRATION_LIBS=$pkg_cv_IGEMACINTEGRATION_LIBS
@@ -17607,7 +17857,7 @@ and SQLITE_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
else
SQLITE_CFLAGS=$pkg_cv_SQLITE_CFLAGS
SQLITE_LIBS=$pkg_cv_SQLITE_LIBS
@@ -17708,7 +17958,7 @@ and GCONFSHARP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
else
GCONFSHARP_CFLAGS=$pkg_cv_GCONFSHARP_CFLAGS
GCONFSHARP_LIBS=$pkg_cv_GCONFSHARP_LIBS
@@ -17722,7 +17972,7 @@ fi
set dummy gconftool-2; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GCONFTOOL+set}" = set; then :
+if ${ac_cv_path_GCONFTOOL+:} false; then :
$as_echo_n "(cached) " >&6
else
case $GCONFTOOL in
@@ -17796,7 +18046,7 @@ $as_echo "Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&
if test "${enable_schemas_install+set}" = set; then :
enableval=$enable_schemas_install; case ${enableval} in
yes|no) ;;
- *) as_fn_error $? "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;;
+ *) as_fn_error $? "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;;
esac
fi
@@ -17928,7 +18178,7 @@ fi
ac_fn_c_check_member "$LINENO" "struct LIBMTP_track_struct" "modificationdate" "ac_cv_member_struct_LIBMTP_track_struct_modificationdate" "#include <libmtp.h>
"
-if test "x$ac_cv_member_struct_LIBMTP_track_struct_modificationdate" = x""yes; then :
+if test "x$ac_cv_member_struct_LIBMTP_track_struct_modificationdate" = xyes; then :
LIBMTP_HAS_MODDATE=yes
else
LIBMTP_HAS_MODDATE=no
@@ -17966,7 +18216,7 @@ fi
# This bug is HP SR number 8606223364.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of time_t" >&5
$as_echo_n "checking size of time_t... " >&6; }
-if test "${ac_cv_sizeof_time_t+set}" = set; then :
+if ${ac_cv_sizeof_time_t+:} false; then :
$as_echo_n "(cached) " >&6
else
if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (time_t))" "ac_cv_sizeof_time_t" "$ac_includes_default"; then :
@@ -17976,7 +18226,7 @@ else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error 77 "cannot compute sizeof (time_t)
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
else
ac_cv_sizeof_time_t=0
fi
@@ -18304,7 +18554,12 @@ $as_echo "yes" >&6; }
fi
if test "x$enable_karmasharp" = "xyes"; then
- KARMASHARP_ASSEMBLIES="`$PKG_CONFIG --variable=Libraries karma-sharp`"
+ asms="`$PKG_CONFIG --variable=Libraries karma-sharp`"
+ for asm in $asms; do
+ KARMASHARP_ASSEMBLIES="$KARMASHARP_ASSEMBLIES $asm"
+ [ -r "$asm.config" ] && KARMASHARP_ASSEMBLIES="$KARMASHARP_ASSEMBLIES $asm.config"
+ [ -r "$asm.mdb" ] && KARMASHARP_ASSEMBLIES="$KARMASHARP_ASSEMBLIES $asm.mdb"
+ done
fi
@@ -18412,7 +18667,7 @@ and MONO_ZEROCONF_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
else
MONO_ZEROCONF_CFLAGS=$pkg_cv_MONO_ZEROCONF_CFLAGS
MONO_ZEROCONF_LIBS=$pkg_cv_MONO_ZEROCONF_LIBS
@@ -18534,7 +18789,7 @@ and MONO_ZEROCONF_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
else
MONO_ZEROCONF_CFLAGS=$pkg_cv_MONO_ZEROCONF_CFLAGS
MONO_ZEROCONF_LIBS=$pkg_cv_MONO_ZEROCONF_LIBS
@@ -18654,7 +18909,7 @@ and MONOTORRENT_DBUS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
else
MONOTORRENT_DBUS_CFLAGS=$pkg_cv_MONOTORRENT_DBUS_CFLAGS
MONOTORRENT_DBUS_LIBS=$pkg_cv_MONOTORRENT_DBUS_LIBS
@@ -18718,6 +18973,200 @@ fi
fi
+
+ LIBINDICATESHARP_REQUIRED=0.4.1
+
+ # Check whether --enable-soundmenu was given.
+if test "${enable_soundmenu+set}" = set; then :
+ enableval=$enable_soundmenu; enable_soundmenu=$enableval
+else
+ enable_soundmenu=no
+
+fi
+
+
+ if test "x$enable_soundmenu" = "xyes"; then
+ has_indicatesharp=no
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for INDICATESHARP" >&5
+$as_echo_n "checking for INDICATESHARP... " >&6; }
+
+if test -n "$INDICATESHARP_CFLAGS"; then
+ pkg_cv_INDICATESHARP_CFLAGS="$INDICATESHARP_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"indicate-sharp-0.1 >= \$LIBINDICATESHARP_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "indicate-sharp-0.1 >= $LIBINDICATESHARP_REQUIRED") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_INDICATESHARP_CFLAGS=`$PKG_CONFIG --cflags "indicate-sharp-0.1 >= $LIBINDICATESHARP_REQUIRED" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$INDICATESHARP_LIBS"; then
+ pkg_cv_INDICATESHARP_LIBS="$INDICATESHARP_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"indicate-sharp-0.1 >= \$LIBINDICATESHARP_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "indicate-sharp-0.1 >= $LIBINDICATESHARP_REQUIRED") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_INDICATESHARP_LIBS=`$PKG_CONFIG --libs "indicate-sharp-0.1 >= $LIBINDICATESHARP_REQUIRED" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ INDICATESHARP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "indicate-sharp-0.1 >= $LIBINDICATESHARP_REQUIRED" 2>&1`
+ else
+ INDICATESHARP_PKG_ERRORS=`$PKG_CONFIG --print-errors "indicate-sharp-0.1 >= $LIBINDICATESHARP_REQUIRED" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$INDICATESHARP_PKG_ERRORS" >&5
+
+ has_indicatesharp=no
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ has_indicatesharp=no
+else
+ INDICATESHARP_CFLAGS=$pkg_cv_INDICATESHARP_CFLAGS
+ INDICATESHARP_LIBS=$pkg_cv_INDICATESHARP_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ has_indicatesharp=yes
+fi
+ if test "x$has_indicatesharp" = "xno"; then
+ as_fn_error $? "indicate-sharp was not found or is not up to date. Please install indicate-sharp of at least version $LIBINDICATESHARP_REQUIRED, or disable sound menu support by passing --disable-soundmenu" "$LINENO" 5
+ fi
+ fi
+
+ if test "x$enable_soundmenu" = "xyes"; then
+ ENABLE_SOUNDMENU_TRUE=
+ ENABLE_SOUNDMENU_FALSE='#'
+else
+ ENABLE_SOUNDMENU_TRUE='#'
+ ENABLE_SOUNDMENU_FALSE=
+fi
+
+
+
+
+ # Check whether --enable-ubuntuone was given.
+if test "${enable_ubuntuone+set}" = set; then :
+ enableval=$enable_ubuntuone; enable_ubuntuone=$enableval
+else
+ enable_ubuntuone=no
+
+fi
+
+
+ if test "x$enable_ubuntuone" = "xyes"; then
+ has_ubuntuonesharp=no
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UBUNTUONESHARP" >&5
+$as_echo_n "checking for UBUNTUONESHARP... " >&6; }
+
+if test -n "$UBUNTUONESHARP_CFLAGS"; then
+ pkg_cv_UBUNTUONESHARP_CFLAGS="$UBUNTUONESHARP_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ubuntuone-sharp-1.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "ubuntuone-sharp-1.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_UBUNTUONESHARP_CFLAGS=`$PKG_CONFIG --cflags "ubuntuone-sharp-1.0" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$UBUNTUONESHARP_LIBS"; then
+ pkg_cv_UBUNTUONESHARP_LIBS="$UBUNTUONESHARP_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ubuntuone-sharp-1.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "ubuntuone-sharp-1.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_UBUNTUONESHARP_LIBS=`$PKG_CONFIG --libs "ubuntuone-sharp-1.0" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ UBUNTUONESHARP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ubuntuone-sharp-1.0" 2>&1`
+ else
+ UBUNTUONESHARP_PKG_ERRORS=`$PKG_CONFIG --print-errors "ubuntuone-sharp-1.0" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$UBUNTUONESHARP_PKG_ERRORS" >&5
+
+ has_ubuntuonesharp=no
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ has_ubuntuonesharp=no
+else
+ UBUNTUONESHARP_CFLAGS=$pkg_cv_UBUNTUONESHARP_CFLAGS
+ UBUNTUONESHARP_LIBS=$pkg_cv_UBUNTUONESHARP_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ has_ubuntuonesharp=yes
+fi
+ if test "x$has_ubuntuonesharp" = "xno"; then
+ as_fn_error $? "ubuntuone-sharp was not found. Please install ubuntuone-sharp, or disable Ubuntu One support by passing --disable-ubuntuone" "$LINENO" 5
+ fi
+ fi
+
+ if test "x$enable_ubuntuone" = "xyes"; then
+ ENABLE_UBUNTUONE_TRUE=
+ ENABLE_UBUNTUONE_FALSE='#'
+else
+ ENABLE_UBUNTUONE_TRUE='#'
+ ENABLE_UBUNTUONE_FALSE=
+fi
+
+
+
ENABLE_GAPLESS="no"
# Check whether --enable-gapless-playback was given.
if test "${enable_gapless_playback+set}" = set; then :
@@ -18822,7 +19271,7 @@ _ACEOF
for ac_header in locale.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"
-if test "x$ac_cv_header_locale_h" = x""yes; then :
+if test "x$ac_cv_header_locale_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LOCALE_H 1
_ACEOF
@@ -18834,7 +19283,7 @@ done
if test $ac_cv_header_locale_h = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5
$as_echo_n "checking for LC_MESSAGES... " >&6; }
-if test "${am_cv_val_LC_MESSAGES+set}" = set; then :
+if ${am_cv_val_LC_MESSAGES+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -18874,7 +19323,7 @@ $as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
INTLLIBS=
ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
-if test "x$ac_cv_header_libintl_h" = x""yes; then :
+if test "x$ac_cv_header_libintl_h" = xyes; then :
gt_cv_func_dgettext_libintl="no"
libintl_extra_libs=""
@@ -18883,7 +19332,7 @@ if test "x$ac_cv_header_libintl_h" = x""yes; then :
#
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5
$as_echo_n "checking for ngettext in libc... " >&6; }
-if test "${gt_cv_func_ngettext_libc+set}" = set; then :
+if ${gt_cv_func_ngettext_libc+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -18914,7 +19363,7 @@ $as_echo "$gt_cv_func_ngettext_libc" >&6; }
if test "$gt_cv_func_ngettext_libc" = "yes" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5
$as_echo_n "checking for dgettext in libc... " >&6; }
-if test "${gt_cv_func_dgettext_libc+set}" = set; then :
+if ${gt_cv_func_dgettext_libc+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -18947,7 +19396,7 @@ $as_echo "$gt_cv_func_dgettext_libc" >&6; }
for ac_func in bind_textdomain_codeset
do :
ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
+if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_BIND_TEXTDOMAIN_CODESET 1
_ACEOF
@@ -18966,7 +19415,7 @@ done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
$as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then :
+if ${ac_cv_lib_intl_bindtextdomain+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -19000,10 +19449,10 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
-if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then :
+if test "x$ac_cv_lib_intl_bindtextdomain" = xyes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
$as_echo_n "checking for ngettext in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
+if ${ac_cv_lib_intl_ngettext+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -19037,10 +19486,10 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
+if test "x$ac_cv_lib_intl_ngettext" = xyes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5
$as_echo_n "checking for dgettext in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_dgettext+set}" = set; then :
+if ${ac_cv_lib_intl_dgettext+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -19074,7 +19523,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5
$as_echo "$ac_cv_lib_intl_dgettext" >&6; }
-if test "x$ac_cv_lib_intl_dgettext" = x""yes; then :
+if test "x$ac_cv_lib_intl_dgettext" = xyes; then :
gt_cv_func_dgettext_libintl=yes
fi
@@ -19090,7 +19539,7 @@ $as_echo_n "checking if -liconv is needed to use gettext... " >&6; }
$as_echo "" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
$as_echo_n "checking for ngettext in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
+if ${ac_cv_lib_intl_ngettext+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -19124,10 +19573,10 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
+if test "x$ac_cv_lib_intl_ngettext" = xyes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5
$as_echo_n "checking for dcgettext in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_dcgettext+set}" = set; then :
+if ${ac_cv_lib_intl_dcgettext+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -19161,7 +19610,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5
$as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
-if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then :
+if test "x$ac_cv_lib_intl_dcgettext" = xyes; then :
gt_cv_func_dgettext_libintl=yes
libintl_extra_libs=-liconv
else
@@ -19186,7 +19635,7 @@ fi
for ac_func in bind_textdomain_codeset
do :
ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
+if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_BIND_TEXTDOMAIN_CODESET 1
_ACEOF
@@ -19224,7 +19673,7 @@ $as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
set dummy msgfmt; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSGFMT+set}" = set; then :
+if ${ac_cv_path_MSGFMT+:} false; then :
$as_echo_n "(cached) " >&6
else
case "$MSGFMT" in
@@ -19261,7 +19710,7 @@ fi
for ac_func in dcgettext
do :
ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
-if test "x$ac_cv_func_dcgettext" = x""yes; then :
+if test "x$ac_cv_func_dcgettext" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_DCGETTEXT 1
_ACEOF
@@ -19302,7 +19751,7 @@ fi
set dummy gmsgfmt; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GMSGFMT+set}" = set; then :
+if ${ac_cv_path_GMSGFMT+:} false; then :
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
@@ -19343,7 +19792,7 @@ fi
set dummy xgettext; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_XGETTEXT+set}" = set; then :
+if ${ac_cv_path_XGETTEXT+:} false; then :
$as_echo_n "(cached) " >&6
else
case "$XGETTEXT" in
@@ -19394,7 +19843,7 @@ else
case $host in
*-*-solaris*)
ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
+if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
CATOBJEXT=.gmo
DATADIRNAME=share
else
@@ -19621,7 +20070,7 @@ fi
set dummy sed; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_SED+set}" = set; then :
+if ${ac_cv_prog_SED+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$SED"; then
@@ -19688,7 +20137,7 @@ fi
-ac_config_files="$ac_config_files Makefile build/Makefile build/m4/Makefile build/m4/shave/shave build/m4/shave/shave-libtool build/pkg-config/Makefile data/Makefile data/org.bansheeproject.Banshee.service data/org.bansheeproject.CollectionIndexer.service data/audio-profiles/Makefile data/desktop-files/Makefile data/desktop-files/common.desktop data/icon-theme-hicolor/Makefile help/Makefile docs/Makefile docs/Hyena/Makefile docs/Banshee/Makefile po/Makefile.in tests/Makefile tests/Analyzer/Makefile tests/Performance/Makefile extras/Makefile libbanshee/Makefile gstreamer/Makefile gstreamer/equalizer/Makefile src/Hyena/Makefile src/Hyena/build/Makefile src/Hyena/build/pkg-config/Makefile src/Hyena/build/m4/Makefile src/Hyena/Hyena/Makefile src/Hyena/Hyena.Data.Sqlite/Makefile src/Hyena/Hyena.Gui/Makefile src/Makefile src/AssemblyInfo.cs src/Clients/Makefile src/Clients/Beroe/Makefile src/Clients/Booter/Makefile src/Clients/Booter/banshee-1.linux src/Clients/Booter/banshee-1.darwin src/Clients/Halie/Makefile src/Clients/Muinshee/Makefile src/Clients/Nereid/Makefile src/Clients/MeeGo/Makefile src/Core/Makefile src/Core/Banshee.CollectionIndexer/Makefile src/Core/Banshee.Core/Makefile src/Core/Banshee.Services/Makefile src/Core/Banshee.ThickClient/Makefile src/Core/Banshee.Widgets/Makefile src/Core/Banshee.WebBrowser/Makefile src/Core/Banshee.WebBrowser/libossifer/Makefile src/Backends/Makefile src/Backends/Banshee.Gio/Makefile src/Backends/Banshee.Gnome/Makefile src/Backends/Banshee.GStreamer/Makefile src/Backends/Banshee.GStreamerSharp/Makefile src/Backends/Banshee.Hal/Makefile src/Backends/Banshee.Unix/Makefile src/Backends/Banshee.Osx/Makefile src/Backends/Banshee.NowPlaying.X11/Makefile src/Backends/Banshee.NowPlaying.X11/libbnpx11/Makefile src/Libraries/Makefile src/Libraries/Lastfm/Makefile src/Libraries/Lastfm.Gui/Makefile src/Libraries/Migo/Makefile src/Libraries/Mono.Media/Makefile src/Libraries/Mtp/Makefile src/Libraries/Mtp/Mtp.dll.config src/Libraries/MusicBrainz/Makefile src/Dap/Makefile src/Dap/Banshee.Dap/Makefile src/Dap/Banshee.Dap.AppleDevice/Makefile src/Dap/Banshee.Dap.Ipod/Makefile src/Dap/Banshee.Dap.MassStorage/Makefile src/Dap/Banshee.Dap.Mtp/Makefile src/Dap/Banshee.Dap.Karma/Makefile src/Extensions/Makefile src/Extensions/Banshee.AmazonMp3/Makefile src/Extensions/Banshee.AmazonMp3.Store/Makefile src/Extensions/Banshee.Audiobook/Makefile src/Extensions/Banshee.AudioCd/Makefile src/Extensions/Banshee.BooScript/Makefile src/Extensions/Banshee.Bpm/Makefile src/Extensions/Banshee.CoverArt/Makefile src/Extensions/Banshee.Daap/Makefile src/Extensions/Banshee.Emusic/Makefile src/Extensions/Banshee.FileSystemQueue/Makefile src/Extensions/Banshee.InternetArchive/Makefile src/Extensions/Banshee.Fixup/Makefile src/Extensions/Banshee.InternetRadio/Makefile src/Extensions/Banshee.Lastfm/Makefile src/Extensions/Banshee.LastfmStreaming/Makefile src/Extensions/Banshee.LibraryWatcher/Makefile src/Extensions/Banshee.MiniMode/Makefile src/Extensions/Banshee.MiroGuide/Makefile src/Extensions/Banshee.MeeGo/Makefile src/Extensions/Banshee.Mpris/Makefile src/Extensions/Banshee.MultimediaKeys/Makefile src/Extensions/Banshee.NotificationArea/Makefile src/Extensions/Banshee.NowPlaying/Makefile src/Extensions/Banshee.PlayQueue/Makefile src/Extensions/Banshee.PlayerMigration/Makefile src/Extensions/Banshee.Podcasting/Makefile src/Extensions/Banshee.SqlDebugConsole/Makefile src/Extensions/Banshee.Sample/Makefile src/Extensions/Banshee.Torrent/Makefile src/Extensions/Banshee.RemoteAudio/Makefile src/Extensions/Banshee.Wikipedia/Makefile src/Extensions/Banshee.YouTube/Makefile extras/metrics/Makefile"
+ac_config_files="$ac_config_files Makefile build/Makefile build/m4/Makefile build/m4/shave/shave build/m4/shave/shave-libtool build/pkg-config/Makefile data/Makefile data/org.bansheeproject.Banshee.service data/org.bansheeproject.CollectionIndexer.service data/audio-profiles/Makefile data/desktop-files/Makefile data/desktop-files/common.desktop data/icon-theme-hicolor/Makefile help/Makefile docs/Makefile docs/Hyena/Makefile docs/Banshee/Makefile po/Makefile.in tests/Makefile tests/Analyzer/Makefile tests/Performance/Makefile extras/Makefile libbanshee/Makefile gstreamer/Makefile gstreamer/equalizer/Makefile src/Hyena/Makefile src/Hyena/build/Makefile src/Hyena/build/pkg-config/Makefile src/Hyena/build/m4/Makefile src/Hyena/Hyena/Makefile src/Hyena/Hyena.Data.Sqlite/Makefile src/Hyena/Hyena.Gui/Makefile src/Makefile src/AssemblyInfo.cs src/Clients/Makefile src/Clients/Beroe/Makefile src/Clients/Booter/Makefile src/Clients/Booter/banshee-1.linux src/Clients/Booter/banshee-1.darwin src/Clients/Halie/Makefile src/Clients/Muinshee/Makefile src/Clients/Nereid/Makefile src/Clients/MeeGo/Makefile src/Core/Makefile src/Core/Banshee.CollectionIndexer/Makefile src/Core/Banshee.Core/Makefile src/Core/Banshee.Services/Makefile src/Core/Banshee.ThickClient/Makefile src/Core/Banshee.Widgets/Makefile src/Core/Banshee.WebBrowser/Makefile src/Core/Banshee.WebBrowser/libossifer/Makefile src/Backends/Makefile src/Backends/Banshee.Gio/Makefile src/Backends/Banshee.Gnome/Makefile src/Backends/Banshee.GStreamer/Makefile src/Backends/Banshee.GStreamerSharp/Makefile src/Backends/Banshee.Hal/Makefile src/Backends/Banshee.Unix/Makefile src/Backends/Banshee.Osx/Makefile src/Backends/Banshee.NowPlaying.X11/Makefile src/Backends/Banshee.NowPlaying.X11/libbnpx11/Makefile src/Libraries/Makefile src/Libraries/Lastfm/Makefile src/Libraries/Lastfm.Gui/Makefile src/Libraries/Migo/Makefile src/Libraries/Mono.Media/Makefile src/Libraries/Mtp/Makefile src/Libraries/Mtp/Mtp.dll.config src/Libraries/MusicBrainz/Makefile src/Dap/Makefile src/Dap/Banshee.Dap/Makefile src/Dap/Banshee.Dap.AppleDevice/Makefile src/Dap/Banshee.Dap.Ipod/Makefile src/Dap/Banshee.Dap.MassStorage/Makefile src/Dap/Banshee.Dap.Mtp/Makefile src/Dap/Banshee.Dap.Karma/Makefile src/Extensions/Makefile src/Extensions/Banshee.AmazonMp3/Makefile src/Extensions/Banshee.AmazonMp3.Store/Makefile src/Extensions/Banshee.Audiobook/Makefile src/Extensions/Banshee.AudioCd/Makefile src/Extensions/Banshee.BooScript/Makefile src/Extensions/Banshee.Bpm/Makefile src/Extensions/Banshee.CoverArt/Makefile src/Extensions/Banshee.Daap/Makefile src/Extensions/Banshee.Emusic/Makefile src/Extensions/Banshee.FileSystemQueue/Makefile src/Extensions/Banshee.InternetArchive/Makefile src/Extensions/Banshee.Fixup/Makefile src/Extensions/Banshee.InternetRadio/Makefile src/Extensions/Banshee.Lastfm/Makefile src/Extensions/Banshee.LastfmStreaming/Makefile src/Extensions/Banshee.LibraryWatcher/Makefile src/Extensions/Banshee.MiniMode/Makefile src/Extensions/Banshee.MiroGuide/Makefile src/Extensions/Banshee.MeeGo/Makefile src/Extensions/Banshee.Mpris/Makefile src/Extensions/Banshee.MultimediaKeys/Makefile src/Extensions/Banshee.NotificationArea/Makefile src/Extensions/Banshee.NowPlaying/Makefile src/Extensions/Banshee.PlayQueue/Makefile src/Extensions/Banshee.PlayerMigration/Makefile src/Extensions/Banshee.Podcasting/Makefile src/Extensions/Banshee.SoundMenu/Makefile src/Extensions/Banshee.SqlDebugConsole/Makefile src/Extensions/Banshee.Sample/Makefile src/Extensions/Banshee.Torrent/Makefile src/Extensions/Banshee.RemoteAudio/Makefile src/Extensions/Banshee.UbuntuOneMusicStore/Makefile src/Extensions/Banshee.Wikipedia/Makefile src/Extensions/Banshee.YouTube/Makefile extras/metrics/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -19754,10 +20203,21 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
:end' >>confcache
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
- test "x$cache_file" != "x/dev/null" &&
+ if test "x$cache_file" != "x/dev/null"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
$as_echo "$as_me: updating cache $cache_file" >&6;}
- cat confcache >$cache_file
+ if test ! -f "$cache_file" || test -h "$cache_file"; then
+ cat confcache >"$cache_file"
+ else
+ case $cache_file in #(
+ */* | ?:*)
+ mv -f confcache "$cache_file"$$ &&
+ mv -f "$cache_file"$$ "$cache_file" ;; #(
+ *)
+ mv -f confcache "$cache_file" ;;
+ esac
+ fi
+ fi
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -19828,6 +20288,10 @@ if test -z "${HAVE_CLUTTER_TRUE}" && test -z "${HAVE_CLUTTER_FALSE}"; then
as_fn_error $? "conditional \"HAVE_CLUTTER\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${HAVE_GST_0_10_26_TRUE}" && test -z "${HAVE_GST_0_10_26_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_GST_0_10_26\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${ENABLE_BUILTIN_EQUALIZER_TRUE}" && test -z "${ENABLE_BUILTIN_EQUALIZER_FALSE}"; then
as_fn_error $? "conditional \"ENABLE_BUILTIN_EQUALIZER\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -20048,6 +20512,14 @@ if test -z "${HAVE_MEEGO_TRUE}" && test -z "${HAVE_MEEGO_FALSE}"; then
as_fn_error $? "conditional \"HAVE_MEEGO\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${ENABLE_SOUNDMENU_TRUE}" && test -z "${ENABLE_SOUNDMENU_FALSE}"; then
+ as_fn_error $? "conditional \"ENABLE_SOUNDMENU\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${ENABLE_UBUNTUONE_TRUE}" && test -z "${ENABLE_UBUNTUONE_FALSE}"; then
+ as_fn_error $? "conditional \"ENABLE_UBUNTUONE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${ENABLE_GAPLESS_TRUE}" && test -z "${ENABLE_GAPLESS_FALSE}"; then
as_fn_error $? "conditional \"ENABLE_GAPLESS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -20065,7 +20537,7 @@ if test -z "${HYENA_PKG_CONFIG_TRUE}" && test -z "${HYENA_PKG_CONFIG_FALSE}"; th
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-: ${CONFIG_STATUS=./config.status}
+: "${CONFIG_STATUS=./config.status}"
ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -20166,6 +20638,7 @@ fi
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
+as_myself=
case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -20472,8 +20945,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by banshee-1 $as_me 1.9.0, which was
-generated by GNU Autoconf 2.67. Invocation command line was
+This file was extended by banshee-1 $as_me 1.9.1, which was
+generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -20538,8 +21011,8 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-banshee-1 config.status 1.9.0
-configured by $0, generated by GNU Autoconf 2.67,
+banshee-1 config.status 1.9.1
+configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -20667,131 +21140,143 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
sed_quote_subst='$sed_quote_subst'
double_quote_subst='$double_quote_subst'
delay_variable_subst='$delay_variable_subst'
-macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
-macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
-enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
-enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
-pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
-enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
-host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
-host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
-host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
-build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'
-build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'
-build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'
-SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'
-Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'
-GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'
-EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'
-FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'
-LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'
-NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'
-LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'
-max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'
-ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'
-exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'
-lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'
-lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
-lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
-reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
-reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
-deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
-file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
-AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
-AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'
-STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'
-RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'
-old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'
-CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'
-compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'
-GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
-objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'
-SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'
-ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'
-MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'
-need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'
-DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'
-NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'
-LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'
-OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'
-OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'
-libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'
-shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'
-export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
-allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
-no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'
-inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'
-link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'
-fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'
-always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'
-export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
-include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
-prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'
-variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'
-need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
-need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'
-version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'
-runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'
-libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'
-library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'
-soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'
-postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
-sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
-sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
-old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
-striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
+macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
+macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
+enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
+enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
+pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
+enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
+ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
+host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
+host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
+build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
+build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
+build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
+SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
+Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
+GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
+EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
+FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
+LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
+NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
+LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
+max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
+ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
+exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
+lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
+lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
+lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
+reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
+reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
+deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
+file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
+AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
+AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
+STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
+RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
+old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
+lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
+CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
+CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
+compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
+GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
+objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
+MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
+need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
+DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
+NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
+LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
+OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
+OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
+libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
+shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
+extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
+export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
+whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
+compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
+old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
+archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
+module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
+allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
+no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
+hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
+hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
+hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
+hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
+inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
+link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
+fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
+always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
+export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
+exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
+include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
+prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
+file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
+variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
+need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
+need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
+version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
+runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
+libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
+library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
+soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
+install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
+postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
+finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
+hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
+sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
+sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
+hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
+enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
+old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
+striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
LTCC='$LTCC'
LTCFLAGS='$LTCFLAGS'
compiler='$compiler_DEFAULT'
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+ eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+
# Quote evaled strings.
-for var in SED \
+for var in SHELL \
+ECHO \
+SED \
GREP \
EGREP \
FGREP \
@@ -20815,8 +21300,6 @@ lt_cv_sys_global_symbol_pipe \
lt_cv_sys_global_symbol_to_cdecl \
lt_cv_sys_global_symbol_to_c_name_address \
lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
-SHELL \
-ECHO \
lt_prog_compiler_no_builtin_flag \
lt_prog_compiler_wl \
lt_prog_compiler_pic \
@@ -20846,12 +21329,13 @@ variables_saved_for_relink \
libname_spec \
library_names_spec \
soname_spec \
+install_override_mode \
finish_eval \
old_striplib \
striplib; do
- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[\\\\\\\`\\"\\\$]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -20878,9 +21362,9 @@ postuninstall_cmds \
finish_cmds \
sys_lib_search_path_spec \
sys_lib_dlsearch_path_spec; do
- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[\\\\\\\`\\"\\\$]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -20888,12 +21372,6 @@ sys_lib_dlsearch_path_spec; do
esac
done
-# Fix-up fallback echo if it was mangled by the above quoting rules.
-case \$lt_ECHO in
-*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
- ;;
-esac
-
ac_aux_dir='$ac_aux_dir'
xsi_shell='$xsi_shell'
lt_shell_append='$lt_shell_append'
@@ -21030,16 +21508,18 @@ do
"src/Extensions/Banshee.PlayQueue/Makefile") CONFIG_FILES="$CONFIG_FILES src/Extensions/Banshee.PlayQueue/Makefile" ;;
"src/Extensions/Banshee.PlayerMigration/Makefile") CONFIG_FILES="$CONFIG_FILES src/Extensions/Banshee.PlayerMigration/Makefile" ;;
"src/Extensions/Banshee.Podcasting/Makefile") CONFIG_FILES="$CONFIG_FILES src/Extensions/Banshee.Podcasting/Makefile" ;;
+ "src/Extensions/Banshee.SoundMenu/Makefile") CONFIG_FILES="$CONFIG_FILES src/Extensions/Banshee.SoundMenu/Makefile" ;;
"src/Extensions/Banshee.SqlDebugConsole/Makefile") CONFIG_FILES="$CONFIG_FILES src/Extensions/Banshee.SqlDebugConsole/Makefile" ;;
"src/Extensions/Banshee.Sample/Makefile") CONFIG_FILES="$CONFIG_FILES src/Extensions/Banshee.Sample/Makefile" ;;
"src/Extensions/Banshee.Torrent/Makefile") CONFIG_FILES="$CONFIG_FILES src/Extensions/Banshee.Torrent/Makefile" ;;
"src/Extensions/Banshee.RemoteAudio/Makefile") CONFIG_FILES="$CONFIG_FILES src/Extensions/Banshee.RemoteAudio/Makefile" ;;
+ "src/Extensions/Banshee.UbuntuOneMusicStore/Makefile") CONFIG_FILES="$CONFIG_FILES src/Extensions/Banshee.UbuntuOneMusicStore/Makefile" ;;
"src/Extensions/Banshee.Wikipedia/Makefile") CONFIG_FILES="$CONFIG_FILES src/Extensions/Banshee.Wikipedia/Makefile" ;;
"src/Extensions/Banshee.YouTube/Makefile") CONFIG_FILES="$CONFIG_FILES src/Extensions/Banshee.YouTube/Makefile" ;;
"extras/metrics/Makefile") CONFIG_FILES="$CONFIG_FILES extras/metrics/Makefile" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
- *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
done
@@ -21062,9 +21542,10 @@ fi
# after its creation but before its name has been assigned to `$tmp'.
$debug ||
{
- tmp=
+ tmp= ac_tmp=
trap 'exit_status=$?
- { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+ : "${ac_tmp:=$tmp}"
+ { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
' 0
trap 'as_fn_exit 1' 1 2 13 15
}
@@ -21072,12 +21553,13 @@ $debug ||
{
tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
- test -n "$tmp" && test -d "$tmp"
+ test -d "$tmp"
} ||
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
@@ -21099,7 +21581,7 @@ else
ac_cs_awk_cr=$ac_cr
fi
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
_ACEOF
@@ -21127,7 +21609,7 @@ done
rm -f conf$$subs.sh
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
_ACEOF
sed -n '
h
@@ -21175,7 +21657,7 @@ t delim
rm -f conf$$subs.awk
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
_ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
for (key in S) S_is_set[key] = 1
FS = ""
@@ -21207,7 +21689,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
else
cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
|| as_fn_error $? "could not setup config files machinery" "$LINENO" 5
_ACEOF
@@ -21241,7 +21723,7 @@ fi # test -n "$CONFIG_FILES"
# No need to generate them if there are no CONFIG_HEADERS.
# This happens for instance with `./config.status Makefile'.
if test -n "$CONFIG_HEADERS"; then
-cat >"$tmp/defines.awk" <<\_ACAWK ||
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
BEGIN {
_ACEOF
@@ -21253,8 +21735,8 @@ _ACEOF
# handling of long lines.
ac_delim='%!_!# '
for ac_last_try in false false :; do
- ac_t=`sed -n "/$ac_delim/p" confdefs.h`
- if test -z "$ac_t"; then
+ ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+ if test -z "$ac_tt"; then
break
elif $ac_last_try; then
as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
@@ -21355,7 +21837,7 @@ do
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
@@ -21374,7 +21856,7 @@ do
for ac_f
do
case $ac_f in
- -) ac_f="$tmp/stdin";;
+ -) ac_f="$ac_tmp/stdin";;
*) # Look for the file first in the build tree, then in the source tree
# (if the path is not absolute). The absolute path cannot be DOS-style,
# because $ac_f cannot contain `:'.
@@ -21383,7 +21865,7 @@ do
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
- as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
esac
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
as_fn_append ac_file_inputs " '$ac_f'"
@@ -21409,8 +21891,8 @@ $as_echo "$as_me: creating $ac_file" >&6;}
esac
case $ac_tag in
- *:-:* | *:-) cat >"$tmp/stdin" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+ *:-:* | *:-) cat >"$ac_tmp/stdin" \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
esac
;;
esac
@@ -21546,21 +22028,22 @@ s&@INSTALL@&$ac_INSTALL&;t t
s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+ >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
- { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
+ "$ac_tmp/out"`; test -z "$ac_out"; } &&
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined" >&5
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined" >&2;}
- rm -f "$tmp/stdin"
+ rm -f "$ac_tmp/stdin"
case $ac_file in
- -) cat "$tmp/out" && rm -f "$tmp/out";;
- *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+ -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+ *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
esac \
|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
;;
@@ -21571,20 +22054,20 @@ which seems to be undefined. Please make sure it is defined" >&2;}
if test x"$ac_file" != x-; then
{
$as_echo "/* $configure_input */" \
- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
- } >"$tmp/config.h" \
+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+ } >"$ac_tmp/config.h" \
|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
- if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+ if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
$as_echo "$as_me: $ac_file is unchanged" >&6;}
else
rm -f "$ac_file"
- mv "$tmp/config.h" "$ac_file" \
+ mv "$ac_tmp/config.h" "$ac_file" \
|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
fi
else
$as_echo "/* $configure_input */" \
- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
|| as_fn_error $? "could not create -" "$LINENO" 5
fi
# Compute "$ac_file"'s index in $config_headers.
@@ -21746,7 +22229,8 @@ $as_echo X"$file" |
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+# Inc.
# Written by Gordon Matzigkeit, 1996
#
# This file is part of GNU Libtool.
@@ -21794,6 +22278,12 @@ pic_mode=$pic_mode
# Whether or not to optimize for fast installation.
fast_install=$enable_fast_install
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# An echo program that protects backslashes.
+ECHO=$lt_ECHO
+
# The host system.
host_alias=$host_alias
host=$host
@@ -21843,10 +22333,6 @@ SP2NL=$lt_lt_SP2NL
# turn newlines into spaces.
NL2SP=$lt_lt_NL2SP
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
# An object symbol dumper.
OBJDUMP=$lt_OBJDUMP
@@ -21868,6 +22354,9 @@ RANLIB=$lt_RANLIB
old_postinstall_cmds=$lt_old_postinstall_cmds
old_postuninstall_cmds=$lt_old_postuninstall_cmds
+# Whether to use a lock for old archive extraction.
+lock_old_archive_extraction=$lock_old_archive_extraction
+
# A C compiler.
LTCC=$lt_CC
@@ -21889,12 +22378,6 @@ global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name
# The name of the directory that contains temporary libtool files.
objdir=$objdir
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# An echo program that does not interpret backslashes.
-ECHO=$lt_ECHO
-
# Used to examine libraries when file_magic_cmd begins with "file".
MAGIC_CMD=$MAGIC_CMD
@@ -21957,6 +22440,9 @@ library_names_spec=$lt_library_names_spec
# The coded name of the library, if different from the real name.
soname_spec=$lt_soname_spec
+# Permission mode override for installation of shared libraries.
+install_override_mode=$lt_install_override_mode
+
# Command to use after installation of a shared archive.
postinstall_cmds=$lt_postinstall_cmds
@@ -21996,6 +22482,10 @@ striplib=$lt_striplib
# The linker used to build libraries.
LD=$lt_LD
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
# Commands used to build an old-style archive.
old_archive_cmds=$lt_old_archive_cmds
@@ -22255,7 +22745,7 @@ _LT_EOF
func_dirname ()
{
# Extract subdirectory from the argument.
- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
if test "X$func_dirname_result" = "X${1}"; then
func_dirname_result="${3}"
else
@@ -22266,7 +22756,7 @@ func_dirname ()
# func_basename file
func_basename ()
{
- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+ func_basename_result=`$ECHO "${1}" | $SED "$basename"`
}
@@ -22279,10 +22769,8 @@ func_basename ()
func_stripname ()
{
case ${2} in
- .*) func_stripname_result=`$ECHO "X${3}" \
- | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
- *) func_stripname_result=`$ECHO "X${3}" \
- | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
esac
}
@@ -22293,20 +22781,20 @@ my_sed_long_arg='1s/^-[^=]*=//'
# func_opt_split
func_opt_split ()
{
- func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
- func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
+ func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
+ func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
}
# func_lo2o object
func_lo2o ()
{
- func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
+ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
}
# func_xform libobj-or-source
func_xform ()
{
- func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
+ func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
}
# func_arith arithmetic-term...
@@ -22468,6 +22956,8 @@ ${PACKAGE}-${VERSION}
Podcasts: ${enable_podcast}
Gapless playback: ${ENABLE_GAPLESS} (gstreamer-plugins-base > 0.10.25.2)
YouTube extension: ${enable_youtube} (gdata-sharp >= 1.4)
+ Sound menu: ${enable_soundmenu} (indicate-sharp >= 0.4.1)
+ Ubuntu One Store: ${enable_ubuntuone} (ubuntuone-sharp)
Build/Development:
Unit Tests: ${do_tests} (nunit >= ${NUNIT_REQUIRED})
diff --git a/configure.ac b/configure.ac
index 4e1f898..f87f0a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,10 +2,10 @@ dnl Granularly define the version components
dnl Remember to also update the Display Version
m4_define([banshee_version_major], [1])
m4_define([banshee_version_minor], [9])
-m4_define([banshee_version_micro], [0])
+m4_define([banshee_version_micro], [1])
dnl this can sometimes differ manually
-m4_define([banshee_display_version], ["1.9.0"])
+m4_define([banshee_display_version], ["1.9.1"])
dnl set to 0 when doing an official release
m4_define([banshee_version_pre_release], [0])
@@ -175,6 +175,12 @@ BANSHEE_CHECK_TORRENT
dnl MeeGo integration (optional)
BANSHEE_CHECK_MEEGO
+dnl Sound menu integration (optional)
+BANSHEE_CHECK_SOUNDMENU
+
+dnl Ubuntu One Music Store (optional)
+BANSHEE_CHECK_UBUNTUONE
+
dnl Gapless, if we have a new-enough playbin2
ENABLE_GAPLESS="no"
AC_ARG_ENABLE(gapless-playback,
@@ -357,10 +363,12 @@ src/Extensions/Banshee.NowPlaying/Makefile
src/Extensions/Banshee.PlayQueue/Makefile
src/Extensions/Banshee.PlayerMigration/Makefile
src/Extensions/Banshee.Podcasting/Makefile
+src/Extensions/Banshee.SoundMenu/Makefile
src/Extensions/Banshee.SqlDebugConsole/Makefile
src/Extensions/Banshee.Sample/Makefile
src/Extensions/Banshee.Torrent/Makefile
src/Extensions/Banshee.RemoteAudio/Makefile
+src/Extensions/Banshee.UbuntuOneMusicStore/Makefile
src/Extensions/Banshee.Wikipedia/Makefile
src/Extensions/Banshee.YouTube/Makefile
@@ -413,6 +421,8 @@ ${PACKAGE}-${VERSION}
Podcasts: ${enable_podcast}
Gapless playback: ${ENABLE_GAPLESS} (gstreamer-plugins-base > 0.10.25.2)
YouTube extension: ${enable_youtube} (gdata-sharp >= 1.4)
+ Sound menu: ${enable_soundmenu} (indicate-sharp >= 0.4.1)
+ Ubuntu One Store: ${enable_ubuntuone} (ubuntuone-sharp)
Build/Development:
Unit Tests: ${do_tests} (nunit >= ${NUNIT_REQUIRED})
diff --git a/data/Makefile.in b/data/Makefile.in
index 1b7fefc..cdf572c 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -40,14 +40,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/org.bansheeproject.CollectionIndexer.service.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -71,9 +63,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -239,6 +241,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -258,6 +262,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -365,6 +371,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -411,7 +419,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/data/addin-xml-strings.cs b/data/addin-xml-strings.cs
index f264e9e..4fde14f 100644
--- a/data/addin-xml-strings.cs
+++ b/data/addin-xml-strings.cs
@@ -203,6 +203,11 @@ internal static class AddinXmlStringCatalog
Catalog.GetString (@"A sample source useful to developers.");
Catalog.GetString (@"Sources");
+ // ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu.addin.xml
+ Catalog.GetString (@"Sound Menu integration for Banshee");
+ Catalog.GetString (@"Control Banshee from the Sound Menu.");
+ Catalog.GetString (@"Utilities");
+
// ../src/Extensions/Banshee.SqlDebugConsole/Banshee.SqlDebugConsole.addin.xml
Catalog.GetString (@"SQL Debug Console");
Catalog.GetString (@"Provides a UI for monitoring Banshee's SQL usage, and running queries.");
@@ -213,6 +218,11 @@ internal static class AddinXmlStringCatalog
Catalog.GetString (@"Support downloading BitTorrent files from podcasts.");
Catalog.GetString (@"Utilities");
+ // ../src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore.addin.xml
+ Catalog.GetString (@"Ubuntu One Music Store");
+ Catalog.GetString (@"This extension grants access to the Ubuntu One Music Store, powered by 7digital.");
+ Catalog.GetString (@"Online Sources");
+
// ../src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia.addin.xml
Catalog.GetString (@"Wikipedia");
Catalog.GetString (@"View artist information from Wikipedia in the context pane.");
diff --git a/data/audio-profiles/Makefile.in b/data/audio-profiles/Makefile.in
index ad9b653..3931fa4 100644
--- a/data/audio-profiles/Makefile.in
+++ b/data/audio-profiles/Makefile.in
@@ -38,14 +38,6 @@ subdir = data/audio-profiles
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -69,9 +61,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -196,6 +198,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -215,6 +219,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -322,6 +328,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -368,7 +376,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/data/audio-profiles/mp3-lame.xml.in b/data/audio-profiles/mp3-lame.xml.in
index 1b9eaff..a28ff29 100644
--- a/data/audio-profiles/mp3-lame.xml.in
+++ b/data/audio-profiles/mp3-lame.xml.in
@@ -18,15 +18,16 @@
<![CDATA[
(gst-construct-pipeline
"audioconvert"
- (gst-construct-element "lame"
- (if (= vbr_mode -1)
- ("preset" preset)
- ("mode" 4
- (if (= vbr_mode 0)
- ("bitrate" bitrate)
- ("vbr" vbr_mode "vbr-quality" (- 9 vbr_quality))))))
+ (gst-construct-element "lamemp3enc"
+ (if (= encoding_mode 0)
+ ("bitrate" bitrate "target" 1)
+ (if (= encoding_mode 4)
+ ("quality" (- 9 vbr_quality) "target" 0)
+ )
+ )
+ )
(if (and
- (!= vbr_mode 0)
+ (!= encoding_mode 0)
(gst-element-is-available "xingmux"))
"xingmux"
"")
@@ -35,15 +36,13 @@
"id3mux"))
]]>
</process>
- <variable id="vbr_mode">
- <_name>VBR Mode</_name>
+ <variable id="encoding_mode">
+ <_name>Encoding Mode</_name>
<control-type>combo</control-type>
<default-value>0</default-value>
<possible-values>
- <_value value="0" disables="vbr_quality,preset" enables="bitrate" >Constant Bitrate</_value>
- <_value value="4" disables="bitrate,preset" enables="vbr_quality">Variable Bitrate</_value>
- <_value value="3" disables="bitrate,preset" enables="vbr_quality">Average Bitrate</_value>
- <_value value="-1" disables="bitrate,vbr_quality" enables="preset">Preset</_value>
+ <_value value="0" disables="vbr_quality" enables="bitrate" >Constant Bitrate</_value>
+ <_value value="4" disables="bitrate" enables="vbr_quality">Variable Bitrate</_value>
</possible-values>
</variable>
<variable id="vbr_quality">
@@ -54,7 +53,7 @@
<max-value>9</max-value>
<_max-label>Best</_max-label>
<step-value>1</step-value>
- <default-value>5</default-value>
+ <default-value>7</default-value>
</variable>
<variable id="bitrate">
<_name>Bitrate</_name>
@@ -70,17 +69,6 @@
<value value="320">320 Kbps</value>
</possible-values>
</variable>
- <variable id="preset">
- <_name>LAME Preset</_name>
- <control-type>combo</control-type>
- <default-value>standard</default-value>
- <possible-values>
- <_value value="medium">Medium</_value>
- <_value value="standard">Standard</_value>
- <_value value="extreme">Extreme</_value>
- <_value value="insane">Insane</_value>
- </possible-values>
- </variable>
</pipeline>
</profile>
</profiles>
diff --git a/data/desktop-files/Makefile.in b/data/desktop-files/Makefile.in
index 9d952d4..dc52ade 100644
--- a/data/desktop-files/Makefile.in
+++ b/data/desktop-files/Makefile.in
@@ -39,14 +39,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/common.desktop.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -70,9 +62,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -197,6 +199,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -216,6 +220,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -323,6 +329,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -369,7 +377,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/data/icon-theme-hicolor/Makefile.in b/data/icon-theme-hicolor/Makefile.in
index 00467c3..763c9fb 100644
--- a/data/icon-theme-hicolor/Makefile.in
+++ b/data/icon-theme-hicolor/Makefile.in
@@ -37,14 +37,6 @@ subdir = data/icon-theme-hicolor
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -68,9 +60,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -172,6 +174,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -191,6 +195,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -298,6 +304,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -344,7 +352,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/docs/Banshee/Makefile.in b/docs/Banshee/Makefile.in
index 81e3d63..2fd6788 100644
--- a/docs/Banshee/Makefile.in
+++ b/docs/Banshee/Makefile.in
@@ -39,14 +39,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = docs/Banshee
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -70,9 +62,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -197,6 +199,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -216,6 +220,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -323,6 +329,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -369,7 +377,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/docs/Hyena/Makefile.in b/docs/Hyena/Makefile.in
index 189e710..c7aa389 100644
--- a/docs/Hyena/Makefile.in
+++ b/docs/Hyena/Makefile.in
@@ -39,14 +39,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = docs/Hyena
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -70,9 +62,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -197,6 +199,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -216,6 +220,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -323,6 +329,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -369,7 +377,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/docs/Makefile.in b/docs/Makefile.in
index 7fbdca1..f043ad2 100644
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -37,14 +37,6 @@ subdir = docs
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -68,9 +60,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -212,6 +214,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -231,6 +235,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -338,6 +344,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -384,7 +392,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/extras/Makefile.in b/extras/Makefile.in
index abe8e61..49f1162 100644
--- a/extras/Makefile.in
+++ b/extras/Makefile.in
@@ -38,14 +38,6 @@ SUBDIRS =
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -69,9 +61,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -212,6 +214,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -231,6 +235,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -338,6 +344,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -384,7 +392,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/extras/metrics/Makefile.in b/extras/metrics/Makefile.in
index 2a72082..2133968 100644
--- a/extras/metrics/Makefile.in
+++ b/extras/metrics/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = extras/metrics
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -431,6 +438,8 @@ LINK_GDATA = $(GDATASHARP_LIBS)
LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -547,6 +556,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -560,6 +570,7 @@ REF_EXTENSION_PODCASTING = $(LINK_MIGO_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/gstreamer/Makefile.in b/gstreamer/Makefile.in
index d293bdf..b943dda 100644
--- a/gstreamer/Makefile.in
+++ b/gstreamer/Makefile.in
@@ -37,14 +37,6 @@ subdir = gstreamer
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in COPYING
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -68,9 +60,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -212,6 +214,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -231,6 +235,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -338,6 +344,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -384,7 +392,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/gstreamer/equalizer/Makefile.in b/gstreamer/equalizer/Makefile.in
index 546aafc..975f884 100644
--- a/gstreamer/equalizer/Makefile.in
+++ b/gstreamer/equalizer/Makefile.in
@@ -40,14 +40,6 @@ DIST_COMMON = $(noinst_HEADERS) $(srcdir)/../gst-package.mk \
subdir = gstreamer/equalizer
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -71,9 +63,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -223,6 +225,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -242,6 +246,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -349,6 +355,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -395,7 +403,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/help/C/add-radio.page b/help/C/add-radio.page
index 50af9a9..bb5a71a 100644
--- a/help/C/add-radio.page
+++ b/help/C/add-radio.page
@@ -31,7 +31,7 @@
<p>Internet radio stations are similar to regular radio stations, allowing
an individual or organization to stream music live over the internet.
Internet radio stations can be a simultaneous stream of a regular radio station,
- an amateur broadasting their own station, or commercial
+ an amateur broadcasting their own station, or commercial
internet radio stations that include live DJs and even commercials.</p>
</section>
diff --git a/help/C/import.page b/help/C/import.page
index bfcb2a3..a980342 100644
--- a/help/C/import.page
+++ b/help/C/import.page
@@ -52,7 +52,7 @@
</item>
<item>
<title><gui>Videos From Photos Folder</gui></title>
- <p>Many digital cameras can take short vidoes, and photo-management
+ <p>Many digital cameras can take short videos, and photo-management
applications often download these videos directly into your Photos
folder. Choose this option to import any videos that have been
stored in your Photos folder.</p>
diff --git a/help/C/introduction.page b/help/C/introduction.page
index 6ba89a4..bdaf45c 100644
--- a/help/C/introduction.page
+++ b/help/C/introduction.page
@@ -25,7 +25,7 @@
<p>
<app>Banshee</app> is a media player that allows you to play your music,
- videos, and other media media as well sync it with portable devices to take your media
+ videos, and other media as well sync it with portable devices to take your media
on the go.
</p>
<p>
diff --git a/help/C/lastfm.page b/help/C/lastfm.page
index 5efaa0d..7648275 100644
--- a/help/C/lastfm.page
+++ b/help/C/lastfm.page
@@ -26,7 +26,7 @@
<p>Last.fm is a popular online service that offers both free and paid
versions. Last.fm offers information on music artists and albums and if you
create a user profile Last.fm allows you to track the music you listen to
- in Banshee for free. If you suscribe as a paying member, you can also listen
+ in Banshee for free. If you subscribe as a paying member, you can also listen
to streaming music from Last.fm in various music clients, including Banshee.
Last.fm offers multiple channels to stream, including recommended music for
you based on your listening habits, your favorites and more.</p>
@@ -77,8 +77,8 @@
music you've loved or tagged.
</p>
- <p>In Banshee's context menu onthe left hand side, you will now have a
- Last.fm section, including your Lat.fm radio stations. You will need an
+ <p>In Banshee's context menu on the left hand side, you will now have a
+ Last.fm section, including your Last.fm radio stations. You will need an
active internet connection to listen to Last.fm radio. Choose the radio
station you wish to listen to and Banshee will communicate with Last.fm
to populate songs for that radio station. Press the <gui>Play</gui> button
diff --git a/help/C/manage-playlists.page b/help/C/manage-playlists.page
index c1829d1..e16e69f 100644
--- a/help/C/manage-playlists.page
+++ b/help/C/manage-playlists.page
@@ -44,7 +44,7 @@
<gui>New Playlist</gui></guiseq> or by selecing the track(s) you would like
to add to the playlist. Select the track(s), right click them, and choose
<guiseq><gui>Add to Playlist</gui><gui>New Playlist</gui></guiseq>.
- You can also drag and drop them to a new playlist by selcting the track(s)
+ You can also drag and drop them to a new playlist by selecting the track(s)
and dragging them to the left hand
window pane over <gui>Music</gui>. As you drag it over <gui>Music</gui>,
a new option <gui><em>New Playlist</em></gui> will appear and you can drop
diff --git a/help/C/search.page b/help/C/search.page
index b4f856e..db139c3 100644
--- a/help/C/search.page
+++ b/help/C/search.page
@@ -36,7 +36,7 @@
<em>dave matthews</em>. By entering <em>dave matthews</em> in the search box,
Banshee will search all metatdata fields including Track Title, Album Title,
Album Artist, Year, etc. Any track whose metadata includes <em>dave</em>
- and <em>matthews</em> will be returned. Search terms are case, meaningyou don't have to capitalize. <em>dave</em>, <em>Dave</em>, and <em>DAVE</em>
+ and <em>matthews</em> will be returned. Search terms are case, meaning you don't have to capitalize. <em>dave</em>, <em>Dave</em>, and <em>DAVE</em>
all mean the same thing when searching.</p>
<section id="operators">
diff --git a/help/C/sort.page b/help/C/sort.page
index dd22c49..09fcb64 100644
--- a/help/C/sort.page
+++ b/help/C/sort.page
@@ -47,7 +47,7 @@
<p>You can sort your library by using your mouse to click on any of the
columns displayed in library view. If you wish to sort your music library
by Artist, click the <gui>Artist</gui> column header and Banshee will
- automically sort that column alphabetically. Clicking the
+ automatically sort that column alphabetically. Clicking the
<gui>Artist</gui> column again will sort the column in reverse alphabetical
order.</p>
</section>
diff --git a/help/Makefile.am b/help/Makefile.am
index d06b00f..e898798 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -29,7 +29,7 @@ DOC_PAGES = \
sync.page \
ui.page
-DOC_LINGUAS = ca de el es gl sl
+DOC_LINGUAS = ca de el es fr gl sl
dist-hook: doc-dist-hook
endif
diff --git a/help/Makefile.in b/help/Makefile.in
index b88eac7..64aa56d 100644
--- a/help/Makefile.in
+++ b/help/Makefile.in
@@ -62,14 +62,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = help
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -93,9 +85,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -197,6 +199,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -216,6 +220,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -323,6 +329,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -369,7 +377,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -523,7 +530,7 @@ top_srcdir = @top_srcdir@
@HAVE_GNOME_DOC_UTILS_TRUE@ sync.page \
@HAVE_GNOME_DOC_UTILS_TRUE@ ui.page
- at HAVE_GNOME_DOC_UTILS_TRUE@DOC_LINGUAS = ca de el es gl sl
+ at HAVE_GNOME_DOC_UTILS_TRUE@DOC_LINGUAS = ca de el es fr gl sl
all: all-am
.SUFFIXES:
diff --git a/help/ca/add-podcast.page b/help/ca/add-podcast.page
index d155fea..7d80e8c 100644
--- a/help/ca/add-podcast.page
+++ b/help/ca/add-podcast.page
@@ -6,7 +6,7 @@
<link type="seealso" xref="remove-media"/>
<link type="seealso" xref="add-radio"/>
<link type="seealso" xref="import"/>
- <desc>Add, remove and play podcasts in Banshee.</desc>
+ <desc>Afegeix, elimina i reprodueix podcasts al Banshee.</desc>
<revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
@@ -24,7 +24,7 @@
<title>Podcasts</title>
<section id="podcastdescription">
- <title>What is a Podcast?</title>
+ <title>Què és un Podcast?</title>
<p>Podcasts are recorded programs, similar to radio programs, that are
available on the internet and allow you to subscribe. When you subscribe
@@ -39,7 +39,7 @@
</section>
<section id="addpodcast">
- <title>Add a Podcast</title>
+ <title>Afegiu un Podcast</title>
<p>To add a Podcast to Banshee you will first need to visit the podcast's
home page on the internet in your browser. Almost all podcasts will have a
@@ -54,23 +54,20 @@
<key>Shift</key><key>Control</key><key>F</key></keyseq>.
</p>
- <p>Banshee will then allow you to choose how you want to download new podcasts
- from a drop down menu. Your choices include:</p>
+ <p>El Banshee us permetrà escollir com voleu baixar els Podcasts nous des del menú desplegable. Les opcions inclouen:</p>
<list>
- <item><p>Download the Most Recent Episode (This will automatically
- download the last episode that was released).</p></item>
- <item><p>Download All Episodes (This will download all episodes).</p></item>
- <item><p>Let Me Decide Which Episodes to Download (This will allow you
- to choose which episodes you would like to download).</p></item>
+ <item><p>Baixeu l'episodi més recent (es baixarà l'últim episodi que s'ha publicat)</p></item>
+ <item><p>Baixa tots els episodis</p></item>
+ <item><p>Deixeu-me decidir quins episodis baixar</p></item>
</list>
- <p>After you have added a Podcast feed, Banshee will display:</p>
+ <p>Un cop hageu afegit un canal Podcast, el Banshee mostrarà:</p>
<list>
- <item><p><gui>Name</gui>: (Name of the specific episode)</p></item>
- <item><p><gui>Podcast</gui>: (Name of the Podcast)</p></item>
- <item><p><gui>Published</gui> (Date the episode was published or released)</p></item>
+ <item><p><gui>Nom</gui>: (nom de l'episodi específic)</p></item>
+ <item><p><gui>Podcast</gui>: (nom del Podcast)</p></item>
+ <item><p><gui>Publicat</gui> (data en que l'episodi es va publicar)</p></item>
</list>
</section>
diff --git a/help/ca/add-radio.page b/help/ca/add-radio.page
index c37d63e..bfbcb34 100644
--- a/help/ca/add-radio.page
+++ b/help/ca/add-radio.page
@@ -6,7 +6,7 @@
<link type="seealso" xref="remove-media"/>
<link type="seealso" xref="add-podcasts"/>
<link type="seealso" xref="import"/>
- <desc>Add, remove and play internet radio stations in Banshee.</desc>
+ <desc>Afegeix, suprimeix i reprodueix emissores de ràdio al Banshee.</desc>
<revision pkgversion="2.0" version="0.1" date="2010-05-20" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
@@ -21,32 +21,29 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Internet Radio</title>
+ <title>Ràdio per Internet</title>
<section id="radiodescription">
- <title>What is Internet Radio?</title>
+ <title>Què és la ràdio per Internet?</title>
<p>Internet radio stations are similar to regular radio stations, allowing
an individual or organization to stream music live over the internet.
Internet radio stations can be a simultaneous stream of a regular radio station,
- an amateur broadasting their own station, or commercial
+ an amateur broadcasting their own station, or commercial
internet radio stations that include live DJs and even commercials.</p>
</section>
<section id="addradio">
- <title>Add Radio Station</title>
+ <title>Afegeix una emissora de ràdio</title>
<p>To add an internet radio station to Banshee, press <gui>Add Station</gui>
in the upper right hand corner of Banshee or, from the menu, choose <guiseq>
<gui>Menu</gui><gui>Add Station</gui></guiseq>.
</p>
- <p>From the internet radio station's webpage, copy the link to their stream
- URL in your web browser. In most browsers, you can right click on the link
- and press <gui>Copy Link</gui>.
- </p>
+ <p>Des de la pàgina d'Internet de l'emissora de Ràdio, copieu l'enllaç del flux a la URL del vostre navegador. A la majoria de navegadors, podeu fer clic amb el botó dret a l'enllaç i prémer <gui>Copia l'enllaç</gui>.</p>
<p>Banshee will prompt you to enter the <gui>Station Genre</gui>.
@@ -61,8 +58,7 @@
<gui>Station Creator</gui>, <gui>Description</gui>, and <gui>Rating</gui>.
</p>
- <p>Then press <gui>Save</gui> to save the internet radio station in Banshee.
- </p>
+ <p>Llavors premeu <gui>Desa</gui> per a desar l'emissora de ràdio per Internet al Banshee.</p>
</section>
diff --git a/help/ca/advanced.page b/help/ca/advanced.page
index f59a3ef..1e1df76 100644
--- a/help/ca/advanced.page
+++ b/help/ca/advanced.page
@@ -3,7 +3,7 @@
<info>
<link type="guide" xref="index#advanced"/>
- <desc>Get help for advanced actions.</desc>
+ <desc>Obtingueu ajuda per a accions avançades.</desc>
<revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
@@ -18,13 +18,13 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Advanced Options and Help</title>
+ <title>Opcions avançades i ajuda</title>
<section id="keyboard" style="2column">
<info>
- <title type="link">Keyboard Shortcuts</title>
+ <title type="link">Dreceres de teclat</title>
</info>
- <title>Keyboard Shortcuts</title>
+ <title>Dreceres de teclat</title>
</section>
</page>
diff --git a/help/ca/amazon.page b/help/ca/amazon.page
index 2312e57..6e9ff06 100644
--- a/help/ca/amazon.page
+++ b/help/ca/amazon.page
@@ -4,7 +4,7 @@
<info>
<link type="guide" xref="index#extensions"/>
<link type="seealso" xref=""/>
- <desc>Sync and purchase music from the Amazon MP3 Store.</desc>
+ <desc>Sincronitza i compra música de la botiga Amazon MP3.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-07-11" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
@@ -19,7 +19,7 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Amazon MP3 Store</title>
+ <title>Botiga Amazon MP3</title>
<p>Banshee supports downloading and importing music from the Amazon MP3 store.
You can manually import Amazon music files, purchase music in your web
@@ -29,13 +29,11 @@
</p>
<note style="important">
- <p>Banshee uses an Amazon affiliate code for all music purchases. All
- money made via this affiliate code is donated to the GNOME Foundation.
- </p>
+ <p>El Banshee utilitza un codi d'afiliació per totes compres de música. Totes les comissions de venda obtingudes amb el codi d'afiliació són donades a la Fundació GNOME.</p>
</note>
<section id="amazon-browser">
- <title>Purchase Amazon MP3s in your web browser</title>
+ <title>Compreu música de l'Amazon MP3 des del navegador</title>
<p>Music purchased from Amazon's MP3 store can be automatically
downloaded and imported into Banshee. Banshee associates itself with
@@ -46,7 +44,7 @@
</section>
<section id="amazon-banshee">
- <title>Buy Amazon MP3s in Banshee</title>
+ <title>Compreu d'Amazon MP3 des del Banshee</title>
<p>You can also search for songs on Amazon within Banshee. Choose the
Amazon MP3 Store from the Banshee menu on the left. This will load the
@@ -58,7 +56,7 @@
</section>
<section id="amazon-manual">
- <title>Import Amazon MP3s manually</title>
+ <title>Importeu música d'Amazon MP3 manualment</title>
<p>When music is purchased from Amazon in a web browser, a file with the
extension .amz is downloaded and saved to your hard drive. To import
diff --git a/help/ca/ca.po b/help/ca/ca.po
index ad23e9e..a1eea6e 100644
--- a/help/ca/ca.po
+++ b/help/ca/ca.po
@@ -1,18 +1,21 @@
#
-# This file is distributed under the same license as the banshee package.
-# (c) 2010 Jordi Mas i Hernandez
-#
+# Copyright (C) 2010 Jordi Mas i Hernàndez, jmas at softcatala.org
+# Traducció de la documentació del Banshee al català
+#
# N.T.:
#
+# Veure notes les de la traducció del programa Banshee
+#
# 1) Atès que "Reproducció ara" és un nom d'una extensió li dono tractament de nom propi
#
# 2) Els operadors de consulta (OR, NOT) al programa Banshee no es tradueixen. Cal emprar els termes en anglès
#
-
+# 3) Noms dels connectors en majúscula ja que són noms propis
+#
msgid ""
msgstr ""
"Project-Id-Version: banshee-help.master\n"
-"POT-Creation-Date: 2010-09-24 18:29+0000\n"
+"POT-Creation-Date: 2010-12-03 22:26+0000\n"
"PO-Revision-Date: 2010-11-15 10:48+0200\n"
"Last-Translator: Jordi Mas <jmas at softcatala.org>\n"
"Language-Team: Catalan\n"
@@ -21,7 +24,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-
#. When image changes, this message will be marked fuzzy or untranslated for you.
#. It doesn't matter what you translate it to: it's not used at all.
#: C/ui.page:29(None) C/introduction.page:45(None)
@@ -30,7 +32,8 @@ msgstr "@@image: 'figures/banshee.png'; md5=THIS FILE DOESN'T EXIST"
#: C/ui.page:8(desc)
msgid "An overview of <app>Banshee's</app> user interface."
-msgstr "Una perspectiva general de la interfície d'usuari del <app>Banshee's</app>."
+msgstr ""
+"Una perspectiva general de la interfície d'usuari del <app>Banshee</app>."
#: C/ui.page:12(name) C/sync.page:12(name) C/sort.page:12(name)
#: C/search.page:12(name) C/play.page:12(name) C/play-queue.page:12(name)
@@ -81,8 +84,8 @@ msgid ""
"Podcasts and more."
msgstr ""
"Les fonts de música i vídeo es mostren a l'esquerra del Banshee. Les fonts "
-"us donen accés ràpid a la cua de reproducció, música, vídeos, Amazon, Last.fm, "
-"Poscasts i d'altres."
+"us donen accés ràpid a la cua de reproducció, música, vídeos, Amazon, Last."
+"fm, Poscasts i d'altres."
#: C/ui.page:42(p)
msgid ""
@@ -92,9 +95,9 @@ msgid ""
"when viewing the video or music library."
msgstr ""
"Les opcions de menú canvien depenent de la font que heu triat. Per exemple, "
-"per a usar el menú per a importar un Podcast, haureu d'escollir la font Podcast. "
-"L'opció del menú per a importar un Podcast no està disponible quan es "
-"visualitza la biblioteca de vídeo o música."
+"per a usar el menú per a importar un Podcast, haureu d'escollir la font "
+"Podcast. L'opció del menú per a importar un Podcast no està disponible quan "
+"es visualitza la biblioteca de vídeo o música."
#: C/ui.page:50(title)
msgid "Library Browser"
@@ -108,9 +111,10 @@ msgid ""
"even the Amazon Music Store to allow you to buy music."
msgstr ""
"Quan escolliu una font de música o vídeo des de «Fonts», el Banshee mostrarà "
-"el contingut al navegador de la biblioteca. Depenent de la font que escolliu, "
-"el Banshee pot reproduir la música, la biblioteca de vídeos, les subscripcions Podcast, o "
-"inclús, mostrar la botiga de música d'Amazon perquè pugueu comprar música."
+"el contingut al navegador de la biblioteca. Depenent de la font que "
+"escolliu, el Banshee pot reproduir la música, la biblioteca de vídeos, les "
+"subscripcions Podcast, o inclús, mostrar la botiga de música d'Amazon perquè "
+"pugueu comprar música."
#: C/ui.page:58(title)
msgid "Now Playing View"
@@ -124,6 +128,10 @@ msgid ""
"album and cover art if available. If you are watching a video, Banshee will "
"display the video."
msgstr ""
+"Quan utilitzeu el Banshee en mode de pantalla completa, el mode «Reproducció ara» amaga "
+"la biblioteca per tal d'obtenir més espai per a visualitzar la música o el vídeo que esteu reproduint. "
+"Quan escolteu música, el mode «Reproducció ara» us mostrarà el nom de l'artista, l'àlbum i "
+"la coberta si estan disponibles. Si esteu reproduint un vídeo, el Banshee us mostrarà el vídeo."
#: C/ui.page:65(p)
msgid ""
@@ -132,10 +140,11 @@ msgid ""
"button in the upper right hand corner of Banshee, or choose <guiseq>View<gui/"
">Fullscreen<gui/></guiseq> to start Fullscreen mode."
msgstr ""
-"Per a què la Reproducció ara amagui l'interfície d'usuari del Banshee i utilitzi "
-"el mode a pantalla completa, podeu prémer <key>F</key>, el botó <gui>Pantalla completa</gui>"
-"a la part superior dreta del Banshee, o seleccionar <guiseq><gui>Pantalla completa<gui/></guiseq> "
-"per a iniciar el mode pantalla completa."
+"Per a què la Reproducció ara amagui l'interfície d'usuari del Banshee i "
+"utilitzi el mode a pantalla completa, podeu prémer <key>F</key>, el botó "
+"<gui>Pantalla completa</gui>a la part superior dreta del Banshee, o "
+"seleccionar <guiseq><gui>Pantalla completa<gui/></guiseq> per a iniciar el "
+"mode pantalla completa."
#: C/ui.page:74(title)
msgid "Library"
@@ -151,10 +160,10 @@ msgid ""
"on managing a source."
msgstr ""
"La vista biblioteca al Banshee canvia depenent de la font que heu escollit. "
-"La biblioteca mostrarà les cobertes, artistes i llistes de cançons. La biblioteca "
-"Podcast mostrarà les subscripcions a Podcasts, que estan baixats o sense acabar de baixar "
-"o bé Podcasts antics. Vegeu la pàgina d'ajuda per a cada font per a obtenir informació "
-"detallada de com gestionar cada font."
+"La biblioteca mostrarà les cobertes, artistes i llistes de cançons. La "
+"biblioteca Podcast mostrarà les subscripcions a Podcasts, que estan baixats "
+"o sense acabar de baixar o bé Podcasts antics. Vegeu la pàgina d'ajuda per a "
+"cada font per a obtenir informació detallada de com gestionar cada font."
#: C/sync.page:9(desc)
msgid "Sync your media to a portable media player or smartphone."
@@ -175,6 +184,11 @@ msgid ""
"lossy format such as Ogg Vorbis or MP3, if you have the correct codecs "
"installed."
msgstr ""
+"El Banshee permet la sincronització de música amb reproductors multimèdia portàtils i telèfons intel·ligents. "
+"Podeu afegir-hi cançons, àlbums, llistes de producció o permetre que el Banshee mantingui sincronitzada la biblioteca sencera. "
+"Després de que el reproductor es connecta a l'ordinador, podeu també reproduir cançons "
+"del vostre reproductor al Banshee. Quan sincronitzeu la música amb un format sense pèrdua, com ara el FLAC, el Banshee "
+"convertirà automàticament la música a un format amb pèrdua com l'Ogg Vorbis o l'MP3, si disposeu els còdecs necessaris insta·lats."
#: C/sync.page:37(title)
msgid "Device Support"
@@ -184,17 +198,20 @@ msgstr "Compatibilitat amb dispositius"
msgid ""
"Banshee supports almost all modern portable music players and smartphones "
"with the notable exception of the Apple iPhone, iPad and iPod Touch."
-msgstr "El Banshee es compatible amb la majoria de reproductors de música moderns "
-"i telèfons intel·ligents amb les excepcions de l'iPhone, l'iPad i l'iPod Touch d'Apple."
+msgstr ""
+"El Banshee es compatible amb la majoria de reproductors de música portables "
+"moderns i telèfons intel·ligents amb les excepcions de l'iPhone, l'iPad i "
+"l'iPod Touch d'Apple."
#: C/sync.page:42(p)
msgid ""
"When you plug your device in, Banshee will display it in the left menu. "
"Pressing the device icon will take you to your device home page in Banshee "
"displaying your sync preferences."
-msgstr "Quan connecteu un dispositiu, el Banshee el mostrarà al menú esquerre. "
-"Al pressionar la icona del dispositiu anireu a la pàgina inicial del dispositiu "
-"mostrant les preferències de sincronització."
+msgstr ""
+"Quan connecteu un dispositiu, el Banshee el mostrarà al menú esquerre. Al "
+"pressionar la icona del dispositiu anireu a la pàgina inicial del dispositiu "
+"mostrant-se les preferències de sincronització."
#: C/sync.page:50(title)
msgid "Sync Your Music"
@@ -205,8 +222,9 @@ msgid ""
"You can choose to manage the media on your portable music by having Banshee "
"automatically sync it or manage your music and media manually."
msgstr ""
-"Podeu escollir gestionar els elements multimèdia al dispositiu portable permetent "
-"al Banshee sincronitzar-se automàticament o gestionant la música i elements multimèdia manualment."
+"Podeu escollir gestionar els elements multimèdia al dispositiu portable "
+"permetent al Banshee sincronitzar-se automàticament o gestionant la música i "
+"elements multimèdia manualment."
#: C/sync.page:56(p)
msgid ""
@@ -234,7 +252,8 @@ msgstr "Podcast"
#: C/sync.page:66(p)
msgid "From the dropdown menu next to each of the media, choose from:"
-msgstr "Des del menú desplegable al costat de cada element multimèdia, escolliu:"
+msgstr ""
+"Des del menú desplegable al costat de cada element multimèdia, escolliu:"
#: C/sync.page:69(p)
msgid "Manage manually"
@@ -251,6 +270,10 @@ msgid ""
"If your library is larger than the space on your portable media player, "
"Banshee will sync media until your player is full and then stop."
msgstr ""
+"Si escolliu sincronitzar la biblioteca sencera automàticament amb el "
+"reproductor multimèdia portàtil assegureu-vos de que el reproductor multimèdia té prou espai. "
+"Si la biblioteca és més gran que l'espai del que disposeu al reproductor multimèdia portàtil, "
+"el Banshee sincronitzarà els elements multimèdia fins que el reproductor estigui pel i llavors s'aturarà."
#: C/sync.page:82(p)
msgid ""
@@ -303,7 +326,7 @@ msgstr ""
#: C/sync.page:127(title)
msgid "Play Music From Your Portable Music Player"
-msgstr "Reproducció de la música des del reproductor portable"
+msgstr "Reproducció de la música des del reproductor de música portable"
#: C/sync.page:128(p)
msgid ""
@@ -312,9 +335,10 @@ msgid ""
"player's library will be displayed. You can then play music in Banshee just "
"as you would music in your own library."
msgstr ""
+
#: C/sync.page:135(title)
msgid "Remove Music From your Portable Music Player"
-msgstr "Suprimeix la música des del reproductor portable"
+msgstr "Suprimeix la música des del reproductor de música portable"
#: C/sync.page:136(p)
msgid ""
@@ -361,13 +385,14 @@ msgid ""
"display all available column to choose from. Click the checkbox next to the "
"name of the column you wish to add to the library view."
msgstr ""
-"Podeu afegir columnes addicionals a la vista biblioteca del <app>Banshee</app> per "
-"disposar de més informació sobre les cançons, a més de poder-les ordenar. "
-"Per defecte, per a cançons, el Banshee mostra les columnes <gui>Nom</gui>, "
-"<gui>Artista</gui>, <gui>Àlbum</gui> i <gui>Temps</gui>. Per a afegir columnes "
-"addicionals, feu un clic amb el botó dret del ratolí a qualsevol de les columnes i el "
-"Banshee mostrarà totes les columnes disponibles. Feu clic a la casella de selecció "
-"al costat del nom de la columna que desitgeu afegir a la vista biblioteca."
+"Podeu afegir columnes addicionals a la vista biblioteca del <app>Banshee</"
+"app> per disposar de més informació sobre les cançons, a més de poder-les "
+"ordenar. Per defecte, per a cançons, el Banshee mostra les columnes "
+"<gui>Nom</gui>, <gui>Artista</gui>, <gui>Àlbum</gui> i <gui>Temps</gui>. Per "
+"a afegir columnes addicionals, feu un clic amb el botó dret del ratolí a "
+"qualsevol de les columnes i el Banshee mostrarà totes les columnes "
+"disponibles. Feu clic a la casella de selecció al costat del nom de la "
+"columna que desitgeu afegir a la vista biblioteca."
#: C/sort.page:46(title)
msgid "Sorting Columns"
@@ -377,15 +402,16 @@ msgstr "Ordenació de columnes"
msgid ""
"You can sort your library by using your mouse to click on any of the columns "
"displayed in library view. If you wish to sort your music library by Artist, "
-"click the <gui>Artist</gui> column header and Banshee will automically sort "
-"that column alphabetically. Clicking the <gui>Artist</gui> column again will "
-"sort the column in reverse alphabetical order."
+"click the <gui>Artist</gui> column header and Banshee will automatically "
+"sort that column alphabetically. Clicking the <gui>Artist</gui> column again "
+"will sort the column in reverse alphabetical order."
msgstr ""
-"Podeu ordenar la biblioteca utilitzant el ratolí fent clic a qualsevol de les "
-"columnes mostrades en la vista biblioteca. Si voleu ordenar la biblioteca per "
-"artista, feu clic a la capçalera de la columna <gui>Artista</gui> i el Banshee "
-"ordenarà automàticament la columna alfabèticament. Fent clic a la columna "
-"<gui>Artista</gui> de nou ordenarà la columna en ordre alfabètic invers."
+"Podeu ordenar la biblioteca utilitzant el ratolí fent clic a qualsevol de "
+"les columnes mostrades en la vista biblioteca. Si voleu ordenar la "
+"biblioteca per artista, feu clic a la capçalera de la columna <gui>Artista</"
+"gui> i el Banshee ordenarà automàticament la columna alfabèticament. Fent "
+"clic a la columna <gui>Artista</gui> de nou ordenarà la columna en ordre "
+"alfabètic invers."
#: C/search.page:9(desc)
msgid "Search your media and perfom basic queries."
@@ -401,9 +427,10 @@ msgid ""
"quickly and easily with basic search terms or perform detailed searches with "
"Banshee's advanced search terminology."
msgstr ""
-"El Banshee disposa d'un llenguatge de cerca potent. Podeu cercar la biblioteca "
-"de forma ràpida i senzilla utilitzant termes de cerca bàsics o bé realitzant "
-"cerques detallades amb la terminologia de cerca avançada del Banshee."
+"El Banshee disposa d'un llenguatge de cerca potent. Podeu cercar a la "
+"biblioteca de forma ràpida i senzilla utilitzant termes de cerca bàsics o bé "
+"realitzant cerques detallades amb la terminologia de cerca avançada del "
+"Banshee."
#: C/search.page:30(p)
msgid ""
@@ -411,8 +438,9 @@ msgid ""
"click the <gui>Search</gui> box in the upper right hand corner of the "
"Library view in Banshee."
msgstr ""
-"Per a realitzar cerques dels vostres elements multimèdia al Banshee, premeu la tecla <key>S</key> "
-"o feu clic en la capsa <gui>Cerca</gui> a la part superior dreta de la vista biblioteca al Banshee."
+"Per a realitzar cerques dels vostres elements multimèdia al Banshee, premeu "
+"la tecla <key>S</key> o feu clic en la capsa <gui>Cerca</gui> a la part "
+"superior dreta de la vista biblioteca al Banshee."
# English typo "meaningyou" -> "meaning you"
#: C/search.page:35(p)
@@ -421,19 +449,20 @@ msgid ""
"em>. By entering <em>dave matthews</em> in the search box, Banshee will "
"search all metatdata fields including Track Title, Album Title, Album "
"Artist, Year, etc. Any track whose metadata includes <em>dave</em> and "
-"<em>matthews</em> will be returned. Search terms are case, meaningyou don't "
+"<em>matthews</em> will be returned. Search terms are case, meaning you don't "
"have to capitalize. <em>dave</em>, <em>Dave</em>, and <em>DAVE</em> all mean "
"the same thing when searching."
msgstr ""
-"Una consulta de cerca consisteix d'algunes termes bàsics, per exemple, <em>lluís llach</"
-"em>. En introduir <em>lluís llach</em> en la capsa de cerca, el Banshee cercarà "
-"a tots els camps de metadades, incloent-hi el títol de la cançó, el títol de l'àlbum, l'artista, "
-"l'any, etc. Qualsevol cançó que inclogui en les seves metadades <em>lluís</em> i "
-"<em>llach</em> serà retornada. La cerca de termes no diferència entre majúscules i minúscules. "
-"Els termes <em>lluís</em>, <em>Lluís</em>, i <em>LLUÍS</em> tenen el mateix "
-"significat al fer una cerca."
+"Una consulta de cerca consisteix d'algunes termes bàsics, per exemple, "
+"<em>lluís llach</em>. En introduir <em>lluís llach</em> en la capsa de "
+"cerca, el Banshee cercarà a tots els camps de metadades, incloent-hi el "
+"títol de la cançó, el títol de l'àlbum, l'artista, l'any, etc. Qualsevol "
+"cançó que inclogui en les seves metadades <em>lluís</em> i <em>llach</em> "
+"serà retornada. La cerca de termes no diferència entre majúscules i "
+"minúscules. Els termes <em>lluís</em>, <em>Lluís</em>, i <em>LLUÍS</em> "
+"tenen el mateix significat al fer una cerca."
-#: C/search.page:43(titl
+#: C/search.page:43(title)
msgid "Basic Operators"
msgstr "Operadors bàsics"
@@ -445,9 +474,9 @@ msgid ""
"default, there is no explicit AND operator."
msgstr ""
"Els operadors poden col·locar-se entre dues paraules de cerca o col·locar-se "
-"abans d'una paraula de cerca. L'operació per defecte és <gui>i</gui> i s'utilitza "
-"quan cap altre operador es emprat entre dos termes de cerca. Atès que és el predeterminat, "
-"no existeix l'operador I explícitament."
+"abans d'una paraula de cerca. L'operació per defecte és <gui>AND</gui> i "
+"s'utilitza quan cap altre operador es emprat entre dos termes de cerca. Atès "
+"que és el predeterminat, l'operador AND no existeix explícitament."
#: C/search.page:49(p)
msgid ""
@@ -455,9 +484,9 @@ msgid ""
"these three operations can yield very powerful queries to help you search "
"your media."
msgstr ""
-"Altres operadors bàsics inclouen l'<gui>OR</gui> i el <gui>NOT</gui>. Junts, "
-"aquests tres operadors permeten consultes molt potents per ajudar-vos a cercar "
-"als elements multimèdia."
+"Altres operadors bàsics són l'<gui>OR</gui> i el <gui>NOT</gui>. Junts, "
+"aquests tres operadors permeten consultes molt potents per ajudar-vos a "
+"cercar als elements multimèdia."
#: C/search.page:56(title)
msgid "Logical Operators and Examples"
@@ -468,8 +497,8 @@ msgid ""
"The following is a list of logical operators and examples of the search "
"results when searching using them."
msgstr ""
-"A continuació es mostra una llista d'operadors lògics i exemples de resultats de "
-"cerques realitzes amb operadors lògics."
+"A continuació es mostra una llista d'operadors lògics i exemples de "
+"resultats de cerques realitzes amb operadors lògics."
#: C/search.page:62(gui)
msgid "Operator"
@@ -493,7 +522,9 @@ msgstr "O, o, <key>|</key>, <key>,</key>"
#: C/search.page:69(p)
msgid "Search results will be two terms with either result in any field."
-msgstr "Els resultats de la cerca seran les cançons que continguin els dos termes en qualsevol camp."
+msgstr ""
+"Els resultats de la cerca seran les cançons que continguin els dos termes en "
+"qualsevol camp."
#: C/search.page:73(p)
msgid "NOT, not,<key>-</key>"
@@ -501,11 +532,11 @@ msgstr "NO, no,<key>-</key>"
#: C/search.page:73(p)
msgid ""
-"Do not display search results with any search team that follows the operator "
+"Do not display search results with any search term that follows the operator "
"of NOT, not,<key>-</key>."
msgstr ""
-"Exclou dels resultats de la cerca qualsevol terme que aparegui després de l'operador "
-"NO, no, <key>-</key>."
+"Exclou dels resultats de la cerca qualsevol terme que aparegui després de "
+"l'operador NO, no, <key>-</key>."
#: C/search.page:80(p)
msgid "Examples of logical operations include:"
@@ -524,8 +555,8 @@ msgid ""
"Matches any fields in a track containing both <em>dave</em> and "
"<em>matthews</em>."
msgstr ""
-"Retorna com a resultat de la cerca qualsevol cançó que contingui <em>lluís</em>"
-"i <em>llach</em> (ambdós) en qualsevol dels camps."
+"Retorna com a resultat de la cerca qualsevol cançó que contingui <em>lluís</"
+"em> i <em>llach</em> (ambdós) en qualsevol dels camps."
#: C/search.page:92(p)
msgid "dave, matthews"
@@ -536,8 +567,8 @@ msgid ""
"Matches any fields in a track containing both <em>dave</em> or <em>matthews</"
"em>."
msgstr ""
-"Retorna com a resultat de la cerca qualsevol cançó que contingui <em>lluís</em> "
-"o <em>llach</em> en qualsevol dels camps."
+"Retorna com a resultat de la cerca qualsevol cançó que contingui <em>lluís</"
+"em> o <em>llach</em> en qualsevol dels camps."
#: C/search.page:97(p)
msgid "dave or matthews"
@@ -554,8 +585,7 @@ msgstr "-\"lluís llach\""
#: C/search.page:107(p)
msgid ""
"Displays all tracks whose fields do not containt <em>dave matthews</em>."
-msgstr ""
-"Mostra totes les cançons que no continguin <em>lluís llach</em>."
+msgstr "Mostra totes les cançons que no continguin <em>lluís llach</em>."
#: C/search.page:114(p)
msgid ""
@@ -569,7 +599,8 @@ msgstr ""
msgid ""
"Import music and categorizations from the <app>Rhythmbox</app> music player."
msgstr ""
-"Importeu la música i les categoritzacions del reproductor de música <app>Rhythmbox</app>."
+"Importeu la música i les categoritzacions del reproductor de música "
+"<app>Rhythmbox</app>."
#: C/rb-import.page:12(title)
msgid "Import your <app>Rhythmbox</app> library"
@@ -593,31 +624,29 @@ msgid ""
"show you all artists in your music library, cover art for each album, and a "
"list of all songs in your library."
msgstr ""
-"Per a reproduir música al Banshee escolliu la font de la música. La biblioteca de música "
-"mostrarà tots els artistes de la biblioteca, cobertes per cada àlbum i la llista "
-"de les cançons que hi ha a la biblioteca."
+"Per a reproduir música al Banshee escolliu la font de la música. La "
+"biblioteca de música mostrarà tots els artistes de la biblioteca, cobertes "
+"per cada àlbum i la llista de les cançons que hi ha a la biblioteca."
#: C/play.page:33(p)
msgid ""
"Choose the album or song you wish to play from the list of artists, albums "
"or use the search bar in the upper right hand corner of Banshee."
msgstr ""
-"Escolliu l'àlbum o cançó que desitgeu reproduir de la llista d'artistes, àlbums "
-"o utilitzeu la barra de cerca de la part superior dreta del Banshee."
+"Escolliu l'àlbum o cançó que desitgeu reproduir de la llista d'artistes, "
+"àlbums o utilitzeu la barra de cerca de la part superior dreta del Banshee."
-# TODO: Veure els noms de les opcions en el Banshee en català
#: C/play.page:37(p)
msgid ""
"To start playing a song, use your mouse to double click the song name, press "
"the <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui><gui>Play</"
"gui></guiseq> from the Banshee menu."
msgstr ""
-"Per començar a reproduir una cançó, utilitzeu el ratolí fent doble clic al nom de la cançó, "
-"premeu la tecla <key>barra espaiadora</key>, o escolliu <guiseq><gui>Playback</gui><gui>Play</"
-"gui></guiseq> from the Banshee menu."
-
+"Per començar a reproduir una cançó, utilitzeu el ratolí fent doble clic al "
+"nom de la cançó, premeu la tecla <key>barra espaiadora</key>, o escolliu "
+"<guiseq><gui>Reprodueix</gui><gui>Reprodueix</gui></guiseq> des del menú del "
+"Banshee."
-# TODO: Veure els noms de les opcions en el Banshee en català
#: C/play.page:42(p)
msgid ""
"You can also start playing an album by choosing the album in the album "
@@ -625,10 +654,10 @@ msgid ""
"<key>Spacebar</key>, or choose <guiseq><gui>Playback</gui><gui>Play</gui></"
"guiseq> from the Banshee menu."
msgstr ""
-"Podeu començar a reproduir un àlbum escollint-lo al navegador d'àlbums "
-"i fent clic amb el ratolí al nom de la cançó, prement la tecla "
-"<key>barra espaiadora</key>, o seleccionant <guiseq><gui>Playback</gui><gui>Play</gui> "
-"guiseq> des del menú del Banshee."
+"Podeu començar a reproduir un àlbum escollint-lo al navegador d'àlbums i "
+"fent clic amb el ratolí al nom de la cançó, prement la tecla <key>barra "
+"espaiadora</key>, o seleccionant <guiseq><gui>Reprodueix</"
+"gui><gui>Reprodueix</gui> </guiseq> des del menú del Banshee."
#: C/play.page:48(p)
msgid ""
@@ -636,6 +665,9 @@ msgid ""
"press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</"
"gui><gui>Play</gui></guiseq> from the Banshee menu."
msgstr ""
+"Per a reproduir totes les cançons d'un artista, escolliu l'artista al "
+"navegador d'artistes i premeu la <key>barra espaiadora</key>, o escolliu "
+"<guiseq><gui>Reprodueix</gui><gui>Reprodueix</gui> des del menú del Banshee."
#: C/play.page:53(p)
msgid ""
@@ -643,10 +675,13 @@ msgid ""
"Favorites, Recently Added and Unheard music. Choose the one you wish to "
"listen to and you can play songs from each."
msgstr ""
+"El Banshee també mostra els àlbums favorits (els que més reproduïu), els "
+"últims elements favorits, o els àlbums recentment afegits o sense escoltar. "
+"Escolliu l'àlbum que voleu escoltar i seleccioneu les cançons a reproduir."
#: C/play.page:61(title)
msgid "Play a video"
-msgstr "Reproducció d'un vídeo"
+msgstr "Reproducció de vídeo"
#: C/play.page:63(p)
msgid ""
@@ -655,12 +690,18 @@ msgid ""
"choose <guiseq><gui>Playback</gui><gui>Play</gui></guiseq> from the Banshee "
"menu."
msgstr ""
+"Els vídeos importats es mostren alfabèticament. Per a reproduir un vídeo, "
+"escolliu de la llista el vídeo que voleu reproduir i premeu la <key>barra "
+"espaiadora</key>, o escolliu <guiseq><gui>Reprodueix</gui><gui>Reprodueix</"
+"gui></guiseq> des del menú del Banshee."
#: C/play.page:68(p)
msgid ""
"Banshee also shows your Favorite videos (those you watch the most) and "
"Unwatched videos. Choose one and you can play a video from the list."
msgstr ""
+"El Banshee també mostra els vídeos favorits (els que més reproduïu) i els "
+"vídeos no reproduïts. Escolliu el vídeo que voleu reproduir de la llista."
#: C/play.page:74(title)
msgid "Play a Podcast"
@@ -672,6 +713,9 @@ msgid ""
"available, and the Podcast browser lists all Podcasts in order of newest "
"first."
msgstr ""
+"Podcasts mostra tots els Podcasts als que esteu subscrits, tots els Podcasts "
+"disponibles. El navegador de Podcast mostra tots els Podcast ordenats pels "
+"més recents."
#: C/play.page:80(p)
msgid ""
@@ -679,16 +723,21 @@ msgid ""
"press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</"
"gui><gui>Play</gui></guiseq> from the Banshee menu."
msgstr ""
+"Per a reproduir un Podcast, escolliu de la llista el que voleu reproduir i "
+"premeu la <key>barra espaiadora</key>, o escolliu <guiseq><gui>Reprodueix</"
+"gui><gui>Reprodueix</gui></guiseq> des del menú del Banshee."
#: C/play.page:88(title)
msgid "Play an internet radio station"
-msgstr ""
+msgstr "Escolteu una emissora de ràdio Internet"
#: C/play.page:90(p)
msgid ""
"The Radio source shows you all internet radio stations you have added to "
"Banshee alphabetically."
msgstr ""
+"La fonts de ràdio mostra ordenades alfabèticament totes les emissores "
+"Internet que heu afegit al Banshee."
#: C/play.page:94(p)
msgid ""
@@ -696,14 +745,18 @@ msgid ""
"from the list and press the <key>Spacebar</key>, or choose "
"<guiseq><gui>Playback</gui><gui>Play</gui></guiseq> from the Banshee menu."
msgstr ""
+"Per a reproduir una emissora de ràdio, escolliu de la llista l'emissora que "
+"voleu escoltar i premeu la <key>barra espaiadora</key>, o escolliu "
+"<guiseq><gui>Reprodueix</gui><gui>Reprodueix</gui></guiseq> des del menú del "
+"Banshee."
#: C/play-queue.page:9(desc)
msgid "Add media to your play queue."
-msgstr ""
+msgstr "Afegiu elements multimèdia a la cua de reproducció."
#: C/play-queue.page:18(title)
msgid "Play Queue"
-msgstr ""
+msgstr "Cua de reproducció"
#: C/play-queue.page:20(p)
msgid ""
@@ -711,16 +764,22 @@ msgid ""
"order. You can add many tracks to let you listen to hours of music non-stop. "
"You can add individual tracks or entire albums, and sort or re-order them."
msgstr ""
+"La <gui>cua de reproducció</gui> us permet afegir música per reproduir en "
+"ordre seqüencial. Podeu afegir moltes cançons, el que us permetrà escoltar "
+"hores de música sense parar. Podeu afegir cançons individuals o àlbums "
+"sencers, i ordenar-los després."
#: C/play-queue.page:26(title)
msgid "Add Music to the Play Queue"
-msgstr ""
+msgstr "Afegiu música a la cua de reproducció"
#: C/play-queue.page:28(p)
msgid ""
"From your music library, you will need to select the music tracks or albums "
"you want to add to the play queue."
msgstr ""
+"Des de la biblioteca de música, heu d'escollir les cançons o àlbums que "
+"voleu afegir a la llista de reproducció."
#: C/play-queue.page:32(p)
msgid ""
@@ -728,6 +787,9 @@ msgid ""
"the album and drag the album over <gui>Play Queue</gui> in the far left "
"window pane."
msgstr ""
+"Per afegir un àlbum sencer a la llista de reproducció, utilitzeu el ratolí "
+"prement sobre l'àlbum i deixeu-lo anar sobre <gui>la cua de reproducció</"
+"gui> a la subfinestra de l'esquerra."
#: C/play-queue.page:37(p)
msgid ""
@@ -736,6 +798,10 @@ msgid ""
"the far left window pane, or right click the track and choose <gui>Add to "
"Play Queue</gui>."
msgstr ""
+"Podeu afegir cançons a la cua de reproducció individualment o en grup. Per a "
+"afegir un únic fitxer, arrossegueu i deixeu anar el fitxer sobre <gui>la cua "
+"de reproducció</gui> en la subfinestra de l'esquerra, o feu clic a la pista "
+"i escolliu <gui>Afegeix a la cua de reproducció</gui>."
#: C/play-queue.page:43(p)
msgid ""
@@ -745,10 +811,16 @@ msgid ""
"drag and drop it over the <gui>Play Queue</gui> in the far left window pane "
"or right click the tracks and choose <gui>Add to Play Queue</gui>."
msgstr ""
+"Podeu escollir múltiples fitxer usant el ratolí i prement <key>Control</key> "
+"i escollint cada fitxer amb el ratolí o seleccionat un rang de fitxers "
+"prement la <key>tecla de majúscules</key> dos cops per seleccionar un rang "
+"de fitxers. Llavors podeu arrossegar i deixar anar sobre la <gui>qua de "
+"reproducció</gui> a la subfinestra de l'esquerra o fent clic amb el botó "
+"dret i escollint <gui>Afegeix a la cua de reproducció</gui>."
#: C/play-queue.page:56(title)
msgid "Organize Your Play Queue"
-msgstr ""
+msgstr "Organitzeu la cua de reproducció"
#: C/play-queue.page:58(p)
msgid ""
@@ -759,40 +831,52 @@ msgid ""
"order with your mouse and release your mouse over the number or place in the "
"list you wish those files to be in the queue."
msgstr ""
+"La cua de reproducció s'organitza per l'ordre que s'afegeixen les cançons. "
+"Les primeres cançons o àlbums que afegiu a la cua seran els primers en ser "
+"reproduïts. Podeu tornar a ordenar la vostra cua de reproducció utilitzant "
+"el ratolí per arrossegar i deixar anar una cançó o cançons a la llista. "
+"Escolliu la cançó o cançons que voleu tornar a ordenar, i deixeu-les anar "
+"sobre el número o lloc que voleu que les cançons tinguin a la cua."
#: C/play-queue.page:70(title)
msgid "Removing Tracks from the Play Queue"
-msgstr ""
+msgstr "Suprimiu cançons de de la llista de reproducció"
#: C/play-queue.page:72(p)
msgid ""
"You can remove an individual track, a group of tracks, or clear your entire "
"play queue."
msgstr ""
+"Podeu suprimir una cançó individual, un grup de cançons, o buidar la cua de "
+"reproducció completament."
#: C/play-queue.page:76(p)
msgid ""
"To remove an individual track or group of tracks, select the track with your "
"mouse and then press <key>Delete</key>."
msgstr ""
+"Per a suprimir una cançó o un grup de cançons, escolliu la cançó amb el "
+"ratolí i llavors premeu la <key>tecla de supressió</key>."
#: C/play-queue.page:80(p)
msgid ""
"To clear your entire Play Queue, press the <gui>Clear</gui> button in the "
"upper right hand corner of the Play Queue."
msgstr ""
+"Per buidar completament la cua de reproducció, premeu el botó <gui>Buida</"
+"gui> a la part superior dreta de la cua de reproducció."
#: C/manage-tags.page:10(desc)
msgid "Edit and change music tags and metadata."
-msgstr ""
+msgstr "Edició i modificació de les etiquetes i metadades de la música"
#: C/manage-tags.page:25(title)
msgid "Music Metadata"
-msgstr ""
+msgstr "Metadades de la música"
#: C/manage-tags.page:29(title)
msgid "Music metadata"
-msgstr ""
+msgstr "Metadades de la música"
#: C/manage-tags.page:31(p)
msgid ""
@@ -818,7 +902,7 @@ msgstr ""
#: C/manage-tags.page:50(title)
msgid "Edit Your Metadata"
-msgstr ""
+msgstr "Edició de les metadades"
#: C/manage-tags.page:52(p)
msgid ""
@@ -837,31 +921,31 @@ msgstr ""
#: C/manage-tags.page:63(gui)
msgid "Track Title:"
-msgstr ""
+msgstr "Títol de la cançó:"
#: C/manage-tags.page:64(gui)
msgid "Track Artist"
-msgstr ""
+msgstr "Artista de la cançó"
#: C/manage-tags.page:65(gui)
msgid "Album Title"
-msgstr ""
+msgstr "Títol de l'àlbum"
#: C/manage-tags.page:66(gui)
msgid "Genre"
-msgstr ""
+msgstr "Gènere"
#: C/manage-tags.page:67(gui)
msgid "Track Number"
-msgstr ""
+msgstr "Número de la cançó"
#: C/manage-tags.page:68(gui)
msgid "Disc Number"
-msgstr ""
+msgstr "Número del disc"
#: C/manage-tags.page:69(gui) C/manage-playlists.page:109(gui)
msgid "Year"
-msgstr ""
+msgstr "Any"
#: C/manage-tags.page:72(p)
msgid ""
@@ -871,14 +955,19 @@ msgid ""
"finished with each song. When you have completed editing all metadata, press "
"<gui>Save</gui>."
msgstr ""
+"Actualitzeu la informació de la cançó. Si heu escollit múltiples cançons per "
+"a editar premeu la icona de la fletxa dreta a la dreta del camp <gui>Títol "
+"de la cançó</gui> o premeu el botó <gui>Endavant</gui> a la part superior de "
+"la capsa de diàleg quan hageu finalitzat amb cada cançó. Un cop hageu "
+"completat l'edició de totes les metadades, premeu <gui>Desa</gui>."
#: C/manage-playlists.page:10(desc)
msgid "Create and manage playlists."
-msgstr ""
+msgstr "Creació i gestió de llistes de reproducció"
#: C/manage-playlists.page:19(title)
msgid "Playlists"
-msgstr ""
+msgstr "Llistes de reproducció"
#: C/manage-playlists.page:21(p)
msgid ""
@@ -888,6 +977,12 @@ msgid ""
"browse through. Some portable media players even allow you to transfer the "
"playlist so you can take it with you on the go."
msgstr ""
+"Les llistes de reproducció us permeten crear i desar llistes de cançons per "
+"ser reproduïdes en un ordre específic. Les llistes de reproducció són una "
+"manera còmode de crear llistes amb les vostres cançons preferides o per "
+"dividir la biblioteca en llistes més petites més fàcils de navegar. Alguns "
+"reproductors portables multimèdia permeten transferir llistes de reproducció "
+"perquè les pugueu utilitzar en aquests dispositius."
#: C/manage-playlists.page:28(p)
msgid ""
@@ -895,10 +990,13 @@ msgid ""
"playlist, as well as smart playlists. Smart Playlists are automatically "
"generated playlists based on your listening habits, favorite music, or more."
msgstr ""
+"El Banshee disposa de llistes de reproducció normals, que inclouen les "
+"cançons que afegiu. També disposa de llistes de reproducció intel·ligents, "
+"que es basen en els hàbits de reproducció, música preferida i d'altres."
#: C/manage-playlists.page:34(title)
msgid "Normal Playlists"
-msgstr ""
+msgstr "Llistes de reproducció normals"
#: C/manage-playlists.page:36(p)
msgid ""
@@ -907,6 +1005,10 @@ msgid ""
"albums, your latest favorite songs, or an upbeat playlist to listen to while "
"you exercise."
msgstr ""
+"Una llista de reproducció normal és una llista de cançons a la que afegiu "
+"cançons i que gestioneu manualment. Podeu crear llistes de cançons del "
+"vostre artista preferit des de múltiples àlbums, per les cançons més noves "
+"que preferiu, o per escoltar mentre feu exercici."
#: C/manage-playlists.page:42(p)
msgid ""
@@ -915,7 +1017,7 @@ msgid ""
"Playlist</gui></guiseq> or by selecing the track(s) you would like to add to "
"the playlist. Select the track(s), right click them, and choose "
"<guiseq><gui>Add to Playlist</gui><gui>New Playlist</gui></guiseq>. You can "
-"also drag and drop them to a new playlist by selcting the track(s) and "
+"also drag and drop them to a new playlist by selecting the track(s) and "
"dragging them to the left hand window pane over <gui>Music</gui>. As you "
"drag it over <gui>Music</gui>, a new option <gui><em>New Playlist</em></gui> "
"will appear and you can drop the track(s) over <gui><em>New Playlist</em></"
@@ -929,6 +1031,9 @@ msgid ""
"the playlist and press <gui>Rename Playlist</gui> and enter the name of your "
"playlist."
msgstr ""
+"Per a anomenar una llista de reproducció, escolliu la llista de reproducció i feu clic "
+"amb el botó dret del ratolí sobre la llista de reproducció i premeu <gui>Canvia el nom</gui> "
+"i introduïu el nom de la llista de reproducció."
#: C/manage-playlists.page:61(p)
msgid ""
@@ -938,6 +1043,12 @@ msgid ""
"column until the up or down arrow is no longer showing and the column is "
"blank and then re-order the playlist."
msgstr ""
+"Podeu canviar l'ordre a una llista de reproducció arrossegant i deixant anar "
+"la cançó a la nova posició a la llista de reproducció. Les cançons només es "
+"poden tornar a ordenar quan la llista de reproducció no està ordenada per "
+"cap columna. Per deixar d'ordenar per una columna, premeu sobre la columna "
+"fins que la fletxa d'amunt o avall no es mostri i la columna quedi en blanc, "
+"llavors torneu a ordenar la llista de reproducció."
#: C/manage-playlists.page:68(p)
msgid ""
@@ -949,7 +1060,7 @@ msgstr ""
#: C/manage-playlists.page:76(title)
msgid "Smart Playlist"
-msgstr ""
+msgstr "Llistes de reproducció intel·ligents"
#: C/manage-playlists.page:78(p)
msgid ""
@@ -957,6 +1068,10 @@ msgid ""
"number of pre-set variables. You can quickly create a new playlist based on "
"a specific artist, favorites or more."
msgstr ""
+"Les llistes de reproducció intel·ligents us permeten generar ràpidament una "
+"llista de reproducció dinàmica basada en un nombre de variables "
+"predeterminat. Podeu crear ràpidament una llista de reproducció nova basant-"
+"vos en un artista específic, en els preferits o d'altres."
#: C/manage-playlists.page:83(p)
msgid ""
@@ -967,31 +1082,36 @@ msgid ""
"from any field included in the song's meatadata, such as Album, Artist or "
"Year. Choose the criteria and then choose from one of the following:"
msgstr ""
+"Per a crear una la llista intel·ligent nova, des del menú escolliu <guiseq>Elements multimèdia<gui>"
+"</gui><gui>Llista de reproducció intel·ligent nova</gui></guiseq>. Es mostrarà una capsa de diàleg "
+"per a crear una llista de reproducció intel·ligent nova. Introduïu el nom de la llista de reproducció "
+"i llavors escolliu el criteri en que es basarà la llista de reproducció. Podeu escollir qualsevol camp "
+"inclòs a les metadades de la cançó, com ara l'àlbum, l'artista, o l'any. Escolliu el criteri i llavors seleccioneu un dels següents:"
#: C/manage-playlists.page:93(p) C/manage-playlists.page:109(gui)
#: C/manage-playlists.page:113(gui)
msgid "is"
-msgstr ""
+msgstr "és"
#: C/manage-playlists.page:94(p)
msgid "is not"
-msgstr ""
+msgstr "no és"
#: C/manage-playlists.page:95(p)
msgid "less than"
-msgstr ""
+msgstr "menys que"
#: C/manage-playlists.page:96(p)
msgid "more than"
-msgstr ""
+msgstr "més que"
#: C/manage-playlists.page:97(p)
msgid "at most"
-msgstr ""
+msgstr "com a màxim"
#: C/manage-playlists.page:98(p)
msgid "at least"
-msgstr ""
+msgstr "com a mínim"
#: C/manage-playlists.page:101(p)
msgid ""
@@ -1000,24 +1120,31 @@ msgid ""
"all songs from 2010 that you rated 5 stars. To create this playlist you "
"would choose:"
msgstr ""
+"Podeu també prémer el botó <gui>+</gui> i afegir una consulta addicional a "
+"la llista de reproducció intel·ligent. Per exemple, podeu crear una llista "
+"de reproducció intel·ligent que inclogui cançons del 2010 i que hageu "
+"valorat amb 5 estrelles. Per a crear aquesta llista de reproducció "
+"seleccionaríeu:"
#: C/manage-playlists.page:110(gui)
msgid "2010"
-msgstr ""
+msgstr "2010"
#: C/manage-playlists.page:113(gui)
msgid "Rating"
-msgstr ""
+msgstr "Valoració"
#: C/manage-playlists.page:114(p)
msgid "<gui/>5 stars"
-msgstr ""
+msgstr "<gui/>5 estrelles"
#: C/manage-playlists.page:118(p)
msgid ""
"You can then optionally select how many songs are included by pressing the "
"<gui>Limit</gui> to checkbox and choosing the number of songs to be included."
msgstr ""
+"Llavors podeu opcionalment seleccionar quantes cançons s'inclouen pressionant "
+"<gui>Limita</gui> a la casella de selecció i seleccionant el nombre de cançons a incloure."
#: C/manage-playlists.page:123(p)
msgid ""
@@ -1030,47 +1157,51 @@ msgstr ""
#: C/manage-playlists.page:131(title)
msgid "Banshee Smart Playlists"
-msgstr ""
+msgstr "Llistes de reproducció intel·ligents del Banshee"
#: C/manage-playlists.page:132(p)
msgid "Favorites (Songs rated four and five stars)"
-msgstr ""
+msgstr "Preferits (cançons amb una valoració de quatre i cinc estrelles)"
#: C/manage-playlists.page:133(p)
msgid "Recent Favorites (Songs listened to often in the past week)"
msgstr ""
+"Preferits recents (cançons que es van escoltar freqüentment la setmana "
+"passada)"
#: C/manage-playlists.page:135(p)
msgid "Recently Added (Songs imported within the last week"
-msgstr ""
+msgstr "Afegits recentment (cançons importes durant l'última setmana)"
#: C/manage-playlists.page:136(p)
msgid "Unheard (Songs that have not been played or skipped)"
-msgstr ""
+msgstr "No escoltats (cançons que no s'han reproduït o s'han omès)"
#: C/manage-playlists.page:137(p)
msgid "Neglected Favorites (Favorites not played in over two months)"
msgstr ""
+"Preferits abandonats (preferits que no s'han reproduït des de fa més de dos "
+"mesos)"
#: C/manage-playlists.page:139(p)
msgid "700 MB of Favorites (A data CD worth of favorite songs)"
-msgstr ""
+msgstr "700 MB de preferits (un CD de dades ple de cançons preferides)"
#: C/manage-playlists.page:140(p)
msgid "80 Minutes of Favorites (An audio CD worth of favorite songs)"
-msgstr ""
+msgstr "80 minuts de preferits (un CD d'àudio ple de cançons preferides)"
#: C/manage-playlists.page:142(p)
msgid "Unrated (Songs that haven't been rated)"
-msgstr ""
+msgstr "Sense valoració (cançons que no han estat valorades)"
#: C/manage-coverart.page:9(desc)
msgid "Manage or change your albums cover art."
-msgstr ""
+msgstr "Gestió i modificació de les cobertes dels àlbums."
#: C/manage-coverart.page:24(title)
msgid "Cover art"
-msgstr ""
+msgstr "Cobertes"
#: C/lastfm.page:9(desc)
msgid "Enable Last.fm, song reporting and Last.fm radio."
@@ -1078,22 +1209,30 @@ msgstr ""
#: C/lastfm.page:24(title)
msgid "Last.fm"
-msgstr ""
+msgstr "Last.fm"
#: C/lastfm.page:26(p)
msgid ""
"Last.fm is a popular online service that offers both free and paid versions. "
"Last.fm offers information on music artists and albums and if you create a "
"user profile Last.fm allows you to track the music you listen to in Banshee "
-"for free. If you suscribe as a paying member, you can also listen to "
+"for free. If you subscribe as a paying member, you can also listen to "
"streaming music from Last.fm in various music clients, including Banshee. "
"Last.fm offers multiple channels to stream, including recommended music for "
"you based on your listening habits, your favorites and more."
msgstr ""
+"Last.fm és un popular servei en línia que ofereix versions gratuïtes i de "
+"pagament. Last.fm ofereix informació d'artistes musicals i àlbums i si creeu "
+"un perfil d'usuari a Last.fm us permet fer un seguiment gratuïtament de la "
+"música que escolteu al Banshee. Si us subscriviu com a membre de pagament, "
+"podeu també escoltar fluxos de música de Last.Fm des de diferents clients, "
+"incloent-hi el Banshee. Last.fm ofereix múltiples canals de fluxos, incloent-"
+"hi recomanacions musicals basades en els vostres hàbits, els favorits i "
+"d'altres."
#: C/lastfm.page:35(title)
msgid "Enable Last.fm"
-msgstr ""
+msgstr "Habilita Last.fm"
#: C/lastfm.page:36(p)
msgid ""
@@ -1119,7 +1258,7 @@ msgstr ""
#: C/lastfm.page:58(title)
msgid "Enable Last.fm Song Reporting"
-msgstr ""
+msgstr "Habilita l'informe de cançons per a Last.Fm"
#: C/lastfm.page:59(p)
msgid ""
@@ -1135,7 +1274,7 @@ msgstr ""
#: C/lastfm.page:72(title)
msgid "Listen to Last.fm Radio"
-msgstr ""
+msgstr "Escoleu l'emissora de ràdio Last.fm"
#: C/lastfm.page:73(p)
msgid ""
@@ -1148,8 +1287,8 @@ msgstr ""
#: C/lastfm.page:80(p)
msgid ""
-"In Banshee's context menu onthe left hand side, you will now have a Last.fm "
-"section, including your Lat.fm radio stations. You will need an active "
+"In Banshee's context menu on the left hand side, you will now have a Last.fm "
+"section, including your Last.fm radio stations. You will need an active "
"internet connection to listen to Last.fm radio. Choose the radio station you "
"wish to listen to and Banshee will communicate with Last.fm to populate "
"songs for that radio station. Press the <gui>Play</gui> button in Banshee or "
@@ -1162,179 +1301,196 @@ msgstr ""
#: C/keyboardshortcuts.page:7(desc) C/advanced.page:27(title)
#: C/advanced.page:29(title)
msgid "Keyboard Shortcuts"
-msgstr ""
+msgstr "Dreceres de teclat"
#: C/keyboardshortcuts.page:24(title)
msgid "Control Banshee using Keyboard Shortcuts"
-msgstr ""
+msgstr "Controleu el Banshee utilitzant dreceres de teclat"
#: C/keyboardshortcuts.page:28(title)
msgid "Playback Control"
-msgstr ""
+msgstr "Control de reproducció"
#: C/keyboardshortcuts.page:32(gui) C/keyboardshortcuts.page:53(gui)
#: C/keyboardshortcuts.page:73(gui) C/keyboardshortcuts.page:90(gui)
#: C/keyboardshortcuts.page:107(gui)
msgid "Key"
-msgstr ""
+msgstr "Tecla"
#: C/keyboardshortcuts.page:32(gui) C/keyboardshortcuts.page:53(gui)
#: C/keyboardshortcuts.page:73(gui) C/keyboardshortcuts.page:90(gui)
#: C/keyboardshortcuts.page:107(gui)
msgid "Action"
-msgstr ""
+msgstr "Acció"
#: C/keyboardshortcuts.page:35(p)
msgid "Space Bar"
-msgstr ""
+msgstr "Barra espaiadora"
#: C/keyboardshortcuts.page:35(p)
msgid "Play or Pause the current song"
-msgstr ""
+msgstr "Reprodueix o posa en pausa la cançó actual"
#: C/keyboardshortcuts.page:38(p) C/keyboardshortcuts.page:76(key)
msgid "N"
-msgstr ""
+msgstr "N"
#: C/keyboardshortcuts.page:38(p)
msgid "Play the next song"
-msgstr ""
+msgstr "Reprodueix la cançó següent"
#: C/keyboardshortcuts.page:41(p)
msgid "B"
-msgstr ""
+msgstr "B"
#: C/keyboardshortcuts.page:41(p)
msgid "Play the previous song"
-msgstr ""
+msgstr "Reprodueix la cançó anterior"
#: C/keyboardshortcuts.page:49(title) C/keyboardshortcuts.page:69(title)
msgid "Library Interaction"
-msgstr ""
+msgstr "Interacció amb la biblioteca"
#: C/keyboardshortcuts.page:56(key) C/keyboardshortcuts.page:76(key)
#: C/keyboardshortcuts.page:114(key) C/keyboardshortcuts.page:118(key)
+#: C/keyboardshortcuts.page:123(key) C/keyboardshortcuts.page:127(key)
#: C/keyboardshortcuts.page:132(key) C/keyboardshortcuts.page:137(key)
msgid "Control"
-msgstr ""
+msgstr "Control"
#: C/keyboardshortcuts.page:56(key) C/keyboardshortcuts.page:110(key)
msgid "F"
-msgstr ""
+msgstr "F"
#: C/keyboardshortcuts.page:56(p)
msgid "Move the focus to the search box"
-msgstr ""
+msgstr "Mou el focus a la capsa de de cerca"
#: C/keyboardshortcuts.page:60(p)
msgid "<key>/</key>, <keyseq><key>Control</key><key>F</key></keyseq>"
-msgstr ""
+msgstr "<key>/</key>, <keyseq><key>Control</key><key>F</key></keyseq>"
#: C/keyboardshortcuts.page:61(p)
msgid "Open import media dialog"
-msgstr ""
+msgstr "Obre la capsa de diàleg d'importació d'elements multimèdia"
#: C/keyboardshortcuts.page:76(p)
msgid "Create New Playlist"
-msgstr ""
+msgstr "Crea una nova llista de reproducció"
#: C/keyboardshortcuts.page:86(title) C/add-podcast.page:26(title)
msgid "Podcasts"
-msgstr ""
+msgstr "Podcasts"
#: C/keyboardshortcuts.page:93(key)
msgid "Y"
-msgstr ""
+msgstr "Y"
#: C/keyboardshortcuts.page:93(p)
msgid "Mark the selected episodes as old"
-msgstr ""
+msgstr "Marca els episodis seleccionats com a antics"
#: C/keyboardshortcuts.page:103(title)
msgid "Interface"
-msgstr ""
+msgstr "Interfície"
#: C/keyboardshortcuts.page:110(p)
msgid "Toggle full-screen mode"
-msgstr ""
+msgstr "Commuta el mode de pantalla completa"
#: C/keyboardshortcuts.page:114(key) C/keyboardshortcuts.page:118(key)
msgid "A"
-msgstr ""
+msgstr "A"
#: C/keyboardshortcuts.page:114(p)
msgid "Select all songs in playlist view"
-msgstr ""
+msgstr "Selecciona totes les cançons en la vista de la llista de reproducció"
#: C/keyboardshortcuts.page:118(key)
msgid "Shift"
-msgstr ""
+msgstr "Maj"
#: C/keyboardshortcuts.page:119(p)
msgid "Unselect all songs in playlist view"
msgstr ""
+"Desselecciona totes les cançons en la vista de la llista de reproducció"
#: C/keyboardshortcuts.page:123(key)
msgid "W"
-msgstr ""
+msgstr "W"
#: C/keyboardshortcuts.page:123(p)
msgid "Hide Banshee Window (Requires Notification Area Plug-in Enabled"
msgstr ""
+"Amaga la finestra del Banshee (requereix tenir el connector «Icona de l'àrea "
+"de notificació» habilitat)"
#: C/keyboardshortcuts.page:127(key)
msgid "Left Mouse Button"
-msgstr ""
+msgstr "Botó esquerre del ratolí"
#: C/keyboardshortcuts.page:128(p)
msgid "Play Previous Song (Requires Notification Area Plug-in Enabled"
msgstr ""
+"Reprodueix la cançó anterior (requereix tenir el connector «Icona de l'àrea "
+"de notificació» habilitat)"
#: C/keyboardshortcuts.page:132(key)
msgid "Right Mouse Button"
-msgstr ""
+msgstr "Botó dret del ratolí"
#: C/keyboardshortcuts.page:133(p)
msgid "Play Next Song (Requires Notification Area Plug-in Enabled"
msgstr ""
+"Reprodueix la cançó següent (requereix tenir el connector «Icona de l'àrea de "
+"notificació» habilitat)"
#: C/keyboardshortcuts.page:137(key)
msgid "Middle Mouse Button"
-msgstr ""
+msgstr "Botó central del ratolí"
#: C/keyboardshortcuts.page:138(p)
msgid "Toggle Play / Pause (Requires Notification Area Plug-in Enabled"
msgstr ""
+"Commuta entre reproducció o pausa (requereix tenir el connector «Icona de "
+"l'àrea de notificació» habilitat)"
#: C/itunes-import.page:8(desc)
msgid ""
"Import music and categorizations from the <app>iTunes</app> media player."
msgstr ""
+"Importa la música i les categoritzacions del reproductor multimèdia "
+"<app>iTunes</app>."
#: C/itunes-import.page:12(title)
msgid "Import your <app>iTunes</app> library"
-msgstr ""
+msgstr "Importació de la biblioteca de l'<app>iTunes</app>"
#: C/introduction.page:8(desc)
msgid "Introduction to the <app>Banshee Media Player</app>."
-msgstr ""
+msgstr "Introducció al <app>reproductor multimèdia Banshee</app>."
#: C/introduction.page:24(title)
msgid "Introduction"
-msgstr ""
+msgstr "Introducció"
#: C/introduction.page:26(p)
msgid ""
"<app>Banshee</app> is a media player that allows you to play your music, "
-"videos, and other media media as well sync it with portable devices to take "
-"your media on the go."
+"videos, and other media as well sync it with portable devices to take your "
+"media on the go."
msgstr ""
+"El <app>Banshee</app> és un reproductor multimèdia que permet reproduir "
+"música, vídeos i altres elements multimèdia així com sincronitzar-se amb "
+"dispositiu portàtils per tal de que us pugeu emportar la música."
#: C/introduction.page:31(p)
msgid ""
"<app>Banshee</app> includes features to import your media, manage its "
"metadata, and play your music and videos."
msgstr ""
+"El <app>Banshee</app> permet importar elements multimèdia, gestionar les "
+"metadades, i reproduir música i vídeos."
#: C/introduction.page:35(p)
msgid ""
@@ -1346,7 +1502,7 @@ msgstr ""
#: C/index.page:24(title)
msgid "Add, Remove & Play"
-msgstr "Afegir, suprimir i reproduir"
+msgstr "Afegiu, suprimiu i reproduïu"
#: C/index.page:28(title)
msgid "Manage & Sort"
@@ -1355,30 +1511,32 @@ msgstr "Gestió i ordenació"
#: C/index.page:32(title)
msgid "Sync your media with a portable music player"
msgstr ""
+"Sincronitzeu els elements multimèdia amb un reproductor de música portable"
#: C/index.page:36(title)
msgid "Add additional functionality to Banshee"
-msgstr ""
+msgstr "Afegiu funcionalitat addicional al Banshee"
#: C/index.page:40(title)
msgid "Advanced options and help"
-msgstr ""
+msgstr "Opcions avançades i ajuda"
#: C/index.page:44(title)
msgid "Common Problems"
-msgstr ""
+msgstr "Problemes comuns"
#: C/import.page:8(desc)
msgid "Add music and videos from your computer to your Banshee library."
msgstr ""
+"Afegeix música i vídeos des del vostre ordinador a la biblioteca del Banshee."
#: C/import.page:15(name)
msgid "Shaun McCance"
-msgstr ""
+msgstr "Shaun McCance"
#: C/import.page:16(email)
msgid "shaunm at gnome.org"
-msgstr ""
+msgstr "shaunm at gnome.org"
#: C/import.page:21(title)
msgid "Import music & videos"
@@ -1390,6 +1548,9 @@ msgid ""
"Imported files appear in your sources and can be edited and managed like any "
"other media in Banshee."
msgstr ""
+"Podeu importar música i vídeos ja emmagatzemats a l'ordinador al Banshee. "
+"Els fitxers importats apareixeran a les fonts i podreu editar-los i "
+"gestionar-los com qualsevol altre element multimèdia al Banshee."
#: C/import.page:27(p)
msgid ""
@@ -1397,16 +1558,21 @@ msgid ""
"gui><gui>Import Media</gui></guiseq>. A dialog will appear with a number of "
"choices."
msgstr ""
+"Per a importar fitxers de música o vídeo, escolliu <guiseq><gui>Elements "
+"multimèdia</gui><gui>Importa elements multimèdia</gui></guiseq>. Una diàleg "
+"apareixerà amb diversos opcions."
#: C/import.page:31(p)
msgid ""
"Plugins may add additional import choices. See <link xref=\"#plugins\"/> "
"below."
msgstr ""
+"Els connectors poden afegir opcions d'importació addicionals. Vegeu <link "
+"xref=\"#plugins\"/> a baix."
#: C/import.page:37(gui)
msgid "Local Folders"
-msgstr "Carpetas locales"
+msgstr "Carpetes locals"
#: C/import.page:38(p)
msgid ""
@@ -1424,16 +1590,21 @@ msgid ""
"Choose this option to import only the specific file or files you select. You "
"will be prompted with a dialog to choose the file or files to import."
msgstr ""
+"Escolliu aquesta opció per a importar només un fitxer o fitxers específics "
+"que seleccioneu. Us apareixerà una capsa de diàleg on podreu escollir el "
+"fitxer o fitxers a importar."
#: C/import.page:49(gui)
msgid "Home Folder"
-msgstr ""
+msgstr "Carpeta d'usuari"
#: C/import.page:50(p)
msgid ""
"Choose this option to import all music and video files in your entire home "
"folder, including files in any subfolders."
msgstr ""
+"Escolliu aquesta opció per a importar tots els fitxers de vídeo i música de "
+"la vostra carpeta d'usuari, incloent-hi els fitxers en les subcarpetes."
#: C/import.page:54(gui)
msgid "Videos From Photos Folder"
@@ -1441,7 +1612,7 @@ msgstr "Vídeos des de la carpeta de fotografies"
#: C/import.page:55(p)
msgid ""
-"Many digital cameras can take short vidoes, and photo-management "
+"Many digital cameras can take short videos, and photo-management "
"applications often download these videos directly into your Photos folder. "
"Choose this option to import any videos that have been stored in your Photos "
"folder."
@@ -1452,6 +1623,8 @@ msgid ""
"You can safely import from a folder you have already imported from without "
"worrying about duplicate entries in your library."
msgstr ""
+"Podeu importar de forma segura una carpeta que ja heu importat sense "
+"preocupar-vos de que es produeixin entrades duplicades a la biblioteca."
#: C/import.page:68(title)
msgid "Import from a Playlist"
@@ -1474,46 +1647,49 @@ msgid ""
"Plugins may add additional import choices. The following additional sources "
"will be available if the appropriate plugins are enabled:"
msgstr ""
+"Els connectors poden afegir opcions d'importació addicionals. Les següents "
+"fonts addicionals estaran disponibles si els connectors apropiats estan "
+"habilitats:"
#: C/extensions.page:8(desc)
msgid "Add additional functionality to Banshee."
-msgstr ""
+msgstr "Afegeix funcionalitat addicional al Banshee."
#: C/extensions.page:23(title)
msgid "Banshee Extensions"
-msgstr ""
+msgstr "Extensions del Banshee"
#: C/extensions.page:27(title)
msgid "Official Banshee Extensions"
-msgstr ""
+msgstr "Extensions oficials del Banshee"
#: C/extensions.page:29(title)
msgid "Manage extensions for Banshee"
-msgstr ""
+msgstr "Gestiona les extensions pel Banshee"
#: C/extensions.page:34(title)
msgid "Community Banshee Extensions"
-msgstr ""
+msgstr "Extensions de la comunitat pel Banshee"
#: C/extensions.page:36(title)
msgid "Add community built extensions for Banshee"
-msgstr ""
+msgstr "Afegiu extensions de la comunitat pel Banshee"
#: C/emusic.page:8(desc)
msgid "Import music purchased from eMusic."
-msgstr ""
+msgstr "Importa la música comprada des d'eMusic."
#: C/emusic.page:12(title)
msgid "Import your eMusic tracks"
-msgstr ""
+msgstr "Importeu les pistes d'eMusic"
#: C/amazon.page:9(desc)
msgid "Sync and purchase music from the Amazon MP3 Store."
-msgstr ""
+msgstr "Sincronitza i compra música de la botiga Amazon MP3."
#: C/amazon.page:24(title)
msgid "Amazon MP3 Store"
-msgstr ""
+msgstr "Botiga Amazon MP3"
#: C/amazon.page:26(p)
msgid ""
@@ -1529,10 +1705,13 @@ msgid ""
"Banshee uses an Amazon affiliate code for all music purchases. All money "
"made via this affiliate code is donated to the GNOME Foundation."
msgstr ""
+"El Banshee utilitza un codi d'afiliació per totes compres de música. Totes "
+"les comissions de venda obtingudes amb el codi d'afiliació són donades a la "
+"Fundació GNOME."
#: C/amazon.page:40(title)
msgid "Purchase Amazon MP3s in your web browser"
-msgstr ""
+msgstr "Compreu música de l'Amazon MP3 des del navegador"
#: C/amazon.page:42(p)
msgid ""
@@ -1545,7 +1724,7 @@ msgstr ""
#: C/amazon.page:51(title)
msgid "Buy Amazon MP3s in Banshee"
-msgstr ""
+msgstr "Compreu d'Amazon MP3 des del Banshee"
#: C/amazon.page:53(p)
msgid ""
@@ -1559,7 +1738,7 @@ msgstr ""
#: C/amazon.page:63(title)
msgid "Import Amazon MP3s manually"
-msgstr ""
+msgstr "Importeu música d'Amazon MP3 manualment"
#: C/amazon.page:65(p)
msgid ""
@@ -1582,36 +1761,36 @@ msgstr ""
#: C/advanced.page:8(desc)
msgid "Get help for advanced actions."
-msgstr ""
+msgstr "Obtingueu ajuda per a accions avançades."
#: C/advanced.page:23(title)
msgid "Advanced Options and Help"
-msgstr ""
+msgstr "Opcions avançades i ajuda"
#: C/add-radio.page:11(desc)
msgid "Add, remove and play internet radio stations in Banshee."
-msgstr ""
+msgstr "Afegeix, suprimeix i reprodueix emissores de ràdio al Banshee."
#: C/add-radio.page:26(title)
msgid "Internet Radio"
-msgstr ""
+msgstr "Ràdio per Internet"
#: C/add-radio.page:29(title)
msgid "What is Internet Radio?"
-msgstr ""
+msgstr "Què és la ràdio per Internet?"
#: C/add-radio.page:31(p)
msgid ""
"Internet radio stations are similar to regular radio stations, allowing an "
"individual or organization to stream music live over the internet. Internet "
"radio stations can be a simultaneous stream of a regular radio station, an "
-"amateur broadasting their own station, or commercial internet radio stations "
-"that include live DJs and even commercials."
+"amateur broadcasting their own station, or commercial internet radio "
+"stations that include live DJs and even commercials."
msgstr ""
#: C/add-radio.page:41(title)
msgid "Add Radio Station"
-msgstr ""
+msgstr "Afegeix una emissora de ràdio"
#: C/add-radio.page:43(p)
msgid ""
@@ -1626,6 +1805,9 @@ msgid ""
"in your web browser. In most browsers, you can right click on the link and "
"press <gui>Copy Link</gui>."
msgstr ""
+"Des de la pàgina d'Internet de l'emissora de Ràdio, copieu l'enllaç del flux "
+"a la URL del vostre navegador. A la majoria de navegadors, podeu fer clic "
+"amb el botó dret a l'enllaç i prémer <gui>Copia l'enllaç</gui>."
#: C/add-radio.page:54(p)
msgid ""
@@ -1648,14 +1830,16 @@ msgstr ""
msgid ""
"Then press <gui>Save</gui> to save the internet radio station in Banshee."
msgstr ""
+"Llavors premeu <gui>Desa</gui> per a desar l'emissora de ràdio per Internet "
+"al Banshee."
#: C/add-podcast.page:11(desc)
msgid "Add, remove and play podcasts in Banshee."
-msgstr ""
+msgstr "Afegeix, elimina i reprodueix podcasts al Banshee."
#: C/add-podcast.page:29(title)
msgid "What is a Podcast?"
-msgstr ""
+msgstr "Què és un Podcast?"
#: C/add-podcast.page:31(p)
msgid ""
@@ -1675,7 +1859,7 @@ msgstr ""
#: C/add-podcast.page:44(title)
msgid "Add a Podcast"
-msgstr ""
+msgstr "Afegiu un Podcast"
#: C/add-podcast.page:46(p)
msgid ""
@@ -1699,41 +1883,45 @@ msgid ""
"Banshee will then allow you to choose how you want to download new podcasts "
"from a drop down menu. Your choices include:"
msgstr ""
+"El Banshee us permetrà escollir com voleu baixar els Podcasts nous des del "
+"menú desplegable. Les opcions inclouen:"
#: C/add-podcast.page:63(p)
msgid ""
"Download the Most Recent Episode (This will automatically download the last "
"episode that was released)."
msgstr ""
+"Baixeu l'episodi més recent (es baixarà l'últim episodi que s'ha publicat)"
+# N.T: Trobo totalment redundant l'explicació entre parèntesis per això l'he omès
#: C/add-podcast.page:65(p)
msgid "Download All Episodes (This will download all episodes)."
-msgstr ""
+msgstr "Baixa tots els episodis"
+# N.T: Trobo totalment redundant l'explicació entre parèntesis per això l'he omès
#: C/add-podcast.page:66(p)
msgid ""
"Let Me Decide Which Episodes to Download (This will allow you to choose "
"which episodes you would like to download)."
-msgstr ""
+msgstr "Deixeu-me decidir quins episodis baixar"
#: C/add-podcast.page:70(p)
msgid "After you have added a Podcast feed, Banshee will display:"
-msgstr ""
+msgstr "Un cop hageu afegit un canal Podcast, el Banshee mostrarà:"
#: C/add-podcast.page:73(p)
msgid "<gui>Name</gui>: (Name of the specific episode)"
-msgstr ""
+msgstr "<gui>Nom</gui>: (nom de l'episodi específic)"
#: C/add-podcast.page:74(p)
msgid "<gui>Podcast</gui>: (Name of the Podcast)"
-msgstr ""
+msgstr "<gui>Podcast</gui>: (nom del Podcast)"
#: C/add-podcast.page:75(p)
msgid "<gui>Published</gui> (Date the episode was published or released)"
-msgstr ""
+msgstr "<gui>Publicat</gui> (data en que l'episodi es va publicar)"
#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
#: C/index.page:0(None)
msgid "translator-credits"
msgstr "Jordi Mas i Hernandez, 2010"
-
diff --git a/help/ca/emusic.page b/help/ca/emusic.page
index 190b567..7bc2a6b 100644
--- a/help/ca/emusic.page
+++ b/help/ca/emusic.page
@@ -4,10 +4,10 @@
<info>
<link type="guide" xref="import#plugins"/>
<revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
- <desc>Import music purchased from eMusic.</desc>
+ <desc>Importa la música comprada des d'eMusic.</desc>
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Import your eMusic tracks</title>
+ <title>Importeu les pistes d'eMusic</title>
</page>
diff --git a/help/ca/extensions.page b/help/ca/extensions.page
index 795fb1d..6c0a2c9 100644
--- a/help/ca/extensions.page
+++ b/help/ca/extensions.page
@@ -3,7 +3,7 @@
<info>
<link type="guide" xref="index#extensions"/>
- <desc>Add additional functionality to Banshee.</desc>
+ <desc>Afegeix funcionalitat addicional al Banshee.</desc>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
@@ -18,20 +18,20 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Banshee Extensions</title>
+ <title>Extensions del Banshee</title>
<section id="official" style="2column">
<info>
- <title type="link">Official Banshee Extensions</title>
+ <title type="link">Extensions oficials del Banshee</title>
</info>
- <title>Manage extensions for Banshee</title>
+ <title>Gestiona les extensions pel Banshee</title>
</section>
<section id="community" style="2column">
<info>
- <title type="link">Community Banshee Extensions</title>
+ <title type="link">Extensions de la comunitat pel Banshee</title>
</info>
- <title>Add community built extensions for Banshee</title>
+ <title>Afegiu extensions de la comunitat pel Banshee</title>
</section>
diff --git a/help/ca/import.page b/help/ca/import.page
index 4459eac..63d7f61 100644
--- a/help/ca/import.page
+++ b/help/ca/import.page
@@ -4,7 +4,7 @@
<info>
<link type="guide" xref="index#media"/>
<link type="seealso" xref="remove-media"/>
- <desc>Add music and videos from your computer to your Banshee library.</desc>
+ <desc>Afegeix música i vídeos des del vostre ordinador a la biblioteca del Banshee.</desc>
<revision pkgversion="1.6" version="1.6" date="2010-07-15" status="review"/>
<credit type="author">
<name>Paul Cutler</name>
@@ -19,39 +19,32 @@
<title>Importació de música i vídeos</title>
- <p>You can import music and videos stored on your computer into Banshee. Imported
- files appear in your sources and can be edited and managed like any other media in
- Banshee.</p>
+ <p>Podeu importar música i vídeos ja emmagatzemats a l'ordinador al Banshee. Els fitxers importats apareixeran a les fonts i podreu editar-los i gestionar-los com qualsevol altre element multimèdia al Banshee.</p>
- <p>To import music or video files on your computer, choose <guiseq><gui>Media</gui>
- <gui>Import Media</gui></guiseq>. A dialog will appear with a number of choices.</p>
+ <p>Per a importar fitxers de música o vídeo, escolliu <guiseq><gui>Elements multimèdia</gui><gui>Importa elements multimèdia</gui></guiseq>. Una diàleg apareixerà amb diversos opcions.</p>
<note>
- <p>Plugins may add additional import choices. See <link xref="#plugins"/>
- below.</p>
+ <p>Els connectors poden afegir opcions d'importació addicionals. Vegeu <link xref="#plugins"/> a baix.</p>
</note>
<terms>
<item>
- <title><gui>Carpetas locales</gui></title>
+ <title><gui>Carpetes locals</gui></title>
<p>Choose this option to import all music and video files within
a specified folder, including all subfolders. You will be prompted
with a dialog to choose a folder to import from.</p>
</item>
<item>
<title><gui>Fitxers locals</gui></title>
- <p>Choose this option to import only the specific file or files
- you select. You will be prompted with a dialog to choose the
- file or files to import.</p>
+ <p>Escolliu aquesta opció per a importar només un fitxer o fitxers específics que seleccioneu. Us apareixerà una capsa de diàleg on podreu escollir el fitxer o fitxers a importar.</p>
</item>
<item>
- <title><gui>Home Folder</gui></title>
- <p>Choose this option to import all music and video files in your
- entire home folder, including files in any subfolders.</p>
+ <title><gui>Carpeta d'usuari</gui></title>
+ <p>Escolliu aquesta opció per a importar tots els fitxers de vídeo i música de la vostra carpeta d'usuari, incloent-hi els fitxers en les subcarpetes.</p>
</item>
<item>
<title><gui>Vídeos des de la carpeta de fotografies</gui></title>
- <p>Many digital cameras can take short vidoes, and photo-management
+ <p>Many digital cameras can take short videos, and photo-management
applications often download these videos directly into your Photos
folder. Choose this option to import any videos that have been
stored in your Photos folder.</p>
@@ -59,8 +52,7 @@
</terms>
<note>
- <p>You can safely import from a folder you have already imported
- from without worrying about duplicate entries in your library.</p>
+ <p>Podeu importar de forma segura una carpeta que ja heu importat sense preocupar-vos de que es produeixin entrades duplicades a la biblioteca.</p>
</note>
<section id="import-playlist">
@@ -75,8 +67,7 @@
<section id="plugins">
<title>Fonts d'importació addicionals</title>
- <p>Plugins may add additional import choices. The following additional
- sources will be available if the appropriate plugins are enabled:</p>
+ <p>Els connectors poden afegir opcions d'importació addicionals. Les següents fonts addicionals estaran disponibles si els connectors apropiats estan habilitats:</p>
</section>
</page>
diff --git a/help/ca/index.page b/help/ca/index.page
index 4d6995e..a856a97 100644
--- a/help/ca/index.page
+++ b/help/ca/index.page
@@ -19,7 +19,7 @@
<title>Reproductor multimèdia Banshee</title>
<section id="media" style="2column">
- <title>Afegir, suprimir i reproduir</title>
+ <title>Afegiu, suprimiu i reproduïu</title>
</section>
<section id="manage" style="2column">
@@ -27,19 +27,19 @@
</section>
<section id="sync" style="2column">
- <title>Sync your media with a portable music player</title>
+ <title>Sincronitzeu els elements multimèdia amb un reproductor de música portable</title>
</section>
<section id="extensions" style="2column">
- <title>Add additional functionality to Banshee</title>
+ <title>Afegiu funcionalitat addicional al Banshee</title>
</section>
<section id="advanced" style="2column">
- <title>Advanced options and help</title>
+ <title>Opcions avançades i ajuda</title>
</section>
<section id="problems">
- <title>Common Problems</title>
+ <title>Problemes comuns</title>
</section>
</page>
diff --git a/help/ca/introduction.page b/help/ca/introduction.page
index 3bc3270..a07456a 100644
--- a/help/ca/introduction.page
+++ b/help/ca/introduction.page
@@ -4,9 +4,7 @@
<info>
<link type="guide" xref="index"/>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
- <desc>
- Introduction to the <app>Banshee Media Player</app>.
- </desc>
+ <desc>Introducció al <app>reproductor multimèdia Banshee</app>.</desc>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
@@ -20,17 +18,10 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Introduction</title>
+ <title>Introducció</title>
- <p>
- <app>Banshee</app> is a media player that allows you to play your music,
- videos, and other media media as well sync it with portable devices to take your media
- on the go.
- </p>
- <p>
- <app>Banshee</app> includes features to import your media, manage its
- metadata, and play your music and videos.
- </p>
+ <p>El <app>Banshee</app> és un reproductor multimèdia que permet reproduir música, vídeos i altres elements multimèdia així com sincronitzar-se amb dispositiu portàtils per tal de que us pugeu emportar la música.</p>
+ <p>El <app>Banshee</app> permet importar elements multimèdia, gestionar les metadades, i reproduir música i vídeos.</p>
<p>
Banshee also helps you sync your music and videos to popular portable
devices, such as digital audio players and smartphones. Banshee supports
diff --git a/help/ca/itunes-import.page b/help/ca/itunes-import.page
index faf4cae..ea10711 100644
--- a/help/ca/itunes-import.page
+++ b/help/ca/itunes-import.page
@@ -4,10 +4,10 @@
<info>
<link type="guide" xref="import#plugins"/>
<revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
- <desc>Import music and categorizations from the <app>iTunes</app> media player.</desc>
+ <desc>Importa la música i les categoritzacions del reproductor multimèdia <app>iTunes</app>.</desc>
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Import your <app>iTunes</app> library</title>
+ <title>Importació de la biblioteca de l'<app>iTunes</app></title>
</page>
diff --git a/help/ca/keyboardshortcuts.page b/help/ca/keyboardshortcuts.page
index 1524299..83b173b 100644
--- a/help/ca/keyboardshortcuts.page
+++ b/help/ca/keyboardshortcuts.page
@@ -3,7 +3,7 @@
<info>
<link type="guide" xref="advanced#keyboard"/>
- <desc>Keyboard Shortcuts</desc>
+ <desc>Dreceres de teclat</desc>
<revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
@@ -20,24 +20,24 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Control Banshee using Keyboard Shortcuts</title>
+ <title>Controleu el Banshee utilitzant dreceres de teclat</title>
<section id="playbackcontrol">
- <title>Playback Control</title>
+ <title>Control de reproducció</title>
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Key</gui></p></td> <td><p><gui>Action</gui></p></td>
+ <td><p><gui>Tecla</gui></p></td> <td><p><gui>Acció</gui></p></td>
</tr>
<tr>
- <td><p>Space Bar</p></td> <td><p>Play or Pause the current song</p></td>
+ <td><p>Barra espaiadora</p></td> <td><p>Reprodueix o posa en pausa la cançó actual</p></td>
</tr>
<tr>
- <td><p>N</p></td> <td><p>Play the next song</p></td>
+ <td><p>N</p></td> <td><p>Reprodueix la cançó següent</p></td>
</tr>
<tr>
- <td><p>B</p></td> <td><p>Play the previous song</p></td>
+ <td><p>B</p></td> <td><p>Reprodueix la cançó anterior</p></td>
</tr>
</table>
@@ -45,19 +45,18 @@
<section id="library">
- <title>Library Interaction</title>
+ <title>Interacció amb la biblioteca</title>
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Key</gui></p></td> <td><p><gui>Action</gui></p></td>
+ <td><p><gui>Tecla</gui></p></td> <td><p><gui>Acció</gui></p></td>
</tr>
<tr>
- <td><p><keyseq><key>Control</key><key>F</key></keyseq></p></td> <td><p>
- Move the focus to the search box</p></td>
+ <td><p><keyseq><key>Control</key><key>F</key></keyseq></p></td> <td><p>Mou el focus a la capsa de de cerca</p></td>
</tr>
<tr>
<td><p><key>/</key>, <keyseq><key>Control</key><key>F</key></keyseq></p></td>
- <td><p>Open import media dialog</p></td>
+ <td><p>Obre la capsa de diàleg d'importació d'elements multimèdia</p></td>
</tr>
</table>
@@ -65,15 +64,14 @@
<section id="playlists">
- <title>Library Interaction</title>
+ <title>Interacció amb la biblioteca</title>
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Key</gui></p></td> <td><p><gui>Action</gui></p></td>
+ <td><p><gui>Tecla</gui></p></td> <td><p><gui>Acció</gui></p></td>
</tr>
<tr>
- <td><p><keyseq><key>Control</key><key>N</key></keyseq></p></td> <td><p>
- Create New Playlist</p></td>
+ <td><p><keyseq><key>Control</key><key>N</key></keyseq></p></td> <td><p>Crea una nova llista de reproducció</p></td>
</tr>
</table>
@@ -86,11 +84,10 @@
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Key</gui></p></td> <td><p><gui>Action</gui></p></td>
+ <td><p><gui>Tecla</gui></p></td> <td><p><gui>Acció</gui></p></td>
</tr>
<tr>
- <td><p><key>Y</key></p></td> <td><p>
- Mark the selected episodes as old</p></td>
+ <td><p><key>Y</key></p></td> <td><p>Marca els episodis seleccionats com a antics</p></td>
</tr>
</table>
@@ -99,43 +96,36 @@
<section id="interface">
- <title>Interface</title>
+ <title>Interfície</title>
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Key</gui></p></td> <td><p><gui>Action</gui></p></td>
+ <td><p><gui>Tecla</gui></p></td> <td><p><gui>Acció</gui></p></td>
</tr>
<tr>
- <td><p><key>F</key></p></td> <td><p>
- Toggle full-screen mode</p></td>
+ <td><p><key>F</key></p></td> <td><p>Commuta el mode de pantalla completa</p></td>
</tr>
<tr>
- <td><p><keyseq><key>Control</key><key>A</key></keyseq></p></td> <td><p>
- Select all songs in playlist view</p></td>
+ <td><p><keyseq><key>Control</key><key>A</key></keyseq></p></td> <td><p>Selecciona totes les cançons en la vista de la llista de reproducció</p></td>
</tr>
<tr>
- <td><p><keyseq><key>Control</key><key>Shift</key><key>A</key></keyseq></p>
- </td> <td><p>
- Unselect all songs in playlist view</p></td>
+ <td><p><keyseq><key>Control</key><key>Maj</key><key>A</key></keyseq></p>
+ </td> <td><p>Desselecciona totes les cançons en la vista de la llista de reproducció</p></td>
</tr>
<tr>
- <td><p><keyseq><key>Control</key><key>W</key></keyseq></p></td> <td><p>
- Hide Banshee Window (Requires Notification Area Plug-in Enabled</p></td>
+ <td><p><keyseq><key>Control</key><key>W</key></keyseq></p></td> <td><p>Amaga la finestra del Banshee (requereix tenir el connector «Icona de l'àrea de notificació» habilitat)</p></td>
</tr>
<tr>
- <td><p><keyseq><key>Control</key><key>Left Mouse Button</key></keyseq>
- </p></td> <td><p>
- Play Previous Song (Requires Notification Area Plug-in Enabled</p></td>
+ <td><p><keyseq><key>Control</key><key>Botó esquerre del ratolí</key></keyseq>
+ </p></td> <td><p>Reprodueix la cançó anterior (requereix tenir el connector «Icona de l'àrea de notificació» habilitat)</p></td>
</tr>
<tr>
- <td><p><keyseq><key>Control</key><key>Right Mouse Button</key></keyseq>
- </p></td> <td><p>
- Play Next Song (Requires Notification Area Plug-in Enabled</p></td>
+ <td><p><keyseq><key>Control</key><key>Botó dret del ratolí</key></keyseq>
+ </p></td> <td><p>Reprodueix la cançó següent (requereix tenir el connector «Icona de l'àrea de notificació» habilitat)</p></td>
</tr>
<tr>
- <td><p><keyseq><key>Control</key><key>Middle Mouse Button</key></keyseq>
- </p></td> <td><p>
- Toggle Play / Pause (Requires Notification Area Plug-in Enabled</p></td>
+ <td><p><keyseq><key>Control</key><key>Botó central del ratolí</key></keyseq>
+ </p></td> <td><p>Commuta entre reproducció o pausa (requereix tenir el connector «Icona de l'àrea de notificació» habilitat)</p></td>
</tr>
</table>
diff --git a/help/ca/lastfm.page b/help/ca/lastfm.page
index c21854e..4f41ed4 100644
--- a/help/ca/lastfm.page
+++ b/help/ca/lastfm.page
@@ -21,16 +21,10 @@
<title>Last.fm</title>
- <p>Last.fm is a popular online service that offers both free and paid
- versions. Last.fm offers information on music artists and albums and if you
- create a user profile Last.fm allows you to track the music you listen to
- in Banshee for free. If you suscribe as a paying member, you can also listen
- to streaming music from Last.fm in various music clients, including Banshee.
- Last.fm offers multiple channels to stream, including recommended music for
- you based on your listening habits, your favorites and more.</p>
+ <p>Last.fm és un popular servei en línia que ofereix versions gratuïtes i de pagament. Last.fm ofereix informació d'artistes musicals i àlbums i si creeu un perfil d'usuari a Last.fm us permet fer un seguiment gratuïtament de la música que escolteu al Banshee. Si us subscriviu com a membre de pagament, podeu també escoltar fluxos de música de Last.Fm des de diferents clients, incloent-hi el Banshee. Last.fm ofereix múltiples canals de fluxos, incloent-hi recomanacions musicals basades en els vostres hàbits, els favorits i d'altres.</p>
<section id="enable-lastfm">
- <title>Enable Last.fm</title>
+ <title>Habilita Last.fm</title>
<p>To get the most out of Last.fm, you will want to create a Last.fm profile.
Visit <link href="http://www.last.fm/join">http://www.last.fm/join</link>
to create an account or choose
@@ -53,7 +47,7 @@
</section>
<section id="songreporting">
- <title>Enable Last.fm Song Reporting</title>
+ <title>Habilita l'informe de cançons per a Last.Fm</title>
<p>After you have successfully linked Banshee to your Last.fm profile, to
enable Banshee to report the songs to your Last.fm profile, in the
<gui>Source Specific</gui> tab in Banshee's preferences, press the
@@ -67,7 +61,7 @@
</section>
<section id="lastfm-radio">
- <title>Listen to Last.fm Radio</title>
+ <title>Escoleu l'emissora de ràdio Last.fm</title>
<p>Last.fm radio is free for residents of the United States, United Kingdom
and Germany. Residents of other countries will have to pay for a premium
account with Last.fm to listen to radio. Premium members, in all countries,
@@ -75,8 +69,8 @@
music you've loved or tagged.
</p>
- <p>In Banshee's context menu onthe left hand side, you will now have a
- Last.fm section, including your Lat.fm radio stations. You will need an
+ <p>In Banshee's context menu on the left hand side, you will now have a
+ Last.fm section, including your Last.fm radio stations. You will need an
active internet connection to listen to Last.fm radio. Choose the radio
station you wish to listen to and Banshee will communicate with Last.fm
to populate songs for that radio station. Press the <gui>Play</gui> button
diff --git a/help/ca/manage-coverart.page b/help/ca/manage-coverart.page
index aea2421..9bea8b5 100644
--- a/help/ca/manage-coverart.page
+++ b/help/ca/manage-coverart.page
@@ -4,7 +4,7 @@
<info>
<link type="guide" xref="index#manage"/>
<link type="seealso" xref="tags"/>
- <desc>Manage or change your albums cover art.</desc>
+ <desc>Gestió i modificació de les cobertes dels àlbums.</desc>
<revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
@@ -19,7 +19,7 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Cover art</title>
+ <title>Cobertes</title>
<p/>
diff --git a/help/ca/manage-playlists.page b/help/ca/manage-playlists.page
index 03cfe34..bfa2b94 100644
--- a/help/ca/manage-playlists.page
+++ b/help/ca/manage-playlists.page
@@ -5,7 +5,7 @@
<link type="guide" xref="index#manage"/>
<link type="seealso" xref="tags"/>
<link type="seealso" xref="coverart"/>
- <desc>Create and manage playlists.</desc>
+ <desc>Creació i gestió de llistes de reproducció</desc>
<revision pkgversion="1.6" version="0.1" date="2010-05-26" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
@@ -14,35 +14,24 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Playlists</title>
+ <title>Llistes de reproducció</title>
- <p>Playlists allow you to create and save a list of music tracks to be played
- in a specific order. Playlists are convenient to create a list of your
- favorite songs or to split your library into smaller lists that are easy
- to browse through. Some portable media players even allow you to transfer the
- playlist so you can take it with you on the go.
- </p>
+ <p>Les llistes de reproducció us permeten crear i desar llistes de cançons per ser reproduïdes en un ordre específic. Les llistes de reproducció són una manera còmode de crear llistes amb les vostres cançons preferides o per dividir la biblioteca en llistes més petites més fàcils de navegar. Alguns reproductors portables multimèdia permeten transferir llistes de reproducció perquè les pugueu utilitzar en aquests dispositius.</p>
- <p>Banshee supports normal playlists, which include songs you add to the
- playlist, as well as smart playlists. Smart Playlists are automatically
- generated playlists based on your listening habits, favorite music, or more.</p>
+ <p>El Banshee disposa de llistes de reproducció normals, que inclouen les cançons que afegiu. També disposa de llistes de reproducció intel·ligents, que es basen en els hàbits de reproducció, música preferida i d'altres.</p>
<section id="manual">
- <title>Normal Playlists</title>
+ <title>Llistes de reproducció normals</title>
- <p>A normal playlist is a list of songs that you add and manage. You might
- want to create your own list of songs by your favorite artist from
- multiple albums, your latest favorite songs, or an upbeat playlist to listen
- to while you exercise.
- </p>
+ <p>Una llista de reproducció normal és una llista de cançons a la que afegiu cançons i que gestioneu manualment. Podeu crear llistes de cançons del vostre artista preferit des de múltiples àlbums, per les cançons més noves que preferiu, o per escoltar mentre feu exercici.</p>
<p>You can create a new playlist by pressing <keyseq><key>Control</key>
<key>N</key></keyseq>, from the menu choosing <guiseq><gui>Menu</gui>
<gui>New Playlist</gui></guiseq> or by selecing the track(s) you would like
to add to the playlist. Select the track(s), right click them, and choose
<guiseq><gui>Add to Playlist</gui><gui>New Playlist</gui></guiseq>.
- You can also drag and drop them to a new playlist by selcting the track(s)
+ You can also drag and drop them to a new playlist by selecting the track(s)
and dragging them to the left hand
window pane over <gui>Music</gui>. As you drag it over <gui>Music</gui>,
a new option <gui><em>New Playlist</em></gui> will appear and you can drop
@@ -51,17 +40,9 @@
you want in the playlist.
</p>
- <p>To give your playlist its own name, select the playlist and right click
- on the playlist and press <gui>Rename Playlist</gui> and enter the name
- of your playlist.
- </p>
+ <p>Per a anomenar una llista de reproducció, escolliu la llista de reproducció i feu clic amb el botó dret del ratolí sobre la llista de reproducció i premeu <gui>Canvia el nom</gui> i introduïu el nom de la llista de reproducció.</p>
- <p>You can change the order of the playlist by dragging and dropping the
- song to the new position in the playlist. Songs can only be re-ordered
- in the playlist when none of the columns are sorted. To unsort a column,
- press the column until the up or down arrow is no longer showing and
- the column is blank and then re-order the playlist.
- </p>
+ <p>Podeu canviar l'ordre a una llista de reproducció arrossegant i deixant anar la cançó a la nova posició a la llista de reproducció. Les cançons només es poden tornar a ordenar quan la llista de reproducció no està ordenada per cap columna. Per deixar d'ordenar per una columna, premeu sobre la columna fins que la fletxa d'amunt o avall no es mostri i la columna quedi en blanc, llavors torneu a ordenar la llista de reproducció.</p>
<p>To remove a track from the playlist, select the track(s) you wish to
remove. Press the <key>Delete</key>, from the menu choose
@@ -71,52 +52,35 @@
</section>
<section id="smartplaylists">
- <title>Smart Playlist</title>
+ <title>Llistes de reproducció intel·ligents</title>
- <p>Smart Playlists allow you to quickly generate a dynamic playlist based
- on a number of pre-set variables. You can quickly create a new playlist
- based on a specific artist, favorites or more.
- </p>
+ <p>Les llistes de reproducció intel·ligents us permeten generar ràpidament una llista de reproducció dinàmica basada en un nombre de variables predeterminat. Podeu crear ràpidament una llista de reproducció nova basant-vos en un artista específic, en els preferits o d'altres.</p>
- <p>To create a new Smart Playlist, from the menu choose <guiseq>
- <gui>Media</gui><gui>New Smart Playlist</gui></guiseq>. You will be
- presented with a dialog to create a new Smart Playlist. Enter
- the name of your playlist and then choose the criteria your playlist
- should be based on. You can choose from any field included in the song's
- meatadata, such as Album, Artist or Year. Choose the criteria and then
- choose from one of the following:
- </p>
+ <p>Per a crear una la llista intel·ligent nova, des del menú escolliu <guiseq>Elements multimèdia<gui/><gui>Llista de reproducció intel·ligent nova</gui></guiseq>. Es mostrarà una capsa de diàleg per a crear una llista de reproducció intel·ligent nova. Introduïu el nom de la llista de reproducció i llavors escolliu el criteri en que es basarà la llista de reproducció. Podeu escollir qualsevol camp inclòs a les metadades de la cançó, com ara l'àlbum, l'artista, o l'any. Escolliu el criteri i llavors seleccioneu un dels següents:</p>
<list>
- <item><p>is</p></item>
- <item><p>is not</p></item>
- <item><p>less than</p></item>
- <item><p>more than</p></item>
- <item><p>at most</p></item>
- <item><p>at least</p></item>
+ <item><p>és</p></item>
+ <item><p>no és</p></item>
+ <item><p>menys que</p></item>
+ <item><p>més que</p></item>
+ <item><p>com a màxim</p></item>
+ <item><p>com a mínim</p></item>
</list>
- <p>You can also press the <gui>+</gui> button to add an addition query
- to the Smart Playlist. For example, you could create a smart playlist
- that includes all songs from 2010 that you rated 5 stars. To create this
- playlist you would choose:
- </p>
+ <p>Podeu també prémer el botó <gui>+</gui> i afegir una consulta addicional a la llista de reproducció intel·ligent. Per exemple, podeu crear una llista de reproducció intel·ligent que inclogui cançons del 2010 i que hageu valorat amb 5 estrelles. Per a crear aquesta llista de reproducció seleccionaríeu:</p>
<table frame="all" rules="rows" shade="rows">
<tr>
- <td><p><gui>Year</gui></p></td> <td><p><gui>is</gui></p> </td>
+ <td><p><gui>Any</gui></p></td> <td><p><gui>és</gui></p> </td>
<td><p><gui>2010</gui></p></td>
</tr>
<tr>
- <td><p><gui>Rating</gui></p></td> <td><p><gui>is</gui></p></td>
- <td><p><gui/>5 stars</p></td>
+ <td><p><gui>Valoració</gui></p></td> <td><p><gui>és</gui></p></td>
+ <td><p><gui/>5 estrelles</p></td>
</tr>
</table>
- <p>You can then optionally select how many songs are included by pressing
- the <gui>Limit</gui> to checkbox and choosing the number of songs to be
- included.
- </p>
+ <p>Llavors podeu opcionalment seleccionar quantes cançons s'inclouen pressionant <gui>Limita</gui> a la casella de selecció i seleccionant el nombre de cançons a incloure.</p>
<p>Banshee also includes smart playlists already created for
you. Press the <gui>Open in editor</gui> button to view how the playlist
@@ -126,18 +90,15 @@
</p>
<list>
- <title>Banshee Smart Playlists</title>
- <item><p>Favorites (Songs rated four and five stars)</p></item>
- <item><p>Recent Favorites (Songs listened to often in the past week)
- </p></item>
- <item><p>Recently Added (Songs imported within the last week</p></item>
- <item><p>Unheard (Songs that have not been played or skipped)</p></item>
- <item><p>Neglected Favorites (Favorites not played in over two months)
- </p></item>
- <item><p>700 MB of Favorites (A data CD worth of favorite songs)</p></item>
- <item><p>80 Minutes of Favorites (An audio CD worth of favorite songs)
- </p></item>
- <item><p>Unrated (Songs that haven't been rated)</p></item>
+ <title>Llistes de reproducció intel·ligents del Banshee</title>
+ <item><p>Preferits (cançons amb una valoració de quatre i cinc estrelles)</p></item>
+ <item><p>Preferits recents (cançons que es van escoltar freqüentment la setmana passada)</p></item>
+ <item><p>Afegits recentment (cançons importes durant l'última setmana)</p></item>
+ <item><p>No escoltats (cançons que no s'han reproduït o s'han omès)</p></item>
+ <item><p>Preferits abandonats (preferits que no s'han reproduït des de fa més de dos mesos)</p></item>
+ <item><p>700 MB de preferits (un CD de dades ple de cançons preferides)</p></item>
+ <item><p>80 minuts de preferits (un CD d'àudio ple de cançons preferides)</p></item>
+ <item><p>Sense valoració (cançons que no han estat valorades)</p></item>
</list>
</section>
diff --git a/help/ca/manage-tags.page b/help/ca/manage-tags.page
index 1f45e91..c724523 100644
--- a/help/ca/manage-tags.page
+++ b/help/ca/manage-tags.page
@@ -5,7 +5,7 @@
<link type="guide" xref="index#manage"/>
<link type="seealso" xref="coverart"/>
<link type="seealso" xref="playlists"/>
- <desc>Edit and change music tags and metadata.</desc>
+ <desc>Edició i modificació de les etiquetes i metadades de la música</desc>
<revision pkgversion="2.0" version="0.1" date="2010-05-09" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
@@ -20,11 +20,11 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Music Metadata</title>
+ <title>Metadades de la música</title>
<section id="metadata">
- <title>Music metadata</title>
+ <title>Metadades de la música</title>
<p>Digital music contains metadata that stores information in the
music file including the artist, album, year recorded, genre, and more.
@@ -45,7 +45,7 @@
<section id="editmetadata">
- <title>Edit Your Metadata</title>
+ <title>Edició de les metadades</title>
<p>You can change and edit the metadata of your songs. Select the song or
songs you want to update and hit the <key>E</key>, choose
@@ -58,21 +58,16 @@
change or update it. The default fields displayed include:</p>
<list>
- <item><p><gui>Track Title:</gui></p></item>
- <item><p><gui>Track Artist</gui></p></item>
- <item><p><gui>Album Title</gui></p></item>
- <item><p><gui>Genre</gui></p></item>
- <item><p><gui>Track Number</gui></p></item>
- <item><p><gui>Disc Number</gui></p></item>
- <item><p><gui>Year</gui></p></item>
+ <item><p><gui>Títol de la cançó:</gui></p></item>
+ <item><p><gui>Artista de la cançó</gui></p></item>
+ <item><p><gui>Títol de l'àlbum</gui></p></item>
+ <item><p><gui>Gènere</gui></p></item>
+ <item><p><gui>Número de la cançó</gui></p></item>
+ <item><p><gui>Número del disc</gui></p></item>
+ <item><p><gui>Any</gui></p></item>
</list>
- <p>Update the song's information. If you have selected multiple songs to
- edit press the right arrow icon to the right of the <gui>Track Title</gui>
- field or press the <gui>Forward</gui> button at the bottom of the dialog
- when finished with each song. When you have completed editing all metadata,
- press <gui>Save</gui>.
- </p>
+ <p>Actualitzeu la informació de la cançó. Si heu escollit múltiples cançons per a editar premeu la icona de la fletxa dreta a la dreta del camp <gui>Títol de la cançó</gui> o premeu el botó <gui>Endavant</gui> a la part superior de la capsa de diàleg quan hageu finalitzat amb cada cançó. Un cop hageu completat l'edició de totes les metadades, premeu <gui>Desa</gui>.</p>
</section>
diff --git a/help/ca/play-queue.page b/help/ca/play-queue.page
index 0d39051..ed2a800 100644
--- a/help/ca/play-queue.page
+++ b/help/ca/play-queue.page
@@ -4,7 +4,7 @@
<info>
<link type="guide" xref="index#media"/>
<link type="seealso" xref="play"/>
- <desc>Add media to your play queue.</desc>
+ <desc>Afegiu elements multimèdia a la cua de reproducció.</desc>
<revision pkgversion="1.6" version="0.1" date="2010-05-26" status="draft"/>
<credit type="author">
<name>Paul Cutler</name>
@@ -13,71 +13,41 @@
<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
</info>
- <title>Play Queue</title>
+ <title>Cua de reproducció</title>
- <p>The <gui>Play Queue</gui> allows you to add music to play in a sequential
- order. You can add many tracks to let you listen to hours of music non-stop.
- You can add individual tracks or entire albums, and sort or re-order them.</p>
+ <p>La <gui>cua de reproducció</gui> us permet afegir música per reproduir en ordre seqüencial. Podeu afegir moltes cançons, el que us permetrà escoltar hores de música sense parar. Podeu afegir cançons individuals o àlbums sencers, i ordenar-los després.</p>
<section id="addqueue">
- <title>Add Music to the Play Queue</title>
+ <title>Afegiu música a la cua de reproducció</title>
- <p>From your music library, you will need to select the music tracks or albums
- you want to add to the play queue.
- </p>
+ <p>Des de la biblioteca de música, heu d'escollir les cançons o àlbums que voleu afegir a la llista de reproducció.</p>
- <p>To add an entire album to the Play Queue, using your mouse press and hold
- the album and drag the album over <gui>Play Queue</gui> in the far left
- window pane.
- </p>
+ <p>Per afegir un àlbum sencer a la llista de reproducció, utilitzeu el ratolí prement sobre l'àlbum i deixeu-lo anar sobre <gui>la cua de reproducció</gui> a la subfinestra de l'esquerra.</p>
- <p>You can add music tracks to the Play Queue individually or as a group.
- To add an individual file, drag and drop it over the <gui>Play Queue</gui>
- in the far left window pane, or right click the track and choose
- <gui>Add to Play Queue</gui>.
- </p>
+ <p>Podeu afegir cançons a la cua de reproducció individualment o en grup. Per a afegir un únic fitxer, arrossegueu i deixeu anar el fitxer sobre <gui>la cua de reproducció</gui> en la subfinestra de l'esquerra, o feu clic a la pista i escolliu <gui>Afegeix a la cua de reproducció</gui>.</p>
- <p>You can select multiple files by using your mouse and pressing
- <key>Control</key> and choosing each file with your mouse or
- select a range of files by
- pressing <key>Shift</key> twice to select that range of files. You can then
- drag and drop it over the <gui>Play Queue</gui>
- in the far left window pane or right click the tracks and choose
- <gui>Add to Play Queue</gui>.
- </p>
+ <p>Podeu escollir múltiples fitxer usant el ratolí i prement <key>Control</key> i escollint cada fitxer amb el ratolí o seleccionat un rang de fitxers prement la <key>tecla de majúscules</key> dos cops per seleccionar un rang de fitxers. Llavors podeu arrossegar i deixar anar sobre la <gui>qua de reproducció</gui> a la subfinestra de l'esquerra o fent clic amb el botó dret i escollint <gui>Afegeix a la cua de reproducció</gui>.</p>
</section>
<section id="reorderqueue">
- <title>Organize Your Play Queue</title>
+ <title>Organitzeu la cua de reproducció</title>
- <p>Your Play Queue is organized in the order of the tracks you added. The
- first tracks or albums you added to the queue will be the first to be played.
- You can re-order your Play Queue by using your mouse and dragging and
- dropping a track or group of tracks in the list. Choose the track(s) you wish
- to re-order with your mouse and release your mouse over the number or place
- in the list you wish those files to be in the queue.
- </p>
+ <p>La cua de reproducció s'organitza per l'ordre que s'afegeixen les cançons. Les primeres cançons o àlbums que afegiu a la cua seran els primers en ser reproduïts. Podeu tornar a ordenar la vostra cua de reproducció utilitzant el ratolí per arrossegar i deixar anar una cançó o cançons a la llista. Escolliu la cançó o cançons que voleu tornar a ordenar, i deixeu-les anar sobre el número o lloc que voleu que les cançons tinguin a la cua.</p>
</section>
<section id="removequeue">
- <title>Removing Tracks from the Play Queue</title>
+ <title>Suprimiu cançons de de la llista de reproducció</title>
- <p>You can remove an individual track, a group of tracks, or clear your entire
- play queue.
- </p>
+ <p>Podeu suprimir una cançó individual, un grup de cançons, o buidar la cua de reproducció completament.</p>
- <p>To remove an individual track or group of tracks, select the track
- with your mouse and then press <key>Delete</key>.
- </p>
+ <p>Per a suprimir una cançó o un grup de cançons, escolliu la cançó amb el ratolí i llavors premeu la <key>tecla de supressió</key>.</p>
- <p>To clear your entire Play Queue, press the <gui>Clear</gui> button in the
- upper right hand corner of the Play Queue.
- </p>
+ <p>Per buidar completament la cua de reproducció, premeu el botó <gui>Buida</gui> a la part superior dreta de la cua de reproducció.</p>
</section>
diff --git a/help/ca/play.page b/help/ca/play.page
index 4a4d819..81f7ff5 100644
--- a/help/ca/play.page
+++ b/help/ca/play.page
@@ -28,60 +28,40 @@
<p>Escolliu l'àlbum o cançó que desitgeu reproduir de la llista d'artistes, àlbums o utilitzeu la barra de cerca de la part superior dreta del Banshee.</p>
- <p>Per començar a reproduir una cançó, utilitzeu el ratolí fent doble clic al nom de la cançó, premeu la tecla <key>barra espaiadora</key>, o escolliu <guiseq><gui>Playback</gui><gui>Play</gui></guiseq> from the Banshee menu.</p>
+ <p>Per començar a reproduir una cançó, utilitzeu el ratolí fent doble clic al nom de la cançó, premeu la tecla <key>barra espaiadora</key>, o escolliu <guiseq><gui>Reprodueix</gui><gui>Reprodueix</gui></guiseq> des del menú del Banshee.</p>
- <p>Podeu començar a reproduir un àlbum escollint-lo al navegador d'àlbums i fent clic amb el ratolí al nom de la cançó, prement la tecla <key>barra espaiadora</key>, o seleccionant <guiseq><gui>Playback</gui><gui>Play</gui> guiseq> des del menú del Banshee.</guiseq></p>
+ <p>Podeu començar a reproduir un àlbum escollint-lo al navegador d'àlbums i fent clic amb el ratolí al nom de la cançó, prement la tecla <key>barra espaiadora</key>, o seleccionant <guiseq><gui>Reprodueix</gui><gui>Reprodueix</gui> </guiseq> des del menú del Banshee.</p>
- <p>To play all songs by one artist, choose the artist in the artist browser
- and press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui>
- <gui>Play</gui></guiseq> from the Banshee menu.
- </p>
+ <p>Per a reproduir totes les cançons d'un artista, escolliu l'artista al navegador d'artistes i premeu la <key>barra espaiadora</key>, o escolliu <guiseq><gui>Reprodueix</gui><gui>Reprodueix</gui> des del menú del Banshee.</guiseq></p>
- <p>Banshee also displays your Favorite albums (those you play the most),
- Recent Favorites, Recently Added and Unheard music. Choose the one
- you wish to listen to and you can play songs from each.
- </p>
+ <p>El Banshee també mostra els àlbums favorits (els que més reproduïu), els últims elements favorits, o els àlbums recentment afegits o sense escoltar. Escolliu l'àlbum que voleu escoltar i seleccioneu les cançons a reproduir.</p>
</section>
<section id="playvideo">
- <title>Reproducció d'un vídeo</title>
+ <title>Reproducció de vídeo</title>
- <p>Your imported videos are listed alphabetically. To play a video,
- choose the video you wish to play from the list and
- press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui>
- <gui>Play</gui></guiseq> from the Banshee menu.</p>
+ <p>Els vídeos importats es mostren alfabèticament. Per a reproduir un vídeo, escolliu de la llista el vídeo que voleu reproduir i premeu la <key>barra espaiadora</key>, o escolliu <guiseq><gui>Reprodueix</gui><gui>Reprodueix</gui></guiseq> des del menú del Banshee.</p>
- <p>Banshee also shows your Favorite videos (those you watch the most)
- and Unwatched videos. Choose one and you can play a video from the list.</p>
+ <p>El Banshee també mostra els vídeos favorits (els que més reproduïu) i els vídeos no reproduïts. Escolliu el vídeo que voleu reproduir de la llista.</p>
</section>
<section id="playpodcast">
<title>Reproducció d'un Podcast</title>
- <p>Podcasts shows you all Podcasts you're subscribed too, all Podcast
- shows available, and the Podcast browser lists all Podcasts in order of
- newest first.</p>
+ <p>Podcasts mostra tots els Podcasts als que esteu subscrits, tots els Podcasts disponibles. El navegador de Podcast mostra tots els Podcast ordenats pels més recents.</p>
- <p>To play a Podcast,
- choose the Podcast you wish to play from the list and
- press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui>
- <gui>Play</gui></guiseq> from the Banshee menu.</p>
+ <p>Per a reproduir un Podcast, escolliu de la llista el que voleu reproduir i premeu la <key>barra espaiadora</key>, o escolliu <guiseq><gui>Reprodueix</gui><gui>Reprodueix</gui></guiseq> des del menú del Banshee.</p>
</section>
<section id="playradio">
- <title>Play an internet radio station</title>
+ <title>Escolteu una emissora de ràdio Internet</title>
- <p>The Radio source shows you all internet radio stations you have added
- to Banshee alphabetically.
- </p>
+ <p>La fonts de ràdio mostra ordenades alfabèticament totes les emissores Internet que heu afegit al Banshee.</p>
- <p>To play an internet radio station,
- choose the radio station you wish to play from the list and
- press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui>
- <gui>Play</gui></guiseq> from the Banshee menu.</p>
+ <p>Per a reproduir una emissora de ràdio, escolliu de la llista l'emissora que voleu escoltar i premeu la <key>barra espaiadora</key>, o escolliu <guiseq><gui>Reprodueix</gui><gui>Reprodueix</gui></guiseq> des del menú del Banshee.</p>
</section>
diff --git a/help/ca/search.page b/help/ca/search.page
index cf2cfc6..7b3aa63 100644
--- a/help/ca/search.page
+++ b/help/ca/search.page
@@ -21,7 +21,7 @@
<title>Cercant a la biblioteca</title>
- <p>El Banshee disposa d'un llenguatge de cerca potent. Podeu cercar la biblioteca de forma ràpida i senzilla utilitzant termes de cerca bàsics o bé realitzant cerques detallades amb la terminologia de cerca avançada del Banshee.</p>
+ <p>El Banshee disposa d'un llenguatge de cerca potent. Podeu cercar a la biblioteca de forma ràpida i senzilla utilitzant termes de cerca bàsics o bé realitzant cerques detallades amb la terminologia de cerca avançada del Banshee.</p>
<p>Per a realitzar cerques dels vostres elements multimèdia al Banshee, premeu la tecla <key>S</key> o feu clic en la capsa <gui>Cerca</gui> a la part superior dreta de la vista biblioteca al Banshee.</p>
@@ -29,9 +29,9 @@
<section id="operators">
<title>Operadors bàsics</title>
- <p>Els operadors poden col·locar-se entre dues paraules de cerca o col·locar-se abans d'una paraula de cerca. L'operació per defecte és <gui>i</gui> i s'utilitza quan cap altre operador es emprat entre dos termes de cerca. Atès que és el predeterminat, no existeix l'operador I explícitament.</p>
+ <p>Els operadors poden col·locar-se entre dues paraules de cerca o col·locar-se abans d'una paraula de cerca. L'operació per defecte és <gui>AND</gui> i s'utilitza quan cap altre operador es emprat entre dos termes de cerca. Atès que és el predeterminat, l'operador AND no existeix explícitament.</p>
- <p>Altres operadors bàsics inclouen l'<gui>OR</gui> i el <gui>NOT</gui>. Junts, aquests tres operadors permeten consultes molt potents per ajudar-vos a cercar als elements multimèdia.</p>
+ <p>Altres operadors bàsics són l'<gui>OR</gui> i el <gui>NOT</gui>. Junts, aquests tres operadors permeten consultes molt potents per ajudar-vos a cercar als elements multimèdia.</p>
</section>
@@ -50,9 +50,7 @@
<td><p>O, o, <key>|</key>, <key>,</key></p></td> <td><p>Els resultats de la cerca seran les cançons que continguin els dos termes en qualsevol camp.</p></td>
</tr>
<tr>
- <td><p>NO, no,<key>-</key></p></td> <td><p>
- Do not display search results with any search term that follows the
- operator of NOT, not,<key>-</key>.</p></td>
+ <td><p>NO, no,<key>-</key></p></td> <td><p>Exclou dels resultats de la cerca qualsevol terme que aparegui després de l'operador NO, no, <key>-</key>.</p></td>
</tr>
</table>
@@ -64,7 +62,7 @@
<td><p><gui>Consulta</gui></p></td> <td><p><gui>Descripció</gui></p></td>
</tr>
<tr>
- <td><p>lluís llach</p></td> <td><p>Retorna com a resultat de la cerca qualsevol cançó que contingui <em>lluís</em>i <em>llach</em> (ambdós) en qualsevol dels camps.</p></td>
+ <td><p>lluís llach</p></td> <td><p>Retorna com a resultat de la cerca qualsevol cançó que contingui <em>lluís</em> i <em>llach</em> (ambdós) en qualsevol dels camps.</p></td>
</tr>
<tr>
<td><p>lluís, llach</p></td> <td><p>Retorna com a resultat de la cerca qualsevol cançó que contingui <em>lluís</em> o <em>llach</em> en qualsevol dels camps.</p></td>
diff --git a/help/ca/sync.page b/help/ca/sync.page
index bcefaba..a4bc06c 100644
--- a/help/ca/sync.page
+++ b/help/ca/sync.page
@@ -21,21 +21,13 @@
<title>Sincronització</title>
- <p>Banshee supports syncing your music to portable media players and
- smartphones. You can add specific music tracks, albums or playlist
- or allow Banshee to keep your music player in sync with your entire
- library. After your player is connected to your computer you can also
- play back the songs on your portable player in Banshee. When syncing
- music in a lossless format, such as FLAC, Banshee will automatically
- transcode your music for you to a lossy format such as Ogg Vorbis or MP3,
- if you have the correct codecs installed.
- </p>
+ <p>El Banshee permet la sincronització de música amb reproductors multimèdia portàtils i telèfons intel·ligents. Podeu afegir-hi cançons, àlbums, llistes de producció o permetre que el Banshee mantingui sincronitzada la biblioteca sencera. Després de que el reproductor es connecta a l'ordinador, podeu també reproduir cançons del vostre reproductor al Banshee. Quan sincronitzeu la música amb un format sense pèrdua, com ara el FLAC, el Banshee convertirà automàticament la música a un format amb pèrdua com l'Ogg Vorbis o l'MP3, si disposeu els còdecs necessaris insta·lats.</p>
<section id="devices">
<title>Compatibilitat amb dispositius</title>
- <p>El Banshee es compatible amb la majoria de reproductors de música moderns i telèfons intel·ligents amb les excepcions de l'iPhone, l'iPad i l'iPod Touch d'Apple.</p>
+ <p>El Banshee es compatible amb la majoria de reproductors de música portables moderns i telèfons intel·ligents amb les excepcions de l'iPhone, l'iPad i l'iPod Touch d'Apple.</p>
- <p>Quan connecteu un dispositiu, el Banshee el mostrarà al menú esquerre. Al pressionar la icona del dispositiu anireu a la pàgina inicial del dispositiu mostrant les preferències de sincronització.</p>
+ <p>Quan connecteu un dispositiu, el Banshee el mostrarà al menú esquerre. Al pressionar la icona del dispositiu anireu a la pàgina inicial del dispositiu mostrant-se les preferències de sincronització.</p>
</section>
@@ -58,12 +50,7 @@
</list>
<note style="warning">
- <p>If you choose to sync your entire library automatically with your
- portable media player make sure your portable media player has enough
- storage space. If your library is larger than the space on your
- portable media player, Banshee will sync media until your player is
- full and then stop.
- </p>
+ <p>Si escolliu sincronitzar la biblioteca sencera automàticament amb el reproductor multimèdia portàtil assegureu-vos de que el reproductor multimèdia té prou espai. Si la biblioteca és més gran que l'espai del que disposeu al reproductor multimèdia portàtil, el Banshee sincronitzarà els elements multimèdia fins que el reproductor estigui pel i llavors s'aturarà.</p>
</note>
<p>If you have created playlists or smart playlists in your music library,
@@ -111,7 +98,7 @@
</section>
<section id="pmp-play">
- <title>Reproducció de la música des del reproductor portable</title>
+ <title>Reproducció de la música des del reproductor de música portable</title>
<p>You can play music stored on your portable music player directly in
Banshee. Choose your player in the Banshee menu on the left and your
portable music player's library will be displayed. You can then play
@@ -119,7 +106,7 @@
</section>
<section id="pmp-delete">
- <title>Suprimeix la música des del reproductor portable</title>
+ <title>Suprimeix la música des del reproductor de música portable</title>
<p>To remove songs stored on your portable music player, choose your
player in Banshee to view its library. Then choose the tracks you would
like to remove and right click the tracks and choose "Delete" or from the
diff --git a/help/ca/ui.page b/help/ca/ui.page
index 016d77f..73752b2 100644
--- a/help/ca/ui.page
+++ b/help/ca/ui.page
@@ -4,7 +4,7 @@
<info>
<link type="guide" xref="index"/>
<revision pkgversion="2.0" version="0.1" date="2010-05-19" status="stub"/>
- <desc>Una perspectiva general de la interfície d'usuari del <app>Banshee's</app>.</desc>
+ <desc>Una perspectiva general de la interfície d'usuari del <app>Banshee</app>.</desc>
<credit type="author">
<name>Paul Cutler</name>
<email>pcutler at gnome.org</email>
@@ -44,11 +44,7 @@
<section id="nowplaying">
<title>Vista Reproducció ara</title>
- <p>Helpful when using Banshee in full screen mode, the Now Playing mode
- hides the library to give you a larger view of the music or video you're
- watching. When listening to music, the Now Playing view will show you
- the artist name, album and cover art if available. If you are watching
- a video, Banshee will display the video.</p>
+ <p>Quan utilitzeu el Banshee en mode de pantalla completa, el mode «Reproducció ara» amaga la biblioteca per tal d'obtenir més espai per a visualitzar la música o el vídeo que esteu reproduint. Quan escolteu música, el mode «Reproducció ara» us mostrarà el nom de l'artista, l'àlbum i la coberta si estan disponibles. Si esteu reproduint un vídeo, el Banshee us mostrarà el vídeo.</p>
<p>Per a què la Reproducció ara amagui l'interfície d'usuari del Banshee i utilitzi el mode a pantalla completa, podeu prémer <key>F</key>, el botó <gui>Pantalla completa</gui>a la part superior dreta del Banshee, o seleccionar <guiseq><gui>Pantalla completa<gui/>seq> per a iniciar el mode pantalla completa.</gui></guiseq></p>
diff --git a/help/de/add-radio.page b/help/de/add-radio.page
index 3379955..759f1b6 100644
--- a/help/de/add-radio.page
+++ b/help/de/add-radio.page
@@ -26,7 +26,11 @@
<section id="radiodescription">
<title>Was ist Internet-Radio?</title>
- <p>Internet-Radiostationen ähneln herkömmlichen Radiosendern. Sie ermöglichen Einzelpersonen oder Organisationen die Verbreitung von Musik live als Datenstrom über das Internet. Sie können den Datenstrom beispielsweise gleichzeitig mit der Aussendung gewöhnlicher Radiosender verbreiten, Amateuren den Betrieb ihres eigenen Radiosenders ermöglichen oder auch kommerziell mit Live-Moderatoren und sogar Werbespots betrieben werden.</p>
+ <p>Internet radio stations are similar to regular radio stations, allowing
+ an individual or organization to stream music live over the internet.
+ Internet radio stations can be a simultaneous stream of a regular radio station,
+ an amateur broadcasting their own station, or commercial
+ internet radio stations that include live DJs and even commercials.</p>
</section>
diff --git a/help/de/import.page b/help/de/import.page
index b1ef7e0..fd616c9 100644
--- a/help/de/import.page
+++ b/help/de/import.page
@@ -42,7 +42,10 @@
</item>
<item>
<title><gui>Videos aus dem Foto-Ordner</gui></title>
- <p>Viele Digitalkameras können kurze Videos aufnehmen, und Anwendungen zur Fotoverwaltung können diese Videos direkt in Ihren Foto-Ordner übertragen. Wählen Sie diese Option, um jegliche in Ihrem Foto-Ordner gespeicherten Videos zu importieren.</p>
+ <p>Many digital cameras can take short videos, and photo-management
+ applications often download these videos directly into your Photos
+ folder. Choose this option to import any videos that have been
+ stored in your Photos folder.</p>
</item>
</terms>
diff --git a/help/de/introduction.page b/help/de/introduction.page
index c42189a..ab1e1ad 100644
--- a/help/de/introduction.page
+++ b/help/de/introduction.page
@@ -20,7 +20,11 @@
<title>Einführung</title>
- <p><app>Banshee</app> ist ein Medien-Wiedergabeprogramm zum Abspielen Ihrer Musik und Videos sowie anderer Medien. Es unterstützt außerdem den Abgleich mit tragbaren Geräten, um Ihre Musik überall hin mitnehmen zu können.</p>
+ <p>
+ <app>Banshee</app> is a media player that allows you to play your music,
+ videos, and other media as well sync it with portable devices to take your media
+ on the go.
+ </p>
<p><app>Banshee</app> verfügt über Funktionsmerkmale zum Importieren von Medien, Verwalten von Metadaten und Wiedergeben Ihrer Musik und Videos.</p>
<p>Banshee hilft Ihnen auch beim Abgleich Ihrer Musik mit populären tragbaren Geräten, wie digitalen Audioplayern und Smartphones. Banshee unterstützt bekannte Geräte wie die meisten iPods, MP3-Spieler von Sandisk und Creative sowie auf Android basierende Smartphones.</p>
diff --git a/help/de/lastfm.page b/help/de/lastfm.page
index 85cd4a0..dba2273 100644
--- a/help/de/lastfm.page
+++ b/help/de/lastfm.page
@@ -21,7 +21,13 @@
<title>Last.fm</title>
- <p>Last.fm ist ein populärer Onlinedienst, der sowohl freie als auch zu bezahlende Versionen anbietet. Last.fm liefert Informationen über Künstler und Alben. Sobald Sie ein Benutzerprofil in Last.fm angelegt haben, können Sie frei Ihre gehörte Musik in Banshee verfolgen. Wenn Sie sich als zahlendes Mitglied registrieren, können Sie außerdem einen Musik-Datenstrom (Streaming) in verschiedenen Client-Programmen anhören, auch in Banshee. Last.fm bietet mehrere Kanäle für das Streaming an, zum Beispiel für Sie empfehlenswerte Musik, basierend auf Ihren Hörgewohnheiten, Ihren Favoriten und mehr.</p>
+ <p>Last.fm is a popular online service that offers both free and paid
+ versions. Last.fm offers information on music artists and albums and if you
+ create a user profile Last.fm allows you to track the music you listen to
+ in Banshee for free. If you subscribe as a paying member, you can also listen
+ to streaming music from Last.fm in various music clients, including Banshee.
+ Last.fm offers multiple channels to stream, including recommended music for
+ you based on your listening habits, your favorites and more.</p>
<section id="enable-lastfm">
<title>Last.fm aktivieren</title>
@@ -41,7 +47,16 @@
<title>Abspielen des Last.fm Internet-Radios</title>
<p>Last-fm-Radio ist frei für Bürger der USA, Großbritanniens und Deutschlands. Bürger anderer Staaten müssen für einen Premium-Zugang bezahlen, um mit Last.fm Radio hören zu können. Premium-Mitglieder in allen Ländern kommen auch in den Genuss von Premium-Radiofunktionen: Abspielen von Wiedergabelisten und Sendern, die Sie mögen oder mit entsprechenden Schlagworten markiert haben.</p>
- <p>Im Kontextmenü von Banshee an der linken Seite wird nun ein Last.fm-Abschnitt mit Ihren Last.fm-Sendern angezeigt. Sie benötigen eine aktive Internetverbindung, um Last.fm-Radio zu hören. Wählen Sie den gewünschten Radiosender aus, woraufhin Banshee eine Verbindung zu Last.fm aufbaut, um die Titel dieses Radiosenders zu übertragen. Klicken Sie auf den Knopf <gui>Wiedergabe</gui> in Banshee oder drücken Sie die <key>Leertaste</key>, um mit der Übertragung eines Last.fm-Radiosenders zu beginnen. Sie können auch auf den Knopf <gui>Weiter</gui> in Banshee klicken, auf der Tastatur <key>N</key> drücken oder <guiseq><gui>Wiedergabe</gui><gui>Weiter</gui></guiseq> wählen, um den nächsten Titel in Ihrer Radiosender-Warteschlange zu hören.</p>
+ <p>In Banshee's context menu on the left hand side, you will now have a
+ Last.fm section, including your Last.fm radio stations. You will need an
+ active internet connection to listen to Last.fm radio. Choose the radio
+ station you wish to listen to and Banshee will communicate with Last.fm
+ to populate songs for that radio station. Press the <gui>Play</gui> button
+ in Banshee or <key>Spacebar</key> to start streaming a Last.fm radio
+ station. You can also press the <gui>Next</gui> button in Banshee,
+ <key>N</key> or choose <guiseq><gui>Playback</gui><gui>Next</gui></guiseq>
+ to play the next song in your radio station queue.
+ </p>
</section>
diff --git a/help/de/manage-playlists.page b/help/de/manage-playlists.page
index 1320e91..cd7e601 100644
--- a/help/de/manage-playlists.page
+++ b/help/de/manage-playlists.page
@@ -26,7 +26,19 @@
<p>Eine gewöhnliche Wiedergabeliste ist eine Liste aus Titeln, die Sie selbst hinzugefügt haben und selbst verwalten. Sie erstellen Ihre eigene Titelliste aus Titeln Ihres Lieblingsinterpreten aus verschiedenen Alben, aus Ihren neuesten Lieblingsliedern oder eine Wiedergabeliste für Hintergrundmusik bei sportlichen Übungen.</p>
- <p>Zum Erstellen einer neuen Wiedergabeliste drücken Sie <keyseq><key>Strg</key><key>N</key></keyseq> oder wählen im Menü <guiseq><gui>Menü</gui><gui>Neue Wiedergabeliste</gui></guiseq>. Alternativ können Sie einfach den oder die Titel auswählen, die Sie zur Wiedergabeliste hinzufügen wollen. Klicken Sie anschließend mit der rechten Maustaste darauf und wählen Sie <guiseq><gui>Zur Wiedergabeliste hinzufügen</gui><gui>Neue Wiedergabeliste</gui></guiseq>. Sie können die Titel auch auswählen und mit der Maus in die linke Fensterleiste über <gui>Musik</gui> ziehen. Sobald sich der Mauszeiger über <gui>Musik</gui> befindet, erscheint eine neue Option <gui><em>Neue Wiedergabeliste</em></gui>. Lassen Sie die Maustaste los, um die Titel zur Wiedergabeliste hinzuzufügen. Sie können diesen Vorgang so lange wiederholen, bis Sie alle gewünschten Titel zur Wiedergabeliste hinzugefügt haben.</p>
+ <p>You can create a new playlist by pressing <keyseq><key>Control</key>
+ <key>N</key></keyseq>, from the menu choosing <guiseq><gui>Menu</gui>
+ <gui>New Playlist</gui></guiseq> or by selecing the track(s) you would like
+ to add to the playlist. Select the track(s), right click them, and choose
+ <guiseq><gui>Add to Playlist</gui><gui>New Playlist</gui></guiseq>.
+ You can also drag and drop them to a new playlist by selecting the track(s)
+ and dragging them to the left hand
+ window pane over <gui>Music</gui>. As you drag it over <gui>Music</gui>,
+ a new option <gui><em>New Playlist</em></gui> will appear and you can drop
+ the track(s) over <gui><em>New Playlist</em></gui> to add them to the
+ playlist. You can repeat this process until you have added all the tracks
+ you want in the playlist.
+ </p>
<p>Um Ihrer Wiedergabeliste einen selbstgewählten Namen zu geben, wählen Sie die Wiedergabeliste aus und klicken Sie dann mit der rechten Maustaste darauf. Wählen Sie anschließend <gui>Wiedergabeliste umbenennen</gui> im Kontextmenü und geben Sie den Namen Ihrer Wiedergabeliste ein.</p>
diff --git a/help/de/search.page b/help/de/search.page
index bc0f899..add7df0 100644
--- a/help/de/search.page
+++ b/help/de/search.page
@@ -25,7 +25,12 @@
<p>Um Ihre Medien in Banshee zu durchsuchen, drücken Sie die Taste <key>S</key> oder klicken Sie in das Feld <gui>Suchen</gui> in der oberen rechten Ecke der Bibliotheksansicht in Banshee.</p>
- <p>Eine Suchanfrage besteht aus zwei grundlegenden Begriffen, beispielsweise <em>dave matthews</em>. Nach Eingabe von <em>dave matthews</em> im Suchfeld durchsucht Banshee alle Metadaten wie Stücktitel, Albumtitel, Album-Interpret, Jahr usw. Jeder Titel, dessen Metadaten <em>dave</em> und <em>matthews</em> enthalten, wird ausgegeben. In den Suchbegriffen wird die Groß- und Kleinschreibung nicht berücksichtigt, <em>dave</em>, <em>Dave</em> und <em>DAVE</em> sind in der Suche gleichbedeutend.</p>
+ <p>A search query consists of some basic terms, for example,
+ <em>dave matthews</em>. By entering <em>dave matthews</em> in the search box,
+ Banshee will search all metatdata fields including Track Title, Album Title,
+ Album Artist, Year, etc. Any track whose metadata includes <em>dave</em>
+ and <em>matthews</em> will be returned. Search terms are case, meaning you don't have to capitalize. <em>dave</em>, <em>Dave</em>, and <em>DAVE</em>
+ all mean the same thing when searching.</p>
<section id="operators">
<title>Grundlegende Operatoren</title>
diff --git a/help/de/sort.page b/help/de/sort.page
index a257e15..6ca5a69 100644
--- a/help/de/sort.page
+++ b/help/de/sort.page
@@ -33,7 +33,12 @@
<section id="sorting">
<title>Sortieren der Spalten</title>
- <p>Sie können mit der Maus in eine beliebige Spalte in der Bibliotheksansicht klicken, um Ihre Bibliothek zu sortieren. Wenn Sie Ihre Musikbibliothek nach Interpreten sortieren wollen, klicken Sie in die Kopfzeile der Spalte <gui>Künstler</gui>, und Banshee sortiert diese Spalte alphabetisch nach dem Namen des Künstlers. Klicken Sie erneut in die Kopfzeile der Spalte <gui>Künstler</gui>, um die Sortierreihenfolge der Spalte umzukehren.</p>
+ <p>You can sort your library by using your mouse to click on any of the
+ columns displayed in library view. If you wish to sort your music library
+ by Artist, click the <gui>Artist</gui> column header and Banshee will
+ automatically sort that column alphabetically. Clicking the
+ <gui>Artist</gui> column again will sort the column in reverse alphabetical
+ order.</p>
</section>
</page>
diff --git a/help/el/add-radio.page b/help/el/add-radio.page
index 502cb44..6813f97 100644
--- a/help/el/add-radio.page
+++ b/help/el/add-radio.page
@@ -26,7 +26,11 @@
<section id="radiodescription">
<title>Τι είναι το διαδικτυακό ραδιόφωνο;</title>
- <p>Οι διαδικτυακοί ραδιοφωνικοί σταθμοί είναι παρόμοιοι με τους κανονικούς, επιτρέποντας σε ένα άτομο ή οργανισμό να μεταδώσει ζωντανά μουσική μέσω του διαδικτύου. Οι διαδικτυακοί ραδιοφωνικοί σταθμοί μπορεί να είναι μια ταυτόχρονη ροή ενός κανονικού ραδιοφωνικού σταθμού, ένας ερασιτέχνης που μεταδίδει το δικό του σταθμό ή εμπορικοί διαδικτυακοί σταθμοί με παραγωγούς, ζωντανό πρόγραμμα και διαφημίσεις.</p>
+ <p>Internet radio stations are similar to regular radio stations, allowing
+ an individual or organization to stream music live over the internet.
+ Internet radio stations can be a simultaneous stream of a regular radio station,
+ an amateur broadcasting their own station, or commercial
+ internet radio stations that include live DJs and even commercials.</p>
</section>
diff --git a/help/el/import.page b/help/el/import.page
index 7998fc6..887f598 100644
--- a/help/el/import.page
+++ b/help/el/import.page
@@ -42,7 +42,10 @@
</item>
<item>
<title><gui>Βίντεο από το φάκελο φωτογραφίες</gui></title>
- <p>Πολλές ψηφιακές κάμερες μπορούν να εγγράφουν μικρά βίντεο και οι εφαρμογές διαχείρισης φωτογραφιών συχνά μεταφορτώνουν αυτά τα βίντεο απευθείας στο φάκελό σας Φωτογραφίες. Επιλέξτε αυτή την επιλογή για να εισάγετε τυχόν βίντεο που έχουν αποθηκευτεί στο φάκελο Φωτογραφίες.</p>
+ <p>Many digital cameras can take short videos, and photo-management
+ applications often download these videos directly into your Photos
+ folder. Choose this option to import any videos that have been
+ stored in your Photos folder.</p>
</item>
</terms>
diff --git a/help/el/introduction.page b/help/el/introduction.page
index d060d79..a13c621 100644
--- a/help/el/introduction.page
+++ b/help/el/introduction.page
@@ -20,7 +20,11 @@
<title>Εισαγωγή</title>
- <p>Το <app>Banshee</app> είναι μια εφαρμογή αναπαραγωγής πολυμέσων που σας επιτρέπει να αναπαράγετε τη μουσική σας, τα βίντεό σας και άλλα πολυμέσα καθώς και να τα συγχρονίζετε με άλλες φορητές συσκευές για να τα έχετε μαζί σας.</p>
+ <p>
+ <app>Banshee</app> is a media player that allows you to play your music,
+ videos, and other media as well sync it with portable devices to take your media
+ on the go.
+ </p>
<p>Το <app>Banshee</app> περιλαμβάνει λειτουργίες εισαγωγής των πολυμέσων σας, διαχείρισης των μεταδεδομένων τους και αναπαραγωγής της μουσικής και των βίντεό σας.</p>
<p>Το Banshee σας βοηθά επίσης να συγχρονίσετε τη μουσική και τα βίντεό σας με δημοφιλείς φορητές συσκευές, όπως αναπαραγωγείς ψηφιακής μουσικής και έξυνπα κινητά. Το Banshee υποστηρίζει δημοφιλείς συσκευές περιλαμβανομένων των περισσότερων iPod, τους αναπαραγωγείς MP3 της Sandisk και της Creative και κινητά με λειτουργικό Android.</p>
diff --git a/help/el/lastfm.page b/help/el/lastfm.page
index 4a5cba8..6556252 100644
--- a/help/el/lastfm.page
+++ b/help/el/lastfm.page
@@ -21,7 +21,13 @@
<title>Last.fm</title>
- <p>Το Last.fm είναι μια δημοφιλής δικτυακή υπηρεσία που προσφέρει τόσο δωρεάν όσο και επί πληρωμή υπηρεσίες. Το Last.fm προσφέρει πληροφορίες για καλλιτέχνες της μουσικής και δίσκους και αν δημιουργήσετε ένα προφίλ χρήστη, το Last.fm σας επιτρέπει να παρακολουθείτε τη μουσική που ακούτε στο Banshee δωρεάν. Αν γίνετε επί πληρωμή συνδρομητής, μπορείτε επίσης να ακούτε ροές μουσικής από το Last.fm σε διάφορους πελάτες μουσικής, περιλαμβανομένου του Banshee. Το Last.fm προσφέρει πολλαπλά κανάλια για ροές, περιλαμβανομένης προτεινόμενης μουσικής για εσάς με βάση τις συνήθειες ακρόασής σας, τα αγαπημένα σας και άλλα.</p>
+ <p>Last.fm is a popular online service that offers both free and paid
+ versions. Last.fm offers information on music artists and albums and if you
+ create a user profile Last.fm allows you to track the music you listen to
+ in Banshee for free. If you subscribe as a paying member, you can also listen
+ to streaming music from Last.fm in various music clients, including Banshee.
+ Last.fm offers multiple channels to stream, including recommended music for
+ you based on your listening habits, your favorites and more.</p>
<section id="enable-lastfm">
<title>Ενεργοποίηση Last.fm</title>
@@ -41,7 +47,16 @@
<title>Ακούστε το ραδιόφωνο του Last.fm</title>
<p>Το ραδιόφωνο του Last.fm είναι δωρεάν για του κατοίκους των ΗΠΑ, του Ηνωμένου Βασιλείου και της Γερμανίας. Οι κάτοικοι άλλων χωρών πρέπει να πληρώσουν για ένα λογαριασμό του Last.fm για ακούσουν ραδιόφωνο. Τα επί πληρωμή μέλη, επίσης έχουν επιπλέον χαρακτηριστικά στο ραδιόφωνο: ακρόαση λιστών αναπαραγωγής και σταθμούς μουσικής που σας αρέσουν ή έχετε επισημάνει. </p>
- <p>Στο μενού περιεχομένου του Banshee, στην αριστερή πλευρά, θα έχετε τώρα μια ενότητα Last.fm, που περιλαμβάνει τους σταθμούς σας του Last.fm. Θα χρειαστείτε μια ενεργή σύνδεση διαδικτύου για να ακούσετε το ραδιόφωνο του Last.fm. Επιλέξτε το ραδιοφωνικό σταθμό που θέλετε να ακούσετε και το Banshee θα επικοινωνήσει με το Last.fm για να συμπληρώσει τραγούδια για αυτό το ραδιοφωνικό σταθμό. Πατήστε το κουμπί <gui>Αναπαραγωγή</gui> στο Banshee ή το <key>Spacebar</key> για να αρχίσετε τη ροή του ραδιοφωνικού σταθμού. Μπορείτε επίσης να πατήσετε το κουμπί <gui>Επόμενο</gui>, το <key>N</key> ή να επιλέξετε <guiseq><gui>Αναπαραγωγή</gui><gui>Επόμενο</gui></guiseq> για να αναπράγετε το επόμενο τραγούδι στη σειρά του ραδιοφωνικού σταθμού.</p>
+ <p>In Banshee's context menu on the left hand side, you will now have a
+ Last.fm section, including your Last.fm radio stations. You will need an
+ active internet connection to listen to Last.fm radio. Choose the radio
+ station you wish to listen to and Banshee will communicate with Last.fm
+ to populate songs for that radio station. Press the <gui>Play</gui> button
+ in Banshee or <key>Spacebar</key> to start streaming a Last.fm radio
+ station. You can also press the <gui>Next</gui> button in Banshee,
+ <key>N</key> or choose <guiseq><gui>Playback</gui><gui>Next</gui></guiseq>
+ to play the next song in your radio station queue.
+ </p>
</section>
diff --git a/help/el/manage-playlists.page b/help/el/manage-playlists.page
index 4c445c7..18c6245 100644
--- a/help/el/manage-playlists.page
+++ b/help/el/manage-playlists.page
@@ -26,7 +26,19 @@
<p>Μια κανονική λίστα αναπαραγωγής είναι μια λίστα τραγουδιών που έχετε προσθέσει και διαχειρίζεστε. Μπορεί να θέλετε να δημιουργήσετε τη δική σας λίστα τραγουδιών από τον αγαπημένο σας καλλιτέχνη από πολλαπλούς δίσκους ή μια λίστα με έντονο ρυθμό για να ακούτε όσο ασκείστε.</p>
- <p>Μπορείτε να δημιουργήσετε μια νέα λίστα αναπαραγωγής πατώντας <keyseq><key>Control</key><key>N</key></keyseq>, από το μενού επιλέγοντας <guiseq><gui>Μενού</gui><gui>Νέα λίστα αναπαραγωγής</gui></guiseq> ή επιλέγοντας τα κομμάτια που θέλετε να προσθέσετε στη λίστα αναπαραγωγής. Επιλέξτε τα κομμάτια, κάντε δεξί κλικ και επιλέξτε <guiseq><gui>Προσθήκη στη λίστα αναπαραγωγής</gui><gui>Νέα λίστα αναπαραγωγής</gui></guiseq>. Μπορείτε επίσης να σύρετε και να τα αφήσετε σε μια νέα λίστα αναπαραγωγής επιλέγοντας τα κομμάτια και σύροντάς τα στο αριστερό πλαίσιο πάνω από το <gui>Μουσική</gui>. Καθώς τα σύρετε πάνω από το <gui>Μουσική</gui>, θα εμφανισθεί μια νέα επιλογή <gui><em>Νέα λίστα αναπαραγωγής</em></gui> και μπορείτε να αφήσετε τα κομμάτια πάνω από αυτή για να προσθέσετε στη λίστα αναπαραγωγής. Μπορείτε να επαναλάβετε αυτή τη διαδικασία μέχρι να προσθέσετε όλα τα κομμάτια που θέλετε στη λίστα αναπαραγωγής.</p>
+ <p>You can create a new playlist by pressing <keyseq><key>Control</key>
+ <key>N</key></keyseq>, from the menu choosing <guiseq><gui>Menu</gui>
+ <gui>New Playlist</gui></guiseq> or by selecing the track(s) you would like
+ to add to the playlist. Select the track(s), right click them, and choose
+ <guiseq><gui>Add to Playlist</gui><gui>New Playlist</gui></guiseq>.
+ You can also drag and drop them to a new playlist by selecting the track(s)
+ and dragging them to the left hand
+ window pane over <gui>Music</gui>. As you drag it over <gui>Music</gui>,
+ a new option <gui><em>New Playlist</em></gui> will appear and you can drop
+ the track(s) over <gui><em>New Playlist</em></gui> to add them to the
+ playlist. You can repeat this process until you have added all the tracks
+ you want in the playlist.
+ </p>
<p>Για να δώσετε στη λίστα αναπαραγωγής όνομα, επιλέξτε τη, κάντε δεξί κλικ σε αυτή, πατήστε <gui>Μετονομασία λίστας αναπαραγωγής</gui> και εισάγετε το όνομα της λίστας.</p>
diff --git a/help/el/search.page b/help/el/search.page
index 386f651..d5088fd 100644
--- a/help/el/search.page
+++ b/help/el/search.page
@@ -25,7 +25,12 @@
<p>Για να εκτελέσετε μια αναζήτηση στη βιβλιοθήκη των μέσων σας στο Banshee, πατήστε το <key>S</key> ή κάντε κλικ στο πεδίο <gui>Αναζήτηση</gui> στην πάνω δεξιά γωνία της προβολής βιβλιοθήκης στο Banshee.</p>
- <p>Ένα ερώτημα αναζήτησης αποτελείται από μερικούς βασικούς όρους, παραδείγματος χάριν, <em>dave matthews</em>. Εισάγοντας <em>dave matthews</em> στο πεδίο αναζήτησης, το Banshee θα ψάξει σε όλα τα πεδία μεταδεδομένων, περιλαμβανομένων των Τίτλου κομματιού, Τίτλου δίσκου, Καλλιτέχνη δίσκου, Έτους, κλπ. Οποιοδήποτε κομμάτι του οποίου τα μεταδεδομένα περιλαμβάνουν το <em>dave</em> και το <em>matthews</em> θα εντοπισθεί. Οι όροι αναζήτησης δεν κάνουν διάκριση πεζών-κεφαλαίων, δηλαδή δεν χρειάζεται να χρησιμοποιήσετε κεφαλαία στην αρχή των λέξεων. Τα <em>dave</em>, <em>Dave</em>, και <em>DAVE</em> όλα σημαίνουν το ίδιο πράγμα κατά την αναζήτηση.</p>
+ <p>A search query consists of some basic terms, for example,
+ <em>dave matthews</em>. By entering <em>dave matthews</em> in the search box,
+ Banshee will search all metatdata fields including Track Title, Album Title,
+ Album Artist, Year, etc. Any track whose metadata includes <em>dave</em>
+ and <em>matthews</em> will be returned. Search terms are case, meaning you don't have to capitalize. <em>dave</em>, <em>Dave</em>, and <em>DAVE</em>
+ all mean the same thing when searching.</p>
<section id="operators">
<title>Βασικοί τελεστές</title>
diff --git a/help/el/sort.page b/help/el/sort.page
index 9a30ace..c03a112 100644
--- a/help/el/sort.page
+++ b/help/el/sort.page
@@ -33,7 +33,12 @@
<section id="sorting">
<title>Ταξινόμηση στηλών</title>
- <p>Μπορείτε να ταξινομήσετε τη βιβλιοθήκη σας κάνοντας κλικ με το ποντίκι σε οποιαδήποτε στήλη εμφανίζεται στην προβολή βιβλιοθήκης. Αν επιθυμείτε να ταξινομήσετε τη μουσική σας βιβλιοθήκη κατά καλλιτέχνη, κάντε κλικ στην επικεφαλίδα της στήλης <gui>Καλλιτέχνης</gui> και το Banshee αυτόματα θα την ταξινομήσει αλφαβητικά. Κάνοντας πάλι κλικ στη στήλη <gui>Καλλιτέχνης</gui> το Banshee θα την ταξινομήσει με αντίστροφη αλφαβητική σειρά.</p>
+ <p>You can sort your library by using your mouse to click on any of the
+ columns displayed in library view. If you wish to sort your music library
+ by Artist, click the <gui>Artist</gui> column header and Banshee will
+ automatically sort that column alphabetically. Clicking the
+ <gui>Artist</gui> column again will sort the column in reverse alphabetical
+ order.</p>
</section>
</page>
diff --git a/help/es/add-radio.page b/help/es/add-radio.page
index c37d63e..3e44382 100644
--- a/help/es/add-radio.page
+++ b/help/es/add-radio.page
@@ -29,7 +29,7 @@
<p>Internet radio stations are similar to regular radio stations, allowing
an individual or organization to stream music live over the internet.
Internet radio stations can be a simultaneous stream of a regular radio station,
- an amateur broadasting their own station, or commercial
+ an amateur broadcasting their own station, or commercial
internet radio stations that include live DJs and even commercials.</p>
</section>
diff --git a/help/es/import.page b/help/es/import.page
index dbe9f65..fa85bb0 100644
--- a/help/es/import.page
+++ b/help/es/import.page
@@ -45,7 +45,10 @@
</item>
<item>
<title><gui>Vídeos de la carpeta de Imágenes</gui></title>
- <p>Muchas cámaras digitales pueden tomar vídeos cortos, y las aplicaciones de gestión de fotografías a menudo descargan esos vídeos directamente en la carpeta de Imágenes. Elija esta opción para importar cualquier vídeo que se haya guardado en la carpeta de Imágenes.</p>
+ <p>Many digital cameras can take short videos, and photo-management
+ applications often download these videos directly into your Photos
+ folder. Choose this option to import any videos that have been
+ stored in your Photos folder.</p>
</item>
</terms>
diff --git a/help/es/introduction.page b/help/es/introduction.page
index ba0c6a3..91edbdf 100644
--- a/help/es/introduction.page
+++ b/help/es/introduction.page
@@ -24,7 +24,7 @@
<p>
<app>Banshee</app> is a media player that allows you to play your music,
- videos, and other media media as well sync it with portable devices to take your media
+ videos, and other media as well sync it with portable devices to take your media
on the go.
</p>
<p>
diff --git a/help/es/lastfm.page b/help/es/lastfm.page
index c21854e..c854f77 100644
--- a/help/es/lastfm.page
+++ b/help/es/lastfm.page
@@ -24,7 +24,7 @@
<p>Last.fm is a popular online service that offers both free and paid
versions. Last.fm offers information on music artists and albums and if you
create a user profile Last.fm allows you to track the music you listen to
- in Banshee for free. If you suscribe as a paying member, you can also listen
+ in Banshee for free. If you subscribe as a paying member, you can also listen
to streaming music from Last.fm in various music clients, including Banshee.
Last.fm offers multiple channels to stream, including recommended music for
you based on your listening habits, your favorites and more.</p>
@@ -75,8 +75,8 @@
music you've loved or tagged.
</p>
- <p>In Banshee's context menu onthe left hand side, you will now have a
- Last.fm section, including your Lat.fm radio stations. You will need an
+ <p>In Banshee's context menu on the left hand side, you will now have a
+ Last.fm section, including your Last.fm radio stations. You will need an
active internet connection to listen to Last.fm radio. Choose the radio
station you wish to listen to and Banshee will communicate with Last.fm
to populate songs for that radio station. Press the <gui>Play</gui> button
diff --git a/help/es/manage-playlists.page b/help/es/manage-playlists.page
index 03cfe34..2fc2479 100644
--- a/help/es/manage-playlists.page
+++ b/help/es/manage-playlists.page
@@ -42,7 +42,7 @@
<gui>New Playlist</gui></guiseq> or by selecing the track(s) you would like
to add to the playlist. Select the track(s), right click them, and choose
<guiseq><gui>Add to Playlist</gui><gui>New Playlist</gui></guiseq>.
- You can also drag and drop them to a new playlist by selcting the track(s)
+ You can also drag and drop them to a new playlist by selecting the track(s)
and dragging them to the left hand
window pane over <gui>Music</gui>. As you drag it over <gui>Music</gui>,
a new option <gui><em>New Playlist</em></gui> will appear and you can drop
diff --git a/help/es/search.page b/help/es/search.page
index ee13e9d..cee49db 100644
--- a/help/es/search.page
+++ b/help/es/search.page
@@ -34,7 +34,7 @@
<em>dave matthews</em>. By entering <em>dave matthews</em> in the search box,
Banshee will search all metatdata fields including Track Title, Album Title,
Album Artist, Year, etc. Any track whose metadata includes <em>dave</em>
- and <em>matthews</em> will be returned. Search terms are case, meaningyou don't have to capitalize. <em>dave</em>, <em>Dave</em>, and <em>DAVE</em>
+ and <em>matthews</em> will be returned. Search terms are case, meaning you don't have to capitalize. <em>dave</em>, <em>Dave</em>, and <em>DAVE</em>
all mean the same thing when searching.</p>
<section id="operators">
diff --git a/help/es/sort.page b/help/es/sort.page
index 0e53ff7..fd52e51 100644
--- a/help/es/sort.page
+++ b/help/es/sort.page
@@ -45,7 +45,7 @@
<p>You can sort your library by using your mouse to click on any of the
columns displayed in library view. If you wish to sort your music library
by Artist, click the <gui>Artist</gui> column header and Banshee will
- automically sort that column alphabetically. Clicking the
+ automatically sort that column alphabetically. Clicking the
<gui>Artist</gui> column again will sort the column in reverse alphabetical
order.</p>
</section>
diff --git a/help/fr/add-podcast.page b/help/fr/add-podcast.page
new file mode 100644
index 0000000..48928d7
--- /dev/null
+++ b/help/fr/add-podcast.page
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="add-podcast">
+
+ <info>
+ <link type="guide" xref="index#media"/>
+ <link type="seealso" xref="remove-media"/>
+ <link type="seealso" xref="add-radio"/>
+ <link type="seealso" xref="import"/>
+ <desc>Ajout, suppression et écoute de podcasts avec Banshee.</desc>
+ <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Podcasts</title>
+
+ <section id="podcastdescription">
+ <title>Un podcast, qu'est-ce que c'est ?</title>
+
+ <p>Les podcasts sont des programmes enregistrés, un peu comme ceux des radios, qui sont disponibles sur internet et auquels il est possible de s'abonner. Si vous souscrivez un abonnement avec Banshee, à chaque fois qu'un nouveau programme est rendu disponible, Banshee le télécharge automatiquement et vous permet de l'écouter.</p>
+
+ <p>Il y a des podcasts sur pratiquement tous les thèmes : musiques, films, Linux... Allez sur internet avec votre moteur de recherche favori et saisissez par exemple ces mots-clés « film podcast » et vous pourrez vous faire une idée du choix disponible.</p>
+
+ </section>
+
+ <section id="addpodcast">
+ <title>Ajout d'un podcast</title>
+
+ <p>Pour ajouter un podcast à Banshee, vous devez d'abord aller sur la page internet de ce podcast avec votre navigateur. Tous les podcasts possèdent un bouton ou un lien pour s'abonner. Copiez le lien avec la souris. La plupart des navigateurs vous permettent de <gui>Copier le lien</gui> d'un clic droit.</p>
+
+ <p>Dans Banshee, appuyez sur le bouton <gui>Ajouter un podcast</gui> dans le coin supérieur droite de la fenêtre, ou allez dans le menu <guiseq><gui>Média</gui><gui>Ajouter un podcast</gui></guiseq> ou enfin appuyez sur le raccourci <keyseq><key>Maj</key><key>Ctrl</key><key>F</key></keyseq>.</p>
+
+ <p>Banshee ouvre une boîte de dialogue vous proposant un menu déroulant pour télécharger un nouveau podcast avec les choix suivants :</p>
+
+ <list>
+ <item><p>Télécharger l'épisode le plus récent (ce sera automatiquement le dernier épisode disponible).</p></item>
+ <item><p>Télécharger tous les épisodes (ceci téléchargera tous les épisodes).</p></item>
+ <item><p>Me laisser choisir quels épisodes télécharger (vous pourrez choisir les épisodes que vous voulez télécharger).</p></item>
+ </list>
+
+ <p>Une fois que vous avez ajouté une source de podcast, Banshee affiche :</p>
+
+ <list>
+ <item><p><gui>Nom</gui> : titre de cet épisode</p></item>
+ <item><p><gui>Podcast</gui> : nom du podcast</p></item>
+ <item><p><gui>Publié</gui> : date de publication ou de mise à disposition de l'épisode</p></item>
+ </list>
+
+ </section>
+
+</page>
diff --git a/help/fr/add-radio.page b/help/fr/add-radio.page
new file mode 100644
index 0000000..05a4e50
--- /dev/null
+++ b/help/fr/add-radio.page
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="add-radio">
+
+ <info>
+ <link type="guide" xref="index#media"/>
+ <link type="seealso" xref="remove-media"/>
+ <link type="seealso" xref="add-podcasts"/>
+ <link type="seealso" xref="import"/>
+ <desc>Ajout, suppression et écoute de stations de radio internet avec Banshee.</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-20" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Radio internet</title>
+
+ <section id="radiodescription">
+ <title>Une radio internet, qu'est-ce que c'est ?</title>
+
+ <p>Les stations radio internet sont similaires aux autres stations historiques et permettent à un individu ou à un groupe d'écouter un flux musical en direct via l'internet. Elles peuvent tout à la fois diffuser un flux en provenance de stations historiques, de stations d'amateurs ou de stations commerciales y compris celles de DJs en direct ou d'autres commerces.</p>
+
+ </section>
+
+ <section id="addradio">
+
+ <title>Ajout d'une station de radio</title>
+
+ <p>Pour ajouter une station de radio internet à Banshee, appuyez sur le bouton <gui>Ajouter une station</gui> au haut à droite, ou allez dans le menu <guiseq><gui>Média</gui><gui>Ajouter une station</gui></guiseq>.</p>
+
+ <p>Sur la page Web de la station de radio internet, recopiez l'URL du flux dans votre navigateur. Avec la plupart des navigateurs, un clic droit sur le lien vous propose de <gui>Copier le lien</gui>.</p>
+
+
+ <p>Banshee ouvre une boîte de dialogue avec plusieurs champs et vous demande d'entrer le genre, le titre et l'URL de flux de la station de radio que vous souhaitez ajouter. Choisissez le <gui>Type de station</gui> dans le menu déroulant. Saisissez le nom de votre station dans le champ adéquat. D'un clic droit dans le champ <gui>URL du flux :</gui> choisissez <gui>copier</gui> ou appuyez sur <keyseq><key>Ctrl</key><key>V</key></keyseq>.</p>
+
+ <p>Vous pouvez aussi remplir les champs facultatifs <gui>Créateur de la station</gui>, <gui>Description</gui> et <gui>Note</gui>.</p>
+
+ <p>Pour terminer, n'oubliez pas d'<gui>Enregistrer</gui> votre nouvelle station dans Banshee.</p>
+
+ </section>
+
+</page>
diff --git a/help/fr/advanced.page b/help/fr/advanced.page
new file mode 100644
index 0000000..2128923
--- /dev/null
+++ b/help/fr/advanced.page
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="advanced">
+
+ <info>
+ <link type="guide" xref="index#advanced"/>
+ <desc>Obtention d'aide sur les options avancées.</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Options avancées et aide</title>
+
+ <section id="keyboard" style="2column">
+ <info>
+ <title type="link">Raccourcis claviers</title>
+ </info>
+ <title>Raccourcis claviers</title>
+ </section>
+
+</page>
diff --git a/help/fr/amazon.page b/help/fr/amazon.page
new file mode 100644
index 0000000..595831a
--- /dev/null
+++ b/help/fr/amazon.page
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="amazon">
+
+ <info>
+ <link type="guide" xref="index#extensions"/>
+ <link type="seealso" xref=""/>
+ <desc>Synchronisation et achat de musique depuis la boutique MP3 Amazon.</desc>
+ <revision pkgversion="1.6" version="0.1" date="2010-07-11" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Boutique MP3 Amazon</title>
+
+ <p>Avec Banshee, vous pouvez télécharger et importer de la musique depuis la boutique MP3 Amazon. Vous pouvez importer des fichiers de musique Amazon manuellement, les acheter dans votre navigateur internet, ou demander à Banshee de le faire. L'offre d'Amazon ne concerne que certains pays pour ce qui est des MP3, et selon votre pays, il se peut que vous ne puissiez pas acheter de musique en MP3 sur Amazon.</p>
+
+ <note style="important">
+ <p>Banshee utilise un code d'affiliation pour toute musique achetée sur Amazon. Toutes les sommes récoltées par le biais de ce code sont reversées à la fondation GNOME.</p>
+ </note>
+
+ <section id="amazon-browser">
+ <title>Achat de MP3 Amazon dans votre navigateur Web</title>
+
+ <p>La musique MP3 achetée sur le site Amazon peut être automatiquement téléchargée et importée dans Banshee. Banshee s'associe au fichier .amz qu'Amazon fournit pour les achats de MP3. Lors de votre achat sur Amazon, votre navigateur Web télécharge le fichier .amz, Banshee l'ouvre automatiquement, télécharge et importe la musique.</p>
+ </section>
+
+ <section id="amazon-banshee">
+ <title>Achat de MP3 sur Amazon avec Banshee</title>
+
+ <p>Vous pouvez aussi chercher des titres sur Amazon avec Banshee. Sélectionnez boutique MP3 Amazon dans le volet de gauche. Ceci téléchargera la bibliothèque de la boutique MP3 Amazon comme si vous étiez dans votre navigateur. Une fois identifié dans Amazon, faites votre choix et achetez votre musique d'un seul clic. Banshee se charge de télécharger et d'importer votre musique dans la bibliothèque.</p>
+ </section>
+
+ <section id="amazon-manual">
+ <title>Importation manuelle de MP3 d'Amazon</title>
+
+ <p>Quand vous achetez de la musique d'Amazon dans votre navigateur internet, un fichier portant l'extension .amz est téléchargé et enregistré sur votre disque dur. Pour importer cette musique manuellement depuis Amazon, allez dans le menu de Banshee <guiseq><gui>Média</gui><gui>Importer des médias</gui></guiseq> et sélectionnez le fichier *.amz à importer. Banshee ouvre ce fichier et se connecte à Amazon MP3 store pour démarrer le téléchargement.</p>
+
+ <note style="warning">
+ <p>Les fichiers .amz d'Amazon ont une durée de vie limitée. Si vous ne téléchargez pas rapidement votre musique, le fichier devient périmé et vous ne pouvez plus obtenir votre musique. Amazon n'indique pas la durée de validité de ses fichiers mais nous vous recommandons de télécharger et d'importer n'importe quel achat sur le site d'Amazon dans l'heure qui suit.</p>
+ </note>
+ </section>
+
+</page>
diff --git a/help/fr/emusic.page b/help/fr/emusic.page
new file mode 100644
index 0000000..75068d8
--- /dev/null
+++ b/help/fr/emusic.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="emusic-import">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc>Importation de musique achetée sur le site eMusic.</desc>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Importation de vos titres eMusic</title>
+
+</page>
diff --git a/help/fr/extensions.page b/help/fr/extensions.page
new file mode 100644
index 0000000..448a1c6
--- /dev/null
+++ b/help/fr/extensions.page
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="2column" id="extend">
+
+ <info>
+ <link type="guide" xref="index#extensions"/>
+ <desc>Ajout de nouvelles fonctionnalités à Banshee.</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Extensions de Banshee</title>
+
+ <section id="official" style="2column">
+ <info>
+ <title type="link">Extensions officielles de Banshee</title>
+ </info>
+ <title>Gestion des extensions de Banshee</title>
+ </section>
+
+ <section id="community" style="2column">
+ <info>
+ <title type="link">Extensions de la communauté pour Banshee</title>
+ </info>
+ <title>Ajout d'extensions développées par la communauté pour Banshee</title>
+ </section>
+
+
+</page>
diff --git a/help/fr/fr.po b/help/fr/fr.po
new file mode 100644
index 0000000..0f999bb
--- /dev/null
+++ b/help/fr/fr.po
@@ -0,0 +1,2137 @@
+# French translation for banshee.
+# Copyright (C) 2010 banshee's COPYRIGHT HOLDER
+# This file is distributed under the same license as the banshee package.
+# Alain LOJEWSKI <allomervan at gmail.com>, 2010
+# Bruno Brouard <annoa.b at gmail.com>, 2010
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: banshee master\n"
+"POT-Creation-Date: 2010-12-03 21:29+0000\n"
+"PO-Revision-Date: 2010-11-03 21:18+0000\n"
+"Last-Translator: Alain Lojewski <allomervan at gmail.com>\n"
+"Language-Team: GNOME French Team <gnomefr at traduc.org>\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"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/ui.page:29(None) C/introduction.page:45(None)
+msgid "@@image: 'figures/banshee.png'; md5=THIS FILE DOESN'T EXIST"
+msgstr "@@image: 'figures/banshee.png'; md5=THIS FILE DOESN'T EXIST"
+
+#: C/ui.page:8(desc)
+msgid "An overview of <app>Banshee's</app> user interface."
+msgstr "Un aperçu de l'interface utilisateur de <app>Banshee</app>."
+
+#: C/ui.page:12(name) C/sync.page:12(name) C/sort.page:12(name)
+#: C/search.page:12(name) C/play.page:12(name) C/play-queue.page:12(name)
+#: C/manage-tags.page:13(name) C/manage-playlists.page:13(name)
+#: C/manage-coverart.page:12(name) C/lastfm.page:12(name)
+#: C/keyboardshortcuts.page:10(name) C/introduction.page:12(name)
+#: C/index.page:9(name) C/import.page:11(name) C/extensions.page:11(name)
+#: C/amazon.page:12(name) C/advanced.page:11(name) C/add-radio.page:14(name)
+#: C/add-podcast.page:14(name)
+msgid "Paul Cutler"
+msgstr "Paul Cutler"
+
+#: C/ui.page:13(email) C/sync.page:13(email) C/sort.page:13(email)
+#: C/search.page:13(email) C/play.page:13(email) C/play-queue.page:13(email)
+#: C/manage-tags.page:14(email) C/manage-playlists.page:14(email)
+#: C/manage-coverart.page:13(email) C/lastfm.page:13(email)
+#: C/keyboardshortcuts.page:11(email) C/introduction.page:13(email)
+#: C/index.page:10(email) C/import.page:12(email) C/extensions.page:12(email)
+#: C/amazon.page:13(email) C/advanced.page:12(email)
+#: C/add-radio.page:15(email) C/add-podcast.page:15(email)
+msgid "pcutler at gnome.org"
+msgstr "pcutler at gnome.org"
+
+#: C/ui.page:24(title)
+msgid "Introduction to the Banshee User Interface"
+msgstr "Introduction à l'interface utilisateur de Banshee"
+
+#: C/ui.page:27(title) C/introduction.page:43(title)
+msgid "<gui>Banshee Media Player</gui> window"
+msgstr "Fenêtre du <gui>Lecteur multimédia Banshee</gui>"
+
+#: C/ui.page:28(app) C/introduction.page:44(app) C/index.page:21(title)
+msgid "Banshee Media Player"
+msgstr "Lecteur multimédia Banshee"
+
+#: C/ui.page:30(p) C/introduction.page:46(p)
+msgid "<app>Banshee</app> library interface"
+msgstr "Interface de la bibliothèque <app>Banshee</app>"
+
+#: C/ui.page:35(title)
+msgid "Sources"
+msgstr "Ressources"
+
+#: C/ui.page:36(p)
+msgid ""
+"Your music and video sources are shown on the left in Banshee. The sources "
+"give you quick access to your Play Queue, Music, Videos, Amazon, Last.fm, "
+"Podcasts and more."
+msgstr ""
+"Vos ressources musicales et vidéos apparaissent à gauche dans Banshee. Ces "
+"ressources permettent un accès rapide à vos files d'attente de lecture, "
+"musiques, vidéos, Amazon, Last.fm, podcasts et davantage encore."
+
+#: C/ui.page:42(p)
+msgid ""
+"The menu choices will change depending on the source you have chosen. For "
+"example, to use the menu to import a Podcast, you will need to choose the "
+"Podcast source. The menu option for importing a Podcast is not available "
+"when viewing the video or music library."
+msgstr ""
+"Les options du menu sont différentes selon le choix de votre ressource. Par "
+"exemple, pour accéder au menu d'importation de podcast, vous devez "
+"sélectionner la ressource Podcast. Si vous êtes déjà en train de parcourir "
+"vos bibliothèques de vidéo ou de musique, cette option du menu est "
+"inaccessible."
+
+#: C/ui.page:50(title)
+msgid "Library Browser"
+msgstr "L'explorateur de bibliothèque"
+
+#: C/ui.page:51(p)
+msgid ""
+"When you select a music or video source from Sources, Banshee will display "
+"your content in the Library browser. Depending on the source you choose, "
+"Banshee can display your music or video library, Podcast subscriptions or "
+"even the Amazon Music Store to allow you to buy music."
+msgstr ""
+"En sélectionnant une ressource de musique ou de vidéo parmi vos ressources, "
+"Banshee affiche le contenu correspondant dans l'explorateur de bibliothèque. "
+"En fonction du choix de la ressource, Banshee peut afficher vos "
+"bibliothèques musicales ou vidéos, vos abonnements à des podcasts et même la "
+"boutique de musique Amazon pour vous permettre d'acheter de la musique."
+
+#: C/ui.page:58(title)
+msgid "Now Playing View"
+msgstr "Affichage en mode Lecture en cours"
+
+#: C/ui.page:59(p)
+msgid ""
+"Helpful when using Banshee in full screen mode, the Now Playing mode hides "
+"the library to give you a larger view of the music or video you're watching. "
+"When listening to music, the Now Playing view will show you the artist name, "
+"album and cover art if available. If you are watching a video, Banshee will "
+"display the video."
+msgstr ""
+"Pratique lorsque vous utilisez Banshee en mode plein écran, le mode Lecture "
+"en cours masque la bibliothèque afin de vous offrir une vue optimale de la "
+"musique ou de la vidéo que vous regardez. Si vous écoutez de la musique, le "
+"mode Lecture en cours affiche le nom de l'artiste, de l'album et le "
+"graphisme de la pochette si disponible. Si vous regardez une vidéo, Banshee "
+"diffuse la vidéo."
+
+#: C/ui.page:65(p)
+msgid ""
+"To change Now Playing to hide the Banshee user interface and use the full "
+"screen mode, you can press the <key>F</key>, press the <gui>Fullscreen</gui> "
+"button in the upper right hand corner of Banshee, or choose <guiseq>View<gui/"
+">Fullscreen<gui/></guiseq> to start Fullscreen mode."
+msgstr ""
+"Pour passer du mode Lecture en cours au mode plein écran et cacher "
+"l'interface utilisateur de Banshee, vous pouvez appuyer sur la touche "
+"<key>F</key> ou cliquer sur le bouton <gui>Plein écran</gui> dans le coin "
+"supérieur droit ou sélectionner la case <gui>Plein écran</gui> du menu "
+"<guiseq><gui>Affichage</gui></guiseq>."
+
+#: C/ui.page:74(title)
+msgid "Library"
+msgstr "La bibliothèque"
+
+#: C/ui.page:75(p)
+msgid ""
+"The Library view in Banshee will change depending on the Source you have "
+"chosen. The Music Library will display cover art, artists in your library, "
+"and list of songs. The Podcast Library will display your Podcast "
+"subscriptions, podcasts that are downloaded or not downloaded, and all, new "
+"or old podcasts. Please see each Source's help page for detailed information "
+"on managing a source."
+msgstr ""
+"L'affichage de la bibliothèque dans Banshee est fonction de la ressource que "
+"vous avez sélectionnée. La bibliothèque musicale affiche les pochettes, les "
+"artistes et la liste des chansons disponibles. La bibliothèque des podcasts "
+"affiche vos abonnements en cours, les podcasts téléchargés ou non et tous "
+"les nouveaux ou anciens podcasts. Veuillez consulter chaque page d'aide "
+"correspondant à chacune des ressources possibles pour de plus amples "
+"informations sur chacune d'elle."
+
+#: C/sync.page:9(desc)
+msgid "Sync your media to a portable media player or smartphone."
+msgstr ""
+"Synchronisation de votre média avec un lecteur multimédia portable ou un "
+"smartphone."
+
+#: C/sync.page:24(title)
+msgid "Sync"
+msgstr "Synchronisation"
+
+#: C/sync.page:26(p)
+msgid ""
+"Banshee supports syncing your music to portable media players and "
+"smartphones. You can add specific music tracks, albums or playlist or allow "
+"Banshee to keep your music player in sync with your entire library. After "
+"your player is connected to your computer you can also play back the songs "
+"on your portable player in Banshee. When syncing music in a lossless format, "
+"such as FLAC, Banshee will automatically transcode your music for you to a "
+"lossy format such as Ogg Vorbis or MP3, if you have the correct codecs "
+"installed."
+msgstr ""
+"Banshee prend en charge la synchronisation de votre musique avec des "
+"lecteurs multimédia portables et des smartphones. Vous pouvez soit y ajouter "
+"certaines pistes, albums ou listes de lectures, soit autoriser Banshee à "
+"synchroniser votre baladeur avec toute votre bibliothèque. Après avoir "
+"connecté votre baladeur à votre ordinateur, vous pouvez aussi écouter les "
+"morceaux qui y sont stockés. Lorsque vous synchronisez de la musique dans un "
+"format sans pertes comme FLAC, Banshee compresse automatiquement vos "
+"morceaux en Ogg Vorbis ou MP3 si vous avez installé les codecs adéquats."
+
+#: C/sync.page:37(title)
+msgid "Device Support"
+msgstr "Compatibilité matérielle"
+
+#: C/sync.page:38(p)
+msgid ""
+"Banshee supports almost all modern portable music players and smartphones "
+"with the notable exception of the Apple iPhone, iPad and iPod Touch."
+msgstr ""
+"Banshee est compatible avec la plupart des lecteurs multimédia portables et "
+"smartphones modernes à l'exception notable des iPhone, iPad et iPodTouch "
+"Apple."
+
+#: C/sync.page:42(p)
+msgid ""
+"When you plug your device in, Banshee will display it in the left menu. "
+"Pressing the device icon will take you to your device home page in Banshee "
+"displaying your sync preferences."
+msgstr ""
+"Quand vous branchez votre matériel, Banshee affiche son icône dans la partie "
+"gauche du menu. Cliquez sur cette icône pour ouvrir la page d'accueil de ce "
+"matériel dans Banshee et afficher vos préférences de synchronisation."
+
+#: C/sync.page:50(title)
+msgid "Sync Your Music"
+msgstr "Synchronisation de votre musique"
+
+#: C/sync.page:51(p)
+msgid ""
+"You can choose to manage the media on your portable music by having Banshee "
+"automatically sync it or manage your music and media manually."
+msgstr ""
+"Vous avez le choix entre laisser Banshee synchroniser automatiquement votre "
+"musique, ou le faire manuellement."
+
+#: C/sync.page:56(p)
+msgid ""
+"Choose your device from the Banshee menu and then choose how you want to "
+"sync your media, including:"
+msgstr ""
+"Choisissez votre matériel dans le menu de Banshee et ensuite la façon de "
+"synchroniser vos média, parmi :"
+
+#: C/sync.page:60(p)
+msgid "Music"
+msgstr "la musique"
+
+#: C/sync.page:61(p)
+msgid "Audiobooks"
+msgstr "les livres audio"
+
+#: C/sync.page:62(p)
+msgid "Videos"
+msgstr "les vidéos"
+
+#: C/sync.page:63(p)
+msgid "Podcast"
+msgstr "les podcasts"
+
+#: C/sync.page:66(p)
+msgid "From the dropdown menu next to each of the media, choose from:"
+msgstr "À partir du menu déroulant de chacun des médias, choisissez entre :"
+
+#: C/sync.page:69(p)
+msgid "Manage manually"
+msgstr "gérer manuellement"
+
+#: C/sync.page:70(p)
+msgid "Sync entire library"
+msgstr "synchroniser toute la bibliothèque"
+
+#: C/sync.page:74(p)
+msgid ""
+"If you choose to sync your entire library automatically with your portable "
+"media player make sure your portable media player has enough storage space. "
+"If your library is larger than the space on your portable media player, "
+"Banshee will sync media until your player is full and then stop."
+msgstr ""
+"Si vous décidez de synchroniser automatiquement toute votre bibliothèque "
+"avec votre baladeur, assurez vous au préalable que celui-ci dispose de "
+"suffisamment de mémoire. Au cas où votre bibliothèque serait plus grande que "
+"l'espace mémoire disponible de votre lecteur, Banshee le synchronise jusqu'à "
+"ce qu'il soit plein puis s'arrête."
+
+#: C/sync.page:82(p)
+msgid ""
+"If you have created playlists or smart playlists in your music library, they "
+"will also be displayed as a sync option for Music. This can be helpful when "
+"creating smart playlists, as smart playlists will automatically update as "
+"new content is added based on the playlist rules, and Banshee will sync the "
+"new playlist to your device every time you plug it in."
+msgstr ""
+"Si vous avez créé des listes de lectures simples ou intelligentes dans votre "
+"bibliothèque musicale, elles sont aussi affichées comme options de "
+"synchronisation musicale. Ceci est très pratique lorsque vous créez des "
+"listes de lecture intelligentes car celles-ci se mettent automatiquement à "
+"jour, au fur et à mesure de vos ajouts, en fonction des règles de la liste "
+"de lecture. Banshee synchronise la nouvelle liste avec votre lecteur à "
+"chaque branchement."
+
+#: C/sync.page:89(p)
+msgid ""
+"Banshee will display the total hard drive space of your portable music "
+"player in a graph in the bottom center of Banshee. The graph will show you "
+"how much space is taken by audio files, video, other and free space. "
+"Directly below that Banshee will show you how many total items are stored on "
+"your portable music player, how many hours or days of listening that is "
+"equal to, and total space used."
+msgstr ""
+"Banshee affiche la totalité du contenu de la mémoire de votre baladeur sous "
+"forme d'un graphique situé au bas au centre. Ce graphique montre combien "
+"d'espace est actuellement utilisé respectivement par les fichiers audio, "
+"vidéo et le reste, ainsi que l'espace encore disponible. Juste en-dessous, "
+"Banshee vous indique le nombre total d'éléments actuellement stockés sur "
+"votre lecteur, le nombre de jours ou d'heures d'écoute que cela représente, "
+"ainsi que l'espace mémoire total utilisé."
+
+#: C/sync.page:100(title)
+msgid "Sync Your Entire Library"
+msgstr "Synchronisation de toute votre bibliothèque"
+
+#: C/sync.page:101(p)
+msgid ""
+"You can drag and drop media to your portable music player form Banshee. "
+"Select the file or files you want to copy to your portable media player and "
+"then press and hold your right mouse button and drag the file(s) to your "
+"portable media player icon in Banshee. This will copy the files to your "
+"device."
+msgstr ""
+"Avec Banshee, vous pouvez utiliser le glisser/copier vers votre baladeur. "
+"Sélectionnez le ou les fichiers que vous voulez copier sur votre baladeur et "
+"glissez-les avec la souris sur l'icône de votre lecteur de médias."
+
+#: C/sync.page:108(p)
+msgid ""
+"If your music library is encoded in a format that your portable media player "
+"does not support, such as OGG or FLAC, and you have the necessary codecs "
+"installed, Banshee can automatically transcode these files to MP3 when "
+"transferring to your portable media player. Check with your Linux "
+"distribution for the necessary codecs as it is outside the scope of this "
+"help and varies by distribution."
+msgstr ""
+"Si votre bibliothèque est encodée sous un format non compatible avec votre "
+"baladeur comme OGG ou FLAC et si vous avez installé les codecs adéquats, "
+"Banshee fait automatiquement la conversion en MP3 pendant le transfert de "
+"vos fichiers vers votre baladeur. Vérifiez la disponibilité des codecs "
+"nécessaires pour votre distribution, étant donné que ceci est en-dehors du "
+"contexte de ce guide et que cela dépend de la distribution utilisée."
+
+#: C/sync.page:117(p)
+msgid ""
+"You may need to eject your device to load the files correctly on your "
+"portable music player. To eject your device in Banshee, using your mouse "
+"right click the device in the Banshee menu and press <gui>Disconnect</gui>."
+msgstr ""
+"Vous pourriez être amené à retirer le volume pour transférer correctement "
+"des fichiers sur votre baladeur. Pour retirer le volume dans Banshee avec la "
+"souris, faites un clic droit sur son icône et choisissez <gui>Déconnecter</"
+"gui> dans le menu contextuel."
+
+#: C/sync.page:127(title)
+msgid "Play Music From Your Portable Music Player"
+msgstr "Diffusion de musique à partir de votre baladeur"
+
+#: C/sync.page:128(p)
+msgid ""
+"You can play music stored on your portable music player directly in Banshee. "
+"Choose your player in the Banshee menu on the left and your portable music "
+"player's library will be displayed. You can then play music in Banshee just "
+"as you would music in your own library."
+msgstr ""
+"Vous pouvez directement diffuser de la musique stockée sur votre baladeur "
+"avec Banshee. Cliquez sur votre baladeur dans le volet gauche de Banshee et "
+"le contenu de celui-ci s'affiche. Vous pouvez alors diffuser ce contenu "
+"comme vous le feriez à partir de votre propre bibliothèque."
+
+#: C/sync.page:135(title)
+msgid "Remove Music From your Portable Music Player"
+msgstr "Suppression de pistes de votre baladeur"
+
+#: C/sync.page:136(p)
+msgid ""
+"To remove songs stored on your portable music player, choose your player in "
+"Banshee to view its library. Then choose the tracks you would like to remove "
+"and right click the tracks and choose \"Delete\" or from the menu choose "
+"<guiseq><gui>Edit</gui><gui>Delete</gui></guiseq>."
+msgstr ""
+"Pour supprimer des morceaux de votre baladeur, cliquez sur celui-ci pour "
+"afficher son contenu, sélectionnez les pistes à supprimer, faites un clic "
+"droit et choisissez « Supprimer », ou à partir du menu, choisissez l'élément "
+"<guiseq><gui>Édition</gui><gui>Supprimer</gui></guiseq>."
+
+#: C/sync.page:142(p)
+msgid ""
+"Deleting files from your portable music will permanently remove the files "
+"and you will not be able to recover them."
+msgstr ""
+"La suppression de fichiers de votre baladeur est un acte irréversible et "
+"vous ne pourrez plus les récupérer."
+
+#: C/sort.page:9(desc)
+msgid "Sort your media and add additional columns."
+msgstr "Trie de vos médias et ajout de colonnes supplémentaires."
+
+#: C/sort.page:24(title)
+msgid "Sort your media"
+msgstr "Tri de vos médias"
+
+#: C/sort.page:28(title)
+msgid "Adding Columns"
+msgstr "Ajout de colonnes"
+
+#: C/sort.page:30(p)
+msgid ""
+"As your library grows, you may want to sort your library view to play search "
+"or view certain songs, artists, or albums."
+msgstr ""
+"Au fur et à mesure que votre bibliothèque s'étoffe, vous pourriez être amené "
+"à l'agencer de façon à retrouver ou visionner plus facilement certains "
+"titres, artistes ou albums."
+
+#: C/sort.page:34(p)
+msgid ""
+"You can add additional columns to the library view in <app>Banshee</app> to "
+"give you more information about the songs and also allow you to sort by. By "
+"default, Banshee displays columns for songs including <gui>Name</gui>, "
+"<gui>Artist</gui>, <gui>Album</gui> and <gui>Time</gui>. To add additional "
+"columns, using your mouse right click on any of the columns and Banshee will "
+"display all available column to choose from. Click the checkbox next to the "
+"name of the column you wish to add to the library view."
+msgstr ""
+"Vous pouvez ajouter des colonnes à l'affichage standard de la bibliothèque "
+"<app>Banshee</app> pour avoir plus d'informations disponibles sur les titres "
+"et aussi pouvoir effectuer un tri sélectif. Par défaut, Banshee affiche pour "
+"les morceaux les colonnes <gui>Nom</gui>, <gui>Artiste</gui>, <gui>Album</"
+"gui> et <gui>Durée</gui>. Pour ajouter d'autres colonnes, faites un clic "
+"droit sur l'en-tête de l'une d'entre elles et Banshee affiche les autres "
+"colonnes disponibles que vous pouvez sélectionner. Cochez la case de celle "
+"que vous voulez ajouter."
+
+#: C/sort.page:46(title)
+msgid "Sorting Columns"
+msgstr "Tri par colonnes"
+
+#: C/sort.page:47(p)
+msgid ""
+"You can sort your library by using your mouse to click on any of the columns "
+"displayed in library view. If you wish to sort your music library by Artist, "
+"click the <gui>Artist</gui> column header and Banshee will automatically "
+"sort that column alphabetically. Clicking the <gui>Artist</gui> column again "
+"will sort the column in reverse alphabetical order."
+msgstr ""
+"Vous pouvez trier votre bibliothèque d'un clic de souris sur n'importe "
+"quelle colonne affichée. Si vous souhaitez trier votre musique par artiste, "
+"cliquez sur l'en-tête de la colonne <gui>Artiste</gui> et Banshee trie "
+"automatiquement cette colonne par ordre alphabétique. Un second clic sur la "
+"même colonne affiche un tri alphabétique inverse."
+
+#: C/search.page:9(desc)
+msgid "Search your media and perfom basic queries."
+msgstr "Recherche parmi vos médias et réalisation de requêtes basiques."
+
+#: C/search.page:24(title)
+msgid "Searching your Banshee Library"
+msgstr "Recherche dans votre bibliothèque Banshee"
+
+#: C/search.page:26(p)
+msgid ""
+"Banshee features a powerful search language. You can search your library "
+"quickly and easily with basic search terms or perform detailed searches with "
+"Banshee's advanced search terminology."
+msgstr ""
+"Banshee est doté d'un langage de recherche performant. Vous pouvez soit "
+"initier une recherche rapide et facile à partir de mots-clés simples, soit "
+"lancer une recherche approfondie avec la terminologie avancée de Banshee."
+
+#: C/search.page:30(p)
+msgid ""
+"To perform a search of your media in Banshee, press the <key>S</key> or "
+"click the <gui>Search</gui> box in the upper right hand corner of the "
+"Library view in Banshee."
+msgstr ""
+"Pour effectuer une recherche de médias avec Banshee, appuyez sur la touche "
+"<key>S</key> ou cliquez dans la case <gui>Rechercher</gui> dans le coin "
+"supérieur droite de l'affichage de la bibliothèque."
+
+#: C/search.page:35(p)
+msgid ""
+"A search query consists of some basic terms, for example, <em>dave matthews</"
+"em>. By entering <em>dave matthews</em> in the search box, Banshee will "
+"search all metatdata fields including Track Title, Album Title, Album "
+"Artist, Year, etc. Any track whose metadata includes <em>dave</em> and "
+"<em>matthews</em> will be returned. Search terms are case, meaning you don't "
+"have to capitalize. <em>dave</em>, <em>Dave</em>, and <em>DAVE</em> all mean "
+"the same thing when searching."
+msgstr ""
+"Une recherche repose sur quelques mots-clés, par exemple <em>dave matthews</"
+"em>. En saisissant <em>dave matthews</em> dans le champ Rechercher, Banshee "
+"consulte toutes les métadonnées présentes comme le titre de la piste, le "
+"titre de l'album, le nom de l'artiste, l'année, etc. Chaque titre contenant "
+"les métadonnées <em>dave</em> et <em>matthews</em> est affiché. Les termes "
+"de recherche ne sont pas sensibles à la casse, et il est donc inutile de "
+"mettre des majuscules. Les termes <em>dave</em>, <em>Dave</em>, et <em>DAVE</"
+"em> signifient tous la même chose."
+
+#: C/search.page:43(title)
+msgid "Basic Operators"
+msgstr "Opérateurs de base"
+
+#: C/search.page:44(p)
+msgid ""
+"Operators can be placed between any two search words or placed before a "
+"search word. The default operation is <gui>AND</gui> and is used when no "
+"other operators are used between two search terms. Because it is the "
+"default, there is no explicit AND operator."
+msgstr ""
+"Des opérateurs peuvent être placés entre deux mots-clés ou devant un mot-"
+"clé. L'opérateur par défaut est <gui>AND</gui> (ET) et est utilisé quand il "
+"n'y en a pas d'autre opérateur entre deux mots. Comme c'est l'opérateur par "
+"défaut, il n'y a pas d'opérateur AND explicit."
+
+#: C/search.page:49(p)
+msgid ""
+"Other basic operators include <gui>OR</gui> and <gui>NOT</gui>. Together, "
+"these three operations can yield very powerful queries to help you search "
+"your media."
+msgstr ""
+"Les autres opérateurs de base sont <gui>OR</gui> et <gui>NOT</gui>. "
+"Utilisées conjointement, ces trois opérations permettent de faire des "
+"recherches très performantes pour vous aider à faire des recherches dans vos "
+"médias."
+
+#: C/search.page:56(title)
+msgid "Logical Operators and Examples"
+msgstr "Opérateurs logiques et exemples"
+
+#: C/search.page:57(p)
+msgid ""
+"The following is a list of logical operators and examples of the search "
+"results when searching using them."
+msgstr ""
+"Voici une liste d'opérateurs logiques et des exemples de résultats de "
+"recherches effectués avec eux."
+
+#: C/search.page:62(gui)
+msgid "Operator"
+msgstr "Opérateur"
+
+#: C/search.page:62(gui) C/search.page:84(gui)
+msgid "Description"
+msgstr "Description"
+
+#: C/search.page:65(p)
+msgid "<em>default</em>, <em>white space</em>"
+msgstr "<em>par défaut</em>, <em>espace</em>"
+
+#: C/search.page:65(p)
+msgid "Search for two terms with a space between the two words or terms."
+msgstr "Recherche les deux mots séparés par un espace entre les deux."
+
+#: C/search.page:69(p)
+msgid "OR, or, <key>|</key>, <key>,</key>"
+msgstr "OR, or, <key>|</key>, <key>,</key>"
+
+#: C/search.page:69(p)
+msgid "Search results will be two terms with either result in any field."
+msgstr ""
+"Les résultats de la recherche sont deux termes avec l'un ou l'autre résultat "
+"dans n'importe quel champ."
+
+#: C/search.page:73(p)
+msgid "NOT, not,<key>-</key>"
+msgstr "NOT, not, <key>-</key>"
+
+#: C/search.page:73(p)
+msgid ""
+"Do not display search results with any search term that follows the operator "
+"of NOT, not,<key>-</key>."
+msgstr ""
+"Ne pas afficher de résultats de recherche contenant un des termes de "
+"recherche qui suit NOT, not, <key>-</key>."
+
+#: C/search.page:80(p)
+msgid "Examples of logical operations include:"
+msgstr "Voici des exemples d'opérations logiques :"
+
+#: C/search.page:84(gui)
+msgid "Query"
+msgstr "Recherche"
+
+#: C/search.page:87(p)
+msgid "dave matthews"
+msgstr "dave matthews"
+
+#: C/search.page:87(p)
+msgid ""
+"Matches any fields in a track containing both <em>dave</em> and "
+"<em>matthews</em>."
+msgstr ""
+"Correspond à n'importe quel champ d'une piste contenant à la fois <em>dave</"
+"em> et <em>matthews</em>."
+
+#: C/search.page:92(p)
+msgid "dave, matthews"
+msgstr "dave, matthews"
+
+#: C/search.page:92(p) C/search.page:97(p) C/search.page:102(p)
+msgid ""
+"Matches any fields in a track containing both <em>dave</em> or <em>matthews</"
+"em>."
+msgstr ""
+"Correspond à n'importe quel champ d'une piste contenant <em>dave</em> ou "
+"<em>matthews</em>."
+
+#: C/search.page:97(p)
+msgid "dave or matthews"
+msgstr "dave or matthews"
+
+#: C/search.page:102(p)
+msgid "dave | matthews"
+msgstr "dave | matthews"
+
+#: C/search.page:107(p)
+msgid "-\"dave matthews\""
+msgstr "-\"dave matthews\""
+
+#: C/search.page:107(p)
+msgid ""
+"Displays all tracks whose fields do not containt <em>dave matthews</em>."
+msgstr ""
+"Affiche toutes les pistes dont les champs ne contiennent pas <em>dave "
+"matthews</em>."
+
+#: C/search.page:114(p)
+msgid ""
+"For more information on performing more complex search queries, see the "
+"<link xref=\"adv-search\"/> page."
+msgstr ""
+"Pour de plus amples informations sur la façon d'effectuer des recherches "
+"plus complexes, consultez la page <link xref=\"adv-search\"/>."
+
+#: C/rb-import.page:8(desc)
+msgid ""
+"Import music and categorizations from the <app>Rhythmbox</app> music player."
+msgstr ""
+"Importation de la musique et de sa classification à partir du lecteur "
+"multimédia <app>Rhythmbox</app>."
+
+#: C/rb-import.page:12(title)
+msgid "Import your <app>Rhythmbox</app> library"
+msgstr "Importation de votre bibliothèque <app>Rhythmbox</app>"
+
+#: C/play.page:9(desc)
+msgid "Play your videos and music files."
+msgstr "Lecture de vos vidéos et de vos fichiers musicaux."
+
+#: C/play.page:24(title)
+msgid "Play Your Media"
+msgstr "Lecture de vos médias"
+
+#: C/play.page:27(title)
+msgid "Play your music"
+msgstr "Lecture de votre musique"
+
+#: C/play.page:29(p)
+msgid ""
+"To play music in Banshee, choose the Music source. The music library will "
+"show you all artists in your music library, cover art for each album, and a "
+"list of all songs in your library."
+msgstr ""
+"Pour écouter de la musique avec Banshee, choisissez la ressource Musique. La "
+"bibliothèque musicale affiche tous les artistes qu'elle contient, la "
+"pochette de chaque album et la liste de toutes les chansons qu'elle contient."
+
+#: C/play.page:33(p)
+msgid ""
+"Choose the album or song you wish to play from the list of artists, albums "
+"or use the search bar in the upper right hand corner of Banshee."
+msgstr ""
+"Choisissez dans la liste d'artistes ou d'albums la chanson ou l'album que "
+"vous souhaitez écouter, ou faites une recherche dans le champ en haut à "
+"droite de Banshee."
+
+#: C/play.page:37(p)
+msgid ""
+"To start playing a song, use your mouse to double click the song name, press "
+"the <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui><gui>Play</"
+"gui></guiseq> from the Banshee menu."
+msgstr ""
+"Pour démarrer l'écoute d'une chanson, faites un double-clic sur son titre, "
+"appuyez sur la touche <key>Espace</key>, ou encore choisissez "
+"<guiseq><gui>Lecture</gui><gui>Lire</gui></guiseq> dans le menu de Banshee."
+
+#: C/play.page:42(p)
+msgid ""
+"You can also start playing an album by choosing the album in the album "
+"browser and pressing use your mouse to double click the song name, press the "
+"<key>Spacebar</key>, or choose <guiseq><gui>Playback</gui><gui>Play</gui></"
+"guiseq> from the Banshee menu."
+msgstr ""
+"Vous pouvez aussi démarrer l'écoute d'un album en le sélectionnant dans "
+"l'explorateur et en double-cliquant sur le titre voulu ou en appuyant sur la "
+"touche <key>Espace</key>, ou encore en choisissant <guiseq><gui>Lecture</"
+"gui><gui>Lire</gui></guiseq> dans le menu de Banshee."
+
+#: C/play.page:48(p)
+msgid ""
+"To play all songs by one artist, choose the artist in the artist browser and "
+"press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</"
+"gui><gui>Play</gui></guiseq> from the Banshee menu."
+msgstr ""
+"Pour écouter tous les titres d'un seul artiste, sélectionnez l'artiste dans "
+"le navigateur et appuyez sur la touche <key>Espace</key> ou choisissez "
+"<guiseq><gui>Lecture</gui><gui>Lire</gui></guiseq> dans le menu de Banshee."
+
+#: C/play.page:53(p)
+msgid ""
+"Banshee also displays your Favorite albums (those you play the most), Recent "
+"Favorites, Recently Added and Unheard music. Choose the one you wish to "
+"listen to and you can play songs from each."
+msgstr ""
+"Banshee affiche aussi vos albums favoris (ceux que vous écoutez le plus "
+"souvent), vos favoris récents, ceux non écoutés et ceux récemment ajoutés. "
+"Sélectionnez celui que vous voulez écouter et lisez les chansons de chacun "
+"d'eux."
+
+#: C/play.page:61(title)
+msgid "Play a video"
+msgstr "Lecture d'une vidéo"
+
+#: C/play.page:63(p)
+msgid ""
+"Your imported videos are listed alphabetically. To play a video, choose the "
+"video you wish to play from the list and press the <key>Spacebar</key>, or "
+"choose <guiseq><gui>Playback</gui><gui>Play</gui></guiseq> from the Banshee "
+"menu."
+msgstr ""
+"Vos vidéos importées sont listées dans l'ordre alphabétique. Pour en lancer "
+"une, sélectionnez-la dans la liste et appuyez sur la touche <key>Espace</"
+"key> ou choisissez <guiseq><gui>Lecture</gui><gui>Lire</gui></guiseq> dans "
+"le menu de Banshee."
+
+#: C/play.page:68(p)
+msgid ""
+"Banshee also shows your Favorite videos (those you watch the most) and "
+"Unwatched videos. Choose one and you can play a video from the list."
+msgstr ""
+"Banshee affiche aussi vos vidéos favorites (celles que vous regardez le plus "
+"souvent) et celles non regardées. Choisissez une catégorie et vous pourrez "
+"lancer une vidéo de la liste."
+
+#: C/play.page:74(title)
+msgid "Play a Podcast"
+msgstr "Lecture d'un podcast"
+
+#: C/play.page:76(p)
+msgid ""
+"Podcasts shows you all Podcasts you're subscribed too, all Podcast shows "
+"available, and the Podcast browser lists all Podcasts in order of newest "
+"first."
+msgstr ""
+"La ressource Podcasts affiche tous les podcasts auxquels vous êtes abonné, "
+"tous les podcasts disponibles et l'explorateur affiche la liste de tous les "
+"podcasts avec les plus récents en tête."
+
+#: C/play.page:80(p)
+msgid ""
+"To play a Podcast, choose the Podcast you wish to play from the list and "
+"press the <key>Spacebar</key>, or choose <guiseq><gui>Playback</"
+"gui><gui>Play</gui></guiseq> from the Banshee menu."
+msgstr ""
+"Pour lire un podcast, sélectionnez-le dans la liste et appuyez sur la touche "
+"<key>Espace</key> ou choisissez <guiseq><gui>Lecture</gui><gui>Lire</gui></"
+"guiseq> dans le menu de Banshee."
+
+#: C/play.page:88(title)
+msgid "Play an internet radio station"
+msgstr "Écoute d'une station de radio internet"
+
+#: C/play.page:90(p)
+msgid ""
+"The Radio source shows you all internet radio stations you have added to "
+"Banshee alphabetically."
+msgstr ""
+"La ressource Radio affiche dans l'ordre alphabétique toutes les stations "
+"radio internet que vous avez ajoutées à Banshee."
+
+#: C/play.page:94(p)
+msgid ""
+"To play an internet radio station, choose the radio station you wish to play "
+"from the list and press the <key>Spacebar</key>, or choose "
+"<guiseq><gui>Playback</gui><gui>Play</gui></guiseq> from the Banshee menu."
+msgstr ""
+"Pour écouter une station de radio internet, sélectionnez-la dans la liste et "
+"appuyez sur la touche <key>Espace</key> ou choisissez <guiseq><gui>Lecture</"
+"gui><gui>Lire</gui></guiseq> dans le menu de Banshee."
+
+#: C/play-queue.page:9(desc)
+msgid "Add media to your play queue."
+msgstr "Ajout de média à votre file d'attente de lecture."
+
+#: C/play-queue.page:18(title)
+msgid "Play Queue"
+msgstr "File d'attente de lecture"
+
+#: C/play-queue.page:20(p)
+msgid ""
+"The <gui>Play Queue</gui> allows you to add music to play in a sequential "
+"order. You can add many tracks to let you listen to hours of music non-stop. "
+"You can add individual tracks or entire albums, and sort or re-order them."
+msgstr ""
+"La <gui>file d'attente de lecture</gui> vous permet d'ajouter des morceaux à "
+"lire dans un ordre séquentiel. Vous pouvez y ajouter beaucoup de pistes pour "
+"écouter des heures de musique sans interruption. Vous pouvez y ajouter des "
+"pistes seules ou des albums entiers et les trier ou les réorganiser."
+
+#: C/play-queue.page:26(title)
+msgid "Add Music to the Play Queue"
+msgstr "Ajout de musique à la file d'attente de lecture"
+
+#: C/play-queue.page:28(p)
+msgid ""
+"From your music library, you will need to select the music tracks or albums "
+"you want to add to the play queue."
+msgstr ""
+"Sélectionnez dans votre bibliothèque les pistes ou les albums à ajouter à la "
+"file d'attente de lecture."
+
+#: C/play-queue.page:32(p)
+msgid ""
+"To add an entire album to the Play Queue, using your mouse press and hold "
+"the album and drag the album over <gui>Play Queue</gui> in the far left "
+"window pane."
+msgstr ""
+"Pour ajouter un album entier avec la souris, sélectionnez-le et glissez-le "
+"dans la <gui>File d'attente de lecture</gui> du volet de gauche."
+
+#: C/play-queue.page:37(p)
+msgid ""
+"You can add music tracks to the Play Queue individually or as a group. To "
+"add an individual file, drag and drop it over the <gui>Play Queue</gui> in "
+"the far left window pane, or right click the track and choose <gui>Add to "
+"Play Queue</gui>."
+msgstr ""
+"Vous pouvez ajouter des morceaux à la file d'attente de lecture un à un ou "
+"par paquets. Pour ajouter un titre, faites un glisser-déposer avec la souris "
+"dans la <gui>File d'attente de lecture</gui> du volet de gauche ou faites un "
+"clic droit et choisissez <gui>Ajouter à la file d'attente de lecture</gui> "
+"dans le menu contextuel."
+
+#: C/play-queue.page:43(p)
+msgid ""
+"You can select multiple files by using your mouse and pressing <key>Control</"
+"key> and choosing each file with your mouse or select a range of files by "
+"pressing <key>Shift</key> twice to select that range of files. You can then "
+"drag and drop it over the <gui>Play Queue</gui> in the far left window pane "
+"or right click the tracks and choose <gui>Add to Play Queue</gui>."
+msgstr ""
+"Vous pouvez ajouter plusieurs pistes en les sélectionnant une à une avec la "
+"souris tout en maintenant la touche <key>Ctrl</key> enfoncée, ou ajouter un "
+"intervalle de pistes en appuyant sur la touche <key>Maj</key> pour "
+"sélectionner cet ensemble. Faites alors un glisser-déposer de la sélection "
+"avec la souris dans la <gui>File d'attente de lecture</gui> du volet de "
+"gauche ou faites un clic droit et choisissez <gui>Ajouter à la file "
+"d'attente de lecture</gui> dans le menu contextuel."
+
+#: C/play-queue.page:56(title)
+msgid "Organize Your Play Queue"
+msgstr "Organisation de votre file d'attente de lecture"
+
+#: C/play-queue.page:58(p)
+msgid ""
+"Your Play Queue is organized in the order of the tracks you added. The first "
+"tracks or albums you added to the queue will be the first to be played. You "
+"can re-order your Play Queue by using your mouse and dragging and dropping a "
+"track or group of tracks in the list. Choose the track(s) you wish to re-"
+"order with your mouse and release your mouse over the number or place in the "
+"list you wish those files to be in the queue."
+msgstr ""
+"Votre file d'attente de lecture est classée dans l'ordre d'ajout des "
+"morceaux. Les premiers titres ou albums ajoutés à la liste sont les premiers "
+"lus. Vous pouvez modifier ce classement avec la souris en faisant un glisser-"
+"déposer d'un titre ou d'un ensemble de titres à l'intérieur de cette liste. "
+"Sélectionnez-le ou les titres que vous souhaitez déplacer et glissez-les "
+"avec la souris à la place ou au numéro de ligne choisi, puis relâchez la "
+"souris."
+
+#: C/play-queue.page:70(title)
+msgid "Removing Tracks from the Play Queue"
+msgstr "Suppression de titres de la file d'attente de lecture"
+
+#: C/play-queue.page:72(p)
+msgid ""
+"You can remove an individual track, a group of tracks, or clear your entire "
+"play queue."
+msgstr ""
+"Vous pouvez supprimer une piste, un ensemble de pistes ou vider entièrement "
+"la file d'attente de lecture."
+
+#: C/play-queue.page:76(p)
+msgid ""
+"To remove an individual track or group of tracks, select the track with your "
+"mouse and then press <key>Delete</key>."
+msgstr ""
+"Pour supprimer une piste précise ou un ensemble de pistes de la liste, "
+"sélectionnez-les avec la souris, puis appuyez sur la touche <key>Suppr</key>."
+
+#: C/play-queue.page:80(p)
+msgid ""
+"To clear your entire Play Queue, press the <gui>Clear</gui> button in the "
+"upper right hand corner of the Play Queue."
+msgstr ""
+"Pour vider entièrement la file d'attente de lecture, appuyez sur le bouton "
+"<gui>Effacer</gui> dans le coin supérieur droite de la fenêtre."
+
+#: C/manage-tags.page:10(desc)
+msgid "Edit and change music tags and metadata."
+msgstr ""
+"Édition et modification des étiquettes et métadonnées d'un fichier musical."
+
+#: C/manage-tags.page:25(title)
+msgid "Music Metadata"
+msgstr "Métadonnées d'un fichier musical"
+
+#: C/manage-tags.page:29(title)
+msgid "Music metadata"
+msgstr "Les métadonnées d'un fichier musical"
+
+#: C/manage-tags.page:31(p)
+msgid ""
+"Digital music contains metadata that stores information in the music file "
+"including the artist, album, year recorded, genre, and more. Almost all "
+"music purchased over the internet will have the metadata already embedded "
+"and if you import music from CDs, Banshee will include the metadata when "
+"ripping the CD if available. For more information on ripping CDs and "
+"including the metadata see the <link xref=\"import\"/>."
+msgstr ""
+"La musique numérique contient des métadonnées qui stockent des informations "
+"dans le fichier musical comme le nom de l'artiste, le titre de l'album, "
+"l'année d'enregistrement, le genre musical et davantage encore. Pratiquement "
+"toute musique achetée par le biais d'Internet possède ces métadonnées déjà "
+"présentes dans le fichier et si vous importez de la musique à partir d'un "
+"CD, Banshee se charge d'y inclure les métadonnées qui s'y trouvent pendant "
+"l'extraction du CD. Pour de plus amples informations sur la manière "
+"d'extraire un CD avec toutes ses métadonnées, consultez la section <link "
+"xref=\"import\"/>."
+
+#: C/manage-tags.page:39(p)
+msgid ""
+"Popular metadata formats are ID3v1 and ID3v2 for MP3 files and Vorbis "
+"comments for OGG Vorbis files."
+msgstr ""
+"Les formats les plus usuels de métadonnées sont ID3v1 et ID3v2 pour les "
+"fichiers MP3 et les commentaires Vorbis pour les fichiers OGG Vorbis."
+
+#: C/manage-tags.page:42(p)
+msgid ""
+"If you have imported songs that do not contain metadata, <app>Banshee</app> "
+"will display <gui>Unknown</gui> for most fields in the library."
+msgstr ""
+"Si vous importez des titres qui ne contiennent pas de métadonnées, Banshee "
+"affiche <gui>Unconnu</gui> dans la plupart des champs de la bibliothèque."
+
+#: C/manage-tags.page:50(title)
+msgid "Edit Your Metadata"
+msgstr "Correction de vos métadonnées"
+
+#: C/manage-tags.page:52(p)
+msgid ""
+"You can change and edit the metadata of your songs. Select the song or songs "
+"you want to update and hit the <key>E</key>, choose <guiseq><gui>Edit</"
+"gui><gui>Edit Track Information</gui></guiseq> from the menu, or use your "
+"mouse and right click on the files and select <gui>Edit Track Information</"
+"gui>."
+msgstr ""
+"Vous pouvez corriger ou modifier les métadonnées de vos chansons. "
+"Sélectionnez le ou les titres que vous souhaitez mettre à jour et appuyez "
+"sur la touche <key>E</key> ou choisissez dans le menu <guiseq><gui>Édition</"
+"gui><gui>Modifier les informations du morceaux</gui></guiseq> ou encore "
+"faites un clic droit sur le titre et choisissez <gui>Modifier les "
+"informations du morceau</gui> dans le menu contextuel."
+
+#: C/manage-tags.page:59(p)
+msgid ""
+"A dialog box will appear that shows the song's metadata and allow you to "
+"change or update it. The default fields displayed include:"
+msgstr ""
+"La boîte de dialogue qui apparaît, affiche les métadonnées du titre et vous "
+"permet de les modifier ou de les mettre à jour. Les champs affichés par "
+"défaut sont :"
+
+#: C/manage-tags.page:63(gui)
+msgid "Track Title:"
+msgstr "Titre du morceau"
+
+#: C/manage-tags.page:64(gui)
+msgid "Track Artist"
+msgstr "Artiste du morceau"
+
+#: C/manage-tags.page:65(gui)
+msgid "Album Title"
+msgstr "Titre de l'album"
+
+#: C/manage-tags.page:66(gui)
+msgid "Genre"
+msgstr "Genre"
+
+#: C/manage-tags.page:67(gui)
+msgid "Track Number"
+msgstr "Numéro de piste"
+
+#: C/manage-tags.page:68(gui)
+msgid "Disc Number"
+msgstr "Numéro du disque"
+
+#: C/manage-tags.page:69(gui) C/manage-playlists.page:109(gui)
+msgid "Year"
+msgstr "Année"
+
+#: C/manage-tags.page:72(p)
+msgid ""
+"Update the song's information. If you have selected multiple songs to edit "
+"press the right arrow icon to the right of the <gui>Track Title</gui> field "
+"or press the <gui>Forward</gui> button at the bottom of the dialog when "
+"finished with each song. When you have completed editing all metadata, press "
+"<gui>Save</gui>."
+msgstr ""
+"Mettez à jour les informations du morceau. Si vous avez sélectionné "
+"plusieurs titres à modifier, appuyez sur la flèche à droite du champ "
+"<gui>Titre du morceau</gui> ou appuyez sur le bouton <gui>Suivant</gui> au "
+"bas de la boîte de dialogue pour passer au suivant. Quand vous avez terminé "
+"de corriger toutes vos métadonnées, n'oubliez pas d'appuyer sur le bouton "
+"<gui>Enregistrer</gui>."
+
+#: C/manage-playlists.page:10(desc)
+msgid "Create and manage playlists."
+msgstr "Création et gestion des listes de lecture."
+
+#: C/manage-playlists.page:19(title)
+msgid "Playlists"
+msgstr "Listes de lecture"
+
+#: C/manage-playlists.page:21(p)
+msgid ""
+"Playlists allow you to create and save a list of music tracks to be played "
+"in a specific order. Playlists are convenient to create a list of your "
+"favorite songs or to split your library into smaller lists that are easy to "
+"browse through. Some portable media players even allow you to transfer the "
+"playlist so you can take it with you on the go."
+msgstr ""
+"Les listes de lecture vous permettent de créer et sauvegarder un ensemble de "
+"titres à écouter dans un certain ordre. Elles sont pratiques pour créer une "
+"liste de vos chansons favorites ou pour ranger votre bibliothèque en listes "
+"plus petites et plus faciles à consulter. Quelques marques de baladeurs "
+"acceptent même de lire ces listes de sorte que vous pouvez les emporter avec "
+"vous telles quelles."
+
+#: C/manage-playlists.page:28(p)
+msgid ""
+"Banshee supports normal playlists, which include songs you add to the "
+"playlist, as well as smart playlists. Smart Playlists are automatically "
+"generated playlists based on your listening habits, favorite music, or more."
+msgstr ""
+"Banshee prend en charge les listes de lecture standards, celles où vous "
+"ajoutez vous-même vos titres mais aussi les listes de lecture intelligentes. "
+"Ces dernières sont générées automatiquement à partir de vos habitudes "
+"d'écoute, de vos favoris ou autres."
+
+#: C/manage-playlists.page:34(title)
+msgid "Normal Playlists"
+msgstr "Listes de lecture standards"
+
+#: C/manage-playlists.page:36(p)
+msgid ""
+"A normal playlist is a list of songs that you add and manage. You might want "
+"to create your own list of songs by your favorite artist from multiple "
+"albums, your latest favorite songs, or an upbeat playlist to listen to while "
+"you exercise."
+msgstr ""
+"Une liste de lecture standard est une suite de morceaux que vous ajoutez et "
+"que vous gérez vous-même. Vous pourriez par exemple créer une liste de "
+"titres de votre artiste favori en piochant dans différents albums, faire une "
+"liste de vos derniers favoris, ou encore créer une liste rythmée pour vous "
+"accompagner pendant vos exercices physiques."
+
+#: C/manage-playlists.page:42(p)
+msgid ""
+"You can create a new playlist by pressing <keyseq><key>Control</key><key>N</"
+"key></keyseq>, from the menu choosing <guiseq><gui>Menu</gui><gui>New "
+"Playlist</gui></guiseq> or by selecing the track(s) you would like to add to "
+"the playlist. Select the track(s), right click them, and choose "
+"<guiseq><gui>Add to Playlist</gui><gui>New Playlist</gui></guiseq>. You can "
+"also drag and drop them to a new playlist by selecting the track(s) and "
+"dragging them to the left hand window pane over <gui>Music</gui>. As you "
+"drag it over <gui>Music</gui>, a new option <gui><em>New Playlist</em></gui> "
+"will appear and you can drop the track(s) over <gui><em>New Playlist</em></"
+"gui> to add them to the playlist. You can repeat this process until you have "
+"added all the tracks you want in the playlist."
+msgstr ""
+"Pour créer une nouvelle liste de lecture, vous pouvez soit presser la "
+"combinaison <keyseq><key>Control</key><key>N</key></keyseq>, soit choisir "
+"<guiseq><gui>Média</gui><gui>Nouvelle liste de lecture</gui></guiseq> dans "
+"le menu, ou encore sélectionner la ou les pistes que vous voulez ajouter et "
+"par un clic droit choisir <guiseq><gui>Ajouter à la liste de lecture</"
+"gui><gui>Nouvelle liste de lecture</gui></guiseq> dans le menu contextuel. "
+"Vous pouvez aussi faire glisser la ou les pistes avec la souris dans la "
+"fenêtre de gauche en passant au-dessus de <gui>Musique</gui>. Au passage, "
+"une option <gui><em>Nouvelle liste de lecture</em></gui> apparaîtra, et vous "
+"pourrez lâcher la ou les pistes dans cette <gui><em>Nouvelle liste de "
+"lecture</em></gui> pour les y ajouter. Il vous faudra répéter ce processus "
+"avec tous les titres que vous souhaitez y ajouter."
+
+#: C/manage-playlists.page:56(p)
+msgid ""
+"To give your playlist its own name, select the playlist and right click on "
+"the playlist and press <gui>Rename Playlist</gui> and enter the name of your "
+"playlist."
+msgstr ""
+"Pour nommer votre liste de lecture, faites un clic droit dessus, choisissez "
+"<gui>Renommer</gui> et saisissez le nom que vous souhaitez lui donner."
+
+#: C/manage-playlists.page:61(p)
+msgid ""
+"You can change the order of the playlist by dragging and dropping the song "
+"to the new position in the playlist. Songs can only be re-ordered in the "
+"playlist when none of the columns are sorted. To unsort a column, press the "
+"column until the up or down arrow is no longer showing and the column is "
+"blank and then re-order the playlist."
+msgstr ""
+"Vous pouvez modifier le classement de la liste en faisant glisser les titres "
+"avec la souris d'une ligne à une autre. Le classement ne peut être modifié "
+"que si aucune colonne n'a auparavant été triée. Pour annuler le tri dans une "
+"colonne, cliquez dans l'en-tête jusqu'à ce que la flèche haute ou basse "
+"disparaisse. Réorganisez ensuite la liste."
+
+#: C/manage-playlists.page:68(p)
+msgid ""
+"To remove a track from the playlist, select the track(s) you wish to remove. "
+"Press the <key>Delete</key>, from the menu choose <guiseq><gui>Edit</"
+"gui><gui>Remove from Playlist</gui></guiseq> or right click the track(s) "
+"with your mouse and press <gui>Remove from Playlist</gui>."
+msgstr ""
+"Pour supprimer un titre de la liste, sélectionnez-le et appuyez sur la "
+"touche <key>Suppr</key>, ou faites <guiseq><gui>Édition</gui><gui>Enlever de "
+"la liste de lecture</gui></guiseq> dans le menu, ou encore par un clic droit "
+"choisissez <gui>Supprimer de la liste</gui> dans le menu contextuel."
+
+#: C/manage-playlists.page:76(title)
+msgid "Smart Playlist"
+msgstr "Liste de lecture intelligente"
+
+#: C/manage-playlists.page:78(p)
+msgid ""
+"Smart Playlists allow you to quickly generate a dynamic playlist based on a "
+"number of pre-set variables. You can quickly create a new playlist based on "
+"a specific artist, favorites or more."
+msgstr ""
+"Les listes de lecture intelligentes vous permettent de générer rapidement "
+"une liste dynamique basée sur un certain nombre de variables pré-"
+"déterminées. Vous pouvez très vite créer une liste de lecture basée sur un "
+"nom d'artiste, sur vos favoris ou autres."
+
+#: C/manage-playlists.page:83(p)
+msgid ""
+"To create a new Smart Playlist, from the menu choose <guiseq><gui>Media</"
+"gui><gui>New Smart Playlist</gui></guiseq>. You will be presented with a "
+"dialog to create a new Smart Playlist. Enter the name of your playlist and "
+"then choose the criteria your playlist should be based on. You can choose "
+"from any field included in the song's meatadata, such as Album, Artist or "
+"Year. Choose the criteria and then choose from one of the following:"
+msgstr ""
+"Pour créer une nouvelle liste de lecture intelligente, allez dans le menu "
+"<guiseq><gui>Média</gui><gui>Nouvelle liste de lecture intelligente</gui></"
+"guiseq>. Une boîte de dialogue s'affiche pour créer une nouvelle liste de "
+"lecture intelligente. Saisissez le nom de la liste et ensuite choisissez les "
+"critères sur lesquels elle sera construite. Vos critères peuvent provenir de "
+"n'importe quel champ, y compris des métadonnées comme le titre de l'album, "
+"le nom de l'artiste ou l'année. Une fois les critères définis, vous devrez "
+"spécifier ceci :"
+
+#: C/manage-playlists.page:93(p) C/manage-playlists.page:109(gui)
+#: C/manage-playlists.page:113(gui)
+msgid "is"
+msgstr "est"
+
+#: C/manage-playlists.page:94(p)
+msgid "is not"
+msgstr "n'est pas"
+
+#: C/manage-playlists.page:95(p)
+msgid "less than"
+msgstr "moins de"
+
+#: C/manage-playlists.page:96(p)
+msgid "more than"
+msgstr "plus de"
+
+#: C/manage-playlists.page:97(p)
+msgid "at most"
+msgstr "au plus"
+
+#: C/manage-playlists.page:98(p)
+msgid "at least"
+msgstr "au moins"
+
+#: C/manage-playlists.page:101(p)
+msgid ""
+"You can also press the <gui>+</gui> button to add an addition query to the "
+"Smart Playlist. For example, you could create a smart playlist that includes "
+"all songs from 2010 that you rated 5 stars. To create this playlist you "
+"would choose:"
+msgstr ""
+"Vous pouvez aussi appuyer sur le bouton <gui>+</gui> pour ajouter une "
+"condition supplémentaire à la liste : par exemple, créer une liste de "
+"lecture intelligente avec tous les morceaux de 2010 auxquels vous avez "
+"attribué une note de cinq étoiles. Pour générer cette liste, il faut saisir :"
+
+#: C/manage-playlists.page:110(gui)
+msgid "2010"
+msgstr "2010"
+
+#: C/manage-playlists.page:113(gui)
+msgid "Rating"
+msgstr "Classement"
+
+#: C/manage-playlists.page:114(p)
+msgid "<gui/>5 stars"
+msgstr "<gui/>5 étoiles"
+
+#: C/manage-playlists.page:118(p)
+msgid ""
+"You can then optionally select how many songs are included by pressing the "
+"<gui>Limit</gui> to checkbox and choosing the number of songs to be included."
+msgstr ""
+"L'option supplémentaire <gui>Limiter à</gui> vous permet de choisir le "
+"nombre maximum de titres que vous voulez y mettre en cochant cette case."
+
+#: C/manage-playlists.page:123(p)
+msgid ""
+"Banshee also includes smart playlists already created for you. Press the "
+"<gui>Open in editor</gui> button to view how the playlist created was or to "
+"modify it. If you press <gui>Create and save</gui> the playlist will be "
+"automatically generated and saved for you. The following playlists are "
+"included:"
+msgstr ""
+"Dans Banshee, vous avez aussi des listes de lectures intelligentes "
+"prédéfinies. Sélectionnez-en une et appuyez sur le bouton <gui>Ouvrir dans "
+"l'éditeur</gui> pour visionner comment elle se présente ou pour la modifier "
+"à votre goût. Quand vous cliquez sur le bouton <gui>Créer et enregistrer</"
+"gui> la liste est automatiquement générée et sauvegardée. Voici les liste "
+"disponibles :"
+
+#: C/manage-playlists.page:131(title)
+msgid "Banshee Smart Playlists"
+msgstr "Listes de lecture intelligentes Banshee"
+
+#: C/manage-playlists.page:132(p)
+msgid "Favorites (Songs rated four and five stars)"
+msgstr "Favoris (morceaux notés quatre ou cinq étoiles)"
+
+#: C/manage-playlists.page:133(p)
+msgid "Recent Favorites (Songs listened to often in the past week)"
+msgstr "Favoris récents (morceaux fréquemment écoutés cette semaine)"
+
+#: C/manage-playlists.page:135(p)
+msgid "Recently Added (Songs imported within the last week"
+msgstr "Récemment ajoutés (morceaux importés cette semaine)"
+
+#: C/manage-playlists.page:136(p)
+msgid "Unheard (Songs that have not been played or skipped)"
+msgstr "Non écoutés (morceaux non écoutés ou ignorés)"
+
+#: C/manage-playlists.page:137(p)
+msgid "Neglected Favorites (Favorites not played in over two months)"
+msgstr "Favoris négligés (favoris non écoutés pendant les deux derniers mois)"
+
+#: C/manage-playlists.page:139(p)
+msgid "700 MB of Favorites (A data CD worth of favorite songs)"
+msgstr "700 Mio de favoris (un CD de données rempli de vos morceaux préférés)"
+
+#: C/manage-playlists.page:140(p)
+msgid "80 Minutes of Favorites (An audio CD worth of favorite songs)"
+msgstr "80 minutes de favoris (un CD audio rempli de vos morceaux préférés)"
+
+#: C/manage-playlists.page:142(p)
+msgid "Unrated (Songs that haven't been rated)"
+msgstr "Non notés (morceaux qui n'ont pas été notés)"
+
+#: C/manage-coverart.page:9(desc)
+msgid "Manage or change your albums cover art."
+msgstr "Gestion ou modification des pochettes de vos albums."
+
+#: C/manage-coverart.page:24(title)
+msgid "Cover art"
+msgstr "Pochette"
+
+#: C/lastfm.page:9(desc)
+msgid "Enable Last.fm, song reporting and Last.fm radio."
+msgstr ""
+"Activation de Last.fm, informations sur les titres et la radio Last.fm."
+
+#: C/lastfm.page:24(title)
+msgid "Last.fm"
+msgstr "Last.fm"
+
+#: C/lastfm.page:26(p)
+msgid ""
+"Last.fm is a popular online service that offers both free and paid versions. "
+"Last.fm offers information on music artists and albums and if you create a "
+"user profile Last.fm allows you to track the music you listen to in Banshee "
+"for free. If you subscribe as a paying member, you can also listen to "
+"streaming music from Last.fm in various music clients, including Banshee. "
+"Last.fm offers multiple channels to stream, including recommended music for "
+"you based on your listening habits, your favorites and more."
+msgstr ""
+"Last.fm est un service en ligne bien connu qui offre des versions gratuites "
+"ou payantes. Last.fm propose des informations sur des artistes ou des albums "
+"et si vous créez un profil Last.fm, vous pouvez surveiller gratuitement la "
+"musique que vous écoutez avec Banshee. Si vous ouvrez un compte payant en "
+"tant qu'adhérent, vous pouvez en plus écouter les diffusions musicales Last."
+"fm en continu à partir de plusieurs clients dont Banshee. Last.fm vous "
+"propose de nombreux canaux de diffusion, y compris ceux les mieux adaptés à "
+"vous, en se basant sur vos habitudes d'écoute, vos favoris ou d'autres "
+"critères."
+
+#: C/lastfm.page:35(title)
+msgid "Enable Last.fm"
+msgstr "Activation de Last.fm"
+
+#: C/lastfm.page:36(p)
+msgid ""
+"To get the most out of Last.fm, you will want to create a Last.fm profile. "
+"Visit <link href=\"http://www.last.fm/join\">http://www.last.fm/join</link> "
+"to create an account or choose <guiseq><gui>Edit</gui><gui>Preferences</"
+"gui></guiseq> from the Banshee menu. Then press the <gui>Source Specific</"
+"gui> tab and press the <gui>Source</gui> drop down menu and choose <gui>Last."
+"fm</gui> and select the <em>Sign up for Last.fm</em> link."
+msgstr ""
+"Pour obtenir le meilleur de Last.fm, il vous faut créer votre profil Last."
+"fm. Suivez ce lien <link href=\"http://www.last.fm/join\">http://www.last.fm/"
+"join</link> pour ouvrir un compte ou bien ouvrez le menu de Banshee "
+"<guiseq><gui>Édition</gui><gui>Préférences</gui></guiseq>, puis l'onglet "
+"<gui>Spécifique à la source</gui> ; dans le menu déroulant, choisissez "
+"<gui>Last.fm</gui> et cliquez sur le lien <em>S'inscrire sur Last.fm</em>."
+
+#: C/lastfm.page:45(p)
+msgid ""
+"To enable Banshee to report the songs you play on your computer to Last.fm, "
+"sign in to Last.fm in Banshee in the <gui>Source Specific</gui> preferences. "
+"Enter your username and press the <gui>Log in to Last.fm</gui> button. You "
+"will be directed to a Last.fm webpage in your browser to grant Banshee "
+"access. Press the <gui>Yes, allow access</gui> link in your browser and you "
+"will be redirected to a webpage that displays a message that Banshee now has "
+"access to Last.fm. Return to Banshee and press the <gui>Finish Logging In</"
+"gui> button to complete the process."
+msgstr ""
+"Pour permettre à Banshee de vous renseigner sur les morceaux diffusés sur "
+"votre ordinateur par Last.fm, vous devez vous inscrire sur Last.fm dans "
+"Banshee dans les préférences <gui>Spécifique à la source</gui>. Saisissez "
+"votre nom d'utilisateur et cliquez sur le bouton <gui>Se connecter à Last."
+"fm</gui>. Vous êtes alors dirigé vers une page Web de Last.fm dans votre "
+"navigateur pour y autoriser l'accès de Banshee. Cliquez sur le lien "
+"<gui>Autoriser l'accès</gui> dans votre navigateur et vous êtes redirigé sur "
+"une autre page qui vous confirme que Banshee a maintenant l'autorisation "
+"d'accéder à Last.fm. Retournez dans Banshee et fermez le processus par le "
+"bouton <gui>Terminer l'authentification</gui>."
+
+#: C/lastfm.page:58(title)
+msgid "Enable Last.fm Song Reporting"
+msgstr "Lancement du processus Last.fm de renseignements sur les titres"
+
+#: C/lastfm.page:59(p)
+msgid ""
+"After you have successfully linked Banshee to your Last.fm profile, to "
+"enable Banshee to report the songs to your Last.fm profile, in the "
+"<gui>Source Specific</gui> tab in Banshee's preferences, press the "
+"<gui>Enable Song Reporting</gui> checkbox. If you have an active internet "
+"connection, Banshee will now send Last.fm information regarding the songs "
+"you play. To view your play history, visit your profile on the Last.fm "
+"website. Last.fm will automatically update your music metadata if any of "
+"your artist, song title or album information is incorrect."
+msgstr ""
+"Après avoir réussi à connecter Banshee à votre profil Last.fm, cochez la "
+"case <gui>Activer l'informateur de morceau</gui> dans l'onglet "
+"<gui>Spécifique à la source</gui> des Préférences de Banshee. Si votre "
+"connexion internet est active, Banshee fourni maintenant des informations "
+"sur le morceau en cours d'écoute. L'historique de vos écoutes est "
+"consultable sur la page Web de votre profil Last.fm. Last.fm mettra "
+"automatiquement à jour les métadonnées de vos morceaux si des informations "
+"sur l'artiste, le titre ou l'album s'avéraient erronées."
+
+#: C/lastfm.page:72(title)
+msgid "Listen to Last.fm Radio"
+msgstr "Écoute de la radio web Last.fm"
+
+#: C/lastfm.page:73(p)
+msgid ""
+"Last.fm radio is free for residents of the United States, United Kingdom and "
+"Germany. Residents of other countries will have to pay for a premium account "
+"with Last.fm to listen to radio. Premium members, in all countries, also "
+"receive premium radio features: listening to playlists and stations of music "
+"you've loved or tagged."
+msgstr ""
+"La radio web Last.fm est gratuite pour les résidents des États-Unis, du "
+"Royaume-Uni et de l'Allemagne. Les habitants des autres pays doivent "
+"acquitter une redevance pour écouter cette radio. Les membres payants de "
+"tous pays auront aussi accès à certains privilèges comme écouter les listes "
+"de lecture et les radios musicales qu'ils ont aimées ou étiquetées."
+
+#: C/lastfm.page:80(p)
+msgid ""
+"In Banshee's context menu on the left hand side, you will now have a Last.fm "
+"section, including your Last.fm radio stations. You will need an active "
+"internet connection to listen to Last.fm radio. Choose the radio station you "
+"wish to listen to and Banshee will communicate with Last.fm to populate "
+"songs for that radio station. Press the <gui>Play</gui> button in Banshee or "
+"<key>Spacebar</key> to start streaming a Last.fm radio station. You can also "
+"press the <gui>Next</gui> button in Banshee, <key>N</key> or choose "
+"<guiseq><gui>Playback</gui><gui>Next</gui></guiseq> to play the next song in "
+"your radio station queue."
+msgstr ""
+"Dans la fenêtre gauche de Banshee est apparue une section Last.fm contenant "
+"vos stations radio Last.fm. Si vous disposez d'une connexion internet "
+"active, vous pouvez choisir une station et Banshee se connecte aux morceaux "
+"les plus populaires de celle-ci. Appuyez sur le bouton <gui>Lire</gui> ou "
+"sur la touche <key>Espace</key> pour démarrer l'écoute. Pour passer au "
+"morceau suivant dans la file d'attente de la radio, appuyez sur le bouton "
+"<gui>Suivant</gui> ou sur la touche <key>N</key>, ou encore choisissez le "
+"menu <guiseq><gui>Lecture</gui><gui>Suivant</gui></guiseq>."
+
+#: C/keyboardshortcuts.page:7(desc) C/advanced.page:27(title)
+#: C/advanced.page:29(title)
+msgid "Keyboard Shortcuts"
+msgstr "Raccourcis claviers"
+
+#: C/keyboardshortcuts.page:24(title)
+msgid "Control Banshee using Keyboard Shortcuts"
+msgstr "Navigation dans Banshee avec les raccourcis clavier"
+
+#: C/keyboardshortcuts.page:28(title)
+msgid "Playback Control"
+msgstr "Contrôle de la lecture"
+
+#: C/keyboardshortcuts.page:32(gui) C/keyboardshortcuts.page:53(gui)
+#: C/keyboardshortcuts.page:73(gui) C/keyboardshortcuts.page:90(gui)
+#: C/keyboardshortcuts.page:107(gui)
+msgid "Key"
+msgstr "Touche"
+
+#: C/keyboardshortcuts.page:32(gui) C/keyboardshortcuts.page:53(gui)
+#: C/keyboardshortcuts.page:73(gui) C/keyboardshortcuts.page:90(gui)
+#: C/keyboardshortcuts.page:107(gui)
+msgid "Action"
+msgstr "Action"
+
+#: C/keyboardshortcuts.page:35(p)
+msgid "Space Bar"
+msgstr "Espace"
+
+#: C/keyboardshortcuts.page:35(p)
+msgid "Play or Pause the current song"
+msgstr "Lecture ou mise en pause du titre en cours"
+
+#: C/keyboardshortcuts.page:38(p) C/keyboardshortcuts.page:76(key)
+msgid "N"
+msgstr "N"
+
+#: C/keyboardshortcuts.page:38(p)
+msgid "Play the next song"
+msgstr "Lecture du titre suivant"
+
+#: C/keyboardshortcuts.page:41(p)
+msgid "B"
+msgstr "B"
+
+#: C/keyboardshortcuts.page:41(p)
+msgid "Play the previous song"
+msgstr "Lecture du titre précédent"
+
+#: C/keyboardshortcuts.page:49(title) C/keyboardshortcuts.page:69(title)
+msgid "Library Interaction"
+msgstr "Interaction avec la bibliothèque"
+
+#: C/keyboardshortcuts.page:56(key) C/keyboardshortcuts.page:76(key)
+#: C/keyboardshortcuts.page:114(key) C/keyboardshortcuts.page:118(key)
+#: C/keyboardshortcuts.page:123(key) C/keyboardshortcuts.page:127(key)
+#: C/keyboardshortcuts.page:132(key) C/keyboardshortcuts.page:137(key)
+msgid "Control"
+msgstr "Ctrl"
+
+#: C/keyboardshortcuts.page:56(key) C/keyboardshortcuts.page:110(key)
+msgid "F"
+msgstr "F"
+
+#: C/keyboardshortcuts.page:56(p)
+msgid "Move the focus to the search box"
+msgstr "Déplacement du focus dans la boîte de la recherche"
+
+# BUG : only Ctrl + I ?
+#: C/keyboardshortcuts.page:60(p)
+msgid "<key>/</key>, <keyseq><key>Control</key><key>F</key></keyseq>"
+msgstr "<key>/</key>, <keyseq><key>Ctrl</key><key>I</key></keyseq>"
+
+#: C/keyboardshortcuts.page:61(p)
+msgid "Open import media dialog"
+msgstr "Ouverture de la boîte de dialogue d'importation de média"
+
+#: C/keyboardshortcuts.page:76(p)
+msgid "Create New Playlist"
+msgstr "Création d'une nouvelle liste de lecture"
+
+#: C/keyboardshortcuts.page:86(title) C/add-podcast.page:26(title)
+msgid "Podcasts"
+msgstr "Podcasts"
+
+#: C/keyboardshortcuts.page:93(key)
+msgid "Y"
+msgstr "Y"
+
+#: C/keyboardshortcuts.page:93(p)
+msgid "Mark the selected episodes as old"
+msgstr "Marquage des épisodes sélectionnés comme anciens"
+
+#: C/keyboardshortcuts.page:103(title)
+msgid "Interface"
+msgstr "Interface"
+
+#: C/keyboardshortcuts.page:110(p)
+msgid "Toggle full-screen mode"
+msgstr "Passage en mode plein écran"
+
+#: C/keyboardshortcuts.page:114(key) C/keyboardshortcuts.page:118(key)
+msgid "A"
+msgstr "A"
+
+#: C/keyboardshortcuts.page:114(p)
+msgid "Select all songs in playlist view"
+msgstr "Sélection de tous les titres de la liste de lecture"
+
+#: C/keyboardshortcuts.page:118(key)
+msgid "Shift"
+msgstr "Maj"
+
+#: C/keyboardshortcuts.page:119(p)
+msgid "Unselect all songs in playlist view"
+msgstr "Désélection de tous les titres de la liste de lecture"
+
+#: C/keyboardshortcuts.page:123(key)
+msgid "W"
+msgstr "W"
+
+#: C/keyboardshortcuts.page:123(p)
+msgid "Hide Banshee Window (Requires Notification Area Plug-in Enabled"
+msgstr ""
+"Masquage de la fenêtre de Banshee (nécessite que le plugin Icône de zone de "
+"notification soit activé)"
+
+#: C/keyboardshortcuts.page:127(key)
+msgid "Left Mouse Button"
+msgstr "bouton gauche de la souris"
+
+#: C/keyboardshortcuts.page:128(p)
+msgid "Play Previous Song (Requires Notification Area Plug-in Enabled"
+msgstr ""
+"Lecture du titre précédent (nécessite que le plugin Icône de zone de "
+"notification soit activé)"
+
+#: C/keyboardshortcuts.page:132(key)
+msgid "Right Mouse Button"
+msgstr "bouton droit de la souris"
+
+#: C/keyboardshortcuts.page:133(p)
+msgid "Play Next Song (Requires Notification Area Plug-in Enabled"
+msgstr ""
+"Lecture du titre suivant (nécessite que le plugin Icône de zone de "
+"notification soit activé)"
+
+#: C/keyboardshortcuts.page:137(key)
+msgid "Middle Mouse Button"
+msgstr "bouton central de la souris"
+
+#: C/keyboardshortcuts.page:138(p)
+msgid "Toggle Play / Pause (Requires Notification Area Plug-in Enabled"
+msgstr ""
+"Passage du mode lecture au mode pause (nécessite que le plugin Icône de zone "
+"de notification soit activé)"
+
+#: C/itunes-import.page:8(desc)
+msgid ""
+"Import music and categorizations from the <app>iTunes</app> media player."
+msgstr ""
+"Importation de la musique et de sa classification à partir du lecteur "
+"multimédia <app>iTunes</app>."
+
+#: C/itunes-import.page:12(title)
+msgid "Import your <app>iTunes</app> library"
+msgstr "Importation de votre bibliothèque <app>iTunes</app>"
+
+#: C/introduction.page:8(desc)
+msgid "Introduction to the <app>Banshee Media Player</app>."
+msgstr "Introduction au <app>Lecteur multimédia Banshee</app>."
+
+#: C/introduction.page:24(title)
+msgid "Introduction"
+msgstr "Premiers pas"
+
+#: C/introduction.page:26(p)
+msgid ""
+"<app>Banshee</app> is a media player that allows you to play your music, "
+"videos, and other media as well sync it with portable devices to take your "
+"media on the go."
+msgstr ""
+"<app>Banshee</app> est un lecteur multimédia qui lit vos musiques, vidéos ou "
+"autres et qui peut se synchroniser avec vos appareils portables pour "
+"emporter vos médias avec vous."
+
+#: C/introduction.page:31(p)
+msgid ""
+"<app>Banshee</app> includes features to import your media, manage its "
+"metadata, and play your music and videos."
+msgstr ""
+"<app>Banshee</app> possède des fonctions pour importer vos médias, gérer "
+"leurs métadonnées et lire vos musiques et vidéos."
+
+#: C/introduction.page:35(p)
+msgid ""
+"Banshee also helps you sync your music and videos to popular portable "
+"devices, such as digital audio players and smartphones. Banshee supports "
+"popular devices including most iPods, Sandisk and Creative MP3 players, and "
+"Android powered phones."
+msgstr ""
+"Banshee vous aide également à synchroniser vos musiques et vidéos avec la "
+"plupart des appareils portables comme les baladeurs numériques et les "
+"smartphones. Banshee prend en charge la plupart des lecteurs audio "
+"numériques comme beaucoup d'iPods, Sandisk, baladeurs MP3 Creative et "
+"téléphones Android."
+
+#: C/index.page:24(title)
+msgid "Add, Remove & Play"
+msgstr "Ajout, suppression et lecture"
+
+#: C/index.page:28(title)
+msgid "Manage & Sort"
+msgstr "Gestion et tri"
+
+#: C/index.page:32(title)
+msgid "Sync your media with a portable music player"
+msgstr "Synchronisation de vos médias avec un lecteur audio numérique"
+
+#: C/index.page:36(title)
+msgid "Add additional functionality to Banshee"
+msgstr "Ajout de nouvelles fonctionnalités à Banshee"
+
+#: C/index.page:40(title)
+msgid "Advanced options and help"
+msgstr "Options avancées et aide"
+
+#: C/index.page:44(title)
+msgid "Common Problems"
+msgstr "Problèmes communs"
+
+#: C/import.page:8(desc)
+msgid "Add music and videos from your computer to your Banshee library."
+msgstr ""
+"Transfert de musiques et vidéos de votre ordinateur vers la bibliothèque de "
+"Banshee."
+
+#: C/import.page:15(name)
+msgid "Shaun McCance"
+msgstr "Shaun McCance"
+
+#: C/import.page:16(email)
+msgid "shaunm at gnome.org"
+msgstr "shaunm at gnome.org"
+
+#: C/import.page:21(title)
+msgid "Import music & videos"
+msgstr "Importation de musique et de vidéos"
+
+#: C/import.page:23(p)
+msgid ""
+"You can import music and videos stored on your computer into Banshee. "
+"Imported files appear in your sources and can be edited and managed like any "
+"other media in Banshee."
+msgstr ""
+"Vous pouvez importer de la musique et des vidéos de votre ordinateur vers "
+"Banshee. Les fichiers importés s'affichent dans vos ressources et peuvent "
+"être modifiés et gérés comme n'importe quel autre média dans Banshee."
+
+#: C/import.page:27(p)
+msgid ""
+"To import music or video files on your computer, choose <guiseq><gui>Media</"
+"gui><gui>Import Media</gui></guiseq>. A dialog will appear with a number of "
+"choices."
+msgstr ""
+"Pour importer des fichiers musicaux ou vidéos sur votre ordinateur, allez "
+"dans le menu <guiseq><gui>Média</gui><gui>Importer des médias</gui></"
+"guiseq>. Une boîte de dialogue s'affiche avec un certain nombre de choix."
+
+#: C/import.page:31(p)
+msgid ""
+"Plugins may add additional import choices. See <link xref=\"#plugins\"/> "
+"below."
+msgstr ""
+"Des greffons additionnels autorisent des choix d'importation "
+"supplémentaires. Consultez le lien <link xref=\"#plugins\"/> ci-dessous."
+
+#: C/import.page:37(gui)
+msgid "Local Folders"
+msgstr "Dossiers locaux"
+
+#: C/import.page:38(p)
+msgid ""
+"Choose this option to import all music and video files within a specified "
+"folder, including all subfolders. You will be prompted with a dialog to "
+"choose a folder to import from."
+msgstr ""
+"Choisissez cette option pour importer tous les fichiers musicaux et vidéos "
+"d'un dossier, y compris ses sous-dossiers. Un message vous demande de "
+"sélectionner le dossier d'origine."
+
+#: C/import.page:43(gui)
+msgid "Local Files"
+msgstr "Fichiers locaux"
+
+#: C/import.page:44(p)
+msgid ""
+"Choose this option to import only the specific file or files you select. You "
+"will be prompted with a dialog to choose the file or files to import."
+msgstr ""
+"Choisissez cette option pour n'importer que le ou les fichiers que vous avez "
+"sélectionnés. Un message vous demande de choisir le ou les fichiers à "
+"importer."
+
+#: C/import.page:49(gui)
+msgid "Home Folder"
+msgstr "Dossier personnel"
+
+#: C/import.page:50(p)
+msgid ""
+"Choose this option to import all music and video files in your entire home "
+"folder, including files in any subfolders."
+msgstr ""
+"Choisissez cette option pour importer tous les fichiers musicaux et vidéos "
+"contenus dans votre dossier personnel complet, y compris ceux de tous les "
+"sous-dossiers."
+
+#: C/import.page:54(gui)
+msgid "Videos From Photos Folder"
+msgstr "Vidéos depuis le dossier Photos"
+
+#: C/import.page:55(p)
+msgid ""
+"Many digital cameras can take short videos, and photo-management "
+"applications often download these videos directly into your Photos folder. "
+"Choose this option to import any videos that have been stored in your Photos "
+"folder."
+msgstr ""
+"Beaucoup d'appareils photos numériques peuvent tourner de courtes vidéos et "
+"les logiciels de gestion habituellement livrés avec eux, ont la "
+"particularité de transférer ces petites vidéos directement dans votre "
+"dossier Photos. Utilisez cette fonction pour importer les vidéos qui ont été "
+"stockées dans votre dossier Photos."
+
+#: C/import.page:63(p)
+msgid ""
+"You can safely import from a folder you have already imported from without "
+"worrying about duplicate entries in your library."
+msgstr ""
+"Vous pouvez importer une nouvelle fois à partir d'un dossier déjà importé "
+"sans vous soucier d'éventuels duplicatas dans votre bibliothèque."
+
+#: C/import.page:68(title)
+msgid "Import from a Playlist"
+msgstr "Importation d'une liste de lecture"
+
+#: C/import.page:69(p)
+msgid ""
+"You can also import music from playlists. Most playlist files end in "
+"<em>m3u</em>. To import from a playlist, from the Banshee menu choose "
+"<guiseq><gui>Media</gui><gui>Import Playlist</gui></guiseq> and locate the "
+"playlist file in your folder, select it and press <gui>Import</gui>."
+msgstr ""
+"Vous pouvez importer de la musique à partir de listes de lecture déjà "
+"existantes sur votre ordinateur. La plupart des listes de lecture se "
+"terminent par l'extension <em>m3u</em>. Allez dans le menu "
+"<guiseq><gui>Média</gui><gui>Importer une liste de lecture</gui></guiseq>, "
+"recherchez votre liste parmi vos dossiers, sélectionnez-la et cliquez sur "
+"<gui>Importer</gui>."
+
+#: C/import.page:78(title)
+msgid "Additional Import Sources"
+msgstr "Sources d'importation additionnelles"
+
+#: C/import.page:79(p)
+msgid ""
+"Plugins may add additional import choices. The following additional sources "
+"will be available if the appropriate plugins are enabled:"
+msgstr ""
+"Des greffons ajoutent des choix d'importation additionnels. Voici les "
+"ressources supplémentaires disponibles si les greffons adéquats sont "
+"activés :"
+
+#: C/extensions.page:8(desc)
+msgid "Add additional functionality to Banshee."
+msgstr "Ajout de nouvelles fonctionnalités à Banshee."
+
+#: C/extensions.page:23(title)
+msgid "Banshee Extensions"
+msgstr "Extensions de Banshee"
+
+#: C/extensions.page:27(title)
+msgid "Official Banshee Extensions"
+msgstr "Extensions officielles de Banshee"
+
+#: C/extensions.page:29(title)
+msgid "Manage extensions for Banshee"
+msgstr "Gestion des extensions de Banshee"
+
+#: C/extensions.page:34(title)
+msgid "Community Banshee Extensions"
+msgstr "Extensions de la communauté pour Banshee"
+
+#: C/extensions.page:36(title)
+msgid "Add community built extensions for Banshee"
+msgstr "Ajout d'extensions développées par la communauté pour Banshee"
+
+#: C/emusic.page:8(desc)
+msgid "Import music purchased from eMusic."
+msgstr "Importation de musique achetée sur le site eMusic."
+
+#: C/emusic.page:12(title)
+msgid "Import your eMusic tracks"
+msgstr "Importation de vos titres eMusic"
+
+#: C/amazon.page:9(desc)
+msgid "Sync and purchase music from the Amazon MP3 Store."
+msgstr "Synchronisation et achat de musique depuis la boutique MP3 Amazon."
+
+#: C/amazon.page:24(title)
+msgid "Amazon MP3 Store"
+msgstr "Boutique MP3 Amazon"
+
+#: C/amazon.page:26(p)
+msgid ""
+"Banshee supports downloading and importing music from the Amazon MP3 store. "
+"You can manually import Amazon music files, purchase music in your web "
+"browser or buy music inside of Banshee. Amazon only offers music for sale as "
+"an MP3 in certain countries and depending on your location, you may not be "
+"able to buy Amazon MP3s."
+msgstr ""
+"Avec Banshee, vous pouvez télécharger et importer de la musique depuis la "
+"boutique MP3 Amazon. Vous pouvez importer des fichiers de musique Amazon "
+"manuellement, les acheter dans votre navigateur internet, ou demander à "
+"Banshee de le faire. L'offre d'Amazon ne concerne que certains pays pour ce "
+"qui est des MP3, et selon votre pays, il se peut que vous ne puissiez pas "
+"acheter de musique en MP3 sur Amazon."
+
+#: C/amazon.page:34(p)
+msgid ""
+"Banshee uses an Amazon affiliate code for all music purchases. All money "
+"made via this affiliate code is donated to the GNOME Foundation."
+msgstr ""
+"Banshee utilise un code d'affiliation pour toute musique achetée sur Amazon. "
+"Toutes les sommes récoltées par le biais de ce code sont reversées à la "
+"fondation GNOME."
+
+#: C/amazon.page:40(title)
+msgid "Purchase Amazon MP3s in your web browser"
+msgstr "Achat de MP3 Amazon dans votre navigateur Web"
+
+#: C/amazon.page:42(p)
+msgid ""
+"Music purchased from Amazon's MP3 store can be automatically downloaded and "
+"imported into Banshee. Banshee associates itself with the .amz file Amazon "
+"provides for MP3 purchases. When you buy music on Amazon, your web browser "
+"will download the .amz file and Banshee will automatically open it and begin "
+"the download and import the music."
+msgstr ""
+"La musique MP3 achetée sur le site Amazon peut être automatiquement "
+"téléchargée et importée dans Banshee. Banshee s'associe au fichier .amz "
+"qu'Amazon fournit pour les achats de MP3. Lors de votre achat sur Amazon, "
+"votre navigateur Web télécharge le fichier .amz, Banshee l'ouvre "
+"automatiquement, télécharge et importe la musique."
+
+#: C/amazon.page:51(title)
+msgid "Buy Amazon MP3s in Banshee"
+msgstr "Achat de MP3 sur Amazon avec Banshee"
+
+#: C/amazon.page:53(p)
+msgid ""
+"You can also search for songs on Amazon within Banshee. Choose the Amazon "
+"MP3 Store from the Banshee menu on the left. This will load the Amazon MP3 "
+"Store just as if you were in a web browser. You can search Amazon for the "
+"music you wish to buy and after logging in to Amazon, buy music with one "
+"click. Banshee will automatically download and import the your purchase into "
+"the library."
+msgstr ""
+"Vous pouvez aussi chercher des titres sur Amazon avec Banshee. Sélectionnez "
+"boutique MP3 Amazon dans le volet de gauche. Ceci téléchargera la "
+"bibliothèque de la boutique MP3 Amazon comme si vous étiez dans votre "
+"navigateur. Une fois identifié dans Amazon, faites votre choix et achetez "
+"votre musique d'un seul clic. Banshee se charge de télécharger et d'importer "
+"votre musique dans la bibliothèque."
+
+#: C/amazon.page:63(title)
+msgid "Import Amazon MP3s manually"
+msgstr "Importation manuelle de MP3 d'Amazon"
+
+#: C/amazon.page:65(p)
+msgid ""
+"When music is purchased from Amazon in a web browser, a file with the "
+"extension .amz is downloaded and saved to your hard drive. To import music "
+"purchased manually from Amazon, in Banshee choose <guiseq><gui>Media</"
+"gui><gui>Import Media</gui></guiseq> from the menu and select the *.amz file "
+"to be imported. Banshee will then open this file and connect to the Amazon "
+"MP3 store to begin the download."
+msgstr ""
+"Quand vous achetez de la musique d'Amazon dans votre navigateur internet, un "
+"fichier portant l'extension .amz est téléchargé et enregistré sur votre "
+"disque dur. Pour importer cette musique manuellement depuis Amazon, allez "
+"dans le menu de Banshee <guiseq><gui>Média</gui><gui>Importer des médias</"
+"gui></guiseq> et sélectionnez le fichier *.amz à importer. Banshee ouvre ce "
+"fichier et se connecte à Amazon MP3 store pour démarrer le téléchargement."
+
+#: C/amazon.page:74(p)
+msgid ""
+"Amazon .amz files are only active for a short time. If you do not download "
+"your music quickly, the file will expire and you cannot download your music "
+"from Amazon. Amazon does not publish how long files are active. It is "
+"recommended you download and import any purchases from Amazon within an hour "
+"of purchase."
+msgstr ""
+"Les fichiers .amz d'Amazon ont une durée de vie limitée. Si vous ne "
+"téléchargez pas rapidement votre musique, le fichier devient périmé et vous "
+"ne pouvez plus obtenir votre musique. Amazon n'indique pas la durée de "
+"validité de ses fichiers mais nous vous recommandons de télécharger et "
+"d'importer n'importe quel achat sur le site d'Amazon dans l'heure qui suit."
+
+#: C/advanced.page:8(desc)
+msgid "Get help for advanced actions."
+msgstr "Obtention d'aide sur les options avancées."
+
+#: C/advanced.page:23(title)
+msgid "Advanced Options and Help"
+msgstr "Options avancées et aide"
+
+#: C/add-radio.page:11(desc)
+msgid "Add, remove and play internet radio stations in Banshee."
+msgstr ""
+"Ajout, suppression et écoute de stations de radio internet avec Banshee."
+
+#: C/add-radio.page:26(title)
+msgid "Internet Radio"
+msgstr "Radio internet"
+
+#: C/add-radio.page:29(title)
+msgid "What is Internet Radio?"
+msgstr "Une radio internet, qu'est-ce que c'est ?"
+
+#: C/add-radio.page:31(p)
+msgid ""
+"Internet radio stations are similar to regular radio stations, allowing an "
+"individual or organization to stream music live over the internet. Internet "
+"radio stations can be a simultaneous stream of a regular radio station, an "
+"amateur broadcasting their own station, or commercial internet radio "
+"stations that include live DJs and even commercials."
+msgstr ""
+"Les stations radio internet sont similaires aux autres stations historiques "
+"et permettent à un individu ou à un groupe d'écouter un flux musical en "
+"direct via l'internet. Elles peuvent tout à la fois diffuser un flux en "
+"provenance de stations historiques, de stations d'amateurs ou de stations "
+"commerciales y compris celles de DJs en direct ou d'autres commerces."
+
+#: C/add-radio.page:41(title)
+msgid "Add Radio Station"
+msgstr "Ajout d'une station de radio"
+
+#: C/add-radio.page:43(p)
+msgid ""
+"To add an internet radio station to Banshee, press <gui>Add Station</gui> in "
+"the upper right hand corner of Banshee or, from the menu, choose "
+"<guiseq><gui>Menu</gui><gui>Add Station</gui></guiseq>."
+msgstr ""
+"Pour ajouter une station de radio internet à Banshee, appuyez sur le bouton "
+"<gui>Ajouter une station</gui> au haut à droite, ou allez dans le menu "
+"<guiseq><gui>Média</gui><gui>Ajouter une station</gui></guiseq>."
+
+#: C/add-radio.page:48(p)
+msgid ""
+"From the internet radio station's webpage, copy the link to their stream URL "
+"in your web browser. In most browsers, you can right click on the link and "
+"press <gui>Copy Link</gui>."
+msgstr ""
+"Sur la page Web de la station de radio internet, recopiez l'URL du flux dans "
+"votre navigateur. Avec la plupart des navigateurs, un clic droit sur le lien "
+"vous propose de <gui>Copier le lien</gui>."
+
+#: C/add-radio.page:54(p)
+msgid ""
+"Banshee will prompt you to enter the <gui>Station Genre</gui>. Choose the "
+"kind of music the internet radio station plays from the available drop down "
+"selections. You will then need to enter the <gui>Station Name</gui>. Enter a "
+"name for the radio station. Then press tab or use your mouse to select the "
+"<gui>Stream URL:</gui> dialog to paste the URL of the radio station. Using "
+"your mouse right click and choose <gui>Paste</gui> or press "
+"<keyseq><key>Control</key>+<key>V</key></keyseq>."
+msgstr ""
+"Banshee ouvre une boîte de dialogue avec plusieurs champs et vous demande "
+"d'entrer le genre, le titre et l'URL de flux de la station de radio que vous "
+"souhaitez ajouter. Choisissez le <gui>Type de station</gui> dans le menu "
+"déroulant. Saisissez le nom de votre station dans le champ adéquat. D'un "
+"clic droit dans le champ <gui>URL du flux :</gui> choisissez <gui>copier</"
+"gui> ou appuyez sur <keyseq><key>Ctrl</key><key>V</key></keyseq>."
+
+#: C/add-radio.page:62(p)
+msgid ""
+"You can optionally also fill out the fields for <gui>Station Creator</gui>, "
+"<gui>Description</gui>, and <gui>Rating</gui>."
+msgstr ""
+"Vous pouvez aussi remplir les champs facultatifs <gui>Créateur de la "
+"station</gui>, <gui>Description</gui> et <gui>Note</gui>."
+
+#: C/add-radio.page:66(p)
+msgid ""
+"Then press <gui>Save</gui> to save the internet radio station in Banshee."
+msgstr ""
+"Pour terminer, n'oubliez pas d'<gui>Enregistrer</gui> votre nouvelle station "
+"dans Banshee."
+
+#: C/add-podcast.page:11(desc)
+msgid "Add, remove and play podcasts in Banshee."
+msgstr "Ajout, suppression et écoute de podcasts avec Banshee."
+
+#: C/add-podcast.page:29(title)
+msgid "What is a Podcast?"
+msgstr "Un podcast, qu'est-ce que c'est ?"
+
+#: C/add-podcast.page:31(p)
+msgid ""
+"Podcasts are recorded programs, similar to radio programs, that are "
+"available on the internet and allow you to subscribe. When you subscribe to "
+"a podcast in Banshee, each time a new program is released, Banshee will "
+"automatically download the podcast and allow you to listen to it."
+msgstr ""
+"Les podcasts sont des programmes enregistrés, un peu comme ceux des radios, "
+"qui sont disponibles sur internet et auquels il est possible de s'abonner. "
+"Si vous souscrivez un abonnement avec Banshee, à chaque fois qu'un nouveau "
+"programme est rendu disponible, Banshee le télécharge automatiquement et "
+"vous permet de l'écouter."
+
+#: C/add-podcast.page:36(p)
+msgid ""
+"There are podcasts on almost any subject including music, movies, Linux, and "
+"more. Search the internet using your favorite search engine with a search "
+"term such as \"movie podcast\" and you will be presented with many options "
+"to choose from."
+msgstr ""
+"Il y a des podcasts sur pratiquement tous les thèmes : musiques, films, "
+"Linux... Allez sur internet avec votre moteur de recherche favori et "
+"saisissez par exemple ces mots-clés « film podcast » et vous pourrez vous "
+"faire une idée du choix disponible."
+
+#: C/add-podcast.page:44(title)
+msgid "Add a Podcast"
+msgstr "Ajout d'un podcast"
+
+#: C/add-podcast.page:46(p)
+msgid ""
+"To add a Podcast to Banshee you will first need to visit the podcast's home "
+"page on the internet in your browser. Almost all podcasts will have a button "
+"or link displayed to subscribe to the podcast. Copy the link to the "
+"podcast's subscription. In most web browsers, you can right click on the "
+"link and choose <gui>Copy link</gui>."
+msgstr ""
+"Pour ajouter un podcast à Banshee, vous devez d'abord aller sur la page "
+"internet de ce podcast avec votre navigateur. Tous les podcasts possèdent un "
+"bouton ou un lien pour s'abonner. Copiez le lien avec la souris. La plupart "
+"des navigateurs vous permettent de <gui>Copier le lien</gui> d'un clic droit."
+
+#: C/add-podcast.page:53(p)
+msgid ""
+"In Banshee, press and choose <gui>Subscribe to Podcasts</gui> in the upper "
+"right hand corner, from the menu choose <guiseq><gui>Media</gui><gui> "
+"Subscribe to Podcast</gui></guiseq> or use the keyboard shortcut "
+"<keyseq><key>Shift</key><key>Control</key><key>F</key></keyseq>."
+msgstr ""
+"Dans Banshee, appuyez sur le bouton <gui>Ajouter un podcast</gui> dans le "
+"coin supérieur droite de la fenêtre, ou allez dans le menu "
+"<guiseq><gui>Média</gui><gui>Ajouter un podcast</gui></guiseq> ou enfin "
+"appuyez sur le raccourci <keyseq><key>Maj</key><key>Ctrl</key><key>F</key></"
+"keyseq>."
+
+#: C/add-podcast.page:59(p)
+msgid ""
+"Banshee will then allow you to choose how you want to download new podcasts "
+"from a drop down menu. Your choices include:"
+msgstr ""
+"Banshee ouvre une boîte de dialogue vous proposant un menu déroulant pour "
+"télécharger un nouveau podcast avec les choix suivants :"
+
+#: C/add-podcast.page:63(p)
+msgid ""
+"Download the Most Recent Episode (This will automatically download the last "
+"episode that was released)."
+msgstr ""
+"Télécharger l'épisode le plus récent (ce sera automatiquement le dernier "
+"épisode disponible)."
+
+#: C/add-podcast.page:65(p)
+msgid "Download All Episodes (This will download all episodes)."
+msgstr "Télécharger tous les épisodes (ceci téléchargera tous les épisodes)."
+
+#: C/add-podcast.page:66(p)
+msgid ""
+"Let Me Decide Which Episodes to Download (This will allow you to choose "
+"which episodes you would like to download)."
+msgstr ""
+"Me laisser choisir quels épisodes télécharger (vous pourrez choisir les "
+"épisodes que vous voulez télécharger)."
+
+#: C/add-podcast.page:70(p)
+msgid "After you have added a Podcast feed, Banshee will display:"
+msgstr "Une fois que vous avez ajouté une source de podcast, Banshee affiche :"
+
+#: C/add-podcast.page:73(p)
+msgid "<gui>Name</gui>: (Name of the specific episode)"
+msgstr "<gui>Nom</gui> : titre de cet épisode"
+
+#: C/add-podcast.page:74(p)
+msgid "<gui>Podcast</gui>: (Name of the Podcast)"
+msgstr "<gui>Podcast</gui> : nom du podcast"
+
+#: C/add-podcast.page:75(p)
+msgid "<gui>Published</gui> (Date the episode was published or released)"
+msgstr ""
+"<gui>Publié</gui> : date de publication ou de mise à disposition de l'épisode"
+
+#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
+#: C/index.page:0(None)
+msgid "translator-credits"
+msgstr ""
+"Alain LOJEWSKI <allomervan at gmail.com>, 2010\n"
+"Bruno Brouard <annoa.b at gmail.com>, 2010"
diff --git a/help/fr/import.page b/help/fr/import.page
new file mode 100644
index 0000000..7620b54
--- /dev/null
+++ b/help/fr/import.page
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="import">
+
+ <info>
+ <link type="guide" xref="index#media"/>
+ <link type="seealso" xref="remove-media"/>
+ <desc>Transfert de musiques et vidéos de votre ordinateur vers la bibliothèque de Banshee.</desc>
+ <revision pkgversion="1.6" version="1.6" date="2010-07-15" status="review"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+ <credit type="editor">
+ <name>Shaun McCance</name>
+ <email>shaunm at gnome.org</email>
+ </credit>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Importation de musique et de vidéos</title>
+
+ <p>Vous pouvez importer de la musique et des vidéos de votre ordinateur vers Banshee. Les fichiers importés s'affichent dans vos ressources et peuvent être modifiés et gérés comme n'importe quel autre média dans Banshee.</p>
+
+ <p>Pour importer des fichiers musicaux ou vidéos sur votre ordinateur, allez dans le menu <guiseq><gui>Média</gui><gui>Importer des médias</gui></guiseq>. Une boîte de dialogue s'affiche avec un certain nombre de choix.</p>
+
+ <note>
+ <p>Des greffons additionnels autorisent des choix d'importation supplémentaires. Consultez le lien <link xref="#plugins"/> ci-dessous.</p>
+ </note>
+
+ <terms>
+ <item>
+ <title><gui>Dossiers locaux</gui></title>
+ <p>Choisissez cette option pour importer tous les fichiers musicaux et vidéos d'un dossier, y compris ses sous-dossiers. Un message vous demande de sélectionner le dossier d'origine.</p>
+ </item>
+ <item>
+ <title><gui>Fichiers locaux</gui></title>
+ <p>Choisissez cette option pour n'importer que le ou les fichiers que vous avez sélectionnés. Un message vous demande de choisir le ou les fichiers à importer.</p>
+ </item>
+ <item>
+ <title><gui>Dossier personnel</gui></title>
+ <p>Choisissez cette option pour importer tous les fichiers musicaux et vidéos contenus dans votre dossier personnel complet, y compris ceux de tous les sous-dossiers.</p>
+ </item>
+ <item>
+ <title><gui>Vidéos depuis le dossier Photos</gui></title>
+ <p>Beaucoup d'appareils photos numériques peuvent tourner de courtes vidéos et les logiciels de gestion habituellement livrés avec eux, ont la particularité de transférer ces petites vidéos directement dans votre dossier Photos. Utilisez cette fonction pour importer les vidéos qui ont été stockées dans votre dossier Photos.</p>
+ </item>
+ </terms>
+
+ <note>
+ <p>Vous pouvez importer une nouvelle fois à partir d'un dossier déjà importé sans vous soucier d'éventuels duplicatas dans votre bibliothèque.</p>
+ </note>
+
+ <section id="import-playlist">
+ <title>Importation d'une liste de lecture</title>
+ <p>Vous pouvez importer de la musique à partir de listes de lecture déjà existantes sur votre ordinateur. La plupart des listes de lecture se terminent par l'extension <em>m3u</em>. Allez dans le menu <guiseq><gui>Média</gui><gui>Importer une liste de lecture</gui></guiseq>, recherchez votre liste parmi vos dossiers, sélectionnez-la et cliquez sur <gui>Importer</gui>.</p>
+ </section>
+
+ <section id="plugins">
+ <title>Sources d'importation additionnelles</title>
+ <p>Des greffons ajoutent des choix d'importation additionnels. Voici les ressources supplémentaires disponibles si les greffons adéquats sont activés :</p>
+ </section>
+
+</page>
diff --git a/help/fr/index.page b/help/fr/index.page
new file mode 100644
index 0000000..5e430cb
--- /dev/null
+++ b/help/fr/index.page
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="guide" id="index">
+
+ <info>
+ <revision pkgversion="1.6" version="0.1" date="2010-01-22" status="incomplete"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Lecteur multimédia Banshee</title>
+
+ <section id="media" style="2column">
+ <title>Ajout, suppression et lecture</title>
+ </section>
+
+ <section id="manage" style="2column">
+ <title>Gestion et tri</title>
+ </section>
+
+ <section id="sync" style="2column">
+ <title>Synchronisation de vos médias avec un lecteur audio numérique</title>
+ </section>
+
+ <section id="extensions" style="2column">
+ <title>Ajout de nouvelles fonctionnalités à Banshee</title>
+ </section>
+
+ <section id="advanced" style="2column">
+ <title>Options avancées et aide</title>
+ </section>
+
+ <section id="problems">
+ <title>Problèmes communs</title>
+ </section>
+
+</page>
diff --git a/help/fr/introduction.page b/help/fr/introduction.page
new file mode 100644
index 0000000..b60627a
--- /dev/null
+++ b/help/fr/introduction.page
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" id="introduction">
+
+ <info>
+ <link type="guide" xref="index"/>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-19" status="draft"/>
+ <desc>Introduction au <app>Lecteur multimédia Banshee</app>.</desc>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Premiers pas</title>
+
+ <p><app>Banshee</app> est un lecteur multimédia qui lit vos musiques, vidéos ou autres et qui peut se synchroniser avec vos appareils portables pour emporter vos médias avec vous.</p>
+ <p><app>Banshee</app> possède des fonctions pour importer vos médias, gérer leurs métadonnées et lire vos musiques et vidéos.</p>
+ <p>Banshee vous aide également à synchroniser vos musiques et vidéos avec la plupart des appareils portables comme les baladeurs numériques et les smartphones. Banshee prend en charge la plupart des lecteurs audio numériques comme beaucoup d'iPods, Sandisk, baladeurs MP3 Creative et téléphones Android.</p>
+
+ <figure>
+ <title>Fenêtre du <gui>Lecteur multimédia Banshee</gui></title>
+ <desc><app>Lecteur multimédia Banshee</app></desc>
+ <media type="image" src="figures/banshee.png" mime="image/png" style="right">
+ <p>Interface de la bibliothèque <app>Banshee</app></p>
+ </media>
+ </figure>
+
+</page>
diff --git a/help/fr/itunes-import.page b/help/fr/itunes-import.page
new file mode 100644
index 0000000..1cc1bb2
--- /dev/null
+++ b/help/fr/itunes-import.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="itunes-import">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc>Importation de la musique et de sa classification à partir du lecteur multimédia <app>iTunes</app>.</desc>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Importation de votre bibliothèque <app>iTunes</app></title>
+
+</page>
diff --git a/help/fr/keyboardshortcuts.page b/help/fr/keyboardshortcuts.page
new file mode 100644
index 0000000..7526b85
--- /dev/null
+++ b/help/fr/keyboardshortcuts.page
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="keyboardshortcuts">
+
+<info>
+ <link type="guide" xref="advanced#keyboard"/>
+ <desc>Raccourcis claviers</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-29" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Navigation dans Banshee avec les raccourcis clavier</title>
+
+ <section id="playbackcontrol">
+
+ <title>Contrôle de la lecture</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Touche</gui></p></td> <td><p><gui>Action</gui></p></td>
+ </tr>
+ <tr>
+ <td><p>Espace</p></td> <td><p>Lecture ou mise en pause du titre en cours</p></td>
+ </tr>
+ <tr>
+ <td><p>N</p></td> <td><p>Lecture du titre suivant</p></td>
+ </tr>
+ <tr>
+ <td><p>B</p></td> <td><p>Lecture du titre précédent</p></td>
+ </tr>
+</table>
+
+ </section>
+
+ <section id="library">
+
+ <title>Interaction avec la bibliothèque</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Touche</gui></p></td> <td><p><gui>Action</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Ctrl</key><key>F</key></keyseq></p></td> <td><p>Déplacement du focus dans la boîte de la recherche</p></td>
+ </tr>
+ <tr>
+ <td><p><key>/</key>, <keyseq><key>Ctrl</key><key>I</key></keyseq></p></td>
+ <td><p>Ouverture de la boîte de dialogue d'importation de média</p></td>
+ </tr>
+</table>
+
+ </section>
+
+ <section id="playlists">
+
+ <title>Interaction avec la bibliothèque</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Touche</gui></p></td> <td><p><gui>Action</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Ctrl</key><key>N</key></keyseq></p></td> <td><p>Création d'une nouvelle liste de lecture</p></td>
+ </tr>
+
+</table>
+
+ </section>
+
+ <section id="podcasts">
+
+ <title>Podcasts</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Touche</gui></p></td> <td><p><gui>Action</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><key>Y</key></p></td> <td><p>Marquage des épisodes sélectionnés comme anciens</p></td>
+ </tr>
+
+</table>
+
+ </section>
+
+ <section id="interface">
+
+ <title>Interface</title>
+
+<table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Touche</gui></p></td> <td><p><gui>Action</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><key>F</key></p></td> <td><p>Passage en mode plein écran</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Ctrl</key><key>A</key></keyseq></p></td> <td><p>Sélection de tous les titres de la liste de lecture</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Ctrl</key><key>Maj</key><key>A</key></keyseq></p>
+ </td> <td><p>Désélection de tous les titres de la liste de lecture</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Ctrl</key><key>W</key></keyseq></p></td> <td><p>Masquage de la fenêtre de Banshee (nécessite que le plugin Icône de zone de notification soit activé)</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Ctrl</key><key>bouton gauche de la souris</key></keyseq>
+ </p></td> <td><p>Lecture du titre précédent (nécessite que le plugin Icône de zone de notification soit activé)</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Ctrl</key><key>bouton droit de la souris</key></keyseq>
+ </p></td> <td><p>Lecture du titre suivant (nécessite que le plugin Icône de zone de notification soit activé)</p></td>
+ </tr>
+ <tr>
+ <td><p><keyseq><key>Ctrl</key><key>bouton central de la souris</key></keyseq>
+ </p></td> <td><p>Passage du mode lecture au mode pause (nécessite que le plugin Icône de zone de notification soit activé)</p></td>
+ </tr>
+
+</table>
+
+ </section>
+</page>
diff --git a/help/fr/lastfm.page b/help/fr/lastfm.page
new file mode 100644
index 0000000..29ad522
--- /dev/null
+++ b/help/fr/lastfm.page
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="lastfm">
+
+ <info>
+ <link type="guide" xref="extend#official"/>
+ <link type="seealso" xref="sync"/>
+ <desc>Activation de Last.fm, informations sur les titres et la radio Last.fm.</desc>
+ <revision pkgversion="1.6" version="0.1" date="2010-07-15" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Last.fm</title>
+
+ <p>Last.fm est un service en ligne bien connu qui offre des versions gratuites ou payantes. Last.fm propose des informations sur des artistes ou des albums et si vous créez un profil Last.fm, vous pouvez surveiller gratuitement la musique que vous écoutez avec Banshee. Si vous ouvrez un compte payant en tant qu'adhérent, vous pouvez en plus écouter les diffusions musicales Last.fm en continu à partir de plusieurs clients dont Banshee. Last.fm vous propose de nombreux canaux de diffusion, y compris ceux les mieux adaptés à vous, en se basant sur vos habitudes d'écoute, vos favoris ou d'autres critères.</p>
+
+ <section id="enable-lastfm">
+ <title>Activation de Last.fm</title>
+ <p>Pour obtenir le meilleur de Last.fm, il vous faut créer votre profil Last.fm. Suivez ce lien <link href="http://www.last.fm/join">http://www.last.fm/join</link> pour ouvrir un compte ou bien ouvrez le menu de Banshee <guiseq><gui>Édition</gui><gui>Préférences</gui></guiseq>, puis l'onglet <gui>Spécifique à la source</gui> ; dans le menu déroulant, choisissez <gui>Last.fm</gui> et cliquez sur le lien <em>S'inscrire sur Last.fm</em>.</p>
+
+ <p>Pour permettre à Banshee de vous renseigner sur les morceaux diffusés sur votre ordinateur par Last.fm, vous devez vous inscrire sur Last.fm dans Banshee dans les préférences <gui>Spécifique à la source</gui>. Saisissez votre nom d'utilisateur et cliquez sur le bouton <gui>Se connecter à Last.fm</gui>. Vous êtes alors dirigé vers une page Web de Last.fm dans votre navigateur pour y autoriser l'accès de Banshee. Cliquez sur le lien <gui>Autoriser l'accès</gui> dans votre navigateur et vous êtes redirigé sur une autre page qui vous confirme que Banshee a maintenant l'autorisation d'accéder à Last.fm. Retournez dans Banshee et fermez le processus par le bouton <gui>Terminer l'authentification</gui>.</p>
+
+ </section>
+
+ <section id="songreporting">
+ <title>Lancement du processus Last.fm de renseignements sur les titres</title>
+ <p>Après avoir réussi à connecter Banshee à votre profil Last.fm, cochez la case <gui>Activer l'informateur de morceau</gui> dans l'onglet <gui>Spécifique à la source</gui> des Préférences de Banshee. Si votre connexion internet est active, Banshee fourni maintenant des informations sur le morceau en cours d'écoute. L'historique de vos écoutes est consultable sur la page Web de votre profil Last.fm. Last.fm mettra automatiquement à jour les métadonnées de vos morceaux si des informations sur l'artiste, le titre ou l'album s'avéraient erronées.</p>
+
+ </section>
+
+ <section id="lastfm-radio">
+ <title>Écoute de la radio web Last.fm</title>
+ <p>La radio web Last.fm est gratuite pour les résidents des États-Unis, du Royaume-Uni et de l'Allemagne. Les habitants des autres pays doivent acquitter une redevance pour écouter cette radio. Les membres payants de tous pays auront aussi accès à certains privilèges comme écouter les listes de lecture et les radios musicales qu'ils ont aimées ou étiquetées.</p>
+
+ <p>Dans la fenêtre gauche de Banshee est apparue une section Last.fm contenant vos stations radio Last.fm. Si vous disposez d'une connexion internet active, vous pouvez choisir une station et Banshee se connecte aux morceaux les plus populaires de celle-ci. Appuyez sur le bouton <gui>Lire</gui> ou sur la touche <key>Espace</key> pour démarrer l'écoute. Pour passer au morceau suivant dans la file d'attente de la radio, appuyez sur le bouton <gui>Suivant</gui> ou sur la touche <key>N</key>, ou encore choisissez le menu <guiseq><gui>Lecture</gui><gui>Suivant</gui></guiseq>.</p>
+
+ </section>
+
+</page>
diff --git a/help/ca/legal.xml b/help/fr/legal.xml
similarity index 100%
copy from help/ca/legal.xml
copy to help/fr/legal.xml
diff --git a/help/fr/manage-coverart.page b/help/fr/manage-coverart.page
new file mode 100644
index 0000000..fd7e3ac
--- /dev/null
+++ b/help/fr/manage-coverart.page
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="coverart">
+
+ <info>
+ <link type="guide" xref="index#manage"/>
+ <link type="seealso" xref="tags"/>
+ <desc>Gestion ou modification des pochettes de vos albums.</desc>
+ <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Pochette</title>
+
+ <p/>
+
+ <p>
+ </p>
+
+</page>
diff --git a/help/fr/manage-playlists.page b/help/fr/manage-playlists.page
new file mode 100644
index 0000000..41fe2af
--- /dev/null
+++ b/help/fr/manage-playlists.page
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="playlists">
+
+ <info>
+ <link type="guide" xref="index#manage"/>
+ <link type="seealso" xref="tags"/>
+ <link type="seealso" xref="coverart"/>
+ <desc>Création et gestion des listes de lecture.</desc>
+ <revision pkgversion="1.6" version="0.1" date="2010-05-26" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Listes de lecture</title>
+
+ <p>Les listes de lecture vous permettent de créer et sauvegarder un ensemble de titres à écouter dans un certain ordre. Elles sont pratiques pour créer une liste de vos chansons favorites ou pour ranger votre bibliothèque en listes plus petites et plus faciles à consulter. Quelques marques de baladeurs acceptent même de lire ces listes de sorte que vous pouvez les emporter avec vous telles quelles.</p>
+
+ <p>Banshee prend en charge les listes de lecture standards, celles où vous ajoutez vous-même vos titres mais aussi les listes de lecture intelligentes. Ces dernières sont générées automatiquement à partir de vos habitudes d'écoute, de vos favoris ou autres.</p>
+
+ <section id="manual">
+
+ <title>Listes de lecture standards</title>
+
+ <p>Une liste de lecture standard est une suite de morceaux que vous ajoutez et que vous gérez vous-même. Vous pourriez par exemple créer une liste de titres de votre artiste favori en piochant dans différents albums, faire une liste de vos derniers favoris, ou encore créer une liste rythmée pour vous accompagner pendant vos exercices physiques.</p>
+
+ <p>Pour créer une nouvelle liste de lecture, vous pouvez soit presser la combinaison <keyseq><key>Control</key><key>N</key></keyseq>, soit choisir <guiseq><gui>Média</gui><gui>Nouvelle liste de lecture</gui></guiseq> dans le menu, ou encore sélectionner la ou les pistes que vous voulez ajouter et par un clic droit choisir <guiseq><gui>Ajouter à la liste de lecture</gui><gui>Nouvelle liste de lecture</gui></guiseq> dans le menu contextuel. Vous pouvez aussi faire glisser la ou les pistes avec la souris dans la fenêtre de gauche en passant au-dessus de <gui>Musique</gui>. Au passage, une option <gui><em>Nouvelle liste de lecture</em></gui> apparaîtra, et vous pourrez lâcher la ou les pistes dans cette <gui><em>Nouvelle liste de lecture</em></gui> pour les y ajouter. Il vous faudra répéter ce processus avec tous les titres que vous souhaitez y ajouter.</p>
+
+ <p>Pour nommer votre liste de lecture, faites un clic droit dessus, choisissez <gui>Renommer</gui> et saisissez le nom que vous souhaitez lui donner.</p>
+
+ <p>Vous pouvez modifier le classement de la liste en faisant glisser les titres avec la souris d'une ligne à une autre. Le classement ne peut être modifié que si aucune colonne n'a auparavant été triée. Pour annuler le tri dans une colonne, cliquez dans l'en-tête jusqu'à ce que la flèche haute ou basse disparaisse. Réorganisez ensuite la liste.</p>
+
+ <p>Pour supprimer un titre de la liste, sélectionnez-le et appuyez sur la touche <key>Suppr</key>, ou faites <guiseq><gui>Édition</gui><gui>Enlever de la liste de lecture</gui></guiseq> dans le menu, ou encore par un clic droit choisissez <gui>Supprimer de la liste</gui> dans le menu contextuel.</p>
+ </section>
+
+ <section id="smartplaylists">
+ <title>Liste de lecture intelligente</title>
+
+ <p>Les listes de lecture intelligentes vous permettent de générer rapidement une liste dynamique basée sur un certain nombre de variables pré-déterminées. Vous pouvez très vite créer une liste de lecture basée sur un nom d'artiste, sur vos favoris ou autres.</p>
+
+ <p>Pour créer une nouvelle liste de lecture intelligente, allez dans le menu <guiseq><gui>Média</gui><gui>Nouvelle liste de lecture intelligente</gui></guiseq>. Une boîte de dialogue s'affiche pour créer une nouvelle liste de lecture intelligente. Saisissez le nom de la liste et ensuite choisissez les critères sur lesquels elle sera construite. Vos critères peuvent provenir de n'importe quel champ, y compris des métadonnées comme le titre de l'album, le nom de l'artiste ou l'année. Une fois les critères définis, vous devrez spécifier ceci :</p>
+
+ <list>
+ <item><p>est</p></item>
+ <item><p>n'est pas</p></item>
+ <item><p>moins de</p></item>
+ <item><p>plus de</p></item>
+ <item><p>au plus</p></item>
+ <item><p>au moins</p></item>
+ </list>
+
+ <p>Vous pouvez aussi appuyer sur le bouton <gui>+</gui> pour ajouter une condition supplémentaire à la liste : par exemple, créer une liste de lecture intelligente avec tous les morceaux de 2010 auxquels vous avez attribué une note de cinq étoiles. Pour générer cette liste, il faut saisir :</p>
+
+ <table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Année</gui></p></td> <td><p><gui>est</gui></p> </td>
+ <td><p><gui>2010</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><gui>Classement</gui></p></td> <td><p><gui>est</gui></p></td>
+ <td><p><gui/>5 étoiles</p></td>
+ </tr>
+ </table>
+
+ <p>L'option supplémentaire <gui>Limiter à</gui> vous permet de choisir le nombre maximum de titres que vous voulez y mettre en cochant cette case.</p>
+
+ <p>Dans Banshee, vous avez aussi des listes de lectures intelligentes prédéfinies. Sélectionnez-en une et appuyez sur le bouton <gui>Ouvrir dans l'éditeur</gui> pour visionner comment elle se présente ou pour la modifier à votre goût. Quand vous cliquez sur le bouton <gui>Créer et enregistrer</gui> la liste est automatiquement générée et sauvegardée. Voici les liste disponibles :</p>
+
+ <list>
+ <title>Listes de lecture intelligentes Banshee</title>
+ <item><p>Favoris (morceaux notés quatre ou cinq étoiles)</p></item>
+ <item><p>Favoris récents (morceaux fréquemment écoutés cette semaine)</p></item>
+ <item><p>Récemment ajoutés (morceaux importés cette semaine)</p></item>
+ <item><p>Non écoutés (morceaux non écoutés ou ignorés)</p></item>
+ <item><p>Favoris négligés (favoris non écoutés pendant les deux derniers mois)</p></item>
+ <item><p>700 Mio de favoris (un CD de données rempli de vos morceaux préférés)</p></item>
+ <item><p>80 minutes de favoris (un CD audio rempli de vos morceaux préférés)</p></item>
+ <item><p>Non notés (morceaux qui n'ont pas été notés)</p></item>
+ </list>
+
+ </section>
+
+</page>
diff --git a/help/fr/manage-tags.page b/help/fr/manage-tags.page
new file mode 100644
index 0000000..9030a50
--- /dev/null
+++ b/help/fr/manage-tags.page
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="tags">
+
+ <info>
+ <link type="guide" xref="index#manage"/>
+ <link type="seealso" xref="coverart"/>
+ <link type="seealso" xref="playlists"/>
+ <desc>Édition et modification des étiquettes et métadonnées d'un fichier musical.</desc>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-09" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Métadonnées d'un fichier musical</title>
+
+ <section id="metadata">
+
+ <title>Les métadonnées d'un fichier musical</title>
+
+ <p>La musique numérique contient des métadonnées qui stockent des informations dans le fichier musical comme le nom de l'artiste, le titre de l'album, l'année d'enregistrement, le genre musical et davantage encore. Pratiquement toute musique achetée par le biais d'Internet possède ces métadonnées déjà présentes dans le fichier et si vous importez de la musique à partir d'un CD, Banshee se charge d'y inclure les métadonnées qui s'y trouvent pendant l'extraction du CD. Pour de plus amples informations sur la manière d'extraire un CD avec toutes ses métadonnées, consultez la section <link xref="import"/>.</p>
+
+ <p>Les formats les plus usuels de métadonnées sont ID3v1 et ID3v2 pour les fichiers MP3 et les commentaires Vorbis pour les fichiers OGG Vorbis.</p>
+
+ <p>Si vous importez des titres qui ne contiennent pas de métadonnées, Banshee affiche <gui>Unconnu</gui> dans la plupart des champs de la bibliothèque.</p>
+
+ </section>
+
+ <section id="editmetadata">
+
+ <title>Correction de vos métadonnées</title>
+
+ <p>Vous pouvez corriger ou modifier les métadonnées de vos chansons. Sélectionnez le ou les titres que vous souhaitez mettre à jour et appuyez sur la touche <key>E</key> ou choisissez dans le menu <guiseq><gui>Édition</gui><gui>Modifier les informations du morceaux</gui></guiseq> ou encore faites un clic droit sur le titre et choisissez <gui>Modifier les informations du morceau</gui> dans le menu contextuel.</p>
+
+ <p>La boîte de dialogue qui apparaît, affiche les métadonnées du titre et vous permet de les modifier ou de les mettre à jour. Les champs affichés par défaut sont :</p>
+
+ <list>
+ <item><p><gui>Titre du morceau</gui></p></item>
+ <item><p><gui>Artiste du morceau</gui></p></item>
+ <item><p><gui>Titre de l'album</gui></p></item>
+ <item><p><gui>Genre</gui></p></item>
+ <item><p><gui>Numéro de piste</gui></p></item>
+ <item><p><gui>Numéro du disque</gui></p></item>
+ <item><p><gui>Année</gui></p></item>
+ </list>
+
+ <p>Mettez à jour les informations du morceau. Si vous avez sélectionné plusieurs titres à modifier, appuyez sur la flèche à droite du champ <gui>Titre du morceau</gui> ou appuyez sur le bouton <gui>Suivant</gui> au bas de la boîte de dialogue pour passer au suivant. Quand vous avez terminé de corriger toutes vos métadonnées, n'oubliez pas d'appuyer sur le bouton <gui>Enregistrer</gui>.</p>
+
+ </section>
+
+</page>
diff --git a/help/fr/play-queue.page b/help/fr/play-queue.page
new file mode 100644
index 0000000..b917b1b
--- /dev/null
+++ b/help/fr/play-queue.page
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="queue">
+
+ <info>
+ <link type="guide" xref="index#media"/>
+ <link type="seealso" xref="play"/>
+ <desc>Ajout de média à votre file d'attente de lecture.</desc>
+ <revision pkgversion="1.6" version="0.1" date="2010-05-26" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>File d'attente de lecture</title>
+
+ <p>La <gui>file d'attente de lecture</gui> vous permet d'ajouter des morceaux à lire dans un ordre séquentiel. Vous pouvez y ajouter beaucoup de pistes pour écouter des heures de musique sans interruption. Vous pouvez y ajouter des pistes seules ou des albums entiers et les trier ou les réorganiser.</p>
+
+<section id="addqueue">
+
+ <title>Ajout de musique à la file d'attente de lecture</title>
+
+ <p>Sélectionnez dans votre bibliothèque les pistes ou les albums à ajouter à la file d'attente de lecture.</p>
+
+ <p>Pour ajouter un album entier avec la souris, sélectionnez-le et glissez-le dans la <gui>File d'attente de lecture</gui> du volet de gauche.</p>
+
+ <p>Vous pouvez ajouter des morceaux à la file d'attente de lecture un à un ou par paquets. Pour ajouter un titre, faites un glisser-déposer avec la souris dans la <gui>File d'attente de lecture</gui> du volet de gauche ou faites un clic droit et choisissez <gui>Ajouter à la file d'attente de lecture</gui> dans le menu contextuel.</p>
+
+ <p>Vous pouvez ajouter plusieurs pistes en les sélectionnant une à une avec la souris tout en maintenant la touche <key>Ctrl</key> enfoncée, ou ajouter un intervalle de pistes en appuyant sur la touche <key>Maj</key> pour sélectionner cet ensemble. Faites alors un glisser-déposer de la sélection avec la souris dans la <gui>File d'attente de lecture</gui> du volet de gauche ou faites un clic droit et choisissez <gui>Ajouter à la file d'attente de lecture</gui> dans le menu contextuel.</p>
+
+</section>
+
+<section id="reorderqueue">
+
+ <title>Organisation de votre file d'attente de lecture</title>
+
+ <p>Votre file d'attente de lecture est classée dans l'ordre d'ajout des morceaux. Les premiers titres ou albums ajoutés à la liste sont les premiers lus. Vous pouvez modifier ce classement avec la souris en faisant un glisser-déposer d'un titre ou d'un ensemble de titres à l'intérieur de cette liste. Sélectionnez-le ou les titres que vous souhaitez déplacer et glissez-les avec la souris à la place ou au numéro de ligne choisi, puis relâchez la souris.</p>
+
+</section>
+
+<section id="removequeue">
+
+ <title>Suppression de titres de la file d'attente de lecture</title>
+
+ <p>Vous pouvez supprimer une piste, un ensemble de pistes ou vider entièrement la file d'attente de lecture.</p>
+
+ <p>Pour supprimer une piste précise ou un ensemble de pistes de la liste, sélectionnez-les avec la souris, puis appuyez sur la touche <key>Suppr</key>.</p>
+
+ <p>Pour vider entièrement la file d'attente de lecture, appuyez sur le bouton <gui>Effacer</gui> dans le coin supérieur droite de la fenêtre.</p>
+
+</section>
+
+</page>
diff --git a/help/fr/play.page b/help/fr/play.page
new file mode 100644
index 0000000..3f2a305
--- /dev/null
+++ b/help/fr/play.page
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="play">
+
+ <info>
+ <link type="guide" xref="index#media"/>
+ <link type="seealso" xref="queue"/>
+ <desc>Lecture de vos vidéos et de vos fichiers musicaux.</desc>
+ <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Lecture de vos médias</title>
+
+ <section id="playmusic">
+ <title>Lecture de votre musique</title>
+
+ <p>Pour écouter de la musique avec Banshee, choisissez la ressource Musique. La bibliothèque musicale affiche tous les artistes qu'elle contient, la pochette de chaque album et la liste de toutes les chansons qu'elle contient.</p>
+
+ <p>Choisissez dans la liste d'artistes ou d'albums la chanson ou l'album que vous souhaitez écouter, ou faites une recherche dans le champ en haut à droite de Banshee.</p>
+
+ <p>Pour démarrer l'écoute d'une chanson, faites un double-clic sur son titre, appuyez sur la touche <key>Espace</key>, ou encore choisissez <guiseq><gui>Lecture</gui><gui>Lire</gui></guiseq> dans le menu de Banshee.</p>
+
+ <p>Vous pouvez aussi démarrer l'écoute d'un album en le sélectionnant dans l'explorateur et en double-cliquant sur le titre voulu ou en appuyant sur la touche <key>Espace</key>, ou encore en choisissant <guiseq><gui>Lecture</gui><gui>Lire</gui></guiseq> dans le menu de Banshee.</p>
+
+ <p>Pour écouter tous les titres d'un seul artiste, sélectionnez l'artiste dans le navigateur et appuyez sur la touche <key>Espace</key> ou choisissez <guiseq><gui>Lecture</gui><gui>Lire</gui></guiseq> dans le menu de Banshee.</p>
+
+ <p>Banshee affiche aussi vos albums favoris (ceux que vous écoutez le plus souvent), vos favoris récents, ceux non écoutés et ceux récemment ajoutés. Sélectionnez celui que vous voulez écouter et lisez les chansons de chacun d'eux.</p>
+
+ </section>
+
+ <section id="playvideo">
+ <title>Lecture d'une vidéo</title>
+
+ <p>Vos vidéos importées sont listées dans l'ordre alphabétique. Pour en lancer une, sélectionnez-la dans la liste et appuyez sur la touche <key>Espace</key> ou choisissez <guiseq><gui>Lecture</gui><gui>Lire</gui></guiseq> dans le menu de Banshee.</p>
+
+ <p>Banshee affiche aussi vos vidéos favorites (celles que vous regardez le plus souvent) et celles non regardées. Choisissez une catégorie et vous pourrez lancer une vidéo de la liste.</p>
+
+ </section>
+
+ <section id="playpodcast">
+ <title>Lecture d'un podcast</title>
+
+ <p>La ressource Podcasts affiche tous les podcasts auxquels vous êtes abonné, tous les podcasts disponibles et l'explorateur affiche la liste de tous les podcasts avec les plus récents en tête.</p>
+
+ <p>Pour lire un podcast, sélectionnez-le dans la liste et appuyez sur la touche <key>Espace</key> ou choisissez <guiseq><gui>Lecture</gui><gui>Lire</gui></guiseq> dans le menu de Banshee.</p>
+
+ </section>
+
+ <section id="playradio">
+ <title>Écoute d'une station de radio internet</title>
+
+ <p>La ressource Radio affiche dans l'ordre alphabétique toutes les stations radio internet que vous avez ajoutées à Banshee.</p>
+
+ <p>Pour écouter une station de radio internet, sélectionnez-la dans la liste et appuyez sur la touche <key>Espace</key> ou choisissez <guiseq><gui>Lecture</gui><gui>Lire</gui></guiseq> dans le menu de Banshee.</p>
+
+ </section>
+
+</page>
diff --git a/help/fr/rb-import.page b/help/fr/rb-import.page
new file mode 100644
index 0000000..17c7f06
--- /dev/null
+++ b/help/fr/rb-import.page
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="rb-import">
+
+ <info>
+ <link type="guide" xref="import#plugins"/>
+ <revision pkgversion="1.6" version="1.6" date="2010-05-31" status="stub"/>
+ <desc>Importation de la musique et de sa classification à partir du lecteur multimédia <app>Rhythmbox</app>.</desc>
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Importation de votre bibliothèque <app>Rhythmbox</app></title>
+
+</page>
diff --git a/help/fr/search.page b/help/fr/search.page
new file mode 100644
index 0000000..daadbf3
--- /dev/null
+++ b/help/fr/search.page
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="search">
+
+ <info>
+ <link type="guide" xref="index#manage"/>
+ <link type="seealso" xref="sort"/>
+ <desc>Recherche parmi vos médias et réalisation de requêtes basiques.</desc>
+ <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Recherche dans votre bibliothèque Banshee</title>
+
+ <p>Banshee est doté d'un langage de recherche performant. Vous pouvez soit initier une recherche rapide et facile à partir de mots-clés simples, soit lancer une recherche approfondie avec la terminologie avancée de Banshee.</p>
+
+ <p>Pour effectuer une recherche de médias avec Banshee, appuyez sur la touche <key>S</key> ou cliquez dans la case <gui>Rechercher</gui> dans le coin supérieur droite de l'affichage de la bibliothèque.</p>
+
+ <p>Une recherche repose sur quelques mots-clés, par exemple <em>dave matthews</em>. En saisissant <em>dave matthews</em> dans le champ Rechercher, Banshee consulte toutes les métadonnées présentes comme le titre de la piste, le titre de l'album, le nom de l'artiste, l'année, etc. Chaque titre contenant les métadonnées <em>dave</em> et <em>matthews</em> est affiché. Les termes de recherche ne sont pas sensibles à la casse, et il est donc inutile de mettre des majuscules. Les termes <em>dave</em>, <em>Dave</em>, et <em>DAVE</em> signifient tous la même chose.</p>
+
+<section id="operators">
+ <title>Opérateurs de base</title>
+ <p>Des opérateurs peuvent être placés entre deux mots-clés ou devant un mot-clé. L'opérateur par défaut est <gui>AND</gui> (ET) et est utilisé quand il n'y en a pas d'autre opérateur entre deux mots. Comme c'est l'opérateur par défaut, il n'y a pas d'opérateur AND explicit.</p>
+
+ <p>Les autres opérateurs de base sont <gui>OR</gui> et <gui>NOT</gui>. Utilisées conjointement, ces trois opérations permettent de faire des recherches très performantes pour vous aider à faire des recherches dans vos médias.</p>
+
+</section>
+
+<section id="logical">
+ <title>Opérateurs logiques et exemples</title>
+ <p>Voici une liste d'opérateurs logiques et des exemples de résultats de recherches effectués avec eux.</p>
+
+ <table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Opérateur</gui></p></td> <td><p><gui>Description</gui></p></td>
+ </tr>
+ <tr>
+ <td><p><em>par défaut</em>, <em>espace</em></p></td> <td><p>Recherche les deux mots séparés par un espace entre les deux.</p></td>
+ </tr>
+ <tr>
+ <td><p>OR, or, <key>|</key>, <key>,</key></p></td> <td><p>Les résultats de la recherche sont deux termes avec l'un ou l'autre résultat dans n'importe quel champ.</p></td>
+ </tr>
+ <tr>
+ <td><p>NOT, not, <key>-</key></p></td> <td><p>Ne pas afficher de résultats de recherche contenant un des termes de recherche qui suit NOT, not, <key>-</key>.</p></td>
+ </tr>
+
+</table>
+
+ <p>Voici des exemples d'opérations logiques :</p>
+
+ <table frame="all" rules="rows" shade="rows">
+ <tr>
+ <td><p><gui>Recherche</gui></p></td> <td><p><gui>Description</gui></p></td>
+ </tr>
+ <tr>
+ <td><p>dave matthews</p></td> <td><p>Correspond à n'importe quel champ d'une piste contenant à la fois <em>dave</em> et <em>matthews</em>.</p></td>
+ </tr>
+ <tr>
+ <td><p>dave, matthews</p></td> <td><p>Correspond à n'importe quel champ d'une piste contenant <em>dave</em> ou <em>matthews</em>.</p></td>
+ </tr>
+ <tr>
+ <td><p>dave or matthews</p></td> <td><p>Correspond à n'importe quel champ d'une piste contenant <em>dave</em> ou <em>matthews</em>.</p></td>
+ </tr>
+ <tr>
+ <td><p>dave | matthews</p></td> <td><p>Correspond à n'importe quel champ d'une piste contenant <em>dave</em> ou <em>matthews</em>.</p></td>
+ </tr>
+ <tr>
+ <td><p>-"dave matthews"</p></td> <td><p>Affiche toutes les pistes dont les champs ne contiennent pas <em>dave matthews</em>.</p></td>
+ </tr>
+
+ </table>
+
+ <p>Pour de plus amples informations sur la façon d'effectuer des recherches plus complexes, consultez la page <link xref="adv-search"/>.</p>
+
+</section>
+
+</page>
diff --git a/help/fr/sort.page b/help/fr/sort.page
new file mode 100644
index 0000000..ddd2d15
--- /dev/null
+++ b/help/fr/sort.page
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="sort">
+
+ <info>
+ <link type="guide" xref="index#manage"/>
+ <link type="seealso" xref="search"/>
+ <desc>Trie de vos médias et ajout de colonnes supplémentaires.</desc>
+ <revision pkgversion="1.6" version="0.1" date="2009-01-22" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Tri de vos médias</title>
+
+ <section id="addcolumn">
+
+ <title>Ajout de colonnes</title>
+
+ <p>Au fur et à mesure que votre bibliothèque s'étoffe, vous pourriez être amené à l'agencer de façon à retrouver ou visionner plus facilement certains titres, artistes ou albums.</p>
+
+ <p>Vous pouvez ajouter des colonnes à l'affichage standard de la bibliothèque <app>Banshee</app> pour avoir plus d'informations disponibles sur les titres et aussi pouvoir effectuer un tri sélectif. Par défaut, Banshee affiche pour les morceaux les colonnes <gui>Nom</gui>, <gui>Artiste</gui>, <gui>Album</gui> et <gui>Durée</gui>. Pour ajouter d'autres colonnes, faites un clic droit sur l'en-tête de l'une d'entre elles et Banshee affiche les autres colonnes disponibles que vous pouvez sélectionner. Cochez la case de celle que vous voulez ajouter.</p>
+
+ </section>
+
+ <section id="sorting">
+ <title>Tri par colonnes</title>
+ <p>Vous pouvez trier votre bibliothèque d'un clic de souris sur n'importe quelle colonne affichée. Si vous souhaitez trier votre musique par artiste, cliquez sur l'en-tête de la colonne <gui>Artiste</gui> et Banshee trie automatiquement cette colonne par ordre alphabétique. Un second clic sur la même colonne affiche un tri alphabétique inverse.</p>
+ </section>
+
+</page>
diff --git a/help/fr/sync.page b/help/fr/sync.page
new file mode 100644
index 0000000..879a659
--- /dev/null
+++ b/help/fr/sync.page
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:e="http://projectmallard.org/experimental/" type="topic" style="task" id="sync">
+
+ <info>
+ <link type="guide" xref="index#sync"/>
+ <link type="seealso" xref="playlists"/>
+ <desc>Synchronisation de votre média avec un lecteur multimédia portable ou un smartphone.</desc>
+ <revision pkgversion="1.8" version="0.1" date="2010-08-29" status="draft"/>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Synchronisation</title>
+
+ <p>Banshee prend en charge la synchronisation de votre musique avec des lecteurs multimédia portables et des smartphones. Vous pouvez soit y ajouter certaines pistes, albums ou listes de lectures, soit autoriser Banshee à synchroniser votre baladeur avec toute votre bibliothèque. Après avoir connecté votre baladeur à votre ordinateur, vous pouvez aussi écouter les morceaux qui y sont stockés. Lorsque vous synchronisez de la musique dans un format sans pertes comme FLAC, Banshee compresse automatiquement vos morceaux en Ogg Vorbis ou MP3 si vous avez installé les codecs adéquats.</p>
+
+ <section id="devices">
+ <title>Compatibilité matérielle</title>
+ <p>Banshee est compatible avec la plupart des lecteurs multimédia portables et smartphones modernes à l'exception notable des iPhone, iPad et iPodTouch Apple.</p>
+
+ <p>Quand vous branchez votre matériel, Banshee affiche son icône dans la partie gauche du menu. Cliquez sur cette icône pour ouvrir la page d'accueil de ce matériel dans Banshee et afficher vos préférences de synchronisation.</p>
+
+ </section>
+
+ <section id="sync-settings">
+ <title>Synchronisation de votre musique</title>
+ <p>Vous avez le choix entre laisser Banshee synchroniser automatiquement votre musique, ou le faire manuellement.</p>
+
+ <p>Choisissez votre matériel dans le menu de Banshee et ensuite la façon de synchroniser vos média, parmi :</p>
+ <list>
+ <item><p>la musique</p></item>
+ <item><p>les livres audio</p></item>
+ <item><p>les vidéos</p></item>
+ <item><p>les podcasts</p></item>
+ </list>
+
+ <p>À partir du menu déroulant de chacun des médias, choisissez entre :</p>
+ <list>
+ <item><p>gérer manuellement</p></item>
+ <item><p>synchroniser toute la bibliothèque</p></item>
+ </list>
+
+ <note style="warning">
+ <p>Si vous décidez de synchroniser automatiquement toute votre bibliothèque avec votre baladeur, assurez vous au préalable que celui-ci dispose de suffisamment de mémoire. Au cas où votre bibliothèque serait plus grande que l'espace mémoire disponible de votre lecteur, Banshee le synchronise jusqu'à ce qu'il soit plein puis s'arrête.</p>
+ </note>
+
+ <p>Si vous avez créé des listes de lectures simples ou intelligentes dans votre bibliothèque musicale, elles sont aussi affichées comme options de synchronisation musicale. Ceci est très pratique lorsque vous créez des listes de lecture intelligentes car celles-ci se mettent automatiquement à jour, au fur et à mesure de vos ajouts, en fonction des règles de la liste de lecture. Banshee synchronise la nouvelle liste avec votre lecteur à chaque branchement.</p>
+
+ <p>Banshee affiche la totalité du contenu de la mémoire de votre baladeur sous forme d'un graphique situé au bas au centre. Ce graphique montre combien d'espace est actuellement utilisé respectivement par les fichiers audio, vidéo et le reste, ainsi que l'espace encore disponible. Juste en-dessous, Banshee vous indique le nombre total d'éléments actuellement stockés sur votre lecteur, le nombre de jours ou d'heures d'écoute que cela représente, ainsi que l'espace mémoire total utilisé.</p>
+
+ </section>
+
+ <section id="sync-manually">
+ <title>Synchronisation de toute votre bibliothèque</title>
+ <p>Avec Banshee, vous pouvez utiliser le glisser/copier vers votre baladeur. Sélectionnez le ou les fichiers que vous voulez copier sur votre baladeur et glissez-les avec la souris sur l'icône de votre lecteur de médias.</p>
+
+ <p>Si votre bibliothèque est encodée sous un format non compatible avec votre baladeur comme OGG ou FLAC et si vous avez installé les codecs adéquats, Banshee fait automatiquement la conversion en MP3 pendant le transfert de vos fichiers vers votre baladeur. Vérifiez la disponibilité des codecs nécessaires pour votre distribution, étant donné que ceci est en-dehors du contexte de ce guide et que cela dépend de la distribution utilisée.</p>
+
+ <note style="tip">
+ <p>Vous pourriez être amené à retirer le volume pour transférer correctement des fichiers sur votre baladeur. Pour retirer le volume dans Banshee avec la souris, faites un clic droit sur son icône et choisissez <gui>Déconnecter</gui> dans le menu contextuel.</p>
+ </note>
+
+ </section>
+
+ <section id="pmp-play">
+ <title>Diffusion de musique à partir de votre baladeur</title>
+ <p>Vous pouvez directement diffuser de la musique stockée sur votre baladeur avec Banshee. Cliquez sur votre baladeur dans le volet gauche de Banshee et le contenu de celui-ci s'affiche. Vous pouvez alors diffuser ce contenu comme vous le feriez à partir de votre propre bibliothèque.</p>
+ </section>
+
+ <section id="pmp-delete">
+ <title>Suppression de pistes de votre baladeur</title>
+ <p>Pour supprimer des morceaux de votre baladeur, cliquez sur celui-ci pour afficher son contenu, sélectionnez les pistes à supprimer, faites un clic droit et choisissez « Supprimer », ou à partir du menu, choisissez l'élément <guiseq><gui>Édition</gui><gui>Supprimer</gui></guiseq>.</p>
+
+ <note style="warning">
+ <p>La suppression de fichiers de votre baladeur est un acte irréversible et vous ne pourrez plus les récupérer.</p>
+ </note>
+
+ </section>
+
+
+</page>
diff --git a/help/fr/ui.page b/help/fr/ui.page
new file mode 100644
index 0000000..ce74825
--- /dev/null
+++ b/help/fr/ui.page
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" id="ui">
+
+ <info>
+ <link type="guide" xref="index"/>
+ <revision pkgversion="2.0" version="0.1" date="2010-05-19" status="stub"/>
+ <desc>Un aperçu de l'interface utilisateur de <app>Banshee</app>.</desc>
+ <credit type="author">
+ <name>Paul Cutler</name>
+ <email>pcutler at gnome.org</email>
+ </credit>
+<!--
+ <copyright>
+ <year>2010</year>
+ <name>GNOME Documentation Project</name>
+ </copyright>
+-->
+ <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
+ </info>
+
+ <title>Introduction à l'interface utilisateur de Banshee</title>
+
+ <figure>
+ <title>Fenêtre du <gui>Lecteur multimédia Banshee</gui></title>
+ <desc><app>Lecteur multimédia Banshee</app></desc>
+ <media type="image" src="figures/banshee.png" mime="image/png" style="right">
+ <p>Interface de la bibliothèque <app>Banshee</app></p>
+ </media>
+ </figure>
+
+<section id="context">
+ <title>Ressources</title>
+ <p>Vos ressources musicales et vidéos apparaissent à gauche dans Banshee. Ces ressources permettent un accès rapide à vos files d'attente de lecture, musiques, vidéos, Amazon, Last.fm, podcasts et davantage encore.</p>
+
+ <note style="tip">
+ <p>Les options du menu sont différentes selon le choix de votre ressource. Par exemple, pour accéder au menu d'importation de podcast, vous devez sélectionner la ressource Podcast. Si vous êtes déjà en train de parcourir vos bibliothèques de vidéo ou de musique, cette option du menu est inaccessible.</p>
+ </note>
+</section>
+
+<section id="browser">
+ <title>L'explorateur de bibliothèque</title>
+ <p>En sélectionnant une ressource de musique ou de vidéo parmi vos ressources, Banshee affiche le contenu correspondant dans l'explorateur de bibliothèque. En fonction du choix de la ressource, Banshee peut afficher vos bibliothèques musicales ou vidéos, vos abonnements à des podcasts et même la boutique de musique Amazon pour vous permettre d'acheter de la musique.</p>
+</section>
+
+<section id="nowplaying">
+ <title>Affichage en mode Lecture en cours</title>
+ <p>Pratique lorsque vous utilisez Banshee en mode plein écran, le mode Lecture en cours masque la bibliothèque afin de vous offrir une vue optimale de la musique ou de la vidéo que vous regardez. Si vous écoutez de la musique, le mode Lecture en cours affiche le nom de l'artiste, de l'album et le graphisme de la pochette si disponible. Si vous regardez une vidéo, Banshee diffuse la vidéo.</p>
+
+ <p>Pour passer du mode Lecture en cours au mode plein écran et cacher l'interface utilisateur de Banshee, vous pouvez appuyer sur la touche <key>F</key> ou cliquer sur le bouton <gui>Plein écran</gui> dans le coin supérieur droit ou sélectionner la case <gui>Plein écran</gui> du menu <guiseq><gui>Affichage</gui></guiseq>.</p>
+
+</section>
+
+<section id="library">
+ <title>La bibliothèque</title>
+ <p>L'affichage de la bibliothèque dans Banshee est fonction de la ressource que vous avez sélectionnée. La bibliothèque musicale affiche les pochettes, les artistes et la liste des chansons disponibles. La bibliothèque des podcasts affiche vos abonnements en cours, les podcasts téléchargés ou non et tous les nouveaux ou anciens podcasts. Veuillez consulter chaque page d'aide correspondant à chacune des ressources possibles pour de plus amples informations sur chacune d'elle.</p>
+</section>
+
+
+</page>
diff --git a/help/gl/add-radio.page b/help/gl/add-radio.page
index e031c67..c150f84 100644
--- a/help/gl/add-radio.page
+++ b/help/gl/add-radio.page
@@ -29,7 +29,7 @@
<p>Internet radio stations are similar to regular radio stations, allowing
an individual or organization to stream music live over the internet.
Internet radio stations can be a simultaneous stream of a regular radio station,
- an amateur broadasting their own station, or commercial
+ an amateur broadcasting their own station, or commercial
internet radio stations that include live DJs and even commercials.</p>
</section>
diff --git a/help/gl/import.page b/help/gl/import.page
index 0cf3d2f..37bd8e7 100644
--- a/help/gl/import.page
+++ b/help/gl/import.page
@@ -51,7 +51,7 @@
</item>
<item>
<title><gui>Vídeos desde o cartafol Fotos</gui></title>
- <p>Many digital cameras can take short vidoes, and photo-management
+ <p>Many digital cameras can take short videos, and photo-management
applications often download these videos directly into your Photos
folder. Choose this option to import any videos that have been
stored in your Photos folder.</p>
diff --git a/help/gl/introduction.page b/help/gl/introduction.page
index 79f2a5f..079ed28 100644
--- a/help/gl/introduction.page
+++ b/help/gl/introduction.page
@@ -24,7 +24,7 @@
<p>
<app>Banshee</app> is a media player that allows you to play your music,
- videos, and other media media as well sync it with portable devices to take your media
+ videos, and other media as well sync it with portable devices to take your media
on the go.
</p>
<p>
diff --git a/help/gl/lastfm.page b/help/gl/lastfm.page
index c21854e..c854f77 100644
--- a/help/gl/lastfm.page
+++ b/help/gl/lastfm.page
@@ -24,7 +24,7 @@
<p>Last.fm is a popular online service that offers both free and paid
versions. Last.fm offers information on music artists and albums and if you
create a user profile Last.fm allows you to track the music you listen to
- in Banshee for free. If you suscribe as a paying member, you can also listen
+ in Banshee for free. If you subscribe as a paying member, you can also listen
to streaming music from Last.fm in various music clients, including Banshee.
Last.fm offers multiple channels to stream, including recommended music for
you based on your listening habits, your favorites and more.</p>
@@ -75,8 +75,8 @@
music you've loved or tagged.
</p>
- <p>In Banshee's context menu onthe left hand side, you will now have a
- Last.fm section, including your Lat.fm radio stations. You will need an
+ <p>In Banshee's context menu on the left hand side, you will now have a
+ Last.fm section, including your Last.fm radio stations. You will need an
active internet connection to listen to Last.fm radio. Choose the radio
station you wish to listen to and Banshee will communicate with Last.fm
to populate songs for that radio station. Press the <gui>Play</gui> button
diff --git a/help/gl/manage-playlists.page b/help/gl/manage-playlists.page
index a88a999..2c91724 100644
--- a/help/gl/manage-playlists.page
+++ b/help/gl/manage-playlists.page
@@ -42,7 +42,7 @@
<gui>New Playlist</gui></guiseq> or by selecing the track(s) you would like
to add to the playlist. Select the track(s), right click them, and choose
<guiseq><gui>Add to Playlist</gui><gui>New Playlist</gui></guiseq>.
- You can also drag and drop them to a new playlist by selcting the track(s)
+ You can also drag and drop them to a new playlist by selecting the track(s)
and dragging them to the left hand
window pane over <gui>Music</gui>. As you drag it over <gui>Music</gui>,
a new option <gui><em>New Playlist</em></gui> will appear and you can drop
diff --git a/help/gl/search.page b/help/gl/search.page
index 8a4595f..c8c90d2 100644
--- a/help/gl/search.page
+++ b/help/gl/search.page
@@ -34,7 +34,7 @@
<em>dave matthews</em>. By entering <em>dave matthews</em> in the search box,
Banshee will search all metatdata fields including Track Title, Album Title,
Album Artist, Year, etc. Any track whose metadata includes <em>dave</em>
- and <em>matthews</em> will be returned. Search terms are case, meaningyou don't have to capitalize. <em>dave</em>, <em>Dave</em>, and <em>DAVE</em>
+ and <em>matthews</em> will be returned. Search terms are case, meaning you don't have to capitalize. <em>dave</em>, <em>Dave</em>, and <em>DAVE</em>
all mean the same thing when searching.</p>
<section id="operators">
diff --git a/help/gl/sort.page b/help/gl/sort.page
index 6852d25..d06241d 100644
--- a/help/gl/sort.page
+++ b/help/gl/sort.page
@@ -45,7 +45,7 @@
<p>You can sort your library by using your mouse to click on any of the
columns displayed in library view. If you wish to sort your music library
by Artist, click the <gui>Artist</gui> column header and Banshee will
- automically sort that column alphabetically. Clicking the
+ automatically sort that column alphabetically. Clicking the
<gui>Artist</gui> column again will sort the column in reverse alphabetical
order.</p>
</section>
diff --git a/help/sl/search.page b/help/sl/search.page
index 58470a8..82ea96a 100644
--- a/help/sl/search.page
+++ b/help/sl/search.page
@@ -50,9 +50,7 @@
<td><p>OR, or, <key>|</key>, <key>,</key></p></td> <td><p>Rezultat iskanja bosta bila dva izraza s katerimkoli rezultatom v kateremukoli polju.</p></td>
</tr>
<tr>
- <td><p>NOT, not,<key>-</key></p></td> <td><p>
- Do not display search results with any search term that follows the
- operator of NOT, not,<key>-</key>.</p></td>
+ <td><p>NOT, not,<key>-</key></p></td> <td><p>Ne prikaži rezultatov iskanja s katerimkoli iskalnim izrazom, ki sledi operatorju NE, ne, <key>-</key>.</p></td>
</tr>
</table>
diff --git a/help/sl/sl.po b/help/sl/sl.po
index d844571..3b4ecaa 100644
--- a/help/sl/sl.po
+++ b/help/sl/sl.po
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: banshee help master\n"
-"POT-Creation-Date: 2010-11-09 02:38+0000\n"
-"PO-Revision-Date: 2010-11-09 17:58+0100\n"
+"POT-Creation-Date: 2010-12-03 23:03+0000\n"
+"PO-Revision-Date: 2010-12-05 11:22+0100\n"
"Last-Translator: Andrej Žnidaršič <andrej.znidarsic at gmail.com>\n"
"Language-Team: Slovenian GNOME Translation Team <gnome-si at googlegroups.com>\n"
"Language: \n"
@@ -272,7 +272,7 @@ msgid "Sorting Columns"
msgstr "Razvrščanje stolpcev"
#: C/sort.page:47(p)
-msgid "You can sort your library by using your mouse to click on any of the columns displayed in library view. If you wish to sort your music library by Artist, click the <gui>Artist</gui> column header and Banshee will automically sort that column alphabetically. Clicking the <gui>Artist</gui> column again will sort the column in reverse alphabetical order."
+msgid "You can sort your library by using your mouse to click on any of the columns displayed in library view. If you wish to sort your music library by Artist, click the <gui>Artist</gui> column header and Banshee will automatically sort that column alphabetically. Clicking the <gui>Artist</gui> column again will sort the column in reverse alphabetical order."
msgstr "Svojo knjižnico lahko razvrstite tako, da z miško kliknete na enega od stolpcev prikazanih v pogledu knjižnice. Če glasbeno knjižnico razvrstiti po izvajalcu, kliknite na glavo stolpca <gui>Izvajalec</gui> in Banshee bo stolpec samodejno razvrstil po abecedi. Ponoven klik na <gui>Izvajalec</gui> bo stolpec razvrstil v nasprotnem abecednem redu."
#: C/search.page:9(desc)
@@ -292,7 +292,7 @@ msgid "To perform a search of your media in Banshee, press the <key>S</key> or c
msgstr "Za izvedbo iskanja vaše večpredstavnosti v Banshee pritisnite <key>S</key> ali kliknite na polje <gui>Iskanje</gui> v zgornjem desnem kotu pogleda knjižnica v Banshee"
#: C/search.page:35(p)
-msgid "A search query consists of some basic terms, for example, <em>dave matthews</em>. By entering <em>dave matthews</em> in the search box, Banshee will search all metatdata fields including Track Title, Album Title, Album Artist, Year, etc. Any track whose metadata includes <em>dave</em> and <em>matthews</em> will be returned. Search terms are case, meaningyou don't have to capitalize. <em>dave</em>, <em>Dave</em>, and <em>DAVE</em> all mean the same thing when searching."
+msgid "A search query consists of some basic terms, for example, <em>dave matthews</em>. By entering <em>dave matthews</em> in the search box, Banshee will search all metatdata fields including Track Title, Album Title, Album Artist, Year, etc. Any track whose metadata includes <em>dave</em> and <em>matthews</em> will be returned. Search terms are case, meaning you don't have to capitalize. <em>dave</em>, <em>Dave</em>, and <em>DAVE</em> all mean the same thing when searching."
msgstr "Iskalna poizvedba je sestavljena iz nekaj osnovnih nizov na primer <em>janez novak</em>. Če v iskalno polje vnesete <em>janez novak</em>, bo Banshee preiskal vsa polja metapodatkov, vključno z naslovom skladbe, naslovom albuma, izvajalcem albuma, letom, itd. Vsaka skladba katere metapodatki vsebujejo <em>janez</em> in <em>novak</em> bo vrnjena kot rezultat. Iskalni izrazi so neodvisni od velikosti črk. <em>janez</em>, <em>Janez</em> in <em>JANEZ</em> med iskanjem pomenijo enako stvar."
#: C/search.page:43(title)
@@ -345,7 +345,7 @@ msgid "NOT, not,<key>-</key>"
msgstr "NOT, not,<key>-</key>"
#: C/search.page:73(p)
-msgid "Do not display search results with any search team that follows the operator of NOT, not,<key>-</key>."
+msgid "Do not display search results with any search term that follows the operator of NOT, not,<key>-</key>."
msgstr "Ne prikaži rezultatov iskanja s katerimkoli iskalnim izrazom, ki sledi operatorju NE, ne, <key>-</key>."
#: C/search.page:80(p)
@@ -624,7 +624,7 @@ msgid "A normal playlist is a list of songs that you add and manage. You might w
msgstr "Običajen seznam predvajanja je seznam skladb, ki jih dodajate in upravljate. Morda želite ustvariti svoj lasten seznam skladb svojega priljubljenega izvajalca iz več albumov, svojih zadnjih priljubljenih skladb ali poskočen seznam predvajanja za poslušanje med telesno vadbo. "
#: C/manage-playlists.page:42(p)
-msgid "You can create a new playlist by pressing <keyseq><key>Control</key><key>N</key></keyseq>, from the menu choosing <guiseq><gui>Menu</gui><gui>New Playlist</gui></guiseq> or by selecing the track(s) you would like to add to the playlist. Select the track(s), right click them, and choose <guiseq><gui>Add to Playlist</gui><gui>New Playlist</gui></guiseq>. You can also drag and drop them to a new playlist by selcting the track(s) and dragging them to the left hand window pane over <gui>Music</gui>. As you drag it over <gui>Music</gui>, a new option <gui><em>New Playlist</em></gui> will appear and you can drop the track(s) over <gui><em>New Playlist</em></gui> to add them to the playlist. You can repeat this process until you have added all the tracks you want in the playlist."
+msgid "You can create a new playlist by pressing <keyseq><key>Control</key><key>N</key></keyseq>, from the menu choosing <guiseq><gui>Menu</gui><gui>New Playlist</gui></guiseq> or by selecing the track(s) you would like to add to the playlist. Select the track(s), right click them, and choose <guiseq><gui>Add to Playlist</gui><gui>New Playlist</gui></guiseq>. You can also drag and drop them to a new playlist by selecting the track(s) and dragging them to the left hand window pane over <gui>Music</gui>. As you drag it over <gui>Music</gui>, a new option <gui><em>New Playlist</em></gui> will appear and you can drop the track(s) over <gui><em>New Playlist</em></gui> to add them to the playlist. You can repeat this process until you have added all the tracks you want in the playlist."
msgstr "Nov seznam predvajanja lahko ustvarite s pritiskom <keyseq><key>Control</key><key>N</key></keyseq>, z izbiro <guiseq><gui>Meni</gui><gui>Nov seznam predvajanja</gui></guiseq> ali z izbiro skladb, ki jih želite dodati na seznam predvajanja. Izberite skladb-o/e, desno kliknite na njih in izberite <guiseq><gui>Dodaj na seznam predvajanja</gui><gui>Nov seznam predvajanja</gui></guiseq>. Skladbe lahko na nov seznam predvajanja tudi povlečete in spustite tako, da skladbe izberete in jih povlečete na levi pladenj okna nad <gui>Glasba</gui>. Ko boste skladbe povlekli nad <gui>Glasba</gui>, se bo pojavila nova možnost <gui><em>Nov seznam predvajanja</em></gui>. Za dodajanje skladb jih spustite nad <gui><em>Nov seznam predvajanja</em></gui>. Opravilo lahko ponavljate toliko časa, dokler nimate na seznamu predvajanja vseh želenih skladb."
#: C/manage-playlists.page:56(p)
@@ -754,7 +754,7 @@ msgid "Last.fm"
msgstr "Last.fm"
#: C/lastfm.page:26(p)
-msgid "Last.fm is a popular online service that offers both free and paid versions. Last.fm offers information on music artists and albums and if you create a user profile Last.fm allows you to track the music you listen to in Banshee for free. If you suscribe as a paying member, you can also listen to streaming music from Last.fm in various music clients, including Banshee. Last.fm offers multiple channels to stream, including recommended music for you based on your listening habits, your favorites and more."
+msgid "Last.fm is a popular online service that offers both free and paid versions. Last.fm offers information on music artists and albums and if you create a user profile Last.fm allows you to track the music you listen to in Banshee for free. If you subscribe as a paying member, you can also listen to streaming music from Last.fm in various music clients, including Banshee. Last.fm offers multiple channels to stream, including recommended music for you based on your listening habits, your favorites and more."
msgstr "Last.fm je priljubljena spletna storitev, ki ponuja tako brezplačno in plačano različico. Last.fm ponuja podatke o glasbenih izvajalci in albumih in če ustvarite uporabniški profil, vam Last.fm omogoča brezplačno sledenje glasbe, ki jo poslušate v Banshee. Če se naročite kot plačujoči član, lahko poslušate tudi pretakajočo glasbo z Last.fm v različnih glasbenih odjemalcih vklučno z Banshee. Last.fm ponuja več kanalov za pretok vključno s priporočeno glasbo za vas na osnovi vaših navad poslušanja, vaših priljubljenih in več. "
#: C/lastfm.page:35(title)
@@ -786,7 +786,7 @@ msgid "Last.fm radio is free for residents of the United States, United Kingdom
msgstr "Radio Last.fm je brezplačen za prebivalce Združenih držav Amerike, Združenega Kraljestva in Nemčije. Prebivalci drugih držav morajo plačati za premijski račun z Last.fm za poslušanje radia. Premijski člani v vseh državah prejmejo tudi zmožnosti premijskega radia: poslušanje seznamov predvajanja in postaj glasbe, ki vam je všeč ali ste jo označili."
#: C/lastfm.page:80(p)
-msgid "In Banshee's context menu onthe left hand side, you will now have a Last.fm section, including your Lat.fm radio stations. You will need an active internet connection to listen to Last.fm radio. Choose the radio station you wish to listen to and Banshee will communicate with Last.fm to populate songs for that radio station. Press the <gui>Play</gui> button in Banshee or <key>Spacebar</key> to start streaming a Last.fm radio station. You can also press the <gui>Next</gui> button in Banshee, <key>N</key> or choose <guiseq><gui>Playback</gui><gui>Next</gui></guiseq> to play the next song in your radio station queue."
+msgid "In Banshee's context menu on the left hand side, you will now have a Last.fm section, including your Last.fm radio stations. You will need an active internet connection to listen to Last.fm radio. Choose the radio station you wish to listen to and Banshee will communicate with Last.fm to populate songs for that radio station. Press the <gui>Play</gui> button in Banshee or <key>Spacebar</key> to start streaming a Last.fm radio station. You can also press the <gui>Next</gui> button in Banshee, <key>N</key> or choose <guiseq><gui>Playback</gui><gui>Next</gui></guiseq> to play the next song in your radio station queue."
msgstr "V vsebinskem meniju na levi strani Banshee boste imeli sedaj odsek Last.fm, vključno s svojimi radijskimi postajami Last.fm. Za poslušanje radia Last.fm boste potrebovali dejavno internetno povezavo. Izberite radijsko postajo, ki jo želite poslušati. Banshee bo komuniciral z Last.fm za dodajanje skladb za to radijsko postajo. V Banshee pritisnite gumb <gui>Predvajaj</gui> ali <key>Preslednico</key> za začetek pretakanja radijske postaje Last.fm. Za predvajanje naslednje skladbe v čakalni vrsti svoje radijske postaje lahko pritisnete gumb <gui>Naslednja</gui>, tipko <key>N</key> ali izberite <guiseq><gui>Predvajanje</gui><gui>Naslednja</gui></guiseq>."
#: C/keyboardshortcuts.page:7(desc)
@@ -968,7 +968,7 @@ msgid "Introduction"
msgstr "Uvod"
#: C/introduction.page:26(p)
-msgid "<app>Banshee</app> is a media player that allows you to play your music, videos, and other media media as well sync it with portable devices to take your media on the go."
+msgid "<app>Banshee</app> is a media player that allows you to play your music, videos, and other media as well sync it with portable devices to take your media on the go."
msgstr "<app>Banshee</app> je večpredstavnostni predvajalnik, ki vam omogoča predvajanja vaše glasbe, videov in drugih večpredstavnostnih datotek kot tudi njihovo usklajevanje s prenosnimi napravami."
#: C/introduction.page:31(p)
@@ -1060,7 +1060,7 @@ msgid "Videos From Photos Folder"
msgstr "Videoposnetki iz mape fotografij"
#: C/import.page:55(p)
-msgid "Many digital cameras can take short vidoes, and photo-management applications often download these videos directly into your Photos folder. Choose this option to import any videos that have been stored in your Photos folder."
+msgid "Many digital cameras can take short videos, and photo-management applications often download these videos directly into your Photos folder. Choose this option to import any videos that have been stored in your Photos folder."
msgstr "Veliko digitalnih fotoaparatov lahko posname kratke videoposnetke, ki jih programi za upravljanje fotografij pogosto uvozijo v vašo mapo Slike. Izberite to možnost za uvoz videov, ki so bili shranjeni v vaši mapi Slike. "
#: C/import.page:63(p)
@@ -1180,7 +1180,7 @@ msgid "What is Internet Radio?"
msgstr "Kaj je internetni radio?"
#: C/add-radio.page:31(p)
-msgid "Internet radio stations are similar to regular radio stations, allowing an individual or organization to stream music live over the internet. Internet radio stations can be a simultaneous stream of a regular radio station, an amateur broadasting their own station, or commercial internet radio stations that include live DJs and even commercials."
+msgid "Internet radio stations are similar to regular radio stations, allowing an individual or organization to stream music live over the internet. Internet radio stations can be a simultaneous stream of a regular radio station, an amateur broadcasting their own station, or commercial internet radio stations that include live DJs and even commercials."
msgstr "Internetne radijske postaje so podobne običajnim radijskim postajam. Posamezniku ali organizaciji omogočajo živo pretakanje glasbe preko interneta. Internetne radijske postaje so lahko hkraten pretok običajne radijske postaje, amaterji, ki razpršeno oddajajo svojo lastno postajo ali komercialne internetne radijske postaje, ki vključujejo DJ-je in celo reklame."
#: C/add-radio.page:41(title)
diff --git a/libbanshee/Makefile.in b/libbanshee/Makefile.in
index 202cdba..fa30ffb 100644
--- a/libbanshee/Makefile.in
+++ b/libbanshee/Makefile.in
@@ -44,14 +44,6 @@ DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -75,9 +67,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -240,6 +242,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -259,6 +263,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -366,6 +372,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -412,7 +420,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/libbanshee/banshee-player-pipeline.c b/libbanshee/banshee-player-pipeline.c
index 6bca604..e0b3759 100644
--- a/libbanshee/banshee-player-pipeline.c
+++ b/libbanshee/banshee-player-pipeline.c
@@ -87,9 +87,10 @@ bp_next_track_starting (BansheePlayer *player)
g_return_val_if_fail (IS_BANSHEE_PLAYER (player), FALSE);
g_return_val_if_fail (GST_IS_ELEMENT (player->playbin), FALSE);
- // Work around BGO #602437 - gapless transition between tracks with
+ // FIXME: Work around BGO #602437 - gapless transition between tracks with
// video streams results in broken behaviour - most obviously, huge A/V
// sync issues.
+ // Will be in GStreamer 0.10.31
has_video = bp_stream_has_video (player->playbin);
if (player->in_gapless_transition && has_video) {
gchar *uri;
@@ -272,6 +273,7 @@ static void bp_volume_changed_callback (GstElement *playbin, GParamSpec *spec, B
gboolean
_bp_pipeline_construct (BansheePlayer *player)
{
+ GValue value = {0};
GstBus *bus;
GstPad *teepad;
GstElement *audiosink;
@@ -402,27 +404,20 @@ _bp_pipeline_construct (BansheePlayer *player)
// Connect to the bus to get messages
bus = gst_pipeline_get_bus (GST_PIPELINE (player->playbin));
gst_bus_add_watch (bus, bp_pipeline_bus_callback, player);
+
+ GstPad *sinkpad = gst_element_get_pad (audiosinkqueue, "sink");
+ g_value_init (&value, G_OBJECT_TYPE (sinkpad));
+ g_value_set_instance (&value, sinkpad);
+ g_object_set_property (G_OBJECT (player->audiotee), "alloc-pad", &value);
+ g_value_unset (&value);
+
+ // Link the first tee pad to the primary audio sink queue
+ gst_pad_link (gst_element_get_request_pad (player->audiotee, "src0"), sinkpad);
// Now allow specialized pipeline setups
_bp_cdda_pipeline_setup (player);
_bp_video_pipeline_setup (player, bus);
- // This call must be the last one in the pipeline setup to work around a
- // GStreamer 0.10.21-0.10.22 algorithm that causes the last-allocated pad
- // to be the one used for buffer allocations. If the visualization one
- // winds up being used for that then the pipeline will freeze when
- // visualizations are disabled.
- //
- // When 0.10.23 is more mainstream we can use the new alloc-pad property to
- // force selection of this pad for allocation. Until then we just have to
- // make sure it's the last one allocated.
- //
- // -- Chris Howie <cdhowie at gmail.com>
-
- // Link the first tee pad to the primary audio sink queue
- gst_pad_link (gst_element_get_request_pad (player->audiotee, "src0"),
- gst_element_get_pad (audiosinkqueue, "sink"));
-
return TRUE;
}
diff --git a/libbanshee/banshee-player-private.h b/libbanshee/banshee-player-private.h
index f3e28a7..4d9bf44 100644
--- a/libbanshee/banshee-player-private.h
+++ b/libbanshee/banshee-player-private.h
@@ -41,6 +41,7 @@
#include <gdk/gdk.h>
#include <gst/fft/gstfftf32.h>
#include <gst/pbutils/pbutils.h>
+#include <gst/tag/tag.h>
#if defined(GDK_WINDOWING_X11)
# include <gdk/gdkx.h>
diff --git a/libbanshee/banshee-player-video.c b/libbanshee/banshee-player-video.c
index 8319403..b901354 100644
--- a/libbanshee/banshee-player-video.c
+++ b/libbanshee/banshee-player-video.c
@@ -57,7 +57,7 @@ bp_video_find_xoverlay (BansheePlayer *player)
g_mutex_unlock (player->video_mutex);
return FALSE;
}
-
+
xoverlay = GST_IS_BIN (video_sink)
? gst_bin_get_by_interface (GST_BIN (video_sink), GST_TYPE_X_OVERLAY)
: video_sink;
@@ -89,6 +89,41 @@ bp_video_find_xoverlay (BansheePlayer *player)
#endif /* GDK_WINDOWING_X11 || GDK_WINDOWING_WIN32 */
+P_INVOKE int
+bp_get_subtitle_count (BansheePlayer *player)
+{
+ g_return_val_if_fail (IS_BANSHEE_PLAYER (player), 0);
+
+ int n_text;
+ g_object_get (G_OBJECT (player->playbin), "n-text", &n_text, NULL);
+ return n_text;
+}
+
+P_INVOKE void
+bp_set_subtitle (BansheePlayer *player, int index)
+{
+ g_return_if_fail (IS_BANSHEE_PLAYER (player));
+
+ int n_text = bp_get_subtitle_count (player);
+
+ if (n_text == 0 || index < -1 || index >= n_text)
+ return;
+
+ bp_debug ("[subtitle]: set subtitle to %d.", index);
+
+ gint flags;
+ g_object_get (G_OBJECT (player->playbin), "flags", &flags, NULL);
+
+ if (index == -1) {
+ flags &= ~(1 << 2);//GST_PLAY_FLAG_TEXT
+ g_object_set (G_OBJECT (player->playbin), "flags", flags, NULL);
+ } else {
+ flags |= (1 << 2);//GST_PLAY_FLAG_TEXT
+ g_object_set (G_OBJECT (player->playbin), "flags", flags, NULL);
+ g_object_set (G_OBJECT (player->playbin), "current-text", index, NULL);
+ }
+}
+
static void
bp_video_sink_element_added (GstBin *videosink, GstElement *element, BansheePlayer *player)
{
diff --git a/libbanshee/banshee-player.c b/libbanshee/banshee-player.c
index ef15efd..56f8319 100644
--- a/libbanshee/banshee-player.c
+++ b/libbanshee/banshee-player.c
@@ -49,6 +49,47 @@ bp_pipeline_set_state (BansheePlayer *player, GstState state)
}
}
+static void
+bp_lookup_for_subtitle (BansheePlayer *player, const gchar *uri)
+{
+ gchar *scheme, *filename, *subfile, *dot, *suburi;
+ int j;
+ // Always enable rendering of subtitles
+ gint flags;
+ g_object_get (G_OBJECT (player->playbin), "flags", &flags, NULL);
+ flags |= (1 << 2);//GST_PLAY_FLAG_TEXT
+ g_object_set (G_OBJECT (player->playbin), "flags", flags, NULL);
+
+ bp_debug ("[subtitle]: lookup for subtitle for video file.");
+ scheme = g_uri_parse_scheme (uri);
+ static gchar *subtitle_extensions[] = { ".srt", ".sub", ".smi", ".txt", ".mpl", ".dks", ".qtx" };
+ if (scheme == NULL || strcmp (scheme, "file") != 0) {
+ g_free (scheme);
+ return;
+ }
+ g_free (scheme);
+
+ dot = g_strrstr (uri, ".");
+ if (dot == NULL)
+ return;
+ filename = g_filename_from_uri (g_strndup (uri, dot - uri), NULL, NULL);
+
+ for (j = 0; j < G_N_ELEMENTS (subtitle_extensions); j++) {
+ subfile = g_strconcat (filename, subtitle_extensions[j], NULL);
+ if (g_file_test (subfile, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR)) {
+ bp_debug ("[subtitle]: Found srt file: %s", subfile);
+ suburi = g_filename_to_uri (subfile, NULL, NULL);
+ g_object_set (G_OBJECT (player->playbin), "suburi", suburi, NULL);
+ g_free (suburi);
+ g_free (subfile);
+ g_free (filename);
+ return;
+ }
+ g_free (subfile);
+ }
+ g_free (filename);
+}
+
// ---------------------------------------------------------------------------
// Public Functions
// ---------------------------------------------------------------------------
@@ -128,6 +169,9 @@ bp_open (BansheePlayer *player, const gchar *uri)
// Pass the request off to playbin
g_object_set (G_OBJECT (player->playbin), "uri", uri, NULL);
+ // Lookup for subtitle files with same name/folder
+ bp_lookup_for_subtitle (player, uri);
+
player->in_gapless_transition = FALSE;
return TRUE;
@@ -172,6 +216,7 @@ bp_set_next_track (BansheePlayer *player, const gchar *uri)
g_return_val_if_fail (IS_BANSHEE_PLAYER (player), FALSE);
g_return_val_if_fail (player->playbin != NULL, FALSE);
g_object_set (G_OBJECT (player->playbin), "uri", uri, NULL);
+ bp_lookup_for_subtitle (player, uri);
return TRUE;
}
@@ -373,3 +418,76 @@ bp_set_about_to_finish_callback (BansheePlayer *player, BansheePlayerAboutToFini
{
SET_CALLBACK (about_to_finish_cb);
}
+
+P_INVOKE void
+bp_set_subtitle_uri (BansheePlayer *player, const gchar *uri)
+{
+ g_return_if_fail (IS_BANSHEE_PLAYER (player));
+ gint64 pos = -1;
+ GstState state;
+ GstFormat format = GST_FORMAT_BYTES;
+ gboolean paused = FALSE;
+
+ // Gstreamer playbin do not support to set suburi during playback
+ // so have to stop/play and seek
+ gst_element_get_state (player->playbin, &state, NULL, 0);
+ paused = (state == GST_STATE_PAUSED);
+ if (state >= GST_STATE_PAUSED) {
+ gst_element_query_position (player->playbin, &format, &pos);
+ gst_element_set_state (player->playbin, GST_STATE_READY);
+ // Force to wait asynch operation
+ gst_element_get_state (player->playbin, &state, NULL, -1);
+ }
+
+ g_object_set (G_OBJECT (player->playbin), "suburi", uri, NULL);
+ gst_element_set_state (player->playbin, paused ? GST_STATE_PAUSED : GST_STATE_PLAYING);
+
+ // Force to wait asynch operation
+ gst_element_get_state (player->playbin, &state, NULL, -1);
+
+ if (pos != -1) {
+ gst_element_seek_simple (player->playbin, format, GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_KEY_UNIT, pos);
+ }
+}
+
+P_INVOKE gchar *
+bp_get_subtitle_uri (BansheePlayer *player)
+{
+ gchar *uri;
+ g_return_val_if_fail (IS_BANSHEE_PLAYER (player), "");
+ g_object_get (G_OBJECT (player->playbin), "suburi", &uri, NULL);
+ return uri;
+}
+
+P_INVOKE gchar *
+bp_get_subtitle_description (BansheePlayer *player, int i)
+{
+ gchar *code;
+ gchar *desc = NULL;
+ GstTagList *tags = NULL;
+
+ g_return_val_if_fail (IS_BANSHEE_PLAYER (player), NULL);
+
+ g_signal_emit_by_name (G_OBJECT (player->playbin), "get-text-tags", i, &tags);
+ if (G_LIKELY(tags)) {
+ gst_tag_list_get_string (tags, GST_TAG_LANGUAGE_CODE, &code);
+ gst_tag_list_free (tags);
+
+ g_return_val_if_fail (code != NULL, NULL);
+
+ // ISO 639-2 undetermined language
+ if (strcmp ((const gchar *)code, "und") == 0) {
+ return NULL;
+ }
+ bp_debug ("[subtitle]: iso 639-2 subtitle code %s", code);
+#ifdef HAVE_GST_0_10_26
+ desc = (gchar *) gst_tag_get_language_name ((const gchar *)&code);
+ bp_debug ("[subtitle]: subtitle language: %s", desc);
+#else
+ desc = g_strdup (code);
+#endif
+
+ g_free (code);
+ }
+ return desc;
+}
diff --git a/ltmain.sh b/ltmain.sh
index 7ed280b..d41416a 100755
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -1,9 +1,10 @@
# Generated from ltmain.m4sh.
-# ltmain.sh (GNU libtool) 2.2.6b
+# libtool (GNU libtool) 2.2.10
# Written by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
+# 2007, 2008, 2009, 2010 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.
@@ -32,50 +33,54 @@
#
# Provide generalized library-building support services.
#
-# --config show all configuration variables
-# --debug enable verbose shell tracing
-# -n, --dry-run display commands without modifying any files
-# --features display basic configuration information and exit
-# --mode=MODE use operation mode MODE
-# --preserve-dup-deps don't remove duplicate dependency libraries
-# --quiet, --silent don't print informational messages
-# --tag=TAG use configuration variables from tag TAG
-# -v, --verbose print informational messages (default)
-# --version print version information
-# -h, --help print short or long help message
+# --config show all configuration variables
+# --debug enable verbose shell tracing
+# -n, --dry-run display commands without modifying any files
+# --features display basic configuration information and exit
+# --mode=MODE use operation mode MODE
+# --preserve-dup-deps don't remove duplicate dependency libraries
+# --quiet, --silent don't print informational messages
+# --no-quiet, --no-silent
+# print informational messages (default)
+# --tag=TAG use configuration variables from tag TAG
+# -v, --verbose print more informational messages than default
+# --no-verbose don't print the extra informational messages
+# --version print version information
+# -h, --help, --help-all print short, long, or detailed help message
#
# MODE must be one of the following:
#
-# clean remove files from the build directory
-# compile compile a source file into a libtool object
-# execute automatically set library path, then run a program
-# finish complete the installation of libtool libraries
-# install install libraries or executables
-# link create a library or an executable
-# uninstall remove libraries from an installed directory
+# clean remove files from the build directory
+# compile compile a source file into a libtool object
+# execute automatically set library path, then run a program
+# finish complete the installation of libtool libraries
+# install install libraries or executables
+# link create a library or an executable
+# uninstall remove libraries from an installed directory
#
-# MODE-ARGS vary depending on the MODE.
+# MODE-ARGS vary depending on the MODE. When passed as first option,
+# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
#
# When reporting a bug, please describe a test case to reproduce it and
# include the following information:
#
-# host-triplet: $host
-# shell: $SHELL
-# compiler: $LTCC
-# compiler flags: $LTCFLAGS
-# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1
-# automake: $automake_version
-# autoconf: $autoconf_version
+# host-triplet: $host
+# shell: $SHELL
+# compiler: $LTCC
+# compiler flags: $LTCFLAGS
+# linker: $LD (gnu? $with_gnu_ld)
+# $progname: (GNU libtool) 2.2.10
+# automake: $automake_version
+# autoconf: $autoconf_version
#
# Report bugs to <bug-libtool at gnu.org>.
-PROGRAM=ltmain.sh
+PROGRAM=libtool
PACKAGE=libtool
-VERSION="2.2.6b Debian-2.2.6b-2ubuntu1"
+VERSION=2.2.10
TIMESTAMP=""
-package_revision=1.3017
+package_revision=1.3175
# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -91,10 +96,15 @@ fi
BIN_SH=xpg4; export BIN_SH # for Tru64
DUALCASE=1; export DUALCASE # for MKS sh
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+ eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+}
+
# NLS nuisances: We save the old values to restore during execute mode.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
lt_user_locale=
lt_safe_locale=
for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
@@ -107,24 +117,33 @@ do
lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
fi"
done
+LC_ALL=C
+LANGUAGE=C
+export LANGUAGE LC_ALL
$lt_unset CDPATH
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath="$0"
: ${CP="cp -f"}
-: ${ECHO="echo"}
-: ${EGREP="/bin/grep -E"}
-: ${FGREP="/bin/grep -F"}
-: ${GREP="/bin/grep"}
+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
+: ${EGREP="grep -E"}
+: ${FGREP="grep -F"}
+: ${GREP="grep"}
: ${LN_S="ln -s"}
: ${MAKE="make"}
: ${MKDIR="mkdir"}
: ${MV="mv -f"}
: ${RM="rm -f"}
-: ${SED="/bin/sed"}
+: ${SED="sed"}
: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
: ${Xsed="$SED -e 1s/^X//"}
@@ -159,32 +178,168 @@ basename="s,^.*/,,"
func_dirname_and_basename ()
{
# Extract subdirectory from the argument.
- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+ func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
if test "X$func_dirname_result" = "X${1}"; then
func_dirname_result="${3}"
else
func_dirname_result="$func_dirname_result${2}"
fi
- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+ func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
}
# Generated shell functions inserted here.
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath="$0"
+# These SED scripts presuppose an absolute path with a trailing slash.
+pathcar='s,^/\([^/]*\).*$,\1,'
+pathcdr='s,^/[^/]*,,'
+removedotparts=':dotsl
+ s@/\./@/@g
+ t dotsl
+ s,/\.$,/,'
+collapseslashes='s@/\{1,\}@/@g'
+finalslash='s,/*$,/,'
+
+# func_normal_abspath PATH
+# Remove doubled-up and trailing slashes, "." path components,
+# and cancel out any ".." path components in PATH after making
+# it an absolute path.
+# value returned in "$func_normal_abspath_result"
+func_normal_abspath ()
+{
+ # Start from root dir and reassemble the path.
+ func_normal_abspath_result=
+ func_normal_abspath_tpath=$1
+ func_normal_abspath_altnamespace=
+ case $func_normal_abspath_tpath in
+ "")
+ # Empty path, that just means $cwd.
+ func_stripname '' '/' "`pwd`"
+ func_normal_abspath_result=$func_stripname_result
+ return
+ ;;
+ # The next three entries are used to spot a run of precisely
+ # two leading slashes without using negated character classes;
+ # we take advantage of case's first-match behaviour.
+ ///*)
+ # Unusual form of absolute path, do nothing.
+ ;;
+ //*)
+ # Not necessarily an ordinary path; POSIX reserves leading '//'
+ # and for example Cygwin uses it to access remote file shares
+ # over CIFS/SMB, so we conserve a leading double slash if found.
+ func_normal_abspath_altnamespace=/
+ ;;
+ /*)
+ # Absolute path, do nothing.
+ ;;
+ *)
+ # Relative path, prepend $cwd.
+ func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
+ ;;
+ esac
+ # Cancel out all the simple stuff to save iterations. We also want
+ # the path to end with a slash for ease of parsing, so make sure
+ # there is one (and only one) here.
+ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+ -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
+ while :; do
+ # Processed it all yet?
+ if test "$func_normal_abspath_tpath" = / ; then
+ # If we ascended to the root using ".." the result may be empty now.
+ if test -z "$func_normal_abspath_result" ; then
+ func_normal_abspath_result=/
+ fi
+ break
+ fi
+ func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
+ -e "$pathcar"`
+ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+ -e "$pathcdr"`
+ # Figure out what to do with it
+ case $func_normal_abspath_tcomponent in
+ "")
+ # Trailing empty path component, ignore it.
+ ;;
+ ..)
+ # Parent dir; strip last assembled component from result.
+ func_dirname "$func_normal_abspath_result"
+ func_normal_abspath_result=$func_dirname_result
+ ;;
+ *)
+ # Actual path component, append it.
+ func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
+ ;;
+ esac
+ done
+ # Restore leading double-slash if one was found on entry.
+ func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
+}
+
+# func_relative_path SRCDIR DSTDIR
+# generates a relative path from SRCDIR to DSTDIR, with a trailing
+# slash if non-empty, suitable for immediately appending a filename
+# without needing to append a separator.
+# value returned in "$func_relative_path_result"
+func_relative_path ()
+{
+ func_relative_path_result=
+ func_normal_abspath "$1"
+ func_relative_path_tlibdir=$func_normal_abspath_result
+ func_normal_abspath "$2"
+ func_relative_path_tbindir=$func_normal_abspath_result
+
+ # Ascend the tree starting from libdir
+ while :; do
+ # check if we have found a prefix of bindir
+ case $func_relative_path_tbindir in
+ $func_relative_path_tlibdir)
+ # found an exact match
+ func_relative_path_tcancelled=
+ break
+ ;;
+ $func_relative_path_tlibdir*)
+ # found a matching prefix
+ func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
+ func_relative_path_tcancelled=$func_stripname_result
+ if test -z "$func_relative_path_result"; then
+ func_relative_path_result=.
+ fi
+ break
+ ;;
+ *)
+ func_dirname $func_relative_path_tlibdir
+ func_relative_path_tlibdir=${func_dirname_result}
+ if test "x$func_relative_path_tlibdir" = x ; then
+ # Have to descend all the way to the root!
+ func_relative_path_result=../$func_relative_path_result
+ func_relative_path_tcancelled=$func_relative_path_tbindir
+ break
+ fi
+ func_relative_path_result=../$func_relative_path_result
+ ;;
+ esac
+ done
+
+ # Now calculate path; take care to avoid doubling-up slashes.
+ func_stripname '' '/' "$func_relative_path_result"
+ func_relative_path_result=$func_stripname_result
+ func_stripname '/' '/' "$func_relative_path_tcancelled"
+ if test "x$func_stripname_result" != x ; then
+ func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
+ fi
+
+ # Normalisation. If bindir is libdir, return empty string,
+ # else relative path ending with a slash; either way, target
+ # file name can be directly appended.
+ if test ! -z "$func_relative_path_result"; then
+ func_stripname './' '' "$func_relative_path_result/"
+ func_relative_path_result=$func_stripname_result
+ fi
+}
# The name of this program:
-# In the unlikely event $progname began with a '-', it would play havoc with
-# func_echo (imagine progname=-n), so we prepend ./ in that case:
func_dirname_and_basename "$progpath"
progname=$func_basename_result
-case $progname in
- -*) progname=./$progname ;;
-esac
# Make sure we have an absolute path for reexecution:
case $progpath in
@@ -258,6 +413,13 @@ func_verbose ()
:
}
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+ $ECHO "$*"
+}
+
# func_error arg...
# Echo program name prefixed message to standard error.
func_error ()
@@ -326,9 +488,9 @@ func_mkdir_p ()
case $my_directory_path in */*) ;; *) break ;; esac
# ...otherwise throw away the child directory and loop
- my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`
+ my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
done
- my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
+ my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
save_mkdir_p_IFS="$IFS"; IFS=':'
for my_dir in $my_dir_list; do
@@ -378,7 +540,7 @@ func_mktempdir ()
func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
fi
- $ECHO "X$my_tmpdir" | $Xsed
+ $ECHO "$my_tmpdir"
}
@@ -392,7 +554,7 @@ func_quote_for_eval ()
{
case $1 in
*[\\\`\"\$]*)
- func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;
+ func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
*)
func_quote_for_eval_unquoted_result="$1" ;;
esac
@@ -419,7 +581,7 @@ func_quote_for_expand ()
{
case $1 in
*[\\\`\"]*)
- my_arg=`$ECHO "X$1" | $Xsed \
+ my_arg=`$ECHO "$1" | $SED \
-e "$double_quote_subst" -e "$sed_double_backslash"` ;;
*)
my_arg="$1" ;;
@@ -489,14 +651,19 @@ func_show_eval_locale ()
}
-
-
-
# func_version
# Echo version message to standard output and exit.
func_version ()
{
- $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
+ $SED -n '/(C)/!b go
+ :more
+ /\./!{
+ N
+ s/\n# / /
+ b more
+ }
+ :go
+ /^# '$PROGRAM' (GNU /,/# warranty; / {
s/^# //
s/^# *$//
s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
@@ -509,19 +676,20 @@ func_version ()
# Echo short help message to standard output and exit.
func_usage ()
{
- $SED -n '/^# Usage:/,/# -h/ {
+ $SED -n '/^# Usage:/,/^# *.*--help/ {
s/^# //
s/^# *$//
s/\$progname/'$progname'/
p
}' < "$progpath"
- $ECHO
+ echo
$ECHO "run \`$progname --help | more' for full usage"
exit $?
}
-# func_help
-# Echo long help message to standard output and exit.
+# func_help [NOEXIT]
+# Echo long help message to standard output and exit,
+# unless 'noexit' is passed as argument.
func_help ()
{
$SED -n '/^# Usage:/,/# Report bugs to/ {
@@ -538,7 +706,10 @@ func_help ()
s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
p
}' < "$progpath"
- exit $?
+ ret=$?
+ if test -z "$1"; then
+ exit $ret
+ fi
}
# func_missing_arg argname
@@ -546,7 +717,7 @@ func_help ()
# exit_cmd.
func_missing_arg ()
{
- func_error "missing argument for $1"
+ func_error "missing argument for $1."
exit_cmd=exit
}
@@ -556,29 +727,6 @@ exit_cmd=:
-# Check that we have a working $ECHO.
-if test "X$1" = X--no-reexec; then
- # Discard the --no-reexec flag, and continue.
- shift
-elif test "X$1" = X--fallback-echo; then
- # Avoid inline document here, it may be left over
- :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
- # Yippee, $ECHO works!
- :
-else
- # Restart under the correct shell, and then maybe $ECHO will work.
- exec $SHELL "$progpath" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
- # used as fallback echo
- shift
- cat <<EOF
-$*
-EOF
- exit $EXIT_SUCCESS
-fi
magic="%%%MAGIC variable%%%"
magic_exe="%%%MAGIC EXE variable%%%"
@@ -636,16 +784,16 @@ func_config ()
# Display the features supported by this script.
func_features ()
{
- $ECHO "host: $host"
+ echo "host: $host"
if test "$build_libtool_libs" = yes; then
- $ECHO "enable shared libraries"
+ echo "enable shared libraries"
else
- $ECHO "disable shared libraries"
+ echo "disable shared libraries"
fi
if test "$build_old_libs" = yes; then
- $ECHO "enable static libraries"
+ echo "enable static libraries"
else
- $ECHO "disable static libraries"
+ echo "disable static libraries"
fi
exit $?
@@ -772,10 +920,21 @@ func_enable_tag ()
--quiet|--silent) preserve_args="$preserve_args $opt"
opt_silent=:
+ opt_verbose=false
+ ;;
+
+ --no-quiet|--no-silent)
+ preserve_args="$preserve_args $opt"
+ opt_silent=false
;;
--verbose| -v) preserve_args="$preserve_args $opt"
opt_silent=false
+ opt_verbose=:
+ ;;
+
+ --no-verbose) preserve_args="$preserve_args $opt"
+ opt_verbose=false
;;
--tag) test "$#" -eq 0 && func_missing_arg "$opt" && break
@@ -793,6 +952,7 @@ func_enable_tag ()
-\?|-h) func_usage ;;
--help) opt_help=: ;;
+ --help-all) opt_help=': help-all' ;;
--version) func_version ;;
-*) func_fatal_help "unrecognized option \`$opt'" ;;
@@ -1010,16 +1170,34 @@ func_source ()
func_infer_tag ()
{
$opt_debug
+
+ # FreeBSD-specific: where we install compilers with non-standard names
+ tag_compilers_CC="*cc cc* *gcc gcc* clang"
+ tag_compilers_CXX="*c++ c++* *g++ g++* clang++"
+ base_compiler=`set -- "$@"; echo $1`
+
+ # If $tagname isn't set, then try to infer if the default "CC" tag applies
+ if test -z "$tagname"; then
+ for zp in $tag_compilers_CC; do
+ case $base_compiler in
+ $zp) tagname="CC"; break;;
+ esac
+ done
+ fi
+
if test -n "$available_tags" && test -z "$tagname"; then
CC_quoted=
for arg in $CC; do
func_quote_for_eval "$arg"
CC_quoted="$CC_quoted $func_quote_for_eval_result"
done
+ CC_expanded=`func_echo_all $CC`
+ CC_quoted_expanded=`func_echo_all $CC_quoted`
case $@ in
# Blanks in the command may have been stripped by the calling shell,
# but not from the CC environment variable when configure was run.
- " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
+ " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+ " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
# Blanks at the start of $base_compile will cause this to fail
# if we don't check for them as well.
*)
@@ -1033,8 +1211,11 @@ func_infer_tag ()
func_quote_for_eval "$arg"
CC_quoted="$CC_quoted $func_quote_for_eval_result"
done
+ CC_expanded=`func_echo_all $CC`
+ CC_quoted_expanded=`func_echo_all $CC_quoted`
case "$@ " in
- " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
+ " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+ " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
# The compiler in the base compile command matches
# the one in the tagged configuration.
# Assume this is the tagged configuration we want.
@@ -1042,7 +1223,22 @@ func_infer_tag ()
break
;;
esac
- fi
+
+ # FreeBSD-specific: try compilers based on inferred tag
+ if test -z "$tagname"; then
+ eval "tag_compilers=\$tag_compilers_${z}"
+ if test -n "$tag_compilers"; then
+ for zp in $tag_compilers; do
+ case $base_compiler in
+ $zp) tagname=$z; break;;
+ esac
+ done
+ if test -n "$tagname"; then
+ break
+ fi
+ fi
+ fi
+ fi
done
# If $tagname still isn't set, then no tagged configuration
# was found and let the user know that the "--tag" command
@@ -1213,7 +1409,7 @@ func_mode_compile ()
*.[cCFSifmso] | \
*.ada | *.adb | *.ads | *.asm | \
*.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
- *.[fF][09]? | *.for | *.java | *.obj | *.sx)
+ *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
func_xform "$libobj"
libobj=$func_xform_result
;;
@@ -1288,7 +1484,7 @@ func_mode_compile ()
# Calculate the filename of the output object if compiler does
# not support -o with -c
if test "$compiler_c_o" = no; then
- output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
+ output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
lockfile="$output_obj.lock"
else
output_obj=
@@ -1445,7 +1641,7 @@ compiler."
}
$opt_help || {
-test "$mode" = compile && func_mode_compile ${1+"$@"}
+ test "$mode" = compile && func_mode_compile ${1+"$@"}
}
func_mode_help ()
@@ -1482,10 +1678,11 @@ This mode accepts the following additional options:
-o OUTPUT-FILE set the output file name to OUTPUT-FILE
-no-suppress do not suppress compiler output for multiple passes
- -prefer-pic try to building PIC objects only
- -prefer-non-pic try to building non-PIC objects only
+ -prefer-pic try to build PIC objects only
+ -prefer-non-pic try to build non-PIC objects only
-shared do not build a \`.o' file suitable for static linking
-static only build a \`.o' file suitable for static linking
+ -Wc,FLAG pass FLAG directly to the compiler
COMPILE-COMMAND is a command to be used in creating a \`standard' object file
from the given SOURCEFILE.
@@ -1538,7 +1735,7 @@ either the \`install' or \`cp' program.
The following components of INSTALL-COMMAND are treated specially:
- -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation
+ -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation
The rest of the components are interpreted as arguments to that command (only
BSD-compatible install options are recognized)."
@@ -1558,6 +1755,8 @@ The following components of LINK-COMMAND are treated specially:
-all-static do not do any dynamic linking at all
-avoid-version do not add a version suffix if possible
+ -bindir BINDIR specify path to binaries directory (for systems where
+ libraries must be found in the PATH setting at runtime)
-dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime
-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
@@ -1586,6 +1785,11 @@ The following components of LINK-COMMAND are treated specially:
-version-info CURRENT[:REVISION[:AGE]]
specify library version info [each variable defaults to 0]
-weak LIBNAME declare that the target provides the LIBNAME interface
+ -Wc,FLAG
+ -Xcompiler FLAG pass linker-specific FLAG directly to the compiler
+ -Wl,FLAG
+ -Xlinker FLAG pass linker-specific FLAG directly to the linker
+ -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC)
All other options (arguments beginning with \`-') are ignored.
@@ -1623,14 +1827,40 @@ Otherwise, only FILE itself is deleted using RM."
;;
esac
- $ECHO
+ echo
$ECHO "Try \`$progname --help' for more information about other modes."
-
- exit $?
}
- # Now that we've collected a possible --mode arg, show help if necessary
- $opt_help && func_mode_help
+# Now that we've collected a possible --mode arg, show help if necessary
+if $opt_help; then
+ if test "$opt_help" = :; then
+ func_mode_help
+ else
+ {
+ func_help noexit
+ for mode in compile link execute install finish uninstall clean; do
+ func_mode_help
+ done
+ } | sed -n '1p; 2,$s/^Usage:/ or: /p'
+ {
+ func_help noexit
+ for mode in compile link execute install finish uninstall clean; do
+ echo
+ func_mode_help
+ done
+ } |
+ sed '1d
+ /^When reporting/,/^Report/{
+ H
+ d
+ }
+ $x
+ /information about other modes/d
+ /more detailed .*MODE/d
+ s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
+ fi
+ exit $?
+fi
# func_mode_execute arg...
@@ -1712,7 +1942,7 @@ func_mode_execute ()
for file
do
case $file in
- -*) ;;
+ -* | *.la | *.lo ) ;;
*)
# Do a test to see if this is really a libtool program.
if func_ltwrapper_script_p "$file"; then
@@ -1754,7 +1984,7 @@ func_mode_execute ()
# Display what would be done.
if test -n "$shlibpath_var"; then
eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
- $ECHO "export $shlibpath_var"
+ echo "export $shlibpath_var"
fi
$ECHO "$cmd$args"
exit $EXIT_SUCCESS
@@ -1795,23 +2025,23 @@ func_mode_finish ()
# Exit here if they wanted silent mode.
$opt_silent && exit $EXIT_SUCCESS
- $ECHO "X----------------------------------------------------------------------" | $Xsed
- $ECHO "Libraries have been installed in:"
+ echo "----------------------------------------------------------------------"
+ echo "Libraries have been installed in:"
for libdir in $libdirs; do
$ECHO " $libdir"
done
- $ECHO
- $ECHO "If you ever happen to want to link against installed libraries"
- $ECHO "in a given directory, LIBDIR, you must either use libtool, and"
- $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'"
- $ECHO "flag during linking and do at least one of the following:"
+ echo
+ echo "If you ever happen to want to link against installed libraries"
+ echo "in a given directory, LIBDIR, you must either use libtool, and"
+ echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+ echo "flag during linking and do at least one of the following:"
if test -n "$shlibpath_var"; then
- $ECHO " - add LIBDIR to the \`$shlibpath_var' environment variable"
- $ECHO " during execution"
+ echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
+ echo " during execution"
fi
if test -n "$runpath_var"; then
- $ECHO " - add LIBDIR to the \`$runpath_var' environment variable"
- $ECHO " during linking"
+ echo " - add LIBDIR to the \`$runpath_var' environment variable"
+ echo " during linking"
fi
if test -n "$hardcode_libdir_flag_spec"; then
libdir=LIBDIR
@@ -1823,21 +2053,21 @@ func_mode_finish ()
$ECHO " - have your system administrator run these commands:$admincmds"
fi
if test -f /etc/ld.so.conf; then
- $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+ echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
fi
- $ECHO
+ echo
- $ECHO "See any operating system documentation about shared libraries for"
+ echo "See any operating system documentation about shared libraries for"
case $host in
solaris2.[6789]|solaris2.1[0-9])
- $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"
- $ECHO "pages."
+ echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
+ echo "pages."
;;
*)
- $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."
+ echo "more information, such as the ld(1) and ld.so(8) manual pages."
;;
esac
- $ECHO "X----------------------------------------------------------------------" | $Xsed
+ echo "----------------------------------------------------------------------"
exit $EXIT_SUCCESS
}
@@ -1852,7 +2082,7 @@ func_mode_install ()
# install_prog (especially on Windows NT).
if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
# Allow the use of GNU shtool's install command.
- $ECHO "X$nonopt" | $GREP shtool >/dev/null; then
+ case $nonopt in *shtool*) :;; *) false;; esac; then
# Aesthetically quote it.
func_quote_for_eval "$nonopt"
install_prog="$func_quote_for_eval_result "
@@ -1867,6 +2097,11 @@ func_mode_install ()
# Aesthetically quote it.
func_quote_for_eval "$arg"
install_prog="$install_prog$func_quote_for_eval_result"
+ install_shared_prog=$install_prog
+ case " $install_prog " in
+ *[\\\ /]cp\ *) install_cp=: ;;
+ *) install_cp=false ;;
+ esac
# We need to accept at least all the BSD install flags.
dest=
@@ -1876,8 +2111,10 @@ func_mode_install ()
install_type=
isdir=no
stripme=
+ no_mode=:
for arg
do
+ arg2=
if test -n "$dest"; then
files="$files $dest"
dest=$arg
@@ -1887,10 +2124,9 @@ func_mode_install ()
case $arg in
-d) isdir=yes ;;
-f)
- case " $install_prog " in
- *[\\\ /]cp\ *) ;;
- *) prev=$arg ;;
- esac
+ if $install_cp; then :; else
+ prev=$arg
+ fi
;;
-g | -m | -o)
prev=$arg
@@ -1904,6 +2140,10 @@ func_mode_install ()
*)
# If the previous option needed an argument, then skip it.
if test -n "$prev"; then
+ if test "x$prev" = x-m && test -n "$install_override_mode"; then
+ arg2=$install_override_mode
+ no_mode=false
+ fi
prev=
else
dest=$arg
@@ -1915,6 +2155,10 @@ func_mode_install ()
# Aesthetically quote the argument.
func_quote_for_eval "$arg"
install_prog="$install_prog $func_quote_for_eval_result"
+ if test -n "$arg2"; then
+ func_quote_for_eval "$arg2"
+ fi
+ install_shared_prog="$install_shared_prog $func_quote_for_eval_result"
done
test -z "$install_prog" && \
@@ -1923,6 +2167,13 @@ func_mode_install ()
test -n "$prev" && \
func_fatal_help "the \`$prev' option requires an argument"
+ if test -n "$install_override_mode" && $no_mode; then
+ if $install_cp; then :; else
+ func_quote_for_eval "$install_override_mode"
+ install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result"
+ fi
+ fi
+
if test -z "$files"; then
if test -z "$dest"; then
func_fatal_help "no file or destination specified"
@@ -2010,7 +2261,7 @@ func_mode_install ()
if test -n "$relink_command"; then
# Determine the prefix the user has applied to our future dir.
- inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`
+ inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
# Don't allow the user to place us outside of our expected
# location b/c this prevents finding dependent libraries that
@@ -2023,9 +2274,9 @@ func_mode_install ()
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
- relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+ relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
else
- relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`
+ relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
fi
func_warning "relinking \`$file'"
@@ -2043,7 +2294,7 @@ func_mode_install ()
test -n "$relink_command" && srcname="$realname"T
# Install the shared library and build the symlinks.
- func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \
+ func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
'exit $?'
tstripme="$stripme"
case $host_os in
@@ -2183,7 +2434,7 @@ func_mode_install ()
if test -f "$lib"; then
func_source "$lib"
fi
- libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
+ libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
if test -n "$libdir" && test ! -f "$libfile"; then
func_warning "\`$lib' has not been installed in \`$libdir'"
finalize=no
@@ -2202,7 +2453,7 @@ func_mode_install ()
file="$func_basename_result"
outputname="$tmpdir/$file"
# Replace the output file specification.
- relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+ relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
$opt_silent || {
func_quote_for_expand "$relink_command"
@@ -2221,7 +2472,7 @@ func_mode_install ()
}
else
# Install the binary that we compiled earlier.
- file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
+ file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
fi
fi
@@ -2323,6 +2574,10 @@ func_generate_dlsyms ()
extern \"C\" {
#endif
+#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
+#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
+#endif
+
/* External symbol declarations for the compiler. */\
"
@@ -2332,7 +2587,7 @@ extern \"C\" {
$opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
# Add our own program objects to the symbol list.
- progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
for progfile in $progfiles; do
func_verbose "extracting global C symbols from \`$progfile'"
$opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
@@ -2371,7 +2626,7 @@ extern \"C\" {
eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
eval '$MV "$nlist"T "$nlist"'
case $host in
- *cygwin | *mingw* | *cegcc* )
+ *cygwin* | *mingw* | *cegcc* )
eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
;;
@@ -2415,10 +2670,10 @@ extern \"C\" {
if test -f "$nlist"S; then
eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
else
- $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms"
+ echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
fi
- $ECHO >> "$output_objdir/$my_dlsyms" "\
+ echo >> "$output_objdir/$my_dlsyms" "\
/* The mapping between symbol names and symbols. */
typedef struct {
@@ -2428,7 +2683,7 @@ typedef struct {
"
case $host in
*cygwin* | *mingw* | *cegcc* )
- $ECHO >> "$output_objdir/$my_dlsyms" "\
+ echo >> "$output_objdir/$my_dlsyms" "\
/* DATA imports from DLLs on WIN32 con't be const, because
runtime relocations are performed -- see ld's documentation
on pseudo-relocs. */"
@@ -2441,7 +2696,7 @@ typedef struct {
lt_dlsym_const=const ;;
esac
- $ECHO >> "$output_objdir/$my_dlsyms" "\
+ echo >> "$output_objdir/$my_dlsyms" "\
extern $lt_dlsym_const lt_dlsymlist
lt_${my_prefix}_LTX_preloaded_symbols[];
$lt_dlsym_const lt_dlsymlist
@@ -2457,7 +2712,7 @@ lt_${my_prefix}_LTX_preloaded_symbols[] =
eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
;;
esac
- $ECHO >> "$output_objdir/$my_dlsyms" "\
+ echo >> "$output_objdir/$my_dlsyms" "\
{0, (void *) 0}
};
@@ -2515,19 +2770,22 @@ static const void *lt_preloaded_setup() {
case $host in
*cygwin* | *mingw* | *cegcc* )
if test -f "$output_objdir/$my_outputname.def"; then
- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+ compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+ finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
else
- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+ compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+ finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
fi
;;
*)
- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+ compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+ finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
;;
esac
;;
+ *-*-freebsd*)
+ # FreeBSD doesn't need this...
+ ;;
*)
func_fatal_error "unknown suffix for \`$my_dlsyms'"
;;
@@ -2538,8 +2796,8 @@ static const void *lt_preloaded_setup() {
# really was required.
# Nullify the symbol file.
- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+ compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
+ finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
fi
}
@@ -2549,6 +2807,7 @@ static const void *lt_preloaded_setup() {
# Need a lot of goo to handle *both* DLLs and import libs
# Has to be a shell function in order to 'eat' the argument
# that is supplied when $file_magic_command is called.
+# Despite the name, also deal with 64 bit binaries.
func_win32_libid ()
{
$opt_debug
@@ -2559,8 +2818,9 @@ func_win32_libid ()
win32_libid_type="x86 archive import"
;;
*ar\ archive*) # could be an import, or static
+ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
- $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+ $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
win32_nmres=`eval $NM -f posix -A $1 |
$SED -n -e '
1,100{
@@ -2598,7 +2858,18 @@ func_extract_an_archive ()
$opt_debug
f_ex_an_ar_dir="$1"; shift
f_ex_an_ar_oldlib="$1"
- func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?'
+ if test "$lock_old_archive_extraction" = yes; then
+ lockfile=$f_ex_an_ar_oldlib.lock
+ until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
+ func_echo "Waiting for $lockfile to be removed"
+ sleep 2
+ done
+ fi
+ func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
+ 'stat=$?; rm -f "$lockfile"; exit $stat'
+ if test "$lock_old_archive_extraction" = yes; then
+ $opt_dry_run || rm -f "$lockfile"
+ fi
if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
:
else
@@ -2669,7 +2940,7 @@ func_extract_archives ()
darwin_file=
darwin_files=
for darwin_file in $darwin_filelist; do
- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
+ darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
$LIPO -create -output "$darwin_file" $darwin_files
done # $darwin_filelist
$RM -rf unfat-$$
@@ -2684,25 +2955,30 @@ func_extract_archives ()
func_extract_an_archive "$my_xdir" "$my_xabs"
;;
esac
- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
done
func_extract_archives_result="$my_oldobjs"
}
-
-# func_emit_wrapper_part1 [arg=no]
+# func_emit_wrapper [arg=no]
#
-# Emit the first part of a libtool wrapper script on stdout.
-# For more information, see the description associated with
-# func_emit_wrapper(), below.
-func_emit_wrapper_part1 ()
+# Emit a libtool wrapper script on stdout.
+# Don't directly open a file because we may want to
+# incorporate the script contents within a cygwin/mingw
+# wrapper executable. Must ONLY be called from within
+# func_mode_link because it depends on a number of variables
+# set therein.
+#
+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
+# variable will take. If 'yes', then the emitted script
+# will assume that the directory in which it is stored is
+# the $objdir directory. This is a cygwin/mingw-specific
+# behavior.
+func_emit_wrapper ()
{
- func_emit_wrapper_part1_arg1=no
- if test -n "$1" ; then
- func_emit_wrapper_part1_arg1=$1
- fi
+ func_emit_wrapper_arg1=${1-no}
$ECHO "\
#! $SHELL
@@ -2718,7 +2994,6 @@ func_emit_wrapper_part1 ()
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
-Xsed='${SED} -e 1s/^X//'
sed_quote_subst='$sed_quote_subst'
# Be Bourne compatible
@@ -2749,31 +3024,132 @@ if test \"\$libtool_install_magic\" = \"$magic\"; then
else
# When we are sourced in execute mode, \$file and \$ECHO are already set.
if test \"\$libtool_execute_magic\" != \"$magic\"; then
- ECHO=\"$qecho\"
- file=\"\$0\"
- # Make sure echo works.
- if test \"X\$1\" = X--no-reexec; then
- # Discard the --no-reexec flag, and continue.
- shift
- elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then
- # Yippee, \$ECHO works!
- :
- else
- # Restart under the correct shell, and then maybe \$ECHO will work.
- exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
- fi
- fi\
+ file=\"\$0\""
+
+ qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
+ $ECHO "\
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+ eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+ ECHO=\"$qECHO\"
+ fi
+
+# Very basic option parsing. These options are (a) specific to
+# the libtool wrapper, (b) are identical between the wrapper
+# /script/ and the wrapper /executable/ which is used only on
+# windows platforms, and (c) all begin with the string "--lt-"
+# (application programs are unlikely to have options which match
+# this pattern).
+#
+# There are only two supported options: --lt-debug and
+# --lt-dump-script. There is, deliberately, no --lt-help.
+#
+# The first argument to this parsing function should be the
+# script's $0 value, followed by "$@".
+lt_option_debug=
+func_parse_lt_options ()
+{
+ lt_script_arg0=\$0
+ shift
+ for lt_opt
+ do
+ case \"\$lt_opt\" in
+ --lt-debug) lt_option_debug=1 ;;
+ --lt-dump-script)
+ lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
+ test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
+ lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
+ cat \"\$lt_dump_D/\$lt_dump_F\"
+ exit 0
+ ;;
+ --lt-*)
+ \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
+ exit 1
+ ;;
+ esac
+ done
+
+ # Print the debug banner immediately:
+ if test -n \"\$lt_option_debug\"; then
+ echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
+ fi
+}
+
+# Used when --lt-debug. Prints its arguments to stdout
+# (redirection is the responsibility of the caller)
+func_lt_dump_args ()
+{
+ lt_dump_args_N=1;
+ for lt_arg
+ do
+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
+ lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
+ done
+}
+
+# Core function for launching the target application
+func_exec_program_core ()
+{
"
- $ECHO "\
+ case $host in
+ # Backslashes separate directories on plain windows
+ *-*-mingw | *-*-os2* | *-cegcc*)
+ $ECHO "\
+ if test -n \"\$lt_option_debug\"; then
+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
+ func_lt_dump_args \${1+\"\$@\"} 1>&2
+ fi
+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+"
+ ;;
+
+ *)
+ $ECHO "\
+ if test -n \"\$lt_option_debug\"; then
+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
+ func_lt_dump_args \${1+\"\$@\"} 1>&2
+ fi
+ exec \"\$progdir/\$program\" \${1+\"\$@\"}
+"
+ ;;
+ esac
+ $ECHO "\
+ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
+ exit 1
+}
+
+# A function to encapsulate launching the target application
+# Strips options in the --lt-* namespace from \$@ and
+# launches target application with the remaining arguments.
+func_exec_program ()
+{
+ for lt_wr_arg
+ do
+ case \$lt_wr_arg in
+ --lt-*) ;;
+ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+ esac
+ shift
+ done
+ func_exec_program_core \${1+\"\$@\"}
+}
+
+ # Parse options
+ func_parse_lt_options \"\$0\" \${1+\"\$@\"}
# Find the directory that this script lives in.
- thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
+ thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
test \"x\$thisdir\" = \"x\$file\" && thisdir=.
# Follow symbolic links until we get to the real thisdir.
- file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
+ file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
while test -n \"\$file\"; do
- destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
+ destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
# If there was a directory component, then change thisdir.
if test \"x\$destdir\" != \"x\$file\"; then
@@ -2783,30 +3159,13 @@ else
esac
fi
- file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
- file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
+ file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
+ file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
done
-"
-}
-# end: func_emit_wrapper_part1
-
-# func_emit_wrapper_part2 [arg=no]
-#
-# Emit the second part of a libtool wrapper script on stdout.
-# For more information, see the description associated with
-# func_emit_wrapper(), below.
-func_emit_wrapper_part2 ()
-{
- func_emit_wrapper_part2_arg1=no
- if test -n "$1" ; then
- func_emit_wrapper_part2_arg1=$1
- fi
-
- $ECHO "\
# Usually 'no', except on cygwin/mingw when embedded into
# the cwrapper.
- WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1
+ WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
# special case for '.'
if test \"\$thisdir\" = \".\"; then
@@ -2814,7 +3173,7 @@ func_emit_wrapper_part2 ()
fi
# remove .libs from thisdir
case \"\$thisdir\" in
- *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;;
+ *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
$objdir ) thisdir=. ;;
esac
fi
@@ -2877,7 +3236,7 @@ func_emit_wrapper_part2 ()
# Some systems cannot cope with colon-terminated $shlibpath_var
# The second colon is a workaround for a bug in BeOS R4 sed
- $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
+ $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
export $shlibpath_var
"
@@ -2894,64 +3253,18 @@ func_emit_wrapper_part2 ()
$ECHO "\
if test \"\$libtool_execute_magic\" != \"$magic\"; then
# Run the actual program with our arguments.
-"
- case $host in
- # Backslashes separate directories on plain windows
- *-*-mingw | *-*-os2* | *-cegcc*)
- $ECHO "\
- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-"
- ;;
-
- *)
- $ECHO "\
- exec \"\$progdir/\$program\" \${1+\"\$@\"}
-"
- ;;
- esac
- $ECHO "\
- \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
- exit 1
+ func_exec_program \${1+\"\$@\"}
fi
else
# The program doesn't exist.
\$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
\$ECHO \"This script is just a wrapper for \$program.\" 1>&2
- $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
+ \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
exit 1
fi
fi\
"
}
-# end: func_emit_wrapper_part2
-
-
-# func_emit_wrapper [arg=no]
-#
-# Emit a libtool wrapper script on stdout.
-# Don't directly open a file because we may want to
-# incorporate the script contents within a cygwin/mingw
-# wrapper executable. Must ONLY be called from within
-# func_mode_link because it depends on a number of variables
-# set therein.
-#
-# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
-# variable will take. If 'yes', then the emitted script
-# will assume that the directory in which it is stored is
-# the $objdir directory. This is a cygwin/mingw-specific
-# behavior.
-func_emit_wrapper ()
-{
- func_emit_wrapper_arg1=no
- if test -n "$1" ; then
- func_emit_wrapper_arg1=$1
- fi
-
- # split this up so that func_emit_cwrapperexe_src
- # can call each part independently.
- func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"
- func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"
-}
# func_to_host_path arg
@@ -2978,23 +3291,19 @@ func_emit_wrapper ()
func_to_host_path ()
{
func_to_host_path_result="$1"
- if test -n "$1" ; then
+ if test -n "$1"; then
case $host in
*mingw* )
lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
case $build in
*mingw* ) # actually, msys
# awkward: cmd appends spaces to result
- lt_sed_strip_trailing_spaces="s/[ ]*\$//"
- func_to_host_path_tmp1=`( cmd //c echo "$1" |\
- $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
- $SED -e "$lt_sed_naive_backslashify"`
+ func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null |
+ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
;;
*cygwin* )
- func_to_host_path_tmp1=`cygpath -w "$1"`
- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
- $SED -e "$lt_sed_naive_backslashify"`
+ func_to_host_path_result=`cygpath -w "$1" |
+ $SED -e "$lt_sed_naive_backslashify"`
;;
* )
# Unfortunately, winepath does not exit with a non-zero
@@ -3006,17 +3315,17 @@ func_to_host_path ()
# the odd construction:
func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+ func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" |
$SED -e "$lt_sed_naive_backslashify"`
else
# Allow warning below.
- func_to_host_path_result=""
+ func_to_host_path_result=
fi
;;
esac
if test -z "$func_to_host_path_result" ; then
func_error "Could not determine host path corresponding to"
- func_error " '$1'"
+ func_error " \`$1'"
func_error "Continuing, but uninstalled executables may not work."
# Fallback:
func_to_host_path_result="$1"
@@ -3049,30 +3358,24 @@ func_to_host_path ()
func_to_host_pathlist ()
{
func_to_host_pathlist_result="$1"
- if test -n "$1" ; then
+ if test -n "$1"; then
case $host in
*mingw* )
lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
# Remove leading and trailing path separator characters from
# ARG. msys behavior is inconsistent here, cygpath turns them
# into '.;' and ';.', and winepath ignores them completely.
- func_to_host_pathlist_tmp2="$1"
- # Once set for this call, this variable should not be
- # reassigned. It is used in tha fallback case.
- func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\
- $SED -e 's|^:*||' -e 's|:*$||'`
+ func_stripname : : "$1"
+ func_to_host_pathlist_tmp1=$func_stripname_result
case $build in
*mingw* ) # Actually, msys.
# Awkward: cmd appends spaces to result.
- lt_sed_strip_trailing_spaces="s/[ ]*\$//"
- func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\
- $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
- $SED -e "$lt_sed_naive_backslashify"`
+ func_to_host_pathlist_result=`
+ ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null |
+ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
;;
*cygwin* )
- func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`
- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
+ func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" |
$SED -e "$lt_sed_naive_backslashify"`
;;
* )
@@ -3088,18 +3391,17 @@ func_to_host_pathlist ()
if test -z "$func_to_host_pathlist_result" ; then
func_to_host_pathlist_result="$func_to_host_path_result"
else
- func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"
+ func_append func_to_host_pathlist_result ";$func_to_host_path_result"
fi
fi
fi
- IFS=:
done
IFS=$func_to_host_pathlist_oldIFS
;;
esac
- if test -z "$func_to_host_pathlist_result" ; then
+ if test -z "$func_to_host_pathlist_result"; then
func_error "Could not determine the host path(s) corresponding to"
- func_error " '$1'"
+ func_error " \`$1'"
func_error "Continuing, but uninstalled executables may not work."
# Fallback. This may break if $1 contains DOS-style drive
# specifications. The fix is not to complicate the expression
@@ -3116,7 +3418,7 @@ func_to_host_pathlist ()
;;
esac
case "$1" in
- *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"
+ *: ) func_append func_to_host_pathlist_result ";"
;;
esac
;;
@@ -3141,31 +3443,23 @@ func_emit_cwrapperexe_src ()
This wrapper executable should never be moved out of the build directory.
If it is, it will not operate correctly.
-
- Currently, it simply execs the wrapper *script* "$SHELL $output",
- but could eventually absorb all of the scripts functionality and
- exec $objdir/$outputname directly.
*/
EOF
cat <<"EOF"
+#ifdef _MSC_VER
+# define _CRT_SECURE_NO_DEPRECATE 1
+#endif
#include <stdio.h>
#include <stdlib.h>
#ifdef _MSC_VER
# include <direct.h>
# include <process.h>
# include <io.h>
-# define setmode _setmode
#else
# include <unistd.h>
# include <stdint.h>
# ifdef __CYGWIN__
# include <io.h>
-# define HAVE_SETENV
-# ifdef __STRICT_ANSI__
-char *realpath (const char *, char *);
-int putenv (char *);
-int setenv (const char *, const char *, int);
-# endif
# endif
#endif
#include <malloc.h>
@@ -3177,6 +3471,44 @@ int setenv (const char *, const char *, int);
#include <fcntl.h>
#include <sys/stat.h>
+/* declarations of non-ANSI functions */
+#if defined(__MINGW32__)
+# ifdef __STRICT_ANSI__
+int _putenv (const char *);
+# endif
+#elif defined(__CYGWIN__)
+# ifdef __STRICT_ANSI__
+char *realpath (const char *, char *);
+int putenv (char *);
+int setenv (const char *, const char *, int);
+# endif
+/* #elif defined (other platforms) ... */
+#endif
+
+/* portability defines, excluding path handling macros */
+#if defined(_MSC_VER)
+# define setmode _setmode
+# define stat _stat
+# define chmod _chmod
+# define getcwd _getcwd
+# define putenv _putenv
+# define S_IXUSR _S_IEXEC
+# ifndef _INTPTR_T_DEFINED
+# define _INTPTR_T_DEFINED
+# define intptr_t int
+# endif
+#elif defined(__MINGW32__)
+# define setmode _setmode
+# define stat _stat
+# define chmod _chmod
+# define getcwd _getcwd
+# define putenv _putenv
+#elif defined(__CYGWIN__)
+# define HAVE_SETENV
+# define FOPEN_WB "wb"
+/* #elif defined (other platforms) ... */
+#endif
+
#if defined(PATH_MAX)
# define LT_PATHMAX PATH_MAX
#elif defined(MAXPATHLEN)
@@ -3192,14 +3524,7 @@ int setenv (const char *, const char *, int);
# define S_IXGRP 0
#endif
-#ifdef _MSC_VER
-# define S_IXUSR _S_IEXEC
-# define stat _stat
-# ifndef _INTPTR_T_DEFINED
-# define intptr_t int
-# endif
-#endif
-
+/* path handling portability macros */
#ifndef DIR_SEPARATOR
# define DIR_SEPARATOR '/'
# define PATH_SEPARATOR ':'
@@ -3230,10 +3555,6 @@ int setenv (const char *, const char *, int);
# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
#endif /* PATH_SEPARATOR_2 */
-#ifdef __CYGWIN__
-# define FOPEN_WB "wb"
-#endif
-
#ifndef FOPEN_WB
# define FOPEN_WB "w"
#endif
@@ -3246,22 +3567,13 @@ int setenv (const char *, const char *, int);
if (stale) { free ((void *) stale); stale = 0; } \
} while (0)
-#undef LTWRAPPER_DEBUGPRINTF
-#if defined DEBUGWRAPPER
-# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
-static void
-ltwrapper_debugprintf (const char *fmt, ...)
-{
- va_list args;
- va_start (args, fmt);
- (void) vfprintf (stderr, fmt, args);
- va_end (args);
-}
+#if defined(LT_DEBUGWRAPPER)
+static int lt_debug = 1;
#else
-# define LTWRAPPER_DEBUGPRINTF(args)
+static int lt_debug = 0;
#endif
-const char *program_name = NULL;
+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
void *xmalloc (size_t num);
char *xstrdup (const char *string);
@@ -3271,31 +3583,17 @@ char *chase_symlinks (const char *pathspec);
int make_executable (const char *path);
int check_executable (const char *path);
char *strendzap (char *str, const char *pat);
-void lt_fatal (const char *message, ...);
+void lt_debugprintf (const char *file, int line, const char *fmt, ...);
+void lt_fatal (const char *file, int line, const char *message, ...);
+static const char *nonnull (const char *s);
+static const char *nonempty (const char *s);
void lt_setenv (const char *name, const char *value);
char *lt_extend_str (const char *orig_value, const char *add, int to_end);
-void lt_opt_process_env_set (const char *arg);
-void lt_opt_process_env_prepend (const char *arg);
-void lt_opt_process_env_append (const char *arg);
-int lt_split_name_value (const char *arg, char** name, char** value);
void lt_update_exe_path (const char *name, const char *value);
void lt_update_lib_path (const char *name, const char *value);
-
-static const char *script_text_part1 =
-EOF
-
- func_emit_wrapper_part1 yes |
- $SED -e 's/\([\\"]\)/\\\1/g' \
- -e 's/^/ "/' -e 's/$/\\n"/'
- echo ";"
- cat <<EOF
-
-static const char *script_text_part2 =
+char **prepare_spawn (char **argv);
+void lt_dump_script (FILE *f);
EOF
- func_emit_wrapper_part2 yes |
- $SED -e 's/\([\\"]\)/\\\1/g' \
- -e 's/^/ "/' -e 's/$/\\n"/'
- echo ";"
cat <<EOF
const char * MAGIC_EXE = "$magic_exe";
@@ -3340,24 +3638,10 @@ EOF
cat <<"EOF"
#define LTWRAPPER_OPTION_PREFIX "--lt-"
-#define LTWRAPPER_OPTION_PREFIX_LENGTH 5
-static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH;
static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
-
static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script";
-
-static const size_t env_set_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 7;
-static const char *env_set_opt = LTWRAPPER_OPTION_PREFIX "env-set";
- /* argument is putenv-style "foo=bar", value of foo is set to bar */
-
-static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11;
-static const char *env_prepend_opt = LTWRAPPER_OPTION_PREFIX "env-prepend";
- /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */
-
-static const size_t env_append_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 10;
-static const char *env_append_opt = LTWRAPPER_OPTION_PREFIX "env-append";
- /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */
+static const char *debug_opt = LTWRAPPER_OPTION_PREFIX "debug";
int
main (int argc, char *argv[])
@@ -3374,10 +3658,13 @@ main (int argc, char *argv[])
int i;
program_name = (char *) xstrdup (base_name (argv[0]));
- LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0]));
- LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
+ newargz = XMALLOC (char *, argc + 1);
- /* very simple arg parsing; don't want to rely on getopt */
+ /* very simple arg parsing; don't want to rely on getopt
+ * also, copy all non cwrapper options to newargz, except
+ * argz[0], which is handled differently
+ */
+ newargc=0;
for (i = 1; i < argc; i++)
{
if (strcmp (argv[i], dumpscript_opt) == 0)
@@ -3391,25 +3678,57 @@ EOF
esac
cat <<"EOF"
- printf ("%s", script_text_part1);
- printf ("%s", script_text_part2);
+ lt_dump_script (stdout);
return 0;
}
+ if (strcmp (argv[i], debug_opt) == 0)
+ {
+ lt_debug = 1;
+ continue;
+ }
+ if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
+ {
+ /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
+ namespace, but it is not one of the ones we know about and
+ have already dealt with, above (inluding dump-script), then
+ report an error. Otherwise, targets might begin to believe
+ they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
+ namespace. The first time any user complains about this, we'll
+ need to make LTWRAPPER_OPTION_PREFIX a configure-time option
+ or a configure.ac-settable value.
+ */
+ lt_fatal (__FILE__, __LINE__,
+ "unrecognized %s option: '%s'",
+ ltwrapper_option_prefix, argv[i]);
+ }
+ /* otherwise ... */
+ newargz[++newargc] = xstrdup (argv[i]);
}
+ newargz[++newargc] = NULL;
+
+EOF
+ cat <<EOF
+ /* The GNU banner must be the first non-error debug message */
+ lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
+EOF
+ cat <<"EOF"
+ lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
+ lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
- newargz = XMALLOC (char *, argc + 1);
tmp_pathspec = find_executable (argv[0]);
if (tmp_pathspec == NULL)
- lt_fatal ("Couldn't find %s", argv[0]);
- LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
- tmp_pathspec));
+ lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
+ lt_debugprintf (__FILE__, __LINE__,
+ "(main) found exe (before symlink chase) at: %s\n",
+ tmp_pathspec);
actual_cwrapper_path = chase_symlinks (tmp_pathspec);
- LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
- actual_cwrapper_path));
+ lt_debugprintf (__FILE__, __LINE__,
+ "(main) found exe (after symlink chase) at: %s\n",
+ actual_cwrapper_path);
XFREE (tmp_pathspec);
- actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
+ actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
strendzap (actual_cwrapper_path, actual_cwrapper_name);
/* wrapper name transforms */
@@ -3427,8 +3746,9 @@ EOF
target_name = tmp_pathspec;
tmp_pathspec = 0;
- LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
- target_name));
+ lt_debugprintf (__FILE__, __LINE__,
+ "(main) libtool target name: %s\n",
+ target_name);
EOF
cat <<EOF
@@ -3481,77 +3801,12 @@ EOF
lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
- newargc=0;
- for (i = 1; i < argc; i++)
- {
- if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)
- {
- if (argv[i][env_set_opt_len] == '=')
- {
- const char *p = argv[i] + env_set_opt_len + 1;
- lt_opt_process_env_set (p);
- }
- else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc)
- {
- lt_opt_process_env_set (argv[++i]); /* don't copy */
- }
- else
- lt_fatal ("%s missing required argument", env_set_opt);
- continue;
- }
- if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)
- {
- if (argv[i][env_prepend_opt_len] == '=')
- {
- const char *p = argv[i] + env_prepend_opt_len + 1;
- lt_opt_process_env_prepend (p);
- }
- else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc)
- {
- lt_opt_process_env_prepend (argv[++i]); /* don't copy */
- }
- else
- lt_fatal ("%s missing required argument", env_prepend_opt);
- continue;
- }
- if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)
- {
- if (argv[i][env_append_opt_len] == '=')
- {
- const char *p = argv[i] + env_append_opt_len + 1;
- lt_opt_process_env_append (p);
- }
- else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc)
- {
- lt_opt_process_env_append (argv[++i]); /* don't copy */
- }
- else
- lt_fatal ("%s missing required argument", env_append_opt);
- continue;
- }
- if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
- {
- /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
- namespace, but it is not one of the ones we know about and
- have already dealt with, above (inluding dump-script), then
- report an error. Otherwise, targets might begin to believe
- they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
- namespace. The first time any user complains about this, we'll
- need to make LTWRAPPER_OPTION_PREFIX a configure-time option
- or a configure.ac-settable value.
- */
- lt_fatal ("Unrecognized option in %s namespace: '%s'",
- ltwrapper_option_prefix, argv[i]);
- }
- /* otherwise ... */
- newargz[++newargc] = xstrdup (argv[i]);
- }
- newargz[++newargc] = NULL;
-
- LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
+ lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
+ nonnull (lt_argv_zero));
for (i = 0; i < newargc; i++)
{
- LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
+ lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
+ i, nonnull (newargz[i]));
}
EOF
@@ -3560,11 +3815,14 @@ EOF
mingw*)
cat <<"EOF"
/* execv doesn't actually work on mingw as expected on unix */
+ newargz = prepare_spawn (newargz);
rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
if (rval == -1)
{
/* failed to start process */
- LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
+ lt_debugprintf (__FILE__, __LINE__,
+ "(main) failed to launch target \"%s\": %s\n",
+ lt_argv_zero, nonnull (strerror (errno)));
return 127;
}
return rval;
@@ -3586,7 +3844,7 @@ xmalloc (size_t num)
{
void *p = (void *) malloc (num);
if (!p)
- lt_fatal ("Memory exhausted");
+ lt_fatal (__FILE__, __LINE__, "memory exhausted");
return p;
}
@@ -3620,8 +3878,8 @@ check_executable (const char *path)
{
struct stat st;
- LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n",
- path ? (*path ? path : "EMPTY!") : "NULL!"));
+ lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
+ nonempty (path));
if ((!path) || (!*path))
return 0;
@@ -3638,8 +3896,8 @@ make_executable (const char *path)
int rval = 0;
struct stat st;
- LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n",
- path ? (*path ? path : "EMPTY!") : "NULL!"));
+ lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
+ nonempty (path));
if ((!path) || (!*path))
return 0;
@@ -3665,8 +3923,8 @@ find_executable (const char *wrapper)
int tmp_len;
char *concat_name;
- LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n",
- wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
+ lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
+ nonempty (wrapper));
if ((wrapper == NULL) || (*wrapper == '\0'))
return NULL;
@@ -3719,7 +3977,8 @@ find_executable (const char *wrapper)
{
/* empty path: current directory */
if (getcwd (tmp, LT_PATHMAX) == NULL)
- lt_fatal ("getcwd failed");
+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+ nonnull (strerror (errno)));
tmp_len = strlen (tmp);
concat_name =
XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
@@ -3744,7 +4003,8 @@ find_executable (const char *wrapper)
}
/* Relative path | not found in path: prepend cwd */
if (getcwd (tmp, LT_PATHMAX) == NULL)
- lt_fatal ("getcwd failed");
+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+ nonnull (strerror (errno)));
tmp_len = strlen (tmp);
concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
memcpy (concat_name, tmp, tmp_len);
@@ -3770,8 +4030,9 @@ chase_symlinks (const char *pathspec)
int has_symlinks = 0;
while (strlen (tmp_pathspec) && !has_symlinks)
{
- LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
- tmp_pathspec));
+ lt_debugprintf (__FILE__, __LINE__,
+ "checking path component for symlinks: %s\n",
+ tmp_pathspec);
if (lstat (tmp_pathspec, &s) == 0)
{
if (S_ISLNK (s.st_mode) != 0)
@@ -3793,8 +4054,9 @@ chase_symlinks (const char *pathspec)
}
else
{
- char *errstr = strerror (errno);
- lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
+ lt_fatal (__FILE__, __LINE__,
+ "error accessing file \"%s\": %s",
+ tmp_pathspec, nonnull (strerror (errno)));
}
}
XFREE (tmp_pathspec);
@@ -3807,7 +4069,8 @@ chase_symlinks (const char *pathspec)
tmp_pathspec = realpath (pathspec, buf);
if (tmp_pathspec == 0)
{
- lt_fatal ("Could not follow symlinks for %s", pathspec);
+ lt_fatal (__FILE__, __LINE__,
+ "could not follow symlinks for %s", pathspec);
}
return xstrdup (tmp_pathspec);
#endif
@@ -3833,11 +4096,25 @@ strendzap (char *str, const char *pat)
return str;
}
+void
+lt_debugprintf (const char *file, int line, const char *fmt, ...)
+{
+ va_list args;
+ if (lt_debug)
+ {
+ (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
+ va_start (args, fmt);
+ (void) vfprintf (stderr, fmt, args);
+ va_end (args);
+ }
+}
+
static void
-lt_error_core (int exit_status, const char *mode,
+lt_error_core (int exit_status, const char *file,
+ int line, const char *mode,
const char *message, va_list ap)
{
- fprintf (stderr, "%s: %s: ", program_name, mode);
+ fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
vfprintf (stderr, message, ap);
fprintf (stderr, ".\n");
@@ -3846,20 +4123,32 @@ lt_error_core (int exit_status, const char *mode,
}
void
-lt_fatal (const char *message, ...)
+lt_fatal (const char *file, int line, const char *message, ...)
{
va_list ap;
va_start (ap, message);
- lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
+ lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
va_end (ap);
}
+static const char *
+nonnull (const char *s)
+{
+ return s ? s : "(null)";
+}
+
+static const char *
+nonempty (const char *s)
+{
+ return (s && !*s) ? "(empty)" : nonnull (s);
+}
+
void
lt_setenv (const char *name, const char *value)
{
- LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
- (name ? name : "<NULL>"),
- (value ? value : "<NULL>")));
+ lt_debugprintf (__FILE__, __LINE__,
+ "(lt_setenv) setting '%s' to '%s'\n",
+ nonnull (name), nonnull (value));
{
#ifdef HAVE_SETENV
/* always make a copy, for consistency with !HAVE_SETENV */
@@ -3904,95 +4193,12 @@ lt_extend_str (const char *orig_value, const char *add, int to_end)
return new_value;
}
-int
-lt_split_name_value (const char *arg, char** name, char** value)
-{
- const char *p;
- int len;
- if (!arg || !*arg)
- return 1;
-
- p = strchr (arg, (int)'=');
-
- if (!p)
- return 1;
-
- *value = xstrdup (++p);
-
- len = strlen (arg) - strlen (*value);
- *name = XMALLOC (char, len);
- strncpy (*name, arg, len-1);
- (*name)[len - 1] = '\0';
-
- return 0;
-}
-
-void
-lt_opt_process_env_set (const char *arg)
-{
- char *name = NULL;
- char *value = NULL;
-
- if (lt_split_name_value (arg, &name, &value) != 0)
- {
- XFREE (name);
- XFREE (value);
- lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);
- }
-
- lt_setenv (name, value);
- XFREE (name);
- XFREE (value);
-}
-
-void
-lt_opt_process_env_prepend (const char *arg)
-{
- char *name = NULL;
- char *value = NULL;
- char *new_value = NULL;
-
- if (lt_split_name_value (arg, &name, &value) != 0)
- {
- XFREE (name);
- XFREE (value);
- lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);
- }
-
- new_value = lt_extend_str (getenv (name), value, 0);
- lt_setenv (name, new_value);
- XFREE (new_value);
- XFREE (name);
- XFREE (value);
-}
-
-void
-lt_opt_process_env_append (const char *arg)
-{
- char *name = NULL;
- char *value = NULL;
- char *new_value = NULL;
-
- if (lt_split_name_value (arg, &name, &value) != 0)
- {
- XFREE (name);
- XFREE (value);
- lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);
- }
-
- new_value = lt_extend_str (getenv (name), value, 1);
- lt_setenv (name, new_value);
- XFREE (new_value);
- XFREE (name);
- XFREE (value);
-}
-
void
lt_update_exe_path (const char *name, const char *value)
{
- LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
- (name ? name : "<NULL>"),
- (value ? value : "<NULL>")));
+ lt_debugprintf (__FILE__, __LINE__,
+ "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
+ nonnull (name), nonnull (value));
if (name && *name && value && *value)
{
@@ -4011,9 +4217,9 @@ lt_update_exe_path (const char *name, const char *value)
void
lt_update_lib_path (const char *name, const char *value)
{
- LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
- (name ? name : "<NULL>"),
- (value ? value : "<NULL>")));
+ lt_debugprintf (__FILE__, __LINE__,
+ "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
+ nonnull (name), nonnull (value));
if (name && *name && value && *value)
{
@@ -4023,11 +4229,152 @@ lt_update_lib_path (const char *name, const char *value)
}
}
+EOF
+ case $host_os in
+ mingw*)
+ cat <<"EOF"
+
+/* Prepares an argument vector before calling spawn().
+ Note that spawn() does not by itself call the command interpreter
+ (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
+ ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+ GetVersionEx(&v);
+ v.dwPlatformId == VER_PLATFORM_WIN32_NT;
+ }) ? "cmd.exe" : "command.com").
+ Instead it simply concatenates the arguments, separated by ' ', and calls
+ CreateProcess(). We must quote the arguments since Win32 CreateProcess()
+ interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
+ special way:
+ - Space and tab are interpreted as delimiters. They are not treated as
+ delimiters if they are surrounded by double quotes: "...".
+ - Unescaped double quotes are removed from the input. Their only effect is
+ that within double quotes, space and tab are treated like normal
+ characters.
+ - Backslashes not followed by double quotes are not special.
+ - But 2*n+1 backslashes followed by a double quote become
+ n backslashes followed by a double quote (n >= 0):
+ \" -> "
+ \\\" -> \"
+ \\\\\" -> \\"
+ */
+#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+char **
+prepare_spawn (char **argv)
+{
+ size_t argc;
+ char **new_argv;
+ size_t i;
+
+ /* Count number of arguments. */
+ for (argc = 0; argv[argc] != NULL; argc++)
+ ;
+ /* Allocate new argument vector. */
+ new_argv = XMALLOC (char *, argc + 1);
+
+ /* Put quoted arguments into the new argument vector. */
+ for (i = 0; i < argc; i++)
+ {
+ const char *string = argv[i];
+
+ if (string[0] == '\0')
+ new_argv[i] = xstrdup ("\"\"");
+ else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
+ {
+ int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
+ size_t length;
+ unsigned int backslashes;
+ const char *s;
+ char *quoted_string;
+ char *p;
+
+ length = 0;
+ backslashes = 0;
+ if (quote_around)
+ length++;
+ for (s = string; *s != '\0'; s++)
+ {
+ char c = *s;
+ if (c == '"')
+ length += backslashes + 1;
+ length++;
+ if (c == '\\')
+ backslashes++;
+ else
+ backslashes = 0;
+ }
+ if (quote_around)
+ length += backslashes + 1;
+
+ quoted_string = XMALLOC (char, length + 1);
+
+ p = quoted_string;
+ backslashes = 0;
+ if (quote_around)
+ *p++ = '"';
+ for (s = string; *s != '\0'; s++)
+ {
+ char c = *s;
+ if (c == '"')
+ {
+ unsigned int j;
+ for (j = backslashes + 1; j > 0; j--)
+ *p++ = '\\';
+ }
+ *p++ = c;
+ if (c == '\\')
+ backslashes++;
+ else
+ backslashes = 0;
+ }
+ if (quote_around)
+ {
+ unsigned int j;
+ for (j = backslashes; j > 0; j--)
+ *p++ = '\\';
+ *p++ = '"';
+ }
+ *p = '\0';
+
+ new_argv[i] = quoted_string;
+ }
+ else
+ new_argv[i] = (char *) string;
+ }
+ new_argv[argc] = NULL;
+
+ return new_argv;
+}
+EOF
+ ;;
+ esac
+
+ cat <<"EOF"
+void lt_dump_script (FILE* f)
+{
+EOF
+ func_emit_wrapper yes |
+ $SED -e 's/\([\\"]\)/\\\1/g' \
+ -e 's/^/ fputs ("/' -e 's/$/\\n", f);/'
+
+ cat <<"EOF"
+}
EOF
}
# end: func_emit_cwrapperexe_src
+# func_win32_import_lib_p ARG
+# True if ARG is an import lib, as indicated by $file_magic_cmd
+func_win32_import_lib_p ()
+{
+ $opt_debug
+ case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
+ *import*) : ;;
+ *) false ;;
+ esac
+}
+
# func_mode_link arg...
func_mode_link ()
{
@@ -4072,6 +4419,7 @@ func_mode_link ()
new_inherited_linker_flags=
avoid_version=no
+ bindir=
dlfiles=
dlprefiles=
dlself=no
@@ -4164,6 +4512,11 @@ func_mode_link ()
esac
case $prev in
+ bindir)
+ bindir="$arg"
+ prev=
+ continue
+ ;;
dlfiles|dlprefiles)
if test "$preload" = no; then
# Add the symbol object into the linking commands.
@@ -4425,6 +4778,11 @@ func_mode_link ()
continue
;;
+ -bindir)
+ prev=bindir
+ continue
+ ;;
+
-dlopen)
prev=dlfiles
continue
@@ -4503,7 +4861,7 @@ func_mode_link ()
esac
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
- testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
+ testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
case :$dllsearchpath: in
*":$dir:"*) ;;
::) dllsearchpath=$dir;;
@@ -4522,7 +4880,7 @@ func_mode_link ()
-l*)
if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
# These systems don't actually have a C or math library (as such)
continue
;;
@@ -4584,6 +4942,7 @@ func_mode_link ()
*" $arg "*) ;;
* ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
esac
+ deplibs="$deplibs $arg"
continue
;;
@@ -4708,7 +5067,7 @@ func_mode_link ()
for flag in $args; do
IFS="$save_ifs"
func_quote_for_eval "$flag"
- arg="$arg $wl$func_quote_for_eval_result"
+ arg="$arg $func_quote_for_eval_result"
compiler_flags="$compiler_flags $func_quote_for_eval_result"
done
IFS="$save_ifs"
@@ -4754,18 +5113,19 @@ func_mode_link ()
arg="$func_quote_for_eval_result"
;;
- # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
- # -r[0-9][0-9]* specifies the processor on the SGI compiler
- # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
- # +DA*, +DD* enable 64-bit mode on the HP compiler
- # -q* pass through compiler args for the IBM compiler
- # -m*, -t[45]*, -txscale* pass through architecture-specific
- # compiler args for GCC
- # -F/path gives path to uninstalled frameworks, gcc on darwin
- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
- # @file GCC response files
+ # Flags to be passed through unchanged, with rationale:
+ # -64, -mips[0-9] enable 64-bit mode for the SGI compiler
+ # -r[0-9][0-9]* specify processor for the SGI compiler
+ # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
+ # +DA*, +DD* enable 64-bit mode for the HP compiler
+ # -q* compiler args for the IBM compiler
+ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
+ # -F/path path to uninstalled frameworks, gcc on darwin
+ # -p, -pg, --coverage, -fprofile-* profiling flags for GCC
+ # @file GCC response files
+ # -tp=* Portland pgcc target processor selection
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
func_quote_for_eval "$arg"
arg="$func_quote_for_eval_result"
func_append compile_command " $arg"
@@ -4925,7 +5285,7 @@ func_mode_link ()
if test -n "$shlibpath_var"; then
# get the directories listed in $shlibpath_var
- eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
+ eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
else
shlib_search_path=
fi
@@ -5033,10 +5393,7 @@ func_mode_link ()
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
- link)
- libs="$deplibs %DEPLIBS%"
- test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
- ;;
+ link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
esac
fi
if test "$linkmode,$pass" = "lib,dlpreopen"; then
@@ -5051,7 +5408,8 @@ func_mode_link ()
# Collect preopened libtool deplibs, except any this library
# has declared as weak libs
for deplib in $dependency_libs; do
- deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"`
+ func_basename "$deplib"
+ deplib_base=$func_basename_result
case " $weak_libs " in
*" $deplib_base "*) ;;
*) deplibs="$deplibs $deplib" ;;
@@ -5076,13 +5434,30 @@ func_mode_link ()
finalize_deplibs="$deplib $finalize_deplibs"
else
compiler_flags="$compiler_flags $deplib"
- if test "$linkmode" = lib ; then
- case "$new_inherited_linker_flags " in
- *" $deplib "*) ;;
- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
- esac
- fi
fi
+
+ case $linkmode in
+ lib)
+ deplibs="$deplib $deplibs"
+ test "$pass" = conv && continue
+ newdependency_libs="$deplib $newdependency_libs"
+ ;;
+ prog)
+ if test "$pass" = conv; then
+ deplibs="$deplib $deplibs"
+ continue
+ fi
+ if test "$pass" = scan; then
+ deplibs="$deplib $deplibs"
+ else
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ fi
+ ;;
+ *)
+ ;;
+ esac # linkmode
+
continue
;;
-l*)
@@ -5230,7 +5605,7 @@ func_mode_link ()
match_pattern*)
set dummy $deplibs_check_method; shift
match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
- if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \
+ if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
| $EGREP "$match_pattern_regex" > /dev/null; then
valid_a_lib=yes
fi
@@ -5240,15 +5615,15 @@ func_mode_link ()
;;
esac
if test "$valid_a_lib" != yes; then
- $ECHO
+ echo
$ECHO "*** Warning: Trying to link with static lib archive $deplib."
- $ECHO "*** I have the capability to make that library automatically link in when"
- $ECHO "*** you link to this library. But I can only do this if you have a"
- $ECHO "*** shared version of the library, which you do not appear to have"
- $ECHO "*** because the file extensions .$libext of this argument makes me believe"
- $ECHO "*** that it is just a static archive that I should not use here."
+ echo "*** I have the capability to make that library automatically link in when"
+ echo "*** you link to this library. But I can only do this if you have a"
+ echo "*** shared version of the library, which you do not appear to have"
+ echo "*** because the file extensions .$libext of this argument makes me believe"
+ echo "*** that it is just a static archive that I should not use here."
else
- $ECHO
+ echo
$ECHO "*** Warning: Linking the shared library $output against the"
$ECHO "*** static library $deplib is not portable!"
deplibs="$deplib $deplibs"
@@ -5321,7 +5696,7 @@ func_mode_link ()
# Convert "-framework foo" to "foo.ltframework"
if test -n "$inherited_linker_flags"; then
- tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
+ tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'`
for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
case " $new_inherited_linker_flags " in
*" $tmp_inherited_linker_flag "*) ;;
@@ -5329,7 +5704,7 @@ func_mode_link ()
esac
done
fi
- dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
if test "$linkmode,$pass" = "lib,link" ||
test "$linkmode,$pass" = "prog,scan" ||
{ test "$linkmode" != prog && test "$linkmode" != lib; }; then
@@ -5347,19 +5722,19 @@ func_mode_link ()
# It is a libtool convenience library, so add in its objects.
convenience="$convenience $ladir/$objdir/$old_library"
old_convenience="$old_convenience $ladir/$objdir/$old_library"
- tmp_libs=
- for deplib in $dependency_libs; do
- deplibs="$deplib $deplibs"
- if $opt_duplicate_deps ; then
- case "$tmp_libs " in
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
- esac
- fi
- tmp_libs="$tmp_libs $deplib"
- done
elif test "$linkmode" != prog && test "$linkmode" != lib; then
func_fatal_error "\`$lib' is not a convenience library"
fi
+ tmp_libs=
+ for deplib in $dependency_libs; do
+ deplibs="$deplib $deplibs"
+ if $opt_duplicate_deps ; then
+ case "$tmp_libs " in
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ esac
+ fi
+ tmp_libs="$tmp_libs $deplib"
+ done
continue
fi # $pass = conv
@@ -5583,7 +5958,7 @@ func_mode_link ()
fi
done
if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
- $ECHO
+ echo
if test "$linkmode" = prog; then
$ECHO "*** Warning: Linking the executable $output against the loadable module"
else
@@ -5686,9 +6061,9 @@ func_mode_link ()
if test "X$dlopenmodule" != "X$lib"; then
$ECHO "*** Warning: lib $linklib is a module, not a shared library"
if test -z "$old_library" ; then
- $ECHO
- $ECHO "*** And there doesn't seem to be a static archive available"
- $ECHO "*** The link will probably fail, sorry"
+ echo
+ echo "*** And there doesn't seem to be a static archive available"
+ echo "*** The link will probably fail, sorry"
else
add="$dir/$old_library"
fi
@@ -5828,21 +6203,21 @@ func_mode_link ()
# Just print a warning and add the library to dependency_libs so
# that the program can be linked against the static library.
- $ECHO
+ echo
$ECHO "*** Warning: This system can not link to static lib archive $lib."
- $ECHO "*** I have the capability to make that library automatically link in when"
- $ECHO "*** you link to this library. But I can only do this if you have a"
- $ECHO "*** shared version of the library, which you do not appear to have."
+ echo "*** I have the capability to make that library automatically link in when"
+ echo "*** you link to this library. But I can only do this if you have a"
+ echo "*** shared version of the library, which you do not appear to have."
if test "$module" = yes; then
- $ECHO "*** But as you try to build a module library, libtool will still create "
- $ECHO "*** a static module, that should work as long as the dlopening application"
- $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime."
+ echo "*** But as you try to build a module library, libtool will still create "
+ echo "*** a static module, that should work as long as the dlopening application"
+ echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
if test -z "$global_symbol_pipe"; then
- $ECHO
- $ECHO "*** However, this would only work if libtool was able to extract symbol"
- $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
- $ECHO "*** not find such a program. So, this module is probably useless."
- $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
+ echo
+ echo "*** However, this would only work if libtool was able to extract symbol"
+ echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+ echo "*** not find such a program. So, this module is probably useless."
+ echo "*** \`nm' from GNU binutils and a full rebuild may help."
fi
if test "$build_old_libs" = no; then
build_libtool_libs=module
@@ -5962,7 +6337,7 @@ func_mode_link ()
compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
else
- compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
fi
fi
dependency_libs="$newdependency_libs"
@@ -6130,7 +6505,7 @@ func_mode_link ()
if test "$deplibs_check_method" != pass_all; then
func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
else
- $ECHO
+ echo
$ECHO "*** Warning: Linking the shared library $output against the non-libtool"
$ECHO "*** objects $objs is not portable!"
libobjs="$libobjs $objs"
@@ -6198,7 +6573,7 @@ func_mode_link ()
age="$number_minor"
revision="$number_revision"
;;
- freebsd-aout|freebsd-elf|sunos)
+ freebsd-aout|freebsd-elf|qnx|sunos)
current="$number_major"
revision="$number_minor"
age="0"
@@ -6210,9 +6585,6 @@ func_mode_link ()
revision="$number_minor"
lt_irix_increment=no
;;
- *)
- func_fatal_configuration "$modename: unknown library version type \`$version_type'"
- ;;
esac
;;
no)
@@ -6435,14 +6807,14 @@ func_mode_link ()
oldlibs="$oldlibs $output_objdir/$libname.$libext"
# Transform .lo files to .o files.
- oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
+ oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
fi
# Eliminate all temporary directories.
#for path in $notinst_path; do
- # lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"`
- # deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"`
- # dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"`
+ # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
+ # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
+ # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
#done
if test -n "$xrpath"; then
@@ -6483,7 +6855,7 @@ func_mode_link ()
if test "$build_libtool_libs" = yes; then
if test -n "$rpath"; then
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
# these systems don't actually have a c library (as such)!
;;
*-*-rhapsody* | *-*-darwin1.[012])
@@ -6568,13 +6940,13 @@ EOF
newdeplibs="$newdeplibs $i"
else
droppeddeps=yes
- $ECHO
+ echo
$ECHO "*** Warning: dynamic linker does not accept needed library $i."
- $ECHO "*** I have the capability to make that library automatically link in when"
- $ECHO "*** you link to this library. But I can only do this if you have a"
- $ECHO "*** shared version of the library, which I believe you do not have"
- $ECHO "*** because a test_compile did reveal that the linker did not use it for"
- $ECHO "*** its dynamic dependency list that programs get resolved with at runtime."
+ echo "*** I have the capability to make that library automatically link in when"
+ echo "*** you link to this library. But I can only do this if you have a"
+ echo "*** shared version of the library, which I believe you do not have"
+ echo "*** because a test_compile did reveal that the linker did not use it for"
+ echo "*** its dynamic dependency list that programs get resolved with at runtime."
fi
fi
;;
@@ -6611,22 +6983,22 @@ EOF
newdeplibs="$newdeplibs $i"
else
droppeddeps=yes
- $ECHO
+ echo
$ECHO "*** Warning: dynamic linker does not accept needed library $i."
- $ECHO "*** I have the capability to make that library automatically link in when"
- $ECHO "*** you link to this library. But I can only do this if you have a"
- $ECHO "*** shared version of the library, which you do not appear to have"
- $ECHO "*** because a test_compile did reveal that the linker did not use this one"
- $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime."
+ echo "*** I have the capability to make that library automatically link in when"
+ echo "*** you link to this library. But I can only do this if you have a"
+ echo "*** shared version of the library, which you do not appear to have"
+ echo "*** because a test_compile did reveal that the linker did not use this one"
+ echo "*** as a dynamic dependency that programs can get resolved with at runtime."
fi
fi
else
droppeddeps=yes
- $ECHO
+ echo
$ECHO "*** Warning! Library $i is needed by this library but I was not able to"
- $ECHO "*** make it link in! You will probably need to install it or some"
- $ECHO "*** library that it depends on before this library will be fully"
- $ECHO "*** functional. Installing it before continuing would be even better."
+ echo "*** make it link in! You will probably need to install it or some"
+ echo "*** library that it depends on before this library will be fully"
+ echo "*** functional. Installing it before continuing would be even better."
fi
;;
*)
@@ -6672,7 +7044,7 @@ EOF
potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
case $potliblink in
[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
- *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
+ *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
esac
done
if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
@@ -6687,12 +7059,12 @@ EOF
fi
if test -n "$a_deplib" ; then
droppeddeps=yes
- $ECHO
+ echo
$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
- $ECHO "*** I have the capability to make that library automatically link in when"
- $ECHO "*** you link to this library. But I can only do this if you have a"
- $ECHO "*** shared version of the library, which you do not appear to have"
- $ECHO "*** because I did check the linker path looking for a file starting"
+ echo "*** I have the capability to make that library automatically link in when"
+ echo "*** you link to this library. But I can only do this if you have a"
+ echo "*** shared version of the library, which you do not appear to have"
+ echo "*** because I did check the linker path looking for a file starting"
if test -z "$potlib" ; then
$ECHO "*** with $libname but no candidates were found. (...for file magic test)"
else
@@ -6730,7 +7102,7 @@ EOF
potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
for potent_lib in $potential_libs; do
potlib="$potent_lib" # see symlink-check above in file_magic test
- if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \
+ if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
$EGREP "$match_pattern_regex" > /dev/null; then
newdeplibs="$newdeplibs $a_deplib"
a_deplib=""
@@ -6741,12 +7113,12 @@ EOF
fi
if test -n "$a_deplib" ; then
droppeddeps=yes
- $ECHO
+ echo
$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
- $ECHO "*** I have the capability to make that library automatically link in when"
- $ECHO "*** you link to this library. But I can only do this if you have a"
- $ECHO "*** shared version of the library, which you do not appear to have"
- $ECHO "*** because I did check the linker path looking for a file starting"
+ echo "*** I have the capability to make that library automatically link in when"
+ echo "*** you link to this library. But I can only do this if you have a"
+ echo "*** shared version of the library, which you do not appear to have"
+ echo "*** because I did check the linker path looking for a file starting"
if test -z "$potlib" ; then
$ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
else
@@ -6764,25 +7136,25 @@ EOF
;;
none | unknown | *)
newdeplibs=""
- tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \
- -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`
+ tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
for i in $predeps $postdeps ; do
# can't use Xsed below, because $i might contain '/'
- tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"`
+ tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
done
fi
- if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' |
- $GREP . >/dev/null; then
- $ECHO
+ case $tmp_deplibs in
+ *[!\ \ ]*)
+ echo
if test "X$deplibs_check_method" = "Xnone"; then
- $ECHO "*** Warning: inter-library dependencies are not supported in this platform."
+ echo "*** Warning: inter-library dependencies are not supported in this platform."
else
- $ECHO "*** Warning: inter-library dependencies are not known to be supported."
+ echo "*** Warning: inter-library dependencies are not known to be supported."
fi
- $ECHO "*** All declared inter-library dependencies are being dropped."
+ echo "*** All declared inter-library dependencies are being dropped."
droppeddeps=yes
- fi
+ ;;
+ esac
;;
esac
versuffix=$versuffix_save
@@ -6794,23 +7166,23 @@ EOF
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library with the System framework
- newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+ newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
;;
esac
if test "$droppeddeps" = yes; then
if test "$module" = yes; then
- $ECHO
- $ECHO "*** Warning: libtool could not satisfy all declared inter-library"
+ echo
+ echo "*** Warning: libtool could not satisfy all declared inter-library"
$ECHO "*** dependencies of module $libname. Therefore, libtool will create"
- $ECHO "*** a static module, that should work as long as the dlopening"
- $ECHO "*** application is linked with the -dlopen flag."
+ echo "*** a static module, that should work as long as the dlopening"
+ echo "*** application is linked with the -dlopen flag."
if test -z "$global_symbol_pipe"; then
- $ECHO
- $ECHO "*** However, this would only work if libtool was able to extract symbol"
- $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
- $ECHO "*** not find such a program. So, this module is probably useless."
- $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
+ echo
+ echo "*** However, this would only work if libtool was able to extract symbol"
+ echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+ echo "*** not find such a program. So, this module is probably useless."
+ echo "*** \`nm' from GNU binutils and a full rebuild may help."
fi
if test "$build_old_libs" = no; then
oldlibs="$output_objdir/$libname.$libext"
@@ -6820,16 +7192,16 @@ EOF
build_libtool_libs=no
fi
else
- $ECHO "*** The inter-library dependencies that have been dropped here will be"
- $ECHO "*** automatically added whenever a program is linked with this library"
- $ECHO "*** or is declared to -dlopen it."
+ echo "*** The inter-library dependencies that have been dropped here will be"
+ echo "*** automatically added whenever a program is linked with this library"
+ echo "*** or is declared to -dlopen it."
if test "$allow_undefined" = no; then
- $ECHO
- $ECHO "*** Since this library must not contain undefined symbols,"
- $ECHO "*** because either the platform does not support them or"
- $ECHO "*** it was explicitly requested with -no-undefined,"
- $ECHO "*** libtool will only create a static version of it."
+ echo
+ echo "*** Since this library must not contain undefined symbols,"
+ echo "*** because either the platform does not support them or"
+ echo "*** it was explicitly requested with -no-undefined,"
+ echo "*** libtool will only create a static version of it."
if test "$build_old_libs" = no; then
oldlibs="$output_objdir/$libname.$libext"
build_libtool_libs=module
@@ -6846,9 +7218,9 @@ EOF
# Time to change all our "foo.ltframework" stuff back to "-framework foo"
case $host in
*-*-darwin*)
- newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
- new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
- deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+ new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+ deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
;;
esac
@@ -6970,7 +7342,7 @@ EOF
done
# Use standard objects if they are pic
- test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
test "X$libobjs" = "X " && libobjs=
delfiles=
@@ -7036,7 +7408,7 @@ EOF
if test -n "$export_symbols" && test -n "$include_expsyms"; then
tmp_export_symbols="$export_symbols"
test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
- $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
fi
if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
@@ -7137,7 +7509,8 @@ EOF
save_libobjs=$libobjs
fi
save_output=$output
- output_la=`$ECHO "X$output" | $Xsed -e "$basename"`
+ func_basename "$output"
+ output_la=$func_basename_result
# Clear the reloadable object creation command queue and
# initialize k to one.
@@ -7150,12 +7523,12 @@ EOF
if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
output=${output_objdir}/${output_la}.lnkscript
func_verbose "creating GNU ld script: $output"
- $ECHO 'INPUT (' > $output
+ echo 'INPUT (' > $output
for obj in $save_libobjs
do
$ECHO "$obj" >> $output
done
- $ECHO ')' >> $output
+ echo ')' >> $output
delfiles="$delfiles $output"
elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
output=${output_objdir}/${output_la}.lnk
@@ -7197,17 +7570,19 @@ EOF
# command to the queue.
if test "$k" -eq 1 ; then
# The first file doesn't have a previous command to add.
- eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
+ reload_objs=$objlist
+ eval concat_cmds=\"$reload_cmds\"
else
# All subsequent reloadable object files will link in
# the last one created.
- eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\"
+ reload_objs="$objlist $last_robj"
+ eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
fi
last_robj=$output_objdir/$output_la-${k}.$objext
func_arith $k + 1
k=$func_arith_result
output=$output_objdir/$output_la-${k}.$objext
- objlist=$obj
+ objlist=" $obj"
func_len " $last_robj"
func_arith $len0 + $func_len_result
len=$func_arith_result
@@ -7217,7 +7592,8 @@ EOF
# reloadable object file. All subsequent reloadable object
# files will link in the last one created.
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
- eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
+ reload_objs="$objlist $last_robj"
+ eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
if test -n "$last_robj"; then
eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
fi
@@ -7276,7 +7652,7 @@ EOF
if test -n "$export_symbols" && test -n "$include_expsyms"; then
tmp_export_symbols="$export_symbols"
test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
- $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
fi
if test -n "$orig_export_symbols"; then
@@ -7441,7 +7817,7 @@ EOF
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then
eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
- reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
+ reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
else
gentop="$output_objdir/${obj}x"
generated="$generated $gentop"
@@ -7452,7 +7828,7 @@ EOF
fi
# Create the old-style object.
- reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+ reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
output="$obj"
func_execute_cmds "$reload_cmds" 'exit $?'
@@ -7512,8 +7888,8 @@ EOF
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library is the System framework
- compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
- finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+ compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
+ finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
;;
esac
@@ -7530,8 +7906,8 @@ EOF
esac
fi
# Time to change all our "foo.ltframework" stuff back to "-framework foo"
- compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
- finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+ finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
;;
esac
@@ -7668,8 +8044,8 @@ EOF
if test -n "$libobjs" && test "$build_old_libs" = yes; then
# Transform all the library objects into standard objects.
- compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
- finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
+ finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
fi
func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
@@ -7681,15 +8057,15 @@ EOF
wrappers_required=yes
case $host in
+ *cegcc* | *mingw32ce*)
+ # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
+ wrappers_required=no
+ ;;
*cygwin* | *mingw* )
if test "$build_libtool_libs" != yes; then
wrappers_required=no
fi
;;
- *cegcc)
- # Disable wrappers for cegcc, we are cross compiling anyway.
- wrappers_required=no
- ;;
*)
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
wrappers_required=no
@@ -7698,7 +8074,7 @@ EOF
esac
if test "$wrappers_required" = no; then
# Replace the output file specification.
- compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+ compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
link_command="$compile_command$compile_rpath"
# We have no uninstalled library dependencies, so finalize right now.
@@ -7745,7 +8121,7 @@ EOF
# We don't need to create a wrapper script.
link_command="$compile_var$compile_command$compile_rpath"
# Replace the output file specification.
- link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+ link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
# Delete the old output file.
$opt_dry_run || $RM $output
# Link the executable and exit
@@ -7764,7 +8140,7 @@ EOF
if test "$fast_install" != no; then
link_command="$finalize_var$compile_command$finalize_rpath"
if test "$fast_install" = yes; then
- relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+ relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
else
# fast_install is set to needless
relink_command=
@@ -7776,7 +8152,7 @@ EOF
fi
# Replace the output file specification.
- link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+ link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
# Delete the old output files.
$opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
@@ -7800,18 +8176,7 @@ EOF
fi
done
relink_command="(cd `pwd`; $relink_command)"
- relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
- fi
-
- # Quote $ECHO for shipping.
- if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then
- case $progpath in
- [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
- *) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
- esac
- qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"`
- else
- qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"`
+ relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
fi
# Only actually do things if not in dry run mode.
@@ -7932,7 +8297,7 @@ EOF
done | sort | sort -uc >/dev/null 2>&1); then
:
else
- $ECHO "copying selected object files to avoid basename conflicts..."
+ echo "copying selected object files to avoid basename conflicts..."
gentop="$output_objdir/${outputname}x"
generated="$generated $gentop"
func_mkdir_p "$gentop"
@@ -8043,7 +8408,7 @@ EOF
done
# Quote the link command for shipping.
relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
- relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
if test "$hardcode_automatic" = yes ; then
relink_command=
fi
@@ -8128,9 +8493,27 @@ EOF
fi
$RM $output
# place dlname in correct position for cygwin
+ # In fact, it would be nice if we could use this code for all target
+ # systems that can't hard-code library paths into their executables
+ # and that have no shared library path variable independent of PATH,
+ # but it turns out we can't easily determine that from inspecting
+ # libtool variables, so we have to hard-code the OSs to which it
+ # applies here; at the moment, that means platforms that use the PE
+ # object format with DLL files. See the long comment at the top of
+ # tests/bindir.at for full details.
tdlname=$dlname
case $host,$output,$installed,$module,$dlname in
- *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
+ # If a -bindir argument was supplied, place the dll there.
+ if test "x$bindir" != x ;
+ then
+ func_relative_path "$install_libdir" "$bindir"
+ tdlname=$func_relative_path_result$dlname
+ else
+ # Otherwise fall back on heuristic.
+ tdlname=../bin/$dlname
+ fi
+ ;;
esac
$ECHO > $output "\
# $outputname - a libtool library file
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2558bc7..5ada56e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -114,6 +114,7 @@ src/Core/Banshee.ThickClient/Banshee.Gui/InterfaceActionService.cs
src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs
src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs
src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackShuffleActions.cs
+src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs
src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs
src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs
src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs
@@ -281,13 +282,11 @@ src/Extensions/Banshee.Podcasting/Banshee.Podcasting.addin.xml
src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastFeedModel.cs
src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs
src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastTrackInfo.cs
-src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellDownloadStatus.cs
src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs
src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcastStatusIndicator.cs
src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellUnheard.cs
src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs
src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs
-src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/HeaderWidget.cs
src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs
src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastEpisodePage.cs
src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs
@@ -296,8 +295,10 @@ src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/P
src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/SyncPreferenceComboBox.cs
src/Extensions/Banshee.RemoteAudio/Banshee.RemoteAudio/RemoteSpeakersWidget.cs
src/Extensions/Banshee.Sample/Banshee.Sample/SampleSource.cs
+src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs
src/Extensions/Banshee.SqlDebugConsole/Banshee.SqlDebugConsole/SqlActions.cs
src/Extensions/Banshee.Torrent/Banshee.Torrent.addin.xml
+src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs
src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia.addin.xml
src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia/ContextPage.cs
src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia/WikipediaView.cs
diff --git a/po/ca.po b/po/ca.po
index 51a2059..459dd4d 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -2,9 +2,9 @@
# Copyright (C) 2005-2010 Jordi Mas i Hernàndez, jmas at softcatala.org
# Traducció del Banshee al català
#
-# Correccions addicionals Josep Puigdemont, Toni Hermoso, Quico Llach, Joan Duran i Gil Forcada.
+# Correccions addicionals Josep Puigdemont, Toni Hermoso, Quico Llach, Joan Duran, Gil Forcada i Silvia Miranda.
#
-# N.T.:
+# N.T.:
#
# 1) Fem servir "Coberta" per traduir "Album Cover". "Portada" (una opció proposada més d'un cop) és la primera pàgina d'un llibre, etc.,
# però el que es veu quan el llibre esta tancat és la coberta, i per tant penso que el mateix es pot aplicar a un disc.
@@ -21,15 +21,17 @@
#
# 7) No tradueixo «scrobbling» de moment (When Last.fm automatically sends the name of each song played by audio player)
#
+# 8) 'Amazon MP3' és nom propi, és el nom del servei.
#
msgid ""
msgstr ""
"Project-Id-Version: Banshee\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-26 16:22+0200\n"
-"PO-Revision-Date: 2010-06-19 18:40+0100\n"
+"POT-Creation-Date: 2010-12-05 14:11+0100\n"
+"PO-Revision-Date: 2010-11-21 23:25+0100\n"
"Last-Translator: Jordi Mas i Hernàndez <jmas at softcatala.org>\n"
-"Language-Team: tradgnome at softcatala.net\n"
+"Language-Team: ca_ES <tradgnome at softcatala.net>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -46,8 +48,8 @@ msgid ""
"Backend providers for the GNOME platform. Includes GConf support and general "
"GNOME integration."
msgstr ""
-"Proveïdors de rerefons per la plataforma GNOME. Inclou compatibilitat amb el "
-"GConf i integració general amb el GNOME."
+"Proveïdors de rerefons per a la plataforma GNOME. Inclou compatibilitat amb "
+"el GConf i integració general en el GNOME."
#. ../src/Backends/Banshee.GStreamer/Banshee.GStreamer.addin.xml
#. ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp.addin.xml
@@ -56,13 +58,13 @@ msgid ""
"GStreamer multimedia services including playback, CD ripping, and "
"transcoding."
msgstr ""
-"Serveis multimèdia del GStreamer incloent-hi reproducció, extracció de CD i "
-"transcodificació."
+"Serveis multimèdia del GStreamer, que inclouen reproducció, extracció de CD "
+"i transcodificació."
#. ../src/Backends/Banshee.Hal/Banshee.Hal.addin.xml
#: ../data/addin-xml-strings.cs:20
msgid "Provides hardware support through HAL."
-msgstr "Proporciona compatibilitat de maquinar mitjançant HAL"
+msgstr "Proporciona compatibilitat de maquinari mitjançant HAL."
#. ../src/Backends/Banshee.NowPlaying.X11/Banshee.NowPlaying.X11.addin.xml
#: ../data/addin-xml-strings.cs:23
@@ -78,8 +80,8 @@ msgstr ""
msgid ""
"Backend providers for the OSX platform. Includes general OSX integration."
msgstr ""
-"Proveïdors de rerefons per la plataforma OSX. Inclou integració general amb "
-"OSX."
+"Proveïdors de rerefons per la plataforma OSX. Inclou integració general en "
+"l'OSX."
#. ../src/Backends/Banshee.Unix/Banshee.Unix.addin.xml
#: ../data/addin-xml-strings.cs:29
@@ -114,12 +116,12 @@ msgstr "Compatibilitat amb la majoria de dispositius iPod/iPhone/iPad."
#: ../data/addin-xml-strings.cs:53 ../data/addin-xml-strings.cs:58
#: ../data/addin-xml-strings.cs:63
msgid "Device Support"
-msgstr "Compatibilitat amb dispositiu"
+msgstr "Compatibilitat amb dispositius"
#. ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod.addin.xml
#: ../data/addin-xml-strings.cs:46
msgid "iPod Support"
-msgstr "Compatibilitat iPod"
+msgstr "Compatibilitat amb iPod"
#: ../data/addin-xml-strings.cs:47
msgid "Support for most iPod devices."
@@ -161,13 +163,13 @@ msgstr ""
#. ../src/Dap/Banshee.Dap/Banshee.Dap.addin.xml
#: ../data/addin-xml-strings.cs:66
msgid "Digital Media Player Support"
-msgstr "Compatibilitat per al reproductor multimèdia digital"
+msgstr "Compatibilitat amb reproductors multimèdia digitals"
#: ../data/addin-xml-strings.cs:67
msgid "Provides general support for many kinds of media player devices."
msgstr ""
-"Proporciona compatibilitat general per molts tipus de dispositius "
-"reproductors multimèdia."
+"Proporciona compatibilitat general per a molts tipus de dispositius de "
+"reproducció multimèdia."
#. ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store.addin.xml
#: ../data/addin-xml-strings.cs:70
@@ -192,7 +194,7 @@ msgstr "Importació Amazon MP3"
#: ../data/addin-xml-strings.cs:76
msgid "Download and import music purchased from Amazon.com"
-msgstr "Baixa i importa música comprada a Amazon.com"
+msgstr "Baixeu i importeu música comprada a Amazon.com"
#. ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook.addin.xml
#: ../data/addin-xml-strings.cs:80
@@ -201,11 +203,11 @@ msgstr "Biblioteca d'audiollibres"
#: ../data/addin-xml-strings.cs:81
msgid "Organize audiobooks, lectures, etc."
-msgstr "Organitza audiollibres, conferències, etc."
+msgstr "Organitzeu audiollibres, conferències, etc."
#: ../data/addin-xml-strings.cs:82 ../data/addin-xml-strings.cs:87
#: ../data/addin-xml-strings.cs:117 ../data/addin-xml-strings.cs:132
-#: ../data/addin-xml-strings.cs:185 ../data/addin-xml-strings.cs:190
+#: ../data/addin-xml-strings.cs:190 ../data/addin-xml-strings.cs:195
msgid "Core"
msgstr "Nucli"
@@ -217,7 +219,7 @@ msgstr "Compatibilitat amb CD d'àudio"
#: ../data/addin-xml-strings.cs:86
msgid "Listen to and rip Audio CDs."
-msgstr "Escoleu i extraieu CD d'àudio."
+msgstr "Escolteu i extraieu CD d'àudio."
#. ../src/Extensions/Banshee.BooScript/Banshee.BooScript.addin.xml
#: ../data/addin-xml-strings.cs:90
@@ -226,14 +228,14 @@ msgstr "Scripts en Boo"
#: ../data/addin-xml-strings.cs:91
msgid "Customize and extend Banshee with Boo-language scripts."
-msgstr "Personalitza i estén el Banshee amb el llenguatge de scripts Boo."
+msgstr "Personalitzeu i amplieu el Banshee amb el llenguatge de scripts Boo."
#: ../data/addin-xml-strings.cs:92 ../data/addin-xml-strings.cs:97
#: ../data/addin-xml-strings.cs:102 ../data/addin-xml-strings.cs:107
#: ../data/addin-xml-strings.cs:122 ../data/addin-xml-strings.cs:147
#: ../data/addin-xml-strings.cs:156 ../data/addin-xml-strings.cs:166
-#: ../data/addin-xml-strings.cs:171 ../data/addin-xml-strings.cs:180
-#: ../data/addin-xml-strings.cs:209
+#: ../data/addin-xml-strings.cs:171 ../data/addin-xml-strings.cs:176
+#: ../data/addin-xml-strings.cs:185 ../data/addin-xml-strings.cs:214
msgid "Utilities"
msgstr "Utilitats"
@@ -262,7 +264,7 @@ msgstr "Compartició DAAP"
#: ../data/addin-xml-strings.cs:106
msgid "Browse and listen to music shared over your local network."
-msgstr "Navegueu i escolteu música compartida en la vostra xarxa local."
+msgstr "Navegueu i escolteu música compartida a la xarxa local."
#. ../src/Extensions/Banshee.Emusic/Banshee.Emusic.addin.xml
#: ../data/addin-xml-strings.cs:110
@@ -271,7 +273,7 @@ msgstr "Importació eMusic"
#: ../data/addin-xml-strings.cs:111
msgid "Download and import music purchased from eMusic"
-msgstr "Baixa i importa música comprada a eMusic"
+msgstr "Baixeu i importeu música comprada a eMusic"
#. ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue.addin.xml
#: ../data/addin-xml-strings.cs:115
@@ -280,7 +282,7 @@ msgstr "Cua de previsualització del sistema de fitxers"
#: ../data/addin-xml-strings.cs:116
msgid "Preview files without importing to your library."
-msgstr "Previsualitza fitxers sense importar-los en la biblioteca."
+msgstr "Previsualitzeu fitxers sense importar-los a la biblioteca."
#. ../src/Extensions/Banshee.Fixup/Banshee.Fixup.addin.xml
#: ../data/addin-xml-strings.cs:120
@@ -291,7 +293,7 @@ msgstr "Reparació de les metadades"
#: ../data/addin-xml-strings.cs:121
msgid "Fix broken and missing metadata using bulk operations"
msgstr ""
-"Repara les metadades malmeses i que manquen utilitzant operacions en bloc"
+"Repareu les metadades malmeses i que manquen utilitzant operacions en bloc"
# N.T.: No es tradueix ja que és nom propi
#. ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive.addin.xml
@@ -302,7 +304,8 @@ msgstr "Internet Archive"
#: ../data/addin-xml-strings.cs:126
msgid "Browse and search the Internet Archive's vast media collection."
-msgstr "Navega i cerca l'enorme col·lecció multimèdia de l'Internet Archive."
+msgstr ""
+"Navegueu i cerqueu l'enorme col·lecció multimèdia de l'Internet Archive."
#. ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio.addin.xml
#: ../data/addin-xml-strings.cs:130
@@ -311,7 +314,7 @@ msgstr "Ràdio per Internet"
#: ../data/addin-xml-strings.cs:131
msgid "Listen to and organize Internet Radio stations."
-msgstr "Escolteu i organitzeu les emissores de ràdio d'Internet"
+msgstr "Escolteu i organitzeu emissores de ràdio per Internet."
#. ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.addin.xml
#: ../data/addin-xml-strings.cs:135
@@ -329,7 +332,7 @@ msgstr "Ràdio Last.fm"
#: ../data/addin-xml-strings.cs:141
msgid "Last.fm streaming radio for paid subscribers."
-msgstr "Flux de ràdio de Last.fm "
+msgstr "Flux de ràdio de Last.fm per a subscriptors de pagament."
#. ../src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher.addin.xml
#: ../data/addin-xml-strings.cs:145
@@ -348,7 +351,7 @@ msgstr "Compatibilitat amb MeeGo"
#: ../data/addin-xml-strings.cs:151
msgid "Provides MeeGo integration, including a custom media panel."
msgstr ""
-"Proporciona integració amb el MeeGo, incloent-hi un tauler multimèdia "
+"Proporciona integració amb el MeeGo; inclou un tauler multimèdia "
"personalitzat."
#. ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode.addin.xml
@@ -361,156 +364,166 @@ msgid ""
"Control Banshee through a small window with only playback controls and track "
"information."
msgstr ""
-"Controla el Banshee mitjançant una finestra petita amb només els controls de "
-"reproducció i informació de la pista."
+"Controleu el Banshee mitjançant una finestra petita només amb els controls "
+"de reproducció i la informació de la cançó."
#. ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide.addin.xml
#: ../data/addin-xml-strings.cs:159
msgid "Miro Guide Podcast Directory"
-msgstr "Directori de Podcasts Miro Guide"
+msgstr "Directori de podcasts Miro Guide"
#: ../data/addin-xml-strings.cs:160
msgid "Browse and subscribe to thousands of audio and video podcasts."
msgstr "Navegueu i subscriviu-vos a milers de podcasts d'àudio i vídeo."
-#. ../src/Extensions/Banshee.MultimediaKeys/Banshee.MultimediaKeys.addin.xml
+#. ../src/Extensions/Banshee.Mpris/Banshee.Mpris.addin.xml
#: ../data/addin-xml-strings.cs:164
+msgid "MPRIS D-Bus interface"
+msgstr "Interfície D-Bus d'MPRIS"
+
+#: ../data/addin-xml-strings.cs:165
+msgid "Control Banshee using the MPRIS D-Bus interface."
+msgstr "Controleu el Banshee mitjançant la interfície D-Bus d'MPRIS."
+
+#. ../src/Extensions/Banshee.MultimediaKeys/Banshee.MultimediaKeys.addin.xml
+#: ../data/addin-xml-strings.cs:169
msgid "Multimedia Keys"
msgstr "Tecles multimèdia"
-#: ../data/addin-xml-strings.cs:165
+#: ../data/addin-xml-strings.cs:170
msgid "Control playback via the multimedia keys on your keyboard."
-msgstr "Controla la reproducció mitjançant les tecles multimèdia del teclat."
+msgstr "Controleu la reproducció mitjançant les tecles multimèdia del teclat."
#. ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.addin.xml
-#: ../data/addin-xml-strings.cs:169
+#: ../data/addin-xml-strings.cs:174
msgid "Notification Area Icon"
msgstr "Icona de l'àrea de notificació"
-#: ../data/addin-xml-strings.cs:170
+#: ../data/addin-xml-strings.cs:175
msgid "Display an icon in the notification area for controlling Banshee."
msgstr "Mostra una icona a l'àrea de notificació per controlar el Banshee."
#. ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying.addin.xml
-#: ../data/addin-xml-strings.cs:174
-#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:164
+#: ../data/addin-xml-strings.cs:179
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:168
#: ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs:50
msgid "Now Playing"
msgstr "S'està reproduint"
-#: ../data/addin-xml-strings.cs:175
+#: ../data/addin-xml-strings.cs:180
msgid ""
"Provides a source that displays embedded video and provides fullscreen video "
"playback and controls."
msgstr ""
-"Proporciona una font que mostra vídeo incrustat i proporciona reproducció i "
+"Proporciona una font que mostra vídeo incrustat, i proporciona reproducció i "
"control del vídeo a pantalla completa."
#. ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration.addin.xml
-#: ../data/addin-xml-strings.cs:178
+#: ../data/addin-xml-strings.cs:183
msgid "Importers for Amarok, Rhythmbox and iTunes"
msgstr "Importadors per a l'Amarok, el Rhythmbox i l'iTunes"
-#: ../data/addin-xml-strings.cs:179
+#: ../data/addin-xml-strings.cs:184
msgid "Import your library from Amarok, Rhythmbox or iTunes."
-msgstr "Importa la vostra biblioteca des de l'Amarok, el Rhythmbox o l'iTunes."
+msgstr "Importeu la biblioteca de l'Amarok, el Rhythmbox o l'iTunes."
#. ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue.addin.xml
-#: ../data/addin-xml-strings.cs:183
+#: ../data/addin-xml-strings.cs:188
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:58
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:79
msgid "Play Queue"
msgstr "Cua de reproducció"
-#: ../data/addin-xml-strings.cs:184
+#: ../data/addin-xml-strings.cs:189
msgid "Queue tracks in an ad-hoc playlist, or let the Auto DJ take over."
msgstr ""
-"Encua les cançons en una llista de reproducció o deixa que el DJ automàtic "
-"se'n ocupi."
+"Encueu les cançons en una llista de reproducció o deixeu que el DJ automàtic "
+"se n'ocupi."
#
#. ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.addin.xml
-#: ../data/addin-xml-strings.cs:188
+#: ../data/addin-xml-strings.cs:193
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:193
#: ../src/Dap/Banshee.Dap/Banshee.Dap/PodcastGroupSource.cs:38
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:107
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:203
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:210
msgid "Podcasts"
msgstr "Podcasts"
-#: ../data/addin-xml-strings.cs:189
+#: ../data/addin-xml-strings.cs:194
msgid "Subscribe to podcasts and stream or download episodes."
-msgstr "Subscriu a Podcasts i fluxos o baixades d'episodis."
+msgstr "Subscriviu-vos a podcasts i emeteu o baixeu episodis."
#. ../src/Extensions/Banshee.RemoteAudio/Banshee.RemoteAudio.addin.xml
-#: ../data/addin-xml-strings.cs:193
+#: ../data/addin-xml-strings.cs:198
msgid "Remote Audio"
msgstr "Àudio remot"
-#: ../data/addin-xml-strings.cs:194
+#: ../data/addin-xml-strings.cs:199
msgid "Provides support for remote speakers like the Airport Express"
-msgstr "Proporciona compatibilitat amb altaveus remots com Airport Express"
+msgstr "Proporciona compatibilitat amb altaveus remots com Airport Express."
#. ../src/Extensions/Banshee.Sample/Banshee.Sample.addin.xml
-#: ../data/addin-xml-strings.cs:197
+#: ../data/addin-xml-strings.cs:202
#: ../src/Extensions/Banshee.Sample/Banshee.Sample/SampleSource.cs:40
msgid "Sample"
msgstr "Exemple"
-#: ../data/addin-xml-strings.cs:198
+#: ../data/addin-xml-strings.cs:203
msgid "A sample source useful to developers."
msgstr "Una font d'exemple útil per a desenvolupadors."
-#: ../data/addin-xml-strings.cs:199
+#: ../data/addin-xml-strings.cs:204
msgid "Sources"
msgstr "Fonts"
#. ../src/Extensions/Banshee.SqlDebugConsole/Banshee.SqlDebugConsole.addin.xml
-#: ../data/addin-xml-strings.cs:202
+#: ../data/addin-xml-strings.cs:207
msgid "SQL Debug Console"
msgstr "Consola de depuració SQL"
-#: ../data/addin-xml-strings.cs:203
+#: ../data/addin-xml-strings.cs:208
msgid "Provides a UI for monitoring Banshee's SQL usage, and running queries."
msgstr ""
-"Proporciona una interfície per a monitoritzar l'ús del SQL del Banshee i les "
-"consultes en execució."
+"Proporciona una interfície per fer un seguiment de l'ús del SQL del Banshee "
+"i les consultes en execució."
-#: ../data/addin-xml-strings.cs:204
+#: ../data/addin-xml-strings.cs:209
msgid "Debug"
msgstr "Depura"
#. ../src/Extensions/Banshee.Torrent/Banshee.Torrent.addin.xml
-#: ../data/addin-xml-strings.cs:207
+#: ../data/addin-xml-strings.cs:212
msgid "Torrent Downloader"
msgstr "Baixada de Torrent"
-#: ../data/addin-xml-strings.cs:208
+#: ../data/addin-xml-strings.cs:213
msgid "Support downloading BitTorrent files from podcasts."
msgstr "Compatibilitat amb baixades de fitxers BitTorrent des de podcasts."
#. ../src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia.addin.xml
-#: ../data/addin-xml-strings.cs:212
+#: ../data/addin-xml-strings.cs:217
#: ../src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia/ContextPage.cs:44
msgid "Wikipedia"
msgstr "Viquipèdia"
-#: ../data/addin-xml-strings.cs:213
+#: ../data/addin-xml-strings.cs:218
msgid "View artist information from Wikipedia in the context pane."
msgstr ""
-"Visualitza la informació de l'artista a Viquipèdia en la subfinestra de "
-"context"
+"Visualitza la informació de l'artista a Viquipèdia a la subfinestra de "
+"context."
-#: ../data/addin-xml-strings.cs:214 ../data/addin-xml-strings.cs:219
+#: ../data/addin-xml-strings.cs:219 ../data/addin-xml-strings.cs:224
msgid "Context Pane"
msgstr "Subfinestra de context"
#. ../src/Extensions/Banshee.YouTube/Banshee.YouTube.addin.xml
-#: ../data/addin-xml-strings.cs:217
+#: ../data/addin-xml-strings.cs:222
#: ../src/Extensions/Banshee.YouTube/Banshee.YouTube/ContextPage.cs:44
msgid "YouTube"
msgstr "YouTube"
-#: ../data/addin-xml-strings.cs:218
+#: ../data/addin-xml-strings.cs:223
msgid "Show related YouTube videos in the context pane"
msgstr "Mostra vídeos del YouTube relacionats a la subfinestra de context"
@@ -523,7 +536,7 @@ msgid "AAC (Novell Encoder)"
msgstr "AAC (Codificador de Novell)"
#: ../data/audio-profiles/aac-novell.xml.in.h:3
-#: ../data/audio-profiles/mp3-lame.xml.in.h:4
+#: ../data/audio-profiles/mp3-lame.xml.in.h:3
#: ../data/audio-profiles/mp3-xing.xml.in.h:2
#: ../data/audio-profiles/wavpack.xml.in.h:3
#: ../data/audio-profiles/wma.xml.in.h:4
@@ -539,8 +552,8 @@ msgid ""
"Designed to be the successor of the MP3 format, AAC generally achieves "
"better sound quality than MP3 at many bit rates."
msgstr ""
-"Dissenya per ser el successor del format MP3, l'AAC normalment aconsegueix "
-"millor qualitat de so a moltes taxa de bits."
+"Dissenyat per ser el successor del format MP3, l'AAC normalment aconsegueix "
+"millor qualitat de so a moltes taxes de bits."
#: ../data/audio-profiles/aac-novell.xml.in.h:6
msgid "Long Term Prediction"
@@ -591,65 +604,36 @@ msgstr ""
"Format d'àudio amb pèrdua, antic i no lliure, però també popular, que "
"produeix fitxers més grans a taxes de bits més baixes."
-#: ../data/audio-profiles/mp3-lame.xml.in.h:2
-msgid "Average Bitrate"
-msgstr "Taxa de bits mitjana"
-
#
-#: ../data/audio-profiles/mp3-lame.xml.in.h:3
+#: ../data/audio-profiles/mp3-lame.xml.in.h:2
#: ../data/audio-profiles/vorbis.xml.in.h:2
#: ../data/audio-profiles/wavpack.xml.in.h:2
#: ../data/audio-profiles/wma.xml.in.h:3
msgid "Best"
msgstr "Millor"
-#: ../data/audio-profiles/mp3-lame.xml.in.h:5
+#: ../data/audio-profiles/mp3-lame.xml.in.h:4
msgid "Constant Bitrate"
msgstr "Taxa de bits constant"
-#: ../data/audio-profiles/mp3-lame.xml.in.h:6
-msgid "Extreme"
-msgstr "Extrem"
-
-#: ../data/audio-profiles/mp3-lame.xml.in.h:7
-msgid "Insane"
-msgstr "Esbojarrat"
-
-#: ../data/audio-profiles/mp3-lame.xml.in.h:8
-msgid "LAME Preset"
-msgstr "Predefinició LAME"
+#: ../data/audio-profiles/mp3-lame.xml.in.h:5
+msgid "Encoding Mode"
+msgstr "Mode de codificació"
-#: ../data/audio-profiles/mp3-lame.xml.in.h:9
+#: ../data/audio-profiles/mp3-lame.xml.in.h:6
msgid "MP3 (LAME Encoder)"
msgstr "MP3 (codificador LAME)"
-#: ../data/audio-profiles/mp3-lame.xml.in.h:10
-msgid "Medium"
-msgstr "Mitjana"
-
-#: ../data/audio-profiles/mp3-lame.xml.in.h:11
-msgid "Preset"
-msgstr "Predefinició"
-
-#: ../data/audio-profiles/mp3-lame.xml.in.h:12
-msgid "Standard"
-msgstr "Estàndard"
-
-#
-#: ../data/audio-profiles/mp3-lame.xml.in.h:13
-msgid "VBR Mode"
-msgstr "Mode VBR"
-
-#: ../data/audio-profiles/mp3-lame.xml.in.h:14
+#: ../data/audio-profiles/mp3-lame.xml.in.h:7
msgid "VBR Quality"
msgstr "Qualitat VBR"
-#: ../data/audio-profiles/mp3-lame.xml.in.h:15
+#: ../data/audio-profiles/mp3-lame.xml.in.h:8
msgid "Variable Bitrate"
msgstr "Taxa de bits variable"
#
-#: ../data/audio-profiles/mp3-lame.xml.in.h:16
+#: ../data/audio-profiles/mp3-lame.xml.in.h:9
#: ../data/audio-profiles/vorbis.xml.in.h:5
#: ../data/audio-profiles/wavpack.xml.in.h:15
#: ../data/audio-profiles/wma.xml.in.h:7
@@ -770,7 +754,7 @@ msgstr "Windows Media Audio"
#
#: ../data/desktop-files/common.desktop.in.h:1
#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:76
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:109
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:107
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs:206
#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:60
msgid "Banshee Media Player"
@@ -796,8 +780,8 @@ msgid "Could not create filesrc element"
msgstr "No s'ha pogut crear l'element «filesrc»"
#: ../libbanshee/banshee-bpmdetector.c:214
-msgid "Could not create decodebin plugin"
-msgstr "No s'ha pogut crear el connector «decodebin»"
+msgid "Could not create decodebin2 plugin"
+msgstr "No s'ha pogut crear el connector «decodebin2»"
#: ../libbanshee/banshee-bpmdetector.c:220
msgid "Could not create audioconvert plugin"
@@ -840,8 +824,8 @@ msgid "Could not create source element"
msgstr "No s'ha pogut crear l'element font"
#: ../libbanshee/banshee-transcoder.c:246
-msgid "Could not create 'decodebin' plugin"
-msgstr "No s'ha pogut crear el connector «decodebin»"
+msgid "Could not create 'decodebin2' plugin"
+msgstr "No s'ha pogut crear el connector «decodebin2»"
#: ../libbanshee/banshee-transcoder.c:252
msgid "Could not create sink element"
@@ -879,12 +863,12 @@ msgstr "Enregistra un CD..."
msgid "Write selected tracks to an audio CD"
msgstr "Enregistra les cançons seleccionades a un CD d'àudio"
-#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:104
+#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:105
msgid "Could not write CD"
msgstr "No s'ha pogut escriure al CD"
#
-#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:105
+#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:106
msgid "Brasero could not be started"
msgstr "No s'ha pogut iniciar el Brasero"
@@ -895,7 +879,7 @@ msgstr "Reproducció de vídeo a pantalla completa activa"
#
#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/AudioCdRipper.cs:89
msgid "Could not find an encoder for ripping."
-msgstr "No s'ha pogut trobar un codificador per a extreure."
+msgstr "No s'ha pogut trobar un codificador per extreure."
#
#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/AudioCdRipper.cs:108
@@ -908,7 +892,7 @@ msgid "Could not create BPM detection driver."
msgstr "No s'ha pogut crear el controlador de detecció BPM."
#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:82
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:766
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:812
msgid "Enable _gapless playback"
msgstr "Ha_bilita el mode de reproducció sense salts"
@@ -917,24 +901,24 @@ msgid ""
"Eliminate the small playback gap on track change. Useful for concept albums "
"and classical music"
msgstr ""
-"Suprimeix el petit salt de reproducció al canviar de pista. Útil per a "
+"Suprimeix el petit salt de reproducció al canviar de cançó. Útil per a "
"àlbums conceptuals i música clàssica"
#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:150
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:187
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:192
msgid "Could not initialize GStreamer library"
msgstr "No s'ha pogut inicialitzar la biblioteca del GStreamer"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:430
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:435
msgid "Unknown Error"
msgstr "Error desconegut"
#
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:760
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:806
msgid "_Enable ReplayGain correction"
msgstr "_Habilita la correcció d'errors ReplayGain"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:761
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:807
msgid ""
"For tracks that have ReplayGain data, automatically scale (normalize) "
"playback volume"
@@ -942,19 +926,19 @@ msgstr ""
"Per a cançons que disposen de dades ReplayGain, escala automàticament "
"(normalitza) el volum de reproducció"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:767
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:813
msgid ""
"Eliminate the small playback gap on track change. Useful for concept albums "
"and classical music."
msgstr ""
-"Suprimeix el petit salt de reproducció al canviar de pista. Útil per a "
+"Suprimeix el petit salt de reproducció al canviar de cançó. Útil per a "
"àlbums conceptuals i música clàssica."
#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/Transcoder.cs:63
msgid "Could not create transcoder"
msgstr "No s'ha pogut crear el codificador"
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:222
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:229
msgid "GStreamer# 0.10"
msgstr "GStreamer# 0.10"
@@ -964,68 +948,68 @@ msgid "_Close"
msgstr "_Tanca"
#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs:92
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:238
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:251
#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:79
#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:133
msgid "Close"
msgstr "Tanca"
-#: ../src/Clients/Booter/Booter/Entry.cs:148
+#: ../src/Clients/Booter/Booter/Entry.cs:152
msgid "Help Options"
msgstr "Opcions d'ajuda"
-#: ../src/Clients/Booter/Booter/Entry.cs:149
+#: ../src/Clients/Booter/Booter/Entry.cs:153
msgid "Show this help"
msgstr "Mostra aquesta ajuda"
-#: ../src/Clients/Booter/Booter/Entry.cs:150
+#: ../src/Clients/Booter/Booter/Entry.cs:154
msgid "Show options for controlling playback"
-msgstr "Mostra les opcions per a controlar la reproducció"
+msgstr "Mostra les opcions per controlar la reproducció"
-#: ../src/Clients/Booter/Booter/Entry.cs:151
+#: ../src/Clients/Booter/Booter/Entry.cs:155
msgid "Show options for querying the playing track"
-msgstr "Mostra les opcions per a consultar la cançó en reproducció"
+msgstr "Mostra les opcions per consultar la cançó en reproducció"
-#: ../src/Clients/Booter/Booter/Entry.cs:152
+#: ../src/Clients/Booter/Booter/Entry.cs:156
msgid "Show options for querying the playing engine"
-msgstr "Mostra les opcions per a consultar el motor de reproducció"
+msgstr "Mostra les opcions per consultar el motor de reproducció"
#
-#: ../src/Clients/Booter/Booter/Entry.cs:153
+#: ../src/Clients/Booter/Booter/Entry.cs:157
msgid "Show options for the user interface"
msgstr "Mostra les opcions per a la interfície d'usuari"
-#: ../src/Clients/Booter/Booter/Entry.cs:154
+#: ../src/Clients/Booter/Booter/Entry.cs:158
msgid "Show options for developers and debugging"
msgstr "Mostra les opcions per a desenvolupadors i depuració"
-#: ../src/Clients/Booter/Booter/Entry.cs:155
+#: ../src/Clients/Booter/Booter/Entry.cs:159
msgid "Show all option groups"
msgstr "Mostra tots els grups d'opcions"
-#: ../src/Clients/Booter/Booter/Entry.cs:156
+#: ../src/Clients/Booter/Booter/Entry.cs:160
msgid "Show version information"
msgstr "Mostra la informació de la versió"
-#: ../src/Clients/Booter/Booter/Entry.cs:159
+#: ../src/Clients/Booter/Booter/Entry.cs:163
msgid "Playback Control Options"
msgstr "Opcions de control de la reproducció"
-#: ../src/Clients/Booter/Booter/Entry.cs:160
+#: ../src/Clients/Booter/Booter/Entry.cs:164
msgid ""
"Play the next track, optionally restarting if the 'restart' value is set"
msgstr ""
"Reprodueix la cançó següent, tornant a començar opcionalment si el valor "
"«reinicia» està establert"
-#: ../src/Clients/Booter/Booter/Entry.cs:161
+#: ../src/Clients/Booter/Booter/Entry.cs:165
msgid ""
"Play the previous track, optionally restarting if the 'restart value is set"
msgstr ""
"Reprodueix la cançó anterior, tornant a començar opcionalment si el valor "
"«reinicia» està establert"
-#: ../src/Clients/Booter/Booter/Entry.cs:162
+#: ../src/Clients/Booter/Booter/Entry.cs:166
msgid ""
"If the current song has been played longer than 4 seconds then restart it, "
"otherwise the same as --previous"
@@ -1033,29 +1017,29 @@ msgstr ""
"Si la cançó actual s'ha estat reproduint durant més de 4 segons reinicia-la, "
"si no, el mateix que --previous"
-#: ../src/Clients/Booter/Booter/Entry.cs:163
+#: ../src/Clients/Booter/Booter/Entry.cs:167
msgid "Automatically start playing any tracks enqueued on the command line"
msgstr ""
"Inicia automàticament la reproducció de qualsevol cançó en la línia d'ordres"
-#: ../src/Clients/Booter/Booter/Entry.cs:164
+#: ../src/Clients/Booter/Booter/Entry.cs:168
msgid "Start playback"
msgstr "Inicia la reproducció"
-#: ../src/Clients/Booter/Booter/Entry.cs:165
+#: ../src/Clients/Booter/Booter/Entry.cs:169
msgid "Pause playback"
msgstr "Fes una pausa en la reproducció"
-#: ../src/Clients/Booter/Booter/Entry.cs:166
+#: ../src/Clients/Booter/Booter/Entry.cs:170
msgid "Toggle playback"
msgstr "Commuta el mode de reproducció"
#
-#: ../src/Clients/Booter/Booter/Entry.cs:167
+#: ../src/Clients/Booter/Booter/Entry.cs:171
msgid "Completely stop playback"
msgstr "Atura completament la reproducció"
-#: ../src/Clients/Booter/Booter/Entry.cs:169
+#: ../src/Clients/Booter/Booter/Entry.cs:173
msgid ""
"Enable or disable playback stopping after the currently playing track (value "
"should be either 'true' or 'false')"
@@ -1063,80 +1047,80 @@ msgstr ""
"Habilita o inhabilita l'aturada de reproducció després de la cançó actual en "
"reproducció (el valor ha de ser «cert» o «fals»)"
-#: ../src/Clients/Booter/Booter/Entry.cs:170
+#: ../src/Clients/Booter/Booter/Entry.cs:174
msgid "Set the playback volume (0-100), prefix with +/- for relative values"
msgstr ""
"Estableix el volum de reproducció (0-100), utilitzeu els prefixos +/- per a "
"valors relatius"
-#: ../src/Clients/Booter/Booter/Entry.cs:171
+#: ../src/Clients/Booter/Booter/Entry.cs:175
msgid "Seek to a specific point (seconds, float)"
msgstr "Vés a un punt concret de l'element actual (segons, coma flotant)"
-#: ../src/Clients/Booter/Booter/Entry.cs:172
+#: ../src/Clients/Booter/Booter/Entry.cs:176
msgid "Set the currently played track's rating (0 to 5)"
msgstr "Estableix la valoració (0 a 5) per la canço que s'està reproduint"
#
-#: ../src/Clients/Booter/Booter/Entry.cs:175
+#: ../src/Clients/Booter/Booter/Entry.cs:179
msgid "Player Engine Query Options"
msgstr "Opcions de consulta del motor del reproductor"
-#: ../src/Clients/Booter/Booter/Entry.cs:176
+#: ../src/Clients/Booter/Booter/Entry.cs:180
msgid "Current player state"
msgstr "Estat actual del reproductor"
-#: ../src/Clients/Booter/Booter/Entry.cs:177
+#: ../src/Clients/Booter/Booter/Entry.cs:181
msgid "Last player state"
msgstr "Darrer estat del reproductor"
-#: ../src/Clients/Booter/Booter/Entry.cs:178
+#: ../src/Clients/Booter/Booter/Entry.cs:182
msgid "Query whether the player can be paused"
msgstr "Consulta si es pot fer una pausa en el reproductor"
-#: ../src/Clients/Booter/Booter/Entry.cs:179
+#: ../src/Clients/Booter/Booter/Entry.cs:183
msgid "Query whether the player can seek"
msgstr "Consulta si es pot fer cerques a un punt concret"
#
-#: ../src/Clients/Booter/Booter/Entry.cs:180
+#: ../src/Clients/Booter/Booter/Entry.cs:184
msgid "Player volume"
msgstr "Volum del reproductor"
#
#
-#: ../src/Clients/Booter/Booter/Entry.cs:181
+#: ../src/Clients/Booter/Booter/Entry.cs:185
msgid "Player position in currently playing track"
msgstr "Posició del reproductor en la cançó que s'està reproduint"
-#: ../src/Clients/Booter/Booter/Entry.cs:184
+#: ../src/Clients/Booter/Booter/Entry.cs:188
msgid "Playing Track Metadata Query Options"
msgstr "Opcions de consulta de metadades de la cançó en reproducció"
-#: ../src/Clients/Booter/Booter/Entry.cs:185
+#: ../src/Clients/Booter/Booter/Entry.cs:189
msgid "URI"
msgstr "URI"
-#: ../src/Clients/Booter/Booter/Entry.cs:186
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:161
+#: ../src/Clients/Booter/Booter/Entry.cs:190
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:138
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:89
msgid "Artist Name"
msgstr "Nom de l'artista"
-#: ../src/Clients/Booter/Booter/Entry.cs:187
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:163
+#: ../src/Clients/Booter/Booter/Entry.cs:191
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:140
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:90
msgid "Album Title"
msgstr "Títol de l'àlbum"
#
-#: ../src/Clients/Booter/Booter/Entry.cs:188
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:160
+#: ../src/Clients/Booter/Booter/Entry.cs:192
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:137
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:88
msgid "Track Title"
msgstr "Títol de la cançó"
-#: ../src/Clients/Booter/Booter/Entry.cs:189
+#: ../src/Clients/Booter/Booter/Entry.cs:193
msgid "Duration"
msgstr "Durada"
@@ -1144,38 +1128,38 @@ msgstr "Durada"
#
#
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:190
+#: ../src/Clients/Booter/Booter/Entry.cs:194
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:117
msgid "Track Number"
msgstr "Número de la cançó"
#
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:191
+#: ../src/Clients/Booter/Booter/Entry.cs:195
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:126
msgid "Track Count"
msgstr "Nombre de reproduccions de la cançó"
#
-#: ../src/Clients/Booter/Booter/Entry.cs:192
+#: ../src/Clients/Booter/Booter/Entry.cs:196
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:149
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:113
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:114
msgid "Disc Number"
msgstr "Número del disc"
#
-#: ../src/Clients/Booter/Booter/Entry.cs:193
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:165
+#: ../src/Clients/Booter/Booter/Entry.cs:197
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:142
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:113
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:177
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:77
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:78
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:132
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:77
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:92
msgid "Year"
msgstr "Any"
-#: ../src/Clients/Booter/Booter/Entry.cs:194
+#: ../src/Clients/Booter/Booter/Entry.cs:198
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:230
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:131
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:60
@@ -1183,79 +1167,79 @@ msgstr "Any"
msgid "Rating"
msgstr "Valoració"
-#: ../src/Clients/Booter/Booter/Entry.cs:195
+#: ../src/Clients/Booter/Booter/Entry.cs:199
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:322
msgid "Score"
msgstr "Puntuació"
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:196
+#: ../src/Clients/Booter/Booter/Entry.cs:200
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:143
msgid "Bit Rate"
msgstr "Taxa de bits"
-#: ../src/Clients/Booter/Booter/Entry.cs:199
+#: ../src/Clients/Booter/Booter/Entry.cs:203
msgid "User Interface Options"
msgstr "Opcions de la interfície d'usuari"
-#: ../src/Clients/Booter/Booter/Entry.cs:200
+#: ../src/Clients/Booter/Booter/Entry.cs:204
msgid "Present the user interface on the active workspace"
msgstr "Presenta la interfície d'usuari en l'espai de treball actiu"
-#: ../src/Clients/Booter/Booter/Entry.cs:201
+#: ../src/Clients/Booter/Booter/Entry.cs:205
msgid "Enter the full-screen mode"
msgstr "Entra al mode de pantalla completa"
-#: ../src/Clients/Booter/Booter/Entry.cs:202
+#: ../src/Clients/Booter/Booter/Entry.cs:206
msgid "Hide the user interface"
msgstr "Amaga la interfície d'usuari"
-#: ../src/Clients/Booter/Booter/Entry.cs:203
+#: ../src/Clients/Booter/Booter/Entry.cs:207
msgid "Do not present the user interface, regardless of any other options"
msgstr ""
"No presentis la interfície d'usuari, independentment de qualsevol altre opció"
-#: ../src/Clients/Booter/Booter/Entry.cs:204
+#: ../src/Clients/Booter/Booter/Entry.cs:208
msgid "Present the import media dialog box"
msgstr "Presenta la capsa de diàleg d'importació d'elements multimèdia"
-#: ../src/Clients/Booter/Booter/Entry.cs:205
+#: ../src/Clients/Booter/Booter/Entry.cs:209
msgid "Present the about dialog"
msgstr "Presenta la capsa de diàleg en quant a"
-#: ../src/Clients/Booter/Booter/Entry.cs:206
+#: ../src/Clients/Booter/Booter/Entry.cs:210
msgid "Present the open location dialog"
msgstr "Presenta la capsa de diàleg obre una ubicació"
-#: ../src/Clients/Booter/Booter/Entry.cs:207
+#: ../src/Clients/Booter/Booter/Entry.cs:211
msgid "Present the preferences dialog"
msgstr "Presenta la capsa de diàleg de les preferències"
-#: ../src/Clients/Booter/Booter/Entry.cs:210
+#: ../src/Clients/Booter/Booter/Entry.cs:214
msgid "Debugging and Development Options"
msgstr "Opcions de desenvolupament i depuració"
-#: ../src/Clients/Booter/Booter/Entry.cs:211
+#: ../src/Clients/Booter/Booter/Entry.cs:215
msgid "Enable general debugging features"
msgstr "Habilita les característiques generals de depuració"
-#: ../src/Clients/Booter/Booter/Entry.cs:212
+#: ../src/Clients/Booter/Booter/Entry.cs:216
msgid "Enable debugging output of SQL queries"
msgstr "Habilita la sortida de depuració de les consultes SQL"
-#: ../src/Clients/Booter/Booter/Entry.cs:213
+#: ../src/Clients/Booter/Booter/Entry.cs:217
msgid "Enable debugging output of Mono.Addins"
msgstr "Habilita la sortida de depuració de Mono.Addins"
-#: ../src/Clients/Booter/Booter/Entry.cs:214
+#: ../src/Clients/Booter/Booter/Entry.cs:218
msgid "Specify an alternate database to use"
msgstr "Especifica la base de dades alternativa a utilitzar"
-#: ../src/Clients/Booter/Booter/Entry.cs:215
+#: ../src/Clients/Booter/Booter/Entry.cs:219
msgid "Specify an alternate key, default is /apps/banshee-1/"
msgstr "Especifiqueu una clau alternativa, per defecte és /apps/banshee-1/"
-#: ../src/Clients/Booter/Booter/Entry.cs:216
+#: ../src/Clients/Booter/Booter/Entry.cs:220
msgid ""
"Optimize instance for running uninstalled; most notably, this will create an "
"alternate Mono.Addins database in the working directory"
@@ -1263,16 +1247,16 @@ msgstr ""
"Optimitza la instància per executar-se sense ser instal·lada; això crearà "
"una base de dades alternativa per a Mono.Addins al directori de treball"
-#: ../src/Clients/Booter/Booter/Entry.cs:218
+#: ../src/Clients/Booter/Booter/Entry.cs:222
msgid "Disable DBus support completely"
msgstr "Inhabilita completament la compatibilitat amb DBus"
-#: ../src/Clients/Booter/Booter/Entry.cs:220
+#: ../src/Clients/Booter/Booter/Entry.cs:224
#, csharp-format
msgid "Skip loading a custom gtkrc file ({0}) if it exists"
msgstr "Omet la càrrega d'un fitxer gtkrc personalitzat ({0}) si existeix"
-#: ../src/Clients/Booter/Booter/Entry.cs:251
+#: ../src/Clients/Booter/Booter/Entry.cs:255
#, csharp-format
msgid "The following help arguments are invalid: {0}"
msgstr "Els següents arguments d'ajuda no són vàlids: {0}"
@@ -1288,9 +1272,9 @@ msgid "En_queue"
msgstr "_En cua"
#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:86
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:66
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:196
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:86
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:210
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:126
msgid "_Play"
msgstr "_Reprodueix"
@@ -1323,26 +1307,26 @@ msgid "Play Song"
msgstr "Reprodueix la cançó"
#. Translators: this is a verb (command), not a noun (things)
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:447
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:465
msgid "Search"
msgstr "Cerca:"
#
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:159
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:136
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:87
msgid "Artist, Album, or Title"
msgstr "Artista, àlbum o títol"
#
#. Alias for %album_artist%
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:162
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:139
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:72
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:78
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:82
msgid "Album Artist"
msgstr "Artista de l'àlbum"
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:164
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:141
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:98
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:185
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:364
@@ -1352,7 +1336,7 @@ msgstr "Gènere"
#
#. Translators: noun
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:166
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:143
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:214
msgid "Comment"
msgstr "Comentari"
@@ -1376,89 +1360,89 @@ msgstr "Àlbum desconegut"
msgid "Unknown Title"
msgstr "Títol desconegut"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:186
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:191
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:91
msgid "Various Artists"
msgstr "Artistes diversos"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:342
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
msgid "Stream location not found"
msgstr "No s'ha trobat la ubicació del flux"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:342
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:324
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:328
msgid "File not found"
msgstr "No s'ha trobat el fitxer"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:344
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:349
msgid "Codec for playing this media type not available"
msgstr "No es troba disponible el còdec per a reproduir aquest tipus de medi"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:346
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:351
msgid "File protected by Digital Rights Management (DRM)"
-msgstr "Fitxer protegit amb Gestió de Drets Digitals"
+msgstr "Fitxer protegit amb Gestió de Drets Digitals (DRM)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:353
msgid "Unknown error"
msgstr "Error desconegut"
#. TODO turn this into a PrimarySource-owned delegate?
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:417
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:422
msgid "_Restart Podcast"
-msgstr "_Reinicia el Podcast"
+msgstr "_Reinicia el podcast"
#
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:418
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:423
msgid "_Restart Audiobook"
msgstr "_Reinicia l'audiollibre"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:419
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:424
msgid "_Restart Video"
msgstr "_Reinicia el vídeo"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:420
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:86
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:93
msgid "_Restart Song"
msgstr "_Reinicia la cançó"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:421
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:426
msgid "_Restart Item"
msgstr "_Reinicia l'element"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:437
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:442
msgid "_Jump to Playing Podcast"
-msgstr "S_alta al Podcast que s'està reproduint"
+msgstr "S_alta al podcast que s'està reproduint"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:438
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:443
msgid "_Jump to Playing Audiobook"
msgstr "S_alta a l'audiollibre que s'està reproduint"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:439
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:444
msgid "_Jump to Playing Video"
msgstr "S_alta al vídeo que s'està reproduint"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:440
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:82
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:89
msgid "_Jump to Playing Song"
msgstr "S_alta a la cançó que s'està reproduint"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:441
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:446
msgid "_Jump to Playing Item"
msgstr "S_alta a l'element que s'està reproduint"
#. Translators: This is used to generate bookmark names. {0} is track title, {1} is minutes
#. (possibly more than two digits) and {2} is seconds (between 00 and 60).
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/Bookmark.cs:173
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/Bookmark.cs:172
#, csharp-format
msgid "{0} ({1}:{2:00})"
msgstr "{0} ({1}:{2:00})"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs:70
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs:69
#, csharp-format
msgid "All Albums ({0})"
msgstr "Tots els àlbums ({0})"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistListModel.cs:69
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistListModel.cs:68
#, csharp-format
msgid "All Artists ({0})"
msgstr "Tots els artistes ({0})"
@@ -1468,15 +1452,15 @@ msgstr "Tots els artistes ({0})"
msgid "Value"
msgstr "Valor"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:50
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:49
msgid "Shuffle by A_lbum"
msgstr "Or_dre aleatori per àlbum"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:51
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:50
msgid "by album"
msgstr "per àlbum"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:52
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:51
msgid "Play all songs from an album, then randomly choose another album"
msgstr ""
"Reprodueix totes les cançons d'un àlbum, i llavors escolleix un altre àlbum "
@@ -1497,28 +1481,28 @@ msgstr ""
"artista aleatòriament"
#
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:36
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:38
msgid "Shuffle _Off"
msgstr "O_rdre aleatori"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:37
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:39
msgid "manually"
msgstr "manualment"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:38
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:40
msgid "Do not shuffle playlist"
msgstr "No reprodueixis en ordre aleatori la llista de reproducció"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:46
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:45
msgid "Shuffle by _Rating"
msgstr "_Ordre aleatori per valoració"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:47
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:46
msgid "by rating"
msgstr "per valoració"
#
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:48
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:47
msgid "Play songs randomly, prefer higher rated songs"
msgstr ""
"Reprodueix les cançons aleatòriament, prioritzant a les cançons millor "
@@ -1539,67 +1523,67 @@ msgstr ""
"puntuades"
#
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:47
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:46
msgid "Shuffle by _Song"
msgstr "_Ordre aleatori per cançó"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:48
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:47
msgid "by song"
msgstr "per cançó"
#
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:49
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:48
msgid "Play songs randomly from the playlist"
msgstr "Reprodueix les cançons de la llista de reproducció en ordre aleatori"
#
-#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:132
+#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:138
msgid "Scanning for media"
msgstr "S'estan cercant elements multimèdia"
-#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:182
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1382
+#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:188
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1384
msgid "Scanning..."
msgstr "S'està escanejant..."
-#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:198
+#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:204
#, csharp-format
msgid "Scanning ({0} files)..."
msgstr "S'està escanejant ({0} fitxers)..."
-#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:232
+#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:238
msgid "Importing Media"
msgstr "S'estan important elements multimèdia"
-#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:239
+#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:245
#: ../src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs:119
msgid "The import process is currently running. Would you like to stop it?"
msgstr "El procés d'importació s'està executant. Voleu aturar-lo?"
-#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:245
+#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:251
#: ../src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs:81
#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdRipper.cs:185
#, csharp-format
msgid "Importing {0} of {1}"
msgstr "S'està important {0} de {1}"
-#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:79
+#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:78
#, csharp-format
msgid "Rescanning {0} of {1}"
msgstr "S'està escanejant {0} de {1}"
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:234
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:232
msgid "Upgrading your Banshee Database"
msgstr "S'està actualitzant la base de dades del Banshee"
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:235
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:233
msgid ""
"Please wait while your old Banshee database is migrated to the new format."
msgstr ""
"Espereu mentre la base de dades antiga del Banshee es migra al format nou."
#
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1379
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1381
msgid "Refreshing Metadata"
msgstr "S'estan actualitzant les metadades"
@@ -1671,17 +1655,13 @@ msgstr "Rock suau"
msgid "Techno"
msgstr "Tecno"
-#: ../src/Core/Banshee.Services/Banshee.Library/HomeDirectoryImportSource.cs:48
-msgid "Home Folder"
-msgstr "Carpeta de l'usuari"
-
#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:58
msgid "Remove From Library"
msgstr "Suprimeix de la biblioteca"
# N.T.: Molt millor amb cometes ja que el nom de la carpeta és en majúscules
#. Translators: {0} is the library name, eg 'Music Library' or 'Podcasts'
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:65
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:122
#, csharp-format
msgid "{0} Folder"
msgstr "Carpeta «{0}»"
@@ -1698,7 +1678,7 @@ msgstr "Artista inicial de l'àlbum"
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:88
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:199
msgid "Conductor"
-msgstr "Conductor"
+msgstr "Director"
#
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:93
@@ -1713,7 +1693,7 @@ msgid "Album"
msgstr "Àlbum"
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:108
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:72
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:73
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:127
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:76
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:97
@@ -1721,59 +1701,59 @@ msgid "Title"
msgstr "Títol"
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:119
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:83
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:84
msgid "Count"
msgstr "Nombre"
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:125
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:89
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:90
msgid "Number"
msgstr "Número"
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:131
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:95
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:96
msgid "Count (unsorted)"
msgstr "Nombre (desordenat)"
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:137
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:101
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:102
msgid "Number (unsorted)"
msgstr "Número (desordenat)"
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:143
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:108
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:107
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:108
msgid "Disc Count"
msgstr "Nombre de discs"
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:155
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:206
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:119
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:120
msgid "Grouping"
msgstr "Agrupació"
#
#. Catalog.GetString ("Music Library")
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:59
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/MusicGroupSource.cs:38
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:60
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/MusicGroupSource.cs:39
msgid "Music"
msgstr "Música"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:65
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:66
msgid "Search your music"
msgstr "Cerqueu en la música"
#. Misc section
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:79
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:80
#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:65
msgid "Miscellaneous"
msgstr "Miscel·lània"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:82
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:83
msgid "_Sort an artist's albums by year, not title"
msgstr "_Ordena els àlbums de l'artista per any, no per títol"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:92
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:93
#, csharp-format
msgid "{0} song"
msgid_plural "{0} songs"
@@ -1781,81 +1761,93 @@ msgstr[0] "{0} cançó"
msgstr[1] "{0} cançons"
#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:114
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:91
+msgid "Music Folder"
+msgstr "Carpeta de la música"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:119
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:95
msgid "Favorites"
msgstr "Preferits"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:115
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:120
msgid "Songs rated four and five stars"
msgstr "Cançons amb valoració de quatre i cinc estrelles"
#
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:119
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:124
msgid "Recent Favorites"
msgstr "Preferits recents"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:120
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:125
msgid "Songs listened to often in the past week"
msgstr "Cançons escoltades sovint la setmana passada"
#
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:124
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:129
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:95
msgid "Recently Added"
msgstr "Afegits recentment"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:125
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:130
msgid "Songs imported within the last week"
msgstr "Cançons importades durant la darrera setmana"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:129
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:134
+msgid "Recently Played"
+msgstr "Reproduccions recents"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:135
+msgid "Recently played songs"
+msgstr "Cançons reproduïdes recentment"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:139
msgid "Unheard"
msgstr "No escoltats"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:130
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:140
msgid "Songs that have not been played or skipped"
msgstr "Cançons que no s'han escoltat o s'han omès"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:137
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:147
msgid "Neglected Favorites"
msgstr "Preferits abandonats"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:138
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:148
msgid "Favorites not played in over two months"
msgstr "Preferits que no s'han escoltat durant més de dos mesos"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:142
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:152
msgid "Least Favorite"
msgstr "Els menys preferits"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:143
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:153
msgid "Songs rated one or two stars or that you have frequently skipped"
msgstr ""
"Cançons amb valoració d'una o dues estrelles o que heu omès freqüentment"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:147
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:157
msgid "700 MB of Favorites"
msgstr "700 MB de preferits"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:148
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:158
msgid "A data CD worth of favorite songs"
msgstr "Un CD de dades ple de cançons preferides"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:153
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:163
msgid "80 Minutes of Favorites"
msgstr "80 minuts de preferits"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:154
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:164
msgid "An audio CD worth of favorite songs"
msgstr "Un CD d'àudio ple de cançons preferides"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:159
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:169
msgid "Unrated"
msgstr "Sense valoració"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:160
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:170
msgid "Songs that haven't been rated"
-msgstr "Cançons que ha no han estat valorades"
+msgstr "Cançons que no han estat valorades"
#: ../src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs:56
msgid "Importing Songs"
@@ -1887,15 +1879,19 @@ msgid_plural "{0} videos"
msgstr[0] "{0} vídeo"
msgstr[1] "{0} vídeos"
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:92
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:90
+msgid "Videos Folder"
+msgstr "Carpeta dels vídeos"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:96
msgid "Videos rated four and five stars"
msgstr "Vídeos amb valoració de quatre i cinc estrelles"
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:96
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:100
msgid "Unwatched"
msgstr "No visualitzats"
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:97
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:101
msgid "Videos that haven't been played yet"
msgstr "Vídeos que encara no s'han visualitzat"
@@ -1958,8 +1954,8 @@ msgid ""
"Enable this option to save rating and playcount metadata inside supported "
"audio files"
msgstr ""
-"Habiliteu aquesta opció per a desar les valoracions i les metadades del "
-"nombre de reproduccions dins dels fitxers d'àudio compatibles"
+"Habiliteu aquesta opció per desar les valoracions i les metadades del nombre "
+"de reproduccions dins dels fitxers d'àudio compatibles"
#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:60
msgid "_Update file and folder names"
@@ -1967,7 +1963,7 @@ msgstr "_Actualitza els noms de fitxers i carpetes"
#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:61
msgid "Rename files and folders according to media metadata"
-msgstr "Reanomena els fitxers i les carpetes segons les metadades."
+msgstr "Canvia el nom dels fitxers i les carpetes segons les metadades"
#
#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:175
@@ -1975,7 +1971,7 @@ msgid ""
"Enable this option to save rating and play count metadata inside supported "
"audio files whenever the rating is changed."
msgstr ""
-"Habiliteu aquesta opció per a desar les metadades de valoracions i el nombre "
+"Habiliteu aquesta opció per desar les metadades de valoracions i el nombre "
"de reproduccions dins dels fitxers d'àudio compatibles quan es canviï la "
"valoració."
@@ -1987,11 +1983,6 @@ msgstr "Importa les _valoracions"
msgid "Import play _counts"
msgstr "Importa el nombre de reproduccions"
-#. disabled by default
-#: ../src/Core/Banshee.Services/Banshee.Metrics/BansheeMetrics.cs:302
-msgid "Improve Banshee by sending anonymous usage data"
-msgstr "Milloreu el Banshee enviant dades d'ús anònimes"
-
#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:52
msgid "There is no available network connection"
msgstr "No hi ha cap connexió de xarxa disponible"
@@ -2005,47 +1996,47 @@ msgid "An available, working network connection will be assumed"
msgstr ""
"S'assumeix que es troba disponible una connexió de xarxa en funcionament"
-#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:157
+#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:159
msgid "_Disable features requiring Internet access"
msgstr "_Inhabilita les funcions que requereixen accés a Internet"
-#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:158
+#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:160
msgid ""
"Some features require a broadband Internet connection such as Last.fm or "
"cover art fetching"
msgstr ""
"Algunes funcions, com Last.fm o baixar les cobertes dels àlbums, necessiten "
-"una connexió a Internet de banda d'ampla"
+"una connexió a Internet de banda ampla"
-#: ../src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:160
+#: ../src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:159
msgid "Search this playlist"
msgstr "Cerca aquesta llista de reproducció intel·ligent"
-#: ../src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:229
+#: ../src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:228
msgid "The track's rating was set differently on the device and in Banshee"
msgstr "La valoració de la cançó és diferent en el dispositiu que al Banshee"
-#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:59
+#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:58
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:309
msgid "Playlist"
msgstr "Llista de reproducció"
-#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:134
+#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:133
msgid "Remove From Playlist"
msgstr "Suprimeix de la llista de reproducció"
-#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:135
+#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:134
msgid "Delete Playlist"
msgstr "Suprimeix la llista de reproducció"
#. TODO generate name based on the track selection, or begin editing it
-#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:386
-#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:392
+#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:385
+#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:391
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:95
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:394
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:500
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:213
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:462
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:591
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214
msgid "New Playlist"
msgstr "Llista de reproducció nova"
@@ -2095,24 +2086,32 @@ msgstr "Polítiques de fitxers"
msgid "Co_py files to media folders when importing"
msgstr "En importar c_opia els fitxers a la carpeta d'elements multimèdia"
+#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:69
+msgid "Improve Banshee by sending anonymous usage data"
+msgstr "Milloreu el Banshee enviant dades d'ús anònimes"
+
#
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:63
msgid "items"
msgstr "elements"
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:64
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:60
msgid "minutes"
msgstr "minuts"
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:65
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:61
msgid "hours"
msgstr "hores"
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:66
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs:63
msgid "MB"
msgstr "MB"
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:67
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs:64
msgid "GB"
msgstr "GB"
@@ -2159,7 +2158,7 @@ msgstr "al"
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:94
msgid "from"
-msgstr "desde"
+msgstr "des de"
#
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:100
@@ -2216,7 +2215,7 @@ msgstr "cançons"
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:128
msgid "trackcount"
-msgstr "nombrecançó"
+msgstr "nombrecançons"
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:134
msgid "Beats per Minute"
@@ -2441,7 +2440,7 @@ msgstr "ubicació"
#
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:270
msgid "Time"
-msgstr "Hora"
+msgstr "Durada"
#
#. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
@@ -2508,14 +2507,14 @@ msgstr "reproduïdael"
#
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:294
msgid "Last Skipped"
-msgstr "Última omesa"
+msgstr "Última omissió"
#
#
#. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:296
msgid "lastskipped"
-msgstr "últimaomesa"
+msgstr "últimaomissió"
#
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:296
@@ -2525,7 +2524,7 @@ msgstr "omesa"
#
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:296
msgid "skippedon"
-msgstr "omesaal"
+msgstr "omesael"
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:302
msgid "Date Added"
@@ -2544,7 +2543,7 @@ msgstr "importat"
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:304
msgid "addedon"
-msgstr "afegidaal"
+msgstr "afegidael"
#
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:304
@@ -2557,7 +2556,7 @@ msgid "importedon"
msgstr "importatel"
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:315
-#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:66
+#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:65
msgid "Smart Playlist"
msgstr "Llista de reproducció intel·ligent"
@@ -2635,6 +2634,7 @@ msgstr "Addició menys recent"
#. Translators: These are unique strings for playback errors. Please, no spaces. Blank ok.
#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:44
#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:46
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:146
#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs:97
msgid "None"
msgstr "Cap"
@@ -2691,7 +2691,7 @@ msgstr "drm"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:208
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:210
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:212
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:383
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:389
msgid "Unknown"
msgstr "Desconegut"
@@ -2699,21 +2699,21 @@ msgstr "Desconegut"
msgid "unknown"
msgstr "desconegut"
-#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/Migrator.cs:79
+#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/Migrator.cs:78
msgid "Unable to Migrate Smart Playlists"
msgstr "No s'han pogut migrar les llistes de reproducció intel·ligents"
-#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/Migrator.cs:80
+#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/Migrator.cs:79
#, csharp-format
msgid "Please file a bug with this error: {0}"
-msgstr "Si us plau empleneu un informe amb aquest error: {0}"
+msgstr "Empleneu un informe amb aquest error: {0}"
-#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:67
+#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:66
#: ../src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/Editor.cs:49
msgid "Edit Smart Playlist"
msgstr "Edita la llista de reproducció intel·ligent"
-#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:242
+#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:249
msgid "Delete Smart Playlist"
msgstr "Suprimeix la llista de reproducció intel·ligent"
@@ -2763,7 +2763,7 @@ msgid "Close Error Report"
msgstr "Tanca l'informe d'errors"
#: ../src/Core/Banshee.Services/Banshee.Sources/ErrorSource.cs:83
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:226
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:224
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ErrorListDialog.cs:46
msgid "Error"
msgstr "Error"
@@ -2800,12 +2800,12 @@ msgid "File _name"
msgstr "Nom del f_itxer"
# csharp-format
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:689
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:669
#, csharp-format
msgid "Adding {0} of {1} to {2}"
msgstr "S'està afegint {0} de {1} a {2}"
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:708
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:688
#, csharp-format
msgid "Deleting {0} of {1} From {2}"
msgstr "S'està suprimint {0} de {1} des de {2}"
@@ -2825,13 +2825,23 @@ msgid_plural "{0} items"
msgstr[0] "{0} element"
msgstr[1] "{0} elements"
-#
+#. TODO should add library sources here, but requires changing quite a few
+#. things that depend on being loaded before the music library is added.
+#. AddSource (music_library = new MusicLibrarySource (), true);
+#. AddSource (video_library = new VideoLibrarySource (), false);
+#: ../src/Core/Banshee.Services/Banshee.Sources/SourceManager.cs:84
+msgid "Libraries"
+msgstr "Biblioteques"
+
+#: ../src/Core/Banshee.Services/Banshee.Sources/SourceManager.cs:85
+msgid "Online Media"
+msgstr "Elements multimèdia en línia"
+
#: ../src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs:82
#: ../src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs:91
msgid "Error opening stream"
msgstr "S'ha produït un error en obrir el flux de dades"
-#
#: ../src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs:83
msgid "Could not open stream or playlist"
msgstr "No s'ha pogut obrir el flux de dades o la llista de reproducció"
@@ -2861,7 +2871,7 @@ msgid "Show:"
msgstr "Mostra:"
#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:51
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:84
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:83
msgid "All"
msgstr "Total"
@@ -2884,8 +2894,7 @@ msgstr "Inhabilita la graella de l'àlbum"
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/AlbumListView.cs:77
msgid "Disable album grid and show the classic layout instead"
-msgstr ""
-"Inhabilita la graella de l'àlbum i en comptes mostra la disposició clàssica"
+msgstr "Inhabilita la graella de l'àlbum i mostra la disposició clàssica"
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/BaseTrackListView.cs:76
msgid "Cannot Reorder While Sorted"
@@ -2896,8 +2905,8 @@ msgid ""
"To put the playlist in manual sort mode, click the currently sorted column "
"header until the sort arrow goes away."
msgstr ""
-"Per a posar la llista de reproducció en mode d'ordenació manual, feu clic a "
-"la capçalera de columna per la qual s'ordena fins que marxi la fletxa "
+"Per posar la llista de reproducció en mode d'ordenació manual, feu clic a la "
+"capçalera de columna per la qual s'ordena fins que desaparegui la fletxa "
"d'ordenació."
#. Translators: this is {disc number} of {disc count}
@@ -2910,19 +2919,19 @@ msgstr ""
msgid "{0} of {1}"
msgstr "{0} de {1}"
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:224
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:222
msgid "Playing"
msgstr "S'està reproduint"
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:225
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:223
msgid "Paused"
msgstr "En pausa"
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:227
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:225
msgid "Protected"
msgstr "Protegit"
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:228
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:226
msgid "External Document"
msgstr "Document extern"
@@ -2936,19 +2945,19 @@ msgstr "Suprimeix aquesta coberta"
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:127
msgid "Track #"
-msgstr "Cançó #"
+msgstr "Núm. cançó"
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:128
msgid "Track & Count"
-msgstr "Cançó i nombre"
+msgstr "Cançó i nombre total"
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:132
msgid "Disc #"
-msgstr "Disc #"
+msgstr "Núm. disc"
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:133
msgid "Disc & Count"
-msgstr "Disc i nombre"
+msgstr "Disc i nombre total"
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:136
#, csharp-format
@@ -2977,7 +2986,7 @@ msgstr "Amaga la subfinestra de context"
#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:144
msgid "Waiting for playback to begin..."
-msgstr "S'està esperant a que s'iniciï la reproducció..."
+msgstr "S'està esperant que s'iniciï la reproducció..."
#: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:150
msgid "Loading..."
@@ -2985,7 +2994,7 @@ msgstr "S'està carregant..."
#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerView.cs:74
msgid "Preamp"
-msgstr "Preamplicador"
+msgstr "Preamplificador"
#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerView.cs:100
#, csharp-format
@@ -3017,19 +3026,19 @@ msgstr "Preselecció nova"
msgid "{0} by {1}"
msgstr "{0} per {1}"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:87
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:86
msgid "_Bookmarks"
msgstr "A_dreces d'interès"
#
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:90
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:89
msgid "_Add Bookmark"
msgstr "_Afegeix una adreça d'interès"
# N.T.: Usem "posició" i no "adreça d'interès" per claredat
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:91
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:90
msgid "Bookmark the Position in the Current Track"
-msgstr "Desa la posició en la pista actual"
+msgstr "Desa la posició a la cançó actual"
#
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:103
@@ -3107,7 +3116,7 @@ msgid "Make Banshee the Default"
msgstr "Fes del Banshee el predeterminat"
#. Translators: verb
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/FileChooserDialog.cs:52
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/FileChooserDialog.cs:53
msgid "I_mport"
msgstr "_Importa"
@@ -3166,11 +3175,11 @@ msgstr "Importa una llista de reproducció"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:61
msgid "Rescan Music Library"
-msgstr "Reescaneja la biblioteca de música"
+msgstr "Torna a escanejar la biblioteca de música"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:62
msgid "Rescan the Music Library folder"
-msgstr "Reescaneja la carpeta de la biblioteca de música"
+msgstr "Torna a escanejar la carpeta de la biblioteca de música"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:67
msgid "Open _Location..."
@@ -3201,151 +3210,133 @@ msgstr "_Preferències"
msgid "Modify your personal preferences"
msgstr "Modifiqueu les preferències personals"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:83
-msgid "Manage _Extensions"
-msgstr "Gestiona les e_xtensions"
-
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:84
-msgid "Manage extensions to add new features to Banshee"
-msgstr "Gestiona les extensions per a afegir funcions noves al Banshee"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:88
msgid "_Tools"
msgstr "Ei_nes"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:92
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:135
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:88
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:134
msgid "_Help"
msgstr "A_juda"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:95
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:91
msgid "_Contents"
msgstr "_Continguts"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:99
-msgid "_Web Resources"
-msgstr "Recursos _web"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
-msgid "Banshee _User Guide (Wiki)"
-msgstr "G_uia d'usuari del Banshee (Wiki)"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:103
-msgid "Learn about how to use Banshee"
-msgstr "Apreneu a utilitzar el Banshee"
-
#
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:108
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:95
msgid "Advanced Collection Searching"
msgstr "Cerca avançada de col·leccions"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:109
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:96
msgid "Learn advanced ways to search your media collection"
msgstr ""
-"Obteniu informació sobre mètodes avançats per a fer cerques en la col·lecció "
+"Obteniu informació sobre mètodes avançats per fer cerques en la col·lecció "
"multimèdia"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:114
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:101
msgid "Banshee _Home Page"
msgstr "Pàgina web d_el Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:115
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
msgid "Visit the Banshee Home Page"
msgstr "Visiteu la pàgina web del Banshee"
#
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:120
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
msgid "_Get Involved"
-msgstr "In_volucreu-vos"
+msgstr "In_volucreu-vos-hi"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:121
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:108
msgid "Become a contributor to Banshee"
msgstr "Esdeveniu un col·laborador del Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:126
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
msgid "_Version Information"
msgstr "_Informació de la versió"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:127
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:114
msgid "View detailed version and configuration information"
msgstr "Visualitza informació detallada de la versió i la configuració"
#
#. Prompt user for location of the playlist.
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:184
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:169
msgid "Import Playlist"
msgstr "Importa la llista de reproducció"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:185
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:559
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:170
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:558
msgid "Playlists"
msgstr "Llistes de reproducció"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:67
-msgid "Play or pause the current item"
-msgstr "Reprodueix o posa en pausa l'element actual"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:69
+msgid "Play the current item"
+msgstr "Reprodueix l'element actual"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:70
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:77
msgid "_Next"
msgstr "_Següent"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:71
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:78
msgid "Play the next item"
msgstr "Reprodueix l'element següent"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:74
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:81
msgid "Pre_vious"
msgstr "An_terior"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:75
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:82
msgid "Play the previous item"
msgstr "Reprodueix l'element anterior"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:78
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:85
msgid "Seek _To..."
msgstr "_Vés a la posició..."
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:79
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:86
msgid "Seek to a specific location in current item"
msgstr "Vés a un punt concret de l'element actual"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:83
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:90
msgid "Jump to the currently playing item"
msgstr "Salta a l'element que s'està reproduint"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:87
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:94
msgid "Restart the current item"
msgstr "Reinicia l'element actual"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:92
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:99
msgid "_Stop When Finished"
msgstr "Atura en finalit_zar"
#
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:93
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:100
msgid "Stop playback after the current item finishes playing"
msgstr "Atura la reproducció quan finalitzi la reproducció de l'element actual"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:99
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:106
msgid "_Playback"
msgstr "_Reprodueix"
#
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:190
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:203
msgid "_Pause"
msgstr "_Fes una pausa"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:202
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:205
+msgid "Pause the current item"
+msgstr "Posa en pausa l'element actual"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:217
msgid "Sto_p"
msgstr "A_tura"
-#
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs:72
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs:73
msgid "Repeat"
msgstr "Repeteix"
-#
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs:78
msgid "Repeat _Off"
msgstr "Sense _repetició"
@@ -3373,16 +3364,53 @@ msgstr "Repeteix la cançó que s'està reproduint"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackShuffleActions.cs:79
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackShuffleActions.cs:80
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:62
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:84
msgid "Shuffle"
msgstr "Ordre aleatori"
-#
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:62
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:63
+msgid "Subtitle"
+msgstr "Subtítol"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:65
+msgid "Load File..."
+msgstr "Carrega el fitxer..."
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:66
+msgid "Load subtitle file"
+msgstr "Carrega el fitxer de subtítols"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:79
+msgid "Load Subtitle File"
+msgstr "Carrega el fitxer de subtítols"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:88
+msgid "L_oad"
+msgstr "C_arrega"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:97
+msgid "Subtitle files"
+msgstr "Fitxers de subtítols"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:128
+#, csharp-format
+msgid "Subtitle {0}"
+msgstr "Subítol {0}"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:132
+#, csharp-format
+msgid "Activate embedded subtitle {0}"
+msgstr "Activa el subtítol incrustat {0}"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:147
+msgid "Hide subtitles"
+msgstr "Amaga els subtítols"
+
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:75
msgid "_New Playlist"
msgstr "_Llista de reproducció nova"
-#
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:76
msgid "Create a new empty playlist"
msgstr "Crea una llista de reproducció buida"
@@ -3422,7 +3450,7 @@ msgstr "Exporta una llista de reproducció"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:101
msgid "Unmap"
-msgstr "Desassociar"
+msgstr "Desassocia"
#
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:104
@@ -3439,7 +3467,7 @@ msgstr "Commuta la font"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:112
msgid "Switch to a source by typing its name"
-msgstr "Commuta a una font teclejant el seu nom"
+msgstr "Canvieu a una font teclejant-ne el nom"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:115
#: ../src/Core/Banshee.ThickClient/Banshee.Preferences.Gui/PreferenceDialog.cs:50
@@ -3458,8 +3486,8 @@ msgstr "Llista de reproducció intel·ligent nova"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:129
#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:84
#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:67
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:57
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:71
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:79
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:72
msgid "Refresh"
msgstr "Actualitza"
@@ -3467,7 +3495,6 @@ msgstr "Actualitza"
msgid "Refresh this randomly sorted smart playlist"
msgstr "Actualitza la llista intel·ligent ordenada aleatòriament"
-#
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:297
msgid "Could not export playlist"
msgstr "No s'ha pogut exportar la llista de reproducció"
@@ -3482,166 +3509,166 @@ msgid "Separate by Type"
msgstr "Separa per tipus"
#
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:70
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:110
msgid "Select _All"
msgstr "Sele_cciona-ho tot"
#
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:71
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:111
msgid "Select all tracks"
msgstr "Selecciona totes les cançons"
#
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:74
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:114
msgid "Select _None"
msgstr "No en se_leccionis cap"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:75
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:115
msgid "Unselect all tracks"
msgstr "Desselecciona totes les cançons"
#
#
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:78
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:118
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:59
msgid "_Edit Track Information"
msgstr "_Edita la informació de la cançó"
#
#
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:79
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:119
msgid "Edit information on selected tracks"
msgstr "Edita la informació de les cançons seleccionades"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:82
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:122
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:252
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:113
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:155
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:117
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:159
msgid "Properties"
msgstr "Propietats"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:83
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:123
msgid "View information on selected tracks"
msgstr "Visualitza la informació de les cançons seleccionades"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:87
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:127
msgid "Play the selected item"
msgstr "Reprodueix l'element seleccionat"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:90
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:130
msgid "Add _to Playlist"
msgstr "Afegei_x a la llista de reproducció"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:91
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:131
msgid "Append selected items to playlist or create new playlist from selection"
msgstr ""
"Afegeix els elements seleccionats a la llista de reproducció o crea'n una de "
"nova a partir de la selecció"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:96
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:136
msgid "Create new playlist from selected tracks"
msgstr ""
"Crea una llista de reproducció intel·ligent nova a partir de les cançons "
"seleccionades"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:100
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:140
msgid "_Remove"
msgstr "_Suprimeix"
#
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:101
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:141
msgid "Remove selected track(s) from this source"
msgstr "Suprimeix les cançons seleccionades d'aquesta font"
#
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:104
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:144
msgid "Remove From _Library"
msgstr "S_uprimeix de la biblioteca"
#
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:105
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:145
msgid "Remove selected track(s) from library"
msgstr "Suprimeix les cançons seleccionades de la biblioteca"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:108
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:148
msgid "_Open Containing Folder"
msgstr "_Obre la carpeta contenidora"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:109
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:149
msgid "Open the folder that contains the selected item"
msgstr "Obre la carpeta que conté l'element seleccionat"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:112
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:152
msgid "_Delete From Drive"
msgstr "S_uprimeix del disc"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:113
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:153
msgid "Permanently delete selected item(s) from medium"
msgstr "Suprimeix permanentment els elements seleccionats del suport"
#
#. Translators: this is a verb (command), not a noun (things)
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:119
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:171
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:159
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:170
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:112
#, csharp-format
msgid "_Search"
msgstr "_Cerca"
#
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:120
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:160
msgid "Search for items matching certain criteria"
msgstr "Cerca els elements que concordin amb criteris determinats"
#
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:123
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:163
msgid "By Matching _Album"
msgstr "Pe_r coincidència de l'àlbum"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:124
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:164
msgid "Search all songs of this album"
msgstr "Cerca totes les cançons d'aquest àlbum"
#
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:127
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:167
msgid "By Matching A_rtist"
msgstr "Pe_r coincidència de l'artista"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:128
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:168
msgid "Search all songs of this artist"
msgstr "Cerca totes les cançons d'aquest artista"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:258
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:322
#, csharp-format
msgid "_Delete From \"{0}\""
msgstr "_Suprimeix de «{0}»"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:464
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:542
msgid "The folder could not be found."
msgstr "No s'ha pogut trobar la carpeta."
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:465
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:543
msgid "Please check that the track's location is accessible by the system."
msgstr "Comproveu que la ubicació de la cançó és accessible pel sistema."
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:535
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:620
#, csharp-format
msgid "Are you sure you want to permanently delete this item?"
msgid_plural ""
"Are you sure you want to permanently delete the selected {0} items?"
-msgstr[0] "Esteu segur que voleu suprimir permanentment aquesta element?"
+msgstr[0] "Esteu segur que voleu suprimir permanentment aquest element?"
msgstr[1] "Esteu segur que voleu suprimir permanentment aquests {0} elements?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:539
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:624
msgid "If you delete the selection, it will be permanently lost."
msgstr "Si suprimiu la selecció, es perdrà permanentment."
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:542
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:627
#, csharp-format
msgid "Remove selection from {0}?"
msgstr "Voleu suprimir la selecció de {0}?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:545
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:630
#, csharp-format
msgid "Are you sure you want to remove the selected item from your {1}?"
msgid_plural ""
@@ -3716,7 +3743,7 @@ msgstr "de"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:141
msgid "Automatically set track number and count"
-msgstr "Estableix automàticament el número de la cançó i el nombre"
+msgstr "Estableix automàticament el número de la cançó i el nombre de cançons"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:144
msgid "Track _Number:"
@@ -3726,7 +3753,7 @@ msgstr "Núme_ro de la cançó:"
#. Catalog.GetString ("Automatically set disc number and count"),
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:166
msgid "Set all disc numbers and counts to these values"
-msgstr "Dóna aquest valor a tots els números de disc i comptadors"
+msgstr "Dóna aquest valor a tots els números de disc i als nombres"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:167
msgid "_Disc Number:"
@@ -3763,12 +3790,12 @@ msgstr "C_ompositor:"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:57
msgid "Set all conductors to this value"
-msgstr "Dóna aquest valor a tots els conductors"
+msgstr "Dóna aquest valor a tots els directors"
#
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:58
msgid "Con_ductor:"
-msgstr "_Conductor:"
+msgstr "_Director:"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:69
msgid "Set all groupings to this value"
@@ -3882,11 +3909,11 @@ msgstr "Durada:"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:179
msgid "Audio Bitrate:"
-msgstr "Taxa de bits de l'àudio"
+msgstr "Taxa de bits de l'àudio:"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:181
msgid "Audio Sample Rate:"
-msgstr "Taxa de la mostra de l'àudio"
+msgstr "Taxa de la mostra de l'àudio:"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:183
msgid "Audio Channels:"
@@ -3912,7 +3939,7 @@ msgstr "Format del contenidor:"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:207
msgid "Imported On:"
-msgstr "Importat el:"
+msgstr "Importada el:"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:209
msgid "Last Played:"
@@ -3939,42 +3966,43 @@ msgid "File Size:"
msgstr "Mida del fitxer:"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:222
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs:61
msgid "bytes"
msgstr "byte"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:95
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:97
msgid "Track Editor"
msgstr "Editor de la cançó"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:95
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:97
msgid "Track Properties"
msgstr "Propietats de la cançó"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:147
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:151
msgid "Show the previous track"
msgstr "Mostra la cançó anterior"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:153
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:157
msgid "Show the next track"
msgstr "Mostra la cançó següent"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:183
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:187
msgid "Title:"
msgstr "Títol:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:184
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:188
msgid "Artist:"
msgstr "Artista:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:185
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:189
msgid "Album:"
msgstr "Àlbum:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:309
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:313
msgid "Sync all field _values"
msgstr "Sincronit_za tots els valors dels camps"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:314
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:318
msgid ""
"Apply the values of all common fields set for this track to all of the "
"tracks selected in this editor"
@@ -3984,24 +4012,24 @@ msgstr ""
# N.T.: És el títol d'una capsa de diàleg
# csharp-format
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:413
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:418
#, csharp-format
msgid "<i>Editing {0} of {1} items</i>"
-msgstr "<i>Editant l'element {0} de {1}</i>"
+msgstr "<i>S'està editant l'element {0} de {1}</i>"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:675
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:698
#, csharp-format
msgid "Save the changes made to the open track?"
msgid_plural "Save the changes made to {0} of {1} open tracks?"
msgstr[0] "Voleu desar els canvis de la cançó oberta?"
msgstr[1] "Voleu desar els canvis de {0} de les {1} cançons obertes?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:692
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:715
msgid "Close _without Saving"
msgstr "Tanca _sense desar"
# N.T.: {0} es substitueix per temps que poden ser uns segons o un minut
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:729
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:752
#, csharp-format
msgid "If you don't save, changes from the last {0} will be permanently lost."
msgstr "Si no deseu, els canvis de l'últim(s) {0} es perdran permanentment."
@@ -4053,26 +4081,26 @@ msgstr[1] "Hi ha tasques actives en execució"
#. Translators: {0} and {1} are for markup so ignore them, {2} and {3}
#. are Podcast Name and Published Date, respectively;
#. e.g. 'from BBtv published 7/26/2007'
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:525
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:523
#, csharp-format
msgid "{0}from{1} {2} {0}published{1} {3}"
msgstr "{0}de{1} {2} {0}publicat al {1} {3}"
#
#. simply: "Chicago Public Radio" or whatever the artist name is
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:538
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:536
msgid "Unknown Stream"
msgstr "Flux desconegut"
# csharp-format
#. Translators: {0} and {1} are markup so ignore them, {2} is the name of the radio station
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:541
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:539
#, csharp-format
msgid "{0}on{1} {2}"
msgstr "{0}a{1} {2}"
#. Translators: {0} is the "from {album} by {artist}" type string, and {1} is the "on {radio station name}" string
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:544
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:542
#, csharp-format
msgid "{0} {1}"
msgstr "{0} {1}"
@@ -4080,7 +4108,7 @@ msgstr "{0} {1}"
#. Translators: {0} and {1} are for markup so ignore them, {2} and {3}
#. are Artist Name and Album Title, respectively;
#. e.g. 'by Parkway Drive from Killing with a Smile'
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:580
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:578
#, csharp-format
msgid "{0}by{1} {2} {0}from{1} {3}"
msgstr "{0}per{1} {2} {0}de{1} {3}"
@@ -4088,7 +4116,7 @@ msgstr "{0}per{1} {2} {0}de{1} {3}"
# csharp-format
#. Translators: {0} and {1} are for markup so ignore them, {2} is for Album Title;
#. e.g. 'from Killing with a Smile'
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:584
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:582
#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:522
#, csharp-format
msgid "{0}from{1} {2}"
@@ -4096,7 +4124,7 @@ msgstr "{0}de{1} {2}"
#. Translators: {0} and {1} are for markup so ignore them, {2} is for Artist Name;
#. e.g. 'by Parkway Drive'
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:588
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:586
#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:526
#, csharp-format
msgid "{0}by{1} {2}"
@@ -4156,10 +4184,8 @@ msgid "Files"
msgstr "Fitxers"
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:63
-#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/ImportSource.cs:67
-#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:82
-msgid "C_hoose Files"
-msgstr "Escolliu els _fitxers"
+msgid "C_hoose Files..."
+msgstr "Escolliu els _fitxers..."
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:81
msgid "_Files to import:"
@@ -4186,8 +4212,8 @@ msgid "Folders"
msgstr "Carpetes"
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FolderImportSource.cs:57
-msgid "C_hoose Folders"
-msgstr "Escolliu les carpetes"
+msgid "C_hoose Folders..."
+msgstr "Es_colliu les carpetes..."
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FolderImportSource.cs:75
msgid "_Folders to import:"
@@ -4219,14 +4245,10 @@ msgstr "No tornis a mostrar aquest quadre de diàleg"
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:130
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:82
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:385
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:384
msgid "_Import"
msgstr "_Importa"
-#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/PhotoFolderImportSource.cs:69
-msgid "Videos From Photos Folder"
-msgstr "Vídeos des de la carpeta de fotografies"
-
#: ../src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileComboBox.cs:86
msgid "No available profiles"
msgstr "No hi ha perfils disponibles"
@@ -4289,6 +4311,10 @@ msgstr "Llista de reproducció intel·ligent nova"
msgid "Playlist _Name:"
msgstr "Nom de _la llista de reproducció:"
+#: ../src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/Editor.cs:108
+msgid "Predefined Smart Playlists"
+msgstr "Llistes de reproducció intel·ligents predefinides"
+
#: ../src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/Editor.cs:119
msgid "Open in editor"
msgstr "Obre en l'editor"
@@ -4322,7 +4348,7 @@ msgstr "Mostra el navegador"
msgid "Show or hide the artist/album browser"
msgstr "Mostra o amaga el navegador d'artista/àlbum"
-#: ../src/Core/Banshee.WebBrowser/Banshee.WebSource/WebBrowserShell.cs:119
+#: ../src/Core/Banshee.WebBrowser/Banshee.WebSource/WebBrowserShell.cs:121
#, csharp-format
msgid "Loading {0}..."
msgstr "S'estan carregant {0}..."
@@ -4348,7 +4374,7 @@ msgid "Idle"
msgstr "En espera"
#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:149
-#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/UserJobDownloadManager.cs:68
+#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/AmazonDownloadManager.cs:58
msgid "Contacting..."
msgstr "S'està contactant..."
@@ -4368,30 +4394,30 @@ msgstr "Silenciat"
msgid "Full Volume"
msgstr "Volum màxim"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:89
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:101
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:101
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:102
msgid "Device"
msgstr "Dispositiu"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:90
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:103
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:102
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:104
msgid "Generation"
msgstr "Generació"
#. FIXME
#. AddDapProperty (Catalog.GetString ("Color"), "black");
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:95
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:104
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:107
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:105
msgid "Capacity"
msgstr "Capacitat"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:96
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:108
msgid "Available"
msgstr "Disponible"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:97
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:105
-#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:135
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:109
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:106
+#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:141
msgid "Serial number"
msgstr "Número de serie"
@@ -4400,35 +4426,45 @@ msgstr "Número de serie"
#. string [] capabilities = new string [ipod_device.ModelInfo.Capabilities.Count];
#. ipod_device.ModelInfo.Capabilities.CopyTo (capabilities, 0);
#. AddDapProperty (Catalog.GetString ("Capabilities"), String.Join (", ", capabilities));
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:104
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:112
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:116
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:113
msgid "Supports cover art"
msgstr "Permet mostrar cobertes"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:105
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:113
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:117
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:114
msgid "Supports photos"
msgstr "Permet visualitzar fotos"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:379
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:468
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:412
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:491
msgid "Track duration is zero"
msgstr "La duració de la cançó és zero"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:566
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:650
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:515
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:694
msgid "Syncing iPod"
msgstr "S'està sincronitzant l'iPod"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:567
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:651
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:516
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:695
msgid "Preparing to synchronize..."
msgstr "S'està preparant la sincronització..."
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:589
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:676
-msgid "Flushing to disk..."
-msgstr "S'està buidant al disc..."
+# csharp-format
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:519
+#, csharp-format
+msgid "Adding track {0} of {1}"
+msgstr "S'està afegint la cançó {0} de {1}"
+
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:555
+#, csharp-format
+msgid "Removing track {0} of {1}"
+msgstr "S'està suprimint la cançó {0} de {1}"
+
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:619
+msgid "Writing media database"
+msgstr "S'està escrivint la base de dades d'elements multimèdia"
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapLibrarySync.cs:131
#, csharp-format
@@ -4436,11 +4472,18 @@ msgid "Sync {0}"
msgstr "Sincronitza {0}"
#. Note to translators: {0}, {1} and {2} will be replaced with numbers.
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapLibrarySync.cs:256
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapLibrarySync.cs:260
#, csharp-format
msgid "{0} to add, {1} to remove, {2} to update"
msgstr "{0} per afegir, {1} per suprimir, {2} per actualitzar"
+#. This group source gives us a seperator for DAPs in the source view.
+#. We add it when we get our first dap source, and then remove it when
+#. we lose the last one.
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs:63
+msgid "Devices"
+msgstr "Dispositius"
+
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:176
msgid "Device Properties"
msgstr "Propietats del dispositiu"
@@ -4453,38 +4496,38 @@ msgstr "Producte"
msgid "Vendor"
msgstr "Proveïdor"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:280
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:133
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:284
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:140
#, csharp-format
msgid "Loading {0}"
msgstr "S'estan carregant {0}"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:364
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:370
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:37
msgid "Yes"
msgstr "Sí"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:364
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:370
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:38
msgid "No"
msgstr "No"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:385
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:391
#, csharp-format
msgid ""
"The {0} format is not supported by the device, and no converter was found to "
"convert it"
msgstr ""
"El format {0} no és compatible amb el dispositiu, i no s'ha trobat cap "
-"convertidor per a convertir-lo"
+"convertidor per convertir-lo"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:391
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:397
msgid "File format conversion support is not available"
msgstr ""
"Aquest dispositiu no té compatibilitat de conversió d'aquest format de "
"fitxer."
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:417
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:423
msgid "Error converting file"
msgstr "S'ha produït un error en convertir el fitxer"
@@ -4631,34 +4674,38 @@ msgstr "S'està desant la base de dades nova..."
msgid "Error rebuilding iPod database"
msgstr "S'ha produït un error en reconstruir la base de dades de l'iPod"
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:102
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:103
msgid "Color"
msgstr "Color"
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:106
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:107
msgid "Produced on"
msgstr "Produït per"
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:107
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:108
msgid "Firmware"
msgstr "Microprogramari"
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:111
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:112
msgid "Capabilities"
msgstr "Característiques"
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:634
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:680
msgid "Out of space on device"
msgstr "No hi ha prou espai al dispositiu"
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:634
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:680
msgid "Please manually remove some songs"
msgstr "Suprimiu manualment algunes cançons"
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:672
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:724
msgid "Updating..."
msgstr "S'està actualitzant..."
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:728
+msgid "Flushing to disk..."
+msgstr "S'està buidant al disc..."
+
#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:61
msgid "Unable to read your iPod"
msgstr "No s'ha pogut llegir l'iPod"
@@ -4702,7 +4749,7 @@ msgstr "Quin n'és el motiu?"
#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:117
msgid "Your iPod is mounted read only. Banshee can not restore your iPod."
msgstr ""
-"L'iPod està muntat en mode de només de lectura. El Banshee no pot restaurar "
+"L'iPod està muntat en mode només de lectura. El Banshee no pot restaurar "
"l'iPod."
#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:125
@@ -4727,7 +4774,7 @@ msgstr ""
#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:143
msgid "Rebuild Database"
-msgstr "S'està reconstruint la base de dades"
+msgstr "Reconstrueix la base de dades"
#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:157
msgid "Rebuilding iPod Database..."
@@ -4780,11 +4827,12 @@ msgstr ""
"S'ha produït un error inicialitzant la compatibilitat amb dispositius MTP. "
"Vegeu http://www.banshee-project.org/Guide/DAPs/MTP per a més informació."
-#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:136
+#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:142
+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/VersionInformationDialog.cs:66
msgid "Version"
msgstr "Versió"
-#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:138
+#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:144
msgid "Battery level"
msgstr "Nivell de la bateria"
@@ -4792,11 +4840,15 @@ msgstr "Nivell de la bateria"
#. user_event.Progress = (double)current / total;
#. Translators: {0} is the name of the MTP audio device (eg Gabe's Zen Player), {1} is the
#. track currently being loaded, and {2} is the total # of tracks that will be loaded.
-#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:154
+#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:160
#, csharp-format
msgid "Loading {0} - {1} of {2}"
msgstr "S'està carregant {0} - {1} de {2}"
+#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/AmazonDownloadManager.cs:57
+msgid "Amazon MP3 Purchases"
+msgstr "Compres Amazon MP3"
+
#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/AmazonMp3DownloaderService.cs:53
msgid "Amazon MP3s"
msgstr "Amazon MP3"
@@ -4817,30 +4869,13 @@ msgstr "Fitxers Amazon MP3"
msgid "Amazon MP3 Purchase"
msgstr "Compra Amazon MP3"
-#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/UserJobDownloadManager.cs:67
-msgid "Amazon MP3 Purchases"
-msgstr "Compres Amazon MP3"
-
-#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/UserJobDownloadManager.cs:176
-#, csharp-format
-msgid "{0} download at {1}/s"
-msgid_plural "{0} downloads at {1}/s"
-msgstr[0] "{0} baixada a {1}/s"
-msgstr[1] "{0} baixades a {1}/s"
-
-#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/UserJobDownloadManager.cs:184
-#, csharp-format
-msgid "{0} download at {1}/s ({2} pending)"
-msgid_plural "{0} downloads at {1}/s ({2} pending)"
-msgstr[0] "{0} baixada a {1}/s ({2} pendent)"
-msgstr[1] "{0} baixades a {1}/s ({2} pendent)"
-
-#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/SignOutButton.cs:38
-msgid "Sign out of Amazon"
-msgstr "Surt d'Amazon"
+#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/ImportSource.cs:67
+#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:81
+msgid "C_hoose Files"
+msgstr "Escolliu els _fitxers"
#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSource.cs:42
-#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:38
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:39
msgid "Amazon MP3 Store"
msgstr "Botiga Amazon MP3"
@@ -4876,11 +4911,15 @@ msgstr "Regne Unit (amazon.co.uk)"
msgid "United States (amazon.com)"
msgstr "Estats Units (amazon.com)"
-#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:47
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:43
#, csharp-format
msgid "Search the Amazon MP3 Store"
msgstr "Cerca a la botiga Amazon MP3"
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:45
+msgid "How Your Purchases Support GNOME"
+msgstr "Com ajudeu el GNOME amb les vostres compres"
+
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:55
msgid "Open Book"
msgstr "Obre el llibre"
@@ -4903,8 +4942,8 @@ msgstr "Reprèn la reproducció d'aquest audiollibre"
#, csharp-format
msgid "Merge the {0} selected discs into one book?"
msgid_plural "Merge the {0} selected discs into one book?"
-msgstr[0] "Fusiona el {0} disc seleccionat en un llibre?"
-msgstr[1] "Fusiona els {0} discs seleccionat en un llibre?"
+msgstr[0] "Voleu fusionar el {0} disc seleccionat en un llibre?"
+msgstr[1] "Voleu fusionar els {0} discs seleccionats en un llibre?"
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:143
msgid ""
@@ -4912,8 +4951,8 @@ msgid ""
"author and book title for all tracks on all these discs to the values below"
msgstr ""
"Això garanteix que es dóna aquest valor correctament a tots els números de "
-"disc, llavors podeu donar els valors d'abaix d'autor i títol per totes les "
-"cançons d'aquests discs."
+"disc, i llavors es defineixen l'autor i el títol del llibre per a totes les "
+"cançons de tots els discs d'acord amb els valors de sota."
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:152
msgid "Author:"
@@ -4929,29 +4968,35 @@ msgstr "Títol del llibre:"
msgid "Author"
msgstr "Autors"
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:62
+#. Translators: This means the first letter of the author's name
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:63
msgid "Author Initial"
-msgstr "Artista inicial"
+msgstr "Inicial de l'autor"
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:67
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:68
msgid "Book Title"
msgstr "Títol del llibre"
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:68
-msgid "Audiobooks, etc"
-msgstr "Audiollibres, etc"
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:307
+msgid "Audiobooks"
+msgstr "Audiollibres"
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:75
msgid "Search your audiobooks"
msgstr "Cerqueu en els audiollibres"
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:144
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:145
#, csharp-format
msgid "{0} book"
msgid_plural "{0} books"
msgstr[0] "{0} llibre"
msgstr[1] "{0} llibres"
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:149
+msgid "Audiobooks Folder"
+msgstr "Carpeta dels audiollibres"
+
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/BookView.cs:114
msgid "Resume Playback"
msgstr "Reprèn la reproducció"
@@ -4961,14 +5006,14 @@ msgid "No Bookmark Set"
msgstr "No hi ha cap adreça d'interès establerta"
#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdDiscModel.cs:76
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:55
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:56
msgid "Audio CD"
msgstr "CD d'àudio"
#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdDiscModel.cs:102
#, csharp-format
msgid "Track {0}"
-msgstr "Pista {0}"
+msgstr "Cançó {0}"
# N.T.: Títol a les preferències
#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdRipper.cs:121
@@ -5040,7 +5085,7 @@ msgstr ""
"substancialment."
#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:320
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:440
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:441
msgid "Import CD"
msgstr "Importa el CD"
@@ -5058,47 +5103,47 @@ msgstr "Duplica el CD"
msgid "Duplicate this audio CD"
msgstr "Duplica aquest CD d'àudio"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:130
-msgid "Searching for CD metadata..."
-msgstr "S'estan cercant les metadades del CD..."
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:131
+msgid "Searching for track information..."
+msgstr "S'està cercant la informació de la cançó..."
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:163
-msgid "Could not fetch metadata for CD."
-msgstr "No s'ha pogut obtenir les metadades per al CD."
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:164
+msgid "Could not fetch track information"
+msgstr "No s'ha pogut obtenir la informació de la cançó"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:191
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:192
msgid "Automatic import off since this album is already in the Music Library."
msgstr ""
-"Importació automàtica inhabilitada degut a que aquest àlbum ja es troba en "
-"la biblioteca de música."
+"Importació automàtica inhabilitada perquè aquest àlbum ja es troba en la "
+"biblioteca de música."
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:214
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:215
msgid "Could not import CD"
msgstr "No s'ha pogut importar el CD"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:231
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:232
msgid "Could not duplicate audio CD"
msgstr "No s'ha pogut duplicar el CD d'àudio"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:363
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:364
msgid "Ejecting audio CD..."
msgstr "S'està expulsant el CD d'àudio..."
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:381
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:382
#, csharp-format
msgid "Could not eject audio CD: {0}"
msgstr "No s'ha pogut expulsar el CD d'àudio: {0}"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:414
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:415
msgid "Audio CD Preferences"
msgstr "Preferències del CD d'àudio"
#
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:415
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:416
msgid "Eject Disc"
msgstr "Expulsa el disc"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:439
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:440
#, csharp-format
msgid "Import ‟{0}”"
msgstr "Importa {0}"
@@ -5107,32 +5152,32 @@ msgstr "Importa {0}"
msgid "Detecting BPM"
msgstr "S'està detectant els BPM"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:91
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:92
msgid "D_etect"
msgstr "D_etecta"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:103
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:104
msgid "T_ap"
msgstr "C_olpeja"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:111
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:112
msgid "Have Banshee attempt to auto-detect the BPM of this song"
msgstr ""
"Que el Banshee intenti detectar automàticament els BPM per aquesta cançó"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:113
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:114
msgid "Play this song"
msgstr "Reprodueix aquesta cançó"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:116
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:117
msgid "Tap this button to the beat to set the BPM for this song manually"
msgstr "Colpeja aquest botó per establir els BPM d'aquesta cançó manualment"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:148
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:147
msgid "_Automatically detect BPM for all songs"
-msgstr "_Detecta automàticament els BPM per a totes les cançons"
+msgstr "_Detecta automàticament els BPM de totes les cançons"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:149
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:148
msgid ""
"Detect beats per minute (BPM) for all songs that don't already have a value "
"set"
@@ -5149,22 +5194,6 @@ msgstr "S'estan baixant les cobertes"
msgid "{0} - {1}"
msgstr "{0} - {1}"
-#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtService.cs:107
-msgid "_Cover Art"
-msgstr "_Coberta"
-
-#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtService.cs:108
-msgid "Manage cover art"
-msgstr "Gestiona les cobertes"
-
-#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtService.cs:110
-msgid "_Download Cover Art"
-msgstr "_Baixa les cobertes"
-
-#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtService.cs:111
-msgid "Download cover art for all tracks"
-msgstr "Baixa la coberta per totes les cançons"
-
#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapContainerSource.cs:42
msgid "Shared Music"
msgstr "Música compartida"
@@ -5254,11 +5283,11 @@ msgstr "Entrada"
msgid "Connecting to {0}"
msgstr "S'està connectant a {0}"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:178
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:187
msgid "Add Remote DAAP Server"
msgstr "Afegeix un servidor DAAP remot"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:179
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:188
msgid "Add a new remote DAAP server"
msgstr "Afegeix un nou servidor DAAP remot"
@@ -5329,15 +5358,15 @@ msgstr "S'estan cancel·lant les baixades"
msgid "Waiting for downloads to terminate..."
msgstr "S'està esperant la finalització de les baixades..."
-#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:60
+#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:59
msgid "Import eMusic Downloads to Library"
msgstr "Importa les baixades d'eMusic a la biblioteca"
-#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:62
+#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:61
msgid "eMusic Files"
msgstr "Fitxers d'eMusic"
-#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:78
+#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:77
msgid "eMusic Tracks"
msgstr "Cançons d'eMusic"
@@ -5347,7 +5376,7 @@ msgid "File System Queue"
msgstr "Cua del sistema de fitxers"
#: ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs:72
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:72
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:94
msgid "Clear"
msgstr "Buida"
@@ -5356,13 +5385,13 @@ msgid "Remove all tracks from the file system queue"
msgstr "Suprimeix totes les cançons de la cua del sistema de fitxers"
#: ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs:79
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:81
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:103
msgid "Clear on Quit"
msgstr "Buida en sortir"
#: ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs:80
msgid "Clear the file system queue when quitting"
-msgstr "Neteja la cua del sistema de fitxers en sortir"
+msgstr "Buida la cua del sistema de fitxers en sortir"
#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/AlbumDuplicateSolver.cs:46
msgid "Duplicate Albums"
@@ -5441,18 +5470,34 @@ msgstr ", {0}"
msgid "Fix?"
msgstr "Repara?"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:48
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:51
msgid "View Item Details"
msgstr "Visualitza els detalls de l'element"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:57
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:60
msgid "Open Webpage"
msgstr "Obre la pàgina web"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:76
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:79
msgid "Visit Archive.org"
msgstr "Vés al lloc web Archive.org"
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:83
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:61
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:170
+msgid "Subscribe"
+msgstr "Subscriviu-vos"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:84
+msgid "Subscribe to this search as a podcast"
+msgstr "Subscriviu-vos a aquesta cerca com un Podcast"
+
+# N.T.: No es tradueix ja que és nom propi
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:88
+#, csharp-format
+msgid "Internet Archive: {0}"
+msgstr "Internet Archive: {0}"
+
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs:78
msgid "Close Item"
msgstr "Tanca l'element"
@@ -5482,7 +5527,7 @@ msgstr ""
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:130
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:66
#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:136
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:271
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:279
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastEpisodePage.cs:89
msgid "Description"
msgstr "Descripció"
@@ -5491,7 +5536,7 @@ msgstr "Descripció"
msgid "Creator:"
msgstr "Creador:"
-# N.T.: Lloc on es va produir l'actuació
+# N.T.: Lloc on es va produir l'actuació
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:222
msgid "Venue:"
msgstr "Lloc:"
@@ -5587,16 +5632,16 @@ msgstr "{0} per {1} al {2}"
msgid "Write your own review"
msgstr "Escriviu les vostres pròpies revisions"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:109
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:108
msgid "Collection:"
msgstr "Col·lecció:"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:118
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:117
#, csharp-format
msgid "Optional Query"
msgstr "Consulta opcional"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:165
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:164
msgid "Sort by:"
msgstr "Ordena per:"
@@ -5690,20 +5735,15 @@ msgid ""
"library, we provide free access to researchers, historians, scholars, and "
"the general public."
msgstr ""
-"L'Internet Archive, una organització sense ànim de lucre, està "
-"construint una biblioteca digital de llocs d'Internet i altres continguts "
-"culturals en forma digital. Igual que en una col·lecció de paper, proveïm "
-"el lliure accés a investigadors, historiadors, estudiosos i el públic en "
-"general."
+"L'Internet Archive, una organització sense ànim de lucre, està construint "
+"una biblioteca digital de llocs d'Internet i altres continguts culturals en "
+"forma digital. Igual que en una col·lecció de paper, proveïm el lliure accés "
+"a investigadors, historiadors, estudiosos i el públic en general."
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:151
msgid "Visit the Internet Archive online at archive.org"
msgstr "Visiteu l'Internet Archive en línia a archive.org"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:307
-msgid "Audiobooks"
-msgstr "Audiollibres"
-
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:308
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:78
msgid "Movies"
@@ -5976,13 +6016,13 @@ msgstr "Afegeix una emissora"
#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:66
msgid "Add a new Internet Radio station or playlist"
msgstr ""
-"Afegeix una nova emissora de ràdio d'Internet o una llista de reproducció"
+"Afegeix una nova emissora de ràdio per Internet o una llista de reproducció"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:81
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:83
msgid "Search your stations"
msgstr "Cerqueu en les emissores"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:82
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:84
#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationEditor.cs:60
msgid "Edit Station"
msgstr "Edita l'emissora"
@@ -6051,6 +6091,7 @@ msgid "Description:"
msgstr "Descripció:"
#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:128
+#: ../src/Hyena/Hyena.Gui/Hyena.Widgets/RatingMenuItem.cs:50
msgid "Rating:"
msgstr "Valoració:"
@@ -6076,11 +6117,11 @@ msgstr "V_isiteu la vostra pàgina de perfil d'usuari a Last.fm"
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:135
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:91
msgid "_Enable Song Reporting"
-msgstr "_Habilita l'informe de la cançó"
+msgstr "_Habilita l'informe de cançons"
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:136
msgid "Enable song reporting"
-msgstr "Habilita l'informe de les cançons"
+msgstr "Habilita l'informe de cançons"
#
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:66
@@ -6497,15 +6538,15 @@ msgstr "URL lastfm://"
msgid "lastfm://"
msgstr "lastfm://"
-#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:109
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:113
msgid "Media"
msgstr "Elements multimèdia"
-#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:119
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:123
msgid "Library"
msgstr "Biblioteca"
-#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:131
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:135
msgid "Launch the Banshee Media Player"
msgstr "Inicia el reproductor multimèdia Banshee"
@@ -6548,11 +6589,11 @@ msgid "Open Miro Guide"
msgstr "Obre la Miro Guide"
#: ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide/View.cs:56
-msgid "Search for Podcasts"
+msgid "Search for podcasts"
msgstr "Cerca Podcasts"
#: ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide/View.cs:57
-msgid "Search for Video Podcasts"
+msgid "Search for video podcasts"
msgstr "Cerca Podcasts de vídeo"
#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:139
@@ -6573,7 +6614,7 @@ msgid ""
"end your session."
msgstr ""
"El Banshee s'ha minimitzat a l'àrea de notificació. Utilitzeu l'opció "
-"<i>Surt</i> per a finalitzar la sessió."
+"<i>Surt</i> per finalitzar la sessió."
#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:480
msgid "Skip this item"
@@ -6608,23 +6649,23 @@ msgid "Simplify the Now Playing interface by hiding the source list and more"
msgstr ""
"Simplifica l'interfície «Reproducció ara» amagant la llista de fonts i més"
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:144
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:143
#, csharp-format
msgid "Unable to import track: {0}"
-msgstr "No es pot importar la pista: {0}"
+msgstr "No es pot importar la canço: {0}"
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:178
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:177
msgid "Importing from Amarok failed"
msgstr "S'ha produït un error en importar des de l'Amarok"
#
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:189
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:188
msgid "Amarok"
msgstr "Amarok"
#. TODO add Help button and dialog/tooltip
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:68
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:384
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:383
msgid "iTunes Importer"
msgstr "Importador de l'iTunes"
@@ -6642,24 +6683,24 @@ msgid "Import playlists"
msgstr "Importa llistes de reproducció"
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:120
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:387
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:386
#, csharp-format
msgid "Locate your \"{0}\" file..."
msgstr "Troba el fitxer «{0}»..."
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:138
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:388
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:387
#, csharp-format
msgid "Locate \"{0}\""
msgstr "Troba «{0}»"
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:167
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:389
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:388
msgid "Locate iTunes Music Directory"
msgstr "Troba la biblioteca de música de l'iTunes"
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:196
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:391
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:390
#, csharp-format
msgid ""
"The iTunes library refers to your music directory as \"{0}\" but Banshee was "
@@ -6669,13 +6710,13 @@ msgstr ""
"«{0}» però el Banshee no ha estat capaç de trobar aquest directori. Cal que "
"l'ubiqueu."
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:75
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:393
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:74
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:392
msgid "iTunes Media Player"
msgstr "Reproductor multimèdia iTunes"
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:135
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:395
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:134
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:394
msgid ""
"Banshee is not familiar with this version of the iTunes library format. "
"Importing may or may not work as expected, or at all. Would you like to "
@@ -6686,19 +6727,19 @@ msgstr ""
"importació?"
#
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:440
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:236
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:397
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:439
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:235
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:396
msgid "Unable to import song."
msgstr "No s'ha pogut importar la cançó."
#
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:370
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:369
msgid "Rhythmbox Music Player"
msgstr "Reproductor de música Rhythmbox"
#
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:386
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:385
msgid "Import _playlists"
msgstr "Importa llistes de reproducció"
@@ -6710,53 +6751,86 @@ msgstr "_Omple"
msgid "f_rom"
msgstr "_des de"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:50
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:52
msgid "Add to Play Queue"
msgstr "Afegeix a la cua de reproducció"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:51
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:53
msgid "Append selected songs to the play queue"
msgstr "Afegeix les cançons seleccionades a la cua de reproducció"
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:57
+msgid "Play After"
+msgstr "Reprodueix després"
+
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:58
+msgid "Add selected songs after the currently playing track, album, or artist"
+msgstr "Afegeix les cançons seleccionades després de la cançó, àlbum o artista que s'està reproduint"
+
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:62
+msgid "Current Track"
+msgstr "Pista actual"
+
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:63
+msgid "Add selected songs to the play queue after the currently playing song"
+msgstr "Afegeix les cançons seleccionades a la cua de reproducció després de la cançó que s'està reproduint"
+
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:67
+msgid "Current Album"
+msgstr "Àlbum actual"
+
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:68
+msgid "Add selected songs to the play queue after the currently playing album"
+msgstr "Afegeix les cançons seleccionades a la cua de reproducció després de l'àlbum que s'està reproduint"
+
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:72
+msgid "Current Artist"
+msgstr "Artista actual"
+
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:73
+msgid "Add selected songs to the play queue after the currently playing artist"
+msgstr "Afegeix les cançons seleccionades a la cua de reproducció després de l'artista que s'està reproduint"
+
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:80
msgid "Refresh random tracks in the play queue"
msgstr "Refresca aleatòriament les cançons de la cua de reproducció"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:63
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:85
msgid "Randomize the playback order of items in the play queue"
msgstr "Genera aleatòriament l'ordre dels elements de la cua de reproducció"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:67
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:89
msgid "Add More"
msgstr "Afegeix-ne més"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:68
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:90
msgid "Add more random tracks to the play queue"
msgstr "Afegeix més cançons aleatòriament a la cua de reproducció"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:73
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:95
msgid "Remove all tracks from the play queue"
msgstr "Suprimeix totes les cançons de la cua de reproducció"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:82
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:104
msgid "Clear the play queue when quitting"
-msgstr "Neteja la cua de reproducció en sortir"
+msgstr "Buida la cua de reproducció en sortir"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:88
msgid "Remove From Play Queue"
msgstr "Suprimeix de la cua de producció"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:864
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:967
msgid "Number of _played songs to show"
msgstr "Nombre de _cançons reproduïdes a mostrar"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:870
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:973
msgid "Number of _upcoming songs to show"
msgstr "Nombre de _cançons següents a mostrar"
#
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastFeedModel.cs:47
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:270
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:278
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:89
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastEpisodePage.cs:86
msgid "Podcast"
msgstr "Podcast"
@@ -6767,71 +6841,64 @@ msgstr "Podcast"
msgid "All Podcasts ({0})"
msgstr "Tots els Podcasts ({0})"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:122
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:102
+msgid "Podcasts Folder"
+msgstr "Carpeta dels Podcasts"
+
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:129
msgid "Remove Podcast"
-msgstr "Suprimeix el Podcast"
+msgstr "Suprimeix el podcast"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:127
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:134
msgid "Disable Auto Updates"
msgstr "Inhabilita les actualitzacions automàtiques"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:145
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:152
#, csharp-format
msgid "Network error updating {0}"
msgstr "S'ha produït un error en actualitzar {0}"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:151
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:158
#, csharp-format
msgid "Parsing error updating {0}"
msgstr "S'ha produït un error en analitzar {0}"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:154
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:161
#, csharp-format
msgid "Authentication error updating {0}"
msgstr "S'ha produït un error d'autenticació en actualitzar {0}"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:157
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:164
#, csharp-format
msgid "Error updating {0}"
msgstr "S'ha produït un error en actualitzar {0}"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:213
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:220
msgid "Search your podcasts"
msgstr "Cerca als vostres podcasts"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:270
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:278
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastEpisodePage.cs:88
msgid "Published"
msgstr "Publicat"
#
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:270
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcastStatusIndicator.cs:66
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:278
msgid "New"
msgstr "Nou"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:271
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellDownloadStatus.cs:57
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:279
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcastStatusIndicator.cs:66
msgid "Downloaded"
msgstr "Baixats"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:293
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:305
#, csharp-format
msgid "{0} episode"
msgid_plural "{0} episodes"
msgstr[0] "{0} episodi"
msgstr[1] "{0} episodis"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellDownloadStatus.cs:58
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellUnheard.cs:58
-msgid "All Items"
-msgstr "Tots els elements"
-
-# N.T.: Fa referència a un conjunt d'elements
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellDownloadStatus.cs:59
-msgid "Not Downloaded"
-msgstr "No baixats"
-
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:113
msgid "Never updated"
msgstr "Mai no s'ha actualitzat"
@@ -6855,86 +6922,86 @@ msgstr "S'està baixant"
msgid "New Items"
msgstr "Elements nous"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellUnheard.cs:59
-msgid "Old Items"
-msgstr "Elements antics"
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellUnheard.cs:58
+msgid "All Items"
+msgstr "Tots els elements"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs:50
msgid "Downloading Podcast(s)"
-msgstr "S'estan baixant els Podcasts"
+msgstr "S'estan baixant els podcasts"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs:52
msgid "Cancel all podcast downloads?"
-msgstr "Voleu cancel·lar les baixades de Podcast?"
+msgstr "Voleu cancel·lar les baixades de podcast?"
#. "<control><shift>U",
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:72
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:73
msgid "Check all podcasts for new episodes"
msgstr "Comprova si hi ha episodis nous a tots els podcasts"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:77
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:78
msgid "Add Podcast..."
-msgstr "Afegeix el Podcast..."
+msgstr "Afegeix el podcast..."
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:78
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:79
msgid "Subscribe to a new podcast"
-msgstr "Subscriviu-vos a un Podcast nou"
+msgstr "Subscriviu-vos a un podcast nou"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:89
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:93
msgid "Unsubscribe and Delete"
msgstr "Cancel·la la subscripció i suprimeix-la"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:95
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:99
msgid "Check for New Episodes"
msgstr "Comprova si hi ha episodis nou"
#
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:101
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:105
msgid "Download All Episodes"
msgstr "Baixa tots els episodis"
#
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:107
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:111
msgid "Visit Podcast Homepage"
-msgstr "Visiteu la pàgina inicial del Podcast"
+msgstr "Visiteu la pàgina inicial del podcast"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:119
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:123
msgid "Mark as New"
msgstr "Marca com a nou"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:125
-msgid "Mark as Old"
-msgstr "Marca com a vell"
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:129
+msgid "Archive"
+msgstr "Arxiu"
-#
#. Translators: this is a verb used as a button name, not a noun
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:131
-msgid "Download Podcast(s)"
-msgstr "Baixa els Podcasts"
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:135
+msgid "Download"
+msgstr "Baixades"
-#
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:137
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:141
msgid "Cancel Download"
msgstr "Cancel·la la baixada"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:143
-msgid "Remove Downloaded File(s)"
-msgstr "Suprimeix els fitxers baixats"
-
-#
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:149
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:153
msgid "Visit Website"
msgstr "Visiteu el lloc web"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:161
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:165
msgid "Add Podcast"
-msgstr "Afegeix el Podcast"
+msgstr "Afegeix el podcast"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:325
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:262
+#, csharp-format
+msgid "Delete File"
+msgid_plural "Delete Files"
+msgstr[0] "Suprimeix el fitxer"
+msgstr[1] "Suprimeix els fitxers"
+
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:343
msgid "Invalid URL"
msgstr "URL no vàlida"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:326
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:344
msgid "Podcast URL is invalid."
msgstr "L'URL del canal Podcast no és vàlid."
@@ -6948,7 +7015,7 @@ msgstr "Darrera actualització:"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:89
msgid "Podcast Name:"
-msgstr "Nom del Podcast:"
+msgstr "Nom del podcast:"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:99
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:85
@@ -6969,19 +7036,14 @@ msgstr "No hi ha cap descripció disponible"
msgid "Podcast:"
msgstr "Podcast:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:61
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:170
-msgid "Subscribe"
-msgstr "Subscriviu-vos"
-
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:92
msgid "Subscribe to New Podcast"
-msgstr "Subscriviu-vos a Podcasts nous"
+msgstr "Subscriviu-vos a podcasts nous"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:100
msgid ""
"Please enter the URL of the podcast to which you would like to subscribe."
-msgstr "Introduïu l'URL del Podcast al que voleu subscriviu-vos."
+msgstr "Introduïu l'URL del podcast al que voleu subscriviu-vos."
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:112
msgid "When new episodes are available: "
@@ -7033,6 +7095,190 @@ msgstr "Reprodueix al navegador web..."
msgid "No videos found"
msgstr "No s'ha trobat cap vídeo"
+#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/Accessibility/ColumnHeaderCellTextAccessible.cs:36
+msgid "open context menu"
+msgstr "obre el menú de context"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/Accessibility/ColumnHeaderCellTextAccessible.cs:37
+msgid "click"
+msgstr "clic"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/Accessibility/ColumnHeaderCellTextAccessible.cs:37
+msgid "menu"
+msgstr "menú"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs:612
+#, csharp-format
+msgid "Hide <i>{0}</i>"
+msgstr "Amaga <i>{0}</i>"
+
+#. Translators: {0} is substituted with the application name
+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:53
+#, csharp-format
+msgid "{0} Encountered a Fatal Error"
+msgstr "{0}: s'ha produït un error greu"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:92
+msgid "Error Details"
+msgstr "Detalls de l'error"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:136
+msgid "An unhandled exception was thrown: "
+msgstr "S'ha llançat un excepció no gestionada: "
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/VersionInformationDialog.cs:58
+msgid "Assembly Version Information"
+msgstr "Informació de la versió de l'assembly"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/VersionInformationDialog.cs:64
+msgid "Assembly Name"
+msgstr "Nom de l'assembly"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs:62
+msgid "KB"
+msgstr "kB"
+
+#
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:86
+msgid "Condition:"
+msgstr "Condició:"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:104
+msgid "_Match"
+msgstr "_Coincidència"
+
+#
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:111
+msgid "all"
+msgstr "tot"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:112
+msgid "any"
+msgstr "qualsevol"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:117
+msgid "of the following:"
+msgstr "dels següents:"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryLimitBox.cs:58
+msgid "_Limit to"
+msgstr "_Limita a"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryLimitBox.cs:85
+msgid "selected by"
+msgstr "seleccionat per"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/RelativeTimeSpanQueryValueEntry.cs:42
+msgid "ago"
+msgstr "fa"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:59
+msgid "seconds"
+msgstr "segons"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:62
+msgid "days"
+msgstr "dies"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:63
+msgid "weeks"
+msgstr "setmanes"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:64
+msgid "months"
+msgstr "mesos"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:65
+msgid "years"
+msgstr "anys"
+
+#: ../src/Hyena/Hyena/Hyena.Downloader/DownloadManagerJob.cs:71
+#, csharp-format
+msgid "{0} download at {1}/s"
+msgid_plural "{0} downloads at {1}/s"
+msgstr[0] "{0} baixada a {1}/s"
+msgstr[1] "{0} baixades a {1}/s"
+
+#: ../src/Hyena/Hyena/Hyena.Downloader/DownloadManagerJob.cs:79
+#, csharp-format
+msgid "{0} download at {1}/s ({2} pending)"
+msgid_plural "{0} downloads at {1}/s ({2} pending)"
+msgstr[0] "{0} baixada a {1}/s ({2} pendent)"
+msgstr[1] "{0} baixades a {1}/s ({2} pendent)"
+
+#
+#. public static readonly Operator Equal = new Operator ("equals", "= {0}", "==", "=", ":");
+#. public static readonly Operator NotEqual = new Operator ("notEqual", "!= {0}", true, "!=", "!:");
+#. public static readonly Operator LessThanEqual = new Operator ("lessThanEquals", "<= {0}", "<=");
+#. public static readonly Operator GreaterThanEqual = new Operator ("greaterThanEquals", ">= {0}", ">=");
+#: ../src/Hyena/Hyena/Hyena.Query/DateQueryValue.cs:47
+msgid "before"
+msgstr "abans"
+
+#
+#: ../src/Hyena/Hyena/Hyena.Query/DateQueryValue.cs:48
+msgid "after"
+msgstr "després"
+
+#: ../src/Hyena/Hyena/Hyena.Query/EnumQueryValue.cs:43
+#: ../src/Hyena/Hyena/Hyena.Query/IntegerQueryValue.cs:41
+#: ../src/Hyena/Hyena/Hyena.Query/StringQueryValue.cs:45
+msgid "is"
+msgstr "és"
+
+#: ../src/Hyena/Hyena/Hyena.Query/EnumQueryValue.cs:44
+#: ../src/Hyena/Hyena/Hyena.Query/IntegerQueryValue.cs:42
+#: ../src/Hyena/Hyena/Hyena.Query/StringQueryValue.cs:46
+msgid "is not"
+msgstr "no és"
+
+#: ../src/Hyena/Hyena/Hyena.Query/IntegerQueryValue.cs:43
+#: ../src/Hyena/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:47
+msgid "at most"
+msgstr "com a màxim"
+
+#
+#: ../src/Hyena/Hyena/Hyena.Query/IntegerQueryValue.cs:44
+#: ../src/Hyena/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:46
+msgid "at least"
+msgstr "com a mínim"
+
+#: ../src/Hyena/Hyena/Hyena.Query/IntegerQueryValue.cs:45
+#: ../src/Hyena/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:45
+msgid "less than"
+msgstr "menys que"
+
+#. The SQL operators in these Operators are reversed from normal on purpose
+#: ../src/Hyena/Hyena/Hyena.Query/IntegerQueryValue.cs:46
+#: ../src/Hyena/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:44
+msgid "more than"
+msgstr "més que"
+
+#: ../src/Hyena/Hyena/Hyena.Query/NullQueryValue.cs:41
+msgid "empty"
+msgstr "buit"
+
+#: ../src/Hyena/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:90
+#, csharp-format
+msgid "{0} ago"
+msgstr "Fa {0}"
+
+#: ../src/Hyena/Hyena/Hyena.Query/StringQueryValue.cs:43
+msgid "contains"
+msgstr "conté"
+
+#: ../src/Hyena/Hyena/Hyena.Query/StringQueryValue.cs:44
+msgid "doesn't contain"
+msgstr "no conté"
+
+#: ../src/Hyena/Hyena/Hyena.Query/StringQueryValue.cs:47
+msgid "starts with"
+msgstr "comença amb"
+
+#: ../src/Hyena/Hyena/Hyena.Query/StringQueryValue.cs:48
+msgid "ends with"
+msgstr "acaba amb"
+
#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:76
msgid "Last.fm Account Login"
msgstr "Compte d'entrada a Last.fm"
@@ -7153,143 +7399,116 @@ msgstr "Esteu connectat amb Last.fm."
msgid "Unknown Podcast"
msgstr "Podcast desconegut"
-#~ msgid "MTP Support Ignoring Device"
-#~ msgstr "Dispositiu sense compatibilitat MTP"
-
-#~ msgid ""
-#~ "Banshee's MTP audio player support can only handle one device at a time."
-#~ msgstr ""
-#~ "La compatibilitat de reproducció d'àudio MTP del Banshee només pot "
-#~ "gestionar una dispositiu al mateix temps."
-
-#~ msgid "Error Finding MTP Device Support"
-#~ msgstr "S'ha produït un error cercant compatibilitat amb dispositius MTP"
-
-#~ msgid ""
-#~ "An MTP device was detected, but Banshee was unable to load support for it."
-#~ msgstr ""
-#~ "S'ha detectat un dispositiu MTP, però el Banshee no ha pogut carregar la "
-#~ "compatibilitat."
-
-#~ msgid "Refresh All Podcasts"
-#~ msgstr "Actualitza tots els Podcasts"
-
-#~ msgid "Subscribe to Podcast..."
-#~ msgstr "Subscriviu-vos al Podcast..."
+#~ msgid "Average Bitrate"
+#~ msgstr "Taxa de bits mitjana"
-#~ msgid "open context menu"
-#~ msgstr "obre el menú de context"
+#~ msgid "Extreme"
+#~ msgstr "Extrem"
-#~ msgid "click"
-#~ msgstr "clic"
+#~ msgid "Insane"
+#~ msgstr "Esbojarrat"
-#~ msgid "menu"
-#~ msgstr "menú"
+#~ msgid "LAME Preset"
+#~ msgstr "Predefinició LAME"
-#~ msgid "Hide <i>{0}</i>"
-#~ msgstr "Amaga <i>{0}</i>"
+#~ msgid "Medium"
+#~ msgstr "Mitjana"
-#~ msgid "Banshee Encountered a Fatal Error"
-#~ msgstr "S'ha produït un error greu al Banshee"
+#~ msgid "Preset"
+#~ msgstr "Predefinició"
-#~ msgid "Error Details"
-#~ msgstr "Detalls de l'error"
-
-#~ msgid "An unhandled exception was thrown: "
-#~ msgstr "S'ha llançat un excepció no gestionada: "
-
-#~ msgid "Assembly Version Information"
-#~ msgstr "Informació de la versió de l'assembly"
-
-#~ msgid "Assembly Name"
-#~ msgstr "Nom de l'assembly"
-
-#~ msgid "KB"
-#~ msgstr "kB"
+#~ msgid "Standard"
+#~ msgstr "Estàndard"
#
-#~ msgid "Condition:"
-#~ msgstr "Condició:"
+#~ msgid "VBR Mode"
+#~ msgstr "Mode VBR"
-#~ msgid "_Match"
-#~ msgstr "_Coincidència"
+# N.T.: Fa referència a un conjunt d'elements
+#~ msgid "Not Downloaded"
+#~ msgstr "No baixats"
-#
-#~ msgid "all"
-#~ msgstr "tot"
+#~ msgid "Old Items"
+#~ msgstr "Elements antics"
-#~ msgid "any"
-#~ msgstr "qualsevol"
+#~ msgid "Home Folder"
+#~ msgstr "Carpeta de l'usuari"
-#~ msgid "of the following:"
-#~ msgstr "dels següents:"
+#~ msgid "Manage _Extensions"
+#~ msgstr "Gestiona les e_xtensions"
-#~ msgid "_Limit to"
-#~ msgstr "_Limita a"
+#~ msgid "Manage extensions to add new features to Banshee"
+#~ msgstr "Gestiona les extensions per afegir funcions noves al Banshee"
-#~ msgid "selected by"
-#~ msgstr "seleccionat per"
+#~ msgid "_Web Resources"
+#~ msgstr "Recursos _web"
-#~ msgid "ago"
-#~ msgstr "fa"
+#~ msgid "Banshee _User Guide (Wiki)"
+#~ msgstr "G_uia d'usuari del Banshee (Wiki)"
-#~ msgid "seconds"
-#~ msgstr "segons"
+#~ msgid "Learn about how to use Banshee"
+#~ msgstr "Apreneu a utilitzar el Banshee"
-#~ msgid "days"
-#~ msgstr "dies"
+#~ msgid "Videos From Photos Folder"
+#~ msgstr "Vídeos des de la carpeta de fotografies"
-#~ msgid "weeks"
-#~ msgstr "setmanes"
+#~ msgid "Audiobooks, etc"
+#~ msgstr "Audiollibres, etc"
-#~ msgid "months"
-#~ msgstr "mesos"
+#~ msgid "Searching for CD metadata..."
+#~ msgstr "S'estan cercant les metadades del CD..."
-#~ msgid "years"
-#~ msgstr "anys"
+#~ msgid "Could not fetch metadata for CD."
+#~ msgstr "No s'ha pogut obtenir les metadades per al CD."
-#
-#~ msgid "before"
-#~ msgstr "abans"
+#~ msgid "Mark as Old"
+#~ msgstr "Marca com a vell"
#
-#~ msgid "after"
-#~ msgstr "després"
+#~ msgid "Download Podcast(s)"
+#~ msgstr "Baixa els podcasts"
-#~ msgid "is"
-#~ msgstr "és"
+#~ msgid "Remove Downloaded File(s)"
+#~ msgstr "Suprimeix els fitxers baixats"
-#~ msgid "is not"
-#~ msgstr "no és"
+#~ msgid "Sign out of Amazon"
+#~ msgstr "Surt d'Amazon"
-#~ msgid "at most"
-#~ msgstr "com a màxim"
+#~ msgid "_Cover Art"
+#~ msgstr "_Coberta"
-#
-#~ msgid "at least"
-#~ msgstr "com a mínim"
+#~ msgid "Manage cover art"
+#~ msgstr "Gestiona les cobertes"
-#~ msgid "less than"
-#~ msgstr "menys que"
+#~ msgid "_Download Cover Art"
+#~ msgstr "_Baixa les cobertes"
-#~ msgid "more than"
-#~ msgstr "més que"
+#~ msgid "Download cover art for all tracks"
+#~ msgstr "Baixa la coberta per totes les cançons"
-#~ msgid "empty"
-#~ msgstr "buit"
+#~ msgid "MTP Support Ignoring Device"
+#~ msgstr "Dispositiu sense compatibilitat MTP"
-#~ msgid "contains"
-#~ msgstr "conté"
+#~ msgid ""
+#~ "Banshee's MTP audio player support can only handle one device at a time."
+#~ msgstr ""
+#~ "La compatibilitat de reproducció d'àudio MTP del Banshee només pot "
+#~ "gestionar una dispositiu al mateix temps."
-#
-#~ msgid "doesn't contain"
-#~ msgstr "no conté"
+#~ msgid "Error Finding MTP Device Support"
+#~ msgstr "S'ha produït un error cercant compatibilitat amb dispositius MTP"
+
+#~ msgid ""
+#~ "An MTP device was detected, but Banshee was unable to load support for it."
+#~ msgstr ""
+#~ "S'ha detectat un dispositiu MTP, però el Banshee no ha pogut carregar la "
+#~ "compatibilitat."
-#~ msgid "starts with"
-#~ msgstr "comença amb"
+#~ msgid "Refresh All Podcasts"
+#~ msgstr "Actualitza tots els podcasts"
-#~ msgid "ends with"
-#~ msgstr "acaba amb"
+#~ msgid "Subscribe to Podcast..."
+#~ msgstr "Subscriviu-vos al podcast..."
#~ msgid "Save your position in tracks so you can resume playback later."
#~ msgstr ""
@@ -7328,13 +7547,6 @@ msgstr "Podcast desconegut"
#~ msgid "<b>Details</b>"
#~ msgstr "<b>Detalls</b>"
-#~ msgid "Predefined Smart Playlists"
-#~ msgstr "Llistes de reproducció intel·ligents predefinides"
-
-#
-#~ msgid "Current source:"
-#~ msgstr "Font actual:"
-
#~ msgid "Hardware"
#~ msgstr "Maquinari"
@@ -7540,7 +7752,7 @@ msgstr "Podcast desconegut"
#
#~ msgid "Update Podcasts"
-#~ msgstr "Actualitza els Podcasts"
+#~ msgstr "Actualitza els podcasts"
#~ msgid "All Columns"
#~ msgstr "Totes les columnes"
@@ -7719,7 +7931,7 @@ msgstr "Podcast desconegut"
#
#~ msgid "Are you sure that you'd like to cancel all podcast downloads?"
-#~ msgstr "Esteu segur que voleu cancel·lar totes les baixades dels Podcasts?"
+#~ msgstr "Esteu segur que voleu cancel·lar totes les baixades dels podcasts?"
#~ msgid "Importing Songs from {0}"
#~ msgstr "S'estan important les cançons des de {0}"
@@ -8163,9 +8375,6 @@ msgstr "Podcast desconegut"
#~ "No s'ha pogut trobar un codificador adient per convertir les cançons "
#~ "seleccionades."
-#~ msgid "Writing a disc"
-#~ msgstr "S'està escrivint un disc"
-
#~ msgid "Writing Disc"
#~ msgstr "S'està escrivint el disc"
@@ -8420,9 +8629,6 @@ msgstr "Podcast desconegut"
#~ msgid "Reading table of contents from CD..."
#~ msgstr "S'està llegint la taula de continguts del CD..."
-#~ msgid "Searching for CD cover art..."
-#~ msgstr "S'està cercant la coberta del CD..."
-
#~ msgid ""
#~ "Cannot search for CD metadata: there is no available Internet connection"
#~ msgstr ""
@@ -8506,8 +8712,8 @@ msgstr "Podcast desconegut"
#~ msgstr ""
#~ "Format per a crear un nom de fitxer de pista dins de la biblioteca. No "
#~ "utilitzeu testimonis o caràcters de camí. Vegeu LibraryFolderPattern. "
-#~ "Testimonis vàlids: %artist%, %album%, %title%, %track_number%, %"
-#~ "track_count%, %track_number_nz% (sense prefix zero), %track_count_nz% "
+#~ "Testimonis vàlids: %artist%, %album%, %title%, %track_number%, "
+#~ "%track_count%, %track_number_nz% (sense prefix zero), %track_count_nz% "
#~ "(sense prefix zero)."
#~ msgid ""
@@ -8519,9 +8725,9 @@ msgstr "Podcast desconegut"
#~ msgstr ""
#~ "Format per a crear una carpeta de pista dins de la biblioteca. No creeu "
#~ "un camí absolut. El camí és relatiu al directori de música del Banshee. "
-#~ "Vegeu LibraryLocation. Testimonis vàlids: %artist%, %album%, %title%, %"
-#~ "track_number%,%track_count%, %track_number_nz% (sense prefix zero), %"
-#~ "track_count_nz% (sense prefix zero), %path_sep% (separador de directoris "
+#~ "Vegeu LibraryLocation. Testimonis vàlids: %artist%, %album%, %title%, "
+#~ "%track_number%,%track_count%, %track_number_nz% (sense prefix zero), "
+#~ "%track_count_nz% (sense prefix zero), %path_sep% (separador de directoris "
#~ "portable (/))."
#~ msgid "Height of the main interface window."
@@ -9156,7 +9362,7 @@ msgstr "Podcast desconegut"
#~ msgstr "Esquema URI no implementat"
#~ msgid "Podcast feed URI scheme is not supported."
-#~ msgstr "L'esquema URI del canal Podcast no està implementat."
+#~ msgstr "L'esquema URI del canal podcast no està implementat."
#
#~ msgid "Unable to load Podcast DB"
@@ -9167,7 +9373,7 @@ msgstr "Podcast desconegut"
#~ msgstr "No s'ha pogut afegir el fitxer a la biblioteca"
#~ msgid "Podcast Feed Update"
-#~ msgstr "Actualització del canal Podcast"
+#~ msgstr "Actualització del canal podcast"
#
#~ msgid "Preparing to update feeds"
@@ -9202,7 +9408,7 @@ msgstr "Podcast desconegut"
#~ "Its name comes from the targeting of audio posts to Apple's iPod® audio "
#~ "player, although podcasts can be listened to directly in {0}."
#~ msgstr ""
-#~ "El Podcasting és un tipus d'àudio bloc on els usuaris es subscriuen a un "
+#~ "El podcasting és un tipus d'àudio bloc on els usuaris es subscriuen a un "
#~ "canal d'espectacles i els seus episodis són baixats i gestionats per ser "
#~ "escoltats quan es troben en desconnexió.\n"
#~ "\n"
@@ -9223,7 +9429,7 @@ msgstr "Podcast desconegut"
#~ msgstr "Cerca podcasts nous"
#~ msgid "Find New Podcasts at PodcastAlley.com"
-#~ msgstr "Cerca nous podcasts a PodcastAlley.com"
+#~ msgstr "Cerca nous podcasts a podcastAlley.com"
#~ msgid "{0} Podcast"
#~ msgid_plural "{0} Podcasts"
@@ -9239,7 +9445,7 @@ msgstr "Podcast desconegut"
#
#~ msgid "Update Podcast"
-#~ msgstr "Actualitza el Podcast"
+#~ msgstr "Actualitza el podcast"
#
#~ msgid "Remove Episodes(s)"
@@ -9250,15 +9456,15 @@ msgstr "Podcast desconegut"
#
#~ msgid "Podcast date column"
-#~ msgstr "Columna data Podcast"
+#~ msgstr "Columna data podcast"
#
#~ msgid "Podcast feed column"
-#~ msgstr "Columna canal Podcast"
+#~ msgstr "Columna canal podcast"
#
#~ msgid "Podcast library location"
-#~ msgstr "Ubicació de la biblioteca Podcast"
+#~ msgstr "Ubicació de la biblioteca podcast"
#
#~ msgid "Podcast title column"
@@ -9670,9 +9876,6 @@ msgstr "Podcast desconegut"
#~ msgid "Burnproof"
#~ msgstr "Verificació d'enregistrament"
-#~ msgid "Encoding Profile:"
-#~ msgstr "Perfil de codificació:"
-
#~ msgid "Engine:"
#~ msgstr "Motor:"
@@ -9689,9 +9892,6 @@ msgstr "Podcast desconegut"
#~ msgid "Could not send seek event to cdparanoia"
#~ msgstr "No s'ha pogut enviar l'esdeveniment de posicionament al cdparanoia"
-#~ msgid "Could not get track start position"
-#~ msgstr "No s'ha pogut obtenir la posició d'inici de la pista"
-
#
#~ msgid "Could not find or create the 'playbin' GStreamer plugin"
#~ msgstr "No s'ha trobat o creat el connector 'playbin' del GStreamer"
diff --git a/po/cs.po b/po/cs.po
index e814b22..e4d0b68 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -11,8 +11,8 @@ msgstr ""
"Project-Id-Version: banshee\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=banshee&component=general\n"
-"POT-Creation-Date: 2010-10-26 23:30+0000\n"
-"PO-Revision-Date: 2010-10-29 14:01+0200\n"
+"POT-Creation-Date: 2010-11-14 08:36+0000\n"
+"PO-Revision-Date: 2010-11-17 08:08+0100\n"
"Last-Translator: Marek Černocký <marek at manet.cz>\n"
"Language-Team: Czech <gnome-cs-list at gnome.org>\n"
"MIME-Version: 1.0\n"
@@ -750,7 +750,7 @@ msgstr "Windows Media Audio"
#: ../data/desktop-files/common.desktop.in.h:1
#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:76
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:105
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:107
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs:206
#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:60
msgid "Banshee Media Player"
@@ -850,11 +850,11 @@ msgstr "Vypálit na CD…"
msgid "Write selected tracks to an audio CD"
msgstr "Zapsat vybrané skladby na hudební CD"
-#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:104
+#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:105
msgid "Could not write CD"
msgstr "CD nelze vypálit"
-#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:105
+#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:106
msgid "Brasero could not be started"
msgstr "Nelze spustit aplikaci Brasero"
@@ -875,7 +875,7 @@ msgid "Could not create BPM detection driver."
msgstr "Nelze vytvořit ovladač na zjišťování BPM."
#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:82
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:766
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:771
msgid "Enable _gapless playback"
msgstr "Zapnout přehrávání bez _mezer"
@@ -888,19 +888,19 @@ msgstr ""
"koncepční alba a klasickou hudbu"
#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:150
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:187
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:192
msgid "Could not initialize GStreamer library"
msgstr "Nelze inicializovat knihovnu GStreamer"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:430
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:435
msgid "Unknown Error"
msgstr "Neznámá chyba"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:760
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:765
msgid "_Enable ReplayGain correction"
msgstr "_Zapnout korekci hlasitosti ReplayGain"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:761
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:766
msgid ""
"For tracks that have ReplayGain data, automatically scale (normalize) "
"playback volume"
@@ -908,7 +908,7 @@ msgstr ""
"Pro stopy, které mají data ReplayGain, automaticky změnit (normalizovat) "
"hlasitost přehrávání."
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:767
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:772
msgid ""
"Eliminate the small playback gap on track change. Useful for concept albums "
"and classical music."
@@ -930,67 +930,67 @@ msgid "_Close"
msgstr "_Zavřít"
#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs:92
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:249
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:251
#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:79
#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:133
msgid "Close"
msgstr "Zavřít"
-#: ../src/Clients/Booter/Booter/Entry.cs:148
+#: ../src/Clients/Booter/Booter/Entry.cs:152
msgid "Help Options"
msgstr "Možnosti nápovědy"
-#: ../src/Clients/Booter/Booter/Entry.cs:149
+#: ../src/Clients/Booter/Booter/Entry.cs:153
msgid "Show this help"
msgstr "Zobrazit tuto nápovědu"
-#: ../src/Clients/Booter/Booter/Entry.cs:150
+#: ../src/Clients/Booter/Booter/Entry.cs:154
msgid "Show options for controlling playback"
msgstr "Zobrazit volby pro ovládání přehrávání"
-#: ../src/Clients/Booter/Booter/Entry.cs:151
+#: ../src/Clients/Booter/Booter/Entry.cs:155
msgid "Show options for querying the playing track"
msgstr "Zobrazit volby pro dotazování přehrávaných skladeb"
-#: ../src/Clients/Booter/Booter/Entry.cs:152
+#: ../src/Clients/Booter/Booter/Entry.cs:156
msgid "Show options for querying the playing engine"
msgstr "Zobrazit volby pro dotazování nástroje pro přehrávání"
-#: ../src/Clients/Booter/Booter/Entry.cs:153
+#: ../src/Clients/Booter/Booter/Entry.cs:157
msgid "Show options for the user interface"
msgstr "Zobrazit volby pro uživatelské rozhraní"
-#: ../src/Clients/Booter/Booter/Entry.cs:154
+#: ../src/Clients/Booter/Booter/Entry.cs:158
msgid "Show options for developers and debugging"
msgstr "Zobrazit volby pro vývojáře a ladění"
-#: ../src/Clients/Booter/Booter/Entry.cs:155
+#: ../src/Clients/Booter/Booter/Entry.cs:159
msgid "Show all option groups"
msgstr "Zobrazit všechny skupiny voleb"
-#: ../src/Clients/Booter/Booter/Entry.cs:156
+#: ../src/Clients/Booter/Booter/Entry.cs:160
msgid "Show version information"
msgstr "Zobrazit informace o verzi"
-#: ../src/Clients/Booter/Booter/Entry.cs:159
+#: ../src/Clients/Booter/Booter/Entry.cs:163
msgid "Playback Control Options"
msgstr "Volby ovládání přehrávání"
-#: ../src/Clients/Booter/Booter/Entry.cs:160
+#: ../src/Clients/Booter/Booter/Entry.cs:164
msgid ""
"Play the next track, optionally restarting if the 'restart' value is set"
msgstr ""
"Přehrát následující skladbu, volitelně restartovat, pokud je nastavena "
"hodnota „restart“"
-#: ../src/Clients/Booter/Booter/Entry.cs:161
+#: ../src/Clients/Booter/Booter/Entry.cs:165
msgid ""
"Play the previous track, optionally restarting if the 'restart value is set"
msgstr ""
"Přehrát předchozí skladbu, volitelně restartovat, pokud je nastavena hodnota "
"„restart“"
-#: ../src/Clients/Booter/Booter/Entry.cs:162
+#: ../src/Clients/Booter/Booter/Entry.cs:166
msgid ""
"If the current song has been played longer than 4 seconds then restart it, "
"otherwise the same as --previous"
@@ -998,29 +998,29 @@ msgstr ""
"Pokud se současná skladba přehrává déle než 4 sekundy, tak se spustí znovu "
"od začátku, jinak má stejnou funkci jak --previous"
-#: ../src/Clients/Booter/Booter/Entry.cs:163
+#: ../src/Clients/Booter/Booter/Entry.cs:167
msgid "Automatically start playing any tracks enqueued on the command line"
msgstr ""
"Automaticky začít přehrávat všechny skladby zařazené ve frontě v příkazové "
"řádce"
-#: ../src/Clients/Booter/Booter/Entry.cs:164
+#: ../src/Clients/Booter/Booter/Entry.cs:168
msgid "Start playback"
msgstr "Začít přehrávání"
-#: ../src/Clients/Booter/Booter/Entry.cs:165
+#: ../src/Clients/Booter/Booter/Entry.cs:169
msgid "Pause playback"
msgstr "Pozastavit přehrávání"
-#: ../src/Clients/Booter/Booter/Entry.cs:166
+#: ../src/Clients/Booter/Booter/Entry.cs:170
msgid "Toggle playback"
msgstr "Přepnout přehrávání"
-#: ../src/Clients/Booter/Booter/Entry.cs:167
+#: ../src/Clients/Booter/Booter/Entry.cs:171
msgid "Completely stop playback"
msgstr "Úplně zastavit přehrávání"
-#: ../src/Clients/Booter/Booter/Entry.cs:169
+#: ../src/Clients/Booter/Booter/Entry.cs:173
msgid ""
"Enable or disable playback stopping after the currently playing track (value "
"should be either 'true' or 'false')"
@@ -1028,100 +1028,100 @@ msgstr ""
"Povolit nebo zakázat zastavení přehrávání po právě hrané stopě (hodnota by "
"měla být „true“ nebo „false“)"
-#: ../src/Clients/Booter/Booter/Entry.cs:170
+#: ../src/Clients/Booter/Booter/Entry.cs:174
msgid "Set the playback volume (0-100), prefix with +/- for relative values"
msgstr ""
"Nastavit hlasitost přehrávání (0 - 100), relativní hodnoty zadejte pomocí "
"znaménka +/- před číslem"
-#: ../src/Clients/Booter/Booter/Entry.cs:171
+#: ../src/Clients/Booter/Booter/Entry.cs:175
msgid "Seek to a specific point (seconds, float)"
msgstr "Přesun na zadanou pozici (v sekundách, desetinné číslo)"
-#: ../src/Clients/Booter/Booter/Entry.cs:172
+#: ../src/Clients/Booter/Booter/Entry.cs:176
msgid "Set the currently played track's rating (0 to 5)"
msgstr "Nastavit hodnocení právě přehrávané stopy (0 až 5)"
-#: ../src/Clients/Booter/Booter/Entry.cs:175
+#: ../src/Clients/Booter/Booter/Entry.cs:179
msgid "Player Engine Query Options"
msgstr "Volby dotazování přehrávacího jádra"
-#: ../src/Clients/Booter/Booter/Entry.cs:176
+#: ../src/Clients/Booter/Booter/Entry.cs:180
msgid "Current player state"
msgstr "Aktuální stav přehrávače"
-#: ../src/Clients/Booter/Booter/Entry.cs:177
+#: ../src/Clients/Booter/Booter/Entry.cs:181
msgid "Last player state"
msgstr "Poslední stav přehrávače"
-#: ../src/Clients/Booter/Booter/Entry.cs:178
+#: ../src/Clients/Booter/Booter/Entry.cs:182
msgid "Query whether the player can be paused"
msgstr "Zeptat se, jestli může být přehrávač pozastaven"
-#: ../src/Clients/Booter/Booter/Entry.cs:179
+#: ../src/Clients/Booter/Booter/Entry.cs:183
msgid "Query whether the player can seek"
msgstr "Zeptat se, jestli může přehrávač přeskakovat"
-#: ../src/Clients/Booter/Booter/Entry.cs:180
+#: ../src/Clients/Booter/Booter/Entry.cs:184
msgid "Player volume"
msgstr "Hlasitost přehrávače"
-#: ../src/Clients/Booter/Booter/Entry.cs:181
+#: ../src/Clients/Booter/Booter/Entry.cs:185
msgid "Player position in currently playing track"
msgstr "Pozice přehrávače v právě přehrávané stopě"
-#: ../src/Clients/Booter/Booter/Entry.cs:184
+#: ../src/Clients/Booter/Booter/Entry.cs:188
msgid "Playing Track Metadata Query Options"
msgstr "Volby dotazování na metadata přehrávané stopy"
-#: ../src/Clients/Booter/Booter/Entry.cs:185
+#: ../src/Clients/Booter/Booter/Entry.cs:189
msgid "URI"
msgstr "URI"
-#: ../src/Clients/Booter/Booter/Entry.cs:186
+#: ../src/Clients/Booter/Booter/Entry.cs:190
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:138
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:89
msgid "Artist Name"
msgstr "Jméno umělce"
-#: ../src/Clients/Booter/Booter/Entry.cs:187
+#: ../src/Clients/Booter/Booter/Entry.cs:191
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:140
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:90
msgid "Album Title"
msgstr "Název alba"
-#: ../src/Clients/Booter/Booter/Entry.cs:188
+#: ../src/Clients/Booter/Booter/Entry.cs:192
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:137
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:88
msgid "Track Title"
msgstr "Název skladby"
-#: ../src/Clients/Booter/Booter/Entry.cs:189
+#: ../src/Clients/Booter/Booter/Entry.cs:193
msgid "Duration"
msgstr "Délka"
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:190
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:117
+#: ../src/Clients/Booter/Booter/Entry.cs:194
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:116
msgid "Track Number"
msgstr "Číslo stopy"
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:191
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:126
+#: ../src/Clients/Booter/Booter/Entry.cs:195
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:125
msgid "Track Count"
msgstr "Počet stop"
-#: ../src/Clients/Booter/Booter/Entry.cs:192
+#: ../src/Clients/Booter/Booter/Entry.cs:196
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:149
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:114
msgid "Disc Number"
msgstr "Číslo disku"
-#: ../src/Clients/Booter/Booter/Entry.cs:193
+#: ../src/Clients/Booter/Booter/Entry.cs:197
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:142
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:113
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:177
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:176
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:78
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:132
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:77
@@ -1129,86 +1129,86 @@ msgstr "Číslo disku"
msgid "Year"
msgstr "Rok"
-#: ../src/Clients/Booter/Booter/Entry.cs:194
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:230
+#: ../src/Clients/Booter/Booter/Entry.cs:198
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:229
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:131
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:60
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:96
msgid "Rating"
msgstr "Hodnocení"
-#: ../src/Clients/Booter/Booter/Entry.cs:195
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:322
+#: ../src/Clients/Booter/Booter/Entry.cs:199
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:321
msgid "Score"
msgstr "Bodování"
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:196
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:143
+#: ../src/Clients/Booter/Booter/Entry.cs:200
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:142
msgid "Bit Rate"
msgstr "Datový tok"
-#: ../src/Clients/Booter/Booter/Entry.cs:199
+#: ../src/Clients/Booter/Booter/Entry.cs:203
msgid "User Interface Options"
msgstr "Volby uživatelského rozhraní"
-#: ../src/Clients/Booter/Booter/Entry.cs:200
+#: ../src/Clients/Booter/Booter/Entry.cs:204
msgid "Present the user interface on the active workspace"
msgstr "Zobrazit uživatelské rozhraní na aktivní pracovní ploše"
-#: ../src/Clients/Booter/Booter/Entry.cs:201
+#: ../src/Clients/Booter/Booter/Entry.cs:205
msgid "Enter the full-screen mode"
msgstr "Vstoupit do režimu celé obrazovky"
-#: ../src/Clients/Booter/Booter/Entry.cs:202
+#: ../src/Clients/Booter/Booter/Entry.cs:206
msgid "Hide the user interface"
msgstr "Skrýt uživatelské rozhraní"
-#: ../src/Clients/Booter/Booter/Entry.cs:203
+#: ../src/Clients/Booter/Booter/Entry.cs:207
msgid "Do not present the user interface, regardless of any other options"
msgstr "Nezobrazovat uživatelské rozhraní, bez ohledu na jakékoliv další volby"
-#: ../src/Clients/Booter/Booter/Entry.cs:204
+#: ../src/Clients/Booter/Booter/Entry.cs:208
msgid "Present the import media dialog box"
msgstr "Zobrazit dialogové okno importu médií"
-#: ../src/Clients/Booter/Booter/Entry.cs:205
+#: ../src/Clients/Booter/Booter/Entry.cs:209
msgid "Present the about dialog"
msgstr "Zobrazit dialogové okno o aplikaci"
-#: ../src/Clients/Booter/Booter/Entry.cs:206
+#: ../src/Clients/Booter/Booter/Entry.cs:210
msgid "Present the open location dialog"
msgstr "Zobrazit dialogové okno otevření umístění"
-#: ../src/Clients/Booter/Booter/Entry.cs:207
+#: ../src/Clients/Booter/Booter/Entry.cs:211
msgid "Present the preferences dialog"
msgstr "Zobrazit dialogové okno předvoleb"
-#: ../src/Clients/Booter/Booter/Entry.cs:210
+#: ../src/Clients/Booter/Booter/Entry.cs:214
msgid "Debugging and Development Options"
msgstr "Volby ladění a vývoje"
-#: ../src/Clients/Booter/Booter/Entry.cs:211
+#: ../src/Clients/Booter/Booter/Entry.cs:215
msgid "Enable general debugging features"
msgstr "Zapnout obecné ladicí funkce"
-#: ../src/Clients/Booter/Booter/Entry.cs:212
+#: ../src/Clients/Booter/Booter/Entry.cs:216
msgid "Enable debugging output of SQL queries"
msgstr "Zapnout ladicí výstup SQL dotazů"
-#: ../src/Clients/Booter/Booter/Entry.cs:213
+#: ../src/Clients/Booter/Booter/Entry.cs:217
msgid "Enable debugging output of Mono.Addins"
msgstr "Zapnout ladicí výstup Mono.Addins"
-#: ../src/Clients/Booter/Booter/Entry.cs:214
+#: ../src/Clients/Booter/Booter/Entry.cs:218
msgid "Specify an alternate database to use"
msgstr "Určit alternativní databázi, která se má použít"
-#: ../src/Clients/Booter/Booter/Entry.cs:215
+#: ../src/Clients/Booter/Booter/Entry.cs:219
msgid "Specify an alternate key, default is /apps/banshee-1/"
msgstr "Určit alternativní klíč, výchozí je /apps/banshee-1/"
-#: ../src/Clients/Booter/Booter/Entry.cs:216
+#: ../src/Clients/Booter/Booter/Entry.cs:220
msgid ""
"Optimize instance for running uninstalled; most notably, this will create an "
"alternate Mono.Addins database in the working directory"
@@ -1216,16 +1216,16 @@ msgstr ""
"Přizpůsobit instanci pro běh bez instalace; tímto se především vytvoří "
"alternativní databáze Mono.Addins v pracovním adresáři"
-#: ../src/Clients/Booter/Booter/Entry.cs:218
+#: ../src/Clients/Booter/Booter/Entry.cs:222
msgid "Disable DBus support completely"
msgstr "Úplně zakázat podporu DBus"
-#: ../src/Clients/Booter/Booter/Entry.cs:220
+#: ../src/Clients/Booter/Booter/Entry.cs:224
#, csharp-format
msgid "Skip loading a custom gtkrc file ({0}) if it exists"
msgstr "Přeskočit načítání souboru gtkrc ({0}), pokud existuje"
-#: ../src/Clients/Booter/Booter/Entry.cs:251
+#: ../src/Clients/Booter/Booter/Entry.cs:255
#, csharp-format
msgid "The following help arguments are invalid: {0}"
msgstr "Následující pomocné argumenty jsou neplatné: {0}"
@@ -1241,7 +1241,7 @@ msgstr "_Zařadit do fronty"
#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:86
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:66
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:196
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:86
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:126
msgid "_Play"
msgstr "_Přehrát"
@@ -1271,7 +1271,7 @@ msgid "Play Song"
msgstr "Přehrát skladbu"
#. Translators: this is a verb (command), not a noun (things)
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:457
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:459
msgid "Search"
msgstr "Hledat"
@@ -1284,21 +1284,21 @@ msgstr "Umělec, album nebo název"
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:139
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:72
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:78
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:82
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:81
msgid "Album Artist"
msgstr "Umělec alba"
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:141
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:98
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:185
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:364
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:184
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:363
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:91
msgid "Genre"
msgstr "Žánr"
#. Translators: noun
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:143
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:214
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:213
msgid "Comment"
msgstr "Poznámka"
@@ -1331,7 +1331,7 @@ msgid "Stream location not found"
msgstr "Umístění proudu nebylo nalezeno"
#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:324
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:328
msgid "File not found"
msgstr "Soubor nenalezen"
@@ -1392,17 +1392,17 @@ msgstr "_Přejít na přehrávanou položku"
#. Translators: This is used to generate bookmark names. {0} is track title, {1} is minutes
#. (possibly more than two digits) and {2} is seconds (between 00 and 60).
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/Bookmark.cs:173
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/Bookmark.cs:172
#, csharp-format
msgid "{0} ({1}:{2:00})"
msgstr "{0} ({1}:{2:00})"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs:70
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs:69
#, csharp-format
msgid "All Albums ({0})"
msgstr "Všechna alba ({0})"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistListModel.cs:69
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistListModel.cs:68
#, csharp-format
msgid "All Artists ({0})"
msgstr "Všichni umělci ({0})"
@@ -1412,15 +1412,15 @@ msgstr "Všichni umělci ({0})"
msgid "Value"
msgstr "Hodnota"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:50
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:49
msgid "Shuffle by A_lbum"
msgstr "Zamíchat podle a_lba"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:51
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:50
msgid "by album"
msgstr "podle alba"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:52
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:51
msgid "Play all songs from an album, then randomly choose another album"
msgstr ""
"Přehrát všechny skladby z jednoho alba a potom náhodně vybrat jiné album"
@@ -1439,27 +1439,27 @@ msgstr ""
"Přehrát všechny skladby od jednoho umělce a potom náhodně vybrat jiného "
"umělce"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:36
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:38
msgid "Shuffle _Off"
msgstr "Vypn_out náhodné pořadí"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:37
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:39
msgid "manually"
msgstr "ručně"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:38
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:40
msgid "Do not shuffle playlist"
msgstr "Nehrát seznam skladeb v náhodném pořadí"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:46
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:45
msgid "Shuffle by _Rating"
msgstr "Zamíchat podle _hodnocení"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:47
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:46
msgid "by rating"
msgstr "podle hodnocení"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:48
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:47
msgid "Play songs randomly, prefer higher rated songs"
msgstr ""
"Přehrát skladby ze seznamu náhodně, upřednostnit lépe hodnocené skladby"
@@ -1476,15 +1476,15 @@ msgstr "podle bodování"
msgid "Play songs randomly, prefer higher scored songs"
msgstr "Přehrát skladby ze seznamu náhodně, upřednostnit lépe bodované skladby"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:47
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:46
msgid "Shuffle by _Song"
msgstr "Zamíchat podle _skladeb"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:48
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:47
msgid "by song"
msgstr "podle skladby"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:49
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:48
msgid "Play songs randomly from the playlist"
msgstr "Přehrát skladby ze seznamu náhodně"
@@ -1493,7 +1493,7 @@ msgid "Scanning for media"
msgstr "Vyhledávají se média"
#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:188
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1382
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1384
msgid "Scanning..."
msgstr "Prohledává se…"
@@ -1518,23 +1518,23 @@ msgstr "Právě probíhá import. Chcete jej zastavit?"
msgid "Importing {0} of {1}"
msgstr "Importuje se {0} z {1}"
-#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:79
+#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:78
#, csharp-format
msgid "Rescanning {0} of {1}"
msgstr "Opětovné prohledávání {0} z {1}"
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:234
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:232
msgid "Upgrading your Banshee Database"
msgstr "Vaše databáze Banshee se převádí na novější verzi"
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:235
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:233
msgid ""
"Please wait while your old Banshee database is migrated to the new format."
msgstr ""
"Vyčkejte prosím, dokud nebude vaše stará databáze Banshee převedena do "
"nového formátu."
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1379
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1381
msgid "Refreshing Metadata"
msgstr "Obnovování metadat"
@@ -1606,10 +1606,6 @@ msgstr "Měkký Rock"
msgid "Techno"
msgstr "Techno"
-#: ../src/Core/Banshee.Services/Banshee.Library/HomeDirectoryImportSource.cs:48
-msgid "Home Folder"
-msgstr "Domovská složka"
-
#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:58
msgid "Remove From Library"
msgstr "Odstranit z knihovny"
@@ -1629,18 +1625,18 @@ msgid "Album Artist Initial"
msgstr "Iniciály umělce alba"
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:88
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:199
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:198
msgid "Conductor"
msgstr "Dirigent"
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:93
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:192
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:191
msgid "Composer"
msgstr "Skladatel"
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:103
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:92
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:360
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:91
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:359
msgid "Album"
msgstr "Album"
@@ -1673,13 +1669,13 @@ msgid "Number (unsorted)"
msgstr "Číslo (neseřazeno)"
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:143
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:108
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:107
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:108
msgid "Disc Count"
msgstr "Počet disků"
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:155
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:206
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:205
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:120
msgid "Grouping"
msgstr "Seskupení"
@@ -1713,8 +1709,6 @@ msgstr[1] "{0} skladby"
msgstr[2] "{0} skladeb"
#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:113
-#| msgid "Audio Folder"
-#| msgid_plural "Audio Folders"
msgid "Music Folder"
msgstr "Složka s hudbou"
@@ -1824,8 +1818,6 @@ msgstr[1] "{0} videa"
msgstr[2] "{0} videí"
#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:90
-#| msgid "Video Folder"
-#| msgid_plural "Video Folders"
msgid "Videos Folder"
msgstr "Složka s videem"
@@ -1952,33 +1944,33 @@ msgstr ""
"Některé funkce vyžadují rychlé připojení k internetu, např. Last.fm nebo "
"stahování přebalů"
-#: ../src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:160
+#: ../src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:159
msgid "Search this playlist"
msgstr "Prohledat tento seznam skladeb"
-#: ../src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:229
+#: ../src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:228
msgid "The track's rating was set differently on the device and in Banshee"
msgstr "Hodnocení stopy je jinak nastavené v zařízení a jinak v Banshee"
-#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:59
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:309
+#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:58
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:308
msgid "Playlist"
msgstr "Seznam skladeb"
-#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:134
+#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:133
msgid "Remove From Playlist"
msgstr "Odstranit ze seznamu skladeb"
-#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:135
+#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:134
msgid "Delete Playlist"
msgstr "Vymazat seznam skladeb"
#. TODO generate name based on the track selection, or begin editing it
-#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:386
-#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:392
+#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:385
+#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:391
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:95
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:394
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:452
#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:542
#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214
msgid "New Playlist"
@@ -2026,237 +2018,237 @@ msgstr "Pravidla souborů"
msgid "Co_py files to media folders when importing"
msgstr "Při importu ko_pírovat soubory do složek médií"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:63
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:62
msgid "items"
msgstr "položky"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:64
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:63
#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:60
msgid "minutes"
msgstr "minuty"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:65
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:64
#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:61
msgid "hours"
msgstr "hodiny"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:66
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:65
#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs:63
msgid "MB"
msgstr "MB"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:67
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:66
#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs:64
msgid "GB"
msgstr "GB"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:74
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:361
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:73
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:360
msgid "Artist"
msgstr "Umělec"
#. Translators: These are unique search aliases for "artist". You can use CSV for synonyms. Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:76
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:75
msgid "artist"
msgstr "umelec"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:76
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:75
msgid "by"
msgstr "od"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:76
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:75
msgid "artists"
msgstr "umělci"
#. Translators: These are unique search aliases for "album artist". You can use CSV for synonyms. Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:84
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:83
msgid "albumartist"
msgstr "umelec_alba"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:84
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:83
msgid "compilationartist"
msgstr "uměleckompilace"
#. Translators: These are unique search aliases for "album". You can use CSV for synonyms. Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:94
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:93
msgid "album"
msgstr "album"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:94
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:93
msgid "on"
msgstr "na"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:94
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:93
msgid "from"
msgstr "z"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:100
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:99
msgid "Disc"
msgstr "Disk"
#. Translators: These are unique search fields (and nouns). You can use CSV for synonyms. Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:102
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:101
msgid "disc"
msgstr "disk"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:102
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:101
msgid "cd"
msgstr "cd"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:102
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:101
msgid "discnum"
msgstr "cislo_disku"
#. Translators: These are unique search fields (and nouns). You can use CSV for synonyms. Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:110
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:109
msgid "discs"
msgstr "disku"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:110
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:109
msgid "cds"
msgstr "pocet_cd"
#. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:119
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:118
msgid "track"
msgstr "stopa"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:119
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:118
msgid "trackno"
msgstr "stopa_cislo"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:119
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:118
msgid "tracknum"
msgstr "cislo_stopy"
#. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:128
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:127
msgid "tracks"
msgstr "stop"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:128
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:127
msgid "trackcount"
msgstr "pocet_stop"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:134
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:133
msgid "Beats per Minute"
msgstr "Úderů za minutu"
#. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:136
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:135
msgid "bpm"
msgstr "uzm"
#. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:145
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:144
msgid "bitrate"
msgstr "datovy_tok"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:145
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:144
msgid "kbs"
msgstr "kb/s"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:145
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:144
msgid "kps"
msgstr "kps"
#. Translators: noun
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:152
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:151
msgid "Sample Rate"
msgstr "Vzorkovací frekvence"
#. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:154
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:153
msgid "samplerate"
msgstr "vzorkovaci_frekvence"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:154
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:153
msgid "Hz"
msgstr "Hz"
#. Translators: noun
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:161
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:160
msgid "Bits Per Sample"
msgstr "Bitů na vzorek"
#. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:163
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:162
msgid "bitspersample"
msgstr "bitu_na_vzorek"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:163
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:162
msgid "bitdepth"
msgstr "bitova_hloubka"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:163
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:162
msgid "quantization"
msgstr "kvantovani"
#. Translators: noun
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:169
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:363
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:168
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:362
#: ../src/Core/Banshee.Services/Banshee.Sources/Source.cs:666
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:89
msgid "Name"
msgstr "Název"
#. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:171
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:170
msgid "title"
msgstr "nazev"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:171
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:170
msgid "titled"
msgstr "nazvano"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:171
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:170
msgid "name"
msgstr "nazev"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:171
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:170
msgid "named"
msgstr "pojmenovano"
#. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:179
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:178
msgid "year"
msgstr "rok"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:179
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:178
msgid "released"
msgstr "vydano"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:179
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:178
msgid "yr"
msgstr "roku"
#. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:187
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:186
msgid "genre"
msgstr "zanr"
#. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:194
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:193
msgid "composer"
msgstr "skladatel"
#. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:201
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:200
msgid "conductor"
msgstr "dirigent"
#. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:208
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:207
msgid "grouping"
msgstr "seskupeni"
#. Translators: These are unique search fields (and nouns). You can use CSV for synonyms. Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:216
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:215
msgid "comment"
msgstr "poznamka"
#. Translators: noun
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:222
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:221
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:135
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:71
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:72
@@ -2264,262 +2256,262 @@ msgid "License"
msgstr "Licence"
#. Translators: These are unique search fields (and nouns). You can use CSV for synonyms. Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:224
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:223
msgid "license"
msgstr "licence"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:224
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:223
msgid "licensed"
msgstr "licencovano"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:224
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:223
msgid "under"
msgstr "pod"
#. , typeof(NullQueryValue)},
#. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:232
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:231
msgid "rating"
msgstr "hodnoceni"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:232
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:231
msgid "stars"
msgstr "hvezdicek"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:238
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:237
msgid "Play Count"
msgstr "Počet přehrání"
#. Translators: These are unique search fields (and nouns). You can use CSV for synonyms. Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:240
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:239
msgid "plays"
msgstr "prehrani"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:240
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:239
msgid "playcount"
msgstr "pocet_prehrani"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:240
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:239
msgid "listens"
msgstr "poslechu"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:246
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:245
msgid "Skip Count"
msgstr "Počet přeskočení"
#. Translators: These are unique search fields (and nouns). You can use CSV for synonyms. Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:248
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:247
msgid "skips"
msgstr "preskoceni"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:248
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:247
msgid "skipcount"
msgstr "pocet_preskoceni"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:254
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:253
msgid "File Size"
msgstr "Velikost souboru"
#. Translators: These are unique search fields (and nouns). You can use CSV for synonyms. Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:256
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:255
msgid "size"
msgstr "velikost"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:256
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:255
msgid "filesize"
msgstr "velikost_souboru"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:262
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:261
msgid "File Location"
msgstr "Umístění souboru"
#. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:264
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:263
msgid "uri"
msgstr "uri"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:264
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:263
msgid "path"
msgstr "cesta"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:264
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:263
msgid "file"
msgstr "soubor"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:264
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:263
msgid "location"
msgstr "umisteni"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:270
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:269
msgid "Time"
msgstr "Čas"
#. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:272
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:271
msgid "duration"
msgstr "trvani"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:272
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:271
msgid "length"
msgstr "delka"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:272
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:271
msgid "time"
msgstr "cas"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:278
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:277
msgid "Mime Type"
msgstr "Typ MIME"
#. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:280
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:279
msgid "type"
msgstr "typ"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:280
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:279
msgid "mimetype"
msgstr "typ_mime"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:280
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:279
msgid "format"
msgstr "format"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:280
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:279
msgid "ext"
msgstr "pripona"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:286
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:285
msgid "Last Played"
msgstr "Naposledy přehráno"
#. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:288
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:287
msgid "lastplayed"
msgstr "naposledy_prehrano"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:288
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:287
msgid "played"
msgstr "prehrano"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:288
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:287
msgid "playedon"
msgstr "prehrano_na"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:294
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:293
msgid "Last Skipped"
msgstr "Naposledy přeskočeno"
#. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:296
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:295
msgid "lastskipped"
msgstr "naposledy_preskoceno"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:296
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:295
msgid "skipped"
msgstr "preskoceno"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:296
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:295
msgid "skippedon"
msgstr "preskoceno_na"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:302
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:301
msgid "Date Added"
msgstr "Datum přidání"
#. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:304
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:303
msgid "added"
msgstr "pridano"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:304
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:303
msgid "imported"
msgstr "importovano"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:304
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:303
msgid "addedon"
msgstr "pridano_na"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:304
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:303
msgid "dateadded"
msgstr "datum_pridani"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:304
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:303
msgid "importedon"
msgstr "importovano_na"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:315
-#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:66
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:314
+#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:65
msgid "Smart Playlist"
msgstr "Chytrý seznam skladeb"
#. Translators: These are unique search fields (and nouns). You can use CSV for synonyms. Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:324
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:323
msgid "score"
msgstr "bodovani"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:330
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:329
msgid "Playback Error"
msgstr "Chyba přehrávání"
#. Translators: These are unique search fields (and nouns). Please, no spaces. Blank ok.
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:332
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:331
msgid "playbackerror"
msgstr "chyba_prehravani"
#. Translators: noun
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:349
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:348
msgid "BPM"
msgstr "BPM"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:350
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:349
msgid "Skips"
msgstr "Přeskočení"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:351
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:350
msgid "Plays"
msgstr "Přehrání"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:356
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:355
msgid "Random"
msgstr "Náhodně"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:366
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:365
msgid "Highest Rating"
msgstr "Nejvyšší hodnocení"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:367
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:366
msgid "Lowest Rating"
msgstr "Nejnižší hodnocení"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:369
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:368
msgid "Highest Score"
msgstr "Nejvyšší bodování"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:370
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:369
msgid "Lowest Score"
msgstr "Nejnižší bodování"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:372
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:371
msgid "Most Often Played"
msgstr "Nejvíce přehrávaná"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:373
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:372
msgid "Least Often Played"
msgstr "Nejméně přehrávaná"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:375
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:374
msgid "Most Recently Played"
msgstr "Naposledy přehráno"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:376
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:375
msgid "Least Recently Played"
msgstr "Přehráno před nejdelší dobou"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:378
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:377
msgid "Most Recently Added"
msgstr "Naposledy přidáno"
-#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:379
+#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:378
msgid "Least Recently Added"
msgstr "Přidáno před nejdelší dobou"
@@ -2582,7 +2574,7 @@ msgstr "drm"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:208
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:210
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:212
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:383
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:389
msgid "Unknown"
msgstr "Neznámý"
@@ -2590,26 +2582,26 @@ msgstr "Neznámý"
msgid "unknown"
msgstr "neznama"
-#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/Migrator.cs:79
+#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/Migrator.cs:78
msgid "Unable to Migrate Smart Playlists"
msgstr "Nelze převést chytré seznamy skladeb"
-#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/Migrator.cs:80
+#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/Migrator.cs:79
#, csharp-format
msgid "Please file a bug with this error: {0}"
msgstr "Nahlaste prosím tuto chybu: {0}"
-#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:67
+#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:66
#: ../src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/Editor.cs:49
msgid "Edit Smart Playlist"
msgstr "Upravit chytrý seznam skladeb"
-#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:242
+#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:241
msgid "Delete Smart Playlist"
msgstr "Odstranit chytrý seznam skladeb"
#: ../src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs:147
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:163
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:161
#, csharp-format
msgid "All Genres ({0})"
msgstr "Všechny žánry ({0})"
@@ -2658,7 +2650,7 @@ msgid "Close Error Report"
msgstr "Zavřít hlášení chyb"
#: ../src/Core/Banshee.Services/Banshee.Sources/ErrorSource.cs:83
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:226
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:224
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ErrorListDialog.cs:46
msgid "Error"
msgstr "Chyba"
@@ -2694,12 +2686,12 @@ msgstr "Hie_rarchie složek"
msgid "File _name"
msgstr "Ná_zev souboru"
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:693
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:669
#, csharp-format
msgid "Adding {0} of {1} to {2}"
msgstr "Přidává se {0} z {1} do {2}"
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:712
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:688
#, csharp-format
msgid "Deleting {0} of {1} From {2}"
msgstr "Odstraňuje se {0} z {1} z {2}"
@@ -2725,12 +2717,10 @@ msgstr[2] "{0} položek"
#. AddSource (music_library = new MusicLibrarySource (), true);
#. AddSource (video_library = new VideoLibrarySource (), false);
#: ../src/Core/Banshee.Services/Banshee.Sources/SourceManager.cs:84
-#| msgid "Library"
msgid "Libraries"
msgstr "Knihovny"
#: ../src/Core/Banshee.Services/Banshee.Sources/SourceManager.cs:85
-#| msgid "Online Sources"
msgid "Online Media"
msgstr "Média on-line"
@@ -2814,19 +2804,19 @@ msgstr ""
msgid "{0} of {1}"
msgstr "{0} z {1}"
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:224
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:222
msgid "Playing"
msgstr "Přehrává se"
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:225
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:223
msgid "Paused"
msgstr "Pozastaveno"
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:227
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:225
msgid "Protected"
msgstr "Chráněno"
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:228
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:226
msgid "External Document"
msgstr "Externí dokument"
@@ -2920,19 +2910,19 @@ msgstr "Nová předvolba"
msgid "{0} by {1}"
msgstr "{0} od {1}"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:87
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:86
msgid "_Bookmarks"
msgstr "_Záložky"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:90
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:89
msgid "_Add Bookmark"
msgstr "_Přidat záložku"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:91
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:90
msgid "Bookmark the Position in the Current Track"
msgstr "Poznamenat pozici v aktuální stopě"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:104
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:103
msgid "_Remove Bookmark"
msgstr "Odst_ranit záložku"
@@ -3006,7 +2996,7 @@ msgid "Make Banshee the Default"
msgstr "Udělat z Banshee výchozí přehrávač"
#. Translators: verb
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/FileChooserDialog.cs:52
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/FileChooserDialog.cs:53
msgid "I_mport"
msgstr "I_mportovat"
@@ -3099,78 +3089,58 @@ msgstr "_Předvolby"
msgid "Modify your personal preferences"
msgstr "Změnit své osobní předvolby"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:83
-msgid "Manage _Extensions"
-msgstr "Spravovat _rozšíření"
-
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:84
-msgid "Manage extensions to add new features to Banshee"
-msgstr "Správa rozšíření, která přidají do Banshee nové funkce"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:88
msgid "_Tools"
msgstr "_Nástroje"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:92
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:88
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:134
msgid "_Help"
msgstr "_Nápověda"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:95
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:91
msgid "_Contents"
msgstr "_Obsah"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:99
-msgid "_Web Resources"
-msgstr "_Webové zdroje"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
-msgid "Banshee _User Guide (Wiki)"
-msgstr "_Uživatelská příručka Banshee (Wiki)"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:103
-msgid "Learn about how to use Banshee"
-msgstr "Naučte se používat Banshee"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:108
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:95
msgid "Advanced Collection Searching"
msgstr "Pokročilé prohledávání sbírky"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:109
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:96
msgid "Learn advanced ways to search your media collection"
msgstr "Naučte se pokročilé způsoby, jak prohledávat svoji sbírku multimédií"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:114
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:101
msgid "Banshee _Home Page"
msgstr "_Domovská stránka Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:115
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
msgid "Visit the Banshee Home Page"
msgstr "Navštivte domovskou stránku Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:120
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
msgid "_Get Involved"
msgstr "_Zapojte se"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:121
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:108
msgid "Become a contributor to Banshee"
msgstr "Přispějte k vývoji Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:126
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
msgid "_Version Information"
msgstr "Informace o _verzi"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:127
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:114
msgid "View detailed version and configuration information"
msgstr "Zobrazit podrobné informace o verzi a nastavení"
#. Prompt user for location of the playlist.
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:184
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:169
msgid "Import Playlist"
msgstr "Importovat seznam skladeb"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:185
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:559
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:170
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:558
msgid "Playlists"
msgstr "Seznamy skladeb"
@@ -3261,7 +3231,7 @@ msgstr "Zopakovat právě přehrávanou skladbu"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackShuffleActions.cs:79
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackShuffleActions.cs:80
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:83
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:84
msgid "Shuffle"
msgstr "Náhodné pořadí"
@@ -3338,7 +3308,7 @@ msgstr "Nový chytrý _seznam skladeb"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:129
#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:84
#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:67
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:78
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:79
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:72
msgid "Refresh"
msgstr "Obnovit"
@@ -3360,134 +3330,134 @@ msgstr "Opravdu chcete smazat tento {0}?"
msgid "Separate by Type"
msgstr "Oddělit podle typu"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:70
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:110
msgid "Select _All"
msgstr "Vybr_at vše"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:71
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:111
msgid "Select all tracks"
msgstr "Vybrat všechny stopy"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:74
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:114
msgid "Select _None"
msgstr "Vybrat _nic"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:75
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:115
msgid "Unselect all tracks"
msgstr "Zrušit označení všech stop"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:78
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:118
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:59
msgid "_Edit Track Information"
msgstr "_Upravit informace o stopě"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:79
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:119
msgid "Edit information on selected tracks"
msgstr "Upravit informace o vybraných skladbách"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:82
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:122
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:252
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:117
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:159
msgid "Properties"
msgstr "Vlastnosti"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:83
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:123
msgid "View information on selected tracks"
msgstr "Zobrazit informace o vybraných stopách"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:87
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:127
msgid "Play the selected item"
msgstr "Přehrát vybranou položku"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:90
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:130
msgid "Add _to Playlist"
msgstr "Přidat _do seznamu skladeb"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:91
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:131
msgid "Append selected items to playlist or create new playlist from selection"
msgstr ""
"Připojit vybrané položky k seznamu skladeb nebo z výběru vytvořit nový "
"seznam skladeb"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:96
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:136
msgid "Create new playlist from selected tracks"
msgstr "Vytvořit chytrý seznam z vybraných stop"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:100
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:140
msgid "_Remove"
msgstr "Odst_ranit"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:101
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:141
msgid "Remove selected track(s) from this source"
msgstr "Odstranit vybranou stopu či stopy z tohoto zdroje"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:104
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:144
msgid "Remove From _Library"
msgstr "Odstranit z _knihovny"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:105
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:145
msgid "Remove selected track(s) from library"
msgstr "Odstranit vybranou stopu či stopy z knihovny"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:108
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:148
msgid "_Open Containing Folder"
msgstr "_Otevřít příslušnou složku"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:109
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:149
msgid "Open the folder that contains the selected item"
msgstr "Otevřít složku, která obsahuje vybrané položky."
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:112
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:152
msgid "_Delete From Drive"
msgstr "_Smazat z disku"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:113
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:153
msgid "Permanently delete selected item(s) from medium"
msgstr "Trvale odstranit vybrané položky z média"
#. Translators: this is a verb (command), not a noun (things)
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:119
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:159
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:170
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:112
#, csharp-format
msgid "_Search"
msgstr "_Hledat"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:120
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:160
msgid "Search for items matching certain criteria"
msgstr "Hledat položky vyhovující určitým kritériím"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:123
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:163
msgid "By Matching _Album"
msgstr "Podle odpovídajícího _alba"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:124
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:164
msgid "Search all songs of this album"
msgstr "Vyhledat všechny skladby z tohoto alba"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:127
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:167
msgid "By Matching A_rtist"
msgstr "Podle odpovídajícího _umělce"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:128
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:168
msgid "Search all songs of this artist"
msgstr "Vyhledat všechny skladby tohoto umělce"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:258
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:312
#, csharp-format
msgid "_Delete From \"{0}\""
msgstr "_Odstranit z „{0}“"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:464
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:532
msgid "The folder could not be found."
msgstr "Složku nelze nalézt."
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:465
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:533
msgid "Please check that the track's location is accessible by the system."
msgstr "Zkontrolujte prosím, zda je umístění stopy dostupné ze systému."
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:535
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:610
#, csharp-format
msgid "Are you sure you want to permanently delete this item?"
msgid_plural ""
@@ -3496,16 +3466,16 @@ msgstr[0] "Opravdu chcete navždy odstranit tuto skladbu?"
msgstr[1] "Opravdu chcete navždy odstranit {0} vybrané skladby?"
msgstr[2] "Opravdu chcete navždy odstranit {0} vybraných skladeb?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:539
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:614
msgid "If you delete the selection, it will be permanently lost."
msgstr "Pokud výběr smažete, bude navždy ztracen."
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:542
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:617
#, csharp-format
msgid "Remove selection from {0}?"
msgstr "Odstranit výběr z {0}?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:545
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:620
#, csharp-format
msgid "Are you sure you want to remove the selected item from your {1}?"
msgid_plural ""
@@ -3798,39 +3768,39 @@ msgstr "Velikost souboru:"
msgid "bytes"
msgstr "bajtů"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:95
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:97
msgid "Track Editor"
msgstr "Editor skladby"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:95
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:97
msgid "Track Properties"
msgstr "Vlastnosti skladby"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:147
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:149
msgid "Show the previous track"
msgstr "Zobrazit předchozí stopu"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:153
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:155
msgid "Show the next track"
msgstr "Zobrazit následující stopu"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:183
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:185
msgid "Title:"
msgstr "Název:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:184
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:186
msgid "Artist:"
msgstr "Umělec:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:185
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:187
msgid "Album:"
msgstr "Album:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:309
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:311
msgid "Sync all field _values"
msgstr "Synchronizovat _hodnoty všech polí"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:314
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:316
msgid ""
"Apply the values of all common fields set for this track to all of the "
"tracks selected in this editor"
@@ -3838,12 +3808,12 @@ msgstr ""
"Aplikovat hodnoty všech společných polí nastavených pro tuto skladbu na "
"všechny skladby vybrané v editoru"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:413
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:416
#, csharp-format
msgid "<i>Editing {0} of {1} items</i>"
msgstr "<i>Upravuje se {0} z {1} položek<i>"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:675
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:678
#, csharp-format
msgid "Save the changes made to the open track?"
msgid_plural "Save the changes made to {0} of {1} open tracks?"
@@ -3851,11 +3821,11 @@ msgstr[0] "Uložit změny provedené v otevřené skladbě?"
msgstr[1] "Uložit změny provedené ve {0} z {1} otevřených skladeb?"
msgstr[2] "Uložit změny provedené ve {0} z {1} otevřených skladeb?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:692
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:695
msgid "Close _without Saving"
msgstr "Zavřít _bez uložení"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:729
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:732
#, csharp-format
msgid "If you don't save, changes from the last {0} will be permanently lost."
msgstr "Pokud změny z posledního {0} neuložíte, budou nenávratně ztraceny."
@@ -4001,10 +3971,9 @@ msgid "Files"
msgstr "Soubory"
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:63
-#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/ImportSource.cs:67
-#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:82
-msgid "C_hoose Files"
-msgstr "Z_volit soubory"
+#| msgid "C_hoose Files"
+msgid "C_hoose Files..."
+msgstr "Z_volit soubory…"
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:81
msgid "_Files to import:"
@@ -4031,8 +4000,9 @@ msgid "Folders"
msgstr "Složky"
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FolderImportSource.cs:57
-msgid "C_hoose Folders"
-msgstr "Z_volit složky"
+#| msgid "C_hoose Folders"
+msgid "C_hoose Folders..."
+msgstr "Z_volit složky…"
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FolderImportSource.cs:75
msgid "_Folders to import:"
@@ -4064,14 +4034,10 @@ msgstr "Toto dialogové okno příště nezobrazovat"
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:130
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:82
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:385
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:384
msgid "_Import"
msgstr "_Importovat"
-#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/PhotoFolderImportSource.cs:69
-msgid "Videos From Photos Folder"
-msgstr "Videa ze složky fotografií"
-
#: ../src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileComboBox.cs:86
msgid "No available profiles"
msgstr "Žádné dostupné profily"
@@ -4301,7 +4267,6 @@ msgstr "{0} přidat, {1} odstranit, {2} aktualizovat"
#. We add it when we get our first dap source, and then remove it when
#. we lose the last one.
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs:63
-#| msgid "Device"
msgid "Devices"
msgstr "Zařízení"
@@ -4317,23 +4282,23 @@ msgstr "Produkt"
msgid "Vendor"
msgstr "Dodavatel"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:280
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:284
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:142
#, csharp-format
msgid "Loading {0}"
msgstr "Probíhá načítání {0}"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:364
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:370
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:37
msgid "Yes"
msgstr "Ano"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:364
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:370
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:38
msgid "No"
msgstr "Žádný"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:385
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:391
#, csharp-format
msgid ""
"The {0} format is not supported by the device, and no converter was found to "
@@ -4342,11 +4307,11 @@ msgstr ""
"Formát {0} není zařízením podporován a nebyl nalezen žádný převodník, který "
"by jej převedl"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:391
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:397
msgid "File format conversion support is not available"
msgstr "Podpora převodu formátu souboru není dostupná"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:417
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:423
msgid "Error converting file"
msgstr "Chyba při převádění souboru"
@@ -4684,6 +4649,11 @@ msgstr "Soubory MP3 na Amazon"
msgid "Amazon MP3 Purchase"
msgstr "Nákup MP3 na Amazon"
+#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/ImportSource.cs:67
+#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:81
+msgid "C_hoose Files"
+msgstr "Z_volit soubory"
+
#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSource.cs:42
#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:39
msgid "Amazon MP3 Store"
@@ -4789,8 +4759,9 @@ msgid "Book Title"
msgstr "Název knihy"
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:68
-msgid "Audiobooks, etc"
-msgstr "Mluvené knihy atd."
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:307
+msgid "Audiobooks"
+msgstr "Mluvené knihy"
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:75
msgid "Search your audiobooks"
@@ -4805,8 +4776,6 @@ msgstr[1] "{0} knihy"
msgstr[2] "{0} knih"
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:149
-#| msgid "Audio Folder"
-#| msgid_plural "Audio Folders"
msgid "Audiobooks Folder"
msgstr "Složka s mluvenými knihami"
@@ -4819,7 +4788,7 @@ msgid "No Bookmark Set"
msgstr "Není nastavena žádná záložka"
#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdDiscModel.cs:76
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:55
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:56
msgid "Audio CD"
msgstr "Hudební CD"
@@ -4893,7 +4862,7 @@ msgstr ""
"jsou např. poškrábaná místa. Výrazně však zpomaluje importování."
#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:320
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:440
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:441
msgid "Import CD"
msgstr "Importovat CD"
@@ -4909,44 +4878,46 @@ msgstr "Duplikovat CD"
msgid "Duplicate this audio CD"
msgstr "Duplikovat toto hudební CD"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:130
-msgid "Searching for CD metadata..."
-msgstr "Hledají se metadata k CD…"
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:131
+#| msgid "Searching for CD metadata..."
+msgid "Searching for track information..."
+msgstr "Hledají se informace o stopě…"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:163
-msgid "Could not fetch metadata for CD."
-msgstr "Nelze získat metadata pro CD."
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:164
+#| msgid "Could not fetch metadata for CD."
+msgid "Could not fetch track information"
+msgstr "Nelze získat informace o stopě"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:191
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:192
msgid "Automatic import off since this album is already in the Music Library."
msgstr "Automaticky vypnout importování, pokud už je album v Hudební knihovně."
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:214
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:215
msgid "Could not import CD"
msgstr "Nelze importovat CD"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:231
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:232
msgid "Could not duplicate audio CD"
msgstr "Nelze duplikovat hudební CD"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:363
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:364
msgid "Ejecting audio CD..."
msgstr "Vysouvá se hudební CD…"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:381
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:382
#, csharp-format
msgid "Could not eject audio CD: {0}"
msgstr "Nelze vysunout hudební CD: {0}"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:414
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:415
msgid "Audio CD Preferences"
msgstr "Předvolby hudebního CD"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:415
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:416
msgid "Eject Disc"
msgstr "Vysunout disk"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:439
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:440
#, csharp-format
msgid "Import ‟{0}”"
msgstr "Importovat „{0}“"
@@ -4977,11 +4948,11 @@ msgstr ""
"Klepejte na toto tlačítko, chcete-li ručně nastavit tempo BMP pro tuto "
"skladbu"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:148
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:147
msgid "_Automatically detect BPM for all songs"
msgstr "_Automaticky rozpoznat tempo BPM všech skladeb"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:149
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:148
msgid ""
"Detect beats per minute (BPM) for all songs that don't already have a value "
"set"
@@ -5163,15 +5134,15 @@ msgstr "Ruší se stahování"
msgid "Waiting for downloads to terminate..."
msgstr "Čeká se na ukončení stahování…"
-#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:60
+#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:59
msgid "Import eMusic Downloads to Library"
msgstr "Importovat stažené z eMusic do knihovny"
-#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:62
+#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:61
msgid "eMusic Files"
msgstr "Soubory eMusic"
-#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:78
+#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:77
msgid "eMusic Tracks"
msgstr "Stopy eMusic"
@@ -5181,7 +5152,7 @@ msgid "File System Queue"
msgstr "Fronta souborového systému"
#: ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs:72
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:93
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:94
msgid "Clear"
msgstr "Vyprázdnit"
@@ -5190,7 +5161,7 @@ msgid "Remove all tracks from the file system queue"
msgstr "Odstranit všechny skladby z fronty souborového systému"
#: ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs:79
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:102
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:103
msgid "Clear on Quit"
msgstr "Vyprázdnit při ukončení"
@@ -5275,18 +5246,35 @@ msgstr ", {0}"
msgid "Fix?"
msgstr "Opravit?"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:48
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:51
msgid "View Item Details"
msgstr "Zobrazit podrobnosti o položce"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:57
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:60
msgid "Open Webpage"
msgstr "Otevřít webovou stránku"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:76
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:79
msgid "Visit Archive.org"
msgstr "Navštívit Archive.org"
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:83
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:61
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:170
+msgid "Subscribe"
+msgstr "Přihlásit se"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:84
+#| msgid "Subscribe to a new podcast"
+msgid "Subscribe to this search as a podcast"
+msgstr "Přihlásit se k tomuto hledání jako k podcastu"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:88
+#, csharp-format
+#| msgid "Internet Archive"
+msgid "Internet Archive: {0}"
+msgstr "Internetový archiv: {0}"
+
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs:78
msgid "Close Item"
msgstr "Zavřít položku"
@@ -5314,7 +5302,7 @@ msgstr "Chyba při získávání podrobností položky z Internetového archivu"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:205
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:130
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:66
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:138
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:136
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:286
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastEpisodePage.cs:89
msgid "Description"
@@ -5531,10 +5519,6 @@ msgstr ""
msgid "Visit the Internet Archive online at archive.org"
msgstr "Navštívit Internetový archiv on-line na archive.org"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:307
-msgid "Audiobooks"
-msgstr "Mluvené knihy"
-
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:308
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:78
msgid "Movies"
@@ -5591,7 +5575,7 @@ msgstr "Získat více"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:128
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:61
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:98
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:137
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:135
msgid "Creator"
msgstr "Tvůrce"
@@ -5817,11 +5801,11 @@ msgstr "Hledat své stanice"
msgid "Edit Station"
msgstr "Upravit stanici"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:136
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:134
msgid "Station"
msgstr "Stanice"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:157
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:155
#, csharp-format
msgid "{0} station"
msgid_plural "{0} stations"
@@ -5829,15 +5813,15 @@ msgstr[0] "{0} stanice"
msgstr[1] "{0} stanice"
msgstr[2] "{0} stanic"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:243
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:241
msgid "Please provide a valid station URI"
msgstr "Zadejte prosím správnou URI stanice"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:256
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:254
msgid "Please provide a station genre"
msgstr "Zadejte prosím žánr stanice"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:264
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:262
msgid "Please provide a station title"
msgstr "Zadejte prosím název stanice"
@@ -6405,22 +6389,22 @@ msgstr ""
"Zjednodušit rozhraní „Právě se přehrává“ tím, že se skryje seznam skladeb "
"apod."
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:144
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:143
#, csharp-format
msgid "Unable to import track: {0}"
msgstr "Nelze importovat stopu: {0}"
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:178
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:177
msgid "Importing from Amarok failed"
msgstr "Import z programu Amarok selhal"
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:189
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:188
msgid "Amarok"
msgstr "Amarok"
#. TODO add Help button and dialog/tooltip
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:68
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:384
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:383
msgid "iTunes Importer"
msgstr "Import z iTunes"
@@ -6437,24 +6421,24 @@ msgid "Import playlists"
msgstr "Importovat seznamy skladeb"
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:120
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:387
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:386
#, csharp-format
msgid "Locate your \"{0}\" file..."
msgstr "Najít svůj soubor „{0}“…"
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:138
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:388
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:387
#, csharp-format
msgid "Locate \"{0}\""
msgstr "Najít „{0}“"
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:167
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:389
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:388
msgid "Locate iTunes Music Directory"
msgstr "Najít složku s hudbou iTunes"
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:196
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:391
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:390
#, csharp-format
msgid ""
"The iTunes library refers to your music directory as \"{0}\" but Banshee was "
@@ -6463,13 +6447,13 @@ msgstr ""
"Knihovna iTunes odkazuje na vaši složku s hudbou jako „{0}“, ale Banshee "
"nedokáže dovodit umístění této složky. Najděte ji prosím."
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:75
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:393
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:74
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:392
msgid "iTunes Media Player"
msgstr "Multimediální přehrávač iTunes"
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:135
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:395
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:134
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:394
msgid ""
"Banshee is not familiar with this version of the iTunes library format. "
"Importing may or may not work as expected, or at all. Would you like to "
@@ -6479,17 +6463,17 @@ msgstr ""
"může a nebo také nemusí fungovat, jak očekáváte, případně nemusí fungovat "
"vůbec. Chcete i přesto import zkusit?"
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:440
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:236
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:397
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:439
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:235
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:396
msgid "Unable to import song."
msgstr "Nelze skladbu importovat."
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:370
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:369
msgid "Rhythmbox Music Player"
msgstr "Hudební přehrávač Rhythmbox"
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:386
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:385
msgid "Import _playlists"
msgstr "Importovat _seznam skladeb"
@@ -6501,78 +6485,69 @@ msgstr "_Vyplnit"
msgid "f_rom"
msgstr "_z"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:51
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:52
msgid "Add to Play Queue"
msgstr "Přidat do fronty"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:52
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:53
msgid "Append selected songs to the play queue"
msgstr "Připojit vybrané skladby do fronty přehrávání"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:56
-#| msgid "after"
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:57
msgid "Play After"
msgstr "Přehrát po"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:57
-#| msgid ""
-#| "Enable or disable playback stopping after the currently playing track "
-#| "(value should be either 'true' or 'false')"
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:58
msgid "Add selected songs after the currently playing track, album, or artist"
msgstr "Přidat vybranou skladbu za právě přehrávanou stopu, album nebo umělce"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:61
-#| msgid "Ban Track"
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:62
msgid "Current Track"
msgstr "Aktuální stopa"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:62
-#| msgid "Append selected songs to the play queue"
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:63
msgid "Add selected songs to the play queue after the currently playing song"
msgstr ""
"Přidat vybrané skladby do fronty přehrávání za právě přehrávanou skladbu"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:66
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:67
msgid "Current Album"
msgstr "Aktuální album"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:67
-#| msgid "Append selected songs to the play queue"
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:68
msgid "Add selected songs to the play queue after the currently playing album"
msgstr "Přidat vybrané skladby do fronty přehrávání za právě přehrávané album"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:71
-#| msgid "Current player state"
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:72
msgid "Current Artist"
msgstr "Aktuální umělec"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:72
-#| msgid "Append selected songs to the play queue"
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:73
msgid "Add selected songs to the play queue after the currently playing artist"
msgstr ""
"Přidat vybrané skladby do fronty přehrávání za právě přehrávaného umělce"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:79
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:80
msgid "Refresh random tracks in the play queue"
msgstr "Zvonu vybrat náhodné stopy do fronty přehrávání"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:84
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:85
msgid "Randomize the playback order of items in the play queue"
msgstr "Náhodně přeházet pořadí přehrávaných položek ve frontě přehrávání"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:88
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:89
msgid "Add More"
msgstr "Přidat další"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:89
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:90
msgid "Add more random tracks to the play queue"
msgstr "Přidat další náhodné stopy do fronty přehrávání"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:94
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:95
msgid "Remove all tracks from the play queue"
msgstr "Odstranit všechny skladby z fronty přehrávání"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:103
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:104
msgid "Clear the play queue when quitting"
msgstr "Vyprázdnit frontu při ukončení"
@@ -6580,11 +6555,11 @@ msgstr "Vyprázdnit frontu při ukončení"
msgid "Remove From Play Queue"
msgstr "Odstranit z fronty"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:952
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:959
msgid "Number of _played songs to show"
msgstr "Počet _přehraných skladeb, které se mají zobrazit"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:958
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:965
msgid "Number of _upcoming songs to show"
msgstr "Počet _nadcházejících skladeb, které se mají zobrazit"
@@ -6601,7 +6576,6 @@ msgid "All Podcasts ({0})"
msgstr "Všechny podcasty ({0})"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:104
-#| msgid "Local Folders"
msgid "Podcasts Folder"
msgstr "Složka s podcasty"
@@ -6643,12 +6617,12 @@ msgid "Published"
msgstr "Zveřejněno"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:285
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcastStatusIndicator.cs:66
msgid "New"
msgstr "Nový"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:286
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellDownloadStatus.cs:57
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcastStatusIndicator.cs:66
msgid "Downloaded"
msgstr "Stažené"
@@ -6703,6 +6677,10 @@ msgstr "Stahují se podcasty"
msgid "Cancel all podcast downloads?"
msgstr "Zrušit stahování všech podcastů?"
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/HeaderWidget.cs:99
+msgid "_Limit to episodes from"
+msgstr "O_mezit na epizody z"
+
#. "<control><shift>U",
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:73
msgid "Check all podcasts for new episodes"
@@ -6737,13 +6715,11 @@ msgid "Mark as New"
msgstr "Označit jako nové"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:129
-#| msgid "Drive"
msgid "Archive"
msgstr "Archivovat"
#. Translators: this is a verb used as a button name, not a noun
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:135
-#| msgid "Downloads"
msgid "Download"
msgstr "Stáhnout"
@@ -6761,7 +6737,6 @@ msgstr "Přidat podcast"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:262
#, csharp-format
-#| msgid "Select Files"
msgid "Delete File"
msgid_plural "Delete Files"
msgstr[0] "Smazat soubor"
@@ -6807,11 +6782,6 @@ msgstr "Není dostupný žádný popis"
msgid "Podcast:"
msgstr "Podcast:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:61
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:170
-msgid "Subscribe"
-msgstr "Přihlásit se"
-
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:92
msgid "Subscribe to New Podcast"
msgstr "Přihlásit se k novému podcastu"
@@ -7169,6 +7139,30 @@ msgstr "Připojeno k Last.fm."
msgid "Unknown Podcast"
msgstr "Neznámý podcast"
+#~ msgid "Home Folder"
+#~ msgstr "Domovská složka"
+
+#~ msgid "Manage _Extensions"
+#~ msgstr "Spravovat _rozšíření"
+
+#~ msgid "Manage extensions to add new features to Banshee"
+#~ msgstr "Správa rozšíření, která přidají do Banshee nové funkce"
+
+#~ msgid "_Web Resources"
+#~ msgstr "_Webové zdroje"
+
+#~ msgid "Banshee _User Guide (Wiki)"
+#~ msgstr "_Uživatelská příručka Banshee (Wiki)"
+
+#~ msgid "Learn about how to use Banshee"
+#~ msgstr "Naučte se používat Banshee"
+
+#~ msgid "Videos From Photos Folder"
+#~ msgstr "Videa ze složky fotografií"
+
+#~ msgid "Audiobooks, etc"
+#~ msgstr "Mluvené knihy atd."
+
#~ msgid "Mark as Old"
#~ msgstr "Označit jako staré"
diff --git a/po/es.po b/po/es.po
index 87db28b..ddefb48 100644
--- a/po/es.po
+++ b/po/es.po
@@ -15,8 +15,8 @@ msgstr ""
"Project-Id-Version: banshee.master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=banshee&component=general\n"
-"POT-Creation-Date: 2010-10-26 00:36+0000\n"
-"PO-Revision-Date: 2010-10-26 18:22+0100\n"
+"POT-Creation-Date: 2010-12-11 17:20+0000\n"
+"PO-Revision-Date: 2010-12-11 20:48+0100\n"
"Last-Translator: Benjamín Valero Espinosa <benjavalero at gmail.com>\n"
"Language-Team: Español <gnome-es-list at gnome.org>\n"
"MIME-Version: 1.0\n"
@@ -170,7 +170,7 @@ msgstr "Examinar, buscar y adquirir música de la tienda Amazon MP3"
#: ../data/addin-xml-strings.cs:72 ../data/addin-xml-strings.cs:77
#: ../data/addin-xml-strings.cs:112 ../data/addin-xml-strings.cs:127
#: ../data/addin-xml-strings.cs:137 ../data/addin-xml-strings.cs:142
-#: ../data/addin-xml-strings.cs:161
+#: ../data/addin-xml-strings.cs:161 ../data/addin-xml-strings.cs:224
msgid "Online Sources"
msgstr "Recursos en línea"
@@ -221,7 +221,8 @@ msgstr "Personalizar y extender Banshee con scripts en el lenguaje Boo."
#: ../data/addin-xml-strings.cs:122 ../data/addin-xml-strings.cs:147
#: ../data/addin-xml-strings.cs:156 ../data/addin-xml-strings.cs:166
#: ../data/addin-xml-strings.cs:171 ../data/addin-xml-strings.cs:176
-#: ../data/addin-xml-strings.cs:185 ../data/addin-xml-strings.cs:214
+#: ../data/addin-xml-strings.cs:185 ../data/addin-xml-strings.cs:209
+#: ../data/addin-xml-strings.cs:219
msgid "Utilities"
msgstr "Herramientas"
@@ -388,7 +389,7 @@ msgstr "Mostrar un icono en el área de notificación para controlar Banshee."
#. ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying.addin.xml
#: ../data/addin-xml-strings.cs:179
-#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:164
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:168
#: ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs:50
msgid "Now Playing"
msgstr "En reproducción"
@@ -428,7 +429,7 @@ msgstr ""
#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:193
#: ../src/Dap/Banshee.Dap/Banshee.Dap/PodcastGroupSource.cs:38
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:107
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:207
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:210
msgid "Podcasts"
msgstr "Podcasts"
@@ -459,52 +460,77 @@ msgstr "Código de muestra útil para desarrolladores."
msgid "Sources"
msgstr "Recursos"
-#. ../src/Extensions/Banshee.SqlDebugConsole/Banshee.SqlDebugConsole.addin.xml
+#. ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu.addin.xml
#: ../data/addin-xml-strings.cs:207
+msgid "Sound Menu integration for Banshee"
+msgstr "Integración de Banshee con el menú de sonido"
+
+#: ../data/addin-xml-strings.cs:208
+msgid "Control Banshee from the Sound Menu."
+msgstr "Controlar Banshee desde el menú de sonido."
+
+#. ../src/Extensions/Banshee.SqlDebugConsole/Banshee.SqlDebugConsole.addin.xml
+#: ../data/addin-xml-strings.cs:212
msgid "SQL Debug Console"
msgstr "Consola de depuración SQL"
-#: ../data/addin-xml-strings.cs:208
+#: ../data/addin-xml-strings.cs:213
msgid "Provides a UI for monitoring Banshee's SQL usage, and running queries."
msgstr ""
"Proporciona una interfaz para monitorizar el uso de SQL de Banshee y para "
"ejecutar peticiones."
-#: ../data/addin-xml-strings.cs:209
+#: ../data/addin-xml-strings.cs:214
msgid "Debug"
msgstr "Depuración"
#. ../src/Extensions/Banshee.Torrent/Banshee.Torrent.addin.xml
-#: ../data/addin-xml-strings.cs:212
+#: ../data/addin-xml-strings.cs:217
msgid "Torrent Downloader"
msgstr "Descargador de Torrent"
-#: ../data/addin-xml-strings.cs:213
+#: ../data/addin-xml-strings.cs:218
msgid "Support downloading BitTorrent files from podcasts."
msgstr "Soporte para descargar archivos BitTorrent desde podcasts."
+#. ../src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore.addin.xml
+#: ../data/addin-xml-strings.cs:222
+#: ../src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs:49
+#: ../src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs:50
+#: ../src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs:90
+msgid "Ubuntu One Music Store"
+msgstr "Ubuntu One Music Store"
+
+#: ../data/addin-xml-strings.cs:223
+msgid ""
+"This extension grants access to the Ubuntu One Music Store, powered by "
+"7digital."
+msgstr ""
+"Esta extensión proporciona acceso a Ubuntu One Music Store, gracias a "
+"7digital."
+
#. ../src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia.addin.xml
-#: ../data/addin-xml-strings.cs:217
+#: ../data/addin-xml-strings.cs:227
#: ../src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia/ContextPage.cs:44
msgid "Wikipedia"
msgstr "Wikipedia"
-#: ../data/addin-xml-strings.cs:218
+#: ../data/addin-xml-strings.cs:228
msgid "View artist information from Wikipedia in the context pane."
msgstr ""
"Ver información de la Wikipedia sobre el artista en el panel contextual."
-#: ../data/addin-xml-strings.cs:219 ../data/addin-xml-strings.cs:224
+#: ../data/addin-xml-strings.cs:229 ../data/addin-xml-strings.cs:234
msgid "Context Pane"
msgstr "Panel contextual"
#. ../src/Extensions/Banshee.YouTube/Banshee.YouTube.addin.xml
-#: ../data/addin-xml-strings.cs:222
+#: ../data/addin-xml-strings.cs:232
#: ../src/Extensions/Banshee.YouTube/Banshee.YouTube/ContextPage.cs:44
msgid "YouTube"
msgstr "YouTube"
-#: ../data/addin-xml-strings.cs:223
+#: ../data/addin-xml-strings.cs:233
msgid "Show related YouTube videos in the context pane"
msgstr "Mostrar vídeos relacionados de YouTube en el panel contextual"
@@ -517,7 +543,7 @@ msgid "AAC (Novell Encoder)"
msgstr "AAC (Codificador de Novell)"
#: ../data/audio-profiles/aac-novell.xml.in.h:3
-#: ../data/audio-profiles/mp3-lame.xml.in.h:4
+#: ../data/audio-profiles/mp3-lame.xml.in.h:3
#: ../data/audio-profiles/mp3-xing.xml.in.h:2
#: ../data/audio-profiles/wavpack.xml.in.h:3
#: ../data/audio-profiles/wma.xml.in.h:4
@@ -586,61 +612,33 @@ msgstr ""
"que produce archivos más grandes a bajas tasas de bits."
#: ../data/audio-profiles/mp3-lame.xml.in.h:2
-msgid "Average Bitrate"
-msgstr "Tasa de bits media"
-
-#: ../data/audio-profiles/mp3-lame.xml.in.h:3
#: ../data/audio-profiles/vorbis.xml.in.h:2
#: ../data/audio-profiles/wavpack.xml.in.h:2
#: ../data/audio-profiles/wma.xml.in.h:3
msgid "Best"
msgstr "Mejor"
-#: ../data/audio-profiles/mp3-lame.xml.in.h:5
+#: ../data/audio-profiles/mp3-lame.xml.in.h:4
msgid "Constant Bitrate"
msgstr "Tasa de bits constante"
-#: ../data/audio-profiles/mp3-lame.xml.in.h:6
-msgid "Extreme"
-msgstr "Extrema"
-
-#: ../data/audio-profiles/mp3-lame.xml.in.h:7
-msgid "Insane"
-msgstr "Demente"
-
-#: ../data/audio-profiles/mp3-lame.xml.in.h:8
-msgid "LAME Preset"
-msgstr "Predefinidos LAME"
+#: ../data/audio-profiles/mp3-lame.xml.in.h:5
+msgid "Encoding Mode"
+msgstr "Modo de codificación"
-#: ../data/audio-profiles/mp3-lame.xml.in.h:9
+#: ../data/audio-profiles/mp3-lame.xml.in.h:6
msgid "MP3 (LAME Encoder)"
msgstr "MP3 (codificador LAME)"
-#: ../data/audio-profiles/mp3-lame.xml.in.h:10
-msgid "Medium"
-msgstr "Media"
-
-#: ../data/audio-profiles/mp3-lame.xml.in.h:11
-msgid "Preset"
-msgstr "Predefinido"
-
-#: ../data/audio-profiles/mp3-lame.xml.in.h:12
-msgid "Standard"
-msgstr "Estándar"
-
-#: ../data/audio-profiles/mp3-lame.xml.in.h:13
-msgid "VBR Mode"
-msgstr "Modo VBR"
-
-#: ../data/audio-profiles/mp3-lame.xml.in.h:14
+#: ../data/audio-profiles/mp3-lame.xml.in.h:7
msgid "VBR Quality"
msgstr "Calidad VBR"
-#: ../data/audio-profiles/mp3-lame.xml.in.h:15
+#: ../data/audio-profiles/mp3-lame.xml.in.h:8
msgid "Variable Bitrate"
msgstr "Tasa de bits variable"
-#: ../data/audio-profiles/mp3-lame.xml.in.h:16
+#: ../data/audio-profiles/mp3-lame.xml.in.h:9
#: ../data/audio-profiles/vorbis.xml.in.h:5
#: ../data/audio-profiles/wavpack.xml.in.h:15
#: ../data/audio-profiles/wma.xml.in.h:7
@@ -754,7 +752,7 @@ msgstr "Windows Media Audio"
#: ../data/desktop-files/common.desktop.in.h:1
#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:76
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:105
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:107
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs:206
#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:60
msgid "Banshee Media Player"
@@ -854,11 +852,11 @@ msgstr "Grabar CD…"
msgid "Write selected tracks to an audio CD"
msgstr "Grabar las pistas seleccionadas en un CD de sonido"
-#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:104
+#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:105
msgid "Could not write CD"
msgstr "No se pudo grabar el CD"
-#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:105
+#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:106
msgid "Brasero could not be started"
msgstr "No se pudo iniciar Brasero"
@@ -879,7 +877,7 @@ msgid "Could not create BPM detection driver."
msgstr "No se pudo crear el controlador de detección de PPM."
#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:82
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:766
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:812
msgid "Enable _gapless playback"
msgstr "Activar reproducción sin _huecos"
@@ -892,19 +890,19 @@ msgstr ""
"álbumes conceptuales y música clásica."
#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:150
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:187
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:192
msgid "Could not initialize GStreamer library"
msgstr "No se ha podido inicializar la biblioteca de GStreamer"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:430
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:435
msgid "Unknown Error"
msgstr "Error desconocido"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:760
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:806
msgid "_Enable ReplayGain correction"
msgstr "Activar corrección _ReplayGain"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:761
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:807
msgid ""
"For tracks that have ReplayGain data, automatically scale (normalize) "
"playback volume"
@@ -912,7 +910,7 @@ msgstr ""
"Para las pistas que tienen datos ReplayGain, escalar (normalizar) "
"automáticamente el volumen de reproducción"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:767
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:813
msgid ""
"Eliminate the small playback gap on track change. Useful for concept albums "
"and classical music."
@@ -924,77 +922,79 @@ msgstr ""
msgid "Could not create transcoder"
msgstr "No se pudo crear el transcodificador"
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:222
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:229
msgid "GStreamer# 0.10"
msgstr "GStreamer# 0.10"
#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs:91
#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:132
+#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:111
msgid "_Close"
msgstr "_Cerrar"
#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs:92
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:249
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:251
#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:79
#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:133
+#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:112
msgid "Close"
msgstr "Cerrar"
-#: ../src/Clients/Booter/Booter/Entry.cs:148
+#: ../src/Clients/Booter/Booter/Entry.cs:152
msgid "Help Options"
msgstr "Opciones de la ayuda"
-#: ../src/Clients/Booter/Booter/Entry.cs:149
+#: ../src/Clients/Booter/Booter/Entry.cs:153
msgid "Show this help"
msgstr "Muestra esta ayuda"
-#: ../src/Clients/Booter/Booter/Entry.cs:150
+#: ../src/Clients/Booter/Booter/Entry.cs:154
msgid "Show options for controlling playback"
msgstr "Muestra las opciones para controlar la reproducción"
-#: ../src/Clients/Booter/Booter/Entry.cs:151
+#: ../src/Clients/Booter/Booter/Entry.cs:155
msgid "Show options for querying the playing track"
msgstr "Muestra las opciones para consultar la pista en reproducción"
-#: ../src/Clients/Booter/Booter/Entry.cs:152
+#: ../src/Clients/Booter/Booter/Entry.cs:156
msgid "Show options for querying the playing engine"
msgstr "Muestra las opciones para consultar el motor de reproducción"
-#: ../src/Clients/Booter/Booter/Entry.cs:153
+#: ../src/Clients/Booter/Booter/Entry.cs:157
msgid "Show options for the user interface"
msgstr "Muestra las opciones para la interfaz de usuario"
-#: ../src/Clients/Booter/Booter/Entry.cs:154
+#: ../src/Clients/Booter/Booter/Entry.cs:158
msgid "Show options for developers and debugging"
msgstr "Muestras las opciones para desarrolladores y depuración"
-#: ../src/Clients/Booter/Booter/Entry.cs:155
+#: ../src/Clients/Booter/Booter/Entry.cs:159
msgid "Show all option groups"
msgstr "Muestra todos los grupos de opciones"
-#: ../src/Clients/Booter/Booter/Entry.cs:156
+#: ../src/Clients/Booter/Booter/Entry.cs:160
msgid "Show version information"
msgstr "Muestra la información de la versión"
-#: ../src/Clients/Booter/Booter/Entry.cs:159
+#: ../src/Clients/Booter/Booter/Entry.cs:163
msgid "Playback Control Options"
msgstr "Opciones de control de reproducción"
-#: ../src/Clients/Booter/Booter/Entry.cs:160
+#: ../src/Clients/Booter/Booter/Entry.cs:164
msgid ""
"Play the next track, optionally restarting if the 'restart' value is set"
msgstr ""
"Reproduce la pista siguiente, reiniciando opcionalmente si el valor «restart» "
"está establecido"
-#: ../src/Clients/Booter/Booter/Entry.cs:161
+#: ../src/Clients/Booter/Booter/Entry.cs:165
msgid ""
"Play the previous track, optionally restarting if the 'restart value is set"
msgstr ""
"Reproduce la pista anterior, reiniciando opcionalmente si el valor «restart» "
"está establecido"
-#: ../src/Clients/Booter/Booter/Entry.cs:162
+#: ../src/Clients/Booter/Booter/Entry.cs:166
msgid ""
"If the current song has been played longer than 4 seconds then restart it, "
"otherwise the same as --previous"
@@ -1002,29 +1002,29 @@ msgstr ""
"Si la canción actual se ha reproducido más de 4 segundos la reinicia, si no "
"es lo mismo que --previous"
-#: ../src/Clients/Booter/Booter/Entry.cs:163
+#: ../src/Clients/Booter/Booter/Entry.cs:167
msgid "Automatically start playing any tracks enqueued on the command line"
msgstr ""
"Comenzar a reproducir automáticamente las pistas en cola en la línea de "
"comandos"
-#: ../src/Clients/Booter/Booter/Entry.cs:164
+#: ../src/Clients/Booter/Booter/Entry.cs:168
msgid "Start playback"
msgstr "Comenzar la reproducción"
-#: ../src/Clients/Booter/Booter/Entry.cs:165
+#: ../src/Clients/Booter/Booter/Entry.cs:169
msgid "Pause playback"
msgstr "Pausar la reproducción"
-#: ../src/Clients/Booter/Booter/Entry.cs:166
+#: ../src/Clients/Booter/Booter/Entry.cs:170
msgid "Toggle playback"
msgstr "Conmutar la reproducción"
-#: ../src/Clients/Booter/Booter/Entry.cs:167
+#: ../src/Clients/Booter/Booter/Entry.cs:171
msgid "Completely stop playback"
msgstr "Detiene completamente la reproducción"
-#: ../src/Clients/Booter/Booter/Entry.cs:169
+#: ../src/Clients/Booter/Booter/Entry.cs:173
msgid ""
"Enable or disable playback stopping after the currently playing track (value "
"should be either 'true' or 'false')"
@@ -1033,97 +1033,97 @@ msgstr ""
"actualmente en reproducción. El valor debe ser «true» (verdadero) o "
"«false» (falso)."
-#: ../src/Clients/Booter/Booter/Entry.cs:170
+#: ../src/Clients/Booter/Booter/Entry.cs:174
msgid "Set the playback volume (0-100), prefix with +/- for relative values"
msgstr ""
"Establecer el volumen de reproducción (0-100), prefijando +/- para valores "
"relativos"
-#: ../src/Clients/Booter/Booter/Entry.cs:171
+#: ../src/Clients/Booter/Booter/Entry.cs:175
msgid "Seek to a specific point (seconds, float)"
msgstr "Saltar a un punto específico (segundos, decimales)"
-#: ../src/Clients/Booter/Booter/Entry.cs:172
+#: ../src/Clients/Booter/Booter/Entry.cs:176
msgid "Set the currently played track's rating (0 to 5)"
msgstr "Establecer la valoración de la pista en reproducción (0 a 5)"
-#: ../src/Clients/Booter/Booter/Entry.cs:175
+#: ../src/Clients/Booter/Booter/Entry.cs:179
msgid "Player Engine Query Options"
msgstr "Opciones de consulta del motor de reproducción"
-#: ../src/Clients/Booter/Booter/Entry.cs:176
+#: ../src/Clients/Booter/Booter/Entry.cs:180
msgid "Current player state"
msgstr "Estado actual del reproductor"
-#: ../src/Clients/Booter/Booter/Entry.cs:177
+#: ../src/Clients/Booter/Booter/Entry.cs:181
msgid "Last player state"
msgstr "Último estado del reproductor"
-#: ../src/Clients/Booter/Booter/Entry.cs:178
+#: ../src/Clients/Booter/Booter/Entry.cs:182
msgid "Query whether the player can be paused"
msgstr "Consulta si el reproductor puede pausarse"
-#: ../src/Clients/Booter/Booter/Entry.cs:179
+#: ../src/Clients/Booter/Booter/Entry.cs:183
msgid "Query whether the player can seek"
msgstr "Consulta si el reproductor puede saltar de posición"
-#: ../src/Clients/Booter/Booter/Entry.cs:180
+#: ../src/Clients/Booter/Booter/Entry.cs:184
msgid "Player volume"
msgstr "Volumen del reproductor"
-#: ../src/Clients/Booter/Booter/Entry.cs:181
+#: ../src/Clients/Booter/Booter/Entry.cs:185
msgid "Player position in currently playing track"
msgstr "Posición del reproductor en la pista actualmente en reproducción"
-#: ../src/Clients/Booter/Booter/Entry.cs:184
+#: ../src/Clients/Booter/Booter/Entry.cs:188
msgid "Playing Track Metadata Query Options"
msgstr "Opciones de consulta de metadatos de la pista en reproducción"
-#: ../src/Clients/Booter/Booter/Entry.cs:185
+#: ../src/Clients/Booter/Booter/Entry.cs:189
msgid "URI"
msgstr "URI"
-#: ../src/Clients/Booter/Booter/Entry.cs:186
+#: ../src/Clients/Booter/Booter/Entry.cs:190
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:138
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:89
msgid "Artist Name"
msgstr "Nombre del artista"
-#: ../src/Clients/Booter/Booter/Entry.cs:187
+#: ../src/Clients/Booter/Booter/Entry.cs:191
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:140
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:90
msgid "Album Title"
msgstr "Título del álbum"
-#: ../src/Clients/Booter/Booter/Entry.cs:188
+#: ../src/Clients/Booter/Booter/Entry.cs:192
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:137
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:88
msgid "Track Title"
msgstr "Título de la pista"
-#: ../src/Clients/Booter/Booter/Entry.cs:189
+#: ../src/Clients/Booter/Booter/Entry.cs:193
msgid "Duration"
msgstr "Duración"
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:190
+#: ../src/Clients/Booter/Booter/Entry.cs:194
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:117
msgid "Track Number"
msgstr "Número de pista"
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:191
+#: ../src/Clients/Booter/Booter/Entry.cs:195
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:126
msgid "Track Count"
msgstr "Número de pistas"
-#: ../src/Clients/Booter/Booter/Entry.cs:192
+#: ../src/Clients/Booter/Booter/Entry.cs:196
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:149
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:114
msgid "Disc Number"
msgstr "Número de disco"
-#: ../src/Clients/Booter/Booter/Entry.cs:193
+#: ../src/Clients/Booter/Booter/Entry.cs:197
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:142
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:113
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:177
@@ -1134,7 +1134,7 @@ msgstr "Número de disco"
msgid "Year"
msgstr "Año"
-#: ../src/Clients/Booter/Booter/Entry.cs:194
+#: ../src/Clients/Booter/Booter/Entry.cs:198
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:230
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:131
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:60
@@ -1142,79 +1142,79 @@ msgstr "Año"
msgid "Rating"
msgstr "Valoración"
-#: ../src/Clients/Booter/Booter/Entry.cs:195
+#: ../src/Clients/Booter/Booter/Entry.cs:199
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:322
msgid "Score"
msgstr "Puntuación"
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:196
+#: ../src/Clients/Booter/Booter/Entry.cs:200
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:143
msgid "Bit Rate"
msgstr "Tasa de bits"
-#: ../src/Clients/Booter/Booter/Entry.cs:199
+#: ../src/Clients/Booter/Booter/Entry.cs:203
msgid "User Interface Options"
msgstr "Opciones de la interfaz de usuario"
-#: ../src/Clients/Booter/Booter/Entry.cs:200
+#: ../src/Clients/Booter/Booter/Entry.cs:204
msgid "Present the user interface on the active workspace"
msgstr "Muestra la interfaz de usuario en el área de trabajo activa"
-#: ../src/Clients/Booter/Booter/Entry.cs:201
+#: ../src/Clients/Booter/Booter/Entry.cs:205
msgid "Enter the full-screen mode"
msgstr "Entrar en el modo de pantalla completa"
-#: ../src/Clients/Booter/Booter/Entry.cs:202
+#: ../src/Clients/Booter/Booter/Entry.cs:206
msgid "Hide the user interface"
msgstr "Oculta la interfaz de usuario"
-#: ../src/Clients/Booter/Booter/Entry.cs:203
+#: ../src/Clients/Booter/Booter/Entry.cs:207
msgid "Do not present the user interface, regardless of any other options"
msgstr "No muestra la interfaz de usuario, sin importar cualquier otra opción"
-#: ../src/Clients/Booter/Booter/Entry.cs:204
+#: ../src/Clients/Booter/Booter/Entry.cs:208
msgid "Present the import media dialog box"
msgstr "Presentar el diálogo de importación multimedia"
-#: ../src/Clients/Booter/Booter/Entry.cs:205
+#: ../src/Clients/Booter/Booter/Entry.cs:209
msgid "Present the about dialog"
msgstr "Presentar el diálogo acerca de"
-#: ../src/Clients/Booter/Booter/Entry.cs:206
+#: ../src/Clients/Booter/Booter/Entry.cs:210
msgid "Present the open location dialog"
msgstr "Presentar el diálogo de abrir ubicación"
-#: ../src/Clients/Booter/Booter/Entry.cs:207
+#: ../src/Clients/Booter/Booter/Entry.cs:211
msgid "Present the preferences dialog"
msgstr "Presentar el diálogo de preferencias"
-#: ../src/Clients/Booter/Booter/Entry.cs:210
+#: ../src/Clients/Booter/Booter/Entry.cs:214
msgid "Debugging and Development Options"
msgstr "Opciones de desarrollo y depuración"
-#: ../src/Clients/Booter/Booter/Entry.cs:211
+#: ../src/Clients/Booter/Booter/Entry.cs:215
msgid "Enable general debugging features"
msgstr "Activa las características de depuración general"
-#: ../src/Clients/Booter/Booter/Entry.cs:212
+#: ../src/Clients/Booter/Booter/Entry.cs:216
msgid "Enable debugging output of SQL queries"
msgstr "Activa la salida de depuración de las consultas SQL"
-#: ../src/Clients/Booter/Booter/Entry.cs:213
+#: ../src/Clients/Booter/Booter/Entry.cs:217
msgid "Enable debugging output of Mono.Addins"
msgstr "Activa la salida de depuración de Mono.Addins"
-#: ../src/Clients/Booter/Booter/Entry.cs:214
+#: ../src/Clients/Booter/Booter/Entry.cs:218
msgid "Specify an alternate database to use"
msgstr "Especifica una base de datos alternativa que usar"
-#: ../src/Clients/Booter/Booter/Entry.cs:215
+#: ../src/Clients/Booter/Booter/Entry.cs:219
msgid "Specify an alternate key, default is /apps/banshee-1/"
msgstr ""
"Especifica una clave alternativa, la predeterminada es /apps/banshee-1/"
-#: ../src/Clients/Booter/Booter/Entry.cs:216
+#: ../src/Clients/Booter/Booter/Entry.cs:220
msgid ""
"Optimize instance for running uninstalled; most notably, this will create an "
"alternate Mono.Addins database in the working directory"
@@ -1222,16 +1222,16 @@ msgstr ""
"Optimiza la instancia para ejecutarse sin instalación; en particular, esto "
"crea una base de datos de Mono.Addins alternativa en el directorio de trabajo"
-#: ../src/Clients/Booter/Booter/Entry.cs:218
+#: ../src/Clients/Booter/Booter/Entry.cs:222
msgid "Disable DBus support completely"
msgstr "Desactiva completamente el soporte de DBus"
-#: ../src/Clients/Booter/Booter/Entry.cs:220
+#: ../src/Clients/Booter/Booter/Entry.cs:224
#, csharp-format
msgid "Skip loading a custom gtkrc file ({0}) if it exists"
msgstr "Omitir la carga de un archivo gtkrc personalizado ({0}) si existe"
-#: ../src/Clients/Booter/Booter/Entry.cs:251
+#: ../src/Clients/Booter/Booter/Entry.cs:255
#, csharp-format
msgid "The following help arguments are invalid: {0}"
msgstr "Los siguientes argumentos para la ayuda son no válidos: {0}"
@@ -1245,9 +1245,9 @@ msgid "En_queue"
msgstr "Añadir a la _cola"
#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:86
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:66
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:196
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:86
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:210
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:126
msgid "_Play"
msgstr "Repro_ducir"
@@ -1277,7 +1277,7 @@ msgid "Play Song"
msgstr "Reproducir canción"
#. Translators: this is a verb (command), not a noun (things)
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:457
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:465
msgid "Search"
msgstr "Buscar"
@@ -1337,7 +1337,7 @@ msgid "Stream location not found"
msgstr "No se encontró la ubicación del flujo"
#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:324
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:328
msgid "File not found"
msgstr "No se encontró el archivo"
@@ -1367,7 +1367,7 @@ msgid "_Restart Video"
msgstr "_Reiniciar vídeo"
#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:86
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:93
msgid "_Restart Song"
msgstr "_Reiniciar canción"
@@ -1388,7 +1388,7 @@ msgid "_Jump to Playing Video"
msgstr "Sa_ltar al vídeo en reproducción"
#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:82
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:89
msgid "_Jump to Playing Song"
msgstr "Sa_ltar a la canción en reproducción"
@@ -1398,17 +1398,17 @@ msgstr "Sa_ltar al elemento en reproducción"
#. Translators: This is used to generate bookmark names. {0} is track title, {1} is minutes
#. (possibly more than two digits) and {2} is seconds (between 00 and 60).
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/Bookmark.cs:173
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/Bookmark.cs:172
#, csharp-format
msgid "{0} ({1}:{2:00})"
msgstr "{0} ({1}:{2:00})"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs:70
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs:69
#, csharp-format
msgid "All Albums ({0})"
msgstr "Todos los álbumes ({0})"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistListModel.cs:69
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistListModel.cs:68
#, csharp-format
msgid "All Artists ({0})"
msgstr "Todos los artistas ({0})"
@@ -1418,15 +1418,15 @@ msgstr "Todos los artistas ({0})"
msgid "Value"
msgstr "Valor"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:50
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:49
msgid "Shuffle by A_lbum"
msgstr "Mezclar por álbu_m"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:51
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:50
msgid "by album"
msgstr "por álbum"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:52
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:51
msgid "Play all songs from an album, then randomly choose another album"
msgstr ""
"Reproducir todas las canciones de un álbum, después elegir aleatoriamente "
@@ -1446,27 +1446,27 @@ msgstr ""
"Reproducir todas las canciones de un artista, después elegir aleatoriamente "
"otro artista"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:36
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:38
msgid "Shuffle _Off"
msgstr "_No mezclar"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:37
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:39
msgid "manually"
msgstr "manualmente"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:38
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:40
msgid "Do not shuffle playlist"
msgstr "No mezclar la lista de reproducción"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:46
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:45
msgid "Shuffle by _Rating"
msgstr "Mezclar por _valoración"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:47
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:46
msgid "by rating"
msgstr "por valoración"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:48
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:47
msgid "Play songs randomly, prefer higher rated songs"
msgstr ""
"Reproducir las canciones aleatoriamente, dando preferencia a las canciones "
@@ -1486,15 +1486,15 @@ msgstr ""
"Reproducir las canciones aleatoriamente, dando preferencia a las canciones "
"con mayor puntuación"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:47
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:46
msgid "Shuffle by _Song"
msgstr "Mezclar por _canción"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:48
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:47
msgid "by song"
msgstr "por canción"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:49
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:48
msgid "Play songs randomly from the playlist"
msgstr "Reproducir las canciones de la lista de reproducción aleatoriamente"
@@ -1503,7 +1503,7 @@ msgid "Scanning for media"
msgstr "Examinando contenido multimedia"
#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:188
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1382
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1384
msgid "Scanning..."
msgstr "Examinando…"
@@ -1528,22 +1528,22 @@ msgstr "El proceso de importación está ejecutándose. ¿Quiere pararlo?"
msgid "Importing {0} of {1}"
msgstr "Importando {0} de {1}"
-#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:79
+#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:78
#, csharp-format
msgid "Rescanning {0} of {1}"
msgstr "Reanalizando {0} de {1}"
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:234
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:232
msgid "Upgrading your Banshee Database"
msgstr "Actualizando su base de datos Banshee"
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:235
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:233
msgid ""
"Please wait while your old Banshee database is migrated to the new format."
msgstr ""
"Espere mientras se migra su antigua base de datos Banshee al nuevo formato."
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1379
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1381
msgid "Refreshing Metadata"
msgstr "Actualizando metadatos"
@@ -1615,10 +1615,6 @@ msgstr "Rock suave"
msgid "Techno"
msgstr "Tecno"
-#: ../src/Core/Banshee.Services/Banshee.Library/HomeDirectoryImportSource.cs:48
-msgid "Home Folder"
-msgstr "Carpeta personal"
-
#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:58
msgid "Remove From Library"
msgstr "Quitar de la colección"
@@ -1694,107 +1690,115 @@ msgid "Grouping"
msgstr "Agrupación"
#. Catalog.GetString ("Music Library")
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:59
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:60
#: ../src/Dap/Banshee.Dap/Banshee.Dap/MusicGroupSource.cs:39
msgid "Music"
msgstr "Música"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:65
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:66
msgid "Search your music"
msgstr "Buscar en su música"
#. Misc section
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:79
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:80
#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:65
msgid "Miscellaneous"
msgstr "Miscelánea"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:82
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:83
msgid "_Sort an artist's albums by year, not title"
msgstr "_Ordenar los álbumes de un artista por año en lugar de por título"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:92
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:93
#, csharp-format
msgid "{0} song"
msgid_plural "{0} songs"
msgstr[0] "{0} canción"
msgstr[1] "{0} canciones"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:113
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:114
msgid "Music Folder"
msgstr "Carpeta de música"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:118
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:119
#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:95
msgid "Favorites"
msgstr "Favoritos"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:119
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:120
msgid "Songs rated four and five stars"
msgstr "Canciones valoradas con cuatro o cinco estrellas"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:123
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:124
msgid "Recent Favorites"
msgstr "Favoritos recientes"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:124
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:125
msgid "Songs listened to often in the past week"
msgstr "Canciones escuchadas a menudo en la última semana"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:128
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:129
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:95
msgid "Recently Added"
msgstr "Añadidas recientemente"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:129
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:130
msgid "Songs imported within the last week"
msgstr "Canciones importadas durante la última semana"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:133
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:134
+msgid "Recently Played"
+msgstr "Reproducidas recientemente"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:135
+msgid "Recently played songs"
+msgstr "Canciones reproducidas recientemente"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:139
msgid "Unheard"
msgstr "No oídas"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:134
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:140
msgid "Songs that have not been played or skipped"
msgstr "Canciones que han sido omitidas o no reproducidas"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:141
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:147
msgid "Neglected Favorites"
msgstr "Favoritos abandonados"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:142
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:148
msgid "Favorites not played in over two months"
msgstr "Favoritos no reproducidos en más de dos meses"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:146
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:152
msgid "Least Favorite"
msgstr "Menos favoritos"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:147
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:153
msgid "Songs rated one or two stars or that you have frequently skipped"
msgstr "Canciones valoradas con una o dos estrellas u omitidas frecuentemente"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:151
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:157
msgid "700 MB of Favorites"
msgstr "700 MB de favoritos"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:152
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:158
msgid "A data CD worth of favorite songs"
msgstr "Un CD de datos lleno de canciones favoritas"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:157
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:163
msgid "80 Minutes of Favorites"
msgstr "80 minutos de favoritos"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:158
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:164
msgid "An audio CD worth of favorite songs"
msgstr "Un CD de sonido lleno de canciones favoritas"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:163
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:169
msgid "Unrated"
msgstr "No valoradas"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:164
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:170
msgid "Songs that haven't been rated"
msgstr "Canciones que no han sido valoradas"
@@ -1927,11 +1931,6 @@ msgstr "Importar valo_raciones"
msgid "Import play _counts"
msgstr "Importar número de reprodu_cciones"
-#. disabled by default
-#: ../src/Core/Banshee.Services/Banshee.Metrics/BansheeMetrics.cs:312
-msgid "Improve Banshee by sending anonymous usage data"
-msgstr "Mejorar Banshee enviando datos anónimos de uso"
-
#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:52
msgid "There is no available network connection"
msgstr "No hay ninguna red disponible"
@@ -1956,36 +1955,36 @@ msgstr ""
"Algunas características requieren conexión a Internet, como Last.fm o la "
"descarga de portadas"
-#: ../src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:160
+#: ../src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:159
msgid "Search this playlist"
msgstr "Buscar en esta lista de reproducción"
-#: ../src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:229
+#: ../src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:228
msgid "The track's rating was set differently on the device and in Banshee"
msgstr ""
"La valoración de la pista tiene valores diferentes en el dispositivo y en "
"Banshee"
-#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:59
+#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:58
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:309
msgid "Playlist"
msgstr "Lista de reproducción"
-#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:134
+#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:133
msgid "Remove From Playlist"
msgstr "Quitar de la lista de reproducción"
-#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:135
+#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:134
msgid "Delete Playlist"
msgstr "Eliminar la lista de reproducción"
#. TODO generate name based on the track selection, or begin editing it
-#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:386
-#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:392
+#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:385
+#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:391
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:95
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:394
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:542
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:462
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:591
#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214
msgid "New Playlist"
msgstr "Lista de reproducción nueva"
@@ -2032,6 +2031,10 @@ msgstr "Políticas de archivos"
msgid "Co_py files to media folders when importing"
msgstr "C_opiar archivos a las carpetas para contenido multimedia al importar"
+#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:69
+msgid "Improve Banshee by sending anonymous usage data"
+msgstr "Mejorar Banshee enviando datos anónimos de uso"
+
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:63
msgid "items"
msgstr "elementos"
@@ -2454,7 +2457,7 @@ msgid "importedon"
msgstr "importadoen"
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:315
-#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:66
+#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:65
msgid "Smart Playlist"
msgstr "Lista de reproducción inteligente"
@@ -2532,6 +2535,7 @@ msgstr "Añadidos menos recientemente"
#. Translators: These are unique strings for playback errors. Please, no spaces. Blank ok.
#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:44
#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:46
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:146
#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs:97
msgid "None"
msgstr "Ninguno"
@@ -2588,7 +2592,7 @@ msgstr "drm"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:208
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:210
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:212
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:383
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:389
msgid "Unknown"
msgstr "Desconocido"
@@ -2596,26 +2600,26 @@ msgstr "Desconocido"
msgid "unknown"
msgstr "desconocido"
-#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/Migrator.cs:79
+#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/Migrator.cs:78
msgid "Unable to Migrate Smart Playlists"
msgstr "No se pudieron migrar las listas de reproducción inteligentes"
-#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/Migrator.cs:80
+#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/Migrator.cs:79
#, csharp-format
msgid "Please file a bug with this error: {0}"
msgstr "Por favor, abra un bug con este error: {0}"
-#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:67
+#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:66
#: ../src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/Editor.cs:49
msgid "Edit Smart Playlist"
msgstr "Editar la lista de reproducción inteligente"
-#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:242
+#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:249
msgid "Delete Smart Playlist"
msgstr "Eliminar la lista de reproducción inteligente"
#: ../src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs:147
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:163
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:161
#, csharp-format
msgid "All Genres ({0})"
msgstr "Todos los géneros ({0})"
@@ -2660,7 +2664,7 @@ msgid "Close Error Report"
msgstr "Cerrar el informe de error"
#: ../src/Core/Banshee.Services/Banshee.Sources/ErrorSource.cs:83
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:226
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:224
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ErrorListDialog.cs:46
msgid "Error"
msgstr "Error"
@@ -2696,12 +2700,12 @@ msgstr "Je_rarquía de carpetas"
msgid "File _name"
msgstr "_Nombre del archivo"
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:693
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:669
#, csharp-format
msgid "Adding {0} of {1} to {2}"
msgstr "Añadiendo {0} de {1} a {2}"
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:712
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:688
#, csharp-format
msgid "Deleting {0} of {1} From {2}"
msgstr "Eliminando {0} de {1} desde {2}"
@@ -2816,19 +2820,19 @@ msgstr ""
msgid "{0} of {1}"
msgstr "{0} de {1}"
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:224
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:222
msgid "Playing"
msgstr "Reproduciendo"
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:225
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:223
msgid "Paused"
msgstr "Pausado"
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:227
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:225
msgid "Protected"
msgstr "Protegido"
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:228
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:226
msgid "External Document"
msgstr "Documento externo"
@@ -2922,19 +2926,19 @@ msgstr "Lista de reproducción nueva"
msgid "{0} by {1}"
msgstr "{0} por {1}"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:87
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:86
msgid "_Bookmarks"
msgstr "_Marcadores"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:90
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:89
msgid "_Add Bookmark"
msgstr "_Añadir marcador"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:91
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:90
msgid "Bookmark the Position in the Current Track"
msgstr "Marcar la posición en la pista actual"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:104
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:103
msgid "_Remove Bookmark"
msgstr "_Quitar marcador"
@@ -3008,7 +3012,7 @@ msgid "Make Banshee the Default"
msgstr "Hacer Banshee el predeterminado"
#. Translators: verb
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/FileChooserDialog.cs:52
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/FileChooserDialog.cs:53
msgid "I_mport"
msgstr "I_mportar"
@@ -3101,135 +3105,119 @@ msgstr "_Preferencias"
msgid "Modify your personal preferences"
msgstr "Modificar sus preferencias personales"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:83
-msgid "Manage _Extensions"
-msgstr "Gestionar _extensiones"
-
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:84
-msgid "Manage extensions to add new features to Banshee"
-msgstr "Gestione las extensiones para añadir nuevas características a Banshee"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:88
msgid "_Tools"
msgstr "_Herramientas"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:92
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:88
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:134
msgid "_Help"
msgstr "Ay_uda"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:95
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:91
msgid "_Contents"
msgstr "Índ_ice"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:99
-msgid "_Web Resources"
-msgstr "Recursos _web"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
-msgid "Banshee _User Guide (Wiki)"
-msgstr "_Guía del usuario de Banshee (Wiki)"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:103
-msgid "Learn about how to use Banshee"
-msgstr "Aprender como usar Banshee"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:108
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:95
msgid "Advanced Collection Searching"
msgstr "Búsqueda avanzada en la colección"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:109
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:96
msgid "Learn advanced ways to search your media collection"
msgstr "Aprender técnicas avanzadas para buscar en su colección multimedia"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:114
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:101
msgid "Banshee _Home Page"
msgstr "_Página de Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:115
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
msgid "Visit the Banshee Home Page"
msgstr "Visitar la página de Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:120
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
msgid "_Get Involved"
msgstr "_Involucrarse"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:121
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:108
msgid "Become a contributor to Banshee"
msgstr "Convertirse en contribuidor a Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:126
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
msgid "_Version Information"
msgstr "Información de la _versión"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:127
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:114
msgid "View detailed version and configuration information"
msgstr "Ver información detallada de la versión y la configuración"
#. Prompt user for location of the playlist.
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:184
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:169
msgid "Import Playlist"
msgstr "Importar lista de reproducción"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:185
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:559
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:170
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:558
msgid "Playlists"
msgstr "Listas de reproducción"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:67
-msgid "Play or pause the current item"
-msgstr "Reproducir o pausar el elemento actual"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:69
+msgid "Play the current item"
+msgstr "Reproducir el elemento actual"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:70
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:77
msgid "_Next"
msgstr "Siguie_nte"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:71
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:78
msgid "Play the next item"
msgstr "Reproducir el siguiente elemento"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:74
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:81
msgid "Pre_vious"
msgstr "_Anterior"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:75
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:82
msgid "Play the previous item"
msgstr "Reproducir el elemento anterior"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:78
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:85
msgid "Seek _To..."
msgstr "Ir has_ta…"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:79
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:86
msgid "Seek to a specific location in current item"
msgstr "Saltar a una posición específica en el elemento actual"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:83
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:90
msgid "Jump to the currently playing item"
msgstr "Saltar al elemento actualmente en reproducción"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:87
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:94
msgid "Restart the current item"
msgstr "Repetir el elemento actual"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:92
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:99
msgid "_Stop When Finished"
msgstr "_Parar al terminar"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:93
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:100
msgid "Stop playback after the current item finishes playing"
msgstr ""
"Para la reproducción aleatoria cuando este elemento termine de reproducirse"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:99
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:106
msgid "_Playback"
msgstr "_Reproducir"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:190
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:203
msgid "_Pause"
msgstr "Pa_usar"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:202
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:205
+msgid "Pause the current item"
+msgstr "Pausar el elemento actual"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:217
msgid "Sto_p"
msgstr "_Parar"
@@ -3265,10 +3253,49 @@ msgstr "Repetir la canción en reproducción"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackShuffleActions.cs:79
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackShuffleActions.cs:80
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:83
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:84
msgid "Shuffle"
msgstr "Aleatorio"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:62
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:63
+msgid "Subtitle"
+msgstr "Subtítulo"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:65
+msgid "Load File..."
+msgstr "Cargar archivo…"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:66
+msgid "Load subtitle file"
+msgstr "Cargar archivo de subtítulos"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:79
+msgid "Load Subtitle File"
+msgstr "Cargar archivo de subtítulos"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:88
+msgid "L_oad"
+msgstr "C_argar"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:97
+msgid "Subtitle files"
+msgstr "Archivos de subtítulos"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:128
+#, csharp-format
+msgid "Subtitle {0}"
+msgstr "Subtítulo {0}"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:132
+#, csharp-format
+msgid "Activate embedded subtitle {0}"
+msgstr "Activar subtítulo incrustado {0}"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:147
+msgid "Hide subtitles"
+msgstr "Ocultar subtítulos"
+
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:75
msgid "_New Playlist"
msgstr "_Lista de reproducción nueva"
@@ -3342,7 +3369,7 @@ msgstr "Lista de reproducción _inteligente nueva"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:129
#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:84
#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:67
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:78
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:79
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:72
msgid "Refresh"
msgstr "Actualizar"
@@ -3364,134 +3391,134 @@ msgstr "¿Está seguro de querer eliminar esta {0}?"
msgid "Separate by Type"
msgstr "Separar por tipo"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:70
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:110
msgid "Select _All"
msgstr "Seleccionar _todo"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:71
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:111
msgid "Select all tracks"
msgstr "Seleccionar todas las pistas"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:74
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:114
msgid "Select _None"
msgstr "_No seleccionar nada"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:75
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:115
msgid "Unselect all tracks"
msgstr "Deseleccionar todas las pistas"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:78
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:118
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:59
msgid "_Edit Track Information"
msgstr "_Editar la información de la pista"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:79
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:119
msgid "Edit information on selected tracks"
msgstr "Editar la información de las pistas seleccionadas"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:82
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:122
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:252
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:114
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:156
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:117
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:159
msgid "Properties"
msgstr "Propiedades"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:83
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:123
msgid "View information on selected tracks"
msgstr "Ver la información de las pistas seleccionadas"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:87
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:127
msgid "Play the selected item"
msgstr "Reproducir el elemento seleccionado"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:90
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:130
msgid "Add _to Playlist"
msgstr "Añadir a la _lista de reproducción"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:91
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:131
msgid "Append selected items to playlist or create new playlist from selection"
msgstr ""
"Añadir los elemento seleccionados a la lista de reproducción o crear una "
"nueva desde la selección"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:96
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:136
msgid "Create new playlist from selected tracks"
msgstr "Crear una lista de reproducción nueva desde las pistas seleccionadas"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:100
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:140
msgid "_Remove"
msgstr "_Quitar"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:101
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:141
msgid "Remove selected track(s) from this source"
msgstr "Quitar las pistas seleccionadas de esta fuente"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:104
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:144
msgid "Remove From _Library"
msgstr "Quitar de la co_lección"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:105
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:145
msgid "Remove selected track(s) from library"
msgstr "Quitar de la colección las pistas seleccionadas"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:108
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:148
msgid "_Open Containing Folder"
msgstr "Abrir la _carpeta contenedora"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:109
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:149
msgid "Open the folder that contains the selected item"
msgstr "Abrir la carpeta que contiene el elemento seleccionado"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:112
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:152
msgid "_Delete From Drive"
msgstr "Eliminar de la _unidad"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:113
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:153
msgid "Permanently delete selected item(s) from medium"
msgstr "Eliminar permanentemente lo(s) elemento(s) seleccionado(s) del soporte"
#. Translators: this is a verb (command), not a noun (things)
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:119
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:159
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:170
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:112
#, csharp-format
msgid "_Search"
msgstr "_Buscar"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:120
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:160
msgid "Search for items matching certain criteria"
msgstr "Buscar elementos que coincidan con cierto criterio"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:123
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:163
msgid "By Matching _Album"
msgstr "Por coincidencia de álbu_m"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:124
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:164
msgid "Search all songs of this album"
msgstr "Buscar todas las canciones de este álbum"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:127
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:167
msgid "By Matching A_rtist"
msgstr "Por coincidencia de _artista"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:128
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:168
msgid "Search all songs of this artist"
msgstr "Buscar todas las canciones de este artista"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:258
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:322
#, csharp-format
msgid "_Delete From \"{0}\""
msgstr "Eli_minar de «{0}»"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:464
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:542
msgid "The folder could not be found."
msgstr "No se pudo encontrar la carpeta."
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:465
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:543
msgid "Please check that the track's location is accessible by the system."
msgstr "Compruebe que la ubicación de la pista es accesible por el sistema."
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:535
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:620
#, csharp-format
msgid "Are you sure you want to permanently delete this item?"
msgid_plural ""
@@ -3501,16 +3528,16 @@ msgstr[1] ""
"¿Está seguro de querer eliminar los {0} elementos seleccionados "
"permanentemente?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:539
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:624
msgid "If you delete the selection, it will be permanently lost."
msgstr "Si elimina la selección, se perderá permanentemente."
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:542
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:627
#, csharp-format
msgid "Remove selection from {0}?"
msgstr "¿Quitar la selección de {0}?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:545
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:630
#, csharp-format
msgid "Are you sure you want to remove the selected item from your {1}?"
msgid_plural ""
@@ -3805,39 +3832,39 @@ msgstr "Tamaño del archivo:"
msgid "bytes"
msgstr "bytes"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:95
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:97
msgid "Track Editor"
msgstr "Editor de pistas"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:95
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:97
msgid "Track Properties"
msgstr "Propiedades de la pista"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:147
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:151
msgid "Show the previous track"
msgstr "Mostrar la pista anterior"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:153
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:157
msgid "Show the next track"
msgstr "Mostrar la siguiente pista"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:183
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:187
msgid "Title:"
msgstr "Título:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:184
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:188
msgid "Artist:"
msgstr "Artista:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:185
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:189
msgid "Album:"
msgstr "Álbum:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:309
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:313
msgid "Sync all field _values"
msgstr "Sincr. todos los _valores"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:314
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:318
msgid ""
"Apply the values of all common fields set for this track to all of the "
"tracks selected in this editor"
@@ -3845,23 +3872,23 @@ msgstr ""
"Aplicar los valores de todos los campos comunes establecidos para esta pista "
"a todas las pistas seleccionadas en este editor"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:413
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:418
#, csharp-format
msgid "<i>Editing {0} of {1} items</i>"
msgstr "<i>Editando elemento {0} de {1}</i>"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:675
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:698
#, csharp-format
msgid "Save the changes made to the open track?"
msgid_plural "Save the changes made to {0} of {1} open tracks?"
msgstr[0] "¿Guardar los cambios hechos a la pista abierta?"
msgstr[1] "¿Guardar los cambios hechos a {0} de {1} pistas abiertas?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:692
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:715
msgid "Close _without Saving"
msgstr "Cerrar _sin guardar"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:729
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:752
#, csharp-format
msgid "If you don't save, changes from the last {0} will be permanently lost."
msgstr ""
@@ -4007,10 +4034,8 @@ msgid "Files"
msgstr "Archivos"
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:63
-#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/ImportSource.cs:67
-#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:82
-msgid "C_hoose Files"
-msgstr "_Elegir archivos"
+msgid "C_hoose Files..."
+msgstr "_Elegir archivos…"
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:81
msgid "_Files to import:"
@@ -4037,8 +4062,8 @@ msgid "Folders"
msgstr "Carpetas"
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FolderImportSource.cs:57
-msgid "C_hoose Folders"
-msgstr "_Elegir carpetas"
+msgid "C_hoose Folders..."
+msgstr "_Elegir carpetas…"
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FolderImportSource.cs:75
msgid "_Folders to import:"
@@ -4070,14 +4095,10 @@ msgstr "No mostrar este diálogo de nuevo"
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:130
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:82
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:385
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:384
msgid "_Import"
msgstr "_Importar"
-#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/PhotoFolderImportSource.cs:69
-msgid "Videos From Photos Folder"
-msgstr "Vídeos de la carpeta Imágenes"
-
#: ../src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileComboBox.cs:86
msgid "No available profiles"
msgstr "Perfiles no disponibles"
@@ -4323,23 +4344,23 @@ msgstr "Producto"
msgid "Vendor"
msgstr "Fabricante"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:280
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:137
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:284
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:140
#, csharp-format
msgid "Loading {0}"
msgstr "Cargando {0}"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:364
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:370
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:37
msgid "Yes"
msgstr "Sí"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:364
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:370
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:38
msgid "No"
msgstr "No"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:385
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:391
#, csharp-format
msgid ""
"The {0} format is not supported by the device, and no converter was found to "
@@ -4348,12 +4369,12 @@ msgstr ""
"El formato {0} no está soportado por el dispositivo, y no se ha encontrado "
"ningún conversor para convertirlo."
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:391
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:397
msgid "File format conversion support is not available"
msgstr ""
"El soporte para la conversión de formatos de archivo no está disponible"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:417
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:423
msgid "Error converting file"
msgstr "Error al convertir el archivo"
@@ -4693,6 +4714,11 @@ msgstr "Archivos de Amazon MP3"
msgid "Amazon MP3 Purchase"
msgstr "Adquisición en Amazon MP3"
+#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/ImportSource.cs:67
+#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:81
+msgid "C_hoose Files"
+msgstr "_Elegir archivos"
+
#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSource.cs:42
#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:39
msgid "Amazon MP3 Store"
@@ -4797,8 +4823,9 @@ msgid "Book Title"
msgstr "Título del libro"
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:68
-msgid "Audiobooks, etc"
-msgstr "Audiolibros, etc."
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:307
+msgid "Audiobooks"
+msgstr "Audiolibros"
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:75
msgid "Search your audiobooks"
@@ -4824,7 +4851,7 @@ msgid "No Bookmark Set"
msgstr "No existe ningún marcador establecido"
#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdDiscModel.cs:76
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:55
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:56
msgid "Audio CD"
msgstr "CD de sonido"
@@ -4899,7 +4926,7 @@ msgstr ""
"importación."
#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:320
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:440
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:441
msgid "Import CD"
msgstr "Importar CD"
@@ -4915,46 +4942,46 @@ msgstr "Copiar CD"
msgid "Duplicate this audio CD"
msgstr "Copiar este CD de sonido"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:130
-msgid "Searching for CD metadata..."
-msgstr "Buscando metadatos del CD…"
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:131
+msgid "Searching for track information..."
+msgstr "Buscando información de la pista…"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:163
-msgid "Could not fetch metadata for CD."
-msgstr "No se pudieron obtener los metadatos de este CD."
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:164
+msgid "Could not fetch track information"
+msgstr "No se pudo obtener la información de la pista"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:191
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:192
msgid "Automatic import off since this album is already in the Music Library."
msgstr ""
"Desactivación automática de importación dado que este álbum ya se encuentra "
"en la colección de música."
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:214
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:215
msgid "Could not import CD"
msgstr "No se pudo importar el CD"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:231
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:232
msgid "Could not duplicate audio CD"
msgstr "No se pudo copiar el CD de sonido"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:363
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:364
msgid "Ejecting audio CD..."
msgstr "Expulsando CD de sonido…"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:381
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:382
#, csharp-format
msgid "Could not eject audio CD: {0}"
msgstr "No se pudo expulsar el CD de sonido: {0}"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:414
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:415
msgid "Audio CD Preferences"
msgstr "Preferencias de CD de sonido"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:415
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:416
msgid "Eject Disc"
msgstr "Expulsar disco"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:439
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:440
#, csharp-format
msgid "Import ‟{0}”"
msgstr "Importar «{0}»"
@@ -4963,33 +4990,33 @@ msgstr "Importar «{0}»"
msgid "Detecting BPM"
msgstr "Detectando PPM"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:91
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:92
msgid "D_etect"
msgstr "D_etectar"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:103
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:104
msgid "T_ap"
msgstr "_Marcar"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:111
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:112
msgid "Have Banshee attempt to auto-detect the BPM of this song"
msgstr "Hace que Banshee intente autodetectar los PPM de esta canción"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:113
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:114
msgid "Play this song"
msgstr "Reproducir esta canción"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:116
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:117
msgid "Tap this button to the beat to set the BPM for this song manually"
msgstr ""
"Marque el ritmo con este botón para establecer manualmente los PPM de esta "
"canción"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:148
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:147
msgid "_Automatically detect BPM for all songs"
msgstr "Detectar automáticamente los _PPM para todas las canciones"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:149
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:148
msgid ""
"Detect beats per minute (BPM) for all songs that don't already have a value "
"set"
@@ -5094,11 +5121,11 @@ msgstr "Iniciar sesión"
msgid "Connecting to {0}"
msgstr "Conectando a {0}"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:178
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:187
msgid "Add Remote DAAP Server"
msgstr "Añadir servidor DAAP remoto"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:179
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:188
msgid "Add a new remote DAAP server"
msgstr "Añadir un nuevo servidor DAAP remoto"
@@ -5169,15 +5196,15 @@ msgstr "Cancelando descargas"
msgid "Waiting for downloads to terminate..."
msgstr "Esperando a que las descargas finalicen…"
-#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:60
+#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:59
msgid "Import eMusic Downloads to Library"
msgstr "Importar descargas de eMusic a la colección de música"
-#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:62
+#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:61
msgid "eMusic Files"
msgstr "Archivos eMusic"
-#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:78
+#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:77
msgid "eMusic Tracks"
msgstr "Pistas eMusic"
@@ -5187,7 +5214,7 @@ msgid "File System Queue"
msgstr "Cola del sistema de archivos"
#: ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs:72
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:93
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:94
msgid "Clear"
msgstr "Limpiar"
@@ -5196,7 +5223,7 @@ msgid "Remove all tracks from the file system queue"
msgstr "Quitar todas las pistas de la cola del sistema de archivos"
#: ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs:79
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:102
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:103
msgid "Clear on Quit"
msgstr "Limpiar al salir"
@@ -5281,18 +5308,33 @@ msgstr ", {0}"
msgid "Fix?"
msgstr "¿Reparar?"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:48
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:51
msgid "View Item Details"
msgstr "Ver los detalles del elemento"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:57
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:60
msgid "Open Webpage"
msgstr "Abrir página web"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:76
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:79
msgid "Visit Archive.org"
msgstr "Visitar Archive.org"
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:83
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:61
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:170
+msgid "Subscribe"
+msgstr "Suscribirse"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:84
+msgid "Subscribe to this search as a podcast"
+msgstr "Suscribirse a esta búsqueda como podcast"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:88
+#, csharp-format
+msgid "Internet Archive: {0}"
+msgstr "Internet Archive: {0}"
+
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs:78
msgid "Close Item"
msgstr "Cerrar elemento"
@@ -5320,8 +5362,8 @@ msgstr "Error al obtener los detalles del elemento desde Internet Archive"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:205
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:130
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:66
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:138
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:276
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:136
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:279
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastEpisodePage.cs:89
msgid "Description"
msgstr "Descripción"
@@ -5536,10 +5578,6 @@ msgstr ""
msgid "Visit the Internet Archive online at archive.org"
msgstr "Visite Internet Archive en línea en archive.org"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:307
-msgid "Audiobooks"
-msgstr "Audiolibros"
-
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:308
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:78
msgid "Movies"
@@ -5595,7 +5633,7 @@ msgstr "Obtener más"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:128
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:61
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:98
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:137
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:135
msgid "Creator"
msgstr "Creador"
@@ -5822,26 +5860,26 @@ msgstr "Buscar en sus emisoras"
msgid "Edit Station"
msgstr "Editar emisora"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:136
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:134
msgid "Station"
msgstr "Emisora"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:157
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:155
#, csharp-format
msgid "{0} station"
msgid_plural "{0} stations"
msgstr[0] "{0} emisora"
msgstr[1] "{0} emisoras"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:243
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:241
msgid "Please provide a valid station URI"
msgstr "Proporcione un URI de emisora válida"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:256
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:254
msgid "Please provide a station genre"
msgstr "Porporcione un género para la emisora"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:264
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:262
msgid "Please provide a station title"
msgstr "Proporcione un título para la emisora"
@@ -6297,15 +6335,15 @@ msgstr "lastfm:// URL"
msgid "lastfm://"
msgstr "lastfm://"
-#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:109
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:113
msgid "Media"
msgstr "Multimedia"
-#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:119
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:123
msgid "Library"
msgstr "Colección"
-#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:131
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:135
msgid "Launch the Banshee Media Player"
msgstr "Lanzar el reproductor multimedia Banshee"
@@ -6364,6 +6402,7 @@ msgid "Show notifications when item changes"
msgstr "Mostrar notificaciones al cambiar de elemento"
#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:344
+#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:209
msgid "Still Running"
msgstr "Aún en ejecución"
@@ -6376,6 +6415,7 @@ msgstr ""
"finalizar la sesión."
#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:480
+#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:340
msgid "Skip this item"
msgstr "Saltar este elemento"
@@ -6409,22 +6449,22 @@ msgstr ""
"Simplificar la interfaz de En reproducción ocultando la lista de fuentes y "
"más"
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:144
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:143
#, csharp-format
msgid "Unable to import track: {0}"
msgstr "No se pudo importar la pista: {0}"
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:178
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:177
msgid "Importing from Amarok failed"
msgstr "Falló la importación desde Amarok"
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:189
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:188
msgid "Amarok"
msgstr "Amarok"
#. TODO add Help button and dialog/tooltip
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:68
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:384
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:383
msgid "iTunes Importer"
msgstr "Importador de iTunes"
@@ -6441,24 +6481,24 @@ msgid "Import playlists"
msgstr "Importar listas de reproducción"
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:120
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:387
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:386
#, csharp-format
msgid "Locate your \"{0}\" file..."
msgstr "Localice su archivo «{0}»…"
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:138
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:388
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:387
#, csharp-format
msgid "Locate \"{0}\""
msgstr "Localizar «{0}»"
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:167
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:389
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:388
msgid "Locate iTunes Music Directory"
msgstr "Localizar carpeta de música de iTunes"
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:196
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:391
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:390
#, csharp-format
msgid ""
"The iTunes library refers to your music directory as \"{0}\" but Banshee was "
@@ -6467,13 +6507,13 @@ msgstr ""
"La colección de iTunes indica que su carpeta de música es «{0}», pero Banshee "
"no ha podido deducir la ubicación de esta carpeta. Por favor, localícela."
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:75
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:393
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:74
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:392
msgid "iTunes Media Player"
msgstr "Reproductor multimedia iTunes"
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:135
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:395
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:134
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:394
msgid ""
"Banshee is not familiar with this version of the iTunes library format. "
"Importing may or may not work as expected, or at all. Would you like to "
@@ -6483,17 +6523,17 @@ msgstr ""
"importación puede que funcione según lo esperado o que no lo haga en "
"absoluto. ¿Desea intentar la importación de todos modos?"
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:440
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:236
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:397
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:439
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:235
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:396
msgid "Unable to import song."
msgstr "No se pudo importar la canción."
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:370
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:369
msgid "Rhythmbox Music Player"
msgstr "Reproductor de música Rhythmbox"
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:386
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:385
msgid "Import _playlists"
msgstr "Importar _listas de reproducción"
@@ -6505,72 +6545,72 @@ msgstr "Relle_nar"
msgid "f_rom"
msgstr "_desde"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:51
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:52
msgid "Add to Play Queue"
msgstr "Añadir a la cola de reproducción"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:52
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:53
msgid "Append selected songs to the play queue"
msgstr "Añadir las canciones seleccionadas a la cola de reproducción"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:56
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:57
msgid "Play After"
msgstr "Reproducir después de"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:57
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:58
msgid "Add selected songs after the currently playing track, album, or artist"
msgstr ""
"Añadir las canciones seleccionadas después de la pista, álbum o artista "
"actual"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:61
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:62
msgid "Current Track"
msgstr "Pista actual"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:62
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:63
msgid "Add selected songs to the play queue after the currently playing song"
msgstr ""
"Añadir las canciones seleccionadas después de la canción en reproducción"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:66
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:67
msgid "Current Album"
msgstr "Álbum actual"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:67
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:68
msgid "Add selected songs to the play queue after the currently playing album"
msgstr "Añadir las canciones seleccionadas después del álbum en reproducción"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:71
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:72
msgid "Current Artist"
msgstr "Artista actual"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:72
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:73
msgid "Add selected songs to the play queue after the currently playing artist"
msgstr "Añadir las canciones seleccionadas después del artista en reproducción"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:79
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:80
msgid "Refresh random tracks in the play queue"
msgstr "Actualizar las pistas aleatorias en la cola de reproducción"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:84
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:85
msgid "Randomize the playback order of items in the play queue"
msgstr ""
"Hacer aleatorio el orden de reproducción de los elementos de su cola de "
"reproducción"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:88
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:89
msgid "Add More"
msgstr "Añadir más"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:89
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:90
msgid "Add more random tracks to the play queue"
msgstr "Añadir más pistas aleatorias a la cola de reproducción"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:94
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:95
msgid "Remove all tracks from the play queue"
msgstr "Quitar todas las pistas de la cola de reproducción"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:103
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:104
msgid "Clear the play queue when quitting"
msgstr "Limpiar la cola de reproducción al salir"
@@ -6578,16 +6618,17 @@ msgstr "Limpiar la cola de reproducción al salir"
msgid "Remove From Play Queue"
msgstr "Quitar de la cola de reproducción"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:952
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:967
msgid "Number of _played songs to show"
msgstr "Número de canciones _reproducidas que mostrar"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:958
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:973
msgid "Number of _upcoming songs to show"
msgstr "Número de canciones pró_ximas que mostrar"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastFeedModel.cs:47
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:275
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:278
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:89
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastEpisodePage.cs:86
msgid "Podcast"
msgstr "Podcast"
@@ -6597,73 +6638,63 @@ msgstr "Podcast"
msgid "All Podcasts ({0})"
msgstr "Todos los podcasts ({0})"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:99
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:102
msgid "Podcasts Folder"
msgstr "Carpeta de podcasts"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:126
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:129
msgid "Remove Podcast"
msgstr "Podcast remoto"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:131
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:134
msgid "Disable Auto Updates"
msgstr "Desactivar actualizaciones automáticas"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:149
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:152
#, csharp-format
msgid "Network error updating {0}"
msgstr "Error de red al actualizar {0}"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:155
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:158
#, csharp-format
msgid "Parsing error updating {0}"
msgstr "Error de análisis al actualizar {0}"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:158
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:161
#, csharp-format
msgid "Authentication error updating {0}"
msgstr "Error de autenticación al actualizar {0}"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:161
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:164
#, csharp-format
msgid "Error updating {0}"
msgstr "Error al actualizar {0}"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:217
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:220
msgid "Search your podcasts"
msgstr "Buscar en sus podcasts"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:275
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:278
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastEpisodePage.cs:88
msgid "Published"
msgstr "Publicado"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:275
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcastStatusIndicator.cs:66
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:278
msgid "New"
msgstr "Nuevo"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:276
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellDownloadStatus.cs:57
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:279
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcastStatusIndicator.cs:66
msgid "Downloaded"
msgstr "Descargado"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:298
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:305
#, csharp-format
msgid "{0} episode"
msgid_plural "{0} episodes"
msgstr[0] "{0} episodio"
msgstr[1] "{0} episodios"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellDownloadStatus.cs:58
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellUnheard.cs:58
-msgid "All Items"
-msgstr "Todos los elementos"
-
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellDownloadStatus.cs:59
-msgid "Not Downloaded"
-msgstr "No descargado"
-
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:113
msgid "Never updated"
msgstr "Nunca actualizado"
@@ -6686,9 +6717,9 @@ msgstr "Descargando"
msgid "New Items"
msgstr "Elementos nuevos"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellUnheard.cs:59
-msgid "Old Items"
-msgstr "Elementos antiguos"
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellUnheard.cs:58
+msgid "All Items"
+msgstr "Todos los elementos"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs:50
msgid "Downloading Podcast(s)"
@@ -6711,56 +6742,59 @@ msgstr "Añadir podcast…"
msgid "Subscribe to a new podcast"
msgstr "Suscribirse a un podcast nuevo"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:90
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:93
msgid "Unsubscribe and Delete"
msgstr "Desuscribirse y eliminar"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:96
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:99
msgid "Check for New Episodes"
msgstr "Comprobar si hay episodios nuevos"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:102
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:105
msgid "Download All Episodes"
msgstr "Descargar todos los episodios"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:108
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:111
msgid "Visit Podcast Homepage"
msgstr "Visitar la web del podcast"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:120
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:123
msgid "Mark as New"
msgstr "Marcar como nuevo"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:126
-msgid "Mark as Old"
-msgstr "Marcar como antiguo"
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:129
+msgid "Archive"
+msgstr "Archivar"
#. Translators: this is a verb used as a button name, not a noun
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:132
-msgid "Download Podcast(s)"
-msgstr "Descargar podcast(s)"
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:135
+msgid "Download"
+msgstr "Descargar"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:138
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:141
msgid "Cancel Download"
msgstr "Cancelar la descarga"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:144
-msgid "Remove Downloaded File(s)"
-msgstr "Eliminar archivo(s) descargado(s)"
-
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:150
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:153
msgid "Visit Website"
msgstr "Visitar el sitio web"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:162
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:165
msgid "Add Podcast"
msgstr "Añadir podcast"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:326
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:262
+#, csharp-format
+msgid "Delete File"
+msgid_plural "Delete Files"
+msgstr[0] "Eliminar archivo"
+msgstr[1] "Eliminar archivos"
+
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:343
msgid "Invalid URL"
msgstr "URL inválida"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:327
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:344
msgid "Podcast URL is invalid."
msgstr "El URL del podcast no es válido."
@@ -6795,11 +6829,6 @@ msgstr "No hay descripción disponible"
msgid "Podcast:"
msgstr "Podcast:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:61
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:170
-msgid "Subscribe"
-msgstr "Suscribirse"
-
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:92
msgid "Subscribe to New Podcast"
msgstr "Suscribirse a un podcast nuevo"
@@ -6829,6 +6858,44 @@ msgstr "Dejar que el usuario decida qué episodios descargar"
msgid "_Speaker:"
msgstr "_Altavoz:"
+#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:211
+msgid ""
+"Banshee was closed to the sound menu. Use the <i>Quit</i> option to end your "
+"session."
+msgstr ""
+"Banshee se cerró en el menú de sonido. Use la opción <i>Salir</i> para "
+"finalizar la sesión."
+
+#. Translators: {0} and {1} are Artist Name and
+#. Album Title, respectively;
+#. e.g. 'by Parkway Drive from Killing with a Smile'
+#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:257
+#, csharp-format
+msgid "by '{0}' from '{1}'"
+msgstr "por «{0}» de «{1}»"
+
+#. Translators: {0} is for Album Title;
+#. e.g. 'from Killing with a Smile'
+#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:262
+#, csharp-format
+msgid "from '{0}'"
+msgstr "de «{0}»"
+
+#. Translators: {0} is for Artist Name;
+#. e.g. 'by Parkway Drive'
+#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:267
+#, csharp-format
+msgid "by '{0}'"
+msgstr "por «{0}»"
+
+#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:376
+msgid "_Show Banshee in the sound menu"
+msgstr "_Mostrar Banshee en el menú de sonido"
+
+#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:377
+msgid "Control Banshee through the sound menu"
+msgstr "Controlar Banshee a través del menú de sonido"
+
#: ../src/Extensions/Banshee.SqlDebugConsole/Banshee.SqlDebugConsole/SqlActions.cs:59
msgid "Show SQL Console"
msgstr "Mostrar consola SQL"
@@ -6841,6 +6908,10 @@ msgstr "Iniciar la monitorización SQL"
msgid "Stop SQL Monitoring"
msgstr "Parar la monitorización SQL"
+#: ../src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs:89
+msgid "Track Preview"
+msgstr "Vista previa de la pista"
+
#: ../src/Extensions/Banshee.YouTube/Banshee.YouTube.Gui/VideoStreamTile.cs:136
msgid "Uploaded by"
msgstr "Subido por"
@@ -7156,6 +7227,70 @@ msgstr "Conectado a Last.fm"
msgid "Unknown Podcast"
msgstr "Podcast desconocido"
+#~ msgid "Average Bitrate"
+#~ msgstr "Tasa de bits media"
+
+#~ msgid "Extreme"
+#~ msgstr "Extrema"
+
+#~ msgid "Insane"
+#~ msgstr "Demente"
+
+#~ msgid "LAME Preset"
+#~ msgstr "Predefinidos LAME"
+
+#~ msgid "Medium"
+#~ msgstr "Media"
+
+#~ msgid "Preset"
+#~ msgstr "Predefinido"
+
+#~ msgid "Standard"
+#~ msgstr "Estándar"
+
+#~ msgid "VBR Mode"
+#~ msgstr "Modo VBR"
+
+#~ msgid "Home Folder"
+#~ msgstr "Carpeta personal"
+
+#~ msgid "Manage _Extensions"
+#~ msgstr "Gestionar _extensiones"
+
+#~ msgid "Manage extensions to add new features to Banshee"
+#~ msgstr ""
+#~ "Gestione las extensiones para añadir nuevas características a Banshee"
+
+#~ msgid "_Web Resources"
+#~ msgstr "Recursos _web"
+
+#~ msgid "Banshee _User Guide (Wiki)"
+#~ msgstr "_Guía del usuario de Banshee (Wiki)"
+
+#~ msgid "Learn about how to use Banshee"
+#~ msgstr "Aprender como usar Banshee"
+
+#~ msgid "Videos From Photos Folder"
+#~ msgstr "Vídeos de la carpeta Imágenes"
+
+#~ msgid "Audiobooks, etc"
+#~ msgstr "Audiolibros, etc."
+
+#~ msgid "Not Downloaded"
+#~ msgstr "No descargado"
+
+#~ msgid "Old Items"
+#~ msgstr "Elementos antiguos"
+
+#~ msgid "Mark as Old"
+#~ msgstr "Marcar como antiguo"
+
+#~ msgid "Download Podcast(s)"
+#~ msgstr "Descargar podcast(s)"
+
+#~ msgid "Remove Downloaded File(s)"
+#~ msgstr "Eliminar archivo(s) descargado(s)"
+
#~ msgid "_Cover Art"
#~ msgstr "_Portadas"
diff --git a/po/fr.po b/po/fr.po
index 12d1e06..dbcb3ca 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2,6 +2,7 @@
# Copyright (C) 2000-2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the banshee package.
#
+#
# Stéphane Raimbault <stephane.raimbault at gmail.com>, 2005, 2007.
# Jonathan Ernst <jonathan at ernstfamily.ch>, 2006-2007.
# Robert-André Mauchin <zebob.m at pengzone.org>, 2007-2008.
@@ -11,14 +12,13 @@
# Yannick Tailliez <ytdispatch-libre at yahoo.com>, 2008.
# Bruno Brouard <annoa.b at gmail.com>, 2009-2010.
# Laurent Coudeur <laurentc at iol.ie>, 2009, 2010.
-#
msgid ""
msgstr ""
"Project-Id-Version: banshee 0.11\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=banshee&component=general\n"
-"POT-Creation-Date: 2010-08-31 20:58+0000\n"
-"PO-Revision-Date: 2010-09-14 21:02+0200\n"
+"POT-Creation-Date: 2010-11-20 20:48+0000\n"
+"PO-Revision-Date: 2010-11-11 15:02+0100\n"
"Last-Translator: Bruno Brouard <annoa.b at gmail.com>\n"
"Language-Team: GNOME French Team <gnomefr at traduc.org>\n"
"MIME-Version: 1.0\n"
@@ -163,7 +163,7 @@ msgstr ""
#. ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store.addin.xml
#: ../data/addin-xml-strings.cs:70
msgid "Amazon MP3 Store Source"
-msgstr "Source de boutique MP3 Amazon"
+msgstr "Source de la boutique MP3 Amazon"
#: ../data/addin-xml-strings.cs:71
msgid "Browse, search, and purchase music from the Amazon MP3 store"
@@ -281,7 +281,8 @@ msgstr "Réparation des métadonnées"
#: ../data/addin-xml-strings.cs:121
msgid "Fix broken and missing metadata using bulk operations"
msgstr ""
-"Répare les métadonnées cassées ou manquantes en utilisant des opérations massives"
+"Répare les métadonnées cassées ou manquantes en utilisant des opérations "
+"massives"
#. ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive.addin.xml
#: ../data/addin-xml-strings.cs:125
@@ -296,11 +297,11 @@ msgstr "Parcourir et rechercher dans la vaste collection d'Internet Archive."
#. ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio.addin.xml
#: ../data/addin-xml-strings.cs:130
msgid "Internet Radio"
-msgstr "Internet Radio"
+msgstr "Radio internet"
#: ../data/addin-xml-strings.cs:131
msgid "Listen to and organize Internet Radio stations."
-msgstr "Écouter et organiser les stations de Internet Radio."
+msgstr "Écouter et organiser les stations de radio internet."
#. ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.addin.xml
#: ../data/addin-xml-strings.cs:135
@@ -360,7 +361,7 @@ msgstr "Répertoire de Podcast du guide Miro"
#: ../data/addin-xml-strings.cs:160
msgid "Browse and subscribe to thousands of audio and video podcasts."
-msgstr "Rechercher et souscrire à des milliers de podcasts audio et video."
+msgstr "Rechercher et souscrire à des milliers de podcasts audio et vidéo."
#. ../src/Extensions/Banshee.Mpris/Banshee.Mpris.addin.xml
#: ../data/addin-xml-strings.cs:164
@@ -428,9 +429,10 @@ msgstr ""
#. ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.addin.xml
#: ../data/addin-xml-strings.cs:193
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:193
#: ../src/Dap/Banshee.Dap/Banshee.Dap/PodcastGroupSource.cs:38
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:107
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:203
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:212
msgid "Podcasts"
msgstr "Podcasts"
@@ -763,7 +765,7 @@ msgstr "Windows Media Audio"
#: ../data/desktop-files/common.desktop.in.h:1
#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:76
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:109
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:107
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs:206
#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:60
msgid "Banshee Media Player"
@@ -787,8 +789,8 @@ msgid "Could not create filesrc element"
msgstr "Impossible de créer l'élément filesrc"
#: ../libbanshee/banshee-bpmdetector.c:214
-msgid "Could not create decodebin plugin"
-msgstr "Impossible de créer le greffon decodebin"
+msgid "Could not create decodebin2 plugin"
+msgstr "Impossible de créer le greffon decodebin2"
#: ../libbanshee/banshee-bpmdetector.c:220
msgid "Could not create audioconvert plugin"
@@ -828,8 +830,8 @@ msgid "Could not create source element"
msgstr "Impossible de créer l'élément source"
#: ../libbanshee/banshee-transcoder.c:246
-msgid "Could not create 'decodebin' plugin"
-msgstr "Impossible de créer le greffon « decodebin »"
+msgid "Could not create 'decodebin2' plugin"
+msgstr "Impossible de créer le greffon « decodebin2 »"
#: ../libbanshee/banshee-transcoder.c:252
msgid "Could not create sink element"
@@ -863,11 +865,11 @@ msgstr "Graver un CD..."
msgid "Write selected tracks to an audio CD"
msgstr "Grave les pistes sélectionnées sur un CD audio"
-#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:104
+#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:105
msgid "Could not write CD"
msgstr "Impossible de graver le CD"
-#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:105
+#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:106
msgid "Brasero could not be started"
msgstr "Impossible de démarrer Brasero"
@@ -888,7 +890,7 @@ msgid "Could not create BPM detection driver."
msgstr "Impossible de créer le pilote de détection du nombre de BPM."
#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:82
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:766
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:771
msgid "Enable _gapless playback"
msgstr "Activer la lecture _gapless (sans silence)"
@@ -901,19 +903,19 @@ msgstr ""
"concept albums et la musique classique."
#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:150
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:187
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:192
msgid "Could not initialize GStreamer library"
msgstr "Impossible d'initialiser la bibliothèque GStreamer"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:430
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:435
msgid "Unknown Error"
msgstr "Erreur inconnue"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:760
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:765
msgid "_Enable ReplayGain correction"
msgstr "_Activer la correction de gain (ReplayGain)"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:761
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:766
msgid ""
"For tracks that have ReplayGain data, automatically scale (normalize) "
"playback volume"
@@ -921,7 +923,7 @@ msgstr ""
"Adapte automatiquement (normalise) le volume de lecture pour les morceaux "
"intégrant des données ReplayGain."
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:767
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:772
msgid ""
"Eliminate the small playback gap on track change. Useful for concept albums "
"and classical music."
@@ -943,67 +945,67 @@ msgid "_Close"
msgstr "_Fermer"
#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs:92
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:238
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:251
#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:79
#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:133
msgid "Close"
msgstr "Fermer"
-#: ../src/Clients/Booter/Booter/Entry.cs:148
+#: ../src/Clients/Booter/Booter/Entry.cs:152
msgid "Help Options"
msgstr "Options d'aide"
-#: ../src/Clients/Booter/Booter/Entry.cs:149
+#: ../src/Clients/Booter/Booter/Entry.cs:153
msgid "Show this help"
msgstr "Affiche cette aide"
-#: ../src/Clients/Booter/Booter/Entry.cs:150
+#: ../src/Clients/Booter/Booter/Entry.cs:154
msgid "Show options for controlling playback"
msgstr "Afficher les options pour le contrôle de la lecture"
-#: ../src/Clients/Booter/Booter/Entry.cs:151
+#: ../src/Clients/Booter/Booter/Entry.cs:155
msgid "Show options for querying the playing track"
msgstr "Afficher les options pour l'interrogation du morceau en cours"
-#: ../src/Clients/Booter/Booter/Entry.cs:152
+#: ../src/Clients/Booter/Booter/Entry.cs:156
msgid "Show options for querying the playing engine"
msgstr "Afficher les options pour l'interrogation du moteur en cours"
-#: ../src/Clients/Booter/Booter/Entry.cs:153
+#: ../src/Clients/Booter/Booter/Entry.cs:157
msgid "Show options for the user interface"
msgstr "Afficher les options pour l'interface utilisateur"
-#: ../src/Clients/Booter/Booter/Entry.cs:154
+#: ../src/Clients/Booter/Booter/Entry.cs:158
msgid "Show options for developers and debugging"
msgstr "Afficher les options destinées au développeurs et au débogage"
-#: ../src/Clients/Booter/Booter/Entry.cs:155
+#: ../src/Clients/Booter/Booter/Entry.cs:159
msgid "Show all option groups"
msgstr "Afficher tous les groupes d'options"
-#: ../src/Clients/Booter/Booter/Entry.cs:156
+#: ../src/Clients/Booter/Booter/Entry.cs:160
msgid "Show version information"
msgstr "Afficher les informations de version"
-#: ../src/Clients/Booter/Booter/Entry.cs:159
+#: ../src/Clients/Booter/Booter/Entry.cs:163
msgid "Playback Control Options"
msgstr "Options de contrôle de la lecture"
-#: ../src/Clients/Booter/Booter/Entry.cs:160
+#: ../src/Clients/Booter/Booter/Entry.cs:164
msgid ""
"Play the next track, optionally restarting if the 'restart' value is set"
msgstr ""
"Lit le morceau suivant, en redémarrant éventuellement si la valeur "
"« restart » est indiquée"
-#: ../src/Clients/Booter/Booter/Entry.cs:161
+#: ../src/Clients/Booter/Booter/Entry.cs:165
msgid ""
"Play the previous track, optionally restarting if the 'restart value is set"
msgstr ""
"Lit le morceau précédent, en redémarrant éventuellement si la valeur "
"« restart » est indiquée"
-#: ../src/Clients/Booter/Booter/Entry.cs:162
+#: ../src/Clients/Booter/Booter/Entry.cs:166
msgid ""
"If the current song has been played longer than 4 seconds then restart it, "
"otherwise the same as --previous"
@@ -1011,29 +1013,29 @@ msgstr ""
"Si la piste actuelle est en cours de lecture depuis plus de 4 secondes "
"recommence au début, sinon pareil que précédent"
-#: ../src/Clients/Booter/Booter/Entry.cs:163
+#: ../src/Clients/Booter/Booter/Entry.cs:167
msgid "Automatically start playing any tracks enqueued on the command line"
msgstr ""
"Démarre automatiquement tous les morceaux mis en attente sur la ligne de "
"commande"
-#: ../src/Clients/Booter/Booter/Entry.cs:164
+#: ../src/Clients/Booter/Booter/Entry.cs:168
msgid "Start playback"
msgstr "Démarrer la lecture"
-#: ../src/Clients/Booter/Booter/Entry.cs:165
+#: ../src/Clients/Booter/Booter/Entry.cs:169
msgid "Pause playback"
msgstr "Suspendre la lecture"
-#: ../src/Clients/Booter/Booter/Entry.cs:166
+#: ../src/Clients/Booter/Booter/Entry.cs:170
msgid "Toggle playback"
msgstr "Basculer la lecture"
-#: ../src/Clients/Booter/Booter/Entry.cs:167
+#: ../src/Clients/Booter/Booter/Entry.cs:171
msgid "Completely stop playback"
msgstr "Arrêt total de la lecture"
-#: ../src/Clients/Booter/Booter/Entry.cs:169
+#: ../src/Clients/Booter/Booter/Entry.cs:173
msgid ""
"Enable or disable playback stopping after the currently playing track (value "
"should be either 'true' or 'false')"
@@ -1041,108 +1043,108 @@ msgstr ""
"Active ou désactive l'arrêt de la lecture après le morceau en cours (la "
"valeur doit être soit « true » (vrai) soit « false » (faux))"
-#: ../src/Clients/Booter/Booter/Entry.cs:170
+#: ../src/Clients/Booter/Booter/Entry.cs:174
msgid "Set the playback volume (0-100), prefix with +/- for relative values"
msgstr ""
"Définit le volume de lecture (0-100), avec un préfixe +/- pour les valeurs "
"relatives"
-#: ../src/Clients/Booter/Booter/Entry.cs:171
+#: ../src/Clients/Booter/Booter/Entry.cs:175
msgid "Seek to a specific point (seconds, float)"
msgstr "Se positionne en un point précis (en secondes, flottant)"
-#: ../src/Clients/Booter/Booter/Entry.cs:172
+#: ../src/Clients/Booter/Booter/Entry.cs:176
msgid "Set the currently played track's rating (0 to 5)"
msgstr "Définit la note du morceau en cours de lecture (de 0 à 5)"
-#: ../src/Clients/Booter/Booter/Entry.cs:175
+#: ../src/Clients/Booter/Booter/Entry.cs:179
msgid "Player Engine Query Options"
msgstr "Options d'interrogation du moteur de lecture"
-#: ../src/Clients/Booter/Booter/Entry.cs:176
+#: ../src/Clients/Booter/Booter/Entry.cs:180
msgid "Current player state"
msgstr "État actuel du lecteur"
-#: ../src/Clients/Booter/Booter/Entry.cs:177
+#: ../src/Clients/Booter/Booter/Entry.cs:181
msgid "Last player state"
msgstr "Dernier état du lecteur"
-#: ../src/Clients/Booter/Booter/Entry.cs:178
+#: ../src/Clients/Booter/Booter/Entry.cs:182
msgid "Query whether the player can be paused"
msgstr "Interroge si le lecteur peut être mis en pause"
-#: ../src/Clients/Booter/Booter/Entry.cs:179
+#: ../src/Clients/Booter/Booter/Entry.cs:183
msgid "Query whether the player can seek"
msgstr "Interroge si le lecteur peut se déplacer au travers du morceau"
-#: ../src/Clients/Booter/Booter/Entry.cs:180
+#: ../src/Clients/Booter/Booter/Entry.cs:184
msgid "Player volume"
msgstr "Volume du lecteur"
-#: ../src/Clients/Booter/Booter/Entry.cs:181
+#: ../src/Clients/Booter/Booter/Entry.cs:185
msgid "Player position in currently playing track"
msgstr "Position du lecteur dans le morceau en cours de lecture"
-#: ../src/Clients/Booter/Booter/Entry.cs:184
+#: ../src/Clients/Booter/Booter/Entry.cs:188
msgid "Playing Track Metadata Query Options"
msgstr "Options d'interrogation des métadonnées du morceau en cours"
-#: ../src/Clients/Booter/Booter/Entry.cs:185
+#: ../src/Clients/Booter/Booter/Entry.cs:189
msgid "URI"
msgstr "URI"
-#: ../src/Clients/Booter/Booter/Entry.cs:186
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:161
+#: ../src/Clients/Booter/Booter/Entry.cs:190
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:138
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:89
msgid "Artist Name"
msgstr "Nom de l'artiste"
-#: ../src/Clients/Booter/Booter/Entry.cs:187
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:163
+#: ../src/Clients/Booter/Booter/Entry.cs:191
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:140
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:90
msgid "Album Title"
msgstr "Titre de l'album"
-#: ../src/Clients/Booter/Booter/Entry.cs:188
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:160
+#: ../src/Clients/Booter/Booter/Entry.cs:192
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:137
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:88
msgid "Track Title"
msgstr "Titre du morceau"
-#: ../src/Clients/Booter/Booter/Entry.cs:189
+#: ../src/Clients/Booter/Booter/Entry.cs:193
msgid "Duration"
msgstr "Durée"
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:190
+#: ../src/Clients/Booter/Booter/Entry.cs:194
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:117
msgid "Track Number"
msgstr "Numéro du morceau"
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:191
+#: ../src/Clients/Booter/Booter/Entry.cs:195
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:126
msgid "Track Count"
msgstr "Nombre de pistes"
-#: ../src/Clients/Booter/Booter/Entry.cs:192
+#: ../src/Clients/Booter/Booter/Entry.cs:196
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:149
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:113
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:114
msgid "Disc Number"
msgstr "Numéro du disque"
-#: ../src/Clients/Booter/Booter/Entry.cs:193
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:165
+#: ../src/Clients/Booter/Booter/Entry.cs:197
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:142
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:113
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:177
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:77
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:78
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:132
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:77
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:92
msgid "Year"
msgstr "Année"
-#: ../src/Clients/Booter/Booter/Entry.cs:194
+#: ../src/Clients/Booter/Booter/Entry.cs:198
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:230
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:131
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:60
@@ -1150,80 +1152,80 @@ msgstr "Année"
msgid "Rating"
msgstr "Note"
-#: ../src/Clients/Booter/Booter/Entry.cs:195
+#: ../src/Clients/Booter/Booter/Entry.cs:199
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:322
msgid "Score"
msgstr "Score"
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:196
+#: ../src/Clients/Booter/Booter/Entry.cs:200
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:143
msgid "Bit Rate"
msgstr "Débit"
-#: ../src/Clients/Booter/Booter/Entry.cs:199
+#: ../src/Clients/Booter/Booter/Entry.cs:203
msgid "User Interface Options"
msgstr "Options de l'interface utilisateur"
-#: ../src/Clients/Booter/Booter/Entry.cs:200
+#: ../src/Clients/Booter/Booter/Entry.cs:204
msgid "Present the user interface on the active workspace"
msgstr "Affiche l'interface utilisateur sur l'espace de travail actif"
-#: ../src/Clients/Booter/Booter/Entry.cs:201
+#: ../src/Clients/Booter/Booter/Entry.cs:205
msgid "Enter the full-screen mode"
msgstr "Activer le mode plein écran"
-#: ../src/Clients/Booter/Booter/Entry.cs:202
+#: ../src/Clients/Booter/Booter/Entry.cs:206
msgid "Hide the user interface"
msgstr "Masque l'interface utilisateur"
-#: ../src/Clients/Booter/Booter/Entry.cs:203
+#: ../src/Clients/Booter/Booter/Entry.cs:207
msgid "Do not present the user interface, regardless of any other options"
msgstr ""
"Ne pas afficher l'interface utilisateur, quelles que soient les autres "
"options"
-#: ../src/Clients/Booter/Booter/Entry.cs:204
+#: ../src/Clients/Booter/Booter/Entry.cs:208
msgid "Present the import media dialog box"
msgstr "Afficher la boîte de dialogue d'importation de média"
-#: ../src/Clients/Booter/Booter/Entry.cs:205
+#: ../src/Clients/Booter/Booter/Entry.cs:209
msgid "Present the about dialog"
msgstr "Afficher la boîte de dialogue À propos"
-#: ../src/Clients/Booter/Booter/Entry.cs:206
+#: ../src/Clients/Booter/Booter/Entry.cs:210
msgid "Present the open location dialog"
msgstr "Afficher la boîte de dialogue d'ouverture d'emplacement"
-#: ../src/Clients/Booter/Booter/Entry.cs:207
+#: ../src/Clients/Booter/Booter/Entry.cs:211
msgid "Present the preferences dialog"
msgstr "Afficher la boîte de dialogue des préférences"
-#: ../src/Clients/Booter/Booter/Entry.cs:210
+#: ../src/Clients/Booter/Booter/Entry.cs:214
msgid "Debugging and Development Options"
msgstr "Options destinées au développement et au débogage"
-#: ../src/Clients/Booter/Booter/Entry.cs:211
+#: ../src/Clients/Booter/Booter/Entry.cs:215
msgid "Enable general debugging features"
msgstr "Activer les fonctions globales de débogage"
-#: ../src/Clients/Booter/Booter/Entry.cs:212
+#: ../src/Clients/Booter/Booter/Entry.cs:216
msgid "Enable debugging output of SQL queries"
msgstr "Activer la sortie de débogage des requêtes SQL"
-#: ../src/Clients/Booter/Booter/Entry.cs:213
+#: ../src/Clients/Booter/Booter/Entry.cs:217
msgid "Enable debugging output of Mono.Addins"
msgstr "Activer la sortie de débogage de Mono.Addins"
-#: ../src/Clients/Booter/Booter/Entry.cs:214
+#: ../src/Clients/Booter/Booter/Entry.cs:218
msgid "Specify an alternate database to use"
msgstr "Indiquer une base de données alternative à utiliser"
-#: ../src/Clients/Booter/Booter/Entry.cs:215
+#: ../src/Clients/Booter/Booter/Entry.cs:219
msgid "Specify an alternate key, default is /apps/banshee-1/"
msgstr "Indiquer une clé alternative, par défaut la clé est /apps/banshee-1/"
-#: ../src/Clients/Booter/Booter/Entry.cs:216
+#: ../src/Clients/Booter/Booter/Entry.cs:220
msgid ""
"Optimize instance for running uninstalled; most notably, this will create an "
"alternate Mono.Addins database in the working directory"
@@ -1232,17 +1234,17 @@ msgstr ""
"ceci créera une base de données Mono.Addins alternative dans le répertoire "
"de travail"
-#: ../src/Clients/Booter/Booter/Entry.cs:218
+#: ../src/Clients/Booter/Booter/Entry.cs:222
msgid "Disable DBus support completely"
msgstr "Désactiver complètement la prise en charge de DBus"
-#: ../src/Clients/Booter/Booter/Entry.cs:220
+#: ../src/Clients/Booter/Booter/Entry.cs:224
#, csharp-format
msgid "Skip loading a custom gtkrc file ({0}) if it exists"
msgstr ""
"Ignorer le chargement d'un fichier gtkrc personnalisé ({0}) s'il existe"
-#: ../src/Clients/Booter/Booter/Entry.cs:251
+#: ../src/Clients/Booter/Booter/Entry.cs:255
#, csharp-format
msgid "The following help arguments are invalid: {0}"
msgstr "Les paramètres d'aide suivants ne sont pas valides : {0}"
@@ -1258,7 +1260,7 @@ msgstr "Met en a_ttente"
#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:86
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:66
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:196
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:86
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:126
msgid "_Play"
msgstr "_Lire"
@@ -1288,24 +1290,24 @@ msgid "Play Song"
msgstr "Lit le morceau"
#. Translators: this is a verb (command), not a noun (things)
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:447
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:465
msgid "Search"
msgstr "Rechercher"
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:159
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:136
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:87
msgid "Artist, Album, or Title"
msgstr "Artiste, album ou titre"
#. Alias for %album_artist%
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:162
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:139
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:72
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:78
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:82
msgid "Album Artist"
msgstr "Artiste de l'album"
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:164
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:141
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:98
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:185
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:364
@@ -1314,7 +1316,7 @@ msgid "Genre"
msgstr "Genre"
#. Translators: noun
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:166
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:143
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:214
msgid "Comment"
msgstr "Commentaire"
@@ -1338,88 +1340,88 @@ msgstr "Album inconnu"
msgid "Unknown Title"
msgstr "Titre inconnu"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:186
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:191
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:91
msgid "Various Artists"
msgstr "Divers artistes"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:342
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
msgid "Stream location not found"
msgstr "L'emplacement du flux n'a pas été trouvé"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:342
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:324
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:328
msgid "File not found"
msgstr "Fichier introuvable"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:344
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:349
msgid "Codec for playing this media type not available"
msgstr "Le codec pour lire ce type de média n'est pas disponible"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:346
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:351
msgid "File protected by Digital Rights Management (DRM)"
msgstr "Fichier protégé par gestion des droits numériques (GDN)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:353
msgid "Unknown error"
msgstr "Erreur inconnue"
#. TODO turn this into a PrimarySource-owned delegate?
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:417
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:422
msgid "_Restart Podcast"
msgstr "_Redémarrer le podcast"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:418
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:423
msgid "_Restart Audiobook"
msgstr "_Redémarrer le livre audio"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:419
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:424
msgid "_Restart Video"
msgstr "_Redémarrer la vidéo"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:420
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:86
msgid "_Restart Song"
msgstr "_Redémarrer le morceau"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:421
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:426
msgid "_Restart Item"
msgstr "_Redémarrer l'élément"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:437
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:442
msgid "_Jump to Playing Podcast"
msgstr "_Aller au podcast en cours de lecture"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:438
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:443
msgid "_Jump to Playing Audiobook"
msgstr "_Aller au livre audio en cours de lecture"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:439
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:444
msgid "_Jump to Playing Video"
msgstr "_Aller à la vidéo en cours de lecture"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:440
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:82
msgid "_Jump to Playing Song"
msgstr "_Aller au morceau en cours de lecture"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:441
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:446
msgid "_Jump to Playing Item"
msgstr "_Aller à l'élément en cours de lecture"
#. Translators: This is used to generate bookmark names. {0} is track title, {1} is minutes
#. (possibly more than two digits) and {2} is seconds (between 00 and 60).
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/Bookmark.cs:173
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/Bookmark.cs:172
#, csharp-format
msgid "{0} ({1}:{2:00})"
msgstr "{0} ({1}:{2:00})"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs:70
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs:69
#, csharp-format
msgid "All Albums ({0})"
msgstr "Tous les albums ({0})"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistListModel.cs:69
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistListModel.cs:68
#, csharp-format
msgid "All Artists ({0})"
msgstr "Tous les artistes ({0})"
@@ -1429,15 +1431,15 @@ msgstr "Tous les artistes ({0})"
msgid "Value"
msgstr "Valeur"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:50
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:49
msgid "Shuffle by A_lbum"
msgstr "Mélanger par a_lbum"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:51
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:50
msgid "by album"
msgstr "par album"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:52
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:51
msgid "Play all songs from an album, then randomly choose another album"
msgstr ""
"Lit tous les morceaux d'un album, puis choisit au hasard un autre album"
@@ -1455,27 +1457,27 @@ msgid "Play all songs by an artist, then randomly choose another artist"
msgstr ""
"Lit tous les morceaux d'un artiste, puis choisit au hasard un autre artiste"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:36
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:38
msgid "Shuffle _Off"
msgstr "Mode aléatoire _désactivé"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:37
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:39
msgid "manually"
msgstr "manuellement"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:38
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:40
msgid "Do not shuffle playlist"
msgstr "Ne pas mélanger la liste de lecture"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:46
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:45
msgid "Shuffle by _Rating"
msgstr "Mélanger par _Note"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:47
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:46
msgid "by rating"
msgstr "par note"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:48
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:47
msgid "Play songs randomly, prefer higher rated songs"
msgstr "Lit les morceaux au hasard, les morceaux bien notés sont préférés"
@@ -1492,66 +1494,66 @@ msgid "Play songs randomly, prefer higher scored songs"
msgstr ""
"Lit les morceaux au hasard, les morceaux avec de bon score sont préférés"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:47
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:46
msgid "Shuffle by _Song"
msgstr "Mélanger par _morceau"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:48
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:47
msgid "by song"
msgstr "par morceau"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:49
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:48
msgid "Play songs randomly from the playlist"
msgstr "Lit au hasard les morceaux de la liste de lecture"
-#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:132
+#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:138
msgid "Scanning for media"
msgstr "Analyse de médias"
-#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:182
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1382
+#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:188
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1384
msgid "Scanning..."
msgstr "Analyse..."
-#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:198
+#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:204
#, csharp-format
msgid "Scanning ({0} files)..."
msgstr "Analyse ({0} fichiers)..."
-#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:232
+#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:238
msgid "Importing Media"
msgstr "Importation d'un média"
-#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:239
+#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:245
#: ../src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs:119
msgid "The import process is currently running. Would you like to stop it?"
msgstr ""
"Une importation est actuellement en cours. Voulez-vous vraiment l'arrêter ?"
-#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:245
+#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:251
#: ../src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs:81
#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdRipper.cs:185
#, csharp-format
msgid "Importing {0} of {1}"
msgstr "Importation {0} sur {1}"
-#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:79
+#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:78
#, csharp-format
msgid "Rescanning {0} of {1}"
msgstr "Ré-analyse {0} sur {1}"
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:234
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:232
msgid "Upgrading your Banshee Database"
msgstr "Mise à jour de votre base de données Banshee"
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:235
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:233
msgid ""
"Please wait while your old Banshee database is migrated to the new format."
msgstr ""
"Veuillez patienter pendant que votre ancienne base de données migre vers le "
"nouveau format."
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1379
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1381
msgid "Refreshing Metadata"
msgstr "Actualisation des métadonnées"
@@ -1623,16 +1625,12 @@ msgstr "Soft Rock"
msgid "Techno"
msgstr "Techno"
-#: ../src/Core/Banshee.Services/Banshee.Library/HomeDirectoryImportSource.cs:48
-msgid "Home Folder"
-msgstr "Dossier personnel"
-
#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:58
msgid "Remove From Library"
msgstr "Enlever de la bibliothèque"
#. Translators: {0} is the library name, eg 'Music Library' or 'Podcasts'
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:65
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:122
#, csharp-format
msgid "{0} Folder"
msgstr "Dossier {0}"
@@ -1662,7 +1660,7 @@ msgid "Album"
msgstr "Album"
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:108
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:72
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:73
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:127
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:76
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:97
@@ -1670,58 +1668,58 @@ msgid "Title"
msgstr "Titre"
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:119
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:83
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:84
msgid "Count"
msgstr "Numéro"
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:125
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:89
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:90
msgid "Number"
msgstr "Nombre"
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:131
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:95
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:96
msgid "Count (unsorted)"
msgstr "Numéro (non trié)"
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:137
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:101
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:102
msgid "Number (unsorted)"
msgstr "Nombre (non trié)"
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:143
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:108
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:107
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:108
msgid "Disc Count"
msgstr "Numéro de disque"
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:155
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:206
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:119
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:120
msgid "Grouping"
msgstr "Groupement"
#. Catalog.GetString ("Music Library")
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:59
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/MusicGroupSource.cs:38
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:60
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/MusicGroupSource.cs:39
msgid "Music"
msgstr "Musique"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:65
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:66
msgid "Search your music"
msgstr "Rechercher votre musique"
#. Misc section
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:79
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:80
#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:65
msgid "Miscellaneous"
msgstr "Divers"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:82
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:83
msgid "_Sort an artist's albums by year, not title"
msgstr "Trier les album_s d'un artiste par année, pas par titre"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:92
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:93
#, csharp-format
msgid "{0} song"
msgid_plural "{0} songs"
@@ -1729,76 +1727,88 @@ msgstr[0] "{0} morceau"
msgstr[1] "{0} morceaux"
#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:114
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:91
+msgid "Music Folder"
+msgstr "Dossier musique"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:119
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:95
msgid "Favorites"
msgstr "Favoris"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:115
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:120
msgid "Songs rated four and five stars"
msgstr "Morceaux notés quatre et cinq étoiles"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:119
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:124
msgid "Recent Favorites"
msgstr "Favoris récents"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:120
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:125
msgid "Songs listened to often in the past week"
msgstr "Morceaux fréquemment écoutés cette semaine"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:124
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:129
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:95
msgid "Recently Added"
msgstr "Récemment ajoutés"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:125
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:130
msgid "Songs imported within the last week"
msgstr "Morceaux importés cette semaine"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:129
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:134
+msgid "Recently Played"
+msgstr "Récemment lus"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:135
+msgid "Recently played songs"
+msgstr "Chansons récemment lues"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:139
msgid "Unheard"
msgstr "Non écoutés"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:130
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:140
msgid "Songs that have not been played or skipped"
msgstr "Morceaux non écoutés ou ignorés"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:137
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:147
msgid "Neglected Favorites"
msgstr "Favoris négligés"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:138
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:148
msgid "Favorites not played in over two months"
msgstr "Favoris non joués durant les deux derniers mois"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:142
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:152
msgid "Least Favorite"
msgstr "Les moins favoris"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:143
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:153
msgid "Songs rated one or two stars or that you have frequently skipped"
msgstr "Morceaux notés une ou deux étoiles ou fréquemment sautés"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:147
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:157
msgid "700 MB of Favorites"
msgstr "700 Mio de favoris"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:148
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:158
msgid "A data CD worth of favorite songs"
msgstr "Un CD de données rempli de vos morceaux préférées"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:153
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:163
msgid "80 Minutes of Favorites"
msgstr "80 minutes de favoris"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:154
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:164
msgid "An audio CD worth of favorite songs"
msgstr "Un CD audio rempli de vos morceaux préférés"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:159
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:169
msgid "Unrated"
msgstr "Non noté"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:160
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:170
msgid "Songs that haven't been rated"
msgstr "Morceaux qui n'ont pas été notés"
@@ -1832,15 +1842,19 @@ msgid_plural "{0} videos"
msgstr[0] "{0} vidéo"
msgstr[1] "{0} vidéos"
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:92
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:90
+msgid "Videos Folder"
+msgstr "Dossier Vidéos"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:96
msgid "Videos rated four and five stars"
msgstr "Vidéos notées quatre et cinq étoiles"
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:96
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:100
msgid "Unwatched"
msgstr "Non regardée"
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:97
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:101
msgid "Videos that haven't been played yet"
msgstr "Vidéos qui n'ont pas encore été lues"
@@ -1930,7 +1944,7 @@ msgid "Import play _counts"
msgstr "Importer le nombre d'é_coutes"
#. disabled by default
-#: ../src/Core/Banshee.Services/Banshee.Metrics/BansheeMetrics.cs:302
+#: ../src/Core/Banshee.Services/Banshee.Metrics/BansheeMetrics.cs:312
msgid "Improve Banshee by sending anonymous usage data"
msgstr "Améliorer Banshee en envoyant les données d'utilisation anonymes"
@@ -1946,11 +1960,11 @@ msgstr "Impossible de se connecter à NetworkManager ou Wicd"
msgid "An available, working network connection will be assumed"
msgstr "Une connexion réseau opérationnelle est supposée disponible"
-#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:157
+#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:159
msgid "_Disable features requiring Internet access"
msgstr "_Désactiver les fonctionnalités nécessitant une connexion internet"
-#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:158
+#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:160
msgid ""
"Some features require a broadband Internet connection such as Last.fm or "
"cover art fetching"
@@ -1958,36 +1972,36 @@ msgstr ""
"Certaines fonctionnalités nécessitent une connexion internet à haut débit, "
"comme Last.fm ou la récupération des pochettes d'albums"
-#: ../src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:160
+#: ../src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:159
msgid "Search this playlist"
msgstr "Rechercher cette liste de lecture"
-#: ../src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:229
+#: ../src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:228
msgid "The track's rating was set differently on the device and in Banshee"
msgstr ""
"Le classement du morceau est différent entre le périphérique et dans Banshee"
-#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:59
+#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:58
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:309
msgid "Playlist"
msgstr "Liste de lecture"
-#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:134
+#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:133
msgid "Remove From Playlist"
msgstr "Enlever de la liste de lecture"
-#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:135
+#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:134
msgid "Delete Playlist"
msgstr "Supprimer la liste de lecture"
#. TODO generate name based on the track selection, or begin editing it
-#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:386
-#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:392
+#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:385
+#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:391
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:95
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:394
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:500
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:213
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:452
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:542
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214
msgid "New Playlist"
msgstr "Nouvelle liste de lecture"
@@ -2038,18 +2052,22 @@ msgid "items"
msgstr "éléments"
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:64
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:60
msgid "minutes"
msgstr "minutes"
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:65
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:61
msgid "hours"
msgstr "heures"
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:66
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs:63
msgid "MB"
msgstr "Mio"
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:67
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs:64
msgid "GB"
msgstr "Gio"
@@ -2185,7 +2203,7 @@ msgstr "Bits par échantillon"
#. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:163
msgid "bitspersample"
-msgstr "bits,par,echantillon"
+msgstr "bitsparechantillon"
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:163
msgid "bitdepth"
@@ -2246,7 +2264,7 @@ msgstr "compositeur"
#. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:201
msgid "conductor"
-msgstr "chef d'orchestre"
+msgstr "chefd'orchestre"
#. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:208
@@ -2454,7 +2472,7 @@ msgid "importedon"
msgstr "importéle"
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:315
-#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:66
+#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:65
msgid "Smart Playlist"
msgstr "Liste de lecture intelligente"
@@ -2589,7 +2607,7 @@ msgstr "gdn"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:208
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:210
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:212
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:383
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:389
msgid "Unknown"
msgstr "Inconnu"
@@ -2597,21 +2615,21 @@ msgstr "Inconnu"
msgid "unknown"
msgstr "inconnu"
-#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/Migrator.cs:79
+#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/Migrator.cs:78
msgid "Unable to Migrate Smart Playlists"
msgstr "Impossible de migrer les listes de lecture intelligentes"
-#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/Migrator.cs:80
+#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/Migrator.cs:79
#, csharp-format
msgid "Please file a bug with this error: {0}"
msgstr "Veuillez signaler cette anomalie avec cette erreur : {0}"
-#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:67
+#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:66
#: ../src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/Editor.cs:49
msgid "Edit Smart Playlist"
msgstr "Modifier la liste de lecture intelligente"
-#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:242
+#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:249
msgid "Delete Smart Playlist"
msgstr "Supprimer la liste de lecture intelligente"
@@ -2661,7 +2679,7 @@ msgid "Close Error Report"
msgstr "Fermer le rapport d'erreur"
#: ../src/Core/Banshee.Services/Banshee.Sources/ErrorSource.cs:83
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:226
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:224
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ErrorListDialog.cs:46
msgid "Error"
msgstr "Erreur"
@@ -2697,12 +2715,12 @@ msgstr "Hié_rarchie des dossiers"
msgid "File _name"
msgstr "_Nom du fichier"
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:689
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:669
#, csharp-format
msgid "Adding {0} of {1} to {2}"
msgstr "Ajout {0} sur {1} vers {2}"
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:708
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:688
#, csharp-format
msgid "Deleting {0} of {1} From {2}"
msgstr "Suppression {0} sur {1} de {2}"
@@ -2722,6 +2740,18 @@ msgid_plural "{0} items"
msgstr[0] "{0} élément"
msgstr[1] "{0} éléments"
+#. TODO should add library sources here, but requires changing quite a few
+#. things that depend on being loaded before the music library is added.
+#. AddSource (music_library = new MusicLibrarySource (), true);
+#. AddSource (video_library = new VideoLibrarySource (), false);
+#: ../src/Core/Banshee.Services/Banshee.Sources/SourceManager.cs:84
+msgid "Libraries"
+msgstr "Bibliothèques"
+
+#: ../src/Core/Banshee.Services/Banshee.Sources/SourceManager.cs:85
+msgid "Online Media"
+msgstr "Média en ligne"
+
#: ../src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs:82
#: ../src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs:91
msgid "Error opening stream"
@@ -2755,7 +2785,7 @@ msgid "Show:"
msgstr "Afficher :"
#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:51
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:84
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:83
msgid "All"
msgstr "Toutes"
@@ -2802,19 +2832,19 @@ msgstr ""
msgid "{0} of {1}"
msgstr "{0} sur {1}"
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:224
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:222
msgid "Playing"
msgstr "Lecture"
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:225
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:223
msgid "Paused"
msgstr "En pause"
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:227
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:225
msgid "Protected"
msgstr "Protégé"
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:228
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:226
msgid "External Document"
msgstr "Document externe"
@@ -2909,15 +2939,15 @@ msgstr "Nouveau pré-réglage"
msgid "{0} by {1}"
msgstr "{0} par {1}"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:87
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:86
msgid "_Bookmarks"
msgstr "_Signets"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:90
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:89
msgid "_Add Bookmark"
msgstr "_Ajouter un signet"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:91
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:90
msgid "Bookmark the Position in the Current Track"
msgstr "Marque la position sur le morceau en cours de lecture."
@@ -2996,7 +3026,7 @@ msgid "Make Banshee the Default"
msgstr "Définir Banshee comme lecteur par défaut"
#. Translators: verb
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/FileChooserDialog.cs:52
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/FileChooserDialog.cs:53
msgid "I_mport"
msgstr "I_mporter"
@@ -3089,80 +3119,60 @@ msgstr "_Préférences"
msgid "Modify your personal preferences"
msgstr "Modifie vos préférences personnelles"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:83
-msgid "Manage _Extensions"
-msgstr "Gérer les _extensions"
-
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:84
-msgid "Manage extensions to add new features to Banshee"
-msgstr "Gère les extensions pour ajouter de nouvelles fonctions à Banshee"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:88
msgid "_Tools"
msgstr "Ou_tils"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:92
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:135
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:88
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:134
msgid "_Help"
msgstr "Aid_e"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:95
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:91
msgid "_Contents"
msgstr "_Sommaire"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:99
-msgid "_Web Resources"
-msgstr "Ressources _Web"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
-msgid "Banshee _User Guide (Wiki)"
-msgstr "Guide _utilisateur de Banshee (Wiki)"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:103
-msgid "Learn about how to use Banshee"
-msgstr "Apprenez-en plus sur l'utilisation de Banshee"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:108
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:95
msgid "Advanced Collection Searching"
msgstr "Recherche avancée dans la bibliothèque"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:109
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:96
msgid "Learn advanced ways to search your media collection"
msgstr ""
"Apprenez à utiliser des méthodes avancées pour faire des recherches dans "
"votre bibliothèque multimédia"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:114
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:101
msgid "Banshee _Home Page"
msgstr "Page d'_accueil de Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:115
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
msgid "Visit the Banshee Home Page"
msgstr "Consultez la page d'accueil Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:120
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
msgid "_Get Involved"
msgstr "_Participer"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:121
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:108
msgid "Become a contributor to Banshee"
msgstr "Devenez un contributeur de Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:126
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
msgid "_Version Information"
msgstr "Information de _version"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:127
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:114
msgid "View detailed version and configuration information"
msgstr "Affiche des informations détaillées sur la version et la configuration"
#. Prompt user for location of the playlist.
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:184
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:169
msgid "Import Playlist"
msgstr "Importer une liste de lecture"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:185
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:559
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:170
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:558
msgid "Playlists"
msgstr "Listes de lecture"
@@ -3253,7 +3263,7 @@ msgstr "Répète le morceau en cours de lecture"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackShuffleActions.cs:79
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackShuffleActions.cs:80
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:62
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:84
msgid "Shuffle"
msgstr "Mode aléatoire"
@@ -3330,8 +3340,8 @@ msgstr "Nouvelle liste de lecture _intelligente"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:129
#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:84
#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:67
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:57
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:71
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:79
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:72
msgid "Refresh"
msgstr "Actualiser"
@@ -3352,135 +3362,135 @@ msgstr "Voulez-vous vraiment supprimer {0} ?"
msgid "Separate by Type"
msgstr "Séparer par type"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:70
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:110
msgid "Select _All"
msgstr "_Tout sélectionner"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:71
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:111
msgid "Select all tracks"
msgstr "Sélectionner tous les morceaux"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:74
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:114
msgid "Select _None"
msgstr "_Aucune sélection"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:75
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:115
msgid "Unselect all tracks"
msgstr "Désélectionner tous les morceaux"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:78
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:118
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:59
msgid "_Edit Track Information"
msgstr "_Modifier les informations du morceau"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:79
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:119
msgid "Edit information on selected tracks"
msgstr "Modifie les informations des morceaux sélectionnés"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:82
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:122
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:252
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:113
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:155
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:117
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:159
msgid "Properties"
msgstr "Propriétés"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:83
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:123
msgid "View information on selected tracks"
msgstr "Affiche les informations des morceaux sélectionnés"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:87
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:127
msgid "Play the selected item"
msgstr "Lit l'élément sélectionné"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:90
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:130
msgid "Add _to Playlist"
msgstr "Ajouter à la _liste de lecture"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:91
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:131
msgid "Append selected items to playlist or create new playlist from selection"
msgstr ""
"Ajoute les éléments sélectionnés à la liste de lecture ou crée une nouvelle "
"liste de lecture à partir de la sélection"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:96
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:136
msgid "Create new playlist from selected tracks"
msgstr "Crée une nouvelle liste de lecture à partir des morceaux sélectionnés"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:100
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:140
msgid "_Remove"
msgstr "_Supprimer"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:101
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:141
msgid "Remove selected track(s) from this source"
msgstr "Supprime le(s) morceau(x) sélectionné(s) de cette source"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:104
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:144
msgid "Remove From _Library"
msgstr "Supprimer de la _bibliothèque"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:105
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:145
msgid "Remove selected track(s) from library"
msgstr "Supprime le(s) morceau(x) sélectionné(s) de votre bibliothèque"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:108
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:148
msgid "_Open Containing Folder"
msgstr "_Ouvrir le dossier conteneur"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:109
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:149
msgid "Open the folder that contains the selected item"
msgstr "Ouvre le dossier qui contient l'élément sélectionné"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:112
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:152
msgid "_Delete From Drive"
msgstr "Supprimer du _disque"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:113
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:153
msgid "Permanently delete selected item(s) from medium"
msgstr ""
"Supprime définitivement les éléments sélectionnés du support de stockage"
#. Translators: this is a verb (command), not a noun (things)
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:119
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:171
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:159
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:170
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:112
#, csharp-format
msgid "_Search"
msgstr "_Rechercher"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:120
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:160
msgid "Search for items matching certain criteria"
msgstr "Recherche d'éléments correspondants à certains critères"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:123
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:163
msgid "By Matching _Album"
msgstr "Par _album correspondant"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:124
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:164
msgid "Search all songs of this album"
msgstr "Recherche tous les morceaux de cet album"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:127
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:167
msgid "By Matching A_rtist"
msgstr "Par a_rtiste correspondant"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:128
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:168
msgid "Search all songs of this artist"
msgstr "Recherche tous les morceaux de cet artiste"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:258
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:312
#, csharp-format
msgid "_Delete From \"{0}\""
msgstr "_Supprimer de « {0} »"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:464
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:532
msgid "The folder could not be found."
msgstr "Le dossier est introuvable."
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:465
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:533
msgid "Please check that the track's location is accessible by the system."
msgstr "Vérifiez que l'emplacement de la piste soit accessible par le système."
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:535
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:610
#, csharp-format
msgid "Are you sure you want to permanently delete this item?"
msgid_plural ""
@@ -3489,17 +3499,17 @@ msgstr[0] "Voulez-vous vraiment supprimer définitivement cet élément ?"
msgstr[1] ""
"Voulez-vous vraiment supprimer définitivement les {0} éléments sélectionnés ?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:539
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:614
msgid "If you delete the selection, it will be permanently lost."
msgstr "Si vous supprimez la sélection, elle sera définitivement perdue."
# Titre de boîte de dialogue.
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:542
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:617
#, csharp-format
msgid "Remove selection from {0}?"
msgstr "Suppression de la sélection sur {0} ?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:545
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:620
#, csharp-format
msgid "Are you sure you want to remove the selected item from your {1}?"
msgid_plural ""
@@ -3790,43 +3800,44 @@ msgid "File Size:"
msgstr "Taille du fichier :"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:222
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs:61
msgid "bytes"
msgstr "octets"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:95
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:97
msgid "Track Editor"
msgstr "Éditeur de morceau"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:95
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:97
msgid "Track Properties"
msgstr "Propriétés du morceau"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:147
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:149
msgid "Show the previous track"
msgstr "Affiche le morceau précédent"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:153
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:155
msgid "Show the next track"
msgstr "Affiche le morceau suivant"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:183
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:185
msgid "Title:"
msgstr "Titre :"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:184
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:186
msgid "Artist:"
msgstr "Artiste :"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:185
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:187
msgid "Album:"
msgstr "Album :"
# NdT : Attention le texte ne doit pas être trop long
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:309
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:311
msgid "Sync all field _values"
msgstr "Synchroniser toutes les _valeurs"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:314
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:316
msgid ""
"Apply the values of all common fields set for this track to all of the "
"tracks selected in this editor"
@@ -3834,12 +3845,12 @@ msgstr ""
"Applique les réglages communs des champs pour ce morceau à tous les morceaux "
"sélectionnés dans cet éditeur"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:413
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:416
#, csharp-format
msgid "<i>Editing {0} of {1} items</i>"
msgstr "<i>Modification de l'élément {0} sur {1}</i>"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:675
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:678
#, csharp-format
msgid "Save the changes made to the open track?"
msgid_plural "Save the changes made to {0} of {1} open tracks?"
@@ -3847,11 +3858,11 @@ msgstr[0] "Enregistrer les modifications effectuées au morceau ouvert ?"
msgstr[1] ""
"Enregistrer les modifications effectuées aux {0} sur {1} morceaux ouverts ?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:692
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:695
msgid "Close _without Saving"
msgstr "Fermer _sans enregistrer"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:729
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:732
#, csharp-format
msgid "If you don't save, changes from the last {0} will be permanently lost."
msgstr ""
@@ -3903,24 +3914,24 @@ msgstr[1] "Tâches en cours"
#. Translators: {0} and {1} are for markup so ignore them, {2} and {3}
#. are Podcast Name and Published Date, respectively;
#. e.g. 'from BBtv published 7/26/2007'
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:525
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:523
#, csharp-format
msgid "{0}from{1} {2} {0}published{1} {3}"
msgstr "{0}de{1} {2} {0}publié le{1} {3}"
#. simply: "Chicago Public Radio" or whatever the artist name is
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:538
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:536
msgid "Unknown Stream"
msgstr "Flux inconnu"
#. Translators: {0} and {1} are markup so ignore them, {2} is the name of the radio station
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:541
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:539
#, csharp-format
msgid "{0}on{1} {2}"
msgstr "{0}sur{1} {2}"
#. Translators: {0} is the "from {album} by {artist}" type string, and {1} is the "on {radio station name}" string
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:544
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:542
#, csharp-format
msgid "{0} {1}"
msgstr "{0} {1}"
@@ -3928,14 +3939,14 @@ msgstr "{0} {1}"
#. Translators: {0} and {1} are for markup so ignore them, {2} and {3}
#. are Artist Name and Album Title, respectively;
#. e.g. 'by Parkway Drive from Killing with a Smile'
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:580
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:578
#, csharp-format
msgid "{0}by{1} {2} {0}from{1} {3}"
msgstr "{0}par{1} {2} {0}sur{1} {3}"
#. Translators: {0} and {1} are for markup so ignore them, {2} is for Album Title;
#. e.g. 'from Killing with a Smile'
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:584
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:582
#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:522
#, csharp-format
msgid "{0}from{1} {2}"
@@ -3943,7 +3954,7 @@ msgstr "{0}sur{1} {2}"
#. Translators: {0} and {1} are for markup so ignore them, {2} is for Artist Name;
#. e.g. 'by Parkway Drive'
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:588
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:586
#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:526
#, csharp-format
msgid "{0}by{1} {2}"
@@ -3999,10 +4010,8 @@ msgid "Files"
msgstr "Fichiers"
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:63
-#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/ImportSource.cs:67
-#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:82
-msgid "C_hoose Files"
-msgstr "C_hoisir des fichiers"
+msgid "C_hoose Files..."
+msgstr "C_hoisir des fichiers..."
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:81
msgid "_Files to import:"
@@ -4029,8 +4038,8 @@ msgid "Folders"
msgstr "Dossiers"
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FolderImportSource.cs:57
-msgid "C_hoose Folders"
-msgstr "C_hoisir des dossiers"
+msgid "C_hoose Folders..."
+msgstr "C_hoisir des dossiers..."
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FolderImportSource.cs:75
msgid "_Folders to import:"
@@ -4063,14 +4072,10 @@ msgstr "Ne plus afficher ce message"
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:130
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:82
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:385
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:384
msgid "_Import"
msgstr "_Importer"
-#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/PhotoFolderImportSource.cs:69
-msgid "Videos From Photos Folder"
-msgstr "Vidéos depuis le dossier Photos"
-
#: ../src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileComboBox.cs:86
msgid "No available profiles"
msgstr "Aucun profil disponible"
@@ -4132,6 +4137,10 @@ msgstr "Nouvelle liste de lecture intelligente"
msgid "Playlist _Name:"
msgstr "_Nom de la liste de lecture :"
+#: ../src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/Editor.cs:108
+msgid "Predefined Smart Playlists"
+msgstr "Listes de lecture intelligente prédéfinies"
+
#: ../src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/Editor.cs:119
msgid "Open in editor"
msgstr "Ouvrir dans l'éditeur"
@@ -4193,7 +4202,7 @@ msgid "Idle"
msgstr "Inactif"
#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:149
-#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/UserJobDownloadManager.cs:68
+#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/AmazonDownloadManager.cs:58
msgid "Contacting..."
msgstr "Contact en cours..."
@@ -4213,30 +4222,30 @@ msgstr "Muet"
msgid "Full Volume"
msgstr "Volume maximum"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:89
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:101
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:101
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:102
msgid "Device"
msgstr "Périphérique"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:90
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:103
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:102
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:104
msgid "Generation"
msgstr "Génération"
#. FIXME
#. AddDapProperty (Catalog.GetString ("Color"), "black");
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:95
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:104
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:107
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:105
msgid "Capacity"
msgstr "Capacité"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:96
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:108
msgid "Available"
msgstr "Disponible"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:97
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:105
-#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:135
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:109
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:106
+#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:141
msgid "Serial number"
msgstr "Numéro de série"
@@ -4245,43 +4254,42 @@ msgstr "Numéro de série"
#. string [] capabilities = new string [ipod_device.ModelInfo.Capabilities.Count];
#. ipod_device.ModelInfo.Capabilities.CopyTo (capabilities, 0);
#. AddDapProperty (Catalog.GetString ("Capabilities"), String.Join (", ", capabilities));
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:104
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:112
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:116
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:113
msgid "Supports cover art"
msgstr "Prend en charge l'affichage des pochettes d'album"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:105
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:113
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:117
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:114
msgid "Supports photos"
msgstr "Prend en charge l'affichage des photos"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:388
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:468
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:412
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:491
msgid "Track duration is zero"
msgstr "La durée de la piste est nulle"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:490
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:651
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:515
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:694
msgid "Syncing iPod"
msgstr "Synchronisation de l'iPod"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:491
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:652
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:516
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:695
msgid "Preparing to synchronize..."
msgstr "Préparation de la synchronisation..."
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:494
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:519
#, csharp-format
msgid "Adding track {0} of {1}"
msgstr "Ajout piste {0} sur {1}"
-#. TODO sync updated metadata to changed tracks
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:512
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:555
#, csharp-format
msgid "Removing track {0} of {1}"
msgstr "Suppression piste {0} sur {1}"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:568
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:619
msgid "Writing media database"
msgstr "Écriture de la base de données des médias"
@@ -4291,11 +4299,18 @@ msgid "Sync {0}"
msgstr "Synchronisation de {0}"
#. Note to translators: {0}, {1} and {2} will be replaced with numbers.
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapLibrarySync.cs:256
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapLibrarySync.cs:260
#, csharp-format
msgid "{0} to add, {1} to remove, {2} to update"
msgstr "{0} à ajouter, {1} à effacer, {2} à mettre à jour"
+#. This group source gives us a seperator for DAPs in the source view.
+#. We add it when we get our first dap source, and then remove it when
+#. we lose the last one.
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs:63
+msgid "Devices"
+msgstr "Périphériques"
+
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:176
msgid "Device Properties"
msgstr "Propriétés de périphérique"
@@ -4308,23 +4323,23 @@ msgstr "Produit"
msgid "Vendor"
msgstr "Fournisseur"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:280
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:133
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:284
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:142
#, csharp-format
msgid "Loading {0}"
msgstr "Chargement de {0}"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:364
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:370
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:37
msgid "Yes"
msgstr "Oui"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:364
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:370
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:38
msgid "No"
msgstr "Non"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:385
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:391
#, csharp-format
msgid ""
"The {0} format is not supported by the device, and no converter was found to "
@@ -4333,13 +4348,13 @@ msgstr ""
"Le format {0} n'est pas pris en charge par le périphérique et aucun "
"convertisseur n'a été trouvé pour le convertir"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:391
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:397
msgid "File format conversion support is not available"
msgstr ""
"La prise en charge de la conversion de format de fichiers n'est pas "
"disponible"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:417
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:423
msgid "Error converting file"
msgstr "Erreur lors de la conversion du fichier"
@@ -4434,7 +4449,7 @@ msgstr "Gérer manuellement"
#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/LibrarySyncOptions.cs:71
msgid "Sync entire library"
-msgstr "Synchronisation de toute la bibliothèque"
+msgstr "Synchroniser toute la bibliothèque"
#. Translators: {0} is the name of a playlist
#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/LibrarySyncOptions.cs:124
@@ -4487,35 +4502,35 @@ msgstr "Enregistrement de la nouvelle base de données..."
msgid "Error rebuilding iPod database"
msgstr "Erreur lors de la reconstruction de la base de données de l'iPod"
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:102
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:103
msgid "Color"
msgstr "Couleur"
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:106
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:107
msgid "Produced on"
msgstr "Produit le"
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:107
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:108
msgid "Firmware"
msgstr "Micrologiciel"
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:111
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:112
msgid "Capabilities"
msgstr "Fonctionnalités"
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:635
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:680
msgid "Out of space on device"
msgstr "Plus de place disponible sur le périphérique"
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:635
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:680
msgid "Please manually remove some songs"
msgstr "Veuillez supprimer manuellement des morceaux"
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:673
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:724
msgid "Updating..."
msgstr "Mise à jour..."
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:677
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:728
msgid "Flushing to disk..."
msgstr "Écriture sur le disque..."
@@ -4640,29 +4655,34 @@ msgstr ""
"périphériques MTP. Voir http://www.banshee-project.org/Guide/DAPs/MTP pour "
"plus d'informations."
-#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:136
+#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:142
+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/VersionInformationDialog.cs:66
msgid "Version"
msgstr "Version"
-#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:138
+#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:144
msgid "Battery level"
msgstr "Niveau de la batterie"
#. user_event.Progress = (double)current / total;
#. Translators: {0} is the name of the MTP audio device (eg Gabe's Zen Player), {1} is the
#. track currently being loaded, and {2} is the total # of tracks that will be loaded.
-#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:154
+#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:160
#, csharp-format
msgid "Loading {0} - {1} of {2}"
msgstr "Chargement de {0} - {1} sur {2}"
+#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/AmazonDownloadManager.cs:57
+msgid "Amazon MP3 Purchases"
+msgstr "Achats MP3 Amazon"
+
#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/AmazonMp3DownloaderService.cs:53
msgid "Amazon MP3s"
msgstr "MP3 Amazon"
#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/AmazonMp3DownloaderService.cs:54
msgid "Songs purchased from the Amazon MP3 Store"
-msgstr "Morceaux achetés dans le magasin MP3 Amazon"
+msgstr "Morceaux achetés dans la boutique MP3 Amazon"
#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/ImportSource.cs:40
msgid "Download Amazon MP3 Purchase"
@@ -4676,28 +4696,15 @@ msgstr "Fichiers MP3 Amazon"
msgid "Amazon MP3 Purchase"
msgstr "Achat MP3 Amazon"
-#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/UserJobDownloadManager.cs:67
-msgid "Amazon MP3 Purchases"
-msgstr "Achats MP3 Amazon"
-
-#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/UserJobDownloadManager.cs:176
-#, csharp-format
-msgid "{0} download at {1}/s"
-msgid_plural "{0} downloads at {1}/s"
-msgstr[0] "{0} téléchargé à {1}/s"
-msgstr[1] "{0} téléchargés à {1}/s"
-
-#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/UserJobDownloadManager.cs:184
-#, csharp-format
-msgid "{0} download at {1}/s ({2} pending)"
-msgid_plural "{0} downloads at {1}/s ({2} pending)"
-msgstr[0] "{0} téléchargé à {1}/s ({2} en attente)"
-msgstr[1] "{0} téléchargés à {1}/s ({2} en attente)"
+#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/ImportSource.cs:67
+#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:81
+msgid "C_hoose Files"
+msgstr "C_hoisir des fichiers"
#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSource.cs:42
#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:39
msgid "Amazon MP3 Store"
-msgstr "Magasin MP3 Amazon"
+msgstr "Boutique MP3 Amazon"
#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSourcePreferences.cs:57
msgid "Country"
@@ -4734,7 +4741,7 @@ msgstr "États-Unis (amazon.com)"
#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:43
#, csharp-format
msgid "Search the Amazon MP3 Store"
-msgstr "Rechercher le magasin MP3 Amazon"
+msgstr "Rechercher la boutique MP3 Amazon"
#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:45
msgid "How Your Purchases Support GNOME"
@@ -4788,29 +4795,35 @@ msgstr "Titre du livre :"
msgid "Author"
msgstr "Auteur"
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:62
+#. Translators: This means the first letter of the author's name
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:63
msgid "Author Initial"
msgstr "Auteur original"
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:67
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:68
msgid "Book Title"
msgstr "Titre du livre"
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:68
-msgid "Audiobooks, etc"
-msgstr "Livres audio, etc."
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:307
+msgid "Audiobooks"
+msgstr "Livres audio"
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:75
msgid "Search your audiobooks"
msgstr "Rechercher vos livres audio"
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:144
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:145
#, csharp-format
msgid "{0} book"
msgid_plural "{0} books"
msgstr[0] "{0} livre"
msgstr[1] "{0} livres"
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:149
+msgid "Audiobooks Folder"
+msgstr "Dossier livres audio"
+
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/BookView.cs:114
msgid "Resume Playback"
msgstr "Reprendre la lecture"
@@ -4820,7 +4833,7 @@ msgid "No Bookmark Set"
msgstr "Aucun signet paramétré"
#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdDiscModel.cs:76
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:55
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:56
msgid "Audio CD"
msgstr "CD audio"
@@ -4898,7 +4911,7 @@ msgstr ""
"qu'elle ralentit significativement l'importation."
#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:320
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:440
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:441
msgid "Import CD"
msgstr "Importer le CD"
@@ -4914,46 +4927,46 @@ msgstr "Copier le CD"
msgid "Duplicate this audio CD"
msgstr "Copie ce CD audio"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:130
-msgid "Searching for CD metadata..."
-msgstr "Recherche des métadonnées sur le CD..."
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:131
+msgid "Searching for track information..."
+msgstr "Recherche d'informations sur la piste..."
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:163
-msgid "Could not fetch metadata for CD."
-msgstr "Impossible de récupérer des métadonnées sur le CD."
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:164
+msgid "Could not fetch track information"
+msgstr "Impossible de récupérer des informations sur la piste"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:191
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:192
msgid "Automatic import off since this album is already in the Music Library."
msgstr ""
"L'importation automatique est désactivée car cet album se trouve déjà dans "
"la bibliothèque de musique."
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:214
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:215
msgid "Could not import CD"
msgstr "Impossible d'importer le CD"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:231
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:232
msgid "Could not duplicate audio CD"
msgstr "Impossible de copier le CD audio"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:363
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:364
msgid "Ejecting audio CD..."
msgstr "Éjection du CD audio..."
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:381
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:382
#, csharp-format
msgid "Could not eject audio CD: {0}"
msgstr "Impossible d'éjecter le CD audio : {0}"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:414
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:415
msgid "Audio CD Preferences"
msgstr "Préférences CD audio"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:415
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:416
msgid "Eject Disc"
msgstr "Éjecter le disque"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:439
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:440
#, csharp-format
msgid "Import ‟{0}”"
msgstr "Importer « {0} »"
@@ -4962,35 +4975,35 @@ msgstr "Importer « {0} »"
msgid "Detecting BPM"
msgstr "Détection du nombre de BPM"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:91
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:92
msgid "D_etect"
msgstr "Dét_ecter"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:103
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:104
msgid "T_ap"
msgstr "Fr_apper"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:111
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:112
msgid "Have Banshee attempt to auto-detect the BPM of this song"
msgstr ""
"Permettre à Banshee d'essayer de détecter automatiquement le nombre de BPM "
"pour ce morceau"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:113
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:114
msgid "Play this song"
msgstr "Lire ce morceau"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:116
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:117
msgid "Tap this button to the beat to set the BPM for this song manually"
msgstr ""
"Cliquez au rythme de la musique pour définir manuellement le nombre de BPM "
"de ce morceau"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:148
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:147
msgid "_Automatically detect BPM for all songs"
msgstr "Détecter _automatiquement le nombre de BPM pour tous les morceaux"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:149
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:148
msgid ""
"Detect beats per minute (BPM) for all songs that don't already have a value "
"set"
@@ -5007,22 +5020,6 @@ msgstr "Téléchargement de la pochette"
msgid "{0} - {1}"
msgstr "{0} - {1}"
-#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtService.cs:107
-msgid "_Cover Art"
-msgstr "Pochette de l'_album"
-
-#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtService.cs:108
-msgid "Manage cover art"
-msgstr "Gérer les pochettes"
-
-#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtService.cs:110
-msgid "_Download Cover Art"
-msgstr "_Télécharger les pochettes"
-
-#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtService.cs:111
-msgid "Download cover art for all tracks"
-msgstr "Télécharge les pochettes pour toutes les pistes"
-
#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapContainerSource.cs:42
msgid "Shared Music"
msgstr "Musique partagée"
@@ -5111,11 +5108,11 @@ msgstr "Identifiant"
msgid "Connecting to {0}"
msgstr "Connexion à {0}"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:178
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:187
msgid "Add Remote DAAP Server"
msgstr "Ajouter un serveur distant DAAP"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:179
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:188
msgid "Add a new remote DAAP server"
msgstr "Ajoute un nouveau serveur distant DAAP"
@@ -5186,15 +5183,15 @@ msgstr "Annulation des téléchargements"
msgid "Waiting for downloads to terminate..."
msgstr "Attente de la fin des téléchargements..."
-#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:60
+#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:59
msgid "Import eMusic Downloads to Library"
msgstr "Importer les téléchargements eMusic dans la bibliothèque"
-#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:62
+#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:61
msgid "eMusic Files"
msgstr "Fichiers eMusic"
-#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:78
+#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:77
msgid "eMusic Tracks"
msgstr "Pistes eMusic"
@@ -5204,7 +5201,7 @@ msgid "File System Queue"
msgstr "File d'attente du système de fichiers"
#: ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs:72
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:72
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:94
msgid "Clear"
msgstr "Effacer"
@@ -5213,7 +5210,7 @@ msgid "Remove all tracks from the file system queue"
msgstr "Supprime tous les morceaux de la file d'attente du système de fichiers"
#: ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs:79
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:81
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:103
msgid "Clear on Quit"
msgstr "Effacer en quittant"
@@ -5299,18 +5296,33 @@ msgstr ", {0}"
msgid "Fix?"
msgstr "Réparer ?"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:48
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:51
msgid "View Item Details"
msgstr "Détails de l'élément"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:57
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:60
msgid "Open Webpage"
msgstr "Ouvrir la page Web"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:76
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:79
msgid "Visit Archive.org"
msgstr "Consulter Archive.org"
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:83
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:61
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:170
+msgid "Subscribe"
+msgstr "S'abonner"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:84
+msgid "Subscribe to this search as a podcast"
+msgstr "S'abonne à cette recherche sous la forme d'un podcast"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:88
+#, csharp-format
+msgid "Internet Archive: {0}"
+msgstr "Internet Archive : {0}"
+
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs:78
msgid "Close Item"
msgstr "Fermer l'élément"
@@ -5339,7 +5351,7 @@ msgstr "Erreur lors de l'obtention des détails depuis Internet Archive"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:130
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:66
#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:136
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:271
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:286
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastEpisodePage.cs:89
msgid "Description"
msgstr "Description"
@@ -5437,22 +5449,22 @@ msgstr[1] "{0} critiques, moyenne {1}"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:289
#, csharp-format
msgid "{0} by {1} on {2}"
-msgstr "{0} par {1} sur {2}"
+msgstr "{0} par {1} le {2}"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:319
msgid "Write your own review"
msgstr "Faites votre propre critique"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:109
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:108
msgid "Collection:"
msgstr "Collection :"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:118
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:117
#, csharp-format
msgid "Optional Query"
msgstr "Requête optionnelle"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:165
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:164
msgid "Sort by:"
msgstr "Trier par :"
@@ -5554,10 +5566,6 @@ msgstr ""
msgid "Visit the Internet Archive online at archive.org"
msgstr "Visitez Internet Archive sur le site archive.org"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:307
-msgid "Audiobooks"
-msgstr "Livres audio"
-
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:308
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:78
msgid "Movies"
@@ -5833,11 +5841,11 @@ msgstr "Ajouter une station"
msgid "Add a new Internet Radio station or playlist"
msgstr "Ajouter une nouvelle station de radio ou liste de lecture internet"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:81
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:83
msgid "Search your stations"
msgstr "Rechercher vos stations"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:82
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:84
#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationEditor.cs:60
msgid "Edit Station"
msgstr "Modifier la station"
@@ -5859,7 +5867,7 @@ msgstr "Renseignez un URI de station valide"
#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:254
msgid "Please provide a station genre"
-msgstr "Renseignez un genre de station"
+msgstr "Renseignez un type de station"
#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:262
msgid "Please provide a station title"
@@ -5904,6 +5912,7 @@ msgid "Description:"
msgstr "Description :"
#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:128
+#: ../src/Hyena/Hyena.Gui/Hyena.Widgets/RatingMenuItem.cs:50
msgid "Rating:"
msgstr "Note :"
@@ -6429,22 +6438,22 @@ msgstr ""
"Simplifie l'interface en cours de lecture en masquant la liste des sources "
"et plus encore"
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:144
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:143
#, csharp-format
msgid "Unable to import track: {0}"
msgstr "Impossible d'importer la piste : {0}"
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:178
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:177
msgid "Importing from Amarok failed"
msgstr "L'importation depuis Amarok a échoué"
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:189
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:188
msgid "Amarok"
msgstr "Amarok"
#. TODO add Help button and dialog/tooltip
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:68
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:384
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:383
msgid "iTunes Importer"
msgstr "Assistant d'importation iTunes"
@@ -6461,24 +6470,24 @@ msgid "Import playlists"
msgstr "Importer les listes de lecture"
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:120
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:387
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:386
#, csharp-format
msgid "Locate your \"{0}\" file..."
msgstr "Localiser votre fichier « {0} »..."
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:138
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:388
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:387
#, csharp-format
msgid "Locate \"{0}\""
msgstr "Localise « {0} »"
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:167
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:389
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:388
msgid "Locate iTunes Music Directory"
msgstr "Trouver le dossier de musique iTunes"
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:196
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:391
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:390
#, csharp-format
msgid ""
"The iTunes library refers to your music directory as \"{0}\" but Banshee was "
@@ -6488,13 +6497,13 @@ msgstr ""
"« {0} » mais Banshee n'a pas été capable de trouver l'emplacement de ce "
"dossier. Cherchez-le manuellement."
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:75
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:393
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:74
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:392
msgid "iTunes Media Player"
msgstr "Lecteur de média iTunes"
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:135
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:395
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:134
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:394
msgid ""
"Banshee is not familiar with this version of the iTunes library format. "
"Importing may or may not work as expected, or at all. Would you like to "
@@ -6504,17 +6513,17 @@ msgstr ""
"peut ne pas fonctionner comme prévue, ou ne pas fonctionner du tout. Voulez "
"vous essayer d'importer quand même ?"
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:440
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:236
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:397
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:439
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:235
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:396
msgid "Unable to import song."
msgstr "Impossible d'importer le morceau."
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:370
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:369
msgid "Rhythmbox Music Player"
msgstr "Lecteur de musique Rhythmbox"
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:386
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:385
msgid "Import _playlists"
msgstr "Im_porter les listes de lecture"
@@ -6526,38 +6535,78 @@ msgstr "_Remplir"
msgid "f_rom"
msgstr "_de"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:50
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:52
msgid "Add to Play Queue"
msgstr "Ajouter à la file d'attente de lecture"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:51
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:53
msgid "Append selected songs to the play queue"
msgstr "Ajoute les morceaux sélectionnés à la file d'attente de lecture"
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:57
+msgid "Play After"
+msgstr "Lire après"
+
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:58
+msgid "Add selected songs after the currently playing track, album, or artist"
+msgstr ""
+"Ajoute les chansons sélectionnées après la piste, l'album ou l'artiste en "
+"cours de lecture"
+
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:62
+msgid "Current Track"
+msgstr "Piste actuelle"
+
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:63
+msgid "Add selected songs to the play queue after the currently playing song"
+msgstr ""
+"Ajoute les chansons sélectionnées à la file d'attente de lecture après la "
+"chanson en cours de lecture"
+
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:67
+msgid "Current Album"
+msgstr "Album actuel"
+
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:68
+msgid "Add selected songs to the play queue after the currently playing album"
+msgstr ""
+"Ajoute les chansons sélectionnées à la file d'attente de lecture après "
+"l'album en cours de lecture"
+
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:72
+msgid "Current Artist"
+msgstr "Artiste actuel"
+
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:73
+msgid "Add selected songs to the play queue after the currently playing artist"
+msgstr ""
+"Ajoute les chansons sélectionnées à la file d'attente de lecture après "
+"l'artiste en cours de lecture"
+
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:80
msgid "Refresh random tracks in the play queue"
msgstr ""
"Rafraichir l'ordre aléatoire pour les morceaux de la file d'attente de "
"lecture"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:63
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:85
msgid "Randomize the playback order of items in the play queue"
msgstr ""
"Mettre dans un ordre aléatoire les morceaux de la file d'attente de lecture"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:67
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:89
msgid "Add More"
msgstr "Ajouter plus"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:68
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:90
msgid "Add more random tracks to the play queue"
msgstr "Ajoute plus de morceaux aléatoires dans la file d'attente de lecture"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:73
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:95
msgid "Remove all tracks from the play queue"
msgstr "Enlève tous les morceaux de la file d'attente de lecture"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:82
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:104
msgid "Clear the play queue when quitting"
msgstr "Effacer la file d'attente de lecture à la fermeture du programme"
@@ -6565,16 +6614,17 @@ msgstr "Effacer la file d'attente de lecture à la fermeture du programme"
msgid "Remove From Play Queue"
msgstr "Enlever de la file d'attente de lecture"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:864
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:959
msgid "Number of _played songs to show"
msgstr "Nombre des morceaux _lus à afficher"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:870
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:965
msgid "Number of _upcoming songs to show"
msgstr "Nombre des morceaux _suivants à afficher"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastFeedModel.cs:47
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:270
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:285
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:89
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastEpisodePage.cs:86
msgid "Podcast"
msgstr "Podcast"
@@ -6584,54 +6634,58 @@ msgstr "Podcast"
msgid "All Podcasts ({0})"
msgstr "Tous les podcasts ({0})"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:122
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:104
+msgid "Podcasts Folder"
+msgstr "Dossier podcasts"
+
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:131
msgid "Remove Podcast"
msgstr "Supprimer le podcast"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:127
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:136
msgid "Disable Auto Updates"
msgstr "Désactiver les mises à jour automatiques"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:145
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:154
#, csharp-format
msgid "Network error updating {0}"
msgstr "Erreur réseau lors de la mise à jour de {0}"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:151
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:160
#, csharp-format
msgid "Parsing error updating {0}"
msgstr "Erreur d'analyse lors de la mise à jour de {0}"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:154
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:163
#, csharp-format
msgid "Authentication error updating {0}"
msgstr "Erreur d'authentification durant la mise à jour de {0}"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:157
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:166
#, csharp-format
msgid "Error updating {0}"
msgstr "Erreur de mise à jour de {0}"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:213
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:222
msgid "Search your podcasts"
msgstr "Rechercher vos podcasts"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:270
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:285
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastEpisodePage.cs:88
msgid "Published"
msgstr "Publié"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:270
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcastStatusIndicator.cs:66
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:285
msgid "New"
msgstr "Nouveau"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:271
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:286
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellDownloadStatus.cs:57
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcastStatusIndicator.cs:66
msgid "Downloaded"
msgstr "Téléchargé"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:293
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:312
#, csharp-format
msgid "{0} episode"
msgid_plural "{0} episodes"
@@ -6682,69 +6736,76 @@ msgstr "Téléchargement du (des) podcast(s)"
msgid "Cancel all podcast downloads?"
msgstr "Annuler tous les téléchargements de podcasts ?"
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/HeaderWidget.cs:99
+msgid "_Limit to episodes from"
+msgstr "_Limiter aux épisodes à partir du"
+
#. "<control><shift>U",
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:72
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:73
msgid "Check all podcasts for new episodes"
msgstr "Chercher les nouveaux épisodes de tous les podcasts"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:77
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:78
msgid "Add Podcast..."
-msgstr "Ajouter le podcast..."
+msgstr "Ajouter un podcast..."
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:78
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:79
msgid "Subscribe to a new podcast"
msgstr "S'abonne à un nouveau podcast"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:89
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:93
msgid "Unsubscribe and Delete"
msgstr "Se désabonner et supprimer"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:95
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:99
msgid "Check for New Episodes"
msgstr "Rechercher de nouveaux épisodes"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:101
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:105
msgid "Download All Episodes"
msgstr "Télécharger tous les épisodes"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:107
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:111
msgid "Visit Podcast Homepage"
msgstr "Visiter la page d'accueil du podcast"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:119
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:123
msgid "Mark as New"
msgstr "Marquer comme nouveau"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:125
-msgid "Mark as Old"
-msgstr "Marquer comme ancien"
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:129
+msgid "Archive"
+msgstr "Archive"
#. Translators: this is a verb used as a button name, not a noun
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:131
-msgid "Download Podcast(s)"
-msgstr "Télécharger le(s) podcast(s)"
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:135
+msgid "Download"
+msgstr "Télécharger"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:137
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:141
msgid "Cancel Download"
msgstr "Annuler les téléchargements"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:143
-msgid "Remove Downloaded File(s)"
-msgstr "Supprimer le(s) fichier(s) téléchargé(s)"
-
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:149
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:153
msgid "Visit Website"
msgstr "Visiter le site Web"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:161
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:165
msgid "Add Podcast"
-msgstr "Ajouter le podcast"
+msgstr "Ajouter un podcast"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:325
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:262
+#, csharp-format
+msgid "Delete File"
+msgid_plural "Delete Files"
+msgstr[0] "Supprimer le fichier"
+msgstr[1] "Supprimer les fichiers"
+
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:343
msgid "Invalid URL"
msgstr "URL non valide"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:326
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:344
msgid "Podcast URL is invalid."
msgstr "L'URL du podcast n'est pas valide."
@@ -6779,11 +6840,6 @@ msgstr "Aucune description disponible"
msgid "Podcast:"
msgstr "Podcast :"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:61
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:170
-msgid "Subscribe"
-msgstr "S'abonner"
-
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:92
msgid "Subscribe to New Podcast"
msgstr "S'abonner à un nouveau podcast"
@@ -6843,6 +6899,185 @@ msgstr "Jouer dans le navigateur Web..."
msgid "No videos found"
msgstr "Aucune vidéo trouvée"
+#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/Accessibility/ColumnHeaderCellTextAccessible.cs:36
+msgid "open context menu"
+msgstr "ouvrir le menu contextuel"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/Accessibility/ColumnHeaderCellTextAccessible.cs:37
+msgid "click"
+msgstr "clic"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/Accessibility/ColumnHeaderCellTextAccessible.cs:37
+msgid "menu"
+msgstr "menu"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs:612
+#, csharp-format
+msgid "Hide <i>{0}</i>"
+msgstr "Masquer <i>{0}</i>"
+
+#. Translators: {0} is substituted with the application name
+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:53
+#, csharp-format
+msgid "{0} Encountered a Fatal Error"
+msgstr "{0} a rencontré une erreur fatale"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:92
+msgid "Error Details"
+msgstr "Détails de l'erreur"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:136
+msgid "An unhandled exception was thrown: "
+msgstr "Une exception non prise en charge a été émise :"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/VersionInformationDialog.cs:58
+msgid "Assembly Version Information"
+msgstr "Information de version de l'assemblage"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/VersionInformationDialog.cs:64
+msgid "Assembly Name"
+msgstr "Nom de l'assemblage"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs:62
+msgid "KB"
+msgstr "Kio"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:86
+msgid "Condition:"
+msgstr "Condition :"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:104
+msgid "_Match"
+msgstr "_Correspondance"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:111
+msgid "all"
+msgstr "toutes"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:112
+msgid "any"
+msgstr "certaines"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:117
+msgid "of the following:"
+msgstr "parmi les suivantes :"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryLimitBox.cs:58
+msgid "_Limit to"
+msgstr "_Limiter à"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryLimitBox.cs:85
+msgid "selected by"
+msgstr "sélectionné par"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/RelativeTimeSpanQueryValueEntry.cs:42
+msgid "ago"
+msgstr "il y a"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:59
+msgid "seconds"
+msgstr "secondes"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:62
+msgid "days"
+msgstr "jours"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:63
+msgid "weeks"
+msgstr "semaines"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:64
+msgid "months"
+msgstr "mois"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:65
+msgid "years"
+msgstr "années"
+
+#: ../src/Hyena/Hyena/Hyena.Downloader/DownloadManagerJob.cs:71
+#, csharp-format
+msgid "{0} download at {1}/s"
+msgid_plural "{0} downloads at {1}/s"
+msgstr[0] "{0} téléchargé à {1}/s"
+msgstr[1] "{0} téléchargés à {1}/s"
+
+#: ../src/Hyena/Hyena/Hyena.Downloader/DownloadManagerJob.cs:79
+#, csharp-format
+msgid "{0} download at {1}/s ({2} pending)"
+msgid_plural "{0} downloads at {1}/s ({2} pending)"
+msgstr[0] "{0} téléchargé à {1}/s ({2} en attente)"
+msgstr[1] "{0} téléchargés à {1}/s ({2} en attente)"
+
+#. public static readonly Operator Equal = new Operator ("equals", "= {0}", "==", "=", ":");
+#. public static readonly Operator NotEqual = new Operator ("notEqual", "!= {0}", true, "!=", "!:");
+#. public static readonly Operator LessThanEqual = new Operator ("lessThanEquals", "<= {0}", "<=");
+#. public static readonly Operator GreaterThanEqual = new Operator ("greaterThanEquals", ">= {0}", ">=");
+#: ../src/Hyena/Hyena/Hyena.Query/DateQueryValue.cs:47
+msgid "before"
+msgstr "avant"
+
+#: ../src/Hyena/Hyena/Hyena.Query/DateQueryValue.cs:48
+msgid "after"
+msgstr "après"
+
+#: ../src/Hyena/Hyena/Hyena.Query/EnumQueryValue.cs:43
+#: ../src/Hyena/Hyena/Hyena.Query/IntegerQueryValue.cs:41
+#: ../src/Hyena/Hyena/Hyena.Query/StringQueryValue.cs:45
+msgid "is"
+msgstr "est"
+
+#: ../src/Hyena/Hyena/Hyena.Query/EnumQueryValue.cs:44
+#: ../src/Hyena/Hyena/Hyena.Query/IntegerQueryValue.cs:42
+#: ../src/Hyena/Hyena/Hyena.Query/StringQueryValue.cs:46
+msgid "is not"
+msgstr "n'est pas"
+
+#: ../src/Hyena/Hyena/Hyena.Query/IntegerQueryValue.cs:43
+#: ../src/Hyena/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:47
+msgid "at most"
+msgstr "au plus"
+
+#: ../src/Hyena/Hyena/Hyena.Query/IntegerQueryValue.cs:44
+#: ../src/Hyena/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:46
+msgid "at least"
+msgstr "au moins"
+
+#: ../src/Hyena/Hyena/Hyena.Query/IntegerQueryValue.cs:45
+#: ../src/Hyena/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:45
+msgid "less than"
+msgstr "moins de"
+
+#. The SQL operators in these Operators are reversed from normal on purpose
+#: ../src/Hyena/Hyena/Hyena.Query/IntegerQueryValue.cs:46
+#: ../src/Hyena/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:44
+msgid "more than"
+msgstr "plus de"
+
+#: ../src/Hyena/Hyena/Hyena.Query/NullQueryValue.cs:41
+msgid "empty"
+msgstr "vide"
+
+#: ../src/Hyena/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:90
+#, csharp-format
+msgid "{0} ago"
+msgstr "il y a {0}"
+
+#: ../src/Hyena/Hyena/Hyena.Query/StringQueryValue.cs:43
+msgid "contains"
+msgstr "contient"
+
+#: ../src/Hyena/Hyena/Hyena.Query/StringQueryValue.cs:44
+msgid "doesn't contain"
+msgstr "ne contient pas"
+
+#: ../src/Hyena/Hyena/Hyena.Query/StringQueryValue.cs:47
+msgid "starts with"
+msgstr "commence par"
+
+#: ../src/Hyena/Hyena/Hyena.Query/StringQueryValue.cs:48
+msgid "ends with"
+msgstr "se termine par"
+
#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:76
msgid "Last.fm Account Login"
msgstr "Connexion au compte Last.fm"
@@ -6963,3 +7198,4 @@ msgstr "Connecté à Last.fm."
msgid "Unknown Podcast"
msgstr "Podcast inconnu"
+
diff --git a/po/gl.po b/po/gl.po
index 38648c4..9fcff8b 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -12,8 +12,8 @@ msgstr ""
"Project-Id-Version: banshee-master-po-gl-3484\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=banshee&component=general\n"
-"POT-Creation-Date: 2010-09-28 06:36+0000\n"
-"PO-Revision-Date: 2010-09-28 23:46+0200\n"
+"POT-Creation-Date: 2010-12-03 19:32+0000\n"
+"PO-Revision-Date: 2010-12-11 01:00+0100\n"
"Last-Translator: Fran Diéguez <frandieguez at ubuntu.com>\n"
"Language-Team: Galician <gnome-gl-list at gnome.org>\n"
"MIME-Version: 1.0\n"
@@ -384,7 +384,7 @@ msgstr "Mostra unha icona na área de notificación para controlar Banshee."
#. ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying.addin.xml
#: ../data/addin-xml-strings.cs:179
-#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:164
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:168
#: ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs:50
msgid "Now Playing"
msgstr "Reproducindo agora"
@@ -421,10 +421,10 @@ msgstr ""
#. ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.addin.xml
#: ../data/addin-xml-strings.cs:193
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:188
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:193
#: ../src/Dap/Banshee.Dap/Banshee.Dap/PodcastGroupSource.cs:38
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:107
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:203
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:210
msgid "Podcasts"
msgstr "Podcasts"
@@ -513,7 +513,7 @@ msgid "AAC (Novell Encoder)"
msgstr "AAC (Codificador de Novell)"
#: ../data/audio-profiles/aac-novell.xml.in.h:3
-#: ../data/audio-profiles/mp3-lame.xml.in.h:4
+#: ../data/audio-profiles/mp3-lame.xml.in.h:3
#: ../data/audio-profiles/mp3-xing.xml.in.h:2
#: ../data/audio-profiles/wavpack.xml.in.h:3
#: ../data/audio-profiles/wma.xml.in.h:4
@@ -582,61 +582,34 @@ msgstr ""
"produce ficheiros máis grandes a baixas taxas de bit."
#: ../data/audio-profiles/mp3-lame.xml.in.h:2
-msgid "Average Bitrate"
-msgstr "Taxa de bits media"
-
-#: ../data/audio-profiles/mp3-lame.xml.in.h:3
#: ../data/audio-profiles/vorbis.xml.in.h:2
#: ../data/audio-profiles/wavpack.xml.in.h:2
#: ../data/audio-profiles/wma.xml.in.h:3
msgid "Best"
msgstr "Mellor"
-#: ../data/audio-profiles/mp3-lame.xml.in.h:5
+#: ../data/audio-profiles/mp3-lame.xml.in.h:4
msgid "Constant Bitrate"
msgstr "Taxa de bits constante"
-#: ../data/audio-profiles/mp3-lame.xml.in.h:6
-msgid "Extreme"
-msgstr "Extremo"
-
-#: ../data/audio-profiles/mp3-lame.xml.in.h:7
-msgid "Insane"
-msgstr "Demente"
-
-#: ../data/audio-profiles/mp3-lame.xml.in.h:8
-msgid "LAME Preset"
-msgstr "Preconfiguración de LAME"
+#: ../data/audio-profiles/mp3-lame.xml.in.h:5
+#| msgid "Syncing iPod"
+msgid "Encoding Mode"
+msgstr "Modo de codificación"
-#: ../data/audio-profiles/mp3-lame.xml.in.h:9
+#: ../data/audio-profiles/mp3-lame.xml.in.h:6
msgid "MP3 (LAME Encoder)"
msgstr "MP3 (codificador LAME)"
-#: ../data/audio-profiles/mp3-lame.xml.in.h:10
-msgid "Medium"
-msgstr "Medio"
-
-#: ../data/audio-profiles/mp3-lame.xml.in.h:11
-msgid "Preset"
-msgstr "Preconfiguración"
-
-#: ../data/audio-profiles/mp3-lame.xml.in.h:12
-msgid "Standard"
-msgstr "Estándar"
-
-#: ../data/audio-profiles/mp3-lame.xml.in.h:13
-msgid "VBR Mode"
-msgstr "Modo VBR"
-
-#: ../data/audio-profiles/mp3-lame.xml.in.h:14
+#: ../data/audio-profiles/mp3-lame.xml.in.h:7
msgid "VBR Quality"
msgstr "Calidade VBR"
-#: ../data/audio-profiles/mp3-lame.xml.in.h:15
+#: ../data/audio-profiles/mp3-lame.xml.in.h:8
msgid "Variable Bitrate"
msgstr "Taxa de bits variábel"
-#: ../data/audio-profiles/mp3-lame.xml.in.h:16
+#: ../data/audio-profiles/mp3-lame.xml.in.h:9
#: ../data/audio-profiles/vorbis.xml.in.h:5
#: ../data/audio-profiles/wavpack.xml.in.h:15
#: ../data/audio-profiles/wma.xml.in.h:7
@@ -750,7 +723,7 @@ msgstr "Windows Media Audio"
#: ../data/desktop-files/common.desktop.in.h:1
#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:76
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:109
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:107
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs:206
#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:60
msgid "Banshee Media Player"
@@ -774,7 +747,6 @@ msgid "Could not create filesrc element"
msgstr "Non foi posíbel crear o elemento filesrc"
#: ../libbanshee/banshee-bpmdetector.c:214
-#| msgid "Could not create decodebin plugin"
msgid "Could not create decodebin2 plugin"
msgstr "Non foi posíbel crear o engadido decodebin2"
@@ -816,7 +788,6 @@ msgid "Could not create source element"
msgstr "Non foi posíbel crear o elemento de orixe"
#: ../libbanshee/banshee-transcoder.c:246
-#| msgid "Could not create 'decodebin' plugin"
msgid "Could not create 'decodebin2' plugin"
msgstr "Non foi posíbel crear o engadido «decodebin2»"
@@ -852,11 +823,11 @@ msgstr "Gravar CD..."
msgid "Write selected tracks to an audio CD"
msgstr "Gravar as pistas seleccionadas nun CD de son"
-#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:104
+#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:105
msgid "Could not write CD"
msgstr "Non foi posíbel gravar o CD"
-#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:105
+#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:106
msgid "Brasero could not be started"
msgstr "Non foi posíbel iniciar o Brasero"
@@ -877,7 +848,7 @@ msgid "Could not create BPM detection driver."
msgstr "Non foi posíbel crear o controlador de detección de BPM."
#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:82
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:766
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:812
msgid "Enable _gapless playback"
msgstr "Activar a reprodución sen _saltos"
@@ -890,19 +861,19 @@ msgstr ""
"álbumes conceptuales e música clásica."
#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:150
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:187
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:192
msgid "Could not initialize GStreamer library"
msgstr "Non foi posíbel inicializar a biblioteca de GStreamer"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:430
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:435
msgid "Unknown Error"
msgstr "Erro descoñecido"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:760
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:806
msgid "_Enable ReplayGain correction"
msgstr "_Activar a corrección ReplayGain"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:761
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:807
msgid ""
"For tracks that have ReplayGain data, automatically scale (normalize) "
"playback volume"
@@ -910,7 +881,7 @@ msgstr ""
"Para las pistas que teñen datos ReplayGain, escalar (normalizar) "
"automaticamente o volume de reprodución"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:767
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:813
msgid ""
"Eliminate the small playback gap on track change. Useful for concept albums "
"and classical music."
@@ -922,7 +893,7 @@ msgstr ""
msgid "Could not create transcoder"
msgstr "Non foi posíbel crear o transcodificador"
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:222
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:229
msgid "GStreamer# 0.10"
msgstr "GStreamer# 0.10"
@@ -932,67 +903,67 @@ msgid "_Close"
msgstr "_Pechar"
#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs:92
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:238
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:251
#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:79
#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:133
msgid "Close"
msgstr "Pechar"
-#: ../src/Clients/Booter/Booter/Entry.cs:148
+#: ../src/Clients/Booter/Booter/Entry.cs:152
msgid "Help Options"
msgstr "Opcións de axuda"
-#: ../src/Clients/Booter/Booter/Entry.cs:149
+#: ../src/Clients/Booter/Booter/Entry.cs:153
msgid "Show this help"
msgstr "Mostrar esta axuda"
-#: ../src/Clients/Booter/Booter/Entry.cs:150
+#: ../src/Clients/Booter/Booter/Entry.cs:154
msgid "Show options for controlling playback"
msgstr "Mostra as opción para controlar a reprodución"
-#: ../src/Clients/Booter/Booter/Entry.cs:151
+#: ../src/Clients/Booter/Booter/Entry.cs:155
msgid "Show options for querying the playing track"
msgstr "Mostrar as opcións para consultar a pista en reprodución"
-#: ../src/Clients/Booter/Booter/Entry.cs:152
+#: ../src/Clients/Booter/Booter/Entry.cs:156
msgid "Show options for querying the playing engine"
msgstr "Mostra as opcións para consultar o motor de reprodución"
-#: ../src/Clients/Booter/Booter/Entry.cs:153
+#: ../src/Clients/Booter/Booter/Entry.cs:157
msgid "Show options for the user interface"
msgstr "Mostra as opcións para a interface de usuario"
-#: ../src/Clients/Booter/Booter/Entry.cs:154
+#: ../src/Clients/Booter/Booter/Entry.cs:158
msgid "Show options for developers and debugging"
msgstr "Mostra as opcións para desenvolvedores e depuración"
-#: ../src/Clients/Booter/Booter/Entry.cs:155
+#: ../src/Clients/Booter/Booter/Entry.cs:159
msgid "Show all option groups"
msgstr "Mostra todos os grupos de opcións"
-#: ../src/Clients/Booter/Booter/Entry.cs:156
+#: ../src/Clients/Booter/Booter/Entry.cs:160
msgid "Show version information"
msgstr "Mostra a información da versión"
-#: ../src/Clients/Booter/Booter/Entry.cs:159
+#: ../src/Clients/Booter/Booter/Entry.cs:163
msgid "Playback Control Options"
msgstr "Opcións de control de reprodución"
-#: ../src/Clients/Booter/Booter/Entry.cs:160
+#: ../src/Clients/Booter/Booter/Entry.cs:164
msgid ""
"Play the next track, optionally restarting if the 'restart' value is set"
msgstr ""
"Reproduce a pista seguinte, reiniciando opcionalmente se o valor 'restart' "
"está estabelecido"
-#: ../src/Clients/Booter/Booter/Entry.cs:161
+#: ../src/Clients/Booter/Booter/Entry.cs:165
msgid ""
"Play the previous track, optionally restarting if the 'restart value is set"
msgstr ""
"Reproduce a pista anterior, reiniciando opcionalmente se o valor 'restart' "
"está estabelecido"
-#: ../src/Clients/Booter/Booter/Entry.cs:162
+#: ../src/Clients/Booter/Booter/Entry.cs:166
msgid ""
"If the current song has been played longer than 4 seconds then restart it, "
"otherwise the same as --previous"
@@ -1000,27 +971,27 @@ msgstr ""
"Se a canción actual reproduciuse máis de 4 segundos reiníciaa, en caso "
"contrario é o mesmo que --previous"
-#: ../src/Clients/Booter/Booter/Entry.cs:163
+#: ../src/Clients/Booter/Booter/Entry.cs:167
msgid "Automatically start playing any tracks enqueued on the command line"
msgstr "Comeza a reproducir automaticamente as pistas á cola na liña de ordes"
-#: ../src/Clients/Booter/Booter/Entry.cs:164
+#: ../src/Clients/Booter/Booter/Entry.cs:168
msgid "Start playback"
msgstr "Iniciar a reprodución"
-#: ../src/Clients/Booter/Booter/Entry.cs:165
+#: ../src/Clients/Booter/Booter/Entry.cs:169
msgid "Pause playback"
msgstr "Pausar a reprodución"
-#: ../src/Clients/Booter/Booter/Entry.cs:166
+#: ../src/Clients/Booter/Booter/Entry.cs:170
msgid "Toggle playback"
msgstr "Trocar a reprodución"
-#: ../src/Clients/Booter/Booter/Entry.cs:167
+#: ../src/Clients/Booter/Booter/Entry.cs:171
msgid "Completely stop playback"
msgstr "Detén completamente a reprodución"
-#: ../src/Clients/Booter/Booter/Entry.cs:169
+#: ../src/Clients/Booter/Booter/Entry.cs:173
msgid ""
"Enable or disable playback stopping after the currently playing track (value "
"should be either 'true' or 'false')"
@@ -1028,98 +999,98 @@ msgstr ""
"Activa ou desactiva a detención da reprodución trala pista actualmente en "
"reprodución (o valor debe ser 'true' ou 'false')"
-#: ../src/Clients/Booter/Booter/Entry.cs:170
+#: ../src/Clients/Booter/Booter/Entry.cs:174
msgid "Set the playback volume (0-100), prefix with +/- for relative values"
msgstr ""
"Establecer o volume de reprodución (0-100), prefixando +/- para valores "
"relativos"
-#: ../src/Clients/Booter/Booter/Entry.cs:171
+#: ../src/Clients/Booter/Booter/Entry.cs:175
msgid "Seek to a specific point (seconds, float)"
msgstr "Salta a un punto específico (segundos, decimales)"
-#: ../src/Clients/Booter/Booter/Entry.cs:172
+#: ../src/Clients/Booter/Booter/Entry.cs:176
msgid "Set the currently played track's rating (0 to 5)"
msgstr "Estabelecer a valoración da pista en reprodución (0 a 5)"
-#: ../src/Clients/Booter/Booter/Entry.cs:175
+#: ../src/Clients/Booter/Booter/Entry.cs:179
msgid "Player Engine Query Options"
msgstr "Opcións de consulta do motor de reprodución"
-#: ../src/Clients/Booter/Booter/Entry.cs:176
+#: ../src/Clients/Booter/Booter/Entry.cs:180
msgid "Current player state"
msgstr "Estado actual do reprodutor"
-#: ../src/Clients/Booter/Booter/Entry.cs:177
+#: ../src/Clients/Booter/Booter/Entry.cs:181
msgid "Last player state"
msgstr "Último estado do reprodutor"
-#: ../src/Clients/Booter/Booter/Entry.cs:178
+#: ../src/Clients/Booter/Booter/Entry.cs:182
msgid "Query whether the player can be paused"
msgstr "Consulta se o reprodutor pode pausarse"
-#: ../src/Clients/Booter/Booter/Entry.cs:179
+#: ../src/Clients/Booter/Booter/Entry.cs:183
msgid "Query whether the player can seek"
msgstr "Consulta se o reprodutor pode saltar de posición"
-#: ../src/Clients/Booter/Booter/Entry.cs:180
+#: ../src/Clients/Booter/Booter/Entry.cs:184
msgid "Player volume"
msgstr "Volume do reprodutor"
-#: ../src/Clients/Booter/Booter/Entry.cs:181
+#: ../src/Clients/Booter/Booter/Entry.cs:185
msgid "Player position in currently playing track"
msgstr "Posición do reprodutor na pista actualmente en reprodución"
-#: ../src/Clients/Booter/Booter/Entry.cs:184
+#: ../src/Clients/Booter/Booter/Entry.cs:188
msgid "Playing Track Metadata Query Options"
msgstr "Opcións de consulta de metadatos da pista en reprodución"
-#: ../src/Clients/Booter/Booter/Entry.cs:185
+#: ../src/Clients/Booter/Booter/Entry.cs:189
msgid "URI"
msgstr "URI"
-#: ../src/Clients/Booter/Booter/Entry.cs:186
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:161
+#: ../src/Clients/Booter/Booter/Entry.cs:190
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:138
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:89
msgid "Artist Name"
msgstr "Nome do artista"
-#: ../src/Clients/Booter/Booter/Entry.cs:187
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:163
+#: ../src/Clients/Booter/Booter/Entry.cs:191
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:140
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:90
msgid "Album Title"
msgstr "Título do álbum"
-#: ../src/Clients/Booter/Booter/Entry.cs:188
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:160
+#: ../src/Clients/Booter/Booter/Entry.cs:192
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:137
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:88
msgid "Track Title"
msgstr "Título da pista"
-#: ../src/Clients/Booter/Booter/Entry.cs:189
+#: ../src/Clients/Booter/Booter/Entry.cs:193
msgid "Duration"
msgstr "Duración"
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:190
+#: ../src/Clients/Booter/Booter/Entry.cs:194
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:117
msgid "Track Number"
msgstr "Número de pista"
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:191
+#: ../src/Clients/Booter/Booter/Entry.cs:195
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:126
msgid "Track Count"
msgstr "Contador de pista"
-#: ../src/Clients/Booter/Booter/Entry.cs:192
+#: ../src/Clients/Booter/Booter/Entry.cs:196
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:149
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:114
msgid "Disc Number"
msgstr "Número de disco"
-#: ../src/Clients/Booter/Booter/Entry.cs:193
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:165
+#: ../src/Clients/Booter/Booter/Entry.cs:197
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:142
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:113
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:177
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:78
@@ -1129,7 +1100,7 @@ msgstr "Número de disco"
msgid "Year"
msgstr "Ano"
-#: ../src/Clients/Booter/Booter/Entry.cs:194
+#: ../src/Clients/Booter/Booter/Entry.cs:198
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:230
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:131
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:60
@@ -1137,78 +1108,78 @@ msgstr "Ano"
msgid "Rating"
msgstr "Puntuación"
-#: ../src/Clients/Booter/Booter/Entry.cs:195
+#: ../src/Clients/Booter/Booter/Entry.cs:199
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:322
msgid "Score"
msgstr "Puntuación"
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:196
+#: ../src/Clients/Booter/Booter/Entry.cs:200
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:143
msgid "Bit Rate"
msgstr "Taxa de bits"
-#: ../src/Clients/Booter/Booter/Entry.cs:199
+#: ../src/Clients/Booter/Booter/Entry.cs:203
msgid "User Interface Options"
msgstr "Opcións da interface de usuario"
-#: ../src/Clients/Booter/Booter/Entry.cs:200
+#: ../src/Clients/Booter/Booter/Entry.cs:204
msgid "Present the user interface on the active workspace"
msgstr "Mostra a interface de usuario na área de traballo activa"
-#: ../src/Clients/Booter/Booter/Entry.cs:201
+#: ../src/Clients/Booter/Booter/Entry.cs:205
msgid "Enter the full-screen mode"
msgstr "Entrar en modo a pantalla completa"
-#: ../src/Clients/Booter/Booter/Entry.cs:202
+#: ../src/Clients/Booter/Booter/Entry.cs:206
msgid "Hide the user interface"
msgstr "Oculta a interface de usuario"
-#: ../src/Clients/Booter/Booter/Entry.cs:203
+#: ../src/Clients/Booter/Booter/Entry.cs:207
msgid "Do not present the user interface, regardless of any other options"
msgstr "Non mostra a interface de usuario, sen importar calquer outra opción"
-#: ../src/Clients/Booter/Booter/Entry.cs:204
+#: ../src/Clients/Booter/Booter/Entry.cs:208
msgid "Present the import media dialog box"
msgstr "Presentar o diálogo de importación multimedia"
-#: ../src/Clients/Booter/Booter/Entry.cs:205
+#: ../src/Clients/Booter/Booter/Entry.cs:209
msgid "Present the about dialog"
msgstr "Presentar o diálogo Sobre"
-#: ../src/Clients/Booter/Booter/Entry.cs:206
+#: ../src/Clients/Booter/Booter/Entry.cs:210
msgid "Present the open location dialog"
msgstr "Presentar o diálogo de abrir localización"
-#: ../src/Clients/Booter/Booter/Entry.cs:207
+#: ../src/Clients/Booter/Booter/Entry.cs:211
msgid "Present the preferences dialog"
msgstr "Presentar el diálogo de preferencias"
-#: ../src/Clients/Booter/Booter/Entry.cs:210
+#: ../src/Clients/Booter/Booter/Entry.cs:214
msgid "Debugging and Development Options"
msgstr "Opción de desenvolvemento e depuración"
-#: ../src/Clients/Booter/Booter/Entry.cs:211
+#: ../src/Clients/Booter/Booter/Entry.cs:215
msgid "Enable general debugging features"
msgstr "Activar as características de depuración xeral"
-#: ../src/Clients/Booter/Booter/Entry.cs:212
+#: ../src/Clients/Booter/Booter/Entry.cs:216
msgid "Enable debugging output of SQL queries"
msgstr "Activa a saída de depuración da consultas SQL"
-#: ../src/Clients/Booter/Booter/Entry.cs:213
+#: ../src/Clients/Booter/Booter/Entry.cs:217
msgid "Enable debugging output of Mono.Addins"
msgstr "Activa a saída de depuración de Mono.Addins"
-#: ../src/Clients/Booter/Booter/Entry.cs:214
+#: ../src/Clients/Booter/Booter/Entry.cs:218
msgid "Specify an alternate database to use"
msgstr "Especifica unha base de datos alternativa para usar"
-#: ../src/Clients/Booter/Booter/Entry.cs:215
+#: ../src/Clients/Booter/Booter/Entry.cs:219
msgid "Specify an alternate key, default is /apps/banshee-1/"
msgstr "Especifica unha tecla alternativa, a predeterminada é /apps/banshee-1/"
-#: ../src/Clients/Booter/Booter/Entry.cs:216
+#: ../src/Clients/Booter/Booter/Entry.cs:220
msgid ""
"Optimize instance for running uninstalled; most notably, this will create an "
"alternate Mono.Addins database in the working directory"
@@ -1216,16 +1187,16 @@ msgstr ""
"Optimiza a instancia para executarse sen instalación; en particular, isto "
"crea unha base de datos de Mono.Addins alternativa no directorio de traballo"
-#: ../src/Clients/Booter/Booter/Entry.cs:218
+#: ../src/Clients/Booter/Booter/Entry.cs:222
msgid "Disable DBus support completely"
msgstr "Desactiva completamente a compatibilidade con DBus"
-#: ../src/Clients/Booter/Booter/Entry.cs:220
+#: ../src/Clients/Booter/Booter/Entry.cs:224
#, csharp-format
msgid "Skip loading a custom gtkrc file ({0}) if it exists"
msgstr "Omitir a carga dun ficheiro gtkrc personalizado ({0}) se existe"
-#: ../src/Clients/Booter/Booter/Entry.cs:251
+#: ../src/Clients/Booter/Booter/Entry.cs:255
#, csharp-format
msgid "The following help arguments are invalid: {0}"
msgstr "Os seguintes argumentos para a axuda non son válidos: {0}"
@@ -1239,9 +1210,9 @@ msgid "En_queue"
msgstr "Meter na _cola"
#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:86
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:66
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:196
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:86
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:210
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:126
msgid "_Play"
msgstr "_Reproducir"
@@ -1271,24 +1242,24 @@ msgid "Play Song"
msgstr "Reproducir canción"
#. Translators: this is a verb (command), not a noun (things)
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:447
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:465
msgid "Search"
msgstr "Buscar"
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:159
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:136
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:87
msgid "Artist, Album, or Title"
msgstr "Artista, álbum ou título"
#. Alias for %album_artist%
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:162
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:139
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:72
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:78
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:82
msgid "Album Artist"
msgstr "Artista do álbum"
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:164
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:141
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:98
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:185
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:364
@@ -1297,7 +1268,7 @@ msgid "Genre"
msgstr "Xénero"
#. Translators: noun
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:166
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:143
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:214
msgid "Comment"
msgstr "Comentario"
@@ -1321,88 +1292,88 @@ msgstr "Álbum descoñecido"
msgid "Unknown Title"
msgstr "Título descoñecido"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:186
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:191
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:91
msgid "Various Artists"
msgstr "Varios artistas"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:342
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
msgid "Stream location not found"
msgstr "Non se encontrou a localización do fluxo"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:342
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:324
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:328
msgid "File not found"
msgstr "Non se encontrou o ficheiro"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:344
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:349
msgid "Codec for playing this media type not available"
msgstr "O códec para reproducir este tipo de medios non está dispoñíbel"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:346
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:351
msgid "File protected by Digital Rights Management (DRM)"
msgstr "Ficheiro protexido con Digital Rights Management (DRM)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:353
msgid "Unknown error"
msgstr "Erro descoñecido"
#. TODO turn this into a PrimarySource-owned delegate?
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:417
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:422
msgid "_Restart Podcast"
msgstr "_Reiniciar podcast"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:418
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:423
msgid "_Restart Audiobook"
msgstr "_Reiniciar audiolibro"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:419
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:424
msgid "_Restart Video"
msgstr "_Reiniciar vídeo"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:420
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:86
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:93
msgid "_Restart Song"
msgstr "_Reiniciar canción"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:421
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:426
msgid "_Restart Item"
msgstr "_Reiniciar elemento"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:437
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:442
msgid "_Jump to Playing Podcast"
msgstr "_Saltar á canción do podcast"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:438
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:443
msgid "_Jump to Playing Audiobook"
msgstr "_Saltar ao audiolibro en reprodución"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:439
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:444
msgid "_Jump to Playing Video"
msgstr "_Saltar ao vídeo en reprodución"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:440
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:82
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:89
msgid "_Jump to Playing Song"
msgstr "_Saltar á canción en reprodución"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:441
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:446
msgid "_Jump to Playing Item"
msgstr "_Saltar ao elemento en reprodución"
#. Translators: This is used to generate bookmark names. {0} is track title, {1} is minutes
#. (possibly more than two digits) and {2} is seconds (between 00 and 60).
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/Bookmark.cs:173
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/Bookmark.cs:172
#, csharp-format
msgid "{0} ({1}:{2:00})"
msgstr "{0} ({1}:{2:00})"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs:70
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs:69
#, csharp-format
msgid "All Albums ({0})"
msgstr "Todos os álbums ({0})"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistListModel.cs:69
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistListModel.cs:68
#, csharp-format
msgid "All Artists ({0})"
msgstr "Todos os artistas ({0})"
@@ -1412,15 +1383,15 @@ msgstr "Todos os artistas ({0})"
msgid "Value"
msgstr "Valor"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:50
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:49
msgid "Shuffle by A_lbum"
msgstr "Mesturar por á_lbum"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:51
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:50
msgid "by album"
msgstr "por álbum"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:52
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:51
msgid "Play all songs from an album, then randomly choose another album"
msgstr ""
"Reproducir todas as cancións dun álbum, despois escoller aleatoriamente "
@@ -1440,27 +1411,27 @@ msgstr ""
"Reproducir todas as cancións dun artista, despois escoller aleatoriamente "
"outro artista"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:36
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:38
msgid "Shuffle _Off"
msgstr "N_on aleatorio"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:37
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:39
msgid "manually"
msgstr "manualmente"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:38
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:40
msgid "Do not shuffle playlist"
msgstr "Non mesturar a lista de reprodución"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:46
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:45
msgid "Shuffle by _Rating"
msgstr "Mesturar por _puntuación"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:47
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:46
msgid "by rating"
msgstr "por puntuación"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:48
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:47
msgid "Play songs randomly, prefer higher rated songs"
msgstr ""
"Reproducir as cancións da lista de reprodución aleatoriamente, preferir as "
@@ -1480,65 +1451,65 @@ msgstr ""
"Reproducir as cancións da lista de reprodución aleatoriamente, preferir as "
"cancións con puntuación máis alta"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:47
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:46
msgid "Shuffle by _Song"
msgstr "Mesturar por _canción"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:48
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:47
msgid "by song"
msgstr "por canción"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:49
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:48
msgid "Play songs randomly from the playlist"
msgstr "Reproducir as cancións da lista de reprodución aleatoriamente"
-#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:132
+#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:138
msgid "Scanning for media"
msgstr "Analizando o contido multimedia"
-#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:182
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1382
+#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:188
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1384
msgid "Scanning..."
msgstr "Analizando..."
-#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:198
+#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:204
#, csharp-format
msgid "Scanning ({0} files)..."
msgstr "Analizando ({0} ficheiros)..."
-#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:232
+#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:238
msgid "Importing Media"
msgstr "Importando contido multimedia"
-#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:239
+#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:245
#: ../src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs:119
msgid "The import process is currently running. Would you like to stop it?"
msgstr "Estase executando o proceso de importación. Quere detelo?"
-#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:245
+#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:251
#: ../src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs:81
#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdRipper.cs:185
#, csharp-format
msgid "Importing {0} of {1}"
msgstr "Importando {0} de{1}"
-#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:79
+#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:78
#, csharp-format
msgid "Rescanning {0} of {1}"
msgstr "Analizando de novo {0} de {1}"
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:234
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:232
msgid "Upgrading your Banshee Database"
msgstr "Actualizando a súa base de datos de Banshee"
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:235
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:233
msgid ""
"Please wait while your old Banshee database is migrated to the new format."
msgstr ""
"Espera mentras se migra a súa base de datos antiga de Banshee ao novo "
"formato."
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1379
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1381
msgid "Refreshing Metadata"
msgstr "Actualizando os metadatos"
@@ -1610,16 +1581,12 @@ msgstr "Rock suave"
msgid "Techno"
msgstr "Tecno"
-#: ../src/Core/Banshee.Services/Banshee.Library/HomeDirectoryImportSource.cs:48
-msgid "Home Folder"
-msgstr "Cartafol persoal"
-
#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:58
msgid "Remove From Library"
msgstr "Eliminar da fonoteca"
#. Translators: {0} is the library name, eg 'Music Library' or 'Podcasts'
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:65
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:122
#, csharp-format
msgid "{0} Folder"
msgstr "Cartafol {0}"
@@ -1689,26 +1656,26 @@ msgid "Grouping"
msgstr "Agrupación"
#. Catalog.GetString ("Music Library")
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:59
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:60
#: ../src/Dap/Banshee.Dap/Banshee.Dap/MusicGroupSource.cs:39
msgid "Music"
msgstr "Música"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:65
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:66
msgid "Search your music"
msgstr "Buscar na súa música"
#. Misc section
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:79
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:80
#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:65
msgid "Miscellaneous"
msgstr "Misceláneo"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:82
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:83
msgid "_Sort an artist's albums by year, not title"
msgstr "_Ordenar os albumes dun artista por ano no lugar de por título"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:92
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:93
#, csharp-format
msgid "{0} song"
msgid_plural "{0} songs"
@@ -1716,78 +1683,94 @@ msgstr[0] "{0} canción"
msgstr[1] "{0} cancións"
#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:114
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:91
+#| msgid "Audio Folder"
+#| msgid_plural "Audio Folders"
+msgid "Music Folder"
+msgstr "Cartafol de música"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:119
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:95
msgid "Favorites"
msgstr "Favoritos"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:115
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:120
msgid "Songs rated four and five stars"
msgstr "Cancións puntuadas con catro ou cinco estrelas"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:119
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:124
msgid "Recent Favorites"
msgstr "Favoritos recentes"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:120
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:125
msgid "Songs listened to often in the past week"
msgstr "Cancións escoitadas a miúdo na última semana"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:124
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:129
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:95
msgid "Recently Added"
msgstr "Engadido recentemente"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:125
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:130
msgid "Songs imported within the last week"
msgstr "Cancións importadas durante a última semana"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:129
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:134
+#| msgid "Most Recently Played"
+msgid "Recently Played"
+msgstr "Reproducidas recentemente"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:135
+#| msgid "Recently Played Tracks"
+msgid "Recently played songs"
+msgstr "Cancións reproducidas recentemente"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:139
msgid "Unheard"
msgstr "Non escoitadas"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:130
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:140
msgid "Songs that have not been played or skipped"
msgstr "Cancións que foron omitidas ou non reproducidas"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:137
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:147
msgid "Neglected Favorites"
msgstr "Favoritos abandoados"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:138
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:148
msgid "Favorites not played in over two months"
msgstr "Favoritos non reproducidos en máis de dous meses"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:142
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:152
msgid "Least Favorite"
msgstr "Menos favoritos"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:143
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:153
msgid "Songs rated one or two stars or that you have frequently skipped"
msgstr ""
"Cancións puntuadas cunha ou dúas estrelas ou que foron omitidas "
"frecuentemente"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:147
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:157
msgid "700 MB of Favorites"
msgstr "700 MB de favoritos"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:148
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:158
msgid "A data CD worth of favorite songs"
msgstr "Un CD de datos cheo de cancións favoritas"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:153
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:163
msgid "80 Minutes of Favorites"
msgstr "80 minutos de favoritos"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:154
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:164
msgid "An audio CD worth of favorite songs"
msgstr "Un CD de son cheo de cancións favoritas"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:159
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:169
msgid "Unrated"
msgstr "Non puntuadas"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:160
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:170
msgid "Songs that haven't been rated"
msgstr "Cancións que non foron puntuadas"
@@ -1821,15 +1804,21 @@ msgid_plural "{0} videos"
msgstr[0] "{0} vídeo"
msgstr[1] "{0} vídeos"
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:92
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:90
+#| msgid "Video Folder"
+#| msgid_plural "Video Folders"
+msgid "Videos Folder"
+msgstr "Cartafol de vídeos"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:96
msgid "Videos rated four and five stars"
msgstr "Vídeos puntuados con catro ou cinco estrelas"
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:96
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:100
msgid "Unwatched"
msgstr "Sen ver"
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:97
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:101
msgid "Videos that haven't been played yet"
msgstr "Vídeos que aínda non foron reproducidos"
@@ -1916,11 +1905,6 @@ msgstr "Importar _puntuacións"
msgid "Import play _counts"
msgstr "Importar as _contas de reprodución"
-#. disabled by default
-#: ../src/Core/Banshee.Services/Banshee.Metrics/BansheeMetrics.cs:302
-msgid "Improve Banshee by sending anonymous usage data"
-msgstr "Mellorar Banshee enviando datos anónimos de uso"
-
#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:52
msgid "There is no available network connection"
msgstr "Non hai ningunha conexión de rede dispoñíbel"
@@ -1945,37 +1929,37 @@ msgstr ""
"Algunhas características requiren unha conexión a Internet, como Last.fm ou "
"a descarga de portadas"
-#: ../src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:160
+#: ../src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:159
msgid "Search this playlist"
msgstr "Buscar na lista de reprodución"
-#: ../src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:229
+#: ../src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:228
msgid "The track's rating was set differently on the device and in Banshee"
msgstr ""
"A cualificación da pista foi estabelecida de forma diferente no dispositivo "
"e en Banshee"
-#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:59
+#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:58
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:309
msgid "Playlist"
msgstr "Lista de reprodución"
-#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:134
+#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:133
msgid "Remove From Playlist"
msgstr "Eliminar da lista de reprodución"
-#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:135
+#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:134
msgid "Delete Playlist"
msgstr "Eliminar a lista de reprodución"
#. TODO generate name based on the track selection, or begin editing it
-#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:386
-#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:392
+#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:385
+#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:391
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:95
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:394
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:500
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:213
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:462
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:591
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214
msgid "New Playlist"
msgstr "Nova lista de reprodución"
@@ -2021,6 +2005,10 @@ msgstr "Normativas do ficheiro"
msgid "Co_py files to media folders when importing"
msgstr "Co_piar os ficheiros aos cartafoles ao importar"
+#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:69
+msgid "Improve Banshee by sending anonymous usage data"
+msgstr "Mellorar Banshee enviando datos anónimos de uso"
+
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:63
msgid "items"
msgstr "elementos"
@@ -2443,7 +2431,7 @@ msgid "importedon"
msgstr "importadoen"
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:315
-#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:66
+#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:65
msgid "Smart Playlist"
msgstr "Lista de reprodución intelixente"
@@ -2521,6 +2509,7 @@ msgstr "Engadido menos recentemente"
#. Translators: These are unique strings for playback errors. Please, no spaces. Blank ok.
#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:44
#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:46
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:146
#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs:97
msgid "None"
msgstr "Ningún"
@@ -2577,7 +2566,7 @@ msgstr "drm"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:208
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:210
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:212
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:383
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:389
msgid "Unknown"
msgstr "Descoñecido"
@@ -2585,21 +2574,21 @@ msgstr "Descoñecido"
msgid "unknown"
msgstr "descoñecido"
-#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/Migrator.cs:79
+#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/Migrator.cs:78
msgid "Unable to Migrate Smart Playlists"
msgstr "Non foi posíbel migrar as listas de reprodución intelixentes"
-#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/Migrator.cs:80
+#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/Migrator.cs:79
#, csharp-format
msgid "Please file a bug with this error: {0}"
msgstr "Por favor, abra un bug con este erro: {0}"
-#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:67
+#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:66
#: ../src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/Editor.cs:49
msgid "Edit Smart Playlist"
msgstr "Editar lista de reprodución intelixente"
-#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:242
+#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:249
msgid "Delete Smart Playlist"
msgstr "Eliminar a lista de reprodución intelixente"
@@ -2649,7 +2638,7 @@ msgid "Close Error Report"
msgstr "Pechar o informe de erro"
#: ../src/Core/Banshee.Services/Banshee.Sources/ErrorSource.cs:83
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:226
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:224
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ErrorListDialog.cs:46
msgid "Error"
msgstr "Erro"
@@ -2685,12 +2674,12 @@ msgstr "_Xerarquía do cartafol"
msgid "File _name"
msgstr "_Nome de ficheiro"
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:693
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:669
#, csharp-format
msgid "Adding {0} of {1} to {2}"
msgstr "Engadindo {0} de{1} a {2}"
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:712
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:688
#, csharp-format
msgid "Deleting {0} of {1} From {2}"
msgstr "Eliminando {0} de{1} desde {2}"
@@ -2710,6 +2699,20 @@ msgid_plural "{0} items"
msgstr[0] "{0} elemento"
msgstr[1] "{0} elementos"
+#. TODO should add library sources here, but requires changing quite a few
+#. things that depend on being loaded before the music library is added.
+#. AddSource (music_library = new MusicLibrarySource (), true);
+#. AddSource (video_library = new VideoLibrarySource (), false);
+#: ../src/Core/Banshee.Services/Banshee.Sources/SourceManager.cs:84
+#| msgid "Library"
+msgid "Libraries"
+msgstr "Coleccións"
+
+#: ../src/Core/Banshee.Services/Banshee.Sources/SourceManager.cs:85
+#| msgid "Online Sources"
+msgid "Online Media"
+msgstr "Multimedia en liña"
+
#: ../src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs:82
#: ../src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs:91
msgid "Error opening stream"
@@ -2743,7 +2746,7 @@ msgid "Show:"
msgstr "Mostrar:"
#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:51
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:84
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:83
msgid "All"
msgstr "Todo"
@@ -2792,19 +2795,19 @@ msgstr ""
msgid "{0} of {1}"
msgstr "{0} de {1}"
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:224
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:222
msgid "Playing"
msgstr "Reproducindo"
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:225
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:223
msgid "Paused"
msgstr "Pausado"
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:227
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:225
msgid "Protected"
msgstr "Protexido"
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:228
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:226
msgid "External Document"
msgstr "Documento externo"
@@ -2898,15 +2901,15 @@ msgstr "Nova preconfiguración"
msgid "{0} by {1}"
msgstr "{0} por {1}"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:87
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:86
msgid "_Bookmarks"
msgstr "_Marcadores"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:90
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:89
msgid "_Add Bookmark"
msgstr "_Engadir marcador"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:91
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:90
msgid "Bookmark the Position in the Current Track"
msgstr "Marcar a posición na pista actual"
@@ -2984,7 +2987,7 @@ msgid "Make Banshee the Default"
msgstr "Facer o Banshee o predeterminado"
#. Translators: verb
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/FileChooserDialog.cs:52
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/FileChooserDialog.cs:53
msgid "I_mport"
msgstr "I_mportar"
@@ -3077,135 +3080,121 @@ msgstr "_Preferencias"
msgid "Modify your personal preferences"
msgstr "Modificar as súas preferencias persoais"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:83
-msgid "Manage _Extensions"
-msgstr "Xestionar _extensións"
-
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:84
-msgid "Manage extensions to add new features to Banshee"
-msgstr "Xestionar as extensións para engadir novas características a Banshee"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:88
msgid "_Tools"
msgstr "_Ferramentas"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:92
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:135
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:88
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:134
msgid "_Help"
msgstr "_Axuda"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:95
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:91
msgid "_Contents"
msgstr "Índ_ice"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:99
-msgid "_Web Resources"
-msgstr "Recursos _web"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
-msgid "Banshee _User Guide (Wiki)"
-msgstr "_Guía do usuario de Banshee (Wiki)"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:103
-msgid "Learn about how to use Banshee"
-msgstr "Aprender como usar o Banshee"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:108
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:95
msgid "Advanced Collection Searching"
msgstr "Busca avanzada na colección"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:109
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:96
msgid "Learn advanced ways to search your media collection"
msgstr "Aprenda técnicas avanzadas para buscar na súa colección multimedia"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:114
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:101
msgid "Banshee _Home Page"
msgstr "_Páxina do Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:115
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
msgid "Visit the Banshee Home Page"
msgstr "Visite a páxina do Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:120
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
msgid "_Get Involved"
msgstr "_Involúcrese"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:121
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:108
msgid "Become a contributor to Banshee"
msgstr "Converterse en contribuidor de Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:126
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
msgid "_Version Information"
msgstr "Información de _versión"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:127
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:114
msgid "View detailed version and configuration information"
msgstr "Ver información detallada da versión e a configuración"
#. Prompt user for location of the playlist.
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:184
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:169
msgid "Import Playlist"
msgstr "Importar lista de reprodución"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:185
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:559
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:170
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:558
msgid "Playlists"
msgstr "Listas de reprodución"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:67
-msgid "Play or pause the current item"
-msgstr "Reproducir ou pausar o elemento actual"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:69
+#| msgid "Play or pause the current item"
+msgid "Play the current item"
+msgstr "Reproducir o elemento actual"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:70
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:77
msgid "_Next"
msgstr "_Seguinte"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:71
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:78
msgid "Play the next item"
msgstr "Reproducir o seguinte elemento"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:74
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:81
msgid "Pre_vious"
msgstr "_Anterior"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:75
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:82
msgid "Play the previous item"
msgstr "Reproducir o elemento anterior"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:78
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:85
msgid "Seek _To..."
msgstr "Ir _até..."
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:79
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:86
msgid "Seek to a specific location in current item"
msgstr "Saltar a unha posición específica no elemento actual"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:83
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:90
msgid "Jump to the currently playing item"
msgstr "Saltar ao elemento actualmente en reprodución"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:87
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:94
msgid "Restart the current item"
msgstr "Reiniciar o elemento actual"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:92
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:99
msgid "_Stop When Finished"
msgstr "_Deter cando remate"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:93
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:100
msgid "Stop playback after the current item finishes playing"
msgstr ""
"Detén a reprodución aleatoria cando este elemento remate de reproducirse"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:99
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:106
msgid "_Playback"
msgstr "_Reproducir"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:190
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:203
msgid "_Pause"
msgstr "_Pausar"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:202
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:205
+#| msgid "Play or pause the current item"
+msgid "Pause the current item"
+msgstr "Deter o elemento actual"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:217
msgid "Sto_p"
msgstr "_Deter"
@@ -3240,10 +3229,55 @@ msgstr "Repetir a canción que se está reproducindo"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackShuffleActions.cs:79
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackShuffleActions.cs:80
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:62
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:84
msgid "Shuffle"
msgstr "Aleatorio"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:62
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:63
+#| msgid "title"
+msgid "Subtitle"
+msgstr "Subtítulo"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:65
+#| msgid "Loading..."
+msgid "Load File..."
+msgstr "Cargar ficheiro..."
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:66
+msgid "Load subtitle file"
+msgstr "Cargar ficheiro de subtítulos"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:79
+#| msgid "Local Files"
+msgid "Load Subtitle File"
+msgstr "Cargar ficheiro de subtítulos"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:88
+#| msgid "Loved"
+msgid "L_oad"
+msgstr "C_argar"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:97
+#| msgid "Select Files"
+msgid "Subtitle files"
+msgstr "Ficheiros de subtítulos"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:128
+#, csharp-format
+#| msgid "Stop {0}"
+msgid "Subtitle {0}"
+msgstr "Subtítulo {0}"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:132
+#, csharp-format
+msgid "Activate embedded subtitle {0}"
+msgstr "Activar o subtítulo empotrado {0}"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:147
+msgid "Hide subtitles"
+msgstr "Agochar os subtítulos"
+
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:75
msgid "_New Playlist"
msgstr "Lista de reprodución _nova"
@@ -3317,8 +3351,8 @@ msgstr "Nova lista de reprodución _intelixente"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:129
#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:84
#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:67
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:57
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:71
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:79
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:72
msgid "Refresh"
msgstr "Actualizar"
@@ -3340,134 +3374,134 @@ msgstr "Está seguro de que quere eliminar este {0}?"
msgid "Separate by Type"
msgstr "Separados por tipo"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:70
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:110
msgid "Select _All"
msgstr "Seleccionar _todo"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:71
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:111
msgid "Select all tracks"
msgstr "Seleccionar todas as pistas"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:74
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:114
msgid "Select _None"
msgstr "_Non seleccionar nada"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:75
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:115
msgid "Unselect all tracks"
msgstr "Deseleccionar todas as pistas"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:78
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:118
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:59
msgid "_Edit Track Information"
msgstr "_Editar información da pista"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:79
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:119
msgid "Edit information on selected tracks"
msgstr "Editar a información nas pistas seleccionadas"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:82
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:122
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:252
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:113
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:155
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:117
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:159
msgid "Properties"
msgstr "Propiedades"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:83
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:123
msgid "View information on selected tracks"
msgstr "Ver a información das pistas seleccionadas"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:87
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:127
msgid "Play the selected item"
msgstr "Reproducir o elemento seleccionado"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:90
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:130
msgid "Add _to Playlist"
msgstr "Engadir á _lista de reprodución"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:91
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:131
msgid "Append selected items to playlist or create new playlist from selection"
msgstr ""
"Engadir os elementos seleccionados á lista de reprodución ou crear unha nova "
"desde a selección"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:96
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:136
msgid "Create new playlist from selected tracks"
msgstr "Crear nova lista de reprodución desde as pistas seleccionadas"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:100
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:140
msgid "_Remove"
msgstr "_Eliminar"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:101
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:141
msgid "Remove selected track(s) from this source"
msgstr "Eliminar as cancións seleccionadas desta fonte"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:104
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:144
msgid "Remove From _Library"
msgstr "Eliminar da _fonoteca"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:105
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:145
msgid "Remove selected track(s) from library"
msgstr "Eliminar as pistas seleccionadas da fonoteca"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:108
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:148
msgid "_Open Containing Folder"
msgstr "Abrir o _cartafol contedor"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:109
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:149
msgid "Open the folder that contains the selected item"
msgstr "Abrir o cartafol que contén o elemento seleccionado"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:112
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:152
msgid "_Delete From Drive"
msgstr "_Eliminar da unidade"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:113
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:153
msgid "Permanently delete selected item(s) from medium"
msgstr "Eliminar permanentemente os elementos seleccionados do medio"
#. Translators: this is a verb (command), not a noun (things)
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:119
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:171
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:159
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:170
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:112
#, csharp-format
msgid "_Search"
msgstr "_Buscar"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:120
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:160
msgid "Search for items matching certain criteria"
msgstr "Buscar elementos que coincidan con certo criterio"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:123
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:163
msgid "By Matching _Album"
msgstr "Por coincidencia de á_lbum"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:124
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:164
msgid "Search all songs of this album"
msgstr "Buscar todas as cancións deste álbum"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:127
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:167
msgid "By Matching A_rtist"
msgstr "Por coincidencia de _artista"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:128
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:168
msgid "Search all songs of this artist"
msgstr "Buscar todas as cancións deste artista"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:258
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:322
#, csharp-format
msgid "_Delete From \"{0}\""
msgstr "_Eliminar de \"{0}\""
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:464
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:542
msgid "The folder could not be found."
msgstr "Non foi posíbel encontrar o cartafol."
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:465
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:543
msgid "Please check that the track's location is accessible by the system."
msgstr "Comprobe que a localización da pista é accesíbel polo sistema."
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:535
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:620
#, csharp-format
msgid "Are you sure you want to permanently delete this item?"
msgid_plural ""
@@ -3477,16 +3511,16 @@ msgstr[1] ""
"Está seguro de que quere eliminar os {0} elementos seleccionados "
"permanentemente?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:539
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:624
msgid "If you delete the selection, it will be permanently lost."
msgstr "Se borra a selección, perderase permanentemente."
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:542
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:627
#, csharp-format
msgid "Remove selection from {0}?"
msgstr "Eliminar a selección da súa {0}?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:545
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:630
#, csharp-format
msgid "Are you sure you want to remove the selected item from your {1}?"
msgid_plural ""
@@ -3779,39 +3813,39 @@ msgstr "Tamaño de ficheiro:"
msgid "bytes"
msgstr "bytes"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:95
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:97
msgid "Track Editor"
msgstr "Editor de pistas"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:95
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:97
msgid "Track Properties"
msgstr "Propiedades da pista"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:147
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:149
msgid "Show the previous track"
msgstr "Mostrar a pista anterior"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:153
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:155
msgid "Show the next track"
msgstr "Mostrar a seguinte pista"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:183
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:185
msgid "Title:"
msgstr "Título:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:184
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:186
msgid "Artist:"
msgstr "Artista:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:185
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:187
msgid "Album:"
msgstr "Álbum:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:309
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:311
msgid "Sync all field _values"
msgstr "Sincronizar todos os _valores dos campos"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:314
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:316
msgid ""
"Apply the values of all common fields set for this track to all of the "
"tracks selected in this editor"
@@ -3819,23 +3853,23 @@ msgstr ""
"Aplicar os valores dos campos comúns estabelecidos para esta pista a todas "
"as pistas seleccionadas neste editor"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:413
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:416
#, csharp-format
msgid "<i>Editing {0} of {1} items</i>"
msgstr "<i>Editando {0} de {1} elementos</i>"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:675
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:678
#, csharp-format
msgid "Save the changes made to the open track?"
msgid_plural "Save the changes made to {0} of {1} open tracks?"
msgstr[0] "Gardar os cambios feitos á pista aberta?"
msgstr[1] "Gardar os cambios feitos ás {0} de {1} pistas abertas?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:692
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:695
msgid "Close _without Saving"
msgstr "Pechar _sen gardar"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:729
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:732
#, csharp-format
msgid "If you don't save, changes from the last {0} will be permanently lost."
msgstr "Se non garda, os cambios das últimas {0} perderanse permanentemente."
@@ -3885,24 +3919,24 @@ msgstr[1] "Executando as tarefas activas"
#. Translators: {0} and {1} are for markup so ignore them, {2} and {3}
#. are Podcast Name and Published Date, respectively;
#. e.g. 'from BBtv published 7/26/2007'
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:525
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:523
#, csharp-format
msgid "{0}from{1} {2} {0}published{1} {3}"
msgstr "{0} de {1} {2} {0} publicado o {1} {3}"
#. simply: "Chicago Public Radio" or whatever the artist name is
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:538
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:536
msgid "Unknown Stream"
msgstr "Fluxo descoñecido"
#. Translators: {0} and {1} are markup so ignore them, {2} is the name of the radio station
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:541
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:539
#, csharp-format
msgid "{0}on{1} {2}"
msgstr "{0} en {1} {2}"
#. Translators: {0} is the "from {album} by {artist}" type string, and {1} is the "on {radio station name}" string
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:544
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:542
#, csharp-format
msgid "{0} {1}"
msgstr "{0} {1}"
@@ -3910,14 +3944,14 @@ msgstr "{0} {1}"
#. Translators: {0} and {1} are for markup so ignore them, {2} and {3}
#. are Artist Name and Album Title, respectively;
#. e.g. 'by Parkway Drive from Killing with a Smile'
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:580
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:578
#, csharp-format
msgid "{0}by{1} {2} {0}from{1} {3}"
msgstr "{0} por {1} {2} {0} de {1} {3}"
#. Translators: {0} and {1} are for markup so ignore them, {2} is for Album Title;
#. e.g. 'from Killing with a Smile'
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:584
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:582
#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:522
#, csharp-format
msgid "{0}from{1} {2}"
@@ -3925,7 +3959,7 @@ msgstr "{0}do{1} {2}"
#. Translators: {0} and {1} are for markup so ignore them, {2} is for Artist Name;
#. e.g. 'by Parkway Drive'
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:588
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:586
#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:526
#, csharp-format
msgid "{0}by{1} {2}"
@@ -3980,10 +4014,9 @@ msgid "Files"
msgstr "Ficheiros"
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:63
-#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/ImportSource.cs:67
-#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:82
-msgid "C_hoose Files"
-msgstr "_Seleccionar ficheiros"
+#| msgid "C_hoose Files"
+msgid "C_hoose Files..."
+msgstr "_Seleccionar ficheiros..."
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:81
msgid "_Files to import:"
@@ -4010,8 +4043,9 @@ msgid "Folders"
msgstr "Cartafoles"
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FolderImportSource.cs:57
-msgid "C_hoose Folders"
-msgstr "_Seleccionar cartafoles"
+#| msgid "C_hoose Folders"
+msgid "C_hoose Folders..."
+msgstr "_Seleccionar cartafoles..."
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FolderImportSource.cs:75
msgid "_Folders to import:"
@@ -4043,14 +4077,10 @@ msgstr "Non mostrar este diálogo de novo"
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:130
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:82
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:385
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:384
msgid "_Import"
msgstr "_Importar"
-#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/PhotoFolderImportSource.cs:69
-msgid "Videos From Photos Folder"
-msgstr "Vídeos do cartafol Imaxes"
-
#: ../src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileComboBox.cs:86
msgid "No available profiles"
msgstr "Perfís non dispoñíbeis"
@@ -4194,28 +4224,28 @@ msgstr "Silencio"
msgid "Full Volume"
msgstr "A todo volume"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:96
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:101
#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:102
msgid "Device"
msgstr "Dispositivo"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:97
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:102
#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:104
msgid "Generation"
msgstr "Xeneración"
#. FIXME
#. AddDapProperty (Catalog.GetString ("Color"), "black");
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:102
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:107
#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:105
msgid "Capacity"
msgstr "Capacidade"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:103
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:108
msgid "Available"
msgstr "Dispoñíbel"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:104
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:109
#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:106
#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:141
msgid "Serial number"
@@ -4226,42 +4256,42 @@ msgstr "Número de serie"
#. string [] capabilities = new string [ipod_device.ModelInfo.Capabilities.Count];
#. ipod_device.ModelInfo.Capabilities.CopyTo (capabilities, 0);
#. AddDapProperty (Catalog.GetString ("Capabilities"), String.Join (", ", capabilities));
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:111
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:116
#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:113
msgid "Supports cover art"
msgstr "Permite portadas"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:112
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:117
#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:114
msgid "Supports photos"
msgstr "Permite imaxes"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:407
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:412
#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:491
msgid "Track duration is zero"
msgstr "A duración da pista é cero"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:510
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:515
#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:694
msgid "Syncing iPod"
msgstr "Sincronizando iPod"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:511
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:516
#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:695
msgid "Preparing to synchronize..."
msgstr "Preparándose para sincronizar..."
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:514
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:519
#, csharp-format
msgid "Adding track {0} of {1}"
msgstr "Engadindo a pista {0} de{1}"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:550
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:555
#, csharp-format
msgid "Removing track {0} of {1}"
msgstr "Eliminando a pista {0} de{1}"
-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:614
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:619
msgid "Writing media database"
msgstr "Escribindo a base de datos multimedia"
@@ -4276,6 +4306,14 @@ msgstr "Sincronizar {0}"
msgid "{0} to add, {1} to remove, {2} to update"
msgstr "{0} para engadir, {1} para eliminar, {2} para actualizar"
+#. This group source gives us a seperator for DAPs in the source view.
+#. We add it when we get our first dap source, and then remove it when
+#. we lose the last one.
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs:63
+#| msgid "Device"
+msgid "Devices"
+msgstr "Dispositivos"
+
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:176
msgid "Device Properties"
msgstr "Propiedades do dispositivo"
@@ -4288,23 +4326,23 @@ msgstr "Produto"
msgid "Vendor"
msgstr "Fabricante"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:280
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:133
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:284
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:140
#, csharp-format
msgid "Loading {0}"
msgstr "Cargando {0}"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:364
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:370
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:37
msgid "Yes"
msgstr "Si"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:364
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:370
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:38
msgid "No"
msgstr "Non"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:385
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:391
#, csharp-format
msgid ""
"The {0} format is not supported by the device, and no converter was found to "
@@ -4313,13 +4351,13 @@ msgstr ""
"O formato {0} non é compatíbel co dispositivo e non se atopou ningún "
"conversor para convertelo"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:391
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:397
msgid "File format conversion support is not available"
msgstr ""
"A compatibilidade para a conversión de formatos de ficheiro non está "
"dispoñíbel"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:417
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:423
msgid "Error converting file"
msgstr "Produciuse un erro ao converter o ficheiro"
@@ -4660,6 +4698,11 @@ msgstr "Ficheiros de Amazon MP3"
msgid "Amazon MP3 Purchase"
msgstr "Adquisición en Amazon MP3"
+#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/ImportSource.cs:67
+#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:81
+msgid "C_hoose Files"
+msgstr "_Seleccionar ficheiros"
+
#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSource.cs:42
#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:39
msgid "Amazon MP3 Store"
@@ -4764,8 +4807,9 @@ msgid "Book Title"
msgstr "Título do libro"
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:68
-msgid "Audiobooks, etc"
-msgstr "Audiolibros, etc"
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:307
+msgid "Audiobooks"
+msgstr "Audiolibros"
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:75
msgid "Search your audiobooks"
@@ -4778,6 +4822,12 @@ msgid_plural "{0} books"
msgstr[0] "{0} libro"
msgstr[1] "{0} libros"
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:149
+#| msgid "Audio Folder"
+#| msgid_plural "Audio Folders"
+msgid "Audiobooks Folder"
+msgstr "Cartafol de audiolibros"
+
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/BookView.cs:114
msgid "Resume Playback"
msgstr "Reiniciar a reprodución"
@@ -4787,7 +4837,7 @@ msgid "No Bookmark Set"
msgstr "Non hai marcadores estabelecidos"
#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdDiscModel.cs:76
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:55
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:56
msgid "Audio CD"
msgstr "CD de son"
@@ -4861,7 +4911,7 @@ msgstr ""
"importación."
#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:320
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:440
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:441
msgid "Import CD"
msgstr "Importar CD"
@@ -4877,46 +4927,48 @@ msgstr "Copiar un CD"
msgid "Duplicate this audio CD"
msgstr "Copiar este CD de son"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:130
-msgid "Searching for CD metadata..."
-msgstr "Buscando metadatos do CD..."
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:131
+#| msgid "Searching for CD metadata..."
+msgid "Searching for track information..."
+msgstr "Buscando información sobre a pista..."
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:163
-msgid "Could not fetch metadata for CD."
-msgstr "Non foi posíbel obter os metadatos deste CD."
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:164
+#| msgid "Could not fetch metadata for CD."
+msgid "Could not fetch track information"
+msgstr "Non foi posíbel obter información sobre a pista"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:191
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:192
msgid "Automatic import off since this album is already in the Music Library."
msgstr ""
"Desactivación automática de importación dado que este álbum xa se encontra "
"na fonoteca."
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:214
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:215
msgid "Could not import CD"
msgstr "Non foi posíbel importar o CD"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:231
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:232
msgid "Could not duplicate audio CD"
msgstr "Non foi posíbel copiar o CD de son"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:363
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:364
msgid "Ejecting audio CD..."
msgstr "Expulsando CD de son..."
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:381
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:382
#, csharp-format
msgid "Could not eject audio CD: {0}"
msgstr "Non foi posíbel expulsar o CD de son: {0}"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:414
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:415
msgid "Audio CD Preferences"
msgstr "Preferencias do CD de son"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:415
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:416
msgid "Eject Disc"
msgstr "Expulsar disco"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:439
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:440
#, csharp-format
msgid "Import ‟{0}”"
msgstr "Importar ‟{0}”"
@@ -4925,33 +4977,33 @@ msgstr "Importar ‟{0}”"
msgid "Detecting BPM"
msgstr "Detectando BPM"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:91
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:92
msgid "D_etect"
msgstr "D_etectar"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:103
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:104
msgid "T_ap"
msgstr "T_oque"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:111
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:112
msgid "Have Banshee attempt to auto-detect the BPM of this song"
msgstr "Tentar que Banshee autodetecte os BPM desta canción"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:113
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:114
msgid "Play this song"
msgstr "Reproducir esta canción"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:116
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:117
msgid "Tap this button to the beat to set the BPM for this song manually"
msgstr ""
"Toque este botón de golpeo para estabelecer o BPM para esta canción "
"manualmente"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:148
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:147
msgid "_Automatically detect BPM for all songs"
msgstr "Detectar _automaticamente todos os BPM de todas as cancións"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:149
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:148
msgid ""
"Detect beats per minute (BPM) for all songs that don't already have a value "
"set"
@@ -5056,11 +5108,11 @@ msgstr "Iniciar sesión"
msgid "Connecting to {0}"
msgstr "Conectado a {0}"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:178
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:187
msgid "Add Remote DAAP Server"
msgstr "Engadir servidor remoto DAAP"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:179
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:188
msgid "Add a new remote DAAP server"
msgstr "Engadir un novo servidor remoto DAAP"
@@ -5131,15 +5183,15 @@ msgstr "Anulando as descargas"
msgid "Waiting for downloads to terminate..."
msgstr "Esperando a que as descargas finalicen..."
-#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:60
+#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:59
msgid "Import eMusic Downloads to Library"
msgstr "Importar descargas de eMusica á fonoteca de música"
-#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:62
+#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:61
msgid "eMusic Files"
msgstr "Ficheiros eMusic"
-#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:78
+#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:77
msgid "eMusic Tracks"
msgstr "Pistas de eMusic"
@@ -5149,7 +5201,7 @@ msgid "File System Queue"
msgstr "Cola do sistema de ficheiros"
#: ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs:72
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:72
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:94
msgid "Clear"
msgstr "Limpar"
@@ -5158,7 +5210,7 @@ msgid "Remove all tracks from the file system queue"
msgstr "Eliminar todas as pistas da cola do sistema de ficheiros"
#: ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs:79
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:81
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:103
msgid "Clear on Quit"
msgstr "Limpar ao saír"
@@ -5243,18 +5295,35 @@ msgstr ", {0}"
msgid "Fix?"
msgstr "Arranxar?"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:48
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:51
msgid "View Item Details"
msgstr "Ver os detalles do elemento"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:57
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:60
msgid "Open Webpage"
msgstr "Abrir páxina web"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:76
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:79
msgid "Visit Archive.org"
msgstr "Visitar Archive.org"
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:83
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:61
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:170
+msgid "Subscribe"
+msgstr "Subscribirse"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:84
+#| msgid "Subscribe to a new podcast"
+msgid "Subscribe to this search as a podcast"
+msgstr "Subscribirse a esta busca como un podcast"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:88
+#, csharp-format
+#| msgid "Internet Archive"
+msgid "Internet Archive: {0}"
+msgstr "Internet Archive: {0}"
+
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs:78
msgid "Close Item"
msgstr "Pechar elemento"
@@ -5284,7 +5353,7 @@ msgstr ""
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:130
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:66
#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:136
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:271
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:279
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastEpisodePage.cs:89
msgid "Description"
msgstr "Descrición"
@@ -5388,16 +5457,16 @@ msgstr "{0}por{1} en {2}"
msgid "Write your own review"
msgstr "Escriba a súa propia revisión"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:109
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:108
msgid "Collection:"
msgstr "Colección:"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:118
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:117
#, csharp-format
msgid "Optional Query"
msgstr "Consulta opcional"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:165
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:164
msgid "Sort by:"
msgstr "Ordenar por:"
@@ -5499,10 +5568,6 @@ msgstr ""
msgid "Visit the Internet Archive online at archive.org"
msgstr "Visitar Internet Archive en liña archive.org"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:307
-msgid "Audiobooks"
-msgstr "Audiolibros"
-
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:308
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:78
msgid "Movies"
@@ -5776,11 +5841,11 @@ msgid "Add a new Internet Radio station or playlist"
msgstr ""
"Engadir unha emisora de radio de Internet nova ou unha lista de reprodución"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:81
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:83
msgid "Search your stations"
msgstr "Buscar nas súas emisoras"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:82
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:84
#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationEditor.cs:60
msgid "Edit Station"
msgstr "Editar emisora"
@@ -6260,15 +6325,15 @@ msgstr "lastfm:// URL"
msgid "lastfm://"
msgstr "lastfm://"
-#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:109
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:113
msgid "Media"
msgstr "Multimedia"
-#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:119
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:123
msgid "Library"
msgstr "Fonoteca"
-#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:131
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:135
msgid "Launch the Banshee Media Player"
msgstr "Lanzar o reproductor multimedia Banshee"
@@ -6371,22 +6436,22 @@ msgstr ""
"Simplificar a interface de «En reprodución» agochando a lista de fontes e "
"máis"
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:144
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:143
#, csharp-format
msgid "Unable to import track: {0}"
msgstr "Non se pode importar a pista: {0}"
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:178
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:177
msgid "Importing from Amarok failed"
msgstr "Fallou a importación de Amarok"
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:189
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:188
msgid "Amarok"
msgstr "Amarok"
#. TODO add Help button and dialog/tooltip
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:68
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:384
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:383
msgid "iTunes Importer"
msgstr "Importador de iTunes"
@@ -6403,24 +6468,24 @@ msgid "Import playlists"
msgstr "Importar listas de reprodución"
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:120
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:387
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:386
#, csharp-format
msgid "Locate your \"{0}\" file..."
msgstr "Localice o seu ficheiro \"{0}\"..."
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:138
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:388
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:387
#, csharp-format
msgid "Locate \"{0}\""
msgstr "Localice \"{0}\""
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:167
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:389
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:388
msgid "Locate iTunes Music Directory"
msgstr "Localice o seu cartafol de música iTunes"
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:196
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:391
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:390
#, csharp-format
msgid ""
"The iTunes library refers to your music directory as \"{0}\" but Banshee was "
@@ -6429,13 +6494,13 @@ msgstr ""
"A biblioteca de iTunes refírese ao seu cartafol de música como \"{0}\" pero "
"Banshee non foi capaz de inferir a localización neste cartafol. Localíceo."
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:75
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:393
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:74
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:392
msgid "iTunes Media Player"
msgstr "Reprodutor de música iTunes"
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:135
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:395
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:134
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:394
msgid ""
"Banshee is not familiar with this version of the iTunes library format. "
"Importing may or may not work as expected, or at all. Would you like to "
@@ -6445,17 +6510,17 @@ msgstr ""
"importación pode ou non traballar como se espera. Quere tentar a importala "
"de todas formas?"
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:440
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:236
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:397
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:439
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:235
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:396
msgid "Unable to import song."
msgstr "Non se pode importar a pista."
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:370
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:369
msgid "Rhythmbox Music Player"
msgstr "Reprodutor de música Rhythmbox"
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:386
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:385
msgid "Import _playlists"
msgstr "Importar _listas de reprodución"
@@ -6467,37 +6532,80 @@ msgstr "_Encher"
msgid "f_rom"
msgstr "de_nde"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:50
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:52
msgid "Add to Play Queue"
msgstr "Engadir á cola de reprodución"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:51
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:53
msgid "Append selected songs to the play queue"
msgstr "Engadir as cancións seleccionadas á cola de reprodución"
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:57
+#| msgid "after"
+msgid "Play After"
+msgstr "Reproducir despois de"
+
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:58
+#| msgid ""
+#| "Enable or disable playback stopping after the currently playing track "
+#| "(value should be either 'true' or 'false')"
+msgid "Add selected songs after the currently playing track, album, or artist"
+msgstr ""
+"Engadir as cancións seleccionadas despois da pista, álbum ou artista actual"
+
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:62
+#| msgid "Current source:"
+msgid "Current Track"
+msgstr "Pista actual"
+
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:63
+#| msgid "Append selected songs to the play queue"
+msgid "Add selected songs to the play queue after the currently playing song"
+msgstr "Engadir as cancións seleccionadas despois da canción en reprodución"
+
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:67
+#| msgid "Current source:"
+msgid "Current Album"
+msgstr "Álbum actual"
+
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:68
+#| msgid "Append selected songs to the play queue"
+msgid "Add selected songs to the play queue after the currently playing album"
+msgstr "Engadir as cancións seleccionadas despois do álbum en reprodución"
+
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:72
+#| msgid "Current player state"
+msgid "Current Artist"
+msgstr "Artista actual"
+
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:73
+#| msgid "Append selected songs to the play queue"
+msgid "Add selected songs to the play queue after the currently playing artist"
+msgstr "Engadir as cancións seleccionadas despois do artista en reprodución"
+
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:80
msgid "Refresh random tracks in the play queue"
msgstr "Actualizar as pistas aleatorias da cola de reprodución"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:63
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:85
msgid "Randomize the playback order of items in the play queue"
msgstr ""
"Facer aleatoria a orde de reprodución dos elementos da súa cola de "
"reprodución"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:67
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:89
msgid "Add More"
msgstr "Engadir máis"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:68
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:90
msgid "Add more random tracks to the play queue"
msgstr "Engadir máis pistas aleatorias á cola de reprodución"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:73
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:95
msgid "Remove all tracks from the play queue"
msgstr "Quitar todas as pistas da cola de reprodución"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:82
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:104
msgid "Clear the play queue when quitting"
msgstr "Limpar a cola de reprodución ao saír"
@@ -6505,16 +6613,17 @@ msgstr "Limpar a cola de reprodución ao saír"
msgid "Remove From Play Queue"
msgstr "Eliminar da cola de reprodución"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:864
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:967
msgid "Number of _played songs to show"
msgstr "Número de cancións _reproducidas para mostrar"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:870
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:973
msgid "Number of _upcoming songs to show"
msgstr "Número de cancións por _vir para mostrar"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastFeedModel.cs:47
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:270
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:278
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:89
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastEpisodePage.cs:86
msgid "Podcast"
msgstr "Podcast"
@@ -6524,69 +6633,64 @@ msgstr "Podcast"
msgid "All Podcasts ({0})"
msgstr "Todos os Podcast ({0})"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:122
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:102
+#| msgid "Local Folders"
+msgid "Podcasts Folder"
+msgstr "Cartafol de podcasts"
+
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:129
msgid "Remove Podcast"
msgstr "Podcast remoto"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:127
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:134
msgid "Disable Auto Updates"
msgstr "Desactivar actualizacións automáticas"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:145
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:152
#, csharp-format
msgid "Network error updating {0}"
msgstr "Produciuse un erro de rede ao actualizar {0}"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:151
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:158
#, csharp-format
msgid "Parsing error updating {0}"
msgstr "Produciuse un erro de análise ao actualizar {0}"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:154
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:161
#, csharp-format
msgid "Authentication error updating {0}"
msgstr "Produciuse un erro de autenticación ao actualizar {0}"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:157
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:164
#, csharp-format
msgid "Error updating {0}"
msgstr "Produciuse un erro ao actualizar {0}"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:213
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:220
msgid "Search your podcasts"
msgstr "Buscar nos seus podcasts"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:270
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:278
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastEpisodePage.cs:88
msgid "Published"
msgstr "Publicado"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:270
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcastStatusIndicator.cs:66
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:278
msgid "New"
msgstr "Novo"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:271
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellDownloadStatus.cs:57
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:279
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcastStatusIndicator.cs:66
msgid "Downloaded"
msgstr "Descargado"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:293
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:305
#, csharp-format
msgid "{0} episode"
msgid_plural "{0} episodes"
msgstr[0] "{0} capítulo"
msgstr[1] "{0} capítulos"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellDownloadStatus.cs:58
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellUnheard.cs:58
-msgid "All Items"
-msgstr "Todos os elementos"
-
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellDownloadStatus.cs:59
-msgid "Not Downloaded"
-msgstr "Non descargado"
-
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:113
msgid "Never updated"
msgstr "Nunca actualizado"
@@ -6609,9 +6713,9 @@ msgstr "Descargando"
msgid "New Items"
msgstr "Novos elementos"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellUnheard.cs:59
-msgid "Old Items"
-msgstr "Elementos antigos"
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellUnheard.cs:58
+msgid "All Items"
+msgstr "Todos os elementos"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs:50
msgid "Downloading Podcast(s)"
@@ -6622,68 +6726,74 @@ msgid "Cancel all podcast downloads?"
msgstr "Quere anualr todas as descargas de podcasts?"
#. "<control><shift>U",
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:72
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:73
msgid "Check all podcasts for new episodes"
msgstr "Comprobar en todos os podcasts se hai novos capítulos"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:77
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:78
msgid "Add Podcast..."
msgstr "Engadir podcast..."
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:78
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:79
msgid "Subscribe to a new podcast"
msgstr "Subscribirse a un podcast novo"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:89
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:93
msgid "Unsubscribe and Delete"
msgstr "Desubscribirse e eliminar"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:95
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:99
msgid "Check for New Episodes"
msgstr "Comprobar se hai novos episodios"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:101
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:105
msgid "Download All Episodes"
msgstr "Descargar todos os episodios"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:107
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:111
msgid "Visit Podcast Homepage"
msgstr "Visitar a web do podcast"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:119
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:123
msgid "Mark as New"
msgstr "Marcar como novo"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:125
-msgid "Mark as Old"
-msgstr "Marcar como antigo"
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:129
+#| msgid "Drive"
+msgid "Archive"
+msgstr "Arquivo"
#. Translators: this is a verb used as a button name, not a noun
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:131
-msgid "Download Podcast(s)"
-msgstr "Descargar podcast(s)"
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:135
+#| msgid "Downloads"
+msgid "Download"
+msgstr "Descargar"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:137
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:141
msgid "Cancel Download"
msgstr "Anular a descarga"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:143
-msgid "Remove Downloaded File(s)"
-msgstr "Eliminar ficheiros descargados"
-
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:149
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:153
msgid "Visit Website"
msgstr "Visitar sitio web"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:161
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:165
msgid "Add Podcast"
msgstr "Engadir podcast"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:325
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:262
+#, csharp-format
+#| msgid "Select Files"
+msgid "Delete File"
+msgid_plural "Delete Files"
+msgstr[0] "Eliminar ficheiro"
+msgstr[1] "Eliminar ficheiros"
+
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:343
msgid "Invalid URL"
msgstr "URL inválido"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:326
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:344
msgid "Podcast URL is invalid."
msgstr "O URL do podcast non é válido."
@@ -6718,11 +6828,6 @@ msgstr "Non hai descrición dispoñíbel"
msgid "Podcast:"
msgstr "Podcast:"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:61
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:170
-msgid "Subscribe"
-msgstr "Subscribirse"
-
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:92
msgid "Subscribe to New Podcast"
msgstr "Subscribirse ao novo podcast"
@@ -6802,7 +6907,6 @@ msgstr "Ocultar <i>{0}</i>"
#. Translators: {0} is substituted with the application name
#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:53
#, csharp-format
-#| msgid "Banshee Encountered a Fatal Error"
msgid "{0} Encountered a Fatal Error"
msgstr "Banshee encontrou un erro fatal {0} "
@@ -6943,8 +7047,6 @@ msgstr "baleiro"
#: ../src/Hyena/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:90
#, csharp-format
-#| msgid "{0} day"
-#| msgid_plural "{0} days"
msgid "{0} ago"
msgstr "fai {0}"
@@ -7080,6 +7182,70 @@ msgstr "Conectado a Last.fm."
msgid "Unknown Podcast"
msgstr "Podcast descoñecido"
+#~ msgid "Average Bitrate"
+#~ msgstr "Taxa de bits media"
+
+#~ msgid "Extreme"
+#~ msgstr "Extremo"
+
+#~ msgid "Insane"
+#~ msgstr "Demente"
+
+#~ msgid "LAME Preset"
+#~ msgstr "Preconfiguración de LAME"
+
+#~ msgid "Medium"
+#~ msgstr "Medio"
+
+#~ msgid "Preset"
+#~ msgstr "Preconfiguración"
+
+#~ msgid "Standard"
+#~ msgstr "Estándar"
+
+#~ msgid "VBR Mode"
+#~ msgstr "Modo VBR"
+
+#~ msgid "Home Folder"
+#~ msgstr "Cartafol persoal"
+
+#~ msgid "Manage _Extensions"
+#~ msgstr "Xestionar _extensións"
+
+#~ msgid "Manage extensions to add new features to Banshee"
+#~ msgstr ""
+#~ "Xestionar as extensións para engadir novas características a Banshee"
+
+#~ msgid "_Web Resources"
+#~ msgstr "Recursos _web"
+
+#~ msgid "Banshee _User Guide (Wiki)"
+#~ msgstr "_Guía do usuario de Banshee (Wiki)"
+
+#~ msgid "Learn about how to use Banshee"
+#~ msgstr "Aprender como usar o Banshee"
+
+#~ msgid "Videos From Photos Folder"
+#~ msgstr "Vídeos do cartafol Imaxes"
+
+#~ msgid "Audiobooks, etc"
+#~ msgstr "Audiolibros, etc"
+
+#~ msgid "Not Downloaded"
+#~ msgstr "Non descargado"
+
+#~ msgid "Old Items"
+#~ msgstr "Elementos antigos"
+
+#~ msgid "Mark as Old"
+#~ msgstr "Marcar como antigo"
+
+#~ msgid "Download Podcast(s)"
+#~ msgstr "Descargar podcast(s)"
+
+#~ msgid "Remove Downloaded File(s)"
+#~ msgstr "Eliminar ficheiros descargados"
+
#~ msgid "_Cover Art"
#~ msgstr "_Portada"
@@ -7197,9 +7363,6 @@ msgstr "Podcast descoñecido"
#~ msgid "Edit Last.fm Settings"
#~ msgstr "Editar a configuración de Last.fm"
-#~ msgid "Current source:"
-#~ msgstr "Fonte actual:"
-
#~ msgid "Failed to Login to Last.fm"
#~ msgstr "Fallou ao iniciar sesión en Last.fm"
diff --git a/po/sl.po b/po/sl.po
index 621d33d..30d465b 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: banshee\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=banshee&component=general\n"
-"POT-Creation-Date: 2010-11-18 19:36+0000\n"
-"PO-Revision-Date: 2010-11-19 10:10+0100\n"
+"POT-Creation-Date: 2010-12-09 09:51+0000\n"
+"PO-Revision-Date: 2010-12-10 09:35+0100\n"
"Last-Translator: Andrej Žnidaršič <andrej.znidarsic at gmail.com>\n"
"Language-Team: Slovenian GNOME Translation Team <gnome-si at googlegroups.com>\n"
"Language: \n"
@@ -371,7 +371,7 @@ msgstr "Prikaz ikone za nadzor Banshee v obvestilnem področju."
#. ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying.addin.xml
#: ../data/addin-xml-strings.cs:179
-#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:164
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:168
#: ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs:50
msgid "Now Playing"
msgstr "Predvaja se"
@@ -405,7 +405,7 @@ msgstr "Daj skladbe v ad-hoc seznam predvajanja, ali pusti prevzem samodejnemu D
#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:193
#: ../src/Dap/Banshee.Dap/Banshee.Dap/PodcastGroupSource.cs:38
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:107
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:212
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:210
msgid "Podcasts"
msgstr "Podcasti"
@@ -492,7 +492,7 @@ msgid "AAC (Novell Encoder)"
msgstr "AAC (Nov kodirnik)"
#: ../data/audio-profiles/aac-novell.xml.in.h:3
-#: ../data/audio-profiles/mp3-lame.xml.in.h:4
+#: ../data/audio-profiles/mp3-lame.xml.in.h:3
#: ../data/audio-profiles/mp3-xing.xml.in.h:2
#: ../data/audio-profiles/wavpack.xml.in.h:3
#: ../data/audio-profiles/wma.xml.in.h:4
@@ -549,61 +549,33 @@ msgid "A proprietary and older, but also popular, lossy audio format that produc
msgstr "Priljubljeni starejši zakonsko zaščiteni zvočni zapis, ki kodira zvok v večje datoteke s slabšo kakovostjo."
#: ../data/audio-profiles/mp3-lame.xml.in.h:2
-msgid "Average Bitrate"
-msgstr "Povprečna bitna hitrost"
-
-#: ../data/audio-profiles/mp3-lame.xml.in.h:3
#: ../data/audio-profiles/vorbis.xml.in.h:2
#: ../data/audio-profiles/wavpack.xml.in.h:2
#: ../data/audio-profiles/wma.xml.in.h:3
msgid "Best"
msgstr "Najboljše"
-#: ../data/audio-profiles/mp3-lame.xml.in.h:5
+#: ../data/audio-profiles/mp3-lame.xml.in.h:4
msgid "Constant Bitrate"
msgstr "Stalna bitna hitrost"
-#: ../data/audio-profiles/mp3-lame.xml.in.h:6
-msgid "Extreme"
-msgstr "Skrajno"
-
-#: ../data/audio-profiles/mp3-lame.xml.in.h:7
-msgid "Insane"
-msgstr "Noro"
-
-#: ../data/audio-profiles/mp3-lame.xml.in.h:8
-msgid "LAME Preset"
-msgstr "LAME prednastavljene"
+#: ../data/audio-profiles/mp3-lame.xml.in.h:5
+msgid "Encoding Mode"
+msgstr "Način kodiranja"
-#: ../data/audio-profiles/mp3-lame.xml.in.h:9
+#: ../data/audio-profiles/mp3-lame.xml.in.h:6
msgid "MP3 (LAME Encoder)"
msgstr "MP3 (kodirnik LAME)"
-#: ../data/audio-profiles/mp3-lame.xml.in.h:10
-msgid "Medium"
-msgstr "Srednje"
-
-#: ../data/audio-profiles/mp3-lame.xml.in.h:11
-msgid "Preset"
-msgstr "Prednastavljene"
-
-#: ../data/audio-profiles/mp3-lame.xml.in.h:12
-msgid "Standard"
-msgstr "Običajno"
-
-#: ../data/audio-profiles/mp3-lame.xml.in.h:13
-msgid "VBR Mode"
-msgstr "Način VBR"
-
-#: ../data/audio-profiles/mp3-lame.xml.in.h:14
+#: ../data/audio-profiles/mp3-lame.xml.in.h:7
msgid "VBR Quality"
msgstr "Kakovost VBR"
-#: ../data/audio-profiles/mp3-lame.xml.in.h:15
+#: ../data/audio-profiles/mp3-lame.xml.in.h:8
msgid "Variable Bitrate"
msgstr "Spremenljiva bitna hitrost"
-#: ../data/audio-profiles/mp3-lame.xml.in.h:16
+#: ../data/audio-profiles/mp3-lame.xml.in.h:9
#: ../data/audio-profiles/vorbis.xml.in.h:5
#: ../data/audio-profiles/wavpack.xml.in.h:15
#: ../data/audio-profiles/wma.xml.in.h:7
@@ -827,7 +799,7 @@ msgid "Could not create BPM detection driver."
msgstr "Gonilnika zaznavanja UNM ni mogoče ustvariti."
#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:82
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:771
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:812
msgid "Enable _gapless playback"
msgstr "Omogoči predvajanje _brez premora"
@@ -844,15 +816,15 @@ msgstr "Knjižnice GStreamer ni mogoče zagnati"
msgid "Unknown Error"
msgstr "Neznana napaka"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:765
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:806
msgid "_Enable ReplayGain correction"
msgstr "_Omogoči popravek ReplayGain"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:766
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:807
msgid "For tracks that have ReplayGain data, automatically scale (normalize) playback volume"
msgstr "Samodejno izravnaj glasnost predvajanja skladb s podatki ReplayGain"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:772
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:813
msgid "Eliminate the small playback gap on track change. Useful for concept albums and classical music."
msgstr "Odstrani majhen premor predvajanja ob spremembi skladb. Uporabno za tematske albume in klasično glasbo."
@@ -860,7 +832,7 @@ msgstr "Odstrani majhen premor predvajanja ob spremembi skladb. Uporabno za tema
msgid "Could not create transcoder"
msgstr "Prekodirnika ni mogoče ustvariti"
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:222
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:229
msgid "GStreamer# 0.10"
msgstr "Uporabljen Gstreamer 0.10."
@@ -1157,8 +1129,8 @@ msgid "En_queue"
msgstr "_Razvrsti"
#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:86
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:66
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:196
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:210
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:126
msgid "_Play"
msgstr "_Predvajaj"
@@ -1279,7 +1251,7 @@ msgid "_Restart Video"
msgstr "_Ponovno predvajaj video"
#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:86
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:93
msgid "_Restart Song"
msgstr "_Ponovno predvajaj"
@@ -1300,7 +1272,7 @@ msgid "_Jump to Playing Video"
msgstr "_Skoči na predvajan video"
#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:82
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:89
msgid "_Jump to Playing Song"
msgstr "_Skoči na predvajano skladbo"
@@ -1820,11 +1792,6 @@ msgstr "Uvozi _ocene"
msgid "Import play _counts"
msgstr "Uvozi _števila predvajanj"
-#. disabled by default
-#: ../src/Core/Banshee.Services/Banshee.Metrics/BansheeMetrics.cs:312
-msgid "Improve Banshee by sending anonymous usage data"
-msgstr "Izboljšajte Banshee s pošiljanjem anonimnih podatkov o uporabi"
-
#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:52
msgid "There is no available network connection"
msgstr "Na voljo ni delujoče omrežne povezave"
@@ -1871,8 +1838,8 @@ msgstr "Izbriši seznam predvajanja"
#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:391
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:452
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:542
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:462
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:591
#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214
msgid "New Playlist"
msgstr "Nov seznam predvajanja"
@@ -1919,6 +1886,10 @@ msgstr "Pravila datotek"
msgid "Co_py files to media folders when importing"
msgstr "_Kopiraj datoteke v večpredstavnostne mape med uvažanjem"
+#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:69
+msgid "Improve Banshee by sending anonymous usage data"
+msgstr "Izboljšajte Banshee s pošiljanjem anonimnih podatkov o uporabi"
+
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:63
msgid "items"
msgstr "predmeti"
@@ -2419,6 +2390,7 @@ msgstr "Davno dodano"
#. Translators: These are unique strings for playback errors. Please, no spaces. Blank ok.
#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:44
#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:46
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:146
#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs:97
msgid "None"
msgstr "Noben"
@@ -3038,59 +3010,63 @@ msgstr "Uvozi seznam predvajanja"
msgid "Playlists"
msgstr "Seznami predvajanja"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:67
-msgid "Play or pause the current item"
-msgstr "Predvajanje ali premor predvajanja trenutne skladbe"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:69
+msgid "Play the current item"
+msgstr "Predvajaj trenutni predmet"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:70
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:77
msgid "_Next"
msgstr "_Naslednji"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:71
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:78
msgid "Play the next item"
msgstr "Predvajanje naslednjega predmeta"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:74
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:81
msgid "Pre_vious"
msgstr "_Predhodni"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:75
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:82
msgid "Play the previous item"
msgstr "Predvajanje predhodnega predmeta"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:78
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:85
msgid "Seek _To..."
msgstr "Išči _do ..."
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:79
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:86
msgid "Seek to a specific location in current item"
msgstr "Išče določeno mesto v trenutnem predmetu"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:83
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:90
msgid "Jump to the currently playing item"
msgstr "Skoči na trenutno predvajan predmet"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:87
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:94
msgid "Restart the current item"
msgstr "Ponovno zažene trenuten predmet"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:92
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:99
msgid "_Stop When Finished"
msgstr "_Zaustavi po koncu"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:93
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:100
msgid "Stop playback after the current item finishes playing"
msgstr "Zaustavitev predvajanja po končanem predvajanju trenutne skladbe"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:99
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:106
msgid "_Playback"
msgstr "_Predvajanje"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:190
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:203
msgid "_Pause"
msgstr "_Premor"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:202
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:205
+msgid "Pause the current item"
+msgstr "Naredi premor trenutnega predmeta"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:217
msgid "Sto_p"
msgstr "_Zaustavi"
@@ -3129,6 +3105,45 @@ msgstr "Ponovi predvajanje trenutne skladbe"
msgid "Shuffle"
msgstr "Premešaj"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:62
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:63
+msgid "Subtitle"
+msgstr "PodnapisPodnaslov"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:65
+msgid "Load File..."
+msgstr "Naloži datoteko ..."
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:66
+msgid "Load subtitle file"
+msgstr "Naloži datoteko podnapisa"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:79
+msgid "Load Subtitle File"
+msgstr "Naloži datoteko s podnapisi"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:88
+msgid "L_oad"
+msgstr "_Naloži"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:97
+msgid "Subtitle files"
+msgstr "Datoteke podnapisov"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:128
+#, csharp-format
+msgid "Subtitle {0}"
+msgstr "Podnapis {0}"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:132
+#, csharp-format
+msgid "Activate embedded subtitle {0}"
+msgstr "Omogoči vstavljen podnapis {0}"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:147
+msgid "Hide subtitles"
+msgstr "Skrij podnapise"
+
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:75
msgid "_New Playlist"
msgstr "_Nov seznam predvajanja"
@@ -3336,20 +3351,20 @@ msgstr "Po skladanju z _izvajalcem"
msgid "Search all songs of this artist"
msgstr "Iskanje vseh skladb izvajalca"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:312
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:322
#, csharp-format
msgid "_Delete From \"{0}\""
msgstr "_Izbriši iz \"{0}\""
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:532
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:542
msgid "The folder could not be found."
msgstr "Mape ni mogoče najti."
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:533
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:543
msgid "Please check that the track's location is accessible by the system."
msgstr "Preverite, če lahko sistem dostopa do mesta skladbe."
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:610
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:620
#, csharp-format
msgid "Are you sure you want to permanently delete this item?"
msgid_plural "Are you sure you want to permanently delete the selected {0} items?"
@@ -3358,16 +3373,16 @@ msgstr[1] "Ali ste prepričani, da želite trajno izbrisati {0} izbran predmet?"
msgstr[2] "Ali ste prepričani, da želite trajno izbrisati {0} izbrana predmeta?"
msgstr[3] "Ali ste prepričani, da želite trajno izbrisati {0} izbrane predmete?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:614
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:624
msgid "If you delete the selection, it will be permanently lost."
msgstr "Izbris izbora bo trajen."
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:617
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:627
#, csharp-format
msgid "Remove selection from {0}?"
msgstr "Odstranitev izbora iz {0}?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:620
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:630
#, csharp-format
msgid "Are you sure you want to remove the selected item from your {1}?"
msgid_plural "Are you sure you want to remove the selected {0} items from your {1}?"
@@ -3662,40 +3677,40 @@ msgstr "Urejevalnik skladb"
msgid "Track Properties"
msgstr "Lastnosti skladbe"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:149
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:151
msgid "Show the previous track"
msgstr "Pokaži predhodno skladbo"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:155
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:157
msgid "Show the next track"
msgstr "Pokaži naslednjo skladbo"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:185
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:187
msgid "Title:"
msgstr "Naslov:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:186
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:188
msgid "Artist:"
msgstr "Izvajalec:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:187
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:189
msgid "Album:"
msgstr "Album:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:311
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:313
msgid "Sync all field _values"
msgstr "Usklajevanje vseh vrednosti _polj"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:316
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:318
msgid "Apply the values of all common fields set for this track to all of the tracks selected in this editor"
msgstr "Uveljavi vrednosti vseh nastavljenih skupnih polj te skladbe za vse skladbe izbrane v urejevalniku"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:416
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:418
#, csharp-format
msgid "<i>Editing {0} of {1} items</i>"
msgstr "<i>Urejanje {0} od {1} predmetov</i>"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:678
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:698
#, csharp-format
msgid "Save the changes made to the open track?"
msgid_plural "Save the changes made to {0} of {1} open tracks?"
@@ -3704,11 +3719,11 @@ msgstr[1] "Ali naj bodo spremembe {0} od {1} odprte skladbe shranjene?"
msgstr[2] "Ali naj bodo spremembe {0} od {1} odprtih skladb shranjene?"
msgstr[3] "Ali naj bodo spremembe {0} od {1} odprtih skladb shranjene?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:695
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:715
msgid "Close _without Saving"
msgstr "Zapri _brez shranjevanja"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:732
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:752
#, csharp-format
msgid "If you don't save, changes from the last {0} will be permanently lost."
msgstr "V primeru, da datoteke ne shranite, bo zadnjih {0} sprememb trajno izgubljenih."
@@ -4160,7 +4175,7 @@ msgid "Vendor"
msgstr "Ponudnik"
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:284
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:142
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:140
#, csharp-format
msgid "Loading {0}"
msgstr "Nalaganje {0}"
@@ -4888,11 +4903,11 @@ msgstr "Prijava"
msgid "Connecting to {0}"
msgstr "Povezovanje z {0}"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:178
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:187
msgid "Add Remote DAAP Server"
msgstr "Dodajte oddaljen strežnik DAAP"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:179
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:188
msgid "Add a new remote DAAP server"
msgstr "Doda nov oddaljen strežnik DAAP"
@@ -5117,7 +5132,7 @@ msgstr "Napaka med pridobivanjem podrobnosti iz spletnega arhiva"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:130
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:66
#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:136
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:286
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:279
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastEpisodePage.cs:89
msgid "Description"
msgstr "Opis"
@@ -6080,15 +6095,15 @@ msgstr "lastfm:// URL"
msgid "lastfm://"
msgstr "lastfm://"
-#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:109
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:113
msgid "Media"
msgstr "Večpredstavnostna datoteka"
-#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:119
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:123
msgid "Library"
msgstr "Knjižnica"
-#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:131
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:135
msgid "Launch the Banshee Media Player"
msgstr "Zaženi predvajalnik večpredstavnostnih datotek Banshee"
@@ -6339,16 +6354,16 @@ msgstr "Počisti čakalno vrsto predvajanja ob končanju"
msgid "Remove From Play Queue"
msgstr "Odstrani s čakalne vrste predvajanja"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:959
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:967
msgid "Number of _played songs to show"
msgstr "Število _predvajanih skladb za prikaz"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:965
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:973
msgid "Number of _upcoming songs to show"
msgstr "Število _prihajajočih skladb za prikaz"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastFeedModel.cs:47
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:285
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:278
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:89
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastEpisodePage.cs:86
msgid "Podcast"
@@ -6359,58 +6374,57 @@ msgstr "Podcast"
msgid "All Podcasts ({0})"
msgstr "Vsi podcasti ({0})"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:104
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:102
msgid "Podcasts Folder"
msgstr "Mapa podcastov"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:131
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:129
msgid "Remove Podcast"
msgstr "Odstrani podcast"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:136
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:134
msgid "Disable Auto Updates"
msgstr "Onemogoči samodejne posodobitve"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:154
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:152
#, csharp-format
msgid "Network error updating {0}"
msgstr "Napaka omrežja med posodabljanjem {0}"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:160
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:158
#, csharp-format
msgid "Parsing error updating {0}"
msgstr "Napaka razčlenjevanja med posodabljanjem {0}"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:163
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:161
#, csharp-format
msgid "Authentication error updating {0}"
msgstr "Napaka overitve med posodabljanjem {0}"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:166
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:164
#, csharp-format
msgid "Error updating {0}"
msgstr "Napaka med posodabljanjem {0}"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:222
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:220
msgid "Search your podcasts"
msgstr "Iščite po svojih podcastih"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:285
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:278
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastEpisodePage.cs:88
msgid "Published"
msgstr "Objavljeno"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:285
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:278
msgid "New"
msgstr "Novo"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:286
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellDownloadStatus.cs:57
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:279
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcastStatusIndicator.cs:66
msgid "Downloaded"
msgstr "Prejeto"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:312
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:305
#, csharp-format
msgid "{0} episode"
msgid_plural "{0} episodes"
@@ -6419,15 +6433,6 @@ msgstr[1] "{0} epizoda"
msgstr[2] "{0} epizodi"
msgstr[3] "{0} epizode"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellDownloadStatus.cs:58
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellUnheard.cs:58
-msgid "All Items"
-msgstr "Vsi predmeti"
-
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellDownloadStatus.cs:59
-msgid "Not Downloaded"
-msgstr "Ne prejeto"
-
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:113
msgid "Never updated"
msgstr "Nikoli posodobljeno"
@@ -6450,9 +6455,9 @@ msgstr "Prejemanje"
msgid "New Items"
msgstr "Novi predmeti"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellUnheard.cs:59
-msgid "Old Items"
-msgstr "Stari predmeti"
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellUnheard.cs:58
+msgid "All Items"
+msgstr "Vsi predmeti"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs:50
msgid "Downloading Podcast(s)"
@@ -6462,10 +6467,6 @@ msgstr "Prejemanje podcast-a/ov"
msgid "Cancel all podcast downloads?"
msgstr "Ali naj bodo vsa prejemanja podcastov preklicana?"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/HeaderWidget.cs:99
-msgid "_Limit to episodes from"
-msgstr "_Omeji na epizode od"
-
#. "<control><shift>U",
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:73
msgid "Check all podcasts for new episodes"
@@ -6919,6 +6920,32 @@ msgstr "Povezano z Last.fm "
msgid "Unknown Podcast"
msgstr "Neznan Podcast"
+#~ msgid "Load subtitle"
+#~ msgstr "Naloži podnapis"
+#~ msgid "Load Subtitle"
+#~ msgstr "Naloži podnapis"
+#~ msgid "Average Bitrate"
+#~ msgstr "Povprečna bitna hitrost"
+#~ msgid "Extreme"
+#~ msgstr "Skrajno"
+#~ msgid "Insane"
+#~ msgstr "Noro"
+#~ msgid "LAME Preset"
+#~ msgstr "LAME prednastavljene"
+#~ msgid "Medium"
+#~ msgstr "Srednje"
+#~ msgid "Preset"
+#~ msgstr "Prednastavljene"
+#~ msgid "Standard"
+#~ msgstr "Običajno"
+#~ msgid "VBR Mode"
+#~ msgstr "Način VBR"
+#~ msgid "Not Downloaded"
+#~ msgstr "Ne prejeto"
+#~ msgid "Old Items"
+#~ msgstr "Stari predmeti"
+#~ msgid "_Limit to episodes from"
+#~ msgstr "_Omeji na epizode od"
#~ msgid "Home Folder"
#~ msgstr "Domača mapa"
#~ msgid "Videos From Photos Folder"
diff --git a/po/th.po b/po/th.po
index 12839e2..214b0b4 100644
--- a/po/th.po
+++ b/po/th.po
@@ -10,8 +10,8 @@ msgstr ""
"Project-Id-Version: Banshee\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=banshee&component=general\n"
-"POT-Creation-Date: 2010-11-07 23:53+0000\n"
-"PO-Revision-Date: 2010-11-15 17:31+0700\n"
+"POT-Creation-Date: 2010-11-20 20:48+0000\n"
+"PO-Revision-Date: 2010-11-22 20:32+0700\n"
"Last-Translator: Sira Nokyoongtong <gumaraa at gmail.com>\n"
"Language-Team: Thai <thai-l10n at googlegroups.com>\n"
"MIME-Version: 1.0\n"
@@ -148,7 +148,7 @@ msgstr ""
#: ../data/addin-xml-strings.cs:71
msgid "Browse, search, and purchase music from the Amazon MP3 store"
-msgstr ""
+msgstr "เรียกดู, ค้นหา และซื้อเพลงจากร้าน MP3 ของ Amazon"
#: ../data/addin-xml-strings.cs:72 ../data/addin-xml-strings.cs:77
#: ../data/addin-xml-strings.cs:112 ../data/addin-xml-strings.cs:127
@@ -164,7 +164,7 @@ msgstr "นำเข้า MP3 จาก Amazon"
#: ../data/addin-xml-strings.cs:76
msgid "Download and import music purchased from Amazon.com"
-msgstr ""
+msgstr "ดาวน์โหลดและนำเข้าเพลงที่ซื้อจาก Amazon.com"
#. ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook.addin.xml
#: ../data/addin-xml-strings.cs:80
@@ -187,10 +187,8 @@ msgstr "แหล่งเพลง"
#. ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd.addin.xml
#: ../data/addin-xml-strings.cs:85
-#, fuzzy
-#| msgid "Audio CD"
msgid "Audio CD Support"
-msgstr "ซีดีเพลง"
+msgstr "การรองรับซีดีเพลง"
#: ../data/addin-xml-strings.cs:86
msgid "Listen to and rip Audio CDs."
@@ -203,7 +201,7 @@ msgstr ""
#: ../data/addin-xml-strings.cs:91
msgid "Customize and extend Banshee with Boo-language scripts."
-msgstr ""
+msgstr "ปรับแต่งและเพิ่มความสามารถให้กับ Banshee ด้วยสคริปต์ภาษา Boo"
#: ../data/addin-xml-strings.cs:92 ../data/addin-xml-strings.cs:97
#: ../data/addin-xml-strings.cs:102 ../data/addin-xml-strings.cs:107
@@ -217,11 +215,11 @@ msgstr ""
#. ../src/Extensions/Banshee.Bpm/Banshee.Bpm.addin.xml
#: ../data/addin-xml-strings.cs:95
msgid "BPM Detection"
-msgstr ""
+msgstr "การตรวจจับ BPM"
#: ../data/addin-xml-strings.cs:96
msgid "Detect the beats per minute (BPM) of your music."
-msgstr ""
+msgstr "ตรวจจับจังหวะต่อนาที (BPM) ของเพลงของคุณ"
#. ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt.addin.xml
#: ../data/addin-xml-strings.cs:100
@@ -236,25 +234,21 @@ msgstr ""
#. ../src/Extensions/Banshee.Daap/Banshee.Daap.addin.xml
#: ../data/addin-xml-strings.cs:105
-#, fuzzy
-#| msgid "Music Sharing"
msgid "DAAP Sharing"
-msgstr "การแบ่งปันเพลง"
+msgstr "การแบ่งปันผ่าน DAAP"
#: ../data/addin-xml-strings.cs:106
msgid "Browse and listen to music shared over your local network."
-msgstr ""
+msgstr "เรียกดูและฟังเพลงที่มีการแบ่งปันในเครือข่ายภายในของคุณ"
#. ../src/Extensions/Banshee.Emusic/Banshee.Emusic.addin.xml
#: ../data/addin-xml-strings.cs:110
-#, fuzzy
-#| msgid "Automatic Import"
msgid "eMusic Import"
-msgstr "นำเข้าอัตโนมัติ"
+msgstr "นำเข้า eMusic"
#: ../data/addin-xml-strings.cs:111
msgid "Download and import music purchased from eMusic"
-msgstr ""
+msgstr "ดาวน์โหลดและนำเข้าเพลงที่ซื้อจาก eMusic"
#. ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue.addin.xml
#: ../data/addin-xml-strings.cs:115
@@ -287,11 +281,11 @@ msgstr ""
#. ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio.addin.xml
#: ../data/addin-xml-strings.cs:130
msgid "Internet Radio"
-msgstr ""
+msgstr "วิทยุอินเทอร์เน็ต"
#: ../data/addin-xml-strings.cs:131
msgid "Listen to and organize Internet Radio stations."
-msgstr ""
+msgstr "ฟังและจัดแจงสถานีวิทยุอินเทอร์เน็ตต่างๆ"
#. ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.addin.xml
#: ../data/addin-xml-strings.cs:135
@@ -304,23 +298,21 @@ msgstr ""
#. ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming.addin.xml
#: ../data/addin-xml-strings.cs:140
-#, fuzzy
-#| msgid "Last.fm Password"
msgid "Last.fm Radio"
-msgstr "รหัสผ่าน Last.fm"
+msgstr "วิทยุ Last.fm"
#: ../data/addin-xml-strings.cs:141
msgid "Last.fm streaming radio for paid subscribers."
-msgstr ""
+msgstr "วิทยุ Last.fm แบบสตรีมสำหรับสมาชิกที่จ่ายค่าบริการ"
#. ../src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher.addin.xml
#: ../data/addin-xml-strings.cs:145
msgid "Library Watcher"
-msgstr ""
+msgstr "เครื่องมือเฝ้าสังเกตไลบรารี"
#: ../data/addin-xml-strings.cs:146
msgid "Automatically update music and video libraries"
-msgstr ""
+msgstr "ปรับข้อมูลไลบรารีเพลงและวีดิทัศน์โดยอัตโนมัติ"
#. ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo.addin.xml
#: ../data/addin-xml-strings.cs:150
@@ -374,35 +366,33 @@ msgstr ""
#. ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.addin.xml
#: ../data/addin-xml-strings.cs:174
msgid "Notification Area Icon"
-msgstr "ไอคอนพื้นที่แจ้งเตือน"
+msgstr "ไอคอนพื้นที่แจ้งเหตุ"
#: ../data/addin-xml-strings.cs:175
msgid "Display an icon in the notification area for controlling Banshee."
-msgstr ""
+msgstr "แสดงไอคอนในพื้นที่แจ้งเหตุเพื่อการควบคุม Banshee"
#. ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying.addin.xml
#: ../data/addin-xml-strings.cs:179
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:164
#: ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs:50
-#, fuzzy
-#| msgid "New Playlist"
msgid "Now Playing"
-msgstr "สร้างรายการเล่นใหม่"
+msgstr "กำลังเล่น"
#: ../data/addin-xml-strings.cs:180
msgid ""
"Provides a source that displays embedded video and provides fullscreen video "
"playback and controls."
-msgstr ""
+msgstr "จัดเตรียมแหล่งซึ่งแสดงวีดิทัศน์ฝังตัว โดยสามารถเล่นแบบเต็มจอพร้อมทั้งควบคุมได้"
#. ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration.addin.xml
#: ../data/addin-xml-strings.cs:183
msgid "Importers for Amarok, Rhythmbox and iTunes"
-msgstr ""
+msgstr "เครื่องมือนำเข้าสำหรับ Amarok, Rhythmbox และ iTunes"
#: ../data/addin-xml-strings.cs:184
msgid "Import your library from Amarok, Rhythmbox or iTunes."
-msgstr ""
+msgstr "นำเข้าไลบรารีของคุณจาก Amarok, Rhythmbox หรือ iTunes"
#. ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue.addin.xml
#: ../data/addin-xml-strings.cs:188
@@ -424,11 +414,11 @@ msgstr ""
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:107
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:212
msgid "Podcasts"
-msgstr ""
+msgstr "พอดคาสต์"
#: ../data/addin-xml-strings.cs:194
msgid "Subscribe to podcasts and stream or download episodes."
-msgstr ""
+msgstr "บอกรับพอดคาสต์และสตรีม หรือดาวน์โหลดตอนต่างๆ"
#. ../src/Extensions/Banshee.RemoteAudio/Banshee.RemoteAudio.addin.xml
#: ../data/addin-xml-strings.cs:198
@@ -497,15 +487,15 @@ msgstr "ช่องข้อมูลประกอบ"
#: ../data/addin-xml-strings.cs:222
#: ../src/Extensions/Banshee.YouTube/Banshee.YouTube/ContextPage.cs:44
msgid "YouTube"
-msgstr ""
+msgstr "YouTube"
#: ../data/addin-xml-strings.cs:223
msgid "Show related YouTube videos in the context pane"
-msgstr ""
+msgstr "แสดงวีดิทัศน์ YouTube ที่เกี่ยวข้องในช่องข้อมูลบริบท"
#: ../data/audio-profiles/aac-novell.xml.in.h:1
msgid "3GPP"
-msgstr ""
+msgstr "3GPP"
#: ../data/audio-profiles/aac-novell.xml.in.h:2
msgid "AAC (Novell Encoder)"
@@ -541,11 +531,11 @@ msgstr ""
#: ../data/audio-profiles/aac-novell.xml.in.h:8
msgid "MPEG-4 ISO"
-msgstr ""
+msgstr "MPEG-4 ISO"
#: ../data/audio-profiles/aac-novell.xml.in.h:9
msgid "MPEG-4 QuickTime"
-msgstr ""
+msgstr "MPEG-4 QuickTime"
#: ../data/audio-profiles/aac-novell.xml.in.h:10
msgid "Output Format"
@@ -584,10 +574,8 @@ msgstr ""
#: ../data/audio-profiles/vorbis.xml.in.h:2
#: ../data/audio-profiles/wavpack.xml.in.h:2
#: ../data/audio-profiles/wma.xml.in.h:3
-#, fuzzy
-#| msgid "Reset"
msgid "Best"
-msgstr "คืนค่าเดิม"
+msgstr "สูงสุด"
#: ../data/audio-profiles/mp3-lame.xml.in.h:5
msgid "Constant Bitrate"
@@ -595,11 +583,11 @@ msgstr ""
#: ../data/audio-profiles/mp3-lame.xml.in.h:6
msgid "Extreme"
-msgstr ""
+msgstr "สุดขีด"
#: ../data/audio-profiles/mp3-lame.xml.in.h:7
msgid "Insane"
-msgstr ""
+msgstr "หลุดโลก"
#: ../data/audio-profiles/mp3-lame.xml.in.h:8
msgid "LAME Preset"
@@ -621,7 +609,7 @@ msgstr "คืนค่าเดิม"
#: ../data/audio-profiles/mp3-lame.xml.in.h:12
msgid "Standard"
-msgstr ""
+msgstr "มาตรฐาน"
#: ../data/audio-profiles/mp3-lame.xml.in.h:13
msgid "VBR Mode"
@@ -640,7 +628,7 @@ msgstr ""
#: ../data/audio-profiles/wavpack.xml.in.h:15
#: ../data/audio-profiles/wma.xml.in.h:7
msgid "Worst"
-msgstr ""
+msgstr "ต่ำสุด"
#: ../data/audio-profiles/mp3-xing.xml.in.h:3
msgid "MP3 (Xing Encoder)"
@@ -648,17 +636,19 @@ msgstr ""
#: ../data/audio-profiles/vorbis.xml.in.h:1
msgid "Audio quality"
-msgstr ""
+msgstr "คุณภาพเสียง"
#: ../data/audio-profiles/vorbis.xml.in.h:3
msgid "Ogg Vorbis"
-msgstr ""
+msgstr "Ogg Vorbis"
#: ../data/audio-profiles/vorbis.xml.in.h:4
msgid ""
"Vorbis is an open source, lossy audio codec with high quality output at a "
"lower file size than MP3."
msgstr ""
+"Vorbis เป็นรูปแบบการอ่าน/ลงรหัสข้อมูลเสียงแบบเสียรายละเอียดที่มีคุณภาพเสียงสูง "
+"โดยขนาดแฟ้มเล็กกว่า MP3"
#: ../data/audio-profiles/wavpack.xml.in.h:1
msgid ""
@@ -734,7 +724,7 @@ msgstr ""
#: ../data/audio-profiles/wma.xml.in.h:2
msgid "Audio Quality"
-msgstr ""
+msgstr "คุณภาพเสียง"
#: ../data/audio-profiles/wma.xml.in.h:5
msgid "Use a variable bitrate"
@@ -766,45 +756,33 @@ msgid "Could not create pipeline"
msgstr "ไม่สามารถสร้างไปป์ไลน์"
#: ../libbanshee/banshee-bpmdetector.c:208
-#, fuzzy
-#| msgid "Could not create pipeline"
msgid "Could not create filesrc element"
-msgstr "ไม่สามารถสร้างไปป์ไลน์"
+msgstr "ไม่สามารถสร้างองค์ประกอบ filesrc"
#: ../libbanshee/banshee-bpmdetector.c:214
-#, fuzzy
-#| msgid "Could not create 'decodebin' plugin"
msgid "Could not create decodebin2 plugin"
-msgstr "ไม่สามารถสร้างปลั๊กอิน 'decodebin'"
+msgstr "ไม่สามารถสร้างปลั๊กอิน decodebin2"
#: ../libbanshee/banshee-bpmdetector.c:220
-#, fuzzy
-#| msgid "Could not create 'audioconvert' plugin"
msgid "Could not create audioconvert plugin"
-msgstr "ไม่สามารถสร้างปลั๊กอิน 'audioconvert'"
+msgstr "ไม่สามารถสร้างปลั๊กอิน audioconvert"
#: ../libbanshee/banshee-bpmdetector.c:226
-#, fuzzy
-#| msgid "Could not create mbtrm plugin"
msgid "Could not create bpmdetect plugin"
-msgstr "ไม่สามารถสร้างปลั๊กอิน mbtrm"
+msgstr "ไม่สามารถสร้างปลั๊กอิน bpmdetect"
#: ../libbanshee/banshee-bpmdetector.c:232
-#, fuzzy
-#| msgid "Could not create 'sinkben' plugin"
msgid "Could not create fakesink plugin"
-msgstr "ไม่สามารถสร้างปลั๊กอิน 'sinkben'"
+msgstr "ไม่สามารถสร้างปลั๊กอิน fakesink"
#: ../libbanshee/banshee-bpmdetector.c:241
#: ../libbanshee/banshee-bpmdetector.c:250 ../libbanshee/banshee-ripper.c:311
msgid "Could not link pipeline elements"
-msgstr "ไม่สามารถเชื่อมอิลิเมนต์ไปป์ไลน์"
+msgstr "ไม่สามารถเชื่อมองค์ประกอบของไปป์ไลน์"
#: ../libbanshee/banshee-ripper.c:276
-#, fuzzy
-#| msgid "Could not initialize component"
msgid "Could not initialize element from cdda URI"
-msgstr "ไม่สามารถตั้งต้นองค์ประกอบ"
+msgstr "ไม่สามารถตั้งต้นองค์ประกอบจาก URI ของ cdda ได้"
#: ../libbanshee/banshee-ripper.c:290
msgid "Could not create encoder pipeline"
@@ -815,28 +793,20 @@ msgid "Could not create queue plugin"
msgstr "ไม่สามารถสร้างปลั๊กอิน queue"
#: ../libbanshee/banshee-ripper.c:304
-#, fuzzy
-#| msgid "Could not create 'sinkben' plugin"
msgid "Could not create filesink plugin"
-msgstr "ไม่สามารถสร้างปลั๊กอิน 'sinkben'"
+msgstr "ไม่สามารถสร้างปลั๊กอิน filesink"
#: ../libbanshee/banshee-transcoder.c:240
-#, fuzzy
-#| msgid "Could not create queue plugin"
msgid "Could not create source element"
-msgstr "ไม่สามารถสร้างปลั๊กอิน queue"
+msgstr "ไม่สามารถสร้างองค์ประกอบต้นกำเนิด"
#: ../libbanshee/banshee-transcoder.c:246
-#, fuzzy
-#| msgid "Could not create 'decodebin' plugin"
msgid "Could not create 'decodebin2' plugin"
-msgstr "ไม่สามารถสร้างปลั๊กอิน 'decodebin'"
+msgstr "ไม่สามารถสร้างปลั๊กอิน 'decodebin2'"
#: ../libbanshee/banshee-transcoder.c:252
-#, fuzzy
-#| msgid "Could not create pipeline"
msgid "Could not create sink element"
-msgstr "ไม่สามารถสร้างไปป์ไลน์"
+msgstr "ไม่สามารถสร้างองค์ประกอบรับสัญญาณ"
#: ../libbanshee/banshee-transcoder.c:258
msgid "Could not create 'sinkben' plugin"
@@ -859,28 +829,20 @@ msgid "Could not construct pipeline"
msgstr "ไม่สามารถสร้างไปป์ไลน์"
#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:65
-#, fuzzy
-#| msgid "Write CD"
msgid "Write CD..."
-msgstr "เขียนซีดี"
+msgstr "เขียนซีดี..."
#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:66
-#, fuzzy
-#| msgid "Write selection to audio CD"
msgid "Write selected tracks to an audio CD"
-msgstr "เขียนเพลงที่เลือกเป็นซีดีเพลง"
+msgstr "เขียนเพลงที่เลือกลงในซีดีเพลง"
-#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:104
-#, fuzzy
-#| msgid "Could Not Write CD"
+#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:105
msgid "Could not write CD"
-msgstr "ไม่สามารถเขียนซีดีได้"
+msgstr "ไม่สามารถเขียนซีดี"
-#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:105
-#, fuzzy
-#| msgid "HAL could not be initialized"
+#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:106
msgid "Brasero could not be started"
-msgstr "ไม่สามารถตั้งต้น HAL ได้"
+msgstr "ไม่สามารถเริ่ม Brasero ได้"
#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/GnomeScreensaverManager.cs:79
msgid "Fullscreen video playback active"
@@ -961,44 +923,40 @@ msgid "Close"
msgstr "ปิด"
#: ../src/Clients/Booter/Booter/Entry.cs:152
-#, fuzzy
-#| msgid "Disc Options"
msgid "Help Options"
-msgstr "ตัวเลือกสำหรับแผ่น"
+msgstr "ตัวเลือกของการแสดงวิธีใช้"
#: ../src/Clients/Booter/Booter/Entry.cs:153
msgid "Show this help"
-msgstr ""
+msgstr "แสดงข้อความวิธีใช้นี้"
#: ../src/Clients/Booter/Booter/Entry.cs:154
msgid "Show options for controlling playback"
-msgstr ""
+msgstr "แสดงตัวเลือกต่างๆ สำหรับควบคุมการเล่น"
#: ../src/Clients/Booter/Booter/Entry.cs:155
msgid "Show options for querying the playing track"
-msgstr ""
+msgstr "แสดงตัวเลือกต่างๆ สำหรับสอบถามเพลงที่กำลังเล่น"
#: ../src/Clients/Booter/Booter/Entry.cs:156
msgid "Show options for querying the playing engine"
-msgstr ""
+msgstr "แสดงตัวเลือกต่างๆ สำหรับสอบถามตัวกลไกที่กำลังเล่น"
#: ../src/Clients/Booter/Booter/Entry.cs:157
msgid "Show options for the user interface"
-msgstr ""
+msgstr "แสดงตัวเลือกต่างๆ สำหรับส่วนติดต่อผู้ใช้"
#: ../src/Clients/Booter/Booter/Entry.cs:158
msgid "Show options for developers and debugging"
-msgstr ""
+msgstr "แสดงตัวเลือกต่างๆ สำหรับนักพัฒนาและการดีบั๊ก"
#: ../src/Clients/Booter/Booter/Entry.cs:159
msgid "Show all option groups"
-msgstr ""
+msgstr "แสดงตัวเลือกทุกกลุ่ม"
#: ../src/Clients/Booter/Booter/Entry.cs:160
-#, fuzzy
-#| msgid "Version Information..."
msgid "Show version information"
-msgstr "ข้อมูลเวอร์ชัน..."
+msgstr "แสดงข้อมูลรุ่น"
#: ../src/Clients/Booter/Booter/Entry.cs:163
msgid "Playback Control Options"
@@ -1069,44 +1027,40 @@ msgid "Set the currently played track's rating (0 to 5)"
msgstr "เล่นเพลงที่กำลังเล่นซ้ำอีก"
#: ../src/Clients/Booter/Booter/Entry.cs:179
-#, fuzzy
-#| msgid "Player Engine Name"
msgid "Player Engine Query Options"
-msgstr "ชื่อกลไกการเล่นเพลง"
+msgstr "ตัวเลือกของการสอบถามกลไกการเล่นเพลง"
#: ../src/Clients/Booter/Booter/Entry.cs:180
msgid "Current player state"
-msgstr ""
+msgstr "สถานะปัจจุบันของกลไกการเล่น"
#: ../src/Clients/Booter/Booter/Entry.cs:181
-#, fuzzy
-#| msgid "Last Played"
msgid "Last player state"
-msgstr "เล่นล่าสุด"
+msgstr "สถานะล่าสุดของกลไกการเล่น"
#: ../src/Clients/Booter/Booter/Entry.cs:182
msgid "Query whether the player can be paused"
-msgstr ""
+msgstr "สอบถามว่ากลไกการเล่นสามารถหยุดพักได้หรือไม่"
#: ../src/Clients/Booter/Booter/Entry.cs:183
msgid "Query whether the player can seek"
-msgstr ""
+msgstr "สอบถามว่ากลไกการเล่นสามารถเลื่อนตำแหน่งเล่นได้หรือไม่"
#: ../src/Clients/Booter/Booter/Entry.cs:184
msgid "Player volume"
-msgstr ""
+msgstr "ความดังเสียงของกลไกการเล่น"
#: ../src/Clients/Booter/Booter/Entry.cs:185
msgid "Player position in currently playing track"
-msgstr ""
+msgstr "ตำแหน่งการเล่นในเพลงที่กำลังเล่น"
#: ../src/Clients/Booter/Booter/Entry.cs:188
msgid "Playing Track Metadata Query Options"
-msgstr ""
+msgstr "ตัวเลือกของการสอบถามข้อมูลกำกับของเพลง"
#: ../src/Clients/Booter/Booter/Entry.cs:189
msgid "URI"
-msgstr ""
+msgstr "URI"
#: ../src/Clients/Booter/Booter/Entry.cs:190
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:138
@@ -1123,16 +1077,12 @@ msgstr "ชื่ออัลบั้ม"
#: ../src/Clients/Booter/Booter/Entry.cs:192
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:137
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:88
-#, fuzzy
-#| msgid "Track"
msgid "Track Title"
-msgstr "เพลงที่"
+msgstr "ชื่อเพลง"
#: ../src/Clients/Booter/Booter/Entry.cs:193
-#, fuzzy
-#| msgid "Track Duration:"
msgid "Duration"
-msgstr "ความยาวเพลง:"
+msgstr "ความยาว"
#. Translators: noun
#: ../src/Clients/Booter/Booter/Entry.cs:194
@@ -1149,10 +1099,8 @@ msgstr "จำนวนเพลง"
#: ../src/Clients/Booter/Booter/Entry.cs:196
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:149
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:114
-#, fuzzy
-#| msgid "Disc name:"
msgid "Disc Number"
-msgstr "ชื่อแผ่น:"
+msgstr "แผ่นที่"
#: ../src/Clients/Booter/Booter/Entry.cs:197
#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:142
@@ -1176,7 +1124,7 @@ msgstr "คะแนนนิยม"
#: ../src/Clients/Booter/Booter/Entry.cs:199
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:322
msgid "Score"
-msgstr ""
+msgstr "คะแนน"
#. Translators: noun
#: ../src/Clients/Booter/Booter/Entry.cs:200
@@ -1186,11 +1134,11 @@ msgstr "อัตราบิต"
#: ../src/Clients/Booter/Booter/Entry.cs:203
msgid "User Interface Options"
-msgstr ""
+msgstr "ตัวเลือกของส่วนติดต่อผู้ใช้"
#: ../src/Clients/Booter/Booter/Entry.cs:204
msgid "Present the user interface on the active workspace"
-msgstr ""
+msgstr "แสดงส่วนติดต่อผู้ใช้บนพื้นที่ทำงานที่กำลังแสดงอยู่"
#: ../src/Clients/Booter/Booter/Entry.cs:205
msgid "Enter the full-screen mode"
@@ -1198,31 +1146,31 @@ msgstr "เข้าสู่โหมดเต็มจอ"
#: ../src/Clients/Booter/Booter/Entry.cs:206
msgid "Hide the user interface"
-msgstr ""
+msgstr "ซ่อนส่วนติดต่อผู้ใช้"
#: ../src/Clients/Booter/Booter/Entry.cs:207
msgid "Do not present the user interface, regardless of any other options"
-msgstr ""
+msgstr "ไม่ต้องแสดงส่วนติดต่อผู้ใช้ ไม่ว่าตัวเลือกอื่นจะระบุว่าอย่างไร"
#: ../src/Clients/Booter/Booter/Entry.cs:208
msgid "Present the import media dialog box"
-msgstr ""
+msgstr "แสดงกล่องโต้ตอบนำเข้าสื่อ"
#: ../src/Clients/Booter/Booter/Entry.cs:209
msgid "Present the about dialog"
-msgstr ""
+msgstr "แสดงกล่องโต้ตอบแสดงข้อมูลเกี่ยวกับโปรแกรม"
#: ../src/Clients/Booter/Booter/Entry.cs:210
msgid "Present the open location dialog"
-msgstr ""
+msgstr "แสดงกล่องโต้ตอบเปิดตำแหน่ง"
#: ../src/Clients/Booter/Booter/Entry.cs:211
msgid "Present the preferences dialog"
-msgstr ""
+msgstr "แสดงกล่องโต้ตอบปรับแต่งโปรแกรม"
#: ../src/Clients/Booter/Booter/Entry.cs:214
msgid "Debugging and Development Options"
-msgstr ""
+msgstr "ตัวเลือกของการดีบั๊กและการพัฒนา"
#: ../src/Clients/Booter/Booter/Entry.cs:215
msgid "Enable general debugging features"
@@ -1275,7 +1223,7 @@ msgstr ""
#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:86
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:66
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:196
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:86
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:126
msgid "_Play"
msgstr "เ_ล่น"
@@ -1305,7 +1253,7 @@ msgid "Play Song"
msgstr "เล่นเพลง"
#. Translators: this is a verb (command), not a noun (things)
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:459
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:465
msgid "Search"
msgstr "ค้นหา"
@@ -1375,7 +1323,7 @@ msgstr ""
#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:351
msgid "File protected by Digital Rights Management (DRM)"
-msgstr ""
+msgstr "แฟ้มถูกปกป้องโดยการจัดการสิทธิ์สื่อดิจิทัล (Digital Rights Management, DRM)"
#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:353
msgid "Unknown error"
@@ -1414,52 +1362,44 @@ msgid "_Restart Item"
msgstr "ตั้งต้นเพลงใหม่"
#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:442
-#, fuzzy
-#| msgid "Jump to playing song"
msgid "_Jump to Playing Podcast"
-msgstr "ไปที่เพลงที่กำลังเล่น"
+msgstr "ไ_ปที่พอดคาสต์ที่กำลังเล่น"
#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:443
#, fuzzy
#| msgid "Jump to playing song"
msgid "_Jump to Playing Audiobook"
-msgstr "ไปที่เพลงที่กำลังเล่น"
+msgstr "ไ_ปที่สมุดเพลงที่กำลังเล่น"
#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:444
-#, fuzzy
-#| msgid "Jump to playing song"
msgid "_Jump to Playing Video"
-msgstr "ไปที่เพลงที่กำลังเล่น"
+msgstr "ไ_ปที่วีดิทัศน์ที่กำลังเล่น"
#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:82
-#, fuzzy
-#| msgid "Jump to playing song"
msgid "_Jump to Playing Song"
-msgstr "ไปที่เพลงที่กำลังเล่น"
+msgstr "ไ_ปที่เพลงที่กำลังเล่น"
#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:446
-#, fuzzy
-#| msgid "Jump to playing song"
msgid "_Jump to Playing Item"
-msgstr "ไปที่เพลงที่กำลังเล่น"
+msgstr "ไ_ปที่รายการที่กำลังเล่น"
#. Translators: This is used to generate bookmark names. {0} is track title, {1} is minutes
#. (possibly more than two digits) and {2} is seconds (between 00 and 60).
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/Bookmark.cs:173
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/Bookmark.cs:172
#, csharp-format
msgid "{0} ({1}:{2:00})"
-msgstr ""
+msgstr "{0} ({1}:{2:00})"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs:70
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs:69
#, csharp-format
msgid "All Albums ({0})"
-msgstr ""
+msgstr "อัลบั้มทั้งหมด ({0})"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistListModel.cs:69
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistListModel.cs:68
#, csharp-format
msgid "All Artists ({0})"
-msgstr ""
+msgstr "ศิลปินทั้งหมด ({0})"
#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseQueryFilterModel.cs:48
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:90
@@ -1468,17 +1408,17 @@ msgstr ""
msgid "Value"
msgstr "พัก"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:50
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:49
msgid "Shuffle by A_lbum"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:51
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:50
#, fuzzy
#| msgid "Album"
msgid "by album"
msgstr "อัลบั้ม"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:52
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:51
msgid "Play all songs from an album, then randomly choose another album"
msgstr ""
@@ -1496,33 +1436,33 @@ msgstr "ศิลปิน"
msgid "Play all songs by an artist, then randomly choose another artist"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:36
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:38
#, fuzzy
#| msgid "Shuffle"
msgid "Shuffle _Off"
msgstr "สุ่ม"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:37
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:39
msgid "manually"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:38
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:40
#, fuzzy
#| msgid "Do not repeat playlist"
msgid "Do not shuffle playlist"
msgstr "ไม่ต้องเล่นเพลงในรายการเล่นซ้ำอีก"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:46
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:45
msgid "Shuffle by _Rating"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:47
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:46
#, fuzzy
#| msgid "Rating"
msgid "by rating"
msgstr "คะแนนนิยม"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:48
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:47
msgid "Play songs randomly, prefer higher rated songs"
msgstr ""
@@ -1538,30 +1478,28 @@ msgstr ""
msgid "Play songs randomly, prefer higher scored songs"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:47
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:46
#, fuzzy
#| msgid "Shuffle"
msgid "Shuffle by _Song"
msgstr "สุ่ม"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:48
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:47
msgid "by song"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:49
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:48
#, fuzzy
#| msgid "Play all songs before repeating playlist"
msgid "Play songs randomly from the playlist"
msgstr "เล่นเพลงทั้งหมดในรายการเล่นแล้วเล่นซ้ำอีก"
#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:138
-#, fuzzy
-#| msgid "Waiting for Media"
msgid "Scanning for media"
-msgstr "กำลังรอแผ่น"
+msgstr "กำลังตรวจหาสื่อ"
#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:188
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1382
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1384
msgid "Scanning..."
msgstr "กำลังตรวจข้อมูล..."
@@ -1571,10 +1509,8 @@ msgid "Scanning ({0} files)..."
msgstr "กำลังตรวจข้อมูล ({0} แฟ้ม)..."
#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:238
-#, fuzzy
-#| msgid "Importing"
msgid "Importing Media"
-msgstr "กำลังนำเข้า"
+msgstr "กำลังนำเข้าสื่อ"
#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:245
#: ../src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs:119
@@ -1588,22 +1524,22 @@ msgstr "กระบวนการนำเข้าเพลงกำลัง
msgid "Importing {0} of {1}"
msgstr "กำลังนำเข้า {0} จาก {1}"
-#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:79
+#: ../src/Core/Banshee.Services/Banshee.Collection/RescanPipeline.cs:78
#, fuzzy, csharp-format
#| msgid "Copying {0} of {1}"
msgid "Rescanning {0} of {1}"
msgstr "กำลังคัดลอก {0} จาก {1}"
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:234
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:232
msgid "Upgrading your Banshee Database"
-msgstr ""
+msgstr "กำลังปรับรุ่นฐานข้อมูล Banshee ของคุณ"
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:235
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:233
msgid ""
"Please wait while your old Banshee database is migrated to the new format."
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1379
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1381
#, fuzzy
#| msgid "Edit Song Metadata"
msgid "Refreshing Metadata"
@@ -1611,7 +1547,7 @@ msgstr "แก้ไขข้อมูลเพลง"
#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:252
msgid "Classical"
-msgstr ""
+msgstr "คลาสสิก"
#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:255
msgid "Club"
@@ -1639,7 +1575,7 @@ msgstr "เต็มจอ"
#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:270
msgid "Laptop Speakers and Headphones"
-msgstr ""
+msgstr "ลำโพงและหูฟังแล็ปท็อป"
#: ../src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:273
msgid "Large Hall"
@@ -1681,26 +1617,19 @@ msgstr ""
msgid "Techno"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Library/HomeDirectoryImportSource.cs:48
-msgid "Home Folder"
-msgstr "โฟลเดอร์บ้าน"
-
#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:58
msgid "Remove From Library"
msgstr "ลบออกจากไลบรารี"
#. Translators: {0} is the library name, eg 'Music Library' or 'Podcasts'
#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:122
-#, fuzzy, csharp-format
-#| msgid "Local Folder"
+#, csharp-format
msgid "{0} Folder"
-msgstr "โฟลเดอร์ในเครื่อง"
+msgstr "โฟลเดอร์ {0}"
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:67
-#, fuzzy
-#| msgid "Track Duration:"
msgid "Track Artist"
-msgstr "ความยาวเพลง:"
+msgstr "ศิลปินเพลง:"
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:83
msgid "Album Artist Initial"
@@ -1708,10 +1637,8 @@ msgstr ""
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:88
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:199
-#, fuzzy
-#| msgid "Contributors"
msgid "Conductor"
-msgstr "ผู้ร่วมสมทบ"
+msgstr "ผู้ควบคุมวง"
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:93
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:192
@@ -1767,109 +1694,119 @@ msgid "Grouping"
msgstr ""
#. Catalog.GetString ("Music Library")
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:59
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:60
#: ../src/Dap/Banshee.Dap/Banshee.Dap/MusicGroupSource.cs:39
msgid "Music"
msgstr "เพลง"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:65
-#, fuzzy
-#| msgid "Search for songs"
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:66
msgid "Search your music"
-msgstr "ค้นหาเพลง"
+msgstr "ค้นหาเพลงของคุณ"
#. Misc section
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:79
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:80
#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:65
msgid "Miscellaneous"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:82
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:83
msgid "_Sort an artist's albums by year, not title"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:92
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:93
#, csharp-format
msgid "{0} song"
msgid_plural "{0} songs"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} เพลง"
+msgstr[1] "{0} เพลง"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:113
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:114
msgid "Music Folder"
msgstr "โฟลเดอร์เพลง"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:118
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:119
#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:95
msgid "Favorites"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:119
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:120
msgid "Songs rated four and five stars"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:123
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:124
msgid "Recent Favorites"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:124
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:125
msgid "Songs listened to often in the past week"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:128
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:129
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:95
msgid "Recently Added"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:129
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:130
msgid "Songs imported within the last week"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:133
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:134
+#, fuzzy
+#| msgid "Last Played"
+msgid "Recently Played"
+msgstr "เล่นล่าสุด"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:135
+#, fuzzy
+#| msgid "Last Played"
+msgid "Recently played songs"
+msgstr "เล่นล่าสุด"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:139
msgid "Unheard"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:134
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:140
msgid "Songs that have not been played or skipped"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:141
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:147
msgid "Neglected Favorites"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:142
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:148
msgid "Favorites not played in over two months"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:146
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:152
msgid "Least Favorite"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:147
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:153
msgid "Songs rated one or two stars or that you have frequently skipped"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:151
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:157
msgid "700 MB of Favorites"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:152
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:158
msgid "A data CD worth of favorite songs"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:157
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:163
msgid "80 Minutes of Favorites"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:158
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:164
msgid "An audio CD worth of favorite songs"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:163
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:169
msgid "Unrated"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:164
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:170
msgid "Songs that haven't been rated"
msgstr ""
@@ -1878,10 +1815,9 @@ msgid "Importing Songs"
msgstr "กำลังนำเข้าเพลง"
#: ../src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs:113
-#, fuzzy, csharp-format
-#| msgid "Importing {0} of {1}"
+#, csharp-format
msgid "Importing From {0}"
-msgstr "กำลังนำเข้า {0} จาก {1}"
+msgstr "กำลังนำเข้าจาก {0}"
#. Catalog.GetString ("Video Library")
#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:43
@@ -1890,10 +1826,8 @@ msgid "Videos"
msgstr "วีดิทัศน์"
#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:48
-#, fuzzy
-#| msgid "Search for songs"
msgid "Search your videos"
-msgstr "ค้นหาเพลง"
+msgstr "ค้นหาวีดิทัศน์ของคุณ"
#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:65
msgid "Produced By"
@@ -1980,11 +1914,11 @@ msgstr ""
#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:60
msgid "_Update file and folder names"
-msgstr ""
+msgstr "_ปรับข้อมูลชื่อแฟ้มและโฟลเดอร์"
#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:61
msgid "Rename files and folders according to media metadata"
-msgstr ""
+msgstr "เปลี่ยนชื่อแฟ้มและโฟลเดอร์ตามข้อมูลกำกับสื่อ"
#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:175
msgid ""
@@ -1993,14 +1927,12 @@ msgid ""
msgstr ""
#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:176
-#, fuzzy
-#| msgid "Importing"
msgid "Import _ratings"
-msgstr "กำลังนำเข้า"
+msgstr "นำเข้า_คะแนนนิยม"
#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:177
msgid "Import play _counts"
-msgstr ""
+msgstr "นำเข้า_จำนวนครั้งการเล่น"
#. disabled by default
#: ../src/Core/Banshee.Services/Banshee.Metrics/BansheeMetrics.cs:312
@@ -2029,49 +1961,45 @@ msgid ""
"cover art fetching"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:160
-#, fuzzy
-#| msgid "Sort Playlists"
+#: ../src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:159
msgid "Search this playlist"
-msgstr "เรียงลำดับรายการเล่น"
+msgstr "ค้นรายการเล่นนี้"
-#: ../src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:229
+#: ../src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:228
msgid "The track's rating was set differently on the device and in Banshee"
msgstr ""
-#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:59
+#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:58
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:309
msgid "Playlist"
msgstr "รายการเล่น"
-#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:134
+#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:133
msgid "Remove From Playlist"
msgstr "ลบออกจากรายการเล่น"
-#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:135
+#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:134
msgid "Delete Playlist"
msgstr "ลบรายการเล่น"
#. TODO generate name based on the track selection, or begin editing it
-#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:386
-#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:392
+#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:385
+#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:391
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:95
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:394
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:452
#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:542
#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214
msgid "New Playlist"
msgstr "สร้างรายการเล่นใหม่"
#: ../src/Core/Banshee.Services/Banshee.Playlists.Formats/AsfReferencePlaylistFormat.cs:43
-#, fuzzy
-#| msgid "Window Maximized"
msgid "Windows Media ASX"
-msgstr "หน้าต่างขยายเต็ม"
+msgstr "สื่อ ASX ของวินโดวส์มีเดีย"
#: ../src/Core/Banshee.Services/Banshee.Playlists.Formats/AsxPlaylistFormat.cs:46
msgid "Windows Media ASX (*.asx)"
-msgstr ""
+msgstr "สื่อ ASX ของวินโดวส์ (*.asx)"
#: ../src/Core/Banshee.Services/Banshee.Playlists.Formats/M3uPlaylistFormat.cs:44
msgid "MPEG Version 3.0 Extended (*.m3u)"
@@ -2221,12 +2149,12 @@ msgstr ""
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:134
msgid "Beats per Minute"
-msgstr ""
+msgstr "จังหวะต่อนาที"
#. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:136
msgid "bpm"
-msgstr ""
+msgstr "bpm"
#. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:145
@@ -2235,11 +2163,11 @@ msgstr "อัตราบิต"
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:145
msgid "kbs"
-msgstr ""
+msgstr "kbs"
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:145
msgid "kps"
-msgstr ""
+msgstr "kps"
#. Translators: noun
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:152
@@ -2287,22 +2215,16 @@ msgid "title"
msgstr "ชื่อ"
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:171
-#, fuzzy
-#| msgid "Title"
msgid "titled"
-msgstr "ชื่อเพลง"
+msgstr "ชื่อว่า"
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:171
-#, fuzzy
-#| msgid "Username:"
msgid "name"
-msgstr "ชื่อผู้ใช้:"
+msgstr "ชื่อ"
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:171
-#, fuzzy
-#| msgid "Enabled"
msgid "named"
-msgstr "เปิดใช้งาน"
+msgstr "ชื่อว่า"
#. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:179
@@ -2315,7 +2237,7 @@ msgstr "ออก"
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:179
msgid "yr"
-msgstr ""
+msgstr "ปี"
#. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:187
@@ -2330,7 +2252,7 @@ msgstr "ผู้ประพันธ์"
#. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:201
msgid "conductor"
-msgstr "ผู้คุมวง"
+msgstr "ผู้ควบคุมวง"
#. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:208
@@ -2340,7 +2262,7 @@ msgstr ""
#. Translators: These are unique search fields (and nouns). You can use CSV for synonyms. Please, no spaces. Blank ok.
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:216
msgid "comment"
-msgstr "ความคิดเห็น"
+msgstr "หมายเหตุ"
#. Translators: noun
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:222
@@ -2348,20 +2270,20 @@ msgstr "ความคิดเห็น"
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:71
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:72
msgid "License"
-msgstr ""
+msgstr "สัญญาอนุญาต"
#. Translators: These are unique search fields (and nouns). You can use CSV for synonyms. Please, no spaces. Blank ok.
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:224
msgid "license"
-msgstr ""
+msgstr "สัญญาอนุญาต"
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:224
msgid "licensed"
-msgstr ""
+msgstr "ไลเซนส์"
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:224
msgid "under"
-msgstr ""
+msgstr "ภายใต้"
#. , typeof(NullQueryValue)},
#. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
@@ -2535,14 +2457,14 @@ msgid "importedon"
msgstr "นำเข้าเมื่อ"
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:315
-#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:66
+#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:65
msgid "Smart Playlist"
msgstr "รายการเล่นอัจฉริยะ"
#. Translators: These are unique search fields (and nouns). You can use CSV for synonyms. Please, no spaces. Blank ok.
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:324
msgid "score"
-msgstr ""
+msgstr "คะแนน"
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:330
msgid "Playback Error"
@@ -2556,7 +2478,7 @@ msgstr "ข้อผิดพลาดในการเล่นเพลง"
#. Translators: noun
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:349
msgid "BPM"
-msgstr ""
+msgstr "BPM"
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:350
msgid "Skips"
@@ -2580,11 +2502,11 @@ msgstr "คะแนนนิยมต่ำสุด"
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:369
msgid "Highest Score"
-msgstr ""
+msgstr "คะแนนสูงสุด"
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:370
msgid "Lowest Score"
-msgstr ""
+msgstr "คะแนนต่ำสุด"
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:372
msgid "Most Often Played"
@@ -2616,20 +2538,16 @@ msgstr ""
#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:44
#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:46
#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs:97
-#, fuzzy
-#| msgid "Done"
msgid "None"
-msgstr "เสร็จแล้ว"
+msgstr "ไม่มี"
#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:46
-#, fuzzy
-#| msgid "Done"
msgid "none"
-msgstr "เสร็จแล้ว"
+msgstr "ไม่มี"
#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:46
msgid "no"
-msgstr ""
+msgstr "ไม่"
#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:49
msgid "Resource Not Found"
@@ -2646,27 +2564,27 @@ msgstr ""
#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:51
msgid "notfound"
-msgstr ""
+msgstr "ไม่พบ"
#. Translators: These are unique strings for playback errors. Please, no spaces. Blank ok.
#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:54
#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:56
msgid "CodecNotFound"
-msgstr ""
+msgstr "ไม่มีตัวแปลงรหัส"
#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:56
msgid "nocodec"
-msgstr ""
+msgstr "ไม่มีตัวแปลง"
#. Translators: These are unique strings for playback errors. Please, no spaces. Blank ok.
#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:59
#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:61
msgid "Drm"
-msgstr ""
+msgstr "Drm"
#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:61
msgid "drm"
-msgstr ""
+msgstr "drm"
#. Translators: These are unique strings for playback errors. Please, no spaces. Blank ok.
#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:64
@@ -2677,34 +2595,32 @@ msgstr ""
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:212
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:389
msgid "Unknown"
-msgstr "ไม่มีข้อมูล"
+msgstr "ไม่ทราบ"
#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:66
-#, fuzzy
-#| msgid "Unknown"
msgid "unknown"
msgstr "ไม่มีข้อมูล"
-#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/Migrator.cs:79
+#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/Migrator.cs:78
msgid "Unable to Migrate Smart Playlists"
msgstr "ไม่สามารถย้ายข้อมูลรายการเล่นอัจฉริยะ"
-#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/Migrator.cs:80
+#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/Migrator.cs:79
#, csharp-format
msgid "Please file a bug with this error: {0}"
-msgstr ""
+msgstr "โปรดรายงานบั๊กพร้อมกับข้อผิดพลาดนี้: {0}"
-#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:67
+#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:66
#: ../src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/Editor.cs:49
msgid "Edit Smart Playlist"
msgstr "แก้ไขรายการเล่นอัจฉริยะ"
-#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:242
+#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:249
msgid "Delete Smart Playlist"
msgstr "ลบรายการเล่นอัจฉริยะ"
#: ../src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs:147
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:163
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:161
#, csharp-format
msgid "All Genres ({0})"
msgstr ""
@@ -2757,10 +2673,8 @@ msgstr "ผิดพลาด"
#: ../src/Core/Banshee.Services/Banshee.Sources/ErrorSource.cs:84
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ErrorListDialog.cs:79
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:251
-#, fuzzy
-#| msgid "Entry Details:"
msgid "Details"
-msgstr "รายละเอียดรายการ:"
+msgstr "รายละเอียด"
#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:152
#, fuzzy
@@ -2769,38 +2683,32 @@ msgid "Errors"
msgstr "ผิดพลาด"
#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:205
-#, fuzzy
-#| msgid "Sort Playlists"
msgid "Sort Playlists By"
-msgstr "เรียงลำดับรายการเล่น"
+msgstr "เรียงลำดับรายการเล่นตาม"
#. Translators: this is a noun, referring to the harddisk
#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:214
-#, fuzzy
-#| msgid "Disk Drive:"
msgid "Drive"
-msgstr "ไดรว์:"
+msgstr "ไดรว์"
#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:238
msgid "File Organization"
-msgstr ""
+msgstr "โครงสร้างระบบแฟ้ม"
#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:239
msgid "Folder hie_rarchy"
-msgstr ""
+msgstr "_ลำดับชั้นโฟลเดอร์"
#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:240
-#, fuzzy
-#| msgid "File Name:"
msgid "File _name"
-msgstr "ชื่อแฟ้ม:"
+msgstr "_ชื่อแฟ้ม"
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:693
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:669
#, csharp-format
msgid "Adding {0} of {1} to {2}"
msgstr "กำลังเพิ่ม {0} จาก {1} เข้าใน {2}"
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:712
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:688
#, csharp-format
msgid "Deleting {0} of {1} From {2}"
msgstr "กำลังลบ {0} จาก {1} ออกจาก {2}"
@@ -2826,11 +2734,11 @@ msgstr[1] "{0} รายการ"
#. AddSource (video_library = new VideoLibrarySource (), false);
#: ../src/Core/Banshee.Services/Banshee.Sources/SourceManager.cs:84
msgid "Libraries"
-msgstr ""
+msgstr "ไลบรารี"
#: ../src/Core/Banshee.Services/Banshee.Sources/SourceManager.cs:85
msgid "Online Media"
-msgstr ""
+msgstr "สื่อออนไลน์"
#: ../src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs:82
#: ../src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs:91
@@ -2880,10 +2788,8 @@ msgid "Enabled"
msgstr "เปิดใช้งาน"
#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:53
-#, fuzzy
-#| msgid "Enabled"
msgid "Not Enabled"
-msgstr "เปิดใช้งาน"
+msgstr "ไม่ได้เปิดใช้งาน"
#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:56
msgid "Search:"
@@ -2918,67 +2824,49 @@ msgid "{0} of {1}"
msgstr "{0} จาก {1}"
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:222
-#, fuzzy
-#| msgid "Play"
msgid "Playing"
-msgstr "เล่น"
+msgstr "กำลังเล่น"
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:223
-#, fuzzy
-#| msgid "Pause"
msgid "Paused"
msgstr "พัก"
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:225
-#, fuzzy
-#| msgid "New iPod Detected"
msgid "Protected"
-msgstr "ตรวจพบไอพอดใหม่"
+msgstr "มีการปกป้อง"
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:226
msgid "External Document"
-msgstr ""
+msgstr "เอกสารภายนอก"
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/CoverArtEditor.cs:80
-#, fuzzy
-#| msgid "Show Cover Art"
msgid "Choose New Cover Art..."
-msgstr "แสดงปกอัลบั้ม"
+msgstr "เลือกปกอัลบั้มใหม่..."
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/CoverArtEditor.cs:98
-#, fuzzy
-#| msgid "Show Cover Art"
msgid "Delete This Cover Art"
-msgstr "แสดงปกอัลบั้ม"
+msgstr "ลบปกอัลบั้มนี้"
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:127
-#, fuzzy
-#| msgid "Track"
msgid "Track #"
-msgstr "เพลงที่"
+msgstr "เพลง #"
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:128
-#, fuzzy
-#| msgid "Track _Count"
msgid "Track & Count"
-msgstr "_จำนวนเพลง"
+msgstr "เพลงและจำนวน"
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:132
-#, fuzzy
-#| msgid "Disc name:"
msgid "Disc #"
-msgstr "ชื่อแผ่น:"
+msgstr "แผ่น #"
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:133
-#, fuzzy
-#| msgid "Disconnect"
msgid "Disc & Count"
-msgstr "ตัดการเชื่อมต่อ"
+msgstr "แผ่นและจำนวน"
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:136
#, csharp-format
msgid "{0} kbps"
-msgstr ""
+msgstr "{0} kbps"
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:139
#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerView.cs:123
@@ -3045,25 +2933,25 @@ msgstr "สร้างรายการเล่นใหม่"
msgid "{0} by {1}"
msgstr "{0} โดย {1}"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:87
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:86
msgid "_Bookmarks"
-msgstr ""
+msgstr "_ที่คั่นหน้า"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:90
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:89
msgid "_Add Bookmark"
-msgstr ""
+msgstr "เ_พิ่มที่คั่นหน้า"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:91
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:90
msgid "Bookmark the Position in the Current Track"
-msgstr ""
+msgstr "คั่นตำแหน่งเล่นของเพลงปัจจุบันไว้"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:104
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:103
msgid "_Remove Bookmark"
-msgstr ""
+msgstr "_ลบที่คั่นหน้า"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:54
msgid "Maintainers"
-msgstr ""
+msgstr "ผู้ดูแล"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:62
msgid "Contributors"
@@ -3090,55 +2978,54 @@ msgstr "เว็บไซต์ Banshee"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ConfirmShutdownDialog.cs:50
msgid "Important tasks are running"
-msgstr ""
+msgstr "ยังมีงานสำคัญดำเนินการอยู่"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ConfirmShutdownDialog.cs:53
msgid ""
"Closing Banshee now will cancel any currently running tasks. They cannot be "
"resumed automatically the next time Banshee is run."
msgstr ""
+"ถ้าปิด Banshee ตอนนี้ ก็จะเป็นการยกเลิกงานทั้งหมดที่ยังดำเนินการอยู่ "
+"และจะไม่สามารถเรียกคืนโดยอัตโนมัติในการทำงานครั้งต่อไปของ Banshee ได้"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ConfirmShutdownDialog.cs:60
-#, fuzzy
-#| msgid "Continue Anyway"
msgid "Quit Anyway"
-msgstr "ยืนยันทำต่อไป"
+msgstr "ยืนยันออก"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ConfirmShutdownDialog.cs:61
-#, fuzzy
-#| msgid "Continue Anyway"
msgid "Continue Running"
-msgstr "ยืนยันทำต่อไป"
+msgstr "ทำต่อไป"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/DefaultApplicationHelperDialog.cs:69
msgid "Make Banshee the default media player?"
-msgstr ""
+msgstr "ต้องการกำหนดให้ Banshee เป็นโปรแกรมเล่นสื่อโดยปริยายหรือไม่?"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/DefaultApplicationHelperDialog.cs:70
msgid ""
"Currently another program is configured as the default media player. Would "
"you prefer Banshee to be the default?"
msgstr ""
+"ขณะนี้มีโปรแกรมอื่นถูกกำหนดให้เป็นเป็นโปรแกรมเล่นสื่อโดยปริยายอยู่ คุณต้องการกำหนดให้ Banshee "
+"เป็นโปรแกรมปริยายแทนหรือไม่?"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/DefaultApplicationHelperDialog.cs:72
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:435
-#, fuzzy, csharp-format
-#| msgid "Do not show this dialog again"
+#, csharp-format
msgid "Do not ask me this again"
-msgstr "ไม่ต้องแสดงกล่องโต้ตอบนี้อีก"
+msgstr "ไม่ต้องถามคำถามนี้อีก"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/DefaultApplicationHelperDialog.cs:86
msgid "Make Banshee the Default"
-msgstr ""
+msgstr "ให้ Banshee เป็นโปรแกรมปริยาย"
#. Translators: verb
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/FileChooserDialog.cs:52
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/FileChooserDialog.cs:53
msgid "I_mport"
msgstr "_นำเข้า"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ImageFileChooserDialog.cs:39
msgid "Select album cover image"
-msgstr ""
+msgstr "เลือกภาพปกอัลบั้ม"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ImageFileChooserDialog.cs:47
msgid "All image files"
@@ -3243,58 +3130,46 @@ msgid "_Contents"
msgstr "เนื้อ_หา"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:95
-msgid "_Web Resources"
-msgstr "ทรัพยากรในเ_ว็บ"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:98
-msgid "Banshee _User Guide (Wiki)"
-msgstr "คู่_มือผู้ใช้ Banshee (วิกิ)"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:99
-msgid "Learn about how to use Banshee"
-msgstr "เรียนรู้วิธีใช้ Banshee"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:104
#, fuzzy
#| msgid "Metadata and Cover Art Searching"
msgid "Advanced Collection Searching"
msgstr "ค้นหาข้อมูลเพลงและภาพปกอัลบั้ม"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:105
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:96
msgid "Learn advanced ways to search your media collection"
msgstr ""
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:110
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:101
msgid "Banshee _Home Page"
msgstr "_หน้าเว็บ Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:111
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
msgid "Visit the Banshee Home Page"
msgstr "ไปยังหน้าเว็บของ Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:116
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
msgid "_Get Involved"
msgstr "มีส่วน_ร่วม"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:117
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:108
msgid "Become a contributor to Banshee"
msgstr "เข้าร่วมสมทบงานกับ Banshee"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:122
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
msgid "_Version Information"
msgstr "ข้อมูลรุ่_น..."
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:123
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:114
msgid "View detailed version and configuration information"
msgstr "ดูรายละเอียดของรุ่นและการตั้งค่าต่างๆ"
#. Prompt user for location of the playlist.
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:178
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:169
msgid "Import Playlist"
msgstr "นำเข้ารายการเล่น"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:179
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:559
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:170
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:558
msgid "Playlists"
msgstr "รายการเล่น"
@@ -3387,7 +3262,7 @@ msgstr "เล่นเพลงที่กำลังเล่นซ้ำอ
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackShuffleActions.cs:79
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackShuffleActions.cs:80
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:83
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:84
msgid "Shuffle"
msgstr "สุ่ม"
@@ -3466,7 +3341,7 @@ msgstr "สร้างรายการเล่น_อัจฉริยะ
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:129
#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:84
#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:67
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:78
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:79
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:72
msgid "Refresh"
msgstr ""
@@ -3476,170 +3351,146 @@ msgid "Refresh this randomly sorted smart playlist"
msgstr ""
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:297
-#, fuzzy
-#| msgid "Do not repeat playlist"
msgid "Could not export playlist"
-msgstr "ไม่ต้องเล่นเพลงในรายการเล่นซ้ำอีก"
+msgstr "ไม่สามารถส่งออกรายการเล่น"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:426
-#, fuzzy, csharp-format
-#| msgid "Are you sure you want to permanently delete this song?"
-#| msgid_plural ""
-#| "Are you sure you want to permanently delete the selected {0} songs?"
+#, csharp-format
msgid "Are you sure you want to delete this {0}?"
-msgstr "คุณแน่ใจว่าต้องการลบเพลงนี้อย่างถาวรหรือไม่?"
+msgstr "คุณแน่ใจหรือไม่ที่จะลบ {0} นี้?"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:469
msgid "Separate by Type"
msgstr ""
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:70
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:110
msgid "Select _All"
msgstr "เลือก_ทั้งหมด"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:71
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:111
msgid "Select all tracks"
msgstr "เลือกทุกเพลง"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:74
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:114
msgid "Select _None"
msgstr "เ_ลิกเลือกทั้งหมด"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:75
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:115
msgid "Unselect all tracks"
msgstr "เลิกเลือกทุกเพลง"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:78
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:118
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:59
-#, fuzzy
-#| msgid "Reading library information"
msgid "_Edit Track Information"
-msgstr "กำลังอ่านข้อมูลไลบรารี"
+msgstr "แ_ก้ไขข้อมูลเพลง"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:79
-#, fuzzy
-#| msgid "Edit metadata on selected songs"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:119
msgid "Edit information on selected tracks"
msgstr "แก้ไขข้อมูลเพลงที่เลือก"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:82
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:122
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:252
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:117
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:159
-#, fuzzy
-#| msgid "{0} Properties"
msgid "Properties"
-msgstr "ปรับแต่งค่าของ {0}"
+msgstr "คุณสมบัติ"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:83
-#, fuzzy
-#| msgid "Set rating for selected songs"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:123
msgid "View information on selected tracks"
-msgstr "ให้คะแนนเพลงที่เลือก"
+msgstr "ดูข้อมูลเพลงที่เลือก"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:87
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:127
msgid "Play the selected item"
msgstr "เล่นรายการที่เลือก"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:90
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:130
msgid "Add _to Playlist"
msgstr "เ_พิ่มในรายการเล่น"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:91
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:131
msgid "Append selected items to playlist or create new playlist from selection"
msgstr "เพิ่มรายการที่เลือกลงในรายการเล่น หรือสร้างรายการเล่นใหม่จากรายการที่เลือก"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:96
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:136
msgid "Create new playlist from selected tracks"
-msgstr ""
+msgstr "สร้างรายการเล่นใหม่จากเพลงที่เลือก"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:100
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:140
msgid "_Remove"
msgstr "_ลบออก"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:101
-#, fuzzy
-#| msgid "Remove selected song(s) from library"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:141
msgid "Remove selected track(s) from this source"
-msgstr "ลบเพลงที่เลือกออกจากไลบรารี"
+msgstr "ลบเพลงที่เลือกออกจากแหล่งนี้"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:104
-#, fuzzy
-#| msgid "Remove selection from library"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:144
msgid "Remove From _Library"
-msgstr "ลบเพลงที่เลือกออกจากไลบรารี"
+msgstr "ลบออกจากไ_ลบรารี"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:105
-#, fuzzy
-#| msgid "Remove selected song(s) from library"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:145
msgid "Remove selected track(s) from library"
msgstr "ลบเพลงที่เลือกออกจากไลบรารี"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:108
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:148
msgid "_Open Containing Folder"
-msgstr ""
+msgstr "เ_ปิดโฟลเดอร์ที่บรรจุ"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:109
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:149
msgid "Open the folder that contains the selected item"
-msgstr ""
+msgstr "เปิดโฟลเดอร์ที่บรรจุรายการที่เลือก"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:112
-#, fuzzy
-#| msgid "Delete Song(s) From Drive"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:152
msgid "_Delete From Drive"
-msgstr "ลบแฟ้มเพลง"
+msgstr "_ลบออกจากไดรว์"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:113
-#, fuzzy
-#| msgid "Permanently delete selected song(s) from storage medium"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:153
msgid "Permanently delete selected item(s) from medium"
-msgstr "ลบเพลงที่เลือกออกจากสื่อเก็บอย่างถาวร"
+msgstr "ลบรายการที่เลือกออกจากสื่ออย่างถาวร"
#. Translators: this is a verb (command), not a noun (things)
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:119
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:159
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:170
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:112
#, csharp-format
msgid "_Search"
msgstr "_ค้นหา"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:120
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:160
msgid "Search for items matching certain criteria"
msgstr "ค้นหารายการที่ตรงกับเงื่อนไขที่กำหนด"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:123
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:163
msgid "By Matching _Album"
msgstr "โดยค้นหา_อัลบั้ม"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:124
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:164
msgid "Search all songs of this album"
msgstr "ค้นหาเพลงทั้งหมดของอัลบั้มนี้"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:127
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:167
msgid "By Matching A_rtist"
msgstr "โดยค้นหาศิ_ลปิน"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:128
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:168
msgid "Search all songs of this artist"
msgstr "ค้นหาเพลงทั้งหมดของศิลปินนี้"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:258
-#, fuzzy, csharp-format
-#| msgid "Delete {0}"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:312
+#, csharp-format
msgid "_Delete From \"{0}\""
-msgstr "ลบ {0}"
+msgstr "_ลบออกจาก \"{0}\""
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:464
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:532
#, fuzzy
#| msgid "Some songs could not be found."
msgid "The folder could not be found."
msgstr "หาเพลงบางเพลงไม่พบ"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:465
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:533
msgid "Please check that the track's location is accessible by the system."
msgstr ""
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:535
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:610
#, csharp-format
msgid "Are you sure you want to permanently delete this item?"
msgid_plural ""
@@ -3647,17 +3498,17 @@ msgid_plural ""
msgstr[0] "คุณแน่ใจหรือไม่ว่าต้องการลบรายการนี้อย่างถาวร?"
msgstr[1] "คุณแน่ใจหรือไม่ว่าต้องการลบรายการที่เลือกไว้ {0} รายการนี้อย่างถาวร?"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:539
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:614
msgid "If you delete the selection, it will be permanently lost."
msgstr "ถ้าคุณลบรายการที่เลือก รายการก็จะสูญหายอย่างถาวร"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:542
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:617
#, fuzzy, csharp-format
#| msgid "Remove selection from library"
msgid "Remove selection from {0}?"
msgstr "ลบเพลงที่เลือกออกจากไลบรารี"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:545
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:620
#, fuzzy, csharp-format
#| msgid "Are you sure you want to remove the selected song from your library?"
#| msgid_plural ""
@@ -3684,58 +3535,40 @@ msgid ""
msgstr ""
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:44
-#, fuzzy
-#| msgid "Advanced Details"
msgid "Basic Details"
-msgstr "รายละเอียดเพิ่มเติม"
+msgstr "รายละเอียดพื้นฐาน"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:69
-#, fuzzy
-#| msgid "Track _Count"
msgid "Track _Title:"
-msgstr "_จำนวนเพลง"
+msgstr "_ชื่อเพลง"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:77
-#, fuzzy
-#| msgid "Set all Artists to this value"
msgid "Set all track artists to this value"
-msgstr "ตั้งศิลปินทั้งหมดเป็นค่านี้"
+msgstr "ตั้งศิลปินเพลงทั้งหมดเป็นค่านี้"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:78
-#, fuzzy
-#| msgid "Track Duration:"
msgid "Track _Artist:"
-msgstr "ความยาวเพลง:"
+msgstr "ศิล_ปินเพลง:"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:86
-#, fuzzy
-#| msgid "Set all Artists to this value"
msgid "Set all compilation album artists to these values"
-msgstr "ตั้งศิลปินทั้งหมดเป็นค่านี้"
+msgstr "ตั้งศิลปินอัลบั้มรวมเพลงทั้งหมดเป็นค่านี้"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:106
-#, fuzzy
-#| msgid "Set all Albums to this value"
msgid "Set all album titles to this value"
-msgstr "ตั้งอัลบั้มทั้งหมดเป็นค่านี้"
+msgstr "ตั้งชื่ออัลบั้มทั้งหมดเป็นค่านี้"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:107
-#, fuzzy
-#| msgid "Album Title"
msgid "Albu_m Title:"
-msgstr "ชื่ออัลบั้ม"
+msgstr "ชื่อ_อัลบั้ม:"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:113
-#, fuzzy
-#| msgid "Set all Genres to this value"
msgid "Set all genres to this value"
-msgstr "ตั้งประเภทเพลงทั้งหมดเป็นค่านี้"
+msgstr "ตั้งแนวเพลงทั้งหมดเป็นค่านี้"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:114
-#, fuzzy
-#| msgid "_Genre"
msgid "_Genre:"
-msgstr "_ประเภท"
+msgstr "แ_นวเพลง:"
#. Translators: "of" is the word beteen a track/disc number and the total count.
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:124
@@ -3744,79 +3577,57 @@ msgid "of"
msgstr ""
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:141
-#, fuzzy
-#| msgid "Automatically Set All Track Numbers"
msgid "Automatically set track number and count"
-msgstr "ตั้งลำดับเพลงทั้งหมดโดยอัตโนมัติ"
+msgstr "ตั้งลำดับและจำนวนเพลงทั้งหมดโดยอัตโนมัติ"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:144
-#, fuzzy
-#| msgid "Track _Number"
msgid "Track _Number:"
-msgstr "_ลำดับเพลง"
+msgstr "_ลำดับเพลง:"
#. Catalog.GetString ("Automatically set disc number and count"),
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:166
-#, fuzzy
-#| msgid "Set all Track Counts to this value"
msgid "Set all disc numbers and counts to these values"
-msgstr "ตั้งจำนวนเพลงทั้งหมดเป็นค่านี้"
+msgstr "ตั้งลำดับและจำนวนแผ่นทั้งหมดเป็นค่าเหล่านี้"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:167
-#, fuzzy
-#| msgid "Disc name:"
msgid "_Disc Number:"
-msgstr "ชื่อแผ่น:"
+msgstr "ลำดับแ_ผ่น:"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:188
-#, fuzzy
-#| msgid "Set all Genres to this value"
msgid "Set all years to this value"
-msgstr "ตั้งประเภทเพลงทั้งหมดเป็นค่านี้"
+msgstr "ตั้งปีทั้งหมดเป็นค่านี้"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:189
-#, fuzzy
-#| msgid "Year"
msgid "_Year:"
-msgstr "ปี"
+msgstr "_ปี:"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
-#, fuzzy
-#| msgid "Set all Artists to this value"
msgid "Set all ratings to this value"
-msgstr "ตั้งศิลปินทั้งหมดเป็นค่านี้"
+msgstr "ตั้งคะแนนนิยมทั้งหมดเป็นค่านี้"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
-#, fuzzy
-#| msgid "Rating"
msgid "_Rating:"
-msgstr "คะแนนนิยม"
+msgstr "_คะแนนนิยม:"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:44
msgid "Extra"
-msgstr ""
+msgstr "เพิ่มเติม"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:50
-#, fuzzy
-#| msgid "Set all Genres to this value"
msgid "Set all composers to this value"
-msgstr "ตั้งประเภทเพลงทั้งหมดเป็นค่านี้"
+msgstr "ตั้งผู้ประพันธ์เพลงทั้งหมดเป็นค่านี้"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:51
msgid "C_omposer:"
-msgstr ""
+msgstr "ผู้_ประพันธ์:"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:57
-#, fuzzy
-#| msgid "Set all Genres to this value"
msgid "Set all conductors to this value"
-msgstr "ตั้งประเภทเพลงทั้งหมดเป็นค่านี้"
+msgstr "ตั้งผู้ควบคุมวงทั้งหมดเป็นค่านี้"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:58
-#, fuzzy
-#| msgid "Contributors"
msgid "Con_ductor:"
-msgstr "ผู้ร่วมสมทบ"
+msgstr "ผู้_ควบคุมวง:"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:69
#, fuzzy
@@ -3829,40 +3640,32 @@ msgid "_Grouping:"
msgstr ""
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:80
-#, fuzzy
-#| msgid "Set all Titles to this value"
msgid "Set all beats per minute to this value"
-msgstr "ตั้งชื่อเพลงทั้งหมดเป็นค่านี้"
+msgstr "ตั้งค่าจังหวะต่อนาทีทั้งหมดเป็นค่านี้"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:81
msgid "Bea_ts Per Minute:"
-msgstr ""
+msgstr "_จังหวะต่อนาที:"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:93
-#, fuzzy
-#| msgid "Set all Artists to this value"
msgid "Set all copyrights to this value"
-msgstr "ตั้งศิลปินทั้งหมดเป็นค่านี้"
+msgstr "ตั้งค่าลิขสิทธิ์ทั้งหมดเป็นค่านี้"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:94
msgid "Copyrig_ht:"
-msgstr ""
+msgstr "_ลิขสิทธิ์:"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:100
-#, fuzzy
-#| msgid "Set all Genres to this value"
msgid "Set all licenses to this value"
-msgstr "ตั้งประเภทเพลงทั้งหมดเป็นค่านี้"
+msgstr "ตั้งค่าสัญญาอนุญาตทั้งหมดเป็นค่านี้"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:101
msgid "_License URI:"
-msgstr ""
+msgstr "URI ของ_สัญญาอนุญาต:"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:110
-#, fuzzy
-#| msgid "Set all Genres to this value"
msgid "Set all comments to this value"
-msgstr "ตั้งประเภทเพลงทั้งหมดเป็นค่านี้"
+msgstr "ตั้งหมายเหตุทั้งหมดเป็นค่านี้"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:111
msgid "Co_mment:"
@@ -3935,42 +3738,32 @@ msgid "File Name:"
msgstr "ชื่อแฟ้ม:"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:160
-#, fuzzy
-#| msgid "Home Directory"
msgid "Directory:"
-msgstr "โฟลเดอร์บ้าน"
+msgstr "ไดเรกทอรี:"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:161
msgid "Full Path:"
-msgstr ""
+msgstr "พาธเต็ม:"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:167
msgid "URI:"
-msgstr ""
+msgstr "URI:"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:176
-#, fuzzy
-#| msgid "Track Duration:"
msgid "Duration:"
-msgstr "ความยาวเพลง:"
+msgstr "ความยาว:"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:179
-#, fuzzy
-#| msgid "Audio Disc:"
msgid "Audio Bitrate:"
-msgstr "ซีดีเพลง:"
+msgstr "อัตราบิตเสียง:"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:181
-#, fuzzy
-#| msgid "Sample Rate:"
msgid "Audio Sample Rate:"
-msgstr "อัตราการเก็บข้อมูล:"
+msgstr "อัตราการเก็บข้อมูลเสียง:"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:183
-#, fuzzy
-#| msgid "Channels:"
msgid "Audio Channels:"
-msgstr "ช่องสัญญาณ:"
+msgstr "ช่องสัญญาณเสียง:"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:185
msgid "Bits Per Sample:"
@@ -3997,32 +3790,24 @@ msgid "Imported On:"
msgstr "นำเข้าเมื่อ:"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:209
-#, fuzzy
-#| msgid "Last Played"
msgid "Last Played:"
-msgstr "เล่นล่าสุด"
+msgstr "เล่นล่าสุด:"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:211
msgid "Last Skipped:"
-msgstr ""
+msgstr "ข้ามล่าสุด:"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:213
-#, fuzzy
-#| msgid "Track _Count"
msgid "Play Count:"
-msgstr "_จำนวนเพลง"
+msgstr "จำนวนการเล่น:"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:214
-#, fuzzy
-#| msgid "Track _Count"
msgid "Skip Count:"
-msgstr "_จำนวนเพลง"
+msgstr "จำนวนการข้าม:"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:215
-#, fuzzy
-#| msgid "Source"
msgid "Score:"
-msgstr "แหล่งเพลง"
+msgstr "คะแนน:"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:221
msgid "File Size:"
@@ -4033,90 +3818,79 @@ msgstr "ขนาดแฟ้ม:"
msgid "bytes"
msgstr ""
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:95
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:97
msgid "Track Editor"
msgstr ""
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:95
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:97
#, fuzzy
#| msgid "{0} Properties"
msgid "Track Properties"
msgstr "ปรับแต่งค่าของ {0}"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:147
-#, fuzzy
-#| msgid "Play the previous song"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:149
msgid "Show the previous track"
-msgstr "เล่นเพลงก่อนหน้า"
+msgstr "แสดงเพลงก่อนหน้า"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:153
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:155
msgid "Show the next track"
-msgstr ""
+msgstr "แสดงเพลงถัดไป"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:183
-#, fuzzy
-#| msgid "Title"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:185
msgid "Title:"
-msgstr "ชื่อเพลง"
+msgstr "ชื่อเพลง:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:184
-#, fuzzy
-#| msgid "Artist"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:186
msgid "Artist:"
-msgstr "ศิลปิน"
+msgstr "ศิลปิน:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:185
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:187
msgid "Album:"
msgstr "อัลบั้ม:"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:309
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:311
msgid "Sync all field _values"
msgstr ""
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:314
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:316
msgid ""
"Apply the values of all common fields set for this track to all of the "
"tracks selected in this editor"
msgstr ""
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:413
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:416
#, fuzzy, csharp-format
#| msgid "Editing Song {0} of {1}"
msgid "<i>Editing {0} of {1} items</i>"
msgstr "แก้ไขข้อมูลเพลงที่ {0} จาก {1}"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:675
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:678
#, csharp-format
msgid "Save the changes made to the open track?"
msgid_plural "Save the changes made to {0} of {1} open tracks?"
msgstr[0] ""
msgstr[1] ""
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:692
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:695
msgid "Close _without Saving"
-msgstr ""
+msgstr "ปิ_ดโดยไม่บันทึก"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:729
-#, fuzzy, csharp-format
-#| msgid "If you delete the selection, it will be permanently lost."
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:732
+#, csharp-format
msgid "If you don't save, changes from the last {0} will be permanently lost."
-msgstr "ถ้าคุณลบเพลงที่เลือกไว้ เพลงจะสูญหายอย่างถาวร"
+msgstr "ถ้าคุณไม่บันทึก การเปลี่ยนแปลงทั้งหมดใน {0} ที่ผ่านมาจะสูญหายอย่างถาวร"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs:62
msgid "_View"
msgstr "มุ_มมอง"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs:65
-#, fuzzy
-#| msgid "Equalizer"
msgid "_Equalizer"
-msgstr "ที่ปรับคลื่นเสียง"
+msgstr "ที่ปรับ_คลื่นเสียง"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs:66
-#, fuzzy
-#| msgid "Display the equalizer."
msgid "View the graphical equalizer"
-msgstr "แสดงที่ปรับคลื่นเสียง"
+msgstr "แสดงที่ปรับคลื่นเสียงแบบกราฟิก"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs:72
msgid "_Context Pane"
@@ -4127,22 +3901,16 @@ msgid "Show the context pane beneath the track list"
msgstr ""
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs:80
-#, fuzzy
-#| msgid "Fullscreen"
msgid "_Fullscreen"
-msgstr "เต็มจอ"
+msgstr "เ_ต็มจอ"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs:81
-#, fuzzy
-#| msgid "Toggle Fullscreen Mode"
msgid "Enter or leave fullscreen mode"
-msgstr "เปิด-ปิดการแสดงแบบเต็มจอ"
+msgstr "เข้าสู่หรือออกจากการแสดงแบบเต็มจอ"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs:86
-#, fuzzy
-#| msgid "Show Cover Art"
msgid "Show Cover _Art"
-msgstr "แสดงปกอัลบั้ม"
+msgstr "แสดง_ปกอัลบั้ม"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs:87
msgid "Toggle display of album cover art"
@@ -4242,42 +4010,32 @@ msgid "Import Files to Library"
msgstr "นำเข้าแฟ้มมายังไลบรารี"
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:48
-#, fuzzy
-#| msgid "Local Files"
msgid "Media Files"
-msgstr "แฟ้มในเครื่อง"
+msgstr "แฟ้มสื่อ"
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:59
msgid "Local Files"
msgstr "แฟ้มในเครื่อง"
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:59
-#, fuzzy
-#| msgid "Local Files"
msgid "Files"
-msgstr "แฟ้มในเครื่อง"
+msgstr "แฟ้ม"
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:63
-#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/ImportSource.cs:67
-#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:82
-#, fuzzy
-#| msgid "Choose Columns"
-msgid "C_hoose Files"
-msgstr "เลือกคอลัมน์"
+msgid "C_hoose Files..."
+msgstr "เ_ลือกแฟ้ม..."
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:81
msgid "_Files to import:"
msgstr "แ_ฟ้มที่จะนำเข้า:"
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:82
-#, fuzzy
-#| msgid "Select All"
msgid "Select Files"
-msgstr "เลือกทั้งหมด"
+msgstr "เลือกแฟ้ม"
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:83
msgid "(none selected)"
-msgstr ""
+msgstr "(ยังไม่ได้เลือก)"
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FolderImportSource.cs:43
msgid "Import Folders to Library"
@@ -4292,8 +4050,8 @@ msgid "Folders"
msgstr "โฟลเดอร์"
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FolderImportSource.cs:57
-msgid "C_hoose Folders"
-msgstr "เ_ลือกโฟลเดอร์"
+msgid "C_hoose Folders..."
+msgstr "เ_ลือกโฟลเดอร์..."
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FolderImportSource.cs:75
msgid "_Folders to import:"
@@ -4319,10 +4077,8 @@ msgstr ""
"คุณไม่มีเพลงในไลบรารี คุณอาจนำเข้าเพลงใหม่ในไลบรารีตอนนี้หรือเลือกที่จะนำเข้าในภายหลังก็ได้"
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:89
-#, fuzzy
-#| msgid "Imported On:"
msgid "Import _from:"
-msgstr "นำเข้าเมื่อ:"
+msgstr "นำเข้า_จาก:"
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:99
msgid "Do not show this dialog again"
@@ -4330,47 +4086,34 @@ msgstr "ไม่ต้องแสดงกล่องโต้ตอบนี
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:130
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:82
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:385
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:384
msgid "_Import"
msgstr "_นำเข้า"
-#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/PhotoFolderImportSource.cs:69
-msgid "Videos From Photos Folder"
-msgstr ""
-
#: ../src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileComboBox.cs:86
msgid "No available profiles"
msgstr ""
#: ../src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileConfigurationDialog.cs:74
-#, fuzzy
-#| msgid "Advanced Details"
msgid "Advanced"
-msgstr "รายละเอียดเพิ่มเติม"
+msgstr "ขั้นสูง"
#: ../src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileConfigurationDialog.cs:175
-#, fuzzy, csharp-format
-#| msgid "Configuration"
+#, csharp-format
msgid "Configuring {0}"
-msgstr "ตั้งค่า"
+msgstr "กำลังตั้งค่า {0}"
#: ../src/Core/Banshee.ThickClient/Banshee.Playlist.Gui/PlaylistExportDialog.cs:20
-#, fuzzy
-#| msgid "Sort Playlists"
msgid "Export Playlist"
-msgstr "เรียงลำดับรายการเล่น"
+msgstr "ส่งออกรายการเล่น"
#: ../src/Core/Banshee.ThickClient/Banshee.Playlist.Gui/PlaylistExportDialog.cs:29
-#, fuzzy
-#| msgid "Import"
msgid "Export"
-msgstr "นำเข้า"
+msgstr "ส่งออก"
#: ../src/Core/Banshee.ThickClient/Banshee.Playlist.Gui/PlaylistExportDialog.cs:54
-#, fuzzy
-#| msgid "Output Format:"
msgid "Select Format: "
-msgstr "ฟอร์แมตผลลัพธ์:"
+msgstr "เลือกรูปแบบ: "
#: ../src/Core/Banshee.ThickClient/Banshee.Preferences.Gui/DefaultPreferenceWidgets.cs:104
msgid "Select library location"
@@ -4393,44 +4136,32 @@ msgid "Source:"
msgstr "แหล่ง:"
#: ../src/Core/Banshee.ThickClient/Banshee.Preferences.Gui/PreferenceDialog.cs:55
-#, fuzzy
-#| msgid "Could not create transcoder"
msgid "Could not show preferences"
-msgstr "ไม่สามารถสร้างตัวแปลงรหัส"
+msgstr "ไม่สามารถแสดงค่าปรับแต่ง"
#: ../src/Core/Banshee.ThickClient/Banshee.Preferences.Gui/PreferenceDialog.cs:56
-#, fuzzy
-#| msgid "Some songs could not be found."
msgid "The preferences service could not be found."
-msgstr "หาเพลงบางเพลงไม่พบ"
+msgstr "หาบริการของค่าปรับแต่งไม่พบ"
#: ../src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/Editor.cs:80
-#, fuzzy
-#| msgid "New Playlist"
msgid "New Smart Playlist"
-msgstr "สร้างรายการเล่นใหม่"
+msgstr "สร้างรายการเล่นอัจฉริยะใหม่"
#: ../src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/Editor.cs:96
-#, fuzzy
-#| msgid "Playlist"
msgid "Playlist _Name:"
-msgstr "รายการเล่น"
+msgstr "_ชื่อรายการเล่น:"
#: ../src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/Editor.cs:108
-#, fuzzy
-#| msgid "Sort Playlists"
msgid "Predefined Smart Playlists"
-msgstr "เรียงลำดับรายการเล่น"
+msgstr "รายการเล่นอัจฉริยะสำเร็จรูป"
#: ../src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/Editor.cs:119
msgid "Open in editor"
-msgstr ""
+msgstr "เปิดในโปรแกรมแก้ไขข้อความ"
#: ../src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/Editor.cs:120
-#, fuzzy
-#| msgid "Create a new preset"
msgid "Create and save"
-msgstr "เพิ่มค่าตั้งสำเร็จ"
+msgstr "สร้างและบันทึก"
#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:110
msgid "Browser on Left"
@@ -4473,11 +4204,11 @@ msgstr ""
#: ../src/Core/Banshee.Widgets/Banshee.Widgets/SearchEntry.cs:95
msgid "Clear search"
-msgstr ""
+msgstr "ล้างการค้นหา"
#: ../src/Core/Banshee.Widgets/Banshee.Widgets/SeekSlider.cs:58
msgid "Seek"
-msgstr ""
+msgstr "เลื่อน"
#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:148
msgid "Idle"
@@ -4495,18 +4226,16 @@ msgid "Buffering"
msgstr "กำลังเตรียมข้อมูลลงที่พัก"
#: ../src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs:96
-#, fuzzy
-#| msgid "Volume Usage"
msgid "Volume"
-msgstr "พื้นที่ใช้งาน"
+msgstr "ความดังเสียง"
#: ../src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs:548
msgid "Muted"
-msgstr ""
+msgstr "ปิดเสียง"
#: ../src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs:550
msgid "Full Volume"
-msgstr ""
+msgstr "ดังเต็มที่"
#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:101
#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:102
@@ -4525,7 +4254,7 @@ msgstr "ยกเลิกปฏิบัติการ"
#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:107
#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:105
msgid "Capacity"
-msgstr ""
+msgstr "ความจุ"
#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:108
#, fuzzy
@@ -4536,10 +4265,8 @@ msgstr "ไม่ปรากฏ"
#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:109
#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:106
#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:141
-#, fuzzy
-#| msgid "Track _Number"
msgid "Serial number"
-msgstr "_ลำดับเพลง"
+msgstr "เลขลำดับผลิตภัณฑ์"
#. AddDapProperty (Catalog.GetString ("Produced on"), ipod_device.ProductionInfo.DisplayDate);
#. AddDapProperty (Catalog.GetString ("Firmware"), ipod_device.FirmwareVersion);
@@ -4548,22 +4275,18 @@ msgstr "_ลำดับเพลง"
#. AddDapProperty (Catalog.GetString ("Capabilities"), String.Join (", ", capabilities));
#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:116
#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:113
-#, fuzzy
-#| msgid "Show Cover Art"
msgid "Supports cover art"
-msgstr "แสดงปกอัลบั้ม"
+msgstr "รองรับปกอัลบั้ม"
#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:117
#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:114
msgid "Supports photos"
-msgstr ""
+msgstr "รองรับภาพถ่าย"
#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:412
#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:491
-#, fuzzy
-#| msgid "Track Duration:"
msgid "Track duration is zero"
-msgstr "ความยาวเพลง:"
+msgstr "ความยาวเพลงเป็นศูนย์"
#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:515
#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:694
@@ -4572,40 +4295,33 @@ msgstr "กำลังปรับข้อมูลกับไอพอดใ
#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:516
#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:695
-#, fuzzy
-#| msgid "Preparing to record"
msgid "Preparing to synchronize..."
-msgstr "กำลังเตรียมการเขียน"
+msgstr "กำลังเตรียมปรับข้อมูลให้ตรงกัน..."
#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:519
-#, fuzzy, csharp-format
-#| msgid "Editing Song {0} of {1}"
+#, csharp-format
msgid "Adding track {0} of {1}"
-msgstr "แก้ไขข้อมูลเพลงที่ {0} จาก {1}"
+msgstr "กำลังเพิ่มเพลงที่ {0} จาก {1}"
#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:555
-#, fuzzy, csharp-format
-#| msgid "Importing {0} of {1}"
+#, csharp-format
msgid "Removing track {0} of {1}"
-msgstr "กำลังนำเข้า {0} จาก {1}"
+msgstr "กำลังลบเพลงที่ {0} จาก {1}"
#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:619
-#, fuzzy
-#| msgid "Writing a disc"
msgid "Writing media database"
-msgstr "กำลังเขียนแผ่น"
+msgstr "กำลังเขียนฐานข้อมูลสื่อ"
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapLibrarySync.cs:131
-#, fuzzy, csharp-format
-#| msgid "Synchronize {0}"
+#, csharp-format
msgid "Sync {0}"
-msgstr "ปรับข้อมูลกับ {0} ให้ตรงกัน"
+msgstr "ปรับข้อมูลกับ {0}"
#. Note to translators: {0}, {1} and {2} will be replaced with numbers.
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapLibrarySync.cs:260
#, csharp-format
msgid "{0} to add, {1} to remove, {2} to update"
-msgstr ""
+msgstr "เพิ่ม {0}, ลบ {1}, ปรับข้อมูล {2}"
#. This group source gives us a seperator for DAPs in the source view.
#. We add it when we get our first dap source, and then remove it when
@@ -4654,26 +4370,22 @@ msgid "File format conversion support is not available"
msgstr ""
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:423
-#, fuzzy
-#| msgid "Converting Files"
msgid "Error converting file"
-msgstr "กำลังแปลงแฟ้ม"
+msgstr "การแปลงแฟ้มผิดพลาด"
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:137
msgid "Sync when first plugged in and when the libraries change"
-msgstr ""
+msgstr "ปรับข้อมูลให้ตรงกันเมื่อเสียบอุปกรณ์หรือเมื่อไลบรารีมีการเปลี่ยนแปลง"
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:138
msgid ""
"Begin synchronizing the device as soon as the device is plugged in or the "
"libraries change."
-msgstr ""
+msgstr "เริ่มปรับข้อมูลให้ตรงกันทันทีที่เชื่อมต่ออุปกรณ์หรือเมื่อไลบรารีมีการเปลี่ยนแปลง"
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:141
-#, fuzzy
-#| msgid "Preferences"
msgid "Sync Preferences"
-msgstr "ปรับแต่ง"
+msgstr "ปรับแต่งการปรับข้อมูลให้ตรงกัน"
#. singular form unused b/c we know it's > 1, but we still need GetPlural
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:365
@@ -4684,16 +4396,12 @@ msgstr[0] ""
msgstr[1] ""
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:369
-#, fuzzy
-#| msgid "Are you sure you want to permanently delete this song?"
-#| msgid_plural ""
-#| "Are you sure you want to permanently delete the selected {0} songs?"
msgid "Are you sure you want to continue?"
-msgstr "คุณแน่ใจว่าต้องการลบเพลงนี้อย่างถาวรหรือไม่?"
+msgstr "คุณแน่ใจหรือไม่ที่จะดำเนินการต่อไป?"
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:377
msgid "Remove tracks"
-msgstr ""
+msgstr "ลบเพลง"
#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:52
msgid "Sync"
@@ -4733,7 +4441,7 @@ msgstr ""
#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:109
msgid "Capacity used"
-msgstr ""
+msgstr "ความจุที่ใช้ไป"
#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:121
msgid "Advanced details"
@@ -4858,7 +4566,7 @@ msgstr ""
#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:88
msgid "Learn more about Banshee's iPod support"
-msgstr ""
+msgstr "เรียนรู้เพิ่มเติมเกี่ยวกับการรองรับไอพอดของ Banshee"
#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:96
msgid ""
@@ -4905,7 +4613,7 @@ msgstr "กำลังสร้างฐานข้อมูลไอพอด
#: ../src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/AmazonMp3GroupSource.cs:43
msgid "Purchased Music"
-msgstr ""
+msgstr "เพลงที่ซื้อมา"
#: ../src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageDevice.cs:87
msgid "Rockbox Device"
@@ -4994,6 +4702,11 @@ msgstr "แฟ้ม MP3 จาก Amazon"
msgid "Amazon MP3 Purchase"
msgstr "รายการซื้อ MP3 จาก Amazon"
+#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/ImportSource.cs:67
+#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:81
+msgid "C_hoose Files"
+msgstr "เ_ลือกแฟ้ม"
+
#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSource.cs:42
#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:39
msgid "Amazon MP3 Store"
@@ -5034,7 +4747,7 @@ msgstr "สหรัฐอเมริกา (amazon.com)"
#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:43
#, csharp-format
msgid "Search the Amazon MP3 Store"
-msgstr ""
+msgstr "ค้นหาจากร้าน MP3 ของ Amazon"
#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:45
msgid "How Your Purchases Support GNOME"
@@ -5105,8 +4818,11 @@ msgid "Book Title"
msgstr "ชื่อเพลง"
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:68
-msgid "Audiobooks, etc"
-msgstr ""
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:307
+#, fuzzy
+#| msgid "Audio"
+msgid "Audiobooks"
+msgstr "ซีดีเพลง"
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:75
#, fuzzy
@@ -5138,7 +4854,7 @@ msgid "No Bookmark Set"
msgstr ""
#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdDiscModel.cs:76
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:55
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:56
msgid "Audio CD"
msgstr "ซีดีเพลง"
@@ -5175,28 +4891,26 @@ msgid "Audio CD Importing"
msgstr "การนำเข้าจากซีดีเพลง"
#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:238
-#, fuzzy
-#| msgid "Import Source"
msgid "_Import format"
-msgstr "นำเข้าแหล่ง"
+msgstr "ฟอร์แมตการ_นำเข้า"
#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:242
msgid "_Automatically import audio CDs when inserted"
-msgstr ""
+msgstr "_นำเข้าซีดีเพลงโดยอัตโนมัติเมื่อใส่แผ่น"
#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:243
msgid ""
"When an audio CD is inserted, automatically begin importing it if metadata "
"can be found and it is not already in the library."
-msgstr ""
+msgstr "เมื่อใส่แผ่นซีดีเพลง ให้เริ่มนำเข้าโดยอัตโนมัติถ้าพบข้อมูลกำกับและแผ่นยังไม่อยู่ในไลบรารี"
#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:247
msgid "_Eject when done importing"
-msgstr ""
+msgstr "_ดันแผ่นออกเมื่อนำเข้าเสร็จ"
#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:248
msgid "When an audio CD has been imported, automatically eject it."
-msgstr ""
+msgstr "เมื่อนำเข้าซีดีเพลงเสร็จแล้ว ให้ดันแผ่นออกโดยอัตโนมัติ"
#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:251
msgid "Use error correction when importing"
@@ -5209,7 +4923,7 @@ msgid ""
msgstr ""
#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:320
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:440
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:441
msgid "Import CD"
msgstr "นำเข้าซีดี"
@@ -5225,81 +4939,83 @@ msgstr "ทำสำเนาซีดี"
msgid "Duplicate this audio CD"
msgstr "ทำสำเนาซีดีเพลงแผ่นนี้"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:130
-msgid "Searching for CD metadata..."
-msgstr "กำลังค้นหาข้อมูลซีดี..."
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:131
+msgid "Searching for track information..."
+msgstr "กำลังค้นหาข้อมูลเพลง..."
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:163
-msgid "Could not fetch metadata for CD."
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:164
+#, fuzzy
+#| msgid "Could not fetch metadata for CD."
+msgid "Could not fetch track information"
msgstr "ไม่สามารถหาข้อมูลเพลงสำหรับซีดีนี้"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:191
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:192
msgid "Automatic import off since this album is already in the Music Library."
msgstr ""
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:214
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:215
msgid "Could not import CD"
msgstr "ไม่สามารถนำเข้าซีดีได้"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:231
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:232
msgid "Could not duplicate audio CD"
msgstr "ไม่สามารถทำสำเนาซีดีเพลง"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:363
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:364
msgid "Ejecting audio CD..."
msgstr "กำลังดันแผ่นซีดีเพลงออก..."
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:381
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:382
#, csharp-format
msgid "Could not eject audio CD: {0}"
msgstr "ไม่สามารถดันแผ่นซีดีเพลงออกได้: {0}"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:414
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:415
msgid "Audio CD Preferences"
msgstr "ปรับแต่งซีดีเพลง"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:415
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:416
msgid "Eject Disc"
msgstr "ดันแผ่นออก"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:439
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:440
#, csharp-format
msgid "Import ‟{0}”"
msgstr "นำเข้า ‟{0}”"
#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmDetectJob.cs:64
msgid "Detecting BPM"
-msgstr "กำลังตรวจหา BPM"
+msgstr "กำลังตรวจจับ BPM"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:91
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:92
msgid "D_etect"
msgstr "ต_รวจหา"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:103
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:104
msgid "T_ap"
msgstr "เ_คาะ"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:111
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:112
msgid "Have Banshee attempt to auto-detect the BPM of this song"
-msgstr "ให้ Banshee พยายามตรวจหาจังหวะต่อนาที (BPM) ของเพลงนี้"
+msgstr "ให้ Banshee พยายามตรวจจับจังหวะต่อนาที (BPM) ของเพลงนี้"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:113
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:114
msgid "Play this song"
msgstr "เล่นเพลงนี้"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:116
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:117
msgid "Tap this button to the beat to set the BPM for this song manually"
msgstr "เคาะปุ่มนี้ตามจังหวะเพลงเพื่อกำหนดอัตราจังหวะต่อนาที (BPM) ของเพลงนี้เอง"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:148
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:147
msgid "_Automatically detect BPM for all songs"
-msgstr "ตรวจหา BMP ของทุกเพลงโดย_อัตโนมัติ"
+msgstr "ตรวจจับ BPM ของทุกเพลงโดย_อัตโนมัติ"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:149
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:148
msgid ""
"Detect beats per minute (BPM) for all songs that don't already have a value "
"set"
-msgstr "ตรวจหาอัตราจังหวะต่อนาที (beats per minute, BPM) ของทุกเพลงที่ยังไม่มีการกำหนดค่า"
+msgstr "ตรวจจับอัตราจังหวะต่อนาที (beats per minute, BPM) ของทุกเพลงที่ยังไม่มีการกำหนดค่า"
#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:58
msgid "Downloading Cover Art"
@@ -5316,11 +5032,11 @@ msgstr ""
#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapErrorView.cs:73
msgid "Disconnected from music share"
-msgstr ""
+msgstr "ตัดการเชื่อมต่อจากแหล่งเพลงใช้ร่วมแล้ว"
#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapErrorView.cs:74
msgid "Unable to connect to music share"
-msgstr ""
+msgstr "ไม่สามารถเชื่อมต่อไปยังแหล่งเพลงใช้ร่วม"
#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapErrorView.cs:88
#, fuzzy
@@ -5390,50 +5106,41 @@ msgstr "ล็อกอิน"
#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapResolverJob.cs:50
#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs:106
-#, fuzzy, csharp-format
-#| msgid "Continue {0}"
+#, csharp-format
msgid "Connecting to {0}"
-msgstr "ทำ {0} ต่อไป"
+msgstr "กำลังเชื่อมต่อไปยัง {0}"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:178
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:187
msgid "Add Remote DAAP Server"
-msgstr ""
+msgstr "เพิ่มเซิร์ฟเวอร์ DAAP ระยะไกล"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:179
-#, fuzzy
-#| msgid "Name of DAAP server share"
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:188
msgid "Add a new remote DAAP server"
-msgstr "ชื่อของแหล่งเพลงที่จะเปิดใช้ร่วมสำหรัับเซิร์ฟเวอร์ DAAP"
+msgstr "เพิ่มเซิร์ฟเวอร์ DAAP ระยะไกลแหล่งใหม่"
#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs:60
-#, fuzzy
-#| msgid "Music Sharing"
msgid "Music Share"
-msgstr "การแบ่งปันเพลง"
+msgstr "แหล่งเพลงใช้ร่วม"
#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs:202
#, csharp-format
msgid "Logging in to {0}."
-msgstr ""
+msgstr "กำลังเข้าสู่ระบบ {0}"
#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs:238
#, csharp-format
msgid "Loading {0} track"
msgid_plural "Loading {0} tracks"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "กำลังโหลดเพลง {0} เพลง"
+msgstr[1] "กำลังโหลดเพลง {0} เพลง"
#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs:270
-#, fuzzy
-#| msgid "Sort Playlists"
msgid "Loading playlists"
-msgstr "เรียงลำดับรายการเล่น"
+msgstr "กำลังโหลดรายการเล่น"
#: ../src/Extensions/Banshee.Daap/Banshee.Daap/OpenRemoteServer.cs:45
-#, fuzzy
-#| msgid "Name of DAAP server share"
msgid "Open remote DAAP server"
-msgstr "ชื่อของแหล่งเพลงที่จะเปิดใช้ร่วมสำหรัับเซิร์ฟเวอร์ DAAP"
+msgstr "เปิดเซิร์ฟเวอร์ DAAP ระยะไกล"
#: ../src/Extensions/Banshee.Daap/Banshee.Daap/OpenRemoteServer.cs:50
msgid "Enter server IP address and port:"
@@ -5478,62 +5185,64 @@ msgstr "กำลังยกเลิกการดาวน์โหลด"
msgid "Waiting for downloads to terminate..."
msgstr "กำลังรอให้รายการดาวน์โหลดหยุดทำงาน..."
-#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:60
+#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:59
msgid "Import eMusic Downloads to Library"
msgstr "นำเข้ารายการดาวน์โหลด eMusic มายังไลบรารี"
-#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:62
+#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:61
msgid "eMusic Files"
msgstr "แฟ้ม eMusic"
-#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:78
-#, fuzzy
-#| msgid "Music Library"
+#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:77
msgid "eMusic Tracks"
-msgstr "ไลบรารีเพลง"
+msgstr "เพลง eMusic"
#: ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs:57
#: ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs:58
msgid "File System Queue"
-msgstr ""
+msgstr "คิวของระบบแฟ้ม"
#: ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs:72
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:93
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:94
msgid "Clear"
msgstr "ล้าง"
#: ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs:73
msgid "Remove all tracks from the file system queue"
-msgstr ""
+msgstr "ลบเพลงทุกเพลงออกจากคิวของระบบแฟ้ม"
#: ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs:79
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:102
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:103
msgid "Clear on Quit"
msgstr "ล้างเมื่อออก"
#: ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs:80
msgid "Clear the file system queue when quitting"
-msgstr ""
+msgstr "ล้างคิวของระบบแฟ้มเมื่อออก"
#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/AlbumDuplicateSolver.cs:46
msgid "Duplicate Albums"
-msgstr ""
+msgstr "อัลบั้มซ้ำกัน"
#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/AlbumDuplicateSolver.cs:47
msgid ""
"Displayed are albums that should likely be merged. For each row, click the "
"desired title to make it bold, or uncheck it to take no action."
msgstr ""
+"อัลบั้มที่แสดงต่อไปนี้มีแนวโน้มว่าควรรวมกัน ในแต่ละแถว ให้คลิกที่ชื่อเพลงที่ต้องการเพื่อทำให้เป็นตัวหนา "
+"หรือเลิกกาถ้าไม่ต้องการทำอะไรกับเพลงนั้น"
#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/ArtistDuplicateSolver.cs:46
msgid "Duplicate Artists"
-msgstr ""
+msgstr "ศิลปินซ้ำกัน"
#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/ArtistDuplicateSolver.cs:47
msgid ""
"Displayed are artists that should likely be merged. For each row, click the "
"desired name to make it bold, or uncheck it to take no action."
msgstr ""
+"ศิลปินที่แสดงต่อไปนี้มีแนวโน้มว่าควรรวมกัน ในแต่ละแถว ให้คลิกที่ชื่อที่ต้องการเพื่อทำให้เป็นตัวหนา "
+"หรือเลิกกาถ้าไม่ต้องการทำอะไรกับศิลปินนั้น"
#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixActions.cs:50
msgid "Fix Music Metadata..."
@@ -5555,17 +5264,19 @@ msgstr ""
#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/GenreDuplicateSolver.cs:46
msgid "Duplicate Genres"
-msgstr ""
+msgstr "แนวเพลงซ้ำกัน"
#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/GenreDuplicateSolver.cs:47
msgid ""
"Displayed are genres that should likely be merged. For each row, click the "
"desired genre to make it bold, or uncheck it to take no action."
msgstr ""
+"แนวเพลงที่แสดงต่อไปนี้มีแนวโน้มว่าควรรวมกัน ในแต่ละแถว "
+"ให้คลิกที่แนวเพลงที่ต้องการเพื่อทำให้เป็นตัวหนา หรือเลิกกาถ้าไม่ต้องการทำอะไรกับแนวเพลงนั้น"
#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/GenreDuplicateSolver.cs:77
msgid " and "
-msgstr ""
+msgstr " และ "
#. Translators: These are articles that might be prefixed or suffixed
#. on artist names or album titles. You can add as many as you need,
@@ -5637,7 +5348,7 @@ msgstr ""
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:205
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:130
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:66
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:138
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:136
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:286
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastEpisodePage.cs:89
msgid "Description"
@@ -5649,13 +5360,11 @@ msgstr "ผู้สร้าง:"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:222
msgid "Venue:"
-msgstr ""
+msgstr "สถานที่:"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:223
-#, fuzzy
-#| msgid "Open Location"
msgid "Location:"
-msgstr "เปิดตำแหน่งแฟ้ม"
+msgstr "ตำแหน่ง:"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:225
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:81
@@ -5668,7 +5377,7 @@ msgstr "ปี:"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:229
msgid "Publisher:"
-msgstr ""
+msgstr "ผู้เผยแพร่:"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:230
msgid "Keywords:"
@@ -5684,15 +5393,15 @@ msgstr "ภาษา:"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:236
msgid "Downloads, overall:"
-msgstr ""
+msgstr "จำนวนดาวน์โหลดทั้งหมด:"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:237
msgid "Downloads, past month:"
-msgstr ""
+msgstr "จำนวนดาวน์โหลดเดือนที่แล้ว:"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:238
msgid "Downloads, past week:"
-msgstr ""
+msgstr "จำนวนดาวน์โหลดสัปดาห์ที่แล้ว:"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:242
msgid "Added:"
@@ -5707,10 +5416,8 @@ msgid "Collections:"
msgstr ""
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:246
-#, fuzzy
-#| msgid "Contributors"
msgid "Contributor:"
-msgstr "ผู้ร่วมสมทบ"
+msgstr "ผู้ร่วมสมทบ:"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:247
msgid "Recorded by:"
@@ -5859,12 +5566,6 @@ msgstr ""
msgid "Visit the Internet Archive online at archive.org"
msgstr ""
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:307
-#, fuzzy
-#| msgid "Audio"
-msgid "Audiobooks"
-msgstr "ซีดีเพลง"
-
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:308
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:78
msgid "Movies"
@@ -5890,11 +5591,11 @@ msgstr "ผลการค้นหา"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchSource.cs:139
msgid "Searching the Internet Archive"
-msgstr ""
+msgstr "กำลังค้นหาจากกรุอินเทอร์เน็ต"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchSource.cs:175
msgid "No matches."
-msgstr ""
+msgstr "ไม่มีรายการที่ตรงกัน"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchSource.cs:180
#, csharp-format
@@ -5922,33 +5623,29 @@ msgstr ""
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:128
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:61
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:98
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:137
-#, fuzzy
-#| msgid "Clear"
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:135
msgid "Creator"
-msgstr "ล้าง"
+msgstr "ผู้สร้าง"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:129
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:75
msgid "Publisher"
-msgstr ""
+msgstr "ผู้เผยแพร่"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:134
msgid "Formats"
-msgstr ""
+msgstr "ฟอร์แมต"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:136
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:65
msgid "Added"
-msgstr ""
+msgstr "เพิ่มเมื่อ"
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:62
msgid "Collection"
msgstr ""
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:63
-#, fuzzy
-#| msgid "Contributors"
msgid "Contributor"
msgstr "ผู้ร่วมสมทบ"
@@ -5957,10 +5654,8 @@ msgid "Created"
msgstr ""
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:68
-#, fuzzy
-#| msgid "Output Format:"
msgid "Format"
-msgstr "ฟอร์แมตผลลัพธ์:"
+msgstr "ฟอร์แมต"
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:69
msgid "ID"
@@ -5971,10 +5666,8 @@ msgid "Language"
msgstr "ภาษา"
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:73
-#, fuzzy
-#| msgid "Mime Type:"
msgid "Media Type"
-msgstr "ชนิดแฟ้ม:"
+msgstr "ชนิดสื่อ"
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:74
msgid "Review Count"
@@ -6089,7 +5782,7 @@ msgstr ""
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:102
msgid "Music & Arts"
-msgstr ""
+msgstr "ดนตรีและศิลปะ"
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:103
msgid "Netlabels"
@@ -6097,11 +5790,11 @@ msgstr ""
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:105
msgid "Non-English Audio"
-msgstr ""
+msgstr "เสียงที่ไม่ใช่ภาษาอังกฤษ"
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:106
msgid "Open Source Audio"
-msgstr ""
+msgstr "เสียงที่โอเพนซอร์ส"
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:108
msgid "Radio Programs"
@@ -6148,44 +5841,40 @@ msgid "Add a new Internet Radio station or playlist"
msgstr "เพิ่มสถานีหรือรายการเล่นวิทยุอินเทอร์เน็ต"
#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:83
-#, fuzzy
-#| msgid "Search for songs"
msgid "Search your stations"
-msgstr "ค้นหาเพลง"
+msgstr "ค้นหาจากสถานีของคุณ"
#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:84
#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationEditor.cs:60
-#, fuzzy
-#| msgid "Editing Song"
msgid "Edit Station"
-msgstr "แก้ไขข้อมูลเพลง"
+msgstr "แก้ไขสถานี"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:136
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:134
msgid "Station"
msgstr "สถานี"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:157
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:155
#, csharp-format
msgid "{0} station"
msgid_plural "{0} stations"
msgstr[0] "{0} สถานี"
msgstr[1] "{0} สถานี"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:243
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:241
msgid "Please provide a valid station URI"
msgstr ""
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:256
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:254
msgid "Please provide a station genre"
msgstr ""
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:264
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:262
msgid "Please provide a station title"
msgstr ""
#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:67
msgid "Add new radio station"
-msgstr ""
+msgstr "เพิ่มสถานีวิทยุใหม่"
#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:68
msgid "Edit radio station"
@@ -6258,37 +5947,37 @@ msgstr "เชื่อมต่อ"
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:98
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:113
msgid "View on Last.fm"
-msgstr ""
+msgstr "ดูบน Last.fm"
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:75
msgid "View this artist's Last.fm page"
-msgstr ""
+msgstr "ไปยังหน้าของศิลปินนี้ใน Last.fm"
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:78
msgid "View Artist on Wikipedia"
-msgstr ""
+msgstr "ดูศิลปินบนวิกิพีเดีย"
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:79
msgid "Find this artist on Wikipedia"
-msgstr ""
+msgstr "หาศิลปินนี้บนวิกิพีเดีย"
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:86
msgid "View Artist's Videos"
-msgstr ""
+msgstr "ดูวีดิทัศน์ของศิลปินนี้"
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:87
msgid "Find videos by this artist"
-msgstr ""
+msgstr "หาวีดิทัศน์ของศิลปินนี้"
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:90
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:106
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:117
msgid "Recommend to"
-msgstr ""
+msgstr "แนะนำให้กับ"
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:91
msgid "Recommend this artist to someone"
-msgstr ""
+msgstr "แนะนำศิลปินนี้ให้กับเพื่อน"
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:99
msgid "View this album's Last.fm page"
@@ -6296,7 +5985,7 @@ msgstr "ไปยังหน้าของอัลบั้มนี้ใน
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:107
msgid "Recommend this album to someone"
-msgstr ""
+msgstr "แนะนำอัลบั้มนี้ให้กับเพื่อน"
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:114
msgid "View this track's Last.fm page"
@@ -6304,7 +5993,7 @@ msgstr "ไปยังหน้าของเพลงนี้ใน Last.fm"
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:118
msgid "Recommend this track to someone"
-msgstr ""
+msgstr "แนะนำเพลงนี้ให้กับเพื่อน"
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:150
#, csharp-format
@@ -6345,37 +6034,38 @@ msgstr "_ชื่อผู้ใช้"
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:160
#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginForm.cs:86
msgid "Sign up for Last.fm"
-msgstr ""
+msgstr "เปิดบัญชี Last.fm"
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:254
msgid ""
"Open Last.fm in a browser, giving you the option to authorize Banshee to "
"work with your account"
msgstr ""
+"เปิด Last.fm ในเบราว์เซอร์ โดยขึ้นตัวเลือกให้คุณอนุญาตให้ Banshee ทำงานกับบัญชีของคุณได้"
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:265
#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:49
msgid "Log in to Last.fm"
-msgstr ""
+msgstr "เข้าสู่ระบบ Last.fm"
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:286
#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:294
#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:321
msgid "You need to allow Banshee to access your Last.fm account."
-msgstr ""
+msgstr "คุณต้องอนุญาตให้ Banshee เข้าถึงบัญชี Last.fm ของคุณ"
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:296
msgid "Finish Logging In"
-msgstr ""
+msgstr "เสร็จสิ้นการเข้าระบบ"
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:310
#, csharp-format
msgid "You are logged in to Last.fm as the user <i>{0}</i>."
-msgstr ""
+msgstr "คุณได้เข้าระบบ Last.fm ในนามของผู้ใช้ <i>{0}</i> แล้ว"
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:313
msgid "Log out of Last.fm"
-msgstr ""
+msgstr "ออกจากระบบ Last.fm"
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSourceContents.cs:123
msgid "Recently Loved Tracks"
@@ -6413,32 +6103,29 @@ msgstr ""
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:80
#, csharp-format
msgid "Top Albums by {0}"
-msgstr ""
+msgstr "อัลบั้มยอดนิยมโดย {0}"
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:81
-#, fuzzy, csharp-format
-#| msgid "Track {0}"
+#, csharp-format
msgid "Top Tracks by {0}"
-msgstr "เพลงที่ {0}"
+msgstr "เพลงยอดนิยมโดย {0}"
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:178
msgid "Recommended Artists"
-msgstr ""
+msgstr "ศิลปินแนะนำ"
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:206
msgid "No similar artists found"
-msgstr ""
+msgstr "ไม่พบศิลปินที่คล้ายกัน"
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/SimilarArtistTile.cs:60
#, csharp-format
msgid "{0}% Similarity"
-msgstr ""
+msgstr "ความคล้าย {0}%"
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/SimilarArtistTile.cs:62
-#, fuzzy
-#| msgid "Unknown Artist"
msgid "Unknown Similarity"
-msgstr "ไม่มีชื่อศิลปิน"
+msgstr "ไม่ทราบความคล้าย"
#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:59
msgid "_Add Station..."
@@ -6452,23 +6139,23 @@ msgstr "เพิ่มสถานีวิทยุ Last.fm ใหม่"
#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:73
#, csharp-format
msgid "Listen to {0} Station"
-msgstr ""
+msgstr "ฟังสถานี {0}"
#. Translators: {0} is a type of Last.fm station, eg "Fans of" or "Similar to".
#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:75
#, csharp-format
msgid "Listen to the Last.fm {0} station for this artist"
-msgstr ""
+msgstr "ฟังสถานี Last.fm {0} ของศิลปินนี้"
#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:80
#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:81
msgid "Fans of"
-msgstr ""
+msgstr "แฟน"
#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:85
#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:86
msgid "Similar to"
-msgstr ""
+msgstr "คล้าย"
#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:94
msgid "Love Track"
@@ -6489,12 +6176,12 @@ msgstr "ทำเครื่องหมายเพลงปัจจุบั
#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:188
#, csharp-format
msgid "Fans of {0}"
-msgstr "แฟนของ {0}"
+msgstr "แฟน {0}"
#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:209
#, csharp-format
msgid "Similar to {0}"
-msgstr "คล้ายกับ {0}"
+msgstr "คล้าย {0}"
#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:240
msgid "_Add Station"
@@ -6512,11 +6199,11 @@ msgstr "ความยาวทั้งหมด {0}"
#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationEditor.cs:68
msgid "New Station"
-msgstr ""
+msgstr "สถานีใหม่"
#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationEditor.cs:90
msgid "Station _Type:"
-msgstr ""
+msgstr "_ชนิดของสถานี:"
#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:58
msgid "Last.fm Station"
@@ -6528,40 +6215,40 @@ msgstr "แก้ไขสถานี Last.fm"
#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:152
msgid "Delete Last.fm Station"
-msgstr ""
+msgstr "ลบสถานี Last.fm"
#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:239
#, csharp-format
msgid "Tuning Last.fm to {0}."
-msgstr ""
+msgstr "กำลังจูน Last.fm ไปที่ {0}"
#. Translators: {0} is an error message sentence from RadioConnection.cs.
#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:249
#, csharp-format
msgid "Failed to tune in station. {0}"
-msgstr ""
+msgstr "จูนสถานีไม่สำเร็จ {0}"
#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:357
#, csharp-format
msgid "Getting new songs for {0}."
-msgstr ""
+msgstr "กำลังอ่านเพลงใหม่ของ {0}"
#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:364
#, csharp-format
msgid "No new songs available for {0}."
-msgstr ""
+msgstr "ไม่มีเพลงใหม่สำหรับ {0}"
#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:390
#, csharp-format
msgid "Failed to get new songs for {0}."
-msgstr ""
+msgstr "อ่านเพลงใหม่ของ {0} ไม่สำเร็จ"
#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:451
#, csharp-format
msgid "{0} song played"
msgid_plural "{0} songs played"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "เล่นแล้ว {0} เพลง"
+msgstr[1] "เล่นแล้ว {0} เพลง"
#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:583
#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs:84
@@ -6692,38 +6379,30 @@ msgid "Open Miro Guide"
msgstr ""
#: ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide/View.cs:56
-#, fuzzy
-#| msgid "Search for songs"
msgid "Search for podcasts"
-msgstr "ค้นหาเพลง"
+msgstr "ค้นหาพอดคาสต์"
#: ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide/View.cs:57
-#, fuzzy
-#| msgid "Search for songs"
msgid "Search for video podcasts"
-msgstr "ค้นหาเพลง"
+msgstr "ค้นหาพอดคาสต์วีดิทัศน์"
#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:139
-#, fuzzy
-#| msgid "Shows the Notification Area Icon"
msgid "_Show Notifications"
-msgstr "แสดงไอคอนในพื้นที่แจ้งเตือน"
+msgstr "แ_สดงไอคอนแจ้งเหตุ"
#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:140
-#, fuzzy
-#| msgid "Shows the Notification Area Icon"
msgid "Show notifications when item changes"
-msgstr "แสดงไอคอนในพื้นที่แจ้งเตือน"
+msgstr "แสดงไอคอนแจ้งเหตุเมื่อเปลี่ยนรายการ"
#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:344
msgid "Still Running"
-msgstr ""
+msgstr "ยังทำงานอยู่"
#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:345
msgid ""
"Banshee was closed to the notification area. Use the <i>Quit</i> option to "
"end your session."
-msgstr ""
+msgstr "Banshee ถูกปิดลงไปอยู่ที่พื้นที่แจ้งเหตุ ใช้ตัวเลือก <i>ออก</i> ถ้าต้องการปิดวาระของคุณ"
#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:480
msgid "Skip this item"
@@ -6731,7 +6410,7 @@ msgstr "ข้ามรายการนี้"
#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:484
msgid "Cannot show notification"
-msgstr ""
+msgstr "ไม่สามารถแสดงการแจ้งเหตุ"
#. Translators: {0} and {1} are for markup so ignore them, {2} and {3}
#. are Artist Name and Album Title, respectively;
@@ -6742,6 +6421,8 @@ msgid ""
"{0}by{1} {2}\n"
"{0}from{1} {3}"
msgstr ""
+"{0}โดย{1} {2}\n"
+"{0}จาก{1} {3}"
#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/X11NotificationAreaBox.cs:68
msgid "Banshee"
@@ -6755,187 +6436,172 @@ msgstr ""
msgid "Simplify the Now Playing interface by hiding the source list and more"
msgstr ""
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:144
-#, fuzzy, csharp-format
-#| msgid "Cannot import track from {0}"
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:143
+#, csharp-format
msgid "Unable to import track: {0}"
-msgstr "ไม่สามารถนำเข้าเพลงจาก {0}"
+msgstr "ไม่สามารถนำเข้าเพลง: {0}"
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:178
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:177
msgid "Importing from Amarok failed"
-msgstr ""
+msgstr "นำเข้าจาก Amarok ไม่สำเร็จ"
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:189
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:188
msgid "Amarok"
-msgstr ""
+msgstr "Amarok"
#. TODO add Help button and dialog/tooltip
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:68
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:384
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:383
msgid "iTunes Importer"
msgstr "เครื่องมือนำเข้าสื่อ iTunes"
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:90
-#, fuzzy
-#| msgid "Importing Songs"
msgid "Import song ratings"
-msgstr "กำลังนำเข้าเพลง"
+msgstr "นำเข้าคะแนนนิยมเพลง"
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:93
msgid "Import play statistics (playcount, etc.)"
-msgstr ""
+msgstr "นำเข้าสถิติการเล่น (จำนวนครั้ง ฯลฯ)"
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:96
msgid "Import playlists"
msgstr "นำเข้ารายการเล่น"
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:120
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:387
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:386
#, csharp-format
msgid "Locate your \"{0}\" file..."
msgstr ""
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:138
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:388
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:387
#, csharp-format
msgid "Locate \"{0}\""
msgstr ""
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:167
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:389
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:388
msgid "Locate iTunes Music Directory"
msgstr ""
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:196
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:391
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:390
#, csharp-format
msgid ""
"The iTunes library refers to your music directory as \"{0}\" but Banshee was "
"not able to infer the location of this directory. Please locate it."
msgstr ""
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:75
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:393
-#, fuzzy
-#| msgid "Music Player"
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:74
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:392
msgid "iTunes Media Player"
-msgstr "โปรแกรมเล่นเพลง"
+msgstr "โปรแกรมเล่นสื่อ iTunes"
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:135
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:395
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:134
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:394
msgid ""
"Banshee is not familiar with this version of the iTunes library format. "
"Importing may or may not work as expected, or at all. Would you like to "
"attempt to import anyway?"
msgstr ""
+"Banshee ไม่รู้จักฟอร์แมตของไลบรารีของ iTunes รุ่นนี้ดีพอ "
+"การนำเข้าอาจทำได้ตามที่คาดหวังหรือไม่ก็ได้ หรืออาจทำไม่ได้เลย คุณยังต้องการพยายามนำเข้าหรือไม่?"
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:440
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:236
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:397
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:439
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:235
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:396
msgid "Unable to import song."
msgstr "ไม่สามารถนำเข้าเพลง"
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:370
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:369
msgid "Rhythmbox Music Player"
msgstr "โปรแกรมเล่นเพลง Rhythmbox"
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:386
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:385
msgid "Import _playlists"
msgstr "นำเข้า_รายการเล่น"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/HeaderWidget.cs:59
msgid "_Fill"
-msgstr ""
+msgstr "เ_ติม"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/HeaderWidget.cs:71
-#, fuzzy
-#| msgid "from"
msgid "f_rom"
-msgstr "จาก"
+msgstr "_จาก"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:51
-#, fuzzy
-#| msgid "Add to Playlist"
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:52
msgid "Add to Play Queue"
msgstr "เพิ่มในรายการเล่น"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:52
-#, fuzzy
-#| msgid ""
-#| "Append selected songs to playlist or create new playlist from selection"
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:53
msgid "Append selected songs to the play queue"
-msgstr "เพิ่มเพลงที่เลือกลงในรายการเล่น หรือสร้างรายการใหม่จากเพลงที่เลือก"
+msgstr "เพิ่มเพลงที่เลือกต่อท้ายคิวเล่น"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:56
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:57
msgid "Play After"
-msgstr ""
+msgstr "เล่นต่อหลัง"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:57
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:58
msgid "Add selected songs after the currently playing track, album, or artist"
-msgstr ""
+msgstr "เล่นเพลงที่เลือกหลังเพลง อัลบั้ม หรือศิลปินที่กำลังเล่นอยู่"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:61
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:62
msgid "Current Track"
-msgstr ""
+msgstr "เพลงปัจจุบัน"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:62
-#, fuzzy
-#| msgid ""
-#| "Append selected songs to playlist or create new playlist from selection"
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:63
msgid "Add selected songs to the play queue after the currently playing song"
-msgstr "เพิ่มเพลงที่เลือกลงในรายการเล่น หรือสร้างรายการใหม่จากเพลงที่เลือก"
+msgstr "เพิ่มเพลงที่เลือกลงในคิวเล่นหลังเพลงที่กำลังเล่นอยู่"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:66
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:67
msgid "Current Album"
msgstr "อัลบั้มปัจจุบัน"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:67
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:68
msgid "Add selected songs to the play queue after the currently playing album"
-msgstr ""
+msgstr "เพิ่มเพลงที่เลือกลงในคิวเล่นหลังอัลบั้มที่กำลังเล่นอยู่"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:71
-#, fuzzy
-#| msgid "Artist"
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:72
msgid "Current Artist"
-msgstr "ศิลปิน"
+msgstr "ศิลปินปัจจุบัน"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:72
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:73
msgid "Add selected songs to the play queue after the currently playing artist"
-msgstr ""
+msgstr "เพิ่มเพลงที่เลือกลงในคิวเล่นหลังศิลปินที่กำลังเล่นอยู่"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:79
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:80
msgid "Refresh random tracks in the play queue"
msgstr ""
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:84
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:85
msgid "Randomize the playback order of items in the play queue"
msgstr ""
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:88
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:89
msgid "Add More"
msgstr "เพิ่มอีก"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:89
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:90
msgid "Add more random tracks to the play queue"
-msgstr ""
+msgstr "สุ่มเพลงเพิ่มลงในคิวเล่นอีก"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:94
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:95
msgid "Remove all tracks from the play queue"
-msgstr ""
+msgstr "ลบเพลงทั้งหมดออกจากคิวเล่น"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:103
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:104
msgid "Clear the play queue when quitting"
-msgstr ""
+msgstr "ล้างคิวเล่นเมื่อออกจากโปรแกรม"
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:88
msgid "Remove From Play Queue"
msgstr ""
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:952
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:959
msgid "Number of _played songs to show"
msgstr ""
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:958
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:965
msgid "Number of _upcoming songs to show"
msgstr ""
@@ -6944,18 +6610,16 @@ msgstr ""
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:89
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastEpisodePage.cs:86
msgid "Podcast"
-msgstr ""
+msgstr "พอดคาสต์"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastFeedModel.cs:69
#, csharp-format
msgid "All Podcasts ({0})"
-msgstr ""
+msgstr "พอดคาสต์ทั้งหมด ({0})"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:104
-#, fuzzy
-#| msgid "Local Folder"
msgid "Podcasts Folder"
-msgstr "โฟลเดอร์ในเครื่อง"
+msgstr "โฟลเดอร์พอดคาสต์"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:131
msgid "Remove Podcast"
@@ -6968,41 +6632,35 @@ msgstr "ปิดการปรับข้อมูลอัตโนมัต
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:154
#, csharp-format
msgid "Network error updating {0}"
-msgstr ""
+msgstr "เกิดความผิดพลาดของเครือข่ายขณะปรับข้อมูล {0}"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:160
#, csharp-format
msgid "Parsing error updating {0}"
-msgstr ""
+msgstr "แจงอ่านผิดพลาดขณะปรับข้อมูล {0}"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:163
-#, fuzzy, csharp-format
-#| msgid "Authentication Required"
+#, csharp-format
msgid "Authentication error updating {0}"
-msgstr "ต้องการรหัสผ่าน"
+msgstr "ยืนยันตัวบุคคลผิดพลาดขณะปรับข้อมูล {0}"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:166
-#, fuzzy, csharp-format
-#| msgid "Error Burning CD"
+#, csharp-format
msgid "Error updating {0}"
-msgstr "เกิดความผิดพลาดในการเขียนซีดี"
+msgstr "เกิดข้อผิดพลาดขณะปรับข้อมูล {0}"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:222
-#, fuzzy
-#| msgid "Search for songs"
msgid "Search your podcasts"
-msgstr "ค้นหาเพลง"
+msgstr "ค้นหาจากพอดคาสต์ของคุณ"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:285
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastEpisodePage.cs:88
msgid "Published"
-msgstr ""
+msgstr "เผยแพร่"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:285
-#, fuzzy
-#| msgid "New CD"
msgid "New"
-msgstr "ซีดีใหม่"
+msgstr "ใหม่"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:286
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellDownloadStatus.cs:57
@@ -7046,19 +6704,19 @@ msgstr "กำลังดาวน์โหลด"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellUnheard.cs:57
msgid "New Items"
-msgstr ""
+msgstr "รายการใหม่"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellUnheard.cs:59
msgid "Old Items"
-msgstr ""
+msgstr "รายการเก่า"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs:50
msgid "Downloading Podcast(s)"
-msgstr ""
+msgstr "กำลังดาวน์โหลดพอดคาสต์"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs:52
msgid "Cancel all podcast downloads?"
-msgstr ""
+msgstr "ต้องการยกเลิกการดาวน์โหลดพอดคาสต์ทั้งหมดหรือไม่?"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/HeaderWidget.cs:99
msgid "_Limit to episodes from"
@@ -7067,19 +6725,19 @@ msgstr ""
#. "<control><shift>U",
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:73
msgid "Check all podcasts for new episodes"
-msgstr ""
+msgstr "ตรวจหาตอนใหม่จากพอดคาสต์ทั้งหมด"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:78
msgid "Add Podcast..."
-msgstr ""
+msgstr "เพิ่มพอดคาสต์..."
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:79
msgid "Subscribe to a new podcast"
-msgstr ""
+msgstr "บอกรับพอดคาสต์"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:93
msgid "Unsubscribe and Delete"
-msgstr ""
+msgstr "เลิกบอกรับและลบทิ้ง"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:99
msgid "Check for New Episodes"
@@ -7090,10 +6748,8 @@ msgid "Download All Episodes"
msgstr "ดาวน์โหลดทุกตอน"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:111
-#, fuzzy
-#| msgid "Visit the Banshee Home Page"
msgid "Visit Podcast Homepage"
-msgstr "ไปยังโฮมเพจของ Banshee"
+msgstr "ไปยังหน้าเว็บของพอดคาสต์"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:123
msgid "Mark as New"
@@ -7129,11 +6785,11 @@ msgstr[1] "ลบแฟ้ม"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:343
msgid "Invalid URL"
-msgstr ""
+msgstr "URL ไม่ถูกต้อง"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:344
msgid "Podcast URL is invalid."
-msgstr ""
+msgstr "URL ของพอดคาสต์ไม่ถูกต้อง"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastEpisodePage.cs:109
msgid "Episode Details"
@@ -7159,14 +6815,12 @@ msgstr ""
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:119
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:105
-#, fuzzy
-#| msgid "No MP3-compatible encoders available"
msgid "No description available"
-msgstr "ไม่มีตัวลงรหัสที่เข้ากันกับ MP3"
+msgstr "ไม่มีรายละเอียด"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastPropertiesDialog.cs:77
msgid "Podcast:"
-msgstr ""
+msgstr "พอดคาสต์:"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:92
msgid "Subscribe to New Podcast"
@@ -7189,11 +6843,11 @@ msgstr "ดาวน์โหลดตอนทั้งหมด"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/SyncPreferenceComboBox.cs:42
msgid "Download the most recent episode"
-msgstr ""
+msgstr "ดาวน์โหลดตอนล่าสุด"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/SyncPreferenceComboBox.cs:43
msgid "Let me decide which episodes to download"
-msgstr ""
+msgstr "ถามว่าจะให้ดาวน์โหลดตอนใดบ้าง"
#: ../src/Extensions/Banshee.RemoteAudio/Banshee.RemoteAudio/RemoteSpeakersWidget.cs:51
#, fuzzy
@@ -7229,7 +6883,7 @@ msgstr "เล่นในเว็บเบราว์เซอร์..."
#: ../src/Extensions/Banshee.YouTube/Banshee.YouTube/YouTubePane.cs:61
msgid "No videos found"
-msgstr ""
+msgstr "ไม่พบวีดิทัศน์"
#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/Accessibility/ColumnHeaderCellTextAccessible.cs:36
msgid "open context menu"
@@ -7246,12 +6900,11 @@ msgstr "เมนู"
#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs:612
#, csharp-format
msgid "Hide <i>{0}</i>"
-msgstr ""
+msgstr "ซ่อน <i>{0}</i>"
#. Translators: {0} is substituted with the application name
#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:53
#, csharp-format
-#| msgid "Banshee Encountered a Fatal Error"
msgid "{0} Encountered a Fatal Error"
msgstr "{0} พบข้อผิดพลาดร้ายแรง"
@@ -7273,31 +6926,31 @@ msgstr "ชื่อส่วนประกอบ"
#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs:62
msgid "KB"
-msgstr ""
+msgstr "KB"
#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:86
-#, fuzzy
-#| msgid "Configuration"
msgid "Condition:"
-msgstr "ตั้งค่า"
+msgstr "เงื่อนไข:"
+# Part of the UI: "_Match" {all,any} "of the following:"
#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:104
msgid "_Match"
-msgstr ""
+msgstr "_ตรงกับรายการ"
+# Part of the UI: "_Match" {all,any} "of the following:"
#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:111
-#, fuzzy
-#| msgid "All"
msgid "all"
msgstr "ทั้งหมด"
+# Part of the UI: "_Match" {all,any} "of the following:"
#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:112
msgid "any"
-msgstr ""
+msgstr "ใดๆ"
+# Part of the UI: "_Match" {all,any} "of the following:"
#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:117
msgid "of the following:"
-msgstr ""
+msgstr "ต่อไปนี้:"
#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryLimitBox.cs:58
msgid "_Limit to"
@@ -7435,35 +7088,35 @@ msgstr ""
msgid ""
"Last.fm username is invalid or Banshee is not authorized to access your "
"account."
-msgstr ""
+msgstr "ชื่อผู้ใช้ Last.fm ไม่ถูกต้อง หรือ Banshee ไม่ได้รับอนุญาตให้เข้าถึงบัญชีของคุณ"
#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:271
msgid "This service does not exist."
-msgstr ""
+msgstr "บริการนี้ไม่มีอยู่"
#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:275
msgid "Stations are only available to paying Last.fm subscribers."
-msgstr ""
+msgstr "สถานีเปิดให้สมาชิกที่จ่ายค่าบริการใช้ได้เท่านั้น"
#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:277
msgid "This station is not available."
-msgstr ""
+msgstr "สถานี้ไม่มีอยู่"
#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:279
msgid "The request is missing a required parameter."
-msgstr ""
+msgstr "คำร้องขอขาดพารามิเตอร์ที่จำเป็น"
#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:281
msgid "The specified resource is invalid."
-msgstr ""
+msgstr "ทรัพยากรที่ระบุมาไม่ถูกต้อง"
#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:283
msgid "Server error, please try again later."
-msgstr ""
+msgstr "เกิดข้อผิดพลาดที่เซิร์ฟเวอร์ โปรดลองใหม่ภายหลัง"
#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:285
msgid "Invalid authentication information, please re-authenticate."
-msgstr ""
+msgstr "ข้อมูลที่ใช้ยืนยันตัวบุคคลไม่ถูกต้อง กรุณายืนยันใหม่"
#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:287
msgid "The API key used by this application is invalid."
@@ -7500,21 +7153,19 @@ msgstr ""
#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:313
msgid "Not connected to Last.fm."
-msgstr ""
+msgstr "ยังไม่ได้เชื่อมต่อกับ Last.fm"
#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:315
msgid "Account details are needed before you can connect to Last.fm"
-msgstr ""
+msgstr "ต้องมีรายละเอียดของบัญชีก่อนที่จะเชื่อมต่อกับ Last.fm ได้"
#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:317
msgid "No network connection detected."
-msgstr ""
+msgstr "ตรวจไม่พบการเชื่อมต่อเครือข่าย"
#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:319
-#, fuzzy
-#| msgid "Last.fm Username"
msgid "Last.fm username is invalid."
-msgstr "ชื่อผู้ใช้ Last.fm"
+msgstr "ชื่อผู้ใช้ Last.fm ไม่ถูกต้อง"
#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:323
msgid "Connecting to Last.fm."
@@ -7527,10 +7178,23 @@ msgstr "เชื่อมต่อกับ Last.fm แล้ว"
#: ../src/Libraries/Migo/Migo.Syndication/Feed.cs:147
#: ../src/Libraries/Migo/Migo.Syndication/RssParser.cs:97
#: ../src/Libraries/Migo/Migo.Syndication/RssParser.cs:100
-#, fuzzy
-#| msgid "Unknown Artist"
msgid "Unknown Podcast"
-msgstr "ไม่มีชื่อศิลปิน"
+msgstr "พอดคาสต์นิรนาม"
+
+#~ msgid "Home Folder"
+#~ msgstr "โฟลเดอร์บ้าน"
+
+#~ msgid "_Web Resources"
+#~ msgstr "ทรัพยากรในเ_ว็บ"
+
+#~ msgid "Banshee _User Guide (Wiki)"
+#~ msgstr "คู่_มือผู้ใช้ Banshee (วิกิ)"
+
+#~ msgid "Learn about how to use Banshee"
+#~ msgstr "เรียนรู้วิธีใช้ Banshee"
+
+#~ msgid "Searching for CD metadata..."
+#~ msgstr "กำลังค้นหาข้อมูลซีดี..."
#~ msgid "<b>Advanced Properties</b>"
#~ msgstr "<b>คุณสมบัติเพิ่มเติม</b>"
@@ -8041,9 +7705,6 @@ msgstr "ไม่มีชื่อศิลปิน"
#~ msgid "Reading table of contents from CD..."
#~ msgstr "กำลังอ่านสารบัญจากซีดี..."
-#~ msgid "Searching for CD cover art..."
-#~ msgstr "กำลังค้นหาภาพปกซีดี..."
-
#~ msgid ""
#~ "Cannot search for CD metadata: there is no available Internet connection"
#~ msgstr "ไม่สามารถค้นหาข้อมูลซีดีได้: ไม่ได้เชื่อมต่ออินเทอร์เน็ต"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 59eff65..f752d54 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,9 +10,9 @@ msgstr ""
"Project-Id-Version: banshee master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=banshee&component=general\n"
-"POT-Creation-Date: 2010-07-24 14:23+0000\n"
-"PO-Revision-Date: 2010-07-25 19:32+0800\n"
-"Last-Translator: Aron Xu <happyaron.xu at gmail.com>\n"
+"POT-Creation-Date: 2010-12-05 11:42+0000\n"
+"PO-Revision-Date: 2010-12-07 00:17+0800\n"
+"Last-Translator: Yinghua Wang <wantinghard at gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh at googlegroups.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,8 +21,8 @@ msgstr ""
#. ../src/Backends/Banshee.Gio/Banshee.Gio.addin.xml
#: ../data/addin-xml-strings.cs:8
-msgid "GIO IO backend"
-msgstr "GIO IO 后端"
+msgid "GIO IO and Hardware backends"
+msgstr "GIO IO 及硬件后端"
#. ../src/Backends/Banshee.Gnome/Banshee.Gnome.addin.xml
#: ../data/addin-xml-strings.cs:11
@@ -42,7 +42,7 @@ msgstr "GStreamer 多媒体服务包括回放，CD 复制及转码。"
#. ../src/Backends/Banshee.Hal/Banshee.Hal.addin.xml
#: ../data/addin-xml-strings.cs:20
msgid "Provides hardware support through HAL."
-msgstr "通过 HAL 提供硬件支持"
+msgstr "通过 HAL 提供硬件支持。"
#. ../src/Backends/Banshee.NowPlaying.X11/Banshee.NowPlaying.X11.addin.xml
#: ../data/addin-xml-strings.cs:23
@@ -65,47 +65,57 @@ msgstr "提供 POSIX/UNIX 支持，包括 IO。"
#. ../src/Core/Banshee.Core/Banshee.Core.addin.xml
#: ../data/addin-xml-strings.cs:32
msgid "Provides low level non-GUI utilities."
-msgstr "提供低层的非图形界面的实用工具集"
+msgstr "提供低层的非图形界面的实用工具集。"
#. ../src/Core/Banshee.Services/Banshee.Services.addin.xml
#: ../data/addin-xml-strings.cs:35
msgid "Provides non-GUI utilities and services."
-msgstr "提供非图形界面的工具集和服务"
+msgstr "提供非图形界面的工具集和服务。"
#. ../src/Core/Banshee.ThickClient/Banshee.ThickClient.addin.xml
#: ../data/addin-xml-strings.cs:38
msgid "Provides GUI utilities and services."
-msgstr "提供图形界面的实用工具集和服务"
+msgstr "提供图形界面的实用工具集和服务。"
-#. ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod.addin.xml
+#. ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice.addin.xml
#: ../data/addin-xml-strings.cs:41
-msgid "iPod Support"
-msgstr "iPod 支持"
+msgid "Apple device Support"
+msgstr "Apple 设备支持"
#: ../data/addin-xml-strings.cs:42
-msgid "Support for most iPod devices."
-msgstr "支持大多数 iPod 设备"
+msgid "Support for most iPod/iPhone/iPad devices."
+msgstr "支持大多数 iPod/iPhone/iPad 设备。"
#: ../data/addin-xml-strings.cs:43 ../data/addin-xml-strings.cs:48
#: ../data/addin-xml-strings.cs:53 ../data/addin-xml-strings.cs:58
+#: ../data/addin-xml-strings.cs:63
msgid "Device Support"
msgstr "设备支持"
-#. ../src/Dap/Banshee.Dap.Karma/Banshee.Dap.Karma.addin.xml
+#. ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod.addin.xml
#: ../data/addin-xml-strings.cs:46
+msgid "iPod Support"
+msgstr "iPod 支持"
+
+#: ../data/addin-xml-strings.cs:47
+msgid "Support for most iPod devices."
+msgstr "支持大多数 iPod 设备"
+
+#. ../src/Dap/Banshee.Dap.Karma/Banshee.Dap.Karma.addin.xml
+#: ../data/addin-xml-strings.cs:51
msgid "Karma Support"
msgstr "Karma 支持"
-#: ../data/addin-xml-strings.cs:47
+#: ../data/addin-xml-strings.cs:52
msgid "Support for Rio Karma devices."
msgstr "支持 Rio Karma 设备"
#. ../src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage.addin.xml
-#: ../data/addin-xml-strings.cs:51
+#: ../data/addin-xml-strings.cs:56
msgid "Mass Storage Media Player Support"
msgstr "大容量媒体播放器支持"
-#: ../data/addin-xml-strings.cs:52
+#: ../data/addin-xml-strings.cs:57
msgid ""
"Support for USB-drive based devices, including many iAudio devices and "
"Android, Pre, and Galaxy phones."
@@ -114,348 +124,358 @@ msgstr ""
"话。"
#. ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp.addin.xml
-#: ../data/addin-xml-strings.cs:56
+#: ../data/addin-xml-strings.cs:61
msgid "MTP Media Player Support"
msgstr "MTP 媒体播放器支持"
-#: ../data/addin-xml-strings.cs:57
+#: ../data/addin-xml-strings.cs:62
msgid "Support for MTP devices, including many Creative Zen devices."
msgstr "支持 MTP 设备，包括许多 Creative Zen 设备。"
#. ../src/Dap/Banshee.Dap/Banshee.Dap.addin.xml
-#: ../data/addin-xml-strings.cs:61
+#: ../data/addin-xml-strings.cs:66
msgid "Digital Media Player Support"
msgstr "数码媒体播放器支持"
-#: ../data/addin-xml-strings.cs:62
+#: ../data/addin-xml-strings.cs:67
msgid "Provides general support for many kinds of media player devices."
msgstr "为许多类型的媒体播放器设备提供通用支持。"
#. ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store.addin.xml
-#: ../data/addin-xml-strings.cs:65
+#: ../data/addin-xml-strings.cs:70
msgid "Amazon MP3 Store Source"
msgstr "Amazon MP3 Store 源"
-#: ../data/addin-xml-strings.cs:66
+#: ../data/addin-xml-strings.cs:71
msgid "Browse, search, and purchase music from the Amazon MP3 store"
msgstr "从 Amazon MP3 store 浏览、搜索和购买音乐"
-#: ../data/addin-xml-strings.cs:67 ../data/addin-xml-strings.cs:72
-#: ../data/addin-xml-strings.cs:107 ../data/addin-xml-strings.cs:122
-#: ../data/addin-xml-strings.cs:132 ../data/addin-xml-strings.cs:137
-#: ../data/addin-xml-strings.cs:156
+#: ../data/addin-xml-strings.cs:72 ../data/addin-xml-strings.cs:77
+#: ../data/addin-xml-strings.cs:112 ../data/addin-xml-strings.cs:127
+#: ../data/addin-xml-strings.cs:137 ../data/addin-xml-strings.cs:142
+#: ../data/addin-xml-strings.cs:161
msgid "Online Sources"
msgstr "在线资源"
#. ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3.addin.xml
-#: ../data/addin-xml-strings.cs:70
+#: ../data/addin-xml-strings.cs:75
msgid "Amazon MP3 Import"
msgstr "Amazon MP3 导入"
-#: ../data/addin-xml-strings.cs:71
+#: ../data/addin-xml-strings.cs:76
msgid "Download and import music purchased from Amazon.com"
msgstr "下载并导入从 Amazon.com 处购买的音乐"
#. ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook.addin.xml
-#: ../data/addin-xml-strings.cs:75
+#: ../data/addin-xml-strings.cs:80
msgid "Audiobooks Library"
msgstr "有声读物库"
-#: ../data/addin-xml-strings.cs:76
+#: ../data/addin-xml-strings.cs:81
msgid "Organize audiobooks, lectures, etc."
msgstr "组织有声读物，演讲，等等。"
-#: ../data/addin-xml-strings.cs:77 ../data/addin-xml-strings.cs:82
-#: ../data/addin-xml-strings.cs:112 ../data/addin-xml-strings.cs:127
-#: ../data/addin-xml-strings.cs:180 ../data/addin-xml-strings.cs:185
+#: ../data/addin-xml-strings.cs:82 ../data/addin-xml-strings.cs:87
+#: ../data/addin-xml-strings.cs:117 ../data/addin-xml-strings.cs:132
+#: ../data/addin-xml-strings.cs:190 ../data/addin-xml-strings.cs:195
msgid "Core"
msgstr "核心"
#. ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd.addin.xml
-#: ../data/addin-xml-strings.cs:80
+#: ../data/addin-xml-strings.cs:85
msgid "Audio CD Support"
msgstr "音频 CD 支持"
-#: ../data/addin-xml-strings.cs:81
+#: ../data/addin-xml-strings.cs:86
msgid "Listen to and rip Audio CDs."
msgstr "收听并复制音频 CD"
#. ../src/Extensions/Banshee.BooScript/Banshee.BooScript.addin.xml
-#: ../data/addin-xml-strings.cs:85
+#: ../data/addin-xml-strings.cs:90
msgid "Boo Scripting"
msgstr "Boo 脚本"
-#: ../data/addin-xml-strings.cs:86
+#: ../data/addin-xml-strings.cs:91
msgid "Customize and extend Banshee with Boo-language scripts."
msgstr "使用 Boo 语言脚本来自定义和扩展 Banshee。"
-#: ../data/addin-xml-strings.cs:87 ../data/addin-xml-strings.cs:92
-#: ../data/addin-xml-strings.cs:97 ../data/addin-xml-strings.cs:102
-#: ../data/addin-xml-strings.cs:117 ../data/addin-xml-strings.cs:142
-#: ../data/addin-xml-strings.cs:151 ../data/addin-xml-strings.cs:161
-#: ../data/addin-xml-strings.cs:166 ../data/addin-xml-strings.cs:175
-#: ../data/addin-xml-strings.cs:204
+#: ../data/addin-xml-strings.cs:92 ../data/addin-xml-strings.cs:97
+#: ../data/addin-xml-strings.cs:102 ../data/addin-xml-strings.cs:107
+#: ../data/addin-xml-strings.cs:122 ../data/addin-xml-strings.cs:147
+#: ../data/addin-xml-strings.cs:156 ../data/addin-xml-strings.cs:166
+#: ../data/addin-xml-strings.cs:171 ../data/addin-xml-strings.cs:176
+#: ../data/addin-xml-strings.cs:185 ../data/addin-xml-strings.cs:214
msgid "Utilities"
msgstr "实用工具"
#. ../src/Extensions/Banshee.Bpm/Banshee.Bpm.addin.xml
-#: ../data/addin-xml-strings.cs:90
+#: ../data/addin-xml-strings.cs:95
msgid "BPM Detection"
msgstr "BPM 探测"
-#: ../data/addin-xml-strings.cs:91
+#: ../data/addin-xml-strings.cs:96
msgid "Detect the beats per minute (BPM) of your music."
-msgstr "探测您音乐的每分钟拍数(BPM)"
+msgstr "探测您音乐的每分钟拍数(BPM)。"
#. ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt.addin.xml
-#: ../data/addin-xml-strings.cs:95
+#: ../data/addin-xml-strings.cs:100
msgid "Cover Art Fetching"
msgstr "封面图片获取中"
-#: ../data/addin-xml-strings.cs:96
+#: ../data/addin-xml-strings.cs:101
msgid "Fetch cover art for all items in your library."
msgstr "为您库中的所有项目获取封面图片。"
#. ../src/Extensions/Banshee.Daap/Banshee.Daap.addin.xml
-#: ../data/addin-xml-strings.cs:100
+#: ../data/addin-xml-strings.cs:105
msgid "DAAP Sharing"
msgstr "DAAP 分享"
-#: ../data/addin-xml-strings.cs:101
+#: ../data/addin-xml-strings.cs:106
msgid "Browse and listen to music shared over your local network."
msgstr "浏览并收听您本地网络上共享的音乐。"
#. ../src/Extensions/Banshee.Emusic/Banshee.Emusic.addin.xml
-#: ../data/addin-xml-strings.cs:105
+#: ../data/addin-xml-strings.cs:110
msgid "eMusic Import"
msgstr "eMusic 导入"
-#: ../data/addin-xml-strings.cs:106
+#: ../data/addin-xml-strings.cs:111
msgid "Download and import music purchased from eMusic"
msgstr "下载并导入从 eMusic 处购买的音乐"
#. ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue.addin.xml
-#: ../data/addin-xml-strings.cs:110
+#: ../data/addin-xml-strings.cs:115
msgid "File System Preview Queue"
msgstr "文件系统预览队列"
-#: ../data/addin-xml-strings.cs:111
+#: ../data/addin-xml-strings.cs:116
msgid "Preview files without importing to your library."
msgstr "预览文件而不用导入到您的库中。"
#. ../src/Extensions/Banshee.Fixup/Banshee.Fixup.addin.xml
-#: ../data/addin-xml-strings.cs:115
+#: ../data/addin-xml-strings.cs:120
msgid "Metadata Fixup"
-msgstr "元数据修复"
+msgstr "修复元数据"
-#: ../data/addin-xml-strings.cs:116
+#: ../data/addin-xml-strings.cs:121
msgid "Fix broken and missing metadata using bulk operations"
msgstr "使用块操作来修复损坏和缺失的元数据"
#. ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive.addin.xml
-#: ../data/addin-xml-strings.cs:120
+#: ../data/addin-xml-strings.cs:125
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeSource.cs:58
msgid "Internet Archive"
-msgstr "互联网档案馆"
+msgstr "互联网仓库"
-#: ../data/addin-xml-strings.cs:121
+#: ../data/addin-xml-strings.cs:126
msgid "Browse and search the Internet Archive's vast media collection."
-msgstr "浏览和搜索互联网档案馆那巨大的媒体收藏。"
+msgstr "浏览和搜索互联网仓库那巨大的媒体收藏。"
#. ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio.addin.xml
-#: ../data/addin-xml-strings.cs:125
+#: ../data/addin-xml-strings.cs:130
msgid "Internet Radio"
msgstr "互联网广播"
-#: ../data/addin-xml-strings.cs:126
+#: ../data/addin-xml-strings.cs:131
msgid "Listen to and organize Internet Radio stations."
msgstr "收听并组织互联网广播电台"
#. ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.addin.xml
-#: ../data/addin-xml-strings.cs:130
+#: ../data/addin-xml-strings.cs:135
msgid "Last.fm Scrobbling"
msgstr "Last.fm Scrobbling"
-#: ../data/addin-xml-strings.cs:131
+#: ../data/addin-xml-strings.cs:136
msgid "Last.fm scrobbling and context pane recommendations."
msgstr "Last.fm scrobbling 和关联窗格推荐"
#. ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming.addin.xml
-#: ../data/addin-xml-strings.cs:135
+#: ../data/addin-xml-strings.cs:140
msgid "Last.fm Radio"
msgstr "Last.fm 电台"
-#: ../data/addin-xml-strings.cs:136
+#: ../data/addin-xml-strings.cs:141
msgid "Last.fm streaming radio for paid subscribers."
msgstr "付费订阅用户的 Last.fm 流电台。"
#. ../src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher.addin.xml
-#: ../data/addin-xml-strings.cs:140
+#: ../data/addin-xml-strings.cs:145
msgid "Library Watcher"
msgstr "库监视器"
-#: ../data/addin-xml-strings.cs:141
+#: ../data/addin-xml-strings.cs:146
msgid "Automatically update music and video libraries"
msgstr "自动更新音乐和视频库"
#. ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo.addin.xml
-#: ../data/addin-xml-strings.cs:145
+#: ../data/addin-xml-strings.cs:150
msgid "MeeGo Support"
msgstr "MeeGo 支持"
-#: ../data/addin-xml-strings.cs:146
+#: ../data/addin-xml-strings.cs:151
msgid "Provides MeeGo integration, including a custom media panel."
msgstr "提供 MeeGo 集成，包括一个自定义的媒体面板。"
#. ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode.addin.xml
-#: ../data/addin-xml-strings.cs:149
+#: ../data/addin-xml-strings.cs:154
msgid "Mini Mode"
msgstr "迷你模式"
-#: ../data/addin-xml-strings.cs:150
+#: ../data/addin-xml-strings.cs:155
msgid ""
"Control Banshee through a small window with only playback controls and track "
"information."
msgstr "通过一个仅有回放控制和曲目信息的小窗口控制 Banshee。"
#. ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide.addin.xml
-#: ../data/addin-xml-strings.cs:154
+#: ../data/addin-xml-strings.cs:159
msgid "Miro Guide Podcast Directory"
msgstr "Miro Guide Podcast 目录"
-#: ../data/addin-xml-strings.cs:155
+#: ../data/addin-xml-strings.cs:160
msgid "Browse and subscribe to thousands of audio and video podcasts."
msgstr "浏览和订阅成千上万的音频和视频博客"
+#. ../src/Extensions/Banshee.Mpris/Banshee.Mpris.addin.xml
+#: ../data/addin-xml-strings.cs:164
+msgid "MPRIS D-Bus interface"
+msgstr "MPRIS D-Bus 接口"
+
+#: ../data/addin-xml-strings.cs:165
+msgid "Control Banshee using the MPRIS D-Bus interface."
+msgstr "通过 MPRIS D-Bus 接口控制 Banshee。"
+
#. ../src/Extensions/Banshee.MultimediaKeys/Banshee.MultimediaKeys.addin.xml
-#: ../data/addin-xml-strings.cs:159
+#: ../data/addin-xml-strings.cs:169
msgid "Multimedia Keys"
msgstr "多媒体键"
-#: ../data/addin-xml-strings.cs:160
+#: ../data/addin-xml-strings.cs:170
msgid "Control playback via the multimedia keys on your keyboard."
msgstr "通过您键盘的多媒体键控制回放。"
#. ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.addin.xml
-#: ../data/addin-xml-strings.cs:164
+#: ../data/addin-xml-strings.cs:174
msgid "Notification Area Icon"
msgstr "通知区域图标"
-#: ../data/addin-xml-strings.cs:165
+#: ../data/addin-xml-strings.cs:175
msgid "Display an icon in the notification area for controlling Banshee."
msgstr "在通知区域显示一个图标以控制 Banshee。"
#. ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying.addin.xml
-#: ../data/addin-xml-strings.cs:169
-#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:164
+#: ../data/addin-xml-strings.cs:179
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:168
#: ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs:50
msgid "Now Playing"
msgstr "现在播放"
-#: ../data/addin-xml-strings.cs:170
+#: ../data/addin-xml-strings.cs:180
msgid ""
"Provides a source that displays embedded video and provides fullscreen video "
"playback and controls."
msgstr "提供一个显示嵌入视频和提供全屏视频播放及控制的源。"
#. ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration.addin.xml
-#: ../data/addin-xml-strings.cs:173
+#: ../data/addin-xml-strings.cs:183
msgid "Importers for Amarok, Rhythmbox and iTunes"
msgstr "Amarok、Rhythmbox 和 iTunes 导入器"
-#: ../data/addin-xml-strings.cs:174
+#: ../data/addin-xml-strings.cs:184
msgid "Import your library from Amarok, Rhythmbox or iTunes."
msgstr "从 Amarok、Rhythmbox 或 iTunes 导入您的库。"
#. ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue.addin.xml
-#: ../data/addin-xml-strings.cs:178
+#: ../data/addin-xml-strings.cs:188
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:58
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:79
msgid "Play Queue"
msgstr "播放队列"
-#: ../data/addin-xml-strings.cs:179
+#: ../data/addin-xml-strings.cs:189
msgid "Queue tracks in an ad-hoc playlist, or let the Auto DJ take over."
msgstr "以一个标准播放清单排队曲目，或让自动 DJ 接管。"
#. ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.addin.xml
-#: ../data/addin-xml-strings.cs:183
+#: ../data/addin-xml-strings.cs:193
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:193
#: ../src/Dap/Banshee.Dap/Banshee.Dap/PodcastGroupSource.cs:38
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:107
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:99
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:210
msgid "Podcasts"
msgstr "播客"
-#: ../data/addin-xml-strings.cs:184
+#: ../data/addin-xml-strings.cs:194
msgid "Subscribe to podcasts and stream or download episodes."
msgstr "订阅博客，流媒体或下载剧集。"
#. ../src/Extensions/Banshee.RemoteAudio/Banshee.RemoteAudio.addin.xml
-#: ../data/addin-xml-strings.cs:188
+#: ../data/addin-xml-strings.cs:198
msgid "Remote Audio"
msgstr "远端音频"
-#: ../data/addin-xml-strings.cs:189
+#: ../data/addin-xml-strings.cs:199
msgid "Provides support for remote speakers like the Airport Express"
msgstr "提供对于像 Airport Express 之类的遥控扬声器的支持"
#. ../src/Extensions/Banshee.Sample/Banshee.Sample.addin.xml
-#: ../data/addin-xml-strings.cs:192
+#: ../data/addin-xml-strings.cs:202
#: ../src/Extensions/Banshee.Sample/Banshee.Sample/SampleSource.cs:40
msgid "Sample"
msgstr "样本"
-#: ../data/addin-xml-strings.cs:193
+#: ../data/addin-xml-strings.cs:203
msgid "A sample source useful to developers."
msgstr "有助于开发者的例子源"
-#: ../data/addin-xml-strings.cs:194
+#: ../data/addin-xml-strings.cs:204
msgid "Sources"
msgstr "来源"
#. ../src/Extensions/Banshee.SqlDebugConsole/Banshee.SqlDebugConsole.addin.xml
-#: ../data/addin-xml-strings.cs:197
+#: ../data/addin-xml-strings.cs:207
msgid "SQL Debug Console"
msgstr "SQL 调试终端"
-#: ../data/addin-xml-strings.cs:198
+#: ../data/addin-xml-strings.cs:208
msgid "Provides a UI for monitoring Banshee's SQL usage, and running queries."
msgstr "为监控 Banshee 的 SQL 使用和进行查询提供一个用户界面"
-#: ../data/addin-xml-strings.cs:199
+#: ../data/addin-xml-strings.cs:209
msgid "Debug"
msgstr "调试"
#. ../src/Extensions/Banshee.Torrent/Banshee.Torrent.addin.xml
-#: ../data/addin-xml-strings.cs:202
+#: ../data/addin-xml-strings.cs:212
msgid "Torrent Downloader"
msgstr "Torrent 下载器"
-#: ../data/addin-xml-strings.cs:203
+#: ../data/addin-xml-strings.cs:213
msgid "Support downloading BitTorrent files from podcasts."
msgstr "支持从博客下载 BitTorrent 文件"
#. ../src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia.addin.xml
-#: ../data/addin-xml-strings.cs:207
+#: ../data/addin-xml-strings.cs:217
#: ../src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia/ContextPage.cs:44
msgid "Wikipedia"
msgstr "维基百科"
-#: ../data/addin-xml-strings.cs:208
+#: ../data/addin-xml-strings.cs:218
msgid "View artist information from Wikipedia in the context pane."
msgstr "在关联窗格中查看从维基百科获得的艺人信息。"
-#: ../data/addin-xml-strings.cs:209 ../data/addin-xml-strings.cs:214
+#: ../data/addin-xml-strings.cs:219 ../data/addin-xml-strings.cs:224
msgid "Context Pane"
msgstr "关联窗格"
#. ../src/Extensions/Banshee.YouTube/Banshee.YouTube.addin.xml
-#: ../data/addin-xml-strings.cs:212
+#: ../data/addin-xml-strings.cs:222
#: ../src/Extensions/Banshee.YouTube/Banshee.YouTube/ContextPage.cs:44
msgid "YouTube"
msgstr "YouTube"
-#: ../data/addin-xml-strings.cs:213
+#: ../data/addin-xml-strings.cs:223
msgid "Show related YouTube videos in the context pane"
msgstr "在关联窗格中显示相关的 YouTube 视频"
@@ -468,7 +488,7 @@ msgid "AAC (Novell Encoder)"
msgstr "AAC (Novell 编码器)"
#: ../data/audio-profiles/aac-novell.xml.in.h:3
-#: ../data/audio-profiles/mp3-lame.xml.in.h:4
+#: ../data/audio-profiles/mp3-lame.xml.in.h:3
#: ../data/audio-profiles/mp3-xing.xml.in.h:2
#: ../data/audio-profiles/wavpack.xml.in.h:3
#: ../data/audio-profiles/wma.xml.in.h:4
@@ -536,61 +556,34 @@ msgstr ""
"一个有版权，较老但也比较流行的有损音频格式，在低比特率下产生的文件较大。"
#: ../data/audio-profiles/mp3-lame.xml.in.h:2
-msgid "Average Bitrate"
-msgstr "平均比特率"
-
-#: ../data/audio-profiles/mp3-lame.xml.in.h:3
#: ../data/audio-profiles/vorbis.xml.in.h:2
#: ../data/audio-profiles/wavpack.xml.in.h:2
#: ../data/audio-profiles/wma.xml.in.h:3
msgid "Best"
msgstr "最好"
-#: ../data/audio-profiles/mp3-lame.xml.in.h:5
+#: ../data/audio-profiles/mp3-lame.xml.in.h:4
msgid "Constant Bitrate"
msgstr "固定比特率"
-#: ../data/audio-profiles/mp3-lame.xml.in.h:6
-msgid "Extreme"
-msgstr "极好"
-
-#: ../data/audio-profiles/mp3-lame.xml.in.h:7
-msgid "Insane"
-msgstr "疯狂"
-
-#: ../data/audio-profiles/mp3-lame.xml.in.h:8
-msgid "LAME Preset"
-msgstr "LAME 预设"
+#: ../data/audio-profiles/mp3-lame.xml.in.h:5
+#| msgid "Syncing iPod"
+msgid "Encoding Mode"
+msgstr "编码模式"
-#: ../data/audio-profiles/mp3-lame.xml.in.h:9
+#: ../data/audio-profiles/mp3-lame.xml.in.h:6
msgid "MP3 (LAME Encoder)"
msgstr "MP3 (LAME 编码器)"
-#: ../data/audio-profiles/mp3-lame.xml.in.h:10
-msgid "Medium"
-msgstr "中等"
-
-#: ../data/audio-profiles/mp3-lame.xml.in.h:11
-msgid "Preset"
-msgstr "预设"
-
-#: ../data/audio-profiles/mp3-lame.xml.in.h:12
-msgid "Standard"
-msgstr "标准"
-
-#: ../data/audio-profiles/mp3-lame.xml.in.h:13
-msgid "VBR Mode"
-msgstr "VBR 模式"
-
-#: ../data/audio-profiles/mp3-lame.xml.in.h:14
+#: ../data/audio-profiles/mp3-lame.xml.in.h:7
msgid "VBR Quality"
msgstr "VBR 质量"
-#: ../data/audio-profiles/mp3-lame.xml.in.h:15
+#: ../data/audio-profiles/mp3-lame.xml.in.h:8
msgid "Variable Bitrate"
msgstr "可变比特率"
-#: ../data/audio-profiles/mp3-lame.xml.in.h:16
+#: ../data/audio-profiles/mp3-lame.xml.in.h:9
#: ../data/audio-profiles/vorbis.xml.in.h:5
#: ../data/audio-profiles/wavpack.xml.in.h:15
#: ../data/audio-profiles/wma.xml.in.h:7
@@ -697,14 +690,14 @@ msgstr "Windows Media Audio"
#: ../data/desktop-files/common.desktop.in.h:1
#: ../src/Clients/Muinshee/Muinshee/PlayerInterface.cs:76
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:95
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:107
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BaseClientWindow.cs:206
#: ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode/MiniModeWindow.cs:60
msgid "Banshee Media Player"
msgstr "Banshee 媒体播放器"
#: ../data/desktop-files/common.desktop.in.h:2
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:192
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:193
msgid "Media Player"
msgstr "媒体播放器"
@@ -721,8 +714,8 @@ msgid "Could not create filesrc element"
msgstr "无法创建“filesrc“元素"
#: ../libbanshee/banshee-bpmdetector.c:214
-msgid "Could not create decodebin plugin"
-msgstr "无法创建“decodebin”插件"
+msgid "Could not create decodebin2 plugin"
+msgstr "无法创建“decodebin2”插件"
#: ../libbanshee/banshee-bpmdetector.c:220
msgid "Could not create audioconvert plugin"
@@ -762,8 +755,8 @@ msgid "Could not create source element"
msgstr "无法创建源元素"
#: ../libbanshee/banshee-transcoder.c:246
-msgid "Could not create 'decodebin' plugin"
-msgstr "无法创建“decodebin”插件"
+msgid "Could not create 'decodebin2' plugin"
+msgstr "无法创建“decodebin2”插件"
#: ../libbanshee/banshee-transcoder.c:252
msgid "Could not create sink element"
@@ -797,11 +790,11 @@ msgstr "写入光盘..."
msgid "Write selected tracks to an audio CD"
msgstr "将选中曲目写入音频光盘"
-#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:104
+#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:105
msgid "Could not write CD"
msgstr "无法写入光盘"
-#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:105
+#: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:106
msgid "Brasero could not be started"
msgstr "无法打开 Brasero "
@@ -822,7 +815,7 @@ msgid "Could not create BPM detection driver."
msgstr "无法创建 BPM 检测驱动"
#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:82
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:766
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:812
msgid "Enable _gapless playback"
msgstr "启用无缝播放(_g)"
@@ -833,25 +826,25 @@ msgid ""
msgstr "消除曲目变化时的小的回放空白。有助于概念唱片和古典音乐。"
#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:150
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:187
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:192
msgid "Could not initialize GStreamer library"
msgstr "无法初始化 GStreamer 库"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:430
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:435
msgid "Unknown Error"
msgstr "未知错误"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:760
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:806
msgid "_Enable ReplayGain correction"
msgstr "启用回放增益修正(_E)"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:761
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:807
msgid ""
"For tracks that have ReplayGain data, automatically scale (normalize) "
"playback volume"
msgstr "对于有回放增益数据的曲目，自动调节(正常化)回放音量。"
-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:767
+#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:813
msgid ""
"Eliminate the small playback gap on track change. Useful for concept albums "
"and classical music."
@@ -861,204 +854,204 @@ msgstr "消除曲目变化时的小的回放空白。多用于概念唱片和古
msgid "Could not create transcoder"
msgstr "无法创建转码器"
-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:139
+#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:229
msgid "GStreamer# 0.10"
msgstr "GStreamer# 0.10"
#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs:91
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:131
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:132
msgid "_Close"
msgstr "关闭(_C)"
#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs:92
-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:224
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:251
#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:79
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:132
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:133
msgid "Close"
msgstr "关闭"
-#: ../src/Clients/Booter/Booter/Entry.cs:148
+#: ../src/Clients/Booter/Booter/Entry.cs:152
msgid "Help Options"
msgstr "帮助选项"
-#: ../src/Clients/Booter/Booter/Entry.cs:149
+#: ../src/Clients/Booter/Booter/Entry.cs:153
msgid "Show this help"
msgstr "显示本帮助"
-#: ../src/Clients/Booter/Booter/Entry.cs:150
+#: ../src/Clients/Booter/Booter/Entry.cs:154
msgid "Show options for controlling playback"
msgstr "显示控制播放的选项"
-#: ../src/Clients/Booter/Booter/Entry.cs:151
+#: ../src/Clients/Booter/Booter/Entry.cs:155
msgid "Show options for querying the playing track"
msgstr "显示查询播放曲目的选项"
-#: ../src/Clients/Booter/Booter/Entry.cs:152
+#: ../src/Clients/Booter/Booter/Entry.cs:156
msgid "Show options for querying the playing engine"
msgstr "显示查询播放引擎的选项"
-#: ../src/Clients/Booter/Booter/Entry.cs:153
+#: ../src/Clients/Booter/Booter/Entry.cs:157
msgid "Show options for the user interface"
msgstr "显示用户界面的选项"
-#: ../src/Clients/Booter/Booter/Entry.cs:154
+#: ../src/Clients/Booter/Booter/Entry.cs:158
msgid "Show options for developers and debugging"
msgstr "显示开发及调试选项"
-#: ../src/Clients/Booter/Booter/Entry.cs:155
+#: ../src/Clients/Booter/Booter/Entry.cs:159
msgid "Show all option groups"
msgstr "显示所有选项组"
-#: ../src/Clients/Booter/Booter/Entry.cs:156
+#: ../src/Clients/Booter/Booter/Entry.cs:160
msgid "Show version information"
msgstr "显示版本信息"
-#: ../src/Clients/Booter/Booter/Entry.cs:159
+#: ../src/Clients/Booter/Booter/Entry.cs:163
msgid "Playback Control Options"
msgstr "播放控制选项"
-#: ../src/Clients/Booter/Booter/Entry.cs:160
+#: ../src/Clients/Booter/Booter/Entry.cs:164
msgid ""
"Play the next track, optionally restarting if the 'restart' value is set"
msgstr "播放下一首曲目，可选重新开始如果设置有“重新开始”值"
-#: ../src/Clients/Booter/Booter/Entry.cs:161
+#: ../src/Clients/Booter/Booter/Entry.cs:165
msgid ""
"Play the previous track, optionally restarting if the 'restart value is set"
msgstr "播放上一首曲目，可选重新开始如果设置有“重新开始”值"
-#: ../src/Clients/Booter/Booter/Entry.cs:162
+#: ../src/Clients/Booter/Booter/Entry.cs:166
msgid ""
"If the current song has been played longer than 4 seconds then restart it, "
"otherwise the same as --previous"
msgstr "如果当前歌曲已经播放超过4秒则重新开始，否则返回上一首。"
-#: ../src/Clients/Booter/Booter/Entry.cs:163
+#: ../src/Clients/Booter/Booter/Entry.cs:167
msgid "Automatically start playing any tracks enqueued on the command line"
msgstr "自动开始播放命令行中排队的任何曲目"
-#: ../src/Clients/Booter/Booter/Entry.cs:164
+#: ../src/Clients/Booter/Booter/Entry.cs:168
msgid "Start playback"
msgstr "开始播放"
-#: ../src/Clients/Booter/Booter/Entry.cs:165
+#: ../src/Clients/Booter/Booter/Entry.cs:169
msgid "Pause playback"
msgstr "暂停回放"
-#: ../src/Clients/Booter/Booter/Entry.cs:166
+#: ../src/Clients/Booter/Booter/Entry.cs:170
msgid "Toggle playback"
msgstr "切换播放"
-#: ../src/Clients/Booter/Booter/Entry.cs:167
+#: ../src/Clients/Booter/Booter/Entry.cs:171
msgid "Completely stop playback"
msgstr "完全停止播放"
-#: ../src/Clients/Booter/Booter/Entry.cs:169
+#: ../src/Clients/Booter/Booter/Entry.cs:173
msgid ""
"Enable or disable playback stopping after the currently playing track (value "
"should be either 'true' or 'false')"
msgstr "启用或禁用在当前播放的曲目后播放停止(应当设置为“真”或“假”值)"
-#: ../src/Clients/Booter/Booter/Entry.cs:170
+#: ../src/Clients/Booter/Booter/Entry.cs:174
msgid "Set the playback volume (0-100), prefix with +/- for relative values"
msgstr "设置播放音量(0-100)，前加 +/- 作为相对值。"
-#: ../src/Clients/Booter/Booter/Entry.cs:171
+#: ../src/Clients/Booter/Booter/Entry.cs:175
msgid "Seek to a specific point (seconds, float)"
msgstr "搜索到指定位置(秒，浮标)"
-#: ../src/Clients/Booter/Booter/Entry.cs:172
+#: ../src/Clients/Booter/Booter/Entry.cs:176
msgid "Set the currently played track's rating (0 to 5)"
msgstr "设置当前播放曲目的评级(0 至 5)"
-#: ../src/Clients/Booter/Booter/Entry.cs:175
+#: ../src/Clients/Booter/Booter/Entry.cs:179
msgid "Player Engine Query Options"
msgstr "播放器引擎查询选项"
-#: ../src/Clients/Booter/Booter/Entry.cs:176
+#: ../src/Clients/Booter/Booter/Entry.cs:180
msgid "Current player state"
msgstr "当前播放器状态"
-#: ../src/Clients/Booter/Booter/Entry.cs:177
+#: ../src/Clients/Booter/Booter/Entry.cs:181
msgid "Last player state"
msgstr "上次播放状态"
-#: ../src/Clients/Booter/Booter/Entry.cs:178
+#: ../src/Clients/Booter/Booter/Entry.cs:182
msgid "Query whether the player can be paused"
msgstr "询问播放器是否能被暂停"
-#: ../src/Clients/Booter/Booter/Entry.cs:179
+#: ../src/Clients/Booter/Booter/Entry.cs:183
msgid "Query whether the player can seek"
msgstr "询问播放器是否能搜索"
-#: ../src/Clients/Booter/Booter/Entry.cs:180
+#: ../src/Clients/Booter/Booter/Entry.cs:184
msgid "Player volume"
msgstr "播放器音量"
-#: ../src/Clients/Booter/Booter/Entry.cs:181
+#: ../src/Clients/Booter/Booter/Entry.cs:185
msgid "Player position in currently playing track"
msgstr "当前播放的曲目的播放器位置"
-#: ../src/Clients/Booter/Booter/Entry.cs:184
+#: ../src/Clients/Booter/Booter/Entry.cs:188
msgid "Playing Track Metadata Query Options"
msgstr "播放曲目元数据询问选项"
-#: ../src/Clients/Booter/Booter/Entry.cs:185
+#: ../src/Clients/Booter/Booter/Entry.cs:189
msgid "URI"
msgstr "URI"
-#: ../src/Clients/Booter/Booter/Entry.cs:186
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:161
+#: ../src/Clients/Booter/Booter/Entry.cs:190
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:138
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:89
msgid "Artist Name"
msgstr "艺人姓名"
-#: ../src/Clients/Booter/Booter/Entry.cs:187
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:163
+#: ../src/Clients/Booter/Booter/Entry.cs:191
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:140
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:90
msgid "Album Title"
msgstr "专辑标题"
-#: ../src/Clients/Booter/Booter/Entry.cs:188
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:160
+#: ../src/Clients/Booter/Booter/Entry.cs:192
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:137
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:88
msgid "Track Title"
msgstr "曲目标题"
-#: ../src/Clients/Booter/Booter/Entry.cs:189
+#: ../src/Clients/Booter/Booter/Entry.cs:193
msgid "Duration"
msgstr "时长"
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:190
+#: ../src/Clients/Booter/Booter/Entry.cs:194
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:117
msgid "Track Number"
msgstr "曲目编号"
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:191
+#: ../src/Clients/Booter/Booter/Entry.cs:195
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:126
msgid "Track Count"
msgstr "曲目计数"
-#: ../src/Clients/Booter/Booter/Entry.cs:192
+#: ../src/Clients/Booter/Booter/Entry.cs:196
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:149
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:113
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:114
msgid "Disc Number"
-msgstr "盘片编号"
+msgstr "唱片编号"
-#: ../src/Clients/Booter/Booter/Entry.cs:193
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:165
+#: ../src/Clients/Booter/Booter/Entry.cs:197
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:142
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:113
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:177
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:77
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:78
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:132
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:77
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:92
msgid "Year"
msgstr "年代"
-#: ../src/Clients/Booter/Booter/Entry.cs:194
+#: ../src/Clients/Booter/Booter/Entry.cs:198
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:230
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:131
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:60
@@ -1066,78 +1059,78 @@ msgstr "年代"
msgid "Rating"
msgstr "评级"
-#: ../src/Clients/Booter/Booter/Entry.cs:195
+#: ../src/Clients/Booter/Booter/Entry.cs:199
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:322
msgid "Score"
msgstr "得分"
#. Translators: noun
-#: ../src/Clients/Booter/Booter/Entry.cs:196
+#: ../src/Clients/Booter/Booter/Entry.cs:200
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:143
msgid "Bit Rate"
msgstr "比特率"
-#: ../src/Clients/Booter/Booter/Entry.cs:199
+#: ../src/Clients/Booter/Booter/Entry.cs:203
msgid "User Interface Options"
msgstr "用户界面选项"
-#: ../src/Clients/Booter/Booter/Entry.cs:200
+#: ../src/Clients/Booter/Booter/Entry.cs:204
msgid "Present the user interface on the active workspace"
msgstr "在当前工作区域提供用户界面"
-#: ../src/Clients/Booter/Booter/Entry.cs:201
+#: ../src/Clients/Booter/Booter/Entry.cs:205
msgid "Enter the full-screen mode"
msgstr "进入全屏模式"
-#: ../src/Clients/Booter/Booter/Entry.cs:202
+#: ../src/Clients/Booter/Booter/Entry.cs:206
msgid "Hide the user interface"
msgstr "隐藏用户界面"
-#: ../src/Clients/Booter/Booter/Entry.cs:203
+#: ../src/Clients/Booter/Booter/Entry.cs:207
msgid "Do not present the user interface, regardless of any other options"
msgstr "不提供用户界面，无论任何其他选项"
-#: ../src/Clients/Booter/Booter/Entry.cs:204
+#: ../src/Clients/Booter/Booter/Entry.cs:208
msgid "Present the import media dialog box"
msgstr "显示导入媒体对话框"
-#: ../src/Clients/Booter/Booter/Entry.cs:205
+#: ../src/Clients/Booter/Booter/Entry.cs:209
msgid "Present the about dialog"
msgstr "提供关于对话框"
-#: ../src/Clients/Booter/Booter/Entry.cs:206
+#: ../src/Clients/Booter/Booter/Entry.cs:210
msgid "Present the open location dialog"
msgstr "显示打开位置对话框"
-#: ../src/Clients/Booter/Booter/Entry.cs:207
+#: ../src/Clients/Booter/Booter/Entry.cs:211
msgid "Present the preferences dialog"
msgstr "显示首选项对话框"
-#: ../src/Clients/Booter/Booter/Entry.cs:210
+#: ../src/Clients/Booter/Booter/Entry.cs:214
msgid "Debugging and Development Options"
msgstr "调试及开发者选项"
-#: ../src/Clients/Booter/Booter/Entry.cs:211
+#: ../src/Clients/Booter/Booter/Entry.cs:215
msgid "Enable general debugging features"
msgstr "启用通用调试特性"
-#: ../src/Clients/Booter/Booter/Entry.cs:212
+#: ../src/Clients/Booter/Booter/Entry.cs:216
msgid "Enable debugging output of SQL queries"
msgstr "启用 SQL 查询 调试输出"
-#: ../src/Clients/Booter/Booter/Entry.cs:213
+#: ../src/Clients/Booter/Booter/Entry.cs:217
msgid "Enable debugging output of Mono.Addins"
msgstr "启用 Mono.Addins 调试输出"
-#: ../src/Clients/Booter/Booter/Entry.cs:214
+#: ../src/Clients/Booter/Booter/Entry.cs:218
msgid "Specify an alternate database to use"
msgstr "指定使用另外的数据库"
-#: ../src/Clients/Booter/Booter/Entry.cs:215
+#: ../src/Clients/Booter/Booter/Entry.cs:219
msgid "Specify an alternate key, default is /apps/banshee-1/"
msgstr "指定使用另外可选键值，默认为 /apps/banshee-1/"
-#: ../src/Clients/Booter/Booter/Entry.cs:216
+#: ../src/Clients/Booter/Booter/Entry.cs:220
msgid ""
"Optimize instance for running uninstalled; most notably, this will create an "
"alternate Mono.Addins database in the working directory"
@@ -1145,16 +1138,16 @@ msgstr ""
"为运行未安装的进程优化；最可见的是，这将在当前的工作目录里创建一个另外的 "
"Mono.Addins 数据库。"
-#: ../src/Clients/Booter/Booter/Entry.cs:218
+#: ../src/Clients/Booter/Booter/Entry.cs:222
msgid "Disable DBus support completely"
msgstr "完全禁止 DBus 支持"
-#: ../src/Clients/Booter/Booter/Entry.cs:220
+#: ../src/Clients/Booter/Booter/Entry.cs:224
#, csharp-format
msgid "Skip loading a custom gtkrc file ({0}) if it exists"
msgstr "跳过载入自定义的 gtkrc 文件 ({0}) ，如果存在"
-#: ../src/Clients/Booter/Booter/Entry.cs:251
+#: ../src/Clients/Booter/Booter/Entry.cs:255
#, csharp-format
msgid "The following help arguments are invalid: {0}"
msgstr "下列帮助参数无效：{0}"
@@ -1168,8 +1161,9 @@ msgid "En_queue"
msgstr "队列(_Q)"
#: ../src/Clients/Muinshee/Muinshee/BaseDialog.cs:86
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:66
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:196
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:73
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:210
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:126
msgid "_Play"
msgstr "播放(_P)"
@@ -1198,20 +1192,25 @@ msgstr "剩余 {0}"
msgid "Play Song"
msgstr "播放曲目"
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:159
+#. Translators: this is a verb (command), not a noun (things)
+#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:465
+msgid "Search"
+msgstr "搜索"
+
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:136
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:87
msgid "Artist, Album, or Title"
msgstr "艺人、专辑或标题"
#. Alias for %album_artist%
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:162
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:139
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:72
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:78
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:82
msgid "Album Artist"
msgstr "专辑艺人"
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:164
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:141
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:98
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:185
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:364
@@ -1220,17 +1219,11 @@ msgid "Genre"
msgstr "流派"
#. Translators: noun
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:166
+#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:143
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:214
msgid "Comment"
msgstr "评论"
-#. Translators: this is a verb (command), not a noun (things)
-#: ../src/Clients/Nereid/Nereid/ViewContainer.cs:187
-#, csharp-format
-msgid "Search"
-msgstr "搜索"
-
#: ../src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs:43
#: ../src/Core/Banshee.Core/Banshee.Collection/ArtistInfo.cs:37
#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdDiscModel.cs:100
@@ -1250,88 +1243,88 @@ msgstr "未知专辑"
msgid "Unknown Title"
msgstr "未知标题"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:186
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:191
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs:91
msgid "Various Artists"
msgstr "众艺人"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:342
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
msgid "Stream location not found"
msgstr "没有找到流位置"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:342
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:321
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:328
msgid "File not found"
msgstr "未找到文件"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:344
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:349
msgid "Codec for playing this media type not available"
msgstr "播放此类型媒体的解码器不可用"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:346
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:351
msgid "File protected by Digital Rights Management (DRM)"
msgstr "文件被数字版权管理系统保护(DRM)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:348
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:353
msgid "Unknown error"
msgstr "未知错误"
#. TODO turn this into a PrimarySource-owned delegate?
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:417
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:422
msgid "_Restart Podcast"
msgstr "重新开始播客(_R)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:418
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:423
msgid "_Restart Audiobook"
msgstr "重新开始有声读物(_R)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:419
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:424
msgid "_Restart Video"
msgstr "重新开始视频(_R)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:420
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:86
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:425
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:93
msgid "_Restart Song"
msgstr "重新开始曲目(_R)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:421
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:426
msgid "_Restart Item"
msgstr "重新开始项目(_R)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:437
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:442
msgid "_Jump to Playing Podcast"
msgstr "跳到当前播放播客(_J)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:438
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:443
msgid "_Jump to Playing Audiobook"
msgstr "跳到当前播放的有声读物(_J)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:439
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:444
msgid "_Jump to Playing Video"
msgstr "跳到当前播放视频(_J)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:440
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:82
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:445
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:89
msgid "_Jump to Playing Song"
msgstr "跳到当前播放曲目(_J)"
-#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:441
+#: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:446
msgid "_Jump to Playing Item"
msgstr "跳到当前播放项目(_J)(_J)"
#. Translators: This is used to generate bookmark names. {0} is track title, {1} is minutes
#. (possibly more than two digits) and {2} is seconds (between 00 and 60).
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/Bookmark.cs:173
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/Bookmark.cs:172
#, csharp-format
msgid "{0} ({1}:{2:00})"
msgstr "{0} ({1}:{2:00})"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs:70
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs:69
#, csharp-format
msgid "All Albums ({0})"
msgstr "所有专辑({0})"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistListModel.cs:69
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistListModel.cs:68
#, csharp-format
msgid "All Artists ({0})"
msgstr "全部艺人({0})"
@@ -1341,15 +1334,15 @@ msgstr "全部艺人({0})"
msgid "Value"
msgstr "值"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:50
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:49
msgid "Shuffle by A_lbum"
msgstr "根据专辑随机播放(_A)"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:51
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:50
msgid "by album"
msgstr "按专辑"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:52
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:51
msgid "Play all songs from an album, then randomly choose another album"
msgstr "从一专辑随机播放所有曲目，然后随机选择另外的专辑"
@@ -1365,27 +1358,27 @@ msgstr "按艺人"
msgid "Play all songs by an artist, then randomly choose another artist"
msgstr "根据艺人播放全部曲目，然后随机选择另外的艺人"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:36
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:38
msgid "Shuffle _Off"
msgstr "随机播放关闭(_O)"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:37
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:39
msgid "manually"
msgstr "手动"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:38
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:40
msgid "Do not shuffle playlist"
msgstr "不随机播放列表"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:46
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:45
msgid "Shuffle by _Rating"
msgstr "根据评级随机播放(_R)"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:47
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:46
msgid "by rating"
msgstr "按评级"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:48
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:47
msgid "Play songs randomly, prefer higher rated songs"
msgstr "从播放列表中随机播放，优先选择高评级曲目"
@@ -1401,42 +1394,42 @@ msgstr "按得分"
msgid "Play songs randomly, prefer higher scored songs"
msgstr "从播放列表中随机播放，优先选择高分曲目"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:47
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:46
msgid "Shuffle by _Song"
msgstr "根据曲目随机播放(_S)"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:48
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:47
msgid "by song"
msgstr "按曲目"
-#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:49
+#: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:48
msgid "Play songs randomly from the playlist"
msgstr "从播放列表中随机播放曲目"
-#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:132
+#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:138
msgid "Scanning for media"
msgstr "正在扫描介质"
-#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:182
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1375
+#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:188
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1384
msgid "Scanning..."
msgstr "正在扫描..."
-#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:198
+#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:204
#, csharp-format
msgid "Scanning ({0} files)..."
msgstr "正在扫描({0} 个文件) ..."
-#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:232
+#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:238
msgid "Importing Media"
msgstr "正在导入媒体"
-#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:239
+#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:245
#: ../src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs:119
msgid "The import process is currently running. Would you like to stop it?"
msgstr "导入过程正在运行，您打算停止它吗？"
-#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:245
+#: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:251
#: ../src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs:81
#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdRipper.cs:185
#, csharp-format
@@ -1448,16 +1441,16 @@ msgstr "导入共{1}个中的第{0}个"
msgid "Rescanning {0} of {1}"
msgstr "正在重新扫描 {1} 个中的第 {0} 个"
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:234
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:232
msgid "Upgrading your Banshee Database"
msgstr "正在更新您的 Banshee 数据库"
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:235
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:233
msgid ""
"Please wait while your old Banshee database is migrated to the new format."
msgstr "请等待您的旧 Banshee 数据库转换为新的格式。"
-#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1372
+#: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1381
msgid "Refreshing Metadata"
msgstr "正在刷新元数据"
@@ -1529,16 +1522,12 @@ msgstr "慢摇滚"
msgid "Techno"
msgstr "电音"
-#: ../src/Core/Banshee.Services/Banshee.Library/HomeDirectoryImportSource.cs:48
-msgid "Home Folder"
-msgstr "主目录"
-
#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:58
msgid "Remove From Library"
msgstr "从音乐库中删除"
#. Translators: {0} is the library name, eg 'Music Library' or 'Podcasts'
-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:65
+#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:122
#, csharp-format
msgid "{0} Folder"
msgstr "{0} 目录"
@@ -1568,7 +1557,7 @@ msgid "Album"
msgstr "专辑"
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:108
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:72
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:73
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:127
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:76
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:97
@@ -1576,124 +1565,146 @@ msgid "Title"
msgstr "标题"
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:119
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:83
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:84
msgid "Count"
msgstr "计数"
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:125
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:89
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:90
msgid "Number"
msgstr "编号"
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:131
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:95
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:96
msgid "Count (unsorted)"
msgstr "计数(未排序)"
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:137
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:101
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:102
msgid "Number (unsorted)"
msgstr "编号(未排序)"
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:143
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:108
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:107
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:108
msgid "Disc Count"
msgstr "光盘计数"
#: ../src/Core/Banshee.Services/Banshee.Library/MusicFileNamePattern.cs:155
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:206
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:119
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:120
msgid "Grouping"
msgstr "分组"
#. Catalog.GetString ("Music Library")
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:59
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/MusicGroupSource.cs:38
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:60
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/MusicGroupSource.cs:39
msgid "Music"
msgstr "音乐"
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:66
+msgid "Search your music"
+msgstr "搜索您的音乐"
+
#. Misc section
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:77
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:80
#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:65
msgid "Miscellaneous"
msgstr "杂项"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:80
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:83
msgid "_Sort an artist's albums by year, not title"
msgstr "根据年代而不是标题排序艺人专辑(_S)"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:107
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:85
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:93
+#, csharp-format
+msgid "{0} song"
+msgid_plural "{0} songs"
+msgstr[0] "{0} 首曲目"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:114
+msgid "Music Folder"
+msgstr "音乐目录"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:119
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:95
msgid "Favorites"
msgstr "我的最爱"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:108
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:120
msgid "Songs rated four and five stars"
msgstr "评级为4星和5星的曲目"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:112
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:124
msgid "Recent Favorites"
msgstr "最近的我的最爱"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:113
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:125
msgid "Songs listened to often in the past week"
msgstr "在过去一周中经常听的曲目"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:117
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:129
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:95
msgid "Recently Added"
msgstr "最近添加的"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:118
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:130
msgid "Songs imported within the last week"
msgstr "上周内导入的曲目"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:122
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:134
+msgid "Recently Played"
+msgstr "最近播放"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:135
+msgid "Recently played songs"
+msgstr "最近播放过的曲目"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:139
msgid "Unheard"
msgstr "未听过的"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:123
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:140
msgid "Songs that have not been played or skipped"
msgstr "未曾播放过或跳过的曲目"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:129
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:147
msgid "Neglected Favorites"
msgstr "忽略的我的最爱"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:130
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:148
msgid "Favorites not played in over two months"
msgstr "在过去两周内没有播放过的处于“我的最爱”分类的曲目"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:134
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:152
msgid "Least Favorite"
msgstr "最不喜欢"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:135
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:153
msgid "Songs rated one or two stars or that you have frequently skipped"
msgstr "评级为1星或2星，或者您经常跳过的曲目"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:139
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:157
msgid "700 MB of Favorites"
msgstr "我的最爱中的 700 MB"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:140
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:158
msgid "A data CD worth of favorite songs"
msgstr "包含我的最爱曲目的数据光盘"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:145
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:163
msgid "80 Minutes of Favorites"
msgstr "我的最爱中的 80 分钟曲目"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:146
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:164
msgid "An audio CD worth of favorite songs"
msgstr "包含我的最爱曲目的音频光盘"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:151
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:169
msgid "Unrated"
msgstr "未评级的"
-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:152
+#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:170
msgid "Songs that haven't been rated"
msgstr "未曾评级的曲目"
@@ -1712,19 +1723,33 @@ msgstr "正在从 {0} 导入"
msgid "Videos"
msgstr "视频"
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:64
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:48
+msgid "Search your videos"
+msgstr "搜索您的视频"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:65
msgid "Produced By"
msgstr "出品："
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:86
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:70
+#, csharp-format
+msgid "{0} video"
+msgid_plural "{0} videos"
+msgstr[0] "{0} 段视频"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:90
+msgid "Videos Folder"
+msgstr "视频目录"
+
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:96
msgid "Videos rated four and five stars"
msgstr "评级为4星或5星的视频"
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:90
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:100
msgid "Unwatched"
msgstr "未观看过的"
-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:91
+#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:101
msgid "Videos that haven't been played yet"
msgstr "还未曾播放过的视频"
@@ -1802,11 +1827,6 @@ msgstr "导入评级(_R)"
msgid "Import play _counts"
msgstr "导入播放计数(_C)"
-#. disabled by default
-#: ../src/Core/Banshee.Services/Banshee.Metrics/BansheeMetrics.cs:302
-msgid "Improve Banshee by sending anonymous usage data"
-msgstr "通过发送匿名使用数据以改进 Banshee "
-
#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:52
msgid "There is no available network connection"
msgstr "没有可用的网络连接"
@@ -1819,41 +1839,45 @@ msgstr "无法连接到 NetworkManager 或 Wicd"
msgid "An available, working network connection will be assumed"
msgstr "将假定有可用的网络连接"
-#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:157
+#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:159
msgid "_Disable features requiring Internet access"
msgstr "禁用需要互联网连接的特性(_D)"
-#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:158
+#: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:160
msgid ""
"Some features require a broadband Internet connection such as Last.fm or "
"cover art fetching"
msgstr "一些特性诸如 Last.fm 或封面图片获取需要宽带互联网连接。"
-#: ../src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:223
+#: ../src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:159
+msgid "Search this playlist"
+msgstr "在此播放列表中搜索"
+
+#: ../src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:228
msgid "The track's rating was set differently on the device and in Banshee"
msgstr "此曲目在设备上的评级和 Banshee 中的不同"
-#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:59
+#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:58
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:309
msgid "Playlist"
msgstr "播放列表"
-#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:134
+#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:133
msgid "Remove From Playlist"
msgstr "从播放列表中删除"
-#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:135
+#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:134
msgid "Delete Playlist"
msgstr "删除播放列表"
#. TODO generate name based on the track selection, or begin editing it
-#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:386
-#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:392
+#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:385
+#: ../src/Core/Banshee.Services/Banshee.Playlist/PlaylistSource.cs:391
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:91
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:375
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:494
-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:213
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:462
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:591
+#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214
msgid "New Playlist"
msgstr "新建播放列表"
@@ -1899,23 +1923,31 @@ msgstr "文件规则"
msgid "Co_py files to media folders when importing"
msgstr "导入时将文件复制到媒体目录(_P)"
+#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:69
+msgid "Improve Banshee by sending anonymous usage data"
+msgstr "通过发送匿名使用数据以改进 Banshee "
+
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:63
msgid "items"
msgstr "项目"
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:64
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:60
msgid "minutes"
msgstr "分钟"
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:65
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:61
msgid "hours"
msgstr "小时"
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:66
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs:63
msgid "MB"
msgstr "MB"
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:67
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs:64
msgid "GB"
msgstr "GB"
@@ -2317,7 +2349,7 @@ msgid "importedon"
msgstr "导入于"
#: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:315
-#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:66
+#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:65
msgid "Smart Playlist"
msgstr "智能播放列表"
@@ -2395,6 +2427,7 @@ msgstr "最最早添加的"
#. Translators: These are unique strings for playback errors. Please, no spaces. Blank ok.
#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:44
#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:46
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:146
#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs:97
msgid "None"
msgstr "无"
@@ -2447,11 +2480,11 @@ msgstr "drm"
#. Translators: These are unique strings for playback errors. Please, no spaces. Blank ok.
#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:64
#: ../src/Core/Banshee.Services/Banshee.Query/PlaybackErrorQueryValue.cs:66
-#: ../src/Core/Banshee.Services/Banshee.ServiceStack/Application.cs:327
+#: ../src/Core/Banshee.Services/Banshee.ServiceStack/Application.cs:354
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:208
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:210
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:212
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:380
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:389
msgid "Unknown"
msgstr "未知"
@@ -2459,26 +2492,26 @@ msgstr "未知"
msgid "unknown"
msgstr "未知"
-#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/Migrator.cs:79
+#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/Migrator.cs:78
msgid "Unable to Migrate Smart Playlists"
msgstr "无法导入智能播放列表"
-#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/Migrator.cs:80
+#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/Migrator.cs:79
#, csharp-format
msgid "Please file a bug with this error: {0}"
msgstr "请关于本次错误提交一个错误报告：{0}"
-#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:67
+#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:66
#: ../src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/Editor.cs:49
msgid "Edit Smart Playlist"
msgstr "编辑智能播放列表"
-#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:233
+#: ../src/Core/Banshee.Services/Banshee.SmartPlaylist/SmartPlaylistSource.cs:249
msgid "Delete Smart Playlist"
msgstr "删除智能播放列表"
#: ../src/Core/Banshee.Services/Banshee.Sources/DatabaseSource.cs:147
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:155
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:161
#, csharp-format
msgid "All Genres ({0})"
msgstr "所有流派 ({0})"
@@ -2519,7 +2552,7 @@ msgid "Close Error Report"
msgstr "关闭错误报告"
#: ../src/Core/Banshee.Services/Banshee.Sources/ErrorSource.cs:83
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:222
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:224
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ErrorListDialog.cs:46
msgid "Error"
msgstr "错误"
@@ -2555,12 +2588,12 @@ msgstr "目录层次(_R)"
msgid "File _name"
msgstr "文件名(_N)"
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:689
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:669
#, csharp-format
msgid "Adding {0} of {1} to {2}"
msgstr "正在添加 {1} 的 {0} 到 {2}"
-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:708
+#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:688
#, csharp-format
msgid "Deleting {0} of {1} From {2}"
msgstr "正在从 {2} 删除 {1} 的第 {0} "
@@ -2573,11 +2606,23 @@ msgstr "按大小升序排列"
msgid "Size Descending"
msgstr "按大小降序排列"
-#: ../src/Core/Banshee.Services/Banshee.Sources/Source.cs:765
+#: ../src/Core/Banshee.Services/Banshee.Sources/Source.cs:789
#, csharp-format
-msgid "{0:N0} item"
-msgid_plural "{0:N0} items"
-msgstr[0] "{0:N0} items"
+msgid "{0} item"
+msgid_plural "{0} items"
+msgstr[0] "{0} 项"
+
+#. TODO should add library sources here, but requires changing quite a few
+#. things that depend on being loaded before the music library is added.
+#. AddSource (music_library = new MusicLibrarySource (), true);
+#. AddSource (video_library = new VideoLibrarySource (), false);
+#: ../src/Core/Banshee.Services/Banshee.Sources/SourceManager.cs:84
+msgid "Libraries"
+msgstr "库"
+
+#: ../src/Core/Banshee.Services/Banshee.Sources/SourceManager.cs:85
+msgid "Online Media"
+msgstr "在线媒体"
#: ../src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs:82
#: ../src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs:91
@@ -2592,11 +2637,11 @@ msgstr "无法打开流媒体或播放列表"
msgid "Problem parsing playlist"
msgstr "解析播放列表出错"
-#: ../src/Core/Banshee.Services/Banshee.Web/Browser.cs:61
+#: ../src/Core/Banshee.Services/Banshee.Web/Browser.cs:67
msgid "Could not launch URL"
msgstr "无法打开 URL"
-#: ../src/Core/Banshee.Services/Banshee.Web/Browser.cs:62
+#: ../src/Core/Banshee.Services/Banshee.Web/Browser.cs:68
#, csharp-format
msgid ""
"{0} could not be opened: {1}\n"
@@ -2612,7 +2657,7 @@ msgid "Show:"
msgstr "显示："
#: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:51
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:84
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:83
msgid "All"
msgstr "所有"
@@ -2637,11 +2682,11 @@ msgstr "禁用专辑格"
msgid "Disable album grid and show the classic layout instead"
msgstr "禁用专辑格，使用经典布局"
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/BaseTrackListView.cs:77
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/BaseTrackListView.cs:76
msgid "Cannot Reorder While Sorted"
msgstr "排序时无法重新排序"
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/BaseTrackListView.cs:78
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/BaseTrackListView.cs:77
msgid ""
"To put the playlist in manual sort mode, click the currently sorted column "
"header until the sort arrow goes away."
@@ -2658,18 +2703,22 @@ msgstr ""
msgid "{0} of {1}"
msgstr "{0}/{1}"
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:220
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:222
msgid "Playing"
msgstr "正在播放"
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:221
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:223
msgid "Paused"
msgstr "暂停"
-#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:223
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:225
msgid "Protected"
msgstr "受保护的"
+#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs:226
+msgid "External Document"
+msgstr "外部文档"
+
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/CoverArtEditor.cs:80
msgid "Choose New Cover Art..."
msgstr "选择新的封面图片..."
@@ -2700,6 +2749,7 @@ msgid "{0} kbps"
msgstr "{0} kbps"
#: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/DefaultColumnController.cs:139
+#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerView.cs:123
#, csharp-format
msgid "{0} Hz"
msgstr "{0} Hz"
@@ -2725,6 +2775,25 @@ msgstr "等待回放开始..."
msgid "Loading..."
msgstr "载入中..."
+#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerView.cs:74
+msgid "Preamp"
+msgstr "预放大"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerView.cs:100
+#, csharp-format
+msgid "+{0} dB"
+msgstr "+{0} 分贝"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerView.cs:102
+#, csharp-format
+msgid "{0} dB"
+msgstr "{0} 分贝"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerView.cs:124
+#, csharp-format
+msgid "{0} kHz"
+msgstr "{0} kHz"
+
#: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:53
msgid "Equalizer"
msgstr "均衡器"
@@ -2740,15 +2809,15 @@ msgstr "新建预设"
msgid "{0} by {1}"
msgstr "{0} - {1}"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:87
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:86
msgid "_Bookmarks"
msgstr "书签(_B)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:90
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:89
msgid "_Add Bookmark"
msgstr "添加书签(_A)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:91
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs:90
msgid "Bookmark the Position in the Current Track"
msgstr "将当前曲目位置设为书签"
@@ -2824,7 +2893,7 @@ msgid "Make Banshee the Default"
msgstr "使 Banshee 成为默认"
#. Translators: verb
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/FileChooserDialog.cs:52
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/FileChooserDialog.cs:53
msgid "I_mport"
msgstr "导入(_M)"
@@ -2917,130 +2986,118 @@ msgstr "首选项(_P)"
msgid "Modify your personal preferences"
msgstr "修改您的个人首选项"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:83
-msgid "Manage _Extensions"
-msgstr "管理扩展程序(_E)"
-
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:84
-msgid "Manage extensions to add new features to Banshee"
-msgstr "管理扩展程序以为 Banshee 添加新特性"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:88
msgid "_Tools"
msgstr "工具(_T)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:92
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:135
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:88
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:134
msgid "_Help"
msgstr "帮助(_H)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:95
-msgid "_Web Resources"
-msgstr "网络资源(_W)"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:91
+msgid "_Contents"
+msgstr "内容(_C)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:98
-msgid "Banshee _User Guide (Wiki)"
-msgstr "Banshee 用户指南(Wiki)(_U)"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:99
-msgid "Learn about how to use Banshee"
-msgstr "学习如何使用 Banshee"
-
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:104
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:95
msgid "Advanced Collection Searching"
msgstr "高级的收藏搜索"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:105
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:96
msgid "Learn advanced ways to search your media collection"
msgstr "学习搜索您媒体收藏的高级方法"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:110
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:101
msgid "Banshee _Home Page"
msgstr "Banshee 主页(_H)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:111
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:102
msgid "Visit the Banshee Home Page"
msgstr "访问 Banshee 主页"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:116
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:107
msgid "_Get Involved"
msgstr "参与(_G)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:117
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:108
msgid "Become a contributor to Banshee"
msgstr "成为 Banshee 的贡献者"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:122
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:113
msgid "_Version Information"
msgstr "版本信息(_V)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:123
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:114
msgid "View detailed version and configuration information"
msgstr "查看详细版本和配置信息"
#. Prompt user for location of the playlist.
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:180
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:169
msgid "Import Playlist"
msgstr "导入播放列表"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:181
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:559
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:170
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:558
msgid "Playlists"
msgstr "播放列表"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:67
-msgid "Play or pause the current item"
-msgstr "播放或暂停当前项目"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:69
+msgid "Play the current item"
+msgstr "播放当前项目"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:70
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:77
msgid "_Next"
msgstr "下一首(_N)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:71
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:78
msgid "Play the next item"
msgstr "播放下一首"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:74
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:81
msgid "Pre_vious"
msgstr "上一首(_V)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:75
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:82
msgid "Play the previous item"
msgstr "播放上一首"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:78
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:85
msgid "Seek _To..."
msgstr "搜索到(_T)..."
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:79
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:86
msgid "Seek to a specific location in current item"
msgstr "在当前项目内搜索到指定位置"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:83
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:90
msgid "Jump to the currently playing item"
msgstr "跳到当前播放的项目"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:87
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:94
msgid "Restart the current item"
msgstr "重新开始当前项目"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:92
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:99
msgid "_Stop When Finished"
msgstr "完成后停止(_S)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:93
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:100
msgid "Stop playback after the current item finishes playing"
msgstr "当前项目播放完后停止播放"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:99
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:106
msgid "_Playback"
msgstr "回放(_P)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:190
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:203
msgid "_Pause"
msgstr "暂停(_P)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:202
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:205
+msgid "Pause the current item"
+msgstr "暂停当前项目"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:217
msgid "Sto_p"
msgstr "停止 {_p}"
@@ -3075,9 +3132,49 @@ msgstr "重复播放当前曲目"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackShuffleActions.cs:79
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackShuffleActions.cs:80
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:84
msgid "Shuffle"
msgstr "随机播放"
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:62
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:63
+msgid "Subtitle"
+msgstr "字幕"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:65
+msgid "Load File..."
+msgstr "载入文件..."
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:66
+msgid "Load subtitle file"
+msgstr "载入字幕文件"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:79
+msgid "Load Subtitle File"
+msgstr "载入本地字幕文件"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:88
+msgid "L_oad"
+msgstr "载入(_O)"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:97
+msgid "Subtitle files"
+msgstr "字幕文件"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:128
+#, csharp-format
+msgid "Subtitle {0}"
+msgstr "字幕 {0}"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:132
+#, csharp-format
+msgid "Activate embedded subtitle {0}"
+msgstr "激活内嵌字幕 {0}"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:147
+msgid "Hide subtitles"
+msgstr "隐藏字幕"
+
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:75
msgid "_New Playlist"
msgstr "新建播放列表(_N)"
@@ -3151,7 +3248,8 @@ msgstr "新建智能播放列表(_S)"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:129
#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:84
#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:67
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:57
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:79
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:72
msgid "Refresh"
msgstr "刷新"
@@ -3172,144 +3270,148 @@ msgstr "您确定要删除本 {0}？"
msgid "Separate by Type"
msgstr "按类型区分"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:70
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:110
msgid "Select _All"
msgstr "全选(_A)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:71
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:111
msgid "Select all tracks"
msgstr "选择所有曲目"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:74
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:114
msgid "Select _None"
msgstr "不选(_N)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:75
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:115
msgid "Unselect all tracks"
msgstr "所有曲目均不选择"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:78
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:118
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:59
msgid "_Edit Track Information"
msgstr "编辑曲目信息(_E)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:79
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:119
msgid "Edit information on selected tracks"
msgstr "编辑选定曲目的信息"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:82
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:122
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:252
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:113
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:155
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:117
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:159
msgid "Properties"
msgstr "属性"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:83
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:123
msgid "View information on selected tracks"
msgstr "查看选定曲目的信息"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:86
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:127
+msgid "Play the selected item"
+msgstr "播放选择的项目"
+
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:130
msgid "Add _to Playlist"
msgstr "添加到播放列表(_T)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:87
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:131
msgid "Append selected items to playlist or create new playlist from selection"
msgstr "添加选定的项目到播放列表或根据选定创建新播放列表"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:92
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:136
msgid "Create new playlist from selected tracks"
msgstr "根据选定的曲目创建新播放列表"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:96
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:140
msgid "_Remove"
msgstr "删除(_R)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:97
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:141
msgid "Remove selected track(s) from this source"
msgstr "从本源中删除已选定曲目"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:100
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:144
msgid "Remove From _Library"
msgstr "从库中删除(_L)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:101
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:145
msgid "Remove selected track(s) from library"
msgstr "从库中删除选定的曲目"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:104
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:148
msgid "_Open Containing Folder"
msgstr "打开包含文件夹(_O)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:105
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:149
msgid "Open the folder that contains the selected item"
msgstr "打开包含有选定项目的文件夹"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:108
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:152
msgid "_Delete From Drive"
msgstr "从硬盘中删除(_D)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:109
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:153
msgid "Permanently delete selected item(s) from medium"
msgstr "从媒介中永久删除已选定项目"
#. Translators: this is a verb (command), not a noun (things)
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:115
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:171
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:159
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:170
#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs:112
#, csharp-format
msgid "_Search"
msgstr "搜索(_S)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:116
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:160
msgid "Search for items matching certain criteria"
msgstr "搜索符合某类标准的项目"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:119
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:163
msgid "By Matching _Album"
msgstr "根据专辑匹配(_A)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:120
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:164
msgid "Search all songs of this album"
msgstr "搜索该专辑的所有曲目"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:123
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:167
msgid "By Matching A_rtist"
msgstr "根据艺人匹配(_R)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:124
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:168
msgid "Search all songs of this artist"
msgstr "搜索该艺人的所有曲目"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:253
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:322
#, csharp-format
msgid "_Delete From \"{0}\""
msgstr "从 {0} 删除(_D)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:445
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:542
msgid "The folder could not be found."
msgstr "没有找到该文件夹。"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:446
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:543
msgid "Please check that the track's location is accessible by the system."
msgstr "请检查本系统是否可访问该曲目位置。"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:512
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:620
#, csharp-format
msgid "Are you sure you want to permanently delete this item?"
msgid_plural ""
"Are you sure you want to permanently delete the selected {0} items?"
msgstr[0] "您确定要永久删除该 {0} 项目吗？"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:516
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:624
msgid "If you delete the selection, it will be permanently lost."
msgstr "如果您决定删除，所选定的项目将永久丢失。"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:519
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:627
#, csharp-format
msgid "Remove selection from {0}?"
msgstr "从 {0} 中删除已选定的吗？"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:522
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:630
#, csharp-format
msgid "Are you sure you want to remove the selected item from your {1}?"
msgid_plural ""
@@ -3390,7 +3492,7 @@ msgstr "将所有光盘编号和计数设置为这些值"
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:167
msgid "_Disc Number:"
-msgstr "盘片编号(_D)："
+msgstr "唱片编号(_D)："
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:188
msgid "Set all years to this value"
@@ -3595,63 +3697,64 @@ msgid "File Size:"
msgstr "文件大小："
#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:222
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs:61
msgid "bytes"
msgstr "字节"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:95
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:97
msgid "Track Editor"
msgstr "曲目编辑器"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:95
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:97
msgid "Track Properties"
msgstr "曲目属性"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:147
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:151
msgid "Show the previous track"
msgstr "显示上一首曲目"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:153
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:157
msgid "Show the next track"
msgstr "显示下一首曲目"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:183
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:187
msgid "Title:"
msgstr "标题："
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:184
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:188
msgid "Artist:"
msgstr "艺人："
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:185
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:189
msgid "Album:"
msgstr "专辑："
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:309
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:313
msgid "Sync all field _values"
msgstr "同步所有字段值(_V)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:314
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:318
msgid ""
"Apply the values of all common fields set for this track to all of the "
"tracks selected in this editor"
msgstr "将本曲目的所有常规字段值设定应用于本编辑器中所有已选定的曲目。"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:413
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:418
#, csharp-format
msgid "<i>Editing {0} of {1} items</i>"
msgstr "<i>正在编辑 {1} 项中的第 {0} 项</i>"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:675
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:698
#, csharp-format
msgid "Save the changes made to the open track?"
msgid_plural "Save the changes made to {0} of {1} open tracks?"
msgstr[0] "保存 {1} 开放曲目的 {0} 更改"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:692
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:715
msgid "Close _without Saving"
msgstr "关闭而不保存(_W)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:729
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:752
#, csharp-format
msgid "If you don't save, changes from the last {0} will be permanently lost."
msgstr "如果您不保存，从最后 {0} 的变化都将永久丢失。"
@@ -3700,24 +3803,24 @@ msgstr[0] "活动任务运行中"
#. Translators: {0} and {1} are for markup so ignore them, {2} and {3}
#. are Podcast Name and Published Date, respectively;
#. e.g. 'from BBtv published 7/26/2007'
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:525
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:523
#, csharp-format
msgid "{0}from{1} {2} {0}published{1} {3}"
msgstr "{0} - {1} {2} {0} - {1} {3}"
#. simply: "Chicago Public Radio" or whatever the artist name is
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:538
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:536
msgid "Unknown Stream"
msgstr "未知流"
#. Translators: {0} and {1} are markup so ignore them, {2} is the name of the radio station
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:541
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:539
#, csharp-format
msgid "{0}on{1} {2}"
msgstr "{0} - {1} {2}"
#. Translators: {0} is the "from {album} by {artist}" type string, and {1} is the "on {radio station name}" string
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:544
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:542
#, csharp-format
msgid "{0} {1}"
msgstr "{0} {1}"
@@ -3725,23 +3828,23 @@ msgstr "{0} {1}"
#. Translators: {0} and {1} are for markup so ignore them, {2} and {3}
#. are Artist Name and Album Title, respectively;
#. e.g. 'by Parkway Drive from Killing with a Smile'
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:580
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:578
#, csharp-format
msgid "{0}by{1} {2} {0}from{1} {3}"
msgstr "{0} - {1} {2} {0} - {1} {3}"
#. Translators: {0} and {1} are for markup so ignore them, {2} is for Album Title;
#. e.g. 'from Killing with a Smile'
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:584
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:521
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:582
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:522
#, csharp-format
msgid "{0}from{1} {2}"
msgstr "{0} - {1} {2}"
#. Translators: {0} and {1} are for markup so ignore them, {2} is for Artist Name;
#. e.g. 'by Parkway Drive'
-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:588
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:525
+#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:586
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:526
#, csharp-format
msgid "{0}by{1} {2}"
msgstr "{0} - {1} {2}"
@@ -3795,10 +3898,8 @@ msgid "Files"
msgstr "文件"
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:63
-#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/ImportSource.cs:67
-#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:82
-msgid "C_hoose Files"
-msgstr "选择文件(_H)"
+msgid "C_hoose Files..."
+msgstr "选择文件(_H)..."
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:81
msgid "_Files to import:"
@@ -3825,8 +3926,8 @@ msgid "Folders"
msgstr "目录"
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FolderImportSource.cs:57
-msgid "C_hoose Folders"
-msgstr "选择目录(_H)"
+msgid "C_hoose Folders..."
+msgstr "选择目录(_H)..."
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FolderImportSource.cs:75
msgid "_Folders to import:"
@@ -3857,14 +3958,10 @@ msgstr "不再显示本对话框"
#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:130
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:82
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:385
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:384
msgid "_Import"
msgstr "导入(_I)"
-#: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/PhotoFolderImportSource.cs:69
-msgid "Videos From Photos Folder"
-msgstr "来自于照片目录的视频"
-
#: ../src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileComboBox.cs:86
msgid "No available profiles"
msgstr "没有可用的个人资料"
@@ -3926,6 +4023,10 @@ msgstr "新智能播放列表"
msgid "Playlist _Name:"
msgstr "播放列表名称(_N)："
+#: ../src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/Editor.cs:108
+msgid "Predefined Smart Playlists"
+msgstr "预定义的智能播放列表"
+
#: ../src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/Editor.cs:119
msgid "Open in editor"
msgstr "在编辑器中打开"
@@ -3958,7 +4059,7 @@ msgstr "显示浏览器"
msgid "Show or hide the artist/album browser"
msgstr "显示或隐藏艺人/专辑浏览器"
-#: ../src/Core/Banshee.WebBrowser/Banshee.WebSource/WebBrowserShell.cs:117
+#: ../src/Core/Banshee.WebBrowser/Banshee.WebSource/WebBrowserShell.cs:121
#, csharp-format
msgid "Loading {0}..."
msgstr "正在加载 {0}..."
@@ -3971,6 +4072,10 @@ msgstr ""
"插入\n"
"光盘"
+#: ../src/Core/Banshee.Widgets/Banshee.Widgets/SearchEntry.cs:95
+msgid "Clear search"
+msgstr "清空搜索"
+
#: ../src/Core/Banshee.Widgets/Banshee.Widgets/SeekSlider.cs:58
msgid "Seek"
msgstr "搜索"
@@ -3980,7 +4085,7 @@ msgid "Idle"
msgstr "空闲"
#: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:149
-#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/UserJobDownloadManager.cs:55
+#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/AmazonDownloadManager.cs:58
msgid "Contacting..."
msgstr "联系中..."
@@ -4000,56 +4105,135 @@ msgstr "已静音"
msgid "Full Volume"
msgstr "最大音量"
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:101
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:102
+msgid "Device"
+msgstr "设备"
+
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:102
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:104
+msgid "Generation"
+msgstr "产生"
+
+#. FIXME
+#. AddDapProperty (Catalog.GetString ("Color"), "black");
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:107
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:105
+msgid "Capacity"
+msgstr "容量"
+
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:108
+msgid "Available"
+msgstr "可用"
+
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:109
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:106
+#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:141
+msgid "Serial number"
+msgstr "序列号"
+
+#. AddDapProperty (Catalog.GetString ("Produced on"), ipod_device.ProductionInfo.DisplayDate);
+#. AddDapProperty (Catalog.GetString ("Firmware"), ipod_device.FirmwareVersion);
+#. string [] capabilities = new string [ipod_device.ModelInfo.Capabilities.Count];
+#. ipod_device.ModelInfo.Capabilities.CopyTo (capabilities, 0);
+#. AddDapProperty (Catalog.GetString ("Capabilities"), String.Join (", ", capabilities));
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:116
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:113
+msgid "Supports cover art"
+msgstr "支持封面图片"
+
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:117
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:114
+msgid "Supports photos"
+msgstr "支持照片"
+
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:412
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:491
+msgid "Track duration is zero"
+msgstr "曲目长度为零"
+
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:515
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:694
+msgid "Syncing iPod"
+msgstr "正在同步 iPod"
+
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:516
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:695
+msgid "Preparing to synchronize..."
+msgstr "正在准备同步..."
+
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:519
+#, csharp-format
+msgid "Adding track {0} of {1}"
+msgstr "正在添加 {1} 条音轨中的第 {0} 个"
+
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:555
+#, csharp-format
+msgid "Removing track {0} of {1}"
+msgstr "正在删除 {1} 条音轨中的第 {0} 个"
+
+#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:619
+msgid "Writing media database"
+msgstr "正在写入媒体库..."
+
#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapLibrarySync.cs:131
#, csharp-format
msgid "Sync {0}"
msgstr "同步 {0}"
#. Note to translators: {0}, {1} and {2} will be replaced with numbers.
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapLibrarySync.cs:256
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapLibrarySync.cs:260
#, csharp-format
msgid "{0} to add, {1} to remove, {2} to update"
msgstr "添加 {0} 个，删除 {1} 个，更新 {2} 个"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:175
+#. This group source gives us a seperator for DAPs in the source view.
+#. We add it when we get our first dap source, and then remove it when
+#. we lose the last one.
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapService.cs:63
+msgid "Devices"
+msgstr "设备"
+
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:176
msgid "Device Properties"
msgstr "设备属性"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:199
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:200
msgid "Product"
msgstr "产品"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:200
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201
msgid "Vendor"
msgstr "出版商"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:277
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:284
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:140
#, csharp-format
msgid "Loading {0}"
msgstr "正在载入 {0}"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:361
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:370
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:37
msgid "Yes"
msgstr "是"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:361
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:370
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:38
msgid "No"
msgstr "否"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:382
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:391
#, csharp-format
msgid ""
"The {0} format is not supported by the device, and no converter was found to "
"convert it"
msgstr "设备不支持 {0} 格式，也没有发现可以使用的转换器"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:388
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:397
msgid "File format conversion support is not available"
msgstr "文件格式转换支持不可用"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:414
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:423
msgid "Error converting file"
msgstr "转换文件出错"
@@ -4068,17 +4252,17 @@ msgid "Sync Preferences"
msgstr "同步首选项"
#. singular form unused b/c we know it's > 1, but we still need GetPlural
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:364
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:365
#, csharp-format
msgid "The sync operation will remove one track from your device."
msgid_plural "The sync operation will remove {0} tracks from your device."
msgstr[0] "同步操作将从您的设备中移除 {0} 首曲目。"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:368
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:369
msgid "Are you sure you want to continue?"
msgstr "您确定要继续吗？"
-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:376
+#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:377
msgid "Remove tracks"
msgstr "移除曲目"
@@ -4191,72 +4375,35 @@ msgstr "正在保存新的数据库"
msgid "Error rebuilding iPod database"
msgstr "重建 iPod 数据库出错"
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:101
-msgid "Device"
-msgstr "设备"
-
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:102
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:103
msgid "Color"
msgstr "颜色"
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:103
-msgid "Generation"
-msgstr "产生"
-
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:104
-msgid "Capacity"
-msgstr "容量"
-
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:105
-#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:148
-msgid "Serial number"
-msgstr "序列号"
-
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:106
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:107
msgid "Produced on"
msgstr "出品于"
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:107
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:108
msgid "Firmware"
msgstr "固件"
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:111
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:112
msgid "Capabilities"
msgstr "能力"
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:112
-msgid "Supports cover art"
-msgstr "支持封面图片"
-
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:113
-msgid "Supports photos"
-msgstr "支持照片"
-
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:468
-msgid "Track duration is zero"
-msgstr "曲目长度为零"
-
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:634
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:680
msgid "Out of space on device"
msgstr "设备无多余空间"
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:634
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:680
msgid "Please manually remove some songs"
msgstr "请手动删除一些曲目"
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:650
-msgid "Syncing iPod"
-msgstr "正在同步 iPod"
-
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:651
-msgid "Preparing to synchronize..."
-msgstr "正在准备同步..."
-
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:672
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:724
msgid "Updating..."
msgstr "正在更新..."
-#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:676
+#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/IpodSource.cs:728
msgid "Flushing to disk..."
msgstr "正在冲刷到硬盘..."
@@ -4269,18 +4416,18 @@ msgid ""
"You have used this iPod with a version of iTunes that saves a version of the "
"song database for your iPod that is too new for Banshee to recognize.\n"
"\n"
-"Banshee can rebuild your database, but some settings might be lost. Using "
-"Banshee and iTunes with the same iPod is not recommended."
+"Banshee can rebuild your database, but you might lose your settings and all "
+"the content in the device (be sure to backup your data first). Using Banshee "
+"and iTunes with the same iPod is not recommended."
msgstr ""
-"您曾用 iPod 和某版本的 iTunes，该版本的 iTunes 保存曲目数据库版本太新，"
-"Banshee 无法识别。\n"
+"您使用某个版本的 iTunes 向您的 iPod 保存了新版的 Banshee 无法识别的歌曲库。\n"
"\n"
-"Banshee 能够重建您的数据库，但是某些设定可能丢失。不推荐在同一 iPod 同时使用 "
-"Banshee 和 iTunes。"
+"Banshee 可以重建您的数据库，不过您的设置和设备中的所有内容都可能丢失(请先做好"
+"备份)。建议您不要使用 Banshee 和 iTunes 对同一台 iPod 进行操作。"
#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:88
msgid "Learn more about Banshee's iPod support"
-msgstr "了解更多关于 Banshee的 iPod 支持"
+msgstr "了解更多关于 Banshee 的 iPod 支持"
#: ../src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:96
msgid ""
@@ -4360,22 +4507,11 @@ msgstr "支持播放列表"
msgid "Ringtones"
msgstr "铃声"
-#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:78
-#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:121
-msgid "MTP Support Ignoring Device"
-msgstr "MTP 支持忽略设备"
-
-#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:79
-#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:122
-msgid ""
-"Banshee's MTP audio player support can only handle one device at a time."
-msgstr "Banshee 的 MTP 音乐播放器仅支持同时处理一个设备"
-
-#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:91
+#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:82
msgid "Error Initializing MTP Device Support"
msgstr "初始化 MTP 设备支持时出错"
-#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:92
+#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:83
msgid ""
"There was an error intializing MTP device support. See http://www.banshee-"
"project.org/Guide/DAPs/MTP for more information."
@@ -4383,31 +4519,35 @@ msgstr ""
"初始化 MTP 设备支持时出错。更多信息请参见 http://www.banshee-project.org/"
"Guide/DAPs/MTP "
-#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:103
-msgid "Error Finding MTP Device Support"
-msgstr "寻找 MTP 设备支持时出错"
-
-#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:104
-msgid ""
-"An MTP device was detected, but Banshee was unable to load support for it."
-msgstr "探测到一个 MTP 设备，但 Banshee 无法载入对它的支持。"
-
-#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:149
+#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:142
+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/VersionInformationDialog.cs:66
msgid "Version"
msgstr "版本"
-#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:151
+#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:144
msgid "Battery level"
msgstr "电池水平"
#. user_event.Progress = (double)current / total;
#. Translators: {0} is the name of the MTP audio device (eg Gabe's Zen Player), {1} is the
#. track currently being loaded, and {2} is the total # of tracks that will be loaded.
-#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:167
+#: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:160
#, csharp-format
msgid "Loading {0} - {1} of {2}"
msgstr "正在载入 {1} 的 {0} 到 {2}"
+#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/AmazonDownloadManager.cs:57
+msgid "Amazon MP3 Purchases"
+msgstr "Amazon MP3 购买"
+
+#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/AmazonMp3DownloaderService.cs:53
+msgid "Amazon MP3s"
+msgstr "Amazon MP3"
+
+#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/AmazonMp3DownloaderService.cs:54
+msgid "Songs purchased from the Amazon MP3 Store"
+msgstr "从 Amazon MP3 商店购买的歌曲"
+
#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/ImportSource.cs:40
msgid "Download Amazon MP3 Purchase"
msgstr "下载 Amazon MP3 购买"
@@ -4420,28 +4560,13 @@ msgstr "Amazon MP3 文件"
msgid "Amazon MP3 Purchase"
msgstr "Amazon MP3 购买"
-#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/UserJobDownloadManager.cs:54
-msgid "Amazon MP3 Purchases"
-msgstr "Amazon MP3 购买"
-
-#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/UserJobDownloadManager.cs:87
-#, csharp-format
-msgid "{0} download at {1}/s"
-msgid_plural "{0} downloads at {1}/s"
-msgstr[0] "{0} 下载，速度为 {1}/s"
-
-#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/UserJobDownloadManager.cs:95
-#, csharp-format
-msgid "{0} download at {1}/s ({2} pending)"
-msgid_plural "{0} downloads at {1}/s ({2} pending)"
-msgstr[0] "{0} 下载，速度为 {1}/s ({2} 等候)"
-
-#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/SignOutButton.cs:38
-msgid "Sign out of Amazon"
-msgstr "登出 Amazon"
+#: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/ImportSource.cs:67
+#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:81
+msgid "C_hoose Files"
+msgstr "选择文件(_H)"
#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSource.cs:42
-#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:38
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:39
msgid "Amazon MP3 Store"
msgstr "Amazon MP3 Store"
@@ -4477,11 +4602,15 @@ msgstr "英国(amazon.co.uk)"
msgid "United States (amazon.com)"
msgstr "美国(amazon.com)"
-#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:47
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:43
#, csharp-format
msgid "Search the Amazon MP3 Store"
msgstr "搜索 Amazon MP3 商店"
+#: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreWebBrowserShell.cs:45
+msgid "How Your Purchases Support GNOME"
+msgstr "您的购买是如何支持 GNOME 的"
+
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:55
msgid "Open Book"
msgstr "打开图书"
@@ -4523,22 +4652,38 @@ msgid "Book Title:"
msgstr "图书标题："
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:57
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:91
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:92
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastEpisodePage.cs:87
msgid "Author"
msgstr "作者："
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:62
+#. Translators: This means the first letter of the author's name
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:63
msgid "Author Initial"
msgstr "初始艺人"
-#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:67
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookFileNamePattern.cs:68
msgid "Book Title"
msgstr "图书标题"
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:68
-msgid "Audiobooks, etc"
-msgstr "有声读物等"
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:307
+msgid "Audiobooks"
+msgstr "有声读物"
+
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:75
+msgid "Search your audiobooks"
+msgstr "搜索您的有声读物"
+
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:145
+#, csharp-format
+msgid "{0} book"
+msgid_plural "{0} books"
+msgstr[0] "{0} 本读物"
+
+#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:149
+msgid "Audiobooks Folder"
+msgstr "有声读物目录"
#: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/BookView.cs:114
msgid "Resume Playback"
@@ -4549,7 +4694,7 @@ msgid "No Bookmark Set"
msgstr "未设置书签"
#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdDiscModel.cs:76
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:55
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:56
msgid "Audio CD"
msgstr "音乐光盘"
@@ -4620,7 +4765,7 @@ msgstr ""
"慢。"
#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdService.cs:320
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:440
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:441
msgid "Import CD"
msgstr "导入 CD"
@@ -4636,44 +4781,44 @@ msgstr "复制光盘"
msgid "Duplicate this audio CD"
msgstr "复制本音乐光盘"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:130
-msgid "Searching for CD metadata..."
-msgstr "正在搜索 CD 元数据"
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:131
+msgid "Searching for track information..."
+msgstr "正在搜索音轨信息..."
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:163
-msgid "Could not fetch metadata for CD."
-msgstr "无法获取 CD 的元数据"
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:164
+msgid "Could not fetch track information"
+msgstr "无法获取音轨信息"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:191
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:192
msgid "Automatic import off since this album is already in the Music Library."
msgstr "由于该专辑已经在音乐库中，关闭自动导入。"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:214
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:215
msgid "Could not import CD"
msgstr "无法导入 CD"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:231
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:232
msgid "Could not duplicate audio CD"
msgstr "无法复制音乐光盘"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:363
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:364
msgid "Ejecting audio CD..."
msgstr "正在弹出音乐光盘..."
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:381
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:382
#, csharp-format
msgid "Could not eject audio CD: {0}"
msgstr "无法弹出音乐光盘：{0}"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:414
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:415
msgid "Audio CD Preferences"
msgstr "音频 CD 首选项"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:415
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:416
msgid "Eject Disc"
msgstr "弹出光盘"
-#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:439
+#: ../src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:440
#, csharp-format
msgid "Import ‟{0}”"
msgstr "导入 ‟{0}”"
@@ -4682,31 +4827,31 @@ msgstr "导入 ‟{0}”"
msgid "Detecting BPM"
msgstr "正在检测 BPM"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:91
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:92
msgid "D_etect"
msgstr "检测(_E)"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:103
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:104
msgid "T_ap"
msgstr "轻敲(_A)"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:111
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:112
msgid "Have Banshee attempt to auto-detect the BPM of this song"
msgstr "让 Banshee 尝试自动探测该歌曲的 BPM"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:113
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:114
msgid "Play this song"
msgstr "播放此曲"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:116
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:117
msgid "Tap this button to the beat to set the BPM for this song manually"
msgstr "按节拍轻敲本按钮以手动设定该歌曲的每分钟节拍数"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:148
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:147
msgid "_Automatically detect BPM for all songs"
msgstr "自动检测所有曲目的 BPM"
-#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:149
+#: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:148
msgid ""
"Detect beats per minute (BPM) for all songs that don't already have a value "
"set"
@@ -4721,22 +4866,6 @@ msgstr "正在下载封面图片"
msgid "{0} - {1}"
msgstr "{0} - {1}"
-#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtService.cs:107
-msgid "_Cover Art"
-msgstr "封面图片(_C)"
-
-#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtService.cs:108
-msgid "Manage cover art"
-msgstr "管理封面图片"
-
-#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtService.cs:110
-msgid "_Download Cover Art"
-msgstr "下载封面图片(_D)"
-
-#: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtService.cs:111
-msgid "Download cover art for all tracks"
-msgstr "为所有曲目下载封面图片"
-
#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapContainerSource.cs:42
msgid "Shared Music"
msgstr "共享的音乐"
@@ -4824,11 +4953,11 @@ msgstr "登录"
msgid "Connecting to {0}"
msgstr "正在连接到 {0}"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:178
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:187
msgid "Add Remote DAAP Server"
msgstr "添加远端 DAAP 服务器"
-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:179
+#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:188
msgid "Add a new remote DAAP server"
msgstr "添加一个新的远端 DAAP 服务器"
@@ -4897,15 +5026,15 @@ msgstr "正在取消下载"
msgid "Waiting for downloads to terminate..."
msgstr "正在等待下载到终端..."
-#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:60
+#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:59
msgid "Import eMusic Downloads to Library"
msgstr "导入 eMusic 下载到库"
-#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:62
+#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:61
msgid "eMusic Files"
msgstr "eMusic 文件"
-#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:78
+#: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:77
msgid "eMusic Tracks"
msgstr "eMusic 曲目"
@@ -4915,7 +5044,7 @@ msgid "File System Queue"
msgstr "文件系统队列"
#: ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs:72
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:71
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:94
msgid "Clear"
msgstr "清空"
@@ -4924,7 +5053,7 @@ msgid "Remove all tracks from the file system queue"
msgstr "从文件系统队列中删除所有曲目"
#: ../src/Extensions/Banshee.FileSystemQueue/Banshee.FileSystemQueue/FileSystemQueueSource.cs:79
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:78
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:103
msgid "Clear on Quit"
msgstr "退出时清空"
@@ -4944,25 +5073,6 @@ msgstr ""
"显示要合并的唱片。对于每一行，点击需要合并的标题会让它字体加粗，或者不选择它"
"而不对它进行任何操作。"
-#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/AlbumDuplicateSolver.cs:73
-#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/ArtistDuplicateSolver.cs:76
-msgid " and "
-msgstr " 和 "
-
-#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/AlbumDuplicateSolver.cs:75
-#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/ArtistDuplicateSolver.cs:78
-#, fuzzy
-#| msgid "Other"
-msgid ", the"
-msgstr "其他"
-
-#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/AlbumDuplicateSolver.cs:77
-#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/ArtistDuplicateSolver.cs:80
-#, fuzzy
-#| msgid "Other"
-msgid "the "
-msgstr "其他"
-
#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/ArtistDuplicateSolver.cs:46
msgid "Duplicate Artists"
msgstr "重复的艺人"
@@ -4972,8 +5082,8 @@ msgid ""
"Displayed are artists that should likely be merged. For each row, click the "
"desired name to make it bold, or uncheck it to take no action."
msgstr ""
-"显示要合并的艺人。对于每一行，点击需要合并的名字会让它字体加粗，或者不选择"
-"它而不对它进行任何操作。"
+"显示要合并的艺人。对于每一行，点击需要合并的名字会让它字体加粗，或者不选择它"
+"而不对它进行任何操作。"
#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixActions.cs:50
msgid "Fix Music Metadata..."
@@ -4987,33 +5097,83 @@ msgstr "元数据修复工具"
msgid "Problem Type:"
msgstr "故障类型："
-#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/View.cs:76
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:66
+msgid "Apply Selected Fixes"
+msgstr "应用选择的修复操作"
+
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/GenreDuplicateSolver.cs:46
+msgid "Duplicate Genres"
+msgstr "重复的流派"
+
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/GenreDuplicateSolver.cs:47
+msgid ""
+"Displayed are genres that should likely be merged. For each row, click the "
+"desired genre to make it bold, or uncheck it to take no action."
+msgstr ""
+"显示的是可能要合并的流派。对于每一行，点击要处理的流派名让它加粗显示，或者不"
+"选从而不进行处理。"
+
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/GenreDuplicateSolver.cs:77
+msgid " and "
+msgstr " 和 "
+
+#. Translators: These are articles that might be prefixed or suffixed
+#. on artist names or album titles. You can add as many as you need,
+#. separated by a pipe (|)
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/Solver.cs:198
+msgid "a|an|the"
+msgstr "一个|这个"
+
+#. Translators: This is the format commonly used in your langauge for
+#. suffixing an article, eg in English: ", The"
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/Solver.cs:202
+#, csharp-format
+msgid ", {0}"
+msgstr "，{0}"
+
+#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/View.cs:77
msgid "Fix?"
msgstr "修复吗？"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:48
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:51
msgid "View Item Details"
msgstr "查看条目详情"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:57
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:60
msgid "Open Webpage"
msgstr "打开网页"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:76
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:79
msgid "Visit Archive.org"
msgstr "访问 Archive.org"
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:83
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:61
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:170
+msgid "Subscribe"
+msgstr "订阅"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:84
+#| msgid "Subscribe to a new podcast"
+msgid "Subscribe to this search as a podcast"
+msgstr "作为播客订阅此搜索"
+
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/Actions.cs:88
+#, csharp-format
+msgid "Internet Archive: {0}"
+msgstr "互联网仓库：{0}"
+
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs:78
msgid "Close Item"
msgstr "关闭条目"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs:97
msgid "Getting item details from the Internet Archive"
-msgstr "正在从互联网档案馆中获取项目细节"
+msgstr "正在从互联网仓库中获取项目细节"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs:148
msgid "Timed out getting item details from the Internet Archive"
-msgstr "从互联网档案馆中获取项目细节时超时"
+msgstr "从互联网仓库中获取项目细节时超时"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs:149
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchSource.cs:190
@@ -5023,13 +5183,13 @@ msgstr "重试"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs:151
msgid "Error getting item details from the Internet Archive"
-msgstr "从互联网档案馆中获取项目细节时出错"
+msgstr "从互联网仓库中获取项目细节时出错"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsView.cs:205
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:130
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:66
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:135
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:166
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:136
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:279
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastEpisodePage.cs:89
msgid "Description"
msgstr "描述"
@@ -5132,16 +5292,16 @@ msgstr "{0} 由 {1} 在 {2} 之上"
msgid "Write your own review"
msgstr "写您自己的评论"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:109
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:108
msgid "Collection:"
msgstr "收集："
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:118
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:117
#, csharp-format
msgid "Optional Query"
msgstr "可选查询"
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:165
+#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:164
msgid "Sort by:"
msgstr "排序通过："
@@ -5234,17 +5394,13 @@ msgid ""
"library, we provide free access to researchers, historians, scholars, and "
"the general public."
msgstr ""
-"互联网档案馆，一个 501(c)(3) 的非营利性机构，正在创建一个互联网网站和其他文化"
+"互联网仓库，一个 501(c)(3) 的非营利性机构，正在创建一个互联网网站和其他文化"
"古物的数字格式的数码图书馆。像纸张图书馆一样，我们为研究者，历史学者以及普通"
"大众提供免费使用。"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:151
msgid "Visit the Internet Archive online at archive.org"
-msgstr "访问在 archive.org 的线上互联网档案馆"
-
-#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:307
-msgid "Audiobooks"
-msgstr "有声读物"
+msgstr "访问在 archive.org 的线上互联网仓库"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:308
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:78
@@ -5269,7 +5425,7 @@ msgstr "搜索结果"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchSource.cs:139
msgid "Searching the Internet Archive"
-msgstr "正在搜索互联网档案馆"
+msgstr "正在搜索互联网仓库"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchSource.cs:175
msgid "No matches."
@@ -5283,15 +5439,15 @@ msgstr[0] "显示 1 到 {0:N0} 个符合项，共 {1:N0} "
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchSource.cs:189
msgid "Timed out searching the Internet Archive"
-msgstr "搜索互联网档案馆时超时"
+msgstr "搜索互联网仓库时超时"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchSource.cs:194
msgid "Error searching the Internet Archive"
-msgstr "搜索互联网档案馆时出错"
+msgstr "搜索互联网仓库时出错"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:88
msgid "Fetch more results from the Internet Archive?"
-msgstr "从互联网档案馆获取更多结果吗？"
+msgstr "从互联网仓库获取更多结果吗？"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:94
msgid "Fetch More"
@@ -5300,7 +5456,7 @@ msgstr "获取更多"
#: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:128
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Field.cs:61
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:98
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:134
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:135
msgid "Creator"
msgstr "创建者"
@@ -5390,7 +5546,7 @@ msgstr "开放源代码电影"
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:81
msgid "Prelinger Archives"
-msgstr "Prelinger 档案馆"
+msgstr "Prelinger 仓库"
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:82
#: ../src/Extensions/Banshee.InternetArchive/InternetArchive/MediaType.cs:109
@@ -5517,24 +5673,34 @@ msgstr "添加电台"
msgid "Add a new Internet Radio station or playlist"
msgstr "添加一个互联网广播电台或播放列表"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:81
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:83
+msgid "Search your stations"
+msgstr "搜索您的电台"
+
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:84
#: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationEditor.cs:60
msgid "Edit Station"
msgstr "编辑电台"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:133
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:134
msgid "Station"
msgstr "电台"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:235
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:155
+#, csharp-format
+msgid "{0} station"
+msgid_plural "{0} stations"
+msgstr[0] "{0} 个电台"
+
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:241
msgid "Please provide a valid station URI"
msgstr "请提供一个有效的电台 URI 地址"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:248
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:254
msgid "Please provide a station genre"
msgstr "请提供一个电台流派"
-#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:256
+#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSource.cs:262
msgid "Please provide a station title"
msgstr "请提供一个电台标题"
@@ -5575,32 +5741,33 @@ msgid "Description:"
msgstr "描述："
#: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:128
+#: ../src/Hyena/Hyena.Gui/Hyena.Widgets/RatingMenuItem.cs:50
msgid "Rating:"
msgstr "评级："
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:122
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:125
msgid "_Last.fm"
msgstr "_Last.fm"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:123
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:126
msgid "Configure the Audioscrobbler plugin"
msgstr "配置“audioconvert”插件"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:126
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:129
msgid "Visit _User Profile Page"
msgstr "访问用户个人资料页面(_U)"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:127
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:130
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:164
msgid "Visit Your Last.fm Profile Page"
msgstr "访问您的 Last.fm 人物简介页面"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:132
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:135
#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:91
msgid "_Enable Song Reporting"
msgstr "启用曲目报告(_E)"
-#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:133
+#: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:136
msgid "Enable song reporting"
msgstr "启用曲目报告"
@@ -5984,15 +6151,15 @@ msgstr "lastfm:// URL"
msgid "lastfm://"
msgstr "lastfm://"
-#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:109
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:113
msgid "Media"
msgstr "媒体"
-#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:119
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:123
msgid "Library"
msgstr "库"
-#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:131
+#: ../src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs:135
msgid "Launch the Banshee Media Player"
msgstr "启动 Banshee 媒体播放器"
@@ -6021,48 +6188,56 @@ msgstr "返回完整模式"
msgid "Change repeat playback mode"
msgstr "改变重复播放模式"
-#: ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide/MiroGuideSource.cs:47
+#: ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide/MiroGuideSource.cs:50
msgid "Miro Guide"
msgstr "Miro Guide"
+#: ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide/MiroGuideSource.cs:97
+msgid "Discover interesting podcasts in the Miro Guide podcast directory!"
+msgstr "在 Miro Guide 播客目录中寻找喜欢的播客！"
+
+#: ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide/MiroGuideSource.cs:100
+msgid "Open Miro Guide"
+msgstr "打开 Miro Guide"
+
#: ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide/View.cs:56
-msgid "Search for Podcasts"
+msgid "Search for podcasts"
msgstr "搜索播客"
#: ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide/View.cs:57
-msgid "Search for Video Podcasts"
+msgid "Search for video podcasts"
msgstr "搜索视频播客"
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:138
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:139
msgid "_Show Notifications"
msgstr "显示通知(_S)"
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:139
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:140
msgid "Show notifications when item changes"
msgstr "当项目变化时显示通知"
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:343
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:344
msgid "Still Running"
msgstr "仍然运行中"
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:344
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:345
msgid ""
"Banshee was closed to the notification area. Use the <i>Quit</i> option to "
"end your session."
msgstr "Banshee 最小化到通知区域。请使用 <i>退出</i> 选项以结束本进程。"
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:479
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:480
msgid "Skip this item"
msgstr "跳过此项"
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:483
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:484
msgid "Cannot show notification"
msgstr "无法显示通知"
#. Translators: {0} and {1} are for markup so ignore them, {2} and {3}
#. are Artist Name and Album Title, respectively;
#. e.g. 'by Parkway Drive from Killing with a Smile'
-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:517
+#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:518
#, csharp-format
msgid ""
"{0}by{1} {2}\n"
@@ -6075,22 +6250,30 @@ msgstr ""
msgid "Banshee"
msgstr "Banshee"
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:144
+#: ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs:59
+msgid "Simplify"
+msgstr "简化"
+
+#: ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs:60
+msgid "Simplify the Now Playing interface by hiding the source list and more"
+msgstr "通过隐藏源列表和其他内部来简化正在播放界面"
+
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:143
#, csharp-format
msgid "Unable to import track: {0}"
msgstr "无法导入曲目：{0}"
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:178
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:177
msgid "Importing from Amarok failed"
msgstr "从 Amarok 导入失败"
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:189
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/AmarokPlayerImportSource.cs:188
msgid "Amarok"
msgstr "Amarok"
#. TODO add Help button and dialog/tooltip
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:68
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:384
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:383
msgid "iTunes Importer"
msgstr "iTunes 已导工具"
@@ -6107,24 +6290,24 @@ msgid "Import playlists"
msgstr "导入播放列表"
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:120
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:387
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:386
#, csharp-format
msgid "Locate your \"{0}\" file..."
msgstr "查找您的“{0}”文件..."
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:138
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:388
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:387
#, csharp-format
msgid "Locate \"{0}\""
msgstr "查找“{0}”"
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:167
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:389
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:388
msgid "Locate iTunes Music Directory"
msgstr "查找 iTunes 音乐目录"
#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:196
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:391
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:390
#, csharp-format
msgid ""
"The iTunes library refers to your music directory as \"{0}\" but Banshee was "
@@ -6132,13 +6315,13 @@ msgid ""
msgstr ""
"iTunes 库提到您的音乐目录为 {0}，但 Banshee 无法推断该目录的位置，请指定。"
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:75
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:393
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:74
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:392
msgid "iTunes Media Player"
msgstr "iTunes 媒体播放器"
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:135
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:395
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:134
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:394
msgid ""
"Banshee is not familiar with this version of the iTunes library format. "
"Importing may or may not work as expected, or at all. Would you like to "
@@ -6147,17 +6330,17 @@ msgstr ""
"Banshee 不熟悉这个版本的 itunes 库格式。可能或不能像期望那样导入，或根本无法"
"导入。您还是想尝试导入吗？"
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:440
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:236
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:397
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:439
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:235
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:396
msgid "Unable to import song."
msgstr "无法导入曲目。"
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:370
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:369
msgid "Rhythmbox Music Player"
msgstr "Rhythmbox 音乐播放器"
-#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:386
+#: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:385
msgid "Import _playlists"
msgstr "导入播放列表(_P)"
@@ -6169,31 +6352,67 @@ msgstr "填写(_F)"
msgid "f_rom"
msgstr "从(_R)"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:50
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:52
msgid "Add to Play Queue"
msgstr "添加到播放队列"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:51
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:53
msgid "Append selected songs to the play queue"
msgstr "添加选定的曲目到播放队列"
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:57
+msgid "Play After"
+msgstr "之后播放"
+
#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:58
+msgid "Add selected songs after the currently playing track, album, or artist"
+msgstr "添加选定的曲目到正在播放的音轨、专辑或艺人之后"
+
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:62
+msgid "Current Track"
+msgstr "当前音轨"
+
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:63
+msgid "Add selected songs to the play queue after the currently playing song"
+msgstr "添加选定的曲目到播放队列中当前播放的曲目之后"
+
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:67
+msgid "Current Album"
+msgstr "当前专辑"
+
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:68
+msgid "Add selected songs to the play queue after the currently playing album"
+msgstr "添加选定的曲目到播放队列中当前播放的专辑之后"
+
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:72
+msgid "Current Artist"
+msgstr "当前艺人"
+
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:73
+msgid "Add selected songs to the play queue after the currently playing artist"
+msgstr "添加选定的曲目到播放队列中当前播放的艺人之后"
+
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:80
msgid "Refresh random tracks in the play queue"
msgstr "从播放队列中刷新随机曲目"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:64
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:85
+msgid "Randomize the playback order of items in the play queue"
+msgstr "打乱播放队列中项目的播放顺序"
+
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:89
msgid "Add More"
msgstr "添加更多"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:65
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:90
msgid "Add more random tracks to the play queue"
msgstr "添加更多的随机曲目到播放队列"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:72
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:95
msgid "Remove all tracks from the play queue"
msgstr "从播放队列中删除所有曲目"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:79
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:104
msgid "Clear the play queue when quitting"
msgstr "退出时清空播放队列"
@@ -6201,16 +6420,17 @@ msgstr "退出时清空播放队列"
msgid "Remove From Play Queue"
msgstr "从播放队列中删除"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:826
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:967
msgid "Number of _played songs to show"
msgstr "要显示的已播过歌曲的数量(_p)"
-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:832
+#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:973
msgid "Number of _upcoming songs to show"
msgstr "要显示的即将播过歌曲的数量(_u)"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastFeedModel.cs:47
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:165
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:278
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:89
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastEpisodePage.cs:86
msgid "Podcast"
msgstr "播客"
@@ -6220,29 +6440,61 @@ msgstr "播客"
msgid "All Podcasts ({0})"
msgstr "所有播客 ({0})"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:165
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:102
+msgid "Podcasts Folder"
+msgstr "播客目录"
+
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:129
+msgid "Remove Podcast"
+msgstr "移除播客"
+
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:134
+msgid "Disable Auto Updates"
+msgstr "禁止自动更新"
+
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:152
+#, csharp-format
+msgid "Network error updating {0}"
+msgstr "更新 {0} 时出现网络错误"
+
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:158
+#, csharp-format
+msgid "Parsing error updating {0}"
+msgstr "更新 {0} 时出现解析错误"
+
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:161
+#, csharp-format
+msgid "Authentication error updating {0}"
+msgstr "更新 {0} 时出现认证错误"
+
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:164
+#, csharp-format
+msgid "Error updating {0}"
+msgstr "更新 {0} 时出错"
+
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:220
+msgid "Search your podcasts"
+msgstr "搜索您的播客"
+
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:278
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastEpisodePage.cs:88
msgid "Published"
msgstr "已发布的"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:165
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcastStatusIndicator.cs:66
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:278
msgid "New"
msgstr "新的"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:166
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellDownloadStatus.cs:57
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:279
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcastStatusIndicator.cs:66
msgid "Downloaded"
msgstr "已下载的"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellDownloadStatus.cs:58
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellUnheard.cs:58
-msgid "All Items"
-msgstr "所有项目"
-
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellDownloadStatus.cs:59
-msgid "Not Downloaded"
-msgstr "没有下载的"
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:305
+#, csharp-format
+msgid "{0} episode"
+msgid_plural "{0} episodes"
+msgstr[0] "{0} 段剧集"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs:113
msgid "Never updated"
@@ -6266,9 +6518,9 @@ msgstr "正在下载"
msgid "New Items"
msgstr "新项目"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellUnheard.cs:59
-msgid "Old Items"
-msgstr "旧项目"
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellUnheard.cs:58
+msgid "All Items"
+msgstr "所有项目"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs:50
msgid "Downloading Podcast(s)"
@@ -6278,70 +6530,71 @@ msgstr "正在下载播客"
msgid "Cancel all podcast downloads?"
msgstr "取消所有播客下载？"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:71
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:95
-msgid "Check for New Episodes"
-msgstr "检查新剧集"
-
#. "<control><shift>U",
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:72
-msgid "Refresh All Podcasts"
-msgstr "刷新所有播客"
-
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:77
-msgid "Subscribe to Podcast..."
-msgstr "订阅播客..."
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:73
+msgid "Check all podcasts for new episodes"
+msgstr "检查所有播放中的新剧集"
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:78
+msgid "Add Podcast..."
+msgstr "添加播客..."
+
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:79
msgid "Subscribe to a new podcast"
msgstr "订阅新播客"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:89
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:93
msgid "Unsubscribe and Delete"
msgstr "取消订阅并删除"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:101
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:99
+msgid "Check for New Episodes"
+msgstr "检查新剧集"
+
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:105
msgid "Download All Episodes"
msgstr "下载所有剧集"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:107
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:111
msgid "Visit Podcast Homepage"
msgstr "访问播客主页"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:119
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:123
msgid "Mark as New"
msgstr "标志为新"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:125
-msgid "Mark as Old"
-msgstr "标志为旧"
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:129
+msgid "Archive"
+msgstr "仓库"
#. Translators: this is a verb used as a button name, not a noun
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:131
-msgid "Download Podcast(s)"
-msgstr "下载播客"
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:135
+msgid "Download"
+msgstr "下载"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:137
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:141
msgid "Cancel Download"
msgstr "取消下载"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:143
-msgid "Remove Downloaded File(s)"
-msgstr "删除已下载文件"
-
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:149
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:153
msgid "Visit Website"
msgstr "访问网站"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:161
-msgid "Subscribe to Podcast"
-msgstr "订阅播客"
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:165
+msgid "Add Podcast"
+msgstr "添加播客"
+
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:262
+#, csharp-format
+msgid "Delete File"
+msgid_plural "Delete Files"
+msgstr[0] "删除文件"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:325
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:343
msgid "Invalid URL"
msgstr "无效的 URL 地址"
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:326
+#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:344
msgid "Podcast URL is invalid."
msgstr "无效的播客 URL 地址"
@@ -6376,11 +6629,6 @@ msgstr "无可用描述"
msgid "Podcast:"
msgstr "播客："
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:61
-#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:170
-msgid "Subscribe"
-msgstr "订阅"
-
#: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:92
msgid "Subscribe to New Podcast"
msgstr "订阅新播客"
@@ -6440,6 +6688,183 @@ msgstr "在 Web 浏览器中播放..."
msgid "No videos found"
msgstr "未找到视频"
+#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/Accessibility/ColumnHeaderCellTextAccessible.cs:36
+msgid "open context menu"
+msgstr "打开环境菜单"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/Accessibility/ColumnHeaderCellTextAccessible.cs:37
+msgid "click"
+msgstr "点击"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/Accessibility/ColumnHeaderCellTextAccessible.cs:37
+msgid "menu"
+msgstr "菜单"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs:612
+#, csharp-format
+msgid "Hide <i>{0}</i>"
+msgstr "隐藏 <i>{0}</i>"
+
+#. Translators: {0} is substituted with the application name
+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:53
+#, csharp-format
+msgid "{0} Encountered a Fatal Error"
+msgstr "{0} 遇到了致命错误"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:92
+msgid "Error Details"
+msgstr "错误详情"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:136
+msgid "An unhandled exception was thrown: "
+msgstr "抛出了一个无法处理的异常："
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/VersionInformationDialog.cs:58
+msgid "Assembly Version Information"
+msgstr "汇编版本信息"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/VersionInformationDialog.cs:64
+msgid "Assembly Name"
+msgstr "汇编名称"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs:62
+msgid "KB"
+msgstr "KB"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:86
+msgid "Condition:"
+msgstr "状态："
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:104
+msgid "_Match"
+msgstr "匹配(_M)"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:111
+msgid "all"
+msgstr "所有"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:112
+msgid "any"
+msgstr "任何"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:117
+msgid "of the following:"
+msgstr "属于以下的："
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryLimitBox.cs:58
+msgid "_Limit to"
+msgstr "限于(_L)"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryLimitBox.cs:85
+msgid "selected by"
+msgstr "选择依据"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/RelativeTimeSpanQueryValueEntry.cs:42
+msgid "ago"
+msgstr "之前"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:59
+msgid "seconds"
+msgstr "秒"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:62
+msgid "days"
+msgstr "天"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:63
+msgid "weeks"
+msgstr "周"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:64
+msgid "months"
+msgstr "月"
+
+#: ../src/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:65
+msgid "years"
+msgstr "年"
+
+#: ../src/Hyena/Hyena/Hyena.Downloader/DownloadManagerJob.cs:71
+#, csharp-format
+msgid "{0} download at {1}/s"
+msgid_plural "{0} downloads at {1}/s"
+msgstr[0] "{0} 下载，速度为 {1}/s"
+
+#: ../src/Hyena/Hyena/Hyena.Downloader/DownloadManagerJob.cs:79
+#, csharp-format
+msgid "{0} download at {1}/s ({2} pending)"
+msgid_plural "{0} downloads at {1}/s ({2} pending)"
+msgstr[0] "{0} 下载，速度为 {1}/s ({2} 等候)"
+
+#. public static readonly Operator Equal = new Operator ("equals", "= {0}", "==", "=", ":");
+#. public static readonly Operator NotEqual = new Operator ("notEqual", "!= {0}", true, "!=", "!:");
+#. public static readonly Operator LessThanEqual = new Operator ("lessThanEquals", "<= {0}", "<=");
+#. public static readonly Operator GreaterThanEqual = new Operator ("greaterThanEquals", ">= {0}", ">=");
+#: ../src/Hyena/Hyena/Hyena.Query/DateQueryValue.cs:47
+msgid "before"
+msgstr "之前"
+
+#: ../src/Hyena/Hyena/Hyena.Query/DateQueryValue.cs:48
+msgid "after"
+msgstr "之后"
+
+#: ../src/Hyena/Hyena/Hyena.Query/EnumQueryValue.cs:43
+#: ../src/Hyena/Hyena/Hyena.Query/IntegerQueryValue.cs:41
+#: ../src/Hyena/Hyena/Hyena.Query/StringQueryValue.cs:45
+msgid "is"
+msgstr "是"
+
+#: ../src/Hyena/Hyena/Hyena.Query/EnumQueryValue.cs:44
+#: ../src/Hyena/Hyena/Hyena.Query/IntegerQueryValue.cs:42
+#: ../src/Hyena/Hyena/Hyena.Query/StringQueryValue.cs:46
+msgid "is not"
+msgstr "不是"
+
+#: ../src/Hyena/Hyena/Hyena.Query/IntegerQueryValue.cs:43
+#: ../src/Hyena/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:47
+msgid "at most"
+msgstr "至多"
+
+#: ../src/Hyena/Hyena/Hyena.Query/IntegerQueryValue.cs:44
+#: ../src/Hyena/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:46
+msgid "at least"
+msgstr "至少"
+
+#: ../src/Hyena/Hyena/Hyena.Query/IntegerQueryValue.cs:45
+#: ../src/Hyena/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:45
+msgid "less than"
+msgstr "少于"
+
+#. The SQL operators in these Operators are reversed from normal on purpose
+#: ../src/Hyena/Hyena/Hyena.Query/IntegerQueryValue.cs:46
+#: ../src/Hyena/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:44
+msgid "more than"
+msgstr "多于"
+
+#: ../src/Hyena/Hyena/Hyena.Query/NullQueryValue.cs:41
+msgid "empty"
+msgstr "空"
+
+#: ../src/Hyena/Hyena/Hyena.Query/RelativeTimeSpanQueryValue.cs:90
+#, csharp-format
+msgid "{0} ago"
+msgstr "{0} 前"
+
+#: ../src/Hyena/Hyena/Hyena.Query/StringQueryValue.cs:43
+msgid "contains"
+msgstr "包含"
+
+#: ../src/Hyena/Hyena/Hyena.Query/StringQueryValue.cs:44
+msgid "doesn't contain"
+msgstr "不包含"
+
+#: ../src/Hyena/Hyena/Hyena.Query/StringQueryValue.cs:47
+msgid "starts with"
+msgstr "起始于"
+
+#: ../src/Hyena/Hyena/Hyena.Query/StringQueryValue.cs:48
+msgid "ends with"
+msgstr "结束于"
+
#: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:76
msgid "Last.fm Account Login"
msgstr "Last.fm 账户登录"
@@ -6467,8 +6892,8 @@ msgid "This service does not exist."
msgstr "这个服务不存在。"
#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:275
-msgid "This station is only available to subscribers."
-msgstr "该电台只对订阅用户开放。"
+msgid "Stations are only available to paying Last.fm subscribers."
+msgstr "该电台只对付费的 Last.fm 订阅用户开放。"
#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:277
msgid "This station is not available."
@@ -6547,12 +6972,123 @@ msgstr "正在连接到 Last.fm。"
msgid "Connected to Last.fm."
msgstr "已连接到 Last.fm。"
-#: ../src/Libraries/Migo/Migo.Syndication/Feed.cs:149
+#: ../src/Libraries/Migo/Migo.Syndication/Feed.cs:147
#: ../src/Libraries/Migo/Migo.Syndication/RssParser.cs:97
#: ../src/Libraries/Migo/Migo.Syndication/RssParser.cs:100
msgid "Unknown Podcast"
msgstr "未知播客"
+#~ msgid "Average Bitrate"
+#~ msgstr "平均比特率"
+
+#~ msgid "Extreme"
+#~ msgstr "极好"
+
+#~ msgid "Insane"
+#~ msgstr "疯狂"
+
+#~ msgid "LAME Preset"
+#~ msgstr "LAME 预设"
+
+#~ msgid "Medium"
+#~ msgstr "中等"
+
+#~ msgid "Preset"
+#~ msgstr "预设"
+
+#~ msgid "Standard"
+#~ msgstr "标准"
+
+#~ msgid "VBR Mode"
+#~ msgstr "VBR 模式"
+
+#~ msgid "Home Folder"
+#~ msgstr "主目录"
+
+#~ msgid "Manage _Extensions"
+#~ msgstr "管理扩展程序(_E)"
+
+#~ msgid "Manage extensions to add new features to Banshee"
+#~ msgstr "管理扩展程序以为 Banshee 添加新特性"
+
+#~ msgid "_Web Resources"
+#~ msgstr "网络资源(_W)"
+
+#~ msgid "Banshee _User Guide (Wiki)"
+#~ msgstr "Banshee 用户指南(Wiki)(_U)"
+
+#~ msgid "Learn about how to use Banshee"
+#~ msgstr "学习如何使用 Banshee"
+
+#~ msgid "Videos From Photos Folder"
+#~ msgstr "来自于照片目录的视频"
+
+#~ msgid "Audiobooks, etc"
+#~ msgstr "有声读物等"
+
+#~ msgid "Not Downloaded"
+#~ msgstr "没有下载的"
+
+#~ msgid "Old Items"
+#~ msgstr "旧项目"
+
+#~ msgid "Mark as Old"
+#~ msgstr "标志为旧"
+
+#~ msgid "Download Podcast(s)"
+#~ msgstr "下载播客"
+
+#~ msgid "Remove Downloaded File(s)"
+#~ msgstr "删除已下载文件"
+
+#~ msgid "MTP Support Ignoring Device"
+#~ msgstr "MTP 支持忽略设备"
+
+#~ msgid ""
+#~ "Banshee's MTP audio player support can only handle one device at a time."
+#~ msgstr "Banshee 的 MTP 音乐播放器仅支持同时处理一个设备"
+
+#~ msgid "Error Finding MTP Device Support"
+#~ msgstr "寻找 MTP 设备支持时出错"
+
+#~ msgid ""
+#~ "An MTP device was detected, but Banshee was unable to load support for it."
+#~ msgstr "探测到一个 MTP 设备，但 Banshee 无法载入对它的支持。"
+
+#~ msgid "Sign out of Amazon"
+#~ msgstr "登出 Amazon"
+
+#~ msgid "_Cover Art"
+#~ msgstr "封面图片(_C)"
+
+#~ msgid "Manage cover art"
+#~ msgstr "管理封面图片"
+
+#~ msgid "_Download Cover Art"
+#~ msgstr "下载封面图片(_D)"
+
+#~ msgid "Download cover art for all tracks"
+#~ msgstr "为所有曲目下载封面图片"
+
+#, fuzzy
+#~| msgid "Other"
+#~ msgid ", the"
+#~ msgstr "其他"
+
+#, fuzzy
+#~| msgid "Other"
+#~ msgid "the "
+#~ msgstr "其他"
+
+#~ msgid "Refresh All Podcasts"
+#~ msgstr "刷新所有播客"
+
+#~ msgid "Subscribe to Podcast..."
+#~ msgstr "订阅播客..."
+
+#~ msgid "Subscribe to Podcast"
+#~ msgstr "订阅播客"
+
#~ msgid "Save your position in tracks so you can resume playback later."
#~ msgstr "保存曲目中的位置以便您可以回头重新开始回放。"
diff --git a/src/AssemblyInfo.cs b/src/AssemblyInfo.cs
index 1595222..b3e6f96 100644
--- a/src/AssemblyInfo.cs
+++ b/src/AssemblyInfo.cs
@@ -2,8 +2,8 @@ using System;
using System.Reflection;
using System.Runtime.CompilerServices;
-[assembly: ApplicationVersion ("1.9.0", "1.9.0")]
-[assembly: ApplicationBuildInformation ("git-checkout", "linux-gnu", "x86_64", "2010-11-21 12:02:22 SGT")]
+[assembly: ApplicationVersion ("1.9.1", "1.9.1")]
+[assembly: ApplicationBuildInformation ("git-checkout", "freebsd8.1", "amd64", "2010-12-15 21:46:18 MYT")]
[assembly: AssemblyVersion ("1.9.0.0")]
[assembly: AssemblyTitle ("Banshee")]
diff --git a/src/Backends/Banshee.GStreamer/Banshee.GStreamer/AudioCdRipper.cs b/src/Backends/Banshee.GStreamer/Banshee.GStreamer/AudioCdRipper.cs
index a9fd24a..d5d2dcc 100644
--- a/src/Backends/Banshee.GStreamer/Banshee.GStreamer/AudioCdRipper.cs
+++ b/src/Backends/Banshee.GStreamer/Banshee.GStreamer/AudioCdRipper.cs
@@ -142,6 +142,13 @@ namespace Banshee.GStreamer
using (TagList tags = new TagList (track)) {
output_path = String.Format ("{0}.{1}", outputUri.LocalPath, output_extension);
+
+ // Avoid overwriting an existing file
+ int i = 1;
+ while (Banshee.IO.File.Exists (new SafeUri (output_path))) {
+ output_path = String.Format ("{0} ({1}).{2}", outputUri.LocalPath, i++, output_extension);
+ }
+
Log.DebugFormat ("GStreamer ripping track {0} to {1}", trackIndex, output_path);
br_rip_track (handle, trackIndex + 1, output_path, tags.Handle, out taggingSupported);
diff --git a/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs b/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs
index 1d4cf75..426bbfc 100644
--- a/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs
+++ b/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs
@@ -416,7 +416,7 @@ namespace Banshee.GStreamer
{
ready_timeout = 0;
var uri = CurrentUri;
- if (CurrentState == PlayerState.Loading && uri != null && uri.IsLocalPath) {
+ if (CurrentState == PlayerState.Loading && Position == 0 && uri != null && uri.IsLocalPath) {
// This is a dirty workaround. I was seeing the playback get stuck on track transition,
// about one in 20 songs, where it would load the new track's duration, but be stuck at 0:00,
// but if I moved the seek slider it would unstick it, hence setting Position...
@@ -691,6 +691,47 @@ namespace Banshee.GStreamer
}
}
+ public override int SubtitleCount {
+ get { return bp_get_subtitle_count (handle); }
+ }
+
+ public override int SubtitleIndex {
+ set { bp_set_subtitle (handle, value); }
+ }
+
+ public override SafeUri SubtitleUri {
+ set {
+ if (value != null) {
+ IntPtr uri_ptr = GLib.Marshaller.StringToPtrGStrdup (value.AbsoluteUri);
+ try {
+ bp_set_subtitle_uri (handle, uri_ptr);
+ } finally {
+ GLib.Marshaller.Free (uri_ptr);
+ }
+ }
+ }
+ get {
+ IntPtr uri_ptr = IntPtr.Zero;
+ try {
+ uri_ptr = bp_get_subtitle_uri (handle);
+ string uri = GLib.Marshaller.Utf8PtrToString (uri_ptr);
+ return new SafeUri(uri);
+ } finally {
+ GLib.Marshaller.Free (uri_ptr);
+ }
+ }
+ }
+
+ public override string GetSubtitleDescription (int index)
+ {
+ IntPtr desc_ptr = IntPtr.Zero;
+ try {
+ desc_ptr = bp_get_subtitle_description (handle, index);
+ return GLib.Marshaller.Utf8PtrToString (desc_ptr);
+ } finally {
+ GLib.Marshaller.Free (desc_ptr);
+ }
+ }
#region ISupportClutter
@@ -949,5 +990,20 @@ namespace Banshee.GStreamer
[DllImport ("libbanshee.dll")]
private static extern IntPtr clutter_gst_video_sink_new (IntPtr texture);
- }
+
+ [DllImport ("libbanshee.dll")]
+ private static extern int bp_get_subtitle_count (HandleRef player);
+
+ [DllImport ("libbanshee.dll")]
+ private static extern void bp_set_subtitle (HandleRef player, int index);
+
+ [DllImport ("libbanshee.dll")]
+ private static extern void bp_set_subtitle_uri (HandleRef player, IntPtr uri);
+
+ [DllImport ("libbanshee.dll")]
+ private static extern IntPtr bp_get_subtitle_uri (HandleRef player);
+
+ [DllImport ("libbanshee.dll")]
+ private static extern IntPtr bp_get_subtitle_description (HandleRef player, int index);
+ }
}
diff --git a/src/Backends/Banshee.GStreamer/Makefile.in b/src/Backends/Banshee.GStreamer/Makefile.in
index 066b3a6..4ef5b48 100644
--- a/src/Backends/Banshee.GStreamer/Makefile.in
+++ b/src/Backends/Banshee.GStreamer/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Backends/Banshee.GStreamer
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -433,6 +440,8 @@ LINK_GDATA = $(GDATASHARP_LIBS)
LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -549,6 +558,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -562,6 +572,7 @@ REF_EXTENSION_PODCASTING = $(LINK_MIGO_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs b/src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs
index e05fe74..e60320f 100644
--- a/src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs
+++ b/src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs
@@ -175,6 +175,13 @@ namespace Banshee.GStreamerSharp
OnStateChanged (PlayerState.Paused);
}
+ public override string GetSubtitleDescription (int index)
+ {
+ return playbin.GetTextTags (index)
+ .GetTag (Gst.Tag.LanguageCode)
+ .FirstOrDefault (t => t != null);
+ }
+
public override ushort Volume {
get { return (ushort) Math.Round (playbin.Volume * 100.0); }
set { playbin.Volume = (value / 100.0); }
@@ -229,5 +236,22 @@ namespace Banshee.GStreamerSharp
public override VideoDisplayContextType VideoDisplayContextType {
get { return VideoDisplayContextType.Unsupported; }
}
+
+ public override int SubtitleCount {
+ get { return playbin.NText; }
+ }
+
+ public override int SubtitleIndex {
+ set {
+ if (value >= 0 && value < SubtitleCount) {
+ playbin.CurrentText = value;
+ }
+ }
+ }
+
+ public override SafeUri SubtitleUri {
+ set { playbin.Suburi = value.AbsoluteUri; }
+ get { return playbin.Suburi; }
+ }
}
}
diff --git a/src/Backends/Banshee.GStreamerSharp/Makefile.in b/src/Backends/Banshee.GStreamerSharp/Makefile.in
index 4f04e39..f01d2d4 100644
--- a/src/Backends/Banshee.GStreamerSharp/Makefile.in
+++ b/src/Backends/Banshee.GStreamerSharp/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Backends/Banshee.GStreamerSharp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -427,6 +434,8 @@ RESOURCES = Banshee.GStreamerSharp.addin.xml
@ENABLE_GST_SHARP_TRUE at LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
@ENABLE_GST_SHARP_TRUE at LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
@ENABLE_GST_SHARP_TRUE at LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+ at ENABLE_GST_SHARP_TRUE@LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+ at ENABLE_GST_SHARP_TRUE@LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
@ENABLE_GST_SHARP_TRUE at DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -543,6 +552,7 @@ RESOURCES = Banshee.GStreamerSharp.addin.xml
@ENABLE_GST_SHARP_TRUE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@ENABLE_GST_SHARP_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
+ at ENABLE_GST_SHARP_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@ENABLE_GST_SHARP_TRUE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@ENABLE_GST_SHARP_TRUE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@ENABLE_GST_SHARP_TRUE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -556,6 +566,7 @@ RESOURCES = Banshee.GStreamerSharp.addin.xml
@ENABLE_GST_SHARP_TRUE at REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_GST_SHARP_TRUE at REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_GST_SHARP_TRUE at REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+ at ENABLE_GST_SHARP_TRUE@REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
@ENABLE_GST_SHARP_TRUE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Backends/Banshee.Gio/Makefile.in b/src/Backends/Banshee.Gio/Makefile.in
index f608cac..9c19be1 100644
--- a/src/Backends/Banshee.Gio/Makefile.in
+++ b/src/Backends/Banshee.Gio/Makefile.in
@@ -43,14 +43,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Backends/Banshee.Gio
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -74,9 +66,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -200,6 +202,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -219,6 +223,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -326,6 +332,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -372,7 +380,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -453,6 +460,8 @@ EXTRA_BUNDLE = $(GIOSHARP_ASSEMBLIES)
@ENABLE_GIO_TRUE at LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
@ENABLE_GIO_TRUE at LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
@ENABLE_GIO_TRUE at LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+ at ENABLE_GIO_TRUE@LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+ at ENABLE_GIO_TRUE@LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
@ENABLE_GIO_TRUE at DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -569,6 +578,7 @@ EXTRA_BUNDLE = $(GIOSHARP_ASSEMBLIES)
@ENABLE_GIO_TRUE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@ENABLE_GIO_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
+ at ENABLE_GIO_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@ENABLE_GIO_TRUE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@ENABLE_GIO_TRUE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@ENABLE_GIO_TRUE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -582,6 +592,7 @@ EXTRA_BUNDLE = $(GIOSHARP_ASSEMBLIES)
@ENABLE_GIO_TRUE at REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_GIO_TRUE at REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_GIO_TRUE at REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+ at ENABLE_GIO_TRUE@REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
@ENABLE_GIO_TRUE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Backends/Banshee.Gnome/Makefile.in b/src/Backends/Banshee.Gnome/Makefile.in
index 04e5d0a..cf9e2c9 100644
--- a/src/Backends/Banshee.Gnome/Makefile.in
+++ b/src/Backends/Banshee.Gnome/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Backends/Banshee.Gnome
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -435,6 +442,8 @@ RESOURCES = \
@ENABLE_GNOME_TRUE at LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
@ENABLE_GNOME_TRUE at LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
@ENABLE_GNOME_TRUE at LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+ at ENABLE_GNOME_TRUE@LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+ at ENABLE_GNOME_TRUE@LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
@ENABLE_GNOME_TRUE at DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -551,6 +560,7 @@ RESOURCES = \
@ENABLE_GNOME_TRUE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@ENABLE_GNOME_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
+ at ENABLE_GNOME_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@ENABLE_GNOME_TRUE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@ENABLE_GNOME_TRUE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@ENABLE_GNOME_TRUE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -564,6 +574,7 @@ RESOURCES = \
@ENABLE_GNOME_TRUE at REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_GNOME_TRUE at REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_GNOME_TRUE at REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+ at ENABLE_GNOME_TRUE@REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
@ENABLE_GNOME_TRUE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Backends/Banshee.Hal/Makefile.in b/src/Backends/Banshee.Hal/Makefile.in
index fa2a353..d30a5f5 100644
--- a/src/Backends/Banshee.Hal/Makefile.in
+++ b/src/Backends/Banshee.Hal/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Backends/Banshee.Hal
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -439,6 +446,8 @@ RESOURCES = Banshee.Hal.addin.xml
@ENABLE_HAL_TRUE at LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
@ENABLE_HAL_TRUE at LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
@ENABLE_HAL_TRUE at LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+ at ENABLE_HAL_TRUE@LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+ at ENABLE_HAL_TRUE@LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
@ENABLE_HAL_TRUE at DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -555,6 +564,7 @@ RESOURCES = Banshee.Hal.addin.xml
@ENABLE_HAL_TRUE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@ENABLE_HAL_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
+ at ENABLE_HAL_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@ENABLE_HAL_TRUE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@ENABLE_HAL_TRUE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@ENABLE_HAL_TRUE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -568,6 +578,7 @@ RESOURCES = Banshee.Hal.addin.xml
@ENABLE_HAL_TRUE at REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_HAL_TRUE at REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_HAL_TRUE at REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+ at ENABLE_HAL_TRUE@REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
@ENABLE_HAL_TRUE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Backends/Banshee.NowPlaying.X11/Makefile.in b/src/Backends/Banshee.NowPlaying.X11/Makefile.in
index 29d2f57..93057cb 100644
--- a/src/Backends/Banshee.NowPlaying.X11/Makefile.in
+++ b/src/Backends/Banshee.NowPlaying.X11/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Backends/Banshee.NowPlaying.X11
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -239,6 +241,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -258,6 +262,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -365,6 +371,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -411,7 +419,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -466,6 +473,8 @@ RESOURCES = Banshee.NowPlaying.X11.addin.xml
@HAVE_XVIDMODE_TRUE at LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
@HAVE_XVIDMODE_TRUE at LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
@HAVE_XVIDMODE_TRUE at LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+ at HAVE_XVIDMODE_TRUE@LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+ at HAVE_XVIDMODE_TRUE@LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
@HAVE_XVIDMODE_TRUE at DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -582,6 +591,7 @@ RESOURCES = Banshee.NowPlaying.X11.addin.xml
@HAVE_XVIDMODE_TRUE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@HAVE_XVIDMODE_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
+ at HAVE_XVIDMODE_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@HAVE_XVIDMODE_TRUE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@HAVE_XVIDMODE_TRUE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@HAVE_XVIDMODE_TRUE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -595,6 +605,7 @@ RESOURCES = Banshee.NowPlaying.X11.addin.xml
@HAVE_XVIDMODE_TRUE at REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_XVIDMODE_TRUE at REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_XVIDMODE_TRUE at REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+ at HAVE_XVIDMODE_TRUE@REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
@HAVE_XVIDMODE_TRUE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Backends/Banshee.NowPlaying.X11/libbnpx11/Makefile.in b/src/Backends/Banshee.NowPlaying.X11/libbnpx11/Makefile.in
index 02d1125..a2387d6 100644
--- a/src/Backends/Banshee.NowPlaying.X11/libbnpx11/Makefile.in
+++ b/src/Backends/Banshee.NowPlaying.X11/libbnpx11/Makefile.in
@@ -40,14 +40,6 @@ DIST_COMMON = $(am__noinst_HEADERS_DIST) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -71,9 +63,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -225,6 +227,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -244,6 +248,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -351,6 +357,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -397,7 +405,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/src/Backends/Banshee.Osx/Makefile.in b/src/Backends/Banshee.Osx/Makefile.in
index 66d63a1..b8b9ddd 100644
--- a/src/Backends/Banshee.Osx/Makefile.in
+++ b/src/Backends/Banshee.Osx/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Backends/Banshee.Osx
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -437,6 +444,8 @@ RESOURCES = Banshee.Osx.addin.xml
@PLATFORM_DARWIN_TRUE at LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
@PLATFORM_DARWIN_TRUE at LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
@PLATFORM_DARWIN_TRUE at LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+ at PLATFORM_DARWIN_TRUE@LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+ at PLATFORM_DARWIN_TRUE@LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
@PLATFORM_DARWIN_TRUE at DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -553,6 +562,7 @@ RESOURCES = Banshee.Osx.addin.xml
@PLATFORM_DARWIN_TRUE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@PLATFORM_DARWIN_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
+ at PLATFORM_DARWIN_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@PLATFORM_DARWIN_TRUE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@PLATFORM_DARWIN_TRUE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@PLATFORM_DARWIN_TRUE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -566,6 +576,7 @@ RESOURCES = Banshee.Osx.addin.xml
@PLATFORM_DARWIN_TRUE at REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@PLATFORM_DARWIN_TRUE at REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@PLATFORM_DARWIN_TRUE at REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+ at PLATFORM_DARWIN_TRUE@REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
@PLATFORM_DARWIN_TRUE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Backends/Banshee.Unix/Makefile.in b/src/Backends/Banshee.Unix/Makefile.in
index 3c867ce..e8688b9 100644
--- a/src/Backends/Banshee.Unix/Makefile.in
+++ b/src/Backends/Banshee.Unix/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Backends/Banshee.Unix
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -430,6 +437,8 @@ LINK_GDATA = $(GDATASHARP_LIBS)
LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -546,6 +555,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -559,6 +569,7 @@ REF_EXTENSION_PODCASTING = $(LINK_MIGO_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Backends/Makefile.in b/src/Backends/Makefile.in
index 6b7983a..5a837b5 100644
--- a/src/Backends/Makefile.in
+++ b/src/Backends/Makefile.in
@@ -37,14 +37,6 @@ subdir = src/Backends
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -68,9 +60,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -212,6 +214,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -231,6 +235,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -338,6 +344,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -384,7 +392,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/src/Clients/Beroe/Makefile.in b/src/Clients/Beroe/Makefile.in
index 9afe77c..8b1c69b 100644
--- a/src/Clients/Beroe/Makefile.in
+++ b/src/Clients/Beroe/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Clients/Beroe
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -423,6 +430,8 @@ LINK_GDATA = $(GDATASHARP_LIBS)
LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -539,6 +548,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -552,6 +562,7 @@ REF_EXTENSION_PODCASTING = $(LINK_MIGO_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Clients/Booter/Makefile.in b/src/Clients/Booter/Makefile.in
index 49ddc29..c467e7d 100644
--- a/src/Clients/Booter/Makefile.in
+++ b/src/Clients/Booter/Makefile.in
@@ -43,14 +43,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Clients/Booter
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -74,9 +66,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -200,6 +202,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -219,6 +223,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -326,6 +332,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -372,7 +380,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -424,6 +431,8 @@ LINK_GDATA = $(GDATASHARP_LIBS)
LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -540,6 +549,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -553,6 +563,7 @@ REF_EXTENSION_PODCASTING = $(LINK_MIGO_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Clients/Halie/Makefile.in b/src/Clients/Halie/Makefile.in
index 4cb7542..ff0eaa6 100644
--- a/src/Clients/Halie/Makefile.in
+++ b/src/Clients/Halie/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Clients/Halie
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -423,6 +430,8 @@ LINK_GDATA = $(GDATASHARP_LIBS)
LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -539,6 +548,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -552,6 +562,7 @@ REF_EXTENSION_PODCASTING = $(LINK_MIGO_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Clients/Makefile.in b/src/Clients/Makefile.in
index 55333a1..bd1d26c 100644
--- a/src/Clients/Makefile.in
+++ b/src/Clients/Makefile.in
@@ -37,14 +37,6 @@ subdir = src/Clients
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -68,9 +60,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -212,6 +214,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -231,6 +235,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -338,6 +344,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -384,7 +392,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/src/Clients/MeeGo/Makefile.in b/src/Clients/MeeGo/Makefile.in
index d395b5f..b03bbb1 100644
--- a/src/Clients/MeeGo/Makefile.in
+++ b/src/Clients/MeeGo/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Clients/MeeGo
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -423,6 +430,8 @@ SOURCES = Banshee.MeeGo.Client/MeeGoClient.cs
@HAVE_MEEGO_TRUE at LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
@HAVE_MEEGO_TRUE at LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
@HAVE_MEEGO_TRUE at LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+ at HAVE_MEEGO_TRUE@LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+ at HAVE_MEEGO_TRUE@LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
@HAVE_MEEGO_TRUE at DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -539,6 +548,7 @@ SOURCES = Banshee.MeeGo.Client/MeeGoClient.cs
@HAVE_MEEGO_TRUE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@HAVE_MEEGO_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
+ at HAVE_MEEGO_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@HAVE_MEEGO_TRUE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@HAVE_MEEGO_TRUE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@HAVE_MEEGO_TRUE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -552,6 +562,7 @@ SOURCES = Banshee.MeeGo.Client/MeeGoClient.cs
@HAVE_MEEGO_TRUE at REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_MEEGO_TRUE at REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_MEEGO_TRUE at REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+ at HAVE_MEEGO_TRUE@REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
@HAVE_MEEGO_TRUE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Clients/Muinshee/Makefile.in b/src/Clients/Muinshee/Makefile.in
index bcba876..76be534 100644
--- a/src/Clients/Muinshee/Makefile.in
+++ b/src/Clients/Muinshee/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Clients/Muinshee
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -434,6 +441,8 @@ LINK_GDATA = $(GDATASHARP_LIBS)
LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -550,6 +559,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -563,6 +573,7 @@ REF_EXTENSION_PODCASTING = $(LINK_MIGO_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Clients/Nereid/Makefile.in b/src/Clients/Nereid/Makefile.in
index c5dd550..2d518f2 100644
--- a/src/Clients/Nereid/Makefile.in
+++ b/src/Clients/Nereid/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Clients/Nereid
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -427,6 +434,8 @@ LINK_GDATA = $(GDATASHARP_LIBS)
LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -543,6 +552,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -556,6 +566,7 @@ REF_EXTENSION_PODCASTING = $(LINK_MIGO_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Core/Banshee.CollectionIndexer/Makefile.in b/src/Core/Banshee.CollectionIndexer/Makefile.in
index 7c43c98..c0bf4a0 100644
--- a/src/Core/Banshee.CollectionIndexer/Makefile.in
+++ b/src/Core/Banshee.CollectionIndexer/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Core/Banshee.CollectionIndexer
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -432,6 +439,8 @@ LINK_GDATA = $(GDATASHARP_LIBS)
LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -548,6 +557,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -561,6 +571,7 @@ REF_EXTENSION_PODCASTING = $(LINK_MIGO_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Core/Banshee.Core/Makefile.in b/src/Core/Banshee.Core/Makefile.in
index a118860..ecca965 100644
--- a/src/Core/Banshee.Core/Makefile.in
+++ b/src/Core/Banshee.Core/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Core/Banshee.Core
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -489,6 +496,8 @@ LINK_GDATA = $(GDATASHARP_LIBS)
LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -605,6 +614,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -618,6 +628,7 @@ REF_EXTENSION_PODCASTING = $(LINK_MIGO_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Core/Banshee.Core/Resources/contributors.xml b/src/Core/Banshee.Core/Resources/contributors.xml
index ede6c3c..5b392a1 100644
--- a/src/Core/Banshee.Core/Resources/contributors.xml
+++ b/src/Core/Banshee.Core/Resources/contributors.xml
@@ -17,6 +17,7 @@
<contributor>Andrew Conkling</contributor>
<contributor>Andrés G. Aragoneses</contributor>
<contributor>Andy Midgette</contributor>
+ <contributor>Aran Cox</contributor>
<contributor>Arthur Carli</contributor>
<contributor>Arun Raghavan</contributor>
<contributor>Aurélien Mino</contributor>
@@ -115,7 +116,7 @@
<contributor>Nicolò Chieffo</contributor>
<contributor>Nils Naumann</contributor>
<contributor>Oben Sonne</contributor>
- <contributor>Olivier Duff</contributor>
+ <contributor>Olivier Dufour</contributor>
<contributor>Oscar Forero</contributor>
<contributor>Pacho Ramos</contributor>
<contributor>Patrick van Staveren</contributor>
@@ -130,8 +131,10 @@
<contributor>Raimo Radczewski</contributor>
<contributor>Robin Stocker</contributor>
<contributor>Roderich Schupp</contributor>
+ <contributor>Rodney Dawes</contributor>
<contributor>Romain Tartière</contributor>
<contributor>Ruben Vermeersch</contributor>
+ <contributor>Samuel Gyger</contributor>
<contributor>Sandy Armstrong</contributor>
<contributor>Scott Peterson</contributor>
<contributor>Sebastian Dröge</contributor>
@@ -145,6 +148,7 @@
<contributor>Trey Ethridge</contributor>
<contributor>Valentin Sawadski</contributor>
<contributor>Will Farrington</contributor>
+ <contributor>William Friesen</contributor>
<contributor>William Pettersson</contributor>
<contributor>Wouter Bolsterlee</contributor>
<contributor>Zhou Ting</contributor>
diff --git a/src/Core/Banshee.Core/Resources/translators.xml b/src/Core/Banshee.Core/Resources/translators.xml
index 3684403..3c5912c 100644
--- a/src/Core/Banshee.Core/Resources/translators.xml
+++ b/src/Core/Banshee.Core/Resources/translators.xml
@@ -212,6 +212,7 @@
<language code="zh_CN" name="Simplified Chinese">
<person>Aron Xu</person>
<person>Tao Wang</person>
+ <person>Yinghua Wang</person>
<person>甘露(Gan Lu)</person>
</language>
<language code="zh_HK" name="Chinese">
diff --git a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseImportManager.cs b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseImportManager.cs
index 75b7a52..337b54b 100644
--- a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseImportManager.cs
+++ b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseImportManager.cs
@@ -174,7 +174,7 @@ namespace Banshee.Collection.Database
// because of transactions. Needs to be fixed in HyenaDatabaseConnection.
ServiceManager.DbConnection.BeginTransaction ();
try {
- track = new DatabaseTrackInfo ();
+ track = new DatabaseTrackInfo () { Uri = uri };
using (var file = StreamTagger.ProcessUri (uri)) {
StreamTagger.TrackInfoMerge (track, file, false, true);
}
diff --git a/src/Core/Banshee.Services/Banshee.MediaEngine/NullPlayerEngine.cs b/src/Core/Banshee.Services/Banshee.MediaEngine/NullPlayerEngine.cs
index 32a846b..5dd3a6a 100644
--- a/src/Core/Banshee.Services/Banshee.MediaEngine/NullPlayerEngine.cs
+++ b/src/Core/Banshee.Services/Banshee.MediaEngine/NullPlayerEngine.cs
@@ -93,5 +93,22 @@ namespace Banshee.MediaEngine
get { return "Null Player Engine"; }
}
+ public override int SubtitleCount {
+ get { return 0; }
+ }
+
+ public override int SubtitleIndex {
+ set { return; }
+ }
+
+ public override SafeUri SubtitleUri {
+ set { return; }
+ get { return null; }
+ }
+
+ public override string GetSubtitleDescription (int index)
+ {
+ return string.Empty;
+ }
}
}
diff --git a/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngine.cs b/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngine.cs
index f34febc..5365747 100644
--- a/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngine.cs
+++ b/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngine.cs
@@ -256,6 +256,8 @@ namespace Banshee.MediaEngine
OnEventChanged (PlayerEvent.TrackInfoUpdated);
}
+ public abstract string GetSubtitleDescription (int index);
+
public TrackInfo CurrentTrack {
get { return current_track; }
}
@@ -318,5 +320,18 @@ namespace Banshee.MediaEngine
set { }
get { return IntPtr.Zero; }
}
+
+ public abstract int SubtitleCount {
+ get;
+ }
+
+ public abstract int SubtitleIndex {
+ set;
+ }
+
+ public abstract SafeUri SubtitleUri {
+ set;
+ get;
+ }
}
}
diff --git a/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs b/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs
index 5d52c56..8d30711 100644
--- a/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs
+++ b/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs
@@ -534,6 +534,11 @@ namespace Banshee.MediaEngine
CurrentState == PlayerState.Contacting;
}
+ public string GetSubtitleDescription (int index)
+ {
+ return active_engine.GetSubtitleDescription (index);
+ }
+
private void CheckPending ()
{
if (pending_engine != null && pending_engine != active_engine) {
@@ -626,6 +631,19 @@ namespace Banshee.MediaEngine
get { return ((active_engine is IEqualizer) && active_engine.SupportsEqualizer); }
}
+ public int SubtitleCount {
+ get { return active_engine.SubtitleCount; }
+ }
+
+ public int SubtitleIndex {
+ set { active_engine.SubtitleIndex = value; }
+ }
+
+ public SafeUri SubtitleUri {
+ set { active_engine.SubtitleUri = value; }
+ get { return active_engine.SubtitleUri; }
+ }
+
public VideoDisplayContextType VideoDisplayContextType {
get { return active_engine.VideoDisplayContextType; }
}
diff --git a/src/Core/Banshee.Services/Banshee.Metrics/BansheeMetrics.cs b/src/Core/Banshee.Services/Banshee.Metrics/BansheeMetrics.cs
index e1e8fb6..139c2fa 100644
--- a/src/Core/Banshee.Services/Banshee.Metrics/BansheeMetrics.cs
+++ b/src/Core/Banshee.Services/Banshee.Metrics/BansheeMetrics.cs
@@ -309,7 +309,7 @@ namespace Banshee.Metrics
public static SchemaEntry<bool> EnableCollection = new SchemaEntry<bool> (
"core", "send_anonymous_usage_data", false, // disabled by default
- Catalog.GetString ("Improve Banshee by sending anonymous usage data"), null
+ "Improve Banshee by sending anonymous usage data", null
);
}
}
diff --git a/src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs b/src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs
index fdba642..8ed6391 100644
--- a/src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs
+++ b/src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs
@@ -65,7 +65,9 @@ namespace Banshee.Preferences
var misc = new Section ("misc", Catalog.GetString ("Miscellaneous"), 20);
general.Add (misc);
- var anon_data = misc.Add (Banshee.Metrics.BansheeMetrics.EnableCollection);
+ var anon_data = misc.Add (new SchemaPreference<bool> (Banshee.Metrics.BansheeMetrics.EnableCollection,
+ Catalog.GetString ("Improve Banshee by sending anonymous usage data"))
+ );
anon_data.ValueChanged += (o) => {
if (Banshee.Metrics.BansheeMetrics.EnableCollection.Get ()) {
Banshee.Metrics.BansheeMetrics.Start ();
diff --git a/src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs b/src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs
index 0ccbe50..73bb600 100644
--- a/src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs
+++ b/src/Core/Banshee.Services/Banshee.Streaming/RadioTrackInfo.cs
@@ -150,7 +150,7 @@ namespace Banshee.Streaming
PlayCore ();
} else {
// Stop playing until we load this radio station and play it
- ServiceManager.PlayerEngine.Close ();
+ ServiceManager.PlayerEngine.Close (true);
ServiceManager.PlayerEngine.TrackIntercept += OnTrackIntercept;
diff --git a/src/Core/Banshee.Services/Makefile.in b/src/Core/Banshee.Services/Makefile.in
index 4ec68db..b057be9 100644
--- a/src/Core/Banshee.Services/Makefile.in
+++ b/src/Core/Banshee.Services/Makefile.in
@@ -43,14 +43,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Core/Banshee.Services
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -74,9 +66,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -201,6 +203,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -220,6 +224,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -327,6 +333,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -373,7 +381,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -653,6 +660,8 @@ LINK_GDATA = $(GDATASHARP_LIBS)
LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -769,6 +778,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -782,6 +792,7 @@ REF_EXTENSION_PODCASTING = $(LINK_MIGO_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/TrackFilterListView.cs b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/TrackFilterListView.cs
index ca6ccff..d49b99a 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/TrackFilterListView.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/TrackFilterListView.cs
@@ -71,7 +71,7 @@ namespace Banshee.Collection.Gui
protected override bool OnPopupMenu ()
{
- if (!HasTrackContextMenu || (Selection is SelectAllSelection && Selection.AllSelected)) {
+ if (!HasTrackContextMenu) {
return false;
}
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs b/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs
index 8552df2..3ac3fef 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs
@@ -69,16 +69,19 @@ namespace Banshee.Gui.TrackEditor
view.HasTooltip = true;
view.QueryTooltip += HandleQueryTooltip;
- name_renderer = new CellRendererText ();
- name_renderer.Alignment = Pango.Alignment.Right;
- name_renderer.Weight = (int)Pango.Weight.Bold;
- name_renderer.Xalign = 1.0f;
- name_renderer.Scale = Pango.Scale.Small;
+ name_renderer = new CellRendererText () {
+ Alignment = Pango.Alignment.Right,
+ Weight = (int)Pango.Weight.Bold,
+ Xalign = 1.0f,
+ Yalign = 0.0f,
+ Scale = Pango.Scale.Small
+ };
value_renderer = new CellRendererText ();
- value_renderer.Ellipsize = Pango.EllipsizeMode.End;
value_renderer.Editable = true;
value_renderer.Scale = Pango.Scale.Small;
+ value_renderer.Ellipsize = Pango.EllipsizeMode.End;
+ value_renderer.WrapMode = Pango.WrapMode.Word;
value_renderer.EditingStarted += delegate(object o, EditingStartedArgs args) {
var entry = args.Editable as Entry;
if (entry != null) {
@@ -86,13 +89,30 @@ namespace Banshee.Gui.TrackEditor
}
};
+ view.SizeAllocated += delegate { UpdateWrapWidth (); };
+ view.Realized += delegate { UpdateWrapWidth (); };
+
view.AppendColumn (Catalog.GetString ("Name"), name_renderer, "text", 0);
- view.AppendColumn (Catalog.GetString ("Value"), value_renderer, "text", 1);
+ view.AppendColumn (Catalog.GetString ("Value"), value_renderer, "text", 1, "ellipsize", 3, "ellipsize-set", 4, "wrap-width", 5);
Add (view);
ShowAll ();
}
+ public void UpdateWrapWidth ()
+ {
+ if (view.IsRealized) {
+ var width = GetValueWidth ();
+
+ model.Foreach ((TreeModel m, TreePath path, TreeIter iter) => {
+ if ((Pango.EllipsizeMode) model.GetValue (iter, 3) != Pango.EllipsizeMode.End) {
+ model.SetValue (iter, 5, width);
+ }
+ return false;
+ });
+ }
+ }
+
public CellRendererText NameRenderer { get { return name_renderer; } }
public CellRendererText ValueRenderer { get { return value_renderer; } }
@@ -101,6 +121,15 @@ namespace Banshee.Gui.TrackEditor
return (bool)model.GetValue (iter, 2);
}
+ private int GetValueWidth ()
+ {
+ var column = view.GetColumn (1);
+ var column_width = column.Width - 2 * value_renderer.Xpad -
+ (int)view.StyleGetProperty ("horizontal-separator") -
+ 2 * (int)view.StyleGetProperty ("focus-line-width");
+ return (int) column_width;
+ }
+
private void HandleQueryTooltip(object o, QueryTooltipArgs args)
{
TreePath path;
@@ -117,12 +146,9 @@ namespace Banshee.Gui.TrackEditor
int width, height;
layout.GetPixelSize (out width, out height);
- var column = view.GetColumn (1);
- var column_width = column.Width - 2 * value_renderer.Xpad -
- (int)view.StyleGetProperty ("horizontal-separator") -
- 2 * (int)view.StyleGetProperty ("focus-line-width");
-
+ var column_width = GetValueWidth ();
if (width > column_width) {
+ var column = view.GetColumn (1);
args.Tooltip.Text = text;
view.SetTooltipCell (args.Tooltip, path, column, value_renderer);
args.RetVal = true;
@@ -225,23 +251,28 @@ namespace Banshee.Gui.TrackEditor
private void CreateModel ()
{
if (model == null) {
- model = new ListStore (typeof (string), typeof (string), typeof (bool));
+ model = new ListStore (typeof (string), typeof (string), typeof (bool), typeof (Pango.EllipsizeMode), typeof(bool), typeof (int));
view.Model = model;
}
}
public void AddItem (string name, object value)
{
+ AddItem (name, value, false);
+ }
+
+ public void AddItem (string name, object value, bool wrapText)
+ {
CreateModel ();
if (name != null && value != null) {
- model.AppendValues (name, value.ToString (), false);
+ model.AppendValues (name, value.ToString (), false, wrapText ? Pango.EllipsizeMode.None : Pango.EllipsizeMode.End, true, wrapText ? 10 : -1);
}
}
public void AddSeparator ()
{
CreateModel ();
- model.AppendValues (String.Empty, String.Empty, true);
+ model.AppendValues (String.Empty, String.Empty, true, Pango.EllipsizeMode.End, false, -1);
}
public int Order {
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs b/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs
index 949489b..89d7d85 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs
@@ -132,6 +132,8 @@ namespace Banshee.Gui.TrackEditor
LoadModifiers ();
LoadTrackToEditor ();
+
+ HideSingleTab ();
}
#region UI Building
@@ -453,6 +455,24 @@ namespace Banshee.Gui.TrackEditor
}
}
+ private void HideSingleTab ()
+ {
+ int visible_pages = 0;
+ foreach (ITrackEditorPage page in pages) {
+ if (page.Widget.Visible) {
+ visible_pages++;
+ }
+ }
+ if (visible_pages == 1) {
+ notebook.ShowTabs = false;
+ notebook.ShowBorder = false;
+ var container = notebook.CurrentPageWidget as Container;
+ if (container != null) {
+ container.BorderWidth = 0;
+ }
+ }
+ }
+
private void LoadCoverArt (TrackInfo current_track)
{
if (current_track == null)
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/MainMenu.cs b/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/MainMenu.cs
index 2c71331..2879951 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/MainMenu.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/MainMenu.cs
@@ -48,6 +48,9 @@ namespace Banshee.Gui.Widgets
((PlaybackShuffleActions)interface_service.FindActionGroup ("PlaybackShuffle")).AttachSubmenu (
"/MainMenu/PlaybackMenu/ShuffleMenu");
+ ((PlaybackSubtitleActions)interface_service.FindActionGroup ("PlaybackSubtitle")).AttachSubmenu (
+ "/MainMenu/PlaybackMenu/SubtitleMenu");
+
menu.Show ();
PackStart (menu, true, true, 0);
}
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui/InterfaceActionService.cs b/src/Core/Banshee.ThickClient/Banshee.Gui/InterfaceActionService.cs
index 085e33e..bde46f8 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui/InterfaceActionService.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui/InterfaceActionService.cs
@@ -130,9 +130,10 @@ namespace Banshee.Gui
}
} else if (args.Change == ExtensionChange.Remove) {
if (extension_actions.ContainsKey (node.Id)) {
+ string name = extension_actions[node.Id].Name;
extension_actions[node.Id].Dispose ();
- Log.DebugFormat ("Extension actions unloaded: {0}", extension_actions[node.Id].Name);
extension_actions.Remove (node.Id);
+ Log.DebugFormat ("Extension actions unloaded: {0}", name);
}
}
} catch (Exception e) {
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs b/src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs
index 6121a09..5c9844b 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs
@@ -45,9 +45,11 @@ namespace Banshee.Gui
{
public class PlaybackActions : BansheeActionGroup
{
+ private string play_tooltip;
private Gtk.Action play_pause_action;
private PlaybackRepeatActions repeat_actions;
private PlaybackShuffleActions shuffle_actions;
+ private PlaybackSubtitleActions subtitle_actions;
public PlaybackRepeatActions RepeatActions {
get { return repeat_actions; }
@@ -57,14 +59,19 @@ namespace Banshee.Gui
get { return shuffle_actions; }
}
+ public PlaybackSubtitleActions SubtitleActions {
+ get { return subtitle_actions; }
+ }
+
public PlaybackActions () : base ("Playback")
{
ImportantByDefault = false;
+ play_tooltip = Catalog.GetString ("Play the current item");
Add (new ActionEntry [] {
new ActionEntry ("PlayPauseAction", null,
Catalog.GetString ("_Play"), "space",
- Catalog.GetString ("Play or pause the current item"), OnPlayPauseAction),
+ play_tooltip, OnPlayPauseAction),
new ActionEntry ("NextAction", null,
Catalog.GetString ("_Next"), "N",
@@ -114,6 +121,7 @@ namespace Banshee.Gui
repeat_actions = new PlaybackRepeatActions (Actions);
shuffle_actions = new PlaybackShuffleActions (Actions, this);
+ subtitle_actions = new PlaybackSubtitleActions (Actions) { Sensitive = false };
}
private void OnPlayerEvent (PlayerEventArgs args)
@@ -142,9 +150,13 @@ namespace Banshee.Gui
}
switch (args.Current) {
+ case PlayerState.Loaded:
+ ShowStopAction ();
+ subtitle_actions.Sensitive = ServiceManager.PlayerEngine.CurrentTrack.HasAttribute (TrackMediaAttributes.VideoStream);
+ subtitle_actions.ReloadEmbeddedSubtitle ();
+ break;
case PlayerState.Contacting:
case PlayerState.Loading:
- case PlayerState.Loaded:
case PlayerState.Playing:
ShowStopAction ();
break;
@@ -152,6 +164,7 @@ namespace Banshee.Gui
ShowPlay ();
break;
case PlayerState.Idle:
+ subtitle_actions.Sensitive = false;
ShowPlay ();
break;
default:
@@ -189,12 +202,14 @@ namespace Banshee.Gui
{
play_pause_action.Label = Catalog.GetString ("_Pause");
play_pause_action.StockId = Gtk.Stock.MediaPause;
+ play_pause_action.Tooltip = Catalog.GetString ("Pause the current item");
}
private void ShowPlay ()
{
play_pause_action.Label = Catalog.GetString ("_Play");
play_pause_action.StockId = Gtk.Stock.MediaPlay;
+ play_pause_action.Tooltip = play_tooltip;
}
private void ShowStop ()
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs b/src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs
new file mode 100644
index 0000000..749b8cc
--- /dev/null
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs
@@ -0,0 +1,220 @@
+//
+// PlaybackSubtitleActions.cs
+//
+// Author:
+// Olivier Dufour <olivier.duff at gmail.com>
+//
+// Copyright 2010 Olivier Dufour
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Collections;
+
+using Gtk;
+
+using Banshee.ServiceStack;
+using Banshee.I18n;
+using Banshee.Collection;
+
+using Hyena;
+
+namespace Banshee.Gui
+{
+ public class PlaybackSubtitleActions : BansheeActionGroup, IEnumerable<RadioAction>
+ {
+ private readonly List<RadioActionEntry> embedded_subtitles_actions = new List<RadioActionEntry> ();
+ public event EventHandler Changed;
+ private Menu mainMenu;
+
+ public new bool Sensitive {
+ get { return base.Sensitive; }
+ set {
+ base.Sensitive = value;
+ OnChanged ();
+ }
+ }
+
+ public PlaybackSubtitleActions (InterfaceActionService actionService)
+ : base (actionService, "PlaybackSubtitle")
+ {
+ Actions.AddActionGroup (this);
+
+ Add (new ActionEntry [] {
+ new ActionEntry ("SubtitleMenuAction", null,
+ Catalog.GetString ("Subtitle"), null,
+ Catalog.GetString ("Subtitle"), null),
+ new ActionEntry ("LoadSubtitleAction", null,
+ Catalog.GetString ("Load File..."), null,
+ Catalog.GetString ("Load subtitle file"), OnLoadSubtitleAction)
+ });
+
+ this["SubtitleMenuAction"].Sensitive = true;
+
+ ServiceManager.PlaybackController.TrackStarted += OnPlaybackTrackStarted;
+
+ //TODO: Set default sub
+ }
+
+ private void OnLoadSubtitleAction (object o, EventArgs args)
+ {
+ var chooser = new Banshee.Gui.Dialogs.FileChooserDialog (
+ Catalog.GetString ("Load Subtitle File"),
+ ServiceManager.Get<Banshee.Gui.GtkElementsService> ().PrimaryWindow,
+ FileChooserAction.Open
+ );
+
+ chooser.DefaultResponse = ResponseType.Ok;
+ chooser.SelectMultiple = false;
+
+ chooser.AddButton (Stock.Cancel, ResponseType.Cancel);
+ chooser.AddButton (Catalog.GetString ("L_oad"), ResponseType.Ok);
+
+ Hyena.Gui.GtkUtilities.SetChooserShortcuts (chooser,
+ ServiceManager.SourceManager.VideoLibrary.BaseDirectory
+ );
+
+ var filter = new FileFilter();
+ filter.AddMimeType ("text/x-pango-markup");
+ filter.AddMimeType ("text/plain");
+ filter.Name = Catalog.GetString ("Subtitle files");
+ chooser.AddFilter (filter);
+
+ if (chooser.Run () == (int)ResponseType.Ok) {
+ ServiceManager.PlayerEngine.SubtitleUri = new SafeUri (chooser.Uri);
+ }
+
+ chooser.Destroy ();
+ }
+
+ private void OnPlaybackTrackStarted (object o, EventArgs args)
+ {
+ var current_track = ServiceManager.PlaybackController.CurrentTrack;
+
+ if (current_track != null &&
+ (current_track.MediaAttributes & TrackMediaAttributes.VideoStream) != 0) {
+ //TODO: activate load subtitle file menu else unactivate
+ }
+ }
+
+ private void ClearEmbeddedSubtitles ()
+ {
+ foreach (RadioActionEntry action in embedded_subtitles_actions) {
+ this.Remove (action.name);
+ }
+ }
+
+ private void AddEmbeddedSubtitle (int i)
+ {
+ string desc = ServiceManager.PlayerEngine.GetSubtitleDescription (i);
+ if (String.IsNullOrEmpty (desc)) {
+ desc = String.Format (Catalog.GetString ("Subtitle {0}"), i);
+ }
+ RadioActionEntry new_action = new RadioActionEntry (String.Format ("Subtitle{0}", i), null,
+ desc, null,
+ String.Format (Catalog.GetString ("Activate embedded subtitle {0}"), i), i);
+ embedded_subtitles_actions.Add (new_action);
+
+ }
+
+ public void ReloadEmbeddedSubtitle ()
+ {
+ ClearEmbeddedSubtitles ();
+ int sub_count = ServiceManager.PlayerEngine.SubtitleCount;
+ if (sub_count == 0) {
+ RefreshMenu ();
+ return;
+ }
+ embedded_subtitles_actions.Add (new RadioActionEntry ("None", null,
+ Catalog.GetString ("None"), null,
+ Catalog.GetString ("Hide subtitles"), -1));
+ for (int i = 0; i < sub_count; i++) {
+ AddEmbeddedSubtitle (i);
+ }
+ Add (embedded_subtitles_actions.ToArray (), 0, OnActionChanged);
+ RefreshMenu ();
+ }
+
+ private void OnActionChanged (object o, ChangedArgs args)
+ {
+ Log.Debug (string.Format ("[sub] Set sub {0}", args.Current.Value));
+ ServiceManager.PlayerEngine.SubtitleIndex = args.Current.Value;
+ }
+
+ private void OnChanged ()
+ {
+ EventHandler handler = Changed;
+ if (handler != null) {
+ handler (this, EventArgs.Empty);
+ }
+ }
+
+ public IEnumerator<RadioAction> GetEnumerator ()
+ {
+ foreach (RadioActionEntry entry in embedded_subtitles_actions) {
+ yield return (RadioAction)this[entry.name];
+ }
+ }
+
+ IEnumerator IEnumerable.GetEnumerator ()
+ {
+ return GetEnumerator ();
+ }
+
+ public void AttachSubmenu (string menuItemPath)
+ {
+ MenuItem menu = Actions.UIManager.GetWidget (menuItemPath) as MenuItem;
+ menu.Submenu = CreateMenu ();
+ }
+
+ private void RefreshMenu ()
+ {
+ foreach (Widget w in mainMenu.Children) {
+ //RadioMenuItems are embedded subtitle ones
+ if (w is RadioMenuItem) {
+ mainMenu.Remove (w);
+ }
+ }
+ AddEmbeddedSubtitleMenu ();
+ mainMenu.ShowAll ();
+ }
+
+ public Menu CreateMenu ()
+ {
+ mainMenu = new Gtk.Menu ();
+
+ mainMenu.Append (this["LoadSubtitleAction"].CreateMenuItem ());
+ mainMenu.Append (new SeparatorMenuItem ());
+ AddEmbeddedSubtitleMenu ();
+
+ mainMenu.ShowAll ();
+ return mainMenu;
+ }
+
+ public void AddEmbeddedSubtitleMenu ()
+ {
+ foreach (RadioAction action in this) {
+ mainMenu.Append (action.CreateMenuItem ());
+ Log.Debug (string.Format ("[sub] Add {0}", action.Name));
+ }
+ }
+ }
+}
+
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs b/src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs
index 0f87b90..2eafd49 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs
@@ -185,6 +185,7 @@ namespace Banshee.Gui
FilterFocused = false;
if (current_source != null && current_source.TrackModel != null) {
+ current_source.TrackModel.Reloaded -= OnReloaded;
current_source.TrackModel.Selection.Changed -= HandleSelectionChanged;
current_source = null;
}
@@ -192,6 +193,7 @@ namespace Banshee.Gui
ITrackModelSource new_source = ActiveSource as ITrackModelSource;
if (new_source != null) {
new_source.TrackModel.Selection.Changed += HandleSelectionChanged;
+ new_source.TrackModel.Reloaded += OnReloaded;
current_source = new_source;
Selection = new_source.TrackModel.Selection;
}
@@ -199,6 +201,13 @@ namespace Banshee.Gui
ThreadAssist.ProxyToMain (UpdateActions);
}
+ private void OnReloaded (object sender, EventArgs args)
+ {
+ ThreadAssist.ProxyToMain (delegate {
+ UpdateActions ();
+ });
+ }
+
private void HandleActionsChanged (object sender, EventArgs args)
{
if (Actions.UIManager.GetAction ("/MainMenu/EditMenu") != null) {
@@ -269,6 +278,7 @@ namespace Banshee.Gui
if (FilterFocused) {
if (Selection == filter_selection) {
filter_selection.MaxIndex = track_source.TrackModel.Selection.MaxIndex;
+ filter_selection.Clear (false);
filter_selection.SelectAll ();
} else {
Log.Error ("Filter focused, but selection is not filter selection!");
diff --git a/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceModel.cs b/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceModel.cs
index 2190aa9..f2ce25e 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceModel.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceModel.cs
@@ -194,6 +194,7 @@ namespace Banshee.Sources.Gui
public void AddSource (Source source, TreeIter parent)
{
+ ThreadAssist.AssertInMainThread ();
lock (sync) {
if (Filter != null && !Filter (source)) {
return;
@@ -211,10 +212,13 @@ namespace Banshee.Sources.Gui
int position = source.Order;
- var type = source is SourceManager.GroupSource ? EntryType.Group : EntryType.Source;
TreeIter iter = parent.Equals (TreeIter.Zero)
- ? InsertWithValues (position, source, source.Order, type)
- : InsertWithValues (parent, position, source, source.Order, type);
+ ? InsertNode (position)
+ : InsertNode (parent, position);
+
+ SetValue (iter, 0, source);
+ SetValue (iter, 1, source.Order);
+ SetValue (iter, 2, source is SourceManager.GroupSource ? EntryType.Group : EntryType.Source);
lock (source.Children) {
foreach (Source child in source.Children) {
@@ -231,6 +235,7 @@ namespace Banshee.Sources.Gui
public void RemoveSource (Source source)
{
+ ThreadAssist.AssertInMainThread ();
lock (sync) {
TreeIter iter = FindSource (source);
if (!iter.Equals (TreeIter.Zero)) {
@@ -246,6 +251,7 @@ namespace Banshee.Sources.Gui
public void Refresh ()
{
+ ThreadAssist.AssertInMainThread ();
Clear ();
foreach (Source source in ServiceManager.SourceManager.Sources) {
AddSource (source);
diff --git a/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs b/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs
index 749c525..a91d056 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs
@@ -89,6 +89,14 @@ namespace Banshee.Sources.Gui
store.Refresh ();
ConnectEvents ();
+ Selection.SelectFunction = (selection, model, path, selected) => {
+ Source source = store.GetSource (path);
+ if (source == null || source is SourceManager.GroupSource) {
+ return false;
+ }
+ return true;
+ };
+
ResetSelection ();
}
@@ -205,6 +213,29 @@ namespace Banshee.Sources.Gui
header_renderer.Foreground = CairoExtensions.ColorGetHex (light_text, false);
}
+ // While scrolling the source view with the keyboard, we want to
+ // just skip group sources and jump to the next source in the view.
+ protected override bool OnKeyPressEvent (Gdk.EventKey press)
+ {
+ TreeIter iter;
+ bool movedCursor = false;
+
+ Selection.GetSelected (out iter);
+ TreePath path = store.GetPath (iter);
+
+ // Move the path to the next source in line as we need to check if it's a group
+ IncrementPathForKeyPress (press, path);
+
+ Source source = store.GetSource (path);
+ while (source is SourceManager.GroupSource && IncrementPathForKeyPress (press, path)) {
+ source = store.GetSource (path);
+ SetCursor (path, source_column, false);
+ movedCursor = true;
+ }
+
+ return movedCursor ? true : base.OnKeyPressEvent (press);
+ }
+
protected override bool OnButtonPressEvent (Gdk.EventButton press)
{
TreePath path;
@@ -221,8 +252,9 @@ namespace Banshee.Sources.Gui
Source source = store.GetSource (path);
- if (source == null || source is SourceManager.GroupSource)
+ if (source == null || source is SourceManager.GroupSource) {
return false;
+ }
// From F-Spot's SaneTreeView class
if (source_renderer.InExpander ((int)press.X)) {
@@ -320,6 +352,22 @@ namespace Banshee.Sources.Gui
}
}
+ private bool IncrementPathForKeyPress (Gdk.EventKey press, TreePath path)
+ {
+ switch (press.Key) {
+ case Gdk.Key.Up:
+ case Gdk.Key.KP_Up:
+ return path.Prev ();
+
+ case Gdk.Key.Down:
+ case Gdk.Key.KP_Down:
+ path.Next ();
+ return true;
+ }
+
+ return false;
+ }
+
#endregion
#region Gtk.TreeView Overrides
@@ -355,6 +403,7 @@ namespace Banshee.Sources.Gui
}
Source new_source = store.GetValue (iter, (int)SourceModel.Columns.Source) as Source;
+
if (ServiceManager.SourceManager.ActiveSource == new_source) {
return false;
}
diff --git a/src/Core/Banshee.ThickClient/Makefile.am b/src/Core/Banshee.ThickClient/Makefile.am
index 62b6fb5..acebf12 100644
--- a/src/Core/Banshee.ThickClient/Makefile.am
+++ b/src/Core/Banshee.ThickClient/Makefile.am
@@ -123,6 +123,7 @@ SOURCES = \
Banshee.Gui/PlaybackActions.cs \
Banshee.Gui/PlaybackRepeatActions.cs \
Banshee.Gui/PlaybackShuffleActions.cs \
+ Banshee.Gui/PlaybackSubtitleActions.cs \
Banshee.Gui/SourceActions.cs \
Banshee.Gui/TrackActions.cs \
Banshee.Gui/ViewActions.cs \
diff --git a/src/Core/Banshee.ThickClient/Makefile.in b/src/Core/Banshee.ThickClient/Makefile.in
index c0fa9ee..f80bb43 100644
--- a/src/Core/Banshee.ThickClient/Makefile.in
+++ b/src/Core/Banshee.ThickClient/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Core/Banshee.ThickClient
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -509,6 +516,7 @@ SOURCES = \
Banshee.Gui/PlaybackActions.cs \
Banshee.Gui/PlaybackRepeatActions.cs \
Banshee.Gui/PlaybackShuffleActions.cs \
+ Banshee.Gui/PlaybackSubtitleActions.cs \
Banshee.Gui/SourceActions.cs \
Banshee.Gui/TrackActions.cs \
Banshee.Gui/ViewActions.cs \
@@ -589,6 +597,8 @@ LINK_GDATA = $(GDATASHARP_LIBS)
LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -705,6 +715,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -718,6 +729,7 @@ REF_EXTENSION_PODCASTING = $(LINK_MIGO_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Core/Banshee.ThickClient/Resources/core-ui-actions-layout.xml b/src/Core/Banshee.ThickClient/Resources/core-ui-actions-layout.xml
index f614071..547fe75 100644
--- a/src/Core/Banshee.ThickClient/Resources/core-ui-actions-layout.xml
+++ b/src/Core/Banshee.ThickClient/Resources/core-ui-actions-layout.xml
@@ -108,6 +108,7 @@
<placeholder name="PlaybackMenuAdditions"/>
<menuitem name="RepeatMenu" action="RepeatMenuAction"/>
<menuitem name="ShuffleMenu" action="ShuffleMenuAction"/>
+ <menuitem name="SubtitleMenu" action="SubtitleMenuAction"/>
</menu>
<menu name="ToolsMenu" action="ToolsMenuAction">
@@ -182,6 +183,7 @@
<menuitem name="SearchForSameAlbum" action="SearchForSameAlbumAction"/>
</menu>
<separator/>
+ <placeholder name="AboveTrackProperties"/>
<menuitem name="TrackProperties" action="TrackPropertiesAction"/>
<menuitem name="TrackEditor" action="TrackEditorAction"/>
</popup>
diff --git a/src/Core/Banshee.WebBrowser/JavaScriptCore.Bridge/Runtime.cs b/src/Core/Banshee.WebBrowser/JavaScriptCore.Bridge/Runtime.cs
new file mode 100644
index 0000000..5aebef1
--- /dev/null
+++ b/src/Core/Banshee.WebBrowser/JavaScriptCore.Bridge/Runtime.cs
@@ -0,0 +1,82 @@
+//
+// Runtime.cs
+//
+// Author:
+// Aaron Bockover <abockover at novell.com>
+//
+// Copyright 2010 Novell, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+
+using JavaScriptCore;
+
+namespace JavaScriptCore.Bridge
+{
+ public static class Runtime
+ {
+ public class RuntimeClassDefinition : JSClassDefinition
+ {
+ public override string ClassName {
+ get { return "ManagedJavaScriptCore"; }
+ }
+
+ protected override bool OnJSDeleteProperty (JSObject obj, string propertyName)
+ {
+ throw new JSErrorException (obj.Context, "IllegalOperationError",
+ "Deleting properties on this object is not allowed");
+ }
+
+ protected override bool OnJSSetProperty (JSObject obj, string propertyName, JSValue value)
+ {
+ throw new JSErrorException (obj.Context, "IllegalOperationError",
+ "Setting properties on this object is not allowed");
+ }
+
+ [JSStaticFunction ("import")]
+ public static JSValue Import (JSObject function, JSObject thisObject, JSValue [] args)
+ {
+ return null;
+ }
+ }
+
+ private static RuntimeClassDefinition js_class_definition;
+ private static JSClass js_class;
+
+ static Runtime ()
+ {
+ js_class_definition = new RuntimeClassDefinition ();
+ js_class = js_class_definition.CreateClass ();
+ }
+
+ public static void BindManagedRuntime (this JSContext context)
+ {
+ if (context.GlobalObject.HasProperty ("mjs")) {
+ throw new ApplicationException ("Cannot bind runtime to JSContext: " +
+ "mjsc property already exists on context's global object.");
+ }
+
+ context.GlobalObject.SetProperty ("mjs", new JSObject (context, js_class),
+ JSPropertyAttribute.DontDelete);
+ }
+ }
+}
+
diff --git a/src/Core/Banshee.WebBrowser/JavaScriptCore.Bridge/Tests/RuntimeTests.cs b/src/Core/Banshee.WebBrowser/JavaScriptCore.Bridge/Tests/RuntimeTests.cs
new file mode 100644
index 0000000..f73e545
--- /dev/null
+++ b/src/Core/Banshee.WebBrowser/JavaScriptCore.Bridge/Tests/RuntimeTests.cs
@@ -0,0 +1,69 @@
+//
+// RuntimeTests.cs
+//
+// Author:
+// Aaron Bockover <abockover at novell.com>
+//
+// Copyright 2010 Novell, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#if ENABLE_TESTS
+
+using System;
+using NUnit.Framework;
+
+using JavaScriptCore.Bridge;
+
+namespace JavaScriptCore.Bridge.Tests
+{
+ [TestFixture]
+ public class RuntimeTests
+ {
+ private JSContext context;
+
+ [TestFixtureSetUp]
+ public void Init ()
+ {
+ context = new JSContext ();
+ context.BindManagedRuntime ();
+ }
+
+ [Test]
+ public void TestExceptionBoundaryJsCatch ()
+ {
+ context.EvaluateScript ("try { mjs.import = 'foo'; } catch (e) { this.p = e.toString (); }");
+ Assert.AreEqual ("IllegalOperationError: Setting properties on this object is not allowed",
+ context.GlobalObject.GetProperty ("p").StringValue);
+ }
+
+ [Test]
+ public void TestExceptionBoundaryRoundTrip ()
+ {
+ try {
+ context.EvaluateScript ("mjs.import = 'foo'");
+ } catch (JSException e) {
+ Assert.AreEqual ("IllegalOperationError: Setting properties on this object is not allowed",
+ e.Error.StringValue);
+ }
+ }
+ }
+}
+
+#endif
\ No newline at end of file
diff --git a/src/Core/Banshee.WebBrowser/JavaScriptCore/JSClassDefinition.cs b/src/Core/Banshee.WebBrowser/JavaScriptCore/JSClassDefinition.cs
index 938679e..715db57 100644
--- a/src/Core/Banshee.WebBrowser/JavaScriptCore/JSClassDefinition.cs
+++ b/src/Core/Banshee.WebBrowser/JavaScriptCore/JSClassDefinition.cs
@@ -26,6 +26,7 @@
using System;
using System.Reflection;
+using System.Collections.Generic;
using System.Runtime.InteropServices;
namespace JavaScriptCore
@@ -41,7 +42,7 @@ namespace JavaScriptCore
public IntPtr parent_class;
public IntPtr /* JSStaticValue[] */ static_values;
- public IntPtr /* JSStaticFunction[] */ static_functions;
+ public IntPtr static_functions;
public JSObject.InitializeCallback initialize;
public JSObject.FinalizeCallback finalize;
@@ -57,9 +58,11 @@ namespace JavaScriptCore
}
private JSClassDefinitionNative raw;
+ private Dictionary<string, MethodInfo> static_methods;
+ private JSObject.CallAsFunctionCallback static_function_callback;
public virtual string ClassName {
- get { return GetType ().FullName.Replace (".", "_"); }
+ get { return GetType ().FullName.Replace (".", "_").Replace ("+", "_"); }
}
public JSClassDefinition ()
@@ -67,6 +70,12 @@ namespace JavaScriptCore
raw = new JSClassDefinitionNative ();
raw.class_name = Marshal.StringToHGlobalAnsi (ClassName);
+ InstallClassOverrides ();
+ InstallStaticMethods ();
+ }
+
+ private void InstallClassOverrides ()
+ {
Override ("OnInitialize", () => raw.initialize = new JSObject.InitializeCallback (JSInitialize));
Override ("OnFinalize", () => raw.finalize = new JSObject.FinalizeCallback (JSFinalize));
Override ("OnJSHasProperty", () => raw.has_property = new JSObject.HasPropertyCallback (JSHasProperty));
@@ -74,6 +83,67 @@ namespace JavaScriptCore
Override ("OnJSSetProperty", () => raw.set_property = new JSObject.SetPropertyCallback (JSSetProperty));
Override ("OnJSDeleteProperty", () => raw.delete_property = new JSObject.DeletePropertyCallback (JSDeleteProperty));
Override ("OnJSGetPropertyNames", () => raw.get_property_names = new JSObject.GetPropertyNamesCallback (JSGetPropertyNames));
+ Override ("OnJSCallAsConstructor", () => raw.call_as_constructor = new JSObject.CallAsConstructorCallback (JSCallAsConstructor));
+ }
+
+ private void InstallStaticMethods ()
+ {
+ List<JSStaticFunction> methods = null;
+
+ foreach (var method in GetType ().GetMethods (
+ BindingFlags.Instance | BindingFlags.Static | BindingFlags.NonPublic)) {
+ foreach (var _attr in method.GetCustomAttributes (typeof (JSStaticFunctionAttribute), false)) {
+ var attr = (JSStaticFunctionAttribute)_attr;
+ var p = method.GetParameters ();
+
+ if (method.ReturnType != typeof (JSValue) || p.Length != 3 &&
+ p[0].ParameterType != typeof (JSObject) ||
+ p[1].ParameterType != typeof (JSObject) ||
+ p[2].ParameterType != typeof (JSValue [])) {
+ throw new Exception (String.Format ("Invalid signature for method annotated " +
+ "with JSStaticFunctionAttribute: {0}:{1} ('{2}'); signature should be " +
+ "'JSValue:JSFunction,JSObject,JSValue[]'",
+ GetType ().FullName, method.Name, attr.Name));
+ }
+
+ if (static_methods == null) {
+ static_methods = new Dictionary<string, MethodInfo> ();
+ } else if (static_methods.ContainsKey (attr.Name)) {
+ throw new Exception ("Class already contains static method named '" + attr.Name + "'");
+ }
+
+ static_methods.Add (attr.Name, method);
+
+ if (methods == null) {
+ methods = new List<JSStaticFunction> ();
+ }
+
+ if (static_function_callback == null) {
+ static_function_callback = new JSObject.CallAsFunctionCallback (OnStaticFunctionCallback);
+ }
+
+ methods.Add (new JSStaticFunction () {
+ Name = attr.Name,
+ Attributes = attr.Attributes,
+ Callback = static_function_callback
+ });
+ }
+ }
+
+ if (methods != null && methods.Count > 0) {
+ var size = Marshal.SizeOf (typeof (JSStaticFunction));
+ var ptr = Marshal.AllocHGlobal (size * (methods.Count + 1));
+
+ for (int i = 0; i < methods.Count; i++) {
+ Marshal.StructureToPtr (methods[i],
+ new IntPtr (ptr.ToInt64 () + size * i), false);
+ }
+
+ Marshal.StructureToPtr (new JSStaticFunction (),
+ new IntPtr (ptr.ToInt64 () + size * methods.Count), false);
+
+ raw.static_functions = ptr;
+ }
}
private void Override (string methodName, Action handler)
@@ -87,11 +157,45 @@ namespace JavaScriptCore
[DllImport (JSContext.NATIVE_IMPORT)]
private static extern IntPtr JSClassCreate (ref JSClassDefinition.JSClassDefinitionNative definition);
+ private JSClass class_handle;
+ public JSClass ClassHandle {
+ get { return class_handle ?? (class_handle = CreateClass ()); }
+ }
+
public JSClass CreateClass ()
{
return new JSClass (JSClassCreate (ref raw));
}
+ private IntPtr OnStaticFunctionCallback (IntPtr ctx, IntPtr function, IntPtr thisObject,
+ IntPtr argumentCount, IntPtr arguments, ref IntPtr exception)
+ {
+ var context = new JSContext (ctx);
+ var fn = new JSObject (ctx, function);
+ string fn_name = null;
+ if (fn.HasProperty ("name")) {
+ var prop = fn.GetProperty ("name");
+ if (prop != null && prop.IsString) {
+ fn_name = prop.StringValue;
+ }
+ }
+
+ MethodInfo method = null;
+ if (fn_name == null || !static_methods.TryGetValue (fn_name, out method)) {
+ return JSValue.NewUndefined (context).Raw;
+ }
+
+ var result = method.Invoke (null, new object [] {
+ fn,
+ new JSObject (context, thisObject),
+ JSValue.MarshalArray (ctx, arguments, argumentCount)
+ });
+
+ return result == null
+ ? JSValue.NewUndefined (context).Raw
+ : ((JSValue)result).Raw;
+ }
+
private void JSInitialize (IntPtr ctx, IntPtr obj)
{
OnJSInitialize (new JSObject (ctx, obj));
@@ -136,7 +240,12 @@ namespace JavaScriptCore
IntPtr value, ref IntPtr exception)
{
var context = new JSContext (ctx);
- return OnJSSetProperty (new JSObject (context, obj), propertyName.Value, new JSValue (context, value));
+ try {
+ return OnJSSetProperty (new JSObject (context, obj), propertyName.Value, new JSValue (context, value));
+ } catch (JSErrorException e) {
+ exception = e.Error.Raw;
+ return false;
+ }
}
protected virtual bool OnJSSetProperty (JSObject obj, string propertyName, JSValue value)
@@ -162,5 +271,20 @@ namespace JavaScriptCore
protected virtual void OnJSGetPropertyNames (JSObject obj, JSPropertyNameAccumulator propertyNames)
{
}
+
+ private IntPtr JSCallAsConstructor (IntPtr ctx, IntPtr constructor,
+ IntPtr argumentCount, IntPtr arguments, ref IntPtr exception)
+ {
+ var result = OnJSCallAsConstructor (new JSObject (ctx, constructor),
+ JSValue.MarshalArray (ctx, arguments, argumentCount));
+ return result == null
+ ? JSValue.NewUndefined (new JSContext (ctx)).Raw
+ : ((JSValue)result).Raw;
+ }
+
+ protected virtual JSObject OnJSCallAsConstructor (JSObject constructor, JSValue [] args)
+ {
+ return null;
+ }
}
}
diff --git a/src/Core/Banshee.WebBrowser/JavaScriptCore/JSContext.cs b/src/Core/Banshee.WebBrowser/JavaScriptCore/JSContext.cs
index c2484a8..89a2157 100644
--- a/src/Core/Banshee.WebBrowser/JavaScriptCore/JSContext.cs
+++ b/src/Core/Banshee.WebBrowser/JavaScriptCore/JSContext.cs
@@ -65,7 +65,7 @@ namespace JavaScriptCore
thisObject == null ? IntPtr.Zero : thisObject.Raw,
sourceUrl, startingLineNumber, ref exception);
JSException.Proxy (this, exception);
- return new JSValue (result);
+ return new JSValue (this, result);
}
public JSValue EvaluateScript (string script, JSObject thisObject, string sourceUrl, int startingLineNumber)
diff --git a/src/Core/Banshee.WebBrowser/JavaScriptCore/JSError.cs b/src/Core/Banshee.WebBrowser/JavaScriptCore/JSError.cs
new file mode 100644
index 0000000..1a8d6c4
--- /dev/null
+++ b/src/Core/Banshee.WebBrowser/JavaScriptCore/JSError.cs
@@ -0,0 +1,53 @@
+//
+// JSError.cs
+//
+// Author:
+// Aaron Bockover <abockover at novell.com>
+//
+// Copyright 2010 Novell, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace JavaScriptCore
+{
+ public class JSError : JSObject
+ {
+ [DllImport (JSContext.NATIVE_IMPORT)]
+ private static extern IntPtr JSObjectMakeError (IntPtr ctx,
+ IntPtr argumentCount, IntPtr args, ref IntPtr exception);
+
+ public JSError (JSContext context, string name, string message) : base (context, IntPtr.Zero)
+ {
+ var exception = IntPtr.Zero;
+ Raw = JSObjectMakeError (context.Raw, IntPtr.Zero, IntPtr.Zero, ref exception);
+ JSException.Proxy (context, exception);
+
+ if (name != null) {
+ SetProperty ("name", new JSValue (context, name));
+ }
+
+ if (message != null) {
+ SetProperty ("message", new JSValue (context, message));
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Core/Banshee.WebBrowser/JavaScriptCore/JSErrorException.cs b/src/Core/Banshee.WebBrowser/JavaScriptCore/JSErrorException.cs
new file mode 100644
index 0000000..618b0b9
--- /dev/null
+++ b/src/Core/Banshee.WebBrowser/JavaScriptCore/JSErrorException.cs
@@ -0,0 +1,40 @@
+//
+// JSErrorException.cs
+//
+// Author:
+// Aaron Bockover <abockover at novell.com>
+//
+// Copyright 2010 Novell, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+
+namespace JavaScriptCore
+{
+ public class JSErrorException : Exception
+ {
+ public JSError Error { get; set; }
+
+ public JSErrorException (JSContext context, string name, string message)
+ {
+ Error = new JSError (context, name, message);
+ }
+ }
+}
diff --git a/src/Core/Banshee.WebBrowser/JavaScriptCore/JSException.cs b/src/Core/Banshee.WebBrowser/JavaScriptCore/JSException.cs
index fb2a970..01678db 100644
--- a/src/Core/Banshee.WebBrowser/JavaScriptCore/JSException.cs
+++ b/src/Core/Banshee.WebBrowser/JavaScriptCore/JSException.cs
@@ -31,15 +31,22 @@ namespace JavaScriptCore
public class JSException : Exception
{
public JSContext Context { get; private set; }
+ public JSValue Error { get; private set; }
- internal JSException (JSContext context, string message)
- : base (message)
+ internal JSException (JSContext context, JSValue error)
+ : base ("JSON: " + error.ToString ())
+ {
+ Error = error;
+ Context = context;
+ }
+
+ internal JSException (JSContext context, string message) : base (message)
{
Context = context;
}
internal JSException (JSContext context, IntPtr exception)
- : this (context, "JSON: " + new JSValue (context, exception).ToJsonString ())
+ : this (context, new JSValue (context, exception))
{
}
diff --git a/src/Core/Banshee.WebBrowser/JavaScriptCore/JSFunction.cs b/src/Core/Banshee.WebBrowser/JavaScriptCore/JSFunction.cs
index b26023a..a6e0c37 100644
--- a/src/Core/Banshee.WebBrowser/JavaScriptCore/JSFunction.cs
+++ b/src/Core/Banshee.WebBrowser/JavaScriptCore/JSFunction.cs
@@ -29,7 +29,7 @@ using System.Runtime.InteropServices;
namespace JavaScriptCore
{
- public delegate JSValue JSFunctionHandler (JSFunction function, JSObject thisObject, JSValue [] args);
+ public delegate JSValue JSFunctionHandler (JSObject function, JSObject thisObject, JSValue [] args);
public class JSFunction : JSObject
{
@@ -56,18 +56,10 @@ namespace JavaScriptCore
IntPtr argumentCount, IntPtr arguments, ref IntPtr exception)
{
var context = new JSContext (ctx);
-
- if (handler == null) {
- return JSValue.NewUndefined (context).Raw;
- }
-
- var args = new JSValue[argumentCount.ToInt32 ()];
-
- for (int i = 0; i < args.Length; i++) {
- args[i] = new JSValue (context, Marshal.ReadIntPtr (arguments, i * IntPtr.Size));
- }
-
- return handler (this, new JSObject (context, thisObject), args).Raw;
+ return handler == null
+ ? JSValue.NewUndefined (context).Raw
+ : handler (this, new JSObject (context, thisObject),
+ JSValue.MarshalArray (ctx, arguments, argumentCount)).Raw;
}
}
}
\ No newline at end of file
diff --git a/src/Core/Banshee.WebBrowser/JavaScriptCore/JSObject.cs b/src/Core/Banshee.WebBrowser/JavaScriptCore/JSObject.cs
index c9ede2a..91bb0c9 100644
--- a/src/Core/Banshee.WebBrowser/JavaScriptCore/JSObject.cs
+++ b/src/Core/Banshee.WebBrowser/JavaScriptCore/JSObject.cs
@@ -181,6 +181,17 @@ namespace JavaScriptCore
#endregion
[DllImport (JSContext.NATIVE_IMPORT)]
+ private static extern void JSObjectSetPrivate (IntPtr obj, IntPtr data);
+
+ [DllImport (JSContext.NATIVE_IMPORT)]
+ private static extern IntPtr JSObjectGetPrivate (IntPtr obj);
+
+ public IntPtr UnmanagedPrivate {
+ get { return JSObjectGetPrivate (Raw); }
+ set { JSObjectSetPrivate (Raw, value); }
+ }
+
+ [DllImport (JSContext.NATIVE_IMPORT)]
private static extern bool JSObjectIsFunction (IntPtr ctx, IntPtr obj);
public bool IsFunction {
diff --git a/src/Core/Banshee.WebBrowser/JavaScriptCore/JSStaticFunction.cs b/src/Core/Banshee.WebBrowser/JavaScriptCore/JSStaticFunction.cs
new file mode 100644
index 0000000..a099423
--- /dev/null
+++ b/src/Core/Banshee.WebBrowser/JavaScriptCore/JSStaticFunction.cs
@@ -0,0 +1,39 @@
+//
+// JSStaticFunction.cs
+//
+// Author:
+// Aaron Bockover <abockover at novell.com>
+//
+// Copyright 2010 Novell, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace JavaScriptCore
+{
+ [StructLayout (LayoutKind.Sequential)]
+ public struct JSStaticFunction
+ {
+ public string Name;
+ public JSObject.CallAsFunctionCallback Callback;
+ public JSPropertyAttribute Attributes;
+ }
+}
diff --git a/src/Core/Banshee.WebBrowser/JavaScriptCore/JSStaticFunctionAttribute.cs b/src/Core/Banshee.WebBrowser/JavaScriptCore/JSStaticFunctionAttribute.cs
new file mode 100644
index 0000000..5c1c769
--- /dev/null
+++ b/src/Core/Banshee.WebBrowser/JavaScriptCore/JSStaticFunctionAttribute.cs
@@ -0,0 +1,49 @@
+//
+// JSStaticFunctionAttribute.cs
+//
+// Author:
+// Aaron Bockover <abockover at novell.com>
+//
+// Copyright 2010 Novell, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+
+namespace JavaScriptCore
+{
+ public class JSStaticFunctionAttribute : Attribute
+ {
+ public string Name { get; set; }
+ public JSPropertyAttribute Attributes { get; set; }
+
+ public JSStaticFunctionAttribute () : this (null, JSPropertyAttribute.None)
+ {
+ }
+
+ public JSStaticFunctionAttribute (string name) : this (name, JSPropertyAttribute.None)
+ {
+ }
+
+ public JSStaticFunctionAttribute (string name, JSPropertyAttribute attributes)
+ {
+ Name = name;
+ Attributes = attributes;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Core/Banshee.WebBrowser/JavaScriptCore/JSValue.cs b/src/Core/Banshee.WebBrowser/JavaScriptCore/JSValue.cs
index d6246d3..5614b1c 100644
--- a/src/Core/Banshee.WebBrowser/JavaScriptCore/JSValue.cs
+++ b/src/Core/Banshee.WebBrowser/JavaScriptCore/JSValue.cs
@@ -236,7 +236,7 @@ namespace JavaScriptCore
var exception = IntPtr.Zero;
var result = JSValueToObject (Context.Raw, Raw, ref exception);
JSException.Proxy (Context, exception);
- return new JSObject (result);
+ return new JSObject (Context, result);
}
}
@@ -277,5 +277,14 @@ namespace JavaScriptCore
{
return IsObject ? ToJsonString (0) ?? StringValue : StringValue;
}
+
+ public static JSValue [] MarshalArray (IntPtr context, IntPtr items, IntPtr itemCount)
+ {
+ var array = new JSValue[itemCount.ToInt32 ()];
+ for (int i = 0; i < array.Length; i++) {
+ array[i] = new JSValue (context, Marshal.ReadIntPtr (items, i * IntPtr.Size));
+ }
+ return array;
+ }
}
}
diff --git a/src/Core/Banshee.WebBrowser/JavaScriptCore/Tests/JSClassTests.cs b/src/Core/Banshee.WebBrowser/JavaScriptCore/Tests/JSClassTests.cs
new file mode 100644
index 0000000..2d78272
--- /dev/null
+++ b/src/Core/Banshee.WebBrowser/JavaScriptCore/Tests/JSClassTests.cs
@@ -0,0 +1,178 @@
+//
+// JSClassTests.cs
+//
+// Author:
+// Aaron Bockover <abockover at novell.com>
+//
+// Copyright 2010 Novell, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#if ENABLE_TESTS
+
+using System;
+using NUnit.Framework;
+
+namespace JavaScriptCore.Tests
+{
+ [TestFixture]
+ public class JSClassTests
+ {
+ private JSContext context;
+ private JSTestStaticClass static_class;
+ private JSTestInstanceClass instance_class;
+
+ [TestFixtureSetUp]
+ public void Init ()
+ {
+ context = new JSContext ();
+ static_class = new JSTestStaticClass ();
+ instance_class = new JSTestInstanceClass ();
+
+ context.GlobalObject.SetProperty ("x", new JSObject (context, static_class.ClassHandle));
+ context.GlobalObject.SetProperty ("y", new JSObject (context, instance_class.ClassHandle));
+ }
+
+ private class JSTestStaticClass : JSClassDefinition
+ {
+ [JSStaticFunction ("return_managed_null")]
+ private static JSValue ReturnManagedNull (JSObject function, JSObject thisObject, JSValue [] args)
+ {
+ return null;
+ }
+
+ [JSStaticFunction ("return_js_undefined")]
+ private static JSValue ReturnJSUndefined (JSObject function, JSObject thisObject, JSValue [] args)
+ {
+ return JSValue.NewUndefined (function.Context);
+ }
+
+ [JSStaticFunction ("return_js_null")]
+ private static JSValue ReturnJSNull (JSObject function, JSObject thisObject, JSValue [] args)
+ {
+ return JSValue.NewNull (function.Context);
+ }
+
+ [JSStaticFunction ("return_js_number")]
+ private static JSValue ReturnJSNumber (JSObject function, JSObject thisObject, JSValue [] args)
+ {
+ return new JSValue (function.Context, 3920.6);
+ }
+
+ [JSStaticFunction ("return_js_string")]
+ private static JSValue ReturnJSString (JSObject function, JSObject thisObject, JSValue [] args)
+ {
+ return new JSValue (function.Context, "hello world");
+ }
+
+ [JSStaticFunction ("this_object")]
+ private static JSValue ThisObject (JSObject function, JSObject thisObject, JSValue [] args)
+ {
+ return thisObject.GetProperty ("name");
+ }
+
+ [JSStaticFunction ("args")]
+ private static JSValue TestArgs (JSObject function, JSObject thisObject, JSValue [] args)
+ {
+ Assert.AreEqual (6, args.Length);
+
+ Assert.AreEqual (JSType.Boolean, args[0].JSType);
+ Assert.AreEqual (JSType.Number, args[1].JSType);
+ Assert.AreEqual (JSType.String, args[2].JSType);
+ Assert.AreEqual (JSType.Object, args[3].JSType);
+ Assert.AreEqual (JSType.Null, args[4].JSType);
+ Assert.AreEqual (JSType.Undefined, args[5].JSType);
+
+ Assert.AreEqual (true, args[0].BooleanValue);
+ Assert.AreEqual (42, args[1].NumberValue);
+ Assert.AreEqual ("banshee", args[2].StringValue);
+ Assert.IsTrue (args[3].ObjectValue.IsFunction);
+ Assert.AreEqual ("args", args[3].ObjectValue.GetProperty ("name").StringValue);
+
+ return null;
+ }
+ }
+
+ [Test]
+ public void TestEnsureJavaScriptCoreVoidReturnIsUndefined ()
+ {
+ Assert.AreEqual (JSType.Undefined, context.EvaluateScript ("(function f () { })()").JSType);
+ }
+
+ [Test]
+ public void TestStaticReturnManagedNull ()
+ {
+ Assert.AreEqual (JSType.Undefined, context.EvaluateScript ("x.return_managed_null ()").JSType);
+ }
+
+ [Test]
+ public void TestStaticReturnJSUndefined ()
+ {
+ Assert.AreEqual (JSType.Undefined, context.EvaluateScript ("x.return_js_undefined ()").JSType);
+ }
+
+ [Test]
+ public void TestStaticReturnJSNull ()
+ {
+ Assert.AreEqual (JSType.Null, context.EvaluateScript ("x.return_js_null ()").JSType);
+ }
+
+ [Test]
+ public void TestStaticReturnJSNumber ()
+ {
+ Assert.AreEqual (3920.6, context.EvaluateScript ("x.return_js_number ()").NumberValue);
+ }
+
+ [Test]
+ public void TestStaticReturnJSString ()
+ {
+ Assert.AreEqual ("hello world", context.EvaluateScript ("x.return_js_string ()").StringValue);
+ }
+
+ [Test]
+ public void TestStaticThisObject ()
+ {
+ Assert.AreEqual ("flipper", context.EvaluateScript ("x.this_object.call ({name:'flipper'})").StringValue);
+ }
+
+ [Test]
+ public void TestStaticArgs ()
+ {
+ context.EvaluateScript ("x.args (true, 42, 'banshee', x.args, null, undefined)");
+ }
+
+ private class JSTestInstanceClass : JSClassDefinition
+ {
+ protected override JSObject OnJSCallAsConstructor (JSObject constructor, JSValue [] args)
+ {
+ var o = new JSObject (constructor.Context, ClassHandle);
+ o.SetProperty ("hello", new JSValue (constructor.Context, "world"));
+ return o;
+ }
+ }
+
+ [Test]
+ public void TestConstructor ()
+ {
+ Assert.AreEqual ("world", context.EvaluateScript ("new y ().hello").StringValue);
+ }
+ }
+}
+
+#endif
\ No newline at end of file
diff --git a/src/Core/Banshee.WebBrowser/JavaScriptCore/Tests/JSFunctionTests.cs b/src/Core/Banshee.WebBrowser/JavaScriptCore/Tests/JSFunctionTests.cs
index af0e1f2..9463887 100644
--- a/src/Core/Banshee.WebBrowser/JavaScriptCore/Tests/JSFunctionTests.cs
+++ b/src/Core/Banshee.WebBrowser/JavaScriptCore/Tests/JSFunctionTests.cs
@@ -83,7 +83,7 @@ namespace JavaScriptCore.Tests
Assert.AreEqual (42, go.NumberValue);
}
- private JSValue Fib_1 (JSFunction function, JSObject @this, JSValue [] args)
+ private JSValue Fib_1 (JSObject function, JSObject @this, JSValue [] args)
{
return args[0].NumberValue <= 1 ? new JSValue (@this.Context, 1) : new JSValue (@this.Context,
Fib_1 (function, @this, new [] { new JSValue (@this.Context, args[0].NumberValue - 1) }).NumberValue +
diff --git a/src/Core/Banshee.WebBrowser/Makefile.am b/src/Core/Banshee.WebBrowser/Makefile.am
index 24857e1..b1c0006 100644
--- a/src/Core/Banshee.WebBrowser/Makefile.am
+++ b/src/Core/Banshee.WebBrowser/Makefile.am
@@ -16,20 +16,27 @@ SOURCES = \
Banshee.WebSource/WebBrowserShell.cs \
Banshee.WebSource/WebSource.cs \
Banshee.WebSource/WebView.cs \
+ JavaScriptCore.Bridge/Runtime.cs \
+ JavaScriptCore.Bridge/Tests/RuntimeTests.cs \
JavaScriptCore/JSClass.cs \
JavaScriptCore/JSClassAttribute.cs \
JavaScriptCore/JSClassDefinition.cs \
JavaScriptCore/JSContext.cs \
+ JavaScriptCore/JSError.cs \
+ JavaScriptCore/JSErrorException.cs \
JavaScriptCore/JSException.cs \
JavaScriptCore/JSFunction.cs \
JavaScriptCore/JSObject.cs \
JavaScriptCore/JSPropertyAttribute.cs \
JavaScriptCore/JSPropertyNameAccumulator.cs \
JavaScriptCore/JSPropertyNameArray.cs \
+ JavaScriptCore/JSStaticFunction.cs \
+ JavaScriptCore/JSStaticFunctionAttribute.cs \
JavaScriptCore/JSString.cs \
JavaScriptCore/JSType.cs \
JavaScriptCore/JSValue.cs \
JavaScriptCore/ManagedPropertyBagClass.cs \
+ JavaScriptCore/Tests/JSClassTests.cs \
JavaScriptCore/Tests/JSFunctionTests.cs \
JavaScriptCore/Tests/JSObjectTests.cs \
JavaScriptCore/Tests/JSStringTests.cs \
diff --git a/src/Core/Banshee.WebBrowser/Makefile.in b/src/Core/Banshee.WebBrowser/Makefile.in
index 6bc7de7..c1d80c8 100644
--- a/src/Core/Banshee.WebBrowser/Makefile.in
+++ b/src/Core/Banshee.WebBrowser/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Core/Banshee.WebBrowser
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -239,6 +241,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -258,6 +262,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -365,6 +371,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -411,7 +419,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -444,20 +451,27 @@ SOURCES = \
Banshee.WebSource/WebBrowserShell.cs \
Banshee.WebSource/WebSource.cs \
Banshee.WebSource/WebView.cs \
+ JavaScriptCore.Bridge/Runtime.cs \
+ JavaScriptCore.Bridge/Tests/RuntimeTests.cs \
JavaScriptCore/JSClass.cs \
JavaScriptCore/JSClassAttribute.cs \
JavaScriptCore/JSClassDefinition.cs \
JavaScriptCore/JSContext.cs \
+ JavaScriptCore/JSError.cs \
+ JavaScriptCore/JSErrorException.cs \
JavaScriptCore/JSException.cs \
JavaScriptCore/JSFunction.cs \
JavaScriptCore/JSObject.cs \
JavaScriptCore/JSPropertyAttribute.cs \
JavaScriptCore/JSPropertyNameAccumulator.cs \
JavaScriptCore/JSPropertyNameArray.cs \
+ JavaScriptCore/JSStaticFunction.cs \
+ JavaScriptCore/JSStaticFunctionAttribute.cs \
JavaScriptCore/JSString.cs \
JavaScriptCore/JSType.cs \
JavaScriptCore/JSValue.cs \
JavaScriptCore/ManagedPropertyBagClass.cs \
+ JavaScriptCore/Tests/JSClassTests.cs \
JavaScriptCore/Tests/JSFunctionTests.cs \
JavaScriptCore/Tests/JSObjectTests.cs \
JavaScriptCore/Tests/JSStringTests.cs \
@@ -497,6 +511,8 @@ RESOURCES = \
@HAVE_LIBWEBKIT_TRUE at LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
@HAVE_LIBWEBKIT_TRUE at LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
@HAVE_LIBWEBKIT_TRUE at LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+ at HAVE_LIBWEBKIT_TRUE@LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+ at HAVE_LIBWEBKIT_TRUE@LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
@HAVE_LIBWEBKIT_TRUE at DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -613,6 +629,7 @@ RESOURCES = \
@HAVE_LIBWEBKIT_TRUE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@HAVE_LIBWEBKIT_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
+ at HAVE_LIBWEBKIT_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@HAVE_LIBWEBKIT_TRUE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -626,6 +643,7 @@ RESOURCES = \
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+ at HAVE_LIBWEBKIT_TRUE@REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Core/Banshee.WebBrowser/libossifer/Makefile.in b/src/Core/Banshee.WebBrowser/libossifer/Makefile.in
index 5057318..87bd2c2 100644
--- a/src/Core/Banshee.WebBrowser/libossifer/Makefile.in
+++ b/src/Core/Banshee.WebBrowser/libossifer/Makefile.in
@@ -40,14 +40,6 @@ subdir = src/Core/Banshee.WebBrowser/libossifer
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -71,9 +63,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -227,6 +229,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -246,6 +250,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -353,6 +359,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -399,7 +407,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/src/Core/Banshee.Widgets/Makefile.in b/src/Core/Banshee.Widgets/Makefile.in
index 67318fa..6986702 100644
--- a/src/Core/Banshee.Widgets/Makefile.in
+++ b/src/Core/Banshee.Widgets/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Core/Banshee.Widgets
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -443,6 +450,8 @@ LINK_GDATA = $(GDATASHARP_LIBS)
LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -559,6 +568,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -572,6 +582,7 @@ REF_EXTENSION_PODCASTING = $(LINK_MIGO_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Core/Makefile.in b/src/Core/Makefile.in
index 129e997..bde34d1 100644
--- a/src/Core/Makefile.in
+++ b/src/Core/Makefile.in
@@ -37,14 +37,6 @@ subdir = src/Core
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -68,9 +60,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -212,6 +214,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -231,6 +235,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -338,6 +344,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -384,7 +392,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs b/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs
index 6cf6dcc..70722a3 100644
--- a/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs
+++ b/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs
@@ -92,6 +92,7 @@ namespace Banshee.Dap.AppleDevice
SupportsVideo = Device.SupportsVideo;
Initialize ();
+ GPod.ITDB.InitIpod (Volume.MountPoint, Device.IpodInfo.ModelNumber, Name);
// FIXME: Properly parse the device, color and generation and don't use the fallback strings
diff --git a/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs b/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs
index 2c97e02..5d85d89 100644
--- a/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs
+++ b/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs
@@ -240,6 +240,8 @@ namespace Banshee.Dap.AppleDevice
if (HasAttribute (TrackMediaAttributes.Podcast)) {
track.Description = description;
track.RememberPlaybackPosition = true;
+ track.SkipWhenShuffling = true;
+ track.Flag4 = (byte)1;
track.MarkUnplayed = (track.PlayCount == 0);
}
@@ -263,7 +265,6 @@ namespace Banshee.Dap.AppleDevice
} else {
if (HasAttribute (TrackMediaAttributes.Podcast)) {
track.MediaType = GPod.MediaType.Podcast;
- track.Flag4 = (byte)1;
} else if (HasAttribute (TrackMediaAttributes.AudioBook)) {
track.MediaType = GPod.MediaType.Audiobook;
} else if (HasAttribute (TrackMediaAttributes.Music)) {
diff --git a/src/Dap/Banshee.Dap.AppleDevice/Makefile.in b/src/Dap/Banshee.Dap.AppleDevice/Makefile.in
index 0bec2e2..5acc12a 100644
--- a/src/Dap/Banshee.Dap.AppleDevice/Makefile.in
+++ b/src/Dap/Banshee.Dap.AppleDevice/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Dap/Banshee.Dap.AppleDevice
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -429,6 +436,8 @@ EXTRA_BUNDLE = $(LIBGPODSHARP_ASSEMBLIES)
@ENABLE_APPLEDEVICE_TRUE at LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
@ENABLE_APPLEDEVICE_TRUE at LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
@ENABLE_APPLEDEVICE_TRUE at LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+ at ENABLE_APPLEDEVICE_TRUE@LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+ at ENABLE_APPLEDEVICE_TRUE@LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
@ENABLE_APPLEDEVICE_TRUE at DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -545,6 +554,7 @@ EXTRA_BUNDLE = $(LIBGPODSHARP_ASSEMBLIES)
@ENABLE_APPLEDEVICE_TRUE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@ENABLE_APPLEDEVICE_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
+ at ENABLE_APPLEDEVICE_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@ENABLE_APPLEDEVICE_TRUE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@ENABLE_APPLEDEVICE_TRUE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@ENABLE_APPLEDEVICE_TRUE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -558,6 +568,7 @@ EXTRA_BUNDLE = $(LIBGPODSHARP_ASSEMBLIES)
@ENABLE_APPLEDEVICE_TRUE at REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_APPLEDEVICE_TRUE at REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_APPLEDEVICE_TRUE at REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+ at ENABLE_APPLEDEVICE_TRUE@REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
@ENABLE_APPLEDEVICE_TRUE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Dap/Banshee.Dap.Ipod/Makefile.in b/src/Dap/Banshee.Dap.Ipod/Makefile.in
index e7a1ec1..b0c7d35 100644
--- a/src/Dap/Banshee.Dap.Ipod/Makefile.in
+++ b/src/Dap/Banshee.Dap.Ipod/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Dap/Banshee.Dap.Ipod
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -433,6 +440,8 @@ EXTRA_BUNDLE = $(IPODSHARP_ASSEMBLIES)
@ENABLE_IPOD_TRUE at LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
@ENABLE_IPOD_TRUE at LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
@ENABLE_IPOD_TRUE at LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+ at ENABLE_IPOD_TRUE@LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+ at ENABLE_IPOD_TRUE@LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
@ENABLE_IPOD_TRUE at DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -549,6 +558,7 @@ EXTRA_BUNDLE = $(IPODSHARP_ASSEMBLIES)
@ENABLE_IPOD_TRUE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@ENABLE_IPOD_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
+ at ENABLE_IPOD_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@ENABLE_IPOD_TRUE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@ENABLE_IPOD_TRUE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@ENABLE_IPOD_TRUE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -562,6 +572,7 @@ EXTRA_BUNDLE = $(IPODSHARP_ASSEMBLIES)
@ENABLE_IPOD_TRUE at REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_IPOD_TRUE at REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_IPOD_TRUE at REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+ at ENABLE_IPOD_TRUE@REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
@ENABLE_IPOD_TRUE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Dap/Banshee.Dap.Karma/Makefile.in b/src/Dap/Banshee.Dap.Karma/Makefile.in
index 4b9f8dc..96a2ac5 100644
--- a/src/Dap/Banshee.Dap.Karma/Makefile.in
+++ b/src/Dap/Banshee.Dap.Karma/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Dap/Banshee.Dap.Karma
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -429,6 +436,8 @@ EXTRA_BUNDLE = $(KARMASHARP_ASSEMBLIES)
@ENABLE_KARMA_TRUE at LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
@ENABLE_KARMA_TRUE at LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
@ENABLE_KARMA_TRUE at LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+ at ENABLE_KARMA_TRUE@LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+ at ENABLE_KARMA_TRUE@LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
@ENABLE_KARMA_TRUE at DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -545,6 +554,7 @@ EXTRA_BUNDLE = $(KARMASHARP_ASSEMBLIES)
@ENABLE_KARMA_TRUE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@ENABLE_KARMA_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
+ at ENABLE_KARMA_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@ENABLE_KARMA_TRUE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@ENABLE_KARMA_TRUE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@ENABLE_KARMA_TRUE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -558,6 +568,7 @@ EXTRA_BUNDLE = $(KARMASHARP_ASSEMBLIES)
@ENABLE_KARMA_TRUE at REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_KARMA_TRUE at REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_KARMA_TRUE at REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+ at ENABLE_KARMA_TRUE@REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
@ENABLE_KARMA_TRUE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage.addin.xml b/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage.addin.xml
index ed4e11d..d397897 100644
--- a/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage.addin.xml
+++ b/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage.addin.xml
@@ -57,6 +57,9 @@
<MassStorageDevice class="Banshee.Dap.MassStorage.AndroidDevice"
vendor-name="Sony Ericsson" product-name="Xperia X10"
vendor-id="0x0fce" product-id="0xd12e,0xe12e"/>
+ <MassStorageDevice class="Banshee.Dap.MassStorage.AndroidDevice"
+ vendor-name="LG Electronics Inc." product-name="LG Ally"
+ vendor-id="0x1004" product-id="0x618e,0x618f"/>
<MassStorageDevice class="Banshee.Dap.MassStorage.WebOSDevice"
vendor-name="Palm" product-name="Pre"
vendor-id="0x0830" product-id="0x8004,0x8002"/>
diff --git a/src/Dap/Banshee.Dap.MassStorage/Makefile.in b/src/Dap/Banshee.Dap.MassStorage/Makefile.in
index b1e40b5..36a3521 100644
--- a/src/Dap/Banshee.Dap.MassStorage/Makefile.in
+++ b/src/Dap/Banshee.Dap.MassStorage/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Dap/Banshee.Dap.MassStorage
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -435,6 +442,8 @@ LINK_GDATA = $(GDATASHARP_LIBS)
LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -551,6 +560,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -564,6 +574,7 @@ REF_EXTENSION_PODCASTING = $(LINK_MIGO_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Dap/Banshee.Dap.Mtp/Makefile.in b/src/Dap/Banshee.Dap.Mtp/Makefile.in
index ef8234c..3b20191 100644
--- a/src/Dap/Banshee.Dap.Mtp/Makefile.in
+++ b/src/Dap/Banshee.Dap.Mtp/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Dap/Banshee.Dap.Mtp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -429,6 +436,8 @@ RESOURCES = Banshee.Dap.Mtp.addin.xml
@ENABLE_MTP_TRUE at LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
@ENABLE_MTP_TRUE at LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
@ENABLE_MTP_TRUE at LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+ at ENABLE_MTP_TRUE@LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+ at ENABLE_MTP_TRUE@LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
@ENABLE_MTP_TRUE at DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -545,6 +554,7 @@ RESOURCES = Banshee.Dap.Mtp.addin.xml
@ENABLE_MTP_TRUE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@ENABLE_MTP_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
+ at ENABLE_MTP_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@ENABLE_MTP_TRUE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@ENABLE_MTP_TRUE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@ENABLE_MTP_TRUE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -558,6 +568,7 @@ RESOURCES = Banshee.Dap.Mtp.addin.xml
@ENABLE_MTP_TRUE at REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_MTP_TRUE at REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_MTP_TRUE at REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+ at ENABLE_MTP_TRUE@REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
@ENABLE_MTP_TRUE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Dap/Banshee.Dap/Makefile.in b/src/Dap/Banshee.Dap/Makefile.in
index bcffa4b..3213b70 100644
--- a/src/Dap/Banshee.Dap/Makefile.in
+++ b/src/Dap/Banshee.Dap/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Dap/Banshee.Dap
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -451,6 +458,8 @@ LINK_GDATA = $(GDATASHARP_LIBS)
LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -567,6 +576,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -580,6 +590,7 @@ REF_EXTENSION_PODCASTING = $(LINK_MIGO_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Dap/Makefile.in b/src/Dap/Makefile.in
index 766eb36..2591919 100644
--- a/src/Dap/Makefile.in
+++ b/src/Dap/Makefile.in
@@ -37,14 +37,6 @@ subdir = src/Dap
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -68,9 +60,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -212,6 +214,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -231,6 +235,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -338,6 +344,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -384,7 +392,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/src/Extensions/Banshee.AmazonMp3.Store/Makefile.in b/src/Extensions/Banshee.AmazonMp3.Store/Makefile.in
index 4bf6fc7..159826a 100644
--- a/src/Extensions/Banshee.AmazonMp3.Store/Makefile.in
+++ b/src/Extensions/Banshee.AmazonMp3.Store/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Extensions/Banshee.AmazonMp3.Store
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -430,6 +437,8 @@ RESOURCES = Banshee.AmazonMp3.Store.addin.xml
@HAVE_LIBWEBKIT_TRUE at LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
@HAVE_LIBWEBKIT_TRUE at LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
@HAVE_LIBWEBKIT_TRUE at LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+ at HAVE_LIBWEBKIT_TRUE@LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+ at HAVE_LIBWEBKIT_TRUE@LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
@HAVE_LIBWEBKIT_TRUE at DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -546,6 +555,7 @@ RESOURCES = Banshee.AmazonMp3.Store.addin.xml
@HAVE_LIBWEBKIT_TRUE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@HAVE_LIBWEBKIT_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
+ at HAVE_LIBWEBKIT_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@HAVE_LIBWEBKIT_TRUE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -559,6 +569,7 @@ RESOURCES = Banshee.AmazonMp3.Store.addin.xml
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+ at HAVE_LIBWEBKIT_TRUE@REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Extensions/Banshee.AmazonMp3.Store/ThemeIcons/16x16/categories/amazon-mp3-store-source.png b/src/Extensions/Banshee.AmazonMp3.Store/ThemeIcons/16x16/categories/amazon-mp3-store-source.png
new file mode 100644
index 0000000..508af88
Binary files /dev/null and b/src/Extensions/Banshee.AmazonMp3.Store/ThemeIcons/16x16/categories/amazon-mp3-store-source.png differ
diff --git a/src/Extensions/Banshee.AmazonMp3.Store/ThemeIcons/22x22/categories/amazon-mp3-store-source.png b/src/Extensions/Banshee.AmazonMp3.Store/ThemeIcons/22x22/categories/amazon-mp3-store-source.png
new file mode 100644
index 0000000..b8f70a6
Binary files /dev/null and b/src/Extensions/Banshee.AmazonMp3.Store/ThemeIcons/22x22/categories/amazon-mp3-store-source.png differ
diff --git a/src/Extensions/Banshee.AmazonMp3/Makefile.in b/src/Extensions/Banshee.AmazonMp3/Makefile.in
index a308555..4aa08b5 100644
--- a/src/Extensions/Banshee.AmazonMp3/Makefile.in
+++ b/src/Extensions/Banshee.AmazonMp3/Makefile.in
@@ -43,14 +43,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Extensions/Banshee.AmazonMp3
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -74,9 +66,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -202,6 +204,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -221,6 +225,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -328,6 +334,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -374,7 +382,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -439,6 +446,8 @@ LINK_GDATA = $(GDATASHARP_LIBS)
LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -555,6 +564,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -568,6 +578,7 @@ REF_EXTENSION_PODCASTING = $(LINK_MIGO_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Extensions/Banshee.AudioCd/Makefile.in b/src/Extensions/Banshee.AudioCd/Makefile.in
index af61cd6..045f6da 100644
--- a/src/Extensions/Banshee.AudioCd/Makefile.in
+++ b/src/Extensions/Banshee.AudioCd/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Extensions/Banshee.AudioCd
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -436,6 +443,8 @@ LINK_GDATA = $(GDATASHARP_LIBS)
LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -552,6 +561,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -565,6 +575,7 @@ REF_EXTENSION_PODCASTING = $(LINK_MIGO_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Extensions/Banshee.Audiobook/Makefile.in b/src/Extensions/Banshee.Audiobook/Makefile.in
index 754ae34..cec430c 100644
--- a/src/Extensions/Banshee.Audiobook/Makefile.in
+++ b/src/Extensions/Banshee.Audiobook/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Extensions/Banshee.Audiobook
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -439,6 +446,8 @@ LINK_GDATA = $(GDATASHARP_LIBS)
LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -555,6 +564,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -568,6 +578,7 @@ REF_EXTENSION_PODCASTING = $(LINK_MIGO_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Extensions/Banshee.BooScript/Makefile.in b/src/Extensions/Banshee.BooScript/Makefile.in
index f972cab..fcf805d 100644
--- a/src/Extensions/Banshee.BooScript/Makefile.in
+++ b/src/Extensions/Banshee.BooScript/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Extensions/Banshee.BooScript
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -430,6 +437,8 @@ RESOURCES = \
@HAVE_BOO_TRUE at LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
@HAVE_BOO_TRUE at LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
@HAVE_BOO_TRUE at LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+ at HAVE_BOO_TRUE@LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+ at HAVE_BOO_TRUE@LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
@HAVE_BOO_TRUE at DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -546,6 +555,7 @@ RESOURCES = \
@HAVE_BOO_TRUE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@HAVE_BOO_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
+ at HAVE_BOO_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@HAVE_BOO_TRUE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@HAVE_BOO_TRUE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@HAVE_BOO_TRUE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -559,6 +569,7 @@ RESOURCES = \
@HAVE_BOO_TRUE at REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_BOO_TRUE at REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_BOO_TRUE at REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+ at HAVE_BOO_TRUE@REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
@HAVE_BOO_TRUE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Extensions/Banshee.Bpm/Makefile.in b/src/Extensions/Banshee.Bpm/Makefile.in
index a2fc370..d02d5e0 100644
--- a/src/Extensions/Banshee.Bpm/Makefile.in
+++ b/src/Extensions/Banshee.Bpm/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Extensions/Banshee.Bpm
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -431,6 +438,8 @@ LINK_GDATA = $(GDATASHARP_LIBS)
LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -547,6 +556,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -560,6 +570,7 @@ REF_EXTENSION_PODCASTING = $(LINK_MIGO_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Extensions/Banshee.CoverArt/Makefile.in b/src/Extensions/Banshee.CoverArt/Makefile.in
index db52ab8..195b219 100644
--- a/src/Extensions/Banshee.CoverArt/Makefile.in
+++ b/src/Extensions/Banshee.CoverArt/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Extensions/Banshee.CoverArt
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -428,6 +435,8 @@ LINK_GDATA = $(GDATASHARP_LIBS)
LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -544,6 +553,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -557,6 +567,7 @@ REF_EXTENSION_PODCASTING = $(LINK_MIGO_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Extensions/Banshee.Daap/Makefile.in b/src/Extensions/Banshee.Daap/Makefile.in
index 783735c..a7fbc29 100644
--- a/src/Extensions/Banshee.Daap/Makefile.in
+++ b/src/Extensions/Banshee.Daap/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Extensions/Banshee.Daap
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -456,6 +463,8 @@ RESOURCES = \
@DAAP_ENABLED_TRUE at LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
@DAAP_ENABLED_TRUE at LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
@DAAP_ENABLED_TRUE at LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+ at DAAP_ENABLED_TRUE@LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+ at DAAP_ENABLED_TRUE@LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
@DAAP_ENABLED_TRUE at DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -572,6 +581,7 @@ RESOURCES = \
@DAAP_ENABLED_TRUE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@DAAP_ENABLED_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
+ at DAAP_ENABLED_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@DAAP_ENABLED_TRUE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@DAAP_ENABLED_TRUE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@DAAP_ENABLED_TRUE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -585,6 +595,7 @@ RESOURCES = \
@DAAP_ENABLED_TRUE at REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@DAAP_ENABLED_TRUE at REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@DAAP_ENABLED_TRUE at REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+ at DAAP_ENABLED_TRUE@REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
@DAAP_ENABLED_TRUE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Extensions/Banshee.Emusic/Makefile.in b/src/Extensions/Banshee.Emusic/Makefile.in
index 7b65426..12d6ba9 100644
--- a/src/Extensions/Banshee.Emusic/Makefile.in
+++ b/src/Extensions/Banshee.Emusic/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Extensions/Banshee.Emusic
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -430,6 +437,8 @@ LINK_GDATA = $(GDATASHARP_LIBS)
LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -546,6 +555,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -559,6 +569,7 @@ REF_EXTENSION_PODCASTING = $(LINK_MIGO_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Extensions/Banshee.FileSystemQueue/Makefile.in b/src/Extensions/Banshee.FileSystemQueue/Makefile.in
index 521eb50..f5c8e7c 100644
--- a/src/Extensions/Banshee.FileSystemQueue/Makefile.in
+++ b/src/Extensions/Banshee.FileSystemQueue/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Extensions/Banshee.FileSystemQueue
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -429,6 +436,8 @@ LINK_GDATA = $(GDATASHARP_LIBS)
LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -545,6 +554,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -558,6 +568,7 @@ REF_EXTENSION_PODCASTING = $(LINK_MIGO_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Extensions/Banshee.Fixup/Banshee.Fixup/ColumnCellSolutionOptions.cs b/src/Extensions/Banshee.Fixup/Banshee.Fixup/ColumnCellSolutionOptions.cs
index fd391fb..1e683f4 100644
--- a/src/Extensions/Banshee.Fixup/Banshee.Fixup/ColumnCellSolutionOptions.cs
+++ b/src/Extensions/Banshee.Fixup/Banshee.Fixup/ColumnCellSolutionOptions.cs
@@ -49,9 +49,9 @@ namespace Banshee.Fixup
UseMarkup = true;
}
- public override void Render (CellContext context, Gtk.StateType state, double cellWidth, double cellHeight)
+ public override void Render (CellContext context, double cellWidth, double cellHeight)
{
- base.Render (context, state, cellWidth, cellHeight);
+ base.Render (context, cellWidth, cellHeight);
if (measure) {
solution_value_widths.Clear ();
diff --git a/src/Extensions/Banshee.Fixup/Makefile.in b/src/Extensions/Banshee.Fixup/Makefile.in
index 00ac2f2..d070645 100644
--- a/src/Extensions/Banshee.Fixup/Makefile.in
+++ b/src/Extensions/Banshee.Fixup/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Extensions/Banshee.Fixup
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -441,6 +448,8 @@ LINK_GDATA = $(GDATASHARP_LIBS)
LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -557,6 +566,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -570,6 +580,7 @@ REF_EXTENSION_PODCASTING = $(LINK_MIGO_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Extensions/Banshee.InternetArchive/Makefile.in b/src/Extensions/Banshee.InternetArchive/Makefile.in
index dd24bb4..bd8f857 100644
--- a/src/Extensions/Banshee.InternetArchive/Makefile.in
+++ b/src/Extensions/Banshee.InternetArchive/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Extensions/Banshee.InternetArchive
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -454,6 +461,8 @@ LINK_GDATA = $(GDATASHARP_LIBS)
LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -570,6 +579,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -583,6 +593,7 @@ REF_EXTENSION_PODCASTING = $(LINK_MIGO_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Extensions/Banshee.InternetRadio/Makefile.in b/src/Extensions/Banshee.InternetRadio/Makefile.in
index 2d9a965..11d8ea9 100644
--- a/src/Extensions/Banshee.InternetRadio/Makefile.in
+++ b/src/Extensions/Banshee.InternetRadio/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Extensions/Banshee.InternetRadio
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -434,6 +441,8 @@ LINK_GDATA = $(GDATASHARP_LIBS)
LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -550,6 +559,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -563,6 +573,7 @@ REF_EXTENSION_PODCASTING = $(LINK_MIGO_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Extensions/Banshee.Lastfm/Makefile.in b/src/Extensions/Banshee.Lastfm/Makefile.in
index f2935a3..0aeb459 100644
--- a/src/Extensions/Banshee.Lastfm/Makefile.in
+++ b/src/Extensions/Banshee.Lastfm/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Extensions/Banshee.Lastfm
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -442,6 +449,8 @@ LINK_GDATA = $(GDATASHARP_LIBS)
LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -558,6 +567,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -571,6 +581,7 @@ REF_EXTENSION_PODCASTING = $(LINK_MIGO_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Extensions/Banshee.LastfmStreaming/Makefile.in b/src/Extensions/Banshee.LastfmStreaming/Makefile.in
index b79309a..fcfebdc 100644
--- a/src/Extensions/Banshee.LastfmStreaming/Makefile.in
+++ b/src/Extensions/Banshee.LastfmStreaming/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Extensions/Banshee.LastfmStreaming
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -437,6 +444,8 @@ LINK_GDATA = $(GDATASHARP_LIBS)
LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -553,6 +562,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -566,6 +576,7 @@ REF_EXTENSION_PODCASTING = $(LINK_MIGO_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Extensions/Banshee.LibraryWatcher/Makefile.in b/src/Extensions/Banshee.LibraryWatcher/Makefile.in
index 0c011da..1da43f1 100644
--- a/src/Extensions/Banshee.LibraryWatcher/Makefile.in
+++ b/src/Extensions/Banshee.LibraryWatcher/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Extensions/Banshee.LibraryWatcher
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -428,6 +435,8 @@ RESOURCES = Banshee.LibraryWatcher.addin.xml
@ENABLE_LIBRARY_WATCHER_TRUE at LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
@ENABLE_LIBRARY_WATCHER_TRUE at LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
@ENABLE_LIBRARY_WATCHER_TRUE at LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+ at ENABLE_LIBRARY_WATCHER_TRUE@LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+ at ENABLE_LIBRARY_WATCHER_TRUE@LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
@ENABLE_LIBRARY_WATCHER_TRUE at DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -544,6 +553,7 @@ RESOURCES = Banshee.LibraryWatcher.addin.xml
@ENABLE_LIBRARY_WATCHER_TRUE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@ENABLE_LIBRARY_WATCHER_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
+ at ENABLE_LIBRARY_WATCHER_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@ENABLE_LIBRARY_WATCHER_TRUE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@ENABLE_LIBRARY_WATCHER_TRUE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@ENABLE_LIBRARY_WATCHER_TRUE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -557,6 +567,7 @@ RESOURCES = Banshee.LibraryWatcher.addin.xml
@ENABLE_LIBRARY_WATCHER_TRUE at REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_LIBRARY_WATCHER_TRUE at REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_LIBRARY_WATCHER_TRUE at REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+ at ENABLE_LIBRARY_WATCHER_TRUE@REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
@ENABLE_LIBRARY_WATCHER_TRUE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs
index d67ad7d..452a1bb 100644
--- a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs
+++ b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs
@@ -41,6 +41,7 @@ using Banshee.Sources.Gui;
using Banshee.Collection;
using Banshee.Collection.Gui;
using Banshee.MediaEngine;
+using Banshee.Gui;
using Banshee.Gui.Widgets;
namespace Banshee.MeeGo
@@ -82,6 +83,9 @@ namespace Banshee.MeeGo
{
ServiceManager.SourceManager.ActiveSourceChanged += OnActiveSourceChanged;
+ ServiceManager.Get<InterfaceActionService> ().TrackActions ["SearchForSameArtistAction"].Activated += OnProgrammaticSearch;
+ ServiceManager.Get<InterfaceActionService> ().TrackActions ["SearchForSameAlbumAction"].Activated += OnProgrammaticSearch;
+
ServiceManager.PlayerEngine.ConnectEvent ((args) => track_info_display.Visible =
ServiceManager.PlayerEngine.CurrentState != PlayerState.Idle,
PlayerEvent.StateChange | PlayerEvent.StartOfStream);
@@ -246,6 +250,14 @@ namespace Banshee.MeeGo
#region Event Handlers
+ private void OnProgrammaticSearch (object o, EventArgs args)
+ {
+ Source source = ServiceManager.SourceManager.ActiveSource;
+ search_entry.Ready = false;
+ search_entry.Query = source.FilterQuery;
+ search_entry.Ready = true;
+ }
+
private void OnBrowserViewSelectionChanged (object o, EventArgs args)
{
// Scroll the raising filter view to the top if "all" is selected
diff --git a/src/Extensions/Banshee.MeeGo/Makefile.in b/src/Extensions/Banshee.MeeGo/Makefile.in
index 04c20e7..ebe9b4d 100644
--- a/src/Extensions/Banshee.MeeGo/Makefile.in
+++ b/src/Extensions/Banshee.MeeGo/Makefile.in
@@ -43,14 +43,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Extensions/Banshee.MeeGo
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -74,9 +66,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -202,6 +204,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -221,6 +225,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -328,6 +334,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -374,7 +382,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -443,6 +450,8 @@ RESOURCES = Banshee.MeeGo.addin.xml
@HAVE_MEEGO_TRUE at LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
@HAVE_MEEGO_TRUE at LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
@HAVE_MEEGO_TRUE at LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+ at HAVE_MEEGO_TRUE@LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+ at HAVE_MEEGO_TRUE@LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
@HAVE_MEEGO_TRUE at DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -559,6 +568,7 @@ RESOURCES = Banshee.MeeGo.addin.xml
@HAVE_MEEGO_TRUE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@HAVE_MEEGO_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
+ at HAVE_MEEGO_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@HAVE_MEEGO_TRUE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@HAVE_MEEGO_TRUE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@HAVE_MEEGO_TRUE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -572,6 +582,7 @@ RESOURCES = Banshee.MeeGo.addin.xml
@HAVE_MEEGO_TRUE at REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_MEEGO_TRUE at REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_MEEGO_TRUE at REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+ at HAVE_MEEGO_TRUE@REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
@HAVE_MEEGO_TRUE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Extensions/Banshee.MiniMode/Makefile.in b/src/Extensions/Banshee.MiniMode/Makefile.in
index e64608c..1ae5cfc 100644
--- a/src/Extensions/Banshee.MiniMode/Makefile.in
+++ b/src/Extensions/Banshee.MiniMode/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Extensions/Banshee.MiniMode
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -429,6 +436,8 @@ LINK_GDATA = $(GDATASHARP_LIBS)
LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -545,6 +554,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -558,6 +568,7 @@ REF_EXTENSION_PODCASTING = $(LINK_MIGO_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Extensions/Banshee.MiroGuide/Makefile.in b/src/Extensions/Banshee.MiroGuide/Makefile.in
index 7c83c8f..4ab1809 100644
--- a/src/Extensions/Banshee.MiroGuide/Makefile.in
+++ b/src/Extensions/Banshee.MiroGuide/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Extensions/Banshee.MiroGuide
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -429,6 +436,8 @@ RESOURCES = Banshee.MiroGuide.addin.xml
@HAVE_LIBWEBKIT_TRUE at LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
@HAVE_LIBWEBKIT_TRUE at LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
@HAVE_LIBWEBKIT_TRUE at LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+ at HAVE_LIBWEBKIT_TRUE@LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+ at HAVE_LIBWEBKIT_TRUE@LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
@HAVE_LIBWEBKIT_TRUE at DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -545,6 +554,7 @@ RESOURCES = Banshee.MiroGuide.addin.xml
@HAVE_LIBWEBKIT_TRUE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@HAVE_LIBWEBKIT_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
+ at HAVE_LIBWEBKIT_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@HAVE_LIBWEBKIT_TRUE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -558,6 +568,7 @@ RESOURCES = Banshee.MiroGuide.addin.xml
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+ at HAVE_LIBWEBKIT_TRUE@REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Extensions/Banshee.MiroGuide/ThemeIcons/16x16/categories/miro-guide-source.png b/src/Extensions/Banshee.MiroGuide/ThemeIcons/16x16/categories/miro-guide-source.png
new file mode 100644
index 0000000..4376ecd
Binary files /dev/null and b/src/Extensions/Banshee.MiroGuide/ThemeIcons/16x16/categories/miro-guide-source.png differ
diff --git a/src/Extensions/Banshee.MiroGuide/ThemeIcons/22x22/categories/miro-guide-source.png b/src/Extensions/Banshee.MiroGuide/ThemeIcons/22x22/categories/miro-guide-source.png
new file mode 100644
index 0000000..2afc56e
Binary files /dev/null and b/src/Extensions/Banshee.MiroGuide/ThemeIcons/22x22/categories/miro-guide-source.png differ
diff --git a/src/Extensions/Banshee.MiroGuide/ThemeIcons/24x24/categories/miro-guide-source.png b/src/Extensions/Banshee.MiroGuide/ThemeIcons/24x24/categories/miro-guide-source.png
new file mode 100644
index 0000000..1f870c4
Binary files /dev/null and b/src/Extensions/Banshee.MiroGuide/ThemeIcons/24x24/categories/miro-guide-source.png differ
diff --git a/src/Extensions/Banshee.MiroGuide/ThemeIcons/32x32/categories/miro-guide-source.png b/src/Extensions/Banshee.MiroGuide/ThemeIcons/32x32/categories/miro-guide-source.png
new file mode 100644
index 0000000..6e5654d
Binary files /dev/null and b/src/Extensions/Banshee.MiroGuide/ThemeIcons/32x32/categories/miro-guide-source.png differ
diff --git a/src/Extensions/Banshee.MiroGuide/ThemeIcons/48x48/categories/miro-guide-source.png b/src/Extensions/Banshee.MiroGuide/ThemeIcons/48x48/categories/miro-guide-source.png
new file mode 100644
index 0000000..3fcbb09
Binary files /dev/null and b/src/Extensions/Banshee.MiroGuide/ThemeIcons/48x48/categories/miro-guide-source.png differ
diff --git a/src/Extensions/Banshee.MiroGuide/ThemeIcons/scalable/categories/miro-guide-source.svg b/src/Extensions/Banshee.MiroGuide/ThemeIcons/scalable/categories/miro-guide-source.svg
new file mode 100644
index 0000000..be1c328
--- /dev/null
+++ b/src/Extensions/Banshee.MiroGuide/ThemeIcons/scalable/categories/miro-guide-source.svg
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ version="1.0"
+ width="48"
+ height="48"
+ id="svg3266"
+ sodipodi:version="0.32"
+ inkscape:version="0.46"
+ sodipodi:docname="miro.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <metadata
+ id="metadata33">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <sodipodi:namedview
+ inkscape:window-height="794"
+ inkscape:window-width="1440"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0.0"
+ guidetolerance="10.0"
+ gridtolerance="10.0"
+ objecttolerance="10.0"
+ borderopacity="1.0"
+ bordercolor="#666666"
+ pagecolor="#ffffff"
+ id="base"
+ showgrid="false"
+ inkscape:zoom="6.8648283"
+ inkscape:cx="-9.6420969"
+ inkscape:cy="24"
+ inkscape:window-x="0"
+ inkscape:window-y="24"
+ inkscape:current-layer="svg3266" />
+ <defs
+ id="defs3268">
+ <linearGradient
+ id="linearGradient8838">
+ <stop
+ id="stop8840"
+ style="stop-color:#000000;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop8842"
+ style="stop-color:#000000;stop-opacity:0"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient2490">
+ <stop
+ id="stop2492"
+ style="stop-color:#791235;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop2494"
+ style="stop-color:#dd3b27;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3242">
+ <stop
+ id="stop3244"
+ style="stop-color:#f8b17e;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3246"
+ style="stop-color:#e35d4f;stop-opacity:1"
+ offset="0.26238" />
+ <stop
+ id="stop3248"
+ style="stop-color:#c6262e;stop-opacity:1"
+ offset="0.66093999" />
+ <stop
+ id="stop3250"
+ style="stop-color:#690b54;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3202">
+ <stop
+ id="stop3204"
+ style="stop-color:#ffffff;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3206"
+ style="stop-color:#d3eefc;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3230">
+ <stop
+ id="stop3232"
+ style="stop-color:#ffffff;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3234"
+ style="stop-color:#ffffff;stop-opacity:0"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3230"
+ id="linearGradient2408"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(0,0.9999998)"
+ x1="26.153599"
+ y1="4.9999995"
+ x2="26.153599"
+ y2="44.233311" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3202"
+ id="linearGradient2411"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.0395395,0,0,0.9504295,2.4213254,1.5862551)"
+ x1="22.885227"
+ y1="17.628952"
+ x2="22.885227"
+ y2="30.889549" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3242"
+ id="radialGradient2415"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0,1.6958206,-1.7757718,0,30.273358,-47.575099)"
+ cx="32.806725"
+ cy="3.5327499"
+ fx="32.806725"
+ fy="3.5327499"
+ r="23" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2490"
+ id="linearGradient2417"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(51.417219,1.3502817)"
+ x1="-23.916132"
+ y1="43.707703"
+ x2="-23.916132"
+ y2="4.6497173" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient8838"
+ id="radialGradient2420"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.1647059,0,0,0.8470576,-111.5647,35.082353)"
+ cx="62.625"
+ cy="4.625"
+ fx="62.625"
+ fy="4.625"
+ r="10.625" />
+ </defs>
+ <path
+ style="opacity:0.3;fill:url(#radialGradient2420);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999987999999995;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ id="path8836"
+ d="M 47.000007,39 C 47.000007,43.970562 36.702555,47.999999 24.000007,47.999999 C 11.297459,47.999999 1.0000068,43.970562 1.0000068,39 C 1.0000068,34.029437 11.297459,30 24.000007,30 C 36.702555,30 47.000007,34.029437 47.000007,39 L 47.000007,39 z" />
+ <path
+ style="fill:url(#radialGradient2415);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2417);stroke-width:0.99999988px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="path2421"
+ d="M 1.5000006,31.761226 C 1.5000006,31.761226 10.115608,15.647729 22.458894,9.2294409 C 29.653279,5.4884898 41.244893,4.5285552 46.43013,13.320438 C 46.43013,13.320438 48.176874,36.419951 34.202924,42.922755 C 34.202924,42.922755 19.743769,50.687298 1.5000006,31.761226 z" />
+ <path
+ style="font-size:26.70637703px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#a1ceef;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:URW Gothic L;-inkscape-font-specification:URW Gothic L Book"
+ id="path2438"
+ d="M 16,30.999999 C 17.225378,30.999999 19.774622,30.999999 21,30.999999 C 21.020028,28.309559 20.916511,25.61742 21,22.928239 C 21,21.493793 21.209448,20.211199 22.896799,20.211199 C 24.832644,20.211199 24.986483,21.181016 24.986483,23.02827 C 24.986483,24.716506 24.986483,29.311763 24.986483,30.999999 C 26.21186,30.999999 28.774623,31 30,31 C 30.014374,28.354294 29.941186,25.707605 30,23.062615 C 30.008937,21.790435 29.886674,20.211199 31.992422,20.211199 C 33.88686,20.211199 33.999064,21.457713 33.999064,23.083965 C 33.999064,24.753635 33.999063,29.330328 33.999064,31 C 35.22444,31 37.774622,31 39,31 C 38.985776,28.048126 39.029681,25.095218 38.975706,22.144048 C 38.898843,20.359713 38.212819,18.388221 36.387725,17.484421 C 35.343606,17.14161 35.045063,17.011799 33.742745,17.011799 C 31.060737,17.011799 20.652644,17 16,17 C 16,21.666666 16,26.333334 16,30.999999 z" />
+ <path
+ style="font-size:26.70637703px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:url(#linearGradient2411);fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:URW Gothic L;-inkscape-font-specification:URW Gothic L Book"
+ id="text3190"
+ d="M 16,31.999999 C 17.225378,31.999999 19.774622,31.999999 21,31.999999 C 21.020028,29.309559 20.916511,26.61742 21,23.928239 C 21,22.493793 21.209448,21.211199 22.896799,21.211199 C 24.832644,21.211199 24.986483,22.181016 24.986483,24.02827 C 24.986483,25.716506 24.986483,30.311763 24.986483,31.999999 C 26.21186,31.999999 28.774623,32 30,32 C 30.014374,29.354294 29.941186,26.707605 30,24.062615 C 30.008937,22.790435 29.886674,21.211199 31.992422,21.211199 C 33.88686,21.211199 33.999064,22.457713 33.999064,24.083965 C 33.999064,25.753635 33.999063,30.330328 33.999064,32 C 35.22444,32 37.774622,32 39,32 C 38.985776,29.048126 39.029681,26.095218 38.975706,23.144048 C 38.898843,21.359713 38.212819,19.388221 36.387725,18.484421 C 35.343606,18.14161 35.045063,18.011799 33.742745,18.011799 C 31.060737,18.011799 20.652644,18 16,18 C 16,22.666666 16,27.333334 16,31.999999 z" />
+ <path
+ style="opacity:0.4;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2408);stroke-width:0.99999988px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="path3238"
+ d="M 31.90625,7.4999998 C 28.681328,7.7425666 25.48596,8.7210967 22.90625,10.0625 C 11.707044,15.885887 3.6907335,29.825628 2.71875,31.5625 C 11.484066,40.437302 19.207332,43.094404 24.75,43.5 C 30.407274,43.913983 33.75,42.09375 33.75,42.09375 C 33.760173,42.083092 33.770592,42.072673 33.78125,42.0625 C 40.364812,38.998827 43.337844,31.95008 44.625,25.5 C 45.868154,19.27042 45.525212,13.993747 45.5,13.625 C 42.448467,8.6273583 37.213852,7.1007814 31.90625,7.4999998 z" />
+</svg>
diff --git a/src/Extensions/Banshee.Mpris/Makefile.in b/src/Extensions/Banshee.Mpris/Makefile.in
index e69f3ff..5998e7e 100644
--- a/src/Extensions/Banshee.Mpris/Makefile.in
+++ b/src/Extensions/Banshee.Mpris/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Extensions/Banshee.Mpris
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -431,6 +438,8 @@ LINK_GDATA = $(GDATASHARP_LIBS)
LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -547,6 +556,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -560,6 +570,7 @@ REF_EXTENSION_PODCASTING = $(LINK_MIGO_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Extensions/Banshee.MultimediaKeys/Makefile.in b/src/Extensions/Banshee.MultimediaKeys/Makefile.in
index 641ffbf..0d5a17c 100644
--- a/src/Extensions/Banshee.MultimediaKeys/Makefile.in
+++ b/src/Extensions/Banshee.MultimediaKeys/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Extensions/Banshee.MultimediaKeys
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -425,6 +432,8 @@ RESOURCES = Banshee.MultimediaKeys.addin.xml
@ENABLE_GNOME_TRUE at LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
@ENABLE_GNOME_TRUE at LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
@ENABLE_GNOME_TRUE at LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+ at ENABLE_GNOME_TRUE@LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+ at ENABLE_GNOME_TRUE@LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
@ENABLE_GNOME_TRUE at DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -541,6 +550,7 @@ RESOURCES = Banshee.MultimediaKeys.addin.xml
@ENABLE_GNOME_TRUE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@ENABLE_GNOME_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
+ at ENABLE_GNOME_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@ENABLE_GNOME_TRUE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@ENABLE_GNOME_TRUE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@ENABLE_GNOME_TRUE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -554,6 +564,7 @@ RESOURCES = Banshee.MultimediaKeys.addin.xml
@ENABLE_GNOME_TRUE at REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_GNOME_TRUE at REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_GNOME_TRUE at REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+ at ENABLE_GNOME_TRUE@REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
@ENABLE_GNOME_TRUE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Extensions/Banshee.NotificationArea/Makefile.in b/src/Extensions/Banshee.NotificationArea/Makefile.in
index f7cfe61..f7e1f45 100644
--- a/src/Extensions/Banshee.NotificationArea/Makefile.in
+++ b/src/Extensions/Banshee.NotificationArea/Makefile.in
@@ -43,14 +43,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Extensions/Banshee.NotificationArea
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -74,9 +66,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -200,6 +202,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -219,6 +223,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -328,6 +334,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -374,7 +382,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -447,6 +454,8 @@ RESOURCES = \
@PLATFORM_DARWIN_FALSE at LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
@PLATFORM_DARWIN_FALSE at LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
@PLATFORM_DARWIN_FALSE at LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+ at PLATFORM_DARWIN_FALSE@LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+ at PLATFORM_DARWIN_FALSE@LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
@PLATFORM_DARWIN_FALSE at DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -563,6 +572,7 @@ RESOURCES = \
@PLATFORM_DARWIN_FALSE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@PLATFORM_DARWIN_FALSE@ $(LINK_EXTENSION_PLAYQUEUE)
+ at PLATFORM_DARWIN_FALSE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@PLATFORM_DARWIN_FALSE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@PLATFORM_DARWIN_FALSE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@PLATFORM_DARWIN_FALSE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -576,6 +586,7 @@ RESOURCES = \
@PLATFORM_DARWIN_FALSE at REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@PLATFORM_DARWIN_FALSE at REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@PLATFORM_DARWIN_FALSE at REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+ at PLATFORM_DARWIN_FALSE@REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
@PLATFORM_DARWIN_FALSE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Extensions/Banshee.NowPlaying/Makefile.in b/src/Extensions/Banshee.NowPlaying/Makefile.in
index 458f568..127557c 100644
--- a/src/Extensions/Banshee.NowPlaying/Makefile.in
+++ b/src/Extensions/Banshee.NowPlaying/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Extensions/Banshee.NowPlaying
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -442,6 +449,8 @@ LINK_GDATA = $(GDATASHARP_LIBS)
LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -558,6 +567,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -571,6 +581,7 @@ REF_EXTENSION_PODCASTING = $(LINK_MIGO_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/HeaderWidget.cs b/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/HeaderWidget.cs
index 4eb9d87..ca8109a 100644
--- a/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/HeaderWidget.cs
+++ b/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/HeaderWidget.cs
@@ -99,6 +99,11 @@ namespace Banshee.PlayQueue
shuffler.RandomModeRemoved += (r) => mode_combo.Remove (r);
}
+ public void SetManual () {
+ ThreadAssist.AssertInMainThread ();
+ mode_combo.ActiveValue = mode_combo.Default;
+ }
+
private void OnModeComboChanged (object o, EventArgs args)
{
var random_by = mode_combo.ActiveValue;
diff --git a/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/IPlayQueue.cs b/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/IPlayQueue.cs
index 77d1948..d128b0a 100644
--- a/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/IPlayQueue.cs
+++ b/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/IPlayQueue.cs
@@ -35,5 +35,6 @@ namespace Banshee.PlayQueue
public interface IPlayQueue
{
void EnqueueUri (string uri, bool prepend);
+ void Clear ();
}
}
diff --git a/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs b/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs
index c7e5b4e..1a8caa9 100644
--- a/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs
+++ b/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs
@@ -220,8 +220,7 @@ namespace Banshee.PlayQueue
UpdateAction ("RefreshPlayQueueAction", playqueue.Populate);
UpdateAction ("AddPlayQueueTracksAction", playqueue.Populate);
UpdateAction ("ShufflePlayQueue", !playqueue.Populate, playqueue.Count > 1);
- UpdateAction ("ClearPlayQueueAction", !playqueue.Populate, playqueue.Count > 0);
- UpdateAction ("ClearPlayQueueOnQuitAction", !playqueue.Populate);
+ UpdateAction ("ClearPlayQueueAction", true, playqueue.Count > 0);
UpdateAction ("AddToPlayQueueAction", db_source != null && db_source != playqueue, true);
}
}
diff --git a/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs b/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs
index ae5ef0c..13ed474 100644
--- a/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs
+++ b/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs
@@ -497,6 +497,14 @@ namespace Banshee.PlayQueue
private void Clear (bool disposing)
{
+ if (Populate) {
+ if (disposing) {
+ PopulateModeSchema.Set ("off");
+ } else {
+ header_widget.SetManual ();
+ }
+ }
+
ServiceManager.DbConnection.Execute (@"
DELETE FROM CorePlaylistEntries
WHERE PlaylistID = ?", DbId
@@ -536,7 +544,7 @@ namespace Banshee.PlayQueue
header_widget = null;
}
- if (!Populate && ClearOnQuitSchema.Get ()) {
+ if (ClearOnQuitSchema.Get ()) {
Clear (true);
}
}
diff --git a/src/Extensions/Banshee.PlayQueue/Makefile.in b/src/Extensions/Banshee.PlayQueue/Makefile.in
index 9a04c5c..edd1092 100644
--- a/src/Extensions/Banshee.PlayQueue/Makefile.in
+++ b/src/Extensions/Banshee.PlayQueue/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Extensions/Banshee.PlayQueue
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -437,6 +444,8 @@ LINK_GDATA = $(GDATASHARP_LIBS)
LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -553,6 +562,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -566,6 +576,7 @@ REF_EXTENSION_PODCASTING = $(LINK_MIGO_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Extensions/Banshee.PlayerMigration/Makefile.in b/src/Extensions/Banshee.PlayerMigration/Makefile.in
index f290fac..d494762 100644
--- a/src/Extensions/Banshee.PlayerMigration/Makefile.in
+++ b/src/Extensions/Banshee.PlayerMigration/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Extensions/Banshee.PlayerMigration
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -430,6 +437,8 @@ LINK_GDATA = $(GDATASHARP_LIBS)
LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -546,6 +555,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -559,6 +569,7 @@ REF_EXTENSION_PODCASTING = $(LINK_MIGO_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/DownloadStatusFilterModel.cs b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/DownloadStatusFilterModel.cs
deleted file mode 100644
index dd3135f..0000000
--- a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/DownloadStatusFilterModel.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-// DownloadStatusFilterModel.cs
-//
-// Authors:
-// Gabriel Burt <gburt at novell.com>
-//
-// Copyright (C) 2008 Novell, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-
-using Hyena.Data;
-
-using Banshee.Database;
-using Banshee.Collection;
-using Banshee.Collection.Database;
-using Banshee.Podcasting.Data;
-
-using Migo.Syndication;
-
-namespace Banshee.Podcasting.Gui
-{
- public enum DownloadedStatusFilter
- {
- Both,
- Downloaded,
- NotDownloaded
- }
-
- public class DownloadStatusFilterModel : FilterListModel<DownloadedStatusFilter>
- {
- public DownloadStatusFilterModel (DatabaseTrackListModel trackModel) : base (trackModel)
- {
- // By default, select All items
- Selection.Clear (false);
- Selection.QuietSelect (0);
- }
-
- public override void Reload (bool notify)
- {
- if (notify)
- OnReloaded ();
- }
-
- public override void Clear ()
- {
- }
-
- public override DownloadedStatusFilter this [int index] {
- get {
- switch (index) {
- case 1: return DownloadedStatusFilter.Downloaded;
- case 2: return DownloadedStatusFilter.NotDownloaded;
- case 0:
- default: return DownloadedStatusFilter.Both;
- }
- }
- }
-
- public override int Count {
- get { return 3; }
- }
-
- public override string GetSqlFilter ()
- {
- if (Selection.AllSelected)
- return null;
- else if (Selection.Contains (1))
- return String.Format ("PodcastEnclosures.DownloadStatus = {0}", (int)FeedDownloadStatus.Downloaded);
- else
- return String.Format ("PodcastEnclosures.DownloadStatus != {0}", (int)FeedDownloadStatus.Downloaded);
- }
- }
-}
diff --git a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastFeedModel.cs b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastFeedModel.cs
index 2ce6110..9936962 100644
--- a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastFeedModel.cs
+++ b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastFeedModel.cs
@@ -52,7 +52,7 @@ namespace Banshee.Podcasting.Gui
WHERE PodcastSyndications.FeedID = PodcastItems.FeedID AND
PodcastItems.ItemID = CoreTracks.ExternalID AND PodcastEnclosures.ItemID = PodcastItems.ItemID AND
CoreCache.ModelID = {1} AND CoreCache.ItemId = {2} {3})
- ORDER BY lower(Title)";
+ ORDER BY HYENA_COLLATION_KEY(Title)";
}
public override string FilterColumn {
diff --git a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs
index b3f029a..367b9b4 100644
--- a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs
+++ b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs
@@ -60,7 +60,6 @@ namespace Banshee.Podcasting.Gui
{
private PodcastFeedModel feed_model;
private PodcastUnheardFilterModel new_filter;
- private DownloadStatusFilterModel downloaded_filter;
public override string DefaultBaseDirectory {
get {
@@ -94,7 +93,6 @@ namespace Banshee.Podcasting.Gui
}
public PodcastUnheardFilterModel NewFilter { get { return new_filter; } }
- public DownloadStatusFilterModel DownloadedFilter { get { return downloaded_filter; } }
public override string PreferencesPageId {
get { return UniqueId; }
@@ -221,21 +219,18 @@ namespace Banshee.Podcasting.Gui
Properties.SetString ("Icon.Name", "podcast");
Properties.Set<string> ("SearchEntryDescription", Catalog.GetString ("Search your podcasts"));
+ Properties.Set<string> ("TrackPropertiesActionLabel", Catalog.GetString ("Episode Properties"));
+
Properties.SetString ("ActiveSourceUIResource", "ActiveSourceUI.xml");
Properties.Set<bool> ("ActiveSourceUIResourcePropagate", true);
Properties.Set<System.Reflection.Assembly> ("ActiveSourceUIResource.Assembly", typeof(PodcastSource).Assembly);
Properties.SetString ("GtkActionPath", "/PodcastSourcePopup");
- //Properties.Set<ISourceContents> ("Nereid.SourceContents", new LazyLoadSourceContents<PodcastSourceContents> ());
- Properties.Set<ISourceContents> ("Nereid.SourceContents", new LazyLoadSourceContents<GridContent> ());
+ Properties.Set<ISourceContents> ("Nereid.SourceContents", new LazyLoadSourceContents<PodcastSourceContents> ());
Properties.Set<bool> ("Nereid.SourceContentsPropagate", true);
Properties.Set<bool> ("SourceView.HideCount", false);
- var header_widget = new HeaderWidget (this);
- header_widget.ShowAll ();
- Properties.Set<Gtk.Widget> ("Nereid.SourceContents.HeaderWidget", header_widget);
-
Properties.SetString ("TrackView.ColumnControllerXml", String.Format (@"
<column-controller>
<add-all-defaults />
@@ -328,7 +323,6 @@ namespace Banshee.Podcasting.Gui
{
PodcastFeedModel feed_model;
yield return new_filter = new PodcastUnheardFilterModel (src.DatabaseTrackModel);
- yield return downloaded_filter = new DownloadStatusFilterModel (src.DatabaseTrackModel);
yield return feed_model = new PodcastFeedModel (src, src.DatabaseTrackModel, ServiceManager.DbConnection, String.Format ("PodcastFeeds-{0}", src.UniqueId));
if (src == this) {
diff --git a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastUnheardFilterModel.cs b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastUnheardFilterModel.cs
index 895c9c2..15cf6dd 100644
--- a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastUnheardFilterModel.cs
+++ b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastUnheardFilterModel.cs
@@ -44,8 +44,7 @@ namespace Banshee.Podcasting.Gui
public enum OldNewFilter
{
Both,
- New,
- Old
+ New
}
public class PodcastUnheardFilterModel : FilterListModel<OldNewFilter>
@@ -71,7 +70,6 @@ namespace Banshee.Podcasting.Gui
get {
switch (index) {
case 1: return OldNewFilter.New;
- case 2: return OldNewFilter.Old;
case 0:
default: return OldNewFilter.Both;
}
@@ -79,7 +77,7 @@ namespace Banshee.Podcasting.Gui
}
public override int Count {
- get { return 3; }
+ get { return 2; }
}
public override string GetSqlFilter ()
diff --git a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellDownloadStatus.cs b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellDownloadStatus.cs
deleted file mode 100644
index 562e7ba..0000000
--- a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellDownloadStatus.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-//
-// ColumnCellDownloadStatus.cs
-//
-// Authors:
-// Gabriel Burt <gburt at novell.com>
-//
-// Copyright (C) 2008 Novell, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using Gtk;
-using Cairo;
-
-using Mono.Unix;
-
-using Hyena.Gui;
-using Hyena.Gui.Theming;
-using Hyena.Data.Gui;
-
-using Migo.Syndication;
-
-using Banshee.Gui;
-using Banshee.ServiceStack;
-using Banshee.Collection.Gui;
-
-namespace Banshee.Podcasting.Gui
-{
- public class ColumnCellDownloadStatus : ColumnCellText
- {
- public ColumnCellDownloadStatus () : base (null, true)
- {
- }
-
- protected override string GetText (object obj)
- {
- DownloadedStatusFilter val = (DownloadedStatusFilter) obj;
- switch (val) {
- case DownloadedStatusFilter.Downloaded: return Catalog.GetString ("Downloaded");
- case DownloadedStatusFilter.Both: return Catalog.GetString ("All Items");
- case DownloadedStatusFilter.NotDownloaded: return Catalog.GetString ("Not Downloaded");
- }
- return String.Empty;
- }
- }
-}
diff --git a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellUnheard.cs b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellUnheard.cs
index 2c41d64..5e0055c 100644
--- a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellUnheard.cs
+++ b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellUnheard.cs
@@ -56,7 +56,6 @@ namespace Banshee.Podcasting.Gui
switch (val) {
case OldNewFilter.New: return Catalog.GetString ("New Items");
case OldNewFilter.Both: return Catalog.GetString ("All Items");
- case OldNewFilter.Old: return Catalog.GetString ("Old Items");
}
return String.Empty;
}
diff --git a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadStatusFilterView.cs b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadStatusFilterView.cs
deleted file mode 100644
index f55dbad..0000000
--- a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadStatusFilterView.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-//
-// DownloadStatusFilterView.cs
-//
-// Authors:
-// Gabriel Burt <gburt at novell.com>
-//
-// Copyright (C) 2008 Novell, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections.ObjectModel;
-
-using Mono.Unix;
-
-using Gtk;
-
-using Hyena.Data;
-using Hyena.Data.Gui;
-using Hyena.Collections;
-
-using Banshee.Gui;
-using Banshee.ServiceStack;
-using Banshee.Collection.Gui;
-
-using Banshee.Podcasting.Data;
-
-using Migo.Syndication;
-
-namespace Banshee.Podcasting.Gui
-{
- public class DownloadStatusFilterView : TrackFilterListView<DownloadedStatusFilter>
- {
- public DownloadStatusFilterView () : base ()
- {
- ColumnCellDownloadStatus renderer = new ColumnCellDownloadStatus ();
- column_controller.Add (new Column ("Download Status Filter", renderer, 1.0));
- ColumnController = column_controller;
- }
- }
-}
\ No newline at end of file
diff --git a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/Grid.cs b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/Grid.cs
index a5aac1d..3cd2fd9 100644
--- a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/Grid.cs
+++ b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/Grid.cs
@@ -50,12 +50,13 @@ namespace Banshee.Podcasting.Gui
public Grid ()
{
var layout = new DataViewLayoutGrid () {
+ Fill = true,
ChildAllocator = () => {
DataViewChildImage img = new DataViewChildImage ();
return new StackPanel () {
Margin = new Thickness (5),
- Width = 350,
- Height = 150,
+ Width = 300,
+ Height = 125,
Spacing = 5,
Children = {
new StackPanel () {
diff --git a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/GridContent.cs b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/GridContent.cs
deleted file mode 100644
index 1159bea..0000000
--- a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/GridContent.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-//
-// AudiobookContent.cs
-//
-// Author:
-// Gabriel Burt <gburt at novell.com>
-//
-// Copyright (C) 2009 Novell, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections.Generic;
-
-using Mono.Unix;
-using Gtk;
-
-using Hyena;
-using Hyena.Data;
-using Hyena.Data.Gui;
-
-using Banshee.Widgets;
-using Banshee.Sources;
-using Banshee.ServiceStack;
-using Banshee.Collection;
-using Banshee.Collection.Database;
-using Banshee.Collection.Gui;
-using Banshee.Gui;
-using Banshee.Gui.Widgets;
-using Banshee.Sources.Gui;
-using Banshee.Web;
-
-using Banshee.Podcasting;
-using Banshee.Podcasting.Data;
-
-namespace Banshee.Podcasting.Gui
-{
- public class GridContent : ISourceContents
- {
- private PodcastSource library;
- private Grid grid;
- private ScrolledWindow sw;
-
- public GridContent ()
- {
- sw = new ScrolledWindow ();
- grid = new Grid ();
- sw.Child = grid;
- sw.ShowAll ();
- }
-
- public bool SetSource (ISource src)
- {
- if (src != null && src == library)
- return true;
-
- library = src as PodcastSource;
- if (library == null) {
- return false;
- }
-
- grid.SetLibrary (library);
-
- // Not sure why this is needed
- /*library.BooksModel.Reloaded += delegate {
- grid.QueueDraw ();
- };*/
- return true;
- }
-
- public ISource Source {
- get { return library; }
- }
-
- public void ResetSource ()
- {
- library = null;
- }
-
- public Widget Widget {
- get { return sw; }
- }
- }
-}
diff --git a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/HeaderWidget.cs b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/HeaderWidget.cs
deleted file mode 100644
index 56cfa81..0000000
--- a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/HeaderWidget.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-//
-// HeaderWidget.cs
-//
-// Author:
-// Gabriel Burt <gburt at novell.com>
-//
-// Copyright (C) 2010 Novell, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using Gtk;
-using Mono.Unix;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-using Hyena;
-using Hyena.Data;
-using Migo.Syndication;
-
-using Banshee.PlaybackController;
-using Banshee.Sources;
-using Banshee.Collection.Database;
-using Banshee.Widgets;
-
-namespace Banshee.Podcasting.Gui
-{
- public class ModelComboBox<T> : DictionaryComboBox<T> where T : class
- {
- private IListModel<T> model;
- private Func<T, string> text_func;
-
- public ModelComboBox (IListModel<T> model, Func<T, string> text_func)
- {
- this.model = model;
- this.text_func = text_func;
-
- model.Reloaded += delegate { ThreadAssist.ProxyToMain (Reload); };
- Reload ();
-
- var last_active = ActiveValue;
-
- Changed += delegate {
- if (last_active != ActiveValue) {
- model.Selection.Clear (false);
- model.Selection.Select (Active);
- last_active = ActiveValue;
- }
- };
- }
-
- private void Reload ()
- {
- var active = ActiveValue;
- Clear ();
-
- bool set_active = false;
- for (int i = 0; i < model.Count; i++) {
- var item = model[i];
- Add (text_func (item), item);
-
- if (item.Equals (active)) {
- ActiveValue = item;
- set_active = true;
- }
- }
-
- if (!set_active) {
- Active = 0;
- }
- }
- }
-
- public class HeaderWidget : HBox
- {
- public HeaderWidget (PodcastSource source)
- {
- ThreadAssist.AssertInMainThread ();
- Spacing = 6;
-
- var podcast_label = new Label (Catalog.GetString ("_Limit to episodes from"));
- var podcast_combo = new ModelComboBox<Feed> (source.FeedModel, feed => feed.Title);
- podcast_label.MnemonicWidget = podcast_combo;
-
- var new_check = new CheckButton ("new") { Active = true };
- new_check.Toggled += (o, a) => {
- source.NewFilter.Selection.Clear (false);
- // HACK; 1 == new, 0 == both
- source.NewFilter.Selection.Select (new_check.Active ? 1 : 0);
- };
-
- var downloaded_check = new CheckButton ("downloaded");
- downloaded_check.Toggled += (o, a) => {
- source.DownloadedFilter.Selection.Clear (false);
- // HACK; 1 == downloaded, 0 == both
- source.DownloadedFilter.Selection.Select (downloaded_check.Active ? 1 : 0);
- };
-
- PackStart (podcast_label, false, false, 0);
- PackStart (podcast_combo, false, false, 0);
- PackStart (new Label ("that are"), false, false, 0);
- PackStart (new_check, false, false, 0);
- PackStart (downloaded_check, false, false, 0);
- }
-
-
- /*private void OnModeComboChanged (object o, EventArgs args)
- {
- var random_by = mode_combo.ActiveValue;
- foreach (var widget in sensitive_widgets) {
- widget.Sensitive = random_by.Id != "off";
- }
-
- var handler = ModeChanged;
- if (handler != null) {
- handler (this, new EventArgs<RandomBy> (random_by));
- }
- }*/
- }
-}
diff --git a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs
index 1b24771..619a4a0 100644
--- a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs
+++ b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs
@@ -119,6 +119,11 @@ namespace Banshee.Podcasting.Gui
OnPodcastProperties
),
new ActionEntry (
+ "EpisodePodcastProperties", null,
+ Catalog.GetString ("Podcast Properties"), null, String.Empty,
+ OnEpisodePodcastProperties
+ ),
+ new ActionEntry (
"PodcastItemMarkNewAction", null,
Catalog.GetString ("Mark as New"),
null, String.Empty,
@@ -250,7 +255,8 @@ namespace Banshee.Podcasting.Gui
if (IsPodcastSource) {
int count = ActiveDbSource.TrackModel.Selection.Count;
- //bool has_single_podcast = podcast_source.PodcastTrackModel.SelectionPodcastCount == 1;
+ bool has_single_podcast = podcast_source.PodcastTrackModel.SelectionPodcastCount == 1;
+ UpdateAction ("EpisodePodcastProperties", true, has_single_podcast);
UpdateAction ("PodcastItemLinkAction", true, count == 1);
@@ -288,9 +294,9 @@ namespace Banshee.Podcasting.Gui
}
}
- private void SubscribeToPodcast (Uri uri, FeedAutoDownload syncPreference)
+ private void SubscribeToPodcast (Uri uri, FeedAutoDownload syncPreference, int max_items)
{
- FeedsManager.Instance.FeedManager.CreateFeed (uri.ToString (), syncPreference);
+ FeedsManager.Instance.FeedManager.CreateFeed (uri.ToString (), syncPreference, max_items);
}
private IEnumerable<TrackInfo> GetSelectedItems ()
@@ -323,6 +329,7 @@ namespace Banshee.Podcasting.Gui
ResponseType response = (ResponseType) subscribeDialog.Run ();
syncPreference = subscribeDialog.SyncPreference;
+ int max_items = subscribeDialog.MaxItemCount;
if (response == ResponseType.Ok) {
url = subscribeDialog.Url.Trim ().Trim ('/');
@@ -344,7 +351,7 @@ namespace Banshee.Podcasting.Gui
Catalog.GetString ("Podcast URL is invalid.")
);
} else {
- SubscribeToPodcast (feedUri, syncPreference);
+ SubscribeToPodcast (feedUri, syncPreference, max_items);
}
}
@@ -513,6 +520,17 @@ namespace Banshee.Podcasting.Gui
}
}
+ private void OnEpisodePodcastProperties (object sender, EventArgs e)
+ {
+ foreach (PodcastTrackInfo pi in PodcastTrackInfo.From (GetSelectedItems ())) {
+ var feed = pi.Feed;
+ if (feed != null) {
+ new PodcastFeedPropertiesDialog (podcast_source, feed).Run ();
+ }
+ break;
+ }
+ }
+
private void OnPodcastItemProperties (object sender, EventArgs e)
{
/*ReadOnlyCollection<PodcastItem> items = itemModel.CopySelectedItems ();
diff --git a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastFeedView.cs b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastFeedView.cs
index d9414a0..f98ee22 100644
--- a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastFeedView.cs
+++ b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastFeedView.cs
@@ -49,14 +49,12 @@ namespace Banshee.Podcasting.Gui
{
public class PodcastFeedView : TrackFilterListView<Feed>
{
- private ColumnCellPodcast renderer;
+ private ColumnCellText renderer;
public PodcastFeedView () : base ()
{
- renderer = new ColumnCellPodcast ();
- column_controller.Add (new Column ("Podcast", renderer, 1.0));
- //column_controller.Add (new Column (null, "Activity", new FeedActivityColumnCell ("Activity"), 0.00, true, 26, 26));
-
+ renderer = new ColumnCellText ("Title", true);
+ column_controller.Add (new Column ("Title", renderer, 1.0));
ColumnController = column_controller;
}
@@ -65,82 +63,5 @@ namespace Banshee.Podcasting.Gui
ServiceManager.Get<InterfaceActionService> ().FindAction ("Podcast.PodcastFeedPopupAction").Activate ();
return true;
}
-
- protected override Gdk.Size OnMeasureChild ()
- {
- return ViewLayout != null
- ? base.OnMeasureChild ()
- : new Gdk.Size (0, renderer.ComputeRowHeight (this));
- }
}
-
- /*public class PodcastFeedView : ListView<Feed>
- {
- private ColumnController columnController;
-
- public PodcastFeedView () : base ()
- {
- columnController = new ColumnController ();
-
- SortableColumn podcastFeedTitleColumn = new SortableColumn (
- Catalog.GetString ("Podcasts"),
- new ColumnCellText ("Title", true), 0.97,
- PodcastSortKeys.Title, true
- );
-
- columnController.AddRange (
- new Column (null, "Activity", new FeedActivityColumnCell ("Activity"), 0.00, true, 26, 26),
- podcastFeedTitleColumn
- );
-
- RulesHint = true;
- podcastFeedTitleColumn.SortType = Hyena.Data.SortType.Descending;
- columnController.DefaultSortColumn = podcastFeedTitleColumn;
- ColumnController = columnController;
- }
-
- private Menu allPopup;
- private Menu popupMenu;
- private MenuItem homepageItem;
- private MenuItem propertiesItem;
- private MenuItem updateAllItem;
-
- protected override bool OnPopupMenu ()
- {
- if (popupMenu == null) {
- UIManager uiManager = ServiceManager.Get<InterfaceActionService> ().UIManager;
-
- allPopup = uiManager.GetWidget ("/PodcastSourcePopup") as Menu;
- popupMenu = uiManager.GetWidget ("/PodcastFeedViewPopup") as Menu;
-
- updateAllItem = uiManager.GetWidget ("/PodcastFeedViewPopup/PodcastUpdateAll") as MenuItem;
- propertiesItem = uiManager.GetWidget ("/PodcastFeedViewPopup/PodcastProperties") as MenuItem;
- homepageItem = uiManager.GetWidget ("/PodcastFeedViewPopup/PodcastHomepage") as MenuItem;
- }
-
- Menu popup;
- PodcastFeedModel model = Model as PodcastFeedModel;
-
- ReadOnlyCollection<Feed> feeds = model.CopySelectedItems ();
-
- if (feeds.Count == 0) {
- popup = allPopup;
- } else {
- if (feeds.Count > 1) {
- homepageItem.Hide ();
- propertiesItem.Hide ();
- } else {
- homepageItem.Show ();
- propertiesItem.Show ();
- }
-
- popup = popupMenu;
- }
-
- updateAllItem.Hide ();
-
- popup.Popup (null, null, null, 0, Gtk.Global.CurrentEventTime);
- return true;
- }
- }*/
}
diff --git a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs
index f0cc048..a1e4618 100644
--- a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs
+++ b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs
@@ -34,61 +34,67 @@ using Pango;
using Migo.Syndication;
using Banshee.Base;
+using Banshee.Collection;
using Banshee.Podcasting.Data;
+using Banshee.Gui.TrackEditor;
+using Banshee.Collection.Gui;
+using Banshee.ServiceStack;
namespace Banshee.Podcasting.Gui
{
internal class PodcastFeedPropertiesDialog : Dialog
{
- private PodcastSource source;
- private Feed feed;
- private SyncPreferenceComboBox new_episode_option_combo;
- private Entry name_entry;
+ PodcastSource source;
+ Feed feed;
+ Entry name_entry;
+
+ Frame header_image_frame;
+ Image header_image;
+ FakeTrackInfo fake_track = new FakeTrackInfo ();
+
+ CheckButton subscribed_check, download_check, archive_check;
+
+ private VBox main_box;
public PodcastFeedPropertiesDialog (PodcastSource source, Feed feed)
{
this.source = source;
this.feed = feed;
+ fake_track.Feed = feed;
Title = feed.Title;
+ HasSeparator = false;
+ BorderWidth = 12;
+ WidthRequest = 525;
//IconThemeUtils.SetWindowIcon (this);
BuildWindow ();
- }
- private void BuildWindow()
- {
- BorderWidth = 6;
- VBox.Spacing = 12;
- HasSeparator = false;
+ DefaultResponse = Gtk.ResponseType.Cancel;
+ ActionArea.Layout = Gtk.ButtonBoxStyle.End;
- HBox box = new HBox();
- box.BorderWidth = 6;
- box.Spacing = 12;
+ Response += OnResponse;
- Button save_button = new Button("gtk-save");
- save_button.CanDefault = true;
- save_button.Show();
+ ShowAll ();
+ }
- // For later additions to the dialog. (I.E. Feed art)
- HBox content_box = new HBox();
- content_box.Spacing = 12;
- Table table = new Table (2, 4, false);
- table.RowSpacing = 6;
- table.ColumnSpacing = 12;
+ private FeedAutoDownload DownloadPref {
+ get { return download_check.Active ? FeedAutoDownload.All : FeedAutoDownload.None; }
+ set { download_check.Active = value != FeedAutoDownload.None; }
+ }
- Label description_label = new Label (Catalog.GetString ("Description:"));
- description_label.SetAlignment (0f, 0f);
- description_label.Justify = Justification.Left;
+ private int MaxItemCount {
+ get { return archive_check.Active ? 1 : 0; }
+ set { archive_check.Active = value > 0; }
+ }
- Label last_updated_label = new Label (Catalog.GetString ("Last updated:"));
- last_updated_label.SetAlignment (0f, 0f);
- last_updated_label.Justify = Justification.Left;
+ private void BuildWindow()
+ {
+ VBox.Spacing = 12;
+ main_box = VBox;
- Label name_label = new Label (Catalog.GetString ("Podcast Name:"));
- name_label.SetAlignment (0f, 0f);
- name_label.Justify = Justification.Left;
+ var save_button = new Button ("gtk-save") { CanDefault = true };
name_entry = new Entry ();
name_entry.Text = feed.Title;
@@ -96,132 +102,132 @@ namespace Banshee.Podcasting.Gui
save_button.Sensitive = !String.IsNullOrEmpty (name_entry.Text);
};
- Label feed_url_label = new Label (Catalog.GetString ("URL:"));
- feed_url_label.SetAlignment (0f, 0f);
- feed_url_label.Justify = Justification.Left;
+ subscribed_check = new CheckButton (Catalog.GetString ("Check periodically for new episodes")) {
+ TooltipText = Catalog.GetString ("If checked, Banshee will check every hour to see if this podcast has new episodes")
+ };
+
+ download_check = new CheckButton (Catalog.GetString ("Download new episodes"));
+ DownloadPref = feed.AutoDownload;
- Label new_episode_option_label = new Label (Catalog.GetString ("When feed is updated:"));
- new_episode_option_label.SetAlignment (0f, 0.5f);
- new_episode_option_label.Justify = Justification.Left;
+ archive_check = new CheckButton (Catalog.GetString ("Archive all episodes except the newest one"));
+ MaxItemCount = (int)feed.MaxItemCount;
- Label last_updated_text = new Label (feed.LastDownloadTime.ToString ("f"));
- last_updated_text.Justify = Justification.Left;
- last_updated_text.SetAlignment (0f, 0f);
+ subscribed_check.Toggled += delegate {
+ download_check.Sensitive = archive_check.Sensitive = subscribed_check.Active;
+ };
+ subscribed_check.Active = feed.IsSubscribed;
+ download_check.Sensitive = archive_check.Sensitive = subscribed_check.Active;
- Label feed_url_text = new Label (feed.Url.ToString ());
- feed_url_text.Wrap = false;
- feed_url_text.Selectable = true;
- feed_url_text.SetAlignment (0f, 0f);
- feed_url_text.Justify = Justification.Left;
- feed_url_text.Ellipsize = Pango.EllipsizeMode.End;
+ var last_updated_text = new Label (feed.LastDownloadTime.ToString ("f")) {
+ Justify = Justification.Left,
+ Xalign = 0f
+ };
+
+ var feed_url_text = new Label (feed.Url.ToString ()) {
+ Wrap = false,
+ Selectable = true,
+ Xalign = 0f,
+ Justify = Justification.Left,
+ Ellipsize = Pango.EllipsizeMode.End
+ };
string description_string = String.IsNullOrEmpty (feed.Description) ?
Catalog.GetString ("No description available") :
feed.Description;
- Label descrition_text = new Label (description_string);
- descrition_text.Justify = Justification.Left;
- descrition_text.SetAlignment (0f, 0f);
- descrition_text.Wrap = true;
- descrition_text.Selectable = true;
-
- Viewport description_viewport = new Viewport();
- description_viewport.SetSizeRequest(-1, 150);
- description_viewport.ShadowType = ShadowType.None;
-
- ScrolledWindow description_scroller = new ScrolledWindow ();
- description_scroller.HscrollbarPolicy = PolicyType.Never;
- description_scroller.VscrollbarPolicy = PolicyType.Automatic;
-
- description_viewport.Add (descrition_text);
- description_scroller.Add (description_viewport);
-
- new_episode_option_combo = new SyncPreferenceComboBox (feed.AutoDownload);
-
- // First column
- uint i = 0;
- table.Attach (
- name_label, 0, 1, i, ++i,
- AttachOptions.Fill, AttachOptions.Fill, 0, 0
- );
-
- table.Attach (
- feed_url_label, 0, 1, i, ++i,
- AttachOptions.Fill, AttachOptions.Fill, 0, 0
- );
-
- table.Attach (
- last_updated_label, 0, 1, i, ++i,
- AttachOptions.Fill, AttachOptions.Fill, 0, 0
- );
-
- table.Attach (
- new_episode_option_label, 0, 1, i, ++i,
- AttachOptions.Fill, AttachOptions.Fill, 0, 0
+ var header_box = new HBox () { Spacing = 6 };
+
+ header_image_frame = new Frame ();
+ header_image = new Image ();
+ LoadCoverArt (fake_track);
+ header_image_frame.Add (
+ CoverArtEditor.For (header_image,
+ (x, y) => true,
+ () => fake_track,
+ () => LoadCoverArt (fake_track)
+ )
);
+ header_box.PackStart (header_image_frame, false, false, 0);
+
+ var table = new Hyena.Widgets.SimpleTable<int> ();
+ table.XOptions[0] = AttachOptions.Fill;
+ table.XOptions[1] = AttachOptions.Expand | AttachOptions.Fill;
+ table.AddRow (0, HeaderLabel (Catalog.GetString ("Name:")), name_entry);
+ table.AddRow (1, HeaderLabel (Catalog.GetString ("Website:")),
+ new Gtk.Alignment (0f, 0f, 0f, 0f) {
+ Child = new LinkButton (feed.Link, Catalog.GetString ("Visit")) {
+ Image = new Gtk.Image (Gtk.Stock.JumpTo, Gtk.IconSize.Button)
+ }
+ });
+ header_box.PackStart (table, true, true, 0);
+
+ main_box.PackStart (header_box, false, false, 0);
+
+ Add (Catalog.GetString ("Subscription Options"), subscribed_check, download_check, archive_check);
+
+ var details = new Banshee.Gui.TrackEditor.StatisticsPage ();
+ details.AddItem (Catalog.GetString ("Feed URL:"), feed_url_text.Text);
+ details.AddItem (Catalog.GetString ("Last Refreshed:"), last_updated_text.Text);
+ details.AddItem (Catalog.GetString ("Description:"), description_string, true);
+ details.AddItem (Catalog.GetString ("Category:"), feed.Category);
+ details.AddItem (Catalog.GetString ("Keywords:"), feed.Keywords);
+ details.AddItem (Catalog.GetString ("Copyright:"), feed.Copyright);
+ details.HeightRequest = 120;
+ Add (true, Catalog.GetString ("Details"), details);
+
+ AddActionWidget (new Button ("gtk-cancel") { CanDefault = true }, ResponseType.Cancel);
+ AddActionWidget (save_button, ResponseType.Ok);
+ }
- table.Attach (
- description_label, 0, 1, i, ++i,
- AttachOptions.Fill, AttachOptions.Fill, 0, 0
- );
-
- // Second column
- i = 0;
- table.Attach (
- name_entry, 1, 2, i, ++i,
- AttachOptions.Fill, AttachOptions.Fill, 0, 0
- );
-
- table.Attach (
- feed_url_text, 1, 2, i, ++i,
- AttachOptions.Fill, AttachOptions.Fill, 0, 0
- );
-
- table.Attach (
- last_updated_text, 1, 2, i, ++i,
- AttachOptions.Fill, AttachOptions.Fill, 0, 0
- );
-
- table.Attach (
- new_episode_option_combo, 1, 2, i, ++i,
- AttachOptions.Fill, AttachOptions.Fill, 0, 0
- );
-
- table.Attach (description_scroller, 1, 2, i, ++i,
- AttachOptions.Expand | AttachOptions.Fill,
- AttachOptions.Expand | AttachOptions.Fill, 0, 0
- );
-
- content_box.PackStart (table, true, true, 0);
- box.PackStart (content_box, true, true, 0);
+ private void Add (string header_txt, params Widget [] widgets)
+ {
+ Add (false, header_txt, widgets);
+ }
- Button cancel_button = new Button("gtk-cancel");
- cancel_button.CanDefault = true;
- cancel_button.Show();
+ private Label HeaderLabel (string str)
+ {
+ return new Label () {
+ Markup = String.Format ("<b>{0}</b>", GLib.Markup.EscapeText (str)),
+ Xalign = 0f
+ };
+ }
- AddActionWidget (cancel_button, ResponseType.Cancel);
- AddActionWidget (save_button, ResponseType.Ok);
+ private void Add (bool filled, string header_txt, params Widget [] widgets)
+ {
+ var vbox = new VBox () { Spacing = 3 };
- DefaultResponse = Gtk.ResponseType.Cancel;
- ActionArea.Layout = Gtk.ButtonBoxStyle.End;
+ vbox.PackStart (HeaderLabel (header_txt), false, false, 0);
- box.ShowAll ();
- VBox.Add (box);
+ foreach (var child in widgets) {
+ var align = new Gtk.Alignment (0, 0, 1, 1) { LeftPadding = 12, Child = child };
+ vbox.PackStart (align, filled, filled, 0);
+ }
- Response += OnResponse;
+ main_box.PackStart (vbox, filled, filled, 0);
}
private void OnResponse (object sender, ResponseArgs args)
{
if (args.ResponseId == Gtk.ResponseType.Ok) {
- FeedAutoDownload new_sync_pref = new_episode_option_combo.ActiveSyncPreference;
-
bool changed = false;
- if (feed.AutoDownload != new_sync_pref) {
- feed.AutoDownload = new_sync_pref;
+
+ if (feed.IsSubscribed != subscribed_check.Active) {
+ feed.IsSubscribed = subscribed_check.Active;
changed = true;
}
+ if (feed.IsSubscribed) {
+ if (feed.AutoDownload != DownloadPref) {
+ feed.AutoDownload = DownloadPref;
+ changed = true;
+ }
+
+ if (feed.MaxItemCount != MaxItemCount) {
+ feed.MaxItemCount = MaxItemCount;
+ changed = true;
+ }
+ }
+
if (feed.Title != name_entry.Text) {
feed.Title = name_entry.Text;
source.Reload ();
@@ -236,5 +242,42 @@ namespace Banshee.Podcasting.Gui
(sender as Dialog).Response -= OnResponse;
(sender as Dialog).Destroy();
}
+
+ void LoadCoverArt (TrackInfo current_track)
+ {
+ if (current_track == null || current_track.ArtworkId == null) {
+ SetDefaultCoverArt ();
+ return;
+ }
+
+ var artwork = ServiceManager.Get<ArtworkManager> ();
+ var cover_art = artwork.LookupScalePixbuf (current_track.ArtworkId, 64);
+
+ header_image.Clear ();
+ header_image.Pixbuf = cover_art;
+
+ if (cover_art == null) {
+ SetDefaultCoverArt ();
+ } else {
+ header_image_frame.ShadowType = ShadowType.In;
+ header_image.QueueDraw ();
+ }
+ }
+
+ void SetDefaultCoverArt ()
+ {
+ header_image.IconName = "podcast";
+ header_image.PixelSize = 64;
+ header_image_frame.ShadowType = ShadowType.In;
+ header_image.QueueDraw ();
+ }
+
+ class FakeTrackInfo : TrackInfo
+ {
+ public Feed Feed { get; set; }
+ public override string ArtworkId {
+ get { return Feed == null ? null : PodcastService.ArtworkIdFor (Feed); }
+ }
+ }
}
}
diff --git a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs
index 02ef1e6..fe50871 100644
--- a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs
+++ b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs
@@ -46,16 +46,19 @@ namespace Banshee.Podcasting.Gui
{
private Entry url_entry;
private Gtk.AccelGroup accelGroup;
- private SyncPreferenceComboBox syncCombo;
+ CheckButton download_check, archive_check;
public string Url {
get { return url_entry.Text; }
set { url_entry.Text = value; }
}
- public FeedAutoDownload SyncPreference
- {
- get { return syncCombo.ActiveSyncPreference; }
+ public FeedAutoDownload SyncPreference {
+ get { return download_check.Active ? FeedAutoDownload.All : FeedAutoDownload.None; }
+ }
+
+ public int MaxItemCount {
+ get { return archive_check.Active ? 1 : 0; }
}
public PodcastSubscribeDialog () : base (Catalog.GetString("Subscribe"), null, DialogFlags.Modal | DialogFlags.NoSeparator)
@@ -95,32 +98,12 @@ namespace Banshee.Podcasting.Gui
header.Justify = Justification.Left;
header.SetAlignment (0.0f, 0.0f);
- WrapLabel message = new WrapLabel ();
- message.Markup = Catalog.GetString (
- "Please enter the URL of the podcast to which you would like to subscribe."
- );
-
- message.Wrap = true;
-
- VBox sync_vbox = new VBox ();
-
- VBox expander_children = new VBox();
- //expander_children.BorderWidth = 6;
- expander_children.Spacing = 6;
-
- Label sync_text = new Label (
- Catalog.GetString ("When new episodes are available: ")
- );
-
- sync_text.SetAlignment (0.0f, 0.0f);
- sync_text.Justify = Justification.Left;
-
- syncCombo = new SyncPreferenceComboBox ();
-
- expander_children.PackStart (sync_text, true, true, 0);
- expander_children.PackStart (syncCombo, true, true, 0);
-
- sync_vbox.Add (expander_children);
+ var message = new WrapLabel () {
+ Markup = Catalog.GetString (
+ "Please enter the URL of the podcast to which you would like to subscribe."
+ ),
+ Wrap = true
+ };
url_entry = new Entry ();
url_entry.ActivatesDefault = true;
@@ -138,31 +121,25 @@ namespace Banshee.Podcasting.Gui
}
}
- Table table = new Table (1, 2, false);
- table.RowSpacing = 6;
- table.ColumnSpacing = 12;
-
- table.Attach (
- new Label (Catalog.GetString ("URL:")), 0, 1, 0, 1,
- AttachOptions.Shrink, AttachOptions.Shrink, 0, 0
- );
-
- table.Attach (
- url_entry, 1, 2, 0, 1,
- AttachOptions.Expand | AttachOptions.Fill,
- AttachOptions.Shrink, 0, 0
- );
-
- table.Attach (
- sync_vbox, 0, 2, 1, 2,
- AttachOptions.Expand | AttachOptions.Fill,
- AttachOptions.Shrink, 0, 0
- );
-
contentBox.PackStart (header, true, true, 0);
contentBox.PackStart (message, true, true, 0);
- contentBox.PackStart (table, true, true, 0);
+ var url_box = new HBox () { Spacing = 12 };
+ url_box.PackStart (new Label (Catalog.GetString ("URL:")), false, false, 0);
+ url_box.PackStart (url_entry, true, true, 0);
+ contentBox.PackStart (url_box, false, false, 0);
+
+ var options_label = new Label () {
+ Markup = String.Format ("<b>{0}</b>", GLib.Markup.EscapeText (Catalog.GetString ("Subscription Options"))),
+ Xalign = 0f
+ };
+ download_check = new CheckButton (Catalog.GetString ("Download new episodes"));
+ archive_check = new CheckButton (Catalog.GetString ("Archive all episodes except the newest one"));
+ var options_box = new VBox () { Spacing = 3 };
+ options_box.PackStart (options_label, false, false, 0);
+ options_box.PackStart (new Gtk.Alignment (0f, 0f, 0f, 0f) { LeftPadding = 12, Child = download_check }, false, false, 0);
+ options_box.PackStart (new Gtk.Alignment (0f, 0f, 0f, 0f) { LeftPadding = 12, Child = archive_check }, false, false, 0);
+ contentBox.PackStart (options_box, false, false, 0);
box.PackStart (contentBox, true, true, 0);
diff --git a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastSourceContents.cs b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastSourceContents.cs
index 813b44d..d0dd457 100644
--- a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastSourceContents.cs
+++ b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastSourceContents.cs
@@ -53,10 +53,9 @@ namespace Banshee.Podcasting.Gui
{
public class PodcastSourceContents : FilteredListSourceContents, ITrackModelSourceContents
{
- private TrackListView track_view;
+ private Grid track_view;
private PodcastFeedView feed_view;
private PodcastUnheardFilterView unheard_view;
- private DownloadStatusFilterView download_view;
public PodcastSourceContents () : base ("podcast")
{
@@ -64,9 +63,8 @@ namespace Banshee.Podcasting.Gui
protected override void InitializeViews ()
{
- SetupMainView (track_view = new TrackListView ());
+ SetupMainView (track_view = new Grid ());
SetupFilterView (unheard_view = new PodcastUnheardFilterView ());
- SetupFilterView (download_view = new DownloadStatusFilterView ());
SetupFilterView (feed_view = new PodcastFeedView ());
}
@@ -75,7 +73,6 @@ namespace Banshee.Podcasting.Gui
if (feed_view.Model != null) {
feed_view.Selection.Clear ();
unheard_view.Selection.Clear ();
- download_view.Selection.Clear ();
}
}
@@ -86,6 +83,10 @@ namespace Banshee.Podcasting.Gui
}
}
+ protected override string ForcePosition {
+ get { return "Left"; }
+ }
+
#region Implement ISourceContents
public override bool SetSource (ISource source)
@@ -105,8 +106,6 @@ namespace Banshee.Podcasting.Gui
SetModel (feed_view, (model as IListModel<Feed>));
else if (model is PodcastUnheardFilterModel)
SetModel (unheard_view, (model as IListModel<OldNewFilter>));
- else if (model is DownloadStatusFilterModel)
- SetModel (download_view, (model as IListModel<DownloadedStatusFilter>));
else
Hyena.Log.DebugFormat ("PodcastContents got non-feed filter model: {0}", model);
}
@@ -122,7 +121,6 @@ namespace Banshee.Podcasting.Gui
source = null;
SetModel (track_view, null);
SetModel (unheard_view, null);
- SetModel (download_view, null);
SetModel (feed_view, null);
track_view.HeaderVisible = false;
//Console.WriteLine ("PSC.reset_source 2");
@@ -142,4 +140,4 @@ namespace Banshee.Podcasting.Gui
"plugins.podcasting", "vpaned_position", 120, "VPaned Position", ""
);
}
-}
\ No newline at end of file
+}
diff --git a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting/PodcastService.cs b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting/PodcastService.cs
index 8710ddc..044dfae 100644
--- a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting/PodcastService.cs
+++ b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting/PodcastService.cs
@@ -402,7 +402,7 @@ namespace Banshee.Podcasting
private void AddFeed (string uri, string title)
{
// TODO replace autodownload w/ actual default preference
- FeedsManager.Instance.FeedManager.CreateFeed (uri, title, FeedAutoDownload.None);
+ FeedsManager.Instance.FeedManager.CreateFeed (uri, title, FeedAutoDownload.None, 0);
source.NotifyUser ();
source.UpdateFeedMessages ();
}
diff --git a/src/Extensions/Banshee.Podcasting/Makefile.am b/src/Extensions/Banshee.Podcasting/Makefile.am
index 3bb4a77..889a01d 100644
--- a/src/Extensions/Banshee.Podcasting/Makefile.am
+++ b/src/Extensions/Banshee.Podcasting/Makefile.am
@@ -4,13 +4,11 @@ LINK = $(REF_EXTENSION_PODCASTING)
INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
SOURCES = \
- Banshee.Podcasting.Data/DownloadStatusFilterModel.cs \
Banshee.Podcasting.Data/PodcastFeedModel.cs \
Banshee.Podcasting.Data/PodcastSource.cs \
Banshee.Podcasting.Data/PodcastTrackInfo.cs \
Banshee.Podcasting.Data/PodcastTrackListModel.cs \
Banshee.Podcasting.Data/PodcastUnheardFilterModel.cs \
- Banshee.Podcasting.Gui/ColumnCellDownloadStatus.cs \
Banshee.Podcasting.Gui/ColumnCellPodcast.cs \
Banshee.Podcasting.Gui/ColumnCellPodcastStatusIndicator.cs \
Banshee.Podcasting.Gui/ColumnCellPublished.cs \
@@ -18,10 +16,7 @@ SOURCES = \
Banshee.Podcasting.Gui/ColumnCellYesNo.cs \
Banshee.Podcasting.Gui/DownloadManager/DownloadManagerInterface.cs \
Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs \
- Banshee.Podcasting.Gui/DownloadStatusFilterView.cs \
Banshee.Podcasting.Gui/Grid.cs \
- Banshee.Podcasting.Gui/GridContent.cs \
- Banshee.Podcasting.Gui/HeaderWidget.cs \
Banshee.Podcasting.Gui/Models/FilterableListModel.cs \
Banshee.Podcasting.Gui/Models/ListModel.cs \
Banshee.Podcasting.Gui/PodcastActions.cs \
diff --git a/src/Extensions/Banshee.Podcasting/Makefile.in b/src/Extensions/Banshee.Podcasting/Makefile.in
index a6994e0..a3e4306 100644
--- a/src/Extensions/Banshee.Podcasting/Makefile.in
+++ b/src/Extensions/Banshee.Podcasting/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Extensions/Banshee.Podcasting
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -393,13 +400,11 @@ TARGET = library
LINK = $(REF_EXTENSION_PODCASTING) $(am__append_1)
INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
SOURCES = \
- Banshee.Podcasting.Data/DownloadStatusFilterModel.cs \
Banshee.Podcasting.Data/PodcastFeedModel.cs \
Banshee.Podcasting.Data/PodcastSource.cs \
Banshee.Podcasting.Data/PodcastTrackInfo.cs \
Banshee.Podcasting.Data/PodcastTrackListModel.cs \
Banshee.Podcasting.Data/PodcastUnheardFilterModel.cs \
- Banshee.Podcasting.Gui/ColumnCellDownloadStatus.cs \
Banshee.Podcasting.Gui/ColumnCellPodcast.cs \
Banshee.Podcasting.Gui/ColumnCellPodcastStatusIndicator.cs \
Banshee.Podcasting.Gui/ColumnCellPublished.cs \
@@ -407,10 +412,7 @@ SOURCES = \
Banshee.Podcasting.Gui/ColumnCellYesNo.cs \
Banshee.Podcasting.Gui/DownloadManager/DownloadManagerInterface.cs \
Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs \
- Banshee.Podcasting.Gui/DownloadStatusFilterView.cs \
Banshee.Podcasting.Gui/Grid.cs \
- Banshee.Podcasting.Gui/GridContent.cs \
- Banshee.Podcasting.Gui/HeaderWidget.cs \
Banshee.Podcasting.Gui/Models/FilterableListModel.cs \
Banshee.Podcasting.Gui/Models/ListModel.cs \
Banshee.Podcasting.Gui/PodcastActions.cs \
@@ -466,6 +468,8 @@ RESOURCES = \
@ENABLE_PODCAST_TRUE at LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
@ENABLE_PODCAST_TRUE at LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
@ENABLE_PODCAST_TRUE at LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+ at ENABLE_PODCAST_TRUE@LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+ at ENABLE_PODCAST_TRUE@LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
@ENABLE_PODCAST_TRUE at DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -582,6 +586,7 @@ RESOURCES = \
@ENABLE_PODCAST_TRUE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@ENABLE_PODCAST_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
+ at ENABLE_PODCAST_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@ENABLE_PODCAST_TRUE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@ENABLE_PODCAST_TRUE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@ENABLE_PODCAST_TRUE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -595,6 +600,7 @@ RESOURCES = \
@ENABLE_PODCAST_TRUE at REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_PODCAST_TRUE at REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_PODCAST_TRUE at REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+ at ENABLE_PODCAST_TRUE@REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
@ENABLE_PODCAST_TRUE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Extensions/Banshee.Podcasting/Resources/ActiveSourceUI.xml b/src/Extensions/Banshee.Podcasting/Resources/ActiveSourceUI.xml
index 8037c88..1c8c547 100644
--- a/src/Extensions/Banshee.Podcasting/Resources/ActiveSourceUI.xml
+++ b/src/Extensions/Banshee.Podcasting/Resources/ActiveSourceUI.xml
@@ -39,16 +39,19 @@
<menuitem name="PodcastItemDeleteFile" action="PodcastItemDeleteFileAction" />
<separator />
<menuitem name="PodcastItemLink" action="PodcastItemLinkAction" />
- <menu action="EpisodePodcastMenu">
+ <!--<menu action="EpisodePodcastMenu">
<menuitem name="PodcastUpdateFeed" action="PodcastUpdateFeedAction" />
<menuitem name="PodcastDownloadAll" action="PodcastDownloadAllAction"/>
<menuitem name="PodcastHomepage" action="PodcastHomepageAction" />
<menuitem name="PodcastDelete" action="PodcastDeleteAction" />
<separator />
<menuitem name="PodcastProperties" action="PodcastPropertiesAction" />
- </menu>
+ </menu>-->
<!--
<menuitem name="PodcastItemCancel" action="PodcastItemCancelAction" />-->
</placeholder>
+ <placeholder name="AboveTrackProperties">
+ <menuitem action="EpisodePodcastProperties"/>
+ </placeholder>
</popup>
</ui>
diff --git a/src/Extensions/Banshee.RemoteAudio/Makefile.in b/src/Extensions/Banshee.RemoteAudio/Makefile.in
index 879f618..43a0bb7 100644
--- a/src/Extensions/Banshee.RemoteAudio/Makefile.in
+++ b/src/Extensions/Banshee.RemoteAudio/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Extensions/Banshee.RemoteAudio
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -434,6 +441,8 @@ RESOURCES = \
@REMOTE_AUDIO_ENABLED_TRUE at LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
@REMOTE_AUDIO_ENABLED_TRUE at LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
@REMOTE_AUDIO_ENABLED_TRUE at LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+ at REMOTE_AUDIO_ENABLED_TRUE@LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+ at REMOTE_AUDIO_ENABLED_TRUE@LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
@REMOTE_AUDIO_ENABLED_TRUE at DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -550,6 +559,7 @@ RESOURCES = \
@REMOTE_AUDIO_ENABLED_TRUE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@REMOTE_AUDIO_ENABLED_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
+ at REMOTE_AUDIO_ENABLED_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@REMOTE_AUDIO_ENABLED_TRUE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@REMOTE_AUDIO_ENABLED_TRUE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@REMOTE_AUDIO_ENABLED_TRUE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -563,6 +573,7 @@ RESOURCES = \
@REMOTE_AUDIO_ENABLED_TRUE at REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@REMOTE_AUDIO_ENABLED_TRUE at REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@REMOTE_AUDIO_ENABLED_TRUE at REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+ at REMOTE_AUDIO_ENABLED_TRUE@REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
@REMOTE_AUDIO_ENABLED_TRUE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Extensions/Banshee.Sample/Makefile.in b/src/Extensions/Banshee.Sample/Makefile.in
index 1eda1a9..332dd75 100644
--- a/src/Extensions/Banshee.Sample/Makefile.in
+++ b/src/Extensions/Banshee.Sample/Makefile.in
@@ -37,14 +37,6 @@ subdir = src/Extensions/Banshee.Sample
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -68,9 +60,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -171,6 +173,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -190,6 +194,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -297,6 +303,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -343,7 +351,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu.addin.xml b/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu.addin.xml
new file mode 100644
index 0000000..c773618
--- /dev/null
+++ b/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu.addin.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Addin
+ id="Banshee.SoundMenu"
+ version="1.0"
+ compatVersion="1.0"
+ copyright="Copyright 2010 Bertrand Lorentz. Licensed under the MIT X11 license."
+ name="Sound Menu integration for Banshee"
+ category="Utilities"
+ description="Control Banshee from the Sound Menu."
+ author="Bertrand Lorentz"
+ url="http://banshee-project.org/"
+ defaultEnabled="false">
+
+ <Dependencies>
+ <Addin id="Banshee.Services" version="1.0"/>
+ <Addin id="Banshee.ThickClient" version="1.0"/>
+ <Addin id="Banshee.Mpris" version="1.0"/>
+ </Dependencies>
+
+ <Extension path="/Banshee/ServiceManager/Service">
+ <Service class="Banshee.SoundMenu.SoundMenuService"/>
+ </Extension>
+
+</Addin>
diff --git a/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs b/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs
new file mode 100644
index 0000000..cae9b52
--- /dev/null
+++ b/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs
@@ -0,0 +1,432 @@
+//
+// SoundMenuService.cs
+//
+// Authors:
+// Bertrand Lorentz <bertrand.lorentz at gmail.com>
+//
+// Copyright (C) 2010 Bertrand Lorentz
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+using Mono.Addins;
+using Mono.Unix;
+using Gtk;
+using Notifications;
+
+using Hyena;
+using Banshee.Base;
+using Banshee.Collection;
+using Banshee.Collection.Gui;
+using Banshee.Configuration;
+using Banshee.Gui;
+using Banshee.IO;
+using Banshee.MediaEngine;
+using Banshee.ServiceStack;
+using Banshee.Preferences;
+
+using Indicate;
+
+namespace Banshee.SoundMenu
+{
+ public class SoundMenuService : IExtensionService
+ {
+ private bool? actions_supported;
+ private ArtworkManager artwork_manager_service;
+ private Notification current_nf;
+ private TrackInfo current_track;
+ private GtkElementsService elements_service;
+ private InterfaceActionService interface_action_service;
+ private string notify_last_artist;
+ private string notify_last_title;
+ private Server server;
+
+ private const int icon_size = 42;
+
+ public SoundMenuService ()
+ {
+ }
+
+ void IExtensionService.Initialize ()
+ {
+ elements_service = ServiceManager.Get<GtkElementsService> ();
+ interface_action_service = ServiceManager.Get<InterfaceActionService> ();
+
+ var notif_addin = AddinManager.Registry.GetAddin("Banshee.NotificationArea");
+ var ind_addin = AddinManager.Registry.GetAddin("Banshee.AppIndicator");
+
+ if (notif_addin != null && notif_addin.Enabled) {
+ Log.Debug("NotificationArea conflicts with SoundMenu, disabling NotificationArea");
+ notif_addin.Enabled = false;
+ } else if (ind_addin != null && ind_addin.Enabled) {
+ Log.Debug("AppIndicator conflicts with SoundMenu, disabling AppIndicator");
+ ind_addin.Enabled = false;
+ }
+
+ AddinManager.AddinLoaded += OnAddinLoaded;
+
+ if (!ServiceStartup ()) {
+ ServiceManager.ServiceStarted += OnServiceStarted;
+ }
+ }
+
+ private void OnServiceStarted (ServiceStartedArgs args)
+ {
+ if (args.Service is Banshee.Gui.InterfaceActionService) {
+ interface_action_service = (InterfaceActionService)args.Service;
+ } else if (args.Service is GtkElementsService) {
+ elements_service = (GtkElementsService)args.Service;
+ }
+
+ ServiceStartup ();
+ }
+
+ private bool ServiceStartup ()
+ {
+ if (elements_service == null || interface_action_service == null) {
+ return false;
+ }
+
+ interface_action_service.GlobalActions.Add (new ActionEntry [] {
+ new ActionEntry ("CloseAction", Stock.Close,
+ Catalog.GetString ("_Close"), "<Control>W",
+ Catalog.GetString ("Close"), CloseWindow)
+ });
+
+
+ InstallPreferences ();
+ server = Server.RefDefault ();
+ if (Enabled) {
+ Register ();
+ }
+
+ ServiceManager.PlayerEngine.ConnectEvent (OnPlayerEvent,
+ PlayerEvent.StartOfStream |
+ PlayerEvent.EndOfStream |
+ PlayerEvent.TrackInfoUpdated |
+ PlayerEvent.StateChange);
+
+ artwork_manager_service = ServiceManager.Get<ArtworkManager> ();
+ artwork_manager_service.AddCachedSize (icon_size);
+
+ RegisterCloseHandler ();
+
+ ServiceManager.ServiceStarted -= OnServiceStarted;
+
+ return true;
+ }
+
+ public void Dispose ()
+ {
+ if (current_nf != null) {
+ try {
+ current_nf.Close ();
+ } catch {}
+ }
+
+ UninstallPreferences ();
+
+ ServiceManager.PlayerEngine.DisconnectEvent (OnPlayerEvent);
+
+ elements_service.PrimaryWindowClose = null;
+
+ Gtk.Action close_action = interface_action_service.GlobalActions["CloseAction"];
+ if (close_action != null) {
+ interface_action_service.GlobalActions.Remove (close_action);
+ }
+
+ AddinManager.AddinLoaded -= OnAddinLoaded;
+
+ elements_service = null;
+ interface_action_service = null;
+ }
+
+ void OnAddinLoaded (object sender, AddinEventArgs args)
+ {
+ if (args.AddinId == "Banshee.NotificationArea" || args.AddinId == "Banshee.AppIndicator") {
+ Log.Debug("SoundMenu conflicts with " + args.AddinId + ", disabling SoundMenu");
+ AddinManager.Registry.GetAddin("Banshee.SoundMenu").Enabled = false;
+ }
+ }
+
+ public void Register ()
+ {
+ Log.Debug ("Registering with sound indicator");
+ server.SetType ("music.banshee");
+ string desktop_file = Paths.Combine (Paths.InstalledApplicationDataRoot,
+ "applications", "banshee-1.desktop");
+ server.DesktopFile (desktop_file);
+ server.Show ();
+ }
+
+ public void Unregister ()
+ {
+ server.Hide ();
+ }
+
+#region Notifications
+ private bool ActionsSupported {
+ get {
+ if (!actions_supported.HasValue) {
+ actions_supported = Notifications.Global.Capabilities != null &&
+ Array.IndexOf (Notifications.Global.Capabilities, "actions") > -1;
+ }
+
+ return actions_supported.Value;
+ }
+ }
+
+ private bool OnPrimaryWindowClose ()
+ {
+ CloseWindow (null, null);
+ return true;
+ }
+
+ private void CloseWindow (object o, EventArgs args)
+ {
+ try {
+ if (NotifyOnCloseSchema.Get ()) {
+ Notification nf = new Notification (
+ Catalog.GetString ("Still Running"),
+ Catalog.GetString (
+ "Banshee was closed to the sound menu. " +
+ "Use the <i>Quit</i> option to end your session."),
+ "media-player-banshee");
+ nf.Urgency = Urgency.Low;
+ nf.Show ();
+
+ NotifyOnCloseSchema.Set (false);
+ }
+ } catch (Exception e) {
+ Log.Warning ("Error while trying to notify of window close.", e.Message, false);
+ }
+
+ elements_service.PrimaryWindow.Visible = false;
+ }
+
+ private void OnPlayerEvent (PlayerEventArgs args)
+ {
+ switch (args.Event) {
+ case PlayerEvent.StartOfStream:
+ case PlayerEvent.TrackInfoUpdated:
+ current_track = ServiceManager.PlayerEngine.CurrentTrack;
+ ShowTrackNotification ();
+ break;
+ case PlayerEvent.EndOfStream:
+ current_track = null;
+ break;
+ }
+ }
+
+ private void OnSongSkipped (object o, ActionArgs args)
+ {
+ if (args.Action == "skip-song") {
+ ServiceManager.PlaybackController.Next ();
+ }
+ }
+
+ private string GetByFrom (string artist, string display_artist, string album, string display_album)
+ {
+ bool has_artist = !String.IsNullOrEmpty (artist);
+ bool has_album = !String.IsNullOrEmpty (album);
+
+ string markup = null;
+ if (has_artist && has_album) {
+ // Translators: {0} and {1} are Artist Name and
+ // Album Title, respectively;
+ // e.g. 'by Parkway Drive from Killing with a Smile'
+ markup = String.Format (Catalog.GetString ("by '{0}' from '{1}'"),
+ display_artist, display_album);
+ } else if (has_album) {
+ // Translators: {0} is for Album Title;
+ // e.g. 'from Killing with a Smile'
+ markup = String.Format (Catalog.GetString ("from '{0}'"),
+ display_album);
+ } else {
+ // Translators: {0} is for Artist Name;
+ // e.g. 'by Parkway Drive'
+ markup = String.Format(Catalog.GetString ("by '{0}'"),
+ display_artist);
+ }
+ return markup;
+ }
+
+ private void ShowTrackNotification ()
+ {
+ // This has to happen before the next if, otherwise the last_* members aren't set correctly.
+ if (current_track == null || (notify_last_title == current_track.DisplayTrackTitle
+ && notify_last_artist == current_track.DisplayArtistName)) {
+ return;
+ }
+
+ notify_last_title = current_track.DisplayTrackTitle;
+ notify_last_artist = current_track.DisplayArtistName;
+
+ if (!ShowNotificationsSchema.Get ()) {
+ return;
+ }
+
+ foreach (var window in elements_service.ContentWindows) {
+ if (window.HasToplevelFocus) {
+ return;
+ }
+ }
+
+ bool is_notification_daemon = false;
+ try {
+ var name = Notifications.Global.ServerInformation.Name;
+ is_notification_daemon = name == "notification-daemon" || name == "Notification Daemon";
+ } catch {
+ // This will be reached if no notification daemon is running
+ return;
+ }
+
+ string message = GetByFrom (
+ current_track.ArtistName, current_track.DisplayArtistName,
+ current_track.AlbumTitle, current_track.DisplayAlbumTitle);
+
+ string image = null;
+
+ image = is_notification_daemon
+ ? CoverArtSpec.GetPathForSize (current_track.ArtworkId, icon_size)
+ : CoverArtSpec.GetPath (current_track.ArtworkId);
+
+ if (!File.Exists (new SafeUri(image))) {
+ if (artwork_manager_service != null) {
+ // artwork does not exist, try looking up the pixbuf to trigger scaling or conversion
+ Gdk.Pixbuf tmp_pixbuf = is_notification_daemon
+ ? artwork_manager_service.LookupScalePixbuf (current_track.ArtworkId, icon_size)
+ : artwork_manager_service.LookupPixbuf (current_track.ArtworkId);
+
+ if (tmp_pixbuf == null) {
+ image = "audio-x-generic";
+ } else {
+ tmp_pixbuf.Dispose ();
+ }
+ }
+ }
+ try {
+ if (current_nf == null) {
+ current_nf = new Notification (current_track.DisplayTrackTitle, message, image);
+ } else {
+ current_nf.Summary = current_track.DisplayTrackTitle;
+ current_nf.Body = message;
+ current_nf.IconName = image;
+ }
+
+ current_nf.Urgency = Urgency.Low;
+ current_nf.Timeout = 4500;
+
+ if (!current_track.IsLive && ActionsSupported && interface_action_service.PlaybackActions["NextAction"].Sensitive) {
+ current_nf.AddAction ("skip-song", Catalog.GetString ("Skip this item"), OnSongSkipped);
+ }
+ current_nf.Show ();
+
+ } catch (Exception e) {
+ Log.Warning ("Cannot show notification", e.Message, false);
+ }
+ }
+
+ private void RegisterCloseHandler ()
+ {
+ if (elements_service.PrimaryWindowClose == null) {
+ elements_service.PrimaryWindowClose = OnPrimaryWindowClose;
+ }
+ }
+
+ private void UnregisterCloseHandler ()
+ {
+ if (elements_service.PrimaryWindowClose != null) {
+ elements_service.PrimaryWindowClose = null;
+ }
+ }
+#endregion
+
+#region Preferences
+ private PreferenceBase enabled_pref;
+
+ private void InstallPreferences ()
+ {
+ PreferenceService service = ServiceManager.Get<PreferenceService> ();
+ if (service == null) {
+ return;
+ }
+
+ enabled_pref = service["general"]["misc"].Add (
+ new SchemaPreference<bool> (EnabledSchema,
+ Catalog.GetString ("_Show Banshee in the sound menu"),
+ Catalog.GetString ("Control Banshee through the sound menu"),
+ delegate { Enabled = EnabledSchema.Get (); })
+ );
+ }
+
+ private void UninstallPreferences ()
+ {
+ PreferenceService service = ServiceManager.Get<PreferenceService> ();
+ if (service == null) {
+ return;
+ }
+
+ service["general"]["misc"].Remove (enabled_pref);
+ }
+
+ public bool Enabled {
+ get { return EnabledSchema.Get (); }
+ set {
+ EnabledSchema.Set (value);
+ if (value) {
+ Register ();
+ RegisterCloseHandler ();
+ } else {
+ Unregister ();
+ UnregisterCloseHandler ();
+ }
+ }
+ }
+
+ private static readonly SchemaEntry<bool> EnabledSchema = new SchemaEntry<bool> (
+ "plugins.soundmenu", "enabled",
+ true,
+ "Show Banshee in the sound menu",
+ "Show Banshee in the sound menu"
+ );
+
+ public static readonly SchemaEntry<bool> ShowNotificationsSchema = new SchemaEntry<bool> (
+ "plugins.soundmenu", "show_notifications",
+ true,
+ "Show notifications",
+ "Show information notifications when item starts playing"
+ );
+
+ public static readonly SchemaEntry<bool> NotifyOnCloseSchema = new SchemaEntry<bool> (
+ "plugins.soundmenu", "notify_on_close",
+ true,
+ "Show a notification when closing main window",
+ "When the main window is closed, show a notification stating this has happened."
+ );
+#endregion
+
+ string IService.ServiceName {
+ get { return "SoundMenuService"; }
+ }
+ }
+}
diff --git a/src/Extensions/Banshee.SoundMenu/Makefile.am b/src/Extensions/Banshee.SoundMenu/Makefile.am
new file mode 100644
index 0000000..2ec47d4
--- /dev/null
+++ b/src/Extensions/Banshee.SoundMenu/Makefile.am
@@ -0,0 +1,21 @@
+if EXTERNAL_NOTIFY_SHARP
+NOTIFY_SHARP_LIBS = $(NOTIFY_SHARP_LIBS)
+else
+GMCS_FLAGS+="-define:INTERNAL_NOTIFY_SHARP"
+NOTIFY_SHARP_LIBS =
+endif
+
+ASSEMBLY = Banshee.SoundMenu
+TARGET = library
+LINK = $(REF_EXTENSION_SOUNDMENU) $(NOTIFY_SHARP_LIBS)
+INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
+
+SOURCES = Banshee.SoundMenu/SoundMenuService.cs
+
+RESOURCES = Banshee.SoundMenu.addin.xml
+
+if ENABLE_SOUNDMENU
+include $(top_srcdir)/build/build.mk
+else
+EXTRA_DIST = $(SOURCES) $(RESOURCES)
+endif
diff --git a/src/Extensions/Banshee.SoundMenu/Makefile.in b/src/Extensions/Banshee.SoundMenu/Makefile.in
new file mode 100644
index 0000000..6b04a75
--- /dev/null
+++ b/src/Extensions/Banshee.SoundMenu/Makefile.in
@@ -0,0 +1,901 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+ at EXTERNAL_NOTIFY_SHARP_FALSE@am__append_1 = "-define:INTERNAL_NOTIFY_SHARP"
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(top_srcdir)/build/build.environment.mk \
+ $(top_srcdir)/build/build.mk \
+ $(top_srcdir)/build/build.rules.mk
+ at ENABLE_SOUNDMENU_TRUE@@ENABLE_TESTS_TRUE at am__append_2 = " $(NUNIT_LIBS)"
+subdir = src/Extensions/Banshee.SoundMenu
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \
+ $(top_srcdir)/build/m4/banshee/boo.m4 \
+ $(top_srcdir)/build/m4/banshee/daap.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-appledevice.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-ipod.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-karma.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
+ $(top_srcdir)/build/m4/banshee/gio.m4 \
+ $(top_srcdir)/build/m4/banshee/gnome-doc-utils.m4 \
+ $(top_srcdir)/build/m4/banshee/gnome-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/hal.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/libwebkit.m4 \
+ $(top_srcdir)/build/m4/banshee/meego.m4 \
+ $(top_srcdir)/build/m4/banshee/mono-addins.m4 \
+ $(top_srcdir)/build/m4/banshee/moonlight.m4 \
+ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/osx.m4 \
+ $(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
+ $(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
+ $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(moduledir)"
+SCRIPTS = $(module_SCRIPTS)
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
+AR = @AR@
+ASM_VERSION = @ASM_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BANSHEE_DESKTOP_NAME = @BANSHEE_DESKTOP_NAME@
+BNPX_CFLAGS = @BNPX_CFLAGS@
+BNPX_GTK_CFLAGS = @BNPX_GTK_CFLAGS@
+BNPX_GTK_LIBS = @BNPX_GTK_LIBS@
+BNPX_LIBS = @BNPX_LIBS@
+BOO_CFLAGS = @BOO_CFLAGS@
+BOO_LIBS = @BOO_LIBS@
+BUILD_HOST_CPU = @BUILD_HOST_CPU@
+BUILD_HOST_OS = @BUILD_HOST_OS@
+BUILD_TIME = @BUILD_TIME@
+BUILD_VENDOR_ID = @BUILD_VENDOR_ID@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CLUTTER_CFLAGS = @CLUTTER_CFLAGS@
+CLUTTER_LIBS = @CLUTTER_LIBS@
+CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISPLAY_VERSION = @DISPLAY_VERSION@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DOCDIR = @DOCDIR@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+ENABLE_RELEASE = @ENABLE_RELEASE@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FC = @FC@
+FGREP = @FGREP@
+GCONFSHARP_CFLAGS = @GCONFSHARP_CFLAGS@
+GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
+GCONFTOOL = @GCONFTOOL@
+GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@
+GDATASHARP_LIBS = @GDATASHARP_LIBS@
+GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@
+GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@
+GDK_X11_CFLAGS = @GDK_X11_CFLAGS@
+GDK_X11_LIBS = @GDK_X11_LIBS@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
+GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
+GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
+GLIBSHARP_2_12_7_CFLAGS = @GLIBSHARP_2_12_7_CFLAGS@
+GLIBSHARP_2_12_7_LIBS = @GLIBSHARP_2_12_7_LIBS@
+GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
+GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GMCS_FLAGS = @GMCS_FLAGS@ $(am__append_1)
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
+GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
+GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
+GREP = @GREP@
+GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
+GST_CFLAGS = @GST_CFLAGS@
+GST_LIBS = @GST_LIBS@
+GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
+GST_PLUGINS_BASE_LIBS = @GST_PLUGINS_BASE_LIBS@
+GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
+GST_SHARP_LIBS = @GST_SHARP_LIBS@
+GTKSHARP_A11Y_CFLAGS = @GTKSHARP_A11Y_CFLAGS@
+GTKSHARP_A11Y_LIBS = @GTKSHARP_A11Y_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
+GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
+GTKSHARP_LIBS = @GTKSHARP_LIBS@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
+GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
+HELP_DIR = @HELP_DIR@
+IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
+IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+IPODSHARP_CFLAGS = @IPODSHARP_CFLAGS@
+IPODSHARP_LIBS = @IPODSHARP_LIBS@
+KARMASHARP_ASSEMBLIES = @KARMASHARP_ASSEMBLIES@
+KARMASHARP_CFLAGS = @KARMASHARP_CFLAGS@
+KARMASHARP_LIBS = @KARMASHARP_LIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBBANSHEE_CFLAGS = @LIBBANSHEE_CFLAGS@
+LIBBANSHEE_LIBS = @LIBBANSHEE_LIBS@
+LIBGPODSHARP_ASSEMBLIES = @LIBGPODSHARP_ASSEMBLIES@
+LIBGPODSHARP_CFLAGS = @LIBGPODSHARP_CFLAGS@
+LIBGPODSHARP_LIBS = @LIBGPODSHARP_LIBS@
+LIBMTP_CFLAGS = @LIBMTP_CFLAGS@
+LIBMTP_LIBS = @LIBMTP_LIBS@
+LIBMTP_SO_MAP = @LIBMTP_SO_MAP@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@
+LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@
+LIBTOOL = @LIBTOOL@
+LIBWEBKIT_CFLAGS = @LIBWEBKIT_CFLAGS@
+LIBWEBKIT_LIBS = @LIBWEBKIT_LIBS@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
+MAKEINFO = @MAKEINFO@
+MCS = @MCS@
+MDASSEMBLER = @MDASSEMBLER@
+MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@
+MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MONO = @MONO@
+MONODOCER = @MONODOCER@
+MONOTORRENT_ASSEMBLIES = @MONOTORRENT_ASSEMBLIES@
+MONOTORRENT_DBUS_CFLAGS = @MONOTORRENT_DBUS_CFLAGS@
+MONOTORRENT_DBUS_LIBS = @MONOTORRENT_DBUS_LIBS@
+MONO_2_4_3_CFLAGS = @MONO_2_4_3_CFLAGS@
+MONO_2_4_3_LIBS = @MONO_2_4_3_LIBS@
+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
+MONO_ADDINS_SETUP_CFLAGS = @MONO_ADDINS_SETUP_CFLAGS@
+MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
+MONO_ZEROCONF_CFLAGS = @MONO_ZEROCONF_CFLAGS@
+MONO_ZEROCONF_LIBS = @MONO_ZEROCONF_LIBS@
+MOONLIGHT_CFLAGS = @MOONLIGHT_CFLAGS@
+MOONLIGHT_LIBS = @MOONLIGHT_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+NDESK_DBUS_GLIB_CFLAGS = @NDESK_DBUS_GLIB_CFLAGS@
+NDESK_DBUS_GLIB_LIBS = @NDESK_DBUS_GLIB_LIBS@
+NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
+ at EXTERNAL_NOTIFY_SHARP_FALSE@NOTIFY_SHARP_LIBS =
+ at EXTERNAL_NOTIFY_SHARP_TRUE@NOTIFY_SHARP_LIBS = $(NOTIFY_SHARP_LIBS)
+NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
+NUNIT_CFLAGS = @NUNIT_CFLAGS@
+NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SQLITE_CFLAGS = @SQLITE_CFLAGS@
+SQLITE_LIBS = @SQLITE_LIBS@
+STRIP = @STRIP@
+TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
+TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
+USE_NLS = @USE_NLS@
+V = @V@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
+XVIDMODE_CFLAGS = @XVIDMODE_CFLAGS@
+XVIDMODE_LIBS = @XVIDMODE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
+expanded_libdir = @expanded_libdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+ASSEMBLY = Banshee.SoundMenu
+TARGET = library
+LINK = $(REF_EXTENSION_SOUNDMENU) $(NOTIFY_SHARP_LIBS) $(am__append_2)
+INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
+SOURCES = Banshee.SoundMenu/SoundMenuService.cs
+RESOURCES = Banshee.SoundMenu.addin.xml
+
+# Initializers
+ at ENABLE_SOUNDMENU_TRUE@MONO_BASE_PATH =
+ at ENABLE_SOUNDMENU_TRUE@MONO_ADDINS_PATH =
+
+# Install Paths
+ at ENABLE_SOUNDMENU_TRUE@DEFAULT_INSTALL_DIR = $(pkglibdir)
+ at ENABLE_SOUNDMENU_TRUE@BACKENDS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Backends
+ at ENABLE_SOUNDMENU_TRUE@EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
+
+# External libraries to link against, generated from configure
+ at ENABLE_SOUNDMENU_TRUE@LINK_SYSTEM = -r:System
+ at ENABLE_SOUNDMENU_TRUE@LINK_CAIRO = -r:Mono.Cairo
+ at ENABLE_SOUNDMENU_TRUE@LINK_MONO_POSIX = -r:Mono.Posix
+ at ENABLE_SOUNDMENU_TRUE@LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
+ at ENABLE_SOUNDMENU_TRUE@LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
+ at ENABLE_SOUNDMENU_TRUE@LINK_GLIB = $(GLIBSHARP_LIBS)
+ at ENABLE_SOUNDMENU_TRUE@LINK_GTK = $(GTKSHARP_LIBS)
+ at ENABLE_SOUNDMENU_TRUE@LINK_GCONF = $(GCONFSHARP_LIBS)
+ at ENABLE_SOUNDMENU_TRUE@LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+ at ENABLE_SOUNDMENU_TRUE@LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
+ at ENABLE_SOUNDMENU_TRUE@LINK_GUDEV = $(GUDEV_SHARP_LIBS)
+ at ENABLE_SOUNDMENU_TRUE@LINK_DBUS = $(NDESK_DBUS_LIBS) $(NDESK_DBUS_GLIB_LIBS)
+ at ENABLE_SOUNDMENU_TRUE@LINK_DBUS_NO_GLIB = $(NDESK_DBUS_LIBS)
+ at ENABLE_SOUNDMENU_TRUE@LINK_TAGLIB = $(TAGLIB_SHARP_LIBS)
+ at ENABLE_SOUNDMENU_TRUE@LINK_IPOD = $(IPODSHARP_LIBS)
+ at ENABLE_SOUNDMENU_TRUE@LINK_BOO = $(BOO_LIBS)
+ at ENABLE_SOUNDMENU_TRUE@LINK_GDATA = $(GDATASHARP_LIBS)
+ at ENABLE_SOUNDMENU_TRUE@LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
+ at ENABLE_SOUNDMENU_TRUE@LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
+ at ENABLE_SOUNDMENU_TRUE@LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+ at ENABLE_SOUNDMENU_TRUE@LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+ at ENABLE_SOUNDMENU_TRUE@LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
+ at ENABLE_SOUNDMENU_TRUE@DIR_BIN = $(top_builddir)/bin
+
+# Hyena
+ at ENABLE_SOUNDMENU_TRUE@REF_HYENA = $(LINK_SYSTEM) $(LINK_MONO_POSIX)
+ at ENABLE_SOUNDMENU_TRUE@LINK_HYENA = -r:$(DIR_BIN)/Hyena.dll -r:$(DIR_BIN)/Hyena.Data.Sqlite.dll
+ at ENABLE_SOUNDMENU_TRUE@LINK_HYENA_DEPS = $(REF_HYENA) $(LINK_HYENA)
+
+# Hyena.Gui
+ at ENABLE_SOUNDMENU_TRUE@REF_HYENA_GUI = $(LINK_HYENA_DEPS) $(LINK_MONO_POSIX) $(LINK_CAIRO) $(LINK_GTK)
+ at ENABLE_SOUNDMENU_TRUE@LINK_HYENA_GUI = -r:$(DIR_BIN)/Hyena.Gui.dll
+ at ENABLE_SOUNDMENU_TRUE@LINK_HYENA_GUI_DEPS = $(REF_HYENA_GUI) $(LINK_HYENA_GUI)
+
+# Lastfm
+ at ENABLE_SOUNDMENU_TRUE@REF_LASTFM = $(LINK_SYSTEM) $(LINK_MONO_MEDIA) $(LINK_MONO_POSIX) $(LINK_HYENA) $(LINK_ICSHARP_ZIP_LIB)
+ at ENABLE_SOUNDMENU_TRUE@LINK_LASTFM = -r:$(DIR_BIN)/Lastfm.dll
+ at ENABLE_SOUNDMENU_TRUE@LINK_LASTFM_DEPS = $(REF_LASTFM) $(LINK_LASTFM)
+
+# Lastfm.Gui
+ at ENABLE_SOUNDMENU_TRUE@REF_LASTFM_GUI = $(LINK_GLIB) $(LINK_GTK) $(LINK_LASTFM_DEPS)
+ at ENABLE_SOUNDMENU_TRUE@LINK_LASTFM_GUI = -r:$(DIR_BIN)/Lastfm.Gui.dll
+ at ENABLE_SOUNDMENU_TRUE@LINK_LASTFM_GUI_DEPS = $(REF_LASTFM_GUI) $(LINK_LASTFM_GUI)
+ at ENABLE_SOUNDMENU_TRUE@REF_MIGO = $(LINK_HYENA_DEPS) $(LINK_ICSHARP_ZIP_LIB)
+ at ENABLE_SOUNDMENU_TRUE@LINK_MIGO = -r:$(DIR_BIN)/Migo.dll
+ at ENABLE_SOUNDMENU_TRUE@LINK_MIGO_DEPS = $(REF_MIGO) $(LINK_MIGO)
+
+# Mono.Media
+ at ENABLE_SOUNDMENU_TRUE@REF_MONO_MEDIA = $(LINK_SYSTEM)
+ at ENABLE_SOUNDMENU_TRUE@LINK_MONO_MEDIA = -r:$(DIR_BIN)/Mono.Media.dll
+ at ENABLE_SOUNDMENU_TRUE@LINK_MONO_MEDIA_DEPS = $(REF_MONO_MEDIA) $(LINK_MONO_MEDIA)
+
+# Mtp
+ at ENABLE_SOUNDMENU_TRUE@REF_MTP = $(LINK_SYSTEM) $(LINK_MONO_POSIX)
+ at ENABLE_SOUNDMENU_TRUE@LINK_MTP = -r:$(DIR_BIN)/Mtp.dll
+ at ENABLE_SOUNDMENU_TRUE@LINK_MTP_DEPS = $(REF_MTP) $(LINK_MTP)
+
+# AppleDevice
+ at ENABLE_SOUNDMENU_TRUE@REF_APPLEDEVICE = $(LINK_SYSTEM)
+ at ENABLE_SOUNDMENU_TRUE@LINK_APPLEDEVICE_DEPS = $(REF_APPLEDEVICE) $(LIBGPODSHARP_LIBS)
+
+# Karma
+ at ENABLE_SOUNDMENU_TRUE@REF_KARMA = $(LINK_SYSTEM) $(LINK_MONO_POSIX)
+ at ENABLE_SOUNDMENU_TRUE@LINK_KARMA = $(KARMASHARP_LIBS)
+ at ENABLE_SOUNDMENU_TRUE@LINK_KARMA_DEPS = $(REF_KARMA) $(LINK_KARMA)
+
+# MusicBrainz
+ at ENABLE_SOUNDMENU_TRUE@REF_MUSICBRAINZ = $(LINK_SYSTEM)
+ at ENABLE_SOUNDMENU_TRUE@LINK_MUSICBRAINZ = -r:$(DIR_BIN)/MusicBrainz.dll
+ at ENABLE_SOUNDMENU_TRUE@LINK_MUSICBRAINZ_DEPS = $(REF_MUSICBRAINZ) $(LINK_MUSICBRAINZ)
+
+# Core
+ at ENABLE_SOUNDMENU_TRUE@REF_BANSHEE_CORE = $(LINK_HYENA_DEPS) $(LINK_MONO_POSIX) $(LINK_GLIB) \
+ at ENABLE_SOUNDMENU_TRUE@ $(LINK_DBUS) $(LINK_TAGLIB) $(LINK_MONO_ADDINS_DEPS)
+
+ at ENABLE_SOUNDMENU_TRUE@LINK_BANSHEE_CORE = -r:$(DIR_BIN)/Banshee.Core.dll
+ at ENABLE_SOUNDMENU_TRUE@LINK_BANSHEE_CORE_DEPS = $(REF_BANSHEE_CORE) $(LINK_BANSHEE_CORE)
+ at ENABLE_SOUNDMENU_TRUE@REF_BANSHEE_SERVICES = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_MEDIA_DEPS) $(LINK_LASTFM_DEPS) $(LINK_MUSICBRAINZ_DEPS)
+ at ENABLE_SOUNDMENU_TRUE@LINK_BANSHEE_SERVICES = -r:$(DIR_BIN)/Banshee.Services.dll
+ at ENABLE_SOUNDMENU_TRUE@LINK_BANSHEE_SERVICES_DEPS = $(REF_BANSHEE_SERVICES) $(LINK_BANSHEE_SERVICES)
+ at ENABLE_SOUNDMENU_TRUE@REF_BANSHEE_WIDGETS = $(LINK_MONO_POSIX) $(LINK_HYENA_GUI_DEPS)
+ at ENABLE_SOUNDMENU_TRUE@LINK_BANSHEE_WIDGETS = -r:$(DIR_BIN)/Banshee.Widgets.dll
+ at ENABLE_SOUNDMENU_TRUE@LINK_BANSHEE_WIDGETS_DEPS = $(REF_BANSHEE_WIDGETS) $(LINK_BANSHEE_WIDGETS)
+ at ENABLE_SOUNDMENU_TRUE@REF_BANSHEE_THICKCLIENT = $(LINK_BANSHEE_WIDGETS_DEPS) \
+ at ENABLE_SOUNDMENU_TRUE@ $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_HYENA_GUI_DEPS) $(LINK_MONO_ADDINS_SETUP_DEPS)
+
+ at ENABLE_SOUNDMENU_TRUE@LINK_BANSHEE_THICKCLIENT = -r:$(DIR_BIN)/Banshee.ThickClient.dll
+ at ENABLE_SOUNDMENU_TRUE@LINK_BANSHEE_THICKCLIENT_DEPS = $(REF_BANSHEE_THICKCLIENT) \
+ at ENABLE_SOUNDMENU_TRUE@ $(LINK_BANSHEE_THICKCLIENT)
+
+ at ENABLE_SOUNDMENU_TRUE@REF_BANSHEE_WEBBROWSER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_SOUNDMENU_TRUE@LINK_BANSHEE_WEBBROWSER = -r:$(DIR_BIN)/Banshee.WebBrowser.dll
+ at ENABLE_SOUNDMENU_TRUE@LINK_BANSHEE_WEBBROWSER_DEPS = $(REF_BANSHEE_WEBBROWSER) $(LINK_BANSHEE_WEBBROWSER)
+ at ENABLE_SOUNDMENU_TRUE@REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_SOUNDMENU_TRUE@LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID)
+ at ENABLE_SOUNDMENU_TRUE@REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO)
+ at ENABLE_SOUNDMENU_TRUE@REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS)
+ at ENABLE_SOUNDMENU_TRUE@REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS)
+ at ENABLE_SOUNDMENU_TRUE@REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS)
+ at ENABLE_SOUNDMENU_TRUE@REF_BANSHEE_COLLECTIONINDEXER = $(LINK_SYSTEM) $(LINK_DBUS_NO_GLIB) $(LINK_MONO_POSIX)
+
+# Dap
+ at ENABLE_SOUNDMENU_TRUE@REF_DAP = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_SOUNDMENU_TRUE@LINK_DAP = -r:$(DIR_BIN)/Banshee.Dap.dll
+ at ENABLE_SOUNDMENU_TRUE@LINK_DAP_DEPS = $(REF_DAP) $(LINK_DAP)
+ at ENABLE_SOUNDMENU_TRUE@REF_DAP_APPLEDEVICE = $(LINK_DAP_DEPS) $(LINK_APPLEDEVICE_DEPS)
+ at ENABLE_SOUNDMENU_TRUE@REF_DAP_MASS_STORAGE = $(LINK_DAP_DEPS)
+ at ENABLE_SOUNDMENU_TRUE@REF_DAP_MTP = $(LINK_DAP_DEPS) $(LINK_MTP_DEPS)
+ at ENABLE_SOUNDMENU_TRUE@REF_DAP_IPOD = $(LINK_DAP_DEPS) $(LINK_IPOD)
+ at ENABLE_SOUNDMENU_TRUE@REF_DAP_KARMA = $(LINK_DAP_DEPS) $(LINK_KARMA_DEPS)
+
+# Extensions
+ at ENABLE_SOUNDMENU_TRUE@LINK_EXTENSION_AMAZONMP3 = -r:$(DIR_BIN)/Banshee.AmazonMp3.exe
+ at ENABLE_SOUNDMENU_TRUE@REF_EXTENSION_AMAZONMP3 = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_SOUNDMENU_TRUE@REF_EXTENSION_AMAZONMP3_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_AMAZONMP3)
+ at ENABLE_SOUNDMENU_TRUE@REF_EXTENSION_AUDIOCD = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
+ at ENABLE_SOUNDMENU_TRUE@REF_EXTENSION_BOOSCRIPT = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BOO)
+ at ENABLE_SOUNDMENU_TRUE@REF_EXTENSION_BPM = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_SOUNDMENU_TRUE@REF_EXTENSION_COVERART = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_SOUNDMENU_TRUE@REF_EXTENSION_DAAP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_ICSHARP_ZIP_LIB) $(LINK_MONO_ZEROCONF)
+ at ENABLE_SOUNDMENU_TRUE@REF_EXTENSION_EMUSIC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MIGO_DEPS)
+ at ENABLE_SOUNDMENU_TRUE@REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_SOUNDMENU_TRUE@REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_SOUNDMENU_TRUE@REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_SOUNDMENU_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
+ at ENABLE_SOUNDMENU_TRUE@REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_SOUNDMENU_TRUE@REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_SOUNDMENU_TRUE@LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
+ at ENABLE_SOUNDMENU_TRUE@REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_SOUNDMENU_TRUE@REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
+ at ENABLE_SOUNDMENU_TRUE@REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
+ at ENABLE_SOUNDMENU_TRUE@REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_SOUNDMENU_TRUE@REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_SOUNDMENU_TRUE@REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_SOUNDMENU_TRUE@LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
+ at ENABLE_SOUNDMENU_TRUE@LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
+ at ENABLE_SOUNDMENU_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
+
+ at ENABLE_SOUNDMENU_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
+ at ENABLE_SOUNDMENU_TRUE@REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
+ at ENABLE_SOUNDMENU_TRUE@LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
+ at ENABLE_SOUNDMENU_TRUE@REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
+ at ENABLE_SOUNDMENU_TRUE@REF_EXTENSION_NOWPLAYING = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_SOUNDMENU_TRUE@LINK_EXTENSION_NOWPLAYING = -r:$(DIR_BIN)/Banshee.NowPlaying.dll
+ at ENABLE_SOUNDMENU_TRUE@LINK_EXTENSION_NOWPLAYING_DEPS = $(REF_EXTENSION_NOWPLAYING) \
+ at ENABLE_SOUNDMENU_TRUE@ $(LINK_EXTENSION_NOWPLAYING)
+
+ at ENABLE_SOUNDMENU_TRUE@REF_EXTENSION_NOWPLAYING_CLUTTER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_SOUNDMENU_TRUE@REF_EXTENSION_PODCASTING = $(LINK_MIGO_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_SOUNDMENU_TRUE@REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_SOUNDMENU_TRUE@REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_SOUNDMENU_TRUE@REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+ at ENABLE_SOUNDMENU_TRUE@REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
+ at ENABLE_SOUNDMENU_TRUE@REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
+
+# Backends
+ at ENABLE_SOUNDMENU_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
+ at ENABLE_SOUNDMENU_TRUE@REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
+ at ENABLE_SOUNDMENU_TRUE@REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
+ at ENABLE_SOUNDMENU_TRUE@REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
+ at ENABLE_SOUNDMENU_TRUE@REF_BACKEND_HAL = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_DBUS)
+ at ENABLE_SOUNDMENU_TRUE@REF_BACKEND_OSX = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_SOUNDMENU_TRUE@REF_BACKEND_BNPX11 = $(LINK_EXTENSION_NOWPLAYING_DEPS)
+
+# Cute hack to replace a space with something
+ at ENABLE_SOUNDMENU_TRUE@colon := :
+ at ENABLE_SOUNDMENU_TRUE@empty :=
+ at ENABLE_SOUNDMENU_TRUE@space := $(empty) $(empty)
+
+# Build path to allow running uninstalled
+ at ENABLE_SOUNDMENU_TRUE@RUN_PATH = $(subst $(space),$(colon), $(MONO_BASE_PATH))
+ at ENABLE_SOUNDMENU_TRUE@UNIQUE_FILTER_PIPE = tr [:space:] \\n | sort | uniq
+ at ENABLE_SOUNDMENU_TRUE@BUILD_DATA_DIR = $(top_builddir)/bin/share/$(PACKAGE)
+ at ENABLE_SOUNDMENU_TRUE@SOURCES_BUILD = $(addprefix $(srcdir)/, \
+ at ENABLE_SOUNDMENU_TRUE@ $(SOURCES)) \
+ at ENABLE_SOUNDMENU_TRUE@ $(top_srcdir)/src/AssemblyInfo.cs
+ at ENABLE_SOUNDMENU_TRUE@RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
+ at ENABLE_SOUNDMENU_TRUE@RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+ at ENABLE_SOUNDMENU_TRUE@ -resource:$(resource),$(notdir $(resource)))
+
+ at ENABLE_SOUNDMENU_TRUE@INSTALL_ICONS = $(top_srcdir)/build/private-icon-theme-installer "$(mkinstalldirs)" "$(INSTALL_DATA)"
+ at ENABLE_SOUNDMENU_TRUE@THEME_ICONS_SOURCE = $(wildcard $(srcdir)/ThemeIcons/*/*/*.png) $(wildcard $(srcdir)/ThemeIcons/scalable/*/*.svg)
+ at ENABLE_SOUNDMENU_TRUE@THEME_ICONS_RELATIVE = $(subst $(srcdir)/ThemeIcons/, , $(THEME_ICONS_SOURCE))
+ at ENABLE_SOUNDMENU_TRUE@ASSEMBLY_EXTENSION = $(strip $(patsubst library, dll, $(TARGET)))
+ at ENABLE_SOUNDMENU_TRUE@ASSEMBLY_FILE = $(top_builddir)/bin/$(ASSEMBLY).$(ASSEMBLY_EXTENSION)
+ at ENABLE_SOUNDMENU_TRUE@INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_DIR)))
+ at ENABLE_SOUNDMENU_TRUE@@ENABLE_TESTS_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
+ at ENABLE_ATK_TRUE@@ENABLE_SOUNDMENU_TRUE at ENABLE_ATK_FLAG = "-define:ENABLE_ATK"
+ at ENABLE_SOUNDMENU_TRUE@FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
+ at ENABLE_SOUNDMENU_TRUE@DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
+ at ENABLE_SOUNDMENU_TRUE@OUTPUT_FILES = \
+ at ENABLE_SOUNDMENU_TRUE@ $(ASSEMBLY_FILE) \
+ at ENABLE_SOUNDMENU_TRUE@ $(ASSEMBLY_FILE).mdb
+
+ at ENABLE_SOUNDMENU_TRUE@moduledir = $(INSTALL_DIR_RESOLVED)
+ at ENABLE_SOUNDMENU_TRUE@module_SCRIPTS = $(OUTPUT_FILES)
+ at ENABLE_SOUNDMENU_FALSE@EXTRA_DIST = $(SOURCES) $(RESOURCES)
+ at ENABLE_SOUNDMENU_TRUE@EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE)
+ at ENABLE_SOUNDMENU_TRUE@CLEANFILES = $(OUTPUT_FILES)
+ at ENABLE_SOUNDMENU_TRUE@DISTCLEANFILES = *.pidb
+ at ENABLE_SOUNDMENU_TRUE@MAINTAINERCLEANFILES = Makefile.in
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/build/build.mk $(top_srcdir)/build/build.environment.mk $(top_srcdir)/build/build.rules.mk $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Extensions/Banshee.SoundMenu/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign src/Extensions/Banshee.SoundMenu/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-moduleSCRIPTS: $(module_SCRIPTS)
+ @$(NORMAL_INSTALL)
+ test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
+ @list='$(module_SCRIPTS)'; test -n "$(moduledir)" || list=; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+ done | \
+ sed -e 'p;s,.*/,,;n' \
+ -e 'h;s|.*|.|' \
+ -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+ if ($$2 == $$4) { files[d] = files[d] " " $$1; \
+ if (++n[d] == $(am__install_max)) { \
+ print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
+ else { print "f", d "/" $$4, $$1 } } \
+ END { for (d in files) print "f", d, files[d] }' | \
+ while read type dir files; do \
+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+ test -z "$$files" || { \
+ echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(moduledir)$$dir'"; \
+ $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(moduledir)$$dir" || exit $$?; \
+ } \
+ ; done
+
+uninstall-moduleSCRIPTS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(module_SCRIPTS)'; test -n "$(moduledir)" || exit 0; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 's,.*/,,;$(transform)'`; \
+ test -n "$$list" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(moduledir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(moduledir)" && rm -f $$files
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile $(SCRIPTS)
+installdirs:
+ for dir in "$(DESTDIR)$(moduledir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+ -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+ -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+ at ENABLE_SOUNDMENU_FALSE@install-data-hook:
+ at ENABLE_SOUNDMENU_FALSE@uninstall-hook:
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-moduleSCRIPTS
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-moduleSCRIPTS
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+.MAKE: install-am install-data-am install-strip uninstall-am
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-data-hook install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-moduleSCRIPTS install-pdf install-pdf-am install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+ ps ps-am uninstall uninstall-am uninstall-hook \
+ uninstall-moduleSCRIPTS
+
+
+ at ENABLE_SOUNDMENU_TRUE@all: $(ASSEMBLY_FILE) theme-icons
+
+ at ENABLE_SOUNDMENU_TRUE@run:
+ at ENABLE_SOUNDMENU_TRUE@ @pushd $(top_builddir); \
+ at ENABLE_SOUNDMENU_TRUE@ make run; \
+ at ENABLE_SOUNDMENU_TRUE@ popd;
+
+ at ENABLE_SOUNDMENU_TRUE@test:
+ at ENABLE_SOUNDMENU_TRUE@ @pushd $(top_builddir)/tests; \
+ at ENABLE_SOUNDMENU_TRUE@ make $(ASSEMBLY); \
+ at ENABLE_SOUNDMENU_TRUE@ popd;
+
+ at ENABLE_SOUNDMENU_TRUE@build-debug:
+ at ENABLE_SOUNDMENU_TRUE@ @echo $(DEP_LINK)
+
+ at ENABLE_SOUNDMENU_TRUE@$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
+
+ at ENABLE_SOUNDMENU_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
+ at ENABLE_SOUNDMENU_TRUE@ @mkdir -p $(top_builddir)/bin
+ at ENABLE_SOUNDMENU_TRUE@ @if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
+ at ENABLE_SOUNDMENU_TRUE@ $(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
+ at ENABLE_SOUNDMENU_TRUE@ $(MONO) $(top_builddir)/build/dll-map-verifier.exe $(srcdir)/$(notdir $@.config) -iwinmm -ilibbanshee -ilibbnpx11 -ilibc -ilibc.so.6 -iintl -ilibmtp.dll -ilibigemacintegration.dylib -iCFRelease $(SOURCES_BUILD); \
+ at ENABLE_SOUNDMENU_TRUE@ fi;
+ at ENABLE_SOUNDMENU_TRUE@ $(MCS) \
+ at ENABLE_SOUNDMENU_TRUE@ $(GMCS_FLAGS) \
+ at ENABLE_SOUNDMENU_TRUE@ $(ASSEMBLY_BUILD_FLAGS) \
+ at ENABLE_SOUNDMENU_TRUE@ -nowarn:0278 -nowarn:0078 $$warn \
+ at ENABLE_SOUNDMENU_TRUE@ -define:HAVE_GTK_2_10 -define:NET_2_0 \
+ at ENABLE_SOUNDMENU_TRUE@ -debug -target:$(TARGET) -out:$@ \
+ at ENABLE_SOUNDMENU_TRUE@ $(BUILD_DEFINES) $(ENABLE_TESTS_FLAG) $(ENABLE_ATK_FLAG) \
+ at ENABLE_SOUNDMENU_TRUE@ $(FILTERED_LINK) $(RESOURCES_BUILD) $(SOURCES_BUILD)
+ at ENABLE_SOUNDMENU_TRUE@ @if [ -e $(srcdir)/$(notdir $@.config) ]; then \
+ at ENABLE_SOUNDMENU_TRUE@ cp $(srcdir)/$(notdir $@.config) $(top_builddir)/bin; \
+ at ENABLE_SOUNDMENU_TRUE@ fi;
+ at ENABLE_SOUNDMENU_TRUE@ @if [ ! -z "$(EXTRA_BUNDLE)" ]; then \
+ at ENABLE_SOUNDMENU_TRUE@ cp $(EXTRA_BUNDLE) $(top_builddir)/bin; \
+ at ENABLE_SOUNDMENU_TRUE@ fi;
+
+ at ENABLE_SOUNDMENU_TRUE@theme-icons: $(THEME_ICONS_SOURCE)
+ at ENABLE_SOUNDMENU_TRUE@ @$(INSTALL_ICONS) -il "$(BUILD_DATA_DIR)" "$(srcdir)" $(THEME_ICONS_RELATIVE)
+
+ at ENABLE_SOUNDMENU_TRUE@install-data-hook: $(THEME_ICONS_SOURCE)
+ at ENABLE_SOUNDMENU_TRUE@ @$(INSTALL_ICONS) -i "$(DESTDIR)$(pkgdatadir)" "$(srcdir)" $(THEME_ICONS_RELATIVE)
+ at ENABLE_SOUNDMENU_TRUE@ $(EXTRA_INSTALL_DATA_HOOK)
+
+ at ENABLE_SOUNDMENU_TRUE@uninstall-hook: $(THEME_ICONS_SOURCE)
+ at ENABLE_SOUNDMENU_TRUE@ @$(INSTALL_ICONS) -u "$(DESTDIR)$(pkgdatadir)" "$(srcdir)" $(THEME_ICONS_RELATIVE)
+ at ENABLE_SOUNDMENU_TRUE@ $(EXTRA_UNINSTALL_HOOK)
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/src/Extensions/Banshee.SqlDebugConsole/Makefile.in b/src/Extensions/Banshee.SqlDebugConsole/Makefile.in
index a337c98..491e098 100644
--- a/src/Extensions/Banshee.SqlDebugConsole/Makefile.in
+++ b/src/Extensions/Banshee.SqlDebugConsole/Makefile.in
@@ -37,14 +37,6 @@ subdir = src/Extensions/Banshee.SqlDebugConsole
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -68,9 +60,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -171,6 +173,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -190,6 +194,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -297,6 +303,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -343,7 +351,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/src/Extensions/Banshee.Torrent/Makefile.in b/src/Extensions/Banshee.Torrent/Makefile.in
index ba32863..2cb9fc3 100644
--- a/src/Extensions/Banshee.Torrent/Makefile.in
+++ b/src/Extensions/Banshee.Torrent/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Extensions/Banshee.Torrent
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -430,6 +437,8 @@ EXTRA_BUNDLE = $(MONOTORRENT_ASSEMBLIES)
@HAVE_MONOTORRENT_DBUS_TRUE at LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
@HAVE_MONOTORRENT_DBUS_TRUE at LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
@HAVE_MONOTORRENT_DBUS_TRUE at LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+ at HAVE_MONOTORRENT_DBUS_TRUE@LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+ at HAVE_MONOTORRENT_DBUS_TRUE@LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
@HAVE_MONOTORRENT_DBUS_TRUE at DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -546,6 +555,7 @@ EXTRA_BUNDLE = $(MONOTORRENT_ASSEMBLIES)
@HAVE_MONOTORRENT_DBUS_TRUE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@HAVE_MONOTORRENT_DBUS_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
+ at HAVE_MONOTORRENT_DBUS_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@HAVE_MONOTORRENT_DBUS_TRUE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@HAVE_MONOTORRENT_DBUS_TRUE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@HAVE_MONOTORRENT_DBUS_TRUE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -559,6 +569,7 @@ EXTRA_BUNDLE = $(MONOTORRENT_ASSEMBLIES)
@HAVE_MONOTORRENT_DBUS_TRUE at REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_MONOTORRENT_DBUS_TRUE at REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_MONOTORRENT_DBUS_TRUE at REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+ at HAVE_MONOTORRENT_DBUS_TRUE@REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
@HAVE_MONOTORRENT_DBUS_TRUE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore.addin.xml b/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore.addin.xml
new file mode 100644
index 0000000..89bd3f5
--- /dev/null
+++ b/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore.addin.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Addin
+ id="Banshee.UbuntuOneMusicStore"
+ version="1.0"
+ compatVersion="1.0"
+ copyright="Copyright 2010 Jo Shields. Licensed under the MIT X11 license."
+ name="Ubuntu One Music Store"
+ category="Online Sources"
+ description="This extension grants access to the Ubuntu One Music Store, powered by 7digital."
+ author="Jo Shields"
+ url="http://one.ubuntu.com/"
+ defaultEnabled="false">
+
+ <Dependencies>
+ <Addin id="Banshee.Services" version="1.0"/>
+ <Addin id="Banshee.ThickClient" version="1.0"/>
+ </Dependencies>
+
+ <Extension path="/Banshee/SourceManager/Source">
+ <Source class="Banshee.UbuntuOneMusicStore.UbuntuOneMusicStoreSource"/>
+ </Extension>
+
+</Addin>
diff --git a/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/Tests/MusicStoreTests.cs b/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/Tests/MusicStoreTests.cs
new file mode 100644
index 0000000..ff2da45
--- /dev/null
+++ b/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/Tests/MusicStoreTests.cs
@@ -0,0 +1,71 @@
+//
+// MusicStoreTests.cs
+//
+// Author:
+// Rodney Dawes <rodney.dawes at canonical.com>
+//
+// Copyright (C) 2010 Canonical, Ltd.
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+#if ENABLE_TESTS
+
+using Gtk;
+using Mono.Addins;
+using NUnit.Framework;
+
+namespace Banshee.UbuntuOneMusicStore
+{
+ [TestFixture]
+ public class MusicStoreTests
+ {
+ [TestFixtureSetUp]
+ public void SetUp ()
+ {
+ Application.Init ();
+ AddinManager.Initialize ();
+ AddinManager.Registry.Update (null);
+ }
+
+ [TestFixtureTearDown]
+ public void TearDown ()
+ {
+ AddinManager.Shutdown ();
+ }
+
+ [Test]
+ public void TestSource ()
+ {
+ var source = new UbuntuOneMusicStoreSource ();
+ Assert.AreEqual (source.Count, 0);
+ }
+
+ [Test]
+ public void TestU1MSUrlLoaded ()
+ {
+ var store = new UbuntuOneMusicStoreSource.StoreWrapper ();
+ Assert.IsNotNull (store);
+ }
+
+ }
+}
+
+#endif
diff --git a/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs b/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs
new file mode 100644
index 0000000..260c384
--- /dev/null
+++ b/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs
@@ -0,0 +1,132 @@
+//
+// UbuntuOneMusicStoreSource.cs
+//
+// Authors:
+// Jo Shields <directhex at apebox.org>
+//
+// Copyright (C) 2010 Jo Shields
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using Mono.Unix;
+using Gdk;
+
+using Hyena;
+
+using Banshee.Collection;
+using Banshee.Gui;
+using Banshee.ServiceStack;
+using Banshee.Sources;
+using Banshee.Sources.Gui;
+
+namespace Banshee.UbuntuOneMusicStore
+{
+ public class UbuntuOneMusicStoreSource : Source
+ {
+ // In the sources TreeView, sets the order value for this source, small on top
+ const int sort_order = 190;
+ CustomView custom_view;
+
+ public UbuntuOneMusicStoreSource () : base (
+ Catalog.GetString ("Ubuntu One Music Store"),
+ Catalog.GetString ("Ubuntu One Music Store"),
+ sort_order, "ubuntu-one-music-store")
+ {
+ Properties.SetString ("Icon.Name", "ubuntuone");
+ }
+
+ // A count of 0 will be hidden in the source TreeView
+ public override int Count {
+ get { return 0; }
+ }
+
+ // Defer any UI creation until it's actually needed.
+ public override void Activate ()
+ {
+ if (custom_view == null) {
+ Properties.Set<ISourceContents> ("Nereid.SourceContents", custom_view = new CustomView ());
+ }
+
+ base.Activate ();
+ Log.Debug ("U1MS: Initialized");
+ }
+
+ public class StoreWrapper: UbuntuOne.U1MusicStore, IDisableKeybindings
+ {
+ string U1LibraryLocation = System.IO.Path.Combine (System.IO.Path.Combine (System.Environment.GetFolderPath (System.Environment.SpecialFolder.Personal), ".ubuntuone"), "Purchased from Ubuntu One");
+
+ public StoreWrapper (): base ()
+ {
+ this.PreviewMp3 += PlayMP3Preview;
+ this.DownloadFinished += AddDownloadToLibrary;
+ this.PlayLibrary += PlayU1MSLibrary;
+ this.UrlLoaded += U1MSUrlLoaded;
+ }
+
+ private void PlayMP3Preview (object Sender, UbuntuOne.PreviewMp3Args a)
+ {
+ Log.Debug ("U1MS: Playing preview: ", a.Url );
+ TrackInfo PreviewTrack = new TrackInfo ();
+ PreviewTrack.TrackTitle = a.Title;
+ PreviewTrack.ArtistName = Catalog.GetString ("Track Preview");
+ PreviewTrack.AlbumTitle = Catalog.GetString ("Ubuntu One Music Store");
+ PreviewTrack.Uri = new SafeUri (a.Url);
+ ServiceManager.PlayerEngine.OpenPlay (PreviewTrack);
+ ServiceManager.PlaybackController.StopWhenFinished = true;
+ }
+
+ private void AddDownloadToLibrary (object Sender, UbuntuOne.DownloadFinishedArgs a)
+ {
+ Log.Debug ("U1MS: Track downloaded: ", a.Path);
+ ServiceManager.Get<Banshee.Library.LibraryImportManager> ().ImportTrack (new SafeUri (a.Path));
+ ServiceManager.Get<Banshee.Library.LibraryImportManager> ().NotifyAllSources ();
+ }
+
+ private void PlayU1MSLibrary (object Sender, UbuntuOne.PlayLibraryArgs a)
+ {
+ Log.Debug ("U1MS: Playing from library: ", a.Path);
+ Log.Debug ("U1MS: U1 library location: ", U1LibraryLocation);
+ int track_id = Banshee.Collection.Database.DatabaseTrackInfo.GetTrackIdForUri (System.IO.Path.Combine (U1LibraryLocation, a.Path));
+ if (track_id > 0)
+ {
+ var track = Banshee.Collection.Database.DatabaseTrackInfo.Provider.FetchSingle (track_id);
+ ServiceManager.PlaybackController.NextSource = ServiceManager.SourceManager.MusicLibrary;
+ ServiceManager.PlayerEngine.OpenPlay (track);
+ }
+ }
+
+ private void U1MSUrlLoaded (object Sender, UbuntuOne.UrlLoadedArgs a)
+ {
+ Log.Debug ("U1MS: Url Loaded: ", a.Url);
+ }
+ }
+
+ private class CustomView : ISourceContents
+ {
+ StoreWrapper store = new StoreWrapper ();
+
+ public bool SetSource (ISource source) { return true; }
+ public void ResetSource () { }
+ public Gtk.Widget Widget { get { return store; } }
+ public ISource Source { get { return null; } }
+ }
+ }
+}
diff --git a/src/Extensions/Banshee.UbuntuOneMusicStore/Makefile.am b/src/Extensions/Banshee.UbuntuOneMusicStore/Makefile.am
new file mode 100644
index 0000000..2873b5b
--- /dev/null
+++ b/src/Extensions/Banshee.UbuntuOneMusicStore/Makefile.am
@@ -0,0 +1,16 @@
+ASSEMBLY = Banshee.UbuntuOneMusicStore
+TARGET = library
+LINK = $(REF_EXTENSION_UBUNTUONEMUSICSTORE)
+INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
+
+SOURCES = \
+ Banshee.UbuntuOneMusicStore/Tests/MusicStoreTests.cs \
+ Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs
+
+RESOURCES = Banshee.UbuntuOneMusicStore.addin.xml
+
+if ENABLE_UBUNTUONE
+include $(top_srcdir)/build/build.mk
+else
+EXTRA_DIST = $(SOURCES) $(RESOURCES)
+endif
diff --git a/src/Extensions/Banshee.UbuntuOneMusicStore/Makefile.in b/src/Extensions/Banshee.UbuntuOneMusicStore/Makefile.in
new file mode 100644
index 0000000..e3d81f2
--- /dev/null
+++ b/src/Extensions/Banshee.UbuntuOneMusicStore/Makefile.in
@@ -0,0 +1,901 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(top_srcdir)/build/build.environment.mk \
+ $(top_srcdir)/build/build.mk \
+ $(top_srcdir)/build/build.rules.mk
+ at ENABLE_TESTS_TRUE@@ENABLE_UBUNTUONE_TRUE at am__append_1 = " $(NUNIT_LIBS)"
+subdir = src/Extensions/Banshee.UbuntuOneMusicStore
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
+ $(top_srcdir)/build/m4/banshee/bnpx11.m4 \
+ $(top_srcdir)/build/m4/banshee/boo.m4 \
+ $(top_srcdir)/build/m4/banshee/daap.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-appledevice.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-ipod.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-karma.m4 \
+ $(top_srcdir)/build/m4/banshee/dap-mtp.m4 \
+ $(top_srcdir)/build/m4/banshee/dbus.m4 \
+ $(top_srcdir)/build/m4/banshee/gio.m4 \
+ $(top_srcdir)/build/m4/banshee/gnome-doc-utils.m4 \
+ $(top_srcdir)/build/m4/banshee/gnome-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/gstreamer.m4 \
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/hal.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/libwebkit.m4 \
+ $(top_srcdir)/build/m4/banshee/meego.m4 \
+ $(top_srcdir)/build/m4/banshee/mono-addins.m4 \
+ $(top_srcdir)/build/m4/banshee/moonlight.m4 \
+ $(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/osx.m4 \
+ $(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
+ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
+ $(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
+ $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(moduledir)"
+SCRIPTS = $(module_SCRIPTS)
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AM_MAKEFLAGS = @AM_MAKEFLAGS@
+API_VERSION = @API_VERSION@
+AR = @AR@
+ASM_VERSION = @ASM_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BANSHEE_DESKTOP_NAME = @BANSHEE_DESKTOP_NAME@
+BNPX_CFLAGS = @BNPX_CFLAGS@
+BNPX_GTK_CFLAGS = @BNPX_GTK_CFLAGS@
+BNPX_GTK_LIBS = @BNPX_GTK_LIBS@
+BNPX_LIBS = @BNPX_LIBS@
+BOO_CFLAGS = @BOO_CFLAGS@
+BOO_LIBS = @BOO_LIBS@
+BUILD_HOST_CPU = @BUILD_HOST_CPU@
+BUILD_HOST_OS = @BUILD_HOST_OS@
+BUILD_TIME = @BUILD_TIME@
+BUILD_VENDOR_ID = @BUILD_VENDOR_ID@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CLUTTER_CFLAGS = @CLUTTER_CFLAGS@
+CLUTTER_LIBS = @CLUTTER_LIBS@
+CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISPLAY_VERSION = @DISPLAY_VERSION@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DOCDIR = @DOCDIR@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+ENABLE_RELEASE = @ENABLE_RELEASE@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FC = @FC@
+FGREP = @FGREP@
+GCONFSHARP_CFLAGS = @GCONFSHARP_CFLAGS@
+GCONFSHARP_LIBS = @GCONFSHARP_LIBS@
+GCONFTOOL = @GCONFTOOL@
+GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+GDATASHARP_CFLAGS = @GDATASHARP_CFLAGS@
+GDATASHARP_LIBS = @GDATASHARP_LIBS@
+GDK_QUARTZ_CFLAGS = @GDK_QUARTZ_CFLAGS@
+GDK_QUARTZ_LIBS = @GDK_QUARTZ_LIBS@
+GDK_X11_CFLAGS = @GDK_X11_CFLAGS@
+GDK_X11_LIBS = @GDK_X11_LIBS@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOSHARP_ASSEMBLIES = @GIOSHARP_ASSEMBLIES@
+GIOSHARP_CFLAGS = @GIOSHARP_CFLAGS@
+GIOSHARP_LIBS = @GIOSHARP_LIBS@
+GKEYFILE_SHARP_CFLAGS = @GKEYFILE_SHARP_CFLAGS@
+GKEYFILE_SHARP_LIBS = @GKEYFILE_SHARP_LIBS@
+GLIBSHARP_2_12_7_CFLAGS = @GLIBSHARP_2_12_7_CFLAGS@
+GLIBSHARP_2_12_7_LIBS = @GLIBSHARP_2_12_7_LIBS@
+GLIBSHARP_CFLAGS = @GLIBSHARP_CFLAGS@
+GLIBSHARP_LIBS = @GLIBSHARP_LIBS@
+GLIB_2_22_CFLAGS = @GLIB_2_22_CFLAGS@
+GLIB_2_22_LIBS = @GLIB_2_22_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GMCS_FLAGS = @GMCS_FLAGS@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GNOME_2_28_CFLAGS = @GNOME_2_28_CFLAGS@
+GNOME_2_28_LIBS = @GNOME_2_28_LIBS@
+GNOME_DOC_UTILS_CFLAGS = @GNOME_DOC_UTILS_CFLAGS@
+GNOME_DOC_UTILS_LIBS = @GNOME_DOC_UTILS_LIBS@
+GOBJECT_QUERY = @GOBJECT_QUERY@
+GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
+GREP = @GREP@
+GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
+GST_CFLAGS = @GST_CFLAGS@
+GST_LIBS = @GST_LIBS@
+GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
+GST_PLUGINS_BASE_LIBS = @GST_PLUGINS_BASE_LIBS@
+GST_SHARP_CFLAGS = @GST_SHARP_CFLAGS@
+GST_SHARP_LIBS = @GST_SHARP_LIBS@
+GTKSHARP_A11Y_CFLAGS = @GTKSHARP_A11Y_CFLAGS@
+GTKSHARP_A11Y_LIBS = @GTKSHARP_A11Y_LIBS@
+GTKSHARP_BEANS_CFLAGS = @GTKSHARP_BEANS_CFLAGS@
+GTKSHARP_BEANS_LIBS = @GTKSHARP_BEANS_LIBS@
+GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@
+GTKSHARP_LIBS = @GTKSHARP_LIBS@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+GUDEV_SHARP_CFLAGS = @GUDEV_SHARP_CFLAGS@
+GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
+HELP_DIR = @HELP_DIR@
+IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
+IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+IPODSHARP_CFLAGS = @IPODSHARP_CFLAGS@
+IPODSHARP_LIBS = @IPODSHARP_LIBS@
+KARMASHARP_ASSEMBLIES = @KARMASHARP_ASSEMBLIES@
+KARMASHARP_CFLAGS = @KARMASHARP_CFLAGS@
+KARMASHARP_LIBS = @KARMASHARP_LIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBBANSHEE_CFLAGS = @LIBBANSHEE_CFLAGS@
+LIBBANSHEE_LIBS = @LIBBANSHEE_LIBS@
+LIBGPODSHARP_ASSEMBLIES = @LIBGPODSHARP_ASSEMBLIES@
+LIBGPODSHARP_CFLAGS = @LIBGPODSHARP_CFLAGS@
+LIBGPODSHARP_LIBS = @LIBGPODSHARP_LIBS@
+LIBMTP_CFLAGS = @LIBMTP_CFLAGS@
+LIBMTP_LIBS = @LIBMTP_LIBS@
+LIBMTP_SO_MAP = @LIBMTP_SO_MAP@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@
+LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@
+LIBTOOL = @LIBTOOL@
+LIBWEBKIT_CFLAGS = @LIBWEBKIT_CFLAGS@
+LIBWEBKIT_LIBS = @LIBWEBKIT_LIBS@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEFLAGS = @MAKEFLAGS@
+MAKEINFO = @MAKEINFO@
+MCS = @MCS@
+MDASSEMBLER = @MDASSEMBLER@
+MEEGO_PANEL_CFLAGS = @MEEGO_PANEL_CFLAGS@
+MEEGO_PANEL_LIBS = @MEEGO_PANEL_LIBS@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MONO = @MONO@
+MONODOCER = @MONODOCER@
+MONOTORRENT_ASSEMBLIES = @MONOTORRENT_ASSEMBLIES@
+MONOTORRENT_DBUS_CFLAGS = @MONOTORRENT_DBUS_CFLAGS@
+MONOTORRENT_DBUS_LIBS = @MONOTORRENT_DBUS_LIBS@
+MONO_2_4_3_CFLAGS = @MONO_2_4_3_CFLAGS@
+MONO_2_4_3_LIBS = @MONO_2_4_3_LIBS@
+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
+MONO_ADDINS_SETUP_CFLAGS = @MONO_ADDINS_SETUP_CFLAGS@
+MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
+MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+MONO_MODULE_LIBS = @MONO_MODULE_LIBS@
+MONO_ZEROCONF_CFLAGS = @MONO_ZEROCONF_CFLAGS@
+MONO_ZEROCONF_LIBS = @MONO_ZEROCONF_LIBS@
+MOONLIGHT_CFLAGS = @MOONLIGHT_CFLAGS@
+MOONLIGHT_LIBS = @MOONLIGHT_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+NDESK_DBUS_GLIB_CFLAGS = @NDESK_DBUS_GLIB_CFLAGS@
+NDESK_DBUS_GLIB_LIBS = @NDESK_DBUS_GLIB_LIBS@
+NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
+NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
+NUNIT_CFLAGS = @NUNIT_CFLAGS@
+NUNIT_LIBS = @NUNIT_LIBS@
+OBJC = @OBJC@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+Q = @Q@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SQLITE_CFLAGS = @SQLITE_CFLAGS@
+SQLITE_LIBS = @SQLITE_LIBS@
+STRIP = @STRIP@
+TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
+TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
+USE_NLS = @USE_NLS@
+V = @V@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
+XVIDMODE_CFLAGS = @XVIDMODE_CFLAGS@
+XVIDMODE_LIBS = @XVIDMODE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+expanded_bindir = @expanded_bindir@
+expanded_datadir = @expanded_datadir@
+expanded_libdir = @expanded_libdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+shavedir = @shavedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+ASSEMBLY = Banshee.UbuntuOneMusicStore
+TARGET = library
+LINK = $(REF_EXTENSION_UBUNTUONEMUSICSTORE) $(am__append_1)
+INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
+SOURCES = \
+ Banshee.UbuntuOneMusicStore/Tests/MusicStoreTests.cs \
+ Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs
+
+RESOURCES = Banshee.UbuntuOneMusicStore.addin.xml
+
+# Initializers
+ at ENABLE_UBUNTUONE_TRUE@MONO_BASE_PATH =
+ at ENABLE_UBUNTUONE_TRUE@MONO_ADDINS_PATH =
+
+# Install Paths
+ at ENABLE_UBUNTUONE_TRUE@DEFAULT_INSTALL_DIR = $(pkglibdir)
+ at ENABLE_UBUNTUONE_TRUE@BACKENDS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Backends
+ at ENABLE_UBUNTUONE_TRUE@EXTENSIONS_INSTALL_DIR = $(DEFAULT_INSTALL_DIR)/Extensions
+
+# External libraries to link against, generated from configure
+ at ENABLE_UBUNTUONE_TRUE@LINK_SYSTEM = -r:System
+ at ENABLE_UBUNTUONE_TRUE@LINK_CAIRO = -r:Mono.Cairo
+ at ENABLE_UBUNTUONE_TRUE@LINK_MONO_POSIX = -r:Mono.Posix
+ at ENABLE_UBUNTUONE_TRUE@LINK_ICSHARP_ZIP_LIB = -r:ICSharpCode.SharpZipLib
+ at ENABLE_UBUNTUONE_TRUE@LINK_MONO_ZEROCONF = $(MONO_ZEROCONF_LIBS)
+ at ENABLE_UBUNTUONE_TRUE@LINK_GLIB = $(GLIBSHARP_LIBS)
+ at ENABLE_UBUNTUONE_TRUE@LINK_GTK = $(GTKSHARP_LIBS)
+ at ENABLE_UBUNTUONE_TRUE@LINK_GCONF = $(GCONFSHARP_LIBS)
+ at ENABLE_UBUNTUONE_TRUE@LINK_GIO = $(GTKSHARP_BEANS_LIBS) $(GIOSHARP_LIBS)
+ at ENABLE_UBUNTUONE_TRUE@LINK_GKEYFILE = $(GKEYFILE_SHARP_LIBS)
+ at ENABLE_UBUNTUONE_TRUE@LINK_GUDEV = $(GUDEV_SHARP_LIBS)
+ at ENABLE_UBUNTUONE_TRUE@LINK_DBUS = $(NDESK_DBUS_LIBS) $(NDESK_DBUS_GLIB_LIBS)
+ at ENABLE_UBUNTUONE_TRUE@LINK_DBUS_NO_GLIB = $(NDESK_DBUS_LIBS)
+ at ENABLE_UBUNTUONE_TRUE@LINK_TAGLIB = $(TAGLIB_SHARP_LIBS)
+ at ENABLE_UBUNTUONE_TRUE@LINK_IPOD = $(IPODSHARP_LIBS)
+ at ENABLE_UBUNTUONE_TRUE@LINK_BOO = $(BOO_LIBS)
+ at ENABLE_UBUNTUONE_TRUE@LINK_GDATA = $(GDATASHARP_LIBS)
+ at ENABLE_UBUNTUONE_TRUE@LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
+ at ENABLE_UBUNTUONE_TRUE@LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
+ at ENABLE_UBUNTUONE_TRUE@LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+ at ENABLE_UBUNTUONE_TRUE@LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+ at ENABLE_UBUNTUONE_TRUE@LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
+ at ENABLE_UBUNTUONE_TRUE@DIR_BIN = $(top_builddir)/bin
+
+# Hyena
+ at ENABLE_UBUNTUONE_TRUE@REF_HYENA = $(LINK_SYSTEM) $(LINK_MONO_POSIX)
+ at ENABLE_UBUNTUONE_TRUE@LINK_HYENA = -r:$(DIR_BIN)/Hyena.dll -r:$(DIR_BIN)/Hyena.Data.Sqlite.dll
+ at ENABLE_UBUNTUONE_TRUE@LINK_HYENA_DEPS = $(REF_HYENA) $(LINK_HYENA)
+
+# Hyena.Gui
+ at ENABLE_UBUNTUONE_TRUE@REF_HYENA_GUI = $(LINK_HYENA_DEPS) $(LINK_MONO_POSIX) $(LINK_CAIRO) $(LINK_GTK)
+ at ENABLE_UBUNTUONE_TRUE@LINK_HYENA_GUI = -r:$(DIR_BIN)/Hyena.Gui.dll
+ at ENABLE_UBUNTUONE_TRUE@LINK_HYENA_GUI_DEPS = $(REF_HYENA_GUI) $(LINK_HYENA_GUI)
+
+# Lastfm
+ at ENABLE_UBUNTUONE_TRUE@REF_LASTFM = $(LINK_SYSTEM) $(LINK_MONO_MEDIA) $(LINK_MONO_POSIX) $(LINK_HYENA) $(LINK_ICSHARP_ZIP_LIB)
+ at ENABLE_UBUNTUONE_TRUE@LINK_LASTFM = -r:$(DIR_BIN)/Lastfm.dll
+ at ENABLE_UBUNTUONE_TRUE@LINK_LASTFM_DEPS = $(REF_LASTFM) $(LINK_LASTFM)
+
+# Lastfm.Gui
+ at ENABLE_UBUNTUONE_TRUE@REF_LASTFM_GUI = $(LINK_GLIB) $(LINK_GTK) $(LINK_LASTFM_DEPS)
+ at ENABLE_UBUNTUONE_TRUE@LINK_LASTFM_GUI = -r:$(DIR_BIN)/Lastfm.Gui.dll
+ at ENABLE_UBUNTUONE_TRUE@LINK_LASTFM_GUI_DEPS = $(REF_LASTFM_GUI) $(LINK_LASTFM_GUI)
+ at ENABLE_UBUNTUONE_TRUE@REF_MIGO = $(LINK_HYENA_DEPS) $(LINK_ICSHARP_ZIP_LIB)
+ at ENABLE_UBUNTUONE_TRUE@LINK_MIGO = -r:$(DIR_BIN)/Migo.dll
+ at ENABLE_UBUNTUONE_TRUE@LINK_MIGO_DEPS = $(REF_MIGO) $(LINK_MIGO)
+
+# Mono.Media
+ at ENABLE_UBUNTUONE_TRUE@REF_MONO_MEDIA = $(LINK_SYSTEM)
+ at ENABLE_UBUNTUONE_TRUE@LINK_MONO_MEDIA = -r:$(DIR_BIN)/Mono.Media.dll
+ at ENABLE_UBUNTUONE_TRUE@LINK_MONO_MEDIA_DEPS = $(REF_MONO_MEDIA) $(LINK_MONO_MEDIA)
+
+# Mtp
+ at ENABLE_UBUNTUONE_TRUE@REF_MTP = $(LINK_SYSTEM) $(LINK_MONO_POSIX)
+ at ENABLE_UBUNTUONE_TRUE@LINK_MTP = -r:$(DIR_BIN)/Mtp.dll
+ at ENABLE_UBUNTUONE_TRUE@LINK_MTP_DEPS = $(REF_MTP) $(LINK_MTP)
+
+# AppleDevice
+ at ENABLE_UBUNTUONE_TRUE@REF_APPLEDEVICE = $(LINK_SYSTEM)
+ at ENABLE_UBUNTUONE_TRUE@LINK_APPLEDEVICE_DEPS = $(REF_APPLEDEVICE) $(LIBGPODSHARP_LIBS)
+
+# Karma
+ at ENABLE_UBUNTUONE_TRUE@REF_KARMA = $(LINK_SYSTEM) $(LINK_MONO_POSIX)
+ at ENABLE_UBUNTUONE_TRUE@LINK_KARMA = $(KARMASHARP_LIBS)
+ at ENABLE_UBUNTUONE_TRUE@LINK_KARMA_DEPS = $(REF_KARMA) $(LINK_KARMA)
+
+# MusicBrainz
+ at ENABLE_UBUNTUONE_TRUE@REF_MUSICBRAINZ = $(LINK_SYSTEM)
+ at ENABLE_UBUNTUONE_TRUE@LINK_MUSICBRAINZ = -r:$(DIR_BIN)/MusicBrainz.dll
+ at ENABLE_UBUNTUONE_TRUE@LINK_MUSICBRAINZ_DEPS = $(REF_MUSICBRAINZ) $(LINK_MUSICBRAINZ)
+
+# Core
+ at ENABLE_UBUNTUONE_TRUE@REF_BANSHEE_CORE = $(LINK_HYENA_DEPS) $(LINK_MONO_POSIX) $(LINK_GLIB) \
+ at ENABLE_UBUNTUONE_TRUE@ $(LINK_DBUS) $(LINK_TAGLIB) $(LINK_MONO_ADDINS_DEPS)
+
+ at ENABLE_UBUNTUONE_TRUE@LINK_BANSHEE_CORE = -r:$(DIR_BIN)/Banshee.Core.dll
+ at ENABLE_UBUNTUONE_TRUE@LINK_BANSHEE_CORE_DEPS = $(REF_BANSHEE_CORE) $(LINK_BANSHEE_CORE)
+ at ENABLE_UBUNTUONE_TRUE@REF_BANSHEE_SERVICES = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_MEDIA_DEPS) $(LINK_LASTFM_DEPS) $(LINK_MUSICBRAINZ_DEPS)
+ at ENABLE_UBUNTUONE_TRUE@LINK_BANSHEE_SERVICES = -r:$(DIR_BIN)/Banshee.Services.dll
+ at ENABLE_UBUNTUONE_TRUE@LINK_BANSHEE_SERVICES_DEPS = $(REF_BANSHEE_SERVICES) $(LINK_BANSHEE_SERVICES)
+ at ENABLE_UBUNTUONE_TRUE@REF_BANSHEE_WIDGETS = $(LINK_MONO_POSIX) $(LINK_HYENA_GUI_DEPS)
+ at ENABLE_UBUNTUONE_TRUE@LINK_BANSHEE_WIDGETS = -r:$(DIR_BIN)/Banshee.Widgets.dll
+ at ENABLE_UBUNTUONE_TRUE@LINK_BANSHEE_WIDGETS_DEPS = $(REF_BANSHEE_WIDGETS) $(LINK_BANSHEE_WIDGETS)
+ at ENABLE_UBUNTUONE_TRUE@REF_BANSHEE_THICKCLIENT = $(LINK_BANSHEE_WIDGETS_DEPS) \
+ at ENABLE_UBUNTUONE_TRUE@ $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_HYENA_GUI_DEPS) $(LINK_MONO_ADDINS_SETUP_DEPS)
+
+ at ENABLE_UBUNTUONE_TRUE@LINK_BANSHEE_THICKCLIENT = -r:$(DIR_BIN)/Banshee.ThickClient.dll
+ at ENABLE_UBUNTUONE_TRUE@LINK_BANSHEE_THICKCLIENT_DEPS = $(REF_BANSHEE_THICKCLIENT) \
+ at ENABLE_UBUNTUONE_TRUE@ $(LINK_BANSHEE_THICKCLIENT)
+
+ at ENABLE_UBUNTUONE_TRUE@REF_BANSHEE_WEBBROWSER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_UBUNTUONE_TRUE@LINK_BANSHEE_WEBBROWSER = -r:$(DIR_BIN)/Banshee.WebBrowser.dll
+ at ENABLE_UBUNTUONE_TRUE@LINK_BANSHEE_WEBBROWSER_DEPS = $(REF_BANSHEE_WEBBROWSER) $(LINK_BANSHEE_WEBBROWSER)
+ at ENABLE_UBUNTUONE_TRUE@REF_NEREID = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_UBUNTUONE_TRUE@LINK_NEREID = -r:$(DIR_BIN)/Nereid.exe $(REF_NEREID)
+ at ENABLE_UBUNTUONE_TRUE@REF_MEEGO = $(LINK_NEREID) $(LINK_EXTENSION_MEEGO)
+ at ENABLE_UBUNTUONE_TRUE@REF_HALIE = $(LINK_BANSHEE_SERVICES_DEPS)
+ at ENABLE_UBUNTUONE_TRUE@REF_BEROE = $(LINK_BANSHEE_SERVICES_DEPS)
+ at ENABLE_UBUNTUONE_TRUE@REF_BOOTER = $(LINK_BANSHEE_SERVICES_DEPS)
+ at ENABLE_UBUNTUONE_TRUE@REF_BANSHEE_COLLECTIONINDEXER = $(LINK_SYSTEM) $(LINK_DBUS_NO_GLIB) $(LINK_MONO_POSIX)
+
+# Dap
+ at ENABLE_UBUNTUONE_TRUE@REF_DAP = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_UBUNTUONE_TRUE@LINK_DAP = -r:$(DIR_BIN)/Banshee.Dap.dll
+ at ENABLE_UBUNTUONE_TRUE@LINK_DAP_DEPS = $(REF_DAP) $(LINK_DAP)
+ at ENABLE_UBUNTUONE_TRUE@REF_DAP_APPLEDEVICE = $(LINK_DAP_DEPS) $(LINK_APPLEDEVICE_DEPS)
+ at ENABLE_UBUNTUONE_TRUE@REF_DAP_MASS_STORAGE = $(LINK_DAP_DEPS)
+ at ENABLE_UBUNTUONE_TRUE@REF_DAP_MTP = $(LINK_DAP_DEPS) $(LINK_MTP_DEPS)
+ at ENABLE_UBUNTUONE_TRUE@REF_DAP_IPOD = $(LINK_DAP_DEPS) $(LINK_IPOD)
+ at ENABLE_UBUNTUONE_TRUE@REF_DAP_KARMA = $(LINK_DAP_DEPS) $(LINK_KARMA_DEPS)
+
+# Extensions
+ at ENABLE_UBUNTUONE_TRUE@LINK_EXTENSION_AMAZONMP3 = -r:$(DIR_BIN)/Banshee.AmazonMp3.exe
+ at ENABLE_UBUNTUONE_TRUE@REF_EXTENSION_AMAZONMP3 = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_UBUNTUONE_TRUE@REF_EXTENSION_AMAZONMP3_STORE = $(LINK_BANSHEE_WEBBROWSER_DEPS) $(LINK_EXTENSION_AMAZONMP3)
+ at ENABLE_UBUNTUONE_TRUE@REF_EXTENSION_AUDIOCD = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS)
+ at ENABLE_UBUNTUONE_TRUE@REF_EXTENSION_BOOSCRIPT = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_BOO)
+ at ENABLE_UBUNTUONE_TRUE@REF_EXTENSION_BPM = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_UBUNTUONE_TRUE@REF_EXTENSION_COVERART = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_UBUNTUONE_TRUE@REF_EXTENSION_DAAP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_ICSHARP_ZIP_LIB) $(LINK_MONO_ZEROCONF)
+ at ENABLE_UBUNTUONE_TRUE@REF_EXTENSION_EMUSIC = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MIGO_DEPS)
+ at ENABLE_UBUNTUONE_TRUE@REF_EXTENSION_FILESYSTEMQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_UBUNTUONE_TRUE@REF_EXTENSION_INTERNETRADIO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_UBUNTUONE_TRUE@REF_EXTENSION_INTERNETARCHIVE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_UBUNTUONE_TRUE@REF_EXTENSION_LIBRARYWATCHER = $(LINK_BANSHEE_SERVICES_DEPS)
+ at ENABLE_UBUNTUONE_TRUE@REF_EXTENSION_MINIMODE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_UBUNTUONE_TRUE@REF_EXTENSION_MEEGO = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_UBUNTUONE_TRUE@LINK_EXTENSION_MEEGO = -r:$(DIR_BIN)/Banshee.MeeGo.dll $(REF_EXTENSION_MEEGO)
+ at ENABLE_UBUNTUONE_TRUE@REF_EXTENSION_MPRIS = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_UBUNTUONE_TRUE@REF_EXTENSION_MULTIMEDIAKEYS = $(LINK_BANSHEE_SERVICES_DEPS)
+ at ENABLE_UBUNTUONE_TRUE@REF_EXTENSION_FIXUP = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MUSICBRAINZ_DEPS) $(LINK_MIGO_DEPS)
+ at ENABLE_UBUNTUONE_TRUE@REF_EXTENSION_NOTIFICATIONAREA = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_UBUNTUONE_TRUE@REF_EXTENSION_PLAYER_MIGRATION = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_UBUNTUONE_TRUE@REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_UBUNTUONE_TRUE@LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
+ at ENABLE_UBUNTUONE_TRUE@LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
+ at ENABLE_UBUNTUONE_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
+
+ at ENABLE_UBUNTUONE_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
+ at ENABLE_UBUNTUONE_TRUE@REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
+ at ENABLE_UBUNTUONE_TRUE@LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
+ at ENABLE_UBUNTUONE_TRUE@REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
+ at ENABLE_UBUNTUONE_TRUE@REF_EXTENSION_NOWPLAYING = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_UBUNTUONE_TRUE@LINK_EXTENSION_NOWPLAYING = -r:$(DIR_BIN)/Banshee.NowPlaying.dll
+ at ENABLE_UBUNTUONE_TRUE@LINK_EXTENSION_NOWPLAYING_DEPS = $(REF_EXTENSION_NOWPLAYING) \
+ at ENABLE_UBUNTUONE_TRUE@ $(LINK_EXTENSION_NOWPLAYING)
+
+ at ENABLE_UBUNTUONE_TRUE@REF_EXTENSION_NOWPLAYING_CLUTTER = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_UBUNTUONE_TRUE@REF_EXTENSION_PODCASTING = $(LINK_MIGO_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_UBUNTUONE_TRUE@REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_UBUNTUONE_TRUE@REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_UBUNTUONE_TRUE@REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+ at ENABLE_UBUNTUONE_TRUE@REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
+ at ENABLE_UBUNTUONE_TRUE@REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
+
+# Backends
+ at ENABLE_UBUNTUONE_TRUE@REF_BACKEND_GIO = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GIO) $(LINK_GUDEV) $(LINK_GKEYFILE)
+ at ENABLE_UBUNTUONE_TRUE@REF_BACKEND_GNOME = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_GCONF)
+ at ENABLE_UBUNTUONE_TRUE@REF_BACKEND_GSTREAMER = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_GLIB)
+ at ENABLE_UBUNTUONE_TRUE@REF_BACKEND_UNIX = $(LINK_BANSHEE_CORE_DEPS) $(LINK_MONO_POSIX)
+ at ENABLE_UBUNTUONE_TRUE@REF_BACKEND_HAL = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_DBUS)
+ at ENABLE_UBUNTUONE_TRUE@REF_BACKEND_OSX = $(LINK_BANSHEE_SERVICES_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
+ at ENABLE_UBUNTUONE_TRUE@REF_BACKEND_BNPX11 = $(LINK_EXTENSION_NOWPLAYING_DEPS)
+
+# Cute hack to replace a space with something
+ at ENABLE_UBUNTUONE_TRUE@colon := :
+ at ENABLE_UBUNTUONE_TRUE@empty :=
+ at ENABLE_UBUNTUONE_TRUE@space := $(empty) $(empty)
+
+# Build path to allow running uninstalled
+ at ENABLE_UBUNTUONE_TRUE@RUN_PATH = $(subst $(space),$(colon), $(MONO_BASE_PATH))
+ at ENABLE_UBUNTUONE_TRUE@UNIQUE_FILTER_PIPE = tr [:space:] \\n | sort | uniq
+ at ENABLE_UBUNTUONE_TRUE@BUILD_DATA_DIR = $(top_builddir)/bin/share/$(PACKAGE)
+ at ENABLE_UBUNTUONE_TRUE@SOURCES_BUILD = $(addprefix $(srcdir)/, \
+ at ENABLE_UBUNTUONE_TRUE@ $(SOURCES)) \
+ at ENABLE_UBUNTUONE_TRUE@ $(top_srcdir)/src/AssemblyInfo.cs
+ at ENABLE_UBUNTUONE_TRUE@RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
+ at ENABLE_UBUNTUONE_TRUE@RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+ at ENABLE_UBUNTUONE_TRUE@ -resource:$(resource),$(notdir $(resource)))
+
+ at ENABLE_UBUNTUONE_TRUE@INSTALL_ICONS = $(top_srcdir)/build/private-icon-theme-installer "$(mkinstalldirs)" "$(INSTALL_DATA)"
+ at ENABLE_UBUNTUONE_TRUE@THEME_ICONS_SOURCE = $(wildcard $(srcdir)/ThemeIcons/*/*/*.png) $(wildcard $(srcdir)/ThemeIcons/scalable/*/*.svg)
+ at ENABLE_UBUNTUONE_TRUE@THEME_ICONS_RELATIVE = $(subst $(srcdir)/ThemeIcons/, , $(THEME_ICONS_SOURCE))
+ at ENABLE_UBUNTUONE_TRUE@ASSEMBLY_EXTENSION = $(strip $(patsubst library, dll, $(TARGET)))
+ at ENABLE_UBUNTUONE_TRUE@ASSEMBLY_FILE = $(top_builddir)/bin/$(ASSEMBLY).$(ASSEMBLY_EXTENSION)
+ at ENABLE_UBUNTUONE_TRUE@INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_DIR)))
+ at ENABLE_TESTS_TRUE@@ENABLE_UBUNTUONE_TRUE at ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
+ at ENABLE_ATK_TRUE@@ENABLE_UBUNTUONE_TRUE at ENABLE_ATK_FLAG = "-define:ENABLE_ATK"
+ at ENABLE_UBUNTUONE_TRUE@FILTERED_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE))
+ at ENABLE_UBUNTUONE_TRUE@DEP_LINK = $(shell echo "$(LINK)" | $(UNIQUE_FILTER_PIPE) | sed s,-r:,,g | grep '$(top_builddir)/bin/')
+ at ENABLE_UBUNTUONE_TRUE@OUTPUT_FILES = \
+ at ENABLE_UBUNTUONE_TRUE@ $(ASSEMBLY_FILE) \
+ at ENABLE_UBUNTUONE_TRUE@ $(ASSEMBLY_FILE).mdb
+
+ at ENABLE_UBUNTUONE_TRUE@moduledir = $(INSTALL_DIR_RESOLVED)
+ at ENABLE_UBUNTUONE_TRUE@module_SCRIPTS = $(OUTPUT_FILES)
+ at ENABLE_UBUNTUONE_FALSE@EXTRA_DIST = $(SOURCES) $(RESOURCES)
+ at ENABLE_UBUNTUONE_TRUE@EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE)
+ at ENABLE_UBUNTUONE_TRUE@CLEANFILES = $(OUTPUT_FILES)
+ at ENABLE_UBUNTUONE_TRUE@DISTCLEANFILES = *.pidb
+ at ENABLE_UBUNTUONE_TRUE@MAINTAINERCLEANFILES = Makefile.in
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/build/build.mk $(top_srcdir)/build/build.environment.mk $(top_srcdir)/build/build.rules.mk $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Extensions/Banshee.UbuntuOneMusicStore/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign src/Extensions/Banshee.UbuntuOneMusicStore/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-moduleSCRIPTS: $(module_SCRIPTS)
+ @$(NORMAL_INSTALL)
+ test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
+ @list='$(module_SCRIPTS)'; test -n "$(moduledir)" || list=; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+ done | \
+ sed -e 'p;s,.*/,,;n' \
+ -e 'h;s|.*|.|' \
+ -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+ if ($$2 == $$4) { files[d] = files[d] " " $$1; \
+ if (++n[d] == $(am__install_max)) { \
+ print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
+ else { print "f", d "/" $$4, $$1 } } \
+ END { for (d in files) print "f", d, files[d] }' | \
+ while read type dir files; do \
+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+ test -z "$$files" || { \
+ echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(moduledir)$$dir'"; \
+ $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(moduledir)$$dir" || exit $$?; \
+ } \
+ ; done
+
+uninstall-moduleSCRIPTS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(module_SCRIPTS)'; test -n "$(moduledir)" || exit 0; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 's,.*/,,;$(transform)'`; \
+ test -n "$$list" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(moduledir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(moduledir)" && rm -f $$files
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile $(SCRIPTS)
+installdirs:
+ for dir in "$(DESTDIR)$(moduledir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+ -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+ -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+ at ENABLE_UBUNTUONE_FALSE@install-data-hook:
+ at ENABLE_UBUNTUONE_FALSE@uninstall-hook:
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-moduleSCRIPTS
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-moduleSCRIPTS
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+.MAKE: install-am install-data-am install-strip uninstall-am
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-data-hook install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-moduleSCRIPTS install-pdf install-pdf-am install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+ ps ps-am uninstall uninstall-am uninstall-hook \
+ uninstall-moduleSCRIPTS
+
+
+ at ENABLE_UBUNTUONE_TRUE@all: $(ASSEMBLY_FILE) theme-icons
+
+ at ENABLE_UBUNTUONE_TRUE@run:
+ at ENABLE_UBUNTUONE_TRUE@ @pushd $(top_builddir); \
+ at ENABLE_UBUNTUONE_TRUE@ make run; \
+ at ENABLE_UBUNTUONE_TRUE@ popd;
+
+ at ENABLE_UBUNTUONE_TRUE@test:
+ at ENABLE_UBUNTUONE_TRUE@ @pushd $(top_builddir)/tests; \
+ at ENABLE_UBUNTUONE_TRUE@ make $(ASSEMBLY); \
+ at ENABLE_UBUNTUONE_TRUE@ popd;
+
+ at ENABLE_UBUNTUONE_TRUE@build-debug:
+ at ENABLE_UBUNTUONE_TRUE@ @echo $(DEP_LINK)
+
+ at ENABLE_UBUNTUONE_TRUE@$(ASSEMBLY_FILE).mdb: $(ASSEMBLY_FILE)
+
+ at ENABLE_UBUNTUONE_TRUE@$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
+ at ENABLE_UBUNTUONE_TRUE@ @mkdir -p $(top_builddir)/bin
+ at ENABLE_UBUNTUONE_TRUE@ @if [ ! "x$(ENABLE_RELEASE)" = "xyes" ]; then \
+ at ENABLE_UBUNTUONE_TRUE@ $(top_srcdir)/build/dll-map-makefile-verifier $(srcdir)/Makefile.am $(srcdir)/$(notdir $@.config) && \
+ at ENABLE_UBUNTUONE_TRUE@ $(MONO) $(top_builddir)/build/dll-map-verifier.exe $(srcdir)/$(notdir $@.config) -iwinmm -ilibbanshee -ilibbnpx11 -ilibc -ilibc.so.6 -iintl -ilibmtp.dll -ilibigemacintegration.dylib -iCFRelease $(SOURCES_BUILD); \
+ at ENABLE_UBUNTUONE_TRUE@ fi;
+ at ENABLE_UBUNTUONE_TRUE@ $(MCS) \
+ at ENABLE_UBUNTUONE_TRUE@ $(GMCS_FLAGS) \
+ at ENABLE_UBUNTUONE_TRUE@ $(ASSEMBLY_BUILD_FLAGS) \
+ at ENABLE_UBUNTUONE_TRUE@ -nowarn:0278 -nowarn:0078 $$warn \
+ at ENABLE_UBUNTUONE_TRUE@ -define:HAVE_GTK_2_10 -define:NET_2_0 \
+ at ENABLE_UBUNTUONE_TRUE@ -debug -target:$(TARGET) -out:$@ \
+ at ENABLE_UBUNTUONE_TRUE@ $(BUILD_DEFINES) $(ENABLE_TESTS_FLAG) $(ENABLE_ATK_FLAG) \
+ at ENABLE_UBUNTUONE_TRUE@ $(FILTERED_LINK) $(RESOURCES_BUILD) $(SOURCES_BUILD)
+ at ENABLE_UBUNTUONE_TRUE@ @if [ -e $(srcdir)/$(notdir $@.config) ]; then \
+ at ENABLE_UBUNTUONE_TRUE@ cp $(srcdir)/$(notdir $@.config) $(top_builddir)/bin; \
+ at ENABLE_UBUNTUONE_TRUE@ fi;
+ at ENABLE_UBUNTUONE_TRUE@ @if [ ! -z "$(EXTRA_BUNDLE)" ]; then \
+ at ENABLE_UBUNTUONE_TRUE@ cp $(EXTRA_BUNDLE) $(top_builddir)/bin; \
+ at ENABLE_UBUNTUONE_TRUE@ fi;
+
+ at ENABLE_UBUNTUONE_TRUE@theme-icons: $(THEME_ICONS_SOURCE)
+ at ENABLE_UBUNTUONE_TRUE@ @$(INSTALL_ICONS) -il "$(BUILD_DATA_DIR)" "$(srcdir)" $(THEME_ICONS_RELATIVE)
+
+ at ENABLE_UBUNTUONE_TRUE@install-data-hook: $(THEME_ICONS_SOURCE)
+ at ENABLE_UBUNTUONE_TRUE@ @$(INSTALL_ICONS) -i "$(DESTDIR)$(pkgdatadir)" "$(srcdir)" $(THEME_ICONS_RELATIVE)
+ at ENABLE_UBUNTUONE_TRUE@ $(EXTRA_INSTALL_DATA_HOOK)
+
+ at ENABLE_UBUNTUONE_TRUE@uninstall-hook: $(THEME_ICONS_SOURCE)
+ at ENABLE_UBUNTUONE_TRUE@ @$(INSTALL_ICONS) -u "$(DESTDIR)$(pkgdatadir)" "$(srcdir)" $(THEME_ICONS_RELATIVE)
+ at ENABLE_UBUNTUONE_TRUE@ $(EXTRA_UNINSTALL_HOOK)
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/src/Extensions/Banshee.Wikipedia/Makefile.in b/src/Extensions/Banshee.Wikipedia/Makefile.in
index 1bee2a1..cdcf74f 100644
--- a/src/Extensions/Banshee.Wikipedia/Makefile.in
+++ b/src/Extensions/Banshee.Wikipedia/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Extensions/Banshee.Wikipedia
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -428,6 +435,8 @@ RESOURCES = Banshee.Wikipedia.addin.xml
@HAVE_LIBWEBKIT_TRUE at LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
@HAVE_LIBWEBKIT_TRUE at LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
@HAVE_LIBWEBKIT_TRUE at LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+ at HAVE_LIBWEBKIT_TRUE@LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+ at HAVE_LIBWEBKIT_TRUE@LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
@HAVE_LIBWEBKIT_TRUE at DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -544,6 +553,7 @@ RESOURCES = Banshee.Wikipedia.addin.xml
@HAVE_LIBWEBKIT_TRUE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@HAVE_LIBWEBKIT_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
+ at HAVE_LIBWEBKIT_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@HAVE_LIBWEBKIT_TRUE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -557,6 +567,7 @@ RESOURCES = Banshee.Wikipedia.addin.xml
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+ at HAVE_LIBWEBKIT_TRUE@REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
@HAVE_LIBWEBKIT_TRUE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Extensions/Banshee.Wikipedia/ThemeIcons/README b/src/Extensions/Banshee.Wikipedia/ThemeIcons/README
deleted file mode 100644
index 4a8e959..0000000
--- a/src/Extensions/Banshee.Wikipedia/ThemeIcons/README
+++ /dev/null
@@ -1,32 +0,0 @@
-*****************************************
-* *
-* Wikipedia icon in Tango style *
-* *
-********************* by mischamajskij **
-
-1) INSTALLATION - USE
-
-This icon is meant as a replacement to the original Wikipedia logo or favicon in Tango style.
-It can be used in websites or apps for links to Wikipedia or in your browser to replace the default favicon.
-
-If you use Firefox you can change the favicons in your bookmarks menu/toolbar using one of the following addons:
-- Favicon Picker 3 (https://addons.mozilla.org/it/firefox/addon/7849)
-- Favicon Picker 2 (https://addons.mozilla.org/it/firefox/addon/3176)
-
-
-2) CREDITS - LICENSE
-
-The white square used as a background comes from some "emblems" icons in the Tango library, which is now public domain
-(http://tango.freedesktop.org/Tango_Desktop_Project).
-The "W" has been drawn from scratch, as the one in the original logo is restricted.
-
-The icons are double licensed: you can choose between a CC-by-sa 3.0 (http://creativecommons.org/licenses/by-sa/3.0/)
-and a GPL 3.0 (http://creativecommons.org/licenses/GPL/3.0/) license, depending on your needs.
-
-
-3) AUTHOR
-
-This icon was drawn on april 2009 by mischamajskij.
-It replaces an older one, previously appeared on deviantArt.
-If you are still looking for a copy of the old icon, or for any other kind of request, please contact me on my DA page
-(http://mischamajskij.deviantart.com/).
\ No newline at end of file
diff --git a/src/Extensions/Banshee.YouTube/Makefile.in b/src/Extensions/Banshee.YouTube/Makefile.in
index 2ad6035..ae6552f 100644
--- a/src/Extensions/Banshee.YouTube/Makefile.in
+++ b/src/Extensions/Banshee.YouTube/Makefile.in
@@ -43,14 +43,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Extensions/Banshee.YouTube
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -74,9 +66,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -200,6 +202,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -219,6 +223,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -326,6 +332,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -372,7 +380,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -433,6 +440,8 @@ RESOURCES = Banshee.YouTube.addin.xml
@HAVE_GDATA_TRUE at LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
@HAVE_GDATA_TRUE at LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
@HAVE_GDATA_TRUE at LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+ at HAVE_GDATA_TRUE@LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+ at HAVE_GDATA_TRUE@LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
@HAVE_GDATA_TRUE at DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -549,6 +558,7 @@ RESOURCES = Banshee.YouTube.addin.xml
@HAVE_GDATA_TRUE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@HAVE_GDATA_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
+ at HAVE_GDATA_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@HAVE_GDATA_TRUE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@HAVE_GDATA_TRUE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@HAVE_GDATA_TRUE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -562,6 +572,7 @@ RESOURCES = Banshee.YouTube.addin.xml
@HAVE_GDATA_TRUE at REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_GDATA_TRUE at REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@HAVE_GDATA_TRUE at REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+ at HAVE_GDATA_TRUE@REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
@HAVE_GDATA_TRUE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Extensions/Makefile.am b/src/Extensions/Makefile.am
index 3ccce53..d0c1509 100644
--- a/src/Extensions/Makefile.am
+++ b/src/Extensions/Makefile.am
@@ -26,9 +26,11 @@ SUBDIRS = \
Banshee.MeeGo \
Banshee.Podcasting \
Banshee.Sample \
+ Banshee.SoundMenu \
Banshee.SqlDebugConsole \
Banshee.Torrent \
Banshee.RemoteAudio \
+ Banshee.UbuntuOneMusicStore \
Banshee.Wikipedia \
Banshee.YouTube
diff --git a/src/Extensions/Makefile.in b/src/Extensions/Makefile.in
index 3e43431..716c24d 100644
--- a/src/Extensions/Makefile.in
+++ b/src/Extensions/Makefile.in
@@ -37,14 +37,6 @@ subdir = src/Extensions
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -68,9 +60,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -212,6 +214,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -231,6 +235,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -338,6 +344,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -384,7 +392,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -429,9 +436,11 @@ SUBDIRS = \
Banshee.MeeGo \
Banshee.Podcasting \
Banshee.Sample \
+ Banshee.SoundMenu \
Banshee.SqlDebugConsole \
Banshee.Torrent \
Banshee.RemoteAudio \
+ Banshee.UbuntuOneMusicStore \
Banshee.Wikipedia \
Banshee.YouTube
diff --git a/src/Hyena/Hyena.Data.Sqlite/Makefile.in b/src/Hyena/Hyena.Data.Sqlite/Makefile.in
index bdd3ce2..b56f17a 100644
--- a/src/Hyena/Hyena.Data.Sqlite/Makefile.in
+++ b/src/Hyena/Hyena.Data.Sqlite/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Hyena/Hyena.Data.Sqlite
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -450,6 +457,8 @@ LINK_GDATA = $(GDATASHARP_LIBS)
LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -566,6 +575,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -579,6 +589,7 @@ REF_EXTENSION_PODCASTING = $(LINK_MIGO_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Hyena/Hyena.Gui/Hyena.Data.Gui/CellContext.cs b/src/Hyena/Hyena.Gui/Hyena.Data.Gui/CellContext.cs
index 3bdb05e..e300c20 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Data.Gui/CellContext.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Data.Gui/CellContext.cs
@@ -41,6 +41,7 @@ namespace Hyena.Data.Gui
public Cairo.Context Context { get; set; }
public Pango.Layout Layout { get; set; }
+ public Pango.FontDescription FontDescription { get; set; }
public Gtk.Widget Widget { get; set; }
public Gtk.StateType State { get; set; }
public Gdk.Drawable Drawable { get; set; }
diff --git a/src/Hyena/Hyena.Gui/Hyena.Data.Gui/DataViewLayoutGrid.cs b/src/Hyena/Hyena.Gui/Hyena.Data.Gui/DataViewLayoutGrid.cs
index ef4b14d..6a310c0 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Data.Gui/DataViewLayoutGrid.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Data.Gui/DataViewLayoutGrid.cs
@@ -38,6 +38,8 @@ namespace Hyena.Data.Gui
public int Rows { get; private set; }
public int Columns { get; private set; }
+ public bool Fill { get; set; }
+
public Func<CanvasItem> ChildAllocator { get; set; }
public event EventHandler<EventArgs<int>> ChildCountChanged;
@@ -96,12 +98,14 @@ namespace Hyena.Data.Gui
int view_row_index = 0;
int view_column_index = 0;
+ int flex_width = Fill ? 0 : (int)Math.Floor (Math.Max (0, child_span_width - ChildSize.Width) / (Columns + 1));
+
// Allocation of the first child in the layout, this
// will change as we iterate the layout children
var child_allocation = new Rect () {
- X = ActualAllocation.X,
+ X = ActualAllocation.X + flex_width,
Y = offset,
- Width = ChildSize.Width,
+ Width = Fill ? child_span_width : ChildSize.Width,
Height = ChildSize.Height
};
@@ -127,7 +131,7 @@ namespace Hyena.Data.Gui
view_column_index = 0;
child_allocation.Y += ChildSize.Height;
- child_allocation.X = ActualAllocation.X;
+ child_allocation.X = ActualAllocation.X + flex_width;
} else {
child_allocation.X += child_span_width;
}
diff --git a/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListViewBase.cs b/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListViewBase.cs
index 60af960..0628520 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListViewBase.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListViewBase.cs
@@ -70,5 +70,6 @@ namespace Hyena.Data.Gui
}
public abstract Pango.Layout PangoLayout { get; }
+ public abstract Pango.FontDescription FontDescription { get; }
}
}
diff --git a/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Rendering.cs b/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Rendering.cs
index 8918e43..78bf70c 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Rendering.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Rendering.cs
@@ -48,7 +48,20 @@ namespace Hyena.Data.Gui
private Pango.Layout pango_layout;
public override Pango.Layout PangoLayout {
- get { return cell_context.Layout; }
+ get {
+ if (pango_layout == null && GdkWindow != null && IsRealized) {
+ using (var cr = Gdk.CairoHelper.Create (GdkWindow)) {
+ pango_layout = CairoExtensions.CreateLayout (this, cr);
+ cell_context.FontDescription = pango_layout.FontDescription;
+ cell_context.Layout = pango_layout;
+ }
+ }
+ return pango_layout;
+ }
+ }
+
+ public override Pango.FontDescription FontDescription {
+ get { return cell_context.FontDescription; }
}
private List<int> selected_rows = new List<int> ();
@@ -90,9 +103,11 @@ namespace Hyena.Data.Gui
Gdk.Drawable drawable = cell_context != null ? cell_context.Drawable : null;
if (pango_layout != null) {
- pango_layout.FontDescription.Dispose ();
+ cell_context.FontDescription.Dispose ();
pango_layout.Dispose ();
pango_layout = null;
+ cell_context.Layout = null;
+ cell_context.FontDescription = null;
}
cell_context = new CellContext ();
@@ -127,12 +142,8 @@ namespace Hyena.Data.Gui
cairo_context = CairoHelper.Create (evnt.Window);
- if (pango_layout == null) {
- pango_layout = CairoExtensions.CreateLayout (this, cairo_context);
- }
-
+ cell_context.Layout = PangoLayout;
cell_context.Context = cairo_context;
- cell_context.Layout = pango_layout;
// FIXME: legacy list foo
if (ViewLayout == null) {
diff --git a/src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/CanvasHost.cs b/src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/CanvasHost.cs
index 6eb7e1e..1c6c22f 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/CanvasHost.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/CanvasHost.cs
@@ -304,6 +304,26 @@ namespace Hyena.Gui.Canvas
}
}
+ Pango.Layout layout;
+ public Pango.Layout PangoLayout {
+ get {
+ if (layout == null) {
+ if (GdkWindow == null || !IsRealized) {
+ return null;
+ }
+
+ using (var cr = Gdk.CairoHelper.Create (GdkWindow)) {
+ layout = CairoExtensions.CreateLayout (this, cr);
+ FontDescription = layout.FontDescription;
+ }
+ }
+
+ return layout;
+ }
+ }
+
+ public Pango.FontDescription FontDescription { get; private set; }
+
public bool Debug {
get { return debug; }
set { debug = value; }
diff --git a/src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/CanvasManager.cs b/src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/CanvasManager.cs
index eac25e5..db6d68f 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/CanvasManager.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/CanvasManager.cs
@@ -30,9 +30,9 @@ namespace Hyena.Gui.Canvas
{
public class CanvasManager
{
- private object host;
+ private ICanvasHost host;
- public CanvasManager (object host)
+ public CanvasManager (ICanvasHost host)
{
this.host = host;
}
@@ -49,7 +49,6 @@ namespace Hyena.Gui.Canvas
public void QueueRender (CanvasItem item, Rect rect)
{
- ICanvasHost host = Host as ICanvasHost;
if (host == null) {
return;
}
@@ -57,7 +56,7 @@ namespace Hyena.Gui.Canvas
host.QueueRender (item, rect);
}
- public object Host {
+ public ICanvasHost Host {
get { return host; }
}
}
diff --git a/src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/ICanvasHost.cs b/src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/ICanvasHost.cs
index 9abc395..25a76bb 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/ICanvasHost.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/ICanvasHost.cs
@@ -35,5 +35,7 @@ namespace Hyena.Gui.Canvas
public interface ICanvasHost
{
void QueueRender (CanvasItem item, Rect rect);
+ Pango.Layout PangoLayout { get; }
+ Pango.FontDescription FontDescription { get; }
}
}
diff --git a/src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/TextBlock.cs b/src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/TextBlock.cs
index d9f81f7..53b77ff 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/TextBlock.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/TextBlock.cs
@@ -29,6 +29,7 @@ using System.Linq;
using Cairo;
using Hyena.Gui;
+using Hyena.Gui.Theming;
namespace Hyena.Gui.Canvas
{
@@ -48,20 +49,8 @@ namespace Hyena.Gui.Canvas
private bool EnsureLayout ()
{
- if (layout != null) {
- return true;
- }
-
- Gtk.Widget widget = Manager == null ? null : Manager.Host as Gtk.Widget;
- if (widget == null || widget.GdkWindow == null || !widget.IsRealized) {
- return false;
- }
-
- using (var cr = Gdk.CairoHelper.Create (widget.GdkWindow)) {
- layout = CairoExtensions.CreateLayout (widget, cr);
- font_desc = layout.FontDescription;
- }
-
+ layout = Manager.Host.PangoLayout;
+ font_desc = Manager.Host.FontDescription;
return layout != null;
}
@@ -75,15 +64,8 @@ namespace Hyena.Gui.Canvas
int text_w, text_h;
- TextWrap wrap = TextWrap;
- layout.Width = wrap == TextWrap.None ? -1 : (int)(Pango.Scale.PangoScale * (available.Width - Margin.X));
- layout.Wrap = GetPangoWrapMode (wrap);
- font_desc.Weight = GetPangoFontWeight (FontWeight);
- layout.SingleParagraphMode = wrap == TextWrap.None;
- layout.Ellipsize = EllipsizeMode;
-
// Update layout
- UpdateLayoutText (GetText ());
+ UpdateLayout (GetText (), available.Width - Margin.X, null, false);
layout.GetPixelSize (out text_w, out text_h);
@@ -93,7 +75,7 @@ namespace Hyena.Gui.Canvas
}
//DesiredSize = new Size (width, text_h);
- var size = new Size (width, text_h);
+ var size = DesiredSize = new Size (width, text_h);
// Hack, as this prevents the TextBlock from
// being flexible in a Vertical StackPanel
@@ -106,18 +88,26 @@ namespace Hyena.Gui.Canvas
return size;
}
- private void UpdateLayoutText (string text)
+ private void UpdateLayout (string text, double width, double? height, bool forceWidth)
{
- if (text == last_text) {
- return;
- }
+ if (text != last_text) {
+ last_formatted_text = GetFormattedText (text) ?? "";
+ last_text = text;
- last_formatted_text = GetFormattedText (text) ?? "";
- last_text = text;
+ if (TextWrap == TextWrap.None && last_formatted_text.IndexOfAny (lfcr) >= 0) {
+ last_formatted_text = last_formatted_text.Replace ("\r\n", "\x20").Replace ('\n', '\x20').Replace ('\r', '\x20');
+ }
+ }
- if (TextWrap == TextWrap.None && last_formatted_text.IndexOfAny (lfcr) >= 0) {
- last_formatted_text = last_formatted_text.Replace ("\r\n", "\x20").Replace ('\n', '\x20').Replace ('\r', '\x20');
+ TextWrap wrap = TextWrap;
+ layout.Width = wrap != TextWrap.None || forceWidth ? (int)(Pango.Scale.PangoScale * width) : -1;
+ layout.Wrap = GetPangoWrapMode (wrap);
+ if (height != null && wrap != TextWrap.None) {
+ layout.SetHeight ((int)(Pango.Scale.PangoScale * height.Value));
}
+ font_desc.Weight = GetPangoFontWeight (FontWeight);
+ layout.SingleParagraphMode = wrap == TextWrap.None;
+ layout.Ellipsize = EllipsizeMode;
if (UseMarkup) {
layout.SetMarkup (last_formatted_text);
@@ -150,16 +140,10 @@ namespace Hyena.Gui.Canvas
return;
}
- //int layout_width = TextWrap == TextWrap.None ? -1 : (int)(Pango.Scale.PangoScale * RenderSize.Width);
- int layout_width = (int)(Pango.Scale.PangoScale * RenderSize.Width);
- if (layout.Width != layout_width) {
- layout.Width = layout_width;
- }
+ UpdateLayout (GetText (), RenderSize.Width, RenderSize.Height, true);
int text_width, text_height;
- if (TextWrap != TextWrap.None) {
- layout.SetHeight ((int)(Pango.Scale.PangoScale * RenderSize.Height));
- }
+
layout.GetPixelSize (out text_width, out text_height);
if (layout.IsEllipsized || text_width > RenderSize.Width || text_height > RenderSize.Height) {
@@ -193,12 +177,16 @@ namespace Hyena.Gui.Canvas
text_alloc = new_alloc;
}
- protected override void ClippedRender (Context cr)
+ protected override void ClippedRender (Hyena.Data.Gui.CellContext context)
{
if (!EnsureLayout ()) {
return;
}
+ var cr = context.Context;
+ Foreground = new Brush (context.Theme.Colors.GetWidgetColor (
+ context.TextAsForeground ? GtkColorClass.Foreground : GtkColorClass.Text, context.State));
+
Brush foreground = Foreground;
if (!foreground.IsValid) {
return;
@@ -215,7 +203,7 @@ namespace Hyena.Gui.Canvas
cr.MoveTo (text_alloc.X, text_alloc.Y);
Foreground.Apply (cr);
- UpdateLayoutText (GetText ());
+ UpdateLayout (GetText (), RenderSize.Width, RenderSize.Height, true);
Pango.CairoHelper.ShowLayout (cr, layout);
cr.Fill ();
diff --git a/src/Hyena/Hyena.Gui/Hyena.Widgets/SimpleTable.cs b/src/Hyena/Hyena.Gui/Hyena.Widgets/SimpleTable.cs
index 15417c7..d628bc6 100644
--- a/src/Hyena/Hyena.Gui/Hyena.Widgets/SimpleTable.cs
+++ b/src/Hyena/Hyena.Gui/Hyena.Widgets/SimpleTable.cs
@@ -39,10 +39,15 @@ namespace Hyena.Widgets
private List<T> items = new List<T> ();
private Dictionary<T, Widget []> item_widgets = new Dictionary<T, Widget []> ();
- public SimpleTable () : base (1, 2, false)
+ public SimpleTable () : this (2) {}
+
+ public SimpleTable (int n_columns) : base (1, (uint)n_columns, false)
{
ColumnSpacing = 5;
RowSpacing = 5;
+
+ XOptions = new AttachOptions [n_columns];
+ YOptions = new AttachOptions [n_columns];
}
public void AddRow (T item, params Widget [] cols)
@@ -50,6 +55,9 @@ namespace Hyena.Widgets
InsertRow (item, (uint)items.Count, cols);
}
+ public AttachOptions [] XOptions { get; private set; }
+ public AttachOptions [] YOptions { get; private set; }
+
public void InsertRow (T item, uint row, params Widget [] cols)
{
if (!added_any) {
@@ -64,7 +72,7 @@ namespace Hyena.Widgets
for (uint x = 0; x < NColumns; x++) {
var widget = item_widgets[items[y]][x];
Remove (widget);
- Attach (widget, x, x + 1, (uint) y + 1, (uint) y + 2);
+ Attach (widget, x, x + 1, (uint) y + 1, (uint) y + 2, XOptions[x], YOptions[y], 0, 0);
}
}
@@ -72,7 +80,7 @@ namespace Hyena.Widgets
item_widgets[item] = cols;
for (uint x = 0; x < NColumns; x++) {
- Attach (cols[x], x, x + 1, row, row + 1);
+ Attach (cols[x], x, x + 1, row, row + 1, XOptions[x], YOptions[row], 0, 0);
}
}
@@ -89,7 +97,7 @@ namespace Hyena.Widgets
for (uint x = 0; x < NColumns; x++) {
var widget = item_widgets[items[y]][x];
Remove (widget);
- Attach (widget, x, x + 1, (uint) y - 1, (uint) y);
+ Attach (widget, x, x + 1, (uint) y - 1, (uint) y, XOptions[x], YOptions[y], 0, 0);
}
}
diff --git a/src/Hyena/Hyena.Gui/Makefile.in b/src/Hyena/Hyena.Gui/Makefile.in
index cfe389c..6e6b5ea 100644
--- a/src/Hyena/Hyena.Gui/Makefile.in
+++ b/src/Hyena/Hyena.Gui/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Hyena/Hyena.Gui
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -561,6 +568,8 @@ LINK_GDATA = $(GDATASHARP_LIBS)
LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -677,6 +686,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -690,6 +700,7 @@ REF_EXTENSION_PODCASTING = $(LINK_MIGO_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Hyena/Hyena/Makefile.in b/src/Hyena/Hyena/Makefile.in
index 34c5147..b67aea3 100644
--- a/src/Hyena/Hyena/Makefile.in
+++ b/src/Hyena/Hyena/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Hyena/Hyena
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -553,6 +560,8 @@ LINK_GDATA = $(GDATASHARP_LIBS)
LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -669,6 +678,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -682,6 +692,7 @@ REF_EXTENSION_PODCASTING = $(LINK_MIGO_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Hyena/Makefile.in b/src/Hyena/Makefile.in
index dbc1dc3..91de1c0 100644
--- a/src/Hyena/Makefile.in
+++ b/src/Hyena/Makefile.in
@@ -38,14 +38,6 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
COPYING NEWS
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -69,9 +61,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -213,6 +215,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -232,6 +236,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -339,6 +345,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -385,7 +393,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/src/Hyena/build/Makefile.in b/src/Hyena/build/Makefile.in
index 1f66610..7311191 100644
--- a/src/Hyena/build/Makefile.in
+++ b/src/Hyena/build/Makefile.in
@@ -39,14 +39,6 @@ subdir = src/Hyena/build
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -70,9 +62,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -237,6 +239,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -256,6 +260,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -363,6 +369,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -409,7 +417,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/src/Hyena/build/m4/Makefile.in b/src/Hyena/build/m4/Makefile.in
index 0f90156..e9ea4f7 100644
--- a/src/Hyena/build/m4/Makefile.in
+++ b/src/Hyena/build/m4/Makefile.in
@@ -37,14 +37,6 @@ subdir = src/Hyena/build/m4
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -68,9 +60,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -172,6 +174,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -191,6 +195,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -298,6 +304,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -344,7 +352,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/src/Hyena/build/pkg-config/Makefile.in b/src/Hyena/build/pkg-config/Makefile.in
index ff93f55..8ce5a14 100644
--- a/src/Hyena/build/pkg-config/Makefile.in
+++ b/src/Hyena/build/pkg-config/Makefile.in
@@ -38,14 +38,6 @@ subdir = src/Hyena/build/pkg-config
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -69,9 +61,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -196,6 +198,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -215,6 +219,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -322,6 +328,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -368,7 +376,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/src/Libraries/Lastfm.Gui/Makefile.in b/src/Libraries/Lastfm.Gui/Makefile.in
index 183ea0d..1c35d83 100644
--- a/src/Libraries/Lastfm.Gui/Makefile.in
+++ b/src/Libraries/Lastfm.Gui/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Libraries/Lastfm.Gui
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -431,6 +438,8 @@ LINK_GDATA = $(GDATASHARP_LIBS)
LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -547,6 +556,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -560,6 +570,7 @@ REF_EXTENSION_PODCASTING = $(LINK_MIGO_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Libraries/Lastfm/Lastfm/LastfmRequest.cs b/src/Libraries/Lastfm/Lastfm/LastfmRequest.cs
index d6ef77c..f298021 100644
--- a/src/Libraries/Lastfm/Lastfm/LastfmRequest.cs
+++ b/src/Libraries/Lastfm/Lastfm/LastfmRequest.cs
@@ -239,7 +239,7 @@ namespace Lastfm
Log.DebugException (e);
response = (HttpWebResponse)e.Response;
}
- return response.GetResponseStream ();
+ return response != null ? response.GetResponseStream () : null;
}
private Stream Post (string uri, string data)
@@ -259,7 +259,7 @@ namespace Lastfm
Log.DebugException (e);
response = (HttpWebResponse)e.Response;
}
- return response.GetResponseStream ();
+ return response != null ? response.GetResponseStream () : null;
}
#endregion
diff --git a/src/Libraries/Lastfm/Makefile.in b/src/Libraries/Lastfm/Makefile.in
index 52ea798..073a664 100644
--- a/src/Libraries/Lastfm/Makefile.in
+++ b/src/Libraries/Lastfm/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Libraries/Lastfm
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -439,6 +446,8 @@ LINK_GDATA = $(GDATASHARP_LIBS)
LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -555,6 +564,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -568,6 +578,7 @@ REF_EXTENSION_PODCASTING = $(LINK_MIGO_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Libraries/Makefile.in b/src/Libraries/Makefile.in
index 4db1daf..3d3b1d2 100644
--- a/src/Libraries/Makefile.in
+++ b/src/Libraries/Makefile.in
@@ -37,14 +37,6 @@ subdir = src/Libraries
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -68,9 +60,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -212,6 +214,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -231,6 +235,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -338,6 +344,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -384,7 +392,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/src/Libraries/Migo/Makefile.in b/src/Libraries/Migo/Makefile.in
index db56e31..cf6dbbf 100644
--- a/src/Libraries/Migo/Makefile.in
+++ b/src/Libraries/Migo/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Libraries/Migo
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -494,6 +501,8 @@ LINK_GDATA = $(GDATASHARP_LIBS)
LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -610,6 +619,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -623,6 +633,7 @@ REF_EXTENSION_PODCASTING = $(LINK_MIGO_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Libraries/Migo/Migo.Syndication/Feed.cs b/src/Libraries/Migo/Migo.Syndication/Feed.cs
index 0a0f38f..827d76d 100644
--- a/src/Libraries/Migo/Migo.Syndication/Feed.cs
+++ b/src/Libraries/Migo/Migo.Syndication/Feed.cs
@@ -77,7 +77,7 @@ namespace Migo.Syndication
}
protected override int ModelVersion {
- get { return 3; }
+ get { return 4; }
}
protected override void MigrateTable (int old_version)
@@ -91,6 +91,10 @@ namespace Migo.Syndication
if (old_version < 3) {
CreateIndex ("PodcastSyndicationsIndex", "IsSubscribed, Title");
}
+
+ if (old_version < 4) {
+ Connection.Execute (String.Format ("UPDATE {0} SET MaxItemCount=0 WHERE MaxItemCount=200", TableName));
+ }
}
}
@@ -129,7 +133,7 @@ namespace Migo.Syndication
private string link;
//private string local_enclosure_path;
private long dbid = -1;
- private long maxItemCount = 200;
+ private long maxItemCount = 0;
private DateTime pubDate;
private FeedSyncSetting syncSetting;
private string title;
@@ -399,6 +403,7 @@ namespace Migo.Syndication
}
if (added_any) {
+ CheckForItemsToArchive ();
Manager.OnFeedsChanged ();
CheckForItemsToDownload ();
}
@@ -556,6 +561,7 @@ namespace Migo.Syndication
public void Save (bool notify)
{
Provider.Save (this);
+ CheckForItemsToArchive ();
if (LastBuildDate > LastAutoDownload) {
CheckForItemsToDownload ();
@@ -566,6 +572,22 @@ namespace Migo.Syndication
}
}
+ private void CheckForItemsToArchive ()
+ {
+ if (MaxItemCount == 0)
+ return;
+
+ int i = 0;
+ foreach (var item in Items) {
+ if (!item.IsRead) {
+ if (i++ >= MaxItemCount) {
+ item.IsRead = true;
+ item.Save (false);
+ }
+ }
+ }
+ }
+
private void CheckForItemsToDownload ()
{
if (LastDownloadError != FeedDownloadError.None || AutoDownload == FeedAutoDownload.None)
diff --git a/src/Libraries/Migo/Migo.Syndication/FeedItem.cs b/src/Libraries/Migo/Migo.Syndication/FeedItem.cs
index b56012a..89f6911 100644
--- a/src/Libraries/Migo/Migo.Syndication/FeedItem.cs
+++ b/src/Libraries/Migo/Migo.Syndication/FeedItem.cs
@@ -232,6 +232,11 @@ namespace Migo.Syndication
public void Save ()
{
+ Save (true);
+ }
+
+ internal void Save (bool notify)
+ {
bool is_new = DbId < 1;
Provider.Save (this);
if (enclosure != null) {
diff --git a/src/Libraries/Migo/Migo.Syndication/FeedManager.cs b/src/Libraries/Migo/Migo.Syndication/FeedManager.cs
index 5724331..ab857cb 100644
--- a/src/Libraries/Migo/Migo.Syndication/FeedManager.cs
+++ b/src/Libraries/Migo/Migo.Syndication/FeedManager.cs
@@ -79,15 +79,20 @@ namespace Migo.Syndication
public Feed CreateFeed (string url, FeedAutoDownload autoDownload)
{
- return CreateFeed (url, null, autoDownload, true);
+ return CreateFeed (url, autoDownload, 0);
}
- public Feed CreateFeed (string url, string title, FeedAutoDownload autoDownload)
+ public Feed CreateFeed (string url, FeedAutoDownload autoDownload, int max_items)
{
- return CreateFeed (url, title, autoDownload, true);
+ return CreateFeed (url, null, autoDownload, max_items, true);
}
- public Feed CreateFeed (string url, string title, FeedAutoDownload autoDownload, bool is_subscribed)
+ public Feed CreateFeed (string url, string title, FeedAutoDownload autoDownload, int max_items)
+ {
+ return CreateFeed (url, title, autoDownload, max_items, true);
+ }
+
+ public Feed CreateFeed (string url, string title, FeedAutoDownload autoDownload, int max_items, bool is_subscribed)
{
Feed feed = null;
url = url.Trim ().TrimEnd ('/');
@@ -96,6 +101,7 @@ namespace Migo.Syndication
feed = new Feed (url, autoDownload);
feed.Title = title;
feed.IsSubscribed = is_subscribed;
+ feed.MaxItemCount = max_items;
feed.Save ();
feed.Update ();
}
diff --git a/src/Libraries/Mono.Media/Makefile.in b/src/Libraries/Mono.Media/Makefile.in
index d486ace..89a9ba4 100644
--- a/src/Libraries/Mono.Media/Makefile.in
+++ b/src/Libraries/Mono.Media/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Libraries/Mono.Media
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -432,6 +439,8 @@ LINK_GDATA = $(GDATASHARP_LIBS)
LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -548,6 +557,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -561,6 +571,7 @@ REF_EXTENSION_PODCASTING = $(LINK_MIGO_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Libraries/Mtp/Makefile.in b/src/Libraries/Mtp/Makefile.in
index 175174a..d560b26 100644
--- a/src/Libraries/Mtp/Makefile.in
+++ b/src/Libraries/Mtp/Makefile.in
@@ -45,14 +45,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Libraries/Mtp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -76,9 +68,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -202,6 +204,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -221,6 +225,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -328,6 +334,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -374,7 +382,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -440,6 +447,8 @@ SOURCES = \
@ENABLE_MTP_TRUE at LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
@ENABLE_MTP_TRUE at LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
@ENABLE_MTP_TRUE at LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+ at ENABLE_MTP_TRUE@LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+ at ENABLE_MTP_TRUE@LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
@ENABLE_MTP_TRUE at DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -556,6 +565,7 @@ SOURCES = \
@ENABLE_MTP_TRUE at LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
@ENABLE_MTP_TRUE@ $(LINK_EXTENSION_PLAYQUEUE)
+ at ENABLE_MTP_TRUE@REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
@ENABLE_MTP_TRUE at REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
@ENABLE_MTP_TRUE at LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
@ENABLE_MTP_TRUE at REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -569,6 +579,7 @@ SOURCES = \
@ENABLE_MTP_TRUE at REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_MTP_TRUE at REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
@ENABLE_MTP_TRUE at REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+ at ENABLE_MTP_TRUE@REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
@ENABLE_MTP_TRUE at REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Libraries/MusicBrainz/Makefile.in b/src/Libraries/MusicBrainz/Makefile.in
index cfdfd2b..3dbce98 100644
--- a/src/Libraries/MusicBrainz/Makefile.in
+++ b/src/Libraries/MusicBrainz/Makefile.in
@@ -42,14 +42,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = src/Libraries/MusicBrainz
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -73,9 +65,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -199,6 +201,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -218,6 +222,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -325,6 +331,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -371,7 +379,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -442,6 +449,8 @@ LINK_GDATA = $(GDATASHARP_LIBS)
LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -558,6 +567,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -571,6 +581,7 @@ REF_EXTENSION_PODCASTING = $(LINK_MIGO_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/src/Makefile.in b/src/Makefile.in
index ee1e296..da26ae9 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -38,14 +38,6 @@ DIST_COMMON = $(srcdir)/AssemblyInfo.cs.in $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -69,9 +61,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -213,6 +215,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -232,6 +236,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -339,6 +345,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -385,7 +393,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/tests/Analyzer/Makefile.in b/tests/Analyzer/Makefile.in
index 02d3924..c9104e7 100644
--- a/tests/Analyzer/Makefile.in
+++ b/tests/Analyzer/Makefile.in
@@ -38,14 +38,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = tests/Analyzer
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -69,9 +61,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -173,6 +175,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -192,6 +196,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -299,6 +305,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -345,7 +353,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -393,6 +400,8 @@ LINK_GDATA = $(GDATASHARP_LIBS)
LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -509,6 +518,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -522,6 +532,7 @@ REF_EXTENSION_PODCASTING = $(LINK_MIGO_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d6bed8e..74e6ec0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -22,6 +22,10 @@ if ENABLE_GIO
TEST_ASSEMBLIES += Banshee.Gio.dll
endif
+if ENABLE_UBUNTUONE
+TEST_ASSEMBLIES += Banshee.UbuntuOneMusicStore.dll
+endif
+
ENV_OPTIONS = TZ=America/Chicago LC_ALL=it_IT LANG=it_IT
NUNIT_CONSOLE = $$(echo $$(which nunit-console2 || which nunit-console))
RUNNER = for asm in $${TEST_ASSEMBLIES}; do echo -e "\033[1mRunning tests on $${asm}...\033[0m"; $(ENV_OPTIONS) $(NUNIT_CONSOLE) -nologo -noshadow $$asm; done
diff --git a/tests/Makefile.in b/tests/Makefile.in
index b4dba35..275d9da 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -36,18 +36,11 @@ host_triplet = @host@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/build/build.environment.mk
@ENABLE_GIO_TRUE@@ENABLE_TESTS_TRUE at am__append_1 = Banshee.Gio.dll
+ at ENABLE_TESTS_TRUE@@ENABLE_UBUNTUONE_TRUE at am__append_2 = Banshee.UbuntuOneMusicStore.dll
subdir = tests
SUBDIRS =
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -71,9 +64,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -214,6 +217,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -233,6 +238,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -340,6 +347,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -386,7 +395,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -434,6 +442,8 @@ LINK_GDATA = $(GDATASHARP_LIBS)
LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -550,6 +560,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -563,6 +574,7 @@ REF_EXTENSION_PODCASTING = $(LINK_MIGO_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
@@ -590,7 +602,7 @@ DIST_SUBDIRS = \
@ENABLE_TESTS_TRUE@ Mono.Media.dll Banshee.Core.dll \
@ENABLE_TESTS_TRUE@ Banshee.Gnome.dll Banshee.Services.dll \
@ENABLE_TESTS_TRUE@ Banshee.Fixup.dll Banshee.Dap.Mtp.dll \
- at ENABLE_TESTS_TRUE@ $(am__append_1)
+ at ENABLE_TESTS_TRUE@ $(am__append_1) $(am__append_2)
@ENABLE_TESTS_TRUE at ENV_OPTIONS = TZ=America/Chicago LC_ALL=it_IT LANG=it_IT
@ENABLE_TESTS_TRUE at NUNIT_CONSOLE = $$(echo $$(which nunit-console2 || which nunit-console))
@ENABLE_TESTS_TRUE at RUNNER = for asm in $${TEST_ASSEMBLIES}; do echo -e "\033[1mRunning tests on $${asm}...\033[0m"; $(ENV_OPTIONS) $(NUNIT_CONSOLE) -nologo -noshadow $$asm; done
diff --git a/tests/Performance/Makefile.in b/tests/Performance/Makefile.in
index 20f5e76..1a3aed8 100644
--- a/tests/Performance/Makefile.in
+++ b/tests/Performance/Makefile.in
@@ -38,14 +38,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
subdir = tests/Performance
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
- $(top_srcdir)/build/m4/shamrock/expansions.m4 \
- $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
- $(top_srcdir)/build/m4/shamrock/i18n.m4 \
- $(top_srcdir)/build/m4/shamrock/mono.m4 \
- $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
- $(top_srcdir)/build/m4/shamrock/nunit.m4 \
- $(top_srcdir)/build/m4/shamrock/programs.m4 \
- $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/build/m4/banshee/bnpx11.m4 \
$(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
@@ -69,9 +61,19 @@ am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \
$(top_srcdir)/build/m4/banshee/notify-sharp.m4 \
$(top_srcdir)/build/m4/banshee/osx.m4 \
$(top_srcdir)/build/m4/banshee/remote-audio.m4 \
+ $(top_srcdir)/build/m4/banshee/soundmenu.m4 \
$(top_srcdir)/build/m4/banshee/taglib.m4 \
$(top_srcdir)/build/m4/banshee/torrent.m4 \
+ $(top_srcdir)/build/m4/banshee/ubuntuonemusicstore.m4 \
$(top_srcdir)/build/m4/banshee/youtube.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+ $(top_srcdir)/build/m4/shamrock/monodoc.m4 \
+ $(top_srcdir)/build/m4/shamrock/nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/programs.m4 \
+ $(top_srcdir)/build/m4/shamrock/util.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -173,6 +175,8 @@ GOBJECT_QUERY = @GOBJECT_QUERY@
GRAPHICS_SUBSYSTEM = @GRAPHICS_SUBSYSTEM@
GREP = @GREP@
GSTREAMER_REQUIRED_VERSION = @GSTREAMER_REQUIRED_VERSION@
+GST_0_10_26_CFLAGS = @GST_0_10_26_CFLAGS@
+GST_0_10_26_LIBS = @GST_0_10_26_LIBS@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
@@ -192,6 +196,8 @@ GUDEV_SHARP_LIBS = @GUDEV_SHARP_LIBS@
HELP_DIR = @HELP_DIR@
IGEMACINTEGRATION_CFLAGS = @IGEMACINTEGRATION_CFLAGS@
IGEMACINTEGRATION_LIBS = @IGEMACINTEGRATION_LIBS@
+INDICATESHARP_CFLAGS = @INDICATESHARP_CFLAGS@
+INDICATESHARP_LIBS = @INDICATESHARP_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -299,6 +305,8 @@ SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+UBUNTUONESHARP_CFLAGS = @UBUNTUONESHARP_CFLAGS@
+UBUNTUONESHARP_LIBS = @UBUNTUONESHARP_LIBS@
USE_NLS = @USE_NLS@
V = @V@
VERSION = @VERSION@
@@ -345,7 +353,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -393,6 +400,8 @@ LINK_GDATA = $(GDATASHARP_LIBS)
LINK_MONOTORRENT_DBUS = $(MONOTORRENT_DBUS_LIBS)
LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
+LINK_INDICATESHARP = $(INDICATESHARP_LIBS)
+LINK_UBUNTUONESHARP = $(UBUNTUONESHARP_LIBS)
DIR_BIN = $(top_builddir)/bin
# Hyena
@@ -509,6 +518,7 @@ LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
$(LINK_EXTENSION_PLAYQUEUE)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
@@ -522,6 +532,7 @@ REF_EXTENSION_PODCASTING = $(LINK_MIGO_DEPS) $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_AUDIOBOOK = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_SAMPLE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
REF_EXTENSION_REMOTE_AUDIO = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_ZEROCONF)
+REF_EXTENSION_UBUNTUONEMUSICSTORE = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_UBUNTUONESHARP)
REF_EXTENSION_WIKIPEDIA = $(LINK_BANSHEE_WEBBROWSER_DEPS)
# Backends
--
banshee
More information about the Pkg-cli-apps-commits
mailing list