[rhythmbox/gobject-introspection: 24/24] Merge branch 'master' into gobject-introspection

[Jonathan Matthew <jmatthew src gnome org>]

commit 55a3b1a92ac6ad26702e5b5a0ba589e253fbda53
Merge: 1aa7a1a 10d4b58
Author: Jonathan Matthew <jonathan d14n org>
Date:   Tue Jan 4 05:51:05 2011 +1000

    Merge branch 'master' into gobject-introspection

 .../rb-dbus-media-server-plugin.c                  |   13 +-
 plugins/mpris/mpris-spec.h                         |   16 +
 plugins/mpris/rb-mpris-plugin.c                    |  387 ++++-
 plugins/mtpdevice/rb-mtp-thread.c                  |   17 +-
 plugins/status-icon/rb-status-icon-plugin.c        |  242 ++-
 po/cs.po                                           |   46 +-
 po/de.po                                           |  938 +++++-----
 po/es.po                                           |   46 +-
 po/et.po                                           |  119 +-
 po/fr.po                                           | 2030 +++++++++++---------
 po/hu.po                                           |  895 +++++-----
 po/pt_BR.po                                        | 1427 +++++---------
 po/sv.po                                           | 1784 +++++++----------
 po/vi.po                                           | 1615 ++++++++++------
 podcast/rb-podcast-manager.c                       |   26 +-
 podcast/rb-podcast-manager.h                       |    1 +
 podcast/rb-podcast-source.c                        |    9 +-
 shell/rb-shell.c                                   |   12 +-
 18 files changed, 5079 insertions(+), 4544 deletions(-)
---