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

[Rodrigo Moya <rodrigo src gnome org>]

commit 9e5e617df0b064e81576be6b910a048fe4518bd6
Merge: 3521a19 f730397
Author: Rodrigo Moya <rodrigo gnome-db org>
Date:   Mon Jan 30 09:15:48 2012 +0100

    Merge branch 'master' into wip/install-languages

 NEWS                                               |   41 +
 configure.ac                                       |   76 +-
 help/gl/gl.po                                      |   17 +-
 help/pa/pa.po                                      |   36 +-
 help/pt_BR/pt_BR.po                                |    4 +-
 .../bluetooth/bluetooth-properties.desktop.in.in   |    2 +-
 panels/bluetooth/bluetooth.ui                      |    2 +-
 panels/bluetooth/cc-bluetooth-panel.c              |    4 +-
 panels/datetime/Makefile.am                        |   50 +-
 panels/datetime/cc-datetime-panel.c                |  245 +-
 panels/datetime/dtm.c                              | 3066 ----------
 panels/datetime/dtm.h                              |  475 --
 .../org.gnome.controlcenter.datetime.policy.in     |   21 +
 panels/datetime/set-timezone.c                     |  479 --
 panels/datetime/set-timezone.h                     |   57 -
 panels/datetime/timedated1-interface.xml           |   27 +
 panels/display/Makefile.am                         |    5 +-
 panels/display/cc-display-panel.c                  |   90 +-
 panels/keyboard/01-screenshot.xml.in               |   12 +
 panels/network/cc-network-panel.c                  |  168 +-
 panels/network/network.ui                          |  139 -
 panels/printers/cc-printers-panel.c                |  152 +-
 panels/printers/pp-new-printer-dialog.c            |  849 ++--
 panels/printers/pp-utils.c                         |  923 ++--
 panels/printers/pp-utils.h                         |    7 +
 panels/screen/gnome-screen-panel.desktop.in.in     |    2 +-
 panels/sound/gvc-balance-bar.c                     |    4 +-
 panels/sound/gvc-level-bar.c                       |   64 +-
 panels/universal-access/cc-ua-panel.c              |    9 +-
 .../gnome-universal-access-panel.desktop.in.in     |    2 +-
 panels/universal-access/uap.ui                     |    6 +-
 panels/universal-access/zoom-options.c             |  329 +-
 panels/universal-access/zoom-options.h             |    4 +-
 panels/universal-access/zoom-options.ui            |  917 ++--
 panels/user-accounts/Makefile.am                   |    3 +-
 panels/user-accounts/um-photo-dialog.c             |    6 +-
 panels/user-accounts/um-user-module.c              |    7 +
 panels/user-accounts/um-user.c                     |   17 +
 panels/wacom/Makefile.am                           |   28 +-
 panels/wacom/calibrator/COPYING                    |   27 +
 panels/wacom/calibrator/Makefile.am                |   37 +
 panels/wacom/calibrator/calibrator.c               |  175 +
 panels/wacom/calibrator/calibrator.h               |  101 +
 panels/wacom/calibrator/gui_gtk.c                  |  458 ++
 panels/wacom/calibrator/gui_gtk.h                  |   55 +
 panels/wacom/calibrator/main.c                     |  417 ++
 panels/wacom/cc-wacom-nav-button.c                 |   44 +-
 panels/wacom/cc-wacom-page.c                       |  359 +-
 panels/wacom/cc-wacom-page.h                       |    4 +-
 panels/wacom/cc-wacom-panel.c                      |   15 +-
 panels/wacom/cc-wacom-panel.h                      |    3 +
 panels/wacom/cc-wacom-stylus-page.c                |  500 ++
 panels/wacom/cc-wacom-stylus-page.h                |   79 +
 panels/wacom/gnome-wacom-panel.desktop.in.in       |    2 +-
 panels/wacom/gnome-wacom-properties.ui             |  374 +--
 panels/wacom/gsd-enums.h                           |    7 +
 panels/wacom/gsd-input-helper.c                    |    6 +-
 panels/wacom/gsd-input-helper.h                    |    1 +
 panels/wacom/gsd-wacom-device.c                    |  454 ++-
 panels/wacom/gsd-wacom-device.h                    |   36 +-
 panels/wacom/test-wacom.c                          |   40 +-
 panels/wacom/update-from-gsd.sh                    |   26 +
 panels/wacom/wacom-stylus-airbrush.svg             |   16 +-
 panels/wacom/wacom-stylus-art-pen.svg              |  127 +
 panels/wacom/wacom-stylus-classic.svg              |  103 +
 panels/wacom/wacom-stylus-inking.svg               |   22 +-
 panels/wacom/wacom-stylus-page.ui                  |  347 ++
 po/POTFILES.in                                     |    5 +
 po/be.po                                           |  231 +-
 po/bg.po                                           | 5794 ++++++++++----------
 po/es.po                                           |  673 ++-
 po/fi.po                                           | 5747 ++++++++++---------
 po/gl.po                                           | 5661 ++++++++++----------
 po/he.po                                           |  657 ++-
 po/ja.po                                           | 5919 ++++++++++----------
 po/nb.po                                           | 2636 +++++-----
 po/sl.po                                           | 5771 ++++++++++----------
 po/vi.po                                           |   12 +-
 po/zh_HK.po                                        |  960 ++--
 po/zh_TW.po                                        |  952 ++--
 shell/cc-shell-category-view.c                     |   51 -
 shell/cc-shell.c                                   |   21 +
 shell/cc-shell.h                                   |    5 +
 shell/control-center.c                             |    2 -
 shell/gnome-control-center.c                       |   73 +-
 shell/shell.ui                                     |    1 +
 86 files changed, 23557 insertions(+), 23794 deletions(-)
---