[gnome-control-center/wip/install-languages: 218/220] Merge branch 'master' into wip/install-languages

[Rodrigo Moya <rodrigo src gnome org>]

commit b84c17ddb42c93fa3ea979fdf4cdffbdecf6c214
Merge: 9e5e617 f6067a7
Author: Rodrigo Moya <rodrigo gnome-db org>
Date:   Sun Feb 5 19:15:29 2012 +0100

    Merge branch 'master' into wip/install-languages

 panels/info/cc-info-panel.c              |    1 -
 panels/keyboard/gnome-keyboard-panel.ui  |    6 -
 panels/mouse/gnome-mouse-properties.ui   |    5 -
 panels/sound/gvc-mixer-dialog.c          |    1 +
 panels/sound/gvc-stream-status-icon.c    |    1 +
 panels/wacom/Makefile.am                 |    9 +-
 panels/wacom/cc-wacom-nav-button.c       |   40 +-
 panels/wacom/cc-wacom-page.c             |   91 +-
 panels/wacom/cc-wacom-panel.c            |    8 +-
 panels/wacom/cc-wacom-stylus-page.c      |    4 +-
 panels/wacom/gnome-wacom-properties.ui   |   24 +-
 panels/wacom/gsd-wacom-device.c          |   35 +-
 panels/wacom/gsd-wacom-device.h          |    3 +-
 panels/wacom/wacom-stylus-page.ui        |   26 +-
 panels/wacom/wacom-tablet-cintiq.svg     |    2 +-
 panels/wacom/wacom-tablet-pc.svg         |    2 +-
 panels/wacom/wacom-tablet.svg            |    2 +-
 po/be.po                                 | 2745 +++++++++++++++---------------
 po/bg.po                                 |  328 ++--
 po/es.po                                 |  149 +-
 po/nb.po                                 |  136 +-
 po/sl.po                                 |  136 +-
 shell/gnome-control-center.desktop.in.in |    1 +
 23 files changed, 1956 insertions(+), 1799 deletions(-)
---