[network-manager-applet/btdun: 11/11] Merge remote branch 'origin/master' into btdun

[Dan Williams <dcbw src gnome org>]

commit 7116c7a28354dcbc82ed78e76d69f04f06dd0570
Merge: 9f89d98 4f6d7de
Author: Dan Williams <dcbw redhat com>
Date:   Thu Feb 11 22:56:38 2010 -0800

    Merge remote branch 'origin/master' into btdun

 po/cs.po                                 |  726 +++++++++++++++++-------------
 po/de.po                                 |   36 ++-
 po/pa.po                                 |  270 +++++++-----
 po/sl.po                                 |   26 +-
 po/sv.po                                 |   26 +-
 src/applet-device-gsm.c                  |  159 +++++--
 src/applet-device-wifi.c                 |   30 +-
 src/applet-dialogs.c                     |   28 +-
 src/applet.c                             |   22 +-
 src/connection-editor/Makefile.am        |    3 +-
 src/gconf-helpers/gconf-helpers.c        |   70 +++-
 src/gconf-helpers/gconf-helpers.h        |    3 +-
 src/gconf-helpers/gconf-upgrade.c        |    2 +-
 src/gconf-helpers/nma-gconf-connection.c |   25 +-
 src/gconf-helpers/nma-gconf-connection.h |    3 +
 src/wired-dialog.c                       |   16 +-
 16 files changed, 911 insertions(+), 534 deletions(-)
---