[rhythmbox/media-player-sync: 27/27] Merge branch 'master' into media-player-sync

[Jonathan Matthew <jmatthew src gnome org>]

commit 1e2dc612905e5d104948e7ffbdf142d66e07700f
Merge: b6cee2d 684e36c
Author: Jonathan Matthew <jonathan d14n org>
Date:   Fri Mar 19 22:28:06 2010 +1000

    Merge branch 'master' into media-player-sync

 backends/rb-player-gst-filter.h                    |    5 +-
 data/rhythmbox.schemas                             |   22 +
 doc/reference/Makefile.am                          |   25 +-
 doc/reference/rhythmbox-docs.sgml                  |    5 +-
 doc/reference/rhythmbox-sections.txt               |  138 +-
 doc/reference/rhythmbox.types                      |    5 +
 help/cs/cs.po                                      | 2780 ++++++++++-----
 metadata/rb-metadata-common.c                      |    1 +
 metadata/rb-metadata-dbus-client.c                 |    1 +
 plugins/audiocd/rb-audiocd-plugin.c                |    3 +-
 plugins/audiocd/rb-audiocd-source.c                |    1 +
 .../rb-generic-player-playlist-source.c            |    2 +
 plugins/ipod/rb-ipod-source.c                      |    1 +
 plugins/status-icon/rb-status-icon-plugin.c        |    2 +-
 po/br.po                                           | 3723 +++++++++++---------
 po/fi.po                                           | 2851 ++++++++-------
 po/hu.po                                           |  161 +-
 po/ja.po                                           | 2508 ++++++++------
 po/nb.po                                           | 2139 +++++++-----
 po/ro.po                                           |  790 ++---
 po/uk.po                                           | 1254 ++++---
 podcast/rb-podcast-manager.c                       |   47 +-
 rhythmdb/rhythmdb-property-model.c                 |    1 +
 rhythmdb/rhythmdb-query-model.c                    |  390 ++-
 rhythmdb/rhythmdb-query-model.h                    |   14 +-
 rhythmdb/rhythmdb-query.c                          |    4 +
 rhythmdb/rhythmdb.c                                |   42 +-
 shell/rb-removable-media-manager.c                 |    2 +
 shell/rb-removable-media-manager.h                 |    2 +-
 shell/rb-shell-clipboard.c                         |    8 +-
 shell/rb-shell-player.c                            |   71 +-
 shell/rb-shell-player.h                            |    2 +-
 shell/rb-shell.c                                   |  395 ++-
 shell/rb-shell.h                                   |   12 +-
 sources/rb-auto-playlist-source.c                  |   12 +-
 sources/rb-podcast-source.c                        |    7 +
 sources/rb-removable-media-source.c                |    8 +
 sources/rb-removable-media-source.h                |   11 +-
 sources/rb-source-group.h                          |    4 +-
 sources/rb-source-search-basic.c                   |   19 +-
 sources/rb-source-search-basic.h                   |   11 +-
 sources/rb-source-search.c                         |   51 +-
 sources/rb-source-search.h                         |   26 +-
 sources/rb-source.c                                |   32 +-
 sources/rb-sourcelist-model.c                      |    1 +
 sources/rb-sourcelist.c                            |   14 +-
 tests/test-rhythmdb.c                              |   37 +
 widgets/rb-entry-view.c                            |   18 +
 widgets/rb-rating-helper.c                         |    2 +-
 widgets/rb-song-info.c                             |    6 +-
 50 files changed, 10443 insertions(+), 7223 deletions(-)
---