[network-manager-applet/btdun: 17/17] Merge commit 'origin/master' into btdun

[Dan Williams <dcbw src gnome org>]

commit 1a0cf9cedc7c0ed9dbaad5ac17461bd8d8f3fe3b
Merge: b519a98... 048cd5e...
Author: Dan Williams <dcbw redhat com>
Date:   Tue Oct 20 12:14:53 2009 -0700

    Merge commit 'origin/master' into btdun

 icons/22/Makefile.am                      |    1 -
 icons/22/nm-active-device.png             |  Bin 415 -> 0 bytes
 nm-applet.schemas.in                      |    6 +-
 po/de.po                                  |  607 +++---
 po/es.po                                  |  534 +++---
 po/nb.po                                  |  595 +++---
 po/pa.po                                  |  838 +++++----
 po/pt_BR.po                               |  538 +++---
 po/sl.po                                  | 2946 ++++++++++++++++++++++-------
 src/applet-dbus-manager.c                 |    2 +-
 src/applet-device-wifi.c                  |    4 +-
 src/applet-dialogs.c                      |   80 +-
 src/applet.c                              |    8 +-
 src/applet.h                              |    1 -
 src/wireless-dialog.c                     |   95 +
 src/wireless-security/eap-method-leap.c   |   24 +-
 src/wireless-security/eap-method-leap.h   |    3 +-
 src/wireless-security/eap-method-peap.c   |   12 +-
 src/wireless-security/eap-method-peap.h   |    3 +-
 src/wireless-security/eap-method-simple.c |   24 +-
 src/wireless-security/eap-method-simple.h |    3 +-
 src/wireless-security/eap-method-tls.c    |   74 +-
 src/wireless-security/eap-method-tls.h    |    3 +-
 src/wireless-security/eap-method-ttls.c   |   10 +
 src/wireless-security/eap-method-ttls.h   |    3 +-
 src/wireless-security/eap-method.c        |   44 +
 src/wireless-security/eap-method.h        |   13 +-
 src/wireless-security/helpers.c           |   21 +-
 src/wireless-security/helpers.h           |    9 +-
 src/wireless-security/wireless-security.c |   45 +-
 src/wireless-security/wireless-security.h |   13 +-
 src/wireless-security/ws-dynamic-wep.c    |   10 +-
 src/wireless-security/ws-dynamic-wep.h    |    3 +-
 src/wireless-security/ws-leap.c           |   24 +-
 src/wireless-security/ws-leap.h           |    3 +-
 src/wireless-security/ws-wep-key.c        |   23 +-
 src/wireless-security/ws-wep-key.h        |    3 +-
 src/wireless-security/ws-wpa-eap.c        |   10 +-
 src/wireless-security/ws-wpa-eap.h        |    3 +-
 src/wireless-security/ws-wpa-psk.c        |   24 +-
 src/wireless-security/ws-wpa-psk.h        |    3 +-
 41 files changed, 4378 insertions(+), 2287 deletions(-)
---