[banshee/hyena-submodule: 83/83] Merge branch 'master' into hyena-submodule

[Gabriel Burt <gburt src gnome org>]

commit c562ed4de837d64c25688ec7cc24d048a35342f8
Merge: ea9d620 175e373
Author: Gabriel Burt <gabriel burt gmail com>
Date:   Sat Jun 5 11:38:02 2010 -0700

    Merge branch 'master' into hyena-submodule
    
    Conflicts:
    	autogen.sh

 .gitignore                                         |    3 +
 AUTHORS                                            |    4 +
 Banshee.sln                                        |   18 +-
 Makefile.am                                        |    5 +
 NEWS                                               |  132 ++--
 autogen.sh                                         |    2 +
 banshee.doap                                       |   16 +-
 build/m4/banshee/gstreamer-sharp.m4                |   13 +
 build/m4/shamrock/gnome-doc.m4                     |   11 +
 build/m4/shamrock/mono.m4                          |   51 +-
 configure.ac                                       |   18 +-
 data/Makefile.am                                   |    2 +-
 data/addin-xml-strings.cs                          |    3 +
 extras/README.releasing                            |   27 +
 help/C/TODO                                        |    8 +
 help/C/add-podcast.page                            |   80 ++
 help/C/add-radio.page                              |   71 ++
 help/C/advanced.page                               |   32 +
 help/C/emusic.page                                 |   14 +
 help/C/extensions.page                             |   40 +
 help/C/import.page                                 |   73 ++
 help/C/importplaylist.page                         |   13 +
 help/C/index.page                                  |   47 +
 help/C/introduction.page                           |   50 +
 help/C/itunes-import.page                          |   14 +
 help/C/keyboardshortcuts.page                      |  145 +++
 help/C/legal.xml                                   |    9 +
 help/C/manage-coverart.page                        |   31 +
 help/C/manage-playlists.page                       |   72 ++
 help/C/manage-tags.page                            |   81 ++
 help/C/play-queue.page                             |   85 ++
 help/C/play.page                                   |   54 ++
 help/C/rb-import.page                              |   14 +
 help/C/search.page                                 |  119 +++
 help/C/sort.page                                   |   55 ++
 help/C/sync.page                                   |   31 +
 help/C/ui.page                                     |   54 ++
 help/Makefile.am                                   |   25 +
 help/banshee.omf.in                                |    9 +
 po/POTFILES.in                                     |    1 +
 po/cs.po                                           |   40 +-
 po/de.po                                           |   25 +-
 po/es.po                                           |  979 +++++++++++---------
 po/gl.po                                           |  336 ++++----
 .../Banshee.GStreamerSharp.addin.xml               |   38 +
 .../Banshee.GStreamerSharp.csproj                  |   69 ++
 .../Banshee.GStreamerSharp/PlayerEngine.cs         |  150 +++
 src/Backends/Banshee.GStreamerSharp/Makefile.am    |   19 +
 src/Backends/Banshee.Gnome/Banshee.Gnome.csproj    |    1 +
 .../GConfConfigurationClient.cs                    |    9 +
 .../Banshee.GnomeBackend/GConfProxy.cs             |  124 +++
 .../Banshee.GnomeBackend/GnomeService.cs           |    3 +
 src/Backends/Banshee.Gnome/Makefile.am             |    1 +
 src/Backends/Banshee.Osx/Banshee.Osx.csproj        |    2 +
 src/Backends/Makefile.am                           |    1 +
 src/Core/Banshee.Core/Banshee.Base/SafeUri.cs      |    5 +
 .../Banshee.Core/Banshee.Collection/TrackInfo.cs   |    2 +-
 .../Banshee.Core/Banshee.Streaming/StreamTagger.cs |    5 +-
 src/Core/Banshee.Core/Resources/contributors.xml   |    4 +
 .../DatabaseTrackInfo.cs                           |   10 +-
 .../Banshee.Database/BansheeDbFormatMigrator.cs    |   14 +-
 .../Banshee.Metadata/SaveTrackMetadataJob.cs       |   25 +-
 .../Banshee.Metadata/SaveTrackMetadataService.cs   |   44 +-
 .../Banshee.Playlist/PlaylistSource.cs             |   16 +-
 .../Banshee.SmartPlaylist/SmartPlaylistSource.cs   |   16 +-
 .../DefaultColumnController.cs                     |   13 +-
 .../Banshee.Sources.Gui/SourceSwitcherEntry.cs     |    4 +-
 .../Banshee.Audiobook/AudiobookLibrarySource.cs    |    5 +-
 .../FileSystemQueueSource.cs                       |    4 +
 .../Banshee.LastfmStreaming.csproj                 |    4 +-
 .../Banshee.NotificationArea.csproj                |    1 +
 .../Banshee.Podcasting/PodcastService.cs           |   11 +
 .../Banshee.SqlDebugConsole.csproj                 |    5 +
 .../Banshee.SqlDebugConsole/SqlActions.cs          |    2 +-
 src/Libraries/Hyena/Hyena.csproj                   |    6 +-
 75 files changed, 2733 insertions(+), 792 deletions(-)
---
diff --cc .gitignore
index e7d8b8b,fd27482..21dc679
--- a/.gitignore
+++ b/.gitignore
@@@ -47,9 -47,8 +47,10 @@@ data/audio-profiles/*.xm
  stamp-h1
  *.userprefs
  Banshee.usertasks
 +build/m4/*.m4
 +gnome-doc-utils.make
  build/m4/shave/shave
+ build/m4/*.m4
  build/m4/shave/shave-libtool
  build/bundle/build-root
  build/bundle/solitary/Options.cs
diff --cc Makefile.am
index 2199ea0,56e8d07..e4ab0b6
--- a/Makefile.am
+++ b/Makefile.am
@@@ -1,9 -1,9 +1,10 @@@
  SUBDIRS = \
  	build \
  	data \
+ 	help \
  	libbanshee \
  	gstreamer \
 +	hyena \
  	src \
  	docs \
  	tests \
diff --cc autogen.sh
index 65ebf73,7823103..7e9ab96
--- a/autogen.sh
+++ b/autogen.sh
@@@ -64,8 -64,7 +64,9 @@@ check_autotool_version $LIBTOOLIZE 1.4.
  check_autotool_version intltoolize 0.35.0
  check_autotool_version pkg-config 0.14.0
  
 +git submodule update --init
 +
+ gnome-doc-prepare
  run intltoolize --force --copy
  run $LIBTOOLIZE --force --copy --automake
  run aclocal -I build/m4/banshee -I build/m4/shamrock -I build/m4/shave $ACLOCAL_FLAGS