[banshee/gtk3: 39/40] Merge branch 'master' into gtk3

[Bertrand Lorentz <blorentz src gnome org>]

commit 1c61173c817f9549f694130800482fe4ed2e16b1
Merge: b553100 0b7630c
Author: Bertrand Lorentz <bertrand lorentz gmail com>
Date:   Sat Dec 17 13:03:12 2011 +0100

    Merge branch 'master' into gtk3
    
    Conflicts:
    	src/Hyena

 AUTHORS                                            |    1 +
 NEWS                                               |   71 +-
 banshee.doap                                       |    8 +-
 build/m4/banshee/gconf.m4                          |   12 +
 build/windows/Installer.wixproj                    |    2 +-
 build/windows/InstallerDefinition.wxs              |    4 +-
 configure.ac                                       |    7 +-
 extras/create-release-notes                        |    2 +-
 po/POTFILES.in                                     |    1 +
 po/ca.po                                           | 1758 ++++++++-------
 po/cs.po                                           |   29 +-
 po/de.po                                           |  156 +-
 po/es.po                                           |   46 +-
 po/ja.po                                           |  741 ++++---
 po/ru.po                                           |  653 ++++--
 po/sk.po                                           | 2293 +++++++++++---------
 po/sl.po                                           |  239 ++-
 po/tr.po                                           |  376 ++--
 .../Banshee.Windows/VersionUpdater.cs              |    2 +-
 .../Banshee.Core/Banshee.Base/PlatformHacks.cs     |   75 -
 src/Core/Banshee.Core/Banshee.Core.csproj          |    1 -
 .../Banshee.Core/Banshee.Streaming/StreamTagger.cs |   21 +-
 src/Core/Banshee.Core/Makefile.am                  |    1 -
 src/Core/Banshee.Core/Resources/contributors.xml   |    1 +
 src/Core/Banshee.Core/Resources/translators.xml    |    2 +-
 .../DatabaseAlbumArtistListModel.cs                |    6 +-
 .../DatabaseImportManager.cs                       |   10 +-
 .../Banshee.Collection/InvalidFileException.cs     |   38 +
 .../Banshee.Collection/RescanPipeline.cs           |    5 +-
 .../Banshee.Metadata/Tests/TaglibReadWriteTests.cs |    2 +-
 .../Banshee.Playlists.Formats/AsxPlaylistFormat.cs |  105 +-
 .../Tests/PlaylistFormatTests.cs                   |   11 +
 .../Banshee.ServiceStack/Application.cs            |    4 -
 src/Core/Banshee.Services/Banshee.Services.csproj  |    1 +
 .../Banshee.Services/Banshee.Sources/Source.cs     |    2 +-
 .../Banshee.Sources/SourceManager.cs               |    1 -
 src/Core/Banshee.Services/Makefile.am              |    1 +
 .../Banshee.Dap.MassStorage.addin.xml              |    5 +-
 .../Banshee.Dap.MassStorage/MaemoDevice.cs         |    4 +
 .../Banshee.Dap.MassStorage/MassStorageDevice.cs   |    4 +
 .../Banshee.Dap.MassStorage/MassStorageSource.cs   |   15 +-
 .../Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs   |    2 +-
 .../Banshee.LibraryWatcher/SourceWatcher.cs        |    5 +-
 .../Banshee.Mpris/Banshee.Mpris/IPlayer.cs         |    2 +-
 .../Banshee.Mpris/Banshee.Mpris/MediaPlayer.cs     |    4 +-
 .../Banshee.Mpris/Banshee.Mpris/Metadata.cs        |    2 +-
 .../Banshee.OpticalDisc.Dvd/DvdService.cs          |    2 +-
 .../UbuntuOneMusicStoreSource.cs                   |    3 +-
 .../Banshee.YouTube.Gui/YouTubeTile.cs             |   14 +-
 tests/data/playlist-data/entryref.asx              |   11 +
 50 files changed, 3828 insertions(+), 2933 deletions(-)
---