[Pkg-cli-apps-commits] r3865 - in /packages/banshee/trunk/debian: changelog patches/06_stable-branch-r3636.patch patches/06_stable-branch-r3644.patch patches/99_autoreconf.patch

Wed Apr 2 09:02:51 UTC 2008

Author: slomo
Date: Wed Apr  2 09:02:49 2008
New Revision: 3865

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=3865
Log:
  debian/patches/06_stable-branch-r3644.patch,
  + Updates swedish translation.

Added:
    packages/banshee/trunk/debian/patches/06_stable-branch-r3644.patch
Removed:
    packages/banshee/trunk/debian/patches/06_stable-branch-r3636.patch
Modified:
    packages/banshee/trunk/debian/changelog
    packages/banshee/trunk/debian/patches/99_autoreconf.patch

Modified: packages/banshee/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/banshee/trunk/debian/changelog?rev=3865&op=diff
==============================================================================

--- packages/banshee/trunk/debian/changelog (original)
+++ packages/banshee/trunk/debian/changelog Wed Apr  2 09:02:49 2008
@@ -1,11 +1,12 @@
 banshee (0.13.2+dfsg-10) unstable; urgency=low
 
   * debian/control,
-    debian/patches/06_stable-branch-r3636.patch,
+    debian/patches/06_stable-branch-r3644.patch,
     debian/patches/99_autoreconf.patch,
     debian/rules:
     + Another update from the stable branch to build against the system's
       notify-sharp and gnome-keyring-sharp instead of the bundled versions.
+    + Updates swedish translation.
 
  -- Sebastian DrÃ¶ge <slomo at debian.org>  Tue, 01 Apr 2008 20:40:37 +0200
 

Added: packages/banshee/trunk/debian/patches/06_stable-branch-r3644.patch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/banshee/trunk/debian/patches/06_stable-branch-r3644.patch?rev=3865&op=file
==============================================================================
--- packages/banshee/trunk/debian/patches/06_stable-branch-r3644.patch (added)
+++ packages/banshee/trunk/debian/patches/06_stable-branch-r3644.patch Wed Apr  2 09:02:49 2008
@@ -1,0 +1,2874 @@
+Index: ChangeLog
+===================================================================
+--- ChangeLog	(Revision 3532)
++++ ChangeLog	(Revision 3644)
+@@ -1,3 +1,38 @@
++2008-04-02  Sebastian DrÃ¶ge  <slomo at circular-chaos.org>
++
++	* src/Extras/Gnome.Keyring/KeyringInfo.cs:
++	* src/Extras/Gnome.Keyring/Makefile.am:
++	* src/Extras/Gnome.Keyring/ResultCode.cs:
++	* src/Extras/Gnome.Keyring/Ring.cs:
++	* src/Extras/Last.FM/Last.FM/Account.cs: Update internal
++	gnome-keyring-sharp to the latest SVN revision. This fixes the
++	Ring.Unlock() method and the usage of gnome-keyring if the environment
++	variables are not set properly.
++
++2008-03-30  Sebastian DrÃ¶ge  <slomo at circular-chaos.org>
++
++	* build/m4/banshee/gnome-keyring-sharp.m4: Fix name of the pkg-config
++	file.
++
++2008-03-30  Sebastian DrÃ¶ge  <slomo at circular-chaos.org>
++
++	* build/Common.Makefile:
++	* build/m4/banshee/gnome-keyring-sharp.m4:
++	* configure.ac:
++	* src/Extras/Gnome.Keyring/Makefile.am: Allow building against an
++	external gnome-keyring-sharp.
++
++2008-03-26  Sebastian DrÃ¶ge  <slomo at circular-chaos.org>
++
++	* build/m4/banshee/notify-sharp.m4:
++	* configure.ac:
++	* src/Core/Banshee.Base/Makefile.am:
++	* src/Plugins/Banshee.Plugins.NotificationAreaIcon/Makefile.am: Allow
++	building against an external notify-sharp if one is found. This is
++	especially important as the next notification-daemon release in a
++	few days changes the DBus API and a newer notify-sharp is required
++	then.
++
+ 2008-03-22  Aaron Bockover  <abock at gnome.org>
+ 
+ 	Fixes BNC #361828 (could not burn audio CD)
+Index: src/Plugins/Banshee.Plugins.NotificationAreaIcon/Makefile.am
+===================================================================
+--- src/Plugins/Banshee.Plugins.NotificationAreaIcon/Makefile.am	(Revision 3532)
++++ src/Plugins/Banshee.Plugins.NotificationAreaIcon/Makefile.am	(Revision 3644)
+@@ -9,6 +9,12 @@
+ 
+ MENU_RESOURCE = NotificationAreaIconMenu.xml
+ 
++if EXTERNAL_NOTIFY_SHARP
++NOTIFY_SHARP_LIBS = $(NOTIFY_SHARP_LIBS)
++else
++NOTIFY_SHARP_LIBS =
++endif
++
+ ASSEMBLY_SOURCES = \
+ 	$(top_srcdir)/src/AssemblyInfo.cs \
+ 	$(srcdir)/NotificationAreaIconPlugin.cs \
+@@ -16,7 +22,7 @@
+ 	$(srcdir)/NotificationArea.cs
+ 
+ $(ASSEMBLY): $(ASSEMBLY_SOURCES) $(MENU_RESOURCE)
+-	$(BUILD_LIB_BANSHEE_CORE) -out:$@ $(LINK_GTK) $(LINK_MONO_UNIX) -resource:$(srcdir)/$(MENU_RESOURCE),$(MENU_RESOURCE) $(ASSEMBLY_SOURCES)
++	$(BUILD_LIB_BANSHEE_CORE) -out:$@ $(LINK_GTK) $(LINK_MONO_UNIX) $(NOTIFY_SHARP_LIBS) -resource:$(srcdir)/$(MENU_RESOURCE),$(MENU_RESOURCE) $(ASSEMBLY_SOURCES)
+ 
+ include $(top_srcdir)/build/gconf-schema-rules
+ 
+Index: src/Extras/Last.FM/Last.FM/Account.cs
+===================================================================
+--- src/Extras/Last.FM/Last.FM/Account.cs	(Revision 3532)
++++ src/Extras/Last.FM/Last.FM/Account.cs	(Revision 3644)
+@@ -70,7 +70,7 @@
+         public static void RequestLoginSync()
+         {
+             try {
+-                Ring.Unlock (Ring.GetDefaultKeyring ());
++                Ring.Unlock (Ring.GetDefaultKeyring (), String.Empty);
+             } catch {}
+ 
+             foreach(ItemData result in Ring.Find(ItemType.NetworkPassword, request_attributes)) {
+@@ -90,7 +90,7 @@
+         public static void CommitLoginSync()
+         {
+             try {
+-                Ring.Unlock (Ring.GetDefaultKeyring ());
++                Ring.Unlock (Ring.GetDefaultKeyring (), String.Empty);
+             } catch {}
+ 
+             Hashtable update_request_attributes = request_attributes.Clone() as Hashtable;
+Index: src/Extras/Gnome.Keyring/KeyringInfo.cs
+===================================================================
+--- src/Extras/Gnome.Keyring/KeyringInfo.cs	(Revision 3532)
++++ src/Extras/Gnome.Keyring/KeyringInfo.cs	(Revision 3644)
+@@ -35,9 +35,11 @@
+ 		DateTime ctime;
+ 		bool lock_on_idle;
+ 		bool locked;
++		string name;
+ 
+-		internal KeyringInfo (bool lock_on_idle, int lock_timeout, DateTime mtime, DateTime ctime, bool locked)
++		internal KeyringInfo (string name, bool lock_on_idle, int lock_timeout, DateTime mtime, DateTime ctime, bool locked)
+ 		{
++			this.name = name;
+ 			this.lock_timeout = lock_timeout;
+ 			this.mtime = mtime;
+ 			this.ctime = ctime;
+@@ -61,14 +63,19 @@
+ 
+ 		public override string ToString ()
+ 		{
+-			return String.Format ("LockOnIdle: {0}\n" +
+-						"Locked: {1}\n" +
+-						"Lock timeout: {2}\n" +
+-						"Creation time: {3}\n" +
+-						"Modification time: {4}\n",
+-						lock_on_idle, locked, lock_timeout, ctime, mtime);
++			return String.Format ("Keyring name: {0}\n" +
++						"Locked: {2}\n" +
++						"LockOnIdle: {1}\n" +
++						"Lock timeout: {3}\n" +
++						"Creation time: {4}\n" +
++						"Modification time: {5}",
++						name, lock_on_idle, locked, lock_timeout, ctime, mtime);
+ 		}
+ 
++		public string Name {
++			get { return name; }
++		}
++
+ 		public bool LockOnIdle {
+ 			get { return lock_on_idle; }
+ 			set { lock_on_idle = value; }
+Index: src/Extras/Gnome.Keyring/Ring.cs
+===================================================================
+--- src/Extras/Gnome.Keyring/Ring.cs	(Revision 3532)
++++ src/Extras/Gnome.Keyring/Ring.cs	(Revision 3644)
+@@ -3,8 +3,10 @@
+ //
+ // Authors:
+ //	Gonzalo Paniagua Javier (gonzalo at ximian.com)
++//	Alp Toker (alp at atoker.com)
+ //
+ // (C) Copyright 2006 Novell, Inc. (http://www.novell.com)
++// (C) Copyright 2007 Alp Toker
+ //
+ 
+ // Permission is hereby granted, free of charge, to any person obtaining
+@@ -36,6 +38,10 @@
+ 
+ using Mono.Unix;
+ 
++#if WITH_DBUS
++using NDesk.DBus;
++#endif
++
+ namespace Gnome.Keyring {
+ 	public class Ring {
+ 		static string appname;
+@@ -77,7 +83,28 @@
+ 
+ 		static Socket Connect ()
+ 		{
+-			string filename = Environment.GetEnvironmentVariable ("GNOME_KEYRING_SOCKET");
++			string filename;
++			Socket sock;
++		 
++			filename = Environment.GetEnvironmentVariable ("GNOME_KEYRING_SOCKET");
++			sock = Connect (filename);
++
++#if WITH_DBUS
++			if (sock == null) {
++				try {
++					filename = Bus.Session.GetObject<IDaemon> ("org.gnome.keyring", new ObjectPath ("/org/gnome/keyring/daemon")).GetSocketPath ();
++				} catch (Exception) {
++					filename = null;
++				}
++				sock = Connect (filename);
++			}
++#endif
++
++			return sock;
++		}
++
++		static Socket Connect (string filename)
++		{
+ 			if (filename == null || filename == "")
+ 				return null;
+ 
+@@ -178,14 +205,22 @@
+ 			SendRequest (req.Stream);
+ 		}
+ 
+-		public static void Unlock (string keyring)
++		public static void Unlock (string keyring, string password)
+ 		{
+ 			if (keyring == null)
+ 				throw new ArgumentNullException ("keyring");
+ 
++			if (password == null)
++				throw new ArgumentNullException ("password");
++
+ 			RequestMessage req = new RequestMessage ();
+-			req.CreateSimpleOperation (Operation.UnlockKeyring, keyring);
+-			SendRequest (req.Stream);
++			req.CreateSimpleOperation (Operation.UnlockKeyring, keyring, password);
++			try {
++				SendRequest (req.Stream);
++			} catch (KeyringException ke) {
++				if (ke.ResultCode != ResultCode.AlreadyUnlocked)
++					throw;
++			}
+ 		}
+ 
+ 		public static void DeleteKeyring (string keyring)
+@@ -417,7 +452,7 @@
+ 			RequestMessage req = new RequestMessage ();
+ 			req.CreateSimpleOperation (Operation.GetKeyringInfo, keyring);
+ 			ResponseMessage resp = SendRequest (req.Stream);
+-			return new KeyringInfo ((resp.GetInt32 () != 0),
++			return new KeyringInfo (keyring, (resp.GetInt32 () != 0),
+ 							resp.GetInt32 (),
+ 							resp.GetDateTime (),
+ 							resp.GetDateTime (),
+@@ -492,5 +527,13 @@
+ 			SendRequest (req.Stream);
+ 		}
+ 	}
++
++#if WITH_DBUS
++	[Interface ("org.gnome.keyring.Daemon")]
++	interface IDaemon
++	{
++		string GetSocketPath ();
++	}
++#endif
+ }
+ 
+Index: src/Extras/Gnome.Keyring/Makefile.am
+===================================================================
+--- src/Extras/Gnome.Keyring/Makefile.am	(Revision 3532)
++++ src/Extras/Gnome.Keyring/Makefile.am	(Revision 3644)
+@@ -3,13 +3,16 @@
+ ASSEMBLY_NAME = Gnome.Keyring
+ ASSEMBLY = $(ASSEMBLY_NAME).dll
+ 
++ASSEMBLY_SOURCES = $(srcdir)/*.cs
++
++if !EXTERNAL_GNOME_KEYRING_SHARP
++
+ gnome_keyringdir= $(pkglibdir)
+ gnome_keyring_SCRIPTS = $(ASSEMBLY) $(ASSEMBLY).mdb
+ 
+-ASSEMBLY_SOURCES = $(srcdir)/*.cs
+-
+ $(ASSEMBLY): $(ASSEMBLY_SOURCES)
+-	$(BUILD_LIB) -out:$@ $(LINK_MONO_UNIX) $(ASSEMBLY_SOURCES)
++	$(BUILD_LIB) -d:WITH_DBUS -out:$@ $(LINK_MONO_UNIX) $(LINK_DBUS) $(ASSEMBLY_SOURCES)
++endif
+ 
+ EXTRA_DIST = $(ASSEMBLY_SOURCES)
+ 
+Index: src/Extras/Gnome.Keyring/ResultCode.cs
+===================================================================
+--- src/Extras/Gnome.Keyring/ResultCode.cs	(Revision 3532)
++++ src/Extras/Gnome.Keyring/ResultCode.cs	(Revision 3644)
+@@ -37,8 +37,7 @@
+ 		BadArguments,
+ 		IOError,
+ 		Cancelled,
+-		AlreadyExists,
+-        NoMatch
++		AlreadyExists
+ 	}
+ }
+ 
+Index: src/Core/Banshee.Base/Makefile.am
+===================================================================
+--- src/Core/Banshee.Base/Makefile.am	(Revision 3532)
++++ src/Core/Banshee.Base/Makefile.am	(Revision 3644)
+@@ -245,9 +245,15 @@
+ 	$(srcdir)/MediaEngine/PlayerEngine.cs \
+ 	$(srcdir)/MediaEngine/IEqualizer.cs
+ 
++if EXTERNAL_NOTIFY_SHARP
++NOTIFICATIONS_SOURCES = 
++NOTIFICATIONS_LIBS = $(NOTIFY_SHARP_LIBS)
++else
+ NOTIFICATIONS_SOURCES = \
+ 	$(srcdir)/Notifications/Notification.cs \
+ 	$(srcdir)/Notifications/Notifications.cs
++NOTIFICATIONS_LIBS =
++endif
+ 
+ HYENA_SOURCES = \
+ 	$(srcdir)/Hyena/IUndoAction.cs \
+@@ -376,7 +382,7 @@
+ Banshee_Base_EXPANDED_RESOURCES_BUILD = $(foreach resource,$(Banshee_Base_EXPANDED_RESOURCES), $(addprefix -resource:,$(resource)),$(notdir $(resource)))
+ 
+ $(ASSEMBLY): $(ASSEMBLY_SOURCES) $(Banshee_Base_EXPANDED_RESOURCES)
+-	$(BUILD_LIB) $(LNB_CSFLAGS) -out:$@ $(LINK_TAGLIB) $(LINK_BANSHEE_WIDGETS) $(LINK_MUSICBRAINZ) $(LINK_LAST_FM) $(LINK_HAL) $(LINK_DBUS) $(LINK_GTK) $(LINK_MONO_UNIX) $(LINK_BOO) $(LINK_BOOBUDDY) -r:System.Data -r:Mono.Data.SqliteClient -r:Mono.Cairo $(Banshee_Base_EXPANDED_RESOURCES_BUILD) $(ASSEMBLY_SOURCES)
++	$(BUILD_LIB) $(LNB_CSFLAGS) -out:$@ $(LINK_TAGLIB) $(LINK_BANSHEE_WIDGETS) $(LINK_MUSICBRAINZ) $(LINK_LAST_FM) $(LINK_HAL) $(LINK_DBUS) $(LINK_GTK) $(LINK_MONO_UNIX) $(LINK_BOO) $(LINK_BOOBUDDY) $(NOTIFICATIONS_LIBS) -r:System.Data -r:Mono.Data.SqliteClient -r:Mono.Cairo $(Banshee_Base_EXPANDED_RESOURCES_BUILD) $(ASSEMBLY_SOURCES)
+ 
+ include $(top_srcdir)/build/gconf-schema-rules
+ 
+Index: build/m4/banshee/notify-sharp.m4
+===================================================================
+--- build/m4/banshee/notify-sharp.m4	(Revision 0)
++++ build/m4/banshee/notify-sharp.m4	(Revision 3644)
+@@ -0,0 +1,16 @@
++AC_DEFUN([BANSHEE_CHECK_NOTIFY_SHARP],
++[
++	AC_ARG_ENABLE(external_notify_sharp, AC_HELP_STRING([--enable-external-notify-sharp], 
++		[Use external Notify# instead of the bundled one]), 
++		enable_external_notify_sharp="yes", enable_external_notify_sharp="no")
++
++	if test "x$enable_external_notify_sharp" = "xyes"; then
++		PKG_CHECK_MODULES(NOTIFY_SHARP, notify-sharp)
++		AC_SUBST(NOTIFY_SHARP_LIBS)
++		AM_CONDITIONAL(EXTERNAL_NOTIFY_SHARP, true)
++	else
++		AC_MSG_RESULT([no])
++		AM_CONDITIONAL(EXTERNAL_NOTIFY_SHARP, false)
++	fi
++])
++
+Index: build/m4/banshee/gnome-keyring-sharp.m4
+===================================================================
+--- build/m4/banshee/gnome-keyring-sharp.m4	(Revision 0)
++++ build/m4/banshee/gnome-keyring-sharp.m4	(Revision 3644)
+@@ -0,0 +1,16 @@
++AC_DEFUN([BANSHEE_CHECK_GNOME_KEYRING_SHARP],
++[
++	AC_ARG_ENABLE(external_gnome_keyring_sharp, AC_HELP_STRING([--enable-external-gnome-keyring-sharp], 
++		[Use external gnome-keyring-sharp instead of the bundled one]), 
++		enable_external_gnome_keyring_sharp="yes", enable_external_gnome_keyring_sharp="no")
++
++	if test "x$enable_external_gnome_keyring_sharp" = "xyes"; then
++		PKG_CHECK_MODULES(GNOME_KEYRING_SHARP, gnome-keyring-sharp-1.0)
++		AC_SUBST(GNOME_KEYRING_SHARP_LIBS)
++		AM_CONDITIONAL(EXTERNAL_GNOME_KEYRING_SHARP, true)
++	else
++		AC_MSG_RESULT([no])
++		AM_CONDITIONAL(EXTERNAL_GNOME_KEYRING_SHARP, false)
++	fi
++])
++
+Index: build/Common.Makefile
+===================================================================
+--- build/Common.Makefile	(Revision 3532)
++++ build/Common.Makefile	(Revision 3644)
+@@ -33,7 +33,12 @@
+ LINK_HAL = -r:$(DIR_HAL)/Hal.dll
+ LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
+ LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
++
++if EXTERNAL_GNOME_KEYRING_SHARP
++LINK_GNOME_KEYRING = $(GNOME_KEYRING_SHARP_LIBS)
++else
+ LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
++endif
+ 
+ if EXTERNAL_NDESK_DBUS
+ LINK_DBUS = $(NDESK_DBUS_LIBS)
+Index: configure.ac
+===================================================================
+--- configure.ac	(Revision 3532)
++++ configure.ac	(Revision 3644)
+@@ -70,6 +70,12 @@
+ dnl External TagLib# libraries (optional)
+ BANSHEE_CHECK_TAGLIB_SHARP
+ 
++dnl External notify-sharp libraries (optional)
++BANSHEE_CHECK_NOTIFY_SHARP
++
++dnl External gnome-keyring-sharp libraries (optional)
++BANSHEE_CHECK_GNOME_KEYRING_SHARP
++
+ dnl Required dependencies (managed/core)
+ BANSHEE_CHECK_GTK_SHARP
+ PKG_CHECK_MODULES(SQLITE, sqlite3 >= 3.2)
+Index: po/ChangeLog
+===================================================================
+--- po/ChangeLog	(Revision 3532)
++++ po/ChangeLog	(Revision 3644)
+@@ -1,3 +1,7 @@
++2008-03-27  Daniel Nylander <po at danielnylander.se>
++
++	* sv.po: Updated Swedish translation.
++
+ 2008-03-22  Wadim Dziedzic  <wadimd at svn.gnome.org>
+ 
+ 	* pl.po: Updated polish translation
+Index: po/sv.po
+===================================================================
+--- po/sv.po	(Revision 3532)
++++ po/sv.po	(Revision 3644)
+@@ -1,6 +1,6 @@
+ # Swedish messages for banshee.
+-# Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+-# Daniel Nylander <po at danielnylander.se>, 2006, 2007.
++# Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# Daniel Nylander <po at danielnylander.se>, 2006, 2007, 2008.
+ # Christian Rose <menthos at menthos.com>, 2005.
+ #
+ # $Id: sv.po,v 1.18 2006/12/26 13:09:56 dnylande Exp $
+@@ -9,8 +9,8 @@
+ msgstr ""
+ "Project-Id-Version: banshee\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2007-06-04 07:40+0200\n"
+-"PO-Revision-Date: 2007-06-04 07:43+0100\n"
++"POT-Creation-Date: 2008-03-27 17:00+0100\n"
++"PO-Revision-Date: 2008-03-27 17:32+0100\n"
+ "Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
+ "Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
+ "MIME-Version: 1.0\n"
+@@ -18,22 +18,6 @@
+ "Content-Transfer-Encoding: 8bit\n"
+ "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+ 
+-#: ../data/audio-profiles/aac.xml.in.h:1
+-msgid "Advanced Audio Coding (AAC)"
+-msgstr "Advanced Audio Coding (AAC)"
+-
+-#: ../data/audio-profiles/aac.xml.in.h:2
+-#: ../data/audio-profiles/mp3-lame.xml.in.h:4
+-#: ../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
+-msgid "Bitrate"
+-msgstr "Bitfrekvens"
+-
+-#: ../data/audio-profiles/aac.xml.in.h:3
+-msgid "Proprietary and standardized format that is superior to MP3, but not as popular."
+-msgstr "ProprietÃ¤rt och standardiserat format som Ã¤r klart bÃ¤ttre Ã¤n MP3 men inte lika populÃ¤rt."
+-
+ #: ../data/audio-profiles/base.xml.in.h:1
+ msgid "Channels"
+ msgstr "Kanaler"
+@@ -62,6 +46,13 @@
+ msgid "Best"
+ msgstr "BÃ¤sta"
+ 
++#: ../data/audio-profiles/mp3-lame.xml.in.h:4
++#: ../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
++msgid "Bitrate"
++msgstr "Bitfrekvens"
++
+ #: ../data/audio-profiles/mp3-lame.xml.in.h:5
+ msgid "Constant Bitrate"
+ msgstr "Konstant bitfrekvens"
+@@ -83,7 +74,7 @@
+ msgstr "Variabel bitfrekvens"
+ 
+ #: ../data/audio-profiles/mp3-lame.xml.in.h:10
+-#: ../data/audio-profiles/wavpack.xml.in.h:9
++#: ../data/audio-profiles/wavpack.xml.in.h:11
+ #: ../data/audio-profiles/wma.xml.in.h:7
+ #: ../data/audio-profiles/vorbis.xml.in.h:5
+ msgid "Worst"
+@@ -98,33 +89,33 @@
+ msgstr "Ett snabbt och effektivt ljudformat med Ã¶ppen kÃ¤llkod som erbjuder icke-fÃ¶rstÃ¶rande och hÃ¶gkvalitativ fÃ¶rstÃ¶rande kodning med stort dynamiskt omfÃ¥ng. "
+ 
+ #: ../data/audio-profiles/wavpack.xml.in.h:4
++msgid "Default"
++msgstr "Standard"
++
++#: ../data/audio-profiles/wavpack.xml.in.h:5
+ msgid "Extra processing"
+ msgstr "Extra behandling"
+ 
+-#: ../data/audio-profiles/wavpack.xml.in.h:5
++#: ../data/audio-profiles/wavpack.xml.in.h:6
++msgid "Highest"
++msgstr "HÃ¶gsta"
++
++#: ../data/audio-profiles/wavpack.xml.in.h:7
+ msgid "Lossy mode"
+ msgstr "FÃ¶rstÃ¶rande"
+ 
+-#: ../data/audio-profiles/wavpack.xml.in.h:6
++#: ../data/audio-profiles/wavpack.xml.in.h:8
+ msgid "Mode"
+ msgstr "LÃ¤ge"
+ 
+-#: ../data/audio-profiles/wavpack.xml.in.h:7
++#: ../data/audio-profiles/wavpack.xml.in.h:9
+ msgid "Store MD5 sum in the file"
+ msgstr "Lagra MD5-kontrollsumma i filen"
+ 
+-#: ../data/audio-profiles/wavpack.xml.in.h:8
++#: ../data/audio-profiles/wavpack.xml.in.h:10
+ msgid "Wavpack"
+ msgstr "Wavpack"
+ 
+-#: ../data/audio-profiles/wav.xml.in.h:1
+-msgid "WAV+PCM is a lossless format that holds uncompressed, raw pulse-code modulated (PCM) audio."
+-msgstr "WAV+PCM Ã¤r ett icke-fÃ¶rstÃ¶rande format som innehÃ¥ller okomprimerat, rÃ¥ pulskodsmodulerat (PCM) ljud."
+-
+-#: ../data/audio-profiles/wav.xml.in.h:2
+-msgid "Waveform PCM"
+-msgstr "Waveform PCM"
+-
+ #: ../data/audio-profiles/wma.xml.in.h:1
+ msgid "A proprietary lossy audio format with high quality output at a lower file size than MP3. A 96 kbps WMA is equivalent to a 128 kbps MP3."
+ msgstr "Ett proprietÃ¤rt fÃ¶rstÃ¶rande ljudformat med hÃ¶gkvalitativ utdata med mindre filstorlek Ã¤n MP3. En 96 kbps WMA motsvarar en 128 kbps MP3."
+@@ -355,7 +346,7 @@
+ msgstr "Ange adressen till filen du vill Ã¶ppna:"
+ 
+ #: ../data/banshee-dialogs.glade.h:48
+-#: ../src/Core/Banshee.Base/ActionManager.cs:154
++#: ../src/Core/Banshee.Base/ActionManager.cs:156
+ msgid "Equalizer"
+ msgstr "Equalizer"
+ 
+@@ -430,9 +421,10 @@
+ 
+ #: ../data/banshee-dialogs.glade.h:66
+ #: ../src/Core/Banshee.Base/Banshee.Cdrom.Gui/RecorderSpeedComboBox.cs:64
+-#: ../src/Core/Banshee.Base/Dap/Dap.cs:658
+-#: ../src/Core/Banshee.Base/Gui/TrackEditor.cs:274
+-#: ../src/Core/Banshee.Base/Gui/TrackEditor.cs:297
++#: ../src/Core/Banshee.Base/Dap/Dap.cs:661
++#: ../src/Core/Banshee.Base/Gui/TrackEditor.cs:302
++#: ../src/Core/Banshee.Base/Gui/TrackEditor.cs:325
++#: ../src/Dap/Banshee.Dap.Ipod/IpodDap.cs:99
+ msgid "Unknown"
+ msgstr "OkÃ¤nd"
+ 
+@@ -478,51 +470,51 @@
+ msgstr "Kunde inte skapa rÃ¶rledning"
+ 
+ #: ../libbanshee/gst-cd-rip-0.10.c:228
+-msgid "Could not initialize cdparanoia"
+-msgstr "Kunde inte initiera cdparanoia"
++msgid "Could not initialize element from cdda URI"
++msgstr "Kunde inte initiera element frÃ¥n cdda-URI"
+ 
+-#: ../libbanshee/gst-cd-rip-0.10.c:239
++#: ../libbanshee/gst-cd-rip-0.10.c:242
+ msgid "Could not create mbtrm plugin"
+ msgstr "Kunde inte skapa mbtrm-insticksmodul"
+ 
+-#: ../libbanshee/gst-cd-rip-0.10.c:251
++#: ../libbanshee/gst-cd-rip-0.10.c:254
+ msgid "Could not create encoder pipeline"
+ msgstr "Kunde inte skapa rÃ¶rledning fÃ¶r kodare"
+ 
+-#: ../libbanshee/gst-cd-rip-0.10.c:257
++#: ../libbanshee/gst-cd-rip-0.10.c:260
+ msgid "Could not create queue plugin"
+ msgstr "Kunde inte skapa kÃ¶insticksmodul"
+ 
+ # Intressant ordval
+-#: ../libbanshee/gst-cd-rip-0.10.c:265
++#: ../libbanshee/gst-cd-rip-0.10.c:268
+ msgid "Could not create GNOME VFS output plugin"
+ msgstr "Kunde inte skapa utmatningsinsticksmodul fÃ¶r GNOME VFS"
+ 
+-#: ../libbanshee/gst-cd-rip-0.10.c:281
+-msgid "Could not link cdparanoiasrc to mbtrm"
+-msgstr "Kunde inte lÃ¤nka cdparanoiasrc till mbtrm"
++#: ../libbanshee/gst-cd-rip-0.10.c:284
++msgid "Could not link cddasrcsrc to mbtrm"
++msgstr "Kunde inte lÃ¤nka cddasrcsrc till mbtrm"
+ 
+-#: ../libbanshee/gst-cd-rip-0.10.c:286
++#: ../libbanshee/gst-cd-rip-0.10.c:289
+ msgid "Could not link mbtrm to queue"
+ msgstr "Kunde inte lÃ¤nka mbtrm till kÃ¶"
+ 
+ # Sink pad?
+-#: ../libbanshee/gst-cd-rip-0.10.c:291
++#: ../libbanshee/gst-cd-rip-0.10.c:294
+ msgid "Could not link queue to encoder"
+ msgstr "Kunde inte lÃ¤nka kÃ¶ till kodare"
+ 
+-#: ../libbanshee/gst-cd-rip-0.10.c:296
++#: ../libbanshee/gst-cd-rip-0.10.c:299
+ msgid "Could not link encoder to gnomevfssink"
+ msgstr "Kunde inte lÃ¤nka kodare till gnomevfssink"
+ 
+-#: ../libbanshee/gst-cd-rip-0.10.c:403
++#: ../libbanshee/gst-cd-rip-0.10.c:409
+ #: ../src/Core/Banshee.Base/BansheeBranding.cs:83
+ #: ../src/Plugins/Banshee.Plugins.MiniMode/minimode.glade.h:3
+ #: ../src/Plugins/Banshee.Plugins.NotificationAreaIcon/NotificationAreaIconPlugin.cs:171
+ msgid "Banshee"
+ msgstr "Banshee"
+ 
+-#: ../libbanshee/gst-cd-rip-0.10.c:429
++#: ../libbanshee/gst-cd-rip-0.10.c:446
+ msgid "Encoding element does not support tagging!"
+ msgstr "Kodningselement har inte stÃ¶d fÃ¶r taggning!"
+ 
+@@ -534,36 +526,36 @@
+ msgid "Could not stat encoded file"
+ msgstr "Kunde inte ta status pÃ¥ kodad fil"
+ 
+-#: ../libbanshee/gst-transcode-0.10.c:258
++#: ../libbanshee/gst-transcode-0.10.c:249
+ msgid "Could not create 'gnomevfssrc' plugin"
+ msgstr "Kunde inte skapa insticksmodulen \"gnomevfssrc\""
+ 
+-#: ../libbanshee/gst-transcode-0.10.c:264
++#: ../libbanshee/gst-transcode-0.10.c:255
+ msgid "Could not create 'decodebin' plugin"
+ msgstr "Kunde inte skapa insticksmodulen \"decodebin\""
+ 
+-#: ../libbanshee/gst-transcode-0.10.c:270
++#: ../libbanshee/gst-transcode-0.10.c:261
+ msgid "Could not create 'gnomevfssink' plugin"
+ msgstr "Kunde inte skapa insticksmodulen \"gnomevfssink\""
+ 
+-#: ../libbanshee/gst-transcode-0.10.c:276
++#: ../libbanshee/gst-transcode-0.10.c:267
+ msgid "Could not create 'sinkben' plugin"
+ msgstr "Kunde inte skapa insticksmodulen \"sinkben\""
+ 
+-#: ../libbanshee/gst-transcode-0.10.c:282
++#: ../libbanshee/gst-transcode-0.10.c:273
+ msgid "Could not create 'audioconvert' plugin"
+ msgstr "Kunde inte skapa insticksmodulen \"audioconvert\""
+ 
+-#: ../libbanshee/gst-transcode-0.10.c:288
++#: ../libbanshee/gst-transcode-0.10.c:279
+ msgid "Could not create encoding pipeline"
+ msgstr "Kunde inte skapa kodningsrÃ¶rledning"
+ 
+ # Sink pad?
+-#: ../libbanshee/gst-transcode-0.10.c:294
++#: ../libbanshee/gst-transcode-0.10.c:285
+ msgid "Could not get sink pad from encoder"
+ msgstr "Kunde inte fÃ¥ sink pad frÃ¥n kodare"
+ 
+-#: ../libbanshee/gst-transcode-0.10.c:377
++#: ../libbanshee/gst-transcode-0.10.c:368
+ msgid "Could not construct pipeline"
+ msgstr "Kunde inte konstruera rÃ¶rledning"
+ 
+@@ -745,7 +737,7 @@
+ #: ../src/Core/Banshee/Banshee.TrackView.Columns/GenreColumn.cs:42
+ #: ../src/Core/Banshee.Base/Banshee.SmartPlaylist/QueryBuilderModel.cs:48
+ #: ../src/Core/Banshee.Base/Banshee.SmartPlaylist/QueryBuilderModel.cs:789
+-#: ../src/Core/Banshee/PlayerInterface.cs:458
++#: ../src/Core/Banshee/PlayerInterface.cs:477
+ msgid "Genre"
+ msgstr "Genre"
+ 
+@@ -759,7 +751,7 @@
+ msgstr "Spelningar"
+ 
+ #: ../src/Core/Banshee/Banshee.TrackView.Columns/RatingColumn.cs:43
+-#: ../src/Core/Banshee.Base/Banshee.SmartPlaylist/QueryBuilderModel.cs:813
++#: ../src/Core/Banshee.Base/Banshee.SmartPlaylist/QueryBuilderModel.cs:814
+ msgid "Rating"
+ msgstr "Betyg"
+ 
+@@ -771,18 +763,18 @@
+ msgstr "Titel"
+ 
+ #: ../src/Core/Banshee/Banshee.TrackView.Columns/TitleColumn.cs:59
+-#: ../src/Plugins/Banshee.Plugins.Radio/CellRendererStation.cs:125
++#: ../src/Plugins/Banshee.Plugins.Radio/CellRendererStation.cs:126
+ msgid "Missing"
+ msgstr "Saknas"
+ 
+ #: ../src/Core/Banshee/Banshee.TrackView.Columns/TitleColumn.cs:65
+-#: ../src/Plugins/Banshee.Plugins.Radio/CellRendererStation.cs:128
++#: ../src/Plugins/Banshee.Plugins.Radio/CellRendererStation.cs:129
+ msgid "No Codec"
+ msgstr "Ingen kodek"
+ 
+ #: ../src/Core/Banshee/Banshee.TrackView.Columns/TitleColumn.cs:68
+-#: ../src/Engines/Banshee.MediaEngine.GStreamer/GstPlayerEngine.cs:219
+-#: ../src/Plugins/Banshee.Plugins.Radio/CellRendererStation.cs:131
++#: ../src/Engines/Banshee.MediaEngine.GStreamer/GstPlayerEngine.cs:229
++#: ../src/Plugins/Banshee.Plugins.Radio/CellRendererStation.cs:132
+ msgid "Unknown Error"
+ msgstr "OkÃ¤nt fel"
+ 
+@@ -805,428 +797,429 @@
+ msgstr "Plats"
+ 
+ #: ../src/Core/Banshee/Banshee.TrackView.Columns/YearColumn.cs:42
+-#: ../src/Core/Banshee.Base/Banshee.SmartPlaylist/QueryBuilderModel.cs:815
+-#: ../src/Core/Banshee/PlayerInterface.cs:459
++#: ../src/Core/Banshee.Base/Banshee.SmartPlaylist/QueryBuilderModel.cs:816
++#: ../src/Core/Banshee.Base/FileNamePattern.cs:121
++#: ../src/Core/Banshee/PlayerInterface.cs:478
+ msgid "Year"
+ msgstr "Ã
r"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:65
++#: ../src/Core/Banshee.Base/ActionManager.cs:67
+ msgid "_Music"
+ msgstr "_Musik"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:68
++#: ../src/Core/Banshee.Base/ActionManager.cs:70
+ msgid "_New Playlist"
+ msgstr "_Ny spellista"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:69
++#: ../src/Core/Banshee.Base/ActionManager.cs:71
+ msgid "Create a new empty playlist"
+ msgstr "Skapa en ny tom spellista"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:72
++#: ../src/Core/Banshee.Base/ActionManager.cs:74
+ msgid "Import _Folder..."
+ msgstr "Importera _mapp..."
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:73
++#: ../src/Core/Banshee.Base/ActionManager.cs:75
+ msgid "Import the contents of an entire folder"
+ msgstr "Importera innehÃ¥llet av en hel mapp"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:76
++#: ../src/Core/Banshee.Base/ActionManager.cs:78
+ msgid "Import Files..."
+ msgstr "Importera filer..."
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:77
++#: ../src/Core/Banshee.Base/ActionManager.cs:79
+ msgid "Import files inside a folder"
+ msgstr "Importera filer inne i en mapp"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:80
++#: ../src/Core/Banshee.Base/ActionManager.cs:82
+ msgid "Import _Music..."
+ msgstr "Importera _musik..."
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:81
++#: ../src/Core/Banshee.Base/ActionManager.cs:83
+ msgid "Import music from a variety of sources"
+ msgstr "Importera musik frÃ¥n ett antal kÃ¤llor"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:84
++#: ../src/Core/Banshee.Base/ActionManager.cs:86
+ msgid "Open _Location..."
+ msgstr "Ã–ppna _plats..."
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:85
++#: ../src/Core/Banshee.Base/ActionManager.cs:87
+ msgid "Open a remote location for playback"
+ msgstr "Ã–ppna en fjÃ¤rrplats fÃ¶r uppspelning"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:88
++#: ../src/Core/Banshee.Base/ActionManager.cs:90
+ msgid "Write CD"
+ msgstr "Skriv cd"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:89
++#: ../src/Core/Banshee.Base/ActionManager.cs:91
+ msgid "Write selection to audio CD"
+ msgstr "Skriv markering till ljud-cd"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:92
++#: ../src/Core/Banshee.Base/ActionManager.cs:94
+ msgid "Import Source"
+ msgstr "Importera kÃ¤lla"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:93
++#: ../src/Core/Banshee.Base/ActionManager.cs:95
+ msgid "Import source to library"
+ msgstr "Importera kÃ¤lla till bibliotek"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:100
++#: ../src/Core/Banshee.Base/ActionManager.cs:102
+ msgid "User Scripts"
+ msgstr "AnvÃ¤ndarskript"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:101
++#: ../src/Core/Banshee.Base/ActionManager.cs:103
+ msgid "Run available user scripts"
+ msgstr "KÃ¶r tillgÃ¤ngliga anvÃ¤ndarskript"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:104
++#: ../src/Core/Banshee.Base/ActionManager.cs:106
+ msgid "_Quit"
+ msgstr "_Avsluta"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:105
++#: ../src/Core/Banshee.Base/ActionManager.cs:107
+ msgid "Quit Banshee"
+ msgstr "Avsluta Banshee"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:108
++#: ../src/Core/Banshee.Base/ActionManager.cs:110
+ msgid "_Edit"
+ msgstr "_Redigera"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:119
++#: ../src/Core/Banshee.Base/ActionManager.cs:121
+ msgid "Select _All"
+ msgstr "Markera _alla"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:120
++#: ../src/Core/Banshee.Base/ActionManager.cs:122
+ msgid "Select all songs in song list"
+ msgstr "Markera alla lÃ¥tar i lÃ¥tlista"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:123
++#: ../src/Core/Banshee.Base/ActionManager.cs:125
+ msgid "Select _None"
+ msgstr "Markera _ingen"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:124
++#: ../src/Core/Banshee.Base/ActionManager.cs:126
+ msgid "Unselect all songs in song list"
+ msgstr "Avmarkera alla lÃ¥tar i lÃ¥tlista"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:127
++#: ../src/Core/Banshee.Base/ActionManager.cs:129
+ msgid "_Jump to playing song"
+ msgstr "_Hoppa till uppspelad lÃ¥t"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:131
++#: ../src/Core/Banshee.Base/ActionManager.cs:133
+ msgid "Plu_gins..."
+ msgstr "Insticks_moduler..."
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:132
++#: ../src/Core/Banshee.Base/ActionManager.cs:134
+ msgid "Configure Banshee plugins"
+ msgstr "Konfigurera insticksmoduler fÃ¶r Banshee"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:137
++#: ../src/Core/Banshee.Base/ActionManager.cs:139
+ msgid "_Tools"
+ msgstr "_Verktyg"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:140
++#: ../src/Core/Banshee.Base/ActionManager.cs:142
+ msgid "_View"
+ msgstr "_Visa"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:143
++#: ../src/Core/Banshee.Base/ActionManager.cs:145
+ msgid "_Columns..."
+ msgstr "_Kolumner..."
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:144
++#: ../src/Core/Banshee.Base/ActionManager.cs:146
+ msgid "Select which columns to display in the song list"
+ msgstr "VÃ¤lj vilka kolumner att visa i lÃ¥tlistan"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:147
++#: ../src/Core/Banshee.Base/ActionManager.cs:149
+ msgid "_Boo Buddy..."
+ msgstr "_Boo Buddy..."
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:148
++#: ../src/Core/Banshee.Base/ActionManager.cs:150
+ msgid "Open Boo Buddy"
+ msgstr "Ã–ppna Boo Buddy"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:155
++#: ../src/Core/Banshee.Base/ActionManager.cs:157
+ msgid "Display the equalizer."
+ msgstr "Visa equalizern."
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:158
++#: ../src/Core/Banshee.Base/ActionManager.cs:160
+ msgid "_Logged Events Viewer..."
+ msgstr "Visare fÃ¶r _loggade hÃ¤ndelser..."
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:159
++#: ../src/Core/Banshee.Base/ActionManager.cs:161
+ msgid "View a detailed log of events"
+ msgstr "Visa en detaljerad hÃ¤ndelselogg"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:162
++#: ../src/Core/Banshee.Base/ActionManager.cs:164
+ msgid "_Help"
+ msgstr "_HjÃ¤lp"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:165
++#: ../src/Core/Banshee.Base/ActionManager.cs:167
+ msgid "_Version Information..."
+ msgstr "_Versionsinformation..."
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:166
++#: ../src/Core/Banshee.Base/ActionManager.cs:168
+ msgid "View detailed version and configuration information"
+ msgstr "Visa detaljerad versions- och konfigurationsinformation"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:169
++#: ../src/Core/Banshee.Base/ActionManager.cs:171
+ msgid "_Web Resources"
+ msgstr "_Webbresurser"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:172
++#: ../src/Core/Banshee.Base/ActionManager.cs:174
+ msgid "Banshee _User Guide (Wiki)"
+ msgstr "Banshees an_vÃ¤ndarguide (Wiki)"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:173
++#: ../src/Core/Banshee.Base/ActionManager.cs:175
+ msgid "Learn about how to use Banshee"
+ msgstr "LÃ¤r dig mer om hur du anvÃ¤nder Banshee"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:178
++#: ../src/Core/Banshee.Base/ActionManager.cs:180
+ msgid "Banshee _Home Page"
+ msgstr "Banshees _hemsida"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:179
++#: ../src/Core/Banshee.Base/ActionManager.cs:181
+ msgid "Visit the Banshee Home Page"
+ msgstr "BesÃ¶k Banshees hemsida"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:184
++#: ../src/Core/Banshee.Base/ActionManager.cs:186
+ msgid "_Get Involved"
+ msgstr "Bli inv_olverad"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:185
++#: ../src/Core/Banshee.Base/ActionManager.cs:187
+ msgid "Become a contributor to Banshee"
+ msgstr "Bli en bidragsgivare till Banshee"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:192
++#: ../src/Core/Banshee.Base/ActionManager.cs:194
+ msgid "_Playback"
+ msgstr "_Uppspelning"
+ 
+ #. Translators: Source being the generic word for playlist, device, library, etc
+-#: ../src/Core/Banshee.Base/ActionManager.cs:195
++#: ../src/Core/Banshee.Base/ActionManager.cs:197
+ #: ../src/Core/Banshee.Base/Gui/SourceView.cs:105
+-#: ../src/Core/Banshee.Base/Source.cs:321
++#: ../src/Core/Banshee.Base/Source.cs:323
+ msgid "Source"
+ msgstr "KÃ¤lla"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:198
++#: ../src/Core/Banshee.Base/ActionManager.cs:200
+ msgid "Song Menu"
+ msgstr "LÃ¥tmeny"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:201
++#: ../src/Core/Banshee.Base/ActionManager.cs:203
+ msgid "_Debug"
+ msgstr "_FelsÃ¶kning"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:204
++#: ../src/Core/Banshee.Base/ActionManager.cs:206
+ msgid "Import Playlist..."
+ msgstr "Importera spellista..."
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:205
++#: ../src/Core/Banshee.Base/ActionManager.cs:207
+ msgid "Import a playlist"
+ msgstr "Importera en spellista"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:208
++#: ../src/Core/Banshee.Base/ActionManager.cs:210
+ msgid "Export Playlist..."
+ msgstr "Exportera spellista..."
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:209
++#: ../src/Core/Banshee.Base/ActionManager.cs:211
+ msgid "Export a playlist"
+ msgstr "Exportera en spellista"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:214
++#: ../src/Core/Banshee.Base/ActionManager.cs:216
+ msgid "_Fullscreen"
+ msgstr "H_elskÃ¤rm"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:215
++#: ../src/Core/Banshee.Base/ActionManager.cs:217
+ msgid "Toggle Fullscreen Mode"
+ msgstr "VÃ¤xla helskÃ¤rmslÃ¤ge"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:218
++#: ../src/Core/Banshee.Base/ActionManager.cs:220
+ msgid "Show Cover _Art"
+ msgstr "Visa oms_lagsbild"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:219
++#: ../src/Core/Banshee.Base/ActionManager.cs:221
+ msgid "Toggle display of album cover art"
+ msgstr "VÃ¤xla visning av albumets omslagsbild"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:230
++#: ../src/Core/Banshee.Base/ActionManager.cs:232
+ msgid "_Copy"
+ msgstr "_Kopiera"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:231
++#: ../src/Core/Banshee.Base/ActionManager.cs:233
+ msgid "Copy selected song(s) to clipboard"
+ msgstr "Kopiera markerade lÃ¥t(ar) till urklipp"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:234
++#: ../src/Core/Banshee.Base/ActionManager.cs:236
+ msgid "_Remove"
+ msgstr "_Ta bort"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:235
++#: ../src/Core/Banshee.Base/ActionManager.cs:237
+ msgid "Remove selected song(s) from library"
+ msgstr "Ta bort markerad(e) lÃ¥t(ar) frÃ¥n bibliotek"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:238
++#: ../src/Core/Banshee.Base/ActionManager.cs:240
+ msgid "_Delete From Drive"
+ msgstr "Ta _bort frÃ¥n enhet"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:239
++#: ../src/Core/Banshee.Base/ActionManager.cs:241
+ msgid "Permanently delete selected song(s) from storage medium"
+ msgstr "Ta permanent bort markerade lÃ¥t(ar) frÃ¥n lagringsmedium"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:242
++#: ../src/Core/Banshee.Base/ActionManager.cs:244
+ msgid "_Edit Song Metadata"
+ msgstr "R_edigera lÃ¥tens metadata"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:243
++#: ../src/Core/Banshee.Base/ActionManager.cs:245
+ msgid "Edit metadata on selected songs"
+ msgstr "Redigera metadata fÃ¶r de markerade lÃ¥tarna"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:246
++#: ../src/Core/Banshee.Base/ActionManager.cs:248
+ msgid "_Search for Songs"
+ msgstr "_SÃ¶k efter lÃ¥tar"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:247
++#: ../src/Core/Banshee.Base/ActionManager.cs:249
+ msgid "Search for songs matching certain criteria"
+ msgstr "SÃ¶k efter lÃ¥tar som matchar vissa kriterium"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:250
++#: ../src/Core/Banshee.Base/ActionManager.cs:252
+ msgid "By Matching _Album"
+ msgstr "Efter matchande _album"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:251
++#: ../src/Core/Banshee.Base/ActionManager.cs:253
+ msgid "Search all songs of this album"
+ msgstr "SÃ¶k efter alla lÃ¥tar i detta album"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:254
++#: ../src/Core/Banshee.Base/ActionManager.cs:256
+ msgid "By Matching A_rtist"
+ msgstr "Efter matchande a_rtist"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:255
++#: ../src/Core/Banshee.Base/ActionManager.cs:257
+ msgid "Search all songs of this artist"
+ msgstr "SÃ¶k efter alla lÃ¥tar av denna artist"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:258
++#: ../src/Core/Banshee.Base/ActionManager.cs:260
+ msgid "By Matching _Genre"
+ msgstr "Efter matchande _genre"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:259
++#: ../src/Core/Banshee.Base/ActionManager.cs:261
+ msgid "Search all songs of this genre"
+ msgstr "SÃ¶k efter alla lÃ¥tar i denna genre"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:262
++#: ../src/Core/Banshee.Base/ActionManager.cs:264
+ msgid "Add _to Playlist"
+ msgstr "LÃ¤gg _till i spellista"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:263
++#: ../src/Core/Banshee.Base/ActionManager.cs:265
+ msgid "Append selected songs to playlist or create new playlist from selection"
+ msgstr "LÃ¤gg till de markerade lÃ¥tarna till spellistan eller skapa en ny spellista frÃ¥n markering"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:272
++#: ../src/Core/Banshee.Base/ActionManager.cs:274
+ msgid "Import CD"
+ msgstr "Importera cd"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:273
++#: ../src/Core/Banshee.Base/ActionManager.cs:275
+ msgid "Import audio CD to library"
+ msgstr "Importera ljud-cd till bibliotek"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:282
++#: ../src/Core/Banshee.Base/ActionManager.cs:284
+ msgid "_Play"
+ msgstr "_Spela"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:283
++#: ../src/Core/Banshee.Base/ActionManager.cs:285
+ msgid "Play or pause the current song"
+ msgstr "Spela upp eller pausa den aktuella lÃ¥ten"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:286
++#: ../src/Core/Banshee.Base/ActionManager.cs:288
+ msgid "_Next"
+ msgstr "_NÃ¤sta"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:287
++#: ../src/Core/Banshee.Base/ActionManager.cs:289
+ msgid "Play the next song"
+ msgstr "Spela upp nÃ¤sta lÃ¥t"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:290
++#: ../src/Core/Banshee.Base/ActionManager.cs:292
+ msgid "Pre_vious"
+ msgstr "FÃ¶re_gÃ¥ende"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:291
++#: ../src/Core/Banshee.Base/ActionManager.cs:293
+ msgid "Play the previous song"
+ msgstr "Spela upp den fÃ¶regÃ¥ende lÃ¥ten"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:296
++#: ../src/Core/Banshee.Base/ActionManager.cs:298
+ msgid "Repeat N_one"
+ msgstr "Upprepa _ingen"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:297
++#: ../src/Core/Banshee.Base/ActionManager.cs:299
+ msgid "Do not repeat playlist"
+ msgstr "Upprepa inte spellista"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:300
++#: ../src/Core/Banshee.Base/ActionManager.cs:302
+ msgid "Repeat _All"
+ msgstr "Upprepa _alla"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:301
++#: ../src/Core/Banshee.Base/ActionManager.cs:303
+ msgid "Play all songs before repeating playlist"
+ msgstr "Spela upp alla lÃ¥tar innan spellistan upprepas"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:304
++#: ../src/Core/Banshee.Base/ActionManager.cs:306
+ msgid "Repeat Si_ngle"
+ msgstr "Upprepa _enstaka"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:305
++#: ../src/Core/Banshee.Base/ActionManager.cs:307
+ msgid "Repeat the current playing song"
+ msgstr "Repetera nuvarande lÃ¥t"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:310
++#: ../src/Core/Banshee.Base/ActionManager.cs:312
+ msgid "Shu_ffle"
+ msgstr "Bla_nda"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:311
++#: ../src/Core/Banshee.Base/ActionManager.cs:313
+ msgid "Toggle between shuffle or continuous playback modes"
+ msgstr "VÃ¤xla mellan blandning eller kontinuerlig uppspelning"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:314
++#: ../src/Core/Banshee.Base/ActionManager.cs:316
+ msgid "_Stop When Finished"
+ msgstr "_Stoppa nÃ¤r fÃ¤rdig"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:315
++#: ../src/Core/Banshee.Base/ActionManager.cs:317
+ msgid "Stop playback after the current song finishes playing"
+ msgstr "Stoppa uppspelning efter nuvarande lÃ¥t har slutat spela"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:324
++#: ../src/Core/Banshee.Base/ActionManager.cs:326
+ msgid "Seek _Backward"
+ msgstr "Spola _bakÃ¥t"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:325
++#: ../src/Core/Banshee.Base/ActionManager.cs:327
+ msgid "Seek backward in current song"
+ msgstr "Spola bakÃ¥t i aktuell lÃ¥t"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:328
++#: ../src/Core/Banshee.Base/ActionManager.cs:330
+ msgid "Seek _Forward"
+ msgstr "Spola _framÃ¥t"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:329
++#: ../src/Core/Banshee.Base/ActionManager.cs:331
+ msgid "Seek forward in current song"
+ msgstr "Spola framÃ¥t i aktuell lÃ¥t"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:332
++#: ../src/Core/Banshee.Base/ActionManager.cs:334
+ msgid "Seek _to..."
+ msgstr "Spola _till..."
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:333
++#: ../src/Core/Banshee.Base/ActionManager.cs:335
+ msgid "Seek to a specific location in current song"
+ msgstr "Spola till en specifik plats i aktuell lÃ¥t"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:336
++#: ../src/Core/Banshee.Base/ActionManager.cs:338
+ msgid "_Restart Song"
+ msgstr "S_tarta om lÃ¥t"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:337
++#: ../src/Core/Banshee.Base/ActionManager.cs:339
+ msgid "Restart the current song"
+ msgstr "Starta om nuvarande lÃ¥t"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:346
++#: ../src/Core/Banshee.Base/ActionManager.cs:348
+ #: ../src/Core/Banshee.Base/SourceManager.cs:276
+ msgid "Synchronize"
+ msgstr "Synkronisera"
+ 
+-#: ../src/Core/Banshee.Base/ActionManager.cs:347
++#: ../src/Core/Banshee.Base/ActionManager.cs:349
+ msgid "Save changes to device or synchronize music library"
+ msgstr "Spara Ã¤ndringar till enhet eller synkronisera musikbibliotek"
+ 
+@@ -1308,7 +1301,7 @@
+ 
+ #: ../src/Core/Banshee.Base/AudioCdRipper.cs:363
+ #: ../src/Core/Banshee.Base/Banshee.PlayerMigration/PlayerImport.cs:55
+-#: ../src/Core/Banshee.Base/ImportManager.cs:297
++#: ../src/Core/Banshee.Base/ImportManager.cs:291
+ #, csharp-format
+ msgid "Importing {0} of {1}"
+ msgstr "Importerar {0} av {1}"
+@@ -1318,6 +1311,7 @@
+ msgstr "Inga tillgÃ¤ngliga profiler"
+ 
+ #: ../src/Core/Banshee.Base/Banshee.AudioProfiles.Gui/ProfileConfigurationDialog.cs:71
++#: ../src/Plugins/Banshee.Plugins.Podcast/UI/PodcastSubscribeDialog.cs:88
+ msgid "Advanced"
+ msgstr "Avancerat"
+ 
+@@ -1344,7 +1338,7 @@
+ msgstr "{0} minuter"
+ 
+ #: ../src/Core/Banshee.Base/Banshee.Burner/BurnerConfigurationPane.cs:136
+-#: ../src/Core/Banshee.Base/Sources/DapSource.cs:339
++#: ../src/Core/Banshee.Base/Sources/DapSource.cs:336
+ #: ../src/Core/Banshee.Widgets/StreamPositionLabel.cs:90
+ #, csharp-format
+ msgid "{0} of {1}"
+@@ -1360,22 +1354,22 @@
+ msgid "{0} MB"
+ msgstr "{0} MB"
+ 
+-#: ../src/Core/Banshee.Base/Banshee.Burner/BurnerCore.cs:122
++#: ../src/Core/Banshee.Base/Banshee.Burner/BurnerCore.cs:118
+ msgid "New Audio C_D"
+ msgstr "Ny ljud-c_d"
+ 
+-#: ../src/Core/Banshee.Base/Banshee.Burner/BurnerCore.cs:123
++#: ../src/Core/Banshee.Base/Banshee.Burner/BurnerCore.cs:119
+ msgid "Create a new audio CD"
+ msgstr "Skapa en ny ljud-cd"
+ 
+ # SUN CHANGED MESSAGE
+-#: ../src/Core/Banshee.Base/Banshee.Burner/BurnerCore.cs:165
++#: ../src/Core/Banshee.Base/Banshee.Burner/BurnerCore.cs:161
+ #: ../src/Core/Banshee.Base/Banshee.Burner/BurnerSessionPreparer.cs:108
+ #: ../src/Core/Banshee.Base/Banshee.Burner/BurnerSessionPreparer.cs:192
+ msgid "Problem creating CD"
+ msgstr "Problem vid skapande av cd"
+ 
+-#: ../src/Core/Banshee.Base/Banshee.Burner/BurnerCore.cs:166
++#: ../src/Core/Banshee.Base/Banshee.Burner/BurnerCore.cs:162
+ msgid "No CD recording hardware was found."
+ msgstr "Ingen hÃ¥rdvara fÃ¶r cd-inspelning hittades."
+ 
+@@ -1491,6 +1485,7 @@
+ msgstr "Fixerar skiva"
+ 
+ #: ../src/Core/Banshee.Base/Banshee.Burner/BurnerSessionRecorder.cs:168
++#: ../src/Dap/Banshee.Dap.Ipod/IpodDap.cs:319
+ msgid "Waiting for Media"
+ msgstr "VÃ¤ntar pÃ¥ media"
+ 
+@@ -1770,7 +1765,7 @@
+ msgstr "Skriv metadata tillbaka till ljudfiler"
+ 
+ #: ../src/Core/Banshee.Base/Banshee.Library/Import.cs:74
+-#: ../src/Dap/Banshee.Dap.MassStorage/MassStorageDap.cs:283
++#: ../src/Dap/Banshee.Dap.MassStorage/MassStorageDap.cs:290
+ msgid "Scanning"
+ msgstr "SÃ¶ker av"
+ 
+@@ -1787,12 +1782,12 @@
+ msgstr "Import frÃ¥n Amaroks databas misslyckades"
+ 
+ #: ../src/Core/Banshee.Base/Banshee.PlayerMigration/PlayerImport.cs:41
+-#: ../src/Core/Banshee.Base/ImportManager.cs:285
++#: ../src/Core/Banshee.Base/ImportManager.cs:279
+ msgid "Importing Songs"
+ msgstr "Importerar lÃ¥tar"
+ 
+ #: ../src/Core/Banshee.Base/Banshee.PlayerMigration/PlayerImport.cs:42
+-#: ../src/Core/Banshee.Base/ImportManager.cs:291
++#: ../src/Core/Banshee.Base/ImportManager.cs:285
+ msgid "The import process is currently running. Would you like to stop it?"
+ msgstr "Importeringsprocessen kÃ¶rs fÃ¶r nÃ¤rvarande. Vill du stoppa den?"
+ 
+@@ -1811,7 +1806,7 @@
+ 
+ #: ../src/Core/Banshee.Base/Banshee.PlayerMigration/PlayerImportDialog.cs:81
+ #: ../src/Core/Banshee.Base/SourceManager.cs:265
+-#: ../src/Core/Banshee/PlayerInterface.cs:2021
++#: ../src/Core/Banshee/PlayerInterface.cs:2097
+ msgid "Import"
+ msgstr "Importera"
+ 
+@@ -1843,57 +1838,48 @@
+ msgid "Invalid Rhythmbox database file"
+ msgstr "Ogiltig Rhythmbox-databasfil"
+ 
+-#: ../src/Core/Banshee.Base/Banshee.Playlists.Formats/M3u.cs:29
++#: ../src/Core/Banshee.Base/Banshee.Playlists.Formats/AsxPlaylistFormat.cs:46
++msgid "Windows Media ASX (*.asx)"
++msgstr "Windows Media ASX (*.asx)"
++
++#: ../src/Core/Banshee.Base/Banshee.Playlists.Formats/M3uPlaylistFormat.cs:43
+ msgid "MPEG Version 3.0 Extended (*.m3u)"
+ msgstr "MPEG version 3.0 Extended (*.m3u)"
+ 
+-#: ../src/Core/Banshee.Base/Banshee.Playlists.Formats/M3u.cs:62
+-#: ../src/Core/Banshee.Base/Banshee.Playlists.Formats/Pls.cs:78
+-msgid "Exception: "
+-msgstr "Undantag: "
+-
+-#: ../src/Core/Banshee.Base/Banshee.Playlists.Formats/M3u.cs:90
+-msgid "Not a valid M3U file."
+-msgstr "Inte en giltig M3U-fil."
+-
+-#: ../src/Core/Banshee.Base/Banshee.Playlists.Formats/Pls.cs:29
++#: ../src/Core/Banshee.Base/Banshee.Playlists.Formats/PlsPlaylistFormat.cs:50
+ msgid "Shoutcast Playlist version 2 (*.pls)"
+ msgstr "Shoutcast-spellista version 2 (*.pls)"
+ 
+-#: ../src/Core/Banshee.Base/Banshee.Playlists.Formats/Pls.cs:113
+-msgid "Not a valid PLS file."
+-msgstr "Inte en giltig PLS-fil."
+-
+-#: ../src/Core/Banshee.Base/Banshee.Playlists/PlaylistFileUtil.cs:183
++#: ../src/Core/Banshee.Base/Banshee.Playlists/PlaylistFileUtil.cs:177
+ msgid "Verifying"
+ msgstr "Verifierar"
+ 
+-#: ../src/Core/Banshee.Base/Banshee.Playlists/PlaylistFileUtil.cs:184
++#: ../src/Core/Banshee.Base/Banshee.Playlists/PlaylistFileUtil.cs:178
+ msgid "The playlist import process is currently running. Would you like to stop it?"
+ msgstr "Importering av spellistan kÃ¶rs fÃ¶r nÃ¤rvarande. Vill du stoppa den?"
+ 
+-#: ../src/Core/Banshee.Base/Banshee.Playlists/PlaylistFileUtil.cs:187
++#: ../src/Core/Banshee.Base/Banshee.Playlists/PlaylistFileUtil.cs:181
+ msgid "Verifying playlist tracks exist in library"
+ msgstr "Verifierar att spellistans spÃ¥r finns i biblioteket"
+ 
+-#: ../src/Core/Banshee.Base/Banshee.Playlists/PlaylistFileUtil.cs:212
++#: ../src/Core/Banshee.Base/Banshee.Playlists/PlaylistFileUtil.cs:206
+ #, csharp-format
+ msgid "Verifying {0} of {1}"
+ msgstr "Verifierar {0} av {1}"
+ 
+-#: ../src/Core/Banshee.Base/Banshee.Playlists/PlaylistFileUtil.cs:215
++#: ../src/Core/Banshee.Base/Banshee.Playlists/PlaylistFileUtil.cs:209
+ msgid "Verifying "
+ msgstr "Verifierar"
+ 
+-#: ../src/Core/Banshee.Base/Banshee.Playlists/PlaylistFileUtil.cs:289
++#: ../src/Core/Banshee.Base/Banshee.Playlists/PlaylistFileUtil.cs:283
+ msgid "Export Playlist"
+ msgstr "Exportera spellista"
+ 
+-#: ../src/Core/Banshee.Base/Banshee.Playlists/PlaylistFileUtil.cs:298
++#: ../src/Core/Banshee.Base/Banshee.Playlists/PlaylistFileUtil.cs:292
+ msgid "Export"
+ msgstr "Exportera"
+ 
+-#: ../src/Core/Banshee.Base/Banshee.Playlists/PlaylistFileUtil.cs:323
++#: ../src/Core/Banshee.Base/Banshee.Playlists/PlaylistFileUtil.cs:317
+ msgid "Select Format: "
+ msgstr "VÃ¤lj format: "
+ 
+@@ -1995,32 +1981,32 @@
+ msgid "between"
+ msgstr "mellan"
+ 
+-#: ../src/Core/Banshee.Base/Banshee.SmartPlaylist/QueryBuilder.cs:335
++#: ../src/Core/Banshee.Base/Banshee.SmartPlaylist/QueryBuilder.cs:338
+ msgid "to"
+ msgstr "till"
+ 
+-#: ../src/Core/Banshee.Base/Banshee.SmartPlaylist/QueryBuilder.cs:709
++#: ../src/Core/Banshee.Base/Banshee.SmartPlaylist/QueryBuilder.cs:712
+ msgid "_Match"
+ msgstr "_Matcha"
+ 
+-#: ../src/Core/Banshee.Base/Banshee.SmartPlaylist/QueryBuilder.cs:716
++#: ../src/Core/Banshee.Base/Banshee.SmartPlaylist/QueryBuilder.cs:719
+ msgid "all"
+ msgstr "alla"
+ 
+-#: ../src/Core/Banshee.Base/Banshee.SmartPlaylist/QueryBuilder.cs:717
++#: ../src/Core/Banshee.Base/Banshee.SmartPlaylist/QueryBuilder.cs:720
+ msgid "any"
+ msgstr "nÃ¥gon"
+ 
+-#: ../src/Core/Banshee.Base/Banshee.SmartPlaylist/QueryBuilder.cs:722
++#: ../src/Core/Banshee.Base/Banshee.SmartPlaylist/QueryBuilder.cs:725
+ msgid "of the following:"
+ msgstr "av fÃ¶ljande:"
+ 
+-#: ../src/Core/Banshee.Base/Banshee.SmartPlaylist/QueryBuilder.cs:741
++#: ../src/Core/Banshee.Base/Banshee.SmartPlaylist/QueryBuilder.cs:744
+ msgid "_Limit to"
+ msgstr "_BegrÃ¤nsa till"
+ 
+ # FIXME. This is confusing.
+-#: ../src/Core/Banshee.Base/Banshee.SmartPlaylist/QueryBuilder.cs:758
++#: ../src/Core/Banshee.Base/Banshee.SmartPlaylist/QueryBuilder.cs:761
+ msgid "selected by"
+ msgstr "valda genom"
+ 
+@@ -2119,17 +2105,21 @@
+ msgid "Play Count"
+ msgstr "SpelrÃ¤knare"
+ 
+-#: ../src/Core/Banshee.Base/Banshee.SmartPlaylist/QueryBuilderModel.cs:796
++#: ../src/Core/Banshee.Base/Banshee.SmartPlaylist/QueryBuilderModel.cs:794
++msgid "Track Number"
++msgstr "SpÃ¥rnummer"
++
++#: ../src/Core/Banshee.Base/Banshee.SmartPlaylist/QueryBuilderModel.cs:797
+ #: ../src/Core/Banshee.Base/Sources/AbstractPlaylistSource.cs:58
+ msgid "Playlist"
+ msgstr "Spellista"
+ 
+-#: ../src/Core/Banshee.Base/Banshee.SmartPlaylist/QueryBuilderModel.cs:810
++#: ../src/Core/Banshee.Base/Banshee.SmartPlaylist/QueryBuilderModel.cs:811
+ #: ../src/Core/Banshee.Base/Banshee.SmartPlaylist/SmartPlaylistSource.cs:127
+ msgid "Smart Playlist"
+ msgstr "Sortera spellista"
+ 
+-#: ../src/Core/Banshee.Base/Banshee.SmartPlaylist/QueryBuilderModel.cs:814
++#: ../src/Core/Banshee.Base/Banshee.SmartPlaylist/QueryBuilderModel.cs:815
+ msgid "Path"
+ msgstr "SÃ¶kvÃ¤g"
+ 
+@@ -2173,16 +2163,16 @@
+ "\n"
+ " Kontrollera dina instÃ¤llningar fÃ¶r \"FÃ¶redragna program\"."
+ 
+-#: ../src/Core/Banshee.Base/BatchTranscoder.cs:135
+ #: ../src/Core/Banshee.Base/BatchTranscoder.cs:136
++#: ../src/Core/Banshee.Base/BatchTranscoder.cs:137
+ msgid "Converting Files"
+ msgstr "Konverterar filer"
+ 
+-#: ../src/Core/Banshee.Base/BatchTranscoder.cs:138
++#: ../src/Core/Banshee.Base/BatchTranscoder.cs:139
+ msgid "Files are currently being converted to another audio format. Would you like to stop this?"
+ msgstr "Filer hÃ¥ller fÃ¶r nÃ¤rvarande pÃ¥ att konverteras till ett annat ljudformat. Vill du stoppa detta?"
+ 
+-#: ../src/Core/Banshee.Base/BatchTranscoder.cs:141
++#: ../src/Core/Banshee.Base/BatchTranscoder.cs:142
+ msgid "Initializing Transcoder..."
+ msgstr "Initierar omkodare..."
+ 
+@@ -2194,40 +2184,44 @@
+ msgid "Cannot initialize DapCore because HalCore is not initialized"
+ msgstr "Kan inte initiera DapCore pÃ¥ grund av att HalCore inte Ã¤r initierad"
+ 
+-#: ../src/Core/Banshee.Base/Dap/Dap.cs:335
+-#: ../src/Core/Banshee.Base/Sources/DapSource.cs:402
++#: ../src/Core/Banshee.Base/Dap/Dap.cs:356
++#: ../src/Core/Banshee.Base/Sources/DapSource.cs:399
+ msgid "Device"
+ msgstr "Enhet"
+ 
+-#: ../src/Core/Banshee.Base/Dap/Dap.cs:336
++#. 1. remove everything in the remove queue if it's on the device
++#. 2. Add everything in the tracklist that isn't on the device
++#. 3. Sync playlists?
++#: ../src/Core/Banshee.Base/Dap/Dap.cs:357
++#: ../src/Dap/Banshee.Dap.Mtp/MtpDap.cs:432
+ #, csharp-format
+ msgid "Synchronizing {0}"
+ msgstr "Synkroniserar {0}"
+ 
+-#: ../src/Core/Banshee.Base/Dap/Dap.cs:340
++#: ../src/Core/Banshee.Base/Dap/Dap.cs:361
+ msgid "Waiting for transcoder..."
+ msgstr "VÃ¤ntar pÃ¥ omkodare..."
+ 
+-#: ../src/Core/Banshee.Base/Dap/Dap.cs:427
+-#: ../src/Core/Banshee.Base/Dap/Dap.cs:448
++#: ../src/Core/Banshee.Base/Dap/Dap.cs:447
++#: ../src/Core/Banshee.Base/Dap/Dap.cs:476
+ msgid "Processing..."
+ msgstr "Behandlar..."
+ 
+-#: ../src/Core/Banshee.Base/Dap/Dap.cs:467
++#: ../src/Core/Banshee.Base/Dap/Dap.cs:495
+ msgid "Could not encode some files"
+ msgstr "Kunde inte koda vissa filer"
+ 
+-#: ../src/Core/Banshee.Base/Dap/Dap.cs:469
++#: ../src/Core/Banshee.Base/Dap/Dap.cs:497
+ msgid "Some files could not be encoded to the proper format. They will not be saved to the device if you continue."
+ msgstr "Vissa filer kunde inte kodas i det riktiga formatet. De kommer inte att sparas till enheten om du fortsÃ¤tter."
+ 
+-#: ../src/Core/Banshee.Base/Dap/Dap.cs:474
++#: ../src/Core/Banshee.Base/Dap/Dap.cs:502
+ msgid "Continue synchronizing"
+ msgstr "FortsÃ¤tt synkronisering"
+ 
+ #. Translators: {0} is the name assigned to a Digital Audio Player by its owner
+ #: ../src/Core/Banshee.Base/Dap/DapPropertiesDialog.cs:54
+-#: ../src/Core/Banshee.Base/Sources/DapSource.cs:406
++#: ../src/Core/Banshee.Base/Sources/DapSource.cs:403
+ #, csharp-format
+ msgid "{0} Properties"
+ msgstr "Egenskaper fÃ¶r {0}"
+@@ -2237,20 +2231,20 @@
+ msgid "Device name"
+ msgstr "Enhetsnamn"
+ 
+-#: ../src/Core/Banshee.Base/Dap/DapPropertiesDialog.cs:85
+-#: ../src/Core/Banshee.Base/Dap/DapPropertiesDialog.cs:88
++#: ../src/Core/Banshee.Base/Dap/DapPropertiesDialog.cs:86
++#: ../src/Core/Banshee.Base/Dap/DapPropertiesDialog.cs:89
+ msgid "Owner name"
+ msgstr "Ã„garens namn"
+ 
+-#: ../src/Core/Banshee.Base/Dap/DapPropertiesDialog.cs:97
++#: ../src/Core/Banshee.Base/Dap/DapPropertiesDialog.cs:99
+ msgid "Encode to"
+ msgstr "Koda till"
+ 
+-#: ../src/Core/Banshee.Base/Dap/DapPropertiesDialog.cs:107
++#: ../src/Core/Banshee.Base/Dap/DapPropertiesDialog.cs:109
+ msgid "Volume usage"
+ msgstr "VolymanvÃ¤ndning"
+ 
+-#: ../src/Core/Banshee.Base/Dap/DapPropertiesDialog.cs:119
++#: ../src/Core/Banshee.Base/Dap/DapPropertiesDialog.cs:121
+ msgid "Advanced details"
+ msgstr "Avancerade detaljer"
+ 
+@@ -2355,7 +2349,7 @@
+ msgid "Loading user interface"
+ msgstr "LÃ¤ser in anvÃ¤ndargrÃ¤nssnitt"
+ 
+-#: ../src/Core/Banshee.Base/GstTranscoder.cs:82
++#: ../src/Core/Banshee.Base/GstTranscoder.cs:83
+ msgid "Could not create transcoder"
+ msgstr "Kunde inte skapa omkodare"
+ 
+@@ -2485,7 +2479,7 @@
+ msgid "Error correction tries to work around problem areas on a disc, such as surface scratches, but will slow down importing substantially."
+ msgstr "Felkorrigering anvÃ¤nds fÃ¶r att korrigera problem pÃ¥ en skiva, sÃ¥som ytliga repor, men kommer att gÃ¶ra importeringen mycket lÃ¥ngsam."
+ 
+-#: ../src/Core/Banshee.Base/Gui/SourceView.cs:533
++#: ../src/Core/Banshee.Base/Gui/SourceView.cs:540
+ msgid "Could not import tracks"
+ msgstr "Kunde inte importera spÃ¥r"
+ 
+@@ -2509,48 +2503,48 @@
+ msgid "Continuous"
+ msgstr "Kontinuerlig"
+ 
+-#: ../src/Core/Banshee.Base/Gui/TrackEditor.cs:213
++#: ../src/Core/Banshee.Base/Gui/TrackEditor.cs:232
+ msgid "Automatically set all track numbers in increasing order"
+ msgstr "StÃ¤ll automatiskt in alla spÃ¥rnummer i stigande ordning"
+ 
+-#: ../src/Core/Banshee.Base/Gui/TrackEditor.cs:214
++#: ../src/Core/Banshee.Base/Gui/TrackEditor.cs:233
+ msgid "Set all track counts to this value"
+ msgstr "StÃ¤ll in alla spÃ¥rantal till detta vÃ¤rde"
+ 
+-#: ../src/Core/Banshee.Base/Gui/TrackEditor.cs:215
++#: ../src/Core/Banshee.Base/Gui/TrackEditor.cs:234
+ msgid "Set all artists to this value"
+ msgstr "StÃ¤ll in alla artister till detta vÃ¤rde"
+ 
+-#: ../src/Core/Banshee.Base/Gui/TrackEditor.cs:216
++#: ../src/Core/Banshee.Base/Gui/TrackEditor.cs:235
+ msgid "Set all albums to this value"
+ msgstr "StÃ¤ll in alla album till detta vÃ¤rde"
+ 
+-#: ../src/Core/Banshee.Base/Gui/TrackEditor.cs:217
++#: ../src/Core/Banshee.Base/Gui/TrackEditor.cs:236
+ msgid "Set all genres to this value"
+ msgstr "StÃ¤ll in alla genrer till detta vÃ¤rde"
+ 
+-#: ../src/Core/Banshee.Base/Gui/TrackEditor.cs:218
++#: ../src/Core/Banshee.Base/Gui/TrackEditor.cs:237
+ msgid "Set all years to this value"
+ msgstr "StÃ¤ll in alla Ã¥rtal till detta vÃ¤rde"
+ 
+-#: ../src/Core/Banshee.Base/Gui/TrackEditor.cs:219
++#: ../src/Core/Banshee.Base/Gui/TrackEditor.cs:238
+ msgid "Apply the values of this track set for the Artist, Album Title, Genre, Track count, Year, and Rating fields to the rest of the selected tracks in this editor."
+ msgstr "VerkstÃ¤ll vÃ¤rden fÃ¶r den hÃ¤r spÃ¥ruppsÃ¤ttningen fÃ¶r fÃ¤lten Artist, Albumtitel, Genre, SpÃ¥rantal, Ã
r och Betyg till resten av de markerade spÃ¥ren i den hÃ¤r redigeraren."
+ 
+-#: ../src/Core/Banshee.Base/Gui/TrackEditor.cs:220
++#: ../src/Core/Banshee.Base/Gui/TrackEditor.cs:239
+ msgid "Set all ratings to this value"
+ msgstr "StÃ¤ll in alla betyg till detta vÃ¤rde"
+ 
+-#: ../src/Core/Banshee.Base/Gui/TrackEditor.cs:272
++#: ../src/Core/Banshee.Base/Gui/TrackEditor.cs:300
+ msgid "Never played"
+ msgstr "Aldrig spelad"
+ 
+-#: ../src/Core/Banshee.Base/Gui/TrackEditor.cs:286
++#: ../src/Core/Banshee.Base/Gui/TrackEditor.cs:314
+ #, csharp-format
+ msgid "Editing song {0} of {1}"
+ msgstr "Redigerar lÃ¥t {0} av {1}"
+ 
+-#: ../src/Core/Banshee.Base/Gui/TrackEditor.cs:287
++#: ../src/Core/Banshee.Base/Gui/TrackEditor.cs:315
+ #, csharp-format
+ msgid "Editing {0}"
+ msgstr "Redigerar {0}"
+@@ -2564,6 +2558,7 @@
+ msgstr "Monteringsnamn"
+ 
+ #: ../src/Core/Banshee.Base/Gui/VersionInformationDialog.cs:69
++#: ../src/Dap/Banshee.Dap.Mtp/MtpDap.cs:197
+ msgid "Version"
+ msgstr "Version"
+ 
+@@ -2630,15 +2625,15 @@
+ msgid "Configuration"
+ msgstr "Konfiguration"
+ 
+-#: ../src/Core/Banshee.Base/PowerManagement.cs:83
++#: ../src/Core/Banshee.Base/PowerManagement.cs:121
+ msgid "Playing Music"
+ msgstr "Spelar musik"
+ 
+-#: ../src/Core/Banshee.Base/Source.cs:388
++#: ../src/Core/Banshee.Base/Source.cs:390
+ msgid "Source Properties..."
+ msgstr "KÃ¤llegenskaper..."
+ 
+-#: ../src/Core/Banshee.Base/Source.cs:396
++#: ../src/Core/Banshee.Base/Source.cs:398
+ #, csharp-format
+ msgid "Delete {0}"
+ msgstr "Ta bort {0}"
+@@ -2698,48 +2693,45 @@
+ msgid "You must select at least one track to import."
+ msgstr "Du mÃ¥ste vÃ¤lja Ã¥tminstone ett spÃ¥r att importera."
+ 
+-#: ../src/Core/Banshee.Base/Sources/DapSource.cs:107
++#: ../src/Core/Banshee.Base/Sources/DapSource.cs:106
+ msgid "Synchronizing your Device, Please Wait..."
+ msgstr "Synkroniserar din enhet, vÃ¤nta..."
+ 
+-#: ../src/Core/Banshee.Base/Sources/DapSource.cs:191
++#: ../src/Core/Banshee.Base/Sources/DapSource.cs:188
+ #: ../src/Plugins/Banshee.Plugins.Daap/DaapSource.cs:316
+ msgid "Importing"
+ msgstr "Importerar"
+ 
+-#: ../src/Core/Banshee.Base/Sources/DapSource.cs:193
++#: ../src/Core/Banshee.Base/Sources/DapSource.cs:190
+ #: ../src/Plugins/Banshee.Plugins.Daap/DaapSource.cs:318
+ #, csharp-format
+ msgid "You are currently importing from {0}. Would you like to stop it?"
+ msgstr "Du hÃ¥ller fÃ¶r nÃ¤rvarande pÃ¥ att importera frÃ¥n {0}. Vill du stoppa detta?"
+ 
+-#. import_manager.UserEvent.Icon = GetIcon;
+-#: ../src/Core/Banshee.Base/Sources/DapSource.cs:195
+-#: ../src/Dap/Banshee.Dap.Mtp/MtpDap.cs:314
++#: ../src/Core/Banshee.Base/Sources/DapSource.cs:192
+ #: ../src/Plugins/Banshee.Plugins.Daap/DaapSource.cs:320
+ #, csharp-format
+ msgid "Copying from {0}"
+ msgstr "Kopierar frÃ¥n {0}"
+ 
+-#: ../src/Core/Banshee.Base/Sources/DapSource.cs:196
+-#: ../src/Dap/Banshee.Dap.Mtp/MtpDap.cs:315
++#: ../src/Core/Banshee.Base/Sources/DapSource.cs:193
++#: ../src/Dap/Banshee.Dap.Mtp/MtpDap.cs:484
+ #: ../src/Plugins/Banshee.Plugins.Daap/DaapSource.cs:321
+ msgid "Scanning..."
+ msgstr "SÃ¶ker av..."
+ 
+-#: ../src/Core/Banshee.Base/Sources/DapSource.cs:313
+-#: ../src/Dap/Banshee.Dap.Mtp/MtpDap.cs:435
++#: ../src/Core/Banshee.Base/Sources/DapSource.cs:310
+ #: ../src/Plugins/Banshee.Plugins.Daap/DaapSource.cs:437
+ #, csharp-format
+ msgid "Cannot import track from {0}"
+ msgstr "Kan inte importera spÃ¥r frÃ¥n {0}"
+ 
+-#: ../src/Core/Banshee.Base/Sources/DapSource.cs:349
++#: ../src/Core/Banshee.Base/Sources/DapSource.cs:346
+ #, csharp-format
+ msgid "({0} Remaining)"
+ msgstr "({0} Ã¥terstÃ¥r)"
+ 
+-#: ../src/Core/Banshee.Base/Sources/DapSource.cs:386
++#: ../src/Core/Banshee.Base/Sources/DapSource.cs:383
+ #, csharp-format
+ msgid "Eject {0}"
+ msgstr "Mata ut {0}"
+@@ -2789,7 +2781,7 @@
+ #: ../src/Core/Banshee.Base/Sources/PlaylistSource.cs:73
+ #: ../src/Core/Banshee.Base/Sources/PlaylistSource.cs:461
+ #: ../src/Core/Banshee.Base/Sources/PlaylistSource.cs:467
+-#: ../src/Core/Banshee/PlayerInterface.cs:1622
++#: ../src/Core/Banshee/PlayerInterface.cs:1694
+ msgid "New Playlist"
+ msgstr "Ny spellista"
+ 
+@@ -2801,7 +2793,7 @@
+ msgid "A playlist with this name already exists. Please choose another name."
+ msgstr "En spellista med detta namn finns redan. VÃ¤lj ett annat namn."
+ 
+-#: ../src/Core/Banshee.Base/StreamTagger.cs:169
++#: ../src/Core/Banshee.Base/StreamTagger.cs:171
+ #, csharp-format
+ msgid "Saving tags for {0}"
+ msgstr "Sparar taggar fÃ¶r {0}"
+@@ -2826,85 +2818,86 @@
+ msgid "{0:0.00} GB"
+ msgstr "{0:0.00} GB"
+ 
+-#: ../src/Core/Banshee/PlayerInterface.cs:453
++#: ../src/Core/Banshee/PlayerInterface.cs:472
+ msgid "All Columns"
+ msgstr "Alla kolumner"
+ 
+-#: ../src/Core/Banshee/PlayerInterface.cs:455
++#: ../src/Core/Banshee/PlayerInterface.cs:474
+ msgid "Song Name"
+ msgstr "LÃ¥tnamn"
+ 
+-#: ../src/Core/Banshee/PlayerInterface.cs:456
++#: ../src/Core/Banshee/PlayerInterface.cs:475
+ msgid "Artist Name"
+ msgstr "Artistnamn"
+ 
+-#: ../src/Core/Banshee/PlayerInterface.cs:457
++#: ../src/Core/Banshee/PlayerInterface.cs:476
+ msgid "Album Title"
+ msgstr "Albumtitel"
+ 
+-#: ../src/Core/Banshee/PlayerInterface.cs:480
++#: ../src/Core/Banshee/PlayerInterface.cs:499
+ msgid "Write selection to CD"
+ msgstr "Skriv markering till cd"
+ 
+-#: ../src/Core/Banshee/PlayerInterface.cs:481
++#: ../src/Core/Banshee/PlayerInterface.cs:500
+ msgid "Import CD into library"
+ msgstr "Importera cd till bibliotek"
+ 
+-#: ../src/Core/Banshee/PlayerInterface.cs:482
++#: ../src/Core/Banshee/PlayerInterface.cs:501
+ #: ../src/Plugins/Banshee.Plugins.MiniMode/MiniModeWindow.cs:151
+ msgid "Play previous song"
+ msgstr "Spela upp fÃ¶regÃ¥ende lÃ¥t"
+ 
+-#: ../src/Core/Banshee/PlayerInterface.cs:483
++#: ../src/Core/Banshee/PlayerInterface.cs:502
+ #: ../src/Plugins/Banshee.Plugins.MiniMode/MiniModeWindow.cs:152
+ msgid "Play/pause current song"
+ msgstr "Spela upp/Pausa aktuell lÃ¥t"
+ 
+-#: ../src/Core/Banshee/PlayerInterface.cs:484
++#: ../src/Core/Banshee/PlayerInterface.cs:503
+ #: ../src/Plugins/Banshee.Plugins.MiniMode/MiniModeWindow.cs:153
++#: ../src/Plugins/Banshee.Plugins.NotificationAreaIcon/NotificationAreaIconPlugin.cs:293
+ msgid "Play next song"
+ msgstr "Spela upp nÃ¤sta lÃ¥t"
+ 
+-#: ../src/Core/Banshee/PlayerInterface.cs:485
++#: ../src/Core/Banshee/PlayerInterface.cs:504
+ msgid "Device disk usage"
+ msgstr "EnhetsanvÃ¤ndning"
+ 
+-#: ../src/Core/Banshee/PlayerInterface.cs:486
++#: ../src/Core/Banshee/PlayerInterface.cs:505
+ msgid "Synchronize music library to device"
+ msgstr "Synkronisera musikbibliotek till enhet"
+ 
+-#: ../src/Core/Banshee/PlayerInterface.cs:487
++#: ../src/Core/Banshee/PlayerInterface.cs:506
+ #: ../src/Plugins/Banshee.Plugins.MiniMode/MiniModeWindow.cs:155
+ msgid "Adjust volume"
+ msgstr "Justera volym"
+ 
+-#: ../src/Core/Banshee/PlayerInterface.cs:488
++#: ../src/Core/Banshee/PlayerInterface.cs:507
+ #: ../src/Plugins/Banshee.Plugins.MiniMode/MiniModeWindow.cs:156
+ msgid "Change repeat playback mode"
+ msgstr "Ã„ndra upprepningslÃ¤ge"
+ 
+-#: ../src/Core/Banshee/PlayerInterface.cs:489
++#: ../src/Core/Banshee/PlayerInterface.cs:508
+ #: ../src/Plugins/Banshee.Plugins.MiniMode/MiniModeWindow.cs:157
+ msgid "Toggle shuffle playback mode"
+ msgstr "VÃ¤xla blandningslÃ¤ge"
+ 
+-#: ../src/Core/Banshee/PlayerInterface.cs:490
++#: ../src/Core/Banshee/PlayerInterface.cs:509
+ msgid "Edit and view metadata of selected songs"
+ msgstr "Redigera och visa metadata fÃ¶r markerade lÃ¥tar"
+ 
+-#: ../src/Core/Banshee/PlayerInterface.cs:814
++#: ../src/Core/Banshee/PlayerInterface.cs:885
+ msgid "Pause"
+ msgstr "Paus"
+ 
+-#: ../src/Core/Banshee/PlayerInterface.cs:816
++#: ../src/Core/Banshee/PlayerInterface.cs:887
+ msgid "Stop"
+ msgstr "Stopp"
+ 
+-#: ../src/Core/Banshee/PlayerInterface.cs:837
++#: ../src/Core/Banshee/PlayerInterface.cs:908
+ msgid "Cannot Play Song"
+ msgstr "Kan inte spela upp lÃ¥t"
+ 
+-#: ../src/Core/Banshee/PlayerInterface.cs:838
++#: ../src/Core/Banshee/PlayerInterface.cs:909
+ #, csharp-format
+ msgid ""
+ "{0} cannot be played by Banshee. The most common reasons for this are:\n"
+@@ -2917,106 +2910,125 @@
+ "  <big>â€¢</big> LÃ¥ten Ã¤r skyddad (DRM)\n"
+ "  <big>â€¢</big> LÃ¥ten Ã¤r pÃ¥ en DAP som inte har stÃ¶d fÃ¶r uppspelning\n"
+ 
+-#: ../src/Core/Banshee/PlayerInterface.cs:847
+-#: ../src/Core/Banshee/PlayerInterface.cs:856
++#: ../src/Core/Banshee/PlayerInterface.cs:918
++#: ../src/Core/Banshee/PlayerInterface.cs:927
+ msgid "Play"
+ msgstr "Spela"
+ 
+-#: ../src/Core/Banshee/PlayerInterface.cs:1268
++#: ../src/Core/Banshee/PlayerInterface.cs:1339
+ #, csharp-format
+ msgid "{0} Item"
+ msgid_plural "{0} Items"
+ msgstr[0] "{0} objekt"
+ msgstr[1] "{0} objekt"
+ 
+-#: ../src/Core/Banshee/PlayerInterface.cs:1272
++#: ../src/Core/Banshee/PlayerInterface.cs:1343
+ #, csharp-format
+ msgid "{0} day"
+ msgid_plural "{0} days"
+ msgstr[0] "{0} dygn"
+ msgstr[1] "{0} dygn"
+ 
+-#: ../src/Core/Banshee/PlayerInterface.cs:1277
++#: ../src/Core/Banshee/PlayerInterface.cs:1348
+ #, csharp-format
+ msgid "{0} hour"
+ msgid_plural "{0} hours"
+ msgstr[0] "{0} timme"
+ msgstr[1] "{0} timmar"
+ 
+-#: ../src/Core/Banshee/PlayerInterface.cs:1281
++#: ../src/Core/Banshee/PlayerInterface.cs:1352
+ #, csharp-format
+ msgid "{0} minute"
+ msgid_plural "{0} minutes"
+ msgstr[0] "{0} minut"
+ msgstr[1] "{0} minuter"
+ 
+-#: ../src/Core/Banshee/PlayerInterface.cs:1283
++#: ../src/Core/Banshee/PlayerInterface.cs:1354
+ #, csharp-format
+ msgid "{0} second"
+ msgid_plural "{0} seconds"
+ msgstr[0] "{0} sekund"
+ msgstr[1] "{0} sekunder"
+ 
+-#: ../src/Core/Banshee/PlayerInterface.cs:1412
++#: ../src/Core/Banshee/PlayerInterface.cs:1484
+ #, csharp-format
+ msgid "Filter on {0}"
+ msgstr "Filtrera pÃ¥ {0}"
+ 
+-#: ../src/Core/Banshee/PlayerInterface.cs:1891
++#: ../src/Core/Banshee/PlayerInterface.cs:1967
+ #, 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?"
+ msgstr[0] "Ã„r du sÃ¤ker pÃ¥ att du vill permanent ta bort denna lÃ¥t?"
+ msgstr[1] "Ã„r du sÃ¤ker pÃ¥ att du vill permanent ta bort de markerade {0} lÃ¥tarna?"
+ 
+-#: ../src/Core/Banshee/PlayerInterface.cs:1895
++#: ../src/Core/Banshee/PlayerInterface.cs:1971
+ msgid "If you delete the selection, it will be permanently lost."
+ msgstr "Om du tar bort markeringen kommer de att permanent fÃ¶rloras."
+ 
+-#: ../src/Core/Banshee/PlayerInterface.cs:1898
++#: ../src/Core/Banshee/PlayerInterface.cs:1974
+ msgid "Remove selection from library"
+ msgstr "Ta bort markering frÃ¥n bibliotek"
+ 
+-#: ../src/Core/Banshee/PlayerInterface.cs:1900
++#: ../src/Core/Banshee/PlayerInterface.cs:1976
+ #, csharp-format
+ msgid "Are you sure you want to remove the selected song from your library?"
+ msgid_plural "Are you sure you want to remove the selected {0} songs from your library?"
+ msgstr[0] "Ã„r du sÃ¤ker att du vill ta bort den markerade lÃ¥ten frÃ¥n ditt bibliotek?"
+ msgstr[1] "Ã„r du sÃ¤ker att du vill ta bort de <b>({0})</b> markerade lÃ¥tarna frÃ¥n ditt bibliotek?"
+ 
+-#: ../src/Core/Banshee/PlayerInterface.cs:1945
++#: ../src/Core/Banshee/PlayerInterface.cs:2021
+ msgid "Delete songs from drive"
+ msgstr "Ta bort lÃ¥tar frÃ¥n enhet"
+ 
+-#: ../src/Core/Banshee/PlayerInterface.cs:1946
++#: ../src/Core/Banshee/PlayerInterface.cs:2022
+ #, csharp-format
+ msgid "You do not have the required permissions to delete '{0}'"
+ msgstr "Du har inte de nÃ¶dvÃ¤ndiga rÃ¤ttigheterna att ta bort \"{0}\""
+ 
+-#: ../src/Core/Banshee/PlayerInterface.cs:2012
++#: ../src/Core/Banshee/PlayerInterface.cs:2088
+ msgid "Import Playlist"
+ msgstr "Importera spellista"
+ 
+-#: ../src/Core/Banshee/PlayerInterface.cs:2044
+-#: ../src/Core/Banshee/PlayerInterface.cs:2062
++#: ../src/Core/Banshee/PlayerInterface.cs:2120
++#: ../src/Core/Banshee/PlayerInterface.cs:2138
+ msgid "Unable to Import Playlist"
+ msgstr "Kunde inte importera spellista"
+ 
+-#: ../src/Core/Banshee/PlayerInterface.cs:2063
++#: ../src/Core/Banshee/PlayerInterface.cs:2139
+ msgid "Banshee was unable to find any valid tracks to import.  Please check the playlist and try again."
+ msgstr "Banshee kunde inte hitta nÃ¥gra giltiga spÃ¥r att importera.  Kontrollera spellistan och fÃ¶rsÃ¶k igen."
+ 
+-#: ../src/Core/Banshee/PlayerInterface.cs:2152
++#: ../src/Core/Banshee/PlayerInterface.cs:2182
++msgid "Could not export playlist"
++msgstr "Kunde inte exportera spellista"
++
++# SUN CHANGED MESSAGE
++#: ../src/Core/Banshee/PlayerInterface.cs:2201
++#: ../src/Core/Banshee/PlayerInterface.cs:2207
++msgid "Error opening stream"
++msgstr "Fel vid Ã¶ppnande av strÃ¶m"
++
++#: ../src/Core/Banshee/PlayerInterface.cs:2201
++msgid "Could not open stream or playlist"
++msgstr "Kunde inte Ã¶ppna strÃ¶m eller spellista"
++
++# SUN CHANGED MESSAGE
++#: ../src/Core/Banshee/PlayerInterface.cs:2207
++msgid "Problem parsing playlist"
++msgstr "Problem vid tolkning av spellista"
++
++#: ../src/Core/Banshee/PlayerInterface.cs:2245
+ msgid "New CD"
+ msgstr "Ny cd"
+ 
+ #. Translators: {0} is the name of the DAP device (i.e. 'iPod')
+-#: ../src/Core/Banshee/PlayerInterface.cs:2173
++#: ../src/Core/Banshee/PlayerInterface.cs:2266
+ #, csharp-format
+ msgid "Synchronize {0}"
+ msgstr "Synkronisera {0}"
+ 
+-#: ../src/Core/Banshee/PlayerInterface.cs:2174
++#: ../src/Core/Banshee/PlayerInterface.cs:2267
+ #, csharp-format
+ msgid ""
+ "You have made changes to your {0}. Please choose a method for updating the contents of your {0}.\n"
+@@ -3029,15 +3041,15 @@
+ "<big>â€¢</big> <i>Synkronisera bibliotek</i>: synkronisera Banshees bibliotek till {0}\n"
+ "<big>â€¢</big> <i>Spara manuella Ã¤ndringar</i>: spara endast de manuella Ã¤ndringarna du gjorde"
+ 
+-#: ../src/Core/Banshee/PlayerInterface.cs:2180
++#: ../src/Core/Banshee/PlayerInterface.cs:2273
+ msgid "<b>Warning:</b> Actions will alter or erase existing iPod contents and may cause incompatibility with iTunes!"
+ msgstr "<b>Varning:</b> Ã
tgÃ¤rder kommer att Ã¤ndra eller radera befintligt iPod-innehÃ¥ll och kan orsaka inkompatibilitet med iTunes!"
+ 
+-#: ../src/Core/Banshee/PlayerInterface.cs:2182
++#: ../src/Core/Banshee/PlayerInterface.cs:2275
+ msgid "Synchronize Library"
+ msgstr "Synkronisera bibliotek"
+ 
+-#: ../src/Core/Banshee/PlayerInterface.cs:2184
++#: ../src/Core/Banshee/PlayerInterface.cs:2277
+ msgid "Save Manual Changes"
+ msgstr "Spara manuella Ã¤ndringar"
+ 
+@@ -3077,7 +3089,7 @@
+ msgstr "Betyg:"
+ 
+ #: ../src/Core/Banshee.Widgets/StreamPositionLabel.cs:82
+-#: ../src/Engines/Banshee.MediaEngine.GStreamer/GstPlayerEngine.cs:279
++#: ../src/Engines/Banshee.MediaEngine.GStreamer/GstPlayerEngine.cs:291
+ msgid "Buffering"
+ msgstr "Buffrar"
+ 
+@@ -3097,71 +3109,75 @@
+ msgid "Full Volume"
+ msgstr "Full volym"
+ 
+-#: ../src/Dap/Banshee.Dap.Ipod/DatabaseRebuilder.cs:53
+-#: ../src/Dap/Banshee.Dap.Ipod/DatabaseRebuilder.cs:54
++#: ../src/Dap/Banshee.Dap.Ipod/DatabaseRebuilder.cs:87
++#: ../src/Dap/Banshee.Dap.Ipod/DatabaseRebuilder.cs:88
+ msgid "Rebuilding Database"
+ msgstr "Bygger om databas"
+ 
+-#: ../src/Dap/Banshee.Dap.Ipod/DatabaseRebuilder.cs:55
++#: ../src/Dap/Banshee.Dap.Ipod/DatabaseRebuilder.cs:89
+ msgid "Scanning iPod..."
+ msgstr "SÃ¶ker av iPod..."
+ 
+-#: ../src/Dap/Banshee.Dap.Ipod/DatabaseRebuilder.cs:89
++#: ../src/Dap/Banshee.Dap.Ipod/DatabaseRebuilder.cs:123
+ msgid "Processing Tracks..."
+ msgstr "Behandlar spÃ¥r..."
+ 
+-#: ../src/Dap/Banshee.Dap.Ipod/DatabaseRebuilder.cs:136
++#: ../src/Dap/Banshee.Dap.Ipod/DatabaseRebuilder.cs:140
++msgid "Ordering Tracks..."
++msgstr "BestÃ¤ller spÃ¥r..."
++
++#: ../src/Dap/Banshee.Dap.Ipod/DatabaseRebuilder.cs:220
+ msgid "Saving new database..."
+ msgstr "Sparar ny databas..."
+ 
+-#: ../src/Dap/Banshee.Dap.Ipod/DatabaseRebuilder.cs:143
++#: ../src/Dap/Banshee.Dap.Ipod/DatabaseRebuilder.cs:232
+ msgid "Error rebuilding iPod database"
+ msgstr "Fel vid ombyggnation av iPod-databas"
+ 
+-#. Translators "Week 25 of 2006"
+-#: ../src/Dap/Banshee.Dap.Ipod/IpodDap.cs:100
+-msgid "Manufactured During"
++#: ../src/Dap/Banshee.Dap.Ipod/IpodDap.cs:99
++#: ../src/Dap/Banshee.Dap.Ipod/IpodDap.cs:102
++#: ../src/Dap/Banshee.Dap.Mtp/MtpDap.cs:194
++msgid "Model"
++msgstr "Modell"
++
++#: ../src/Dap/Banshee.Dap.Ipod/IpodDap.cs:106
++msgid "Advertised Capacity"
++msgstr "Annonserad kapacitet"
++
++#: ../src/Dap/Banshee.Dap.Ipod/IpodDap.cs:109
++msgid "Manufactured In"
+ msgstr "Tillverkad under"
+ 
+-#: ../src/Dap/Banshee.Dap.Ipod/IpodDap.cs:101
+-#, csharp-format
+-msgid "Week {0} of {1}"
+-msgstr "Vecka {0} av {1}"
+-
+-#: ../src/Dap/Banshee.Dap.Ipod/IpodDap.cs:139
++#: ../src/Dap/Banshee.Dap.Ipod/IpodDap.cs:177
+ msgid "Your iPod could not be identified"
+ msgstr "Din iPod kunde inte identifieras"
+ 
+-#: ../src/Dap/Banshee.Dap.Ipod/IpodDap.cs:140
++#: ../src/Dap/Banshee.Dap.Ipod/IpodDap.cs:178
+ msgid "Please consider submitting information about your iPod to the Banshee Project so your iPod may be more fully identified in the future.\n"
+ msgstr "Fundera pÃ¥ att skicka in information om din iPod till Banshee-projektet sÃ¥ att din iPod kan bli identifierad bÃ¤ttre i framtiden.\n"
+ 
+-#: ../src/Dap/Banshee.Dap.Ipod/IpodDap.cs:143
++#: ../src/Dap/Banshee.Dap.Ipod/IpodDap.cs:181
+ msgid "Do not ask me again"
+ msgstr "FrÃ¥ga mig inte igen"
+ 
+-#: ../src/Dap/Banshee.Dap.Ipod/IpodDap.cs:148
++#: ../src/Dap/Banshee.Dap.Ipod/IpodDap.cs:186
+ msgid "Go to Web Site"
+ msgstr "GÃ¥ till webbplatsen"
+ 
+-#: ../src/Dap/Banshee.Dap.Ipod/IpodDap.cs:234
++#: ../src/Dap/Banshee.Dap.Ipod/IpodDap.cs:278
+ msgid "Could not eject iPod"
+ msgstr "Kunde inte mata ut iPod"
+ 
+-#: ../src/Dap/Banshee.Dap.Ipod/IpodDap.cs:242
+-#: ../src/Dap/Banshee.Dap.Ipod/IpodDap.cs:261
++#: ../src/Dap/Banshee.Dap.Ipod/IpodDap.cs:303
++#: ../src/Dap/Banshee.Dap.Ipod/IpodDap.cs:322
+ msgid "Synchronizing iPod"
+ msgstr "Synkroniserar iPod"
+ 
+-#: ../src/Dap/Banshee.Dap.Ipod/IpodDap.cs:243
++#: ../src/Dap/Banshee.Dap.Ipod/IpodDap.cs:304
+ msgid "Pre-processing tracks"
+ msgstr "FÃ¶rbehandlar spÃ¥r"
+ 
+-#: ../src/Dap/Banshee.Dap.Ipod/IpodDap.cs:258
+-msgid "Flushing to Disk (may take time)"
+-msgstr "Skriver till disk (kan ta tid)"
+-
+-#: ../src/Dap/Banshee.Dap.Ipod/IpodDap.cs:268
++#: ../src/Dap/Banshee.Dap.Ipod/IpodDap.cs:333
+ msgid "Failed to synchronize iPod"
+ msgstr "Misslyckades med att synkronisera iPod"
+ 
+@@ -3193,15 +3209,19 @@
+ msgid "What is the reason for this?"
+ msgstr "Vad Ã¤r anledningen fÃ¶r detta?"
+ 
+-#: ../src/Dap/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:116
++#: ../src/Dap/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:110
++msgid "Your iPod is mounted read only. Banshee can not restore your iPod."
++msgstr "Din iPod Ã¤r monterad som skrivskyddad. Banshee kan inte Ã¥terstÃ¤lla din iPod."
++
++#: ../src/Dap/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:118
+ msgid "Rebuild iPod Database..."
+ msgstr "Bygger om iPod-databas..."
+ 
+-#: ../src/Dap/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:124
++#: ../src/Dap/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:126
+ msgid "Confirm Rebuild iPod Database"
+ msgstr "BekrÃ¤fta ombyggnation av iPod-databas"
+ 
+-#: ../src/Dap/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:130
++#: ../src/Dap/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:132
+ msgid ""
+ "Rebuilding your iPod database may take some time. Also note that any playlists you have on your iPod will be lost.\n"
+ "\n"
+@@ -3211,19 +3231,16 @@
+ "\n"
+ "Ã„r du sÃ¤ker pÃ¥ att du vill bygga om din iPod-databas?"
+ 
+-#: ../src/Dap/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:135
++#: ../src/Dap/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:137
+ msgid "Rebuild Database"
+ msgstr "Bygg om databas"
+ 
+-#: ../src/Dap/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:147
++#: ../src/Dap/Banshee.Dap.Ipod/UnsupportedDatabaseView.cs:151
+ msgid "Rebuilding iPod Database..."
+ msgstr "Bygger om iPod-databas..."
+ 
+ #: ../src/Dap/Banshee.Dap.Karma/Karma.cs:144
+ #: ../src/Dap/Banshee.Dap.Karma/Karma.cs:172
+-#: ../src/Dap/Banshee.Dap.Mtp/MtpDap.cs:232
+-#: ../src/Dap/Banshee.Dap.Mtp/MtpDap.cs:236
+-#: ../src/Dap/Banshee.Dap.Mtp/MtpDap.cs:269
+ #: ../src/Dap/Banshee.Dap.Njb/NjbDap.cs:248
+ #: ../src/Dap/Banshee.Dap.Njb/NjbDap.cs:260
+ msgid "Synchronizing Device"
+@@ -3236,6 +3253,7 @@
+ 
+ #: ../src/Dap/Banshee.Dap.MassStorage/MassStorageDap.cs:189
+ #: ../src/Dap/Banshee.Dap.MassStorage/MassStorageDap.cs:191
++#: ../src/Dap/Banshee.Dap.Mtp/MtpDap.cs:193
+ msgid "Vendor"
+ msgstr "Tillverkare"
+ 
+@@ -3257,80 +3275,122 @@
+ msgstr[0] "Ljudformat"
+ msgstr[1] "Ljudformat"
+ 
+-#: ../src/Dap/Banshee.Dap.MassStorage/MassStorageDap.cs:264
++#: ../src/Dap/Banshee.Dap.MassStorage/MassStorageDap.cs:271
+ msgid "Loading Songs"
+ msgstr "LÃ¤ser in lÃ¥tar"
+ 
+-#: ../src/Dap/Banshee.Dap.MassStorage/MassStorageDap.cs:265
++#: ../src/Dap/Banshee.Dap.MassStorage/MassStorageDap.cs:272
+ msgid "The audio device song loading process is currently running.  Would you like to stop it?"
+ msgstr "LÃ¥tinlÃ¤sningsprocessen fÃ¶r ljudenheten kÃ¶rs fÃ¶r nÃ¤rvarande. Vill du stoppa den?"
+ 
+-#: ../src/Dap/Banshee.Dap.MassStorage/MassStorageDap.cs:266
++#: ../src/Dap/Banshee.Dap.MassStorage/MassStorageDap.cs:273
+ #, csharp-format
+ msgid "Loading {0} of {1}"
+ msgstr "LÃ¤ser in {0} av {1}"
+ 
+-#: ../src/Dap/Banshee.Dap.MassStorage/MassStorageDap.cs:315
++#: ../src/Dap/Banshee.Dap.MassStorage/MassStorageDap.cs:322
+ #, csharp-format
+ msgid "Copying {0} of {1}"
+ msgstr "Kopierar {0} av {1}"
+ 
+-#: ../src/Dap/Banshee.Dap.MassStorage/MassStorageDap.cs:330
+-msgid "Song Playing on Device"
+-msgstr "LÃ¥t spelar pÃ¥ enhet"
+-
+-#: ../src/Dap/Banshee.Dap.MassStorage/MassStorageDap.cs:331
+-msgid "Before you can eject your device, you need to start playing a song that is not on it.  This is a known bug."
+-msgstr "Innan du kan mata ut din enhet, behÃ¶ver du starta uppspelning av en lÃ¥t som inte finns pÃ¥ den.  Det hÃ¤r Ã¤r ett kÃ¤nt fel."
+-
+-#: ../src/Dap/Banshee.Dap.MassStorage/MassStorageDap.cs:362
++#: ../src/Dap/Banshee.Dap.MassStorage/MassStorageDap.cs:364
+ #, csharp-format
+ msgid "Failed to Unmount {0}"
+ msgstr "Misslyckades med att avmontera {0}"
+ 
+-#: ../src/Dap/Banshee.Dap.MassStorage/MassStorageDap.cs:363
++#: ../src/Dap/Banshee.Dap.MassStorage/MassStorageDap.cs:365
+ msgid "Make sure no other programs are using it."
+ msgstr "Se till att inga andra program anvÃ¤nder den."
+ 
+-#: ../src/Dap/Banshee.Dap.MassStorage/MassStorageDap.cs:375
++#: ../src/Dap/Banshee.Dap.MassStorage/MassStorageDap.cs:377
+ #, csharp-format
+ msgid "Failed to Eject {0}"
+ msgstr "Misslyckades med att mata ut {0}"
+ 
+-#: ../src/Dap/Banshee.Dap.MassStorage/MassStorageDap.cs:529
++#: ../src/Dap/Banshee.Dap.MassStorage/MassStorageDap.cs:549
+ #, csharp-format
+ msgid "Removing songs from {0}"
+ msgstr "Tar bort lÃ¥tar frÃ¥n {0}"
+ 
+-#: ../src/Dap/Banshee.Dap.MassStorage/MassStorageDap.cs:530
++#: ../src/Dap/Banshee.Dap.MassStorage/MassStorageDap.cs:550
+ #, csharp-format
+ msgid "Removing {0} of {1}"
+ msgstr "Tar bort {0} av {1}"
+ 
+-#: ../src/Dap/Banshee.Dap.MassStorage/MassStorageDap.cs:565
++#: ../src/Dap/Banshee.Dap.MassStorage/MassStorageDap.cs:667
+ msgid "Audio Device"
+ msgstr "Ljudenhet"
+ 
+-#: ../src/Dap/Banshee.Dap.Mtp/MtpDap.cs:168
+-msgid ": Found"
+-msgstr ": Hittade"
++#: ../src/Dap/Banshee.Dap.Mtp/MtpDap.cs:97
++#: ../src/Dap/Banshee.Dap.Mtp/MtpDap.cs:145
++msgid "MTP Support Ignoring Device"
++msgstr "MTP-stÃ¶d ignorerar enhet"
+ 
+-#: ../src/Dap/Banshee.Dap.Mtp/MtpDap.cs:169
+-msgid "Reading library information"
+-msgstr "LÃ¤ser biblioteksinformation"
++#: ../src/Dap/Banshee.Dap.Mtp/MtpDap.cs:98
++#: ../src/Dap/Banshee.Dap.Mtp/MtpDap.cs:146
++msgid "Banshee's MTP audio player support can only handle one device at a time."
++msgstr "Banshees stÃ¶d fÃ¶r MTP-ljudspelare kan endast hantera en enhet Ã¥t gÃ¥ngen."
+ 
+-#: ../src/Dap/Banshee.Dap.Mtp/MtpDap.cs:180
+-msgid "Loading device"
+-msgstr "LÃ¤ser enhet"
++#: ../src/Dap/Banshee.Dap.Mtp/MtpDap.cs:117
++msgid "Error Initializing MTP Device Support"
++msgstr "Fel vid initiering av stÃ¶d fÃ¶r MTP-enheter"
+ 
+-#: ../src/Dap/Banshee.Dap.Mtp/MtpDap.cs:184
+-msgid "Done"
+-msgstr "Klar"
++#: ../src/Dap/Banshee.Dap.Mtp/MtpDap.cs:118
++msgid "There was an error intializing MTP device support.  See http://www.banshee-project.org/Guide/DAPs/MTP for more information."
++msgstr "Det intrÃ¤ffade ett fel vid initiering av stÃ¶d fÃ¶r MTP-enhet.  Se http://www.banshee-project.org/Guide/DAPs/MTP fÃ¶r mer information."
+ 
+-#: ../src/Dap/Banshee.Dap.Mtp/MtpDap.cs:185
+-msgid ": Ready for use"
+-msgstr ": Klar fÃ¶r anvÃ¤ndning"
++#: ../src/Dap/Banshee.Dap.Mtp/MtpDap.cs:130
++msgid "Error Finding MTP Device Support"
++msgstr "Fel vid sÃ¶kning efter stÃ¶d fÃ¶r MTP-enhet"
+ 
++#: ../src/Dap/Banshee.Dap.Mtp/MtpDap.cs:131
++msgid "An MTP device was detected, but Banshee was unable to load support for it."
++msgstr "En MTP-enhet hittades men Banshee kunde inte lÃ¤sa in stÃ¶d fÃ¶r den."
++
++#: ../src/Dap/Banshee.Dap.Mtp/MtpDap.cs:195
++msgid "Audio Format(s)"
++msgstr "Ljudformat"
++
++#: ../src/Dap/Banshee.Dap.Mtp/MtpDap.cs:196
++msgid "Album Art"
++msgstr "Albumomslag"
++
++#: ../src/Dap/Banshee.Dap.Mtp/MtpDap.cs:196
++msgid "Yes"
++msgstr "Ja"
++
++#: ../src/Dap/Banshee.Dap.Mtp/MtpDap.cs:196
++msgid "No"
++msgstr "Nej"
++
++#: ../src/Dap/Banshee.Dap.Mtp/MtpDap.cs:198
++msgid "Serial Number"
++msgstr "Serienummer"
++
++#: ../src/Dap/Banshee.Dap.Mtp/MtpDap.cs:254
++#, csharp-format
++msgid "Loading {0}"
++msgstr "LÃ¤ser in {0}"
++
++#: ../src/Dap/Banshee.Dap.Mtp/MtpDap.cs:439
++#: ../src/Dap/Banshee.Dap.Mtp/MtpDap.cs:446
++msgid "Syncing album art"
++msgstr "Synkronisering av albumomslag"
++
++#: ../src/Dap/Banshee.Dap.Mtp/MtpDap.cs:451
++#, csharp-format
++msgid "There was an unknown error while synchronizing {0}."
++msgstr "Det intrÃ¤ffade ett okÃ¤nt fel vid synkronisering av {0}."
++
++#: ../src/Dap/Banshee.Dap.Mtp/MtpDap.cs:467
++msgid "MTP Device Error"
++msgstr "MTP-enhetsfel"
++
++#: ../src/Dap/Banshee.Dap.Mtp/MtpDap.cs:483
++#, csharp-format
++msgid "Importing from {0}"
++msgstr "Importerar frÃ¥n {0}"
++
+ #: ../src/Dap/Banshee.Dap.Njb/NjbDap.cs:155
+ msgid "Cannot read device"
+ msgstr "Kan inte lÃ¤sa enhet"
+@@ -3343,7 +3403,7 @@
+ msgid "Could not set the owner of the device."
+ msgstr "Kunde inte stÃ¤lla in Ã¤garen fÃ¶r enheten."
+ 
+-#: ../src/Engines/Banshee.MediaEngine.GStreamer/GstPlayerEngine.cs:138
++#: ../src/Engines/Banshee.MediaEngine.GStreamer/GstPlayerEngine.cs:140
+ msgid "Could not initialize GStreamer library"
+ msgstr "Kunde inte initiera GStreamer-bibliotek"
+ 
+@@ -3366,7 +3426,7 @@
+ msgstr "LÃ¶senord:"
+ 
+ #: ../src/Plugins/Banshee.Plugins.Audioscrobbler/AudioscrobblerConfigDialog.cs:60
+-#: ../src/Plugins/Banshee.Plugins.Audioscrobbler/AudioscrobblerPlugin.cs:142
++#: ../src/Plugins/Banshee.Plugins.Audioscrobbler/AudioscrobblerPlugin.cs:143
+ msgid "Audioscrobbler Reporting"
+ msgstr "Audioscrobbler-rapportering"
+ 
+@@ -3379,7 +3439,7 @@
+ msgstr "GÃ¥ med i Banshee-gruppen"
+ 
+ #: ../src/Plugins/Banshee.Plugins.Audioscrobbler/AudioscrobblerConfigDialog.cs:90
+-#: ../src/Plugins/Banshee.Plugins.Audioscrobbler/AudioscrobblerPlugin.cs:115
++#: ../src/Plugins/Banshee.Plugins.Audioscrobbler/AudioscrobblerPlugin.cs:116
+ msgid "Enable song reporting"
+ msgstr "Aktivera lÃ¥trapportering"
+ 
+@@ -3395,36 +3455,36 @@
+ msgid "Your profile page on Last.fm is automatically updated whenever you listen to music. It lets others see what you're listening to right now, and shows charts of your listening history."
+ msgstr "Din profilsida pÃ¥ Last.fm uppdateras automatiskt nÃ¤r du lyssnar pÃ¥ musik. Den lÃ¥ter andra se vad du lyssnar pÃ¥ just nu, och visar grafer Ã¶ver din lyssningshistorik."
+ 
+-#: ../src/Plugins/Banshee.Plugins.Audioscrobbler/AudioscrobblerPlugin.cs:96
++#: ../src/Plugins/Banshee.Plugins.Audioscrobbler/AudioscrobblerPlugin.cs:97
+ msgid "_Audioscrobbler"
+ msgstr "_Audioscrobbler"
+ 
+-#: ../src/Plugins/Banshee.Plugins.Audioscrobbler/AudioscrobblerPlugin.cs:97
+-#: ../src/Plugins/Banshee.Plugins.Audioscrobbler/AudioscrobblerPlugin.cs:109
++#: ../src/Plugins/Banshee.Plugins.Audioscrobbler/AudioscrobblerPlugin.cs:98
++#: ../src/Plugins/Banshee.Plugins.Audioscrobbler/AudioscrobblerPlugin.cs:110
+ msgid "Configure the Audioscrobbler plugin"
+ msgstr "Konfigurera insticksmodulen Audioscrobbler"
+ 
+-#: ../src/Plugins/Banshee.Plugins.Audioscrobbler/AudioscrobblerPlugin.cs:100
++#: ../src/Plugins/Banshee.Plugins.Audioscrobbler/AudioscrobblerPlugin.cs:101
+ msgid "Visit _user profile page"
+ msgstr "BesÃ¶k _anvÃ¤ndarens profilsida"
+ 
+-#: ../src/Plugins/Banshee.Plugins.Audioscrobbler/AudioscrobblerPlugin.cs:101
++#: ../src/Plugins/Banshee.Plugins.Audioscrobbler/AudioscrobblerPlugin.cs:102
+ msgid "Visit your Audioscrobbler profile page"
+ msgstr "BesÃ¶k din profilsida fÃ¶r Audioscrobbler"
+ 
+-#: ../src/Plugins/Banshee.Plugins.Audioscrobbler/AudioscrobblerPlugin.cs:104
++#: ../src/Plugins/Banshee.Plugins.Audioscrobbler/AudioscrobblerPlugin.cs:105
+ msgid "Visit _group page"
+ msgstr "BesÃ¶k _gruppens sida"
+ 
+-#: ../src/Plugins/Banshee.Plugins.Audioscrobbler/AudioscrobblerPlugin.cs:105
++#: ../src/Plugins/Banshee.Plugins.Audioscrobbler/AudioscrobblerPlugin.cs:106
+ msgid "Visit the Banshee last.fm group page"
+ msgstr "BesÃ¶k Banshees last.fm-gruppsida"
+ 
+-#: ../src/Plugins/Banshee.Plugins.Audioscrobbler/AudioscrobblerPlugin.cs:108
++#: ../src/Plugins/Banshee.Plugins.Audioscrobbler/AudioscrobblerPlugin.cs:109
+ msgid "_Configure..."
+ msgstr "_Konfigurera..."
+ 
+-#: ../src/Plugins/Banshee.Plugins.Audioscrobbler/AudioscrobblerPlugin.cs:114
++#: ../src/Plugins/Banshee.Plugins.Audioscrobbler/AudioscrobblerPlugin.cs:115
+ msgid "_Enable song reporting"
+ msgstr "_Aktivera lÃ¥trapportering"
+ 
+@@ -3447,6 +3507,7 @@
+ #: ../src/Plugins/Banshee.Plugins.Audioscrobbler/banshee-plugin-audioscrobbler.schemas.in.h:5
+ #: ../src/Plugins/Banshee.Plugins.Bookmarks/banshee-plugin-bookmarks.schemas.in.h:2
+ #: ../src/Plugins/Banshee.Plugins.Daap/banshee-plugin-daap.schemas.in.h:3
++#: ../src/Plugins/Banshee.Plugins.LastFM/banshee-plugin-lastfm.schemas.in.h:6
+ #: ../src/Plugins/Banshee.Plugins.MetadataSearch/banshee-plugin-metadatasearcher.schemas.in.h:2
+ #: ../src/Plugins/Banshee.Plugins.MiniMode/banshee-plugin-minimode.schemas.in.h:2
+ #: ../src/Plugins/Banshee.Plugins.MMKeys/banshee-plugin-mmkeys.schemas.in.h:2
+@@ -3625,6 +3686,269 @@
+ msgid "Disconnect"
+ msgstr "Koppla frÃ¥n"
+ 
++#: ../src/Plugins/Banshee.Plugins.LastFM/Connection.cs:333
++msgid "Failed to Login to Last.fm"
++msgstr "Misslyckades med att logga in pÃ¥ Last.fm"
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/Connection.cs:334
++msgid "Either your username or password is invalid."
++msgstr "Antingen Ã¤r ditt anvÃ¤ndarnamn eller lÃ¶senord felaktigt."
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/Connection.cs:457
++msgid "There is not enough content to play this station."
++msgstr "Det finns inte tillrÃ¤ckligt mycket innehÃ¥ll fÃ¶r att spela upp denna station."
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/Connection.cs:458
++msgid "This group does not have enough members for radio."
++msgstr "Denna grupp har inte tillrÃ¤ckligt mÃ¥nga medlemmar fÃ¶r radio."
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/Connection.cs:459
++msgid "This artist does not have enough fans for radio."
++msgstr "Denna artist har inte tillrÃ¤ckligt mÃ¥nga fans fÃ¶r radio."
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/Connection.cs:460
++msgid "This station is not available."
++msgstr "Denna station Ã¤r inte tillgÃ¤nglig."
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/Connection.cs:461
++msgid "This station is only available to subscribers."
++msgstr "Denna station Ã¤r endast tillgÃ¤nglig fÃ¶r prenumeranter."
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/Connection.cs:462
++msgid "There are not enough neighbours for this station."
++msgstr "Det finns inte tillrÃ¤ckligt mÃ¥nga grannar fÃ¶r denna station."
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/Connection.cs:463
++msgid "The streaming system is offline for maintenance, please try again later."
++msgstr "StrÃ¶mningssystemet Ã¤r nere fÃ¶r underhÃ¥ll. FÃ¶rsÃ¶k igen senare."
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/Connection.cs:464
++msgid "There was an unknown error."
++msgstr "Det intrÃ¤ffade ett okÃ¤nt fel."
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/Connection.cs:472
++msgid "Not connected to Last.fm."
++msgstr "Inte ansluten till Last.fm."
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/Connection.cs:473
++msgid "Need account details before can connect to Last.fm"
++msgstr "BehÃ¶ver kontoinformation innan anslutning till Last.fm kan gÃ¶ras"
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/Connection.cs:474
++msgid "No network connection detected."
++msgstr "Ingen nÃ¤tverksanslutning hittades."
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/Connection.cs:475
++msgid "Last.fm username or password is invalid."
++msgstr "AnvÃ¤ndarnamnet eller lÃ¶senordet fÃ¶r Last.fm Ã¤r felaktigt."
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/Connection.cs:476
++msgid "Connecting to Last.fm."
++msgstr "Ansluter till Last.fm."
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/Connection.cs:477
++msgid "Connected to Last.fm."
++msgstr "Ansluten till Last.fm."
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/Editor.cs:62
++msgid "Edit Station"
++msgstr "Redigera station"
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/Editor.cs:69
++msgid "New Station"
++msgstr "Ny station"
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/LastFMSource.cs:178
++msgid "Edit Last.fm Settings"
++msgstr "Redigera instÃ¤llningar fÃ¶r Last.fm"
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/LastFMSource.cs:257
++msgid "Last.fm (Disconnected)"
++msgstr "Last.fm (FrÃ¥nkopplad)"
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/Plugin.cs:76
++msgid "Last.fm Radio"
++msgstr "Last.fm-radio"
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/Plugin.cs:80
++msgid "Play music from Last.fm, the world's largest social music platform. Show off your taste, see what your friends are listening to, hear new music, get personal radio, recommendations, and downloads, all for free."
++msgstr "Spela upp musik frÃ¥n Last.fm, vÃ¤rldens stÃ¶rsta sociala musikplattform. Visa upp din musiksmak fÃ¶r andra, se vad dina vÃ¤nner lyssnar pÃ¥, lyssna pÃ¥ ny musik, fÃ¥ en personlig radio, rekommendera musik och hÃ¤mta ner musik. Allt Ã¤r kostnadsfritt."
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/Plugin.cs:108
++msgid "_Add Station"
++msgstr "_LÃ¤gg till station"
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/Plugin.cs:113
++msgid "Connect"
++msgstr "Anslut"
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/Plugin.cs:118
++msgid "Sort Stations by"
++msgstr "Sortera stationer efter"
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/Plugin.cs:123
++msgid "Love Track"
++msgstr "Ã„lska spÃ¥ret"
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/Plugin.cs:124
++msgid "Mark current track as loved"
++msgstr "Markera aktuellt spÃ¥r som Ã¤lskat"
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/Plugin.cs:128
++msgid "Ban Track"
++msgstr "Bannlys spÃ¥ret"
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/Plugin.cs:129
++msgid "Mark current track as banned"
++msgstr "Markera aktuellt spÃ¥r som bannlyst"
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/Plugin.cs:137
++msgid "Station Name"
++msgstr "Stationsnamn"
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/Plugin.cs:142
++msgid "Total Play Count"
++msgstr "Totalt antal spelningar"
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/Plugin.cs:147
++msgid "Station Type"
++msgstr "Stationstyp"
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/StationSource.cs:216
++#, csharp-format
++msgid "Tuning Last.fm to {0}."
++msgstr "Rattar in Last.fm till {0}."
++
++#. Translators: {0} is an error message sentence from Connection.cs.
++#: ../src/Plugins/Banshee.Plugins.LastFM/StationSource.cs:226
++#, csharp-format
++msgid "Failed to tune in station. {0}"
++msgstr "Misslyckades med ta emot station. {0}"
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/StationSource.cs:306
++#, csharp-format
++msgid "Getting new songs for {0}."
++msgstr "HÃ¤mtar nya lÃ¥tar fÃ¶r {0}."
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/StationSource.cs:313
++#, csharp-format
++msgid "No new songs available for {0}."
++msgstr "Inga nya lÃ¥tar tillgÃ¤ngliga fÃ¶r {0}."
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/StationSource.cs:336
++#, csharp-format
++msgid "Failed to get new songs for {0}."
++msgstr "Misslyckades med att hÃ¤mta nya lÃ¥tar fÃ¶r {0}."
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/StationSource.cs:432
++msgid "Delete Last.fm Station"
++msgstr "Ta bort Last.fm-station"
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/StationSource.cs:437
++msgid "Last.fm Station"
++msgstr "Last.fm-station"
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/StationSource.cs:442
++msgid "Edit Last.fm Station"
++msgstr "Redigera Last.fm-station"
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/StationSource.cs:484
++#: ../src/Plugins/Banshee.Plugins.LastFM/StationType.cs:85
++msgid "Recommended"
++msgstr "Rekommenderad"
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/StationSource.cs:485
++#: ../src/Plugins/Banshee.Plugins.LastFM/StationType.cs:94
++msgid "Personal"
++msgstr "Personlig"
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/StationSource.cs:486
++#: ../src/Plugins/Banshee.Plugins.LastFM/StationType.cs:103
++msgid "Loved"
++msgstr "Ã„lskat"
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/StationSource.cs:487
++#: ../src/Plugins/Banshee.Plugins.LastFM/StationType.cs:112
++msgid "Neighbors"
++msgstr "Grannar"
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/StationType.cs:86
++#: ../src/Plugins/Banshee.Plugins.LastFM/StationType.cs:95
++msgid "For User:"
++msgstr "FÃ¶r anvÃ¤ndare:"
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/StationType.cs:104
++msgid "By User:"
++msgstr "Av anvÃ¤ndare:"
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/StationType.cs:113
++msgid "Of User:"
++msgstr "Till anvÃ¤ndare:"
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/StationType.cs:121
++msgid "Group"
++msgstr "Grupp"
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/StationType.cs:122
++msgid "Group Name:"
++msgstr "Gruppnamn:"
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/StationType.cs:130
++msgid "Tag"
++msgstr "Tagg"
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/StationType.cs:131
++msgid "Tag Name:"
++msgstr "Taggnamn:"
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/StationType.cs:139
++msgid "Fan"
++msgstr "Fan"
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/StationType.cs:140
++msgid "Fans of:"
++msgstr "Fans av:"
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/StationType.cs:148
++msgid "Similar"
++msgstr "Liknande"
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/StationType.cs:149
++msgid "Similar to:"
++msgstr "Liknande:"
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/Resources/lastfm.glade.h:1
++msgid "Station _Type:"
++msgstr "Stations_typ:"
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/Resources/lastfm.glade.h:2
++msgid "_Name:"
++msgstr "_Namn:"
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/banshee-plugin-lastfm.schemas.in.h:1
++msgid "Last.fm expanded"
++msgstr "Last.fm utfÃ¤lld"
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/banshee-plugin-lastfm.schemas.in.h:2
++msgid "Last.fm plugin enabled"
++msgstr "Insticksmodulen Last.fm aktiverad"
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/banshee-plugin-lastfm.schemas.in.h:3
++msgid "Last.fm station sort criteria. 0 = name, 1 = play count, 2 = type"
++msgstr "Sorteringskriterium fÃ¶r Last.fm-stationer. 0 = namn, 1 = antal spelningar, 2 = typ"
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/banshee-plugin-lastfm.schemas.in.h:4
++msgid "Last.fm user"
++msgstr "AnvÃ¤ndare fÃ¶r Last.fm"
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/banshee-plugin-lastfm.schemas.in.h:5
++msgid "Last.fm username"
++msgstr "AnvÃ¤ndarnamn fÃ¶r Last.fm"
++
++#: ../src/Plugins/Banshee.Plugins.LastFM/banshee-plugin-lastfm.schemas.in.h:7
++msgid "Station sort criteria"
++msgstr "Sorteringskriterium fÃ¶r stationer"
++
+ #: ../src/Plugins/Banshee.Plugins.MetadataSearch/banshee-plugin-metadatasearcher.schemas.in.h:1
+ msgid "Metadata searcher plugin enabled"
+ msgstr "Insticksmodulen MetadatasÃ¶kning aktiverad"
+@@ -3790,7 +4114,7 @@
+ msgid "Now Playing"
+ msgstr "Spelar nu"
+ 
+-#: ../src/Plugins/Banshee.Plugins.NotificationAreaIcon/NotificationAreaIconPlugin.cs:293
++#: ../src/Plugins/Banshee.Plugins.NotificationAreaIcon/NotificationAreaIconPlugin.cs:297
+ msgid "Cannot show notification"
+ msgstr "Kan inte visa notifiering"
+ 
+@@ -4240,15 +4564,23 @@
+ msgstr "Tid fÃ¶r senaste radiouppdateringskontroll"
+ 
+ #: ../src/Plugins/Banshee.Plugins.Radio/banshee-plugin-radio.schemas.in.h:10
++msgid "URI for remote stations update"
++msgstr "URI fÃ¶r uppdatering av fjÃ¤rrstationer"
++
++#: ../src/Plugins/Banshee.Plugins.Radio/banshee-plugin-radio.schemas.in.h:11
++msgid "URI to update remote stations from"
++msgstr "URI fÃ¶r att uppdatera fjÃ¤rrstationer frÃ¥n"
++
++#: ../src/Plugins/Banshee.Plugins.Radio/banshee-plugin-radio.schemas.in.h:12
+ msgid "Update remote stations from radio.banshee-project.org"
+ msgstr "Uppdatera fjÃ¤rrstationer frÃ¥n radio.banshee-project.org"
+ 
+-#: ../src/Plugins/Banshee.Plugins.Radio/CellRendererStation.cs:116
++#: ../src/Plugins/Banshee.Plugins.Radio/CellRendererStation.cs:117
+ msgid "Loading"
+ msgstr "LÃ¤ser in"
+ 
+ #: ../src/Plugins/Banshee.Plugins.Radio/RadioPlugin.cs:52
+-#: ../src/Plugins/Banshee.Plugins.Radio/RadioSource.cs:63
++#: ../src/Plugins/Banshee.Plugins.Radio/RadioSource.cs:65
+ msgid "Radio"
+ msgstr "Radio"
+ 
+@@ -4304,15 +4636,15 @@
+ msgid "Remove selected Radio Station"
+ msgstr "Ta bort markerad radiostation"
+ 
+-#: ../src/Plugins/Banshee.Plugins.Radio/RadioSource.cs:81
++#: ../src/Plugins/Banshee.Plugins.Radio/RadioSource.cs:83
+ msgid "Refreshing radio stations from the Banshee Radio Web Service"
+ msgstr "Uppdaterar radiostationer frÃ¥n Banshee Radio Web Service"
+ 
+-#: ../src/Plugins/Banshee.Plugins.Radio/RadioSource.cs:91
++#: ../src/Plugins/Banshee.Plugins.Radio/RadioSource.cs:93
+ msgid "Failed to load radio stations: "
+ msgstr "Misslyckades med att lÃ¤sa in radiostationer: "
+ 
+-#: ../src/Plugins/Banshee.Plugins.Radio/RadioSource.cs:337
++#: ../src/Plugins/Banshee.Plugins.Radio/RadioSource.cs:339
+ msgid "Invalid URI format."
+ msgstr "Ogiltigt URI-format."
+ 
+@@ -4378,12 +4710,12 @@
+ msgid "Top Albums by {0}"
+ msgstr "Toppalbum fÃ¶r {0}"
+ 
+-#: ../src/Plugins/Banshee.Plugins.Recommendation/RecommendationPane.cs:366
++#: ../src/Plugins/Banshee.Plugins.Recommendation/RecommendationPane.cs:367
+ #, csharp-format
+ msgid "{0}% Similarity"
+ msgstr "{0}% liknande"
+ 
+-#: ../src/Plugins/Banshee.Plugins.Recommendation/RecommendationPane.cs:368
++#: ../src/Plugins/Banshee.Plugins.Recommendation/RecommendationPane.cs:369
+ msgid "Unknown Similarity"
+ msgstr "OkÃ¤nd likhet"
+ 
+@@ -4400,6 +4732,52 @@
+ msgid "Show Recommendations"
+ msgstr "Visa rekommendationer"
+ 
++#~ msgid "Advanced Audio Coding (AAC)"
++#~ msgstr "Advanced Audio Coding (AAC)"
++#~ msgid ""
++#~ "Proprietary and standardized format that is superior to MP3, but not as "
++#~ "popular."
++#~ msgstr ""
++#~ "ProprietÃ¤rt och standardiserat format som Ã¤r klart bÃ¤ttre Ã¤n MP3 men inte "
++#~ "lika populÃ¤rt."
++#~ msgid ""
++#~ "WAV+PCM is a lossless format that holds uncompressed, raw pulse-code "
++#~ "modulated (PCM) audio."
++#~ msgstr ""
++#~ "WAV+PCM Ã¤r ett icke-fÃ¶rstÃ¶rande format som innehÃ¥ller okomprimerat, rÃ¥ "
++#~ "pulskodsmodulerat (PCM) ljud."
++#~ msgid "Waveform PCM"
++#~ msgstr "Waveform PCM"
++#~ msgid "Could not initialize cdparanoia"
++#~ msgstr "Kunde inte initiera cdparanoia"
++#~ msgid "Exception: "
++#~ msgstr "Undantag: "
++#~ msgid "Not a valid M3U file."
++#~ msgstr "Inte en giltig M3U-fil."
++#~ msgid "Not a valid PLS file."
++#~ msgstr "Inte en giltig PLS-fil."
++#~ msgid "Week {0} of {1}"
++#~ msgstr "Vecka {0} av {1}"
++#~ msgid "Flushing to Disk (may take time)"
++#~ msgstr "Skriver till disk (kan ta tid)"
++#~ msgid "Song Playing on Device"
++#~ msgstr "LÃ¥t spelar pÃ¥ enhet"
++#~ msgid ""
++#~ "Before you can eject your device, you need to start playing a song that "
++#~ "is not on it.  This is a known bug."
++#~ msgstr ""
++#~ "Innan du kan mata ut din enhet, behÃ¶ver du starta uppspelning av en lÃ¥t "
++#~ "som inte finns pÃ¥ den.  Det hÃ¤r Ã¤r ett kÃ¤nt fel."
++#~ msgid ": Found"
++#~ msgstr ": Hittade"
++#~ msgid "Reading library information"
++#~ msgstr "LÃ¤ser biblioteksinformation"
++#~ msgid "Loading device"
++#~ msgstr "LÃ¤ser enhet"
++#~ msgid "Done"
++#~ msgstr "Klar"
++#~ msgid ": Ready for use"
++#~ msgstr ": Klar fÃ¶r anvÃ¤ndning"
+ #~ msgid "Searching: {0}"
+ #~ msgstr "SÃ¶ker: {0}"
+ #~ msgid "Ratin_g"
+@@ -4637,10 +5015,6 @@
+ # http://bugzilla.ximian.com/show_bug.cgi?id=61062
+ #~ msgid "{0} KHz"
+ #~ msgstr "{0} KHz"
+-#~ msgid "Yes"
+-#~ msgstr "Ja"
+-#~ msgid "No"
+-#~ msgstr "Nej"
+ #~ msgid "File Transcoder"
+ #~ msgstr "Filomkodning"
+ #~ msgid "Are you sure you want to cancel the '{0}' operation?"
+@@ -4687,8 +5061,6 @@
+ #~ msgstr "<small>Kodning</small>"
+ #~ msgid "<small>Library</small>"
+ #~ msgstr "<small>Bibliotek</small>"
+-#~ msgid "Default Engine"
+-#~ msgstr "Standardmotor"
+ #~ msgid "Encoding Profile:"
+ #~ msgstr "Kodningsprofil:"
+ #~ msgid "Rename the active source"
+@@ -4795,10 +5167,6 @@
+ #~ msgstr "Inga markerade"
+ 
+ #, fuzzy
+-#~ msgid "iPod Name:"
+-#~ msgstr "FÃ¤ltnamn"
+-
+-#, fuzzy
+ #~ msgid "<span size=\"small\">Idle</span>"
+ #~ msgstr "<span size=\"larger\">OkÃ¤nd</span>"
+ 
+@@ -4824,12 +5192,7 @@
+ #~ msgid "Unkown Album"
+ #~ msgstr "OkÃ¤nt album"
+ 
+-# SUN CHANGED MESSAGE
+ #, fuzzy
+-#~ msgid "Error Burning CD"
+-#~ msgstr "Fel vid Ã¶ppnande av cd"
+-
+-#, fuzzy
+ #~ msgid "Encoding files..."
+ #~ msgstr "Flyttar filer"
+ 
+@@ -4838,10 +5201,6 @@
+ #~ msgstr "FÃ¤ltnamn"
+ 
+ #, fuzzy
+-#~ msgid "Your Name"
+-#~ msgstr "Ditt vÃ¤rdnamn"
+-
+-#, fuzzy
+ #~ msgid "Computer Name"
+ #~ msgstr "Dator"
+ 
+@@ -4856,8 +5215,6 @@
+ #, fuzzy
+ #~ msgid "Write Support"
+ #~ msgstr "White Sulphur"
+-#~ msgid "Serial Number"
+-#~ msgstr "Serienummer"
+ 
+ #, fuzzy
+ #~ msgid "Database Version"
+@@ -5016,8 +5373,6 @@
+ #~ msgstr "Klipp ut markering"
+ #~ msgid "D_eselect All"
+ #~ msgstr "A_vmarkera alla"
+-#~ msgid "Delete selection"
+-#~ msgstr "Ta bort markering"
+ #~ msgid "Display music player help"
+ #~ msgstr "Visa hjÃ¤lp fÃ¶r musikspelaren"
+ #~ msgid "Edit music player preferences"

Modified: packages/banshee/trunk/debian/patches/99_autoreconf.patch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/banshee/trunk/debian/patches/99_autoreconf.patch?rev=3865&op=diff
==============================================================================
--- packages/banshee/trunk/debian/patches/99_autoreconf.patch (original)
+++ packages/banshee/trunk/debian/patches/99_autoreconf.patch Wed Apr  2 09:02:49 2008
@@ -1,6 +1,6 @@
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/aclocal.m4 banshee-0.13.2+dfsg/aclocal.m4
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/aclocal.m4 banshee-0.13.2+dfsg/aclocal.m4
 --- banshee-0.13.2+dfsg.old/aclocal.m4	2008-01-09 00:06:50.000000000 +0100
-+++ banshee-0.13.2+dfsg/aclocal.m4	2008-04-01 20:38:24.000000000 +0200
++++ banshee-0.13.2+dfsg/aclocal.m4	2008-04-02 11:01:43.000000000 +0200
 @@ -1,7 +1,7 @@
 -# generated automatically by aclocal 1.10 -*- Autoconf -*-
 +# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
@@ -865,9 +865,9 @@
  m4_include([build/m4/banshee/taglib.m4])
  m4_include([build/m4/shamrock/expansions.m4])
  m4_include([build/m4/shamrock/gstreamer.m4])
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/branding/Makefile.in banshee-0.13.2+dfsg/branding/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/branding/Makefile.in banshee-0.13.2+dfsg/branding/Makefile.in
 --- banshee-0.13.2+dfsg.old/branding/Makefile.in	2008-01-09 00:06:53.000000000 +0100
-+++ banshee-0.13.2+dfsg/branding/Makefile.in	2008-04-01 20:38:30.000000000 +0200
++++ banshee-0.13.2+dfsg/branding/Makefile.in	2008-04-02 11:01:49.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -969,9 +969,9 @@
  @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.dll \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/build/m4/Makefile.in banshee-0.13.2+dfsg/build/m4/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/build/m4/Makefile.in banshee-0.13.2+dfsg/build/m4/Makefile.in
 --- banshee-0.13.2+dfsg.old/build/m4/Makefile.in	2008-01-09 00:06:53.000000000 +0100
-+++ banshee-0.13.2+dfsg/build/m4/Makefile.in	2008-04-01 20:38:30.000000000 +0200
++++ banshee-0.13.2+dfsg/build/m4/Makefile.in	2008-04-02 11:01:50.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -1063,9 +1063,9 @@
  OBJEXT = @OBJEXT@
  PACKAGE = @PACKAGE@
  PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/build/Makefile.in banshee-0.13.2+dfsg/build/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/build/Makefile.in banshee-0.13.2+dfsg/build/Makefile.in
 --- banshee-0.13.2+dfsg.old/build/Makefile.in	2008-01-09 00:06:53.000000000 +0100
-+++ banshee-0.13.2+dfsg/build/Makefile.in	2008-04-01 20:38:30.000000000 +0200
++++ banshee-0.13.2+dfsg/build/Makefile.in	2008-04-02 11:01:49.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -1205,9 +1205,9 @@
  	test -z "$(CTAGS_ARGS)$$tags$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
  	     $$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/configure banshee-0.13.2+dfsg/configure
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/configure banshee-0.13.2+dfsg/configure
 --- banshee-0.13.2+dfsg.old/configure	2008-01-09 00:06:52.000000000 +0100
-+++ banshee-0.13.2+dfsg/configure	2008-04-01 20:38:28.000000000 +0200
++++ banshee-0.13.2+dfsg/configure	2008-04-02 11:01:47.000000000 +0200
 @@ -860,14 +860,14 @@
  INTLTOOL_SCHEMAS_RULE
  INTLTOOL_THEME_RULE
@@ -4075,9 +4075,9 @@
        -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
  	< ${ac_aux_dir}/${file}.in > ${file}.out
    if cmp -s ${file} ${file}.out 2>/dev/null; then
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/data/audio-profiles/Makefile.in banshee-0.13.2+dfsg/data/audio-profiles/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/data/audio-profiles/Makefile.in banshee-0.13.2+dfsg/data/audio-profiles/Makefile.in
 --- banshee-0.13.2+dfsg.old/data/audio-profiles/Makefile.in	2008-01-09 00:06:54.000000000 +0100
-+++ banshee-0.13.2+dfsg/data/audio-profiles/Makefile.in	2008-04-01 20:38:30.000000000 +0200
++++ banshee-0.13.2+dfsg/data/audio-profiles/Makefile.in	2008-04-02 11:01:50.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4179,9 +4179,9 @@
  
  audioprofiles_DATA = $(audioprofiles_in_files:.xml.in=.xml)
  EXTRA_DIST = $(audioprofiles_in_files)
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/data/images/app-icons/Makefile.in banshee-0.13.2+dfsg/data/images/app-icons/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/data/images/app-icons/Makefile.in banshee-0.13.2+dfsg/data/images/app-icons/Makefile.in
 --- banshee-0.13.2+dfsg.old/data/images/app-icons/Makefile.in	2008-01-09 00:06:54.000000000 +0100
-+++ banshee-0.13.2+dfsg/data/images/app-icons/Makefile.in	2008-04-01 20:38:30.000000000 +0200
++++ banshee-0.13.2+dfsg/data/images/app-icons/Makefile.in	2008-04-02 11:01:50.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4273,9 +4273,9 @@
  OBJEXT = @OBJEXT@
  PACKAGE = @PACKAGE@
  PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/data/images/Makefile.in banshee-0.13.2+dfsg/data/images/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/data/images/Makefile.in banshee-0.13.2+dfsg/data/images/Makefile.in
 --- banshee-0.13.2+dfsg.old/data/images/Makefile.in	2008-01-09 00:06:54.000000000 +0100
-+++ banshee-0.13.2+dfsg/data/images/Makefile.in	2008-04-01 20:38:30.000000000 +0200
++++ banshee-0.13.2+dfsg/data/images/Makefile.in	2008-04-02 11:01:50.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4405,9 +4405,9 @@
  	test -z "$(CTAGS_ARGS)$$tags$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
  	     $$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/data/Makefile.in banshee-0.13.2+dfsg/data/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/data/Makefile.in banshee-0.13.2+dfsg/data/Makefile.in
 --- banshee-0.13.2+dfsg.old/data/Makefile.in	2008-01-09 00:06:54.000000000 +0100
-+++ banshee-0.13.2+dfsg/data/Makefile.in	2008-04-01 20:38:30.000000000 +0200
++++ banshee-0.13.2+dfsg/data/Makefile.in	2008-04-02 11:01:50.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4537,9 +4537,9 @@
  	test -z "$(CTAGS_ARGS)$$tags$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
  	     $$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/depcomp banshee-0.13.2+dfsg/depcomp
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/depcomp banshee-0.13.2+dfsg/depcomp
 --- banshee-0.13.2+dfsg.old/depcomp	2008-01-09 00:06:55.000000000 +0100
-+++ banshee-0.13.2+dfsg/depcomp	2008-04-01 20:38:32.000000000 +0200
++++ banshee-0.13.2+dfsg/depcomp	2008-04-02 11:01:51.000000000 +0200
 @@ -1,9 +1,9 @@
  #! /bin/sh
  # depcomp - compile a program generating dependencies as side-effects
@@ -4604,9 +4604,9 @@
    else
      # The sourcefile does not contain any dependencies, so just
      # store a dummy comment line, to avoid errors with the Makefile
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/docs/Makefile.in banshee-0.13.2+dfsg/docs/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/docs/Makefile.in banshee-0.13.2+dfsg/docs/Makefile.in
 --- banshee-0.13.2+dfsg.old/docs/Makefile.in	2008-01-09 00:06:54.000000000 +0100
-+++ banshee-0.13.2+dfsg/docs/Makefile.in	2008-04-01 20:38:31.000000000 +0200
++++ banshee-0.13.2+dfsg/docs/Makefile.in	2008-04-02 11:01:50.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4709,9 +4709,9 @@
  # 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 -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/ext/dbus-sharp/Makefile.in banshee-0.13.2+dfsg/ext/dbus-sharp/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/ext/dbus-sharp/Makefile.in banshee-0.13.2+dfsg/ext/dbus-sharp/Makefile.in
 --- banshee-0.13.2+dfsg.old/ext/dbus-sharp/Makefile.in	2008-01-09 00:06:54.000000000 +0100
-+++ banshee-0.13.2+dfsg/ext/dbus-sharp/Makefile.in	2008-04-01 20:38:31.000000000 +0200
++++ banshee-0.13.2+dfsg/ext/dbus-sharp/Makefile.in	2008-04-02 11:01:50.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4813,9 +4813,9 @@
  @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.dll \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/ext/hal-sharp/Makefile.in banshee-0.13.2+dfsg/ext/hal-sharp/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/ext/hal-sharp/Makefile.in banshee-0.13.2+dfsg/ext/hal-sharp/Makefile.in
 --- banshee-0.13.2+dfsg.old/ext/hal-sharp/Makefile.in	2008-01-09 00:06:54.000000000 +0100
-+++ banshee-0.13.2+dfsg/ext/hal-sharp/Makefile.in	2008-04-01 20:38:31.000000000 +0200
++++ banshee-0.13.2+dfsg/ext/hal-sharp/Makefile.in	2008-04-02 11:01:51.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4917,9 +4917,9 @@
  @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.dll \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/ext/libmtp-sharp/Makefile.in banshee-0.13.2+dfsg/ext/libmtp-sharp/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/ext/libmtp-sharp/Makefile.in banshee-0.13.2+dfsg/ext/libmtp-sharp/Makefile.in
 --- banshee-0.13.2+dfsg.old/ext/libmtp-sharp/Makefile.in	2008-01-09 00:06:54.000000000 +0100
-+++ banshee-0.13.2+dfsg/ext/libmtp-sharp/Makefile.in	2008-04-01 20:38:31.000000000 +0200
++++ banshee-0.13.2+dfsg/ext/libmtp-sharp/Makefile.in	2008-04-02 11:01:51.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5071,9 +5071,9 @@
  	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
  install-asmSCRIPTS: $(asm_SCRIPTS)
  	@$(NORMAL_INSTALL)
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/ext/Makefile.in banshee-0.13.2+dfsg/ext/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/ext/Makefile.in banshee-0.13.2+dfsg/ext/Makefile.in
 --- banshee-0.13.2+dfsg.old/ext/Makefile.in	2008-01-09 00:06:54.000000000 +0100
-+++ banshee-0.13.2+dfsg/ext/Makefile.in	2008-04-01 20:38:31.000000000 +0200
++++ banshee-0.13.2+dfsg/ext/Makefile.in	2008-04-02 11:01:50.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5203,9 +5203,9 @@
  	test -z "$(CTAGS_ARGS)$$tags$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
  	     $$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/ext/taglib-sharp/Makefile.in banshee-0.13.2+dfsg/ext/taglib-sharp/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/ext/taglib-sharp/Makefile.in banshee-0.13.2+dfsg/ext/taglib-sharp/Makefile.in
 --- banshee-0.13.2+dfsg.old/ext/taglib-sharp/Makefile.in	2008-01-09 00:06:54.000000000 +0100
-+++ banshee-0.13.2+dfsg/ext/taglib-sharp/Makefile.in	2008-04-01 20:38:31.000000000 +0200
++++ banshee-0.13.2+dfsg/ext/taglib-sharp/Makefile.in	2008-04-02 11:01:51.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5339,9 +5339,9 @@
  # 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 -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/extras/Makefile.in banshee-0.13.2+dfsg/extras/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/extras/Makefile.in banshee-0.13.2+dfsg/extras/Makefile.in
 --- banshee-0.13.2+dfsg.old/extras/Makefile.in	2008-01-09 00:06:54.000000000 +0100
-+++ banshee-0.13.2+dfsg/extras/Makefile.in	2008-04-01 20:38:31.000000000 +0200
++++ banshee-0.13.2+dfsg/extras/Makefile.in	2008-04-02 11:01:51.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5471,9 +5471,9 @@
  	test -z "$(CTAGS_ARGS)$$tags$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
  	     $$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/extras/tools/Makefile.in banshee-0.13.2+dfsg/extras/tools/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/extras/tools/Makefile.in banshee-0.13.2+dfsg/extras/tools/Makefile.in
 --- banshee-0.13.2+dfsg.old/extras/tools/Makefile.in	2008-01-09 00:06:54.000000000 +0100
-+++ banshee-0.13.2+dfsg/extras/tools/Makefile.in	2008-04-01 20:38:32.000000000 +0200
++++ banshee-0.13.2+dfsg/extras/tools/Makefile.in	2008-04-02 11:01:51.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5575,9 +5575,9 @@
  @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.dll \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/install-sh banshee-0.13.2+dfsg/install-sh
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/install-sh banshee-0.13.2+dfsg/install-sh
 --- banshee-0.13.2+dfsg.old/install-sh	2008-01-09 00:06:53.000000000 +0100
-+++ banshee-0.13.2+dfsg/install-sh	2008-04-01 20:38:29.000000000 +0200
++++ banshee-0.13.2+dfsg/install-sh	2008-04-02 11:01:49.000000000 +0200
 @@ -1,7 +1,7 @@
  #!/bin/sh
  # install - install a program, script, or datafile
@@ -5940,9 +5940,9 @@
  
      trap '' 0
    fi
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/intltool-extract.in banshee-0.13.2+dfsg/intltool-extract.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/intltool-extract.in banshee-0.13.2+dfsg/intltool-extract.in
 --- banshee-0.13.2+dfsg.old/intltool-extract.in	2008-01-09 00:06:47.000000000 +0100
-+++ banshee-0.13.2+dfsg/intltool-extract.in	2008-04-01 20:38:17.000000000 +0200
++++ banshee-0.13.2+dfsg/intltool-extract.in	2008-04-02 11:01:36.000000000 +0200
 @@ -32,7 +32,7 @@
  ## Release information
  my $PROGRAM      = "intltool-extract";
@@ -6000,9 +6000,9 @@
  sub type_glade {
      ### For translatable Glade XML files ###
  
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/intltool-merge.in banshee-0.13.2+dfsg/intltool-merge.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/intltool-merge.in banshee-0.13.2+dfsg/intltool-merge.in
 --- banshee-0.13.2+dfsg.old/intltool-merge.in	2008-01-09 00:06:47.000000000 +0100
-+++ banshee-0.13.2+dfsg/intltool-merge.in	2008-04-01 20:38:17.000000000 +0200
++++ banshee-0.13.2+dfsg/intltool-merge.in	2008-04-02 11:01:36.000000000 +0200
 @@ -35,7 +35,7 @@
  ## Release information
  my $PROGRAM = "intltool-merge";
@@ -6313,9 +6313,9 @@
              print OUTPUT;
          }
          close OUTPUT;
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/intltool-update.in banshee-0.13.2+dfsg/intltool-update.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/intltool-update.in banshee-0.13.2+dfsg/intltool-update.in
 --- banshee-0.13.2+dfsg.old/intltool-update.in	2008-01-09 00:06:47.000000000 +0100
-+++ banshee-0.13.2+dfsg/intltool-update.in	2008-04-01 20:38:17.000000000 +0200
++++ banshee-0.13.2+dfsg/intltool-update.in	2008-04-02 11:01:36.000000000 +0200
 @@ -30,7 +30,7 @@
  
  ## Release information
@@ -6573,9 +6573,9 @@
      $keywords = $1 if $make_source =~ /^$varname[ ]*=\[?([^\n\]]+)/m;
      
      return $keywords;
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/libbanshee/Makefile.in banshee-0.13.2+dfsg/libbanshee/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/libbanshee/Makefile.in banshee-0.13.2+dfsg/libbanshee/Makefile.in
 --- banshee-0.13.2+dfsg.old/libbanshee/Makefile.in	2008-01-09 00:06:55.000000000 +0100
-+++ banshee-0.13.2+dfsg/libbanshee/Makefile.in	2008-04-01 20:38:32.000000000 +0200
++++ banshee-0.13.2+dfsg/libbanshee/Makefile.in	2008-04-02 11:01:51.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -6736,7 +6736,7 @@
  	test -z "$(CTAGS_ARGS)$$tags$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
  	     $$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/ltmain.sh banshee-0.13.2+dfsg/ltmain.sh
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/ltmain.sh banshee-0.13.2+dfsg/ltmain.sh
 --- banshee-0.13.2+dfsg.old/ltmain.sh	2007-09-21 20:28:33.000000000 +0200
 +++ banshee-0.13.2+dfsg/ltmain.sh	2008-03-30 17:14:06.000000000 +0200
 @@ -2,7 +2,7 @@
@@ -6932,9 +6932,9 @@
        do
  	eval "if test \"\${save_$lt_var+set}\" = set; then
  		$lt_var=\$save_$lt_var; export $lt_var
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/Makefile.in banshee-0.13.2+dfsg/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/Makefile.in banshee-0.13.2+dfsg/Makefile.in
 --- banshee-0.13.2+dfsg.old/Makefile.in	2008-01-09 00:06:58.000000000 +0100
-+++ banshee-0.13.2+dfsg/Makefile.in	2008-04-01 20:38:39.000000000 +0200
++++ banshee-0.13.2+dfsg/Makefile.in	2008-04-02 11:01:57.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -7095,9 +7095,9 @@
  	distclean-tags distcleancheck distdir distuninstallcheck dvi \
  	dvi-am html html-am info info-am install install-am \
  	install-data install-data-am install-dvi install-dvi-am \
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/po/Makefile.in.in banshee-0.13.2+dfsg/po/Makefile.in.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/po/Makefile.in.in banshee-0.13.2+dfsg/po/Makefile.in.in
 --- banshee-0.13.2+dfsg.old/po/Makefile.in.in	2008-01-09 00:06:47.000000000 +0100
-+++ banshee-0.13.2+dfsg/po/Makefile.in.in	2008-04-01 20:38:17.000000000 +0200
++++ banshee-0.13.2+dfsg/po/Makefile.in.in	2008-04-02 11:01:36.000000000 +0200
 @@ -1,10 +1,10 @@
  # Makefile for program source directory in GNU NLS utilities package.
  # Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper at gnu.ai.mit.edu>
@@ -7130,9 +7130,9 @@
  
  uninstall:
  	linguas="$(USE_LINGUAS)"; \
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Core/Banshee/Makefile.in banshee-0.13.2+dfsg/src/Core/Banshee/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/src/Core/Banshee/Makefile.in banshee-0.13.2+dfsg/src/Core/Banshee/Makefile.in
 --- banshee-0.13.2+dfsg.old/src/Core/Banshee/Makefile.in	2008-01-09 00:06:55.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Core/Banshee/Makefile.in	2008-04-01 20:38:33.000000000 +0200
++++ banshee-0.13.2+dfsg/src/Core/Banshee/Makefile.in	2008-04-02 11:01:52.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -7234,9 +7234,9 @@
  @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.dll \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Core/Banshee.Base/Makefile.in banshee-0.13.2+dfsg/src/Core/Banshee.Base/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/src/Core/Banshee.Base/Makefile.in banshee-0.13.2+dfsg/src/Core/Banshee.Base/Makefile.in
 --- banshee-0.13.2+dfsg.old/src/Core/Banshee.Base/Makefile.in	2008-01-09 00:06:55.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Core/Banshee.Base/Makefile.in	2008-04-01 20:38:32.000000000 +0200
++++ banshee-0.13.2+dfsg/src/Core/Banshee.Base/Makefile.in	2008-04-02 11:01:52.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -7365,9 +7365,9 @@
  
  $(srcdir)/$(ASSEMBLY_GCONF_SCHEMA): $(ASSEMBLY)
  	if test -w $@ -o \( ! -e $@ -a -w $(srcdir) \); then \
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Core/Banshee.Hyena/Makefile.in banshee-0.13.2+dfsg/src/Core/Banshee.Hyena/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/src/Core/Banshee.Hyena/Makefile.in banshee-0.13.2+dfsg/src/Core/Banshee.Hyena/Makefile.in
 --- banshee-0.13.2+dfsg.old/src/Core/Banshee.Hyena/Makefile.in	2008-01-09 00:06:55.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Core/Banshee.Hyena/Makefile.in	2008-04-01 20:38:33.000000000 +0200
++++ banshee-0.13.2+dfsg/src/Core/Banshee.Hyena/Makefile.in	2008-04-02 11:01:52.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -7469,9 +7469,9 @@
  @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.dll \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Core/Banshee.Widgets/Makefile.in banshee-0.13.2+dfsg/src/Core/Banshee.Widgets/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/src/Core/Banshee.Widgets/Makefile.in banshee-0.13.2+dfsg/src/Core/Banshee.Widgets/Makefile.in
 --- banshee-0.13.2+dfsg.old/src/Core/Banshee.Widgets/Makefile.in	2008-01-09 00:06:55.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Core/Banshee.Widgets/Makefile.in	2008-04-01 20:38:33.000000000 +0200
++++ banshee-0.13.2+dfsg/src/Core/Banshee.Widgets/Makefile.in	2008-04-02 11:01:52.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -7573,9 +7573,9 @@
  @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.dll \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Core/Makefile.in banshee-0.13.2+dfsg/src/Core/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/src/Core/Makefile.in banshee-0.13.2+dfsg/src/Core/Makefile.in
 --- banshee-0.13.2+dfsg.old/src/Core/Makefile.in	2008-01-09 00:06:55.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Core/Makefile.in	2008-04-01 20:38:33.000000000 +0200
++++ banshee-0.13.2+dfsg/src/Core/Makefile.in	2008-04-02 11:01:52.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -7705,9 +7705,9 @@
  	test -z "$(CTAGS_ARGS)$$tags$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
  	     $$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Dap/Banshee.Dap.Ipod/Makefile.in banshee-0.13.2+dfsg/src/Dap/Banshee.Dap.Ipod/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/src/Dap/Banshee.Dap.Ipod/Makefile.in banshee-0.13.2+dfsg/src/Dap/Banshee.Dap.Ipod/Makefile.in
 --- banshee-0.13.2+dfsg.old/src/Dap/Banshee.Dap.Ipod/Makefile.in	2008-01-09 00:06:55.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Dap/Banshee.Dap.Ipod/Makefile.in	2008-04-01 20:38:33.000000000 +0200
++++ banshee-0.13.2+dfsg/src/Dap/Banshee.Dap.Ipod/Makefile.in	2008-04-02 11:01:52.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -7809,9 +7809,9 @@
  @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.dll \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Dap/Banshee.Dap.Karma/Makefile.in banshee-0.13.2+dfsg/src/Dap/Banshee.Dap.Karma/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/src/Dap/Banshee.Dap.Karma/Makefile.in banshee-0.13.2+dfsg/src/Dap/Banshee.Dap.Karma/Makefile.in
 --- banshee-0.13.2+dfsg.old/src/Dap/Banshee.Dap.Karma/Makefile.in	2008-01-09 00:06:55.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Dap/Banshee.Dap.Karma/Makefile.in	2008-04-01 20:38:34.000000000 +0200
++++ banshee-0.13.2+dfsg/src/Dap/Banshee.Dap.Karma/Makefile.in	2008-04-02 11:01:53.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -7913,9 +7913,9 @@
  @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.dll \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Dap/Banshee.Dap.MassStorage/Makefile.in banshee-0.13.2+dfsg/src/Dap/Banshee.Dap.MassStorage/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/src/Dap/Banshee.Dap.MassStorage/Makefile.in banshee-0.13.2+dfsg/src/Dap/Banshee.Dap.MassStorage/Makefile.in
 --- banshee-0.13.2+dfsg.old/src/Dap/Banshee.Dap.MassStorage/Makefile.in	2008-01-09 00:06:55.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Dap/Banshee.Dap.MassStorage/Makefile.in	2008-04-01 20:38:34.000000000 +0200
++++ banshee-0.13.2+dfsg/src/Dap/Banshee.Dap.MassStorage/Makefile.in	2008-04-02 11:01:53.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -8017,9 +8017,9 @@
  @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.dll \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Dap/Banshee.Dap.Mtp/Makefile.in banshee-0.13.2+dfsg/src/Dap/Banshee.Dap.Mtp/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/src/Dap/Banshee.Dap.Mtp/Makefile.in banshee-0.13.2+dfsg/src/Dap/Banshee.Dap.Mtp/Makefile.in
 --- banshee-0.13.2+dfsg.old/src/Dap/Banshee.Dap.Mtp/Makefile.in	2008-01-09 00:06:55.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Dap/Banshee.Dap.Mtp/Makefile.in	2008-04-01 20:38:34.000000000 +0200
++++ banshee-0.13.2+dfsg/src/Dap/Banshee.Dap.Mtp/Makefile.in	2008-04-02 11:01:53.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -8138,9 +8138,9 @@
  # 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 -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Dap/Banshee.Dap.Njb/Makefile.in banshee-0.13.2+dfsg/src/Dap/Banshee.Dap.Njb/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/src/Dap/Banshee.Dap.Njb/Makefile.in banshee-0.13.2+dfsg/src/Dap/Banshee.Dap.Njb/Makefile.in
 --- banshee-0.13.2+dfsg.old/src/Dap/Banshee.Dap.Njb/Makefile.in	2008-01-09 00:06:56.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Dap/Banshee.Dap.Njb/Makefile.in	2008-04-01 20:38:34.000000000 +0200
++++ banshee-0.13.2+dfsg/src/Dap/Banshee.Dap.Njb/Makefile.in	2008-04-02 11:01:53.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -8242,9 +8242,9 @@
  @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.dll \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Dap/Makefile.in banshee-0.13.2+dfsg/src/Dap/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/src/Dap/Makefile.in banshee-0.13.2+dfsg/src/Dap/Makefile.in
 --- banshee-0.13.2+dfsg.old/src/Dap/Makefile.in	2008-01-09 00:06:56.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Dap/Makefile.in	2008-04-01 20:38:34.000000000 +0200
++++ banshee-0.13.2+dfsg/src/Dap/Makefile.in	2008-04-02 11:01:53.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -8374,9 +8374,9 @@
  	test -z "$(CTAGS_ARGS)$$tags$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
  	     $$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Engines/Banshee.MediaEngine.GStreamer/Makefile.in banshee-0.13.2+dfsg/src/Engines/Banshee.MediaEngine.GStreamer/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/src/Engines/Banshee.MediaEngine.GStreamer/Makefile.in banshee-0.13.2+dfsg/src/Engines/Banshee.MediaEngine.GStreamer/Makefile.in
 --- banshee-0.13.2+dfsg.old/src/Engines/Banshee.MediaEngine.GStreamer/Makefile.in	2008-01-09 00:06:56.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Engines/Banshee.MediaEngine.GStreamer/Makefile.in	2008-04-01 20:38:34.000000000 +0200
++++ banshee-0.13.2+dfsg/src/Engines/Banshee.MediaEngine.GStreamer/Makefile.in	2008-04-02 11:01:53.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -8478,9 +8478,9 @@
  @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.dll \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Engines/Makefile.in banshee-0.13.2+dfsg/src/Engines/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/src/Engines/Makefile.in banshee-0.13.2+dfsg/src/Engines/Makefile.in
 --- banshee-0.13.2+dfsg.old/src/Engines/Makefile.in	2008-01-09 00:06:56.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Engines/Makefile.in	2008-04-01 20:38:35.000000000 +0200
++++ banshee-0.13.2+dfsg/src/Engines/Makefile.in	2008-04-02 11:01:53.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -8610,9 +8610,9 @@
  	test -z "$(CTAGS_ARGS)$$tags$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
  	     $$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Extras/Boo/Makefile.in banshee-0.13.2+dfsg/src/Extras/Boo/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/src/Extras/Boo/Makefile.in banshee-0.13.2+dfsg/src/Extras/Boo/Makefile.in
 --- banshee-0.13.2+dfsg.old/src/Extras/Boo/Makefile.in	2008-01-09 00:06:56.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Extras/Boo/Makefile.in	2008-04-01 20:38:35.000000000 +0200
++++ banshee-0.13.2+dfsg/src/Extras/Boo/Makefile.in	2008-04-02 11:01:54.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -8704,9 +8704,9 @@
  OBJEXT = @OBJEXT@
  PACKAGE = @PACKAGE@
  PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Extras/BooBuddy/Makefile.in banshee-0.13.2+dfsg/src/Extras/BooBuddy/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/src/Extras/BooBuddy/Makefile.in banshee-0.13.2+dfsg/src/Extras/BooBuddy/Makefile.in
 --- banshee-0.13.2+dfsg.old/src/Extras/BooBuddy/Makefile.in	2008-01-09 00:06:56.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Extras/BooBuddy/Makefile.in	2008-04-01 20:38:35.000000000 +0200
++++ banshee-0.13.2+dfsg/src/Extras/BooBuddy/Makefile.in	2008-04-02 11:01:54.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -8808,9 +8808,9 @@
  @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.dll \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Extras/Gnome.Keyring/Makefile.in banshee-0.13.2+dfsg/src/Extras/Gnome.Keyring/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/src/Extras/Gnome.Keyring/Makefile.in banshee-0.13.2+dfsg/src/Extras/Gnome.Keyring/Makefile.in
 --- banshee-0.13.2+dfsg.old/src/Extras/Gnome.Keyring/Makefile.in	2008-01-09 00:06:56.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Extras/Gnome.Keyring/Makefile.in	2008-04-01 20:38:35.000000000 +0200
++++ banshee-0.13.2+dfsg/src/Extras/Gnome.Keyring/Makefile.in	2008-04-02 11:01:54.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -8931,13 +8931,13 @@
 -$(ASSEMBLY): $(ASSEMBLY_SOURCES)
 -	$(BUILD_LIB) -out:$@ $(LINK_MONO_UNIX) $(ASSEMBLY_SOURCES)
 + at EXTERNAL_GNOME_KEYRING_SHARP_FALSE@$(ASSEMBLY): $(ASSEMBLY_SOURCES)
-+ at EXTERNAL_GNOME_KEYRING_SHARP_FALSE@	$(BUILD_LIB) -out:$@ $(LINK_MONO_UNIX) $(ASSEMBLY_SOURCES)
++ at EXTERNAL_GNOME_KEYRING_SHARP_FALSE@	$(BUILD_LIB) -d:WITH_DBUS -out:$@ $(LINK_MONO_UNIX) $(LINK_DBUS) $(ASSEMBLY_SOURCES)
  # 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 -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Extras/Last.FM/Makefile.in banshee-0.13.2+dfsg/src/Extras/Last.FM/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/src/Extras/Last.FM/Makefile.in banshee-0.13.2+dfsg/src/Extras/Last.FM/Makefile.in
 --- banshee-0.13.2+dfsg.old/src/Extras/Last.FM/Makefile.in	2008-01-09 00:06:56.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Extras/Last.FM/Makefile.in	2008-04-01 20:38:35.000000000 +0200
++++ banshee-0.13.2+dfsg/src/Extras/Last.FM/Makefile.in	2008-04-02 11:01:55.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -9039,9 +9039,9 @@
  @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.dll \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Extras/Makefile.in banshee-0.13.2+dfsg/src/Extras/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/src/Extras/Makefile.in banshee-0.13.2+dfsg/src/Extras/Makefile.in
 --- banshee-0.13.2+dfsg.old/src/Extras/Makefile.in	2008-01-09 00:06:56.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Extras/Makefile.in	2008-04-01 20:38:35.000000000 +0200
++++ banshee-0.13.2+dfsg/src/Extras/Makefile.in	2008-04-02 11:01:55.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -9171,9 +9171,9 @@
  	test -z "$(CTAGS_ARGS)$$tags$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
  	     $$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Extras/MusicBrainz/Makefile.in banshee-0.13.2+dfsg/src/Extras/MusicBrainz/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/src/Extras/MusicBrainz/Makefile.in banshee-0.13.2+dfsg/src/Extras/MusicBrainz/Makefile.in
 --- banshee-0.13.2+dfsg.old/src/Extras/MusicBrainz/Makefile.in	2008-01-09 00:06:56.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Extras/MusicBrainz/Makefile.in	2008-04-01 20:38:35.000000000 +0200
++++ banshee-0.13.2+dfsg/src/Extras/MusicBrainz/Makefile.in	2008-04-02 11:01:55.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -9275,9 +9275,9 @@
  @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.dll \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Makefile.in banshee-0.13.2+dfsg/src/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/src/Makefile.in banshee-0.13.2+dfsg/src/Makefile.in
 --- banshee-0.13.2+dfsg.old/src/Makefile.in	2008-01-09 00:06:56.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Makefile.in	2008-04-01 20:38:36.000000000 +0200
++++ banshee-0.13.2+dfsg/src/Makefile.in	2008-04-02 11:01:55.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -9407,9 +9407,9 @@
  	test -z "$(CTAGS_ARGS)$$tags$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
  	     $$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.Audioscrobbler/Makefile.in banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.Audioscrobbler/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.Audioscrobbler/Makefile.in banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.Audioscrobbler/Makefile.in
 --- banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.Audioscrobbler/Makefile.in	2008-01-09 00:06:56.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.Audioscrobbler/Makefile.in	2008-04-01 20:38:36.000000000 +0200
++++ banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.Audioscrobbler/Makefile.in	2008-04-02 11:01:55.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -9511,9 +9511,9 @@
  @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.dll \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.Bookmarks/Makefile.in banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.Bookmarks/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.Bookmarks/Makefile.in banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.Bookmarks/Makefile.in
 --- banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.Bookmarks/Makefile.in	2008-01-09 00:06:57.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.Bookmarks/Makefile.in	2008-04-01 20:38:36.000000000 +0200
++++ banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.Bookmarks/Makefile.in	2008-04-02 11:01:55.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -9615,9 +9615,9 @@
  @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.dll \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.Daap/Makefile.in banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.Daap/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.Daap/Makefile.in banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.Daap/Makefile.in
 --- banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.Daap/Makefile.in	2008-01-09 00:06:57.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.Daap/Makefile.in	2008-04-01 20:38:36.000000000 +0200
++++ banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.Daap/Makefile.in	2008-04-02 11:01:55.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -9719,9 +9719,9 @@
  @DAAP_ENABLED_TRUE@@EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
  @DAAP_ENABLED_TRUE@@EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.dll \
  @DAAP_ENABLED_TRUE@@EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.LastFM/Makefile.in banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.LastFM/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.LastFM/Makefile.in banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.LastFM/Makefile.in
 --- banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.LastFM/Makefile.in	2008-01-09 00:06:57.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.LastFM/Makefile.in	2008-04-01 20:38:37.000000000 +0200
++++ banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.LastFM/Makefile.in	2008-04-02 11:01:56.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -9823,9 +9823,9 @@
  @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.dll \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.MetadataSearch/Makefile.in banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.MetadataSearch/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.MetadataSearch/Makefile.in banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.MetadataSearch/Makefile.in
 --- banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.MetadataSearch/Makefile.in	2008-01-09 00:06:57.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.MetadataSearch/Makefile.in	2008-04-01 20:38:37.000000000 +0200
++++ banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.MetadataSearch/Makefile.in	2008-04-02 11:01:56.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -9927,9 +9927,9 @@
  @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.dll \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.MiniMode/Makefile.in banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.MiniMode/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.MiniMode/Makefile.in banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.MiniMode/Makefile.in
 --- banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.MiniMode/Makefile.in	2008-01-09 00:06:57.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.MiniMode/Makefile.in	2008-04-01 20:38:37.000000000 +0200
++++ banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.MiniMode/Makefile.in	2008-04-02 11:01:56.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -10031,9 +10031,9 @@
  @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.dll \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.MMKeys/Makefile.in banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.MMKeys/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.MMKeys/Makefile.in banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.MMKeys/Makefile.in
 --- banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.MMKeys/Makefile.in	2008-01-09 00:06:57.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.MMKeys/Makefile.in	2008-04-01 20:38:37.000000000 +0200
++++ banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.MMKeys/Makefile.in	2008-04-02 11:01:56.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -10135,9 +10135,9 @@
  @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.dll \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.NotificationAreaIcon/Makefile.in banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.NotificationAreaIcon/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.NotificationAreaIcon/Makefile.in banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.NotificationAreaIcon/Makefile.in
 --- banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.NotificationAreaIcon/Makefile.in	2008-01-09 00:06:57.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.NotificationAreaIcon/Makefile.in	2008-04-01 20:38:37.000000000 +0200
++++ banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.NotificationAreaIcon/Makefile.in	2008-04-02 11:01:56.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -10250,9 +10250,9 @@
  
  $(srcdir)/$(ASSEMBLY_GCONF_SCHEMA): $(ASSEMBLY)
  	if test -w $@ -o \( ! -e $@ -a -w $(srcdir) \); then \
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.Podcast/Makefile.in banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.Podcast/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.Podcast/Makefile.in banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.Podcast/Makefile.in
 --- banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.Podcast/Makefile.in	2008-01-09 00:06:57.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.Podcast/Makefile.in	2008-04-01 20:38:38.000000000 +0200
++++ banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.Podcast/Makefile.in	2008-04-02 11:01:56.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -10354,9 +10354,9 @@
  @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.dll \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.Radio/Makefile.in banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.Radio/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.Radio/Makefile.in banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.Radio/Makefile.in
 --- banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.Radio/Makefile.in	2008-01-09 00:06:57.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.Radio/Makefile.in	2008-04-01 20:38:38.000000000 +0200
++++ banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.Radio/Makefile.in	2008-04-02 11:01:57.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -10458,9 +10458,9 @@
  @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.dll \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.Recommendation/Makefile.in banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.Recommendation/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.Recommendation/Makefile.in banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.Recommendation/Makefile.in
 --- banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.Recommendation/Makefile.in	2008-01-09 00:06:57.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.Recommendation/Makefile.in	2008-04-01 20:38:38.000000000 +0200
++++ banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.Recommendation/Makefile.in	2008-04-02 11:01:57.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -10562,9 +10562,9 @@
  @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.dll \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.Sample/Makefile.in banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.Sample/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.Sample/Makefile.in banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.Sample/Makefile.in
 --- banshee-0.13.2+dfsg.old/src/Plugins/Banshee.Plugins.Sample/Makefile.in	2008-01-09 00:06:58.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.Sample/Makefile.in	2008-04-01 20:38:38.000000000 +0200
++++ banshee-0.13.2+dfsg/src/Plugins/Banshee.Plugins.Sample/Makefile.in	2008-04-02 11:01:57.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -10666,9 +10666,9 @@
  @EXTERNAL_NDESK_DBUS_FALSE at LINK_DBUS = \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.dll \
  @EXTERNAL_NDESK_DBUS_FALSE@	-r:$(DIR_DBUS)/NDesk.DBus.GLib.dll
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/src/Plugins/Makefile.in banshee-0.13.2+dfsg/src/Plugins/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/src/Plugins/Makefile.in banshee-0.13.2+dfsg/src/Plugins/Makefile.in
 --- banshee-0.13.2+dfsg.old/src/Plugins/Makefile.in	2008-01-09 00:06:58.000000000 +0100
-+++ banshee-0.13.2+dfsg/src/Plugins/Makefile.in	2008-04-01 20:38:38.000000000 +0200
++++ banshee-0.13.2+dfsg/src/Plugins/Makefile.in	2008-04-02 11:01:57.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -10798,9 +10798,9 @@
  	test -z "$(CTAGS_ARGS)$$tags$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
  	     $$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.2+dfsg.old/tests/Makefile.in banshee-0.13.2+dfsg/tests/Makefile.in
+diff -Naur -x'*config.sub' -x'*config.guess' banshee-0.13.2+dfsg.old/tests/Makefile.in banshee-0.13.2+dfsg/tests/Makefile.in
 --- banshee-0.13.2+dfsg.old/tests/Makefile.in	2008-01-09 00:06:58.000000000 +0100
-+++ banshee-0.13.2+dfsg/tests/Makefile.in	2008-04-01 20:38:38.000000000 +0200
++++ banshee-0.13.2+dfsg/tests/Makefile.in	2008-04-02 11:01:57.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.


