[gnome-shell/zeitgeist: 55/55] Merge remote branch 'origin/master' into zeitgeist

[Federico Mena Quintero <federico src gnome org>]

commit 23bf5db80ca3fb2d4ef5ee35025620a42aaf9483
Merge: 550e997 f81af32
Author: Federico Mena Quintero <federico gnome org>
Date:   Tue Mar 29 17:00:54 2011 -0400

    Merge remote branch 'origin/master' into zeitgeist

 configure.ac                       |   12 +-
 data/theme/gnome-shell.css         |   12 +-
 gnome-shell.doap                   |   16 +
 js/ui/boxpointer.js                |  138 ++-
 js/ui/main.js                      |    2 +-
 js/ui/messageTray.js               |   37 +-
 js/ui/notificationDaemon.js        |    8 +
 js/ui/panel.js                     |   30 +-
 js/ui/polkitAuthenticationAgent.js |    4 +
 js/ui/popupMenu.js                 |   13 +-
 js/ui/status/network.js            |   35 +-
 js/ui/statusIconDispatcher.js      |    3 +-
 js/ui/telepathyClient.js           |   87 +-
 po/LINGUAS                         |    2 +
 po/ar.po                           |  120 ++-
 po/bg.po                           |  467 +++++---
 po/ca.po                           |  491 +++++--
 po/da.po                           | 1262 ++++++++++++++++--
 po/de.po                           | 1193 ++++++++++--------
 po/fr.po                           |   99 +-
 po/gl.po                           |  100 +-
 po/he.po                           |  283 +++--
 po/hi.po                           | 1185 +++++++++++++++++
 po/id.po                           |  336 +++---
 po/lv.po                           |  375 +++---
 po/mr.po                           | 1197 +++++++++++++++++
 po/nl.po                           |  241 ++--
 po/pa.po                           |   99 +-
 po/pl.po                           |  222 ++--
 po/pt_BR.po                        |  117 +-
 po/ru.po                           |  189 ++--
 po/sl.po                           |  122 ++-
 po/ug.po                           | 2513 ++++++++++++++++++++----------------
 po/uk.po                           |   92 +-
 po/vi.po                           |   10 +-
 po/zh_CN.po                        |   99 +-
 src/gnome-shell-plugin.c           |   14 +
 src/shell-global.c                 |    4 +-
 src/shell-util.c                   |   55 +
 src/shell-util.h                   |    3 +
 40 files changed, 7972 insertions(+), 3315 deletions(-)
---