This commit was manufactured by cvs2svn to create tagNETWORKMANAGER_0_6_3_RELEASE

'NETWORKMANAGER_0_6_3_RELEASE'.

git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/tags/NETWORKMANAGER_0_6_3_RELEASE@1813 4912f4e0-d625-0410-9fb7-b9a5a253dbdc

200 files changed, 36295 insertions, 12690 deletions

diff --git a/ChangeLog b/ChangeLog
index 90512e23e6..eb93bbd512 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,751 @@
+2006-06-07  Robert Love  <rml@novell.com>
+
+	* NEWS: Update.
+	* configure.in: Bump version to 0.6.3.
+
+2006-06-07  Robert Love  <rml@novell.com>
+
+	* gnome/applet/gconf-helpers.c: Bug fix: nm_gconf_helper_get_bool()
+	  checked that the return type was GCONF_VALUE_STRING, not the correct
+	  GCONF_VALUE_BOOL, and thus it never worked.
+	* src/NetworkManagerAPList.c: Before concluding that two networks are
+	  identical based on their BSSID, make sure that the BSSID in question
+	  is actually valid.  Specifically, an empty or all zero BSSID does not
+	  cut it.
+	* gnome/applet/applet-dbus-info.c, gnome/applet/other-network-dialog.c,
+	  src/nm-dbus-nmi.c, src/nm-device-802-11-wireless.c: White space and
+	  similar invariant clean up.
+
+2006-06-02  Robert Love  <rml@novell.com>
+
+	* gnome/applet/applet.c: Update copyright years.  Add Novell.
+
+2006-05-29  Stanislav Brabec  <sbrabec@suse.cz>
+
+	* configure.in: Updated translations from HEAD branch.
+
+2006-05-28  Dan Williams  <dcbw@redhat.com>
+
+	* gnome/applet/applet.glade
+	  gnome/vpn-properties/nm-vpn-properties.glade
+		- Set window icons on dialogs  (Gnome.org #333420)
+
+2006-05-28  Christian Persch  <chpe@cvs.gnome.org>
+
+	* gnome/vpn-properties/nm-vpn-properties.glade:
+	* vpn-daemons/openvpn/properties/nm-openvpn-dialog.glade:
+	* vpn-daemons/pptp/properties/nm-pptp-dialog.glade:
+	* vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade:
+		- Make the VPN properties pages prettier and more HIG
+		  compliant. Gnome Bug #336913.
+
+2006-05-28  Dan Williams  <dcbw@redhat.com>
+
+	Patch from Christian Persch <chpe@gnome.org>
+	* gnome/vpn-properties/nm-vpn-properties.c
+	* gnome/vpn-properties/nm-vpn-properties.glade
+		- HIG-ification love  (Gnome.org #336846)
+
+2006-05-28  Dan Williams  <dcbw@redhat.com>
+
+	Patch from Christian Persch <chpe@gnome.org>
+	* configure.in
+	  gnome/vpn-properties/nm-vpn-properties.c
+	  	- (main): Fix option parsing.  Gnome.org #336847
+
+2006-05-28  Dan Williams  <dcbw@redhat.com>
+
+	* gnome/vpn-properties/nm-vpn-properties.c
+		- (find_vpn_ui_by_service_name): protect against NULL service names
+		- (update_edit_del_sensitivity): protect against NULL service names
+			Gnome.org #341306
+
+2006-05-28  Dan Williams  <dcbw@redhat.com>
+
+	Patch from Chris Fuller <crf@grandecom.net>:
+	* src/nm-device-802-11-wireless.c
+		- (nm_device_802_11_wireless_dispose): add a is_initialized member and
+			don't dispose of wireless-specific stuff unless it is actually
+			initialized.  Gnome.org #341263
+
+2006-05-28  Dan Williams  <dcbw@redhat.com>
+
+	* src/NetworkManagerPolicy.c
+		- (nm_policy_device_change_check): don't switch devices if the "best"
+			AP is essentially the same as the current activation request, but
+			the current activation request isn't done activating yet.  Fixes
+			multiple requests for keyring password on startup for Gnome applet.
+			Gnome.org #341297
+
+2006-05-26  Nicolas Trangez  <eikke@eikke.com>
+
+	* src/NetworkManager.c: use GOptions instead of getopt
+	* configure.in: bump glib required version to >= 2.6 for GOption
+	  support
+
+2006-05-25  Robert Love  <rml@novell.com>
+
+	Patch Valentine Sinitsyn <e_val@inbox.ru> to fix GNOME bug #342400:
+	* libnm-util/Makefile.am: Only build gnome-keyring-md5.{c,h} if we are
+	  not using gcrypt.  Otherwise, we get a linker error.
+
+2006-05-25  Robert Love  <rml@novell.com>
+
+	Patch Valentine Sinitsyn <e_val@inbox.ru> to fix GNOME bug #342398:
+	* configure.in, gnome/Makefile.am, Makefile.am: Add "--without-gnome"
+	  configure flag to disable building of the GNOME-based applet.
+
+2006-05-25  Robert Love  <rml@novell.com>
+
+	* gnome/applet/nm-device.c, gnome/applet/nm-device.h: Rename function
+	  parameter from link, because it shadows a global variable with some
+	  older versions of glibc.  Yes, glibc is now fixed and, yes, glibc
+	  should never have exported to the entire system a common four letter
+	  word.  But we here at NetworkManager are team players.  Fixes
+	  GNOME bug #336532.
+
+2006-05-24  Robert Love  <rml@novell.com>
+
+	* examples/python/systray/eggtrayicon.c, gnome/applet/eggtrayicon.c,
+	  gnome/applet/passphrase-dialog.c, gnome/applet/vpn-password-dialog.c,
+	  src/NetworkManager.c: Include <glib/gi18n.h> and not <libintl.h>.
+
+2006-05-24  Robert Love  <rml@novell.com>
+
+	* gnome/applet/Makefile.am, gnome/vpn-properties/Makefile.am,
+	  libnm-util/Makefile.am, src/Makefile.am,
+	  vpn-daemons/openvpn/auth-dialog/Makefile.am,
+	  vpn-daemons/openvpn/properties/Makefile.am,
+	  vpn-daemons/pptp/auth-dialog/Makefile.am,
+	  vpn-daemons/pptp/properties/Makefile.am,
+	  vpn-daemons/vpnc/auth-dialog/Makefile.am,
+	  vpn-daemons/vpnc/properties/Makefile.am: Do not override what the
+	  user passed for --datadir, if anything, when setting the GNOME locale
+	  directory.  It should be a function of the specified datadir and not
+	  the prefix.
+
+2006-05-24  Robert Love  <rml@novell.com>
+
+	* gnome/applet/main.c, gnome/vpn-properties/nm-vpn-properties.c,
+	  src/NetworkManager.c: Take care to call bindtextdomain with the
+	  location of msgid files.
+	* src/Makefile.am: Set GNOMELOCALEDIR to the location of GNOME mo
+	  files.
+
+2006-05-22  Robert Love  <rml@novell.com>
+
+	* src/nm-device-802-11-wireless.c: Don't chain up to the parent's
+	  stage4_timeout on failure unless the wireless network is Ad-Hoc.
+	  99% of the time there is a real problem with wireless, and a
+	  seemingly successful connection via Zeroconf just confuses the user.
+	  And that 1% of the time the network is probably Ad-Hoc, anyhow.
+
+2006-05-22  Robert Love  <rml@novell.com>
+
+	* src/backends/NetworkManagerSuSE.c: Reload, do not restart, ypbind and
+	  autofs on interface up if NIS is configured.  On interface down, do
+	  nothing.
+
+2006-05-22  Robert Love  <rml@novell.com>
+
+	* gnome/applet/applet.c: Zero out the icon pointers before we set them,
+	  to avoid calling g_object_unref() on stale pointers on error in
+	  nma_icons_free().  This happens because we short-circuit loaded the
+	  icons on the first failure but then free all icons.  Normally we have
+	  no issue because the icons were zero'ed out malloc, but we have stale
+	  pointer data after nma_icon_theme_changed().
+	* gnome/applet/main.c: Return error code if nma_new() failed.
+
+2006-05-21  Dan Williams  <dcbw@redhat.com>
+
+	Patch from Adam Schreiber <sadam@clemson.edu>
+	* gnome/vpn-properties/nm-vpn-properties.c
+		- (main): correct Gnome program name  (gnome.org #342498)
+
+2006-05-21  Dan Williams  <dcbw@redhat.com>
+
+	Fix gnome.org #330832 based on patch from Crispin Flowerday <crispin@gnome.org>
+
+	* src/NetworkManagerDbus.[ch]
+		- nm_dbus_get_device_from_object_path -> nm_dbus_get_device_from_escaped_object_path:
+			clarify that function's argument should be an escaped dbus object
+			path, and look for path segment end before returning a match
+	* src/nm-dbus-nm.c:
+		- Fix up users of nm_dbus_get_device_from_escaped_object_path()
+
+2006-05-17  Robert Love  <rml@novell.com>
+
+	Functionality to differentiate Ad-Hoc networks from infrastructure
+	networks in the applet, by displaying a special icon:
+	* gnome/applet/applet-dbus-devices.c: Set the mode for new networks.
+	* gnome/applet/applet.c: Pass 'applet' to network_menu_item_update().
+	* gnome/applet/menu-items.c: Set a special icon in the scan list for
+	  ad-hoc networks.  TODO: Add a third icon representing "encrypted and
+	  Ad-Hoc".  Right now, we display the same icon for all Ad-Hoc wireless
+	  networks, encrypted or not.
+	* gnome/applet/wireless-network.c, gnome/applet/wireless-network.h: New
+	  accessor functions to get and set the mode of a given network,
+	  wireless_network_get_mode() and wireless_network_set_mode().
+
+2006-05-17  Robert Love  <rml@novell.com>
+
+	Functionality to automatically add BSSIDs to the allowed-MAC list as
+	one roams from access point to access point on a given network:
+	* src/NetworkManagerUtils.c: Add nm_ethernet_addresses_are_equal(),
+	  helper function to compare two ether_addr structures and return TRUE
+	  if they contain the same MAC address.
+	* src/NetworkManagerUtils.h: Add nm_ethernet_addresses_are_equal()
+	  prototype.
+	* src/nm-device-802-11-wireless.c: New function to update the BSSID
+	  stored with the current AP.  If the BSSID has indeed changed, we
+	  send it out to the applet, allowing the allowed-MAC list to grow
+	  automatically in response to roaming.
+
+2006-05-16  Robert Love  <rml@novell.com>
+
+	* src/backends/NetworkManagerSuSE.c: Don't touch ypbind or autofs
+	  unless dhcp:DHCLIENT_MODIFY_NIS_CONF is set to "yes".
+
+2006-05-13  Dan Williams  <dcbw@redhat.com>
+
+	* src/nm-device-802-3-ethernet.c
+		- (real_get_generic_capabilities): Don't ignore devices that can't do
+			carrier detect (Debian bug #366373)
+
+2006-05-11  Dan Williams  <dcbw@redhat.com>
+
+	Patch from Michael Biebl <biebl@teco.edu>
+	* src/backends/NetworkManagerDebian.c
+		- Debian backend fixups
+
+2006-05-10  Robert Love  <rml@novell.com>
+
+	* src/backends/NetworkManagerSuSE.c: Fix double free (Novell #173442).
+
+2006-05-09  Robert Love  <rml@novell.com>
+
+	* gnome/applet/nm-gconf-wso-wpa-eap.c: Fix FIXME: Save the WPA EAP
+	  private certificate passphrase, if any, in the GNOME Keyring.
+	* libnm-utils/dbus-helpers.c: Update.
+
+2006-05-05  Robert Love  <rml@novell.com>
+
+	* src/NetworkManager.c: Set the umask to 0022 when daemonizing, in case
+	  root has a wacky default of its own (or, more common, a user has a
+	  bad umask and uses su/sudo to restart NetworkManager).  Anything
+	  other than 0022 does not do what we want with, for example,
+	  resolv.conf.  This problem is amplified by our judicious use of
+	  fopen(), which uses mode 0666 -- implying that the only way to get
+	  the permissions we want is with a umask of 0022.
+
+2006-05-05  Dan Williams  <dcbw@redhat.com>
+
+	* gnome/libnm_glib/libnm_glib.c
+		- Don't suck CPU when dbus isn't around by scheduling idle handlers
+			to reconnect; instead wait a bit more with each reconnect attempt
+			up to a max of one minute.
+
+2006-05-04  Ryan Lortie  <desrt@desrt.ca>
+
+	* gnome/applet/passphrase-dialog.c (update_button_cb): Get the SSID of
+	  the WirelessNetwork structure using the proper function instead of
+	  just casting it directly to (const char *) (gnome.org #336991)
+
+2006-05-03  Robert Love  <rml@novell.com>
+
+	* src/backends/NetworkManagerSuSE.c: Respect the variable
+	  dhcp:DHCLIENT_MODIFY_RESOLV_CONF, not
+	  config:MODIFY_RESOLV_CONF_DYNAMICALLY, when deciding whether or not
+	  to dynamically update /etc/resolv.conf.
+
+2006-05-02  Robert Love  <rml@novell.com>
+
+	Patch by Timo Hoenig;
+	* tests/nm-online.c: Print pretty status indicator as timeout winds
+	  down.  Also fix possible race between DBUS startup and failure
+	  return.
+
+2006-05-01  Robert Love  <rml@novell.com>
+
+	* gnome/applet/applet-compat.c: Warn if the returned escaped ESSID is
+	  empty, too.
+
+2006-04-27  Jeremy Katz  <katzj@redhat.com>
+
+	* src/nm-device.c (discover_device_type): Actually use the hal
+	device type instead of ioctl poking
+
+2006-04-26  Robert Love  <rml@novell.com>
+
+	* tests/nm-online.c: New file.  Simple utility that returns exit status
+	  noting whether the connection is offline or online.  If offline on
+	  start, it waits 30 seconds (or a command-line given value) for an
+	  online signal.  If it times out, it again returns offline.  This is
+	  useful for scripts that want to wait for network connections.
+
+2006-04-25  Robert Love  <rml@novell.com>
+
+	* src/nm-ap-security-wep.c: Bug fix: We stopped setting the
+	  key mode (the authentication algorithm), e.g. open or shared, when we
+	  moved to using wpa_supplicant.  wpa_supplicant defaults to open, so
+	  only shared was broken.  If the user specified a shared key, set it
+	  explicitly, otherwise let wpa_supplicant go with the default.
+
+2006-04-20  Robert Love  <rml@novell.com>
+
+	Fix bug where hidden ESSID's would not show up in the applet, even
+	if NMI provided a BSSID -> ESSID mapping from Gconf.  This occurred
+	because nm_policy_device_list_update_from_allowed_list() would merge
+	the data, putting a name to the hidden networks, but never notify NMI
+	of the changes.  Simple fix is to invoke the function
+	nm_dbus_signal_wireless_network_change() if we make a mapping.
+	* src/NetworkManagerAPList.c: Call the function
+	  nm_dbus_signal_wireless_network_change() if we made a successful
+	  BSSID to ESSID mapping, notifying the applet of the "new" network.
+	* src/NetworkManagerAPList.h: Update the prototypes for both
+	  nm_ap_list_copy_essids_by_address() and
+	  nm_ap_list_copy_one_essid_by_address().
+
+2006-04-20  Robert Love  <rml@novell.com>
+
+	* gnome/applet/applet-dbus-info.c: Don't bail out if the timestamp is
+	  not set.  Just return zero.
+
+2006-04-20  Robert Love  <rml@novell.com>
+
+	* gnome/vpn-properties/nm-vpn-properties.c: Satisfy TODO: Ensure that
+	  only one copy of nm-vpn-properties is running at a time via the 'ol
+	  X selection trick.  This prevents the user from opening two "VPN
+	  Connections" windows from within the applet, which leads to mass
+	  hysteria.
+	* clipboard.c: New file, implementing simple X selection logic.
+	* clipboard.h: New file.
+	* gnome/vpn-properties/Makefile.am: Add clipboard.{c,h}
+
+2006-04-16  Dan Williams  <dcbw@redhat.com>
+
+	Patch from Paul Blazejowski <paulb@blazebox.homeip.net>
+	* configure.in
+	  initscript/Slackware/Makefile.am
+	  initscript/Slackware/rc.networkmanager-dispatcher.in
+	  initscript/Slackware/rc.networkmanager.in
+		- Update slackware initscripts
+
+2006-04-10  Robert Love  <rml@novell.com>
+
+	* gnome/vpn-properties/nm-vpn-properties.c: Intercept and short-circuit
+	  the "delete_event" signal on the druid's parent window and handle it
+	  our way, lest using the WM to close the druid results in a series of
+	  bloody and ultimately lethal errors.
+
+2006-04-10  Robert Love  <rml@novell.com>
+
+	* gnome/vpn-properties/nm-vpn-properties.c: Validate VPN settings on
+	  'Back' too or else the 'Forward' option is initially disabled despite
+	  valid input.
+
+2006-04-06  Robert Love  <rml@novell.com>
+
+	Fix bad but simple bug where an active modem connection did not update
+	NM's connection state, breaking any app that did online/offline:
+	* src/NetworkManagerMain.h: Add 'modem_active' member to NMData,
+	  represented whether a dial up connection is active, or not.
+	* src/nm-dbus-nm.c: Set and unset 'modem_active' in response
+	  to modem activation and deactivation.
+	* src/NetworkManagerDbus.c: When asked our state, do not return
+	  disconnected if the modem is active.
+
+2006-04-04  Robert Love  <rml@novell.com>
+
+	* gnome/applet/applet.c: Remove the 'Remove' option that I added to the
+	  applet.  It just confuses the crap out of people and does not make a
+	  lot of sense, as the daemon still runs.
+
+2006-03-29  Robert Love  <rml@novell.com>
+
+	Patch by Vinay R <rvinay@novell.com> and Robert Love <rml@novell.com>,
+	to add support for per-route MSS and improve support for per-interface
+	MTU:
+	* src/NetworkManagerSystem.c: Modify nm_system_device_set_ip4_route to
+	  optionally take an MSS parameter and set it for the given route.
+	  Remove nm_system_device_set_ip4_route_with_iface.  Pass in the
+	  NMIP4Config's stored MSS, if any.
+	* src/nm-ip4-config.c: Add 'mtu' and 'mss' to NMIP4Config, representing
+	  the interface's MTU and the route's MSS, respectively.  Add functions
+	  nm_ip4_config_get_mtu, nm_ip4_config_set_mtu, nm_ip4_config_get_mss,
+	  and nm_ip4_config_set_mss for retrieving and setting the MTU and the
+	  MSS.
+	* src/nm-ip4-config.h: Add prototypes for nm_ip4_config_get_mtu,
+	  nm_ip4_config_set_mtu, nm_ip4_config_get_mss, and
+	  nm_ip4_config_set_mss.
+	* src/vpn-manager/nm-vpn-service.c: Modify to receive the MSS from the
+	  VPN daemon.
+	* src/backends/NetworkManager{Arch,Debian,Gentoo,RedHat,Slackware,SUSE}.c:
+	  Change the retval of nm_system_get_mtu to guint32.
+	* src/dhcp-manager/nm-dhcp-manager.c: Set the MTU on the new DHCP-given
+	  NMIP4Config to the MTU provided by the system, if any.  TODO: If DHCP
+	  servers can specify MTU's, we should set it here if the MTU was not
+	  provided.
+
+2006-03-27  Dan Williams  <dcbw@redhat.com>
+
+	Patch from Christian Persch <chpe@gnome.org>
+	* gnome/applet/applet.glade
+		- HIG fixes; mostly for spacing and borders (gnome.org #336220)
+
+2006-03-27  Dan Williams  <dcbw@redhat.com>
+
+	Patch from Diffe <diffie@blazebox.homeip.net>
+	* src/backends/NetworkManagerSlackware.c
+		- Don't restart howl, since it's been replaced by Avahi
+			in most distributions
+
+2006-03-27  Dan Williams  <dcbw@redhat.com>
+
+	Patch from Tor Krill <bugzilla@krill.nu>
+	* configure.in
+	  initscript/Makefile.am
+	  src/backends/Makefile.am
+	  src/backends/NetworkManagerArch.c
+	  initscript/Arch/Makefile.am
+	  initscript/Arch/networkmanager-dispatcher.in
+	  initscript/Arch/networkmanager.in
+		- Add Arch Linux support, fixes gnome.org #335147
+
+2006-03-27  Dan Williams  <dcbw@redhat.com>
+
+	Patch from Diffe <diffie@blazebox.homeip.net>
+	* initscript/Slackware/rc.networkmanager
+		- update, fixed gnome.org #333368
+
+2006-03-27  Robert Love  <rml@novell.com>
+
+	* configure.in: Bump version to 0.6.2.
+	* NEWS: Update.
+
+2006-03-27  Robert Love  <rml@novell.com>
+
+	* gnome/applet/other-network-dialog.c: Do not allow the user to try to
+	  create WPA-EAP Ad-Hoc networks because such an action makes no sense.
+
+2006-03-27  Robert Love  <rml@novell.com>
+
+	Patch by Jürg Billeter <j@bitron.ch>:
+	* src/nm-logging.c: Add printf modifier to fix warning on 64-bit
+	  systems.
+	* src/nm-netlink-monitor.c: Include <net/if.h> instead of <linux/if.h>
+	  as we prefer glibc over kernel headers, if possible.
+
+2006-03-27  Robert Love  <rml@novell.com>
+
+	Patch by Jon Escombe <list@dresco.co.uk>:
+	* gnome/applet/nm-gconf-wso.c: Add missing NM_AUTH_TYPE_WPA_EAP case.
+	* gnome/applet/nm-gconf-wso-wpa-eap.c: If retrieving the gconf values
+	  fail, don't bail out.  We don't expect all of the various WPA-EAP
+	  values to be present.
+	* src/nm-ap-security.c: We need to match all capabilities for each
+	  encryption type, not any one of them.
+
+2006-03-27  Robert Love  <rml@novell.com>
+
+	* src/backends/NetworkManagerSuSE.c: Revert 2006-03-17 commit and again
+	  restart, not reload, ypbind.  Unfortunately there is no superior
+	  solution.
+
+2006-03-24  Robert Love  <rml@novell.com>
+
+	Patch by Christopher Aillon <caillon@redhat.com> on HEAD:
+	* gnome/applet/applet-notifications.c: When displaying a notification,
+	  make sure to get rid of the previous notification so as to not have
+	  competing bubbles, and stop leaking the old one.
+	* gnome/applet/applet.c, gnome/applet/applet.h:	Add a new
+	  'notification' member to the applet, and zero it out and free it
+	  appropriately.
+
+2006-03-23  Robert Love  <rml@novell.com>
+
+	Patch by j <j@bootlab.org>:
+	* gnome/applet/applet.glade: Don't set the invisible_char property,
+	  which simply overrides the GTK default.  By and by, this behavior
+	  ought to be fixed in Glade.
+
+2006-03-22  Robert Love  <rml@novell.com>
+
+	* src/dhcp-manager/nm-dhcp-manager.c: Bump timeout to 45 seconds.
+
+2006-03-22  Robert Love  <rml@novell.com>
+
+	Bug fix by Timo Hoenig <thoenig@suse.de>:
+	* gnome/applet/applet-dbus.c: Let the applet reconnect to DBUS on
+	  disconnect.  Otherwise, we have the daemon surviving DBUS restarts
+	  and the applet going AWOL.
+
+2006-03-22  Robert Love  <rml@novell.com>
+
+	* src/dhcp-manager/nm-dhcp-manager.c: Create NM_DHCP_TIMEOUT
+	  preprocessor define and use it instead of open-coded the DHCP
+	  timeout, which is currently 25 seconds, everywhere.
+
+2006-03-22  Robert Love  <rml@novell.com>
+
+	Implement "Dynamic WEP", which is basically WPA authentication and WEP
+	key exchange via WPA, ostensibly providing good security without
+	requiring hardware that supports full WPA.  Also, add UI elements to
+	allow the user to select the pairwise & group cipher for WPA Enterprise
+	networks, too:
+	* gnome/applet/applet.glade: Update glade file.
+	* gnome/applet/nm-gconf-wso-wpa-eap.c: Serialize and deserialize the
+	  key type, too, to and from gconf.
+	* gnome/applet/wireless-security-option.c: Add "wpa_eap" parameter to
+	  wso_wpa_create_key_type_model(), noting whether we are handling PSK
+	  or EAP configuration, and in the latter case add in "Dynamic WEP" if
+	  the capabilities match.
+	* gnome/applet/wso-private.h: Update wso_wpa_create_key_type_model()'s
+	  prototype.
+	* gnome/applet/wso-wpa-eap.c: Manage UI elements for the key type and
+	  serialize from UI to DBUS.
+	* gnome/applet/wso-wpa-psk.c: Cannot fail and always returns at least
+	  one element.
+	* libnm-util/dbus-helpers.c: Update nmu_security_serialize_wpa_eap(),
+	  nmu_security_serialize_wpa_eap_with_cipher(), and
+	  nmu_security_deserialize_wpa_eap() to take a "key_type" parameter and
+	  serialize/deserialize the key type via DBUS as the new third DBUS
+	  parameter.
+	* libnm-util/dbus-helpers.h: Update prototypes.
+	* src/nm-ap-security-wpa-eap.c: Deserialize the key type from DBUS,
+	  too.  If the key type is WEP104, do Dynamic WEP, which means
+	  "IEEE8021X" for "key_mgmt".  Also add support for user-specified
+	  pairwise and group ciphers (fixes a FIXME).
+
+2006-03-21  Robert Love  <rml@novell.com>
+
+	* src/NetworkManagerSystem.c, src/NetworkManagerSystem.h: Add
+	  nm_system_get_mtu(), which returns a user-provided or system-mandated
+	  MTU value for a given device, if any, or zero if no such value
+	  exists.  Add nm_system_set_mtu() to set the MTU for a given device
+	  if we have a provided value.
+	* src/nm-device.c: Set the MTU of devices.
+	* src/backends/NetworkManagerSuSE.c: Read MTU, if any, from sysconfig.
+	* src/backends/NetworkManagerDebian.c,
+	  src/backends/NetworkManagerGentoo.c,
+	  src/backends/NetworkManagerRedHat.c,
+	  src/backends/NetworkManagerSlackware.c: Implement stub functions.
+
+2006-03-21  Robert Love  <rml@novell.com>
+
+	* src/backends/NetworkManagerSuSE.c: Strip hypens from hex key in
+	  configuration file.
+
+2006-03-17  Robert Love  <rml@novell.com>
+
+	* src/backends/NetworkManagerSuSE.c: Do "rcypbind reload" to send the
+	  signal SIGHUP to ypbind, not "rcypbind restart" to physically restart
+	  it, in case it is not running in the first place.  We just want its
+	  configuration reloaded.  Also, do not "rcypbind stop" on device down.
+
+2006-03-15  Robert Love  <rml@novell.com>
+
+	* gnome/applet/applet.glade, gnome/applet/wso-wep-ascii.c,
+	  gnome/applet/wso-wep-hex.c, gnome/applet/wso-wep-passphrase.c: The
+	  label "WEP 40/128-bit" is inconsistent because the physical key size
+	  is 40 or 104-bits, to which a 24-bit initialisation vector is
+	  appended, forming a 64 or 128-bit traffic key.  Thus, the label ought
+	  to read "40/104" or "64/128".  I do not care much which, but most
+	  users think of "silver" and "gold" encryption as 64 and 128-bits, so
+	  let's stick with that.  Thus, s/"40/128"/"64/128"/g.  Also, since our
+	  WEP passphrase support only handles 128-bit keys, and any future
+	  64-bit passphrase support will require a new option (no way to auto-
+	  detect the target key size), explicitly label our passphrase support
+	  "WEP 128-bit Passphrase".
+
+2006-03-15  Robert Love  <rml@novell.com>
+
+	* src/dhcp-manager/nm-dhcp-manager.c: Do not start dhcdbd, but rely on
+	  the system init scripts (or some other mechanism) starting it (or a
+	  compatible DBUS service) before NetworkManager runs.  This means that
+	  distributions might need to update their init scripts.  This fixes
+	  possible races and is quite a bit cleaner.
+	* initscript/SUSE/networkmanager.in: Update to start dhcdbd before
+	  starting the NetworkManager daemon.
+
+2006-03-14  Robert Love  <rml@novell.com>
+
+	* src/backends/NetworkManagerSuSE.c: Check that we have a valid AP
+	  before adding anything.
+
+2006-03-13  Robert Love  <rml@novell.com>
+
+	* gnome/vpn-properties/nm-vpn-properties.c: Hide the next page's
+	  widgets, too, if they exist, in case the user hit the back button.
+	  Fixes a bug where the details page contains the widgets of multiple
+	  VPN modules (Novell bug #157048).
+
+2006-03-13  Robert Love  <rml@novell.com>
+
+	* configure.in: Bump version to 0.6.1.
+	* NEWS: Update.
+
+2006-03-13  Robert Love  <rml@novell.com>
+
+	Patch by Timo Hoenig <thoenig@suse.de>:
+	* dispatcher-daemon/NetworkManagerDispatcher.c: Let the dispatcher
+	  daemon survive DBUS restarts, too.
+
+2006-03-10  Robert Love  <rml@novell.com>
+
+	* gnome/applet/applet-dbus-devices.c: When building the device
+	  description, do not bail out if one property is nonexistant.  Keep
+	  building the rest of the string, in case the others exist.  The user
+	  cannot do anything about the errors, anyhow.  Some devices do not
+	  have all of the properties.
+
+2006-03-10  Robert Love  <rml@novell.com>
+
+	* gnome/applet/applet.glade: Add toggles to show/obfuscate the
+	  passphrase or key.
+	* gnome/applet/wso-wep-ascii.c, gnome/applet/wso-wep-hex.c,
+	  gnome/applet/wso-wep-passphrase.c, gnome/applet/wso-wpa-eap.c,
+	  gnome/applet/wso-wpa-psk.c: Show and obfuscate passphrases and keys
+	  in response to "toggled" signal on new toggle.
+
+2006-03-10  Robert Love  <rml@novell.com>
+
+	* src/nm-ap-security-wpa-eap.c: Pass fake empty strings for
+	  serialization if strings are NULL, lest DBUS get angry.
+
+2006-03-10  Robert Love  <rml@novell.com>
+
+	* src/nm-ap-security-wpa-eap.c: Don't log the password.
+
+2006-03-09  Robert Love  <rml@novell.com>
+
+	* src/backends/NetworkManagerSuSE.c: Read in WEP and WPA static
+	  configurations.
+
+2006-03-09  Robert Love  <rml@novell.com>
+
+	* src/NetworkManagerAP.c, src/NetworkManagerAP.h: Have the function
+	  nm_ap_set_timestamp() take the second and micro-second parameters as
+	  direct arguments, which avoids both a dynamic memory allocation and a
+	  structure-to-structure copy!  Add a new interface, the aptly named
+	  nm_ap_set_timestamp_via_timestamp(), to set the timestamp from an
+	  existing GTimeVal, as nm_ap_set_timestamp() once did, for use with
+	  the return from nm_ap_get_timestamp().  New users should use the new
+	  nm_ap_set_timestamp(), not nm_ap_set_timestamp_via_timestamp(), for
+	  the extreme benefit to performance.
+	* src/NetworkManagerAPList.c, src/nm-dbus-nmi.c,
+	  src/backends/NetworkManagerSuSE.c: Use the new functions as needed.
+
+2006-03-08  Robert Love  <rml@novell.com>
+
+	* gnome/applet/applet.glade: Hide the password entry text with
+	  asterisks.
+
+2006-03-08  Robert Love  <rml@novell.com>
+
+	* src/NetworkManagerSystem.h, src/nm-device.c, NetworkManagerDebian.c,
+	  NetworkManagerRedHat.c, NetworkManagerGentoo.c,
+	  NetworkManagerSlackware.c: Pass nm_system_device_get_system_config()
+	  a second argument, NMData.
+	* src/nm-ap-security.h, src/nm-ap-security.c: Export nm_ap_security_new.
+	* src/backends/NetworkManagerSuSE.c: Add wireless networks from ifcfg-*
+	  config files as trusted.
+
+2006-03-06  Robert Love  <rml@novell.com>
+
+	* gnome/applet/Makefile.am: Define AUTOSTARTDIR.
+	* gnome/applet/applet.c: Add 'Remove' option to the right click menu,
+	  to exit the applet.  As a sweet side-effect, idea courtesy of Chris
+	  Rivera, detect if the applet was auto-started.  If so, ask the user
+	  if he or she would like to stop automatically running the applet on
+	  login.  If so, disable autostart.
+
+2006-03-06  Robert Love  <rml@novell.com>
+
+	* NetworkManager.pc.in:  Provide an -I to the NetworkManager include
+	  directory in CFLAGS so developers can actually use NetworkManager.h.
+
+2006-03-06  Robert Love  <rml@novell.com>
+
+	* src/dhcp-manager/nm-dhcp-manager.c: Use preprocessor defines and not
+	  open-coded integer constants.  Add state_to_string() to map a given
+	  state to a textual description, and provide that when notifying of
+	  state change.
+	* src/dhcp-manager/nm-dhcp-manager.h: Provide defines for the dhcdbd
+	  states, copied and cleaned up from dhcdbd.d.  Ideally, we would use
+	  this header directly, but it is currently not installed on most
+	  systems.
+
+2006-03-05  Dan Williams  <dcbw@redhat.com>
+
+	* gnome/applet/applet-notifications.h
+		- Protect prototype of nma_send_event_notification() because it
+			includes libnotify-specific types
+		- Include libnotify/libnotify.h too, since we technically need it
+
+	* gnome/applet/applet.c
+		- (nma_show_vpn_failure_dialog): fix usage of g_return_if_fail
+		- (nma_show_vpn_login_banner_dialog): add some error checking
+
+2006-03-04  Dan Williams  <dcbw@redhat.com>
+
+	Clean up activation cancellation.  Should be a lot faster now.  Observed
+	an issue with wireless devices between stage 2 and 3 of activation, where
+	activation would be cancelled, but the device thread wouldn't notice until
+	the supplicant association timed out.  Reorganize activation such that
+	a cancellation handler gets immediately scheduled in the device's thread,
+	and devices have a chance to perform any custom cleanup too.
+
+	* src/nm-device.[ch]
+		- (activation_cancel_handler): new device-type-specific function
+			for cleaning up device-type-specific stuff on cancellation
+		- (cancel_activation): removed
+		- (nm_device_activation_cancel): subsume functionality of
+			real_cancel_activation, but instead of doing anything, punt
+			operation to a handler that's run in device-thread context
+		- (nm_device_schedule_activation_handle_cancel): fix spelling of
+			a warning message
+		- (activation_handle_cancel_helper): cancellation handler run in
+			device-thread context, calls device-type-specific cancelation,
+			then tears down the activation request
+		- (real_activation_cancel_handler): generic cancellation handler,
+			deals with cancelling any in-process DHCP request
+		- (nm_device_activate_stage1_device_prepare,
+		   nm_device_activate_stage2_device_config,
+		   nm_device_activate_stage3_ip_config_start,
+		   nm_device_activate_stage4_ip_config_get,
+		   nm_device_activate_stage4_ip_config_timeout,
+		   nm_device_activate_stage5_ip_commit): don't call
+			nm_device_schedule_activation_handle_cancel() any more, since
+			cancellation will have been already scheduled for us by
+			nm_device_activation_cancel().  Just exit the function and
+			assume that the cancel handler will be called next.
+
+	* src/nm-device-802-3-ethernet.c
+		- (real_act_stage2_config): remove; didn't do anything anyway
+
+	* src/nm-device-802-11-wireless.c
+		- (supplicant_status_cb): ensure we don't do anything if the activation
+			got cancelled
+		- (real_activation_cancel_handler): implement; cancel user key request
+			on activation cancellation
+
+2006-03-04  Dan Williams  <dcbw@redhat.com>
+
+	* src/nm-device-802-11-wireless.c
+		- (supplicant_send_network_config): assume that drivers that don't
+			support WPA pretty much suck, and can't handle NM scanning
+			along with wpa_supplicant.
+
+2006-03-03  Robert Love  <rml@novell.com>
+
+	* configure.in: Bump version to 0.6.0.
+	* NEWS: Update.
+
+2006-03-03  Robert Love  <rml@novell.com>
+
+	* configure.in: Require DBUS 0.60 or later.
+
 2006-03-03  Dan Williams  <dcbw@redhat.com>
 
 	Fix a crash if an "Other wireless network" was chosen, failed, then
diff --git a/Makefile.am b/Makefile.am
index 12b5da07f8..3e0401773f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,13 +15,19 @@ EXTRA_DIST =				\
 	NetworkManager.pc.in	\
 	intltool-extract.in		\
 	intltool-merge.in		\
-	intltool-update.in		\
+	intltool-update.in		
+	
+if WITH_GNOME
+EXTRA_DIST +=				\
 	nm-applet.desktop
+endif
 
 DISTCLEANFILES = intltool-extract intltool-merge intltool-update
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = NetworkManager.pc
 
+if WITH_GNOME
 autostartdir = $(datadir)/gnome/autostart
 autostart_DATA = nm-applet.desktop
+endif
diff --git a/NEWS b/NEWS
index b49daecbf9..a2413f8d4b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,80 @@
 ==============================================
+NetworkManager-0.6.3
+Overview of changes since NetworkManager-0.6.2
+==============================================
+
+0.6.3 is a bug fix release with many, many bug
+fixes.  See the ChangeLog for details.
+
+==============================================
+NetworkManager-0.6.2
+Overview of changes since NetworkManager-0.6.1
+==============================================
+
+0.6.2 is a bug fix release.  Note that NetworkManager no longer automatically
+runs dhcdbd if it is not running.  This means that it is now the system's
+responsibility to start dhcdbd prior to NetworkManager, e.g. in the
+distribution's NetworkManager initscript.
+
+* NetworkManager
+	* Many, many bug fixes (Everyone)
+	* Dynamic WEP Support (Robert Love)
+
+* nm-applet
+	* Many bug fixes (Everyone)
+
+
+==============================================
+NetworkManager-0.6.1
+Overview of changes since NetworkManager-0.6.0
+==============================================
+
+0.6.1 is a minor bug fix release.
+
+* NetworkManager
+	* Improved activation cancelation (Dan Williams)
+	* Workarounds for non-WPA drivers (Dan Williams)
+	* Fix WPA Enterprise crasher (Robert Love)
+
+* nm-applet
+	* Hide password entry fields by default (Robert Love)
+	* Add toggle to show/hide password field (Robert Love)
+	* Add 'Remove' option to right-click menu (Robert Love)
+
+==============================================
+NetworkManager-0.6.0
+Overview of changes since NetworkManager-0.5.1
+==============================================
+
+This releases ushers in WPA support, as well as many other features, bug fixes,
+and clean ups.
+
+We now require libnl, a netlink library (http://people.suug.ch/~tgr/libnl/) and
+wpa_supplicant, a WPA supplicant (http://hostap.epitest.fi/wpa_supplicant/).
+
+Two new VPN modules are part of the distribution: openvpn and pptp.
+
+* NetworkManager
+	* WPA and WPA2 support (Dan Williams)
+	* WPA Enterprise support (Robert Love)
+	* Rearchitecting, refactoring (Dan Williams)
+	* wpa_supplicant support (Dan Williams, Kay Sievers)
+	* NIS support (Robert Love)
+	* DHCP hostname support (Timo Hoenig)
+	* ISDN support, improve dial up support (Robert Love)
+	* Man pages (Robert Love)
+	* Survive DBUS and HAL restarts (Timo Hoening)
+	* Generate PID files (Dan Willians)
+	* Bug fixes and clean ups (the whole gang)
+
+* nm-applet
+	* New tray icon look and behavior (Robert Love, Dan Williams)
+	* New wireless security layer (Dan Williams)
+	* New "Enable Networking" toggle (Robert Love)
+	* Display speed of current connection (Robert Love)
+	* Bug fixes and clean ups (the whole gang)
+
+==============================================
 NetworkManager-0.5.1
 Overview of changes since NetworkManager-0.5.0
 ==============================================
diff --git a/NetworkManager.pc.in b/NetworkManager.pc.in
index 3ffcc5389c..33694613d4 100644
--- a/NetworkManager.pc.in
+++ b/NetworkManager.pc.in
@@ -8,3 +8,4 @@ Name: NetworkManager
 Description: System for maintaining active network connection
 Requires: dbus-1
 Version: @VERSION@
+Cflags: -I${includedir}/NetworkManager
diff --git a/configure.in b/configure.in
index 47cfa56ff0..0515d59e3c 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 AC_PREREQ(2.52)
 
-AC_INIT(NetworkManager, 0.5.1, dcbw@redhat.com, NetworkManager)
+AC_INIT(NetworkManager, 0.6.3, dcbw@redhat.com, NetworkManager)
 AM_INIT_AUTOMAKE([subdir-objects])
 AM_MAINTAINER_MODE
 
@@ -35,22 +35,29 @@ AC_FUNC_MEMCMP
 AC_CHECK_FUNCS(select socket uname)
 
 dnl
+dnl GNOME support
+dnl
+AC_ARG_WITH(gnome, AC_HELP_STRING([--without-gnome], [Build NetworkManager without GNOME support, e.g. daemon only]))
+AM_CONDITIONAL(WITH_GNOME, test x"$with_gnome" != xno)
+
+dnl
 dnl translation support
 dnl
 GETTEXT_PACKAGE=NetworkManager
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
-ALL_LINGUAS="bg bs ca cs da de el en_CA es fi fr gu hr hu it ja ko lt nb ne nl pa pt_BR rw sk sq sr sr@Latn sv uk vi wa zh_CN zh_TW"
+ALL_LINGUAS="bg bs ca cs da de el en_CA en_GB es fi fr gu hr hu it ja ko lt mk nb ne nl pa pt_BR rw sk sq sr@Latn sr sv uk vi wa zh_CN zh_TW"
 AC_PROG_INTLTOOL([0.27.2])
 AM_GLIB_GNU_GETTEXT
 
-AC_ARG_WITH(distro, AC_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, suse, gentoo, debian, or slackware]))
+AC_ARG_WITH(distro, AC_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, suse, gentoo, debian, arch or slackware]))
 if test "z$with_distro" = "z"; then
 	AC_CHECK_FILE(/etc/redhat-release,with_distro="redhat")
 	AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse")
 	AC_CHECK_FILE(/etc/fedora-release,with_distro="redhat")
 	AC_CHECK_FILE(/etc/gentoo-release,with_distro="gentoo")
 	AC_CHECK_FILE(/etc/debian_version,with_distro="debian")
+	AC_CHECK_FILE(/etc/arch-release,with_distro="arch")
 	AC_CHECK_FILE(/etc/slackware-version,with_distro="slackware")
 fi
 with_distro=`echo ${with_distro} | tr '[[:upper:]]' '[[:lower:]]' `
@@ -60,7 +67,7 @@ if test "z$with_distro" = "z"; then
 	exit 1
 else
 	case $with_distro in
-		redhat|suse|gentoo|debian|slackware) ;;
+		redhat|suse|gentoo|debian|slackware|arch) ;;
 		*)
 			echo "Your distribution (${with_distro}) is not yet supported!  (patches welcome)"
 			exit 1
@@ -72,6 +79,7 @@ AM_CONDITIONAL(TARGET_SUSE, test x"$with_distro" = xsuse)
 AM_CONDITIONAL(TARGET_GENTOO, test x"$with_distro" = xgentoo)
 AM_CONDITIONAL(TARGET_DEBIAN, test x"$with_distro" = xdebian)
 AM_CONDITIONAL(TARGET_SLACKWARE, test x"$with_distro" = xslackware)
+AM_CONDITIONAL(TARGET_ARCH, test x"$with_distro" = xarch)
 
 AC_MSG_CHECKING([for wireless-tools >= 28pre9])
 AC_TRY_COMPILE([#include <iwlib.h>],
@@ -87,7 +95,7 @@ fi
 IWLIB=-liw
 AC_SUBST(IWLIB)
 
-PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= 0.22)
+PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= 0.60)
 
 ##### Find out the version of DBUS we're using
 dbus_version=`pkg-config --modversion dbus-1`
@@ -127,7 +135,7 @@ PKG_CHECK_MODULES(GTHREAD, gthread-2.0)
 AC_SUBST(GTHREAD_CFLAGS)
 AC_SUBST(GTHREAD_LIBS)
 
-PKG_CHECK_MODULES(GLIB, glib-2.0)
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.6)
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
@@ -139,33 +147,35 @@ PKG_CHECK_MODULES(HAL, hal >= 0.5.0)
 AC_SUBST(HAL_CFLAGS)
 AC_SUBST(HAL_LIBS)
 
-PKG_CHECK_MODULES(GTK, gtk+-2.0)
-AC_SUBST(GTK_CFLAGS)
-AC_SUBST(GTK_LIBS)
-
-PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0)
-AC_SUBST(GDK_PIXBUF_CFLAGS)
-AC_SUBST(GDK_PIXBUF_LIBS)
-
-PKG_CHECK_MODULES(GLADE, libglade-2.0)
-AC_SUBST(GLADE_CFLAGS)
-AC_SUBST(GLADE_LIBS)
-
-PKG_CHECK_MODULES(GCONF, gconf-2.0)
-AC_SUBST(GCONF_CFLAGS)
-AC_SUBST(GCONF_LIBS)
-
-PKG_CHECK_MODULES(GNOME_KEYRING, gnome-keyring-1)
-AC_SUBST(GNOME_KEYRING_CFLAGS)
-AC_SUBST(GNOME_KEYRING_LIBS)
-
-PKG_CHECK_MODULES([NOTIFY], [libnotify >= 0.3.0], [enable_notify=yes],
-			    [enable_notify=no])
-if test "x$enable_notify" != "xno"; then
-   AC_DEFINE_UNQUOTED([ENABLE_NOTIFY], [1],
-   [Enable notifications with libnotify])
+if test x"$with_gnome" != xno; then
+	PKG_CHECK_MODULES(GTK, gtk+-2.0)
+	AC_SUBST(GTK_CFLAGS)
+	AC_SUBST(GTK_LIBS)
+
+	PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0)
+	AC_SUBST(GDK_PIXBUF_CFLAGS)
+	AC_SUBST(GDK_PIXBUF_LIBS)
+
+	PKG_CHECK_MODULES(GLADE, libglade-2.0)
+	AC_SUBST(GLADE_CFLAGS)
+	AC_SUBST(GLADE_LIBS)
+
+	PKG_CHECK_MODULES(GCONF, gconf-2.0)
+	AC_SUBST(GCONF_CFLAGS)
+	AC_SUBST(GCONF_LIBS)
+
+	PKG_CHECK_MODULES(GNOME_KEYRING, gnome-keyring-1)
+	AC_SUBST(GNOME_KEYRING_CFLAGS)
+	AC_SUBST(GNOME_KEYRING_LIBS)
+
+	PKG_CHECK_MODULES([NOTIFY], [libnotify >= 0.3.0], [enable_notify=yes],
+				[enable_notify=no])
+	if test "x$enable_notify" != "xno"; then
+		AC_DEFINE_UNQUOTED([ENABLE_NOTIFY], [1],
+		[Enable notifications with libnotify])
+	fi
 fi
-AM_CONDITIONAL(WITH_NOTIFY, test x"$enable_notify" != xno)
+AM_CONDITIONAL(WITH_NOTIFY, test x"$enable_notify" != xno) # can't do it from inside 'if'
 
 PKG_CHECK_MODULES(LIBNL, libnl-1)
 AC_SUBST(LIBNL_CFLAGS)
@@ -193,13 +203,20 @@ else
 fi
 AM_CONDITIONAL(WITH_GCRYPT, test x"$ac_gcrypt" != xno)
 
-PKG_CHECK_MODULES(PANEL_APPLET, libpanelapplet-2.0)
-AC_SUBST(PANEL_APPLET_CFLAGS)
-AC_SUBST(PANEL_APPLET_LIBS)
+if test x"$with_gnome" != xno; then
+	PKG_CHECK_MODULES(PANEL_APPLET, libpanelapplet-2.0)
+	AC_SUBST(PANEL_APPLET_CFLAGS)
+	AC_SUBST(PANEL_APPLET_LIBS)
 
-PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0)
-AC_SUBST(LIBGNOMEUI_CFLAGS) # is this even needed? it was typed incorrectly before
-AC_SUBST(LIBGNOMEUI_LIBS)
+	PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0)
+	AC_SUBST(LIBGNOMEUI_CFLAGS) # is this even needed? it was typed incorrectly before
+	AC_SUBST(LIBGNOMEUI_LIBS)
+
+	PKG_CHECK_EXISTS([libgnome-2.0 >= 2.14.0],[have_libgnome_2_14=yes],[have_libgnome_2_14=no])
+	if test "$have_libgnome_2_14" = "yes"; then
+		AC_DEFINE([HAVE_LIBGNOME_2_14],[1],[Define if we have libgnome 2.14])
+	fi
+fi
 
 AC_ARG_WITH(dbus-sys, AC_HELP_STRING([--with-dbus-sys=DIR], [where D-BUS system.d directory is]))
 
@@ -332,9 +349,14 @@ initscript/Gentoo/Makefile
 initscript/Gentoo/NetworkManager
 initscript/Debian/Makefile
 initscript/Slackware/Makefile
+initscript/Slackware/rc.networkmanager
+initscript/Slackware/rc.networkmanager-dispatcher
 initscript/SUSE/Makefile
 initscript/SUSE/networkmanager
 initscript/SUSE/networkmanager-dispatcher
+initscript/Arch/Makefile
+initscript/Arch/networkmanager
+initscript/Arch/networkmanager-dispatcher
 man/Makefile
 man/NetworkManager.1
 man/NetworkManagerDispatcher.1
diff --git a/dispatcher-daemon/NetworkManagerDispatcher.c b/dispatcher-daemon/NetworkManagerDispatcher.c
index c61b25cbaf..8f1d366398 100644
--- a/dispatcher-daemon/NetworkManagerDispatcher.c
+++ b/dispatcher-daemon/NetworkManagerDispatcher.c
@@ -52,6 +52,7 @@ typedef enum NMDAction	NMDAction;
 
 #define NMD_DEFAULT_PID_FILE	LOCALSTATEDIR"/run/NetworkManagerDispatcher.pid"
 
+static DBusConnection *nmd_dbus_init (void);
 
 /*
  * nmd_permission_check
@@ -174,6 +175,22 @@ static char * nmd_get_device_name (DBusConnection *connection, char *path)
 	return dev_name;
 }
 
+/*
+ * nmd reinit_dbus
+ *
+ * Reconnect to the system message bus if the connection was dropped.
+ *
+ */
+static gboolean nmd_reinit_dbus (gpointer user_data)
+{
+	if (nmd_dbus_init ())
+	{
+		nm_info ("Successfully reconnected to the system bus.");
+		return FALSE;
+	}
+	else
+		return TRUE;
+}
 
 /*
  * nmd_dbus_filter
@@ -191,6 +208,14 @@ static DBusHandlerResult nmd_dbus_filter (DBusConnection *connection, DBusMessag
 	dbus_error_init (&error);
 	object_path = dbus_message_get_path (message);
 
+	if (dbus_message_is_signal (message, DBUS_INTERFACE_LOCAL, "Disconnected"))
+	{
+		dbus_connection_unref (connection);
+		connection = NULL;
+		g_timeout_add (3000, nmd_reinit_dbus, NULL);
+		handled = TRUE;
+	}
+
 	if (dbus_message_is_signal (message, NM_DBUS_INTERFACE, "DeviceNoLongerActive"))
 		action = NMD_DEVICE_NOW_INACTIVE;
 	else if (dbus_message_is_signal (message, NM_DBUS_INTERFACE, "DeviceNowActive"))
@@ -225,7 +250,6 @@ static DBusHandlerResult nmd_dbus_filter (DBusConnection *connection, DBusMessag
 	return (handled ? DBUS_HANDLER_RESULT_HANDLED : DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
 }
 
-
 /*
  * nmd_dbus_init
  *
@@ -246,6 +270,7 @@ static DBusConnection *nmd_dbus_init (void)
 		return (NULL);
 	}
 
+	dbus_connection_set_exit_on_disconnect (connection, FALSE);
 	dbus_connection_setup_with_g_main (connection, NULL);
 
 	if (!dbus_connection_add_filter (connection, nmd_dbus_filter, NULL, NULL))
diff --git a/examples/python/systray/eggtrayicon.c b/examples/python/systray/eggtrayicon.c
index 07ce5dfce0..cfabfe5743 100644
--- a/examples/python/systray/eggtrayicon.c
+++ b/examples/python/systray/eggtrayicon.c
@@ -20,7 +20,7 @@
 
 #include <config.h>
 #include <string.h>
-#include <libintl.h>
+#include <glib/gi18n.h>
 
 #include "eggtrayicon.h"
 
diff --git a/gnome/Makefile.am b/gnome/Makefile.am
index 285bd24848..1f6ce0833d 100644
--- a/gnome/Makefile.am
+++ b/gnome/Makefile.am
@@ -1,2 +1,6 @@
+if WITH_GNOME
 SUBDIRS = applet libnm_glib vpn-properties
+else
+SUBDIRS = libnm_glib
+endif
 
diff --git a/gnome/applet/Makefile.am b/gnome/applet/Makefile.am
index 542bed9ab5..5a10629521 100644
--- a/gnome/applet/Makefile.am
+++ b/gnome/applet/Makefile.am
@@ -6,28 +6,29 @@ INCLUDES = -I${top_srcdir} -I${top_srcdir}/utils -I${top_srcdir}/include -I${top
 
 bin_PROGRAMS = nm-applet
 
-nm_applet_CPPFLAGS =						\
-	$(DBUS_CFLAGS)							\
-	$(GTHREAD_CFLAGS)						\
-	$(HAL_CFLAGS)							\
-	$(DBUS_GLIB_CFLAGS)						\
-	$(GLADE_CFLAGS)						\
-	$(GTK_CFLAGS)							\
-	$(GCONF_CFLAGS)						\
-	$(LIBGNOMEUI_CFLAGS)					\
-	$(PANEL_APPLET_CFLAGS)					\
-	$(GNOME_KEYRING_CFLAGS)					\
-	-DICONDIR=\""$(datadir)/pixmaps"\"			\
-	-DGLADEDIR=\""$(gladedir)"\"				\
-	-DBINDIR=\""$(bindir)"\"					\
-	-DSYSCONFDIR=\""$(sysconfdir)"\"			\
+nm_applet_CPPFLAGS =									\
+	$(DBUS_CFLAGS)										\
+	$(GTHREAD_CFLAGS)									\
+	$(HAL_CFLAGS)										\
+	$(DBUS_GLIB_CFLAGS)									\
+	$(GLADE_CFLAGS)									\
+	$(GTK_CFLAGS)										\
+	$(GCONF_CFLAGS)									\
+	$(LIBGNOMEUI_CFLAGS)								\
+	$(PANEL_APPLET_CFLAGS)								\
+	$(GNOME_KEYRING_CFLAGS)								\
+	-DICONDIR=\""$(datadir)/pixmaps"\"						\
+	-DGLADEDIR=\""$(gladedir)"\"							\
+	-DBINDIR=\""$(bindir)"\"								\
+	-DSYSCONFDIR=\""$(sysconfdir)"\"						\
+	-DAUTOSTARTDIR=\""$(datadir)/gnome/autostart"\"			\
 	-DVPN_NAME_FILES_DIR=\""$(sysconfdir)/NetworkManager/VPN"\"	\
-	-DDBUS_API_SUBJECT_TO_CHANGE				\
-	-DG_DISABLE_DEPRECATED					\
-	-DGDK_DISABLE_DEPRECATED					\
-	-DGNOME_DISABLE_DEPRECATED				\
-	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"		\
-	-DVERSION=\"$(VERSION)\"					\
+	-DDBUS_API_SUBJECT_TO_CHANGE							\
+	-DG_DISABLE_DEPRECATED								\
+	-DGDK_DISABLE_DEPRECATED								\
+	-DGNOME_DISABLE_DEPRECATED							\
+	-DGNOMELOCALEDIR=\"$(datadir)/locale\"					\
+	-DVERSION=\"$(VERSION)\"								\
 	$(NULL)
 
 if WITH_NOTIFY
diff --git a/gnome/applet/applet-compat.c b/gnome/applet/applet-compat.c
index ec244af22f..1764ded96c 100644
--- a/gnome/applet/applet-compat.c
+++ b/gnome/applet/applet-compat.c
@@ -280,7 +280,7 @@ convert_one_entry (GConfClient *client,
 	g_return_if_fail (client != NULL);
 	g_return_if_fail (essid != NULL);
 
-	if (!(escaped_network = gconf_escape_key (essid, strlen (essid))))
+	if (!(escaped_network = gconf_escape_key (essid, strlen (essid))) || strlen (escaped_network) < 0)
 	{
 		nm_warning ("%s:%d (%s): couldn't unescape network name '%s'.",
 				__FILE__, __LINE__, __func__, essid);
diff --git a/gnome/applet/applet-dbus-devices.c b/gnome/applet/applet-dbus-devices.c
index 6f6dda9b22..c3964f7531 100644
--- a/gnome/applet/applet-dbus-devices.c
+++ b/gnome/applet/applet-dbus-devices.c
@@ -106,7 +106,7 @@ void nma_dbus_update_nm_state (NMApplet *applet)
 
 typedef struct DriverCBData
 {
-	NMApplet *	applet;
+	NMApplet *		applet;
 	NetworkDevice *	dev;
 } DriverCBData;
 
@@ -120,7 +120,7 @@ typedef struct DriverCBData
 static void nma_dbus_device_get_driver_cb (DBusPendingCall *pcall, void *user_data)
 {
 	DBusMessage *		reply;
-	NMApplet *	applet = (NMApplet *) user_data;
+	NMApplet *		applet = (NMApplet *) user_data;
 	DriverCBData *		data = (DriverCBData *) user_data;
 	const char *		driver;
 
@@ -164,7 +164,7 @@ out:
 /*
  * nma_dbus_device_get_driver
  *
- * Get the a device's driver name
+ * Get the device's driver name
  *
  */
 static void nma_dbus_device_get_driver (NetworkDevice *dev, NMApplet *applet)
@@ -291,7 +291,8 @@ static void hal_info_product_cb (DBusPendingCall *pcall, void *user_data)
 {
 	DBusMessage *		reply;
 	HalInfoCBData *	cb_data = (HalInfoCBData *) user_data;
-	char *			info_product;
+	char *			info_product = "Unknown";
+	char *			desc;
 
 	g_return_if_fail (pcall != NULL);
 	g_return_if_fail (cb_data != NULL);
@@ -303,24 +304,13 @@ static void hal_info_product_cb (DBusPendingCall *pcall, void *user_data)
 	if (!(reply = dbus_pending_call_steal_reply (pcall)))
 		goto out;
 
-	if (message_is_error (reply))
-	{
-		DBusError err;
-
-		dbus_error_init (&err);
-		dbus_set_error_from_message (&err, reply);
-		nm_warning ("dbus returned an error.\n  (%s) %s\n", err.name, err.message);
-		dbus_error_free (&err);
-		dbus_message_unref (reply);
-		goto out;
-	}
+	if (!message_is_error (reply))
+		dbus_message_get_args (reply, NULL, DBUS_TYPE_STRING, &info_product, DBUS_TYPE_INVALID);
 
-	if (dbus_message_get_args (reply, NULL, DBUS_TYPE_STRING, &info_product, DBUS_TYPE_INVALID))
-	{
-		char *desc = g_strdup_printf ("%s %s", cb_data->vendor, info_product);
+	desc = g_strdup_printf ("%s %s", cb_data->vendor, info_product);
+	network_device_set_desc (cb_data->dev, desc);
+	g_free (desc);
 
-		network_device_set_desc (cb_data->dev, desc);
-	}
 	dbus_message_unref (reply);
 
 out:
@@ -338,7 +328,10 @@ static void hal_info_vendor_cb (DBusPendingCall *pcall, void *user_data)
 {
 	DBusMessage *		reply;
 	HalInfoCBData *	cb_data = (HalInfoCBData *) user_data;
-	char *			info_vendor;
+	char *			info_vendor = "Unknown";
+	DBusMessage *		message;
+	DBusPendingCall *	product_pcall = NULL;
+
 
 	g_return_if_fail (pcall != NULL);
 	g_return_if_fail (cb_data != NULL);
@@ -349,44 +342,30 @@ static void hal_info_vendor_cb (DBusPendingCall *pcall, void *user_data)
 	if (!(reply = dbus_pending_call_steal_reply (pcall)))
 		goto out;
 
-	if (message_is_error (reply))
-	{
-		DBusError err;
-
-		dbus_error_init (&err);
-		dbus_set_error_from_message (&err, reply);
-		nm_warning ("dbus returned an error.\n  (%s) %s\n", err.name, err.message);
-		dbus_error_free (&err);
-		dbus_message_unref (reply);
-		goto out;
-	}
+	if (!message_is_error (reply))
+		dbus_message_get_args (reply, NULL, DBUS_TYPE_STRING, &info_vendor, DBUS_TYPE_INVALID);
 
-	if (dbus_message_get_args (reply, NULL, DBUS_TYPE_STRING, &info_vendor, DBUS_TYPE_INVALID))
+	if ((message = dbus_message_new_method_call ("org.freedesktop.Hal", cb_data->parent_op,
+										"org.freedesktop.Hal.Device", "GetPropertyString")))
 	{
-		DBusMessage *		message;
-		DBusPendingCall *	product_pcall = NULL;
+		const char *	prop = "info.product";
 
-		if ((message = dbus_message_new_method_call ("org.freedesktop.Hal", cb_data->parent_op,
-											"org.freedesktop.Hal.Device", "GetPropertyString")))
+		dbus_message_append_args (message, DBUS_TYPE_STRING, &prop, DBUS_TYPE_INVALID);
+		dbus_connection_send_with_reply (cb_data->applet->connection, message, &product_pcall, -1);
+		if (product_pcall)
 		{
-			const char *	prop = "info.product";
-
-			dbus_message_append_args (message, DBUS_TYPE_STRING, &prop, DBUS_TYPE_INVALID);
-			dbus_connection_send_with_reply (cb_data->applet->connection, message, &product_pcall, -1);
-			if (product_pcall)
-			{
-				HalInfoCBData *	product_cb_data = g_malloc0 (sizeof (HalInfoCBData));
-
-				product_cb_data->applet = cb_data->applet;
-				network_device_ref (cb_data->dev);
-				product_cb_data->dev = cb_data->dev;
-				product_cb_data->parent_op = g_strdup (cb_data->parent_op);
-				product_cb_data->vendor = g_strdup (info_vendor);
-				dbus_pending_call_set_notify (product_pcall, hal_info_product_cb, product_cb_data, (DBusFreeFunction) free_hal_info_cb_data);
-			}
-			dbus_message_unref (message);
+			HalInfoCBData *	product_cb_data = g_malloc0 (sizeof (HalInfoCBData));
+
+			product_cb_data->applet = cb_data->applet;
+			network_device_ref (cb_data->dev);
+			product_cb_data->dev = cb_data->dev;
+			product_cb_data->parent_op = g_strdup (cb_data->parent_op);
+			product_cb_data->vendor = g_strdup (info_vendor);
+			dbus_pending_call_set_notify (product_pcall, hal_info_product_cb, product_cb_data, (DBusFreeFunction) free_hal_info_cb_data);
 		}
+		dbus_message_unref (message);
 	}
+
 	dbus_message_unref (reply);
 
 out:
@@ -536,7 +515,7 @@ static void nma_dbus_net_properties_cb (DBusPendingCall *pcall, void *user_data)
 {
 	DBusMessage *		reply;
 	NetPropCBData *	cb_data = (NetPropCBData *) user_data;
-	NMApplet *	applet;
+	NMApplet *		applet;
 	const char *		op = NULL;
 	const char *		essid = NULL;
 	const char *		hw_addr = NULL;
@@ -602,6 +581,7 @@ static void nma_dbus_net_properties_cb (DBusPendingCall *pcall, void *user_data)
 				network_device_remove_wireless_network (dev, tmp_net);
 			}
 
+			wireless_network_set_mode (net, mode);
 			wireless_network_set_capabilities (net, capabilities);
 			wireless_network_set_strength (net, strength);
 			if (act_net && strlen (act_net) && (strcmp (act_net, op) == 0))
@@ -895,11 +875,13 @@ static void free_device_activated_cb_data (DeviceActivatedCBData *obj)
 static void nma_dbus_device_activated_cb (DBusPendingCall *pcall, void *user_data)
 {
 	DeviceActivatedCBData *	cb_data = (DeviceActivatedCBData*) user_data;
-	NMApplet *		applet = cb_data->applet;
+	NMApplet *			applet = cb_data->applet;
+#ifdef ENABLE_NOTIFY
 	char *				essid = cb_data->essid;
 	NetworkDevice *		active_device;
 	char *				message = NULL;
 	char *				icon = NULL;
+#endif
 
 	nma_dbus_device_properties_cb (pcall, applet);
 
diff --git a/gnome/applet/applet-dbus-info.c b/gnome/applet/applet-dbus-info.c
index 00ef7576e3..5789047366 100644
--- a/gnome/applet/applet-dbus-info.c
+++ b/gnome/applet/applet-dbus-info.c
@@ -97,7 +97,7 @@ static void nmi_dbus_get_network_key_callback (GnomeKeyringResult result,
                                                gpointer           data)
 {
 	NMGetNetworkKeyCBData *	cb_data = (NMGetNetworkKeyCBData*) data;
-	NMApplet *		applet = cb_data->applet;
+	NMApplet *			applet = cb_data->applet;
 	DBusMessage *			message = cb_data->message;
 	NetworkDevice *		dev = cb_data->dev;
 	char *				net_path = cb_data->net_path;
@@ -141,7 +141,7 @@ nmi_dbus_get_key_for_network (DBusConnection *connection,
                               DBusMessage *message,
                               void *user_data)
 {
-	NMApplet *	applet = (NMApplet *) user_data;
+	NMApplet *		applet = (NMApplet *) user_data;
 	char *			dev_path = NULL;
 	char *			net_path = NULL;
 	char *			essid = NULL;
@@ -307,9 +307,9 @@ nmi_dbus_get_networks (DBusConnection *connection,
                        DBusMessage *message,
                        void *user_data)
 {
-	const char * NO_NET_ERROR = "NoNetworks";
-	const char * NO_NET_ERROR_MSG = "There are no wireless networks stored.";
-	NMApplet *	applet = (NMApplet *) user_data;
+	const char * 		NO_NET_ERROR = "NoNetworks";
+	const char * 		NO_NET_ERROR_MSG = "There are no wireless networks stored.";
+	NMApplet *		applet = (NMApplet *) user_data;
 	GSList *			dir_list = NULL;
 	GSList *			elt;
 	DBusMessage *		reply = NULL;
@@ -386,7 +386,7 @@ nmi_dbus_get_network_properties (DBusConnection *connection,
                                  DBusMessage *message,
                                  void *user_data)
 {
-	NMApplet *	applet = (NMApplet *) user_data;
+	NMApplet *		applet = (NMApplet *) user_data;
 	DBusMessage *		reply = NULL;
 	gchar *			gconf_key = NULL;
 	char *			network = NULL;
@@ -431,13 +431,9 @@ nmi_dbus_get_network_properties (DBusConnection *connection,
 		goto out;
 	}
 
-	/* Timestamp */
+	/* Timestamp.  If the timestamp is not set, return zero. */
 	if (!nm_gconf_get_int_helper (client, GCONF_PATH_WIRELESS_NETWORKS, "timestamp", escaped_network, &timestamp) || (timestamp < 0))
-	{
-		nm_warning ("%s:%d - couldn't get 'timestamp' item from GConf for '%s'.",
-				__FILE__, __LINE__, essid);
-		goto out;
-	}
+		timestamp = 0;
 
 	/* Trusted status */
 	if (!nm_gconf_get_bool_helper (client, GCONF_PATH_WIRELESS_NETWORKS, "trusted", escaped_network, &trusted))
@@ -474,15 +470,11 @@ nmi_dbus_get_network_properties (DBusConnection *connection,
 
 	/* Third arg: Trusted (BOOLEAN) */
 	dbus_message_iter_append_basic (&iter, DBUS_TYPE_BOOLEAN, &trusted);
-	
+
 	/* Fourth arg: List of AP BSSIDs (ARRAY, STRING) */
 	dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING_AS_STRING, &array_iter);
 	if (bssids_value && (g_slist_length (gconf_value_get_list (bssids_value)) > 0))
-	{
-		g_slist_foreach (gconf_value_get_list (bssids_value),
-				(GFunc) addr_list_append_helper,
-				&array_iter);
-	}
+		g_slist_foreach (gconf_value_get_list (bssids_value), (GFunc) addr_list_append_helper, &array_iter);
 	else
 	{
 		const char *fake = "";
@@ -845,7 +837,7 @@ nmi_save_network_info (NMApplet *applet,
 	g_free (key);
 	if (!gconf_entry)
 	{
-		nm_warning ("%s:%d - GConf entry for '%s' doesn't exist.", __FILE__, __LINE__, essid);
+		nm_warning ("Failed to create or obtain GConf entry for '%s'.", essid);
 		goto out;
 	}
 	gconf_entry_unref (gconf_entry);
@@ -959,7 +951,7 @@ nmi_dbus_update_network_info (DBusConnection *connection,
                               DBusMessage *message,
                               void *user_data)
 {
-	NMApplet *	applet = (NMApplet *) user_data;
+	NMApplet *		applet = (NMApplet *) user_data;
 	char *			essid = NULL;
 	gboolean			automatic;
 	NMGConfWSO *		gconf_wso = NULL;
@@ -1027,8 +1019,8 @@ out:
 DBusHandlerResult nmi_dbus_info_message_handler (DBusConnection *connection, DBusMessage *message, void *user_data)
 {
 	NMApplet *	applet = (NMApplet *)user_data;
-	DBusMessage *		reply = NULL;
-	gboolean			handled;
+	DBusMessage *	reply = NULL;
+	gboolean		handled;
 
 	g_return_val_if_fail (applet != NULL, DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
 
diff --git a/gnome/applet/applet-dbus.c b/gnome/applet/applet-dbus.c
index cf1de23b0c..ca91979f8c 100644
--- a/gnome/applet/applet-dbus.c
+++ b/gnome/applet/applet-dbus.c
@@ -68,7 +68,13 @@ static DBusHandlerResult nma_dbus_filter (DBusConnection *connection, DBusMessag
 
 	/* nm_info ("signal(): got signal op='%s' member='%s' interface='%s'", object_path, member, interface); */
 
-	if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS, "NameOwnerChanged"))
+	if (dbus_message_is_signal (message, DBUS_INTERFACE_LOCAL, "Disconnected"))
+	{
+		dbus_connection_unref (applet->connection);
+		applet->connection = NULL;
+		applet->nm_running = FALSE;
+	}
+	else if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS, "NameOwnerChanged"))
 	{
 		char 	*service;
 		char		*old_owner;
@@ -398,11 +404,14 @@ static gboolean nma_dbus_connection_watcher (gpointer user_data)
 		if ((applet->connection = nma_dbus_init (applet)))
 		{
 			applet->nm_running = nma_dbus_nm_is_running (applet->connection);
-			nma_set_state (applet, NM_STATE_DISCONNECTED);
-			nma_dbus_update_nm_state (applet);
-			nma_dbus_update_devices (applet);
-			nma_dbus_update_dialup (applet);
-			nma_dbus_vpn_update_vpn_connections (applet);
+			if (applet->nm_running)
+			{
+				nma_set_state (applet, NM_STATE_DISCONNECTED);
+				nma_dbus_update_nm_state (applet);
+				nma_dbus_update_devices (applet);
+				nma_dbus_update_dialup (applet);
+				nma_dbus_vpn_update_vpn_connections (applet);
+			}
 		}
 	}
 
diff --git a/gnome/applet/applet-notifications.c b/gnome/applet/applet-notifications.c
index 86dcc4a69d..b7f7a5811e 100644
--- a/gnome/applet/applet-notifications.c
+++ b/gnome/applet/applet-notifications.c
@@ -20,6 +20,7 @@
  */
 
 #include <libnotify/notify.h>
+#include "applet.h"
 #include "applet-notifications.h"
 
 void
@@ -29,7 +30,7 @@ nma_send_event_notification (NMApplet *applet,
                               const char *message,
                               const char *icon)
 {
-	NotifyNotification *notification;
+	const char *notify_icon;
 
 	g_return_if_fail (applet != NULL);
 	g_return_if_fail (summary != NULL);
@@ -38,9 +39,16 @@ nma_send_event_notification (NMApplet *applet,
 	if (!notify_is_initted ())
 		notify_init ("NetworkManager");
 
-	notification = notify_notification_new (summary, message,
-			icon ? icon : GTK_STOCK_NETWORK, GTK_WIDGET (applet));
-	notify_notification_set_urgency (notification, urgency);
-	notify_notification_show (notification, NULL);
+	if (applet->notification != NULL) {
+		notify_notification_close (applet->notification, NULL);
+		g_object_unref (applet->notification);
+	}
+
+	notify_icon = icon ? icon : GTK_STOCK_NETWORK;
+
+	applet->notification = notify_notification_new (summary, message, notify_icon, GTK_WIDGET (applet));
+
+	notify_notification_set_urgency (applet->notification, urgency);
+	notify_notification_show (applet->notification, NULL);
 }
 
diff --git a/gnome/applet/applet-notifications.h b/gnome/applet/applet-notifications.h
index e95d0b965e..a4050310b9 100644
--- a/gnome/applet/applet-notifications.h
+++ b/gnome/applet/applet-notifications.h
@@ -22,6 +22,11 @@
 #ifndef NM_NOTIFICATION_H__
 #define NM_NOTIFICATION_H__
 
+#include "config.h"
+
+#ifdef ENABLE_NOTIFY
+
+#include <libnotify/notify.h>
 #include "applet.h"
 
 void
@@ -31,4 +36,6 @@ nma_send_event_notification (NMApplet *applet,
                               const char *message,
                               const char *icon);
 
+#endif /* ENABLE_NOTIFY */
+
 #endif /* NM_NOTIFICATION_H__ */
diff --git a/gnome/applet/applet.c b/gnome/applet/applet.c
index 9602ec0871..1e3df849cc 100644
--- a/gnome/applet/applet.c
+++ b/gnome/applet/applet.c
@@ -75,15 +75,15 @@
 	#define GTK_STOCK_INFO			GTK_STOCK_DIALOG_INFO
 #endif
 
-static GObject *	nma_constructor (GType type, guint n_props, GObjectConstructParam *construct_props);
-static gboolean	nma_icons_init (NMApplet *applet);
-static void		nma_icons_free (NMApplet *applet);
-static void		nma_about_cb (NMApplet *applet);
-static void		nma_context_menu_update (NMApplet *applet);
-static GtkWidget *	nma_get_instance (NMApplet *applet);
-static void		nma_update_state (NMApplet *applet);
-static void		nma_dropdown_menu_deactivate_cb (GtkWidget *menu, NMApplet *applet);
-static GType		nma_get_type (void);	/* for G_DEFINE_TYPE */
+static GObject *				nma_constructor (GType type, guint n_props, GObjectConstructParam *construct_props);
+static gboolean				nma_icons_init (NMApplet *applet);
+static void					nma_icons_free (NMApplet *applet);
+static void					nma_context_menu_update (NMApplet *applet);
+static GtkWidget *				nma_get_instance (NMApplet *applet);
+static void					nma_update_state (NMApplet *applet);
+static void					nma_dropdown_menu_deactivate_cb (GtkWidget *menu, NMApplet *applet);
+static G_GNUC_NORETURN void		nma_destroy (NMApplet *applet);
+static GType					nma_get_type (void);	/* for G_DEFINE_TYPE */
 
 G_DEFINE_TYPE(NMApplet, nma, EGG_TYPE_TRAY_ICON)
 
@@ -291,7 +291,7 @@ static void about_dialog_activate_link_cb (GtkAboutDialog *about,
 	gnome_url_show (url, NULL);
 }
 
-static void nma_about_cb (NMApplet *applet)
+static void nma_about_cb (GtkMenuItem *mi, NMApplet *applet)
 {
 	static const gchar *authors[] =
 	{
@@ -336,7 +336,8 @@ static void nma_about_cb (NMApplet *applet)
 
 	about_dialog = gnome_about_new (_("NetworkManager Applet"),
 	                                VERSION,
-	                                _("Copyright \xc2\xa9 2004-2005 Red Hat, Inc."),
+	                                _("Copyright \xc2\xa9 2004-2006 Red Hat, Inc.\n"
+							    "Copyright \xc2\xa9 2005-2006 Novell, Inc."),
 	                                _("Notification area applet for managing your network devices and connections."),
 	                                authors,
 	                                documenters,
@@ -361,7 +362,8 @@ static void nma_about_cb (NMApplet *applet)
 	gtk_show_about_dialog (NULL,
 	                       "name", _("NetworkManager Applet"),
 	                       "version", VERSION,
-	                       "copyright", _("Copyright \xc2\xa9 2004-2005 Red Hat, Inc."),
+	                       "copyright", _("Copyright \xc2\xa9 2004-2005 Red Hat, Inc.\n"
+					                  "Copyright \xc2\xa9 2005-2006 Novell, Inc."),
 	                       "comments", _("Notification area applet for managing your network devices and connections."),
 	                       "website", "http://www.gnome.org/projects/NetworkManager/",
 	                       "authors", authors,
@@ -373,6 +375,7 @@ static void nma_about_cb (NMApplet *applet)
 #endif
 }
 
+
 #ifndef ENABLE_NOTIFY
 /*
  * nma_show_vpn_failure_dialog
@@ -386,8 +389,8 @@ nma_show_vpn_failure_dialog (const char *title,
 {
 	GtkWidget	*dialog;
 
-	g_return_if_fail (title != NULL, FALSE);
-	g_return_if_fail (msg != NULL, FALSE);
+	g_return_if_fail (title != NULL);
+	g_return_if_fail (msg != NULL);
 
 	dialog = gtk_message_dialog_new_with_markup (NULL, 0, GTK_MESSAGE_ERROR,
 				GTK_BUTTONS_OK, msg, NULL);
@@ -480,6 +483,9 @@ nma_show_vpn_login_banner_dialog (const char *title,
 {
 	GtkWidget	*dialog;
 
+	g_return_if_fail (title != NULL);
+	g_return_if_fail (msg != NULL);
+
 	dialog = gtk_message_dialog_new_with_markup (NULL, 0, GTK_MESSAGE_INFO,
 					GTK_BUTTONS_OK, msg, NULL);
 	gtk_window_set_title (GTK_WINDOW (dialog), title);
@@ -1581,6 +1587,7 @@ static void nma_add_networks_helper (NetworkDevice *dev, WirelessNetwork *net, g
 	AddNetworksCB *	cb_data = (AddNetworksCB *)user_data;
 	NMNetworkMenuItem *	item;
 	GtkCheckMenuItem *	gtk_item;
+	NMApplet *		applet;
 
 	g_return_if_fail (dev != NULL);
 	g_return_if_fail (net != NULL);
@@ -1588,22 +1595,23 @@ static void nma_add_networks_helper (NetworkDevice *dev, WirelessNetwork *net, g
 	g_return_if_fail (cb_data->menu != NULL);
 	g_return_if_fail (cb_data->applet != NULL);
 
-	item = network_menu_item_new (cb_data->applet->encryption_size_group);
+	applet = cb_data->applet;
+	item = network_menu_item_new (applet->encryption_size_group);
 	gtk_item = network_menu_item_get_check_item (item);
 
 	gtk_menu_shell_append (GTK_MENU_SHELL (cb_data->menu), GTK_WIDGET (gtk_item));
-	if (   (cb_data->applet->nm_state == NM_STATE_CONNECTED)
-	    || (cb_data->applet->nm_state == NM_STATE_CONNECTING))
+	if (   (applet->nm_state == NM_STATE_CONNECTED)
+	    || (applet->nm_state == NM_STATE_CONNECTING))
 	{
 		if (network_device_get_active (dev) && wireless_network_get_active (net))
 			gtk_check_menu_item_set_active (gtk_item, TRUE);
 	}
-	network_menu_item_update (item, net, cb_data->has_encrypted);
+	network_menu_item_update (applet, item, net, cb_data->has_encrypted);
 
 	g_object_set_data (G_OBJECT (gtk_item), "network", g_strdup (wireless_network_get_essid (net)));
 	g_object_set_data (G_OBJECT (gtk_item), "device", g_strdup (network_device_get_nm_path (dev)));
 	g_object_set_data (G_OBJECT (gtk_item), "nm-item-data", item);
-	g_signal_connect (G_OBJECT (gtk_item), "activate", G_CALLBACK (nma_menu_item_activate), cb_data->applet);
+	g_signal_connect (G_OBJECT (gtk_item), "activate", G_CALLBACK (nma_menu_item_activate), applet);
 
 	gtk_widget_show (GTK_WIDGET (gtk_item));
 }
@@ -2437,8 +2445,7 @@ static void nma_gconf_vpn_connections_notify_callback (GConfClient *client, guin
  * Destroy the applet and clean up its data
  *
  */
-static void G_GNUC_NORETURN
-nma_destroy (NMApplet *applet, gpointer user_data)
+static void G_GNUC_NORETURN nma_destroy (NMApplet *applet)
 {
 	if (applet->dropdown_menu)
 		nma_dropdown_menu_clear (applet->dropdown_menu);
@@ -2448,6 +2455,10 @@ nma_destroy (NMApplet *applet, gpointer user_data)
 	nma_icons_free (applet);
 
 	nmi_passphrase_dialog_destroy (applet);
+#ifdef ENABLE_NOTIFY
+	notify_notification_close (applet->notification, NULL);
+	g_object_unref (applet->notification);
+#endif
 
 	if (applet->redraw_timeout_id > 0)
 	{
@@ -2489,6 +2500,10 @@ static GtkWidget * nma_get_instance (NMApplet *applet)
 	applet->nm_state = NM_STATE_DISCONNECTED;
 	applet->tooltips = NULL;
 	applet->passphrase_dialog = NULL;
+#ifdef ENABLE_NOTIFY
+	applet->notification = NULL;
+#endif
+
 	applet->glade_file = g_build_filename (GLADEDIR, "applet.glade", NULL);
 	if (!applet->glade_file || !g_file_test (applet->glade_file, G_FILE_TEST_IS_REGULAR))
 	{
@@ -2535,7 +2550,7 @@ static GtkWidget * nma_get_instance (NMApplet *applet)
 
 static void nma_icons_free (NMApplet *applet)
 {
-	gint i,j;
+	int i;
 
 	g_object_unref (applet->no_connection_icon);
 	g_object_unref (applet->wired_icon);
@@ -2549,17 +2564,49 @@ static void nma_icons_free (NMApplet *applet)
 	g_object_unref (applet->wireless_100_icon);
 
 	for (i = 0; i < NUM_CONNECTING_STAGES; i++)
+	{
+		int j;
+
 		for (j = 0; j < NUM_CONNECTING_FRAMES; j++)
 			g_object_unref (applet->network_connecting_icons[i][j]);
+	}
 
 	for (i = 0; i < NUM_VPN_CONNECTING_FRAMES; i++)
 		g_object_unref (applet->vpn_connecting_icons[i]);
 }
 
+static void nma_icons_zero (NMApplet *applet)
+{
+	int i;
+
+	applet->no_connection_icon = NULL;
+	applet->wired_icon = NULL;
+	applet->adhoc_icon = NULL;
+	applet->vpn_lock_icon = NULL;
+
+	applet->wireless_00_icon = NULL;
+	applet->wireless_25_icon = NULL;
+	applet->wireless_50_icon = NULL;
+	applet->wireless_75_icon = NULL;
+	applet->wireless_100_icon = NULL;
+
+	for (i = 0; i < NUM_CONNECTING_STAGES; i++)
+	{
+		int j;
+
+		for (j = 0; j < NUM_CONNECTING_FRAMES; j++)
+			applet->network_connecting_icons[i][j] = NULL;
+	}
+
+	for (i = 0; i < NUM_VPN_CONNECTING_FRAMES; i++)
+		applet->vpn_connecting_icons[i] = NULL;
+
+}
+
 #define ICON_LOAD(x, y)	\
 	{		\
 		GError *err = NULL; \
-		x = gtk_icon_theme_load_icon (icon_theme, y, icon_size, 0, &err); \
+		x = gtk_icon_theme_load_icon (icon_theme, y, 22, 0, &err); \
 		if (x == NULL) { \
 			success = FALSE; \
 			g_warning ("Icon %s missing: %s", y, err->message); \
@@ -2571,12 +2618,14 @@ static void nma_icons_free (NMApplet *applet)
 static gboolean
 nma_icons_load_from_disk (NMApplet *applet, GtkIconTheme *icon_theme)
 {
-	char *	name;
-	int		i, j;
-	gboolean	success = FALSE;
+	int		i;
+	gboolean	success;
 
-	/* Assume icons are square */
-	gint icon_size = 22;
+	/*
+	 * NULL out the icons, so if we error and call nma_icons_free(), we don't hit stale
+	 * data on the not-yet-reached icons.  This can happen off nma_icon_theme_changed().
+	 */
+	nma_icons_zero (applet);
 
 	ICON_LOAD(applet->no_connection_icon, "nm-no-connection");
 	ICON_LOAD(applet->wired_icon, "nm-device-wired");
@@ -2591,8 +2640,12 @@ nma_icons_load_from_disk (NMApplet *applet, GtkIconTheme *icon_theme)
 
 	for (i = 0; i < NUM_CONNECTING_STAGES; i++)
 	{
+		int j;
+
 		for (j = 0; j < NUM_CONNECTING_FRAMES; j++)
 		{
+			char *name;
+
 			name = g_strdup_printf ("nm-stage%02d-connecting%02d", i+1, j+1);
 			ICON_LOAD(applet->network_connecting_icons[i][j], name);
 			g_free (name);
@@ -2601,6 +2654,8 @@ nma_icons_load_from_disk (NMApplet *applet, GtkIconTheme *icon_theme)
 
 	for (i = 0; i < NUM_VPN_CONNECTING_FRAMES; i++)
 	{
+		char *name;
+
 		name = g_strdup_printf ("nm-vpn-connecting%02d", i+1);
 		ICON_LOAD(applet->vpn_connecting_icons[i], name);
 		g_free (name);
diff --git a/gnome/applet/applet.glade b/gnome/applet/applet.glade
index fd8a852ff8..d902070454 100644
--- a/gnome/applet/applet.glade
+++ b/gnome/applet/applet.glade
@@ -4,12 +4,12 @@
 <glade-interface>
 
 <widget class="GtkDialog" id="trust_dialog">
-  <property name="border_width">6</property>
+  <property name="border_width">5</property>
   <property name="title" translatable="yes"> </property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_CENTER_ALWAYS</property>
   <property name="modal">True</property>
-  <property name="resizable">True</property>
+  <property name="resizable">False</property>
   <property name="destroy_with_parent">False</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
@@ -24,7 +24,7 @@
     <widget class="GtkVBox" id="dialog-vbox1">
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
-      <property name="spacing">12</property>
+      <property name="spacing">14</property>
 
       <child internal-child="action_area">
 	<widget class="GtkHButtonBox" id="dialog-action_area1">
@@ -68,7 +68,7 @@
 
       <child>
 	<widget class="GtkHBox" id="hbox1">
-	  <property name="border_width">6</property>
+	  <property name="border_width">5</property>
 	  <property name="visible">True</property>
 	  <property name="homogeneous">False</property>
 	  <property name="spacing">12</property>
@@ -160,13 +160,14 @@ You have chosen to log in to the wireless network '%s'.  If you are sure that th
 </widget>
 
 <widget class="GtkDialog" id="driver_sucks_dialog">
-  <property name="border_width">6</property>
+  <property name="border_width">5</property>
   <property name="title" translatable="yes"> </property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_CENTER_ALWAYS</property>
   <property name="modal">True</property>
-  <property name="resizable">True</property>
+  <property name="resizable">False</property>
   <property name="destroy_with_parent">False</property>
+  <property name="icon_name">gtk-info</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
@@ -180,7 +181,7 @@ You have chosen to log in to the wireless network '%s'.  If you are sure that th
     <widget class="GtkVBox" id="vbox2">
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
-      <property name="spacing">12</property>
+      <property name="spacing">14</property>
 
       <child internal-child="action_area">
 	<widget class="GtkHButtonBox" id="hbuttonbox1">
@@ -211,7 +212,7 @@ You have chosen to log in to the wireless network '%s'.  If you are sure that th
 
       <child>
 	<widget class="GtkHBox" id="hbox2">
-	  <property name="border_width">6</property>
+	  <property name="border_width">5</property>
 	  <property name="visible">True</property>
 	  <property name="homogeneous">False</property>
 	  <property name="spacing">12</property>
@@ -303,7 +304,7 @@ You have chosen to log in to the wireless network '%s'.  If you are sure that th
 </widget>
 
 <widget class="GtkDialog" id="other_network_dialog">
-  <property name="border_width">6</property>
+  <property name="border_width">5</property>
   <property name="title" translatable="yes">Other Wireless Network...</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_CENTER_ALWAYS</property>
@@ -311,6 +312,7 @@ You have chosen to log in to the wireless network '%s'.  If you are sure that th
   <property name="default_width">488</property>
   <property name="resizable">False</property>
   <property name="destroy_with_parent">False</property>
+  <property name="icon_name">gtk-dialog-authentication</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
@@ -324,7 +326,7 @@ You have chosen to log in to the wireless network '%s'.  If you are sure that th
     <widget class="GtkVBox" id="dialog-vbox1">
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
-      <property name="spacing">4</property>
+      <property name="spacing">2</property>
 
       <child internal-child="action_area">
 	<widget class="GtkHButtonBox" id="dialog-action_area1">
@@ -368,7 +370,7 @@ You have chosen to log in to the wireless network '%s'.  If you are sure that th
 
       <child>
 	<widget class="GtkHBox" id="hbox1">
-	  <property name="border_width">6</property>
+	  <property name="border_width">5</property>
 	  <property name="visible">True</property>
 	  <property name="homogeneous">False</property>
 	  <property name="spacing">12</property>
@@ -427,8 +429,8 @@ You have chosen to log in to the wireless network '%s'.  If you are sure that th
 		  <property name="n_rows">4</property>
 		  <property name="n_columns">2</property>
 		  <property name="homogeneous">False</property>
-		  <property name="row_spacing">12</property>
-		  <property name="column_spacing">6</property>
+		  <property name="row_spacing">6</property>
+		  <property name="column_spacing">12</property>
 
 		  <child>
 		    <widget class="GtkLabel" id="wireless_adapter_label">
@@ -485,7 +487,7 @@ You have chosen to log in to the wireless network '%s'.  If you are sure that th
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
 		      <property name="wrap">False</property>
 		      <property name="selectable">False</property>
-		      <property name="xalign">1</property>
+		      <property name="xalign">0</property>
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
 		      <property name="ypad">0</property>
@@ -514,7 +516,6 @@ You have chosen to log in to the wireless network '%s'.  If you are sure that th
 		      <property name="max_length">0</property>
 		      <property name="text" translatable="yes"></property>
 		      <property name="has_frame">True</property>
-		      <property name="invisible_char">*</property>
 		      <property name="activates_default">True</property>
 		    </widget>
 		    <packing>
@@ -535,7 +536,7 @@ You have chosen to log in to the wireless network '%s'.  If you are sure that th
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
 		      <property name="wrap">False</property>
 		      <property name="selectable">False</property>
-		      <property name="xalign">1</property>
+		      <property name="xalign">0</property>
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
 		      <property name="ypad">0</property>
@@ -558,9 +559,9 @@ You have chosen to log in to the wireless network '%s'.  If you are sure that th
 		    <widget class="GtkComboBox" id="security_combo">
 		      <property name="visible">True</property>
 		      <property name="items" translatable="yes">None
-WEP Passphrase
-WEP 40/128-bit hex
-WEP 40/128-bit ASCII
+WEP 128-bit Passphrase
+WEP 64/128-bit Hex
+WEP 64/128-bit ASCII
 </property>
 		      <property name="add_tearoffs">False</property>
 		      <property name="focus_on_click">True</property>
@@ -619,7 +620,7 @@ WEP 40/128-bit ASCII
 </widget>
 
 <widget class="GtkDialog" id="passphrase_dialog">
-  <property name="border_width">6</property>
+  <property name="border_width">5</property>
   <property name="has_focus">True</property>
   <property name="title" translatable="yes">Wireless Network Key Required</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
@@ -627,6 +628,7 @@ WEP 40/128-bit ASCII
   <property name="modal">True</property>
   <property name="resizable">False</property>
   <property name="destroy_with_parent">False</property>
+  <property name="icon_name">gtk-dialog-authentication</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
@@ -640,7 +642,7 @@ WEP 40/128-bit ASCII
     <widget class="GtkVBox" id="dialog-vbox1">
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
-      <property name="spacing">12</property>
+      <property name="spacing">2</property>
 
       <child internal-child="action_area">
 	<widget class="GtkHButtonBox" id="dialog-action_area1">
@@ -684,7 +686,7 @@ WEP 40/128-bit ASCII
 
       <child>
 	<widget class="GtkHBox" id="hbox1">
-	  <property name="border_width">6</property>
+	  <property name="border_width">5</property>
 	  <property name="visible">True</property>
 	  <property name="homogeneous">False</property>
 	  <property name="spacing">12</property>
@@ -742,7 +744,7 @@ A passphrase or encryption key is required to access the wireless network '%s'.<
 		<widget class="GtkHBox" id="hbox7">
 		  <property name="visible">True</property>
 		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
+		  <property name="spacing">12</property>
 
 		  <child>
 		    <widget class="GtkLabel" id="security_combo_label">
@@ -773,9 +775,9 @@ A passphrase or encryption key is required to access the wireless network '%s'.<
 		    <widget class="GtkComboBox" id="security_combo">
 		      <property name="visible">True</property>
 		      <property name="items" translatable="yes">None
-WEP Passphrase
-WEP 40/128-bit hex
-WEP 40/128-bit ASCII
+WEP 128-bit Passphrase
+WEP 64/128-bit Hex
+WEP 64/128-bit ASCII
 </property>
 		      <property name="add_tearoffs">False</property>
 		      <property name="focus_on_click">True</property>
@@ -829,13 +831,14 @@ WEP 40/128-bit ASCII
 </widget>
 
 <widget class="GtkDialog" id="info_dialog">
-  <property name="border_width">6</property>
+  <property name="border_width">5</property>
   <property name="title" translatable="yes">Connection Information</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">False</property>
   <property name="resizable">False</property>
   <property name="destroy_with_parent">False</property>
+  <property name="icon_name">gtk-info</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
@@ -901,7 +904,7 @@ WEP 40/128-bit ASCII
 		<widget class="GtkHBox" id="hbox2">
 		  <property name="visible">True</property>
 		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
+		  <property name="spacing">12</property>
 
 		  <child>
 		    <widget class="GtkImage" id="image1">
@@ -927,8 +930,8 @@ WEP 40/128-bit ASCII
 		      <property name="n_rows">14</property>
 		      <property name="n_columns">2</property>
 		      <property name="homogeneous">False</property>
-		      <property name="row_spacing">3</property>
-		      <property name="column_spacing">6</property>
+		      <property name="row_spacing">6</property>
+		      <property name="column_spacing">12</property>
 
 		      <child>
 			<widget class="GtkLabel" id="label-interface">
@@ -1749,11 +1752,11 @@ WEP 40/128-bit ASCII
 	<widget class="GtkTable" id="table6">
 	  <property name="border_width">8</property>
 	  <property name="visible">True</property>
-	  <property name="n_rows">2</property>
+	  <property name="n_rows">3</property>
 	  <property name="n_columns">2</property>
 	  <property name="homogeneous">False</property>
 	  <property name="row_spacing">6</property>
-	  <property name="column_spacing">6</property>
+	  <property name="column_spacing">12</property>
 
 	  <child>
 	    <widget class="GtkLabel" id="wep_key_label">
@@ -1788,11 +1791,10 @@ WEP 40/128-bit ASCII
 	      <property name="visible">True</property>
 	      <property name="can_focus">True</property>
 	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
+	      <property name="visibility">False</property>
 	      <property name="max_length">0</property>
 	      <property name="text" translatable="yes"></property>
 	      <property name="has_frame">True</property>
-	      <property name="invisible_char">*</property>
 	      <property name="activates_default">False</property>
 	    </widget>
 	    <packing>
@@ -1825,8 +1827,8 @@ WEP 40/128-bit ASCII
 	    <packing>
 	      <property name="left_attach">0</property>
 	      <property name="right_attach">1</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
+	      <property name="top_attach">2</property>
+	      <property name="bottom_attach">3</property>
 	      <property name="x_options">fill</property>
 	      <property name="y_options"></property>
 	    </packing>
@@ -1843,10 +1845,60 @@ Shared Key</property>
 	    <packing>
 	      <property name="left_attach">1</property>
 	      <property name="right_attach">2</property>
+	      <property name="top_attach">2</property>
+	      <property name="bottom_attach">3</property>
+	      <property name="x_options">fill</property>
+	      <property name="y_options">fill</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkLabel" id="label31">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes"></property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
+	    </widget>
+	    <packing>
+	      <property name="left_attach">0</property>
+	      <property name="right_attach">1</property>
 	      <property name="top_attach">1</property>
 	      <property name="bottom_attach">2</property>
 	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
+	      <property name="y_options"></property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkCheckButton" id="show_checkbutton">
+	      <property name="visible">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label" translatable="yes">Show key</property>
+	      <property name="use_underline">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="active">False</property>
+	      <property name="inconsistent">False</property>
+	      <property name="draw_indicator">True</property>
+	    </widget>
+	    <packing>
+	      <property name="left_attach">1</property>
+	      <property name="right_attach">2</property>
+	      <property name="top_attach">1</property>
+	      <property name="bottom_attach">2</property>
+	      <property name="x_options">fill</property>
+	      <property name="y_options"></property>
 	    </packing>
 	  </child>
 	</widget>
@@ -1942,7 +1994,7 @@ Shared Key</property>
 	  <property name="n_columns">2</property>
 	  <property name="homogeneous">False</property>
 	  <property name="row_spacing">6</property>
-	  <property name="column_spacing">6</property>
+	  <property name="column_spacing">12</property>
 
 	  <child>
 	    <widget class="GtkEntry" id="leap_username_entry">
@@ -1953,7 +2005,6 @@ Shared Key</property>
 	      <property name="max_length">0</property>
 	      <property name="text" translatable="yes"></property>
 	      <property name="has_frame">True</property>
-	      <property name="invisible_char">*</property>
 	      <property name="activates_default">False</property>
 	    </widget>
 	    <packing>
@@ -1970,11 +2021,10 @@ Shared Key</property>
 	      <property name="visible">True</property>
 	      <property name="can_focus">True</property>
 	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
+	      <property name="visibility">False</property>
 	      <property name="max_length">0</property>
 	      <property name="text" translatable="yes"></property>
 	      <property name="has_frame">True</property>
-	      <property name="invisible_char">*</property>
 	      <property name="activates_default">False</property>
 	    </widget>
 	    <packing>
@@ -2130,11 +2180,11 @@ Shared Key</property>
 	<widget class="GtkTable" id="wpa_psk_table">
 	  <property name="border_width">8</property>
 	  <property name="visible">True</property>
-	  <property name="n_rows">2</property>
+	  <property name="n_rows">3</property>
 	  <property name="n_columns">2</property>
 	  <property name="homogeneous">False</property>
-	  <property name="row_spacing">4</property>
-	  <property name="column_spacing">4</property>
+	  <property name="row_spacing">6</property>
+	  <property name="column_spacing">12</property>
 
 	  <child>
 	    <widget class="GtkLabel" id="wpa_psk_label">
@@ -2169,11 +2219,10 @@ Shared Key</property>
 	      <property name="visible">True</property>
 	      <property name="can_focus">True</property>
 	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
+	      <property name="visibility">False</property>
 	      <property name="max_length">0</property>
 	      <property name="text" translatable="yes"></property>
 	      <property name="has_frame">True</property>
-	      <property name="invisible_char">*</property>
 	      <property name="activates_default">True</property>
 	    </widget>
 	    <packing>
@@ -2206,8 +2255,8 @@ Shared Key</property>
 	    <packing>
 	      <property name="left_attach">0</property>
 	      <property name="right_attach">1</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
+	      <property name="top_attach">2</property>
+	      <property name="bottom_attach">3</property>
 	      <property name="x_options">fill</property>
 	      <property name="y_options"></property>
 	    </packing>
@@ -2223,10 +2272,60 @@ Shared Key</property>
 	    <packing>
 	      <property name="left_attach">1</property>
 	      <property name="right_attach">2</property>
+	      <property name="top_attach">2</property>
+	      <property name="bottom_attach">3</property>
+	      <property name="x_options">fill</property>
+	      <property name="y_options">fill</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkLabel" id="label32">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes"></property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
+	    </widget>
+	    <packing>
+	      <property name="left_attach">0</property>
+	      <property name="right_attach">1</property>
+	      <property name="top_attach">1</property>
+	      <property name="bottom_attach">2</property>
+	      <property name="x_options">fill</property>
+	      <property name="y_options"></property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkCheckButton" id="show_checkbutton">
+	      <property name="visible">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label" translatable="yes">Show password</property>
+	      <property name="use_underline">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="active">False</property>
+	      <property name="inconsistent">False</property>
+	      <property name="draw_indicator">True</property>
+	    </widget>
+	    <packing>
+	      <property name="left_attach">1</property>
+	      <property name="right_attach">2</property>
 	      <property name="top_attach">1</property>
 	      <property name="bottom_attach">2</property>
 	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
+	      <property name="y_options"></property>
 	    </packing>
 	  </child>
 	</widget>
@@ -2318,11 +2417,11 @@ Shared Key</property>
 	<widget class="GtkTable" id="wpa_eap_table">
 	  <property name="border_width">8</property>
 	  <property name="visible">True</property>
-	  <property name="n_rows">8</property>
+	  <property name="n_rows">10</property>
 	  <property name="n_columns">2</property>
 	  <property name="homogeneous">False</property>
-	  <property name="row_spacing">4</property>
-	  <property name="column_spacing">4</property>
+	  <property name="row_spacing">6</property>
+	  <property name="column_spacing">12</property>
 
 	  <child>
 	    <widget class="GtkLabel" id="wpa-eap-ca-cert-file-label">
@@ -2345,8 +2444,8 @@ Shared Key</property>
 	    <packing>
 	      <property name="left_attach">0</property>
 	      <property name="right_attach">1</property>
-	      <property name="top_attach">5</property>
-	      <property name="bottom_attach">6</property>
+	      <property name="top_attach">6</property>
+	      <property name="bottom_attach">7</property>
 	      <property name="x_options">fill</property>
 	      <property name="y_options"></property>
 	    </packing>
@@ -2373,8 +2472,8 @@ Shared Key</property>
 	    <packing>
 	      <property name="left_attach">0</property>
 	      <property name="right_attach">1</property>
-	      <property name="top_attach">6</property>
-	      <property name="bottom_attach">7</property>
+	      <property name="top_attach">7</property>
+	      <property name="bottom_attach">8</property>
 	      <property name="x_options">fill</property>
 	      <property name="y_options"></property>
 	    </packing>
@@ -2393,8 +2492,8 @@ Shared Key</property>
 	    <packing>
 	      <property name="left_attach">1</property>
 	      <property name="right_attach">2</property>
-	      <property name="top_attach">5</property>
-	      <property name="bottom_attach">6</property>
+	      <property name="top_attach">6</property>
+	      <property name="bottom_attach">7</property>
 	      <property name="x_options">fill</property>
 	      <property name="y_options">fill</property>
 	    </packing>
@@ -2413,8 +2512,8 @@ Shared Key</property>
 	    <packing>
 	      <property name="left_attach">1</property>
 	      <property name="right_attach">2</property>
-	      <property name="top_attach">6</property>
-	      <property name="bottom_attach">7</property>
+	      <property name="top_attach">7</property>
+	      <property name="bottom_attach">8</property>
 	      <property name="x_options">fill</property>
 	      <property name="y_options">fill</property>
 	    </packing>
@@ -2441,8 +2540,8 @@ Shared Key</property>
 	    <packing>
 	      <property name="left_attach">0</property>
 	      <property name="right_attach">1</property>
-	      <property name="top_attach">7</property>
-	      <property name="bottom_attach">8</property>
+	      <property name="top_attach">8</property>
+	      <property name="bottom_attach">9</property>
 	      <property name="x_options">fill</property>
 	      <property name="y_options"></property>
 	    </packing>
@@ -2453,18 +2552,17 @@ Shared Key</property>
 	      <property name="visible">True</property>
 	      <property name="can_focus">True</property>
 	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
+	      <property name="visibility">False</property>
 	      <property name="max_length">0</property>
 	      <property name="text" translatable="yes"></property>
 	      <property name="has_frame">True</property>
-	      <property name="invisible_char">*</property>
 	      <property name="activates_default">False</property>
 	    </widget>
 	    <packing>
 	      <property name="left_attach">1</property>
 	      <property name="right_attach">2</property>
-	      <property name="top_attach">7</property>
-	      <property name="bottom_attach">8</property>
+	      <property name="top_attach">8</property>
+	      <property name="bottom_attach">9</property>
 	      <property name="y_options"></property>
 	    </packing>
 	  </child>
@@ -2490,8 +2588,8 @@ Shared Key</property>
 	    <packing>
 	      <property name="left_attach">0</property>
 	      <property name="right_attach">1</property>
-	      <property name="top_attach">4</property>
-	      <property name="bottom_attach">5</property>
+	      <property name="top_attach">5</property>
+	      <property name="bottom_attach">6</property>
 	      <property name="x_options">fill</property>
 	      <property name="y_options"></property>
 	    </packing>
@@ -2510,8 +2608,8 @@ Shared Key</property>
 	    <packing>
 	      <property name="left_attach">1</property>
 	      <property name="right_attach">2</property>
-	      <property name="top_attach">4</property>
-	      <property name="bottom_attach">5</property>
+	      <property name="top_attach">5</property>
+	      <property name="bottom_attach">6</property>
 	      <property name="x_options">fill</property>
 	      <property name="y_options">fill</property>
 	    </packing>
@@ -2538,8 +2636,8 @@ Shared Key</property>
 	    <packing>
 	      <property name="left_attach">0</property>
 	      <property name="right_attach">1</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
+	      <property name="top_attach">2</property>
+	      <property name="bottom_attach">3</property>
 	      <property name="x_options">fill</property>
 	      <property name="y_options"></property>
 	    </packing>
@@ -2566,8 +2664,8 @@ Shared Key</property>
 	    <packing>
 	      <property name="left_attach">0</property>
 	      <property name="right_attach">1</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
+	      <property name="top_attach">3</property>
+	      <property name="bottom_attach">4</property>
 	      <property name="x_options">fill</property>
 	      <property name="y_options"></property>
 	    </packing>
@@ -2594,8 +2692,8 @@ Shared Key</property>
 	    <packing>
 	      <property name="left_attach">0</property>
 	      <property name="right_attach">1</property>
-	      <property name="top_attach">3</property>
-	      <property name="bottom_attach">4</property>
+	      <property name="top_attach">4</property>
+	      <property name="bottom_attach">5</property>
 	      <property name="x_options">fill</property>
 	      <property name="y_options"></property>
 	    </packing>
@@ -2610,14 +2708,13 @@ Shared Key</property>
 	      <property name="max_length">0</property>
 	      <property name="text" translatable="yes"></property>
 	      <property name="has_frame">True</property>
-	      <property name="invisible_char">*</property>
 	      <property name="activates_default">False</property>
 	    </widget>
 	    <packing>
 	      <property name="left_attach">1</property>
 	      <property name="right_attach">2</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
+	      <property name="top_attach">2</property>
+	      <property name="bottom_attach">3</property>
 	      <property name="y_options"></property>
 	    </packing>
 	  </child>
@@ -2627,18 +2724,17 @@ Shared Key</property>
 	      <property name="visible">True</property>
 	      <property name="can_focus">True</property>
 	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
+	      <property name="visibility">False</property>
 	      <property name="max_length">0</property>
 	      <property name="text" translatable="yes"></property>
 	      <property name="has_frame">True</property>
-	      <property name="invisible_char">*</property>
 	      <property name="activates_default">False</property>
 	    </widget>
 	    <packing>
 	      <property name="left_attach">1</property>
 	      <property name="right_attach">2</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
+	      <property name="top_attach">3</property>
+	      <property name="bottom_attach">4</property>
 	      <property name="y_options"></property>
 	    </packing>
 	  </child>
@@ -2652,14 +2748,13 @@ Shared Key</property>
 	      <property name="max_length">0</property>
 	      <property name="text" translatable="yes"></property>
 	      <property name="has_frame">True</property>
-	      <property name="invisible_char">*</property>
 	      <property name="activates_default">False</property>
 	    </widget>
 	    <packing>
 	      <property name="left_attach">1</property>
 	      <property name="right_attach">2</property>
-	      <property name="top_attach">3</property>
-	      <property name="bottom_attach">4</property>
+	      <property name="top_attach">4</property>
+	      <property name="bottom_attach">5</property>
 	      <property name="y_options"></property>
 	    </packing>
 	  </child>
@@ -2707,6 +2802,100 @@ Shared Key</property>
 	      <property name="y_options">fill</property>
 	    </packing>
 	  </child>
+
+	  <child>
+	    <widget class="GtkLabel" id="label33">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes"></property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
+	    </widget>
+	    <packing>
+	      <property name="left_attach">0</property>
+	      <property name="right_attach">1</property>
+	      <property name="top_attach">9</property>
+	      <property name="bottom_attach">10</property>
+	      <property name="x_options">fill</property>
+	      <property name="y_options"></property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkCheckButton" id="show_checkbutton">
+	      <property name="visible">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label" translatable="yes">Show passwords</property>
+	      <property name="use_underline">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="active">False</property>
+	      <property name="inconsistent">False</property>
+	      <property name="draw_indicator">True</property>
+	    </widget>
+	    <packing>
+	      <property name="left_attach">1</property>
+	      <property name="right_attach">2</property>
+	      <property name="top_attach">9</property>
+	      <property name="bottom_attach">10</property>
+	      <property name="x_options">fill</property>
+	      <property name="y_options"></property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkLabel" id="wpa-key-type-label">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">Key Type:</property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
+	    </widget>
+	    <packing>
+	      <property name="left_attach">0</property>
+	      <property name="right_attach">1</property>
+	      <property name="top_attach">1</property>
+	      <property name="bottom_attach">2</property>
+	      <property name="x_options">fill</property>
+	      <property name="y_options"></property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkComboBox" id="wpa_eap_key_type_combo">
+	      <property name="visible">True</property>
+	      <property name="add_tearoffs">False</property>
+	      <property name="focus_on_click">True</property>
+	    </widget>
+	    <packing>
+	      <property name="left_attach">1</property>
+	      <property name="right_attach">2</property>
+	      <property name="top_attach">1</property>
+	      <property name="bottom_attach">2</property>
+	      <property name="x_options">fill</property>
+	      <property name="y_options">fill</property>
+	    </packing>
+	  </child>
 	</widget>
 	<packing>
 	  <property name="tab_expand">False</property>
@@ -2796,11 +2985,11 @@ Shared Key</property>
 	<widget class="GtkTable" id="table7">
 	  <property name="border_width">8</property>
 	  <property name="visible">True</property>
-	  <property name="n_rows">2</property>
+	  <property name="n_rows">3</property>
 	  <property name="n_columns">2</property>
 	  <property name="homogeneous">False</property>
 	  <property name="row_spacing">6</property>
-	  <property name="column_spacing">6</property>
+	  <property name="column_spacing">12</property>
 
 	  <child>
 	    <widget class="GtkLabel" id="wep_passphrase_label">
@@ -2835,11 +3024,10 @@ Shared Key</property>
 	      <property name="visible">True</property>
 	      <property name="can_focus">True</property>
 	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
+	      <property name="visibility">False</property>
 	      <property name="max_length">0</property>
 	      <property name="text" translatable="yes"></property>
 	      <property name="has_frame">True</property>
-	      <property name="invisible_char">*</property>
 	      <property name="activates_default">True</property>
 	    </widget>
 	    <packing>
@@ -2872,8 +3060,8 @@ Shared Key</property>
 	    <packing>
 	      <property name="left_attach">0</property>
 	      <property name="right_attach">1</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
+	      <property name="top_attach">2</property>
+	      <property name="bottom_attach">3</property>
 	      <property name="x_options">fill</property>
 	      <property name="y_options"></property>
 	    </packing>
@@ -2890,10 +3078,60 @@ Shared Key</property>
 	    <packing>
 	      <property name="left_attach">1</property>
 	      <property name="right_attach">2</property>
+	      <property name="top_attach">2</property>
+	      <property name="bottom_attach">3</property>
+	      <property name="x_options">fill</property>
+	      <property name="y_options">fill</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkCheckButton" id="show_checkbutton">
+	      <property name="visible">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label" translatable="yes">Show passphrase</property>
+	      <property name="use_underline">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="active">False</property>
+	      <property name="inconsistent">False</property>
+	      <property name="draw_indicator">True</property>
+	    </widget>
+	    <packing>
+	      <property name="left_attach">1</property>
+	      <property name="right_attach">2</property>
 	      <property name="top_attach">1</property>
 	      <property name="bottom_attach">2</property>
 	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
+	      <property name="y_options"></property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkLabel" id="label30">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes"></property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
+	    </widget>
+	    <packing>
+	      <property name="left_attach">0</property>
+	      <property name="right_attach">1</property>
+	      <property name="top_attach">1</property>
+	      <property name="bottom_attach">2</property>
+	      <property name="x_options">fill</property>
+	      <property name="y_options"></property>
 	    </packing>
 	  </child>
 	</widget>
diff --git a/gnome/applet/applet.h b/gnome/applet/applet.h
index 16334c2672..9a3c1a8c21 100644
--- a/gnome/applet/applet.h
+++ b/gnome/applet/applet.h
@@ -21,6 +21,11 @@
 
 #ifndef APPLET_H
 #define APPLET_H
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <gtk/gtk.h>
 #include <gconf/gconf-client.h>
 #include <glade/glade.h>
@@ -33,6 +38,9 @@
 #include "wireless-network.h"
 #include "dbus-method-dispatcher.h"
 
+#ifdef ENABLE_NOTIFY
+#include <libnotify/notify.h>
+#endif
 
 /*
  * Preference locations
@@ -119,17 +127,20 @@ typedef struct
 
 	GtkWidget *		passphrase_dialog;
 	GladeXML *		info_dialog_xml;
+#ifdef ENABLE_NOTIFY
+	NotifyNotification*	notification;
+#endif
 } NMApplet;
 
 typedef struct
 {
-	NMApplet *	applet;
+	NMApplet *		applet;
 	NetworkDevice *	dev;
 	GladeXML *		xml;
 } DriverNotifyCBData;
 
 NetworkDevice *	nma_get_device_for_nm_path			(GSList *dev_list, const char *nm_dev);
-NMApplet *	nma_new							(void);
+NMApplet *		nma_new							(void);
 void				nma_schedule_warning_dialog			(NMApplet *applet, const char *msg);
 gboolean			nma_driver_notify					(gpointer user_data);
 void				nma_show_vpn_failure_alert			(NMApplet *applet, const char *member, const char *vpn_name, const char *error_msg);
diff --git a/gnome/applet/eggtrayicon.c b/gnome/applet/eggtrayicon.c
index 1d4427fb76..68fa1d8187 100644
--- a/gnome/applet/eggtrayicon.c
+++ b/gnome/applet/eggtrayicon.c
@@ -20,7 +20,7 @@
 
 #include <config.h>
 #include <string.h>
-#include <libintl.h>
+#include <glib/gi18n.h>
 
 #include "eggtrayicon.h"
 
diff --git a/gnome/applet/gconf-helpers.c b/gnome/applet/gconf-helpers.c
index 017133cc9b..6d2b4b3166 100644
--- a/gnome/applet/gconf-helpers.c
+++ b/gnome/applet/gconf-helpers.c
@@ -107,7 +107,7 @@ nm_gconf_get_bool_helper (GConfClient *client,
 	gc_key = g_strdup_printf ("%s/%s/%s", path, network, key);
 	if ((gc_value = gconf_client_get (client, gc_key, NULL)))
 	{
-		if (gc_value->type == GCONF_VALUE_STRING)
+		if (gc_value->type == GCONF_VALUE_BOOL)
 		{
 			*value = gconf_value_get_bool (gc_value);
 			success = TRUE;
diff --git a/gnome/applet/main.c b/gnome/applet/main.c
index f53197ecc4..0ec417afaf 100644
--- a/gnome/applet/main.c
+++ b/gnome/applet/main.c
@@ -22,7 +22,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #include <string.h>
@@ -37,15 +37,10 @@ static void session_die (GnomeClient *client, gpointer client_data)
         gtk_main_quit ();
 }
 
-static gboolean session_save (GnomeClient *client, gpointer client_data)
-{
-        return TRUE;
-}
-
 int main (int argc, char *argv[])
 {
 	NMApplet *	nma;
-	GnomeClient *	client = NULL;
+	GnomeClient *	client;
 
 	gnome_program_init ("nm-applet", VERSION, LIBGNOMEUI_MODULE,
 			    argc, argv, 
@@ -54,18 +49,19 @@ int main (int argc, char *argv[])
     	client = gnome_master_client ();
     	gnome_client_set_restart_style (client, GNOME_RESTART_ANYWAY);
 
-    	g_signal_connect (client, "save_yourself", G_CALLBACK (session_save), NULL);
+    	g_signal_connect (client, "save_yourself", G_CALLBACK (gtk_true), NULL);
     	g_signal_connect (client, "die", G_CALLBACK (session_die), NULL);
 
-	bindtextdomain (GETTEXT_PACKAGE, NULL);
+	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
 
-	if ((nma = nma_new ()))
-	{
-		gtk_widget_show_all (GTK_WIDGET (nma));
-		gtk_main ();
-	}
+	nma = nma_new ();
+	if (!nma)
+		exit (EXIT_FAILURE);
+
+	gtk_widget_show_all (GTK_WIDGET (nma));
+	gtk_main ();
 
 	return 0;
 }
diff --git a/gnome/applet/menu-items.c b/gnome/applet/menu-items.c
index 5e7d4bf1d5..9b545421f5 100644
--- a/gnome/applet/menu-items.c
+++ b/gnome/applet/menu-items.c
@@ -33,6 +33,7 @@
 #include <stdio.h>
 #include <glib/gi18n.h>
 #include <string.h>
+#include <iwlib.h>
 
 #include "menu-items.h"
 #include "applet-dbus.h"
@@ -234,14 +235,16 @@ GtkCheckMenuItem *network_menu_item_get_check_item (NMNetworkMenuItem *item)
 }
 
 
-/* has_encrypted means that the wireless network has an encrypted
+/* is_encrypted means that the wireless network has an encrypted
  * area, and thus we need to allow for spacing.
  */
-void network_menu_item_update (NMNetworkMenuItem *item, WirelessNetwork *network, const gboolean is_encrypted)
+void network_menu_item_update (NMApplet *applet, NMNetworkMenuItem *item,
+						 WirelessNetwork *network, const gboolean is_encrypted)
 {
 	char *	display_essid;
 	gdouble	percent;
-	int		capabilities;
+	gboolean	encrypted = FALSE;
+	gboolean	adhoc = FALSE;
 
 	g_return_if_fail (item != NULL);
 	g_return_if_fail (network != NULL);
@@ -256,10 +259,22 @@ void network_menu_item_update (NMNetworkMenuItem *item, WirelessNetwork *network
 	/* Deal with the encrypted icon */
 	g_object_set (item->security_image, "visible", is_encrypted, NULL);
 
-	capabilities = wireless_network_get_capabilities (network);
-	if (    (capabilities & NM_802_11_CAP_PROTO_WEP)
-		|| (capabilities & NM_802_11_CAP_PROTO_WPA)
-		|| (capabilities & NM_802_11_CAP_PROTO_WPA2))
+	if (wireless_network_get_capabilities (network) & (NM_802_11_CAP_PROTO_WEP | NM_802_11_CAP_PROTO_WPA | NM_802_11_CAP_PROTO_WPA2))
+		encrypted = TRUE;
+
+	if (wireless_network_get_mode (network) == IW_MODE_ADHOC)
+		adhoc = TRUE;
+
+	/*
+	 * Set a special icon for special circumstances: encrypted or ad-hoc.
+	 *
+	 * FIXME: We do not currently differentiate between encrypted and non-encrypted Ad-Hoc
+	 *        networks; they all receive the same icon.  Ideally, we should have a third icon
+	 *        type for encrypted Ad-Hoc networks.
+	 */
+	if (adhoc)
+		gtk_image_set_from_pixbuf (GTK_IMAGE (item->security_image), applet->adhoc_icon);
+	else if (encrypted)
 	{
 		/*
 		 * We want to use "network-wireless-encrypted," which was recently added to the icon spec,
@@ -267,7 +282,12 @@ void network_menu_item_update (NMNetworkMenuItem *item, WirelessNetwork *network
 		 *
 		 * XXX: Would be nice to require gtk-2.6.  For now, we have an ugly and a simple version.
 		 */
-#if (GTK_MAJOR_VERSION <= 2 && GTK_MINOR_VERSION < 6)
+#if GTK_CHECK_VERSION(2,6,0)
+		if (gtk_icon_theme_has_icon (gtk_icon_theme_get_default (), "network-wireless-encrypted"))
+			gtk_image_set_from_icon_name (GTK_IMAGE (item->security_image), "network-wireless-encrypted", GTK_ICON_SIZE_MENU);
+		else
+			gtk_image_set_from_icon_name (GTK_IMAGE (item->security_image), "gnome-lockscreen", GTK_ICON_SIZE_MENU);
+# else
 		GdkPixbuf *pixbuf;
 		GtkIconTheme *icon_theme;
 
@@ -276,20 +296,13 @@ void network_menu_item_update (NMNetworkMenuItem *item, WirelessNetwork *network
 		if (!pixbuf)
 			pixbuf = gtk_icon_theme_load_icon (icon_theme, "gnome-lockscreen", GTK_ICON_SIZE_MENU, 0, NULL);
 		gtk_image_set_from_pixbuf (GTK_IMAGE (item->security_image), pixbuf);
-# else
-		if (gtk_icon_theme_has_icon (gtk_icon_theme_get_default (), "network-wireless-encrypted"))
-			gtk_image_set_from_icon_name (GTK_IMAGE (item->security_image), "network-wireless-encrypted", GTK_ICON_SIZE_MENU);
-		else
-			gtk_image_set_from_icon_name (GTK_IMAGE (item->security_image), "gnome-lockscreen", GTK_ICON_SIZE_MENU);
 #endif
 	}
-	else
+	else	/* neither encrypted nor Ad-Hoc */
 		gtk_image_set_from_stock (GTK_IMAGE (item->security_image), NULL, GTK_ICON_SIZE_MENU);
 }
 
 
-
-
 /****************************************************************
  *   Utility stuff
  ****************************************************************/
@@ -299,34 +312,34 @@ void network_menu_item_update (NMNetworkMenuItem *item, WirelessNetwork *network
 static char *eel_make_valid_utf8 (const char *name)
 {
 	GString *string;
-	const char *remainder, *invalid;
+	const char *rem, *invalid;
 	int remaining_bytes, valid_bytes;
 
 	string = NULL;
-	remainder = name;
+	rem = name;
 	remaining_bytes = strlen (name);
 
 	while (remaining_bytes != 0) {
-		if (g_utf8_validate (remainder, remaining_bytes, &invalid)) {
+		if (g_utf8_validate (rem, remaining_bytes, &invalid)) {
 			break;
 		}
-		valid_bytes = invalid - remainder;
+		valid_bytes = invalid - rem;
 
 		if (string == NULL) {
 			string = g_string_sized_new (remaining_bytes);
 		}
-		g_string_append_len (string, remainder, valid_bytes);
+		g_string_append_len (string, rem, valid_bytes);
 		g_string_append_c (string, '?');
 
 		remaining_bytes -= valid_bytes + 1;
-		remainder = invalid + 1;
+		rem = invalid + 1;
 	}
 
 	if (string == NULL) {
 		return g_strdup (name);
 	}
 
-	g_string_append (string, remainder);
+	g_string_append (string, rem);
 	g_string_append (string, _(" (invalid Unicode)"));
 	g_assert (g_utf8_validate (string->str, -1, NULL));
 
diff --git a/gnome/applet/menu-items.h b/gnome/applet/menu-items.h
index 1b1a278182..cde8aace46 100644
--- a/gnome/applet/menu-items.h
+++ b/gnome/applet/menu-items.h
@@ -41,7 +41,7 @@ void				 wireless_menu_item_update (NMWirelessMenuItem *item, NetworkDevice *dev
 
 NMNetworkMenuItem	*network_menu_item_new (GtkSizeGroup *encryption_size_group);
 GtkCheckMenuItem	*network_menu_item_get_check_item (NMNetworkMenuItem *item);
-void				 network_menu_item_update (NMNetworkMenuItem *item, WirelessNetwork *network, const gboolean is_encrypted);
+void				 network_menu_item_update (NMApplet *applet, NMNetworkMenuItem *item, WirelessNetwork *network, const gboolean is_encrypted);
 
 /* Helper function; escapes an essid for human readable display. */
 char      		*nm_menu_network_escape_essid_for_display (const char *essid);
diff --git a/gnome/applet/nm-device.c b/gnome/applet/nm-device.c
index 69d29c7b2e..b2d5ac6342 100644
--- a/gnome/applet/nm-device.c
+++ b/gnome/applet/nm-device.c
@@ -672,11 +672,11 @@ gboolean network_device_get_link (NetworkDevice *dev)
 	return (dev->link);
 }
 
-void network_device_set_link (NetworkDevice *dev, gboolean link)
+void network_device_set_link (NetworkDevice *dev, gboolean new_link)
 {
 	g_return_if_fail (dev != NULL);
 
-	dev->link = link;
+	dev->link = new_link;
 }
 
 /*
diff --git a/gnome/applet/nm-device.h b/gnome/applet/nm-device.h
index d8ab40b387..2580d4ef7b 100644
--- a/gnome/applet/nm-device.h
+++ b/gnome/applet/nm-device.h
@@ -95,7 +95,7 @@ const char *			network_device_get_hal_udi				(NetworkDevice *dev);
 void					network_device_set_hal_udi				(NetworkDevice *dev, const char *hal_udi);
 
 gboolean				network_device_get_link					(NetworkDevice *dev);
-void					network_device_set_link					(NetworkDevice *dev, gboolean link);
+void					network_device_set_link					(NetworkDevice *dev, gboolean new_link);
 
 int					network_device_get_speed					(NetworkDevice *dev);
 void					network_device_set_speed					(NetworkDevice *dev, int speed);
diff --git a/gnome/applet/nm-gconf-wso-wpa-eap.c b/gnome/applet/nm-gconf-wso-wpa-eap.c
index 66c3ead0b0..4ef3106aef 100644
--- a/gnome/applet/nm-gconf-wso-wpa-eap.c
+++ b/gnome/applet/nm-gconf-wso-wpa-eap.c
@@ -39,12 +39,12 @@
 struct _NMGConfWSOWPA_EAPPrivate
 {
 	int			eap_method;
+	int			key_type;
 	int			wpa_version;
 	int			key_mgmt;
 	const char *	identity;
 	const char *	passwd;
 	const char *	anon_identity;
-	const char *	private_key_passwd;
 	const char *	private_key_file;
 	const char *	client_cert_file;
 	const char *	ca_cert_file;
@@ -64,25 +64,28 @@ nm_gconf_wso_wpa_eap_new_deserialize_dbus (DBusMessageIter *iter, int we_cipher)
 	char *			ca_cert_file = NULL;
 	int				wpa_version;
 	int				eap_method;
+	int				key_type;
 
 	g_return_val_if_fail (we_cipher == NM_AUTH_TYPE_WPA_EAP, NULL);
 	g_return_val_if_fail (iter != NULL, NULL);
 
-	if (!nmu_security_deserialize_wpa_eap (iter, &eap_method, &identity, &passwd, &anon_identity, &private_key_passwd,
-								    &private_key_file, &client_cert_file, &ca_cert_file, &wpa_version))
+	if (!nmu_security_deserialize_wpa_eap (iter, &eap_method, &key_type, &identity, &passwd,
+								    &anon_identity, &private_key_passwd, &private_key_file,
+								    &client_cert_file, &ca_cert_file, &wpa_version))
 		goto out;
 
 	/* Success, build up our security object */
 	security = g_object_new (NM_TYPE_GCONF_WSO_WPA_EAP, NULL);
 	nm_gconf_wso_set_we_cipher (NM_GCONF_WSO (security), we_cipher);
-	nm_gconf_wso_set_key (NM_GCONF_WSO (security), "FIXME", 5);	/* FIXME: What to do about Enterprise keys? */
+	if (private_key_passwd)
+		nm_gconf_wso_set_key (NM_GCONF_WSO (security), private_key_passwd, strlen (private_key_passwd));
 	security->priv->wpa_version = wpa_version;
 	security->priv->eap_method = eap_method;
+	security->priv->key_type = key_type;
 	security->priv->key_mgmt = IW_AUTH_KEY_MGMT_802_1X;
 	security->priv->identity = g_strdup (identity);
 	security->priv->passwd = g_strdup (passwd);
 	security->priv->anon_identity = g_strdup (anon_identity);
-	security->priv->private_key_passwd = g_strdup (private_key_passwd);
 	security->priv->private_key_file = g_strdup (private_key_file);
 	security->priv->client_cert_file = g_strdup (client_cert_file);
 	security->priv->ca_cert_file = g_strdup (ca_cert_file);
@@ -99,97 +102,88 @@ nm_gconf_wso_wpa_eap_new_deserialize_gconf (GConfClient *client, const char *net
 	char *			identity = NULL;
 	char *			passwd = NULL;
 	char *			anon_identity = NULL;
-	char *			private_key_passwd = NULL;
 	char *			private_key_file = NULL;
 	char *			client_cert_file = NULL;
 	char *			ca_cert_file = NULL;
-	int				wpa_version;
-	int				eap_method;
-	int				key_mgmt;
+	int				wpa_version = 0;
+	int				eap_method = 0;
+	int				key_type = 0;
+	int				key_mgmt = 0;
 
 	g_return_val_if_fail (client != NULL, NULL);
 	g_return_val_if_fail (network != NULL, NULL);
 	g_return_val_if_fail ((we_cipher == NM_AUTH_TYPE_WPA_EAP), NULL);
 
-	if (!nm_gconf_get_int_helper (client,
-							GCONF_PATH_WIRELESS_NETWORKS,
-							WPA_EAP_PREFIX"eap_method",
-							network,
-							&eap_method))
-		goto out;
-
-	if (!nm_gconf_get_int_helper (client,
-							GCONF_PATH_WIRELESS_NETWORKS,
-							WPA_EAP_PREFIX"wpa_version",
-							network,
-							&wpa_version))
-		goto out;
-
-	if (!nm_gconf_get_int_helper (client,
-							GCONF_PATH_WIRELESS_NETWORKS,
-							WPA_EAP_PREFIX"key_mgt",
-							network,
-							&key_mgmt))
-
-	if (!nm_gconf_get_string_helper (client,
-							   GCONF_PATH_WIRELESS_NETWORKS,
-							   WPA_EAP_PREFIX"identity",
-							   network,
-							   &identity))
-		goto out;
-
-	if (!nm_gconf_get_string_helper (client,
-							   GCONF_PATH_WIRELESS_NETWORKS,
-							   WPA_EAP_PREFIX"passwd",
-							   network,
-							   &passwd))
-		goto out;
-
-	if (!nm_gconf_get_string_helper (client,
-							   GCONF_PATH_WIRELESS_NETWORKS,
-							   WPA_EAP_PREFIX"anon_identity",
-							   network,
-							   &anon_identity))
-		goto out;
-
-	if (!nm_gconf_get_string_helper (client,
-							   GCONF_PATH_WIRELESS_NETWORKS,
-							   WPA_EAP_PREFIX"private_key_passwd",
-							   network,
-							   &private_key_passwd))
-		goto out;
-
-	if (!nm_gconf_get_string_helper (client,
-							   GCONF_PATH_WIRELESS_NETWORKS,
-							   WPA_EAP_PREFIX"private_key_file",
-							   network,
-							   &private_key_file))
-		goto out;
-
-	if (!nm_gconf_get_string_helper (client,
-							   GCONF_PATH_WIRELESS_NETWORKS,
-							   WPA_EAP_PREFIX"client_cert_file",
-							   network,
-							   &client_cert_file))
-		goto out;
-
-	if (!nm_gconf_get_string_helper (client,
-							   GCONF_PATH_WIRELESS_NETWORKS,
-							   WPA_EAP_PREFIX"ca_cert_file",
-							   network,
-							   &ca_cert_file))
-		goto out;
+	nm_gconf_get_int_helper (client,
+						GCONF_PATH_WIRELESS_NETWORKS,
+						WPA_EAP_PREFIX"eap_method",
+						network,
+						&eap_method);
+
+	nm_gconf_get_int_helper (client,
+						GCONF_PATH_WIRELESS_NETWORKS,
+						WPA_EAP_PREFIX"key_type",
+						network,
+						&key_type);
+
+	nm_gconf_get_int_helper (client,
+						GCONF_PATH_WIRELESS_NETWORKS,
+						WPA_EAP_PREFIX"wpa_version",
+						network,
+						&wpa_version);
+
+	nm_gconf_get_int_helper (client,
+						GCONF_PATH_WIRELESS_NETWORKS,
+						WPA_EAP_PREFIX"key_mgt",
+						network,
+						&key_mgmt);
+
+	nm_gconf_get_string_helper (client,
+						   GCONF_PATH_WIRELESS_NETWORKS,
+						   WPA_EAP_PREFIX"identity",
+						   network,
+						   &identity);
+
+	nm_gconf_get_string_helper (client,
+						   GCONF_PATH_WIRELESS_NETWORKS,
+						   WPA_EAP_PREFIX"passwd",
+						   network,
+						   &passwd);
+
+	nm_gconf_get_string_helper (client,
+						   GCONF_PATH_WIRELESS_NETWORKS,
+						   WPA_EAP_PREFIX"anon_identity",
+						   network,
+						   &anon_identity);
+
+	nm_gconf_get_string_helper (client,
+						   GCONF_PATH_WIRELESS_NETWORKS,
+						   WPA_EAP_PREFIX"private_key_file",
+						   network,
+						   &private_key_file);
+
+	nm_gconf_get_string_helper (client,
+						   GCONF_PATH_WIRELESS_NETWORKS,
+						   WPA_EAP_PREFIX"client_cert_file",
+						   network,
+						   &client_cert_file);
+
+	nm_gconf_get_string_helper (client,
+						   GCONF_PATH_WIRELESS_NETWORKS,
+						   WPA_EAP_PREFIX"ca_cert_file",
+						   network,
+						   &ca_cert_file);
 
 	/* Success, build up our security object */
 	security = g_object_new (NM_TYPE_GCONF_WSO_WPA_EAP, NULL);
 	nm_gconf_wso_set_we_cipher (NM_GCONF_WSO (security), we_cipher);
 	security->priv->wpa_version = wpa_version;
 	security->priv->eap_method = eap_method;
+	security->priv->key_type = key_type;
 	security->priv->key_mgmt = IW_AUTH_KEY_MGMT_802_1X;
 	security->priv->identity = g_strdup (identity);
 	security->priv->passwd = g_strdup (passwd);
 	security->priv->anon_identity = g_strdup (anon_identity);
-	security->priv->private_key_passwd = g_strdup (private_key_passwd);
 	security->priv->private_key_file = g_strdup (private_key_file);
 	security->priv->client_cert_file = g_strdup (client_cert_file);
 	security->priv->ca_cert_file = g_strdup (ca_cert_file);
@@ -197,12 +191,10 @@ nm_gconf_wso_wpa_eap_new_deserialize_gconf (GConfClient *client, const char *net
 	g_free (identity);
 	g_free (passwd);
 	g_free (anon_identity);
-	g_free (private_key_passwd);
 	g_free (private_key_file);
 	g_free (client_cert_file);
 	g_free (ca_cert_file);
 
-out:
 	return security;
 }
 
@@ -214,10 +206,11 @@ real_serialize_dbus (NMGConfWSO *instance, DBusMessageIter *iter)
 
 	if (!nmu_security_serialize_wpa_eap (iter,
 			self->priv->eap_method,
+			self->priv->key_type,
 			self->priv->identity ? : "",
 			self->priv->passwd ? : "",
 			self->priv->anon_identity ? : "",
-			self->priv->private_key_passwd ? : "",
+			nm_gconf_wso_get_key (instance),
 			self->priv->private_key_file ? : "",
 			self->priv->client_cert_file ? : "",
 			self->priv->ca_cert_file ? : "",
@@ -236,6 +229,10 @@ real_serialize_gconf (NMGConfWSO *instance, GConfClient *client, const char *net
 	gconf_client_set_int (client, key, self->priv->eap_method, NULL);
 	g_free (key);
 
+	key = g_strdup_printf ("%s/%s/%skey_type", GCONF_PATH_WIRELESS_NETWORKS, network, WPA_EAP_PREFIX);
+	gconf_client_set_int (client, key, self->priv->key_type, NULL);
+	g_free (key);
+
 	key = g_strdup_printf ("%s/%s/%swpa_version", GCONF_PATH_WIRELESS_NETWORKS, network, WPA_EAP_PREFIX);
 	gconf_client_set_int (client, key, self->priv->wpa_version, NULL);
 	g_free (key);
@@ -256,10 +253,6 @@ real_serialize_gconf (NMGConfWSO *instance, GConfClient *client, const char *net
 	gconf_client_set_string (client, key, self->priv->anon_identity, NULL);
 	g_free (key);
 
-	key = g_strdup_printf ("%s/%s/%sprivate_key_passwd", GCONF_PATH_WIRELESS_NETWORKS, network, WPA_EAP_PREFIX);
-	gconf_client_set_string (client, key, self->priv->private_key_passwd, NULL);
-	g_free (key);
-
 	key = g_strdup_printf ("%s/%s/%sprivate_key_file", GCONF_PATH_WIRELESS_NETWORKS, network, WPA_EAP_PREFIX);
 	gconf_client_set_string (client, key, self->priv->private_key_file, NULL);
 	g_free (key);
diff --git a/gnome/applet/nm-gconf-wso.c b/gnome/applet/nm-gconf-wso.c
index 0aecef361b..23b6069fe1 100644
--- a/gnome/applet/nm-gconf-wso.c
+++ b/gnome/applet/nm-gconf-wso.c
@@ -137,6 +137,10 @@ nm_gconf_wso_new_deserialize_gconf (GConfClient *client,
 				security = NM_GCONF_WSO (nm_gconf_wso_wpa_psk_new_deserialize_gconf (client, network, we_cipher));
 				break;
 
+			case NM_AUTH_TYPE_WPA_EAP:
+				security = NM_GCONF_WSO (nm_gconf_wso_wpa_eap_new_deserialize_gconf (client, network, we_cipher));
+				break;
+
 			default:
 				break;
 		}
diff --git a/gnome/applet/other-network-dialog.c b/gnome/applet/other-network-dialog.c
index e66cf49bd7..4669cf168c 100644
--- a/gnome/applet/other-network-dialog.c
+++ b/gnome/applet/other-network-dialog.c
@@ -329,11 +329,11 @@ static GtkDialog *nma_ond_init (GladeXML *xml, NMApplet *applet, gboolean create
 	gtk_tree_model_get (model, &iter, NAME_COLUMN, &str, DEV_COLUMN, &dev, -1);
 	g_assert (dev);
 	dev_caps = network_device_get_type_capabilities (dev);
-	/* Can't do WPA2/CCMP Ad-Hoc networks because wpa_supplicant
-	 * doesn't support them.
+	/* Can't do WPA2/CCMP or WPA-EAP Ad-Hoc networks because wpa_supplicant
+	 * doesn't support the former and the latter does not make sense.
 	 */
 	if (create_network)
-		dev_caps &= ~NM_802_11_CAP_PROTO_WPA2;
+		dev_caps &= ~(NM_802_11_CAP_PROTO_WPA2 | NM_802_11_CAP_KEY_MGMT_802_1X);
 	wsm_set_capabilities (wsm, dev_caps);
 
 	security_combo = GTK_COMBO_BOX (glade_xml_get_widget (xml, "security_combo"));
@@ -381,7 +381,7 @@ static GtkDialog *nma_ond_init (GladeXML *xml, NMApplet *applet, gboolean create
 static void nma_ond_response_cb (GtkDialog *dialog, gint response, gpointer data)
 {
 	GladeXML *		xml;
-	NMApplet *	applet;
+	NMApplet *		applet;
 	gboolean			create_network;
 	GtkTreeModel *		model;
 	GtkComboBox *		combo;
diff --git a/gnome/applet/passphrase-dialog.c b/gnome/applet/passphrase-dialog.c
index efb1b88882..2d05ec1db0 100644
--- a/gnome/applet/passphrase-dialog.c
+++ b/gnome/applet/passphrase-dialog.c
@@ -20,7 +20,6 @@
  */
 
 #include <config.h>
-#include <libintl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -53,6 +52,7 @@ static void update_button_cb (GtkWidget *unused, GtkDialog *dialog)
 	GladeXML *	xml;
 	WirelessSecurityManager * wsm;
 	GtkComboBox *	security_combo;
+	WirelessNetwork *net;
 
 	g_return_if_fail (dialog != NULL);
 	xml = get_dialog_xml (GTK_WIDGET (dialog));
@@ -60,7 +60,8 @@ static void update_button_cb (GtkWidget *unused, GtkDialog *dialog)
 	wsm = (WirelessSecurityManager *) g_object_get_data (G_OBJECT (dialog), "wireless-security-manager");
 	g_return_if_fail (wsm != NULL);
 
-	if ((ssid = (const char *) g_object_get_data (G_OBJECT (dialog), "network")))
+	if ((net = g_object_get_data (G_OBJECT (dialog), "network")) &&
+	    (ssid = wireless_network_get_essid (net)))
 	{
 		/* Validate the wireless security choices */
 		security_combo = GTK_COMBO_BOX (glade_xml_get_widget (xml, "security_combo"));
diff --git a/gnome/applet/vpn-password-dialog.c b/gnome/applet/vpn-password-dialog.c
index e32b5ee88f..a379ef1caa 100644
--- a/gnome/applet/vpn-password-dialog.c
+++ b/gnome/applet/vpn-password-dialog.c
@@ -20,7 +20,6 @@
  */
 
 #include <config.h>
-#include <libintl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -29,7 +28,7 @@
 #include <glib.h>
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib.h>
-#include <glib/gi18n-lib.h>
+#include <glib/gi18n.h>
 #include <unistd.h>
 
 #include "applet.h"
diff --git a/gnome/applet/wireless-network.c b/gnome/applet/wireless-network.c
index 54334716f7..a9fe8ba066 100644
--- a/gnome/applet/wireless-network.c
+++ b/gnome/applet/wireless-network.c
@@ -22,6 +22,8 @@
 
 
 #include <glib.h>
+#include <iwlib.h>
+
 #include "wireless-network.h"
 
 /*
@@ -35,6 +37,7 @@ struct WirelessNetwork
 	char *	essid;
 	gboolean	active;
 	gint8	strength;
+	int		mode;
 	int		capabilities;
 };
 
@@ -173,6 +176,24 @@ void wireless_network_set_capabilities (WirelessNetwork *net, int capabilities)
 }
 
 /*
+ * Accessors for mode
+ */
+int wireless_network_get_mode (WirelessNetwork *net)
+{
+	g_return_val_if_fail (net != NULL, FALSE);
+
+	return net->mode;
+}
+
+void wireless_network_set_mode (WirelessNetwork *net, int mode)
+{
+	g_return_if_fail (net != NULL);
+	g_return_if_fail ((mode == IW_MODE_ADHOC) || (mode == IW_MODE_INFRA));
+
+	net->mode = mode;
+}
+
+/*
  * Accessors for strength
  */
 gint8 wireless_network_get_strength (WirelessNetwork *net)
diff --git a/gnome/applet/wireless-network.h b/gnome/applet/wireless-network.h
index b60edd5b49..6b1b227eb4 100644
--- a/gnome/applet/wireless-network.h
+++ b/gnome/applet/wireless-network.h
@@ -41,6 +41,9 @@ const char *		wireless_network_get_nm_path		(WirelessNetwork *net);
 int				wireless_network_get_capabilities	(WirelessNetwork *net);
 void				wireless_network_set_capabilities	(WirelessNetwork *net, int capabilities);
 
+int				wireless_network_get_mode		(WirelessNetwork *net);
+void				wireless_network_set_mode		(WirelessNetwork *net, int mode);
+
 gint8			wireless_network_get_strength		(WirelessNetwork *net);
 void				wireless_network_set_strength		(WirelessNetwork *net, gint8 strength);
 
diff --git a/gnome/applet/wireless-security-option.c b/gnome/applet/wireless-security-option.c
index fed6381a3f..3383b640e9 100644
--- a/gnome/applet/wireless-security-option.c
+++ b/gnome/applet/wireless-security-option.c
@@ -194,8 +194,7 @@ void wso_wep_auth_combo_cleanup (WirelessSecurityOption *opt, GtkComboBox * comb
 
 
 GtkTreeModel *
-wso_wpa_create_key_type_model (int capabilities,
-                               int *num_added)
+wso_wpa_create_key_type_model (int capabilities, gboolean wpa_eap, int *num_added)
 {
 	GtkListStore *	model;
 	GtkTreeIter	iter;
@@ -209,8 +208,16 @@ wso_wpa_create_key_type_model (int capabilities,
 	name = _("Automatic (Default)");
 	gtk_list_store_append (model, &iter);
 	gtk_list_store_set (model, &iter, WPA_KEY_TYPE_NAME_COL, name,
-					WPA_KEY_TYPE_CIPHER_COL, 0, -1);
+					WPA_KEY_TYPE_CIPHER_COL, NM_AUTH_TYPE_WPA_PSK_AUTO, -1);
 
+	if (capabilities & NM_802_11_CAP_CIPHER_CCMP)
+	{
+		name = _("AES-CCMP");
+		gtk_list_store_append (model, &iter);
+		gtk_list_store_set (model, &iter, WPA_KEY_TYPE_NAME_COL, name,
+			WPA_KEY_TYPE_CIPHER_COL, IW_AUTH_CIPHER_CCMP, -1);
+		num++;
+	}
 	if (capabilities & NM_802_11_CAP_CIPHER_TKIP)
 	{
 		name = _("TKIP");
@@ -219,12 +226,12 @@ wso_wpa_create_key_type_model (int capabilities,
 			WPA_KEY_TYPE_CIPHER_COL, IW_AUTH_CIPHER_TKIP, -1);
 		num++;
 	}
-	if (capabilities & NM_802_11_CAP_CIPHER_CCMP)
+	if (wpa_eap && capabilities & NM_802_11_CAP_KEY_MGMT_802_1X)
 	{
-		name = _("AES-CCMP");
+		name = _("Dynamic WEP");
 		gtk_list_store_append (model, &iter);
 		gtk_list_store_set (model, &iter, WPA_KEY_TYPE_NAME_COL, name,
-			WPA_KEY_TYPE_CIPHER_COL, IW_AUTH_CIPHER_CCMP, -1);
+			WPA_KEY_TYPE_CIPHER_COL, IW_AUTH_CIPHER_WEP104, -1);
 		num++;
 	}
 
diff --git a/gnome/applet/wso-private.h b/gnome/applet/wso-private.h
index d3e248f7fb..796d370e99 100644
--- a/gnome/applet/wso-private.h
+++ b/gnome/applet/wso-private.h
@@ -79,7 +79,7 @@ void			wso_wep_auth_combo_cleanup (WirelessSecurityOption *opt, GtkComboBox * co
 #define WPA_KEY_TYPE_NAME_COL		0
 #define WPA_KEY_TYPE_CIPHER_COL	1
 
-GtkTreeModel *	wso_wpa_create_key_type_model (int capabilities, int *num_added);
+GtkTreeModel *	wso_wpa_create_key_type_model (int capabilities, gboolean wpa_eap, int *num_added);
 
 
 #endif	/* WIRELESS_SECURITY_OPTION_PRIVATE_H */
diff --git a/gnome/applet/wso-wep-ascii.c b/gnome/applet/wso-wep-ascii.c
index e11980b470..1c51734b32 100644
--- a/gnome/applet/wso-wep-ascii.c
+++ b/gnome/applet/wso-wep-ascii.c
@@ -37,6 +37,7 @@ struct OptData
 {
 	const char *	entry_name;
 	const char *	auth_combo_name;
+	const char *	show_checkbutton_name;
 };
 
 static void data_free_func (WirelessSecurityOption *opt)
@@ -53,9 +54,16 @@ static void data_free_func (WirelessSecurityOption *opt)
 }
 
 
+static void show_key_cb (GtkToggleButton *button, GtkEntry *entry)
+{
+	gtk_entry_set_visibility (entry, gtk_toggle_button_get_active (button));
+}
+
+
 static GtkWidget * widget_create_func (WirelessSecurityOption *opt, GtkSignalFunc validate_cb, gpointer user_data)
 {
 	GtkWidget *	entry;
+	GtkWidget *	checkbutton;
 	GtkWidget *	combo;
 	GtkWidget *	widget;
 
@@ -69,6 +77,9 @@ static GtkWidget * widget_create_func (WirelessSecurityOption *opt, GtkSignalFun
 	entry = glade_xml_get_widget (opt->uixml, opt->data->entry_name);
 	g_signal_connect (G_OBJECT (entry), "changed", validate_cb, user_data);
 
+	checkbutton = glade_xml_get_widget (opt->uixml, opt->data->show_checkbutton_name);
+	g_signal_connect (G_OBJECT (checkbutton), "toggled", GTK_SIGNAL_FUNC (show_key_cb), GTK_ENTRY (entry));
+
 	combo = glade_xml_get_widget (opt->uixml, opt->data->auth_combo_name);
 	wso_wep_auth_combo_setup (opt, GTK_COMBO_BOX (combo));
 
@@ -124,7 +135,7 @@ WirelessSecurityOption * wso_wep_ascii_new (const char *glade_file)
 	g_return_val_if_fail (glade_file != NULL, NULL);
 
 	opt = g_malloc0 (sizeof (WirelessSecurityOption));
-	opt->name = g_strdup (_("WEP 40/128-bit ASCII"));
+	opt->name = g_strdup (_("WEP 64/128-bit ASCII"));
 	opt->widget_name = "wep_key_notebook";
 	opt->data_free_func = data_free_func;
 	opt->validate_input_func = validate_input_func;
@@ -143,6 +154,7 @@ WirelessSecurityOption * wso_wep_ascii_new (const char *glade_file)
 	opt->data = data = g_malloc0 (sizeof (OptData));
 	data->entry_name = "wep_key_entry";
 	data->auth_combo_name = "auth_method_combo";
+	data->show_checkbutton_name = "show_checkbutton";
 
 	return opt;
 }
diff --git a/gnome/applet/wso-wep-hex.c b/gnome/applet/wso-wep-hex.c
index 2809edd23b..0bd00de3ae 100644
--- a/gnome/applet/wso-wep-hex.c
+++ b/gnome/applet/wso-wep-hex.c
@@ -37,6 +37,7 @@ struct OptData
 {
 	const char *	entry_name;
 	const char *	auth_combo_name;
+	const char *	show_checkbutton_name;
 };
 
 static void data_free_func (WirelessSecurityOption *opt)
@@ -53,9 +54,16 @@ static void data_free_func (WirelessSecurityOption *opt)
 }
 
 
+static void show_key_cb (GtkToggleButton *button, GtkEntry *entry)
+{
+	gtk_entry_set_visibility (entry, gtk_toggle_button_get_active (button));
+}
+
+
 static GtkWidget * widget_create_func (WirelessSecurityOption *opt, GtkSignalFunc validate_cb, gpointer user_data)
 {
 	GtkWidget *	entry;
+	GtkWidget *	checkbutton;
 	GtkWidget *	combo;
 	GtkWidget *	widget;
 
@@ -67,6 +75,9 @@ static GtkWidget * widget_create_func (WirelessSecurityOption *opt, GtkSignalFun
 	entry = glade_xml_get_widget (opt->uixml, opt->data->entry_name);
 	g_signal_connect (G_OBJECT (entry), "changed", validate_cb, user_data);
 
+	checkbutton = glade_xml_get_widget (opt->uixml, opt->data->show_checkbutton_name);
+	g_signal_connect (G_OBJECT (checkbutton), "toggled", GTK_SIGNAL_FUNC (show_key_cb), GTK_ENTRY (entry));
+
 	combo = glade_xml_get_widget (opt->uixml, opt->data->auth_combo_name);
 	wso_wep_auth_combo_setup (opt, GTK_COMBO_BOX (combo));
 
@@ -121,7 +132,7 @@ WirelessSecurityOption * wso_wep_hex_new (const char *glade_file)
 	g_return_val_if_fail (glade_file != NULL, NULL);
 
 	opt = g_malloc0 (sizeof (WirelessSecurityOption));
-	opt->name = g_strdup (_("WEP 40/128-bit hex"));
+	opt->name = g_strdup (_("WEP 64/128-bit Hex"));
 	opt->widget_name = "wep_key_notebook";
 	opt->data_free_func = data_free_func;
 	opt->validate_input_func = validate_input_func;
@@ -140,6 +151,7 @@ WirelessSecurityOption * wso_wep_hex_new (const char *glade_file)
 	opt->data = data = g_malloc0 (sizeof (OptData));
 	data->entry_name = "wep_key_entry";
 	data->auth_combo_name = "auth_method_combo";
+	data->show_checkbutton_name = "show_checkbutton";
 
 	return opt;
 }
diff --git a/gnome/applet/wso-wep-passphrase.c b/gnome/applet/wso-wep-passphrase.c
index 7034b3e855..4253d45bba 100644
--- a/gnome/applet/wso-wep-passphrase.c
+++ b/gnome/applet/wso-wep-passphrase.c
@@ -37,6 +37,7 @@ struct OptData
 {
 	const char *	entry_name;
 	const char *	auth_combo_name;
+	const char *	show_checkbutton_name;
 };
 
 static void data_free_func (WirelessSecurityOption *opt)
@@ -53,9 +54,15 @@ static void data_free_func (WirelessSecurityOption *opt)
 }
 
 
+static void show_passphrase_cb (GtkToggleButton *button, GtkEntry *entry)
+{
+	gtk_entry_set_visibility (entry, gtk_toggle_button_get_active (button));
+}
+
 static GtkWidget * widget_create_func (WirelessSecurityOption *opt, GtkSignalFunc validate_cb, gpointer user_data)
 {
 	GtkWidget *	entry;
+	GtkWidget *	checkbutton;
 	GtkWidget *	combo;
 	GtkWidget *	widget;
 
@@ -67,6 +74,9 @@ static GtkWidget * widget_create_func (WirelessSecurityOption *opt, GtkSignalFun
 	entry = glade_xml_get_widget (opt->uixml, opt->data->entry_name);
 	g_signal_connect (G_OBJECT (entry), "changed", validate_cb, user_data);
 
+	checkbutton = glade_xml_get_widget (opt->uixml, opt->data->show_checkbutton_name);
+	g_signal_connect (G_OBJECT (checkbutton), "toggled", GTK_SIGNAL_FUNC (show_passphrase_cb), GTK_ENTRY (entry));
+
 	combo = glade_xml_get_widget (opt->uixml, opt->data->auth_combo_name);
 	wso_wep_auth_combo_setup (opt, GTK_COMBO_BOX (combo));
 
@@ -83,6 +93,7 @@ static gboolean validate_input_func (WirelessSecurityOption *opt, const char *ss
 
 	entry = glade_xml_get_widget (opt->uixml, opt->data->entry_name);
 	input = gtk_entry_get_text (GTK_ENTRY (entry));
+
 	return wso_validate_helper (opt, ssid, input, out_cipher);
 }
 
@@ -121,7 +132,7 @@ WirelessSecurityOption * wso_wep_passphrase_new (const char *glade_file)
 	g_return_val_if_fail (glade_file != NULL, NULL);
 
 	opt = g_malloc0 (sizeof (WirelessSecurityOption));
-	opt->name = g_strdup (_("WEP Passphrase"));
+	opt->name = g_strdup (_("WEP 128-bit Passphrase"));
 	opt->widget_name = "wep_passphrase_notebook";
 	opt->data_free_func = data_free_func;
 	opt->validate_input_func = validate_input_func;
@@ -139,6 +150,7 @@ WirelessSecurityOption * wso_wep_passphrase_new (const char *glade_file)
 	opt->data = data = g_malloc0 (sizeof (OptData));
 	data->entry_name = "wep_passphrase_entry";
 	data->auth_combo_name = "auth_method_combo";
+	data->show_checkbutton_name = "show_checkbutton";
 
 	return opt;
 }
diff --git a/gnome/applet/wso-wpa-eap.c b/gnome/applet/wso-wpa-eap.c
index f7ae4c7467..bcc52c269d 100644
--- a/gnome/applet/wso-wpa-eap.c
+++ b/gnome/applet/wso-wpa-eap.c
@@ -40,6 +40,7 @@
 struct OptData
 {
 	int			eap_method;
+	int			key_type;
 	const char *	identity;
 	const char *	passwd;
 	const char *	anon_identity;
@@ -62,6 +63,21 @@ data_free_func (WirelessSecurityOption *opt)
 }
 
 
+static void show_passwords_cb (GtkToggleButton *button, WirelessSecurityOption *opt)
+{
+	GtkWidget *	entry;
+	gboolean		visible;
+
+	visible = gtk_toggle_button_get_active (button);
+
+	entry = glade_xml_get_widget (opt->uixml, "wpa_eap_passwd_entry");
+	gtk_entry_set_visibility (GTK_ENTRY (entry), visible);
+
+	entry = glade_xml_get_widget (opt->uixml, "wpa_eap_private_key_passwd_entry");
+	gtk_entry_set_visibility (GTK_ENTRY (entry), visible);
+}
+
+
 static GtkWidget *
 widget_create_func (WirelessSecurityOption *opt,
                     GtkSignalFunc validate_cb,
@@ -69,6 +85,7 @@ widget_create_func (WirelessSecurityOption *opt,
 {
 	GtkWidget *	entry;
 	GtkWidget *	widget;
+	GtkWidget *	checkbutton;
 
 	g_return_val_if_fail (opt != NULL, NULL);
 	g_return_val_if_fail (opt->data != NULL, NULL);
@@ -97,6 +114,9 @@ widget_create_func (WirelessSecurityOption *opt,
 	entry = glade_xml_get_widget (opt->uixml, "wpa_eap_private_key_passwd_entry");
 	g_signal_connect (G_OBJECT (entry), "changed", validate_cb, user_data);
 
+	checkbutton = glade_xml_get_widget (opt->uixml, "show_checkbutton");
+	g_signal_connect (G_OBJECT (checkbutton), "toggled", GTK_SIGNAL_FUNC (show_passwords_cb), opt);
+
 	return widget;
 }
 
@@ -151,6 +171,11 @@ append_dbus_params_func (WirelessSecurityOption *opt,
 	gtk_combo_box_get_active_iter (GTK_COMBO_BOX (entry), &tree_iter);
 	gtk_tree_model_get (model, &tree_iter, WPA_EAP_VALUE_COL, &opt->data->eap_method, -1);
 
+	entry = glade_xml_get_widget (opt->uixml, "wpa_eap_key_type_combo");
+	model = gtk_combo_box_get_model (GTK_COMBO_BOX (entry));
+	gtk_combo_box_get_active_iter (GTK_COMBO_BOX (entry), &tree_iter);
+	gtk_tree_model_get (model, &tree_iter, WPA_KEY_TYPE_CIPHER_COL, &opt->data->key_type, -1);
+
 	entry = glade_xml_get_widget (opt->uixml, "wpa_eap_identity_entry");
 	opt->data->identity = gtk_entry_get_text (GTK_ENTRY (entry)) ? : "";
 
@@ -176,6 +201,7 @@ append_dbus_params_func (WirelessSecurityOption *opt,
 
 	nmu_security_serialize_wpa_eap_with_cipher (&dbus_iter,
 									    opt->data->eap_method,
+									    opt->data->key_type,
 									    opt->data->identity,
 									    opt->data->passwd,
 									    opt->data->anon_identity,
@@ -197,9 +223,12 @@ wso_wpa_eap_new (const char *glade_file,
 	WirelessSecurityOption * opt = NULL;
 	OptData *				data = NULL;
 	GtkWidget *			eap_method_combo;
+	GtkWidget *			key_type_combo;
 	GtkListStore *			model;
+	GtkTreeModel *			tree_model;
 	GtkTreeIter			iter;
 	GtkCellRenderer *		renderer;
+	int					num_added;
 
 	struct {
 		const char *		name;
@@ -242,12 +271,25 @@ wso_wpa_eap_new (const char *glade_file,
 	gtk_combo_box_set_model (GTK_COMBO_BOX (eap_method_combo), GTK_TREE_MODEL (model));
 	gtk_tree_model_get_iter_first (GTK_TREE_MODEL (model), &iter);
 	gtk_combo_box_set_active_iter (GTK_COMBO_BOX (eap_method_combo), &iter);
-	renderer = gtk_cell_renderer_text_new ();
 
 	/* FIXME: Why do we need this here but not in the same place in wso-wpa-psk.c ? */
+	renderer = gtk_cell_renderer_text_new ();
 	gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (eap_method_combo), renderer, TRUE);
 	gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (eap_method_combo), renderer, "text", 0, NULL);
 
+	key_type_combo = glade_xml_get_widget (opt->uixml, "wpa_eap_key_type_combo");
+	tree_model = wso_wpa_create_key_type_model (capabilities, TRUE, &num_added);
+	gtk_combo_box_set_model (GTK_COMBO_BOX (key_type_combo), tree_model);
+	gtk_tree_model_get_iter_first (tree_model, &iter);
+	gtk_combo_box_set_active_iter (GTK_COMBO_BOX (key_type_combo), &iter);
+	if (num_added == 1)
+		gtk_widget_set_sensitive (key_type_combo, FALSE);
+
+	/* FIXME: Why do we need this here but not in the same place in wso-wpa-psk.c ? */
+	renderer = gtk_cell_renderer_text_new ();
+	gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (key_type_combo), renderer, TRUE);
+	gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (key_type_combo), renderer, "text", 0, NULL);
+
 	/* Option-specific data */
 	opt->data = data = g_malloc0 (sizeof (OptData));
 	data->wpa2 = wpa2;
diff --git a/gnome/applet/wso-wpa-psk.c b/gnome/applet/wso-wpa-psk.c
index ded3e16ca5..3625a381ce 100644
--- a/gnome/applet/wso-wpa-psk.c
+++ b/gnome/applet/wso-wpa-psk.c
@@ -41,6 +41,7 @@ struct OptData
 	gboolean				wpa2;
 	const char *			entry_name;
 	const char *			key_type_combo_name;
+	const char *			show_checkbutton_name;
 	IEEE_802_11_Cipher *	hex_cipher;
 	IEEE_802_11_Cipher *	passphrase_cipher;
 };
@@ -58,12 +59,19 @@ data_free_func (WirelessSecurityOption *opt)
 }
 
 
+static void show_passphrase_cb (GtkToggleButton *button, GtkEntry *entry)
+{
+	gtk_entry_set_visibility (entry, gtk_toggle_button_get_active (button));
+}
+
+
 static GtkWidget *
 widget_create_func (WirelessSecurityOption *opt,
                     GtkSignalFunc validate_cb,
                     gpointer user_data)
 {
 	GtkWidget *	entry;
+	GtkWidget *	checkbutton;
 	GtkWidget *	widget;
 
 	g_return_val_if_fail (opt != NULL, NULL);
@@ -73,6 +81,10 @@ widget_create_func (WirelessSecurityOption *opt,
 	widget = wso_widget_helper (opt);
 	entry = glade_xml_get_widget (opt->uixml, opt->data->entry_name);
 	g_signal_connect (G_OBJECT (entry), "changed", validate_cb, user_data);
+
+	checkbutton = glade_xml_get_widget (opt->uixml, opt->data->show_checkbutton_name);
+	g_signal_connect (G_OBJECT (checkbutton), "toggled", GTK_SIGNAL_FUNC (show_passphrase_cb), GTK_ENTRY (entry));
+
 	return widget;
 }
 
@@ -183,6 +195,7 @@ wso_wpa_psk_new (const char *glade_file,
 	data->wpa2 = wpa2;
 	data->entry_name = "wpa_psk_entry";
 	data->key_type_combo_name = "wpa_psk_type_combo";
+	data->show_checkbutton_name = "show_checkbutton";
 
 	/* Set up our ciphers */
 	data->passphrase_cipher = cipher_wpa_psk_passphrase_new ();
@@ -194,12 +207,7 @@ wso_wpa_psk_new (const char *glade_file,
 
 	key_type_combo = glade_xml_get_widget (opt->uixml, data->key_type_combo_name);
 	g_signal_connect (G_OBJECT (key_type_combo), "changed", (GCallback) key_type_combo_changed_cb, opt);
-	model = wso_wpa_create_key_type_model (capabilities, &num_added);
-	if (!model || !num_added)
-	{
-		wso_free (opt);
-		return NULL;
-	}
+	model = wso_wpa_create_key_type_model (capabilities, FALSE, &num_added);
 	gtk_combo_box_set_model (GTK_COMBO_BOX (key_type_combo), model);
 	gtk_tree_model_get_iter_first (model, &iter);
 	gtk_combo_box_set_active_iter (GTK_COMBO_BOX (key_type_combo), &iter);
diff --git a/gnome/libnm_glib/libnm_glib.c b/gnome/libnm_glib/libnm_glib.c
index f3a5e4b8de..096a97d5c8 100644
--- a/gnome/libnm_glib/libnm_glib.c
+++ b/gnome/libnm_glib/libnm_glib.c
@@ -39,6 +39,7 @@ struct libnm_glib_ctx
 	GMainLoop *		g_main_loop;
 	DBusConnection	*	dbus_con;
 	guint			dbus_watcher;
+	guint			dbus_watch_interval;
 	gboolean			thread_done;
 	gboolean			thread_inited;
 
@@ -347,14 +348,29 @@ libnm_glib_dbus_watcher (gpointer user_data)
 
 	g_return_val_if_fail (ctx != NULL, FALSE);
 
+	ctx->dbus_watcher = 0;
+
 	if (!ctx->dbus_con)
 		ctx->dbus_con = libnm_glib_dbus_init ((gpointer)ctx, ctx->g_main_ctx);
 
 	if (ctx->dbus_con)
-		return (FALSE);	/* Don't reschedule ourselves if we have a connection to dbus */
+	{
+		/* Get NM's state right away after we reconnect */
+		libnm_glib_get_nm_state (ctx);
+		ctx->dbus_watch_interval = 1000;
+	}
+	else
+	{
+		/* Wait 3 seconds longer each time we fail to reconnect to dbus,
+		 * with a maximum wait of one minute.
+		 */
+		ctx->dbus_watch_interval = MIN(ctx->dbus_watch_interval + 3000, 60000); 
 
-	/* Reschule ourselves if we _still_ don't have a connection to dbus */
-	return (TRUE);
+		/* Reschule ourselves if we _still_ don't have a connection to dbus */
+		libnm_glib_schedule_dbus_watcher (ctx);
+	}
+
+	return FALSE;
 }
 
 
@@ -372,7 +388,7 @@ libnm_glib_schedule_dbus_watcher (libnm_glib_ctx *ctx)
 
 	if (ctx->dbus_watcher == 0)
 	{
-		GSource	*source = g_idle_source_new ();
+		GSource *	source = g_timeout_source_new (ctx->dbus_watch_interval);
 		g_source_set_callback (source, libnm_glib_dbus_watcher, (gpointer) ctx, NULL);
 		ctx->dbus_watcher = g_source_attach (source, ctx->g_main_ctx);
 		g_source_unref (source);
@@ -453,6 +469,7 @@ libnm_glib_ctx_new (void)
 		goto error;
 	if (!(ctx->callbacks_lock = g_mutex_new ()))
 		goto error;
+	ctx->dbus_watch_interval = 1000;
 
 	return ctx;
 
diff --git a/gnome/vpn-properties/Makefile.am b/gnome/vpn-properties/Makefile.am
index d43a861129..550a6cc96d 100644
--- a/gnome/vpn-properties/Makefile.am
+++ b/gnome/vpn-properties/Makefile.am
@@ -7,8 +7,10 @@ nm_vpn_properties_HEADERS = 					\
 	nm-vpn-ui-interface.h
 
 nm_vpn_properties_SOURCES = 					\
-					nm-vpn-properties.c	\
-	nm-vpn-ui-interface.h
+					nm-vpn-properties.c		\
+					clipboard.c			\
+					clipboard.h			\
+					nm-vpn-ui-interface.h
 
 gladedir = $(datadir)/gnome-vpn-properties
 glade_DATA = nm-vpn-properties.glade
@@ -25,7 +27,7 @@ nm_vpn_properties_CFLAGS =                              \
         -DG_DISABLE_DEPRECATED                          \
         -DGDK_DISABLE_DEPRECATED                        \
         -DGNOME_DISABLE_DEPRECATED                      \
-        -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"  \
+	-DGNOMELOCALEDIR=\"$(datadir)/locale\"		\
         -DVERSION=\"$(VERSION)\" \
         $(NULL)
 
diff --git a/gnome/vpn-properties/clipboard.c b/gnome/vpn-properties/clipboard.c
new file mode 100644
index 0000000000..0688d4696a
--- /dev/null
+++ b/gnome/vpn-properties/clipboard.c
@@ -0,0 +1,74 @@
+/*
+ * src/clipboard.c - X clipboard hack to detect if daemon is running
+ *
+ * Elliot Lee <sopwith@redhat.com>
+ *
+ * (C) Copyright 1999 Red Hat, Inc.
+ *
+ * Licensed under the GNU GPL v2.  See COPYING.
+ */
+
+#include "config.h"
+
+#include <gnome.h>
+#include <gconf/gconf-client.h>
+#include <gdk/gdkx.h>
+
+#include "clipboard.h"
+
+/*
+ * clipboard_get_func - dummy get_func for gtk_clipboard_set_with_data ()
+ */
+static void
+clipboard_get_func (GtkClipboard *clipboard __attribute__((__unused__)),
+		   GtkSelectionData *selection_data __attribute__((__unused__)),
+		    guint info __attribute__((__unused__)),
+		    gpointer user_data_or_owner __attribute__((__unused__)))
+{
+}
+
+/*
+ * clipboard_clear_func - dummy clear_func for gtk_clipboard_set_with_data ()
+ */
+static void
+clipboard_clear_func (GtkClipboard *clipboard __attribute__((__unused__)),
+		      gpointer user_data_or_owner __attribute__((__unused__)))
+{
+}
+
+#define CLIPBOARD_NAME	"VPN_CLIPBOARD_FOO"
+
+/*
+ * vpn_get_clipboard - try and get the CLIPBOARD_NAME clipboard
+ *
+ * Returns TRUE if successfully retrieved and FALSE otherwise.
+ */
+gboolean
+vpn_get_clipboard (void)
+{
+	static const GtkTargetEntry targets[] = { {CLIPBOARD_NAME, 0, 0} };
+	gboolean retval = FALSE;
+	GtkClipboard *clipboard;
+	Atom atom;
+
+	atom = gdk_x11_get_xatom_by_name (CLIPBOARD_NAME);
+
+	XGrabServer (GDK_DISPLAY ());
+
+	if (XGetSelectionOwner (GDK_DISPLAY (), atom) != None)
+		goto out;
+
+	clipboard = gtk_clipboard_get (gdk_atom_intern (CLIPBOARD_NAME, FALSE));
+
+	if (gtk_clipboard_set_with_data (clipboard, targets,
+					 G_N_ELEMENTS (targets),
+					 clipboard_get_func,
+					 clipboard_clear_func, NULL))
+		retval = TRUE;
+
+out:
+	XUngrabServer (GDK_DISPLAY ());
+	gdk_flush ();
+
+	return retval;
+}
diff --git a/gnome/vpn-properties/clipboard.h b/gnome/vpn-properties/clipboard.h
new file mode 100644
index 0000000000..3b07909797
--- /dev/null
+++ b/gnome/vpn-properties/clipboard.h
@@ -0,0 +1,6 @@
+#ifndef _VPN_PROPERTIES_CLIPBOARD_H
+#define _VPN_PROPERTIES_CLIPBOARD_H
+
+gboolean vpn_get_clipboard (void);
+
+#endif	/* _VPN_PROPERTIES_CLIPBOARD_H */
diff --git a/gnome/vpn-properties/nm-vpn-properties.c b/gnome/vpn-properties/nm-vpn-properties.c
index 4cbfadadb7..ade8702ffc 100644
--- a/gnome/vpn-properties/nm-vpn-properties.c
+++ b/gnome/vpn-properties/nm-vpn-properties.c
@@ -39,10 +39,11 @@
 #include <gtk/gtkwindow.h>
 #include <glade/glade.h>
 #include <gconf/gconf-client.h>
-#include <glib/gi18n-lib.h>
+#include <glib/gi18n.h>
 
 #define NM_VPN_API_SUBJECT_TO_CHANGE
 #include "nm-vpn-ui-interface.h"
+#include "clipboard.h"
 
 #define NM_GCONF_VPN_CONNECTIONS_PATH "/system/networking/vpn_connections"
 
@@ -67,11 +68,15 @@ find_vpn_ui_by_service_name (const char *service_name)
 {
 	GSList *i;
 
+	g_return_val_if_fail (service_name != NULL, NULL);
+
 	for (i = vpn_types; i != NULL; i = g_slist_next (i)) {
 		NetworkManagerVpnUI *vpn_ui;
+		const char * vpn_ui_service_name;
 
 		vpn_ui = i->data;
-		if (strcmp (vpn_ui->get_service_name (vpn_ui), service_name) == 0)
+		vpn_ui_service_name = vpn_ui->get_service_name (vpn_ui);
+		if (vpn_ui_service_name && strcmp (vpn_ui_service_name, service_name) == 0)
 			return vpn_ui;
 	}
 
@@ -90,7 +95,7 @@ static void
 update_edit_del_sensitivity (void)
 {
 	GtkTreeSelection *selection;
-	gboolean is_editable, is_exportable;
+	gboolean is_editable = FALSE, is_exportable = FALSE;
 	GtkTreeIter iter;
 
 	selection = gtk_tree_view_get_selection (vpn_conn_view);
@@ -98,13 +103,14 @@ update_edit_del_sensitivity (void)
 		is_editable = is_exportable = FALSE;
 	else {
 		NetworkManagerVpnUI *vpn_ui;
-		const char *service_name;
+		const char *service_name = NULL;
 
 		gtk_tree_model_get (GTK_TREE_MODEL (vpn_conn_list), &iter, VPNCONN_USER_CAN_EDIT_COLUMN, &is_editable, -1);
 		gtk_tree_model_get (GTK_TREE_MODEL (vpn_conn_list), &iter, VPNCONN_SVC_NAME_COLUMN, &service_name, -1);
 
 		vpn_ui = find_vpn_ui_by_service_name (service_name);
-		is_exportable = vpn_ui->can_export (vpn_ui);
+		if (vpn_ui)
+			is_exportable = vpn_ui->can_export (vpn_ui);
 	}
 
 	gtk_widget_set_sensitive (vpn_edit, is_editable);
@@ -236,9 +242,12 @@ static gboolean vpn_druid_vpn_type_page_next (GnomeDruidPage *druidpage,
 
 	/* first hide existing child */
 	w = g_list_nth_data (gtk_container_children (GTK_CONTAINER (vpn_type_details)), 0);
-	if (w != NULL) {
+	if (w)
+		gtk_widget_hide (w);
+	/* hide the previous widget from the next page, in case the user hit 'back' */
+	w = g_list_nth_data (gtk_container_children (GTK_CONTAINER (vpn_type_details)), 1);
+	if (w)
 		gtk_widget_hide (w);
-	}
 
 	/* show appropriate child */
 	vpn_ui = (NetworkManagerVpnUI *) g_slist_nth_data (vpn_types, gtk_combo_box_get_active (vpn_type_combo_box));
@@ -266,7 +275,19 @@ static void vpn_druid_vpn_details_page_prepare (GnomeDruidPage *druidpage,
 						GtkWidget *widget,
 						gpointer user_data)
 {
-	gnome_druid_set_buttons_sensitive (druid, TRUE, FALSE, TRUE, FALSE);	
+	gboolean is_valid;
+	NetworkManagerVpnUI *vpn_ui;
+
+	is_valid = FALSE;
+
+	/*printf ("vpn_druid_von_details_page_prepare!\n");*/
+
+	/* validate input, in case we are coming in via 'Back' */
+	vpn_ui = (NetworkManagerVpnUI *) g_slist_nth_data (vpn_types, gtk_combo_box_get_active (vpn_type_combo_box));
+	if (vpn_ui != NULL)
+		is_valid = vpn_ui->is_valid (vpn_ui);
+
+	gnome_druid_set_buttons_sensitive (druid, TRUE, is_valid, TRUE, FALSE);	
 }
 
 static gboolean vpn_druid_vpn_details_page_next (GnomeDruidPage *druidpage,
@@ -338,7 +359,11 @@ static gboolean vpn_druid_cancel (GnomeDruid *ignored_druid, gpointer user_data)
 	return FALSE;
 }
 
-
+static gboolean vpn_window_close (GtkWidget *ignored, gpointer user_data)
+{
+	gtk_widget_hide_all (GTK_WIDGET (druid_window));
+	return TRUE;
+}
 
 static void
 add_cb (GtkButton *button, gpointer user_data)
@@ -380,6 +405,7 @@ add_cb (GtkButton *button, gpointer user_data)
 	gtk_window_set_policy (druid_window, FALSE, FALSE, TRUE);
 
 	gtk_widget_show_all (GTK_WIDGET (druid_window));
+
 out:
 	;
 }
@@ -607,7 +633,7 @@ edit_cb (GtkButton *button, gpointer user_data)
 	char *conn_gconf_path;
 	GtkTreeIter iter;
 
-	/*printf ("edit\n");*/
+	printf ("edit_cb\n");
 
 	if (!retrieve_data_from_selected_connection (&vpn_ui, &conn_vpn_data, &conn_routes, &conn_name, &conn_gconf_path))
 		goto out;
@@ -754,12 +780,19 @@ out:
 }
 
 static void
-close_cb (void)
+response_cb (void)
 {
 	gtk_widget_destroy (dialog);
 	gtk_main_quit ();
 }
 
+static gboolean
+delete_event_cb (GtkDialog *the_dialog)
+{
+	gtk_dialog_response (the_dialog, GTK_RESPONSE_DELETE_EVENT);
+	return TRUE;
+}
+
 static void
 export_cb (GtkButton *button, gpointer user_data)
 {
@@ -769,7 +802,7 @@ export_cb (GtkButton *button, gpointer user_data)
 	const char *conn_name;
 	char *conn_gconf_path;
 
-	/*printf ("edit\n");*/
+	/*printf ("export_cb\n");*/
 
 	if (!retrieve_data_from_selected_connection (&vpn_ui, &conn_vpn_data, &conn_routes, &conn_name, &conn_gconf_path))
 		goto out;
@@ -814,7 +847,7 @@ static void get_all_vpn_connections (void)
 		    gconf_value_get_list_type (value) != GCONF_VALUE_STRING ||
 		    (conn_vpn_data = gconf_value_get_list (value)) == NULL)
 			goto error;
-		
+
 		//conn_user_can_edit = (strcmp (conn_name, "RH VPN Boston") != 0);
 
 		gtk_list_store_append (vpn_conn_list, &iter);
@@ -903,9 +936,11 @@ init_app (void)
 	GtkCellRenderer *renderer;
 	GSList *i;
 	GtkHBox *vpn_type_hbox1;
+	GtkWidget *toplevel;
 	GDir *dir;
 
-	/* TODO: ensure only one copy of this program is running at any time */
+	if (!vpn_get_clipboard ())
+		return FALSE;
 
 	gconf_client = gconf_client_get_default ();
 	gconf_client_add_dir (gconf_client, NM_GCONF_VPN_CONNECTIONS_PATH,
@@ -973,11 +1008,10 @@ init_app (void)
 	gtk_signal_connect (GTK_OBJECT (vpn_export), "clicked", GTK_SIGNAL_FUNC (export_cb), NULL);
 	vpn_delete = glade_xml_get_widget (xml, "delete");
 	gtk_signal_connect (GTK_OBJECT (vpn_delete), "clicked", GTK_SIGNAL_FUNC (delete_cb), NULL);
-	w = glade_xml_get_widget (xml, "close");
-	gtk_signal_connect (GTK_OBJECT (w), "clicked",
-			    GTK_SIGNAL_FUNC (close_cb), NULL);
-	gtk_signal_connect (GTK_OBJECT (dialog), "delete_event",
-			    GTK_SIGNAL_FUNC (close_cb), NULL);
+	g_signal_connect (dialog, "response",
+			  G_CALLBACK (response_cb), NULL);
+	g_signal_connect (dialog, "delete_event",
+			  G_CALLBACK (delete_event_cb), NULL);
 
 	vpn_conn_view = GTK_TREE_VIEW (glade_xml_get_widget (xml, "vpnlist"));
 	vpn_conn_list = gtk_list_store_new (VPNCONN_N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN);
@@ -1024,6 +1058,9 @@ init_app (void)
 	gtk_signal_connect_after (GTK_OBJECT (w), "prepare", GTK_SIGNAL_FUNC (vpn_druid_vpn_confirm_page_prepare), NULL);
 	gtk_signal_connect_after (GTK_OBJECT (w), "finish", GTK_SIGNAL_FUNC (vpn_druid_vpn_confirm_page_finish), NULL);
 
+	toplevel = gtk_widget_get_toplevel (GTK_WIDGET (druid));
+	gtk_signal_connect (GTK_OBJECT (toplevel), "delete_event", GTK_SIGNAL_FUNC (vpn_window_close), NULL);
+
 	druid_window = GTK_WINDOW (glade_xml_get_widget (xml, "vpn-create-connection"));
 
 	/* make the druid window modal wrt. our main window */
@@ -1053,23 +1090,36 @@ main (int argc, char *argv[])
 	int ret;
 	gboolean bad_opts;
 	gboolean do_import;
-	GError *error = NULL;
 	gchar *import_svc = NULL;
 	gchar *import_file = NULL;
 	GOptionEntry entries[] =  {
-			{ "import-service", 's', 0, G_OPTION_ARG_STRING, &import_svc, "VPN Service for importing", NULL},
-			{ "import-file", 'f', 0, G_OPTION_ARG_STRING, &import_file, "File to import", NULL},
-			{ NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL }
+		{ "import-service", 's', 0, G_OPTION_ARG_STRING, &import_svc, "VPN Service for importing", NULL},
+		{ "import-file", 'f', 0, G_OPTION_ARG_FILENAME, &import_file, "File to import", NULL},
+		{ NULL }
 	};
 
-	bindtextdomain (GETTEXT_PACKAGE, NULL);
+	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
 
 	context = g_option_context_new ("- NetworkManager VPN properties");
 	g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
-	g_option_context_add_group (context, gtk_get_option_group (TRUE));
-	g_option_context_parse (context, &argc, &argv, &error);
+
+#ifdef HAVE_LIBGNOME_2_14
+	gnome_program_init ("nm-vpn-properties", VERSION, LIBGNOMEUI_MODULE, argc, argv,
+			    GNOME_PARAM_GOPTION_CONTEXT, context,
+			    GNOME_PARAM_NONE);
+#else
+	{
+		GError *error = NULL;
+		g_option_context_add_group (context, gtk_get_option_group (TRUE));
+		g_option_context_parse (context, &argc, &argv, &error);
+		g_option_context_free (context);
+	}
+
+	gnome_program_init ("nm-vpn-properties", VERSION, LIBGNOMEUI_MODULE, argc, argv,
+			    GNOME_PARAM_NONE, GNOME_PARAM_NONE);
+#endif
 
 	bad_opts = FALSE;
 	do_import = FALSE;
@@ -1087,11 +1137,6 @@ main (int argc, char *argv[])
 		goto out;
 	}
 
-	gnome_program_init (GETTEXT_PACKAGE, VERSION, LIBGNOMEUI_MODULE, argc, argv,
-			    GNOME_PARAM_NONE, GNOME_PARAM_NONE);
-
-	glade_gnome_init ();
-
 	if (init_app () == FALSE) {
 		ret = EXIT_FAILURE;
 		goto out;
diff --git a/gnome/vpn-properties/nm-vpn-properties.glade b/gnome/vpn-properties/nm-vpn-properties.glade
index f8adce18b0..67c54c0dec 100644
--- a/gnome/vpn-properties/nm-vpn-properties.glade
+++ b/gnome/vpn-properties/nm-vpn-properties.glade
@@ -4,16 +4,18 @@
 <glade-interface>
 <requires lib="gnome"/>
 
-<widget class="GtkWindow" id="vpn-ui-properties">
+<widget class="GtkDialog" id="vpn-ui-properties">
   <property name="border_width">5</property>
   <property name="width_request">400</property>
   <property name="height_request">300</property>
+  <property name="visible">True</property>
   <property name="title" translatable="yes">VPN Connections</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_CENTER</property>
   <property name="modal">False</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
+  <property name="icon_name">gtk-network</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
@@ -21,201 +23,241 @@
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="focus_on_map">True</property>
   <property name="urgency_hint">False</property>
+  <property name="has_separator">False</property>
 
-  <child>
-    <widget class="GtkVBox" id="vbox23">
+  <child internal-child="vbox">
+    <widget class="GtkVBox" id="dialog-vbox1">
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
+      <property name="spacing">2</property>
 
-      <child>
-	<widget class="GtkLabel" id="label29">
+      <child internal-child="action_area">
+	<widget class="GtkHButtonBox" id="dialog-action_area1">
 	  <property name="visible">True</property>
-	  <property name="label" translatable="yes">Manage Virtual Private Network Connections</property>
-	  <property name="use_underline">False</property>
-	  <property name="use_markup">False</property>
-	  <property name="justify">GTK_JUSTIFY_LEFT</property>
-	  <property name="wrap">False</property>
-	  <property name="selectable">False</property>
-	  <property name="xalign">0</property>
-	  <property name="yalign">0</property>
-	  <property name="xpad">6</property>
-	  <property name="ypad">11</property>
-	  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	  <property name="width_chars">-1</property>
-	  <property name="single_line_mode">False</property>
-	  <property name="angle">0</property>
+	  <property name="layout_style">GTK_BUTTONBOX_END</property>
+
+	  <child>
+	    <widget class="GtkButton" id="closebutton1">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-close</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">-7</property>
+	    </widget>
+	  </child>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>
 	  <property name="expand">False</property>
-	  <property name="fill">False</property>
+	  <property name="fill">True</property>
+	  <property name="pack_type">GTK_PACK_END</property>
 	</packing>
       </child>
 
       <child>
-	<widget class="GtkHBox" id="hbox70">
+	<widget class="GtkVBox" id="vbox25">
+	  <property name="border_width">5</property>
 	  <property name="visible">True</property>
 	  <property name="homogeneous">False</property>
-	  <property name="spacing">0</property>
+	  <property name="spacing">12</property>
 
 	  <child>
-	    <widget class="GtkScrolledWindow" id="scrolledwindow1">
+	    <widget class="GtkLabel" id="label29">
 	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-	      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-	      <property name="shadow_type">GTK_SHADOW_IN</property>
-	      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-	      <child>
-		<widget class="GtkTreeView" id="vpnlist">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="headers_visible">False</property>
-		  <property name="rules_hint">False</property>
-		  <property name="reorderable">False</property>
-		  <property name="enable_search">False</property>
-		  <property name="fixed_height_mode">False</property>
-		  <property name="hover_selection">False</property>
-		  <property name="hover_expand">False</property>
-		</widget>
-	      </child>
+	      <property name="label" translatable="yes">Manage Virtual Private Network Connections</property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0</property>
+	      <property name="yalign">0</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
 	    </widget>
 	    <packing>
 	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
+	      <property name="expand">False</property>
+	      <property name="fill">False</property>
 	    </packing>
 	  </child>
 
 	  <child>
-	    <widget class="GtkVButtonBox" id="vbuttonbox1">
-	      <property name="border_width">6</property>
+	    <widget class="GtkHBox" id="hbox70">
 	      <property name="visible">True</property>
-	      <property name="layout_style">GTK_BUTTONBOX_START</property>
-	      <property name="spacing">12</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">6</property>
 
 	      <child>
-		<widget class="GtkButton" id="add">
+		<widget class="GtkScrolledWindow" id="scrolledwindow1">
 		  <property name="visible">True</property>
-		  <property name="tooltip" translatable="yes">Add a new VPN connection</property>
-		  <property name="can_default">True</property>
 		  <property name="can_focus">True</property>
-		  <property name="label">gtk-add</property>
-		  <property name="use_stock">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-		</widget>
-	      </child>
+		  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+		  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+		  <property name="shadow_type">GTK_SHADOW_IN</property>
+		  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
-	      <child>
-		<widget class="GtkButton" id="edit">
-		  <property name="visible">True</property>
-		  <property name="tooltip" translatable="yes">Edit the selected VPN connection</property>
-		  <property name="can_default">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label">gtk-edit</property>
-		  <property name="use_stock">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
+		  <child>
+		    <widget class="GtkTreeView" id="vpnlist">
+		      <property name="visible">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="headers_visible">False</property>
+		      <property name="rules_hint">False</property>
+		      <property name="reorderable">False</property>
+		      <property name="enable_search">False</property>
+		      <property name="fixed_height_mode">False</property>
+		      <property name="hover_selection">False</property>
+		      <property name="hover_expand">False</property>
+		    </widget>
+		  </child>
 		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">True</property>
+		  <property name="fill">True</property>
+		</packing>
 	      </child>
 
 	      <child>
-		<widget class="GtkButton" id="export">
+		<widget class="GtkVButtonBox" id="vbuttonbox1">
 		  <property name="visible">True</property>
-		  <property name="tooltip" translatable="yes">Export the selected VPN connection to a file</property>
-		  <property name="can_default">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
+		  <property name="layout_style">GTK_BUTTONBOX_START</property>
+		  <property name="spacing">6</property>
 
 		  <child>
-		    <widget class="GtkAlignment" id="alignment1">
+		    <widget class="GtkButton" id="add">
 		      <property name="visible">True</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xscale">0</property>
-		      <property name="yscale">0</property>
-		      <property name="top_padding">0</property>
-		      <property name="bottom_padding">0</property>
-		      <property name="left_padding">0</property>
-		      <property name="right_padding">0</property>
+		      <property name="tooltip" translatable="yes">Add a new VPN connection</property>
+		      <property name="can_default">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="label">gtk-add</property>
+		      <property name="use_stock">True</property>
+		      <property name="relief">GTK_RELIEF_NORMAL</property>
+		      <property name="focus_on_click">True</property>
+		    </widget>
+		  </child>
+
+		  <child>
+		    <widget class="GtkButton" id="edit">
+		      <property name="visible">True</property>
+		      <property name="tooltip" translatable="yes">Edit the selected VPN connection</property>
+		      <property name="can_default">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="label">gtk-edit</property>
+		      <property name="use_stock">True</property>
+		      <property name="relief">GTK_RELIEF_NORMAL</property>
+		      <property name="focus_on_click">True</property>
+		    </widget>
+		  </child>
+
+		  <child>
+		    <widget class="GtkButton" id="export">
+		      <property name="visible">True</property>
+		      <property name="tooltip" translatable="yes">Export the selected VPN connection to a file</property>
+		      <property name="can_default">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="relief">GTK_RELIEF_NORMAL</property>
+		      <property name="focus_on_click">True</property>
 
 		      <child>
-			<widget class="GtkHBox" id="hbox71">
+			<widget class="GtkAlignment" id="alignment1">
 			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">2</property>
-
-			  <child>
-			    <widget class="GtkImage" id="image1">
-			      <property name="visible">True</property>
-			      <property name="stock">gtk-save</property>
-			      <property name="icon_size">4</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xscale">0</property>
+			  <property name="yscale">0</property>
+			  <property name="top_padding">0</property>
+			  <property name="bottom_padding">0</property>
+			  <property name="left_padding">0</property>
+			  <property name="right_padding">0</property>
 
 			  <child>
-			    <widget class="GtkLabel" id="label33">
+			    <widget class="GtkHBox" id="hbox71">
 			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">E_xport</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			      <property name="width_chars">-1</property>
-			      <property name="single_line_mode">False</property>
-			      <property name="angle">0</property>
-			      <accessibility>
-				<atkproperty name="AtkObject::accessible_description" translatable="yes">Export the VPN settings to a file</atkproperty>
-			      </accessibility>
+			      <property name="homogeneous">False</property>
+			      <property name="spacing">2</property>
+
+			      <child>
+				<widget class="GtkImage" id="image1">
+				  <property name="visible">True</property>
+				  <property name="stock">gtk-save</property>
+				  <property name="icon_size">4</property>
+				  <property name="xalign">0.5</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkLabel" id="label33">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">E_xport</property>
+				  <property name="use_underline">True</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0.5</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
+				  <accessibility>
+				    <atkproperty name="AtkObject::accessible_description" translatable="yes">Export the VPN settings to a file</atkproperty>
+				  </accessibility>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
 			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
 			  </child>
 			</widget>
 		      </child>
 		    </widget>
 		  </child>
-		</widget>
-	      </child>
 
-	      <child>
-		<widget class="GtkButton" id="delete">
-		  <property name="visible">True</property>
-		  <property name="tooltip" translatable="yes">Delete the selected VPN connection</property>
-		  <property name="can_default">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label">gtk-delete</property>
-		  <property name="use_stock">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
+		  <child>
+		    <widget class="GtkButton" id="delete">
+		      <property name="visible">True</property>
+		      <property name="tooltip" translatable="yes">Delete the selected VPN connection</property>
+		      <property name="can_default">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="label">gtk-delete</property>
+		      <property name="use_stock">True</property>
+		      <property name="relief">GTK_RELIEF_NORMAL</property>
+		      <property name="focus_on_click">True</property>
+		    </widget>
+		  </child>
 		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">True</property>
+		</packing>
 	      </child>
 	    </widget>
 	    <packing>
 	      <property name="padding">0</property>
-	      <property name="expand">False</property>
+	      <property name="expand">True</property>
 	      <property name="fill">True</property>
 	    </packing>
 	  </child>
@@ -226,37 +268,12 @@
 	  <property name="fill">True</property>
 	</packing>
       </child>
-
-      <child>
-	<widget class="GtkHButtonBox" id="hbuttonbox1">
-	  <property name="border_width">6</property>
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-	  <property name="spacing">0</property>
-
-	  <child>
-	    <widget class="GtkButton" id="close">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-close</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
     </widget>
   </child>
 </widget>
 
 <widget class="GtkWindow" id="vpn-create-connection">
+  <property name="border_width">5</property>
   <property name="title" translatable="yes">Create VPN Connection</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
@@ -273,7 +290,7 @@
 
   <child>
     <widget class="GnomeDruid" id="vpn-create-connection-druid">
-      <property name="border_width">4</property>
+      <property name="border_width">5</property>
       <property name="visible">True</property>
       <property name="show_help">False</property>
 
@@ -295,7 +312,7 @@ It will require some information, such as IP addresses and secrets.  Please see
 
 	  <child internal-child="vbox">
 	    <widget class="GtkVBox" id="druid-vbox4">
-	      <property name="border_width">16</property>
+	      <property name="border_width">12</property>
 	      <property name="visible">True</property>
 	      <property name="homogeneous">False</property>
 	      <property name="spacing">6</property>
@@ -317,7 +334,7 @@ It will require some information, such as IP addresses and secrets.  Please see
 		      <property name="selectable">False</property>
 		      <property name="xalign">0</property>
 		      <property name="yalign">0.5</property>
-		      <property name="xpad">12</property>
+		      <property name="xpad">0</property>
 		      <property name="ypad">0</property>
 		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 		      <property name="width_chars">-1</property>
@@ -335,7 +352,7 @@ It will require some information, such as IP addresses and secrets.  Please see
 		    <widget class="GtkHBox" id="vpn-create-connection-druid-hbox1">
 		      <property name="visible">True</property>
 		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
+		      <property name="spacing">12</property>
 
 		      <child>
 			<widget class="GtkLabel" id="label32">
@@ -346,7 +363,7 @@ It will require some information, such as IP addresses and secrets.  Please see
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
 			  <property name="wrap">False</property>
 			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
+			  <property name="xalign">0</property>
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
@@ -356,7 +373,7 @@ It will require some information, such as IP addresses and secrets.  Please see
 			  <property name="angle">0</property>
 			</widget>
 			<packing>
-			  <property name="padding">12</property>
+			  <property name="padding">0</property>
 			  <property name="expand">False</property>
 			  <property name="fill">False</property>
 			</packing>
@@ -375,7 +392,7 @@ It will require some information, such as IP addresses and secrets.  Please see
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
-		  <property name="expand">True</property>
+		  <property name="expand">False</property>
 		  <property name="fill">False</property>
 		</packing>
 	      </child>
@@ -391,7 +408,7 @@ It will require some information, such as IP addresses and secrets.  Please see
 
 	  <child internal-child="vbox">
 	    <widget class="GtkVBox" id="vpn-connection-druid-details-box">
-	      <property name="border_width">16</property>
+	      <property name="border_width">12</property>
 	      <property name="visible">True</property>
 	      <property name="homogeneous">False</property>
 	      <property name="spacing">6</property>
diff --git a/initscript/Arch/.cvsignore b/initscript/Arch/.cvsignore
new file mode 100644
index 0000000000..489063dd77
--- /dev/null
+++ b/initscript/Arch/.cvsignore
@@ -0,0 +1,4 @@
+Makefile
+Makefile.in
+networkmanager
+networkmanager-dispatcher
diff --git a/initscript/Arch/Makefile.am b/initscript/Arch/Makefile.am
new file mode 100644
index 0000000000..b611ead672
--- /dev/null
+++ b/initscript/Arch/Makefile.am
@@ -0,0 +1,4 @@
+EXTRA_DIST = networkmanager networkmanager-dispatcher 
+
+initddir = $(sysconfdir)/rc.d
+initd_SCRIPTS = networkmanager networkmanager-dispatcher
diff --git a/initscript/Arch/networkmanager-dispatcher.in b/initscript/Arch/networkmanager-dispatcher.in
new file mode 100644
index 0000000000..e04dd89c57
--- /dev/null
+++ b/initscript/Arch/networkmanager-dispatcher.in
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+prefix=@prefix@
+exec_prefix=@prefix@
+sbindir=@sbindir@
+NETWORKMANAGER_BIN=${sbindir}/NetworkManagerDispatcher
+
+# general config
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+# Sanity checks.
+[ -x $NETWORKMANAGER_BIN ] || exit 0
+
+# We need /usr/sbin/ip
+[ -x /usr/sbin/ip ] || exit 0
+
+PID=`pidof -o %PPID $NETWORKMANAGER_BIN`
+case "$1" in
+	start)
+		stat_busy "Starting NetworkManagerDispatcher"
+		if [ -z "$PID" ]; then
+			$NETWORKMANAGER_BIN
+		fi
+		if [ ! -z "$PID" -o $? -gt 0 ]; then
+			stat_fail
+		else
+			add_daemon NetworkManagerDispatcher
+			stat_done
+		fi
+		;;
+	stop)
+		stat_busy "Stopping NetworkManagerDispatcher"
+			[ ! -z "$PID" ] && kill $PID &> /dev/null
+		if [ $? -gt 0 ]; then
+			stat_fail
+		else
+			rm_daemon NetworkManagerDispatcher
+			stat_done
+		fi
+		;;
+	restart)
+		$0 stop
+		sleep 1
+		$0 start
+		;;
+	*)
+		echo "usage: $0 {start|stop|restart}"
+		;;
+esac
+exit 0
+
+
+
diff --git a/initscript/Arch/networkmanager.in b/initscript/Arch/networkmanager.in
new file mode 100644
index 0000000000..41b7c86941
--- /dev/null
+++ b/initscript/Arch/networkmanager.in
@@ -0,0 +1,55 @@
+#!/bin/bash
+
+prefix=@prefix@
+exec_prefix=@prefix@
+sbindir=@sbindir@
+
+NETWORKMANAGER_BIN=${sbindir}/NetworkManager
+
+# general config
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+# Sanity checks.
+[ -x $NETWORKMANAGER_BIN ] || exit 0
+
+# We need /usr/sbin/ip
+[ -x /usr/sbin/ip ] || exit 0
+
+PID=`pidof -o %PPID $NETWORKMANAGER_BIN`
+case "$1" in
+	start)
+		stat_busy "Starting NetworkManager"
+		if [ -z "$PID" ]; then
+			$NETWORKMANAGER_BIN
+		fi
+		if [ ! -z "$PID" -o $? -gt 0 ]; then
+			stat_fail
+		else
+			add_daemon NetworkManager
+			stat_done
+		fi
+		;;
+	stop)
+		stat_busy "Stopping NetworkManager"
+			[ ! -z "$PID" ] && kill $PID &> /dev/null
+		if [ $? -gt 0 ]; then
+			stat_fail
+		else
+			rm_daemon NetworkManager
+			stat_done
+		fi
+		;;
+	restart)
+		$0 stop
+		sleep 1
+		$0 start
+		;;
+	*)
+		echo "usage: $0 {start|stop|restart}"
+		;;
+esac
+exit 0
+
+
+
diff --git a/initscript/Makefile.am b/initscript/Makefile.am
index b20408a1eb..e5ee9a1198 100644
--- a/initscript/Makefile.am
+++ b/initscript/Makefile.am
@@ -14,3 +14,6 @@ endif
 if TARGET_SUSE
 SUBDIRS += SUSE
 endif
+if TARGET_ARCH
+SUBDIRS += Arch
+endif
diff --git a/initscript/SUSE/networkmanager.in b/initscript/SUSE/networkmanager.in
index df2cd24a2b..ada215c675 100644
--- a/initscript/SUSE/networkmanager.in
+++ b/initscript/SUSE/networkmanager.in
@@ -10,6 +10,9 @@
 
 sbindir=@sbindir@
 
+DHCDBD_BIN=${sinbidr}/dhcdbd
+test -x $DHCDBD_BIN || exit 5
+
 NETWORKMANAGER_BIN=${sbindir}/NetworkManager
 test -x $NETWORKMANAGER_BIN || exit 5
 
@@ -18,6 +21,12 @@ rc_reset
 
 case "$1" in
 	start)
+		checkproc $DHCDBD_BIN
+		if [ $? != 0 ]; then
+			echo -n "Starting the DHCP DBUS Daemon"
+			startproc $DHCDBD_BIN --system
+			rc_status -v
+		fi
 		checkproc $NETWORKMANAGER_BIN
 		if [ $? = 0 ]; then
 			echo -n "NetworkManager already running"
@@ -32,6 +41,8 @@ case "$1" in
 		echo -n "Shutting down the NetworkManager"
 		killproc -TERM $NETWORKMANAGER_BIN
 		rc_status -v
+		echo -n "Shutting down the DHCP DBUS Daemon"
+		killproc -TERM $DHCDBD_BIN
 		;;
 	restart)
 		$0 stop
@@ -39,6 +50,9 @@ case "$1" in
 		rc_status
 		;;
 	status)
+		echo -n "Checking for the DHCP DBUS Daemon: "
+		checkproc $DHCDBD_BIN
+		rc_status -v
 		echo -n "Checking for the NetworkManager: "
 		checkproc $NETWORKMANAGER_BIN
 		rc_status -v
diff --git a/initscript/Slackware/.cvsignore b/initscript/Slackware/.cvsignore
index 282522db03..8d4d02f151 100644
--- a/initscript/Slackware/.cvsignore
+++ b/initscript/Slackware/.cvsignore
@@ -1,2 +1,4 @@
 Makefile
 Makefile.in
+rc.networkmanager
+rc.networkmanager-dispatcher
diff --git a/initscript/Slackware/Makefile.am b/initscript/Slackware/Makefile.am
index 5c7c4421df..70c508ff5b 100644
--- a/initscript/Slackware/Makefile.am
+++ b/initscript/Slackware/Makefile.am
@@ -1,5 +1,5 @@
-EXTRA_DIST = rc.networkmanager
+EXTRA_DIST = rc.networkmanager rc.networkmanager-dispatcher
 
 initddir = $(sysconfdir)/rc.d
-initd_SCRIPTS = rc.networkmanager
+initd_SCRIPTS = rc.networkmanager rc.networkmanager-dispatcher
 
diff --git a/initscript/Slackware/rc.networkmanager b/initscript/Slackware/rc.networkmanager
deleted file mode 100755
index e00a42efbb..0000000000
--- a/initscript/Slackware/rc.networkmanager
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/sh
-#
-# NetworkManager:   NetworkManager daemon
-#
-# description:  This is a daemon for automatically switching network \
-#               connections to the best available connection. \
-#
-# processname: NetworkManager
-# pidfile: /var/run/NetworkManager.pid
-#
-# We need /sbin/ip
-[ -x /sbin/ip ] || exit 1
-
-processname=NetworkManager
-servicename=NetworkManager
-pidfile=/var/run/NetworkManager.pid
-
-RETVAL=0
-
-start()
-{
-	if [ "`pgrep dbus-daemon`" = "" ]; then
-		echo -n "D-BUS must be running to start NetworkManager"
-		exit 1
-	fi
-	if [ "`pgrep hald`" = "" ]; then
-		echo -n "HAL must be running to start NetworkManager"
-		exit 1
-	fi
- 
-	echo -n $"Starting NetworkManager daemon: "
-	$servicename
-	RETVAL=$?
-	echo
-	[ $RETVAL -eq 0 ] && echo `/sbin/pidof $processname` > $pidfile
-}
-
-stop()
-{
-	echo -n $"Stopping NetworkManager daemon: "
-
-	killall -s TERM $servicename
-	RETVAL=$?
-	echo
-	if [ $RETVAL -eq 0 ]; then
-		rm -f $pidfile
-	fi
-}
-
-# See how we were called.
-case "$1" in
-	start)
-		start
-		;;
-	stop)
-		stop
-		;;
-	restart)
-		stop
-		start
-		;;
-	*)
-		echo $"Usage: $0 {start|stop|restart}"
-		;;
-esac
-exit $RETVAL
diff --git a/initscript/Slackware/rc.networkmanager-dispatcher.in b/initscript/Slackware/rc.networkmanager-dispatcher.in
new file mode 100644
index 0000000000..72e5b4ab6e
--- /dev/null
+++ b/initscript/Slackware/rc.networkmanager-dispatcher.in
@@ -0,0 +1,99 @@
+#!/bin/sh
+#
+# NetworkManagerDispatcher:   NetworkManagerDispatcher daemon
+#
+# description:  This is a daemon for automatically switching network \
+#               connections to the best available connection. \
+#
+# processname: NetworkManagerDispatcher
+# pidfile: /var/run/NetworkManagerDispatcher.pid
+#
+
+prefix=@prefix@
+exec_prefix=@prefix@
+sbindir=@sbindir@
+
+NETWORKMANAGER_BIN=${sbindir}/NetworkManagerDispatcher
+
+# Sanity checks.
+[ -x $NETWORKMANAGER_BIN ] || exit 0
+
+# We need /sbin/ip
+[ -x /sbin/ip ] || exit 0
+
+PIDFILE=/var/run/NetworkManagerDispatcher.pid
+
+nm_start()
+{
+	if [ "`pgrep dbus-daemon`" = "" ]; then
+    echo "D-BUS must be running to start NetworkManagerDispatcher"
+    return
+	fi
+  
+	if [ "`pgrep hald`" = "" ]; then
+	 echo "HAL must be running to start NetworkManagerDispatcher"
+	 return
+	fi
+ 
+  # Just in case the pidfile is still there, we may need to nuke it.
+  if [ -e "$PIDFILE" ]; then
+    rm -f $PIDFILE
+  fi
+
+  echo "Starting NetworkManagerDispatcher daemon:  $NETWORKMANAGER_BIN"
+  $NETWORKMANAGER_BIN
+}
+
+nm_status()
+{
+  local pidlist=`cat $PIDFILE 2>/dev/null`
+  if [ -z "$pidlist" ]; then
+    return 1
+  fi
+  local command=`ps -p $pidlist -o comm=`
+  if [ "$command" != 'NetworkManagerDispatcher' ]; then
+    return 1
+  fi
+}
+
+nm_stop()
+{
+  echo -en "Stopping NetworkManagerDispatcher: "
+  local pidlist=`cat $PIDFILE 2>/dev/null`
+  if [ ! -z "$pidlist" ]; then
+    kill $pidlist &>/dev/null
+    rm -f $PIDFILE &>/dev/null
+	fi
+  echo "stopped";
+}
+
+nm_restart()
+{
+  nm_stop
+  nm_start
+}
+
+case "$1" in
+'start')
+  if ( ! nm_status ); then
+    nm_start
+  else
+    echo "NetworkManagerDispatcher is already running (will not start it twice)."
+  fi
+		;;
+'stop')
+  nm_stop
+		;;
+'restart')
+  nm_restart
+		;;
+'status')
+  if ( nm_status ); then
+    echo "NetworkManagerDispatcher is currently running"
+  else
+    echo "NetworkManagerDispatcher is not running."
+  fi
+		;;
+*)
+  echo "usage $0 start|stop|status|restart"
+esac
diff --git a/initscript/Slackware/rc.networkmanager.in b/initscript/Slackware/rc.networkmanager.in
new file mode 100644
index 0000000000..2d5bab9105
--- /dev/null
+++ b/initscript/Slackware/rc.networkmanager.in
@@ -0,0 +1,99 @@
+#!/bin/sh
+#
+# NetworkManager:   NetworkManager daemon
+#
+# description:  This is a daemon for automatically switching network \
+#               connections to the best available connection. \
+#
+# processname: NetworkManager
+# pidfile: /var/run/NetworkManager.pid
+#
+
+prefix=@prefix@
+exec_prefix=@prefix@
+sbindir=@sbindir@
+
+NETWORKMANAGER_BIN=${sbindir}/NetworkManager
+
+# Sanity checks.
+[ -x $NETWORKMANAGER_BIN ] || exit 0
+
+# We need /sbin/ip
+[ -x /sbin/ip ] || exit 0
+
+PIDFILE=/var/run/NetworkManager.pid
+
+nm_start()
+{
+	if [ "`pgrep dbus-daemon`" = "" ]; then
+    echo "D-BUS must be running to start NetworkManager"
+    return
+	fi
+  
+	if [ "`pgrep hald`" = "" ]; then
+	 echo "HAL must be running to start NetworkManager"
+	 return
+	fi
+ 
+  # Just in case the pidfile is still there, we may need to nuke it.
+  if [ -e "$PIDFILE" ]; then
+    rm -f $PIDFILE
+  fi
+
+  echo "Starting NetworkManager daemon:  $NETWORKMANAGER_BIN"
+  $NETWORKMANAGER_BIN
+}
+
+nm_status()
+{
+  local pidlist=`cat $PIDFILE 2>/dev/null`
+  if [ -z "$pidlist" ]; then
+    return 1
+  fi
+  local command=`ps -p $pidlist -o comm=`
+  if [ "$command" != 'NetworkManager' ]; then
+    return 1
+  fi
+}
+
+nm_stop()
+{
+  echo -en "Stopping NetworkManager: "
+  local pidlist=`cat $PIDFILE 2>/dev/null`
+  if [ ! -z "$pidlist" ]; then
+    kill $pidlist &>/dev/null
+    rm -f $PIDFILE &>/dev/null
+	fi
+  echo "stopped";
+}
+
+nm_restart()
+{
+  nm_stop
+  nm_start
+}
+
+case "$1" in
+'start')
+  if ( ! nm_status ); then
+    nm_start
+  else
+    echo "NetworkManager is already running (will not start it twice)."
+  fi
+		;;
+'stop')
+  nm_stop
+		;;
+'restart')
+  nm_restart
+		;;
+'status')
+  if ( nm_status ); then
+    echo "NetworkManager is currently running"
+  else
+    echo "NetworkManager is not running."
+  fi
+		;;
+*)
+  echo "usage $0 start|stop|status|restart"
+esac
diff --git a/libnm-util/Makefile.am b/libnm-util/Makefile.am
index a97e8a0c9e..8dc994034d 100644
--- a/libnm-util/Makefile.am
+++ b/libnm-util/Makefile.am
@@ -9,7 +9,7 @@ libnm_util_la_CPPFLAGS =				\
 	-DG_DISABLE_DEPRECATED			\
 	-DGDK_DISABLE_DEPRECATED			\
 	-DGNOME_DISABLE_DEPRECATED		\
-	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
+	-DGNOMELOCALEDIR=\"$(datadir)/locale\"
 
 if WITH_GCRYPT
 libnm_util_la_CPPFLAGS += $(LIBGCRYPT_CFLAGS)
@@ -29,8 +29,6 @@ libnm_util_la_SOURCES=			\
 	cipher-wpa-psk-hex.h		\
 	cipher-wpa-psk-passphrase.c	\
 	cipher-wpa-psk-passphrase.h	\
-	gnome-keyring-md5.c			\
-	gnome-keyring-md5.h			\
 	dbus-helpers.c				\
 	dbus-helpers.h				\
 	sha1.c					\
diff --git a/libnm-util/cipher-wep-passphrase.c b/libnm-util/cipher-wep-passphrase.c
index d6ed26bf82..6c6756dcd7 100644
--- a/libnm-util/cipher-wep-passphrase.c
+++ b/libnm-util/cipher-wep-passphrase.c
@@ -19,6 +19,10 @@
  * (C) Copyright 2005 Red Hat, Inc.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <glib.h>
 #include <iwlib.h>
 
diff --git a/libnm-util/dbus-helpers.c b/libnm-util/dbus-helpers.c
index 990c4ea83a..63d0d2dad5 100644
--- a/libnm-util/dbus-helpers.c
+++ b/libnm-util/dbus-helpers.c
@@ -249,6 +249,7 @@ nmu_security_serialize_wpa_psk_with_cipher (DBusMessage *message,
 dbus_bool_t
 nmu_security_serialize_wpa_eap (DBusMessageIter *iter,
 						  int eap_method,
+						  int key_type,
 						  const char *identity,
 						  const char *passwd,
 						  const char *anon_identity,
@@ -258,6 +259,8 @@ nmu_security_serialize_wpa_eap (DBusMessageIter *iter,
 						  const char *ca_cert_file,
 						  int wpa_version)
 {
+	const char *fake_private_key_passwd = "";
+
 	g_return_val_if_fail (iter != NULL, FALSE);
 	g_return_val_if_fail ((wpa_version == IW_AUTH_WPA_VERSION_WPA) || (wpa_version == IW_AUTH_WPA_VERSION_WPA2), FALSE);
 	g_return_val_if_fail ((eap_method == NM_EAP_METHOD_MD5)
@@ -267,32 +270,39 @@ nmu_security_serialize_wpa_eap (DBusMessageIter *iter,
 				    || (eap_method == NM_EAP_METHOD_PEAP)
 				    || (eap_method == NM_EAP_METHOD_TLS)
 				    || (eap_method == NM_EAP_METHOD_TTLS), FALSE);
+	g_return_val_if_fail ((key_type == NM_AUTH_TYPE_WPA_PSK_AUTO)
+				    || (key_type == IW_AUTH_CIPHER_CCMP)
+				    || (key_type == IW_AUTH_CIPHER_TKIP)
+				    || (key_type == IW_AUTH_CIPHER_WEP104), FALSE);
 
 	/* Second arg: EAP method (INT32) */
 	dbus_message_iter_append_basic (iter, DBUS_TYPE_INT32, &eap_method);
 
-	/* Third arg: Identity (STRING) */
+	/* Third arg: Key type (INT32) */
+	dbus_message_iter_append_basic (iter, DBUS_TYPE_INT32, &key_type);
+
+	/* Fourth arg: Identity (STRING) */
 	dbus_message_iter_append_basic (iter, DBUS_TYPE_STRING, &identity);
 
-	/* Fourth arg: Password (STRING) */
+	/* Fifth arg: Password (STRING) */
 	dbus_message_iter_append_basic (iter, DBUS_TYPE_STRING, &passwd);
 
-	/* Fifth arg: Anonymous Identity (STRING) */
+	/* Sixth arg: Anonymous Identity (STRING) */
 	dbus_message_iter_append_basic (iter, DBUS_TYPE_STRING, &anon_identity);
 
-	/* Sixth arg: Private key password (STRING) */
-	dbus_message_iter_append_basic (iter, DBUS_TYPE_STRING, &private_key_passwd);
+	/* Seventh arg: Private key password (STRING) */
+	dbus_message_iter_append_basic (iter, DBUS_TYPE_STRING, private_key_passwd ? &private_key_passwd : &fake_private_key_passwd);
 
-	/* Seventh arg: Private key file (STRING) */
+	/* Eighth arg: Private key file (STRING) */
 	dbus_message_iter_append_basic (iter, DBUS_TYPE_STRING, &private_key_file);
 
-	/* Eighth arg: Client certificate file (STRING) */
+	/* Ninth arg: Client certificate file (STRING) */
 	dbus_message_iter_append_basic (iter, DBUS_TYPE_STRING, &client_cert_file);
 
-	/* Ninth arg: CA certificate file (STRING) */
+	/* Tenth arg: CA certificate file (STRING) */
 	dbus_message_iter_append_basic (iter, DBUS_TYPE_STRING, &ca_cert_file);
 
-	/* Tenth and final arg: WPA version (INT32) */
+	/* Eleventh and final arg: WPA version (INT32) */
 	dbus_message_iter_append_basic (iter, DBUS_TYPE_INT32, &wpa_version);
 
 	return TRUE;
@@ -302,6 +312,7 @@ nmu_security_serialize_wpa_eap (DBusMessageIter *iter,
 dbus_bool_t
 nmu_security_serialize_wpa_eap_with_cipher (DBusMessageIter *iter,
 								    int eap_method,
+								    int key_type,
 								    const char *identity,
 								    const char *passwd,
 								    const char *anon_identity,
@@ -322,11 +333,15 @@ nmu_security_serialize_wpa_eap_with_cipher (DBusMessageIter *iter,
 				    || (eap_method == NM_EAP_METHOD_PEAP)
 				    || (eap_method == NM_EAP_METHOD_TLS)
 				    || (eap_method == NM_EAP_METHOD_TTLS), FALSE);
+	g_return_val_if_fail ((key_type == NM_AUTH_TYPE_WPA_PSK_AUTO)
+				    || (key_type == IW_AUTH_CIPHER_CCMP)
+				    || (key_type == IW_AUTH_CIPHER_TKIP)
+				    || (key_type == IW_AUTH_CIPHER_WEP104), FALSE);
 
 	/* First arg: WE Cipher (INT32) */
 	we_cipher_append_helper (iter, NM_AUTH_TYPE_WPA_EAP);
 
-	result = nmu_security_serialize_wpa_eap (iter, eap_method, identity, passwd, anon_identity, private_key_passwd,
+	result = nmu_security_serialize_wpa_eap (iter, eap_method, key_type, identity, passwd, anon_identity, private_key_passwd,
 									 private_key_file, client_cert_file, ca_cert_file, wpa_version);
 
 	return result;
@@ -338,6 +353,7 @@ nmu_security_serialize_wpa_eap_with_cipher (DBusMessageIter *iter,
 dbus_bool_t
 nmu_security_deserialize_wpa_eap (DBusMessageIter *iter,
 						    int *eap_method,
+						    int *key_type,
 						    char **identity,
 						    char **passwd,
 						    char **anon_identity,
@@ -356,8 +372,11 @@ nmu_security_deserialize_wpa_eap (DBusMessageIter *iter,
 	char *		dbus_ca_cert_file;
 	dbus_int32_t	dbus_wpa_version;
 	dbus_int32_t	dbus_eap_method;
+	dbus_int32_t	dbus_key_type;
 
 	g_return_val_if_fail (iter != NULL, FALSE);
+	g_return_val_if_fail (eap_method != NULL, FALSE);
+	g_return_val_if_fail (key_type != NULL, FALSE);
 	g_return_val_if_fail (identity != NULL, FALSE);
 	g_return_val_if_fail (*identity == NULL, FALSE);
 	g_return_val_if_fail (passwd != NULL, FALSE);
@@ -385,49 +404,58 @@ nmu_security_deserialize_wpa_eap (DBusMessageIter *iter,
 				    || (dbus_eap_method == NM_EAP_METHOD_TLS)
 				    || (dbus_eap_method == NM_EAP_METHOD_TTLS), FALSE);
 
-	/* Third arg: Identity (STRING) */
+	/* Third arg: Key type (INT32) */
+	g_return_val_if_fail (dbus_message_iter_next (iter), FALSE);
+	g_return_val_if_fail (dbus_message_iter_get_arg_type (iter) == DBUS_TYPE_INT32, FALSE);
+	dbus_message_iter_get_basic (iter, &dbus_key_type);
+	g_return_val_if_fail ((dbus_key_type == NM_AUTH_TYPE_WPA_PSK_AUTO)
+				    || (dbus_key_type == IW_AUTH_CIPHER_CCMP)
+				    || (dbus_key_type == IW_AUTH_CIPHER_TKIP)
+				    || (dbus_key_type == IW_AUTH_CIPHER_WEP104), FALSE);
+
+	/* Fourth arg: Identity (STRING) */
 	g_return_val_if_fail (dbus_message_iter_next (iter), FALSE);
 	g_return_val_if_fail (dbus_message_iter_get_arg_type (iter) == DBUS_TYPE_STRING, FALSE);
 	dbus_message_iter_get_basic (iter, &dbus_identity);
 	g_return_val_if_fail (dbus_identity != NULL, FALSE);
 
-	/* Fourth arg: Password (STRING) */
+	/* Fifth arg: Password (STRING) */
 	g_return_val_if_fail (dbus_message_iter_next (iter), FALSE);
 	g_return_val_if_fail (dbus_message_iter_get_arg_type (iter) == DBUS_TYPE_STRING, FALSE);
 	dbus_message_iter_get_basic (iter, &dbus_password);
 	g_return_val_if_fail (dbus_password != NULL, FALSE);
 
-	/* Fifth arg: Anonymous Identity (STRING) */
+	/* Sixth arg: Anonymous Identity (STRING) */
 	g_return_val_if_fail (dbus_message_iter_next (iter), FALSE);
 	g_return_val_if_fail (dbus_message_iter_get_arg_type (iter) == DBUS_TYPE_STRING, FALSE);
 	dbus_message_iter_get_basic (iter, &dbus_anon_identity);
 	g_return_val_if_fail (dbus_anon_identity != NULL, FALSE);
 
-	/* Sixth arg: Private key password (STRING) */
+	/* Seventh arg: Private key password (STRING) */
 	g_return_val_if_fail (dbus_message_iter_next (iter), FALSE);
 	g_return_val_if_fail (dbus_message_iter_get_arg_type (iter) == DBUS_TYPE_STRING, FALSE);
 	dbus_message_iter_get_basic (iter, &dbus_private_key_passwd);
 	g_return_val_if_fail (dbus_private_key_passwd != NULL, FALSE);
 
-	/* Seventh arg: Private key file (STRING) */
+	/* Eighth arg: Private key file (STRING) */
 	g_return_val_if_fail (dbus_message_iter_next (iter), FALSE);
 	g_return_val_if_fail (dbus_message_iter_get_arg_type (iter) == DBUS_TYPE_STRING, FALSE);
 	dbus_message_iter_get_basic (iter, &dbus_private_key_file);
 	g_return_val_if_fail (dbus_private_key_file != NULL, FALSE);
 
-	/* Eighth arg: Client certificate file (STRING) */
+	/* Ninth arg: Client certificate file (STRING) */
 	g_return_val_if_fail (dbus_message_iter_next (iter), FALSE);
 	g_return_val_if_fail (dbus_message_iter_get_arg_type (iter) == DBUS_TYPE_STRING, FALSE);
 	dbus_message_iter_get_basic (iter, &dbus_client_cert_file);
 	g_return_val_if_fail (dbus_client_cert_file != NULL, FALSE);
 
-	/* Ninth arg: CA certificate file (STRING) */
+	/* Tenth arg: CA certificate file (STRING) */
 	g_return_val_if_fail (dbus_message_iter_next (iter), FALSE);
 	g_return_val_if_fail (dbus_message_iter_get_arg_type (iter) == DBUS_TYPE_STRING, FALSE);
 	dbus_message_iter_get_basic (iter, &dbus_ca_cert_file);
 	g_return_val_if_fail (dbus_ca_cert_file != NULL, FALSE);
 
-	/* Tenth and final arg: WPA version (INT32) */
+	/* Eleventh and final arg: WPA version (INT32) */
 	g_return_val_if_fail (dbus_message_iter_next (iter), FALSE);
 	g_return_val_if_fail (dbus_message_iter_get_arg_type (iter) == DBUS_TYPE_INT32, FALSE);
 	dbus_message_iter_get_basic (iter, &dbus_wpa_version);
@@ -435,6 +463,7 @@ nmu_security_deserialize_wpa_eap (DBusMessageIter *iter,
 			|| (dbus_wpa_version == IW_AUTH_WPA_VERSION_WPA2), FALSE);
 
 	*eap_method = dbus_eap_method;
+	*key_type = dbus_key_type;
 	*identity = strlen (dbus_identity) > 0 ? dbus_identity : NULL;
 	*passwd = strlen (dbus_password) > 0 ? dbus_password : NULL;
 	*anon_identity = strlen (dbus_anon_identity) > 0 ? dbus_anon_identity : NULL;
diff --git a/libnm-util/dbus-helpers.h b/libnm-util/dbus-helpers.h
index 713f425eb0..8bc56c6b17 100644
--- a/libnm-util/dbus-helpers.h
+++ b/libnm-util/dbus-helpers.h
@@ -67,6 +67,7 @@ dbus_bool_t	nmu_security_serialize_wpa_psk_with_cipher (DBusMessage *message,
 
 dbus_bool_t	nmu_security_serialize_wpa_eap (DBusMessageIter *iter,
 								int eap_method,
+								int key_type,
 								const char *identity,
 								const char *passwd,
 								const char *anon_identity,
@@ -78,6 +79,7 @@ dbus_bool_t	nmu_security_serialize_wpa_eap (DBusMessageIter *iter,
 
 dbus_bool_t	nmu_security_serialize_wpa_eap_with_cipher (DBusMessageIter *iter,
 								int eap_method,
+								int key_type,
 								const char *identity,
 								const char *passwd,
 								const char *anon_identity,
@@ -89,6 +91,7 @@ dbus_bool_t	nmu_security_serialize_wpa_eap_with_cipher (DBusMessageIter *iter,
 
 dbus_bool_t	nmu_security_deserialize_wpa_eap (DBusMessageIter *iter,
 								int *eap_method,
+								int *key_type,
 								char **identity,
 								char **passwd,
 								char **anon_identity,
diff --git a/po/ChangeLog b/po/ChangeLog
index c86a5dcfb1..8f130abbdd 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,19 @@
+2006-06-02  Robert Love  <rml@novell.com>
+
+	* hu.po: Update.
+
+2006-05-30  Robert Love  <rml@novell.com>
+
+	* no.po: Remove.  We have nb.po.
+
+2006-05-29  Stanislav Brabec  <sbrabec@suse.cz>
+
+	* *.po: Updated translations from HEAD branch.
+
+2006-05-18  Robert Love  <rml@novell.com>
+
+	* hu.po: Update.
+
 2006-03-02  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* POTFILES.in: Add two missing files.
diff --git a/po/bg.po b/po/bg.po
index fcc73fb057..44a98d5735 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-15 08:01+0200\n"
+"POT-Creation-Date: 2006-05-29 18:33+0200\n"
 "PO-Revision-Date: 2005-12-15 08:01+0200\n"
 "Last-Translator: Alexander Shopov <ash@contact.bg>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -16,23 +16,23 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#. Setup a request to the keyring to save the network passphrase
-#: ../gnome/applet/applet-dbus-info.c:923
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:919
 #, c-format
 msgid "Passphrase for wireless network %s"
 msgstr "Парола за безжичната мрежа %s"
 
-#: ../gnome/applet/applet-dbus.c:302
+#: ../gnome/applet/applet-dbus.c:265
 #, c-format
 msgid "Connection to the wireless network '%s' failed."
 msgstr "�еу�пешно �вързване към безжичната мрежа „%s“."
 
-#: ../gnome/applet/applet-dbus.c:307
+#: ../gnome/applet/applet-dbus.c:270
 msgid "Connection to the wired network failed."
 msgstr "�еу�пешно �вързване към кабелната мрежа."
 
-#: ../gnome/applet/applet.c:183
-msgid "Error displaying connection information: "
+#: ../gnome/applet/applet.c:184
+#, fuzzy
+msgid "Error displaying connection information:"
 msgstr "Грешка при показване на информаци�та за връзката:"
 
 #: ../gnome/applet/applet.c:202
@@ -43,32 +43,32 @@ msgstr "Ð�Ñ�кои реÑ�урÑ�и не бÑ�ха открити (файлът нÐ
 msgid "No active connections!"
 msgstr "��ма дей�тващи връзки!"
 
-#: ../gnome/applet/applet.c:228
+#: ../gnome/applet/applet.c:234
 #, c-format
 msgid "Wired Ethernet (%s)"
 msgstr "Кабелен Етернет (%s)"
 
-#: ../gnome/applet/applet.c:230
+#: ../gnome/applet/applet.c:236
 #, c-format
 msgid "Wireless Ethernet (%s)"
 msgstr "Безжичен Етернет (%s)"
 
-#: ../gnome/applet/applet.c:323 ../gnome/applet/applet.c:348
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:362
 msgid "NetworkManager Applet"
 msgstr "�плетът NetworkManager"
 
-#: ../gnome/applet/applet.c:325 ../gnome/applet/applet.c:350
+#: ../gnome/applet/applet.c:339 ../gnome/applet/applet.c:364
 msgid "Copyright © 2004-2005 Red Hat, Inc."
 msgstr "�втор�ки права © 2004-2005 Red Hat, Inc."
 
-#: ../gnome/applet/applet.c:326 ../gnome/applet/applet.c:351
+#: ../gnome/applet/applet.c:340 ../gnome/applet/applet.c:365
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "�плет за обла�тта за уведом�ване за управление на мрежовите у�трой�тва и "
 "връзки."
 
-#: ../gnome/applet/applet.c:329 ../gnome/applet/applet.c:356
+#: ../gnome/applet/applet.c:343 ../gnome/applet/applet.c:370
 msgid "translator-credits"
 msgstr ""
 "�лек�андър Шопов <ash@contact.bg>\n"
@@ -77,26 +77,22 @@ msgstr ""
 "�аучете повече за на� на http://gnome.cult.bg\n"
 "Докладвайте за грешки на http://gnome.cult.bg/bugs<"
 
-#: ../gnome/applet/applet.c:441
-msgid "VPN Error"
-msgstr "Грешка на ВЧМ"
-
-#: ../gnome/applet/applet.c:445
+#: ../gnome/applet/applet.c:426
 msgid "VPN Login Failure"
 msgstr "Грешка при идентификаци� пред ВЧМ"
 
-#: ../gnome/applet/applet.c:446
+#: ../gnome/applet/applet.c:427
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a login failure."
 msgstr ""
 "�еу�пех при о�ъще�тв�ването на връзката към ВЧМ „%s“ поради грешка в "
 "идентификаци�та."
 
-#: ../gnome/applet/applet.c:450
+#: ../gnome/applet/applet.c:431
 msgid "VPN Start Failure"
 msgstr "Грешка при �тартиране на ВЧМ"
 
-#: ../gnome/applet/applet.c:451
+#: ../gnome/applet/applet.c:432
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
@@ -105,25 +101,25 @@ msgstr ""
 "Връзката към ВЧМ „%s“ �е провали поради грешка при �тартиране на програмата "
 "за ВЧМ."
 
-#: ../gnome/applet/applet.c:455 ../gnome/applet/applet.c:465
+#: ../gnome/applet/applet.c:436 ../gnome/applet/applet.c:446
 msgid "VPN Connect Failure"
 msgstr "Грешка при �вързване към ВЧМ"
 
-#: ../gnome/applet/applet.c:456
+#: ../gnome/applet/applet.c:437
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a connection error."
 msgstr "Връзката към ВЧМ „%s“ �е провали поради грешка при �вързването."
 
-#: ../gnome/applet/applet.c:460
+#: ../gnome/applet/applet.c:441
 msgid "VPN Configuration Error"
 msgstr "Грешка в на�тройките на ВЧМ"
 
-#: ../gnome/applet/applet.c:461
+#: ../gnome/applet/applet.c:442
 #, c-format
 msgid "The VPN connection '%s' was not correctly configured."
 msgstr "Връзката към ВЧМ „%s“ е � неправилни на�тройки."
 
-#: ../gnome/applet/applet.c:466
+#: ../gnome/applet/applet.c:447
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' because the VPN server did not "
@@ -132,23 +128,13 @@ msgstr ""
 "Връзката към ВЧМ „%s“ �е провали, защото на�тройките на мрежата върнати от "
 "�ървъра за ВЧМ б�ха неправилни."
 
-#: ../gnome/applet/applet.c:474
-#, c-format
-msgid "The VPN service said: \"%s\""
-msgstr "Отговорът от у�лугата за ВЧМ е „%s“"
-
-#: ../gnome/applet/applet.c:543
-#, c-format
-msgid "VPN connection '%s' said:"
-msgstr "Отговорът от връзката към ВЧМ е „%s“"
-
-#: ../gnome/applet/applet.c:545
+#: ../gnome/applet/applet.c:517
 msgid "VPN Login Message"
 msgstr "Съобщение при идентификаци� пред ВЧМ"
 
-#: ../gnome/applet/applet.c:763 ../gnome/applet/applet.c:2367
-#: ../gnome/applet/other-network-dialog.c:379
-#: ../gnome/applet/passphrase-dialog.c:372
+#: ../gnome/applet/applet.c:741 ../gnome/applet/applet.c:2508
+#: ../gnome/applet/other-network-dialog.c:453
+#: ../gnome/applet/passphrase-dialog.c:228
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
@@ -156,148 +142,164 @@ msgstr ""
 "�плетът NetworkManager не можа да открие н�кои задължителни ре�ур�и (файлът "
 "на glade)."
 
-#: ../gnome/applet/applet.c:775
+#: ../gnome/applet/applet.c:753
 #, c-format
 msgid "The network device \"%s (%s)\" does not support wireless scanning."
 msgstr "Мрежовото у�трой�тво „%s (%s)“ не поддържа безжично претър�ване."
 
-#: ../gnome/applet/applet.c:783
+#: ../gnome/applet/applet.c:761
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
 msgstr "Мрежовото у�трой�тво „%s (%s)“ не поддържа за�ичане на връзка."
 
-#: ../gnome/applet/applet.c:928
+#: ../gnome/applet/applet.c:908
 #, c-format
 msgid "Preparing device %s for the wired network..."
 msgstr "Подготв�не на у�трой�твото „%s“ за кабелната мрежа..."
 
-#: ../gnome/applet/applet.c:930
+#: ../gnome/applet/applet.c:910
 #, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
 msgstr "Подготв�не на у�трой�твото „%s“ за безжичната мрежа „%s“..."
 
-#: ../gnome/applet/applet.c:938
+#: ../gnome/applet/applet.c:918
 #, c-format
 msgid "Configuring device %s for the wired network..."
 msgstr "�а�тройване на у�трой�твото „%s“ за кабелната мрежа..."
 
-#: ../gnome/applet/applet.c:940
+#: ../gnome/applet/applet.c:920
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
 msgstr "Опит за �вързване към безжичната мрежа „%s“..."
 
-#: ../gnome/applet/applet.c:948
+#: ../gnome/applet/applet.c:928
 #, c-format
 msgid "Waiting for Network Key for the wireless network '%s'..."
 msgstr "Изчакване за мрежови� ключ за безжичната мрежа „%s“..."
 
-#: ../gnome/applet/applet.c:956 ../gnome/applet/applet.c:966
+#: ../gnome/applet/applet.c:936 ../gnome/applet/applet.c:946
 msgid "Requesting a network address from the wired network..."
 msgstr "Запитване на кабелната мрежа за адре�..."
 
-#: ../gnome/applet/applet.c:958 ../gnome/applet/applet.c:968
+#: ../gnome/applet/applet.c:938 ../gnome/applet/applet.c:948
 #, c-format
 msgid "Requesting a network address from the wireless network '%s'..."
 msgstr "Запитване на безжичната мрежа „%s“ за адре�..."
 
-#: ../gnome/applet/applet.c:976
+#: ../gnome/applet/applet.c:956
 msgid "Finishing connection to the wired network..."
 msgstr "Завършване на връзката към кабелната мрежа..."
 
-#: ../gnome/applet/applet.c:978
+#: ../gnome/applet/applet.c:958
 #, c-format
 msgid "Finishing connection to the wireless network '%s'..."
 msgstr "Завършване на връзката към безжичната мрежа „%s“..."
 
-#: ../gnome/applet/applet.c:1094
+#: ../gnome/applet/applet.c:1075
 msgid "NetworkManager is not running"
 msgstr "NetworkManager не е включен"
 
-#: ../gnome/applet/applet.c:1106
+#: ../gnome/applet/applet.c:1083 ../gnome/applet/applet.c:1828
+#, fuzzy
+msgid "Networking disabled"
+msgstr "_Име на мрежа:"
+
+#: ../gnome/applet/applet.c:1088
 msgid "No network connection"
 msgstr "��ма връзка към мрежа"
 
-#: ../gnome/applet/applet.c:1111
+#: ../gnome/applet/applet.c:1093
 msgid "Wired network connection"
 msgstr "Връзка към кабелна мрежа"
 
-#: ../gnome/applet/applet.c:1115
+#: ../gnome/applet/applet.c:1097
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Връзка към инцидентна, безжична мрежа"
 
-#: ../gnome/applet/applet.c:1117
+#: ../gnome/applet/applet.c:1099
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "Безжична връзка към „%s“ (%d%%)"
 
-#: ../gnome/applet/applet.c:1139
+#: ../gnome/applet/applet.c:1120
 #, c-format
 msgid "VPN connection to '%s'"
 msgstr "Връзка по ВЧМ към „%s“"
 
-#: ../gnome/applet/applet.c:1147
+#: ../gnome/applet/applet.c:1128
 #, c-format
 msgid "VPN connecting to '%s'"
 msgstr "Свързване по ВЧМ към „%s“"
 
-#: ../gnome/applet/applet.c:1537
+#: ../gnome/applet/applet.c:1541
 msgid "_Connect to Other Wireless Network..."
 msgstr "_Свързване към други безжични мрежи..."
 
-#: ../gnome/applet/applet.c:1558
+#: ../gnome/applet/applet.c:1562
 msgid "Create _New Wireless Network..."
 msgstr "Създаване на _нова безжична мрежа..."
 
-#: ../gnome/applet/applet.c:1671
+#: ../gnome/applet/applet.c:1685
 msgid "_VPN Connections"
 msgstr "_Връзки по ВЧМ"
 
-#: ../gnome/applet/applet.c:1703
+#: ../gnome/applet/applet.c:1730
 msgid "_Configure VPN..."
 msgstr "_�а�тройване на ВЧМ..."
 
-#: ../gnome/applet/applet.c:1707
+#: ../gnome/applet/applet.c:1734
 msgid "_Disconnect VPN..."
 msgstr "_Прекъ�ване на ВЧМ..."
 
-#: ../gnome/applet/applet.c:1729
+#: ../gnome/applet/applet.c:1756
 msgid "_Dial Up Connections"
 msgstr "_Връзки по телефонна лини�"
 
-#: ../gnome/applet/applet.c:1738
+#. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
+#: ../gnome/applet/applet.c:1767
 #, c-format
 msgid "Connect to %s..."
 msgstr "Свързване към %s..."
 
-#: ../gnome/applet/applet.c:1788
+#: ../gnome/applet/applet.c:1773
+#, fuzzy, c-format
+msgid "Disconnect from %s..."
+msgstr "Свързване към %s..."
+
+#: ../gnome/applet/applet.c:1822
 msgid "No network devices have been found"
 msgstr "�е �а открити мрежови у�трой�тва"
 
-#: ../gnome/applet/applet.c:1962
+#: ../gnome/applet/applet.c:2014
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager не е включен..."
 
+#. 'Enable Networking' item
+#: ../gnome/applet/applet.c:2170
+msgid "Enable _Networking"
+msgstr ""
+
 #. 'Enable Wireless' item
-#: ../gnome/applet/applet.c:2087
+#: ../gnome/applet/applet.c:2176
 msgid "Enable _Wireless"
 msgstr "Включване на _безжичната мрежа"
 
 #. 'Connection Information' item
-#: ../gnome/applet/applet.c:2093
+#: ../gnome/applet/applet.c:2182
 msgid "Connection _Information"
 msgstr "_Информаци� за връзката"
 
 #. Help item
-#: ../gnome/applet/applet.c:2103
+#: ../gnome/applet/applet.c:2193
 msgid "_Help"
 msgstr "_Помощ"
 
 #. About item
-#: ../gnome/applet/applet.c:2111
+#: ../gnome/applet/applet.c:2202
 msgid "_About"
 msgstr "_Отно�но"
 
-#: ../gnome/applet/applet.c:2503
+#: ../gnome/applet/applet.c:2667
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
@@ -305,99 +307,177 @@ msgstr ""
 "�плетът NetworkManager не може да открие необходим ре�ур�. Програмата не "
 "може да продължи работа.\n"
 
-#: ../gnome/applet/eggtrayicon.c:127
+#: ../gnome/applet/wireless-security-option.c:157
+#, fuzzy
+msgid "Open System"
+msgstr ""
+"Открита �и�тема\n"
+"Споделен ключ"
+
+#: ../gnome/applet/wireless-security-option.c:160
+#, fuzzy
+msgid "Shared Key"
+msgstr ""
+"Открита �и�тема\n"
+"Споделен ключ"
+
+#: ../gnome/applet/wireless-security-option.c:208
+msgid "Automatic (Default)"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:215
+msgid "AES-CCMP"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:223
+msgid "TKIP"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:231
+msgid "Dynamic WEP"
+msgstr ""
+
+#: ../gnome/applet/wso-none.c:53
+msgid "None"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-ascii.c:138
+msgid "WEP 64/128-bit ASCII"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-hex.c:135
+msgid "WEP 64/128-bit Hex"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-passphrase.c:135
+#, fuzzy
+msgid "WEP 128-bit Passphrase"
+msgstr "Парола:"
+
+#: ../gnome/applet/wso-wpa-eap.c:237
+msgid "PEAP"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:238
+msgid "TLS"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:239
+msgid "TTLS"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
+#: ../src/nm-ap-security-wpa-eap.c:116
+msgid "WPA2 Enterprise"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
+#: ../src/nm-ap-security-wpa-eap.c:121
+msgid "WPA Enterprise"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-psk.c:178
+msgid "WPA2 Personal"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-psk.c:180
+msgid "WPA Personal"
+msgstr ""
+
+#: ../gnome/applet/eggtrayicon.c:134
 msgid "Orientation"
 msgstr "Ориентаци�"
 
-#: ../gnome/applet/eggtrayicon.c:128
+#: ../gnome/applet/eggtrayicon.c:135
 msgid "The orientation of the tray."
 msgstr "Ориентаци�та на тавата"
 
-#: ../gnome/applet/menu-items.c:87
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Кабелна мрежа (%s)"
 
-#: ../gnome/applet/menu-items.c:90
+#: ../gnome/applet/menu-items.c:91
 msgid "_Wired Network"
 msgstr "_Кабелна мрежа"
 
-#: ../gnome/applet/menu-items.c:161
+#: ../gnome/applet/menu-items.c:162
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
 msgstr[0] "Безжична мрежа (%s)"
 msgstr[1] "Безжични мрежи (%s)"
 
-#: ../gnome/applet/menu-items.c:163
+#: ../gnome/applet/menu-items.c:164
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Безжична мрежа"
 msgstr[1] "Безжични мрежи"
 
-#: ../gnome/applet/menu-items.c:303
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr " (невалиден Уникод)"
 
-#: ../gnome/applet/other-network-dialog.c:248
-#, c-format
+#: ../gnome/applet/other-network-dialog.c:352
+#, fuzzy, c-format
 msgid ""
-"By default, the ESSID is set to your computer's name, %s, with no encryption "
-"enabled"
+"By default, the wireless network's name is set to your computer's name, %s, "
+"with no encryption enabled"
 msgstr ""
 "По подразбиране идентификаторът ESSID е името на компютъра Ви, %s, без "
 "шифриране"
 
-#: ../gnome/applet/other-network-dialog.c:252
+#: ../gnome/applet/other-network-dialog.c:358
 msgid "Create new wireless network"
 msgstr "Създаване на нова безжична мрежа"
 
-#: ../gnome/applet/other-network-dialog.c:253
+#: ../gnome/applet/other-network-dialog.c:359
+#, fuzzy
 msgid ""
-"Enter the ESSID and security settings of the wireless network you wish to "
+"Enter the name and security settings of the wireless network you wish to "
 "create."
 msgstr ""
 "Въведете идентификатора ESSID и на�тройките на �игурно�тта на безжичната "
 "мрежа, ко�то и�кате да �ъздадете."
 
-#: ../gnome/applet/other-network-dialog.c:257
+#: ../gnome/applet/other-network-dialog.c:363
 msgid "Create New Wireless Network"
 msgstr "Създаване на нова безжична мрежа"
 
-#: ../gnome/applet/other-network-dialog.c:262
-msgid "Custom wireless network"
+#: ../gnome/applet/other-network-dialog.c:368
+#, fuzzy
+msgid "Existing wireless network"
 msgstr "Потребител�ка безжична мрежа"
 
-#: ../gnome/applet/other-network-dialog.c:263
-msgid "Enter the ESSID of the wireless network to which you wish to connect."
+#: ../gnome/applet/other-network-dialog.c:369
+#, fuzzy
+msgid "Enter the name of the wireless network to which you wish to connect."
 msgstr ""
 "Въведете идентификатора ESSID на безжичната мрежа, към ко�то и�кате да �е "
 "�вържете."
 
-#: ../gnome/applet/other-network-dialog.c:265
+#: ../gnome/applet/other-network-dialog.c:371
 msgid "Connect to Other Wireless Network"
 msgstr "Свързване към друга безжична мрежа"
 
-#: ../gnome/applet/passphrase-dialog.c:159
-#: ../gnome/applet/applet.glade.h:33
-msgid "Passphrase:"
-msgstr "Парола:"
-
-#: ../gnome/applet/passphrase-dialog.c:162
-msgid "ASCII Key:"
-msgstr "Ключ в ASCII:"
+#: ../gnome/applet/passphrase-dialog.c:215
+#, fuzzy
+msgid "Error connecting to wireless network"
+msgstr "Свързване към друга безжична мрежа"
 
-#: ../gnome/applet/passphrase-dialog.c:165
-msgid "Hex Key:"
-msgstr "Ше�тнай�етичен ключ:"
+#: ../gnome/applet/passphrase-dialog.c:216
+msgid ""
+"The requested wireless network requires security capabilities unsupported by "
+"your hardware."
+msgstr ""
 
-#: ../gnome/applet/vpn-password-dialog.c:152
-#: ../gnome/applet/vpn-password-dialog.c:189
+#: ../gnome/applet/vpn-password-dialog.c:151
+#: ../gnome/applet/vpn-password-dialog.c:188
 #, c-format
 msgid "Cannot start VPN connection '%s'"
 msgstr "Връзката към ВЧМ „%s“ не може да бъде �тартирана"
 
-#: ../gnome/applet/vpn-password-dialog.c:155
+#: ../gnome/applet/vpn-password-dialog.c:154
 #, c-format
 msgid ""
 "Could not find the authentication dialog for VPN connection type '%s'. "
@@ -406,7 +486,7 @@ msgstr ""
 "Диалоговата кути� за идентификаци� пред ВЧМ „%s“ не може да бъде открита. "
 "Свържете �е �ъ� �и�темни� админи�тратор."
 
-#: ../gnome/applet/vpn-password-dialog.c:192
+#: ../gnome/applet/vpn-password-dialog.c:191
 #, c-format
 msgid ""
 "There was a problem launching the authentication dialog for VPN connection "
@@ -470,58 +550,88 @@ msgstr ""
 "NetworkManager н�ма да Ви и�ка потвърждени� при �ледващи влизани�."
 
 #: ../gnome/applet/applet.glade.h:15
+msgid "Anonymous Identity:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:16
 msgid "Authentication:"
 msgstr "Идентификаци�:"
 
-#: ../gnome/applet/applet.glade.h:16
+#: ../gnome/applet/applet.glade.h:17
 msgid "Broadcast Address:"
 msgstr "�дре� за разпръ�кване:"
 
-#: ../gnome/applet/applet.glade.h:17
+#: ../gnome/applet/applet.glade.h:18
+msgid "CA Certificate File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:19
 msgid "C_onnect"
 msgstr "_Свързване"
 
-#: ../gnome/applet/applet.glade.h:18
+#: ../gnome/applet/applet.glade.h:20
+msgid "Client Certificate File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:21
 msgid "Connection Information"
 msgstr "Информаци� за връзката"
 
-#: ../gnome/applet/applet.glade.h:19
+#: ../gnome/applet/applet.glade.h:22
 msgid "Default Route:"
 msgstr "Маршрут по подразбиране:"
 
-#: ../gnome/applet/applet.glade.h:20
+#: ../gnome/applet/applet.glade.h:23
 msgid "Destination Address:"
 msgstr "Целеви адре�:"
 
-#: ../gnome/applet/applet.glade.h:21
+#: ../gnome/applet/applet.glade.h:24
+msgid "Driver:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:25
+msgid "EAP Method:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:26
 msgid "Hardware Address:"
 msgstr "Хардуерен адре�:"
 
-#: ../gnome/applet/applet.glade.h:22
+#: ../gnome/applet/applet.glade.h:27
 msgid "IP Address:"
 msgstr "IP адре�:"
 
-#: ../gnome/applet/applet.glade.h:23
+#: ../gnome/applet/applet.glade.h:28
+msgid "Identity:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:29
 msgid "Interface:"
 msgstr "Интерфей�:"
 
-#: ../gnome/applet/applet.glade.h:24
+#: ../gnome/applet/applet.glade.h:30
+#, fuzzy
+msgid "Key Type:"
+msgstr "Ключ:"
+
+#: ../gnome/applet/applet.glade.h:31
 msgid "Key:"
 msgstr "Ключ:"
 
-#: ../gnome/applet/applet.glade.h:25
+#: ../gnome/applet/applet.glade.h:32
+#, fuzzy
 msgid ""
 "None\n"
-"WEP Passphrase\n"
-"WEP 40/128-bit hex\n"
-"WEP 40/128-bit ASCII\n"
+"WEP 128-bit Passphrase\n"
+"WEP 64/128-bit Hex\n"
+"WEP 64/128-bit ASCII\n"
 msgstr ""
 "��ма\n"
 "Парола WEP\n"
 "40/128-битов ше�тнай�етичен ключ за WEP\n"
 "40/128-битов ключ за WEP в ASCII\n"
 
-#: ../gnome/applet/applet.glade.h:30
+#: ../gnome/applet/applet.glade.h:37
 msgid ""
 "Open System\n"
 "Shared Key"
@@ -529,90 +639,125 @@ msgstr ""
 "Открита �и�тема\n"
 "Споделен ключ"
 
-#: ../gnome/applet/applet.glade.h:32
+#: ../gnome/applet/applet.glade.h:39
 msgid "Other Wireless Network..."
 msgstr "Друга безжична мрежа..."
 
-#: ../gnome/applet/applet.glade.h:34
+#: ../gnome/applet/applet.glade.h:40
+msgid "Passphrase:"
+msgstr "Парола:"
+
+#: ../gnome/applet/applet.glade.h:41
 msgid "Password:"
 msgstr "Парола:"
 
-#: ../gnome/applet/applet.glade.h:35
+#: ../gnome/applet/applet.glade.h:42
 msgid "Primary DNS:"
 msgstr "О�новен �ървър за DNS:"
 
-#: ../gnome/applet/applet.glade.h:36
+#: ../gnome/applet/applet.glade.h:43
+msgid "Private Key File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:44
+msgid "Private Key Password:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:45
 msgid "Secondary DNS:"
 msgstr "Допълнителен �ървър за DNS:"
 
-#: ../gnome/applet/applet.glade.h:37
+#: ../gnome/applet/applet.glade.h:46
+msgid "Select the CA Certificate File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:47
+msgid "Select the Client Certificate File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:48
+msgid "Select the Private Key File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:49
+msgid "Show key"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:50
+#, fuzzy
+msgid "Show passphrase"
+msgstr "Парола:"
+
+#: ../gnome/applet/applet.glade.h:51
+#, fuzzy
+msgid "Show password"
+msgstr "Парола:"
+
+#: ../gnome/applet/applet.glade.h:52
+#, fuzzy
+msgid "Show passwords"
+msgstr "Парола:"
+
+#: ../gnome/applet/applet.glade.h:53
+msgid "Speed:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:54
 msgid "Subnet Mask:"
 msgstr "Ма�ка на подмрежата:"
 
-#: ../gnome/applet/applet.glade.h:38
+#: ../gnome/applet/applet.glade.h:55
+msgid "Type:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:56
 msgid "User Name:"
 msgstr "Потребител�ко име:"
 
-#: ../gnome/applet/applet.glade.h:39
+#: ../gnome/applet/applet.glade.h:57
 msgid "Wireless Network Key Required"
 msgstr "�еобходим е ключ за безжична мрежа"
 
-#: ../gnome/applet/applet.glade.h:40
+#: ../gnome/applet/applet.glade.h:58
 msgid "Wireless _adapter:"
 msgstr "Безжичен _адаптер:"
 
-#: ../gnome/applet/applet.glade.h:41
+#: ../gnome/applet/applet.glade.h:59
 msgid "_Always Trust this Wireless Network"
 msgstr "_По�то�нно доверие на тази безжична мрежа"
 
-#: ../gnome/applet/applet.glade.h:42
+#: ../gnome/applet/applet.glade.h:60
 msgid "_Don't remind me again"
 msgstr "_Да н�ма нови напомн�ни�"
 
-#: ../gnome/applet/applet.glade.h:43
+#: ../gnome/applet/applet.glade.h:61
 msgid "_Login to Network"
 msgstr "_Свързване към мрежа"
 
-#: ../gnome/applet/applet.glade.h:44
+#: ../gnome/applet/applet.glade.h:62
 msgid "_Network Name:"
 msgstr "_Име на мрежа:"
 
-#: ../gnome/applet/applet.glade.h:45
+#: ../gnome/applet/applet.glade.h:63
 msgid "_Wireless Security:"
 msgstr "_Безжична �игурно�т:"
 
-#: ../gnome/applet/applet.glade.h:46
-msgid "leap_subwindow"
-msgstr "прозорец_за_име_и_парола"
-
-#: ../gnome/applet/applet.glade.h:47
-msgid "wep_key_subwindow"
-msgstr "прозорец_за_ключа_за_wep"
-
-#: ../gnome/applet/applet.glade.h:48
-msgid "wep_passphrase_subwindow"
-msgstr "прозорец_за_парола_за_wep"
-
-#: ../gnome/applet/applet.glade.h:49
-msgid "wpa_psk_subwindow"
-msgstr "прозорец_за_ключ"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.c:370
+#: ../gnome/vpn-properties/nm-vpn-properties.c:383
 msgid "Cannot add VPN connection"
 msgstr "�е може да �е добави връзка към ВЧМ"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:372
+#: ../gnome/vpn-properties/nm-vpn-properties.c:385
 msgid ""
 "No suitable VPN software was found on your system. Contact your system "
 "administrator."
 msgstr ""
 "�е е открит подход�щ �офтуер за ВЧМ. Свържете �е �ъ� �и�темни� админи�тратор."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:424
+#: ../gnome/vpn-properties/nm-vpn-properties.c:437
 msgid "Cannot import VPN connection"
 msgstr "Връзката към ВЧМ не може да �е вне�е"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:426
+#: ../gnome/vpn-properties/nm-vpn-properties.c:439
 #, c-format
 msgid ""
 "Cannot find suitable software for VPN connection type '%s' to import the "
@@ -622,12 +767,12 @@ msgstr ""
 "�офтуер за връзка към ВЧМ от вида „%1$s“. Свържете �е �ъ� �и�темни� "
 "админи�тратор."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:566
+#: ../gnome/vpn-properties/nm-vpn-properties.c:579
 #, c-format
 msgid "Error retrieving VPN connection '%s'"
 msgstr "Грешка при получаване на информаци� за връзката към ВЧМ „%s“"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:569
+#: ../gnome/vpn-properties/nm-vpn-properties.c:582
 #, c-format
 msgid ""
 "Could not find the UI files for VPN connection type '%s'. Contact your "
@@ -636,12 +781,12 @@ msgstr ""
 "Файловете � опи�ание на графични� интерфей� за връзки към ВЧМ от вида „%s“ "
 "не могат да бъдат открити. Свържете �е �ъ� �и�темни� админи�тратор."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:729
+#: ../gnome/vpn-properties/nm-vpn-properties.c:739
 #, c-format
 msgid "Delete VPN connection \"%s\"?"
 msgstr "Да �е изтрие ли връзката към ВЧМ „%s“?"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:732
+#: ../gnome/vpn-properties/nm-vpn-properties.c:742
 #, c-format
 msgid ""
 "All information about the VPN connection \"%s\" will be lost and you may "
@@ -652,16 +797,16 @@ msgstr ""
 "наложи да � и�кате наново от �и�темни� админи�тратор, ако и�кате да � "
 "�ъздадете наново."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:938
+#: ../gnome/vpn-properties/nm-vpn-properties.c:959
 msgid "Unable to load"
 msgstr "�еу�пех при зареждане"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:940
+#: ../gnome/vpn-properties/nm-vpn-properties.c:961
 msgid "Cannot find some needed resources (the glade file)!"
 msgstr "��кои ре�ур�и не б�ха открити (файлът на glade)!"
 
 #. Edit dialog
-#: ../gnome/vpn-properties/nm-vpn-properties.c:1058
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
 msgid "Edit VPN Connection"
 msgstr "Редактиране на връзка към ВЧМ"
 
@@ -735,6 +880,42 @@ msgstr ""
 msgid "VPN Connections"
 msgstr "Връзки към ВЧМ"
 
+#: ../src/nm-ap-security-wep.c:52
+msgid "40-bit WEP"
+msgstr ""
+
+#: ../src/nm-ap-security-wep.c:54
+msgid "104-bit WEP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:50
+msgid "WPA TKIP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:52
+msgid "WPA CCMP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:54
+msgid "WPA Automatic"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:59
+msgid "WPA2 TKIP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:61
+msgid "WPA2 CCMP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:63
+msgid "WPA2 Automatic"
+msgstr ""
+
+#: ../src/nm-ap-security.c:320
+msgid "none"
+msgstr ""
+
 #: ../src/nm-netlink-monitor.c:154
 #, c-format
 msgid ""
@@ -751,23 +932,115 @@ msgstr ""
 "неу�пешно �вързване към мрежовото гнездо за наблюдение на у�трой�тва за "
 "кабелен Етернет - %s"
 
-#: ../src/nm-netlink-monitor.c:403
+#: ../src/nm-netlink-monitor.c:405
 msgid "operation took too long"
 msgstr "операци�та продължи прекалено дълго"
 
-#: ../src/nm-netlink-monitor.c:500
+#: ../src/nm-netlink-monitor.c:502
 msgid "received data from wrong type of sender"
 msgstr "получени �а данни от неправилен вид изпращач"
 
-#: ../src/nm-netlink-monitor.c:513
+#: ../src/nm-netlink-monitor.c:515
 msgid "received data from unexpected sender"
 msgstr "получени �а данни от неочакван изпращач"
 
-#: ../src/nm-netlink-monitor.c:644
+#: ../src/nm-netlink-monitor.c:646
 msgid "too much data was sent over socket and some of it was lost"
 msgstr ""
 "през гнездото �а получени прекалено много данни и н�кои от т�х �а загубени"
 
-#: ../src/nm-netlink-monitor.c:733
+#: ../src/nm-netlink-monitor.c:735
 msgid "error occurred while waiting for data on socket"
 msgstr "грешка при изчакване за данни през гнездо"
+
+#: ../gnome/applet/applet-dbus-devices.c:898
+#, fuzzy, c-format
+msgid "You are now connected to the Ad-Hoc wireless network '%s'."
+msgstr "Връзка към инцидентна, безжична мрежа"
+
+#: ../gnome/applet/applet-dbus-devices.c:903
+#, fuzzy, c-format
+msgid "You are now connected to the wireless network '%s'."
+msgstr "Завършване на връзката към безжичната мрежа „%s“..."
+
+#: ../gnome/applet/applet-dbus-devices.c:910
+#, fuzzy
+msgid "You are now connected to the wired network."
+msgstr "Завършване на връзката към кабелната мрежа..."
+
+#: ../gnome/applet/applet-dbus-devices.c:916
+msgid "Connection Established"
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:959
+#, fuzzy
+msgid "Disconnected"
+msgstr "_Прекъ�ване на ВЧМ..."
+
+#: ../gnome/applet/applet-dbus-devices.c:960
+msgid "The network connection has been disconnected."
+msgstr ""
+
+#~ msgid "VPN Error"
+#~ msgstr "Грешка на ВЧМ"
+
+#~ msgid "The VPN service said: \"%s\""
+#~ msgstr "Отговорът от у�лугата за ВЧМ е „%s“"
+
+#~ msgid "VPN connection '%s' said:"
+#~ msgstr "Отговорът от връзката към ВЧМ е „%s“"
+
+#~ msgid "ASCII Key:"
+#~ msgstr "Ключ в ASCII:"
+
+#~ msgid "Hex Key:"
+#~ msgstr "Ше�тнай�етичен ключ:"
+
+#~ msgid "leap_subwindow"
+#~ msgstr "прозорец_за_име_и_парола"
+
+#~ msgid "wep_key_subwindow"
+#~ msgstr "прозорец_за_ключа_за_wep"
+
+#~ msgid "wep_passphrase_subwindow"
+#~ msgstr "прозорец_за_парола_за_wep"
+
+#~ msgid "wpa_psk_subwindow"
+#~ msgstr "прозорец_за_ключ"
+
+#~ msgid "Error displaying connection information: "
+#~ msgstr "Грешка при показване на информаци�та за връзката:"
+
+#~ msgid ""
+#~ "By default, the ESSID is set to your computer's name, %s, with no "
+#~ "encryption enabled"
+#~ msgstr ""
+#~ "По подразбиране идентификаторът ESSID е името на компютъра Ви, %s, без "
+#~ "шифриране"
+
+#~ msgid ""
+#~ "Enter the ESSID and security settings of the wireless network you wish to "
+#~ "create."
+#~ msgstr ""
+#~ "Въведете идентификатора ESSID и на�тройките на �игурно�тта на безжичната "
+#~ "мрежа, ко�то и�кате да �ъздадете."
+
+#~ msgid "Custom wireless network"
+#~ msgstr "Потребител�ка безжична мрежа"
+
+#~ msgid ""
+#~ "Enter the ESSID of the wireless network to which you wish to connect."
+#~ msgstr ""
+#~ "Въведете идентификатора ESSID на безжичната мрежа, към ко�то и�кате да �е "
+#~ "�вържете."
+
+#~ msgid ""
+#~ "None\n"
+#~ "WEP Passphrase\n"
+#~ "WEP 40/128-bit hex\n"
+#~ "WEP 40/128-bit ASCII\n"
+#~ msgstr ""
+#~ "��ма\n"
+#~ "Парола WEP\n"
+#~ "40/128-битов ше�тнай�етичен ключ за WEP\n"
+#~ "40/128-битов ключ за WEP в ASCII\n"
diff --git a/po/bs.po b/po/bs.po
index 5e97139169..02b4e8ab3c 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-19 13:38-0400\n"
+"POT-Creation-Date: 2006-05-29 18:33+0200\n"
 "PO-Revision-Date: 2004-09-01 04:10+0200\n"
 "Last-Translator: Kemal Å anjta <gomez@lugzdk.ba>\n"
 "Language-Team: Bosnian <lokal@linux.org.ba>\n"
@@ -16,62 +16,116 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: info-daemon/networks.glade:11
-msgid "Modify Wireless Networks"
-msgstr "Izmjeni Wireless mreže"
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:919
+#, fuzzy, c-format
+msgid "Passphrase for wireless network %s"
+msgstr "Nema wireless mreža..."
 
-#: info-daemon/networks.glade:92
-msgid "<span weight=\"bold\">Wireless Networks:</span>"
-msgstr "<span weight=\"bold\">Wireless Mreže:</span>"
+#: ../gnome/applet/applet-dbus.c:265
+#, c-format
+msgid "Connection to the wireless network '%s' failed."
+msgstr ""
+
+#: ../gnome/applet/applet-dbus.c:270
+msgid "Connection to the wired network failed."
+msgstr ""
+
+#: ../gnome/applet/applet.c:184
+msgid "Error displaying connection information:"
+msgstr ""
 
-#: info-daemon/passphrase.glade:9
+#: ../gnome/applet/applet.c:202
 #, fuzzy
-msgid "Wireless Network Key Required"
+msgid "Could not find some required resources (the glade file)!"
+msgstr ""
+"NetworkManager Aplet nije pronašao neke potrebne resurse (glade nije "
+"pronađen)."
+
+#: ../gnome/applet/applet.c:213
+#, fuzzy
+msgid "No active connections!"
+msgstr "Mrežne konekcije"
+
+#: ../gnome/applet/applet.c:234
+#, fuzzy, c-format
+msgid "Wired Ethernet (%s)"
 msgstr "Wireless Mreže"
 
-#: info-daemon/passphrase.glade:52
-msgid "_Login to Network"
-msgstr "_Prijava na mrežu"
+#: ../gnome/applet/applet.c:236
+#, fuzzy, c-format
+msgid "Wireless Ethernet (%s)"
+msgstr "Wireless Mreže"
 
-#: info-daemon/passphrase.glade:100
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:362
 #, fuzzy
+msgid "NetworkManager Applet"
+msgstr "NetworkManager nije pokrenut..."
+
+#: ../gnome/applet/applet.c:339 ../gnome/applet/applet.c:364
+msgid "Copyright © 2004-2005 Red Hat, Inc."
+msgstr ""
+
+#: ../gnome/applet/applet.c:340 ../gnome/applet/applet.c:365
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
-"Network</span>\n"
-"\n"
-"A passphrase or encryption key is required to access the wireless network '%"
-"s'."
+"Notification area applet for managing your network devices and connections."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Passphrase je potreban od Wirelles "
-"mreže</span>\n"
-"\n"
-"Passphrase ili WEP key je potreba za pristup Wireless mreži '%s'."
 
-#: info-daemon/passphrase.glade:129
-msgid "Key Type:"
+#: ../gnome/applet/applet.c:343 ../gnome/applet/applet.c:370
+msgid "translator-credits"
+msgstr ""
+
+#: ../gnome/applet/applet.c:426
+msgid "VPN Login Failure"
 msgstr ""
 
-#: info-daemon/passphrase.glade:150
+#: ../gnome/applet/applet.c:427
+#, c-format
+msgid "Could not start the VPN connection '%s' due to a login failure."
+msgstr ""
+
+#: ../gnome/applet/applet.c:431
+msgid "VPN Start Failure"
+msgstr ""
+
+#: ../gnome/applet/applet.c:432
+#, c-format
 msgid ""
-"128-bit Passphrase\n"
-"128-bit Raw Hex Key"
+"Could not start the VPN connection '%s' due to a failure launching the VPN "
+"program."
 msgstr ""
 
-#: info-daemon/passphrase.glade:180
-#: info-daemon/NetworkManagerInfoPassphraseDialog.c:101
-msgid "Passphrase:"
-msgstr "Passphrase:"
+#: ../gnome/applet/applet.c:436 ../gnome/applet/applet.c:446
+msgid "VPN Connect Failure"
+msgstr ""
 
-#: info-daemon/passphrase.glade:208 panel-applet/essid.glade:162
-msgid "*"
-msgstr "*"
+#: ../gnome/applet/applet.c:437
+#, c-format
+msgid "Could not start the VPN connection '%s' due to a connection error."
+msgstr ""
 
-#: info-daemon/NetworkManagerInfoPassphraseDialog.c:104
-msgid "Key:"
+#: ../gnome/applet/applet.c:441
+msgid "VPN Configuration Error"
+msgstr ""
+
+#: ../gnome/applet/applet.c:442
+#, c-format
+msgid "The VPN connection '%s' was not correctly configured."
 msgstr ""
 
-#. Reuse the above string to make the translators less angry.
-#: panel-applet/NMWirelessApplet.c:691 panel-applet/NMWirelessApplet.c:701
+#: ../gnome/applet/applet.c:447
+#, c-format
+msgid ""
+"Could not start the VPN connection '%s' because the VPN server did not "
+"return an adequate network configuration."
+msgstr ""
+
+#: ../gnome/applet/applet.c:517
+msgid "VPN Login Message"
+msgstr ""
+
+#: ../gnome/applet/applet.c:741 ../gnome/applet/applet.c:2508
+#: ../gnome/applet/other-network-dialog.c:453
+#: ../gnome/applet/passphrase-dialog.c:228
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
@@ -79,84 +133,850 @@ msgstr ""
 "NetworkManager Aplet nije pronašao neke potrebne resurse (glade nije "
 "pronađen)."
 
-#: panel-applet/NMWirelessApplet.c:716
+#: ../gnome/applet/applet.c:753
+#, c-format
+msgid "The network device \"%s (%s)\" does not support wireless scanning."
+msgstr ""
+
+#: ../gnome/applet/applet.c:761
+#, c-format
+msgid "The network device \"%s (%s)\" does not support link detection."
+msgstr ""
+
+#: ../gnome/applet/applet.c:908
+#, c-format
+msgid "Preparing device %s for the wired network..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:910
+#, fuzzy, c-format
+msgid "Preparing device %s for the wireless network '%s'..."
+msgstr "Nema wireless mreža..."
+
+#: ../gnome/applet/applet.c:918
+#, c-format
+msgid "Configuring device %s for the wired network..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:920
+#, fuzzy, c-format
+msgid "Attempting to join the wireless network '%s'..."
+msgstr "Nema wireless mreža..."
+
+#: ../gnome/applet/applet.c:928
+#, fuzzy, c-format
+msgid "Waiting for Network Key for the wireless network '%s'..."
+msgstr "Nema wireless mreža..."
+
+#: ../gnome/applet/applet.c:936 ../gnome/applet/applet.c:946
+msgid "Requesting a network address from the wired network..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:938 ../gnome/applet/applet.c:948
+#, fuzzy, c-format
+msgid "Requesting a network address from the wireless network '%s'..."
+msgstr "Nema wireless mreža..."
+
+#: ../gnome/applet/applet.c:956
+msgid "Finishing connection to the wired network..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:958
+#, fuzzy, c-format
+msgid "Finishing connection to the wireless network '%s'..."
+msgstr "Nema wireless mreža..."
+
+#: ../gnome/applet/applet.c:1075
+#, fuzzy
+msgid "NetworkManager is not running"
+msgstr "NetworkManager nije pokrenut..."
+
+#: ../gnome/applet/applet.c:1083 ../gnome/applet/applet.c:1828
+msgid "Networking disabled"
+msgstr ""
+
+#: ../gnome/applet/applet.c:1088
+#, fuzzy
+msgid "No network connection"
+msgstr "Mrežne konekcije"
+
+#: ../gnome/applet/applet.c:1093
 #, fuzzy
-msgid "Custom wireless network"
+msgid "Wired network connection"
+msgstr "Mrežne konekcije"
+
+#: ../gnome/applet/applet.c:1097
+#, fuzzy
+msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Wireless Mreže"
 
-#: panel-applet/NMWirelessApplet.c:717
-msgid "Enter the ESSID of the wireless network to which you wish to connect."
+#: ../gnome/applet/applet.c:1099
+#, fuzzy, c-format
+msgid "Wireless network connection to '%s' (%d%%)"
+msgstr "Wireless Mreže"
+
+#: ../gnome/applet/applet.c:1120
+#, c-format
+msgid "VPN connection to '%s'"
+msgstr ""
+
+#: ../gnome/applet/applet.c:1128
+#, c-format
+msgid "VPN connecting to '%s'"
 msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:800
+#: ../gnome/applet/applet.c:1541
+#, fuzzy
+msgid "_Connect to Other Wireless Network..."
+msgstr "Wireless Mreže"
+
+#: ../gnome/applet/applet.c:1562
 #, fuzzy
-msgid "Other Wireless Networks..."
+msgid "Create _New Wireless Network..."
 msgstr "Wireless Mreže"
 
-#: panel-applet/NMWirelessApplet.c:911
+#: ../gnome/applet/applet.c:1685
+#, fuzzy
+msgid "_VPN Connections"
+msgstr "Mrežne konekcije"
+
+#: ../gnome/applet/applet.c:1730
+msgid "_Configure VPN..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1734
+msgid "_Disconnect VPN..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1756
+#, fuzzy
+msgid "_Dial Up Connections"
+msgstr "Mrežne konekcije"
+
+#. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
+#: ../gnome/applet/applet.c:1767
+#, c-format
+msgid "Connect to %s..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1773
+#, c-format
+msgid "Disconnect from %s..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1822
 msgid "No network devices have been found"
 msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:1028
+#: ../gnome/applet/applet.c:2014
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager nije pokrenut..."
 
-#: panel-applet/essid.glade:52
-msgid "C_onnect"
+#. 'Enable Networking' item
+#: ../gnome/applet/applet.c:2170
+#, fuzzy
+msgid "Enable _Networking"
+msgstr "Wireless Mreže"
+
+#. 'Enable Wireless' item
+#: ../gnome/applet/applet.c:2176
+msgid "Enable _Wireless"
+msgstr ""
+
+#. 'Connection Information' item
+#: ../gnome/applet/applet.c:2182
+msgid "Connection _Information"
+msgstr ""
+
+#. Help item
+#: ../gnome/applet/applet.c:2193
+msgid "_Help"
 msgstr ""
 
-#: panel-applet/essid.glade:131
+#. About item
+#: ../gnome/applet/applet.c:2202
 #, fuzzy
-msgid "Wireless _Network:"
-msgstr "Wireless Mreže"
+msgid "_About"
+msgstr "_O..."
 
-#: panel-applet/essid.glade:177
+#: ../gnome/applet/applet.c:2667
 #, fuzzy
-msgid "Wireless _adapter:"
-msgstr "Wireless Mreže"
+msgid ""
+"The NetworkManager applet could not find some required resources.  It cannot "
+"continue.\n"
+msgstr ""
+"NetworkManager Aplet nije pronašao neke potrebne resurse (glade nije "
+"pronađen)."
+
+#: ../gnome/applet/wireless-security-option.c:157
+msgid "Open System"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:160
+msgid "Shared Key"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:208
+msgid "Automatic (Default)"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:215
+msgid "AES-CCMP"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:223
+msgid "TKIP"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:231
+msgid "Dynamic WEP"
+msgstr ""
+
+#: ../gnome/applet/wso-none.c:53
+msgid "None"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-ascii.c:138
+msgid "WEP 64/128-bit ASCII"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-hex.c:135
+msgid "WEP 64/128-bit Hex"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-passphrase.c:135
+#, fuzzy
+msgid "WEP 128-bit Passphrase"
+msgstr "Passphrase:"
 
-#: panel-applet/menu-info.c:101
+#: ../gnome/applet/wso-wpa-eap.c:237
+msgid "PEAP"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:238
+msgid "TLS"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:239
+msgid "TTLS"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
+#: ../src/nm-ap-security-wpa-eap.c:116
+msgid "WPA2 Enterprise"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
+#: ../src/nm-ap-security-wpa-eap.c:121
+msgid "WPA Enterprise"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-psk.c:178
+msgid "WPA2 Personal"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-psk.c:180
+msgid "WPA Personal"
+msgstr ""
+
+#: ../gnome/applet/eggtrayicon.c:134
+msgid "Orientation"
+msgstr ""
+
+#: ../gnome/applet/eggtrayicon.c:135
+msgid "The orientation of the tray."
+msgstr ""
+
+#: ../gnome/applet/menu-items.c:88
 #, fuzzy, c-format
 msgid "Wired Network (%s)"
 msgstr "Wireless Mreže"
 
-#: panel-applet/menu-info.c:103
+#: ../gnome/applet/menu-items.c:91
 #, fuzzy
-msgid "Wired Network"
+msgid "_Wired Network"
 msgstr "Wireless Mreže"
 
-#: panel-applet/menu-info.c:168
+#: ../gnome/applet/menu-items.c:162
 #, fuzzy, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
 msgstr[0] "Wireless Mreže"
 msgstr[1] "Wireless Mreže"
 
-#: panel-applet/menu-info.c:170
+#: ../gnome/applet/menu-items.c:164
 #, fuzzy
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Wireless Mreže"
 msgstr[1] "Wireless Mreže"
 
-#: panel-applet/menu-info.c:307
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr ""
 
-#: examples/python/systray/eggtrayicon.c:111
-msgid "Orientation"
+#: ../gnome/applet/other-network-dialog.c:352
+#, c-format
+msgid ""
+"By default, the wireless network's name is set to your computer's name, %s, "
+"with no encryption enabled"
 msgstr ""
 
-#: examples/python/systray/eggtrayicon.c:112
-msgid "The orientation of the tray."
+#: ../gnome/applet/other-network-dialog.c:358
+#, fuzzy
+msgid "Create new wireless network"
+msgstr "Nema wireless mreža..."
+
+#: ../gnome/applet/other-network-dialog.c:359
+msgid ""
+"Enter the name and security settings of the wireless network you wish to "
+"create."
+msgstr ""
+
+#: ../gnome/applet/other-network-dialog.c:363
+#, fuzzy
+msgid "Create New Wireless Network"
+msgstr "Wireless Mreže"
+
+#: ../gnome/applet/other-network-dialog.c:368
+#, fuzzy
+msgid "Existing wireless network"
+msgstr "Wireless Mreže"
+
+#: ../gnome/applet/other-network-dialog.c:369
+msgid "Enter the name of the wireless network to which you wish to connect."
+msgstr ""
+
+#: ../gnome/applet/other-network-dialog.c:371
+#, fuzzy
+msgid "Connect to Other Wireless Network"
+msgstr "Wireless Mreže"
+
+#: ../gnome/applet/passphrase-dialog.c:215
+#, fuzzy
+msgid "Error connecting to wireless network"
+msgstr "Wireless Mreže"
+
+#: ../gnome/applet/passphrase-dialog.c:216
+msgid ""
+"The requested wireless network requires security capabilities unsupported by "
+"your hardware."
+msgstr ""
+
+#: ../gnome/applet/vpn-password-dialog.c:151
+#: ../gnome/applet/vpn-password-dialog.c:188
+#, c-format
+msgid "Cannot start VPN connection '%s'"
+msgstr ""
+
+#: ../gnome/applet/vpn-password-dialog.c:154
+#, c-format
+msgid ""
+"Could not find the authentication dialog for VPN connection type '%s'. "
+"Contact your system administrator."
+msgstr ""
+
+#: ../gnome/applet/vpn-password-dialog.c:191
+#, c-format
+msgid ""
+"There was a problem launching the authentication dialog for VPN connection "
+"type '%s'. Contact your system administrator."
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:1
+msgid " "
+msgstr " "
+
+#: ../gnome/applet/applet.glade.h:2
+#, fuzzy
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
+msgstr "<span weight=\"bold\">Wireless Mreže:</span>"
+
+#: ../gnome/applet/applet.glade.h:4
+#, fuzzy, no-c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
+"Network</span>\n"
+"\n"
+"A passphrase or encryption key is required to access the wireless network '%"
+"s'."
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Passphrase je potreban od Wirelles "
+"mreže</span>\n"
+"\n"
+"Passphrase ili WEP key je potreba za pristup Wireless mreži '%s'."
+
+#: ../gnome/applet/applet.glade.h:8
+#, no-c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
+"\n"
+"%s  It will not be completely functional."
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:12
+#, fuzzy, no-c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
+"span>\n"
+"\n"
+"You have chosen to log in to the wireless network '%s'.  If you are sure "
+"that this wireless network is secure, click the checkbox below and "
+"NetworkManager will not require confirmation on subsequent log ins."
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
+"span>\n"
+"\n"
+"You have chosen log in to the wireless network '%s'.  If you are sure this "
+"wireless network is secure, click the checkbox below and NetworkManager will "
+"no longer pester you with stupid questions when you connect to it."
+
+#: ../gnome/applet/applet.glade.h:15
+msgid "Anonymous Identity:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:16
+msgid "Authentication:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:17
+msgid "Broadcast Address:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:18
+msgid "CA Certificate File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:19
+msgid "C_onnect"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:20
+msgid "Client Certificate File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:21
+msgid "Connection Information"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:22
+msgid "Default Route:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:23
+msgid "Destination Address:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:24
+msgid "Driver:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:25
+msgid "EAP Method:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:26
+msgid "Hardware Address:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:27
+msgid "IP Address:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:28
+msgid "Identity:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:29
+msgid "Interface:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:30
+msgid "Key Type:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:31
+msgid "Key:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:32
+msgid ""
+"None\n"
+"WEP 128-bit Passphrase\n"
+"WEP 64/128-bit Hex\n"
+"WEP 64/128-bit ASCII\n"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:37
+msgid ""
+"Open System\n"
+"Shared Key"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:39
+#, fuzzy
+msgid "Other Wireless Network..."
+msgstr "Wireless Mreže"
+
+#: ../gnome/applet/applet.glade.h:40
+msgid "Passphrase:"
+msgstr "Passphrase:"
+
+#: ../gnome/applet/applet.glade.h:41
+msgid "Password:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:42
+msgid "Primary DNS:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:43
+msgid "Private Key File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:44
+msgid "Private Key Password:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:45
+msgid "Secondary DNS:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:46
+msgid "Select the CA Certificate File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:47
+msgid "Select the Client Certificate File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:48
+msgid "Select the Private Key File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:49
+msgid "Show key"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:50
+#, fuzzy
+msgid "Show passphrase"
+msgstr "Passphrase:"
+
+#: ../gnome/applet/applet.glade.h:51
+msgid "Show password"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:52
+msgid "Show passwords"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:53
+msgid "Speed:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:54
+msgid "Subnet Mask:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:55
+msgid "Type:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:56
+msgid "User Name:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:57
+#, fuzzy
+msgid "Wireless Network Key Required"
+msgstr "Wireless Mreže"
+
+#: ../gnome/applet/applet.glade.h:58
+#, fuzzy
+msgid "Wireless _adapter:"
+msgstr "Wireless Mreže"
+
+#: ../gnome/applet/applet.glade.h:59
+#, fuzzy
+msgid "_Always Trust this Wireless Network"
+msgstr "Uvijek vjeruj ovoj wireless mreži"
+
+#: ../gnome/applet/applet.glade.h:60
+msgid "_Don't remind me again"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:61
+msgid "_Login to Network"
+msgstr "_Prijava na mrežu"
+
+#: ../gnome/applet/applet.glade.h:62
+msgid "_Network Name:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:63
+#, fuzzy
+msgid "_Wireless Security:"
+msgstr "Wireless Mreže"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:383
+msgid "Cannot add VPN connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:385
+msgid ""
+"No suitable VPN software was found on your system. Contact your system "
+"administrator."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:437
+msgid "Cannot import VPN connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:439
+#, c-format
+msgid ""
+"Cannot find suitable software for VPN connection type '%s' to import the "
+"file '%s'. Contact your system administrator."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:579
+#, c-format
+msgid "Error retrieving VPN connection '%s'"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:582
+#, c-format
+msgid ""
+"Could not find the UI files for VPN connection type '%s'. Contact your "
+"system administrator."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:739
+#, c-format
+msgid "Delete VPN connection \"%s\"?"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:742
+#, c-format
+msgid ""
+"All information about the VPN connection \"%s\" will be lost and you may "
+"need your system administrator to provide information to create a new "
+"connection."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:959
+msgid "Unable to load"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:961
+#, fuzzy
+msgid "Cannot find some needed resources (the glade file)!"
+msgstr ""
+"NetworkManager Aplet nije pronašao neke potrebne resurse (glade nije "
+"pronađen)."
+
+#. Edit dialog
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
+#, fuzzy
+msgid "Edit VPN Connection"
+msgstr "Mrežne konekcije"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:1
+msgid "Add a new VPN connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:2
+msgid "Choose which type of VPN connection you wish to create."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
+msgid "Connect to:"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
+#, fuzzy
+msgid "Create VPN Connection"
+msgstr "Mrežne konekcije"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
+msgid "Create VPN Connection - 1 of 2"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
+msgid "Create VPN Connection - 2 of 2"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
+msgid "Delete the selected VPN connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
+msgid "E_xport"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:9
+msgid "Edit the selected VPN connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:10
+msgid "Export the VPN settings to a file"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:11
+msgid "Export the selected VPN connection to a file"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:12
+msgid "Finish Creating VPN Connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:13
+#, fuzzy
+msgid "Manage Virtual Private Network Connections"
+msgstr "Mrežne konekcije"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:14
+msgid ""
+"This assistant will guide you through the creation of a connection to a "
+"Virtual Private Network (VPN).\n"
+"\n"
+"It will require some information, such as IP addresses and secrets.  Please "
+"see your system administrator to obtain this information."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:17
+#, fuzzy
+msgid "VPN Connections"
+msgstr "Mrežne konekcije"
+
+#: ../src/nm-ap-security-wep.c:52
+msgid "40-bit WEP"
+msgstr ""
+
+#: ../src/nm-ap-security-wep.c:54
+msgid "104-bit WEP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:50
+msgid "WPA TKIP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:52
+msgid "WPA CCMP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:54
+msgid "WPA Automatic"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:59
+msgid "WPA2 TKIP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:61
+msgid "WPA2 CCMP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:63
+msgid "WPA2 Automatic"
+msgstr ""
+
+#: ../src/nm-ap-security.c:320
+msgid "none"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:154
+#, c-format
+msgid ""
+"unable to create netlink socket for monitoring wired ethernet devices - %s"
 msgstr ""
 
-#~ msgid " "
-#~ msgstr " "
+#: ../src/nm-netlink-monitor.c:172
+#, c-format
+msgid ""
+"unable to bind to netlink socket for monitoring wired ethernet devices - %s"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:405
+msgid "operation took too long"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:502
+msgid "received data from wrong type of sender"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:515
+msgid "received data from unexpected sender"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:646
+msgid "too much data was sent over socket and some of it was lost"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:735
+msgid "error occurred while waiting for data on socket"
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:898
+#, c-format
+msgid "You are now connected to the Ad-Hoc wireless network '%s'."
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:903
+#, fuzzy, c-format
+msgid "You are now connected to the wireless network '%s'."
+msgstr "Nema wireless mreža..."
+
+#: ../gnome/applet/applet-dbus-devices.c:910
+msgid "You are now connected to the wired network."
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:916
+msgid "Connection Established"
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:959
+msgid "Disconnected"
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:960
+#, fuzzy
+msgid "The network connection has been disconnected."
+msgstr "Nijedna mrežna konekcija trenutno nije aktivna..."
+
+#~ msgid "Modify Wireless Networks"
+#~ msgstr "Izmjeni Wireless mreže"
+
+#~ msgid "*"
+#~ msgstr "*"
 
 #~ msgid "There are no network devices..."
 #~ msgstr "Nema mrežnih uređaja..."
 
+#~ msgid "A wired network connection is currently active..."
+#~ msgstr "Ži�ana mrežna konekcija je trenutno aktivna..."
+
+#~ msgid "<span weight=\"bold\">Wireless Networks:</span>"
+#~ msgstr "<span weight=\"bold\">Wireless Mreže:</span>"
+
+#, fuzzy
+#~ msgid "Custom wireless network"
+#~ msgstr "Wireless Mreže"
+
+#, fuzzy
+#~ msgid "Other Wireless Networks..."
+#~ msgstr "Wireless Mreže"
+
+#, fuzzy
+#~ msgid "Wireless _Network:"
+#~ msgstr "Wireless Mreže"
+
+#, fuzzy
+#~ msgid "Wired Network"
+#~ msgstr "Wireless Mreže"
+
 #~ msgid "There are no wireless networks..."
 #~ msgstr "Nema wireless mreža..."
 
@@ -166,9 +986,6 @@ msgstr ""
 #~ msgid "No network connection is currently active..."
 #~ msgstr "Nijedna mrežna konekcija trenutno nije aktivna..."
 
-#~ msgid "A wired network connection is currently active..."
-#~ msgstr "Ži�ana mrežna konekcija je trenutno aktivna..."
-
 #~ msgid "_About..."
 #~ msgstr "_O..."
 
diff --git a/po/ca.po b/po/ca.po
index 552246cd67..7e4ebc63d4 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-29 01:08+0100\n"
+"POT-Creation-Date: 2006-05-29 18:33+0200\n"
 "PO-Revision-Date: 2006-01-29 01:15+0100\n"
 "Last-Translator: Josep Puigdemont i Casamajó <josep.puigdemont@gmail.com>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
@@ -17,82 +17,78 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:923
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:919
 #, c-format
 msgid "Passphrase for wireless network %s"
 msgstr "Contrasenya per a la xarxa sense fil %s"
 
-#: ../gnome/applet/applet-dbus.c:244
+#: ../gnome/applet/applet-dbus.c:265
 #, c-format
 msgid "Connection to the wireless network '%s' failed."
 msgstr "Ha fallat la connexió a la xarxa sense fil «%s»."
 
-#: ../gnome/applet/applet-dbus.c:249
+#: ../gnome/applet/applet-dbus.c:270
 msgid "Connection to the wired network failed."
 msgstr "Ha fallat la connexió a la xarxa amb fil."
 
-#: ../gnome/applet/applet.c:180
-msgid "Error displaying connection information: "
-msgstr "S'ha produït un error en mostrar la informació de la connexió: "
+#: ../gnome/applet/applet.c:184
+msgid "Error displaying connection information:"
+msgstr "S'ha produït un error en mostrar la informació de la connexió:"
 
-#: ../gnome/applet/applet.c:199
+#: ../gnome/applet/applet.c:202
 msgid "Could not find some required resources (the glade file)!"
 msgstr ""
 "Alguns dels recursos requerits no s'han pogut trobar (el fitxer glade)!"
 
-#: ../gnome/applet/applet.c:210
+#: ../gnome/applet/applet.c:213
 msgid "No active connections!"
 msgstr "No hi ha cap connexió activa."
 
-#: ../gnome/applet/applet.c:225
+#: ../gnome/applet/applet.c:234
 #, c-format
 msgid "Wired Ethernet (%s)"
 msgstr "Xarxa amb fil (%s)"
 
-#: ../gnome/applet/applet.c:227
+#: ../gnome/applet/applet.c:236
 #, c-format
 msgid "Wireless Ethernet (%s)"
 msgstr "Xarxa sense fil (%s)"
 
-#: ../gnome/applet/applet.c:321 ../gnome/applet/applet.c:346
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:362
 msgid "NetworkManager Applet"
 msgstr "Miniaplicació NetworkManager"
 
-#: ../gnome/applet/applet.c:323 ../gnome/applet/applet.c:348
+#: ../gnome/applet/applet.c:339 ../gnome/applet/applet.c:364
 msgid "Copyright © 2004-2005 Red Hat, Inc."
 msgstr "Copyright © 2004-2005 Red Hat, Inc."
 
-#: ../gnome/applet/applet.c:324 ../gnome/applet/applet.c:349
+#: ../gnome/applet/applet.c:340 ../gnome/applet/applet.c:365
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Miniaplicació per a l'àrea de notificació per a gestionar els vostres "
 "dispositius de xarxa i connexions."
 
-#: ../gnome/applet/applet.c:327 ../gnome/applet/applet.c:354
+#: ../gnome/applet/applet.c:343 ../gnome/applet/applet.c:370
 msgid "translator-credits"
 msgstr "Josep Puigdemont i Casamajó <josep.puigdemont@gmail.com>"
 
-#: ../gnome/applet/applet.c:439
-msgid "VPN Error"
-msgstr "Error VPN"
-
-#: ../gnome/applet/applet.c:443
+#: ../gnome/applet/applet.c:426
 msgid "VPN Login Failure"
 msgstr "S'ha produït un error en l'entrada VPN"
 
-#: ../gnome/applet/applet.c:444
+#: ../gnome/applet/applet.c:427
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a login failure."
 msgstr ""
 "Atès que s'ha produït un error en l'entrada, no s'ha pogut iniciar la "
 "connexió VPN «%s»."
 
-#: ../gnome/applet/applet.c:448
+#: ../gnome/applet/applet.c:431
 msgid "VPN Start Failure"
 msgstr "No s'ha pogut iniciar la VPN"
 
-#: ../gnome/applet/applet.c:449
+#: ../gnome/applet/applet.c:432
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
@@ -101,27 +97,27 @@ msgstr ""
 "No s'ha pogut iniciar la connexió VPN «%s» perquè s'ha produït un error en "
 "llançar la VPN."
 
-#: ../gnome/applet/applet.c:453 ../gnome/applet/applet.c:463
+#: ../gnome/applet/applet.c:436 ../gnome/applet/applet.c:446
 msgid "VPN Connect Failure"
 msgstr "S'ha produït un error en la connexió VPN"
 
-#: ../gnome/applet/applet.c:454
+#: ../gnome/applet/applet.c:437
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a connection error."
 msgstr ""
 "No s'ha pogut iniciar la connexió VPN «%s» ja que s'ha produït un error de "
 "connexió."
 
-#: ../gnome/applet/applet.c:458
+#: ../gnome/applet/applet.c:441
 msgid "VPN Configuration Error"
 msgstr "S'ha produït un error de configuració de la VPN"
 
-#: ../gnome/applet/applet.c:459
+#: ../gnome/applet/applet.c:442
 #, c-format
 msgid "The VPN connection '%s' was not correctly configured."
 msgstr "La connexió VPN «%s» no està correctament configurada."
 
-#: ../gnome/applet/applet.c:464
+#: ../gnome/applet/applet.c:447
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' because the VPN server did not "
@@ -130,23 +126,13 @@ msgstr ""
 "No s'ha pogut iniciar la connexió VPN «%s» perquè el servidor VPN no ha "
 "retornat cap configuració de xarxa adequada."
 
-#: ../gnome/applet/applet.c:472
-#, c-format
-msgid "The VPN service said: \"%s\""
-msgstr "El servei VPN digué: «%s»"
-
-#: ../gnome/applet/applet.c:541
-#, c-format
-msgid "VPN connection '%s' said:"
-msgstr "La connexió VPN «%s» digué:"
-
-#: ../gnome/applet/applet.c:543
+#: ../gnome/applet/applet.c:517
 msgid "VPN Login Message"
 msgstr "Missatge d'entrada de la VPN"
 
-#: ../gnome/applet/applet.c:760 ../gnome/applet/applet.c:2514
+#: ../gnome/applet/applet.c:741 ../gnome/applet/applet.c:2508
 #: ../gnome/applet/other-network-dialog.c:453
-#: ../gnome/applet/passphrase-dialog.c:206
+#: ../gnome/applet/passphrase-dialog.c:228
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
@@ -154,164 +140,164 @@ msgstr ""
 "La miniaplicació NetworkManager no ha pogut trobar alguns dels recursos "
 "requerits (no s'ha trobat el fitxer glade)."
 
-#: ../gnome/applet/applet.c:772
+#: ../gnome/applet/applet.c:753
 #, c-format
 msgid "The network device \"%s (%s)\" does not support wireless scanning."
 msgstr "El dispositiu de xarxa «%s (%s)» no permet l'escaneig sense fil."
 
-#: ../gnome/applet/applet.c:780
+#: ../gnome/applet/applet.c:761
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
 msgstr "El dispositiu de xarxa «%s (%s)» no permet la detecció de l'enllaç."
 
-#: ../gnome/applet/applet.c:927
+#: ../gnome/applet/applet.c:908
 #, c-format
 msgid "Preparing device %s for the wired network..."
 msgstr "S'està perparant el dispositiu %s per a la xarxa amb fil..."
 
-#: ../gnome/applet/applet.c:929
+#: ../gnome/applet/applet.c:910
 #, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
 msgstr "S'està preparant el dispositiu %s per a la xarxa sense fil «%s»..."
 
-#: ../gnome/applet/applet.c:937
+#: ../gnome/applet/applet.c:918
 #, c-format
 msgid "Configuring device %s for the wired network..."
 msgstr "S'està configurant el dispositu %s per a la xarxa amb fil..."
 
-#: ../gnome/applet/applet.c:939
+#: ../gnome/applet/applet.c:920
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
 msgstr "S'està intentant entrar a la xarxa sense fil «%s»..."
 
-#: ../gnome/applet/applet.c:947
+#: ../gnome/applet/applet.c:928
 #, c-format
 msgid "Waiting for Network Key for the wireless network '%s'..."
 msgstr "S'està esperant per a la clau de xarxa de la xarxa sense fil «%s»..."
 
-#: ../gnome/applet/applet.c:955 ../gnome/applet/applet.c:965
+#: ../gnome/applet/applet.c:936 ../gnome/applet/applet.c:946
 msgid "Requesting a network address from the wired network..."
 msgstr "S'està sol·licitant una adreça de xarxa per a la xarxa amb fil..."
 
-#: ../gnome/applet/applet.c:957 ../gnome/applet/applet.c:967
+#: ../gnome/applet/applet.c:938 ../gnome/applet/applet.c:948
 #, c-format
 msgid "Requesting a network address from the wireless network '%s'..."
 msgstr ""
 "S'està sol·licitant una adreça de xarxa per a la xarxa sense fil «%s»..."
 
-#: ../gnome/applet/applet.c:975
+#: ../gnome/applet/applet.c:956
 msgid "Finishing connection to the wired network..."
 msgstr "S'està finalitzant la connexió a la xarxa amb fil..."
 
-#: ../gnome/applet/applet.c:977
+#: ../gnome/applet/applet.c:958
 #, c-format
 msgid "Finishing connection to the wireless network '%s'..."
 msgstr "S'està finalizant la connexió a la xarxa sense fil «%s»..."
 
-#: ../gnome/applet/applet.c:1094
+#: ../gnome/applet/applet.c:1075
 msgid "NetworkManager is not running"
 msgstr "No s'està executant el NetworkManager"
 
-#: ../gnome/applet/applet.c:1107 ../gnome/applet/applet.c:1841
+#: ../gnome/applet/applet.c:1083 ../gnome/applet/applet.c:1828
 msgid "Networking disabled"
 msgstr "S'ha inhabilitat la xarxa"
 
-#: ../gnome/applet/applet.c:1112
+#: ../gnome/applet/applet.c:1088
 msgid "No network connection"
 msgstr "No hi ha cap connexió de xarxa"
 
-#: ../gnome/applet/applet.c:1117
+#: ../gnome/applet/applet.c:1093
 msgid "Wired network connection"
 msgstr "Connexió de xarxa amb fil"
 
-#: ../gnome/applet/applet.c:1121
+#: ../gnome/applet/applet.c:1097
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Connectat a una xarxa Ad-Hoc sense fil"
 
-#: ../gnome/applet/applet.c:1123
+#: ../gnome/applet/applet.c:1099
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "Connexió de xarxa sense fil a «%s» (%d%%)"
 
-#: ../gnome/applet/applet.c:1145
+#: ../gnome/applet/applet.c:1120
 #, c-format
 msgid "VPN connection to '%s'"
 msgstr "Connexió VPN a «%s»"
 
-#: ../gnome/applet/applet.c:1153
+#: ../gnome/applet/applet.c:1128
 #, c-format
 msgid "VPN connecting to '%s'"
 msgstr "S'està connectant amb VPN a «%s»"
 
-#: ../gnome/applet/applet.c:1566
+#: ../gnome/applet/applet.c:1541
 msgid "_Connect to Other Wireless Network..."
 msgstr "_Connecta a d'altres xarxes sense fil..."
 
-#: ../gnome/applet/applet.c:1587
+#: ../gnome/applet/applet.c:1562
 msgid "Create _New Wireless Network..."
 msgstr "Crea una xarxa sense fil _nova..."
 
-#: ../gnome/applet/applet.c:1708
+#: ../gnome/applet/applet.c:1685
 msgid "_VPN Connections"
 msgstr "Connexions _VPN"
 
-#: ../gnome/applet/applet.c:1743
+#: ../gnome/applet/applet.c:1730
 msgid "_Configure VPN..."
 msgstr "_Configura la VPN..."
 
-#: ../gnome/applet/applet.c:1747
+#: ../gnome/applet/applet.c:1734
 msgid "_Disconnect VPN..."
 msgstr "_Desconnecta la VPN..."
 
-#: ../gnome/applet/applet.c:1769
+#: ../gnome/applet/applet.c:1756
 msgid "_Dial Up Connections"
 msgstr "Connexions de _marcatge"
 
 #. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
-#: ../gnome/applet/applet.c:1780
+#: ../gnome/applet/applet.c:1767
 #, c-format
 msgid "Connect to %s..."
 msgstr "Connecta a %s..."
 
-#: ../gnome/applet/applet.c:1786
+#: ../gnome/applet/applet.c:1773
 #, c-format
 msgid "Disconnect from %s..."
 msgstr "Desconnecta de %s..."
 
-#: ../gnome/applet/applet.c:1835
+#: ../gnome/applet/applet.c:1822
 msgid "No network devices have been found"
 msgstr "No s'ha trobat cap dispositiu de xarxa"
 
-#: ../gnome/applet/applet.c:2027
+#: ../gnome/applet/applet.c:2014
 msgid "NetworkManager is not running..."
 msgstr "No s'està executant el NetworkManager..."
 
 #. 'Enable Networking' item
-#: ../gnome/applet/applet.c:2183
+#: ../gnome/applet/applet.c:2170
 msgid "Enable _Networking"
 msgstr "Habilita la _xarxa"
 
 #. 'Enable Wireless' item
-#: ../gnome/applet/applet.c:2189
+#: ../gnome/applet/applet.c:2176
 msgid "Enable _Wireless"
 msgstr "Habilita la xarxa _sense fil"
 
 #. 'Connection Information' item
-#: ../gnome/applet/applet.c:2195
+#: ../gnome/applet/applet.c:2182
 msgid "Connection _Information"
 msgstr "_Informació de la connexió"
 
 #. Help item
-#: ../gnome/applet/applet.c:2206
+#: ../gnome/applet/applet.c:2193
 msgid "_Help"
 msgstr "A_juda"
 
 #. About item
-#: ../gnome/applet/applet.c:2215
+#: ../gnome/applet/applet.c:2202
 msgid "_About"
 msgstr "_Quant a"
 
-#: ../gnome/applet/applet.c:2633
+#: ../gnome/applet/applet.c:2667
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
@@ -327,61 +313,99 @@ msgstr "Sistema obert"
 msgid "Shared Key"
 msgstr "Clau compartida"
 
-#: ../gnome/applet/wireless-security-option.c:209
-msgid "TKIP (Default)"
-msgstr "TKIP (Predeterminat)"
+#: ../gnome/applet/wireless-security-option.c:208
+msgid "Automatic (Default)"
+msgstr "Automàtic (Predeterminat)"
 
-#: ../gnome/applet/wireless-security-option.c:218
+#: ../gnome/applet/wireless-security-option.c:215
 msgid "AES-CCMP"
 msgstr "AES-CCMP"
 
+#: ../gnome/applet/wireless-security-option.c:223
+msgid "TKIP"
+msgstr "TKIP"
+
+#: ../gnome/applet/wireless-security-option.c:231
+msgid "Dynamic WEP"
+msgstr "WEP dinàmic"
+
 #: ../gnome/applet/wso-none.c:53
 msgid "None"
 msgstr "Cap"
 
-#: ../gnome/applet/wso-wep-ascii.c:127
-msgid "WEP 40/128-bit ASCII"
-msgstr "WEP 40/128-bit ASCII"
+#: ../gnome/applet/wso-wep-ascii.c:138
+msgid "WEP 64/128-bit ASCII"
+msgstr "WEP 64/128-bit ASCII"
+
+#: ../gnome/applet/wso-wep-hex.c:135
+msgid "WEP 64/128-bit Hex"
+msgstr "WEP 64/128-bit Hex"
 
-#: ../gnome/applet/wso-wep-hex.c:124
-msgid "WEP 40/128-bit hex"
-msgstr "WEP 40/128-bit hex"
+#: ../gnome/applet/wso-wep-passphrase.c:135
+msgid "WEP 128-bit Passphrase"
+msgstr "WEP contrasenya de 128-bits"
+
+#: ../gnome/applet/wso-wpa-eap.c:237
+msgid "PEAP"
+msgstr "PEAP"
+
+#: ../gnome/applet/wso-wpa-eap.c:238
+msgid "TLS"
+msgstr "TLS"
+
+#: ../gnome/applet/wso-wpa-eap.c:239
+msgid "TTLS"
+msgstr "TTLS"
+
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
+#: ../src/nm-ap-security-wpa-eap.c:116
+msgid "WPA2 Enterprise"
+msgstr "WPA2 Enterprise"
+
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
+#: ../src/nm-ap-security-wpa-eap.c:121
+msgid "WPA Enterprise"
+msgstr "WPA Enterprise"
+
+#: ../gnome/applet/wso-wpa-psk.c:178
+msgid "WPA2 Personal"
+msgstr "Contrasenya personal WPA2"
 
-#: ../gnome/applet/wso-wep-passphrase.c:124
-msgid "WEP Passphrase"
-msgstr "Contrasenya WEP:"
+#: ../gnome/applet/wso-wpa-psk.c:180
+msgid "WPA Personal"
+msgstr "Contrasenya personal WPA"
 
-#: ../gnome/applet/eggtrayicon.c:128
+#: ../gnome/applet/eggtrayicon.c:134
 msgid "Orientation"
 msgstr "Orientació"
 
-#: ../gnome/applet/eggtrayicon.c:129
+#: ../gnome/applet/eggtrayicon.c:135
 msgid "The orientation of the tray."
 msgstr "Orientació de l'àrea de notificació."
 
-#: ../gnome/applet/menu-items.c:87
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Xarxa amb fil (%s)"
 
-#: ../gnome/applet/menu-items.c:90
+#: ../gnome/applet/menu-items.c:91
 msgid "_Wired Network"
 msgstr "Xarxa amb _fil"
 
-#: ../gnome/applet/menu-items.c:161
+#: ../gnome/applet/menu-items.c:162
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
 msgstr[0] "Xarxa sense fil (%s)"
 msgstr[1] "Xarxes sense fil (%s)"
 
-#: ../gnome/applet/menu-items.c:163
+#: ../gnome/applet/menu-items.c:164
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Xarxa sense fil"
 msgstr[1] "Xarxes sense fil"
 
-#: ../gnome/applet/menu-items.c:330
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr " (Unicode invàlid)"
 
@@ -422,13 +446,25 @@ msgstr "Entreu el nom de la xarxa sense fil a la que vulgueu connectar-vos."
 msgid "Connect to Other Wireless Network"
 msgstr "Connecta a d'altres xarxes sense fil"
 
-#: ../gnome/applet/vpn-password-dialog.c:152
-#: ../gnome/applet/vpn-password-dialog.c:189
+#: ../gnome/applet/passphrase-dialog.c:215
+msgid "Error connecting to wireless network"
+msgstr "S'ha produït un error en connectar a la xarxa sense fil..."
+
+#: ../gnome/applet/passphrase-dialog.c:216
+msgid ""
+"The requested wireless network requires security capabilities unsupported by "
+"your hardware."
+msgstr ""
+"La xarxa sense fil seleccionada requereix certes característiques de "
+"seguretat que no estan implementades en el aquest maquinari."
+
+#: ../gnome/applet/vpn-password-dialog.c:151
+#: ../gnome/applet/vpn-password-dialog.c:188
 #, c-format
 msgid "Cannot start VPN connection '%s'"
 msgstr "No s'ha pogut iniciar la connexió VPN «%s»"
 
-#: ../gnome/applet/vpn-password-dialog.c:155
+#: ../gnome/applet/vpn-password-dialog.c:154
 #, c-format
 msgid ""
 "Could not find the authentication dialog for VPN connection type '%s'. "
@@ -437,7 +473,7 @@ msgstr ""
 "No s'ha pogut trobar el diàleg d'autenticació per al tipus de connexió VPN «%"
 "s». Contacteu el vostre administrador de sistemes."
 
-#: ../gnome/applet/vpn-password-dialog.c:192
+#: ../gnome/applet/vpn-password-dialog.c:191
 #, c-format
 msgid ""
 "There was a problem launching the authentication dialog for VPN connection "
@@ -501,58 +537,86 @@ msgstr ""
 "aquesta xarxa en el futur."
 
 #: ../gnome/applet/applet.glade.h:15
+msgid "Anonymous Identity:"
+msgstr "Identitat anònima:"
+
+#: ../gnome/applet/applet.glade.h:16
 msgid "Authentication:"
 msgstr "Autenticació:"
 
-#: ../gnome/applet/applet.glade.h:16
+#: ../gnome/applet/applet.glade.h:17
 msgid "Broadcast Address:"
 msgstr "Adreça de multidifusió:"
 
-#: ../gnome/applet/applet.glade.h:17
+#: ../gnome/applet/applet.glade.h:18
+msgid "CA Certificate File:"
+msgstr "Fitxer del certificat CA:"
+
+#: ../gnome/applet/applet.glade.h:19
 msgid "C_onnect"
 msgstr "C_onnecta"
 
-#: ../gnome/applet/applet.glade.h:18
+#: ../gnome/applet/applet.glade.h:20
+msgid "Client Certificate File:"
+msgstr "Fitxer del certificat del client:"
+
+#: ../gnome/applet/applet.glade.h:21
 msgid "Connection Information"
 msgstr "Informació de la connexió"
 
-#: ../gnome/applet/applet.glade.h:19
+#: ../gnome/applet/applet.glade.h:22
 msgid "Default Route:"
 msgstr "Ruta predeterminada:"
 
-#: ../gnome/applet/applet.glade.h:20
+#: ../gnome/applet/applet.glade.h:23
 msgid "Destination Address:"
 msgstr "Adreça de destí:"
 
-#: ../gnome/applet/applet.glade.h:21
+#: ../gnome/applet/applet.glade.h:24
+msgid "Driver:"
+msgstr "Connector:"
+
+#: ../gnome/applet/applet.glade.h:25
+msgid "EAP Method:"
+msgstr "Mètode EAP:"
+
+#: ../gnome/applet/applet.glade.h:26
 msgid "Hardware Address:"
 msgstr "Adreça del maquinari:"
 
-#: ../gnome/applet/applet.glade.h:22
+#: ../gnome/applet/applet.glade.h:27
 msgid "IP Address:"
 msgstr "Adreça IP:"
 
-#: ../gnome/applet/applet.glade.h:23
+#: ../gnome/applet/applet.glade.h:28
+msgid "Identity:"
+msgstr "Identitat:"
+
+#: ../gnome/applet/applet.glade.h:29
 msgid "Interface:"
 msgstr "Interfície:"
 
-#: ../gnome/applet/applet.glade.h:24
+#: ../gnome/applet/applet.glade.h:30
+msgid "Key Type:"
+msgstr "Tipus de clau:"
+
+#: ../gnome/applet/applet.glade.h:31
 msgid "Key:"
 msgstr "Clau:"
 
-#: ../gnome/applet/applet.glade.h:25
+#: ../gnome/applet/applet.glade.h:32
 msgid ""
 "None\n"
-"WEP Passphrase\n"
-"WEP 40/128-bit hex\n"
-"WEP 40/128-bit ASCII\n"
+"WEP 128-bit Passphrase\n"
+"WEP 64/128-bit Hex\n"
+"WEP 64/128-bit ASCII\n"
 msgstr ""
 "Cap\n"
-"Contrasenya WEP\n"
-"WEP 40/128-bit hex\n"
-"WEP 40/128-bit ASCII\n"
+"WEP contrasenya de 128 bits\n"
+"WEP 64/128-bit Hex\n"
+"WEP 64/128-bit ASCII\n"
 
-#: ../gnome/applet/applet.glade.h:30
+#: ../gnome/applet/applet.glade.h:37
 msgid ""
 "Open System\n"
 "Shared Key"
@@ -560,95 +624,111 @@ msgstr ""
 "Sistema obert\n"
 "Clau compartida"
 
-#: ../gnome/applet/applet.glade.h:32
+#: ../gnome/applet/applet.glade.h:39
 msgid "Other Wireless Network..."
 msgstr "Altres xarxes sense fil..."
 
-#: ../gnome/applet/applet.glade.h:33
+#: ../gnome/applet/applet.glade.h:40
 msgid "Passphrase:"
 msgstr "Contrasenya:"
 
-#: ../gnome/applet/applet.glade.h:34
+#: ../gnome/applet/applet.glade.h:41
 msgid "Password:"
 msgstr "Contrasenya:"
 
-#: ../gnome/applet/applet.glade.h:35
+#: ../gnome/applet/applet.glade.h:42
 msgid "Primary DNS:"
 msgstr "DNS primari:"
 
-#: ../gnome/applet/applet.glade.h:36
+#: ../gnome/applet/applet.glade.h:43
+msgid "Private Key File:"
+msgstr "Fitxer de la clau privada:"
+
+#: ../gnome/applet/applet.glade.h:44
+msgid "Private Key Password:"
+msgstr "Contrasenya de la clau privada:"
+
+#: ../gnome/applet/applet.glade.h:45
 msgid "Secondary DNS:"
 msgstr "DNS secondari:"
 
-#: ../gnome/applet/applet.glade.h:37
+#: ../gnome/applet/applet.glade.h:46
+msgid "Select the CA Certificate File"
+msgstr "Seleccioneu el fitxer del certificat de la CA"
+
+#: ../gnome/applet/applet.glade.h:47
+msgid "Select the Client Certificate File"
+msgstr "Seleccioneu el fitxer del certificat del client"
+
+#: ../gnome/applet/applet.glade.h:48
+msgid "Select the Private Key File"
+msgstr "Seleccioneu el fitxer de la clau privada"
+
+#: ../gnome/applet/applet.glade.h:49
+msgid "Show key"
+msgstr "Mostra la clau"
+
+#: ../gnome/applet/applet.glade.h:50
+msgid "Show passphrase"
+msgstr "Mostra la contrasenya:"
+
+#: ../gnome/applet/applet.glade.h:51
+msgid "Show password"
+msgstr "Mostra la contrasenya:"
+
+#: ../gnome/applet/applet.glade.h:52
+msgid "Show passwords"
+msgstr "Mostra les contrasenyes"
+
+#: ../gnome/applet/applet.glade.h:53
+msgid "Speed:"
+msgstr "Velocitat:"
+
+#: ../gnome/applet/applet.glade.h:54
 msgid "Subnet Mask:"
 msgstr "Màscara de subxarxa:"
 
-#: ../gnome/applet/applet.glade.h:38
+#: ../gnome/applet/applet.glade.h:55
 msgid "Type:"
 msgstr "Tipus:"
 
-#: ../gnome/applet/applet.glade.h:39
+#: ../gnome/applet/applet.glade.h:56
 msgid "User Name:"
 msgstr "Nom d'usuari:"
 
-#: ../gnome/applet/applet.glade.h:40
+#: ../gnome/applet/applet.glade.h:57
 msgid "Wireless Network Key Required"
 msgstr "Es requereix una clau per a la xarxa sense fil"
 
-#: ../gnome/applet/applet.glade.h:41
+#: ../gnome/applet/applet.glade.h:58
 msgid "Wireless _adapter:"
 msgstr "_Adaptador sense fil:"
 
-#: ../gnome/applet/applet.glade.h:42
+#: ../gnome/applet/applet.glade.h:59
 msgid "_Always Trust this Wireless Network"
 msgstr "Confia sempre en _aquesta xarxa sense fil"
 
-#: ../gnome/applet/applet.glade.h:43
+#: ../gnome/applet/applet.glade.h:60
 msgid "_Don't remind me again"
 msgstr "_No m'ho tornis a recordar"
 
-#: ../gnome/applet/applet.glade.h:44
+#: ../gnome/applet/applet.glade.h:61
 msgid "_Login to Network"
 msgstr "_Entra a la xarxa"
 
-#: ../gnome/applet/applet.glade.h:45
+#: ../gnome/applet/applet.glade.h:62
 msgid "_Network Name:"
 msgstr "Nom de _xarxa:"
 
-#: ../gnome/applet/applet.glade.h:46
+#: ../gnome/applet/applet.glade.h:63
 msgid "_Wireless Security:"
 msgstr "Seguretat de la _xarxa sense fil:"
 
-#: ../gnome/applet/applet.glade.h:47
-msgid "leap_subwindow"
-msgstr "leap_subwindow"
-
-#: ../gnome/applet/applet.glade.h:48
-msgid "wep_key_subwindow"
-msgstr "wep_key_subwindow"
-
-#: ../gnome/applet/applet.glade.h:49
-msgid "wep_passphrase_subwindow"
-msgstr "wep_passphrase_subwindow"
-
-#: ../gnome/applet/applet.glade.h:50
-msgid "wpa_psk_subwindow"
-msgstr "wpa_psk_subwindow"
-
-#: ../gnome/applet/wso-wpa-psk.c:168
-msgid "WPA2 Personal"
-msgstr "Contrasenya personal WPA2"
-
-#: ../gnome/applet/wso-wpa-psk.c:170
-msgid "WPA Personal"
-msgstr "Contrasenya personal WPA"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.c:358
+#: ../gnome/vpn-properties/nm-vpn-properties.c:383
 msgid "Cannot add VPN connection"
 msgstr "No s'ha pogut afegir la connexions VPN"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:360
+#: ../gnome/vpn-properties/nm-vpn-properties.c:385
 msgid ""
 "No suitable VPN software was found on your system. Contact your system "
 "administrator."
@@ -656,11 +736,11 @@ msgstr ""
 "No s'ha pogut trobar el programari VPN adequat en aquest ordinador. "
 "Contacteu el vostre administrador."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:412
+#: ../gnome/vpn-properties/nm-vpn-properties.c:437
 msgid "Cannot import VPN connection"
 msgstr "No s'ha pogut importar la connexió VPN"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:414
+#: ../gnome/vpn-properties/nm-vpn-properties.c:439
 #, c-format
 msgid ""
 "Cannot find suitable software for VPN connection type '%s' to import the "
@@ -669,12 +749,12 @@ msgstr ""
 "No s'ha pogut trobar el programari adequat per al tipus de connexió VPN «%s» "
 "per a importar el fitxer «%s». Contacteu el vostre administrador de sistemes."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:554
+#: ../gnome/vpn-properties/nm-vpn-properties.c:579
 #, c-format
 msgid "Error retrieving VPN connection '%s'"
 msgstr "S'ha produït un error en recuperar la connexió VPN «%s»"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:557
+#: ../gnome/vpn-properties/nm-vpn-properties.c:582
 #, c-format
 msgid ""
 "Could not find the UI files for VPN connection type '%s'. Contact your "
@@ -683,12 +763,12 @@ msgstr ""
 "No s'han pogut trobar els fitxers d'UI per al tipus de connexió VPN «%s». "
 "Contacteu el vostre administrador de sistemes."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:717
+#: ../gnome/vpn-properties/nm-vpn-properties.c:739
 #, c-format
 msgid "Delete VPN connection \"%s\"?"
 msgstr "Voleu suprimir la connexió VPN «%s»?"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:720
+#: ../gnome/vpn-properties/nm-vpn-properties.c:742
 #, c-format
 msgid ""
 "All information about the VPN connection \"%s\" will be lost and you may "
@@ -699,16 +779,16 @@ msgstr ""
 "necessitareu que el vostre administrador us proporcioni informació per a "
 "crear una connexió nova."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:926
+#: ../gnome/vpn-properties/nm-vpn-properties.c:959
 msgid "Unable to load"
 msgstr "No es pot carregar"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:928
+#: ../gnome/vpn-properties/nm-vpn-properties.c:961
 msgid "Cannot find some needed resources (the glade file)!"
 msgstr "No s'han pogut trobar alguns dels recursos requerits el fitxer glade)."
 
 #. Edit dialog
-#: ../gnome/vpn-properties/nm-vpn-properties.c:1043
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
 msgid "Edit VPN Connection"
 msgstr "Edita la connexió VPN"
 
@@ -782,11 +862,11 @@ msgstr ""
 msgid "VPN Connections"
 msgstr "Connexions VPN"
 
-#: ../src/nm-ap-security-wep.c:47
+#: ../src/nm-ap-security-wep.c:52
 msgid "40-bit WEP"
 msgstr "40-bit WEP"
 
-#: ../src/nm-ap-security-wep.c:49
+#: ../src/nm-ap-security-wep.c:54
 msgid "104-bit WEP"
 msgstr "104-bit WEP"
 
@@ -798,15 +878,23 @@ msgstr "WPA TKIP"
 msgid "WPA CCMP"
 msgstr "WPA CCMP"
 
-#: ../src/nm-ap-security-wpa-psk.c:57
+#: ../src/nm-ap-security-wpa-psk.c:54
+msgid "WPA Automatic"
+msgstr "WPA automàtic"
+
+#: ../src/nm-ap-security-wpa-psk.c:59
 msgid "WPA2 TKIP"
 msgstr "WPA2 TKIP"
 
-#: ../src/nm-ap-security-wpa-psk.c:59
+#: ../src/nm-ap-security-wpa-psk.c:61
 msgid "WPA2 CCMP"
 msgstr "WPA2 CCMP"
 
-#: ../src/nm-ap-security.c:308
+#: ../src/nm-ap-security-wpa-psk.c:63
+msgid "WPA2 Automatic"
+msgstr "WPA2 automàtic"
+
+#: ../src/nm-ap-security.c:320
 msgid "none"
 msgstr "cap"
 
@@ -846,6 +934,79 @@ msgstr "s'ha enviat massa dades a través del sòcol, i se n'han perdut algunes"
 msgid "error occurred while waiting for data on socket"
 msgstr "s'ha produït un error en esperar dades del sòcol"
 
+#: ../gnome/applet/applet-dbus-devices.c:898
+#, c-format
+msgid "You are now connected to the Ad-Hoc wireless network '%s'."
+msgstr "Ara esteu connectat a la xarxa Ad-Hoc sense fil «%s»."
+
+#: ../gnome/applet/applet-dbus-devices.c:903
+#, c-format
+msgid "You are now connected to the wireless network '%s'."
+msgstr "Ara esteu connectat a la xarxa sense fil «%s»."
+
+#: ../gnome/applet/applet-dbus-devices.c:910
+msgid "You are now connected to the wired network."
+msgstr "Ara esteu connectat a la xarxa amb fil."
+
+#: ../gnome/applet/applet-dbus-devices.c:916
+msgid "Connection Established"
+msgstr "S'ha establert la connexió"
+
+#: ../gnome/applet/applet-dbus-devices.c:959
+msgid "Disconnected"
+msgstr "Desconnectat"
+
+#: ../gnome/applet/applet-dbus-devices.c:960
+msgid "The network connection has been disconnected."
+msgstr "S'ha desconnectat la connexió de xarxa."
+
+#~ msgid "Error displaying connection information: "
+#~ msgstr "S'ha produït un error en mostrar la informació de la connexió: "
+
+#~ msgid "VPN Error"
+#~ msgstr "Error VPN"
+
+#~ msgid "The VPN service said: \"%s\""
+#~ msgstr "El servei VPN digué: «%s»"
+
+#~ msgid "VPN connection '%s' said:"
+#~ msgstr "La connexió VPN «%s» digué:"
+
+#~ msgid "TKIP (Default)"
+#~ msgstr "TKIP (Predeterminat)"
+
+#~ msgid "WEP 40/128-bit ASCII"
+#~ msgstr "WEP 40/128-bit ASCII"
+
+#~ msgid "WEP 40/128-bit hex"
+#~ msgstr "WEP 40/128-bit hex"
+
+#~ msgid "WEP Passphrase"
+#~ msgstr "Contrasenya WEP:"
+
+#~ msgid ""
+#~ "None\n"
+#~ "WEP Passphrase\n"
+#~ "WEP 40/128-bit hex\n"
+#~ "WEP 40/128-bit ASCII\n"
+#~ msgstr ""
+#~ "Cap\n"
+#~ "Contrasenya WEP\n"
+#~ "WEP 40/128-bit hex\n"
+#~ "WEP 40/128-bit ASCII\n"
+
+#~ msgid "leap_subwindow"
+#~ msgstr "leap_subwindow"
+
+#~ msgid "wep_key_subwindow"
+#~ msgstr "wep_key_subwindow"
+
+#~ msgid "wep_passphrase_subwindow"
+#~ msgstr "wep_passphrase_subwindow"
+
+#~ msgid "wpa_psk_subwindow"
+#~ msgstr "wpa_psk_subwindow"
+
 #~ msgid ""
 #~ "The requested wireless network '%s' does not appear to be in range.  A "
 #~ "different wireless network will be used if any are available."
diff --git a/po/cs.po b/po/cs.po
index e728831309..f948e781a5 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-28 20:14+0100\n"
+"POT-Creation-Date: 2006-05-29 18:33+0200\n"
 "PO-Revision-Date: 2006-02-28 22:13+0100\n"
 "Last-Translator: Miloslav Trmac <mitr@volny.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -18,17 +18,17 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:923
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:919
 #, c-format
 msgid "Passphrase for wireless network %s"
 msgstr "Heslo pro bezdrátovou síť %s"
 
-#: ../gnome/applet/applet-dbus.c:259
+#: ../gnome/applet/applet-dbus.c:265
 #, c-format
 msgid "Connection to the wireless network '%s' failed."
 msgstr "Připojení k bezdrátové síti '%s' selhalo."
 
-#: ../gnome/applet/applet-dbus.c:264
+#: ../gnome/applet/applet-dbus.c:270
 msgid "Connection to the wired network failed."
 msgstr "Připojení k drátové síti selhalo."
 
@@ -36,56 +36,56 @@ msgstr "Připojení k drátové síti selhalo."
 msgid "Error displaying connection information:"
 msgstr "Chyba při zobrazování informací o připojení:"
 
-#: ../gnome/applet/applet.c:201
+#: ../gnome/applet/applet.c:202
 msgid "Could not find some required resources (the glade file)!"
 msgstr "Nemohu najít některé vyžadované zdroje (soubor glade)!"
 
-#: ../gnome/applet/applet.c:212
+#: ../gnome/applet/applet.c:213
 msgid "No active connections!"
 msgstr "Žádná aktivní připojení!"
 
-#: ../gnome/applet/applet.c:229
+#: ../gnome/applet/applet.c:234
 #, c-format
 msgid "Wired Ethernet (%s)"
 msgstr "Drátový Ethernet (%s)"
 
-#: ../gnome/applet/applet.c:231
+#: ../gnome/applet/applet.c:236
 #, c-format
 msgid "Wireless Ethernet (%s)"
 msgstr "Bezdrátový Ethernet (%s)"
 
-#: ../gnome/applet/applet.c:328 ../gnome/applet/applet.c:353
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:362
 msgid "NetworkManager Applet"
 msgstr "Aplet NetworkManager"
 
-#: ../gnome/applet/applet.c:330 ../gnome/applet/applet.c:355
+#: ../gnome/applet/applet.c:339 ../gnome/applet/applet.c:364
 msgid "Copyright © 2004-2005 Red Hat, Inc."
 msgstr "Copyright © 2004-2005 Red Hat, Inc."
 
-#: ../gnome/applet/applet.c:331 ../gnome/applet/applet.c:356
+#: ../gnome/applet/applet.c:340 ../gnome/applet/applet.c:365
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Aplet oznamovací oblasti pro správu vašich síťových zařízení a připojení."
 
-#: ../gnome/applet/applet.c:334 ../gnome/applet/applet.c:361
+#: ../gnome/applet/applet.c:343 ../gnome/applet/applet.c:370
 msgid "translator-credits"
 msgstr "Miloslav Trma� <mitr@volny.cz>"
 
-#: ../gnome/applet/applet.c:417
+#: ../gnome/applet/applet.c:426
 msgid "VPN Login Failure"
 msgstr "Chyba přihlášení k VPN"
 
-#: ../gnome/applet/applet.c:418
+#: ../gnome/applet/applet.c:427
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a login failure."
 msgstr "Nemohu spustit připojení k VPN '%s' kvůli chybě přihlášení."
 
-#: ../gnome/applet/applet.c:422
+#: ../gnome/applet/applet.c:431
 msgid "VPN Start Failure"
 msgstr "Chyba spuštění VPN"
 
-#: ../gnome/applet/applet.c:423
+#: ../gnome/applet/applet.c:432
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
@@ -93,25 +93,25 @@ msgid ""
 msgstr ""
 "Nemohu spustit připojení k VPN '%s' kvůli chybě spouštění programu pro VPN."
 
-#: ../gnome/applet/applet.c:427 ../gnome/applet/applet.c:437
+#: ../gnome/applet/applet.c:436 ../gnome/applet/applet.c:446
 msgid "VPN Connect Failure"
 msgstr "Chyba připojení k VPN"
 
-#: ../gnome/applet/applet.c:428
+#: ../gnome/applet/applet.c:437
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a connection error."
 msgstr "Nemohu spustit připojení k VPN '%s' kvůli chybě připojení."
 
-#: ../gnome/applet/applet.c:432
+#: ../gnome/applet/applet.c:441
 msgid "VPN Configuration Error"
 msgstr "Chyba nastavení VPN"
 
-#: ../gnome/applet/applet.c:433
+#: ../gnome/applet/applet.c:442
 #, c-format
 msgid "The VPN connection '%s' was not correctly configured."
 msgstr "Připojení k VPN '%s' nebylo správně nastaveno."
 
-#: ../gnome/applet/applet.c:438
+#: ../gnome/applet/applet.c:447
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' because the VPN server did not "
@@ -120,13 +120,13 @@ msgstr ""
 "Nemohu spustit připojení k VPN '%s', protože VPN server nevrátil "
 "odpovídající nastavení sítě."
 
-#: ../gnome/applet/applet.c:505
+#: ../gnome/applet/applet.c:517
 msgid "VPN Login Message"
 msgstr "Zpráva po přihlášení VPN"
 
-#: ../gnome/applet/applet.c:729 ../gnome/applet/applet.c:2481
+#: ../gnome/applet/applet.c:741 ../gnome/applet/applet.c:2508
 #: ../gnome/applet/other-network-dialog.c:453
-#: ../gnome/applet/passphrase-dialog.c:227
+#: ../gnome/applet/passphrase-dialog.c:228
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
@@ -134,163 +134,163 @@ msgstr ""
 "Aplet NetworkManager nemohl najít některé vyžadované zdroje (soubor glade "
 "nebyl nalezen)."
 
-#: ../gnome/applet/applet.c:741
+#: ../gnome/applet/applet.c:753
 #, c-format
 msgid "The network device \"%s (%s)\" does not support wireless scanning."
 msgstr "Síťové zařízení \"%s (%s)\" nepodporuje bezdrátové hledání."
 
-#: ../gnome/applet/applet.c:749
+#: ../gnome/applet/applet.c:761
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
 msgstr "Síťové zařízení \"%s (%s)\" nepodporuje detekci připojení."
 
-#: ../gnome/applet/applet.c:896
+#: ../gnome/applet/applet.c:908
 #, c-format
 msgid "Preparing device %s for the wired network..."
 msgstr "Připravuji zařízení %s pro drátovou síť..."
 
-#: ../gnome/applet/applet.c:898
+#: ../gnome/applet/applet.c:910
 #, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
 msgstr "Připravuji zařízení %s pro bezdrátovou síť '%s' ..."
 
-#: ../gnome/applet/applet.c:906
+#: ../gnome/applet/applet.c:918
 #, c-format
 msgid "Configuring device %s for the wired network..."
 msgstr "Nastavuji zařízení %s pro drátovou síť..."
 
-#: ../gnome/applet/applet.c:908
+#: ../gnome/applet/applet.c:920
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
 msgstr "Pokouším se přidat k bezdrátové síti '%s'..."
 
-#: ../gnome/applet/applet.c:916
+#: ../gnome/applet/applet.c:928
 #, c-format
 msgid "Waiting for Network Key for the wireless network '%s'..."
 msgstr "Čekám na klí� bezdrátové sítě '%s' ..."
 
-#: ../gnome/applet/applet.c:924 ../gnome/applet/applet.c:934
+#: ../gnome/applet/applet.c:936 ../gnome/applet/applet.c:946
 msgid "Requesting a network address from the wired network..."
 msgstr "Žádám síťovou adresu od drátové sítě..."
 
-#: ../gnome/applet/applet.c:926 ../gnome/applet/applet.c:936
+#: ../gnome/applet/applet.c:938 ../gnome/applet/applet.c:948
 #, c-format
 msgid "Requesting a network address from the wireless network '%s'..."
 msgstr "Žádám síťovou adresu od bezdrátové sítě '%s'..."
 
-#: ../gnome/applet/applet.c:944
+#: ../gnome/applet/applet.c:956
 msgid "Finishing connection to the wired network..."
 msgstr "Dokon�uji připojení k drátové síti..."
 
-#: ../gnome/applet/applet.c:946
+#: ../gnome/applet/applet.c:958
 #, c-format
 msgid "Finishing connection to the wireless network '%s'..."
 msgstr "Dokon�uji připojení k bezdrátové síti '%s' ..."
 
-#: ../gnome/applet/applet.c:1063
+#: ../gnome/applet/applet.c:1075
 msgid "NetworkManager is not running"
 msgstr "NetworkManager neběží"
 
-#: ../gnome/applet/applet.c:1076 ../gnome/applet/applet.c:1808
+#: ../gnome/applet/applet.c:1083 ../gnome/applet/applet.c:1828
 msgid "Networking disabled"
 msgstr "Síť zakázána"
 
-#: ../gnome/applet/applet.c:1081
+#: ../gnome/applet/applet.c:1088
 msgid "No network connection"
 msgstr "Žádné připojení k síti"
 
-#: ../gnome/applet/applet.c:1086
+#: ../gnome/applet/applet.c:1093
 msgid "Wired network connection"
 msgstr "Drátové připojení k síti"
 
-#: ../gnome/applet/applet.c:1090
+#: ../gnome/applet/applet.c:1097
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Připojen k ad-hoc bezdrátové síti"
 
-#: ../gnome/applet/applet.c:1092
+#: ../gnome/applet/applet.c:1099
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "Bezdrátové připojení k '%s' (%d%%)"
 
-#: ../gnome/applet/applet.c:1112
+#: ../gnome/applet/applet.c:1120
 #, c-format
 msgid "VPN connection to '%s'"
 msgstr "Připojení k VPN '%s'"
 
-#: ../gnome/applet/applet.c:1120
+#: ../gnome/applet/applet.c:1128
 #, c-format
 msgid "VPN connecting to '%s'"
 msgstr "Připojuji se k VPN '%s'"
 
-#: ../gnome/applet/applet.c:1533
+#: ../gnome/applet/applet.c:1541
 msgid "_Connect to Other Wireless Network..."
 msgstr "_Připojit se k jiné bezdrátové síti..."
 
-#: ../gnome/applet/applet.c:1554
+#: ../gnome/applet/applet.c:1562
 msgid "Create _New Wireless Network..."
 msgstr "Vytvořit _novou bezdrátovou síť..."
 
-#: ../gnome/applet/applet.c:1675
+#: ../gnome/applet/applet.c:1685
 msgid "_VPN Connections"
 msgstr "Připojení k _VPN"
 
-#: ../gnome/applet/applet.c:1710
+#: ../gnome/applet/applet.c:1730
 msgid "_Configure VPN..."
 msgstr "_Nastavit VPN..."
 
-#: ../gnome/applet/applet.c:1714
+#: ../gnome/applet/applet.c:1734
 msgid "_Disconnect VPN..."
 msgstr "_Odpojit VPN..."
 
-#: ../gnome/applet/applet.c:1736
+#: ../gnome/applet/applet.c:1756
 msgid "_Dial Up Connections"
 msgstr "_Vytá�ená připojení"
 
 #. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
-#: ../gnome/applet/applet.c:1747
+#: ../gnome/applet/applet.c:1767
 #, c-format
 msgid "Connect to %s..."
 msgstr "Připojit se k %s..."
 
-#: ../gnome/applet/applet.c:1753
+#: ../gnome/applet/applet.c:1773
 #, c-format
 msgid "Disconnect from %s..."
 msgstr "Odpojit se od %s..."
 
-#: ../gnome/applet/applet.c:1802
+#: ../gnome/applet/applet.c:1822
 msgid "No network devices have been found"
 msgstr "Nebylo nalezeno žádné síťové zařízení"
 
-#: ../gnome/applet/applet.c:1994
+#: ../gnome/applet/applet.c:2014
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager neběží..."
 
 #. 'Enable Networking' item
-#: ../gnome/applet/applet.c:2150
+#: ../gnome/applet/applet.c:2170
 msgid "Enable _Networking"
 msgstr "Povolit _síť"
 
 #. 'Enable Wireless' item
-#: ../gnome/applet/applet.c:2156
+#: ../gnome/applet/applet.c:2176
 msgid "Enable _Wireless"
 msgstr "Povolit _bezdrátové"
 
 #. 'Connection Information' item
-#: ../gnome/applet/applet.c:2162
+#: ../gnome/applet/applet.c:2182
 msgid "Connection _Information"
 msgstr "_Informace o spojení"
 
 #. Help item
-#: ../gnome/applet/applet.c:2173
+#: ../gnome/applet/applet.c:2193
 msgid "_Help"
 msgstr "_Nápověda"
 
 #. About item
-#: ../gnome/applet/applet.c:2182
+#: ../gnome/applet/applet.c:2202
 msgid "_About"
 msgstr "O _aplikaci"
 
-#: ../gnome/applet/applet.c:2600
+#: ../gnome/applet/applet.c:2667
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
@@ -306,59 +306,65 @@ msgstr "Otevřený systém"
 msgid "Shared Key"
 msgstr "Sdílený klí�"
 
-#: ../gnome/applet/wireless-security-option.c:209
+#: ../gnome/applet/wireless-security-option.c:208
 msgid "Automatic (Default)"
 msgstr "Automatické (implicitní)"
 
-#: ../gnome/applet/wireless-security-option.c:216
+#: ../gnome/applet/wireless-security-option.c:215
+msgid "AES-CCMP"
+msgstr "AES-CCMP"
+
+#: ../gnome/applet/wireless-security-option.c:223
 msgid "TKIP"
 msgstr "TKIP"
 
-#: ../gnome/applet/wireless-security-option.c:224
-msgid "AES-CCMP"
-msgstr "AES-CCMP"
+#: ../gnome/applet/wireless-security-option.c:231
+msgid "Dynamic WEP"
+msgstr "Dynamické WEP"
 
 #: ../gnome/applet/wso-none.c:53
 msgid "None"
 msgstr "Žádné"
 
-#: ../gnome/applet/wso-wep-ascii.c:127
-msgid "WEP 40/128-bit ASCII"
-msgstr "WEP 40/128 bitů v ASCII"
+#: ../gnome/applet/wso-wep-ascii.c:138
+msgid "WEP 64/128-bit ASCII"
+msgstr "WEP 64/128 bitů v ASCII"
 
-#: ../gnome/applet/wso-wep-hex.c:124
-msgid "WEP 40/128-bit hex"
-msgstr "WEP 40/128 bitů šestnáctkově"
+#: ../gnome/applet/wso-wep-hex.c:135
+msgid "WEP 64/128-bit Hex"
+msgstr "WEP 64/128 bitů šestnáctkově"
 
-#: ../gnome/applet/wso-wep-passphrase.c:124
-msgid "WEP Passphrase"
-msgstr "Heslo WEP"
+#: ../gnome/applet/wso-wep-passphrase.c:135
+msgid "WEP 128-bit Passphrase"
+msgstr "Heslo WEP 128 bitů"
 
-#: ../gnome/applet/wso-wpa-eap.c:202
+#: ../gnome/applet/wso-wpa-eap.c:237
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../gnome/applet/wso-wpa-eap.c:203
+#: ../gnome/applet/wso-wpa-eap.c:238
 msgid "TLS"
 msgstr "TLS"
 
-#: ../gnome/applet/wso-wpa-eap.c:204
+#: ../gnome/applet/wso-wpa-eap.c:239
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../gnome/applet/wso-wpa-eap.c:212
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
+#: ../src/nm-ap-security-wpa-eap.c:116
 msgid "WPA2 Enterprise"
 msgstr "WPA2 Enterprise"
 
-#: ../gnome/applet/wso-wpa-eap.c:214
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
+#: ../src/nm-ap-security-wpa-eap.c:121
 msgid "WPA Enterprise"
 msgstr "WPA Enterprise"
 
-#: ../gnome/applet/wso-wpa-psk.c:166
+#: ../gnome/applet/wso-wpa-psk.c:178
 msgid "WPA2 Personal"
 msgstr "WPA2 Personal"
 
-#: ../gnome/applet/wso-wpa-psk.c:168
+#: ../gnome/applet/wso-wpa-psk.c:180
 msgid "WPA Personal"
 msgstr "WPA Personal"
 
@@ -370,16 +376,16 @@ msgstr "Orientace"
 msgid "The orientation of the tray."
 msgstr "Orientace oznamovací oblasti."
 
-#: ../gnome/applet/menu-items.c:87
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Drátová síť (%s)"
 
-#: ../gnome/applet/menu-items.c:90
+#: ../gnome/applet/menu-items.c:91
 msgid "_Wired Network"
 msgstr "_Drátová síť"
 
-#: ../gnome/applet/menu-items.c:161
+#: ../gnome/applet/menu-items.c:162
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
@@ -387,14 +393,14 @@ msgstr[0] "Bezdrátová síť (%s)"
 msgstr[1] "Bezdrátové sítě (%s)"
 msgstr[2] "Bezdrátové sítě (%s)"
 
-#: ../gnome/applet/menu-items.c:163
+#: ../gnome/applet/menu-items.c:164
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Bezdrátová síť"
 msgstr[1] "Bezdrátové sítě"
 msgstr[2] "Bezdrátové sítě"
 
-#: ../gnome/applet/menu-items.c:330
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr " (neplatné Unicode)"
 
@@ -435,11 +441,11 @@ msgstr "Zadejte název bezdrátové sítě, ke které se chcete připojit."
 msgid "Connect to Other Wireless Network"
 msgstr "Připojit se k jiné bezdrátové síti"
 
-#: ../gnome/applet/passphrase-dialog.c:214
+#: ../gnome/applet/passphrase-dialog.c:215
 msgid "Error connecting to wireless network"
 msgstr "Chyba při připojování k bezdrátové síti"
 
-#: ../gnome/applet/passphrase-dialog.c:215
+#: ../gnome/applet/passphrase-dialog.c:216
 msgid ""
 "The requested wireless network requires security capabilities unsupported by "
 "your hardware."
@@ -447,13 +453,13 @@ msgstr ""
 "Požadovaná bezdrátová síť vyžaduje možnosti zabezpe�ení nepodporované vaším "
 "hardware."
 
-#: ../gnome/applet/vpn-password-dialog.c:152
-#: ../gnome/applet/vpn-password-dialog.c:189
+#: ../gnome/applet/vpn-password-dialog.c:151
+#: ../gnome/applet/vpn-password-dialog.c:188
 #, c-format
 msgid "Cannot start VPN connection '%s'"
 msgstr "Nemohu spustit připojení k VPN '%s'"
 
-#: ../gnome/applet/vpn-password-dialog.c:155
+#: ../gnome/applet/vpn-password-dialog.c:154
 #, c-format
 msgid ""
 "Could not find the authentication dialog for VPN connection type '%s'. "
@@ -462,7 +468,7 @@ msgstr ""
 "Nemohu najít autentiza�ní dialog pro typ připojení k VPN '%s'. Kontaktujte "
 "vašeho správce systému."
 
-#: ../gnome/applet/vpn-password-dialog.c:192
+#: ../gnome/applet/vpn-password-dialog.c:191
 #, c-format
 msgid ""
 "There was a problem launching the authentication dialog for VPN connection "
@@ -583,22 +589,26 @@ msgid "Interface:"
 msgstr "Rozhraní:"
 
 #: ../gnome/applet/applet.glade.h:30
+msgid "Key Type:"
+msgstr "Typ klí�e:"
+
+#: ../gnome/applet/applet.glade.h:31
 msgid "Key:"
 msgstr "Klí�:"
 
-#: ../gnome/applet/applet.glade.h:31
+#: ../gnome/applet/applet.glade.h:32
 msgid ""
 "None\n"
-"WEP Passphrase\n"
-"WEP 40/128-bit hex\n"
-"WEP 40/128-bit ASCII\n"
+"WEP 128-bit Passphrase\n"
+"WEP 64/128-bit Hex\n"
+"WEP 64/128-bit ASCII\n"
 msgstr ""
 "Žádný\n"
-"Heslo WEP\n"
-"WEP 40/128 bitů šestnáctkově\n"
-"WEP 40/128 bitů v ASCII\n"
+"Heslo WEP 128 bitů\n"
+"WEP 64/128 bitů šestnáctkově\n"
+"WEP 64/128 bitů v ASCII\n"
 
-#: ../gnome/applet/applet.glade.h:36
+#: ../gnome/applet/applet.glade.h:37
 msgid ""
 "Open System\n"
 "Shared Key"
@@ -606,111 +616,111 @@ msgstr ""
 "Otevřený systém\n"
 "Sdílený klí�"
 
-#: ../gnome/applet/applet.glade.h:38
+#: ../gnome/applet/applet.glade.h:39
 msgid "Other Wireless Network..."
 msgstr "Jiná bezdrátová síť..."
 
-#: ../gnome/applet/applet.glade.h:39
+#: ../gnome/applet/applet.glade.h:40
 msgid "Passphrase:"
 msgstr "Heslo:"
 
-#: ../gnome/applet/applet.glade.h:40
+#: ../gnome/applet/applet.glade.h:41
 msgid "Password:"
 msgstr "Heslo:"
 
-#: ../gnome/applet/applet.glade.h:41
+#: ../gnome/applet/applet.glade.h:42
 msgid "Primary DNS:"
 msgstr "Primární DNS:"
 
-#: ../gnome/applet/applet.glade.h:42
+#: ../gnome/applet/applet.glade.h:43
 msgid "Private Key File:"
 msgstr "Soubor soukromého klí�e:"
 
-#: ../gnome/applet/applet.glade.h:43
+#: ../gnome/applet/applet.glade.h:44
 msgid "Private Key Password:"
 msgstr "Heslo soukromého klí�e:"
 
-#: ../gnome/applet/applet.glade.h:44
+#: ../gnome/applet/applet.glade.h:45
 msgid "Secondary DNS:"
 msgstr "Sekundární DNS:"
 
-#: ../gnome/applet/applet.glade.h:45
+#: ../gnome/applet/applet.glade.h:46
 msgid "Select the CA Certificate File"
 msgstr "Zvolte soubor certifikátu CA"
 
-#: ../gnome/applet/applet.glade.h:46
+#: ../gnome/applet/applet.glade.h:47
 msgid "Select the Client Certificate File"
 msgstr "Zvolte soubor certifikátu klienta"
 
-#: ../gnome/applet/applet.glade.h:47
+#: ../gnome/applet/applet.glade.h:48
 msgid "Select the Private Key File"
 msgstr "Zvolte soubor soukromého klí�e"
 
-#: ../gnome/applet/applet.glade.h:48
+#: ../gnome/applet/applet.glade.h:49
+msgid "Show key"
+msgstr "Zobrazit klí�"
+
+#: ../gnome/applet/applet.glade.h:50
+msgid "Show passphrase"
+msgstr "Zobrazit heslo"
+
+#: ../gnome/applet/applet.glade.h:51
+msgid "Show password"
+msgstr "Zobrazit heslo"
+
+#: ../gnome/applet/applet.glade.h:52
+msgid "Show passwords"
+msgstr "Zobrazit hesla"
+
+#: ../gnome/applet/applet.glade.h:53
+msgid "Speed:"
+msgstr "Rychlost:"
+
+#: ../gnome/applet/applet.glade.h:54
 msgid "Subnet Mask:"
 msgstr "Maska podsítě:"
 
-#: ../gnome/applet/applet.glade.h:49
+#: ../gnome/applet/applet.glade.h:55
 msgid "Type:"
 msgstr "Typ:"
 
-#: ../gnome/applet/applet.glade.h:50
+#: ../gnome/applet/applet.glade.h:56
 msgid "User Name:"
 msgstr "Jméno uživatele:"
 
-#: ../gnome/applet/applet.glade.h:51
+#: ../gnome/applet/applet.glade.h:57
 msgid "Wireless Network Key Required"
 msgstr "Je vyžadován klí� bezdrátové sítě"
 
-#: ../gnome/applet/applet.glade.h:52
+#: ../gnome/applet/applet.glade.h:58
 msgid "Wireless _adapter:"
 msgstr "Bezdrátový _adaptér:"
 
-#: ../gnome/applet/applet.glade.h:53
+#: ../gnome/applet/applet.glade.h:59
 msgid "_Always Trust this Wireless Network"
 msgstr "_Vždy důvěřovat této bezdrátové síti"
 
-#: ../gnome/applet/applet.glade.h:54
+#: ../gnome/applet/applet.glade.h:60
 msgid "_Don't remind me again"
 msgstr "_Už mě to nepřipomínat"
 
-#: ../gnome/applet/applet.glade.h:55
+#: ../gnome/applet/applet.glade.h:61
 msgid "_Login to Network"
 msgstr "_Přihlásit se k síti"
 
-#: ../gnome/applet/applet.glade.h:56
+#: ../gnome/applet/applet.glade.h:62
 msgid "_Network Name:"
 msgstr "_Název sítě:"
 
-#: ../gnome/applet/applet.glade.h:57
+#: ../gnome/applet/applet.glade.h:63
 msgid "_Wireless Security:"
 msgstr "_Bezdrátové zabezpe�ení:"
 
-#: ../gnome/applet/applet.glade.h:58
-msgid "leap_subwindow"
-msgstr "leap_subwindow"
-
-#: ../gnome/applet/applet.glade.h:59
-msgid "wep_key_subwindow"
-msgstr "wep_key_subwindow"
-
-#: ../gnome/applet/applet.glade.h:60
-msgid "wep_passphrase_subwindow"
-msgstr "wep_passphrase_subwindow"
-
-#: ../gnome/applet/applet.glade.h:61
-msgid "wpa_eap_subwindow"
-msgstr "wpa_eap_subwindow"
-
-#: ../gnome/applet/applet.glade.h:62
-msgid "wpa_psk_subwindow"
-msgstr "wpa_psk_subwindow"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.c:358
+#: ../gnome/vpn-properties/nm-vpn-properties.c:383
 msgid "Cannot add VPN connection"
 msgstr "Nemohu přidat připojení k VPN"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:360
+#: ../gnome/vpn-properties/nm-vpn-properties.c:385
 msgid ""
 "No suitable VPN software was found on your system. Contact your system "
 "administrator."
@@ -718,11 +728,11 @@ msgstr ""
 "Ve vašem systému nebyl nalezen vhodný software pro VPN. Kontaktujte vašeho "
 "správce systému."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:411
+#: ../gnome/vpn-properties/nm-vpn-properties.c:437
 msgid "Cannot import VPN connection"
 msgstr "Nemohu importovat připojení k VPN"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:413
+#: ../gnome/vpn-properties/nm-vpn-properties.c:439
 #, c-format
 msgid ""
 "Cannot find suitable software for VPN connection type '%s' to import the "
@@ -731,12 +741,12 @@ msgstr ""
 "Nemohu najít vhodný soubor pro typ připojení k VPN '%s' pro import souboru '%"
 "s'. Kontaktujte vašeho správce systému."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:553
+#: ../gnome/vpn-properties/nm-vpn-properties.c:579
 #, c-format
 msgid "Error retrieving VPN connection '%s'"
 msgstr "Chyba při získávání připojení k VPN '%s'"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:556
+#: ../gnome/vpn-properties/nm-vpn-properties.c:582
 #, c-format
 msgid ""
 "Could not find the UI files for VPN connection type '%s'. Contact your "
@@ -745,12 +755,12 @@ msgstr ""
 "Nemohu najít soubory UI pro typ připojení k VPN '%s'. Kontaktujte vašeho "
 "správce systému."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:713
+#: ../gnome/vpn-properties/nm-vpn-properties.c:739
 #, c-format
 msgid "Delete VPN connection \"%s\"?"
 msgstr "Odstranit připojení k VPN \"%s\"?"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:716
+#: ../gnome/vpn-properties/nm-vpn-properties.c:742
 #, c-format
 msgid ""
 "All information about the VPN connection \"%s\" will be lost and you may "
@@ -760,16 +770,16 @@ msgstr ""
 "Všechny informace o připojení k VPN \"%s\" budou ztraceny a možná vám bude "
 "váš správce systému poskytnout informace pro vytvoření nového připojení."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:924
+#: ../gnome/vpn-properties/nm-vpn-properties.c:959
 msgid "Unable to load"
 msgstr "Nemohu na�íst"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:926
+#: ../gnome/vpn-properties/nm-vpn-properties.c:961
 msgid "Cannot find some needed resources (the glade file)!"
 msgstr "Nemohu najít některé vyžadované zdroje (soubor glade)!"
 
 #. Edit dialog
-#: ../gnome/vpn-properties/nm-vpn-properties.c:1034
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
 msgid "Edit VPN Connection"
 msgstr "Upravit připojení k VPN"
 
@@ -843,11 +853,11 @@ msgstr ""
 msgid "VPN Connections"
 msgstr "Připojení k VPN"
 
-#: ../src/nm-ap-security-wep.c:47
+#: ../src/nm-ap-security-wep.c:52
 msgid "40-bit WEP"
 msgstr "40 bitů WEP"
 
-#: ../src/nm-ap-security-wep.c:49
+#: ../src/nm-ap-security-wep.c:54
 msgid "104-bit WEP"
 msgstr "104 bitů WEP"
 
@@ -875,7 +885,7 @@ msgstr "WPA2 CCMP"
 msgid "WPA2 Automatic"
 msgstr "WPA2 automatické"
 
-#: ../src/nm-ap-security.c:305
+#: ../src/nm-ap-security.c:320
 msgid "none"
 msgstr "žádné"
 
@@ -914,6 +924,67 @@ msgstr "po socketu bylo posláno příliš mnoho dat a některá byla ztracena"
 msgid "error occurred while waiting for data on socket"
 msgstr "při �ekání na data ze socketu došlo k chybě"
 
+#: ../gnome/applet/applet-dbus-devices.c:898
+#, c-format
+msgid "You are now connected to the Ad-Hoc wireless network '%s'."
+msgstr "Jste právě připojen k ad-hoc bezdrátové síti '%s'."
+
+#: ../gnome/applet/applet-dbus-devices.c:903
+#, c-format
+msgid "You are now connected to the wireless network '%s'."
+msgstr "Jste právě připojeni k bezdrátové síti '%s'."
+
+#: ../gnome/applet/applet-dbus-devices.c:910
+msgid "You are now connected to the wired network."
+msgstr "Jste právě připojeni ke drátové síti."
+
+#: ../gnome/applet/applet-dbus-devices.c:916
+msgid "Connection Established"
+msgstr "Připojení navázáno"
+
+#: ../gnome/applet/applet-dbus-devices.c:959
+msgid "Disconnected"
+msgstr "Odpojen"
+
+#: ../gnome/applet/applet-dbus-devices.c:960
+msgid "The network connection has been disconnected."
+msgstr "Připojení k síti bylo odpojeno."
+
+#~ msgid "WEP 40/128-bit ASCII"
+#~ msgstr "WEP 40/128 bitů v ASCII"
+
+#~ msgid "WEP 40/128-bit hex"
+#~ msgstr "WEP 40/128 bitů šestnáctkově"
+
+#~ msgid "WEP Passphrase"
+#~ msgstr "Heslo WEP"
+
+#~ msgid ""
+#~ "None\n"
+#~ "WEP Passphrase\n"
+#~ "WEP 40/128-bit hex\n"
+#~ "WEP 40/128-bit ASCII\n"
+#~ msgstr ""
+#~ "Žádný\n"
+#~ "Heslo WEP\n"
+#~ "WEP 40/128 bitů šestnáctkově\n"
+#~ "WEP 40/128 bitů v ASCII\n"
+
+#~ msgid "leap_subwindow"
+#~ msgstr "leap_subwindow"
+
+#~ msgid "wep_key_subwindow"
+#~ msgstr "wep_key_subwindow"
+
+#~ msgid "wep_passphrase_subwindow"
+#~ msgstr "wep_passphrase_subwindow"
+
+#~ msgid "wpa_eap_subwindow"
+#~ msgstr "wpa_eap_subwindow"
+
+#~ msgid "wpa_psk_subwindow"
+#~ msgstr "wpa_psk_subwindow"
+
 #~ msgid "The VPN service said: \"%s\""
 #~ msgstr "Služba VPN řekla: \"%s\""
 
@@ -923,12 +994,6 @@ msgstr "při �ekání na data ze socketu došlo k chybě"
 #~ msgid "VPN connection '%s' said:"
 #~ msgstr "Připojení k VPN '%s' řeklo:"
 
-#~ msgid "Disconnected"
-#~ msgstr "Odpojen"
-
-#~ msgid "The network connection has been disconnected."
-#~ msgstr "Připojení k síti bylo odpojeno."
-
 #~ msgid "Connected"
 #~ msgstr "Připojen"
 
@@ -946,3 +1011,18 @@ msgstr "při �ekání na data ze socketu došlo k chybě"
 
 #~ msgid "Hex Key:"
 #~ msgstr "Klí� šestnáctkově:"
+
+#~ msgid "Stop automatically running the networking applet?"
+#~ msgstr "Vypnout automatické spouštění síťového apletu?"
+
+#~ msgid ""
+#~ "The networking applet will now terminate, but will automatically launch "
+#~ "the next time you login.  Would you like to stop automatically running "
+#~ "the networking applet on login?"
+#~ msgstr ""
+#~ "Síťový aplet bude nyní ukon�en, ale automaticky se spustí při vašem "
+#~ "příštím přihlášení. Chcete vypnout automatické spouštění síťového apletu "
+#~ "při přihlášení?"
+
+#~ msgid "_Remove"
+#~ msgstr "_Odstranit"
diff --git a/po/da.po b/po/da.po
index 019728ee6a..de7a284850 100644
--- a/po/da.po
+++ b/po/da.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-26 15:17+0100\n"
+"POT-Creation-Date: 2006-05-29 18:33+0200\n"
 "PO-Revision-Date: 2006-01-26 15:18+0100\n"
 "Last-Translator: Lasse Bang Mikkelsen <lbm@fatalerror.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -18,58 +18,59 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:934
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:919
 #, c-format
 msgid "Passphrase for wireless network %s"
 msgstr "Adgangskode til trådløst netværk %s"
 
-#: ../gnome/applet/applet-dbus.c:274
+#: ../gnome/applet/applet-dbus.c:265
 #, c-format
 msgid "Connection to the wireless network '%s' failed."
 msgstr "Tilslutning til det trådløse netværk '%s' mislykkedes."
 
-#: ../gnome/applet/applet-dbus.c:279
+#: ../gnome/applet/applet-dbus.c:270
 msgid "Connection to the wired network failed."
 msgstr "Tilslutning til det kablede netværk mislykkedes."
 
-#: ../gnome/applet/applet.c:180
-msgid "Error displaying connection information: "
+#: ../gnome/applet/applet.c:184
+#, fuzzy
+msgid "Error displaying connection information:"
 msgstr "Fejl ved visning af forbindelses-information: "
 
-#: ../gnome/applet/applet.c:199
+#: ../gnome/applet/applet.c:202
 msgid "Could not find some required resources (the glade file)!"
 msgstr "Kunne ikke finde nogle krævede ressourcer (glade-filen)!"
 
-#: ../gnome/applet/applet.c:210
+#: ../gnome/applet/applet.c:213
 msgid "No active connections!"
 msgstr "Ingen aktive forbindelser!"
 
-#: ../gnome/applet/applet.c:225
+#: ../gnome/applet/applet.c:234
 #, c-format
 msgid "Wired Ethernet (%s)"
 msgstr "Kablet Ethernet (%s)"
 
-#: ../gnome/applet/applet.c:227
+#: ../gnome/applet/applet.c:236
 #, c-format
 msgid "Wireless Ethernet (%s)"
 msgstr "Trådløst Ethernet (%s)"
 
-#: ../gnome/applet/applet.c:321 ../gnome/applet/applet.c:346
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:362
 msgid "NetworkManager Applet"
 msgstr "NetworkManager-panelprogram"
 
-#: ../gnome/applet/applet.c:323 ../gnome/applet/applet.c:348
+#: ../gnome/applet/applet.c:339 ../gnome/applet/applet.c:364
 msgid "Copyright © 2004-2005 Red Hat, Inc."
 msgstr "Copyright © 2004-2005 Red Hat, Inc."
 
-#: ../gnome/applet/applet.c:324 ../gnome/applet/applet.c:349
+#: ../gnome/applet/applet.c:340 ../gnome/applet/applet.c:365
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Statusfelt-panelprogram til håndtering af dine netværks-enheder og -"
 "forbindelser."
 
-#: ../gnome/applet/applet.c:327 ../gnome/applet/applet.c:354
+#: ../gnome/applet/applet.c:343 ../gnome/applet/applet.c:370
 msgid "translator-credits"
 msgstr ""
 "David Nielsen\n"
@@ -79,24 +80,20 @@ msgstr ""
 "Dansk-gruppen <dansk@dansk-gruppen.dk>\n"
 "Mere info: http://www.dansk-gruppen.dk"
 
-#: ../gnome/applet/applet.c:439
-msgid "VPN Error"
-msgstr "VPN fejl"
-
-#: ../gnome/applet/applet.c:443
+#: ../gnome/applet/applet.c:426
 msgid "VPN Login Failure"
 msgstr "VPN logind-fejl"
 
-#: ../gnome/applet/applet.c:444
+#: ../gnome/applet/applet.c:427
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a login failure."
 msgstr "Kunne ikke etablere VPN-forbindelsen '%s' pågrund af en logind-fejl."
 
-#: ../gnome/applet/applet.c:448
+#: ../gnome/applet/applet.c:431
 msgid "VPN Start Failure"
 msgstr "VPN etablerings-fejl"
 
-#: ../gnome/applet/applet.c:449
+#: ../gnome/applet/applet.c:432
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
@@ -105,26 +102,26 @@ msgstr ""
 "Kunne ikke etablere VPN-forbindelsen '%s' pågrund af fejl ved start af VPN-"
 "program."
 
-#: ../gnome/applet/applet.c:453 ../gnome/applet/applet.c:463
+#: ../gnome/applet/applet.c:436 ../gnome/applet/applet.c:446
 msgid "VPN Connect Failure"
 msgstr "VPN tilslutnings-fejl"
 
-#: ../gnome/applet/applet.c:454
+#: ../gnome/applet/applet.c:437
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a connection error."
 msgstr ""
 "Kunne ikke etablere VPN-forbindelsen '%s' pågrund af en forbindelses-fejl."
 
-#: ../gnome/applet/applet.c:458
+#: ../gnome/applet/applet.c:441
 msgid "VPN Configuration Error"
 msgstr "VPN konfigurations-fejl"
 
-#: ../gnome/applet/applet.c:459
+#: ../gnome/applet/applet.c:442
 #, c-format
 msgid "The VPN connection '%s' was not correctly configured."
 msgstr "VPN-forbindelsen '%s' er ikke konfigureret korrekt."
 
-#: ../gnome/applet/applet.c:464
+#: ../gnome/applet/applet.c:447
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' because the VPN server did not "
@@ -133,23 +130,13 @@ msgstr ""
 "Kunne ikke etablere VPN-forbindelsen '%s' fordi VPN-serveren ikke "
 "returnerede en passende netværks-konfiguration."
 
-#: ../gnome/applet/applet.c:472
-#, c-format
-msgid "The VPN service said: \"%s\""
-msgstr "VPN-tjenesten sagde: \"%s\""
-
-#: ../gnome/applet/applet.c:541
-#, c-format
-msgid "VPN connection '%s' said:"
-msgstr "VPN-forbindelsen '%s' sagde:"
-
-#: ../gnome/applet/applet.c:543
+#: ../gnome/applet/applet.c:517
 msgid "VPN Login Message"
 msgstr "VPN logind-meddelelse"
 
-#: ../gnome/applet/applet.c:760 ../gnome/applet/applet.c:2514
-#: ../gnome/applet/other-network-dialog.c:457
-#: ../gnome/applet/passphrase-dialog.c:209
+#: ../gnome/applet/applet.c:741 ../gnome/applet/applet.c:2508
+#: ../gnome/applet/other-network-dialog.c:453
+#: ../gnome/applet/passphrase-dialog.c:228
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
@@ -157,163 +144,163 @@ msgstr ""
 "NetworkManager panelprogrammet kunne ikke finde nogle krævede ressourcer "
 "(glade-filen blev ikke fundet)."
 
-#: ../gnome/applet/applet.c:772
+#: ../gnome/applet/applet.c:753
 #, c-format
 msgid "The network device \"%s (%s)\" does not support wireless scanning."
 msgstr "Netværks-enheden \"%s (%s)\" understøtter ikke trådløs scanning."
 
-#: ../gnome/applet/applet.c:780
+#: ../gnome/applet/applet.c:761
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
 msgstr "Netværks-enheden \"%s (%s)\" understøtter ikke link-detektering."
 
-#: ../gnome/applet/applet.c:928
+#: ../gnome/applet/applet.c:908
 #, c-format
 msgid "Preparing device %s for the wired network..."
 msgstr "Klargører enheden %s til det kablede netværk..."
 
-#: ../gnome/applet/applet.c:930
+#: ../gnome/applet/applet.c:910
 #, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
 msgstr "Klargører enheden %s til det trådløse netværk '%s'..."
 
-#: ../gnome/applet/applet.c:938
+#: ../gnome/applet/applet.c:918
 #, c-format
 msgid "Configuring device %s for the wired network..."
 msgstr "Konfigurerer enheden %s til det kablede netværk..."
 
-#: ../gnome/applet/applet.c:940
+#: ../gnome/applet/applet.c:920
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
 msgstr "Forsøger at tilslutte til det trådløse netværk '%s'..."
 
-#: ../gnome/applet/applet.c:948
+#: ../gnome/applet/applet.c:928
 #, c-format
 msgid "Waiting for Network Key for the wireless network '%s'..."
 msgstr "Venter på netværksnøglen til det trådløse netværk '%s'..."
 
-#: ../gnome/applet/applet.c:956 ../gnome/applet/applet.c:966
+#: ../gnome/applet/applet.c:936 ../gnome/applet/applet.c:946
 msgid "Requesting a network address from the wired network..."
 msgstr "Forespørger en netværks-adresse fra det kablede netværk..."
 
-#: ../gnome/applet/applet.c:958 ../gnome/applet/applet.c:968
+#: ../gnome/applet/applet.c:938 ../gnome/applet/applet.c:948
 #, c-format
 msgid "Requesting a network address from the wireless network '%s'..."
 msgstr "Forespørger en netværks-adresse fra det trådløse netværk '%s'..."
 
-#: ../gnome/applet/applet.c:976
+#: ../gnome/applet/applet.c:956
 msgid "Finishing connection to the wired network..."
 msgstr "Færdiggører tilslutning til det kablede netværk..."
 
-#: ../gnome/applet/applet.c:978
+#: ../gnome/applet/applet.c:958
 #, c-format
 msgid "Finishing connection to the wireless network '%s'..."
 msgstr "Færdiggører tilslutning til det trådløse netværk '%s'..."
 
-#: ../gnome/applet/applet.c:1095
+#: ../gnome/applet/applet.c:1075
 msgid "NetworkManager is not running"
 msgstr "NetworkManager kører ikke"
 
-#: ../gnome/applet/applet.c:1108 ../gnome/applet/applet.c:1842
+#: ../gnome/applet/applet.c:1083 ../gnome/applet/applet.c:1828
 msgid "Networking disabled"
 msgstr "Netværks-understøttelse deaktiveret"
 
-#: ../gnome/applet/applet.c:1113
+#: ../gnome/applet/applet.c:1088
 msgid "No network connection"
 msgstr "Ingen netværks-forbindelse"
 
-#: ../gnome/applet/applet.c:1118
+#: ../gnome/applet/applet.c:1093
 msgid "Wired network connection"
 msgstr "Kablet netværks-forbindelse"
 
-#: ../gnome/applet/applet.c:1122
+#: ../gnome/applet/applet.c:1097
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Tilsluttet til et trådløst ad hoc netværk"
 
-#: ../gnome/applet/applet.c:1124
+#: ../gnome/applet/applet.c:1099
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "Trådløs netværks-forbindelse til '%s' (%d%%)"
 
-#: ../gnome/applet/applet.c:1146
+#: ../gnome/applet/applet.c:1120
 #, c-format
 msgid "VPN connection to '%s'"
 msgstr "VPN-forbindelse til '%s'"
 
-#: ../gnome/applet/applet.c:1154
+#: ../gnome/applet/applet.c:1128
 #, c-format
 msgid "VPN connecting to '%s'"
 msgstr "VPN tilslutter til '%s'"
 
-#: ../gnome/applet/applet.c:1567
+#: ../gnome/applet/applet.c:1541
 msgid "_Connect to Other Wireless Network..."
 msgstr "_Tilslut til andet trådløst netværk..."
 
-#: ../gnome/applet/applet.c:1588
+#: ../gnome/applet/applet.c:1562
 msgid "Create _New Wireless Network..."
 msgstr "Opret _nyt trådløst netværk..."
 
-#: ../gnome/applet/applet.c:1709
+#: ../gnome/applet/applet.c:1685
 msgid "_VPN Connections"
 msgstr "_VPN-forbindelser"
 
-#: ../gnome/applet/applet.c:1744
+#: ../gnome/applet/applet.c:1730
 msgid "_Configure VPN..."
 msgstr "_Konfigurér VPN..."
 
-#: ../gnome/applet/applet.c:1748
+#: ../gnome/applet/applet.c:1734
 msgid "_Disconnect VPN..."
 msgstr "_Afbryd VPN..."
 
-#: ../gnome/applet/applet.c:1770
+#: ../gnome/applet/applet.c:1756
 msgid "_Dial Up Connections"
 msgstr "_Opkalds-forbindelser"
 
 #. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
-#: ../gnome/applet/applet.c:1781
+#: ../gnome/applet/applet.c:1767
 #, c-format
 msgid "Connect to %s..."
 msgstr "Tilslut til %s..."
 
-#: ../gnome/applet/applet.c:1787
+#: ../gnome/applet/applet.c:1773
 #, c-format
 msgid "Disconnect from %s..."
 msgstr "Afbryd fra %s..."
 
-#: ../gnome/applet/applet.c:1836
+#: ../gnome/applet/applet.c:1822
 msgid "No network devices have been found"
 msgstr "Ingen netværks-enheder blev fundet"
 
-#: ../gnome/applet/applet.c:2028
+#: ../gnome/applet/applet.c:2014
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager kører ikke..."
 
 #. 'Enable Networking' item
-#: ../gnome/applet/applet.c:2184
+#: ../gnome/applet/applet.c:2170
 msgid "Enable _Networking"
 msgstr "Aktivér _netværks-understøttelse"
 
 #. 'Enable Wireless' item
-#: ../gnome/applet/applet.c:2190
+#: ../gnome/applet/applet.c:2176
 msgid "Enable _Wireless"
 msgstr "Aktivér _trådløst netværk"
 
 #. 'Connection Information' item
-#: ../gnome/applet/applet.c:2196
+#: ../gnome/applet/applet.c:2182
 msgid "Connection _Information"
 msgstr "Forbindelses-_information"
 
 #. Help item
-#: ../gnome/applet/applet.c:2207
+#: ../gnome/applet/applet.c:2193
 msgid "_Help"
 msgstr "_Hjælp"
 
 #. About item
-#: ../gnome/applet/applet.c:2216
+#: ../gnome/applet/applet.c:2202
 msgid "_About"
 msgstr "_Om"
 
-#: ../gnome/applet/applet.c:2633
+#: ../gnome/applet/applet.c:2667
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
@@ -321,73 +308,116 @@ msgstr ""
 "NetworkManager panelprogrammet kunne ikke finde nogle krævede ressourcer - "
 "kan ikke fortsætte.\n"
 
-#: ../gnome/applet/wireless-security-option.c:158
+#: ../gnome/applet/wireless-security-option.c:157
 msgid "Open System"
 msgstr "Ã…bent system"
 
-#: ../gnome/applet/wireless-security-option.c:161
+#: ../gnome/applet/wireless-security-option.c:160
 msgid "Shared Key"
 msgstr "Delt nøgle"
 
-#: ../gnome/applet/wireless-security-option.c:212
-msgid "TKIP (Default)"
+#: ../gnome/applet/wireless-security-option.c:208
+#, fuzzy
+msgid "Automatic (Default)"
 msgstr "TKIP (forvalgt)"
 
-#: ../gnome/applet/wireless-security-option.c:221
+#: ../gnome/applet/wireless-security-option.c:215
 msgid "AES-CCMP"
 msgstr "AES-CCMP"
 
+#: ../gnome/applet/wireless-security-option.c:223
+#, fuzzy
+msgid "TKIP"
+msgstr "WPA TKIP"
+
+#: ../gnome/applet/wireless-security-option.c:231
+msgid "Dynamic WEP"
+msgstr ""
+
 #: ../gnome/applet/wso-none.c:53
 msgid "None"
 msgstr "Ingen"
 
-#: ../gnome/applet/wso-wep-ascii.c:128
-msgid "WEP 40/128-bit ASCII"
+#: ../gnome/applet/wso-wep-ascii.c:138
+#, fuzzy
+msgid "WEP 64/128-bit ASCII"
 msgstr "WEP 40/128-bit ASCII"
 
-#: ../gnome/applet/wso-wep-hex.c:125
-msgid "WEP 40/128-bit hex"
+#: ../gnome/applet/wso-wep-hex.c:135
+#, fuzzy
+msgid "WEP 64/128-bit Hex"
 msgstr "WEP 40/128-bit hex"
 
-#: ../gnome/applet/wso-wep-passphrase.c:125
-msgid "WEP Passphrase"
+#: ../gnome/applet/wso-wep-passphrase.c:135
+#, fuzzy
+msgid "WEP 128-bit Passphrase"
 msgstr "WEP-adgangskode:"
 
-#: ../gnome/applet/eggtrayicon.c:128
+#: ../gnome/applet/wso-wpa-eap.c:237
+msgid "PEAP"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:238
+msgid "TLS"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:239
+msgid "TTLS"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
+#: ../src/nm-ap-security-wpa-eap.c:116
+msgid "WPA2 Enterprise"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
+#: ../src/nm-ap-security-wpa-eap.c:121
+msgid "WPA Enterprise"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-psk.c:178
+msgid "WPA2 Personal"
+msgstr "Personlig WPA2"
+
+#: ../gnome/applet/wso-wpa-psk.c:180
+msgid "WPA Personal"
+msgstr "Personlig WPA"
+
+#: ../gnome/applet/eggtrayicon.c:134
 msgid "Orientation"
 msgstr "Retning"
 
-#: ../gnome/applet/eggtrayicon.c:129
+#: ../gnome/applet/eggtrayicon.c:135
 msgid "The orientation of the tray."
 msgstr "Retningen på statusikonet."
 
-#: ../gnome/applet/menu-items.c:87
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Kablet netværk (%s)"
 
-#: ../gnome/applet/menu-items.c:90
+#: ../gnome/applet/menu-items.c:91
 msgid "_Wired Network"
 msgstr "_Kablet netværk"
 
-#: ../gnome/applet/menu-items.c:161
+#: ../gnome/applet/menu-items.c:162
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
 msgstr[0] "Trådløst netværk (%s)"
 msgstr[1] "Trådløse netværk (%s)"
 
-#: ../gnome/applet/menu-items.c:163
+#: ../gnome/applet/menu-items.c:164
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Trådløst netværk"
 msgstr[1] "Trådløse netværk"
 
-#: ../gnome/applet/menu-items.c:330
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr " (ugyldig Unicode)"
 
-#: ../gnome/applet/other-network-dialog.c:354
+#: ../gnome/applet/other-network-dialog.c:352
 #, c-format
 msgid ""
 "By default, the wireless network's name is set to your computer's name, %s, "
@@ -396,11 +426,11 @@ msgstr ""
 "Som standard navngives det trådløse netværk til din maskines navn, %s, uden "
 "nogen kryptering slået til"
 
-#: ../gnome/applet/other-network-dialog.c:360
+#: ../gnome/applet/other-network-dialog.c:358
 msgid "Create new wireless network"
 msgstr "Opret nyt trådløst netværk"
 
-#: ../gnome/applet/other-network-dialog.c:361
+#: ../gnome/applet/other-network-dialog.c:359
 msgid ""
 "Enter the name and security settings of the wireless network you wish to "
 "create."
@@ -408,29 +438,40 @@ msgstr ""
 "Indtast navn- og sikkerhedsopsætning på det trådløse netværk du ønsker at "
 "oprette."
 
-#: ../gnome/applet/other-network-dialog.c:365
+#: ../gnome/applet/other-network-dialog.c:363
 msgid "Create New Wireless Network"
 msgstr "Opret nyt trådløst netværk"
 
-#: ../gnome/applet/other-network-dialog.c:370
+#: ../gnome/applet/other-network-dialog.c:368
 msgid "Existing wireless network"
 msgstr "Eksisterende trådløst netværk"
 
-#: ../gnome/applet/other-network-dialog.c:371
+#: ../gnome/applet/other-network-dialog.c:369
 msgid "Enter the name of the wireless network to which you wish to connect."
 msgstr "Indtast navnet på det trådløse netværk du ønsker at tilslutte dig."
 
-#: ../gnome/applet/other-network-dialog.c:373
+#: ../gnome/applet/other-network-dialog.c:371
 msgid "Connect to Other Wireless Network"
 msgstr "Tilslut til andet trådløst netværk"
 
-#: ../gnome/applet/vpn-password-dialog.c:152
-#: ../gnome/applet/vpn-password-dialog.c:189
+#: ../gnome/applet/passphrase-dialog.c:215
+#, fuzzy
+msgid "Error connecting to wireless network"
+msgstr "Eksisterende trådløst netværk"
+
+#: ../gnome/applet/passphrase-dialog.c:216
+msgid ""
+"The requested wireless network requires security capabilities unsupported by "
+"your hardware."
+msgstr ""
+
+#: ../gnome/applet/vpn-password-dialog.c:151
+#: ../gnome/applet/vpn-password-dialog.c:188
 #, c-format
 msgid "Cannot start VPN connection '%s'"
 msgstr "Kan ikke etablere VPN-forbindelsen '%s'"
 
-#: ../gnome/applet/vpn-password-dialog.c:155
+#: ../gnome/applet/vpn-password-dialog.c:154
 #, c-format
 msgid ""
 "Could not find the authentication dialog for VPN connection type '%s'. "
@@ -439,7 +480,7 @@ msgstr ""
 "Kunne ikke finde godkendelses-vinduet til VPN-forbindelsestypen '%s'. "
 "Kontakt din system-administrator."
 
-#: ../gnome/applet/vpn-password-dialog.c:192
+#: ../gnome/applet/vpn-password-dialog.c:191
 #, c-format
 msgid ""
 "There was a problem launching the authentication dialog for VPN connection "
@@ -503,58 +544,88 @@ msgstr ""
 "NetworkManager vil ikke spørge i fremtiden."
 
 #: ../gnome/applet/applet.glade.h:15
+msgid "Anonymous Identity:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:16
 msgid "Authentication:"
 msgstr "Godkendelse:"
 
-#: ../gnome/applet/applet.glade.h:16
+#: ../gnome/applet/applet.glade.h:17
 msgid "Broadcast Address:"
 msgstr "Rundsendings-adresse:"
 
-#: ../gnome/applet/applet.glade.h:17
+#: ../gnome/applet/applet.glade.h:18
+msgid "CA Certificate File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:19
 msgid "C_onnect"
 msgstr "T_ilslut"
 
-#: ../gnome/applet/applet.glade.h:18
+#: ../gnome/applet/applet.glade.h:20
+msgid "Client Certificate File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:21
 msgid "Connection Information"
 msgstr "Forbindelses-information"
 
-#: ../gnome/applet/applet.glade.h:19
+#: ../gnome/applet/applet.glade.h:22
 msgid "Default Route:"
 msgstr "Standard rute:"
 
-#: ../gnome/applet/applet.glade.h:20
+#: ../gnome/applet/applet.glade.h:23
 msgid "Destination Address:"
 msgstr "Destinations-adresse:"
 
-#: ../gnome/applet/applet.glade.h:21
+#: ../gnome/applet/applet.glade.h:24
+msgid "Driver:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:25
+msgid "EAP Method:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:26
 msgid "Hardware Address:"
 msgstr "Hardware-adresse:"
 
-#: ../gnome/applet/applet.glade.h:22
+#: ../gnome/applet/applet.glade.h:27
 msgid "IP Address:"
 msgstr "IP-adresse:"
 
-#: ../gnome/applet/applet.glade.h:23
+#: ../gnome/applet/applet.glade.h:28
+msgid "Identity:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:29
 msgid "Interface:"
 msgstr "Enhed:"
 
-#: ../gnome/applet/applet.glade.h:24
+#: ../gnome/applet/applet.glade.h:30
+#, fuzzy
+msgid "Key Type:"
+msgstr "Type:"
+
+#: ../gnome/applet/applet.glade.h:31
 msgid "Key:"
 msgstr "Nøgle:"
 
-#: ../gnome/applet/applet.glade.h:25
+#: ../gnome/applet/applet.glade.h:32
+#, fuzzy
 msgid ""
 "None\n"
-"WEP Passphrase\n"
-"WEP 40/128-bit hex\n"
-"WEP 40/128-bit ASCII\n"
+"WEP 128-bit Passphrase\n"
+"WEP 64/128-bit Hex\n"
+"WEP 64/128-bit ASCII\n"
 msgstr ""
 "Ingen\n"
 "WEP-adgangskode\n"
 "WEP 40/128-bit hex\n"
 "WEP 40/128-bit ASCII\n"
 
-#: ../gnome/applet/applet.glade.h:30
+#: ../gnome/applet/applet.glade.h:37
 msgid ""
 "Open System\n"
 "Shared Key"
@@ -562,95 +633,114 @@ msgstr ""
 "Ã…bent system\n"
 "Delt nøgle"
 
-#: ../gnome/applet/applet.glade.h:32
+#: ../gnome/applet/applet.glade.h:39
 msgid "Other Wireless Network..."
 msgstr "Andet trådløst netværk..."
 
-#: ../gnome/applet/applet.glade.h:33
+#: ../gnome/applet/applet.glade.h:40
 msgid "Passphrase:"
 msgstr "Adgangskode:"
 
-#: ../gnome/applet/applet.glade.h:34
+#: ../gnome/applet/applet.glade.h:41
 msgid "Password:"
 msgstr "Adgangskode:"
 
-#: ../gnome/applet/applet.glade.h:35
+#: ../gnome/applet/applet.glade.h:42
 msgid "Primary DNS:"
 msgstr "Primær DNS:"
 
-#: ../gnome/applet/applet.glade.h:36
+#: ../gnome/applet/applet.glade.h:43
+msgid "Private Key File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:44
+msgid "Private Key Password:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:45
 msgid "Secondary DNS:"
 msgstr "Sekundær DNS:"
 
-#: ../gnome/applet/applet.glade.h:37
+#: ../gnome/applet/applet.glade.h:46
+msgid "Select the CA Certificate File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:47
+msgid "Select the Client Certificate File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:48
+msgid "Select the Private Key File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:49
+msgid "Show key"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:50
+#, fuzzy
+msgid "Show passphrase"
+msgstr "Adgangskode:"
+
+#: ../gnome/applet/applet.glade.h:51
+#, fuzzy
+msgid "Show password"
+msgstr "Adgangskode:"
+
+#: ../gnome/applet/applet.glade.h:52
+#, fuzzy
+msgid "Show passwords"
+msgstr "Adgangskode:"
+
+#: ../gnome/applet/applet.glade.h:53
+msgid "Speed:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:54
 msgid "Subnet Mask:"
 msgstr "Undernet-maske:"
 
-#: ../gnome/applet/applet.glade.h:38
+#: ../gnome/applet/applet.glade.h:55
 msgid "Type:"
 msgstr "Type:"
 
-#: ../gnome/applet/applet.glade.h:39
+#: ../gnome/applet/applet.glade.h:56
 msgid "User Name:"
 msgstr "Brugernavn:"
 
-#: ../gnome/applet/applet.glade.h:40
+#: ../gnome/applet/applet.glade.h:57
 msgid "Wireless Network Key Required"
 msgstr "Nøgle til trådløst netværk påkrævet"
 
-#: ../gnome/applet/applet.glade.h:41
+#: ../gnome/applet/applet.glade.h:58
 msgid "Wireless _adapter:"
 msgstr "Trådløs _adapter:"
 
-#: ../gnome/applet/applet.glade.h:42
+#: ../gnome/applet/applet.glade.h:59
 msgid "_Always Trust this Wireless Network"
 msgstr "_Stol altid på dette trådløse netværk"
 
-#: ../gnome/applet/applet.glade.h:43
+#: ../gnome/applet/applet.glade.h:60
 msgid "_Don't remind me again"
 msgstr "_PÃ¥mind mig ikke igen"
 
-#: ../gnome/applet/applet.glade.h:44
+#: ../gnome/applet/applet.glade.h:61
 msgid "_Login to Network"
 msgstr "_Log på netværk"
 
-#: ../gnome/applet/applet.glade.h:45
+#: ../gnome/applet/applet.glade.h:62
 msgid "_Network Name:"
 msgstr "_Netværksnavn:"
 
-#: ../gnome/applet/applet.glade.h:46
+#: ../gnome/applet/applet.glade.h:63
 msgid "_Wireless Security:"
 msgstr "Trådløs sikkerhed:"
 
-#: ../gnome/applet/applet.glade.h:47
-msgid "leap_subwindow"
-msgstr "leap_subwindow"
-
-#: ../gnome/applet/applet.glade.h:48
-msgid "wep_key_subwindow"
-msgstr "wep_key_subwindow"
-
-#: ../gnome/applet/applet.glade.h:49
-msgid "wep_passphrase_subwindow"
-msgstr "wep_passphrase_subwindow"
-
-#: ../gnome/applet/applet.glade.h:50
-msgid "wpa_psk_subwindow"
-msgstr "wpa_psk_subwindow"
-
-#: ../gnome/applet/wso-wpa-psk.c:171
-msgid "WPA2 Personal"
-msgstr "Personlig WPA2"
-
-#: ../gnome/applet/wso-wpa-psk.c:173
-msgid "WPA Personal"
-msgstr "Personlig WPA"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.c:358
+#: ../gnome/vpn-properties/nm-vpn-properties.c:383
 msgid "Cannot add VPN connection"
 msgstr "Kan ikke tilføje VPN-forbindelse"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:360
+#: ../gnome/vpn-properties/nm-vpn-properties.c:385
 msgid ""
 "No suitable VPN software was found on your system. Contact your system "
 "administrator."
@@ -658,11 +748,11 @@ msgstr ""
 "Ingen passende VPN-programmel blev fundet på dit system. Kontakt din system-"
 "administrator."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:412
+#: ../gnome/vpn-properties/nm-vpn-properties.c:437
 msgid "Cannot import VPN connection"
 msgstr "Kan ikke importere VPN-forbindelse"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:414
+#: ../gnome/vpn-properties/nm-vpn-properties.c:439
 #, c-format
 msgid ""
 "Cannot find suitable software for VPN connection type '%s' to import the "
@@ -671,12 +761,12 @@ msgstr ""
 "Kan ikke finde passende programmel til VPN-forbindelsestypen '%s', til "
 "import af filen '%s'. Kontakt din system-administrator."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:554
+#: ../gnome/vpn-properties/nm-vpn-properties.c:579
 #, c-format
 msgid "Error retrieving VPN connection '%s'"
 msgstr "Fejl ved hentning af VPN-forbindelsen '%s'"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:557
+#: ../gnome/vpn-properties/nm-vpn-properties.c:582
 #, c-format
 msgid ""
 "Could not find the UI files for VPN connection type '%s'. Contact your "
@@ -685,12 +775,12 @@ msgstr ""
 "Kunne ikke finde brugergrænseflade-filerne til VPN-forbindelsestypen '%s'. "
 "Kontakt din system-administrator."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:717
+#: ../gnome/vpn-properties/nm-vpn-properties.c:739
 #, c-format
 msgid "Delete VPN connection \"%s\"?"
 msgstr "Slet VPN-forbindelsen \"%s\"?"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:720
+#: ../gnome/vpn-properties/nm-vpn-properties.c:742
 #, c-format
 msgid ""
 "All information about the VPN connection \"%s\" will be lost and you may "
@@ -701,16 +791,16 @@ msgstr ""
 "muligvis brug for din system-administrator, som kan give dig de nødvendige "
 "informationer til oprettelse af en ny forbindelse."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:926
+#: ../gnome/vpn-properties/nm-vpn-properties.c:959
 msgid "Unable to load"
 msgstr "Kan ikke indlæse"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:928
+#: ../gnome/vpn-properties/nm-vpn-properties.c:961
 msgid "Cannot find some needed resources (the glade file)!"
 msgstr "Kan ikke finde nogle krævede ressourcer (glade-filen)!"
 
 #. Edit dialog
-#: ../gnome/vpn-properties/nm-vpn-properties.c:1043
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
 msgid "Edit VPN Connection"
 msgstr "Redigér VPN-forbindelse"
 
@@ -785,11 +875,11 @@ msgstr ""
 msgid "VPN Connections"
 msgstr "VPN-forbindelser"
 
-#: ../src/nm-ap-security-wep.c:47
+#: ../src/nm-ap-security-wep.c:52
 msgid "40-bit WEP"
 msgstr "40-bit WEP"
 
-#: ../src/nm-ap-security-wep.c:49
+#: ../src/nm-ap-security-wep.c:54
 msgid "104-bit WEP"
 msgstr "104-bit WEP"
 
@@ -801,15 +891,23 @@ msgstr "WPA TKIP"
 msgid "WPA CCMP"
 msgstr "WPA CCMP"
 
-#: ../src/nm-ap-security-wpa-psk.c:57
+#: ../src/nm-ap-security-wpa-psk.c:54
+msgid "WPA Automatic"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:59
 msgid "WPA2 TKIP"
 msgstr "WPA2 TKIP"
 
-#: ../src/nm-ap-security-wpa-psk.c:59
+#: ../src/nm-ap-security-wpa-psk.c:61
 msgid "WPA2 CCMP"
 msgstr "WPA2 CCMP"
 
-#: ../src/nm-ap-security.c:310
+#: ../src/nm-ap-security-wpa-psk.c:63
+msgid "WPA2 Automatic"
+msgstr ""
+
+#: ../src/nm-ap-security.c:320
 msgid "none"
 msgstr "ingen"
 
@@ -848,3 +946,78 @@ msgstr "for meget data var sendt over sokkelen og noget gik tabt"
 #: ../src/nm-netlink-monitor.c:735
 msgid "error occurred while waiting for data on socket"
 msgstr "der opstod en fejl mens der blev ventet på data på sokkelen"
+
+#: ../gnome/applet/applet-dbus-devices.c:898
+#, fuzzy, c-format
+msgid "You are now connected to the Ad-Hoc wireless network '%s'."
+msgstr "Tilsluttet til et trådløst ad hoc netværk"
+
+#: ../gnome/applet/applet-dbus-devices.c:903
+#, fuzzy, c-format
+msgid "You are now connected to the wireless network '%s'."
+msgstr "Færdiggører tilslutning til det trådløse netværk '%s'..."
+
+#: ../gnome/applet/applet-dbus-devices.c:910
+#, fuzzy
+msgid "You are now connected to the wired network."
+msgstr "Færdiggører tilslutning til det kablede netværk..."
+
+#: ../gnome/applet/applet-dbus-devices.c:916
+msgid "Connection Established"
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:959
+#, fuzzy
+msgid "Disconnected"
+msgstr "_Afbryd VPN..."
+
+#: ../gnome/applet/applet-dbus-devices.c:960
+msgid "The network connection has been disconnected."
+msgstr ""
+
+#~ msgid "VPN Error"
+#~ msgstr "VPN fejl"
+
+#~ msgid "The VPN service said: \"%s\""
+#~ msgstr "VPN-tjenesten sagde: \"%s\""
+
+#~ msgid "VPN connection '%s' said:"
+#~ msgstr "VPN-forbindelsen '%s' sagde:"
+
+#~ msgid "leap_subwindow"
+#~ msgstr "leap_subwindow"
+
+#~ msgid "wep_key_subwindow"
+#~ msgstr "wep_key_subwindow"
+
+#~ msgid "wep_passphrase_subwindow"
+#~ msgstr "wep_passphrase_subwindow"
+
+#~ msgid "wpa_psk_subwindow"
+#~ msgstr "wpa_psk_subwindow"
+
+#~ msgid "Error displaying connection information: "
+#~ msgstr "Fejl ved visning af forbindelses-information: "
+
+#~ msgid "TKIP (Default)"
+#~ msgstr "TKIP (forvalgt)"
+
+#~ msgid "WEP 40/128-bit ASCII"
+#~ msgstr "WEP 40/128-bit ASCII"
+
+#~ msgid "WEP 40/128-bit hex"
+#~ msgstr "WEP 40/128-bit hex"
+
+#~ msgid "WEP Passphrase"
+#~ msgstr "WEP-adgangskode:"
+
+#~ msgid ""
+#~ "None\n"
+#~ "WEP Passphrase\n"
+#~ "WEP 40/128-bit hex\n"
+#~ "WEP 40/128-bit ASCII\n"
+#~ msgstr ""
+#~ "Ingen\n"
+#~ "WEP-adgangskode\n"
+#~ "WEP 40/128-bit hex\n"
+#~ "WEP 40/128-bit ASCII\n"
diff --git a/po/de.po b/po/de.po
index 3c474133e5..8cf7ab184d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,432 +10,484 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-27 20:46+0200\n"
+"POT-Creation-Date: 2006-05-29 18:33+0200\n"
 "PO-Revision-Date: 2005-09-27 20:55+0200\n"
 "Last-Translator: Hendrik Brandt <heb@gnome-de.org>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. Setup a request to the keyring to save the network passphrase
-#: ../gnome/applet/applet-dbus-info.c:864
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:919
 #, c-format
 msgid "Passphrase for wireless network %s"
-msgstr "Passwort für Funknetzwerk %s"
+msgstr "Passwort für Funknetzwerk %s"
 
-#: ../gnome/applet/applet-dbus-info.c:1082
-#, c-format
-msgid ""
-"The requested wireless network '%s' does not appear to be in range.  A "
-"different wireless network will be used if any are available."
-msgstr ""
-"Das gewünschte Funknetzwerk »%s« scheint nicht in Reichweite zu sein. Falls "
-"weitere Funknetzwerke verfügbar sind, wird ein anderes verwendet."
-
-#: ../gnome/applet/applet-dbus.c:317
+#: ../gnome/applet/applet-dbus.c:265
 #, c-format
 msgid "Connection to the wireless network '%s' failed."
-msgstr "Die Verbindung mit Funknetzwerk »%s« ist fehlgeschlagen."
+msgstr "Die Verbindung mit Funknetzwerk »%s« ist fehlgeschlagen."
 
-#: ../gnome/applet/applet-dbus.c:322
+#: ../gnome/applet/applet-dbus.c:270
 msgid "Connection to the wired network failed."
 msgstr "Die Verbindung mit dem Kabelnetzwerk ist fehlgeschlagen."
 
-#: ../gnome/applet/applet.c:181
-msgid "Error displaying connection information: "
+#: ../gnome/applet/applet.c:184
+#, fuzzy
+msgid "Error displaying connection information:"
 msgstr "Die Verbindungsinformationen konnte nicht angezeigt werden: "
 
-#: ../gnome/applet/applet.c:200
+#: ../gnome/applet/applet.c:202
 msgid "Could not find some required resources (the glade file)!"
 msgstr ""
-"Einige benötigte Ressourcen wurden nicht gefunden (die Glade-Datei fehlt)."
+"Einige benötigte Ressourcen wurden nicht gefunden (die Glade-Datei fehlt)."
 
-#: ../gnome/applet/applet.c:211
+#: ../gnome/applet/applet.c:213
 msgid "No active connections!"
 msgstr "Keine aktive Netzwerkverbindung"
 
-#: ../gnome/applet/applet.c:223
+#: ../gnome/applet/applet.c:234
 #, c-format
 msgid "Wired Ethernet (%s)"
 msgstr "Kabel-Ethernet (%s)"
 
-#: ../gnome/applet/applet.c:225
+#: ../gnome/applet/applet.c:236
 #, c-format
 msgid "Wireless Ethernet (%s)"
 msgstr "Funk-Ethernet (%s)"
 
-#: ../gnome/applet/applet.c:302 ../gnome/applet/applet.c:320
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:362
 msgid "NetworkManager Applet"
 msgstr "Netzwerk-Manager-Applet"
 
-#: ../gnome/applet/applet.c:304 ../gnome/applet/applet.c:322
-msgid "Copyright (C) 2004-2005 Red Hat, Inc."
-msgstr "Copyright © 2004-2005 Red Hat, Inc."
+#: ../gnome/applet/applet.c:339 ../gnome/applet/applet.c:364
+#, fuzzy
+msgid "Copyright © 2004-2005 Red Hat, Inc."
+msgstr "Copyright © 2004-2005 Red Hat, Inc."
 
-#: ../gnome/applet/applet.c:305 ../gnome/applet/applet.c:323
+#: ../gnome/applet/applet.c:340 ../gnome/applet/applet.c:365
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
-"Ein Applet für das Benachrichtigungsfeld, mit dem Sie Ihre Netzwerkgeräte "
-"und Netzwerkverbindungen verwalten können."
+"Ein Applet für das Benachrichtigungsfeld, mit dem Sie Ihre Netzwerkgeräte "
+"und Netzwerkverbindungen verwalten können."
 
-#: ../gnome/applet/applet.c:327
+#: ../gnome/applet/applet.c:343 ../gnome/applet/applet.c:370
 msgid "translator-credits"
 msgstr "Hendrik Brandt <heb@gnome-de.org>"
 
-#: ../gnome/applet/applet.c:412
-msgid "VPN Error"
-msgstr "VPN-Fehler"
-
-#: ../gnome/applet/applet.c:416
+#: ../gnome/applet/applet.c:426
 msgid "VPN Login Failure"
 msgstr "VPN-Anmeldefehler"
 
-#: ../gnome/applet/applet.c:417
+#: ../gnome/applet/applet.c:427
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a login failure."
 msgstr ""
-"VPN-Verbindung »%s« konnte auf Grund eines Anmeldefehlers nicht gestartet "
+"VPN-Verbindung »%s« konnte auf Grund eines Anmeldefehlers nicht gestartet "
 "werden."
 
-#: ../gnome/applet/applet.c:421
+#: ../gnome/applet/applet.c:431
 msgid "VPN Start Failure"
 msgstr "VPN-Startfehler"
 
-#: ../gnome/applet/applet.c:422
+#: ../gnome/applet/applet.c:432
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
 "program."
 msgstr ""
-"Die VPN-Verbindung »%s« konnte infolge eines Fehlers beim Starten des VPN-"
+"Die VPN-Verbindung »%s« konnte infolge eines Fehlers beim Starten des VPN-"
 "Programms nicht hergestellt werden."
 
-#: ../gnome/applet/applet.c:426 ../gnome/applet/applet.c:436
+#: ../gnome/applet/applet.c:436 ../gnome/applet/applet.c:446
 msgid "VPN Connect Failure"
 msgstr "VPN-Verbindungsfehler"
 
-#: ../gnome/applet/applet.c:427
+#: ../gnome/applet/applet.c:437
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a connection error."
 msgstr ""
-"VPN-Verbindung »%s« konnte auf Grund eines Verbindungsfehlers nicht "
+"VPN-Verbindung »%s« konnte auf Grund eines Verbindungsfehlers nicht "
 "gestartet werden"
 
-#: ../gnome/applet/applet.c:431
+#: ../gnome/applet/applet.c:441
 msgid "VPN Configuration Error"
 msgstr "VPN-Konfigurationsfehler"
 
-#: ../gnome/applet/applet.c:432
+#: ../gnome/applet/applet.c:442
 #, c-format
 msgid "The VPN connection '%s' was not correctly configured."
-msgstr "Die VPN-Verbindung »%s« wurde nicht richtig konfiguriert."
+msgstr "Die VPN-Verbindung »%s« wurde nicht richtig konfiguriert."
 
-#: ../gnome/applet/applet.c:437
+#: ../gnome/applet/applet.c:447
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' because the VPN server did not "
 "return an adequate network configuration."
 msgstr ""
-"Die VPN-Verbindung »%s« konnte nicht hergestellt werden, da der VPN-Server "
+"Die VPN-Verbindung »%s« konnte nicht hergestellt werden, da der VPN-Server "
 "keine geeignete Netzwerkkonfiguration lieferte."
 
-#: ../gnome/applet/applet.c:445
-#, c-format
-msgid "The VPN service said: \"%s\""
-msgstr "Anwort des VPN-Dienstes: »%s«"
-
-#: ../gnome/applet/applet.c:514
-#, c-format
-msgid "VPN connection '%s' said:"
-msgstr "Antwort der VPN-Verbindung »%s«:"
-
-#: ../gnome/applet/applet.c:516
+#: ../gnome/applet/applet.c:517
 msgid "VPN Login Message"
 msgstr "VPN-Anmeldemitteilung"
 
-#: ../gnome/applet/applet.c:734 ../gnome/applet/applet.c:2286
-#: ../gnome/applet/other-network-dialog.c:407
-#: ../gnome/applet/passphrase-dialog.c:384
+#: ../gnome/applet/applet.c:741 ../gnome/applet/applet.c:2508
+#: ../gnome/applet/other-network-dialog.c:453
+#: ../gnome/applet/passphrase-dialog.c:228
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
 msgstr ""
-"Das Netzwerk-Manager-Applet konnte benötigte Ressourcen nicht finden (Die "
+"Das Netzwerk-Manager-Applet konnte benötigte Ressourcen nicht finden (Die "
 "Glade-Datei wurde nicht gefunden)."
 
-#: ../gnome/applet/applet.c:747
+#: ../gnome/applet/applet.c:753
 #, c-format
 msgid "The network device \"%s (%s)\" does not support wireless scanning."
-msgstr "Das Netzwerkgerät »%s (%s)« unterstützt keine Funknetzwerksuche."
+msgstr "Das Netzwerkgerät »%s (%s)« unterstützt keine Funknetzwerksuche."
 
-#: ../gnome/applet/applet.c:754
+#: ../gnome/applet/applet.c:761
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
-msgstr "Das Netzwerkgerät »%s (%s)« unterstützt keine Link-Erkennung."
+msgstr "Das Netzwerkgerät »%s (%s)« unterstützt keine Link-Erkennung."
 
-#: ../gnome/applet/applet.c:963
+#: ../gnome/applet/applet.c:908
 #, c-format
 msgid "Preparing device %s for the wired network..."
-msgstr "Vorbereiten des Geräts %s wird für das Kabelnetzwerk..."
+msgstr "Vorbereiten des Geräts %s wird für das Kabelnetzwerk..."
 
-#: ../gnome/applet/applet.c:965
+#: ../gnome/applet/applet.c:910
 #, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
-msgstr "Vorbereiten des Geräts %s für das Funknetzwerk »%s«..."
+msgstr "Vorbereiten des Geräts %s für das Funknetzwerk »%s«..."
 
-#: ../gnome/applet/applet.c:972
+#: ../gnome/applet/applet.c:918
 #, c-format
 msgid "Configuring device %s for the wired network..."
-msgstr "Konfigurieren des Geräts %s für das Kabelnetzwerk..."
+msgstr "Konfigurieren des Geräts %s für das Kabelnetzwerk..."
 
-#: ../gnome/applet/applet.c:974
+#: ../gnome/applet/applet.c:920
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
-msgstr "Versuch, dem Funknetzwerk »%s« beizutreten..."
+msgstr "Versuch, dem Funknetzwerk »%s« beizutreten..."
 
-#: ../gnome/applet/applet.c:981
+#: ../gnome/applet/applet.c:928
 #, c-format
 msgid "Waiting for Network Key for the wireless network '%s'..."
-msgstr "Warten auf den Netzwerkschlüssel für das Funknetzwerk »%s«..."
+msgstr "Warten auf den Netzwerkschlüssel für das Funknetzwerk »%s«..."
 
-#: ../gnome/applet/applet.c:988 ../gnome/applet/applet.c:997
+#: ../gnome/applet/applet.c:936 ../gnome/applet/applet.c:946
 msgid "Requesting a network address from the wired network..."
 msgstr "Anfordern einer Netzwerkadresse vom Kabelnetzwerk..."
 
-#: ../gnome/applet/applet.c:990 ../gnome/applet/applet.c:999
+#: ../gnome/applet/applet.c:938 ../gnome/applet/applet.c:948
 #, c-format
 msgid "Requesting a network address from the wireless network '%s'..."
-msgstr "Anfordern einer Netzwerkadresse vom Funknetzwerk »%s«..."
+msgstr "Anfordern einer Netzwerkadresse vom Funknetzwerk »%s«..."
 
-#: ../gnome/applet/applet.c:1006
+#: ../gnome/applet/applet.c:956
 msgid "Finishing connection to the wired network..."
 msgstr "Fertigstellen der Verbindung mit dem Kabelnetzwerk..."
 
-#: ../gnome/applet/applet.c:1008
+#: ../gnome/applet/applet.c:958
 #, c-format
 msgid "Finishing connection to the wireless network '%s'..."
-msgstr "Fertigstellen der Verbindung mit dem Funknetzwerk »%s«..."
+msgstr "Fertigstellen der Verbindung mit dem Funknetzwerk »%s«..."
 
-#: ../gnome/applet/applet.c:1053
+#: ../gnome/applet/applet.c:1075
 msgid "NetworkManager is not running"
 msgstr "Der Netzwerk-Manager ist nicht aktiv"
 
-#: ../gnome/applet/applet.c:1064
+#: ../gnome/applet/applet.c:1083 ../gnome/applet/applet.c:1828
+msgid "Networking disabled"
+msgstr ""
+
+#: ../gnome/applet/applet.c:1088
 msgid "No network connection"
 msgstr "Keine Netzwerkverbindung"
 
-#: ../gnome/applet/applet.c:1069
+#: ../gnome/applet/applet.c:1093
 msgid "Wired network connection"
 msgstr "Kabelnetzwerkverbindung"
 
-#: ../gnome/applet/applet.c:1073
+#: ../gnome/applet/applet.c:1097
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Verbunden mit einem Ad-Hoc-Funknetzwerk"
 
-#: ../gnome/applet/applet.c:1075
+#: ../gnome/applet/applet.c:1099
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
-msgstr "Funknetzwerkverbindung mit »%s« (%d%%)"
+msgstr "Funknetzwerkverbindung mit »%s« (%d%%)"
 
-#: ../gnome/applet/applet.c:1095
+#: ../gnome/applet/applet.c:1120
 #, c-format
 msgid "VPN connection to '%s'"
-msgstr "VPN-Verbindungen zu »%s«"
+msgstr "VPN-Verbindungen zu »%s«"
 
-#: ../gnome/applet/applet.c:1103
+#: ../gnome/applet/applet.c:1128
 #, c-format
 msgid "VPN connecting to '%s'"
-msgstr "VPN verbindet zu »%s«"
+msgstr "VPN verbindet zu »%s«"
 
-#: ../gnome/applet/applet.c:1489
+#: ../gnome/applet/applet.c:1541
 msgid "_Connect to Other Wireless Network..."
 msgstr "Mit einem anderen Funknetzwerk _verbinden..."
 
-#: ../gnome/applet/applet.c:1510
+#: ../gnome/applet/applet.c:1562
 msgid "Create _New Wireless Network..."
 msgstr "_Neues Funknetzwerk erstellen..."
 
-#: ../gnome/applet/applet.c:1623
+#: ../gnome/applet/applet.c:1685
 msgid "_VPN Connections"
 msgstr "_VPN-Verbindungen"
 
-#: ../gnome/applet/applet.c:1655
+#: ../gnome/applet/applet.c:1730
 msgid "_Configure VPN..."
 msgstr "VPN _konfigurieren..."
 
-#: ../gnome/applet/applet.c:1659
+#: ../gnome/applet/applet.c:1734
 msgid "_Disconnect VPN..."
 msgstr "VPN _trennen..."
 
-#: ../gnome/applet/applet.c:1681
+#: ../gnome/applet/applet.c:1756
 msgid "_Dial Up Connections"
 msgstr "_Einwahlverbindung"
 
-#: ../gnome/applet/applet.c:1690
+#. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
+#: ../gnome/applet/applet.c:1767
 #, c-format
 msgid "Connect to %s..."
 msgstr "Verbinden mit %s..."
 
-#: ../gnome/applet/applet.c:1740
+#: ../gnome/applet/applet.c:1773
+#, fuzzy, c-format
+msgid "Disconnect from %s..."
+msgstr "Verbinden mit %s..."
+
+#: ../gnome/applet/applet.c:1822
 msgid "No network devices have been found"
-msgstr "Es wurden keine Netzwerkgeräte gefunden"
+msgstr "Es wurden keine Netzwerkgeräte gefunden"
 
-#: ../gnome/applet/applet.c:1902
+#: ../gnome/applet/applet.c:2014
 msgid "NetworkManager is not running..."
 msgstr "Der Netzwerk-Manager ist nicht aktiv..."
 
-#. Wireless Enabled item
-#: ../gnome/applet/applet.c:2004
-msgid "_Wireless Enabled"
-msgstr "_Funknetz aktiv"
+#. 'Enable Networking' item
+#: ../gnome/applet/applet.c:2170
+msgid "Enable _Networking"
+msgstr ""
 
-#. Connection Information item
-#: ../gnome/applet/applet.c:2010
+#. 'Enable Wireless' item
+#: ../gnome/applet/applet.c:2176
+msgid "Enable _Wireless"
+msgstr ""
+
+#. 'Connection Information' item
+#: ../gnome/applet/applet.c:2182
 msgid "Connection _Information"
 msgstr "Verbindungs_informationen"
 
 #. Help item
-#: ../gnome/applet/applet.c:2020
+#: ../gnome/applet/applet.c:2193
 msgid "_Help"
 msgstr "_Hilfe"
 
 #. About item
-#: ../gnome/applet/applet.c:2028
+#: ../gnome/applet/applet.c:2202
 msgid "_About"
 msgstr "_Info"
 
-#: ../gnome/applet/applet.c:2435
+#: ../gnome/applet/applet.c:2667
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
 msgstr ""
-"Das Netzwerk-Manager-Applet konnte benötigte Ressourcen nicht finden und "
+"Das Netzwerk-Manager-Applet konnte benötigte Ressourcen nicht finden und "
 "kann deshalb nicht fortfahren.\n"
 
-#: ../gnome/applet/eggtrayicon.c:127
+#: ../gnome/applet/wireless-security-option.c:157
+msgid "Open System"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:160
+msgid "Shared Key"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:208
+msgid "Automatic (Default)"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:215
+msgid "AES-CCMP"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:223
+msgid "TKIP"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:231
+msgid "Dynamic WEP"
+msgstr ""
+
+#: ../gnome/applet/wso-none.c:53
+msgid "None"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-ascii.c:138
+msgid "WEP 64/128-bit ASCII"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-hex.c:135
+msgid "WEP 64/128-bit Hex"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-passphrase.c:135
+#, fuzzy
+msgid "WEP 128-bit Passphrase"
+msgstr "Passwort:"
+
+#: ../gnome/applet/wso-wpa-eap.c:237
+msgid "PEAP"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:238
+msgid "TLS"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:239
+msgid "TTLS"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
+#: ../src/nm-ap-security-wpa-eap.c:116
+msgid "WPA2 Enterprise"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
+#: ../src/nm-ap-security-wpa-eap.c:121
+msgid "WPA Enterprise"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-psk.c:178
+msgid "WPA2 Personal"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-psk.c:180
+msgid "WPA Personal"
+msgstr ""
+
+#: ../gnome/applet/eggtrayicon.c:134
 msgid "Orientation"
 msgstr "Ausrichtung"
 
-#: ../gnome/applet/eggtrayicon.c:128
+#: ../gnome/applet/eggtrayicon.c:135
 msgid "The orientation of the tray."
 msgstr "Die Ausrichtung des Benachrichtigungsfeldes."
 
-#: ../gnome/applet/menu-items.c:87
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Kabelnetzwerk (%s)"
 
-#: ../gnome/applet/menu-items.c:90
+#: ../gnome/applet/menu-items.c:91
 msgid "_Wired Network"
 msgstr "_Kabelnetzwerk"
 
-#: ../gnome/applet/menu-items.c:161
+#: ../gnome/applet/menu-items.c:162
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
 msgstr[0] "Funknetzwerk (%s)"
 msgstr[1] "Funknetzwerke (%s)"
 
-#: ../gnome/applet/menu-items.c:163
+#: ../gnome/applet/menu-items.c:164
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Funknetzwerk"
 msgstr[1] "Funknetzwerke"
 
-#: ../gnome/applet/menu-items.c:303
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
-msgstr " (ungültiger Unicode)"
-
-#: ../gnome/applet/other-network-dialog.c:143
-#: ../gnome/applet/applet.glade.h:39
-msgid "_Passphrase:"
-msgstr "_Passwort:"
+msgstr " (ungültiger Unicode)"
 
-#: ../gnome/applet/other-network-dialog.c:146
-msgid "_ASCII Key:"
-msgstr "_ASCII-Schlüssel:"
-
-#: ../gnome/applet/other-network-dialog.c:149
-msgid "_Hex Key:"
-msgstr "_Hexadezimalschlüssel:"
+#: ../gnome/applet/other-network-dialog.c:352
+#, fuzzy, c-format
+msgid ""
+"By default, the wireless network's name is set to your computer's name, %s, "
+"with no encryption enabled"
+msgstr "Als Vorgabe ist die ESSID auf Ihren Rechnernamen gesetzt."
 
-#: ../gnome/applet/other-network-dialog.c:238
+#: ../gnome/applet/other-network-dialog.c:358
 msgid "Create new wireless network"
 msgstr "Ein neues Funknetzwerk erstellen"
 
-#: ../gnome/applet/other-network-dialog.c:239
+#: ../gnome/applet/other-network-dialog.c:359
+#, fuzzy
 msgid ""
-"Enter the ESSID and security settings of the wireless network you wish to "
+"Enter the name and security settings of the wireless network you wish to "
 "create."
 msgstr ""
-"Bitte geben Sie die ESSID und die Sicherheitseinstellungen für das drahtlose "
-"Netzwerk mit dem Sie sich verbinden möchten ein."
-
-#: ../gnome/applet/other-network-dialog.c:240
-msgid "By default, the ESSID is set to your computer's name,"
-msgstr "Als Vorgabe ist die ESSID auf Ihren Rechnernamen gesetzt."
-
-#: ../gnome/applet/other-network-dialog.c:242
-msgid ", with no encryption enabled."
-msgstr ", ohne aktivierte Verschlüsselung."
+"Bitte geben Sie die ESSID und die Sicherheitseinstellungen für das drahtlose "
+"Netzwerk mit dem Sie sich verbinden möchten ein."
 
-#: ../gnome/applet/other-network-dialog.c:244
+#: ../gnome/applet/other-network-dialog.c:363
 msgid "Create New Wireless Network"
 msgstr "Neues Funknetzwerk erstellen"
 
-#: ../gnome/applet/other-network-dialog.c:249
-msgid "Custom wireless network"
+#: ../gnome/applet/other-network-dialog.c:368
+#, fuzzy
+msgid "Existing wireless network"
 msgstr "Benutzerdefiniertes Funknetzwerk"
 
-#: ../gnome/applet/other-network-dialog.c:250
-msgid "Enter the ESSID of the wireless network to which you wish to connect."
+#: ../gnome/applet/other-network-dialog.c:369
+#, fuzzy
+msgid "Enter the name of the wireless network to which you wish to connect."
 msgstr ""
-"Bitte geben Sie die ESSID für das drahtlose Netzwerk mit dem Sie sich "
-"verbinden möchten ein."
+"Bitte geben Sie die ESSID für das drahtlose Netzwerk mit dem Sie sich "
+"verbinden möchten ein."
 
-#: ../gnome/applet/other-network-dialog.c:252
+#: ../gnome/applet/other-network-dialog.c:371
 msgid "Connect to Other Wireless Network"
 msgstr "Mit einem anderen Funknetzwerk verbinden"
 
-#: ../gnome/applet/passphrase-dialog.c:155
-msgid "Passphrase:"
-msgstr "Passwort:"
-
-#: ../gnome/applet/passphrase-dialog.c:158
-msgid "ASCII Key:"
-msgstr "ASCII-Schlüssel:"
+#: ../gnome/applet/passphrase-dialog.c:215
+#, fuzzy
+msgid "Error connecting to wireless network"
+msgstr "Mit einem anderen Funknetzwerk verbinden"
 
-#: ../gnome/applet/passphrase-dialog.c:161
-msgid "Hex Key:"
-msgstr "Hexadezimalschlüssel:"
+#: ../gnome/applet/passphrase-dialog.c:216
+msgid ""
+"The requested wireless network requires security capabilities unsupported by "
+"your hardware."
+msgstr ""
 
-#: ../gnome/applet/vpn-password-dialog.c:152
-#: ../gnome/applet/vpn-password-dialog.c:189
+#: ../gnome/applet/vpn-password-dialog.c:151
+#: ../gnome/applet/vpn-password-dialog.c:188
 #, c-format
 msgid "Cannot start VPN connection '%s'"
-msgstr "VPN-Verbindung »%s« konnte nicht gestartet werden"
+msgstr "VPN-Verbindung »%s« konnte nicht gestartet werden"
 
-#: ../gnome/applet/vpn-password-dialog.c:155
+#: ../gnome/applet/vpn-password-dialog.c:154
 #, c-format
 msgid ""
 "Could not find the authentication dialog for VPN connection type '%s'. "
 "Contact your system administrator."
 msgstr ""
-"Es konnte kein Authentifizierungsdialog für die VPN-Verbindung vom Typ »%s« "
+"Es konnte kein Authentifizierungsdialog für die VPN-Verbindung vom Typ »%s« "
 "gefunden werden. Bitte setzen Sie sich mit Ihrem Systemadministrator in "
 "Verbindung."
 
-#: ../gnome/applet/vpn-password-dialog.c:192
+#: ../gnome/applet/vpn-password-dialog.c:191
 #, c-format
 msgid ""
 "There was a problem launching the authentication dialog for VPN connection "
 "type '%s'. Contact your system administrator."
 msgstr ""
-"Beim Starten des Authentifizierungsdialog für die VPN-Verbindung vom Typ »%"
-"s« ist ein Problem aufgetreten. Bitte setzen Sie sich mit Ihrem "
+"Beim Starten des Authentifizierungsdialog für die VPN-Verbindung vom Typ »%"
+"s« ist ein Problem aufgetreten. Bitte setzen Sie sich mit Ihrem "
 "Systemadministrator in Verbindung."
 
 #: ../gnome/applet/applet.glade.h:1
@@ -444,32 +496,12 @@ msgstr " "
 
 #: ../gnome/applet/applet.glade.h:2
 msgid ""
-"128-bit Passphrase (WEP)\n"
-"ASCII Key (WEP)\n"
-"Hex Key (WEP)"
-msgstr ""
-"128-Bit Passwort (WEP)\n"
-"ASCII-Schlüssel (WEP)\n"
-"Hexadezimalschlüssel (WEP)"
-
-#: ../gnome/applet/applet.glade.h:5
-msgid ""
-"128-bit passphrase (WEP)\n"
-"ASCII key (WEP)\n"
-"Hex key (WEP)"
-msgstr ""
-"128-Bit Passwort (WEP)\n"
-"ASCII-Schlüssel (WEP)\n"
-"Hexadezimalschlüssel (WEP)"
-
-#: ../gnome/applet/applet.glade.h:8
-msgid ""
 "<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
 msgstr ""
 "<span weight=\"bold\" size=\"larger\">Informationen zur aktiven Verbindung</"
 "span>"
 
-#: ../gnome/applet/applet.glade.h:10
+#: ../gnome/applet/applet.glade.h:4
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
@@ -478,25 +510,25 @@ msgid ""
 "A passphrase or encryption key is required to access the wireless network '%"
 "s'."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Passwortgeschütztes Funknetzwerk</"
+"<span weight=\"bold\" size=\"larger\">Passwortgeschütztes Funknetzwerk</"
 "span>\n"
 "\n"
-"Es wird ein Passwort oder ein Verschlüsselungsschlüssel für den Zugang zu "
-"dem Funknetzwerk »%s« benötigt."
+"Es wird ein Passwort oder ein Verschlüsselungsschlüssel für den Zugang zu "
+"dem Funknetzwerk »%s« benötigt."
 
-#: ../gnome/applet/applet.glade.h:14
+#: ../gnome/applet/applet.glade.h:8
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
 "\n"
 "%s  It will not be completely functional."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Eingeschränkte Netzwerkfunktionalität</"
+"<span weight=\"bold\" size=\"larger\">Eingeschränkte Netzwerkfunktionalität</"
 "span>\n"
 "\n"
-"%s  Es wird nicht vollständig funktionstüchtig sein."
+"%s  Es wird nicht vollständig funktionstüchtig sein."
 
-#: ../gnome/applet/applet.glade.h:18
+#: ../gnome/applet/applet.glade.h:12
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
@@ -506,34 +538,59 @@ msgid ""
 "that this wireless network is secure, click the checkbox below and "
 "NetworkManager will not require confirmation on subsequent log ins."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Anmeldungsbestätigung für das "
+"<span weight=\"bold\" size=\"larger\">Anmeldungsbestätigung für das "
 "Funknetzwerk</span>\n"
 "\n"
-"Sie haben die Anmeldung am Funknetzwerk »%s« gewählt. Falls Sie sicher sind, "
-"dass dieses Funknetzwerk vertrauenswürdig ist, können Sie die unten "
-"angegebene Option auswählen und der Network-Manager wird ab sofort keine "
-"Bestätigung mehr für dieses Netzwerk verlangen."
+"Sie haben die Anmeldung am Funknetzwerk »%s« gewählt. Falls Sie sicher sind, "
+"dass dieses Funknetzwerk vertrauenswürdig ist, können Sie die unten "
+"angegebene Option auswählen und der Network-Manager wird ab sofort keine "
+"Bestätigung mehr für dieses Netzwerk verlangen."
 
-#: ../gnome/applet/applet.glade.h:21
+#: ../gnome/applet/applet.glade.h:15
+msgid "Anonymous Identity:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:16
+#, fuzzy
+msgid "Authentication:"
+msgstr "Ausrichtung"
+
+#: ../gnome/applet/applet.glade.h:17
 msgid "Broadcast Address:"
 msgstr "Broadcast-Adresse:"
 
-#: ../gnome/applet/applet.glade.h:22
+#: ../gnome/applet/applet.glade.h:18
+msgid "CA Certificate File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:19
 msgid "C_onnect"
 msgstr "_Verbinden"
 
-#: ../gnome/applet/applet.glade.h:23
-msgid "Connect with _encryption enabled"
-msgstr "Mit aktivierter _Verschlüsselung verbinden"
+#: ../gnome/applet/applet.glade.h:20
+msgid "Client Certificate File:"
+msgstr ""
 
-#: ../gnome/applet/applet.glade.h:24
+#: ../gnome/applet/applet.glade.h:21
 msgid "Connection Information"
 msgstr "Verbindungsinformationen"
 
-#: ../gnome/applet/applet.glade.h:25
+#: ../gnome/applet/applet.glade.h:22
+msgid "Default Route:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:23
 msgid "Destination Address:"
 msgstr "Zieladresse:"
 
+#: ../gnome/applet/applet.glade.h:24
+msgid "Driver:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:25
+msgid "EAP Method:"
+msgstr ""
+
 #: ../gnome/applet/applet.glade.h:26
 msgid "Hardware Address:"
 msgstr "Hardware-Adresse:"
@@ -543,54 +600,145 @@ msgid "IP Address:"
 msgstr "IP-Adresse:"
 
 #: ../gnome/applet/applet.glade.h:28
+msgid "Identity:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:29
 msgid "Interface:"
 msgstr "Schnittstelle:"
 
-#: ../gnome/applet/applet.glade.h:29
+#: ../gnome/applet/applet.glade.h:30
+#, fuzzy
+msgid "Key Type:"
+msgstr "_Schlüsseltyp:"
+
+#: ../gnome/applet/applet.glade.h:31
+#, fuzzy
+msgid "Key:"
+msgstr "Hexadezimalschlüssel:"
+
+#: ../gnome/applet/applet.glade.h:32
+msgid ""
+"None\n"
+"WEP 128-bit Passphrase\n"
+"WEP 64/128-bit Hex\n"
+"WEP 64/128-bit ASCII\n"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:37
+msgid ""
+"Open System\n"
+"Shared Key"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:39
 msgid "Other Wireless Network..."
 msgstr "Anderes Funknetzwerk..."
 
-#: ../gnome/applet/applet.glade.h:30
+#: ../gnome/applet/applet.glade.h:40
+msgid "Passphrase:"
+msgstr "Passwort:"
+
+#: ../gnome/applet/applet.glade.h:41
+msgid "Password:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:42
+msgid "Primary DNS:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:43
+msgid "Private Key File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:44
+msgid "Private Key Password:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:45
+msgid "Secondary DNS:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:46
+msgid "Select the CA Certificate File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:47
+msgid "Select the Client Certificate File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:48
+msgid "Select the Private Key File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:49
+msgid "Show key"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:50
+#, fuzzy
+msgid "Show passphrase"
+msgstr "Passwort:"
+
+#: ../gnome/applet/applet.glade.h:51
+msgid "Show password"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:52
+msgid "Show passwords"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:53
+msgid "Speed:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:54
 msgid "Subnet Mask:"
 msgstr "Subnetz-Maske:"
 
-#: ../gnome/applet/applet.glade.h:31
+#: ../gnome/applet/applet.glade.h:55
+#, fuzzy
+msgid "Type:"
+msgstr "_Schlüsseltyp:"
+
+#: ../gnome/applet/applet.glade.h:56
+msgid "User Name:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:57
 msgid "Wireless Network Key Required"
-msgstr "Schlüssel für Funknetzwerk benötigt"
+msgstr "Schlüssel für Funknetzwerk benötigt"
 
-#: ../gnome/applet/applet.glade.h:32
+#: ../gnome/applet/applet.glade.h:58
 msgid "Wireless _adapter:"
 msgstr "Funknetzwerkk_arte:"
 
-#: ../gnome/applet/applet.glade.h:33
-msgid "Wireless _network:"
-msgstr "_Funknetzwerk:"
-
-#: ../gnome/applet/applet.glade.h:34
+#: ../gnome/applet/applet.glade.h:59
 msgid "_Always Trust this Wireless Network"
 msgstr "_Diesem Funknetzwerk immer vertrauen"
 
-#: ../gnome/applet/applet.glade.h:35
+#: ../gnome/applet/applet.glade.h:60
 msgid "_Don't remind me again"
 msgstr "Diesen _Hinweis nicht mehr anzeigen"
 
-#: ../gnome/applet/applet.glade.h:36
-msgid "_Key Type:"
-msgstr "_Schlüsseltyp:"
-
-#: ../gnome/applet/applet.glade.h:37
-msgid "_Key type:"
-msgstr "_Schlüsseltyp:"
-
-#: ../gnome/applet/applet.glade.h:38
+#: ../gnome/applet/applet.glade.h:61
 msgid "_Login to Network"
 msgstr "_Am Netzwerk anmelden"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:372
+#: ../gnome/applet/applet.glade.h:62
+msgid "_Network Name:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:63
+#, fuzzy
+msgid "_Wireless Security:"
+msgstr "Funknetzwerkk_arte:"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:383
 msgid "Cannot add VPN connection"
-msgstr "VPN-Verbindung konnte nicht hinzugefügt werden"
+msgstr "VPN-Verbindung konnte nicht hinzugefügt werden"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:374
+#: ../gnome/vpn-properties/nm-vpn-properties.c:385
 msgid ""
 "No suitable VPN software was found on your system. Contact your system "
 "administrator."
@@ -598,72 +746,72 @@ msgstr ""
 "Es wurde keine brauchbare VPN-Software gefunden. Bitte setzen Sie sich mit "
 "Ihrem Systemadministrator in Verbindung."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:426
+#: ../gnome/vpn-properties/nm-vpn-properties.c:437
 msgid "Cannot import VPN connection"
 msgstr "VPN-Verbindung konnte nicht importiert werden"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:428
+#: ../gnome/vpn-properties/nm-vpn-properties.c:439
 #, c-format
 msgid ""
 "Cannot find suitable software for VPN connection type '%s' to import the "
 "file '%s'. Contact your system administrator."
 msgstr ""
-"Es wurde keine brauchbare Software für die VPN-Verbindung vom Typ »%s« zum "
-"Import der Datei »%s« gefunden. Bitte setzen Sie sich mit Ihrem "
+"Es wurde keine brauchbare Software für die VPN-Verbindung vom Typ »%s« zum "
+"Import der Datei »%s« gefunden. Bitte setzen Sie sich mit Ihrem "
 "Systemadministrator in Verbindung."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:568
+#: ../gnome/vpn-properties/nm-vpn-properties.c:579
 #, c-format
 msgid "Error retrieving VPN connection '%s'"
-msgstr "Fehler beim Abrufen der VPN-Verbindung »%s«"
+msgstr "Fehler beim Abrufen der VPN-Verbindung »%s«"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:571
+#: ../gnome/vpn-properties/nm-vpn-properties.c:582
 #, c-format
 msgid ""
 "Could not find the UI files for VPN connection type '%s'. Contact your "
 "system administrator."
 msgstr ""
-"Die Dateien für die Benutzerschnittstelle für VPN-Verbindungen vom Typ »%s« "
+"Die Dateien für die Benutzerschnittstelle für VPN-Verbindungen vom Typ »%s« "
 "wurden nicht gefunden.Bitte setzen Sie sich mit Ihrem Systemadministrator in "
 "Verbindung."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:731
+#: ../gnome/vpn-properties/nm-vpn-properties.c:739
 #, c-format
 msgid "Delete VPN connection \"%s\"?"
-msgstr "Möchten Sie die VPN-Verbindungen »%s« löschen?"
+msgstr "Möchten Sie die VPN-Verbindungen »%s« löschen?"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:734
+#: ../gnome/vpn-properties/nm-vpn-properties.c:742
 #, c-format
 msgid ""
 "All information about the VPN connection \"%s\" will be lost and you may "
 "need your system administrator to provide information to create a new "
 "connection."
 msgstr ""
-"Alle Informationen über die VPN-Verbindung »%s« werden verloren gehen und "
-"Sie werden Ihren Systemadministrator für das Bereitstellen der Informationen "
-"für eine neue Verbindung benötigen."
+"Alle Informationen über die VPN-Verbindung »%s« werden verloren gehen und "
+"Sie werden Ihren Systemadministrator für das Bereitstellen der Informationen "
+"für eine neue Verbindung benötigen."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:940
+#: ../gnome/vpn-properties/nm-vpn-properties.c:959
 msgid "Unable to load"
 msgstr "Konnte nicht geladen werden"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:942
+#: ../gnome/vpn-properties/nm-vpn-properties.c:961
 msgid "Cannot find some needed resources (the glade file)!"
 msgstr ""
-"Einige benötigte Ressourcen wurden nicht gefunden (die Glade-Datei fehlt)."
+"Einige benötigte Ressourcen wurden nicht gefunden (die Glade-Datei fehlt)."
 
 #. Edit dialog
-#: ../gnome/vpn-properties/nm-vpn-properties.c:1060
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
 msgid "Edit VPN Connection"
 msgstr "VPN-Verbindungen bearbeiten"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:1
 msgid "Add a new VPN connection"
-msgstr "Neue VPN-Verbindungen hinzufügen"
+msgstr "Neue VPN-Verbindungen hinzufügen"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:2
 msgid "Choose which type of VPN connection you wish to create."
-msgstr "Bitte wählen Sie aus, welche Art VPN-Verbindung Sie erstellen möchten."
+msgstr "Bitte wählen Sie aus, welche Art VPN-Verbindung Sie erstellen möchten."
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
 msgid "Connect to:"
@@ -683,7 +831,7 @@ msgstr "Neue VPN-Verbindungen erstellen - 2 von 2"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
 msgid "Delete the selected VPN connection"
-msgstr "Die ausgewählte VPN-Verbindung löschen"
+msgstr "Die ausgewählte VPN-Verbindung löschen"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
 msgid "E_xport"
@@ -691,7 +839,7 @@ msgstr "E_xportieren"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:9
 msgid "Edit the selected VPN connection"
-msgstr "Die ausgewählte VPN-Verbindung bearbeiten"
+msgstr "Die ausgewählte VPN-Verbindung bearbeiten"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:10
 msgid "Export the VPN settings to a file"
@@ -699,11 +847,11 @@ msgstr "Die VPN-Verbindungsdaten in eine Datei exportieren"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:11
 msgid "Export the selected VPN connection to a file"
-msgstr "Ausgewählte VPN-Verbindung in eine Datei exportieren"
+msgstr "Ausgewählte VPN-Verbindung in eine Datei exportieren"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:12
 msgid "Finish Creating VPN Connection"
-msgstr "Erstellen der VPN-Verbindung abschließen"
+msgstr "Erstellen der VPN-Verbindung abschließen"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:13
 msgid "Manage Virtual Private Network Connections"
@@ -720,19 +868,55 @@ msgstr ""
 "Dieser Assistent wird Sie durch das Erstellen einer neuen VPN-Verbindung zu "
 "einem privaten Netzwerk geleiten.\n"
 "\n"
-"Dazu benötigen Sie eventuell einige Informationen, wie z.B. IP-Adressen und "
-"Passwörter, welche Sie durch Ihren Systemadministrator erhalten."
+"Dazu benötigen Sie eventuell einige Informationen, wie z.B. IP-Adressen und "
+"Passwörter, welche Sie durch Ihren Systemadministrator erhalten."
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:17
 msgid "VPN Connections"
 msgstr "VPN-Verbindungen"
 
+#: ../src/nm-ap-security-wep.c:52
+msgid "40-bit WEP"
+msgstr ""
+
+#: ../src/nm-ap-security-wep.c:54
+msgid "104-bit WEP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:50
+msgid "WPA TKIP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:52
+msgid "WPA CCMP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:54
+msgid "WPA Automatic"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:59
+msgid "WPA2 TKIP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:61
+msgid "WPA2 CCMP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:63
+msgid "WPA2 Automatic"
+msgstr ""
+
+#: ../src/nm-ap-security.c:320
+msgid "none"
+msgstr ""
+
 #: ../src/nm-netlink-monitor.c:154
 #, c-format
 msgid ""
 "unable to create netlink socket for monitoring wired ethernet devices - %s"
 msgstr ""
-"Erstellung eines Netlink-Socket zur Überwachung von Kabelnetzwerkgeräten "
+"Erstellung eines Netlink-Socket zur Überwachung von Kabelnetzwerkgeräten "
 "fehlgeschlagen - %s"
 
 #: ../src/nm-netlink-monitor.c:172
@@ -740,28 +924,133 @@ msgstr ""
 msgid ""
 "unable to bind to netlink socket for monitoring wired ethernet devices - %s"
 msgstr ""
-"Bindung an einen Netlink-Socket zur Überwachung von Kabelnetzwerkgeräten "
+"Bindung an einen Netlink-Socket zur Überwachung von Kabelnetzwerkgeräten "
 "fehlgeschlagen - %s"
 
-#: ../src/nm-netlink-monitor.c:403
+#: ../src/nm-netlink-monitor.c:405
 msgid "operation took too long"
 msgstr "Vorgang dauerte zu lange"
 
-#: ../src/nm-netlink-monitor.c:500
+#: ../src/nm-netlink-monitor.c:502
 msgid "received data from wrong type of sender"
 msgstr "Daten von einem falschen Absendertyp erhalten"
 
-#: ../src/nm-netlink-monitor.c:513
+#: ../src/nm-netlink-monitor.c:515
 msgid "received data from unexpected sender"
 msgstr "Daten von einem unerwarteten Absender erhalten"
 
-#: ../src/nm-netlink-monitor.c:644
+#: ../src/nm-netlink-monitor.c:646
 msgid "too much data was sent over socket and some of it was lost"
 msgstr ""
-"Es wurden zu viele Daten über den Socket gesendet und einiges davon ist "
+"Es wurden zu viele Daten über den Socket gesendet und einiges davon ist "
 "verloren gegangen"
 
-#: ../src/nm-netlink-monitor.c:733
+#: ../src/nm-netlink-monitor.c:735
 msgid "error occurred while waiting for data on socket"
-msgstr "Während des Wartens auf Daten am Socket, ist ein Fehler aufgetreten"
+msgstr "Während des Wartens auf Daten am Socket, ist ein Fehler aufgetreten"
+
+#: ../gnome/applet/applet-dbus-devices.c:898
+#, fuzzy, c-format
+msgid "You are now connected to the Ad-Hoc wireless network '%s'."
+msgstr "Verbunden mit einem Ad-Hoc-Funknetzwerk"
+
+#: ../gnome/applet/applet-dbus-devices.c:903
+#, fuzzy, c-format
+msgid "You are now connected to the wireless network '%s'."
+msgstr "Fertigstellen der Verbindung mit dem Funknetzwerk »%s«..."
+
+#: ../gnome/applet/applet-dbus-devices.c:910
+#, fuzzy
+msgid "You are now connected to the wired network."
+msgstr "Fertigstellen der Verbindung mit dem Kabelnetzwerk..."
+
+#: ../gnome/applet/applet-dbus-devices.c:916
+msgid "Connection Established"
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:959
+#, fuzzy
+msgid "Disconnected"
+msgstr "VPN _trennen..."
+
+#: ../gnome/applet/applet-dbus-devices.c:960
+msgid "The network connection has been disconnected."
+msgstr ""
 
+#~ msgid ""
+#~ "The requested wireless network '%s' does not appear to be in range.  A "
+#~ "different wireless network will be used if any are available."
+#~ msgstr ""
+#~ "Das gewünschte Funknetzwerk »%s« scheint nicht in Reichweite zu sein. "
+#~ "Falls weitere Funknetzwerke verfügbar sind, wird ein anderes verwendet."
+
+#~ msgid "VPN Error"
+#~ msgstr "VPN-Fehler"
+
+#~ msgid "The VPN service said: \"%s\""
+#~ msgstr "Anwort des VPN-Dienstes: »%s«"
+
+#~ msgid "VPN connection '%s' said:"
+#~ msgstr "Antwort der VPN-Verbindung »%s«:"
+
+#~ msgid "_Wireless Enabled"
+#~ msgstr "_Funknetz aktiv"
+
+#~ msgid "_Passphrase:"
+#~ msgstr "_Passwort:"
+
+#~ msgid "_ASCII Key:"
+#~ msgstr "_ASCII-Schlüssel:"
+
+#~ msgid "_Hex Key:"
+#~ msgstr "_Hexadezimalschlüssel:"
+
+#~ msgid ", with no encryption enabled."
+#~ msgstr ", ohne aktivierte Verschlüsselung."
+
+#~ msgid "ASCII Key:"
+#~ msgstr "ASCII-Schlüssel:"
+
+#~ msgid ""
+#~ "128-bit Passphrase (WEP)\n"
+#~ "ASCII Key (WEP)\n"
+#~ "Hex Key (WEP)"
+#~ msgstr ""
+#~ "128-Bit Passwort (WEP)\n"
+#~ "ASCII-Schlüssel (WEP)\n"
+#~ "Hexadezimalschlüssel (WEP)"
+
+#~ msgid ""
+#~ "128-bit passphrase (WEP)\n"
+#~ "ASCII key (WEP)\n"
+#~ "Hex key (WEP)"
+#~ msgstr ""
+#~ "128-Bit Passwort (WEP)\n"
+#~ "ASCII-Schlüssel (WEP)\n"
+#~ "Hexadezimalschlüssel (WEP)"
+
+#~ msgid "Connect with _encryption enabled"
+#~ msgstr "Mit aktivierter _Verschlüsselung verbinden"
+
+#~ msgid "Wireless _network:"
+#~ msgstr "_Funknetzwerk:"
+
+#~ msgid "_Key type:"
+#~ msgstr "_Schlüsseltyp:"
+
+#~ msgid "Stop automatically running the networking applet?"
+#~ msgstr ""
+#~ "Soll künftig auf den automatischen Start des Miniprogramms bei der "
+#~ "Anmeldung verzichtet werden?"
+
+#~ msgid ""
+#~ "The networking applet will now terminate, but will automatically launch "
+#~ "the next time you login.  Would you like to stop automatically running "
+#~ "the networking applet on login?"
+#~ msgstr ""
+#~ "Das Netzwerk-Miniprogramm wird jetzt beendet, bei der nächsten Anmeldung "
+#~ "aber wieder automatisch gestartet. Soll das Miniprogramm bei der "
+#~ "Anmeldung nicht mehr automatisch gestartet werden?"
+
+#~ msgid "_Remove"
+#~ msgstr "_Entfernen"
diff --git a/po/el.po b/po/el.po
index 8e2955a261..7134a0da90 100644
--- a/po/el.po
+++ b/po/el.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: el\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-27 12:02+0300\n"
+"POT-Creation-Date: 2006-05-29 18:33+0200\n"
 "PO-Revision-Date: 2005-08-27 12:01+0300\n"
 "Last-Translator: Kostas Papadimas <pkst@gnome.org>\n"
 "Language-Team: Greek <team@gnome.gr>\n"
@@ -18,93 +18,77 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#. Setup a request to the keyring to save the network passphrase
-#: ../gnome/applet/applet-dbus-info.c:915
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:919
 #, c-format
 msgid "Passphrase for wireless network %s"
 msgstr "Συνθηματικό για ασ��ματο δικτ�ο %s"
 
-#: ../gnome/applet/applet-dbus-info.c:1137
-#, c-format
-msgid ""
-"The requested wireless network '%s' does not appear to be in range.  A "
-"different wireless network will be used if any are available."
-msgstr ""
-"Το ασ��ματο δίκτυο '%s'  που ζητήσατε δεν είναι π�οσβάσιμο. Ένα άλλοασ��ματο "
-"δίκτυο θα χ�ησιμοποιηθεί αν είναι διαθέσιμο."
-
-#: ../gnome/applet/applet-dbus.c:605
+#: ../gnome/applet/applet-dbus.c:265
 #, c-format
 msgid "Connection to the wireless network '%s' failed."
 msgstr "Η σ�νδεση στο ασ��ματο δίκτυο  '%s' απέτυχε."
 
-#: ../gnome/applet/applet-dbus.c:610
+#: ../gnome/applet/applet-dbus.c:270
 msgid "Connection to the wired network failed."
 msgstr "Αποτυχία σ�νδεσης σε ένα ενσ��ματο δίκτυο."
 
-#: ../gnome/applet/applet.c:192
-msgid "Error displaying connection information: "
+#: ../gnome/applet/applet.c:184
+#, fuzzy
+msgid "Error displaying connection information:"
 msgstr "Σφάλμα απεικόνισης πλη�οφο�ιών σ�νδεσης:"
 
-#: ../gnome/applet/applet.c:217
+#: ../gnome/applet/applet.c:202
 msgid "Could not find some required resources (the glade file)!"
 msgstr "Αδυναμία ε��εσης κάποθβν απιατο�μενων πό�ων (the glade file)!"
 
-#: ../gnome/applet/applet.c:227
+#: ../gnome/applet/applet.c:213
 msgid "No active connections!"
 msgstr "Δεν υπά�χουν ενε�γές συνδέσεις!"
 
-#: ../gnome/applet/applet.c:236
-msgid "Could not open socket!"
-msgstr "Αδυναμία ανοίγματος socket!"
-
-#: ../gnome/applet/applet.c:251
-msgid "Failed to get information about the interface!"
-msgstr "Αποτυχία λήψης πλη�οφο�ιών για τη διεπαφή!"
-
-#: ../gnome/applet/applet.c:284
+#: ../gnome/applet/applet.c:234
 #, c-format
 msgid "Wired Ethernet (%s)"
 msgstr "Ενσ��ματο Ethernet (%s)"
 
-#: ../gnome/applet/applet.c:286
+#: ../gnome/applet/applet.c:236
 #, c-format
 msgid "Wireless Ethernet (%s)"
 msgstr "Ασ��ματο Ethernet (%s)"
 
-#: ../gnome/applet/applet.c:387 ../gnome/applet/applet.c:405
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:362
 msgid "NetworkManager Applet"
 msgstr "Εφα�μογή NetworkManager"
 
-#: ../gnome/applet/applet.c:389 ../gnome/applet/applet.c:407
-msgid "Copyright (C) 2004-2005 Red Hat, Inc."
+#: ../gnome/applet/applet.c:339 ../gnome/applet/applet.c:364
+#, fuzzy
+msgid "Copyright © 2004-2005 Red Hat, Inc."
 msgstr "Copyright (C) 2004-2005 Red Hat, Inc."
 
-#: ../gnome/applet/applet.c:390 ../gnome/applet/applet.c:408
+#: ../gnome/applet/applet.c:340 ../gnome/applet/applet.c:365
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Μια μικ�οεφα�μογή για τη διαχεί�ιση των συσκευών και των συνδέσεων του "
 "δικτ�ου σας."
 
-#: ../gnome/applet/applet.c:497
-msgid "VPN Error"
-msgstr "Σφάλμα VPN"
+#: ../gnome/applet/applet.c:343 ../gnome/applet/applet.c:370
+msgid "translator-credits"
+msgstr ""
 
-#: ../gnome/applet/applet.c:501
+#: ../gnome/applet/applet.c:426
 msgid "VPN Login Failure"
 msgstr ""
 
-#: ../gnome/applet/applet.c:502
+#: ../gnome/applet/applet.c:427
 #, fuzzy, c-format
 msgid "Could not start the VPN connection '%s' due to a login failure."
 msgstr "Αδυναμία εκκίνησης σ�νδεσης VPN '%s'"
 
-#: ../gnome/applet/applet.c:506
+#: ../gnome/applet/applet.c:431
 msgid "VPN Start Failure"
 msgstr ""
 
-#: ../gnome/applet/applet.c:507
+#: ../gnome/applet/applet.c:432
 #, fuzzy, c-format
 msgid ""
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
@@ -117,26 +101,26 @@ msgstr ""
 "\n"
 "Η υπη�εσία VPN απάντησε: \"%s\""
 
-#: ../gnome/applet/applet.c:511 ../gnome/applet/applet.c:521
+#: ../gnome/applet/applet.c:436 ../gnome/applet/applet.c:446
 #, fuzzy
 msgid "VPN Connect Failure"
 msgstr "Συνδέσεις VPN"
 
-#: ../gnome/applet/applet.c:512
+#: ../gnome/applet/applet.c:437
 #, fuzzy, c-format
 msgid "Could not start the VPN connection '%s' due to a connection error."
 msgstr "Αδυναμία εκκίνησης σ�νδεσης VPN '%s'"
 
-#: ../gnome/applet/applet.c:516
+#: ../gnome/applet/applet.c:441
 msgid "VPN Configuration Error"
 msgstr ""
 
-#: ../gnome/applet/applet.c:517
+#: ../gnome/applet/applet.c:442
 #, c-format
 msgid "The VPN connection '%s' was not correctly configured."
 msgstr ""
 
-#: ../gnome/applet/applet.c:522
+#: ../gnome/applet/applet.c:447
 #, fuzzy, c-format
 msgid ""
 "Could not start the VPN connection '%s' because the VPN server did not "
@@ -149,23 +133,13 @@ msgstr ""
 "\n"
 "Η υπη�εσία VPN απάντησε: \"%s\""
 
-#: ../gnome/applet/applet.c:530
-#, c-format
-msgid "The VPN service said: \"%s\""
-msgstr ""
-
-#: ../gnome/applet/applet.c:599
-#, fuzzy, c-format
-msgid "VPN connection '%s' said:"
-msgstr "Σ�νδεση VPN σε '%s'"
-
-#: ../gnome/applet/applet.c:601
+#: ../gnome/applet/applet.c:517
 msgid "VPN Login Message"
 msgstr ""
 
-#: ../gnome/applet/applet.c:820 ../gnome/applet/applet.c:2447
-#: ../gnome/applet/other-network-dialog.c:326
-#: ../gnome/applet/passphrase-dialog.c:385
+#: ../gnome/applet/applet.c:741 ../gnome/applet/applet.c:2508
+#: ../gnome/applet/other-network-dialog.c:453
+#: ../gnome/applet/passphrase-dialog.c:228
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
@@ -173,56 +147,56 @@ msgstr ""
 "Η μικ�οεφα�μογή NetworkManager δεν μπό�εσε να β�εί κάποιους απαιτο�μενους "
 "πό�ους (δενβ�έθηκε το α�χείο glade)"
 
-#: ../gnome/applet/applet.c:833
+#: ../gnome/applet/applet.c:753
 #, c-format
 msgid "The network device \"%s (%s)\" does not support wireless scanning."
 msgstr "Η συσκευή δικτ�ου \"%s (%s)\" δεν υποστη�ίζει ασ��ματη σά�ωση."
 
-#: ../gnome/applet/applet.c:840
+#: ../gnome/applet/applet.c:761
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
 msgstr "Η συσκευή δικτ�ου \"%s (%s)\" δεν υποστη�ίζει εντοπισμό δεσμο�."
 
-#: ../gnome/applet/applet.c:984
+#: ../gnome/applet/applet.c:908
 #, c-format
 msgid "Preparing device %s for the wired network..."
 msgstr "Π�οετοιμασία συσκευής %s για το ενσ��ματο δίκτυο..."
 
-#: ../gnome/applet/applet.c:986
+#: ../gnome/applet/applet.c:910
 #, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
 msgstr "Π�οετοιμασία συσκευής %s για το ασ��ματο δίκτυο '%s'..."
 
-#: ../gnome/applet/applet.c:993
+#: ../gnome/applet/applet.c:918
 #, c-format
 msgid "Configuring device %s for the wired network..."
 msgstr "Γίνεται ��θμιση της συσκευής %s για το ενσ��ματο δίκτυο..."
 
-#: ../gnome/applet/applet.c:995
+#: ../gnome/applet/applet.c:920
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
 msgstr "Π�οσπάθεια σ�νδεσης με το ασ��ματο δίκτυο '%s'..."
 
-#: ../gnome/applet/applet.c:1002
+#: ../gnome/applet/applet.c:928
 #, c-format
 msgid "Waiting for Network Key for the wireless network '%s'..."
 msgstr "Αναμονή για κλειδί δικτ�ου για το ασ��ματο δίκτυο '%s'..."
 
-#: ../gnome/applet/applet.c:1009 ../gnome/applet/applet.c:1018
+#: ../gnome/applet/applet.c:936 ../gnome/applet/applet.c:946
 #, fuzzy
 msgid "Requesting a network address from the wired network..."
 msgstr "Σ�νδεση σε ένα ενσ��ματο δίκτυο..."
 
-#: ../gnome/applet/applet.c:1011 ../gnome/applet/applet.c:1020
+#: ../gnome/applet/applet.c:938 ../gnome/applet/applet.c:948
 #, fuzzy, c-format
 msgid "Requesting a network address from the wireless network '%s'..."
 msgstr "a."
 
-#: ../gnome/applet/applet.c:1027
+#: ../gnome/applet/applet.c:956
 msgid "Finishing connection to the wired network..."
 msgstr "Η σ�νδεση στο ενσ��ματο δίκτυο ολοκλη�ώνεται..."
 
-#: ../gnome/applet/applet.c:1029
+#: ../gnome/applet/applet.c:958
 #, c-format
 msgid "Finishing connection to the wireless network '%s'..."
 msgstr "Η σ�νδεση στο ασ��ματο δίκτυο '%s' ολοκλη�ώνεται...."
@@ -231,7 +205,11 @@ msgstr "Η σ�νδεση στο ασ��ματο δίκτυο '%s' ολοκλη
 msgid "NetworkManager is not running"
 msgstr "Το NetworkManager δεν εκτελείται"
 
-#: ../gnome/applet/applet.c:1086
+#: ../gnome/applet/applet.c:1083 ../gnome/applet/applet.c:1828
+msgid "Networking disabled"
+msgstr ""
+
+#: ../gnome/applet/applet.c:1088
 msgid "No network connection"
 msgstr "Δεν υπά�χει σ�νδεση δικτ�ου"
 
@@ -239,226 +217,273 @@ msgstr "Δεν υπά�χει σ�νδεση δικτ�ου"
 msgid "Wired network connection"
 msgstr "Ενσ��ματη σ�νδεση δικτ�ου"
 
-#: ../gnome/applet/applet.c:1100
+#: ../gnome/applet/applet.c:1097
 #, fuzzy
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Συνδεδεμένο"
 
-#: ../gnome/applet/applet.c:1114
+#: ../gnome/applet/applet.c:1099
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "Ασ��ματη σ�νδεση δικτ�ου σε '%s' (%d%%)"
 
-#: ../gnome/applet/applet.c:1140
+#: ../gnome/applet/applet.c:1120
 #, c-format
 msgid "VPN connection to '%s'"
 msgstr "Σ�νδεση VPN σε '%s'"
 
-#: ../gnome/applet/applet.c:1554
+#: ../gnome/applet/applet.c:1128
+#, fuzzy, c-format
+msgid "VPN connecting to '%s'"
+msgstr "Σ�νδεση VPN σε '%s'"
+
+#: ../gnome/applet/applet.c:1541
 msgid "_Connect to Other Wireless Network..."
 msgstr "_Σ�νδεση σε άλλο ασ��ματο δίκτυο..."
 
-#: ../gnome/applet/applet.c:1575
+#: ../gnome/applet/applet.c:1562
 msgid "Create _New Wireless Network..."
 msgstr "Δημιου�γία _νέου ασ��ματου δικτ�ου..."
 
-#: ../gnome/applet/applet.c:1689
+#: ../gnome/applet/applet.c:1685
 #, fuzzy
 msgid "_VPN Connections"
 msgstr "Συνδέσεις VPN"
 
-#: ../gnome/applet/applet.c:1718
+#: ../gnome/applet/applet.c:1730
 #, fuzzy
 msgid "_Configure VPN..."
 msgstr "Ρ�θμιση VPN..."
 
-#: ../gnome/applet/applet.c:1722
+#: ../gnome/applet/applet.c:1734
 #, fuzzy
 msgid "_Disconnect VPN..."
 msgstr "Αποσ�νδεση VPN..."
 
-#: ../gnome/applet/applet.c:1745
+#: ../gnome/applet/applet.c:1756
 #, fuzzy
 msgid "_Dial Up Connections"
 msgstr "Συνδέσεις VPN"
 
-#: ../gnome/applet/applet.c:1754
+#. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
+#: ../gnome/applet/applet.c:1767
 #, fuzzy, c-format
 msgid "Connect to %s..."
 msgstr "Σ�νδεση μέσω %s..."
 
-#: ../gnome/applet/applet.c:1806
+#: ../gnome/applet/applet.c:1773
+#, fuzzy, c-format
+msgid "Disconnect from %s..."
+msgstr "Σ�νδεση μέσω %s..."
+
+#: ../gnome/applet/applet.c:1822
 msgid "No network devices have been found"
 msgstr "Δε β�έθηκαν συσκευές δικτ�ου"
 
-#: ../gnome/applet/applet.c:1971
+#: ../gnome/applet/applet.c:2014
 msgid "NetworkManager is not running..."
 msgstr "Ο NetworkManager δεν εκτελείται."
 
-#: ../gnome/applet/applet.c:2039
-msgid "_Stop All Wireless Devices"
-msgstr "_Διακοπή όλων των ασ��ματων συσκευών"
-
-#: ../gnome/applet/applet.c:2044
-msgid "_Start All Wireless Devices"
-msgstr "Ένα�_ξη όλων των ασ��ματων συσκευών"
-
-#: ../gnome/applet/applet.c:2075
-msgid "_Wireless Network Discovery"
-msgstr "Ανακάλυ_ψη ασ��ματου δικτ�ου"
-
-#: ../gnome/applet/applet.c:2078
-msgid "Always Search"
-msgstr "Πάντα Αναζήτηση"
-
-#: ../gnome/applet/applet.c:2086
-#, fuzzy
-msgid "Search Only When Disconnected"
-msgstr "Αναζήτηση Μόνο Αποσυνδέθηκε"
-
-#: ../gnome/applet/applet.c:2094
-msgid "Never Search"
-msgstr "Ποτέ Αναζήτηση"
+#. 'Enable Networking' item
+#: ../gnome/applet/applet.c:2170
+msgid "Enable _Networking"
+msgstr ""
 
-#. Stop All Wireless Devices item
-#: ../gnome/applet/applet.c:2106
-msgid "Stop All Wireless Devices"
-msgstr "Διακοπή Όλων Των Ασ��ματων Συσκευών"
+#. 'Enable Wireless' item
+#: ../gnome/applet/applet.c:2176
+msgid "Enable _Wireless"
+msgstr ""
 
-#: ../gnome/applet/applet.c:2112
+#. 'Connection Information' item
+#: ../gnome/applet/applet.c:2182
 msgid "Connection _Information"
 msgstr "Πλη�οφο�ίες _σ�νδεσης"
 
-#: ../gnome/applet/applet.c:2120
+#. Help item
+#: ../gnome/applet/applet.c:2193
 msgid "_Help"
 msgstr "_Βοήθεια"
 
-#: ../gnome/applet/applet.c:2127
+#. About item
+#: ../gnome/applet/applet.c:2202
 msgid "_About"
 msgstr "Πε_�ί"
 
-#: ../gnome/applet/applet.c:2597
+#: ../gnome/applet/applet.c:2667
 #, fuzzy
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
 msgstr "not ε��εση ο"
 
-#: ../gnome/applet/eggtrayicon.c:118
+#: ../gnome/applet/wireless-security-option.c:157
+msgid "Open System"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:160
+msgid "Shared Key"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:208
+msgid "Automatic (Default)"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:215
+msgid "AES-CCMP"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:223
+msgid "TKIP"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:231
+msgid "Dynamic WEP"
+msgstr ""
+
+#: ../gnome/applet/wso-none.c:53
+msgid "None"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-ascii.c:138
+msgid "WEP 64/128-bit ASCII"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-hex.c:135
+msgid "WEP 64/128-bit Hex"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-passphrase.c:135
+#, fuzzy
+msgid "WEP 128-bit Passphrase"
+msgstr "Συνθηματικό:"
+
+#: ../gnome/applet/wso-wpa-eap.c:237
+msgid "PEAP"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:238
+msgid "TLS"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:239
+msgid "TTLS"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
+#: ../src/nm-ap-security-wpa-eap.c:116
+msgid "WPA2 Enterprise"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
+#: ../src/nm-ap-security-wpa-eap.c:121
+msgid "WPA Enterprise"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-psk.c:178
+msgid "WPA2 Personal"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-psk.c:180
+msgid "WPA Personal"
+msgstr ""
+
+#: ../gnome/applet/eggtrayicon.c:134
 msgid "Orientation"
 msgstr "Π�οσανατολισμός"
 
-#: ../gnome/applet/eggtrayicon.c:119
+#: ../gnome/applet/eggtrayicon.c:135
 msgid "The orientation of the tray."
 msgstr "Ο π�οσανατολισμός του συ�τα�ιο�."
 
-#: ../gnome/applet/menu-items.c:89
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Ενσ��ματο Δίκτυο (%s)"
 
-#: ../gnome/applet/menu-items.c:92
+#: ../gnome/applet/menu-items.c:91
 msgid "_Wired Network"
 msgstr "Ε_νσ��ματο Δίκτυο"
 
-#: ../gnome/applet/menu-items.c:165
+#: ../gnome/applet/menu-items.c:162
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
 msgstr[0] "Ασ��ματο Δίκτυο (%s)"
 msgstr[1] "Ασ��ματα Δίκτυα (%s)"
 
-#: ../gnome/applet/menu-items.c:167
+#: ../gnome/applet/menu-items.c:164
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Ασ��ματο Δίκτυο"
 msgstr[1] "Ασ��ματα Δίκτυα"
 
-#: ../gnome/applet/menu-items.c:309
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr " (μή έγκυ�ο Unicode)"
 
-#: ../gnome/applet/other-network-dialog.c:143
-#: ../gnome/applet/applet.glade.h:39
-#, fuzzy
-msgid "_Passphrase:"
-msgstr "Συνθηματικό:"
-
-#: ../gnome/applet/other-network-dialog.c:146
-#, fuzzy
-msgid "_ASCII Key:"
-msgstr "Κλειδί Ascii:"
-
-#: ../gnome/applet/other-network-dialog.c:149
-#, fuzzy
-msgid "_Hex Key:"
-msgstr "Κλειδί Hex:"
+#: ../gnome/applet/other-network-dialog.c:352
+#, fuzzy, c-format
+msgid ""
+"By default, the wireless network's name is set to your computer's name, %s, "
+"with no encryption enabled"
+msgstr "εξ ο�ισμο� είναι"
 
-#: ../gnome/applet/other-network-dialog.c:232
+#: ../gnome/applet/other-network-dialog.c:358
 msgid "Create new wireless network"
 msgstr "Δημιου�γία νέου ασ��ματου Δικτ�ου"
 
-#: ../gnome/applet/other-network-dialog.c:233
+#: ../gnome/applet/other-network-dialog.c:359
 #, fuzzy
 msgid ""
-"Enter the ESSID and security settings of the wireless network you wish to "
+"Enter the name and security settings of the wireless network you wish to "
 "create."
 msgstr "Enter and από."
 
-#: ../gnome/applet/other-network-dialog.c:234
-#, fuzzy
-msgid "By default, the ESSID is set to your computer's name,"
-msgstr "εξ ο�ισμο� είναι"
-
-#: ../gnome/applet/other-network-dialog.c:236
-#, fuzzy
-msgid ", with no encryption enabled."
-msgstr "Σ�νδεση με κ�υπτογ�άφηση"
-
-#: ../gnome/applet/other-network-dialog.c:238
+#: ../gnome/applet/other-network-dialog.c:363
 #, fuzzy
 msgid "Create New Wireless Network"
 msgstr "Δημιου�γία _νέου ασ��ματου δικτ�ου..."
 
-#: ../gnome/applet/other-network-dialog.c:243
-msgid "Custom wireless network"
+#: ../gnome/applet/other-network-dialog.c:368
+#, fuzzy
+msgid "Existing wireless network"
 msgstr "Π�οσα�μοσμένο ασ��ματο δίκτυο"
 
-#: ../gnome/applet/other-network-dialog.c:244
-msgid "Enter the ESSID of the wireless network to which you wish to connect."
+#: ../gnome/applet/other-network-dialog.c:369
+#, fuzzy
+msgid "Enter the name of the wireless network to which you wish to connect."
 msgstr "Εισάγετε το ESSID του ασ��ματου δικτ�ου που θέλετε να συνδεθείτε."
 
-#: ../gnome/applet/other-network-dialog.c:246
+#: ../gnome/applet/other-network-dialog.c:371
 #, fuzzy
 msgid "Connect to Other Wireless Network"
 msgstr "_Σ�νδεση σε άλλο ασ��ματο δίκτυο..."
 
-#: ../gnome/applet/passphrase-dialog.c:155
-msgid "Passphrase:"
-msgstr "Συνθηματικό:"
-
-#: ../gnome/applet/passphrase-dialog.c:158
-msgid "ASCII Key:"
-msgstr "Κλειδί Ascii:"
+#: ../gnome/applet/passphrase-dialog.c:215
+#, fuzzy
+msgid "Error connecting to wireless network"
+msgstr "_Σ�νδεση σε άλλο ασ��ματο δίκτυο..."
 
-#: ../gnome/applet/passphrase-dialog.c:161
-msgid "Hex Key:"
-msgstr "Κλειδί Hex:"
+#: ../gnome/applet/passphrase-dialog.c:216
+msgid ""
+"The requested wireless network requires security capabilities unsupported by "
+"your hardware."
+msgstr ""
 
-#: ../gnome/applet/vpn-password-dialog.c:152
-#: ../gnome/applet/vpn-password-dialog.c:191
+#: ../gnome/applet/vpn-password-dialog.c:151
+#: ../gnome/applet/vpn-password-dialog.c:188
 #, c-format
 msgid "Cannot start VPN connection '%s'"
 msgstr "Αδυναμία εκκίνησης σ�νδεσης VPN '%s'"
 
-#: ../gnome/applet/vpn-password-dialog.c:155
+#: ../gnome/applet/vpn-password-dialog.c:154
 #, fuzzy, c-format
 msgid ""
 "Could not find the authentication dialog for VPN connection type '%s'. "
 "Contact your system administrator."
 msgstr "not ε��εση πιστοποίηση διάλογος για είδος Επαφή."
 
-#: ../gnome/applet/vpn-password-dialog.c:194
+#: ../gnome/applet/vpn-password-dialog.c:191
 #, fuzzy, c-format
 msgid ""
 "There was a problem launching the authentication dialog for VPN connection "
@@ -470,32 +495,12 @@ msgid " "
 msgstr " "
 
 #: ../gnome/applet/applet.glade.h:2
-msgid ""
-"128-bit Passphrase (WEP)\n"
-"ASCII Key (WEP)\n"
-"Hex Key (WEP)"
-msgstr ""
-"128-bit συνθηματικό (WEP)\n"
-"Κλειδί ASCII (WEP)\n"
-"Κλειδί Hex(WEP)"
-
-#: ../gnome/applet/applet.glade.h:5
-msgid ""
-"128-bit passphrase (WEP)\n"
-"ASCII key (WEP)\n"
-"Hex key (WEP)"
-msgstr ""
-"128-bit συνθηματικό (WEP)\n"
-"Κλειδί ASCII (WEP)\n"
-"Κλειδί Hex (WEP)"
-
-#: ../gnome/applet/applet.glade.h:8
 #, fuzzy
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
 msgstr "<span weight=\"bold\">Ασ��ματα Δίκτυα:</span>"
 
-#: ../gnome/applet/applet.glade.h:10
+#: ../gnome/applet/applet.glade.h:4
 #, fuzzy, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
@@ -506,7 +511,7 @@ msgid ""
 msgstr ""
 "<span weight=\"bold\" size=\"larger\"> Ασ��ματη Δίκτυο</span> ο or είναι."
 
-#: ../gnome/applet/applet.glade.h:14
+#: ../gnome/applet/applet.glade.h:8
 #, fuzzy, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
@@ -514,7 +519,7 @@ msgid ""
 "%s  It will not be completely functional."
 msgstr "<span weight=\"bold\" size=\"larger\"> Δίκτυο</span> ο ο not."
 
-#: ../gnome/applet/applet.glade.h:18
+#: ../gnome/applet/applet.glade.h:12
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
@@ -531,28 +536,52 @@ msgstr ""
 "αυτό το ασ��ματο δίκτυο είναι ασφαλές, πατήστε το πα�ακάτωκουτί ελέγχου και "
 "ο NetworkManager δεν θα απαιτεί επιβεβαίωση στις επόμενες συνδέσεις σας."
 
-#: ../gnome/applet/applet.glade.h:21
+#: ../gnome/applet/applet.glade.h:15
+msgid "Anonymous Identity:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:16
+#, fuzzy
+msgid "Authentication:"
+msgstr "Π�οσανατολισμός"
+
+#: ../gnome/applet/applet.glade.h:17
 #, fuzzy
 msgid "Broadcast Address:"
 msgstr "Μετάδοση Διε�θυνση:"
 
-#: ../gnome/applet/applet.glade.h:22
+#: ../gnome/applet/applet.glade.h:18
+msgid "CA Certificate File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:19
 msgid "C_onnect"
 msgstr "Σ�ν_δεση"
 
-#: ../gnome/applet/applet.glade.h:23
-#, fuzzy
-msgid "Connect with _encryption enabled"
-msgstr "Σ�νδεση με κ�υπτογ�άφηση"
+#: ../gnome/applet/applet.glade.h:20
+msgid "Client Certificate File:"
+msgstr ""
 
-#: ../gnome/applet/applet.glade.h:24
+#: ../gnome/applet/applet.glade.h:21
 msgid "Connection Information"
 msgstr "Πλη�οφο�ίες σ�νδεσης"
 
-#: ../gnome/applet/applet.glade.h:25
+#: ../gnome/applet/applet.glade.h:22
+msgid "Default Route:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:23
 msgid "Destination Address:"
 msgstr " Διε�θυνση π�οο�ισμο�:"
 
+#: ../gnome/applet/applet.glade.h:24
+msgid "Driver:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:25
+msgid "EAP Method:"
+msgstr ""
+
 #: ../gnome/applet/applet.glade.h:26
 msgid "Hardware Address:"
 msgstr "Διε�θυνση υλικο�:"
@@ -562,95 +591,184 @@ msgid "IP Address:"
 msgstr "Διε�θυνση IP:"
 
 #: ../gnome/applet/applet.glade.h:28
+msgid "Identity:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:29
 msgid "Interface:"
 msgstr "Διεπαφή:"
 
-#: ../gnome/applet/applet.glade.h:29
+#: ../gnome/applet/applet.glade.h:30
+#, fuzzy
+msgid "Key Type:"
+msgstr "Κατά Είδος"
+
+#: ../gnome/applet/applet.glade.h:31
+#, fuzzy
+msgid "Key:"
+msgstr "Κλειδί Hex:"
+
+#: ../gnome/applet/applet.glade.h:32
+msgid ""
+"None\n"
+"WEP 128-bit Passphrase\n"
+"WEP 64/128-bit Hex\n"
+"WEP 64/128-bit ASCII\n"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:37
+msgid ""
+"Open System\n"
+"Shared Key"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:39
 msgid "Other Wireless Network..."
 msgstr "Άλλο ασ��ματο δίκτυο..."
 
-#: ../gnome/applet/applet.glade.h:30
+#: ../gnome/applet/applet.glade.h:40
+msgid "Passphrase:"
+msgstr "Συνθηματικό:"
+
+#: ../gnome/applet/applet.glade.h:41
+msgid "Password:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:42
+msgid "Primary DNS:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:43
+msgid "Private Key File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:44
+msgid "Private Key Password:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:45
+msgid "Secondary DNS:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:46
+msgid "Select the CA Certificate File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:47
+msgid "Select the Client Certificate File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:48
+msgid "Select the Private Key File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:49
+msgid "Show key"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:50
+#, fuzzy
+msgid "Show passphrase"
+msgstr "Συνθηματικό:"
+
+#: ../gnome/applet/applet.glade.h:51
+msgid "Show password"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:52
+msgid "Show passwords"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:53
+msgid "Speed:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:54
 #, fuzzy
 msgid "Subnet Mask:"
 msgstr "Subnet Mask:"
 
-#: ../gnome/applet/applet.glade.h:31
+#: ../gnome/applet/applet.glade.h:55
+#, fuzzy
+msgid "Type:"
+msgstr "Κατά Είδος"
+
+#: ../gnome/applet/applet.glade.h:56
+msgid "User Name:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:57
 #, fuzzy
 msgid "Wireless Network Key Required"
 msgstr "Ασ��ματη Δίκτυο Πλήκτ�ο"
 
-#: ../gnome/applet/applet.glade.h:32
+#: ../gnome/applet/applet.glade.h:58
 msgid "Wireless _adapter:"
 msgstr "Ασ��ματος _π�οσα�μογέας:"
 
-#: ../gnome/applet/applet.glade.h:33
-msgid "Wireless _network:"
-msgstr "Ασ��ματο _δίκτυο:"
-
-#: ../gnome/applet/applet.glade.h:34
+#: ../gnome/applet/applet.glade.h:59
 #, fuzzy
 msgid "_Always Trust this Wireless Network"
 msgstr "�α είναι πάντα έμπιστο αυτό το ασ��ματο Δίκτυο"
 
-#: ../gnome/applet/applet.glade.h:35
+#: ../gnome/applet/applet.glade.h:60
 #, fuzzy
 msgid "_Don't remind me again"
 msgstr "�α μη γίνει υπενθ�μιση ξανά"
 
-#: ../gnome/applet/applet.glade.h:36
-#, fuzzy
-msgid "_Key Type:"
-msgstr "Κατά Είδος"
-
-#: ../gnome/applet/applet.glade.h:37
-#, fuzzy
-msgid "_Key type:"
-msgstr "Κατά Είδος"
-
-#: ../gnome/applet/applet.glade.h:38
+#: ../gnome/applet/applet.glade.h:61
 msgid "_Login to Network"
 msgstr "_Είσοδος στο Δίκτυο"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:376
+#: ../gnome/applet/applet.glade.h:62
+msgid "_Network Name:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:63
+#, fuzzy
+msgid "_Wireless Security:"
+msgstr "Ασ��ματος _π�οσα�μογέας:"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:383
 msgid "Cannot add VPN connection"
 msgstr "Αδυναμία π�οσθήκης σ�νδεσης VPN"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:378
+#: ../gnome/vpn-properties/nm-vpn-properties.c:385
 #, fuzzy
 msgid ""
 "No suitable VPN software was found on your system. Contact your system "
 "administrator."
 msgstr "Όχι στο Επαφή."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:430
+#: ../gnome/vpn-properties/nm-vpn-properties.c:437
 msgid "Cannot import VPN connection"
 msgstr "Αδυναμία εισαγωγής σ�νδεσης VPN"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:432
+#: ../gnome/vpn-properties/nm-vpn-properties.c:439
 #, fuzzy, c-format
 msgid ""
 "Cannot find suitable software for VPN connection type '%s' to import the "
 "file '%s'. Contact your system administrator."
 msgstr "ε��εση για είδος α�χείο Επαφή."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:572
+#: ../gnome/vpn-properties/nm-vpn-properties.c:579
 #, c-format
 msgid "Error retrieving VPN connection '%s'"
 msgstr "Σφάλμα ανάκτησης σ�νδεσης VPN '%s'"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:575
+#: ../gnome/vpn-properties/nm-vpn-properties.c:582
 #, fuzzy, c-format
 msgid ""
 "Could not find the UI files for VPN connection type '%s'. Contact your "
 "system administrator."
 msgstr "not ε��εση για είδος Επαφή."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:735
+#: ../gnome/vpn-properties/nm-vpn-properties.c:739
 #, c-format
 msgid "Delete VPN connection \"%s\"?"
 msgstr "Διαγ�αφή σ�νδεσης VPN \"%s\";"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:738
+#: ../gnome/vpn-properties/nm-vpn-properties.c:742
 #, fuzzy, c-format
 msgid ""
 "All information about the VPN connection \"%s\" will be lost and you may "
@@ -658,17 +776,17 @@ msgid ""
 "connection."
 msgstr "Όλα πε�ί and a νέο."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:953
+#: ../gnome/vpn-properties/nm-vpn-properties.c:959
 msgid "Unable to load"
 msgstr "Αδυναμία φό�τωσης"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:955
+#: ../gnome/vpn-properties/nm-vpn-properties.c:961
 #, fuzzy
 msgid "Cannot find some needed resources (the glade file)!"
 msgstr "ε��εση α�χείο!"
 
 #. Edit dialog
-#: ../gnome/vpn-properties/nm-vpn-properties.c:1073
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
 msgid "Edit VPN Connection"
 msgstr "Επεξε�γασία σ�νδεσης VPN"
 
@@ -677,32 +795,29 @@ msgid "Add a new VPN connection"
 msgstr "Π�οσθήκη μιας νέας σ�νδεσης VPN"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:2
+msgid "Choose which type of VPN connection you wish to create."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
 msgid "Connect to:"
 msgstr "Σ�νδεση σε:"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
 msgid "Create VPN Connection"
 msgstr "Δημιου�γία σ�νδεσης VPN"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
 msgid "Create VPN Connection - 1 of 2"
 msgstr "Δημιου�γία σ�νδεσης VPN - 1 από 2"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
 msgid "Create VPN Connection - 2 of 2"
 msgstr "Δημιου�γία σ�νδεσης VPN - 2 από 2"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
 msgid "Delete the selected VPN connection"
 msgstr "Διαγ�αφή της επιλεγμένης σ�νδεσης VPN"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
-#, fuzzy
-msgid ""
-"Dependent on the private network you want to connect to, you need to select "
-"what type of connection you want to create."
-msgstr "στο είδος από."
-
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
 msgid "E_xport"
 msgstr "Ε_ξαγωγή"
@@ -712,36 +827,74 @@ msgid "Edit the selected VPN connection"
 msgstr "Επεξε�γασία της επιλεγμένης σ�νδεσης VPN"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:10
-msgid "Export VPN connection to a file"
-msgstr "Εξαγωγή σ�νδεσης VPN σε α�χείο"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:11
 msgid "Export the VPN settings to a file"
 msgstr "Εξαγωγή των �υθμίσεων VPN σε ένα α�χείο"
 
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:11
+#, fuzzy
+msgid "Export the selected VPN connection to a file"
+msgstr "Εξαγωγή σ�νδεσης VPN σε α�χείο"
+
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:12
-msgid "Finish create VPN Connection"
+#, fuzzy
+msgid "Finish Creating VPN Connection"
 msgstr "Ολοκλη�ώθηκε η δημιου�γία σ�νδεσης VPN"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:13
 #, fuzzy
-msgid "Manage Virtual Private Network connections"
+msgid "Manage Virtual Private Network Connections"
 msgstr "Ασ��ματη σ�νδεση δικτ�ου"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:14
 #, fuzzy
 msgid ""
-"This assistant will guide you through the creation of a new VPN connection "
-"to a private network.\n"
+"This assistant will guide you through the creation of a connection to a "
+"Virtual Private Network (VPN).\n"
 "\n"
-"It will require some information, such as IP addresses and secrets, that "
-"will probably be provided by your system administrator as appropriate."
+"It will require some information, such as IP addresses and secrets.  Please "
+"see your system administrator to obtain this information."
 msgstr "από a νέο a ο IP and."
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:17
 msgid "VPN Connections"
 msgstr "Συνδέσεις VPN"
 
+#: ../src/nm-ap-security-wep.c:52
+msgid "40-bit WEP"
+msgstr ""
+
+#: ../src/nm-ap-security-wep.c:54
+msgid "104-bit WEP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:50
+msgid "WPA TKIP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:52
+msgid "WPA CCMP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:54
+msgid "WPA Automatic"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:59
+msgid "WPA2 TKIP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:61
+msgid "WPA2 CCMP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:63
+msgid "WPA2 Automatic"
+msgstr ""
+
+#: ../src/nm-ap-security.c:320
+msgid "none"
+msgstr ""
+
 #: ../src/nm-netlink-monitor.c:154
 #, fuzzy, c-format
 msgid ""
@@ -754,27 +907,151 @@ msgid ""
 "unable to bind to netlink socket for monitoring wired ethernet devices - %s"
 msgstr "για"
 
-#: ../src/nm-netlink-monitor.c:403
+#: ../src/nm-netlink-monitor.c:405
 msgid "operation took too long"
 msgstr "η λειτου�γία πή�ε πολ� χ�όνο"
 
-#: ../src/nm-netlink-monitor.c:500
+#: ../src/nm-netlink-monitor.c:502
 #, fuzzy
 msgid "received data from wrong type of sender"
 msgstr "είδος από"
 
-#: ../src/nm-netlink-monitor.c:513
+#: ../src/nm-netlink-monitor.c:515
 msgid "received data from unexpected sender"
 msgstr "λήψη δεδομένων από απ�όσμενο αποστολές"
 
-#: ../src/nm-netlink-monitor.c:644
+#: ../src/nm-netlink-monitor.c:646
 msgid "too much data was sent over socket and some of it was lost"
 msgstr "στάλθηκαν πά�α πολλά δεδομένα στο socket και με�ικά από αυτά χάθηκαν"
 
-#: ../src/nm-netlink-monitor.c:733
+#: ../src/nm-netlink-monitor.c:735
 msgid "error occurred while waiting for data on socket"
 msgstr "δημιου�γήθηκε σφάλμα κατά την αναμονή για δεδομένα στο socket"
 
+#: ../gnome/applet/applet-dbus-devices.c:898
+#, fuzzy, c-format
+msgid "You are now connected to the Ad-Hoc wireless network '%s'."
+msgstr "Συνδεδεμένο"
+
+#: ../gnome/applet/applet-dbus-devices.c:903
+#, fuzzy, c-format
+msgid "You are now connected to the wireless network '%s'."
+msgstr "Η σ�νδεση στο ασ��ματο δίκτυο '%s' ολοκλη�ώνεται...."
+
+#: ../gnome/applet/applet-dbus-devices.c:910
+#, fuzzy
+msgid "You are now connected to the wired network."
+msgstr "Η σ�νδεση στο ενσ��ματο δίκτυο ολοκλη�ώνεται..."
+
+#: ../gnome/applet/applet-dbus-devices.c:916
+msgid "Connection Established"
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:959
+#, fuzzy
+msgid "Disconnected"
+msgstr "Αποσ�νδεση VPN..."
+
+#: ../gnome/applet/applet-dbus-devices.c:960
+msgid "The network connection has been disconnected."
+msgstr ""
+
+#~ msgid ""
+#~ "The requested wireless network '%s' does not appear to be in range.  A "
+#~ "different wireless network will be used if any are available."
+#~ msgstr ""
+#~ "Το ασ��ματο δίκτυο '%s'  που ζητήσατε δεν είναι π�οσβάσιμο. Ένα "
+#~ "άλλοασ��ματο δίκτυο θα χ�ησιμοποιηθεί αν είναι διαθέσιμο."
+
+#~ msgid "Could not open socket!"
+#~ msgstr "Αδυναμία ανοίγματος socket!"
+
+#~ msgid "Failed to get information about the interface!"
+#~ msgstr "Αποτυχία λήψης πλη�οφο�ιών για τη διεπαφή!"
+
+#~ msgid "VPN Error"
+#~ msgstr "Σφάλμα VPN"
+
+#, fuzzy
+#~ msgid "VPN connection '%s' said:"
+#~ msgstr "Σ�νδεση VPN σε '%s'"
+
+#~ msgid "_Stop All Wireless Devices"
+#~ msgstr "_Διακοπή όλων των ασ��ματων συσκευών"
+
+#~ msgid "_Start All Wireless Devices"
+#~ msgstr "Ένα�_ξη όλων των ασ��ματων συσκευών"
+
+#~ msgid "_Wireless Network Discovery"
+#~ msgstr "Ανακάλυ_ψη ασ��ματου δικτ�ου"
+
+#~ msgid "Always Search"
+#~ msgstr "Πάντα Αναζήτηση"
+
+#, fuzzy
+#~ msgid "Search Only When Disconnected"
+#~ msgstr "Αναζήτηση Μόνο Αποσυνδέθηκε"
+
+#~ msgid "Never Search"
+#~ msgstr "Ποτέ Αναζήτηση"
+
+#~ msgid "Stop All Wireless Devices"
+#~ msgstr "Διακοπή Όλων Των Ασ��ματων Συσκευών"
+
+#, fuzzy
+#~ msgid "_Passphrase:"
+#~ msgstr "Συνθηματικό:"
+
+#, fuzzy
+#~ msgid "_ASCII Key:"
+#~ msgstr "Κλειδί Ascii:"
+
+#, fuzzy
+#~ msgid "_Hex Key:"
+#~ msgstr "Κλειδί Hex:"
+
+#, fuzzy
+#~ msgid ", with no encryption enabled."
+#~ msgstr "Σ�νδεση με κ�υπτογ�άφηση"
+
+#~ msgid "ASCII Key:"
+#~ msgstr "Κλειδί Ascii:"
+
+#~ msgid ""
+#~ "128-bit Passphrase (WEP)\n"
+#~ "ASCII Key (WEP)\n"
+#~ "Hex Key (WEP)"
+#~ msgstr ""
+#~ "128-bit συνθηματικό (WEP)\n"
+#~ "Κλειδί ASCII (WEP)\n"
+#~ "Κλειδί Hex(WEP)"
+
+#~ msgid ""
+#~ "128-bit passphrase (WEP)\n"
+#~ "ASCII key (WEP)\n"
+#~ "Hex key (WEP)"
+#~ msgstr ""
+#~ "128-bit συνθηματικό (WEP)\n"
+#~ "Κλειδί ASCII (WEP)\n"
+#~ "Κλειδί Hex (WEP)"
+
+#, fuzzy
+#~ msgid "Connect with _encryption enabled"
+#~ msgstr "Σ�νδεση με κ�υπτογ�άφηση"
+
+#~ msgid "Wireless _network:"
+#~ msgstr "Ασ��ματο _δίκτυο:"
+
+#, fuzzy
+#~ msgid "_Key type:"
+#~ msgstr "Κατά Είδος"
+
+#, fuzzy
+#~ msgid ""
+#~ "Dependent on the private network you want to connect to, you need to "
+#~ "select what type of connection you want to create."
+#~ msgstr "στο είδος από."
+
 #~ msgid ""
 #~ "<span weight=\"bold\" size=\"larger\">VPN Login Failure</span>\n"
 #~ "\n"
@@ -832,3 +1109,52 @@ msgstr "δημιουÏ�γήθηκε σφάλμα κατά την αναμονή Î
 
 #~ msgid "_OK"
 #~ msgstr "_OK"
+
+#~ msgid "Error displaying connection information: "
+#~ msgstr "Σφάλμα απεικόνισης πλη�οφο�ιών σ�νδεσης:"
+
+#~ msgid "Copyright (C) 2004-2005 Red Hat, Inc."
+#~ msgstr "Copyright (C) 2004-2005 Red Hat, Inc."
+
+#, fuzzy
+#~ msgid ""
+#~ "Enter the ESSID and security settings of the wireless network you wish to "
+#~ "create."
+#~ msgstr "Enter and από."
+
+#, fuzzy
+#~ msgid "By default, the ESSID is set to your computer's name,"
+#~ msgstr "εξ ο�ισμο� είναι"
+
+#~ msgid "Custom wireless network"
+#~ msgstr "Π�οσα�μοσμένο ασ��ματο δίκτυο"
+
+#~ msgid ""
+#~ "Enter the ESSID of the wireless network to which you wish to connect."
+#~ msgstr "Εισάγετε το ESSID του ασ��ματου δικτ�ου που θέλετε να συνδεθείτε."
+
+#~ msgid "Hex Key:"
+#~ msgstr "Κλειδί Hex:"
+
+#, fuzzy
+#~ msgid "_Key Type:"
+#~ msgstr "Κατά Είδος"
+
+#~ msgid "Export VPN connection to a file"
+#~ msgstr "Εξαγωγή σ�νδεσης VPN σε α�χείο"
+
+#~ msgid "Finish create VPN Connection"
+#~ msgstr "Ολοκλη�ώθηκε η δημιου�γία σ�νδεσης VPN"
+
+#, fuzzy
+#~ msgid "Manage Virtual Private Network connections"
+#~ msgstr "Ασ��ματη σ�νδεση δικτ�ου"
+
+#, fuzzy
+#~ msgid ""
+#~ "This assistant will guide you through the creation of a new VPN "
+#~ "connection to a private network.\n"
+#~ "\n"
+#~ "It will require some information, such as IP addresses and secrets, that "
+#~ "will probably be provided by your system administrator as appropriate."
+#~ msgstr "από a νέο a ο IP and."
diff --git a/po/en_CA.po b/po/en_CA.po
index 85215f25ff..35669e7bfd 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-31 21:00-0500\n"
+"POT-Creation-Date: 2006-05-29 18:33+0200\n"
 "PO-Revision-Date: 2005-09-06 14:52-0400\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: Canadian English <adamw@gnome.org>\n"
@@ -17,78 +17,74 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:923
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:919
 #, c-format
 msgid "Passphrase for wireless network %s"
 msgstr "Passphrase for wireless network %s"
 
-#: ../gnome/applet/applet-dbus.c:244
+#: ../gnome/applet/applet-dbus.c:265
 #, c-format
 msgid "Connection to the wireless network '%s' failed."
 msgstr "Connection to the wireless network '%s' failed."
 
-#: ../gnome/applet/applet-dbus.c:249
+#: ../gnome/applet/applet-dbus.c:270
 msgid "Connection to the wired network failed."
 msgstr "Connection to the wired network failed."
 
-#: ../gnome/applet/applet.c:179
+#: ../gnome/applet/applet.c:184
 msgid "Error displaying connection information:"
 msgstr "Error displaying connection information:"
 
-#: ../gnome/applet/applet.c:196
+#: ../gnome/applet/applet.c:202
 msgid "Could not find some required resources (the glade file)!"
 msgstr "Could not find some required resources (the glade file)!"
 
-#: ../gnome/applet/applet.c:207
+#: ../gnome/applet/applet.c:213
 msgid "No active connections!"
 msgstr "No active connections!"
 
-#: ../gnome/applet/applet.c:224
+#: ../gnome/applet/applet.c:234
 #, c-format
 msgid "Wired Ethernet (%s)"
 msgstr "Wired Ethernet (%s)"
 
-#: ../gnome/applet/applet.c:226
+#: ../gnome/applet/applet.c:236
 #, c-format
 msgid "Wireless Ethernet (%s)"
 msgstr "Wireless Ethernet (%s)"
 
-#: ../gnome/applet/applet.c:323 ../gnome/applet/applet.c:348
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:362
 msgid "NetworkManager Applet"
 msgstr "NetworkManager Applet"
 
-#: ../gnome/applet/applet.c:325 ../gnome/applet/applet.c:350
+#: ../gnome/applet/applet.c:339 ../gnome/applet/applet.c:364
 msgid "Copyright © 2004-2005 Red Hat, Inc."
 msgstr "Copyright © 2004-2005 Red Hat, Inc."
 
-#: ../gnome/applet/applet.c:326 ../gnome/applet/applet.c:351
+#: ../gnome/applet/applet.c:340 ../gnome/applet/applet.c:365
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Notification area applet for managing your network devices and connections."
 
-#: ../gnome/applet/applet.c:329 ../gnome/applet/applet.c:356
+#: ../gnome/applet/applet.c:343 ../gnome/applet/applet.c:370
 msgid "translator-credits"
 msgstr "Adam Weinberger <adamw@gnome.org>"
 
-#: ../gnome/applet/applet.c:441
-msgid "VPN Error"
-msgstr "VPN Error"
-
-#: ../gnome/applet/applet.c:445
+#: ../gnome/applet/applet.c:426
 msgid "VPN Login Failure"
 msgstr "VPN Login Failure"
 
-#: ../gnome/applet/applet.c:446
+#: ../gnome/applet/applet.c:427
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a login failure."
 msgstr "Could not start the VPN connection '%s' due to a login failure."
 
-#: ../gnome/applet/applet.c:450
+#: ../gnome/applet/applet.c:431
 msgid "VPN Start Failure"
 msgstr "VPN Start Failure"
 
-#: ../gnome/applet/applet.c:451
+#: ../gnome/applet/applet.c:432
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
@@ -97,25 +93,25 @@ msgstr ""
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
 "program."
 
-#: ../gnome/applet/applet.c:455 ../gnome/applet/applet.c:465
+#: ../gnome/applet/applet.c:436 ../gnome/applet/applet.c:446
 msgid "VPN Connect Failure"
 msgstr "VPN Connect Failure"
 
-#: ../gnome/applet/applet.c:456
+#: ../gnome/applet/applet.c:437
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a connection error."
 msgstr "Could not start the VPN connection '%s' due to a connection error."
 
-#: ../gnome/applet/applet.c:460
+#: ../gnome/applet/applet.c:441
 msgid "VPN Configuration Error"
 msgstr "VPN Configuration Error"
 
-#: ../gnome/applet/applet.c:461
+#: ../gnome/applet/applet.c:442
 #, c-format
 msgid "The VPN connection '%s' was not correctly configured."
 msgstr "The VPN connection '%s' was not correctly configured."
 
-#: ../gnome/applet/applet.c:466
+#: ../gnome/applet/applet.c:447
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' because the VPN server did not "
@@ -124,23 +120,13 @@ msgstr ""
 "Could not start the VPN connection '%s' because the VPN server did not "
 "return an adequate network configuration."
 
-#: ../gnome/applet/applet.c:474
-#, c-format
-msgid "The VPN service said: \"%s\""
-msgstr "The VPN service said: \"%s\""
-
-#: ../gnome/applet/applet.c:543
-#, c-format
-msgid "VPN connection '%s' said:"
-msgstr "VPN connection '%s' said:"
-
-#: ../gnome/applet/applet.c:545
+#: ../gnome/applet/applet.c:517
 msgid "VPN Login Message"
 msgstr "VPN Login Message"
 
-#: ../gnome/applet/applet.c:762 ../gnome/applet/applet.c:2516
+#: ../gnome/applet/applet.c:741 ../gnome/applet/applet.c:2508
 #: ../gnome/applet/other-network-dialog.c:453
-#: ../gnome/applet/passphrase-dialog.c:227
+#: ../gnome/applet/passphrase-dialog.c:228
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
@@ -148,163 +134,163 @@ msgstr ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
 
-#: ../gnome/applet/applet.c:774
+#: ../gnome/applet/applet.c:753
 #, c-format
 msgid "The network device \"%s (%s)\" does not support wireless scanning."
 msgstr "The network device \"%s (%s)\" does not support wireless scanning."
 
-#: ../gnome/applet/applet.c:782
+#: ../gnome/applet/applet.c:761
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
 msgstr "The network device \"%s (%s)\" does not support link detection."
 
-#: ../gnome/applet/applet.c:929
+#: ../gnome/applet/applet.c:908
 #, c-format
 msgid "Preparing device %s for the wired network..."
 msgstr "Preparing device %s for the wired network..."
 
-#: ../gnome/applet/applet.c:931
+#: ../gnome/applet/applet.c:910
 #, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
 msgstr "Preparing device %s for the wireless network '%s'..."
 
-#: ../gnome/applet/applet.c:939
+#: ../gnome/applet/applet.c:918
 #, c-format
 msgid "Configuring device %s for the wired network..."
 msgstr "Configuring device %s for the wired network..."
 
-#: ../gnome/applet/applet.c:941
+#: ../gnome/applet/applet.c:920
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
 msgstr "Attempting to join the wireless network '%s'..."
 
-#: ../gnome/applet/applet.c:949
+#: ../gnome/applet/applet.c:928
 #, c-format
 msgid "Waiting for Network Key for the wireless network '%s'..."
 msgstr "Waiting for Network Key for the wireless network '%s'..."
 
-#: ../gnome/applet/applet.c:957 ../gnome/applet/applet.c:967
+#: ../gnome/applet/applet.c:936 ../gnome/applet/applet.c:946
 msgid "Requesting a network address from the wired network..."
 msgstr "Requesting a network address from the wired network..."
 
-#: ../gnome/applet/applet.c:959 ../gnome/applet/applet.c:969
+#: ../gnome/applet/applet.c:938 ../gnome/applet/applet.c:948
 #, c-format
 msgid "Requesting a network address from the wireless network '%s'..."
 msgstr "Requesting a network address from the wireless network '%s'..."
 
-#: ../gnome/applet/applet.c:977
+#: ../gnome/applet/applet.c:956
 msgid "Finishing connection to the wired network..."
 msgstr "Finishing connection to the wired network..."
 
-#: ../gnome/applet/applet.c:979
+#: ../gnome/applet/applet.c:958
 #, c-format
 msgid "Finishing connection to the wireless network '%s'..."
 msgstr "Finishing connection to the wireless network '%s'..."
 
-#: ../gnome/applet/applet.c:1096
+#: ../gnome/applet/applet.c:1075
 msgid "NetworkManager is not running"
 msgstr "NetworkManager is not running"
 
-#: ../gnome/applet/applet.c:1109 ../gnome/applet/applet.c:1843
+#: ../gnome/applet/applet.c:1083 ../gnome/applet/applet.c:1828
 msgid "Networking disabled"
 msgstr "Networking disabled"
 
-#: ../gnome/applet/applet.c:1114
+#: ../gnome/applet/applet.c:1088
 msgid "No network connection"
 msgstr "No network connection"
 
-#: ../gnome/applet/applet.c:1119
+#: ../gnome/applet/applet.c:1093
 msgid "Wired network connection"
 msgstr "Wired network connection"
 
-#: ../gnome/applet/applet.c:1123
+#: ../gnome/applet/applet.c:1097
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Connected to an Ad-Hoc wireless network"
 
-#: ../gnome/applet/applet.c:1125
+#: ../gnome/applet/applet.c:1099
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "Wireless network connection to '%s' (%d%%)"
 
-#: ../gnome/applet/applet.c:1147
+#: ../gnome/applet/applet.c:1120
 #, c-format
 msgid "VPN connection to '%s'"
 msgstr "VPN connection to '%s'"
 
-#: ../gnome/applet/applet.c:1155
+#: ../gnome/applet/applet.c:1128
 #, c-format
 msgid "VPN connecting to '%s'"
 msgstr "VPN connecting to '%s'"
 
-#: ../gnome/applet/applet.c:1568
+#: ../gnome/applet/applet.c:1541
 msgid "_Connect to Other Wireless Network..."
 msgstr "_Connect to Other Wireless Network..."
 
-#: ../gnome/applet/applet.c:1589
+#: ../gnome/applet/applet.c:1562
 msgid "Create _New Wireless Network..."
 msgstr "Create _New Wireless Network..."
 
-#: ../gnome/applet/applet.c:1710
+#: ../gnome/applet/applet.c:1685
 msgid "_VPN Connections"
 msgstr "_VPN Connections"
 
-#: ../gnome/applet/applet.c:1745
+#: ../gnome/applet/applet.c:1730
 msgid "_Configure VPN..."
 msgstr "_Configure VPN..."
 
-#: ../gnome/applet/applet.c:1749
+#: ../gnome/applet/applet.c:1734
 msgid "_Disconnect VPN..."
 msgstr "_Disconnect VPN..."
 
-#: ../gnome/applet/applet.c:1771
+#: ../gnome/applet/applet.c:1756
 msgid "_Dial Up Connections"
 msgstr "_Dial-Up Connections"
 
 #. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
-#: ../gnome/applet/applet.c:1782
+#: ../gnome/applet/applet.c:1767
 #, c-format
 msgid "Connect to %s..."
 msgstr "Connect to %s..."
 
-#: ../gnome/applet/applet.c:1788
+#: ../gnome/applet/applet.c:1773
 #, c-format
 msgid "Disconnect from %s..."
 msgstr "Disconnect from %s..."
 
-#: ../gnome/applet/applet.c:1837
+#: ../gnome/applet/applet.c:1822
 msgid "No network devices have been found"
 msgstr "No network devices have been found"
 
-#: ../gnome/applet/applet.c:2029
+#: ../gnome/applet/applet.c:2014
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager is not running..."
 
 #. 'Enable Networking' item
-#: ../gnome/applet/applet.c:2185
+#: ../gnome/applet/applet.c:2170
 msgid "Enable _Networking"
 msgstr "Enable _Networking"
 
 #. 'Enable Wireless' item
-#: ../gnome/applet/applet.c:2191
+#: ../gnome/applet/applet.c:2176
 msgid "Enable _Wireless"
 msgstr "Enable _Wireless"
 
 #. 'Connection Information' item
-#: ../gnome/applet/applet.c:2197
+#: ../gnome/applet/applet.c:2182
 msgid "Connection _Information"
 msgstr "Connection _Information"
 
 #. Help item
-#: ../gnome/applet/applet.c:2208
+#: ../gnome/applet/applet.c:2193
 msgid "_Help"
 msgstr "_Help"
 
 #. About item
-#: ../gnome/applet/applet.c:2217
+#: ../gnome/applet/applet.c:2202
 msgid "_About"
 msgstr "_About"
 
-#: ../gnome/applet/applet.c:2635
+#: ../gnome/applet/applet.c:2667
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
@@ -320,65 +306,102 @@ msgstr "Open System"
 msgid "Shared Key"
 msgstr "Shared Key"
 
-#: ../gnome/applet/wireless-security-option.c:209
+#: ../gnome/applet/wireless-security-option.c:208
 msgid "Automatic (Default)"
 msgstr "Automatic (Default)"
 
-#: ../gnome/applet/wireless-security-option.c:217
+#: ../gnome/applet/wireless-security-option.c:215
+msgid "AES-CCMP"
+msgstr "AES-CCMP"
+
+#: ../gnome/applet/wireless-security-option.c:223
 msgid "TKIP"
 msgstr "TKIP"
 
-#: ../gnome/applet/wireless-security-option.c:225
-msgid "AES-CCMP"
-msgstr "AES-CCMP"
+#: ../gnome/applet/wireless-security-option.c:231
+msgid "Dynamic WEP"
+msgstr ""
 
 #: ../gnome/applet/wso-none.c:53
 msgid "None"
 msgstr "None"
 
-#: ../gnome/applet/wso-wep-ascii.c:127
-msgid "WEP 40/128-bit ASCII"
+#: ../gnome/applet/wso-wep-ascii.c:138
+#, fuzzy
+msgid "WEP 64/128-bit ASCII"
 msgstr "WEP 40/128-bit ASCII"
 
-#: ../gnome/applet/wso-wep-hex.c:124
-msgid "WEP 40/128-bit hex"
+#: ../gnome/applet/wso-wep-hex.c:135
+#, fuzzy
+msgid "WEP 64/128-bit Hex"
 msgstr "WEP 40/128-bit hex"
 
-#: ../gnome/applet/wso-wep-passphrase.c:124
-msgid "WEP Passphrase"
+#: ../gnome/applet/wso-wep-passphrase.c:135
+#, fuzzy
+msgid "WEP 128-bit Passphrase"
 msgstr "WEP Passphrase"
 
-#: ../gnome/applet/eggtrayicon.c:128
+#: ../gnome/applet/wso-wpa-eap.c:237
+msgid "PEAP"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:238
+msgid "TLS"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:239
+msgid "TTLS"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
+#: ../src/nm-ap-security-wpa-eap.c:116
+msgid "WPA2 Enterprise"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
+#: ../src/nm-ap-security-wpa-eap.c:121
+msgid "WPA Enterprise"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-psk.c:178
+msgid "WPA2 Personal"
+msgstr "WPA2 Personal"
+
+#: ../gnome/applet/wso-wpa-psk.c:180
+msgid "WPA Personal"
+msgstr "WPA Personal"
+
+#: ../gnome/applet/eggtrayicon.c:134
 msgid "Orientation"
 msgstr "Orientation"
 
-#: ../gnome/applet/eggtrayicon.c:129
+#: ../gnome/applet/eggtrayicon.c:135
 msgid "The orientation of the tray."
 msgstr "The orientation of the tray."
 
-#: ../gnome/applet/menu-items.c:87
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Wired Network (%s)"
 
-#: ../gnome/applet/menu-items.c:90
+#: ../gnome/applet/menu-items.c:91
 msgid "_Wired Network"
 msgstr "_Wired Network"
 
-#: ../gnome/applet/menu-items.c:161
+#: ../gnome/applet/menu-items.c:162
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
 msgstr[0] "Wireless Network (%s)"
 msgstr[1] "Wireless Networks (%s)"
 
-#: ../gnome/applet/menu-items.c:163
+#: ../gnome/applet/menu-items.c:164
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Wireless Network"
 msgstr[1] "Wireless Networks"
 
-#: ../gnome/applet/menu-items.c:330
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr " (invalid Unicode)"
 
@@ -419,11 +442,11 @@ msgstr "Enter the name of the wireless network to which you wish to connect."
 msgid "Connect to Other Wireless Network"
 msgstr "Connect to Other Wireless Network"
 
-#: ../gnome/applet/passphrase-dialog.c:214
+#: ../gnome/applet/passphrase-dialog.c:215
 msgid "Error connecting to wireless network"
 msgstr "Error connecting to wireless network"
 
-#: ../gnome/applet/passphrase-dialog.c:215
+#: ../gnome/applet/passphrase-dialog.c:216
 msgid ""
 "The requested wireless network requires security capabilities unsupported by "
 "your hardware."
@@ -431,13 +454,13 @@ msgstr ""
 "The requested wireless network requires security capabilities unsupported by "
 "your hardware."
 
-#: ../gnome/applet/vpn-password-dialog.c:152
-#: ../gnome/applet/vpn-password-dialog.c:189
+#: ../gnome/applet/vpn-password-dialog.c:151
+#: ../gnome/applet/vpn-password-dialog.c:188
 #, c-format
 msgid "Cannot start VPN connection '%s'"
 msgstr "Cannot start VPN connection '%s'"
 
-#: ../gnome/applet/vpn-password-dialog.c:155
+#: ../gnome/applet/vpn-password-dialog.c:154
 #, c-format
 msgid ""
 "Could not find the authentication dialog for VPN connection type '%s'. "
@@ -446,7 +469,7 @@ msgstr ""
 "Could not find the authentication dialogue for VPN connection type '%s'. "
 "Contact your system administrator."
 
-#: ../gnome/applet/vpn-password-dialog.c:192
+#: ../gnome/applet/vpn-password-dialog.c:191
 #, c-format
 msgid ""
 "There was a problem launching the authentication dialog for VPN connection "
@@ -509,62 +532,88 @@ msgstr ""
 "NetworkManager will not require confirmation on subsequent logins."
 
 #: ../gnome/applet/applet.glade.h:15
+msgid "Anonymous Identity:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:16
 msgid "Authentication:"
 msgstr "Authentication:"
 
-#: ../gnome/applet/applet.glade.h:16
+#: ../gnome/applet/applet.glade.h:17
 msgid "Broadcast Address:"
 msgstr "Broadcast Address:"
 
-#: ../gnome/applet/applet.glade.h:17
+#: ../gnome/applet/applet.glade.h:18
+msgid "CA Certificate File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:19
 msgid "C_onnect"
 msgstr "C_onnect"
 
-#: ../gnome/applet/applet.glade.h:18
+#: ../gnome/applet/applet.glade.h:20
+msgid "Client Certificate File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:21
 msgid "Connection Information"
 msgstr "Connection Information"
 
-#: ../gnome/applet/applet.glade.h:19
+#: ../gnome/applet/applet.glade.h:22
 msgid "Default Route:"
 msgstr "Default Route:"
 
-#: ../gnome/applet/applet.glade.h:20
+#: ../gnome/applet/applet.glade.h:23
 msgid "Destination Address:"
 msgstr "Destination Address:"
 
-#: ../gnome/applet/applet.glade.h:21
+#: ../gnome/applet/applet.glade.h:24
 msgid "Driver:"
 msgstr "Driver:"
 
-#: ../gnome/applet/applet.glade.h:22
+#: ../gnome/applet/applet.glade.h:25
+msgid "EAP Method:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:26
 msgid "Hardware Address:"
 msgstr "Hardware Address:"
 
-#: ../gnome/applet/applet.glade.h:23
+#: ../gnome/applet/applet.glade.h:27
 msgid "IP Address:"
 msgstr "IP Address:"
 
-#: ../gnome/applet/applet.glade.h:24
+#: ../gnome/applet/applet.glade.h:28
+msgid "Identity:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:29
 msgid "Interface:"
 msgstr "Interface:"
 
-#: ../gnome/applet/applet.glade.h:25
+#: ../gnome/applet/applet.glade.h:30
+#, fuzzy
+msgid "Key Type:"
+msgstr "Type:"
+
+#: ../gnome/applet/applet.glade.h:31
 msgid "Key:"
 msgstr "Key:"
 
-#: ../gnome/applet/applet.glade.h:26
+#: ../gnome/applet/applet.glade.h:32
+#, fuzzy
 msgid ""
 "None\n"
-"WEP Passphrase\n"
-"WEP 40/128-bit hex\n"
-"WEP 40/128-bit ASCII\n"
+"WEP 128-bit Passphrase\n"
+"WEP 64/128-bit Hex\n"
+"WEP 64/128-bit ASCII\n"
 msgstr ""
 "None\n"
 "WEP Passphrase\n"
 "WEP 40/128-bit hex\n"
 "WEP 40/128-bit ASCII\n"
 
-#: ../gnome/applet/applet.glade.h:31
+#: ../gnome/applet/applet.glade.h:37
 msgid ""
 "Open System\n"
 "Shared Key"
@@ -572,95 +621,114 @@ msgstr ""
 "Open System\n"
 "Shared Key"
 
-#: ../gnome/applet/applet.glade.h:33
+#: ../gnome/applet/applet.glade.h:39
 msgid "Other Wireless Network..."
 msgstr "Other Wireless Network..."
 
-#: ../gnome/applet/applet.glade.h:34
+#: ../gnome/applet/applet.glade.h:40
 msgid "Passphrase:"
 msgstr "Passphrase:"
 
-#: ../gnome/applet/applet.glade.h:35
+#: ../gnome/applet/applet.glade.h:41
 msgid "Password:"
 msgstr "Password:"
 
-#: ../gnome/applet/applet.glade.h:36
+#: ../gnome/applet/applet.glade.h:42
 msgid "Primary DNS:"
 msgstr "Primary DNS:"
 
-#: ../gnome/applet/applet.glade.h:37
+#: ../gnome/applet/applet.glade.h:43
+msgid "Private Key File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:44
+msgid "Private Key Password:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:45
 msgid "Secondary DNS:"
 msgstr "Secondary DNS:"
 
-#: ../gnome/applet/applet.glade.h:38
+#: ../gnome/applet/applet.glade.h:46
+msgid "Select the CA Certificate File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:47
+msgid "Select the Client Certificate File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:48
+msgid "Select the Private Key File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:49
+msgid "Show key"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:50
+#, fuzzy
+msgid "Show passphrase"
+msgstr "Passphrase:"
+
+#: ../gnome/applet/applet.glade.h:51
+#, fuzzy
+msgid "Show password"
+msgstr "Password:"
+
+#: ../gnome/applet/applet.glade.h:52
+#, fuzzy
+msgid "Show passwords"
+msgstr "Password:"
+
+#: ../gnome/applet/applet.glade.h:53
+msgid "Speed:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:54
 msgid "Subnet Mask:"
 msgstr "Subnet Mask:"
 
-#: ../gnome/applet/applet.glade.h:39
+#: ../gnome/applet/applet.glade.h:55
 msgid "Type:"
 msgstr "Type:"
 
-#: ../gnome/applet/applet.glade.h:40
+#: ../gnome/applet/applet.glade.h:56
 msgid "User Name:"
 msgstr "User Name:"
 
-#: ../gnome/applet/applet.glade.h:41
+#: ../gnome/applet/applet.glade.h:57
 msgid "Wireless Network Key Required"
 msgstr "Wireless Network Key Required"
 
-#: ../gnome/applet/applet.glade.h:42
+#: ../gnome/applet/applet.glade.h:58
 msgid "Wireless _adapter:"
 msgstr "Wireless _adapter:"
 
-#: ../gnome/applet/applet.glade.h:43
+#: ../gnome/applet/applet.glade.h:59
 msgid "_Always Trust this Wireless Network"
 msgstr "_Always Trust this Wireless Network"
 
-#: ../gnome/applet/applet.glade.h:44
+#: ../gnome/applet/applet.glade.h:60
 msgid "_Don't remind me again"
 msgstr "_Do not remind me again"
 
-#: ../gnome/applet/applet.glade.h:45
+#: ../gnome/applet/applet.glade.h:61
 msgid "_Login to Network"
 msgstr "_Login to Network"
 
-#: ../gnome/applet/applet.glade.h:46
+#: ../gnome/applet/applet.glade.h:62
 msgid "_Network Name:"
 msgstr "_Network Name:"
 
-#: ../gnome/applet/applet.glade.h:47
+#: ../gnome/applet/applet.glade.h:63
 msgid "_Wireless Security:"
 msgstr "_Wireless Security:"
 
-#: ../gnome/applet/applet.glade.h:48
-msgid "leap_subwindow"
-msgstr "leap_subwindow"
-
-#: ../gnome/applet/applet.glade.h:49
-msgid "wep_key_subwindow"
-msgstr "wep_key_subwindow"
-
-#: ../gnome/applet/applet.glade.h:50
-msgid "wep_passphrase_subwindow"
-msgstr "wep_passphrase_subwindow"
-
-#: ../gnome/applet/applet.glade.h:51
-msgid "wpa_psk_subwindow"
-msgstr "wpa_psk_subwindow"
-
-#: ../gnome/applet/wso-wpa-psk.c:168
-msgid "WPA2 Personal"
-msgstr "WPA2 Personal"
-
-#: ../gnome/applet/wso-wpa-psk.c:170
-msgid "WPA Personal"
-msgstr "WPA Personal"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.c:358
+#: ../gnome/vpn-properties/nm-vpn-properties.c:383
 msgid "Cannot add VPN connection"
 msgstr "Cannot add VPN connection"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:360
+#: ../gnome/vpn-properties/nm-vpn-properties.c:385
 msgid ""
 "No suitable VPN software was found on your system. Contact your system "
 "administrator."
@@ -668,11 +736,11 @@ msgstr ""
 "No suitable VPN software was found on your system. Contact your system "
 "administrator."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:412
+#: ../gnome/vpn-properties/nm-vpn-properties.c:437
 msgid "Cannot import VPN connection"
 msgstr "Cannot import VPN connection"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:414
+#: ../gnome/vpn-properties/nm-vpn-properties.c:439
 #, c-format
 msgid ""
 "Cannot find suitable software for VPN connection type '%s' to import the "
@@ -681,12 +749,12 @@ msgstr ""
 "Cannot find suitable software for VPN connection type '%s' to import the "
 "file '%s'. Contact your system administrator."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:554
+#: ../gnome/vpn-properties/nm-vpn-properties.c:579
 #, c-format
 msgid "Error retrieving VPN connection '%s'"
 msgstr "Error retrieving VPN connection '%s'"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:557
+#: ../gnome/vpn-properties/nm-vpn-properties.c:582
 #, c-format
 msgid ""
 "Could not find the UI files for VPN connection type '%s'. Contact your "
@@ -695,12 +763,12 @@ msgstr ""
 "Could not find the UI files for VPN connection type '%s'. Contact your "
 "system administrator."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:717
+#: ../gnome/vpn-properties/nm-vpn-properties.c:739
 #, c-format
 msgid "Delete VPN connection \"%s\"?"
 msgstr "Delete VPN connection \"%s\"?"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:720
+#: ../gnome/vpn-properties/nm-vpn-properties.c:742
 #, c-format
 msgid ""
 "All information about the VPN connection \"%s\" will be lost and you may "
@@ -711,16 +779,16 @@ msgstr ""
 "need your system administrator to provide information to create a new "
 "connection."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:926
+#: ../gnome/vpn-properties/nm-vpn-properties.c:959
 msgid "Unable to load"
 msgstr "Unable to load"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:928
+#: ../gnome/vpn-properties/nm-vpn-properties.c:961
 msgid "Cannot find some needed resources (the glade file)!"
 msgstr "Cannot find some needed resources (the glade file)!"
 
 #. Edit dialog
-#: ../gnome/vpn-properties/nm-vpn-properties.c:1043
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
 msgid "Edit VPN Connection"
 msgstr "Edit VPN Connection"
 
@@ -794,11 +862,11 @@ msgstr ""
 msgid "VPN Connections"
 msgstr "VPN Connections"
 
-#: ../src/nm-ap-security-wep.c:47
+#: ../src/nm-ap-security-wep.c:52
 msgid "40-bit WEP"
 msgstr "40-bit WEP"
 
-#: ../src/nm-ap-security-wep.c:49
+#: ../src/nm-ap-security-wep.c:54
 msgid "104-bit WEP"
 msgstr "104-bit WEP"
 
@@ -826,7 +894,7 @@ msgstr "WPA2 CCMP"
 msgid "WPA2 Automatic"
 msgstr "WPA2 Automatic"
 
-#: ../src/nm-ap-security.c:310
+#: ../src/nm-ap-security.c:320
 msgid "none"
 msgstr "none"
 
@@ -863,3 +931,72 @@ msgstr "Too much data was sent over socket and some of it was lost"
 #: ../src/nm-netlink-monitor.c:735
 msgid "error occurred while waiting for data on socket"
 msgstr "error occurred while waiting for data on socket"
+
+#: ../gnome/applet/applet-dbus-devices.c:898
+#, fuzzy, c-format
+msgid "You are now connected to the Ad-Hoc wireless network '%s'."
+msgstr "Connected to an Ad-Hoc wireless network"
+
+#: ../gnome/applet/applet-dbus-devices.c:903
+#, fuzzy, c-format
+msgid "You are now connected to the wireless network '%s'."
+msgstr "Finishing connection to the wireless network '%s'..."
+
+#: ../gnome/applet/applet-dbus-devices.c:910
+#, fuzzy
+msgid "You are now connected to the wired network."
+msgstr "Finishing connection to the wired network..."
+
+#: ../gnome/applet/applet-dbus-devices.c:916
+msgid "Connection Established"
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:959
+#, fuzzy
+msgid "Disconnected"
+msgstr "_Disconnect VPN..."
+
+#: ../gnome/applet/applet-dbus-devices.c:960
+msgid "The network connection has been disconnected."
+msgstr ""
+
+#~ msgid "VPN Error"
+#~ msgstr "VPN Error"
+
+#~ msgid "The VPN service said: \"%s\""
+#~ msgstr "The VPN service said: \"%s\""
+
+#~ msgid "VPN connection '%s' said:"
+#~ msgstr "VPN connection '%s' said:"
+
+#~ msgid "leap_subwindow"
+#~ msgstr "leap_subwindow"
+
+#~ msgid "wep_key_subwindow"
+#~ msgstr "wep_key_subwindow"
+
+#~ msgid "wep_passphrase_subwindow"
+#~ msgstr "wep_passphrase_subwindow"
+
+#~ msgid "wpa_psk_subwindow"
+#~ msgstr "wpa_psk_subwindow"
+
+#~ msgid "WEP 40/128-bit ASCII"
+#~ msgstr "WEP 40/128-bit ASCII"
+
+#~ msgid "WEP 40/128-bit hex"
+#~ msgstr "WEP 40/128-bit hex"
+
+#~ msgid "WEP Passphrase"
+#~ msgstr "WEP Passphrase"
+
+#~ msgid ""
+#~ "None\n"
+#~ "WEP Passphrase\n"
+#~ "WEP 40/128-bit hex\n"
+#~ "WEP 40/128-bit ASCII\n"
+#~ msgstr ""
+#~ "None\n"
+#~ "WEP Passphrase\n"
+#~ "WEP 40/128-bit hex\n"
+#~ "WEP 40/128-bit ASCII\n"
diff --git a/po/en_GB.po b/po/en_GB.po
index a88b5737cf..148f24a09e 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-08 15:07+0100\n"
+"POT-Creation-Date: 2006-05-29 18:33+0200\n"
 "PO-Revision-Date: 2005-10-15 11:09+0100\n"
 "Last-Translator: James Ogley <james@usr-local-bin.org>\n"
 "Language-Team: English (British) <en@li.org>\n"
@@ -17,94 +17,80 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #
-#. Setup a request to the keyring to save the network passphrase
-#: ../gnome/applet/applet-dbus-info.c:867
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:919
 #, c-format
 msgid "Passphrase for wireless network %s"
 msgstr "Passphrase for wireless network %s"
 
-#: ../gnome/applet/applet-dbus-info.c:1085
-#, c-format
-msgid ""
-"The requested wireless network '%s' does not appear to be in range.  A "
-"different wireless network will be used if any are available."
-msgstr ""
-"The requested wireless network '%s' does not appear to be in range.  A "
-"different wireless network will be used if any are available."
-
 #
-#: ../gnome/applet/applet-dbus.c:317
+#: ../gnome/applet/applet-dbus.c:265
 #, c-format
 msgid "Connection to the wireless network '%s' failed."
 msgstr "Connection to the wireless network '%s' failed."
 
-#: ../gnome/applet/applet-dbus.c:322
+#: ../gnome/applet/applet-dbus.c:270
 msgid "Connection to the wired network failed."
 msgstr "Connection to the wired network failed."
 
-#: ../gnome/applet/applet.c:181
-msgid "Error displaying connection information: "
+#: ../gnome/applet/applet.c:184
+#, fuzzy
+msgid "Error displaying connection information:"
 msgstr "Error displaying connection information: "
 
-#: ../gnome/applet/applet.c:200
+#: ../gnome/applet/applet.c:202
 #, fuzzy
 msgid "Could not find some required resources (the glade file)!"
 msgstr ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
 
-#: ../gnome/applet/applet.c:211
+#: ../gnome/applet/applet.c:213
 msgid "No active connections!"
 msgstr "No active connections!"
 
-#: ../gnome/applet/applet.c:226
+#: ../gnome/applet/applet.c:234
 #, fuzzy, c-format
 msgid "Wired Ethernet (%s)"
 msgstr "Wired Network (%s)"
 
-#: ../gnome/applet/applet.c:228
+#: ../gnome/applet/applet.c:236
 #, fuzzy, c-format
 msgid "Wireless Ethernet (%s)"
 msgstr "Wireless Network (%s)"
 
-#: ../gnome/applet/applet.c:314 ../gnome/applet/applet.c:332
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:362
 msgid "NetworkManager Applet"
 msgstr "NetworkManager Applet"
 
-#: ../gnome/applet/applet.c:316 ../gnome/applet/applet.c:334
-msgid "Copyright (C) 2004-2005 Red Hat, Inc."
+#: ../gnome/applet/applet.c:339 ../gnome/applet/applet.c:364
+#, fuzzy
+msgid "Copyright © 2004-2005 Red Hat, Inc."
 msgstr "Copyright (C) 2004-2005 Red Hat, Inc."
 
-#: ../gnome/applet/applet.c:317 ../gnome/applet/applet.c:335
+#: ../gnome/applet/applet.c:340 ../gnome/applet/applet.c:365
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Notification area applet for managing your network devices and connections."
 
-#: ../gnome/applet/applet.c:339
+#: ../gnome/applet/applet.c:343 ../gnome/applet/applet.c:370
 msgid "translator-credits"
-msgstr ""
-"David Lodge <dave@cirt.net>"
-"James Ogley <james@usr-local-bin.org>"
-
-#: ../gnome/applet/applet.c:424
-msgid "VPN Error"
-msgstr "VPN Error"
+msgstr "David Lodge <dave@cirt.net>James Ogley <james@usr-local-bin.org>"
 
-#: ../gnome/applet/applet.c:428
+#: ../gnome/applet/applet.c:426
 msgid "VPN Login Failure"
 msgstr "VPN Login Failure"
 
-#: ../gnome/applet/applet.c:429
+#: ../gnome/applet/applet.c:427
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a login failure."
 msgstr "Could not start the VPN connection '%s' due to a login failure."
 
-#: ../gnome/applet/applet.c:433
+#: ../gnome/applet/applet.c:431
 msgid "VPN Start Failure"
 msgstr "VPN Start Failure"
 
-#: ../gnome/applet/applet.c:434
+#: ../gnome/applet/applet.c:432
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
@@ -113,25 +99,25 @@ msgstr ""
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
 "program."
 
-#: ../gnome/applet/applet.c:438 ../gnome/applet/applet.c:448
+#: ../gnome/applet/applet.c:436 ../gnome/applet/applet.c:446
 msgid "VPN Connect Failure"
 msgstr "VPN Connect Failure"
 
-#: ../gnome/applet/applet.c:439
+#: ../gnome/applet/applet.c:437
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a connection error."
 msgstr "Could not start the VPN connection '%s' due to a connection error."
 
-#: ../gnome/applet/applet.c:443
+#: ../gnome/applet/applet.c:441
 msgid "VPN Configuration Error"
 msgstr "VPN Configuration Error"
 
-#: ../gnome/applet/applet.c:444
+#: ../gnome/applet/applet.c:442
 #, c-format
 msgid "The VPN connection '%s' was not correctly configured."
 msgstr "The VPN connection '%s' was not correctly configured."
 
-#: ../gnome/applet/applet.c:449
+#: ../gnome/applet/applet.c:447
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' because the VPN server did not "
@@ -140,23 +126,13 @@ msgstr ""
 "Could not start the VPN connection '%s' because the VPN server did not "
 "return an adequate network configuration."
 
-#: ../gnome/applet/applet.c:457
-#, c-format
-msgid "The VPN service said: \"%s\""
-msgstr "The VPN service said: \"%s\""
-
-#: ../gnome/applet/applet.c:526
-#, c-format
-msgid "VPN connection '%s' said:"
-msgstr "VPN connection '%s' said:"
-
-#: ../gnome/applet/applet.c:528
+#: ../gnome/applet/applet.c:517
 msgid "VPN Login Message"
 msgstr "VPN Login Message"
 
-#: ../gnome/applet/applet.c:746 ../gnome/applet/applet.c:2305
-#: ../gnome/applet/other-network-dialog.c:407
-#: ../gnome/applet/passphrase-dialog.c:384
+#: ../gnome/applet/applet.c:741 ../gnome/applet/applet.c:2508
+#: ../gnome/applet/other-network-dialog.c:453
+#: ../gnome/applet/passphrase-dialog.c:228
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
@@ -164,157 +140,171 @@ msgstr ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
 
-#: ../gnome/applet/applet.c:759
+#: ../gnome/applet/applet.c:753
 #, c-format
 msgid "The network device \"%s (%s)\" does not support wireless scanning."
 msgstr "The network device \"%s (%s)\" does not support wireless scanning."
 
-#: ../gnome/applet/applet.c:766
+#: ../gnome/applet/applet.c:761
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
 msgstr "The network device \"%s (%s)\" does not support link detection."
 
-#: ../gnome/applet/applet.c:914
+#: ../gnome/applet/applet.c:908
 #, fuzzy, c-format
 msgid "Preparing device %s for the wired network..."
 msgstr "Connecting to a wired network..."
 
 #
-#: ../gnome/applet/applet.c:916
+#: ../gnome/applet/applet.c:910
 #, fuzzy, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
 msgstr "Connecting to wireless network '%s'..."
 
-#: ../gnome/applet/applet.c:924
+#: ../gnome/applet/applet.c:918
 #, fuzzy, c-format
 msgid "Configuring device %s for the wired network..."
 msgstr "Connecting to a wired network..."
 
 #
-#: ../gnome/applet/applet.c:926
+#: ../gnome/applet/applet.c:920
 #, fuzzy, c-format
 msgid "Attempting to join the wireless network '%s'..."
 msgstr "Connecting to wireless network '%s'..."
 
 #
-#: ../gnome/applet/applet.c:934
+#: ../gnome/applet/applet.c:928
 #, fuzzy, c-format
 msgid "Waiting for Network Key for the wireless network '%s'..."
 msgstr "Connecting to wireless network '%s'..."
 
-#: ../gnome/applet/applet.c:942 ../gnome/applet/applet.c:952
+#: ../gnome/applet/applet.c:936 ../gnome/applet/applet.c:946
 #, fuzzy
 msgid "Requesting a network address from the wired network..."
 msgstr "Connecting to a wired network..."
 
 #
-#: ../gnome/applet/applet.c:944 ../gnome/applet/applet.c:954
+#: ../gnome/applet/applet.c:938 ../gnome/applet/applet.c:948
 #, fuzzy, c-format
 msgid "Requesting a network address from the wireless network '%s'..."
 msgstr "Connecting to wireless network '%s'..."
 
-#: ../gnome/applet/applet.c:962
+#: ../gnome/applet/applet.c:956
 #, fuzzy
 msgid "Finishing connection to the wired network..."
 msgstr "Connecting to a wired network..."
 
 #
-#: ../gnome/applet/applet.c:964
+#: ../gnome/applet/applet.c:958
 #, fuzzy, c-format
 msgid "Finishing connection to the wireless network '%s'..."
 msgstr "Connecting to wireless network '%s'..."
 
-#: ../gnome/applet/applet.c:1073
+#: ../gnome/applet/applet.c:1075
 msgid "NetworkManager is not running"
 msgstr "NetworkManager is not running"
 
-#: ../gnome/applet/applet.c:1085
+#: ../gnome/applet/applet.c:1083 ../gnome/applet/applet.c:1828
+msgid "Networking disabled"
+msgstr ""
+
+#: ../gnome/applet/applet.c:1088
 msgid "No network connection"
 msgstr "No network connection"
 
-#: ../gnome/applet/applet.c:1090
+#: ../gnome/applet/applet.c:1093
 msgid "Wired network connection"
 msgstr "Wired network connection"
 
 #
-#: ../gnome/applet/applet.c:1094
+#: ../gnome/applet/applet.c:1097
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Connected to an Ad-Hoc wireless network"
 
-#: ../gnome/applet/applet.c:1096
+#: ../gnome/applet/applet.c:1099
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "Wireless network connection to '%s' (%d%%)"
 
-#: ../gnome/applet/applet.c:1118
+#: ../gnome/applet/applet.c:1120
 #, c-format
 msgid "VPN connection to '%s'"
 msgstr "VPN connection to '%s'"
 
-#: ../gnome/applet/applet.c:1126
+#: ../gnome/applet/applet.c:1128
 #, c-format
 msgid "VPN connecting to '%s'"
 msgstr "VPN connecting to '%s'"
 
-#: ../gnome/applet/applet.c:1510
+#: ../gnome/applet/applet.c:1541
 msgid "_Connect to Other Wireless Network..."
 msgstr "_Connect to Other Wireless Network..."
 
-#: ../gnome/applet/applet.c:1531
+#: ../gnome/applet/applet.c:1562
 msgid "Create _New Wireless Network..."
 msgstr "Create _New Wireless Network..."
 
-#: ../gnome/applet/applet.c:1644
+#: ../gnome/applet/applet.c:1685
 msgid "_VPN Connections"
 msgstr "_VPN Connections"
 
-#: ../gnome/applet/applet.c:1676
+#: ../gnome/applet/applet.c:1730
 msgid "_Configure VPN..."
 msgstr "_Configure VPN..."
 
-#: ../gnome/applet/applet.c:1680
+#: ../gnome/applet/applet.c:1734
 msgid "_Disconnect VPN..."
 msgstr "_Disconnect VPN..."
 
-#: ../gnome/applet/applet.c:1702
+#: ../gnome/applet/applet.c:1756
 msgid "_Dial Up Connections"
 msgstr "_Dial Up Connections"
 
-#: ../gnome/applet/applet.c:1711
+#. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
+#: ../gnome/applet/applet.c:1767
 #, c-format
 msgid "Connect to %s..."
 msgstr "Connect to %s..."
 
-#: ../gnome/applet/applet.c:1761
+#: ../gnome/applet/applet.c:1773
+#, fuzzy, c-format
+msgid "Disconnect from %s..."
+msgstr "Connect to %s..."
+
+#: ../gnome/applet/applet.c:1822
 msgid "No network devices have been found"
 msgstr "No network devices have been found"
 
-#: ../gnome/applet/applet.c:1923
+#: ../gnome/applet/applet.c:2014
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager is not running..."
 
-#
-#. Wireless Enabled item
-#: ../gnome/applet/applet.c:2025
-msgid "_Wireless Enabled"
-msgstr "_Wireless Enabled"
+#. 'Enable Networking' item
+#: ../gnome/applet/applet.c:2170
+msgid "Enable _Networking"
+msgstr ""
+
+#. 'Enable Wireless' item
+#: ../gnome/applet/applet.c:2176
+msgid "Enable _Wireless"
+msgstr ""
 
-#. Connection Information item
-#: ../gnome/applet/applet.c:2031
+#. 'Connection Information' item
+#: ../gnome/applet/applet.c:2182
 msgid "Connection _Information"
 msgstr "Connection _Information"
 
 #. Help item
-#: ../gnome/applet/applet.c:2041
+#: ../gnome/applet/applet.c:2193
 msgid "_Help"
 msgstr "_Help"
 
 #. About item
-#: ../gnome/applet/applet.c:2049
+#: ../gnome/applet/applet.c:2202
 msgid "_About"
 msgstr "_About"
 
-#: ../gnome/applet/applet.c:2441
+#: ../gnome/applet/applet.c:2667
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
@@ -322,24 +312,95 @@ msgstr ""
 "The NetworkManager Applet could not find some required resources.  It cannot "
 "continue.\n"
 
-#: ../gnome/applet/eggtrayicon.c:127
+#: ../gnome/applet/wireless-security-option.c:157
+msgid "Open System"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:160
+msgid "Shared Key"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:208
+msgid "Automatic (Default)"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:215
+msgid "AES-CCMP"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:223
+msgid "TKIP"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:231
+msgid "Dynamic WEP"
+msgstr ""
+
+#: ../gnome/applet/wso-none.c:53
+msgid "None"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-ascii.c:138
+msgid "WEP 64/128-bit ASCII"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-hex.c:135
+msgid "WEP 64/128-bit Hex"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-passphrase.c:135
+#, fuzzy
+msgid "WEP 128-bit Passphrase"
+msgstr "Passphrase:"
+
+#: ../gnome/applet/wso-wpa-eap.c:237
+msgid "PEAP"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:238
+msgid "TLS"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:239
+msgid "TTLS"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
+#: ../src/nm-ap-security-wpa-eap.c:116
+msgid "WPA2 Enterprise"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
+#: ../src/nm-ap-security-wpa-eap.c:121
+msgid "WPA Enterprise"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-psk.c:178
+msgid "WPA2 Personal"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-psk.c:180
+msgid "WPA Personal"
+msgstr ""
+
+#: ../gnome/applet/eggtrayicon.c:134
 msgid "Orientation"
 msgstr "Orientation"
 
-#: ../gnome/applet/eggtrayicon.c:128
+#: ../gnome/applet/eggtrayicon.c:135
 msgid "The orientation of the tray."
 msgstr "The orientation of the tray."
 
-#: ../gnome/applet/menu-items.c:87
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Wired Network (%s)"
 
-#: ../gnome/applet/menu-items.c:90
+#: ../gnome/applet/menu-items.c:91
 msgid "_Wired Network"
 msgstr "_Wired Network"
 
-#: ../gnome/applet/menu-items.c:161
+#: ../gnome/applet/menu-items.c:162
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
@@ -347,86 +408,74 @@ msgstr[0] "Wireless Network (%s)"
 msgstr[1] "Wireless Networks (%s)"
 
 #
-#: ../gnome/applet/menu-items.c:163
+#: ../gnome/applet/menu-items.c:164
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Wireless Network"
 msgstr[1] "Wireless Networks"
 
-#: ../gnome/applet/menu-items.c:303
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr " (invalid Unicode)"
 
-#: ../gnome/applet/other-network-dialog.c:143
-#: ../gnome/applet/applet.glade.h:42
-msgid "_Passphrase:"
-msgstr "_Passphrase:"
-
-#: ../gnome/applet/other-network-dialog.c:146
-msgid "_ASCII Key:"
-msgstr "_ASCII Key:"
-
-#: ../gnome/applet/other-network-dialog.c:149
-msgid "_Hex Key:"
-msgstr "_Hex Key:"
+#: ../gnome/applet/other-network-dialog.c:352
+#, fuzzy, c-format
+msgid ""
+"By default, the wireless network's name is set to your computer's name, %s, "
+"with no encryption enabled"
+msgstr "By default, the ESSID is set to your computer's name,"
 
 #
-#: ../gnome/applet/other-network-dialog.c:238
+#: ../gnome/applet/other-network-dialog.c:358
 msgid "Create new wireless network"
 msgstr "Create new wireless network"
 
-#: ../gnome/applet/other-network-dialog.c:239
+#: ../gnome/applet/other-network-dialog.c:359
+#, fuzzy
 msgid ""
-"Enter the ESSID and security settings of the wireless network you wish to "
+"Enter the name and security settings of the wireless network you wish to "
 "create."
 msgstr ""
 "Enter the ESSID and security settings of the wireless network you wish to "
 "create."
 
-#: ../gnome/applet/other-network-dialog.c:240
-msgid "By default, the ESSID is set to your computer's name,"
-msgstr "By default, the ESSID is set to your computer's name,"
-
-#: ../gnome/applet/other-network-dialog.c:242
-msgid ", with no encryption enabled."
-msgstr ", with no encryption enabled."
-
-#: ../gnome/applet/other-network-dialog.c:244
+#: ../gnome/applet/other-network-dialog.c:363
 msgid "Create New Wireless Network"
 msgstr "Create New Wireless Network..."
 
 #
-#: ../gnome/applet/other-network-dialog.c:249
-msgid "Custom wireless network"
+#: ../gnome/applet/other-network-dialog.c:368
+#, fuzzy
+msgid "Existing wireless network"
 msgstr "Custom wireless network"
 
-#: ../gnome/applet/other-network-dialog.c:250
-msgid "Enter the ESSID of the wireless network to which you wish to connect."
+#: ../gnome/applet/other-network-dialog.c:369
+#, fuzzy
+msgid "Enter the name of the wireless network to which you wish to connect."
 msgstr "Enter the ESSID of the wireless network to which you wish to connect."
 
-#: ../gnome/applet/other-network-dialog.c:252
+#: ../gnome/applet/other-network-dialog.c:371
 msgid "Connect to Other Wireless Network"
 msgstr "Connect to Other Wireless Network"
 
-#: ../gnome/applet/passphrase-dialog.c:155
-msgid "Passphrase:"
-msgstr "Passphrase:"
-
-#: ../gnome/applet/passphrase-dialog.c:158
-msgid "ASCII Key:"
-msgstr "ASCII Key:"
+#: ../gnome/applet/passphrase-dialog.c:215
+#, fuzzy
+msgid "Error connecting to wireless network"
+msgstr "Scanning for wireless networks..."
 
-#: ../gnome/applet/passphrase-dialog.c:161
-msgid "Hex Key:"
-msgstr "Hex Key:"
+#: ../gnome/applet/passphrase-dialog.c:216
+msgid ""
+"The requested wireless network requires security capabilities unsupported by "
+"your hardware."
+msgstr ""
 
-#: ../gnome/applet/vpn-password-dialog.c:152
-#: ../gnome/applet/vpn-password-dialog.c:189
+#: ../gnome/applet/vpn-password-dialog.c:151
+#: ../gnome/applet/vpn-password-dialog.c:188
 #, c-format
 msgid "Cannot start VPN connection '%s'"
 msgstr "Cannot start VPN connection '%s'"
 
-#: ../gnome/applet/vpn-password-dialog.c:155
+#: ../gnome/applet/vpn-password-dialog.c:154
 #, c-format
 msgid ""
 "Could not find the authentication dialog for VPN connection type '%s'. "
@@ -435,7 +484,7 @@ msgstr ""
 "Could not find the authentication dialog for VPN connection type '%s'. "
 "Contact your system administrator."
 
-#: ../gnome/applet/vpn-password-dialog.c:192
+#: ../gnome/applet/vpn-password-dialog.c:191
 #, c-format
 msgid ""
 "There was a problem launching the authentication dialog for VPN connection "
@@ -449,32 +498,13 @@ msgid " "
 msgstr " "
 
 #: ../gnome/applet/applet.glade.h:2
-msgid ""
-"128-bit Passphrase (WEP)\n"
-"ASCII Key (WEP)\n"
-"Hex Key (WEP)"
-msgstr ""
-"128-bit Passphrase (WEP)\n"
-"ASCII Key (WEP)\n"
-"Hex Key (WEP)"
-
-#: ../gnome/applet/applet.glade.h:5
-msgid ""
-"128-bit passphrase (WEP)\n"
-"ASCII key (WEP)\n"
-"Hex key (WEP)"
-msgstr ""
-"128-bit passphrase (WEP)\n"
-"ASCII key (WEP)\n"
-"Hex key (WEP)"
-
-#: ../gnome/applet/applet.glade.h:8
 #, fuzzy
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
 
-#: ../gnome/applet/applet.glade.h:10
+#: ../gnome/applet/applet.glade.h:4
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
@@ -489,7 +519,7 @@ msgstr ""
 "A passphrase or encryption key is required to access the wireless network '%"
 "s'."
 
-#: ../gnome/applet/applet.glade.h:14
+#: ../gnome/applet/applet.glade.h:8
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
@@ -500,7 +530,7 @@ msgstr ""
 "\n"
 "%s  It will not be completely functional."
 
-#: ../gnome/applet/applet.glade.h:18
+#: ../gnome/applet/applet.glade.h:12
 #, fuzzy, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
@@ -517,98 +547,202 @@ msgstr ""
 "wireless network is secure, click the checkbox below and NetworkManager will "
 "not require confirmation on subsequent connections."
 
-#: ../gnome/applet/applet.glade.h:21
+#: ../gnome/applet/applet.glade.h:15
+msgid "Anonymous Identity:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:16
+#, fuzzy
+msgid "Authentication:"
+msgstr "Orientation"
+
+#: ../gnome/applet/applet.glade.h:17
 msgid "Broadcast Address:"
 msgstr "Broadcast Address:"
 
-#: ../gnome/applet/applet.glade.h:22
+#: ../gnome/applet/applet.glade.h:18
+msgid "CA Certificate File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:19
 msgid "C_onnect"
 msgstr "C_onnect"
 
-#: ../gnome/applet/applet.glade.h:23
-msgid "Connect with _encryption enabled"
-msgstr "Connect with _encryption enabled"
+#: ../gnome/applet/applet.glade.h:20
+msgid "Client Certificate File:"
+msgstr ""
 
-#: ../gnome/applet/applet.glade.h:24
+#: ../gnome/applet/applet.glade.h:21
 msgid "Connection Information"
 msgstr "Connection Information"
 
-#: ../gnome/applet/applet.glade.h:25
+#: ../gnome/applet/applet.glade.h:22
 msgid "Default Route:"
 msgstr "Default Route:"
 
-#: ../gnome/applet/applet.glade.h:26
+#: ../gnome/applet/applet.glade.h:23
 msgid "Destination Address:"
 msgstr "Destination Address:"
 
-#: ../gnome/applet/applet.glade.h:27
+#: ../gnome/applet/applet.glade.h:24
+msgid "Driver:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:25
+msgid "EAP Method:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:26
 msgid "Hardware Address:"
 msgstr "Hardware Address:"
 
-#: ../gnome/applet/applet.glade.h:28
+#: ../gnome/applet/applet.glade.h:27
 msgid "IP Address:"
 msgstr "IP Address:"
 
+#: ../gnome/applet/applet.glade.h:28
+msgid "Identity:"
+msgstr ""
+
 #: ../gnome/applet/applet.glade.h:29
 msgid "Interface:"
 msgstr "Interface:"
 
 #: ../gnome/applet/applet.glade.h:30
+#, fuzzy
+msgid "Key Type:"
+msgstr "_Key Type:"
+
+#: ../gnome/applet/applet.glade.h:31
+#, fuzzy
+msgid "Key:"
+msgstr "Hex Key:"
+
+#: ../gnome/applet/applet.glade.h:32
+msgid ""
+"None\n"
+"WEP 128-bit Passphrase\n"
+"WEP 64/128-bit Hex\n"
+"WEP 64/128-bit ASCII\n"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:37
+msgid ""
+"Open System\n"
+"Shared Key"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:39
 msgid "Other Wireless Network..."
 msgstr "Other Wireless Networks..."
 
-#: ../gnome/applet/applet.glade.h:31
+#: ../gnome/applet/applet.glade.h:40
+msgid "Passphrase:"
+msgstr "Passphrase:"
+
+#: ../gnome/applet/applet.glade.h:41
+msgid "Password:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:42
 msgid "Primary DNS:"
 msgstr "Primary DNS:"
 
-#: ../gnome/applet/applet.glade.h:32
+#: ../gnome/applet/applet.glade.h:43
+msgid "Private Key File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:44
+msgid "Private Key Password:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:45
 msgid "Secondary DNS:"
 msgstr "Secondary DNS:"
 
-#: ../gnome/applet/applet.glade.h:33
+#: ../gnome/applet/applet.glade.h:46
+msgid "Select the CA Certificate File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:47
+msgid "Select the Client Certificate File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:48
+msgid "Select the Private Key File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:49
+msgid "Show key"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:50
+#, fuzzy
+msgid "Show passphrase"
+msgstr "Passphrase:"
+
+#: ../gnome/applet/applet.glade.h:51
+msgid "Show password"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:52
+msgid "Show passwords"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:53
+msgid "Speed:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:54
 msgid "Subnet Mask:"
 msgstr "Subnet Mask:"
 
-#: ../gnome/applet/applet.glade.h:34
+#: ../gnome/applet/applet.glade.h:55
+#, fuzzy
+msgid "Type:"
+msgstr "_Key Type:"
+
+#: ../gnome/applet/applet.glade.h:56
+msgid "User Name:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:57
 msgid "Wireless Network Key Required"
 msgstr "Wireless Network Key Required"
 
 #
-#: ../gnome/applet/applet.glade.h:35
+#: ../gnome/applet/applet.glade.h:58
 msgid "Wireless _adapter:"
 msgstr "Wireless _adapter:"
 
 #
-#: ../gnome/applet/applet.glade.h:36
-msgid "Wireless _network:"
-msgstr "Wireless _network:"
-
-#
-#: ../gnome/applet/applet.glade.h:37
+#: ../gnome/applet/applet.glade.h:59
 msgid "_Always Trust this Wireless Network"
 msgstr "_Always Trust this Wireless Network"
 
-#: ../gnome/applet/applet.glade.h:38
+#: ../gnome/applet/applet.glade.h:60
 msgid "_Don't remind me again"
 msgstr "_Don't remind me again"
 
-#: ../gnome/applet/applet.glade.h:39
-msgid "_Key Type:"
-msgstr "_Key Type:"
-
-#: ../gnome/applet/applet.glade.h:40
-msgid "_Key type:"
-msgstr "_Key type:"
-
-#: ../gnome/applet/applet.glade.h:41
+#: ../gnome/applet/applet.glade.h:61
 msgid "_Login to Network"
 msgstr "_Login to Network"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:372
+#: ../gnome/applet/applet.glade.h:62
+msgid "_Network Name:"
+msgstr ""
+
+#
+#: ../gnome/applet/applet.glade.h:63
+#, fuzzy
+msgid "_Wireless Security:"
+msgstr "Wireless _adapter:"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:383
 msgid "Cannot add VPN connection"
 msgstr "Cannot add VPN connection"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:374
+#: ../gnome/vpn-properties/nm-vpn-properties.c:385
 msgid ""
 "No suitable VPN software was found on your system. Contact your system "
 "administrator."
@@ -616,11 +750,11 @@ msgstr ""
 "No suitable VPN software was found on your system. Contact your system "
 "administrator."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:426
+#: ../gnome/vpn-properties/nm-vpn-properties.c:437
 msgid "Cannot import VPN connection"
 msgstr "Cannot import VPN connection"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:428
+#: ../gnome/vpn-properties/nm-vpn-properties.c:439
 #, c-format
 msgid ""
 "Cannot find suitable software for VPN connection type '%s' to import the "
@@ -629,12 +763,12 @@ msgstr ""
 "Cannot find suitable software for VPN connection type '%s' to import the "
 "file '%s'. Contact your system administrator."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:568
+#: ../gnome/vpn-properties/nm-vpn-properties.c:579
 #, c-format
 msgid "Error retrieving VPN connection '%s'"
 msgstr "Error retrieving VPN connection '%s'"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:571
+#: ../gnome/vpn-properties/nm-vpn-properties.c:582
 #, c-format
 msgid ""
 "Could not find the UI files for VPN connection type '%s'. Contact your "
@@ -643,12 +777,12 @@ msgstr ""
 "Could not find the UI files for VPN connection type '%s'. Contact your "
 "system administrator."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:731
+#: ../gnome/vpn-properties/nm-vpn-properties.c:739
 #, c-format
 msgid "Delete VPN connection \"%s\"?"
 msgstr "Delete VPN connection \"%s\"?"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:734
+#: ../gnome/vpn-properties/nm-vpn-properties.c:742
 #, c-format
 msgid ""
 "All information about the VPN connection \"%s\" will be lost and you may "
@@ -659,11 +793,11 @@ msgstr ""
 "need your system administrator to provide information to create a new "
 "connection."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:940
+#: ../gnome/vpn-properties/nm-vpn-properties.c:959
 msgid "Unable to load"
 msgstr "Unable to load"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:942
+#: ../gnome/vpn-properties/nm-vpn-properties.c:961
 #, fuzzy
 msgid "Cannot find some needed resources (the glade file)!"
 msgstr ""
@@ -671,7 +805,7 @@ msgstr ""
 "file was not found)."
 
 #. Edit dialog
-#: ../gnome/vpn-properties/nm-vpn-properties.c:1060
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
 msgid "Edit VPN Connection"
 msgstr "Edit VPN Connection"
 
@@ -746,6 +880,42 @@ msgstr ""
 msgid "VPN Connections"
 msgstr "VPN Connections"
 
+#: ../src/nm-ap-security-wep.c:52
+msgid "40-bit WEP"
+msgstr ""
+
+#: ../src/nm-ap-security-wep.c:54
+msgid "104-bit WEP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:50
+msgid "WPA TKIP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:52
+msgid "WPA CCMP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:54
+msgid "WPA Automatic"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:59
+msgid "WPA2 TKIP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:61
+msgid "WPA2 CCMP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:63
+msgid "WPA2 Automatic"
+msgstr ""
+
+#: ../src/nm-ap-security.c:320
+msgid "none"
+msgstr ""
+
 #: ../src/nm-netlink-monitor.c:154
 #, c-format
 msgid ""
@@ -760,26 +930,119 @@ msgid ""
 msgstr ""
 "unable to bind to netlink socket for monitoring wired ethernet devices - %s"
 
-#: ../src/nm-netlink-monitor.c:403
+#: ../src/nm-netlink-monitor.c:405
 msgid "operation took too long"
 msgstr "operation took too long"
 
-#: ../src/nm-netlink-monitor.c:500
+#: ../src/nm-netlink-monitor.c:502
 msgid "received data from wrong type of sender"
 msgstr "received data from wrong type of sender"
 
-#: ../src/nm-netlink-monitor.c:513
+#: ../src/nm-netlink-monitor.c:515
 msgid "received data from unexpected sender"
 msgstr "received data from unexpected sender"
 
-#: ../src/nm-netlink-monitor.c:644
+#: ../src/nm-netlink-monitor.c:646
 msgid "too much data was sent over socket and some of it was lost"
 msgstr "too much data was sent over socket and some of it was lost"
 
-#: ../src/nm-netlink-monitor.c:733
+#: ../src/nm-netlink-monitor.c:735
 msgid "error occurred while waiting for data on socket"
 msgstr "error occurred while waiting for data on socket"
 
+#
+#: ../gnome/applet/applet-dbus-devices.c:898
+#, fuzzy, c-format
+msgid "You are now connected to the Ad-Hoc wireless network '%s'."
+msgstr "Connected to an Ad-Hoc wireless network"
+
+#
+#: ../gnome/applet/applet-dbus-devices.c:903
+#, fuzzy, c-format
+msgid "You are now connected to the wireless network '%s'."
+msgstr "Connecting to wireless network '%s'..."
+
+#: ../gnome/applet/applet-dbus-devices.c:910
+#, fuzzy
+msgid "You are now connected to the wired network."
+msgstr "Connecting to a wired network..."
+
+#: ../gnome/applet/applet-dbus-devices.c:916
+msgid "Connection Established"
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:959
+#, fuzzy
+msgid "Disconnected"
+msgstr "_Disconnect VPN..."
+
+#: ../gnome/applet/applet-dbus-devices.c:960
+msgid "The network connection has been disconnected."
+msgstr ""
+
+#~ msgid ""
+#~ "The requested wireless network '%s' does not appear to be in range.  A "
+#~ "different wireless network will be used if any are available."
+#~ msgstr ""
+#~ "The requested wireless network '%s' does not appear to be in range.  A "
+#~ "different wireless network will be used if any are available."
+
+#~ msgid "VPN Error"
+#~ msgstr "VPN Error"
+
+#~ msgid "The VPN service said: \"%s\""
+#~ msgstr "The VPN service said: \"%s\""
+
+#~ msgid "VPN connection '%s' said:"
+#~ msgstr "VPN connection '%s' said:"
+
+#
+#~ msgid "_Wireless Enabled"
+#~ msgstr "_Wireless Enabled"
+
+#~ msgid "_Passphrase:"
+#~ msgstr "_Passphrase:"
+
+#~ msgid "_ASCII Key:"
+#~ msgstr "_ASCII Key:"
+
+#~ msgid "_Hex Key:"
+#~ msgstr "_Hex Key:"
+
+#~ msgid ", with no encryption enabled."
+#~ msgstr ", with no encryption enabled."
+
+#~ msgid "ASCII Key:"
+#~ msgstr "ASCII Key:"
+
+#~ msgid ""
+#~ "128-bit Passphrase (WEP)\n"
+#~ "ASCII Key (WEP)\n"
+#~ "Hex Key (WEP)"
+#~ msgstr ""
+#~ "128-bit Passphrase (WEP)\n"
+#~ "ASCII Key (WEP)\n"
+#~ "Hex Key (WEP)"
+
+#~ msgid ""
+#~ "128-bit passphrase (WEP)\n"
+#~ "ASCII key (WEP)\n"
+#~ "Hex key (WEP)"
+#~ msgstr ""
+#~ "128-bit passphrase (WEP)\n"
+#~ "ASCII key (WEP)\n"
+#~ "Hex key (WEP)"
+
+#~ msgid "Connect with _encryption enabled"
+#~ msgstr "Connect with _encryption enabled"
+
+#
+#~ msgid "Wireless _network:"
+#~ msgstr "Wireless _network:"
+
+#~ msgid "_Key type:"
+#~ msgstr "_Key type:"
+
 #~ msgid "<span weight=\"bold\">Wireless Networks:</span>"
 #~ msgstr "<span weight=\"bold\">Wireless Networks:</span>"
 
@@ -805,9 +1068,6 @@ msgstr "error occurred while waiting for data on socket"
 #~ "\n"
 #~ "The VPN service said: \"%s\""
 
-#~ msgid "Scanning for wireless networks..."
-#~ msgstr "Scanning for wireless networks..."
-
 #~ msgid "Pause Wireless Scanning"
 #~ msgstr "Pause Wireless Scanning"
 
diff --git a/po/es.po b/po/es.po
index 99392bb15e..125dac4e5a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-16 22:35+0100\n"
+"POT-Creation-Date: 2006-05-29 18:33+0200\n"
 "PO-Revision-Date: 2006-02-07 11:23+0100\n"
 "Last-Translator: \n"
 "Language-Team:  <es@li.org>\n"
@@ -20,80 +20,76 @@ msgstr ""
 "X-Generator: KBabel 1.11\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:923
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:919
 #, c-format
 msgid "Passphrase for wireless network %s"
 msgstr "Frase de paso para la red inalámbrica %s"
 
-#: ../gnome/applet/applet-dbus.c:244
+#: ../gnome/applet/applet-dbus.c:265
 #, c-format
 msgid "Connection to the wireless network '%s' failed."
 msgstr "La conexión a la red inalámbrica «%s» ha fallado."
 
-#: ../gnome/applet/applet-dbus.c:249
+#: ../gnome/applet/applet-dbus.c:270
 msgid "Connection to the wired network failed."
 msgstr "La conexión a la red cableada ha fallado."
 
-#: ../gnome/applet/applet.c:179
+#: ../gnome/applet/applet.c:184
 msgid "Error displaying connection information:"
 msgstr "Ha ocurrido un error al mostrar información de conexión:"
 
-#: ../gnome/applet/applet.c:196
+#: ../gnome/applet/applet.c:202
 msgid "Could not find some required resources (the glade file)!"
 msgstr ""
 "No se han podido encontrar algunos recursos necesarios (el archivo glade)."
 
-#: ../gnome/applet/applet.c:207
+#: ../gnome/applet/applet.c:213
 msgid "No active connections!"
 msgstr "No hay conexiones activas."
 
-#: ../gnome/applet/applet.c:224
+#: ../gnome/applet/applet.c:234
 #, c-format
 msgid "Wired Ethernet (%s)"
 msgstr "Red Ethernet cableada (%s)"
 
-#: ../gnome/applet/applet.c:226
+#: ../gnome/applet/applet.c:236
 #, c-format
 msgid "Wireless Ethernet (%s)"
 msgstr "Red Ethernet inalámbrica (%s)"
 
-#: ../gnome/applet/applet.c:323 ../gnome/applet/applet.c:348
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:362
 msgid "NetworkManager Applet"
 msgstr "Miniaplicación NetworkManager"
 
-#: ../gnome/applet/applet.c:325 ../gnome/applet/applet.c:350
+#: ../gnome/applet/applet.c:339 ../gnome/applet/applet.c:364
 msgid "Copyright © 2004-2005 Red Hat, Inc."
 msgstr "Copyright © 2004-2005 Red Hat, Inc."
 
-#: ../gnome/applet/applet.c:326 ../gnome/applet/applet.c:351
+#: ../gnome/applet/applet.c:340 ../gnome/applet/applet.c:365
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Miniaplicación del área de notificación para administrar sus dispositivos de "
 "red y conexiones."
 
-#: ../gnome/applet/applet.c:329 ../gnome/applet/applet.c:356
+#: ../gnome/applet/applet.c:343 ../gnome/applet/applet.c:370
 msgid "translator-credits"
 msgstr "Lucas Vieites <lucas@asixinformatica.com>, 2005"
 
-#: ../gnome/applet/applet.c:441
-msgid "VPN Error"
-msgstr "Error de VPN"
-
-#: ../gnome/applet/applet.c:445
+#: ../gnome/applet/applet.c:426
 msgid "VPN Login Failure"
 msgstr "Error de acceso de VPN"
 
-#: ../gnome/applet/applet.c:446
+#: ../gnome/applet/applet.c:427
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a login failure."
 msgstr "No se pudo iniciar la conexión VPN «%s» debido a un error de acceso."
 
-#: ../gnome/applet/applet.c:450
+#: ../gnome/applet/applet.c:431
 msgid "VPN Start Failure"
 msgstr "Error de inicio de VPN"
 
-#: ../gnome/applet/applet.c:451
+#: ../gnome/applet/applet.c:432
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
@@ -102,26 +98,26 @@ msgstr ""
 "No se pudo iniciar la conexión VPN «%s» debido a un error al iniciar el "
 "programa VPN."
 
-#: ../gnome/applet/applet.c:455 ../gnome/applet/applet.c:465
+#: ../gnome/applet/applet.c:436 ../gnome/applet/applet.c:446
 msgid "VPN Connect Failure"
 msgstr "Error de conexión VPN"
 
-#: ../gnome/applet/applet.c:456
+#: ../gnome/applet/applet.c:437
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a connection error."
 msgstr ""
 "No se puede iniciar la conexión VPN «%s» debido a un error de conexión."
 
-#: ../gnome/applet/applet.c:460
+#: ../gnome/applet/applet.c:441
 msgid "VPN Configuration Error"
 msgstr "Error de configuración VPN"
 
-#: ../gnome/applet/applet.c:461
+#: ../gnome/applet/applet.c:442
 #, c-format
 msgid "The VPN connection '%s' was not correctly configured."
 msgstr "La conexión VPN «%s» no estaba configurada correctamente."
 
-#: ../gnome/applet/applet.c:466
+#: ../gnome/applet/applet.c:447
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' because the VPN server did not "
@@ -130,23 +126,13 @@ msgstr ""
 "No se pudo iniciar la conexión VPN «%s» porque el servidor VPN no ha "
 "devuelto una configuración de red adecuada."
 
-#: ../gnome/applet/applet.c:474
-#, c-format
-msgid "The VPN service said: \"%s\""
-msgstr "El servicio VPN ha devuelto el mensaje:«%s»"
-
-#: ../gnome/applet/applet.c:543
-#, c-format
-msgid "VPN connection '%s' said:"
-msgstr "La conexión VPN «%s» ha devuelto el siguiente mensaje:"
-
-#: ../gnome/applet/applet.c:545
+#: ../gnome/applet/applet.c:517
 msgid "VPN Login Message"
 msgstr "Mensaje de acceso VPN"
 
-#: ../gnome/applet/applet.c:762 ../gnome/applet/applet.c:2516
+#: ../gnome/applet/applet.c:741 ../gnome/applet/applet.c:2508
 #: ../gnome/applet/other-network-dialog.c:453
-#: ../gnome/applet/passphrase-dialog.c:227
+#: ../gnome/applet/passphrase-dialog.c:228
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
@@ -154,165 +140,165 @@ msgstr ""
 "La miniaplicación NetworkManager no pudo encontrar algunos archivos de "
 "recursos (No se encontró el archivo de glade)."
 
-#: ../gnome/applet/applet.c:774
+#: ../gnome/applet/applet.c:753
 #, c-format
 msgid "The network device \"%s (%s)\" does not support wireless scanning."
 msgstr ""
 "El dispositivo de red «%s (%s)» no puede inspeccionar redes inalámbricas."
 
-#: ../gnome/applet/applet.c:782
+#: ../gnome/applet/applet.c:761
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
 msgstr ""
 "El dispositivo de red \"%s (%s)\" no puede realizar detección de enlaces."
 
-#: ../gnome/applet/applet.c:929
+#: ../gnome/applet/applet.c:908
 #, c-format
 msgid "Preparing device %s for the wired network..."
 msgstr "Preparando el dispositivo %s para la red cableada..."
 
-#: ../gnome/applet/applet.c:931
+#: ../gnome/applet/applet.c:910
 #, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
 msgstr "Preparando el dispositivo %s para la red inalámbrica «%s»..."
 
-#: ../gnome/applet/applet.c:939
+#: ../gnome/applet/applet.c:918
 #, c-format
 msgid "Configuring device %s for the wired network..."
 msgstr "Configurando el dispositivo %s para la red cableada..."
 
-#: ../gnome/applet/applet.c:941
+#: ../gnome/applet/applet.c:920
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
 msgstr "Intentando conectar con la red inalámbrica «%s»..."
 
-#: ../gnome/applet/applet.c:949
+#: ../gnome/applet/applet.c:928
 #, c-format
 msgid "Waiting for Network Key for the wireless network '%s'..."
 msgstr "Esperando la contraseña de red para la red inalámbrica «%s»..."
 
-#: ../gnome/applet/applet.c:957 ../gnome/applet/applet.c:967
+#: ../gnome/applet/applet.c:936 ../gnome/applet/applet.c:946
 msgid "Requesting a network address from the wired network..."
 msgstr "Solicitando una dirección de red a la red cableada..."
 
-#: ../gnome/applet/applet.c:959 ../gnome/applet/applet.c:969
+#: ../gnome/applet/applet.c:938 ../gnome/applet/applet.c:948
 #, c-format
 msgid "Requesting a network address from the wireless network '%s'..."
 msgstr "Solicitando una dirección de red a la red inalámbrica «%s»..."
 
-#: ../gnome/applet/applet.c:977
+#: ../gnome/applet/applet.c:956
 msgid "Finishing connection to the wired network..."
 msgstr "Deteniendo la conexión a la red cableada..."
 
-#: ../gnome/applet/applet.c:979
+#: ../gnome/applet/applet.c:958
 #, c-format
 msgid "Finishing connection to the wireless network '%s'..."
 msgstr "Deteniendo la conexión a la red inalámbrica «%s»..."
 
-#: ../gnome/applet/applet.c:1096
+#: ../gnome/applet/applet.c:1075
 msgid "NetworkManager is not running"
 msgstr "NetworkManager no se está ejecutando"
 
-#: ../gnome/applet/applet.c:1109 ../gnome/applet/applet.c:1843
+#: ../gnome/applet/applet.c:1083 ../gnome/applet/applet.c:1828
 msgid "Networking disabled"
 msgstr "Red desactivada"
 
-#: ../gnome/applet/applet.c:1114
+#: ../gnome/applet/applet.c:1088
 msgid "No network connection"
 msgstr "Sin conexión de red"
 
-#: ../gnome/applet/applet.c:1119
+#: ../gnome/applet/applet.c:1093
 msgid "Wired network connection"
 msgstr "Conexión de red cableada"
 
-#: ../gnome/applet/applet.c:1123
+#: ../gnome/applet/applet.c:1097
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Conectado con una red inalámbrica Ad-Hoc"
 
-#: ../gnome/applet/applet.c:1125
+#: ../gnome/applet/applet.c:1099
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "Conexión de red inalámbrica a «%s» (%d%%)"
 
-#: ../gnome/applet/applet.c:1147
+#: ../gnome/applet/applet.c:1120
 #, c-format
 msgid "VPN connection to '%s'"
 msgstr "Conexión VPN a «%s»"
 
-#: ../gnome/applet/applet.c:1155
+#: ../gnome/applet/applet.c:1128
 #, c-format
 msgid "VPN connecting to '%s'"
 msgstr "VPN conectando a «%s»"
 
-#: ../gnome/applet/applet.c:1568
+#: ../gnome/applet/applet.c:1541
 msgid "_Connect to Other Wireless Network..."
 msgstr "_Conectar a otra red inalámbrica..."
 
-#: ../gnome/applet/applet.c:1589
+#: ../gnome/applet/applet.c:1562
 msgid "Create _New Wireless Network..."
 msgstr "Crear una red inalámbrica _nueva..."
 
-#: ../gnome/applet/applet.c:1710
+#: ../gnome/applet/applet.c:1685
 msgid "_VPN Connections"
 msgstr "Conexiones _VPN"
 
-#: ../gnome/applet/applet.c:1745
+#: ../gnome/applet/applet.c:1730
 msgid "_Configure VPN..."
 msgstr "_Configurar VPN..."
 
-#: ../gnome/applet/applet.c:1749
+#: ../gnome/applet/applet.c:1734
 msgid "_Disconnect VPN..."
 msgstr "_Desconectar VPN..."
 
-#: ../gnome/applet/applet.c:1771
+#: ../gnome/applet/applet.c:1756
 msgid "_Dial Up Connections"
 msgstr "Conexiones de _marcado"
 
 #. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
-#: ../gnome/applet/applet.c:1782
+#: ../gnome/applet/applet.c:1767
 #, c-format
 msgid "Connect to %s..."
 msgstr "Conectar a %s..."
 
-#: ../gnome/applet/applet.c:1788
+#: ../gnome/applet/applet.c:1773
 #, c-format
 msgid "Disconnect from %s..."
 msgstr "Desconectar de %s..."
 
-#: ../gnome/applet/applet.c:1837
+#: ../gnome/applet/applet.c:1822
 msgid "No network devices have been found"
 msgstr "No se ha encontrado ningún dispositivo de red"
 
-#: ../gnome/applet/applet.c:2029
+#: ../gnome/applet/applet.c:2014
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager no se está ejecutando..."
 
 #. 'Enable Networking' item
-#: ../gnome/applet/applet.c:2185
+#: ../gnome/applet/applet.c:2170
 msgid "Enable _Networking"
 msgstr "Activar _red"
 
 #. 'Enable Wireless' item
-#: ../gnome/applet/applet.c:2191
+#: ../gnome/applet/applet.c:2176
 msgid "Enable _Wireless"
 msgstr "Activar _inalámbrico"
 
 #. 'Connection Information' item
-#: ../gnome/applet/applet.c:2197
+#: ../gnome/applet/applet.c:2182
 msgid "Connection _Information"
 msgstr "_Información de la conexión"
 
 #. Help item
-#: ../gnome/applet/applet.c:2208
+#: ../gnome/applet/applet.c:2193
 msgid "_Help"
 msgstr "A_yuda"
 
 #. About item
-#: ../gnome/applet/applet.c:2217
+#: ../gnome/applet/applet.c:2202
 msgid "_About"
 msgstr "A_cerca de"
 
-#: ../gnome/applet/applet.c:2635
+#: ../gnome/applet/applet.c:2667
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
@@ -328,65 +314,99 @@ msgstr "Sistema abierto"
 msgid "Shared Key"
 msgstr "Clave compartida"
 
-#: ../gnome/applet/wireless-security-option.c:209
+#: ../gnome/applet/wireless-security-option.c:208
 msgid "Automatic (Default)"
 msgstr "Automático (Predeterminado)"
 
-#: ../gnome/applet/wireless-security-option.c:217
+#: ../gnome/applet/wireless-security-option.c:215
+msgid "AES-CCMP"
+msgstr "AES-CCMP"
+
+#: ../gnome/applet/wireless-security-option.c:223
 msgid "TKIP"
 msgstr "TKIP"
 
-#: ../gnome/applet/wireless-security-option.c:225
-msgid "AES-CCMP"
-msgstr "AES-CCMP"
+#: ../gnome/applet/wireless-security-option.c:231
+msgid "Dynamic WEP"
+msgstr "WEP dinámico"
 
 #: ../gnome/applet/wso-none.c:53
 msgid "None"
 msgstr "Ninguno"
 
-#: ../gnome/applet/wso-wep-ascii.c:127
-msgid "WEP 40/128-bit ASCII"
-msgstr "WEP de 40/128 bits ASCII"
+#: ../gnome/applet/wso-wep-ascii.c:138
+msgid "WEP 64/128-bit ASCII"
+msgstr "WEP de 64/128 bits ASCII"
+
+#: ../gnome/applet/wso-wep-hex.c:135
+msgid "WEP 64/128-bit Hex"
+msgstr "WEP de 64/128bits hex"
+
+#: ../gnome/applet/wso-wep-passphrase.c:135
+msgid "WEP 128-bit Passphrase"
+msgstr "Frase de paso WEP de 128 bits:"
+
+#: ../gnome/applet/wso-wpa-eap.c:237
+msgid "PEAP"
+msgstr "PEAP"
+
+#: ../gnome/applet/wso-wpa-eap.c:238
+msgid "TLS"
+msgstr "TLS"
 
-#: ../gnome/applet/wso-wep-hex.c:124
-msgid "WEP 40/128-bit hex"
-msgstr "WEP de 40/128bits hex"
+#: ../gnome/applet/wso-wpa-eap.c:239
+msgid "TTLS"
+msgstr "TTLS"
 
-#: ../gnome/applet/wso-wep-passphrase.c:124
-msgid "WEP Passphrase"
-msgstr "Contraseña WEP:"
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
+#: ../src/nm-ap-security-wpa-eap.c:116
+msgid "WPA2 Enterprise"
+msgstr "WPA2 Empresa"
 
-#: ../gnome/applet/eggtrayicon.c:128
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
+#: ../src/nm-ap-security-wpa-eap.c:121
+msgid "WPA Enterprise"
+msgstr "WPA Empresa"
+
+#: ../gnome/applet/wso-wpa-psk.c:178
+msgid "WPA2 Personal"
+msgstr "WPA2 Personal"
+
+#: ../gnome/applet/wso-wpa-psk.c:180
+msgid "WPA Personal"
+msgstr "WPA Personal"
+
+#: ../gnome/applet/eggtrayicon.c:134
 msgid "Orientation"
 msgstr "Orientación"
 
-#: ../gnome/applet/eggtrayicon.c:129
+#: ../gnome/applet/eggtrayicon.c:135
 msgid "The orientation of the tray."
 msgstr "La orientación del área de notificación."
 
-#: ../gnome/applet/menu-items.c:87
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Red cableada (%s)"
 
-#: ../gnome/applet/menu-items.c:90
+#: ../gnome/applet/menu-items.c:91
 msgid "_Wired Network"
 msgstr "Red _cableada"
 
-#: ../gnome/applet/menu-items.c:161
+#: ../gnome/applet/menu-items.c:162
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
 msgstr[0] "Red inalámbrica (%s)"
 msgstr[1] "Redes inalámbricas (%s)"
 
-#: ../gnome/applet/menu-items.c:163
+#: ../gnome/applet/menu-items.c:164
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Red inalámbrica"
 msgstr[1] "Redes inalámbricas"
 
-#: ../gnome/applet/menu-items.c:330
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr " (Unicode inválido)"
 
@@ -428,11 +448,11 @@ msgstr ""
 msgid "Connect to Other Wireless Network"
 msgstr "Conectar a otra red inalámbrica"
 
-#: ../gnome/applet/passphrase-dialog.c:214
+#: ../gnome/applet/passphrase-dialog.c:215
 msgid "Error connecting to wireless network"
 msgstr "Error al conectar a la red inalámbrica"
 
-#: ../gnome/applet/passphrase-dialog.c:215
+#: ../gnome/applet/passphrase-dialog.c:216
 msgid ""
 "The requested wireless network requires security capabilities unsupported by "
 "your hardware."
@@ -440,13 +460,13 @@ msgstr ""
 "La red inalámbrica solicitada requiere capacidades de seguridad que su "
 "hardware no proporciona."
 
-#: ../gnome/applet/vpn-password-dialog.c:152
-#: ../gnome/applet/vpn-password-dialog.c:189
+#: ../gnome/applet/vpn-password-dialog.c:151
+#: ../gnome/applet/vpn-password-dialog.c:188
 #, c-format
 msgid "Cannot start VPN connection '%s'"
 msgstr "No se puede iniciar la conexión VPN «%s»"
 
-#: ../gnome/applet/vpn-password-dialog.c:155
+#: ../gnome/applet/vpn-password-dialog.c:154
 #, c-format
 msgid ""
 "Could not find the authentication dialog for VPN connection type '%s'. "
@@ -455,7 +475,7 @@ msgstr ""
 "No se ha podido encontrar el diálogo de autenticación para el tipo de "
 "conexión VPN «%s». Póngase en contacto con su administrador de sistemas."
 
-#: ../gnome/applet/vpn-password-dialog.c:192
+#: ../gnome/applet/vpn-password-dialog.c:191
 #, c-format
 msgid ""
 "There was a problem launching the authentication dialog for VPN connection "
@@ -519,62 +539,86 @@ msgstr ""
 "solicitar confirmación en los siguientes accesos."
 
 #: ../gnome/applet/applet.glade.h:15
+msgid "Anonymous Identity:"
+msgstr "Identidad anónima:"
+
+#: ../gnome/applet/applet.glade.h:16
 msgid "Authentication:"
 msgstr "Autenticación:"
 
-#: ../gnome/applet/applet.glade.h:16
+#: ../gnome/applet/applet.glade.h:17
 msgid "Broadcast Address:"
 msgstr "Dirección de difusión:"
 
-#: ../gnome/applet/applet.glade.h:17
+#: ../gnome/applet/applet.glade.h:18
+msgid "CA Certificate File:"
+msgstr "Archivo de certificado CA:"
+
+#: ../gnome/applet/applet.glade.h:19
 msgid "C_onnect"
 msgstr "_Conectar"
 
-#: ../gnome/applet/applet.glade.h:18
+#: ../gnome/applet/applet.glade.h:20
+msgid "Client Certificate File:"
+msgstr "Archivo de certificado del cliente:"
+
+#: ../gnome/applet/applet.glade.h:21
 msgid "Connection Information"
 msgstr "Información de la conexión"
 
-#: ../gnome/applet/applet.glade.h:19
+#: ../gnome/applet/applet.glade.h:22
 msgid "Default Route:"
 msgstr "Ruta predeterminada:"
 
-#: ../gnome/applet/applet.glade.h:20
+#: ../gnome/applet/applet.glade.h:23
 msgid "Destination Address:"
 msgstr "Dirección de destino:"
 
-#: ../gnome/applet/applet.glade.h:21
+#: ../gnome/applet/applet.glade.h:24
 msgid "Driver:"
 msgstr "Controlador:"
 
-#: ../gnome/applet/applet.glade.h:22
+#: ../gnome/applet/applet.glade.h:25
+msgid "EAP Method:"
+msgstr "Método EAP:"
+
+#: ../gnome/applet/applet.glade.h:26
 msgid "Hardware Address:"
 msgstr "Dirección hardware:"
 
-#: ../gnome/applet/applet.glade.h:23
+#: ../gnome/applet/applet.glade.h:27
 msgid "IP Address:"
 msgstr "Dirección IP:"
 
-#: ../gnome/applet/applet.glade.h:24
+#: ../gnome/applet/applet.glade.h:28
+msgid "Identity:"
+msgstr "Identidad:"
+
+#: ../gnome/applet/applet.glade.h:29
 msgid "Interface:"
 msgstr "Interfaz:"
 
-#: ../gnome/applet/applet.glade.h:25
+#: ../gnome/applet/applet.glade.h:30
+msgid "Key Type:"
+msgstr "Tipo de clave:"
+
+#: ../gnome/applet/applet.glade.h:31
 msgid "Key:"
 msgstr "Clave:"
 
-#: ../gnome/applet/applet.glade.h:26
+#: ../gnome/applet/applet.glade.h:32
 msgid ""
 "None\n"
-"WEP Passphrase\n"
-"WEP 40/128-bit hex\n"
-"WEP 40/128-bit ASCII\n"
+"WEP 128-bit Passphrase\n"
+"WEP 64/128-bit Hex\n"
+"WEP 64/128-bit ASCII\n"
 msgstr ""
 "Ninguna\n"
-"Frase de paso WEP\n"
-"WEP 40/128-bit hex\n"
-"WEP 40/128-bit ASCII\n"
+"Frase de paso WEP de 128 bits\n"
+"WEP 64/128-bit hex\n"
+"WEP 64/128-bit ASCII\n"
 
-#: ../gnome/applet/applet.glade.h:31
+#: ../gnome/applet/applet.glade.h:37
 msgid ""
 "Open System\n"
 "Shared Key"
@@ -582,95 +626,111 @@ msgstr ""
 "Sistema abierto\n"
 "Clave compartida"
 
-#: ../gnome/applet/applet.glade.h:33
+#: ../gnome/applet/applet.glade.h:39
 msgid "Other Wireless Network..."
 msgstr "Otras redes inalámbricas..."
 
-#: ../gnome/applet/applet.glade.h:34
+#: ../gnome/applet/applet.glade.h:40
 msgid "Passphrase:"
 msgstr "Contraseña:"
 
-#: ../gnome/applet/applet.glade.h:35
+#: ../gnome/applet/applet.glade.h:41
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: ../gnome/applet/applet.glade.h:36
+#: ../gnome/applet/applet.glade.h:42
 msgid "Primary DNS:"
 msgstr "DNS primario:"
 
-#: ../gnome/applet/applet.glade.h:37
+#: ../gnome/applet/applet.glade.h:43
+msgid "Private Key File:"
+msgstr "Archivo de clave privada:"
+
+#: ../gnome/applet/applet.glade.h:44
+msgid "Private Key Password:"
+msgstr "Contraseña de clave privada:"
+
+#: ../gnome/applet/applet.glade.h:45
 msgid "Secondary DNS:"
 msgstr "DNS secundario:"
 
-#: ../gnome/applet/applet.glade.h:38
+#: ../gnome/applet/applet.glade.h:46
+msgid "Select the CA Certificate File"
+msgstr "Seleccione el archivo de certificado CA"
+
+#: ../gnome/applet/applet.glade.h:47
+msgid "Select the Client Certificate File"
+msgstr "Seleccione el archivo de certificado del cliente"
+
+#: ../gnome/applet/applet.glade.h:48
+msgid "Select the Private Key File"
+msgstr "Seleccione el archivo de clave privada"
+
+#: ../gnome/applet/applet.glade.h:49
+msgid "Show key"
+msgstr "Mostrar la clave"
+
+#: ../gnome/applet/applet.glade.h:50
+msgid "Show passphrase"
+msgstr "Mostrar la frase de paso"
+
+#: ../gnome/applet/applet.glade.h:51
+msgid "Show password"
+msgstr "Mostrar la contraseña"
+
+#: ../gnome/applet/applet.glade.h:52
+msgid "Show passwords"
+msgstr "Mostrar las contraseñas"
+
+#: ../gnome/applet/applet.glade.h:53
+msgid "Speed:"
+msgstr "Velocidad:"
+
+#: ../gnome/applet/applet.glade.h:54
 msgid "Subnet Mask:"
 msgstr "Máscara de subred:"
 
-#: ../gnome/applet/applet.glade.h:39
+#: ../gnome/applet/applet.glade.h:55
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../gnome/applet/applet.glade.h:40
+#: ../gnome/applet/applet.glade.h:56
 msgid "User Name:"
 msgstr "Nombre de usuario:"
 
-#: ../gnome/applet/applet.glade.h:41
+#: ../gnome/applet/applet.glade.h:57
 msgid "Wireless Network Key Required"
 msgstr "Clave requerida para la red inalámbrica"
 
-#: ../gnome/applet/applet.glade.h:42
+#: ../gnome/applet/applet.glade.h:58
 msgid "Wireless _adapter:"
 msgstr "_Adaptador inalámbrico:"
 
-#: ../gnome/applet/applet.glade.h:43
+#: ../gnome/applet/applet.glade.h:59
 msgid "_Always Trust this Wireless Network"
 msgstr "_Siempre confiar en esta red inalámbrica"
 
-#: ../gnome/applet/applet.glade.h:44
+#: ../gnome/applet/applet.glade.h:60
 msgid "_Don't remind me again"
 msgstr "_No volver a recordar"
 
-#: ../gnome/applet/applet.glade.h:45
+#: ../gnome/applet/applet.glade.h:61
 msgid "_Login to Network"
 msgstr "_Entrar en la red"
 
-#: ../gnome/applet/applet.glade.h:46
+#: ../gnome/applet/applet.glade.h:62
 msgid "_Network Name:"
 msgstr "Nombre de _red:"
 
-#: ../gnome/applet/applet.glade.h:47
+#: ../gnome/applet/applet.glade.h:63
 msgid "_Wireless Security:"
 msgstr "_Seguridad inalámbrica:"
 
-#: ../gnome/applet/applet.glade.h:48
-msgid "leap_subwindow"
-msgstr "leap_subwindow"
-
-#: ../gnome/applet/applet.glade.h:49
-msgid "wep_key_subwindow"
-msgstr "wep_key_subwindow"
-
-#: ../gnome/applet/applet.glade.h:50
-msgid "wep_passphrase_subwindow"
-msgstr "wep_passphrase_subwindow"
-
-#: ../gnome/applet/applet.glade.h:51
-msgid "wpa_psk_subwindow"
-msgstr "wpa_psk_subwindow"
-
-#: ../gnome/applet/wso-wpa-psk.c:168
-msgid "WPA2 Personal"
-msgstr "WPA2 Personal"
-
-#: ../gnome/applet/wso-wpa-psk.c:170
-msgid "WPA Personal"
-msgstr "WPA Personal"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.c:358
+#: ../gnome/vpn-properties/nm-vpn-properties.c:383
 msgid "Cannot add VPN connection"
 msgstr "No se puede añadir una conexión VPN"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:360
+#: ../gnome/vpn-properties/nm-vpn-properties.c:385
 msgid ""
 "No suitable VPN software was found on your system. Contact your system "
 "administrator."
@@ -678,11 +738,11 @@ msgstr ""
 "No se ha encontrado software VPN adecuado en su sistema. Póngase en contacto "
 "con su administrador de sistemas."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:411
+#: ../gnome/vpn-properties/nm-vpn-properties.c:437
 msgid "Cannot import VPN connection"
 msgstr "No se puede importar la conexión VPN"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:413
+#: ../gnome/vpn-properties/nm-vpn-properties.c:439
 #, c-format
 msgid ""
 "Cannot find suitable software for VPN connection type '%s' to import the "
@@ -692,12 +752,12 @@ msgstr ""
 "s» para importar el archivo «%s». Póngase en contacto con su administrador "
 "de sistemas."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:553
+#: ../gnome/vpn-properties/nm-vpn-properties.c:579
 #, c-format
 msgid "Error retrieving VPN connection '%s'"
 msgstr "Ha ocurrido un error al recuperar la conexión VPN «%s»"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:556
+#: ../gnome/vpn-properties/nm-vpn-properties.c:582
 #, c-format
 msgid ""
 "Could not find the UI files for VPN connection type '%s'. Contact your "
@@ -706,12 +766,12 @@ msgstr ""
 "No se han encontrado los archivos de la IU para la conexión VPN de tipo «%"
 "s». Póngase en contacto con su administrador de sistemas."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:713
+#: ../gnome/vpn-properties/nm-vpn-properties.c:739
 #, c-format
 msgid "Delete VPN connection \"%s\"?"
 msgstr "¿Desea eliminar la conexión VPN «%s»?"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:716
+#: ../gnome/vpn-properties/nm-vpn-properties.c:742
 #, c-format
 msgid ""
 "All information about the VPN connection \"%s\" will be lost and you may "
@@ -721,16 +781,16 @@ msgstr ""
 "Se perderá toda la información de la conexión VPN «%s» y necesitará que su "
 "administrador de sistemas le proporcione información para crear una conexión."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:921
+#: ../gnome/vpn-properties/nm-vpn-properties.c:959
 msgid "Unable to load"
 msgstr "No se puede cargar"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:923
+#: ../gnome/vpn-properties/nm-vpn-properties.c:961
 msgid "Cannot find some needed resources (the glade file)!"
 msgstr "No se pueden encontrar algunos recursos necesarios (el archivo glade)."
 
 #. Edit dialog
-#: ../gnome/vpn-properties/nm-vpn-properties.c:1031
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
 msgid "Edit VPN Connection"
 msgstr "Editar conexión VPN"
 
@@ -804,11 +864,11 @@ msgstr ""
 msgid "VPN Connections"
 msgstr "Conexiones VPN"
 
-#: ../src/nm-ap-security-wep.c:47
+#: ../src/nm-ap-security-wep.c:52
 msgid "40-bit WEP"
 msgstr "WEP de 40 bits"
 
-#: ../src/nm-ap-security-wep.c:49
+#: ../src/nm-ap-security-wep.c:54
 msgid "104-bit WEP"
 msgstr "WEP de 104 bits"
 
@@ -836,7 +896,7 @@ msgstr "WPA2 CCMP"
 msgid "WPA2 Automatic"
 msgstr "WPA2 automática"
 
-#: ../src/nm-ap-security.c:290
+#: ../src/nm-ap-security.c:320
 msgid "none"
 msgstr "ninguna"
 
@@ -876,3 +936,85 @@ msgstr ""
 #: ../src/nm-netlink-monitor.c:735
 msgid "error occurred while waiting for data on socket"
 msgstr "ha ocurrido un error mientras esperaban datos en un socket"
+
+#: ../gnome/applet/applet-dbus-devices.c:898
+#, c-format
+msgid "You are now connected to the Ad-Hoc wireless network '%s'."
+msgstr "Ahora está conectado a la red inalámbrica Ad-Hoc «%s»."
+
+#: ../gnome/applet/applet-dbus-devices.c:903
+#, c-format
+msgid "You are now connected to the wireless network '%s'."
+msgstr "Ahora está conectado a la red inalámbrica «%s»."
+
+#: ../gnome/applet/applet-dbus-devices.c:910
+msgid "You are now connected to the wired network."
+msgstr "Ahora está conectado a la red cableada."
+
+#: ../gnome/applet/applet-dbus-devices.c:916
+msgid "Connection Established"
+msgstr "Se ha establecido la conexión"
+
+#: ../gnome/applet/applet-dbus-devices.c:959
+msgid "Disconnected"
+msgstr "Desconectado"
+
+#: ../gnome/applet/applet-dbus-devices.c:960
+msgid "The network connection has been disconnected."
+msgstr "La conexión de red ha sido desconectada."
+
+#~ msgid "VPN Error"
+#~ msgstr "Error de VPN"
+
+#~ msgid "The VPN service said: \"%s\""
+#~ msgstr "El servicio VPN ha devuelto el mensaje:«%s»"
+
+#~ msgid "VPN connection '%s' said:"
+#~ msgstr "La conexión VPN «%s» ha devuelto el siguiente mensaje:"
+
+#~ msgid "leap_subwindow"
+#~ msgstr "leap_subwindow"
+
+#~ msgid "wep_key_subwindow"
+#~ msgstr "wep_key_subwindow"
+
+#~ msgid "wep_passphrase_subwindow"
+#~ msgstr "wep_passphrase_subwindow"
+
+#~ msgid "wpa_psk_subwindow"
+#~ msgstr "wpa_psk_subwindow"
+
+#~ msgid "Stop automatically running the networking applet?"
+#~ msgstr "¿Desea detener la ejecución automática de la miniaplicación de red?"
+
+#~ msgid ""
+#~ "The networking applet will now terminate, but will automatically launch "
+#~ "the next time you login.  Would you like to stop automatically running "
+#~ "the networking applet on login?"
+#~ msgstr ""
+#~ "La miniaplicación de red se detendrá ahora pero se ejecutará "
+#~ "automáticamente la próxima vez que inicie sesión. ¿Desea que no se "
+#~ "ejecute la miniaplicación cuando inicie sesión?"
+
+#~ msgid "_Remove"
+#~ msgstr "_Eliminar"
+
+#~ msgid "WEP 40/128-bit ASCII"
+#~ msgstr "WEP de 40/128 bits ASCII"
+
+#~ msgid "WEP 40/128-bit hex"
+#~ msgstr "WEP de 40/128bits hex"
+
+#~ msgid "WEP Passphrase"
+#~ msgstr "Contraseña WEP:"
+
+#~ msgid ""
+#~ "None\n"
+#~ "WEP Passphrase\n"
+#~ "WEP 40/128-bit hex\n"
+#~ "WEP 40/128-bit ASCII\n"
+#~ msgstr ""
+#~ "Ninguna\n"
+#~ "Frase de paso WEP\n"
+#~ "WEP 40/128-bit hex\n"
+#~ "WEP 40/128-bit ASCII\n"
diff --git a/po/fi.po b/po/fi.po
index 2c875ec889..7d6c7e197c 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-28 22:07+0200\n"
+"POT-Creation-Date: 2006-05-29 18:33+0200\n"
 "PO-Revision-Date: 2006-02-28 22:15+0200\n"
 "Last-Translator: Ilkka Tuohela <hile@iki.fi>\n"
 "Language-Team: Finnish <gnome-fi-laatu@lists.sourceforge.net>\n"
@@ -17,17 +17,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:923
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:919
 #, c-format
 msgid "Passphrase for wireless network %s"
 msgstr "Langattoman verkon %s tunnuslause"
 
-#: ../gnome/applet/applet-dbus.c:259
+#: ../gnome/applet/applet-dbus.c:265
 #, c-format
 msgid "Connection to the wireless network '%s' failed."
 msgstr "Yhteys langattomaan verkkoon \"%s\" epäonnistui."
 
-#: ../gnome/applet/applet-dbus.c:264
+#: ../gnome/applet/applet-dbus.c:270
 msgid "Connection to the wired network failed."
 msgstr "Yhteys kiinteään verkkoon epäonnistui."
 
@@ -35,58 +35,58 @@ msgstr "Yhteys kiinteään verkkoon epäonnistui."
 msgid "Error displaying connection information:"
 msgstr "Virhe näytettäessä yhteyden tietoja:"
 
-#: ../gnome/applet/applet.c:201
+#: ../gnome/applet/applet.c:202
 msgid "Could not find some required resources (the glade file)!"
 msgstr "Joitain vaadittuja osia ei löytynyt (glade-tiedostoa)!"
 
-#: ../gnome/applet/applet.c:212
+#: ../gnome/applet/applet.c:213
 msgid "No active connections!"
 msgstr "Ei aktiivisia yhteyksiä!"
 
-#: ../gnome/applet/applet.c:229
+#: ../gnome/applet/applet.c:234
 #, c-format
 msgid "Wired Ethernet (%s)"
 msgstr "Kiinteä Ethernet-yhteys (%s)"
 
-#: ../gnome/applet/applet.c:231
+#: ../gnome/applet/applet.c:236
 #, c-format
 msgid "Wireless Ethernet (%s)"
 msgstr "Langaton Ethernet (%s)"
 
-#: ../gnome/applet/applet.c:328 ../gnome/applet/applet.c:353
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:362
 msgid "NetworkManager Applet"
 msgstr "NetworkManager-sovelma"
 
-#: ../gnome/applet/applet.c:330 ../gnome/applet/applet.c:355
+#: ../gnome/applet/applet.c:339 ../gnome/applet/applet.c:364
 msgid "Copyright © 2004-2005 Red Hat, Inc."
 msgstr "Copyright © 2004-2005 Red Hat, Inc."
 
-#: ../gnome/applet/applet.c:331 ../gnome/applet/applet.c:356
+#: ../gnome/applet/applet.c:340 ../gnome/applet/applet.c:365
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "Ilmoitusalueen sovelma verkkolaitteiden ja yhteyksien hallintaan."
 
-#: ../gnome/applet/applet.c:334 ../gnome/applet/applet.c:361
+#: ../gnome/applet/applet.c:343 ../gnome/applet/applet.c:370
 msgid "translator-credits"
 msgstr ""
 "Ilkka Tuohela, 2005.\n"
 "\n"
 "http://www.gnome.fi/"
 
-#: ../gnome/applet/applet.c:417
+#: ../gnome/applet/applet.c:426
 msgid "VPN Login Failure"
 msgstr "Virhe kirjauduttaessa VPN:ään"
 
-#: ../gnome/applet/applet.c:418
+#: ../gnome/applet/applet.c:427
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a login failure."
 msgstr "VPN-yhteyttä \"%s\" ei voitu käynnistää kirjautumisvirheen takia."
 
-#: ../gnome/applet/applet.c:422
+#: ../gnome/applet/applet.c:431
 msgid "VPN Start Failure"
 msgstr "VPN-yhteyden käynnistysvirhe"
 
-#: ../gnome/applet/applet.c:423
+#: ../gnome/applet/applet.c:432
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
@@ -95,25 +95,25 @@ msgstr ""
 "VPN-yhteyttä \"%s\" ei voitu käynnistää, koska VPN-ohjelman suorittaminen "
 "epäonnistui."
 
-#: ../gnome/applet/applet.c:427 ../gnome/applet/applet.c:437
+#: ../gnome/applet/applet.c:436 ../gnome/applet/applet.c:446
 msgid "VPN Connect Failure"
 msgstr "VPN-yhteyden yhteydenottovirhe"
 
-#: ../gnome/applet/applet.c:428
+#: ../gnome/applet/applet.c:437
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a connection error."
 msgstr "VPN-yhteyttä \"%s\" ei voitu käynnistää, koska tapahtui yhteysvirhe."
 
-#: ../gnome/applet/applet.c:432
+#: ../gnome/applet/applet.c:441
 msgid "VPN Configuration Error"
 msgstr "VPN-yhteyden asetusvirhe"
 
-#: ../gnome/applet/applet.c:433
+#: ../gnome/applet/applet.c:442
 #, c-format
 msgid "The VPN connection '%s' was not correctly configured."
 msgstr "VPN-yhteyden \"%s\" asetukset ovat virheelliset."
 
-#: ../gnome/applet/applet.c:438
+#: ../gnome/applet/applet.c:447
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' because the VPN server did not "
@@ -122,13 +122,13 @@ msgstr ""
 "VPN-yhteyttä \"%s\" ei voitu käynnistää, koska VPN-palvelin ei palauttanut "
 "kelvollista verkkomäärittelyä."
 
-#: ../gnome/applet/applet.c:505
+#: ../gnome/applet/applet.c:517
 msgid "VPN Login Message"
 msgstr "VPN-yhteyden kirjautumisviesti"
 
-#: ../gnome/applet/applet.c:729 ../gnome/applet/applet.c:2481
+#: ../gnome/applet/applet.c:741 ../gnome/applet/applet.c:2508
 #: ../gnome/applet/other-network-dialog.c:453
-#: ../gnome/applet/passphrase-dialog.c:227
+#: ../gnome/applet/passphrase-dialog.c:228
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
@@ -136,163 +136,163 @@ msgstr ""
 "NetworkManager-sovelma ei voinut ladata jotain vaadituista resursseista "
 "(glade-tiedostoa ei löytynyt)."
 
-#: ../gnome/applet/applet.c:741
+#: ../gnome/applet/applet.c:753
 #, c-format
 msgid "The network device \"%s (%s)\" does not support wireless scanning."
 msgstr "Verkkolaite \"%s (%s)\" ei tue langattomien verkkojen etsimistä."
 
-#: ../gnome/applet/applet.c:749
+#: ../gnome/applet/applet.c:761
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
 msgstr "Verkkolaite \"%s (%s)\" ei tue verkkoyhteyden havaitsemista."
 
-#: ../gnome/applet/applet.c:896
+#: ../gnome/applet/applet.c:908
 #, c-format
 msgid "Preparing device %s for the wired network..."
 msgstr "Valmistellaan laitetta %s kiinteälle verkkoyhteydelle..."
 
-#: ../gnome/applet/applet.c:898
+#: ../gnome/applet/applet.c:910
 #, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
 msgstr "Valmistellaan laitetta %s langattomalle verkolle \"%s\"..."
 
-#: ../gnome/applet/applet.c:906
+#: ../gnome/applet/applet.c:918
 #, c-format
 msgid "Configuring device %s for the wired network..."
 msgstr "Määritellään laitetta %s kiinteälle verkkoyhteydelle..."
 
-#: ../gnome/applet/applet.c:908
+#: ../gnome/applet/applet.c:920
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
 msgstr "Yritetään liittyä langattomaan verkkoon \"%s\"..."
 
-#: ../gnome/applet/applet.c:916
+#: ../gnome/applet/applet.c:928
 #, c-format
 msgid "Waiting for Network Key for the wireless network '%s'..."
 msgstr "Odotetaan verkon avainta langattomalle verkolle \"%s\""
 
-#: ../gnome/applet/applet.c:924 ../gnome/applet/applet.c:934
+#: ../gnome/applet/applet.c:936 ../gnome/applet/applet.c:946
 msgid "Requesting a network address from the wired network..."
 msgstr "Pyydetään verkko-osoitetta kiinteästä verkosta..."
 
-#: ../gnome/applet/applet.c:926 ../gnome/applet/applet.c:936
+#: ../gnome/applet/applet.c:938 ../gnome/applet/applet.c:948
 #, c-format
 msgid "Requesting a network address from the wireless network '%s'..."
 msgstr "Pyydetään verkko-osoitettta langattomasta verkosta \"%s\"..."
 
-#: ../gnome/applet/applet.c:944
+#: ../gnome/applet/applet.c:956
 msgid "Finishing connection to the wired network..."
 msgstr "Viimeistellään yhteyttä kiinteään verkkoon..."
 
-#: ../gnome/applet/applet.c:946
+#: ../gnome/applet/applet.c:958
 #, c-format
 msgid "Finishing connection to the wireless network '%s'..."
 msgstr "Viimeistellään yhteyttä langattomaan verkkoon \"%s\"..."
 
-#: ../gnome/applet/applet.c:1063
+#: ../gnome/applet/applet.c:1075
 msgid "NetworkManager is not running"
 msgstr "NetworkManager ei ole käytössä"
 
-#: ../gnome/applet/applet.c:1076 ../gnome/applet/applet.c:1808
+#: ../gnome/applet/applet.c:1083 ../gnome/applet/applet.c:1828
 msgid "Networking disabled"
 msgstr "Verkko ei ole käytössä"
 
-#: ../gnome/applet/applet.c:1081
+#: ../gnome/applet/applet.c:1088
 msgid "No network connection"
 msgstr "Ei verkkoyhteyttä"
 
-#: ../gnome/applet/applet.c:1086
+#: ../gnome/applet/applet.c:1093
 msgid "Wired network connection"
 msgstr "Kiinteä verkkoyhteys"
 
-#: ../gnome/applet/applet.c:1090
+#: ../gnome/applet/applet.c:1097
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Yhteys langattomaan Ad-Hoc-verkkoon"
 
-#: ../gnome/applet/applet.c:1092
+#: ../gnome/applet/applet.c:1099
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "Langaton verkkoyhteys \"%s\" (%d%%)"
 
-#: ../gnome/applet/applet.c:1112
+#: ../gnome/applet/applet.c:1120
 #, c-format
 msgid "VPN connection to '%s'"
 msgstr "VPN-yhteys \"%s\""
 
-#: ../gnome/applet/applet.c:1120
+#: ../gnome/applet/applet.c:1128
 #, c-format
 msgid "VPN connecting to '%s'"
 msgstr "VPN-yhteyttä \"%s\" avataan"
 
-#: ../gnome/applet/applet.c:1533
+#: ../gnome/applet/applet.c:1541
 msgid "_Connect to Other Wireless Network..."
 msgstr "_Yhdistä muihin langattomiin verkkoihin..."
 
-#: ../gnome/applet/applet.c:1554
+#: ../gnome/applet/applet.c:1562
 msgid "Create _New Wireless Network..."
 msgstr "Luo _uusi langaton verkko..."
 
-#: ../gnome/applet/applet.c:1675
+#: ../gnome/applet/applet.c:1685
 msgid "_VPN Connections"
 msgstr "_VPN-yhteydet"
 
-#: ../gnome/applet/applet.c:1710
+#: ../gnome/applet/applet.c:1730
 msgid "_Configure VPN..."
 msgstr "_Määrittele VPN-yhteys..."
 
-#: ../gnome/applet/applet.c:1714
+#: ../gnome/applet/applet.c:1734
 msgid "_Disconnect VPN..."
 msgstr "_Katkaise VPN-yhteys..."
 
-#: ../gnome/applet/applet.c:1736
+#: ../gnome/applet/applet.c:1756
 msgid "_Dial Up Connections"
 msgstr "_Modeemiyhteydet"
 
 #. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
-#: ../gnome/applet/applet.c:1747
+#: ../gnome/applet/applet.c:1767
 #, c-format
 msgid "Connect to %s..."
 msgstr "Ota yhteyttä kohteeseen %s..."
 
-#: ../gnome/applet/applet.c:1753
+#: ../gnome/applet/applet.c:1773
 #, c-format
 msgid "Disconnect from %s..."
 msgstr "Katkaise yhteys kohteeseen %s..."
 
-#: ../gnome/applet/applet.c:1802
+#: ../gnome/applet/applet.c:1822
 msgid "No network devices have been found"
 msgstr "Verkkolaitteita ei löytynyt"
 
-#: ../gnome/applet/applet.c:1994
+#: ../gnome/applet/applet.c:2014
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager ei ole käytössä..."
 
 #. 'Enable Networking' item
-#: ../gnome/applet/applet.c:2150
+#: ../gnome/applet/applet.c:2170
 msgid "Enable _Networking"
 msgstr "Ota _verkko käyttöön"
 
 #. 'Enable Wireless' item
-#: ../gnome/applet/applet.c:2156
+#: ../gnome/applet/applet.c:2176
 msgid "Enable _Wireless"
 msgstr "Ota _langaton käyttöön"
 
 #. 'Connection Information' item
-#: ../gnome/applet/applet.c:2162
+#: ../gnome/applet/applet.c:2182
 msgid "Connection _Information"
 msgstr "Tietoja _yhteydestä"
 
 #. Help item
-#: ../gnome/applet/applet.c:2173
+#: ../gnome/applet/applet.c:2193
 msgid "_Help"
 msgstr "O_hje"
 
 #. About item
-#: ../gnome/applet/applet.c:2182
+#: ../gnome/applet/applet.c:2202
 msgid "_About"
 msgstr "_Tietoja"
 
-#: ../gnome/applet/applet.c:2600
+#: ../gnome/applet/applet.c:2667
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
@@ -308,59 +308,65 @@ msgstr "Avoin järjestelmä"
 msgid "Shared Key"
 msgstr "Jaettu avain"
 
-#: ../gnome/applet/wireless-security-option.c:209
+#: ../gnome/applet/wireless-security-option.c:208
 msgid "Automatic (Default)"
 msgstr "Automaattinen (oletus)"
 
-#: ../gnome/applet/wireless-security-option.c:216
+#: ../gnome/applet/wireless-security-option.c:215
+msgid "AES-CCMP"
+msgstr "AES-CCMP"
+
+#: ../gnome/applet/wireless-security-option.c:223
 msgid "TKIP"
 msgstr "TKIP"
 
-#: ../gnome/applet/wireless-security-option.c:224
-msgid "AES-CCMP"
-msgstr "AES-CCMP"
+#: ../gnome/applet/wireless-security-option.c:231
+msgid "Dynamic WEP"
+msgstr "Dynaaminen WEP"
 
 #: ../gnome/applet/wso-none.c:53
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../gnome/applet/wso-wep-ascii.c:127
-msgid "WEP 40/128-bit ASCII"
-msgstr "WEP 40/128-bittinen ASCII"
+#: ../gnome/applet/wso-wep-ascii.c:138
+msgid "WEP 64/128-bit ASCII"
+msgstr "WEP 64/128-bittinen ASCII"
 
-#: ../gnome/applet/wso-wep-hex.c:124
-msgid "WEP 40/128-bit hex"
-msgstr "WEP 40/128-bittinen heksadesimaali"
+#: ../gnome/applet/wso-wep-hex.c:135
+msgid "WEP 64/128-bit Hex"
+msgstr "WEP 64/128-bittinen heksadesimaali"
 
-#: ../gnome/applet/wso-wep-passphrase.c:124
-msgid "WEP Passphrase"
-msgstr "WEP-tunnuslause:"
+#: ../gnome/applet/wso-wep-passphrase.c:135
+msgid "WEP 128-bit Passphrase"
+msgstr "WEP 128-bittinen tunnuslause"
 
-#: ../gnome/applet/wso-wpa-eap.c:202
+#: ../gnome/applet/wso-wpa-eap.c:237
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../gnome/applet/wso-wpa-eap.c:203
+#: ../gnome/applet/wso-wpa-eap.c:238
 msgid "TLS"
 msgstr "TLS"
 
-#: ../gnome/applet/wso-wpa-eap.c:204
+#: ../gnome/applet/wso-wpa-eap.c:239
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../gnome/applet/wso-wpa-eap.c:212
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
+#: ../src/nm-ap-security-wpa-eap.c:116
 msgid "WPA2 Enterprise"
 msgstr "WPA2 Enterprise"
 
-#: ../gnome/applet/wso-wpa-eap.c:214
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
+#: ../src/nm-ap-security-wpa-eap.c:121
 msgid "WPA Enterprise"
 msgstr "WPA Enterprise"
 
-#: ../gnome/applet/wso-wpa-psk.c:166
+#: ../gnome/applet/wso-wpa-psk.c:178
 msgid "WPA2 Personal"
 msgstr "WPA2 (henkilökohtainen)"
 
-#: ../gnome/applet/wso-wpa-psk.c:168
+#: ../gnome/applet/wso-wpa-psk.c:180
 msgid "WPA Personal"
 msgstr "WPA (henkilökohtainen)"
 
@@ -372,29 +378,29 @@ msgstr "Suunta"
 msgid "The orientation of the tray."
 msgstr "Ilmoitusalueen suunta."
 
-#: ../gnome/applet/menu-items.c:87
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Kiinteä verkkoyhteys (%s)"
 
-#: ../gnome/applet/menu-items.c:90
+#: ../gnome/applet/menu-items.c:91
 msgid "_Wired Network"
 msgstr "_Kiinteä verkkoyhteys"
 
-#: ../gnome/applet/menu-items.c:161
+#: ../gnome/applet/menu-items.c:162
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
 msgstr[0] "Langaton verkko (%s)"
 msgstr[1] "Langattomat verkot (%s)"
 
-#: ../gnome/applet/menu-items.c:163
+#: ../gnome/applet/menu-items.c:164
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Langaton verkko"
 msgstr[1] "Langattomat verkot"
 
-#: ../gnome/applet/menu-items.c:330
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr " (virheellistä Unicodea)"
 
@@ -433,24 +439,24 @@ msgstr "Syötä sen langattoman verkon nimi, johon haluat ottaa yhteyttä."
 msgid "Connect to Other Wireless Network"
 msgstr "Ota yhteyttä muuhun langattomaan verkkoon"
 
-#: ../gnome/applet/passphrase-dialog.c:214
+#: ../gnome/applet/passphrase-dialog.c:215
 msgid "Error connecting to wireless network"
 msgstr "Virhe yhdistettäessä langattomaan verkkoon"
 
-#: ../gnome/applet/passphrase-dialog.c:215
+#: ../gnome/applet/passphrase-dialog.c:216
 msgid ""
 "The requested wireless network requires security capabilities unsupported by "
 "your hardware."
 msgstr ""
 "Pyydetty langaton verkko vaatii tietoturvakykyjä, joita laitteistosi ei tue."
 
-#: ../gnome/applet/vpn-password-dialog.c:152
-#: ../gnome/applet/vpn-password-dialog.c:189
+#: ../gnome/applet/vpn-password-dialog.c:151
+#: ../gnome/applet/vpn-password-dialog.c:188
 #, c-format
 msgid "Cannot start VPN connection '%s'"
 msgstr "VPN-yhteyttä \"%s\" ei voida käynnistää"
 
-#: ../gnome/applet/vpn-password-dialog.c:155
+#: ../gnome/applet/vpn-password-dialog.c:154
 #, c-format
 msgid ""
 "Could not find the authentication dialog for VPN connection type '%s'. "
@@ -459,7 +465,7 @@ msgstr ""
 "Kirjautumisikkunaa VPN-yhteyden tyypille \"%s\" ei löydy. Ota yhteyttä "
 "järjestelmäsi ylläpitäjään."
 
-#: ../gnome/applet/vpn-password-dialog.c:192
+#: ../gnome/applet/vpn-password-dialog.c:191
 #, c-format
 msgid ""
 "There was a problem launching the authentication dialog for VPN connection "
@@ -582,22 +588,26 @@ msgid "Interface:"
 msgstr "Verkkolaite:"
 
 #: ../gnome/applet/applet.glade.h:30
+msgid "Key Type:"
+msgstr "Avaimen tyyppi:"
+
+#: ../gnome/applet/applet.glade.h:31
 msgid "Key:"
 msgstr "Avain:"
 
-#: ../gnome/applet/applet.glade.h:31
+#: ../gnome/applet/applet.glade.h:32
 msgid ""
 "None\n"
-"WEP Passphrase\n"
-"WEP 40/128-bit hex\n"
-"WEP 40/128-bit ASCII\n"
+"WEP 128-bit Passphrase\n"
+"WEP 64/128-bit Hex\n"
+"WEP 64/128-bit ASCII\n"
 msgstr ""
 "Ei mitään\n"
-"WEP-tunnuslause\n"
-"WEP 40/128-bittinen heksadesimaali\n"
-"WEP 40/128-bittinen ASCII\n"
+"WEP 128-bittinen tunnuslause\n"
+"WEP 64/128-bittinen heksadesimaali\n"
+"WEP 64/128-bittinen ASCII\n"
 
-#: ../gnome/applet/applet.glade.h:36
+#: ../gnome/applet/applet.glade.h:37
 msgid ""
 "Open System\n"
 "Shared Key"
@@ -605,111 +615,111 @@ msgstr ""
 "Avoin järjestelmä\n"
 "Jaettu avain"
 
-#: ../gnome/applet/applet.glade.h:38
+#: ../gnome/applet/applet.glade.h:39
 msgid "Other Wireless Network..."
 msgstr "Muu langaton verkko..."
 
-#: ../gnome/applet/applet.glade.h:39
+#: ../gnome/applet/applet.glade.h:40
 msgid "Passphrase:"
 msgstr "Tunnuslause:"
 
-#: ../gnome/applet/applet.glade.h:40
+#: ../gnome/applet/applet.glade.h:41
 msgid "Password:"
 msgstr "Salasana:"
 
-#: ../gnome/applet/applet.glade.h:41
+#: ../gnome/applet/applet.glade.h:42
 msgid "Primary DNS:"
 msgstr "Ensisijainen DNS:"
 
-#: ../gnome/applet/applet.glade.h:42
+#: ../gnome/applet/applet.glade.h:43
 msgid "Private Key File:"
 msgstr "Salausavaimen tiedosto"
 
-#: ../gnome/applet/applet.glade.h:43
+#: ../gnome/applet/applet.glade.h:44
 msgid "Private Key Password:"
 msgstr "Salausavaimen salasana:"
 
-#: ../gnome/applet/applet.glade.h:44
+#: ../gnome/applet/applet.glade.h:45
 msgid "Secondary DNS:"
 msgstr "Toissijainen DNS:"
 
-#: ../gnome/applet/applet.glade.h:45
+#: ../gnome/applet/applet.glade.h:46
 msgid "Select the CA Certificate File"
 msgstr "Valise CA-varmenteen tiedosto"
 
-#: ../gnome/applet/applet.glade.h:46
+#: ../gnome/applet/applet.glade.h:47
 msgid "Select the Client Certificate File"
 msgstr "Valitse asiakasvarmenteen tiedosto"
 
-#: ../gnome/applet/applet.glade.h:47
+#: ../gnome/applet/applet.glade.h:48
 msgid "Select the Private Key File"
 msgstr "Valitse salaisen avaimen tiedosto"
 
-#: ../gnome/applet/applet.glade.h:48
+#: ../gnome/applet/applet.glade.h:49
+msgid "Show key"
+msgstr "Näytä avain"
+
+#: ../gnome/applet/applet.glade.h:50
+msgid "Show passphrase"
+msgstr "Näytä tunnuslause:"
+
+#: ../gnome/applet/applet.glade.h:51
+msgid "Show password"
+msgstr "Näytä salasana"
+
+#: ../gnome/applet/applet.glade.h:52
+msgid "Show passwords"
+msgstr "Näytä salasanat"
+
+#: ../gnome/applet/applet.glade.h:53
+msgid "Speed:"
+msgstr "Nopeus:"
+
+#: ../gnome/applet/applet.glade.h:54
 msgid "Subnet Mask:"
 msgstr "Aliverkkopeite:"
 
-#: ../gnome/applet/applet.glade.h:49
+#: ../gnome/applet/applet.glade.h:55
 msgid "Type:"
 msgstr "Tyyppi:"
 
-#: ../gnome/applet/applet.glade.h:50
+#: ../gnome/applet/applet.glade.h:56
 msgid "User Name:"
 msgstr "Käyttäjätunnus:"
 
-#: ../gnome/applet/applet.glade.h:51
+#: ../gnome/applet/applet.glade.h:57
 msgid "Wireless Network Key Required"
 msgstr "Langattoman verkon salausavain vaaditaan"
 
-#: ../gnome/applet/applet.glade.h:52
+#: ../gnome/applet/applet.glade.h:58
 msgid "Wireless _adapter:"
 msgstr "Langaton _verkkolaite:"
 
-#: ../gnome/applet/applet.glade.h:53
+#: ../gnome/applet/applet.glade.h:59
 msgid "_Always Trust this Wireless Network"
 msgstr "_Luota aina tähän langattomaan verkkoon"
 
-#: ../gnome/applet/applet.glade.h:54
+#: ../gnome/applet/applet.glade.h:60
 msgid "_Don't remind me again"
 msgstr "_Älä huomauta uudestaan"
 
-#: ../gnome/applet/applet.glade.h:55
+#: ../gnome/applet/applet.glade.h:61
 msgid "_Login to Network"
 msgstr "_Kirjaudu verkkoon"
 
-#: ../gnome/applet/applet.glade.h:56
+#: ../gnome/applet/applet.glade.h:62
 msgid "_Network Name:"
 msgstr "_Verkon nimi:"
 
-#: ../gnome/applet/applet.glade.h:57
+#: ../gnome/applet/applet.glade.h:63
 msgid "_Wireless Security:"
 msgstr "_Langaton tietoturva:"
 
-#: ../gnome/applet/applet.glade.h:58
-msgid "leap_subwindow"
-msgstr "leap_ali-ikkuna"
-
-#: ../gnome/applet/applet.glade.h:59
-msgid "wep_key_subwindow"
-msgstr "wep_avaimen_ali-ikkuna"
-
-#: ../gnome/applet/applet.glade.h:60
-msgid "wep_passphrase_subwindow"
-msgstr "wep_salalauseen_ali-ikkuna"
-
-#: ../gnome/applet/applet.glade.h:61
-msgid "wpa_eap_subwindow"
-msgstr "wep_eap_ali-ikkuna"
-
-#: ../gnome/applet/applet.glade.h:62
-msgid "wpa_psk_subwindow"
-msgstr "wpa_psk_ali-ikkuna"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.c:358
+#: ../gnome/vpn-properties/nm-vpn-properties.c:383
 msgid "Cannot add VPN connection"
 msgstr "VPN-yhteyttä ei voitu lisätä"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:360
+#: ../gnome/vpn-properties/nm-vpn-properties.c:385
 msgid ""
 "No suitable VPN software was found on your system. Contact your system "
 "administrator."
@@ -717,11 +727,11 @@ msgstr ""
 "Sopivaa VPN-ohjelmistoa ei löytynyt järjestelmästäsi. Ota yhteyttä "
 "järjestelmäsi ylläpitäjään."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:411
+#: ../gnome/vpn-properties/nm-vpn-properties.c:437
 msgid "Cannot import VPN connection"
 msgstr "VPN-yhteyttä ei voida tuoda"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:413
+#: ../gnome/vpn-properties/nm-vpn-properties.c:439
 #, c-format
 msgid ""
 "Cannot find suitable software for VPN connection type '%s' to import the "
@@ -730,12 +740,12 @@ msgstr ""
 "Sopivaa VPN-ohjelmistoa VPN-yhteyden tyypille \"%s\" ei löydy tuotaessa "
 "asetustiedostoa \"%s\". Ota yhteyttä järjestelmäsi ylläpitäjään."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:553
+#: ../gnome/vpn-properties/nm-vpn-properties.c:579
 #, c-format
 msgid "Error retrieving VPN connection '%s'"
 msgstr "Virhe haettaessa VPN-yhteyttä \"%s\""
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:556
+#: ../gnome/vpn-properties/nm-vpn-properties.c:582
 #, c-format
 msgid ""
 "Could not find the UI files for VPN connection type '%s'. Contact your "
@@ -744,12 +754,12 @@ msgstr ""
 "VPN-yhteyden tyypille \"%s\" ei löydy käyttöliittymää. Ota yhteyttä "
 "järjestelmäsi ylläpitäjään."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:713
+#: ../gnome/vpn-properties/nm-vpn-properties.c:739
 #, c-format
 msgid "Delete VPN connection \"%s\"?"
 msgstr "Poistetaanko VPN-yhteys \"%s\"?"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:716
+#: ../gnome/vpn-properties/nm-vpn-properties.c:742
 #, c-format
 msgid ""
 "All information about the VPN connection \"%s\" will be lost and you may "
@@ -760,16 +770,16 @@ msgstr ""
 "yhteyttä järjestelmäsiylläpitäjään, jotta saat uuden yhteyden luomiseen "
 "tarvittavat tiedot."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:924
+#: ../gnome/vpn-properties/nm-vpn-properties.c:959
 msgid "Unable to load"
 msgstr "Ei voitu ladata"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:926
+#: ../gnome/vpn-properties/nm-vpn-properties.c:961
 msgid "Cannot find some needed resources (the glade file)!"
 msgstr "Jotain tarvittavista resursseista ei löydy (glade-tiedosto)!"
 
 #. Edit dialog
-#: ../gnome/vpn-properties/nm-vpn-properties.c:1034
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
 msgid "Edit VPN Connection"
 msgstr "Muokkaa VPN-yhteyttä"
 
@@ -842,11 +852,11 @@ msgstr ""
 msgid "VPN Connections"
 msgstr "VPN-yhteydet"
 
-#: ../src/nm-ap-security-wep.c:47
+#: ../src/nm-ap-security-wep.c:52
 msgid "40-bit WEP"
 msgstr "40-bittinen WEP"
 
-#: ../src/nm-ap-security-wep.c:49
+#: ../src/nm-ap-security-wep.c:54
 msgid "104-bit WEP"
 msgstr "104-bittinen WEP"
 
@@ -874,7 +884,7 @@ msgstr "WPA2 COMP"
 msgid "WPA2 Automatic"
 msgstr "WPA2 (automaattinen)"
 
-#: ../src/nm-ap-security.c:305
+#: ../src/nm-ap-security.c:320
 msgid "none"
 msgstr "ei mitään"
 
@@ -914,6 +924,67 @@ msgstr "lähetettiin liian paljon tietoja pistekkeeseen ja osaa siitä hukkui"
 msgid "error occurred while waiting for data on socket"
 msgstr "virhe odotettaessa tietoja pistokkeesta"
 
+#: ../gnome/applet/applet-dbus-devices.c:898
+#, c-format
+msgid "You are now connected to the Ad-Hoc wireless network '%s'."
+msgstr "Yhteys langattomaan Ad-Hoc-verkkoon \"%s\" on nyt muodostettu."
+
+#: ../gnome/applet/applet-dbus-devices.c:903
+#, c-format
+msgid "You are now connected to the wireless network '%s'."
+msgstr "Yhteys langattomaan verkkoon \"%s\" on nyt muodostettu."
+
+#: ../gnome/applet/applet-dbus-devices.c:910
+msgid "You are now connected to the wired network."
+msgstr "Yhteys kiinteään verkkoon on nyt muodostettu."
+
+#: ../gnome/applet/applet-dbus-devices.c:916
+msgid "Connection Established"
+msgstr "Yhteys muodostettu"
+
+#: ../gnome/applet/applet-dbus-devices.c:959
+msgid "Disconnected"
+msgstr "Yhteys katkaistu"
+
+#: ../gnome/applet/applet-dbus-devices.c:960
+msgid "The network connection has been disconnected."
+msgstr "Yhteys verkkoon on katkaistu."
+
+#~ msgid "WEP 40/128-bit ASCII"
+#~ msgstr "WEP 40/128-bittinen ASCII"
+
+#~ msgid "WEP 40/128-bit hex"
+#~ msgstr "WEP 40/128-bittinen heksadesimaali"
+
+#~ msgid "WEP Passphrase"
+#~ msgstr "WEP-tunnuslause:"
+
+#~ msgid ""
+#~ "None\n"
+#~ "WEP Passphrase\n"
+#~ "WEP 40/128-bit hex\n"
+#~ "WEP 40/128-bit ASCII\n"
+#~ msgstr ""
+#~ "Ei mitään\n"
+#~ "WEP-tunnuslause\n"
+#~ "WEP 40/128-bittinen heksadesimaali\n"
+#~ "WEP 40/128-bittinen ASCII\n"
+
+#~ msgid "leap_subwindow"
+#~ msgstr "leap_ali-ikkuna"
+
+#~ msgid "wep_key_subwindow"
+#~ msgstr "wep_avaimen_ali-ikkuna"
+
+#~ msgid "wep_passphrase_subwindow"
+#~ msgstr "wep_salalauseen_ali-ikkuna"
+
+#~ msgid "wpa_eap_subwindow"
+#~ msgstr "wep_eap_ali-ikkuna"
+
+#~ msgid "wpa_psk_subwindow"
+#~ msgstr "wpa_psk_ali-ikkuna"
+
 #~ msgid "The VPN service said: \"%s\""
 #~ msgstr "VPN-palvelin vastasi: \"%s\""
 
@@ -923,12 +994,6 @@ msgstr "virhe odotettaessa tietoja pistokkeesta"
 #~ msgid "VPN connection '%s' said:"
 #~ msgstr "VPN-yhteys \"%s\" ilmoitti:"
 
-#~ msgid "Disconnected"
-#~ msgstr "Yhteys katkaistu"
-
-#~ msgid "The network connection has been disconnected."
-#~ msgstr "Yhteys verkkoon on katkaistu."
-
 #~ msgid "Connected"
 #~ msgstr "Yhdistetty"
 
diff --git a/po/fr.po b/po/fr.po
index 8ac832baad..b8021f1bfc 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager 0.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-16 00:21+0100\n"
+"POT-Creation-Date: 2006-05-29 18:33+0200\n"
 "PO-Revision-Date: 2005-02-16 00:11+0100\n"
 "Last-Translator: Raphaël Tournoy <lexpas@free.fr>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
@@ -17,250 +17,988 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 
-#: info-daemon/networks.glade.h:1
-msgid "<span weight=\"bold\">Wireless Networks:</span>"
-msgstr "<span weight=\"bold\">Réseaux sans fil :</span>"
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:919
+#, fuzzy, c-format
+msgid "Passphrase for wireless network %s"
+msgstr "Créer un nouveau réseau sans fil"
 
-#: info-daemon/networks.glade.h:2
-msgid "Modify Wireless Networks"
-msgstr "Modifier les réseaux sans fil"
+#: ../gnome/applet/applet-dbus.c:265
+#, fuzzy, c-format
+msgid "Connection to the wireless network '%s' failed."
+msgstr "Connexion au réseau sans fil « %s »..."
 
-#: info-daemon/passphrase.glade.h:1 panel-applet/essid.glade.h:1
-msgid "*"
-msgstr "*"
+#: ../gnome/applet/applet-dbus.c:270
+#, fuzzy
+msgid "Connection to the wired network failed."
+msgstr "Connexion à un réseau sans fil..."
 
-#: info-daemon/passphrase.glade.h:2 panel-applet/essid.glade.h:2
-msgid ""
-"128-bit Passphrase (WEP)\n"
-"Ascii Key (WEP)\n"
-"Hex Key (WEP)"
+#: ../gnome/applet/applet.c:184
+msgid "Error displaying connection information:"
 msgstr ""
-"Phrase de passe 128 bit (WEP)\n"
-"Clé ASCII (WEP)\n"
-"Clé hexa (WEP)"
 
-#: info-daemon/passphrase.glade.h:6
-#, no-c-format
+#: ../gnome/applet/applet.c:202
+#, fuzzy
+msgid "Could not find some required resources (the glade file)!"
+msgstr ""
+"L'applet NetworkManager n'a pas pu trouver les ressources requises (le "
+"fichier glade n'a pas été trouvé)."
+
+#: ../gnome/applet/applet.c:213
+#, fuzzy
+msgid "No active connections!"
+msgstr "Aucune connexion réseau"
+
+#: ../gnome/applet/applet.c:234
+#, fuzzy, c-format
+msgid "Wired Ethernet (%s)"
+msgstr "Réseau cablé (%s)"
+
+#: ../gnome/applet/applet.c:236
+#, fuzzy, c-format
+msgid "Wireless Ethernet (%s)"
+msgstr "Réseau sans fil (%s)"
+
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:362
+msgid "NetworkManager Applet"
+msgstr "Applet NetworkManager"
+
+#: ../gnome/applet/applet.c:339 ../gnome/applet/applet.c:364
+#, fuzzy
+msgid "Copyright © 2004-2005 Red Hat, Inc."
+msgstr "© 2004-2005 Red Hat, Inc."
+
+#: ../gnome/applet/applet.c:340 ../gnome/applet/applet.c:365
+#, fuzzy
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
-"Network</span>\n"
-"\n"
-"A passphrase or encryption key is required to access the wireless network '%"
-"s'."
+"Notification area applet for managing your network devices and connections."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Phrase de passe requise par le réseau "
-"sans fil</span>\n"
-"\n"
-"Une phrase de passe ou une clé de chiffrement est requise pour accéder au "
-"réseau sans fil « %s »."
+"Une application de tableau de bord pour gérer vos périphériques réseaux et "
+"vox connexions."
 
-#: info-daemon/passphrase.glade.h:9 panel-applet/essid.glade.h:7
-msgid "Key Type:"
-msgstr "Type de clé :"
+#: ../gnome/applet/applet.c:343 ../gnome/applet/applet.c:370
+msgid "translator-credits"
+msgstr ""
 
-#: info-daemon/passphrase.glade.h:10
-#: info-daemon/NetworkManagerInfoPassphraseDialog.c:139
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:149
-#: panel-applet/essid.glade.h:8
-msgid "Passphrase:"
-msgstr "Phrase de passe :"
+#: ../gnome/applet/applet.c:426
+msgid "VPN Login Failure"
+msgstr ""
 
-#: info-daemon/passphrase.glade.h:11
-msgid "Wireless Network Key Required"
-msgstr "Clef requise par le réseau sans fil"
+#: ../gnome/applet/applet.c:427
+#, c-format
+msgid "Could not start the VPN connection '%s' due to a login failure."
+msgstr ""
 
-#: info-daemon/passphrase.glade.h:12
-msgid "_Login to Network"
-msgstr "_Connexion au réseau"
+#: ../gnome/applet/applet.c:431
+msgid "VPN Start Failure"
+msgstr ""
 
-#: info-daemon/NetworkManagerInfoPassphraseDialog.c:142
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:152
-msgid "Ascii Key:"
-msgstr "Clé ASCII :"
+#: ../gnome/applet/applet.c:432
+#, c-format
+msgid ""
+"Could not start the VPN connection '%s' due to a failure launching the VPN "
+"program."
+msgstr ""
 
-#: info-daemon/NetworkManagerInfoPassphraseDialog.c:145
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:155
-msgid "Hex Key:"
-msgstr "Clé hexa :"
+#: ../gnome/applet/applet.c:436 ../gnome/applet/applet.c:446
+msgid "VPN Connect Failure"
+msgstr ""
 
-#: info-daemon/NetworkManagerInfoVPN.c:157
+#: ../gnome/applet/applet.c:437
 #, c-format
-msgid "You must log in to access the private network %s"
-msgstr "Vous devez vous connecter pour accéder au réseau privé %s"
+msgid "Could not start the VPN connection '%s' due to a connection error."
+msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:140 panel-applet/NMWirelessApplet.c:158
-msgid "NetworkManager Applet"
-msgstr "Applet NetworkManager"
+#: ../gnome/applet/applet.c:441
+msgid "VPN Configuration Error"
+msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:142
-msgid "(C) 2004-2005 Red Hat, Inc."
-msgstr "© 2004-2005 Red Hat, Inc."
+#: ../gnome/applet/applet.c:442
+#, c-format
+msgid "The VPN connection '%s' was not correctly configured."
+msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:143 panel-applet/NMWirelessApplet.c:161
-msgid "A panel application for managing your network devices & connections."
+#: ../gnome/applet/applet.c:447
+#, c-format
+msgid ""
+"Could not start the VPN connection '%s' because the VPN server did not "
+"return an adequate network configuration."
 msgstr ""
-"Une application de tableau de bord pour gérer vos périphériques réseaux et "
-"vox connexions."
 
-#: panel-applet/NMWirelessApplet.c:160
-msgid "(C) 2004-2005 by Red Hat, Inc."
-msgstr "© 2004-2005 by Red Hat, Inc."
+#: ../gnome/applet/applet.c:517
+msgid "VPN Login Message"
+msgstr ""
+
+#: ../gnome/applet/applet.c:741 ../gnome/applet/applet.c:2508
+#: ../gnome/applet/other-network-dialog.c:453
+#: ../gnome/applet/passphrase-dialog.c:228
+msgid ""
+"The NetworkManager Applet could not find some required resources (the glade "
+"file was not found)."
+msgstr ""
+"L'applet NetworkManager n'a pas pu trouver les ressources requises (le "
+"fichier glade n'a pas été trouvé)."
+
+#: ../gnome/applet/applet.c:753
+#, c-format
+msgid "The network device \"%s (%s)\" does not support wireless scanning."
+msgstr ""
+
+#: ../gnome/applet/applet.c:761
+#, c-format
+msgid "The network device \"%s (%s)\" does not support link detection."
+msgstr ""
+
+#: ../gnome/applet/applet.c:908
+#, fuzzy, c-format
+msgid "Preparing device %s for the wired network..."
+msgstr "Connexion à un réseau sans fil..."
+
+#: ../gnome/applet/applet.c:910
+#, fuzzy, c-format
+msgid "Preparing device %s for the wireless network '%s'..."
+msgstr "Connexion au réseau sans fil « %s »..."
+
+#: ../gnome/applet/applet.c:918
+#, fuzzy, c-format
+msgid "Configuring device %s for the wired network..."
+msgstr "Connexion à un réseau sans fil..."
+
+#: ../gnome/applet/applet.c:920
+#, fuzzy, c-format
+msgid "Attempting to join the wireless network '%s'..."
+msgstr "Connexion au réseau sans fil « %s »..."
+
+#: ../gnome/applet/applet.c:928
+#, fuzzy, c-format
+msgid "Waiting for Network Key for the wireless network '%s'..."
+msgstr "Connexion au réseau sans fil « %s »..."
+
+#: ../gnome/applet/applet.c:936 ../gnome/applet/applet.c:946
+#, fuzzy
+msgid "Requesting a network address from the wired network..."
+msgstr "Connexion à un réseau sans fil..."
+
+#: ../gnome/applet/applet.c:938 ../gnome/applet/applet.c:948
+#, fuzzy, c-format
+msgid "Requesting a network address from the wireless network '%s'..."
+msgstr "Connexion au réseau sans fil « %s »..."
+
+#: ../gnome/applet/applet.c:956
+#, fuzzy
+msgid "Finishing connection to the wired network..."
+msgstr "Connexion à un réseau sans fil..."
+
+#: ../gnome/applet/applet.c:958
+#, fuzzy, c-format
+msgid "Finishing connection to the wireless network '%s'..."
+msgstr "Connexion au réseau sans fil « %s »..."
+
+#: ../gnome/applet/applet.c:1075
+msgid "NetworkManager is not running"
+msgstr "NetworkManager n'est pas lancé"
 
-#: panel-applet/NMWirelessApplet.c:377
+#: ../gnome/applet/applet.c:1083 ../gnome/applet/applet.c:1828
+msgid "Networking disabled"
+msgstr ""
+
+#: ../gnome/applet/applet.c:1088
 msgid "No network connection"
 msgstr "Aucune connexion réseau"
 
-#: panel-applet/NMWirelessApplet.c:382
+#: ../gnome/applet/applet.c:1093
 msgid "Wired network connection"
 msgstr "Connexion à un réseau cablé"
 
-#: panel-applet/NMWirelessApplet.c:387
-msgid "Connecting to a wired network..."
-msgstr "Connexion à un réseau sans fil..."
-
-#: panel-applet/NMWirelessApplet.c:396
+#: ../gnome/applet/applet.c:1097
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Connecté à un réseau sans fil Ad-Hoc"
 
-#: panel-applet/NMWirelessApplet.c:410
+#: ../gnome/applet/applet.c:1099
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "Connexion au réseau sans fil vers « %s » (%d%%)"
 
-#: panel-applet/NMWirelessApplet.c:415
-msgid "Wireless network connection"
-msgstr "Connexion réseau sans fil"
-
-#: panel-applet/NMWirelessApplet.c:420
+#: ../gnome/applet/applet.c:1120
 #, c-format
-msgid "Connecting to wireless network '%s'..."
-msgstr "Connexion au réseau sans fil « %s »..."
-
-#: panel-applet/NMWirelessApplet.c:426
-msgid "NetworkManager is not running"
-msgstr "NetworkManager n'est pas lancé"
+msgid "VPN connection to '%s'"
+msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:431
-msgid "Scanning for wireless networks..."
-msgstr "Recherche de réseaux sans fil..."
+#: ../gnome/applet/applet.c:1128
+#, c-format
+msgid "VPN connecting to '%s'"
+msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:754
-msgid "Other Wireless Networks..."
+#: ../gnome/applet/applet.c:1541
+#, fuzzy
+msgid "_Connect to Other Wireless Network..."
 msgstr "Autres réseaux sans fil..."
 
-#: panel-applet/NMWirelessApplet.c:775
-msgid "Create new Wireless Network..."
+#: ../gnome/applet/applet.c:1562
+#, fuzzy
+msgid "Create _New Wireless Network..."
 msgstr "Créer un nouveau réseau sans fil..."
 
-#: panel-applet/NMWirelessApplet.c:885
+#: ../gnome/applet/applet.c:1685
+msgid "_VPN Connections"
+msgstr ""
+
+#: ../gnome/applet/applet.c:1730
+msgid "_Configure VPN..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1734
+msgid "_Disconnect VPN..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1756
+msgid "_Dial Up Connections"
+msgstr ""
+
+#. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
+#: ../gnome/applet/applet.c:1767
+#, c-format
+msgid "Connect to %s..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1773
+#, c-format
+msgid "Disconnect from %s..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1822
 msgid "No network devices have been found"
 msgstr "Aucun périphérique réseau n'a été détecté"
 
-#: panel-applet/NMWirelessApplet.c:1003
+#: ../gnome/applet/applet.c:2014
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager n'est pas lancé..."
 
-#: panel-applet/NMWirelessApplet.c:1047 panel-applet/NMWirelessApplet.c:1096
-msgid "Pause Wireless Scanning"
-msgstr "Interrompre la recherche de réseau sans fil"
-
-#: panel-applet/NMWirelessApplet.c:1052
-msgid "Resume Wireless Scanning"
-msgstr "Reprendre la recherche de réseau sans fil"
+#. 'Enable Networking' item
+#: ../gnome/applet/applet.c:2170
+#, fuzzy
+msgid "Enable _Networking"
+msgstr "Réseau _sans fil :"
 
-#: panel-applet/NMWirelessApplet.c:1062 panel-applet/NMWirelessApplet.c:1102
-msgid "Stop All Wireless Devices"
-msgstr "Arrêter tous les périphériques sans fil"
+#. 'Enable Wireless' item
+#: ../gnome/applet/applet.c:2176
+msgid "Enable _Wireless"
+msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:1067
-msgid "Start All Wireless Devices"
-msgstr "Démarrer tous les périphériques sans fil"
+#. 'Connection Information' item
+#: ../gnome/applet/applet.c:2182
+msgid "Connection _Information"
+msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:1112
-msgid "Help"
+#. Help item
+#: ../gnome/applet/applet.c:2193
+#, fuzzy
+msgid "_Help"
 msgstr "Aide"
 
-#: panel-applet/NMWirelessApplet.c:1119
-msgid "About"
+#. About item
+#: ../gnome/applet/applet.c:2202
+#, fuzzy
+msgid "_About"
 msgstr "À _propos"
 
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:228
-msgid "Create new wireless network"
-msgstr "Créer un nouveau réseau sans fil"
-
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:229
+#: ../gnome/applet/applet.c:2667
+#, fuzzy
 msgid ""
-"Enter the ESSID and security settings of the wireless network you wish to "
-"create."
+"The NetworkManager applet could not find some required resources.  It cannot "
+"continue.\n"
 msgstr ""
-"Saisissez l'ESSID et les paramètres de sécurité du réseau sans fil que vous "
-"voulez créer."
+"L'applet NetworkManager n'a pas pu trouver les ressources requises (le "
+"fichier glade n'a pas été trouvé)."
 
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:234
-msgid "Custom wireless network"
-msgstr "Réseau sans fil personnalisé"
+#: ../gnome/applet/wireless-security-option.c:157
+msgid "Open System"
+msgstr ""
 
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:235
-msgid "Enter the ESSID of the wireless network to which you wish to connect."
+#: ../gnome/applet/wireless-security-option.c:160
+msgid "Shared Key"
 msgstr ""
-"Saisissez l'ESSID du réseau sans fil auquel vous voulez vous connecter."
 
-#. Reuse the above string to make the translators less angry.
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:316
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:325
-msgid ""
-"The NetworkManager Applet could not find some required resources (the glade "
-"file was not found)."
+#: ../gnome/applet/wireless-security-option.c:208
+msgid "Automatic (Default)"
 msgstr ""
-"L'applet NetworkManager n'a pas pu trouver les ressources requises (le "
-"fichier glade n'a pas été trouvé)."
 
-#: panel-applet/essid.glade.h:5
-msgid "C_onnect"
-msgstr "Se _connecter"
+#: ../gnome/applet/wireless-security-option.c:215
+msgid "AES-CCMP"
+msgstr ""
 
-#: panel-applet/essid.glade.h:6
-msgid "Connect with encryption enabled"
-msgstr "Se connecter avec le chiffrement activé"
+#: ../gnome/applet/wireless-security-option.c:223
+msgid "TKIP"
+msgstr ""
 
-#: panel-applet/essid.glade.h:9
-msgid "Wireless _adapter:"
-msgstr "_Adaptateur sans fil :"
+#: ../gnome/applet/wireless-security-option.c:231
+msgid "Dynamic WEP"
+msgstr ""
 
-#: panel-applet/essid.glade.h:10
-msgid "Wireless _Network:"
-msgstr "Réseau _sans fil :"
+#: ../gnome/applet/wso-none.c:53
+msgid "None"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-ascii.c:138
+msgid "WEP 64/128-bit ASCII"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-hex.c:135
+msgid "WEP 64/128-bit Hex"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-passphrase.c:135
+#, fuzzy
+msgid "WEP 128-bit Passphrase"
+msgstr "Phrase de passe :"
+
+#: ../gnome/applet/wso-wpa-eap.c:237
+msgid "PEAP"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:238
+msgid "TLS"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:239
+msgid "TTLS"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
+#: ../src/nm-ap-security-wpa-eap.c:116
+msgid "WPA2 Enterprise"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
+#: ../src/nm-ap-security-wpa-eap.c:121
+msgid "WPA Enterprise"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-psk.c:178
+msgid "WPA2 Personal"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-psk.c:180
+msgid "WPA Personal"
+msgstr ""
+
+#: ../gnome/applet/eggtrayicon.c:134
+msgid "Orientation"
+msgstr "Orientation"
 
-#: panel-applet/menu-info.c:109
+#: ../gnome/applet/eggtrayicon.c:135
+msgid "The orientation of the tray."
+msgstr "L'orientation de la zone de notification."
+
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Réseau cablé (%s)"
 
-#: panel-applet/menu-info.c:111
-msgid "Wired Network"
+#: ../gnome/applet/menu-items.c:91
+#, fuzzy
+msgid "_Wired Network"
 msgstr "Réseau cablé"
 
-#: panel-applet/menu-info.c:181
+#: ../gnome/applet/menu-items.c:162
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
 msgstr[0] "Réseau sans fil (%s)"
 msgstr[1] "Réseaux sans fil (%s)"
 
-#: panel-applet/menu-info.c:183
+#: ../gnome/applet/menu-items.c:164
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Réseau sans fil"
 msgstr[1] "Réseaux sans fil"
 
-#: panel-applet/menu-info.c:320
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr " (Unicode non valide)"
 
-#: examples/python/systray/eggtrayicon.c:111
-msgid "Orientation"
+#: ../gnome/applet/other-network-dialog.c:352
+#, c-format
+msgid ""
+"By default, the wireless network's name is set to your computer's name, %s, "
+"with no encryption enabled"
+msgstr ""
+
+#: ../gnome/applet/other-network-dialog.c:358
+msgid "Create new wireless network"
+msgstr "Créer un nouveau réseau sans fil"
+
+#: ../gnome/applet/other-network-dialog.c:359
+#, fuzzy
+msgid ""
+"Enter the name and security settings of the wireless network you wish to "
+"create."
+msgstr ""
+"Saisissez l'ESSID et les paramètres de sécurité du réseau sans fil que vous "
+"voulez créer."
+
+#: ../gnome/applet/other-network-dialog.c:363
+#, fuzzy
+msgid "Create New Wireless Network"
+msgstr "Créer un nouveau réseau sans fil..."
+
+#: ../gnome/applet/other-network-dialog.c:368
+#, fuzzy
+msgid "Existing wireless network"
+msgstr "Réseau sans fil personnalisé"
+
+#: ../gnome/applet/other-network-dialog.c:369
+#, fuzzy
+msgid "Enter the name of the wireless network to which you wish to connect."
+msgstr ""
+"Saisissez l'ESSID du réseau sans fil auquel vous voulez vous connecter."
+
+#: ../gnome/applet/other-network-dialog.c:371
+#, fuzzy
+msgid "Connect to Other Wireless Network"
+msgstr "Autres réseaux sans fil..."
+
+#: ../gnome/applet/passphrase-dialog.c:215
+#, fuzzy
+msgid "Error connecting to wireless network"
+msgstr "Connexion au réseau sans fil « %s »..."
+
+#: ../gnome/applet/passphrase-dialog.c:216
+msgid ""
+"The requested wireless network requires security capabilities unsupported by "
+"your hardware."
+msgstr ""
+
+#: ../gnome/applet/vpn-password-dialog.c:151
+#: ../gnome/applet/vpn-password-dialog.c:188
+#, c-format
+msgid "Cannot start VPN connection '%s'"
+msgstr ""
+
+#: ../gnome/applet/vpn-password-dialog.c:154
+#, c-format
+msgid ""
+"Could not find the authentication dialog for VPN connection type '%s'. "
+"Contact your system administrator."
+msgstr ""
+
+#: ../gnome/applet/vpn-password-dialog.c:191
+#, c-format
+msgid ""
+"There was a problem launching the authentication dialog for VPN connection "
+"type '%s'. Contact your system administrator."
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:1
+msgid " "
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:2
+#, fuzzy
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
+msgstr "<span weight=\"bold\">Réseaux sans fil :</span>"
+
+#: ../gnome/applet/applet.glade.h:4
+#, no-c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
+"Network</span>\n"
+"\n"
+"A passphrase or encryption key is required to access the wireless network '%"
+"s'."
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Phrase de passe requise par le réseau "
+"sans fil</span>\n"
+"\n"
+"Une phrase de passe ou une clé de chiffrement est requise pour accéder au "
+"réseau sans fil « %s »."
+
+#: ../gnome/applet/applet.glade.h:8
+#, no-c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
+"\n"
+"%s  It will not be completely functional."
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:12
+#, no-c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
+"span>\n"
+"\n"
+"You have chosen to log in to the wireless network '%s'.  If you are sure "
+"that this wireless network is secure, click the checkbox below and "
+"NetworkManager will not require confirmation on subsequent log ins."
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:15
+msgid "Anonymous Identity:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:16
+#, fuzzy
+msgid "Authentication:"
 msgstr "Orientation"
 
-#: examples/python/systray/eggtrayicon.c:112
-msgid "The orientation of the tray."
-msgstr "L'orientation de la zone de notification."
+#: ../gnome/applet/applet.glade.h:17
+msgid "Broadcast Address:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:18
+msgid "CA Certificate File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:19
+msgid "C_onnect"
+msgstr "Se _connecter"
+
+#: ../gnome/applet/applet.glade.h:20
+msgid "Client Certificate File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:21
+msgid "Connection Information"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:22
+msgid "Default Route:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:23
+msgid "Destination Address:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:24
+msgid "Driver:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:25
+msgid "EAP Method:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:26
+msgid "Hardware Address:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:27
+msgid "IP Address:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:28
+msgid "Identity:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:29
+msgid "Interface:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:30
+msgid "Key Type:"
+msgstr "Type de clé :"
+
+#: ../gnome/applet/applet.glade.h:31
+#, fuzzy
+msgid "Key:"
+msgstr "Clé hexa :"
+
+#: ../gnome/applet/applet.glade.h:32
+msgid ""
+"None\n"
+"WEP 128-bit Passphrase\n"
+"WEP 64/128-bit Hex\n"
+"WEP 64/128-bit ASCII\n"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:37
+msgid ""
+"Open System\n"
+"Shared Key"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:39
+#, fuzzy
+msgid "Other Wireless Network..."
+msgstr "Autres réseaux sans fil..."
+
+#: ../gnome/applet/applet.glade.h:40
+msgid "Passphrase:"
+msgstr "Phrase de passe :"
+
+#: ../gnome/applet/applet.glade.h:41
+msgid "Password:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:42
+msgid "Primary DNS:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:43
+msgid "Private Key File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:44
+msgid "Private Key Password:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:45
+msgid "Secondary DNS:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:46
+msgid "Select the CA Certificate File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:47
+msgid "Select the Client Certificate File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:48
+msgid "Select the Private Key File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:49
+msgid "Show key"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:50
+#, fuzzy
+msgid "Show passphrase"
+msgstr "Phrase de passe :"
+
+#: ../gnome/applet/applet.glade.h:51
+msgid "Show password"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:52
+msgid "Show passwords"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:53
+msgid "Speed:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:54
+msgid "Subnet Mask:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:55
+#, fuzzy
+msgid "Type:"
+msgstr "Type de clé :"
+
+#: ../gnome/applet/applet.glade.h:56
+msgid "User Name:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:57
+msgid "Wireless Network Key Required"
+msgstr "Clef requise par le réseau sans fil"
+
+#: ../gnome/applet/applet.glade.h:58
+msgid "Wireless _adapter:"
+msgstr "_Adaptateur sans fil :"
+
+#: ../gnome/applet/applet.glade.h:59
+#, fuzzy
+msgid "_Always Trust this Wireless Network"
+msgstr "Réseau sans fil"
+
+#: ../gnome/applet/applet.glade.h:60
+msgid "_Don't remind me again"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:61
+msgid "_Login to Network"
+msgstr "_Connexion au réseau"
+
+#: ../gnome/applet/applet.glade.h:62
+msgid "_Network Name:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:63
+#, fuzzy
+msgid "_Wireless Security:"
+msgstr "_Adaptateur sans fil :"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:383
+msgid "Cannot add VPN connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:385
+msgid ""
+"No suitable VPN software was found on your system. Contact your system "
+"administrator."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:437
+#, fuzzy
+msgid "Cannot import VPN connection"
+msgstr "Aucune connexion réseau"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:439
+#, c-format
+msgid ""
+"Cannot find suitable software for VPN connection type '%s' to import the "
+"file '%s'. Contact your system administrator."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:579
+#, c-format
+msgid "Error retrieving VPN connection '%s'"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:582
+#, c-format
+msgid ""
+"Could not find the UI files for VPN connection type '%s'. Contact your "
+"system administrator."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:739
+#, c-format
+msgid "Delete VPN connection \"%s\"?"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:742
+#, c-format
+msgid ""
+"All information about the VPN connection \"%s\" will be lost and you may "
+"need your system administrator to provide information to create a new "
+"connection."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:959
+msgid "Unable to load"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:961
+#, fuzzy
+msgid "Cannot find some needed resources (the glade file)!"
+msgstr ""
+"L'applet NetworkManager n'a pas pu trouver les ressources requises (le "
+"fichier glade n'a pas été trouvé)."
+
+#. Edit dialog
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
+msgid "Edit VPN Connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:1
+#, fuzzy
+msgid "Add a new VPN connection"
+msgstr "Aucune connexion réseau"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:2
+msgid "Choose which type of VPN connection you wish to create."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
+#, fuzzy
+msgid "Connect to:"
+msgstr "Se _connecter"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
+msgid "Create VPN Connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
+msgid "Create VPN Connection - 1 of 2"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
+msgid "Create VPN Connection - 2 of 2"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
+msgid "Delete the selected VPN connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
+msgid "E_xport"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:9
+msgid "Edit the selected VPN connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:10
+msgid "Export the VPN settings to a file"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:11
+msgid "Export the selected VPN connection to a file"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:12
+msgid "Finish Creating VPN Connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:13
+#, fuzzy
+msgid "Manage Virtual Private Network Connections"
+msgstr "Connexion réseau sans fil"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:14
+msgid ""
+"This assistant will guide you through the creation of a connection to a "
+"Virtual Private Network (VPN).\n"
+"\n"
+"It will require some information, such as IP addresses and secrets.  Please "
+"see your system administrator to obtain this information."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:17
+#, fuzzy
+msgid "VPN Connections"
+msgstr "Aucune connexion réseau"
+
+#: ../src/nm-ap-security-wep.c:52
+msgid "40-bit WEP"
+msgstr ""
+
+#: ../src/nm-ap-security-wep.c:54
+msgid "104-bit WEP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:50
+msgid "WPA TKIP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:52
+msgid "WPA CCMP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:54
+msgid "WPA Automatic"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:59
+msgid "WPA2 TKIP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:61
+msgid "WPA2 CCMP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:63
+msgid "WPA2 Automatic"
+msgstr ""
+
+#: ../src/nm-ap-security.c:320
+msgid "none"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:154
+#, c-format
+msgid ""
+"unable to create netlink socket for monitoring wired ethernet devices - %s"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:172
+#, c-format
+msgid ""
+"unable to bind to netlink socket for monitoring wired ethernet devices - %s"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:405
+msgid "operation took too long"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:502
+msgid "received data from wrong type of sender"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:515
+msgid "received data from unexpected sender"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:646
+msgid "too much data was sent over socket and some of it was lost"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:735
+msgid "error occurred while waiting for data on socket"
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:898
+#, fuzzy, c-format
+msgid "You are now connected to the Ad-Hoc wireless network '%s'."
+msgstr "Connecté à un réseau sans fil Ad-Hoc"
+
+#: ../gnome/applet/applet-dbus-devices.c:903
+#, fuzzy, c-format
+msgid "You are now connected to the wireless network '%s'."
+msgstr "Connexion au réseau sans fil « %s »..."
+
+#: ../gnome/applet/applet-dbus-devices.c:910
+#, fuzzy
+msgid "You are now connected to the wired network."
+msgstr "Connexion à un réseau sans fil..."
+
+#: ../gnome/applet/applet-dbus-devices.c:916
+#, fuzzy
+msgid "Connection Established"
+msgstr "Se connecter avec le chiffrement activé"
+
+#: ../gnome/applet/applet-dbus-devices.c:959
+msgid "Disconnected"
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:960
+msgid "The network connection has been disconnected."
+msgstr ""
+
+#~ msgid "Modify Wireless Networks"
+#~ msgstr "Modifier les réseaux sans fil"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid ""
+#~ "128-bit Passphrase (WEP)\n"
+#~ "Ascii Key (WEP)\n"
+#~ "Hex Key (WEP)"
+#~ msgstr ""
+#~ "Phrase de passe 128 bit (WEP)\n"
+#~ "Clé ASCII (WEP)\n"
+#~ "Clé hexa (WEP)"
+
+#~ msgid "Ascii Key:"
+#~ msgstr "Clé ASCII :"
+
+#~ msgid "You must log in to access the private network %s"
+#~ msgstr "Vous devez vous connecter pour accéder au réseau privé %s"
+
+#~ msgid "(C) 2004-2005 by Red Hat, Inc."
+#~ msgstr "© 2004-2005 by Red Hat, Inc."
+
+#~ msgid "Scanning for wireless networks..."
+#~ msgstr "Recherche de réseaux sans fil..."
+
+#~ msgid "Pause Wireless Scanning"
+#~ msgstr "Interrompre la recherche de réseau sans fil"
+
+#~ msgid "Resume Wireless Scanning"
+#~ msgstr "Reprendre la recherche de réseau sans fil"
+
+#~ msgid "Stop All Wireless Devices"
+#~ msgstr "Arrêter tous les périphériques sans fil"
+
+#~ msgid "Start All Wireless Devices"
+#~ msgstr "Démarrer tous les périphériques sans fil"
+
+#~ msgid "Stop automatically running the networking applet?"
+#~ msgstr "Arrêter l'exécution automatique de l'applet réseau ?"
+
+#~ msgid ""
+#~ "The networking applet will now terminate, but will automatically launch "
+#~ "the next time you login.  Would you like to stop automatically running "
+#~ "the networking applet on login?"
+#~ msgstr ""
+#~ "L'applet réseau va se terminer, mais elle démarrera automatiquement la "
+#~ "prochaine fois que vous vous loguerez. Voulez-vous arrêter l'exécution "
+#~ "automatique de l'applet réseau lors du login ?"
+
+#~ msgid "_Remove"
+#~ msgstr "_Supprimer"
diff --git a/po/gu.po b/po/gu.po
index b44ba6256b..0303792ef8 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-19 13:38-0400\n"
+"POT-Creation-Date: 2006-05-29 18:33+0200\n"
 "PO-Revision-Date: 2004-09-09 14:24+0530\n"
 "Last-Translator: Ankit Patel <ankit@redhat.com>\n"
 "Language-Team: Gujarati\n"
@@ -18,141 +18,957 @@ msgstr ""
 "Plural-Forms: Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "\n"
 
-#: info-daemon/networks.glade:11
-msgid "Modify Wireless Networks"
-msgstr "વાયરલેસ નેટવર�કો સ�ધારો"
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:919
+#, fuzzy, c-format
+msgid "Passphrase for wireless network %s"
+msgstr "ત�યાં કોઈ વાયરલેસ નેટવર�ક નથી..."
 
-#: info-daemon/networks.glade:92
-msgid "<span weight=\"bold\">Wireless Networks:</span>"
-msgstr "<span weight=\"bold\">વાયરલેસ નેટવર�કો:</span>"
+#: ../gnome/applet/applet-dbus.c:265
+#, c-format
+msgid "Connection to the wireless network '%s' failed."
+msgstr ""
 
-#: info-daemon/passphrase.glade:9
-msgid "Wireless Network Key Required"
-msgstr "વાયરલેસ નેટવર�ક કી જર�રી છે"
+#: ../gnome/applet/applet-dbus.c:270
+msgid "Connection to the wired network failed."
+msgstr ""
 
-#: info-daemon/passphrase.glade:52
-msgid "_Login to Network"
-msgstr "નેટવર�કમાં પ�રવેશો (_L)"
+#: ../gnome/applet/applet.c:184
+msgid "Error displaying connection information:"
+msgstr ""
+
+#: ../gnome/applet/applet.c:202
+#, fuzzy
+msgid "Could not find some required resources (the glade file)!"
+msgstr "નેટવર�ક વ�યવસ�થાપક �પ�લેટ અમ�ક જર�રી સ�રોતો શોધી શકી નહિં (glade ફાઈલ મળી નથી)."
+
+#: ../gnome/applet/applet.c:213
+#, fuzzy
+msgid "No active connections!"
+msgstr "નેટવર�ક જોડાણો"
 
-#: info-daemon/passphrase.glade:100
+#: ../gnome/applet/applet.c:234
+#, fuzzy, c-format
+msgid "Wired Ethernet (%s)"
+msgstr "વાયરલેસ નેટવર�કો"
+
+#: ../gnome/applet/applet.c:236
+#, fuzzy, c-format
+msgid "Wireless Ethernet (%s)"
+msgstr "વાયરલેસ નેટવર�કો"
+
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:362
 #, fuzzy
+msgid "NetworkManager Applet"
+msgstr "નેટવર�ક વ�યવસ�થાપક ચાલત�ં નથી..."
+
+#: ../gnome/applet/applet.c:339 ../gnome/applet/applet.c:364
+msgid "Copyright © 2004-2005 Red Hat, Inc."
+msgstr ""
+
+#: ../gnome/applet/applet.c:340 ../gnome/applet/applet.c:365
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
-"Network</span>\n"
-"\n"
-"A passphrase or encryption key is required to access the wireless network '%"
-"s'."
+"Notification area applet for managing your network devices and connections."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">વાયરલેસ નેટવર�ક દ�વારા પાસફ�રે� જર�રી છે</"
-"span>\n"
-"\n"
-"પાસફ�રે� અથવા WEP કી � વાયરલેસ નેટવર�ક '%s' ને ચલાવવા માટે જર�રી છે."
 
-#: info-daemon/passphrase.glade:129
-msgid "Key Type:"
+#: ../gnome/applet/applet.c:343 ../gnome/applet/applet.c:370
+msgid "translator-credits"
+msgstr ""
+
+#: ../gnome/applet/applet.c:426
+msgid "VPN Login Failure"
+msgstr ""
+
+#: ../gnome/applet/applet.c:427
+#, c-format
+msgid "Could not start the VPN connection '%s' due to a login failure."
 msgstr ""
 
-#: info-daemon/passphrase.glade:150
+#: ../gnome/applet/applet.c:431
+msgid "VPN Start Failure"
+msgstr ""
+
+#: ../gnome/applet/applet.c:432
+#, c-format
 msgid ""
-"128-bit Passphrase\n"
-"128-bit Raw Hex Key"
+"Could not start the VPN connection '%s' due to a failure launching the VPN "
+"program."
 msgstr ""
 
-#: info-daemon/passphrase.glade:180
-#: info-daemon/NetworkManagerInfoPassphraseDialog.c:101
-msgid "Passphrase:"
-msgstr "પાસફ�રે�:"
+#: ../gnome/applet/applet.c:436 ../gnome/applet/applet.c:446
+msgid "VPN Connect Failure"
+msgstr ""
 
-#: info-daemon/passphrase.glade:208 panel-applet/essid.glade:162
-msgid "*"
-msgstr "*"
+#: ../gnome/applet/applet.c:437
+#, c-format
+msgid "Could not start the VPN connection '%s' due to a connection error."
+msgstr ""
 
-#: info-daemon/NetworkManagerInfoPassphraseDialog.c:104
-msgid "Key:"
+#: ../gnome/applet/applet.c:441
+msgid "VPN Configuration Error"
 msgstr ""
 
-#. Reuse the above string to make the translators less angry.
-#: panel-applet/NMWirelessApplet.c:691 panel-applet/NMWirelessApplet.c:701
+#: ../gnome/applet/applet.c:442
+#, c-format
+msgid "The VPN connection '%s' was not correctly configured."
+msgstr ""
+
+#: ../gnome/applet/applet.c:447
+#, c-format
+msgid ""
+"Could not start the VPN connection '%s' because the VPN server did not "
+"return an adequate network configuration."
+msgstr ""
+
+#: ../gnome/applet/applet.c:517
+msgid "VPN Login Message"
+msgstr ""
+
+#: ../gnome/applet/applet.c:741 ../gnome/applet/applet.c:2508
+#: ../gnome/applet/other-network-dialog.c:453
+#: ../gnome/applet/passphrase-dialog.c:228
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
 msgstr "નેટવર�ક વ�યવસ�થાપક �પ�લેટ અમ�ક જર�રી સ�રોતો શોધી શકી નહિં (glade ફાઈલ મળી નથી)."
 
-#: panel-applet/NMWirelessApplet.c:716
+#: ../gnome/applet/applet.c:753
+#, c-format
+msgid "The network device \"%s (%s)\" does not support wireless scanning."
+msgstr ""
+
+#: ../gnome/applet/applet.c:761
+#, c-format
+msgid "The network device \"%s (%s)\" does not support link detection."
+msgstr ""
+
+#: ../gnome/applet/applet.c:908
+#, c-format
+msgid "Preparing device %s for the wired network..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:910
+#, fuzzy, c-format
+msgid "Preparing device %s for the wireless network '%s'..."
+msgstr "ત�યાં કોઈ વાયરલેસ નેટવર�ક નથી..."
+
+#: ../gnome/applet/applet.c:918
+#, c-format
+msgid "Configuring device %s for the wired network..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:920
+#, fuzzy, c-format
+msgid "Attempting to join the wireless network '%s'..."
+msgstr "ત�યાં કોઈ વાયરલેસ નેટવર�ક નથી..."
+
+#: ../gnome/applet/applet.c:928
+#, fuzzy, c-format
+msgid "Waiting for Network Key for the wireless network '%s'..."
+msgstr "ત�યાં કોઈ વાયરલેસ નેટવર�ક નથી..."
+
+#: ../gnome/applet/applet.c:936 ../gnome/applet/applet.c:946
+msgid "Requesting a network address from the wired network..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:938 ../gnome/applet/applet.c:948
+#, fuzzy, c-format
+msgid "Requesting a network address from the wireless network '%s'..."
+msgstr "ત�યાં કોઈ વાયરલેસ નેટવર�ક નથી..."
+
+#: ../gnome/applet/applet.c:956
+msgid "Finishing connection to the wired network..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:958
+#, fuzzy, c-format
+msgid "Finishing connection to the wireless network '%s'..."
+msgstr "ત�યાં કોઈ વાયરલેસ નેટવર�ક નથી..."
+
+#: ../gnome/applet/applet.c:1075
+#, fuzzy
+msgid "NetworkManager is not running"
+msgstr "નેટવર�ક વ�યવસ�થાપક ચાલત�ં નથી..."
+
+#: ../gnome/applet/applet.c:1083 ../gnome/applet/applet.c:1828
+msgid "Networking disabled"
+msgstr ""
+
+#: ../gnome/applet/applet.c:1088
+#, fuzzy
+msgid "No network connection"
+msgstr "નેટવર�ક જોડાણો"
+
+#: ../gnome/applet/applet.c:1093
+#, fuzzy
+msgid "Wired network connection"
+msgstr "નેટવર�ક જોડાણો"
+
+#: ../gnome/applet/applet.c:1097
 #, fuzzy
-msgid "Custom wireless network"
+msgid "Connected to an Ad-Hoc wireless network"
 msgstr "વાયરલેસ નેટવર�કો"
 
-#: panel-applet/NMWirelessApplet.c:717
-msgid "Enter the ESSID of the wireless network to which you wish to connect."
+#: ../gnome/applet/applet.c:1099
+#, fuzzy, c-format
+msgid "Wireless network connection to '%s' (%d%%)"
+msgstr "વાયરલેસ નેટવર�કો"
+
+#: ../gnome/applet/applet.c:1120
+#, c-format
+msgid "VPN connection to '%s'"
 msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:800
+#: ../gnome/applet/applet.c:1128
+#, c-format
+msgid "VPN connecting to '%s'"
+msgstr ""
+
+#: ../gnome/applet/applet.c:1541
+#, fuzzy
+msgid "_Connect to Other Wireless Network..."
+msgstr "વાયરલેસ નેટવર�કો"
+
+#: ../gnome/applet/applet.c:1562
 #, fuzzy
-msgid "Other Wireless Networks..."
+msgid "Create _New Wireless Network..."
 msgstr "વાયરલેસ નેટવર�કો"
 
-#: panel-applet/NMWirelessApplet.c:911
+#: ../gnome/applet/applet.c:1685
+#, fuzzy
+msgid "_VPN Connections"
+msgstr "નેટવર�ક જોડાણો"
+
+#: ../gnome/applet/applet.c:1730
+msgid "_Configure VPN..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1734
+msgid "_Disconnect VPN..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1756
+#, fuzzy
+msgid "_Dial Up Connections"
+msgstr "નેટવર�ક જોડાણો"
+
+#. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
+#: ../gnome/applet/applet.c:1767
+#, c-format
+msgid "Connect to %s..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1773
+#, c-format
+msgid "Disconnect from %s..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1822
 msgid "No network devices have been found"
 msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:1028
+#: ../gnome/applet/applet.c:2014
 msgid "NetworkManager is not running..."
 msgstr "નેટવર�ક વ�યવસ�થાપક ચાલત�ં નથી..."
 
-#: panel-applet/essid.glade:52
-msgid "C_onnect"
+#. 'Enable Networking' item
+#: ../gnome/applet/applet.c:2170
+#, fuzzy
+msgid "Enable _Networking"
+msgstr "વાયરલેસ નેટવર�કો"
+
+#. 'Enable Wireless' item
+#: ../gnome/applet/applet.c:2176
+msgid "Enable _Wireless"
+msgstr ""
+
+#. 'Connection Information' item
+#: ../gnome/applet/applet.c:2182
+msgid "Connection _Information"
+msgstr ""
+
+#. Help item
+#: ../gnome/applet/applet.c:2193
+msgid "_Help"
 msgstr ""
 
-#: panel-applet/essid.glade:131
+#. About item
+#: ../gnome/applet/applet.c:2202
 #, fuzzy
-msgid "Wireless _Network:"
-msgstr "વાયરલેસ નેટવર�કો"
+msgid "_About"
+msgstr "વિશે (_A)..."
 
-#: panel-applet/essid.glade:177
+#: ../gnome/applet/applet.c:2667
 #, fuzzy
-msgid "Wireless _adapter:"
-msgstr "વાયરલેસ નેટવર�કો"
+msgid ""
+"The NetworkManager applet could not find some required resources.  It cannot "
+"continue.\n"
+msgstr "નેટવર�ક વ�યવસ�થાપક �પ�લેટ અમ�ક જર�રી સ�રોતો શોધી શકી નહિં (glade ફાઈલ મળી નથી)."
+
+#: ../gnome/applet/wireless-security-option.c:157
+msgid "Open System"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:160
+msgid "Shared Key"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:208
+msgid "Automatic (Default)"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:215
+msgid "AES-CCMP"
+msgstr ""
 
-#: panel-applet/menu-info.c:101
+#: ../gnome/applet/wireless-security-option.c:223
+msgid "TKIP"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:231
+msgid "Dynamic WEP"
+msgstr ""
+
+#: ../gnome/applet/wso-none.c:53
+msgid "None"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-ascii.c:138
+msgid "WEP 64/128-bit ASCII"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-hex.c:135
+msgid "WEP 64/128-bit Hex"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-passphrase.c:135
+#, fuzzy
+msgid "WEP 128-bit Passphrase"
+msgstr "પાસફ�રે�:"
+
+#: ../gnome/applet/wso-wpa-eap.c:237
+msgid "PEAP"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:238
+msgid "TLS"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:239
+msgid "TTLS"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
+#: ../src/nm-ap-security-wpa-eap.c:116
+msgid "WPA2 Enterprise"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
+#: ../src/nm-ap-security-wpa-eap.c:121
+msgid "WPA Enterprise"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-psk.c:178
+msgid "WPA2 Personal"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-psk.c:180
+msgid "WPA Personal"
+msgstr ""
+
+#: ../gnome/applet/eggtrayicon.c:134
+msgid "Orientation"
+msgstr ""
+
+#: ../gnome/applet/eggtrayicon.c:135
+msgid "The orientation of the tray."
+msgstr ""
+
+#: ../gnome/applet/menu-items.c:88
 #, fuzzy, c-format
 msgid "Wired Network (%s)"
 msgstr "વાયરલેસ નેટવર�કો"
 
-#: panel-applet/menu-info.c:103
+#: ../gnome/applet/menu-items.c:91
 #, fuzzy
-msgid "Wired Network"
+msgid "_Wired Network"
 msgstr "વાયરલેસ નેટવર�કો"
 
-#: panel-applet/menu-info.c:168
+#: ../gnome/applet/menu-items.c:162
 #, fuzzy, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
 msgstr[0] "વાયરલેસ નેટવર�કો"
 msgstr[1] "વાયરલેસ નેટવર�કો"
 
-#: panel-applet/menu-info.c:170
+#: ../gnome/applet/menu-items.c:164
 #, fuzzy
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "વાયરલેસ નેટવર�કો"
 msgstr[1] "વાયરલેસ નેટવર�કો"
 
-#: panel-applet/menu-info.c:307
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr ""
 
-#: examples/python/systray/eggtrayicon.c:111
-msgid "Orientation"
+#: ../gnome/applet/other-network-dialog.c:352
+#, c-format
+msgid ""
+"By default, the wireless network's name is set to your computer's name, %s, "
+"with no encryption enabled"
 msgstr ""
 
-#: examples/python/systray/eggtrayicon.c:112
-msgid "The orientation of the tray."
+#: ../gnome/applet/other-network-dialog.c:358
+#, fuzzy
+msgid "Create new wireless network"
+msgstr "ત�યાં કોઈ વાયરલેસ નેટવર�ક નથી..."
+
+#: ../gnome/applet/other-network-dialog.c:359
+msgid ""
+"Enter the name and security settings of the wireless network you wish to "
+"create."
+msgstr ""
+
+#: ../gnome/applet/other-network-dialog.c:363
+#, fuzzy
+msgid "Create New Wireless Network"
+msgstr "વાયરલેસ નેટવર�કો"
+
+#: ../gnome/applet/other-network-dialog.c:368
+#, fuzzy
+msgid "Existing wireless network"
+msgstr "વાયરલેસ નેટવર�કો"
+
+#: ../gnome/applet/other-network-dialog.c:369
+msgid "Enter the name of the wireless network to which you wish to connect."
+msgstr ""
+
+#: ../gnome/applet/other-network-dialog.c:371
+#, fuzzy
+msgid "Connect to Other Wireless Network"
+msgstr "વાયરલેસ નેટવર�કો"
+
+#: ../gnome/applet/passphrase-dialog.c:215
+#, fuzzy
+msgid "Error connecting to wireless network"
+msgstr "વાયરલેસ નેટવર�કો"
+
+#: ../gnome/applet/passphrase-dialog.c:216
+msgid ""
+"The requested wireless network requires security capabilities unsupported by "
+"your hardware."
+msgstr ""
+
+#: ../gnome/applet/vpn-password-dialog.c:151
+#: ../gnome/applet/vpn-password-dialog.c:188
+#, c-format
+msgid "Cannot start VPN connection '%s'"
+msgstr ""
+
+#: ../gnome/applet/vpn-password-dialog.c:154
+#, c-format
+msgid ""
+"Could not find the authentication dialog for VPN connection type '%s'. "
+"Contact your system administrator."
+msgstr ""
+
+#: ../gnome/applet/vpn-password-dialog.c:191
+#, c-format
+msgid ""
+"There was a problem launching the authentication dialog for VPN connection "
+"type '%s'. Contact your system administrator."
 msgstr ""
 
+#: ../gnome/applet/applet.glade.h:1
+msgid " "
+msgstr " "
+
+#: ../gnome/applet/applet.glade.h:2
+#, fuzzy
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
+msgstr "<span weight=\"bold\">વાયરલેસ નેટવર�કો:</span>"
+
+#: ../gnome/applet/applet.glade.h:4
+#, fuzzy, no-c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
+"Network</span>\n"
+"\n"
+"A passphrase or encryption key is required to access the wireless network '%"
+"s'."
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">વાયરલેસ નેટવર�ક દ�વારા પાસફ�રે� જર�રી છે</"
+"span>\n"
+"\n"
+"પાસફ�રે� અથવા WEP કી � વાયરલેસ નેટવર�ક '%s' ને ચલાવવા માટે જર�રી છે."
+
+#: ../gnome/applet/applet.glade.h:8
+#, no-c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
+"\n"
+"%s  It will not be completely functional."
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:12
+#, fuzzy, no-c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
+"span>\n"
+"\n"
+"You have chosen to log in to the wireless network '%s'.  If you are sure "
+"that this wireless network is secure, click the checkbox below and "
+"NetworkManager will not require confirmation on subsequent log ins."
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">વાયરલેસ નેટવર�ક પ�રવેશ ખાતરી</span>\n"
+"\n"
+"તમે વાયરલેસ નેટવર�ક '%s' માં પ�રવેશવાન�ં પસંદ કરેલ છે.  જો તમે ચોક�કસ હોયકે આ વાયરલેસ નેટવર�ક "
+"સ�રક�ષિત છે, તો નીચેના ચકાસણીબોક�સમાં ક�લિક કરો અને નેટવર�ક વ�યવસ�થાપક તમને લાંબા સમય સ�ધી "
+"નકામા પ�રશ�નો પૂછવા માટે સમર�થ નહિં હોય તેની સાથે જોડાવા માટે."
+
+#: ../gnome/applet/applet.glade.h:15
+msgid "Anonymous Identity:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:16
+msgid "Authentication:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:17
+msgid "Broadcast Address:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:18
+msgid "CA Certificate File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:19
+msgid "C_onnect"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:20
+msgid "Client Certificate File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:21
+msgid "Connection Information"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:22
+msgid "Default Route:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:23
+msgid "Destination Address:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:24
+msgid "Driver:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:25
+msgid "EAP Method:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:26
+msgid "Hardware Address:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:27
+msgid "IP Address:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:28
+msgid "Identity:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:29
+msgid "Interface:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:30
+msgid "Key Type:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:31
+msgid "Key:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:32
+msgid ""
+"None\n"
+"WEP 128-bit Passphrase\n"
+"WEP 64/128-bit Hex\n"
+"WEP 64/128-bit ASCII\n"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:37
+msgid ""
+"Open System\n"
+"Shared Key"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:39
+#, fuzzy
+msgid "Other Wireless Network..."
+msgstr "વાયરલેસ નેટવર�કો"
+
+#: ../gnome/applet/applet.glade.h:40
+msgid "Passphrase:"
+msgstr "પાસફ�રે�:"
+
+#: ../gnome/applet/applet.glade.h:41
+msgid "Password:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:42
+msgid "Primary DNS:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:43
+msgid "Private Key File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:44
+msgid "Private Key Password:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:45
+msgid "Secondary DNS:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:46
+msgid "Select the CA Certificate File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:47
+msgid "Select the Client Certificate File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:48
+msgid "Select the Private Key File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:49
+msgid "Show key"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:50
+#, fuzzy
+msgid "Show passphrase"
+msgstr "પાસફ�રે�:"
+
+#: ../gnome/applet/applet.glade.h:51
+msgid "Show password"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:52
+msgid "Show passwords"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:53
+msgid "Speed:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:54
+msgid "Subnet Mask:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:55
+msgid "Type:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:56
+msgid "User Name:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:57
+msgid "Wireless Network Key Required"
+msgstr "વાયરલેસ નેટવર�ક કી જર�રી છે"
+
+#: ../gnome/applet/applet.glade.h:58
+#, fuzzy
+msgid "Wireless _adapter:"
+msgstr "વાયરલેસ નેટવર�કો"
+
+#: ../gnome/applet/applet.glade.h:59
+#, fuzzy
+msgid "_Always Trust this Wireless Network"
+msgstr "હંમેશા આ વાયરલેસ નેટવર�કનો વિશ�વાસ કરો"
+
+#: ../gnome/applet/applet.glade.h:60
+msgid "_Don't remind me again"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:61
+msgid "_Login to Network"
+msgstr "નેટવર�કમાં પ�રવેશો (_L)"
+
+#: ../gnome/applet/applet.glade.h:62
+msgid "_Network Name:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:63
+#, fuzzy
+msgid "_Wireless Security:"
+msgstr "વાયરલેસ નેટવર�કો"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:383
+msgid "Cannot add VPN connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:385
+msgid ""
+"No suitable VPN software was found on your system. Contact your system "
+"administrator."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:437
+msgid "Cannot import VPN connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:439
+#, c-format
+msgid ""
+"Cannot find suitable software for VPN connection type '%s' to import the "
+"file '%s'. Contact your system administrator."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:579
+#, c-format
+msgid "Error retrieving VPN connection '%s'"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:582
+#, c-format
+msgid ""
+"Could not find the UI files for VPN connection type '%s'. Contact your "
+"system administrator."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:739
+#, c-format
+msgid "Delete VPN connection \"%s\"?"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:742
+#, c-format
+msgid ""
+"All information about the VPN connection \"%s\" will be lost and you may "
+"need your system administrator to provide information to create a new "
+"connection."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:959
+msgid "Unable to load"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:961
+#, fuzzy
+msgid "Cannot find some needed resources (the glade file)!"
+msgstr "નેટવર�ક વ�યવસ�થાપક �પ�લેટ અમ�ક જર�રી સ�રોતો શોધી શકી નહિં (glade ફાઈલ મળી નથી)."
+
+#. Edit dialog
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
+#, fuzzy
+msgid "Edit VPN Connection"
+msgstr "નેટવર�ક જોડાણો"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:1
+msgid "Add a new VPN connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:2
+msgid "Choose which type of VPN connection you wish to create."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
+msgid "Connect to:"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
+#, fuzzy
+msgid "Create VPN Connection"
+msgstr "નેટવર�ક જોડાણો"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
+msgid "Create VPN Connection - 1 of 2"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
+msgid "Create VPN Connection - 2 of 2"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
+msgid "Delete the selected VPN connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
+msgid "E_xport"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:9
+msgid "Edit the selected VPN connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:10
+msgid "Export the VPN settings to a file"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:11
+msgid "Export the selected VPN connection to a file"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:12
+msgid "Finish Creating VPN Connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:13
+#, fuzzy
+msgid "Manage Virtual Private Network Connections"
+msgstr "નેટવર�ક જોડાણો"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:14
+msgid ""
+"This assistant will guide you through the creation of a connection to a "
+"Virtual Private Network (VPN).\n"
+"\n"
+"It will require some information, such as IP addresses and secrets.  Please "
+"see your system administrator to obtain this information."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:17
+#, fuzzy
+msgid "VPN Connections"
+msgstr "નેટવર�ક જોડાણો"
+
+#: ../src/nm-ap-security-wep.c:52
+msgid "40-bit WEP"
+msgstr ""
+
+#: ../src/nm-ap-security-wep.c:54
+msgid "104-bit WEP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:50
+msgid "WPA TKIP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:52
+msgid "WPA CCMP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:54
+msgid "WPA Automatic"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:59
+msgid "WPA2 TKIP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:61
+msgid "WPA2 CCMP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:63
+msgid "WPA2 Automatic"
+msgstr ""
+
+#: ../src/nm-ap-security.c:320
+msgid "none"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:154
+#, c-format
+msgid ""
+"unable to create netlink socket for monitoring wired ethernet devices - %s"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:172
+#, c-format
+msgid ""
+"unable to bind to netlink socket for monitoring wired ethernet devices - %s"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:405
+msgid "operation took too long"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:502
+msgid "received data from wrong type of sender"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:515
+msgid "received data from unexpected sender"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:646
+msgid "too much data was sent over socket and some of it was lost"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:735
+msgid "error occurred while waiting for data on socket"
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:898
+#, c-format
+msgid "You are now connected to the Ad-Hoc wireless network '%s'."
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:903
+#, fuzzy, c-format
+msgid "You are now connected to the wireless network '%s'."
+msgstr "ત�યાં કોઈ વાયરલેસ નેટવર�ક નથી..."
+
+#: ../gnome/applet/applet-dbus-devices.c:910
+msgid "You are now connected to the wired network."
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:916
+msgid "Connection Established"
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:959
+msgid "Disconnected"
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:960
+#, fuzzy
+msgid "The network connection has been disconnected."
+msgstr "કોઈ નેટવર�ક જોડાણો વર�તમાનમાં સક�રિય નથી..."
+
+#~ msgid "Modify Wireless Networks"
+#~ msgstr "વાયરલેસ નેટવર�કો સ�ધારો"
+
+#~ msgid "*"
+#~ msgstr "*"
+
 #~ msgid "There are no network devices..."
 #~ msgstr "ત�યાં કોઈ નેટવર�ક ઉપકરણો નથી..."
 
+#~ msgid "A wired network connection is currently active..."
+#~ msgstr "વાયરવાળ�ં નેટવર�ક જોડાણ વર�તમાનમાં સક�રિય છે..."
+
+#~ msgid "<span weight=\"bold\">Wireless Networks:</span>"
+#~ msgstr "<span weight=\"bold\">વાયરલેસ નેટવર�કો:</span>"
+
+#, fuzzy
+#~ msgid "Custom wireless network"
+#~ msgstr "વાયરલેસ નેટવર�કો"
+
+#, fuzzy
+#~ msgid "Other Wireless Networks..."
+#~ msgstr "વાયરલેસ નેટવર�કો"
+
+#, fuzzy
+#~ msgid "Wireless _Network:"
+#~ msgstr "વાયરલેસ નેટવર�કો"
+
+#, fuzzy
+#~ msgid "Wired Network"
+#~ msgstr "વાયરલેસ નેટવર�કો"
+
 #~ msgid "There are no wireless networks..."
 #~ msgstr "ત�યાં કોઈ વાયરલેસ નેટવર�ક નથી..."
 
@@ -162,15 +978,9 @@ msgstr ""
 #~ msgid "No network connection is currently active..."
 #~ msgstr "કોઈ નેટવર�ક જોડાણો વર�તમાનમાં સક�રિય નથી..."
 
-#~ msgid "A wired network connection is currently active..."
-#~ msgstr "વાયરવાળ�ં નેટવર�ક જોડાણ વર�તમાનમાં સક�રિય છે..."
-
 #~ msgid "_About..."
 #~ msgstr "વિશે (_A)..."
 
-#~ msgid " "
-#~ msgstr " "
-
 #~ msgid ""
 #~ "<span weight=\"bold\" size=\"larger\">Wireless Network Login "
 #~ "Confirmation</span>\n"
diff --git a/po/hr.po b/po/hr.po
index 3ddfd37d32..4ee2c7394d 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-04 17:28+0100\n"
+"POT-Creation-Date: 2006-05-29 18:33+0200\n"
 "PO-Revision-Date: 2005-02-04 01:08+0100\n"
 "Last-Translator: Tomislav Vujec <tvujec@redhat.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
@@ -16,205 +16,994 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: info-daemon/networks.glade:11
-msgid "Modify Wireless Networks"
-msgstr "Postavke beži�nih mreža"
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:919
+#, fuzzy, c-format
+msgid "Passphrase for wireless network %s"
+msgstr "Stvori novu be�i�nu mrežu"
 
-#: info-daemon/networks.glade:92
-msgid "<span weight=\"bold\">Wireless Networks:</span>"
-msgstr "<span weight=\"bold\">Beži�ne mreže:</span>"
+#: ../gnome/applet/applet-dbus.c:265
+#, fuzzy, c-format
+msgid "Connection to the wireless network '%s' failed."
+msgstr "Spajanje na beži�nu mrežu '%s'..."
 
-#: info-daemon/passphrase.glade:9
-msgid "Wireless Network Key Required"
-msgstr "Potreban je klju� beži�ne mreže"
+#: ../gnome/applet/applet-dbus.c:270
+#, fuzzy
+msgid "Connection to the wired network failed."
+msgstr "Spajanje na ži�anu mrežu..."
 
-#: info-daemon/passphrase.glade:52
-msgid "_Login to Network"
-msgstr "_Prijava na mrežu"
+#: ../gnome/applet/applet.c:184
+msgid "Error displaying connection information:"
+msgstr ""
+
+#: ../gnome/applet/applet.c:202
+#, fuzzy
+msgid "Could not find some required resources (the glade file)!"
+msgstr ""
+"NetworkManager ne može naći potrebne datoteke (glade datoteka nije "
+"pronađena)."
+
+#: ../gnome/applet/applet.c:213
+#, fuzzy
+msgid "No active connections!"
+msgstr "Nema spoja na mrežu"
 
-#: info-daemon/passphrase.glade:100
+#: ../gnome/applet/applet.c:234
+#, fuzzy, c-format
+msgid "Wired Ethernet (%s)"
+msgstr "Ži�ana mreža (%s)"
+
+#: ../gnome/applet/applet.c:236
+#, fuzzy, c-format
+msgid "Wireless Ethernet (%s)"
+msgstr "Beži�na mreža (%s)"
+
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:362
+#, fuzzy
+msgid "NetworkManager Applet"
+msgstr "NetworkManager nije pokrenut"
+
+#: ../gnome/applet/applet.c:339 ../gnome/applet/applet.c:364
+msgid "Copyright © 2004-2005 Red Hat, Inc."
+msgstr ""
+
+#: ../gnome/applet/applet.c:340 ../gnome/applet/applet.c:365
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
-"Network</span>\n"
-"\n"
-"A passphrase or encryption key is required to access the wireless network '%"
-"s'."
+"Notification area applet for managing your network devices and connections."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Potrebna je lozinka za beži�nu mrežu</"
-"span>\n"
-"\n"
-"Za pristup mreži '%s', potrebna je lozinka ili klju�."
 
-#: info-daemon/passphrase.glade:129 panel-applet/essid.glade:246
-msgid "Key Type:"
-msgstr "Tip klju�a:"
+#: ../gnome/applet/applet.c:343 ../gnome/applet/applet.c:370
+msgid "translator-credits"
+msgstr ""
+
+#: ../gnome/applet/applet.c:426
+msgid "VPN Login Failure"
+msgstr ""
 
-#: info-daemon/passphrase.glade:150 panel-applet/essid.glade:315
+#: ../gnome/applet/applet.c:427
+#, c-format
+msgid "Could not start the VPN connection '%s' due to a login failure."
+msgstr ""
+
+#: ../gnome/applet/applet.c:431
+msgid "VPN Start Failure"
+msgstr ""
+
+#: ../gnome/applet/applet.c:432
+#, c-format
 msgid ""
-"128-bit Passphrase (WEP)\n"
-"Ascii Key (WEP)\n"
-"Hex Key (WEP)"
+"Could not start the VPN connection '%s' due to a failure launching the VPN "
+"program."
 msgstr ""
-"128-bitna lozinka (WEP)\n"
-"Slov�ani klju� (WEP)\n"
-"Heksadecimalni klju� (WEP)"
 
-#: info-daemon/passphrase.glade:181
-#: info-daemon/NetworkManagerInfoPassphraseDialog.c:139
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:149
-#: panel-applet/essid.glade:270
-msgid "Passphrase:"
-msgstr "Lozinka:"
+#: ../gnome/applet/applet.c:436 ../gnome/applet/applet.c:446
+msgid "VPN Connect Failure"
+msgstr ""
 
-#: info-daemon/passphrase.glade:209 panel-applet/essid.glade:203
-#: panel-applet/essid.glade:300
-msgid "*"
-msgstr "*"
+#: ../gnome/applet/applet.c:437
+#, c-format
+msgid "Could not start the VPN connection '%s' due to a connection error."
+msgstr ""
 
-#: info-daemon/NetworkManagerInfoPassphraseDialog.c:142
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:152
-msgid "Ascii Key:"
-msgstr "Slov�ani klju�"
+#: ../gnome/applet/applet.c:441
+msgid "VPN Configuration Error"
+msgstr ""
 
-#: info-daemon/NetworkManagerInfoPassphraseDialog.c:145
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:155
-msgid "Hex Key:"
-msgstr "Heksadecimalni klju�"
+#: ../gnome/applet/applet.c:442
+#, c-format
+msgid "The VPN connection '%s' was not correctly configured."
+msgstr ""
+
+#: ../gnome/applet/applet.c:447
+#, c-format
+msgid ""
+"Could not start the VPN connection '%s' because the VPN server did not "
+"return an adequate network configuration."
+msgstr ""
+
+#: ../gnome/applet/applet.c:517
+msgid "VPN Login Message"
+msgstr ""
+
+#: ../gnome/applet/applet.c:741 ../gnome/applet/applet.c:2508
+#: ../gnome/applet/other-network-dialog.c:453
+#: ../gnome/applet/passphrase-dialog.c:228
+msgid ""
+"The NetworkManager Applet could not find some required resources (the glade "
+"file was not found)."
+msgstr ""
+"NetworkManager ne može naći potrebne datoteke (glade datoteka nije "
+"pronađena)."
 
-#: info-daemon/NetworkManagerInfoVPN.c:157
+#: ../gnome/applet/applet.c:753
 #, c-format
-msgid "You must log in to access the private network %s"
-msgstr "Prijava je potrebna za pristup na mrežu %s"
+msgid "The network device \"%s (%s)\" does not support wireless scanning."
+msgstr ""
+
+#: ../gnome/applet/applet.c:761
+#, c-format
+msgid "The network device \"%s (%s)\" does not support link detection."
+msgstr ""
+
+#: ../gnome/applet/applet.c:908
+#, fuzzy, c-format
+msgid "Preparing device %s for the wired network..."
+msgstr "Spajanje na ži�anu mrežu..."
+
+#: ../gnome/applet/applet.c:910
+#, fuzzy, c-format
+msgid "Preparing device %s for the wireless network '%s'..."
+msgstr "Spajanje na beži�nu mrežu '%s'..."
+
+#: ../gnome/applet/applet.c:918
+#, fuzzy, c-format
+msgid "Configuring device %s for the wired network..."
+msgstr "Spajanje na ži�anu mrežu..."
+
+#: ../gnome/applet/applet.c:920
+#, fuzzy, c-format
+msgid "Attempting to join the wireless network '%s'..."
+msgstr "Spajanje na beži�nu mrežu '%s'..."
+
+#: ../gnome/applet/applet.c:928
+#, fuzzy, c-format
+msgid "Waiting for Network Key for the wireless network '%s'..."
+msgstr "Spajanje na beži�nu mrežu '%s'..."
+
+#: ../gnome/applet/applet.c:936 ../gnome/applet/applet.c:946
+#, fuzzy
+msgid "Requesting a network address from the wired network..."
+msgstr "Spajanje na ži�anu mrežu..."
+
+#: ../gnome/applet/applet.c:938 ../gnome/applet/applet.c:948
+#, fuzzy, c-format
+msgid "Requesting a network address from the wireless network '%s'..."
+msgstr "Spajanje na beži�nu mrežu '%s'..."
+
+#: ../gnome/applet/applet.c:956
+#, fuzzy
+msgid "Finishing connection to the wired network..."
+msgstr "Spajanje na ži�anu mrežu..."
+
+#: ../gnome/applet/applet.c:958
+#, fuzzy, c-format
+msgid "Finishing connection to the wireless network '%s'..."
+msgstr "Spajanje na beži�nu mrežu '%s'..."
+
+#: ../gnome/applet/applet.c:1075
+msgid "NetworkManager is not running"
+msgstr "NetworkManager nije pokrenut"
+
+#: ../gnome/applet/applet.c:1083 ../gnome/applet/applet.c:1828
+msgid "Networking disabled"
+msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:313
+#: ../gnome/applet/applet.c:1088
 msgid "No network connection"
 msgstr "Nema spoja na mrežu"
 
-#: panel-applet/NMWirelessApplet.c:318
+#: ../gnome/applet/applet.c:1093
 msgid "Wired network connection"
 msgstr "Spoj na ži�anu mrežu"
 
-#: panel-applet/NMWirelessApplet.c:323
-msgid "Connecting to a wired network..."
-msgstr "Spajanje na ži�anu mrežu..."
-
-#: panel-applet/NMWirelessApplet.c:332
+#: ../gnome/applet/applet.c:1097
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Spoj na Ad-Hoc beži�nu mrežu"
 
-#: panel-applet/NMWirelessApplet.c:346
+#: ../gnome/applet/applet.c:1099
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "Spoj na beži�nu mrežu '%s' (%d%%)"
 
-#: panel-applet/NMWirelessApplet.c:351
-msgid "Wireless network connection"
-msgstr "Spoj na beži�nu mrežu"
-
-#: panel-applet/NMWirelessApplet.c:356
+#: ../gnome/applet/applet.c:1120
 #, c-format
-msgid "Connecting to wireless network '%s'..."
-msgstr "Spajanje na beži�nu mrežu '%s'..."
-
-#: panel-applet/NMWirelessApplet.c:362
-msgid "NetworkManager is not running"
-msgstr "NetworkManager nije pokrenut"
+msgid "VPN connection to '%s'"
+msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:367
-msgid "Scanning for wireless networks..."
-msgstr "Potraga za beži�nim mrežama..."
+#: ../gnome/applet/applet.c:1128
+#, c-format
+msgid "VPN connecting to '%s'"
+msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:690
-msgid "Other Wireless Networks..."
+#: ../gnome/applet/applet.c:1541
+#, fuzzy
+msgid "_Connect to Other Wireless Network..."
 msgstr "Ostale beži�ne mreže..."
 
-#: panel-applet/NMWirelessApplet.c:711
-msgid "Create new Wireless Network..."
+#: ../gnome/applet/applet.c:1562
+#, fuzzy
+msgid "Create _New Wireless Network..."
 msgstr "Stvori novu be�i�nu mrežu..."
 
-#: panel-applet/NMWirelessApplet.c:821
+#: ../gnome/applet/applet.c:1685
+msgid "_VPN Connections"
+msgstr ""
+
+#: ../gnome/applet/applet.c:1730
+msgid "_Configure VPN..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1734
+msgid "_Disconnect VPN..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1756
+msgid "_Dial Up Connections"
+msgstr ""
+
+#. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
+#: ../gnome/applet/applet.c:1767
+#, c-format
+msgid "Connect to %s..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1773
+#, c-format
+msgid "Disconnect from %s..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1822
 msgid "No network devices have been found"
 msgstr "Nema mrežnih uređaja"
 
-#: panel-applet/NMWirelessApplet.c:939
+#: ../gnome/applet/applet.c:2014
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager nije pokrenut..."
 
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:228
-msgid "Create new wireless network"
-msgstr "Stvori novu be�i�nu mrežu"
+#. 'Enable Networking' item
+#: ../gnome/applet/applet.c:2170
+#, fuzzy
+msgid "Enable _Networking"
+msgstr "Beži�na _mreža:"
 
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:229
-msgid ""
-"Enter the ESSID and security settings of the wireless network you wish to "
-"create."
-msgstr "Unesi ESSID i sigurnosne postavke beži�ne mreže koju treba stvoriti."
+#. 'Enable Wireless' item
+#: ../gnome/applet/applet.c:2176
+msgid "Enable _Wireless"
+msgstr ""
 
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:234
-msgid "Custom wireless network"
-msgstr "Posebna beži�na mreža"
+#. 'Connection Information' item
+#: ../gnome/applet/applet.c:2182
+msgid "Connection _Information"
+msgstr ""
 
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:235
-msgid "Enter the ESSID of the wireless network to which you wish to connect."
+#. Help item
+#: ../gnome/applet/applet.c:2193
+msgid "_Help"
+msgstr ""
+
+#. About item
+#: ../gnome/applet/applet.c:2202
+msgid "_About"
 msgstr ""
-"Unesi ESSID i sigurnosne postavke beži�ne mreže na koju se treba spojiti."
 
-#. Reuse the above string to make the translators less angry.
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:316
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:325
+#: ../gnome/applet/applet.c:2667
+#, fuzzy
 msgid ""
-"The NetworkManager Applet could not find some required resources (the glade "
-"file was not found)."
+"The NetworkManager applet could not find some required resources.  It cannot "
+"continue.\n"
 msgstr ""
 "NetworkManager ne može naći potrebne datoteke (glade datoteka nije "
 "pronađena)."
 
-#: panel-applet/essid.glade:53
-msgid "C_onnect"
-msgstr "_Spoji se"
+#: ../gnome/applet/wireless-security-option.c:157
+msgid "Open System"
+msgstr ""
 
-#: panel-applet/essid.glade:132
-msgid "Wireless _adapter:"
-msgstr "Beži�ni _uređaj:"
+#: ../gnome/applet/wireless-security-option.c:160
+msgid "Shared Key"
+msgstr ""
 
-#: panel-applet/essid.glade:172
-msgid "Wireless _Network:"
-msgstr "Beži�na _mreža:"
+#: ../gnome/applet/wireless-security-option.c:208
+msgid "Automatic (Default)"
+msgstr ""
 
-#: panel-applet/essid.glade:337
-msgid "Connect with encryption enabled"
-msgstr "Spoji se sa enkripcijom"
+#: ../gnome/applet/wireless-security-option.c:215
+msgid "AES-CCMP"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:223
+msgid "TKIP"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:231
+msgid "Dynamic WEP"
+msgstr ""
+
+#: ../gnome/applet/wso-none.c:53
+msgid "None"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-ascii.c:138
+msgid "WEP 64/128-bit ASCII"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-hex.c:135
+msgid "WEP 64/128-bit Hex"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-passphrase.c:135
+#, fuzzy
+msgid "WEP 128-bit Passphrase"
+msgstr "Lozinka:"
+
+#: ../gnome/applet/wso-wpa-eap.c:237
+msgid "PEAP"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:238
+msgid "TLS"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:239
+msgid "TTLS"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
+#: ../src/nm-ap-security-wpa-eap.c:116
+msgid "WPA2 Enterprise"
+msgstr ""
 
-#: panel-applet/menu-info.c:109
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
+#: ../src/nm-ap-security-wpa-eap.c:121
+msgid "WPA Enterprise"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-psk.c:178
+msgid "WPA2 Personal"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-psk.c:180
+msgid "WPA Personal"
+msgstr ""
+
+#: ../gnome/applet/eggtrayicon.c:134
+msgid "Orientation"
+msgstr "Orjentacija"
+
+#: ../gnome/applet/eggtrayicon.c:135
+msgid "The orientation of the tray."
+msgstr "Orjentacija ladice."
+
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Ži�ana mreža (%s)"
 
-#: panel-applet/menu-info.c:111
-msgid "Wired Network"
+#: ../gnome/applet/menu-items.c:91
+#, fuzzy
+msgid "_Wired Network"
 msgstr "Ži�ana mreža"
 
-#: panel-applet/menu-info.c:177
+#: ../gnome/applet/menu-items.c:162
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
 msgstr[0] "Beži�na mreža (%s)"
 msgstr[1] "Beži�ne mreže (%s)"
 
-#: panel-applet/menu-info.c:179
+#: ../gnome/applet/menu-items.c:164
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Beži�na mreža"
 msgstr[1] "Beži�ne mreže"
 
-#: panel-applet/menu-info.c:316
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr " (greška u unicodu)"
 
-#: examples/python/systray/eggtrayicon.c:111
-msgid "Orientation"
+#: ../gnome/applet/other-network-dialog.c:352
+#, c-format
+msgid ""
+"By default, the wireless network's name is set to your computer's name, %s, "
+"with no encryption enabled"
+msgstr ""
+
+#: ../gnome/applet/other-network-dialog.c:358
+msgid "Create new wireless network"
+msgstr "Stvori novu be�i�nu mrežu"
+
+#: ../gnome/applet/other-network-dialog.c:359
+#, fuzzy
+msgid ""
+"Enter the name and security settings of the wireless network you wish to "
+"create."
+msgstr "Unesi ESSID i sigurnosne postavke beži�ne mreže koju treba stvoriti."
+
+#: ../gnome/applet/other-network-dialog.c:363
+#, fuzzy
+msgid "Create New Wireless Network"
+msgstr "Stvori novu be�i�nu mrežu..."
+
+#: ../gnome/applet/other-network-dialog.c:368
+#, fuzzy
+msgid "Existing wireless network"
+msgstr "Posebna beži�na mreža"
+
+#: ../gnome/applet/other-network-dialog.c:369
+#, fuzzy
+msgid "Enter the name of the wireless network to which you wish to connect."
+msgstr ""
+"Unesi ESSID i sigurnosne postavke beži�ne mreže na koju se treba spojiti."
+
+#: ../gnome/applet/other-network-dialog.c:371
+#, fuzzy
+msgid "Connect to Other Wireless Network"
+msgstr "Ostale beži�ne mreže..."
+
+#: ../gnome/applet/passphrase-dialog.c:215
+#, fuzzy
+msgid "Error connecting to wireless network"
+msgstr "Spajanje na beži�nu mrežu '%s'..."
+
+#: ../gnome/applet/passphrase-dialog.c:216
+msgid ""
+"The requested wireless network requires security capabilities unsupported by "
+"your hardware."
+msgstr ""
+
+#: ../gnome/applet/vpn-password-dialog.c:151
+#: ../gnome/applet/vpn-password-dialog.c:188
+#, c-format
+msgid "Cannot start VPN connection '%s'"
+msgstr ""
+
+#: ../gnome/applet/vpn-password-dialog.c:154
+#, c-format
+msgid ""
+"Could not find the authentication dialog for VPN connection type '%s'. "
+"Contact your system administrator."
+msgstr ""
+
+#: ../gnome/applet/vpn-password-dialog.c:191
+#, c-format
+msgid ""
+"There was a problem launching the authentication dialog for VPN connection "
+"type '%s'. Contact your system administrator."
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:1
+msgid " "
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:2
+#, fuzzy
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
+msgstr "<span weight=\"bold\">Beži�ne mreže:</span>"
+
+#: ../gnome/applet/applet.glade.h:4
+#, no-c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
+"Network</span>\n"
+"\n"
+"A passphrase or encryption key is required to access the wireless network '%"
+"s'."
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Potrebna je lozinka za beži�nu mrežu</"
+"span>\n"
+"\n"
+"Za pristup mreži '%s', potrebna je lozinka ili klju�."
+
+#: ../gnome/applet/applet.glade.h:8
+#, no-c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
+"\n"
+"%s  It will not be completely functional."
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:12
+#, no-c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
+"span>\n"
+"\n"
+"You have chosen to log in to the wireless network '%s'.  If you are sure "
+"that this wireless network is secure, click the checkbox below and "
+"NetworkManager will not require confirmation on subsequent log ins."
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:15
+msgid "Anonymous Identity:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:16
+#, fuzzy
+msgid "Authentication:"
 msgstr "Orjentacija"
 
-#: examples/python/systray/eggtrayicon.c:112
-msgid "The orientation of the tray."
-msgstr "Orjentacija ladice."
+#: ../gnome/applet/applet.glade.h:17
+msgid "Broadcast Address:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:18
+msgid "CA Certificate File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:19
+msgid "C_onnect"
+msgstr "_Spoji se"
+
+#: ../gnome/applet/applet.glade.h:20
+msgid "Client Certificate File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:21
+msgid "Connection Information"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:22
+msgid "Default Route:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:23
+msgid "Destination Address:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:24
+msgid "Driver:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:25
+msgid "EAP Method:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:26
+msgid "Hardware Address:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:27
+msgid "IP Address:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:28
+msgid "Identity:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:29
+msgid "Interface:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:30
+msgid "Key Type:"
+msgstr "Tip klju�a:"
+
+#: ../gnome/applet/applet.glade.h:31
+#, fuzzy
+msgid "Key:"
+msgstr "Heksadecimalni klju�"
+
+#: ../gnome/applet/applet.glade.h:32
+msgid ""
+"None\n"
+"WEP 128-bit Passphrase\n"
+"WEP 64/128-bit Hex\n"
+"WEP 64/128-bit ASCII\n"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:37
+msgid ""
+"Open System\n"
+"Shared Key"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:39
+#, fuzzy
+msgid "Other Wireless Network..."
+msgstr "Ostale beži�ne mreže..."
+
+#: ../gnome/applet/applet.glade.h:40
+msgid "Passphrase:"
+msgstr "Lozinka:"
+
+#: ../gnome/applet/applet.glade.h:41
+msgid "Password:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:42
+msgid "Primary DNS:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:43
+msgid "Private Key File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:44
+msgid "Private Key Password:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:45
+msgid "Secondary DNS:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:46
+msgid "Select the CA Certificate File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:47
+msgid "Select the Client Certificate File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:48
+msgid "Select the Private Key File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:49
+msgid "Show key"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:50
+#, fuzzy
+msgid "Show passphrase"
+msgstr "Lozinka:"
+
+#: ../gnome/applet/applet.glade.h:51
+msgid "Show password"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:52
+msgid "Show passwords"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:53
+msgid "Speed:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:54
+msgid "Subnet Mask:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:55
+#, fuzzy
+msgid "Type:"
+msgstr "Tip klju�a:"
+
+#: ../gnome/applet/applet.glade.h:56
+msgid "User Name:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:57
+msgid "Wireless Network Key Required"
+msgstr "Potreban je klju� beži�ne mreže"
+
+#: ../gnome/applet/applet.glade.h:58
+msgid "Wireless _adapter:"
+msgstr "Beži�ni _uređaj:"
+
+#: ../gnome/applet/applet.glade.h:59
+#, fuzzy
+msgid "_Always Trust this Wireless Network"
+msgstr "Beži�na mreža"
+
+#: ../gnome/applet/applet.glade.h:60
+msgid "_Don't remind me again"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:61
+msgid "_Login to Network"
+msgstr "_Prijava na mrežu"
+
+#: ../gnome/applet/applet.glade.h:62
+msgid "_Network Name:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:63
+#, fuzzy
+msgid "_Wireless Security:"
+msgstr "Beži�ni _uređaj:"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:383
+msgid "Cannot add VPN connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:385
+msgid ""
+"No suitable VPN software was found on your system. Contact your system "
+"administrator."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:437
+#, fuzzy
+msgid "Cannot import VPN connection"
+msgstr "Nema spoja na mrežu"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:439
+#, c-format
+msgid ""
+"Cannot find suitable software for VPN connection type '%s' to import the "
+"file '%s'. Contact your system administrator."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:579
+#, c-format
+msgid "Error retrieving VPN connection '%s'"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:582
+#, c-format
+msgid ""
+"Could not find the UI files for VPN connection type '%s'. Contact your "
+"system administrator."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:739
+#, c-format
+msgid "Delete VPN connection \"%s\"?"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:742
+#, c-format
+msgid ""
+"All information about the VPN connection \"%s\" will be lost and you may "
+"need your system administrator to provide information to create a new "
+"connection."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:959
+msgid "Unable to load"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:961
+#, fuzzy
+msgid "Cannot find some needed resources (the glade file)!"
+msgstr ""
+"NetworkManager ne može naći potrebne datoteke (glade datoteka nije "
+"pronađena)."
+
+#. Edit dialog
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
+msgid "Edit VPN Connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:1
+#, fuzzy
+msgid "Add a new VPN connection"
+msgstr "Nema spoja na mrežu"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:2
+msgid "Choose which type of VPN connection you wish to create."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
+#, fuzzy
+msgid "Connect to:"
+msgstr "_Spoji se"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
+msgid "Create VPN Connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
+msgid "Create VPN Connection - 1 of 2"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
+msgid "Create VPN Connection - 2 of 2"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
+msgid "Delete the selected VPN connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
+msgid "E_xport"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:9
+msgid "Edit the selected VPN connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:10
+msgid "Export the VPN settings to a file"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:11
+msgid "Export the selected VPN connection to a file"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:12
+msgid "Finish Creating VPN Connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:13
+#, fuzzy
+msgid "Manage Virtual Private Network Connections"
+msgstr "Spoj na beži�nu mrežu"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:14
+msgid ""
+"This assistant will guide you through the creation of a connection to a "
+"Virtual Private Network (VPN).\n"
+"\n"
+"It will require some information, such as IP addresses and secrets.  Please "
+"see your system administrator to obtain this information."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:17
+#, fuzzy
+msgid "VPN Connections"
+msgstr "Nema spoja na mrežu"
+
+#: ../src/nm-ap-security-wep.c:52
+msgid "40-bit WEP"
+msgstr ""
+
+#: ../src/nm-ap-security-wep.c:54
+msgid "104-bit WEP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:50
+msgid "WPA TKIP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:52
+msgid "WPA CCMP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:54
+msgid "WPA Automatic"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:59
+msgid "WPA2 TKIP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:61
+msgid "WPA2 CCMP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:63
+msgid "WPA2 Automatic"
+msgstr ""
+
+#: ../src/nm-ap-security.c:320
+msgid "none"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:154
+#, c-format
+msgid ""
+"unable to create netlink socket for monitoring wired ethernet devices - %s"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:172
+#, c-format
+msgid ""
+"unable to bind to netlink socket for monitoring wired ethernet devices - %s"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:405
+msgid "operation took too long"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:502
+msgid "received data from wrong type of sender"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:515
+msgid "received data from unexpected sender"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:646
+msgid "too much data was sent over socket and some of it was lost"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:735
+msgid "error occurred while waiting for data on socket"
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:898
+#, fuzzy, c-format
+msgid "You are now connected to the Ad-Hoc wireless network '%s'."
+msgstr "Spoj na Ad-Hoc beži�nu mrežu"
+
+#: ../gnome/applet/applet-dbus-devices.c:903
+#, fuzzy, c-format
+msgid "You are now connected to the wireless network '%s'."
+msgstr "Spajanje na beži�nu mrežu '%s'..."
+
+#: ../gnome/applet/applet-dbus-devices.c:910
+#, fuzzy
+msgid "You are now connected to the wired network."
+msgstr "Spajanje na ži�anu mrežu..."
+
+#: ../gnome/applet/applet-dbus-devices.c:916
+#, fuzzy
+msgid "Connection Established"
+msgstr "Spoji se sa enkripcijom"
+
+#: ../gnome/applet/applet-dbus-devices.c:959
+msgid "Disconnected"
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:960
+msgid "The network connection has been disconnected."
+msgstr ""
+
+#~ msgid "Modify Wireless Networks"
+#~ msgstr "Postavke beži�nih mreža"
+
+#~ msgid ""
+#~ "128-bit Passphrase (WEP)\n"
+#~ "Ascii Key (WEP)\n"
+#~ "Hex Key (WEP)"
+#~ msgstr ""
+#~ "128-bitna lozinka (WEP)\n"
+#~ "Slov�ani klju� (WEP)\n"
+#~ "Heksadecimalni klju� (WEP)"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "Ascii Key:"
+#~ msgstr "Slov�ani klju�"
+
+#~ msgid "You must log in to access the private network %s"
+#~ msgstr "Prijava je potrebna za pristup na mrežu %s"
+
+#~ msgid "Scanning for wireless networks..."
+#~ msgstr "Potraga za beži�nim mrežama..."
+
+#~ msgid "<span weight=\"bold\">Wireless Networks:</span>"
+#~ msgstr "<span weight=\"bold\">Beži�ne mreže:</span>"
+
+#~ msgid "Hex Key:"
+#~ msgstr "Heksadecimalni klju�"
+
+#~ msgid "Connecting to a wired network..."
+#~ msgstr "Spajanje na ži�anu mrežu..."
+
+#~ msgid "Wireless network connection"
+#~ msgstr "Spoj na beži�nu mrežu"
+
+#~ msgid "Connecting to wireless network '%s'..."
+#~ msgstr "Spajanje na beži�nu mrežu '%s'..."
+
+#~ msgid "Other Wireless Networks..."
+#~ msgstr "Ostale beži�ne mreže..."
+
+#~ msgid "Create new Wireless Network..."
+#~ msgstr "Stvori novu be�i�nu mrežu..."
+
+#~ msgid ""
+#~ "Enter the ESSID and security settings of the wireless network you wish to "
+#~ "create."
+#~ msgstr ""
+#~ "Unesi ESSID i sigurnosne postavke beži�ne mreže koju treba stvoriti."
+
+#~ msgid "Custom wireless network"
+#~ msgstr "Posebna beži�na mreža"
+
+#~ msgid ""
+#~ "Enter the ESSID of the wireless network to which you wish to connect."
+#~ msgstr ""
+#~ "Unesi ESSID i sigurnosne postavke beži�ne mreže na koju se treba spojiti."
+
+#~ msgid "Wireless _Network:"
+#~ msgstr "Beži�na _mreža:"
+
+#~ msgid "Connect with encryption enabled"
+#~ msgstr "Spoji se sa enkripcijom"
+
+#~ msgid "Wired Network"
+#~ msgstr "Ži�ana mreža"
diff --git a/po/hu.po b/po/hu.po
index 31a80ddb46..0b85f0492e 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,93 +1,91 @@
+# translation of hu.po to Hungarian
 # Hungarian translation of NetworkManager
-# Gabor Kelemen <kelemeng@gnome.hu>, 2005, 2006.
 # This file is distributed under the same license as the NetworkManager package.
 # Copyright (C) 2005, Free Software Foundation. Inc.
+# Gabor Kelemen <kelemeng@gnome.hu>, 2005, 2006.
+# Kalman Kemenczy <kkemenczy@novell.com>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: NetworkManager.HEAD.hu\n"
+"Project-Id-Version: hu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-28 20:28+0100\n"
-"PO-Revision-Date: 2006-01-06 19:36+0100\n"
-"Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
-"Language-Team: Hungarian <gnome@gnome.hu>\n"
+"POT-Creation-Date: 2006-05-29 18:33+0200\n"
+"PO-Revision-Date: 2006-05-30 12:00+0200\n"
+"Last-Translator: Kalman Kemenczy <kkemenczy@novell.com>\n"
+"Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms:  nplurals=1; plural=0;\n"
-"X-Generator: KBabel 1.11.1\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: KBabel 1.10.2\n"
 
-#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:923
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:919
 #, c-format
 msgid "Passphrase for wireless network %s"
 msgstr "Jelmondat a(z) %s vezeték nélküli hálózathoz"
 
-#: ../gnome/applet/applet-dbus.c:244
+#: ../gnome/applet/applet-dbus.c:265
 #, c-format
 msgid "Connection to the wireless network '%s' failed."
 msgstr "Kapcsolódás \"%s\" vezeték nélküli hálózathoz sikertelen."
 
-#: ../gnome/applet/applet-dbus.c:249
+#: ../gnome/applet/applet-dbus.c:270
 msgid "Connection to the wired network failed."
 msgstr "Kapcsolódás a vezetékes hálózathoz sikertelen."
 
-#: ../gnome/applet/applet.c:180
-msgid "Error displaying connection information: "
-msgstr "Hiba a kapcsolat információinak megjelenítése közben: "
+#: ../gnome/applet/applet.c:184
+msgid "Error displaying connection information:"
+msgstr "Hiba a kapcsolatinformációk megjelenítése közben:"
 
-#: ../gnome/applet/applet.c:199
+#: ../gnome/applet/applet.c:202
 msgid "Could not find some required resources (the glade file)!"
 msgstr "Nem található néhány szükséges erőforrás (a glade fájl)!"
 
-#: ../gnome/applet/applet.c:210
+#: ../gnome/applet/applet.c:213
 msgid "No active connections!"
 msgstr "Nincs aktív kapcsolat!"
 
-#: ../gnome/applet/applet.c:225
+#: ../gnome/applet/applet.c:234
 #, c-format
 msgid "Wired Ethernet (%s)"
 msgstr "Vezetékes Ethernet (%s)"
 
-#: ../gnome/applet/applet.c:227
+#: ../gnome/applet/applet.c:236
 #, c-format
 msgid "Wireless Ethernet (%s)"
 msgstr "Vezeték nélküli Ethernet (%s)"
 
-#: ../gnome/applet/applet.c:321 ../gnome/applet/applet.c:346
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:362
 msgid "NetworkManager Applet"
 msgstr "NetworkManager kisalkalmazás"
 
-#: ../gnome/applet/applet.c:323 ../gnome/applet/applet.c:348
+#: ../gnome/applet/applet.c:339 ../gnome/applet/applet.c:364
 msgid "Copyright © 2004-2005 Red Hat, Inc."
 msgstr "Copyright (C) 2004-2005 Red Hat, Inc."
 
-#: ../gnome/applet/applet.c:324 ../gnome/applet/applet.c:349
+#: ../gnome/applet/applet.c:340 ../gnome/applet/applet.c:365
 msgid "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Értesítésiterület-kisalkalmazás a hálózati eszközök és kapcsolatok "
 "kezelésére."
 
-#: ../gnome/applet/applet.c:327 ../gnome/applet/applet.c:354
+#: ../gnome/applet/applet.c:343 ../gnome/applet/applet.c:370
 msgid "translator-credits"
 msgstr "Kelemen Gábor <kelemeng@gnome.hu>"
 
-#: ../gnome/applet/applet.c:439
-msgid "VPN Error"
-msgstr "VPN hiba"
-
-#: ../gnome/applet/applet.c:443
+#: ../gnome/applet/applet.c:426
 msgid "VPN Login Failure"
 msgstr "VPN bejelentkezési hiba"
 
-#: ../gnome/applet/applet.c:444
+#: ../gnome/applet/applet.c:427
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a login failure."
 msgstr "Egy bejelentkezési hiba miatt nem lehet elindítani \"%s\" VPN kapcsolatot."
 
-#: ../gnome/applet/applet.c:448
+#: ../gnome/applet/applet.c:431
 msgid "VPN Start Failure"
 msgstr "VPN indítási hiba"
 
-#: ../gnome/applet/applet.c:449
+#: ../gnome/applet/applet.c:432
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
@@ -96,25 +94,25 @@ msgstr ""
 "Nem sikerült elindítani \"%s\" VPN kapcsolatot a VPN program indításakor "
 "fellépett hiba miatt."
 
-#: ../gnome/applet/applet.c:453 ../gnome/applet/applet.c:463
+#: ../gnome/applet/applet.c:436 ../gnome/applet/applet.c:446
 msgid "VPN Connect Failure"
 msgstr "VPN kapcsolódási hiba"
 
-#: ../gnome/applet/applet.c:454
+#: ../gnome/applet/applet.c:437
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a connection error."
 msgstr "Egy kapcsolódási hiba miatt nem lehet elindítani \"%s\" VPN kapcsolatot."
 
-#: ../gnome/applet/applet.c:458
+#: ../gnome/applet/applet.c:441
 msgid "VPN Configuration Error"
 msgstr "VPN beállítási hiba"
 
-#: ../gnome/applet/applet.c:459
+#: ../gnome/applet/applet.c:442
 #, c-format
 msgid "The VPN connection '%s' was not correctly configured."
 msgstr "A(z) \"%s\" VPN kapcsolat nincs megfelelően beállítva."
 
-#: ../gnome/applet/applet.c:464
+#: ../gnome/applet/applet.c:447
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' because the VPN server did not "
@@ -123,185 +121,175 @@ msgstr ""
 "Nem sikerült elindítani \"%s\" VPN kapcsolatot, mivel a VPN-kiszolgáló nem "
 "adott vissza megfelelő hálózati beállításokat."
 
-#: ../gnome/applet/applet.c:472
-#, c-format
-msgid "The VPN service said: \"%s\""
-msgstr "A VPN szolgáltatás válasza: \"%s\""
-
-#: ../gnome/applet/applet.c:541
-#, c-format
-msgid "VPN connection '%s' said:"
-msgstr "A(z) \"%s\" VPN kapcsolat válasza:"
-
-#: ../gnome/applet/applet.c:543
+#: ../gnome/applet/applet.c:517
 msgid "VPN Login Message"
 msgstr "VPN bejelentkezési üzenet"
 
-#: ../gnome/applet/applet.c:760 ../gnome/applet/applet.c:2514
+#: ../gnome/applet/applet.c:741 ../gnome/applet/applet.c:2508
 #: ../gnome/applet/other-network-dialog.c:453
-#: ../gnome/applet/passphrase-dialog.c:206
+#: ../gnome/applet/passphrase-dialog.c:228
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
 msgstr "A NetworkManager kisalkalmazás nem talál néhány szükséges glade fájlt."
 
-#: ../gnome/applet/applet.c:772
+#: ../gnome/applet/applet.c:753
 #, c-format
 msgid "The network device \"%s (%s)\" does not support wireless scanning."
 msgstr "A(z) \"%s (%s)\" hálózati eszköz nem támogatja a vezeték nélküli keresést."
 
-#: ../gnome/applet/applet.c:780
+#: ../gnome/applet/applet.c:761
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
 msgstr "A(z) \"%s (%s)\" hálózati eszköz nem támogatja a kapcsolatfelismerést."
 
-#: ../gnome/applet/applet.c:927
+#: ../gnome/applet/applet.c:908
 #, c-format
 msgid "Preparing device %s for the wired network..."
 msgstr "%s eszköz előkészítése a vezetékes hálózathoz..."
 
-#: ../gnome/applet/applet.c:929
+#: ../gnome/applet/applet.c:910
 #, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
 msgstr "%s eszköz előkészítése \"%s\" vezeték nélküli hálózathoz..."
 
-#: ../gnome/applet/applet.c:937
+#: ../gnome/applet/applet.c:918
 #, c-format
 msgid "Configuring device %s for the wired network..."
 msgstr "%s eszköz beállítása a vezetékes hálózathoz..."
 
-#: ../gnome/applet/applet.c:939
+#: ../gnome/applet/applet.c:920
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
 msgstr "Kísérlet \"%s\" vezeték nélküli hálózathoz való kapcsolódásra..."
 
-#: ../gnome/applet/applet.c:947
+#: ../gnome/applet/applet.c:928
 #, c-format
 msgid "Waiting for Network Key for the wireless network '%s'..."
 msgstr "Várakozás \"%s\" vezeték nélküli hálózat hálózati kulcsára..."
 
-#: ../gnome/applet/applet.c:955 ../gnome/applet/applet.c:965
+#: ../gnome/applet/applet.c:936 ../gnome/applet/applet.c:946
 msgid "Requesting a network address from the wired network..."
 msgstr "Hálózati cím kérése a vezetékes hálózattól..."
 
-#: ../gnome/applet/applet.c:957 ../gnome/applet/applet.c:967
+#: ../gnome/applet/applet.c:938 ../gnome/applet/applet.c:948
 #, c-format
 msgid "Requesting a network address from the wireless network '%s'..."
 msgstr "Hálózati cím kérése \"%s\" vezeték nélküli hálózattól..."
 
-#: ../gnome/applet/applet.c:975
+#: ../gnome/applet/applet.c:956
 msgid "Finishing connection to the wired network..."
 msgstr "A vezetékes hálózathoz való kapcsolódás befejezése..."
 
-#: ../gnome/applet/applet.c:977
+#: ../gnome/applet/applet.c:958
 #, c-format
 msgid "Finishing connection to the wireless network '%s'..."
 msgstr "\"%s\" vezeték nélküli hálózathoz való kapcsolódás befejezése..."
 
-#: ../gnome/applet/applet.c:1094
+#: ../gnome/applet/applet.c:1075
 msgid "NetworkManager is not running"
 msgstr "A NetworkManager nem fut"
 
-#: ../gnome/applet/applet.c:1107 ../gnome/applet/applet.c:1841
+#: ../gnome/applet/applet.c:1083 ../gnome/applet/applet.c:1828
 msgid "Networking disabled"
 msgstr "Hálózat letiltva"
 
-#: ../gnome/applet/applet.c:1112
+#: ../gnome/applet/applet.c:1088
 msgid "No network connection"
 msgstr "Nincs hálózati kapcsolat"
 
-#: ../gnome/applet/applet.c:1117
+#: ../gnome/applet/applet.c:1093
 msgid "Wired network connection"
 msgstr "Vezetékes hálózati kapcsolat"
 
-#: ../gnome/applet/applet.c:1121
+#: ../gnome/applet/applet.c:1097
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Ad-hoc vezeték nélküli hálózathoz kapcsolódva"
 
-#: ../gnome/applet/applet.c:1123
+#: ../gnome/applet/applet.c:1099
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "Vezeték nélküli hálózati kapcsolat a következővel: \"%s\" (%d%%)"
 
-#: ../gnome/applet/applet.c:1145
+#: ../gnome/applet/applet.c:1120
 #, c-format
 msgid "VPN connection to '%s'"
 msgstr "VPN kapcsolat a következőhöz: \"%s\""
 
-#: ../gnome/applet/applet.c:1153
+#: ../gnome/applet/applet.c:1128
 #, c-format
 msgid "VPN connecting to '%s'"
 msgstr "VPN kapcsolódás a következőhöz: \"%s\""
 
-#: ../gnome/applet/applet.c:1566
+#: ../gnome/applet/applet.c:1541
 msgid "_Connect to Other Wireless Network..."
 msgstr "Kapcsolódás _más vezeték nélküli hálózathoz..."
 
-#: ../gnome/applet/applet.c:1587
+#: ../gnome/applet/applet.c:1562
 msgid "Create _New Wireless Network..."
 msgstr "Ú_j vezeték nélküli hálózat létrehozása..."
 
-#: ../gnome/applet/applet.c:1708
+#: ../gnome/applet/applet.c:1685
 msgid "_VPN Connections"
 msgstr "_VPN kapcsolatok"
 
-#: ../gnome/applet/applet.c:1743
+#: ../gnome/applet/applet.c:1730
 msgid "_Configure VPN..."
 msgstr "V_PN beállítása..."
 
-#: ../gnome/applet/applet.c:1747
+#: ../gnome/applet/applet.c:1734
 msgid "_Disconnect VPN..."
 msgstr "VP_N bontása..."
 
-#: ../gnome/applet/applet.c:1769
+#: ../gnome/applet/applet.c:1756
 msgid "_Dial Up Connections"
 msgstr "_Betárcsázós kapcsolatok"
 
 #. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
-#: ../gnome/applet/applet.c:1780
+#: ../gnome/applet/applet.c:1767
 #, c-format
 msgid "Connect to %s..."
 msgstr "Kapcsolódás ehhez: %s..."
 
-#: ../gnome/applet/applet.c:1786
+#: ../gnome/applet/applet.c:1773
 #, c-format
 msgid "Disconnect from %s..."
 msgstr "Kapcsolat bontása: %s..."
 
-#: ../gnome/applet/applet.c:1835
+#: ../gnome/applet/applet.c:1822
 msgid "No network devices have been found"
 msgstr "Nem találtam hálózati eszközöket"
 
-#: ../gnome/applet/applet.c:2027
+#: ../gnome/applet/applet.c:2014
 msgid "NetworkManager is not running..."
 msgstr "A NetworkManager nem fut..."
 
 #. 'Enable Networking' item
-#: ../gnome/applet/applet.c:2183
+#: ../gnome/applet/applet.c:2170
 msgid "Enable _Networking"
 msgstr "_Hálózat engedélyezése"
 
 #. 'Enable Wireless' item
-#: ../gnome/applet/applet.c:2189
+#: ../gnome/applet/applet.c:2176
 msgid "Enable _Wireless"
 msgstr "_Vezeték nélküli kapcsolat engedélyezése"
 
 #. 'Connection Information' item
-#: ../gnome/applet/applet.c:2195
+#: ../gnome/applet/applet.c:2182
 msgid "Connection _Information"
 msgstr "_Kapcsolat-információk"
 
 #. Help item
-#: ../gnome/applet/applet.c:2206
+#: ../gnome/applet/applet.c:2193
 msgid "_Help"
 msgstr "_Súgó"
 
 #. About item
-#: ../gnome/applet/applet.c:2215
+#: ../gnome/applet/applet.c:2202
 msgid "_About"
 msgstr "_Névjegy"
 
-#: ../gnome/applet/applet.c:2633
+#: ../gnome/applet/applet.c:2667
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
@@ -317,61 +305,99 @@ msgstr "Nyílt rendszer"
 msgid "Shared Key"
 msgstr "Megosztott kulcs"
 
-#: ../gnome/applet/wireless-security-option.c:209
-msgid "TKIP (Default)"
-msgstr "TKIP (alapértelmezett)"
+#: ../gnome/applet/wireless-security-option.c:208
+msgid "Automatic (Default)"
+msgstr "Automatikus (alapértelmezett)"
 
-#: ../gnome/applet/wireless-security-option.c:218
+#: ../gnome/applet/wireless-security-option.c:215
 msgid "AES-CCMP"
 msgstr "AES-CCMP"
 
+#: ../gnome/applet/wireless-security-option.c:223
+msgid "TKIP"
+msgstr "TKIP"
+
+#: ../gnome/applet/wireless-security-option.c:231
+msgid "Dynamic WEP"
+msgstr "Dinamikus WEP"
+
 #: ../gnome/applet/wso-none.c:53
 msgid "None"
 msgstr "Nincs"
 
-#: ../gnome/applet/wso-wep-ascii.c:127
-msgid "WEP 40/128-bit ASCII"
-msgstr "WEP 40/128 bites ASCII"
+#: ../gnome/applet/wso-wep-ascii.c:138
+msgid "WEP 64/128-bit ASCII"
+msgstr "WEP 64/128 bites ASCII"
+
+#: ../gnome/applet/wso-wep-hex.c:135
+msgid "WEP 64/128-bit Hex"
+msgstr "WEP 64/128 bites hexadecimális"
+
+#: ../gnome/applet/wso-wep-passphrase.c:135
+msgid "WEP 128-bit Passphrase"
+msgstr "WEP 128 bites jelmondat"
+
+#: ../gnome/applet/wso-wpa-eap.c:237
+msgid "PEAP"
+msgstr "PEAP"
+
+#: ../gnome/applet/wso-wpa-eap.c:238
+msgid "TLS"
+msgstr "TLS"
+
+#: ../gnome/applet/wso-wpa-eap.c:239
+msgid "TTLS"
+msgstr "TTLS"
+
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
+#: ../src/nm-ap-security-wpa-eap.c:116
+msgid "WPA2 Enterprise"
+msgstr "WPA2 Enterprise"
 
-#: ../gnome/applet/wso-wep-hex.c:124
-msgid "WEP 40/128-bit hex"
-msgstr "WEP 40/128 bites hexadecimális"
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
+#: ../src/nm-ap-security-wpa-eap.c:121
+msgid "WPA Enterprise"
+msgstr "WPA Enterprise"
 
-#: ../gnome/applet/wso-wep-passphrase.c:124
-msgid "WEP Passphrase"
-msgstr "WEP jelmondat"
+#: ../gnome/applet/wso-wpa-psk.c:178
+msgid "WPA2 Personal"
+msgstr "WPA2 személyes"
+
+#: ../gnome/applet/wso-wpa-psk.c:180
+msgid "WPA Personal"
+msgstr "WPA személyes"
 
-#: ../gnome/applet/eggtrayicon.c:128
+#: ../gnome/applet/eggtrayicon.c:134
 msgid "Orientation"
 msgstr "Tájolás"
 
-#: ../gnome/applet/eggtrayicon.c:129
+#: ../gnome/applet/eggtrayicon.c:135
 msgid "The orientation of the tray."
 msgstr "A tálca tájolása."
 
-#: ../gnome/applet/menu-items.c:87
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Vezetékes hálózat (%s)"
 
-#: ../gnome/applet/menu-items.c:90
+#: ../gnome/applet/menu-items.c:91
 msgid "_Wired Network"
 msgstr "_Vezetékes hálózat"
 
-#: ../gnome/applet/menu-items.c:161
+#: ../gnome/applet/menu-items.c:162
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
 msgstr[0] "Vezeték nélküli hálózat (%s)"
 msgstr[1] "Vezeték nélküli hálózatok (%s)"
 
-#: ../gnome/applet/menu-items.c:163
+#: ../gnome/applet/menu-items.c:164
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Vezeték nélküli hálózat"
 msgstr[1] "Vezeték nélküli hálózatok"
 
-#: ../gnome/applet/menu-items.c:330
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr " (érvénytelen Unicode)"
 
@@ -380,7 +406,9 @@ msgstr " (érvénytelen Unicode)"
 msgid ""
 "By default, the wireless network's name is set to your computer's name, %s, "
 "with no encryption enabled"
-msgstr "Alapértelmezésben a vezeték nélküli hálózat neve a számítógépe neve, (%s) kikapcsolt titkosítással"
+msgstr ""
+"Alapértelmezésben a vezeték nélküli hálózat neve a számítógépe neve, (%s) "
+"kikapcsolt titkosítással"
 
 #: ../gnome/applet/other-network-dialog.c:358
 msgid "Create new wireless network"
@@ -390,7 +418,9 @@ msgstr "Új vezeték nélküli hálózat létrehozása"
 msgid ""
 "Enter the name and security settings of the wireless network you wish to "
 "create."
-msgstr "Adja meg a létrehozandó vezeték nélküli hálózat nevét és biztonsági beállításait."
+msgstr ""
+"Adja meg a létrehozandó vezeték nélküli hálózat nevét és biztonsági "
+"beállításait."
 
 #: ../gnome/applet/other-network-dialog.c:363
 msgid "Create New Wireless Network"
@@ -408,13 +438,25 @@ msgstr "Adja meg azon vezeték nélküli hálózat nevét, amelyhez kapcsolódni
 msgid "Connect to Other Wireless Network"
 msgstr "Kapcsolódás más vezeték nélküli hálózathoz"
 
-#: ../gnome/applet/vpn-password-dialog.c:152
-#: ../gnome/applet/vpn-password-dialog.c:189
+#: ../gnome/applet/passphrase-dialog.c:215
+msgid "Error connecting to wireless network"
+msgstr "Hiba a vezeték nélküli hálózathoz csatlakozás közben"
+
+#: ../gnome/applet/passphrase-dialog.c:216
+msgid ""
+"The requested wireless network requires security capabilities unsupported by "
+"your hardware."
+msgstr ""
+"A kért vezeték nélküli hálózat a hardver által nem támogatott biztonsági "
+"képességeket igényel."
+
+#: ../gnome/applet/vpn-password-dialog.c:151
+#: ../gnome/applet/vpn-password-dialog.c:188
 #, c-format
 msgid "Cannot start VPN connection '%s'"
 msgstr "Nem lehet elindítani \"%s\" VPN kapcsolatot"
 
-#: ../gnome/applet/vpn-password-dialog.c:155
+#: ../gnome/applet/vpn-password-dialog.c:154
 #, c-format
 msgid ""
 "Could not find the authentication dialog for VPN connection type '%s'. "
@@ -423,7 +465,7 @@ msgstr ""
 "Nem található a hitelesítési párbeszédablak a(z) \"%s\" típusú VPN "
 "kapcsolathoz. Lépjen kapcsolatba a rendszergazdával."
 
-#: ../gnome/applet/vpn-password-dialog.c:192
+#: ../gnome/applet/vpn-password-dialog.c:191
 #, c-format
 msgid ""
 "There was a problem launching the authentication dialog for VPN connection "
@@ -486,58 +528,86 @@ msgstr ""
 "későbbiekben kapcsolódik hozzá."
 
 #: ../gnome/applet/applet.glade.h:15
+msgid "Anonymous Identity:"
+msgstr "Névtelen személyazonosság:"
+
+#: ../gnome/applet/applet.glade.h:16
 msgid "Authentication:"
 msgstr "Hitelesítés:"
 
-#: ../gnome/applet/applet.glade.h:16
+#: ../gnome/applet/applet.glade.h:17
 msgid "Broadcast Address:"
 msgstr "Broadcast cím:"
 
-#: ../gnome/applet/applet.glade.h:17
+#: ../gnome/applet/applet.glade.h:18
+msgid "CA Certificate File:"
+msgstr "CA tanúsítványfájl:"
+
+#: ../gnome/applet/applet.glade.h:19
 msgid "C_onnect"
 msgstr "Kapcs_olódás"
 
-#: ../gnome/applet/applet.glade.h:18
+#: ../gnome/applet/applet.glade.h:20
+msgid "Client Certificate File:"
+msgstr "Ügyfél tanúsítványfájl:"
+
+#: ../gnome/applet/applet.glade.h:21
 msgid "Connection Information"
 msgstr "Kapcsolat-információk"
 
-#: ../gnome/applet/applet.glade.h:19
+#: ../gnome/applet/applet.glade.h:22
 msgid "Default Route:"
 msgstr "Alapértelmezett útvonal:"
 
-#: ../gnome/applet/applet.glade.h:20
+#: ../gnome/applet/applet.glade.h:23
 msgid "Destination Address:"
 msgstr "Célcím:"
 
-#: ../gnome/applet/applet.glade.h:21
+#: ../gnome/applet/applet.glade.h:24
+msgid "Driver:"
+msgstr "Illesztőprogram:"
+
+#: ../gnome/applet/applet.glade.h:25
+msgid "EAP Method:"
+msgstr "EAP módszer:"
+
+#: ../gnome/applet/applet.glade.h:26
 msgid "Hardware Address:"
 msgstr "Hardvercím:"
 
-#: ../gnome/applet/applet.glade.h:22
+#: ../gnome/applet/applet.glade.h:27
 msgid "IP Address:"
 msgstr "IP-cím:"
 
-#: ../gnome/applet/applet.glade.h:23
+#: ../gnome/applet/applet.glade.h:28
+msgid "Identity:"
+msgstr "Személyazonosság:"
+
+#: ../gnome/applet/applet.glade.h:29
 msgid "Interface:"
 msgstr "Csatoló:"
 
-#: ../gnome/applet/applet.glade.h:24
+#: ../gnome/applet/applet.glade.h:30
+msgid "Key Type:"
+msgstr "Kulcs típusa:"
+
+#: ../gnome/applet/applet.glade.h:31
 msgid "Key:"
 msgstr "Kulcs:"
 
-#: ../gnome/applet/applet.glade.h:25
+#: ../gnome/applet/applet.glade.h:32
 msgid ""
 "None\n"
-"WEP Passphrase\n"
-"WEP 40/128-bit hex\n"
-"WEP 40/128-bit ASCII\n"
+"WEP 128-bit Passphrase\n"
+"WEP 64/128-bit Hex\n"
+"WEP 64/128-bit ASCII\n"
 msgstr ""
 "Nincs\n"
-"WEP jelmondat\n"
-"WEP 40/128-bit hexadecimális\n"
-"WEP 40/128-bit ASCII\n"
+"WEP 128 bites jelmondat\n"
+"WEP 64/128-bit hexadecimális\n"
+"WEP 64/128-bit ASCII\n"
 
-#: ../gnome/applet/applet.glade.h:30
+#: ../gnome/applet/applet.glade.h:37
 msgid ""
 "Open System\n"
 "Shared Key"
@@ -545,95 +615,111 @@ msgstr ""
 "Nyílt rendszer\n"
 "Megosztott kulcs"
 
-#: ../gnome/applet/applet.glade.h:32
+#: ../gnome/applet/applet.glade.h:39
 msgid "Other Wireless Network..."
 msgstr "Egyéb vezeték nélküli hálózat..."
 
-#: ../gnome/applet/applet.glade.h:33
+#: ../gnome/applet/applet.glade.h:40
 msgid "Passphrase:"
 msgstr "Jelmondat:"
 
-#: ../gnome/applet/applet.glade.h:34
+#: ../gnome/applet/applet.glade.h:41
 msgid "Password:"
 msgstr "Jelszó:"
 
-#: ../gnome/applet/applet.glade.h:35
+#: ../gnome/applet/applet.glade.h:42
 msgid "Primary DNS:"
 msgstr "Elsődleges DNS:"
 
-#: ../gnome/applet/applet.glade.h:36
+#: ../gnome/applet/applet.glade.h:43
+msgid "Private Key File:"
+msgstr "Személyes kulcsfájl:"
+
+#: ../gnome/applet/applet.glade.h:44
+msgid "Private Key Password:"
+msgstr "Személyes kulcs jelszava:"
+
+#: ../gnome/applet/applet.glade.h:45
 msgid "Secondary DNS:"
 msgstr "Másodlagos DNS:"
 
-#: ../gnome/applet/applet.glade.h:37
+#: ../gnome/applet/applet.glade.h:46
+msgid "Select the CA Certificate File"
+msgstr "A CA tanúsítványfájl kiválasztása"
+
+#: ../gnome/applet/applet.glade.h:47
+msgid "Select the Client Certificate File"
+msgstr "Az ügyfél tanúsítványfájl kiválasztása"
+
+#: ../gnome/applet/applet.glade.h:48
+msgid "Select the Private Key File"
+msgstr "A személyes kulcsfájl kiválasztása"
+
+#: ../gnome/applet/applet.glade.h:49
+msgid "Show key"
+msgstr "Kulcs megjelenítése"
+
+#: ../gnome/applet/applet.glade.h:50
+msgid "Show passphrase"
+msgstr "Jelmondat megjelenítése:"
+
+#: ../gnome/applet/applet.glade.h:51
+msgid "Show password"
+msgstr "Jelszó megjelenítése:"
+
+#: ../gnome/applet/applet.glade.h:52
+msgid "Show passwords"
+msgstr "Jelszavak megjelenítése:"
+
+#: ../gnome/applet/applet.glade.h:53
+msgid "Speed:"
+msgstr "Sebesség:"
+
+#: ../gnome/applet/applet.glade.h:54
 msgid "Subnet Mask:"
 msgstr "Alhálózati maszk:"
 
-#: ../gnome/applet/applet.glade.h:38
+#: ../gnome/applet/applet.glade.h:55
 msgid "Type:"
 msgstr "Típus:"
 
-#: ../gnome/applet/applet.glade.h:39
+#: ../gnome/applet/applet.glade.h:56
 msgid "User Name:"
 msgstr "Felhasználói név:"
 
-#: ../gnome/applet/applet.glade.h:40
+#: ../gnome/applet/applet.glade.h:57
 msgid "Wireless Network Key Required"
 msgstr "Vezeték nélküli hálózat kulcs szükséges"
 
-#: ../gnome/applet/applet.glade.h:41
+#: ../gnome/applet/applet.glade.h:58
 msgid "Wireless _adapter:"
 msgstr "Vezeték _nélküli csatoló:"
 
-#: ../gnome/applet/applet.glade.h:42
+#: ../gnome/applet/applet.glade.h:59
 msgid "_Always Trust this Wireless Network"
 msgstr "_Mindig megbízom ebben a vezeték nélküli hálózatban"
 
-#: ../gnome/applet/applet.glade.h:43
+#: ../gnome/applet/applet.glade.h:60
 msgid "_Don't remind me again"
 msgstr "_Ne emlékezzen rám"
 
-#: ../gnome/applet/applet.glade.h:44
+#: ../gnome/applet/applet.glade.h:61
 msgid "_Login to Network"
 msgstr "_Bejelentkezés a hálózatba"
 
-#: ../gnome/applet/applet.glade.h:45
+#: ../gnome/applet/applet.glade.h:62
 msgid "_Network Name:"
 msgstr "_Hálózatnév:"
 
-#: ../gnome/applet/applet.glade.h:46
+#: ../gnome/applet/applet.glade.h:63
 msgid "_Wireless Security:"
 msgstr "Vezeték _nélküli biztonság:"
 
-#: ../gnome/applet/applet.glade.h:47
-msgid "leap_subwindow"
-msgstr ""
-
-#: ../gnome/applet/applet.glade.h:48
-msgid "wep_key_subwindow"
-msgstr ""
-
-#: ../gnome/applet/applet.glade.h:49
-msgid "wep_passphrase_subwindow"
-msgstr ""
-
-#: ../gnome/applet/applet.glade.h:50
-msgid "wpa_psk_subwindow"
-msgstr ""
-
-#: ../gnome/applet/wso-wpa-psk.c:168
-msgid "WPA2 Personal"
-msgstr "WPA2 személyes"
-
-#: ../gnome/applet/wso-wpa-psk.c:170
-msgid "WPA Personal"
-msgstr "WPA személyes"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.c:358
+#: ../gnome/vpn-properties/nm-vpn-properties.c:383
 msgid "Cannot add VPN connection"
 msgstr "Nem lehet VPN kapcsolatot hozzáadni"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:360
+#: ../gnome/vpn-properties/nm-vpn-properties.c:385
 msgid ""
 "No suitable VPN software was found on your system. Contact your system "
 "administrator."
@@ -641,11 +727,11 @@ msgstr ""
 "Nem található megfelelő VPN szoftver a rendszerén. Lépjen kapcsolatba a "
 "rendszergazdával."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:412
+#: ../gnome/vpn-properties/nm-vpn-properties.c:437
 msgid "Cannot import VPN connection"
 msgstr "Nem lehet VPN kapcsolatot importálni"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:414
+#: ../gnome/vpn-properties/nm-vpn-properties.c:439
 #, c-format
 msgid ""
 "Cannot find suitable software for VPN connection type '%s' to import the "
@@ -654,12 +740,12 @@ msgstr ""
 "Nem található a(z) \"%s\" kapcsolattípusnak megfelelő VPN szoftver a(z) \"%s"
 "\" fájl importálásához. Lépjen kapcsolatba a rendszergazdával."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:554
+#: ../gnome/vpn-properties/nm-vpn-properties.c:579
 #, c-format
 msgid "Error retrieving VPN connection '%s'"
 msgstr "Hiba a(z) \"%s\" VPN kapcsolat lekérése közben"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:557
+#: ../gnome/vpn-properties/nm-vpn-properties.c:582
 #, c-format
 msgid ""
 "Could not find the UI files for VPN connection type '%s'. Contact your "
@@ -668,12 +754,12 @@ msgstr ""
 "Nem találhatóak a(z) \"%s\" VPN kapcsolathoz tartozó felhasználóifelület-"
 "fájlok. Lépjen kapcsolatba a rendszergazdával."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:717
+#: ../gnome/vpn-properties/nm-vpn-properties.c:739
 #, c-format
 msgid "Delete VPN connection \"%s\"?"
 msgstr "Törli a(z) \"%s\" VPN kapcsolatot?"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:720
+#: ../gnome/vpn-properties/nm-vpn-properties.c:742
 #, c-format
 msgid ""
 "All information about the VPN connection \"%s\" will be lost and you may "
@@ -684,16 +770,16 @@ msgstr ""
 "kapcsolat létrehozásához szükséges információkért lehetséges, hogy a "
 "rendszergazdára is szüksége lesz."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:926
+#: ../gnome/vpn-properties/nm-vpn-properties.c:959
 msgid "Unable to load"
 msgstr "Nem lehet betölteni"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:928
+#: ../gnome/vpn-properties/nm-vpn-properties.c:961
 msgid "Cannot find some needed resources (the glade file)!"
 msgstr "Nem található néhány szükséges erőforrás (a glade fájl)!"
 
 #. Edit dialog
-#: ../gnome/vpn-properties/nm-vpn-properties.c:1043
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
 msgid "Edit VPN Connection"
 msgstr "VPN kapcsolat szerkesztése"
 
@@ -767,11 +853,11 @@ msgstr ""
 msgid "VPN Connections"
 msgstr "VPN kapcsolatok"
 
-#: ../src/nm-ap-security-wep.c:47
+#: ../src/nm-ap-security-wep.c:52
 msgid "40-bit WEP"
 msgstr "40 bites WEP"
 
-#: ../src/nm-ap-security-wep.c:49
+#: ../src/nm-ap-security-wep.c:54
 msgid "104-bit WEP"
 msgstr "104 bites WEP"
 
@@ -783,15 +869,23 @@ msgstr "WPA TKIP"
 msgid "WPA CCMP"
 msgstr "WPA CCMP"
 
-#: ../src/nm-ap-security-wpa-psk.c:57
+#: ../src/nm-ap-security-wpa-psk.c:54
+msgid "WPA Automatic"
+msgstr "WPA automatikus"
+
+#: ../src/nm-ap-security-wpa-psk.c:59
 msgid "WPA2 TKIP"
 msgstr "WPA2 TKIP"
 
-#: ../src/nm-ap-security-wpa-psk.c:59
+#: ../src/nm-ap-security-wpa-psk.c:61
 msgid "WPA2 CCMP"
 msgstr "WPA2 CCMP"
 
-#: ../src/nm-ap-security.c:308
+#: ../src/nm-ap-security-wpa-psk.c:63
+msgid "WPA2 Automatic"
+msgstr "WPA2 automatikus"
+
+#: ../src/nm-ap-security.c:320
 msgid "none"
 msgstr "nincs"
 
@@ -829,3 +923,29 @@ msgstr "túl sok adat lett átküldve a foglalaton és ezek egy része elveszett
 msgid "error occurred while waiting for data on socket"
 msgstr "hiba lépett fel adatokra várakozás közben a foglalaton"
 
+#: ../gnome/applet/applet-dbus-devices.c:898
+#, c-format
+msgid "You are now connected to the Ad-Hoc wireless network '%s'."
+msgstr "Kapcsolódott a(z) \"%s\" ad-hoc vezeték nélküli hálózathoz kapcsolódva."
+
+#: ../gnome/applet/applet-dbus-devices.c:903
+#, c-format
+msgid "You are now connected to the wireless network '%s'."
+msgstr "Kapcsolódott a(z) \"%s\" vezeték nélküli hálózathoz."
+
+#: ../gnome/applet/applet-dbus-devices.c:910
+msgid "You are now connected to the wired network."
+msgstr "Kapcsolódott a vezetékes hálózathoz."
+
+#: ../gnome/applet/applet-dbus-devices.c:916
+msgid "Connection Established"
+msgstr "Kapcsolat létrehozva"
+
+#: ../gnome/applet/applet-dbus-devices.c:959
+msgid "Disconnected"
+msgstr "Kapcsolat bontva"
+
+#: ../gnome/applet/applet-dbus-devices.c:960
+msgid "The network connection has been disconnected."
+msgstr "A hálózati kapcsolat bontva."
+
diff --git a/po/it.po b/po/it.po
index 3a56532a6d..1a55824b7c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-27 18:46+0100\n"
+"POT-Creation-Date: 2006-05-29 18:33+0200\n"
 "PO-Revision-Date: 2005-02-25 13:19+0100\n"
 "Last-Translator: Francesco Marletta <francesco.marletta@tiscali.it>\n"
 "Language-Team: Italian <tp@list.slinux.it>\n"
@@ -16,266 +16,1078 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../info-daemon/networks.glade.h:1
-msgid "<span weight=\"bold\">Wireless Networks:</span>"
-msgstr "<span weight=\"bold\">Reti wireless:</span>"
+# [NdT] è il titolo della finestra
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:919
+#, c-format
+msgid "Passphrase for wireless network %s"
+msgstr "Frase di accesso per la rete wireless %s"
+
+#: ../gnome/applet/applet-dbus.c:265
+#, c-format
+msgid "Connection to the wireless network '%s' failed."
+msgstr "Connessione alla rete wireless \"%s\" fallita."
+
+#: ../gnome/applet/applet-dbus.c:270
+msgid "Connection to the wired network failed."
+msgstr "Connessione alla rete cablata fallita."
+
+#: ../gnome/applet/applet.c:184
+msgid "Error displaying connection information:"
+msgstr "Errore nel visualizzare le informazioni di connessione:"
+
+#: ../gnome/applet/applet.c:202
+msgid "Could not find some required resources (the glade file)!"
+msgstr "Impossibile trovare alcune risorse richieste (il file glade)!"
+
+#: ../gnome/applet/applet.c:213
+msgid "No active connections!"
+msgstr "Nessuna connessione attiva!"
+
+#: ../gnome/applet/applet.c:234
+#, c-format
+msgid "Wired Ethernet (%s)"
+msgstr "Ethernet cablata (%s)"
+
+#: ../gnome/applet/applet.c:236
+#, c-format
+msgid "Wireless Ethernet (%s)"
+msgstr "Ethernet wireless (%s)"
 
-#: ../info-daemon/networks.glade.h:2
-msgid "Modify Wireless Networks"
-msgstr "Modifica le reti wireless"
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:362
+msgid "NetworkManager Applet"
+msgstr "Applet NetworkManager"
 
-#: ../info-daemon/passphrase.glade.h:1
-msgid "*"
-msgstr "*"
+#: ../gnome/applet/applet.c:339 ../gnome/applet/applet.c:364
+msgid "Copyright © 2004-2005 Red Hat, Inc."
+msgstr "Copyright © 2004-2005 Red Hat, Inc."
 
-#: ../info-daemon/passphrase.glade.h:2
+#: ../gnome/applet/applet.c:340 ../gnome/applet/applet.c:365
 msgid ""
-"128-bit Passphrase (WEP)\n"
-"Ascii Key (WEP)\n"
-"Hex Key (WEP)"
+"Notification area applet for managing your network devices and connections."
 msgstr ""
-"Frase chiave a 128-bit (WEP)\n"
-"Chiave Ascii (WEP)\n"
-"Chiave Esadecimale (WEP)"
+"Un'applet per l'aerea di notifica per la gestione delle interfacce e delle "
+"connessioni di rete"
 
-#: ../info-daemon/passphrase.glade.h:6
-#, no-c-format
+#: ../gnome/applet/applet.c:343 ../gnome/applet/applet.c:370
+msgid "translator-credits"
+msgstr "Francesco Marletta <francesco.marletta@tiscali.it>"
+
+#: ../gnome/applet/applet.c:426
+msgid "VPN Login Failure"
+msgstr "Accesso VPN fallito"
+
+#: ../gnome/applet/applet.c:427
+#, c-format
+msgid "Could not start the VPN connection '%s' due to a login failure."
+msgstr ""
+"Impossibile avviare la connessione VPN “%s� a causa di un fallimento "
+"nell'accesso."
+
+#: ../gnome/applet/applet.c:431
+msgid "VPN Start Failure"
+msgstr "Avvio VPN fallito"
+
+#: ../gnome/applet/applet.c:432
+#, c-format
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
-"Network</span>\n"
-"\n"
-"A passphrase or encryption key is required to access the wireless network '%"
-"s'."
+"Could not start the VPN connection '%s' due to a failure launching the VPN "
+"program."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Frase chiave richiesta dalla rete "
-"wireless</span>\n"
-"\n"
-"È richiesta una frase chiave o una chiave di cifratura per accedere alla "
-"rete wireless \"%s\"."
+"Impossibile avviare la connessione VPN “%s� a causa di un fallimento "
+"nell'avvio del programma VPN."
 
-#: ../info-daemon/passphrase.glade.h:9
-msgid "Key Type:"
-msgstr "Tipo di chiave:"
+#: ../gnome/applet/applet.c:436 ../gnome/applet/applet.c:446
+msgid "VPN Connect Failure"
+msgstr "Connessione VPN fallita"
 
-#: ../info-daemon/passphrase.glade.h:10
-#: ../info-daemon/NetworkManagerInfoPassphraseDialog.c:139
-#: ../panel-applet/NMWirelessAppletOtherNetworkDialog.c:150
-#: ../panel-applet/essid.glade.h:7
-msgid "Passphrase:"
-msgstr "Frase chiave:"
+#: ../gnome/applet/applet.c:437
+#, c-format
+msgid "Could not start the VPN connection '%s' due to a connection error."
+msgstr ""
+"Impossibile avviare la connessione VPN “%s� a causa di un errore nella "
+"connessione."
 
-#: ../info-daemon/passphrase.glade.h:11
-msgid "Wireless Network Key Required"
-msgstr "Richiesta chiave per rete wireless"
+#: ../gnome/applet/applet.c:441
+msgid "VPN Configuration Error"
+msgstr "Errore di configurazione VPN"
 
-#: ../info-daemon/passphrase.glade.h:12
-msgid "_Login to Network"
-msgstr "_Login alla rete"
+#: ../gnome/applet/applet.c:442
+#, c-format
+msgid "The VPN connection '%s' was not correctly configured."
+msgstr "La connessione VPN “%s� non è stata configurata correttamente."
 
-#: ../info-daemon/NetworkManagerInfoPassphraseDialog.c:142
-#: ../panel-applet/NMWirelessAppletOtherNetworkDialog.c:153
-msgid "Ascii Key:"
-msgstr "Chiave ascii:"
+#: ../gnome/applet/applet.c:447
+#, c-format
+msgid ""
+"Could not start the VPN connection '%s' because the VPN server did not "
+"return an adequate network configuration."
+msgstr ""
+"Impossibile avviare la connessione “%s� perché il server VPN non ha "
+"restituito una configurazione di rete adeguata."
 
-#: ../info-daemon/NetworkManagerInfoPassphraseDialog.c:145
-#: ../panel-applet/NMWirelessAppletOtherNetworkDialog.c:156
-msgid "Hex Key:"
-msgstr "Chiave esadecimale:"
+#: ../gnome/applet/applet.c:517
+msgid "VPN Login Message"
+msgstr "Messaggio di accesso VPN"
+
+#: ../gnome/applet/applet.c:741 ../gnome/applet/applet.c:2508
+#: ../gnome/applet/other-network-dialog.c:453
+#: ../gnome/applet/passphrase-dialog.c:228
+msgid ""
+"The NetworkManager Applet could not find some required resources (the glade "
+"file was not found)."
+msgstr ""
+"L'applet NetworkManager non è riuscita a trovare alcune risorse richieste "
+"(il file glade non è stato trovato)."
 
-#: ../info-daemon/NetworkManagerInfoVPN.c:157
+#: ../gnome/applet/applet.c:753
 #, c-format
-msgid "You must log in to access the private network %s"
-msgstr "È necessario effettuare il login per accedere alla rete privata %s"
+msgid "The network device \"%s (%s)\" does not support wireless scanning."
+msgstr "Il dispositivo di rete “%s (%s)� non supporta la scansione wireless."
 
-#: ../panel-applet/NMWirelessApplet.c:142
-#: ../panel-applet/NMWirelessApplet.c:160
-msgid "NetworkManager Applet"
-msgstr "Applet NetworkManager"
+#: ../gnome/applet/applet.c:761
+#, c-format
+msgid "The network device \"%s (%s)\" does not support link detection."
+msgstr ""
+"Il dispositivo di rete “%s (%s)� non supporta il riconoscimento del "
+"collegamento."
 
-#: ../panel-applet/NMWirelessApplet.c:144
-#: ../panel-applet/NMWirelessApplet.c:162
-msgid "Copyright (C) 2004-2005 Red Hat, Inc."
-msgstr "Copyright © 2004-2005 Red Hat, Inc."
+#: ../gnome/applet/applet.c:908
+#, c-format
+msgid "Preparing device %s for the wired network..."
+msgstr "Preparazione del dispositivo %s per la rete cablata in corso..."
 
-#: ../panel-applet/NMWirelessApplet.c:145
-#: ../panel-applet/NMWirelessApplet.c:163
-msgid ""
-"Notification area applet for managing your network devices and connections."
+#: ../gnome/applet/applet.c:910
+#, c-format
+msgid "Preparing device %s for the wireless network '%s'..."
 msgstr ""
-"Un'applet per l'aerea di notifica per la gestione delle interfacce e delle "
-"connessioni di rete"
+"Preparazione del dispositivo %s per la rete wireless \"%s\" in corso..."
+
+#: ../gnome/applet/applet.c:918
+#, c-format
+msgid "Configuring device %s for the wired network..."
+msgstr "Configurazione del dispositivo %s per la rete cablata in corso..."
+
+#: ../gnome/applet/applet.c:920
+#, c-format
+msgid "Attempting to join the wireless network '%s'..."
+msgstr "Tentativo di unirsi alla rete wireless \"%s\" in corso..."
+
+#: ../gnome/applet/applet.c:928
+#, c-format
+msgid "Waiting for Network Key for the wireless network '%s'..."
+msgstr "In attesa della chiave di rete per la rete wireless \"%s\"..."
+
+#: ../gnome/applet/applet.c:936 ../gnome/applet/applet.c:946
+msgid "Requesting a network address from the wired network..."
+msgstr "Richiesta di un indirizzo di rete dalla rete cablata in corso..."
+
+#: ../gnome/applet/applet.c:938 ../gnome/applet/applet.c:948
+#, c-format
+msgid "Requesting a network address from the wireless network '%s'..."
+msgstr ""
+"Richiesta di un indirizzo di rete dalla rete wireless \"%s\" in corso..."
+
+#: ../gnome/applet/applet.c:956
+msgid "Finishing connection to the wired network..."
+msgstr "Chiusura della connessione alla rete cablata in corso..."
+
+#: ../gnome/applet/applet.c:958
+#, c-format
+msgid "Finishing connection to the wireless network '%s'..."
+msgstr "Chiusura della connessione alla rete wireless \"%s\" in corso..."
 
-#: ../panel-applet/NMWirelessApplet.c:379
+#: ../gnome/applet/applet.c:1075
+msgid "NetworkManager is not running"
+msgstr "NetworkManager non è in esecuzione"
+
+#: ../gnome/applet/applet.c:1083 ../gnome/applet/applet.c:1828
+msgid "Networking disabled"
+msgstr "Funzionalità di rete disabilitate"
+
+#: ../gnome/applet/applet.c:1088
 msgid "No network connection"
 msgstr "Nessuna connessione di rete"
 
-#: ../panel-applet/NMWirelessApplet.c:384
+#: ../gnome/applet/applet.c:1093
 msgid "Wired network connection"
 msgstr "Connessione di rete cablata"
 
-#: ../panel-applet/NMWirelessApplet.c:389
-msgid "Connecting to a wired network..."
-msgstr "Connessione ad una rete cablata in corso..."
-
-#: ../panel-applet/NMWirelessApplet.c:398
+#: ../gnome/applet/applet.c:1097
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Connesso ad una rete wireless ad-hoc"
 
-#: ../panel-applet/NMWirelessApplet.c:412
+#: ../gnome/applet/applet.c:1099
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "Connessione di rete wireless a \"%s\" (%d%%)"
 
-#: ../panel-applet/NMWirelessApplet.c:417
-msgid "Wireless network connection"
-msgstr "Connessione di rete wireless"
+#: ../gnome/applet/applet.c:1120
+#, c-format
+msgid "VPN connection to '%s'"
+msgstr "Connessione VPN a “%s�"
 
-#: ../panel-applet/NMWirelessApplet.c:422
+#: ../gnome/applet/applet.c:1128
 #, c-format
-msgid "Connecting to wireless network '%s'..."
-msgstr "Connessione alla rete wireless \"%s\" in corso..."
+msgid "VPN connecting to '%s'"
+msgstr "Connessione VPN a “%s� in corso"
 
-#: ../panel-applet/NMWirelessApplet.c:428
-msgid "NetworkManager is not running"
-msgstr "NetworkManager non è in esecuzione"
+#: ../gnome/applet/applet.c:1541
+msgid "_Connect to Other Wireless Network..."
+msgstr "_Connetti ad altre reti wireless..."
+
+#: ../gnome/applet/applet.c:1562
+msgid "Create _New Wireless Network..."
+msgstr "Crea _nuova rete wireless..."
+
+#: ../gnome/applet/applet.c:1685
+msgid "_VPN Connections"
+msgstr "Connessioni _VPN"
 
-#: ../panel-applet/NMWirelessApplet.c:433
-msgid "Scanning for wireless networks..."
-msgstr "Scansione di reti wireless..."
+#: ../gnome/applet/applet.c:1730
+msgid "_Configure VPN..."
+msgstr "_Configura VPN..."
 
-#: ../panel-applet/NMWirelessApplet.c:798
-msgid "Other Wireless Networks..."
-msgstr "Altre reti wireless..."
+#: ../gnome/applet/applet.c:1734
+msgid "_Disconnect VPN..."
+msgstr "_Disconnetti VPN..."
 
-#: ../panel-applet/NMWirelessApplet.c:819
-msgid "Create new Wireless Network..."
-msgstr "Crea nuova rete wireless..."
+#: ../gnome/applet/applet.c:1756
+msgid "_Dial Up Connections"
+msgstr "Connessioni mo_dem"
 
-#: ../panel-applet/NMWirelessApplet.c:895
+#. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
+#: ../gnome/applet/applet.c:1767
+#, c-format
+msgid "Connect to %s..."
+msgstr "Connetti a %s..."
+
+#: ../gnome/applet/applet.c:1773
+#, c-format
+msgid "Disconnect from %s..."
+msgstr "Disconnetti da %s..."
+
+#: ../gnome/applet/applet.c:1822
 msgid "No network devices have been found"
 msgstr "Non è stata trovata alcuna interfaccia di rete"
 
-#: ../panel-applet/NMWirelessApplet.c:1037
+#: ../gnome/applet/applet.c:2014
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager non è in esecuzione..."
 
-#: ../panel-applet/NMWirelessApplet.c:1107
-#: ../panel-applet/NMWirelessApplet.c:1156
-msgid "Pause Wireless Scanning"
-msgstr "Sospendere la scansione wireless"
+#. 'Enable Networking' item
+#: ../gnome/applet/applet.c:2170
+msgid "Enable _Networking"
+msgstr "Abilita _rete"
+
+#. 'Enable Wireless' item
+#: ../gnome/applet/applet.c:2176
+msgid "Enable _Wireless"
+msgstr "Abilita _wireless"
+
+#. 'Connection Information' item
+#: ../gnome/applet/applet.c:2182
+msgid "Connection _Information"
+msgstr "_Informazioni connessione"
+
+#. Help item
+#: ../gnome/applet/applet.c:2193
+msgid "_Help"
+msgstr "A_iuto"
+
+#. About item
+#: ../gnome/applet/applet.c:2202
+msgid "_About"
+msgstr "I_nformazioni"
+
+#: ../gnome/applet/applet.c:2667
+msgid ""
+"The NetworkManager applet could not find some required resources.  It cannot "
+"continue.\n"
+msgstr ""
+"L'applet NetworkManager non è riuscita a trovare alcune risorse richieste. "
+"Non può continuare l'esecuzione.\n"
+
+#: ../gnome/applet/wireless-security-option.c:157
+msgid "Open System"
+msgstr "Sistema aperto"
+
+#: ../gnome/applet/wireless-security-option.c:160
+msgid "Shared Key"
+msgstr "Chiave condivisa"
+
+# o Automatica?
+#: ../gnome/applet/wireless-security-option.c:208
+msgid "Automatic (Default)"
+msgstr "Automatica (predefinito)"
+
+#: ../gnome/applet/wireless-security-option.c:215
+msgid "AES-CCMP"
+msgstr "AES-CCMP"
+
+#: ../gnome/applet/wireless-security-option.c:223
+msgid "TKIP"
+msgstr "TKIP"
+
+#: ../gnome/applet/wireless-security-option.c:231
+msgid "Dynamic WEP"
+msgstr ""
+
+# Dovrebbe riferirsi a "sicurezza"
+#: ../gnome/applet/wso-none.c:53
+msgid "None"
+msgstr "Nessuna"
 
-#: ../panel-applet/NMWirelessApplet.c:1112
-msgid "Resume Wireless Scanning"
-msgstr "Riprendere la scansione wireless"
+#: ../gnome/applet/wso-wep-ascii.c:138
+#, fuzzy
+msgid "WEP 64/128-bit ASCII"
+msgstr "WEP 40/128-bit ASCII"
 
-#: ../panel-applet/NMWirelessApplet.c:1122
-#: ../panel-applet/NMWirelessApplet.c:1162
-msgid "Stop All Wireless Devices"
-msgstr "Ferma tutti i dispositivi wireless"
+#: ../gnome/applet/wso-wep-hex.c:135
+#, fuzzy
+msgid "WEP 64/128-bit Hex"
+msgstr "WEP 40/128-bit esadecimale"
+
+#: ../gnome/applet/wso-wep-passphrase.c:135
+#, fuzzy
+msgid "WEP 128-bit Passphrase"
+msgstr "Frase di accesso WEP"
+
+#: ../gnome/applet/wso-wpa-eap.c:237
+msgid "PEAP"
+msgstr "PEAP"
+
+#: ../gnome/applet/wso-wpa-eap.c:238
+msgid "TLS"
+msgstr "TLS"
+
+#: ../gnome/applet/wso-wpa-eap.c:239
+msgid "TTLS"
+msgstr "TTLS"
+
+# [NdT] va tradotto?
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
+#: ../src/nm-ap-security-wpa-eap.c:116
+msgid "WPA2 Enterprise"
+msgstr "WPA2 Enterprise"
+
+# [NdT] va tradotto?
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
+#: ../src/nm-ap-security-wpa-eap.c:121
+msgid "WPA Enterprise"
+msgstr "WPA Enterprise"
+
+#: ../gnome/applet/wso-wpa-psk.c:178
+msgid "WPA2 Personal"
+msgstr "WPA2 personale"
+
+#: ../gnome/applet/wso-wpa-psk.c:180
+msgid "WPA Personal"
+msgstr "WPA personale"
+
+#: ../gnome/applet/eggtrayicon.c:134
+msgid "Orientation"
+msgstr "Orientamento"
+
+#: ../gnome/applet/eggtrayicon.c:135
+msgid "The orientation of the tray."
+msgstr "L'orientamento del vassoio."
+
+#: ../gnome/applet/menu-items.c:88
+#, c-format
+msgid "Wired Network (%s)"
+msgstr "Rete cablata (%s)"
+
+#: ../gnome/applet/menu-items.c:91
+msgid "_Wired Network"
+msgstr "Rete _cablata"
+
+#: ../gnome/applet/menu-items.c:162
+#, c-format
+msgid "Wireless Network (%s)"
+msgid_plural "Wireless Networks (%s)"
+msgstr[0] "Rete wireless (%s)"
+msgstr[1] "Reti wireless (%s)"
 
-#: ../panel-applet/NMWirelessApplet.c:1127
-msgid "Start All Wireless Devices"
-msgstr "Avvia tutti i dispositivi wireless"
+#: ../gnome/applet/menu-items.c:164
+msgid "Wireless Network"
+msgid_plural "Wireless Networks"
+msgstr[0] "Rete wireless"
+msgstr[1] "Reti wireless"
 
-#: ../panel-applet/NMWirelessApplet.c:1172
-msgid "Help"
-msgstr "Aiuto"
+#: ../gnome/applet/menu-items.c:343
+msgid " (invalid Unicode)"
+msgstr " (Unicode non valido)"
 
-#: ../panel-applet/NMWirelessApplet.c:1179
-msgid "About"
-msgstr "Informazioni"
+#: ../gnome/applet/other-network-dialog.c:352
+#, c-format
+msgid ""
+"By default, the wireless network's name is set to your computer's name, %s, "
+"with no encryption enabled"
+msgstr ""
+"Come impostazione predefinita, il nome della rete wireless è impostata con "
+"il nome del computer, %s, senza cifratura abilitata"
 
 # [NdT] è il titolo della finestra
-#: ../panel-applet/NMWirelessAppletOtherNetworkDialog.c:229
+#: ../gnome/applet/other-network-dialog.c:358
 msgid "Create new wireless network"
 msgstr "Creazione nuova rete wireless"
 
-#: ../panel-applet/NMWirelessAppletOtherNetworkDialog.c:230
+#: ../gnome/applet/other-network-dialog.c:359
 msgid ""
-"Enter the ESSID and security settings of the wireless network you wish to "
+"Enter the name and security settings of the wireless network you wish to "
 "create."
 msgstr ""
-"Inserire l'ESSID e le impostazioni di sicurezza della rete wireless che si "
+"Inserire il nome e le impostazioni di sicurezza della rete wireless che si "
 "desidera creare."
 
-#: ../panel-applet/NMWirelessAppletOtherNetworkDialog.c:235
-msgid "Custom wireless network"
-msgstr "Rete wireless personalizzata"
+#: ../gnome/applet/other-network-dialog.c:363
+msgid "Create New Wireless Network"
+msgstr "Crea nuova rete wireless"
+
+#: ../gnome/applet/other-network-dialog.c:368
+msgid "Existing wireless network"
+msgstr "Rete wireless esistente"
+
+#: ../gnome/applet/other-network-dialog.c:369
+msgid "Enter the name of the wireless network to which you wish to connect."
+msgstr "Inserire il nome delle rete wireless a cui ci si vuole connettere."
 
-#: ../panel-applet/NMWirelessAppletOtherNetworkDialog.c:236
-msgid "Enter the ESSID of the wireless network to which you wish to connect."
-msgstr "Inserire l'ESSID della rete wireless a cui ci si vuole connettere."
+#: ../gnome/applet/other-network-dialog.c:371
+msgid "Connect to Other Wireless Network"
+msgstr "Connetti ad altre reti wireless"
 
-#. Reuse the above string to make the translators less angry.
-#: ../panel-applet/NMWirelessAppletOtherNetworkDialog.c:316
-#: ../panel-applet/NMWirelessAppletOtherNetworkDialog.c:325
+#: ../gnome/applet/passphrase-dialog.c:215
+msgid "Error connecting to wireless network"
+msgstr "Errore nella connessione alla rete wireless"
+
+#: ../gnome/applet/passphrase-dialog.c:216
 msgid ""
-"The NetworkManager Applet could not find some required resources (the glade "
-"file was not found)."
+"The requested wireless network requires security capabilities unsupported by "
+"your hardware."
 msgstr ""
-"L'applet NetworkManager non è riuscita a trovare alcune risorse richieste "
-"(il file glade non è stato trovato)."
+"La rete wireless richiesta richiede funzionalità di sicurezza non supportate "
+"dall'hardware presente."
+
+#: ../gnome/applet/vpn-password-dialog.c:151
+#: ../gnome/applet/vpn-password-dialog.c:188
+#, c-format
+msgid "Cannot start VPN connection '%s'"
+msgstr "Impossibile avviare la connessione VPN \"%s\""
+
+#: ../gnome/applet/vpn-password-dialog.c:154
+#, c-format
+msgid ""
+"Could not find the authentication dialog for VPN connection type '%s'. "
+"Contact your system administrator."
+msgstr ""
+"Impossibile trovare la finestra di dialogo per la connessione VPN di tipo \"%"
+"s\". Contattare l'amministratore di sistema."
+
+#: ../gnome/applet/vpn-password-dialog.c:191
+#, c-format
+msgid ""
+"There was a problem launching the authentication dialog for VPN connection "
+"type '%s'. Contact your system administrator."
+msgstr ""
+"Si è verificato un problema avviando la finestra di dialogo di "
+"autenticazione per la connessione VPN di tipo \"%s\". Contattare "
+"l'amministratore di sistema."
+
+#: ../gnome/applet/applet.glade.h:1
+msgid " "
+msgstr " "
+
+#: ../gnome/applet/applet.glade.h:2
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Informazioni connessione attiva</span>"
+
+#: ../gnome/applet/applet.glade.h:4
+#, no-c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
+"Network</span>\n"
+"\n"
+"A passphrase or encryption key is required to access the wireless network '%"
+"s'."
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Frase chiave richiesta dalla rete "
+"wireless</span>\n"
+"\n"
+"È richiesta una frase chiave o una chiave di cifratura per accedere alla "
+"rete wireless \"%s\"."
 
-#: ../panel-applet/essid.glade.h:1
+#: ../gnome/applet/applet.glade.h:8
+#, no-c-format
 msgid ""
-"128-bit passphrase (WEP)\n"
-"Ascii key (WEP)\n"
-"Hex key (WEP)"
+"<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
+"\n"
+"%s  It will not be completely functional."
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Funzionalità di rete ridotta</span>\n"
+"\n"
+"%s  Non sarà del funzionale."
+
+#: ../gnome/applet/applet.glade.h:12
+#, no-c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
+"span>\n"
+"\n"
+"You have chosen to log in to the wireless network '%s'.  If you are sure "
+"that this wireless network is secure, click the checkbox below and "
+"NetworkManager will not require confirmation on subsequent log ins."
 msgstr ""
-"Frase chiave a 128-bit (WEP)\n"
-"Chiave ASCII (WEP)\n"
-"Chiave esadecimale (WEP)"
+"<span weight=\"bold\" size=\"larger\">Conferma accesso a rete wireless</"
+"span>\n"
+"\n"
+"Si è scelto di accedere alla rete wireless \"%s\". Se si ha la certezza che "
+"questa rete wireless è sicura, selezionare la casella di spunta sottostante "
+"e NetworkManager non chiederà la conferma ai successivi accessi."
+
+#: ../gnome/applet/applet.glade.h:15
+msgid "Anonymous Identity:"
+msgstr "Identità anonima:"
+
+#: ../gnome/applet/applet.glade.h:16
+msgid "Authentication:"
+msgstr "Autenticazione:"
 
-#: ../panel-applet/essid.glade.h:4
+#: ../gnome/applet/applet.glade.h:17
+msgid "Broadcast Address:"
+msgstr "Indirizzo broadcast:"
+
+#: ../gnome/applet/applet.glade.h:18
+msgid "CA Certificate File:"
+msgstr "File del certificato della CA:"
+
+#: ../gnome/applet/applet.glade.h:19
 msgid "C_onnect"
 msgstr "C_onnetti"
 
-#: ../panel-applet/essid.glade.h:5
-msgid "Connect with encryption enabled"
-msgstr "Connessione con cifratura attiva"
+#: ../gnome/applet/applet.glade.h:20
+msgid "Client Certificate File:"
+msgstr "File del certificato del client:"
+
+#: ../gnome/applet/applet.glade.h:21
+msgid "Connection Information"
+msgstr "Informazioni connessione"
+
+#: ../gnome/applet/applet.glade.h:22
+msgid "Default Route:"
+msgstr "Rotta predefinita:"
+
+#: ../gnome/applet/applet.glade.h:23
+msgid "Destination Address:"
+msgstr "Indirizzo destinazione:"
+
+#: ../gnome/applet/applet.glade.h:24
+msgid "Driver:"
+msgstr "Driver:"
+
+#: ../gnome/applet/applet.glade.h:25
+msgid "EAP Method:"
+msgstr "Metodo EAP:"
+
+#: ../gnome/applet/applet.glade.h:26
+msgid "Hardware Address:"
+msgstr "Indirizzo hardware:"
 
-#: ../panel-applet/essid.glade.h:6
-msgid "Key type:"
+#: ../gnome/applet/applet.glade.h:27
+msgid "IP Address:"
+msgstr "Indirizzo IP:"
+
+#: ../gnome/applet/applet.glade.h:28
+msgid "Identity:"
+msgstr "Identità:"
+
+#: ../gnome/applet/applet.glade.h:29
+msgid "Interface:"
+msgstr "Interfaccia:"
+
+#: ../gnome/applet/applet.glade.h:30
+msgid "Key Type:"
 msgstr "Tipo di chiave:"
 
-#: ../panel-applet/essid.glade.h:8
+#: ../gnome/applet/applet.glade.h:31
+msgid "Key:"
+msgstr "Chiave:"
+
+#: ../gnome/applet/applet.glade.h:32
+#, fuzzy
+msgid ""
+"None\n"
+"WEP 128-bit Passphrase\n"
+"WEP 64/128-bit Hex\n"
+"WEP 64/128-bit ASCII\n"
+msgstr ""
+"Nessuna\n"
+"Frase di accesso WEP\n"
+"WEP 40/128-bit esadecimale\n"
+"WEP 40/128-bit ASCII\n"
+
+#: ../gnome/applet/applet.glade.h:37
+msgid ""
+"Open System\n"
+"Shared Key"
+msgstr ""
+"Sistema aperto\n"
+"Chiave condivisa"
+
+#: ../gnome/applet/applet.glade.h:39
+msgid "Other Wireless Network..."
+msgstr "Altra rete wireless..."
+
+#: ../gnome/applet/applet.glade.h:40
+msgid "Passphrase:"
+msgstr "Frase chiave:"
+
+#: ../gnome/applet/applet.glade.h:41
+msgid "Password:"
+msgstr "Password:"
+
+#: ../gnome/applet/applet.glade.h:42
+msgid "Primary DNS:"
+msgstr "DNS primario:"
+
+#: ../gnome/applet/applet.glade.h:43
+msgid "Private Key File:"
+msgstr "File della chiave privata:"
+
+#: ../gnome/applet/applet.glade.h:44
+msgid "Private Key Password:"
+msgstr "Password della chiave privata:"
+
+#: ../gnome/applet/applet.glade.h:45
+msgid "Secondary DNS:"
+msgstr "DNS secondario:"
+
+#: ../gnome/applet/applet.glade.h:46
+msgid "Select the CA Certificate File"
+msgstr "Selezionare il file con il certificato della CA"
+
+#: ../gnome/applet/applet.glade.h:47
+msgid "Select the Client Certificate File"
+msgstr "Selezionare il file con il certificato del client"
+
+#: ../gnome/applet/applet.glade.h:48
+msgid "Select the Private Key File"
+msgstr "Selezionare il file con la chiave privata"
+
+#: ../gnome/applet/applet.glade.h:49
+msgid "Show key"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:50
+#, fuzzy
+msgid "Show passphrase"
+msgstr "Frase chiave:"
+
+#: ../gnome/applet/applet.glade.h:51
+#, fuzzy
+msgid "Show password"
+msgstr "Password:"
+
+#: ../gnome/applet/applet.glade.h:52
+#, fuzzy
+msgid "Show passwords"
+msgstr "Password:"
+
+#: ../gnome/applet/applet.glade.h:53
+msgid "Speed:"
+msgstr "Velocità:"
+
+#: ../gnome/applet/applet.glade.h:54
+msgid "Subnet Mask:"
+msgstr "Maschera di rete:"
+
+#: ../gnome/applet/applet.glade.h:55
+msgid "Type:"
+msgstr "Tipo:"
+
+#: ../gnome/applet/applet.glade.h:56
+msgid "User Name:"
+msgstr "Nome utente:"
+
+#: ../gnome/applet/applet.glade.h:57
+msgid "Wireless Network Key Required"
+msgstr "Richiesta chiave per rete wireless"
+
+#: ../gnome/applet/applet.glade.h:58
 msgid "Wireless _adapter:"
 msgstr "_Adattatore wireless:"
 
-#: ../panel-applet/essid.glade.h:9
-msgid "Wireless _network:"
-msgstr "_Rete wireless:"
+#: ../gnome/applet/applet.glade.h:59
+msgid "_Always Trust this Wireless Network"
+msgstr "Dare _sempre fiducia a questa rete wireless"
+
+#: ../gnome/applet/applet.glade.h:60
+msgid "_Don't remind me again"
+msgstr "_Non ricordarlo più"
+
+#: ../gnome/applet/applet.glade.h:61
+msgid "_Login to Network"
+msgstr "_Login alla rete"
+
+#: ../gnome/applet/applet.glade.h:62
+msgid "_Network Name:"
+msgstr "_Nome rete:"
+
+#: ../gnome/applet/applet.glade.h:63
+msgid "_Wireless Security:"
+msgstr "Sicurezza _wireless:"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:383
+msgid "Cannot add VPN connection"
+msgstr "Impossibile aggiungere una connessione VPN"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:385
+msgid ""
+"No suitable VPN software was found on your system. Contact your system "
+"administrator."
+msgstr ""
+"Non è stato trovato un software VPN adatto nel sistema. Contattare "
+"l'amministratore di sistema."
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:437
+msgid "Cannot import VPN connection"
+msgstr "Impossibile importare la connessione VPN"
 
-#: ../panel-applet/menu-info.c:91
+#: ../gnome/vpn-properties/nm-vpn-properties.c:439
 #, c-format
-msgid "Wired Network (%s)"
-msgstr "Rete cablata (%s)"
+msgid ""
+"Cannot find suitable software for VPN connection type '%s' to import the "
+"file '%s'. Contact your system administrator."
+msgstr ""
+"Impossibile trovare un software adatto ad importare il file \"%2$s\" per la "
+"connessione VPN di tipo \"%1$s\". Contattare l'amministratore di sistema."
 
-#: ../panel-applet/menu-info.c:93
-msgid "Wired Network"
-msgstr "Rete cablata"
+#: ../gnome/vpn-properties/nm-vpn-properties.c:579
+#, c-format
+msgid "Error retrieving VPN connection '%s'"
+msgstr "Errore nel recuperare la connessione VPN \"%s\""
 
-#: ../panel-applet/menu-info.c:166
+#: ../gnome/vpn-properties/nm-vpn-properties.c:582
 #, c-format
-msgid "Wireless Network (%s)"
-msgid_plural "Wireless Networks (%s)"
-msgstr[0] "Rete wireless (%s)"
-msgstr[1] "Reti wireless (%s)"
+msgid ""
+"Could not find the UI files for VPN connection type '%s'. Contact your "
+"system administrator."
+msgstr ""
+"Impossibile trovare il file di interfaccia per la connessione VPN di tipo \"%"
+"s\". Contattare l'amministratore di sistema."
 
-#: ../panel-applet/menu-info.c:168
-msgid "Wireless Network"
-msgid_plural "Wireless Networks"
-msgstr[0] "Rete wireless"
-msgstr[1] "Reti wireless"
+#: ../gnome/vpn-properties/nm-vpn-properties.c:739
+#, c-format
+msgid "Delete VPN connection \"%s\"?"
+msgstr "Eliminare la connessione VPN \"%s\"?"
 
-#: ../panel-applet/menu-info.c:294
-msgid " (invalid Unicode)"
-msgstr " (Unicode non valido)"
+#: ../gnome/vpn-properties/nm-vpn-properties.c:742
+#, c-format
+msgid ""
+"All information about the VPN connection \"%s\" will be lost and you may "
+"need your system administrator to provide information to create a new "
+"connection."
+msgstr ""
+"Tutte le informazioni sulla connessione VPN \"%s\" verranno perse e sarà "
+"necessario chiedere informazioni all'amministratore di sistema per creare "
+"una nuova connessione."
 
-#: ../examples/python/systray/eggtrayicon.c:111
-msgid "Orientation"
-msgstr "Orientamento"
+#: ../gnome/vpn-properties/nm-vpn-properties.c:959
+msgid "Unable to load"
+msgstr "Impossibile caricare"
 
-#: ../examples/python/systray/eggtrayicon.c:112
-msgid "The orientation of the tray."
-msgstr "L'orientamento del vassoio."
+#: ../gnome/vpn-properties/nm-vpn-properties.c:961
+msgid "Cannot find some needed resources (the glade file)!"
+msgstr "Impossibile trovare alcune risorse richieste (il file glade)!"
+
+#. Edit dialog
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
+msgid "Edit VPN Connection"
+msgstr "Modifica connessione VPN"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:1
+msgid "Add a new VPN connection"
+msgstr "Aggiunge una nuova connessione VPN"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:2
+msgid "Choose which type of VPN connection you wish to create."
+msgstr "Scegliere quale tipo di connessione VPN si desidera creare."
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
+msgid "Connect to:"
+msgstr "Connetti a:"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
+msgid "Create VPN Connection"
+msgstr "Creazione connessione VPN"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
+msgid "Create VPN Connection - 1 of 2"
+msgstr "Creazione connessione VPN - 1 di 2"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
+msgid "Create VPN Connection - 2 of 2"
+msgstr "Creazione connessione VPN - 2 di 2"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
+msgid "Delete the selected VPN connection"
+msgstr "Elimina la connessione VPN selezionata"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
+msgid "E_xport"
+msgstr "E_sporta"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:9
+msgid "Edit the selected VPN connection"
+msgstr "Modifica la connessione VPN selezionata"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:10
+msgid "Export the VPN settings to a file"
+msgstr "Esporta le impostazioni VPN in un file"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:11
+msgid "Export the selected VPN connection to a file"
+msgstr "Esporta la connessione VPN selezionata in un file"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:12
+msgid "Finish Creating VPN Connection"
+msgstr "Fine della creazione di una connessione VPN"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:13
+msgid "Manage Virtual Private Network Connections"
+msgstr "Gestione delle connessioni alle reti private virtuali (VPN)"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:14
+msgid ""
+"This assistant will guide you through the creation of a connection to a "
+"Virtual Private Network (VPN).\n"
+"\n"
+"It will require some information, such as IP addresses and secrets.  Please "
+"see your system administrator to obtain this information."
+msgstr ""
+"Questo assistente vi guiderà nella creazione di una connessione ad una rete "
+"privata virtuale (VPN).\n"
+"\n"
+"Richiederà alcune informazioni, come indirizzi IP e dati segreti. Contattare "
+"l'amministratore di sistema per ottenere queste informazioni."
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:17
+msgid "VPN Connections"
+msgstr "Connessioni VPN"
+
+#: ../src/nm-ap-security-wep.c:52
+msgid "40-bit WEP"
+msgstr "WEP a 40 bit"
+
+#: ../src/nm-ap-security-wep.c:54
+msgid "104-bit WEP"
+msgstr "WEP a 104 bit"
+
+#: ../src/nm-ap-security-wpa-psk.c:50
+msgid "WPA TKIP"
+msgstr "WPA TKIP"
+
+#: ../src/nm-ap-security-wpa-psk.c:52
+msgid "WPA CCMP"
+msgstr "WPA CCMP"
+
+#: ../src/nm-ap-security-wpa-psk.c:54
+msgid "WPA Automatic"
+msgstr "WPA automatica"
+
+#: ../src/nm-ap-security-wpa-psk.c:59
+msgid "WPA2 TKIP"
+msgstr "WPA2 TKIP"
+
+#: ../src/nm-ap-security-wpa-psk.c:61
+msgid "WPA2 CCMP"
+msgstr "WPA2 CCMP"
+
+#: ../src/nm-ap-security-wpa-psk.c:63
+msgid "WPA2 Automatic"
+msgstr "WPA2 automatica"
+
+#: ../src/nm-ap-security.c:320
+msgid "none"
+msgstr "nessuna"
+
+#: ../src/nm-netlink-monitor.c:154
+#, c-format
+msgid ""
+"unable to create netlink socket for monitoring wired ethernet devices - %s"
+msgstr ""
+"impossibile creare un socket netlink per monitorare i dispositivi di rete "
+"cablata ethernet - %s"
+
+#: ../src/nm-netlink-monitor.c:172
+#, c-format
+msgid ""
+"unable to bind to netlink socket for monitoring wired ethernet devices - %s"
+msgstr ""
+"impossibile effettuare il bind al socket netlink per monitorare i "
+"dispositivi di rete cablata ethernet - %s"
+
+#: ../src/nm-netlink-monitor.c:405
+msgid "operation took too long"
+msgstr "l'operazione ha impiegato troppo tempo"
+
+#: ../src/nm-netlink-monitor.c:502
+msgid "received data from wrong type of sender"
+msgstr "dati ricevuti dal tipo di mittente errato"
+
+#: ../src/nm-netlink-monitor.c:515
+msgid "received data from unexpected sender"
+msgstr "dati ricevuti da un mittente inatteso"
+
+#: ../src/nm-netlink-monitor.c:646
+msgid "too much data was sent over socket and some of it was lost"
+msgstr ""
+"sono stati inviati troppi dati sul socket e una loro parte è stata persa"
+
+#: ../src/nm-netlink-monitor.c:735
+msgid "error occurred while waiting for data on socket"
+msgstr "si è verificato un errore durante l'attesa dei dati sul socket"
+
+#: ../gnome/applet/applet-dbus-devices.c:898
+#, c-format
+msgid "You are now connected to the Ad-Hoc wireless network '%s'."
+msgstr "Adesso si è connessi alla rete wireless ad-hoc \"%s\"."
+
+#: ../gnome/applet/applet-dbus-devices.c:903
+#, c-format
+msgid "You are now connected to the wireless network '%s'."
+msgstr "Adesso si è connessi alla rete wireless \"%s\"."
+
+#: ../gnome/applet/applet-dbus-devices.c:910
+msgid "You are now connected to the wired network."
+msgstr "Adesso si è connessi alla rete cablata."
+
+#: ../gnome/applet/applet-dbus-devices.c:916
+msgid "Connection Established"
+msgstr "Connessione stabilita"
+
+#: ../gnome/applet/applet-dbus-devices.c:959
+msgid "Disconnected"
+msgstr "Disconnesso"
+
+# [NdT] certo che l'originare era proprio brutto
+#: ../gnome/applet/applet-dbus-devices.c:960
+msgid "The network connection has been disconnected."
+msgstr "La connessione di rete è stata interrotta."
+
+#~ msgid "Modify Wireless Networks"
+#~ msgstr "Modifica le reti wireless"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid ""
+#~ "128-bit Passphrase (WEP)\n"
+#~ "Ascii Key (WEP)\n"
+#~ "Hex Key (WEP)"
+#~ msgstr ""
+#~ "Frase chiave a 128-bit (WEP)\n"
+#~ "Chiave Ascii (WEP)\n"
+#~ "Chiave Esadecimale (WEP)"
+
+#~ msgid "Ascii Key:"
+#~ msgstr "Chiave ascii:"
+
+#~ msgid "You must log in to access the private network %s"
+#~ msgstr "È necessario effettuare il login per accedere alla rete privata %s"
+
+#~ msgid "Scanning for wireless networks..."
+#~ msgstr "Scansione di reti wireless..."
+
+#~ msgid "Pause Wireless Scanning"
+#~ msgstr "Sospendere la scansione wireless"
+
+#~ msgid "Resume Wireless Scanning"
+#~ msgstr "Riprendere la scansione wireless"
+
+#~ msgid "Stop All Wireless Devices"
+#~ msgstr "Ferma tutti i dispositivi wireless"
+
+#~ msgid "Start All Wireless Devices"
+#~ msgstr "Avvia tutti i dispositivi wireless"
+
+#~ msgid ""
+#~ "128-bit passphrase (WEP)\n"
+#~ "Ascii key (WEP)\n"
+#~ "Hex key (WEP)"
+#~ msgstr ""
+#~ "Frase chiave a 128-bit (WEP)\n"
+#~ "Chiave ASCII (WEP)\n"
+#~ "Chiave esadecimale (WEP)"
+
+#~ msgid "Key type:"
+#~ msgstr "Tipo di chiave:"
+
+#~ msgid "Wireless _network:"
+#~ msgstr "_Rete wireless:"
+
+#~ msgid "Stop automatically running the networking applet?"
+#~ msgstr "Fermare l'avvio automatico dell'applet di rete?"
+
+#~ msgid ""
+#~ "The networking applet will now terminate, but will automatically launch "
+#~ "the next time you login.  Would you like to stop automatically running "
+#~ "the networking applet on login?"
+#~ msgstr ""
+#~ "L'applet di rete terminerà adesso, ma verrà avviata automaticamente al "
+#~ "prossimo accesso al sistema. Si vuole fermare l'avvio automatico "
+#~ "dell'applet di rete all'accesso?"
+
+#~ msgid "_Remove"
+#~ msgstr "_Rimuovi"
+
+#~ msgid "<span weight=\"bold\">Wireless Networks:</span>"
+#~ msgstr "<span weight=\"bold\">Reti wireless:</span>"
+
+#~ msgid "Hex Key:"
+#~ msgstr "Chiave esadecimale:"
+
+#~ msgid "Copyright (C) 2004-2005 Red Hat, Inc."
+#~ msgstr "Copyright © 2004-2005 Red Hat, Inc."
+
+#~ msgid "Connecting to a wired network..."
+#~ msgstr "Connessione ad una rete cablata in corso..."
+
+#~ msgid "Wireless network connection"
+#~ msgstr "Connessione di rete wireless"
+
+#~ msgid "Connecting to wireless network '%s'..."
+#~ msgstr "Connessione alla rete wireless \"%s\" in corso..."
+
+#~ msgid "Other Wireless Networks..."
+#~ msgstr "Altre reti wireless..."
+
+#~ msgid "Create new Wireless Network..."
+#~ msgstr "Crea nuova rete wireless..."
+
+#~ msgid "Help"
+#~ msgstr "Aiuto"
+
+#~ msgid "About"
+#~ msgstr "Informazioni"
+
+#~ msgid ""
+#~ "Enter the ESSID and security settings of the wireless network you wish to "
+#~ "create."
+#~ msgstr ""
+#~ "Inserire l'ESSID e le impostazioni di sicurezza della rete wireless che "
+#~ "si desidera creare."
+
+#~ msgid "Custom wireless network"
+#~ msgstr "Rete wireless personalizzata"
+
+#~ msgid ""
+#~ "Enter the ESSID of the wireless network to which you wish to connect."
+#~ msgstr "Inserire l'ESSID della rete wireless a cui ci si vuole connettere."
+
+#~ msgid "Connect with encryption enabled"
+#~ msgstr "Connessione con cifratura attiva"
+
+#~ msgid "Wired Network"
+#~ msgstr "Rete cablata"
diff --git a/po/ja.po b/po/ja.po
index 0b9f05b37f..805827f51b 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager 0.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-01 11:27+0100\n"
+"POT-Creation-Date: 2006-05-29 18:33+0200\n"
 "PO-Revision-Date: 2005-01-01 23:57+0900\n"
 "Last-Translator: Satoru SATOH <ss@gnome.gr.jp>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
@@ -16,204 +16,961 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: info-daemon/networks.glade.h:1
-msgid "<span weight=\"bold\">Wireless Networks:</span>"
-msgstr "<span weight=\"bold\">無線�ットワーク:</span>"
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:919
+#, fuzzy, c-format
+msgid "Passphrase for wireless network %s"
+msgstr "新��無線�ットワークを作�"
+
+#: ../gnome/applet/applet-dbus.c:265
+#, fuzzy, c-format
+msgid "Connection to the wireless network '%s' failed."
+msgstr "無線�ットワーク�接続中..."
+
+#: ../gnome/applet/applet-dbus.c:270
+#, fuzzy
+msgid "Connection to the wired network failed."
+msgstr "無線�ットワーク�接続中..."
+
+#: ../gnome/applet/applet.c:184
+msgid "Error displaying connection information:"
+msgstr ""
+
+#: ../gnome/applet/applet.c:202
+#, fuzzy
+msgid "Could not find some required resources (the glade file)!"
+msgstr ""
+"NetworkManager アプレット������必��リソースglade ファイル)を���る"
+"�������ん���"
+
+#: ../gnome/applet/applet.c:213
+#, fuzzy
+msgid "No active connections!"
+msgstr "�ットワーク接続��"
+
+#: ../gnome/applet/applet.c:234
+#, fuzzy, c-format
+msgid "Wired Ethernet (%s)"
+msgstr "無線�ットワーク (%s)"
 
-#: info-daemon/networks.glade.h:2
-msgid "Modify Wireless Networks"
-msgstr "無線�ットワークを変更"
+#: ../gnome/applet/applet.c:236
+#, fuzzy, c-format
+msgid "Wireless Ethernet (%s)"
+msgstr "無線�ットワーク (%s)"
+
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:362
+#, fuzzy
+msgid "NetworkManager Applet"
+msgstr "NetworkManager �実行�れ����ん"
 
-#: info-daemon/passphrase.glade.h:1 panel-applet/essid.glade.h:1
-msgid "*"
-msgstr "*"
+#: ../gnome/applet/applet.c:339 ../gnome/applet/applet.c:364
+msgid "Copyright © 2004-2005 Red Hat, Inc."
+msgstr ""
 
-#: info-daemon/passphrase.glade.h:2 panel-applet/essid.glade.h:2
+#: ../gnome/applet/applet.c:340 ../gnome/applet/applet.c:365
 msgid ""
-"128-bit Passphrase (WEP)\n"
-"Ascii Key (WEP)\n"
-"Hex Key (WEP)"
+"Notification area applet for managing your network devices and connections."
 msgstr ""
-"128-bit パスフレーズ (WEP)\n"
-"ASCII � (WEP)\n"
-"16 進� (WEP)"
 
-#: info-daemon/passphrase.glade.h:6
-#, no-c-format
+#: ../gnome/applet/applet.c:343 ../gnome/applet/applet.c:370
+msgid "translator-credits"
+msgstr ""
+
+#: ../gnome/applet/applet.c:426
+msgid "VPN Login Failure"
+msgstr ""
+
+#: ../gnome/applet/applet.c:427
+#, c-format
+msgid "Could not start the VPN connection '%s' due to a login failure."
+msgstr ""
+
+#: ../gnome/applet/applet.c:431
+msgid "VPN Start Failure"
+msgstr ""
+
+#: ../gnome/applet/applet.c:432
+#, c-format
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
-"Network</span>\n"
-"\n"
-"A passphrase or encryption key is required to access the wireless network '%"
-"s'."
+"Could not start the VPN connection '%s' due to a failure launching the VPN "
+"program."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">無線�ットワーク��パスフレーズ�"
-"必���</span>\n\n"
-"無線�ットワーク '%s' �アクセス�る��パスフレーズ�暗�化��必���"
 
-#: info-daemon/passphrase.glade.h:9 panel-applet/essid.glade.h:7
-msgid "Key Type:"
-msgstr "��種別"
+#: ../gnome/applet/applet.c:436 ../gnome/applet/applet.c:446
+msgid "VPN Connect Failure"
+msgstr ""
 
-#: info-daemon/passphrase.glade.h:10
-#: info-daemon/NetworkManagerInfoPassphraseDialog.c:139
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:147
-#: panel-applet/essid.glade.h:8
-msgid "Passphrase:"
-msgstr "パスフレーズ:"
+#: ../gnome/applet/applet.c:437
+#, c-format
+msgid "Could not start the VPN connection '%s' due to a connection error."
+msgstr ""
 
-#: info-daemon/passphrase.glade.h:11
-msgid "Wireless Network Key Required"
-msgstr "無線�ットワーク��必���"
+#: ../gnome/applet/applet.c:441
+msgid "VPN Configuration Error"
+msgstr ""
 
-#: info-daemon/passphrase.glade.h:12
-msgid "_Login to Network"
-msgstr "�ットワーク�ログイン(_L)"
+#: ../gnome/applet/applet.c:442
+#, c-format
+msgid "The VPN connection '%s' was not correctly configured."
+msgstr ""
 
-#: info-daemon/NetworkManagerInfoPassphraseDialog.c:142
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:150
-msgid "Ascii Key:"
-msgstr "ASCII �:"
+#: ../gnome/applet/applet.c:447
+#, c-format
+msgid ""
+"Could not start the VPN connection '%s' because the VPN server did not "
+"return an adequate network configuration."
+msgstr ""
 
-#: info-daemon/NetworkManagerInfoPassphraseDialog.c:145
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:153
-msgid "Hex Key:"
-msgstr "16 進�:"
+#: ../gnome/applet/applet.c:517
+msgid "VPN Login Message"
+msgstr ""
 
-#: info-daemon/NetworkManagerInfoVPN.c:157
+#: ../gnome/applet/applet.c:741 ../gnome/applet/applet.c:2508
+#: ../gnome/applet/other-network-dialog.c:453
+#: ../gnome/applet/passphrase-dialog.c:228
+msgid ""
+"The NetworkManager Applet could not find some required resources (the glade "
+"file was not found)."
+msgstr ""
+"NetworkManager アプレット������必��リソースglade ファイル)を���る"
+"�������ん���"
+
+#: ../gnome/applet/applet.c:753
+#, c-format
+msgid "The network device \"%s (%s)\" does not support wireless scanning."
+msgstr ""
+
+#: ../gnome/applet/applet.c:761
 #, c-format
-msgid "You must log in to access the private network %s"
-msgstr "プライベート�ットワーク %s �アクセス�る��ログイン"
-"���れ�����ん"
+msgid "The network device \"%s (%s)\" does not support link detection."
+msgstr ""
+
+#: ../gnome/applet/applet.c:908
+#, fuzzy, c-format
+msgid "Preparing device %s for the wired network..."
+msgstr "無線�ットワーク�接続中..."
+
+#: ../gnome/applet/applet.c:910
+#, fuzzy, c-format
+msgid "Preparing device %s for the wireless network '%s'..."
+msgstr "無線�ットワークを走査中..."
+
+#: ../gnome/applet/applet.c:918
+#, fuzzy, c-format
+msgid "Configuring device %s for the wired network..."
+msgstr "無線�ットワーク�接続中..."
+
+#: ../gnome/applet/applet.c:920
+#, fuzzy, c-format
+msgid "Attempting to join the wireless network '%s'..."
+msgstr "無線�ットワーク�接続中..."
+
+#: ../gnome/applet/applet.c:928
+#, fuzzy, c-format
+msgid "Waiting for Network Key for the wireless network '%s'..."
+msgstr "無線�ットワークを走査中..."
+
+#: ../gnome/applet/applet.c:936 ../gnome/applet/applet.c:946
+#, fuzzy
+msgid "Requesting a network address from the wired network..."
+msgstr "無線�ットワーク�接続中..."
+
+#: ../gnome/applet/applet.c:938 ../gnome/applet/applet.c:948
+#, fuzzy, c-format
+msgid "Requesting a network address from the wireless network '%s'..."
+msgstr "無線�ットワーク�接続中..."
+
+#: ../gnome/applet/applet.c:956
+#, fuzzy
+msgid "Finishing connection to the wired network..."
+msgstr "無線�ットワーク�接続中..."
+
+#: ../gnome/applet/applet.c:958
+#, fuzzy, c-format
+msgid "Finishing connection to the wireless network '%s'..."
+msgstr "無線�ットワーク�接続中..."
+
+#: ../gnome/applet/applet.c:1075
+msgid "NetworkManager is not running"
+msgstr "NetworkManager �実行�れ����ん"
+
+#: ../gnome/applet/applet.c:1083 ../gnome/applet/applet.c:1828
+msgid "Networking disabled"
+msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:293
+#: ../gnome/applet/applet.c:1088
 msgid "No network connection"
 msgstr "�ットワーク接続��"
 
-#: panel-applet/NMWirelessApplet.c:297
+#: ../gnome/applet/applet.c:1093
 msgid "Wired network connection"
 msgstr "無線�ットワーク接続"
 
-#: panel-applet/NMWirelessApplet.c:303
-msgid "Connecting to a wired network..."
-msgstr "無線�ットワーク�接続中..."
-
-#: panel-applet/NMWirelessApplet.c:311
+#: ../gnome/applet/applet.c:1097
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Ad-Hoc 無線�ットワーク�接続����"
 
-#: panel-applet/NMWirelessApplet.c:325
-#, c-format
-msgid "Wireless network connection (%d%%)"
+#: ../gnome/applet/applet.c:1099
+#, fuzzy, c-format
+msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "無線�ットワーク接続 (%d%%)"
 
-#: panel-applet/NMWirelessApplet.c:329
-msgid "Wireless network connection"
-msgstr "無線�ットワーク接続"
+#: ../gnome/applet/applet.c:1120
+#, c-format
+msgid "VPN connection to '%s'"
+msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:335
-msgid "Connecting to a wireless network..."
+#: ../gnome/applet/applet.c:1128
+#, c-format
+msgid "VPN connecting to '%s'"
+msgstr ""
+
+#: ../gnome/applet/applet.c:1541
+#, fuzzy
+msgid "_Connect to Other Wireless Network..."
 msgstr "無線�ットワーク�接続中..."
 
-#: panel-applet/NMWirelessApplet.c:339
-msgid "NetworkManager is not running"
-msgstr "NetworkManager �実行�れ����ん"
+#: ../gnome/applet/applet.c:1562
+#, fuzzy
+msgid "Create _New Wireless Network..."
+msgstr "新��無線�ットワークを作�..."
 
-#: panel-applet/NMWirelessApplet.c:345
-msgid "Scanning for wireless networks..."
-msgstr "無線�ットワークを走査中..."
+#: ../gnome/applet/applet.c:1685
+msgid "_VPN Connections"
+msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:667
-msgid "Other Wireless Networks..."
-msgstr "他�無線�ットワーク..."
+#: ../gnome/applet/applet.c:1730
+msgid "_Configure VPN..."
+msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:688
-msgid "Create new Wireless Network..."
-msgstr "新��無線�ットワークを作�..."
+#: ../gnome/applet/applet.c:1734
+msgid "_Disconnect VPN..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1756
+msgid "_Dial Up Connections"
+msgstr ""
+
+#. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
+#: ../gnome/applet/applet.c:1767
+#, c-format
+msgid "Connect to %s..."
+msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:798
+#: ../gnome/applet/applet.c:1773
+#, c-format
+msgid "Disconnect from %s..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1822
 msgid "No network devices have been found"
 msgstr "�ットワークデ�イス����り��ん���"
 
-#: panel-applet/NMWirelessApplet.c:916
+#: ../gnome/applet/applet.c:2014
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager �実行�れ����ん..."
 
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:226
-msgid "Create new wireless network"
-msgstr "新��無線�ットワークを作�"
+#. 'Enable Networking' item
+#: ../gnome/applet/applet.c:2170
+#, fuzzy
+msgid "Enable _Networking"
+msgstr "無線�ットワーク(_N):"
 
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:227
-msgid ""
-"Enter the ESSID and security settings of the wireless network you wish to "
-"create."
+#. 'Enable Wireless' item
+#: ../gnome/applet/applet.c:2176
+msgid "Enable _Wireless"
 msgstr ""
-"作����無線�ットワーク� ESSID �セキュリティ設定を入力��下��"
 
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:232
-msgid "Custom wireless network"
-msgstr "カスタム無線�ットワーク"
+#. 'Connection Information' item
+#: ../gnome/applet/applet.c:2182
+msgid "Connection _Information"
+msgstr ""
 
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:233
-msgid "Enter the ESSID of the wireless network to which you wish to connect."
-msgstr "接続��無線�ットワーク� ESSID を入力��下��"
+#. Help item
+#: ../gnome/applet/applet.c:2193
+msgid "_Help"
+msgstr ""
+
+#. About item
+#: ../gnome/applet/applet.c:2202
+msgid "_About"
+msgstr ""
 
-#. Reuse the above string to make the translators less angry.
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:314
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:323
+#: ../gnome/applet/applet.c:2667
+#, fuzzy
 msgid ""
-"The NetworkManager Applet could not find some required resources (the glade "
-"file was not found)."
+"The NetworkManager applet could not find some required resources.  It cannot "
+"continue.\n"
 msgstr ""
-"NetworkManager アプレット������必��リソース"
-"glade ファイル)を���る�������ん���"
+"NetworkManager アプレット������必��リソースglade ファイル)を���る"
+"�������ん���"
 
-#: panel-applet/essid.glade.h:5
-msgid "C_onnect"
-msgstr "接続(_O)"
+#: ../gnome/applet/wireless-security-option.c:157
+msgid "Open System"
+msgstr ""
 
-#: panel-applet/essid.glade.h:6
-msgid "Connect with encryption enabled"
-msgstr "暗�化を有効���接続"
+#: ../gnome/applet/wireless-security-option.c:160
+msgid "Shared Key"
+msgstr ""
 
-#: panel-applet/essid.glade.h:9
-msgid "Wireless _adapter:"
-msgstr "無線アダプタ(_A):"
+#: ../gnome/applet/wireless-security-option.c:208
+msgid "Automatic (Default)"
+msgstr ""
 
-#: panel-applet/essid.glade.h:10
-msgid "Wireless _Network:"
-msgstr "無線�ットワーク(_N):"
+#: ../gnome/applet/wireless-security-option.c:215
+msgid "AES-CCMP"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:223
+msgid "TKIP"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:231
+msgid "Dynamic WEP"
+msgstr ""
+
+#: ../gnome/applet/wso-none.c:53
+msgid "None"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-ascii.c:138
+msgid "WEP 64/128-bit ASCII"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-hex.c:135
+msgid "WEP 64/128-bit Hex"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-passphrase.c:135
+#, fuzzy
+msgid "WEP 128-bit Passphrase"
+msgstr "パスフレーズ:"
+
+#: ../gnome/applet/wso-wpa-eap.c:237
+msgid "PEAP"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:238
+msgid "TLS"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:239
+msgid "TTLS"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
+#: ../src/nm-ap-security-wpa-eap.c:116
+msgid "WPA2 Enterprise"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
+#: ../src/nm-ap-security-wpa-eap.c:121
+msgid "WPA Enterprise"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-psk.c:178
+msgid "WPA2 Personal"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-psk.c:180
+msgid "WPA Personal"
+msgstr ""
+
+#: ../gnome/applet/eggtrayicon.c:134
+msgid "Orientation"
+msgstr "��"
 
-#: panel-applet/menu-info.c:101
+#: ../gnome/applet/eggtrayicon.c:135
+msgid "The orientation of the tray."
+msgstr "トレイ���"
+
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "無線�ットワーク (%s)"
 
-#: panel-applet/menu-info.c:103
-msgid "Wired Network"
+#: ../gnome/applet/menu-items.c:91
+#, fuzzy
+msgid "_Wired Network"
 msgstr "無線�ットワーク"
 
-#: panel-applet/menu-info.c:168
+#: ../gnome/applet/menu-items.c:162
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
 msgstr[0] "無線�ットワーク (%s)"
 msgstr[1] "無線�ットワーク (%s)"
 
-#: panel-applet/menu-info.c:170
+#: ../gnome/applet/menu-items.c:164
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "無線�ットワーク"
 msgstr[1] "無線�ットワーク"
 
-#: panel-applet/menu-info.c:307
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr " (�正� Unicode)"
 
-#: examples/python/systray/eggtrayicon.c:111
-msgid "Orientation"
+#: ../gnome/applet/other-network-dialog.c:352
+#, c-format
+msgid ""
+"By default, the wireless network's name is set to your computer's name, %s, "
+"with no encryption enabled"
+msgstr ""
+
+#: ../gnome/applet/other-network-dialog.c:358
+msgid "Create new wireless network"
+msgstr "新��無線�ットワークを作�"
+
+#: ../gnome/applet/other-network-dialog.c:359
+#, fuzzy
+msgid ""
+"Enter the name and security settings of the wireless network you wish to "
+"create."
+msgstr "作����無線�ットワーク� ESSID �セキュリティ設定を入力��下��"
+
+#: ../gnome/applet/other-network-dialog.c:363
+#, fuzzy
+msgid "Create New Wireless Network"
+msgstr "新��無線�ットワークを作�..."
+
+#: ../gnome/applet/other-network-dialog.c:368
+#, fuzzy
+msgid "Existing wireless network"
+msgstr "カスタム無線�ットワーク"
+
+#: ../gnome/applet/other-network-dialog.c:369
+#, fuzzy
+msgid "Enter the name of the wireless network to which you wish to connect."
+msgstr "接続��無線�ットワーク� ESSID を入力��下��"
+
+#: ../gnome/applet/other-network-dialog.c:371
+#, fuzzy
+msgid "Connect to Other Wireless Network"
+msgstr "無線�ットワーク�接続中..."
+
+#: ../gnome/applet/passphrase-dialog.c:215
+#, fuzzy
+msgid "Error connecting to wireless network"
+msgstr "無線�ットワーク�接続中..."
+
+#: ../gnome/applet/passphrase-dialog.c:216
+msgid ""
+"The requested wireless network requires security capabilities unsupported by "
+"your hardware."
+msgstr ""
+
+#: ../gnome/applet/vpn-password-dialog.c:151
+#: ../gnome/applet/vpn-password-dialog.c:188
+#, c-format
+msgid "Cannot start VPN connection '%s'"
+msgstr ""
+
+#: ../gnome/applet/vpn-password-dialog.c:154
+#, c-format
+msgid ""
+"Could not find the authentication dialog for VPN connection type '%s'. "
+"Contact your system administrator."
+msgstr ""
+
+#: ../gnome/applet/vpn-password-dialog.c:191
+#, c-format
+msgid ""
+"There was a problem launching the authentication dialog for VPN connection "
+"type '%s'. Contact your system administrator."
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:1
+msgid " "
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:2
+#, fuzzy
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
+msgstr "<span weight=\"bold\">無線�ットワーク:</span>"
+
+#: ../gnome/applet/applet.glade.h:4
+#, no-c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
+"Network</span>\n"
+"\n"
+"A passphrase or encryption key is required to access the wireless network '%"
+"s'."
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">無線�ットワーク��パスフレーズ�必�"
+"��</span>\n"
+"\n"
+"無線�ットワーク '%s' �アクセス�る��パスフレーズ�暗�化��必���"
+
+#: ../gnome/applet/applet.glade.h:8
+#, no-c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
+"\n"
+"%s  It will not be completely functional."
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:12
+#, no-c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
+"span>\n"
+"\n"
+"You have chosen to log in to the wireless network '%s'.  If you are sure "
+"that this wireless network is secure, click the checkbox below and "
+"NetworkManager will not require confirmation on subsequent log ins."
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:15
+msgid "Anonymous Identity:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:16
+#, fuzzy
+msgid "Authentication:"
 msgstr "��"
 
-#: examples/python/systray/eggtrayicon.c:112
-msgid "The orientation of the tray."
-msgstr "トレイ���"
+#: ../gnome/applet/applet.glade.h:17
+msgid "Broadcast Address:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:18
+msgid "CA Certificate File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:19
+msgid "C_onnect"
+msgstr "接続(_O)"
+
+#: ../gnome/applet/applet.glade.h:20
+msgid "Client Certificate File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:21
+msgid "Connection Information"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:22
+msgid "Default Route:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:23
+msgid "Destination Address:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:24
+msgid "Driver:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:25
+msgid "EAP Method:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:26
+msgid "Hardware Address:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:27
+msgid "IP Address:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:28
+msgid "Identity:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:29
+msgid "Interface:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:30
+msgid "Key Type:"
+msgstr "��種別"
+
+#: ../gnome/applet/applet.glade.h:31
+#, fuzzy
+msgid "Key:"
+msgstr "16 進�:"
+
+#: ../gnome/applet/applet.glade.h:32
+msgid ""
+"None\n"
+"WEP 128-bit Passphrase\n"
+"WEP 64/128-bit Hex\n"
+"WEP 64/128-bit ASCII\n"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:37
+msgid ""
+"Open System\n"
+"Shared Key"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:39
+#, fuzzy
+msgid "Other Wireless Network..."
+msgstr "他�無線�ットワーク..."
+
+#: ../gnome/applet/applet.glade.h:40
+msgid "Passphrase:"
+msgstr "パスフレーズ:"
+
+#: ../gnome/applet/applet.glade.h:41
+msgid "Password:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:42
+msgid "Primary DNS:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:43
+msgid "Private Key File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:44
+msgid "Private Key Password:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:45
+msgid "Secondary DNS:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:46
+msgid "Select the CA Certificate File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:47
+msgid "Select the Client Certificate File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:48
+msgid "Select the Private Key File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:49
+msgid "Show key"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:50
+#, fuzzy
+msgid "Show passphrase"
+msgstr "パスフレーズ:"
+
+#: ../gnome/applet/applet.glade.h:51
+msgid "Show password"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:52
+msgid "Show passwords"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:53
+msgid "Speed:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:54
+msgid "Subnet Mask:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:55
+#, fuzzy
+msgid "Type:"
+msgstr "��種別"
+
+#: ../gnome/applet/applet.glade.h:56
+msgid "User Name:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:57
+msgid "Wireless Network Key Required"
+msgstr "無線�ットワーク��必���"
+
+#: ../gnome/applet/applet.glade.h:58
+msgid "Wireless _adapter:"
+msgstr "無線アダプタ(_A):"
+
+#: ../gnome/applet/applet.glade.h:59
+#, fuzzy
+msgid "_Always Trust this Wireless Network"
+msgstr "無線�ットワーク"
+
+#: ../gnome/applet/applet.glade.h:60
+msgid "_Don't remind me again"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:61
+msgid "_Login to Network"
+msgstr "�ットワーク�ログイン(_L)"
+
+#: ../gnome/applet/applet.glade.h:62
+msgid "_Network Name:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:63
+#, fuzzy
+msgid "_Wireless Security:"
+msgstr "無線アダプタ(_A):"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:383
+msgid "Cannot add VPN connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:385
+msgid ""
+"No suitable VPN software was found on your system. Contact your system "
+"administrator."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:437
+#, fuzzy
+msgid "Cannot import VPN connection"
+msgstr "�ットワーク接続��"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:439
+#, c-format
+msgid ""
+"Cannot find suitable software for VPN connection type '%s' to import the "
+"file '%s'. Contact your system administrator."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:579
+#, c-format
+msgid "Error retrieving VPN connection '%s'"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:582
+#, c-format
+msgid ""
+"Could not find the UI files for VPN connection type '%s'. Contact your "
+"system administrator."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:739
+#, c-format
+msgid "Delete VPN connection \"%s\"?"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:742
+#, c-format
+msgid ""
+"All information about the VPN connection \"%s\" will be lost and you may "
+"need your system administrator to provide information to create a new "
+"connection."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:959
+msgid "Unable to load"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:961
+#, fuzzy
+msgid "Cannot find some needed resources (the glade file)!"
+msgstr ""
+"NetworkManager アプレット������必��リソースglade ファイル)を���る"
+"�������ん���"
+
+#. Edit dialog
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
+msgid "Edit VPN Connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:1
+#, fuzzy
+msgid "Add a new VPN connection"
+msgstr "�ットワーク接続��"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:2
+msgid "Choose which type of VPN connection you wish to create."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
+#, fuzzy
+msgid "Connect to:"
+msgstr "接続(_O)"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
+msgid "Create VPN Connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
+msgid "Create VPN Connection - 1 of 2"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
+msgid "Create VPN Connection - 2 of 2"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
+msgid "Delete the selected VPN connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
+msgid "E_xport"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:9
+msgid "Edit the selected VPN connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:10
+msgid "Export the VPN settings to a file"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:11
+msgid "Export the selected VPN connection to a file"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:12
+msgid "Finish Creating VPN Connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:13
+#, fuzzy
+msgid "Manage Virtual Private Network Connections"
+msgstr "無線�ットワーク接続"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:14
+msgid ""
+"This assistant will guide you through the creation of a connection to a "
+"Virtual Private Network (VPN).\n"
+"\n"
+"It will require some information, such as IP addresses and secrets.  Please "
+"see your system administrator to obtain this information."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:17
+#, fuzzy
+msgid "VPN Connections"
+msgstr "�ットワーク接続��"
+
+#: ../src/nm-ap-security-wep.c:52
+msgid "40-bit WEP"
+msgstr ""
+
+#: ../src/nm-ap-security-wep.c:54
+msgid "104-bit WEP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:50
+msgid "WPA TKIP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:52
+msgid "WPA CCMP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:54
+msgid "WPA Automatic"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:59
+msgid "WPA2 TKIP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:61
+msgid "WPA2 CCMP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:63
+msgid "WPA2 Automatic"
+msgstr ""
+
+#: ../src/nm-ap-security.c:320
+msgid "none"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:154
+#, c-format
+msgid ""
+"unable to create netlink socket for monitoring wired ethernet devices - %s"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:172
+#, c-format
+msgid ""
+"unable to bind to netlink socket for monitoring wired ethernet devices - %s"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:405
+msgid "operation took too long"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:502
+msgid "received data from wrong type of sender"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:515
+msgid "received data from unexpected sender"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:646
+msgid "too much data was sent over socket and some of it was lost"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:735
+msgid "error occurred while waiting for data on socket"
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:898
+#, fuzzy, c-format
+msgid "You are now connected to the Ad-Hoc wireless network '%s'."
+msgstr "Ad-Hoc 無線�ットワーク�接続����"
+
+#: ../gnome/applet/applet-dbus-devices.c:903
+#, fuzzy, c-format
+msgid "You are now connected to the wireless network '%s'."
+msgstr "無線�ットワーク�接続中..."
+
+#: ../gnome/applet/applet-dbus-devices.c:910
+#, fuzzy
+msgid "You are now connected to the wired network."
+msgstr "無線�ットワーク�接続中..."
+
+#: ../gnome/applet/applet-dbus-devices.c:916
+#, fuzzy
+msgid "Connection Established"
+msgstr "暗�化を有効���接続"
+
+#: ../gnome/applet/applet-dbus-devices.c:959
+msgid "Disconnected"
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:960
+msgid "The network connection has been disconnected."
+msgstr ""
+
+#~ msgid "Modify Wireless Networks"
+#~ msgstr "無線�ットワークを変更"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid ""
+#~ "128-bit Passphrase (WEP)\n"
+#~ "Ascii Key (WEP)\n"
+#~ "Hex Key (WEP)"
+#~ msgstr ""
+#~ "128-bit パスフレーズ (WEP)\n"
+#~ "ASCII � (WEP)\n"
+#~ "16 進� (WEP)"
+
+#~ msgid "Ascii Key:"
+#~ msgstr "ASCII �:"
+
+#~ msgid "You must log in to access the private network %s"
+#~ msgstr ""
+#~ "プライベート�ットワーク %s �アクセス�る��ログイン���れ�����ん"
+
+#~ msgid "Stop automatically running the networking applet?"
+#~ msgstr "�ットワークアップレット�実行を自動的��止����?"
+
+#~ msgid ""
+#~ "The networking applet will now terminate, but will automatically launch "
+#~ "the next time you login.  Would you like to stop automatically running "
+#~ "the networking applet on login?"
+#~ msgstr ""
+#~ "�ットワークアプレット�終了�����次�ログイン�る際�自動的�起動��"
+#~ "�。ログイン時��ットワークアプレット�自動起動を�止����？"
+
+#~ msgid "_Remove"
+#~ msgstr "削除(_R)"
diff --git a/po/ko.po b/po/ko.po
index d56627f623..25896e029a 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-26 13:26+0900\n"
+"POT-Creation-Date: 2006-05-29 18:33+0200\n"
 "PO-Revision-Date: 2006-02-26 13:30+0900\n"
 "Last-Translator: Young-Ho Cha <ganadist@gmail.com>\n"
 "Language-Team: GNOME Korea <gnome-kr-hackers@lists.kldp.net>\n"
@@ -16,98 +16,98 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:923
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:919
 #, c-format
 msgid "Passphrase for wireless network %s"
 msgstr "무선 네트워� %s� 열쇠글"
 
-#: ../gnome/applet/applet-dbus.c:244
+#: ../gnome/applet/applet-dbus.c:265
 #, c-format
 msgid "Connection to the wireless network '%s' failed."
 msgstr "무선 네트워� '%s'(으)로 연결 실패."
 
-#: ../gnome/applet/applet-dbus.c:249
+#: ../gnome/applet/applet-dbus.c:270
 msgid "Connection to the wired network failed."
 msgstr "유선 네트워� 연결 실패."
 
-#: ../gnome/applet/applet.c:183
+#: ../gnome/applet/applet.c:184
 msgid "Error displaying connection information:"
 msgstr "연결 정보 보�기 오류:"
 
-#: ../gnome/applet/applet.c:200
+#: ../gnome/applet/applet.c:202
 msgid "Could not find some required resources (the glade file)!"
 msgstr "필요한 몇몇 파�(glade 파�)� 찾� 수 없습니다!"
 
-#: ../gnome/applet/applet.c:211
+#: ../gnome/applet/applet.c:213
 msgid "No active connections!"
 msgstr "활성� 연결 없�!"
 
-#: ../gnome/applet/applet.c:228
+#: ../gnome/applet/applet.c:234
 #, c-format
 msgid "Wired Ethernet (%s)"
 msgstr "유선 ��넷 (%s)"
 
-#: ../gnome/applet/applet.c:230
+#: ../gnome/applet/applet.c:236
 #, c-format
 msgid "Wireless Ethernet (%s)"
 msgstr "무선 ��넷 (%s)"
 
-#: ../gnome/applet/applet.c:327 ../gnome/applet/applet.c:352
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:362
 msgid "NetworkManager Applet"
 msgstr "네트워� 관리� 애플릿"
 
-#: ../gnome/applet/applet.c:329 ../gnome/applet/applet.c:354
+#: ../gnome/applet/applet.c:339 ../gnome/applet/applet.c:364
 msgid "Copyright © 2004-2005 Red Hat, Inc."
 msgstr "Copyright © 2004-2005 Red Hat, Inc."
 
-#: ../gnome/applet/applet.c:330 ../gnome/applet/applet.c:355
+#: ../gnome/applet/applet.c:340 ../gnome/applet/applet.c:365
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "네트워� 장치와 연결� 관리하는 애플릿."
 
-#: ../gnome/applet/applet.c:333 ../gnome/applet/applet.c:360
+#: ../gnome/applet/applet.c:343 ../gnome/applet/applet.c:370
 msgid "translator-credits"
 msgstr "차�호 <ganadist@gmail.com>, 2006"
 
-#: ../gnome/applet/applet.c:488
+#: ../gnome/applet/applet.c:426
 msgid "VPN Login Failure"
 msgstr "VPN 로그� 실패"
 
-#: ../gnome/applet/applet.c:489
+#: ../gnome/applet/applet.c:427
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a login failure."
 msgstr "로그�� 실패해서 VPN 연결 '%s'(�)를 시작할 수 없습니다."
 
-#: ../gnome/applet/applet.c:493
+#: ../gnome/applet/applet.c:431
 msgid "VPN Start Failure"
 msgstr "VPN 시작 실패"
 
-#: ../gnome/applet/applet.c:494
+#: ../gnome/applet/applet.c:432
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
 "program."
 msgstr "VPN프로그램 실행� 실패해서 VPN 연결 '%s'(�)를 시작할 수 없습니다."
 
-#: ../gnome/applet/applet.c:498 ../gnome/applet/applet.c:508
+#: ../gnome/applet/applet.c:436 ../gnome/applet/applet.c:446
 msgid "VPN Connect Failure"
 msgstr "VPN 연결 실패"
 
-#: ../gnome/applet/applet.c:499
+#: ../gnome/applet/applet.c:437
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a connection error."
 msgstr "연결� 오류가 있어서 VPN 연결 '%s'(�)를 시작할 수 없습니다."
 
-#: ../gnome/applet/applet.c:503
+#: ../gnome/applet/applet.c:441
 msgid "VPN Configuration Error"
 msgstr "VPN 설정 오류"
 
-#: ../gnome/applet/applet.c:504
+#: ../gnome/applet/applet.c:442
 #, c-format
 msgid "The VPN connection '%s' was not correctly configured."
 msgstr "VPN 연결 '%s'� 설정� 올바르지 않습니다."
 
-#: ../gnome/applet/applet.c:509
+#: ../gnome/applet/applet.c:447
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' because the VPN server did not "
@@ -117,26 +117,12 @@ msgstr ""
 "수 없습니다."
 
 #: ../gnome/applet/applet.c:517
-#, c-format
-msgid "The VPN service said: \"%s\""
-msgstr "VPN 서비스: \"%s\""
-
-#: ../gnome/applet/applet.c:524
-msgid "VPN Error"
-msgstr "VPN 오류"
-
-#: ../gnome/applet/applet.c:634
-#, c-format
-msgid "VPN connection '%s' said:"
-msgstr "VPN ì—°ê²° '%s':"
-
-#: ../gnome/applet/applet.c:637 ../gnome/applet/applet.c:642
 msgid "VPN Login Message"
 msgstr "VPN 로그� 메세지"
 
-#: ../gnome/applet/applet.c:859 ../gnome/applet/applet.c:2690
+#: ../gnome/applet/applet.c:741 ../gnome/applet/applet.c:2508
 #: ../gnome/applet/other-network-dialog.c:453
-#: ../gnome/applet/passphrase-dialog.c:227
+#: ../gnome/applet/passphrase-dialog.c:228
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
@@ -144,188 +130,163 @@ msgstr ""
 "네트워� 관리� 애플릿� 필요한 몇몇 파�� 찾� 수 없습니다. (glade 파�� "
 "찾� 수 없습니다)."
 
-#: ../gnome/applet/applet.c:871
+#: ../gnome/applet/applet.c:753
 #, c-format
 msgid "The network device \"%s (%s)\" does not support wireless scanning."
 msgstr "네트워� 장치 \"%s (%s)\"(�)가 무선랜 검색� 지�하지 않습니다."
 
-#: ../gnome/applet/applet.c:879
+#: ../gnome/applet/applet.c:761
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
 msgstr "네트워� 장치 \"%s (%s)\"(�)가 연결 �지를 지�하지 않습니다."
 
-#: ../gnome/applet/applet.c:1026
+#: ../gnome/applet/applet.c:908
 #, c-format
 msgid "Preparing device %s for the wired network..."
 msgstr "유선 네트워�� 장치 %s 준비중..."
 
-#: ../gnome/applet/applet.c:1028
+#: ../gnome/applet/applet.c:910
 #, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
 msgstr "무선 네트워� '%2$s'� 장치 %1$s 준비중..."
 
-#: ../gnome/applet/applet.c:1036
+#: ../gnome/applet/applet.c:918
 #, c-format
 msgid "Configuring device %s for the wired network..."
 msgstr "유선 네트워�� 장치 %s 설정중..."
 
-#: ../gnome/applet/applet.c:1038
+#: ../gnome/applet/applet.c:920
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
 msgstr "무선 네트워� '%s'� 참여 준비중..."
 
-#: ../gnome/applet/applet.c:1046
+#: ../gnome/applet/applet.c:928
 #, c-format
 msgid "Waiting for Network Key for the wireless network '%s'..."
 msgstr "무선 네트워� '%s'� 네트워� 키 기다리는 중..."
 
-#: ../gnome/applet/applet.c:1054 ../gnome/applet/applet.c:1064
+#: ../gnome/applet/applet.c:936 ../gnome/applet/applet.c:946
 msgid "Requesting a network address from the wired network..."
 msgstr "유선 네트워��서 네트워� 주소 요청중..."
 
-#: ../gnome/applet/applet.c:1056 ../gnome/applet/applet.c:1066
+#: ../gnome/applet/applet.c:938 ../gnome/applet/applet.c:948
 #, c-format
 msgid "Requesting a network address from the wireless network '%s'..."
 msgstr "무선 네트워� '%s'�서 네트워� 주소 요청중..."
 
-#: ../gnome/applet/applet.c:1074
+#: ../gnome/applet/applet.c:956
 msgid "Finishing connection to the wired network..."
 msgstr "유선 네트워� 연결 �내는 중..."
 
-#: ../gnome/applet/applet.c:1076
+#: ../gnome/applet/applet.c:958
 #, c-format
 msgid "Finishing connection to the wireless network '%s'..."
 msgstr "무선 네트워� '%s' 연결 �내는 중..."
 
-#: ../gnome/applet/applet.c:1187
-msgid "Disconnected"
-msgstr "연결 �겼�"
-
-#: ../gnome/applet/applet.c:1188
-msgid "The network connection has been disconnected."
-msgstr "네트워� 연결� �겼습니다."
-
-#: ../gnome/applet/applet.c:1194
-msgid "Connected"
-msgstr "연결�"
-
-#: ../gnome/applet/applet.c:1197
-msgid "Connected to a wired network interface."
-msgstr "유선 네트워�� 연결�었습니다."
-
-#: ../gnome/applet/applet.c:1205
-msgid "An ad-hoc wireless network connection has been established."
-msgstr "ad-hoc 무선 네트워� 연결� �었습니다."
-
-#: ../gnome/applet/applet.c:1210
-#, c-format
-msgid "A wireless network connection to '%s' has been established."
-msgstr "'%s'(으)로 무선 네트워� 연결� �었습니다."
-
-#: ../gnome/applet/applet.c:1268
+#: ../gnome/applet/applet.c:1075
 msgid "NetworkManager is not running"
 msgstr "네트워� 관리�가 실행 중�지 않습니다"
 
-#: ../gnome/applet/applet.c:1281 ../gnome/applet/applet.c:2017
+#: ../gnome/applet/applet.c:1083 ../gnome/applet/applet.c:1828
 msgid "Networking disabled"
 msgstr "네트워�를 사용할 수 없습니다"
 
-#: ../gnome/applet/applet.c:1286
+#: ../gnome/applet/applet.c:1088
 msgid "No network connection"
 msgstr "네트워� 연결 없�"
 
-#: ../gnome/applet/applet.c:1291
+#: ../gnome/applet/applet.c:1093
 msgid "Wired network connection"
 msgstr "유선 네트워� 연결"
 
-#: ../gnome/applet/applet.c:1295
+#: ../gnome/applet/applet.c:1097
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Ad-Hoc 무선 네트워� 연결�"
 
-#: ../gnome/applet/applet.c:1297
+#: ../gnome/applet/applet.c:1099
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "'%s'(으)로 무선 네트워� 연결 (%d%%)"
 
-#: ../gnome/applet/applet.c:1319
+#: ../gnome/applet/applet.c:1120
 #, c-format
 msgid "VPN connection to '%s'"
 msgstr "'%s'(으)로 VPN 연결"
 
-#: ../gnome/applet/applet.c:1327
+#: ../gnome/applet/applet.c:1128
 #, c-format
 msgid "VPN connecting to '%s'"
 msgstr "'%s'(으)로 VPN 연결중"
 
-#: ../gnome/applet/applet.c:1742
+#: ../gnome/applet/applet.c:1541
 msgid "_Connect to Other Wireless Network..."
 msgstr "다른 무선 네트워�� 연결(_C)..."
 
-#: ../gnome/applet/applet.c:1763
+#: ../gnome/applet/applet.c:1562
 msgid "Create _New Wireless Network..."
 msgstr "새 무선 네트워� 만들기(_N)..."
 
-#: ../gnome/applet/applet.c:1884
+#: ../gnome/applet/applet.c:1685
 msgid "_VPN Connections"
 msgstr "VPN ì—°ê²°(_V)"
 
-#: ../gnome/applet/applet.c:1919
+#: ../gnome/applet/applet.c:1730
 msgid "_Configure VPN..."
 msgstr "VPN 설정하기(_C)..."
 
-#: ../gnome/applet/applet.c:1923
+#: ../gnome/applet/applet.c:1734
 msgid "_Disconnect VPN..."
 msgstr "VPN 연결 �기(_D)..."
 
-#: ../gnome/applet/applet.c:1945
+#: ../gnome/applet/applet.c:1756
 msgid "_Dial Up Connections"
 msgstr "ì „í™” ì—°ê²°(_D)"
 
 #. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
-#: ../gnome/applet/applet.c:1956
+#: ../gnome/applet/applet.c:1767
 #, c-format
 msgid "Connect to %s..."
 msgstr "%s(으)로 연결..."
 
-#: ../gnome/applet/applet.c:1962
+#: ../gnome/applet/applet.c:1773
 #, c-format
 msgid "Disconnect from %s..."
 msgstr "%s�서 연결 �기..."
 
-#: ../gnome/applet/applet.c:2011
+#: ../gnome/applet/applet.c:1822
 msgid "No network devices have been found"
 msgstr "네트워� 장치를 찾� 수 없습니다"
 
-#: ../gnome/applet/applet.c:2203
+#: ../gnome/applet/applet.c:2014
 msgid "NetworkManager is not running..."
 msgstr "네트워� 관리�가 실행중�지 않습니다..."
 
 #. 'Enable Networking' item
-#: ../gnome/applet/applet.c:2359
+#: ../gnome/applet/applet.c:2170
 msgid "Enable _Networking"
 msgstr "네트워� 사용(_N)"
 
 #. 'Enable Wireless' item
-#: ../gnome/applet/applet.c:2365
+#: ../gnome/applet/applet.c:2176
 msgid "Enable _Wireless"
 msgstr "무선 네트워� 사용(_W)"
 
 #. 'Connection Information' item
-#: ../gnome/applet/applet.c:2371
+#: ../gnome/applet/applet.c:2182
 msgid "Connection _Information"
 msgstr "ì—°ê²° ì •ë³´(_I)"
 
 #. Help item
-#: ../gnome/applet/applet.c:2382
+#: ../gnome/applet/applet.c:2193
 msgid "_Help"
 msgstr "�움�(_H)"
 
 #. About item
-#: ../gnome/applet/applet.c:2391
+#: ../gnome/applet/applet.c:2202
 msgid "_About"
 msgstr "ì •ë³´(_A)"
 
-#: ../gnome/applet/applet.c:2809
+#: ../gnome/applet/applet.c:2667
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
@@ -341,34 +302,71 @@ msgstr "열린 시스템"
 msgid "Shared Key"
 msgstr "공유 키"
 
-#: ../gnome/applet/wireless-security-option.c:209
+#: ../gnome/applet/wireless-security-option.c:208
 msgid "Automatic (Default)"
 msgstr "�� (기본값)"
 
-#: ../gnome/applet/wireless-security-option.c:216
+#: ../gnome/applet/wireless-security-option.c:215
+msgid "AES-CCMP"
+msgstr "AES-CCMP"
+
+#: ../gnome/applet/wireless-security-option.c:223
 msgid "TKIP"
 msgstr "TKIP"
 
-#: ../gnome/applet/wireless-security-option.c:224
-msgid "AES-CCMP"
-msgstr "AES-CCMP"
+#: ../gnome/applet/wireless-security-option.c:231
+msgid "Dynamic WEP"
+msgstr ""
 
 #: ../gnome/applet/wso-none.c:53
 msgid "None"
 msgstr "없�"
 
-#: ../gnome/applet/wso-wep-ascii.c:127
-msgid "WEP 40/128-bit ASCII"
+#: ../gnome/applet/wso-wep-ascii.c:138
+#, fuzzy
+msgid "WEP 64/128-bit ASCII"
 msgstr "WEP 40/128비트 ASCII"
 
-#: ../gnome/applet/wso-wep-hex.c:124
-msgid "WEP 40/128-bit hex"
+#: ../gnome/applet/wso-wep-hex.c:135
+#, fuzzy
+msgid "WEP 64/128-bit Hex"
 msgstr "WEP 40/128비트 16진수"
 
-#: ../gnome/applet/wso-wep-passphrase.c:124
-msgid "WEP Passphrase"
+#: ../gnome/applet/wso-wep-passphrase.c:135
+#, fuzzy
+msgid "WEP 128-bit Passphrase"
 msgstr "WEP 열쇠글"
 
+#: ../gnome/applet/wso-wpa-eap.c:237
+msgid "PEAP"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:238
+msgid "TLS"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:239
+msgid "TTLS"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
+#: ../src/nm-ap-security-wpa-eap.c:116
+msgid "WPA2 Enterprise"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
+#: ../src/nm-ap-security-wpa-eap.c:121
+msgid "WPA Enterprise"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-psk.c:178
+msgid "WPA2 Personal"
+msgstr "개�용 WPA2"
+
+#: ../gnome/applet/wso-wpa-psk.c:180
+msgid "WPA Personal"
+msgstr "개�용 WPA"
+
 #: ../gnome/applet/eggtrayicon.c:134
 msgid "Orientation"
 msgstr "ë°©í–¥"
@@ -377,27 +375,27 @@ msgstr "ë°©í–¥"
 msgid "The orientation of the tray."
 msgstr "트레�� 방향."
 
-#: ../gnome/applet/menu-items.c:87
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "유선 네트워� (%s)"
 
-#: ../gnome/applet/menu-items.c:90
+#: ../gnome/applet/menu-items.c:91
 msgid "_Wired Network"
 msgstr "유선 네트워�(_W)"
 
-#: ../gnome/applet/menu-items.c:161
+#: ../gnome/applet/menu-items.c:162
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
 msgstr[0] "무선 네트워� (%s)"
 
-#: ../gnome/applet/menu-items.c:163
+#: ../gnome/applet/menu-items.c:164
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "무선 네트워�"
 
-#: ../gnome/applet/menu-items.c:330
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr " (잘못� 유니코드)"
 
@@ -436,23 +434,23 @@ msgstr "연결하려는 무선 네트워�� �름� 입력하십시오."
 msgid "Connect to Other Wireless Network"
 msgstr "다른 무선 네트워�� 연결"
 
-#: ../gnome/applet/passphrase-dialog.c:214
+#: ../gnome/applet/passphrase-dialog.c:215
 msgid "Error connecting to wireless network"
 msgstr "무선 네트워� 연결 오류"
 
-#: ../gnome/applet/passphrase-dialog.c:215
+#: ../gnome/applet/passphrase-dialog.c:216
 msgid ""
 "The requested wireless network requires security capabilities unsupported by "
 "your hardware."
 msgstr "무선 네트워��서 하드웨어가 지�하지 않는 보안 기능� 필요로 합니다."
 
-#: ../gnome/applet/vpn-password-dialog.c:152
-#: ../gnome/applet/vpn-password-dialog.c:189
+#: ../gnome/applet/vpn-password-dialog.c:151
+#: ../gnome/applet/vpn-password-dialog.c:188
 #, c-format
 msgid "Cannot start VPN connection '%s'"
 msgstr "VPN 연결 '%s'(�)를 시작할 수 없습니다"
 
-#: ../gnome/applet/vpn-password-dialog.c:155
+#: ../gnome/applet/vpn-password-dialog.c:154
 #, c-format
 msgid ""
 "Could not find the authentication dialog for VPN connection type '%s'. "
@@ -461,7 +459,7 @@ msgstr ""
 "VPN 연결 형� '%s'� �� 대화��를 찾� 수 없습니다.시스템 관리��게 알려"
 "주십시오."
 
-#: ../gnome/applet/vpn-password-dialog.c:192
+#: ../gnome/applet/vpn-password-dialog.c:191
 #, c-format
 msgid ""
 "There was a problem launching the authentication dialog for VPN connection "
@@ -581,22 +579,28 @@ msgid "Interface:"
 msgstr "�터페�스:"
 
 #: ../gnome/applet/applet.glade.h:30
+#, fuzzy
+msgid "Key Type:"
+msgstr "형�:"
+
+#: ../gnome/applet/applet.glade.h:31
 msgid "Key:"
 msgstr "키:"
 
-#: ../gnome/applet/applet.glade.h:31
+#: ../gnome/applet/applet.glade.h:32
+#, fuzzy
 msgid ""
 "None\n"
-"WEP Passphrase\n"
-"WEP 40/128-bit hex\n"
-"WEP 40/128-bit ASCII\n"
+"WEP 128-bit Passphrase\n"
+"WEP 64/128-bit Hex\n"
+"WEP 64/128-bit ASCII\n"
 msgstr ""
 "없�\n"
 "WEP 열쇠글\n"
 "WEP 40/128비트 16진수\n"
 "WEP 40/128비트 ASCII\n"
 
-#: ../gnome/applet/applet.glade.h:36
+#: ../gnome/applet/applet.glade.h:37
 msgid ""
 "Open System\n"
 "Shared Key"
@@ -604,130 +608,125 @@ msgstr ""
 "열린 시스템\n"
 "공유 키"
 
-#: ../gnome/applet/applet.glade.h:38
+#: ../gnome/applet/applet.glade.h:39
 msgid "Other Wireless Network..."
 msgstr "다른 무선 네트워�..."
 
-#: ../gnome/applet/applet.glade.h:39
+#: ../gnome/applet/applet.glade.h:40
 msgid "Passphrase:"
 msgstr "열쇠글:"
 
-#: ../gnome/applet/applet.glade.h:40
+#: ../gnome/applet/applet.glade.h:41
 msgid "Password:"
 msgstr "열쇠글:"
 
-#: ../gnome/applet/applet.glade.h:41
+#: ../gnome/applet/applet.glade.h:42
 msgid "Primary DNS:"
 msgstr "기본 DNS:"
 
-#: ../gnome/applet/applet.glade.h:42
+#: ../gnome/applet/applet.glade.h:43
 msgid "Private Key File:"
 msgstr "개�키 파�:"
 
-#: ../gnome/applet/applet.glade.h:43
+#: ../gnome/applet/applet.glade.h:44
 msgid "Private Key Password:"
 msgstr "개�키 열쇠글:"
 
-#: ../gnome/applet/applet.glade.h:44
+#: ../gnome/applet/applet.glade.h:45
 msgid "Secondary DNS:"
 msgstr "ë³´ì¡° DNS:"
 
-#: ../gnome/applet/applet.glade.h:45
+#: ../gnome/applet/applet.glade.h:46
 msgid "Select the CA Certificate File"
 msgstr "CA ��서 파�� 선�하십시오"
 
-#: ../gnome/applet/applet.glade.h:46
+#: ../gnome/applet/applet.glade.h:47
 msgid "Select the Client Certificate File"
 msgstr "���언트 ��서 파�� 선�하십시오"
 
-#: ../gnome/applet/applet.glade.h:47
+#: ../gnome/applet/applet.glade.h:48
 msgid "Select the Private Key File"
 msgstr "개�키 파�� 선�하십시오"
 
-#: ../gnome/applet/applet.glade.h:48
+#: ../gnome/applet/applet.glade.h:49
+msgid "Show key"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:50
+#, fuzzy
+msgid "Show passphrase"
+msgstr "열쇠글:"
+
+#: ../gnome/applet/applet.glade.h:51
+#, fuzzy
+msgid "Show password"
+msgstr "열쇠글:"
+
+#: ../gnome/applet/applet.glade.h:52
+#, fuzzy
+msgid "Show passwords"
+msgstr "열쇠글:"
+
+#: ../gnome/applet/applet.glade.h:53
+msgid "Speed:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:54
 msgid "Subnet Mask:"
 msgstr "서브넷 마스�:"
 
-#: ../gnome/applet/applet.glade.h:49
+#: ../gnome/applet/applet.glade.h:55
 msgid "Type:"
 msgstr "형�:"
 
-#: ../gnome/applet/applet.glade.h:50
+#: ../gnome/applet/applet.glade.h:56
 msgid "User Name:"
 msgstr "사용� �름:"
 
-#: ../gnome/applet/applet.glade.h:51
+#: ../gnome/applet/applet.glade.h:57
 msgid "Wireless Network Key Required"
 msgstr "무선 네트워� 키가 필요합니다"
 
-#: ../gnome/applet/applet.glade.h:52
+#: ../gnome/applet/applet.glade.h:58
 msgid "Wireless _adapter:"
 msgstr "무선 아답터(_A):"
 
-#: ../gnome/applet/applet.glade.h:53
+#: ../gnome/applet/applet.glade.h:59
 msgid "_Always Trust this Wireless Network"
 msgstr "� 무선 네트워� 항� 신뢰(_A)"
 
-#: ../gnome/applet/applet.glade.h:54
+#: ../gnome/applet/applet.glade.h:60
 msgid "_Don't remind me again"
 msgstr "다시 묻지 않�(_D)"
 
-#: ../gnome/applet/applet.glade.h:55
+#: ../gnome/applet/applet.glade.h:61
 msgid "_Login to Network"
 msgstr "네트워�� 로그�(_L)"
 
-#: ../gnome/applet/applet.glade.h:56
+#: ../gnome/applet/applet.glade.h:62
 msgid "_Network Name:"
 msgstr "네트워� �름(_N):"
 
-#: ../gnome/applet/applet.glade.h:57
+#: ../gnome/applet/applet.glade.h:63
 msgid "_Wireless Security:"
 msgstr "무선 보안(_W):"
 
-#: ../gnome/applet/applet.glade.h:58
-msgid "leap_subwindow"
-msgstr "leap_subwindow"
-
-#: ../gnome/applet/applet.glade.h:59
-msgid "wep_key_subwindow"
-msgstr "wep_key_subwindow"
-
-#: ../gnome/applet/applet.glade.h:60
-msgid "wep_passphrase_subwindow"
-msgstr "wep_passphrase_subwindow"
-
-#: ../gnome/applet/applet.glade.h:61
-msgid "wpa_eap_subwindow"
-msgstr "wpa_eap_subwindow"
-
-#: ../gnome/applet/applet.glade.h:62
-msgid "wpa_psk_subwindow"
-msgstr "wpa_psk_subwindow"
-
-#: ../gnome/applet/wso-wpa-psk.c:166
-msgid "WPA2 Personal"
-msgstr "개�용 WPA2"
-
-#: ../gnome/applet/wso-wpa-psk.c:168
-msgid "WPA Personal"
-msgstr "개�용 WPA"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.c:358
+#: ../gnome/vpn-properties/nm-vpn-properties.c:383
 msgid "Cannot add VPN connection"
 msgstr "VPN 연결� �할 수 없�"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:360
+#: ../gnome/vpn-properties/nm-vpn-properties.c:385
 msgid ""
 "No suitable VPN software was found on your system. Contact your system "
 "administrator."
 msgstr ""
 "시스템� 알맞는 VPN 소프트웨어가 없습니다. 시스템 관리��게 알리기 바립니다."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:411
+#: ../gnome/vpn-properties/nm-vpn-properties.c:437
 msgid "Cannot import VPN connection"
 msgstr "VPN 연결 가져올 수 없�"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:413
+#: ../gnome/vpn-properties/nm-vpn-properties.c:439
 #, c-format
 msgid ""
 "Cannot find suitable software for VPN connection type '%s' to import the "
@@ -736,12 +735,12 @@ msgstr ""
 "파� '%2$s'�서 VPN 연결 형� '%1$s'(�)를 가져올 수 있는 �당한 소프트웨어"
 "가 없습니다. 시스템 관리��게 알리기 바�니다."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:553
+#: ../gnome/vpn-properties/nm-vpn-properties.c:579
 #, c-format
 msgid "Error retrieving VPN connection '%s'"
 msgstr "VPN 연결 '%s' 얻는� 오류"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:556
+#: ../gnome/vpn-properties/nm-vpn-properties.c:582
 #, c-format
 msgid ""
 "Could not find the UI files for VPN connection type '%s'. Contact your "
@@ -750,12 +749,12 @@ msgstr ""
 "VPN 연결 형� '%s'� 대한 UI 파�� 찾� 수 없습니다. 시스템 관리��게 알리"
 "기 바�니다."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:713
+#: ../gnome/vpn-properties/nm-vpn-properties.c:739
 #, c-format
 msgid "Delete VPN connection \"%s\"?"
 msgstr "VPN 연결 \"%s\"(�)를 지우겠습니까?"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:716
+#: ../gnome/vpn-properties/nm-vpn-properties.c:742
 #, c-format
 msgid ""
 "All information about the VPN connection \"%s\" will be lost and you may "
@@ -765,16 +764,16 @@ msgstr ""
 "VPN 연결 \"%s\"� 대한 모든 정보를 버립니다. 그리고 시스템 관리��게 새 연결"
 "� 대한 정보를 다시 얻어야 합니다."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:921
+#: ../gnome/vpn-properties/nm-vpn-properties.c:959
 msgid "Unable to load"
 msgstr "�� 수 없�"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:923
+#: ../gnome/vpn-properties/nm-vpn-properties.c:961
 msgid "Cannot find some needed resources (the glade file)!"
 msgstr "필요한 몇몇 파�(glade 파�)� 찾� 수 없습니다!"
 
 #. Edit dialog
-#: ../gnome/vpn-properties/nm-vpn-properties.c:1031
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
 msgid "Edit VPN Connection"
 msgstr "VPN 연결 편집"
 
@@ -847,11 +846,11 @@ msgstr ""
 msgid "VPN Connections"
 msgstr "VPN ì—°ê²°"
 
-#: ../src/nm-ap-security-wep.c:47
+#: ../src/nm-ap-security-wep.c:52
 msgid "40-bit WEP"
 msgstr "40비트 WEP"
 
-#: ../src/nm-ap-security-wep.c:49
+#: ../src/nm-ap-security-wep.c:54
 msgid "104-bit WEP"
 msgstr "104비트 WEP"
 
@@ -879,7 +878,7 @@ msgstr "WAP2 CCMP"
 msgid "WPA2 Automatic"
 msgstr "WPA2 ��"
 
-#: ../src/nm-ap-security.c:305
+#: ../src/nm-ap-security.c:320
 msgid "none"
 msgstr "없�"
 
@@ -914,3 +913,86 @@ msgstr "너무 많� ��터가 보내졌고 �부는 잃어버렸습니다"
 #: ../src/nm-netlink-monitor.c:735
 msgid "error occurred while waiting for data on socket"
 msgstr "소켓�서 ��터를 기다리는 �안 오류가 발�했습니다"
+
+#: ../gnome/applet/applet-dbus-devices.c:898
+#, fuzzy, c-format
+msgid "You are now connected to the Ad-Hoc wireless network '%s'."
+msgstr "Ad-Hoc 무선 네트워� 연결�"
+
+#: ../gnome/applet/applet-dbus-devices.c:903
+#, fuzzy, c-format
+msgid "You are now connected to the wireless network '%s'."
+msgstr "무선 네트워� '%s' 연결 �내는 중..."
+
+#: ../gnome/applet/applet-dbus-devices.c:910
+#, fuzzy
+msgid "You are now connected to the wired network."
+msgstr "유선 네트워� 연결 �내는 중..."
+
+#: ../gnome/applet/applet-dbus-devices.c:916
+msgid "Connection Established"
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:959
+msgid "Disconnected"
+msgstr "연결 �겼�"
+
+#: ../gnome/applet/applet-dbus-devices.c:960
+msgid "The network connection has been disconnected."
+msgstr "네트워� 연결� �겼습니다."
+
+#~ msgid "The VPN service said: \"%s\""
+#~ msgstr "VPN 서비스: \"%s\""
+
+#~ msgid "VPN Error"
+#~ msgstr "VPN 오류"
+
+#~ msgid "VPN connection '%s' said:"
+#~ msgstr "VPN ì—°ê²° '%s':"
+
+#~ msgid "Connected"
+#~ msgstr "연결�"
+
+#~ msgid "Connected to a wired network interface."
+#~ msgstr "유선 네트워�� 연결�었습니다."
+
+#~ msgid "An ad-hoc wireless network connection has been established."
+#~ msgstr "ad-hoc 무선 네트워� 연결� �었습니다."
+
+#~ msgid "A wireless network connection to '%s' has been established."
+#~ msgstr "'%s'(으)로 무선 네트워� 연결� �었습니다."
+
+#~ msgid "leap_subwindow"
+#~ msgstr "leap_subwindow"
+
+#~ msgid "wep_key_subwindow"
+#~ msgstr "wep_key_subwindow"
+
+#~ msgid "wep_passphrase_subwindow"
+#~ msgstr "wep_passphrase_subwindow"
+
+#~ msgid "wpa_eap_subwindow"
+#~ msgstr "wpa_eap_subwindow"
+
+#~ msgid "wpa_psk_subwindow"
+#~ msgstr "wpa_psk_subwindow"
+
+#~ msgid "WEP 40/128-bit ASCII"
+#~ msgstr "WEP 40/128비트 ASCII"
+
+#~ msgid "WEP 40/128-bit hex"
+#~ msgstr "WEP 40/128비트 16진수"
+
+#~ msgid "WEP Passphrase"
+#~ msgstr "WEP 열쇠글"
+
+#~ msgid ""
+#~ "None\n"
+#~ "WEP Passphrase\n"
+#~ "WEP 40/128-bit hex\n"
+#~ "WEP 40/128-bit ASCII\n"
+#~ msgstr ""
+#~ "없�\n"
+#~ "WEP 열쇠글\n"
+#~ "WEP 40/128비트 16진수\n"
+#~ "WEP 40/128비트 ASCII\n"
diff --git a/po/lt.po b/po/lt.po
index 6993f86e0e..a97fc7735a 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -8,83 +8,84 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-25 00:28+0200\n"
+"POT-Creation-Date: 2006-05-29 18:33+0200\n"
 "PO-Revision-Date: 2006-02-25 00:37+0200\n"
 "Last-Translator: Žygimantas Beru�ka <zygis@gnome.org>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
+"100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:923
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:919
 #, c-format
 msgid "Passphrase for wireless network %s"
 msgstr "Bevielio tinklo „%s“ slaptažodis"
 
-#: ../gnome/applet/applet-dbus.c:244
+#: ../gnome/applet/applet-dbus.c:265
 #, c-format
 msgid "Connection to the wireless network '%s' failed."
 msgstr "Nepavyko prisijungti prie bevielio tinklo „%s“."
 
-#: ../gnome/applet/applet-dbus.c:249
+#: ../gnome/applet/applet-dbus.c:270
 msgid "Connection to the wired network failed."
 msgstr "Nepavyko prisijungti prie laidinio tinklo."
 
-#: ../gnome/applet/applet.c:183
+#: ../gnome/applet/applet.c:184
 msgid "Error displaying connection information:"
 msgstr "Klaida rodant prisijungimo informacijÄ…:"
 
-#: ../gnome/applet/applet.c:200
+#: ../gnome/applet/applet.c:202
 msgid "Could not find some required resources (the glade file)!"
 msgstr "Nepavyko rasti kai kurių reikalingų resursų (glade rinkmenos)!"
 
-#: ../gnome/applet/applet.c:211
+#: ../gnome/applet/applet.c:213
 msgid "No active connections!"
 msgstr "Nėra aktyvių prisijungimų!"
 
-#: ../gnome/applet/applet.c:228
+#: ../gnome/applet/applet.c:234
 #, c-format
 msgid "Wired Ethernet (%s)"
 msgstr "Laidinis tinklas (%s)"
 
-#: ../gnome/applet/applet.c:230
+#: ../gnome/applet/applet.c:236
 #, c-format
 msgid "Wireless Ethernet (%s)"
 msgstr "Bevielis tinklas (%s)"
 
-#: ../gnome/applet/applet.c:327 ../gnome/applet/applet.c:352
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:362
 msgid "NetworkManager Applet"
 msgstr "NetworkManager įtaisas"
 
-#: ../gnome/applet/applet.c:329 ../gnome/applet/applet.c:354
+#: ../gnome/applet/applet.c:339 ../gnome/applet/applet.c:364
 msgid "Copyright © 2004-2005 Red Hat, Inc."
 msgstr "Autorinės teisės © 2004-2005 Red Hat, Inc."
 
-#: ../gnome/applet/applet.c:330 ../gnome/applet/applet.c:355
+#: ../gnome/applet/applet.c:340 ../gnome/applet/applet.c:365
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Pranešimų vietos įtaisas Jūsų tinklo įrenginių ir prisijungimų valdymui."
 
-#: ../gnome/applet/applet.c:333 ../gnome/applet/applet.c:360
+#: ../gnome/applet/applet.c:343 ../gnome/applet/applet.c:370
 msgid "translator-credits"
 msgstr "Žygimantas Beru�ka <zygis@gnome.org>"
 
-#: ../gnome/applet/applet.c:488
+#: ../gnome/applet/applet.c:426
 msgid "VPN Login Failure"
 msgstr "VPN prisijungimas nepavyko"
 
-#: ../gnome/applet/applet.c:489
+#: ../gnome/applet/applet.c:427
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a login failure."
 msgstr "VPN prisijungimo „%s“ atverti nepavyko, nes nepavyko autentikuotis."
 
-#: ../gnome/applet/applet.c:493
+#: ../gnome/applet/applet.c:431
 msgid "VPN Start Failure"
 msgstr "VPN atverti nepavyko"
 
-#: ../gnome/applet/applet.c:494
+#: ../gnome/applet/applet.c:432
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
@@ -92,25 +93,25 @@ msgid ""
 msgstr ""
 "Nepavyko atverti VPN prisijungimo „%s“, nes nepavyko paleisti VPN programos."
 
-#: ../gnome/applet/applet.c:498 ../gnome/applet/applet.c:508
+#: ../gnome/applet/applet.c:436 ../gnome/applet/applet.c:446
 msgid "VPN Connect Failure"
 msgstr "VPN prisijungimo klaida"
 
-#: ../gnome/applet/applet.c:499
+#: ../gnome/applet/applet.c:437
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a connection error."
 msgstr "Nepavyko atverti VPN prisijungimo „%s“ dėl prisijungimo klaidos."
 
-#: ../gnome/applet/applet.c:503
+#: ../gnome/applet/applet.c:441
 msgid "VPN Configuration Error"
 msgstr "VPN konfigūracijos klaida"
 
-#: ../gnome/applet/applet.c:504
+#: ../gnome/applet/applet.c:442
 #, c-format
 msgid "The VPN connection '%s' was not correctly configured."
 msgstr "VPN prisijungimas „%s“ buvo neteisingai sukonfigūruotas."
 
-#: ../gnome/applet/applet.c:509
+#: ../gnome/applet/applet.c:447
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' because the VPN server did not "
@@ -120,26 +121,12 @@ msgstr ""
 "adekva�ios tinklo konfigūracijos."
 
 #: ../gnome/applet/applet.c:517
-#, c-format
-msgid "The VPN service said: \"%s\""
-msgstr "Iš VPN tarnybos gauta: „%s“"
-
-#: ../gnome/applet/applet.c:524
-msgid "VPN Error"
-msgstr "VPN klaida"
-
-#: ../gnome/applet/applet.c:634
-#, c-format
-msgid "VPN connection '%s' said:"
-msgstr "Iš VPN prisijungimo „%s“ gauta:"
-
-#: ../gnome/applet/applet.c:637 ../gnome/applet/applet.c:642
 msgid "VPN Login Message"
 msgstr "VPN prisijungimo pranešimas"
 
-#: ../gnome/applet/applet.c:859 ../gnome/applet/applet.c:2690
+#: ../gnome/applet/applet.c:741 ../gnome/applet/applet.c:2508
 #: ../gnome/applet/other-network-dialog.c:453
-#: ../gnome/applet/passphrase-dialog.c:227
+#: ../gnome/applet/passphrase-dialog.c:228
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
@@ -147,188 +134,163 @@ msgstr ""
 "NetworkManager įtaisas nerado kai kurių reikalingų resursų (nerasta glade "
 "rinkmena)."
 
-#: ../gnome/applet/applet.c:871
+#: ../gnome/applet/applet.c:753
 #, c-format
 msgid "The network device \"%s (%s)\" does not support wireless scanning."
 msgstr "Tinklinis įrenginys „%s (%s)“ nepalaiko bevielio skanavimo."
 
-#: ../gnome/applet/applet.c:879
+#: ../gnome/applet/applet.c:761
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
 msgstr "Tinklinis įrenginys „%s (%s)“ nepalaiko saitų aptikimo."
 
-#: ../gnome/applet/applet.c:1026
+#: ../gnome/applet/applet.c:908
 #, c-format
 msgid "Preparing device %s for the wired network..."
 msgstr "Įrenginys %s ruošiamas laidiniam tinklui..."
 
-#: ../gnome/applet/applet.c:1028
+#: ../gnome/applet/applet.c:910
 #, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
 msgstr "Įrenginys %s ruošiamas bevieliam tinklui „%s“..."
 
-#: ../gnome/applet/applet.c:1036
+#: ../gnome/applet/applet.c:918
 #, c-format
 msgid "Configuring device %s for the wired network..."
 msgstr "Įrenginys %s konfigūruojamas laidiniam tinklui..."
 
-#: ../gnome/applet/applet.c:1038
+#: ../gnome/applet/applet.c:920
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
 msgstr "Bandoma prisijungti prie bevielio tinklo „%s“..."
 
-#: ../gnome/applet/applet.c:1046
+#: ../gnome/applet/applet.c:928
 #, c-format
 msgid "Waiting for Network Key for the wireless network '%s'..."
 msgstr "Bevielio tinklo „%s“ laukiama Tinklo rakto..."
 
-#: ../gnome/applet/applet.c:1054 ../gnome/applet/applet.c:1064
+#: ../gnome/applet/applet.c:936 ../gnome/applet/applet.c:946
 msgid "Requesting a network address from the wired network..."
 msgstr "Laidinio tinklo prašoma adreso tinkle..."
 
-#: ../gnome/applet/applet.c:1056 ../gnome/applet/applet.c:1066
+#: ../gnome/applet/applet.c:938 ../gnome/applet/applet.c:948
 #, c-format
 msgid "Requesting a network address from the wireless network '%s'..."
 msgstr "Bevielio tinklo „%s“ prašoma adreso tinkle..."
 
-#: ../gnome/applet/applet.c:1074
+#: ../gnome/applet/applet.c:956
 msgid "Finishing connection to the wired network..."
 msgstr "Užbaigiamas prisijungimas prie laidinio tinklo..."
 
-#: ../gnome/applet/applet.c:1076
+#: ../gnome/applet/applet.c:958
 #, c-format
 msgid "Finishing connection to the wireless network '%s'..."
 msgstr "Užbaigiamas prisijungimas prie bevielio tinklo „%s“..."
 
-#: ../gnome/applet/applet.c:1187
-msgid "Disconnected"
-msgstr "Atjungta"
-
-#: ../gnome/applet/applet.c:1188
-msgid "The network connection has been disconnected."
-msgstr "Atsijungta nuo tinklo."
-
-#: ../gnome/applet/applet.c:1194
-msgid "Connected"
-msgstr "Prisijungta"
-
-#: ../gnome/applet/applet.c:1197
-msgid "Connected to a wired network interface."
-msgstr "Prisijungta prie laidinio tinklo sÄ…sajos."
-
-#: ../gnome/applet/applet.c:1205
-msgid "An ad-hoc wireless network connection has been established."
-msgstr "Prisijungta prie ad-hoc bevielio tinklo."
-
-#: ../gnome/applet/applet.c:1210
-#, c-format
-msgid "A wireless network connection to '%s' has been established."
-msgstr "Prisijungta bevieliu ryšiu prie „%s“."
-
-#: ../gnome/applet/applet.c:1268
+#: ../gnome/applet/applet.c:1075
 msgid "NetworkManager is not running"
 msgstr "NetworkManager nepaleistas"
 
-#: ../gnome/applet/applet.c:1281 ../gnome/applet/applet.c:2017
+#: ../gnome/applet/applet.c:1083 ../gnome/applet/applet.c:1828
 msgid "Networking disabled"
 msgstr "Tinklo sÄ…sajos atjungtos"
 
-#: ../gnome/applet/applet.c:1286
+#: ../gnome/applet/applet.c:1088
 msgid "No network connection"
 msgstr "NÄ—ra tinklo prisijungimo"
 
-#: ../gnome/applet/applet.c:1291
+#: ../gnome/applet/applet.c:1093
 msgid "Wired network connection"
 msgstr "Bevielis tinklo prisijungimas"
 
-#: ../gnome/applet/applet.c:1295
+#: ../gnome/applet/applet.c:1097
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Prisijungti prie Ad-Hoc bevielio tinklo"
 
-#: ../gnome/applet/applet.c:1297
+#: ../gnome/applet/applet.c:1099
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "Bevielio tinklo prisijungimas prie „%s“ (%d%%)"
 
-#: ../gnome/applet/applet.c:1319
+#: ../gnome/applet/applet.c:1120
 #, c-format
 msgid "VPN connection to '%s'"
 msgstr "VPN prisijungimas prie „%s“"
 
-#: ../gnome/applet/applet.c:1327
+#: ../gnome/applet/applet.c:1128
 #, c-format
 msgid "VPN connecting to '%s'"
 msgstr "VPN prisijungimas prie „%s“"
 
-#: ../gnome/applet/applet.c:1742
+#: ../gnome/applet/applet.c:1541
 msgid "_Connect to Other Wireless Network..."
 msgstr "_Prisijungti prie kito bevielio tinklo..."
 
-#: ../gnome/applet/applet.c:1763
+#: ../gnome/applet/applet.c:1562
 msgid "Create _New Wireless Network..."
 msgstr "Sukurti _naują bevielį tinklą..."
 
-#: ../gnome/applet/applet.c:1884
+#: ../gnome/applet/applet.c:1685
 msgid "_VPN Connections"
 msgstr "_VPN prisijungimai"
 
-#: ../gnome/applet/applet.c:1919
+#: ../gnome/applet/applet.c:1730
 msgid "_Configure VPN..."
 msgstr "_Konfigūruoti VPN..."
 
-#: ../gnome/applet/applet.c:1923
+#: ../gnome/applet/applet.c:1734
 msgid "_Disconnect VPN..."
 msgstr "_Atjungti VPN..."
 
-#: ../gnome/applet/applet.c:1945
+#: ../gnome/applet/applet.c:1756
 msgid "_Dial Up Connections"
 msgstr "_Dial Up prisijungimai"
 
 #. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
-#: ../gnome/applet/applet.c:1956
+#: ../gnome/applet/applet.c:1767
 #, c-format
 msgid "Connect to %s..."
 msgstr "Prisijungti prie %s..."
 
-#: ../gnome/applet/applet.c:1962
+#: ../gnome/applet/applet.c:1773
 #, c-format
 msgid "Disconnect from %s..."
 msgstr "Atsijungti nuo %s..."
 
-#: ../gnome/applet/applet.c:2011
+#: ../gnome/applet/applet.c:1822
 msgid "No network devices have been found"
 msgstr "Nerasta tinklinių įrenginių"
 
-#: ../gnome/applet/applet.c:2203
+#: ../gnome/applet/applet.c:2014
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager nepaleistas..."
 
 #. 'Enable Networking' item
-#: ../gnome/applet/applet.c:2359
+#: ../gnome/applet/applet.c:2170
 msgid "Enable _Networking"
 msgstr "Įjungti _tinklą"
 
 #. 'Enable Wireless' item
-#: ../gnome/applet/applet.c:2365
+#: ../gnome/applet/applet.c:2176
 msgid "Enable _Wireless"
 msgstr "Įjungti _bevielį"
 
 #. 'Connection Information' item
-#: ../gnome/applet/applet.c:2371
+#: ../gnome/applet/applet.c:2182
 msgid "Connection _Information"
 msgstr "Prisijungimo _informacija"
 
 #. Help item
-#: ../gnome/applet/applet.c:2382
+#: ../gnome/applet/applet.c:2193
 msgid "_Help"
 msgstr "_Pagalba"
 
 #. About item
-#: ../gnome/applet/applet.c:2391
+#: ../gnome/applet/applet.c:2202
 msgid "_About"
 msgstr "_Apie"
 
-#: ../gnome/applet/applet.c:2809
+#: ../gnome/applet/applet.c:2667
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
@@ -344,33 +306,67 @@ msgstr "Atvira sistema"
 msgid "Shared Key"
 msgstr "Viešas raktas"
 
-#: ../gnome/applet/wireless-security-option.c:209
+#: ../gnome/applet/wireless-security-option.c:208
 msgid "Automatic (Default)"
 msgstr "Automatiškas (numatytasis)"
 
-#: ../gnome/applet/wireless-security-option.c:217
+#: ../gnome/applet/wireless-security-option.c:215
+msgid "AES-CCMP"
+msgstr "AES-CCMP"
+
+#: ../gnome/applet/wireless-security-option.c:223
 msgid "TKIP"
 msgstr "TKIP"
 
-#: ../gnome/applet/wireless-security-option.c:225
-msgid "AES-CCMP"
-msgstr "AES-CCMP"
+#: ../gnome/applet/wireless-security-option.c:231
+msgid "Dynamic WEP"
+msgstr ""
 
 #: ../gnome/applet/wso-none.c:53
 msgid "None"
 msgstr "NÄ—ra"
 
-#: ../gnome/applet/wso-wep-ascii.c:127
-msgid "WEP 40/128-bit ASCII"
-msgstr "WEP 40/128-bit ASCII"
+#: ../gnome/applet/wso-wep-ascii.c:138
+msgid "WEP 64/128-bit ASCII"
+msgstr "WEP 64/128 bitų ASCII"
+
+#: ../gnome/applet/wso-wep-hex.c:135
+msgid "WEP 64/128-bit Hex"
+msgstr "WEP 64/128 bitų Hex"
+
+#: ../gnome/applet/wso-wep-passphrase.c:135
+msgid "WEP 128-bit Passphrase"
+msgstr "WEP 128 bitų slaptažodis"
+
+#: ../gnome/applet/wso-wpa-eap.c:237
+msgid "PEAP"
+msgstr "PEAP"
+
+#: ../gnome/applet/wso-wpa-eap.c:238
+msgid "TLS"
+msgstr "TLS"
+
+#: ../gnome/applet/wso-wpa-eap.c:239
+msgid "TTLS"
+msgstr "TTLS"
 
-#: ../gnome/applet/wso-wep-hex.c:124
-msgid "WEP 40/128-bit hex"
-msgstr "WEP 40/128-bit hex"
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
+#: ../src/nm-ap-security-wpa-eap.c:116
+msgid "WPA2 Enterprise"
+msgstr "WPA2 industrinis"
 
-#: ../gnome/applet/wso-wep-passphrase.c:124
-msgid "WEP Passphrase"
-msgstr "WEP slaptažodis"
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
+#: ../src/nm-ap-security-wpa-eap.c:121
+msgid "WPA Enterprise"
+msgstr "WPA industrinis"
+
+#: ../gnome/applet/wso-wpa-psk.c:178
+msgid "WPA2 Personal"
+msgstr "WPA2 asmeninis"
+
+#: ../gnome/applet/wso-wpa-psk.c:180
+msgid "WPA Personal"
+msgstr "WPA asmeninis"
 
 #: ../gnome/applet/eggtrayicon.c:134
 msgid "Orientation"
@@ -380,16 +376,16 @@ msgstr "Orientacija"
 msgid "The orientation of the tray."
 msgstr "Skydelio orientacija."
 
-#: ../gnome/applet/menu-items.c:87
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Laidinis tinklas (%s)"
 
-#: ../gnome/applet/menu-items.c:90
+#: ../gnome/applet/menu-items.c:91
 msgid "_Wired Network"
 msgstr "_Laidinis tinklas"
 
-#: ../gnome/applet/menu-items.c:161
+#: ../gnome/applet/menu-items.c:162
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
@@ -397,14 +393,14 @@ msgstr[0] "Bevielis tinklas (%s)"
 msgstr[1] "Bevieliai tinklai (%s)"
 msgstr[2] "Bevielių tinklų (%s)"
 
-#: ../gnome/applet/menu-items.c:163
+#: ../gnome/applet/menu-items.c:164
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Bevielis tinklas"
 msgstr[1] "Bevieliai tinklai"
 msgstr[2] "Bevielių tinklų"
 
-#: ../gnome/applet/menu-items.c:330
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr " (netinkamas Unikodas)"
 
@@ -444,11 +440,11 @@ msgstr "Įveskite bevielio tinklo, prie kurio norite jungtis, pavadinimą."
 msgid "Connect to Other Wireless Network"
 msgstr "Prisijungti prie kito bevielio tinklo"
 
-#: ../gnome/applet/passphrase-dialog.c:214
+#: ../gnome/applet/passphrase-dialog.c:215
 msgid "Error connecting to wireless network"
 msgstr "Klaida jungiantis prie bevielio tinklo"
 
-#: ../gnome/applet/passphrase-dialog.c:215
+#: ../gnome/applet/passphrase-dialog.c:216
 msgid ""
 "The requested wireless network requires security capabilities unsupported by "
 "your hardware."
@@ -456,13 +452,13 @@ msgstr ""
 "Užklaustam bevieliui tinklui reikia saugumo ypatybių, kokių Jūsų aparatūra "
 "nepalaiko."
 
-#: ../gnome/applet/vpn-password-dialog.c:152
-#: ../gnome/applet/vpn-password-dialog.c:189
+#: ../gnome/applet/vpn-password-dialog.c:151
+#: ../gnome/applet/vpn-password-dialog.c:188
 #, c-format
 msgid "Cannot start VPN connection '%s'"
 msgstr "Nepavyko atverti VPN prisijungimo „%s“"
 
-#: ../gnome/applet/vpn-password-dialog.c:155
+#: ../gnome/applet/vpn-password-dialog.c:154
 #, c-format
 msgid ""
 "Could not find the authentication dialog for VPN connection type '%s'. "
@@ -471,7 +467,7 @@ msgstr ""
 "Nepavyko rasti autentikacijos dialogo VPN prisijungimo tipui „%s“. "
 "Susisiekite su savo sistemos administratoriumi."
 
-#: ../gnome/applet/vpn-password-dialog.c:192
+#: ../gnome/applet/vpn-password-dialog.c:191
 #, c-format
 msgid ""
 "There was a problem launching the authentication dialog for VPN connection "
@@ -536,62 +532,87 @@ msgstr ""
 "langelį ir NetworkManager ateityje prisijungiant nereikalaus patvirtinimo."
 
 #: ../gnome/applet/applet.glade.h:15
+msgid "Anonymous Identity:"
+msgstr "AnoniminÄ— tapatybÄ—:"
+
+#: ../gnome/applet/applet.glade.h:16
 msgid "Authentication:"
 msgstr "Autentikacija:"
 
-#: ../gnome/applet/applet.glade.h:16
+#: ../gnome/applet/applet.glade.h:17
 msgid "Broadcast Address:"
 msgstr "Transliacijos adresas:"
 
-#: ../gnome/applet/applet.glade.h:17
+#: ../gnome/applet/applet.glade.h:18
+msgid "CA Certificate File:"
+msgstr "CA sertifikato rinkmena:"
+
+#: ../gnome/applet/applet.glade.h:19
 msgid "C_onnect"
 msgstr "Prisi_jungti"
 
-#: ../gnome/applet/applet.glade.h:18
+#: ../gnome/applet/applet.glade.h:20
+msgid "Client Certificate File:"
+msgstr "Kliento sertifikato rinkmena:"
+
+#: ../gnome/applet/applet.glade.h:21
 msgid "Connection Information"
 msgstr "Prisijungimo informacija"
 
-#: ../gnome/applet/applet.glade.h:19
+#: ../gnome/applet/applet.glade.h:22
 msgid "Default Route:"
 msgstr "Numatytasis maršrutas:"
 
-#: ../gnome/applet/applet.glade.h:20
+#: ../gnome/applet/applet.glade.h:23
 msgid "Destination Address:"
 msgstr "Paskirties adresas:"
 
-#: ../gnome/applet/applet.glade.h:21
+#: ../gnome/applet/applet.glade.h:24
 msgid "Driver:"
 msgstr "TvarkyklÄ—:"
 
-#: ../gnome/applet/applet.glade.h:22
+#: ../gnome/applet/applet.glade.h:25
+msgid "EAP Method:"
+msgstr "EAP metodas:"
+
+#: ../gnome/applet/applet.glade.h:26
 msgid "Hardware Address:"
 msgstr "Aparatinis adresas:"
 
-#: ../gnome/applet/applet.glade.h:23
+#: ../gnome/applet/applet.glade.h:27
 msgid "IP Address:"
 msgstr "IP adresas:"
 
-#: ../gnome/applet/applet.glade.h:24
+#: ../gnome/applet/applet.glade.h:28
+msgid "Identity:"
+msgstr "TapatybÄ—:"
+
+#: ../gnome/applet/applet.glade.h:29
 msgid "Interface:"
 msgstr "SÄ…saja:"
 
-#: ../gnome/applet/applet.glade.h:25
+#: ../gnome/applet/applet.glade.h:30
+#, fuzzy
+msgid "Key Type:"
+msgstr "Tipas:"
+
+#: ../gnome/applet/applet.glade.h:31
 msgid "Key:"
 msgstr "Raktas:"
 
-#: ../gnome/applet/applet.glade.h:26
+#: ../gnome/applet/applet.glade.h:32
 msgid ""
 "None\n"
-"WEP Passphrase\n"
-"WEP 40/128-bit hex\n"
-"WEP 40/128-bit ASCII\n"
+"WEP 128-bit Passphrase\n"
+"WEP 64/128-bit Hex\n"
+"WEP 64/128-bit ASCII\n"
 msgstr ""
-"Jokio\n"
-"WEP slaptažodis\n"
-"WEP 40/128 bitų hex\n"
-"WEP 40/128 bitų ASCII\n"
+"NÄ—ra\n"
+"WEP 128 bitų slaptažodis\n"
+"WEP 64/128 bitų Hex\n"
+"WEP 64/128 bitų ASCII\n"
 
-#: ../gnome/applet/applet.glade.h:31
+#: ../gnome/applet/applet.glade.h:37
 msgid ""
 "Open System\n"
 "Shared Key"
@@ -599,95 +620,111 @@ msgstr ""
 "Atvira sistema\n"
 "Viešas raktas"
 
-#: ../gnome/applet/applet.glade.h:33
+#: ../gnome/applet/applet.glade.h:39
 msgid "Other Wireless Network..."
 msgstr "Kitas bevielis tinklas..."
 
-#: ../gnome/applet/applet.glade.h:34
+#: ../gnome/applet/applet.glade.h:40
 msgid "Passphrase:"
 msgstr "Slaptažodis:"
 
-#: ../gnome/applet/applet.glade.h:35
+#: ../gnome/applet/applet.glade.h:41
 msgid "Password:"
 msgstr "Slaptažodis:"
 
-#: ../gnome/applet/applet.glade.h:36
+#: ../gnome/applet/applet.glade.h:42
 msgid "Primary DNS:"
 msgstr "Pirminis DNS:"
 
-#: ../gnome/applet/applet.glade.h:37
+#: ../gnome/applet/applet.glade.h:43
+msgid "Private Key File:"
+msgstr "Privataus rakto rinkmena:"
+
+#: ../gnome/applet/applet.glade.h:44
+msgid "Private Key Password:"
+msgstr "Privataus rakto slaptažodis:"
+
+#: ../gnome/applet/applet.glade.h:45
 msgid "Secondary DNS:"
 msgstr "Antrinis DNS:"
 
-#: ../gnome/applet/applet.glade.h:38
+#: ../gnome/applet/applet.glade.h:46
+msgid "Select the CA Certificate File"
+msgstr "Pasirinkite CA sertifikato rinkmenÄ…"
+
+#: ../gnome/applet/applet.glade.h:47
+msgid "Select the Client Certificate File"
+msgstr "Pasirinkite Kliento sertifikato rinkmenÄ…"
+
+#: ../gnome/applet/applet.glade.h:48
+msgid "Select the Private Key File"
+msgstr "Pasirinkite privataus rakto rinkmenÄ…"
+
+#: ../gnome/applet/applet.glade.h:49
+msgid "Show key"
+msgstr "Rodyti raktÄ…"
+
+#: ../gnome/applet/applet.glade.h:50
+msgid "Show passphrase"
+msgstr "Rodyti slaptažodį"
+
+#: ../gnome/applet/applet.glade.h:51
+msgid "Show password"
+msgstr "Rodyti slaptažodį"
+
+#: ../gnome/applet/applet.glade.h:52
+msgid "Show passwords"
+msgstr "Rodyti slaptažodžius"
+
+#: ../gnome/applet/applet.glade.h:53
+msgid "Speed:"
+msgstr "Greitis:"
+
+#: ../gnome/applet/applet.glade.h:54
 msgid "Subnet Mask:"
 msgstr "Potinklio kaukÄ—:"
 
-#: ../gnome/applet/applet.glade.h:39
+#: ../gnome/applet/applet.glade.h:55
 msgid "Type:"
 msgstr "Tipas:"
 
-#: ../gnome/applet/applet.glade.h:40
+#: ../gnome/applet/applet.glade.h:56
 msgid "User Name:"
 msgstr "Naudotojo vardas:"
 
-#: ../gnome/applet/applet.glade.h:41
+#: ../gnome/applet/applet.glade.h:57
 msgid "Wireless Network Key Required"
 msgstr "Reikalingas bevielio tinklo raktas"
 
-#: ../gnome/applet/applet.glade.h:42
+#: ../gnome/applet/applet.glade.h:58
 msgid "Wireless _adapter:"
 msgstr "Bevielis _adapteris:"
 
-#: ../gnome/applet/applet.glade.h:43
+#: ../gnome/applet/applet.glade.h:59
 msgid "_Always Trust this Wireless Network"
 msgstr "_Visada pasitikÄ—ti Å¡iuo bevieliu tinklu"
 
-#: ../gnome/applet/applet.glade.h:44
+#: ../gnome/applet/applet.glade.h:60
 msgid "_Don't remind me again"
 msgstr "_Daugiau man nepriminti"
 
-#: ../gnome/applet/applet.glade.h:45
+#: ../gnome/applet/applet.glade.h:61
 msgid "_Login to Network"
 msgstr "_Prisijungi prie tinklo"
 
-#: ../gnome/applet/applet.glade.h:46
+#: ../gnome/applet/applet.glade.h:62
 msgid "_Network Name:"
 msgstr "_Tinklo pavadinimas:"
 
-#: ../gnome/applet/applet.glade.h:47
+#: ../gnome/applet/applet.glade.h:63
 msgid "_Wireless Security:"
 msgstr "_Bevielis saugumas:"
 
-#: ../gnome/applet/applet.glade.h:48
-msgid "leap_subwindow"
-msgstr "leap_subwindow"
-
-#: ../gnome/applet/applet.glade.h:49
-msgid "wep_key_subwindow"
-msgstr "wep_key_subwindow"
-
-#: ../gnome/applet/applet.glade.h:50
-msgid "wep_passphrase_subwindow"
-msgstr "wep_passphrase_subwindow"
-
-#: ../gnome/applet/applet.glade.h:51
-msgid "wpa_psk_subwindow"
-msgstr "wpa_psk_subwindow"
-
-#: ../gnome/applet/wso-wpa-psk.c:168
-msgid "WPA2 Personal"
-msgstr "WPA2 asmeninis"
-
-#: ../gnome/applet/wso-wpa-psk.c:170
-msgid "WPA Personal"
-msgstr "WPA asmeninis"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.c:358
+#: ../gnome/vpn-properties/nm-vpn-properties.c:383
 msgid "Cannot add VPN connection"
 msgstr "Nepavyko pridÄ—ti VPN prisijungimo"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:360
+#: ../gnome/vpn-properties/nm-vpn-properties.c:385
 msgid ""
 "No suitable VPN software was found on your system. Contact your system "
 "administrator."
@@ -695,11 +732,11 @@ msgstr ""
 "Jūsų sistemoje nepavyko rasti tinkamos VPN programos. Susisiekite su savo "
 "sistemos administratoriumi."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:411
+#: ../gnome/vpn-properties/nm-vpn-properties.c:437
 msgid "Cannot import VPN connection"
 msgstr "Nepavyko importuoti VPN prisijungimo"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:413
+#: ../gnome/vpn-properties/nm-vpn-properties.c:439
 #, c-format
 msgid ""
 "Cannot find suitable software for VPN connection type '%s' to import the "
@@ -708,26 +745,26 @@ msgstr ""
 "Nepavyko rasti tinkamos programos VPN ryšio tipui „%s“ rinkmenos „%s“ "
 "importavimui. Susisiekite su savo sistemos administratoriumi."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:553
+#: ../gnome/vpn-properties/nm-vpn-properties.c:579
 #, c-format
 msgid "Error retrieving VPN connection '%s'"
 msgstr "Klaida gaunant VPN prisijungimą „%s“"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:556
+#: ../gnome/vpn-properties/nm-vpn-properties.c:582
 #, c-format
 msgid ""
 "Could not find the UI files for VPN connection type '%s'. Contact your "
 "system administrator."
 msgstr ""
-"Nepavyko rasti UI rinkmenų VPN ryšio tipui „%s“. Susisiekite su savo sistemos "
-"administratoriumi."
+"Nepavyko rasti UI rinkmenų VPN ryšio tipui „%s“. Susisiekite su savo "
+"sistemos administratoriumi."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:713
+#: ../gnome/vpn-properties/nm-vpn-properties.c:739
 #, c-format
 msgid "Delete VPN connection \"%s\"?"
 msgstr "Ištrinti VPN prisijungimą „%s“?"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:716
+#: ../gnome/vpn-properties/nm-vpn-properties.c:742
 #, c-format
 msgid ""
 "All information about the VPN connection \"%s\" will be lost and you may "
@@ -738,16 +775,16 @@ msgstr ""
 "gali reikėti, kad Jūsų sistemos administratorius suteiktų šią informaciją "
 "norint sukurti naujÄ… prisijungimÄ…."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:921
+#: ../gnome/vpn-properties/nm-vpn-properties.c:959
 msgid "Unable to load"
 msgstr "Nepavyko įkelti"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:923
+#: ../gnome/vpn-properties/nm-vpn-properties.c:961
 msgid "Cannot find some needed resources (the glade file)!"
 msgstr "Nepavyko rasti kai kurių reikalingų resursų (glade rinkmenos)!"
 
 #. Edit dialog
-#: ../gnome/vpn-properties/nm-vpn-properties.c:1031
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
 msgid "Edit VPN Connection"
 msgstr "Keisti VPN prisijungimÄ…"
 
@@ -822,11 +859,11 @@ msgstr ""
 msgid "VPN Connections"
 msgstr "VPN prisijungimai"
 
-#: ../src/nm-ap-security-wep.c:47
+#: ../src/nm-ap-security-wep.c:52
 msgid "40-bit WEP"
 msgstr "40 bitų WEP"
 
-#: ../src/nm-ap-security-wep.c:49
+#: ../src/nm-ap-security-wep.c:54
 msgid "104-bit WEP"
 msgstr "104 bitų WEP"
 
@@ -854,7 +891,7 @@ msgstr "WPA2 CCMP"
 msgid "WPA2 Automatic"
 msgstr "WPA2 automatiškas"
 
-#: ../src/nm-ap-security.c:290
+#: ../src/nm-ap-security.c:320
 msgid "none"
 msgstr "nÄ—ra"
 
@@ -893,3 +930,97 @@ msgstr ""
 #: ../src/nm-netlink-monitor.c:735
 msgid "error occurred while waiting for data on socket"
 msgstr "laukiant lizde duomenų įvyko klaida"
+
+#: ../gnome/applet/applet-dbus-devices.c:898
+#, c-format
+msgid "You are now connected to the Ad-Hoc wireless network '%s'."
+msgstr "Jūs dabar prisijungę prie Ad-Hoc bevielio tinklo „%s“."
+
+#: ../gnome/applet/applet-dbus-devices.c:903
+#, c-format
+msgid "You are now connected to the wireless network '%s'."
+msgstr "Jūs dabar prisijungę prie bevielio tinklo „%s“."
+
+#: ../gnome/applet/applet-dbus-devices.c:910
+msgid "You are now connected to the wired network."
+msgstr "JÅ«s dabar prisijungÄ™ prie laidinio tinklo."
+
+#: ../gnome/applet/applet-dbus-devices.c:916
+msgid "Connection Established"
+msgstr "Prisijungta"
+
+#: ../gnome/applet/applet-dbus-devices.c:959
+msgid "Disconnected"
+msgstr "Atjungta"
+
+#: ../gnome/applet/applet-dbus-devices.c:960
+msgid "The network connection has been disconnected."
+msgstr "Atsijungta nuo tinklo."
+
+#~ msgid "The VPN service said: \"%s\""
+#~ msgstr "Iš VPN tarnybos gauta: „%s“"
+
+#~ msgid "VPN Error"
+#~ msgstr "VPN klaida"
+
+#~ msgid "VPN connection '%s' said:"
+#~ msgstr "Iš VPN prisijungimo „%s“ gauta:"
+
+#~ msgid "Connected"
+#~ msgstr "Prisijungta"
+
+#~ msgid "Connected to a wired network interface."
+#~ msgstr "Prisijungta prie laidinio tinklo sÄ…sajos."
+
+#~ msgid "An ad-hoc wireless network connection has been established."
+#~ msgstr "Prisijungta prie ad-hoc bevielio tinklo."
+
+#~ msgid "A wireless network connection to '%s' has been established."
+#~ msgstr "Prisijungta bevieliu ryšiu prie „%s“."
+
+#~ msgid "WEP 40/128-bit ASCII"
+#~ msgstr "WEP 40/128-bit ASCII"
+
+#~ msgid "WEP 40/128-bit hex"
+#~ msgstr "WEP 40/128-bit hex"
+
+#~ msgid "WEP Passphrase"
+#~ msgstr "WEP slaptažodis"
+
+#~ msgid ""
+#~ "None\n"
+#~ "WEP Passphrase\n"
+#~ "WEP 40/128-bit hex\n"
+#~ "WEP 40/128-bit ASCII\n"
+#~ msgstr ""
+#~ "Jokio\n"
+#~ "WEP slaptažodis\n"
+#~ "WEP 40/128 bitų hex\n"
+#~ "WEP 40/128 bitų ASCII\n"
+
+#~ msgid "leap_subwindow"
+#~ msgstr "leap_subwindow"
+
+#~ msgid "wep_key_subwindow"
+#~ msgstr "wep_key_subwindow"
+
+#~ msgid "wep_passphrase_subwindow"
+#~ msgstr "wep_passphrase_subwindow"
+
+#~ msgid "wpa_psk_subwindow"
+#~ msgstr "wpa_psk_subwindow"
+
+#~ msgid "Stop automatically running the networking applet?"
+#~ msgstr "Daugiau automatiškai nepaleisti tinklų įtaiso?"
+
+#~ msgid ""
+#~ "The networking applet will now terminate, but will automatically launch "
+#~ "the next time you login.  Would you like to stop automatically running "
+#~ "the networking applet on login?"
+#~ msgstr ""
+#~ "Tinklų įtaisas dabar bus išjungtas, ta�iau kito prisijungimo metu vėl bus "
+#~ "paleistas. Ar norite, kad jis prisijungimo metu daugiau nebūtų "
+#~ "paleidžiamas automatiškai?"
+
+#~ msgid "_Remove"
+#~ msgstr "_Pašalinti"
diff --git a/po/mk.po b/po/mk.po
index 30ac1d46d5..71dad9fe6e 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -11,209 +11,1026 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mk.po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-16 11:26+0100\n"
+"POT-Creation-Date: 2006-05-29 18:33+0200\n"
 "PO-Revision-Date: 2005-01-16 13:51+0100\n"
 "Last-Translator:  <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: "
+"Content-Transfer-Encoding: \n"
 
-#: info-daemon/networks.glade.h:1
-msgid "<span weight=\"bold\">Wireless Networks:</span>"
-msgstr "<span weight=\"bold\">Безжични мрежи:</span>"
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:919
+#, c-format
+msgid "Passphrase for wireless network %s"
+msgstr "Фразата за лозинка за безжичната мрежа %s"
+
+#: ../gnome/applet/applet-dbus.c:265
+#, c-format
+msgid "Connection to the wireless network '%s' failed."
+msgstr "Поврзувањето �о безжичната мрежа '%s' не у�пеа."
+
+#: ../gnome/applet/applet-dbus.c:270
+msgid "Connection to the wired network failed."
+msgstr "Поврзувањето �о жичената мрежа не у�пеа."
+
+#: ../gnome/applet/applet.c:184
+msgid "Error displaying connection information:"
+msgstr "Грешка во прикажувањето на информациите за поврзувањето:"
+
+#: ../gnome/applet/applet.c:202
+msgid "Could not find some required resources (the glade file)!"
+msgstr ""
+"�плетот за „Менаџерот за мрежа“ не може да најде некои од потребните ре�ур�и "
+"(не е пронајдена glade датотеката)!"
+
+#: ../gnome/applet/applet.c:213
+msgid "No active connections!"
+msgstr "�ема активни поврзувања!"
+
+#: ../gnome/applet/applet.c:234
+#, c-format
+msgid "Wired Ethernet (%s)"
+msgstr "Жичена етернет мрежа (%s)"
 
-#: info-daemon/networks.glade.h:2
-msgid "Modify Wireless Networks"
-msgstr "Измени ги безжичните мрежи"
+#: ../gnome/applet/applet.c:236
+#, c-format
+msgid "Wireless Ethernet (%s)"
+msgstr "Безжична етернет мрежа (%s)"
+
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:362
+msgid "NetworkManager Applet"
+msgstr "�плет за менаџирање �о мрежи"
 
-#: info-daemon/passphrase.glade.h:1 panel-applet/essid.glade.h:1
-msgid "*"
-msgstr "*"
+#: ../gnome/applet/applet.c:339 ../gnome/applet/applet.c:364
+msgid "Copyright © 2004-2005 Red Hat, Inc."
+msgstr "Copyright © 2004-2005 Red Hat, Inc."
 
-#: info-daemon/passphrase.glade.h:2 panel-applet/essid.glade.h:2
+#: ../gnome/applet/applet.c:340 ../gnome/applet/applet.c:365
 msgid ""
-"128-bit Passphrase (WEP)\n"
-"Ascii Key (WEP)\n"
-"Hex Key (WEP)"
+"Notification area applet for managing your network devices and connections."
 msgstr ""
-"128-bit Passphrase (WEP)\n"
-"Ascii Key (WEP)\n"
-"Hex Key (WEP)"
+"�плет во ме�тото за изве�тување за менаџирање на мрежните уреди и поврзувања."
 
-#: info-daemon/passphrase.glade.h:6
-#, no-c-format
+#: ../gnome/applet/applet.c:343 ../gnome/applet/applet.c:370
+msgid "translator-credits"
+msgstr "Јован �аумов�ки"
+
+#: ../gnome/applet/applet.c:426
+msgid "VPN Login Failure"
+msgstr "VPN најавата не у�пеа"
+
+#: ../gnome/applet/applet.c:427
+#, c-format
+msgid "Could not start the VPN connection '%s' due to a login failure."
+msgstr ""
+"�е можам да го �тартувам VPN поврзувањето '%s' заради грешка во најавувањето."
+
+#: ../gnome/applet/applet.c:431
+msgid "VPN Start Failure"
+msgstr "Стартувањето на VPN не у�пеа"
+
+#: ../gnome/applet/applet.c:432
+#, c-format
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
-"Network</span>\n"
-"\n"
-"A passphrase or encryption key is required to access the wireless network '%"
-"s'."
+"Could not start the VPN connection '%s' due to a failure launching the VPN "
+"program."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Безжичната мрежа ја бара фразата за лозинката</span>\n"
-"\n"
-"Фразата за лозинката или клучот за кодирање �е потребни за при�тап до безжичната мрежа '%"
-"s'."
+"�е можам да го �тартувам VPN поврзувањето '%s'  поради грешка во подигањето "
+"на VPN програмата."
 
-#: info-daemon/passphrase.glade.h:9 panel-applet/essid.glade.h:7
-msgid "Key Type:"
-msgstr "Тип на клуч:"
+#: ../gnome/applet/applet.c:436 ../gnome/applet/applet.c:446
+msgid "VPN Connect Failure"
+msgstr "Грешка во VPN поврзувањето"
 
-#: info-daemon/passphrase.glade.h:10
-#: info-daemon/NetworkManagerInfoPassphraseDialog.c:139
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:147
-#: panel-applet/essid.glade.h:8
-msgid "Passphrase:"
-msgstr "Фраза за лозинка:"
+#: ../gnome/applet/applet.c:437
+#, c-format
+msgid "Could not start the VPN connection '%s' due to a connection error."
+msgstr ""
+"�е можам да го �тартувам VPN поврзувањето '%s' поради грешка во поврзувањето."
 
-#: info-daemon/passphrase.glade.h:11
-msgid "Wireless Network Key Required"
-msgstr "Потребен е клучот за безжичната мрежа"
+#: ../gnome/applet/applet.c:441
+msgid "VPN Configuration Error"
+msgstr "Грешка во VPN конфигурирањето"
 
-#: info-daemon/passphrase.glade.h:12
-msgid "_Login to Network"
-msgstr "_�ајави �е на мрежа"
+#: ../gnome/applet/applet.c:442
+#, c-format
+msgid "The VPN connection '%s' was not correctly configured."
+msgstr "VPN поврзувањето '%s' беше неправилно конфигурирано."
 
-#: info-daemon/NetworkManagerInfoPassphraseDialog.c:142
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:150
-msgid "Ascii Key:"
-msgstr "Ascii клуч:"
+#: ../gnome/applet/applet.c:447
+#, c-format
+msgid ""
+"Could not start the VPN connection '%s' because the VPN server did not "
+"return an adequate network configuration."
+msgstr ""
+"�е можам да го �тартувам VPN поврзувањето '%s' бидејќи VPN �ерверот не врати "
+"адекватна мрежна конфигурација."
+
+#: ../gnome/applet/applet.c:517
+msgid "VPN Login Message"
+msgstr "VPN најавна порака"
+
+#: ../gnome/applet/applet.c:741 ../gnome/applet/applet.c:2508
+#: ../gnome/applet/other-network-dialog.c:453
+#: ../gnome/applet/passphrase-dialog.c:228
+msgid ""
+"The NetworkManager Applet could not find some required resources (the glade "
+"file was not found)."
+msgstr ""
+"�плетот за „Менаџерот за мрежа“ не може да најде некои од потребните ре�ур�и "
+"(не е пронајдена glade датотеката)."
+
+#: ../gnome/applet/applet.c:753
+#, c-format
+msgid "The network device \"%s (%s)\" does not support wireless scanning."
+msgstr "Мрежниот уред \"%s (%s)\" не поддржува безжично �кенирање."
+
+#: ../gnome/applet/applet.c:761
+#, c-format
+msgid "The network device \"%s (%s)\" does not support link detection."
+msgstr "Мрежниот уред \"%s (%s)\" не поддржува откривање на вр�ка."
+
+#: ../gnome/applet/applet.c:908
+#, c-format
+msgid "Preparing device %s for the wired network..."
+msgstr "Го подготвувам уредот %s за жичената мрежа..."
+
+#: ../gnome/applet/applet.c:910
+#, c-format
+msgid "Preparing device %s for the wireless network '%s'..."
+msgstr "Го подготвувам уредот %s за безжичната мрежа '%s'..."
 
-#: info-daemon/NetworkManagerInfoPassphraseDialog.c:145
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:153
-msgid "Hex Key:"
-msgstr "Hex клуч:"
+#: ../gnome/applet/applet.c:918
+#, c-format
+msgid "Configuring device %s for the wired network..."
+msgstr "Го конфигурирам уредот %s за жичената мрежа..."
+
+#: ../gnome/applet/applet.c:920
+#, c-format
+msgid "Attempting to join the wireless network '%s'..."
+msgstr "Се обидувам да �е придружам кон безжичната мрежа '%s'..."
 
-#: info-daemon/NetworkManagerInfoVPN.c:157
+#: ../gnome/applet/applet.c:928
 #, c-format
-msgid "You must log in to access the private network %s"
-msgstr "Морате да �е најавите за да при�тапите на приватната мрежа %s"
+msgid "Waiting for Network Key for the wireless network '%s'..."
+msgstr "Чекам мрежен клуч за безжичната мрежа '%s'..."
 
-#: panel-applet/NMWirelessApplet.c:293
+#: ../gnome/applet/applet.c:936 ../gnome/applet/applet.c:946
+msgid "Requesting a network address from the wired network..."
+msgstr "Барам мрежна адре�а од жичената мрежа..."
+
+#: ../gnome/applet/applet.c:938 ../gnome/applet/applet.c:948
+#, c-format
+msgid "Requesting a network address from the wireless network '%s'..."
+msgstr "Барам мрежна адре�а од жичената мрежа '%s'..."
+
+#: ../gnome/applet/applet.c:956
+msgid "Finishing connection to the wired network..."
+msgstr "Го завршувам поврзувањето �о жичената мрежа..."
+
+#: ../gnome/applet/applet.c:958
+#, c-format
+msgid "Finishing connection to the wireless network '%s'..."
+msgstr "Го завршувам поврзувањето �о жичената мрежа '%s'..."
+
+#: ../gnome/applet/applet.c:1075
+msgid "NetworkManager is not running"
+msgstr "Менаџерот за мрежа не работи"
+
+#: ../gnome/applet/applet.c:1083 ../gnome/applet/applet.c:1828
+msgid "Networking disabled"
+msgstr "Вмрежувањето е оневозможено"
+
+#: ../gnome/applet/applet.c:1088
 msgid "No network connection"
 msgstr "�ема мрежна вр�ка"
 
-#: panel-applet/NMWirelessApplet.c:297
+#: ../gnome/applet/applet.c:1093
 msgid "Wired network connection"
 msgstr "Мрежна вр�ка"
 
-#: panel-applet/NMWirelessApplet.c:303
-msgid "Connecting to a wired network..."
-msgstr "Се врзувам за мрежата..."
-
-#: panel-applet/NMWirelessApplet.c:311
+#: ../gnome/applet/applet.c:1097
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Врзани �те на ад-хок безжична мрежа"
 
-#: panel-applet/NMWirelessApplet.c:325
+#: ../gnome/applet/applet.c:1099
 #, c-format
-msgid "Wireless network connection (%d%%)"
-msgstr "Безжична мрежна вр�ка (%d%%)"
+msgid "Wireless network connection to '%s' (%d%%)"
+msgstr "Безжично мрежно поврзување до '%s' (%d%%)"
 
-#: panel-applet/NMWirelessApplet.c:329
-msgid "Wireless network connection"
-msgstr "Безжична мрежна вр�ка"
+#: ../gnome/applet/applet.c:1120
+#, c-format
+msgid "VPN connection to '%s'"
+msgstr "VPN вр�ка до '%s'"
 
-#: panel-applet/NMWirelessApplet.c:335
-msgid "Connecting to a wireless network..."
-msgstr "Се врзувам за безжична мрежа..."
+#: ../gnome/applet/applet.c:1128
+#, c-format
+msgid "VPN connecting to '%s'"
+msgstr "VPN �е конектира до '%s'"
 
-#: panel-applet/NMWirelessApplet.c:339
-msgid "NetworkManager is not running"
-msgstr "Менаџерот за мрежа не работи"
+#: ../gnome/applet/applet.c:1541
+msgid "_Connect to Other Wireless Network..."
+msgstr "_Поврзи �е �о друга безжична мрежа..."
+
+#: ../gnome/applet/applet.c:1562
+msgid "Create _New Wireless Network..."
+msgstr "Креирај _нова безжична мрежа..."
+
+#: ../gnome/applet/applet.c:1685
+msgid "_VPN Connections"
+msgstr "_VPN поврзувања"
 
-#: panel-applet/NMWirelessApplet.c:345
-msgid "Scanning for wireless networks..."
-msgstr "Скенирам за безжични мрежи..."
+#: ../gnome/applet/applet.c:1730
+msgid "_Configure VPN..."
+msgstr "_Конфигурирај VPN..."
 
-#: panel-applet/NMWirelessApplet.c:667
-msgid "Other Wireless Networks..."
-msgstr "Други безжични мрежи..."
+#: ../gnome/applet/applet.c:1734
+msgid "_Disconnect VPN..."
+msgstr "_Прекини вр�ка �о VPN..."
 
-#: panel-applet/NMWirelessApplet.c:688
-msgid "Create new Wireless Network..."
-msgstr "Креирај нова безжична мрежа..."
+#: ../gnome/applet/applet.c:1756
+msgid "_Dial Up Connections"
+msgstr "_Конекции �о бирање"
+
+#. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
+#: ../gnome/applet/applet.c:1767
+#, c-format
+msgid "Connect to %s..."
+msgstr "Поврзи �е �о %s..."
+
+#: ../gnome/applet/applet.c:1773
+#, c-format
+msgid "Disconnect from %s..."
+msgstr "Прекини вр�ка �о %s..."
 
-#: panel-applet/NMWirelessApplet.c:798
+#: ../gnome/applet/applet.c:1822
 msgid "No network devices have been found"
 msgstr "�е �е пронајдени мрежни уреди"
 
-#: panel-applet/NMWirelessApplet.c:916
+#: ../gnome/applet/applet.c:2014
 msgid "NetworkManager is not running..."
 msgstr "Менаџерот за мрежа работи..."
 
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:226
+#. 'Enable Networking' item
+#: ../gnome/applet/applet.c:2170
+msgid "Enable _Networking"
+msgstr "Овозможи _вмрежување"
+
+#. 'Enable Wireless' item
+#: ../gnome/applet/applet.c:2176
+msgid "Enable _Wireless"
+msgstr "Овозможи _безжична мрежа"
+
+#. 'Connection Information' item
+#: ../gnome/applet/applet.c:2182
+msgid "Connection _Information"
+msgstr "_Информации за поврзувањето"
+
+#. Help item
+#: ../gnome/applet/applet.c:2193
+msgid "_Help"
+msgstr "_Помош"
+
+#. About item
+#: ../gnome/applet/applet.c:2202
+msgid "_About"
+msgstr "_За"
+
+#: ../gnome/applet/applet.c:2667
+msgid ""
+"The NetworkManager applet could not find some required resources.  It cannot "
+"continue.\n"
+msgstr ""
+"�плетот за „Менаџерот за мрежа“ не може да најде некои од потребните "
+"ре�ур�и. �е може да продолжи.\n"
+
+#: ../gnome/applet/wireless-security-option.c:157
+msgid "Open System"
+msgstr "Отворен �и�тем"
+
+#: ../gnome/applet/wireless-security-option.c:160
+msgid "Shared Key"
+msgstr "Споделен клуч"
+
+#: ../gnome/applet/wireless-security-option.c:208
+msgid "Automatic (Default)"
+msgstr "�втомат�ки (Стандардно)"
+
+#: ../gnome/applet/wireless-security-option.c:215
+msgid "AES-CCMP"
+msgstr "AES-CCMP"
+
+#: ../gnome/applet/wireless-security-option.c:223
+msgid "TKIP"
+msgstr "TKIP"
+
+#: ../gnome/applet/wireless-security-option.c:231
+msgid "Dynamic WEP"
+msgstr "Динамичен WEP"
+
+#: ../gnome/applet/wso-none.c:53
+msgid "None"
+msgstr "�ишто"
+
+#: ../gnome/applet/wso-wep-ascii.c:138
+msgid "WEP 64/128-bit ASCII"
+msgstr "WEP 64/128-bit ASCII"
+
+#: ../gnome/applet/wso-wep-hex.c:135
+msgid "WEP 64/128-bit Hex"
+msgstr "WEP 64/128-bit Hex"
+
+#: ../gnome/applet/wso-wep-passphrase.c:135
+msgid "WEP 128-bit Passphrase"
+msgstr "WEP 128-bit фраза за лозинка"
+
+#: ../gnome/applet/wso-wpa-eap.c:237
+msgid "PEAP"
+msgstr "PEAP"
+
+#: ../gnome/applet/wso-wpa-eap.c:238
+msgid "TLS"
+msgstr "TLS"
+
+#: ../gnome/applet/wso-wpa-eap.c:239
+msgid "TTLS"
+msgstr "TTLS"
+
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
+#: ../src/nm-ap-security-wpa-eap.c:116
+msgid "WPA2 Enterprise"
+msgstr "WPA2 Enterprise"
+
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
+#: ../src/nm-ap-security-wpa-eap.c:121
+msgid "WPA Enterprise"
+msgstr "WPA Enterprise"
+
+#: ../gnome/applet/wso-wpa-psk.c:178
+msgid "WPA2 Personal"
+msgstr "WPA2 Personal"
+
+#: ../gnome/applet/wso-wpa-psk.c:180
+msgid "WPA Personal"
+msgstr "WPA Personal"
+
+#: ../gnome/applet/eggtrayicon.c:134
+msgid "Orientation"
+msgstr "Ориентација"
+
+#: ../gnome/applet/eggtrayicon.c:135
+msgid "The orientation of the tray."
+msgstr "Ориентација во ме�тото за �ме�тување."
+
+#: ../gnome/applet/menu-items.c:88
+#, c-format
+msgid "Wired Network (%s)"
+msgstr "Мрежа (%s)"
+
+#: ../gnome/applet/menu-items.c:91
+msgid "_Wired Network"
+msgstr "_Жичена мрежа"
+
+#: ../gnome/applet/menu-items.c:162
+#, fuzzy, c-format
+msgid "Wireless Network (%s)"
+msgid_plural "Wireless Networks (%s)"
+msgstr[0] "Безжична мрежа (%s)"
+msgstr[1] "Безжична мрежа (%s)"
+
+#: ../gnome/applet/menu-items.c:164
+#, fuzzy
+msgid "Wireless Network"
+msgid_plural "Wireless Networks"
+msgstr[0] "Безжична мрежа"
+msgstr[1] "Безжична мрежа"
+
+#: ../gnome/applet/menu-items.c:343
+msgid " (invalid Unicode)"
+msgstr " (невалиден јуникод)"
+
+#: ../gnome/applet/other-network-dialog.c:352
+#, c-format
+msgid ""
+"By default, the wireless network's name is set to your computer's name, %s, "
+"with no encryption enabled"
+msgstr ""
+"Стандардно, името на безжичната мрежа е по�тавено како името на твојот "
+"компјутер, %s, без приклучено енкриптирање"
+
+#: ../gnome/applet/other-network-dialog.c:358
 msgid "Create new wireless network"
 msgstr "Креирај нова безжична мрежа"
 
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:227
+#: ../gnome/applet/other-network-dialog.c:359
 msgid ""
-"Enter the ESSID and security settings of the wireless network you wish to "
+"Enter the name and security settings of the wireless network you wish to "
 "create."
-msgstr "Вне�ете ESSID и безбедно�ни поде�увања за безжичната мрежа што �акате да "
-"ја креирате."
+msgstr ""
+"Вне�ете го името и безбедно�ните по�тавувања на безжичната мрежа која што "
+"�акате да ја креирате."
+
+#: ../gnome/applet/other-network-dialog.c:363
+msgid "Create New Wireless Network"
+msgstr "Креирај нова безжична мрежа"
 
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:232
-msgid "Custom wireless network"
-msgstr "Соп�твена безжична мрежа"
+#: ../gnome/applet/other-network-dialog.c:368
+msgid "Existing wireless network"
+msgstr "По�тоечка безжична мрежа"
 
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:233
-msgid "Enter the ESSID of the wireless network to which you wish to connect."
-msgstr "Вне�ете ESSID на безжичната мрежа на која што �акате да �е врзете."
+#: ../gnome/applet/other-network-dialog.c:369
+msgid "Enter the name of the wireless network to which you wish to connect."
+msgstr "Вне�ете име на безжичната мрежа на која што �акате да �е врзете."
 
-#. Reuse the above string to make the translators less angry.
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:314
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:323
+#: ../gnome/applet/other-network-dialog.c:371
+msgid "Connect to Other Wireless Network"
+msgstr "Поврзи �е �о друга безжична мрежа"
+
+#: ../gnome/applet/passphrase-dialog.c:215
+msgid "Error connecting to wireless network"
+msgstr "Грешка при поврзувањето �о безжичната мрежа"
+
+#: ../gnome/applet/passphrase-dialog.c:216
 msgid ""
-"The NetworkManager Applet could not find some required resources (the glade "
-"file was not found)."
+"The requested wireless network requires security capabilities unsupported by "
+"your hardware."
+msgstr ""
+"Бараната безжична мрежа бара безбедно�ни можно�ти кои �е неподдржани од "
+"Вашиот хардвер."
+
+#: ../gnome/applet/vpn-password-dialog.c:151
+#: ../gnome/applet/vpn-password-dialog.c:188
+#, c-format
+msgid "Cannot start VPN connection '%s'"
+msgstr "�е можам да започнам VPN поврзување '%s'"
+
+#: ../gnome/applet/vpn-password-dialog.c:154
+#, c-format
+msgid ""
+"Could not find the authentication dialog for VPN connection type '%s'. "
+"Contact your system administrator."
 msgstr ""
-"�плетот за „Менаџерот за мрежа“ не може да најде некои од потребните ре�ур�и (не е "
-"пронајдена glade датотеката)."
+"�е можам да го пронајдам дијалог прозорецот за проверка на веродо�тојно�та "
+"за VPN поврзувањето од тип '%s'. Контактирајте го админи�траторот на "
+"�и�темот."
 
-#: panel-applet/essid.glade.h:5
+#: ../gnome/applet/vpn-password-dialog.c:191
+#, c-format
+msgid ""
+"There was a problem launching the authentication dialog for VPN connection "
+"type '%s'. Contact your system administrator."
+msgstr ""
+"Имаше проблем �о подигањето на дијалог прозорецот за проверка на "
+"веродо�тојно�та за VPN поврзувањето од тип '%s'. Контактирајте го "
+"админи�траторот на �и�темот."
+
+#: ../gnome/applet/applet.glade.h:1
+msgid " "
+msgstr " "
+
+#: ../gnome/applet/applet.glade.h:2
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Информации за активното поврзување</"
+"span>"
+
+#: ../gnome/applet/applet.glade.h:4
+#, no-c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
+"Network</span>\n"
+"\n"
+"A passphrase or encryption key is required to access the wireless network '%"
+"s'."
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Безжичната мрежа ја бара фразата за "
+"лозинката</span>\n"
+"\n"
+"Фразата за лозинката или клучот за кодирање �е потребни за при�тап до "
+"безжичната мрежа '%s'."
+
+#: ../gnome/applet/applet.glade.h:8
+#, no-c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
+"\n"
+"%s  It will not be completely functional."
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">�амалена функционално�т на мрежата</"
+"span>\n"
+"\n"
+"%s нема да биде комплетно функционална."
+
+#: ../gnome/applet/applet.glade.h:12
+#, no-c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
+"span>\n"
+"\n"
+"You have chosen to log in to the wireless network '%s'.  If you are sure "
+"that this wireless network is secure, click the checkbox below and "
+"NetworkManager will not require confirmation on subsequent log ins."
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Потврдување на најавата на безжична "
+"мрежа</span>\n"
+"\n"
+"Одбравте да �е најавите на безжичната мрежа '%s'.  �ко �те �игурни дека оваа "
+"безжична мрежа е безбедна, кликнете на полето за чекирање подолу и  "
+"NetworkManager нема да бара потврда на ваквите поврзувања."
+
+#: ../gnome/applet/applet.glade.h:15
+msgid "Anonymous Identity:"
+msgstr "�нонимен идентитет:"
+
+#: ../gnome/applet/applet.glade.h:16
+msgid "Authentication:"
+msgstr "Проверка на веродо�тојно�та:"
+
+#: ../gnome/applet/applet.glade.h:17
+msgid "Broadcast Address:"
+msgstr "�дре�а за емитување:"
+
+#: ../gnome/applet/applet.glade.h:18
+msgid "CA Certificate File:"
+msgstr "Датотека за CA �ертификат:"
+
+#: ../gnome/applet/applet.glade.h:19
 msgid "C_onnect"
 msgstr "В_рзи �е"
 
-#: panel-applet/essid.glade.h:6
-msgid "Connect with encryption enabled"
-msgstr "Врзување �о овозможено кодирање"
+#: ../gnome/applet/applet.glade.h:20
+msgid "Client Certificate File:"
+msgstr "Датотека за �ертификат на клиентот:"
+
+#: ../gnome/applet/applet.glade.h:21
+msgid "Connection Information"
+msgstr "Информации за поврзувањето"
+
+#: ../gnome/applet/applet.glade.h:22
+msgid "Default Route:"
+msgstr "Стандардна на�ока:"
+
+#: ../gnome/applet/applet.glade.h:23
+msgid "Destination Address:"
+msgstr "�дре�а на де�тинацијата:"
+
+#: ../gnome/applet/applet.glade.h:24
+msgid "Driver:"
+msgstr "Драјвер:"
+
+#: ../gnome/applet/applet.glade.h:25
+msgid "EAP Method:"
+msgstr "EAP метод:"
+
+#: ../gnome/applet/applet.glade.h:26
+msgid "Hardware Address:"
+msgstr "Хардвер�ка адре�а:"
+
+#: ../gnome/applet/applet.glade.h:27
+msgid "IP Address:"
+msgstr "IP �дре�а:"
+
+#: ../gnome/applet/applet.glade.h:28
+msgid "Identity:"
+msgstr "Идентитет:"
+
+#: ../gnome/applet/applet.glade.h:29
+msgid "Interface:"
+msgstr "Уред:"
+
+#: ../gnome/applet/applet.glade.h:30
+msgid "Key Type:"
+msgstr "Тип на клуч:"
+
+#: ../gnome/applet/applet.glade.h:31
+msgid "Key:"
+msgstr "Клуч:"
+
+#: ../gnome/applet/applet.glade.h:32
+msgid ""
+"None\n"
+"WEP 128-bit Passphrase\n"
+"WEP 64/128-bit Hex\n"
+"WEP 64/128-bit ASCII\n"
+msgstr ""
+"None\n"
+"WEP 128-bit Passphrase\n"
+"WEP 64/128-bit Hex\n"
+"WEP 64/128-bit ASCII\n"
+
+#: ../gnome/applet/applet.glade.h:37
+msgid ""
+"Open System\n"
+"Shared Key"
+msgstr ""
+"Отворен �и�тем\n"
+"Споделен клуч"
+
+#: ../gnome/applet/applet.glade.h:39
+msgid "Other Wireless Network..."
+msgstr "Друга безжична мрежа..."
+
+#: ../gnome/applet/applet.glade.h:40
+msgid "Passphrase:"
+msgstr "Фраза за лозинка:"
+
+#: ../gnome/applet/applet.glade.h:41
+msgid "Password:"
+msgstr "Лозинка:"
+
+#: ../gnome/applet/applet.glade.h:42
+msgid "Primary DNS:"
+msgstr "Примарен DNS:"
 
-#: panel-applet/essid.glade.h:9
+#: ../gnome/applet/applet.glade.h:43
+msgid "Private Key File:"
+msgstr "Датотека �о приватен клуч:"
+
+#: ../gnome/applet/applet.glade.h:44
+msgid "Private Key Password:"
+msgstr "Лозинка на приватниот клуч:"
+
+#: ../gnome/applet/applet.glade.h:45
+msgid "Secondary DNS:"
+msgstr "Втор DNS:"
+
+#: ../gnome/applet/applet.glade.h:46
+msgid "Select the CA Certificate File"
+msgstr "Одберете ја датотеката за CA �ертификатот"
+
+#: ../gnome/applet/applet.glade.h:47
+msgid "Select the Client Certificate File"
+msgstr "Одберете ја датотеката за клиент�киот �ертификат"
+
+#: ../gnome/applet/applet.glade.h:48
+msgid "Select the Private Key File"
+msgstr "Одберете датотека �о приватен клуч"
+
+#: ../gnome/applet/applet.glade.h:49
+msgid "Show key"
+msgstr "Прикажи клуч"
+
+#: ../gnome/applet/applet.glade.h:50
+msgid "Show passphrase"
+msgstr "Прикажи ја фразата за лозинка"
+
+#: ../gnome/applet/applet.glade.h:51
+msgid "Show password"
+msgstr "Прикажи лозинка"
+
+#: ../gnome/applet/applet.glade.h:52
+msgid "Show passwords"
+msgstr "Прикажи лозинки"
+
+#: ../gnome/applet/applet.glade.h:53
+msgid "Speed:"
+msgstr "Брзина:"
+
+#: ../gnome/applet/applet.glade.h:54
+msgid "Subnet Mask:"
+msgstr "Сабнет ма�к:"
+
+#: ../gnome/applet/applet.glade.h:55
+msgid "Type:"
+msgstr "Тип:"
+
+#: ../gnome/applet/applet.glade.h:56
+msgid "User Name:"
+msgstr "Кори�ничко име:"
+
+#: ../gnome/applet/applet.glade.h:57
+msgid "Wireless Network Key Required"
+msgstr "Потребен е клучот за безжичната мрежа"
+
+#: ../gnome/applet/applet.glade.h:58
 msgid "Wireless _adapter:"
 msgstr "Безжичен _адаптер:"
 
-#: panel-applet/essid.glade.h:10
-msgid "Wireless _Network:"
-msgstr "Безжична _мрежа:"
+#: ../gnome/applet/applet.glade.h:59
+msgid "_Always Trust this Wireless Network"
+msgstr "_Секогаш верувај � на оваа безжична мрежа"
+
+#: ../gnome/applet/applet.glade.h:60
+msgid "_Don't remind me again"
+msgstr "_�е ме пот�етувај повеќе"
 
-#: panel-applet/menu-info.c:101
+#: ../gnome/applet/applet.glade.h:61
+msgid "_Login to Network"
+msgstr "_�ајави �е на мрежа"
+
+#: ../gnome/applet/applet.glade.h:62
+msgid "_Network Name:"
+msgstr "Име на _мрежа:"
+
+#: ../gnome/applet/applet.glade.h:63
+msgid "_Wireless Security:"
+msgstr "_Безжична безбедно�т:"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:383
+msgid "Cannot add VPN connection"
+msgstr "�е можам да додадам VPN поврзување"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:385
+msgid ""
+"No suitable VPN software was found on your system. Contact your system "
+"administrator."
+msgstr ""
+"�е е пронајден �оодветен VPN �офтвер на Вашиот �и�тем. Контактирајте го "
+"Вашиот �и�тем админи�тратор."
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:437
+msgid "Cannot import VPN connection"
+msgstr "�е можам да увезам VPN поврзување"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:439
 #, c-format
-msgid "Wired Network (%s)"
-msgstr "Мрежа (%s)"
+msgid ""
+"Cannot find suitable software for VPN connection type '%s' to import the "
+"file '%s'. Contact your system administrator."
+msgstr ""
+"�е можам да најдам �оодветен �офтвер за VPN поврзување од типот '%s' за да "
+"ја вне�ам датотеката '%s' . Контактирајте го админи�траторот."
 
-#: panel-applet/menu-info.c:103
-msgid "Wired Network"
-msgstr "Мрежа"
+#: ../gnome/vpn-properties/nm-vpn-properties.c:579
+#, c-format
+msgid "Error retrieving VPN connection '%s'"
+msgstr "Грешка во во�по�тавувањето на VPN поврзувањето '%s'"
 
-#: panel-applet/menu-info.c:168
+#: ../gnome/vpn-properties/nm-vpn-properties.c:582
 #, c-format
-msgid "Wireless Network (%s)"
-msgstr "Безжична мрежа (%s)"
+msgid ""
+"Could not find the UI files for VPN connection type '%s'. Contact your "
+"system administrator."
+msgstr ""
+"�е можам да ги пронајдам датотеките за кори�ничкиот интерфеј� за VPN "
+"поврзувањето од тип '%s'. Контактирајте го Вашиот админи�тратор на �и�темот."
 
-#: panel-applet/menu-info.c:170
-msgid "Wireless Network"
-msgstr "Безжична мрежа"
+#: ../gnome/vpn-properties/nm-vpn-properties.c:739
+#, c-format
+msgid "Delete VPN connection \"%s\"?"
+msgstr "Да го избришам VPN поврзувањето \"%s\"?"
 
-#: panel-applet/menu-info.c:307
-msgid " (invalid Unicode)"
-msgstr " (невалиден јуникод)"
+#: ../gnome/vpn-properties/nm-vpn-properties.c:742
+#, c-format
+msgid ""
+"All information about the VPN connection \"%s\" will be lost and you may "
+"need your system administrator to provide information to create a new "
+"connection."
+msgstr ""
+"Сите информации за  VPN поврзувањето \"%s\" ќе бидат изгубени и можеби ќе "
+"треба да го контактирате админи�траторот за да добиете информации за "
+"креирање на ново поврзување."
 
-#: examples/python/systray/eggtrayicon.c:111
-msgid "Orientation"
-msgstr "Ориентација"
+#: ../gnome/vpn-properties/nm-vpn-properties.c:959
+msgid "Unable to load"
+msgstr "�е можам да вчитам"
 
-#: examples/python/systray/eggtrayicon.c:112
-msgid "The orientation of the tray."
-msgstr "Ориентација во ме�тото за �ме�тување."
+#: ../gnome/vpn-properties/nm-vpn-properties.c:961
+msgid "Cannot find some needed resources (the glade file)!"
+msgstr "�е можам да ги пронајдам потребните ре�ур�и (glade датотеката)!"
+
+#. Edit dialog
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
+msgid "Edit VPN Connection"
+msgstr "Уреди го VPN поврзувањето"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:1
+msgid "Add a new VPN connection"
+msgstr "Додај ново VPN поврзување"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:2
+msgid "Choose which type of VPN connection you wish to create."
+msgstr "Одберете кој тип на VPN поврзување �акате да направите."
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
+msgid "Connect to:"
+msgstr "Поврзи �е �о:"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
+msgid "Create VPN Connection"
+msgstr "Креирај VPN поврзување"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
+msgid "Create VPN Connection - 1 of 2"
+msgstr "Креирај VPN поврзување - 1 од 2"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
+msgid "Create VPN Connection - 2 of 2"
+msgstr "Креирај VPN поврзување - 2 од 2"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
+msgid "Delete the selected VPN connection"
+msgstr "Избриши го избраното VPN поврзување"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
+msgid "E_xport"
+msgstr "И_звези"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:9
+msgid "Edit the selected VPN connection"
+msgstr "Уреди го избраното VPN поврзување"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:10
+msgid "Export the VPN settings to a file"
+msgstr "Извези ги по�тавувањата за VPN во датотека"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:11
+msgid "Export the selected VPN connection to a file"
+msgstr "Извези го избраното VPN поврзување во датотека"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:12
+msgid "Finish Creating VPN Connection"
+msgstr "Заврши �о креирање на VPN поврзување"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:13
+msgid "Manage Virtual Private Network Connections"
+msgstr "Управувај �о виртуелните приватни мрежни поврзувања"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:14
+msgid ""
+"This assistant will guide you through the creation of a connection to a "
+"Virtual Private Network (VPN).\n"
+"\n"
+"It will require some information, such as IP addresses and secrets.  Please "
+"see your system administrator to obtain this information."
+msgstr ""
+"Овој помошник ќе ве води низ креирањето на поврзување �о виртуелната "
+"приватна мрежа (VPN).\n"
+"\n"
+"Ќе бидат потребни некои информации, како што �е IP адре�и и тајни.  "
+"Контактирајте го админи�траторот на �и�темот за да ги добиете овие информации"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:17
+msgid "VPN Connections"
+msgstr "VPN поврзувања"
+
+#: ../src/nm-ap-security-wep.c:52
+msgid "40-bit WEP"
+msgstr "40-bit WEP"
+
+#: ../src/nm-ap-security-wep.c:54
+msgid "104-bit WEP"
+msgstr "104-bit WEP"
+
+#: ../src/nm-ap-security-wpa-psk.c:50
+msgid "WPA TKIP"
+msgstr "WPA TKIP"
+
+#: ../src/nm-ap-security-wpa-psk.c:52
+msgid "WPA CCMP"
+msgstr "WPA CCMP"
+
+#: ../src/nm-ap-security-wpa-psk.c:54
+msgid "WPA Automatic"
+msgstr "WPA автомат�ки"
+
+#: ../src/nm-ap-security-wpa-psk.c:59
+msgid "WPA2 TKIP"
+msgstr "WPA2 TKIP"
+
+#: ../src/nm-ap-security-wpa-psk.c:61
+msgid "WPA2 CCMP"
+msgstr "WPA2 CCMP"
+
+#: ../src/nm-ap-security-wpa-psk.c:63
+msgid "WPA2 Automatic"
+msgstr "WPA2 Aвтомат�ки"
+
+#: ../src/nm-ap-security.c:320
+msgid "none"
+msgstr "ништо"
+
+#: ../src/nm-netlink-monitor.c:154
+#, c-format
+msgid ""
+"unable to create netlink socket for monitoring wired ethernet devices - %s"
+msgstr ""
+"не можам да креирам нетлинк �окет за надгледување на жичените етернет уреди "
+"- %s"
+
+#: ../src/nm-netlink-monitor.c:172
+#, c-format
+msgid ""
+"unable to bind to netlink socket for monitoring wired ethernet devices - %s"
+msgstr ""
+"не можам да �е поврзам нетлинк �окет за надгледување на жичените етернет "
+"уреди - %s"
+
+#: ../src/nm-netlink-monitor.c:405
+msgid "operation took too long"
+msgstr "операцијата траеше предолго"
+
+#: ../src/nm-netlink-monitor.c:502
+msgid "received data from wrong type of sender"
+msgstr "примив податоци од погрешен тип на и�праќач"
+
+#: ../src/nm-netlink-monitor.c:515
+msgid "received data from unexpected sender"
+msgstr "примив податоци од неочекуван и�праќач"
+
+#: ../src/nm-netlink-monitor.c:646
+msgid "too much data was sent over socket and some of it was lost"
+msgstr ""
+"премногу податоци беа и�пратени преку �окетот и некои од нив �е изгубија"
+
+#: ../src/nm-netlink-monitor.c:735
+msgid "error occurred while waiting for data on socket"
+msgstr "�е �лучи грешка при чекањето на податоци од �окетот"
+
+#: ../gnome/applet/applet-dbus-devices.c:898
+#, c-format
+msgid "You are now connected to the Ad-Hoc wireless network '%s'."
+msgstr "Сега �те поврзани �о Ad-Hoc безжичната мрежа '%s'."
+
+#: ../gnome/applet/applet-dbus-devices.c:903
+#, c-format
+msgid "You are now connected to the wireless network '%s'."
+msgstr "Сега �те поврзани �о безжичната мрежа '%s'."
+
+#: ../gnome/applet/applet-dbus-devices.c:910
+msgid "You are now connected to the wired network."
+msgstr "Сега �те поврзани �о безжичната мрежа."
+
+#: ../gnome/applet/applet-dbus-devices.c:916
+msgid "Connection Established"
+msgstr "Вр�ката е во�по�тавена"
+
+#: ../gnome/applet/applet-dbus-devices.c:959
+msgid "Disconnected"
+msgstr "Прекината вр�ка"
+
+#: ../gnome/applet/applet-dbus-devices.c:960
+msgid "The network connection has been disconnected."
+msgstr "Мрежното поврзување �е прекина"
+
+#~ msgid "<span weight=\"bold\">Wireless Networks:</span>"
+#~ msgstr "<span weight=\"bold\">Безжични мрежи:</span>"
+
+#~ msgid "Modify Wireless Networks"
+#~ msgstr "Измени ги безжичните мрежи"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid ""
+#~ "128-bit Passphrase (WEP)\n"
+#~ "Ascii Key (WEP)\n"
+#~ "Hex Key (WEP)"
+#~ msgstr ""
+#~ "128-bit Passphrase (WEP)\n"
+#~ "Ascii Key (WEP)\n"
+#~ "Hex Key (WEP)"
+
+#~ msgid "Ascii Key:"
+#~ msgstr "Ascii клуч:"
+
+#~ msgid "Hex Key:"
+#~ msgstr "Hex клуч:"
+
+#~ msgid "You must log in to access the private network %s"
+#~ msgstr "Морате да �е најавите за да при�тапите на приватната мрежа %s"
+
+#~ msgid "Connecting to a wired network..."
+#~ msgstr "Се врзувам за мрежата..."
+
+#~ msgid "Wireless network connection (%d%%)"
+#~ msgstr "Безжична мрежна вр�ка (%d%%)"
+
+#~ msgid "Wireless network connection"
+#~ msgstr "Безжична мрежна вр�ка"
+
+#~ msgid "Connecting to a wireless network..."
+#~ msgstr "Се врзувам за безжична мрежа..."
+
+#~ msgid "Scanning for wireless networks..."
+#~ msgstr "Скенирам за безжични мрежи..."
+
+#~ msgid "Other Wireless Networks..."
+#~ msgstr "Други безжични мрежи..."
+
+#~ msgid "Create new Wireless Network..."
+#~ msgstr "Креирај нова безжична мрежа..."
+
+#~ msgid ""
+#~ "Enter the ESSID and security settings of the wireless network you wish to "
+#~ "create."
+#~ msgstr ""
+#~ "Вне�ете ESSID и безбедно�ни поде�увања за безжичната мрежа што �акате да "
+#~ "ја креирате."
+
+#~ msgid "Custom wireless network"
+#~ msgstr "Соп�твена безжична мрежа"
+
+#~ msgid ""
+#~ "Enter the ESSID of the wireless network to which you wish to connect."
+#~ msgstr "Вне�ете ESSID на безжичната мрежа на која што �акате да �е врзете."
+
+#~ msgid "Connect with encryption enabled"
+#~ msgstr "Врзување �о овозможено кодирање"
+
+#~ msgid "Wireless _Network:"
+#~ msgstr "Безжична _мрежа:"
 
+#~ msgid "Wired Network"
+#~ msgstr "Мрежа"
diff --git a/po/nb.po b/po/nb.po
index 40bde27788..1085f928a0 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager 0.1.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-02 12:54+0100\n"
+"POT-Creation-Date: 2006-05-29 18:33+0200\n"
 "PO-Revision-Date: 2006-03-02 12:59+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.uio.no>\n"
@@ -17,17 +17,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:923
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:919
 #, c-format
 msgid "Passphrase for wireless network %s"
 msgstr "Passord for trådløst nettverk %s"
 
-#: ../gnome/applet/applet-dbus.c:259
+#: ../gnome/applet/applet-dbus.c:265
 #, c-format
 msgid "Connection to the wireless network '%s' failed."
 msgstr "Tilkobling til trådløst nettverk «%s» feilet."
 
-#: ../gnome/applet/applet-dbus.c:264
+#: ../gnome/applet/applet-dbus.c:270
 msgid "Connection to the wired network failed."
 msgstr "Tilkobling til trådløst nettverk feilet."
 
@@ -35,55 +35,55 @@ msgstr "Tilkobling til trådløst nettverk feilet."
 msgid "Error displaying connection information:"
 msgstr "Feil under visning av tilkoblingsinformasjon:"
 
-#: ../gnome/applet/applet.c:201
+#: ../gnome/applet/applet.c:202
 msgid "Could not find some required resources (the glade file)!"
 msgstr "Fant ikke nødvendige ressurser (glade-filen)."
 
-#: ../gnome/applet/applet.c:212
+#: ../gnome/applet/applet.c:213
 msgid "No active connections!"
 msgstr "Ingen aktive tilkoblinger!"
 
-#: ../gnome/applet/applet.c:229
+#: ../gnome/applet/applet.c:234
 #, c-format
 msgid "Wired Ethernet (%s)"
 msgstr "Kablet nettverk (%s)"
 
-#: ../gnome/applet/applet.c:231
+#: ../gnome/applet/applet.c:236
 #, c-format
 msgid "Wireless Ethernet (%s)"
 msgstr "Trådløst nettverk (%s)"
 
-#: ../gnome/applet/applet.c:328 ../gnome/applet/applet.c:353
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:362
 msgid "NetworkManager Applet"
 msgstr "NetworkManager panelprogram"
 
-#: ../gnome/applet/applet.c:330 ../gnome/applet/applet.c:355
+#: ../gnome/applet/applet.c:339 ../gnome/applet/applet.c:364
 msgid "Copyright © 2004-2005 Red Hat, Inc."
 msgstr "Opphavsrett © 2004-2005 Red Hat, Inc."
 
-#: ../gnome/applet/applet.c:331 ../gnome/applet/applet.c:356
+#: ../gnome/applet/applet.c:340 ../gnome/applet/applet.c:365
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "Et panelprogram for å håndtere nettverksenheter og tilkoblinger."
 
-#: ../gnome/applet/applet.c:334 ../gnome/applet/applet.c:361
+#: ../gnome/applet/applet.c:343 ../gnome/applet/applet.c:370
 msgid "translator-credits"
 msgstr "Kjartan Maraas <kmaraas@gnome.org>"
 
-#: ../gnome/applet/applet.c:416
+#: ../gnome/applet/applet.c:426
 msgid "VPN Login Failure"
 msgstr "Feil ved VPN-pålogging"
 
-#: ../gnome/applet/applet.c:417
+#: ../gnome/applet/applet.c:427
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a login failure."
 msgstr "Kunne ikke starte VPN-tilkobling «%s» pga en feil ved pålogging."
 
-#: ../gnome/applet/applet.c:421
+#: ../gnome/applet/applet.c:431
 msgid "VPN Start Failure"
 msgstr "Feil ved start av VPN"
 
-#: ../gnome/applet/applet.c:422
+#: ../gnome/applet/applet.c:432
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
@@ -92,25 +92,25 @@ msgstr ""
 "Kunne ikke starte VPN-tilkobling «%s» på grunn av feil ved oppstart av VPN-"
 "programmet."
 
-#: ../gnome/applet/applet.c:426 ../gnome/applet/applet.c:436
+#: ../gnome/applet/applet.c:436 ../gnome/applet/applet.c:446
 msgid "VPN Connect Failure"
 msgstr "Feil ved tilkobling av VPN"
 
-#: ../gnome/applet/applet.c:427
+#: ../gnome/applet/applet.c:437
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a connection error."
 msgstr "Kunne ikke starte VPN-tilkobling «%s» pga en feil ved tilkobling."
 
-#: ../gnome/applet/applet.c:431
+#: ../gnome/applet/applet.c:441
 msgid "VPN Configuration Error"
 msgstr "Feil i konfigurasjon av VPN"
 
-#: ../gnome/applet/applet.c:432
+#: ../gnome/applet/applet.c:442
 #, c-format
 msgid "The VPN connection '%s' was not correctly configured."
 msgstr "VPN-tilkobling «%s» er ikke korrekt konfigurert."
 
-#: ../gnome/applet/applet.c:437
+#: ../gnome/applet/applet.c:447
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' because the VPN server did not "
@@ -119,177 +119,177 @@ msgstr ""
 "Kunne ikke starte VPN-tilkobling «%s» fordi VPN-tjeneren ikke returnerte "
 "riktig nettverkskonfigurasjon."
 
-#: ../gnome/applet/applet.c:504
+#: ../gnome/applet/applet.c:517
 msgid "VPN Login Message"
 msgstr "PÃ¥loggingsmelding for VPN"
 
-#: ../gnome/applet/applet.c:728 ../gnome/applet/applet.c:2490
+#: ../gnome/applet/applet.c:741 ../gnome/applet/applet.c:2508
 #: ../gnome/applet/other-network-dialog.c:453
-#: ../gnome/applet/passphrase-dialog.c:227
+#: ../gnome/applet/passphrase-dialog.c:228
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
 msgstr ""
 "NetworkManager fant ikke nødvendige ressurser (glade-filen ble ikke funnet)."
 
-#: ../gnome/applet/applet.c:740
+#: ../gnome/applet/applet.c:753
 #, c-format
 msgid "The network device \"%s (%s)\" does not support wireless scanning."
 msgstr "Nettverksenheten «%s (%s)» støtter ikke søk etter trådløse nettverk."
 
-#: ../gnome/applet/applet.c:748
+#: ../gnome/applet/applet.c:761
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
 msgstr ""
 "Nettverksenheten «%s (%s)» støtter ikke informasjon om tilkoblet status."
 
-#: ../gnome/applet/applet.c:895
+#: ../gnome/applet/applet.c:908
 #, c-format
 msgid "Preparing device %s for the wired network..."
 msgstr "Klargjør enhet %s for det trådløse nettverket..."
 
-#: ../gnome/applet/applet.c:897
+#: ../gnome/applet/applet.c:910
 #, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
 msgstr "Klargjør enhet %s for trådløst nettverk «%s»..."
 
-#: ../gnome/applet/applet.c:905
+#: ../gnome/applet/applet.c:918
 #, c-format
 msgid "Configuring device %s for the wired network..."
 msgstr "Konfigurerer enhet %s for kablet nettverk..."
 
-#: ../gnome/applet/applet.c:907
+#: ../gnome/applet/applet.c:920
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
 msgstr "Forsøker å bruke trådløst nettverk «%s»..."
 
-#: ../gnome/applet/applet.c:915
+#: ../gnome/applet/applet.c:928
 #, c-format
 msgid "Waiting for Network Key for the wireless network '%s'..."
 msgstr "Venter på nettverksnøkkel for trådløst nettverk «%s»..."
 
-#: ../gnome/applet/applet.c:923 ../gnome/applet/applet.c:933
+#: ../gnome/applet/applet.c:936 ../gnome/applet/applet.c:946
 msgid "Requesting a network address from the wired network..."
 msgstr "Ber om en nettverksadresse fra kablet nettverk..."
 
-#: ../gnome/applet/applet.c:925 ../gnome/applet/applet.c:935
+#: ../gnome/applet/applet.c:938 ../gnome/applet/applet.c:948
 #, c-format
 msgid "Requesting a network address from the wireless network '%s'..."
 msgstr "Ber om en nettverksadresse fra trådløst nettverk «%s»..."
 
-#: ../gnome/applet/applet.c:943
+#: ../gnome/applet/applet.c:956
 msgid "Finishing connection to the wired network..."
 msgstr "Fullfører tilkobling til kablet nettverk..."
 
-#: ../gnome/applet/applet.c:945
+#: ../gnome/applet/applet.c:958
 #, c-format
 msgid "Finishing connection to the wireless network '%s'..."
 msgstr "Fullfører tilkobling til trådløst nettverk «%s»..."
 
-#: ../gnome/applet/applet.c:1062
+#: ../gnome/applet/applet.c:1075
 msgid "NetworkManager is not running"
 msgstr "NetworkManager kjører ikke"
 
-#: ../gnome/applet/applet.c:1075 ../gnome/applet/applet.c:1817
+#: ../gnome/applet/applet.c:1083 ../gnome/applet/applet.c:1828
 msgid "Networking disabled"
 msgstr "Nettverk deaktivert"
 
-#: ../gnome/applet/applet.c:1080
+#: ../gnome/applet/applet.c:1088
 msgid "No network connection"
 msgstr "Ingen nettverksforbindelse"
 
-#: ../gnome/applet/applet.c:1085
+#: ../gnome/applet/applet.c:1093
 msgid "Wired network connection"
 msgstr "Trådløs nettverkforbindelse"
 
-#: ../gnome/applet/applet.c:1089
+#: ../gnome/applet/applet.c:1097
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Kobler til et Ad-Hoc trådløst nettverk"
 
-#: ../gnome/applet/applet.c:1091
+#: ../gnome/applet/applet.c:1099
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "Trådløs nettverksforbindelse til «%s» (%d%%)"
 
-#: ../gnome/applet/applet.c:1111
+#: ../gnome/applet/applet.c:1120
 #, c-format
 msgid "VPN connection to '%s'"
 msgstr "VPN-tilkobling til «%s»"
 
-#: ../gnome/applet/applet.c:1119
+#: ../gnome/applet/applet.c:1128
 #, c-format
 msgid "VPN connecting to '%s'"
 msgstr "Kobler til «%s» via VPN"
 
-#: ../gnome/applet/applet.c:1532
+#: ../gnome/applet/applet.c:1541
 msgid "_Connect to Other Wireless Network..."
 msgstr "_Koble til annet trådløst nettverk..."
 
-#: ../gnome/applet/applet.c:1553
+#: ../gnome/applet/applet.c:1562
 msgid "Create _New Wireless Network..."
 msgstr "Opprett _nytt trådløst nettverk..."
 
-#: ../gnome/applet/applet.c:1674
+#: ../gnome/applet/applet.c:1685
 msgid "_VPN Connections"
 msgstr "_VPN-tilkoblinger"
 
-#: ../gnome/applet/applet.c:1719
+#: ../gnome/applet/applet.c:1730
 msgid "_Configure VPN..."
 msgstr "_Konfigurer VPN..."
 
-#: ../gnome/applet/applet.c:1723
+#: ../gnome/applet/applet.c:1734
 msgid "_Disconnect VPN..."
 msgstr "Ko_ble fra VPN..."
 
-#: ../gnome/applet/applet.c:1745
+#: ../gnome/applet/applet.c:1756
 msgid "_Dial Up Connections"
 msgstr "_Oppringte tilkoblinger"
 
 #. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
-#: ../gnome/applet/applet.c:1756
+#: ../gnome/applet/applet.c:1767
 #, c-format
 msgid "Connect to %s..."
 msgstr "Koble til %s..."
 
-#: ../gnome/applet/applet.c:1762
+#: ../gnome/applet/applet.c:1773
 #, c-format
 msgid "Disconnect from %s..."
 msgstr "Koble fra %s..."
 
-#: ../gnome/applet/applet.c:1811
+#: ../gnome/applet/applet.c:1822
 msgid "No network devices have been found"
 msgstr "Ingen nettverksenheter ble funnet"
 
-#: ../gnome/applet/applet.c:2003
+#: ../gnome/applet/applet.c:2014
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager kjører ikke..."
 
 #. 'Enable Networking' item
-#: ../gnome/applet/applet.c:2159
+#: ../gnome/applet/applet.c:2170
 msgid "Enable _Networking"
 msgstr "_Aktiver nettverk"
 
 #. 'Enable Wireless' item
-#: ../gnome/applet/applet.c:2165
+#: ../gnome/applet/applet.c:2176
 msgid "Enable _Wireless"
 msgstr "Aktiver _trådløst nettverk"
 
 #. 'Connection Information' item
-#: ../gnome/applet/applet.c:2171
+#: ../gnome/applet/applet.c:2182
 msgid "Connection _Information"
 msgstr "Tilkoblings_informasjon"
 
 #. Help item
-#: ../gnome/applet/applet.c:2182
+#: ../gnome/applet/applet.c:2193
 msgid "_Help"
 msgstr "_Hjelp"
 
 #. About item
-#: ../gnome/applet/applet.c:2191
+#: ../gnome/applet/applet.c:2202
 msgid "_About"
 msgstr "_Om"
 
-#: ../gnome/applet/applet.c:2609
+#: ../gnome/applet/applet.c:2667
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
@@ -305,61 +305,65 @@ msgstr "Ã…pent system"
 msgid "Shared Key"
 msgstr "Delt nøkkel"
 
-#: ../gnome/applet/wireless-security-option.c:209
+#: ../gnome/applet/wireless-security-option.c:208
 msgid "Automatic (Default)"
 msgstr "Automatisk (forvalgt)"
 
-#: ../gnome/applet/wireless-security-option.c:216
+#: ../gnome/applet/wireless-security-option.c:215
+msgid "AES-CCMP"
+msgstr "AES-CCMP"
+
+#: ../gnome/applet/wireless-security-option.c:223
 msgid "TKIP"
 msgstr "TKIP"
 
-#: ../gnome/applet/wireless-security-option.c:224
-msgid "AES-CCMP"
-msgstr "AES-CCMP"
+#: ../gnome/applet/wireless-security-option.c:231
+msgid "Dynamic WEP"
+msgstr "Dynamisk WEP"
 
 #: ../gnome/applet/wso-none.c:53
 msgid "None"
 msgstr "Ingen"
 
-#: ../gnome/applet/wso-wep-ascii.c:127
-msgid "WEP 40/128-bit ASCII"
-msgstr "WEP 40/128-bit ASCII"
+#: ../gnome/applet/wso-wep-ascii.c:138
+msgid "WEP 64/128-bit ASCII"
+msgstr "WEP 64/128-bit ASCII"
 
-#: ../gnome/applet/wso-wep-hex.c:124
-msgid "WEP 40/128-bit hex"
-msgstr "WEP 40/128-bit heksadesimal"
+#: ../gnome/applet/wso-wep-hex.c:135
+msgid "WEP 64/128-bit Hex"
+msgstr "WEP 64/128-bit heksadesimal"
 
-#: ../gnome/applet/wso-wep-passphrase.c:124
-msgid "WEP Passphrase"
-msgstr "WEP Passord:"
+#: ../gnome/applet/wso-wep-passphrase.c:135
+msgid "WEP 128-bit Passphrase"
+msgstr "WEP 128-bit passord:"
 
-#: ../gnome/applet/wso-wpa-eap.c:208
+#: ../gnome/applet/wso-wpa-eap.c:237
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../gnome/applet/wso-wpa-eap.c:209
+#: ../gnome/applet/wso-wpa-eap.c:238
 msgid "TLS"
 msgstr "TLS"
 
-#: ../gnome/applet/wso-wpa-eap.c:210
+#: ../gnome/applet/wso-wpa-eap.c:239
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../gnome/applet/wso-wpa-eap.c:218 ../src/nm-ap-security-wpa-eap.c:90
-#: ../src/nm-ap-security-wpa-eap.c:114
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
+#: ../src/nm-ap-security-wpa-eap.c:116
 msgid "WPA2 Enterprise"
 msgstr "WPA2 enterprise"
 
-#: ../gnome/applet/wso-wpa-eap.c:220 ../src/nm-ap-security-wpa-eap.c:92
-#: ../src/nm-ap-security-wpa-eap.c:119
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
+#: ../src/nm-ap-security-wpa-eap.c:121
 msgid "WPA Enterprise"
 msgstr "WPA enterprise"
 
-#: ../gnome/applet/wso-wpa-psk.c:166
+#: ../gnome/applet/wso-wpa-psk.c:178
 msgid "WPA2 Personal"
 msgstr "WPA2 personlig"
 
-#: ../gnome/applet/wso-wpa-psk.c:168
+#: ../gnome/applet/wso-wpa-psk.c:180
 msgid "WPA Personal"
 msgstr "WPA personlig"
 
@@ -371,29 +375,29 @@ msgstr "Orientering"
 msgid "The orientation of the tray."
 msgstr "Orientering for trauet."
 
-#: ../gnome/applet/menu-items.c:87
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Kablet nettverk (%s)"
 
-#: ../gnome/applet/menu-items.c:90
+#: ../gnome/applet/menu-items.c:91
 msgid "_Wired Network"
 msgstr "_Kablet nettverk"
 
-#: ../gnome/applet/menu-items.c:161
+#: ../gnome/applet/menu-items.c:162
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
 msgstr[0] "Trådløst nettverk (%s)"
 msgstr[1] "Trådløse nettverk (%s)"
 
-#: ../gnome/applet/menu-items.c:163
+#: ../gnome/applet/menu-items.c:164
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Trådløst nettverk"
 msgstr[1] "Trådløse nettverk"
 
-#: ../gnome/applet/menu-items.c:330
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr " (ugyldig Unicode)"
 
@@ -434,11 +438,11 @@ msgstr "Oppgi navnet til det trådløse nettverket du ønsker å koble deg til."
 msgid "Connect to Other Wireless Network"
 msgstr "Koble til annet trådløst nettverk"
 
-#: ../gnome/applet/passphrase-dialog.c:214
+#: ../gnome/applet/passphrase-dialog.c:215
 msgid "Error connecting to wireless network"
 msgstr "Feil under tilkobling til trådløst nettverk"
 
-#: ../gnome/applet/passphrase-dialog.c:215
+#: ../gnome/applet/passphrase-dialog.c:216
 msgid ""
 "The requested wireless network requires security capabilities unsupported by "
 "your hardware."
@@ -446,13 +450,13 @@ msgstr ""
 "Valgt trådløst nettverk krever en type sikkerhet som ikke er støttet av ditt "
 "nettverkskort."
 
-#: ../gnome/applet/vpn-password-dialog.c:152
-#: ../gnome/applet/vpn-password-dialog.c:189
+#: ../gnome/applet/vpn-password-dialog.c:151
+#: ../gnome/applet/vpn-password-dialog.c:188
 #, c-format
 msgid "Cannot start VPN connection '%s'"
 msgstr "Kan ikke starte VPN-tilkobling «%s»"
 
-#: ../gnome/applet/vpn-password-dialog.c:155
+#: ../gnome/applet/vpn-password-dialog.c:154
 #, c-format
 msgid ""
 "Could not find the authentication dialog for VPN connection type '%s'. "
@@ -461,7 +465,7 @@ msgstr ""
 "Fant ikke autentiseringsdialogen for VPN tilkoblingstypen «%s». Kontakt din "
 "systemadministrator."
 
-#: ../gnome/applet/vpn-password-dialog.c:192
+#: ../gnome/applet/vpn-password-dialog.c:191
 #, c-format
 msgid ""
 "There was a problem launching the authentication dialog for VPN connection "
@@ -585,22 +589,26 @@ msgid "Interface:"
 msgstr "Grensesnitt:"
 
 #: ../gnome/applet/applet.glade.h:30
+msgid "Key Type:"
+msgstr "Nøkkeltype:"
+
+#: ../gnome/applet/applet.glade.h:31
 msgid "Key:"
 msgstr "Nøkkel:"
 
-#: ../gnome/applet/applet.glade.h:31
+#: ../gnome/applet/applet.glade.h:32
 msgid ""
 "None\n"
-"WEP Passphrase\n"
-"WEP 40/128-bit hex\n"
-"WEP 40/128-bit ASCII\n"
+"WEP 128-bit Passphrase\n"
+"WEP 64/128-bit Hex\n"
+"WEP 64/128-bit ASCII\n"
 msgstr ""
 "Ingen\n"
 "WEP passord\n"
-"WEP 40/128-bit heksadesimal\n"
-"WEP 40/128-bit ASCII\n"
+"WEP 64/128-bit heksadesimal\n"
+"WEP 64/128-bit ASCII\n"
 
-#: ../gnome/applet/applet.glade.h:36
+#: ../gnome/applet/applet.glade.h:37
 msgid ""
 "Open System\n"
 "Shared Key"
@@ -608,91 +616,111 @@ msgstr ""
 "Ã…pent system\n"
 "Delt nøkkel"
 
-#: ../gnome/applet/applet.glade.h:38
+#: ../gnome/applet/applet.glade.h:39
 msgid "Other Wireless Network..."
 msgstr "Annet trådløst nettverk..."
 
-#: ../gnome/applet/applet.glade.h:39
+#: ../gnome/applet/applet.glade.h:40
 msgid "Passphrase:"
 msgstr "Passord:"
 
-#: ../gnome/applet/applet.glade.h:40
+#: ../gnome/applet/applet.glade.h:41
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../gnome/applet/applet.glade.h:41
+#: ../gnome/applet/applet.glade.h:42
 msgid "Primary DNS:"
 msgstr "Primær DNS:"
 
-#: ../gnome/applet/applet.glade.h:42
+#: ../gnome/applet/applet.glade.h:43
 msgid "Private Key File:"
 msgstr "Privat nøkkelfil:"
 
-#: ../gnome/applet/applet.glade.h:43
+#: ../gnome/applet/applet.glade.h:44
 msgid "Private Key Password:"
 msgstr "Passord for privat nøkkel:"
 
-#: ../gnome/applet/applet.glade.h:44
+#: ../gnome/applet/applet.glade.h:45
 msgid "Secondary DNS:"
 msgstr "Sekundær DNS:"
 
-#: ../gnome/applet/applet.glade.h:45
+#: ../gnome/applet/applet.glade.h:46
 msgid "Select the CA Certificate File"
 msgstr "Velg sertifikatfil for CA"
 
-#: ../gnome/applet/applet.glade.h:46
+#: ../gnome/applet/applet.glade.h:47
 msgid "Select the Client Certificate File"
 msgstr "Velg sertifikatfil for klient"
 
-#: ../gnome/applet/applet.glade.h:47
+#: ../gnome/applet/applet.glade.h:48
 msgid "Select the Private Key File"
 msgstr "Velg fil med privat nøkkel"
 
-#: ../gnome/applet/applet.glade.h:48
+#: ../gnome/applet/applet.glade.h:49
+msgid "Show key"
+msgstr "Vis nøkkel"
+
+#: ../gnome/applet/applet.glade.h:50
+msgid "Show passphrase"
+msgstr "Vis passord"
+
+#: ../gnome/applet/applet.glade.h:51
+msgid "Show password"
+msgstr "Vis passord"
+
+#: ../gnome/applet/applet.glade.h:52
+msgid "Show passwords"
+msgstr "Vis passord"
+
+#: ../gnome/applet/applet.glade.h:53
+msgid "Speed:"
+msgstr "Hastighet:"
+
+#: ../gnome/applet/applet.glade.h:54
 msgid "Subnet Mask:"
 msgstr "Subnettmaske:"
 
-#: ../gnome/applet/applet.glade.h:49
+#: ../gnome/applet/applet.glade.h:55
 msgid "Type:"
 msgstr "Type:"
 
-#: ../gnome/applet/applet.glade.h:50
+#: ../gnome/applet/applet.glade.h:56
 msgid "User Name:"
 msgstr "Brukernavn:"
 
-#: ../gnome/applet/applet.glade.h:51
+#: ../gnome/applet/applet.glade.h:57
 msgid "Wireless Network Key Required"
 msgstr "Nøkkel for trådløst nettverk kreves"
 
-#: ../gnome/applet/applet.glade.h:52
+#: ../gnome/applet/applet.glade.h:58
 msgid "Wireless _adapter:"
 msgstr "Trådløst _kort:"
 
-#: ../gnome/applet/applet.glade.h:53
+#: ../gnome/applet/applet.glade.h:59
 msgid "_Always Trust this Wireless Network"
 msgstr "Stol _alltid på dette trådløse nettverket"
 
-#: ../gnome/applet/applet.glade.h:54
+#: ../gnome/applet/applet.glade.h:60
 msgid "_Don't remind me again"
 msgstr "_Ikke vis påminnelse igjen"
 
-#: ../gnome/applet/applet.glade.h:55
+#: ../gnome/applet/applet.glade.h:61
 msgid "_Login to Network"
 msgstr "_Logg på nettverk"
 
-#: ../gnome/applet/applet.glade.h:56
+#: ../gnome/applet/applet.glade.h:62
 msgid "_Network Name:"
 msgstr "_Nettverksnavn:"
 
-#: ../gnome/applet/applet.glade.h:57
+#: ../gnome/applet/applet.glade.h:63
 msgid "_Wireless Security:"
 msgstr "Tr_ådløs sikkerhet:"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:358
+#: ../gnome/vpn-properties/nm-vpn-properties.c:383
 msgid "Cannot add VPN connection"
 msgstr "Kan ikke legge til VPN-tilkobling"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:360
+#: ../gnome/vpn-properties/nm-vpn-properties.c:385
 msgid ""
 "No suitable VPN software was found on your system. Contact your system "
 "administrator."
@@ -700,11 +728,11 @@ msgstr ""
 "Ingen passende VPN-programvare ble funnet på systemet. Kontakt din "
 "systemadministrator."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:411
+#: ../gnome/vpn-properties/nm-vpn-properties.c:437
 msgid "Cannot import VPN connection"
 msgstr "Kan ikke importere VPN-tilkobling"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:413
+#: ../gnome/vpn-properties/nm-vpn-properties.c:439
 #, c-format
 msgid ""
 "Cannot find suitable software for VPN connection type '%s' to import the "
@@ -713,12 +741,12 @@ msgstr ""
 "Kan ikke finne passende programvare for VPN-tilkobling av type «%s» for "
 "import av fil «%s». Kontakt din sysstemadministrator."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:553
+#: ../gnome/vpn-properties/nm-vpn-properties.c:579
 #, c-format
 msgid "Error retrieving VPN connection '%s'"
 msgstr "Feil under henting av VPN tilkobling «%s»"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:556
+#: ../gnome/vpn-properties/nm-vpn-properties.c:582
 #, c-format
 msgid ""
 "Could not find the UI files for VPN connection type '%s'. Contact your "
@@ -727,12 +755,12 @@ msgstr ""
 "Kunne ikke finne brukergrensesnittfiler for VPN-tilkobling type «%s». "
 "Kontakt din systemadministrator."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:713
+#: ../gnome/vpn-properties/nm-vpn-properties.c:739
 #, c-format
 msgid "Delete VPN connection \"%s\"?"
 msgstr "Slett VPN-tilkobling «%s»?"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:716
+#: ../gnome/vpn-properties/nm-vpn-properties.c:742
 #, c-format
 msgid ""
 "All information about the VPN connection \"%s\" will be lost and you may "
@@ -742,16 +770,16 @@ msgstr ""
 "All informasjon om VPN-tilkobling «%s» vil gå tapt og du vil kanskje trenge "
 "hjelp fra din systemadministrator for å opprette en ny tilkobling."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:924
+#: ../gnome/vpn-properties/nm-vpn-properties.c:959
 msgid "Unable to load"
 msgstr "Kunne ikke laste"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:926
+#: ../gnome/vpn-properties/nm-vpn-properties.c:961
 msgid "Cannot find some needed resources (the glade file)!"
 msgstr "Fant ikke nødvendige ressurser (glade-filen)."
 
 #. Edit dialog
-#: ../gnome/vpn-properties/nm-vpn-properties.c:1034
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
 msgid "Edit VPN Connection"
 msgstr "Rediger VPN-tilkobling"
 
@@ -825,11 +853,11 @@ msgstr ""
 msgid "VPN Connections"
 msgstr "VPN-tilkoblinger"
 
-#: ../src/nm-ap-security-wep.c:47
+#: ../src/nm-ap-security-wep.c:52
 msgid "40-bit WEP"
 msgstr "40-bit WEP"
 
-#: ../src/nm-ap-security-wep.c:49
+#: ../src/nm-ap-security-wep.c:54
 msgid "104-bit WEP"
 msgstr "104-bit WEP"
 
@@ -857,7 +885,7 @@ msgstr "WPA2 CCMP"
 msgid "WPA2 Automatic"
 msgstr "WPA2 automatisk"
 
-#: ../src/nm-ap-security.c:305
+#: ../src/nm-ap-security.c:320
 msgid "none"
 msgstr "ingen"
 
@@ -897,28 +925,63 @@ msgstr "for mye data ble sendt over pluggen og noe data gikk tapt"
 msgid "error occurred while waiting for data on socket"
 msgstr "det skjedde en feil under venting på data på sokkel"
 
-#: ../gnome/applet/applet-dbus-devices.c:913
+#: ../gnome/applet/applet-dbus-devices.c:898
 #, c-format
 msgid "You are now connected to the Ad-Hoc wireless network '%s'."
 msgstr "Du er nå koblet til Ad-Hoc trådløst nettverk «%s»."
 
-#: ../gnome/applet/applet-dbus-devices.c:918
+#: ../gnome/applet/applet-dbus-devices.c:903
 #, c-format
 msgid "You are now connected to the wireless network '%s'."
 msgstr "Du er nå koblet til trådløst nettverk «%s»."
 
-#: ../gnome/applet/applet-dbus-devices.c:925
+#: ../gnome/applet/applet-dbus-devices.c:910
 msgid "You are now connected to the wired network."
 msgstr "Du er nå koblet til kablet nettverk."
 
-#: ../gnome/applet/applet-dbus-devices.c:931
+#: ../gnome/applet/applet-dbus-devices.c:916
 msgid "Connection Established"
 msgstr "Tilkobling etablert"
 
-#: ../gnome/applet/applet-dbus-devices.c:974
+#: ../gnome/applet/applet-dbus-devices.c:959
 msgid "Disconnected"
 msgstr "Frakoblet"
 
-#: ../gnome/applet/applet-dbus-devices.c:975
+#: ../gnome/applet/applet-dbus-devices.c:960
 msgid "The network connection has been disconnected."
 msgstr "Nettverksforbindelsen er frakoblet."
+
+#~ msgid "WEP 40/128-bit ASCII"
+#~ msgstr "WEP 40/128-bit ASCII"
+
+#~ msgid "WEP 40/128-bit hex"
+#~ msgstr "WEP 40/128-bit heksadesimal"
+
+#~ msgid "WEP Passphrase"
+#~ msgstr "WEP Passord:"
+
+#~ msgid ""
+#~ "None\n"
+#~ "WEP Passphrase\n"
+#~ "WEP 40/128-bit hex\n"
+#~ "WEP 40/128-bit ASCII\n"
+#~ msgstr ""
+#~ "Ingen\n"
+#~ "WEP passord\n"
+#~ "WEP 40/128-bit heksadesimal\n"
+#~ "WEP 40/128-bit ASCII\n"
+
+#~ msgid "Stop automatically running the networking applet?"
+#~ msgstr "Stopp automatisk oppstart av nettverkspanelprogrammet?"
+
+#~ msgid ""
+#~ "The networking applet will now terminate, but will automatically launch "
+#~ "the next time you login.  Would you like to stop automatically running "
+#~ "the networking applet on login?"
+#~ msgstr ""
+#~ "Nettverkspanelprogrammet vil nå avslutte, men automatisk starte opp neste "
+#~ "gang du logger inn. Vil du stoppe automatisk oppstart av dette "
+#~ "panelprogrammet?"
+
+#~ msgid "_Remove"
+#~ msgstr "Fje_rn fra panelet"
diff --git a/po/ne.po b/po/ne.po
index 2e52306ed4..57649cbcd6 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-14 14:36+0545\n"
+"POT-Creation-Date: 2006-05-29 18:33+0200\n"
 "PO-Revision-Date: 2005-04-11 10:13+0000\n"
 "Last-Translator: Jyotsna Shrestha <jyoshrestha@hotmail.com>\n"
 "Language-Team: Nepali <info@mpp.org.np>\n"
@@ -17,306 +17,494 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n!=0;\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: info-daemon/networks.glade.h:1
-msgid "<span weight=\"bold\">Wireless Networks:</span>"
-msgstr "<span weight=\"bold\">ताररहित संजाल:</span>"
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:919
+#, fuzzy, c-format
+msgid "Passphrase for wireless network %s"
+msgstr "नया� ताररहित संजाल सृजना गर�न�होला।"
 
-#: info-daemon/networks.glade.h:2
-msgid "Modify Wireless Networks"
-msgstr "ताररहित संजाल स�धारन�होला"
+#: ../gnome/applet/applet-dbus.c:265
+#, fuzzy, c-format
+msgid "Connection to the wireless network '%s' failed."
+msgstr "ताररहित संजाल '%s' सम�पर�क गरिदै..."
 
-#: info-daemon/passphrase.glade.h:1 panel-applet/applet.glade.h:2
-msgid "*"
-msgstr "*"
+#: ../gnome/applet/applet-dbus.c:270
+#, fuzzy
+msgid "Connection to the wired network failed."
+msgstr "तारसहित संजालमा सम�पर�क गरिदै..."
 
-#: info-daemon/passphrase.glade.h:2
-msgid ""
-"128-bit Passphrase (WEP)\n"
-"Ascii Key (WEP)\n"
-"Hex Key (WEP)"
+#: ../gnome/applet/applet.c:184
+msgid "Error displaying connection information:"
 msgstr ""
-"१२८-विट ग�जरि�कोवाक�य (डब�ल� ई पि)\n"
-"��ससिआइआइ क�न�ज (डब�ल� ई पि)\n"
-"हेक�स क�न�ज (डब�ल� ई पि)"
 
-#: info-daemon/passphrase.glade.h:6
-#, no-c-format
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
-"Network</span>\n"
-"\n"
-"A passphrase or encryption key is required to access the wireless network '%"
-"s'."
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">ग�जरि�कोवाक�य चाहियो ताररहित संजाल</span> "
-"बाट\n"
-"\n"
-"ग�जरि�कोवाक�य र ग�प�तिकरण क�न�ज ताररहित संजाल '%s' प�रवेशको लागी चाहिन�छ।"
-
-#: info-daemon/passphrase.glade.h:9
-msgid "Key Type:"
-msgstr "क�न�ज प�रकार:"
-
-#: info-daemon/passphrase.glade.h:10
-#: info-daemon/NetworkManagerInfoPassphraseDialog.c:140
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:150
-#: panel-applet/essid.glade.h:7 panel-applet/applet.glade.h:19
-msgid "Passphrase:"
-msgstr "ग�ज�रि�कोवाक�य:"
-
-#: info-daemon/passphrase.glade.h:11
-msgid "Wireless Network Key Required"
-msgstr "ताररहित सञ�जाल क�न�ज चाहियो"
-
-#: info-daemon/passphrase.glade.h:12 panel-applet/applet.glade.h:22
-msgid "_Login to Network"
-msgstr "सञ�जालमा लगइन गर�न�होला"
+#: ../gnome/applet/applet.c:202
+#, fuzzy
+msgid "Could not find some required resources (the glade file)!"
+msgstr "संजालप�रबन�धक �पप�लेटले केहि आवश�यक स�रोतहरू फेला पार�नसकेन (ग�लेड फाइल फेला परेन)।"
 
-#: info-daemon/NetworkManagerInfoPassphraseDialog.c:143
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:153
-msgid "Ascii Key:"
-msgstr "��ससिआइआइ क�न�ज:"
+#: ../gnome/applet/applet.c:213
+#, fuzzy
+msgid "No active connections!"
+msgstr "संजाल जडान छैन"
 
-#: info-daemon/NetworkManagerInfoPassphraseDialog.c:146
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:156
-msgid "Hex Key:"
-msgstr "हेक�स क�न�ज:"
+#: ../gnome/applet/applet.c:234
+#, fuzzy, c-format
+msgid "Wired Ethernet (%s)"
+msgstr "तारसहित सञ�जाल (%s)"
 
-#: info-daemon/NetworkManagerInfoVPN.c:158
-#, c-format
-msgid "You must log in to access the private network %s"
-msgstr "तपाईले निजि संजाल %s मा प�रवेशको लागी लगइन गर�न�पर�छ।"
+#: ../gnome/applet/applet.c:236
+#, fuzzy, c-format
+msgid "Wireless Ethernet (%s)"
+msgstr "ताररहित सञ�जाल (%s)"
 
-#: panel-applet/NMWirelessApplet.c:151 panel-applet/NMWirelessApplet.c:169
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:362
 msgid "NetworkManager Applet"
 msgstr "संजालप�रबन�धक �प�लेट"
 
-#: panel-applet/NMWirelessApplet.c:153 panel-applet/NMWirelessApplet.c:171
-msgid "Copyright (C) 2004-2005 Red Hat, Inc."
+#: ../gnome/applet/applet.c:339 ../gnome/applet/applet.c:364
+#, fuzzy
+msgid "Copyright © 2004-2005 Red Hat, Inc."
 msgstr "सर�वाधिकार (C) २००४-२००५ रेड ह�याट, आइ�नसि।"
 
-#: panel-applet/NMWirelessApplet.c:154 panel-applet/NMWirelessApplet.c:172
+#: ../gnome/applet/applet.c:340 ../gnome/applet/applet.c:365
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "तपाईको संजाल यन�त�रहरू र जडानहरू प�रबन�धको लागी चेतावनी क�षेत�र �पप�लेट"
 
-#: panel-applet/NMWirelessApplet.c:232
+#: ../gnome/applet/applet.c:343 ../gnome/applet/applet.c:370
+msgid "translator-credits"
+msgstr ""
+
+#: ../gnome/applet/applet.c:426
+msgid "VPN Login Failure"
+msgstr ""
+
+#: ../gnome/applet/applet.c:427
+#, c-format
+msgid "Could not start the VPN connection '%s' due to a login failure."
+msgstr ""
+
+#: ../gnome/applet/applet.c:431
+msgid "VPN Start Failure"
+msgstr ""
+
+#: ../gnome/applet/applet.c:432
 #, c-format
 msgid ""
-"<span weight=\"bold\" size=\"larger\">VPN Login Failure</span>\n"
-"\n"
-"Could not start the VPN connection '%s' due to a login failure.\n"
-"\n"
-"The VPN service said: \"%s\""
+"Could not start the VPN connection '%s' due to a failure launching the VPN "
+"program."
 msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:288
+#: ../gnome/applet/applet.c:436 ../gnome/applet/applet.c:446
+#, fuzzy
+msgid "VPN Connect Failure"
+msgstr "संजाल जडान छैन"
+
+#: ../gnome/applet/applet.c:437
+#, c-format
+msgid "Could not start the VPN connection '%s' due to a connection error."
+msgstr ""
+
+#: ../gnome/applet/applet.c:441
+msgid "VPN Configuration Error"
+msgstr ""
+
+#: ../gnome/applet/applet.c:442
+#, c-format
+msgid "The VPN connection '%s' was not correctly configured."
+msgstr ""
+
+#: ../gnome/applet/applet.c:447
 #, c-format
 msgid ""
-"<span weight=\"bold\" size=\"larger\">VPN Login Message</span>\n"
-"\n"
-"VPN connection '%s' said:\n"
-"\n"
-"\"%s\""
+"Could not start the VPN connection '%s' because the VPN server did not "
+"return an adequate network configuration."
 msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:499 panel-applet/NMWirelessApplet.c:1772
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:319
+#: ../gnome/applet/applet.c:517
+msgid "VPN Login Message"
+msgstr ""
+
+#: ../gnome/applet/applet.c:741 ../gnome/applet/applet.c:2508
+#: ../gnome/applet/other-network-dialog.c:453
+#: ../gnome/applet/passphrase-dialog.c:228
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
 msgstr "संजालप�रबन�धक �पप�लेटले केहि आवश�यक स�रोतहरू फेला पार�नसकेन (ग�लेड फाइल फेला परेन)।"
 
-#: panel-applet/NMWirelessApplet.c:510
+#: ../gnome/applet/applet.c:753
 #, c-format
 msgid "The network device \"%s (%s)\" does not support wireless scanning."
 msgstr "संजाल साधन \"%s (%s)\" ले ताररहित स�क�यानिङलाई समर�थन गरेन।"
 
-#: panel-applet/NMWirelessApplet.c:518
+#: ../gnome/applet/applet.c:761
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
 msgstr "संजाल साधन \"%s (%s)\" ले सम�पर�क अन�सन�धान समर�थन गरेन।"
 
-#: panel-applet/NMWirelessApplet.c:762
+#: ../gnome/applet/applet.c:908
+#, fuzzy, c-format
+msgid "Preparing device %s for the wired network..."
+msgstr "तारसहित संजालमा सम�पर�क गरिदै..."
+
+#: ../gnome/applet/applet.c:910
+#, fuzzy, c-format
+msgid "Preparing device %s for the wireless network '%s'..."
+msgstr "ताररहित संजाल '%s' सम�पर�क गरिदै..."
+
+#: ../gnome/applet/applet.c:918
+#, fuzzy, c-format
+msgid "Configuring device %s for the wired network..."
+msgstr "तारसहित संजालमा सम�पर�क गरिदै..."
+
+#: ../gnome/applet/applet.c:920
+#, fuzzy, c-format
+msgid "Attempting to join the wireless network '%s'..."
+msgstr "ताररहित संजाल '%s' सम�पर�क गरिदै..."
+
+#: ../gnome/applet/applet.c:928
+#, fuzzy, c-format
+msgid "Waiting for Network Key for the wireless network '%s'..."
+msgstr "ताररहित संजाल '%s' सम�पर�क गरिदै..."
+
+#: ../gnome/applet/applet.c:936 ../gnome/applet/applet.c:946
+#, fuzzy
+msgid "Requesting a network address from the wired network..."
+msgstr "तारसहित संजालमा सम�पर�क गरिदै..."
+
+#: ../gnome/applet/applet.c:938 ../gnome/applet/applet.c:948
+#, fuzzy, c-format
+msgid "Requesting a network address from the wireless network '%s'..."
+msgstr "ताररहित संजाल '%s' सम�पर�क गरिदै..."
+
+#: ../gnome/applet/applet.c:956
+#, fuzzy
+msgid "Finishing connection to the wired network..."
+msgstr "तारसहित संजालमा सम�पर�क गरिदै..."
+
+#: ../gnome/applet/applet.c:958
+#, fuzzy, c-format
+msgid "Finishing connection to the wireless network '%s'..."
+msgstr "ताररहित संजाल '%s' सम�पर�क गरिदै..."
+
+#: ../gnome/applet/applet.c:1075
+msgid "NetworkManager is not running"
+msgstr "संजालप�रबन�धक संचालन भईराखेको छैन।"
+
+#: ../gnome/applet/applet.c:1083 ../gnome/applet/applet.c:1828
+msgid "Networking disabled"
+msgstr ""
+
+#: ../gnome/applet/applet.c:1088
 msgid "No network connection"
 msgstr "संजाल जडान छैन"
 
-#: panel-applet/NMWirelessApplet.c:767
+#: ../gnome/applet/applet.c:1093
 msgid "Wired network connection"
 msgstr "तारसहित संजाल जडान"
 
-#: panel-applet/NMWirelessApplet.c:772
-msgid "Connecting to a wired network..."
-msgstr "तारसहित संजालमा सम�पर�क गरिदै..."
-
-#: panel-applet/NMWirelessApplet.c:781
+#: ../gnome/applet/applet.c:1097
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "�ड-�चओसि ताररहित संजालमा सम�पर�क स�थापना गरियो।"
 
-#: panel-applet/NMWirelessApplet.c:795
+#: ../gnome/applet/applet.c:1099
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "'%s' (%d%%) मा ताररहित संजाल सम�पर�क"
 
-#: panel-applet/NMWirelessApplet.c:800
-msgid "Wireless network connection"
-msgstr "ताररहित संजाल सम�पर�क"
-
-#: panel-applet/NMWirelessApplet.c:805
-#, c-format
-msgid "Connecting to wireless network '%s'..."
-msgstr "ताररहित संजाल '%s' सम�पर�क गरिदै..."
-
-#: panel-applet/NMWirelessApplet.c:811
-msgid "NetworkManager is not running"
-msgstr "संजालप�रबन�धक संचालन भईराखेको छैन।"
+#: ../gnome/applet/applet.c:1120
+#, fuzzy, c-format
+msgid "VPN connection to '%s'"
+msgstr "संजाल जडान छैन"
 
-#: panel-applet/NMWirelessApplet.c:816
-msgid "Scanning for wireless networks..."
-msgstr "ताररहित संजालको लागी स�क�यानिङ गरिदै॰॰॰"
+#: ../gnome/applet/applet.c:1128
+#, fuzzy, c-format
+msgid "VPN connecting to '%s'"
+msgstr "संजाल जडान छैन"
 
-#: panel-applet/NMWirelessApplet.c:1230
-msgid "Other Wireless Networks..."
+#: ../gnome/applet/applet.c:1541
+#, fuzzy
+msgid "_Connect to Other Wireless Network..."
 msgstr "अन�य ताररहित संजालहरू॰॰॰"
 
-#: panel-applet/NMWirelessApplet.c:1251
-msgid "Create new Wireless Network..."
+#: ../gnome/applet/applet.c:1562
+#, fuzzy
+msgid "Create _New Wireless Network..."
 msgstr "नया� ताररहित सञ�जाल सृजना॰॰॰"
 
-#: panel-applet/NMWirelessApplet.c:1325
+#: ../gnome/applet/applet.c:1685
 #, fuzzy
-msgid "VPN Connections"
+msgid "_VPN Connections"
+msgstr "संजाल जडान छैन"
+
+#: ../gnome/applet/applet.c:1730
+msgid "_Configure VPN..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1734
+msgid "_Disconnect VPN..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1756
+#, fuzzy
+msgid "_Dial Up Connections"
 msgstr "संजाल जडान छैन"
 
-#: panel-applet/NMWirelessApplet.c:1347
-msgid "Disconnect VPN..."
+#. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
+#: ../gnome/applet/applet.c:1767
+#, c-format
+msgid "Connect to %s..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1773
+#, c-format
+msgid "Disconnect from %s..."
 msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:1376
+#: ../gnome/applet/applet.c:1822
 msgid "No network devices have been found"
 msgstr "संजाल साधन फेला परेको छैन।"
 
-#: panel-applet/NMWirelessApplet.c:1534
+#: ../gnome/applet/applet.c:2014
 msgid "NetworkManager is not running..."
 msgstr "संजालप�रबन�धक संचालन भईराखेको छैन॰॰॰"
 
-#: panel-applet/NMWirelessApplet.c:1604 panel-applet/NMWirelessApplet.c:1652
-msgid "Pause Wireless Scanning"
-msgstr "ताररहित स�क�यानिङ रोक�न�होला"
-
-#: panel-applet/NMWirelessApplet.c:1609
-msgid "Resume Wireless Scanning"
-msgstr "ताररहित स�क�यानिङ फेरी श�रू गर�न�होला"
+#. 'Enable Networking' item
+#: ../gnome/applet/applet.c:2170
+msgid "Enable _Networking"
+msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:1619 panel-applet/NMWirelessApplet.c:1658
-msgid "Stop All Wireless Devices"
-msgstr "सबै ताररहित यन�त�रहर� रोक�न�होला।"
+#. 'Enable Wireless' item
+#: ../gnome/applet/applet.c:2176
+msgid "Enable _Wireless"
+msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:1624
-msgid "Start All Wireless Devices"
-msgstr "सबै ताररहित यन�त�रहर� श�रू गर�न�होला।"
+#. 'Connection Information' item
+#: ../gnome/applet/applet.c:2182
+msgid "Connection _Information"
+msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:1667
-msgid "Help"
+#. Help item
+#: ../gnome/applet/applet.c:2193
+#, fuzzy
+msgid "_Help"
 msgstr "मद�दत॒"
 
-#: panel-applet/NMWirelessApplet.c:1674
-msgid "About"
+#. About item
+#: ../gnome/applet/applet.c:2202
+#, fuzzy
+msgid "_About"
 msgstr "बारेमा॒"
 
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:232
-msgid "Create new wireless network"
-msgstr "नया� ताररहित संजाल सृजना गर�न�होला।"
-
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:233
+#: ../gnome/applet/applet.c:2667
+#, fuzzy
 msgid ""
-"Enter the ESSID and security settings of the wireless network you wish to "
-"create."
+"The NetworkManager applet could not find some required resources.  It cannot "
+"continue.\n"
+msgstr "संजालप�रबन�धक �पप�लेटले केहि आवश�यक स�रोतहरू फेला पार�नसकेन (ग�लेड फाइल फेला परेन)।"
+
+#: ../gnome/applet/wireless-security-option.c:157
+msgid "Open System"
 msgstr ""
-"तपाईले सृजना गर�न चहान�भ�को ताररहित संजालको ई �स �स आई डि र स�रक�षा मिलान प�रवेश "
-"गराउन�होला।"
 
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:238
-msgid "Custom wireless network"
-msgstr "ताररहित संजाल आफै मिलाउन�होला"
+#: ../gnome/applet/wireless-security-option.c:160
+msgid "Shared Key"
+msgstr ""
 
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:239
-msgid "Enter the ESSID of the wireless network to which you wish to connect."
-msgstr "तपाईले सम�पर�क गर�न चहान�भ�को ताररहित संजालको ई �स �स आई डि प�रवेश गराउन�होला।"
+#: ../gnome/applet/wireless-security-option.c:208
+msgid "Automatic (Default)"
+msgstr ""
 
-#: panel-applet/essid.glade.h:1 panel-applet/applet.glade.h:3
-msgid ""
-"128-bit passphrase (WEP)\n"
-"Ascii key (WEP)\n"
-"Hex key (WEP)"
+#: ../gnome/applet/wireless-security-option.c:215
+msgid "AES-CCMP"
 msgstr ""
-"१२८-विट ग�जरि�कोवाक�य (डब�ल� ई पि)\n"
-"��ससिआइआइ क�न�ज (डब�ल� ई पि)\n"
-"हेक�स क�न�ज (डब�ल� ई पि)"
 
-#: panel-applet/essid.glade.h:4 panel-applet/applet.glade.h:15
-msgid "C_onnect"
-msgstr "सम�पर�क गर�न�होला"
+#: ../gnome/applet/wireless-security-option.c:223
+msgid "TKIP"
+msgstr ""
 
-#: panel-applet/essid.glade.h:5 panel-applet/applet.glade.h:16
-msgid "Connect with encryption enabled"
-msgstr "सक�षम ग�प�तिकरण सहित जडान गर�न�होला"
+#: ../gnome/applet/wireless-security-option.c:231
+msgid "Dynamic WEP"
+msgstr ""
 
-#: panel-applet/essid.glade.h:6 panel-applet/applet.glade.h:18
-msgid "Key type:"
-msgstr "क�न�ज प�रकार:"
+#: ../gnome/applet/wso-none.c:53
+msgid "None"
+msgstr ""
 
-#: panel-applet/essid.glade.h:8 panel-applet/applet.glade.h:20
-msgid "Wireless _adapter:"
-msgstr "ताररहित �डप�टर:"
+#: ../gnome/applet/wso-wep-ascii.c:138
+msgid "WEP 64/128-bit ASCII"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-hex.c:135
+msgid "WEP 64/128-bit Hex"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-passphrase.c:135
+#, fuzzy
+msgid "WEP 128-bit Passphrase"
+msgstr "ग�ज�रि�कोवाक�य:"
 
-#: panel-applet/essid.glade.h:9 panel-applet/applet.glade.h:21
-msgid "Wireless _network:"
-msgstr "ताररहित संजाल:"
+#: ../gnome/applet/wso-wpa-eap.c:237
+msgid "PEAP"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:238
+msgid "TLS"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:239
+msgid "TTLS"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
+#: ../src/nm-ap-security-wpa-eap.c:116
+msgid "WPA2 Enterprise"
+msgstr ""
 
-#: panel-applet/menu-info.c:91
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
+#: ../src/nm-ap-security-wpa-eap.c:121
+msgid "WPA Enterprise"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-psk.c:178
+msgid "WPA2 Personal"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-psk.c:180
+msgid "WPA Personal"
+msgstr ""
+
+#: ../gnome/applet/eggtrayicon.c:134
+msgid "Orientation"
+msgstr "अभिम�खीकरण॒"
+
+#: ../gnome/applet/eggtrayicon.c:135
+msgid "The orientation of the tray."
+msgstr "ट�रेको अभिम�खीकरण॒"
+
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "तारसहित सञ�जाल (%s)"
 
-#: panel-applet/menu-info.c:93
-msgid "Wired Network"
+#: ../gnome/applet/menu-items.c:91
+#, fuzzy
+msgid "_Wired Network"
 msgstr "तारसहित सञ�जाल"
 
-#: panel-applet/menu-info.c:166
+#: ../gnome/applet/menu-items.c:162
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
 msgstr[0] "ताररहित सञ�जाल (%s)"
 msgstr[1] "ताररहित सञ�जालहरू (%s)"
 
-#: panel-applet/menu-info.c:168
+#: ../gnome/applet/menu-items.c:164
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "ताररहित सञ�जाल"
 msgstr[1] "ताररहित सञ�जालहरू"
 
-#: panel-applet/menu-info.c:294
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr " (अमान�य यूनिकोड)"
 
-#: panel-applet/NMWirelessApplet.xml.h:1
-msgid "_About..."
-msgstr "बारेमा॒"
+#: ../gnome/applet/other-network-dialog.c:352
+#, c-format
+msgid ""
+"By default, the wireless network's name is set to your computer's name, %s, "
+"with no encryption enabled"
+msgstr ""
 
-#: panel-applet/eggtrayicon.c:118 examples/python/systray/eggtrayicon.c:111
-msgid "Orientation"
-msgstr "अभिम�खीकरण॒"
+#: ../gnome/applet/other-network-dialog.c:358
+msgid "Create new wireless network"
+msgstr "नया� ताररहित संजाल सृजना गर�न�होला।"
 
-#: panel-applet/eggtrayicon.c:119 examples/python/systray/eggtrayicon.c:112
-msgid "The orientation of the tray."
-msgstr "ट�रेको अभिम�खीकरण॒"
+#: ../gnome/applet/other-network-dialog.c:359
+#, fuzzy
+msgid ""
+"Enter the name and security settings of the wireless network you wish to "
+"create."
+msgstr ""
+"तपाईले सृजना गर�न चहान�भ�को ताररहित संजालको ई �स �स आई डि र स�रक�षा मिलान प�रवेश "
+"गराउन�होला।"
+
+#: ../gnome/applet/other-network-dialog.c:363
+#, fuzzy
+msgid "Create New Wireless Network"
+msgstr "नया� ताररहित सञ�जाल सृजना॰॰॰"
+
+#: ../gnome/applet/other-network-dialog.c:368
+#, fuzzy
+msgid "Existing wireless network"
+msgstr "ताररहित संजाल आफै मिलाउन�होला"
+
+#: ../gnome/applet/other-network-dialog.c:369
+#, fuzzy
+msgid "Enter the name of the wireless network to which you wish to connect."
+msgstr "तपाईले सम�पर�क गर�न चहान�भ�को ताररहित संजालको ई �स �स आई डि प�रवेश गराउन�होला।"
+
+#: ../gnome/applet/other-network-dialog.c:371
+#, fuzzy
+msgid "Connect to Other Wireless Network"
+msgstr "अन�य ताररहित संजालहरू॰॰॰"
+
+#: ../gnome/applet/passphrase-dialog.c:215
+#, fuzzy
+msgid "Error connecting to wireless network"
+msgstr "ताररहित संजाल '%s' सम�पर�क गरिदै..."
+
+#: ../gnome/applet/passphrase-dialog.c:216
+msgid ""
+"The requested wireless network requires security capabilities unsupported by "
+"your hardware."
+msgstr ""
 
-#: panel-applet/applet.glade.h:1
+#: ../gnome/applet/vpn-password-dialog.c:151
+#: ../gnome/applet/vpn-password-dialog.c:188
+#, c-format
+msgid "Cannot start VPN connection '%s'"
+msgstr ""
+
+#: ../gnome/applet/vpn-password-dialog.c:154
+#, c-format
+msgid ""
+"Could not find the authentication dialog for VPN connection type '%s'. "
+"Contact your system administrator."
+msgstr ""
+
+#: ../gnome/applet/vpn-password-dialog.c:191
+#, c-format
+msgid ""
+"There was a problem launching the authentication dialog for VPN connection "
+"type '%s'. Contact your system administrator."
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:1
 msgid " "
 msgstr " "
 
-#: panel-applet/applet.glade.h:7
+#: ../gnome/applet/applet.glade.h:2
+#, fuzzy
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
+msgstr "<span weight=\"bold\">ताररहित संजाल:</span>"
+
+#: ../gnome/applet/applet.glade.h:4
+#, no-c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
+"Network</span>\n"
+"\n"
+"A passphrase or encryption key is required to access the wireless network '%"
+"s'."
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">ग�जरि�कोवाक�य चाहियो ताररहित संजाल</span> "
+"बाट\n"
+"\n"
+"ग�जरि�कोवाक�य र ग�प�तिकरण क�न�ज ताररहित संजाल '%s' प�रवेशको लागी चाहिन�छ।"
+
+#: ../gnome/applet/applet.glade.h:8
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
@@ -327,15 +515,15 @@ msgstr ""
 "\n"
 "%s  यो पूर�ण कार�य ह�ने छैन।"
 
-#: panel-applet/applet.glade.h:11
-#, no-c-format
+#: ../gnome/applet/applet.glade.h:12
+#, fuzzy, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
 "span>\n"
 "\n"
-"You have chosen log in to the wireless network '%s'.  If you are sure this "
-"wireless network is secure, click the checkbox below and NetworkManager will "
-"no longer pester you with stupid questions when you connect to it."
+"You have chosen to log in to the wireless network '%s'.  If you are sure "
+"that this wireless network is secure, click the checkbox below and "
+"NetworkManager will not require confirmation on subsequent log ins."
 msgstr ""
 "<span weight=\"bold\" size=\"larger\">ताररहित संजाल लगइन प�रमाणित</span>\n"
 "\n"
@@ -343,55 +531,563 @@ msgstr ""
 "ताररहित संजाल स�रक�षित छ, तलको जा�च बाकसमा क�लिक गर�न�होला र संजाल प�रबन�धकले मन�द "
 "प�रश�नहरूले तपाईलाई द�:ख दिंदैन जब तपाई यससंग जोडिन�ह�न�छ।."
 
-#: panel-applet/applet.glade.h:14
-msgid "Always Trust this Wireless Network"
+#: ../gnome/applet/applet.glade.h:15
+msgid "Anonymous Identity:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:16
+#, fuzzy
+msgid "Authentication:"
+msgstr "अभिम�खीकरण॒"
+
+#: ../gnome/applet/applet.glade.h:17
+msgid "Broadcast Address:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:18
+msgid "CA Certificate File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:19
+msgid "C_onnect"
+msgstr "सम�पर�क गर�न�होला"
+
+#: ../gnome/applet/applet.glade.h:20
+msgid "Client Certificate File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:21
+msgid "Connection Information"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:22
+msgid "Default Route:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:23
+msgid "Destination Address:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:24
+msgid "Driver:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:25
+msgid "EAP Method:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:26
+msgid "Hardware Address:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:27
+msgid "IP Address:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:28
+msgid "Identity:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:29
+msgid "Interface:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:30
+msgid "Key Type:"
+msgstr "क�न�ज प�रकार:"
+
+#: ../gnome/applet/applet.glade.h:31
+#, fuzzy
+msgid "Key:"
+msgstr "हेक�स क�न�ज:"
+
+#: ../gnome/applet/applet.glade.h:32
+msgid ""
+"None\n"
+"WEP 128-bit Passphrase\n"
+"WEP 64/128-bit Hex\n"
+"WEP 64/128-bit ASCII\n"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:37
+msgid ""
+"Open System\n"
+"Shared Key"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:39
+#, fuzzy
+msgid "Other Wireless Network..."
+msgstr "अन�य ताररहित संजालहरू॰॰॰"
+
+#: ../gnome/applet/applet.glade.h:40
+msgid "Passphrase:"
+msgstr "ग�ज�रि�कोवाक�य:"
+
+#: ../gnome/applet/applet.glade.h:41
+msgid "Password:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:42
+msgid "Primary DNS:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:43
+msgid "Private Key File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:44
+msgid "Private Key Password:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:45
+msgid "Secondary DNS:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:46
+msgid "Select the CA Certificate File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:47
+msgid "Select the Client Certificate File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:48
+msgid "Select the Private Key File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:49
+msgid "Show key"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:50
+#, fuzzy
+msgid "Show passphrase"
+msgstr "ग�ज�रि�कोवाक�य:"
+
+#: ../gnome/applet/applet.glade.h:51
+msgid "Show password"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:52
+msgid "Show passwords"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:53
+msgid "Speed:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:54
+msgid "Subnet Mask:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:55
+#, fuzzy
+msgid "Type:"
+msgstr "क�न�ज प�रकार:"
+
+#: ../gnome/applet/applet.glade.h:56
+msgid "User Name:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:57
+msgid "Wireless Network Key Required"
+msgstr "ताररहित सञ�जाल क�न�ज चाहियो"
+
+#: ../gnome/applet/applet.glade.h:58
+msgid "Wireless _adapter:"
+msgstr "ताररहित �डप�टर:"
+
+#: ../gnome/applet/applet.glade.h:59
+#, fuzzy
+msgid "_Always Trust this Wireless Network"
 msgstr "जहिलेपनि यहि ताररहित सञ�जालमा विश�वास गर�न�होला।"
 
-#: panel-applet/applet.glade.h:17
-msgid "Don't remind me again"
+#: ../gnome/applet/applet.glade.h:60
+#, fuzzy
+msgid "_Don't remind me again"
 msgstr "मलाई फेरि नसम��ाउन�होला।"
 
-#: panel-applet/applet.glade.h:23
-msgid "_OK"
-msgstr "ठीक छ॒"
+#: ../gnome/applet/applet.glade.h:61
+msgid "_Login to Network"
+msgstr "सञ�जालमा लगइन गर�न�होला"
 
-#: panel-applet/nmwa-vpn-password-dialog.c:105
+#: ../gnome/applet/applet.glade.h:62
+msgid "_Network Name:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:63
+#, fuzzy
+msgid "_Wireless Security:"
+msgstr "ताररहित �डप�टर:"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:383
+#, fuzzy
+msgid "Cannot add VPN connection"
+msgstr "संजाल जडान छैन"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:385
+msgid ""
+"No suitable VPN software was found on your system. Contact your system "
+"administrator."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:437
+#, fuzzy
+msgid "Cannot import VPN connection"
+msgstr "संजाल जडान छैन"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:439
+#, c-format
+msgid ""
+"Cannot find suitable software for VPN connection type '%s' to import the "
+"file '%s'. Contact your system administrator."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:579
+#, c-format
+msgid "Error retrieving VPN connection '%s'"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:582
+#, c-format
+msgid ""
+"Could not find the UI files for VPN connection type '%s'. Contact your "
+"system administrator."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:739
 #, fuzzy, c-format
-msgid "You must log in to access the Virtual Private Network '%s'."
-msgstr "तपाईले निजि संजाल %s मा प�रवेशको लागी लगइन गर�न�पर�छ।"
+msgid "Delete VPN connection \"%s\"?"
+msgstr "संजाल जडान छैन"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:742
+#, c-format
+msgid ""
+"All information about the VPN connection \"%s\" will be lost and you may "
+"need your system administrator to provide information to create a new "
+"connection."
+msgstr ""
 
-#: src/nm-netlink-monitor.c:154
+#: ../gnome/vpn-properties/nm-vpn-properties.c:959
+msgid "Unable to load"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:961
+#, fuzzy
+msgid "Cannot find some needed resources (the glade file)!"
+msgstr "संजालप�रबन�धक �पप�लेटले केहि आवश�यक स�रोतहरू फेला पार�नसकेन (ग�लेड फाइल फेला परेन)।"
+
+#. Edit dialog
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
+#, fuzzy
+msgid "Edit VPN Connection"
+msgstr "संजाल जडान छैन"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:1
+#, fuzzy
+msgid "Add a new VPN connection"
+msgstr "संजाल जडान छैन"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:2
+msgid "Choose which type of VPN connection you wish to create."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
+#, fuzzy
+msgid "Connect to:"
+msgstr "सम�पर�क गर�न�होला"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
+#, fuzzy
+msgid "Create VPN Connection"
+msgstr "संजाल जडान छैन"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
+#, fuzzy
+msgid "Create VPN Connection - 1 of 2"
+msgstr "संजाल जडान छैन"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
+#, fuzzy
+msgid "Create VPN Connection - 2 of 2"
+msgstr "संजाल जडान छैन"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
+msgid "Delete the selected VPN connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
+msgid "E_xport"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:9
+msgid "Edit the selected VPN connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:10
+msgid "Export the VPN settings to a file"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:11
+msgid "Export the selected VPN connection to a file"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:12
+#, fuzzy
+msgid "Finish Creating VPN Connection"
+msgstr "संजाल जडान छैन"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:13
+#, fuzzy
+msgid "Manage Virtual Private Network Connections"
+msgstr "ताररहित संजाल सम�पर�क"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:14
+msgid ""
+"This assistant will guide you through the creation of a connection to a "
+"Virtual Private Network (VPN).\n"
+"\n"
+"It will require some information, such as IP addresses and secrets.  Please "
+"see your system administrator to obtain this information."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:17
+#, fuzzy
+msgid "VPN Connections"
+msgstr "संजाल जडान छैन"
+
+#: ../src/nm-ap-security-wep.c:52
+msgid "40-bit WEP"
+msgstr ""
+
+#: ../src/nm-ap-security-wep.c:54
+msgid "104-bit WEP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:50
+msgid "WPA TKIP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:52
+msgid "WPA CCMP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:54
+msgid "WPA Automatic"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:59
+msgid "WPA2 TKIP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:61
+msgid "WPA2 CCMP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:63
+msgid "WPA2 Automatic"
+msgstr ""
+
+#: ../src/nm-ap-security.c:320
+msgid "none"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:154
 #, c-format
 msgid ""
 "unable to create netlink socket for monitoring wired ethernet devices - %s"
 msgstr "मानिटरिङ तारसहित ईथरनेट यन�त�र - %s को लागी नेटलिङ�क सकेट सृजना गर�न असक�षम"
 
-#: src/nm-netlink-monitor.c:172
+#: ../src/nm-netlink-monitor.c:172
 #, c-format
 msgid ""
 "unable to bind to netlink socket for monitoring wired ethernet devices - %s"
 msgstr "मानिटरिङ तारसहित ईथरनेट यन�त�र - %s को लागी नेटलिङ�क सकेट संयोजन गर�न असक�षम"
 
-#: src/nm-netlink-monitor.c:403
+#: ../src/nm-netlink-monitor.c:405
 msgid "operation took too long"
 msgstr "संचालनले धेरै लामो लियो"
 
-#: src/nm-netlink-monitor.c:500
+#: ../src/nm-netlink-monitor.c:502
 msgid "received data from wrong type of sender"
 msgstr "गलत प�रकारको प�रेषकबाट पठा�को डाटा प�राप�त गरियो।"
 
-#: src/nm-netlink-monitor.c:513
+#: ../src/nm-netlink-monitor.c:515
 msgid "received data from unexpected sender"
 msgstr "आशा नगरेको प�रेषकबाट पठा�को डाटा प�राप�त गरियो।"
 
-#: src/nm-netlink-monitor.c:535
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: src/nm-netlink-monitor.c:644
+#: ../src/nm-netlink-monitor.c:646
 msgid "too much data was sent over socket and some of it was lost"
 msgstr "सकेट माथी धेरै डाटाहरू पठाईयो र त�यसमध�ये केहि हरायो।"
 
+#: ../src/nm-netlink-monitor.c:735
+msgid "error occurred while waiting for data on socket"
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:898
+#, fuzzy, c-format
+msgid "You are now connected to the Ad-Hoc wireless network '%s'."
+msgstr "�ड-�चओसि ताररहित संजालमा सम�पर�क स�थापना गरियो।"
+
+#: ../gnome/applet/applet-dbus-devices.c:903
+#, fuzzy, c-format
+msgid "You are now connected to the wireless network '%s'."
+msgstr "ताररहित संजाल '%s' सम�पर�क गरिदै..."
+
+#: ../gnome/applet/applet-dbus-devices.c:910
+#, fuzzy
+msgid "You are now connected to the wired network."
+msgstr "तारसहित संजालमा सम�पर�क गरिदै..."
+
+#: ../gnome/applet/applet-dbus-devices.c:916
+#, fuzzy
+msgid "Connection Established"
+msgstr "सक�षम ग�प�तिकरण सहित जडान गर�न�होला"
+
+#: ../gnome/applet/applet-dbus-devices.c:959
+msgid "Disconnected"
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:960
+msgid "The network connection has been disconnected."
+msgstr ""
+
+#~ msgid "Modify Wireless Networks"
+#~ msgstr "ताररहित संजाल स�धारन�होला"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid ""
+#~ "128-bit Passphrase (WEP)\n"
+#~ "Ascii Key (WEP)\n"
+#~ "Hex Key (WEP)"
+#~ msgstr ""
+#~ "१२८-विट ग�जरि�कोवाक�य (डब�ल� ई पि)\n"
+#~ "��ससिआइआइ क�न�ज (डब�ल� ई पि)\n"
+#~ "हेक�स क�न�ज (डब�ल� ई पि)"
+
+#~ msgid "Ascii Key:"
+#~ msgstr "��ससिआइआइ क�न�ज:"
+
+#~ msgid "You must log in to access the private network %s"
+#~ msgstr "तपाईले निजि संजाल %s मा प�रवेशको लागी लगइन गर�न�पर�छ।"
+
+#~ msgid "Scanning for wireless networks..."
+#~ msgstr "ताररहित संजालको लागी स�क�यानिङ गरिदै॰॰॰"
+
+#~ msgid "Pause Wireless Scanning"
+#~ msgstr "ताररहित स�क�यानिङ रोक�न�होला"
+
+#~ msgid "Resume Wireless Scanning"
+#~ msgstr "ताररहित स�क�यानिङ फेरी श�रू गर�न�होला"
+
+#~ msgid "Stop All Wireless Devices"
+#~ msgstr "सबै ताररहित यन�त�रहर� रोक�न�होला।"
+
+#~ msgid "Start All Wireless Devices"
+#~ msgstr "सबै ताररहित यन�त�रहर� श�रू गर�न�होला।"
+
+#~ msgid ""
+#~ "128-bit passphrase (WEP)\n"
+#~ "Ascii key (WEP)\n"
+#~ "Hex key (WEP)"
+#~ msgstr ""
+#~ "१२८-विट ग�जरि�कोवाक�य (डब�ल� ई पि)\n"
+#~ "��ससिआइआइ क�न�ज (डब�ल� ई पि)\n"
+#~ "हेक�स क�न�ज (डब�ल� ई पि)"
+
+#~ msgid "Key type:"
+#~ msgstr "क�न�ज प�रकार:"
+
+#~ msgid "Wireless _network:"
+#~ msgstr "ताररहित संजाल:"
+
+#~ msgid "_About..."
+#~ msgstr "बारेमा॒"
+
+#~ msgid "_OK"
+#~ msgstr "ठीक छ॒"
+
+#, fuzzy
+#~ msgid "You must log in to access the Virtual Private Network '%s'."
+#~ msgstr "तपाईले निजि संजाल %s मा प�रवेशको लागी लगइन गर�न�पर�छ।"
+
+#~ msgid "%s"
+#~ msgstr "%s"
+
 #~ msgid "progress bar label|%d %%"
 #~ msgstr "प�रगति बार तह|%d %%"
+
+#~ msgid "<span weight=\"bold\">Wireless Networks:</span>"
+#~ msgstr "<span weight=\"bold\">ताररहित संजाल:</span>"
+
+#~ msgid "Hex Key:"
+#~ msgstr "हेक�स क�न�ज:"
+
+#~ msgid "Copyright (C) 2004-2005 Red Hat, Inc."
+#~ msgstr "सर�वाधिकार (C) २००४-२००५ रेड ह�याट, आइ�नसि।"
+
+#~ msgid "Connecting to a wired network..."
+#~ msgstr "तारसहित संजालमा सम�पर�क गरिदै..."
+
+#~ msgid "Wireless network connection"
+#~ msgstr "ताररहित संजाल सम�पर�क"
+
+#~ msgid "Connecting to wireless network '%s'..."
+#~ msgstr "ताररहित संजाल '%s' सम�पर�क गरिदै..."
+
+#~ msgid "Other Wireless Networks..."
+#~ msgstr "अन�य ताररहित संजालहरू॰॰॰"
+
+#~ msgid "Create new Wireless Network..."
+#~ msgstr "नया� ताररहित सञ�जाल सृजना॰॰॰"
+
+#~ msgid "Help"
+#~ msgstr "मद�दत॒"
+
+#~ msgid "About"
+#~ msgstr "बारेमा॒"
+
+#~ msgid ""
+#~ "Enter the ESSID and security settings of the wireless network you wish to "
+#~ "create."
+#~ msgstr ""
+#~ "तपाईले सृजना गर�न चहान�भ�को ताररहित संजालको ई �स �स आई डि र स�रक�षा मिलान प�रवेश "
+#~ "गराउन�होला।"
+
+#~ msgid "Custom wireless network"
+#~ msgstr "ताररहित संजाल आफै मिलाउन�होला"
+
+#~ msgid ""
+#~ "Enter the ESSID of the wireless network to which you wish to connect."
+#~ msgstr ""
+#~ "तपाईले सम�पर�क गर�न चहान�भ�को ताररहित संजालको ई �स �स आई डि प�रवेश गराउन�होला।"
+
+#~ msgid "Connect with encryption enabled"
+#~ msgstr "सक�षम ग�प�तिकरण सहित जडान गर�न�होला"
+
+#~ msgid "Wired Network"
+#~ msgstr "तारसहित सञ�जाल"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Wireless Network Login "
+#~ "Confirmation</span>\n"
+#~ "\n"
+#~ "You have chosen log in to the wireless network '%s'.  If you are sure "
+#~ "this wireless network is secure, click the checkbox below and "
+#~ "NetworkManager will no longer pester you with stupid questions when you "
+#~ "connect to it."
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">ताररहित संजाल लगइन प�रमाणित</span>\n"
+#~ "\n"
+#~ "तपाईले ताररहित संजाल '%s' मा लगइन छान�न� भ�को छ। यदि तपाई निश�चिन�त ह�न�ह�न�छ कि "
+#~ "ताररहित संजाल स�रक�षित छ, तलको जा�च बाकसमा क�लिक गर�न�होला र संजाल प�रबन�धकले मन�द "
+#~ "प�रश�नहरूले तपाईलाई द�:ख दिंदैन जब तपाई यससंग जोडिन�ह�न�छ।."
+
+#~ msgid "Always Trust this Wireless Network"
+#~ msgstr "जहिलेपनि यहि ताररहित सञ�जालमा विश�वास गर�न�होला।"
+
+#~ msgid "Don't remind me again"
+#~ msgstr "मलाई फेरि नसम��ाउन�होला।"
diff --git a/po/nl.po b/po/nl.po
index 1be0f8d71e..f1e0279093 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNOME 2.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-14 03:41+0100\n"
+"POT-Creation-Date: 2006-05-29 18:33+0200\n"
 "PO-Revision-Date: 2006-02-14 13:49+0100\n"
 "Last-Translator: Tino Meinen <a.t.meinen@chello.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -22,118 +22,118 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:923
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:919
 #, c-format
 msgid "Passphrase for wireless network %s"
 msgstr "Wachtwoordzin voor draadloos netwerk %s"
 
-#: ../gnome/applet/applet-dbus.c:244
+#: ../gnome/applet/applet-dbus.c:265
 #, c-format
 msgid "Connection to the wireless network '%s' failed."
 msgstr "Verbinding maken met het draadloos netwerk '%s' is mislukt."
 
 # vaste netwerk
-#: ../gnome/applet/applet-dbus.c:249
+#: ../gnome/applet/applet-dbus.c:270
 msgid "Connection to the wired network failed."
 msgstr "Verbinding maken met het bekabelde netwerk is mislukt."
 
-#: ../gnome/applet/applet.c:179
+#: ../gnome/applet/applet.c:184
 msgid "Error displaying connection information:"
 msgstr "Fout bij weergeven van verbindingsinformatie:"
 
-#: ../gnome/applet/applet.c:196
+#: ../gnome/applet/applet.c:202
 msgid "Could not find some required resources (the glade file)!"
 msgstr "Kon bepaalde vereiste bronnen niet vinden (het glade bestand)!"
 
 # Netwerken
-#: ../gnome/applet/applet.c:207
+#: ../gnome/applet/applet.c:213
 msgid "No active connections!"
 msgstr "Geen actieve netwerkverbindingen!"
 
 # Bekabeld ethernet/kabel-ethernet
-#: ../gnome/applet/applet.c:224
+#: ../gnome/applet/applet.c:234
 #, c-format
 msgid "Wired Ethernet (%s)"
 msgstr "Bekabeld ethernet (%s)"
 
-#: ../gnome/applet/applet.c:226
+#: ../gnome/applet/applet.c:236
 #, c-format
 msgid "Wireless Ethernet (%s)"
 msgstr "Draadloos ethernet (%s)"
 
-#: ../gnome/applet/applet.c:323 ../gnome/applet/applet.c:348
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:362
 msgid "NetworkManager Applet"
 msgstr "NetworkManager applet"
 
-#: ../gnome/applet/applet.c:325 ../gnome/applet/applet.c:350
+#: ../gnome/applet/applet.c:339 ../gnome/applet/applet.c:364
 msgid "Copyright © 2004-2005 Red Hat, Inc."
 msgstr "Copyright © 2004-2005 Red Hat, Inc."
 
 # (verschijnt als ondertitel in het 'about' dialoog.
 # Een toepassing in het paneel voor het beheren van uw netwerkverbindingen en apparaten.
 # Een paneeltoepassing voor het beheer van uw netwerkapparaten en verbindingen.
-#: ../gnome/applet/applet.c:326 ../gnome/applet/applet.c:351
+#: ../gnome/applet/applet.c:340 ../gnome/applet/applet.c:365
 msgid ""
 "Notification area applet for managing your network devices and connections."
-msgstr "Een toepassing in het paneel voor het beheren van uw netwerkverbindingen en apparaten."
+msgstr ""
+"Een toepassing in het paneel voor het beheren van uw netwerkverbindingen en "
+"apparaten."
 
-#: ../gnome/applet/applet.c:329 ../gnome/applet/applet.c:356
+#: ../gnome/applet/applet.c:343 ../gnome/applet/applet.c:370
 msgid "translator-credits"
 msgstr ""
 "Tino Meinen\n"
 "\n"
 "Kijk voor meer informatie op http://nl.gnome.org/"
 
-#: ../gnome/applet/applet.c:441
-msgid "VPN Error"
-msgstr "VPN-fout"
-
-#: ../gnome/applet/applet.c:445
+#: ../gnome/applet/applet.c:426
 msgid "VPN Login Failure"
 msgstr "VPN-aanmelding mislukt"
 
 # starten/opzetten/aanmaken 
 # aanmeldfout/aanmeldingsfout
 # (dit bericht komt meerdere keren voor)
-#: ../gnome/applet/applet.c:446
+#: ../gnome/applet/applet.c:427
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a login failure."
 msgstr "Kon de VPN-verbinding '%s' niet starten vanwege een aanmeldingsfout."
 
-#: ../gnome/applet/applet.c:450
+#: ../gnome/applet/applet.c:431
 msgid "VPN Start Failure"
 msgstr "VPN opstarten mislukt"
 
 # launching en starting is allebij opstarten.
 # kon geen VPN-verbinding met s maken/kon de VPN-verbinding s niet maken
-#: ../gnome/applet/applet.c:451
+#: ../gnome/applet/applet.c:432
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
 "program."
-msgstr "Kon de VPN-verbinding '%s' niet maken omdat het VPN-programma niet kon opstarten."
+msgstr ""
+"Kon de VPN-verbinding '%s' niet maken omdat het VPN-programma niet kon "
+"opstarten."
 
-#: ../gnome/applet/applet.c:455 ../gnome/applet/applet.c:465
+#: ../gnome/applet/applet.c:436 ../gnome/applet/applet.c:446
 msgid "VPN Connect Failure"
 msgstr "VPN-verbinding mislukt"
 
 # VPN-verbinding starten/opzetten/aanmaken
-#: ../gnome/applet/applet.c:456
+#: ../gnome/applet/applet.c:437
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a connection error."
 msgstr "Kon de VPN-verbinding '%s' niet starten vanwege een verbindingsfout."
 
-#: ../gnome/applet/applet.c:460
+#: ../gnome/applet/applet.c:441
 msgid "VPN Configuration Error"
 msgstr "VPN-configuratiefout"
 
 # niet goed/onjuist
-#: ../gnome/applet/applet.c:461
+#: ../gnome/applet/applet.c:442
 #, c-format
 msgid "The VPN connection '%s' was not correctly configured."
 msgstr "De VPN-verbinding '%s' is niet goed geconfigureerd."
 
-#: ../gnome/applet/applet.c:466
+#: ../gnome/applet/applet.c:447
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' because the VPN server did not "
@@ -142,24 +142,13 @@ msgstr ""
 "Kon de VPN-verbinding '%s' niet maken omdat de VPN-server geen geschikte "
 "netwerkconfiguratie aangaf."
 
-#: ../gnome/applet/applet.c:474
-#, c-format
-msgid "The VPN service said: \"%s\""
-msgstr "De VPN-service meldde: \"%s\""
-
-# verbinding naar/met
-#: ../gnome/applet/applet.c:543
-#, c-format
-msgid "VPN connection '%s' said:"
-msgstr "VPN-verbinding '%s' meldde:"
-
-#: ../gnome/applet/applet.c:545
+#: ../gnome/applet/applet.c:517
 msgid "VPN Login Message"
 msgstr "VPN-aanmeldbericht"
 
-#: ../gnome/applet/applet.c:762 ../gnome/applet/applet.c:2516
+#: ../gnome/applet/applet.c:741 ../gnome/applet/applet.c:2508
 #: ../gnome/applet/other-network-dialog.c:453
-#: ../gnome/applet/passphrase-dialog.c:227
+#: ../gnome/applet/passphrase-dialog.c:228
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
@@ -168,29 +157,29 @@ msgstr ""
 "glade bestand is niet gevonden)."
 
 # station/apparaat
-#: ../gnome/applet/applet.c:774
+#: ../gnome/applet/applet.c:753
 #, c-format
 msgid "The network device \"%s (%s)\" does not support wireless scanning."
 msgstr "Het netwerkapparaat \"%s (%s)\" ondersteunt draadloos scannen niet."
 
-#: ../gnome/applet/applet.c:782
+#: ../gnome/applet/applet.c:761
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
 msgstr "Het netwerkapparaat \"%s (%s)\" ondersteunt link-detecteren niet."
 
 # vaste netwerk
-#: ../gnome/applet/applet.c:929
+#: ../gnome/applet/applet.c:908
 #, c-format
 msgid "Preparing device %s for the wired network..."
 msgstr "Apparaat %s wordt ingesteld voor het bekabelde netwerk..."
 
-#: ../gnome/applet/applet.c:931
+#: ../gnome/applet/applet.c:910
 #, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
 msgstr "Apparaat %s wordt ingesteld op het draadloos netwerk '%s'..."
 
 # vaste netwerk
-#: ../gnome/applet/applet.c:939
+#: ../gnome/applet/applet.c:918
 #, c-format
 msgid "Configuring device %s for the wired network..."
 msgstr "Appraat %s wordt geconfigureerd voor het bekabelde netwerk..."
@@ -198,33 +187,33 @@ msgstr "Appraat %s wordt geconfigureerd voor het bekabelde netwerk..."
 # bezig met pogen om binen te komen
 # aan te sluiten bij/verbinding te maken met/binnen te komen bij
 # ("binnenkomen bij" klingt als 'cracken')
-#: ../gnome/applet/applet.c:941
+#: ../gnome/applet/applet.c:920
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
 msgstr "Poging aan te sluiten bij het draadloos netwerk '%s'..."
 
-#: ../gnome/applet/applet.c:949
+#: ../gnome/applet/applet.c:928
 #, c-format
 msgid "Waiting for Network Key for the wireless network '%s'..."
 msgstr "Wachten op netwerksleutel voor het draadloos netwerk '%s'..."
 
 # vaste netwerk
-#: ../gnome/applet/applet.c:957 ../gnome/applet/applet.c:967
+#: ../gnome/applet/applet.c:936 ../gnome/applet/applet.c:946
 msgid "Requesting a network address from the wired network..."
 msgstr "Er wordt een netwerkadres verzocht voor het bekabelde netwerk..."
 
-#: ../gnome/applet/applet.c:959 ../gnome/applet/applet.c:969
+#: ../gnome/applet/applet.c:938 ../gnome/applet/applet.c:948
 #, c-format
 msgid "Requesting a network address from the wireless network '%s'..."
 msgstr "Er wordt een netwerkadres verzocht voor het draadloos netwerk '%s'..."
 
 # afgerond/voltooid/gelegd
 # vaste netwerk
-#: ../gnome/applet/applet.c:977
+#: ../gnome/applet/applet.c:956
 msgid "Finishing connection to the wired network..."
 msgstr "Verbinding met het bekabelde netwerk wordt voltooid..."
 
-#: ../gnome/applet/applet.c:979
+#: ../gnome/applet/applet.c:958
 #, c-format
 msgid "Finishing connection to the wireless network '%s'..."
 msgstr "Verbinding met het draadloos netwerk '%s' wordt voltooid..."
@@ -234,86 +223,86 @@ msgstr "Verbinding met het draadloos netwerk '%s' wordt voltooid..."
 # NetworkManager loopt niet
 # Geen NetworkManager aanwezig
 # NetworkManager niet aanwezig
-#: ../gnome/applet/applet.c:1096
+#: ../gnome/applet/applet.c:1075
 msgid "NetworkManager is not running"
 msgstr "Geen NetworkManager..."
 
 # netwerk is uitgezet/netwerken is uitgezet/netwerken is niet mogelijk
-#: ../gnome/applet/applet.c:1109 ../gnome/applet/applet.c:1843
+#: ../gnome/applet/applet.c:1083 ../gnome/applet/applet.c:1828
 msgid "Networking disabled"
 msgstr "Netwerk is uitgeschakeld"
 
 # geen netwerk/netwerkverbinding
-#: ../gnome/applet/applet.c:1114
+#: ../gnome/applet/applet.c:1088
 msgid "No network connection"
 msgstr "Geen netwerkverbinding"
 
 # netwerk/netwerkverbinding
 # vaste netwerk
-#: ../gnome/applet/applet.c:1119
+#: ../gnome/applet/applet.c:1093
 msgid "Wired network connection"
 msgstr "Bekabelde netwerkverbinding"
 
-#: ../gnome/applet/applet.c:1123
+#: ../gnome/applet/applet.c:1097
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Verbonden met een Ad-hoc draadloos netwerk"
 
-#: ../gnome/applet/applet.c:1125
+#: ../gnome/applet/applet.c:1099
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "Draadloze netwerkverbinding met '%s' (%d%%)"
 
 # verbinding naar/met
-#: ../gnome/applet/applet.c:1147
+#: ../gnome/applet/applet.c:1120
 #, c-format
 msgid "VPN connection to '%s'"
 msgstr "VPN-verbinding met '%s'"
 
 # Connecting? ipv connection?
-#: ../gnome/applet/applet.c:1155
+#: ../gnome/applet/applet.c:1128
 #, c-format
 msgid "VPN connecting to '%s'"
 msgstr "VPN verbinden met '%s'"
 
-#: ../gnome/applet/applet.c:1568
+#: ../gnome/applet/applet.c:1541
 msgid "_Connect to Other Wireless Network..."
 msgstr "_Verbinden met ander draadloos netwerk..."
 
-#: ../gnome/applet/applet.c:1589
+#: ../gnome/applet/applet.c:1562
 msgid "Create _New Wireless Network..."
 msgstr "_Nieuw draadloos netwerk aanmaken..."
 
 # Netwerken
-#: ../gnome/applet/applet.c:1710
+#: ../gnome/applet/applet.c:1685
 msgid "_VPN Connections"
 msgstr "_VPN-verbindingen"
 
-#: ../gnome/applet/applet.c:1745
+#: ../gnome/applet/applet.c:1730
 msgid "_Configure VPN..."
 msgstr "VPN _configureren..."
 
-#: ../gnome/applet/applet.c:1749
+#: ../gnome/applet/applet.c:1734
 msgid "_Disconnect VPN..."
 msgstr "V_PN-verbinding verbreken..."
 
 # Netwerken
-#: ../gnome/applet/applet.c:1771
+#: ../gnome/applet/applet.c:1756
 msgid "_Dial Up Connections"
 msgstr "In_bel-verbindingen"
 
 #. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
-#: ../gnome/applet/applet.c:1782
+#: ../gnome/applet/applet.c:1767
 #, c-format
 msgid "Connect to %s..."
 msgstr "Verbinden met %s..."
 
-#: ../gnome/applet/applet.c:1788
+#: ../gnome/applet/applet.c:1773
 #, c-format
 msgid "Disconnect from %s..."
 msgstr "Verbinden met %s verbreken..."
 
 # Er zijn geen netwerkapparaten geconfigureerd/gevonden
-#: ../gnome/applet/applet.c:1837
+#: ../gnome/applet/applet.c:1822
 msgid "No network devices have been found"
 msgstr "Er zijn geen netwerkapparaten geconfigureerd"
 
@@ -323,38 +312,38 @@ msgstr "Er zijn geen netwerkapparaten geconfigureerd"
 # NetworkManager loopt niet
 # Geen NetworkManager aanwezig
 # NetworkManager niet aanwezig
-#: ../gnome/applet/applet.c:2029
+#: ../gnome/applet/applet.c:2014
 msgid "NetworkManager is not running..."
 msgstr "Geen NetworkManager..."
 
 #. 'Enable Networking' item
-#: ../gnome/applet/applet.c:2185
+#: ../gnome/applet/applet.c:2170
 msgid "Enable _Networking"
 msgstr "_Netwerk aanzetten"
 
 # Wireless gebruiken
 #. 'Enable Wireless' item
-#: ../gnome/applet/applet.c:2191
+#: ../gnome/applet/applet.c:2176
 msgid "Enable _Wireless"
 msgstr "_Draadloos netwerk aanzetten"
 
 #. 'Connection Information' item
-#: ../gnome/applet/applet.c:2197
+#: ../gnome/applet/applet.c:2182
 msgid "Connection _Information"
 msgstr "_Verbindingsinformatie"
 
 #. Help item
-#: ../gnome/applet/applet.c:2208
+#: ../gnome/applet/applet.c:2193
 msgid "_Help"
 msgstr "_Hulp"
 
 #. About item
-#: ../gnome/applet/applet.c:2217
+#: ../gnome/applet/applet.c:2202
 msgid "_About"
 msgstr "I_nfo"
 
 # het kan het glade-bestand niet vinden.
-#: ../gnome/applet/applet.c:2635
+#: ../gnome/applet/applet.c:2667
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
@@ -370,67 +359,101 @@ msgstr "Open systeem"
 msgid "Shared Key"
 msgstr "Gedeelde sleutel"
 
-#: ../gnome/applet/wireless-security-option.c:209
+#: ../gnome/applet/wireless-security-option.c:208
 msgid "Automatic (Default)"
 msgstr "Automatisch (standaard)"
 
-#: ../gnome/applet/wireless-security-option.c:217
+#: ../gnome/applet/wireless-security-option.c:215
+msgid "AES-CCMP"
+msgstr "AES-CCMP"
+
+#: ../gnome/applet/wireless-security-option.c:223
 msgid "TKIP"
 msgstr "TKIP"
 
-#: ../gnome/applet/wireless-security-option.c:225
-msgid "AES-CCMP"
-msgstr "AES-CCMP"
+#: ../gnome/applet/wireless-security-option.c:231
+msgid "Dynamic WEP"
+msgstr "Dynamisch WEP"
 
 #: ../gnome/applet/wso-none.c:53
 msgid "None"
 msgstr "Geen"
 
-#: ../gnome/applet/wso-wep-ascii.c:127
-msgid "WEP 40/128-bit ASCII"
-msgstr "WEP 40/128-bit ASCII"
+#: ../gnome/applet/wso-wep-ascii.c:138
+msgid "WEP 64/128-bit ASCII"
+msgstr "WEP 64/128-bit ASCII"
+
+#: ../gnome/applet/wso-wep-hex.c:135
+msgid "WEP 64/128-bit Hex"
+msgstr "WEP 64/128-bit Hex"
+
+#: ../gnome/applet/wso-wep-passphrase.c:135
+msgid "WEP 128-bit Passphrase"
+msgstr "WEP 128-bit wachtwoordzin"
+
+#: ../gnome/applet/wso-wpa-eap.c:237
+msgid "PEAP"
+msgstr "PEAP"
+
+#: ../gnome/applet/wso-wpa-eap.c:238
+msgid "TLS"
+msgstr "TLS"
 
-#: ../gnome/applet/wso-wep-hex.c:124
-msgid "WEP 40/128-bit hex"
-msgstr "WEP 40/128-bit hex"
+#: ../gnome/applet/wso-wpa-eap.c:239
+msgid "TTLS"
+msgstr "TTLS"
 
-#: ../gnome/applet/wso-wep-passphrase.c:124
-msgid "WEP Passphrase"
-msgstr "WEP wachtwoordzin"
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
+#: ../src/nm-ap-security-wpa-eap.c:116
+msgid "WPA2 Enterprise"
+msgstr "WPA2 enterprise"
 
-#: ../gnome/applet/eggtrayicon.c:128
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
+#: ../src/nm-ap-security-wpa-eap.c:121
+msgid "WPA Enterprise"
+msgstr "WPA enterprise"
+
+#: ../gnome/applet/wso-wpa-psk.c:178
+msgid "WPA2 Personal"
+msgstr "WPA2 persoonlijk"
+
+#: ../gnome/applet/wso-wpa-psk.c:180
+msgid "WPA Personal"
+msgstr "WPA persoonlijk"
+
+#: ../gnome/applet/eggtrayicon.c:134
 msgid "Orientation"
 msgstr "Oriëntatie"
 
-#: ../gnome/applet/eggtrayicon.c:129
+#: ../gnome/applet/eggtrayicon.c:135
 msgid "The orientation of the tray."
 msgstr "De oriëntatie van het applet."
 
 # vaste netwerk
-#: ../gnome/applet/menu-items.c:87
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Bekabelde netwerk (%s)"
 
 # vaste netwerk
-#: ../gnome/applet/menu-items.c:90
+#: ../gnome/applet/menu-items.c:91
 msgid "_Wired Network"
 msgstr "_Bekabelde netwerk"
 
-#: ../gnome/applet/menu-items.c:161
+#: ../gnome/applet/menu-items.c:162
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
 msgstr[0] "Draadloos netwerk (%s)"
 msgstr[1] "Draadloze netwerken (%s)"
 
-#: ../gnome/applet/menu-items.c:163
+#: ../gnome/applet/menu-items.c:164
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Draadloos netwerk"
 msgstr[1] "Draadloze netwerken"
 
-#: ../gnome/applet/menu-items.c:330
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr " (ongeldige Unicode)"
 
@@ -441,7 +464,9 @@ msgstr " (ongeldige Unicode)"
 msgid ""
 "By default, the wireless network's name is set to your computer's name, %s, "
 "with no encryption enabled"
-msgstr "Standaard wordt de naam van het draadloos netwerk ingesteld op de naam van uw computer: %s, en wordt de verbinding niet versleuteld."
+msgstr ""
+"Standaard wordt de naam van het draadloos netwerk ingesteld op de naam van "
+"uw computer: %s, en wordt de verbinding niet versleuteld."
 
 #: ../gnome/applet/other-network-dialog.c:358
 msgid "Create new wireless network"
@@ -472,11 +497,11 @@ msgstr ""
 msgid "Connect to Other Wireless Network"
 msgstr "Verbinden met ander draadloos netwerk"
 
-#: ../gnome/applet/passphrase-dialog.c:214
+#: ../gnome/applet/passphrase-dialog.c:215
 msgid "Error connecting to wireless network"
 msgstr "Fout bij het verbinden met draadloos netwerk"
 
-#: ../gnome/applet/passphrase-dialog.c:215
+#: ../gnome/applet/passphrase-dialog.c:216
 msgid ""
 "The requested wireless network requires security capabilities unsupported by "
 "your hardware."
@@ -484,13 +509,13 @@ msgstr ""
 "Het gekozen draadloos netwerk vereist een type beveiliging die niet mogelijk "
 "is met uw hardware."
 
-#: ../gnome/applet/vpn-password-dialog.c:152
-#: ../gnome/applet/vpn-password-dialog.c:189
+#: ../gnome/applet/vpn-password-dialog.c:151
+#: ../gnome/applet/vpn-password-dialog.c:188
 #, c-format
 msgid "Cannot start VPN connection '%s'"
 msgstr "Kan VPN-verbinding '%s' niet starten"
 
-#: ../gnome/applet/vpn-password-dialog.c:155
+#: ../gnome/applet/vpn-password-dialog.c:154
 #, c-format
 msgid ""
 "Could not find the authentication dialog for VPN connection type '%s'. "
@@ -499,7 +524,7 @@ msgstr ""
 "Kon het aanmeldingsdialoogvenster voor VPN-verbindingstype '%s' niet vinden. "
 "Neem contact op met uw systeembeheerder."
 
-#: ../gnome/applet/vpn-password-dialog.c:192
+#: ../gnome/applet/vpn-password-dialog.c:191
 #, c-format
 msgid ""
 "There was a problem launching the authentication dialog for VPN connection "
@@ -565,65 +590,89 @@ msgstr ""
 "onderstaande optie aan. NetworkManager zal u dan niet meer om toestemming "
 "vragen wanneer u zich weer bij dit netwerk aanmeldt."
 
-# identiteitscontrole/aanmeldingscontrole
 #: ../gnome/applet/applet.glade.h:15
+msgid "Anonymous Identity:"
+msgstr "Anonieme identiteit:"
+
+# identiteitscontrole/aanmeldingscontrole
+#: ../gnome/applet/applet.glade.h:16
 msgid "Authentication:"
 msgstr "Aanmeldingscontrole:"
 
-#: ../gnome/applet/applet.glade.h:16
+#: ../gnome/applet/applet.glade.h:17
 msgid "Broadcast Address:"
 msgstr "Broadcastadres:"
 
-#: ../gnome/applet/applet.glade.h:17
+#: ../gnome/applet/applet.glade.h:18
+msgid "CA Certificate File:"
+msgstr "CA-certificaatbestand:"
+
+#: ../gnome/applet/applet.glade.h:19
 msgid "C_onnect"
 msgstr "_Verbinden"
 
-#: ../gnome/applet/applet.glade.h:18
+#: ../gnome/applet/applet.glade.h:20
+msgid "Client Certificate File:"
+msgstr "Cliënt-certificaatbestand:"
+
+#: ../gnome/applet/applet.glade.h:21
 msgid "Connection Information"
 msgstr "Verbindingsinformatie"
 
-#: ../gnome/applet/applet.glade.h:19
+#: ../gnome/applet/applet.glade.h:22
 msgid "Default Route:"
 msgstr "Standaardroute:"
 
-#: ../gnome/applet/applet.glade.h:20
+#: ../gnome/applet/applet.glade.h:23
 msgid "Destination Address:"
 msgstr "Doeladres:"
 
-#: ../gnome/applet/applet.glade.h:21
+#: ../gnome/applet/applet.glade.h:24
 msgid "Driver:"
 msgstr "Stuurprogramma:"
 
-#: ../gnome/applet/applet.glade.h:22
+#: ../gnome/applet/applet.glade.h:25
+msgid "EAP Method:"
+msgstr "EAP-methode:"
+
+#: ../gnome/applet/applet.glade.h:26
 msgid "Hardware Address:"
 msgstr "Hardware-adres:"
 
-#: ../gnome/applet/applet.glade.h:23
+#: ../gnome/applet/applet.glade.h:27
 msgid "IP Address:"
 msgstr "IP-adres:"
 
-#: ../gnome/applet/applet.glade.h:24
+#: ../gnome/applet/applet.glade.h:28
+msgid "Identity:"
+msgstr "Identiteit:"
+
+#: ../gnome/applet/applet.glade.h:29
 msgid "Interface:"
 msgstr "Apparaat:"
 
+#: ../gnome/applet/applet.glade.h:30
+msgid "Key Type:"
+msgstr "Sleuteltype:"
+
 # station/apparaat/interface
-#: ../gnome/applet/applet.glade.h:25
+#: ../gnome/applet/applet.glade.h:31
 msgid "Key:"
 msgstr "Sleutel:"
 
-#: ../gnome/applet/applet.glade.h:26
+#: ../gnome/applet/applet.glade.h:32
 msgid ""
 "None\n"
-"WEP Passphrase\n"
-"WEP 40/128-bit hex\n"
-"WEP 40/128-bit ASCII\n"
+"WEP 128-bit Passphrase\n"
+"WEP 64/128-bit Hex\n"
+"WEP 64/128-bit ASCII\n"
 msgstr ""
 "Geen\n"
-"WEP wachtwoordzin\n"
-"WEP 40/128-bit hex\n"
-"WEP 40/128-bit ASCII\n"
+"WEP 128-bit wachtwoordzin\n"
+"WEP 64/128-bit hex\n"
+"WEP 64/128-bit ASCII\n"
 
-#: ../gnome/applet/applet.glade.h:31
+#: ../gnome/applet/applet.glade.h:37
 msgid ""
 "Open System\n"
 "Shared Key"
@@ -631,104 +680,116 @@ msgstr ""
 "Open systeem\n"
 "gedeelde sleutel"
 
-#: ../gnome/applet/applet.glade.h:33
+#: ../gnome/applet/applet.glade.h:39
 msgid "Other Wireless Network..."
 msgstr "Ander draadloos netwerk..."
 
-#: ../gnome/applet/applet.glade.h:34
+#: ../gnome/applet/applet.glade.h:40
 msgid "Passphrase:"
 msgstr "Wachtwoordzin:"
 
-#: ../gnome/applet/applet.glade.h:35
+#: ../gnome/applet/applet.glade.h:41
 msgid "Password:"
 msgstr "Wachtwoord:"
 
-#: ../gnome/applet/applet.glade.h:36
+#: ../gnome/applet/applet.glade.h:42
 msgid "Primary DNS:"
 msgstr "Primaire DNS:"
 
-#: ../gnome/applet/applet.glade.h:37
+#: ../gnome/applet/applet.glade.h:43
+msgid "Private Key File:"
+msgstr "Privé sleutelbestand:"
+
+#: ../gnome/applet/applet.glade.h:44
+msgid "Private Key Password:"
+msgstr "Privé sleutelwachtwoord:"
+
+#: ../gnome/applet/applet.glade.h:45
 msgid "Secondary DNS:"
 msgstr "Secondaire DNS:"
 
-#: ../gnome/applet/applet.glade.h:38
+#: ../gnome/applet/applet.glade.h:46
+msgid "Select the CA Certificate File"
+msgstr "Selecteer het CA-certificaatbestand"
+
+#: ../gnome/applet/applet.glade.h:47
+msgid "Select the Client Certificate File"
+msgstr "Selecteer het cliënt-certificaatbestand"
+
+#: ../gnome/applet/applet.glade.h:48
+msgid "Select the Private Key File"
+msgstr "Selecteer het privé sleutelbestand"
+
+#: ../gnome/applet/applet.glade.h:49
+msgid "Show key"
+msgstr "Sleutel tonen"
+
+#: ../gnome/applet/applet.glade.h:50
+msgid "Show passphrase"
+msgstr "Wachtwoordzin tonen"
+
+#: ../gnome/applet/applet.glade.h:51
+msgid "Show password"
+msgstr "Wachtwoord tonen"
+
+#: ../gnome/applet/applet.glade.h:52
+msgid "Show passwords"
+msgstr "Wachtwoorden tonen"
+
+#: ../gnome/applet/applet.glade.h:53
+msgid "Speed:"
+msgstr "Snelheid:"
+
+#: ../gnome/applet/applet.glade.h:54
 msgid "Subnet Mask:"
 msgstr "Subnetmasker:"
 
-#: ../gnome/applet/applet.glade.h:39
+#: ../gnome/applet/applet.glade.h:55
 msgid "Type:"
 msgstr "Type:"
 
 # inlognaam/gebruikersnaam
-#: ../gnome/applet/applet.glade.h:40
+#: ../gnome/applet/applet.glade.h:56
 msgid "User Name:"
 msgstr "Gebruikersnaam:"
 
-#: ../gnome/applet/applet.glade.h:41
+#: ../gnome/applet/applet.glade.h:57
 msgid "Wireless Network Key Required"
 msgstr "Sleutel voor draadloos netwerk vereist"
 
 # draadloze adapter is een adapter zonder draadjes
 # bedoeld wordt een adapter voor draadloos netwerken
-#: ../gnome/applet/applet.glade.h:42
+#: ../gnome/applet/applet.glade.h:58
 msgid "Wireless _adapter:"
 msgstr "Draadloos _adapter:"
 
-#: ../gnome/applet/applet.glade.h:43
+#: ../gnome/applet/applet.glade.h:59
 msgid "_Always Trust this Wireless Network"
 msgstr "_Dit draadloos netwerk altijd vertrouwen"
 
-#: ../gnome/applet/applet.glade.h:44
+#: ../gnome/applet/applet.glade.h:60
 msgid "_Don't remind me again"
 msgstr "_Niet meer tonen"
 
-#: ../gnome/applet/applet.glade.h:45
+#: ../gnome/applet/applet.glade.h:61
 msgid "_Login to Network"
 msgstr "_Aanmelden bij het netwerk"
 
-#: ../gnome/applet/applet.glade.h:46
+#: ../gnome/applet/applet.glade.h:62
 msgid "_Network Name:"
 msgstr "_Netwerknaam:"
 
 # Bedoeld wordt beveiliging van het draadloos netwerk.
 # niet dat de beveiling draadloos is.
-#: ../gnome/applet/applet.glade.h:47
+#: ../gnome/applet/applet.glade.h:63
 msgid "_Wireless Security:"
 msgstr "_Draadloos beveiliging:"
 
-# BUG: deze horen niet thuis in het po-bestand
-#: ../gnome/applet/applet.glade.h:48
-msgid "leap_subwindow"
-msgstr "leap_subwindow"
-
-# BUG: deze horen niet thuis in het po-bestand
-#: ../gnome/applet/applet.glade.h:49
-msgid "wep_key_subwindow"
-msgstr "wep_key_subwindow"
-
-# BUG: deze horen niet thuis in het po-bestand
-#: ../gnome/applet/applet.glade.h:50
-msgid "wep_passphrase_subwindow"
-msgstr "wep_passphrase_subwindow"
-
-# BUG: deze horen niet thuis in het po-bestand
-#: ../gnome/applet/applet.glade.h:51
-msgid "wpa_psk_subwindow"
-msgstr "wpa_psk_subwindow"
-
-#: ../gnome/applet/wso-wpa-psk.c:168
-msgid "WPA2 Personal"
-msgstr "WPA2 persoonlijk"
-
-#: ../gnome/applet/wso-wpa-psk.c:170
-msgid "WPA Personal"
-msgstr "WPA persoonlijk"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.c:358
+#: ../gnome/vpn-properties/nm-vpn-properties.c:383
 msgid "Cannot add VPN connection"
 msgstr "Kan VPN-verbinding niet toevoegen"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:360
+#: ../gnome/vpn-properties/nm-vpn-properties.c:385
 msgid ""
 "No suitable VPN software was found on your system. Contact your system "
 "administrator."
@@ -737,39 +798,43 @@ msgstr ""
 "met uw systeembeheerder."
 
 # Netwerken
-#: ../gnome/vpn-properties/nm-vpn-properties.c:412
+#: ../gnome/vpn-properties/nm-vpn-properties.c:437
 msgid "Cannot import VPN connection"
 msgstr "Kan VPN-verbinding niet importeren"
 
 # VPN-verbinding type s
 # VPN-verbindingstype s
-#: ../gnome/vpn-properties/nm-vpn-properties.c:414
+#: ../gnome/vpn-properties/nm-vpn-properties.c:439
 #, c-format
 msgid ""
 "Cannot find suitable software for VPN connection type '%s' to import the "
 "file '%s'. Contact your system administrator."
-msgstr "Kan geen geschikte software vinden voor VPN-verbindingstype '%s' om het bestand '%s' te importeren. Neem contact op met uw systeembeheerder."
+msgstr ""
+"Kan geen geschikte software vinden voor VPN-verbindingstype '%s' om het "
+"bestand '%s' te importeren. Neem contact op met uw systeembeheerder."
 
 # herleiden/ophalen
-#: ../gnome/vpn-properties/nm-vpn-properties.c:554
+#: ../gnome/vpn-properties/nm-vpn-properties.c:579
 #, c-format
 msgid "Error retrieving VPN connection '%s'"
 msgstr "Fout bij herleiden VPN-verbinding '%s'"
 
 # bleh: UI files
-#: ../gnome/vpn-properties/nm-vpn-properties.c:557
+#: ../gnome/vpn-properties/nm-vpn-properties.c:582
 #, c-format
 msgid ""
 "Could not find the UI files for VPN connection type '%s'. Contact your "
 "system administrator."
-msgstr "Kon de UI-bestanden voor VPN-verbindingtype '%s' niet vinden. Neem contact op met uw systeembeheerder."
+msgstr ""
+"Kon de UI-bestanden voor VPN-verbindingtype '%s' niet vinden. Neem contact "
+"op met uw systeembeheerder."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:717
+#: ../gnome/vpn-properties/nm-vpn-properties.c:739
 #, c-format
 msgid "Delete VPN connection \"%s\"?"
 msgstr "VPN-verbinding \"%s\" verwijderen?"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:720
+#: ../gnome/vpn-properties/nm-vpn-properties.c:742
 #, c-format
 msgid ""
 "All information about the VPN connection \"%s\" will be lost and you may "
@@ -780,16 +845,16 @@ msgstr ""
 "mogelijk uw systeembeheerder om informatie moeten vragen voor het opzetten "
 "van een nieuwe verbinding."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:926
+#: ../gnome/vpn-properties/nm-vpn-properties.c:959
 msgid "Unable to load"
 msgstr "Kon niet laden"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:928
+#: ../gnome/vpn-properties/nm-vpn-properties.c:961
 msgid "Cannot find some needed resources (the glade file)!"
 msgstr "Kon bepaalde vereiste bronnen niet vinden (het glade bestand)!"
 
 #. Edit dialog
-#: ../gnome/vpn-properties/nm-vpn-properties.c:1043
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
 msgid "Edit VPN Connection"
 msgstr "VPN-verbinding bewerken"
 
@@ -870,11 +935,11 @@ msgstr ""
 msgid "VPN Connections"
 msgstr "VPN-verbindingen"
 
-#: ../src/nm-ap-security-wep.c:47
+#: ../src/nm-ap-security-wep.c:52
 msgid "40-bit WEP"
 msgstr "40-bit WEP"
 
-#: ../src/nm-ap-security-wep.c:49
+#: ../src/nm-ap-security-wep.c:54
 msgid "104-bit WEP"
 msgstr "104-bit WEP"
 
@@ -902,7 +967,7 @@ msgstr "WPA2 CCMP"
 msgid "WPA2 Automatic"
 msgstr "WPA2 automatisch"
 
-#: ../src/nm-ap-security.c:290
+#: ../src/nm-ap-security.c:320
 msgid "none"
 msgstr "geen"
 
@@ -942,6 +1007,80 @@ msgstr "te veel data verzonden over de socket, een gedeelte is verloren"
 msgid "error occurred while waiting for data on socket"
 msgstr "er is een fout opgetreden bij het wachten op data van de 'socket'"
 
+#: ../gnome/applet/applet-dbus-devices.c:898
+#, c-format
+msgid "You are now connected to the Ad-Hoc wireless network '%s'."
+msgstr "U bent nu verbonden met het Ad-hoc draadloos netwerk '%s'."
+
+#: ../gnome/applet/applet-dbus-devices.c:903
+#, c-format
+msgid "You are now connected to the wireless network '%s'."
+msgstr "U bent nu verbonden met het draadloos netwerk '%s'."
+
+# bedraad netwerk
+#: ../gnome/applet/applet-dbus-devices.c:910
+msgid "You are now connected to the wired network."
+msgstr "U bent nu verbonden met het bekabelde netwerk."
+
+#: ../gnome/applet/applet-dbus-devices.c:916
+msgid "Connection Established"
+msgstr "Verbinding ingesteld"
+
+#: ../gnome/applet/applet-dbus-devices.c:959
+msgid "Disconnected"
+msgstr "Verbinding verbroken"
+
+# "the connection has been disconnected" is een contaminatie
+#: ../gnome/applet/applet-dbus-devices.c:960
+msgid "The network connection has been disconnected."
+msgstr "De verbinding met het netwerk is verbroken."
+
+#~ msgid "VPN Error"
+#~ msgstr "VPN-fout"
+
+#~ msgid "The VPN service said: \"%s\""
+#~ msgstr "De VPN-service meldde: \"%s\""
+
+# verbinding naar/met
+#~ msgid "VPN connection '%s' said:"
+#~ msgstr "VPN-verbinding '%s' meldde:"
+
+#~ msgid "WEP 40/128-bit ASCII"
+#~ msgstr "WEP 40/128-bit ASCII"
+
+#~ msgid "WEP 40/128-bit hex"
+#~ msgstr "WEP 40/128-bit hex"
+
+#~ msgid "WEP Passphrase"
+#~ msgstr "WEP wachtwoordzin"
+
+#~ msgid ""
+#~ "None\n"
+#~ "WEP Passphrase\n"
+#~ "WEP 40/128-bit hex\n"
+#~ "WEP 40/128-bit ASCII\n"
+#~ msgstr ""
+#~ "Geen\n"
+#~ "WEP wachtwoordzin\n"
+#~ "WEP 40/128-bit hex\n"
+#~ "WEP 40/128-bit ASCII\n"
+
+# BUG: deze horen niet thuis in het po-bestand
+#~ msgid "leap_subwindow"
+#~ msgstr "leap_subwindow"
+
+# BUG: deze horen niet thuis in het po-bestand
+#~ msgid "wep_key_subwindow"
+#~ msgstr "wep_key_subwindow"
+
+# BUG: deze horen niet thuis in het po-bestand
+#~ msgid "wep_passphrase_subwindow"
+#~ msgstr "wep_passphrase_subwindow"
+
+# BUG: deze horen niet thuis in het po-bestand
+#~ msgid "wpa_psk_subwindow"
+#~ msgstr "wpa_psk_subwindow"
+
 #~ msgid "Connect using WPA2"
 #~ msgstr "Verbinden met gebruik van WPA2"
 
@@ -1136,3 +1275,18 @@ msgstr "er is een fout opgetreden bij het wachten op data van de 'socket'"
 # een draadloos netwerk aanwezig...
 #~ msgid "A wired network connection is currently active..."
 #~ msgstr "Er is momenteel een draadloze netwerkverbinding actief..."
+
+#~ msgid "Stop automatically running the networking applet?"
+#~ msgstr "Niet langer automatisch het netwerk-applet opstarten?"
+
+#~ msgid ""
+#~ "The networking applet will now terminate, but will automatically launch "
+#~ "the next time you login.  Would you like to stop automatically running "
+#~ "the networking applet on login?"
+#~ msgstr ""
+#~ "Het netwerk-applet zal nu worden afgesloten maar zal automatisch worden "
+#~ "opgestart wanneer u zich de volgende keer weer aanmeldt. Wilt u dat het "
+#~ "netwerk-applet niet langer automatisch wordt opgestart bij het aanmelden?"
+
+#~ msgid "_Remove"
+#~ msgstr "_Verwijderen"
diff --git a/po/no.po b/po/no.po
deleted file mode 100644
index 40bde27788..0000000000
--- a/po/no.po
+++ /dev/null
@@ -1,924 +0,0 @@
-# translation of NetworkManager to Norwegian Bokmal
-# This file is distributed under the same license as the NetworkManager package.
-# Copyright (C) 2004, 2005 Red Hat, Inc.
-# Kjartan Maraas <kmaraas@gnome.org>, 2004-2006.
-# Terance Edward Sola <terance@lyse.net>, 2005.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: NetworkManager 0.1.x\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-02 12:54+0100\n"
-"PO-Revision-Date: 2006-03-02 12:59+0100\n"
-"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
-"Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.uio.no>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:923
-#, c-format
-msgid "Passphrase for wireless network %s"
-msgstr "Passord for trådløst nettverk %s"
-
-#: ../gnome/applet/applet-dbus.c:259
-#, c-format
-msgid "Connection to the wireless network '%s' failed."
-msgstr "Tilkobling til trådløst nettverk «%s» feilet."
-
-#: ../gnome/applet/applet-dbus.c:264
-msgid "Connection to the wired network failed."
-msgstr "Tilkobling til trådløst nettverk feilet."
-
-#: ../gnome/applet/applet.c:184
-msgid "Error displaying connection information:"
-msgstr "Feil under visning av tilkoblingsinformasjon:"
-
-#: ../gnome/applet/applet.c:201
-msgid "Could not find some required resources (the glade file)!"
-msgstr "Fant ikke nødvendige ressurser (glade-filen)."
-
-#: ../gnome/applet/applet.c:212
-msgid "No active connections!"
-msgstr "Ingen aktive tilkoblinger!"
-
-#: ../gnome/applet/applet.c:229
-#, c-format
-msgid "Wired Ethernet (%s)"
-msgstr "Kablet nettverk (%s)"
-
-#: ../gnome/applet/applet.c:231
-#, c-format
-msgid "Wireless Ethernet (%s)"
-msgstr "Trådløst nettverk (%s)"
-
-#: ../gnome/applet/applet.c:328 ../gnome/applet/applet.c:353
-msgid "NetworkManager Applet"
-msgstr "NetworkManager panelprogram"
-
-#: ../gnome/applet/applet.c:330 ../gnome/applet/applet.c:355
-msgid "Copyright © 2004-2005 Red Hat, Inc."
-msgstr "Opphavsrett © 2004-2005 Red Hat, Inc."
-
-#: ../gnome/applet/applet.c:331 ../gnome/applet/applet.c:356
-msgid ""
-"Notification area applet for managing your network devices and connections."
-msgstr "Et panelprogram for å håndtere nettverksenheter og tilkoblinger."
-
-#: ../gnome/applet/applet.c:334 ../gnome/applet/applet.c:361
-msgid "translator-credits"
-msgstr "Kjartan Maraas <kmaraas@gnome.org>"
-
-#: ../gnome/applet/applet.c:416
-msgid "VPN Login Failure"
-msgstr "Feil ved VPN-pålogging"
-
-#: ../gnome/applet/applet.c:417
-#, c-format
-msgid "Could not start the VPN connection '%s' due to a login failure."
-msgstr "Kunne ikke starte VPN-tilkobling «%s» pga en feil ved pålogging."
-
-#: ../gnome/applet/applet.c:421
-msgid "VPN Start Failure"
-msgstr "Feil ved start av VPN"
-
-#: ../gnome/applet/applet.c:422
-#, c-format
-msgid ""
-"Could not start the VPN connection '%s' due to a failure launching the VPN "
-"program."
-msgstr ""
-"Kunne ikke starte VPN-tilkobling «%s» på grunn av feil ved oppstart av VPN-"
-"programmet."
-
-#: ../gnome/applet/applet.c:426 ../gnome/applet/applet.c:436
-msgid "VPN Connect Failure"
-msgstr "Feil ved tilkobling av VPN"
-
-#: ../gnome/applet/applet.c:427
-#, c-format
-msgid "Could not start the VPN connection '%s' due to a connection error."
-msgstr "Kunne ikke starte VPN-tilkobling «%s» pga en feil ved tilkobling."
-
-#: ../gnome/applet/applet.c:431
-msgid "VPN Configuration Error"
-msgstr "Feil i konfigurasjon av VPN"
-
-#: ../gnome/applet/applet.c:432
-#, c-format
-msgid "The VPN connection '%s' was not correctly configured."
-msgstr "VPN-tilkobling «%s» er ikke korrekt konfigurert."
-
-#: ../gnome/applet/applet.c:437
-#, c-format
-msgid ""
-"Could not start the VPN connection '%s' because the VPN server did not "
-"return an adequate network configuration."
-msgstr ""
-"Kunne ikke starte VPN-tilkobling «%s» fordi VPN-tjeneren ikke returnerte "
-"riktig nettverkskonfigurasjon."
-
-#: ../gnome/applet/applet.c:504
-msgid "VPN Login Message"
-msgstr "PÃ¥loggingsmelding for VPN"
-
-#: ../gnome/applet/applet.c:728 ../gnome/applet/applet.c:2490
-#: ../gnome/applet/other-network-dialog.c:453
-#: ../gnome/applet/passphrase-dialog.c:227
-msgid ""
-"The NetworkManager Applet could not find some required resources (the glade "
-"file was not found)."
-msgstr ""
-"NetworkManager fant ikke nødvendige ressurser (glade-filen ble ikke funnet)."
-
-#: ../gnome/applet/applet.c:740
-#, c-format
-msgid "The network device \"%s (%s)\" does not support wireless scanning."
-msgstr "Nettverksenheten «%s (%s)» støtter ikke søk etter trådløse nettverk."
-
-#: ../gnome/applet/applet.c:748
-#, c-format
-msgid "The network device \"%s (%s)\" does not support link detection."
-msgstr ""
-"Nettverksenheten «%s (%s)» støtter ikke informasjon om tilkoblet status."
-
-#: ../gnome/applet/applet.c:895
-#, c-format
-msgid "Preparing device %s for the wired network..."
-msgstr "Klargjør enhet %s for det trådløse nettverket..."
-
-#: ../gnome/applet/applet.c:897
-#, c-format
-msgid "Preparing device %s for the wireless network '%s'..."
-msgstr "Klargjør enhet %s for trådløst nettverk «%s»..."
-
-#: ../gnome/applet/applet.c:905
-#, c-format
-msgid "Configuring device %s for the wired network..."
-msgstr "Konfigurerer enhet %s for kablet nettverk..."
-
-#: ../gnome/applet/applet.c:907
-#, c-format
-msgid "Attempting to join the wireless network '%s'..."
-msgstr "Forsøker å bruke trådløst nettverk «%s»..."
-
-#: ../gnome/applet/applet.c:915
-#, c-format
-msgid "Waiting for Network Key for the wireless network '%s'..."
-msgstr "Venter på nettverksnøkkel for trådløst nettverk «%s»..."
-
-#: ../gnome/applet/applet.c:923 ../gnome/applet/applet.c:933
-msgid "Requesting a network address from the wired network..."
-msgstr "Ber om en nettverksadresse fra kablet nettverk..."
-
-#: ../gnome/applet/applet.c:925 ../gnome/applet/applet.c:935
-#, c-format
-msgid "Requesting a network address from the wireless network '%s'..."
-msgstr "Ber om en nettverksadresse fra trådløst nettverk «%s»..."
-
-#: ../gnome/applet/applet.c:943
-msgid "Finishing connection to the wired network..."
-msgstr "Fullfører tilkobling til kablet nettverk..."
-
-#: ../gnome/applet/applet.c:945
-#, c-format
-msgid "Finishing connection to the wireless network '%s'..."
-msgstr "Fullfører tilkobling til trådløst nettverk «%s»..."
-
-#: ../gnome/applet/applet.c:1062
-msgid "NetworkManager is not running"
-msgstr "NetworkManager kjører ikke"
-
-#: ../gnome/applet/applet.c:1075 ../gnome/applet/applet.c:1817
-msgid "Networking disabled"
-msgstr "Nettverk deaktivert"
-
-#: ../gnome/applet/applet.c:1080
-msgid "No network connection"
-msgstr "Ingen nettverksforbindelse"
-
-#: ../gnome/applet/applet.c:1085
-msgid "Wired network connection"
-msgstr "Trådløs nettverkforbindelse"
-
-#: ../gnome/applet/applet.c:1089
-msgid "Connected to an Ad-Hoc wireless network"
-msgstr "Kobler til et Ad-Hoc trådløst nettverk"
-
-#: ../gnome/applet/applet.c:1091
-#, c-format
-msgid "Wireless network connection to '%s' (%d%%)"
-msgstr "Trådløs nettverksforbindelse til «%s» (%d%%)"
-
-#: ../gnome/applet/applet.c:1111
-#, c-format
-msgid "VPN connection to '%s'"
-msgstr "VPN-tilkobling til «%s»"
-
-#: ../gnome/applet/applet.c:1119
-#, c-format
-msgid "VPN connecting to '%s'"
-msgstr "Kobler til «%s» via VPN"
-
-#: ../gnome/applet/applet.c:1532
-msgid "_Connect to Other Wireless Network..."
-msgstr "_Koble til annet trådløst nettverk..."
-
-#: ../gnome/applet/applet.c:1553
-msgid "Create _New Wireless Network..."
-msgstr "Opprett _nytt trådløst nettverk..."
-
-#: ../gnome/applet/applet.c:1674
-msgid "_VPN Connections"
-msgstr "_VPN-tilkoblinger"
-
-#: ../gnome/applet/applet.c:1719
-msgid "_Configure VPN..."
-msgstr "_Konfigurer VPN..."
-
-#: ../gnome/applet/applet.c:1723
-msgid "_Disconnect VPN..."
-msgstr "Ko_ble fra VPN..."
-
-#: ../gnome/applet/applet.c:1745
-msgid "_Dial Up Connections"
-msgstr "_Oppringte tilkoblinger"
-
-#. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
-#: ../gnome/applet/applet.c:1756
-#, c-format
-msgid "Connect to %s..."
-msgstr "Koble til %s..."
-
-#: ../gnome/applet/applet.c:1762
-#, c-format
-msgid "Disconnect from %s..."
-msgstr "Koble fra %s..."
-
-#: ../gnome/applet/applet.c:1811
-msgid "No network devices have been found"
-msgstr "Ingen nettverksenheter ble funnet"
-
-#: ../gnome/applet/applet.c:2003
-msgid "NetworkManager is not running..."
-msgstr "NetworkManager kjører ikke..."
-
-#. 'Enable Networking' item
-#: ../gnome/applet/applet.c:2159
-msgid "Enable _Networking"
-msgstr "_Aktiver nettverk"
-
-#. 'Enable Wireless' item
-#: ../gnome/applet/applet.c:2165
-msgid "Enable _Wireless"
-msgstr "Aktiver _trådløst nettverk"
-
-#. 'Connection Information' item
-#: ../gnome/applet/applet.c:2171
-msgid "Connection _Information"
-msgstr "Tilkoblings_informasjon"
-
-#. Help item
-#: ../gnome/applet/applet.c:2182
-msgid "_Help"
-msgstr "_Hjelp"
-
-#. About item
-#: ../gnome/applet/applet.c:2191
-msgid "_About"
-msgstr "_Om"
-
-#: ../gnome/applet/applet.c:2609
-msgid ""
-"The NetworkManager applet could not find some required resources.  It cannot "
-"continue.\n"
-msgstr ""
-"Panelprogrammet for NetworkManager fant ikke noen av de nødvendige "
-"ressursene. Det kan ikke fortsette.\n"
-
-#: ../gnome/applet/wireless-security-option.c:157
-msgid "Open System"
-msgstr "Ã…pent system"
-
-#: ../gnome/applet/wireless-security-option.c:160
-msgid "Shared Key"
-msgstr "Delt nøkkel"
-
-#: ../gnome/applet/wireless-security-option.c:209
-msgid "Automatic (Default)"
-msgstr "Automatisk (forvalgt)"
-
-#: ../gnome/applet/wireless-security-option.c:216
-msgid "TKIP"
-msgstr "TKIP"
-
-#: ../gnome/applet/wireless-security-option.c:224
-msgid "AES-CCMP"
-msgstr "AES-CCMP"
-
-#: ../gnome/applet/wso-none.c:53
-msgid "None"
-msgstr "Ingen"
-
-#: ../gnome/applet/wso-wep-ascii.c:127
-msgid "WEP 40/128-bit ASCII"
-msgstr "WEP 40/128-bit ASCII"
-
-#: ../gnome/applet/wso-wep-hex.c:124
-msgid "WEP 40/128-bit hex"
-msgstr "WEP 40/128-bit heksadesimal"
-
-#: ../gnome/applet/wso-wep-passphrase.c:124
-msgid "WEP Passphrase"
-msgstr "WEP Passord:"
-
-#: ../gnome/applet/wso-wpa-eap.c:208
-msgid "PEAP"
-msgstr "PEAP"
-
-#: ../gnome/applet/wso-wpa-eap.c:209
-msgid "TLS"
-msgstr "TLS"
-
-#: ../gnome/applet/wso-wpa-eap.c:210
-msgid "TTLS"
-msgstr "TTLS"
-
-#: ../gnome/applet/wso-wpa-eap.c:218 ../src/nm-ap-security-wpa-eap.c:90
-#: ../src/nm-ap-security-wpa-eap.c:114
-msgid "WPA2 Enterprise"
-msgstr "WPA2 enterprise"
-
-#: ../gnome/applet/wso-wpa-eap.c:220 ../src/nm-ap-security-wpa-eap.c:92
-#: ../src/nm-ap-security-wpa-eap.c:119
-msgid "WPA Enterprise"
-msgstr "WPA enterprise"
-
-#: ../gnome/applet/wso-wpa-psk.c:166
-msgid "WPA2 Personal"
-msgstr "WPA2 personlig"
-
-#: ../gnome/applet/wso-wpa-psk.c:168
-msgid "WPA Personal"
-msgstr "WPA personlig"
-
-#: ../gnome/applet/eggtrayicon.c:134
-msgid "Orientation"
-msgstr "Orientering"
-
-#: ../gnome/applet/eggtrayicon.c:135
-msgid "The orientation of the tray."
-msgstr "Orientering for trauet."
-
-#: ../gnome/applet/menu-items.c:87
-#, c-format
-msgid "Wired Network (%s)"
-msgstr "Kablet nettverk (%s)"
-
-#: ../gnome/applet/menu-items.c:90
-msgid "_Wired Network"
-msgstr "_Kablet nettverk"
-
-#: ../gnome/applet/menu-items.c:161
-#, c-format
-msgid "Wireless Network (%s)"
-msgid_plural "Wireless Networks (%s)"
-msgstr[0] "Trådløst nettverk (%s)"
-msgstr[1] "Trådløse nettverk (%s)"
-
-#: ../gnome/applet/menu-items.c:163
-msgid "Wireless Network"
-msgid_plural "Wireless Networks"
-msgstr[0] "Trådløst nettverk"
-msgstr[1] "Trådløse nettverk"
-
-#: ../gnome/applet/menu-items.c:330
-msgid " (invalid Unicode)"
-msgstr " (ugyldig Unicode)"
-
-#: ../gnome/applet/other-network-dialog.c:352
-#, c-format
-msgid ""
-"By default, the wireless network's name is set to your computer's name, %s, "
-"with no encryption enabled"
-msgstr ""
-"Nettverksnavnet er som standard satt til datamaskinens navn, %s,  og "
-"kryptering er ikke aktivert."
-
-#: ../gnome/applet/other-network-dialog.c:358
-msgid "Create new wireless network"
-msgstr "Opprett nytt trådløst nettverk"
-
-#: ../gnome/applet/other-network-dialog.c:359
-msgid ""
-"Enter the name and security settings of the wireless network you wish to "
-"create."
-msgstr ""
-"Oppgi navn og sikkerhetsinnstillinger for det trådløse nettverket du ønsker "
-"Ã¥ opprette."
-
-#: ../gnome/applet/other-network-dialog.c:363
-msgid "Create New Wireless Network"
-msgstr "Opprett nytt trådløst nettverk"
-
-#: ../gnome/applet/other-network-dialog.c:368
-msgid "Existing wireless network"
-msgstr "Eksisterende trådløse nettverk"
-
-#: ../gnome/applet/other-network-dialog.c:369
-msgid "Enter the name of the wireless network to which you wish to connect."
-msgstr "Oppgi navnet til det trådløse nettverket du ønsker å koble deg til."
-
-#: ../gnome/applet/other-network-dialog.c:371
-msgid "Connect to Other Wireless Network"
-msgstr "Koble til annet trådløst nettverk"
-
-#: ../gnome/applet/passphrase-dialog.c:214
-msgid "Error connecting to wireless network"
-msgstr "Feil under tilkobling til trådløst nettverk"
-
-#: ../gnome/applet/passphrase-dialog.c:215
-msgid ""
-"The requested wireless network requires security capabilities unsupported by "
-"your hardware."
-msgstr ""
-"Valgt trådløst nettverk krever en type sikkerhet som ikke er støttet av ditt "
-"nettverkskort."
-
-#: ../gnome/applet/vpn-password-dialog.c:152
-#: ../gnome/applet/vpn-password-dialog.c:189
-#, c-format
-msgid "Cannot start VPN connection '%s'"
-msgstr "Kan ikke starte VPN-tilkobling «%s»"
-
-#: ../gnome/applet/vpn-password-dialog.c:155
-#, c-format
-msgid ""
-"Could not find the authentication dialog for VPN connection type '%s'. "
-"Contact your system administrator."
-msgstr ""
-"Fant ikke autentiseringsdialogen for VPN tilkoblingstypen «%s». Kontakt din "
-"systemadministrator."
-
-#: ../gnome/applet/vpn-password-dialog.c:192
-#, c-format
-msgid ""
-"There was a problem launching the authentication dialog for VPN connection "
-"type '%s'. Contact your system administrator."
-msgstr ""
-"Det oppstod en feil under oppstart av autentiseringsdialogen for VPN "
-"tilkoblingstypen «%s». Kontakt din systemadministrator."
-
-#: ../gnome/applet/applet.glade.h:1
-msgid " "
-msgstr " "
-
-#: ../gnome/applet/applet.glade.h:2
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Informasjon om aktiv tilkobling</span>"
-
-#: ../gnome/applet/applet.glade.h:4
-#, no-c-format
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
-"Network</span>\n"
-"\n"
-"A passphrase or encryption key is required to access the wireless network '%"
-"s'."
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Passord kreves for trådløst nettverk</"
-"span>\n"
-"\n"
-"Ett passord eller en krypteringsnøkkel kreves for å aksessere trådløst "
-"nettverk «%s»."
-
-#: ../gnome/applet/applet.glade.h:8
-#, no-c-format
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
-"\n"
-"%s  It will not be completely functional."
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Redusert nettverksfunksjonalitet</"
-"span>\n"
-"\n"
-"%s  Ikke fullstendig funksjonell."
-
-#: ../gnome/applet/applet.glade.h:12
-#, no-c-format
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
-"span>\n"
-"\n"
-"You have chosen to log in to the wireless network '%s'.  If you are sure "
-"that this wireless network is secure, click the checkbox below and "
-"NetworkManager will not require confirmation on subsequent log ins."
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Bekreftelse av pålogging på trådløst "
-"nettverk</span>\n"
-"\n"
-"Du har valgt å logge inn på trådløst nettverk «%s». Hvis du er sikker på at "
-"dette trådløse nettverket er sikkert kan du be NetworkManager om å slutte å "
-"spørre spørsmål når du kobler deg til det ved å krysse av i boksen nedenfor."
-
-#: ../gnome/applet/applet.glade.h:15
-msgid "Anonymous Identity:"
-msgstr "Anonym identitet:"
-
-#: ../gnome/applet/applet.glade.h:16
-msgid "Authentication:"
-msgstr "Autentisering:"
-
-#: ../gnome/applet/applet.glade.h:17
-msgid "Broadcast Address:"
-msgstr "Kringkastingsadresse:"
-
-#: ../gnome/applet/applet.glade.h:18
-msgid "CA Certificate File:"
-msgstr "Sertifikatfil for CA:"
-
-#: ../gnome/applet/applet.glade.h:19
-msgid "C_onnect"
-msgstr "K_oble til"
-
-#: ../gnome/applet/applet.glade.h:20
-msgid "Client Certificate File:"
-msgstr "Sertifikatfil for klient:"
-
-#: ../gnome/applet/applet.glade.h:21
-msgid "Connection Information"
-msgstr "Tilkoblingsinformasjon"
-
-#: ../gnome/applet/applet.glade.h:22
-msgid "Default Route:"
-msgstr "Forvalgt rute:"
-
-#: ../gnome/applet/applet.glade.h:23
-msgid "Destination Address:"
-msgstr "MÃ¥ladresse:"
-
-#: ../gnome/applet/applet.glade.h:24
-msgid "Driver:"
-msgstr "Driver:"
-
-#: ../gnome/applet/applet.glade.h:25
-msgid "EAP Method:"
-msgstr "EAP-metode:"
-
-#: ../gnome/applet/applet.glade.h:26
-msgid "Hardware Address:"
-msgstr "Maskinvareadresse:"
-
-#: ../gnome/applet/applet.glade.h:27
-msgid "IP Address:"
-msgstr "IP adresse:"
-
-#: ../gnome/applet/applet.glade.h:28
-msgid "Identity:"
-msgstr "Identitet:"
-
-#: ../gnome/applet/applet.glade.h:29
-msgid "Interface:"
-msgstr "Grensesnitt:"
-
-#: ../gnome/applet/applet.glade.h:30
-msgid "Key:"
-msgstr "Nøkkel:"
-
-#: ../gnome/applet/applet.glade.h:31
-msgid ""
-"None\n"
-"WEP Passphrase\n"
-"WEP 40/128-bit hex\n"
-"WEP 40/128-bit ASCII\n"
-msgstr ""
-"Ingen\n"
-"WEP passord\n"
-"WEP 40/128-bit heksadesimal\n"
-"WEP 40/128-bit ASCII\n"
-
-#: ../gnome/applet/applet.glade.h:36
-msgid ""
-"Open System\n"
-"Shared Key"
-msgstr ""
-"Ã…pent system\n"
-"Delt nøkkel"
-
-#: ../gnome/applet/applet.glade.h:38
-msgid "Other Wireless Network..."
-msgstr "Annet trådløst nettverk..."
-
-#: ../gnome/applet/applet.glade.h:39
-msgid "Passphrase:"
-msgstr "Passord:"
-
-#: ../gnome/applet/applet.glade.h:40
-msgid "Password:"
-msgstr "Passord:"
-
-#: ../gnome/applet/applet.glade.h:41
-msgid "Primary DNS:"
-msgstr "Primær DNS:"
-
-#: ../gnome/applet/applet.glade.h:42
-msgid "Private Key File:"
-msgstr "Privat nøkkelfil:"
-
-#: ../gnome/applet/applet.glade.h:43
-msgid "Private Key Password:"
-msgstr "Passord for privat nøkkel:"
-
-#: ../gnome/applet/applet.glade.h:44
-msgid "Secondary DNS:"
-msgstr "Sekundær DNS:"
-
-#: ../gnome/applet/applet.glade.h:45
-msgid "Select the CA Certificate File"
-msgstr "Velg sertifikatfil for CA"
-
-#: ../gnome/applet/applet.glade.h:46
-msgid "Select the Client Certificate File"
-msgstr "Velg sertifikatfil for klient"
-
-#: ../gnome/applet/applet.glade.h:47
-msgid "Select the Private Key File"
-msgstr "Velg fil med privat nøkkel"
-
-#: ../gnome/applet/applet.glade.h:48
-msgid "Subnet Mask:"
-msgstr "Subnettmaske:"
-
-#: ../gnome/applet/applet.glade.h:49
-msgid "Type:"
-msgstr "Type:"
-
-#: ../gnome/applet/applet.glade.h:50
-msgid "User Name:"
-msgstr "Brukernavn:"
-
-#: ../gnome/applet/applet.glade.h:51
-msgid "Wireless Network Key Required"
-msgstr "Nøkkel for trådløst nettverk kreves"
-
-#: ../gnome/applet/applet.glade.h:52
-msgid "Wireless _adapter:"
-msgstr "Trådløst _kort:"
-
-#: ../gnome/applet/applet.glade.h:53
-msgid "_Always Trust this Wireless Network"
-msgstr "Stol _alltid på dette trådløse nettverket"
-
-#: ../gnome/applet/applet.glade.h:54
-msgid "_Don't remind me again"
-msgstr "_Ikke vis påminnelse igjen"
-
-#: ../gnome/applet/applet.glade.h:55
-msgid "_Login to Network"
-msgstr "_Logg på nettverk"
-
-#: ../gnome/applet/applet.glade.h:56
-msgid "_Network Name:"
-msgstr "_Nettverksnavn:"
-
-#: ../gnome/applet/applet.glade.h:57
-msgid "_Wireless Security:"
-msgstr "Tr_ådløs sikkerhet:"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.c:358
-msgid "Cannot add VPN connection"
-msgstr "Kan ikke legge til VPN-tilkobling"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.c:360
-msgid ""
-"No suitable VPN software was found on your system. Contact your system "
-"administrator."
-msgstr ""
-"Ingen passende VPN-programvare ble funnet på systemet. Kontakt din "
-"systemadministrator."
-
-#: ../gnome/vpn-properties/nm-vpn-properties.c:411
-msgid "Cannot import VPN connection"
-msgstr "Kan ikke importere VPN-tilkobling"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.c:413
-#, c-format
-msgid ""
-"Cannot find suitable software for VPN connection type '%s' to import the "
-"file '%s'. Contact your system administrator."
-msgstr ""
-"Kan ikke finne passende programvare for VPN-tilkobling av type «%s» for "
-"import av fil «%s». Kontakt din sysstemadministrator."
-
-#: ../gnome/vpn-properties/nm-vpn-properties.c:553
-#, c-format
-msgid "Error retrieving VPN connection '%s'"
-msgstr "Feil under henting av VPN tilkobling «%s»"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.c:556
-#, c-format
-msgid ""
-"Could not find the UI files for VPN connection type '%s'. Contact your "
-"system administrator."
-msgstr ""
-"Kunne ikke finne brukergrensesnittfiler for VPN-tilkobling type «%s». "
-"Kontakt din systemadministrator."
-
-#: ../gnome/vpn-properties/nm-vpn-properties.c:713
-#, c-format
-msgid "Delete VPN connection \"%s\"?"
-msgstr "Slett VPN-tilkobling «%s»?"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.c:716
-#, c-format
-msgid ""
-"All information about the VPN connection \"%s\" will be lost and you may "
-"need your system administrator to provide information to create a new "
-"connection."
-msgstr ""
-"All informasjon om VPN-tilkobling «%s» vil gå tapt og du vil kanskje trenge "
-"hjelp fra din systemadministrator for å opprette en ny tilkobling."
-
-#: ../gnome/vpn-properties/nm-vpn-properties.c:924
-msgid "Unable to load"
-msgstr "Kunne ikke laste"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.c:926
-msgid "Cannot find some needed resources (the glade file)!"
-msgstr "Fant ikke nødvendige ressurser (glade-filen)."
-
-#. Edit dialog
-#: ../gnome/vpn-properties/nm-vpn-properties.c:1034
-msgid "Edit VPN Connection"
-msgstr "Rediger VPN-tilkobling"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:1
-msgid "Add a new VPN connection"
-msgstr "Legg til en ny VPN-tilkobling"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:2
-msgid "Choose which type of VPN connection you wish to create."
-msgstr "Velg hvilken type VPN-tilkobling du ønsker å opprette."
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
-msgid "Connect to:"
-msgstr "Koble til:"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
-msgid "Create VPN Connection"
-msgstr "Opprett VPN-tilkobling"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
-msgid "Create VPN Connection - 1 of 2"
-msgstr "Opprett VPN-tilkobling - 1 av 2"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
-msgid "Create VPN Connection - 2 of 2"
-msgstr "Opprett VPN-tilkobling - 2 av 2"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
-msgid "Delete the selected VPN connection"
-msgstr "Slett valgt VPN-tilkobling"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
-msgid "E_xport"
-msgstr "E_ksporter"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:9
-msgid "Edit the selected VPN connection"
-msgstr "Rediger valgt VPN-tilkobling"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:10
-msgid "Export the VPN settings to a file"
-msgstr "Eksporter innstillinger for VPN til en fil"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:11
-msgid "Export the selected VPN connection to a file"
-msgstr "Eksporter valgt VPN-tilkobling til en fil"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:12
-msgid "Finish Creating VPN Connection"
-msgstr "Fullfør oppretting av VPN-tilkobling"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:13
-msgid "Manage Virtual Private Network Connections"
-msgstr "HÃ¥ndter tilkoblinger til Virtuelle Private Nettverk"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:14
-msgid ""
-"This assistant will guide you through the creation of a connection to a "
-"Virtual Private Network (VPN).\n"
-"\n"
-"It will require some information, such as IP addresses and secrets.  Please "
-"see your system administrator to obtain this information."
-msgstr ""
-"Denne assistenten vil hjelpe deg gjennom oppretting av en tilkobling til et "
-"Virtuelt Privat Nettverk (VPN).\n"
-"\n"
-"Du vil trenge en del informasjon slik som IP-adresse og passord. Du vil "
-"sannsynligvis kunne få denne informasjonen fra din systemadministrator."
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:17
-msgid "VPN Connections"
-msgstr "VPN-tilkoblinger"
-
-#: ../src/nm-ap-security-wep.c:47
-msgid "40-bit WEP"
-msgstr "40-bit WEP"
-
-#: ../src/nm-ap-security-wep.c:49
-msgid "104-bit WEP"
-msgstr "104-bit WEP"
-
-#: ../src/nm-ap-security-wpa-psk.c:50
-msgid "WPA TKIP"
-msgstr "WPA TKIP"
-
-#: ../src/nm-ap-security-wpa-psk.c:52
-msgid "WPA CCMP"
-msgstr "WPA CCMP"
-
-#: ../src/nm-ap-security-wpa-psk.c:54
-msgid "WPA Automatic"
-msgstr "WPA automatisk"
-
-#: ../src/nm-ap-security-wpa-psk.c:59
-msgid "WPA2 TKIP"
-msgstr "WPA2 TKIP"
-
-#: ../src/nm-ap-security-wpa-psk.c:61
-msgid "WPA2 CCMP"
-msgstr "WPA2 CCMP"
-
-#: ../src/nm-ap-security-wpa-psk.c:63
-msgid "WPA2 Automatic"
-msgstr "WPA2 automatisk"
-
-#: ../src/nm-ap-security.c:305
-msgid "none"
-msgstr "ingen"
-
-#: ../src/nm-netlink-monitor.c:154
-#, c-format
-msgid ""
-"unable to create netlink socket for monitoring wired ethernet devices - %s"
-msgstr ""
-"kan ikke opprette netlink-plugg for overvåking av kablede ethernet-enheter - "
-"%s"
-
-#: ../src/nm-netlink-monitor.c:172
-#, c-format
-msgid ""
-"unable to bind to netlink socket for monitoring wired ethernet devices - %s"
-msgstr ""
-"kan ikke binde til netlink-plugg for overvåking av kablede ethernet-enheter "
-"- %s"
-
-#: ../src/nm-netlink-monitor.c:405
-msgid "operation took too long"
-msgstr "operasjonen tok for lang tid"
-
-#: ../src/nm-netlink-monitor.c:502
-msgid "received data from wrong type of sender"
-msgstr "mottok data fra feil type avsender"
-
-#: ../src/nm-netlink-monitor.c:515
-msgid "received data from unexpected sender"
-msgstr "mottok data fra uventet avsender"
-
-#: ../src/nm-netlink-monitor.c:646
-msgid "too much data was sent over socket and some of it was lost"
-msgstr "for mye data ble sendt over pluggen og noe data gikk tapt"
-
-#: ../src/nm-netlink-monitor.c:735
-msgid "error occurred while waiting for data on socket"
-msgstr "det skjedde en feil under venting på data på sokkel"
-
-#: ../gnome/applet/applet-dbus-devices.c:913
-#, c-format
-msgid "You are now connected to the Ad-Hoc wireless network '%s'."
-msgstr "Du er nå koblet til Ad-Hoc trådløst nettverk «%s»."
-
-#: ../gnome/applet/applet-dbus-devices.c:918
-#, c-format
-msgid "You are now connected to the wireless network '%s'."
-msgstr "Du er nå koblet til trådløst nettverk «%s»."
-
-#: ../gnome/applet/applet-dbus-devices.c:925
-msgid "You are now connected to the wired network."
-msgstr "Du er nå koblet til kablet nettverk."
-
-#: ../gnome/applet/applet-dbus-devices.c:931
-msgid "Connection Established"
-msgstr "Tilkobling etablert"
-
-#: ../gnome/applet/applet-dbus-devices.c:974
-msgid "Disconnected"
-msgstr "Frakoblet"
-
-#: ../gnome/applet/applet-dbus-devices.c:975
-msgid "The network connection has been disconnected."
-msgstr "Nettverksforbindelsen er frakoblet."
diff --git a/po/pa.po b/po/pa.po
index 81a69e73ca..3b56128afc 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-05 11:56+0100\n"
+"POT-Creation-Date: 2006-05-29 18:33+0200\n"
 "PO-Revision-Date: 2005-03-05 18:06+0530\n"
 "Last-Translator: Amanpreet Singh Alam <amanpreetalam@yahoo.com>\n"
 "Language-Team: Punjabi <fedora-trans-pa@redhat.com>\n"
@@ -20,249 +20,1000 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "\n"
 
-#: info-daemon/networks.glade.h:1
-msgid "<span weight=\"bold\">Wireless Networks:</span>"
-msgstr "<span weight=\"bold\">ਬੇਤਾਰ ਨੈੱਟਵਰਕ:</span>"
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:919
+#, fuzzy, c-format
+msgid "Passphrase for wireless network %s"
+msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ ਬਣਾਓ"
 
-#: info-daemon/networks.glade.h:2
-msgid "Modify Wireless Networks"
-msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ ਸੋਧ"
+#: ../gnome/applet/applet-dbus.c:265
+#, fuzzy, c-format
+msgid "Connection to the wireless network '%s' failed."
+msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ '%s' ਨਾਲ ਜ�ੜਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
+
+#: ../gnome/applet/applet-dbus.c:270
+#, fuzzy
+msgid "Connection to the wired network failed."
+msgstr "ਤਾਰ ਵਾਲੇ ਨੈਟਵਰਕ ਨਾਲ ਜ�ੜਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
+
+#: ../gnome/applet/applet.c:184
+msgid "Error displaying connection information:"
+msgstr ""
+
+#: ../gnome/applet/applet.c:202
+msgid "Could not find some required resources (the glade file)!"
+msgstr ""
+
+#: ../gnome/applet/applet.c:213
+#, fuzzy
+msgid "No active connections!"
+msgstr "ਕੋਈ ਨੈਟਵਰਕ ਕ�ਨੈਕਸ਼ਨ ਨਹੀਂ"
+
+#: ../gnome/applet/applet.c:234
+#, fuzzy, c-format
+msgid "Wired Ethernet (%s)"
+msgstr "ਤਾਰ ਨੈਟਰਵਕ (%s)"
 
-#: info-daemon/passphrase.glade.h:1
-msgid "*"
-msgstr "*"
+#: ../gnome/applet/applet.c:236
+#, fuzzy, c-format
+msgid "Wireless Ethernet (%s)"
+msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ (%s)"
 
-#: info-daemon/passphrase.glade.h:2
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:362
+msgid "NetworkManager Applet"
+msgstr "ਨੈਟਵਰਕਮੈਨੇਜਰ �ਪਲਿਟ"
+
+#: ../gnome/applet/applet.c:339 ../gnome/applet/applet.c:364
+#, fuzzy
+msgid "Copyright © 2004-2005 Red Hat, Inc."
+msgstr "ਹੱਕ ਰਾਖਵੇਂ ਹਨ (C) 2004-2005 Red Hat, Inc."
+
+#: ../gnome/applet/applet.c:340 ../gnome/applet/applet.c:365
 msgid ""
-"128-bit Passphrase (WEP)\n"
-"Ascii Key (WEP)\n"
-"Hex Key (WEP)"
+"Notification area applet for managing your network devices and connections."
 msgstr ""
-"128-bit ਪ�ਹੈਰਾ (WEP)\n"
-"Ascii ਕ�ੰਜੀ (WEP)\n"
-"Hex ਕ�ੰਜੀ (WEP)"
+"ਸੂਚਨਾ ਖੇਤਰ �ਪਲਿਟ, ਜੋ ਕਿ ਵੇਖਾਉਦਾ ਹੈ ਕਿ ਤ�ਹਾਡੇ ਨੈਟਵਰਕ ਜੰਤਰਾਂ ਅਤੇ ਕ�ਨੈਕਸ਼ਨਾਂ ਨੂੰ ਕਿਵੇਂ ਵੇਖਿਆ ਜਾਵੇ।"
 
-#: info-daemon/passphrase.glade.h:6
-#, no-c-format
+#: ../gnome/applet/applet.c:343 ../gnome/applet/applet.c:370
+msgid "translator-credits"
+msgstr ""
+
+#: ../gnome/applet/applet.c:426
+msgid "VPN Login Failure"
+msgstr ""
+
+#: ../gnome/applet/applet.c:427
+#, c-format
+msgid "Could not start the VPN connection '%s' due to a login failure."
+msgstr ""
+
+#: ../gnome/applet/applet.c:431
+msgid "VPN Start Failure"
+msgstr ""
+
+#: ../gnome/applet/applet.c:432
+#, c-format
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
-"Network</span>\n"
-"\n"
-"A passphrase or encryption key is required to access the wireless network '%"
-"s'."
+"Could not start the VPN connection '%s' due to a failure launching the VPN "
+"program."
 msgstr ""
 
-#: info-daemon/passphrase.glade.h:9
-msgid "Key Type:"
-msgstr "ਕ�ੰਜੀ ਕਿਸਮ:"
+#: ../gnome/applet/applet.c:436 ../gnome/applet/applet.c:446
+msgid "VPN Connect Failure"
+msgstr ""
 
-#: info-daemon/passphrase.glade.h:10
-#: info-daemon/NetworkManagerInfoPassphraseDialog.c:139
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:150
-#: panel-applet/essid.glade.h:7
-msgid "Passphrase:"
-msgstr "ਪ�ਰਸੰਗ:"
+#: ../gnome/applet/applet.c:437
+#, c-format
+msgid "Could not start the VPN connection '%s' due to a connection error."
+msgstr ""
 
-#: info-daemon/passphrase.glade.h:11
-msgid "Wireless Network Key Required"
-msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ ਸਵਿੱਚ ਲੋੜੀਦਾ"
+#: ../gnome/applet/applet.c:441
+msgid "VPN Configuration Error"
+msgstr ""
 
-#: info-daemon/passphrase.glade.h:12
-msgid "_Login to Network"
-msgstr "ਨੈਟਵਰਕ ਤੇ ਲਾਗਿੰਨ(_L)"
+#: ../gnome/applet/applet.c:442
+#, c-format
+msgid "The VPN connection '%s' was not correctly configured."
+msgstr ""
 
-#: info-daemon/NetworkManagerInfoPassphraseDialog.c:142
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:153
-msgid "Ascii Key:"
-msgstr "Ascii ਕ�ੰਜੀ:"
+#: ../gnome/applet/applet.c:447
+#, c-format
+msgid ""
+"Could not start the VPN connection '%s' because the VPN server did not "
+"return an adequate network configuration."
+msgstr ""
 
-#: info-daemon/NetworkManagerInfoPassphraseDialog.c:145
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:156
-msgid "Hex Key:"
-msgstr "Hex ਕ�ੰਜੀ:"
+#: ../gnome/applet/applet.c:517
+msgid "VPN Login Message"
+msgstr ""
+
+#: ../gnome/applet/applet.c:741 ../gnome/applet/applet.c:2508
+#: ../gnome/applet/other-network-dialog.c:453
+#: ../gnome/applet/passphrase-dialog.c:228
+msgid ""
+"The NetworkManager Applet could not find some required resources (the glade "
+"file was not found)."
+msgstr ""
 
-#: info-daemon/NetworkManagerInfoVPN.c:157
+#: ../gnome/applet/applet.c:753
 #, c-format
-msgid "You must log in to access the private network %s"
-msgstr "ਤ�ਹਾਨੂੰ ਨਿੱਜੀ ਨੈਟਵਰਕ %s ਨੂੰ ਵਰਤਣ ਲਈ ਲਾਗਿੰਨ ਕਰਨਾ ਪਵੇਗਾ"
+msgid "The network device \"%s (%s)\" does not support wireless scanning."
+msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:142 panel-applet/NMWirelessApplet.c:160
-msgid "NetworkManager Applet"
-msgstr "ਨੈਟਵਰਕਮੈਨੇਜਰ �ਪਲਿਟ"
+#: ../gnome/applet/applet.c:761
+#, c-format
+msgid "The network device \"%s (%s)\" does not support link detection."
+msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:144 panel-applet/NMWirelessApplet.c:162
-msgid "Copyright (C) 2004-2005 Red Hat, Inc."
-msgstr "ਹੱਕ ਰਾਖਵੇਂ ਹਨ (C) 2004-2005 Red Hat, Inc."
+#: ../gnome/applet/applet.c:908
+#, fuzzy, c-format
+msgid "Preparing device %s for the wired network..."
+msgstr "ਤਾਰ ਵਾਲੇ ਨੈਟਵਰਕ ਨਾਲ ਜ�ੜਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
+
+#: ../gnome/applet/applet.c:910
+#, fuzzy, c-format
+msgid "Preparing device %s for the wireless network '%s'..."
+msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ '%s' ਨਾਲ ਜ�ੜਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
+
+#: ../gnome/applet/applet.c:918
+#, fuzzy, c-format
+msgid "Configuring device %s for the wired network..."
+msgstr "ਤਾਰ ਵਾਲੇ ਨੈਟਵਰਕ ਨਾਲ ਜ�ੜਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
+
+#: ../gnome/applet/applet.c:920
+#, fuzzy, c-format
+msgid "Attempting to join the wireless network '%s'..."
+msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ '%s' ਨਾਲ ਜ�ੜਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
+
+#: ../gnome/applet/applet.c:928
+#, fuzzy, c-format
+msgid "Waiting for Network Key for the wireless network '%s'..."
+msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ '%s' ਨਾਲ ਜ�ੜਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
+
+#: ../gnome/applet/applet.c:936 ../gnome/applet/applet.c:946
+#, fuzzy
+msgid "Requesting a network address from the wired network..."
+msgstr "ਤਾਰ ਵਾਲੇ ਨੈਟਵਰਕ ਨਾਲ ਜ�ੜਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
+
+#: ../gnome/applet/applet.c:938 ../gnome/applet/applet.c:948
+#, fuzzy, c-format
+msgid "Requesting a network address from the wireless network '%s'..."
+msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ '%s' ਨਾਲ ਜ�ੜਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
+
+#: ../gnome/applet/applet.c:956
+#, fuzzy
+msgid "Finishing connection to the wired network..."
+msgstr "ਤਾਰ ਵਾਲੇ ਨੈਟਵਰਕ ਨਾਲ ਜ�ੜਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
+
+#: ../gnome/applet/applet.c:958
+#, fuzzy, c-format
+msgid "Finishing connection to the wireless network '%s'..."
+msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ '%s' ਨਾਲ ਜ�ੜਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
+
+#: ../gnome/applet/applet.c:1075
+msgid "NetworkManager is not running"
+msgstr "ਨੈਟਵਰਕ ਮੈਨੇਜਰ ਚੱਲ ਨਹੀਂ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: panel-applet/NMWirelessApplet.c:145 panel-applet/NMWirelessApplet.c:163
-msgid "Notification area applet for managing your network devices and connections."
-msgstr "ਸੂਚਨਾ ਖੇਤਰ �ਪਲਿਟ, ਜੋ ਕਿ ਵੇਖਾਉਦਾ ਹੈ ਕਿ ਤ�ਹਾਡੇ ਨੈਟਵਰਕ ਜੰਤਰਾਂ ਅਤੇ ਕ�ਨੈਕਸ਼ਨਾਂ ਨੂੰ ਕਿਵੇਂ ਵੇਖਿਆ ਜਾਵੇ।"
+#: ../gnome/applet/applet.c:1083 ../gnome/applet/applet.c:1828
+msgid "Networking disabled"
+msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:379
+#: ../gnome/applet/applet.c:1088
 msgid "No network connection"
 msgstr "ਕੋਈ ਨੈਟਵਰਕ ਕ�ਨੈਕਸ਼ਨ ਨਹੀਂ"
 
-#: panel-applet/NMWirelessApplet.c:384
+#: ../gnome/applet/applet.c:1093
 msgid "Wired network connection"
 msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ ਕ�ਨੈਕਸ਼ਨ"
 
-#: panel-applet/NMWirelessApplet.c:389
-msgid "Connecting to a wired network..."
-msgstr "ਤਾਰ ਵਾਲੇ ਨੈਟਵਰਕ ਨਾਲ ਜ�ੜਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
-
-#: panel-applet/NMWirelessApplet.c:398
+#: ../gnome/applet/applet.c:1097
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Ad-Hoc ਬੇਤਾਰ ਨੈਟਵਰਕ ਨਾਲ ਜ�ੜਿਆ"
 
-#: panel-applet/NMWirelessApplet.c:412
+#: ../gnome/applet/applet.c:1099
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "'%s' (%d%%) ਲਈ ਬੇਤਾਰ ਨੈਟਵਰਕ ਕ�ਨੈਕਸ਼ਨ"
 
-#: panel-applet/NMWirelessApplet.c:417
-msgid "Wireless network connection"
-msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ ਸੋਧ"
-
-#: panel-applet/NMWirelessApplet.c:422
+#: ../gnome/applet/applet.c:1120
 #, c-format
-msgid "Connecting to wireless network '%s'..."
-msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ '%s' ਨਾਲ ਜ�ੜਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
-
-#: panel-applet/NMWirelessApplet.c:428
-msgid "NetworkManager is not running"
-msgstr "ਨੈਟਵਰਕ ਮੈਨੇਜਰ ਚੱਲ ਨਹੀਂ ਜਾ ਰਿਹਾ ਹੈ"
+msgid "VPN connection to '%s'"
+msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:433
-msgid "Scanning for wireless networks..."
-msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ ਲਈ ਖੋਜ ਜਾਰੀ ਹੈ..."
+#: ../gnome/applet/applet.c:1128
+#, c-format
+msgid "VPN connecting to '%s'"
+msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:798
-msgid "Other Wireless Networks..."
+#: ../gnome/applet/applet.c:1541
+#, fuzzy
+msgid "_Connect to Other Wireless Network..."
 msgstr "ਹੋਰ ਬੇਤਾਰ ਨੈੱਟਵਰਕ..."
 
-#: panel-applet/NMWirelessApplet.c:819
-msgid "Create new Wireless Network..."
+#: ../gnome/applet/applet.c:1562
+#, fuzzy
+msgid "Create _New Wireless Network..."
 msgstr "ਨਵਾਂ ਬੇਤਾਰ ਨੈੱਟਵਰਕ ਬਣਾਓ..."
 
-#: panel-applet/NMWirelessApplet.c:895
+#: ../gnome/applet/applet.c:1685
+msgid "_VPN Connections"
+msgstr ""
+
+#: ../gnome/applet/applet.c:1730
+msgid "_Configure VPN..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1734
+msgid "_Disconnect VPN..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1756
+msgid "_Dial Up Connections"
+msgstr ""
+
+#. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
+#: ../gnome/applet/applet.c:1767
+#, c-format
+msgid "Connect to %s..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1773
+#, c-format
+msgid "Disconnect from %s..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1822
 msgid "No network devices have been found"
 msgstr "ਕੋਈ ਨੈਟਵਰਕ ਜੰਤਰ ਨਹੀਂ ਲੱਭਿਆ"
 
-#: panel-applet/NMWirelessApplet.c:1037
+#: ../gnome/applet/applet.c:2014
 msgid "NetworkManager is not running..."
 msgstr "ਨੈਟਵਰਕਮੈਨੇਜਰ ਚੱਲ ਨਹੀਂ ਰਿਹਾ ਹੈ..."
 
-#: panel-applet/NMWirelessApplet.c:1107 panel-applet/NMWirelessApplet.c:1156
-msgid "Pause Wireless Scanning"
-msgstr "ਬੇਤਾਰ ਪੜਤਾਲ ਰੋਕੋ"
-
-#: panel-applet/NMWirelessApplet.c:1112
-msgid "Resume Wireless Scanning"
-msgstr "ਬੇਤਾਰ ਪੜਤਾਲ ਮ�ੜ ਚਾਲੂ"
+#. 'Enable Networking' item
+#: ../gnome/applet/applet.c:2170
+msgid "Enable _Networking"
+msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:1122 panel-applet/NMWirelessApplet.c:1162
-msgid "Stop All Wireless Devices"
-msgstr "ਸਭ ਬੇਤਾਰ ਜੰਤਰ ਰੋਕੋ"
+#. 'Enable Wireless' item
+#: ../gnome/applet/applet.c:2176
+msgid "Enable _Wireless"
+msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:1127
-msgid "Start All Wireless Devices"
-msgstr "ਸਭ ਬੇਤਾਰ ਜੰਤਰ ਸ਼�ਰੂ"
+#. 'Connection Information' item
+#: ../gnome/applet/applet.c:2182
+msgid "Connection _Information"
+msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:1172
-msgid "Help"
+#. Help item
+#: ../gnome/applet/applet.c:2193
+#, fuzzy
+msgid "_Help"
 msgstr "ਸਹਾਇਤਾ"
 
-#: panel-applet/NMWirelessApplet.c:1179
-msgid "About"
+#. About item
+#: ../gnome/applet/applet.c:2202
+#, fuzzy
+msgid "_About"
 msgstr "ਇਸ ਬਾਰੇ"
 
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:229
-msgid "Create new wireless network"
-msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ ਬਣਾਓ"
-
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:230
+#: ../gnome/applet/applet.c:2667
 msgid ""
-"Enter the ESSID and security settings of the wireless network you wish to "
-"create."
+"The NetworkManager applet could not find some required resources.  It cannot "
+"continue.\n"
 msgstr ""
 
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:235
-msgid "Custom wireless network"
-msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ ਸੋਧ"
+#: ../gnome/applet/wireless-security-option.c:157
+msgid "Open System"
+msgstr ""
 
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:236
-msgid "Enter the ESSID of the wireless network to which you wish to connect."
+#: ../gnome/applet/wireless-security-option.c:160
+msgid "Shared Key"
 msgstr ""
 
-#. Reuse the above string to make the translators less angry.
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:316
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:325
-msgid ""
-"The NetworkManager Applet could not find some required resources (the glade "
-"file was not found)."
+#: ../gnome/applet/wireless-security-option.c:208
+msgid "Automatic (Default)"
 msgstr ""
 
-#: panel-applet/essid.glade.h:1
-msgid ""
-"128-bit passphrase (WEP)\n"
-"Ascii key (WEP)\n"
-"Hex key (WEP)"
+#: ../gnome/applet/wireless-security-option.c:215
+msgid "AES-CCMP"
 msgstr ""
-"128-bit ਪ�ਹੈਰਾ (WEP)\n"
-"Ascii ਕ�ੰਜੀ (WEP)\n"
-"Hex ਕ�ੰਜੀ (WEP)"
 
-#: panel-applet/essid.glade.h:4
-msgid "C_onnect"
-msgstr "ਕ�ਨੈਕਸ਼ਨ(_o)"
+#: ../gnome/applet/wireless-security-option.c:223
+msgid "TKIP"
+msgstr ""
 
-#: panel-applet/essid.glade.h:5
-msgid "Connect with encryption enabled"
-msgstr "ਇਕ�ਰਿਪਸ਼ਨ ਨਾਲ ਕ�ਨੈਕਸ਼ਨ ਯੋਗ"
+#: ../gnome/applet/wireless-security-option.c:231
+msgid "Dynamic WEP"
+msgstr ""
 
-#: panel-applet/essid.glade.h:6
-msgid "Key type:"
-msgstr "ਕ�ੰਜੀ ਕਿਸਮ:"
+#: ../gnome/applet/wso-none.c:53
+msgid "None"
+msgstr ""
 
-#: panel-applet/essid.glade.h:8
-msgid "Wireless _adapter:"
-msgstr "ਬੇਤਾਰ �ਡਪਟਰ(_a):"
+#: ../gnome/applet/wso-wep-ascii.c:138
+msgid "WEP 64/128-bit ASCII"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-hex.c:135
+msgid "WEP 64/128-bit Hex"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-passphrase.c:135
+#, fuzzy
+msgid "WEP 128-bit Passphrase"
+msgstr "ਪ�ਰਸੰਗ:"
+
+#: ../gnome/applet/wso-wpa-eap.c:237
+msgid "PEAP"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:238
+msgid "TLS"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:239
+msgid "TTLS"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
+#: ../src/nm-ap-security-wpa-eap.c:116
+msgid "WPA2 Enterprise"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
+#: ../src/nm-ap-security-wpa-eap.c:121
+msgid "WPA Enterprise"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-psk.c:178
+msgid "WPA2 Personal"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-psk.c:180
+msgid "WPA Personal"
+msgstr ""
+
+#: ../gnome/applet/eggtrayicon.c:134
+msgid "Orientation"
+msgstr "ਸਥਿਤੀ"
 
-#: panel-applet/essid.glade.h:9
-msgid "Wireless _network:"
-msgstr "ਬੇਤਾਰ ਨੈਟਵਰਕ(_n):"
+#: ../gnome/applet/eggtrayicon.c:135
+msgid "The orientation of the tray."
+msgstr "ਟਰੇ ਦੀ ਸਥਿਤੀ ਹੈ।"
 
-#: panel-applet/menu-info.c:91
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "ਤਾਰ ਨੈਟਰਵਕ (%s)"
 
-#: panel-applet/menu-info.c:93
-msgid "Wired Network"
+#: ../gnome/applet/menu-items.c:91
+#, fuzzy
+msgid "_Wired Network"
 msgstr "ਤਾਰ ਨੈੱਟਵਰਕ"
 
-#: panel-applet/menu-info.c:166
+#: ../gnome/applet/menu-items.c:162
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
 msgstr[0] "ਬੇਤਾਰ ਨੈੱਟਵਰਕ (%s)"
 msgstr[1] "ਬੇਤਾਰ ਨੈੱਟਵਰਕ (%s)"
 
-#: panel-applet/menu-info.c:168
+#: ../gnome/applet/menu-items.c:164
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "ਬੇਤਾਰ ਨੈੱਟਵਰਕ"
 msgstr[1] "ਬੇਤਾਰ ਨੈੱਟਵਰਕ"
 
-#: panel-applet/menu-info.c:294
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr " (ਗਲਤ ਯੂਨੀਕੋਡ)"
 
-#: examples/python/systray/eggtrayicon.c:111
-msgid "Orientation"
+#: ../gnome/applet/other-network-dialog.c:352
+#, c-format
+msgid ""
+"By default, the wireless network's name is set to your computer's name, %s, "
+"with no encryption enabled"
+msgstr ""
+
+#: ../gnome/applet/other-network-dialog.c:358
+msgid "Create new wireless network"
+msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ ਬਣਾਓ"
+
+#: ../gnome/applet/other-network-dialog.c:359
+msgid ""
+"Enter the name and security settings of the wireless network you wish to "
+"create."
+msgstr ""
+
+#: ../gnome/applet/other-network-dialog.c:363
+#, fuzzy
+msgid "Create New Wireless Network"
+msgstr "ਨਵਾਂ ਬੇਤਾਰ ਨੈੱਟਵਰਕ ਬਣਾਓ..."
+
+#: ../gnome/applet/other-network-dialog.c:368
+#, fuzzy
+msgid "Existing wireless network"
+msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ ਸੋਧ"
+
+#: ../gnome/applet/other-network-dialog.c:369
+msgid "Enter the name of the wireless network to which you wish to connect."
+msgstr ""
+
+#: ../gnome/applet/other-network-dialog.c:371
+#, fuzzy
+msgid "Connect to Other Wireless Network"
+msgstr "ਹੋਰ ਬੇਤਾਰ ਨੈੱਟਵਰਕ..."
+
+#: ../gnome/applet/passphrase-dialog.c:215
+#, fuzzy
+msgid "Error connecting to wireless network"
+msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ '%s' ਨਾਲ ਜ�ੜਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
+
+#: ../gnome/applet/passphrase-dialog.c:216
+msgid ""
+"The requested wireless network requires security capabilities unsupported by "
+"your hardware."
+msgstr ""
+
+#: ../gnome/applet/vpn-password-dialog.c:151
+#: ../gnome/applet/vpn-password-dialog.c:188
+#, c-format
+msgid "Cannot start VPN connection '%s'"
+msgstr ""
+
+#: ../gnome/applet/vpn-password-dialog.c:154
+#, c-format
+msgid ""
+"Could not find the authentication dialog for VPN connection type '%s'. "
+"Contact your system administrator."
+msgstr ""
+
+#: ../gnome/applet/vpn-password-dialog.c:191
+#, c-format
+msgid ""
+"There was a problem launching the authentication dialog for VPN connection "
+"type '%s'. Contact your system administrator."
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:1
+msgid " "
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:2
+#, fuzzy
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
+msgstr "<span weight=\"bold\">ਬੇਤਾਰ ਨੈੱਟਵਰਕ:</span>"
+
+#: ../gnome/applet/applet.glade.h:4
+#, no-c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
+"Network</span>\n"
+"\n"
+"A passphrase or encryption key is required to access the wireless network '%"
+"s'."
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:8
+#, no-c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
+"\n"
+"%s  It will not be completely functional."
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:12
+#, no-c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
+"span>\n"
+"\n"
+"You have chosen to log in to the wireless network '%s'.  If you are sure "
+"that this wireless network is secure, click the checkbox below and "
+"NetworkManager will not require confirmation on subsequent log ins."
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:15
+msgid "Anonymous Identity:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:16
+#, fuzzy
+msgid "Authentication:"
 msgstr "ਸਥਿਤੀ"
 
-#: examples/python/systray/eggtrayicon.c:112
-msgid "The orientation of the tray."
-msgstr "ਟਰੇ ਦੀ ਸਥਿਤੀ ਹੈ।"
+#: ../gnome/applet/applet.glade.h:17
+msgid "Broadcast Address:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:18
+msgid "CA Certificate File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:19
+msgid "C_onnect"
+msgstr "ਕ�ਨੈਕਸ਼ਨ(_o)"
+
+#: ../gnome/applet/applet.glade.h:20
+msgid "Client Certificate File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:21
+msgid "Connection Information"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:22
+msgid "Default Route:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:23
+msgid "Destination Address:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:24
+msgid "Driver:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:25
+msgid "EAP Method:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:26
+msgid "Hardware Address:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:27
+msgid "IP Address:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:28
+msgid "Identity:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:29
+msgid "Interface:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:30
+msgid "Key Type:"
+msgstr "ਕ�ੰਜੀ ਕਿਸਮ:"
+
+#: ../gnome/applet/applet.glade.h:31
+#, fuzzy
+msgid "Key:"
+msgstr "Hex ਕ�ੰਜੀ:"
+
+#: ../gnome/applet/applet.glade.h:32
+msgid ""
+"None\n"
+"WEP 128-bit Passphrase\n"
+"WEP 64/128-bit Hex\n"
+"WEP 64/128-bit ASCII\n"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:37
+msgid ""
+"Open System\n"
+"Shared Key"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:39
+#, fuzzy
+msgid "Other Wireless Network..."
+msgstr "ਹੋਰ ਬੇਤਾਰ ਨੈੱਟਵਰਕ..."
+
+#: ../gnome/applet/applet.glade.h:40
+msgid "Passphrase:"
+msgstr "ਪ�ਰਸੰਗ:"
+
+#: ../gnome/applet/applet.glade.h:41
+msgid "Password:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:42
+msgid "Primary DNS:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:43
+msgid "Private Key File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:44
+msgid "Private Key Password:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:45
+msgid "Secondary DNS:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:46
+msgid "Select the CA Certificate File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:47
+msgid "Select the Client Certificate File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:48
+msgid "Select the Private Key File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:49
+msgid "Show key"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:50
+#, fuzzy
+msgid "Show passphrase"
+msgstr "ਪ�ਰਸੰਗ:"
+
+#: ../gnome/applet/applet.glade.h:51
+msgid "Show password"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:52
+msgid "Show passwords"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:53
+msgid "Speed:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:54
+msgid "Subnet Mask:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:55
+#, fuzzy
+msgid "Type:"
+msgstr "ਕ�ੰਜੀ ਕਿਸਮ:"
+
+#: ../gnome/applet/applet.glade.h:56
+msgid "User Name:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:57
+msgid "Wireless Network Key Required"
+msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ ਸਵਿੱਚ ਲੋੜੀਦਾ"
+
+#: ../gnome/applet/applet.glade.h:58
+msgid "Wireless _adapter:"
+msgstr "ਬੇਤਾਰ �ਡਪਟਰ(_a):"
+
+#: ../gnome/applet/applet.glade.h:59
+#, fuzzy
+msgid "_Always Trust this Wireless Network"
+msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ"
+
+#: ../gnome/applet/applet.glade.h:60
+msgid "_Don't remind me again"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:61
+msgid "_Login to Network"
+msgstr "ਨੈਟਵਰਕ ਤੇ ਲਾਗਿੰਨ(_L)"
+
+#: ../gnome/applet/applet.glade.h:62
+msgid "_Network Name:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:63
+#, fuzzy
+msgid "_Wireless Security:"
+msgstr "ਬੇਤਾਰ �ਡਪਟਰ(_a):"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:383
+msgid "Cannot add VPN connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:385
+msgid ""
+"No suitable VPN software was found on your system. Contact your system "
+"administrator."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:437
+#, fuzzy
+msgid "Cannot import VPN connection"
+msgstr "ਕੋਈ ਨੈਟਵਰਕ ਕ�ਨੈਕਸ਼ਨ ਨਹੀਂ"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:439
+#, c-format
+msgid ""
+"Cannot find suitable software for VPN connection type '%s' to import the "
+"file '%s'. Contact your system administrator."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:579
+#, c-format
+msgid "Error retrieving VPN connection '%s'"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:582
+#, c-format
+msgid ""
+"Could not find the UI files for VPN connection type '%s'. Contact your "
+"system administrator."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:739
+#, c-format
+msgid "Delete VPN connection \"%s\"?"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:742
+#, c-format
+msgid ""
+"All information about the VPN connection \"%s\" will be lost and you may "
+"need your system administrator to provide information to create a new "
+"connection."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:959
+msgid "Unable to load"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:961
+msgid "Cannot find some needed resources (the glade file)!"
+msgstr ""
+
+#. Edit dialog
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
+msgid "Edit VPN Connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:1
+#, fuzzy
+msgid "Add a new VPN connection"
+msgstr "ਕੋਈ ਨੈਟਵਰਕ ਕ�ਨੈਕਸ਼ਨ ਨਹੀਂ"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:2
+msgid "Choose which type of VPN connection you wish to create."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
+#, fuzzy
+msgid "Connect to:"
+msgstr "ਕ�ਨੈਕਸ਼ਨ(_o)"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
+msgid "Create VPN Connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
+msgid "Create VPN Connection - 1 of 2"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
+msgid "Create VPN Connection - 2 of 2"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
+msgid "Delete the selected VPN connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
+msgid "E_xport"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:9
+msgid "Edit the selected VPN connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:10
+msgid "Export the VPN settings to a file"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:11
+msgid "Export the selected VPN connection to a file"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:12
+msgid "Finish Creating VPN Connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:13
+#, fuzzy
+msgid "Manage Virtual Private Network Connections"
+msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ ਸੋਧ"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:14
+msgid ""
+"This assistant will guide you through the creation of a connection to a "
+"Virtual Private Network (VPN).\n"
+"\n"
+"It will require some information, such as IP addresses and secrets.  Please "
+"see your system administrator to obtain this information."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:17
+#, fuzzy
+msgid "VPN Connections"
+msgstr "ਕੋਈ ਨੈਟਵਰਕ ਕ�ਨੈਕਸ਼ਨ ਨਹੀਂ"
+
+#: ../src/nm-ap-security-wep.c:52
+msgid "40-bit WEP"
+msgstr ""
+
+#: ../src/nm-ap-security-wep.c:54
+msgid "104-bit WEP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:50
+msgid "WPA TKIP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:52
+msgid "WPA CCMP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:54
+msgid "WPA Automatic"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:59
+msgid "WPA2 TKIP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:61
+msgid "WPA2 CCMP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:63
+msgid "WPA2 Automatic"
+msgstr ""
+
+#: ../src/nm-ap-security.c:320
+msgid "none"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:154
+#, c-format
+msgid ""
+"unable to create netlink socket for monitoring wired ethernet devices - %s"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:172
+#, c-format
+msgid ""
+"unable to bind to netlink socket for monitoring wired ethernet devices - %s"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:405
+msgid "operation took too long"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:502
+msgid "received data from wrong type of sender"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:515
+msgid "received data from unexpected sender"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:646
+msgid "too much data was sent over socket and some of it was lost"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:735
+msgid "error occurred while waiting for data on socket"
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:898
+#, fuzzy, c-format
+msgid "You are now connected to the Ad-Hoc wireless network '%s'."
+msgstr "Ad-Hoc ਬੇਤਾਰ ਨੈਟਵਰਕ ਨਾਲ ਜ�ੜਿਆ"
+
+#: ../gnome/applet/applet-dbus-devices.c:903
+#, fuzzy, c-format
+msgid "You are now connected to the wireless network '%s'."
+msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ '%s' ਨਾਲ ਜ�ੜਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
+
+#: ../gnome/applet/applet-dbus-devices.c:910
+#, fuzzy
+msgid "You are now connected to the wired network."
+msgstr "ਤਾਰ ਵਾਲੇ ਨੈਟਵਰਕ ਨਾਲ ਜ�ੜਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
+
+#: ../gnome/applet/applet-dbus-devices.c:916
+#, fuzzy
+msgid "Connection Established"
+msgstr "ਇਕ�ਰਿਪਸ਼ਨ ਨਾਲ ਕ�ਨੈਕਸ਼ਨ ਯੋਗ"
+
+#: ../gnome/applet/applet-dbus-devices.c:959
+msgid "Disconnected"
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:960
+msgid "The network connection has been disconnected."
+msgstr ""
+
+#~ msgid "Modify Wireless Networks"
+#~ msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ ਸੋਧ"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid ""
+#~ "128-bit Passphrase (WEP)\n"
+#~ "Ascii Key (WEP)\n"
+#~ "Hex Key (WEP)"
+#~ msgstr ""
+#~ "128-bit ਪ�ਹੈਰਾ (WEP)\n"
+#~ "Ascii ਕ�ੰਜੀ (WEP)\n"
+#~ "Hex ਕ�ੰਜੀ (WEP)"
+
+#~ msgid "Ascii Key:"
+#~ msgstr "Ascii ਕ�ੰਜੀ:"
+
+#~ msgid "You must log in to access the private network %s"
+#~ msgstr "ਤ�ਹਾਨੂੰ ਨਿੱਜੀ ਨੈਟਵਰਕ %s ਨੂੰ ਵਰਤਣ ਲਈ ਲਾਗਿੰਨ ਕਰਨਾ ਪਵੇਗਾ"
+
+#~ msgid "Scanning for wireless networks..."
+#~ msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ ਲਈ ਖੋਜ ਜਾਰੀ ਹੈ..."
+
+#~ msgid "Pause Wireless Scanning"
+#~ msgstr "ਬੇਤਾਰ ਪੜਤਾਲ ਰੋਕੋ"
+
+#~ msgid "Resume Wireless Scanning"
+#~ msgstr "ਬੇਤਾਰ ਪੜਤਾਲ ਮ�ੜ ਚਾਲੂ"
+
+#~ msgid "Stop All Wireless Devices"
+#~ msgstr "ਸਭ ਬੇਤਾਰ ਜੰਤਰ ਰੋਕੋ"
+
+#~ msgid "Start All Wireless Devices"
+#~ msgstr "ਸਭ ਬੇਤਾਰ ਜੰਤਰ ਸ਼�ਰੂ"
+
+#~ msgid ""
+#~ "128-bit passphrase (WEP)\n"
+#~ "Ascii key (WEP)\n"
+#~ "Hex key (WEP)"
+#~ msgstr ""
+#~ "128-bit ਪ�ਹੈਰਾ (WEP)\n"
+#~ "Ascii ਕ�ੰਜੀ (WEP)\n"
+#~ "Hex ਕ�ੰਜੀ (WEP)"
+
+#~ msgid "Key type:"
+#~ msgstr "ਕ�ੰਜੀ ਕਿਸਮ:"
+
+#~ msgid "Wireless _network:"
+#~ msgstr "ਬੇਤਾਰ ਨੈਟਵਰਕ(_n):"
+
+#~ msgid "<span weight=\"bold\">Wireless Networks:</span>"
+#~ msgstr "<span weight=\"bold\">ਬੇਤਾਰ ਨੈੱਟਵਰਕ:</span>"
+
+#~ msgid "Hex Key:"
+#~ msgstr "Hex ਕ�ੰਜੀ:"
+
+#~ msgid "Copyright (C) 2004-2005 Red Hat, Inc."
+#~ msgstr "ਹੱਕ ਰਾਖਵੇਂ ਹਨ (C) 2004-2005 Red Hat, Inc."
+
+#~ msgid "Connecting to a wired network..."
+#~ msgstr "ਤਾਰ ਵਾਲੇ ਨੈਟਵਰਕ ਨਾਲ ਜ�ੜਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
+
+#~ msgid "Wireless network connection"
+#~ msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ ਸੋਧ"
+
+#~ msgid "Connecting to wireless network '%s'..."
+#~ msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ '%s' ਨਾਲ ਜ�ੜਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
+
+#~ msgid "Other Wireless Networks..."
+#~ msgstr "ਹੋਰ ਬੇਤਾਰ ਨੈੱਟਵਰਕ..."
+
+#~ msgid "Create new Wireless Network..."
+#~ msgstr "ਨਵਾਂ ਬੇਤਾਰ ਨੈੱਟਵਰਕ ਬਣਾਓ..."
+
+#~ msgid "Help"
+#~ msgstr "ਸਹਾਇਤਾ"
+
+#~ msgid "About"
+#~ msgstr "ਇਸ ਬਾਰੇ"
+
+#~ msgid "Custom wireless network"
+#~ msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ ਸੋਧ"
+
+#~ msgid "Connect with encryption enabled"
+#~ msgstr "ਇਕ�ਰਿਪਸ਼ਨ ਨਾਲ ਕ�ਨੈਕਸ਼ਨ ਯੋਗ"
 
+#~ msgid "Wired Network"
+#~ msgstr "ਤਾਰ ਨੈੱਟਵਰਕ"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 3430f379c0..55907f9014 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-28 04:09+0100\n"
+"POT-Creation-Date: 2006-05-29 18:33+0200\n"
 "PO-Revision-Date: 2006-03-01 22:31-0300\n"
 "Last-Translator: Raphael Higino <raphaelh@uai.com.br>\n"
 "Language-Team: Brazilian Portuguese <gnome-l10n-br@listas.cipsga.org.br>\n"
@@ -16,17 +16,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:923
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:919
 #, c-format
 msgid "Passphrase for wireless network %s"
 msgstr "Frase secreta para rede sem fio %s"
 
-#: ../gnome/applet/applet-dbus.c:259
+#: ../gnome/applet/applet-dbus.c:265
 #, c-format
 msgid "Connection to the wireless network '%s' failed."
 msgstr "A conexão com a rede sem fio '%s' falhou."
 
-#: ../gnome/applet/applet-dbus.c:264
+#: ../gnome/applet/applet-dbus.c:270
 msgid "Connection to the wired network failed."
 msgstr "A conexão à rede com fios falhou."
 
@@ -34,93 +34,104 @@ msgstr "A conexão à rede com fios falhou."
 msgid "Error displaying connection information:"
 msgstr "Erro ao exibir as informações da conexão:"
 
-#: ../gnome/applet/applet.c:201
+#: ../gnome/applet/applet.c:202
 msgid "Could not find some required resources (the glade file)!"
-msgstr "Não foi possível encontrar alguns recursos requeridos (o arquivo glade não foi encontrado)."
+msgstr ""
+"Não foi possível encontrar alguns recursos requeridos (o arquivo glade não "
+"foi encontrado)."
 
-#: ../gnome/applet/applet.c:212
+#: ../gnome/applet/applet.c:213
 msgid "No active connections!"
 msgstr "Nenhuma conexão ativa!"
 
-#: ../gnome/applet/applet.c:229
+#: ../gnome/applet/applet.c:234
 #, c-format
 msgid "Wired Ethernet (%s)"
 msgstr "Ethernet Com Fios (%s)"
 
-#: ../gnome/applet/applet.c:231
+#: ../gnome/applet/applet.c:236
 #, c-format
 msgid "Wireless Ethernet (%s)"
 msgstr "Ethernet Sem Fio (%s)"
 
-#: ../gnome/applet/applet.c:328 ../gnome/applet/applet.c:353
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:362
 msgid "NetworkManager Applet"
 msgstr "Mini-aplicativo Gerenciador de Rede"
 
-#: ../gnome/applet/applet.c:330 ../gnome/applet/applet.c:355
+#: ../gnome/applet/applet.c:339 ../gnome/applet/applet.c:364
 msgid "Copyright © 2004-2005 Red Hat, Inc."
 msgstr "Copyright © 2004-2005 Red Hat, Inc."
 
-#: ../gnome/applet/applet.c:331 ../gnome/applet/applet.c:356
+#: ../gnome/applet/applet.c:340 ../gnome/applet/applet.c:365
 msgid ""
 "Notification area applet for managing your network devices and connections."
-msgstr "Mini-aplicativo da área de notificação para gerenciar seus dispositivos e conexões de rede."
+msgstr ""
+"Mini-aplicativo da área de notificação para gerenciar seus dispositivos e "
+"conexões de rede."
 
-#: ../gnome/applet/applet.c:334 ../gnome/applet/applet.c:361
+#: ../gnome/applet/applet.c:343 ../gnome/applet/applet.c:370
 msgid "translator-credits"
 msgstr "Raphael Higino <raphaelh@uai.com.br>"
 
-#: ../gnome/applet/applet.c:417
+#: ../gnome/applet/applet.c:426
 msgid "VPN Login Failure"
 msgstr "Falha ao se autenticar na VPN"
 
-#: ../gnome/applet/applet.c:418
+#: ../gnome/applet/applet.c:427
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a login failure."
-msgstr "Não foi possível iniciar a conexão VPN '%s' devido a uma falha de autenticação."
+msgstr ""
+"Não foi possível iniciar a conexão VPN '%s' devido a uma falha de "
+"autenticação."
 
-#: ../gnome/applet/applet.c:422
+#: ../gnome/applet/applet.c:431
 msgid "VPN Start Failure"
 msgstr "Falha ao iniciar a VPN"
 
-#: ../gnome/applet/applet.c:423
+#: ../gnome/applet/applet.c:432
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
 "program."
-msgstr "Não foi possível iniciar a conexão VPN '%s' devido a uma falha ao executar o programa de VPN."
+msgstr ""
+"Não foi possível iniciar a conexão VPN '%s' devido a uma falha ao executar o "
+"programa de VPN."
 
-#: ../gnome/applet/applet.c:427 ../gnome/applet/applet.c:437
+#: ../gnome/applet/applet.c:436 ../gnome/applet/applet.c:446
 msgid "VPN Connect Failure"
 msgstr "Falha ao conectar-se à VPN"
 
-#: ../gnome/applet/applet.c:428
+#: ../gnome/applet/applet.c:437
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a connection error."
-msgstr "Não foi possível iniciar a conexão VPN '%s' devido a um erro de conexão."
+msgstr ""
+"Não foi possível iniciar a conexão VPN '%s' devido a um erro de conexão."
 
-#: ../gnome/applet/applet.c:432
+#: ../gnome/applet/applet.c:441
 msgid "VPN Configuration Error"
 msgstr "Erro de configuração da VPN"
 
-#: ../gnome/applet/applet.c:433
+#: ../gnome/applet/applet.c:442
 #, c-format
 msgid "The VPN connection '%s' was not correctly configured."
 msgstr "A conexão VPN '%s' não foi configurada corretamente."
 
-#: ../gnome/applet/applet.c:438
+#: ../gnome/applet/applet.c:447
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' because the VPN server did not "
 "return an adequate network configuration."
-msgstr "Não foi possível iniciar a conexão VPN '%s' porque o servidor VPN não retornou uma configuração de rede adequada."
+msgstr ""
+"Não foi possível iniciar a conexão VPN '%s' porque o servidor VPN não "
+"retornou uma configuração de rede adequada."
 
-#: ../gnome/applet/applet.c:505
+#: ../gnome/applet/applet.c:517
 msgid "VPN Login Message"
 msgstr "Mensagem de autenticação da VPN"
 
-#: ../gnome/applet/applet.c:729 ../gnome/applet/applet.c:2481
+#: ../gnome/applet/applet.c:741 ../gnome/applet/applet.c:2508
 #: ../gnome/applet/other-network-dialog.c:453
-#: ../gnome/applet/passphrase-dialog.c:227
+#: ../gnome/applet/passphrase-dialog.c:228
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
@@ -128,167 +139,169 @@ msgstr ""
 "O mini-aplicativo Gerenciador de Rede não pôde encontrar alguns recursos "
 "requeridos (o arquivo glade não foi encontrado)."
 
-#: ../gnome/applet/applet.c:741
+#: ../gnome/applet/applet.c:753
 #, c-format
 msgid "The network device \"%s (%s)\" does not support wireless scanning."
 msgstr "O dispositivo de rede \"%s (%s)\" não suporta varredura sem-fio."
 
-#: ../gnome/applet/applet.c:749
+#: ../gnome/applet/applet.c:761
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
 msgstr "O dispositivo de rede \"%s (%s)\" não suporta detecção de link."
 
-#: ../gnome/applet/applet.c:896
+#: ../gnome/applet/applet.c:908
 #, c-format
 msgid "Preparing device %s for the wired network..."
 msgstr "Preparando o dispositivo %s para a rede com fios..."
 
-#: ../gnome/applet/applet.c:898
+#: ../gnome/applet/applet.c:910
 #, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
 msgstr "Preparando o dispositivo %s para a rede com fios '%s'..."
 
-#: ../gnome/applet/applet.c:906
+#: ../gnome/applet/applet.c:918
 #, c-format
 msgid "Configuring device %s for the wired network..."
 msgstr "Configurando dispositivo %s para a rede com fios..."
 
-#: ../gnome/applet/applet.c:908
+#: ../gnome/applet/applet.c:920
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
 msgstr "Tentando se juntar à rede sem fio '%s'..."
 
-#: ../gnome/applet/applet.c:916
+#: ../gnome/applet/applet.c:928
 #, c-format
 msgid "Waiting for Network Key for the wireless network '%s'..."
 msgstr "Esperando a chave da rede sem fio '%s'..."
 
-#: ../gnome/applet/applet.c:924 ../gnome/applet/applet.c:934
+#: ../gnome/applet/applet.c:936 ../gnome/applet/applet.c:946
 msgid "Requesting a network address from the wired network..."
 msgstr "Requisitando um endereço de rede da rede com fios..."
 
-#: ../gnome/applet/applet.c:926 ../gnome/applet/applet.c:936
+#: ../gnome/applet/applet.c:938 ../gnome/applet/applet.c:948
 #, c-format
 msgid "Requesting a network address from the wireless network '%s'..."
 msgstr "Requisitando um endereço de rede da rede sem fios '%s'..."
 
-#: ../gnome/applet/applet.c:944
+#: ../gnome/applet/applet.c:956
 msgid "Finishing connection to the wired network..."
 msgstr "Terminando a conexão à rede com fios..."
 
-#: ../gnome/applet/applet.c:946
+#: ../gnome/applet/applet.c:958
 #, c-format
 msgid "Finishing connection to the wireless network '%s'..."
 msgstr "Terminando a conexão à rede sem fio '%s'..."
 
-#: ../gnome/applet/applet.c:1063
+#: ../gnome/applet/applet.c:1075
 msgid "NetworkManager is not running"
 msgstr "O Gerenciador de Rede não está sendo executado"
 
-#: ../gnome/applet/applet.c:1076 ../gnome/applet/applet.c:1808
+#: ../gnome/applet/applet.c:1083 ../gnome/applet/applet.c:1828
 msgid "Networking disabled"
 msgstr "Rede desabilitada"
 
-#: ../gnome/applet/applet.c:1081
+#: ../gnome/applet/applet.c:1088
 msgid "No network connection"
 msgstr "Nenhuma conexão de rede"
 
-#: ../gnome/applet/applet.c:1086
+#: ../gnome/applet/applet.c:1093
 msgid "Wired network connection"
 msgstr "Conexão de rede com fios"
 
-#: ../gnome/applet/applet.c:1090
+#: ../gnome/applet/applet.c:1097
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Conectado a uma rede sem fio Ad-Hoc"
 
-#: ../gnome/applet/applet.c:1092
+#: ../gnome/applet/applet.c:1099
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "Conexão de rede sem fio com '%s' (%d%%)"
 
-#: ../gnome/applet/applet.c:1112
+#: ../gnome/applet/applet.c:1120
 #, c-format
 msgid "VPN connection to '%s'"
 msgstr "Conexão VPN com '%s'"
 
-#: ../gnome/applet/applet.c:1120
+#: ../gnome/applet/applet.c:1128
 #, c-format
 msgid "VPN connecting to '%s'"
 msgstr "Estabelecendo conexão VPN com '%s'"
 
-#: ../gnome/applet/applet.c:1533
+#: ../gnome/applet/applet.c:1541
 msgid "_Connect to Other Wireless Network..."
 msgstr "_Conectar-se a Outra Rede Sem Fio..."
 
-#: ../gnome/applet/applet.c:1554
+#: ../gnome/applet/applet.c:1562
 msgid "Create _New Wireless Network..."
 msgstr "Criar _nova rede sem fio..."
 
-#: ../gnome/applet/applet.c:1675
+#: ../gnome/applet/applet.c:1685
 msgid "_VPN Connections"
 msgstr "Conexões _VPN"
 
-#: ../gnome/applet/applet.c:1710
+#: ../gnome/applet/applet.c:1730
 msgid "_Configure VPN..."
 msgstr "_Configurar VPN..."
 
-#: ../gnome/applet/applet.c:1714
+#: ../gnome/applet/applet.c:1734
 msgid "_Disconnect VPN..."
 msgstr "_Desconectar VPN..."
 
-#: ../gnome/applet/applet.c:1736
+#: ../gnome/applet/applet.c:1756
 msgid "_Dial Up Connections"
 msgstr "Conexões Discadas"
 
 #. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
-#: ../gnome/applet/applet.c:1747
+#: ../gnome/applet/applet.c:1767
 #, c-format
 msgid "Connect to %s..."
 msgstr "Conectar a %s..."
 
-#: ../gnome/applet/applet.c:1753
+#: ../gnome/applet/applet.c:1773
 #, c-format
 msgid "Disconnect from %s..."
 msgstr "Desconectar de %s..."
 
-#: ../gnome/applet/applet.c:1802
+#: ../gnome/applet/applet.c:1822
 msgid "No network devices have been found"
 msgstr "Nenhum dispositivo de rede foi encontrado"
 
-#: ../gnome/applet/applet.c:1994
+#: ../gnome/applet/applet.c:2014
 msgid "NetworkManager is not running..."
 msgstr "O Gerenciador de Rede não está sendo executado..."
 
 #. 'Enable Networking' item
-#: ../gnome/applet/applet.c:2150
+#: ../gnome/applet/applet.c:2170
 msgid "Enable _Networking"
 msgstr "_Habilitar Rede"
 
 #. 'Enable Wireless' item
-#: ../gnome/applet/applet.c:2156
+#: ../gnome/applet/applet.c:2176
 msgid "Enable _Wireless"
 msgstr "Habilitar Rede _Sem Fio"
 
 #. 'Connection Information' item
-#: ../gnome/applet/applet.c:2162
+#: ../gnome/applet/applet.c:2182
 msgid "Connection _Information"
 msgstr "_Informações da Conexão"
 
 #. Help item
-#: ../gnome/applet/applet.c:2173
+#: ../gnome/applet/applet.c:2193
 msgid "_Help"
 msgstr "Aj_uda"
 
 #. About item
-#: ../gnome/applet/applet.c:2182
+#: ../gnome/applet/applet.c:2202
 msgid "_About"
 msgstr "_Sobre"
 
-#: ../gnome/applet/applet.c:2600
+#: ../gnome/applet/applet.c:2667
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
-msgstr "O mini-aplicativo Gerenciador de Rede não pôde encontrar alguns recursos requeridos. Não é possível continuar.\n"
+msgstr ""
+"O mini-aplicativo Gerenciador de Rede não pôde encontrar alguns recursos "
+"requeridos. Não é possível continuar.\n"
 
 #: ../gnome/applet/wireless-security-option.c:157
 msgid "Open System"
@@ -298,59 +311,68 @@ msgstr "Sistema Aberto"
 msgid "Shared Key"
 msgstr "Chave Compartilhada"
 
-#: ../gnome/applet/wireless-security-option.c:209
+#: ../gnome/applet/wireless-security-option.c:208
 msgid "Automatic (Default)"
 msgstr "Automático (Padrão)"
 
-#: ../gnome/applet/wireless-security-option.c:216
+#: ../gnome/applet/wireless-security-option.c:215
+msgid "AES-CCMP"
+msgstr "AES-CCMP"
+
+#: ../gnome/applet/wireless-security-option.c:223
 msgid "TKIP"
 msgstr "TKIP"
 
-#: ../gnome/applet/wireless-security-option.c:224
-msgid "AES-CCMP"
-msgstr "AES-CCMP"
+#: ../gnome/applet/wireless-security-option.c:231
+msgid "Dynamic WEP"
+msgstr ""
 
 #: ../gnome/applet/wso-none.c:53
 msgid "None"
 msgstr "Nenhuma"
 
-#: ../gnome/applet/wso-wep-ascii.c:127
-msgid "WEP 40/128-bit ASCII"
+#: ../gnome/applet/wso-wep-ascii.c:138
+#, fuzzy
+msgid "WEP 64/128-bit ASCII"
 msgstr "WEP de 40/128 bits ASCII"
 
-#: ../gnome/applet/wso-wep-hex.c:124
-msgid "WEP 40/128-bit hex"
+#: ../gnome/applet/wso-wep-hex.c:135
+#, fuzzy
+msgid "WEP 64/128-bit Hex"
 msgstr "WEP de 40/128 bits hexa"
 
-#: ../gnome/applet/wso-wep-passphrase.c:124
-msgid "WEP Passphrase"
+#: ../gnome/applet/wso-wep-passphrase.c:135
+#, fuzzy
+msgid "WEP 128-bit Passphrase"
 msgstr "Frase Secreta WEP"
 
-#: ../gnome/applet/wso-wpa-eap.c:202
+#: ../gnome/applet/wso-wpa-eap.c:237
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../gnome/applet/wso-wpa-eap.c:203
+#: ../gnome/applet/wso-wpa-eap.c:238
 msgid "TLS"
 msgstr "TLS"
 
-#: ../gnome/applet/wso-wpa-eap.c:204
+#: ../gnome/applet/wso-wpa-eap.c:239
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../gnome/applet/wso-wpa-eap.c:212
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
+#: ../src/nm-ap-security-wpa-eap.c:116
 msgid "WPA2 Enterprise"
 msgstr "WPA2 Empresas"
 
-#: ../gnome/applet/wso-wpa-eap.c:214
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
+#: ../src/nm-ap-security-wpa-eap.c:121
 msgid "WPA Enterprise"
 msgstr "WPA Empresas"
 
-#: ../gnome/applet/wso-wpa-psk.c:166
+#: ../gnome/applet/wso-wpa-psk.c:178
 msgid "WPA2 Personal"
 msgstr "WPA2 Pessoal"
 
-#: ../gnome/applet/wso-wpa-psk.c:168
+#: ../gnome/applet/wso-wpa-psk.c:180
 msgid "WPA Personal"
 msgstr "WPA Pessoal"
 
@@ -362,29 +384,29 @@ msgstr "Orientação"
 msgid "The orientation of the tray."
 msgstr "A orientação da bandeja."
 
-#: ../gnome/applet/menu-items.c:87
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Rede Com Fios (%s)"
 
-#: ../gnome/applet/menu-items.c:90
+#: ../gnome/applet/menu-items.c:91
 msgid "_Wired Network"
 msgstr "_Rede Com Fios"
 
-#: ../gnome/applet/menu-items.c:161
+#: ../gnome/applet/menu-items.c:162
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
 msgstr[0] "Rede Sem Fio (%s)"
 msgstr[1] "Redes Sem Fio (%s)"
 
-#: ../gnome/applet/menu-items.c:163
+#: ../gnome/applet/menu-items.c:164
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Rede Sem Fio"
 msgstr[1] "Redes Sem Fio"
 
-#: ../gnome/applet/menu-items.c:330
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr " (Unicode inválido)"
 
@@ -393,7 +415,9 @@ msgstr " (Unicode inválido)"
 msgid ""
 "By default, the wireless network's name is set to your computer's name, %s, "
 "with no encryption enabled"
-msgstr "Por padrão, o nome da rede sem fio é definido com o nome do seu computador, %s, sem nenhuma criptografia habilitada"
+msgstr ""
+"Por padrão, o nome da rede sem fio é definido com o nome do seu computador, %"
+"s, sem nenhuma criptografia habilitada"
 
 #: ../gnome/applet/other-network-dialog.c:358
 msgid "Create new wireless network"
@@ -403,7 +427,9 @@ msgstr "Criar nova rede sem fio"
 msgid ""
 "Enter the name and security settings of the wireless network you wish to "
 "create."
-msgstr "Digite o nome e as configurações de segurança da rede sem fio que você deseja criar."
+msgstr ""
+"Digite o nome e as configurações de segurança da rede sem fio que você "
+"deseja criar."
 
 #: ../gnome/applet/other-network-dialog.c:363
 msgid "Create New Wireless Network"
@@ -421,35 +447,41 @@ msgstr "Digite o nome da rede sem fio com a qual você deseja se conectar."
 msgid "Connect to Other Wireless Network"
 msgstr "Conectar a outra rede sem fio"
 
-#: ../gnome/applet/passphrase-dialog.c:214
+#: ../gnome/applet/passphrase-dialog.c:215
 msgid "Error connecting to wireless network"
 msgstr "Erro ao conectar à rede sem fio"
 
-#: ../gnome/applet/passphrase-dialog.c:215
+#: ../gnome/applet/passphrase-dialog.c:216
 msgid ""
 "The requested wireless network requires security capabilities unsupported by "
 "your hardware."
-msgstr "A rede sem fio solicitada requer capacidades de segurança não suportadas pelo seu hardware."
+msgstr ""
+"A rede sem fio solicitada requer capacidades de segurança não suportadas "
+"pelo seu hardware."
 
-#: ../gnome/applet/vpn-password-dialog.c:152
-#: ../gnome/applet/vpn-password-dialog.c:189
+#: ../gnome/applet/vpn-password-dialog.c:151
+#: ../gnome/applet/vpn-password-dialog.c:188
 #, c-format
 msgid "Cannot start VPN connection '%s'"
 msgstr "Não é possível iniciar a conexão VPN '%s'"
 
-#: ../gnome/applet/vpn-password-dialog.c:155
+#: ../gnome/applet/vpn-password-dialog.c:154
 #, c-format
 msgid ""
 "Could not find the authentication dialog for VPN connection type '%s'. "
 "Contact your system administrator."
-msgstr "Não foi possível encontrar o diálogo de autenticação para o tipo de conexão VPN '%s'. Entre em contato com o seu administrador de sistema."
+msgstr ""
+"Não foi possível encontrar o diálogo de autenticação para o tipo de conexão "
+"VPN '%s'. Entre em contato com o seu administrador de sistema."
 
-#: ../gnome/applet/vpn-password-dialog.c:192
+#: ../gnome/applet/vpn-password-dialog.c:191
 #, c-format
 msgid ""
 "There was a problem launching the authentication dialog for VPN connection "
 "type '%s'. Contact your system administrator."
-msgstr "Houve um problema ao executar o diálogo de autenticação para o tipo de conexão VPN '%s'. Entre em contato com o seu administrador de sistema."
+msgstr ""
+"Houve um problema ao executar o diálogo de autenticação para o tipo de "
+"conexão VPN '%s'. Entre em contato com o seu administrador de sistema."
 
 #: ../gnome/applet/applet.glade.h:1
 msgid " "
@@ -458,7 +490,8 @@ msgstr " "
 #: ../gnome/applet/applet.glade.h:2
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Informações da Conexão Ativa</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Informações da Conexão Ativa</span>"
 
 #: ../gnome/applet/applet.glade.h:4
 #, no-c-format
@@ -482,7 +515,8 @@ msgid ""
 "\n"
 "%s  It will not be completely functional."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Funcionalidade da Rede Reduzida</span>\n"
+"<span weight=\"bold\" size=\"larger\">Funcionalidade da Rede Reduzida</"
+"span>\n"
 "\n"
 "%s  Não será completamente funcional."
 
@@ -496,9 +530,12 @@ msgid ""
 "that this wireless network is secure, click the checkbox below and "
 "NetworkManager will not require confirmation on subsequent log ins."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Confirmação de Entrada em Rede Sem Fio</span>\n"
+"<span weight=\"bold\" size=\"larger\">Confirmação de Entrada em Rede Sem "
+"Fio</span>\n"
 "\n"
-"Você escolheu entrar na rede sem fio '%s'.  Se você tem certeza de que essa rede é segura, clique na caixa de verificação abaixo e o Gerenciador de Rede não vai mais pedir confirmação em conexões posteriores."
+"Você escolheu entrar na rede sem fio '%s'.  Se você tem certeza de que essa "
+"rede é segura, clique na caixa de verificação abaixo e o Gerenciador de Rede "
+"não vai mais pedir confirmação em conexões posteriores."
 
 #: ../gnome/applet/applet.glade.h:15
 msgid "Anonymous Identity:"
@@ -561,22 +598,28 @@ msgid "Interface:"
 msgstr "Interface:"
 
 #: ../gnome/applet/applet.glade.h:30
+#, fuzzy
+msgid "Key Type:"
+msgstr "Tipo:"
+
+#: ../gnome/applet/applet.glade.h:31
 msgid "Key:"
 msgstr "Chave:"
 
-#: ../gnome/applet/applet.glade.h:31
+#: ../gnome/applet/applet.glade.h:32
+#, fuzzy
 msgid ""
 "None\n"
-"WEP Passphrase\n"
-"WEP 40/128-bit hex\n"
-"WEP 40/128-bit ASCII\n"
+"WEP 128-bit Passphrase\n"
+"WEP 64/128-bit Hex\n"
+"WEP 64/128-bit ASCII\n"
 msgstr ""
 "Nenhuma\n"
 "Frase secreta WEP\n"
 "WEP 40/128 bits hexa\n"
 "WEP 40/128 bits ASCII\n"
 
-#: ../gnome/applet/applet.glade.h:36
+#: ../gnome/applet/applet.glade.h:37
 msgid ""
 "Open System\n"
 "Shared Key"
@@ -584,162 +627,175 @@ msgstr ""
 "Sistema Aberto\n"
 "Chave Compartilhada"
 
-#: ../gnome/applet/applet.glade.h:38
+#: ../gnome/applet/applet.glade.h:39
 msgid "Other Wireless Network..."
 msgstr "Outra Rede Sem Fio..."
 
-#: ../gnome/applet/applet.glade.h:39
+#: ../gnome/applet/applet.glade.h:40
 msgid "Passphrase:"
 msgstr "Frase Secreta:"
 
-#: ../gnome/applet/applet.glade.h:40
+#: ../gnome/applet/applet.glade.h:41
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../gnome/applet/applet.glade.h:41
+#: ../gnome/applet/applet.glade.h:42
 msgid "Primary DNS:"
 msgstr "DNS Primário:"
 
-#: ../gnome/applet/applet.glade.h:42
+#: ../gnome/applet/applet.glade.h:43
 msgid "Private Key File:"
 msgstr "Arquivo da Chave Privada:"
 
-#: ../gnome/applet/applet.glade.h:43
+#: ../gnome/applet/applet.glade.h:44
 msgid "Private Key Password:"
 msgstr "Senha da Chave Privada:"
 
-#: ../gnome/applet/applet.glade.h:44
+#: ../gnome/applet/applet.glade.h:45
 msgid "Secondary DNS:"
 msgstr "DNS Secondário:"
 
-#: ../gnome/applet/applet.glade.h:45
+#: ../gnome/applet/applet.glade.h:46
 msgid "Select the CA Certificate File"
 msgstr "Selecione o arquivo de certificado CA"
 
-#: ../gnome/applet/applet.glade.h:46
+#: ../gnome/applet/applet.glade.h:47
 msgid "Select the Client Certificate File"
 msgstr "Selecione o arquivo de certificado do cliente"
 
-#: ../gnome/applet/applet.glade.h:47
+#: ../gnome/applet/applet.glade.h:48
 msgid "Select the Private Key File"
 msgstr "Selecione o arquivo da chave privada"
 
-#: ../gnome/applet/applet.glade.h:48
+#: ../gnome/applet/applet.glade.h:49
+msgid "Show key"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:50
+#, fuzzy
+msgid "Show passphrase"
+msgstr "Frase Secreta:"
+
+#: ../gnome/applet/applet.glade.h:51
+#, fuzzy
+msgid "Show password"
+msgstr "Senha:"
+
+#: ../gnome/applet/applet.glade.h:52
+#, fuzzy
+msgid "Show passwords"
+msgstr "Senha:"
+
+#: ../gnome/applet/applet.glade.h:53
+msgid "Speed:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:54
 msgid "Subnet Mask:"
 msgstr "Máscara de Subrede:"
 
-#: ../gnome/applet/applet.glade.h:49
+#: ../gnome/applet/applet.glade.h:55
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../gnome/applet/applet.glade.h:50
+#: ../gnome/applet/applet.glade.h:56
 msgid "User Name:"
 msgstr "Nome do Usuário:"
 
-#: ../gnome/applet/applet.glade.h:51
+#: ../gnome/applet/applet.glade.h:57
 msgid "Wireless Network Key Required"
 msgstr "Chave da Rede Sem Fio Requerida"
 
-#: ../gnome/applet/applet.glade.h:52
+#: ../gnome/applet/applet.glade.h:58
 msgid "Wireless _adapter:"
 msgstr "_Adaptador sem fio:"
 
-#: ../gnome/applet/applet.glade.h:53
+#: ../gnome/applet/applet.glade.h:59
 msgid "_Always Trust this Wireless Network"
 msgstr "_Sempre confiar nesta rede sem fio"
 
-#: ../gnome/applet/applet.glade.h:54
+#: ../gnome/applet/applet.glade.h:60
 msgid "_Don't remind me again"
 msgstr "_Não se lembre de mim novamente"
 
-#: ../gnome/applet/applet.glade.h:55
+#: ../gnome/applet/applet.glade.h:61
 msgid "_Login to Network"
 msgstr "_Entrar na rede"
 
-#: ../gnome/applet/applet.glade.h:56
+#: ../gnome/applet/applet.glade.h:62
 msgid "_Network Name:"
 msgstr "_Nome da Rede:"
 
-#: ../gnome/applet/applet.glade.h:57
+#: ../gnome/applet/applet.glade.h:63
 msgid "_Wireless Security:"
 msgstr "_Segurança Sem Fio:"
 
-#: ../gnome/applet/applet.glade.h:58
-msgid "leap_subwindow"
-msgstr "leap_subwindow"
-
-#: ../gnome/applet/applet.glade.h:59
-msgid "wep_key_subwindow"
-msgstr "wep_key_subwindow"
-
-#: ../gnome/applet/applet.glade.h:60
-msgid "wep_passphrase_subwindow"
-msgstr "wep_passphrase_subwindow"
-
-#: ../gnome/applet/applet.glade.h:61
-msgid "wpa_eap_subwindow"
-msgstr "wpa_eap_subwindow"
-
-#: ../gnome/applet/applet.glade.h:62
-msgid "wpa_psk_subwindow"
-msgstr "wpa_psk_subwindow"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.c:358
+#: ../gnome/vpn-properties/nm-vpn-properties.c:383
 msgid "Cannot add VPN connection"
 msgstr "Não é possível adicionar conexão VPN"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:360
+#: ../gnome/vpn-properties/nm-vpn-properties.c:385
 msgid ""
 "No suitable VPN software was found on your system. Contact your system "
 "administrator."
-msgstr "Nenhum software de VPN apropriado foi encontrado no seu sistema. Entre em contato com o seu administrador de sistema."
+msgstr ""
+"Nenhum software de VPN apropriado foi encontrado no seu sistema. Entre em "
+"contato com o seu administrador de sistema."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:411
+#: ../gnome/vpn-properties/nm-vpn-properties.c:437
 msgid "Cannot import VPN connection"
 msgstr "Não é possível importar conexão VPN"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:413
+#: ../gnome/vpn-properties/nm-vpn-properties.c:439
 #, c-format
 msgid ""
 "Cannot find suitable software for VPN connection type '%s' to import the "
 "file '%s'. Contact your system administrator."
-msgstr "Não é possível encontrar o software adequado para o tipo de conexão VPN '%s' importar o arquivo '%s'. Entre em contato com o seu administrador de sistema."
+msgstr ""
+"Não é possível encontrar o software adequado para o tipo de conexão VPN '%s' "
+"importar o arquivo '%s'. Entre em contato com o seu administrador de sistema."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:553
+#: ../gnome/vpn-properties/nm-vpn-properties.c:579
 #, c-format
 msgid "Error retrieving VPN connection '%s'"
 msgstr "Erro ao recuperar a conexão VPN '%s'"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:556
+#: ../gnome/vpn-properties/nm-vpn-properties.c:582
 #, c-format
 msgid ""
 "Could not find the UI files for VPN connection type '%s'. Contact your "
 "system administrator."
-msgstr "Não foi possível encontrar os arquivos de interface para o tipo de conexão VPN '%s'. Entre em contato com o seu administrador de sistema."
+msgstr ""
+"Não foi possível encontrar os arquivos de interface para o tipo de conexão "
+"VPN '%s'. Entre em contato com o seu administrador de sistema."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:713
+#: ../gnome/vpn-properties/nm-vpn-properties.c:739
 #, c-format
 msgid "Delete VPN connection \"%s\"?"
 msgstr "Excluir a conexão VPN \"%s\"?"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:716
+#: ../gnome/vpn-properties/nm-vpn-properties.c:742
 #, c-format
 msgid ""
 "All information about the VPN connection \"%s\" will be lost and you may "
 "need your system administrator to provide information to create a new "
 "connection."
-msgstr "Todas as informações sobre a conexão VPN \"%s\" serão perdidas e você pode precisar que o seu administrador de sistema forneca informações para criar uma nova conexão."
+msgstr ""
+"Todas as informações sobre a conexão VPN \"%s\" serão perdidas e você pode "
+"precisar que o seu administrador de sistema forneca informações para criar "
+"uma nova conexão."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:924
+#: ../gnome/vpn-properties/nm-vpn-properties.c:959
 msgid "Unable to load"
 msgstr "Impossível carregar"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:926
+#: ../gnome/vpn-properties/nm-vpn-properties.c:961
 msgid "Cannot find some needed resources (the glade file)!"
-msgstr "Não foi possível encontrar alguns recursos necessários (o arquivo glade)."
+msgstr ""
+"Não foi possível encontrar alguns recursos necessários (o arquivo glade)."
 
 #. Edit dialog
-#: ../gnome/vpn-properties/nm-vpn-properties.c:1034
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
 msgid "Edit VPN Connection"
 msgstr "Editar conexões VPN"
 
@@ -803,19 +859,22 @@ msgid ""
 "It will require some information, such as IP addresses and secrets.  Please "
 "see your system administrator to obtain this information."
 msgstr ""
-"Este assistente o guiará através da criação de uma conexão com uma Rede Privada Virtual (VPN).\n"
+"Este assistente o guiará através da criação de uma conexão com uma Rede "
+"Privada Virtual (VPN).\n"
 "\n"
-"Serão necessárias algumas informações, tais como endereços IP e segredos. Por favor, entre em contato com o seu administrador de sistema para obter essas informações."
+"Serão necessárias algumas informações, tais como endereços IP e segredos. "
+"Por favor, entre em contato com o seu administrador de sistema para obter "
+"essas informações."
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:17
 msgid "VPN Connections"
 msgstr "Conexões VPN"
 
-#: ../src/nm-ap-security-wep.c:47
+#: ../src/nm-ap-security-wep.c:52
 msgid "40-bit WEP"
 msgstr "WEP de 40 bits"
 
-#: ../src/nm-ap-security-wep.c:49
+#: ../src/nm-ap-security-wep.c:54
 msgid "104-bit WEP"
 msgstr "WEP de 104 bits"
 
@@ -843,7 +902,7 @@ msgstr "WPA2 CCMP"
 msgid "WPA2 Automatic"
 msgstr "WPA2 Automático"
 
-#: ../src/nm-ap-security.c:305
+#: ../src/nm-ap-security.c:320
 msgid "none"
 msgstr "nenhuma"
 
@@ -851,13 +910,17 @@ msgstr "nenhuma"
 #, c-format
 msgid ""
 "unable to create netlink socket for monitoring wired ethernet devices - %s"
-msgstr "impossível criar o socket netlink para monitorar dispositivos de ethernet com fios - %s"
+msgstr ""
+"impossível criar o socket netlink para monitorar dispositivos de ethernet "
+"com fios - %s"
 
 #: ../src/nm-netlink-monitor.c:172
 #, c-format
 msgid ""
 "unable to bind to netlink socket for monitoring wired ethernet devices - %s"
-msgstr "impossível se associar ao socket netlink para monitorar dispositivos de ethernet com fios - %s"
+msgstr ""
+"impossível se associar ao socket netlink para monitorar dispositivos de "
+"ethernet com fios - %s"
 
 #: ../src/nm-netlink-monitor.c:405
 msgid "operation took too long"
@@ -879,6 +942,50 @@ msgstr "dados demais foram recebidos pelo socket e alguns deles foram perdidos"
 msgid "error occurred while waiting for data on socket"
 msgstr "ocorreu um erro ao esperar por dados no socket"
 
+#: ../gnome/applet/applet-dbus-devices.c:898
+#, fuzzy, c-format
+msgid "You are now connected to the Ad-Hoc wireless network '%s'."
+msgstr "Conectado a uma rede sem fio Ad-Hoc"
+
+#: ../gnome/applet/applet-dbus-devices.c:903
+#, fuzzy, c-format
+msgid "You are now connected to the wireless network '%s'."
+msgstr "Terminando a conexão à rede sem fio '%s'..."
+
+#: ../gnome/applet/applet-dbus-devices.c:910
+#, fuzzy
+msgid "You are now connected to the wired network."
+msgstr "Terminando a conexão à rede com fios..."
+
+#: ../gnome/applet/applet-dbus-devices.c:916
+msgid "Connection Established"
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:959
+#, fuzzy
+msgid "Disconnected"
+msgstr "_Desconectar VPN..."
+
+#: ../gnome/applet/applet-dbus-devices.c:960
+#, fuzzy
+msgid "The network connection has been disconnected."
+msgstr "Atualmente nenhuma conexão de rede está ativa..."
+
+#~ msgid "leap_subwindow"
+#~ msgstr "leap_subwindow"
+
+#~ msgid "wep_key_subwindow"
+#~ msgstr "wep_key_subwindow"
+
+#~ msgid "wep_passphrase_subwindow"
+#~ msgstr "wep_passphrase_subwindow"
+
+#~ msgid "wpa_eap_subwindow"
+#~ msgstr "wpa_eap_subwindow"
+
+#~ msgid "wpa_psk_subwindow"
+#~ msgstr "wpa_psk_subwindow"
+
 #~ msgid "Modify Wireless Networks"
 #~ msgstr "Modificar Redes Sem Fio"
 
@@ -895,8 +1002,20 @@ msgstr "ocorreu um erro ao esperar por dados no socket"
 #~ msgid "There are no network devices..."
 #~ msgstr "Não há nenhum dispositivo de rede..."
 
-#~ msgid "No network connection is currently active..."
-#~ msgstr "Atualmente nenhuma conexão de rede está ativa..."
-
 #~ msgid "A wired network connection is currently active..."
 #~ msgstr "Atualmente uma conexão de rede com fios está ativa..."
+
+#~ msgid "Stop automatically running the networking applet?"
+#~ msgstr "Parar execução automática do applet de rede?"
+
+#~ msgid ""
+#~ "The networking applet will now terminate, but will automatically launch "
+#~ "the next time you login.  Would you like to stop automatically running "
+#~ "the networking applet on login?"
+#~ msgstr ""
+#~ "O applet de rede será concluído agora, mas será iniciado automaticamente "
+#~ "da próxima vez que você efetuar login. Deseja parar a execução automática "
+#~ "do applet de rede no login?"
+
+#~ msgid "_Remove"
+#~ msgstr "_Remover"
diff --git a/po/rw.po b/po/rw.po
index 05d92b3813..7b21c6270f 100644
--- a/po/rw.po
+++ b/po/rw.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-04-01 16:22-0700\n"
+"POT-Creation-Date: 2006-05-29 18:33+0200\n"
 "PO-Revision-Date: 2005-03-31 20:55-0700\n"
 "Last-Translator: Steve Murphy <murf@e-tools.com>\n"
 "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
@@ -25,306 +25,498 @@ msgstr ""
 "ULL NAME <EMAIL@ADDRESS>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: info-daemon/networks.glade.h:1
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:919
+#, fuzzy, c-format
+msgid "Passphrase for wireless network %s"
+msgstr "Gishya urusobe"
+
+#: ../gnome/applet/applet-dbus.c:265
+#, fuzzy, c-format
+msgid "Connection to the wireless network '%s' failed."
+msgstr "Kuri urusobe"
+
+#: ../gnome/applet/applet-dbus.c:270
 #, fuzzy
-msgid "<span weight=\"bold\">Wireless Networks:</span>"
-msgstr "<Uburemere UTSINDAGIYE"
+msgid "Connection to the wired network failed."
+msgstr "Kuri a urusobe"
 
-#: info-daemon/networks.glade.h:2
-msgid "Modify Wireless Networks"
+#: ../gnome/applet/applet.c:184
+msgid "Error displaying connection information:"
 msgstr ""
 
-#: info-daemon/passphrase.glade.h:1 panel-applet/applet.glade.h:2
-msgid "*"
-msgstr "*"
+#: ../gnome/applet/applet.c:202
+#, fuzzy
+msgid "Could not find some required resources (the glade file)!"
+msgstr "OYA Gushaka Bya ngombwa i IDOSIYE OYA Byabonetse"
 
-#: info-daemon/passphrase.glade.h:2
-msgid ""
-"128-bit Passphrase (WEP)\n"
-"Ascii Key (WEP)\n"
-"Hex Key (WEP)"
+#: ../gnome/applet/applet.c:213
+#, fuzzy
+msgid "No active connections!"
+msgstr "urusobe Ukwihuza"
+
+#: ../gnome/applet/applet.c:234
+#, c-format
+msgid "Wired Ethernet (%s)"
 msgstr ""
 
-#: info-daemon/passphrase.glade.h:6
-#, fuzzy, no-c-format
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
-"Network</span>\n"
-"\n"
-"A passphrase or encryption key is required to access the wireless network '%"
-"s'."
+#: ../gnome/applet/applet.c:236
+#, c-format
+msgid "Wireless Ethernet (%s)"
 msgstr ""
-"<Uburemere UTSINDAGIYE Ingano Kinini ku A Cyangwa Bishunzwe: Urufunguzo ni "
-"Bya ngombwa Kuri i urusobe"
 
-# #-#-#-#-#  sw.pot (PACKAGE VERSION)  #-#-#-#-#
-# sw/source\ui\index\cnttab.src:TP_TOX_SELECT.FT_SORTALG.text
-# #-#-#-#-#  sw.pot (PACKAGE VERSION)  #-#-#-#-#
-# sw/source\ui\misc\srtdlg.src:DLG_SORTING.FT_KEYTYP.text
-#: info-daemon/passphrase.glade.h:9
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:362
+msgid "NetworkManager Applet"
+msgstr ""
+
+#: ../gnome/applet/applet.c:339 ../gnome/applet/applet.c:364
 #, fuzzy
-msgid "Key Type:"
-msgstr "Ubwoko bw'agakandisho"
+msgid "Copyright © 2004-2005 Red Hat, Inc."
+msgstr "C"
 
-#: info-daemon/passphrase.glade.h:10
-#: info-daemon/NetworkManagerInfoPassphraseDialog.c:140
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:150
-#: panel-applet/essid.glade.h:7 panel-applet/applet.glade.h:19
-msgid "Passphrase:"
+#: ../gnome/applet/applet.c:340 ../gnome/applet/applet.c:365
+#, fuzzy
+msgid ""
+"Notification area applet for managing your network devices and connections."
+msgstr "Ubuso Apuleti... kugirango urusobe Na Ukwihuza"
+
+#: ../gnome/applet/applet.c:343 ../gnome/applet/applet.c:370
+msgid "translator-credits"
 msgstr ""
 
-#: info-daemon/passphrase.glade.h:11
-msgid "Wireless Network Key Required"
+#: ../gnome/applet/applet.c:426
+msgid "VPN Login Failure"
 msgstr ""
 
-#: info-daemon/passphrase.glade.h:12 panel-applet/applet.glade.h:22
-#, fuzzy
-msgid "_Login to Network"
-msgstr "Kuri"
+#: ../gnome/applet/applet.c:427
+#, c-format
+msgid "Could not start the VPN connection '%s' due to a login failure."
+msgstr ""
+
+#: ../gnome/applet/applet.c:431
+msgid "VPN Start Failure"
+msgstr ""
 
-#: info-daemon/NetworkManagerInfoPassphraseDialog.c:143
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:153
-msgid "Ascii Key:"
+#: ../gnome/applet/applet.c:432
+#, c-format
+msgid ""
+"Could not start the VPN connection '%s' due to a failure launching the VPN "
+"program."
 msgstr ""
 
-#: info-daemon/NetworkManagerInfoPassphraseDialog.c:146
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:156
-msgid "Hex Key:"
+#: ../gnome/applet/applet.c:436 ../gnome/applet/applet.c:446
+msgid "VPN Connect Failure"
 msgstr ""
 
-#: info-daemon/NetworkManagerInfoVPN.c:158
-#, fuzzy, c-format
-msgid "You must log in to access the private network %s"
-msgstr "LOG in Kuri i By'umwihariko urusobe"
+#: ../gnome/applet/applet.c:437
+#, c-format
+msgid "Could not start the VPN connection '%s' due to a connection error."
+msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:149 panel-applet/NMWirelessApplet.c:167
-msgid "NetworkManager Applet"
+#: ../gnome/applet/applet.c:441
+msgid "VPN Configuration Error"
 msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:151 panel-applet/NMWirelessApplet.c:169
-#, fuzzy
-msgid "Copyright (C) 2004-2005 Red Hat, Inc."
-msgstr "C"
+#: ../gnome/applet/applet.c:442
+#, c-format
+msgid "The VPN connection '%s' was not correctly configured."
+msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:152 panel-applet/NMWirelessApplet.c:170
-#, fuzzy
+#: ../gnome/applet/applet.c:447
+#, c-format
 msgid ""
-"Notification area applet for managing your network devices and connections."
-msgstr "Ubuso Apuleti... kugirango urusobe Na Ukwihuza"
+"Could not start the VPN connection '%s' because the VPN server did not "
+"return an adequate network configuration."
+msgstr ""
+
+#: ../gnome/applet/applet.c:517
+msgid "VPN Login Message"
+msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:384 panel-applet/NMWirelessApplet.c:1523
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:319
+#: ../gnome/applet/applet.c:741 ../gnome/applet/applet.c:2508
+#: ../gnome/applet/other-network-dialog.c:453
+#: ../gnome/applet/passphrase-dialog.c:228
 #, fuzzy
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
 msgstr "OYA Gushaka Bya ngombwa i IDOSIYE OYA Byabonetse"
 
-#: panel-applet/NMWirelessApplet.c:395
+#: ../gnome/applet/applet.c:753
 #, fuzzy, c-format
 msgid "The network device \"%s (%s)\" does not support wireless scanning."
 msgstr "urusobe APAREYE OYA Gushigikira"
 
-#: panel-applet/NMWirelessApplet.c:403
+#: ../gnome/applet/applet.c:761
 #, fuzzy, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
 msgstr "urusobe APAREYE OYA Gushigikira Ihuza"
 
-#: panel-applet/NMWirelessApplet.c:627
+#: ../gnome/applet/applet.c:908
+#, fuzzy, c-format
+msgid "Preparing device %s for the wired network..."
+msgstr "Kuri a urusobe"
+
+#: ../gnome/applet/applet.c:910
+#, fuzzy, c-format
+msgid "Preparing device %s for the wireless network '%s'..."
+msgstr "Kuri urusobe"
+
+#: ../gnome/applet/applet.c:918
+#, fuzzy, c-format
+msgid "Configuring device %s for the wired network..."
+msgstr "Kuri a urusobe"
+
+#: ../gnome/applet/applet.c:920
+#, fuzzy, c-format
+msgid "Attempting to join the wireless network '%s'..."
+msgstr "Kuri urusobe"
+
+#: ../gnome/applet/applet.c:928
+#, fuzzy, c-format
+msgid "Waiting for Network Key for the wireless network '%s'..."
+msgstr "Kuri urusobe"
+
+#: ../gnome/applet/applet.c:936 ../gnome/applet/applet.c:946
+#, fuzzy
+msgid "Requesting a network address from the wired network..."
+msgstr "Kuri a urusobe"
+
+#: ../gnome/applet/applet.c:938 ../gnome/applet/applet.c:948
+#, fuzzy, c-format
+msgid "Requesting a network address from the wireless network '%s'..."
+msgstr "Kuri urusobe"
+
+#: ../gnome/applet/applet.c:956
+#, fuzzy
+msgid "Finishing connection to the wired network..."
+msgstr "Kuri a urusobe"
+
+#: ../gnome/applet/applet.c:958
+#, fuzzy, c-format
+msgid "Finishing connection to the wireless network '%s'..."
+msgstr "Kuri urusobe"
+
+#: ../gnome/applet/applet.c:1075
+#, fuzzy
+msgid "NetworkManager is not running"
+msgstr "ni OYA"
+
+#: ../gnome/applet/applet.c:1083 ../gnome/applet/applet.c:1828
+msgid "Networking disabled"
+msgstr ""
+
+#: ../gnome/applet/applet.c:1088
 #, fuzzy
 msgid "No network connection"
 msgstr "urusobe Ukwihuza"
 
-#: panel-applet/NMWirelessApplet.c:632
+#: ../gnome/applet/applet.c:1093
 #, fuzzy
 msgid "Wired network connection"
 msgstr "urusobe Ukwihuza"
 
-#: panel-applet/NMWirelessApplet.c:637
-#, fuzzy
-msgid "Connecting to a wired network..."
-msgstr "Kuri a urusobe"
-
-#: panel-applet/NMWirelessApplet.c:646
+#: ../gnome/applet/applet.c:1097
 #, fuzzy
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Kuri urusobe"
 
-#: panel-applet/NMWirelessApplet.c:660
+#: ../gnome/applet/applet.c:1099
 #, fuzzy, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "urusobe Ukwihuza Kuri"
 
-#: panel-applet/NMWirelessApplet.c:665
-#, fuzzy
-msgid "Wireless network connection"
-msgstr "urusobe Ukwihuza"
+#: ../gnome/applet/applet.c:1120
+#, c-format
+msgid "VPN connection to '%s'"
+msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:670
-#, fuzzy, c-format
-msgid "Connecting to wireless network '%s'..."
-msgstr "Kuri urusobe"
+#: ../gnome/applet/applet.c:1128
+#, c-format
+msgid "VPN connecting to '%s'"
+msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:676
+#: ../gnome/applet/applet.c:1541
 #, fuzzy
-msgid "NetworkManager is not running"
-msgstr "ni OYA"
+msgid "_Connect to Other Wireless Network..."
+msgstr "Kuri urusobe"
 
-#: panel-applet/NMWirelessApplet.c:681
+#: ../gnome/applet/applet.c:1562
 #, fuzzy
-msgid "Scanning for wireless networks..."
-msgstr "kugirango"
+msgid "Create _New Wireless Network..."
+msgstr "Gishya"
 
-#: panel-applet/NMWirelessApplet.c:1046
-msgid "Other Wireless Networks..."
+#: ../gnome/applet/applet.c:1685
+msgid "_VPN Connections"
 msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:1067
-#, fuzzy
-msgid "Create new Wireless Network..."
-msgstr "Gishya"
+#: ../gnome/applet/applet.c:1730
+msgid "_Configure VPN..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1734
+msgid "_Disconnect VPN..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1756
+msgid "_Dial Up Connections"
+msgstr ""
+
+#. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
+#: ../gnome/applet/applet.c:1767
+#, c-format
+msgid "Connect to %s..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1773
+#, c-format
+msgid "Disconnect from %s..."
+msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:1143
+#: ../gnome/applet/applet.c:1822
 #, fuzzy
 msgid "No network devices have been found"
 msgstr "urusobe Byabonetse"
 
-#: panel-applet/NMWirelessApplet.c:1285
+#: ../gnome/applet/applet.c:2014
 #, fuzzy
 msgid "NetworkManager is not running..."
 msgstr "ni OYA"
 
-#: panel-applet/NMWirelessApplet.c:1355 panel-applet/NMWirelessApplet.c:1403
-msgid "Pause Wireless Scanning"
+#. 'Enable Networking' item
+#: ../gnome/applet/applet.c:2170
+msgid "Enable _Networking"
 msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:1360
-msgid "Resume Wireless Scanning"
+#. 'Enable Wireless' item
+#: ../gnome/applet/applet.c:2176
+msgid "Enable _Wireless"
 msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:1370 panel-applet/NMWirelessApplet.c:1409
-msgid "Stop All Wireless Devices"
+#. 'Connection Information' item
+#: ../gnome/applet/applet.c:2182
+msgid "Connection _Information"
 msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:1375
-#, fuzzy
-msgid "Start All Wireless Devices"
-msgstr "Gutangira"
-
 # scp/source\office\profile.lng:STR_VALUE_TEMPLATE_SERVICES_HELP.text
-#: panel-applet/NMWirelessApplet.c:1418
-msgid "Help"
+#. Help item
+#: ../gnome/applet/applet.c:2193
+#, fuzzy
+msgid "_Help"
 msgstr "Ifashayobora"
 
-#: panel-applet/NMWirelessApplet.c:1425
-msgid "About"
-msgstr "Bigyanye"
-
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:232
+#. About item
+#: ../gnome/applet/applet.c:2202
 #, fuzzy
-msgid "Create new wireless network"
-msgstr "Gishya urusobe"
+msgid "_About"
+msgstr "Bigyanye"
 
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:233
+#: ../gnome/applet/applet.c:2667
 #, fuzzy
 msgid ""
-"Enter the ESSID and security settings of the wireless network you wish to "
-"create."
-msgstr "i Na Umutekano Amagenamiterere Bya i urusobe Kuri Kurema"
+"The NetworkManager applet could not find some required resources.  It cannot "
+"continue.\n"
+msgstr "OYA Gushaka Bya ngombwa i IDOSIYE OYA Byabonetse"
 
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:238
-#, fuzzy
-msgid "Custom wireless network"
-msgstr "Kugena urusobe"
+#: ../gnome/applet/wireless-security-option.c:157
+msgid "Open System"
+msgstr ""
 
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:239
-#, fuzzy
-msgid "Enter the ESSID of the wireless network to which you wish to connect."
-msgstr "i Bya i urusobe Kuri Kuri Kwihuza"
+#: ../gnome/applet/wireless-security-option.c:160
+msgid "Shared Key"
+msgstr ""
 
-#: panel-applet/essid.glade.h:1 panel-applet/applet.glade.h:3
-#, fuzzy
-msgid ""
-"128-bit passphrase (WEP)\n"
-"Ascii key (WEP)\n"
-"Hex key (WEP)"
-msgstr "Urufunguzo Urufunguzo"
+#: ../gnome/applet/wireless-security-option.c:208
+msgid "Automatic (Default)"
+msgstr ""
 
-#: panel-applet/essid.glade.h:4 panel-applet/applet.glade.h:15
-#, fuzzy
-msgid "C_onnect"
-msgstr "Kwihuza"
+#: ../gnome/applet/wireless-security-option.c:215
+msgid "AES-CCMP"
+msgstr ""
 
-#: panel-applet/essid.glade.h:5 panel-applet/applet.glade.h:16
-#, fuzzy
-msgid "Connect with encryption enabled"
-msgstr "Na: Bishunzwe: Bikora"
+#: ../gnome/applet/wireless-security-option.c:223
+msgid "TKIP"
+msgstr ""
 
-# #-#-#-#-#  sw.pot (PACKAGE VERSION)  #-#-#-#-#
-# sw/source\ui\index\cnttab.src:TP_TOX_SELECT.FT_SORTALG.text
-# #-#-#-#-#  sw.pot (PACKAGE VERSION)  #-#-#-#-#
-# sw/source\ui\misc\srtdlg.src:DLG_SORTING.FT_KEYTYP.text
-#: panel-applet/essid.glade.h:6 panel-applet/applet.glade.h:18
-#, fuzzy
-msgid "Key type:"
-msgstr "Ubwoko bw'agakandisho"
+#: ../gnome/applet/wireless-security-option.c:231
+msgid "Dynamic WEP"
+msgstr ""
 
-#: panel-applet/essid.glade.h:8 panel-applet/applet.glade.h:20
-msgid "Wireless _adapter:"
+#: ../gnome/applet/wso-none.c:53
+msgid "None"
 msgstr ""
 
-#: panel-applet/essid.glade.h:9 panel-applet/applet.glade.h:21
+#: ../gnome/applet/wso-wep-ascii.c:138
+msgid "WEP 64/128-bit ASCII"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-hex.c:135
+msgid "WEP 64/128-bit Hex"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-passphrase.c:135
+msgid "WEP 128-bit Passphrase"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:237
+msgid "PEAP"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:238
+msgid "TLS"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:239
+msgid "TTLS"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
+#: ../src/nm-ap-security-wpa-eap.c:116
+msgid "WPA2 Enterprise"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
+#: ../src/nm-ap-security-wpa-eap.c:121
+msgid "WPA Enterprise"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-psk.c:178
+msgid "WPA2 Personal"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-psk.c:180
+msgid "WPA Personal"
+msgstr ""
+
+#: ../gnome/applet/eggtrayicon.c:134
+msgid "Orientation"
+msgstr "Icyerekezo"
+
+#: ../gnome/applet/eggtrayicon.c:135
 #, fuzzy
-msgid "Wireless _network:"
-msgstr "urusobe"
+msgid "The orientation of the tray."
+msgstr "Icyerekezo Bya i"
 
-#: panel-applet/menu-info.c:91
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
 msgstr ""
 
-#: panel-applet/menu-info.c:93
-msgid "Wired Network"
-msgstr ""
+#: ../gnome/applet/menu-items.c:91
+#, fuzzy
+msgid "_Wired Network"
+msgstr "urusobe"
 
-#: panel-applet/menu-info.c:166
+#: ../gnome/applet/menu-items.c:162
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: panel-applet/menu-info.c:168
+#: ../gnome/applet/menu-items.c:164
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: panel-applet/menu-info.c:294
+#: ../gnome/applet/menu-items.c:343
 #, fuzzy
 msgid " (invalid Unicode)"
 msgstr "(Sibyo"
 
-#: examples/python/systray/eggtrayicon.c:111 panel-applet/eggtrayicon.c:118
-msgid "Orientation"
-msgstr "Icyerekezo"
+#: ../gnome/applet/other-network-dialog.c:352
+#, c-format
+msgid ""
+"By default, the wireless network's name is set to your computer's name, %s, "
+"with no encryption enabled"
+msgstr ""
 
-#: examples/python/systray/eggtrayicon.c:112 panel-applet/eggtrayicon.c:119
+#: ../gnome/applet/other-network-dialog.c:358
 #, fuzzy
-msgid "The orientation of the tray."
-msgstr "Icyerekezo Bya i"
+msgid "Create new wireless network"
+msgstr "Gishya urusobe"
 
-# offmgr/source\offapp\intro\intro.hrc:TEXT_DEFAULTABOUT.text
-#: panel-applet/NMWirelessApplet.xml.h:1
+#: ../gnome/applet/other-network-dialog.c:359
 #, fuzzy
-msgid "_About..."
-msgstr "Ibyerekeye"
+msgid ""
+"Enter the name and security settings of the wireless network you wish to "
+"create."
+msgstr "i Na Umutekano Amagenamiterere Bya i urusobe Kuri Kurema"
 
-#: panel-applet/applet.glade.h:1
+#: ../gnome/applet/other-network-dialog.c:363
+#, fuzzy
+msgid "Create New Wireless Network"
+msgstr "Gishya"
+
+#: ../gnome/applet/other-network-dialog.c:368
+#, fuzzy
+msgid "Existing wireless network"
+msgstr "Kugena urusobe"
+
+#: ../gnome/applet/other-network-dialog.c:369
+#, fuzzy
+msgid "Enter the name of the wireless network to which you wish to connect."
+msgstr "i Bya i urusobe Kuri Kuri Kwihuza"
+
+#: ../gnome/applet/other-network-dialog.c:371
+#, fuzzy
+msgid "Connect to Other Wireless Network"
+msgstr "Kuri urusobe"
+
+#: ../gnome/applet/passphrase-dialog.c:215
+#, fuzzy
+msgid "Error connecting to wireless network"
+msgstr "Kuri urusobe"
+
+#: ../gnome/applet/passphrase-dialog.c:216
+msgid ""
+"The requested wireless network requires security capabilities unsupported by "
+"your hardware."
+msgstr ""
+
+#: ../gnome/applet/vpn-password-dialog.c:151
+#: ../gnome/applet/vpn-password-dialog.c:188
+#, c-format
+msgid "Cannot start VPN connection '%s'"
+msgstr ""
+
+#: ../gnome/applet/vpn-password-dialog.c:154
+#, c-format
+msgid ""
+"Could not find the authentication dialog for VPN connection type '%s'. "
+"Contact your system administrator."
+msgstr ""
+
+#: ../gnome/applet/vpn-password-dialog.c:191
+#, c-format
+msgid ""
+"There was a problem launching the authentication dialog for VPN connection "
+"type '%s'. Contact your system administrator."
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:1
 msgid " "
 msgstr " "
 
-#: panel-applet/applet.glade.h:7
+#: ../gnome/applet/applet.glade.h:2
+#, fuzzy
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
+msgstr "<Uburemere UTSINDAGIYE"
+
+#: ../gnome/applet/applet.glade.h:4
+#, fuzzy, no-c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
+"Network</span>\n"
+"\n"
+"A passphrase or encryption key is required to access the wireless network '%"
+"s'."
+msgstr ""
+"<Uburemere UTSINDAGIYE Ingano Kinini ku A Cyangwa Bishunzwe: Urufunguzo ni "
+"Bya ngombwa Kuri i urusobe"
+
+#: ../gnome/applet/applet.glade.h:8
 #, fuzzy, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
@@ -332,67 +524,563 @@ msgid ""
 "%s  It will not be completely functional."
 msgstr "<Uburemere UTSINDAGIYE Ingano Kinini OYA"
 
-#: panel-applet/applet.glade.h:11
+#: ../gnome/applet/applet.glade.h:12
 #, fuzzy, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
 "span>\n"
 "\n"
-"You have chosen log in to the wireless network '%s'.  If you are sure this "
-"wireless network is secure, click the checkbox below and NetworkManager will "
-"no longer pester you with stupid questions when you connect to it."
+"You have chosen to log in to the wireless network '%s'.  If you are sure "
+"that this wireless network is secure, click the checkbox below and "
+"NetworkManager will not require confirmation on subsequent log ins."
 msgstr ""
 "<Uburemere UTSINDAGIYE Ingano Kinini LOG in Kuri i urusobe iyi urusobe ni "
 "Kanda i munsi Na Oya Na: Ryari: Kwihuza Kuri"
 
-#: panel-applet/applet.glade.h:14
+#: ../gnome/applet/applet.glade.h:15
+msgid "Anonymous Identity:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:16
+#, fuzzy
+msgid "Authentication:"
+msgstr "Icyerekezo"
+
+#: ../gnome/applet/applet.glade.h:17
+msgid "Broadcast Address:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:18
+msgid "CA Certificate File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:19
+#, fuzzy
+msgid "C_onnect"
+msgstr "Kwihuza"
+
+#: ../gnome/applet/applet.glade.h:20
+msgid "Client Certificate File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:21
+msgid "Connection Information"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:22
+msgid "Default Route:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:23
+msgid "Destination Address:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:24
+msgid "Driver:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:25
+msgid "EAP Method:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:26
+msgid "Hardware Address:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:27
+msgid "IP Address:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:28
+msgid "Identity:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:29
+msgid "Interface:"
+msgstr ""
+
+# #-#-#-#-#  sw.pot (PACKAGE VERSION)  #-#-#-#-#
+# sw/source\ui\index\cnttab.src:TP_TOX_SELECT.FT_SORTALG.text
+# #-#-#-#-#  sw.pot (PACKAGE VERSION)  #-#-#-#-#
+# sw/source\ui\misc\srtdlg.src:DLG_SORTING.FT_KEYTYP.text
+#: ../gnome/applet/applet.glade.h:30
+#, fuzzy
+msgid "Key Type:"
+msgstr "Ubwoko bw'agakandisho"
+
+# #-#-#-#-#  sw.pot (PACKAGE VERSION)  #-#-#-#-#
+# sw/source\ui\index\cnttab.src:TP_TOX_SELECT.FT_SORTALG.text
+# #-#-#-#-#  sw.pot (PACKAGE VERSION)  #-#-#-#-#
+# sw/source\ui\misc\srtdlg.src:DLG_SORTING.FT_KEYTYP.text
+#: ../gnome/applet/applet.glade.h:31
+#, fuzzy
+msgid "Key:"
+msgstr "Ubwoko bw'agakandisho"
+
+#: ../gnome/applet/applet.glade.h:32
+msgid ""
+"None\n"
+"WEP 128-bit Passphrase\n"
+"WEP 64/128-bit Hex\n"
+"WEP 64/128-bit ASCII\n"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:37
+msgid ""
+"Open System\n"
+"Shared Key"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:39
+#, fuzzy
+msgid "Other Wireless Network..."
+msgstr "Gishya"
+
+#: ../gnome/applet/applet.glade.h:40
+msgid "Passphrase:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:41
+msgid "Password:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:42
+msgid "Primary DNS:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:43
+msgid "Private Key File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:44
+msgid "Private Key Password:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:45
+msgid "Secondary DNS:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:46
+msgid "Select the CA Certificate File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:47
+msgid "Select the Client Certificate File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:48
+msgid "Select the Private Key File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:49
+msgid "Show key"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:50
+msgid "Show passphrase"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:51
+msgid "Show password"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:52
+msgid "Show passwords"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:53
+msgid "Speed:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:54
+msgid "Subnet Mask:"
+msgstr ""
+
+# #-#-#-#-#  sw.pot (PACKAGE VERSION)  #-#-#-#-#
+# sw/source\ui\index\cnttab.src:TP_TOX_SELECT.FT_SORTALG.text
+# #-#-#-#-#  sw.pot (PACKAGE VERSION)  #-#-#-#-#
+# sw/source\ui\misc\srtdlg.src:DLG_SORTING.FT_KEYTYP.text
+#: ../gnome/applet/applet.glade.h:55
 #, fuzzy
-msgid "Always Trust this Wireless Network"
+msgid "Type:"
+msgstr "Ubwoko bw'agakandisho"
+
+#: ../gnome/applet/applet.glade.h:56
+msgid "User Name:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:57
+msgid "Wireless Network Key Required"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:58
+msgid "Wireless _adapter:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:59
+#, fuzzy
+msgid "_Always Trust this Wireless Network"
 msgstr "iyi"
 
-#: panel-applet/applet.glade.h:17
-msgid "Don't remind me again"
+#: ../gnome/applet/applet.glade.h:60
+msgid "_Don't remind me again"
 msgstr ""
 
-# crashrep/source\all\crashrep.lng:%OK_BUTTON%.text
-#: panel-applet/applet.glade.h:23
+#: ../gnome/applet/applet.glade.h:61
+#, fuzzy
+msgid "_Login to Network"
+msgstr "Kuri"
+
+#: ../gnome/applet/applet.glade.h:62
+msgid "_Network Name:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:63
+#, fuzzy
+msgid "_Wireless Security:"
+msgstr "urusobe"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:383
+msgid "Cannot add VPN connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:385
+msgid ""
+"No suitable VPN software was found on your system. Contact your system "
+"administrator."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:437
+#, fuzzy
+msgid "Cannot import VPN connection"
+msgstr "urusobe Ukwihuza"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:439
+#, c-format
+msgid ""
+"Cannot find suitable software for VPN connection type '%s' to import the "
+"file '%s'. Contact your system administrator."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:579
+#, c-format
+msgid "Error retrieving VPN connection '%s'"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:582
+#, c-format
+msgid ""
+"Could not find the UI files for VPN connection type '%s'. Contact your "
+"system administrator."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:739
+#, c-format
+msgid "Delete VPN connection \"%s\"?"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:742
+#, c-format
+msgid ""
+"All information about the VPN connection \"%s\" will be lost and you may "
+"need your system administrator to provide information to create a new "
+"connection."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:959
+msgid "Unable to load"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:961
+#, fuzzy
+msgid "Cannot find some needed resources (the glade file)!"
+msgstr "OYA Gushaka Bya ngombwa i IDOSIYE OYA Byabonetse"
+
+#. Edit dialog
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
+msgid "Edit VPN Connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:1
 #, fuzzy
-msgid "_OK"
-msgstr "YEGO"
+msgid "Add a new VPN connection"
+msgstr "urusobe Ukwihuza"
 
-#: src/nm-netlink-monitor.c:154
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:2
+msgid "Choose which type of VPN connection you wish to create."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
+#, fuzzy
+msgid "Connect to:"
+msgstr "Kwihuza"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
+msgid "Create VPN Connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
+msgid "Create VPN Connection - 1 of 2"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
+msgid "Create VPN Connection - 2 of 2"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
+msgid "Delete the selected VPN connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
+msgid "E_xport"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:9
+msgid "Edit the selected VPN connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:10
+msgid "Export the VPN settings to a file"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:11
+msgid "Export the selected VPN connection to a file"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:12
+msgid "Finish Creating VPN Connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:13
+#, fuzzy
+msgid "Manage Virtual Private Network Connections"
+msgstr "urusobe Ukwihuza"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:14
+msgid ""
+"This assistant will guide you through the creation of a connection to a "
+"Virtual Private Network (VPN).\n"
+"\n"
+"It will require some information, such as IP addresses and secrets.  Please "
+"see your system administrator to obtain this information."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:17
+#, fuzzy
+msgid "VPN Connections"
+msgstr "urusobe Ukwihuza"
+
+#: ../src/nm-ap-security-wep.c:52
+msgid "40-bit WEP"
+msgstr ""
+
+#: ../src/nm-ap-security-wep.c:54
+msgid "104-bit WEP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:50
+msgid "WPA TKIP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:52
+msgid "WPA CCMP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:54
+msgid "WPA Automatic"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:59
+msgid "WPA2 TKIP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:61
+msgid "WPA2 CCMP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:63
+msgid "WPA2 Automatic"
+msgstr ""
+
+#: ../src/nm-ap-security.c:320
+msgid "none"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:154
 #, fuzzy, c-format
 msgid ""
 "unable to create netlink socket for monitoring wired ethernet devices - %s"
 msgstr "Kuri Kurema kugirango"
 
-#: src/nm-netlink-monitor.c:172
+#: ../src/nm-netlink-monitor.c:172
 #, fuzzy, c-format
 msgid ""
 "unable to bind to netlink socket for monitoring wired ethernet devices - %s"
 msgstr "Kuri Kuri kugirango"
 
-#: src/nm-netlink-monitor.c:403
+#: ../src/nm-netlink-monitor.c:405
 msgid "operation took too long"
 msgstr ""
 
-#: src/nm-netlink-monitor.c:500
+#: ../src/nm-netlink-monitor.c:502
 #, fuzzy
 msgid "received data from wrong type of sender"
 msgstr "BYAKIRIWE Ibyatanzwe Bivuye Ubwoko Bya Uwohereza"
 
-#: src/nm-netlink-monitor.c:513
+#: ../src/nm-netlink-monitor.c:515
 #, fuzzy
 msgid "received data from unexpected sender"
 msgstr "BYAKIRIWE Ibyatanzwe Bivuye Uwohereza"
 
-# basctl/source\basicide\basidesh.src:RID_IMGBTN_REMOVEWATCH.text
-#: src/nm-netlink-monitor.c:535
-#, fuzzy, c-format
-msgid "%s"
-msgstr "%s"
-
-#: src/nm-netlink-monitor.c:644
+#: ../src/nm-netlink-monitor.c:646
 #, fuzzy
 msgid "too much data was sent over socket and some of it was lost"
 msgstr "Ibyatanzwe Yoherejwe: KURI Na Bya"
+
+#: ../src/nm-netlink-monitor.c:735
+msgid "error occurred while waiting for data on socket"
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:898
+#, fuzzy, c-format
+msgid "You are now connected to the Ad-Hoc wireless network '%s'."
+msgstr "Kuri urusobe"
+
+#: ../gnome/applet/applet-dbus-devices.c:903
+#, fuzzy, c-format
+msgid "You are now connected to the wireless network '%s'."
+msgstr "Kuri urusobe"
+
+#: ../gnome/applet/applet-dbus-devices.c:910
+#, fuzzy
+msgid "You are now connected to the wired network."
+msgstr "Kuri a urusobe"
+
+#: ../gnome/applet/applet-dbus-devices.c:916
+#, fuzzy
+msgid "Connection Established"
+msgstr "Na: Bishunzwe: Bikora"
+
+#: ../gnome/applet/applet-dbus-devices.c:959
+msgid "Disconnected"
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:960
+msgid "The network connection has been disconnected."
+msgstr ""
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#, fuzzy
+#~ msgid "You must log in to access the private network %s"
+#~ msgstr "LOG in Kuri i By'umwihariko urusobe"
+
+#, fuzzy
+#~ msgid "Scanning for wireless networks..."
+#~ msgstr "kugirango"
+
+#, fuzzy
+#~ msgid "Start All Wireless Devices"
+#~ msgstr "Gutangira"
+
+#, fuzzy
+#~ msgid ""
+#~ "128-bit passphrase (WEP)\n"
+#~ "Ascii key (WEP)\n"
+#~ "Hex key (WEP)"
+#~ msgstr "Urufunguzo Urufunguzo"
+
+# #-#-#-#-#  sw.pot (PACKAGE VERSION)  #-#-#-#-#
+# sw/source\ui\index\cnttab.src:TP_TOX_SELECT.FT_SORTALG.text
+# #-#-#-#-#  sw.pot (PACKAGE VERSION)  #-#-#-#-#
+# sw/source\ui\misc\srtdlg.src:DLG_SORTING.FT_KEYTYP.text
+#, fuzzy
+#~ msgid "Key type:"
+#~ msgstr "Ubwoko bw'agakandisho"
+
+# offmgr/source\offapp\intro\intro.hrc:TEXT_DEFAULTABOUT.text
+#, fuzzy
+#~ msgid "_About..."
+#~ msgstr "Ibyerekeye"
+
+# crashrep/source\all\crashrep.lng:%OK_BUTTON%.text
+#, fuzzy
+#~ msgid "_OK"
+#~ msgstr "YEGO"
+
+# basctl/source\basicide\basidesh.src:RID_IMGBTN_REMOVEWATCH.text
+#, fuzzy
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#, fuzzy
+#~ msgid "<span weight=\"bold\">Wireless Networks:</span>"
+#~ msgstr "<Uburemere UTSINDAGIYE"
+
+#, fuzzy
+#~ msgid "Copyright (C) 2004-2005 Red Hat, Inc."
+#~ msgstr "C"
+
+#, fuzzy
+#~ msgid "Connecting to a wired network..."
+#~ msgstr "Kuri a urusobe"
+
+#, fuzzy
+#~ msgid "Wireless network connection"
+#~ msgstr "urusobe Ukwihuza"
+
+#, fuzzy
+#~ msgid "Connecting to wireless network '%s'..."
+#~ msgstr "Kuri urusobe"
+
+#, fuzzy
+#~ msgid "Create new Wireless Network..."
+#~ msgstr "Gishya"
+
+# scp/source\office\profile.lng:STR_VALUE_TEMPLATE_SERVICES_HELP.text
+#~ msgid "Help"
+#~ msgstr "Ifashayobora"
+
+#~ msgid "About"
+#~ msgstr "Bigyanye"
+
+#, fuzzy
+#~ msgid ""
+#~ "Enter the ESSID and security settings of the wireless network you wish to "
+#~ "create."
+#~ msgstr "i Na Umutekano Amagenamiterere Bya i urusobe Kuri Kurema"
+
+#, fuzzy
+#~ msgid "Custom wireless network"
+#~ msgstr "Kugena urusobe"
+
+#, fuzzy
+#~ msgid ""
+#~ "Enter the ESSID of the wireless network to which you wish to connect."
+#~ msgstr "i Bya i urusobe Kuri Kuri Kwihuza"
+
+#, fuzzy
+#~ msgid "Connect with encryption enabled"
+#~ msgstr "Na: Bishunzwe: Bikora"
+
+#, fuzzy
+#~ msgid "Wireless _network:"
+#~ msgstr "urusobe"
+
+#, fuzzy
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Wireless Network Login "
+#~ "Confirmation</span>\n"
+#~ "\n"
+#~ "You have chosen log in to the wireless network '%s'.  If you are sure "
+#~ "this wireless network is secure, click the checkbox below and "
+#~ "NetworkManager will no longer pester you with stupid questions when you "
+#~ "connect to it."
+#~ msgstr ""
+#~ "<Uburemere UTSINDAGIYE Ingano Kinini LOG in Kuri i urusobe iyi urusobe ni "
+#~ "Kanda i munsi Na Oya Na: Ryari: Kwihuza Kuri"
+
+#, fuzzy
+#~ msgid "Always Trust this Wireless Network"
+#~ msgstr "iyi"
diff --git a/po/sk.po b/po/sk.po
index 174339415e..141e234df8 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the NetworkManager package.
 # Marcel Telka <marcel@telka.sk>, 2004, 2005, 2006.
 #
-# $Id: sk.po,v 1.44 2006/02/27 06:53:33 dcbw Exp $
+# $Id: sk.po,v 1.44.2.1 2006/05/29 16:58:09 utx Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-18 23:53+0100\n"
+"POT-Creation-Date: 2006-05-29 18:33+0200\n"
 "PO-Revision-Date: 2006-01-19 00:00+0100\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -18,78 +18,75 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural= (n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
 
-#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:934
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:919
 #, c-format
 msgid "Passphrase for wireless network %s"
 msgstr "Heslo pre bezdrôtovú sieť %s"
 
-#: ../gnome/applet/applet-dbus.c:274
+#: ../gnome/applet/applet-dbus.c:265
 #, c-format
 msgid "Connection to the wireless network '%s' failed."
 msgstr "Pripájanie k bezdrôtovej sieti '%s' zlyhalo."
 
-#: ../gnome/applet/applet-dbus.c:279
+#: ../gnome/applet/applet-dbus.c:270
 msgid "Connection to the wired network failed."
 msgstr "Pripájanie k drôtovej sieti zlyhalo."
 
-#: ../gnome/applet/applet.c:180
-msgid "Error displaying connection information: "
+#: ../gnome/applet/applet.c:184
+#, fuzzy
+msgid "Error displaying connection information:"
 msgstr "Chyba pri zobrazovaní informácií o spojení: "
 
-#: ../gnome/applet/applet.c:199
+#: ../gnome/applet/applet.c:202
 msgid "Could not find some required resources (the glade file)!"
 msgstr "Nepodarilo sa nájsť niektoré vyžadované zdroje (súbor glade)!"
 
-#: ../gnome/applet/applet.c:210
+#: ../gnome/applet/applet.c:213
 msgid "No active connections!"
 msgstr "Bez aktívnych sieťových spojení!"
 
-#: ../gnome/applet/applet.c:225
+#: ../gnome/applet/applet.c:234
 #, c-format
 msgid "Wired Ethernet (%s)"
 msgstr "Drôtový ethernet (%s)"
 
-#: ../gnome/applet/applet.c:227
+#: ../gnome/applet/applet.c:236
 #, c-format
 msgid "Wireless Ethernet (%s)"
 msgstr "Bezdrôtový ethernet (%s)"
 
-#: ../gnome/applet/applet.c:321 ../gnome/applet/applet.c:346
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:362
 msgid "NetworkManager Applet"
 msgstr "Applet NetworkManager"
 
-#: ../gnome/applet/applet.c:323 ../gnome/applet/applet.c:348
+#: ../gnome/applet/applet.c:339 ../gnome/applet/applet.c:364
 msgid "Copyright © 2004-2005 Red Hat, Inc."
 msgstr "Autorské práva © 2004-2005 Red Hat, Inc."
 
-#: ../gnome/applet/applet.c:324 ../gnome/applet/applet.c:349
+#: ../gnome/applet/applet.c:340 ../gnome/applet/applet.c:365
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Aplet oblasti upozornení pre správu vašich sieťových zariadení a pripojení."
 
-#: ../gnome/applet/applet.c:327 ../gnome/applet/applet.c:354
+#: ../gnome/applet/applet.c:343 ../gnome/applet/applet.c:370
 msgid "translator-credits"
 msgstr "Marcel Telka <marcel@telka.sk>"
 
-#: ../gnome/applet/applet.c:439
-msgid "VPN Error"
-msgstr "Chyba VPN"
-
-#: ../gnome/applet/applet.c:443
+#: ../gnome/applet/applet.c:426
 msgid "VPN Login Failure"
 msgstr "Zlyhanie VPN prihlásenia"
 
-#: ../gnome/applet/applet.c:444
+#: ../gnome/applet/applet.c:427
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a login failure."
 msgstr "Nepodarilo sa spustiť VPN spojenie '%s' kvôli zlyhania prihlásenia."
 
-#: ../gnome/applet/applet.c:448
+#: ../gnome/applet/applet.c:431
 msgid "VPN Start Failure"
 msgstr "Zlyhanie spustenia VPN"
 
-#: ../gnome/applet/applet.c:449
+#: ../gnome/applet/applet.c:432
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
@@ -98,25 +95,25 @@ msgstr ""
 "Nepodarilo sa spustiť VPN spojenie '%s' kvôli zlyhaniu spustenia VPN "
 "programu."
 
-#: ../gnome/applet/applet.c:453 ../gnome/applet/applet.c:463
+#: ../gnome/applet/applet.c:436 ../gnome/applet/applet.c:446
 msgid "VPN Connect Failure"
 msgstr "Zlyhanie VPN spojenia"
 
-#: ../gnome/applet/applet.c:454
+#: ../gnome/applet/applet.c:437
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a connection error."
 msgstr "Nepodarilo sa spustiť VPN spojenie '%s' kvôli chybe spojenia."
 
-#: ../gnome/applet/applet.c:458
+#: ../gnome/applet/applet.c:441
 msgid "VPN Configuration Error"
 msgstr "Chyba konfigurácie VPN"
 
-#: ../gnome/applet/applet.c:459
+#: ../gnome/applet/applet.c:442
 #, c-format
 msgid "The VPN connection '%s' was not correctly configured."
 msgstr "VPN spojenie '%s' nebolo správne nakonfigurované."
 
-#: ../gnome/applet/applet.c:464
+#: ../gnome/applet/applet.c:447
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' because the VPN server did not "
@@ -125,23 +122,13 @@ msgstr ""
 "Nepodarilo sa spustiť VPN spojenie '%s', pretože VPN server nevrátil "
 "príslušnú konfiguráciu siete."
 
-#: ../gnome/applet/applet.c:472
-#, c-format
-msgid "The VPN service said: \"%s\""
-msgstr "VPN služba oznámila: \"%s\""
-
-#: ../gnome/applet/applet.c:541
-#, c-format
-msgid "VPN connection '%s' said:"
-msgstr "VPN spojenie '%s' oznámilo:"
-
-#: ../gnome/applet/applet.c:543
+#: ../gnome/applet/applet.c:517
 msgid "VPN Login Message"
 msgstr "Správa VPN prihlásenia"
 
-#: ../gnome/applet/applet.c:760 ../gnome/applet/applet.c:2514
-#: ../gnome/applet/other-network-dialog.c:457
-#: ../gnome/applet/passphrase-dialog.c:209
+#: ../gnome/applet/applet.c:741 ../gnome/applet/applet.c:2508
+#: ../gnome/applet/other-network-dialog.c:453
+#: ../gnome/applet/passphrase-dialog.c:228
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
@@ -149,163 +136,163 @@ msgstr ""
 "Applet NetworkManager nemohol nájsť niektoré vyžadované zdroje (súbor glade "
 "nebol nájdený)."
 
-#: ../gnome/applet/applet.c:772
+#: ../gnome/applet/applet.c:753
 #, c-format
 msgid "The network device \"%s (%s)\" does not support wireless scanning."
 msgstr "Sieťové zariadenie \"%s (%s)\" nepodporuje bezdrôtové vyhľadávanie."
 
-#: ../gnome/applet/applet.c:780
+#: ../gnome/applet/applet.c:761
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
 msgstr "Sieťové zariadenie \"%s (%s)\" nepodporuje detekciu linky."
 
-#: ../gnome/applet/applet.c:928
+#: ../gnome/applet/applet.c:908
 #, c-format
 msgid "Preparing device %s for the wired network..."
 msgstr "Pripravujem zariadenie %s pre drôtovú sieť..."
 
-#: ../gnome/applet/applet.c:930
+#: ../gnome/applet/applet.c:910
 #, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
 msgstr "Pripravujem zariadenie %s pre bezdrôtovú sieť '%s'..."
 
-#: ../gnome/applet/applet.c:938
+#: ../gnome/applet/applet.c:918
 #, c-format
 msgid "Configuring device %s for the wired network..."
 msgstr "Konfigurácia zariadenia %s pre drôtovú sieť..."
 
-#: ../gnome/applet/applet.c:940
+#: ../gnome/applet/applet.c:920
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
 msgstr "Pokus o pripojenie k bezdrôtovej sieti '%s'..."
 
-#: ../gnome/applet/applet.c:948
+#: ../gnome/applet/applet.c:928
 #, c-format
 msgid "Waiting for Network Key for the wireless network '%s'..."
 msgstr "Čakanie na sieťový kľú� pre bezdrôtovú sieť '%s'..."
 
-#: ../gnome/applet/applet.c:956 ../gnome/applet/applet.c:966
+#: ../gnome/applet/applet.c:936 ../gnome/applet/applet.c:946
 msgid "Requesting a network address from the wired network..."
 msgstr "Vyžiadanie sieťovej adresy z drôtovej siete..."
 
-#: ../gnome/applet/applet.c:958 ../gnome/applet/applet.c:968
+#: ../gnome/applet/applet.c:938 ../gnome/applet/applet.c:948
 #, c-format
 msgid "Requesting a network address from the wireless network '%s'..."
 msgstr "Vyžiadanie sieťovej adresy z bezdrôtovej siete '%s'..."
 
-#: ../gnome/applet/applet.c:976
+#: ../gnome/applet/applet.c:956
 msgid "Finishing connection to the wired network..."
 msgstr "Ukon�ovanie spojenia k drôtovej sieti..."
 
-#: ../gnome/applet/applet.c:978
+#: ../gnome/applet/applet.c:958
 #, c-format
 msgid "Finishing connection to the wireless network '%s'..."
 msgstr "Ukon�ovanie spojenia k bezdrôtovej sieti '%s'..."
 
-#: ../gnome/applet/applet.c:1095
+#: ../gnome/applet/applet.c:1075
 msgid "NetworkManager is not running"
 msgstr "NetworkManager nebeží"
 
-#: ../gnome/applet/applet.c:1108 ../gnome/applet/applet.c:1842
+#: ../gnome/applet/applet.c:1083 ../gnome/applet/applet.c:1828
 msgid "Networking disabled"
 msgstr "Sieť deaktivovaná"
 
-#: ../gnome/applet/applet.c:1113
+#: ../gnome/applet/applet.c:1088
 msgid "No network connection"
 msgstr "Bez sieťového spojenia"
 
-#: ../gnome/applet/applet.c:1118
+#: ../gnome/applet/applet.c:1093
 msgid "Wired network connection"
 msgstr "Pripojenie k drôtovej sieti"
 
-#: ../gnome/applet/applet.c:1122
+#: ../gnome/applet/applet.c:1097
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Pripájané k bezdrôtovej sieti Ad-Hoc"
 
-#: ../gnome/applet/applet.c:1124
+#: ../gnome/applet/applet.c:1099
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "Bezdrôtové sieťové pripojenie k '%s' (%d%%)"
 
-#: ../gnome/applet/applet.c:1146
+#: ../gnome/applet/applet.c:1120
 #, c-format
 msgid "VPN connection to '%s'"
 msgstr "VPN spojenie s '%s'"
 
-#: ../gnome/applet/applet.c:1154
+#: ../gnome/applet/applet.c:1128
 #, c-format
 msgid "VPN connecting to '%s'"
 msgstr "VPN pripájanie k '%s'"
 
-#: ../gnome/applet/applet.c:1567
+#: ../gnome/applet/applet.c:1541
 msgid "_Connect to Other Wireless Network..."
 msgstr "_Pripojiť sa k inej bezdrôtovej sieti..."
 
-#: ../gnome/applet/applet.c:1588
+#: ../gnome/applet/applet.c:1562
 msgid "Create _New Wireless Network..."
 msgstr "Vytvoriť _novú bezdrôtovú sieť..."
 
-#: ../gnome/applet/applet.c:1709
+#: ../gnome/applet/applet.c:1685
 msgid "_VPN Connections"
 msgstr "_VPN spojenia"
 
-#: ../gnome/applet/applet.c:1744
+#: ../gnome/applet/applet.c:1730
 msgid "_Configure VPN..."
 msgstr "_Konfigurovať VPN..."
 
-#: ../gnome/applet/applet.c:1748
+#: ../gnome/applet/applet.c:1734
 msgid "_Disconnect VPN..."
 msgstr "_Odpojiť VPN..."
 
-#: ../gnome/applet/applet.c:1770
+#: ../gnome/applet/applet.c:1756
 msgid "_Dial Up Connections"
 msgstr "_Vytá�ané spojenia"
 
 #. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
-#: ../gnome/applet/applet.c:1781
+#: ../gnome/applet/applet.c:1767
 #, c-format
 msgid "Connect to %s..."
 msgstr "Pripojiť k %s..."
 
-#: ../gnome/applet/applet.c:1787
+#: ../gnome/applet/applet.c:1773
 #, c-format
 msgid "Disconnect from %s..."
 msgstr "Odpojiť od %s..."
 
-#: ../gnome/applet/applet.c:1836
+#: ../gnome/applet/applet.c:1822
 msgid "No network devices have been found"
 msgstr "Neboli nájdené iné sieťové zariadenia"
 
-#: ../gnome/applet/applet.c:2028
+#: ../gnome/applet/applet.c:2014
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager nebeží..."
 
 #. 'Enable Networking' item
-#: ../gnome/applet/applet.c:2184
+#: ../gnome/applet/applet.c:2170
 msgid "Enable _Networking"
 msgstr "Povoliť _sieť"
 
 #. 'Enable Wireless' item
-#: ../gnome/applet/applet.c:2190
+#: ../gnome/applet/applet.c:2176
 msgid "Enable _Wireless"
 msgstr "Povoliť _bezdrôtové pripojenie"
 
 #. 'Connection Information' item
-#: ../gnome/applet/applet.c:2196
+#: ../gnome/applet/applet.c:2182
 msgid "Connection _Information"
 msgstr "_Informácie o spojení"
 
 #. Help item
-#: ../gnome/applet/applet.c:2207
+#: ../gnome/applet/applet.c:2193
 msgid "_Help"
 msgstr "_Pomocník"
 
 #. About item
-#: ../gnome/applet/applet.c:2216
+#: ../gnome/applet/applet.c:2202
 msgid "_About"
 msgstr "_O programe"
 
-#: ../gnome/applet/applet.c:2633
+#: ../gnome/applet/applet.c:2667
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
@@ -313,56 +300,101 @@ msgstr ""
 "Applet NetworkManager nemohol nájsť niektoré vyžadované zdroje. Nemôže "
 "pokra�ovať.\n"
 
-#: ../gnome/applet/wireless-security-option.c:158
+#: ../gnome/applet/wireless-security-option.c:157
 msgid "Open System"
 msgstr "Otvorený systém"
 
-#: ../gnome/applet/wireless-security-option.c:161
+#: ../gnome/applet/wireless-security-option.c:160
 msgid "Shared Key"
 msgstr "Zdieľaný kľú�"
 
-#: ../gnome/applet/wireless-security-option.c:212
-msgid "TKIP (Default)"
+#: ../gnome/applet/wireless-security-option.c:208
+#, fuzzy
+msgid "Automatic (Default)"
 msgstr "TKIP (Predvolené)"
 
-#: ../gnome/applet/wireless-security-option.c:221
+#: ../gnome/applet/wireless-security-option.c:215
 msgid "AES-CCMP"
 msgstr "AES CCMP"
 
+#: ../gnome/applet/wireless-security-option.c:223
+#, fuzzy
+msgid "TKIP"
+msgstr "WPA TKIP"
+
+#: ../gnome/applet/wireless-security-option.c:231
+msgid "Dynamic WEP"
+msgstr ""
+
 #: ../gnome/applet/wso-none.c:53
 msgid "None"
 msgstr "Ni�"
 
-#: ../gnome/applet/wso-wep-ascii.c:128
-msgid "WEP 40/128-bit ASCII"
+#: ../gnome/applet/wso-wep-ascii.c:138
+#, fuzzy
+msgid "WEP 64/128-bit ASCII"
 msgstr "WEP 40/128 bitov v ASCII"
 
-#: ../gnome/applet/wso-wep-hex.c:125
-msgid "WEP 40/128-bit hex"
+#: ../gnome/applet/wso-wep-hex.c:135
+#, fuzzy
+msgid "WEP 64/128-bit Hex"
 msgstr "WEP 40/128 bitov v šestnástkovej sústave"
 
-#: ../gnome/applet/wso-wep-passphrase.c:125
-msgid "WEP Passphrase"
+#: ../gnome/applet/wso-wep-passphrase.c:135
+#, fuzzy
+msgid "WEP 128-bit Passphrase"
 msgstr "WEP heslo:"
 
-#: ../gnome/applet/eggtrayicon.c:128
+#: ../gnome/applet/wso-wpa-eap.c:237
+msgid "PEAP"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:238
+msgid "TLS"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:239
+msgid "TTLS"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
+#: ../src/nm-ap-security-wpa-eap.c:116
+msgid "WPA2 Enterprise"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
+#: ../src/nm-ap-security-wpa-eap.c:121
+msgid "WPA Enterprise"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-psk.c:178
+#, fuzzy
+msgid "WPA2 Personal"
+msgstr "Osobné WPA/WPA2"
+
+#: ../gnome/applet/wso-wpa-psk.c:180
+#, fuzzy
+msgid "WPA Personal"
+msgstr "Osobné WPA/WPA2"
+
+#: ../gnome/applet/eggtrayicon.c:134
 msgid "Orientation"
 msgstr "Orientácia"
 
-#: ../gnome/applet/eggtrayicon.c:129
+#: ../gnome/applet/eggtrayicon.c:135
 msgid "The orientation of the tray."
 msgstr "Orientácia zásobníka."
 
-#: ../gnome/applet/menu-items.c:87
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Drôtová sieť (%s)"
 
-#: ../gnome/applet/menu-items.c:90
+#: ../gnome/applet/menu-items.c:91
 msgid "_Wired Network"
 msgstr "_Drôtová sieť"
 
-#: ../gnome/applet/menu-items.c:161
+#: ../gnome/applet/menu-items.c:162
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
@@ -370,31 +402,31 @@ msgstr[0] "Bezdrôtových sietí (%s)"
 msgstr[1] "Bezdrôtová sieť (%s)"
 msgstr[2] "Bezdrôtové siete (%s)"
 
-#: ../gnome/applet/menu-items.c:163
+#: ../gnome/applet/menu-items.c:164
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Bezdrôtových sietí"
 msgstr[1] "Bezdrôtová sieť"
 msgstr[2] "Bezdrôtové siete"
 
-#: ../gnome/applet/menu-items.c:330
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr " (neplatný Unikód)"
 
-#: ../gnome/applet/other-network-dialog.c:354
+#: ../gnome/applet/other-network-dialog.c:352
 #, c-format
 msgid ""
 "By default, the wireless network's name is set to your computer's name, %s, "
 "with no encryption enabled"
 msgstr ""
-"Štandardne je názov bezdrôtovej siete nastavený na názov vášho po�íta�a, %s, bez povoleného "
-"Å¡ifrovania"
+"Štandardne je názov bezdrôtovej siete nastavený na názov vášho po�íta�a, %s, "
+"bez povoleného šifrovania"
 
-#: ../gnome/applet/other-network-dialog.c:360
+#: ../gnome/applet/other-network-dialog.c:358
 msgid "Create new wireless network"
 msgstr "Vytvoriť novú bezdrôtovú sieť"
 
-#: ../gnome/applet/other-network-dialog.c:361
+#: ../gnome/applet/other-network-dialog.c:359
 msgid ""
 "Enter the name and security settings of the wireless network you wish to "
 "create."
@@ -402,29 +434,40 @@ msgstr ""
 "Zadajte názov a bezpe�nostné nastavenia bezdrôtovej siete, ktorú chcete "
 "vytvoriť."
 
-#: ../gnome/applet/other-network-dialog.c:365
+#: ../gnome/applet/other-network-dialog.c:363
 msgid "Create New Wireless Network"
 msgstr "Vytvoriť _novú bezdrôtovú sieť"
 
-#: ../gnome/applet/other-network-dialog.c:370
+#: ../gnome/applet/other-network-dialog.c:368
 msgid "Existing wireless network"
 msgstr "Existujúca bezdrôtová sieť"
 
-#: ../gnome/applet/other-network-dialog.c:371
+#: ../gnome/applet/other-network-dialog.c:369
 msgid "Enter the name of the wireless network to which you wish to connect."
 msgstr "Zadajte názov bezdrôtovej siete, ku ktorej sa chcete pripojiť."
 
-#: ../gnome/applet/other-network-dialog.c:373
+#: ../gnome/applet/other-network-dialog.c:371
 msgid "Connect to Other Wireless Network"
 msgstr "_Pripojiť sa k inej bezdrôtovej sieti"
 
-#: ../gnome/applet/vpn-password-dialog.c:152
-#: ../gnome/applet/vpn-password-dialog.c:189
+#: ../gnome/applet/passphrase-dialog.c:215
+#, fuzzy
+msgid "Error connecting to wireless network"
+msgstr "Existujúca bezdrôtová sieť"
+
+#: ../gnome/applet/passphrase-dialog.c:216
+msgid ""
+"The requested wireless network requires security capabilities unsupported by "
+"your hardware."
+msgstr ""
+
+#: ../gnome/applet/vpn-password-dialog.c:151
+#: ../gnome/applet/vpn-password-dialog.c:188
 #, c-format
 msgid "Cannot start VPN connection '%s'"
 msgstr "Nepodarilo sa spustiť VPN spojenie '%s'"
 
-#: ../gnome/applet/vpn-password-dialog.c:155
+#: ../gnome/applet/vpn-password-dialog.c:154
 #, c-format
 msgid ""
 "Could not find the authentication dialog for VPN connection type '%s'. "
@@ -433,7 +476,7 @@ msgstr ""
 "Nepodarilo sa nájsť dialógové okno overenia totožnosti pre VPN spojenie typu "
 "'%s'. Spojte sa s vašim správcom systému."
 
-#: ../gnome/applet/vpn-password-dialog.c:192
+#: ../gnome/applet/vpn-password-dialog.c:191
 #, c-format
 msgid ""
 "There was a problem launching the authentication dialog for VPN connection "
@@ -495,62 +538,88 @@ msgstr ""
 "NetworkManager nebude viac vyžadovať potvrdenie pri �alších prihláseniach."
 
 #: ../gnome/applet/applet.glade.h:15
+msgid "Anonymous Identity:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:16
 msgid "Authentication:"
 msgstr "Overenie totožnosti:"
 
-#: ../gnome/applet/applet.glade.h:16
+#: ../gnome/applet/applet.glade.h:17
 msgid "Broadcast Address:"
 msgstr "Adresa šírenia:"
 
-#: ../gnome/applet/applet.glade.h:17
+#: ../gnome/applet/applet.glade.h:18
+msgid "CA Certificate File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:19
 msgid "C_onnect"
 msgstr "Prip_ojiť"
 
-#: ../gnome/applet/applet.glade.h:18
-msgid "Connect using WPA2"
-msgstr "Pripojiť pomocou WPA2"
+#: ../gnome/applet/applet.glade.h:20
+msgid "Client Certificate File:"
+msgstr ""
 
-#: ../gnome/applet/applet.glade.h:19
+#: ../gnome/applet/applet.glade.h:21
 msgid "Connection Information"
 msgstr "Informácie o spojení"
 
-#: ../gnome/applet/applet.glade.h:20
+#: ../gnome/applet/applet.glade.h:22
 msgid "Default Route:"
 msgstr "Predvolené smerovanie:"
 
-#: ../gnome/applet/applet.glade.h:21
+#: ../gnome/applet/applet.glade.h:23
 msgid "Destination Address:"
 msgstr "Cieľová adresa:"
 
-#: ../gnome/applet/applet.glade.h:22
+#: ../gnome/applet/applet.glade.h:24
+msgid "Driver:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:25
+msgid "EAP Method:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:26
 msgid "Hardware Address:"
 msgstr "Hardvérová adresa:"
 
-#: ../gnome/applet/applet.glade.h:23
+#: ../gnome/applet/applet.glade.h:27
 msgid "IP Address:"
 msgstr "IP adresa:"
 
-#: ../gnome/applet/applet.glade.h:24
+#: ../gnome/applet/applet.glade.h:28
+msgid "Identity:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:29
 msgid "Interface:"
 msgstr "Rozhranie:"
 
-#: ../gnome/applet/applet.glade.h:25
+#: ../gnome/applet/applet.glade.h:30
+#, fuzzy
+msgid "Key Type:"
+msgstr "Typ:"
+
+#: ../gnome/applet/applet.glade.h:31
 msgid "Key:"
 msgstr "Kľú�:"
 
-#: ../gnome/applet/applet.glade.h:26
+#: ../gnome/applet/applet.glade.h:32
+#, fuzzy
 msgid ""
 "None\n"
-"WEP Passphrase\n"
-"WEP 40/128-bit hex\n"
-"WEP 40/128-bit ASCII\n"
+"WEP 128-bit Passphrase\n"
+"WEP 64/128-bit Hex\n"
+"WEP 64/128-bit ASCII\n"
 msgstr ""
 "Žiaden\n"
 "WEP heslo\n"
 "WEP 40/128 bitov v šestnástkovej sústave\n"
 "WEP 40/128 bitov ASCII\n"
 
-#: ../gnome/applet/applet.glade.h:31
+#: ../gnome/applet/applet.glade.h:37
 msgid ""
 "Open System\n"
 "Shared Key"
@@ -558,91 +627,114 @@ msgstr ""
 "Otvorený systém\n"
 "Zdieľaný kľú�"
 
-#: ../gnome/applet/applet.glade.h:33
+#: ../gnome/applet/applet.glade.h:39
 msgid "Other Wireless Network..."
 msgstr "Ostatné bezdrôtové siete..."
 
-#: ../gnome/applet/applet.glade.h:34
+#: ../gnome/applet/applet.glade.h:40
 msgid "Passphrase:"
 msgstr "Heslo:"
 
-#: ../gnome/applet/applet.glade.h:35
+#: ../gnome/applet/applet.glade.h:41
 msgid "Password:"
 msgstr "Heslo:"
 
-#: ../gnome/applet/applet.glade.h:36
+#: ../gnome/applet/applet.glade.h:42
 msgid "Primary DNS:"
 msgstr "Primárne DNS:"
 
-#: ../gnome/applet/applet.glade.h:37
+#: ../gnome/applet/applet.glade.h:43
+msgid "Private Key File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:44
+msgid "Private Key Password:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:45
 msgid "Secondary DNS:"
 msgstr "Sekundárne DNS:"
 
-#: ../gnome/applet/applet.glade.h:38
+#: ../gnome/applet/applet.glade.h:46
+msgid "Select the CA Certificate File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:47
+msgid "Select the Client Certificate File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:48
+msgid "Select the Private Key File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:49
+msgid "Show key"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:50
+#, fuzzy
+msgid "Show passphrase"
+msgstr "Heslo:"
+
+#: ../gnome/applet/applet.glade.h:51
+#, fuzzy
+msgid "Show password"
+msgstr "Heslo:"
+
+#: ../gnome/applet/applet.glade.h:52
+#, fuzzy
+msgid "Show passwords"
+msgstr "Heslo:"
+
+#: ../gnome/applet/applet.glade.h:53
+msgid "Speed:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:54
 msgid "Subnet Mask:"
 msgstr "Maska podsiete:"
 
-#: ../gnome/applet/applet.glade.h:39
+#: ../gnome/applet/applet.glade.h:55
 msgid "Type:"
 msgstr "Typ:"
 
-#: ../gnome/applet/applet.glade.h:40
+#: ../gnome/applet/applet.glade.h:56
 msgid "User Name:"
 msgstr "Meno používateľa:"
 
-#: ../gnome/applet/applet.glade.h:41
+#: ../gnome/applet/applet.glade.h:57
 msgid "Wireless Network Key Required"
 msgstr "Je potrebný kľú� bezdrôtovej siete"
 
-#: ../gnome/applet/applet.glade.h:42
+#: ../gnome/applet/applet.glade.h:58
 msgid "Wireless _adapter:"
 msgstr "Bezdrôtový _adaptér:"
 
-#: ../gnome/applet/applet.glade.h:43
+#: ../gnome/applet/applet.glade.h:59
 msgid "_Always Trust this Wireless Network"
 msgstr "_Vždy dôverovať tejto bezdrôtovej sieti"
 
-#: ../gnome/applet/applet.glade.h:44
+#: ../gnome/applet/applet.glade.h:60
 msgid "_Don't remind me again"
 msgstr "_Nepripomínať mi znovu"
 
-#: ../gnome/applet/applet.glade.h:45
+#: ../gnome/applet/applet.glade.h:61
 msgid "_Login to Network"
 msgstr "_Prihlásenie k sieti"
 
-#: ../gnome/applet/applet.glade.h:46
+#: ../gnome/applet/applet.glade.h:62
 msgid "_Network Name:"
 msgstr "_Sieťové meno:"
 
-#: ../gnome/applet/applet.glade.h:47
+#: ../gnome/applet/applet.glade.h:63
 msgid "_Wireless Security:"
 msgstr "Bezdrôtová bezpe�nosť:"
 
-#: ../gnome/applet/applet.glade.h:48
-msgid "leap_subwindow"
-msgstr ""
-
-#: ../gnome/applet/applet.glade.h:49
-msgid "wep_key_subwindow"
-msgstr ""
-
-#: ../gnome/applet/applet.glade.h:50
-msgid "wep_passphrase_subwindow"
-msgstr ""
-
-#: ../gnome/applet/applet.glade.h:51
-msgid "wpa_psk_subwindow"
-msgstr ""
-
-#: ../gnome/applet/wso-wpa-psk.c:165
-msgid "WPA/WPA2 Personal"
-msgstr "Osobné WPA/WPA2"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.c:358
+#: ../gnome/vpn-properties/nm-vpn-properties.c:383
 msgid "Cannot add VPN connection"
 msgstr "Nemôžte pridať VPN spojenie"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:360
+#: ../gnome/vpn-properties/nm-vpn-properties.c:385
 msgid ""
 "No suitable VPN software was found on your system. Contact your system "
 "administrator."
@@ -650,11 +742,11 @@ msgstr ""
 "Vo vašom systéme nebol nájdený použiteľný softvér pre VPN. Spojte sa so "
 "správcom vášho systému."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:412
+#: ../gnome/vpn-properties/nm-vpn-properties.c:437
 msgid "Cannot import VPN connection"
 msgstr "Nemôžte importovať VPN spojenie"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:414
+#: ../gnome/vpn-properties/nm-vpn-properties.c:439
 #, c-format
 msgid ""
 "Cannot find suitable software for VPN connection type '%s' to import the "
@@ -663,12 +755,12 @@ msgstr ""
 "Nepodarilo sa nájsť použiteľný softvér pre pre VPN spojenie typu '%s' na "
 "import súboru '%s'. Spojte sa so správcom vášho systému."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:554
+#: ../gnome/vpn-properties/nm-vpn-properties.c:579
 #, c-format
 msgid "Error retrieving VPN connection '%s'"
 msgstr "Chyba pri získavaní VPN spojenia '%s'"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:557
+#: ../gnome/vpn-properties/nm-vpn-properties.c:582
 #, c-format
 msgid ""
 "Could not find the UI files for VPN connection type '%s'. Contact your "
@@ -677,12 +769,12 @@ msgstr ""
 "Nepodarilo sa nájsť súbory používateľského rozhrania pre VPN spojenie typu '%"
 "s'. Spojte sa so správcom vášho systému."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:717
+#: ../gnome/vpn-properties/nm-vpn-properties.c:739
 #, c-format
 msgid "Delete VPN connection \"%s\"?"
 msgstr "Odstrániť VPN spojenie \"%s\"?"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:720
+#: ../gnome/vpn-properties/nm-vpn-properties.c:742
 #, c-format
 msgid ""
 "All information about the VPN connection \"%s\" will be lost and you may "
@@ -693,16 +785,16 @@ msgstr ""
 "potrebovať správcu vášho systému, aby vám poskytol informácie na vytvorenie "
 "nového spojenia."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:926
+#: ../gnome/vpn-properties/nm-vpn-properties.c:959
 msgid "Unable to load"
 msgstr "Nepodarilo sa na�ítať"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:928
+#: ../gnome/vpn-properties/nm-vpn-properties.c:961
 msgid "Cannot find some needed resources (the glade file)!"
 msgstr "Nepodarilo sa nájsť niektoré vyžadované zdroje (súbor glade)!"
 
 #. Edit dialog
-#: ../gnome/vpn-properties/nm-vpn-properties.c:1043
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
 msgid "Edit VPN Connection"
 msgstr "Upraviť VPN spojenie"
 
@@ -776,11 +868,11 @@ msgstr ""
 msgid "VPN Connections"
 msgstr "VPN spojenia"
 
-#: ../src/nm-ap-security-wep.c:47
+#: ../src/nm-ap-security-wep.c:52
 msgid "40-bit WEP"
 msgstr "40 bitový WEP"
 
-#: ../src/nm-ap-security-wep.c:49
+#: ../src/nm-ap-security-wep.c:54
 msgid "104-bit WEP"
 msgstr "104 bitový WEP"
 
@@ -792,15 +884,23 @@ msgstr "WPA TKIP"
 msgid "WPA CCMP"
 msgstr "WPA CCMP"
 
-#: ../src/nm-ap-security-wpa-psk.c:57
+#: ../src/nm-ap-security-wpa-psk.c:54
+msgid "WPA Automatic"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:59
 msgid "WPA2 TKIP"
 msgstr "WPA2 TKIP"
 
-#: ../src/nm-ap-security-wpa-psk.c:59
+#: ../src/nm-ap-security-wpa-psk.c:61
 msgid "WPA2 CCMP"
 msgstr "WPA2 CCMP"
 
-#: ../src/nm-ap-security.c:310
+#: ../src/nm-ap-security-wpa-psk.c:63
+msgid "WPA2 Automatic"
+msgstr ""
+
+#: ../src/nm-ap-security.c:320
 msgid "none"
 msgstr "ni�"
 
@@ -840,3 +940,72 @@ msgstr ""
 #: ../src/nm-netlink-monitor.c:735
 msgid "error occurred while waiting for data on socket"
 msgstr "vyskytla sa chyba pri �akaní na dáta zo zásuvky"
+
+#: ../gnome/applet/applet-dbus-devices.c:898
+#, fuzzy, c-format
+msgid "You are now connected to the Ad-Hoc wireless network '%s'."
+msgstr "Pripájané k bezdrôtovej sieti Ad-Hoc"
+
+#: ../gnome/applet/applet-dbus-devices.c:903
+#, fuzzy, c-format
+msgid "You are now connected to the wireless network '%s'."
+msgstr "Ukon�ovanie spojenia k bezdrôtovej sieti '%s'..."
+
+#: ../gnome/applet/applet-dbus-devices.c:910
+#, fuzzy
+msgid "You are now connected to the wired network."
+msgstr "Ukon�ovanie spojenia k drôtovej sieti..."
+
+#: ../gnome/applet/applet-dbus-devices.c:916
+msgid "Connection Established"
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:959
+#, fuzzy
+msgid "Disconnected"
+msgstr "_Odpojiť VPN..."
+
+#: ../gnome/applet/applet-dbus-devices.c:960
+msgid "The network connection has been disconnected."
+msgstr ""
+
+#~ msgid "VPN Error"
+#~ msgstr "Chyba VPN"
+
+#~ msgid "The VPN service said: \"%s\""
+#~ msgstr "VPN služba oznámila: \"%s\""
+
+#~ msgid "VPN connection '%s' said:"
+#~ msgstr "VPN spojenie '%s' oznámilo:"
+
+#~ msgid "Connect using WPA2"
+#~ msgstr "Pripojiť pomocou WPA2"
+
+#~ msgid "Error displaying connection information: "
+#~ msgstr "Chyba pri zobrazovaní informácií o spojení: "
+
+#~ msgid "TKIP (Default)"
+#~ msgstr "TKIP (Predvolené)"
+
+#~ msgid "WEP 40/128-bit ASCII"
+#~ msgstr "WEP 40/128 bitov v ASCII"
+
+#~ msgid "WEP 40/128-bit hex"
+#~ msgstr "WEP 40/128 bitov v šestnástkovej sústave"
+
+#~ msgid "WEP Passphrase"
+#~ msgstr "WEP heslo:"
+
+#~ msgid ""
+#~ "None\n"
+#~ "WEP Passphrase\n"
+#~ "WEP 40/128-bit hex\n"
+#~ "WEP 40/128-bit ASCII\n"
+#~ msgstr ""
+#~ "Žiaden\n"
+#~ "WEP heslo\n"
+#~ "WEP 40/128 bitov v šestnástkovej sústave\n"
+#~ "WEP 40/128 bitov ASCII\n"
+
+#~ msgid "WPA/WPA2 Personal"
+#~ msgstr "Osobné WPA/WPA2"
diff --git a/po/sq.po b/po/sq.po
index b425d1e3fa..e2329b84bc 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-19 13:38-0400\n"
+"POT-Creation-Date: 2006-05-29 18:33+0200\n"
 "PO-Revision-Date: 2004-09-15 11:49+0200\n"
 "Last-Translator: Laurent Dhima <laurenti@alblinux.net>\n"
 "Language-Team: Albanian <gnome-albanian-perkthyesit@lists.sourceforge.net>\n"
@@ -15,61 +15,116 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: info-daemon/networks.glade:11
-msgid "Modify Wireless Networks"
-msgstr "Ndrysho Rrjetet Wireless"
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:919
+#, fuzzy, c-format
+msgid "Passphrase for wireless network %s"
+msgstr "Nuk ekziston asnjë rrjet wireless..."
 
-#: info-daemon/networks.glade:92
-msgid "<span weight=\"bold\">Wireless Networks:</span>"
-msgstr "<span weight=\"bold\">Rrjete Wireless:</span>"
+#: ../gnome/applet/applet-dbus.c:265
+#, c-format
+msgid "Connection to the wireless network '%s' failed."
+msgstr ""
 
-#: info-daemon/passphrase.glade:9
-msgid "Wireless Network Key Required"
-msgstr "Nevoitet Kyçi i Rrjetit Wireless"
+#: ../gnome/applet/applet-dbus.c:270
+msgid "Connection to the wired network failed."
+msgstr ""
 
-#: info-daemon/passphrase.glade:52
-msgid "_Login to Network"
-msgstr "_Identifikohu në Rrjet"
+#: ../gnome/applet/applet.c:184
+msgid "Error displaying connection information:"
+msgstr ""
+
+#: ../gnome/applet/applet.c:202
+#, fuzzy
+msgid "Could not find some required resources (the glade file)!"
+msgstr ""
+"Instrumenti NetworkManager nuk arrin të gjejë disa burime të nevojshme (file "
+"glade nuk u gjet)."
+
+#: ../gnome/applet/applet.c:213
+#, fuzzy
+msgid "No active connections!"
+msgstr "Lidhjet e rrjetit"
+
+#: ../gnome/applet/applet.c:234
+#, fuzzy, c-format
+msgid "Wired Ethernet (%s)"
+msgstr "Ndrysho Rrjetet Wireless"
+
+#: ../gnome/applet/applet.c:236
+#, fuzzy, c-format
+msgid "Wireless Ethernet (%s)"
+msgstr "Ndrysho Rrjetet Wireless"
 
-#: info-daemon/passphrase.glade:100
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:362
 #, fuzzy
+msgid "NetworkManager Applet"
+msgstr "NetworkManager nuk është duke punuar..."
+
+#: ../gnome/applet/applet.c:339 ../gnome/applet/applet.c:364
+msgid "Copyright © 2004-2005 Red Hat, Inc."
+msgstr ""
+
+#: ../gnome/applet/applet.c:340 ../gnome/applet/applet.c:365
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
-"Network</span>\n"
-"\n"
-"A passphrase or encryption key is required to access the wireless network '%"
-"s'."
+"Notification area applet for managing your network devices and connections."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Fjalëkalimi kërkohet nga Rrjeti  "
-"Wirelessi</span>\n"
-"\n"
-"Për t'u futur në rrjetin wireless '%s' kërkohet fjalëkalimi ose një kyç WEP."
 
-#: info-daemon/passphrase.glade:129
-msgid "Key Type:"
+#: ../gnome/applet/applet.c:343 ../gnome/applet/applet.c:370
+msgid "translator-credits"
+msgstr ""
+
+#: ../gnome/applet/applet.c:426
+msgid "VPN Login Failure"
+msgstr ""
+
+#: ../gnome/applet/applet.c:427
+#, c-format
+msgid "Could not start the VPN connection '%s' due to a login failure."
+msgstr ""
+
+#: ../gnome/applet/applet.c:431
+msgid "VPN Start Failure"
 msgstr ""
 
-#: info-daemon/passphrase.glade:150
+#: ../gnome/applet/applet.c:432
+#, c-format
 msgid ""
-"128-bit Passphrase\n"
-"128-bit Raw Hex Key"
+"Could not start the VPN connection '%s' due to a failure launching the VPN "
+"program."
 msgstr ""
 
-#: info-daemon/passphrase.glade:180
-#: info-daemon/NetworkManagerInfoPassphraseDialog.c:101
-msgid "Passphrase:"
-msgstr "Fjalëkalimi:"
+#: ../gnome/applet/applet.c:436 ../gnome/applet/applet.c:446
+msgid "VPN Connect Failure"
+msgstr ""
 
-#: info-daemon/passphrase.glade:208 panel-applet/essid.glade:162
-msgid "*"
-msgstr "*"
+#: ../gnome/applet/applet.c:437
+#, c-format
+msgid "Could not start the VPN connection '%s' due to a connection error."
+msgstr ""
 
-#: info-daemon/NetworkManagerInfoPassphraseDialog.c:104
-msgid "Key:"
+#: ../gnome/applet/applet.c:441
+msgid "VPN Configuration Error"
+msgstr ""
+
+#: ../gnome/applet/applet.c:442
+#, c-format
+msgid "The VPN connection '%s' was not correctly configured."
 msgstr ""
 
-#. Reuse the above string to make the translators less angry.
-#: panel-applet/NMWirelessApplet.c:691 panel-applet/NMWirelessApplet.c:701
+#: ../gnome/applet/applet.c:447
+#, c-format
+msgid ""
+"Could not start the VPN connection '%s' because the VPN server did not "
+"return an adequate network configuration."
+msgstr ""
+
+#: ../gnome/applet/applet.c:517
+msgid "VPN Login Message"
+msgstr ""
+
+#: ../gnome/applet/applet.c:741 ../gnome/applet/applet.c:2508
+#: ../gnome/applet/other-network-dialog.c:453
+#: ../gnome/applet/passphrase-dialog.c:228
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
@@ -77,92 +132,854 @@ msgstr ""
 "Instrumenti NetworkManager nuk arrin të gjejë disa burime të nevojshme (file "
 "glade nuk u gjet)."
 
-#: panel-applet/NMWirelessApplet.c:716
+#: ../gnome/applet/applet.c:753
+#, c-format
+msgid "The network device \"%s (%s)\" does not support wireless scanning."
+msgstr ""
+
+#: ../gnome/applet/applet.c:761
+#, c-format
+msgid "The network device \"%s (%s)\" does not support link detection."
+msgstr ""
+
+#: ../gnome/applet/applet.c:908
+#, c-format
+msgid "Preparing device %s for the wired network..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:910
+#, fuzzy, c-format
+msgid "Preparing device %s for the wireless network '%s'..."
+msgstr "Nuk ekziston asnjë rrjet wireless..."
+
+#: ../gnome/applet/applet.c:918
+#, c-format
+msgid "Configuring device %s for the wired network..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:920
+#, fuzzy, c-format
+msgid "Attempting to join the wireless network '%s'..."
+msgstr "Nuk ekziston asnjë rrjet wireless..."
+
+#: ../gnome/applet/applet.c:928
+#, fuzzy, c-format
+msgid "Waiting for Network Key for the wireless network '%s'..."
+msgstr "Nuk ekziston asnjë rrjet wireless..."
+
+#: ../gnome/applet/applet.c:936 ../gnome/applet/applet.c:946
+msgid "Requesting a network address from the wired network..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:938 ../gnome/applet/applet.c:948
+#, fuzzy, c-format
+msgid "Requesting a network address from the wireless network '%s'..."
+msgstr "Nuk ekziston asnjë rrjet wireless..."
+
+#: ../gnome/applet/applet.c:956
+msgid "Finishing connection to the wired network..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:958
+#, fuzzy, c-format
+msgid "Finishing connection to the wireless network '%s'..."
+msgstr "Nuk ekziston asnjë rrjet wireless..."
+
+#: ../gnome/applet/applet.c:1075
+#, fuzzy
+msgid "NetworkManager is not running"
+msgstr "NetworkManager nuk është duke punuar..."
+
+#: ../gnome/applet/applet.c:1083 ../gnome/applet/applet.c:1828
+msgid "Networking disabled"
+msgstr ""
+
+#: ../gnome/applet/applet.c:1088
+#, fuzzy
+msgid "No network connection"
+msgstr "Lidhjet e rrjetit"
+
+#: ../gnome/applet/applet.c:1093
 #, fuzzy
-msgid "Custom wireless network"
+msgid "Wired network connection"
+msgstr "Lidhjet e rrjetit"
+
+#: ../gnome/applet/applet.c:1097
+#, fuzzy
+msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Ndrysho Rrjetet Wireless"
 
-#: panel-applet/NMWirelessApplet.c:717
-msgid "Enter the ESSID of the wireless network to which you wish to connect."
+#: ../gnome/applet/applet.c:1099
+#, fuzzy, c-format
+msgid "Wireless network connection to '%s' (%d%%)"
+msgstr "Ndrysho Rrjetet Wireless"
+
+#: ../gnome/applet/applet.c:1120
+#, c-format
+msgid "VPN connection to '%s'"
+msgstr ""
+
+#: ../gnome/applet/applet.c:1128
+#, c-format
+msgid "VPN connecting to '%s'"
 msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:800
+#: ../gnome/applet/applet.c:1541
 #, fuzzy
-msgid "Other Wireless Networks..."
+msgid "_Connect to Other Wireless Network..."
 msgstr "Rrjete të tjerë Wireless..."
 
-#: panel-applet/NMWirelessApplet.c:911
+#: ../gnome/applet/applet.c:1562
+#, fuzzy
+msgid "Create _New Wireless Network..."
+msgstr "Rrjete të tjerë Wireless..."
+
+#: ../gnome/applet/applet.c:1685
+#, fuzzy
+msgid "_VPN Connections"
+msgstr "Lidhjet e rrjetit"
+
+#: ../gnome/applet/applet.c:1730
+msgid "_Configure VPN..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1734
+msgid "_Disconnect VPN..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1756
+#, fuzzy
+msgid "_Dial Up Connections"
+msgstr "Lidhjet e rrjetit"
+
+#. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
+#: ../gnome/applet/applet.c:1767
+#, c-format
+msgid "Connect to %s..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1773
+#, c-format
+msgid "Disconnect from %s..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1822
 msgid "No network devices have been found"
 msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:1028
+#: ../gnome/applet/applet.c:2014
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager nuk është duke punuar..."
 
-#: panel-applet/essid.glade:52
-msgid "C_onnect"
+#. 'Enable Networking' item
+#: ../gnome/applet/applet.c:2170
+#, fuzzy
+msgid "Enable _Networking"
+msgstr "Ndrysho Rrjetet Wireless"
+
+#. 'Enable Wireless' item
+#: ../gnome/applet/applet.c:2176
+msgid "Enable _Wireless"
 msgstr ""
 
-#: panel-applet/essid.glade:131
+#. 'Connection Information' item
+#: ../gnome/applet/applet.c:2182
+msgid "Connection _Information"
+msgstr ""
+
+#. Help item
+#: ../gnome/applet/applet.c:2193
+msgid "_Help"
+msgstr ""
+
+#. About item
+#: ../gnome/applet/applet.c:2202
 #, fuzzy
-msgid "Wireless _Network:"
-msgstr "Ndrysho Rrjetet Wireless"
+msgid "_About"
+msgstr "_Informacione..."
 
-#: panel-applet/essid.glade:177
-msgid "Wireless _adapter:"
+#: ../gnome/applet/applet.c:2667
+#, fuzzy
+msgid ""
+"The NetworkManager applet could not find some required resources.  It cannot "
+"continue.\n"
+msgstr ""
+"Instrumenti NetworkManager nuk arrin të gjejë disa burime të nevojshme (file "
+"glade nuk u gjet)."
+
+#: ../gnome/applet/wireless-security-option.c:157
+msgid "Open System"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:160
+msgid "Shared Key"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:208
+msgid "Automatic (Default)"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:215
+msgid "AES-CCMP"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:223
+msgid "TKIP"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:231
+msgid "Dynamic WEP"
 msgstr ""
 
-#: panel-applet/menu-info.c:101
+#: ../gnome/applet/wso-none.c:53
+msgid "None"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-ascii.c:138
+msgid "WEP 64/128-bit ASCII"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-hex.c:135
+msgid "WEP 64/128-bit Hex"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-passphrase.c:135
+#, fuzzy
+msgid "WEP 128-bit Passphrase"
+msgstr "Fjalëkalimi:"
+
+#: ../gnome/applet/wso-wpa-eap.c:237
+msgid "PEAP"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:238
+msgid "TLS"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:239
+msgid "TTLS"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
+#: ../src/nm-ap-security-wpa-eap.c:116
+msgid "WPA2 Enterprise"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
+#: ../src/nm-ap-security-wpa-eap.c:121
+msgid "WPA Enterprise"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-psk.c:178
+msgid "WPA2 Personal"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-psk.c:180
+msgid "WPA Personal"
+msgstr ""
+
+#: ../gnome/applet/eggtrayicon.c:134
+msgid "Orientation"
+msgstr ""
+
+#: ../gnome/applet/eggtrayicon.c:135
+msgid "The orientation of the tray."
+msgstr ""
+
+#: ../gnome/applet/menu-items.c:88
 #, fuzzy, c-format
 msgid "Wired Network (%s)"
 msgstr "Ndrysho Rrjetet Wireless"
 
-#: panel-applet/menu-info.c:103
+#: ../gnome/applet/menu-items.c:91
 #, fuzzy
-msgid "Wired Network"
+msgid "_Wired Network"
 msgstr "Ndrysho Rrjetet Wireless"
 
-#: panel-applet/menu-info.c:168
+#: ../gnome/applet/menu-items.c:162
 #, fuzzy, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
 msgstr[0] "Ndrysho Rrjetet Wireless"
 msgstr[1] "Ndrysho Rrjetet Wireless"
 
-#: panel-applet/menu-info.c:170
+#: ../gnome/applet/menu-items.c:164
 #, fuzzy
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Ndrysho Rrjetet Wireless"
 msgstr[1] "Ndrysho Rrjetet Wireless"
 
-#: panel-applet/menu-info.c:307
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr ""
 
-#: examples/python/systray/eggtrayicon.c:111
-msgid "Orientation"
+#: ../gnome/applet/other-network-dialog.c:352
+#, c-format
+msgid ""
+"By default, the wireless network's name is set to your computer's name, %s, "
+"with no encryption enabled"
 msgstr ""
 
-#: examples/python/systray/eggtrayicon.c:112
-msgid "The orientation of the tray."
+#: ../gnome/applet/other-network-dialog.c:358
+#, fuzzy
+msgid "Create new wireless network"
+msgstr "Nuk ekziston asnjë rrjet wireless..."
+
+#: ../gnome/applet/other-network-dialog.c:359
+msgid ""
+"Enter the name and security settings of the wireless network you wish to "
+"create."
 msgstr ""
 
-#~ msgid "There are no wireless networks..."
-#~ msgstr "Nuk ekziston asnjë rrjet wireless..."
+#: ../gnome/applet/other-network-dialog.c:363
+#, fuzzy
+msgid "Create New Wireless Network"
+msgstr "Ndrysho Rrjetet Wireless"
+
+#: ../gnome/applet/other-network-dialog.c:368
+#, fuzzy
+msgid "Existing wireless network"
+msgstr "Ndrysho Rrjetet Wireless"
+
+#: ../gnome/applet/other-network-dialog.c:369
+msgid "Enter the name of the wireless network to which you wish to connect."
+msgstr ""
+
+#: ../gnome/applet/other-network-dialog.c:371
+#, fuzzy
+msgid "Connect to Other Wireless Network"
+msgstr "Rrjete të tjerë Wireless..."
+
+#: ../gnome/applet/passphrase-dialog.c:215
+#, fuzzy
+msgid "Error connecting to wireless network"
+msgstr "Ndrysho Rrjetet Wireless"
+
+#: ../gnome/applet/passphrase-dialog.c:216
+msgid ""
+"The requested wireless network requires security capabilities unsupported by "
+"your hardware."
+msgstr ""
+
+#: ../gnome/applet/vpn-password-dialog.c:151
+#: ../gnome/applet/vpn-password-dialog.c:188
+#, c-format
+msgid "Cannot start VPN connection '%s'"
+msgstr ""
+
+#: ../gnome/applet/vpn-password-dialog.c:154
+#, c-format
+msgid ""
+"Could not find the authentication dialog for VPN connection type '%s'. "
+"Contact your system administrator."
+msgstr ""
+
+#: ../gnome/applet/vpn-password-dialog.c:191
+#, c-format
+msgid ""
+"There was a problem launching the authentication dialog for VPN connection "
+"type '%s'. Contact your system administrator."
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:1
+msgid " "
+msgstr " "
+
+#: ../gnome/applet/applet.glade.h:2
+#, fuzzy
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
+msgstr "<span weight=\"bold\">Rrjete Wireless:</span>"
+
+#: ../gnome/applet/applet.glade.h:4
+#, fuzzy, no-c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
+"Network</span>\n"
+"\n"
+"A passphrase or encryption key is required to access the wireless network '%"
+"s'."
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Fjalëkalimi kërkohet nga Rrjeti  "
+"Wirelessi</span>\n"
+"\n"
+"Për t'u futur në rrjetin wireless '%s' kërkohet fjalëkalimi ose një kyç WEP."
+
+#: ../gnome/applet/applet.glade.h:8
+#, no-c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
+"\n"
+"%s  It will not be completely functional."
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:12
+#, fuzzy, no-c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
+"span>\n"
+"\n"
+"You have chosen to log in to the wireless network '%s'.  If you are sure "
+"that this wireless network is secure, click the checkbox below and "
+"NetworkManager will not require confirmation on subsequent log ins."
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Konfirmimi i futjes në Rrjetin "
+"Wireless</span>\n"
+"\n"
+"Jeni duke u futur në rrjetin wireless '%s'.  Nëse jeni i sigurt që ky rrjet "
+"pa fije është i sigurt, kliko tek kutia zgjedhëse e mëposhtme dhe "
+"NetworkManager nuk do t'ju bezdisë më me pyetje të kota në momentin që do të "
+"dëshironi të lidheni me të."
+
+#: ../gnome/applet/applet.glade.h:15
+msgid "Anonymous Identity:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:16
+msgid "Authentication:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:17
+msgid "Broadcast Address:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:18
+msgid "CA Certificate File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:19
+msgid "C_onnect"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:20
+msgid "Client Certificate File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:21
+msgid "Connection Information"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:22
+msgid "Default Route:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:23
+msgid "Destination Address:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:24
+msgid "Driver:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:25
+msgid "EAP Method:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:26
+msgid "Hardware Address:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:27
+msgid "IP Address:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:28
+msgid "Identity:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:29
+msgid "Interface:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:30
+msgid "Key Type:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:31
+msgid "Key:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:32
+msgid ""
+"None\n"
+"WEP 128-bit Passphrase\n"
+"WEP 64/128-bit Hex\n"
+"WEP 64/128-bit ASCII\n"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:37
+msgid ""
+"Open System\n"
+"Shared Key"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:39
+#, fuzzy
+msgid "Other Wireless Network..."
+msgstr "Rrjete të tjerë Wireless..."
+
+#: ../gnome/applet/applet.glade.h:40
+msgid "Passphrase:"
+msgstr "Fjalëkalimi:"
+
+#: ../gnome/applet/applet.glade.h:41
+msgid "Password:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:42
+msgid "Primary DNS:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:43
+msgid "Private Key File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:44
+msgid "Private Key Password:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:45
+msgid "Secondary DNS:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:46
+msgid "Select the CA Certificate File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:47
+msgid "Select the Client Certificate File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:48
+msgid "Select the Private Key File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:49
+msgid "Show key"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:50
+#, fuzzy
+msgid "Show passphrase"
+msgstr "Fjalëkalimi:"
+
+#: ../gnome/applet/applet.glade.h:51
+msgid "Show password"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:52
+msgid "Show passwords"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:53
+msgid "Speed:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:54
+msgid "Subnet Mask:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:55
+msgid "Type:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:56
+msgid "User Name:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:57
+msgid "Wireless Network Key Required"
+msgstr "Nevoitet Kyçi i Rrjetit Wireless"
+
+#: ../gnome/applet/applet.glade.h:58
+msgid "Wireless _adapter:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:59
+#, fuzzy
+msgid "_Always Trust this Wireless Network"
+msgstr "Ky rrjet wireless është gjithmonë i besueshëm"
+
+#: ../gnome/applet/applet.glade.h:60
+msgid "_Don't remind me again"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:61
+msgid "_Login to Network"
+msgstr "_Identifikohu në Rrjet"
+
+#: ../gnome/applet/applet.glade.h:62
+msgid "_Network Name:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:63
+#, fuzzy
+msgid "_Wireless Security:"
+msgstr "Ndrysho Rrjetet Wireless"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:383
+msgid "Cannot add VPN connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:385
+msgid ""
+"No suitable VPN software was found on your system. Contact your system "
+"administrator."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:437
+msgid "Cannot import VPN connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:439
+#, c-format
+msgid ""
+"Cannot find suitable software for VPN connection type '%s' to import the "
+"file '%s'. Contact your system administrator."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:579
+#, c-format
+msgid "Error retrieving VPN connection '%s'"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:582
+#, c-format
+msgid ""
+"Could not find the UI files for VPN connection type '%s'. Contact your "
+"system administrator."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:739
+#, c-format
+msgid "Delete VPN connection \"%s\"?"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:742
+#, c-format
+msgid ""
+"All information about the VPN connection \"%s\" will be lost and you may "
+"need your system administrator to provide information to create a new "
+"connection."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:959
+msgid "Unable to load"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:961
+#, fuzzy
+msgid "Cannot find some needed resources (the glade file)!"
+msgstr ""
+"Instrumenti NetworkManager nuk arrin të gjejë disa burime të nevojshme (file "
+"glade nuk u gjet)."
+
+#. Edit dialog
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
+#, fuzzy
+msgid "Edit VPN Connection"
+msgstr "Lidhjet e rrjetit"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:1
+msgid "Add a new VPN connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:2
+msgid "Choose which type of VPN connection you wish to create."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
+msgid "Connect to:"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
+#, fuzzy
+msgid "Create VPN Connection"
+msgstr "Lidhjet e rrjetit"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
+msgid "Create VPN Connection - 1 of 2"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
+msgid "Create VPN Connection - 2 of 2"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
+msgid "Delete the selected VPN connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
+msgid "E_xport"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:9
+msgid "Edit the selected VPN connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:10
+msgid "Export the VPN settings to a file"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:11
+msgid "Export the selected VPN connection to a file"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:12
+msgid "Finish Creating VPN Connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:13
+#, fuzzy
+msgid "Manage Virtual Private Network Connections"
+msgstr "Lidhjet e rrjetit"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:14
+msgid ""
+"This assistant will guide you through the creation of a connection to a "
+"Virtual Private Network (VPN).\n"
+"\n"
+"It will require some information, such as IP addresses and secrets.  Please "
+"see your system administrator to obtain this information."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:17
+#, fuzzy
+msgid "VPN Connections"
+msgstr "Lidhjet e rrjetit"
+
+#: ../src/nm-ap-security-wep.c:52
+msgid "40-bit WEP"
+msgstr ""
+
+#: ../src/nm-ap-security-wep.c:54
+msgid "104-bit WEP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:50
+msgid "WPA TKIP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:52
+msgid "WPA CCMP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:54
+msgid "WPA Automatic"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:59
+msgid "WPA2 TKIP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:61
+msgid "WPA2 CCMP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:63
+msgid "WPA2 Automatic"
+msgstr ""
+
+#: ../src/nm-ap-security.c:320
+msgid "none"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:154
+#, c-format
+msgid ""
+"unable to create netlink socket for monitoring wired ethernet devices - %s"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:172
+#, c-format
+msgid ""
+"unable to bind to netlink socket for monitoring wired ethernet devices - %s"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:405
+msgid "operation took too long"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:502
+msgid "received data from wrong type of sender"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:515
+msgid "received data from unexpected sender"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:646
+msgid "too much data was sent over socket and some of it was lost"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:735
+msgid "error occurred while waiting for data on socket"
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:898
+#, c-format
+msgid "You are now connected to the Ad-Hoc wireless network '%s'."
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:903
+#, fuzzy, c-format
+msgid "You are now connected to the wireless network '%s'."
+msgstr "Nuk ekziston asnjë rrjet wireless..."
+
+#: ../gnome/applet/applet-dbus-devices.c:910
+msgid "You are now connected to the wired network."
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:916
+msgid "Connection Established"
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:959
+msgid "Disconnected"
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:960
+msgid "The network connection has been disconnected."
+msgstr ""
+
+#~ msgid "Modify Wireless Networks"
+#~ msgstr "Ndrysho Rrjetet Wireless"
+
+#~ msgid "*"
+#~ msgstr "*"
 
 #~ msgid "There are no network devices..."
 #~ msgstr "Nuk ekziston asnjë dispozitiv rrjeti..."
 
+#~ msgid "<span weight=\"bold\">Wireless Networks:</span>"
+#~ msgstr "<span weight=\"bold\">Rrjete Wireless:</span>"
+
+#, fuzzy
+#~ msgid "Custom wireless network"
+#~ msgstr "Ndrysho Rrjetet Wireless"
+
+#, fuzzy
+#~ msgid "Other Wireless Networks..."
+#~ msgstr "Rrjete të tjerë Wireless..."
+
+#, fuzzy
+#~ msgid "Wireless _Network:"
+#~ msgstr "Ndrysho Rrjetet Wireless"
+
+#, fuzzy
+#~ msgid "Wired Network"
+#~ msgstr "Ndrysho Rrjetet Wireless"
+
+#~ msgid "There are no wireless networks..."
+#~ msgstr "Nuk ekziston asnjë rrjet wireless..."
+
 #~ msgid "Network Connections"
 #~ msgstr "Lidhjet e rrjetit"
 
 #~ msgid "_About..."
 #~ msgstr "_Informacione..."
 
-#~ msgid " "
-#~ msgstr " "
-
 #~ msgid ""
 #~ "<span weight=\"bold\" size=\"larger\">Wireless Network Login "
 #~ "Confirmation</span>\n"
diff --git a/po/sr.po b/po/sr.po
index 7b5372adcf..439f10d670 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,236 +6,398 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-13 16:11-0400\n"
+"POT-Creation-Date: 2006-05-29 18:33+0200\n"
 "PO-Revision-Date: 2005-05-14 18:47+02:00\n"
 "Last-Translator: Filip Miletic <f dot miletic at ewi dot tudelft dot nl>\n"
 "Language-Team: Serbian <gnu@prevod.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3;    plural=n%10==1 && n%100!=11 ? 0 :    n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3;    plural=n%10==1 && n%100!=11 ? 0 :    n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: examples/python/systray/eggtrayicon.c:111 gnome/applet/eggtrayicon.c:118
-msgid "Orientation"
-msgstr "У�мерење"
-
-# Потребан је бољи превод за ово
-#: examples/python/systray/eggtrayicon.c:112 gnome/applet/eggtrayicon.c:119
-msgid "The orientation of the tray."
-msgstr "У�мерење обавештајне зоне."
-
-#: gnome/applet/applet-dbus-info.c:852
-#, c-format
-msgid ""
-"The requested wireless network '%s' does not appear to be in range.  A "
-"different wireless network will be used if any are available."
-msgstr "Тражена бежична мрежа „%s“ није у домету. Биће коришћена друга бежична мрежа ако је ра�положива."
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:919
+#, fuzzy, c-format
+msgid "Passphrase for wireless network %s"
+msgstr "�аправи нову бежичну мрежу"
 
-#: gnome/applet/applet-dbus.c:573
-#, c-format
-msgid "Connection to the wireless network '%s' failed.\n"
+#: ../gnome/applet/applet-dbus.c:265
+#, fuzzy, c-format
+msgid "Connection to the wireless network '%s' failed."
 msgstr "�еу�пела веза �а бежичном мрежом „%s“.\n"
 
-#: gnome/applet/applet-dbus.c:578
-msgid "Connection to the wired network failed.\n"
+#: ../gnome/applet/applet-dbus.c:270
+#, fuzzy
+msgid "Connection to the wired network failed."
 msgstr "�еу�пела веза �а жичаном мрежом.\n"
 
-#: gnome/applet/applet.c:194 gnome/applet/applet.c:212
+#: ../gnome/applet/applet.c:184
+msgid "Error displaying connection information:"
+msgstr ""
+
+#: ../gnome/applet/applet.c:202
+#, fuzzy
+msgid "Could not find some required resources (the glade file)!"
+msgstr ""
+"�плет Управник мреже није могао да пронађе неке од потребних ре�ур�а (глејд "
+"датотека није пронађена)."
+
+#: ../gnome/applet/applet.c:213
+#, fuzzy
+msgid "No active connections!"
+msgstr "�ема мрежних веза"
+
+#: ../gnome/applet/applet.c:234
+#, fuzzy, c-format
+msgid "Wired Ethernet (%s)"
+msgstr "Жичана мрежа (%s)"
+
+#: ../gnome/applet/applet.c:236
+#, fuzzy, c-format
+msgid "Wireless Ethernet (%s)"
+msgstr "Бежична мрежа (%s)"
+
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:362
 msgid "NetworkManager Applet"
 msgstr "�плет Управник мреже"
 
-#: gnome/applet/applet.c:196 gnome/applet/applet.c:214
-msgid "Copyright (C) 2004-2005 Red Hat, Inc."
+#: ../gnome/applet/applet.c:339 ../gnome/applet/applet.c:364
+#, fuzzy
+msgid "Copyright © 2004-2005 Red Hat, Inc."
 msgstr "Copyright (C) 2004-2005 Red Hat, Inc."
 
-#: gnome/applet/applet.c:197 gnome/applet/applet.c:215
+#: ../gnome/applet/applet.c:340 ../gnome/applet/applet.c:365
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "�плет за обавештајну зону за управљање мрежним уређајима и везама."
 
-#: gnome/applet/applet.c:280
+#: ../gnome/applet/applet.c:343 ../gnome/applet/applet.c:370
+msgid "translator-credits"
+msgstr ""
+
+#: ../gnome/applet/applet.c:426
+msgid "VPN Login Failure"
+msgstr ""
+
+#: ../gnome/applet/applet.c:427
+#, c-format
+msgid "Could not start the VPN connection '%s' due to a login failure."
+msgstr ""
+
+#: ../gnome/applet/applet.c:431
+msgid "VPN Start Failure"
+msgstr ""
+
+#: ../gnome/applet/applet.c:432
 #, c-format
 msgid ""
-"<span weight=\"bold\" size=\"larger\">VPN Login Failure</span>\n"
-"\n"
-"Could not start the VPN connection '%s' due to a login failure.\n"
-"\n"
-"The VPN service said: \"%s\""
+"Could not start the VPN connection '%s' due to a failure launching the VPN "
+"program."
+msgstr ""
+
+#: ../gnome/applet/applet.c:436 ../gnome/applet/applet.c:446
+#, fuzzy
+msgid "VPN Connect Failure"
+msgstr "VPN везе"
+
+#: ../gnome/applet/applet.c:437
+#, c-format
+msgid "Could not start the VPN connection '%s' due to a connection error."
+msgstr ""
+
+#: ../gnome/applet/applet.c:441
+msgid "VPN Configuration Error"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Пријава на VPN није у�пела</span>\n"
-"\n"
-"VPN веза �а мрежом „%s“ није о�тварена јер пријава није у�пела.\n"
-"\n"
-"Порука VPN �ерви�а је била : „%s“"
 
-#: gnome/applet/applet.c:341
+#: ../gnome/applet/applet.c:442
+#, c-format
+msgid "The VPN connection '%s' was not correctly configured."
+msgstr ""
+
+#: ../gnome/applet/applet.c:447
 #, c-format
 msgid ""
-"<span weight=\"bold\" size=\"larger\">VPN Login Message</span>\n"
-"\n"
-"VPN connection '%s' said:\n"
-"\n"
-"\"%s\""
+"Could not start the VPN connection '%s' because the VPN server did not "
+"return an adequate network configuration."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Порука при пријави на VPN</span>\n"
-"\n"
-"Порука VPN везе „%s“ је:\n"
-"\n"
-"„%s“"
 
-#: gnome/applet/applet.c:559 gnome/applet/applet.c:1922
-#: gnome/applet/other-network-dialog.c:315
-#: gnome/applet/passphrase-dialog.c:430
+#: ../gnome/applet/applet.c:517
+msgid "VPN Login Message"
+msgstr ""
+
+#: ../gnome/applet/applet.c:741 ../gnome/applet/applet.c:2508
+#: ../gnome/applet/other-network-dialog.c:453
+#: ../gnome/applet/passphrase-dialog.c:228
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
-msgstr "�плет Управник мреже није могао да пронађе неке од потребних ре�ур�а (глејд датотека није пронађена)."
+msgstr ""
+"�плет Управник мреже није могао да пронађе неке од потребних ре�ур�а (глејд "
+"датотека није пронађена)."
 
-#: gnome/applet/applet.c:572
+#: ../gnome/applet/applet.c:753
 #, c-format
 msgid "The network device \"%s (%s)\" does not support wireless scanning."
 msgstr "Мрежни уређај „%s (%s)“ не подржава потрагу за бежичним мрежама."
 
-#: gnome/applet/applet.c:579
+#: ../gnome/applet/applet.c:761
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
 msgstr "Мрежни уређај „%s (%s)“ не подржава откривање везе."
 
-#: gnome/applet/applet.c:700
+#: ../gnome/applet/applet.c:908
 #, c-format
 msgid "Preparing device %s for the wired network..."
 msgstr "Припрема уређаја %s за жичану мрежу..."
 
-#: gnome/applet/applet.c:702
+#: ../gnome/applet/applet.c:910
 #, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
 msgstr "Припрема уређаја %s за бежичну мрежу „%s“..."
 
-#: gnome/applet/applet.c:709
+#: ../gnome/applet/applet.c:918
 #, c-format
 msgid "Configuring device %s for the wired network..."
 msgstr "Подешавање уређаја %s за бежичну мрежу..."
 
-#: gnome/applet/applet.c:711
+#: ../gnome/applet/applet.c:920
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
 msgstr "Покушај при�тупа бежичној мрежи „%s“..."
 
-#: gnome/applet/applet.c:718
+#: ../gnome/applet/applet.c:928
 #, c-format
 msgid "Waiting for Network Key for the wireless network '%s'..."
 msgstr "Чекање на мрежни кључ за бежичну мрежу „%s“..."
 
-#: gnome/applet/applet.c:725 gnome/applet/applet.c:734
+#: ../gnome/applet/applet.c:936 ../gnome/applet/applet.c:946
 msgid "Requesting a network address from the wired network..."
 msgstr "Потраживање мрежне адре�е за жичану мрежу..."
 
-#: gnome/applet/applet.c:727 gnome/applet/applet.c:736
+#: ../gnome/applet/applet.c:938 ../gnome/applet/applet.c:948
 #, c-format
 msgid "Requesting a network address from the wireless network '%s'..."
 msgstr "Потраживање мрежне адре�е за бежичну мрежу „%s“..."
 
-#: gnome/applet/applet.c:743
+#: ../gnome/applet/applet.c:956
 msgid "Finishing connection to the wired network..."
 msgstr "Обу�тављање везе �а жичаном мрежом..."
 
-#: gnome/applet/applet.c:745
+#: ../gnome/applet/applet.c:958
 #, c-format
 msgid "Finishing connection to the wireless network '%s'..."
 msgstr "Обу�тављање везе �а бежичном мрежом „%s“..."
 
-#: gnome/applet/applet.c:791
+#: ../gnome/applet/applet.c:1075
 msgid "NetworkManager is not running"
 msgstr "Управљач мреже није покренут"
 
-#: gnome/applet/applet.c:802
+#: ../gnome/applet/applet.c:1083 ../gnome/applet/applet.c:1828
+msgid "Networking disabled"
+msgstr ""
+
+#: ../gnome/applet/applet.c:1088
 msgid "No network connection"
 msgstr "�ема мрежних веза"
 
-#: gnome/applet/applet.c:809
+#: ../gnome/applet/applet.c:1093
 msgid "Wired network connection"
 msgstr "Бежична мрежна веза"
 
 # FIXME �д-хок
-#: gnome/applet/applet.c:816
+#: ../gnome/applet/applet.c:1097
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Повезан �а ад-хок бежичном мрежом"
 
-#: gnome/applet/applet.c:830
+#: ../gnome/applet/applet.c:1099
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "Бежична мрежна веза �а „%s“ (%d%%)"
 
-#: gnome/applet/applet.c:1181
-msgid "Other Wireless Networks..."
+#: ../gnome/applet/applet.c:1120
+#, fuzzy, c-format
+msgid "VPN connection to '%s'"
+msgstr "VPN везе"
+
+#: ../gnome/applet/applet.c:1128
+#, fuzzy, c-format
+msgid "VPN connecting to '%s'"
+msgstr "VPN везе"
+
+#: ../gnome/applet/applet.c:1541
+#, fuzzy
+msgid "_Connect to Other Wireless Network..."
 msgstr "О�тале бежичне мреже..."
 
-#: gnome/applet/applet.c:1202
-msgid "Create new Wireless Network..."
+#: ../gnome/applet/applet.c:1562
+#, fuzzy
+msgid "Create _New Wireless Network..."
 msgstr "�аправи нову бежичну мрежу..."
 
-#: gnome/applet/applet.c:1315
-msgid "VPN Connections"
+#: ../gnome/applet/applet.c:1685
+#, fuzzy
+msgid "_VPN Connections"
 msgstr "VPN везе"
 
-#: gnome/applet/applet.c:1337
-msgid "Disconnect VPN..."
+#: ../gnome/applet/applet.c:1730
+msgid "_Configure VPN..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1734
+#, fuzzy
+msgid "_Disconnect VPN..."
 msgstr "И�кључи VPN..."
 
-#: gnome/applet/applet.c:1366
+#: ../gnome/applet/applet.c:1756
+#, fuzzy
+msgid "_Dial Up Connections"
+msgstr "VPN везе"
+
+#. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
+#: ../gnome/applet/applet.c:1767
+#, fuzzy, c-format
+msgid "Connect to %s..."
+msgstr "И�кључи VPN..."
+
+#: ../gnome/applet/applet.c:1773
+#, fuzzy, c-format
+msgid "Disconnect from %s..."
+msgstr "И�кључи VPN..."
+
+#: ../gnome/applet/applet.c:1822
 msgid "No network devices have been found"
 msgstr "�ије пронађен ниједан мрежни уређај"
 
-#: gnome/applet/applet.c:1529
+#: ../gnome/applet/applet.c:2014
 msgid "NetworkManager is not running..."
 msgstr "Управљач мрежом није покренут..."
 
-#: gnome/applet/applet.c:1599 gnome/applet/applet.c:1647
-msgid "Pause Wireless Scanning"
-msgstr "Обу�тави тражење бежичне мреже"
-
-#: gnome/applet/applet.c:1604
-msgid "Resume Wireless Scanning"
-msgstr "�а�тави тражење бежичне мреже"
+#. 'Enable Networking' item
+#: ../gnome/applet/applet.c:2170
+msgid "Enable _Networking"
+msgstr ""
 
-#: gnome/applet/applet.c:1614 gnome/applet/applet.c:1653
-msgid "Stop All Wireless Devices"
-msgstr "Зау�тави �ве бежичне уређаје"
+#. 'Enable Wireless' item
+#: ../gnome/applet/applet.c:2176
+msgid "Enable _Wireless"
+msgstr ""
 
-#: gnome/applet/applet.c:1619
-msgid "Start All Wireless Devices"
-msgstr "Покрени �ве бежичне уређаје"
+#. 'Connection Information' item
+#: ../gnome/applet/applet.c:2182
+msgid "Connection _Information"
+msgstr ""
 
-#: gnome/applet/applet.c:1662
-msgid "Help"
+#. Help item
+#: ../gnome/applet/applet.c:2193
+#, fuzzy
+msgid "_Help"
 msgstr "Помоћ"
 
-#: gnome/applet/applet.c:1669
-msgid "About"
+#. About item
+#: ../gnome/applet/applet.c:2202
+#, fuzzy
+msgid "_About"
 msgstr "О програму"
 
-#: gnome/applet/applet.c:2070
+#: ../gnome/applet/applet.c:2667
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
-msgstr "Управљач мрежом није у�пео да пронађе неопходне ре�ур�е и не може да на�тави рад.\n"
+msgstr ""
+"Управљач мрежом није у�пео да пронађе неопходне ре�ур�е и не може да на�тави "
+"рад.\n"
 
-#: gnome/applet/gtkcellrendererprogress.c:243
-#: gnome/applet/gtkcellrendererprogress.c:301
-#, c-format
-msgid "progress bar label|%d %%"
-msgstr "%d %%"
+#: ../gnome/applet/wireless-security-option.c:157
+msgid "Open System"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:160
+msgid "Shared Key"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:208
+msgid "Automatic (Default)"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:215
+msgid "AES-CCMP"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:223
+msgid "TKIP"
+msgstr ""
 
-#: gnome/applet/menu-items.c:91
+#: ../gnome/applet/wireless-security-option.c:231
+msgid "Dynamic WEP"
+msgstr ""
+
+#: ../gnome/applet/wso-none.c:53
+msgid "None"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-ascii.c:138
+msgid "WEP 64/128-bit ASCII"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-hex.c:135
+msgid "WEP 64/128-bit Hex"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-passphrase.c:135
+#, fuzzy
+msgid "WEP 128-bit Passphrase"
+msgstr "Лозинка:"
+
+#: ../gnome/applet/wso-wpa-eap.c:237
+msgid "PEAP"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:238
+msgid "TLS"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:239
+msgid "TTLS"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
+#: ../src/nm-ap-security-wpa-eap.c:116
+msgid "WPA2 Enterprise"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
+#: ../src/nm-ap-security-wpa-eap.c:121
+msgid "WPA Enterprise"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-psk.c:178
+msgid "WPA2 Personal"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-psk.c:180
+msgid "WPA Personal"
+msgstr ""
+
+#: ../gnome/applet/eggtrayicon.c:134
+msgid "Orientation"
+msgstr "У�мерење"
+
+# Потребан је бољи превод за ово
+#: ../gnome/applet/eggtrayicon.c:135
+msgid "The orientation of the tray."
+msgstr "У�мерење обавештајне зоне."
+
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Жичана мрежа (%s)"
 
-#: gnome/applet/menu-items.c:93
-msgid "Wired Network"
+#: ../gnome/applet/menu-items.c:91
+#, fuzzy
+msgid "_Wired Network"
 msgstr "Жичана мрежа"
 
-#: gnome/applet/menu-items.c:166
+#: ../gnome/applet/menu-items.c:162
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
@@ -243,85 +405,104 @@ msgstr[0] "Бежична мрежа (%s)"
 msgstr[1] "Бежичне мреже (%s)"
 msgstr[2] "Бежичних мрежа (%s)"
 
-#: gnome/applet/menu-items.c:168
+#: ../gnome/applet/menu-items.c:164
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Бежична мрежа"
 msgstr[1] "Бежичне мреже"
 msgstr[2] "Бежичне мреже"
 
-#: gnome/applet/menu-items.c:294
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr " (неи�праван Уникод)"
 
-#: gnome/applet/other-network-dialog.c:148
-#: gnome/applet/passphrase-dialog.c:164
-#: gnome/applet/applet.glade.h:27
-msgid "Passphrase:"
-msgstr "Лозинка:"
-
-#: gnome/applet/other-network-dialog.c:151
-#: gnome/applet/passphrase-dialog.c:167
-msgid "Ascii Key:"
-msgstr "�СКРИ кључ:"
-
-#: gnome/applet/other-network-dialog.c:154
-#: gnome/applet/passphrase-dialog.c:170
-msgid "Hex Key:"
-msgstr "Хек�а кључ:"
+#: ../gnome/applet/other-network-dialog.c:352
+#, c-format
+msgid ""
+"By default, the wireless network's name is set to your computer's name, %s, "
+"with no encryption enabled"
+msgstr ""
 
-#: gnome/applet/other-network-dialog.c:229
+#: ../gnome/applet/other-network-dialog.c:358
 msgid "Create new wireless network"
 msgstr "�аправи нову бежичну мрежу"
 
-#: gnome/applet/other-network-dialog.c:230
+#: ../gnome/applet/other-network-dialog.c:359
+#, fuzzy
 msgid ""
-"Enter the ESSID and security settings of the wireless network you wish to "
+"Enter the name and security settings of the wireless network you wish to "
 "create."
-msgstr "Уне�ите ESSID и безбедно�не по�тавке бежичне мреже коју желите да начините."
+msgstr ""
+"Уне�ите ESSID и безбедно�не по�тавке бежичне мреже коју желите да начините."
+
+#: ../gnome/applet/other-network-dialog.c:363
+#, fuzzy
+msgid "Create New Wireless Network"
+msgstr "�аправи нову бежичну мрежу..."
 
-#: gnome/applet/other-network-dialog.c:235
-msgid "Custom wireless network"
+#: ../gnome/applet/other-network-dialog.c:368
+#, fuzzy
+msgid "Existing wireless network"
 msgstr "Кори�ничка бежична мрежа"
 
-#: gnome/applet/other-network-dialog.c:236
-msgid "Enter the ESSID of the wireless network to which you wish to connect."
+#: ../gnome/applet/other-network-dialog.c:369
+#, fuzzy
+msgid "Enter the name of the wireless network to which you wish to connect."
 msgstr "Уне�ите ESSID бежичне мреже �а којом желите да �е повежете."
 
-#: gnome/applet/vpn-password-dialog.c:105
-#, c-format
-msgid "You must log in to access the Virtual Private Network '%s'."
-msgstr "Морате бити пријављени како би�те кори�тили виртуелну приватну мрежу „%s“."
+#: ../gnome/applet/other-network-dialog.c:371
+#, fuzzy
+msgid "Connect to Other Wireless Network"
+msgstr "О�тале бежичне мреже..."
 
-#: gnome/applet/applet.glade.h:1
-msgid " "
-msgstr " "
+# FIXME �д-хок
+#: ../gnome/applet/passphrase-dialog.c:215
+#, fuzzy
+msgid "Error connecting to wireless network"
+msgstr "Повезан �а ад-хок бежичном мрежом"
 
-#: gnome/applet/applet.glade.h:2
-msgid "*"
-msgstr "*"
+#: ../gnome/applet/passphrase-dialog.c:216
+msgid ""
+"The requested wireless network requires security capabilities unsupported by "
+"your hardware."
+msgstr ""
 
-#: gnome/applet/applet.glade.h:3
+#: ../gnome/applet/vpn-password-dialog.c:151
+#: ../gnome/applet/vpn-password-dialog.c:188
+#, c-format
+msgid "Cannot start VPN connection '%s'"
+msgstr ""
+
+#: ../gnome/applet/vpn-password-dialog.c:154
+#, c-format
 msgid ""
-"128-bit Passphrase (WEP)\n"
-"Ascii Key (WEP)\n"
-"Hex Key (WEP)"
+"Could not find the authentication dialog for VPN connection type '%s'. "
+"Contact your system administrator."
 msgstr ""
-"128-битни кључ (WEP)\n"
-"�СКРИ кључ (WEP)\n"
-"Хек� кључ (WEP)"
 
-#: gnome/applet/applet.glade.h:6
+#: ../gnome/applet/vpn-password-dialog.c:191
+#, c-format
 msgid ""
-"128-bit passphrase (WEP)\n"
-"Ascii key (WEP)\n"
-"Hex key (WEP)"
+"There was a problem launching the authentication dialog for VPN connection "
+"type '%s'. Contact your system administrator."
 msgstr ""
-"128-битни кључ (WEP)\n"
-"�СКРИ кључ (WEP)\n"
-"Хек� кључ (WEP)"
 
-#: gnome/applet/applet.glade.h:10
+#: ../gnome/applet/applet.glade.h:1
+msgid " "
+msgstr " "
+
+#: ../gnome/applet/applet.glade.h:2
+#, fuzzy
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Порука при пријави на VPN</span>\n"
+"\n"
+"Порука VPN везе „%s“ је:\n"
+"\n"
+"„%s“"
+
+#: ../gnome/applet/applet.glade.h:4
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
@@ -334,104 +515,614 @@ msgstr ""
 "\n"
 " Лозинка или кључ за шифровање �у неопходни за при�туп бежичној мрежи „%s“."
 
-#: gnome/applet/applet.glade.h:14
+#: ../gnome/applet/applet.glade.h:8
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
 "\n"
 "%s  It will not be completely functional."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Смањена употребна вредно�т мреже</span>\n"
+"<span weight=\"bold\" size=\"larger\">Смањена употребна вредно�т мреже</"
+"span>\n"
 "\n"
 "%s неће бити �а�вим употребљива."
 
-#: gnome/applet/applet.glade.h:18
-#, no-c-format
+#: ../gnome/applet/applet.glade.h:12
+#, fuzzy, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
 "span>\n"
 "\n"
-"You have chosen log in to the wireless network '%s'.  If you are sure this "
-"wireless network is secure, click the checkbox below and NetworkManager will "
-"no longer pester you with stupid questions when you connect to it."
+"You have chosen to log in to the wireless network '%s'.  If you are sure "
+"that this wireless network is secure, click the checkbox below and "
+"NetworkManager will not require confirmation on subsequent log ins."
 msgstr ""
 "<span weight=\"bold\" size=\"larger\">Потврда пријаве на мрежу</span>\n"
 "\n"
-"Желите да �е пријавите на мрежу „%s“. �ко �те �игурни да је ова бежична мрежа безбедна, обележите кућицу и�под и Управник мреже вам више неће по�тављати �увишна питања при пријави на ову мрежу."
+"Желите да �е пријавите на мрежу „%s“. �ко �те �игурни да је ова бежична "
+"мрежа безбедна, обележите кућицу и�под и Управник мреже вам више неће "
+"по�тављати �увишна питања при пријави на ову мрежу."
 
-#: gnome/applet/applet.glade.h:21
-msgid "Always Trust this Wireless Network"
-msgstr "Увек поклони поверење бежичној мрежи"
+#: ../gnome/applet/applet.glade.h:15
+msgid "Anonymous Identity:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:16
+#, fuzzy
+msgid "Authentication:"
+msgstr "У�мерење"
 
-#: gnome/applet/applet.glade.h:22
+#: ../gnome/applet/applet.glade.h:17
+msgid "Broadcast Address:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:18
+msgid "CA Certificate File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:19
 msgid "C_onnect"
 msgstr "П_овежи �е"
 
-#: gnome/applet/applet.glade.h:23
-msgid "Connect with encryption enabled"
-msgstr "Повежи �е и укључи шифровање"
+#: ../gnome/applet/applet.glade.h:20
+msgid "Client Certificate File:"
+msgstr ""
 
-#: gnome/applet/applet.glade.h:24
-msgid "Don't remind me again"
-msgstr "�е под�ећај ме више"
+#: ../gnome/applet/applet.glade.h:21
+msgid "Connection Information"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:22
+msgid "Default Route:"
+msgstr ""
 
-#: gnome/applet/applet.glade.h:25
+#: ../gnome/applet/applet.glade.h:23
+msgid "Destination Address:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:24
+msgid "Driver:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:25
+msgid "EAP Method:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:26
+msgid "Hardware Address:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:27
+msgid "IP Address:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:28
+msgid "Identity:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:29
+msgid "Interface:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:30
 msgid "Key Type:"
 msgstr "Вр�та кључа:"
 
-#: gnome/applet/applet.glade.h:26
-msgid "Key type:"
+#: ../gnome/applet/applet.glade.h:31
+#, fuzzy
+msgid "Key:"
+msgstr "Хек�а кључ:"
+
+#: ../gnome/applet/applet.glade.h:32
+msgid ""
+"None\n"
+"WEP 128-bit Passphrase\n"
+"WEP 64/128-bit Hex\n"
+"WEP 64/128-bit ASCII\n"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:37
+msgid ""
+"Open System\n"
+"Shared Key"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:39
+#, fuzzy
+msgid "Other Wireless Network..."
+msgstr "О�тале бежичне мреже..."
+
+#: ../gnome/applet/applet.glade.h:40
+msgid "Passphrase:"
+msgstr "Лозинка:"
+
+#: ../gnome/applet/applet.glade.h:41
+msgid "Password:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:42
+msgid "Primary DNS:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:43
+msgid "Private Key File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:44
+msgid "Private Key Password:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:45
+msgid "Secondary DNS:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:46
+msgid "Select the CA Certificate File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:47
+msgid "Select the Client Certificate File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:48
+msgid "Select the Private Key File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:49
+msgid "Show key"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:50
+#, fuzzy
+msgid "Show passphrase"
+msgstr "Лозинка:"
+
+#: ../gnome/applet/applet.glade.h:51
+msgid "Show password"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:52
+msgid "Show passwords"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:53
+msgid "Speed:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:54
+msgid "Subnet Mask:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:55
+#, fuzzy
+msgid "Type:"
 msgstr "Вр�та кључа:"
 
-#: gnome/applet/applet.glade.h:28
+#: ../gnome/applet/applet.glade.h:56
+msgid "User Name:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:57
 msgid "Wireless Network Key Required"
 msgstr "Потребан је кључ за бежичну мрежу"
 
-#: gnome/applet/applet.glade.h:29
+#: ../gnome/applet/applet.glade.h:58
 msgid "Wireless _adapter:"
 msgstr "Бежични _уређај:"
 
-#: gnome/applet/applet.glade.h:30
-msgid "Wireless _network:"
-msgstr "Бежична _мрежа:"
+#: ../gnome/applet/applet.glade.h:59
+#, fuzzy
+msgid "_Always Trust this Wireless Network"
+msgstr "Увек поклони поверење бежичној мрежи"
+
+#: ../gnome/applet/applet.glade.h:60
+#, fuzzy
+msgid "_Don't remind me again"
+msgstr "�е под�ећај ме више"
 
-#: gnome/applet/applet.glade.h:31
+#: ../gnome/applet/applet.glade.h:61
 msgid "_Login to Network"
 msgstr "_Умрежи �е"
 
-#: gnome/applet/applet.glade.h:32
-msgid "_OK"
-msgstr "_У реду"
+#: ../gnome/applet/applet.glade.h:62
+msgid "_Network Name:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:63
+#, fuzzy
+msgid "_Wireless Security:"
+msgstr "Бежични _уређај:"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:383
+#, fuzzy
+msgid "Cannot add VPN connection"
+msgstr "VPN везе"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:385
+msgid ""
+"No suitable VPN software was found on your system. Contact your system "
+"administrator."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:437
+#, fuzzy
+msgid "Cannot import VPN connection"
+msgstr "�ема мрежних веза"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:439
+#, c-format
+msgid ""
+"Cannot find suitable software for VPN connection type '%s' to import the "
+"file '%s'. Contact your system administrator."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:579
+#, c-format
+msgid "Error retrieving VPN connection '%s'"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:582
+#, c-format
+msgid ""
+"Could not find the UI files for VPN connection type '%s'. Contact your "
+"system administrator."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:739
+#, fuzzy, c-format
+msgid "Delete VPN connection \"%s\"?"
+msgstr "VPN везе"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:742
+#, c-format
+msgid ""
+"All information about the VPN connection \"%s\" will be lost and you may "
+"need your system administrator to provide information to create a new "
+"connection."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:959
+msgid "Unable to load"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:961
+#, fuzzy
+msgid "Cannot find some needed resources (the glade file)!"
+msgstr ""
+"�плет Управник мреже није могао да пронађе неке од потребних ре�ур�а (глејд "
+"датотека није пронађена)."
+
+#. Edit dialog
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
+#, fuzzy
+msgid "Edit VPN Connection"
+msgstr "VPN везе"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:1
+#, fuzzy
+msgid "Add a new VPN connection"
+msgstr "�ема мрежних веза"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:2
+msgid "Choose which type of VPN connection you wish to create."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
+#, fuzzy
+msgid "Connect to:"
+msgstr "П_овежи �е"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
+#, fuzzy
+msgid "Create VPN Connection"
+msgstr "VPN везе"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
+#, fuzzy
+msgid "Create VPN Connection - 1 of 2"
+msgstr "VPN везе"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
+#, fuzzy
+msgid "Create VPN Connection - 2 of 2"
+msgstr "VPN везе"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
+msgid "Delete the selected VPN connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
+msgid "E_xport"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:9
+msgid "Edit the selected VPN connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:10
+msgid "Export the VPN settings to a file"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:11
+msgid "Export the selected VPN connection to a file"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:12
+#, fuzzy
+msgid "Finish Creating VPN Connection"
+msgstr "VPN везе"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:13
+#, fuzzy
+msgid "Manage Virtual Private Network Connections"
+msgstr "Бежична мрежна веза"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:14
+msgid ""
+"This assistant will guide you through the creation of a connection to a "
+"Virtual Private Network (VPN).\n"
+"\n"
+"It will require some information, such as IP addresses and secrets.  Please "
+"see your system administrator to obtain this information."
+msgstr ""
 
-#: src/nm-netlink-monitor.c:154
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:17
+msgid "VPN Connections"
+msgstr "VPN везе"
+
+#: ../src/nm-ap-security-wep.c:52
+msgid "40-bit WEP"
+msgstr ""
+
+#: ../src/nm-ap-security-wep.c:54
+msgid "104-bit WEP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:50
+msgid "WPA TKIP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:52
+msgid "WPA CCMP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:54
+msgid "WPA Automatic"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:59
+msgid "WPA2 TKIP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:61
+msgid "WPA2 CCMP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:63
+msgid "WPA2 Automatic"
+msgstr ""
+
+#: ../src/nm-ap-security.c:320
+msgid "none"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:154
 #, c-format
 msgid ""
 "unable to create netlink socket for monitoring wired ethernet devices - %s"
-msgstr "�ије могуће направити утичницу за по�матрање жичаног мрежног уређаја - %s"
+msgstr ""
+"�ије могуће направити утичницу за по�матрање жичаног мрежног уређаја - %s"
 
-#: src/nm-netlink-monitor.c:172
+#: ../src/nm-netlink-monitor.c:172
 #, c-format
 msgid ""
 "unable to bind to netlink socket for monitoring wired ethernet devices - %s"
-msgstr "�ије могуће повезати �е на утичницу за по�матрање жичаног мрежног уређаја - %s"
+msgstr ""
+"�ије могуће повезати �е на утичницу за по�матрање жичаног мрежног уређаја - %"
+"s"
 
-#: src/nm-netlink-monitor.c:404
+#: ../src/nm-netlink-monitor.c:405
 msgid "operation took too long"
 msgstr "Потрага је предуго трајала"
 
-#: src/nm-netlink-monitor.c:501
+#: ../src/nm-netlink-monitor.c:502
 msgid "received data from wrong type of sender"
 msgstr "Примљени �у подаци погрешног типа од пошиљаоца"
 
-#: src/nm-netlink-monitor.c:514
+#: ../src/nm-netlink-monitor.c:515
 msgid "received data from unexpected sender"
 msgstr "Примљени �у подаци од неочекиваног пошиљаоца"
 
-#: src/nm-netlink-monitor.c:536
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: src/nm-netlink-monitor.c:645
+#: ../src/nm-netlink-monitor.c:646
 msgid "too much data was sent over socket and some of it was lost"
 msgstr "Сувише података је по�лато кроз утичницу и нешто од њих је изгубљено"
+
+#: ../src/nm-netlink-monitor.c:735
+msgid "error occurred while waiting for data on socket"
+msgstr ""
+
+# FIXME �д-хок
+#: ../gnome/applet/applet-dbus-devices.c:898
+#, fuzzy, c-format
+msgid "You are now connected to the Ad-Hoc wireless network '%s'."
+msgstr "Повезан �а ад-хок бежичном мрежом"
+
+#: ../gnome/applet/applet-dbus-devices.c:903
+#, fuzzy, c-format
+msgid "You are now connected to the wireless network '%s'."
+msgstr "Обу�тављање везе �а бежичном мрежом „%s“..."
+
+#: ../gnome/applet/applet-dbus-devices.c:910
+#, fuzzy
+msgid "You are now connected to the wired network."
+msgstr "Обу�тављање везе �а жичаном мрежом..."
+
+#: ../gnome/applet/applet-dbus-devices.c:916
+#, fuzzy
+msgid "Connection Established"
+msgstr "Повежи �е и укључи шифровање"
+
+#: ../gnome/applet/applet-dbus-devices.c:959
+#, fuzzy
+msgid "Disconnected"
+msgstr "И�кључи VPN..."
+
+#: ../gnome/applet/applet-dbus-devices.c:960
+msgid "The network connection has been disconnected."
+msgstr ""
+
+#~ msgid ""
+#~ "The requested wireless network '%s' does not appear to be in range.  A "
+#~ "different wireless network will be used if any are available."
+#~ msgstr ""
+#~ "Тражена бежична мрежа „%s“ није у домету. Биће коришћена друга бежична "
+#~ "мрежа ако је ра�положива."
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">VPN Login Failure</span>\n"
+#~ "\n"
+#~ "Could not start the VPN connection '%s' due to a login failure.\n"
+#~ "\n"
+#~ "The VPN service said: \"%s\""
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Пријава на VPN није у�пела</span>\n"
+#~ "\n"
+#~ "VPN веза �а мрежом „%s“ није о�тварена јер пријава није у�пела.\n"
+#~ "\n"
+#~ "Порука VPN �ерви�а је била : „%s“"
+
+#~ msgid "Pause Wireless Scanning"
+#~ msgstr "Обу�тави тражење бежичне мреже"
+
+#~ msgid "Resume Wireless Scanning"
+#~ msgstr "�а�тави тражење бежичне мреже"
+
+#~ msgid "Stop All Wireless Devices"
+#~ msgstr "Зау�тави �ве бежичне уређаје"
+
+#~ msgid "Start All Wireless Devices"
+#~ msgstr "Покрени �ве бежичне уређаје"
+
+#~ msgid "progress bar label|%d %%"
+#~ msgstr "%d %%"
+
+#~ msgid "Ascii Key:"
+#~ msgstr "�СКРИ кључ:"
+
+#~ msgid "You must log in to access the Virtual Private Network '%s'."
+#~ msgstr ""
+#~ "Морате бити пријављени како би�те кори�тили виртуелну приватну мрежу „%s“."
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid ""
+#~ "128-bit Passphrase (WEP)\n"
+#~ "Ascii Key (WEP)\n"
+#~ "Hex Key (WEP)"
+#~ msgstr ""
+#~ "128-битни кључ (WEP)\n"
+#~ "�СКРИ кључ (WEP)\n"
+#~ "Хек� кључ (WEP)"
+
+#~ msgid ""
+#~ "128-bit passphrase (WEP)\n"
+#~ "Ascii key (WEP)\n"
+#~ "Hex key (WEP)"
+#~ msgstr ""
+#~ "128-битни кључ (WEP)\n"
+#~ "�СКРИ кључ (WEP)\n"
+#~ "Хек� кључ (WEP)"
+
+#~ msgid "Key type:"
+#~ msgstr "Вр�та кључа:"
+
+#~ msgid "Wireless _network:"
+#~ msgstr "Бежична _мрежа:"
+
+#~ msgid "_OK"
+#~ msgstr "_У реду"
+
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid "Connection to the wireless network '%s' failed.\n"
+#~ msgstr "�еу�пела веза �а бежичном мрежом „%s“.\n"
+
+#~ msgid "Connection to the wired network failed.\n"
+#~ msgstr "�еу�пела веза �а жичаном мрежом.\n"
+
+#~ msgid "Copyright (C) 2004-2005 Red Hat, Inc."
+#~ msgstr "Copyright (C) 2004-2005 Red Hat, Inc."
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">VPN Login Message</span>\n"
+#~ "\n"
+#~ "VPN connection '%s' said:\n"
+#~ "\n"
+#~ "\"%s\""
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Порука при пријави на VPN</span>\n"
+#~ "\n"
+#~ "Порука VPN везе „%s“ је:\n"
+#~ "\n"
+#~ "„%s“"
+
+#~ msgid "Other Wireless Networks..."
+#~ msgstr "О�тале бежичне мреже..."
+
+#~ msgid "Create new Wireless Network..."
+#~ msgstr "�аправи нову бежичну мрежу..."
+
+#~ msgid "Disconnect VPN..."
+#~ msgstr "И�кључи VPN..."
+
+#~ msgid "Help"
+#~ msgstr "Помоћ"
+
+#~ msgid "About"
+#~ msgstr "О програму"
+
+#~ msgid "Wired Network"
+#~ msgstr "Жичана мрежа"
+
+#~ msgid "Hex Key:"
+#~ msgstr "Хек�а кључ:"
+
+#~ msgid ""
+#~ "Enter the ESSID and security settings of the wireless network you wish to "
+#~ "create."
+#~ msgstr ""
+#~ "Уне�ите ESSID и безбедно�не по�тавке бежичне мреже коју желите да "
+#~ "начините."
+
+#~ msgid "Custom wireless network"
+#~ msgstr "Кори�ничка бежична мрежа"
+
+#~ msgid ""
+#~ "Enter the ESSID of the wireless network to which you wish to connect."
+#~ msgstr "Уне�ите ESSID бежичне мреже �а којом желите да �е повежете."
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Wireless Network Login "
+#~ "Confirmation</span>\n"
+#~ "\n"
+#~ "You have chosen log in to the wireless network '%s'.  If you are sure "
+#~ "this wireless network is secure, click the checkbox below and "
+#~ "NetworkManager will no longer pester you with stupid questions when you "
+#~ "connect to it."
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Потврда пријаве на мрежу</span>\n"
+#~ "\n"
+#~ "Желите да �е пријавите на мрежу „%s“. �ко �те �игурни да је ова бежична "
+#~ "мрежа безбедна, обележите кућицу и�под и Управник мреже вам више неће "
+#~ "по�тављати �увишна питања при пријави на ову мрежу."
+
+#~ msgid "Always Trust this Wireless Network"
+#~ msgstr "Увек поклони поверење бежичној мрежи"
+
+#~ msgid "Connect with encryption enabled"
+#~ msgstr "Повежи �е и укључи шифровање"
+
+#~ msgid "Don't remind me again"
+#~ msgstr "�е под�ећај ме више"
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index d3d57e051f..254bc0c8a7 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -6,236 +6,398 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-13 16:11-0400\n"
+"POT-Creation-Date: 2006-05-29 18:33+0200\n"
 "PO-Revision-Date: 2005-05-14 18:47+02:00\n"
 "Last-Translator: Filip Miletic <f dot miletic at ewi dot tudelft dot nl>\n"
 "Language-Team: Serbian <gnu@prevod.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3;    plural=n%10==1 && n%100!=11 ? 0 :    n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3;    plural=n%10==1 && n%100!=11 ? 0 :    n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: examples/python/systray/eggtrayicon.c:111 gnome/applet/eggtrayicon.c:118
-msgid "Orientation"
-msgstr "Usmerenje"
-
-# Potreban je bolji prevod za ovo
-#: examples/python/systray/eggtrayicon.c:112 gnome/applet/eggtrayicon.c:119
-msgid "The orientation of the tray."
-msgstr "Usmerenje obaveštajne zone."
-
-#: gnome/applet/applet-dbus-info.c:852
-#, c-format
-msgid ""
-"The requested wireless network '%s' does not appear to be in range.  A "
-"different wireless network will be used if any are available."
-msgstr "Tražena beži�na mreža „%s“ nije u dometu. Biće korišćena druga beži�na mreža ako je raspoloživa."
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:919
+#, fuzzy, c-format
+msgid "Passphrase for wireless network %s"
+msgstr "Napravi novu beži�nu mrežu"
 
-#: gnome/applet/applet-dbus.c:573
-#, c-format
-msgid "Connection to the wireless network '%s' failed.\n"
+#: ../gnome/applet/applet-dbus.c:265
+#, fuzzy, c-format
+msgid "Connection to the wireless network '%s' failed."
 msgstr "Neuspela veza sa beži�nom mrežom „%s“.\n"
 
-#: gnome/applet/applet-dbus.c:578
-msgid "Connection to the wired network failed.\n"
+#: ../gnome/applet/applet-dbus.c:270
+#, fuzzy
+msgid "Connection to the wired network failed."
 msgstr "Neuspela veza sa ži�anom mrežom.\n"
 
-#: gnome/applet/applet.c:194 gnome/applet/applet.c:212
+#: ../gnome/applet/applet.c:184
+msgid "Error displaying connection information:"
+msgstr ""
+
+#: ../gnome/applet/applet.c:202
+#, fuzzy
+msgid "Could not find some required resources (the glade file)!"
+msgstr ""
+"Aplet Upravnik mreže nije mogao da pronađe neke od potrebnih resursa (glejd "
+"datoteka nije pronađena)."
+
+#: ../gnome/applet/applet.c:213
+#, fuzzy
+msgid "No active connections!"
+msgstr "Nema mrežnih veza"
+
+#: ../gnome/applet/applet.c:234
+#, fuzzy, c-format
+msgid "Wired Ethernet (%s)"
+msgstr "Ži�ana mreža (%s)"
+
+#: ../gnome/applet/applet.c:236
+#, fuzzy, c-format
+msgid "Wireless Ethernet (%s)"
+msgstr "Beži�na mreža (%s)"
+
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:362
 msgid "NetworkManager Applet"
 msgstr "Aplet Upravnik mreže"
 
-#: gnome/applet/applet.c:196 gnome/applet/applet.c:214
-msgid "Copyright (C) 2004-2005 Red Hat, Inc."
+#: ../gnome/applet/applet.c:339 ../gnome/applet/applet.c:364
+#, fuzzy
+msgid "Copyright © 2004-2005 Red Hat, Inc."
 msgstr "Copyright (C) 2004-2005 Red Hat, Inc."
 
-#: gnome/applet/applet.c:197 gnome/applet/applet.c:215
+#: ../gnome/applet/applet.c:340 ../gnome/applet/applet.c:365
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "Aplet za obaveštajnu zonu za upravljanje mrežnim uređajima i vezama."
 
-#: gnome/applet/applet.c:280
+#: ../gnome/applet/applet.c:343 ../gnome/applet/applet.c:370
+msgid "translator-credits"
+msgstr ""
+
+#: ../gnome/applet/applet.c:426
+msgid "VPN Login Failure"
+msgstr ""
+
+#: ../gnome/applet/applet.c:427
+#, c-format
+msgid "Could not start the VPN connection '%s' due to a login failure."
+msgstr ""
+
+#: ../gnome/applet/applet.c:431
+msgid "VPN Start Failure"
+msgstr ""
+
+#: ../gnome/applet/applet.c:432
 #, c-format
 msgid ""
-"<span weight=\"bold\" size=\"larger\">VPN Login Failure</span>\n"
-"\n"
-"Could not start the VPN connection '%s' due to a login failure.\n"
-"\n"
-"The VPN service said: \"%s\""
+"Could not start the VPN connection '%s' due to a failure launching the VPN "
+"program."
+msgstr ""
+
+#: ../gnome/applet/applet.c:436 ../gnome/applet/applet.c:446
+#, fuzzy
+msgid "VPN Connect Failure"
+msgstr "VPN veze"
+
+#: ../gnome/applet/applet.c:437
+#, c-format
+msgid "Could not start the VPN connection '%s' due to a connection error."
+msgstr ""
+
+#: ../gnome/applet/applet.c:441
+msgid "VPN Configuration Error"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Prijava na VPN nije uspela</span>\n"
-"\n"
-"VPN veza sa mrežom „%s“ nije ostvarena jer prijava nije uspela.\n"
-"\n"
-"Poruka VPN servisa je bila : „%s“"
 
-#: gnome/applet/applet.c:341
+#: ../gnome/applet/applet.c:442
+#, c-format
+msgid "The VPN connection '%s' was not correctly configured."
+msgstr ""
+
+#: ../gnome/applet/applet.c:447
 #, c-format
 msgid ""
-"<span weight=\"bold\" size=\"larger\">VPN Login Message</span>\n"
-"\n"
-"VPN connection '%s' said:\n"
-"\n"
-"\"%s\""
+"Could not start the VPN connection '%s' because the VPN server did not "
+"return an adequate network configuration."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Poruka pri prijavi na VPN</span>\n"
-"\n"
-"Poruka VPN veze „%s“ je:\n"
-"\n"
-"„%s“"
 
-#: gnome/applet/applet.c:559 gnome/applet/applet.c:1922
-#: gnome/applet/other-network-dialog.c:315
-#: gnome/applet/passphrase-dialog.c:430
+#: ../gnome/applet/applet.c:517
+msgid "VPN Login Message"
+msgstr ""
+
+#: ../gnome/applet/applet.c:741 ../gnome/applet/applet.c:2508
+#: ../gnome/applet/other-network-dialog.c:453
+#: ../gnome/applet/passphrase-dialog.c:228
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
-msgstr "Aplet Upravnik mreže nije mogao da pronađe neke od potrebnih resursa (glejd datoteka nije pronađena)."
+msgstr ""
+"Aplet Upravnik mreže nije mogao da pronađe neke od potrebnih resursa (glejd "
+"datoteka nije pronađena)."
 
-#: gnome/applet/applet.c:572
+#: ../gnome/applet/applet.c:753
 #, c-format
 msgid "The network device \"%s (%s)\" does not support wireless scanning."
 msgstr "Mrežni uređaj „%s (%s)“ ne podržava potragu za beži�nim mrežama."
 
-#: gnome/applet/applet.c:579
+#: ../gnome/applet/applet.c:761
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
 msgstr "Mrežni uređaj „%s (%s)“ ne podržava otkrivanje veze."
 
-#: gnome/applet/applet.c:700
+#: ../gnome/applet/applet.c:908
 #, c-format
 msgid "Preparing device %s for the wired network..."
 msgstr "Priprema uređaja %s za ži�anu mrežu..."
 
-#: gnome/applet/applet.c:702
+#: ../gnome/applet/applet.c:910
 #, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
 msgstr "Priprema uređaja %s za beži�nu mrežu „%s“..."
 
-#: gnome/applet/applet.c:709
+#: ../gnome/applet/applet.c:918
 #, c-format
 msgid "Configuring device %s for the wired network..."
 msgstr "Podešavanje uređaja %s za beži�nu mrežu..."
 
-#: gnome/applet/applet.c:711
+#: ../gnome/applet/applet.c:920
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
 msgstr "Pokušaj pristupa beži�noj mreži „%s“..."
 
-#: gnome/applet/applet.c:718
+#: ../gnome/applet/applet.c:928
 #, c-format
 msgid "Waiting for Network Key for the wireless network '%s'..."
 msgstr "Čekanje na mrežni klju� za beži�nu mrežu „%s“..."
 
-#: gnome/applet/applet.c:725 gnome/applet/applet.c:734
+#: ../gnome/applet/applet.c:936 ../gnome/applet/applet.c:946
 msgid "Requesting a network address from the wired network..."
 msgstr "Potraživanje mrežne adrese za ži�anu mrežu..."
 
-#: gnome/applet/applet.c:727 gnome/applet/applet.c:736
+#: ../gnome/applet/applet.c:938 ../gnome/applet/applet.c:948
 #, c-format
 msgid "Requesting a network address from the wireless network '%s'..."
 msgstr "Potraživanje mrežne adrese za beži�nu mrežu „%s“..."
 
-#: gnome/applet/applet.c:743
+#: ../gnome/applet/applet.c:956
 msgid "Finishing connection to the wired network..."
 msgstr "Obustavljanje veze sa ži�anom mrežom..."
 
-#: gnome/applet/applet.c:745
+#: ../gnome/applet/applet.c:958
 #, c-format
 msgid "Finishing connection to the wireless network '%s'..."
 msgstr "Obustavljanje veze sa beži�nom mrežom „%s“..."
 
-#: gnome/applet/applet.c:791
+#: ../gnome/applet/applet.c:1075
 msgid "NetworkManager is not running"
 msgstr "Upravlja� mreže nije pokrenut"
 
-#: gnome/applet/applet.c:802
+#: ../gnome/applet/applet.c:1083 ../gnome/applet/applet.c:1828
+msgid "Networking disabled"
+msgstr ""
+
+#: ../gnome/applet/applet.c:1088
 msgid "No network connection"
 msgstr "Nema mrežnih veza"
 
-#: gnome/applet/applet.c:809
+#: ../gnome/applet/applet.c:1093
 msgid "Wired network connection"
 msgstr "Beži�na mrežna veza"
 
 # FIXME Ad-hok
-#: gnome/applet/applet.c:816
+#: ../gnome/applet/applet.c:1097
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Povezan sa ad-hok beži�nom mrežom"
 
-#: gnome/applet/applet.c:830
+#: ../gnome/applet/applet.c:1099
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "Beži�na mrežna veza sa „%s“ (%d%%)"
 
-#: gnome/applet/applet.c:1181
-msgid "Other Wireless Networks..."
+#: ../gnome/applet/applet.c:1120
+#, fuzzy, c-format
+msgid "VPN connection to '%s'"
+msgstr "VPN veze"
+
+#: ../gnome/applet/applet.c:1128
+#, fuzzy, c-format
+msgid "VPN connecting to '%s'"
+msgstr "VPN veze"
+
+#: ../gnome/applet/applet.c:1541
+#, fuzzy
+msgid "_Connect to Other Wireless Network..."
 msgstr "Ostale beži�ne mreže..."
 
-#: gnome/applet/applet.c:1202
-msgid "Create new Wireless Network..."
+#: ../gnome/applet/applet.c:1562
+#, fuzzy
+msgid "Create _New Wireless Network..."
 msgstr "Napravi novu beži�nu mrežu..."
 
-#: gnome/applet/applet.c:1315
-msgid "VPN Connections"
+#: ../gnome/applet/applet.c:1685
+#, fuzzy
+msgid "_VPN Connections"
 msgstr "VPN veze"
 
-#: gnome/applet/applet.c:1337
-msgid "Disconnect VPN..."
+#: ../gnome/applet/applet.c:1730
+msgid "_Configure VPN..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1734
+#, fuzzy
+msgid "_Disconnect VPN..."
 msgstr "Isklju�i VPN..."
 
-#: gnome/applet/applet.c:1366
+#: ../gnome/applet/applet.c:1756
+#, fuzzy
+msgid "_Dial Up Connections"
+msgstr "VPN veze"
+
+#. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
+#: ../gnome/applet/applet.c:1767
+#, fuzzy, c-format
+msgid "Connect to %s..."
+msgstr "Isklju�i VPN..."
+
+#: ../gnome/applet/applet.c:1773
+#, fuzzy, c-format
+msgid "Disconnect from %s..."
+msgstr "Isklju�i VPN..."
+
+#: ../gnome/applet/applet.c:1822
 msgid "No network devices have been found"
 msgstr "Nije pronađen nijedan mrežni uređaj"
 
-#: gnome/applet/applet.c:1529
+#: ../gnome/applet/applet.c:2014
 msgid "NetworkManager is not running..."
 msgstr "Upravlja� mrežom nije pokrenut..."
 
-#: gnome/applet/applet.c:1599 gnome/applet/applet.c:1647
-msgid "Pause Wireless Scanning"
-msgstr "Obustavi traženje beži�ne mreže"
-
-#: gnome/applet/applet.c:1604
-msgid "Resume Wireless Scanning"
-msgstr "Nastavi traženje beži�ne mreže"
+#. 'Enable Networking' item
+#: ../gnome/applet/applet.c:2170
+msgid "Enable _Networking"
+msgstr ""
 
-#: gnome/applet/applet.c:1614 gnome/applet/applet.c:1653
-msgid "Stop All Wireless Devices"
-msgstr "Zaustavi sve beži�ne uređaje"
+#. 'Enable Wireless' item
+#: ../gnome/applet/applet.c:2176
+msgid "Enable _Wireless"
+msgstr ""
 
-#: gnome/applet/applet.c:1619
-msgid "Start All Wireless Devices"
-msgstr "Pokreni sve beži�ne uređaje"
+#. 'Connection Information' item
+#: ../gnome/applet/applet.c:2182
+msgid "Connection _Information"
+msgstr ""
 
-#: gnome/applet/applet.c:1662
-msgid "Help"
+#. Help item
+#: ../gnome/applet/applet.c:2193
+#, fuzzy
+msgid "_Help"
 msgstr "Pomoć"
 
-#: gnome/applet/applet.c:1669
-msgid "About"
+#. About item
+#: ../gnome/applet/applet.c:2202
+#, fuzzy
+msgid "_About"
 msgstr "O programu"
 
-#: gnome/applet/applet.c:2070
+#: ../gnome/applet/applet.c:2667
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
-msgstr "Upravlja� mrežom nije uspeo da pronađe neophodne resurse i ne može da nastavi rad.\n"
+msgstr ""
+"Upravlja� mrežom nije uspeo da pronađe neophodne resurse i ne može da "
+"nastavi rad.\n"
 
-#: gnome/applet/gtkcellrendererprogress.c:243
-#: gnome/applet/gtkcellrendererprogress.c:301
-#, c-format
-msgid "progress bar label|%d %%"
-msgstr "%d %%"
+#: ../gnome/applet/wireless-security-option.c:157
+msgid "Open System"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:160
+msgid "Shared Key"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:208
+msgid "Automatic (Default)"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:215
+msgid "AES-CCMP"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:223
+msgid "TKIP"
+msgstr ""
 
-#: gnome/applet/menu-items.c:91
+#: ../gnome/applet/wireless-security-option.c:231
+msgid "Dynamic WEP"
+msgstr ""
+
+#: ../gnome/applet/wso-none.c:53
+msgid "None"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-ascii.c:138
+msgid "WEP 64/128-bit ASCII"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-hex.c:135
+msgid "WEP 64/128-bit Hex"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-passphrase.c:135
+#, fuzzy
+msgid "WEP 128-bit Passphrase"
+msgstr "Lozinka:"
+
+#: ../gnome/applet/wso-wpa-eap.c:237
+msgid "PEAP"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:238
+msgid "TLS"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:239
+msgid "TTLS"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
+#: ../src/nm-ap-security-wpa-eap.c:116
+msgid "WPA2 Enterprise"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
+#: ../src/nm-ap-security-wpa-eap.c:121
+msgid "WPA Enterprise"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-psk.c:178
+msgid "WPA2 Personal"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-psk.c:180
+msgid "WPA Personal"
+msgstr ""
+
+#: ../gnome/applet/eggtrayicon.c:134
+msgid "Orientation"
+msgstr "Usmerenje"
+
+# Potreban je bolji prevod za ovo
+#: ../gnome/applet/eggtrayicon.c:135
+msgid "The orientation of the tray."
+msgstr "Usmerenje obaveštajne zone."
+
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Ži�ana mreža (%s)"
 
-#: gnome/applet/menu-items.c:93
-msgid "Wired Network"
+#: ../gnome/applet/menu-items.c:91
+#, fuzzy
+msgid "_Wired Network"
 msgstr "Ži�ana mreža"
 
-#: gnome/applet/menu-items.c:166
+#: ../gnome/applet/menu-items.c:162
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
@@ -243,85 +405,104 @@ msgstr[0] "Beži�na mreža (%s)"
 msgstr[1] "Beži�ne mreže (%s)"
 msgstr[2] "Beži�nih mreža (%s)"
 
-#: gnome/applet/menu-items.c:168
+#: ../gnome/applet/menu-items.c:164
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Beži�na mreža"
 msgstr[1] "Beži�ne mreže"
 msgstr[2] "Beži�ne mreže"
 
-#: gnome/applet/menu-items.c:294
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr " (neispravan Unikod)"
 
-#: gnome/applet/other-network-dialog.c:148
-#: gnome/applet/passphrase-dialog.c:164
-#: gnome/applet/applet.glade.h:27
-msgid "Passphrase:"
-msgstr "Lozinka:"
-
-#: gnome/applet/other-network-dialog.c:151
-#: gnome/applet/passphrase-dialog.c:167
-msgid "Ascii Key:"
-msgstr "ASKRI klju�:"
-
-#: gnome/applet/other-network-dialog.c:154
-#: gnome/applet/passphrase-dialog.c:170
-msgid "Hex Key:"
-msgstr "Heksa klju�:"
+#: ../gnome/applet/other-network-dialog.c:352
+#, c-format
+msgid ""
+"By default, the wireless network's name is set to your computer's name, %s, "
+"with no encryption enabled"
+msgstr ""
 
-#: gnome/applet/other-network-dialog.c:229
+#: ../gnome/applet/other-network-dialog.c:358
 msgid "Create new wireless network"
 msgstr "Napravi novu beži�nu mrežu"
 
-#: gnome/applet/other-network-dialog.c:230
+#: ../gnome/applet/other-network-dialog.c:359
+#, fuzzy
 msgid ""
-"Enter the ESSID and security settings of the wireless network you wish to "
+"Enter the name and security settings of the wireless network you wish to "
 "create."
-msgstr "Unesite ESSID i bezbednosne postavke beži�ne mreže koju želite da na�inite."
+msgstr ""
+"Unesite ESSID i bezbednosne postavke beži�ne mreže koju želite da na�inite."
+
+#: ../gnome/applet/other-network-dialog.c:363
+#, fuzzy
+msgid "Create New Wireless Network"
+msgstr "Napravi novu beži�nu mrežu..."
 
-#: gnome/applet/other-network-dialog.c:235
-msgid "Custom wireless network"
+#: ../gnome/applet/other-network-dialog.c:368
+#, fuzzy
+msgid "Existing wireless network"
 msgstr "Korisni�ka beži�na mreža"
 
-#: gnome/applet/other-network-dialog.c:236
-msgid "Enter the ESSID of the wireless network to which you wish to connect."
+#: ../gnome/applet/other-network-dialog.c:369
+#, fuzzy
+msgid "Enter the name of the wireless network to which you wish to connect."
 msgstr "Unesite ESSID beži�ne mreže sa kojom želite da se povežete."
 
-#: gnome/applet/vpn-password-dialog.c:105
-#, c-format
-msgid "You must log in to access the Virtual Private Network '%s'."
-msgstr "Morate biti prijavljeni kako biste koristili virtuelnu privatnu mrežu „%s“."
+#: ../gnome/applet/other-network-dialog.c:371
+#, fuzzy
+msgid "Connect to Other Wireless Network"
+msgstr "Ostale beži�ne mreže..."
 
-#: gnome/applet/applet.glade.h:1
-msgid " "
-msgstr " "
+# FIXME Ad-hok
+#: ../gnome/applet/passphrase-dialog.c:215
+#, fuzzy
+msgid "Error connecting to wireless network"
+msgstr "Povezan sa ad-hok beži�nom mrežom"
 
-#: gnome/applet/applet.glade.h:2
-msgid "*"
-msgstr "*"
+#: ../gnome/applet/passphrase-dialog.c:216
+msgid ""
+"The requested wireless network requires security capabilities unsupported by "
+"your hardware."
+msgstr ""
 
-#: gnome/applet/applet.glade.h:3
+#: ../gnome/applet/vpn-password-dialog.c:151
+#: ../gnome/applet/vpn-password-dialog.c:188
+#, c-format
+msgid "Cannot start VPN connection '%s'"
+msgstr ""
+
+#: ../gnome/applet/vpn-password-dialog.c:154
+#, c-format
 msgid ""
-"128-bit Passphrase (WEP)\n"
-"Ascii Key (WEP)\n"
-"Hex Key (WEP)"
+"Could not find the authentication dialog for VPN connection type '%s'. "
+"Contact your system administrator."
 msgstr ""
-"128-bitni klju� (WEP)\n"
-"ASKRI klju� (WEP)\n"
-"Heks klju� (WEP)"
 
-#: gnome/applet/applet.glade.h:6
+#: ../gnome/applet/vpn-password-dialog.c:191
+#, c-format
 msgid ""
-"128-bit passphrase (WEP)\n"
-"Ascii key (WEP)\n"
-"Hex key (WEP)"
+"There was a problem launching the authentication dialog for VPN connection "
+"type '%s'. Contact your system administrator."
 msgstr ""
-"128-bitni klju� (WEP)\n"
-"ASKRI klju� (WEP)\n"
-"Heks klju� (WEP)"
 
-#: gnome/applet/applet.glade.h:10
+#: ../gnome/applet/applet.glade.h:1
+msgid " "
+msgstr " "
+
+#: ../gnome/applet/applet.glade.h:2
+#, fuzzy
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Poruka pri prijavi na VPN</span>\n"
+"\n"
+"Poruka VPN veze „%s“ je:\n"
+"\n"
+"„%s“"
+
+#: ../gnome/applet/applet.glade.h:4
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
@@ -334,104 +515,615 @@ msgstr ""
 "\n"
 " Lozinka ili klju� za šifrovanje su neophodni za pristup beži�noj mreži „%s“."
 
-#: gnome/applet/applet.glade.h:14
+#: ../gnome/applet/applet.glade.h:8
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
 "\n"
 "%s  It will not be completely functional."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Smanjena upotrebna vrednost mreže</span>\n"
+"<span weight=\"bold\" size=\"larger\">Smanjena upotrebna vrednost mreže</"
+"span>\n"
 "\n"
 "%s neće biti sasvim upotrebljiva."
 
-#: gnome/applet/applet.glade.h:18
-#, no-c-format
+#: ../gnome/applet/applet.glade.h:12
+#, fuzzy, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
 "span>\n"
 "\n"
-"You have chosen log in to the wireless network '%s'.  If you are sure this "
-"wireless network is secure, click the checkbox below and NetworkManager will "
-"no longer pester you with stupid questions when you connect to it."
+"You have chosen to log in to the wireless network '%s'.  If you are sure "
+"that this wireless network is secure, click the checkbox below and "
+"NetworkManager will not require confirmation on subsequent log ins."
 msgstr ""
 "<span weight=\"bold\" size=\"larger\">Potvrda prijave na mrežu</span>\n"
 "\n"
-"Želite da se prijavite na mrežu „%s“. Ako ste sigurni da je ova beži�na mreža bezbedna, obeležite kućicu ispod i Upravnik mreže vam više neće postavljati suvišna pitanja pri prijavi na ovu mrežu."
+"Želite da se prijavite na mrežu „%s“. Ako ste sigurni da je ova beži�na "
+"mreža bezbedna, obeležite kućicu ispod i Upravnik mreže vam više neće "
+"postavljati suvišna pitanja pri prijavi na ovu mrežu."
 
-#: gnome/applet/applet.glade.h:21
-msgid "Always Trust this Wireless Network"
-msgstr "Uvek pokloni poverenje beži�noj mreži"
+#: ../gnome/applet/applet.glade.h:15
+msgid "Anonymous Identity:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:16
+#, fuzzy
+msgid "Authentication:"
+msgstr "Usmerenje"
 
-#: gnome/applet/applet.glade.h:22
+#: ../gnome/applet/applet.glade.h:17
+msgid "Broadcast Address:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:18
+msgid "CA Certificate File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:19
 msgid "C_onnect"
 msgstr "P_oveži se"
 
-#: gnome/applet/applet.glade.h:23
-msgid "Connect with encryption enabled"
-msgstr "Poveži se i uklju�i šifrovanje"
+#: ../gnome/applet/applet.glade.h:20
+msgid "Client Certificate File:"
+msgstr ""
 
-#: gnome/applet/applet.glade.h:24
-msgid "Don't remind me again"
-msgstr "Ne podsećaj me više"
+#: ../gnome/applet/applet.glade.h:21
+msgid "Connection Information"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:22
+msgid "Default Route:"
+msgstr ""
 
-#: gnome/applet/applet.glade.h:25
+#: ../gnome/applet/applet.glade.h:23
+msgid "Destination Address:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:24
+msgid "Driver:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:25
+msgid "EAP Method:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:26
+msgid "Hardware Address:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:27
+msgid "IP Address:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:28
+msgid "Identity:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:29
+msgid "Interface:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:30
 msgid "Key Type:"
 msgstr "Vrsta klju�a:"
 
-#: gnome/applet/applet.glade.h:26
-msgid "Key type:"
+#: ../gnome/applet/applet.glade.h:31
+#, fuzzy
+msgid "Key:"
+msgstr "Heksa klju�:"
+
+#: ../gnome/applet/applet.glade.h:32
+msgid ""
+"None\n"
+"WEP 128-bit Passphrase\n"
+"WEP 64/128-bit Hex\n"
+"WEP 64/128-bit ASCII\n"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:37
+msgid ""
+"Open System\n"
+"Shared Key"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:39
+#, fuzzy
+msgid "Other Wireless Network..."
+msgstr "Ostale beži�ne mreže..."
+
+#: ../gnome/applet/applet.glade.h:40
+msgid "Passphrase:"
+msgstr "Lozinka:"
+
+#: ../gnome/applet/applet.glade.h:41
+msgid "Password:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:42
+msgid "Primary DNS:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:43
+msgid "Private Key File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:44
+msgid "Private Key Password:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:45
+msgid "Secondary DNS:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:46
+msgid "Select the CA Certificate File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:47
+msgid "Select the Client Certificate File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:48
+msgid "Select the Private Key File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:49
+msgid "Show key"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:50
+#, fuzzy
+msgid "Show passphrase"
+msgstr "Lozinka:"
+
+#: ../gnome/applet/applet.glade.h:51
+msgid "Show password"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:52
+msgid "Show passwords"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:53
+msgid "Speed:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:54
+msgid "Subnet Mask:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:55
+#, fuzzy
+msgid "Type:"
 msgstr "Vrsta klju�a:"
 
-#: gnome/applet/applet.glade.h:28
+#: ../gnome/applet/applet.glade.h:56
+msgid "User Name:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:57
 msgid "Wireless Network Key Required"
 msgstr "Potreban je klju� za beži�nu mrežu"
 
-#: gnome/applet/applet.glade.h:29
+#: ../gnome/applet/applet.glade.h:58
 msgid "Wireless _adapter:"
 msgstr "Beži�ni _uređaj:"
 
-#: gnome/applet/applet.glade.h:30
-msgid "Wireless _network:"
-msgstr "Beži�na _mreža:"
+#: ../gnome/applet/applet.glade.h:59
+#, fuzzy
+msgid "_Always Trust this Wireless Network"
+msgstr "Uvek pokloni poverenje beži�noj mreži"
+
+#: ../gnome/applet/applet.glade.h:60
+#, fuzzy
+msgid "_Don't remind me again"
+msgstr "Ne podsećaj me više"
 
-#: gnome/applet/applet.glade.h:31
+#: ../gnome/applet/applet.glade.h:61
 msgid "_Login to Network"
 msgstr "_Umreži se"
 
-#: gnome/applet/applet.glade.h:32
-msgid "_OK"
-msgstr "_U redu"
+#: ../gnome/applet/applet.glade.h:62
+msgid "_Network Name:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:63
+#, fuzzy
+msgid "_Wireless Security:"
+msgstr "Beži�ni _uređaj:"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:383
+#, fuzzy
+msgid "Cannot add VPN connection"
+msgstr "VPN veze"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:385
+msgid ""
+"No suitable VPN software was found on your system. Contact your system "
+"administrator."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:437
+#, fuzzy
+msgid "Cannot import VPN connection"
+msgstr "Nema mrežnih veza"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:439
+#, c-format
+msgid ""
+"Cannot find suitable software for VPN connection type '%s' to import the "
+"file '%s'. Contact your system administrator."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:579
+#, c-format
+msgid "Error retrieving VPN connection '%s'"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:582
+#, c-format
+msgid ""
+"Could not find the UI files for VPN connection type '%s'. Contact your "
+"system administrator."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:739
+#, fuzzy, c-format
+msgid "Delete VPN connection \"%s\"?"
+msgstr "VPN veze"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:742
+#, c-format
+msgid ""
+"All information about the VPN connection \"%s\" will be lost and you may "
+"need your system administrator to provide information to create a new "
+"connection."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:959
+msgid "Unable to load"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:961
+#, fuzzy
+msgid "Cannot find some needed resources (the glade file)!"
+msgstr ""
+"Aplet Upravnik mreže nije mogao da pronađe neke od potrebnih resursa (glejd "
+"datoteka nije pronađena)."
+
+#. Edit dialog
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
+#, fuzzy
+msgid "Edit VPN Connection"
+msgstr "VPN veze"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:1
+#, fuzzy
+msgid "Add a new VPN connection"
+msgstr "Nema mrežnih veza"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:2
+msgid "Choose which type of VPN connection you wish to create."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
+#, fuzzy
+msgid "Connect to:"
+msgstr "P_oveži se"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
+#, fuzzy
+msgid "Create VPN Connection"
+msgstr "VPN veze"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
+#, fuzzy
+msgid "Create VPN Connection - 1 of 2"
+msgstr "VPN veze"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
+#, fuzzy
+msgid "Create VPN Connection - 2 of 2"
+msgstr "VPN veze"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
+msgid "Delete the selected VPN connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
+msgid "E_xport"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:9
+msgid "Edit the selected VPN connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:10
+msgid "Export the VPN settings to a file"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:11
+msgid "Export the selected VPN connection to a file"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:12
+#, fuzzy
+msgid "Finish Creating VPN Connection"
+msgstr "VPN veze"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:13
+#, fuzzy
+msgid "Manage Virtual Private Network Connections"
+msgstr "Beži�na mrežna veza"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:14
+msgid ""
+"This assistant will guide you through the creation of a connection to a "
+"Virtual Private Network (VPN).\n"
+"\n"
+"It will require some information, such as IP addresses and secrets.  Please "
+"see your system administrator to obtain this information."
+msgstr ""
 
-#: src/nm-netlink-monitor.c:154
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:17
+msgid "VPN Connections"
+msgstr "VPN veze"
+
+#: ../src/nm-ap-security-wep.c:52
+msgid "40-bit WEP"
+msgstr ""
+
+#: ../src/nm-ap-security-wep.c:54
+msgid "104-bit WEP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:50
+msgid "WPA TKIP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:52
+msgid "WPA CCMP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:54
+msgid "WPA Automatic"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:59
+msgid "WPA2 TKIP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:61
+msgid "WPA2 CCMP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:63
+msgid "WPA2 Automatic"
+msgstr ""
+
+#: ../src/nm-ap-security.c:320
+msgid "none"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:154
 #, c-format
 msgid ""
 "unable to create netlink socket for monitoring wired ethernet devices - %s"
-msgstr "Nije moguće napraviti uti�nicu za posmatranje ži�anog mrežnog uređaja - %s"
+msgstr ""
+"Nije moguće napraviti uti�nicu za posmatranje ži�anog mrežnog uređaja - %s"
 
-#: src/nm-netlink-monitor.c:172
+#: ../src/nm-netlink-monitor.c:172
 #, c-format
 msgid ""
 "unable to bind to netlink socket for monitoring wired ethernet devices - %s"
-msgstr "Nije moguće povezati se na uti�nicu za posmatranje ži�anog mrežnog uređaja - %s"
+msgstr ""
+"Nije moguće povezati se na uti�nicu za posmatranje ži�anog mrežnog uređaja - "
+"%s"
 
-#: src/nm-netlink-monitor.c:404
+#: ../src/nm-netlink-monitor.c:405
 msgid "operation took too long"
 msgstr "Potraga je predugo trajala"
 
-#: src/nm-netlink-monitor.c:501
+#: ../src/nm-netlink-monitor.c:502
 msgid "received data from wrong type of sender"
 msgstr "Primljeni su podaci pogrešnog tipa od pošiljaoca"
 
-#: src/nm-netlink-monitor.c:514
+#: ../src/nm-netlink-monitor.c:515
 msgid "received data from unexpected sender"
 msgstr "Primljeni su podaci od neo�ekivanog pošiljaoca"
 
-#: src/nm-netlink-monitor.c:536
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: src/nm-netlink-monitor.c:645
+#: ../src/nm-netlink-monitor.c:646
 msgid "too much data was sent over socket and some of it was lost"
 msgstr "Suviše podataka je poslato kroz uti�nicu i nešto od njih je izgubljeno"
+
+#: ../src/nm-netlink-monitor.c:735
+msgid "error occurred while waiting for data on socket"
+msgstr ""
+
+# FIXME Ad-hok
+#: ../gnome/applet/applet-dbus-devices.c:898
+#, fuzzy, c-format
+msgid "You are now connected to the Ad-Hoc wireless network '%s'."
+msgstr "Povezan sa ad-hok beži�nom mrežom"
+
+#: ../gnome/applet/applet-dbus-devices.c:903
+#, fuzzy, c-format
+msgid "You are now connected to the wireless network '%s'."
+msgstr "Obustavljanje veze sa beži�nom mrežom „%s“..."
+
+#: ../gnome/applet/applet-dbus-devices.c:910
+#, fuzzy
+msgid "You are now connected to the wired network."
+msgstr "Obustavljanje veze sa ži�anom mrežom..."
+
+#: ../gnome/applet/applet-dbus-devices.c:916
+#, fuzzy
+msgid "Connection Established"
+msgstr "Poveži se i uklju�i šifrovanje"
+
+#: ../gnome/applet/applet-dbus-devices.c:959
+#, fuzzy
+msgid "Disconnected"
+msgstr "Isklju�i VPN..."
+
+#: ../gnome/applet/applet-dbus-devices.c:960
+msgid "The network connection has been disconnected."
+msgstr ""
+
+#~ msgid ""
+#~ "The requested wireless network '%s' does not appear to be in range.  A "
+#~ "different wireless network will be used if any are available."
+#~ msgstr ""
+#~ "Tražena beži�na mreža „%s“ nije u dometu. Biće korišćena druga beži�na "
+#~ "mreža ako je raspoloživa."
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">VPN Login Failure</span>\n"
+#~ "\n"
+#~ "Could not start the VPN connection '%s' due to a login failure.\n"
+#~ "\n"
+#~ "The VPN service said: \"%s\""
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Prijava na VPN nije uspela</span>\n"
+#~ "\n"
+#~ "VPN veza sa mrežom „%s“ nije ostvarena jer prijava nije uspela.\n"
+#~ "\n"
+#~ "Poruka VPN servisa je bila : „%s“"
+
+#~ msgid "Pause Wireless Scanning"
+#~ msgstr "Obustavi traženje beži�ne mreže"
+
+#~ msgid "Resume Wireless Scanning"
+#~ msgstr "Nastavi traženje beži�ne mreže"
+
+#~ msgid "Stop All Wireless Devices"
+#~ msgstr "Zaustavi sve beži�ne uređaje"
+
+#~ msgid "Start All Wireless Devices"
+#~ msgstr "Pokreni sve beži�ne uređaje"
+
+#~ msgid "progress bar label|%d %%"
+#~ msgstr "%d %%"
+
+#~ msgid "Ascii Key:"
+#~ msgstr "ASKRI klju�:"
+
+#~ msgid "You must log in to access the Virtual Private Network '%s'."
+#~ msgstr ""
+#~ "Morate biti prijavljeni kako biste koristili virtuelnu privatnu mrežu „%"
+#~ "s“."
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid ""
+#~ "128-bit Passphrase (WEP)\n"
+#~ "Ascii Key (WEP)\n"
+#~ "Hex Key (WEP)"
+#~ msgstr ""
+#~ "128-bitni klju� (WEP)\n"
+#~ "ASKRI klju� (WEP)\n"
+#~ "Heks klju� (WEP)"
+
+#~ msgid ""
+#~ "128-bit passphrase (WEP)\n"
+#~ "Ascii key (WEP)\n"
+#~ "Hex key (WEP)"
+#~ msgstr ""
+#~ "128-bitni klju� (WEP)\n"
+#~ "ASKRI klju� (WEP)\n"
+#~ "Heks klju� (WEP)"
+
+#~ msgid "Key type:"
+#~ msgstr "Vrsta klju�a:"
+
+#~ msgid "Wireless _network:"
+#~ msgstr "Beži�na _mreža:"
+
+#~ msgid "_OK"
+#~ msgstr "_U redu"
+
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid "Connection to the wireless network '%s' failed.\n"
+#~ msgstr "Neuspela veza sa beži�nom mrežom „%s“.\n"
+
+#~ msgid "Connection to the wired network failed.\n"
+#~ msgstr "Neuspela veza sa ži�anom mrežom.\n"
+
+#~ msgid "Copyright (C) 2004-2005 Red Hat, Inc."
+#~ msgstr "Copyright (C) 2004-2005 Red Hat, Inc."
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">VPN Login Message</span>\n"
+#~ "\n"
+#~ "VPN connection '%s' said:\n"
+#~ "\n"
+#~ "\"%s\""
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Poruka pri prijavi na VPN</span>\n"
+#~ "\n"
+#~ "Poruka VPN veze „%s“ je:\n"
+#~ "\n"
+#~ "„%s“"
+
+#~ msgid "Other Wireless Networks..."
+#~ msgstr "Ostale beži�ne mreže..."
+
+#~ msgid "Create new Wireless Network..."
+#~ msgstr "Napravi novu beži�nu mrežu..."
+
+#~ msgid "Disconnect VPN..."
+#~ msgstr "Isklju�i VPN..."
+
+#~ msgid "Help"
+#~ msgstr "Pomoć"
+
+#~ msgid "About"
+#~ msgstr "O programu"
+
+#~ msgid "Wired Network"
+#~ msgstr "Ži�ana mreža"
+
+#~ msgid "Hex Key:"
+#~ msgstr "Heksa klju�:"
+
+#~ msgid ""
+#~ "Enter the ESSID and security settings of the wireless network you wish to "
+#~ "create."
+#~ msgstr ""
+#~ "Unesite ESSID i bezbednosne postavke beži�ne mreže koju želite da "
+#~ "na�inite."
+
+#~ msgid "Custom wireless network"
+#~ msgstr "Korisni�ka beži�na mreža"
+
+#~ msgid ""
+#~ "Enter the ESSID of the wireless network to which you wish to connect."
+#~ msgstr "Unesite ESSID beži�ne mreže sa kojom želite da se povežete."
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Wireless Network Login "
+#~ "Confirmation</span>\n"
+#~ "\n"
+#~ "You have chosen log in to the wireless network '%s'.  If you are sure "
+#~ "this wireless network is secure, click the checkbox below and "
+#~ "NetworkManager will no longer pester you with stupid questions when you "
+#~ "connect to it."
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Potvrda prijave na mrežu</span>\n"
+#~ "\n"
+#~ "Želite da se prijavite na mrežu „%s“. Ako ste sigurni da je ova beži�na "
+#~ "mreža bezbedna, obeležite kućicu ispod i Upravnik mreže vam više neće "
+#~ "postavljati suvišna pitanja pri prijavi na ovu mrežu."
+
+#~ msgid "Always Trust this Wireless Network"
+#~ msgstr "Uvek pokloni poverenje beži�noj mreži"
+
+#~ msgid "Connect with encryption enabled"
+#~ msgstr "Poveži se i uklju�i šifrovanje"
+
+#~ msgid "Don't remind me again"
+#~ msgstr "Ne podsećaj me više"
diff --git a/po/sv.po b/po/sv.po
index 5e57e0dc43..f32fd7e0fa 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -2,13 +2,13 @@
 # Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 # Christian Rose <menthos@menthos.com>, 2004, 2005.
 #
-# $Id: sv.po,v 1.9 2006/02/27 06:53:33 dcbw Exp $
+# $Id: sv.po,v 1.9.2.1 2006/05/29 16:58:09 utx Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-18 01:14+0200\n"
+"POT-Creation-Date: 2006-05-29 18:33+0200\n"
 "PO-Revision-Date: 2005-09-18 01:14+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -17,86 +17,79 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. Setup a request to the keyring to save the network passphrase
-#: ../gnome/applet/applet-dbus-info.c:864
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:919
 #, c-format
 msgid "Passphrase for wireless network %s"
 msgstr "Lösenfras för det trådlösa nätverket %s"
 
-#: ../gnome/applet/applet-dbus-info.c:1082
-#, c-format
-msgid ""
-"The requested wireless network '%s' does not appear to be in range.  A "
-"different wireless network will be used if any are available."
-msgstr ""
-"Det begärda trådlösa nätverket \"%s\" verkar inte vara inom räckhåll. Ett "
-"annat trådlöst nätverk kommer att användas om något är tillgängligt."
-
-#: ../gnome/applet/applet-dbus.c:317
+#: ../gnome/applet/applet-dbus.c:265
 #, c-format
 msgid "Connection to the wireless network '%s' failed."
 msgstr "Anslutning till det trådlösa nätverket \"%s\" misslyckades."
 
-#: ../gnome/applet/applet-dbus.c:322
+#: ../gnome/applet/applet-dbus.c:270
 msgid "Connection to the wired network failed."
 msgstr "Anslutning till det trådburna nätverket misslyckades."
 
-#: ../gnome/applet/applet.c:181
-msgid "Error displaying connection information: "
-msgstr "Fel vid visning av anslutningsinformation: "
+#: ../gnome/applet/applet.c:184
+msgid "Error displaying connection information:"
+msgstr "Fel vid visning av anslutningsinformation:"
 
-#: ../gnome/applet/applet.c:200
+#: ../gnome/applet/applet.c:202
 msgid "Could not find some required resources (the glade file)!"
 msgstr "Kunde inte hitta en del nödvändiga resurser (glade-filen)!"
 
-#: ../gnome/applet/applet.c:211
+#: ../gnome/applet/applet.c:213
 msgid "No active connections!"
 msgstr "Inga aktiva anslutningar!"
 
-#: ../gnome/applet/applet.c:223
+#: ../gnome/applet/applet.c:234
 #, c-format
 msgid "Wired Ethernet (%s)"
 msgstr "Trådbundet Ethernet (%s)"
 
-#: ../gnome/applet/applet.c:225
+#: ../gnome/applet/applet.c:236
 #, c-format
 msgid "Wireless Ethernet (%s)"
 msgstr "Trådlöst Ethernet (%s)"
 
-#: ../gnome/applet/applet.c:302 ../gnome/applet/applet.c:320
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:362
 msgid "NetworkManager Applet"
 msgstr "Panelprogram för nätverkshantering"
 
-#: ../gnome/applet/applet.c:304 ../gnome/applet/applet.c:322
-msgid "Copyright (C) 2004-2005 Red Hat, Inc."
+#: ../gnome/applet/applet.c:339 ../gnome/applet/applet.c:364
+msgid "Copyright © 2004-2005 Red Hat, Inc."
 msgstr "Copyright © 2004-2005 Red Hat, Inc."
 
-#: ../gnome/applet/applet.c:305 ../gnome/applet/applet.c:323
+#: ../gnome/applet/applet.c:340 ../gnome/applet/applet.c:365
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Panelprogram i notifieringsytan för hantering av dina nätverksenheter och "
 "nätverksanslutningar."
 
-#: ../gnome/applet/applet.c:412
-msgid "VPN Error"
-msgstr "VPN-fel"
+#: ../gnome/applet/applet.c:343 ../gnome/applet/applet.c:370
+msgid "translator-credits"
+msgstr ""
+"Christian Rose\n"
+"Skicka synpunkter på översättningen till\n"
+"tp-sv@listor.tp-sv.se"
 
-#: ../gnome/applet/applet.c:416
+#: ../gnome/applet/applet.c:426
 msgid "VPN Login Failure"
 msgstr "VPN-inloggningsfel"
 
-#: ../gnome/applet/applet.c:417
+#: ../gnome/applet/applet.c:427
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a login failure."
 msgstr ""
 "Kunde inte starta VPN-anslutningen \"%s\" på grund av ett inloggningfel."
 
-#: ../gnome/applet/applet.c:421
+#: ../gnome/applet/applet.c:431
 msgid "VPN Start Failure"
 msgstr "VPN-startfel"
 
-#: ../gnome/applet/applet.c:422
+#: ../gnome/applet/applet.c:432
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
@@ -105,26 +98,26 @@ msgstr ""
 "Kunde inte starta VPN-anslutningen \"%s\" på grund av ett fel vid start av "
 "VPN-programmet."
 
-#: ../gnome/applet/applet.c:426 ../gnome/applet/applet.c:436
+#: ../gnome/applet/applet.c:436 ../gnome/applet/applet.c:446
 msgid "VPN Connect Failure"
 msgstr "VPN-anslutningsfel"
 
-#: ../gnome/applet/applet.c:427
+#: ../gnome/applet/applet.c:437
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a connection error."
 msgstr ""
 "Kunde inte starta VPN-anslutningen \"%s\" på grund av ett anslutningsfel."
 
-#: ../gnome/applet/applet.c:431
+#: ../gnome/applet/applet.c:441
 msgid "VPN Configuration Error"
 msgstr "VPN-konfigurationsfel"
 
-#: ../gnome/applet/applet.c:432
+#: ../gnome/applet/applet.c:442
 #, c-format
 msgid "The VPN connection '%s' was not correctly configured."
 msgstr "VPN-anslutningen \"%s\" konfigurerades inte korrekt."
 
-#: ../gnome/applet/applet.c:437
+#: ../gnome/applet/applet.c:447
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' because the VPN server did not "
@@ -133,23 +126,13 @@ msgstr ""
 "Kunde inte starta VPN-anslutningen \"%s\" eftersom VPN-servern inte "
 "returnerade en lämplig nätverkskonfiguration."
 
-#: ../gnome/applet/applet.c:445
-#, c-format
-msgid "The VPN service said: \"%s\""
-msgstr "VPN-tjänsten sa: \"%s\""
-
-#: ../gnome/applet/applet.c:514
-#, c-format
-msgid "VPN connection '%s' said:"
-msgstr "VPN-anslutningen \"%s\" sa:"
-
-#: ../gnome/applet/applet.c:516
+#: ../gnome/applet/applet.c:517
 msgid "VPN Login Message"
 msgstr "VPN-inloggningsmeddelande"
 
-#: ../gnome/applet/applet.c:734 ../gnome/applet/applet.c:2286
-#: ../gnome/applet/other-network-dialog.c:407
-#: ../gnome/applet/passphrase-dialog.c:384
+#: ../gnome/applet/applet.c:741 ../gnome/applet/applet.c:2508
+#: ../gnome/applet/other-network-dialog.c:453
+#: ../gnome/applet/passphrase-dialog.c:228
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
@@ -157,148 +140,163 @@ msgstr ""
 "Panelprogrammet för nätverkshantering kunde inte hitta en del nödvändiga "
 "resurser (glade-filen hittades inte)."
 
-#: ../gnome/applet/applet.c:747
+#: ../gnome/applet/applet.c:753
 #, c-format
 msgid "The network device \"%s (%s)\" does not support wireless scanning."
 msgstr "Nätverksenheten \"%s (%s)\" stöder inte trådlös genomsökning."
 
-#: ../gnome/applet/applet.c:754
+#: ../gnome/applet/applet.c:761
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
 msgstr "Nätverksenheten \"%s (%s)\" stöder inte länkdetektering."
 
-#: ../gnome/applet/applet.c:963
+#: ../gnome/applet/applet.c:908
 #, c-format
 msgid "Preparing device %s for the wired network..."
 msgstr "Förbereder enheten %s för det trådbundna nätverket..."
 
-#: ../gnome/applet/applet.c:965
+#: ../gnome/applet/applet.c:910
 #, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
 msgstr "Förbereder enheten %s för det trådlösa nätverket \"%s\"..."
 
-#: ../gnome/applet/applet.c:972
+#: ../gnome/applet/applet.c:918
 #, c-format
 msgid "Configuring device %s for the wired network..."
 msgstr "Konfigurerar enheten %s för det trådbundna nätverket..."
 
-#: ../gnome/applet/applet.c:974
+#: ../gnome/applet/applet.c:920
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
 msgstr "Försöker ansluta till det trådlösa nätverket \"%s\"..."
 
-#: ../gnome/applet/applet.c:981
+#: ../gnome/applet/applet.c:928
 #, c-format
 msgid "Waiting for Network Key for the wireless network '%s'..."
 msgstr "Väntar på nätverksnyckel för det trådlösa nätverket \"%s\"..."
 
-#: ../gnome/applet/applet.c:988 ../gnome/applet/applet.c:997
+#: ../gnome/applet/applet.c:936 ../gnome/applet/applet.c:946
 msgid "Requesting a network address from the wired network..."
 msgstr "Begär en nätverksadress från det trådbundna nätverket..."
 
-#: ../gnome/applet/applet.c:990 ../gnome/applet/applet.c:999
+#: ../gnome/applet/applet.c:938 ../gnome/applet/applet.c:948
 #, c-format
 msgid "Requesting a network address from the wireless network '%s'..."
 msgstr "Begär en nätverksadress från det trådlösa nätverket \"%s\"..."
 
-#: ../gnome/applet/applet.c:1006
+#: ../gnome/applet/applet.c:956
 msgid "Finishing connection to the wired network..."
 msgstr "Slutför anslutning till det trådbundna nätverket..."
 
-#: ../gnome/applet/applet.c:1008
+#: ../gnome/applet/applet.c:958
 #, c-format
 msgid "Finishing connection to the wireless network '%s'..."
 msgstr "Slutför anslutning till det trådlösa nätverket \"%s\"..."
 
-#: ../gnome/applet/applet.c:1053
+#: ../gnome/applet/applet.c:1075
 msgid "NetworkManager is not running"
 msgstr "Nätverkshanteraren är inte igång"
 
-#: ../gnome/applet/applet.c:1064
+#: ../gnome/applet/applet.c:1083 ../gnome/applet/applet.c:1828
+msgid "Networking disabled"
+msgstr "Nätverk inaktiverat"
+
+#: ../gnome/applet/applet.c:1088
 msgid "No network connection"
 msgstr "Ingen nätverksanslutning"
 
-#: ../gnome/applet/applet.c:1069
+#: ../gnome/applet/applet.c:1093
 msgid "Wired network connection"
 msgstr "Trådbunden nätverksanslutning"
 
-#: ../gnome/applet/applet.c:1073
+#: ../gnome/applet/applet.c:1097
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Anluten till ett trådlöst ad hoc-nätverk"
 
-#: ../gnome/applet/applet.c:1075
+#: ../gnome/applet/applet.c:1099
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "Trådlös nätverksanslutning till \"%s\" (%d%%)"
 
-#: ../gnome/applet/applet.c:1095
+#: ../gnome/applet/applet.c:1120
 #, c-format
 msgid "VPN connection to '%s'"
 msgstr "VPN-anslutning till \"%s\""
 
-#: ../gnome/applet/applet.c:1103
+#: ../gnome/applet/applet.c:1128
 #, c-format
 msgid "VPN connecting to '%s'"
 msgstr "VPN-ansluter till \"%s\""
 
-#: ../gnome/applet/applet.c:1489
+#: ../gnome/applet/applet.c:1541
 msgid "_Connect to Other Wireless Network..."
 msgstr "_Anslut till annat trådlöst nätverk..."
 
-#: ../gnome/applet/applet.c:1510
+#: ../gnome/applet/applet.c:1562
 msgid "Create _New Wireless Network..."
 msgstr "Skapa _nytt trådlöst nätverk..."
 
-#: ../gnome/applet/applet.c:1623
+#: ../gnome/applet/applet.c:1685
 msgid "_VPN Connections"
 msgstr "_VPN-anslutningar"
 
-#: ../gnome/applet/applet.c:1655
+#: ../gnome/applet/applet.c:1730
 msgid "_Configure VPN..."
 msgstr "_Konfigurera VPN..."
 
-#: ../gnome/applet/applet.c:1659
+#: ../gnome/applet/applet.c:1734
 msgid "_Disconnect VPN..."
 msgstr "Koppla _från VPN..."
 
-#: ../gnome/applet/applet.c:1681
+#: ../gnome/applet/applet.c:1756
 msgid "_Dial Up Connections"
 msgstr "_Uppringda anslutningar"
 
-#: ../gnome/applet/applet.c:1690
+#. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
+#: ../gnome/applet/applet.c:1767
 #, c-format
 msgid "Connect to %s..."
 msgstr "Anslut till %s..."
 
-#: ../gnome/applet/applet.c:1740
+#: ../gnome/applet/applet.c:1773
+#, c-format
+msgid "Disconnect from %s..."
+msgstr "Koppla från %s..."
+
+#: ../gnome/applet/applet.c:1822
 msgid "No network devices have been found"
 msgstr "Inga nätverksenheter har hittats"
 
-#: ../gnome/applet/applet.c:1902
+#: ../gnome/applet/applet.c:2014
 msgid "NetworkManager is not running..."
 msgstr "Nätverkshanteraren är inte igång..."
 
-#. Wireless Enabled item
-#: ../gnome/applet/applet.c:2004
-msgid "_Wireless Enabled"
-msgstr "_Trådlöst aktiverat"
+#. 'Enable Networking' item
+#: ../gnome/applet/applet.c:2170
+msgid "Enable _Networking"
+msgstr "Aktivera _nätverk"
 
-#. Connection Information item
-#: ../gnome/applet/applet.c:2010
+#. 'Enable Wireless' item
+#: ../gnome/applet/applet.c:2176
+msgid "Enable _Wireless"
+msgstr "Aktivera _trådlöst"
+
+#. 'Connection Information' item
+#: ../gnome/applet/applet.c:2182
 msgid "Connection _Information"
 msgstr "Anslutnings_information"
 
 #. Help item
-#: ../gnome/applet/applet.c:2020
+#: ../gnome/applet/applet.c:2193
 msgid "_Help"
 msgstr "_Hjälp"
 
 #. About item
-#: ../gnome/applet/applet.c:2028
+#: ../gnome/applet/applet.c:2202
 msgid "_About"
 msgstr "_Om"
 
-#: ../gnome/applet/applet.c:2435
+#: ../gnome/applet/applet.c:2667
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
@@ -306,108 +304,186 @@ msgstr ""
 "Panelprogrammet för nätverkshantering kunde inte hitta en del nödvändiga "
 "resurser. Det kan inte fortsätta.\n"
 
-#: ../gnome/applet/eggtrayicon.c:127
+#: ../gnome/applet/wireless-security-option.c:157
+msgid "Open System"
+msgstr "Öppet system"
+
+#: ../gnome/applet/wireless-security-option.c:160
+msgid "Shared Key"
+msgstr "Delad nyckel"
+
+#: ../gnome/applet/wireless-security-option.c:208
+msgid "Automatic (Default)"
+msgstr "Automatiskt (standard)"
+
+#: ../gnome/applet/wireless-security-option.c:215
+msgid "AES-CCMP"
+msgstr "AES-CCMP"
+
+#: ../gnome/applet/wireless-security-option.c:223
+msgid "TKIP"
+msgstr "TKIP"
+
+#: ../gnome/applet/wireless-security-option.c:231
+msgid "Dynamic WEP"
+msgstr "Dynamisk WEP"
+
+#: ../gnome/applet/wso-none.c:53
+msgid "None"
+msgstr "Ingen"
+
+#: ../gnome/applet/wso-wep-ascii.c:138
+msgid "WEP 64/128-bit ASCII"
+msgstr "WEP 64/128-bitars ASCII"
+
+#: ../gnome/applet/wso-wep-hex.c:135
+msgid "WEP 64/128-bit Hex"
+msgstr "WEP 64/128-bitars hexadecimal"
+
+#: ../gnome/applet/wso-wep-passphrase.c:135
+msgid "WEP 128-bit Passphrase"
+msgstr "WEP 128-bitars lösenfras"
+
+#: ../gnome/applet/wso-wpa-eap.c:237
+msgid "PEAP"
+msgstr "PEAP"
+
+#: ../gnome/applet/wso-wpa-eap.c:238
+msgid "TLS"
+msgstr "TLS"
+
+#: ../gnome/applet/wso-wpa-eap.c:239
+msgid "TTLS"
+msgstr "TTLS"
+
+# Jag misstänker att det här inte ska översättas; det handlar nog om
+# säkerhetsalgoritmer. Hade nog förvillat mer än hjälpt om det varit
+# översatt.
+# /Christian
+#
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
+#: ../src/nm-ap-security-wpa-eap.c:116
+msgid "WPA2 Enterprise"
+msgstr "WPA2 Enterprise"
+
+# Jag misstänker att det här inte ska översättas; det handlar nog om
+# säkerhetsalgoritmer. Hade nog förvillat mer än hjälpt om det varit
+# översatt.
+# /Christian
+#
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
+#: ../src/nm-ap-security-wpa-eap.c:121
+msgid "WPA Enterprise"
+msgstr "WPA Enterprise"
+
+# Jag misstänker att det här inte ska översättas; det handlar nog om
+# säkerhetsalgoritmer. Hade nog förvillat mer än hjälpt om det varit
+# översatt.
+# /Christian
+#
+#: ../gnome/applet/wso-wpa-psk.c:178
+msgid "WPA2 Personal"
+msgstr "WPA2 Personal"
+
+# Jag misstänker att det här inte ska översättas; det handlar nog om
+# säkerhetsalgoritmer. Hade nog förvillat mer än hjälpt om det varit
+# översatt.
+# /Christian
+#
+#: ../gnome/applet/wso-wpa-psk.c:180
+msgid "WPA Personal"
+msgstr "WPA Personal"
+
+#: ../gnome/applet/eggtrayicon.c:134
 msgid "Orientation"
 msgstr "Orientering"
 
-#: ../gnome/applet/eggtrayicon.c:128
+#: ../gnome/applet/eggtrayicon.c:135
 msgid "The orientation of the tray."
 msgstr "Orienteringen på lådan."
 
-#: ../gnome/applet/menu-items.c:87
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Trådbundet nätverk (%s)"
 
-#: ../gnome/applet/menu-items.c:90
+#: ../gnome/applet/menu-items.c:91
 msgid "_Wired Network"
 msgstr "_Trådbundet nätverk"
 
-#: ../gnome/applet/menu-items.c:161
+#: ../gnome/applet/menu-items.c:162
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
 msgstr[0] "Trådlöst nätverk (%s)"
 msgstr[1] "Trådlösa nätverk (%s)"
 
-#: ../gnome/applet/menu-items.c:163
+#: ../gnome/applet/menu-items.c:164
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Trådlöst nätverk"
 msgstr[1] "Trådlösa nätverk"
 
-#: ../gnome/applet/menu-items.c:303
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr " (ogiltig Unicode)"
 
-#: ../gnome/applet/other-network-dialog.c:143
-#: ../gnome/applet/applet.glade.h:39
-msgid "_Passphrase:"
-msgstr "_Lösenfras:"
-
-#: ../gnome/applet/other-network-dialog.c:146
-msgid "_ASCII Key:"
-msgstr "_ASCII-nyckel:"
-
-#: ../gnome/applet/other-network-dialog.c:149
-msgid "_Hex Key:"
-msgstr "_Hexadecimal nyckel:"
+#: ../gnome/applet/other-network-dialog.c:352
+#, c-format
+msgid ""
+"By default, the wireless network's name is set to your computer's name, %s, "
+"with no encryption enabled"
+msgstr ""
+"Som standard är namnet på det trådlösa nätverket angivet till din dators "
+"namn, %s, och utan någon kryptering aktiverad"
 
-#: ../gnome/applet/other-network-dialog.c:238
+#: ../gnome/applet/other-network-dialog.c:358
 msgid "Create new wireless network"
 msgstr "Skapa nytt trådlöst nätverk"
 
-#: ../gnome/applet/other-network-dialog.c:239
+#: ../gnome/applet/other-network-dialog.c:359
 msgid ""
-"Enter the ESSID and security settings of the wireless network you wish to "
+"Enter the name and security settings of the wireless network you wish to "
 "create."
 msgstr ""
-"Ange ESSID och säkerhetsinställningarna för det trådlösa nätverk som du vill "
-"skapa."
-
-#: ../gnome/applet/other-network-dialog.c:240
-msgid "By default, the ESSID is set to your computer's name,"
-msgstr "Som standard är ESSID angivet till din dators namn,"
-
-#: ../gnome/applet/other-network-dialog.c:242
-msgid ", with no encryption enabled."
-msgstr ", och utan någon kryptering aktiverad."
+"Ange namnet och säkerhetsinställningarna för det trådlösa nätverk som du "
+"vill skapa."
 
-#: ../gnome/applet/other-network-dialog.c:244
+#: ../gnome/applet/other-network-dialog.c:363
 msgid "Create New Wireless Network"
 msgstr "Skapa nytt trådlöst nätverk"
 
-#: ../gnome/applet/other-network-dialog.c:249
-msgid "Custom wireless network"
-msgstr "Anpassat trådlöst nätverk"
+#: ../gnome/applet/other-network-dialog.c:368
+msgid "Existing wireless network"
+msgstr "Befintligt trådlöst nätverk"
 
-#: ../gnome/applet/other-network-dialog.c:250
-msgid "Enter the ESSID of the wireless network to which you wish to connect."
-msgstr "Ange ESSID för det trådlösa nätverk som du vill ansluta till."
+#: ../gnome/applet/other-network-dialog.c:369
+msgid "Enter the name of the wireless network to which you wish to connect."
+msgstr "Ange namnet på det trådlösa nätverk som du vill ansluta till."
 
-#: ../gnome/applet/other-network-dialog.c:252
+#: ../gnome/applet/other-network-dialog.c:371
 msgid "Connect to Other Wireless Network"
 msgstr "Anslut till annat trådlöst nätverk"
 
-#: ../gnome/applet/passphrase-dialog.c:155
-msgid "Passphrase:"
-msgstr "Lösenfras:"
-
-#: ../gnome/applet/passphrase-dialog.c:158
-msgid "ASCII Key:"
-msgstr "ASCII-nyckel:"
+#: ../gnome/applet/passphrase-dialog.c:215
+msgid "Error connecting to wireless network"
+msgstr "Fel vid anslutning till trådlöst nätverk"
 
-#: ../gnome/applet/passphrase-dialog.c:161
-msgid "Hex Key:"
-msgstr "Hexadecimal nyckel:"
+#: ../gnome/applet/passphrase-dialog.c:216
+msgid ""
+"The requested wireless network requires security capabilities unsupported by "
+"your hardware."
+msgstr ""
+"Det begärda trådlösa nätverket kräver säkerhetsfunktioner som inte stöds av "
+"din hårdvara."
 
-#: ../gnome/applet/vpn-password-dialog.c:152
-#: ../gnome/applet/vpn-password-dialog.c:189
+#: ../gnome/applet/vpn-password-dialog.c:151
+#: ../gnome/applet/vpn-password-dialog.c:188
 #, c-format
 msgid "Cannot start VPN connection '%s'"
 msgstr "Kan inte starta VPN-anslutningen \"%s\""
 
-#: ../gnome/applet/vpn-password-dialog.c:155
+#: ../gnome/applet/vpn-password-dialog.c:154
 #, c-format
 msgid ""
 "Could not find the authentication dialog for VPN connection type '%s'. "
@@ -416,7 +492,7 @@ msgstr ""
 "Kunde inte hitta autentiseringsdialogen för VPN-anslutningstypen \"%s\". "
 "Kontakta din systemadministratör."
 
-#: ../gnome/applet/vpn-password-dialog.c:192
+#: ../gnome/applet/vpn-password-dialog.c:191
 #, c-format
 msgid ""
 "There was a problem launching the authentication dialog for VPN connection "
@@ -431,31 +507,11 @@ msgstr " "
 
 #: ../gnome/applet/applet.glade.h:2
 msgid ""
-"128-bit Passphrase (WEP)\n"
-"ASCII Key (WEP)\n"
-"Hex Key (WEP)"
-msgstr ""
-"128-bitars lösenfras (WEP)\n"
-"ASCII-nyckel (WEP)\n"
-"Hexadecimal nyckel (WEP)"
-
-#: ../gnome/applet/applet.glade.h:5
-msgid ""
-"128-bit passphrase (WEP)\n"
-"ASCII key (WEP)\n"
-"Hex key (WEP)"
-msgstr ""
-"128-bitars lösenfras (WEP)\n"
-"ASCII-nyckel (WEP)\n"
-"Hexadecimal nyckel (WEP)"
-
-#: ../gnome/applet/applet.glade.h:8
-msgid ""
 "<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
 msgstr ""
 "<span weight=\"bold\" size=\"larger\">Information om aktiv anslutning</span>"
 
-#: ../gnome/applet/applet.glade.h:10
+#: ../gnome/applet/applet.glade.h:4
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
@@ -470,7 +526,7 @@ msgstr ""
 "En lösenfras eller en krypteringsnyckel krävs för att komma åt det trådlösa "
 "nätverket \"%s\"."
 
-#: ../gnome/applet/applet.glade.h:14
+#: ../gnome/applet/applet.glade.h:8
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
@@ -482,7 +538,7 @@ msgstr ""
 "\n"
 "%s  Det kommer inte att vara helt fungerande."
 
-#: ../gnome/applet/applet.glade.h:18
+#: ../gnome/applet/applet.glade.h:12
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
@@ -500,26 +556,50 @@ msgstr ""
 "kommer nätverkshanteraren inte längre att kräva bekräftelse vid framtida "
 "inloggningar."
 
-#: ../gnome/applet/applet.glade.h:21
+#: ../gnome/applet/applet.glade.h:15
+msgid "Anonymous Identity:"
+msgstr "Anonym identitet:"
+
+#: ../gnome/applet/applet.glade.h:16
+msgid "Authentication:"
+msgstr "Autentisering:"
+
+#: ../gnome/applet/applet.glade.h:17
 msgid "Broadcast Address:"
 msgstr "Broadcast-adress:"
 
-#: ../gnome/applet/applet.glade.h:22
+#: ../gnome/applet/applet.glade.h:18
+msgid "CA Certificate File:"
+msgstr "CA-certifikatfil:"
+
+#: ../gnome/applet/applet.glade.h:19
 msgid "C_onnect"
 msgstr "_Anslut"
 
-#: ../gnome/applet/applet.glade.h:23
-msgid "Connect with _encryption enabled"
-msgstr "Anslut med _kryptering aktiverad"
+#: ../gnome/applet/applet.glade.h:20
+msgid "Client Certificate File:"
+msgstr "Klientcertifikatfil:"
 
-#: ../gnome/applet/applet.glade.h:24
+#: ../gnome/applet/applet.glade.h:21
 msgid "Connection Information"
 msgstr "Anslutningsinformation"
 
-#: ../gnome/applet/applet.glade.h:25
+#: ../gnome/applet/applet.glade.h:22
+msgid "Default Route:"
+msgstr "Standardväg:"
+
+#: ../gnome/applet/applet.glade.h:23
 msgid "Destination Address:"
 msgstr "MÃ¥ladress:"
 
+#: ../gnome/applet/applet.glade.h:24
+msgid "Driver:"
+msgstr "Drivrutin:"
+
+#: ../gnome/applet/applet.glade.h:25
+msgid "EAP Method:"
+msgstr "EAP-metod:"
+
 #: ../gnome/applet/applet.glade.h:26
 msgid "Hardware Address:"
 msgstr "HÃ¥rdvaruadress:"
@@ -529,54 +609,146 @@ msgid "IP Address:"
 msgstr "IP-adress:"
 
 #: ../gnome/applet/applet.glade.h:28
+msgid "Identity:"
+msgstr "Identitet:"
+
+#: ../gnome/applet/applet.glade.h:29
 msgid "Interface:"
 msgstr "Gränssnitt:"
 
-#: ../gnome/applet/applet.glade.h:29
+#: ../gnome/applet/applet.glade.h:30
+msgid "Key Type:"
+msgstr "Nyckeltyp:"
+
+#: ../gnome/applet/applet.glade.h:31
+msgid "Key:"
+msgstr "Nyckel:"
+
+#: ../gnome/applet/applet.glade.h:32
+msgid ""
+"None\n"
+"WEP 128-bit Passphrase\n"
+"WEP 64/128-bit Hex\n"
+"WEP 64/128-bit ASCII\n"
+msgstr ""
+"Ingen\n"
+"WEP 128-bitars lösenfras\n"
+"WEP 64/128-bitars hexadecimal\n"
+"WEP 64/128-bitars ASCII\n"
+
+#: ../gnome/applet/applet.glade.h:37
+msgid ""
+"Open System\n"
+"Shared Key"
+msgstr ""
+"Öppet system\n"
+"Delad nyckel"
+
+#: ../gnome/applet/applet.glade.h:39
 msgid "Other Wireless Network..."
 msgstr "Annat trådlöst nätverk..."
 
-#: ../gnome/applet/applet.glade.h:30
+#: ../gnome/applet/applet.glade.h:40
+msgid "Passphrase:"
+msgstr "Lösenfras:"
+
+#: ../gnome/applet/applet.glade.h:41
+msgid "Password:"
+msgstr "Lösenord:"
+
+#: ../gnome/applet/applet.glade.h:42
+msgid "Primary DNS:"
+msgstr "Primär DNS:"
+
+#: ../gnome/applet/applet.glade.h:43
+msgid "Private Key File:"
+msgstr "Fil med privat nyckel:"
+
+#: ../gnome/applet/applet.glade.h:44
+msgid "Private Key Password:"
+msgstr "Lösenord för privat nyckel:"
+
+#: ../gnome/applet/applet.glade.h:45
+msgid "Secondary DNS:"
+msgstr "Sekundär DNS:"
+
+#: ../gnome/applet/applet.glade.h:46
+msgid "Select the CA Certificate File"
+msgstr "Välj en CA-certifikatfil"
+
+#: ../gnome/applet/applet.glade.h:47
+msgid "Select the Client Certificate File"
+msgstr "Välj en klientcertifikatfil"
+
+#: ../gnome/applet/applet.glade.h:48
+msgid "Select the Private Key File"
+msgstr "Välj fil med privat nyckel"
+
+#: ../gnome/applet/applet.glade.h:49
+msgid "Show key"
+msgstr "Visa nyckel"
+
+#: ../gnome/applet/applet.glade.h:50
+msgid "Show passphrase"
+msgstr "Visa lösenfras"
+
+#: ../gnome/applet/applet.glade.h:51
+msgid "Show password"
+msgstr "Visa lösenord"
+
+#: ../gnome/applet/applet.glade.h:52
+msgid "Show passwords"
+msgstr "Visa lösenord"
+
+#: ../gnome/applet/applet.glade.h:53
+msgid "Speed:"
+msgstr "Hastighet:"
+
+#: ../gnome/applet/applet.glade.h:54
 msgid "Subnet Mask:"
 msgstr "Subnätsmask:"
 
-#: ../gnome/applet/applet.glade.h:31
+#: ../gnome/applet/applet.glade.h:55
+msgid "Type:"
+msgstr "Typ:"
+
+#: ../gnome/applet/applet.glade.h:56
+msgid "User Name:"
+msgstr "Användarnamn:"
+
+#: ../gnome/applet/applet.glade.h:57
 msgid "Wireless Network Key Required"
 msgstr "Nyckel krävs för det trådlösa nätverket"
 
-#: ../gnome/applet/applet.glade.h:32
+#: ../gnome/applet/applet.glade.h:58
 msgid "Wireless _adapter:"
 msgstr "Trådlös _nätverksadapter:"
 
-#: ../gnome/applet/applet.glade.h:33
-msgid "Wireless _network:"
-msgstr "Trådlöst _nätverk:"
-
-#: ../gnome/applet/applet.glade.h:34
+#: ../gnome/applet/applet.glade.h:59
 msgid "_Always Trust this Wireless Network"
 msgstr "_Lita alltid på detta trådlösa nätverk"
 
-#: ../gnome/applet/applet.glade.h:35
+#: ../gnome/applet/applet.glade.h:60
 msgid "_Don't remind me again"
 msgstr "_PÃ¥minn mig inte igen"
 
-#: ../gnome/applet/applet.glade.h:36
-msgid "_Key Type:"
-msgstr "_Nyckeltyp:"
-
-#: ../gnome/applet/applet.glade.h:37
-msgid "_Key type:"
-msgstr "_Nyckeltyp:"
-
-#: ../gnome/applet/applet.glade.h:38
+#: ../gnome/applet/applet.glade.h:61
 msgid "_Login to Network"
 msgstr "_Logga in på nätverket"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:372
+#: ../gnome/applet/applet.glade.h:62
+msgid "_Network Name:"
+msgstr "_Nätverksnamn:"
+
+#: ../gnome/applet/applet.glade.h:63
+msgid "_Wireless Security:"
+msgstr "_Trådlös säkerhet:"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:383
 msgid "Cannot add VPN connection"
 msgstr "Kan inte lägga till VPN-anslutning"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:374
+#: ../gnome/vpn-properties/nm-vpn-properties.c:385
 msgid ""
 "No suitable VPN software was found on your system. Contact your system "
 "administrator."
@@ -584,11 +756,11 @@ msgstr ""
 "Ingen lämplig VPN-programvara hittades på ditt system. Kontakta din "
 "systemadministratör."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:426
+#: ../gnome/vpn-properties/nm-vpn-properties.c:437
 msgid "Cannot import VPN connection"
 msgstr "Kan inte importera VPN-anslutning"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:428
+#: ../gnome/vpn-properties/nm-vpn-properties.c:439
 #, c-format
 msgid ""
 "Cannot find suitable software for VPN connection type '%s' to import the "
@@ -597,12 +769,12 @@ msgstr ""
 "Kan inte hitta lämplig programvara för VPN-anslutningstypen \"%s\" för att "
 "importera filen \"%s\". Kontakta din systemadministratör."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:568
+#: ../gnome/vpn-properties/nm-vpn-properties.c:579
 #, c-format
 msgid "Error retrieving VPN connection '%s'"
 msgstr "Fel vid hämtning av VPN-anslutningen \"%s\""
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:571
+#: ../gnome/vpn-properties/nm-vpn-properties.c:582
 #, c-format
 msgid ""
 "Could not find the UI files for VPN connection type '%s'. Contact your "
@@ -611,12 +783,12 @@ msgstr ""
 "Kunde inte hitta användargränssnittsfilerna för VPN-anslutningstypen \"%s\". "
 "Kontakta din systemadministratör."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:731
+#: ../gnome/vpn-properties/nm-vpn-properties.c:739
 #, c-format
 msgid "Delete VPN connection \"%s\"?"
 msgstr "Ta bort VPN-anslutningen \"%s\"?"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:734
+#: ../gnome/vpn-properties/nm-vpn-properties.c:742
 #, c-format
 msgid ""
 "All information about the VPN connection \"%s\" will be lost and you may "
@@ -627,16 +799,16 @@ msgstr ""
 "komma att behöva kontakta din systemadministratör för att få information för "
 "att kunna skapa en ny anslutning."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:940
+#: ../gnome/vpn-properties/nm-vpn-properties.c:959
 msgid "Unable to load"
 msgstr "Kan inte läsa in"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:942
+#: ../gnome/vpn-properties/nm-vpn-properties.c:961
 msgid "Cannot find some needed resources (the glade file)!"
 msgstr "Kunde inte hitta en del nödvändiga resurser (glade-filen)!"
 
 #. Edit dialog
-#: ../gnome/vpn-properties/nm-vpn-properties.c:1060
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
 msgid "Edit VPN Connection"
 msgstr "Redigera VPN-anslutning"
 
@@ -711,6 +883,42 @@ msgstr ""
 msgid "VPN Connections"
 msgstr "VPN-anslutningar"
 
+#: ../src/nm-ap-security-wep.c:52
+msgid "40-bit WEP"
+msgstr "40-bitars WEP"
+
+#: ../src/nm-ap-security-wep.c:54
+msgid "104-bit WEP"
+msgstr "104-bitars WEP"
+
+#: ../src/nm-ap-security-wpa-psk.c:50
+msgid "WPA TKIP"
+msgstr "WPA TKIP"
+
+#: ../src/nm-ap-security-wpa-psk.c:52
+msgid "WPA CCMP"
+msgstr "WPA CCMP"
+
+#: ../src/nm-ap-security-wpa-psk.c:54
+msgid "WPA Automatic"
+msgstr "WPA automatisk"
+
+#: ../src/nm-ap-security-wpa-psk.c:59
+msgid "WPA2 TKIP"
+msgstr "WPA2 TKIP"
+
+#: ../src/nm-ap-security-wpa-psk.c:61
+msgid "WPA2 CCMP"
+msgstr "WPA2 CCMP"
+
+#: ../src/nm-ap-security-wpa-psk.c:63
+msgid "WPA2 Automatic"
+msgstr "WPA2 automatisk"
+
+#: ../src/nm-ap-security.c:320
+msgid "none"
+msgstr "ingen"
+
 #: ../src/nm-netlink-monitor.c:154
 #, c-format
 msgid ""
@@ -727,28 +935,141 @@ msgstr ""
 "kan inte binda till netlink-uttag för övervakning av trådbundna ethernet-"
 "enheter - %s"
 
-#: ../src/nm-netlink-monitor.c:403
+#: ../src/nm-netlink-monitor.c:405
 msgid "operation took too long"
 msgstr "åtgärden tog för lång tid"
 
-#: ../src/nm-netlink-monitor.c:500
+#: ../src/nm-netlink-monitor.c:502
 msgid "received data from wrong type of sender"
 msgstr "mottog data från fel typ av avsändare"
 
-#: ../src/nm-netlink-monitor.c:513
+#: ../src/nm-netlink-monitor.c:515
 msgid "received data from unexpected sender"
 msgstr "mottog data från oväntad avsändare"
 
-#: ../src/nm-netlink-monitor.c:644
+#: ../src/nm-netlink-monitor.c:646
 msgid "too much data was sent over socket and some of it was lost"
 msgstr "för mycket data skickades över uttaget och en del gick förlorat"
 
-#: ../src/nm-netlink-monitor.c:733
+#: ../src/nm-netlink-monitor.c:735
 msgid "error occurred while waiting for data on socket"
 msgstr "fel inträffade vid väntan på data i uttaget"
 
-#~ msgid "Error displaying connection information:"
-#~ msgstr "Fel vid visning av anslutningsinformation:"
+#: ../gnome/applet/applet-dbus-devices.c:898
+#, c-format
+msgid "You are now connected to the Ad-Hoc wireless network '%s'."
+msgstr "Du är nu ansluten till det trådlösa ad hoc-nätverket \"%s\"."
+
+#: ../gnome/applet/applet-dbus-devices.c:903
+#, c-format
+msgid "You are now connected to the wireless network '%s'."
+msgstr "Du är nu ansluten till det trådlösa nätverket \"%s\"."
+
+#: ../gnome/applet/applet-dbus-devices.c:910
+msgid "You are now connected to the wired network."
+msgstr "Du är nu ansluten till det trådbundna nätverket."
+
+#: ../gnome/applet/applet-dbus-devices.c:916
+msgid "Connection Established"
+msgstr "Anslutning etablerad"
+
+#: ../gnome/applet/applet-dbus-devices.c:959
+msgid "Disconnected"
+msgstr "Frånkopplad"
+
+#: ../gnome/applet/applet-dbus-devices.c:960
+msgid "The network connection has been disconnected."
+msgstr "Nätverksanslutningen har kopplats från."
+
+#~ msgid ""
+#~ "The requested wireless network '%s' does not appear to be in range.  A "
+#~ "different wireless network will be used if any are available."
+#~ msgstr ""
+#~ "Det begärda trådlösa nätverket \"%s\" verkar inte vara inom räckhåll. Ett "
+#~ "annat trådlöst nätverk kommer att användas om något är tillgängligt."
+
+#~ msgid "Error displaying connection information: "
+#~ msgstr "Fel vid visning av anslutningsinformation: "
+
+#~ msgid "Copyright (C) 2004-2005 Red Hat, Inc."
+#~ msgstr "Copyright © 2004-2005 Red Hat, Inc."
+
+#~ msgid "VPN Error"
+#~ msgstr "VPN-fel"
+
+#~ msgid "The VPN service said: \"%s\""
+#~ msgstr "VPN-tjänsten sa: \"%s\""
+
+#~ msgid "VPN connection '%s' said:"
+#~ msgstr "VPN-anslutningen \"%s\" sa:"
+
+#~ msgid "_Wireless Enabled"
+#~ msgstr "_Trådlöst aktiverat"
+
+#~ msgid "_Passphrase:"
+#~ msgstr "_Lösenfras:"
+
+#~ msgid "_ASCII Key:"
+#~ msgstr "_ASCII-nyckel:"
+
+#~ msgid "_Hex Key:"
+#~ msgstr "_Hexadecimal nyckel:"
+
+#~ msgid ""
+#~ "Enter the ESSID and security settings of the wireless network you wish to "
+#~ "create."
+#~ msgstr ""
+#~ "Ange ESSID och säkerhetsinställningarna för det trådlösa nätverk som du "
+#~ "vill skapa."
+
+#~ msgid "By default, the ESSID is set to your computer's name,"
+#~ msgstr "Som standard är ESSID angivet till din dators namn,"
+
+#~ msgid ", with no encryption enabled."
+#~ msgstr ", och utan någon kryptering aktiverad."
+
+#~ msgid "Custom wireless network"
+#~ msgstr "Anpassat trådlöst nätverk"
+
+#~ msgid ""
+#~ "Enter the ESSID of the wireless network to which you wish to connect."
+#~ msgstr "Ange ESSID för det trådlösa nätverk som du vill ansluta till."
+
+#~ msgid "ASCII Key:"
+#~ msgstr "ASCII-nyckel:"
+
+#~ msgid "Hex Key:"
+#~ msgstr "Hexadecimal nyckel:"
+
+#~ msgid ""
+#~ "128-bit Passphrase (WEP)\n"
+#~ "ASCII Key (WEP)\n"
+#~ "Hex Key (WEP)"
+#~ msgstr ""
+#~ "128-bitars lösenfras (WEP)\n"
+#~ "ASCII-nyckel (WEP)\n"
+#~ "Hexadecimal nyckel (WEP)"
+
+#~ msgid ""
+#~ "128-bit passphrase (WEP)\n"
+#~ "ASCII key (WEP)\n"
+#~ "Hex key (WEP)"
+#~ msgstr ""
+#~ "128-bitars lösenfras (WEP)\n"
+#~ "ASCII-nyckel (WEP)\n"
+#~ "Hexadecimal nyckel (WEP)"
+
+#~ msgid "Connect with _encryption enabled"
+#~ msgstr "Anslut med _kryptering aktiverad"
+
+#~ msgid "Wireless _network:"
+#~ msgstr "Trådlöst _nätverk:"
+
+#~ msgid "_Key Type:"
+#~ msgstr "_Nyckeltyp:"
+
+#~ msgid "_Key type:"
+#~ msgstr "_Nyckeltyp:"
 
 #~ msgid "Wired network (%s)"
 #~ msgstr "Trådbundet nätverk (%s)"
@@ -808,9 +1129,6 @@ msgstr "fel inträffade vid väntan på data i uttaget"
 #~ msgid "Don't remind me again"
 #~ msgstr "PÃ¥minn mig inte igen"
 
-#~ msgid "Key Type:"
-#~ msgstr "Nyckeltyp:"
-
 #~ msgid "Key type:"
 #~ msgstr "Nyckeltyp:"
 
@@ -969,9 +1287,6 @@ msgstr "fel inträffade vid väntan på data i uttaget"
 #~ msgid "Domain:"
 #~ msgstr "Domän:"
 
-#~ msgid "Password:"
-#~ msgstr "Lösenord:"
-
 #~ msgid "VPN Connection Manager"
 #~ msgstr "VPN-anslutningshanterare"
 
@@ -1017,9 +1332,6 @@ msgstr "fel inträffade vid väntan på data i uttaget"
 #~ msgid "*"
 #~ msgstr "*"
 
-#~ msgid "Copyright © 2004-2005 Red Hat, Inc."
-#~ msgstr "Copyright © 2004-2005 Red Hat, Inc."
-
 #~ msgid "Copyright (C) 2004-2006 Red Hat, Inc."
 #~ msgstr "Copyright © 2004-2006 Red Hat, Inc."
 
@@ -1094,3 +1406,46 @@ msgstr "fel inträffade vid väntan på data i uttaget"
 #~ "på att detta trådlösa nätverk är säkert klickar du i kryssrutan nedan, så "
 #~ "kommer nätverkshanteraren inte längre att besvära dig med dumma frågor "
 #~ "när du ansluter till det."
+
+#~ msgid "Stop automatically running the networking applet?"
+#~ msgstr "Stoppa automatisk körning av panelprogrammet för nätverk?"
+
+#~ msgid ""
+#~ "The networking applet will now terminate, but will automatically launch "
+#~ "the next time you login.  Would you like to stop automatically running "
+#~ "the networking applet on login?"
+#~ msgstr ""
+#~ "Panelprogrammet för nätverk kommer nu att avslutas, men det kommer "
+#~ "automatiskt att startas nästa gång du loggar in. Vill du stoppa "
+#~ "automatisk körning av panelprogrammet för nätverk vid inloggning?"
+
+#~ msgid "_Remove"
+#~ msgstr "_Ta bort"
+
+#~ msgid "Disconnect..."
+#~ msgstr "Koppla från..."
+
+#~ msgid "Disconnect"
+#~ msgstr "Koppla från"
+
+#~ msgid "Automatic"
+#~ msgstr "Automatiskt"
+
+#~ msgid "WEP Passphrase"
+#~ msgstr "WEP-lösenfras"
+
+#~ msgid ""
+#~ "By default, the wireless network's name is set to your computer's name, %"
+#~ "s, with no encryption enabled."
+#~ msgstr ""
+#~ "Som standard är namnet på det trådlösa nätverket angivet till din dators "
+#~ "namn, %s, och utan någon kryptering aktiverad."
+
+#~ msgid "Authentication"
+#~ msgstr "Autentisering"
+
+#~ msgid "Key"
+#~ msgstr "Nyckel"
+
+#~ msgid "Network Name:"
+#~ msgstr "Nätverksnamn:"
diff --git a/po/uk.po b/po/uk.po
index f07e1ed055..d3afd98b08 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-10 12:09+0300\n"
+"POT-Creation-Date: 2006-05-29 18:33+0200\n"
 "PO-Revision-Date: 2005-08-10 03:32+0200\n"
 "Last-Translator: Maxim Dziumanenko <mvd@mylinux.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -17,102 +17,81 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#. Setup a request to the keyring to save the network passphrase
-#: ../gnome/applet/applet-dbus-info.c:839
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:919
 #, c-format
 msgid "Passphrase for wireless network %s"
 msgstr "Парольна фраза бездротової мережі %s"
 
-#: ../gnome/applet/applet-dbus-info.c:1049
-#, c-format
-msgid ""
-"The requested wireless network '%s' does not appear to be in range.  A "
-"different wireless network will be used if any are available."
-msgstr ""
-"Запитане бездротове з'єднанн� '%s' поза межами до��жно�ті. Будуть "
-"викори�товувати�ь різні бездротові з'єднанн�, з тих �кі будуть до�тупні."
-
-#: ../gnome/applet/applet-dbus.c:598
-#, c-format
-msgid "Connection to the wireless network '%s' failed.\n"
+#: ../gnome/applet/applet-dbus.c:265
+#, fuzzy, c-format
+msgid "Connection to the wireless network '%s' failed."
 msgstr "Помилка з'єднанн� з бездротовою мережею '%s'.\n"
 
-#: ../gnome/applet/applet-dbus.c:603
-msgid "Connection to the wired network failed.\n"
+#: ../gnome/applet/applet-dbus.c:270
+#, fuzzy
+msgid "Connection to the wired network failed."
 msgstr "Помилка з'єднанн� з дротовою мережею.\n"
 
-#: ../gnome/applet/applet.c:192
-msgid "Error displaying connection information: "
+#: ../gnome/applet/applet.c:184
+#, fuzzy
+msgid "Error displaying connection information:"
 msgstr "Помилка відображенн� інформації про з'єднанн�: "
 
-#: ../gnome/applet/applet.c:217
+#: ../gnome/applet/applet.c:202
 msgid "Could not find some required resources (the glade file)!"
 msgstr "�е вдаєть�� знайти де�кі необхідні ре�ур�и (не знайдено файл glade)!"
 
-#: ../gnome/applet/applet.c:227
+#: ../gnome/applet/applet.c:213
 msgid "No active connections!"
 msgstr "�емає активних з'єднань!"
 
-#: ../gnome/applet/applet.c:236
-msgid "Could not open socket!"
-msgstr "�е вдаєть�� відкрити �окет!"
-
-#: ../gnome/applet/applet.c:251
-msgid "Failed to get information about the interface!"
-msgstr "�е вдаєть�� отримати інформацію про інтерфей�!"
-
-#: ../gnome/applet/applet.c:284
+#: ../gnome/applet/applet.c:234
 #, c-format
 msgid "Wired Ethernet (%s)"
 msgstr "Дротова мережа Ethernet (%s)"
 
-#: ../gnome/applet/applet.c:286
+#: ../gnome/applet/applet.c:236
 #, c-format
 msgid "Wireless Ethernet (%s)"
 msgstr "Бездротова мережа Ethernet (%s)"
 
-#: ../gnome/applet/applet.c:380 ../gnome/applet/applet.c:398
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:362
 msgid "NetworkManager Applet"
 msgstr "�плет NetworkManager"
 
-#: ../gnome/applet/applet.c:382 ../gnome/applet/applet.c:400
-msgid "Copyright (C) 2004-2005 Red Hat, Inc."
+#: ../gnome/applet/applet.c:339 ../gnome/applet/applet.c:364
+#, fuzzy
+msgid "Copyright © 2004-2005 Red Hat, Inc."
 msgstr "�втор�ькі права (C) 2004-2005 Red Hat, Inc."
 
-#: ../gnome/applet/applet.c:383 ../gnome/applet/applet.c:401
+#: ../gnome/applet/applet.c:340 ../gnome/applet/applet.c:365
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "�плет обла�ті �повіщенн� дл� керуванн� мережними при�тро�ми та з'єднанн�ми."
 
-#: ../gnome/applet/applet.c:486
-msgid "VPN Error"
-msgstr "Помилка VPN"
+#: ../gnome/applet/applet.c:343 ../gnome/applet/applet.c:370
+msgid "translator-credits"
+msgstr ""
 
-#: ../gnome/applet/applet.c:490
-#, c-format
-msgid ""
-"<span weight=\"bold\" size=\"larger\">VPN Login Failure</span>\n"
-"\n"
-"Could not start the VPN connection '%s' due to a login failure.\n"
-"\n"
-"The VPN service said: \"%s\""
+#: ../gnome/applet/applet.c:426
+msgid "VPN Login Failure"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Помилка входу у VPN</span>\n"
-"\n"
-"Через помилку входу не вдаєть�� запу�тити VPN-з'єднанн� '%s'.\n"
-"\n"
-"Повідомленн� �лужби VPN: \"%s\""
 
-#: ../gnome/applet/applet.c:495
-#, c-format
+#: ../gnome/applet/applet.c:427
+#, fuzzy, c-format
+msgid "Could not start the VPN connection '%s' due to a login failure."
+msgstr "�е вдаєть�� запу�тити з'єднанн� VPN '%s'"
+
+#: ../gnome/applet/applet.c:431
+msgid "VPN Start Failure"
+msgstr ""
+
+#: ../gnome/applet/applet.c:432
+#, fuzzy, c-format
 msgid ""
-"<span weight=\"bold\" size=\"larger\">VPN Start Failure</span>\n"
-"\n"
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
-"program.\n"
-"\n"
-"The VPN service said: \"%s\""
+"program."
 msgstr ""
 "<span weight=\"bold\" size=\"larger\">Помилка запу�ку VPN</span>\n"
 "\n"
@@ -121,45 +100,30 @@ msgstr ""
 "\n"
 "Повідомленн� �лужби VPN: \"%s\""
 
-#: ../gnome/applet/applet.c:500
-#, c-format
-msgid ""
-"<span weight=\"bold\" size=\"larger\">VPN Connect Failure</span>\n"
-"\n"
-"Could not start the VPN connection '%s' due to a connection error.\n"
-"\n"
-"The VPN service said: \"%s\""
+#: ../gnome/applet/applet.c:436 ../gnome/applet/applet.c:446
+#, fuzzy
+msgid "VPN Connect Failure"
+msgstr "�алаштовуванн� VPN"
+
+#: ../gnome/applet/applet.c:437
+#, fuzzy, c-format
+msgid "Could not start the VPN connection '%s' due to a connection error."
+msgstr "�е вдаєть�� запу�тити з'єднанн� VPN '%s'"
+
+#: ../gnome/applet/applet.c:441
+msgid "VPN Configuration Error"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Помилка з'єднанн� VPN</span>\n"
-"\n"
-"�е вдаєть�� відкрити VPN-з'єднанн� '%s' через помилку з'єднанн�.\n"
-"\n"
-"Повідомленн� �лужби VPN: \"%s\""
 
-#: ../gnome/applet/applet.c:505
+#: ../gnome/applet/applet.c:442
 #, c-format
-msgid ""
-"<span weight=\"bold\" size=\"larger\">VPN Configuration Error</span>\n"
-"\n"
-"The VPN connection '%s' was not correctly configured.\n"
-"\n"
-"The VPN service said: \"%s\""
+msgid "The VPN connection '%s' was not correctly configured."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Помилка налаштовуванн� VPN</span>\n"
-"\n"
-"VPN-з'єднанн� '%s' некоректно налаштовано.\n"
-"\n"
-"Повідомленн� �лужби VPN: \"%s\""
 
-#: ../gnome/applet/applet.c:510
-#, c-format
+#: ../gnome/applet/applet.c:447
+#, fuzzy, c-format
 msgid ""
-"<span weight=\"bold\" size=\"larger\">VPN Connect Failure</span>\n"
-"\n"
 "Could not start the VPN connection '%s' because the VPN server did not "
-"return an adequate network configuration.\n"
-"\n"
-"The VPN service said: \"%s\""
+"return an adequate network configuration."
 msgstr ""
 "<span weight=\"bold\" size=\"larger\">Помилка з'єднанн� VPN</span>\n"
 "\n"
@@ -168,24 +132,13 @@ msgstr ""
 "\n"
 "Повідомленн� �лужби VPN: \"%s\""
 
-#: ../gnome/applet/applet.c:577
-#, c-format
-msgid ""
-"<span weight=\"bold\" size=\"larger\">VPN Login Message</span>\n"
-"\n"
-"VPN connection '%s' said:\n"
-"\n"
-"\"%s\""
+#: ../gnome/applet/applet.c:517
+msgid "VPN Login Message"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Повідомленн� входу VPN</span>\n"
-"\n"
-"Повідомленн� VPN-з'єднанн� '%s':\n"
-"\n"
-"\"%s\""
 
-#: ../gnome/applet/applet.c:795 ../gnome/applet/applet.c:2431
-#: ../gnome/applet/other-network-dialog.c:322
-#: ../gnome/applet/passphrase-dialog.c:397
+#: ../gnome/applet/applet.c:741 ../gnome/applet/applet.c:2508
+#: ../gnome/applet/other-network-dialog.c:453
+#: ../gnome/applet/passphrase-dialog.c:228
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
@@ -193,161 +146,168 @@ msgstr ""
 "�плет NetworkManager не може знайти де�кі необхідні ре�ур�и (не знайдено "
 "файл glade)."
 
-#: ../gnome/applet/applet.c:808
+#: ../gnome/applet/applet.c:753
 #, c-format
 msgid "The network device \"%s (%s)\" does not support wireless scanning."
 msgstr ""
 "Мережний при�трій \"%s (%s)\" не підтримує �кануванн� бездротової мережі."
 
-#: ../gnome/applet/applet.c:815
+#: ../gnome/applet/applet.c:761
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
 msgstr "Мережний при�трій \"%s (%s)\" не підтримує ви�вленн� зв'�зку."
 
-#: ../gnome/applet/applet.c:936
+#: ../gnome/applet/applet.c:908
 #, c-format
 msgid "Preparing device %s for the wired network..."
 msgstr "При�трій %s готуєть�� до з'єднанн� з дротовою мережею..."
 
-#: ../gnome/applet/applet.c:938
+#: ../gnome/applet/applet.c:910
 #, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
 msgstr "При�трій %s готуєть�� до з'єднанн� з бездротовою мережею '%s'..."
 
-#: ../gnome/applet/applet.c:945
+#: ../gnome/applet/applet.c:918
 #, c-format
 msgid "Configuring device %s for the wired network..."
 msgstr "При�трій %s налаштовуєть�� дл� дротової мережі..."
 
-#: ../gnome/applet/applet.c:947
+#: ../gnome/applet/applet.c:920
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
 msgstr "Спроба з'єднати�ь з бездротовою мережею '%s'..."
 
-#: ../gnome/applet/applet.c:954
+#: ../gnome/applet/applet.c:928
 #, c-format
 msgid "Waiting for Network Key for the wireless network '%s'..."
 msgstr "Очікуєть�� мережний ключ бездротової мережі '%s'..."
 
-#: ../gnome/applet/applet.c:961 ../gnome/applet/applet.c:970
+#: ../gnome/applet/applet.c:936 ../gnome/applet/applet.c:946
 msgid "Requesting a network address from the wired network..."
 msgstr "Запитуєть�� мережна адре�а дротової мережі..."
 
-#: ../gnome/applet/applet.c:963 ../gnome/applet/applet.c:972
+#: ../gnome/applet/applet.c:938 ../gnome/applet/applet.c:948
 #, c-format
 msgid "Requesting a network address from the wireless network '%s'..."
 msgstr "Запитуєть�� мережна адре�а бездротової мережі '%s'..."
 
-#: ../gnome/applet/applet.c:979
+#: ../gnome/applet/applet.c:956
 msgid "Finishing connection to the wired network..."
 msgstr "Завершуєть�� з'єднанн� з дротовою мережею..."
 
-#: ../gnome/applet/applet.c:981
+#: ../gnome/applet/applet.c:958
 #, c-format
 msgid "Finishing connection to the wireless network '%s'..."
 msgstr "Завершуєть�� з'єднанн� з бездротовою мережею '%s'..."
 
-#: ../gnome/applet/applet.c:1027
+#: ../gnome/applet/applet.c:1075
 msgid "NetworkManager is not running"
 msgstr "NetworkManager не запущено"
 
-#: ../gnome/applet/applet.c:1038
+#: ../gnome/applet/applet.c:1083 ../gnome/applet/applet.c:1828
+msgid "Networking disabled"
+msgstr ""
+
+#: ../gnome/applet/applet.c:1088
 msgid "No network connection"
 msgstr "�емає з'єднанн� з мережею"
 
-#: ../gnome/applet/applet.c:1045
+#: ../gnome/applet/applet.c:1093
 msgid "Wired network connection"
 msgstr "Дротове з'єднанн� з мережею"
 
-#: ../gnome/applet/applet.c:1052
+#: ../gnome/applet/applet.c:1097
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "З'єднано з о�обливою бездротовою мережею"
 
-#: ../gnome/applet/applet.c:1066
+#: ../gnome/applet/applet.c:1099
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "Бездротове мережне з'єднанн� з '%s' (%d%%)"
 
-#: ../gnome/applet/applet.c:1091
+#: ../gnome/applet/applet.c:1120
 #, c-format
 msgid "VPN connection to '%s'"
 msgstr "VPN з'єднанн� до '%s'"
 
-#: ../gnome/applet/applet.c:1542
+#: ../gnome/applet/applet.c:1128
+#, fuzzy, c-format
+msgid "VPN connecting to '%s'"
+msgstr "VPN з'єднанн� до '%s'"
+
+#: ../gnome/applet/applet.c:1541
 msgid "_Connect to Other Wireless Network..."
 msgstr "_З'єднати�ь з іншою бездротовою мережею..."
 
-#: ../gnome/applet/applet.c:1563
+#: ../gnome/applet/applet.c:1562
 msgid "Create _New Wireless Network..."
 msgstr "Створити _нову бездротову мережу..."
 
-#: ../gnome/applet/applet.c:1676
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:17
-msgid "VPN Connections"
+#: ../gnome/applet/applet.c:1685
+#, fuzzy
+msgid "_VPN Connections"
 msgstr "�алаштовуванн� VPN"
 
-#: ../gnome/applet/applet.c:1703
-msgid "Configure VPN..."
+#: ../gnome/applet/applet.c:1730
+#, fuzzy
+msgid "_Configure VPN..."
 msgstr "�алаштовуванн� VPN..."
 
-#: ../gnome/applet/applet.c:1707
-msgid "Disconnect VPN..."
+#: ../gnome/applet/applet.c:1734
+#, fuzzy
+msgid "_Disconnect VPN..."
 msgstr "Від'єднанн� від VPN..."
 
-#: ../gnome/applet/applet.c:1730
-msgid "Dial Up"
-msgstr "Комутаційне з'єднанн�"
+#: ../gnome/applet/applet.c:1756
+#, fuzzy
+msgid "_Dial Up Connections"
+msgstr "�алаштовуванн� VPN"
+
+#. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
+#: ../gnome/applet/applet.c:1767
+#, fuzzy, c-format
+msgid "Connect to %s..."
+msgstr "З'єднати�ь з:"
 
-#: ../gnome/applet/applet.c:1790
+#: ../gnome/applet/applet.c:1773
+#, fuzzy, c-format
+msgid "Disconnect from %s..."
+msgstr "Від'єднанн� від VPN..."
+
+#: ../gnome/applet/applet.c:1822
 msgid "No network devices have been found"
 msgstr "�е було знайдено мережних при�троїв"
 
-#: ../gnome/applet/applet.c:1955
+#: ../gnome/applet/applet.c:2014
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager не запущено..."
 
-#: ../gnome/applet/applet.c:2023
-msgid "_Stop All Wireless Devices"
-msgstr "З_упинити у�і бездротові при�трої"
-
-#: ../gnome/applet/applet.c:2028
-msgid "_Start All Wireless Devices"
-msgstr "_Запу�тити у�і бездротові при�трої"
-
-#: ../gnome/applet/applet.c:2059
-msgid "_Wireless Network Discovery"
-msgstr "Ви�вленн� _бездротовії мережі"
-
-#: ../gnome/applet/applet.c:2062
-msgid "Always Search"
-msgstr "Шукати завжди"
-
-#: ../gnome/applet/applet.c:2070
-msgid "Search Only When Disconnected"
-msgstr "Шукати лише пі�л� від'єднанн�"
-
-#: ../gnome/applet/applet.c:2078
-msgid "Never Search"
-msgstr "�іколи не шукати"
+#. 'Enable Networking' item
+#: ../gnome/applet/applet.c:2170
+msgid "Enable _Networking"
+msgstr ""
 
-#. Stop All Wireless Devices item
-#: ../gnome/applet/applet.c:2090
-msgid "Stop All Wireless Devices"
-msgstr "Зупинити у�і бездротові при�трої"
+#. 'Enable Wireless' item
+#: ../gnome/applet/applet.c:2176
+msgid "Enable _Wireless"
+msgstr ""
 
-#: ../gnome/applet/applet.c:2096
+#. 'Connection Information' item
+#: ../gnome/applet/applet.c:2182
 msgid "Connection _Information"
 msgstr "_Інформаці� про з'єднанн�"
 
-#: ../gnome/applet/applet.c:2104
+#. Help item
+#: ../gnome/applet/applet.c:2193
 msgid "_Help"
 msgstr "_Довідка"
 
-#: ../gnome/applet/applet.c:2111
+#. About item
+#: ../gnome/applet/applet.c:2202
 msgid "_About"
 msgstr "_Про програму"
 
-#: ../gnome/applet/applet.c:2581
+#: ../gnome/applet/applet.c:2667
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
@@ -355,24 +315,95 @@ msgstr ""
 "�плет NetworkManager не може знайти де�кі необхідні ре�ур�и.  Продовжувати "
 "роботу неможливо.\n"
 
-#: ../gnome/applet/eggtrayicon.c:118
+#: ../gnome/applet/wireless-security-option.c:157
+msgid "Open System"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:160
+msgid "Shared Key"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:208
+msgid "Automatic (Default)"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:215
+msgid "AES-CCMP"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:223
+msgid "TKIP"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:231
+msgid "Dynamic WEP"
+msgstr ""
+
+#: ../gnome/applet/wso-none.c:53
+msgid "None"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-ascii.c:138
+msgid "WEP 64/128-bit ASCII"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-hex.c:135
+msgid "WEP 64/128-bit Hex"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-passphrase.c:135
+#, fuzzy
+msgid "WEP 128-bit Passphrase"
+msgstr "Парольна фраза:"
+
+#: ../gnome/applet/wso-wpa-eap.c:237
+msgid "PEAP"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:238
+msgid "TLS"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:239
+msgid "TTLS"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
+#: ../src/nm-ap-security-wpa-eap.c:116
+msgid "WPA2 Enterprise"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
+#: ../src/nm-ap-security-wpa-eap.c:121
+msgid "WPA Enterprise"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-psk.c:178
+msgid "WPA2 Personal"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-psk.c:180
+msgid "WPA Personal"
+msgstr ""
+
+#: ../gnome/applet/eggtrayicon.c:134
 msgid "Orientation"
 msgstr "Орієнтаці�"
 
-#: ../gnome/applet/eggtrayicon.c:119
+#: ../gnome/applet/eggtrayicon.c:135
 msgid "The orientation of the tray."
 msgstr "Орієнтаці� лотка."
 
-#: ../gnome/applet/menu-items.c:89
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Дротова мережа (%s)"
 
-#: ../gnome/applet/menu-items.c:92
+#: ../gnome/applet/menu-items.c:91
 msgid "_Wired Network"
 msgstr "_Дротова мережа"
 
-#: ../gnome/applet/menu-items.c:165
+#: ../gnome/applet/menu-items.c:162
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
@@ -380,68 +411,75 @@ msgstr[0] "Бездротова мережа (%s)"
 msgstr[1] "Бездротові мережі (%s)"
 msgstr[2] "Бездротові мережі (%s)"
 
-#: ../gnome/applet/menu-items.c:167
+#: ../gnome/applet/menu-items.c:164
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Бездротова мережа"
 msgstr[1] "Бездротові мережі"
 msgstr[2] "Бездротові мережі"
 
-#: ../gnome/applet/menu-items.c:309
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr " (неправильний Юнікод)"
 
-#: ../gnome/applet/other-network-dialog.c:143
-#: ../gnome/applet/passphrase-dialog.c:156
-#: ../gnome/applet/applet.glade.h:34
-msgid "Passphrase:"
-msgstr "Парольна фраза:"
-
-#: ../gnome/applet/other-network-dialog.c:146
-#: ../gnome/applet/passphrase-dialog.c:159
-msgid "ASCII Key:"
-msgstr "ASCII-ключ:"
-
-#: ../gnome/applet/other-network-dialog.c:149
-#: ../gnome/applet/passphrase-dialog.c:162
-msgid "Hex Key:"
-msgstr "Ші�тнадц�тковий ключ:"
+#: ../gnome/applet/other-network-dialog.c:352
+#, fuzzy, c-format
+msgid ""
+"By default, the wireless network's name is set to your computer's name, %s, "
+"with no encryption enabled"
+msgstr "Типово, значенн� ESSID таке ж �к назва комп'ютера,"
 
-#: ../gnome/applet/other-network-dialog.c:232
+#: ../gnome/applet/other-network-dialog.c:358
 msgid "Create new wireless network"
 msgstr "Створити новий бездротовий при�трій"
 
-#: ../gnome/applet/other-network-dialog.c:233
+#: ../gnome/applet/other-network-dialog.c:359
+#, fuzzy
 msgid ""
-"Enter the ESSID and security settings of the wireless network you wish to "
+"Enter the name and security settings of the wireless network you wish to "
 "create."
 msgstr ""
 "Введіть ESSID та параметри безпеки бездротової мережі, �ку ви бажаєте "
 "�творити."
 
-#: ../gnome/applet/other-network-dialog.c:234
-msgid "By default, the ESSID is set to your computer's name,"
-msgstr "Типово, значенн� ESSID таке ж �к назва комп'ютера,"
-
-#: ../gnome/applet/other-network-dialog.c:236
-msgid ", with no encryption enabled."
-msgstr ", без увімкненн� шифруванн�"
+#: ../gnome/applet/other-network-dialog.c:363
+#, fuzzy
+msgid "Create New Wireless Network"
+msgstr "Створити _нову бездротову мережу..."
 
-#: ../gnome/applet/other-network-dialog.c:241
-msgid "Custom wireless network"
+#: ../gnome/applet/other-network-dialog.c:368
+#, fuzzy
+msgid "Existing wireless network"
 msgstr "Вла�на бездротова мережа"
 
-#: ../gnome/applet/other-network-dialog.c:242
-msgid "Enter the ESSID of the wireless network to which you wish to connect."
+#: ../gnome/applet/other-network-dialog.c:369
+#, fuzzy
+msgid "Enter the name of the wireless network to which you wish to connect."
 msgstr "Введіть ESSID бездротової мережі, до �кої ви бажаєте з'єднати�ь."
 
-#: ../gnome/applet/vpn-password-dialog.c:152
-#: ../gnome/applet/vpn-password-dialog.c:191
+#: ../gnome/applet/other-network-dialog.c:371
+#, fuzzy
+msgid "Connect to Other Wireless Network"
+msgstr "_З'єднати�ь з іншою бездротовою мережею..."
+
+#: ../gnome/applet/passphrase-dialog.c:215
+#, fuzzy
+msgid "Error connecting to wireless network"
+msgstr "З'єднано з о�обливою бездротовою мережею"
+
+#: ../gnome/applet/passphrase-dialog.c:216
+msgid ""
+"The requested wireless network requires security capabilities unsupported by "
+"your hardware."
+msgstr ""
+
+#: ../gnome/applet/vpn-password-dialog.c:151
+#: ../gnome/applet/vpn-password-dialog.c:188
 #, c-format
 msgid "Cannot start VPN connection '%s'"
 msgstr "�е вдаєть�� запу�тити з'єднанн� VPN '%s'"
 
-#: ../gnome/applet/vpn-password-dialog.c:155
+#: ../gnome/applet/vpn-password-dialog.c:154
 #, c-format
 msgid ""
 "Could not find the authentication dialog for VPN connection type '%s'. "
@@ -450,7 +488,7 @@ msgstr ""
 "�е вдаєть�� знайти діалогове вікно аутентифікації дл� з'єднанн� VPN типу '%"
 "s'. Зв'�жіть�� з �и�темним адміні�тратором."
 
-#: ../gnome/applet/vpn-password-dialog.c:194
+#: ../gnome/applet/vpn-password-dialog.c:191
 #, c-format
 msgid ""
 "There was a problem launching the authentication dialog for VPN connection "
@@ -465,31 +503,11 @@ msgstr " "
 
 #: ../gnome/applet/applet.glade.h:2
 msgid ""
-"128-bit Passphrase (WEP)\n"
-"ASCII Key (WEP)\n"
-"Hex Key (WEP)"
-msgstr ""
-"128-бітна парольна фраза (WEP)\n"
-"ASCII-ключ (WEP)\n"
-"Ші�тнадц�тковий ключ (WEP)"
-
-#: ../gnome/applet/applet.glade.h:5
-msgid ""
-"128-bit passphrase (WEP)\n"
-"ASCII key (WEP)\n"
-"Hex key (WEP)"
-msgstr ""
-"128-бітна парольна фраза (WEP)\n"
-"ASCII-ключ (WEP)\n"
-"Ші�тнадц�тковий ключ (WEP)"
-
-#: ../gnome/applet/applet.glade.h:8
-msgid ""
 "<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
 msgstr ""
 "<span weight=\"bold\" size=\"larger\">Інформаці� про активні з'єднанн�</span>"
 
-#: ../gnome/applet/applet.glade.h:10
+#: ../gnome/applet/applet.glade.h:4
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
@@ -504,7 +522,7 @@ msgstr ""
 "Дл� до�тупу до бездротової мережі '%s' необхідна парольна фраза чи ключ "
 "шифруванн�."
 
-#: ../gnome/applet/applet.glade.h:14
+#: ../gnome/applet/applet.glade.h:8
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
@@ -516,7 +534,7 @@ msgstr ""
 "\n"
 "%s  Програма не повні�тю функціональна."
 
-#: ../gnome/applet/applet.glade.h:18
+#: ../gnome/applet/applet.glade.h:12
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
@@ -533,87 +551,200 @@ msgstr ""
 "відмітьте поле нижче, та NetworkManager надалі не буде набридати запитанн�ми "
 "при з'єднанні."
 
-#: ../gnome/applet/applet.glade.h:21
-msgid "Always Trust this Wireless Network"
-msgstr "Завжди довір�ти бездротовій мережі"
+#: ../gnome/applet/applet.glade.h:15
+msgid "Anonymous Identity:"
+msgstr ""
 
-#: ../gnome/applet/applet.glade.h:22
+#: ../gnome/applet/applet.glade.h:16
+#, fuzzy
+msgid "Authentication:"
+msgstr "Орієнтаці�"
+
+#: ../gnome/applet/applet.glade.h:17
 msgid "Broadcast Address:"
 msgstr "Широкомовна адре�а:"
 
-#: ../gnome/applet/applet.glade.h:23
+#: ../gnome/applet/applet.glade.h:18
+msgid "CA Certificate File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:19
 msgid "C_onnect"
 msgstr "_З'єднати�ь"
 
-#: ../gnome/applet/applet.glade.h:24
-msgid "Connect with encryption enabled"
-msgstr "З'єднанн� з шифруванн�м"
+#: ../gnome/applet/applet.glade.h:20
+msgid "Client Certificate File:"
+msgstr ""
 
-#: ../gnome/applet/applet.glade.h:25
+#: ../gnome/applet/applet.glade.h:21
 msgid "Connection Information"
 msgstr "Інформаці� про з'єднанн�"
 
-#: ../gnome/applet/applet.glade.h:26
+#: ../gnome/applet/applet.glade.h:22
+msgid "Default Route:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:23
 msgid "Destination Address:"
 msgstr "Цільова адре�а:"
 
-#: ../gnome/applet/applet.glade.h:27
-msgid "Don't remind me again"
-msgstr "�е нагадувати надалі"
+#: ../gnome/applet/applet.glade.h:24
+msgid "Driver:"
+msgstr ""
 
-#: ../gnome/applet/applet.glade.h:28
+#: ../gnome/applet/applet.glade.h:25
+msgid "EAP Method:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:26
 msgid "Hardware Address:"
 msgstr "�паратна адре�а:"
 
-#: ../gnome/applet/applet.glade.h:29
+#: ../gnome/applet/applet.glade.h:27
 msgid "IP Address:"
 msgstr "�дре�а IP:"
 
-#: ../gnome/applet/applet.glade.h:30
+#: ../gnome/applet/applet.glade.h:28
+msgid "Identity:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:29
 msgid "Interface:"
 msgstr "Інтерфей�:"
 
-#: ../gnome/applet/applet.glade.h:31
+#: ../gnome/applet/applet.glade.h:30
 msgid "Key Type:"
 msgstr "Тип ключа:"
 
+#: ../gnome/applet/applet.glade.h:31
+#, fuzzy
+msgid "Key:"
+msgstr "Ші�тнадц�тковий ключ:"
+
 #: ../gnome/applet/applet.glade.h:32
-msgid "Key type:"
-msgstr "Тип ключа:"
+msgid ""
+"None\n"
+"WEP 128-bit Passphrase\n"
+"WEP 64/128-bit Hex\n"
+"WEP 64/128-bit ASCII\n"
+msgstr ""
 
-#: ../gnome/applet/applet.glade.h:33
+#: ../gnome/applet/applet.glade.h:37
+msgid ""
+"Open System\n"
+"Shared Key"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:39
 msgid "Other Wireless Network..."
 msgstr "Інша бездротова мережа..."
 
-#: ../gnome/applet/applet.glade.h:35
+#: ../gnome/applet/applet.glade.h:40
+msgid "Passphrase:"
+msgstr "Парольна фраза:"
+
+#: ../gnome/applet/applet.glade.h:41
+msgid "Password:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:42
+msgid "Primary DNS:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:43
+msgid "Private Key File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:44
+msgid "Private Key Password:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:45
+msgid "Secondary DNS:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:46
+msgid "Select the CA Certificate File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:47
+msgid "Select the Client Certificate File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:48
+msgid "Select the Private Key File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:49
+msgid "Show key"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:50
+#, fuzzy
+msgid "Show passphrase"
+msgstr "Парольна фраза:"
+
+#: ../gnome/applet/applet.glade.h:51
+msgid "Show password"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:52
+msgid "Show passwords"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:53
+msgid "Speed:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:54
 msgid "Subnet Mask:"
 msgstr "Ма�ка мережі:"
 
-#: ../gnome/applet/applet.glade.h:36
+#: ../gnome/applet/applet.glade.h:55
+#, fuzzy
+msgid "Type:"
+msgstr "Тип ключа:"
+
+#: ../gnome/applet/applet.glade.h:56
+msgid "User Name:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:57
 msgid "Wireless Network Key Required"
 msgstr "Вимагаєть�� ключ бездротової мережі"
 
-#: ../gnome/applet/applet.glade.h:37
+#: ../gnome/applet/applet.glade.h:58
 msgid "Wireless _adapter:"
 msgstr "Бездротовий _адаптер:"
 
-#: ../gnome/applet/applet.glade.h:38
-msgid "Wireless _network:"
-msgstr "Бездротова _мережа"
+#: ../gnome/applet/applet.glade.h:59
+#, fuzzy
+msgid "_Always Trust this Wireless Network"
+msgstr "Завжди довір�ти бездротовій мережі"
 
-#: ../gnome/applet/applet.glade.h:39
+#: ../gnome/applet/applet.glade.h:60
+#, fuzzy
+msgid "_Don't remind me again"
+msgstr "�е нагадувати надалі"
+
+#: ../gnome/applet/applet.glade.h:61
 msgid "_Login to Network"
 msgstr "_Увійти в мережу"
 
-#: ../gnome/applet/applet.glade.h:40
-msgid "_OK"
-msgstr "_Гаразд"
+#: ../gnome/applet/applet.glade.h:62
+msgid "_Network Name:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:63
+#, fuzzy
+msgid "_Wireless Security:"
+msgstr "Бездротовий _адаптер:"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:374
+#: ../gnome/vpn-properties/nm-vpn-properties.c:383
 msgid "Cannot add VPN connection"
 msgstr "�е вдаєть�� додати з'єднанн� VPN"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:376
+#: ../gnome/vpn-properties/nm-vpn-properties.c:385
 msgid ""
 "No suitable VPN software was found on your system. Contact your system "
 "administrator."
@@ -621,11 +752,11 @@ msgstr ""
 "У �и�темі не в�тановлено потрібне програмне забезпеченн� VPN. Зв'�жіть�� з "
 "�и�темним адміні�тратором."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:428
+#: ../gnome/vpn-properties/nm-vpn-properties.c:437
 msgid "Cannot import VPN connection"
 msgstr "�е вдаєть�� імпортувати з'єднанн� VPN"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:430
+#: ../gnome/vpn-properties/nm-vpn-properties.c:439
 #, c-format
 msgid ""
 "Cannot find suitable software for VPN connection type '%s' to import the "
@@ -634,12 +765,12 @@ msgstr ""
 "�е вдаєть�� знайти відповідне програмне забезпеченн� дл� з'єднань VPN типу '%"
 "s', щоб імпортувати файл '%s'. Зв'�жіть�� з �и�темним адміні�тратором."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:570
+#: ../gnome/vpn-properties/nm-vpn-properties.c:579
 #, c-format
 msgid "Error retrieving VPN connection '%s'"
 msgstr "Помилка отриманн� з'єднанн� VPN '%s'"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:573
+#: ../gnome/vpn-properties/nm-vpn-properties.c:582
 #, c-format
 msgid ""
 "Could not find the UI files for VPN connection type '%s'. Contact your "
@@ -648,12 +779,12 @@ msgstr ""
 "�е вдаєть�� знайти файли графічного інтерфей�у дл� з'єднанн�  VPN типу '%s'. "
 "Зв'�жіть�� з �и�темним адміні�тратором."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:733
+#: ../gnome/vpn-properties/nm-vpn-properties.c:739
 #, c-format
 msgid "Delete VPN connection \"%s\"?"
 msgstr "Видалити з'єднанн� VPN \"%s\"?"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:736
+#: ../gnome/vpn-properties/nm-vpn-properties.c:742
 #, c-format
 msgid ""
 "All information about the VPN connection \"%s\" will be lost and you may "
@@ -664,11 +795,11 @@ msgstr ""
 "доведеть�� звернути�ь до �и�темного адміні�тратора за інформацією дл� "
 "�творенн� нового з'єднанн�."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:951
+#: ../gnome/vpn-properties/nm-vpn-properties.c:959
 msgid "Unable to load"
 msgstr "�е вдаєть�� завантажити"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:953
+#: ../gnome/vpn-properties/nm-vpn-properties.c:961
 msgid "Cannot find some needed resources (the glade file)!"
 msgstr "�е вдаєть�� знайти де�кі необхідні ре�ур�и (не знайдено файл glade)!"
 
@@ -682,33 +813,29 @@ msgid "Add a new VPN connection"
 msgstr "Додати нове з'єднанн� VPN"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:2
+msgid "Choose which type of VPN connection you wish to create."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
 msgid "Connect to:"
 msgstr "З'єднати�ь з:"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
 msgid "Create VPN Connection"
 msgstr "Створенн� з'єднанн� VPN"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
 msgid "Create VPN Connection - 1 of 2"
 msgstr "Створенн� з'єднанн� VPN - 1 з 2"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
 msgid "Create VPN Connection - 2 of 2"
 msgstr "Створенн� з'єднанн� VPN - 2 з 2"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
 msgid "Delete the selected VPN connection"
 msgstr "Видалити  виділені з'єднанн� VPN"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
-msgid ""
-"Dependent on the private network you want to connect to, you need to select "
-"what type of connection you want to create."
-msgstr ""
-"В залежно�ті від приватної мережі, до �кої ви хочете приєднати�ь, вам "
-"потрібно виділити тип �творюваного з'єднанн�."
-
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
 msgid "E_xport"
 msgstr "_Ек�порт"
@@ -718,34 +845,78 @@ msgid "Edit the selected VPN connection"
 msgstr "Редагувати виділене з'єднанн� VPN"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:10
-msgid "Export VPN connection to a file"
-msgstr "Ек�портувати з'єднанн� VPN у файл"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:11
 msgid "Export the VPN settings to a file"
 msgstr "Ек�портувати параметри VPN у файл"
 
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:11
+#, fuzzy
+msgid "Export the selected VPN connection to a file"
+msgstr "Ек�портувати з'єднанн� VPN у файл"
+
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:12
-msgid "Finish create VPN Connection"
+#, fuzzy
+msgid "Finish Creating VPN Connection"
 msgstr "Завершенн� �творенн� з'єднанн� VPN"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:13
-msgid "Manage Virtual Private Network connections"
+#, fuzzy
+msgid "Manage Virtual Private Network Connections"
 msgstr "Керуванн� з'єднанн�ми віртуальної приватної мережеі"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:14
+#, fuzzy
 msgid ""
-"This assistant will guide you through the creation of a new VPN connection "
-"to a private network.\n"
+"This assistant will guide you through the creation of a connection to a "
+"Virtual Private Network (VPN).\n"
 "\n"
-"It will require some information, such as IP addresses and secrets, that "
-"will probably be provided by your system administrator as appropriate."
+"It will require some information, such as IP addresses and secrets.  Please "
+"see your system administrator to obtain this information."
 msgstr ""
 "Цей помічник допоможе �творити нову приватну мережу VPN.\n"
 "\n"
 "�еобхідно вказати де�ку інформацію, наприклад адре�и IP та �екрети, �кі, "
 "можливо, надають�� �и�темним вашим адміні�тратором."
 
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:17
+msgid "VPN Connections"
+msgstr "�алаштовуванн� VPN"
+
+#: ../src/nm-ap-security-wep.c:52
+msgid "40-bit WEP"
+msgstr ""
+
+#: ../src/nm-ap-security-wep.c:54
+msgid "104-bit WEP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:50
+msgid "WPA TKIP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:52
+msgid "WPA CCMP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:54
+msgid "WPA Automatic"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:59
+msgid "WPA2 TKIP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:61
+msgid "WPA2 CCMP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:63
+msgid "WPA2 Automatic"
+msgstr ""
+
+#: ../src/nm-ap-security.c:320
+msgid "none"
+msgstr ""
+
 #: ../src/nm-netlink-monitor.c:154
 #, c-format
 msgid ""
@@ -761,27 +932,284 @@ msgstr ""
 "не вдаєть�� прив'�зати�ь до мережного �окету дл� контролю при�трою ethernet "
 "- %s"
 
-#: ../src/nm-netlink-monitor.c:403
+#: ../src/nm-netlink-monitor.c:405
 msgid "operation took too long"
 msgstr "операці� виконуєть�� надто довго"
 
-#: ../src/nm-netlink-monitor.c:500
+#: ../src/nm-netlink-monitor.c:502
 msgid "received data from wrong type of sender"
 msgstr "отримано дані з неправильним типом відправника"
 
-#: ../src/nm-netlink-monitor.c:513
+#: ../src/nm-netlink-monitor.c:515
 msgid "received data from unexpected sender"
 msgstr "отримано дані з не�подіваним відправником"
 
-#: ../src/nm-netlink-monitor.c:535
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: ../src/nm-netlink-monitor.c:644
+#: ../src/nm-netlink-monitor.c:646
 msgid "too much data was sent over socket and some of it was lost"
 msgstr "через �окет надто багато даних наді�лано, та ча�тину з них втрачено"
 
-#: ../src/nm-netlink-monitor.c:733
+#: ../src/nm-netlink-monitor.c:735
 msgid "error occurred while waiting for data on socket"
 msgstr "помилка при очікуванні даних з �окету"
+
+#: ../gnome/applet/applet-dbus-devices.c:898
+#, fuzzy, c-format
+msgid "You are now connected to the Ad-Hoc wireless network '%s'."
+msgstr "З'єднано з о�обливою бездротовою мережею"
+
+#: ../gnome/applet/applet-dbus-devices.c:903
+#, fuzzy, c-format
+msgid "You are now connected to the wireless network '%s'."
+msgstr "Завершуєть�� з'єднанн� з бездротовою мережею '%s'..."
+
+#: ../gnome/applet/applet-dbus-devices.c:910
+#, fuzzy
+msgid "You are now connected to the wired network."
+msgstr "Завершуєть�� з'єднанн� з дротовою мережею..."
+
+#: ../gnome/applet/applet-dbus-devices.c:916
+#, fuzzy
+msgid "Connection Established"
+msgstr "З'єднанн� з шифруванн�м"
+
+#: ../gnome/applet/applet-dbus-devices.c:959
+#, fuzzy
+msgid "Disconnected"
+msgstr "Від'єднанн� від VPN..."
+
+#: ../gnome/applet/applet-dbus-devices.c:960
+msgid "The network connection has been disconnected."
+msgstr ""
+
+#~ msgid ""
+#~ "The requested wireless network '%s' does not appear to be in range.  A "
+#~ "different wireless network will be used if any are available."
+#~ msgstr ""
+#~ "Запитане бездротове з'єднанн� '%s' поза межами до��жно�ті. Будуть "
+#~ "викори�товувати�ь різні бездротові з'єднанн�, з тих �кі будуть до�тупні."
+
+#~ msgid "Could not open socket!"
+#~ msgstr "�е вдаєть�� відкрити �окет!"
+
+#~ msgid "Failed to get information about the interface!"
+#~ msgstr "�е вдаєть�� отримати інформацію про інтерфей�!"
+
+#~ msgid "VPN Error"
+#~ msgstr "Помилка VPN"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">VPN Login Failure</span>\n"
+#~ "\n"
+#~ "Could not start the VPN connection '%s' due to a login failure.\n"
+#~ "\n"
+#~ "The VPN service said: \"%s\""
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Помилка входу у VPN</span>\n"
+#~ "\n"
+#~ "Через помилку входу не вдаєть�� запу�тити VPN-з'єднанн� '%s'.\n"
+#~ "\n"
+#~ "Повідомленн� �лужби VPN: \"%s\""
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">VPN Connect Failure</span>\n"
+#~ "\n"
+#~ "Could not start the VPN connection '%s' due to a connection error.\n"
+#~ "\n"
+#~ "The VPN service said: \"%s\""
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Помилка з'єднанн� VPN</span>\n"
+#~ "\n"
+#~ "�е вдаєть�� відкрити VPN-з'єднанн� '%s' через помилку з'єднанн�.\n"
+#~ "\n"
+#~ "Повідомленн� �лужби VPN: \"%s\""
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">VPN Configuration Error</span>\n"
+#~ "\n"
+#~ "The VPN connection '%s' was not correctly configured.\n"
+#~ "\n"
+#~ "The VPN service said: \"%s\""
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Помилка налаштовуванн� VPN</span>\n"
+#~ "\n"
+#~ "VPN-з'єднанн� '%s' некоректно налаштовано.\n"
+#~ "\n"
+#~ "Повідомленн� �лужби VPN: \"%s\""
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">VPN Login Message</span>\n"
+#~ "\n"
+#~ "VPN connection '%s' said:\n"
+#~ "\n"
+#~ "\"%s\""
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Повідомленн� входу VPN</span>\n"
+#~ "\n"
+#~ "Повідомленн� VPN-з'єднанн� '%s':\n"
+#~ "\n"
+#~ "\"%s\""
+
+#~ msgid "Dial Up"
+#~ msgstr "Комутаційне з'єднанн�"
+
+#~ msgid "_Stop All Wireless Devices"
+#~ msgstr "З_упинити у�і бездротові при�трої"
+
+#~ msgid "_Start All Wireless Devices"
+#~ msgstr "_Запу�тити у�і бездротові при�трої"
+
+#~ msgid "_Wireless Network Discovery"
+#~ msgstr "Ви�вленн� _бездротовії мережі"
+
+#~ msgid "Always Search"
+#~ msgstr "Шукати завжди"
+
+#~ msgid "Search Only When Disconnected"
+#~ msgstr "Шукати лише пі�л� від'єднанн�"
+
+#~ msgid "Never Search"
+#~ msgstr "�іколи не шукати"
+
+#~ msgid "Stop All Wireless Devices"
+#~ msgstr "Зупинити у�і бездротові при�трої"
+
+#~ msgid "ASCII Key:"
+#~ msgstr "ASCII-ключ:"
+
+#~ msgid ", with no encryption enabled."
+#~ msgstr ", без увімкненн� шифруванн�"
+
+#~ msgid ""
+#~ "128-bit Passphrase (WEP)\n"
+#~ "ASCII Key (WEP)\n"
+#~ "Hex Key (WEP)"
+#~ msgstr ""
+#~ "128-бітна парольна фраза (WEP)\n"
+#~ "ASCII-ключ (WEP)\n"
+#~ "Ші�тнадц�тковий ключ (WEP)"
+
+#~ msgid ""
+#~ "128-bit passphrase (WEP)\n"
+#~ "ASCII key (WEP)\n"
+#~ "Hex key (WEP)"
+#~ msgstr ""
+#~ "128-бітна парольна фраза (WEP)\n"
+#~ "ASCII-ключ (WEP)\n"
+#~ "Ші�тнадц�тковий ключ (WEP)"
+
+#~ msgid "Key type:"
+#~ msgstr "Тип ключа:"
+
+#~ msgid "Wireless _network:"
+#~ msgstr "Бездротова _мережа"
+
+#~ msgid "_OK"
+#~ msgstr "_Гаразд"
+
+#~ msgid ""
+#~ "Dependent on the private network you want to connect to, you need to "
+#~ "select what type of connection you want to create."
+#~ msgstr ""
+#~ "В залежно�ті від приватної мережі, до �кої ви хочете приєднати�ь, вам "
+#~ "потрібно виділити тип �творюваного з'єднанн�."
+
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid "Connection to the wireless network '%s' failed.\n"
+#~ msgstr "Помилка з'єднанн� з бездротовою мережею '%s'.\n"
+
+#~ msgid "Connection to the wired network failed.\n"
+#~ msgstr "Помилка з'єднанн� з дротовою мережею.\n"
+
+#~ msgid "Error displaying connection information: "
+#~ msgstr "Помилка відображенн� інформації про з'єднанн�: "
+
+#~ msgid "Copyright (C) 2004-2005 Red Hat, Inc."
+#~ msgstr "�втор�ькі права (C) 2004-2005 Red Hat, Inc."
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">VPN Start Failure</span>\n"
+#~ "\n"
+#~ "Could not start the VPN connection '%s' due to a failure launching the "
+#~ "VPN program.\n"
+#~ "\n"
+#~ "The VPN service said: \"%s\""
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Помилка запу�ку VPN</span>\n"
+#~ "\n"
+#~ "�е вдаєть�� запу�тити VPN-з'єднанн� '%s' через помилку запу�ку програми "
+#~ "VPN.\n"
+#~ "\n"
+#~ "Повідомленн� �лужби VPN: \"%s\""
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">VPN Connect Failure</span>\n"
+#~ "\n"
+#~ "Could not start the VPN connection '%s' because the VPN server did not "
+#~ "return an adequate network configuration.\n"
+#~ "\n"
+#~ "The VPN service said: \"%s\""
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Помилка з'єднанн� VPN</span>\n"
+#~ "\n"
+#~ "�е вдаєть�� запу�тити VPN-з'єднанн� '%s', тому що VPN-�ервер не повернув "
+#~ "належної конфігурації мережі.\n"
+#~ "\n"
+#~ "Повідомленн� �лужби VPN: \"%s\""
+
+#~ msgid "Configure VPN..."
+#~ msgstr "�алаштовуванн� VPN..."
+
+#~ msgid "Disconnect VPN..."
+#~ msgstr "Від'єднанн� від VPN..."
+
+#~ msgid "Hex Key:"
+#~ msgstr "Ші�тнадц�тковий ключ:"
+
+#~ msgid ""
+#~ "Enter the ESSID and security settings of the wireless network you wish to "
+#~ "create."
+#~ msgstr ""
+#~ "Введіть ESSID та параметри безпеки бездротової мережі, �ку ви бажаєте "
+#~ "�творити."
+
+#~ msgid "By default, the ESSID is set to your computer's name,"
+#~ msgstr "Типово, значенн� ESSID таке ж �к назва комп'ютера,"
+
+#~ msgid "Custom wireless network"
+#~ msgstr "Вла�на бездротова мережа"
+
+#~ msgid ""
+#~ "Enter the ESSID of the wireless network to which you wish to connect."
+#~ msgstr "Введіть ESSID бездротової мережі, до �кої ви бажаєте з'єднати�ь."
+
+#~ msgid "Always Trust this Wireless Network"
+#~ msgstr "Завжди довір�ти бездротовій мережі"
+
+#~ msgid "Connect with encryption enabled"
+#~ msgstr "З'єднанн� з шифруванн�м"
+
+#~ msgid "Don't remind me again"
+#~ msgstr "�е нагадувати надалі"
+
+#~ msgid "Export VPN connection to a file"
+#~ msgstr "Ек�портувати з'єднанн� VPN у файл"
+
+#~ msgid "Finish create VPN Connection"
+#~ msgstr "Завершенн� �творенн� з'єднанн� VPN"
+
+#~ msgid "Manage Virtual Private Network connections"
+#~ msgstr "Керуванн� з'єднанн�ми віртуальної приватної мережеі"
+
+#~ msgid ""
+#~ "This assistant will guide you through the creation of a new VPN "
+#~ "connection to a private network.\n"
+#~ "\n"
+#~ "It will require some information, such as IP addresses and secrets, that "
+#~ "will probably be provided by your system administrator as appropriate."
+#~ msgstr ""
+#~ "Цей помічник допоможе �творити нову приватну мережу VPN.\n"
+#~ "\n"
+#~ "�еобхідно вказати де�ку інформацію, наприклад адре�и IP та �екрети, �кі, "
+#~ "можливо, надають�� �и�темним вашим адміні�тратором."
diff --git a/po/vi.po b/po/vi.po
index 01db30d1fc..7a2dd53439 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -3,10 +3,10 @@
 # Clytie Siddall <clytie@riverland.net.au>, 2006.
 # 
 msgid ""
-""
-msgstr "Project-Id-Version: NetworkManager HEAD\n"
+msgstr ""
+"Project-Id-Version: NetworkManager HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-28 04:09+0100\n"
+"POT-Creation-Date: 2006-05-29 18:33+0200\n"
 "PO-Revision-Date: 2006-02-28 17:28+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
@@ -16,484 +16,502 @@ msgstr "Project-Id-Version: NetworkManager HEAD\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: LocFactoryEditor 1.6b36\n"
 
-#:../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:923
-#,c-format
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:919
+#, c-format
 msgid "Passphrase for wireless network %s"
 msgstr "Cụm từ mật khẩu cho mạng vô tuyến %s"
 
-#:../gnome/applet/applet-dbus.c:259
-#,c-format
+#: ../gnome/applet/applet-dbus.c:265
+#, c-format
 msgid "Connection to the wireless network '%s' failed."
 msgstr "Việc kết nối đến mạng vô tuyến « %s » bị lỗi."
 
-#:../gnome/applet/applet-dbus.c:264
+#: ../gnome/applet/applet-dbus.c:270
 msgid "Connection to the wired network failed."
 msgstr "Việc kết nối đến mạng tuyến bị lỗi."
 
-#:../gnome/applet/applet.c:184
+#: ../gnome/applet/applet.c:184
 msgid "Error displaying connection information:"
 msgstr "Gặp lỗi khi hiển thị thông tin kết nối:"
 
-#:../gnome/applet/applet.c:201
+#: ../gnome/applet/applet.c:202
 msgid "Could not find some required resources (the glade file)!"
 msgstr "• Không thể tìm thấy một số tài nguyên cần thiết (tập tin glade). •"
 
-#:../gnome/applet/applet.c:212
+#: ../gnome/applet/applet.c:213
 msgid "No active connections!"
 msgstr "• Không có kết nối hoạt động. •"
 
-#:../gnome/applet/applet.c:229
-#,c-format
+#: ../gnome/applet/applet.c:234
+#, c-format
 msgid "Wired Ethernet (%s)"
 msgstr "Ethernet tuyến (%s)"
 
-#:../gnome/applet/applet.c:231
-#,c-format
+#: ../gnome/applet/applet.c:236
+#, c-format
 msgid "Wireless Ethernet (%s)"
 msgstr "Ethernet vô tuyến (%s)"
 
-#:../gnome/applet/applet.c:328 ../gnome/applet/applet.c:353
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:362
 msgid "NetworkManager Applet"
 msgstr "Tiểu dụng Quản lý mạng"
 
-#:../gnome/applet/applet.c:330 ../gnome/applet/applet.c:355
+#: ../gnome/applet/applet.c:339 ../gnome/applet/applet.c:364
 msgid "Copyright © 2004-2005 Red Hat, Inc."
 msgstr "Bản quy�n © năm 2004-2005 Red Hat, Inc."
 
-#:../gnome/applet/applet.c:331 ../gnome/applet/applet.c:356
+#: ../gnome/applet/applet.c:340 ../gnome/applet/applet.c:365
 msgid ""
 "Notification area applet for managing your network devices and connections."
-msgstr "Tiểu dụng vùng thông báo để quản lý các thiết bị và kết nối mạng của bạn."
+msgstr ""
+"Tiểu dụng vùng thông báo để quản lý các thiết bị và kết nối mạng của bạn."
 
-#:../gnome/applet/applet.c:334 ../gnome/applet/applet.c:361
+#: ../gnome/applet/applet.c:343 ../gnome/applet/applet.c:370
 msgid "translator-credits"
 msgstr "Nhóm Việt hóa Gnome <gnomevi-list@lists.sourceforge.net>"
 
-#:../gnome/applet/applet.c:417
+#: ../gnome/applet/applet.c:426
 msgid "VPN Login Failure"
 msgstr "�ăng nhập VPN bị lỗi"
 
-#:../gnome/applet/applet.c:418
-#,c-format
+#: ../gnome/applet/applet.c:427
+#, c-format
 msgid "Could not start the VPN connection '%s' due to a login failure."
 msgstr "Không thể khởi chạy kết nối VPN « %s » do việc đăng nhập bị lỗi."
 
-#:../gnome/applet/applet.c:422
+#: ../gnome/applet/applet.c:431
 msgid "VPN Start Failure"
 msgstr "Khởi chạy VPN bị lỗi"
 
-#:../gnome/applet/applet.c:423
-#,c-format
+#: ../gnome/applet/applet.c:432
+#, c-format
 msgid ""
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
 "program."
-msgstr "Không thể khởi chạy kết nối VPN « %s » do việc khởi chạy chương trình VPN bị "
+msgstr ""
+"Không thể khởi chạy kết nối VPN « %s » do việc khởi chạy chương trình VPN bị "
 "lá»—i."
 
-#:../gnome/applet/applet.c:427 ../gnome/applet/applet.c:437
+#: ../gnome/applet/applet.c:436 ../gnome/applet/applet.c:446
 msgid "VPN Connect Failure"
 msgstr "Kết nối VPN bị lỗi"
 
-#:../gnome/applet/applet.c:428
-#,c-format
+#: ../gnome/applet/applet.c:437
+#, c-format
 msgid "Could not start the VPN connection '%s' due to a connection error."
 msgstr "Không thể khởi chạy kết nối VPN « %s » do lỗi kết nối."
 
-#:../gnome/applet/applet.c:432
+#: ../gnome/applet/applet.c:441
 msgid "VPN Configuration Error"
 msgstr "Lỗi cấu hình VPN"
 
-#:../gnome/applet/applet.c:433
-#,c-format
+#: ../gnome/applet/applet.c:442
+#, c-format
 msgid "The VPN connection '%s' was not correctly configured."
 msgstr "Chưa cấu hình đúng sự kết nối VPN « %s »."
 
-#:../gnome/applet/applet.c:438
-#,c-format
+#: ../gnome/applet/applet.c:447
+#, c-format
 msgid ""
 "Could not start the VPN connection '%s' because the VPN server did not "
 "return an adequate network configuration."
-msgstr "Không thể khởi chạy kết nối VPN « %s » vì trình phục vụ VPN chưa trả gởi cấu "
+msgstr ""
+"Không thể khởi chạy kết nối VPN « %s » vì trình phục vụ VPN chưa trả gởi cấu "
 "hình mạng hợp lệ."
 
-#:../gnome/applet/applet.c:505
+#: ../gnome/applet/applet.c:517
 msgid "VPN Login Message"
 msgstr "Thông điệp đăng nhập VPN"
 
-#:../gnome/applet/applet.c:729 ../gnome/applet/applet.c:2481
-#:../gnome/applet/other-network-dialog.c:453
-#:../gnome/applet/passphrase-dialog.c:227
+#: ../gnome/applet/applet.c:741 ../gnome/applet/applet.c:2508
+#: ../gnome/applet/other-network-dialog.c:453
+#: ../gnome/applet/passphrase-dialog.c:228
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
-msgstr "Tiểu dụng Quản lý mạng không thể tìm một số tài nguyên cần thiết (không tìm "
+msgstr ""
+"Tiểu dụng Quản lý mạng không thể tìm một số tài nguyên cần thiết (không tìm "
 "thấy tập tin glade)."
 
-#:../gnome/applet/applet.c:741
-#,c-format
+#: ../gnome/applet/applet.c:753
+#, c-format
 msgid "The network device \"%s (%s)\" does not support wireless scanning."
 msgstr "Thiết bị mạng « %s (%s) » không hỗ trợ khả năng quét vô tuyến."
 
-#:../gnome/applet/applet.c:749
-#,c-format
+#: ../gnome/applet/applet.c:761
+#, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
 msgstr "Thiết bị mạng « %s (%s) » không hỗ trợ khả năng phát hiện liên kết."
 
-#:../gnome/applet/applet.c:896
-#,c-format
+#: ../gnome/applet/applet.c:908
+#, c-format
 msgid "Preparing device %s for the wired network..."
 msgstr "�ang chuẩn bị thiết bị %s cho mạng tuyến..."
 
-#:../gnome/applet/applet.c:898
-#,c-format
+#: ../gnome/applet/applet.c:910
+#, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
 msgstr "�ang chuẩn bị thiết bị %s cho mạng vô tuyến « %s »..."
 
-#:../gnome/applet/applet.c:906
-#,c-format
+#: ../gnome/applet/applet.c:918
+#, c-format
 msgid "Configuring device %s for the wired network..."
 msgstr "�ang cấu hình thiết bị %s cho mạng tuyến..."
 
-#:../gnome/applet/applet.c:908
-#,c-format
+#: ../gnome/applet/applet.c:920
+#, c-format
 msgid "Attempting to join the wireless network '%s'..."
 msgstr "�ang cố tham gia mạng vô tuyến « %s »..."
 
-#:../gnome/applet/applet.c:916
-#,c-format
+#: ../gnome/applet/applet.c:928
+#, c-format
 msgid "Waiting for Network Key for the wireless network '%s'..."
 msgstr "�ang đợi Khóa mạng cho mạng vô tuyến « %s »..."
 
-#:../gnome/applet/applet.c:924 ../gnome/applet/applet.c:934
+#: ../gnome/applet/applet.c:936 ../gnome/applet/applet.c:946
 msgid "Requesting a network address from the wired network..."
 msgstr "�ang yêu cầu địa chỉ mạng từ mạng tuyến..."
 
-#:../gnome/applet/applet.c:926 ../gnome/applet/applet.c:936
-#,c-format
+#: ../gnome/applet/applet.c:938 ../gnome/applet/applet.c:948
+#, c-format
 msgid "Requesting a network address from the wireless network '%s'..."
 msgstr "�ang yêu cầu địa chỉ mạng từ mạng vô tuyến « %s »..."
 
-#:../gnome/applet/applet.c:944
+#: ../gnome/applet/applet.c:956
 msgid "Finishing connection to the wired network..."
 msgstr "�ang kết nối xong tới mạng tuyến..."
 
-#:../gnome/applet/applet.c:946
-#,c-format
+#: ../gnome/applet/applet.c:958
+#, c-format
 msgid "Finishing connection to the wireless network '%s'..."
 msgstr "�ang kết nối xong tới mạng vô tuyến « %s »..."
 
-#:../gnome/applet/applet.c:1063
+#: ../gnome/applet/applet.c:1075
 msgid "NetworkManager is not running"
 msgstr "Trình NetworkManager chưa chạy."
 
-#:../gnome/applet/applet.c:1076 ../gnome/applet/applet.c:1808
+#: ../gnome/applet/applet.c:1083 ../gnome/applet/applet.c:1828
 msgid "Networking disabled"
 msgstr "Chạy mạng bị tắt"
 
-#:../gnome/applet/applet.c:1081
+#: ../gnome/applet/applet.c:1088
 msgid "No network connection"
 msgstr "Không có kết nối mạng"
 
-#:../gnome/applet/applet.c:1086
+#: ../gnome/applet/applet.c:1093
 msgid "Wired network connection"
 msgstr "Kết nối mạng tuyến"
 
-#:../gnome/applet/applet.c:1090
+#: ../gnome/applet/applet.c:1097
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "�ã kết nối tới một mạng vô tuyến Như có"
 
-#:../gnome/applet/applet.c:1092
-#,c-format
+#: ../gnome/applet/applet.c:1099
+#, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "Cách kết nối mạng vô tuyến tới « %s » (%d%%)"
 
-#:../gnome/applet/applet.c:1112
-#,c-format
+#: ../gnome/applet/applet.c:1120
+#, c-format
 msgid "VPN connection to '%s'"
 msgstr "Cách kết nối VPN tới « %s »"
 
-#:../gnome/applet/applet.c:1120
-#,c-format
+#: ../gnome/applet/applet.c:1128
+#, c-format
 msgid "VPN connecting to '%s'"
 msgstr "�ang kết nối VPN tới « %s »..."
 
-#:../gnome/applet/applet.c:1533
+#: ../gnome/applet/applet.c:1541
 msgid "_Connect to Other Wireless Network..."
 msgstr "_Kết nối tới mạng Vô tuyến Khác..."
 
-#:../gnome/applet/applet.c:1554
+#: ../gnome/applet/applet.c:1562
 msgid "Create _New Wireless Network..."
 msgstr "Tạo mạng Vô tuyến _Mới..."
 
-#:../gnome/applet/applet.c:1675
+#: ../gnome/applet/applet.c:1685
 msgid "_VPN Connections"
 msgstr "Kết nối _VPN"
 
-#:../gnome/applet/applet.c:1710
+#: ../gnome/applet/applet.c:1730
 msgid "_Configure VPN..."
 msgstr "_Cấu hình VPN..."
 
-#:../gnome/applet/applet.c:1714
+#: ../gnome/applet/applet.c:1734
 msgid "_Disconnect VPN..."
 msgstr "_Ngắt kết nối VPN..."
 
-#:../gnome/applet/applet.c:1736
+#: ../gnome/applet/applet.c:1756
 msgid "_Dial Up Connections"
 msgstr "Kết nối _quay số"
 
-#.FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
-#:../gnome/applet/applet.c:1747
-#,c-format
+#. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
+#: ../gnome/applet/applet.c:1767
+#, c-format
 msgid "Connect to %s..."
 msgstr "Kết nối đến %s..."
 
-#:../gnome/applet/applet.c:1753
-#,c-format
+#: ../gnome/applet/applet.c:1773
+#, c-format
 msgid "Disconnect from %s..."
 msgstr "Ngắt kết nối từ %s..."
 
-#:../gnome/applet/applet.c:1802
+#: ../gnome/applet/applet.c:1822
 msgid "No network devices have been found"
 msgstr "Không tìm thấy thiết bị mạng nào"
 
-#:../gnome/applet/applet.c:1994
+#: ../gnome/applet/applet.c:2014
 msgid "NetworkManager is not running..."
 msgstr "Trình NetworkManager chưa chạy..."
 
-#.'Enable Networking' item
-#:../gnome/applet/applet.c:2150
+#. 'Enable Networking' item
+#: ../gnome/applet/applet.c:2170
 msgid "Enable _Networking"
 msgstr "Bật chạy _mạng"
 
-#.'Enable Wireless' item
-#:../gnome/applet/applet.c:2156
+#. 'Enable Wireless' item
+#: ../gnome/applet/applet.c:2176
 msgid "Enable _Wireless"
 msgstr "Bật _Vô tuyến"
 
-#.'Connection Information' item
-#:../gnome/applet/applet.c:2162
+#. 'Connection Information' item
+#: ../gnome/applet/applet.c:2182
 msgid "Connection _Information"
 msgstr "Thông t_in kết nối"
 
-#.Help item
-#:../gnome/applet/applet.c:2173
+#. Help item
+#: ../gnome/applet/applet.c:2193
 msgid "_Help"
 msgstr "Trợ _giúp"
 
-#.About item
-#:../gnome/applet/applet.c:2182
+#. About item
+#: ../gnome/applet/applet.c:2202
 msgid "_About"
 msgstr "_Giới thiệu"
 
-#:../gnome/applet/applet.c:2600
+#: ../gnome/applet/applet.c:2667
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
-msgstr "Tiểu dụng Quản lý mạng không thể tìm một số tài nguyên nên không thể tiếp "
+msgstr ""
+"Tiểu dụng Quản lý mạng không thể tìm một số tài nguyên nên không thể tiếp "
 "tục.\n"
 
-#:../gnome/applet/wireless-security-option.c:157
+#: ../gnome/applet/wireless-security-option.c:157
 msgid "Open System"
 msgstr "Hệ thống mở"
 
-#:../gnome/applet/wireless-security-option.c:160
+#: ../gnome/applet/wireless-security-option.c:160
 msgid "Shared Key"
 msgstr "Khóa dùng chung"
 
-#:../gnome/applet/wireless-security-option.c:209
+#: ../gnome/applet/wireless-security-option.c:208
 msgid "Automatic (Default)"
 msgstr "Tự động (Mặc định)"
 
+# Name: don't translate / Tên: đừng dịch
+#: ../gnome/applet/wireless-security-option.c:215
+msgid "AES-CCMP"
+msgstr "AES-CCMP"
+
 # Literal: don't translate / Nghĩa chữ: đừng dịch
-#:../gnome/applet/wireless-security-option.c:216
+#: ../gnome/applet/wireless-security-option.c:223
 msgid "TKIP"
 msgstr "TKIP"
 
-# Name: don't translate / Tên: đừng dịch
-#:../gnome/applet/wireless-security-option.c:224
-msgid "AES-CCMP"
-msgstr "AES-CCMP"
+#: ../gnome/applet/wireless-security-option.c:231
+msgid "Dynamic WEP"
+msgstr "WEP Ä‘á»™ng"
 
-#:../gnome/applet/wso-none.c:53
+#: ../gnome/applet/wso-none.c:53
 msgid "None"
 msgstr "Không có"
 
 # Name: don't translate / Tên: đừng dịch
-#:../gnome/applet/wso-wep-ascii.c:127
-msgid "WEP 40/128-bit ASCII"
-msgstr "WEP 40/128-bit ASCII"
+#: ../gnome/applet/wso-wep-ascii.c:138
+msgid "WEP 64/128-bit ASCII"
+msgstr "WEP 64/128-bit ASCII"
 
-#:../gnome/applet/wso-wep-hex.c:124
-msgid "WEP 40/128-bit hex"
-msgstr "WEP 40/128-bit thập lục"
+#: ../gnome/applet/wso-wep-hex.c:135
+msgid "WEP 64/128-bit Hex"
+msgstr "WEP 64/128-bit thập lục"
 
-#:../gnome/applet/wso-wep-passphrase.c:124
-msgid "WEP Passphrase"
-msgstr "WEP Cụm từ mật khẩu"
+#: ../gnome/applet/wso-wep-passphrase.c:135
+msgid "WEP 128-bit Passphrase"
+msgstr "WEP 128-bit cụm từ mật khẩu"
 
-#:../gnome/applet/wso-wpa-eap.c:202
+#: ../gnome/applet/wso-wpa-eap.c:237
 msgid "PEAP"
 msgstr "PEAP"
 
-#:../gnome/applet/wso-wpa-eap.c:203
+#: ../gnome/applet/wso-wpa-eap.c:238
 msgid "TLS"
 msgstr "TLS"
 
-#:../gnome/applet/wso-wpa-eap.c:204
+#: ../gnome/applet/wso-wpa-eap.c:239
 msgid "TTLS"
 msgstr "TTLS"
 
-#:../gnome/applet/wso-wpa-eap.c:212
 # Name: don't translate / Tên: đừng dịch
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
+#: ../src/nm-ap-security-wpa-eap.c:116
 msgid "WPA2 Enterprise"
 msgstr "WPA2 Enterprise"
 
-#:../gnome/applet/wso-wpa-eap.c:214
 # Name: don't translate / Tên: đừng dịch
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
+#: ../src/nm-ap-security-wpa-eap.c:121
 msgid "WPA Enterprise"
 msgstr "WPA Enterprise"
 
-#:../gnome/applet/wso-wpa-psk.c:166
+#: ../gnome/applet/wso-wpa-psk.c:178
 msgid "WPA2 Personal"
 msgstr "WPA2 Cá nhân"
 
-#:../gnome/applet/wso-wpa-psk.c:168
+#: ../gnome/applet/wso-wpa-psk.c:180
 msgid "WPA Personal"
 msgstr "WPA Cá nhân"
 
-#:../gnome/applet/eggtrayicon.c:134
+#: ../gnome/applet/eggtrayicon.c:134
 msgid "Orientation"
 msgstr "HÆ°á»›ng"
 
-#:../gnome/applet/eggtrayicon.c:135
+#: ../gnome/applet/eggtrayicon.c:135
 msgid "The orientation of the tray."
 msgstr "HÆ°á»›ng khay."
 
-#:../gnome/applet/menu-items.c:87
-#,c-format
+#: ../gnome/applet/menu-items.c:88
+#, c-format
 msgid "Wired Network (%s)"
 msgstr "mạng tuyến (%s)"
 
-#:../gnome/applet/menu-items.c:90
+#: ../gnome/applet/menu-items.c:91
 msgid "_Wired Network"
 msgstr "mạng t_uyến"
 
-#:../gnome/applet/menu-items.c:161
-#,c-format
+#: ../gnome/applet/menu-items.c:162
+#, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
 msgstr[0] "mạng vô tuyến (%s)"
 
-#:../gnome/applet/menu-items.c:163
+#: ../gnome/applet/menu-items.c:164
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "mạng vô tuyến"
 
-#:../gnome/applet/menu-items.c:330
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr " (Unicode không hợp lệ)"
 
-#:../gnome/applet/other-network-dialog.c:352
-#,c-format
+#: ../gnome/applet/other-network-dialog.c:352
+#, c-format
 msgid ""
 "By default, the wireless network's name is set to your computer's name, %s, "
 "with no encryption enabled"
-msgstr "Mặc định là tên của mạng vô tuyến được đặt thành tên của máy tính bạn, %s, "
+msgstr ""
+"Mặc định là tên của mạng vô tuyến được đặt thành tên của máy tính bạn, %s, "
 "không có mật mã được bật."
 
-#:../gnome/applet/other-network-dialog.c:358
+#: ../gnome/applet/other-network-dialog.c:358
 msgid "Create new wireless network"
 msgstr "Tạo mạng vô tuyến mới"
 
-#:../gnome/applet/other-network-dialog.c:359
+#: ../gnome/applet/other-network-dialog.c:359
 msgid ""
 "Enter the name and security settings of the wireless network you wish to "
 "create."
 msgstr "Hãy nhập tên tên và thiết lập bảo mật của mạng vô tuyến bạn muốn thêm."
 
-#:../gnome/applet/other-network-dialog.c:363
+#: ../gnome/applet/other-network-dialog.c:363
 msgid "Create New Wireless Network"
 msgstr "Tạo mạng vô tuyến mới"
 
-#:../gnome/applet/other-network-dialog.c:368
+#: ../gnome/applet/other-network-dialog.c:368
 msgid "Existing wireless network"
 msgstr "mạng vô tuyến đã có"
 
-#:../gnome/applet/other-network-dialog.c:369
+#: ../gnome/applet/other-network-dialog.c:369
 msgid "Enter the name of the wireless network to which you wish to connect."
 msgstr "Hãy gõ tên của mạng vô tuyến đến mà bạn muốn kết nối."
 
-#:../gnome/applet/other-network-dialog.c:371
+#: ../gnome/applet/other-network-dialog.c:371
 msgid "Connect to Other Wireless Network"
 msgstr "Kết nối đến mạng Vô tuyến Khác"
 
-#:../gnome/applet/passphrase-dialog.c:214
+#: ../gnome/applet/passphrase-dialog.c:215
 msgid "Error connecting to wireless network"
 msgstr "Gặp lỗi khi kết nối đến mạng vô tuyến"
 
-#:../gnome/applet/passphrase-dialog.c:215
+#: ../gnome/applet/passphrase-dialog.c:216
 msgid ""
 "The requested wireless network requires security capabilities unsupported by "
 "your hardware."
-msgstr "mạng vô tuyến đã yêu cầu cần thiết khả năng bảo mật không được hỗ trợ bởi "
+msgstr ""
+"mạng vô tuyến đã yêu cầu cần thiết khả năng bảo mật không được hỗ trợ bởi "
 "phần cứng của bạn."
 
-#:../gnome/applet/vpn-password-dialog.c:152
-#:../gnome/applet/vpn-password-dialog.c:189
-#,c-format
+#: ../gnome/applet/vpn-password-dialog.c:151
+#: ../gnome/applet/vpn-password-dialog.c:188
+#, c-format
 msgid "Cannot start VPN connection '%s'"
 msgstr "Không thể khởi chạy kết nối VPN tới « %s »"
 
-#:../gnome/applet/vpn-password-dialog.c:155
-#,c-format
+#: ../gnome/applet/vpn-password-dialog.c:154
+#, c-format
 msgid ""
 "Could not find the authentication dialog for VPN connection type '%s'. "
 "Contact your system administrator."
-msgstr "Không tìm thấy hộp thoại xác thực cho cách kết nối VPN « %s ». Hãy liên lạc "
+msgstr ""
+"Không tìm thấy hộp thoại xác thực cho cách kết nối VPN « %s ». Hãy liên lạc "
 "với quản trị hệ thống."
 
-#:../gnome/applet/vpn-password-dialog.c:192
-#,c-format
+#: ../gnome/applet/vpn-password-dialog.c:191
+#, c-format
 msgid ""
 "There was a problem launching the authentication dialog for VPN connection "
 "type '%s'. Contact your system administrator."
-msgstr "Gặp lỗi khi khởi chạy hộp thoại xác thực cho cách kết nối VPN « %s ». Hãy "
+msgstr ""
+"Gặp lỗi khi khởi chạy hộp thoại xác thực cho cách kết nối VPN « %s ». Hãy "
 "liên lạc với quản trị hệ thống."
 
-#:../gnome/applet/applet.glade.h:1
+#: ../gnome/applet/applet.glade.h:1
 msgid " "
 msgstr " "
 
-#:../gnome/applet/applet.glade.h:2
+#: ../gnome/applet/applet.glade.h:2
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Thông tin kết nối hoạt động</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Thông tin kết nối hoạt động</span>"
 
-#:../gnome/applet/applet.glade.h:4
-#,no-c-format
+#: ../gnome/applet/applet.glade.h:4
+#, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
 "Network</span>\n"
 "\n"
 "A passphrase or encryption key is required to access the wireless network '%"
 "s'."
-msgstr "<span weight=\"bold\" size=\"larger\">Cụm từ Mật khẩu Cần thiết cho mạng Vô "
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Cụm từ Mật khẩu Cần thiết cho mạng Vô "
 "tuyến</span>\n"
 "\n"
 "Cần thiết cụm từ mật khẩu hay khóa mật mã để truy cập mạng vô tuyến « %s »."
 
-#:../gnome/applet/applet.glade.h:8
-#,no-c-format
+#: ../gnome/applet/applet.glade.h:8
+#, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
 "\n"
 "%s  It will not be completely functional."
-msgstr "<span weight=\"bold\" size=\"larger\">Chức năng mạng bị giảm</span>\n"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Chức năng mạng bị giảm</span>\n"
 "\n"
 "%s  Nó sẽ không hoạt động hoàn toàn."
 
-#:../gnome/applet/applet.glade.h:12
-#,no-c-format
+#: ../gnome/applet/applet.glade.h:12
+#, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
 "span>\n"
@@ -501,399 +519,490 @@ msgid ""
 "You have chosen to log in to the wireless network '%s'.  If you are sure "
 "that this wireless network is secure, click the checkbox below and "
 "NetworkManager will not require confirmation on subsequent log ins."
-msgstr "<span weight=\"bold\" size=\"larger\">Xác thực �ăng nhập với mạng Vô tuyến</"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Xác thực �ăng nhập với mạng Vô tuyến</"
 "span>\n"
 "\n"
 "Bạn đã ch�n đăng nhập với mạng vô tuyến « %s ». Nếu bạn có chắc là mạng này "
 "bảo mật, hãy đánh dấu trong hộp ch�n bên dưới, vậy trình Quản lý mạng sẽ "
 "không cần thiết xác thực khi đăng nhập sau."
 
-#:../gnome/applet/applet.glade.h:15
+#: ../gnome/applet/applet.glade.h:15
 msgid "Anonymous Identity:"
 msgstr "Thực thể vô danh:"
 
-#:../gnome/applet/applet.glade.h:16
+#: ../gnome/applet/applet.glade.h:16
 msgid "Authentication:"
 msgstr "Xác thực:"
 
-#:../gnome/applet/applet.glade.h:17
+#: ../gnome/applet/applet.glade.h:17
 msgid "Broadcast Address:"
 msgstr "�ịa chỉ phát thanh:"
 
-#:../gnome/applet/applet.glade.h:18
+#: ../gnome/applet/applet.glade.h:18
 msgid "CA Certificate File:"
 msgstr "Tập tin chứng nhận của CA:"
 
-#:../gnome/applet/applet.glade.h:19
+#: ../gnome/applet/applet.glade.h:19
 msgid "C_onnect"
 msgstr "_Kết nối"
 
-#:../gnome/applet/applet.glade.h:20
+#: ../gnome/applet/applet.glade.h:20
 msgid "Client Certificate File:"
 msgstr "Tập tin chứng nhận của ứng dụng khách:"
 
-#:../gnome/applet/applet.glade.h:21
+#: ../gnome/applet/applet.glade.h:21
 msgid "Connection Information"
 msgstr "Thông tin kết nối"
 
-#:../gnome/applet/applet.glade.h:22
+#: ../gnome/applet/applet.glade.h:22
 msgid "Default Route:"
 msgstr "Tuyến mặc định:"
 
-#:../gnome/applet/applet.glade.h:23
+#: ../gnome/applet/applet.glade.h:23
 msgid "Destination Address:"
 msgstr "�ịa chỉ đích:"
 
-#:../gnome/applet/applet.glade.h:24
+#: ../gnome/applet/applet.glade.h:24
 msgid "Driver:"
 msgstr "Trình đi�u khiển:"
 
-#:../gnome/applet/applet.glade.h:25
+#: ../gnome/applet/applet.glade.h:25
 msgid "EAP Method:"
 msgstr "Phương pháp EAP:"
 
-#:../gnome/applet/applet.glade.h:26
+#: ../gnome/applet/applet.glade.h:26
 msgid "Hardware Address:"
 msgstr "�ịa chỉ phần cứng:"
 
-#:../gnome/applet/applet.glade.h:27
+#: ../gnome/applet/applet.glade.h:27
 msgid "IP Address:"
 msgstr "�ịa chỉ IP:"
 
-#:../gnome/applet/applet.glade.h:28
+#: ../gnome/applet/applet.glade.h:28
 msgid "Identity:"
 msgstr "Thực thể:"
 
-#:../gnome/applet/applet.glade.h:29
+#: ../gnome/applet/applet.glade.h:29
 msgid "Interface:"
 msgstr "Giao diện:"
 
-#:../gnome/applet/applet.glade.h:30
+#: ../gnome/applet/applet.glade.h:30
+msgid "Key Type:"
+msgstr "Kiểu khoá :"
+
+#: ../gnome/applet/applet.glade.h:31
 msgid "Key:"
 msgstr "Khóa:"
 
-#:../gnome/applet/applet.glade.h:31
+#: ../gnome/applet/applet.glade.h:32
 msgid ""
 "None\n"
-"WEP Passphrase\n"
-"WEP 40/128-bit hex\n"
-"WEP 40/128-bit ASCII\n"
-msgstr "Không có\n"
-"Cụm từ mật khẩu WEP\n"
-"WEP 40/128-bit thập lục\n"
-"WEP 40/128-bit ASCII\n"
-
-#:../gnome/applet/applet.glade.h:36
+"WEP 128-bit Passphrase\n"
+"WEP 64/128-bit Hex\n"
+"WEP 64/128-bit ASCII\n"
+msgstr ""
+"Không có\n"
+"WEP 128-bit cụm từ mật khẩu\n"
+"WEP 64/128-bit thập lục\n"
+"WEP 64/128-bit ASCII\n"
+
+#: ../gnome/applet/applet.glade.h:37
 msgid ""
 "Open System\n"
 "Shared Key"
-msgstr "Hệ thống mở\n"
+msgstr ""
+"Hệ thống mở\n"
 "Khóa dùng chung"
 
-#:../gnome/applet/applet.glade.h:38
+#: ../gnome/applet/applet.glade.h:39
 msgid "Other Wireless Network..."
 msgstr "mạng Vô tuyến khác..."
 
-#:../gnome/applet/applet.glade.h:39
+#: ../gnome/applet/applet.glade.h:40
 msgid "Passphrase:"
 msgstr "Cụm từ mật khẩu :"
 
-#:../gnome/applet/applet.glade.h:40
+#: ../gnome/applet/applet.glade.h:41
 msgid "Password:"
 msgstr "Mật khẩu :"
 
-#:../gnome/applet/applet.glade.h:41
+#: ../gnome/applet/applet.glade.h:42
 msgid "Primary DNS:"
 msgstr "DNS chính:"
 
-#:../gnome/applet/applet.glade.h:42
+#: ../gnome/applet/applet.glade.h:43
 msgid "Private Key File:"
 msgstr "Tập tin khoá riêng:"
 
-#:../gnome/applet/applet.glade.h:43
+#: ../gnome/applet/applet.glade.h:44
 msgid "Private Key Password:"
 msgstr "Mật khẩu khoá riêng:"
 
-#:../gnome/applet/applet.glade.h:44
+#: ../gnome/applet/applet.glade.h:45
 msgid "Secondary DNS:"
 msgstr "DNS phụ :"
 
-#:../gnome/applet/applet.glade.h:45
+#: ../gnome/applet/applet.glade.h:46
 msgid "Select the CA Certificate File"
 msgstr "Ch�n tập tin chứng nhận của nhà cầm quy�n chứng nhận (CA)."
 
-#:../gnome/applet/applet.glade.h:46
+#: ../gnome/applet/applet.glade.h:47
 msgid "Select the Client Certificate File"
 msgstr "Ch�n tập tin chứng nhận của ứng dụng khách."
 
-#:../gnome/applet/applet.glade.h:47
+#: ../gnome/applet/applet.glade.h:48
 msgid "Select the Private Key File"
 msgstr "Ch�n tập tin là khóa riêng."
 
-#:../gnome/applet/applet.glade.h:48
+#: ../gnome/applet/applet.glade.h:49
+msgid "Show key"
+msgstr "Hiện khoá"
+
+#: ../gnome/applet/applet.glade.h:50
+msgid "Show passphrase"
+msgstr "HIện cụm từ mật khẩu"
+
+#: ../gnome/applet/applet.glade.h:51
+msgid "Show password"
+msgstr "Hiện mật khẩu"
+
+#: ../gnome/applet/applet.glade.h:52
+msgid "Show passwords"
+msgstr "Hiện các mật khẩu"
+
+#: ../gnome/applet/applet.glade.h:53
+msgid "Speed:"
+msgstr "Tốc độ :"
+
+#: ../gnome/applet/applet.glade.h:54
 msgid "Subnet Mask:"
 msgstr "Mặt nạ mạng cấp dưới:"
 
-#:../gnome/applet/applet.glade.h:49
+#: ../gnome/applet/applet.glade.h:55
 msgid "Type:"
 msgstr "Kiểu :"
 
-#:../gnome/applet/applet.glade.h:50
+#: ../gnome/applet/applet.glade.h:56
 msgid "User Name:"
 msgstr "Tên ngư�i dùng:"
 
-#:../gnome/applet/applet.glade.h:51
+#: ../gnome/applet/applet.glade.h:57
 msgid "Wireless Network Key Required"
 msgstr "Cần thiết Khóa mạng Vô tuyến:"
 
-#:../gnome/applet/applet.glade.h:52
+#: ../gnome/applet/applet.glade.h:58
 msgid "Wireless _adapter:"
 msgstr "_Bộ đi�u hợp vô tuyến"
 
-#:../gnome/applet/applet.glade.h:53
+#: ../gnome/applet/applet.glade.h:59
 msgid "_Always Trust this Wireless Network"
 msgstr "_Luôn luôn tin cây mạng vô tuyến này"
 
-#:../gnome/applet/applet.glade.h:54
+#: ../gnome/applet/applet.glade.h:60
 msgid "_Don't remind me again"
 msgstr "_�ừng nhắc nhở tôi lần nữa"
 
-#:../gnome/applet/applet.glade.h:55
+#: ../gnome/applet/applet.glade.h:61
 msgid "_Login to Network"
 msgstr "_�ăng nhập với mạng"
 
-#:../gnome/applet/applet.glade.h:56
+#: ../gnome/applet/applet.glade.h:62
 msgid "_Network Name:"
 msgstr "T_ên mạng:"
 
-#:../gnome/applet/applet.glade.h:57
+#: ../gnome/applet/applet.glade.h:63
 msgid "_Wireless Security:"
 msgstr "_Bảo mật vô tuyến:"
 
-#:../gnome/applet/applet.glade.h:58
-msgid "leap_subwindow"
-msgstr "leap_subwindow"
-
-#:../gnome/applet/applet.glade.h:59
-msgid "wep_key_subwindow"
-msgstr "wep_key_subwindow"
-
-#:../gnome/applet/applet.glade.h:60
-msgid "wep_passphrase_subwindow"
-msgstr "wep_passphrase_subwindow"
-
-#:../gnome/applet/applet.glade.h:61
-msgid "wpa_eap_subwindow"
-msgstr "wpa_eap_subwindow"
-
-#:../gnome/applet/applet.glade.h:62
-msgid "wpa_psk_subwindow"
-msgstr "wpa_psk_subwindow"
-
-#:../gnome/vpn-properties/nm-vpn-properties.c:358
+#: ../gnome/vpn-properties/nm-vpn-properties.c:383
 msgid "Cannot add VPN connection"
 msgstr "Không thể thêm sự kết nối VPN"
 
-#:../gnome/vpn-properties/nm-vpn-properties.c:360
+#: ../gnome/vpn-properties/nm-vpn-properties.c:385
 msgid ""
 "No suitable VPN software was found on your system. Contact your system "
 "administrator."
-msgstr "Không tìm thấy phần m�m VPN thích hợp nào trong hệ thống của bạn. Hãy liên "
+msgstr ""
+"Không tìm thấy phần m�m VPN thích hợp nào trong hệ thống của bạn. Hãy liên "
 "lạc với quản trị hệ thống."
 
-#:../gnome/vpn-properties/nm-vpn-properties.c:411
+#: ../gnome/vpn-properties/nm-vpn-properties.c:437
 msgid "Cannot import VPN connection"
 msgstr "Không thể nhập sự kết nối VPN"
 
-#:../gnome/vpn-properties/nm-vpn-properties.c:413
-#,c-format
+#: ../gnome/vpn-properties/nm-vpn-properties.c:439
+#, c-format
 msgid ""
 "Cannot find suitable software for VPN connection type '%s' to import the "
 "file '%s'. Contact your system administrator."
-msgstr "Không tìm thấy phần m�m thích hợp cho kiểu kết nối VPN « %s » để nhập tập "
+msgstr ""
+"Không tìm thấy phần m�m thích hợp cho kiểu kết nối VPN « %s » để nhập tập "
 "tin « %s ». Hãy liên lạc với quản trị hệ thống."
 
-#:../gnome/vpn-properties/nm-vpn-properties.c:553
-#,c-format
+#: ../gnome/vpn-properties/nm-vpn-properties.c:579
+#, c-format
 msgid "Error retrieving VPN connection '%s'"
 msgstr "Gặp lỗi khi lấy kết nối PN « %s »"
 
-#:../gnome/vpn-properties/nm-vpn-properties.c:556
-#,c-format
+#: ../gnome/vpn-properties/nm-vpn-properties.c:582
+#, c-format
 msgid ""
 "Could not find the UI files for VPN connection type '%s'. Contact your "
 "system administrator."
-msgstr "Không tìm thấy những tập tin giao diện ngư�i dùng cho kiểu kết nối VPN « %s "
+msgstr ""
+"Không tìm thấy những tập tin giao diện ngư�i dùng cho kiểu kết nối VPN « %s "
 "». Hãy liên lạc với quản trị hệ thống."
 
-#:../gnome/vpn-properties/nm-vpn-properties.c:713
-#,c-format
+#: ../gnome/vpn-properties/nm-vpn-properties.c:739
+#, c-format
 msgid "Delete VPN connection \"%s\"?"
 msgstr "Xóa b� sự kết nối VPN « %s » không?"
 
-#:../gnome/vpn-properties/nm-vpn-properties.c:716
-#,c-format
+#: ../gnome/vpn-properties/nm-vpn-properties.c:742
+#, c-format
 msgid ""
 "All information about the VPN connection \"%s\" will be lost and you may "
 "need your system administrator to provide information to create a new "
 "connection."
-msgstr "M�i thông tin v� sự kết nối VPN « %s » sẽ bị mất và có lẽ bạn sẽ cần quản "
+msgstr ""
+"M�i thông tin v� sự kết nối VPN « %s » sẽ bị mất và có lẽ bạn sẽ cần quản "
 "trị hệ thống cung cấp thông tin để tạo sự kết nối mới."
 
-#:../gnome/vpn-properties/nm-vpn-properties.c:924
+#: ../gnome/vpn-properties/nm-vpn-properties.c:959
 msgid "Unable to load"
 msgstr "Không thể tải"
 
-#:../gnome/vpn-properties/nm-vpn-properties.c:926
+#: ../gnome/vpn-properties/nm-vpn-properties.c:961
 msgid "Cannot find some needed resources (the glade file)!"
 msgstr "• Không tìm thấy một số tài nguyên cần thiết (tải tập tin glade). •"
 
-#.Edit dialog
-#:../gnome/vpn-properties/nm-vpn-properties.c:1034
+#. Edit dialog
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
 msgid "Edit VPN Connection"
 msgstr "Sửa đổi sự kết nối VPN"
 
-#:../gnome/vpn-properties/nm-vpn-properties.glade.h:1
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:1
 msgid "Add a new VPN connection"
 msgstr "Thêm sự kết nối VPN mới"
 
-#:../gnome/vpn-properties/nm-vpn-properties.glade.h:2
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:2
 msgid "Choose which type of VPN connection you wish to create."
 msgstr "Hãy ch�n kiểu kết nối VPN nào bạn muốn tạo."
 
-#:../gnome/vpn-properties/nm-vpn-properties.glade.h:3
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
 msgid "Connect to:"
 msgstr "Kết nối đến:"
 
-#:../gnome/vpn-properties/nm-vpn-properties.glade.h:4
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
 msgid "Create VPN Connection"
 msgstr "Tạo sự kết nối VPN"
 
-#:../gnome/vpn-properties/nm-vpn-properties.glade.h:5
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
 msgid "Create VPN Connection - 1 of 2"
 msgstr "Tạo sự kết nối VPN — bước 1 trên 2"
 
-#:../gnome/vpn-properties/nm-vpn-properties.glade.h:6
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
 msgid "Create VPN Connection - 2 of 2"
 msgstr "Tạo sự kết nối VPN — bước 2 trên 2"
 
-#:../gnome/vpn-properties/nm-vpn-properties.glade.h:7
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
 msgid "Delete the selected VPN connection"
 msgstr "Xóa b� kết nối VPN đã ch�n"
 
-#:../gnome/vpn-properties/nm-vpn-properties.glade.h:8
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
 msgid "E_xport"
 msgstr "_Xuất"
 
-#:../gnome/vpn-properties/nm-vpn-properties.glade.h:9
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:9
 msgid "Edit the selected VPN connection"
 msgstr "Sửa đổi kết nối VPN đã ch�n."
 
-#:../gnome/vpn-properties/nm-vpn-properties.glade.h:10
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:10
 msgid "Export the VPN settings to a file"
 msgstr "Xuất các thiết lập VPN vào tập tin"
 
-#:../gnome/vpn-properties/nm-vpn-properties.glade.h:11
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:11
 msgid "Export the selected VPN connection to a file"
 msgstr "Xuất kết nối VPN đã ch�n vào tập tin"
 
-#:../gnome/vpn-properties/nm-vpn-properties.glade.h:12
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:12
 msgid "Finish Creating VPN Connection"
 msgstr "Tạo xong kết nối VPN"
 
-#:../gnome/vpn-properties/nm-vpn-properties.glade.h:13
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:13
 msgid "Manage Virtual Private Network Connections"
 msgstr "Quản lý các Kết nối mạng Riêng Ảo (VPN)"
 
-#:../gnome/vpn-properties/nm-vpn-properties.glade.h:14
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:14
 msgid ""
 "This assistant will guide you through the creation of a connection to a "
 "Virtual Private Network (VPN).\n"
 "\n"
 "It will require some information, such as IP addresses and secrets.  Please "
 "see your system administrator to obtain this information."
-msgstr "Trợ lý này sẽ hướng dẫn bạn qua tiến trình tạo kết nối đến một mạng Riêng Ảo "
+msgstr ""
+"Trợ lý này sẽ hướng dẫn bạn qua tiến trình tạo kết nối đến một mạng Riêng Ảo "
 "(VPN).\n"
 "\n"
 "Cần thiết một phần thông tin, như địa chỉ IP và đi�u bí mật. Hãy h�i quan "
 "trị hệ thống cung cấp thông tin này."
 
-#:../gnome/vpn-properties/nm-vpn-properties.glade.h:17
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:17
 msgid "VPN Connections"
 msgstr "Kết nối VPN"
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
-#:../src/nm-ap-security-wep.c:47
+#: ../src/nm-ap-security-wep.c:52
 msgid "40-bit WEP"
 msgstr "40-bit WEP"
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
-#:../src/nm-ap-security-wep.c:49
+#: ../src/nm-ap-security-wep.c:54
 msgid "104-bit WEP"
 msgstr "104-bit WEP"
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
-#:../src/nm-ap-security-wpa-psk.c:50
+#: ../src/nm-ap-security-wpa-psk.c:50
 msgid "WPA TKIP"
 msgstr "WPA TKIP"
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
-#:../src/nm-ap-security-wpa-psk.c:52
+#: ../src/nm-ap-security-wpa-psk.c:52
 msgid "WPA CCMP"
 msgstr "WPA CCMP"
 
-#:../src/nm-ap-security-wpa-psk.c:54
+#: ../src/nm-ap-security-wpa-psk.c:54
 msgid "WPA Automatic"
 msgstr "WPA Tá»± Ä‘á»™ng"
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
-#:../src/nm-ap-security-wpa-psk.c:59
+#: ../src/nm-ap-security-wpa-psk.c:59
 msgid "WPA2 TKIP"
 msgstr "WPA2 TKIP"
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
-#:../src/nm-ap-security-wpa-psk.c:61
+#: ../src/nm-ap-security-wpa-psk.c:61
 msgid "WPA2 CCMP"
 msgstr "WPA2 CCMP"
 
-#:../src/nm-ap-security-wpa-psk.c:63
+#: ../src/nm-ap-security-wpa-psk.c:63
 msgid "WPA2 Automatic"
 msgstr "WPA2 Tá»± Ä‘á»™ng"
 
-#:../src/nm-ap-security.c:305
+#: ../src/nm-ap-security.c:320
 msgid "none"
 msgstr "không có"
 
-#:../src/nm-netlink-monitor.c:154
-#,c-format
+#: ../src/nm-netlink-monitor.c:154
+#, c-format
 msgid ""
 "unable to create netlink socket for monitoring wired ethernet devices - %s"
-msgstr "không thể tạo ổ cắm kiểu liên kết mạng, để theo dõi các thiết bị Ethernet "
+msgstr ""
+"không thể tạo ổ cắm kiểu liên kết mạng, để theo dõi các thiết bị Ethernet "
 "tuyến — %s"
 
-#:../src/nm-netlink-monitor.c:172
-#,c-format
+#: ../src/nm-netlink-monitor.c:172
+#, c-format
 msgid ""
 "unable to bind to netlink socket for monitoring wired ethernet devices - %s"
-msgstr "không thể đóng kết tới ổ cắm kiểu liên kết mạng, để theo dõi các thiết bị "
+msgstr ""
+"không thể đóng kết tới ổ cắm kiểu liên kết mạng, để theo dõi các thiết bị "
 "Ethernet tuyến — %s"
 
-#:../src/nm-netlink-monitor.c:405
+#: ../src/nm-netlink-monitor.c:405
 msgid "operation took too long"
 msgstr "thao tác quá lâu"
 
-#:../src/nm-netlink-monitor.c:502
+#: ../src/nm-netlink-monitor.c:502
 msgid "received data from wrong type of sender"
 msgstr "đã nhận dữ liệu từ bộ gởi kiểu không đúng"
 
-#:../src/nm-netlink-monitor.c:515
+#: ../src/nm-netlink-monitor.c:515
 msgid "received data from unexpected sender"
 msgstr "đã nhận dữ liệu từ bộ gởi bất ng�"
 
-#:../src/nm-netlink-monitor.c:646
+#: ../src/nm-netlink-monitor.c:646
 msgid "too much data was sent over socket and some of it was lost"
 msgstr "quá nhi�u dữ liệu đã được gởi qua ổ cắm, và một phần nó bị mất"
 
-#:../src/nm-netlink-monitor.c:735
+#: ../src/nm-netlink-monitor.c:735
 msgid "error occurred while waiting for data on socket"
-msgstr "gặp lỗi khi đợi dữ liệu trên ổ cắm"
\ No newline at end of file
+msgstr "gặp lỗi khi đợi dữ liệu trên ổ cắm"
+
+#: ../gnome/applet/applet-dbus-devices.c:898
+#, c-format
+msgid "You are now connected to the Ad-Hoc wireless network '%s'."
+msgstr "Bây gi� bạn có kết nối hoạt động đến mạng vô tuyến Như có « %s »."
+
+#: ../gnome/applet/applet-dbus-devices.c:903
+#, c-format
+msgid "You are now connected to the wireless network '%s'."
+msgstr "Bây gi� bạn có kết nối hoạt động đến mạng vô tuyến « %s »."
+
+#: ../gnome/applet/applet-dbus-devices.c:910
+msgid "You are now connected to the wired network."
+msgstr "Bây gi� bạn có kết nối hoạt động đến mạng tuyến."
+
+#: ../gnome/applet/applet-dbus-devices.c:916
+msgid "Connection Established"
+msgstr "Kết nối đã được thiết lập"
+
+#: ../gnome/applet/applet-dbus-devices.c:959
+msgid "Disconnected"
+msgstr "Bị ngắt kết nối"
+
+#: ../gnome/applet/applet-dbus-devices.c:960
+msgid "The network connection has been disconnected."
+msgstr "Kết nối mạng đã bị ngắt."
+
+# Name: don't translate / Tên: đừng dịch
+#~ msgid "WEP 40/128-bit ASCII"
+#~ msgstr "WEP 40/128-bit ASCII"
+
+#~ msgid "WEP 40/128-bit hex"
+#~ msgstr "WEP 40/128-bit thập lục"
+
+#~ msgid "WEP Passphrase"
+#~ msgstr "WEP Cụm từ mật khẩu"
+
+#~ msgid ""
+#~ "None\n"
+#~ "WEP Passphrase\n"
+#~ "WEP 40/128-bit hex\n"
+#~ "WEP 40/128-bit ASCII\n"
+#~ msgstr ""
+#~ "Không có\n"
+#~ "Cụm từ mật khẩu WEP\n"
+#~ "WEP 40/128-bit thập lục\n"
+#~ "WEP 40/128-bit ASCII\n"
+
+#~ msgid "leap_subwindow"
+#~ msgstr "leap_subwindow"
+
+#~ msgid "wep_key_subwindow"
+#~ msgstr "wep_key_subwindow"
+
+#~ msgid "wep_passphrase_subwindow"
+#~ msgstr "wep_passphrase_subwindow"
+
+#~ msgid "wpa_eap_subwindow"
+#~ msgstr "wpa_eap_subwindow"
+
+#~ msgid "wpa_psk_subwindow"
+#~ msgstr "wpa_psk_subwindow"
+
+#~ msgid "Stop automatically running the networking applet?"
+#~ msgstr "Dừng tự động chạy tiểu dụng chạy mạng không?"
+
+#~ msgid ""
+#~ "The networking applet will now terminate, but will automatically launch "
+#~ "the next time you login.  Would you like to stop automatically running "
+#~ "the networking applet on login?"
+#~ msgstr ""
+#~ "Tiểu dụng chạy mạng sẽ kết thúc ngay, nhưng sẽ tự động khởi chạy khi bạn "
+#~ "đăng nhập lần kế tiếp. Bạn có muốn dừng tự động chạy tiểu dụng chạy mặng "
+#~ "vào lúc đăng nhập phải không?"
+
+#~ msgid "_Remove"
+#~ msgstr "_Gỡ b�"
diff --git a/po/wa.po b/po/wa.po
index 41bccf2a6a..ede1616b16 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-19 13:38-0400\n"
+"POT-Creation-Date: 2006-05-29 18:33+0200\n"
 "PO-Revision-Date: 2004-09-09 10:41+0200\n"
 "Last-Translator: Pablo Saratxaga <pablo@walon.org>\n"
 "Language-Team: Walloon <linux-wa@walon.org>\n"
@@ -16,62 +16,116 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
-#: info-daemon/networks.glade:11
-msgid "Modify Wireless Networks"
-msgstr "Candjî les rantoeles sins fyis"
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:919
+#, fuzzy, c-format
+msgid "Passphrase for wireless network %s"
+msgstr "I gn a nole rantoele sins fyis..."
 
-#: info-daemon/networks.glade:92
-msgid "<span weight=\"bold\">Wireless Networks:</span>"
-msgstr "<span weight=\"bold\">Rantoeles sins fyis:</span>"
+#: ../gnome/applet/applet-dbus.c:265
+#, c-format
+msgid "Connection to the wireless network '%s' failed."
+msgstr ""
 
-#: info-daemon/passphrase.glade:9
-msgid "Wireless Network Key Required"
-msgstr "I gn a mezåjhe d' ene clé d' ecriptaedje pol rantoele sins fyis"
+#: ../gnome/applet/applet-dbus.c:270
+msgid "Connection to the wired network failed."
+msgstr ""
 
-#: info-daemon/passphrase.glade:52
-msgid "_Login to Network"
-msgstr "S' _elodjî sol rantoele"
+#: ../gnome/applet/applet.c:184
+msgid "Error displaying connection information:"
+msgstr ""
+
+#: ../gnome/applet/applet.c:202
+#, fuzzy
+msgid "Could not find some required resources (the glade file)!"
+msgstr ""
+"L' aplikete manaedjresse di rantoeles n' a nén savou trover sacwantès "
+"rsoûces k' end a mezåjhe (li fitchî glade n' a nén stî trové)."
 
-#: info-daemon/passphrase.glade:100
+#: ../gnome/applet/applet.c:213
 #, fuzzy
+msgid "No active connections!"
+msgstr "Raloyaedjes rantoele"
+
+#: ../gnome/applet/applet.c:234
+#, fuzzy, c-format
+msgid "Wired Ethernet (%s)"
+msgstr "Rantoeles sins fyis"
+
+#: ../gnome/applet/applet.c:236
+#, fuzzy, c-format
+msgid "Wireless Ethernet (%s)"
+msgstr "Rantoeles sins fyis"
+
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:362
+#, fuzzy
+msgid "NetworkManager Applet"
+msgstr "Li manaedjeu d' rantoeles n' est nén en alaedje..."
+
+#: ../gnome/applet/applet.c:339 ../gnome/applet/applet.c:364
+msgid "Copyright © 2004-2005 Red Hat, Inc."
+msgstr ""
+
+#: ../gnome/applet/applet.c:340 ../gnome/applet/applet.c:365
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
-"Network</span>\n"
-"\n"
-"A passphrase or encryption key is required to access the wireless network '%"
-"s'."
+"Notification area applet for managing your network devices and connections."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Li rantoele sins fyis a mezåjhe d' on "
-"scret</span>\n"
-"\n"
-"I gn a mezåjhe d' on sicret ou d' ene clé WEP po-z aveur accès al rantoele "
-"sins fyis «%s»."
 
-#: info-daemon/passphrase.glade:129
-msgid "Key Type:"
+#: ../gnome/applet/applet.c:343 ../gnome/applet/applet.c:370
+msgid "translator-credits"
+msgstr ""
+
+#: ../gnome/applet/applet.c:426
+msgid "VPN Login Failure"
+msgstr ""
+
+#: ../gnome/applet/applet.c:427
+#, c-format
+msgid "Could not start the VPN connection '%s' due to a login failure."
+msgstr ""
+
+#: ../gnome/applet/applet.c:431
+msgid "VPN Start Failure"
 msgstr ""
 
-#: info-daemon/passphrase.glade:150
+#: ../gnome/applet/applet.c:432
+#, c-format
 msgid ""
-"128-bit Passphrase\n"
-"128-bit Raw Hex Key"
+"Could not start the VPN connection '%s' due to a failure launching the VPN "
+"program."
 msgstr ""
 
-#: info-daemon/passphrase.glade:180
-#: info-daemon/NetworkManagerInfoPassphraseDialog.c:101
-msgid "Passphrase:"
-msgstr "Sicret:"
+#: ../gnome/applet/applet.c:436 ../gnome/applet/applet.c:446
+msgid "VPN Connect Failure"
+msgstr ""
 
-#: info-daemon/passphrase.glade:208 panel-applet/essid.glade:162
-msgid "*"
-msgstr "*"
+#: ../gnome/applet/applet.c:437
+#, c-format
+msgid "Could not start the VPN connection '%s' due to a connection error."
+msgstr ""
 
-#: info-daemon/NetworkManagerInfoPassphraseDialog.c:104
-msgid "Key:"
+#: ../gnome/applet/applet.c:441
+msgid "VPN Configuration Error"
+msgstr ""
+
+#: ../gnome/applet/applet.c:442
+#, c-format
+msgid "The VPN connection '%s' was not correctly configured."
 msgstr ""
 
-#. Reuse the above string to make the translators less angry.
-#: panel-applet/NMWirelessApplet.c:691 panel-applet/NMWirelessApplet.c:701
+#: ../gnome/applet/applet.c:447
+#, c-format
+msgid ""
+"Could not start the VPN connection '%s' because the VPN server did not "
+"return an adequate network configuration."
+msgstr ""
+
+#: ../gnome/applet/applet.c:517
+msgid "VPN Login Message"
+msgstr ""
+
+#: ../gnome/applet/applet.c:741 ../gnome/applet/applet.c:2508
+#: ../gnome/applet/other-network-dialog.c:453
+#: ../gnome/applet/passphrase-dialog.c:228
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
@@ -79,81 +133,851 @@ msgstr ""
 "L' aplikete manaedjresse di rantoeles n' a nén savou trover sacwantès "
 "rsoûces k' end a mezåjhe (li fitchî glade n' a nén stî trové)."
 
-#: panel-applet/NMWirelessApplet.c:716
+#: ../gnome/applet/applet.c:753
+#, c-format
+msgid "The network device \"%s (%s)\" does not support wireless scanning."
+msgstr ""
+
+#: ../gnome/applet/applet.c:761
+#, c-format
+msgid "The network device \"%s (%s)\" does not support link detection."
+msgstr ""
+
+#: ../gnome/applet/applet.c:908
+#, c-format
+msgid "Preparing device %s for the wired network..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:910
+#, fuzzy, c-format
+msgid "Preparing device %s for the wireless network '%s'..."
+msgstr "I gn a nole rantoele sins fyis..."
+
+#: ../gnome/applet/applet.c:918
+#, c-format
+msgid "Configuring device %s for the wired network..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:920
+#, fuzzy, c-format
+msgid "Attempting to join the wireless network '%s'..."
+msgstr "I gn a nole rantoele sins fyis..."
+
+#: ../gnome/applet/applet.c:928
+#, fuzzy, c-format
+msgid "Waiting for Network Key for the wireless network '%s'..."
+msgstr "I gn a nole rantoele sins fyis..."
+
+#: ../gnome/applet/applet.c:936 ../gnome/applet/applet.c:946
+msgid "Requesting a network address from the wired network..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:938 ../gnome/applet/applet.c:948
+#, fuzzy, c-format
+msgid "Requesting a network address from the wireless network '%s'..."
+msgstr "I gn a nole rantoele sins fyis..."
+
+#: ../gnome/applet/applet.c:956
+msgid "Finishing connection to the wired network..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:958
+#, fuzzy, c-format
+msgid "Finishing connection to the wireless network '%s'..."
+msgstr "I gn a nole rantoele sins fyis..."
+
+#: ../gnome/applet/applet.c:1075
+#, fuzzy
+msgid "NetworkManager is not running"
+msgstr "Li manaedjeu d' rantoeles n' est nén en alaedje..."
+
+#: ../gnome/applet/applet.c:1083 ../gnome/applet/applet.c:1828
+msgid "Networking disabled"
+msgstr ""
+
+#: ../gnome/applet/applet.c:1088
+#, fuzzy
+msgid "No network connection"
+msgstr "Raloyaedjes rantoele"
+
+#: ../gnome/applet/applet.c:1093
 #, fuzzy
-msgid "Custom wireless network"
+msgid "Wired network connection"
+msgstr "Raloyaedjes rantoele"
+
+#: ../gnome/applet/applet.c:1097
+#, fuzzy
+msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Rantoeles sins fyis"
 
-#: panel-applet/NMWirelessApplet.c:717
-msgid "Enter the ESSID of the wireless network to which you wish to connect."
+#: ../gnome/applet/applet.c:1099
+#, fuzzy, c-format
+msgid "Wireless network connection to '%s' (%d%%)"
+msgstr "Rantoeles sins fyis"
+
+#: ../gnome/applet/applet.c:1120
+#, c-format
+msgid "VPN connection to '%s'"
+msgstr ""
+
+#: ../gnome/applet/applet.c:1128
+#, c-format
+msgid "VPN connecting to '%s'"
 msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:800
+#: ../gnome/applet/applet.c:1541
 #, fuzzy
-msgid "Other Wireless Networks..."
+msgid "_Connect to Other Wireless Network..."
 msgstr "Rantoeles sins fyis"
 
-#: panel-applet/NMWirelessApplet.c:911
+#: ../gnome/applet/applet.c:1562
+#, fuzzy
+msgid "Create _New Wireless Network..."
+msgstr "Rantoeles sins fyis"
+
+#: ../gnome/applet/applet.c:1685
+#, fuzzy
+msgid "_VPN Connections"
+msgstr "Raloyaedjes rantoele"
+
+#: ../gnome/applet/applet.c:1730
+msgid "_Configure VPN..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1734
+msgid "_Disconnect VPN..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1756
+#, fuzzy
+msgid "_Dial Up Connections"
+msgstr "Raloyaedjes rantoele"
+
+#. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
+#: ../gnome/applet/applet.c:1767
+#, c-format
+msgid "Connect to %s..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1773
+#, c-format
+msgid "Disconnect from %s..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1822
 msgid "No network devices have been found"
 msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:1028
+#: ../gnome/applet/applet.c:2014
 msgid "NetworkManager is not running..."
 msgstr "Li manaedjeu d' rantoeles n' est nén en alaedje..."
 
-#: panel-applet/essid.glade:52
-msgid "C_onnect"
+#. 'Enable Networking' item
+#: ../gnome/applet/applet.c:2170
+#, fuzzy
+msgid "Enable _Networking"
+msgstr "Rantoeles sins fyis"
+
+#. 'Enable Wireless' item
+#: ../gnome/applet/applet.c:2176
+msgid "Enable _Wireless"
+msgstr ""
+
+#. 'Connection Information' item
+#: ../gnome/applet/applet.c:2182
+msgid "Connection _Information"
 msgstr ""
 
-#: panel-applet/essid.glade:131
+#. Help item
+#: ../gnome/applet/applet.c:2193
+msgid "_Help"
+msgstr ""
+
+#. About item
+#: ../gnome/applet/applet.c:2202
 #, fuzzy
-msgid "Wireless _Network:"
-msgstr "Rantoeles sins fyis"
+msgid "_About"
+msgstr "Ã…_d fwait..."
 
-#: panel-applet/essid.glade:177
+#: ../gnome/applet/applet.c:2667
 #, fuzzy
-msgid "Wireless _adapter:"
-msgstr "Rantoeles sins fyis"
+msgid ""
+"The NetworkManager applet could not find some required resources.  It cannot "
+"continue.\n"
+msgstr ""
+"L' aplikete manaedjresse di rantoeles n' a nén savou trover sacwantès "
+"rsoûces k' end a mezåjhe (li fitchî glade n' a nén stî trové)."
+
+#: ../gnome/applet/wireless-security-option.c:157
+msgid "Open System"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:160
+msgid "Shared Key"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:208
+msgid "Automatic (Default)"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:215
+msgid "AES-CCMP"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:223
+msgid "TKIP"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:231
+msgid "Dynamic WEP"
+msgstr ""
+
+#: ../gnome/applet/wso-none.c:53
+msgid "None"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-ascii.c:138
+msgid "WEP 64/128-bit ASCII"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-hex.c:135
+msgid "WEP 64/128-bit Hex"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-passphrase.c:135
+#, fuzzy
+msgid "WEP 128-bit Passphrase"
+msgstr "Sicret:"
+
+#: ../gnome/applet/wso-wpa-eap.c:237
+msgid "PEAP"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:238
+msgid "TLS"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:239
+msgid "TTLS"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
+#: ../src/nm-ap-security-wpa-eap.c:116
+msgid "WPA2 Enterprise"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
+#: ../src/nm-ap-security-wpa-eap.c:121
+msgid "WPA Enterprise"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-psk.c:178
+msgid "WPA2 Personal"
+msgstr ""
 
-#: panel-applet/menu-info.c:101
+#: ../gnome/applet/wso-wpa-psk.c:180
+msgid "WPA Personal"
+msgstr ""
+
+#: ../gnome/applet/eggtrayicon.c:134
+msgid "Orientation"
+msgstr ""
+
+#: ../gnome/applet/eggtrayicon.c:135
+msgid "The orientation of the tray."
+msgstr ""
+
+#: ../gnome/applet/menu-items.c:88
 #, fuzzy, c-format
 msgid "Wired Network (%s)"
 msgstr "Rantoeles sins fyis"
 
-#: panel-applet/menu-info.c:103
+#: ../gnome/applet/menu-items.c:91
 #, fuzzy
-msgid "Wired Network"
+msgid "_Wired Network"
 msgstr "Rantoeles sins fyis"
 
-#: panel-applet/menu-info.c:168
+#: ../gnome/applet/menu-items.c:162
 #, fuzzy, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
 msgstr[0] "Rantoeles sins fyis"
 msgstr[1] "Rantoeles sins fyis"
 
-#: panel-applet/menu-info.c:170
+#: ../gnome/applet/menu-items.c:164
 #, fuzzy
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Rantoeles sins fyis"
 msgstr[1] "Rantoeles sins fyis"
 
-#: panel-applet/menu-info.c:307
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr ""
 
-#: examples/python/systray/eggtrayicon.c:111
-msgid "Orientation"
+#: ../gnome/applet/other-network-dialog.c:352
+#, c-format
+msgid ""
+"By default, the wireless network's name is set to your computer's name, %s, "
+"with no encryption enabled"
 msgstr ""
 
-#: examples/python/systray/eggtrayicon.c:112
-msgid "The orientation of the tray."
+#: ../gnome/applet/other-network-dialog.c:358
+#, fuzzy
+msgid "Create new wireless network"
+msgstr "I gn a nole rantoele sins fyis..."
+
+#: ../gnome/applet/other-network-dialog.c:359
+msgid ""
+"Enter the name and security settings of the wireless network you wish to "
+"create."
+msgstr ""
+
+#: ../gnome/applet/other-network-dialog.c:363
+#, fuzzy
+msgid "Create New Wireless Network"
+msgstr "Rantoeles sins fyis"
+
+#: ../gnome/applet/other-network-dialog.c:368
+#, fuzzy
+msgid "Existing wireless network"
+msgstr "Rantoeles sins fyis"
+
+#: ../gnome/applet/other-network-dialog.c:369
+msgid "Enter the name of the wireless network to which you wish to connect."
+msgstr ""
+
+#: ../gnome/applet/other-network-dialog.c:371
+#, fuzzy
+msgid "Connect to Other Wireless Network"
+msgstr "Rantoeles sins fyis"
+
+#: ../gnome/applet/passphrase-dialog.c:215
+#, fuzzy
+msgid "Error connecting to wireless network"
+msgstr "Rantoeles sins fyis"
+
+#: ../gnome/applet/passphrase-dialog.c:216
+msgid ""
+"The requested wireless network requires security capabilities unsupported by "
+"your hardware."
+msgstr ""
+
+#: ../gnome/applet/vpn-password-dialog.c:151
+#: ../gnome/applet/vpn-password-dialog.c:188
+#, c-format
+msgid "Cannot start VPN connection '%s'"
+msgstr ""
+
+#: ../gnome/applet/vpn-password-dialog.c:154
+#, c-format
+msgid ""
+"Could not find the authentication dialog for VPN connection type '%s'. "
+"Contact your system administrator."
+msgstr ""
+
+#: ../gnome/applet/vpn-password-dialog.c:191
+#, c-format
+msgid ""
+"There was a problem launching the authentication dialog for VPN connection "
+"type '%s'. Contact your system administrator."
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:1
+msgid " "
+msgstr " "
+
+#: ../gnome/applet/applet.glade.h:2
+#, fuzzy
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
+msgstr "<span weight=\"bold\">Rantoeles sins fyis:</span>"
+
+#: ../gnome/applet/applet.glade.h:4
+#, fuzzy, no-c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
+"Network</span>\n"
+"\n"
+"A passphrase or encryption key is required to access the wireless network '%"
+"s'."
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Li rantoele sins fyis a mezåjhe d' on "
+"scret</span>\n"
+"\n"
+"I gn a mezåjhe d' on sicret ou d' ene clé WEP po-z aveur accès al rantoele "
+"sins fyis «%s»."
+
+#: ../gnome/applet/applet.glade.h:8
+#, no-c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
+"\n"
+"%s  It will not be completely functional."
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:12
+#, fuzzy, no-c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
+"span>\n"
+"\n"
+"You have chosen to log in to the wireless network '%s'.  If you are sure "
+"that this wireless network is secure, click the checkbox below and "
+"NetworkManager will not require confirmation on subsequent log ins."
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Acertinaedje di l' elodjaedje al "
+"rantoele sins fyis</span>\n"
+"\n"
+"Vos avoz tchoezi di vs elodjî al rantoele sins fyis «%s». Si vos estoz seur "
+"ki cisse rantoele la est fiyåve, clitchîz sol boesse a clitchî chal pa dzo, "
+"eyet l' manaedjeu di rantoeles ni vos pelrè pus avou ces kesses ci l' côp ki "
+"vént."
+
+#: ../gnome/applet/applet.glade.h:15
+msgid "Anonymous Identity:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:16
+msgid "Authentication:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:17
+msgid "Broadcast Address:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:18
+msgid "CA Certificate File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:19
+msgid "C_onnect"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:20
+msgid "Client Certificate File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:21
+msgid "Connection Information"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:22
+msgid "Default Route:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:23
+msgid "Destination Address:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:24
+msgid "Driver:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:25
+msgid "EAP Method:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:26
+msgid "Hardware Address:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:27
+msgid "IP Address:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:28
+msgid "Identity:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:29
+msgid "Interface:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:30
+msgid "Key Type:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:31
+msgid "Key:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:32
+msgid ""
+"None\n"
+"WEP 128-bit Passphrase\n"
+"WEP 64/128-bit Hex\n"
+"WEP 64/128-bit ASCII\n"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:37
+msgid ""
+"Open System\n"
+"Shared Key"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:39
+#, fuzzy
+msgid "Other Wireless Network..."
+msgstr "Rantoeles sins fyis"
+
+#: ../gnome/applet/applet.glade.h:40
+msgid "Passphrase:"
+msgstr "Sicret:"
+
+#: ../gnome/applet/applet.glade.h:41
+msgid "Password:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:42
+msgid "Primary DNS:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:43
+msgid "Private Key File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:44
+msgid "Private Key Password:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:45
+msgid "Secondary DNS:"
 msgstr ""
 
+#: ../gnome/applet/applet.glade.h:46
+msgid "Select the CA Certificate File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:47
+msgid "Select the Client Certificate File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:48
+msgid "Select the Private Key File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:49
+msgid "Show key"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:50
+#, fuzzy
+msgid "Show passphrase"
+msgstr "Sicret:"
+
+#: ../gnome/applet/applet.glade.h:51
+msgid "Show password"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:52
+msgid "Show passwords"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:53
+msgid "Speed:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:54
+msgid "Subnet Mask:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:55
+msgid "Type:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:56
+msgid "User Name:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:57
+msgid "Wireless Network Key Required"
+msgstr "I gn a mezåjhe d' ene clé d' ecriptaedje pol rantoele sins fyis"
+
+#: ../gnome/applet/applet.glade.h:58
+#, fuzzy
+msgid "Wireless _adapter:"
+msgstr "Rantoeles sins fyis"
+
+#: ../gnome/applet/applet.glade.h:59
+#, fuzzy
+msgid "_Always Trust this Wireless Network"
+msgstr "Aveur tofer fiyate dins cisse rantoele ci"
+
+#: ../gnome/applet/applet.glade.h:60
+msgid "_Don't remind me again"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:61
+msgid "_Login to Network"
+msgstr "S' _elodjî sol rantoele"
+
+#: ../gnome/applet/applet.glade.h:62
+msgid "_Network Name:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:63
+#, fuzzy
+msgid "_Wireless Security:"
+msgstr "Rantoeles sins fyis"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:383
+msgid "Cannot add VPN connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:385
+msgid ""
+"No suitable VPN software was found on your system. Contact your system "
+"administrator."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:437
+msgid "Cannot import VPN connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:439
+#, c-format
+msgid ""
+"Cannot find suitable software for VPN connection type '%s' to import the "
+"file '%s'. Contact your system administrator."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:579
+#, c-format
+msgid "Error retrieving VPN connection '%s'"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:582
+#, c-format
+msgid ""
+"Could not find the UI files for VPN connection type '%s'. Contact your "
+"system administrator."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:739
+#, c-format
+msgid "Delete VPN connection \"%s\"?"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:742
+#, c-format
+msgid ""
+"All information about the VPN connection \"%s\" will be lost and you may "
+"need your system administrator to provide information to create a new "
+"connection."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:959
+msgid "Unable to load"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:961
+#, fuzzy
+msgid "Cannot find some needed resources (the glade file)!"
+msgstr ""
+"L' aplikete manaedjresse di rantoeles n' a nén savou trover sacwantès "
+"rsoûces k' end a mezåjhe (li fitchî glade n' a nén stî trové)."
+
+#. Edit dialog
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
+#, fuzzy
+msgid "Edit VPN Connection"
+msgstr "Raloyaedjes rantoele"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:1
+msgid "Add a new VPN connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:2
+msgid "Choose which type of VPN connection you wish to create."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
+msgid "Connect to:"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
+#, fuzzy
+msgid "Create VPN Connection"
+msgstr "Raloyaedjes rantoele"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
+msgid "Create VPN Connection - 1 of 2"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
+msgid "Create VPN Connection - 2 of 2"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
+msgid "Delete the selected VPN connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
+msgid "E_xport"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:9
+msgid "Edit the selected VPN connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:10
+msgid "Export the VPN settings to a file"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:11
+msgid "Export the selected VPN connection to a file"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:12
+msgid "Finish Creating VPN Connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:13
+#, fuzzy
+msgid "Manage Virtual Private Network Connections"
+msgstr "Raloyaedjes rantoele"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:14
+msgid ""
+"This assistant will guide you through the creation of a connection to a "
+"Virtual Private Network (VPN).\n"
+"\n"
+"It will require some information, such as IP addresses and secrets.  Please "
+"see your system administrator to obtain this information."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:17
+#, fuzzy
+msgid "VPN Connections"
+msgstr "Raloyaedjes rantoele"
+
+#: ../src/nm-ap-security-wep.c:52
+msgid "40-bit WEP"
+msgstr ""
+
+#: ../src/nm-ap-security-wep.c:54
+msgid "104-bit WEP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:50
+msgid "WPA TKIP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:52
+msgid "WPA CCMP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:54
+msgid "WPA Automatic"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:59
+msgid "WPA2 TKIP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:61
+msgid "WPA2 CCMP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:63
+msgid "WPA2 Automatic"
+msgstr ""
+
+#: ../src/nm-ap-security.c:320
+msgid "none"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:154
+#, c-format
+msgid ""
+"unable to create netlink socket for monitoring wired ethernet devices - %s"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:172
+#, c-format
+msgid ""
+"unable to bind to netlink socket for monitoring wired ethernet devices - %s"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:405
+msgid "operation took too long"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:502
+msgid "received data from wrong type of sender"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:515
+msgid "received data from unexpected sender"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:646
+msgid "too much data was sent over socket and some of it was lost"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:735
+msgid "error occurred while waiting for data on socket"
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:898
+#, c-format
+msgid "You are now connected to the Ad-Hoc wireless network '%s'."
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:903
+#, fuzzy, c-format
+msgid "You are now connected to the wireless network '%s'."
+msgstr "I gn a nole rantoele sins fyis..."
+
+#: ../gnome/applet/applet-dbus-devices.c:910
+msgid "You are now connected to the wired network."
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:916
+msgid "Connection Established"
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:959
+msgid "Disconnected"
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:960
+#, fuzzy
+msgid "The network connection has been disconnected."
+msgstr "Nou raloyaedje rantoele en alaedje pol moumint..."
+
+#~ msgid "Modify Wireless Networks"
+#~ msgstr "Candjî les rantoeles sins fyis"
+
+#~ msgid "*"
+#~ msgstr "*"
+
 #~ msgid "There are no network devices..."
 #~ msgstr "I gn a nou éndjin rantoele...."
 
+#~ msgid "A wired network connection is currently active..."
+#~ msgstr "On raloyaedje rantoele, mins so fyis, est en alaedje pol moumint..."
+
+#~ msgid "<span weight=\"bold\">Wireless Networks:</span>"
+#~ msgstr "<span weight=\"bold\">Rantoeles sins fyis:</span>"
+
+#, fuzzy
+#~ msgid "Custom wireless network"
+#~ msgstr "Rantoeles sins fyis"
+
+#, fuzzy
+#~ msgid "Other Wireless Networks..."
+#~ msgstr "Rantoeles sins fyis"
+
+#, fuzzy
+#~ msgid "Wireless _Network:"
+#~ msgstr "Rantoeles sins fyis"
+
+#, fuzzy
+#~ msgid "Wired Network"
+#~ msgstr "Rantoeles sins fyis"
+
 #~ msgid "There are no wireless networks..."
 #~ msgstr "I gn a nole rantoele sins fyis..."
 
@@ -163,15 +987,9 @@ msgstr ""
 #~ msgid "No network connection is currently active..."
 #~ msgstr "Nou raloyaedje rantoele en alaedje pol moumint..."
 
-#~ msgid "A wired network connection is currently active..."
-#~ msgstr "On raloyaedje rantoele, mins so fyis, est en alaedje pol moumint..."
-
 #~ msgid "_About..."
 #~ msgstr "Ã…_d fwait..."
 
-#~ msgid " "
-#~ msgstr " "
-
 #~ msgid ""
 #~ "<span weight=\"bold\" size=\"larger\">Wireless Network Login "
 #~ "Confirmation</span>\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index cfcbaf5e35..97b90b7b02 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-16 03:43+0200\n"
+"POT-Creation-Date: 2006-05-29 18:33+0200\n"
 "PO-Revision-Date: 2005-10-16 17:47+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -16,392 +16,437 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#. Setup a request to the keyring to save the network passphrase
-#: ../gnome/applet/applet-dbus-info.c:874
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:919
 #, c-format
 msgid "Passphrase for wireless network %s"
 msgstr "无线网络 %s 的密��"
 
-#: ../gnome/applet/applet-dbus-info.c:1092
-#, c-format
-msgid ""
-"The requested wireless network '%s' does not appear to be in range.  A "
-"different wireless network will be used if any are available."
-msgstr ""
-"所请求的无线网络“%s�似乎�在范围内。如果有其它无线网络的�，将会切�到�用的"
-"无线网络。"
-
-#: ../gnome/applet/applet-dbus.c:317
+#: ../gnome/applet/applet-dbus.c:265
 #, c-format
 msgid "Connection to the wireless network '%s' failed."
 msgstr "到无线网络“%s�的连接失败。"
 
-#: ../gnome/applet/applet-dbus.c:322
+#: ../gnome/applet/applet-dbus.c:270
 msgid "Connection to the wired network failed."
 msgstr "连接到有线网络失败。"
 
-#: ../gnome/applet/applet.c:181
-msgid "Error displaying connection information: "
+#: ../gnome/applet/applet.c:184
+msgid "Error displaying connection information:"
 msgstr "显示连接信�出错："
 
-#: ../gnome/applet/applet.c:200
+#: ../gnome/applet/applet.c:202
 msgid "Could not find some required resources (the glade file)!"
 msgstr "�找�到所需的资�(glade 文件未找到)�"
 
-#: ../gnome/applet/applet.c:211
+#: ../gnome/applet/applet.c:213
 msgid "No active connections!"
 msgstr "没有活动的连接�"
 
-#: ../gnome/applet/applet.c:226
+#: ../gnome/applet/applet.c:234
 #, c-format
 msgid "Wired Ethernet (%s)"
 msgstr "有线以太网(%s)"
 
-#: ../gnome/applet/applet.c:228
+#: ../gnome/applet/applet.c:236
 #, c-format
 msgid "Wireless Ethernet (%s)"
 msgstr "无线以太网(%s)"
 
-#: ../gnome/applet/applet.c:314 ../gnome/applet/applet.c:332
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:362
 msgid "NetworkManager Applet"
 msgstr "网络管�器�程�"
 
-#: ../gnome/applet/applet.c:316 ../gnome/applet/applet.c:334
-msgid "Copyright (C) 2004-2005 Red Hat, Inc."
+#: ../gnome/applet/applet.c:339 ../gnome/applet/applet.c:364
+msgid "Copyright © 2004-2005 Red Hat, Inc."
 msgstr "版� (C) 2004-2005 Red Hat, Inc."
 
-#: ../gnome/applet/applet.c:317 ../gnome/applet/applet.c:335
+#: ../gnome/applet/applet.c:340 ../gnome/applet/applet.c:365
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "管�您网络设备和连接的通知区域�程�"
 
-#: ../gnome/applet/applet.c:339
+#: ../gnome/applet/applet.c:343 ../gnome/applet/applet.c:370
 msgid "translator-credits"
 msgstr "Funda Wang <fundawang@linux.net.cn>"
 
-#: ../gnome/applet/applet.c:424
-msgid "VPN Error"
-msgstr "VPN 出错"
-
-#: ../gnome/applet/applet.c:428
+#: ../gnome/applet/applet.c:426
 msgid "VPN Login Failure"
 msgstr "VPN 登录失败"
 
-#: ../gnome/applet/applet.c:429
+#: ../gnome/applet/applet.c:427
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a login failure."
 msgstr "无法�动 VPN 连接“%s�，原因是登录失败。"
 
-#: ../gnome/applet/applet.c:433
+#: ../gnome/applet/applet.c:431
 msgid "VPN Start Failure"
 msgstr "VPN �动失败"
 
-#: ../gnome/applet/applet.c:434
+#: ../gnome/applet/applet.c:432
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
 "program."
 msgstr "无法�动 VPN 连接“%s�，原因是调用 VPN 程�失败。"
 
-#: ../gnome/applet/applet.c:438 ../gnome/applet/applet.c:448
+#: ../gnome/applet/applet.c:436 ../gnome/applet/applet.c:446
 msgid "VPN Connect Failure"
 msgstr "VPN 连接失败"
 
-#: ../gnome/applet/applet.c:439
+#: ../gnome/applet/applet.c:437
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a connection error."
 msgstr "无法�动 VPN 连接“%s�，原因是连接出错。"
 
-#: ../gnome/applet/applet.c:443
+#: ../gnome/applet/applet.c:441
 msgid "VPN Configuration Error"
 msgstr "VPN �置错误"
 
-#: ../gnome/applet/applet.c:444
+#: ../gnome/applet/applet.c:442
 #, c-format
 msgid "The VPN connection '%s' was not correctly configured."
 msgstr "VPN 连接“%s�未正确�置。"
 
-#: ../gnome/applet/applet.c:449
+#: ../gnome/applet/applet.c:447
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' because the VPN server did not "
 "return an adequate network configuration."
 msgstr "无法�动 VPN 连接“%s�，原因是 VPN �务器未返回足够的网络�置。"
 
-#: ../gnome/applet/applet.c:457
-#, c-format
-msgid "The VPN service said: \"%s\""
-msgstr "VPN �务说：“%s�"
-
-#: ../gnome/applet/applet.c:526
-#, c-format
-msgid "VPN connection '%s' said:"
-msgstr "VPN 连接“%s�说："
-
-#: ../gnome/applet/applet.c:528
+#: ../gnome/applet/applet.c:517
 msgid "VPN Login Message"
 msgstr "VPN 登录消�"
 
-#: ../gnome/applet/applet.c:746 ../gnome/applet/applet.c:2321
-#: ../gnome/applet/other-network-dialog.c:417
-#: ../gnome/applet/passphrase-dialog.c:384
+#: ../gnome/applet/applet.c:741 ../gnome/applet/applet.c:2508
+#: ../gnome/applet/other-network-dialog.c:453
+#: ../gnome/applet/passphrase-dialog.c:228
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
 msgstr "网络管�器�程�找�到所需的资�(glade 文件未找到)。"
 
-#: ../gnome/applet/applet.c:758
+#: ../gnome/applet/applet.c:753
 #, c-format
 msgid "The network device \"%s (%s)\" does not support wireless scanning."
 msgstr "网络设备“%s(%s)��支�无线扫�。"
 
-#: ../gnome/applet/applet.c:766
+#: ../gnome/applet/applet.c:761
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
 msgstr "网络设备“%s(%s)��支�链接检测。"
 
-#: ../gnome/applet/applet.c:910
+#: ../gnome/applet/applet.c:908
 #, c-format
 msgid "Preparing device %s for the wired network..."
 msgstr "正在为有线网络准备设备 %s..."
 
-#: ../gnome/applet/applet.c:912
+#: ../gnome/applet/applet.c:910
 #, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
 msgstr "正在为无线网络“%2$s�准备设备 %1$s..."
 
-#: ../gnome/applet/applet.c:920
+#: ../gnome/applet/applet.c:918
 #, c-format
 msgid "Configuring device %s for the wired network..."
 msgstr "正在为有线网络�置设备 %s..."
 
-#: ../gnome/applet/applet.c:922
+#: ../gnome/applet/applet.c:920
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
 msgstr "正在试图加入无线网络“%s�..."
 
-#: ../gnome/applet/applet.c:930
+#: ../gnome/applet/applet.c:928
 #, c-format
 msgid "Waiting for Network Key for the wireless network '%s'..."
 msgstr "正在等待无线网络“%s�的网络密钥..."
 
-#: ../gnome/applet/applet.c:938 ../gnome/applet/applet.c:948
+#: ../gnome/applet/applet.c:936 ../gnome/applet/applet.c:946
 msgid "Requesting a network address from the wired network..."
 msgstr "正在从有线网络请求网络地�..."
 
-#: ../gnome/applet/applet.c:940 ../gnome/applet/applet.c:950
+#: ../gnome/applet/applet.c:938 ../gnome/applet/applet.c:948
 #, c-format
 msgid "Requesting a network address from the wireless network '%s'..."
 msgstr "正在从无线网络“%s�请求网络地�..."
 
-#: ../gnome/applet/applet.c:958
+#: ../gnome/applet/applet.c:956
 msgid "Finishing connection to the wired network..."
 msgstr "正在完�到有线网络的连接..."
 
-#: ../gnome/applet/applet.c:960
+#: ../gnome/applet/applet.c:958
 #, c-format
 msgid "Finishing connection to the wireless network '%s'..."
 msgstr "正在完�到无线网络“%s�的连接..."
 
-#: ../gnome/applet/applet.c:1077
+#: ../gnome/applet/applet.c:1075
 msgid "NetworkManager is not running"
 msgstr "网络管�器未�行"
 
-#: ../gnome/applet/applet.c:1089
+#: ../gnome/applet/applet.c:1083 ../gnome/applet/applet.c:1828
+msgid "Networking disabled"
+msgstr "网络已�用"
+
+#: ../gnome/applet/applet.c:1088
 msgid "No network connection"
 msgstr "没有网络连接"
 
-#: ../gnome/applet/applet.c:1094
+#: ../gnome/applet/applet.c:1093
 msgid "Wired network connection"
 msgstr "有线网络连接"
 
-#: ../gnome/applet/applet.c:1098
+#: ../gnome/applet/applet.c:1097
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "已连接到 Ad-Hoc 无线网络"
 
-#: ../gnome/applet/applet.c:1100
+#: ../gnome/applet/applet.c:1099
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "到“%s�的无线网络连接(%d%%)"
 
-#: ../gnome/applet/applet.c:1122
+#: ../gnome/applet/applet.c:1120
 #, c-format
 msgid "VPN connection to '%s'"
 msgstr "到“%s�的 VPN 连接"
 
-#: ../gnome/applet/applet.c:1130
+#: ../gnome/applet/applet.c:1128
 #, c-format
 msgid "VPN connecting to '%s'"
 msgstr "连接到“%s�的 VPN"
 
-#: ../gnome/applet/applet.c:1518
+#: ../gnome/applet/applet.c:1541
 msgid "_Connect to Other Wireless Network..."
 msgstr "连接到其它无线网络(_C)..."
 
-#: ../gnome/applet/applet.c:1539
+#: ../gnome/applet/applet.c:1562
 msgid "Create _New Wireless Network..."
 msgstr "创建新的无线网络(_N)..."
 
-#: ../gnome/applet/applet.c:1652
+#: ../gnome/applet/applet.c:1685
 msgid "_VPN Connections"
 msgstr "_VPN 连接"
 
-#: ../gnome/applet/applet.c:1684
+#: ../gnome/applet/applet.c:1730
 msgid "_Configure VPN..."
 msgstr "�置 VPN(_C)..."
 
-#: ../gnome/applet/applet.c:1688
+#: ../gnome/applet/applet.c:1734
 msgid "_Disconnect VPN..."
 msgstr "æ–­å¼€ VPN(_D)..."
 
-#: ../gnome/applet/applet.c:1710
+#: ../gnome/applet/applet.c:1756
 msgid "_Dial Up Connections"
 msgstr "拨�连接(_D)"
 
-#: ../gnome/applet/applet.c:1719
+#. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
+#: ../gnome/applet/applet.c:1767
 #, c-format
 msgid "Connect to %s..."
 msgstr "正在连接到 %s..."
 
-#: ../gnome/applet/applet.c:1769
+#: ../gnome/applet/applet.c:1773
+#, c-format
+msgid "Disconnect from %s..."
+msgstr "正在从 %s 断开..."
+
+#: ../gnome/applet/applet.c:1822
 msgid "No network devices have been found"
 msgstr "没有�现网络设备"
 
-#: ../gnome/applet/applet.c:1939
+#: ../gnome/applet/applet.c:2014
 msgid "NetworkManager is not running..."
 msgstr "网络管�器未�行..."
 
-#. Wireless Enabled item
-#: ../gnome/applet/applet.c:2041
-msgid "_Wireless Enabled"
-msgstr "无线已�用(_W)"
+#. 'Enable Networking' item
+#: ../gnome/applet/applet.c:2170
+msgid "Enable _Networking"
+msgstr "�用�网(_N)"
 
-#. Connection Information item
-#: ../gnome/applet/applet.c:2047
+#. 'Enable Wireless' item
+#: ../gnome/applet/applet.c:2176
+msgid "Enable _Wireless"
+msgstr "�用无线(_W)"
+
+#. 'Connection Information' item
+#: ../gnome/applet/applet.c:2182
 msgid "Connection _Information"
 msgstr "连接信�(_I)"
 
 #. Help item
-#: ../gnome/applet/applet.c:2057
+#: ../gnome/applet/applet.c:2193
 msgid "_Help"
 msgstr "帮助(_H)"
 
 #. About item
-#: ../gnome/applet/applet.c:2065
+#: ../gnome/applet/applet.c:2202
 msgid "_About"
 msgstr "关于(_A)"
 
-#: ../gnome/applet/applet.c:2457
+#: ../gnome/applet/applet.c:2667
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
 msgstr "网络管�器�程�找�到所需的资�。无法继续。\n"
 
-#: ../gnome/applet/eggtrayicon.c:127
+#: ../gnome/applet/wireless-security-option.c:157
+msgid "Open System"
+msgstr "开放�系统"
+
+#: ../gnome/applet/wireless-security-option.c:160
+msgid "Shared Key"
+msgstr "共享密钥"
+
+#: ../gnome/applet/wireless-security-option.c:208
+msgid "Automatic (Default)"
+msgstr "自动(默认)"
+
+#: ../gnome/applet/wireless-security-option.c:215
+msgid "AES-CCMP"
+msgstr "AES-CCMP"
+
+#: ../gnome/applet/wireless-security-option.c:223
+msgid "TKIP"
+msgstr "TKIP"
+
+#: ../gnome/applet/wireless-security-option.c:231
+msgid "Dynamic WEP"
+msgstr "动� WEP"
+
+#: ../gnome/applet/wso-none.c:53
+msgid "None"
+msgstr "æ— "
+
+#: ../gnome/applet/wso-wep-ascii.c:138
+msgid "WEP 64/128-bit ASCII"
+msgstr "WEP 64/128 � ASCII"
+
+#: ../gnome/applet/wso-wep-hex.c:135
+msgid "WEP 64/128-bit Hex"
+msgstr "WEP 64/128 ��六进制"
+
+#: ../gnome/applet/wso-wep-passphrase.c:135
+msgid "WEP 128-bit Passphrase"
+msgstr "WEP 128 �密��"
+
+#: ../gnome/applet/wso-wpa-eap.c:237
+msgid "PEAP"
+msgstr "PEAP"
+
+#: ../gnome/applet/wso-wpa-eap.c:238
+msgid "TLS"
+msgstr "TLS"
+
+#: ../gnome/applet/wso-wpa-eap.c:239
+msgid "TTLS"
+msgstr "TTLS"
+
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
+#: ../src/nm-ap-security-wpa-eap.c:116
+msgid "WPA2 Enterprise"
+msgstr "WPA2 �业"
+
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
+#: ../src/nm-ap-security-wpa-eap.c:121
+msgid "WPA Enterprise"
+msgstr "WPA �业"
+
+#: ../gnome/applet/wso-wpa-psk.c:178
+msgid "WPA2 Personal"
+msgstr "WPA2 个人"
+
+#: ../gnome/applet/wso-wpa-psk.c:180
+msgid "WPA Personal"
+msgstr "WPA 个人"
+
+#: ../gnome/applet/eggtrayicon.c:134
 msgid "Orientation"
 msgstr "方�"
 
-#: ../gnome/applet/eggtrayicon.c:128
+#: ../gnome/applet/eggtrayicon.c:135
 msgid "The orientation of the tray."
 msgstr "托盘方�。"
 
-#: ../gnome/applet/menu-items.c:87
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "有线网络(%s)"
 
-#: ../gnome/applet/menu-items.c:90
+#: ../gnome/applet/menu-items.c:91
 msgid "_Wired Network"
 msgstr "有线网络(_W)"
 
-#: ../gnome/applet/menu-items.c:161
+#: ../gnome/applet/menu-items.c:162
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
 msgstr[0] "无线网络(%s)"
 
-#: ../gnome/applet/menu-items.c:163
+#: ../gnome/applet/menu-items.c:164
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "无线网络"
 
-#: ../gnome/applet/menu-items.c:303
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr " (无效的 Unicode)"
 
-#: ../gnome/applet/other-network-dialog.c:148
-#: ../gnome/applet/applet.glade.h:42
-msgid "_Passphrase:"
-msgstr "密��(_P)："
-
-#: ../gnome/applet/other-network-dialog.c:151
-msgid "_ASCII Key:"
-msgstr "_ASCII 密钥："
-
-#: ../gnome/applet/other-network-dialog.c:154
-msgid "_Hex Key:"
-msgstr "�六进制密钥(_H)："
+#: ../gnome/applet/other-network-dialog.c:352
+#, c-format
+msgid ""
+"By default, the wireless network's name is set to your computer's name, %s, "
+"with no encryption enabled"
+msgstr "默认情况下，无线网络的�称会设定为您的计算机�称，%s，如果没有加密的�"
 
-#: ../gnome/applet/other-network-dialog.c:243
+#: ../gnome/applet/other-network-dialog.c:358
 msgid "Create new wireless network"
 msgstr "创建新的无线网络"
 
-#: ../gnome/applet/other-network-dialog.c:244
+#: ../gnome/applet/other-network-dialog.c:359
 msgid ""
-"Enter the ESSID and security settings of the wireless network you wish to "
+"Enter the name and security settings of the wireless network you wish to "
 "create."
-msgstr "输入您想�创建的无线网络的 ESSID 和安全设置。"
+msgstr "输入您想�创建的无线网络的�称和安全设置。"
 
-#: ../gnome/applet/other-network-dialog.c:245
-msgid "By default, the ESSID is set to your computer's name,"
-msgstr "默认情况下，ESSID 会设定为您的计算机�称 "
-
-#: ../gnome/applet/other-network-dialog.c:247
-msgid ", with no encryption enabled."
-msgstr "，并且��用加密。"
-
-#: ../gnome/applet/other-network-dialog.c:249
+#: ../gnome/applet/other-network-dialog.c:363
 msgid "Create New Wireless Network"
 msgstr "创建新的无线网络"
 
-#: ../gnome/applet/other-network-dialog.c:254
-msgid "Custom wireless network"
-msgstr "自定义无线网络"
+#: ../gnome/applet/other-network-dialog.c:368
+msgid "Existing wireless network"
+msgstr "现有无线网络"
 
-#: ../gnome/applet/other-network-dialog.c:255
-msgid "Enter the ESSID of the wireless network to which you wish to connect."
-msgstr "输入您想�连接的无线网络的 ESSID。"
+#: ../gnome/applet/other-network-dialog.c:369
+msgid "Enter the name of the wireless network to which you wish to connect."
+msgstr "输入您想�连接的无线网络的�称。"
 
-#: ../gnome/applet/other-network-dialog.c:257
+#: ../gnome/applet/other-network-dialog.c:371
 msgid "Connect to Other Wireless Network"
 msgstr "连接到其它无线网络"
 
-#: ../gnome/applet/passphrase-dialog.c:155
-msgid "Passphrase:"
-msgstr "密��："
-
-#: ../gnome/applet/passphrase-dialog.c:158
-msgid "ASCII Key:"
-msgstr "ASCII 密钥："
+#: ../gnome/applet/passphrase-dialog.c:215
+msgid "Error connecting to wireless network"
+msgstr "连接到无线网络出错"
 
-#: ../gnome/applet/passphrase-dialog.c:161
-msgid "Hex Key:"
-msgstr "�六进制密钥："
+#: ../gnome/applet/passphrase-dialog.c:216
+msgid ""
+"The requested wireless network requires security capabilities unsupported by "
+"your hardware."
+msgstr "您的硬件�支�请求的无线网络所需的安全特性。"
 
-#: ../gnome/applet/vpn-password-dialog.c:152
-#: ../gnome/applet/vpn-password-dialog.c:189
+#: ../gnome/applet/vpn-password-dialog.c:151
+#: ../gnome/applet/vpn-password-dialog.c:188
 #, c-format
 msgid "Cannot start VPN connection '%s'"
 msgstr "无法�动 VPN 连接“%s�"
 
-#: ../gnome/applet/vpn-password-dialog.c:155
+#: ../gnome/applet/vpn-password-dialog.c:154
 #, c-format
 msgid ""
 "Could not find the authentication dialog for VPN connection type '%s'. "
 "Contact your system administrator."
 msgstr "找�到 VPN 连接类型“%s�的身份验�对�。请�系您的系统管�员。"
 
-#: ../gnome/applet/vpn-password-dialog.c:192
+#: ../gnome/applet/vpn-password-dialog.c:191
 #, c-format
 msgid ""
 "There was a problem launching the authentication dialog for VPN connection "
@@ -414,30 +459,10 @@ msgstr " "
 
 #: ../gnome/applet/applet.glade.h:2
 msgid ""
-"128-bit Passphrase (WEP)\n"
-"ASCII Key (WEP)\n"
-"Hex Key (WEP)"
-msgstr ""
-"128 �密��(WEP)\n"
-"ASCII 密钥(WEP)\n"
-"�六进制密钥(WEP)"
-
-#: ../gnome/applet/applet.glade.h:5
-msgid ""
-"128-bit passphrase (WEP)\n"
-"ASCII key (WEP)\n"
-"Hex key (WEP)"
-msgstr ""
-"128 �密��(WEP)\n"
-"ASCII 密钥(WEP)\n"
-"�六进制密钥(WEP)"
-
-#: ../gnome/applet/applet.glade.h:8
-msgid ""
 "<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">活动连接信�</span>"
 
-#: ../gnome/applet/applet.glade.h:10
+#: ../gnome/applet/applet.glade.h:4
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
@@ -450,7 +475,7 @@ msgstr ""
 "\n"
 "�访问无线网络“%s�，需��供密��或加密密钥。"
 
-#: ../gnome/applet/applet.glade.h:14
+#: ../gnome/applet/applet.glade.h:8
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
@@ -461,7 +486,7 @@ msgstr ""
 "\n"
 "%s  该网络无法完整工作。"
 
-#: ../gnome/applet/applet.glade.h:18
+#: ../gnome/applet/applet.glade.h:12
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
@@ -476,105 +501,209 @@ msgstr ""
 "您选择登录到无线网络“%s�。如果您确定此无线网络是安全的，请选中下�的�选框，"
 "网络管�器在以�登录时将�会请求确认。"
 
-#: ../gnome/applet/applet.glade.h:21
+#: ../gnome/applet/applet.glade.h:15
+msgid "Anonymous Identity:"
+msgstr "匿�身份："
+
+#: ../gnome/applet/applet.glade.h:16
+msgid "Authentication:"
+msgstr "认�："
+
+#: ../gnome/applet/applet.glade.h:17
 msgid "Broadcast Address:"
 msgstr "广播地�："
 
-#: ../gnome/applet/applet.glade.h:22
+#: ../gnome/applet/applet.glade.h:18
+msgid "CA Certificate File:"
+msgstr "CA �书文件："
+
+#: ../gnome/applet/applet.glade.h:19
 msgid "C_onnect"
 msgstr "连接(_O)"
 
-#: ../gnome/applet/applet.glade.h:23
-msgid "Connect with _encryption enabled"
-msgstr "�用加密连接(_E)"
+#: ../gnome/applet/applet.glade.h:20
+msgid "Client Certificate File:"
+msgstr "客户端�书文件："
 
-#: ../gnome/applet/applet.glade.h:24
+#: ../gnome/applet/applet.glade.h:21
 msgid "Connection Information"
 msgstr "连接信�"
 
-#: ../gnome/applet/applet.glade.h:25
+#: ../gnome/applet/applet.glade.h:22
 msgid "Default Route:"
 msgstr "默认路由："
 
-#: ../gnome/applet/applet.glade.h:26
+#: ../gnome/applet/applet.glade.h:23
 msgid "Destination Address:"
 msgstr "目的地�："
 
-#: ../gnome/applet/applet.glade.h:27
+#: ../gnome/applet/applet.glade.h:24
+msgid "Driver:"
+msgstr "驱动程�："
+
+#: ../gnome/applet/applet.glade.h:25
+msgid "EAP Method:"
+msgstr "EAP 方法："
+
+#: ../gnome/applet/applet.glade.h:26
 msgid "Hardware Address:"
 msgstr "硬件地�："
 
-#: ../gnome/applet/applet.glade.h:28
+#: ../gnome/applet/applet.glade.h:27
 msgid "IP Address:"
 msgstr "IP 地�："
 
+#: ../gnome/applet/applet.glade.h:28
+msgid "Identity:"
+msgstr "身份："
+
 #: ../gnome/applet/applet.glade.h:29
 msgid "Interface:"
 msgstr "接�："
 
 #: ../gnome/applet/applet.glade.h:30
+msgid "Key Type:"
+msgstr "密钥类型："
+
+#: ../gnome/applet/applet.glade.h:31
+msgid "Key:"
+msgstr "密钥："
+
+#: ../gnome/applet/applet.glade.h:32
+msgid ""
+"None\n"
+"WEP 128-bit Passphrase\n"
+"WEP 64/128-bit Hex\n"
+"WEP 64/128-bit ASCII\n"
+msgstr ""
+"æ— \n"
+"WEP 128 �密��\n"
+"WEP 64/128 ��六进制\n"
+"WEP 64/128 � ASCII\n"
+
+#: ../gnome/applet/applet.glade.h:37
+msgid ""
+"Open System\n"
+"Shared Key"
+msgstr ""
+"开放�系统\n"
+"共享密钥"
+
+#: ../gnome/applet/applet.glade.h:39
 msgid "Other Wireless Network..."
 msgstr "其它无线网络..."
 
-#: ../gnome/applet/applet.glade.h:31
+#: ../gnome/applet/applet.glade.h:40
+msgid "Passphrase:"
+msgstr "密��："
+
+#: ../gnome/applet/applet.glade.h:41
+msgid "Password:"
+msgstr "密�："
+
+#: ../gnome/applet/applet.glade.h:42
 msgid "Primary DNS:"
 msgstr "主 DNS："
 
-#: ../gnome/applet/applet.glade.h:32
+#: ../gnome/applet/applet.glade.h:43
+msgid "Private Key File:"
+msgstr "�钥文件："
+
+#: ../gnome/applet/applet.glade.h:44
+msgid "Private Key Password:"
+msgstr "�用密钥密�："
+
+#: ../gnome/applet/applet.glade.h:45
 msgid "Secondary DNS:"
 msgstr "辅 DNS："
 
-#: ../gnome/applet/applet.glade.h:33
+#: ../gnome/applet/applet.glade.h:46
+msgid "Select the CA Certificate File"
+msgstr "选择 CA �书文件"
+
+#: ../gnome/applet/applet.glade.h:47
+msgid "Select the Client Certificate File"
+msgstr "选择客户端�书文件"
+
+#: ../gnome/applet/applet.glade.h:48
+msgid "Select the Private Key File"
+msgstr "选择�钥文件"
+
+#: ../gnome/applet/applet.glade.h:49
+msgid "Show key"
+msgstr "显示密钥"
+
+#: ../gnome/applet/applet.glade.h:50
+msgid "Show passphrase"
+msgstr "显示密��"
+
+#: ../gnome/applet/applet.glade.h:51
+msgid "Show password"
+msgstr "显示密�"
+
+#: ../gnome/applet/applet.glade.h:52
+msgid "Show passwords"
+msgstr "显示密�"
+
+#: ../gnome/applet/applet.glade.h:53
+msgid "Speed:"
+msgstr "速度："
+
+#: ../gnome/applet/applet.glade.h:54
 msgid "Subnet Mask:"
 msgstr "�网掩�："
 
-#: ../gnome/applet/applet.glade.h:34
+#: ../gnome/applet/applet.glade.h:55
+msgid "Type:"
+msgstr "类型："
+
+#: ../gnome/applet/applet.glade.h:56
+msgid "User Name:"
+msgstr "用户�："
+
+#: ../gnome/applet/applet.glade.h:57
 msgid "Wireless Network Key Required"
 msgstr "需�无线网络密钥"
 
-#: ../gnome/applet/applet.glade.h:35
+#: ../gnome/applet/applet.glade.h:58
 msgid "Wireless _adapter:"
 msgstr "无线适�器(_A)："
 
-#: ../gnome/applet/applet.glade.h:36
-msgid "Wireless _network:"
-msgstr "无线网络(_N)："
-
-#: ../gnome/applet/applet.glade.h:37
+#: ../gnome/applet/applet.glade.h:59
 msgid "_Always Trust this Wireless Network"
 msgstr "总是信任此无线网络(_A)"
 
-#: ../gnome/applet/applet.glade.h:38
+#: ../gnome/applet/applet.glade.h:60
 msgid "_Don't remind me again"
 msgstr "以����醒(_D)"
 
-#: ../gnome/applet/applet.glade.h:39
-msgid "_Key Type:"
-msgstr "密钥类型(_K)："
-
-#: ../gnome/applet/applet.glade.h:40
-msgid "_Key type:"
-msgstr "密钥类型(_K)："
-
-#: ../gnome/applet/applet.glade.h:41
+#: ../gnome/applet/applet.glade.h:61
 msgid "_Login to Network"
 msgstr "登录到网络(_L)"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:372
+#: ../gnome/applet/applet.glade.h:62
+msgid "_Network Name:"
+msgstr "网络�称(_N)："
+
+#: ../gnome/applet/applet.glade.h:63
+msgid "_Wireless Security:"
+msgstr "无线安全性(_W)："
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:383
 msgid "Cannot add VPN connection"
 msgstr "无法添加 VPN 连接"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:374
+#: ../gnome/vpn-properties/nm-vpn-properties.c:385
 msgid ""
 "No suitable VPN software was found on your system. Contact your system "
 "administrator."
 msgstr "您的系统上未找到�适的 VPN 软件。请�系您的系统管�员。"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:426
+#: ../gnome/vpn-properties/nm-vpn-properties.c:437
 msgid "Cannot import VPN connection"
 msgstr "没有导入 VPN 连接"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:428
+#: ../gnome/vpn-properties/nm-vpn-properties.c:439
 #, c-format
 msgid ""
 "Cannot find suitable software for VPN connection type '%s' to import the "
@@ -582,24 +711,24 @@ msgid ""
 msgstr ""
 "找�到�适的软件�导入 VPN 连接类型“%s�的文件“%s�。请�系您的系统管�员。"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:568
+#: ../gnome/vpn-properties/nm-vpn-properties.c:579
 #, c-format
 msgid "Error retrieving VPN connection '%s'"
 msgstr "获� VPN 连接“%s�出错"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:571
+#: ../gnome/vpn-properties/nm-vpn-properties.c:582
 #, c-format
 msgid ""
 "Could not find the UI files for VPN connection type '%s'. Contact your "
 "system administrator."
 msgstr "找�到 VPN 连接类型“%s�的用户界�文件。请�系您的系统管�员。"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:731
+#: ../gnome/vpn-properties/nm-vpn-properties.c:739
 #, c-format
 msgid "Delete VPN connection \"%s\"?"
 msgstr "删除 VPN 连接“%s��？"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:734
+#: ../gnome/vpn-properties/nm-vpn-properties.c:742
 #, c-format
 msgid ""
 "All information about the VPN connection \"%s\" will be lost and you may "
@@ -609,16 +738,16 @@ msgstr ""
 "关于 VPN 连接“%s�的全部信�都将丢失。�创建新连接的�，您就必须请求您的系统管"
 "�员�供相应信�。"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:940
+#: ../gnome/vpn-properties/nm-vpn-properties.c:959
 msgid "Unable to load"
 msgstr "无法装入"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:942
+#: ../gnome/vpn-properties/nm-vpn-properties.c:961
 msgid "Cannot find some needed resources (the glade file)!"
 msgstr "找�到所需的资�(glade 文件)�"
 
 #. Edit dialog
-#: ../gnome/vpn-properties/nm-vpn-properties.c:1060
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
 msgid "Edit VPN Connection"
 msgstr "编辑 VPN 连接"
 
@@ -691,6 +820,42 @@ msgstr ""
 msgid "VPN Connections"
 msgstr "VPN 连接"
 
+#: ../src/nm-ap-security-wep.c:52
+msgid "40-bit WEP"
+msgstr "40 � WEP"
+
+#: ../src/nm-ap-security-wep.c:54
+msgid "104-bit WEP"
+msgstr "104 � WEP"
+
+#: ../src/nm-ap-security-wpa-psk.c:50
+msgid "WPA TKIP"
+msgstr "WPA TKIP"
+
+#: ../src/nm-ap-security-wpa-psk.c:52
+msgid "WPA CCMP"
+msgstr "WPA CCMP"
+
+#: ../src/nm-ap-security-wpa-psk.c:54
+msgid "WPA Automatic"
+msgstr "WPA 自动"
+
+#: ../src/nm-ap-security-wpa-psk.c:59
+msgid "WPA2 TKIP"
+msgstr "WPA2 TKIP"
+
+#: ../src/nm-ap-security-wpa-psk.c:61
+msgid "WPA2 CCMP"
+msgstr "WPA2 CCMP"
+
+#: ../src/nm-ap-security-wpa-psk.c:63
+msgid "WPA2 Automatic"
+msgstr "WPA2 自动"
+
+#: ../src/nm-ap-security.c:320
+msgid "none"
+msgstr "æ— "
+
 #: ../src/nm-netlink-monitor.c:154
 #, c-format
 msgid ""
@@ -703,22 +868,160 @@ msgid ""
 "unable to bind to netlink socket for monitoring wired ethernet devices - %s"
 msgstr "无法绑定到监视有线以太网设备的网络连接套接字 - %s"
 
-#: ../src/nm-netlink-monitor.c:403
+#: ../src/nm-netlink-monitor.c:405
 msgid "operation took too long"
 msgstr "�作时间太长"
 
-#: ../src/nm-netlink-monitor.c:500
+#: ../src/nm-netlink-monitor.c:502
 msgid "received data from wrong type of sender"
 msgstr "从错误的��者类型收到数�"
 
-#: ../src/nm-netlink-monitor.c:513
+#: ../src/nm-netlink-monitor.c:515
 msgid "received data from unexpected sender"
 msgstr "从未知的��者收到数�"
 
-#: ../src/nm-netlink-monitor.c:644
+#: ../src/nm-netlink-monitor.c:646
 msgid "too much data was sent over socket and some of it was lost"
 msgstr "�套接字��的数�太多，其中有些已�丢失"
 
-#: ../src/nm-netlink-monitor.c:733
+#: ../src/nm-netlink-monitor.c:735
 msgid "error occurred while waiting for data on socket"
 msgstr "等候套接字上的数�时�生了错误"
+
+#: ../gnome/applet/applet-dbus-devices.c:898
+#, c-format
+msgid "You are now connected to the Ad-Hoc wireless network '%s'."
+msgstr "您现在已连接到 Ad-Hoc 无线网络“%s�。"
+
+#: ../gnome/applet/applet-dbus-devices.c:903
+#, c-format
+msgid "You are now connected to the wireless network '%s'."
+msgstr "您现在已连接到无线网络“%s�。"
+
+#: ../gnome/applet/applet-dbus-devices.c:910
+msgid "You are now connected to the wired network."
+msgstr "您现在已连接到有线网络。"
+
+#: ../gnome/applet/applet-dbus-devices.c:916
+msgid "Connection Established"
+msgstr "连接已建立"
+
+#: ../gnome/applet/applet-dbus-devices.c:959
+msgid "Disconnected"
+msgstr "已断开连接"
+
+#: ../gnome/applet/applet-dbus-devices.c:960
+msgid "The network connection has been disconnected."
+msgstr "网络连接现已断开。"
+
+#~ msgid ""
+#~ "The requested wireless network '%s' does not appear to be in range.  A "
+#~ "different wireless network will be used if any are available."
+#~ msgstr ""
+#~ "所请求的无线网络“%s�似乎�在范围内。如果有其它无线网络的�，将会切�到�用"
+#~ "的无线网络。"
+
+#~ msgid "VPN Error"
+#~ msgstr "VPN 出错"
+
+#~ msgid "The VPN service said: \"%s\""
+#~ msgstr "VPN �务说：“%s�"
+
+#~ msgid "VPN connection '%s' said:"
+#~ msgstr "VPN 连接“%s�说："
+
+#~ msgid "_Wireless Enabled"
+#~ msgstr "无线已�用(_W)"
+
+#~ msgid "_Passphrase:"
+#~ msgstr "密��(_P)："
+
+#~ msgid "_ASCII Key:"
+#~ msgstr "_ASCII 密钥："
+
+#~ msgid "_Hex Key:"
+#~ msgstr "�六进制密钥(_H)："
+
+#~ msgid ", with no encryption enabled."
+#~ msgstr "，并且��用加密。"
+
+#~ msgid "ASCII Key:"
+#~ msgstr "ASCII 密钥："
+
+#~ msgid ""
+#~ "128-bit Passphrase (WEP)\n"
+#~ "ASCII Key (WEP)\n"
+#~ "Hex Key (WEP)"
+#~ msgstr ""
+#~ "128 �密��(WEP)\n"
+#~ "ASCII 密钥(WEP)\n"
+#~ "�六进制密钥(WEP)"
+
+#~ msgid ""
+#~ "128-bit passphrase (WEP)\n"
+#~ "ASCII key (WEP)\n"
+#~ "Hex key (WEP)"
+#~ msgstr ""
+#~ "128 �密��(WEP)\n"
+#~ "ASCII 密钥(WEP)\n"
+#~ "�六进制密钥(WEP)"
+
+#~ msgid "Connect with _encryption enabled"
+#~ msgstr "�用加密连接(_E)"
+
+#~ msgid "Wireless _network:"
+#~ msgstr "无线网络(_N)："
+
+#~ msgid "_Key type:"
+#~ msgstr "密钥类型(_K)："
+
+#~ msgid "Copyright (c) 2004-2005 Red Hat, Inc."
+#~ msgstr "Copyright (c) 2004-2005 Red Hat, Inc."
+
+#~ msgid "Stop automatically running the networking applet?"
+#~ msgstr "�自动�止�行�网�程��？"
+
+#~ msgid ""
+#~ "The networking applet will now terminate, but will automatically launch "
+#~ "the next time you login.  Would you like to stop automatically running "
+#~ "the networking applet on login?"
+#~ msgstr ""
+#~ "�网�程�将立�终止，但会在您下次登录时自动起动。�在登录时自动�止�行�"
+#~ "网�程��？"
+
+#~ msgid "_Remove"
+#~ msgstr "去除(_R)"
+
+#~ msgid "Wire"
+#~ msgid_plural " (inva"
+#~ msgstr[0] "无线网络"
+
+#~ msgid " (inva"
+#~ msgstr " (无效的 Unicode)"
+
+#~ msgid "Error displaying connection information: "
+#~ msgstr "显示连接信�出错："
+
+#~ msgid "Copyright (C) 2004-2005 Red Hat, Inc."
+#~ msgstr "版� (C) 2004-2005 Red Hat, Inc."
+
+#~ msgid ""
+#~ "Enter the ESSID and security settings of the wireless network you wish to "
+#~ "create."
+#~ msgstr "输入您想�创建的无线网络的 ESSID 和安全设置。"
+
+#~ msgid "By default, the ESSID is set to your computer's name,"
+#~ msgstr "默认情况下，ESSID 会设定为您的计算机�称 "
+
+#~ msgid "Custom wireless network"
+#~ msgstr "自定义无线网络"
+
+#~ msgid ""
+#~ "Enter the ESSID of the wireless network to which you wish to connect."
+#~ msgstr "输入您想�连接的无线网络的 ESSID。"
+
+#~ msgid "Hex Key:"
+#~ msgstr "�六进制密钥："
+
+#~ msgid "_Key Type:"
+#~ msgstr "密钥类型(_K)："
diff --git a/po/zh_TW.po b/po/zh_TW.po
index e2ba2a2aab..a9bd5fa070 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Network Manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-21 22:15+0800\n"
+"POT-Creation-Date: 2006-05-29 18:33+0200\n"
 "PO-Revision-Date: 2005-07-09 11:14+0800\n"
 "Last-Translator: Woodman Tuen <wmtuen@gmail.com>\n"
 "Language-Team: Chinese/Traditional <community@linuxhall.org>\n"
@@ -16,386 +16,452 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../gnome/applet/applet-dbus-info.c:986
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:919
 #, c-format
-msgid ""
-"The requested wireless network '%s' does not appear to be in range.  A "
-"different wireless network will be used if any are available."
-msgstr ""
+msgid "Passphrase for wireless network %s"
+msgstr "無線網路 %s 的通行碼"
 
-#: ../gnome/applet/applet-dbus.c:597
-#, c-format
-msgid "Connection to the wireless network '%s' failed.\n"
+#: ../gnome/applet/applet-dbus.c:265
+#, fuzzy, c-format
+msgid "Connection to the wireless network '%s' failed."
 msgstr "連接無線網路‘%s’失敗。\n"
 
-#: ../gnome/applet/applet-dbus.c:602
-msgid "Connection to the wired network failed.\n"
+#: ../gnome/applet/applet-dbus.c:270
+#, fuzzy
+msgid "Connection to the wired network failed."
 msgstr "連接有線網路失敗。\n"
 
-#: ../gnome/applet/applet.c:192
-msgid "Error displaying connection information: "
+#: ../gnome/applet/applet.c:184
+#, fuzzy
+msgid "Error displaying connection information:"
 msgstr "顯示連線資訊發生錯誤："
 
-#: ../gnome/applet/applet.c:217
+#: ../gnome/applet/applet.c:202
 msgid "Could not find some required resources (the glade file)!"
 msgstr "無法找到一些需�的資�（glade 檔）�"
 
-#: ../gnome/applet/applet.c:227
+#: ../gnome/applet/applet.c:213
 msgid "No active connections!"
 msgstr "沒有使用中的連線"
 
-#: ../gnome/applet/applet.c:236
-msgid "Could not open socket!"
-msgstr ""
-
-#: ../gnome/applet/applet.c:251
-msgid "Failed to get information about the interface!"
-msgstr "無法�得網路介�的訊資�"
-
-#: ../gnome/applet/applet.c:284
+#: ../gnome/applet/applet.c:234
 #, c-format
 msgid "Wired Ethernet (%s)"
 msgstr "有線乙太網路 (%s)"
 
-#: ../gnome/applet/applet.c:286
+#: ../gnome/applet/applet.c:236
 #, c-format
 msgid "Wireless Ethernet (%s)"
 msgstr "有線乙太網路 (%s)"
 
-#: ../gnome/applet/applet.c:380 ../gnome/applet/applet.c:398
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:362
 msgid "NetworkManager Applet"
 msgstr "NetworkManager ��程�"
 
-#: ../gnome/applet/applet.c:382 ../gnome/applet/applet.c:400
-msgid "Copyright (C) 2004-2005 Red Hat, Inc."
+#: ../gnome/applet/applet.c:339 ../gnome/applet/applet.c:364
+#, fuzzy
+msgid "Copyright © 2004-2005 Red Hat, Inc."
 msgstr "版權所有 (C) 2004-2005 Red Hat, Inc."
 
-#: ../gnome/applet/applet.c:383 ../gnome/applet/applet.c:401
+#: ../gnome/applet/applet.c:340 ../gnome/applet/applet.c:365
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 
-#: ../gnome/applet/applet.c:486
-msgid "VPN Error"
-msgstr "VPN 錯誤"
+#: ../gnome/applet/applet.c:343 ../gnome/applet/applet.c:370
+msgid "translator-credits"
+msgstr ""
 
-#: ../gnome/applet/applet.c:490
-#, c-format
-msgid ""
-"<span weight=\"bold\" size=\"larger\">VPN Login Failure</span>\n"
-"\n"
-"Could not start the VPN connection '%s' due to a login failure.\n"
-"\n"
-"The VPN service said: \"%s\""
+#: ../gnome/applet/applet.c:426
+msgid "VPN Login Failure"
 msgstr ""
 
-#: ../gnome/applet/applet.c:495
+#: ../gnome/applet/applet.c:427
+#, fuzzy, c-format
+msgid "Could not start the VPN connection '%s' due to a login failure."
+msgstr "無法執行 VPN 連線‘%s’"
+
+#: ../gnome/applet/applet.c:431
+msgid "VPN Start Failure"
+msgstr ""
+
+#: ../gnome/applet/applet.c:432
 #, c-format
 msgid ""
-"<span weight=\"bold\" size=\"larger\">VPN Start Failure</span>\n"
-"\n"
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
-"program.\n"
-"\n"
-"The VPN service said: \"%s\""
+"program."
 msgstr ""
 
-#: ../gnome/applet/applet.c:500
-#, c-format
-msgid ""
-"<span weight=\"bold\" size=\"larger\">VPN Connect Failure</span>\n"
-"\n"
-"Could not start the VPN connection '%s' due to a connection error.\n"
-"\n"
-"The VPN service said: \"%s\""
+#: ../gnome/applet/applet.c:436 ../gnome/applet/applet.c:446
+#, fuzzy
+msgid "VPN Connect Failure"
+msgstr "VPN 連線"
+
+#: ../gnome/applet/applet.c:437
+#, fuzzy, c-format
+msgid "Could not start the VPN connection '%s' due to a connection error."
+msgstr "無法執行 VPN 連線‘%s’"
+
+#: ../gnome/applet/applet.c:441
+msgid "VPN Configuration Error"
 msgstr ""
 
-#: ../gnome/applet/applet.c:505
+#: ../gnome/applet/applet.c:442
 #, c-format
-msgid ""
-"<span weight=\"bold\" size=\"larger\">VPN Configuration Error</span>\n"
-"\n"
-"The VPN connection '%s' was not correctly configured.\n"
-"\n"
-"The VPN service said: \"%s\""
+msgid "The VPN connection '%s' was not correctly configured."
 msgstr ""
 
-#: ../gnome/applet/applet.c:510
+#: ../gnome/applet/applet.c:447
 #, c-format
 msgid ""
-"<span weight=\"bold\" size=\"larger\">VPN Connect Failure</span>\n"
-"\n"
 "Could not start the VPN connection '%s' because the VPN server did not "
-"return an adequate network configuration.\n"
-"\n"
-"The VPN service said: \"%s\""
+"return an adequate network configuration."
 msgstr ""
 
-#: ../gnome/applet/applet.c:577
-#, c-format
-msgid ""
-"<span weight=\"bold\" size=\"larger\">VPN Login Message</span>\n"
-"\n"
-"VPN connection '%s' said:\n"
-"\n"
-"\"%s\""
+#: ../gnome/applet/applet.c:517
+msgid "VPN Login Message"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">VPN 登入訊�</span>\n"
-"\n"
-"VPN 連線‘%s’說：\n"
-"\n"
-"\"%s\""
 
-#: ../gnome/applet/applet.c:795 ../gnome/applet/applet.c:2365
-#: ../gnome/applet/other-network-dialog.c:315
-#: ../gnome/applet/passphrase-dialog.c:455
+#: ../gnome/applet/applet.c:741 ../gnome/applet/applet.c:2508
+#: ../gnome/applet/other-network-dialog.c:453
+#: ../gnome/applet/passphrase-dialog.c:228
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
 msgstr "NetworkManager ��程�無法找到一些需�的資�（找�到 glade 檔）"
 
-#: ../gnome/applet/applet.c:808
+#: ../gnome/applet/applet.c:753
 #, c-format
 msgid "The network device \"%s (%s)\" does not support wireless scanning."
 msgstr "網路�置“%s (%s)��支�無線網路掃�。"
 
-#: ../gnome/applet/applet.c:815
+#: ../gnome/applet/applet.c:761
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
 msgstr "網路�置“%s (%s)��支�連接�測"
 
-#: ../gnome/applet/applet.c:936
+#: ../gnome/applet/applet.c:908
 #, c-format
 msgid "Preparing device %s for the wired network..."
 msgstr "�置 %s 正準備連接有線網路..."
 
-#: ../gnome/applet/applet.c:938
+#: ../gnome/applet/applet.c:910
 #, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
 msgstr "�置 %s 正準備連接無線網路‘%s’..."
 
-#: ../gnome/applet/applet.c:945
+#: ../gnome/applet/applet.c:918
 #, fuzzy, c-format
 msgid "Configuring device %s for the wired network..."
 msgstr "正在連接到有線網路..."
 
-#: ../gnome/applet/applet.c:947
+#: ../gnome/applet/applet.c:920
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
 msgstr "正在嘗試加入無線網路‘%s’..."
 
-#: ../gnome/applet/applet.c:954
+#: ../gnome/applet/applet.c:928
 #, c-format
 msgid "Waiting for Network Key for the wireless network '%s'..."
 msgstr "正在等待無線網路‘%s’的網路金鑰..."
 
-#: ../gnome/applet/applet.c:961 ../gnome/applet/applet.c:970
+#: ../gnome/applet/applet.c:936 ../gnome/applet/applet.c:946
 msgid "Requesting a network address from the wired network..."
 msgstr "正�求有線網路�供網路��..."
 
-#: ../gnome/applet/applet.c:963 ../gnome/applet/applet.c:972
+#: ../gnome/applet/applet.c:938 ../gnome/applet/applet.c:948
 #, c-format
 msgid "Requesting a network address from the wireless network '%s'..."
 msgstr "正�求無線網路‘%s’�供網路��..."
 
-#: ../gnome/applet/applet.c:979
+#: ../gnome/applet/applet.c:956
 msgid "Finishing connection to the wired network..."
 msgstr "連接有線網路完�..."
 
-#: ../gnome/applet/applet.c:981
+#: ../gnome/applet/applet.c:958
 #, c-format
 msgid "Finishing connection to the wireless network '%s'..."
 msgstr "連接無線網路‘%s’完�..."
 
-#: ../gnome/applet/applet.c:1027
+#: ../gnome/applet/applet.c:1075
 msgid "NetworkManager is not running"
 msgstr "NetworkManager 沒有執行"
 
-#: ../gnome/applet/applet.c:1038
+#: ../gnome/applet/applet.c:1083 ../gnome/applet/applet.c:1828
+msgid "Networking disabled"
+msgstr ""
+
+#: ../gnome/applet/applet.c:1088
 msgid "No network connection"
 msgstr "沒有網路連接"
 
-#: ../gnome/applet/applet.c:1045
+#: ../gnome/applet/applet.c:1093
 msgid "Wired network connection"
 msgstr "有線網路連接"
 
-#: ../gnome/applet/applet.c:1052
+#: ../gnome/applet/applet.c:1097
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "連接到 Ad-Hoc 點�點�無線網路"
 
-#: ../gnome/applet/applet.c:1066
+#: ../gnome/applet/applet.c:1099
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "無線網路連接到‘%s’ (%d%%)"
 
-#: ../gnome/applet/applet.c:1091
+#: ../gnome/applet/applet.c:1120
 #, c-format
 msgid "VPN connection to '%s'"
 msgstr "VPN 連線連接到‘%s’"
 
-#: ../gnome/applet/applet.c:1517
+#: ../gnome/applet/applet.c:1128
+#, fuzzy, c-format
+msgid "VPN connecting to '%s'"
+msgstr "VPN 連線連接到‘%s’"
+
+#: ../gnome/applet/applet.c:1541
 msgid "_Connect to Other Wireless Network..."
 msgstr "連接到其它的無線網路(_C)..."
 
-#: ../gnome/applet/applet.c:1538
+#: ../gnome/applet/applet.c:1562
 msgid "Create _New Wireless Network..."
 msgstr "建立新的無線網路(_N)..."
 
-#: ../gnome/applet/applet.c:1651
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:17
-msgid "VPN Connections"
+#: ../gnome/applet/applet.c:1685
+#, fuzzy
+msgid "_VPN Connections"
 msgstr "VPN 連線"
 
-#: ../gnome/applet/applet.c:1678
-msgid "Configure VPN..."
+#: ../gnome/applet/applet.c:1730
+#, fuzzy
+msgid "_Configure VPN..."
 msgstr "設置 VPN..."
 
-#: ../gnome/applet/applet.c:1682
-msgid "Disconnect VPN..."
+#: ../gnome/applet/applet.c:1734
+#, fuzzy
+msgid "_Disconnect VPN..."
 msgstr "與 VPN 斷線..."
 
-#: ../gnome/applet/applet.c:1732
+#: ../gnome/applet/applet.c:1756
+#, fuzzy
+msgid "_Dial Up Connections"
+msgstr "VPN 連線"
+
+#. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
+#: ../gnome/applet/applet.c:1767
+#, fuzzy, c-format
+msgid "Connect to %s..."
+msgstr "連線到："
+
+#: ../gnome/applet/applet.c:1773
+#, fuzzy, c-format
+msgid "Disconnect from %s..."
+msgstr "與 VPN 斷線..."
+
+#: ../gnome/applet/applet.c:1822
 msgid "No network devices have been found"
 msgstr "找�到任何網路�置"
 
-#: ../gnome/applet/applet.c:1890
+#: ../gnome/applet/applet.c:2014
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager 沒有執行...."
 
-#: ../gnome/applet/applet.c:1958
-msgid "_Stop All Wireless Devices"
-msgstr "�止所有無線網路�置(_S)"
-
-#: ../gnome/applet/applet.c:1963
-msgid "_Start All Wireless Devices"
-msgstr "開始執行所有無線網路�置(_S)"
-
-#: ../gnome/applet/applet.c:1994
-#, fuzzy
-msgid "_Wireless Network Discovery"
-msgstr "無線網路 (%s)"
-
-#: ../gnome/applet/applet.c:1997
-msgid "Always Search"
-msgstr "總是�尋"
-
-#: ../gnome/applet/applet.c:2005
-msgid "Search Only When Disconnected"
-msgstr "在斷線時��尋"
-
-#: ../gnome/applet/applet.c:2013
-msgid "Never Search"
-msgstr "永��尋"
+#. 'Enable Networking' item
+#: ../gnome/applet/applet.c:2170
+msgid "Enable _Networking"
+msgstr ""
 
-#. Stop All Wireless Devices item
-#: ../gnome/applet/applet.c:2025
-msgid "Stop All Wireless Devices"
-msgstr "�止所有無線網路�置"
+#. 'Enable Wireless' item
+#: ../gnome/applet/applet.c:2176
+msgid "Enable _Wireless"
+msgstr ""
 
-#: ../gnome/applet/applet.c:2031
+#. 'Connection Information' item
+#: ../gnome/applet/applet.c:2182
 msgid "Connection _Information"
 msgstr "連線資訊(_I)"
 
-#: ../gnome/applet/applet.c:2039
+#. Help item
+#: ../gnome/applet/applet.c:2193
 msgid "_Help"
 msgstr "求助(_H)"
 
-#: ../gnome/applet/applet.c:2046
+#. About item
+#: ../gnome/applet/applet.c:2202
 msgid "_About"
 msgstr "關於(_A)"
 
-#: ../gnome/applet/applet.c:2515
+#: ../gnome/applet/applet.c:2667
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
 msgstr "NetworkManager ��程�無法找到一些需�的資�。它無法繼續。\n"
 
-#: ../gnome/applet/eggtrayicon.c:118
+#: ../gnome/applet/wireless-security-option.c:157
+msgid "Open System"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:160
+msgid "Shared Key"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:208
+msgid "Automatic (Default)"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:215
+msgid "AES-CCMP"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:223
+msgid "TKIP"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:231
+msgid "Dynamic WEP"
+msgstr ""
+
+#: ../gnome/applet/wso-none.c:53
+msgid "None"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-ascii.c:138
+msgid "WEP 64/128-bit ASCII"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-hex.c:135
+msgid "WEP 64/128-bit Hex"
+msgstr ""
+
+#: ../gnome/applet/wso-wep-passphrase.c:135
+#, fuzzy
+msgid "WEP 128-bit Passphrase"
+msgstr "通行碼："
+
+#: ../gnome/applet/wso-wpa-eap.c:237
+msgid "PEAP"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:238
+msgid "TLS"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:239
+msgid "TTLS"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
+#: ../src/nm-ap-security-wpa-eap.c:116
+msgid "WPA2 Enterprise"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
+#: ../src/nm-ap-security-wpa-eap.c:121
+msgid "WPA Enterprise"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-psk.c:178
+msgid "WPA2 Personal"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-psk.c:180
+msgid "WPA Personal"
+msgstr ""
+
+#: ../gnome/applet/eggtrayicon.c:134
 msgid "Orientation"
 msgstr "方�"
 
-#: ../gnome/applet/eggtrayicon.c:119
+#: ../gnome/applet/eggtrayicon.c:135
 msgid "The orientation of the tray."
 msgstr "��的方�"
 
-#: ../gnome/applet/menu-items.c:89
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "有線網路 (%s)"
 
-#: ../gnome/applet/menu-items.c:92
+#: ../gnome/applet/menu-items.c:91
 msgid "_Wired Network"
 msgstr "有線網路(_W)"
 
-#: ../gnome/applet/menu-items.c:165
+#: ../gnome/applet/menu-items.c:162
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
 msgstr[0] "無線網路 (%s)"
 
-#: ../gnome/applet/menu-items.c:167
+#: ../gnome/applet/menu-items.c:164
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "無線網路"
 
-#: ../gnome/applet/menu-items.c:309
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr "（無效的統一碼）"
 
-#: ../gnome/applet/other-network-dialog.c:148
-#: ../gnome/applet/passphrase-dialog.c:163
-#: ../gnome/applet/applet.glade.h:34
-msgid "Passphrase:"
-msgstr "通行碼："
-
-#: ../gnome/applet/other-network-dialog.c:151
-#: ../gnome/applet/passphrase-dialog.c:166
-#, fuzzy
-msgid "ASCII Key:"
-msgstr "Acii 格�金鑰："
-
-#: ../gnome/applet/other-network-dialog.c:154
-#: ../gnome/applet/passphrase-dialog.c:169
-msgid "Hex Key:"
-msgstr "Hex 格�金鑰："
+#: ../gnome/applet/other-network-dialog.c:352
+#, c-format
+msgid ""
+"By default, the wireless network's name is set to your computer's name, %s, "
+"with no encryption enabled"
+msgstr ""
 
-#: ../gnome/applet/other-network-dialog.c:229
+#: ../gnome/applet/other-network-dialog.c:358
 msgid "Create new wireless network"
 msgstr "建立新的無線網路"
 
-#: ../gnome/applet/other-network-dialog.c:230
+#: ../gnome/applet/other-network-dialog.c:359
+#, fuzzy
 msgid ""
-"Enter the ESSID and security settings of the wireless network you wish to "
+"Enter the name and security settings of the wireless network you wish to "
 "create."
 msgstr "輸入您�建立的無線網路的 ESSID �安全設定。"
 
-#: ../gnome/applet/other-network-dialog.c:235
-msgid "Custom wireless network"
+#: ../gnome/applet/other-network-dialog.c:363
+#, fuzzy
+msgid "Create New Wireless Network"
+msgstr "建立新的無線網路(_N)..."
+
+#: ../gnome/applet/other-network-dialog.c:368
+#, fuzzy
+msgid "Existing wireless network"
 msgstr "自訂無線網路"
 
-#: ../gnome/applet/other-network-dialog.c:236
-msgid "Enter the ESSID of the wireless network to which you wish to connect."
+#: ../gnome/applet/other-network-dialog.c:369
+#, fuzzy
+msgid "Enter the name of the wireless network to which you wish to connect."
 msgstr "輸入您�連接的無線網路的 ESSID。"
 
-#: ../gnome/applet/passphrase-dialog.c:248
-#, c-format
-msgid "Passphrase for wireless network %s"
-msgstr "無線網路 %s 的通行碼"
+#: ../gnome/applet/other-network-dialog.c:371
+#, fuzzy
+msgid "Connect to Other Wireless Network"
+msgstr "連接到其它的無線網路(_C)..."
 
-#: ../gnome/applet/vpn-password-dialog.c:152
-#: ../gnome/applet/vpn-password-dialog.c:191
+#: ../gnome/applet/passphrase-dialog.c:215
+#, fuzzy
+msgid "Error connecting to wireless network"
+msgstr "連接到 Ad-Hoc 點�點�無線網路"
+
+#: ../gnome/applet/passphrase-dialog.c:216
+msgid ""
+"The requested wireless network requires security capabilities unsupported by "
+"your hardware."
+msgstr ""
+
+#: ../gnome/applet/vpn-password-dialog.c:151
+#: ../gnome/applet/vpn-password-dialog.c:188
 #, c-format
 msgid "Cannot start VPN connection '%s'"
 msgstr "無法執行 VPN 連線‘%s’"
 
-#: ../gnome/applet/vpn-password-dialog.c:155
+#: ../gnome/applet/vpn-password-dialog.c:154
 #, c-format
 msgid ""
 "Could not find the authentication dialog for VPN connection type '%s'. "
 "Contact your system administrator."
 msgstr ""
 
-#: ../gnome/applet/vpn-password-dialog.c:194
+#: ../gnome/applet/vpn-password-dialog.c:191
 #, c-format
 msgid ""
 "There was a problem launching the authentication dialog for VPN connection "
@@ -408,30 +474,10 @@ msgstr " "
 
 #: ../gnome/applet/applet.glade.h:2
 msgid ""
-"128-bit Passphrase (WEP)\n"
-"Ascii Key (WEP)\n"
-"Hex Key (WEP)"
-msgstr ""
-"128�元通行碼 (WEP)\n"
-"Acii 格�金鑰 (WEP)\n"
-"Hex 格�金鑰 (WEP)"
-
-#: ../gnome/applet/applet.glade.h:5
-msgid ""
-"128-bit passphrase (WEP)\n"
-"Ascii key (WEP)\n"
-"Hex key (WEP)"
-msgstr ""
-"128�元通行碼 (WEP)\n"
-"Acii 格�金鑰 (WEP)\n"
-"Hex 格�金鑰 (WEP)"
-
-#: ../gnome/applet/applet.glade.h:8
-msgid ""
 "<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
 msgstr "<span weight=\"bold\">使用中的連線資訊：</span>"
 
-#: ../gnome/applet/applet.glade.h:10
+#: ../gnome/applet/applet.glade.h:4
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
@@ -444,7 +490,7 @@ msgstr ""
 "\n"
 "需�一個通行碼或是密鑰來存�無線網路‘%s’"
 
-#: ../gnome/applet/applet.glade.h:14
+#: ../gnome/applet/applet.glade.h:8
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
@@ -452,7 +498,7 @@ msgid ""
 "%s  It will not be completely functional."
 msgstr ""
 
-#: ../gnome/applet/applet.glade.h:18
+#: ../gnome/applet/applet.glade.h:12
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
@@ -463,121 +509,234 @@ msgid ""
 "NetworkManager will not require confirmation on subsequent log ins."
 msgstr ""
 
-#: ../gnome/applet/applet.glade.h:21
-msgid "Always Trust this Wireless Network"
-msgstr "總是信任這無線網路"
+#: ../gnome/applet/applet.glade.h:15
+msgid "Anonymous Identity:"
+msgstr ""
 
-#: ../gnome/applet/applet.glade.h:22
+#: ../gnome/applet/applet.glade.h:16
+#, fuzzy
+msgid "Authentication:"
+msgstr "方�"
+
+#: ../gnome/applet/applet.glade.h:17
 msgid "Broadcast Address:"
 msgstr "廣播��："
 
-#: ../gnome/applet/applet.glade.h:23
+#: ../gnome/applet/applet.glade.h:18
+msgid "CA Certificate File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:19
 msgid "C_onnect"
 msgstr "連線(_O)"
 
-#: ../gnome/applet/applet.glade.h:24
-msgid "Connect with encryption enabled"
-msgstr "啟用加密連接"
+#: ../gnome/applet/applet.glade.h:20
+msgid "Client Certificate File:"
+msgstr ""
 
-#: ../gnome/applet/applet.glade.h:25
+#: ../gnome/applet/applet.glade.h:21
 msgid "Connection Information"
 msgstr "連線資訊"
 
-#: ../gnome/applet/applet.glade.h:26
+#: ../gnome/applet/applet.glade.h:22
+msgid "Default Route:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:23
 msgid "Destination Address:"
 msgstr "目的地��："
 
-#: ../gnome/applet/applet.glade.h:27
-msgid "Don't remind me again"
-msgstr "����醒我"
+#: ../gnome/applet/applet.glade.h:24
+msgid "Driver:"
+msgstr ""
 
-#: ../gnome/applet/applet.glade.h:28
+#: ../gnome/applet/applet.glade.h:25
+msgid "EAP Method:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:26
 msgid "Hardware Address:"
 msgstr "硬體��："
 
-#: ../gnome/applet/applet.glade.h:29
+#: ../gnome/applet/applet.glade.h:27
 msgid "IP Address:"
 msgstr "IP ��："
 
-#: ../gnome/applet/applet.glade.h:30
+#: ../gnome/applet/applet.glade.h:28
+msgid "Identity:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:29
 msgid "Interface:"
 msgstr "介�："
 
-#: ../gnome/applet/applet.glade.h:31
+#: ../gnome/applet/applet.glade.h:30
 msgid "Key Type:"
 msgstr "金鑰類型："
 
+#: ../gnome/applet/applet.glade.h:31
+#, fuzzy
+msgid "Key:"
+msgstr "Hex 格�金鑰："
+
 #: ../gnome/applet/applet.glade.h:32
-msgid "Key type:"
-msgstr "金鑰類型："
+msgid ""
+"None\n"
+"WEP 128-bit Passphrase\n"
+"WEP 64/128-bit Hex\n"
+"WEP 64/128-bit ASCII\n"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:37
+msgid ""
+"Open System\n"
+"Shared Key"
+msgstr ""
 
-#: ../gnome/applet/applet.glade.h:33
+#: ../gnome/applet/applet.glade.h:39
 msgid "Other Wireless Network..."
 msgstr "其它無線網路..."
 
-#: ../gnome/applet/applet.glade.h:35
+#: ../gnome/applet/applet.glade.h:40
+msgid "Passphrase:"
+msgstr "通行碼："
+
+#: ../gnome/applet/applet.glade.h:41
+msgid "Password:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:42
+msgid "Primary DNS:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:43
+msgid "Private Key File:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:44
+msgid "Private Key Password:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:45
+msgid "Secondary DNS:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:46
+msgid "Select the CA Certificate File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:47
+msgid "Select the Client Certificate File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:48
+msgid "Select the Private Key File"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:49
+msgid "Show key"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:50
+#, fuzzy
+msgid "Show passphrase"
+msgstr "通行碼："
+
+#: ../gnome/applet/applet.glade.h:51
+msgid "Show password"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:52
+msgid "Show passwords"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:53
+msgid "Speed:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:54
 msgid "Subnet Mask:"
 msgstr "�網路�罩："
 
-#: ../gnome/applet/applet.glade.h:36
+#: ../gnome/applet/applet.glade.h:55
+#, fuzzy
+msgid "Type:"
+msgstr "金鑰類型："
+
+#: ../gnome/applet/applet.glade.h:56
+msgid "User Name:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:57
 msgid "Wireless Network Key Required"
 msgstr "需�無線網路金鑰"
 
-#: ../gnome/applet/applet.glade.h:37
+#: ../gnome/applet/applet.glade.h:58
 msgid "Wireless _adapter:"
 msgstr "無線網絡�(_A)："
 
-#: ../gnome/applet/applet.glade.h:38
-msgid "Wireless _network:"
-msgstr "無線網路(_N)："
+#: ../gnome/applet/applet.glade.h:59
+#, fuzzy
+msgid "_Always Trust this Wireless Network"
+msgstr "總是信任這無線網路"
+
+#: ../gnome/applet/applet.glade.h:60
+#, fuzzy
+msgid "_Don't remind me again"
+msgstr "����醒我"
 
-#: ../gnome/applet/applet.glade.h:39
+#: ../gnome/applet/applet.glade.h:61
 msgid "_Login to Network"
 msgstr "登入網路(_L)"
 
-#: ../gnome/applet/applet.glade.h:40
-msgid "_OK"
-msgstr "確定(_O)"
+#: ../gnome/applet/applet.glade.h:62
+msgid "_Network Name:"
+msgstr ""
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:374
+#: ../gnome/applet/applet.glade.h:63
+#, fuzzy
+msgid "_Wireless Security:"
+msgstr "無線網絡�(_A)："
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:383
 msgid "Cannot add VPN connection"
 msgstr "無法加入 VPN 連線"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:376
+#: ../gnome/vpn-properties/nm-vpn-properties.c:385
 msgid ""
 "No suitable VPN software was found on your system. Contact your system "
 "administrator."
 msgstr ""
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:428
+#: ../gnome/vpn-properties/nm-vpn-properties.c:437
 msgid "Cannot import VPN connection"
 msgstr "無法匯入 VPN 網路連線"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:430
+#: ../gnome/vpn-properties/nm-vpn-properties.c:439
 #, c-format
 msgid ""
 "Cannot find suitable software for VPN connection type '%s' to import the "
 "file '%s'. Contact your system administrator."
 msgstr ""
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:570
+#: ../gnome/vpn-properties/nm-vpn-properties.c:579
 #, c-format
 msgid "Error retrieving VPN connection '%s'"
 msgstr ""
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:573
+#: ../gnome/vpn-properties/nm-vpn-properties.c:582
 #, c-format
 msgid ""
 "Could not find the UI files for VPN connection type '%s'. Contact your "
 "system administrator."
 msgstr ""
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:733
+#: ../gnome/vpn-properties/nm-vpn-properties.c:739
 #, c-format
 msgid "Delete VPN connection \"%s\"?"
 msgstr "刪除 VPN 連線“%s�？"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:736
+#: ../gnome/vpn-properties/nm-vpn-properties.c:742
 #, c-format
 msgid ""
 "All information about the VPN connection \"%s\" will be lost and you may "
@@ -585,11 +744,11 @@ msgid ""
 "connection."
 msgstr ""
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:951
+#: ../gnome/vpn-properties/nm-vpn-properties.c:959
 msgid "Unable to load"
 msgstr "無法載入"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:953
+#: ../gnome/vpn-properties/nm-vpn-properties.c:961
 msgid "Cannot find some needed resources (the glade file)!"
 msgstr "無法找到一些需�的資�（ glade 檔）�"
 
@@ -603,29 +762,27 @@ msgid "Add a new VPN connection"
 msgstr "加入新的 VPN 連線"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:2
+msgid "Choose which type of VPN connection you wish to create."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
 msgid "Connect to:"
 msgstr "連線到："
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
 msgid "Create VPN Connection"
 msgstr "建立 VPN 連線"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
 msgid "Create VPN Connection - 1 of 2"
 msgstr "建立 VPN 連線 - 第一步"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
 msgid "Create VPN Connection - 2 of 2"
 msgstr "建立 VPN 連線 - 第二步"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
-msgid "Delete the selected VPN connection"
-msgstr ""
-
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
-msgid ""
-"Dependent on the private network you want to connect to, you need to select "
-"what type of connection you want to create."
+msgid "Delete the selected VPN connection"
 msgstr ""
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
@@ -637,28 +794,71 @@ msgid "Edit the selected VPN connection"
 msgstr "編輯已�的 VPN 連線"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:10
-msgid "Export VPN connection to a file"
-msgstr "匯出 VPN 連線至檔案"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:11
 msgid "Export the VPN settings to a file"
 msgstr "匯出 VPN 設定至檔案"
 
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:11
+#, fuzzy
+msgid "Export the selected VPN connection to a file"
+msgstr "匯出 VPN 連線至檔案"
+
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:12
-msgid "Finish create VPN Connection"
+#, fuzzy
+msgid "Finish Creating VPN Connection"
 msgstr "建立 VPN 連線完�"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:13
-msgid "Manage Virtual Private Network connections"
+#, fuzzy
+msgid "Manage Virtual Private Network Connections"
 msgstr "管�虛擬�有網路連線"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:14
 msgid ""
-"This assistant will guide you through the creation of a new VPN connection "
-"to a private network.\n"
+"This assistant will guide you through the creation of a connection to a "
+"Virtual Private Network (VPN).\n"
 "\n"
-"It will require some information, such as IP addresses and secrets, that "
-"will probably be provided by your system administrator as appropriate."
+"It will require some information, such as IP addresses and secrets.  Please "
+"see your system administrator to obtain this information."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:17
+msgid "VPN Connections"
+msgstr "VPN 連線"
+
+#: ../src/nm-ap-security-wep.c:52
+msgid "40-bit WEP"
+msgstr ""
+
+#: ../src/nm-ap-security-wep.c:54
+msgid "104-bit WEP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:50
+msgid "WPA TKIP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:52
+msgid "WPA CCMP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:54
+msgid "WPA Automatic"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:59
+msgid "WPA2 TKIP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:61
+msgid "WPA2 CCMP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:63
+msgid "WPA2 Automatic"
+msgstr ""
+
+#: ../src/nm-ap-security.c:320
+msgid "none"
 msgstr ""
 
 #: ../src/nm-netlink-monitor.c:154
@@ -673,31 +873,130 @@ msgid ""
 "unable to bind to netlink socket for monitoring wired ethernet devices - %s"
 msgstr ""
 
-#: ../src/nm-netlink-monitor.c:404
+#: ../src/nm-netlink-monitor.c:405
 msgid "operation took too long"
 msgstr ""
 
-#: ../src/nm-netlink-monitor.c:501
+#: ../src/nm-netlink-monitor.c:502
 msgid "received data from wrong type of sender"
 msgstr ""
 
-#: ../src/nm-netlink-monitor.c:514
+#: ../src/nm-netlink-monitor.c:515
 msgid "received data from unexpected sender"
 msgstr ""
 
-#: ../src/nm-netlink-monitor.c:536
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: ../src/nm-netlink-monitor.c:645
+#: ../src/nm-netlink-monitor.c:646
 msgid "too much data was sent over socket and some of it was lost"
 msgstr ""
 
-#: ../src/nm-netlink-monitor.c:734
+#: ../src/nm-netlink-monitor.c:735
 msgid "error occurred while waiting for data on socket"
 msgstr ""
 
+#: ../gnome/applet/applet-dbus-devices.c:898
+#, fuzzy, c-format
+msgid "You are now connected to the Ad-Hoc wireless network '%s'."
+msgstr "連接到 Ad-Hoc 點�點�無線網路"
+
+#: ../gnome/applet/applet-dbus-devices.c:903
+#, fuzzy, c-format
+msgid "You are now connected to the wireless network '%s'."
+msgstr "連接無線網路‘%s’完�..."
+
+#: ../gnome/applet/applet-dbus-devices.c:910
+#, fuzzy
+msgid "You are now connected to the wired network."
+msgstr "連接有線網路完�..."
+
+#: ../gnome/applet/applet-dbus-devices.c:916
+#, fuzzy
+msgid "Connection Established"
+msgstr "啟用加密連接"
+
+#: ../gnome/applet/applet-dbus-devices.c:959
+#, fuzzy
+msgid "Disconnected"
+msgstr "與 VPN 斷線..."
+
+#: ../gnome/applet/applet-dbus-devices.c:960
+msgid "The network connection has been disconnected."
+msgstr ""
+
+#~ msgid "Failed to get information about the interface!"
+#~ msgstr "無法�得網路介�的訊資�"
+
+#~ msgid "VPN Error"
+#~ msgstr "VPN 錯誤"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">VPN Login Message</span>\n"
+#~ "\n"
+#~ "VPN connection '%s' said:\n"
+#~ "\n"
+#~ "\"%s\""
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">VPN 登入訊�</span>\n"
+#~ "\n"
+#~ "VPN 連線‘%s’說：\n"
+#~ "\n"
+#~ "\"%s\""
+
+#~ msgid "_Stop All Wireless Devices"
+#~ msgstr "�止所有無線網路�置(_S)"
+
+#~ msgid "_Start All Wireless Devices"
+#~ msgstr "開始執行所有無線網路�置(_S)"
+
+#, fuzzy
+#~ msgid "_Wireless Network Discovery"
+#~ msgstr "無線網路 (%s)"
+
+#~ msgid "Always Search"
+#~ msgstr "總是�尋"
+
+#~ msgid "Search Only When Disconnected"
+#~ msgstr "在斷線時��尋"
+
+#~ msgid "Never Search"
+#~ msgstr "永��尋"
+
+#~ msgid "Stop All Wireless Devices"
+#~ msgstr "�止所有無線網路�置"
+
+#, fuzzy
+#~ msgid "ASCII Key:"
+#~ msgstr "Acii 格�金鑰："
+
+#~ msgid ""
+#~ "128-bit Passphrase (WEP)\n"
+#~ "Ascii Key (WEP)\n"
+#~ "Hex Key (WEP)"
+#~ msgstr ""
+#~ "128�元通行碼 (WEP)\n"
+#~ "Acii 格�金鑰 (WEP)\n"
+#~ "Hex 格�金鑰 (WEP)"
+
+#~ msgid ""
+#~ "128-bit passphrase (WEP)\n"
+#~ "Ascii key (WEP)\n"
+#~ "Hex key (WEP)"
+#~ msgstr ""
+#~ "128�元通行碼 (WEP)\n"
+#~ "Acii 格�金鑰 (WEP)\n"
+#~ "Hex 格�金鑰 (WEP)"
+
+#~ msgid "Key type:"
+#~ msgstr "金鑰類型："
+
+#~ msgid "Wireless _network:"
+#~ msgstr "無線網路(_N)："
+
+#~ msgid "_OK"
+#~ msgstr "確定(_O)"
+
+#~ msgid "%s"
+#~ msgstr "%s"
+
 #~ msgid "Modify Wireless Networks"
 #~ msgstr "修改無線網路"
 
@@ -706,3 +1005,23 @@ msgstr ""
 
 #~ msgid "You must log in to access the private network %s"
 #~ msgstr "您需�登入來存��有網路 %s"
+
+#~ msgid "Copyright (C) 2004-2005 Red Hat, Inc."
+#~ msgstr "版權 (C) 2004-2005 Red Hat, Inc."
+
+#~ msgid "Stop automatically running the networking applet?"
+#~ msgstr "�自動�止執行網路 Applet 嗎?"
+
+#~ msgid ""
+#~ "The networking applet will now terminate, but will automatically launch "
+#~ "the next time you login.  Would you like to stop automatically running "
+#~ "the networking applet on login?"
+#~ msgstr ""
+#~ "這個網路 Applet �將��，但在您下次登入時會自動啟動。您��止在登入時自動"
+#~ "執行這個網路 Applet 嗎?"
+
+#~ msgid "_Remove"
+#~ msgstr "移除(_R)"
+
+#~ msgid " (inva"
+#~ msgstr "（無效的統一碼）"
diff --git a/src/Makefile.am b/src/Makefile.am
index 88323fd6e6..685f04160a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -90,9 +90,9 @@ NetworkManager_CPPFLAGS = 							\
 	-DSYSCONFDIR=\"$(sysconfdir)\"					\
 	-DLOCALSTATEDIR=\"$(localstatedir)\"				\
 	-DNM_RUN_DIR=\"$(rundir)\"						\
+	-DGNOMELOCALEDIR=\"$(datadir)/locale\"				\
 	-DARP_DEBUG
 
-
 NetworkManager_LDADD = 							\
 			$(DBUS_LIBS)						\
 			$(GTHREAD_LIBS)					\
diff --git a/src/NetworkManager.c b/src/NetworkManager.c
index 4e0e63ac33..79eb346a85 100644
--- a/src/NetworkManager.c
+++ b/src/NetworkManager.c
@@ -19,6 +19,10 @@
  * (C) Copyright 2004 Red Hat, Inc.
  */
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include <glib.h>
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib-lowlevel.h>
@@ -32,6 +36,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <glib/gi18n.h>
 
 #include "NetworkManager.h"
 #include "nm-utils.h"
@@ -693,14 +698,8 @@ write_pidfile (const char *pidfile)
  */
 static void nm_print_usage (void)
 {
-	fprintf (stderr, "\n" "usage : NetworkManager [--no-daemon] [--pid-file=<file>] [--help]\n");
 	fprintf (stderr,
 		"\n"
-		"        --no-daemon             Don't become a daemon\n"
-		"        --pid-file=<path>       Specify the location of a PID file\n"
-		"        --enable-test-devices   Allow dummy devices to be created via DBUS methods [DEBUG]\n"
-		"        --help                  Show this information and exit\n"
-		"\n"
 		"NetworkManager monitors all network connections and automatically\n"
 		"chooses the best connection to use.  It also allows the user to\n"
 		"specify wireless access points which wireless cards in the computer\n"
@@ -715,8 +714,9 @@ static void nm_print_usage (void)
  */
 int main( int argc, char *argv[] )
 {
-	gboolean		become_daemon = TRUE;
+	gboolean		become_daemon = FALSE;
 	gboolean		enable_test_devices = FALSE;
+	gboolean		show_usage = FALSE;
 	char *		owner;
 	char *		pidfile = NULL;
 	char *		user_pidfile = NULL;
@@ -727,47 +727,33 @@ int main( int argc, char *argv[] )
 		return (EXIT_FAILURE);
 	}
 
+	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+	textdomain (GETTEXT_PACKAGE);
+
 	/* Parse options */
-	while (1)
 	{
-		int c;
-		int option_index = 0;
-		const char *opt;
-
-		static struct option options[] = {
-			{"no-daemon",			0, NULL, 0},
-			{"enable-test-devices",	0, NULL, 0},
-			{"pid-file",			1, NULL, 0},
-			{"help",				0, NULL, 0},
-			{NULL,				0, NULL, 0}
+		GOptionContext  *opt_ctx = NULL;
+		GOptionEntry options[] = {
+			{"no-daemon", 0, 0, G_OPTION_ARG_NONE, &become_daemon, "Don't become a daemon", NULL},
+			{"pid-file", 0, 0, G_OPTION_ARG_STRING, &user_pidfile, "Specify the location of a PID file", NULL},
+			{"enable-test-devices", 0, 0, G_OPTION_ARG_NONE, &enable_test_devices, "Allow dummy devices to be created via DBUS methods [DEBUG]", NULL},
+			{"info", 0, 0, G_OPTION_ARG_NONE, &show_usage, "Show application information", NULL},
+			{NULL}
 		};
+		opt_ctx = g_option_context_new("");
+		g_option_context_add_main_entries(opt_ctx, options, NULL);
+		g_option_context_parse(opt_ctx, &argc, &argv, NULL);
+		g_option_context_free(opt_ctx);
+	}
 
-		c = getopt_long (argc, argv, "", options, &option_index);
-		if (c == -1)
-			break;
-
-		switch (c)
-		{
-			case 0:
-				opt = options[option_index].name;
-				if (strcmp (opt, "help") == 0)
-				{
-					nm_print_usage ();
-					exit (EXIT_SUCCESS);
-				}
-				else if (strcmp (opt, "no-daemon") == 0)
-					become_daemon = FALSE;
-				else if (strcmp (opt, "enable-test-devices") == 0)
-					enable_test_devices = TRUE;
-				else if (strcmp (opt, "pid-file") == 0)
-					user_pidfile = g_strdup (optarg);
-				break;
-
-			default:
-				nm_print_usage ();
-				exit (EXIT_FAILURE);
-				break;
-		}
+	/* Tricky: become_daemon is FALSE by default, so unless it's TRUE because of a CLI
+	 * option, it'll become TRUE after this */
+	become_daemon = !become_daemon;
+	if (show_usage == TRUE)
+	{
+		nm_print_usage();
+		exit (EXIT_SUCCESS);
 	}
 
 	if (become_daemon)
@@ -786,6 +772,13 @@ int main( int argc, char *argv[] )
 		write_pidfile (pidfile);
 	}
 
+	/*
+	 * Set the umask to 0022, which results in 0666 & ~0022 = 0644.
+	 * Otherwise, if root (or an su'ing user) has a wacky umask, we could
+	 * write out an unreadable resolv.conf.
+	 */
+	umask (022);
+
 	g_type_init ();
 	if (!g_thread_supported ())
 		g_thread_init (NULL);
diff --git a/src/NetworkManagerAP.c b/src/NetworkManagerAP.c
index d616cb8f4b..6d3c749c19 100644
--- a/src/NetworkManagerAP.c
+++ b/src/NetworkManagerAP.c
@@ -171,13 +171,20 @@ const GTimeVal *nm_ap_get_timestamp (const NMAccessPoint *ap)
 	return (&ap->timestamp);
 }
 
-void nm_ap_set_timestamp (NMAccessPoint *ap, const GTimeVal *timestamp)
+void nm_ap_set_timestamp (NMAccessPoint *ap, glong sec, glong usec)
 {
 	g_return_if_fail (ap != NULL);
 
-	ap->timestamp = *timestamp;
+	ap->timestamp.tv_sec = sec;
+	ap->timestamp.tv_usec = usec;
 }
 
+void nm_ap_set_timestamp_via_timestamp (NMAccessPoint *ap, const GTimeVal *timestamp)
+{
+	g_return_if_fail (ap != NULL);
+
+	ap->timestamp = *timestamp;
+}
 
 /*
  * Get/set functions for essid
diff --git a/src/NetworkManagerAP.h b/src/NetworkManagerAP.h
index 66f9188fa1..fc376ba3e6 100644
--- a/src/NetworkManagerAP.h
+++ b/src/NetworkManagerAP.h
@@ -37,8 +37,9 @@ NMAccessPoint *	nm_ap_new_from_ap		(NMAccessPoint *ap);
 void				nm_ap_unref			(NMAccessPoint *ap);
 void				nm_ap_ref				(NMAccessPoint *ap);
 
-const GTimeVal *	nm_ap_get_timestamp		(const NMAccessPoint *ap);
-void				nm_ap_set_timestamp		(NMAccessPoint *ap, const GTimeVal *timestamp);
+const GTimeVal *	nm_ap_get_timestamp				(const NMAccessPoint *ap);
+void				nm_ap_set_timestamp				(NMAccessPoint *ap, glong sec, glong usec);
+void				nm_ap_set_timestamp_via_timestamp	(NMAccessPoint *ap, const GTimeVal *timestamp);
 
 const char *		nm_ap_get_essid		(const NMAccessPoint *ap);
 void				nm_ap_set_essid		(NMAccessPoint *ap, const char *essid);
diff --git a/src/NetworkManagerAPList.c b/src/NetworkManagerAPList.c
index 32e5964933..05a45024b1 100644
--- a/src/NetworkManagerAPList.c
+++ b/src/NetworkManagerAPList.c
@@ -437,10 +437,11 @@ NMAccessPoint *nm_ap_list_get_ap_by_address (NMAccessPointList *list, const stru
  */
 gboolean nm_ap_list_merge_scanned_ap (NMDevice80211Wireless *dev, NMAccessPointList *list, NMAccessPoint *merge_ap)
 {
-	NMAccessPoint *	list_ap = NULL;
-	gboolean			strength_changed = FALSE;
-	gboolean			new = FALSE;
-	NMData *			app_data;
+	NMAccessPoint *			list_ap = NULL;
+	gboolean					strength_changed = FALSE;
+	gboolean					new = FALSE;
+	NMData *					app_data;
+	const struct ether_addr *	merge_bssid;
 
 	g_return_val_if_fail (dev != NULL, FALSE);
 	g_return_val_if_fail (list != NULL, FALSE);
@@ -449,18 +450,17 @@ gboolean nm_ap_list_merge_scanned_ap (NMDevice80211Wireless *dev, NMAccessPointL
 	app_data = nm_device_get_app_data (NM_DEVICE (dev));
 	g_return_val_if_fail (app_data != NULL, FALSE);
 
-	if ((list_ap = nm_ap_list_get_ap_by_address (list, nm_ap_get_address (merge_ap))))
+	merge_bssid = nm_ap_get_address (merge_ap);
+	if (nm_ethernet_address_is_valid (merge_bssid) && (list_ap = nm_ap_list_get_ap_by_address (list, merge_bssid)))
 	{
+		/* First, we check for an address match.  If the merge AP has a valid
+		 * BSSID and the same address as a list AP, then the merge AP and
+		 * the list AP must be the same physical AP. The list AP properties must
+		 * be from a previous scan so the time_last_seen's are not equal.  Update
+		 * encryption, authentication method, strength, and the time_last_seen. */
+
 		const char *	devlist_essid = nm_ap_get_essid (list_ap);
 		const char *	merge_essid = nm_ap_get_essid (merge_ap);
-
-		/* First, we check for an address match. If the merge AP has the
-		 * same address as a list AP, the merge AP and the list AP
-		 * must be the same physical AP. The list AP properties must be from
-		 * a previous scan so the time_last_seen's are not equal.
-		 * Update encryption, authentication method,
-		 * strength, and the time_last_seen. */
-
 		const GTimeVal  *merge_ap_seen = nm_ap_get_last_seen (merge_ap);
 
 		/* Did the AP's name change? */
@@ -492,7 +492,6 @@ gboolean nm_ap_list_merge_scanned_ap (NMDevice80211Wireless *dev, NMAccessPointL
 	}
 	else if ((list_ap = nm_ap_list_get_ap_by_essid (list, nm_ap_get_essid (merge_ap))))
 	{
-
 		/* Second, we check for an ESSID match. In this case,
 		 * a list AP has the same non-NULL ESSID as the merge AP. Update the
 		 * encryption and authentication method. Update the strength and address
@@ -573,7 +572,7 @@ void nm_ap_list_copy_properties (NMAccessPointList *dest, NMAccessPointList *sou
 			{
 				nm_ap_set_invalid (dest_ap, nm_ap_get_invalid (src_ap));
 				nm_ap_set_security (dest_ap, nm_ap_get_security (src_ap));
-				nm_ap_set_timestamp (dest_ap, nm_ap_get_timestamp (src_ap));
+				nm_ap_set_timestamp_via_timestamp (dest_ap, nm_ap_get_timestamp (src_ap));
 			}
 		}
 		nm_ap_list_iter_free (iter);
@@ -589,7 +588,10 @@ void nm_ap_list_copy_properties (NMAccessPointList *dest, NMAccessPointList *sou
  * If one is found, copy the essid over to the original access point.
  *
  */
-void nm_ap_list_copy_one_essid_by_address (NMAccessPoint *ap, NMAccessPointList *search_list)
+void nm_ap_list_copy_one_essid_by_address (NMData *app_data,
+								   NMDevice80211Wireless *dev,
+								   NMAccessPoint *ap,
+								   NMAccessPointList *search_list)
 {
 	NMAccessPoint	*found_ap;
 
@@ -599,7 +601,10 @@ void nm_ap_list_copy_one_essid_by_address (NMAccessPoint *ap, NMAccessPointList
 	if (!nm_ap_get_essid (ap) && (found_ap = nm_ap_list_get_ap_by_address (search_list, nm_ap_get_address (ap))))
 	{
 		if (nm_ap_get_essid (found_ap))
+		{
 			nm_ap_set_essid (ap, nm_ap_get_essid (found_ap));
+			nm_dbus_signal_wireless_network_change (app_data->dbus_connection, dev, ap, NETWORK_STATUS_APPEARED, 0);
+		}
 	}
 }
 
@@ -612,7 +617,10 @@ void nm_ap_list_copy_one_essid_by_address (NMAccessPoint *ap, NMAccessPointList
  * its found, copy the source access point's essid to the dest access point.
  *
  */
-void nm_ap_list_copy_essids_by_address (NMAccessPointList *dest, NMAccessPointList *source)
+void nm_ap_list_copy_essids_by_address (NMData *app_data,
+								NMDevice80211Wireless *dev,
+								NMAccessPointList *dest,
+								NMAccessPointList *source)
 {
 	NMAPListIter	*iter;
 	NMAccessPoint	*dest_ap;
@@ -623,7 +631,7 @@ void nm_ap_list_copy_essids_by_address (NMAccessPointList *dest, NMAccessPointLi
 	if ((iter = nm_ap_list_iter_new (dest)))
 	{
 		while ((dest_ap = nm_ap_list_iter_next (iter)))
-			nm_ap_list_copy_one_essid_by_address (dest_ap, source);
+			nm_ap_list_copy_one_essid_by_address (app_data, dev, dest_ap, source);
 
 		nm_ap_list_iter_free (iter);
 	}
diff --git a/src/NetworkManagerAPList.h b/src/NetworkManagerAPList.h
index 144746fee0..d4e83830ba 100644
--- a/src/NetworkManagerAPList.h
+++ b/src/NetworkManagerAPList.h
@@ -48,8 +48,8 @@ NMAccessPoint *	nm_ap_list_get_ap_by_essid		(NMAccessPointList *list, const char
 NMAccessPoint *	nm_ap_list_get_ap_by_address		(NMAccessPointList *list, const struct ether_addr *addr);
 
 void				nm_ap_list_copy_properties		(NMAccessPointList *dest, NMAccessPointList *source);
-void				nm_ap_list_copy_essids_by_address	(NMAccessPointList *dest, NMAccessPointList *source);
-void				nm_ap_list_copy_one_essid_by_address	(NMAccessPoint *ap, NMAccessPointList *search_list);
+void				nm_ap_list_copy_essids_by_address	(NMData *app_data, NMDevice80211Wireless *dev, NMAccessPointList *dest, NMAccessPointList *source);
+void				nm_ap_list_copy_one_essid_by_address	(NMData *app_data, NMDevice80211Wireless *dev, NMAccessPoint *ap, NMAccessPointList *search_list);
 
 gboolean			nm_ap_list_merge_scanned_ap		(NMDevice80211Wireless *dev, NMAccessPointList *list, NMAccessPoint *merge_ap);
 
diff --git a/src/NetworkManagerDbus.c b/src/NetworkManagerDbus.c
index 67b711b81b..a550fa2894 100644
--- a/src/NetworkManagerDbus.c
+++ b/src/NetworkManagerDbus.c
@@ -119,52 +119,50 @@ char * nm_dbus_get_object_path_for_network (NMDevice *dev, NMAccessPoint *ap)
 
 
 /*
- * nm_dbus_get_device_from_object_path
+ * nm_dbus_get_device_from_escaped_object_path
  *
- * Returns the device associated with a dbus object path
+ * Returns the device associated with an _escaped_ dbus object path
  *
  */
-NMDevice *nm_dbus_get_device_from_object_path (NMData *data, const char *path)
+NMDevice *nm_dbus_get_device_from_escaped_object_path (NMData *data, const char *path)
 {
-	NMDevice	*dev = NULL;
+	NMDevice *dev = NULL;
+	GSList *	elt;
 
 	g_return_val_if_fail (path != NULL, NULL);
 	g_return_val_if_fail (data != NULL, NULL);
 
-	/* FIXME
-	 * This function could be much more efficient, for example we could
-	 * actually _parse_ the object path, but that's a lot more code and
-	 * stupid stuff.  The approach below is slower, less efficient, but
-	 * less code and less error-prone.
-	 */
+	if (!nm_try_acquire_mutex (data->dev_list_mutex, __FUNCTION__))
+		return NULL;
 
-	/* Iterate over device list */
-	if (nm_try_acquire_mutex (data->dev_list_mutex, __FUNCTION__))
+	/* Iterate over the device list looking for the device with the matching object path. */
+	for (elt = data->dev_list; elt; elt = g_slist_next (elt))
 	{
-		GSList	*elt;
-		char		 compare_path[100];
-		char    *escaped_compare_path;
+		char *compare_path;
+		char *escaped_compare_path;
+		int len;
+
+		if (!(dev = (NMDevice *)(elt->data)))
+			continue;
+
+		compare_path = g_strdup_printf ("%s/%s", NM_DBUS_PATH_DEVICES, nm_device_get_iface (dev));
+		escaped_compare_path = nm_dbus_escape_object_path (compare_path);
+		g_free (compare_path);
+		len = strlen (escaped_compare_path);
 
-		for (elt = data->dev_list; elt; elt = g_slist_next (elt))
+		/* Compare against our constructed path, but ignore any trailing elements */
+		if (    (strncmp (path, escaped_compare_path, len) == 0)
+			&& ((path[len] == '\0' || path[len] == '/')))
 		{
-			if ((dev = (NMDevice *)(elt->data)))
-			{
-				snprintf (compare_path, 100, "%s/%s", NM_DBUS_PATH_DEVICES, nm_device_get_iface (dev));
-				escaped_compare_path = nm_dbus_escape_object_path (compare_path);
-				/* Compare against our constructed path, but ignore any trailing elements */
-				if (strncmp (path, compare_path, strlen (escaped_compare_path)) == 0)
-				{
-					g_free (escaped_compare_path);
-					break;
-				}
-				g_free (escaped_compare_path);
-				dev = NULL;
-			}
+			g_free (escaped_compare_path);
+			break;
 		}
-		nm_unlock_mutex (data->dev_list_mutex, __FUNCTION__);
+		g_free (escaped_compare_path);
+		dev = NULL;
 	}
+	nm_unlock_mutex (data->dev_list_mutex, __FUNCTION__);
 
-	return (dev);
+	return dev;
 }
 
 
@@ -287,11 +285,9 @@ void nm_dbus_schedule_device_status_change_signal (NMData *data, NMDevice *dev,
 
 
 /*
- * nm_dbus_network_status_from_data
- *
- * Return a network status string based on our network data
+ * nm_get_app_state_from_data
  *
- * Caller MUST free returned value
+ * Return the state of the network connection
  *
  */
 NMState nm_get_app_state_from_data (NMData *data)
@@ -304,7 +300,7 @@ NMState nm_get_app_state_from_data (NMData *data)
 		return NM_STATE_ASLEEP;
 
 	act_dev = nm_get_active_device (data);
-	if (!act_dev)
+	if (!act_dev && !data->modem_active)
 		return NM_STATE_DISCONNECTED;
 
 	if (nm_device_is_activating (act_dev))
@@ -619,7 +615,7 @@ static DBusHandlerResult nm_dbus_devices_message_handler (DBusConnection *connec
 
 	path = dbus_message_get_path (message);
 
-	if (!(dev = nm_dbus_get_device_from_object_path (data, path)))
+	if (!(dev = nm_dbus_get_device_from_escaped_object_path (data, path)))
 		reply = nm_dbus_create_error_message (message, NM_DBUS_INTERFACE, "DeviceNotFound", "The requested network device does not exist.");
 	else
 	{
diff --git a/src/NetworkManagerDbus.h b/src/NetworkManagerDbus.h
index 6fab558ec2..8646b66cb6 100644
--- a/src/NetworkManagerDbus.h
+++ b/src/NetworkManagerDbus.h
@@ -69,7 +69,7 @@ void			nm_dbus_signal_state_change			(DBusConnection *connection, NMData *data);
 void			nm_dbus_signal_wireless_network_change	(DBusConnection *connection, NMDevice80211Wireless *dev, NMAccessPoint *ap, NMNetworkStatus status, gint strength);
 void			nm_dbus_signal_device_strength_change	(DBusConnection *connection, NMDevice80211Wireless *dev, gint strength);
 
-NMDevice *	nm_dbus_get_device_from_object_path	(NMData *data, const char *path);
+NMDevice *	nm_dbus_get_device_from_escaped_object_path	(NMData *data, const char *path);
 
 NMState		nm_get_app_state_from_data			(NMData *data);
 
diff --git a/src/NetworkManagerMain.h b/src/NetworkManagerMain.h
index c4cf9a1b29..24b703a241 100644
--- a/src/NetworkManagerMain.h
+++ b/src/NetworkManagerMain.h
@@ -83,6 +83,7 @@ typedef struct NMData
 	GMutex *				dev_list_mutex;
 
 	gboolean				wireless_enabled;
+	gboolean				modem_active;
 	gboolean				asleep;
 
 	GSList *				dialup_list;
diff --git a/src/NetworkManagerPolicy.c b/src/NetworkManagerPolicy.c
index fda29a6efc..37bfdf472f 100644
--- a/src/NetworkManagerPolicy.c
+++ b/src/NetworkManagerPolicy.c
@@ -327,7 +327,7 @@ nm_policy_device_change_check (NMData *data)
 	 * 1) old device is NULL, new device is NULL - we aren't currently connected to anything, and we
 	 *		can't find anything to connect to.  Do nothing.
 	 *
-	 * 2) old device is NULL, new device is good - we aren't currenlty connected to anything, but
+	 * 2) old device is NULL, new device is good - we aren't currently connected to anything, but
 	 *		we have something we can connect to.  Connect to it.
 	 *
 	 * 3) old device is good, new device is NULL - have a current connection, but it's no good since
@@ -384,14 +384,24 @@ nm_policy_device_change_check (NMData *data)
 				const char *	old_essid = nm_ap_get_essid (old_ap);
 				int			old_mode = nm_ap_get_mode (old_ap);
 				const char *	new_essid = nm_ap_get_essid (ap);
+				gboolean		same_request = FALSE;
 
 				/* Schedule new activation if the currently associated
 				 * access point is not the "best" one or we've lost the
 				 * link to the old access point.  We don't switch away
 				 * from Ad-Hoc APs either.
 				 */
-				gboolean same_essid = (strcmp (old_essid, new_essid) == 0);
-				if ((!same_essid || !old_has_link) && (old_mode != IW_MODE_ADHOC))
+				gboolean same_essid = (nm_null_safe_strcmp (old_essid, new_essid) == 0);
+
+				/* If the "best" AP's essid is the same as the current activation
+				 * request's essid, but the current activation request isn't
+				 * done yet, don't switch.  This prevents multiple requests for the
+				 * AP's password on startup.
+				 */
+				if ((old_dev == new_dev) && nm_device_is_activating (new_dev) && same_essid)
+					same_request = TRUE;
+
+				if (!same_request && (!same_essid || !old_has_link) && (old_mode != IW_MODE_ADHOC))
 				{
 					nm_info ("SWITCH: found better connection '%s/%s'"
 					         " than current connection '%s/%s'.  "
@@ -608,7 +618,7 @@ static gboolean nm_policy_device_list_update_from_allowed_list (NMData *data)
 				 * in the ESSID of base stations that aren't broadcasting their ESSID, if we have their
 				 * MAC address in our allowed list.
 				 */
-				nm_ap_list_copy_essids_by_address (nm_device_802_11_wireless_ap_list_get (wdev), data->allowed_ap_list);
+				nm_ap_list_copy_essids_by_address (data, wdev, nm_device_802_11_wireless_ap_list_get (wdev), data->allowed_ap_list);
 				nm_ap_list_copy_properties (nm_device_802_11_wireless_ap_list_get (wdev), data->allowed_ap_list);
 			}
 			else
diff --git a/src/NetworkManagerSystem.c b/src/NetworkManagerSystem.c
index fc93a9d22f..e27fa617dd 100644
--- a/src/NetworkManagerSystem.c
+++ b/src/NetworkManagerSystem.c
@@ -52,8 +52,119 @@
 #include <netlink/route/link.h>
 
 
-static gboolean nm_system_device_set_ip4_route					(NMDevice *dev, int ip4_gateway, int ip4_dest, int ip4_netmask);
-static gboolean nm_system_device_set_ip4_route_with_iface			(NMDevice *dev, const char *iface, int ip4_gateway, int ip4_dest, int ip4_netmask);
+/*
+ * nm_system_device_set_ip4_route
+ *
+ */
+static gboolean nm_system_device_set_ip4_route (NMDevice *dev, int ip4_gateway, int ip4_dest, int ip4_netmask, int mss)
+{
+	NMSock *			sk;
+	gboolean			success = FALSE;
+	struct rtentry		rtent;
+	struct sockaddr_in *p;
+	const char *		iface;
+	int				err;
+
+	iface = nm_device_get_iface (dev);
+
+	/*
+	 * Zero is not a legal gateway and the ioctl will fail.  But zero is a
+	 * way of saying "no route" so we just return here.  Hopefully the
+	 * caller flushed the routes, first.
+	 */
+	if (ip4_gateway == 0)
+		return TRUE;
+
+	if ((sk = nm_dev_sock_open (dev, NETWORK_CONTROL, __FUNCTION__, NULL)) == NULL)
+		return FALSE;
+
+	memset (&rtent, 0, sizeof (struct rtentry));
+	p				= (struct sockaddr_in *) &rtent.rt_dst;
+	p->sin_family		= AF_INET;
+	p->sin_addr.s_addr	= ip4_dest;
+	p				= (struct sockaddr_in *) &rtent.rt_gateway;
+	p->sin_family		= AF_INET;
+	p->sin_addr.s_addr	= ip4_gateway;
+	p				= (struct sockaddr_in *) &rtent.rt_genmask;
+	p->sin_family		= AF_INET;
+	p->sin_addr.s_addr	= ip4_netmask;
+	rtent.rt_dev		= (char *)iface;
+	rtent.rt_metric	= 1;
+	rtent.rt_window	= 0;
+	rtent.rt_flags		= RTF_UP | RTF_GATEWAY | (rtent.rt_window ? RTF_WINDOW : 0);
+
+	if (mss)
+	{
+		rtent.rt_flags |= RTF_MTU;
+		rtent.rt_mtu = mss;
+	}
+
+#ifdef IOCTL_DEBUG
+	nm_info ("%s: About to CADDRT\n", nm_device_get_iface (dev));
+#endif
+	err = ioctl (nm_dev_sock_get_fd (sk), SIOCADDRT, &rtent);
+#ifdef IOCTL_DEBUG
+	nm_info ("%s: About to CADDRT\n", nm_device_get_iface (dev));
+#endif
+
+	if (err == -1)
+	{
+		if (errno == ENETUNREACH)	/* possibly gateway is over the bridge */
+		{						/* try adding a route to gateway first */
+			struct rtentry	rtent2;
+			
+			memset (&rtent2, 0, sizeof(struct rtentry));
+			p				= (struct sockaddr_in *)&rtent2.rt_dst;
+			p->sin_family		= AF_INET;
+			p				= (struct sockaddr_in *)&rtent2.rt_gateway;
+			p->sin_family		= AF_INET;
+			p->sin_addr.s_addr	= ip4_gateway;
+			p				= (struct sockaddr_in *)&rtent2.rt_genmask;
+			p->sin_family		= AF_INET;
+			p->sin_addr.s_addr	= 0xffffffff;
+			rtent2.rt_dev		= (char *)iface;
+			rtent2.rt_metric	= 0;
+			rtent2.rt_flags	= RTF_UP | RTF_HOST;
+
+			if (mss)
+			{
+				rtent2.rt_flags |= RTF_MTU;
+				rtent2.rt_mtu = mss;
+			}
+
+#ifdef IOCTL_DEBUG
+			nm_info ("%s: About to CADDRT (2)\n", nm_device_get_iface (dev));
+#endif
+			err = ioctl (nm_dev_sock_get_fd (sk), SIOCADDRT, &rtent2);
+#ifdef IOCTL_DEBUG
+			nm_info ("%s: About to CADDRT (2)\n", nm_device_get_iface (dev));
+#endif
+
+			if (!err)
+			{
+#ifdef IOCTL_DEBUG
+				nm_info ("%s: About to CADDRT (3)\n", nm_device_get_iface (dev));
+#endif
+				err = ioctl (nm_dev_sock_get_fd (sk), SIOCADDRT, &rtent);
+#ifdef IOCTL_DEBUG
+				nm_info ("%s: About to CADDRT (3)\n", nm_device_get_iface (dev));
+#endif
+
+				if (!err)
+					success = TRUE;
+				else
+					nm_warning ("Failed to set IPv4 default route on '%s': %s", iface, strerror (errno));
+			}
+		}
+		else
+			nm_warning ("Failed to set IPv4 default route on '%s': %s", iface, strerror (errno));
+	}
+	else
+		success = TRUE;
+
+	nm_dev_sock_close (sk);
+	return success;
+}
 
 
 static struct nl_cache * get_link_cache (struct nl_handle *nlh)
@@ -73,6 +184,7 @@ static struct nl_cache * get_link_cache (struct nl_handle *nlh)
 	return link_cache;
 }
 
+
 static void iface_to_rtnl_index (const char *iface, struct nl_handle *nlh, struct rtnl_addr *addr)
 {
 	struct nl_cache *	cache = NULL;
@@ -170,7 +282,7 @@ gboolean nm_system_device_set_from_ip4_config (NMDevice *dev)
 	nl_handle_destroy (nlh);
 
 	sleep (1);
-	nm_system_device_set_ip4_route (dev, nm_ip4_config_get_gateway (config), 0, 0);
+	nm_system_device_set_ip4_route (dev, nm_ip4_config_get_gateway (config), 0, 0, nm_ip4_config_get_mss (config));
 
 	nm_named_manager_add_ip4_config (app_data->named_manager, config);
 
@@ -271,7 +383,7 @@ gboolean nm_system_vpn_device_set_from_ip4_config (NMNamedManager *named, NMDevi
 
 	/* Set up a route to the VPN gateway through the real network device */
 	if (active_device && (ad_config = nm_device_get_ip4_config (active_device)))
-		nm_system_device_set_ip4_route (active_device, nm_ip4_config_get_gateway (ad_config), nm_ip4_config_get_gateway (config), 0xFFFFFFFF);
+		nm_system_device_set_ip4_route (active_device, nm_ip4_config_get_gateway (ad_config), nm_ip4_config_get_gateway (config), 0xFFFFFFFF, nm_ip4_config_get_mss (config));
 
 	if (iface != NULL && strlen (iface))
 	{
@@ -413,111 +525,43 @@ out:
 
 
 /*
- * nm_system_device_set_ip4_route
- *
- * Set the IPv4 broadcast address on a device.
+ * nm_system_set_mtu
  *
+ * Set the MTU for a given device.
  */
-static gboolean nm_system_device_set_ip4_route (NMDevice *dev, int ip4_gateway, int ip4_dest, int ip4_netmask)
-{
-	g_return_val_if_fail (dev != NULL, FALSE);
-
-	return nm_system_device_set_ip4_route_with_iface (dev, nm_device_get_iface (dev), ip4_gateway, ip4_dest, ip4_netmask);
-}
-
-static gboolean nm_system_device_set_ip4_route_with_iface (NMDevice *dev, const char *iface, int ip4_gateway, int ip4_dest, int ip4_netmask)
+void nm_system_set_mtu (NMDevice *dev)
 {
-	NMSock *			sk;
-	gboolean			success = FALSE;
-	struct rtentry		rtent;
-	struct sockaddr_in *p;
-	int				err;
-
-	g_return_val_if_fail (iface != NULL, FALSE);
-
-	/*
-	 * Zero is not a legal gateway and the ioctl will fail.  But zero is a
-	 * way of saying "no route" so we just return here.  Hopefully the
-	 * caller flushed the routes, first.
-	 */
-	if (ip4_gateway == 0)
-		return TRUE;
-
-	if ((sk = nm_dev_sock_open (dev, NETWORK_CONTROL, __FUNCTION__, NULL)) == NULL)
-		return FALSE;
-
-	memset (&rtent, 0, sizeof (struct rtentry));
-	p				= (struct sockaddr_in *)&rtent.rt_dst;
-	p->sin_family		= AF_INET;
-	p->sin_addr.s_addr	= ip4_dest;
-	p				= (struct sockaddr_in *)&rtent.rt_gateway;
-	p->sin_family		= AF_INET;
-	p->sin_addr.s_addr	= ip4_gateway;
-	p				= (struct sockaddr_in *)&rtent.rt_genmask;
-	p->sin_family		= AF_INET;
-	p->sin_addr.s_addr	= ip4_netmask;
-	rtent.rt_dev		= (char *)iface;
-	rtent.rt_metric	= 1;
-	rtent.rt_window	= 0;
-	rtent.rt_flags		= RTF_UP | RTF_GATEWAY | (rtent.rt_window ? RTF_WINDOW : 0);
+	struct rtnl_link *	request;
+	struct rtnl_link *	old;
+	unsigned long		mtu;
+	struct nl_handle *	nlh;
+	const char *		iface;
 
-#ifdef IOCTL_DEBUG
-	nm_info ("%s: About to CADDRT\n", nm_device_get_iface (dev));
-#endif
-	err = ioctl (nm_dev_sock_get_fd (sk), SIOCADDRT, &rtent);
-#ifdef IOCTL_DEBUG
-	nm_info ("%s: About to CADDRT\n", nm_device_get_iface (dev));
-#endif
+	mtu = nm_system_get_mtu (dev);
+	if (!mtu)
+		return;
 
-	if (err == -1)
-	{
-		if (errno == ENETUNREACH)	/* possibly gateway is over the bridge */
-		{						/* try adding a route to gateway first */
-			struct rtentry	rtent2;
-			
-			memset (&rtent2, 0, sizeof(struct rtentry));
-			p				= (struct sockaddr_in *)&rtent2.rt_dst;
-			p->sin_family		= AF_INET;
-			p				= (struct sockaddr_in *)&rtent2.rt_gateway;
-			p->sin_family		= AF_INET;
-			p->sin_addr.s_addr	= ip4_gateway;
-			p				= (struct sockaddr_in *)&rtent2.rt_genmask;
-			p->sin_family		= AF_INET;
-			p->sin_addr.s_addr	= 0xffffffff;
-			rtent2.rt_dev		= (char *)iface;
-			rtent2.rt_metric	= 0;
-			rtent2.rt_flags	= RTF_UP | RTF_HOST;
+	nlh = new_nl_handle ();
+	if (!nlh)
+		return;
 
-#ifdef IOCTL_DEBUG
-			nm_info ("%s: About to CADDRT (2)\n", nm_device_get_iface (dev));
-#endif
-			err = ioctl (nm_dev_sock_get_fd (sk), SIOCADDRT, &rtent2);
-#ifdef IOCTL_DEBUG
-			nm_info ("%s: About to CADDRT (2)\n", nm_device_get_iface (dev));
-#endif
+	request = rtnl_link_alloc ();
+	if (!request)
+		goto out_nl_close;
 
-			if (err == 0)
-			{
-#ifdef IOCTL_DEBUG
-				nm_info ("%s: About to CADDRT (3)\n", nm_device_get_iface (dev));
-#endif
-				err = ioctl (nm_dev_sock_get_fd (sk), SIOCADDRT, &rtent);
-#ifdef IOCTL_DEBUG
-				nm_info ("%s: About to CADDRT (3)\n", nm_device_get_iface (dev));
-#endif
+	iface = nm_device_get_iface (dev);
+	old = iface_to_rtnl_link (iface, nlh);
+	if (!old)
+		goto out_request;
 
-				if (err == 0)
-					success = TRUE;
-				else
-					nm_warning ("nm_system_device_set_ip4_route_with_iface (%s): failed to set IPv4 default route! error = %s", iface, strerror (errno));
-			}
-		}
-		else
-			nm_warning ("nm_system_device_set_ip4_route_with_iface (%s): failed to set IPv4 default route! error = %s", iface, strerror (errno));
-	}
-	else
-		success = TRUE;
+	nm_info ("Setting MTU of interface '%s' to %ld", iface, mtu);
+	rtnl_link_set_mtu (request, mtu);
+	rtnl_link_change (nlh, old, request, 0);
 
-	nm_dev_sock_close (sk);
-	return (success);
+	rtnl_link_put (old);
+out_request:
+	rtnl_link_put (request);
+out_nl_close:
+	nl_close (nlh);
+	nl_handle_destroy (nlh);
 }
diff --git a/src/NetworkManagerSystem.h b/src/NetworkManagerSystem.h
index e6f3f80ddd..c26f49eb5d 100644
--- a/src/NetworkManagerSystem.h
+++ b/src/NetworkManagerSystem.h
@@ -27,6 +27,7 @@
 #include "nm-ip4-config.h"
 #include "nm-named-manager.h"
 
+struct NMData;
 
 /* Prototypes for system/distribution dependent functions,
  * implemented in the backend files in backends/ directory
@@ -55,7 +56,7 @@ void			nm_system_update_dns					(void);
 void			nm_system_restart_mdns_responder			(void);
 void			nm_system_device_add_ip6_link_address 		(NMDevice *dev);
 
-void *		nm_system_device_get_system_config			(NMDevice *dev);
+void *		nm_system_device_get_system_config			(NMDevice *dev, struct NMData *data);
 void			nm_system_device_free_system_config		(NMDevice *dev, void *system_config_data);
 NMIP4Config *	nm_system_device_new_ip4_system_config		(NMDevice *dev);
 
@@ -81,6 +82,9 @@ void			nm_system_set_hostname (NMIP4Config *config);
 void			nm_system_activate_nis (NMIP4Config *config);
 void			nm_system_shutdown_nis (void);
 
+void			nm_system_set_mtu (NMDevice *dev);
+guint32		nm_system_get_mtu (NMDevice *dev);
+
 gboolean		nm_system_should_modify_resolv_conf (void);
 
 #endif
diff --git a/src/NetworkManagerUtils.c b/src/NetworkManagerUtils.c
index 55860dfd15..14bd9e18d4 100644
--- a/src/NetworkManagerUtils.c
+++ b/src/NetworkManagerUtils.c
@@ -333,7 +333,7 @@ int nm_null_safe_strcmp (const char *s1, const char *s2)
 /*
  * nm_ethernet_address_is_valid
  *
- * Compares an ethernet address against known invalid addresses.
+ * Compares an Ethernet address against known invalid addresses.
  *
  */
 gboolean nm_ethernet_address_is_valid (const struct ether_addr *test_addr)
@@ -359,6 +359,19 @@ gboolean nm_ethernet_address_is_valid (const struct ether_addr *test_addr)
 
 
 /*
+ * nm_ethernet_addresses_are_equal
+ *
+ * Compare two Ethernet addresses and return TRUE if equal and FALSE if not.
+ */
+gboolean nm_ethernet_addresses_are_equal (const struct ether_addr *a, const struct ether_addr *b)
+{
+	if (memcmp (a, b, sizeof (struct ether_addr)))
+		return FALSE;
+	return TRUE;
+}
+
+
+/*
  * nm_spawn_process
  *
  * Wrap g_spawn_sync in a usable manner
diff --git a/src/NetworkManagerUtils.h b/src/NetworkManagerUtils.h
index be93804388..acf2eea4ac 100644
--- a/src/NetworkManagerUtils.h
+++ b/src/NetworkManagerUtils.h
@@ -57,6 +57,7 @@ void			nm_print_open_socks				(void);
 int			nm_null_safe_strcmp				(const char *s1, const char *s2);
 
 gboolean		nm_ethernet_address_is_valid		(const struct ether_addr *test_addr);
+gboolean		nm_ethernet_addresses_are_equal	(const struct ether_addr *a, const struct ether_addr *b);
 
 int			nm_spawn_process				(const char *args);
 
diff --git a/src/backends/Makefile.am b/src/backends/Makefile.am
index 3e1ad3b038..da5de20595 100644
--- a/src/backends/Makefile.am
+++ b/src/backends/Makefile.am
@@ -1,9 +1,10 @@
-INCLUDES = -I${top_srcdir}                       \
-           -I${top_srcdir}/include               \
-           -I${top_srcdir}/utils                 \
-           -I${top_srcdir}/src                   \
-           -I${top_srcdir}/src/vpn-manager       \
-           -I${top_srcdir}/src/named-manager
+INCLUDES = -I${top_srcdir}				\
+		 -I${top_srcdir}/include			\
+		 -I${top_srcdir}/utils			\
+		 -I${top_srcdir}/src			\
+		 -I${top_srcdir}/src/vpn-manager	\
+		 -I${top_srcdir}/src/named-manager	\
+		 -I${top_srcdir}/libnm-util
 
 noinst_LTLIBRARIES = libnmbackend.la
 
@@ -37,6 +38,10 @@ if TARGET_SLACKWARE
 libnmbackend_la_SOURCES +=	NetworkManagerSlackware.c
 endif
 
+if TARGET_ARCH
+libnmbackend_la_SOURCES +=	NetworkManagerArch.c
+endif
+
 libnmbackend_la_LIBADD = $(DBUS_LIBS) $(GTHREAD_LIBS)
 libnmbackend_la_CPPFLAGS =	$(DBUS_CFLAGS)				\
 					$(GTHREAD_CFLAGS)				\
diff --git a/src/backends/NetworkManagerArch.c b/src/backends/NetworkManagerArch.c
new file mode 100644
index 0000000000..c6cb52d6f0
--- /dev/null
+++ b/src/backends/NetworkManagerArch.c
@@ -0,0 +1,954 @@
+/* NetworkManager -- Network link manager
+ *
+ * Backend implementation for the Arch Linux distribution http://www.archlinux.org
+ * 
+ * Tor Krill <tor@krill.nu> and Will Rea <sillywilly@gmail.com>
+ *
+ * Updated by Wael Nasreddine <gandalf@siemens-mobiles.org>
+ * 
+ * Heavily based on NetworkManagerDebian.c by Matthew Garrett <mjg59@srcf.ucam.org>
+ *
+ * Heavily based on NetworkManagerRedhat.c by Dan Williams <dcbw@redhat.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * (C) Copyright 2004 Tom Parker
+ * (C) Copyright 2004 Matthew Garrett
+ * (C) Copyright 2004 Red Hat, Inc.
+ */
+
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <signal.h>
+#include <arpa/inet.h>
+#include <glib/gprintf.h>
+#include "NetworkManagerSystem.h"
+#include "NetworkManagerUtils.h"
+#include "nm-device.h"
+#include "nm-device-802-3-ethernet.h"
+#include "nm-device-802-11-wireless.h"
+#include "NetworkManagerDialup.h"
+#include "interface_parser.h"
+#include "nm-utils.h"
+
+#define ARPING "/usr/sbin/arping"
+
+/*
+ * nm_system_init
+ *
+ * Initializes the distribution-specific system backend
+ *
+ */
+void nm_system_init (void)
+{
+}
+
+/*
+ * nm_system_device_add_default_route_via_device
+ *
+ * Add default route to the given device
+ *
+ */
+void nm_system_device_add_default_route_via_device (NMDevice *dev)
+{
+	g_return_if_fail (dev != NULL);
+
+	/* Not really applicable for test devices */
+	if (nm_device_is_test_device (dev))
+		return;
+
+	nm_system_device_add_default_route_via_device_with_iface (nm_device_get_iface (dev));
+}
+
+
+/*
+ * nm_system_device_add_default_route_via_device_with_iface
+ *
+ * Add default route to the given device
+ *
+ */
+void nm_system_device_add_default_route_via_device_with_iface (const char *iface)
+{
+	char	*buf;
+
+	g_return_if_fail (iface != NULL);
+
+	/* Add default gateway */
+	buf = g_strdup_printf ("/usr/sbin/ip route add default dev %s", iface);
+	nm_spawn_process (buf);
+	g_free (buf);
+}
+
+/*
+ * nm_system_device_add_route_via_device_with_iface
+ *
+ * Add route to the given device
+ *
+ */
+void nm_system_device_add_route_via_device_with_iface (const char *iface, const char *route)
+{
+	char	*buf;
+
+	g_return_if_fail (iface != NULL);
+
+	/* Add default gateway */
+	buf = g_strdup_printf ("/usr/sbin/ip route add %s dev %s", route, iface);
+	nm_spawn_process (buf);
+	g_free (buf);
+}
+
+
+/*
+ * nm_system_device_flush_addresses
+ *
+ * Flush all network addresses associated with a network device
+ *
+ */
+void nm_system_device_flush_routes (NMDevice *dev)
+{
+
+	g_return_if_fail (dev != NULL);
+
+	/* Not really applicable for test devices */
+	if (nm_device_is_test_device (dev))
+		return;
+
+	nm_system_device_flush_routes_with_iface (nm_device_get_iface (dev));
+}
+
+/*
+ * nm_system_device_flush_routes_with_iface
+ *
+ * Flush all routes associated with a network device
+ *
+ */
+void nm_system_device_flush_routes_with_iface (const char *iface)
+{
+	char	*buf;
+
+	g_return_if_fail (iface != NULL);
+
+	/* Remove routing table entries */
+	buf = g_strdup_printf ("/usr/sbin/ip route flush dev %s", iface);
+	nm_spawn_process (buf);
+	g_free (buf);
+}
+
+/*
+ * nm_system_device_flush_addresses
+ *
+ * Flush all network addresses associated with a network device
+ *
+ */
+void nm_system_device_flush_addresses (NMDevice *dev)
+{
+	g_return_if_fail (dev != NULL);
+
+	/* Not really applicable for test devices */
+	if (nm_device_is_test_device (dev))
+		return;
+
+	nm_system_device_flush_addresses_with_iface (nm_device_get_iface (dev));
+}
+
+
+/*
+ * nm_system_device_flush_addresses_with_iface
+ *
+ * Flush all network addresses associated with a network device
+ *
+ */
+void nm_system_device_flush_addresses_with_iface (const char *iface)
+{
+	char	*buf;
+
+	g_return_if_fail (iface != NULL);
+
+	/* Remove all IP addresses for a device */
+	buf = g_strdup_printf ("/usr/sbin/ip addr flush dev %s", iface);
+	nm_spawn_process (buf);
+	g_free (buf);
+}
+
+/*
+ * nm_system_device_setup_static_ip4_config
+ *
+ * Set up the device with a particular IPv4 address/netmask/gateway.
+ *
+ * Returns:	TRUE	on success
+ *			FALSE on error
+ *
+ */
+#if 0
+gboolean nm_system_device_setup_static_ip4_config (NMDevice *dev)
+{
+#define IPBITS (sizeof (guint32) * 8)
+	struct in_addr  temp_addr;
+	struct in_addr  temp_addr2;
+	char            *s_tmp;
+	char            *s_tmp2;
+	int             i;
+	guint32         addr;
+	guint32         netmask;
+	guint32         prefix = IPBITS;	 /* initialize with # bits in ipv4 address */
+	guint32         broadcast;
+	char            *buf;
+	int             err;
+	const char            *iface;
+
+	g_return_val_if_fail (dev != NULL, FALSE);
+	g_return_val_if_fail (!nm_device_config_get_use_dhcp (dev), FALSE);
+
+	addr = nm_device_config_get_ip4_address (dev);
+	netmask = nm_device_config_get_ip4_netmask (dev);
+	iface = nm_device_get_iface (dev);
+	broadcast = nm_device_config_get_ip4_broadcast (dev);
+
+	/* get the prefix from the netmask */
+	for (i = 0; i < IPBITS; i++)
+	{
+		if (!(ntohl (netmask) & ((2 << i) - 1)))
+			prefix--;
+	}
+
+	/* Calculate the broadcast address if the user didn't specify one */
+	if (!broadcast)
+		broadcast = ((addr & (int)netmask) | ~(int)netmask);
+
+	/* 
+	 * Try and work out if someone else has our IP
+	 * using RFC 2131 Duplicate Address Detection
+	 */
+	temp_addr.s_addr = addr;
+	buf = g_strdup_printf ("%s -q -D -c 1 -I %s %s",ARPING, 
+					   iface, inet_ntoa (temp_addr));
+	if ((err = nm_spawn_process (buf)))
+	{
+		nm_warning ("Error: Duplicate address '%s' detected for " 
+				  "device '%s' \n", iface, inet_ntoa (temp_addr));
+		goto error;
+	}
+	g_free (buf);
+
+	/* set our IP address */
+	temp_addr.s_addr = addr;
+	temp_addr2.s_addr = broadcast;
+	s_tmp = g_strdup (inet_ntoa (temp_addr));
+	s_tmp2 = g_strdup (inet_ntoa (temp_addr2));
+	buf = g_strdup_printf ("/sbin/ip addr add %s/%d brd %s dev %s label %s",
+					   s_tmp, prefix, s_tmp2, iface, iface);
+	g_free (s_tmp);
+	g_free (s_tmp2);
+	if ((err = nm_spawn_process (buf)))
+	{
+		nm_warning ("Error: could not set network configuration for "
+				  "device '%s' using command:\n      '%s'",
+				  iface, buf);
+		goto error;
+	}
+	g_free (buf);
+
+	/* Alert other computers of our new address */
+	temp_addr.s_addr = addr;
+	buf = g_strdup_printf ("%s -q -A -c 1 -I %s %s", ARPING,iface,
+					   inet_ntoa (temp_addr));
+	nm_spawn_process (buf);
+	g_free (buf);
+	g_usleep (G_USEC_PER_SEC * 2);
+	buf = g_strdup_printf ("%s -q -U -c 1 -I %s %s", ARPING, iface,
+					   inet_ntoa (temp_addr));
+	nm_spawn_process (buf);
+	g_free (buf);
+
+	/* set the default route to be this device's gateway */
+	temp_addr.s_addr = nm_device_config_get_ip4_gateway (dev);
+	buf = g_strdup_printf ("/sbin/ip route replace default via %s dev %s",
+					   inet_ntoa (temp_addr), iface);
+	if ((err = nm_spawn_process (buf)))
+	{
+		nm_warning ("Error: could not set default route using "
+				  "command:\n    '%s'", buf);
+		goto error;
+	}
+	g_free (buf);
+	return(TRUE);
+
+	error:
+	g_free (buf);
+	nm_system_device_flush_addresses (dev);
+	nm_system_device_flush_routes (dev);
+	return(FALSE);
+}
+#endif
+
+/*
+ * nm_system_enable_loopback
+ *
+ * Bring up the loopback interface
+ *
+ */
+void nm_system_enable_loopback (void)
+{
+	nm_spawn_process ("/sbin/ifconfig lo up");
+}
+
+
+/*
+ * nm_system_flush_loopback_routes
+ *
+ * Flush all routes associated with the loopback device, because it
+ * sometimes gets the first route for ZeroConf/Link-Local traffic.
+ *
+ */
+void nm_system_flush_loopback_routes (void)
+{
+	nm_spawn_process ("/usr/sbin/ip route flush dev lo");
+}
+
+
+/*
+ * nm_system_delete_default_route
+ *
+ * Remove the old default route in preparation for a new one
+ *
+ */
+void nm_system_delete_default_route (void)
+{
+	nm_spawn_process ("/usr/sbin/ip route del default");
+}
+
+
+/*
+ * nm_system_flush_arp_cache
+ *
+ * Flush all entries in the arp cache.
+ *
+ */
+void nm_system_flush_arp_cache (void)
+{
+	nm_spawn_process ("/usr/sbin/ip neigh flush all");
+}
+
+
+/*
+ * nm_system_kill_all_dhcp_daemons
+ *
+ * Kill all DHCP daemons currently running, done at startup.
+ *
+ */
+void nm_system_kill_all_dhcp_daemons (void)
+{
+	nm_spawn_process ("/usr/bin/killall -q dhclient");
+}
+
+
+/*
+ * nm_system_update_dns
+ *
+ * Make glibc/nscd aware of any changes to the resolv.conf file by
+ * restarting nscd.
+ *
+ */
+void nm_system_update_dns (void)
+{
+	nm_spawn_process ("/etc/rc.d/nscd restart");
+
+}
+
+
+/*
+ * nm_system_restart_mdns_responder
+ *
+ * Restart the multicast DNS responder so that it knows about new
+ * network interfaces and IP addresses.
+ *
+ */
+void nm_system_restart_mdns_responder (void)
+{
+	nm_spawn_process ("/etc/rc.d/avahi-daemon restart");
+}
+
+
+/*
+ * nm_system_device_add_ip6_link_address
+ *
+ * Add a default link-local IPv6 address to a device.
+ *
+ */
+void nm_system_device_add_ip6_link_address (NMDevice *dev)
+{
+	char *buf;
+	char *addr;
+	struct ether_addr hw_addr;
+	unsigned char eui[8];
+
+  if (nm_device_is_802_3_ethernet (dev))
+    nm_device_802_3_ethernet_get_address (NM_DEVICE_802_3_ETHERNET (dev), &hw_addr);
+  else if (nm_device_is_802_11_wireless (dev))
+    nm_device_802_11_wireless_get_address (NM_DEVICE_802_11_WIRELESS (dev), &hw_addr);
+
+	memcpy (eui, &(hw_addr.ether_addr_octet), sizeof (hw_addr.ether_addr_octet));
+	memmove(eui+5, eui+3, 3);
+	eui[3] = 0xff;
+	eui[4] = 0xfe;
+	eui[0] ^= 2;
+
+	/* Add the default link-local IPv6 address to a device */
+	buf = g_strdup_printf ("/usr/sbin/ip -6 addr add fe80::%x%02x:%x%02x:%x%02x:%x%02x/64 dev %s",
+			 eui[0], eui[1], eui[2], eui[3],
+			 eui[4], eui[5],
+			 eui[6], eui[7], nm_device_get_iface (dev));
+	nm_spawn_process (buf);
+	g_free (buf);
+}
+
+/*
+ * set_ip4_config_from_resolv_conf
+ *
+ * Add nameservers and search names from a resolv.conf format file.
+ *
+ */
+static void set_ip4_config_from_resolv_conf (const char *filename, NMIP4Config *ip4_config)
+{
+	char *	contents = NULL;
+	char **	split_contents = NULL;
+	int		i, len;
+
+	g_return_if_fail (filename != NULL);
+	g_return_if_fail (ip4_config != NULL);
+
+	if (!g_file_get_contents (filename, &contents, NULL, NULL) || (contents == NULL))
+		return;
+
+	if (!(split_contents = g_strsplit (contents, "\n", 0)))
+		goto out;
+	
+	len = g_strv_length (split_contents);
+	for (i = 0; i < len; i++)
+	{
+		char *line = split_contents[i];
+
+		/* Ignore comments */
+		if (!line || (line[0] == ';') || (line[0] == '#'))
+			continue;
+
+		line = g_strstrip (line);
+		if ((strncmp (line, "search", 6) == 0) && (strlen (line) > 6))
+		{
+			char *searches = g_strdup (line + 7);
+			char **split_searches = NULL;
+
+			if (!searches || !strlen (searches))
+				continue;
+
+			/* Allow space-separated search domains */
+			if ((split_searches = g_strsplit (searches, " ", 0)))
+			{
+				int m, srch_len;
+
+				srch_len = g_strv_length (split_searches);
+				for (m = 0; m < srch_len; m++)
+				{
+					if (split_searches[m])
+						nm_ip4_config_add_domain	(ip4_config, split_searches[m]);
+				}
+				g_strfreev (split_searches);
+			}
+			else
+			{
+				/* Only 1 item, add the whole line */
+				nm_ip4_config_add_domain	(ip4_config, searches);
+			}
+
+			g_free (searches);
+		}
+		else if ((strncmp (line, "nameserver", 10) == 0) && (strlen (line) > 10))
+		{
+			guint32	addr = (guint32) (inet_addr (line + 11));
+
+			if (addr != (guint32) -1)
+				nm_ip4_config_add_nameserver (ip4_config, addr);
+		}
+	}
+
+	g_strfreev (split_contents);
+
+	out:
+	g_free (contents);
+}
+
+/*
+*   ArchReadConfig
+*   
+*   Read platform dependant config file and fill hash with relevant info
+*/
+
+static GHashTable * ArchReadConfig(const char* file, const char* dev)
+{
+	gchar *contents=NULL;
+	gchar **split_contents=NULL;
+	GHashTable *cfg,*ifs;
+	guint len;  
+	gint i;
+	gpointer val;
+
+	if (!g_file_get_contents (file, &contents, NULL, NULL) || (contents == NULL))
+	{
+		return NULL;
+	}
+
+	if (!(split_contents = g_strsplit (contents, "\n", 0)))
+	{
+		g_free(contents);
+		return NULL;
+	}
+
+	cfg=g_hash_table_new_full(g_str_hash,g_str_equal,g_free,g_free);
+	if (cfg==NULL)
+	{
+		g_free(contents);
+		return NULL;
+	}
+
+	ifs=g_hash_table_new_full(g_str_hash,g_str_equal,g_free,g_free);
+	if (ifs==NULL)
+	{
+		g_free(contents);
+		g_hash_table_destroy(cfg);
+		return NULL;
+	}
+
+	/* load hash with key value pairs from config file */
+	len = g_strv_length (split_contents);
+	for (i = 0; i < len; i++)
+	{
+		char *line = split_contents[i];
+		gchar** splt;
+
+		/* Ignore comments */
+		if (!line || (line[0] == ';') || (line[0] == '#'))
+		{
+			continue;
+		}
+
+		line = g_strstrip(line);        
+
+		splt=g_strsplit(line,"=",0);
+		if (g_strv_length(splt)==2)
+		{
+			g_hash_table_insert(cfg,g_strstrip(splt[0]),g_strstrip(splt[1]));
+		}
+		else
+		{
+			g_strfreev(splt);
+		}
+
+	}
+
+	/* Find our network device */
+	if ((val=g_hash_table_lookup(cfg,dev)))
+	{
+		char hit[128]; 
+		gchar** splt;
+		gint hits;      
+
+		if (sscanf(val,"\"%[0-9a-zA-Z .]\"",hit))
+		{
+
+			splt=g_strsplit(hit," ",0);
+
+			hits=g_strv_length(splt);
+			if (hits>1)
+			{
+				guint j=0;
+				while ((hits-=2)>=0)
+				{
+					g_hash_table_insert(ifs,splt[j],splt[j+1]);
+					j+=2;
+				}
+
+			}
+
+		}
+	}
+
+	/* Find out any default route */
+	if ((val=g_hash_table_lookup(cfg,"ROUTES")))
+	{
+		char hit[128];
+		gchar** splt;
+		gint hits,i;    
+
+		if (sscanf(val,"( %[!0-9a-zA-z ] )",hit))
+		{
+
+			splt=g_strsplit(hit," ",0);
+
+			hits=g_strv_length(splt);
+			for (i=0;i<hits;i++)
+			{
+
+				if (splt[i][0]=='!')
+				{
+					continue;
+				}
+
+				if ((val=g_hash_table_lookup(cfg,splt[i])))
+				{
+
+					if (sscanf(val," \" default gw %[0-9a-zA-Z.-_] \"",hit))
+					{
+						g_hash_table_insert(ifs,g_strdup("gateway"),g_strdup(hit));
+						break; /* Only one default gw */
+					}
+
+				}
+			}
+			g_strfreev(splt);
+
+		}
+
+	}
+
+	g_hash_table_destroy(cfg);  
+	g_strfreev (split_contents);
+	g_free(contents);
+
+	return ifs;
+}
+
+
+typedef struct ArchSystemConfigData
+{
+	NMIP4Config *   config;
+	gboolean                use_dhcp;
+} ArchSystemConfigData;
+
+
+
+/*
+ * nm_system_device_get_system_config
+ *
+ * Retrieve any relevant configuration info for a particular device
+ * from the system network configuration information.  Clear out existing
+ * info before setting stuff too.
+ *
+ */
+void* nm_system_device_get_system_config (NMDevice * dev, NMData *app_data)
+{
+
+	GHashTable* ifh;
+	gpointer val;
+	ArchSystemConfigData*   sys_data=NULL;
+
+	g_return_val_if_fail (dev != NULL, NULL);
+
+	sys_data = g_malloc0 (sizeof (ArchSystemConfigData));
+	sys_data->use_dhcp = TRUE;
+	sys_data->config=NULL;
+
+	ifh=ArchReadConfig("/etc/rc.conf",nm_device_get_iface(dev));
+	if (ifh==NULL)
+	{
+		g_free(sys_data);
+		return NULL;
+	}
+
+	if ((val=g_hash_table_lookup(ifh,nm_device_get_iface(dev))))
+	{
+		// We found an IP-nr and thus have a static configuration
+
+		sys_data->use_dhcp=FALSE;
+		sys_data->config = nm_ip4_config_new();
+
+		nm_ip4_config_set_address (sys_data->config, inet_addr (val));
+
+		val = g_hash_table_lookup(ifh, "gateway");
+		if (val)
+			nm_ip4_config_set_gateway (sys_data->config, inet_addr (val));
+
+		val = g_hash_table_lookup(ifh, "netmask");
+		if (val)
+			nm_ip4_config_set_netmask (sys_data->config, inet_addr (val));
+		else
+		{
+			guint32 addr = nm_ip4_config_get_address (sys_data->config);
+
+			/* Make a default netmask if we have an IP address */
+			if (((ntohl (addr) & 0xFF000000) >> 24) <= 127)
+				nm_ip4_config_set_netmask (sys_data->config, htonl (0xFF000000));
+			else if (((ntohl (addr) & 0xFF000000) >> 24) <= 191)
+				nm_ip4_config_set_netmask (sys_data->config, htonl (0xFFFF0000));
+			else
+				nm_ip4_config_set_netmask (sys_data->config, htonl (0xFFFFFF00));
+		}
+
+		val = g_hash_table_lookup(ifh, "broadcast");
+		if (val)
+			nm_ip4_config_set_broadcast (sys_data->config, inet_addr (val));
+		else
+		{
+			guint32 broadcast = ((nm_ip4_config_get_address (sys_data->config) & nm_ip4_config_get_netmask (sys_data->config))
+							 | ~nm_ip4_config_get_netmask (sys_data->config));
+			nm_ip4_config_set_broadcast (sys_data->config, broadcast);
+		}
+
+		set_ip4_config_from_resolv_conf (SYSCONFDIR"/resolv.conf", sys_data->config);
+#if 1
+		{
+			int j;
+			nm_debug ("------ Config (%s)", nm_device_get_iface (dev));
+			nm_debug ("    ADDR=%d", nm_ip4_config_get_address (sys_data->config));
+			nm_debug ("    GW  =%d", nm_ip4_config_get_gateway (sys_data->config));
+			nm_debug ("    NM  =%d", nm_ip4_config_get_netmask (sys_data->config));
+			nm_debug ("    NSs =%d",nm_ip4_config_get_num_nameservers(sys_data->config));
+			for (j=0;j<nm_ip4_config_get_num_nameservers(sys_data->config);j++)
+			{
+				nm_debug ("    NS =%d",nm_ip4_config_get_nameserver(sys_data->config,j));
+			}
+			nm_debug ("---------------------\n");
+		}
+#endif
+
+	}
+
+	g_hash_table_destroy(ifh);
+
+
+	return (void *)sys_data;
+}
+
+/*
+ * nm_system_device_free_system_config
+ *
+ * Free stored system config data
+ *
+ */
+void nm_system_device_free_system_config (NMDevice *dev, void *system_config_data)
+{
+	ArchSystemConfigData *sys_data = (ArchSystemConfigData*) system_config_data;
+
+	g_return_if_fail (dev != NULL);
+
+	if (!sys_data)
+	{
+		return;
+	}
+
+	if (sys_data->config)
+		nm_ip4_config_unref (sys_data->config);
+
+
+}
+
+
+/*
+ * nm_system_device_get_use_dhcp
+ *
+ * Return whether the distro-specific system config tells us to use
+ * dhcp for this device.
+ *
+ */
+gboolean nm_system_device_get_use_dhcp (NMDevice *dev)
+{
+	ArchSystemConfigData *sys_data;
+
+	g_return_val_if_fail (dev != NULL, TRUE);
+
+	if ((sys_data = nm_device_get_system_config_data(dev)))
+	{
+		return sys_data->use_dhcp;
+	}
+
+	return TRUE;
+}
+
+/*
+ * nm_system_device_get_disabled
+ *
+ * Return whether the distro-specific system config tells us to use
+ * dhcp for this device.
+ *
+ */
+gboolean nm_system_device_get_disabled (NMDevice *dev)
+{
+	return FALSE;
+}
+
+
+NMIP4Config *nm_system_device_new_ip4_system_config (NMDevice *dev)
+{
+	ArchSystemConfigData	*sys_data;
+	NMIP4Config		*new_config = NULL;
+
+	g_return_val_if_fail (dev != NULL, NULL);
+
+	if ((sys_data = nm_device_get_system_config_data (dev)))
+		new_config = nm_ip4_config_copy (sys_data->config);
+
+	return new_config;
+}
+
+void nm_system_deactivate_all_dialup (GSList *list)
+{
+	GSList *elt;
+
+	for (elt = list; elt; elt = g_slist_next (elt))
+	{
+		NMDialUpConfig *config = (NMDialUpConfig *) elt->data;
+		char *cmd;
+
+		cmd = g_strdup_printf ("/sbin/ifconfig %s down", (char *) config->data);
+		nm_spawn_process (cmd);
+		g_free (cmd);
+	}
+}
+
+gboolean nm_system_deactivate_dialup (GSList *list, const char *dialup)
+{
+	GSList *elt;
+	gboolean ret = FALSE;
+
+	for (elt = list; elt; elt = g_slist_next (elt))
+	{
+		NMDialUpConfig *config = (NMDialUpConfig *) elt->data;
+		if (strcmp (dialup, config->name) == 0)
+		{
+			char *cmd;
+
+			nm_info ("Deactivating dialup device %s (%s) ...", dialup, (char *) config->data);
+			cmd = g_strdup_printf ("/sbin/ifconfig %s down", (char *) config->data);
+			nm_spawn_process (cmd);
+			g_free (cmd);
+			ret = TRUE;
+			break;
+		}
+	}
+
+	return ret;
+}
+
+gboolean nm_system_activate_dialup (GSList *list, const char *dialup)
+{
+	GSList *elt;
+	gboolean ret = FALSE;
+
+	for (elt = list; elt; elt = g_slist_next (elt))
+	{
+		NMDialUpConfig *config = (NMDialUpConfig *) elt->data;
+		if (strcmp (dialup, config->name) == 0)
+		{
+			char *cmd;
+
+			nm_info ("Activating dialup device %s (%s) ...", dialup, (char *) config->data);
+			cmd = g_strdup_printf ("/sbin/ifconfig %s up", (char *) config->data);
+			nm_spawn_process (cmd);
+			g_free (cmd);
+			ret = TRUE;
+			break;
+		}
+	}
+
+	return ret;
+}
+
+GSList * nm_system_get_dialup_config (void)
+{
+	const char *buf;
+	if_block *curr_device;
+	gboolean       error = FALSE;
+	GError *err;
+	unsigned int i = 0;
+	size_t len;
+	GSList *list = NULL;
+#if 0  // PORT me
+	if_block *curr;
+	ifparser_init();
+
+	/* FIXME: get all ppp(and others?) lines from /e/n/i here */
+	curr = ifparser_getfirst();
+	while (curr!=NULL)
+	{
+		NMDialUpConfig *config;
+		if (strcmp(curr->type,"iface")==0)
+		{
+			buf = ifparser_getkey(curr,"inet");
+			if (buf && strcmp (buf, "ppp")==0)
+			{
+				config = g_malloc (sizeof (NMDialUpConfig));
+				config->name = g_strdup_printf ("Modem (#%d)", i++);
+				config->data = g_strdup (curr->name);	/* interface name */
+
+				list = g_slist_append (list, config);
+
+				nm_info ("Found dial up configuration for %s: %s", config->name, (char *) config->data);
+			}
+		}
+		curr = curr->next;
+	}
+	ifparser_destroy();
+
+	/* Hack: Go back and remove the "(#0)" if there is only one device */
+	if (i == 1)
+	{
+		NMDialUpConfig *config = (NMDialUpConfig *) list->data;
+		g_free (config->name);
+		config->name = g_strdup ("Modem");
+	}
+#endif
+	return list;
+}
+
+/*
+ * nm_system_activate_nis
+ *
+ * set up the nis domain and write a yp.conf
+ *
+ */
+void nm_system_activate_nis (NMIP4Config *config)
+{
+}
+
+/*
+ * nm_system_should_modify_resolv_conf
+ *
+ * Can NM update resolv.conf, or is it locked down?
+ */
+gboolean nm_system_should_modify_resolv_conf (void)
+{
+	return TRUE;
+}
+
+/*
+ * nm_system_shutdown_nis
+ *
+ * shutdown ypbind
+ *
+ */
+void nm_system_shutdown_nis (void)
+{
+}
+
+/*
+ * nm_system_set_hostname
+ *
+ * set the hostname
+ *
+ */
+void nm_system_set_hostname (NMIP4Config *config)
+{
+}
+
diff --git a/src/backends/NetworkManagerDebian.c b/src/backends/NetworkManagerDebian.c
index db90fad3d8..7f53bba9d5 100644
--- a/src/backends/NetworkManagerDebian.c
+++ b/src/backends/NetworkManagerDebian.c
@@ -384,7 +384,7 @@ out:
  * info before setting stuff too.
  *
  */
-void* nm_system_device_get_system_config (NMDevice *dev)
+void* nm_system_device_get_system_config (NMDevice *dev, NMData *app_data)
 {
 	DebSystemConfigData *	sys_data = NULL;
 	if_block *curr_device;
@@ -681,3 +681,15 @@ gboolean nm_system_should_modify_resolv_conf (void)
 {
 	return TRUE;
 }
+
+
+/*
+ * nm_system_get_mtu
+ *
+ * Return a user-provided or system-mandated MTU for this device or zero if
+ * no such MTU is provided.
+ */
+guint32 nm_system_get_mtu (NMDevice *dev)
+{
+	return 0;
+}
diff --git a/src/backends/NetworkManagerGentoo.c b/src/backends/NetworkManagerGentoo.c
index c77855b56b..81a82690bf 100644
--- a/src/backends/NetworkManagerGentoo.c
+++ b/src/backends/NetworkManagerGentoo.c
@@ -300,7 +300,7 @@ typedef struct GentooSystemConfigData
  * info before setting stuff too.
  *
  */
-void *nm_system_device_get_system_config (NMDevice *dev)
+void *nm_system_device_get_system_config (NMDevice *dev, NMData *app_data)
 {
 	char		*cfg_file_path = NULL;
 	FILE		*file = NULL;
@@ -583,3 +583,14 @@ gboolean nm_system_should_modify_resolv_conf (void)
 {
 	return TRUE;
 }
+
+/*
+ * nm_system_get_mtu
+ *
+ * Return a user-provided or system-mandated MTU for this device or zero if
+ * no such MTU is provided.
+ */
+guint32 nm_system_get_mtu (NMDevice *dev)
+{
+	return 0;
+}
diff --git a/src/backends/NetworkManagerRedHat.c b/src/backends/NetworkManagerRedHat.c
index 2676ca51f3..3af01d0031 100644
--- a/src/backends/NetworkManagerRedHat.c
+++ b/src/backends/NetworkManagerRedHat.c
@@ -454,7 +454,7 @@ out:
  * Read in the config file for a device.
  *
  */
-void *nm_system_device_get_system_config (NMDevice *dev)
+void *nm_system_device_get_system_config (NMDevice *dev, NMData *app_data)
 {
 	char *				cfg_file_path = NULL;
 	shvarFile *			file;
@@ -930,3 +930,15 @@ gboolean nm_system_should_modify_resolv_conf (void)
 {
 	return TRUE;
 }
+
+
+/*
+ * nm_system_get_mtu
+ *
+ * Return a user-provided or system-mandated MTU for this device or zero if
+ * no such MTU is provided.
+ */
+guint32 nm_system_get_mtu (NMDevice *dev)
+{
+	return 0;
+}
diff --git a/src/backends/NetworkManagerSlackware.c b/src/backends/NetworkManagerSlackware.c
index 91dbb0aa87..88aaf1b02c 100644
--- a/src/backends/NetworkManagerSlackware.c
+++ b/src/backends/NetworkManagerSlackware.c
@@ -139,7 +139,7 @@ gboolean nm_system_device_setup_static_ip4_config (NMDevice *dev)
  * info before setting stuff too.
  *
  */
-void *nm_system_device_get_system_config (NMDevice *dev)
+void *nm_system_device_get_system_config (NMDevice *dev, NMData *app_data)
 {
 	return NULL;
 }
@@ -215,8 +215,6 @@ void nm_system_update_dns (void)
  */
 void nm_system_restart_mdns_responder (void)
 {
-	/* for GWARE at least */
-	nm_spawn_process("/etc/rc.d/rc.howl restart");
 }
 
 
@@ -423,3 +421,15 @@ gboolean nm_system_should_modify_resolv_conf (void)
 {
 	return TRUE;
 }
+
+
+/*
+ * nm_system_get_mtu
+ *
+ * Return a user-provided or system-mandated MTU for this device or zero if
+ * no such MTU is provided.
+ */
+guint32 nm_system_get_mtu (NMDevice *dev)
+{
+	return 0;
+}
diff --git a/src/backends/NetworkManagerSuSE.c b/src/backends/NetworkManagerSuSE.c
index 43cc79e630..1bad8a626e 100644
--- a/src/backends/NetworkManagerSuSE.c
+++ b/src/backends/NetworkManagerSuSE.c
@@ -31,7 +31,19 @@
 
 #include "NetworkManagerSystem.h"
 #include "NetworkManagerUtils.h"
+#include "NetworkManagerMain.h"
 #include "nm-device.h"
+#include "nm-ap-security.h"
+#include "nm-ap-security-private.h"
+#include "nm-ap-security-wep.h"
+#include "nm-ap-security-wpa-psk.h"
+#include "NetworkManagerAPList.h"
+#include "NetworkManagerPolicy.h"
+#include "cipher.h"
+#include "cipher-wep-ascii.h"
+#include "cipher-wep-hex.h"
+#include "cipher-wep-passphrase.h"
+#include "cipher-wpa-psk-passphrase.h"
 #include "nm-device-802-3-ethernet.h"
 #include "nm-device-802-11-wireless.h"
 #include "NetworkManagerDialup.h"
@@ -342,6 +354,7 @@ typedef struct SuSEDeviceConfigData
 	NMIP4Config *	config;
 	gboolean		use_dhcp;
 	gboolean		system_disabled;
+	guint32		mtu;
 } SuSEDeviceConfigData;
 
 /*
@@ -428,7 +441,7 @@ out:
  * SuSE stores this information in /etc/sysconfig/network/ifcfg-*-<MAC address>
  *
  */
-void *nm_system_device_get_system_config (NMDevice *dev)
+void *nm_system_device_get_system_config (NMDevice *dev, NMData *app_data)
 {
 	char *cfg_file_path = NULL;
 	char mac[18];
@@ -482,7 +495,7 @@ void *nm_system_device_get_system_config (NMDevice *dev)
 	return sys_data;
 
 found:
-	nm_debug ("found config %s for if %s", cfg_file_path, nm_device_get_iface (dev));
+	nm_debug ("found config '%s' for interface '%s'", cfg_file_path, nm_device_get_iface (dev));
 	if (!(file = svNewFile (cfg_file_path)))
 	{
 		g_free (cfg_file_path);
@@ -507,7 +520,149 @@ found:
 			sys_data->system_disabled = TRUE;
 		}
 		free (buf);
-	}		
+	}
+
+	if ((buf = svGetValue (file, "MTU")))
+	{
+		guint32 mtu;
+
+		errno = 0;
+		mtu = strtoul (buf, NULL, 10);
+		if (!errno && mtu > 500 && mtu < INT_MAX)
+			sys_data->mtu = mtu;
+		free (buf);
+	}
+
+	if ((buf = svGetValue (file, "WIRELESS_ESSID")) && strlen (buf) > 1)
+	{
+		NMAccessPoint *	ap;
+		NMAccessPoint *	list_ap;
+		char *			key;
+		char *			mode;
+
+		ap = nm_ap_new ();
+		nm_ap_set_essid (ap, buf);
+		nm_ap_set_timestamp (ap, time (NULL), 0);
+		nm_ap_set_trusted (ap, TRUE);
+
+		if ((mode = svGetValue (file, "WIRELESS_AUTH_MODE")) && !strcmp (mode, "psk"))
+		{
+			if ((key = svGetValue (file, "WIRELESS_WPA_PSK")))
+			{
+				IEEE_802_11_Cipher *	cipher;
+				NMAPSecurityWPA_PSK *	security;
+				char *				hash;
+
+				cipher = cipher_wpa_psk_passphrase_new ();
+				nm_ap_set_capabilities (ap, NM_802_11_CAP_PROTO_WPA);
+				security = nm_ap_security_wpa_psk_new_from_ap (ap, NM_AUTH_TYPE_WPA_PSK_AUTO);
+				hash = ieee_802_11_cipher_hash (cipher, buf, key);
+				if (hash)
+				{
+					nm_ap_security_set_key (NM_AP_SECURITY (security), hash, strlen (hash));
+					nm_ap_set_security (ap, NM_AP_SECURITY (security));
+				}
+
+				ieee_802_11_cipher_unref (cipher);
+				g_object_unref (G_OBJECT (security));
+			}
+		}
+		else if ((key = svGetValue (file, "WIRELESS_KEY_0")) && strlen (key) > 3)
+		{
+			IEEE_802_11_Cipher *	cipher;
+			NMAPSecurityWEP *		security;
+			char *				key_type;
+			char *				hash;
+			char *				real_key;
+
+			key_type = svGetValue (file, "WIRELESS_KEY_LENGTH");
+			if (key_type && strcmp (key_type, "128") != 0)
+			{
+				if (key[0] == 'h' && key[1] == ':')
+				{
+					cipher = cipher_wep64_passphrase_new ();
+					real_key = key + 2;
+				}
+				else if (key[0] == 's' && key[1] == ':')
+				{
+					cipher = cipher_wep64_ascii_new ();
+					real_key = key + 2;
+				}
+				else
+				{
+					cipher = cipher_wep64_hex_new ();
+					real_key = key;
+				}
+				security = nm_ap_security_wep_new_from_ap (ap, IW_AUTH_CIPHER_WEP40);
+			}
+			else
+			{
+				if (key[0] == 'h' && key[1] == ':')
+				{
+					cipher = cipher_wep128_passphrase_new ();
+					real_key = key + 2;
+				}
+				else if (key[0] == 's' && key[1] == ':')
+				{
+					cipher = cipher_wep128_ascii_new ();
+					real_key = key + 2;
+				}
+				else
+				{
+					char **keyv;
+
+					cipher = cipher_wep128_hex_new ();
+
+					keyv = g_strsplit (key, "-", 0);
+					real_key = g_strjoinv (NULL, keyv);
+					g_strfreev (keyv);
+				}
+				security = nm_ap_security_wep_new_from_ap (ap, IW_AUTH_CIPHER_WEP104);
+			}
+			hash = ieee_802_11_cipher_hash (cipher, buf, real_key);
+			if (hash)
+			{
+				nm_ap_security_set_key (NM_AP_SECURITY (security), hash, strlen (hash));
+				nm_ap_set_security (ap, NM_AP_SECURITY (security));
+			}
+
+			ieee_802_11_cipher_unref (cipher);
+			g_object_unref (G_OBJECT (security));
+
+			free (key_type);
+		}
+		else
+		{
+			NMAPSecurity *	security;
+
+			security = nm_ap_security_new (IW_AUTH_CIPHER_NONE);
+			nm_ap_set_security (ap, security);
+			g_object_unref (G_OBJECT (security));
+		}
+
+		if ((list_ap = nm_ap_list_get_ap_by_essid (app_data->allowed_ap_list, buf)))
+		{
+			nm_ap_set_essid (list_ap, nm_ap_get_essid (ap));
+			nm_ap_set_timestamp_via_timestamp (list_ap, nm_ap_get_timestamp (ap));
+			nm_ap_set_trusted (list_ap, nm_ap_get_trusted (ap));
+			nm_ap_set_security (list_ap, nm_ap_get_security (ap));
+		}
+		else
+		{
+			/* New AP, just add it to the list */
+			nm_ap_list_append_ap (app_data->allowed_ap_list, ap);
+		}
+		nm_ap_unref (ap);
+
+		nm_debug ("Adding '%s' to the list of trusted networks", buf);
+
+		/* Ensure all devices get new information copied into their device lists */
+		nm_policy_schedule_device_ap_lists_update_from_allowed (app_data);
+
+		free (key);
+		free (mode);
+		free (buf);
+	}
 
 	sys_data->config = nm_ip4_config_new ();
 
@@ -566,6 +721,8 @@ found:
 			nm_ip4_config_set_broadcast (sys_data->config, broadcast);
 		}
 
+		nm_ip4_config_set_mtu (sys_data->config, sys_data->mtu);
+
 		buf = NULL;
 		if ((f = fopen (SYSCONFDIR"/sysconfig/network/routes", "r")))
 		{
@@ -619,6 +776,9 @@ out:
 	nm_debug ("mask=%s", ip_str);
 	g_free (ip_str);
 
+	if (sys_data->mtu)
+		nm_debug ("mtu=%u", sys_data->mtu);
+
 	len = nm_ip4_config_get_num_nameservers (sys_data->config);
 	for (i = 0; i < len; i++)
 	{
@@ -687,7 +847,6 @@ gboolean nm_system_device_get_disabled (NMDevice *dev)
 
 	g_return_val_if_fail (dev != NULL, FALSE);
 
-
 	if ((sys_data = nm_device_get_system_config_data (dev)))
 		return sys_data->system_disabled;
 
@@ -930,8 +1089,7 @@ void nm_system_activate_nis (NMIP4Config *config)
 {
 	shvarFile *file;
 	const char *nis_domain;
-	char *name, *buf = NULL; 
-	int num_nis_servers = 0; 
+	char *name, *buf;
 	struct in_addr	temp_addr;
 	int i;
 	FILE *ypconf = NULL;
@@ -958,12 +1116,15 @@ void nm_system_activate_nis (NMIP4Config *config)
 		goto out_close;
 
 	if (!strcmp (buf, "yes")) {
+		int num_nis_servers;
+
 		num_nis_servers = nm_ip4_config_get_num_nis_servers(config);
-		/* write out yp.conf and restart the daemon */
 		if (num_nis_servers > 0)
 		{
 			struct stat sb;
 
+			/* write out yp.conf and restart the daemon */
+
 			ypconf = fopen ("/etc/yp.conf", "w");
 
 			if (ypconf)
@@ -981,12 +1142,12 @@ void nm_system_activate_nis (NMIP4Config *config)
 			if (stat ("/usr/sbin/rcypbind", &sb) != -1)
 			{
 				nm_info ("Restarting ypbind.");
-				nm_spawn_process ("/usr/sbin/rcypbind restart");
+				nm_spawn_process ("/usr/sbin/rcypbind reload");
 			}
 			if (stat ("/usr/sbin/rcautofs", &sb) != -1)
 			{
 				nm_info ("Restarting autofs.");
-				nm_spawn_process ("/usr/sbin/rcautofs restart");
+				nm_spawn_process ("/usr/sbin/rcautofs reload");
 			}
 		}
 	}
@@ -1007,20 +1168,44 @@ out_gfree:
  */
 void nm_system_shutdown_nis (void)
 {
-	struct stat sb;
+#if 0	/* XXX: let's not touch NIS, for now; probably need to make this a configurable option */
+	char *name, *buf = NULL;
+	shvarFile *file;
 
-	if (stat ("/usr/sbin/rcypbind", &sb) != -1)
-	{
-		nm_info ("Stopping ypbind.");
-		nm_spawn_process ("/usr/sbin/rcypbind stop");
-	}
-	if (stat ("/usr/sbin/rcautofs", &sb) != -1)
-	{
-		nm_info ("Restarting autofs.");
-		nm_spawn_process ("/usr/sbin/rcautofs restart");
+	name = g_strdup_printf (SYSCONFDIR"/sysconfig/network/dhcp");
+	file = svNewFile (name);
+	if (!file)
+		goto out_gfree;
+
+	buf = svGetValue (file, "DHCLIENT_MODIFY_NIS_CONF");
+	if (!buf)
+		goto out_close;
+
+	if (!strcmp (buf, "yes")) {
+		struct stat sb;
+
+		if (stat ("/usr/sbin/rcypbind", &sb) != -1)
+		{
+			nm_info ("Stopping ypbind.");
+			nm_spawn_process ("/usr/sbin/rcypbind stop");
+		}
+
+		if (stat ("/usr/sbin/rcautofs", &sb) != -1)
+		{
+			nm_info ("Restarting autofs.");
+			nm_spawn_process ("/usr/sbin/rcautofs restart");
+		}
 	}
+
+	free (buf);
+out_close:
+	svCloseFile (file);
+out_gfree:
+	g_free (name);
+#endif
 }
 
+
 /*
  * nm_system_set_hostname
  *
@@ -1092,12 +1277,12 @@ gboolean nm_system_should_modify_resolv_conf (void)
 	shvarFile *file;
 	gboolean ret = TRUE;
 
-	name = g_strdup_printf (SYSCONFDIR"/sysconfig/network/config");
+	name = g_strdup_printf (SYSCONFDIR"/sysconfig/network/dhcp");
 	file = svNewFile (name);
 	if (!file)
 		goto out_gfree;
 
-	buf = svGetValue (file, "MODIFY_RESOLV_CONF_DYNAMICALLY");
+	buf = svGetValue (file, "DHCLIENT_MODIFY_RESOLV_CONF");
 	if (!buf)
 		goto out_close;
 
@@ -1113,3 +1298,20 @@ out_gfree:
 	return ret;
 }
 
+
+/*
+ * nm_system_get_mtu
+ *
+ * Return a user-provided or system-mandated MTU for this device or zero if
+ * no such MTU is provided.
+ */
+guint32 nm_system_get_mtu (NMDevice *dev)
+{
+	SuSEDeviceConfigData *	sys_data;
+
+	sys_data = nm_device_get_system_config_data (dev);
+	if (!sys_data)
+		return 0;
+
+	return sys_data->mtu;
+}
diff --git a/src/backends/interface_parser.c b/src/backends/interface_parser.c
index ac6faaeb90..53d6487d74 100644
--- a/src/backends/interface_parser.c
+++ b/src/backends/interface_parser.c
@@ -50,6 +50,10 @@ void add_block(const char *type, const char* name)
 
 void add_data(const char *key,const char *data)
 {
+	// Check if there is a block where we can attach our data
+	if (first == NULL)
+		return;
+			
 	if_data *ret = (if_data*)calloc(1,sizeof(struct _if_data));
 	ret->key = g_strdup(key);
 	ret->data = g_strdup(data);
@@ -73,6 +77,10 @@ void ifparser_init(void)
 {
 	FILE *inp = fopen(INTERFACES,"r");
 	int ret = 0;
+	char *line;
+	char *space;
+	char rline[255];
+
 	if (inp == NULL)
 	{
 		nm_warning ("Error: Can't open %s\n",INTERFACES);
@@ -81,10 +89,16 @@ void ifparser_init(void)
 	first = last = NULL;
 	while(1)
 	{
-		char *line,rline[255],*space;
+		line = space = NULL;
 		ret = fscanf(inp,"%255[^\n]\n",rline);
 		if (ret == EOF)
 			break;
+		// If the line did not match, skip it
+		if (ret == 0) {
+			fgets(rline, 255, inp);
+			continue;
+		}
+		
 		line = rline;
 		while(line[0] == ' ')
 			line++;
@@ -94,18 +108,19 @@ void ifparser_init(void)
 		SPACE_OR_TAB(line,space)
 		if (space == NULL)
 		{
-            nm_warning ("Error: Can't parse interface line '%s'\n",line);
+			nm_warning ("Error: Can't parse interface line '%s'\n",line);
 			continue;
 		}
 		space[0] = '\0';
 		
-		
+		// There are four different stanzas:
+		// iface, mapping, auto and allow-*. Create a block for each of them.
 		if (strcmp(line,"iface")==0)
 		{
 			char *space2 = strchr(space+1,' ');
 			if (space2 == NULL)
 			{
-            	nm_warning ("Error: Can't parse iface line '%s'\n",space+1);
+				nm_warning ("Error: Can't parse iface line '%s'\n",space+1);
 				continue;
 			}
 			space2[0]='\0';
@@ -116,7 +131,7 @@ void ifparser_init(void)
 				space = strchr(space2+1,' ');
 				if (space == NULL)
 				{
-            		nm_warning ("Error: Can't parse data '%s'\n",space2+1);
+					nm_warning ("Error: Can't parse data '%s'\n",space2+1);
 					continue;
 				}
 				space[0] = '\0';
@@ -125,6 +140,10 @@ void ifparser_init(void)
 		}
 		else if (strcmp(line,"auto")==0)
 			add_block(line,space+1);
+		else if (strcmp(line,"mapping")==0)
+			add_block(line,space+1);
+		else if (strncmp(line,"allow-",6)==0)
+			add_block(line,space+1);
 		else
 			add_data(line,space+1);
 		
diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp-manager/nm-dhcp-manager.c
index acf7eb2880..5a1e0b5814 100644
--- a/src/dhcp-manager/nm-dhcp-manager.c
+++ b/src/dhcp-manager/nm-dhcp-manager.c
@@ -29,10 +29,13 @@
 #include "nm-device.h"
 #include "NetworkManagerPolicy.h"
 #include "NetworkManagerUtils.h"
+#include "NetworkManagerSystem.h"
 #include "nm-activation-request.h"
 #include "nm-utils.h"
 
 
+#define NM_DHCP_TIMEOUT		45	/* DHCP timeout, in seconds */
+
 struct NMDHCPManager
 {
 	NMData *		data;
@@ -73,39 +76,6 @@ static gboolean state_is_down (guint8 state)
 }
 
 
-/*
- * nm_dhcp_manager_exec_daemon
- *
- * Launch the DHCP daemon.
- *
- */
-static gboolean nm_dhcp_manager_exec_daemon (NMDHCPManager *manager)
-{
-	GPtrArray		*dhcp_argv;
-	GError		*error = NULL;
-	GPid			 pid;
-
-	g_return_val_if_fail (manager != NULL, FALSE);
-
-	dhcp_argv = g_ptr_array_new ();
-	g_ptr_array_add (dhcp_argv, (gpointer) DHCDBD_BINARY_PATH);
-	g_ptr_array_add (dhcp_argv, (gpointer) "--system");
-	g_ptr_array_add (dhcp_argv, NULL);
-
-	if (!g_spawn_async ("/", (char **) dhcp_argv->pdata, NULL, 0, NULL, NULL, &pid, &error))
-	{
-		g_ptr_array_free (dhcp_argv, TRUE);
-		nm_warning ("Could not activate the DHCP daemon " DHCDBD_BINARY_PATH ".  error: '%s'.", error->message);
-		g_error_free (error);
-		return FALSE;
-	}
-	g_ptr_array_free (dhcp_argv, TRUE);
-	nm_info ("Activated the DHCP daemon " DHCDBD_BINARY_PATH " with PID %d.", pid);
-
-	return TRUE;
-}
-
-
 NMDHCPManager * nm_dhcp_manager_new (NMData *data)
 {
 	NMDHCPManager *	manager;
@@ -153,9 +123,8 @@ guint32 nm_dhcp_manager_get_state_for_device (NMDHCPManager *manager, NMDevice *
 
 	if (!manager->running)
 	{
-		if (nm_dhcp_manager_exec_daemon (manager) == FALSE)
-			return 0;
-		sleep (1);
+		nm_warning ("dhcdbd not running!");
+		return 0;
 	}
 
 	path = g_strdup_printf (DHCP_OBJECT_PATH"/%s", nm_device_get_iface (dev));
@@ -206,7 +175,8 @@ static gboolean nm_dhcp_manager_handle_timeout (NMActRequest *req)
 	dev = nm_act_request_get_dev (req);
 	g_assert (dev);
 
-	nm_info ("Device '%s' DHCP transaction took too long (>25s), stopping it.", nm_device_get_iface (dev));
+	nm_info ("Device '%s' DHCP transaction took too long (>%ds), stopping it.",
+		    nm_device_get_iface (dev), NM_DHCP_TIMEOUT);
 
 	if (nm_act_request_get_stage (req) == NM_ACT_STAGE_IP_CONFIG_START)
 	{
@@ -235,9 +205,8 @@ gboolean nm_dhcp_manager_begin_transaction (NMDHCPManager *manager, NMActRequest
 
 	if (!manager->running)
 	{
-		if (nm_dhcp_manager_exec_daemon (manager) == FALSE)
-			return FALSE;
-		sleep (1);
+		nm_warning ("dhcdbd not running!");
+		return FALSE;
 	}
 	else
 	{
@@ -273,8 +242,8 @@ gboolean nm_dhcp_manager_begin_transaction (NMDHCPManager *manager, NMActRequest
 		return FALSE;
 	}
 
-	/* Set up a timeout on the transaction to kill it after 25s */
-	source = g_timeout_source_new (25000);
+	/* Set up a timeout on the transaction to kill it after NM_DHCP_TIMEOUT seconds */
+	source = g_timeout_source_new (NM_DHCP_TIMEOUT * 1000);
 	g_source_set_callback (source, (GSourceFunc) nm_dhcp_manager_handle_timeout, req, NULL);
 	nm_act_request_set_dhcp_timeout (req, g_source_attach (source, manager->data->main_context));
 	g_source_unref (source);
@@ -610,10 +579,44 @@ NMIP4Config * nm_dhcp_manager_get_ip4_config (NMDHCPManager *manager, NMActReque
 		nm_info ("  nis server %s", inet_ntoa (temp_addr));
 	}
 
+	/*
+	 * Grab the MTU from the backend.  If DHCP servers can send recommended MTU's,
+	 * should set that here if the backend returns zero.
+	 */
+	nm_ip4_config_set_mtu (ip4_config, nm_system_get_mtu (dev));
+
 out:
 	return ip4_config;
 }
 
+static inline const char * state_to_string (guint state)
+{
+	switch (state)
+	{
+		case DHCDBD_PREINIT:
+			return "starting";
+		case DHCDBD_BOUND:
+			return "bound";
+		case DHCDBD_RENEW:
+			return "renew";
+		case DHCDBD_REBOOT:
+			return "reboot";
+		case DHCDBD_REBIND:
+			return "rebind";
+		case DHCDBD_TIMEOUT:
+			return "timeout";
+		case DHCDBD_FAIL:
+			return "fail";
+		case DHCDBD_START:
+			return "successfully started";
+		case DHCDBD_ABEND:
+			return "abnormal exit";
+		case DHCDBD_END:
+			return "normal exit";
+		default:
+			return "unknown";
+	}
+}
 
 /*
  * nm_dhcp_manager_process_signal
@@ -654,19 +657,23 @@ gboolean nm_dhcp_manager_process_signal (NMDHCPManager *manager, DBusMessage *me
 	dev = nm_get_device_by_iface (manager->data, member);
 	if (dev && (req = nm_device_get_act_request (dev)))
 	{
-		if (dbus_message_is_signal (message, DHCP_SERVICE_NAME".state", nm_device_get_iface (dev)))
+		const char *iface = nm_device_get_iface (dev);
+
+		if (dbus_message_is_signal (message, DHCP_SERVICE_NAME".state", iface))
 		{
 			guint8	state;
 
 			if (dbus_message_get_args (message, NULL, DBUS_TYPE_BYTE, &state, DBUS_TYPE_INVALID))
 			{
-				nm_info ("DHCP daemon state now %d for interface %s", state, nm_device_get_iface (dev));
+				const char *desc = state_to_string (state);
+
+				nm_info ("DHCP daemon state is now %d (%s) for interface %s", state, desc, iface);
 				switch (state)
 				{
-					case 2:		/* BOUND */
-					case 3:		/* RENEW */
-					case 4:		/* REBOOT */
-					case 5:		/* REBIND */
+					case DHCDBD_BOUND:		/* lease obtained */
+					case DHCDBD_RENEW:		/* lease renewed */
+					case DHCDBD_REBOOT:		/* have valid lease, but now obtained a different one */
+					case DHCDBD_REBIND:		/* new, different lease */
 						if (nm_act_request_get_stage (req) == NM_ACT_STAGE_IP_CONFIG_START)
 						{
 							nm_device_activate_schedule_stage4_ip_config_get (req);
@@ -674,7 +681,7 @@ gboolean nm_dhcp_manager_process_signal (NMDHCPManager *manager, DBusMessage *me
 						}
 						break;
 
-					case 8:		/* TIMEOUT - timed out trying to contact server */
+					case DHCDBD_TIMEOUT:		/* timed out contacting DHCP server */
 						if (nm_act_request_get_stage (req) == NM_ACT_STAGE_IP_CONFIG_START)
 						{
 							nm_device_activate_schedule_stage4_ip_config_timeout (req);
@@ -682,9 +689,9 @@ gboolean nm_dhcp_manager_process_signal (NMDHCPManager *manager, DBusMessage *me
 						}
 						break;					
 
-					case 9:		/* FAIL */
-					case 13:		/* ABEND */
-//					case 14:		/* END */
+					case DHCDBD_FAIL:		/* all attempts to contact server timed out, sleeping */
+					case DHCDBD_ABEND:		/* dhclient exited abnormally */
+//					case DHCDBD_END:		/* dhclient exited normally */
 						if (nm_act_request_get_stage (req) == NM_ACT_STAGE_IP_CONFIG_START)
 						{
 							nm_policy_schedule_activation_failed (req);
diff --git a/src/dhcp-manager/nm-dhcp-manager.h b/src/dhcp-manager/nm-dhcp-manager.h
index 7cf4a19db3..2746713bed 100644
--- a/src/dhcp-manager/nm-dhcp-manager.h
+++ b/src/dhcp-manager/nm-dhcp-manager.h
@@ -24,6 +24,31 @@
 #include "NetworkManagerMain.h"
 #include "nm-device.h"
 
+/*
+ * FIXME: These should go in a header shared by NetworkManager and dhcdbd,
+ * but right now NetworkManager and dhcdbd do not share any header.  The
+ * following is copied (and cleaned up) from dhcdbd.h.
+ */
+enum dhcdbd_state
+{
+	DHCDBD_NBI=0,		/* no broadcast interfaces found */
+	DHCDBD_PREINIT,	/* configuration started */
+	DHCDBD_BOUND,		/* lease obtained */
+	DHCDBD_RENEW,		/* lease renewed */
+	DHCDBD_REBOOT,		/* have valid lease, but now obtained a different one */
+	DHCDBD_REBIND,		/* new, different lease */
+	DHCDBD_STOP,		/* remove old lease */
+	DHCDBD_MEDIUM,		/* media selection begun */
+	DHCDBD_TIMEOUT,	/* timed out contacting DHCP server */
+	DHCDBD_FAIL,		/* all attempts to contact server timed out, sleeping */
+	DHCDBD_EXPIRE,		/* lease has expired, renewing */
+	DHCDBD_RELEASE,	/* releasing lease */
+	DHCDBD_START,		/* sent when dhclient started OK */
+	DHCDBD_ABEND,		/* dhclient exited abnormally */
+	DHCDBD_END,		/* dhclient exited normally */
+	DHCDBD_END_OPTIONS,	/* last option in subscription sent */
+};
+
 char *			get_dhcp_match_string					(const char *owner);
 
 NMDHCPManager *	nm_dhcp_manager_new						(NMData *data);
diff --git a/src/nm-ap-security-wep.c b/src/nm-ap-security-wep.c
index bfe487420d..c11953e0ad 100644
--- a/src/nm-ap-security-wep.c
+++ b/src/nm-ap-security-wep.c
@@ -39,6 +39,11 @@ struct _NMAPSecurityWEPPrivate
 	int		auth_algorithm;
 };
 
+static int get_auth_algorithm (NMAPSecurityWEP *security)
+{
+	return security->priv->auth_algorithm;
+}
+
 static void set_description (NMAPSecurityWEP *security)
 {
 	NMAPSecurity * parent = NM_AP_SECURITY (security);
@@ -121,6 +126,16 @@ real_write_supplicant_config (NMAPSecurity *instance,
 			"SET_NETWORK %i key_mgmt NONE", nwid))
 		goto out;
 
+	/*
+	 * If the user selected "Shared" (aka restricted) key, set it explicitly.  Otherwise,
+	 * let wpa_supplicant default to the right thing, which is an open key.
+	 */
+	if (get_auth_algorithm (NM_AP_SECURITY_WEP (instance)) == IW_AUTH_ALG_SHARED_KEY)
+	{
+		if (!nm_utils_supplicant_request_with_check (ctrl, "OK", __func__, msg,
+			"SET_NETWORK %i auth_alg SHARED", nwid));
+	}
+
 	msg = g_strdup_printf ("SET_NETWORK %i wep_key0 <key>", nwid);
 	if (!nm_utils_supplicant_request_with_check (ctrl, "OK", __func__, msg,
 			"SET_NETWORK %i wep_key0 %s", nwid, key))
diff --git a/src/nm-ap-security-wpa-eap.c b/src/nm-ap-security-wpa-eap.c
index 4ad74053b2..0d9603aeca 100644
--- a/src/nm-ap-security-wpa-eap.c
+++ b/src/nm-ap-security-wpa-eap.c
@@ -37,6 +37,7 @@
 struct _NMAPSecurityWPA_EAPPrivate
 {
 	int		eap_method;
+	int		key_type;
 	int		wpa_version;
 	int		key_mgmt;
 	char *	identity;
@@ -54,6 +55,7 @@ nm_ap_security_wpa_eap_new_deserialize (DBusMessageIter *iter)
 {
 	NMAPSecurityWPA_EAP *	security = NULL;
 	int					eap_method;
+	int					key_type;
 	int					wpa_version;
 	char *				identity = NULL;
 	char *				passwd = NULL;
@@ -65,9 +67,9 @@ nm_ap_security_wpa_eap_new_deserialize (DBusMessageIter *iter)
 
 	g_return_val_if_fail (iter != NULL, NULL);
 
-	if (!nmu_security_deserialize_wpa_eap (iter, &eap_method, &identity, &passwd, &anon_identity,
-								    &private_key_passwd, &private_key_file, &client_cert_file, 
-								    &ca_cert_file, &wpa_version))
+	if (!nmu_security_deserialize_wpa_eap (iter, &eap_method, &key_type, &identity, &passwd,
+								    &anon_identity, &private_key_passwd, &private_key_file,
+								    &client_cert_file, &ca_cert_file, &wpa_version))
 		goto out;
 
 	/* Success, build up our security object */
@@ -75,6 +77,7 @@ nm_ap_security_wpa_eap_new_deserialize (DBusMessageIter *iter)
 	nm_ap_security_set_we_cipher (NM_AP_SECURITY (security), NM_AUTH_TYPE_WPA_EAP);
 	nm_ap_security_set_key (NM_AP_SECURITY (security), "FIXME", 5); /* FIXME: what do we do for Enterprise? */
 	security->priv->eap_method = eap_method;
+	security->priv->key_type = key_type;
 	security->priv->wpa_version = wpa_version;
 	security->priv->key_mgmt = IW_AUTH_KEY_MGMT_802_1X;
 	security->priv->identity = g_strdup (identity);
@@ -128,15 +131,16 @@ real_serialize (NMAPSecurity *instance, DBusMessageIter *iter)
 	NMAPSecurityWPA_EAP * self = NM_AP_SECURITY_WPA_EAP (instance);
 
 	if (!nmu_security_serialize_wpa_eap (iter,
-								  self->priv->eap_method,
-								  self->priv->identity,
-								  self->priv->passwd,
-								  self->priv->anon_identity,
-								  self->priv->private_key_passwd,
-								  self->priv->private_key_file,
-								  self->priv->client_cert_file,
-								  self->priv->ca_cert_file,
-								  self->priv->wpa_version))
+			self->priv->eap_method,
+			self->priv->key_type,
+			self->priv->identity ? : "",
+			self->priv->passwd ? : "",
+			self->priv->anon_identity ? : "",
+			self->priv->private_key_passwd ? : "",
+			self->priv->private_key_file ? : "",
+			self->priv->client_cert_file ? : "",
+			self->priv->ca_cert_file ? : "",
+			self->priv->wpa_version))
 		return -1;
 	return 0;
 }
@@ -177,11 +181,11 @@ real_write_supplicant_config (NMAPSecurity *instance,
 	const char *		ca_cert_file = self->priv->ca_cert_file;
 	const char *		client_cert_file = self->priv->client_cert_file;
 	int				wpa_version = self->priv->wpa_version;
-	int				cipher = nm_ap_security_get_we_cipher (instance);
 	int 				key_mgmt = self->priv->key_mgmt;
 	int				eap_method = self->priv->eap_method;
+	int				key_type = self->priv->key_type;
 
-	g_return_val_if_fail (cipher == NM_AUTH_TYPE_WPA_EAP, FALSE);
+	g_return_val_if_fail (nm_ap_security_get_we_cipher (instance) == NM_AUTH_TYPE_WPA_EAP, FALSE);
 	g_return_val_if_fail (key_mgmt == IW_AUTH_KEY_MGMT_802_1X, FALSE);
 	g_return_val_if_fail (wpa_version == IW_AUTH_WPA_VERSION_WPA
 				    || wpa_version == IW_AUTH_WPA_VERSION_WPA2, FALSE);
@@ -192,6 +196,10 @@ real_write_supplicant_config (NMAPSecurity *instance,
 				    || eap_method == NM_EAP_METHOD_PEAP
 				    || eap_method == NM_EAP_METHOD_TLS
 				    || eap_method == NM_EAP_METHOD_TTLS, FALSE);
+	g_return_val_if_fail ((key_type == NM_AUTH_TYPE_WPA_PSK_AUTO)
+				    || (key_type == IW_AUTH_CIPHER_CCMP)
+				    || (key_type == IW_AUTH_CIPHER_TKIP)
+				    || (key_type == IW_AUTH_CIPHER_WEP104), FALSE);
 
 	/* WPA-EAP network setup */
 
@@ -206,8 +214,17 @@ real_write_supplicant_config (NMAPSecurity *instance,
 			goto out;
 	}
 
-	if (!nm_utils_supplicant_request_with_check (ctrl, "OK", __func__, NULL, "SET_NETWORK %i key_mgmt WPA-EAP", nwid))
-		goto out;
+	if (key_type != IW_AUTH_CIPHER_WEP104)
+	{
+		if (!nm_utils_supplicant_request_with_check (ctrl, "OK", __func__, NULL, "SET_NETWORK %i key_mgmt WPA-EAP", nwid))
+			goto out;
+	}
+	else
+	{
+		/* So-called Dynamic WEP */
+		if (!nm_utils_supplicant_request_with_check (ctrl, "OK", __func__, NULL, "SET_NETWORK %i key_mgmt IEEE8021X", nwid))
+			goto out;
+	}
 
 	if (!nm_utils_supplicant_request_with_check (ctrl, "OK", __func__, NULL, "SET_NETWORK %i eap %s", nwid, get_eap_method (eap_method)))
 		goto out;
@@ -217,8 +234,15 @@ real_write_supplicant_config (NMAPSecurity *instance,
 			goto out;
 
 	if (passwd && strlen (passwd) > 0)
-		if (!nm_utils_supplicant_request_with_check (ctrl, "OK", __func__, NULL, "SET_NETWORK %i password \"%s\"", nwid, passwd))
+	{
+		msg = g_strdup_printf ("SET_NETWORK %i password <password>", nwid);
+		if (!nm_utils_supplicant_request_with_check (ctrl, "OK", __func__, msg, "SET_NETWORK %i password \"%s\"", nwid, passwd))
+		{
+			g_free (msg);
 			goto out;
+		}
+		g_free (msg);
+	}
 
 	if (anon_identity && strlen (anon_identity) > 0)
 		if (!nm_utils_supplicant_request_with_check (ctrl, "OK", __func__, NULL, "SET_NETWORK %i anonymous_identity \"%s\"", nwid, anon_identity))
@@ -246,34 +270,31 @@ real_write_supplicant_config (NMAPSecurity *instance,
 		if (!nm_utils_supplicant_request_with_check (ctrl, "OK", __func__, NULL, "SET_NETWORK %i ca_cert \"%s\"", nwid, ca_cert_file))
 			goto out;
 
-#if 0	/* Right now we always let wpa_supplicant sort out the pairwise and group cipher */
 	/*
-	 * FIXME: Technically, the pairwise cipher does not need to be the same as
-	 * the group cipher.  Fixing this requires changes in the UI.
+	 * Set the pairwise and group cipher, if the user provided one.  If user selected "Automatic", we
+	 * let wpa_supplicant sort it out.  Likewise, if the user selected "Dynamic WEP", we do nothing.
 	 */
-	if (cipher == IW_AUTH_CIPHER_TKIP)
-		pairwise_cipher = group_cipher = "TKIP";
-	else if (cipher == IW_AUTH_CIPHER_CCMP)
-		pairwise_cipher = group_cipher = "CCMP";
-	else if (cipher == IW_AUTH_CIPHER_NONE)
-		pairwise_cipher = group_cipher = "NONE";
-
-	/* Ad-Hoc requires pairwise cipher of NONE */
-	if (user_created)
-		pairwise_cipher = "NONE";
-
-	/* If user selected "Automatic", we let wpa_supplicant sort it out */
-	if (cipher != NM_AUTH_TYPE_WPA_PSK_AUTO)
+	if (key_type != NM_AUTH_TYPE_WPA_PSK_AUTO && key_type != IW_AUTH_CIPHER_WEP104)
 	{
+		const char *cipher;
+
+		/*
+	 	 * FIXME: Technically, the pairwise cipher does not need to be the same as
+	 	 * the group cipher.  Fixing this requires changes in the UI.
+	 	 */
+		if (key_type == IW_AUTH_CIPHER_TKIP)
+			cipher = "TKIP";
+		else /* IW_AUTH_CIPHER_CCMP */
+			cipher = "CCMP";
+
 		if (!nm_utils_supplicant_request_with_check (ctrl, "OK", __func__, NULL,
-				"SET_NETWORK %i pairwise %s", nwid, pairwise_cipher))
+				"SET_NETWORK %i pairwise %s", nwid, cipher))
 			goto out;
 
 		if (!nm_utils_supplicant_request_with_check (ctrl, "OK", __func__, NULL,
-				"SET_NETWORK %i group %s", nwid, group_cipher))
+				"SET_NETWORK %i group %s", nwid, cipher))
 			goto out;
 	}
-#endif
 
 	success = TRUE;
 
@@ -305,6 +326,7 @@ real_copy_constructor (NMAPSecurity *instance)
 	NMAPSecurityWPA_EAP * self = NM_AP_SECURITY_WPA_EAP (instance);
 
 	dst->priv->eap_method = self->priv->eap_method;
+	dst->priv->key_type = self->priv->key_type;
 	dst->priv->wpa_version = self->priv->wpa_version;
 	dst->priv->key_mgmt = self->priv->key_mgmt;
 	dst->priv->identity = self->priv->identity;
diff --git a/src/nm-ap-security.c b/src/nm-ap-security.c
index ffeabe14ea..3809d2c897 100644
--- a/src/nm-ap-security.c
+++ b/src/nm-ap-security.c
@@ -45,7 +45,7 @@ struct _NMAPSecurityPrivate
 	gboolean	dispose_has_run;
 };
 
-static NMAPSecurity *
+NMAPSecurity *
 nm_ap_security_new (int we_cipher)
 {
 	NMAPSecurity * security;
@@ -125,15 +125,15 @@ nm_ap_security_new_from_ap (NMAccessPoint *ap)
 
 	/* Deteremine best encryption algorithm to use */
 	caps = nm_ap_get_capabilities (ap);
-	if ((caps & WPA_CCMP_PSK) || (caps & WPA2_CCMP_PSK))
+	if (((caps & WPA_CCMP_PSK) == WPA_CCMP_PSK) || ((caps & WPA2_CCMP_PSK) == WPA2_CCMP_PSK))
 		security = NM_AP_SECURITY (nm_ap_security_wpa_psk_new_from_ap (ap, IW_AUTH_CIPHER_CCMP));
-	else if ((caps & WPA_TKIP_PSK) || (caps & WPA2_TKIP_PSK))
+	else if (((caps & WPA_TKIP_PSK) == WPA_TKIP_PSK) || ((caps & WPA2_TKIP_PSK) == WPA2_TKIP_PSK))
 		security = NM_AP_SECURITY (nm_ap_security_wpa_psk_new_from_ap (ap, IW_AUTH_CIPHER_TKIP));
-	else if ((caps & WPA_EAP) || (caps & WPA2_EAP))
+	else if (((caps & WPA_EAP) == WPA_EAP) || ((caps & WPA2_EAP) == WPA2_EAP))
 		security = NM_AP_SECURITY (nm_ap_security_wpa_eap_new_from_ap (ap));
-	else if (caps & WEP_WEP104)
+	else if ((caps & WEP_WEP104) == WEP_WEP104)
 		security = NM_AP_SECURITY (nm_ap_security_wep_new_from_ap (ap, IW_AUTH_CIPHER_WEP104));
-	else if (caps & WEP_WEP40)
+	else if ((caps & WEP_WEP40) == WEP_WEP40)
 		security = NM_AP_SECURITY (nm_ap_security_wep_new_from_ap (ap, IW_AUTH_CIPHER_WEP40));
 	else if (!nm_ap_get_encrypted (ap))
 		security = nm_ap_security_new (IW_AUTH_CIPHER_NONE);
diff --git a/src/nm-ap-security.h b/src/nm-ap-security.h
index a2344b74ee..7d5f0f9c07 100644
--- a/src/nm-ap-security.h
+++ b/src/nm-ap-security.h
@@ -77,6 +77,8 @@ GType nm_ap_security_get_type (void);
 
 NMAPSecurity *	nm_ap_security_new_copy (NMAPSecurity *self);
 
+NMAPSecurity * nm_ap_security_new (int we_cipher);
+
 NMAPSecurity *	nm_ap_security_new_deserialize (DBusMessageIter *iter);
 
 NMAPSecurity *	nm_ap_security_new_from_ap (struct NMAccessPoint *ap);
diff --git a/src/nm-dbus-net.c b/src/nm-dbus-net.c
index 6795365812..4c01f2eca4 100644
--- a/src/nm-dbus-net.c
+++ b/src/nm-dbus-net.c
@@ -281,7 +281,6 @@ NMDbusMethodList *nm_dbus_net_methods_setup (void)
 	NMDbusMethodList	*list = nm_dbus_method_list_new (nm_dbus_net_validate);
 
 	nm_dbus_method_list_add_method (list, "getProperties",		nm_dbus_net_get_properties);
-
 	nm_dbus_method_list_add_method (list, "getName",			nm_dbus_net_get_name);
 	nm_dbus_method_list_add_method (list, "getAddress",		nm_dbus_net_get_address);
 	nm_dbus_method_list_add_method (list, "getStrength",		nm_dbus_net_get_strength);
diff --git a/src/nm-dbus-nm.c b/src/nm-dbus-nm.c
index ce6c4aaa0f..89af143c1b 100644
--- a/src/nm-dbus-nm.c
+++ b/src/nm-dbus-nm.c
@@ -170,6 +170,8 @@ static DBusMessage *nm_dbus_nm_activate_dialup (DBusConnection *connection, DBus
 	if (!nm_system_activate_dialup (nm_data->dialup_list, dialup))
 		reply = nm_dbus_create_error_message (message, NM_DBUS_INTERFACE, "ActivationFailed",
 									   "Failed to activate the dialup device.");
+	else
+		nm_data->modem_active = TRUE;
 	nm_unlock_mutex (nm_data->dialup_list_mutex, __FUNCTION__);
 
 out:
@@ -203,6 +205,8 @@ static DBusMessage *nm_dbus_nm_deactivate_dialup (DBusConnection *connection, DB
 	if (!nm_system_deactivate_dialup (nm_data->dialup_list, dialup))
 		reply = nm_dbus_create_error_message (message, NM_DBUS_INTERFACE, "DeactivationFailed",
 									   "Failed to deactivate the dialup device.");
+	else
+		nm_data->modem_active = FALSE;
 	nm_unlock_mutex (nm_data->dialup_list_mutex, __FUNCTION__);
 
 out:
@@ -224,7 +228,6 @@ static DBusMessage *nm_dbus_nm_set_active_device (DBusConnection *connection, DB
 	NMDevice *		dev = NULL;
 	DBusMessage *		reply = NULL;
 	char *			dev_path;
-	char *			unescaped_dev_path = NULL;
 	NMAccessPoint *	ap = NULL;
 	DBusMessageIter	iter;
 
@@ -243,9 +246,7 @@ static DBusMessage *nm_dbus_nm_set_active_device (DBusConnection *connection, DB
 	}
 
 	dbus_message_iter_get_basic (&iter, &dev_path);
-	unescaped_dev_path = nm_dbus_unescape_object_path (dev_path);
-	dev = nm_dbus_get_device_from_object_path (data->data, unescaped_dev_path);
-	g_free (unescaped_dev_path);
+	dev = nm_dbus_get_device_from_escaped_object_path (data->data, dev_path);
 
 	/* Ensure the device exists in our list and is supported */
 	if (!dev || !(nm_device_get_capabilities (dev) & NM_DEVICE_CAP_NM_SUPPORTED))
@@ -328,7 +329,6 @@ static DBusMessage *nm_dbus_nm_create_wireless_network (DBusConnection *connecti
 	NMDevice *		dev = NULL;
 	DBusMessage *		reply = NULL;
 	char *			dev_path = NULL;
-	char *			unescaped_dev_path = NULL;
 	NMAccessPoint *	new_ap = NULL;
 	NMAPSecurity * 	security = NULL;
 	char *			essid = NULL;
@@ -348,9 +348,7 @@ static DBusMessage *nm_dbus_nm_create_wireless_network (DBusConnection *connecti
 	}
 
 	dbus_message_iter_get_basic (&iter, &dev_path);
-	unescaped_dev_path = nm_dbus_unescape_object_path (dev_path);
-	dev = nm_dbus_get_device_from_object_path (data->data, unescaped_dev_path);
-	g_free (unescaped_dev_path);
+	dev = nm_dbus_get_device_from_escaped_object_path (data->data, dev_path);
 
 	/* Ensure the device exists in our list and is supported */
 	if (!dev || !(nm_device_get_capabilities (dev) & NM_DEVICE_CAP_NM_SUPPORTED))
@@ -448,9 +446,7 @@ static DBusMessage *nm_dbus_nm_remove_test_device (DBusConnection *connection, D
 	{
 		NMDevice	*dev;
 
-		dev_path = nm_dbus_unescape_object_path (dev_path);
-
-		if ((dev = nm_dbus_get_device_from_object_path (data->data, dev_path)))
+		if ((dev = nm_dbus_get_device_from_escaped_object_path (data->data, dev_path)))
 		{
 			if (nm_device_is_test_device (dev))
 				nm_remove_device (data->data, dev);
@@ -463,8 +459,6 @@ static DBusMessage *nm_dbus_nm_remove_test_device (DBusConnection *connection, D
 			reply = nm_dbus_create_error_message (message, NM_DBUS_INTERFACE, "DeviceNotFound",
 							"The requested network device does not exist.");
 		}
-
-		g_free (dev_path);
 	}
 	else
 	{
@@ -560,6 +554,7 @@ static DBusMessage *nm_dbus_nm_sleep (DBusConnection *connection, DBusMessage *m
 
 		nm_lock_mutex (app_data->dialup_list_mutex, __FUNCTION__);
 		nm_system_deactivate_all_dialup (app_data->dialup_list);
+		app_data->modem_active = FALSE;
 		nm_unlock_mutex (app_data->dialup_list_mutex, __FUNCTION__);
 	}
 
diff --git a/src/nm-dbus-nmi.c b/src/nm-dbus-nmi.c
index 38bc71ed91..6be71ecc8d 100644
--- a/src/nm-dbus-nmi.c
+++ b/src/nm-dbus-nmi.c
@@ -214,7 +214,6 @@ void nm_dbus_cancel_get_user_key_for_network (DBusConnection *connection, NMActR
 }
 
 
-
 /*
  * nm_dbus_update_network_info
  *
@@ -346,7 +345,6 @@ static void nm_dbus_get_network_data_cb (DBusPendingCall *pcall, void *user_data
 	NMAPSecurity *			security;
 	NMAccessPoint *		ap;
 	NMAccessPoint *		list_ap;
-	GTimeVal *			timestamp;
 
 	g_return_if_fail (pcall != NULL);
 	g_return_if_fail (cb_data != NULL);
@@ -381,8 +379,7 @@ static void nm_dbus_get_network_data_cb (DBusPendingCall *pcall, void *user_data
 	/* First arg: ESSID (STRING) */
 	if (dbus_message_iter_get_arg_type (&iter) != DBUS_TYPE_STRING)
 	{
-		nm_warning ("%s:%d (%s): a message argument (essid) was invalid.",
-				__FILE__, __LINE__, __func__);
+		nm_warning ("a message argument (essid) was invalid.");
 		goto out;
 	}
 	dbus_message_iter_get_basic (&iter, &essid);
@@ -391,18 +388,16 @@ static void nm_dbus_get_network_data_cb (DBusPendingCall *pcall, void *user_data
 	if (!dbus_message_iter_next (&iter)
 			|| (dbus_message_iter_get_arg_type (&iter) != DBUS_TYPE_INT32))
 	{
-		nm_warning ("%s:%d (%s): a message argument (timestamp) was invalid.",
-				__FILE__, __LINE__, __func__);
+		nm_warning ("a message argument (timestamp) was invalid.");
 		goto out;
 	}
 	dbus_message_iter_get_basic (&iter, &timestamp_secs);
-	
-	/* Third arg: trusted (BOOLEAN) */
+
+	/* Third arg: Trusted (BOOLEAN) */
 	if (!dbus_message_iter_next (&iter)
 			|| (dbus_message_iter_get_arg_type (&iter) != DBUS_TYPE_BOOLEAN))
 	{
-		nm_warning ("%s:%d (%s): a message argument (trusted) was invalid.",
-				__FILE__, __LINE__, __func__);
+		nm_warning ("a message argument (trusted) was invalid.");
 		goto out;
 	}
 	dbus_message_iter_get_basic (&iter, &trusted);
@@ -412,8 +407,7 @@ static void nm_dbus_get_network_data_cb (DBusPendingCall *pcall, void *user_data
 			|| (dbus_message_iter_get_arg_type (&iter) != DBUS_TYPE_ARRAY)
 			|| (dbus_message_iter_get_element_type (&iter) != DBUS_TYPE_STRING))
 	{
-		nm_warning ("%s:%d (%s): a message argument (addresses) was invalid.",
-				__FILE__, __LINE__, __func__);
+		nm_warning ("a message argument (addresses) was invalid.");
 		goto out;
 	}
 	dbus_message_iter_recurse (&iter, &subiter);
@@ -429,16 +423,15 @@ static void nm_dbus_get_network_data_cb (DBusPendingCall *pcall, void *user_data
 	/* Unserialize access point security info */
 	if (!dbus_message_iter_has_next (&iter))
 	{
-		nm_warning ("%s:%d (%s): a message argument (security info) was invalid.",
-				__FILE__, __LINE__, __func__);
+		nm_warning ("a message argument (security info) was invalid.");
 		goto out;
 	}
 	dbus_message_iter_next (&iter);
 
 	if (!(security = nm_ap_security_new_deserialize (&iter)))
 	{
-		nm_warning ("%s:%d (%s): message arguments were invalid (could not deserialize "
-				"wireless network security information.", __FILE__, __LINE__, __func__);
+		nm_warning ("message arguments were invalid (could not deserialize "
+				"wireless network security information.");
 		goto out;
 	}
 
@@ -448,11 +441,7 @@ static void nm_dbus_get_network_data_cb (DBusPendingCall *pcall, void *user_data
 	nm_ap_set_security (ap, security);
 	g_object_unref (G_OBJECT (security));	/* set_security copies the object */
 
-	timestamp = g_malloc0 (sizeof (GTimeVal));
-	timestamp->tv_sec = timestamp_secs;
-	timestamp->tv_usec = 0;
-	nm_ap_set_timestamp (ap, timestamp);
-	g_free (timestamp);
+	nm_ap_set_timestamp (ap, timestamp_secs, 0);
 
 	nm_ap_set_trusted (ap, trusted);
 	nm_ap_set_user_addresses (ap, addr_list);
@@ -460,7 +449,7 @@ static void nm_dbus_get_network_data_cb (DBusPendingCall *pcall, void *user_data
 	if ((list_ap = nm_ap_list_get_ap_by_essid (cb_data->list, essid)))
 	{
 		nm_ap_set_essid (list_ap, nm_ap_get_essid (ap));
-		nm_ap_set_timestamp (list_ap, nm_ap_get_timestamp (ap));
+		nm_ap_set_timestamp_via_timestamp (list_ap, nm_ap_get_timestamp (ap));
 		nm_ap_set_trusted (list_ap, nm_ap_get_trusted (ap));
 		nm_ap_set_security (list_ap, nm_ap_get_security (ap));
 		nm_ap_set_user_addresses (list_ap, nm_ap_get_user_addresses (ap));
@@ -505,15 +494,13 @@ static void nm_dbus_get_networks_cb (DBusPendingCall *pcall, void *user_data)
 
 	if (!dbus_pending_call_get_completed (pcall))
 	{
-		nm_warning ("%s:%d (%s): pending call was not completed.",
-				__FILE__, __LINE__, __func__);
+		nm_warning ("pending call was not completed.");
 		goto out;
 	}
 
 	if (!(reply = dbus_pending_call_steal_reply (pcall)))
 	{
-		nm_warning ("%s:%d (%s): could not retrieve the reply.",
-				__FILE__, __LINE__, __func__);
+		nm_warning ("could not retrieve the reply.");
 		goto out;
 	}
 
@@ -523,8 +510,7 @@ static void nm_dbus_get_networks_cb (DBusPendingCall *pcall, void *user_data)
 
 		dbus_error_init (&err);
 		dbus_set_error_from_message (&err, reply);
-		nm_warning ("%s:%d (%s): error received: %s - %s.",
-				__FILE__, __LINE__, __func__, err.name, err.message);
+		nm_warning ("error received: %s - %s.", err.name, err.message);
 		goto out;
 	}
 
diff --git a/src/nm-device-802-11-wireless.c b/src/nm-device-802-11-wireless.c
index 228a139efc..62d35bf162 100644
--- a/src/nm-device-802-11-wireless.c
+++ b/src/nm-device-802-11-wireless.c
@@ -61,6 +61,7 @@ struct _Supplicant
 struct _NMDevice80211WirelessPrivate
 {
 	gboolean	dispose_has_run;
+	gboolean	is_initialized;
 
 	struct ether_addr	hw_addr;
 
@@ -134,6 +135,140 @@ static void		nm_device_802_11_wireless_set_wep_enc_key (NMDevice80211Wireless *s
                                            const char *key,
                                            int auth_method);
 
+
+/*
+ * nm_device_802_11_wireless_update_bssid
+ *
+ * Update the current wireless network's BSSID, presumably in response to
+ * roaming.
+ *
+ */
+static void
+nm_device_802_11_wireless_update_bssid (NMDevice80211Wireless *self)
+{
+	NMAccessPoint *		ap;
+	NMActRequest *			req;
+	struct ether_addr		new_bssid;
+	const struct ether_addr	*old_bssid;
+
+	g_return_if_fail (self != NULL);
+
+	/* Grab the scan lock since the current AP is meaningless during a scan. */
+	if (!nm_try_acquire_mutex (self->priv->scan_mutex, __FUNCTION__))
+		return;
+
+	/* If we aren't the active device with an active AP, there is no meaningful BSSID value */
+	req = nm_device_get_act_request (NM_DEVICE (self));
+	if (!req)
+		goto out;
+
+	ap = nm_act_request_get_ap (req);
+	if (!ap)
+		goto out;
+
+	/* Get the current BSSID.  If it is valid but does not match the stored value, update it. */
+	nm_device_802_11_wireless_get_bssid (self, &new_bssid);
+	old_bssid = nm_ap_get_address (ap);
+	if (nm_ethernet_address_is_valid (&new_bssid) && !nm_ethernet_addresses_are_equal (&new_bssid, old_bssid))
+	{
+		NMData *	app_data;
+		gboolean	automatic;
+		gchar	new_addr[20];
+		gchar	old_addr[20];
+
+		memset (new_addr, '\0', sizeof (new_addr));
+		memset (old_addr, '\0', sizeof (old_addr));
+		iw_ether_ntop (&new_bssid, new_addr);
+		iw_ether_ntop (old_bssid, old_addr);
+		nm_debug ("Roamed from BSSID %s to %s on wireless network '%s'", old_addr, new_addr, nm_ap_get_essid (ap));
+
+		nm_ap_set_address (ap, &new_bssid);
+
+		automatic = !nm_act_request_get_user_requested (req);
+		app_data = nm_device_get_app_data (NM_DEVICE (self));
+		g_assert (app_data);
+		nm_dbus_update_network_info (app_data->dbus_connection, ap, automatic);
+	}
+
+out:
+	nm_unlock_mutex (self->priv->scan_mutex, __func__);
+}
+
+
+/*
+ * nm_device_802_11_wireless_update_signal_strength
+ *
+ * Update the device's idea of the strength of its connection to the
+ * current access point.
+ *
+ */
+static void
+nm_device_802_11_wireless_update_signal_strength (NMDevice80211Wireless *self)
+{
+	NMData *		app_data;
+	gboolean		has_range = FALSE;
+	NMSock *		sk;
+	iwrange		range;
+	iwstats		stats;
+	int			percent = -1;
+
+	g_return_if_fail (self != NULL);
+
+	app_data = nm_device_get_app_data (NM_DEVICE (self));
+	g_assert (app_data);
+
+	/* Grab the scan lock since our strength is meaningless during a scan. */
+	if (!nm_try_acquire_mutex (self->priv->scan_mutex, __FUNCTION__))
+		return;
+
+	/* If we aren't the active device, we don't really have a signal strength
+	 * that would mean anything.
+	 */
+	if (!nm_device_get_act_request (NM_DEVICE (self)))
+	{
+		self->priv->strength = -1;
+		goto out;
+	}
+
+	if ((sk = nm_dev_sock_open (NM_DEVICE (self), DEV_WIRELESS, __FUNCTION__, NULL)))
+	{
+		const char *iface = nm_device_get_iface (NM_DEVICE (self));
+
+		memset (&range, 0, sizeof (iwrange));
+		memset (&stats, 0, sizeof (iwstats));
+#ifdef IOCTL_DEBUG
+		nm_info ("%s: About to GET 'iwrange'.", iface);
+#endif
+		has_range = (iw_get_range_info (nm_dev_sock_get_fd (sk), iface, &range) >= 0);
+#ifdef IOCTL_DEBUG
+		nm_info ("%s: About to GET 'iwstats'.", iface);
+#endif
+		if (iw_get_stats (nm_dev_sock_get_fd (sk), iface, &stats, &range, has_range) == 0)
+		{
+			percent = wireless_qual_to_percent (&stats.qual, (const iwqual *)(&self->priv->max_qual),
+					(const iwqual *)(&self->priv->avg_qual));
+		}
+		nm_dev_sock_close (sk);
+	}
+
+	/* Try to smooth out the strength.  Atmel cards, for example, will give no strength
+	 * one second and normal strength the next.
+	 */
+	if ((percent == -1) && (++self->priv->invalid_strength_counter <= 3))
+		percent = self->priv->strength;
+	else
+		self->priv->invalid_strength_counter = 0;
+
+	if (percent != self->priv->strength)
+		nm_dbus_signal_device_strength_change (app_data->dbus_connection, self, percent);
+
+	self->priv->strength = percent;
+
+out:
+	nm_unlock_mutex (self->priv->scan_mutex, __func__);
+}
+
+
 static guint nm_wireless_scan_interval_to_seconds (NMWirelessScanInterval interval)
 {
 	guint seconds;
@@ -242,6 +377,7 @@ nm_device_802_11_wireless_init (NMDevice80211Wireless * self)
 {
 	self->priv = NM_DEVICE_802_11_WIRELESS_GET_PRIVATE (self);
 	self->priv->dispose_has_run = FALSE;
+	self->priv->is_initialized = FALSE;
 
 	memset (&(self->priv->hw_addr), 0, sizeof (struct ether_addr));
 	self->priv->supplicant.pid = -1;
@@ -255,6 +391,7 @@ real_init (NMDevice *dev)
 	guint32				caps;
 	NMSock *				sk;
 
+	self->priv->is_initialized = TRUE;
 	self->priv->scan_mutex = g_mutex_new ();
 	nm_register_mutex_desc (self->priv->scan_mutex, "Scan Mutex");
 
@@ -336,6 +473,7 @@ nm_device_802_11_periodic_update (gpointer data)
 	g_return_val_if_fail (self != NULL, TRUE);
 
 	nm_device_802_11_wireless_update_signal_strength (self);
+	nm_device_802_11_wireless_update_bssid (self);
 
 	return TRUE;
 }
@@ -573,7 +711,7 @@ nm_device_802_11_wireless_get_best_ap (NMDevice80211Wireless *self)
 			else if (link_to_specific_ap (self, cur_ap, TRUE))
 				keep = TRUE;
 
-			/* Only keep if its not in the invalid list and its _is_ in our scaned list */
+			/* Only keep if its not in the invalid list and it _is_ in our scanned list */
 			if ( keep
 				&& !nm_ap_list_get_ap_by_essid (app_data->invalid_ap_list, essid)
 				&& nm_device_802_11_wireless_ap_list_get_ap_by_essid (self, essid))
@@ -1119,80 +1257,6 @@ max_qual->updated);
 
 
 /*
- * nm_device_802_11_wireless_update_signal_strength
- *
- * Update the device's idea of the strength of its connection to the
- * current access point.
- *
- */
-void
-nm_device_802_11_wireless_update_signal_strength (NMDevice80211Wireless *self)
-{
-	NMData *		app_data;
-	gboolean		has_range = FALSE;
-	NMSock *		sk;
-	iwrange		range;
-	iwstats		stats;
-	int			percent = -1;
-
-	g_return_if_fail (self != NULL);
-
-	app_data = nm_device_get_app_data (NM_DEVICE (self));
-	g_assert (app_data);
-
-	/* Grab the scan lock since our strength is meaningless during a scan. */
-	if (!nm_try_acquire_mutex (self->priv->scan_mutex, __FUNCTION__))
-		return;
-
-	/* If we aren't the active device, we don't really have a signal strength
-	 * that would mean anything.
-	 */
-	if (!nm_device_get_act_request (NM_DEVICE (self)))
-	{
-		self->priv->strength = -1;
-		goto out;
-	}
-
-	if ((sk = nm_dev_sock_open (NM_DEVICE (self), DEV_WIRELESS, __FUNCTION__, NULL)))
-	{
-		const char *iface = nm_device_get_iface (NM_DEVICE (self));
-
-		memset (&range, 0, sizeof (iwrange));
-		memset (&stats, 0, sizeof (iwstats));
-#ifdef IOCTL_DEBUG
-	nm_info ("%s: About to GET 'iwrange'.", iface);
-#endif
-		has_range = (iw_get_range_info (nm_dev_sock_get_fd (sk), iface, &range) >= 0);
-#ifdef IOCTL_DEBUG
-	nm_info ("%s: About to GET 'iwstats'.", iface);
-#endif
-		if (iw_get_stats (nm_dev_sock_get_fd (sk), iface, &stats, &range, has_range) == 0)
-		{
-			percent = wireless_qual_to_percent (&stats.qual, (const iwqual *)(&self->priv->max_qual),
-					(const iwqual *)(&self->priv->avg_qual));
-		}
-		nm_dev_sock_close (sk);
-	}
-
-	/* Try to smooth out the strength.  Atmel cards, for example, will give no strength
-	 * one second and normal strength the next.
-	 */
-	if ((percent == -1) && (++self->priv->invalid_strength_counter <= 3))
-		percent = self->priv->strength;
-	else
-		self->priv->invalid_strength_counter = 0;
-
-	if (percent != self->priv->strength)
-		nm_dbus_signal_device_strength_change (app_data->dbus_connection, self, percent);
-
-	self->priv->strength = percent;
-
-out:
-	nm_unlock_mutex (self->priv->scan_mutex, __func__);
-}
-
-
-/*
  * nm_device_get_essid
  *
  * If a device is wireless, return the essid that it is attempting
@@ -1270,7 +1334,7 @@ nm_device_802_11_wireless_set_essid (NMDevice80211Wireless *self,
 		wreq.u.essid.pointer = (caddr_t) safe_essid;
 		wreq.u.essid.length	 = strlen ((char *) safe_essid) + 1;
 		wreq.u.essid.flags	 = 1;	/* Enable essid on card */
-	
+
 #ifdef IOCTL_DEBUG
 	nm_info ("%s: About to SET IWESSID.", iface);
 #endif
@@ -1512,7 +1576,7 @@ nm_device_802_11_wireless_get_bssid (NMDevice80211Wireless *self,
 	if ((sk = nm_dev_sock_open (NM_DEVICE (self), DEV_WIRELESS, __FUNCTION__, NULL)))
 	{
 #ifdef IOCTL_DEBUG
-	nm_info ("%s: About to GET IWAP.", iface);
+		nm_info ("%s: About to GET IWAP.", iface);
 #endif
 		if (iw_get_ext (nm_dev_sock_get_fd (sk), iface, SIOCGIWAP, &wrq) >= 0)
 			memcpy (bssid, &(wrq.u.ap_addr.sa_data), sizeof (struct ether_addr));
@@ -1872,7 +1936,7 @@ nm_device_802_11_wireless_scan (gpointer user_data)
 					scan_results->results_len = results_len;
 				}
 				else
-					nm_warning ("get_scan_results() on device %s returned an error.", iface);
+					nm_warning ("device %s returned an error.", iface);
 			}
 
 			nm_device_802_11_wireless_set_mode (self, orig_mode);
@@ -2192,6 +2256,12 @@ supplicant_status_cb (GIOChannel *source,
 
 	g_assert (self);
 
+	/* Do nothing if we're supposed to be canceling activation.
+	 * We'll get cleaned up by the cancellation handlers later.
+	 */
+	if (nm_device_activation_should_cancel (dev))
+		return TRUE;
+
 	ctrl = self->priv->supplicant.ctrl;
 	g_return_val_if_fail (ctrl != NULL, FALSE);
 
@@ -2394,7 +2464,7 @@ supplicant_exec (NMDevice80211Wireless *self)
 		g_source_attach (self->priv->supplicant.stdout, nm_device_get_main_context (NM_DEVICE (self)));
 		g_io_channel_unref (channel);
 
-		/* Crackrock delay so we don't try to talk to wpa_supplicant to early */
+		/* Crackrock delay so we don't try to talk to wpa_supplicant too early */
 		/* FIXME: poll the global control socket instead of just sleeping */
 		g_usleep (G_USEC_PER_SEC);
 
@@ -2460,8 +2530,10 @@ supplicant_send_network_config (NMDevice80211Wireless *self,
 	const char *		essid;
 	struct wpa_ctrl *	ctrl;
 	gboolean			user_created;
-	char *			hex_essid;
-	char *			ap_scan = "AP_SCAN 1";
+	const char *		hex_essid;
+	const char *		ap_scan = "AP_SCAN 1";
+	guint32			caps;
+	gboolean			supports_wpa;
 
 	g_return_val_if_fail (self != NULL, FALSE);
 	g_return_val_if_fail (req != NULL, FALSE);
@@ -2472,14 +2544,24 @@ supplicant_send_network_config (NMDevice80211Wireless *self,
 	ctrl = self->priv->supplicant.ctrl;
 	g_assert (ctrl);
 
-	/* Ad-Hoc and non-broadcasting networks need AP_SCAN 2 */
+	/* Assume that drivers that don't support WPA pretty much suck,
+	 * and can't handle NM scanning along with wpa_supplicant.  Which
+	 * is the case for most of them, airo in particular.
+	 */
+	caps = nm_device_get_type_capabilities (NM_DEVICE (self));
+	supports_wpa = (caps & NM_802_11_CAP_PROTO_WPA)
+				|| (caps & NM_802_11_CAP_PROTO_WPA2);
+
+	/* Use "AP_SCAN 2" if:
+	 * - The wireless network is non-broadcast or user created
+	 * - The wireless driver does not support WPA
+	 */
 	user_created = nm_ap_get_user_created (ap);
-	if (!nm_ap_get_broadcast (ap) || user_created)
+	if (!nm_ap_get_broadcast (ap) || user_created || !supports_wpa)
 		ap_scan = "AP_SCAN 2";
 
 	/* Tell wpa_supplicant that we'll do the scanning */
-	if (!nm_utils_supplicant_request_with_check (ctrl, "OK", __func__, NULL,
-			ap_scan))
+	if (!nm_utils_supplicant_request_with_check (ctrl, "OK", __func__, NULL, ap_scan))
 		goto out;
 
 	/* Standard network setup info */
@@ -2734,16 +2816,22 @@ real_act_stage4_ip_config_timeout (NMDevice *dev,
 		nm_dbus_get_user_key_for_network (data->dbus_connection, req, TRUE);
 		ret = NM_ACT_STAGE_RETURN_POSTPONE;
 	}
-	else
+	else if (nm_ap_get_mode (ap) == IW_MODE_ADHOC)
 	{
 		NMDevice80211WirelessClass *	klass;
 		NMDeviceClass * parent_class;
 
-		/* Chain up to parent */
+		/* For Ad-Hoc networks, chain up to parent to get a Zeroconf IP */
 		klass = NM_DEVICE_802_11_WIRELESS_GET_CLASS (self);
 		parent_class = NM_DEVICE_CLASS (g_type_class_peek_parent (klass));
 		ret = parent_class->act_stage4_ip_config_timeout (dev, req, &real_config);
 	}
+	else
+	{
+		/* Non-encrypted network and IP configure failed.  Alert the user. */
+		ret = NM_ACT_STAGE_RETURN_FAILURE;
+	}
+
 	*config = real_config;
 
 	return ret;
@@ -2820,6 +2908,27 @@ real_activation_failure_handler (NMDevice *dev,
 			ap ? nm_ap_get_essid (ap) : "(none)");
 }
 
+static void
+real_activation_cancel_handler (NMDevice *dev,
+                                NMActRequest *req)
+{
+	NMDevice80211Wireless *		self = NM_DEVICE_802_11_WIRELESS (dev);
+	NMDevice80211WirelessClass *	klass;
+	NMDeviceClass * 			parent_class;
+
+	/* Chain up to parent first */
+	klass = NM_DEVICE_802_11_WIRELESS_GET_CLASS (self);
+	parent_class = NM_DEVICE_CLASS (g_type_class_peek_parent (klass));
+	parent_class->activation_cancel_handler (dev, req);
+
+	if (nm_act_request_get_stage (req) == NM_ACT_STAGE_NEED_USER_KEY)
+	{
+		NMData *data = nm_device_get_app_data (dev);
+		nm_dbus_cancel_get_user_key_for_network (data->dbus_connection, req);
+	}
+}
+
+
 static gboolean
 real_can_interrupt_activation (NMDevice *dev)
 {
@@ -2851,24 +2960,20 @@ nm_device_802_11_wireless_dispose (GObject *object)
 	NMDevice80211WirelessClass *	klass = NM_DEVICE_802_11_WIRELESS_GET_CLASS (object);
 	NMDeviceClass *			parent_class;
 
+	/* Make sure dispose does not run twice. */
 	if (self->priv->dispose_has_run)
-		/* If dispose did already run, return. */
 		return;
 
-	/* Make sure dispose does not run twice. */
 	self->priv->dispose_has_run = TRUE;
 
-	/* 
-	 * In dispose, you are supposed to free all types referenced from this
-	 * object which might themselves hold a reference to self. Generally,
-	 * the most simple solution is to unref all members on which you own a 
-	 * reference.
-	 */
-
-	nm_device_802_11_wireless_ap_list_clear (self);
-	if (self->priv->ap_list)
-		nm_ap_list_unref (self->priv->ap_list);
-	g_mutex_free (self->priv->scan_mutex);
+	/* Only do this part of the cleanup if the object is initialized */
+	if (self->priv->is_initialized)
+	{
+		nm_device_802_11_wireless_ap_list_clear (self);
+		if (self->priv->ap_list)
+			nm_ap_list_unref (self->priv->ap_list);
+		g_mutex_free (self->priv->scan_mutex);
+	}
 
 	/* Chain up to the parent class */
 	parent_class = NM_DEVICE_CLASS (g_type_class_peek_parent (klass));
@@ -2912,6 +3017,7 @@ nm_device_802_11_wireless_class_init (NMDevice80211WirelessClass *klass)
 
 	parent_class->activation_failure_handler = real_activation_failure_handler;
 	parent_class->activation_success_handler = real_activation_success_handler;
+	parent_class->activation_cancel_handler = real_activation_cancel_handler;
 
 	g_type_class_add_private (object_class, sizeof (NMDevice80211WirelessPrivate));
 }
@@ -3046,7 +3152,7 @@ get_scan_results (NMDevice80211Wireless *dev,
 		{
 			if (tries > 20 * SCAN_SLEEP_CENTISECONDS)
 			{
-				nm_warning ("get_scan_results(): card took too much time scanning.  Get a better one.");
+				nm_warning ("card took too much time scanning.  Get a better one.");
 				break;
 			}
 
@@ -3060,7 +3166,7 @@ get_scan_results (NMDevice80211Wireless *dev,
 		}
 		else		/* Random errors */
 		{
-			nm_warning ("get_scan_results(): unknown error, or the card returned too much scan info: %s",
+			nm_warning ("unknown error, or the card returned too much scan info: %s",
 					  strerror (errno));
 			break;
 		}
@@ -3075,7 +3181,6 @@ add_new_ap_to_device_list (NMDevice80211Wireless *dev,
                            NMAccessPoint *ap)
 {
 	GTimeVal cur_time;
-	NMData *	app_data;
 	NMAccessPointList *	ap_list;
 
 	g_return_if_fail (dev != NULL);
@@ -3087,11 +3192,13 @@ add_new_ap_to_device_list (NMDevice80211Wireless *dev,
 	/* If the AP is not broadcasting its ESSID, try to fill it in here from our
 	 * allowed list where we cache known MAC->ESSID associations.
 	 */
-	app_data = nm_device_get_app_data (NM_DEVICE (dev));
 	if (!nm_ap_get_essid (ap))
 	{
+		NMData *	app_data;
+
 		nm_ap_set_broadcast (ap, FALSE);
-		nm_ap_list_copy_one_essid_by_address (ap, app_data->allowed_ap_list);
+		app_data = nm_device_get_app_data (NM_DEVICE (dev));
+		nm_ap_list_copy_one_essid_by_address (app_data, dev, ap, app_data->allowed_ap_list);
 	}
 
 	/* Add the AP to the device's AP list */
diff --git a/src/nm-device-802-11-wireless.h b/src/nm-device-802-11-wireless.h
index d5d32f5f18..d3c70e5170 100644
--- a/src/nm-device-802-11-wireless.h
+++ b/src/nm-device-802-11-wireless.h
@@ -65,8 +65,6 @@ struct _NMDevice80211WirelessClass
 
 GType nm_device_802_11_wireless_get_type (void);
 
-NMDevice80211Wireless *	nm_device_802_11_wireless_new (void);
-
 
 static inline gboolean nm_device_is_802_11_wireless (NMDevice *dev);
 static inline gboolean nm_device_is_802_11_wireless (NMDevice *dev)
@@ -122,8 +120,6 @@ int		nm_device_802_11_wireless_get_mode (NMDevice80211Wireless *self);
 
 gint8	nm_device_802_11_wireless_get_signal_strength (NMDevice80211Wireless *self);
 
-void		nm_device_802_11_wireless_update_signal_strength (NMDevice80211Wireless *self);
-
 
 G_END_DECLS
 
diff --git a/src/nm-device-802-3-ethernet.c b/src/nm-device-802-3-ethernet.c
index 3355646584..130a9a8371 100644
--- a/src/nm-device-802-3-ethernet.c
+++ b/src/nm-device-802-3-ethernet.c
@@ -207,25 +207,11 @@ real_get_generic_capabilities (NMDevice *dev)
 	if (supports_ethtool_carrier_detect (self) || supports_mii_carrier_detect (self))
 		caps |= NM_DEVICE_CAP_CARRIER_DETECT;
 
-	if (caps)
-		caps |= NM_DEVICE_CAP_NM_SUPPORTED;
+	caps |= NM_DEVICE_CAP_NM_SUPPORTED;
 
 	return caps;
 }
 
-static NMActStageReturn
-real_act_stage2_config (NMDevice *dev, NMActRequest *req)
-{
-	NMData *	data;
-
-	g_assert (req);
-	data = nm_act_request_get_data (req);
-	g_assert (data);
-
-	return TRUE;
-}
-
-
 static void
 nm_device_802_3_ethernet_dispose (GObject *object)
 {
@@ -280,8 +266,6 @@ nm_device_802_3_ethernet_class_init (NMDevice8023EthernetClass *klass)
 	parent_class->start = real_start;
 	parent_class->update_link = real_update_link;
 
-	parent_class->act_stage2_config = real_act_stage2_config;
-
 	g_type_class_add_private (object_class, sizeof (NMDevice8023EthernetPrivate));
 }
 
diff --git a/src/nm-device-802-3-ethernet.h b/src/nm-device-802-3-ethernet.h
index f976ab4cc1..5d5a70b08e 100644
--- a/src/nm-device-802-3-ethernet.h
+++ b/src/nm-device-802-3-ethernet.h
@@ -57,8 +57,6 @@ struct _NMDevice8023EthernetClass
 
 GType nm_device_802_3_ethernet_get_type (void);
 
-NMDevice8023Ethernet *	nm_device_802_3_ethernet_new (void);
-
 
 static inline gboolean nm_device_is_802_3_ethernet (NMDevice *dev);
 static inline gboolean nm_device_is_802_3_ethernet (NMDevice *dev)
diff --git a/src/nm-device.c b/src/nm-device.c
index d2f9152921..67fa1b33ab 100644
--- a/src/nm-device.c
+++ b/src/nm-device.c
@@ -75,9 +75,6 @@ static gpointer	nm_device_worker (gpointer user_data);
 
 static void		nm_device_activate_schedule_stage5_ip_config_commit (NMActRequest *req);
 
-static void		nm_device_schedule_activation_handle_cancel (NMActRequest *req);
-
-
 /*
  * nm_device_test_wireless_extensions
  *
@@ -85,30 +82,17 @@ static void		nm_device_schedule_activation_handle_cancel (NMActRequest *req);
  *
  */
 static NMDeviceType
-discover_device_type (const char *iface)
+discover_device_type (LibHalContext *ctx, const char *udi)
 {
-	int	err = -1;
-	int	fd;
-
-	g_return_val_if_fail (iface != NULL, FALSE);
-
-	if ((fd = iw_sockets_open ()) >= 0)
-	{
-		char	buf[64];
-
-		strncpy (buf, iface, 62);
-		buf[63] = '\0';
+	char * category = NULL;
 
-#ifdef IOCTL_DEBUG
-		nm_info ("%s: About to GET IWNAME", iface);
-#endif
-		err = ioctl (fd, SIOCGIWNAME, buf);
-#ifdef IOCTL_DEBUG
-		nm_info ("%s: Done with GET IWNAME", iface);
-#endif
-		close (fd);
-	}
-	return err == 0 ? DEVICE_TYPE_802_11_WIRELESS : DEVICE_TYPE_802_3_ETHERNET;
+	if (libhal_device_property_exists (ctx, udi, "info.category", NULL))
+		category = libhal_device_get_property_string(ctx, udi, "info.category", NULL);
+	if (category && (!strcmp (category, "net.80211")))
+		return DEVICE_TYPE_802_11_WIRELESS;
+	else if (category && (!strcmp (category, "net.80203")))
+		return DEVICE_TYPE_802_3_ETHERNET;
+	return DEVICE_TYPE_UNKNOWN;
 }
 
 /*
@@ -155,7 +139,7 @@ nm_device_new (const char *iface,
 	g_return_val_if_fail (strlen (iface) > 0, NULL);
 	g_return_val_if_fail (app_data != NULL, NULL);
 
-	type = discover_device_type (iface);
+	type = discover_device_type (app_data->hal_ctx, udi);
 	switch (type)
 	{
 		case DEVICE_TYPE_802_11_WIRELESS:
@@ -199,7 +183,7 @@ nm_device_new (const char *iface,
 		nm_device_802_11_wireless_set_address (NM_DEVICE_802_11_WIRELESS (dev));
 
 	/* Grab IP config data for this device from the system configuration files */
-	dev->priv->system_config_data = nm_system_device_get_system_config (dev);
+	dev->priv->system_config_data = nm_system_device_get_system_config (dev, app_data);
 	dev->priv->use_dhcp = nm_system_device_get_use_dhcp (dev);
 
 	/* Allow distributions to flag devices as disabled */
@@ -215,9 +199,11 @@ nm_device_new (const char *iface,
 	if (NM_DEVICE_GET_CLASS (dev)->init)
 		NM_DEVICE_GET_CLASS (dev)->init (dev);
 
+	/* This ref should logically go in nm_device_worker, but we need the
+	   ref to be taken before the worker thread is scheduled on a cpu. */
+	g_object_ref (G_OBJECT (dev));
 	dev->priv->worker = g_thread_create (nm_device_worker, dev, TRUE, NULL);
 	g_assert (dev->priv->worker);
-	g_object_ref (G_OBJECT (dev));	/* For the worker thread */
 
 	/* Block until our device thread has actually had a chance to start. */
 	args[0] = &dev->priv->worker_started;
@@ -678,10 +664,7 @@ nm_device_activate_stage1_device_prepare (NMActRequest *req)
 	g_assert (ret == NM_ACT_STAGE_RETURN_SUCCESS);
 
 	if (nm_device_activation_should_cancel (self))
-	{
-		nm_device_schedule_activation_handle_cancel (req);
 		goto out;
-	}
 
 	nm_device_activate_schedule_stage2_device_config (req);
 
@@ -762,10 +745,7 @@ nm_device_activate_stage2_device_config (NMActRequest *req)
 		nm_device_bring_up (self);
 
 	if (nm_device_activation_should_cancel (self))
-	{
-		nm_device_schedule_activation_handle_cancel (req);
 		goto out;
-	}
 
 	ret = NM_DEVICE_GET_CLASS (self)->act_stage2_config (self, req);
 	if (ret == NM_ACT_STAGE_RETURN_POSTPONE)
@@ -780,10 +760,7 @@ nm_device_activate_stage2_device_config (NMActRequest *req)
 	nm_info ("Activation (%s) Stage 2 of 5 (Device Configure) successful.", iface);
 
 	if (nm_device_activation_should_cancel (self))
-	{
-		nm_device_schedule_activation_handle_cancel (req);
 		goto out;
-	}
 
 	nm_device_activate_schedule_stage3_ip_config_start (req);
 
@@ -873,10 +850,7 @@ nm_device_activate_stage3_ip_config_start (NMActRequest *req)
 	nm_info ("Activation (%s) Stage 3 of 5 (IP Configure Start) started...", iface);
 
 	if (nm_device_activation_should_cancel (self))
-	{
-		nm_device_schedule_activation_handle_cancel (req);
 		goto out;
-	}
 
 	ret = NM_DEVICE_GET_CLASS (self)->act_stage3_ip_config_start (self, req);
 	if (ret == NM_ACT_STAGE_RETURN_POSTPONE)
@@ -889,10 +863,7 @@ nm_device_activate_stage3_ip_config_start (NMActRequest *req)
 	g_assert (ret == NM_ACT_STAGE_RETURN_SUCCESS);	
 
 	if (nm_device_activation_should_cancel (self))
-	{
-		nm_device_schedule_activation_handle_cancel (req);
 		goto out;
-	}
 
 	nm_device_activate_schedule_stage4_ip_config_get (req);
 
@@ -1019,18 +990,12 @@ nm_device_activate_stage4_ip_config_get (NMActRequest *req)
 	nm_info ("Activation (%s) Stage 4 of 5 (IP Configure Get) started...", nm_device_get_iface (self));
 
 	if (nm_device_activation_should_cancel (self))
-	{
-		nm_device_schedule_activation_handle_cancel (req);
 		goto out;
-	}
 
 	ret = NM_DEVICE_GET_CLASS (self)->act_stage4_get_ip4_config (self, req, &ip4_config);
 
 	if (nm_device_activation_should_cancel (self))
-	{
-		nm_device_schedule_activation_handle_cancel (req);
 		goto out;
-	}
 
 	if (ret == NM_ACT_STAGE_RETURN_POSTPONE)
 		goto out;
@@ -1042,10 +1007,7 @@ nm_device_activate_stage4_ip_config_get (NMActRequest *req)
 	g_assert (ret == NM_ACT_STAGE_RETURN_SUCCESS);	
 
 	if (nm_device_activation_should_cancel (self))
-	{
-		nm_device_schedule_activation_handle_cancel (req);
 		goto out;
-	}
 
 	nm_act_request_set_ip4_config (req, ip4_config);
 	nm_device_activate_schedule_stage5_ip_config_commit (req);
@@ -1129,10 +1091,7 @@ nm_device_activate_stage4_ip_config_timeout (NMActRequest *req)
 	nm_info ("Activation (%s) Stage 4 of 5 (IP Configure Timeout) started...", iface);
 
 	if (nm_device_activation_should_cancel (self))
-	{
-		nm_device_schedule_activation_handle_cancel (req);
 		goto out;
-	}
 
 	ret = NM_DEVICE_GET_CLASS (self)->act_stage4_ip_config_timeout (self, req, &ip4_config);
 	if (ret == NM_ACT_STAGE_RETURN_POSTPONE)
@@ -1209,10 +1168,7 @@ nm_device_activate_stage5_ip_config_commit (NMActRequest *req)
 			nm_device_get_iface (self));
 
 	if (nm_device_activation_should_cancel (self))
-	{
-		nm_device_schedule_activation_handle_cancel (req);
 		goto out;
-	}
 
 	nm_device_set_ip4_config (self, ip4_config);
 	if (nm_system_device_set_from_ip4_config (self))
@@ -1222,6 +1178,7 @@ nm_device_activate_stage5_ip_config_commit (NMActRequest *req)
 		nm_system_restart_mdns_responder ();
 		nm_system_set_hostname (self->priv->ip4_config);
 		nm_system_activate_nis (self->priv->ip4_config);
+		nm_system_set_mtu (self);
 		if (NM_DEVICE_GET_CLASS (self)->update_link)
 			NM_DEVICE_GET_CLASS (self)->update_link (self);
 		nm_policy_schedule_activation_finish (req);
@@ -1262,27 +1219,39 @@ nm_device_activate_schedule_stage5_ip_config_commit (NMActRequest *req)
 }
 
 
+static void
+real_activation_cancel_handler (NMDevice *self,
+                                NMActRequest *req)
+{
+	g_return_if_fail (self != NULL);
+	g_return_if_fail (req != NULL);
+
+	if (nm_act_request_get_stage (req) == NM_ACT_STAGE_IP_CONFIG_START)
+		nm_dhcp_manager_cancel_transaction (self->priv->app_data->dhcp_manager, req);
+}
+
 /*
- * nm_device_activation_handle_cancel
+ * activation_handle_cancel_helper
  *
- * Cancel activation on a device and clean up.
+ * Allow specific device types to clean up their own cancellation
  *
  */
 static gboolean
-nm_device_activation_handle_cancel (NMActRequest *req)
+activation_handle_cancel_helper (NMActRequest *req)
 {
-	NMDevice *	self;
-	NMData *		data;
-
-	g_return_val_if_fail (req != NULL, FALSE);
+	NMDevice * self;
+	NMDeviceClass *klass;
 
-	data = nm_act_request_get_data (req);
-	g_assert (data);
+	g_assert (req);
 
 	self = nm_act_request_get_dev (req);
 	g_assert (self);
 
-	if ((req = nm_device_get_act_request (self)) && nm_device_is_activating (self))
+	klass = NM_DEVICE_CLASS (g_type_class_peek (NM_TYPE_DEVICE));
+	if (klass->activation_cancel_handler)
+		klass->activation_cancel_handler (self, req);
+
+	if ((req = nm_device_get_act_request (self)))
 	{
 		self->priv->act_request = NULL;
 		nm_act_request_unref (req);
@@ -1317,29 +1286,13 @@ nm_device_schedule_activation_handle_cancel (NMActRequest *req)
 
 	nm_info ("Activation (%s) cancellation handler scheduled...", nm_device_get_iface (self));
 	source = g_idle_source_new ();
-	g_source_set_callback (source, (GSourceFunc) nm_device_activation_handle_cancel, req, NULL);
+	g_source_set_callback (source, (GSourceFunc) activation_handle_cancel_helper, req, NULL);
+	g_source_set_priority (source, G_PRIORITY_HIGH_IDLE);
 	g_source_attach (source, self->priv->context);
 	g_source_unref (source);
 }
 
 
-/*
- * nm_device_activation_cancel
- *
- * Signal activation worker that it should stop and die.
- *
- */
-void
-nm_device_activation_cancel (NMDevice *self)
-{
-	NMDeviceClass *	klass;
-
-	g_return_if_fail (self != NULL);
-
-	klass = NM_DEVICE_CLASS (g_type_class_peek (NM_TYPE_DEVICE));
-	klass->cancel_activation (self);
-}
-
 static
 gboolean nm_ac_test (int tries,
                      nm_completion_args args)
@@ -1358,8 +1311,14 @@ gboolean nm_ac_test (int tries,
 	return TRUE;
 }
 
-static void
-real_cancel_activation (NMDevice *self)
+/*
+ * nm_device_activation_cancel
+ *
+ * Signal activation worker that it should stop and die.
+ *
+ */
+void
+nm_device_activation_cancel (NMDevice *self)
 {
 	nm_completion_args	args;
 	NMData *			app_data;
@@ -1372,28 +1331,11 @@ real_cancel_activation (NMDevice *self)
 	if (nm_device_is_activating (self))
 	{
 		NMActRequest *	req = nm_device_get_act_request (self);
-		gboolean		clear_act_request = FALSE;
 
 		nm_info ("Activation (%s): cancelling...", nm_device_get_iface (self));
 		self->priv->quit_activation = TRUE;
 
-		/* If the device is waiting for DHCP or a user key, force its current request to stop. */
-		if (nm_act_request_get_stage (req) == NM_ACT_STAGE_NEED_USER_KEY)
-		{
-			nm_dbus_cancel_get_user_key_for_network (app_data->dbus_connection, req);
-			clear_act_request = TRUE;
-		}
-		else if (nm_act_request_get_stage (req) == NM_ACT_STAGE_IP_CONFIG_START)
-		{
-			nm_dhcp_manager_cancel_transaction (app_data->dhcp_manager, req);
-			clear_act_request = TRUE;
-		}
-
-		if (clear_act_request)
-		{
-			self->priv->act_request = NULL;
-			nm_act_request_unref (req);
-		}
+		nm_device_schedule_activation_handle_cancel (req);
 
 		/* Spin until cancelled.  Possible race conditions or deadlocks here.
 		 * The other problem with waiting here is that we hold up dbus traffic
@@ -1924,8 +1866,6 @@ nm_device_dispose (GObject *object)
 	 * reference.
 	 */
 
-	nm_device_stop (self);
-
 	nm_system_device_free_system_config (self, self->priv->system_config_data);
 	if (self->priv->ip4_config)
 	{
@@ -1972,7 +1912,7 @@ nm_device_class_init (NMDeviceClass *klass)
 	object_class->finalize = nm_device_finalize;
 
 	klass->is_test_device = real_is_test_device;
-	klass->cancel_activation = real_cancel_activation;
+	klass->activation_cancel_handler = real_activation_cancel_handler;
 	klass->get_type_capabilities = real_get_type_capabilities;
 	klass->get_generic_capabilities = real_get_generic_capabilities;
 	klass->start = real_start;
diff --git a/src/nm-device.h b/src/nm-device.h
index 1689fe19b5..f413c8800c 100644
--- a/src/nm-device.h
+++ b/src/nm-device.h
@@ -102,12 +102,13 @@ struct _NMDeviceClass
 												 NMIP4Config **config);
 	void			(* deactivate)			(NMDevice *self);
 	void			(* deactivate_quickly)	(NMDevice *self);
-	void			(* cancel_activation)	(NMDevice *self);
 
 	void			(* activation_failure_handler)	(NMDevice *self,
 											 struct NMActRequest *req);
 	void			(* activation_success_handler)	(NMDevice *self,
 											 struct NMActRequest *req);
+	void			(* activation_cancel_handler)		(NMDevice *self,
+											 struct NMActRequest *req);
 
 	gboolean		(* can_interrupt_activation)		(NMDevice *self);
 };
diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c
index da91e92c9c..8056d03075 100644
--- a/src/nm-ip4-config.c
+++ b/src/nm-ip4-config.c
@@ -41,10 +41,13 @@ struct NMIP4Config
 	guint32	ip4_netmask;
 	guint32	ip4_broadcast;
 
+	guint32	mtu;	/* Maximum Transmission Unit of the interface */
+	guint32	mss;	/* Maximum Segment Size of the route */
+
 	GSList *	nameservers;
 	GSList *	domains;
 
-	gchar * hostname;
+	gchar *	hostname;
 	gchar *	nis_domain;
 	GSList *	nis_servers;
 
@@ -326,6 +329,33 @@ guint32 nm_ip4_config_get_num_domains (NMIP4Config *config)
 	return (g_slist_length (config->domains));
 }
 
+guint32 nm_ip4_config_get_mtu (NMIP4Config *config)
+{
+	g_return_val_if_fail (config != NULL, 0);
+
+	return config->mtu;
+}
+
+void nm_ip4_config_set_mtu (NMIP4Config *config, guint32 mtu)
+{
+	g_return_if_fail (config != NULL);
+
+	config->mtu = mtu;
+}
+
+guint32 nm_ip4_config_get_mss (NMIP4Config *config)
+{
+	g_return_val_if_fail (config != NULL, 0);
+
+	return config->mss;
+}
+
+void nm_ip4_config_set_mss (NMIP4Config *config, guint32 mss)
+{
+	g_return_if_fail (config != NULL);
+
+	config->mss = mss;
+}
 
 /* libnl convenience/conversion functions */
 
diff --git a/src/nm-ip4-config.h b/src/nm-ip4-config.h
index e35fb0ce14..9bbd2231dc 100644
--- a/src/nm-ip4-config.h
+++ b/src/nm-ip4-config.h
@@ -68,6 +68,11 @@ void			nm_ip4_config_add_domain			(NMIP4Config *config, const char *domain);
 const char *	nm_ip4_config_get_domain			(NMIP4Config *config, guint i);
 guint32		nm_ip4_config_get_num_domains		(NMIP4Config *config);
 
+guint32		nm_ip4_config_get_mtu			(NMIP4Config *config);
+void			nm_ip4_config_set_mtu			(NMIP4Config *config, guint32 mtu);
+
+guint32		nm_ip4_config_get_mss			(NMIP4Config *config);
+void			nm_ip4_config_set_mss			(NMIP4Config *config, guint32 mss);
 
 /* Flags for nm_ip4_config_to_rtnl_addr() */
 #define NM_RTNL_ADDR_NONE		0x0000
diff --git a/src/nm-logging.c b/src/nm-logging.c
index 7d409cd4f0..b2d34ab4c9 100644
--- a/src/nm-logging.c
+++ b/src/nm-logging.c
@@ -46,7 +46,7 @@ fallback_get_backtrace (void)
 	{
 		syslog (LOG_CRIT, "******************* START **********************************");
 		for (i = 0; i < size; i++)
-			syslog (LOG_CRIT, "Frame %d: %s", i, strings[i]);
+			syslog (LOG_CRIT, "Frame %zd: %s", i, strings[i]);
 		free (strings);
 		syslog (LOG_CRIT, "******************* END **********************************");
 	}
diff --git a/src/nm-netlink-monitor.c b/src/nm-netlink-monitor.c
index 98e9c17967..8f7eaa4c18 100644
--- a/src/nm-netlink-monitor.c
+++ b/src/nm-netlink-monitor.c
@@ -30,7 +30,7 @@
 #include <linux/types.h>
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
-#include <linux/if.h>
+#include <net/if.h>
 #include <linux/unistd.h>
 #include <unistd.h>
 
@@ -133,8 +133,8 @@ nm_netlink_monitor_class_install_signals (NmNetlinkMonitorClass	*monitor_class)
 }
 
 gboolean
-nm_netlink_monitor_open_connection (NmNetlinkMonitor  *monitor,
-				    GError	     **error)
+nm_netlink_monitor_open_connection (NmNetlinkMonitor *monitor,
+							 GError **error)
 {
 	struct sockaddr_nl monitor_address = { .nl_family = 0 };
 	int fd, saved_errno;
diff --git a/src/vpn-manager/nm-vpn-service.c b/src/vpn-manager/nm-vpn-service.c
index 73bf13e72e..177c5c2bdf 100644
--- a/src/vpn-manager/nm-vpn-service.c
+++ b/src/vpn-manager/nm-vpn-service.c
@@ -61,6 +61,7 @@ static void print_vpn_config (guint32 ip4_vpn_gateway,
 						guint32 ip4_dns_len,
 						guint32 *ip4_nbns,
 						guint32 ip4_nbns_len,
+						guint32 mss,
 						const char *dns_domain,
 						const char *login_banner);
 #endif
@@ -809,13 +810,18 @@ nm_vpn_service_stage4_ip_config_get (NMVPNService *service,
 		dbus_message_iter_next (&subiter);
 	}
 
-	/* Eigth arg: DNS Domain (STRING) */
+	/* Eighth arg: MSS (UINT32) */
+	if (!get_dbus_guint32_helper (&iter, &num, "MSS"))
+		goto out;
+	nm_ip4_config_set_mss (config, num);
+	
+	/* Ninth arg: DNS Domain (STRING) */
 	if (!get_dbus_string_helper (&iter, &str, "DNS Domain"))
 		goto out;
 	if (strlen (str))
 		nm_ip4_config_add_domain (config, str);
 
-	/* Ninth arg: VPN Login Banner (STRING) */
+	/* Tenth arg: VPN Login Banner (STRING) */
 	if (!get_dbus_string_helper (&iter, &login_banner, "Login Banner"))
 		goto out;
 
@@ -829,6 +835,7 @@ nm_vpn_service_stage4_ip_config_get (NMVPNService *service,
 	                  ip4_dns_len,
 	                  ip4_nbns,
 	                  ip4_nbns_len,
+	                  mss,
 	                  dns_domain,
 	                  login_banner);
 #endif
@@ -1057,6 +1064,7 @@ static void print_vpn_config (guint32 ip4_vpn_gateway,
 						guint32 ip4_dns_len,
 						guint32 *ip4_nbns,
 						guint32 ip4_nbns_len,
+						guint32 mss,
 						const char *dns_domain,
 						const char *login_banner)
 {
@@ -1072,6 +1080,7 @@ static void print_vpn_config (guint32 ip4_vpn_gateway,
 	nm_info ("Internal IP4 Netmask: %s", inet_ntoa (temp_addr));
 	temp_addr.s_addr = ip4_ptp_address;
 	nm_info ("Internal IP4 Point-to-Point Address: %s", inet_ntoa (temp_addr));
+	nm_info ("Maximum Segment Size (MSS): %d", mss);
 
 	for (i = 0; i < ip4_dns_len; i++)
 	{
diff --git a/test/.cvsignore b/test/.cvsignore
index 64b68377e9..86003aa11d 100644
--- a/test/.cvsignore
+++ b/test/.cvsignore
@@ -6,3 +6,4 @@ nmtestdevices
 libnm_glib_test
 nm-dhcp-opt-test
 nm-tool
+nm-online
diff --git a/test/Makefile.am b/test/Makefile.am
index cc68e954c4..91a4ca4acc 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -13,12 +13,15 @@ AM_CPPFLAGS =						\
 	-DBINDIR=\"$(bindir)\"			\
 	-DDATADIR=\"$(datadir)\"
 
-noinst_PROGRAMS = nm-tool nminfotest nmtestdevices libnm_glib_test
+noinst_PROGRAMS = nm-tool nm-online nminfotest nmtestdevices libnm_glib_test
 
 nm_tool_SOURCES = nm-tool.c
 nm_tool_LDADD =	$(DBUS_LIBS) $(GTHREAD_LIBS) $(HAL_LIBS)	\
 		$(top_builddir)/utils/libnmutils.la
 
+nm_online_SOURCES = nm-online.c
+nm_online_LDADD =	$(DBUS_LIBS) $(GTHREAD_LIBS) $(HAL_LIBS)	\
+		$(top_builddir)/utils/libnmutils.la
 
 nminfotest_SOURCES = nminfotest.c
 nminfotest_LDADD =	$(DBUS_LIBS) $(GTHREAD_LIBS)	\
diff --git a/test/nm-online.c b/test/nm-online.c
new file mode 100644
index 0000000000..5b47563132
--- /dev/null
+++ b/test/nm-online.c
@@ -0,0 +1,141 @@
+/*
+ * nm-online.c - Are we online?
+ *
+ * Return values:
+ *
+ * 	0	: already online or connection established within given timeout
+ *	1	: offline or not online within given timeout
+ *	2	: unspecified error
+ *
+ * Robert Love <rml@novell.com>
+ */
+
+#define DBUS_API_SUBJECT_TO_CHANGE 1
+#define PROGRESS_STEPS 15
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <glib.h>
+#include <dbus/dbus.h>
+#include <dbus/dbus-glib-lowlevel.h>
+#include <dbus/dbus-glib.h>
+
+#include "NetworkManager.h"
+
+typedef struct 
+{
+	int value;
+	double norm;
+} Timeout;
+
+static DBusHandlerResult dbus_filter (DBusConnection *connection G_GNUC_UNUSED,
+				      DBusMessage *message,
+				      void *user_data G_GNUC_UNUSED)
+{
+	if (!dbus_message_is_signal (message, NM_DBUS_INTERFACE,
+				     "DeviceNowActive"))
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	exit (0);
+}
+
+static gboolean check_online (DBusConnection *connection)
+{
+	DBusMessage *message, *reply;
+	DBusError error;
+	dbus_uint32_t state;
+	
+	message = dbus_message_new_method_call (NM_DBUS_SERVICE, NM_DBUS_PATH,
+						NM_DBUS_INTERFACE, "state");
+	if (!message)
+		exit (2);
+
+	dbus_error_init (&error);
+	reply = dbus_connection_send_with_reply_and_block (connection, message,
+							   -1, &error);
+	dbus_message_unref (message);
+	if (!reply) 
+		return FALSE;
+
+	if (!dbus_message_get_args (reply, NULL, DBUS_TYPE_UINT32, &state,
+				    DBUS_TYPE_INVALID))
+		exit (2);
+
+	if (state != NM_STATE_CONNECTED)
+		return FALSE;
+
+	return TRUE;
+}
+
+static gboolean handle_timeout (gpointer data)
+{
+	int i = PROGRESS_STEPS;
+	Timeout *timeout = (Timeout *) data;
+
+	g_print ("\rConnecting");
+	for (; i > 0; i--)
+		putchar ((timeout->value >= (i * timeout->norm)) ? ' ' : '.');
+	if (timeout->value)
+		g_print (" %4is", timeout->value);
+	fflush (stdout);
+
+	timeout->value--;
+	if (timeout->value < 0)
+		exit (1);
+
+	return TRUE;
+}
+
+int main (int argc, char *argv[])
+{
+	DBusConnection *connection;
+	DBusError error;
+	GMainLoop *loop;
+	Timeout timeout;
+	
+	timeout.value = 30;
+
+	if (argc == 2) {
+		timeout.value = (int) strtol (argv[1], NULL, 10);
+		if (timeout.value <= 0 || timeout.value > 3600) 
+			return 2;
+	}
+
+	g_type_init ();
+
+	dbus_error_init (&error);
+	connection = dbus_bus_get (DBUS_BUS_SYSTEM, &error);
+	if (connection == NULL) {
+		dbus_error_free (&error);
+		return 2;
+	}
+
+	dbus_connection_setup_with_g_main (connection, NULL);
+
+	if (!dbus_connection_add_filter (connection, dbus_filter, NULL, NULL))
+		return 2;
+
+	dbus_bus_add_match (connection,
+			    "type='signal',"
+			    "interface='" NM_DBUS_INTERFACE "',"
+			    "sender='" NM_DBUS_SERVICE "',"
+			    "path='" NM_DBUS_PATH "'", &error);
+	if (dbus_error_is_set (&error)) {
+		dbus_error_free (&error);
+		return 2;
+	}
+
+	/* Check after we setup the filter to ensure that we cannot race. */
+	if (check_online (connection))
+		return 0;
+
+	if (timeout.value) {
+		timeout.norm = (double) timeout.value / (double) PROGRESS_STEPS;
+		g_timeout_add (1000, handle_timeout, &timeout);
+	}
+
+	loop = g_main_loop_new (NULL, FALSE);
+	g_main_loop_run (loop);
+
+	return 2;
+}
diff --git a/test/nm-tool.c b/test/nm-tool.c
index 4c13ac3021..c17f765631 100644
--- a/test/nm-tool.c
+++ b/test/nm-tool.c
@@ -84,7 +84,7 @@ static gboolean get_nm_state (DBusConnection *connection)
 			success = FALSE;
 			break;
 	}
-	fprintf (stderr, "State: %s\n\n", state_string);
+	printf ("State: %s\n\n", state_string);
 
 	return success;
 }
@@ -327,7 +327,7 @@ static void detail_device (DBusConnection *connection, const char *path)
 		print_string ("HW Address", hw_addr);
 
 		/* Capabilities */
-		fprintf (stderr, "\n  Capabilities:\n");
+		printf ("\n  Capabilities:\n");
 		if (caps & NM_DEVICE_CAP_NM_SUPPORTED)
 			print_string ("  Supported", "yes");
 		else
diff --git a/vpn-daemons/openvpn/ChangeLog b/vpn-daemons/openvpn/ChangeLog
index ede98cae37..827f07262f 100644
--- a/vpn-daemons/openvpn/ChangeLog
+++ b/vpn-daemons/openvpn/ChangeLog
@@ -1,9 +1,41 @@
+2006-05-11  Robert Love  <rml@novell.com>
+
+	Patch to add OpenVPN TLS and Cipher support, by Groug <groug@free.fr>:
+	* properties/nm-openvpn-dialog.glade: Add UI checkboxes.
+	* properties/nm-openvpn.c: New UI.
+	* src/nm-openvpn-service.c: Support "--tls-auth" and "--cipher"
+	  OpenVPN options.
+	* src/nm-utils.c: Add nm_find_openvpn(), exported function for finding
+	  the location of the OpenVPN binary.
+	* src/nm-utils.h: Add prototype.
+
+2006-04-17  Robert Love  <rml@novell.com>
+
+	* properties/nm-openvpn-dialog.glade: If the dialog won't let the user
+	  type in the file entry GtkEntries, then don't mark them editable.
+
+2006-04-10  Robert Love  <rml@novell.com>
+
+	* properties/nm-openvpn.c: Report error if writing out of exported
+	  configuration fails.  The silent treatment might work for me and my
+	  wife, but not for failed I/O.
+
+2006-03-30  Robert Love  <rml@novell.com>
+
+	Patch by Crispin Flowerday <gnome@flowerday.cx>:
+	* src/nm-openvpn-service-helper.c: Fix crash when no PtP IP address is
+	  supplied.
+
+2006-03-29  Robert Love  <rml@novell.com>
+
+	* src/nm-openvpn-service.c: New eigth argument to DBUS VPN method, the
+	  per-route MSS.  OpenVPN does not care about the MSS, so we send zero.
+
 2006-03-02  Raphael Higino  <raphaelh@cvs.gnome.org>
 
 	* configure.in: Added pt_BR to ALL_LINGUAS.
 
 2006-02-28  Ilkka Tuohela  <hile@iki.fi>
-
 	* configure.in: Added fi to ALL_LINGUAS.
 	
 2006-02-16  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
diff --git a/vpn-daemons/openvpn/auth-dialog/Makefile.am b/vpn-daemons/openvpn/auth-dialog/Makefile.am
index 4efbbae6ba..6bc2a6804b 100644
--- a/vpn-daemons/openvpn/auth-dialog/Makefile.am
+++ b/vpn-daemons/openvpn/auth-dialog/Makefile.am
@@ -14,7 +14,7 @@ nm_openvpn_auth_dialog_CPPFLAGS =			\
 	-DG_DISABLE_DEPRECATED			\
 	-DGDK_DISABLE_DEPRECATED		\
 	-DGNOME_DISABLE_DEPRECATED		\
-	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
+	-DGNOMELOCALEDIR=\"$(datadir)/locale\"	\
 	-DVERSION=\"$(VERSION)\"			\
 	$(NULL)
 
diff --git a/vpn-daemons/openvpn/po/.cvsignore b/vpn-daemons/openvpn/po/.cvsignore
index 68336a4624..9c6c9ae0d1 100644
--- a/vpn-daemons/openvpn/po/.cvsignore
+++ b/vpn-daemons/openvpn/po/.cvsignore
@@ -4,4 +4,9 @@ Makefile.in
 POTFILES
 da.gmo
 sv.gmo
+es.gmo
+fi.gmo
+pt_BR.gmo
+zh_CN.gmo
 *.pot
+stamp-it
diff --git a/vpn-daemons/openvpn/po/ChangeLog b/vpn-daemons/openvpn/po/ChangeLog
index ecd89281a9..57ccc55509 100644
--- a/vpn-daemons/openvpn/po/ChangeLog
+++ b/vpn-daemons/openvpn/po/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-18  Robert Love  <rml@novell.com>
+
+	* sv.po: Update.
+	* cs.po, es.po, hu.po, ja.po, pt_BR.po, zh_TW.po, de.po, fr.po, it.po,
+	  pl.po, zh_CN.po: Add.
+
 2006-03-02  Raphael Higino  <raphaelh@cvs.gnome.org>
 
 	* pt_BR.po: Added Brazilian Portuguese translation.
diff --git a/vpn-daemons/openvpn/po/cs.po b/vpn-daemons/openvpn/po/cs.po
new file mode 100644
index 0000000000..56c6641503
--- /dev/null
+++ b/vpn-daemons/openvpn/po/cs.po
@@ -0,0 +1,388 @@
+# translation of cs.po to cs_CZ
+# Czech message file for YaST2 (@memory@).
+# Copyright (C) 2005 SUSE Linux Products GmbH.
+# Copyright (C) 2002 SuSE Linux AG.
+# Copyright (C) 1999-2001 SuSE GmbH.
+#
+# Petr Pavlik <pp@suse.cz>, 1999, 2000, 2001.
+# Klara Cihlarova <koty@seznam.cz>, 2006.
+msgid ""
+msgstr ""
+"Project-Id-Version: cs\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-05-16 17:16+0200\n"
+"PO-Revision-Date: 2006-05-17 13:21+0200\n"
+"Last-Translator: Klara Cihlarova <koty@seznam.cz>\n"
+"Language-Team: cs_CZ <cs@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms:  nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: KBabel 1.11.2\n"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:148
+msgid "_Password:"
+msgstr "_Heslo:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:149
+msgid "_Secondary Password:"
+msgstr "Ověření _hesla:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:272
+msgid "_Username:"
+msgstr "_Uživ. jméno:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:274
+msgid "_Domain:"
+msgstr "_Doména:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:360
+msgid "Connect _anonymously"
+msgstr "Připojit _anonymně"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:365
+msgid "Connect as _user:"
+msgstr "Připojit jako _uživatel:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:471
+msgid "_Remember password for this session"
+msgstr "_Zapamatovat heslo pro toto sezení"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:473
+msgid "_Save password in keyring"
+msgstr "_Uložit heslo do svazku klí�ů"
+
+#: ../auth-dialog/main.c:214
+#, c-format
+msgid "You need to authenticate to access the Virtual Private Network '%s'."
+msgstr "Abyste mohli přistupovat do VPN '%s', musíte zadat ověřovací informace."
+
+#: ../auth-dialog/main.c:215
+msgid "Authenticate VPN"
+msgstr "Ověřování VPN"
+
+#: ../auth-dialog/main.c:227 ../auth-dialog/main.c:252
+msgid "Certificate password:"
+msgstr "Hes_lo certifikátu:"
+
+#: ../nm-openvpn.desktop.in.h:1
+msgid "Add, Remove, and Edit VPN Connections"
+msgstr "Přidat, odstranit a upravit VPN připojení"
+
+#: ../nm-openvpn.desktop.in.h:2
+msgid "VPN Connection Manager (OpenVPN)"
+msgstr "Správce VPN připojení (OpenVPN)"
+
+#: ../properties/nm-openvpn.c:108
+msgid "OpenVPN Client"
+msgstr "OpenVPN klient"
+
+#: ../properties/nm-openvpn.c:614
+msgid "The following OpenVPN connection will be created:"
+msgstr "Budou vytvořeny následující OpenVPN připojení:"
+
+#: ../properties/nm-openvpn.c:616
+#, c-format
+msgid "Name:  %s"
+msgstr "Jméno:  %s"
+
+#: ../properties/nm-openvpn.c:624
+msgid "Connection Type: X.509 Certificates"
+msgstr "Typ připojení: X.509 certifikáty"
+
+#: ../properties/nm-openvpn.c:627 ../properties/nm-openvpn.c:654
+#: ../properties/nm-openvpn.c:666
+#, c-format
+msgid "CA:  %s"
+msgstr "CA:  %s"
+
+#: ../properties/nm-openvpn.c:630 ../properties/nm-openvpn.c:669
+#, c-format
+msgid "Cert:  %s"
+msgstr "Cert:  %s"
+
+#: ../properties/nm-openvpn.c:633 ../properties/nm-openvpn.c:672
+#, c-format
+msgid "Key:  %s"
+msgstr "Klí�:  %s"
+
+#: ../properties/nm-openvpn.c:637
+msgid "Connection Type: Shared Key"
+msgstr "Typ připojení: sdílený klí�"
+
+#: ../properties/nm-openvpn.c:640
+#, c-format
+msgid "Shared Key:  %s"
+msgstr "Sdílený klí�:  %s"
+
+#: ../properties/nm-openvpn.c:643
+#, c-format
+msgid "Local IP:  %s"
+msgstr "Lokální IP: %s"
+
+#: ../properties/nm-openvpn.c:646
+#, c-format
+msgid "Remote IP:  %s"
+msgstr "Vzdálená IP: %s"
+
+#: ../properties/nm-openvpn.c:651
+msgid "Connection Type: Password"
+msgstr "Typ připojení: heslo"
+
+#: ../properties/nm-openvpn.c:657 ../properties/nm-openvpn.c:675
+#, c-format
+msgid "Username:  %s"
+msgstr "Jméno uživatele:  %s"
+
+#: ../properties/nm-openvpn.c:663
+msgid "Connection Type: X.509 with Password Authentication"
+msgstr "Typ připojení: X.509 s ověřením hesla"
+
+#: ../properties/nm-openvpn.c:681
+#, c-format
+msgid "Remote:  %s"
+msgstr "Vzdálený:  %s"
+
+#: ../properties/nm-openvpn.c:684
+#, c-format
+msgid "Device: %s"
+msgstr "Zařízení:  %s"
+
+#: ../properties/nm-openvpn.c:684
+msgid "TAP"
+msgstr "TAP"
+
+#: ../properties/nm-openvpn.c:684
+msgid "TUN"
+msgstr "TUN"
+
+#: ../properties/nm-openvpn.c:687
+#, c-format
+msgid "Protocol: %s"
+msgstr "Protokol: %s"
+
+#: ../properties/nm-openvpn.c:687
+msgid "TCP"
+msgstr "TCP"
+
+#: ../properties/nm-openvpn.c:687
+msgid "UDP"
+msgstr "UDP"
+
+#: ../properties/nm-openvpn.c:691
+#, c-format
+msgid "Routes:  %s"
+msgstr "Směrování:  %s"
+
+#: ../properties/nm-openvpn.c:695
+#, c-format
+msgid "Use LZO Compression: %s"
+msgstr "Komprese LZO:%s"
+
+#: ../properties/nm-openvpn.c:695
+msgid "Yes"
+msgstr "Ano"
+
+#: ../properties/nm-openvpn.c:695
+msgid "No"
+msgstr "Ne"
+
+#: ../properties/nm-openvpn.c:698
+msgid "The connection details can be changed using the \"Edit\" button."
+msgstr "Podrobnosti o připojení lze změnit kliknutím na tla�ítko \"Upravit\"."
+
+#: ../properties/nm-openvpn.c:849
+msgid "Cannot import settings"
+msgstr "Nelze importovat nastavení"
+
+#: ../properties/nm-openvpn.c:851
+#, c-format
+msgid "The VPN settings file '%s' does not contain valid data."
+msgstr "Zadaný soubor '%s' neobsahuje platná data."
+
+#: ../properties/nm-openvpn.c:885
+msgid "Select file to import"
+msgstr "Vyberte soubor k importu"
+
+#: ../properties/nm-openvpn.c:966 ../properties/nm-openvpn.c:978
+msgid "Select CA to use"
+msgstr "Vyberte CA"
+
+#: ../properties/nm-openvpn.c:969
+msgid "Select certificate to use"
+msgstr "Vyberte certifikát"
+
+#: ../properties/nm-openvpn.c:972
+msgid "Select key to use"
+msgstr "Vyberte klí�"
+
+#: ../properties/nm-openvpn.c:975
+msgid "Select shared key to use"
+msgstr "Vyberte sdílený klí�"
+
+#. printf ("in impl_export\n");
+#: ../properties/nm-openvpn.c:1147
+msgid "Save as..."
+msgstr "Uložit jako..."
+
+#: ../properties/nm-openvpn.c:1177
+#, c-format
+msgid "A file named \"%s\" already exists."
+msgstr "Jméno souboru \"%s\" již existuje."
+
+#: ../properties/nm-openvpn.c:1180
+msgid "Do you want to replace it with the one you are saving?"
+msgstr "Nahradit?"
+
+#: ../properties/nm-openvpn-dialog.glade.h:1
+msgid "<b>Connection Name</b>"
+msgstr "<b>Název připojení</b>"
+
+#: ../properties/nm-openvpn-dialog.glade.h:2
+msgid "<b>Optional Information</b>"
+msgstr "<b>Volitelné informace</b>"
+
+#: ../properties/nm-openvpn-dialog.glade.h:3
+msgid "<b>Required Information</b>"
+msgstr "<b>Požadované informace</b>"
+
+#: ../properties/nm-openvpn-dialog.glade.h:4
+msgid "<i>example: 172.16.0.0/16 10.11.12.0/24</i>"
+msgstr "<i>příklad: 172.16.0.0/16 10.11.12.0/24</i>"
+
+#: ../properties/nm-openvpn-dialog.glade.h:5
+msgid "CA  file:"
+msgstr "Soubor CA:"
+
+#: ../properties/nm-openvpn-dialog.glade.h:6
+msgid "Certificate:"
+msgstr "Certifikát:"
+
+#: ../properties/nm-openvpn-dialog.glade.h:7
+msgid "Connection Type:"
+msgstr "Typ připojení:"
+
+#: ../properties/nm-openvpn-dialog.glade.h:8
+msgid "Key:"
+msgstr "Klí�:"
+
+#: ../properties/nm-openvpn-dialog.glade.h:9
+msgid "Local IP:"
+msgstr "Lokální IP:"
+
+#: ../properties/nm-openvpn-dialog.glade.h:10
+msgid "Password"
+msgstr "Heslo"
+
+#: ../properties/nm-openvpn-dialog.glade.h:11
+msgid ""
+"Please enter the information provided by your system administrator below. Do "
+"not enter your password here as you will be prompted when connecting."
+msgstr ""
+"Níže zadejte informace od svého správce systému. Nezadávejte své heslo, "
+"budete na něj dotázání později během připojování."
+
+#: ../properties/nm-openvpn-dialog.glade.h:12
+msgid ""
+"Please note that the file you import is not an OpenVPN configuration file. "
+"Ask your adminstrator for the file."
+msgstr ""
+"Importovaný soubor není soubor s nastavením OpenVPN.\n"
+"Potřebný soubor si vyžádejte u svého administrátora."
+
+#: ../properties/nm-openvpn-dialog.glade.h:13
+msgid "Remote IP:"
+msgstr "Vzdálená IP:"
+
+#: ../properties/nm-openvpn-dialog.glade.h:14
+msgid "Shared Key:"
+msgstr "Sdílený klí�:"
+
+#: ../properties/nm-openvpn-dialog.glade.h:15
+msgid "Shared key"
+msgstr "Sdílený klí�:"
+
+#: ../properties/nm-openvpn-dialog.glade.h:16
+msgid "Use LZO compression"
+msgstr "Komprese LZO"
+
+#: ../properties/nm-openvpn-dialog.glade.h:17
+msgid "Use TAP device"
+msgstr "Použít TAB zařízení"
+
+#: ../properties/nm-openvpn-dialog.glade.h:18
+msgid "Use TCP connection"
+msgstr "Použít TCP spojení"
+
+#: ../properties/nm-openvpn-dialog.glade.h:19
+msgid "Username:"
+msgstr "Uživatelské jméno:"
+
+#: ../properties/nm-openvpn-dialog.glade.h:20
+msgid "X.509"
+msgstr "X.509"
+
+#: ../properties/nm-openvpn-dialog.glade.h:21
+msgid ""
+"X.509 Certificates\n"
+"Pre-shared key\n"
+"Password Authentication\n"
+"X.509 with Password Authentication"
+msgstr ""
+"X.509 certifikáty\n"
+"Sdílený klí�\n"
+"Ověření hesla\n"
+"X.509 s ověřením hesla"
+
+#: ../properties/nm-openvpn-dialog.glade.h:25
+msgid "_Gateway:"
+msgstr "_Brána:"
+
+#: ../properties/nm-openvpn-dialog.glade.h:26
+msgid "_Import Saved Configuration..."
+msgstr "_Importovat uložené nastavení..."
+
+#: ../properties/nm-openvpn-dialog.glade.h:27
+msgid ""
+"_Name used to identify the connection to the private network, e.g. \"Campus "
+"VPN\" or \"Corporate Network\""
+msgstr ""
+"_Jméno používané k identifikaci připojení k soukromé síti, např. \"Kolejní VPN\" "
+"nebo \"Práce\""
+
+#: ../properties/nm-openvpn-dialog.glade.h:28
+msgid "_Only use VPN connection for these addresses"
+msgstr "_Použít VPN pouze pro tyto adresy"
+
+#: ../src/nm-openvpn-service.c:136
+msgid ""
+"The VPN login failed because the user name and password were not accepted or "
+"the certificate password was wrong."
+msgstr ""
+"Připojení do VPN selhalo. Uživatelské jméno a heslo odmítnuto nebo je "
+"chybné heslo certifikátu."
+
+#: ../src/nm-openvpn-service.c:138
+msgid "The VPN login failed because the VPN program could not be started."
+msgstr "Připojení do VPN selhalo. VPN program nelze spustit."
+
+#: ../src/nm-openvpn-service.c:140
+msgid ""
+"The VPN login failed because the VPN program could not connect to the VPN "
+"server."
+msgstr "Připojení do VPN selhalo. Nelze se spojit s VPN serverem."
+
+#: ../src/nm-openvpn-service.c:142
+msgid "The VPN login failed because the VPN configuration options were invalid."
+msgstr "Připojení do VPN selhalo. Chybné volby VPN."
+
+#: ../src/nm-openvpn-service.c:144
+msgid ""
+"The VPN login failed because the VPN program received an invalid "
+"configuration from the VPN server."
+msgstr "Připojení do VPN selhalo. Byly obdrženy chybné volby od VPN serveru."
+
+#: ../src/nm-openvpn-service.c:146
+msgid "VPN connection failed"
+msgstr "VPN spojení selhalo"
+
diff --git a/vpn-daemons/openvpn/po/de.po b/vpn-daemons/openvpn/po/de.po
new file mode 100644
index 0000000000..80acc3e701
--- /dev/null
+++ b/vpn-daemons/openvpn/po/de.po
@@ -0,0 +1,424 @@
+# German message file for YaST2 (@memory@).
+# Copyright (C) 2005 SUSE Linux Products GmbH.
+# Copyright (C) 2002, 2003 SuSE Linux AG.
+# Copyright (C) 1999, 2000, 2001 SuSE GmbH.
+# Antje Faber <afaber@suse.de>, 2000-2003.
+# Karl Eichwalder <ke@suse.de>, 1999-2003.
+# Martin Lohner <ml@suse.de>, 2000.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: YaST (@memory@)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-05-16 17:16+0200\n"
+"PO-Revision-Date: 2003-02-12 09:27+0100\n"
+"Last-Translator: Karl Eichwalder <ke@suse.de>\n"
+"Language-Team: German <i18n@suse.de>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:148
+#, fuzzy
+msgid "_Password:"
+msgstr "Passwort:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:149
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "Passwort &bestätigen:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:272
+#, fuzzy
+msgid "_Username:"
+msgstr "Benut&zername:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:274
+#, fuzzy
+msgid "_Domain:"
+msgstr "&Domain:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:360
+#, fuzzy
+msgid "Connect _anonymously"
+msgstr "Verbindungen"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:365
+#, fuzzy
+msgid "Connect as _user:"
+msgstr "Verbunden als "
+
+#: ../auth-dialog/gnome-two-password-dialog.c:471
+#, fuzzy
+msgid "_Remember password for this session"
+msgstr "&Bestätigen Sie das Passwort:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:473
+#, fuzzy
+msgid "_Save password in keyring"
+msgstr "Passwortverschlüsselung festlegen"
+
+#: ../auth-dialog/main.c:214
+#, c-format
+msgid "You need to authenticate to access the Virtual Private Network '%s'."
+msgstr ""
+
+#: ../auth-dialog/main.c:215
+#, fuzzy
+msgid "Authenticate VPN"
+msgstr "Authentifizierung"
+
+#: ../auth-dialog/main.c:227 ../auth-dialog/main.c:252
+#, fuzzy
+msgid "Certificate password:"
+msgstr "Zertifikat-&Passwort:"
+
+#: ../nm-openvpn.desktop.in.h:1
+msgid "Add, Remove, and Edit VPN Connections"
+msgstr ""
+
+#: ../nm-openvpn.desktop.in.h:2
+#, fuzzy
+msgid "VPN Connection Manager (OpenVPN)"
+msgstr "Verbindungsverwaltung"
+
+#: ../properties/nm-openvpn.c:108
+#, fuzzy
+msgid "OpenVPN Client"
+msgstr "IPP-Client"
+
+#: ../properties/nm-openvpn.c:614
+#, fuzzy
+msgid "The following OpenVPN connection will be created:"
+msgstr "Folgende Scanner werden deaktiviert:"
+
+#: ../properties/nm-openvpn.c:616
+#, fuzzy, c-format
+msgid "Name:  %s"
+msgstr "&Name:"
+
+#: ../properties/nm-openvpn.c:624
+#, fuzzy
+msgid "Connection Type: X.509 Certificates"
+msgstr "Zertifikat auswählen"
+
+#: ../properties/nm-openvpn.c:627 ../properties/nm-openvpn.c:654
+#: ../properties/nm-openvpn.c:666
+#, c-format
+msgid "CA:  %s"
+msgstr ""
+
+# &A is taken
+#: ../properties/nm-openvpn.c:630 ../properties/nm-openvpn.c:669
+#, fuzzy, c-format
+msgid "Cert:  %s"
+msgstr "%1$s wird erstellt"
+
+#: ../properties/nm-openvpn.c:633 ../properties/nm-openvpn.c:672
+#, fuzzy, c-format
+msgid "Key:  %s"
+msgstr "Schlüssel:"
+
+#: ../properties/nm-openvpn.c:637
+#, fuzzy
+msgid "Connection Type: Shared Key"
+msgstr "Verbindungsart"
+
+#: ../properties/nm-openvpn.c:640
+#, fuzzy, c-format
+msgid "Shared Key:  %s"
+msgstr "Gemeinsamer Schlüssel"
+
+#: ../properties/nm-openvpn.c:643
+#, fuzzy, c-format
+msgid "Local IP:  %s"
+msgstr "Lokale IP-Adresse"
+
+#: ../properties/nm-openvpn.c:646
+#, fuzzy, c-format
+msgid "Remote IP:  %s"
+msgstr "&Entfernte IP-Adresse"
+
+#: ../properties/nm-openvpn.c:651
+#, fuzzy
+msgid "Connection Type: Password"
+msgstr "Verbindungsart"
+
+#: ../properties/nm-openvpn.c:657 ../properties/nm-openvpn.c:675
+#, fuzzy, c-format
+msgid "Username:  %s"
+msgstr "Benutzername: %1"
+
+#: ../properties/nm-openvpn.c:663
+msgid "Connection Type: X.509 with Password Authentication"
+msgstr ""
+
+#: ../properties/nm-openvpn.c:681
+#, fuzzy, c-format
+msgid "Remote:  %s"
+msgstr "Funktion: %s"
+
+#: ../properties/nm-openvpn.c:684
+#, fuzzy, c-format
+msgid "Device: %s"
+msgstr "Gerät: %1"
+
+#: ../properties/nm-openvpn.c:684
+#, fuzzy
+msgid "TAP"
+msgstr "PAP"
+
+#: ../properties/nm-openvpn.c:684
+#, fuzzy
+msgid "TUN"
+msgstr "LUN"
+
+#: ../properties/nm-openvpn.c:687
+#, fuzzy, c-format
+msgid "Protocol: %s"
+msgstr "Protokoll"
+
+#: ../properties/nm-openvpn.c:687
+#, fuzzy
+msgid "TCP"
+msgstr "TCP: "
+
+#: ../properties/nm-openvpn.c:687
+#, fuzzy
+msgid "UDP"
+msgstr "UDP: "
+
+#: ../properties/nm-openvpn.c:691
+#, fuzzy, c-format
+msgid "Routes:  %s"
+msgstr "Routen: %1"
+
+#: ../properties/nm-openvpn.c:695
+#, fuzzy, c-format
+msgid "Use LZO Compression: %s"
+msgstr "Komprimierung"
+
+#: ../properties/nm-openvpn.c:695
+msgid "Yes"
+msgstr "Ja"
+
+#: ../properties/nm-openvpn.c:695
+msgid "No"
+msgstr "Nein"
+
+#: ../properties/nm-openvpn.c:698
+msgid "The connection details can be changed using the \"Edit\" button."
+msgstr ""
+
+#: ../properties/nm-openvpn.c:849
+#, fuzzy
+msgid "Cannot import settings"
+msgstr "Einstellungen können nicht geschrieben werden."
+
+#: ../properties/nm-openvpn.c:851
+#, fuzzy, c-format
+msgid "The VPN settings file '%s' does not contain valid data."
+msgstr "Die angegebene Datei enthält keinen TSIG-Schlüssel."
+
+#: ../properties/nm-openvpn.c:885
+#, fuzzy
+msgid "Select file to import"
+msgstr "Wählen Sie eine zu ladende Datei."
+
+#: ../properties/nm-openvpn.c:966 ../properties/nm-openvpn.c:978
+#, fuzzy
+msgid "Select CA to use"
+msgstr "&Benutzer wählen:"
+
+#: ../properties/nm-openvpn.c:969
+#, fuzzy
+msgid "Select certificate to use"
+msgstr "Zertifikatdatei wählen"
+
+# &w is taken by "&Weiter"
+# 2001-09-18 10:51:12 CEST -ke-
+#: ../properties/nm-openvpn.c:972
+#, fuzzy
+msgid "Select key to use"
+msgstr "Wählen Sie Ihren Tuner aus."
+
+#: ../properties/nm-openvpn.c:975
+#, fuzzy
+msgid "Select shared key to use"
+msgstr "Treffen Sie eine Auswahl für die zu verwendende PPD-Datei."
+
+#. printf ("in impl_export\n");
+#: ../properties/nm-openvpn.c:1147
+msgid "Save as..."
+msgstr "Speichern unter..."
+
+#: ../properties/nm-openvpn.c:1177
+#, fuzzy, c-format
+msgid "A file named \"%s\" already exists."
+msgstr "Ein Host mit dem Namen %1 ist bereits vorhanden."
+
+#: ../properties/nm-openvpn.c:1180
+#, fuzzy
+msgid "Do you want to replace it with the one you are saving?"
+msgstr ""
+"Möchten Sie Ihre Einstellungen\n"
+"wirklich rückgängig machen?"
+
+#: ../properties/nm-openvpn-dialog.glade.h:1
+#, fuzzy
+msgid "<b>Connection Name</b>"
+msgstr "<b>Beschreibung:</b>"
+
+#: ../properties/nm-openvpn-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Optional Information</b>"
+msgstr "Optionale Informationen"
+
+#: ../properties/nm-openvpn-dialog.glade.h:3
+#, fuzzy
+msgid "<b>Required Information</b>"
+msgstr "<p><b>Support-Informationen</b></p>\n"
+
+#: ../properties/nm-openvpn-dialog.glade.h:4
+msgid "<i>example: 172.16.0.0/16 10.11.12.0/24</i>"
+msgstr ""
+
+#: ../properties/nm-openvpn-dialog.glade.h:5
+#, fuzzy
+msgid "CA  file:"
+msgstr "CA in Datei gespeichert"
+
+#: ../properties/nm-openvpn-dialog.glade.h:6
+#, fuzzy
+msgid "Certificate:"
+msgstr "Zertifikat"
+
+#: ../properties/nm-openvpn-dialog.glade.h:7
+#, fuzzy
+msgid "Connection Type:"
+msgstr "Verbindungsart"
+
+#: ../properties/nm-openvpn-dialog.glade.h:8
+msgid "Key:"
+msgstr "Schlüssel:"
+
+#: ../properties/nm-openvpn-dialog.glade.h:9
+#, fuzzy
+msgid "Local IP:"
+msgstr "Lokal"
+
+#: ../properties/nm-openvpn-dialog.glade.h:10
+msgid "Password"
+msgstr "Passwort"
+
+#: ../properties/nm-openvpn-dialog.glade.h:11
+msgid ""
+"Please enter the information provided by your system administrator below. Do "
+"not enter your password here as you will be prompted when connecting."
+msgstr ""
+
+#: ../properties/nm-openvpn-dialog.glade.h:12
+msgid ""
+"Please note that the file you import is not an OpenVPN configuration file. "
+"Ask your adminstrator for the file."
+msgstr ""
+
+#: ../properties/nm-openvpn-dialog.glade.h:13
+#, fuzzy
+msgid "Remote IP:"
+msgstr "Entfernt"
+
+#: ../properties/nm-openvpn-dialog.glade.h:14
+#, fuzzy
+msgid "Shared Key:"
+msgstr "Gemeinsamer Schlüssel"
+
+#: ../properties/nm-openvpn-dialog.glade.h:15
+#, fuzzy
+msgid "Shared key"
+msgstr "Gemeinsamer Schlüssel"
+
+#: ../properties/nm-openvpn-dialog.glade.h:16
+#, fuzzy
+msgid "Use LZO compression"
+msgstr "Komprimierung"
+
+#: ../properties/nm-openvpn-dialog.glade.h:17
+#, fuzzy
+msgid "Use TAP device"
+msgstr "&USB-Geräte"
+
+#: ../properties/nm-openvpn-dialog.glade.h:18
+#, fuzzy
+msgid "Use TCP connection"
+msgstr "Verbindung testen"
+
+#: ../properties/nm-openvpn-dialog.glade.h:19
+#, fuzzy
+msgid "Username:"
+msgstr "Benut&zername:"
+
+#: ../properties/nm-openvpn-dialog.glade.h:20
+msgid "X.509"
+msgstr ""
+
+#: ../properties/nm-openvpn-dialog.glade.h:21
+msgid ""
+"X.509 Certificates\n"
+"Pre-shared key\n"
+"Password Authentication\n"
+"X.509 with Password Authentication"
+msgstr ""
+
+#: ../properties/nm-openvpn-dialog.glade.h:25
+#, fuzzy
+msgid "_Gateway:"
+msgstr "Gateway"
+
+#: ../properties/nm-openvpn-dialog.glade.h:26
+#, fuzzy
+msgid "_Import Saved Configuration..."
+msgstr "&Serverkonfiguration..."
+
+#: ../properties/nm-openvpn-dialog.glade.h:27
+msgid ""
+"_Name used to identify the connection to the private network, e.g. \"Campus "
+"VPN\" or \"Corporate Network\""
+msgstr ""
+
+#: ../properties/nm-openvpn-dialog.glade.h:28
+msgid "_Only use VPN connection for these addresses"
+msgstr ""
+
+#: ../src/nm-openvpn-service.c:136
+msgid ""
+"The VPN login failed because the user name and password were not accepted or "
+"the certificate password was wrong."
+msgstr ""
+
+#: ../src/nm-openvpn-service.c:138
+msgid "The VPN login failed because the VPN program could not be started."
+msgstr ""
+
+#: ../src/nm-openvpn-service.c:140
+msgid ""
+"The VPN login failed because the VPN program could not connect to the VPN "
+"server."
+msgstr ""
+
+#: ../src/nm-openvpn-service.c:142
+msgid ""
+"The VPN login failed because the VPN configuration options were invalid."
+msgstr ""
+
+#: ../src/nm-openvpn-service.c:144
+msgid ""
+"The VPN login failed because the VPN program received an invalid "
+"configuration from the VPN server."
+msgstr ""
+
+#: ../src/nm-openvpn-service.c:146
+#, fuzzy
+msgid "VPN connection failed"
+msgstr "Keine Verbindungen definiert"
diff --git a/vpn-daemons/openvpn/po/es.po b/vpn-daemons/openvpn/po/es.po
index d45e8de061..43179f9d7e 100644
--- a/vpn-daemons/openvpn/po/es.po
+++ b/vpn-daemons/openvpn/po/es.po
@@ -1,179 +1,241 @@
-# translation of NetworkManager-openvpn.HEAD.po to
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Spanish message file for YaST2 (@memory@).
+# Copyright (C) 2005 SUSE Linux Products GmbH.
+# Copyright (C) 2002, 2003 SuSE Linux AG.
+# Copyright (C) 1999, 2000, 2001 SuSE GmbH.
+# Ibán josé García Castillo <Iban.Garcia@alufis35.uv.es>, 2000.
+# Javier Moreno <javier.moreno@alufis35.uv.es>, 2000.
+# Jordi Jaen Pallares <jordi@suse.de>, 1999, 2000, 2001.
+# Pablo Iranzo Gómez <Pablo.Iranzo@uv.es>, 2000.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: NetworkManager-openvpn.HEAD\n"
+"Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-06 12:41+0100\n"
-"PO-Revision-Date: 2006-02-07 11:55+0100\n"
-"Last-Translator: \n"
-"Language-Team:  <es@li.org>\n"
+"POT-Creation-Date: 2006-05-16 17:16+0200\n"
+"PO-Revision-Date: 2003-02-12 10:23+0100\n"
+"Last-Translator: Pablo Iranzo Gómez <Pablo.Iranzo@uv.es>\n"
+"Language-Team: Spanish <i18n@suse.de>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../auth-dialog/gnome-two-password-dialog.c:148
+#, fuzzy
 msgid "_Password:"
-msgstr "_Contraseña:"
+msgstr "Contraseña:"
 
 #: ../auth-dialog/gnome-two-password-dialog.c:149
+#, fuzzy
 msgid "_Secondary Password:"
-msgstr "Contraseña _secundaria:"
+msgstr "V&erificar contraseña:"
 
 #: ../auth-dialog/gnome-two-password-dialog.c:272
+#, fuzzy
 msgid "_Username:"
-msgstr "_Usuario:"
+msgstr "Nombre de &usuario:"
 
 #: ../auth-dialog/gnome-two-password-dialog.c:274
+#, fuzzy
 msgid "_Domain:"
-msgstr "_Dominio:"
+msgstr "&Dominio:"
 
+# include/printconf/dialogs.ycp:150
 #: ../auth-dialog/gnome-two-password-dialog.c:360
+#, fuzzy
 msgid "Connect _anonymously"
-msgstr "Conectar como -anónimo"
+msgstr "Conexiones"
 
+# include/scanner/scanner_overview.ycp:85
+# include/scanner/scanner_overview.ycp:85
+# include/scanner/scanner_overview.ycp:85
 #: ../auth-dialog/gnome-two-password-dialog.c:365
+#, fuzzy
 msgid "Connect as _user:"
-msgstr "Conectar como _usuario:"
+msgstr "Conectado como"
 
+# include/partitioning/custom_part_dialogs.ycp:67
+# include/partitioning/custom_part_dialogs.ycp:67
+# include/partitioning/custom_part_dialogs.ycp:67 include/partitioning/custom_part_dialogs.ycp:197
+# 
 #: ../auth-dialog/gnome-two-password-dialog.c:471
+#, fuzzy
 msgid "_Remember password for this session"
-msgstr "_Recordar la contraseña durante esta sesión"
+msgstr ""
+"Vuelva a introducir la contraseña para \n"
+"&verificarla:"
 
 #: ../auth-dialog/gnome-two-password-dialog.c:473
+#, fuzzy
 msgid "_Save password in keyring"
-msgstr "_Guardar la contraseña en el llavero"
+msgstr "Definir codificación de la contraseña"
 
 #: ../auth-dialog/main.c:214
 #, c-format
 msgid "You need to authenticate to access the Virtual Private Network '%s'."
-msgstr "Necesita autenticarse para acceder a la red privada virtual (VPN) «%s»."
+msgstr ""
 
 #: ../auth-dialog/main.c:215
+#, fuzzy
 msgid "Authenticate VPN"
-msgstr "Autenticar VPN"
+msgstr "Autentificación"
 
 #: ../auth-dialog/main.c:227 ../auth-dialog/main.c:252
+#, fuzzy
 msgid "Certificate password:"
-msgstr "Certificar contraseña:"
+msgstr "&Contraseña de certificado:"
 
 #: ../nm-openvpn.desktop.in.h:1
 msgid "Add, Remove, and Edit VPN Connections"
-msgstr "Añadir, eliminar y editar conexiones VPN"
+msgstr ""
 
+# include/network/modem/dialogs.ycp:400
 #: ../nm-openvpn.desktop.in.h:2
+#, fuzzy
 msgid "VPN Connection Manager (OpenVPN)"
-msgstr "Gestor de conexiones VPN (OpenVPN)"
+msgstr "Connection Management"
 
 #: ../properties/nm-openvpn.c:108
+#, fuzzy
 msgid "OpenVPN Client"
-msgstr "Cliente OpenVPN"
+msgstr "Cliente IPP"
 
+#
+# include/printconf/dialogs.ycp:1787
 #: ../properties/nm-openvpn.c:614
+#, fuzzy
 msgid "The following OpenVPN connection will be created:"
-msgstr "Se creará la siguiente conexión OpenVPN:"
+msgstr "Los siguientes escáneres se desactivarán:"
 
 #: ../properties/nm-openvpn.c:616
-#, c-format
+#, fuzzy, c-format
 msgid "Name:  %s"
-msgstr "Nombre: %s"
+msgstr "No&mbre:"
 
 #: ../properties/nm-openvpn.c:624
+#, fuzzy
 msgid "Connection Type: X.509 Certificates"
-msgstr "Tipo de conexión: Certificados X.509"
+msgstr "Elija un certificado"
 
 #: ../properties/nm-openvpn.c:627 ../properties/nm-openvpn.c:654
 #: ../properties/nm-openvpn.c:666
 #, c-format
 msgid "CA:  %s"
-msgstr "CA: %s"
+msgstr ""
 
+# clients/inst_custom_part.ycp:2337
+# clients/inst_custom_part.ycp:2336
+# clients/inst_custom_part.ycp:2350
 #: ../properties/nm-openvpn.c:630 ../properties/nm-openvpn.c:669
-#, c-format
+#, fuzzy, c-format
 msgid "Cert:  %s"
-msgstr "Cert: %s"
+msgstr "Crear %1$s"
 
 #: ../properties/nm-openvpn.c:633 ../properties/nm-openvpn.c:672
-#, c-format
+#, fuzzy, c-format
 msgid "Key:  %s"
-msgstr "Clave: %s"
+msgstr "Clave:"
 
+# include/mail/ui.ycp:354
+# include/mail/ui.ycp:371
 #: ../properties/nm-openvpn.c:637
+#, fuzzy
 msgid "Connection Type: Shared Key"
-msgstr "Tipo de conexión: Clave compartida"
+msgstr "Tipo de conexión"
 
 #: ../properties/nm-openvpn.c:640
-#, c-format
+#, fuzzy, c-format
 msgid "Shared Key:  %s"
-msgstr "Clave compartida: %s"
+msgstr "Clave compartida"
 
+# include/network/isdn/complex.ycp:195 include/network/lan/dialogs.ycp:145
+# include/network/modem/complex.ycp:196
 #: ../properties/nm-openvpn.c:643
-#, c-format
+#, fuzzy, c-format
 msgid "Local IP:  %s"
-msgstr "IP local: %s"
+msgstr "Dirección IP local"
 
+# 
+# include/network/isdn/ip.ycp:72 include/network/isdn/ip.ycp:98
 #: ../properties/nm-openvpn.c:646
-#, c-format
+#, fuzzy, c-format
 msgid "Remote IP:  %s"
-msgstr "IP remota: %s"
+msgstr "Dirección IP re&mota"
 
+# include/mail/ui.ycp:354
+# include/mail/ui.ycp:371
 #: ../properties/nm-openvpn.c:651
+#, fuzzy
 msgid "Connection Type: Password"
-msgstr "Tipo de conexión: Contraseña"
+msgstr "Tipo de conexión"
 
+# 
+# include/network/providers.ycp:498 include/network/providers.ycp:681
 #: ../properties/nm-openvpn.c:657 ../properties/nm-openvpn.c:675
-#, c-format
+#, fuzzy, c-format
 msgid "Username:  %s"
-msgstr "Usuario: %s"
+msgstr "Nombre de usuario: %1"
 
 #: ../properties/nm-openvpn.c:663
 msgid "Connection Type: X.509 with Password Authentication"
-msgstr "Tipo de conexión: X.509 con autenticación por contraseña"
+msgstr ""
 
+# modules/inst_video_data.ycp:68 modules/inst_video_data.ycp:206
+# include/cups/ui.ycp:2328
+# include/cups/ui.ycp:2025
 #: ../properties/nm-openvpn.c:681
-#, c-format
+#, fuzzy, c-format
 msgid "Remote:  %s"
-msgstr "Remoto: %s"
+msgstr "Función: %s"
 
+# include/partitioning/lvm_ui_lib.ycp:351
+# include/partitioning/lvm_ui_lib.ycp:351
+# include/partitioning/lvm_ui_lib.ycp:377
 #: ../properties/nm-openvpn.c:684
-#, c-format
+#, fuzzy, c-format
 msgid "Device: %s"
-msgstr "Dispositivo: %s"
+msgstr "Dispositivo: %1"
 
 #: ../properties/nm-openvpn.c:684
+#, fuzzy
 msgid "TAP"
-msgstr "TAP"
+msgstr "PAP"
 
 #: ../properties/nm-openvpn.c:684
+#, fuzzy
 msgid "TUN"
-msgstr "TUN"
+msgstr "LUN"
 
+# include/mail/ui.ycp:720
+# include/mail/ui.ycp:747
+# 
+# include/mail/ui.ycp:819
+# include/mail/ui.ycp:1013
 #: ../properties/nm-openvpn.c:687
-#, c-format
+#, fuzzy, c-format
 msgid "Protocol: %s"
-msgstr "Protocolo: %s"
+msgstr "Protocolo"
 
+# clients/online_update.ycp:251
 #: ../properties/nm-openvpn.c:687
+#, fuzzy
 msgid "TCP"
-msgstr "TCP"
+msgstr "TCP: "
 
 #: ../properties/nm-openvpn.c:687
+#, fuzzy
 msgid "UDP"
-msgstr "UDP"
+msgstr "UDP: "
 
 #: ../properties/nm-openvpn.c:691
-#, c-format
+#, fuzzy, c-format
 msgid "Routes:  %s"
-msgstr "Rutas: %s"
+msgstr "Rutas: %1"
 
 #: ../properties/nm-openvpn.c:695
-#, c-format
+#, fuzzy, c-format
 msgid "Use LZO Compression: %s"
-msgstr "Usar compresión LZO: %s"
+msgstr "Compresión"
 
 #: ../properties/nm-openvpn.c:695
 msgid "Yes"
@@ -185,36 +247,47 @@ msgstr "No"
 
 #: ../properties/nm-openvpn.c:698
 msgid "The connection details can be changed using the \"Edit\" button."
-msgstr "Los detalles de la conexión se pueden modificar mediante el botón «Editar»."
+msgstr ""
 
 #: ../properties/nm-openvpn.c:849
+#, fuzzy
 msgid "Cannot import settings"
-msgstr "No se pueden importar los ajustes"
+msgstr "No es posible escribir la configuración"
 
 #: ../properties/nm-openvpn.c:851
-#, c-format
+#, fuzzy, c-format
 msgid "The VPN settings file '%s' does not contain valid data."
-msgstr "El archivo de ajustes «%s» no contiene datos válidos."
+msgstr "El archivo especificado no contiene ninguna clave TSIG."
 
 #: ../properties/nm-openvpn.c:885
+#, fuzzy
 msgid "Select file to import"
-msgstr "Seleccione un archivo para importar"
+msgstr "Seleccione el archivo que desea cargar."
 
+#
+# include/cups/ui.ycp:1323
+# include/cups/ui.ycp:1058
 #: ../properties/nm-openvpn.c:966 ../properties/nm-openvpn.c:978
+#, fuzzy
 msgid "Select CA to use"
-msgstr "Seleccione la CA que desea utilizar"
+msgstr "&Seleccionar usuario:"
 
 #: ../properties/nm-openvpn.c:969
+#, fuzzy
 msgid "Select certificate to use"
-msgstr "Seleccione el certificado que desea utilizar"
+msgstr "Seleccionar archivo de certificado"
 
+# 
+# include/tv/ui.ycp:529
 #: ../properties/nm-openvpn.c:972
+#, fuzzy
 msgid "Select key to use"
-msgstr "Seleccione la clave que desea utilizar"
+msgstr "Seleccione el sintonizador que desee."
 
 #: ../properties/nm-openvpn.c:975
+#, fuzzy
 msgid "Select shared key to use"
-msgstr "Seleccione la clave compartida que desea utilizar"
+msgstr "Seleccione el archivo PPD que desea usar."
 
 #. printf ("in impl_export\n");
 #: ../properties/nm-openvpn.c:1147
@@ -222,49 +295,70 @@ msgid "Save as..."
 msgstr "Guardar como..."
 
 #: ../properties/nm-openvpn.c:1177
-#, c-format
+#, fuzzy, c-format
 msgid "A file named \"%s\" already exists."
-msgstr "Ya existe un archivo llamado «%s»."
+msgstr "Ya existe un host llamado %1."
 
+# clients/inst_sw_select.ycp:360
+# clients/inst_sw_select.ycp:436
+# 
 #: ../properties/nm-openvpn.c:1180
+#, fuzzy
 msgid "Do you want to replace it with the one you are saving?"
-msgstr "¿Desea reemplazarlo con el archivo que está guardando?"
+msgstr "¿Desea realmente reiniciar la selección?"
 
 #: ../properties/nm-openvpn-dialog.glade.h:1
+#, fuzzy
 msgid "<b>Connection Name</b>"
-msgstr "<b>Nombre de la conexión</b>"
+msgstr "<b>Descripción:</b>"
 
+# clients/online_update_details.ycp:113
 #: ../properties/nm-openvpn-dialog.glade.h:2
+#, fuzzy
 msgid "<b>Optional Information</b>"
-msgstr "<b>Información opcional</b>"
+msgstr "Información opcional"
 
+# clients/support_question.ycp:110
+# clients/support_question.ycp:118
+# clients/support_question.ycp:121
 #: ../properties/nm-openvpn-dialog.glade.h:3
+#, fuzzy
 msgid "<b>Required Information</b>"
-msgstr "<b>Información obligatoria</b>"
+msgstr "<p><b>Información de asistencia</b></p>\n"
 
 #: ../properties/nm-openvpn-dialog.glade.h:4
 msgid "<i>example: 172.16.0.0/16 10.11.12.0/24</i>"
-msgstr "<i>por ejemplo: 172.16.0.0/16 10.11.12.0/24</i>"
+msgstr ""
 
 #: ../properties/nm-openvpn-dialog.glade.h:5
+#, fuzzy
 msgid "CA  file:"
-msgstr "Archivo CA:"
+msgstr "CA guardada a archivo."
 
 #: ../properties/nm-openvpn-dialog.glade.h:6
+#, fuzzy
 msgid "Certificate:"
-msgstr "Certificado:"
+msgstr "Certificado"
 
+# include/mail/ui.ycp:354
+# include/mail/ui.ycp:371
 #: ../properties/nm-openvpn-dialog.glade.h:7
+#, fuzzy
 msgid "Connection Type:"
-msgstr "Tipo de conexión:"
+msgstr "Tipo de conexión"
 
 #: ../properties/nm-openvpn-dialog.glade.h:8
 msgid "Key:"
 msgstr "Clave:"
 
+# include/mail/ui.ycp:562 include/mail/ui.ycp:720
+# include/mail/ui.ycp:592 include/mail/ui.ycp:747
+# include/mail/ui.ycp:664 include/mail/ui.ycp:819
+# include/mail/ui.ycp:727 include/mail/ui.ycp:1013
 #: ../properties/nm-openvpn-dialog.glade.h:9
+#, fuzzy
 msgid "Local IP:"
-msgstr "IP Local:"
+msgstr "Local"
 
 #: ../properties/nm-openvpn-dialog.glade.h:10
 msgid "Password"
@@ -274,47 +368,59 @@ msgstr "Contraseña"
 msgid ""
 "Please enter the information provided by your system administrator below. Do "
 "not enter your password here as you will be prompted when connecting."
-msgstr "Introduzca la información proporcionada por su administrador de sistemas aquí abajo. No introduzca su contraseña, puesto que se le pedirá cuando conecte."
+msgstr ""
 
 #: ../properties/nm-openvpn-dialog.glade.h:12
 msgid ""
 "Please note that the file you import is not an OpenVPN configuration file. "
 "Ask your adminstrator for the file."
 msgstr ""
-"Fíjese en que el archivo que está importando no es un archivo de configuración OpenVPN. "
-"Pida este archivo a su administrador."
 
+# include/partitioning/lvm_ui_lib.ycp:363 include/partitioning/raid_ui.ycp:349
+# include/partitioning/lvm_ui_lib.ycp:363 include/partitioning/raid_ui.ycp:349
+# include/partitioning/lvm_ui_lib.ycp:389 include/partitioning/raid_ui.ycp:349
 #: ../properties/nm-openvpn-dialog.glade.h:13
+#, fuzzy
 msgid "Remote IP:"
-msgstr "IP remota:"
+msgstr "Remota"
 
 #: ../properties/nm-openvpn-dialog.glade.h:14
+#, fuzzy
 msgid "Shared Key:"
-msgstr "Clave compartida:"
+msgstr "Clave compartida"
 
 #: ../properties/nm-openvpn-dialog.glade.h:15
+#, fuzzy
 msgid "Shared key"
 msgstr "Clave compartida"
 
 #: ../properties/nm-openvpn-dialog.glade.h:16
+#, fuzzy
 msgid "Use LZO compression"
-msgstr "Usar compresión LZO"
+msgstr "Compresión"
 
+# include/scanner/scanner_usb.ycp:47
+# include/scanner/scanner_usb.ycp:47
+# include/scanner/scanner_usb.ycp:47
 #: ../properties/nm-openvpn-dialog.glade.h:17
+#, fuzzy
 msgid "Use TAP device"
-msgstr "Usar dispositivo TAP"
+msgstr "Dispositivos &USB"
 
+# include/printconf/dialogs.ycp:150
 #: ../properties/nm-openvpn-dialog.glade.h:18
+#, fuzzy
 msgid "Use TCP connection"
-msgstr "Usar conexión TCP"
+msgstr "Probar conexión"
 
 #: ../properties/nm-openvpn-dialog.glade.h:19
+#, fuzzy
 msgid "Username:"
-msgstr "Usuario:"
+msgstr "Nombre de &usuario:"
 
 #: ../properties/nm-openvpn-dialog.glade.h:20
 msgid "X.509"
-msgstr "X.509"
+msgstr ""
 
 #: ../properties/nm-openvpn-dialog.glade.h:21
 msgid ""
@@ -323,18 +429,16 @@ msgid ""
 "Password Authentication\n"
 "X.509 with Password Authentication"
 msgstr ""
-"Certificados X.509\n"
-"Clave pre.compartida\n"
-"Autenticación por contraseña\n"
-"X.509 con autenticación por contraseña"
 
 #: ../properties/nm-openvpn-dialog.glade.h:25
+#, fuzzy
 msgid "_Gateway:"
-msgstr "_Pasarela:"
+msgstr "Pasarela"
 
 #: ../properties/nm-openvpn-dialog.glade.h:26
+#, fuzzy
 msgid "_Import Saved Configuration..."
-msgstr "_Importar configuración guardada..."
+msgstr "Configuración del &servidor..."
 
 #: ../properties/nm-openvpn-dialog.glade.h:27
 msgid ""
@@ -350,29 +454,31 @@ msgstr ""
 msgid ""
 "The VPN login failed because the user name and password were not accepted or "
 "the certificate password was wrong."
-msgstr "El acceso VPN ha fallado porque el nombre de usuario y la contraseña no fueron aceptadas o la contraseña del certificado es errónea."
+msgstr ""
 
 #: ../src/nm-openvpn-service.c:138
 msgid "The VPN login failed because the VPN program could not be started."
-msgstr "El acceso VPN ha fallado porque no se ha podido iniciar el programa VPN."
+msgstr ""
 
 #: ../src/nm-openvpn-service.c:140
 msgid ""
 "The VPN login failed because the VPN program could not connect to the VPN "
 "server."
-msgstr "El acceso VPN ha fallado porque el programa VPN no ha podido conectar con el servidor VPN."
+msgstr ""
 
 #: ../src/nm-openvpn-service.c:142
-msgid "The VPN login failed because the VPN configuration options were invalid."
-msgstr "El acceso VPN ha fallado porque las opciones de configuración de VPN eran incorrectas."
+msgid ""
+"The VPN login failed because the VPN configuration options were invalid."
+msgstr ""
 
 #: ../src/nm-openvpn-service.c:144
 msgid ""
 "The VPN login failed because the VPN program received an invalid "
 "configuration from the VPN server."
-msgstr "El acceso VPN ha fallado porque el programa VPN recibió una configuración incorrecta del servidor VPN."
+msgstr ""
 
+# clients/rc_config_step1.ycp:296
 #: ../src/nm-openvpn-service.c:146
+#, fuzzy
 msgid "VPN connection failed"
-msgstr "La conexión VPN ha fallado"
-
+msgstr "No se ha definido ninguna conexión."
diff --git a/vpn-daemons/openvpn/po/fi.po b/vpn-daemons/openvpn/po/fi.po
index 132757a5f8..73ece64a67 100644
--- a/vpn-daemons/openvpn/po/fi.po
+++ b/vpn-daemons/openvpn/po/fi.po
@@ -1,21 +1,20 @@
-# Finnish messages for NetworkManager-openvpn.
-# Copyright (C) 2006 Ilkka Tuohela
-# Ilkka Tuohela <hile@iki.fi>, 2006.
-#
-# Suomennos: http://gnome.fi/
+# translation of NetworkManager-openvpn.po to
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 #
+# Jyri Palokangas <jmp@netti.fi>, 2006.
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager-openvpn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-28 22:00+0200\n"
-"PO-Revision-Date: 2006-02-28 22:33+0200\n"
-"Last-Translator: Ilkka Tuohela <hile@iki.fi>\n"
-"Language-Team: Finnish <gnome-fi-laatu@lists.sourceforge.net>\n"
+"POT-Creation-Date: 2006-05-16 17:16+0200\n"
+"PO-Revision-Date: 2006-06-02 10:28+0300\n"
+"Last-Translator: Jyri Palokangas <jmp@netti.fi>\n"
+"Language-Team:  <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.2\n"
 
 #: ../auth-dialog/gnome-two-password-dialog.c:148
 msgid "_Password:"
@@ -27,56 +26,56 @@ msgstr "_Toissijainen salasana:"
 
 #: ../auth-dialog/gnome-two-password-dialog.c:272
 msgid "_Username:"
-msgstr "_Käyttäjätunnus:"
+msgstr "_Käyttäjänimi:"
 
 #: ../auth-dialog/gnome-two-password-dialog.c:274
 msgid "_Domain:"
-msgstr "_Toimialue:"
+msgstr "Toimi_alue:"
 
 #: ../auth-dialog/gnome-two-password-dialog.c:360
 msgid "Connect _anonymously"
-msgstr "Yhdistä _anonyymisti"
+msgstr "Yhdistä nimettö_mästi"
 
 #: ../auth-dialog/gnome-two-password-dialog.c:365
 msgid "Connect as _user:"
-msgstr "Yhdistä _käyttäjänä:"
+msgstr "_Yhdistä käyttäjänä:"
 
 #: ../auth-dialog/gnome-two-password-dialog.c:471
 msgid "_Remember password for this session"
-msgstr "_Muista salasana istunnon ajan"
+msgstr "_Muista salasana tälle istunnolle"
 
 #: ../auth-dialog/gnome-two-password-dialog.c:473
 msgid "_Save password in keyring"
-msgstr "_Tallenna salasana avainrenkaaseen"
+msgstr "Tall_enna salasana avainrenkaaseen"
 
 #: ../auth-dialog/main.c:214
 #, c-format
 msgid "You need to authenticate to access the Virtual Private Network '%s'."
-msgstr "Yhteydenotto VPN-verkkoon \"%s\" vaatii kirjautumista."
+msgstr "Sinun täytyy tunnistautua saadaksesi pääsy virtuaaliseen näennäisverkkoon '%s'."
 
 #: ../auth-dialog/main.c:215
 msgid "Authenticate VPN"
-msgstr "Todenna VPN-yhteyden avaus"
+msgstr "Tunnistaudu VPN"
 
 #: ../auth-dialog/main.c:227 ../auth-dialog/main.c:252
 msgid "Certificate password:"
-msgstr "Varmennettu salasana:"
+msgstr "_Varmenteen salasana:"
 
 #: ../nm-openvpn.desktop.in.h:1
 msgid "Add, Remove, and Edit VPN Connections"
-msgstr "Lisää, poista tai muokkaa VPN-yhteyksiä"
+msgstr "Lisää, poista ja muokkaa VPN yhteyksiä"
 
 #: ../nm-openvpn.desktop.in.h:2
 msgid "VPN Connection Manager (OpenVPN)"
-msgstr "VPN-yhteyksien hallinta (OpenVPN)"
+msgstr "VPN yhteshallinta (OpenVPN)"
 
 #: ../properties/nm-openvpn.c:108
 msgid "OpenVPN Client"
-msgstr "OpenVPN-asiakas"
+msgstr "OpenVPN asiakas"
 
 #: ../properties/nm-openvpn.c:614
 msgid "The following OpenVPN connection will be created:"
-msgstr "Seuraava OpenVPN-yhteys luodaan:"
+msgstr "Seuraava OpenVPN yhteys luodaan:"
 
 #: ../properties/nm-openvpn.c:616
 #, c-format
@@ -85,7 +84,7 @@ msgstr "Nimi:  %s"
 
 #: ../properties/nm-openvpn.c:624
 msgid "Connection Type: X.509 Certificates"
-msgstr "Yhteyden tyyppi: X.509-varmenteet"
+msgstr "Yhteystyyppi: X.509 varmenteella"
 
 #: ../properties/nm-openvpn.c:627 ../properties/nm-openvpn.c:654
 #: ../properties/nm-openvpn.c:666
@@ -96,7 +95,7 @@ msgstr "CA:  %s"
 #: ../properties/nm-openvpn.c:630 ../properties/nm-openvpn.c:669
 #, c-format
 msgid "Cert:  %s"
-msgstr "Varmenne:  %s"
+msgstr "Cert:  %s"
 
 #: ../properties/nm-openvpn.c:633 ../properties/nm-openvpn.c:672
 #, c-format
@@ -105,7 +104,7 @@ msgstr "Avain:  %s"
 
 #: ../properties/nm-openvpn.c:637
 msgid "Connection Type: Shared Key"
-msgstr "Yhteyden tyyppi: jaettu avain"
+msgstr "Yhteystyyppi: Jaettu avain"
 
 #: ../properties/nm-openvpn.c:640
 #, c-format
@@ -115,30 +114,30 @@ msgstr "Jaettu avain:  %s"
 #: ../properties/nm-openvpn.c:643
 #, c-format
 msgid "Local IP:  %s"
-msgstr "Oma IP-osoite:  %s"
+msgstr "Paikallinen IP:  %s"
 
 #: ../properties/nm-openvpn.c:646
 #, c-format
 msgid "Remote IP:  %s"
-msgstr "Palvelimen IP-osoite:  %s"
+msgstr "Etä IP:  %s"
 
 #: ../properties/nm-openvpn.c:651
 msgid "Connection Type: Password"
-msgstr "Yhteyden tyyppi: Salasana"
+msgstr "Yhteystyyppi: Salasana"
 
 #: ../properties/nm-openvpn.c:657 ../properties/nm-openvpn.c:675
 #, c-format
 msgid "Username:  %s"
-msgstr "Käyttäjätunnus:  %s"
+msgstr "Käyttäjänimi:  %s"
 
 #: ../properties/nm-openvpn.c:663
 msgid "Connection Type: X.509 with Password Authentication"
-msgstr "Yhteyden tyyppi: X.509 salasanalla todennuksella"
+msgstr "Yhteystyyppi: X.509 salasana tunnistautumisella"
 
 #: ../properties/nm-openvpn.c:681
 #, c-format
 msgid "Remote:  %s"
-msgstr "Palvelin:  %s"
+msgstr "Etä:  %s"
 
 #: ../properties/nm-openvpn.c:684
 #, c-format
@@ -156,7 +155,7 @@ msgstr "TUN"
 #: ../properties/nm-openvpn.c:687
 #, c-format
 msgid "Protocol: %s"
-msgstr "Protokolla: %s"
+msgstr "Yhteyskäytäntö: %s"
 
 #: ../properties/nm-openvpn.c:687
 msgid "TCP"
@@ -174,7 +173,7 @@ msgstr "Reitit:  %s"
 #: ../properties/nm-openvpn.c:695
 #, c-format
 msgid "Use LZO Compression: %s"
-msgstr "Käytä LZO-pakkausta: %s"
+msgstr "Käytä LZO pakkausta: %s"
 
 #: ../properties/nm-openvpn.c:695
 msgid "Yes"
@@ -186,16 +185,16 @@ msgstr "Ei"
 
 #: ../properties/nm-openvpn.c:698
 msgid "The connection details can be changed using the \"Edit\" button."
-msgstr "Yhteyden yksityiskohtia voi muuttaa valitsemalla \"Muokkaa\"."
+msgstr "Yhteyden yksityiskohtia voi muuttaa käyttämällä \"Muokkaa\" painiketta."
 
 #: ../properties/nm-openvpn.c:849
 msgid "Cannot import settings"
-msgstr "Asetuksia ei voi tuoda"
+msgstr "Asetusten tuonti ei onnistu"
 
 #: ../properties/nm-openvpn.c:851
 #, c-format
 msgid "The VPN settings file '%s' does not contain valid data."
-msgstr "VPN-asetustiedosto \"%s\" ei sisällä kelvollisia tietoja."
+msgstr "VPN asetustiedosto '%s' ei sisällä kelpoa dataa."
 
 #: ../properties/nm-openvpn.c:885
 msgid "Select file to import"
@@ -225,11 +224,11 @@ msgstr "Tallenna nimellä..."
 #: ../properties/nm-openvpn.c:1177
 #, c-format
 msgid "A file named \"%s\" already exists."
-msgstr "Tiedosto \"%s\" on jo olemassa."
+msgstr "Tiedosto nimellä \"%s\" on jo olemassa."
 
 #: ../properties/nm-openvpn.c:1180
 msgid "Do you want to replace it with the one you are saving?"
-msgstr "Haluatko korvata sen tiedostolla jota olet tallentamassa?"
+msgstr "Haluatko korvata se tiedostolla jota olet tallentamassa?"
 
 #: ../properties/nm-openvpn-dialog.glade.h:1
 msgid "<b>Connection Name</b>"
@@ -237,7 +236,7 @@ msgstr "<b>Yhteyden nimi</b>"
 
 #: ../properties/nm-openvpn-dialog.glade.h:2
 msgid "<b>Optional Information</b>"
-msgstr "<b>Lisätietoja</b>"
+msgstr "<b>Valinnaiset tiedot</b>"
 
 #: ../properties/nm-openvpn-dialog.glade.h:3
 msgid "<b>Required Information</b>"
@@ -245,11 +244,11 @@ msgstr "<b>Vaaditut tiedot</b>"
 
 #: ../properties/nm-openvpn-dialog.glade.h:4
 msgid "<i>example: 172.16.0.0/16 10.11.12.0/24</i>"
-msgstr "<i>esimerkki: 172.16.0.0/16 10.11.12.0/24</i>"
+msgstr "<i>esimerkiksi: 172.16.0.0/16 10.11.12.0/24</i>"
 
 #: ../properties/nm-openvpn-dialog.glade.h:5
 msgid "CA  file:"
-msgstr "CA-tiedosto:"
+msgstr "CA  tiedosto:"
 
 #: ../properties/nm-openvpn-dialog.glade.h:6
 msgid "Certificate:"
@@ -257,7 +256,7 @@ msgstr "Varmenne:"
 
 #: ../properties/nm-openvpn-dialog.glade.h:7
 msgid "Connection Type:"
-msgstr "Yhteyden tyyppi:"
+msgstr "Yhteystyyppi:"
 
 #: ../properties/nm-openvpn-dialog.glade.h:8
 msgid "Key:"
@@ -265,7 +264,7 @@ msgstr "Avain:"
 
 #: ../properties/nm-openvpn-dialog.glade.h:9
 msgid "Local IP:"
-msgstr "Paikallinen IP-osoite:"
+msgstr "Paikallinen IP:"
 
 #: ../properties/nm-openvpn-dialog.glade.h:10
 msgid "Password"
@@ -275,21 +274,19 @@ msgstr "Salasana"
 msgid ""
 "Please enter the information provided by your system administrator below. Do "
 "not enter your password here as you will be prompted when connecting."
-msgstr ""
-"Syötä järjestelmän ylläpitäjältä saamasi tiedot alla oleviin kohtiin. Älä "
-"syötä tähän salasanaasi, sillä se kysytään vasta otettaessa yhteyttä."
+msgstr "Anna järjestelmänvalvojalta saamasi tiedot tähän. Älä anna salasanaasi tässä, se kysytään kun otat yhteyden."
 
 #: ../properties/nm-openvpn-dialog.glade.h:12
 msgid ""
 "Please note that the file you import is not an OpenVPN configuration file. "
 "Ask your adminstrator for the file."
 msgstr ""
-"Huomaa, ettei tuotava tiedosto ole OpenVPN-ohjelmiston asetustiedosto. "
-"Kysy ylläpitäjältäsi oikeaa tiedostoa."
+"Huomaa että tiedosto jonka toit ei ole OpenVPN määritystiedosto. "
+"Pyydä tiedostoa järjestelmänvalvojalta."
 
 #: ../properties/nm-openvpn-dialog.glade.h:13
 msgid "Remote IP:"
-msgstr "Palvelimen IP-osoite:"
+msgstr "Etä IP:"
 
 #: ../properties/nm-openvpn-dialog.glade.h:14
 msgid "Shared Key:"
@@ -301,11 +298,11 @@ msgstr "Jaettu avain"
 
 #: ../properties/nm-openvpn-dialog.glade.h:16
 msgid "Use LZO compression"
-msgstr "Käytä LZO-pakkausta"
+msgstr "Käytä LZO pakkausta"
 
 #: ../properties/nm-openvpn-dialog.glade.h:17
 msgid "Use TAP device"
-msgstr "Käytä TAP-laitetta"
+msgstr "Käytä TAP laitetta"
 
 #: ../properties/nm-openvpn-dialog.glade.h:18
 msgid "Use TCP connection"
@@ -326,10 +323,10 @@ msgid ""
 "Password Authentication\n"
 "X.509 with Password Authentication"
 msgstr ""
-"X.509-varmenteet\n"
-"Jaettu avain\n"
-"Salasanalla todentaminen\n"
-"X.509 salasanatodennuksella"
+"X.509 varmenteet\n"
+"Esi-jaettu avain\n"
+"Salasana tunnistus\n"
+"X.509 salasana tunnistuksella"
 
 #: ../properties/nm-openvpn-dialog.glade.h:25
 msgid "_Gateway:"
@@ -337,56 +334,47 @@ msgstr "_Yhdyskäytävä:"
 
 #: ../properties/nm-openvpn-dialog.glade.h:26
 msgid "_Import Saved Configuration..."
-msgstr "Tuo tallennettu määrittely..."
+msgstr "Tuo tallennettu määr_itys..."
 
 #: ../properties/nm-openvpn-dialog.glade.h:27
 msgid ""
 "_Name used to identify the connection to the private network, e.g. \"Campus "
 "VPN\" or \"Corporate Network\""
 msgstr ""
-"_Nimi, josta yhteys yksityiseen verkkoon tunnistetaan: esimerkiksi "
-"\"Kampusverkko\" tai \"Työpaikan verkko\"."
+"_Nimi jota käytetään yhteyden tunnistukseen yksityisessä verkossa, esim. \"Kampus "
+"VPN\" tai \"Yhtiön verkko\""
 
 #: ../properties/nm-openvpn-dialog.glade.h:28
 msgid "_Only use VPN connection for these addresses"
-msgstr "_Käytä VPN-yhteyttä näille osotteille"
+msgstr "Käytä vain VPN yhteyttä näihin _osoitteisiin"
 
 #: ../src/nm-openvpn-service.c:136
 msgid ""
 "The VPN login failed because the user name and password were not accepted or "
 "the certificate password was wrong."
-msgstr ""
-"VPN-kirjautuminen epäonnistui, koska käyttäjätunnusta ja salasanaa ei "
-"hyväsytty, tai varmenteen salasana oli väärin."
+msgstr "VPN kirjautuminen epäonnistui koska käyttäjänimeä ja salasanaa ei hyväksytty tai varmenteen salasana oli väärä."
 
 #: ../src/nm-openvpn-service.c:138
 msgid "The VPN login failed because the VPN program could not be started."
-msgstr "VPN-kirjautuminen epäonnistui, koska VPN-ohjelmaa ei voitu käynnistää."
+msgstr "VPN kirjautuminen epäonnistui koska VPN ohjelmaa ei onnistuttu käynnistämään."
 
 #: ../src/nm-openvpn-service.c:140
 msgid ""
 "The VPN login failed because the VPN program could not connect to the VPN "
 "server."
-msgstr ""
-"VPN-kirjatuminen epäonnistui, koska VPN-ohjelma ei saanut yhteyttä "
-"VPN-palvelimeen."
+msgstr "VPN kirjautuminen epäonnistui koska VPN ohjelma ei saanut yhteyttä VPN-palvelimeen."
 
 #: ../src/nm-openvpn-service.c:142
-msgid ""
-"The VPN login failed because the VPN configuration options were invalid."
-msgstr ""
-"VPN-kirjautuminen epäonnistui, koska VPN-asetuksten valinnat olivat "
-"virheelliset."
+msgid "The VPN login failed because the VPN configuration options were invalid."
+msgstr "VPN kirjautuminen epäonnistui koska VPN määrityksen valinnat olivat virheellisiä."
 
 #: ../src/nm-openvpn-service.c:144
 msgid ""
 "The VPN login failed because the VPN program received an invalid "
 "configuration from the VPN server."
-msgstr ""
-"VPN-kirjautumien epäonnstui, koska VPN-ohjelma sai epäyhteensopivat "
-"asetukset VPN-palvelimelta."
+msgstr "VPN kirjautuminen epäonnistui koska VPN ohjelma vastaanotti virheellisen määrityksen VPN-palvelimelta."
 
 #: ../src/nm-openvpn-service.c:146
 msgid "VPN connection failed"
-msgstr "VPN-yhteys epäonnistui"
+msgstr "VPN yhteys epäonnistui"
 
diff --git a/vpn-daemons/openvpn/po/fr.po b/vpn-daemons/openvpn/po/fr.po
new file mode 100644
index 0000000000..fa898e832f
--- /dev/null
+++ b/vpn-daemons/openvpn/po/fr.po
@@ -0,0 +1,479 @@
+# French message file for YaST2 (@memory@).
+# Copyright (C) 2005 SUSE Linux Products GmbH.
+# Copyright (C) 2002, 2003 SuSE Linux AG.
+# Copyright (C) 2000, 2001 SuSE GmbH.
+# Patricia Vaz <patricia@suse.de>, 2003.
+# Francoise Lermen <flermen@suse.de>, 2000, 2001, 2002.
+# Karine Nguyen <karine@suse.de>, 2001.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: YaST (@memory@)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-05-16 17:16+0200\n"
+"PO-Revision-Date: 2003-02-12 09:50+0100\n"
+"Last-Translator: Patricia Vaz <patricia@suse.de>\n"
+"Language-Team: French <i18n@suse.de>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+# TLABEL online_update_2002_03_14_2340__10
+#: ../auth-dialog/gnome-two-password-dialog.c:148
+#, fuzzy
+msgid "_Password:"
+msgstr "Mot de passe :"
+
+# TLABEL users_2002_01_04_0147__49
+#: ../auth-dialog/gnome-two-password-dialog.c:149
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "&Vérifier le mot de passe :"
+
+# TLABEL packages_2002_03_14_2340__5
+#: ../auth-dialog/gnome-two-password-dialog.c:272
+#, fuzzy
+msgid "_Username:"
+msgstr "Nom d'&utilisateur :"
+
+# TLABEL autoinst_2002_08_07_0216__305
+#: ../auth-dialog/gnome-two-password-dialog.c:274
+#, fuzzy
+msgid "_Domain:"
+msgstr "&Domaine :"
+
+# TLABEL printconf_2002_01_04_0147__63
+#: ../auth-dialog/gnome-two-password-dialog.c:360
+#, fuzzy
+msgid "Connect _anonymously"
+msgstr "Connexions"
+
+# TLABEL scanner_2002_01_04_0147__22
+#: ../auth-dialog/gnome-two-password-dialog.c:365
+#, fuzzy
+msgid "Connect as _user:"
+msgstr "Connecté en tant que"
+
+# TLABEL partitioning_2002_01_04_0147__215
+#: ../auth-dialog/gnome-two-password-dialog.c:471
+#, fuzzy
+msgid "_Remember password for this session"
+msgstr ""
+"Entrez à nouveau votre mot de passe\n"
+"pour &vérification :"
+
+# TLABEL user_2002_03_14_2340__5
+#: ../auth-dialog/gnome-two-password-dialog.c:473
+#, fuzzy
+msgid "_Save password in keyring"
+msgstr "Définir le chiffrement du mot de passe"
+
+#: ../auth-dialog/main.c:214
+#, c-format
+msgid "You need to authenticate to access the Virtual Private Network '%s'."
+msgstr ""
+
+# TLABEL autoinst_2002_08_07_0216__146
+#: ../auth-dialog/main.c:215
+#, fuzzy
+msgid "Authenticate VPN"
+msgstr "Authentification"
+
+# TLABEL users_2002_01_04_0147__49
+#: ../auth-dialog/main.c:227 ../auth-dialog/main.c:252
+#, fuzzy
+msgid "Certificate password:"
+msgstr "Mot de passe du &certificat :"
+
+#: ../nm-openvpn.desktop.in.h:1
+msgid "Add, Remove, and Edit VPN Connections"
+msgstr ""
+
+# TLABEL lan_2002_01_04_0147__200
+#: ../nm-openvpn.desktop.in.h:2
+#, fuzzy
+msgid "VPN Connection Manager (OpenVPN)"
+msgstr "Connection Management"
+
+# TLABEL rpm-groups_2002_03_14_2340__22
+#: ../properties/nm-openvpn.c:108
+#, fuzzy
+msgid "OpenVPN Client"
+msgstr "Client IPP"
+
+# TLABEL printer_2002_08_07_0216__75
+#: ../properties/nm-openvpn.c:614
+#, fuzzy
+msgid "The following OpenVPN connection will be created:"
+msgstr "Les scanneurs suivants seront désactivés :"
+
+# TLABEL cups_2002_03_14_2340__13
+#: ../properties/nm-openvpn.c:616
+#, fuzzy, c-format
+msgid "Name:  %s"
+msgstr "&Nom:"
+
+# TLABEL cups_2002_01_04_0147__147
+#: ../properties/nm-openvpn.c:624
+#, fuzzy
+msgid "Connection Type: X.509 Certificates"
+msgstr "Choisir un certificat"
+
+#: ../properties/nm-openvpn.c:627 ../properties/nm-openvpn.c:654
+#: ../properties/nm-openvpn.c:666
+#, c-format
+msgid "CA:  %s"
+msgstr ""
+
+# TLABEL storage_2002_08_07_0216__37
+#: ../properties/nm-openvpn.c:630 ../properties/nm-openvpn.c:669
+#, fuzzy, c-format
+msgid "Cert:  %s"
+msgstr "Créer %1$s"
+
+# TLABEL autoinst_2002_08_07_0216__93
+#: ../properties/nm-openvpn.c:633 ../properties/nm-openvpn.c:672
+#, fuzzy, c-format
+msgid "Key:  %s"
+msgstr "Clé :"
+
+# TLABEL mail_2002_08_07_0216__1
+#: ../properties/nm-openvpn.c:637
+#, fuzzy
+msgid "Connection Type: Shared Key"
+msgstr "Type de connexion"
+
+# TLABEL packages_2002_03_14_2340__85
+#: ../properties/nm-openvpn.c:640
+#, fuzzy, c-format
+msgid "Shared Key:  %s"
+msgstr "Clé partagée"
+
+# TLABEL lan_2002_01_04_0147__306
+#: ../properties/nm-openvpn.c:643
+#, fuzzy, c-format
+msgid "Local IP:  %s"
+msgstr "Adresse IP locale"
+
+# TLABEL network_2002_03_14_2340__151
+#: ../properties/nm-openvpn.c:646
+#, fuzzy, c-format
+msgid "Remote IP:  %s"
+msgstr "Adresse IP d&istante"
+
+# TLABEL mail_2002_08_07_0216__1
+#: ../properties/nm-openvpn.c:651
+#, fuzzy
+msgid "Connection Type: Password"
+msgstr "Type de connexion"
+
+# TLABEL network_2002_03_14_2340__32
+#: ../properties/nm-openvpn.c:657 ../properties/nm-openvpn.c:675
+#, fuzzy, c-format
+msgid "Username:  %s"
+msgstr "Nom d'utilisateur : %1"
+
+#: ../properties/nm-openvpn.c:663
+msgid "Connection Type: X.509 with Password Authentication"
+msgstr ""
+
+# TLABEL wizard_2002_03_14_2340__7
+#: ../properties/nm-openvpn.c:681
+#, fuzzy, c-format
+msgid "Remote:  %s"
+msgstr "Rôle : %s"
+
+# TLABEL partitioning_2002_01_04_0147__400
+# Shorten translated string; agreed by flermen 2001-01-27.
+# 2001-01-29 11:13:40 CET -ke-
+# TLABEL modules/inst_custom_part.ycp:2168
+#: ../properties/nm-openvpn.c:684
+#, fuzzy, c-format
+msgid "Device: %s"
+msgstr "Périphérique : %1"
+
+#: ../properties/nm-openvpn.c:684
+#, fuzzy
+msgid "TAP"
+msgstr "PAP"
+
+#: ../properties/nm-openvpn.c:684
+#, fuzzy
+msgid "TUN"
+msgstr "Numéro d'unité logique"
+
+# TLABEL mail_2002_03_14_2340__44
+#: ../properties/nm-openvpn.c:687
+#, fuzzy, c-format
+msgid "Protocol: %s"
+msgstr "Protocole"
+
+# TLABEL online_update_2002_01_04_0147__21
+#: ../properties/nm-openvpn.c:687
+#, fuzzy
+msgid "TCP"
+msgstr "TCP :"
+
+#: ../properties/nm-openvpn.c:687
+#, fuzzy
+msgid "UDP"
+msgstr "UDP :"
+
+#: ../properties/nm-openvpn.c:691
+#, fuzzy, c-format
+msgid "Routes:  %s"
+msgstr "Routes: %1"
+
+# TLABEL rpm-groups_2002_03_14_2340__24
+#: ../properties/nm-openvpn.c:695
+#, fuzzy, c-format
+msgid "Use LZO Compression: %s"
+msgstr "Compression"
+
+# TLABEL autoinst_2002_08_07_0216__451
+#: ../properties/nm-openvpn.c:695
+msgid "Yes"
+msgstr "Oui"
+
+# TLABEL autoinst_2002_08_07_0216__459
+#: ../properties/nm-openvpn.c:695
+msgid "No"
+msgstr "Non"
+
+#: ../properties/nm-openvpn.c:698
+msgid "The connection details can be changed using the \"Edit\" button."
+msgstr ""
+
+# TLABEL profile-manager_2002_08_07_0216__9
+#: ../properties/nm-openvpn.c:849
+#, fuzzy
+msgid "Cannot import settings"
+msgstr "Impossible d'enregistrer les paramètres !"
+
+#: ../properties/nm-openvpn.c:851
+#, fuzzy, c-format
+msgid "The VPN settings file '%s' does not contain valid data."
+msgstr "Le fichier spécifié ne contient pas de clé TSIG."
+
+# TLABEL profile-manager_2002_08_07_0216__58
+#: ../properties/nm-openvpn.c:885
+#, fuzzy
+msgid "Select file to import"
+msgstr "Sélectionnez le fichier à copier."
+
+# TLABEL cups_2002_01_04_0147__185
+#: ../properties/nm-openvpn.c:966 ../properties/nm-openvpn.c:978
+#, fuzzy
+msgid "Select CA to use"
+msgstr "&Sélectionner un utilisateur :"
+
+# TLABEL restore_2002_08_07_0216__46
+#: ../properties/nm-openvpn.c:969
+#, fuzzy
+msgid "Select certificate to use"
+msgstr "Sélectionner un fichier certificat"
+
+# TLABEL tv_2002_01_04_0147__40
+#: ../properties/nm-openvpn.c:972
+#, fuzzy
+msgid "Select key to use"
+msgstr "Sélectionnez un tuner."
+
+#: ../properties/nm-openvpn.c:975
+#, fuzzy
+msgid "Select shared key to use"
+msgstr "Sélectionner le fichier PPD à utiliser."
+
+# TLABEL restore_2002_08_07_0216__41
+#. printf ("in impl_export\n");
+#: ../properties/nm-openvpn.c:1147
+msgid "Save as..."
+msgstr "Enregistrer sous..."
+
+# TLABEL network_2002_03_14_2340__39
+#: ../properties/nm-openvpn.c:1177
+#, fuzzy, c-format
+msgid "A file named \"%s\" already exists."
+msgstr "Un hôte nommé %1 existe déjà."
+
+# TLABEL packages_2002_03_14_2340__75
+#: ../properties/nm-openvpn.c:1180
+#, fuzzy
+msgid "Do you want to replace it with the one you are saving?"
+msgstr "Voulez-vous vraiment rétablir les paramètres initiaux ?"
+
+# TLABEL packages_2002_01_04_0147__194
+#: ../properties/nm-openvpn-dialog.glade.h:1
+#, fuzzy
+msgid "<b>Connection Name</b>"
+msgstr "<b>Description : </b>"
+
+# TLABEL online_update_2002_01_04_0147__48
+#: ../properties/nm-openvpn-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Optional Information</b>"
+msgstr "Informations facultatives"
+
+# TLABEL support_2002_01_04_0147__23
+#: ../properties/nm-openvpn-dialog.glade.h:3
+#, fuzzy
+msgid "<b>Required Information</b>"
+msgstr "<p><b>Informations relatives à l'assistance technique</b></p>\n"
+
+#: ../properties/nm-openvpn-dialog.glade.h:4
+msgid "<i>example: 172.16.0.0/16 10.11.12.0/24</i>"
+msgstr ""
+
+# TLABEL restore_2002_08_07_0216__41
+#: ../properties/nm-openvpn-dialog.glade.h:5
+#, fuzzy
+msgid "CA  file:"
+msgstr "AC enregistrée dans un fichier."
+
+#: ../properties/nm-openvpn-dialog.glade.h:6
+#, fuzzy
+msgid "Certificate:"
+msgstr "Certificat"
+
+# TLABEL mail_2002_08_07_0216__1
+#: ../properties/nm-openvpn-dialog.glade.h:7
+#, fuzzy
+msgid "Connection Type:"
+msgstr "Type de connexion"
+
+# TLABEL autoinst_2002_08_07_0216__93
+#: ../properties/nm-openvpn-dialog.glade.h:8
+msgid "Key:"
+msgstr "Clé :"
+
+# TLABEL mail_2002_03_14_2340__37
+#: ../properties/nm-openvpn-dialog.glade.h:9
+#, fuzzy
+msgid "Local IP:"
+msgstr "Local"
+
+# TLABEL packages_2002_03_14_2340__6
+#: ../properties/nm-openvpn-dialog.glade.h:10
+msgid "Password"
+msgstr "Mot de passe"
+
+#: ../properties/nm-openvpn-dialog.glade.h:11
+msgid ""
+"Please enter the information provided by your system administrator below. Do "
+"not enter your password here as you will be prompted when connecting."
+msgstr ""
+
+#: ../properties/nm-openvpn-dialog.glade.h:12
+msgid ""
+"Please note that the file you import is not an OpenVPN configuration file. "
+"Ask your adminstrator for the file."
+msgstr ""
+
+# TLABEL partitioning_2002_01_04_0147__406
+#: ../properties/nm-openvpn-dialog.glade.h:13
+#, fuzzy
+msgid "Remote IP:"
+msgstr "Distant"
+
+# TLABEL packages_2002_03_14_2340__85
+#: ../properties/nm-openvpn-dialog.glade.h:14
+#, fuzzy
+msgid "Shared Key:"
+msgstr "Clé partagée"
+
+# TLABEL packages_2002_03_14_2340__85
+#: ../properties/nm-openvpn-dialog.glade.h:15
+#, fuzzy
+msgid "Shared key"
+msgstr "Clé partagée"
+
+# TLABEL rpm-groups_2002_03_14_2340__24
+#: ../properties/nm-openvpn-dialog.glade.h:16
+#, fuzzy
+msgid "Use LZO compression"
+msgstr "Compression"
+
+# TLABEL scanner_2002_01_04_0147__73
+#: ../properties/nm-openvpn-dialog.glade.h:17
+#, fuzzy
+msgid "Use TAP device"
+msgstr "Périphériques &USB"
+
+# TLABEL printconf_2002_01_04_0147__63
+#: ../properties/nm-openvpn-dialog.glade.h:18
+#, fuzzy
+msgid "Use TCP connection"
+msgstr "Tester la connexion"
+
+# TLABEL packages_2002_03_14_2340__5
+#: ../properties/nm-openvpn-dialog.glade.h:19
+#, fuzzy
+msgid "Username:"
+msgstr "Nom d'&utilisateur :"
+
+#: ../properties/nm-openvpn-dialog.glade.h:20
+msgid "X.509"
+msgstr ""
+
+#: ../properties/nm-openvpn-dialog.glade.h:21
+msgid ""
+"X.509 Certificates\n"
+"Pre-shared key\n"
+"Password Authentication\n"
+"X.509 with Password Authentication"
+msgstr ""
+
+# TLABEL autoinst_2002_08_07_0216__316
+#: ../properties/nm-openvpn-dialog.glade.h:25
+#, fuzzy
+msgid "_Gateway:"
+msgstr "Passerelle"
+
+#: ../properties/nm-openvpn-dialog.glade.h:26
+#, fuzzy
+msgid "_Import Saved Configuration..."
+msgstr "Configuration du &serveur..."
+
+#: ../properties/nm-openvpn-dialog.glade.h:27
+msgid ""
+"_Name used to identify the connection to the private network, e.g. \"Campus "
+"VPN\" or \"Corporate Network\""
+msgstr ""
+
+#: ../properties/nm-openvpn-dialog.glade.h:28
+msgid "_Only use VPN connection for these addresses"
+msgstr ""
+
+#: ../src/nm-openvpn-service.c:136
+msgid ""
+"The VPN login failed because the user name and password were not accepted or "
+"the certificate password was wrong."
+msgstr ""
+
+#: ../src/nm-openvpn-service.c:138
+msgid "The VPN login failed because the VPN program could not be started."
+msgstr ""
+
+#: ../src/nm-openvpn-service.c:140
+msgid ""
+"The VPN login failed because the VPN program could not connect to the VPN "
+"server."
+msgstr ""
+
+#: ../src/nm-openvpn-service.c:142
+msgid ""
+"The VPN login failed because the VPN configuration options were invalid."
+msgstr ""
+
+#: ../src/nm-openvpn-service.c:144
+msgid ""
+"The VPN login failed because the VPN program received an invalid "
+"configuration from the VPN server."
+msgstr ""
+
+# TLABEL rc_config_2002_01_04_0147__19
+#: ../src/nm-openvpn-service.c:146
+#, fuzzy
+msgid "VPN connection failed"
+msgstr "Aucune connexion définie"
diff --git a/vpn-daemons/openvpn/po/hu.po b/vpn-daemons/openvpn/po/hu.po
new file mode 100644
index 0000000000..118a0d600a
--- /dev/null
+++ b/vpn-daemons/openvpn/po/hu.po
@@ -0,0 +1,446 @@
+# Hungarian message File YaST2 (@memory@).
+# Copyright (C) 2005 SUSE Linux Products GmbH.
+# Copyright (C) 2002 SuSE Linux AG.
+# Copyright (C) 2000, 2001 SuSE GmbH.
+# Marcel Hilzinger <hili@suselinux.hu>, 2001.
+# Sári Gábor <saga@tux.hu>, 2000.
+# Steve Varadi <svaradi@usa.com>, 2000.
+# Zoltán Levárdy <pogacsa@programmer.net>, 1999.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: YaST (@memory@)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-05-16 17:16+0200\n"
+"PO-Revision-Date: 2001-10-18 09:42+0200\n"
+"Last-Translator: Marcel Hilzinger <hili@suselinux.hu>\n"
+"Language-Team: Hungarian <i18n@suse.de>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:148
+#, fuzzy
+msgid "_Password:"
+msgstr "Jelszó:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:149
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "Jelszó &ellenőrzése:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:272
+#, fuzzy
+msgid "_Username:"
+msgstr "&Felhasználónév:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:274
+#, fuzzy
+msgid "_Domain:"
+msgstr "&Tartomány:"
+
+# clients/printconf_ask_device.ycp:192
+#: ../auth-dialog/gnome-two-password-dialog.c:360
+#, fuzzy
+msgid "Connect _anonymously"
+msgstr "Kapcsolatok"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:365
+#, fuzzy
+msgid "Connect as _user:"
+msgstr "Csatlakoztatva másképp: "
+
+#: ../auth-dialog/gnome-two-password-dialog.c:471
+#, fuzzy
+msgid "_Remember password for this session"
+msgstr "Az ellenőrzéshez adja meg a &jelszót újból:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:473
+#, fuzzy
+msgid "_Save password in keyring"
+msgstr "Jelszótitkosítás beállítása"
+
+#: ../auth-dialog/main.c:214
+#, c-format
+msgid "You need to authenticate to access the Virtual Private Network '%s'."
+msgstr ""
+
+# modules/inst_sw_single.ycp:63
+# clients/inst_sw_single.ycp:118
+#: ../auth-dialog/main.c:215
+#, fuzzy
+msgid "Authenticate VPN"
+msgstr "Hitelesítés"
+
+#: ../auth-dialog/main.c:227 ../auth-dialog/main.c:252
+#, fuzzy
+msgid "Certificate password:"
+msgstr "Tanúsítvány &jelszava:"
+
+#: ../nm-openvpn.desktop.in.h:1
+msgid "Add, Remove, and Edit VPN Connections"
+msgstr ""
+
+# clients/lan_modem.ycp:793
+#: ../nm-openvpn.desktop.in.h:2
+#, fuzzy
+msgid "VPN Connection Manager (OpenVPN)"
+msgstr "Kapcsolatkezelés"
+
+#: ../properties/nm-openvpn.c:108
+#, fuzzy
+msgid "OpenVPN Client"
+msgstr "IPP kliensek"
+
+#: ../properties/nm-openvpn.c:614
+#, fuzzy
+msgid "The following OpenVPN connection will be created:"
+msgstr "A következő lapolvasók kerülnek deaktiválásra:"
+
+#: ../properties/nm-openvpn.c:616
+#, fuzzy, c-format
+msgid "Name:  %s"
+msgstr "&Név:"
+
+#: ../properties/nm-openvpn.c:624
+#, fuzzy
+msgid "Connection Type: X.509 Certificates"
+msgstr "Válasszon tanúsítványt"
+
+#: ../properties/nm-openvpn.c:627 ../properties/nm-openvpn.c:654
+#: ../properties/nm-openvpn.c:666
+#, c-format
+msgid "CA:  %s"
+msgstr ""
+
+# modules/inst_custom_part.ycp:498
+#: ../properties/nm-openvpn.c:630 ../properties/nm-openvpn.c:669
+#, fuzzy, c-format
+msgid "Cert:  %s"
+msgstr "%1$s létrehozása"
+
+#: ../properties/nm-openvpn.c:633 ../properties/nm-openvpn.c:672
+#, fuzzy, c-format
+msgid "Key:  %s"
+msgstr "Kulcs:"
+
+# clients/printconf_ask_device.ycp:192
+#: ../properties/nm-openvpn.c:637
+#, fuzzy
+msgid "Connection Type: Shared Key"
+msgstr "Kapcsolat típusa"
+
+#: ../properties/nm-openvpn.c:640
+#, fuzzy, c-format
+msgid "Shared Key:  %s"
+msgstr "Osztott kulcs"
+
+# /usr/lib/YaST2/clients/lan_address.ycp:84
+# clients/lan_address.ycp:140 clients/lan_complex.ycp:521 clients/lan_complex.ycp:684
+#: ../properties/nm-openvpn.c:643
+#, fuzzy, c-format
+msgid "Local IP:  %s"
+msgstr "Helyi IP-cím"
+
+# clients/lan_ISDN.ycp:1011 clients/lan_ISDN.ycp:1028
+#: ../properties/nm-openvpn.c:646
+#, fuzzy, c-format
+msgid "Remote IP:  %s"
+msgstr "Távoli IP-cí&m"
+
+# clients/printconf_ask_device.ycp:192
+#: ../properties/nm-openvpn.c:651
+#, fuzzy
+msgid "Connection Type: Password"
+msgstr "Kapcsolat típusa"
+
+# /usr/lib/YaST2/clients/lan_dns.ycp:85
+# clients/lan_dns.ycp:269
+#: ../properties/nm-openvpn.c:657 ../properties/nm-openvpn.c:675
+#, fuzzy, c-format
+msgid "Username:  %s"
+msgstr "Felhasználónév: %1"
+
+#: ../properties/nm-openvpn.c:663
+msgid "Connection Type: X.509 with Password Authentication"
+msgstr ""
+
+# modules/inst_video_data.ycp:68 modules/inst_video_data.ycp:206
+#: ../properties/nm-openvpn.c:681
+#, fuzzy, c-format
+msgid "Remote:  %s"
+msgstr "Szerep: %s"
+
+# modules/inst_custom_part.ycp:491
+#: ../properties/nm-openvpn.c:684
+#, fuzzy, c-format
+msgid "Device: %s"
+msgstr "Eszköz: %1"
+
+#: ../properties/nm-openvpn.c:684
+#, fuzzy
+msgid "TAP"
+msgstr "PAP"
+
+#: ../properties/nm-openvpn.c:684
+#, fuzzy
+msgid "TUN"
+msgstr "LUN"
+
+# /usr/lib/YaST2/clients/lan_inetd_custom.ycp:175
+#: ../properties/nm-openvpn.c:687
+#, fuzzy, c-format
+msgid "Protocol: %s"
+msgstr "Protokoll"
+
+#: ../properties/nm-openvpn.c:687
+#, fuzzy
+msgid "TCP"
+msgstr "TCP: "
+
+#: ../properties/nm-openvpn.c:687
+#, fuzzy
+msgid "UDP"
+msgstr "UDP: "
+
+#: ../properties/nm-openvpn.c:691
+#, fuzzy, c-format
+msgid "Routes:  %s"
+msgstr "Útvonalak: %1"
+
+#: ../properties/nm-openvpn.c:695
+#, fuzzy, c-format
+msgid "Use LZO Compression: %s"
+msgstr "Tömörítés"
+
+#: ../properties/nm-openvpn.c:695
+msgid "Yes"
+msgstr "Igen"
+
+#: ../properties/nm-openvpn.c:695
+msgid "No"
+msgstr "Nem"
+
+#: ../properties/nm-openvpn.c:698
+msgid "The connection details can be changed using the \"Edit\" button."
+msgstr ""
+
+#: ../properties/nm-openvpn.c:849
+#, fuzzy
+msgid "Cannot import settings"
+msgstr "A beállítások mentése nem sikerült!"
+
+#: ../properties/nm-openvpn.c:851
+#, fuzzy, c-format
+msgid "The VPN settings file '%s' does not contain valid data."
+msgstr "A megadott fájl nem tartalmaz TSIG kulcsot"
+
+#: ../properties/nm-openvpn.c:885
+#, fuzzy
+msgid "Select file to import"
+msgstr "Válassza ki, hogy melyik fájlt szeretné betölteni."
+
+# modules/printconf/printconf_manuf_model.ycp:77
+# modules/printconf/printconf_manuf_model.ycp:99
+# clients/printconf_manuf_model.ycp:105 clients/printconf_manuf_model.ycp:156
+#: ../properties/nm-openvpn.c:966 ../properties/nm-openvpn.c:978
+#, fuzzy
+msgid "Select CA to use"
+msgstr "&Válasszon felhasználót:"
+
+#: ../properties/nm-openvpn.c:969
+#, fuzzy
+msgid "Select certificate to use"
+msgstr "Válassza ki a tanúsítvány fájlt."
+
+# modules/printconf/printconf_manuf_model.ycp:71
+# clients/printconf_manuf_model.ycp:96
+#: ../properties/nm-openvpn.c:972
+#, fuzzy
+msgid "Select key to use"
+msgstr "Válassza ki a hangolót."
+
+#: ../properties/nm-openvpn.c:975
+#, fuzzy
+msgid "Select shared key to use"
+msgstr "Válassza ki a használandó PPD fájlt."
+
+#. printf ("in impl_export\n");
+#: ../properties/nm-openvpn.c:1147
+msgid "Save as..."
+msgstr "Mentés másként..."
+
+#: ../properties/nm-openvpn.c:1177
+#, fuzzy, c-format
+msgid "A file named \"%s\" already exists."
+msgstr "%1 nevű gép már létezik."
+
+# modules/inst_sw_select.ycp:273
+# /usr/lib/YaST2/clients/inst_sw_select.ycp:380
+# clients/inst_sw_select.ycp:345
+#: ../properties/nm-openvpn.c:1180
+#, fuzzy
+msgid "Do you want to replace it with the one you are saving?"
+msgstr "Valóban eldobja részletezett választását?"
+
+#: ../properties/nm-openvpn-dialog.glade.h:1
+#, fuzzy
+msgid "<b>Connection Name</b>"
+msgstr "<b>Leírás:</b>"
+
+#: ../properties/nm-openvpn-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Optional Information</b>"
+msgstr "Részletes adatok"
+
+#: ../properties/nm-openvpn-dialog.glade.h:3
+#, fuzzy
+msgid "<b>Required Information</b>"
+msgstr "<p><b>Támogatási információ</b></p>\n"
+
+#: ../properties/nm-openvpn-dialog.glade.h:4
+msgid "<i>example: 172.16.0.0/16 10.11.12.0/24</i>"
+msgstr ""
+
+#: ../properties/nm-openvpn-dialog.glade.h:5
+#, fuzzy
+msgid "CA  file:"
+msgstr "CA mentve fájba."
+
+#: ../properties/nm-openvpn-dialog.glade.h:6
+#, fuzzy
+msgid "Certificate:"
+msgstr "Tanúsítvány"
+
+# clients/printconf_ask_device.ycp:192
+#: ../properties/nm-openvpn-dialog.glade.h:7
+#, fuzzy
+msgid "Connection Type:"
+msgstr "Kapcsolat típusa"
+
+#: ../properties/nm-openvpn-dialog.glade.h:8
+msgid "Key:"
+msgstr "Kulcs:"
+
+#: ../properties/nm-openvpn-dialog.glade.h:9
+#, fuzzy
+msgid "Local IP:"
+msgstr "Helyi"
+
+#: ../properties/nm-openvpn-dialog.glade.h:10
+msgid "Password"
+msgstr "Jelszó"
+
+#: ../properties/nm-openvpn-dialog.glade.h:11
+msgid ""
+"Please enter the information provided by your system administrator below. Do "
+"not enter your password here as you will be prompted when connecting."
+msgstr ""
+
+#: ../properties/nm-openvpn-dialog.glade.h:12
+msgid ""
+"Please note that the file you import is not an OpenVPN configuration file. "
+"Ask your adminstrator for the file."
+msgstr ""
+
+#: ../properties/nm-openvpn-dialog.glade.h:13
+#, fuzzy
+msgid "Remote IP:"
+msgstr "Távoli"
+
+#: ../properties/nm-openvpn-dialog.glade.h:14
+#, fuzzy
+msgid "Shared Key:"
+msgstr "Osztott kulcs"
+
+#: ../properties/nm-openvpn-dialog.glade.h:15
+#, fuzzy
+msgid "Shared key"
+msgstr "Osztott kulcs"
+
+#: ../properties/nm-openvpn-dialog.glade.h:16
+#, fuzzy
+msgid "Use LZO compression"
+msgstr "Tömörítés"
+
+#: ../properties/nm-openvpn-dialog.glade.h:17
+#, fuzzy
+msgid "Use TAP device"
+msgstr "&USB eszköz"
+
+# clients/printconf_ask_device.ycp:192
+#: ../properties/nm-openvpn-dialog.glade.h:18
+#, fuzzy
+msgid "Use TCP connection"
+msgstr "Kapcsolat tesztelése"
+
+#: ../properties/nm-openvpn-dialog.glade.h:19
+#, fuzzy
+msgid "Username:"
+msgstr "&Felhasználónév:"
+
+#: ../properties/nm-openvpn-dialog.glade.h:20
+msgid "X.509"
+msgstr ""
+
+#: ../properties/nm-openvpn-dialog.glade.h:21
+msgid ""
+"X.509 Certificates\n"
+"Pre-shared key\n"
+"Password Authentication\n"
+"X.509 with Password Authentication"
+msgstr ""
+
+#: ../properties/nm-openvpn-dialog.glade.h:25
+#, fuzzy
+msgid "_Gateway:"
+msgstr "�tjáró"
+
+#: ../properties/nm-openvpn-dialog.glade.h:26
+#, fuzzy
+msgid "_Import Saved Configuration..."
+msgstr "Ki&szolgáló beállítások..."
+
+#: ../properties/nm-openvpn-dialog.glade.h:27
+msgid ""
+"_Name used to identify the connection to the private network, e.g. \"Campus "
+"VPN\" or \"Corporate Network\""
+msgstr ""
+
+#: ../properties/nm-openvpn-dialog.glade.h:28
+msgid "_Only use VPN connection for these addresses"
+msgstr ""
+
+#: ../src/nm-openvpn-service.c:136
+msgid ""
+"The VPN login failed because the user name and password were not accepted or "
+"the certificate password was wrong."
+msgstr ""
+
+#: ../src/nm-openvpn-service.c:138
+msgid "The VPN login failed because the VPN program could not be started."
+msgstr ""
+
+#: ../src/nm-openvpn-service.c:140
+msgid ""
+"The VPN login failed because the VPN program could not connect to the VPN "
+"server."
+msgstr ""
+
+#: ../src/nm-openvpn-service.c:142
+msgid ""
+"The VPN login failed because the VPN configuration options were invalid."
+msgstr ""
+
+#: ../src/nm-openvpn-service.c:144
+msgid ""
+"The VPN login failed because the VPN program received an invalid "
+"configuration from the VPN server."
+msgstr ""
+
+# clients/rc_config_step1.ycp:316
+#: ../src/nm-openvpn-service.c:146
+#, fuzzy
+msgid "VPN connection failed"
+msgstr "Nincsenek meghatározva kapcsolatok."
diff --git a/vpn-daemons/openvpn/po/it.po b/vpn-daemons/openvpn/po/it.po
new file mode 100644
index 0000000000..0f562cf217
--- /dev/null
+++ b/vpn-daemons/openvpn/po/it.po
@@ -0,0 +1,437 @@
+# Italian message file for YaST2 (@memory@).
+# Copyright (C) 2005 SUSE Linux Products GmbH.
+# Copyright (C) 2002 SuSE Linux AG.
+# Copyright (C) 1999, 2000, 2001 SuSE GmbH.
+# Franca Delcarlo <francad@attglobal.net>, 1999, 2000, 2001.
+# Karl Eichwalder <ke@suse.de>, 2000.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: YaST (@memory@)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-05-16 17:16+0200\n"
+"PO-Revision-Date: 2001-07-18 11:04+0200\n"
+"Last-Translator: Franca Delcarlo <francad@attglobal.net>\n"
+"Language-Team: i18n <i18n@suse.de>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:148
+#, fuzzy
+msgid "_Password:"
+msgstr "Password:"
+
+# TLABEL modules/inst_user.ycp:27
+#: ../auth-dialog/gnome-two-password-dialog.c:149
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "V&erifica password:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:272
+#, fuzzy
+msgid "_Username:"
+msgstr "Nome &utente:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:274
+#, fuzzy
+msgid "_Domain:"
+msgstr "&Dominio:"
+
+# TLABEL modules/printconf/printconf_ask_device.ycp:134
+#: ../auth-dialog/gnome-two-password-dialog.c:360
+#, fuzzy
+msgid "Connect _anonymously"
+msgstr "Connessioni"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:365
+#, fuzzy
+msgid "Connect as _user:"
+msgstr " Connesso come "
+
+#: ../auth-dialog/gnome-two-password-dialog.c:471
+#, fuzzy
+msgid "_Remember password for this session"
+msgstr "Ripetere la password per una &verifica:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:473
+#, fuzzy
+msgid "_Save password in keyring"
+msgstr "Imposta cifratura password"
+
+#: ../auth-dialog/main.c:214
+#, c-format
+msgid "You need to authenticate to access the Virtual Private Network '%s'."
+msgstr ""
+
+#: ../auth-dialog/main.c:215
+#, fuzzy
+msgid "Authenticate VPN"
+msgstr "Autenticazione"
+
+# TLABEL modules/inst_user.ycp:27
+#: ../auth-dialog/main.c:227 ../auth-dialog/main.c:252
+#, fuzzy
+msgid "Certificate password:"
+msgstr "&Password certificato:"
+
+#: ../nm-openvpn.desktop.in.h:1
+msgid "Add, Remove, and Edit VPN Connections"
+msgstr ""
+
+#: ../nm-openvpn.desktop.in.h:2
+#, fuzzy
+msgid "VPN Connection Manager (OpenVPN)"
+msgstr "Amministrazione delle connessioni"
+
+#: ../properties/nm-openvpn.c:108
+#, fuzzy
+msgid "OpenVPN Client"
+msgstr "Client IPP"
+
+# TLABEL modules/printconf/printconf.ycp:515
+#: ../properties/nm-openvpn.c:614
+#, fuzzy
+msgid "The following OpenVPN connection will be created:"
+msgstr "I seguenti scanner verranno disattivati:"
+
+# TLABEL modules/inst_sw_single.ycp:510
+#: ../properties/nm-openvpn.c:616
+#, fuzzy, c-format
+msgid "Name:  %s"
+msgstr "No&me:"
+
+# TLABEL modules/printconf/printconf.ycp:133
+#: ../properties/nm-openvpn.c:624
+#, fuzzy
+msgid "Connection Type: X.509 Certificates"
+msgstr "Scegliere un certificato"
+
+#: ../properties/nm-openvpn.c:627 ../properties/nm-openvpn.c:654
+#: ../properties/nm-openvpn.c:666
+#, c-format
+msgid "CA:  %s"
+msgstr ""
+
+# TLABEL modules/inst_custom_part.ycp:2183
+#: ../properties/nm-openvpn.c:630 ../properties/nm-openvpn.c:669
+#, fuzzy, c-format
+msgid "Cert:  %s"
+msgstr "Crea %1$s"
+
+#: ../properties/nm-openvpn.c:633 ../properties/nm-openvpn.c:672
+#, fuzzy, c-format
+msgid "Key:  %s"
+msgstr "Chiave:"
+
+# TLABEL modules/printconf/printconf_ask_device.ycp:134
+#: ../properties/nm-openvpn.c:637
+#, fuzzy
+msgid "Connection Type: Shared Key"
+msgstr "Tipo di connessione"
+
+#: ../properties/nm-openvpn.c:640
+#, fuzzy, c-format
+msgid "Shared Key:  %s"
+msgstr "Chiave condivisa"
+
+# TLABEL modules/lan/lan.ycp:1089
+#: ../properties/nm-openvpn.c:643
+#, fuzzy, c-format
+msgid "Local IP:  %s"
+msgstr "Indirizzo IP locale"
+
+# TLABEL modules/dialup/dialup.ycp:1328
+#: ../properties/nm-openvpn.c:646
+#, fuzzy, c-format
+msgid "Remote IP:  %s"
+msgstr "Indirizzo IP re&moto"
+
+# TLABEL modules/printconf/printconf_ask_device.ycp:134
+#: ../properties/nm-openvpn.c:651
+#, fuzzy
+msgid "Connection Type: Password"
+msgstr "Tipo di connessione"
+
+# TLABEL modules/lan/lan.ycp:1377
+#: ../properties/nm-openvpn.c:657 ../properties/nm-openvpn.c:675
+#, fuzzy, c-format
+msgid "Username:  %s"
+msgstr "Nome utente: %1"
+
+#: ../properties/nm-openvpn.c:663
+msgid "Connection Type: X.509 with Password Authentication"
+msgstr ""
+
+#: ../properties/nm-openvpn.c:681
+#, fuzzy, c-format
+msgid "Remote:  %s"
+msgstr "Ruolo: %s"
+
+# TLABEL modules/inst_custom_part.ycp:2168
+#: ../properties/nm-openvpn.c:684
+#, fuzzy, c-format
+msgid "Device: %s"
+msgstr "Dispositivo:%1"
+
+#: ../properties/nm-openvpn.c:684
+#, fuzzy
+msgid "TAP"
+msgstr "PAP"
+
+#: ../properties/nm-openvpn.c:684
+#, fuzzy
+msgid "TUN"
+msgstr "LUN"
+
+#: ../properties/nm-openvpn.c:687
+#, fuzzy, c-format
+msgid "Protocol: %s"
+msgstr "Protocollo"
+
+#: ../properties/nm-openvpn.c:687
+#, fuzzy
+msgid "TCP"
+msgstr "TCP: "
+
+#: ../properties/nm-openvpn.c:687
+#, fuzzy
+msgid "UDP"
+msgstr "UDP:"
+
+#: ../properties/nm-openvpn.c:691
+#, fuzzy, c-format
+msgid "Routes:  %s"
+msgstr "Route: %1"
+
+#: ../properties/nm-openvpn.c:695
+#, fuzzy, c-format
+msgid "Use LZO Compression: %s"
+msgstr "Compressione"
+
+#: ../properties/nm-openvpn.c:695
+msgid "Yes"
+msgstr "Sì"
+
+#: ../properties/nm-openvpn.c:695
+msgid "No"
+msgstr "No"
+
+#: ../properties/nm-openvpn.c:698
+msgid "The connection details can be changed using the \"Edit\" button."
+msgstr ""
+
+#: ../properties/nm-openvpn.c:849
+#, fuzzy
+msgid "Cannot import settings"
+msgstr "Impossibile salvare le impostazioni!"
+
+#: ../properties/nm-openvpn.c:851
+#, fuzzy, c-format
+msgid "The VPN settings file '%s' does not contain valid data."
+msgstr "Il file specificato non contiene una chiave TSIG."
+
+#: ../properties/nm-openvpn.c:885
+#, fuzzy
+msgid "Select file to import"
+msgstr "Selezionate un file da caricare."
+
+# TLABEL modules/printconf/printconf_manuf_model.ycp:86
+#: ../properties/nm-openvpn.c:966 ../properties/nm-openvpn.c:978
+#, fuzzy
+msgid "Select CA to use"
+msgstr "&Selezionate l'utente:"
+
+# TLABEL modules/sound/sound.ycp:480
+#: ../properties/nm-openvpn.c:969
+#, fuzzy
+msgid "Select certificate to use"
+msgstr "Seleziona file certificato"
+
+# TLABEL modules/printconf/printconf_manuf_model.ycp:80
+#: ../properties/nm-openvpn.c:972
+#, fuzzy
+msgid "Select key to use"
+msgstr "Selezionare il sintonizzatore."
+
+#: ../properties/nm-openvpn.c:975
+#, fuzzy
+msgid "Select shared key to use"
+msgstr "Selezionate il file PPD da usare."
+
+#. printf ("in impl_export\n");
+#: ../properties/nm-openvpn.c:1147
+msgid "Save as..."
+msgstr "Salva come..."
+
+#: ../properties/nm-openvpn.c:1177
+#, fuzzy, c-format
+msgid "A file named \"%s\" already exists."
+msgstr "Il nome host %1 esiste già."
+
+# TLABEL modules/inst_sw_select.ycp:376
+#: ../properties/nm-openvpn.c:1180
+#, fuzzy
+msgid "Do you want to replace it with the one you are saving?"
+msgstr "Volete davvero azzerare le vostre impostazioni?"
+
+#: ../properties/nm-openvpn-dialog.glade.h:1
+#, fuzzy
+msgid "<b>Connection Name</b>"
+msgstr "<b>Descrizione:</b> "
+
+#: ../properties/nm-openvpn-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Optional Information</b>"
+msgstr "Informazioni opzionali"
+
+#: ../properties/nm-openvpn-dialog.glade.h:3
+#, fuzzy
+msgid "<b>Required Information</b>"
+msgstr "<p><b>Informazioni sul Supporto tecnico</b></p>\n"
+
+#: ../properties/nm-openvpn-dialog.glade.h:4
+msgid "<i>example: 172.16.0.0/16 10.11.12.0/24</i>"
+msgstr ""
+
+#: ../properties/nm-openvpn-dialog.glade.h:5
+#, fuzzy
+msgid "CA  file:"
+msgstr "CA salvato su file."
+
+#: ../properties/nm-openvpn-dialog.glade.h:6
+#, fuzzy
+msgid "Certificate:"
+msgstr "Certificato"
+
+# TLABEL modules/printconf/printconf_ask_device.ycp:134
+#: ../properties/nm-openvpn-dialog.glade.h:7
+#, fuzzy
+msgid "Connection Type:"
+msgstr "Tipo di connessione"
+
+#: ../properties/nm-openvpn-dialog.glade.h:8
+msgid "Key:"
+msgstr "Chiave:"
+
+#: ../properties/nm-openvpn-dialog.glade.h:9
+#, fuzzy
+msgid "Local IP:"
+msgstr "Locale"
+
+#: ../properties/nm-openvpn-dialog.glade.h:10
+msgid "Password"
+msgstr "Password"
+
+#: ../properties/nm-openvpn-dialog.glade.h:11
+msgid ""
+"Please enter the information provided by your system administrator below. Do "
+"not enter your password here as you will be prompted when connecting."
+msgstr ""
+
+#: ../properties/nm-openvpn-dialog.glade.h:12
+msgid ""
+"Please note that the file you import is not an OpenVPN configuration file. "
+"Ask your adminstrator for the file."
+msgstr ""
+
+#: ../properties/nm-openvpn-dialog.glade.h:13
+#, fuzzy
+msgid "Remote IP:"
+msgstr "Remoto"
+
+#: ../properties/nm-openvpn-dialog.glade.h:14
+#, fuzzy
+msgid "Shared Key:"
+msgstr "Chiave condivisa"
+
+#: ../properties/nm-openvpn-dialog.glade.h:15
+#, fuzzy
+msgid "Shared key"
+msgstr "Chiave condivisa"
+
+#: ../properties/nm-openvpn-dialog.glade.h:16
+#, fuzzy
+msgid "Use LZO compression"
+msgstr "Compressione"
+
+#: ../properties/nm-openvpn-dialog.glade.h:17
+#, fuzzy
+msgid "Use TAP device"
+msgstr "&Dispositivi USB"
+
+# TLABEL modules/printconf/printconf_ask_device.ycp:134
+#: ../properties/nm-openvpn-dialog.glade.h:18
+#, fuzzy
+msgid "Use TCP connection"
+msgstr "Prova della connessione"
+
+#: ../properties/nm-openvpn-dialog.glade.h:19
+#, fuzzy
+msgid "Username:"
+msgstr "Nome &utente:"
+
+#: ../properties/nm-openvpn-dialog.glade.h:20
+msgid "X.509"
+msgstr ""
+
+#: ../properties/nm-openvpn-dialog.glade.h:21
+msgid ""
+"X.509 Certificates\n"
+"Pre-shared key\n"
+"Password Authentication\n"
+"X.509 with Password Authentication"
+msgstr ""
+
+#: ../properties/nm-openvpn-dialog.glade.h:25
+#, fuzzy
+msgid "_Gateway:"
+msgstr "Gateway"
+
+#: ../properties/nm-openvpn-dialog.glade.h:26
+#, fuzzy
+msgid "_Import Saved Configuration..."
+msgstr "Configurazione &server..."
+
+#: ../properties/nm-openvpn-dialog.glade.h:27
+msgid ""
+"_Name used to identify the connection to the private network, e.g. \"Campus "
+"VPN\" or \"Corporate Network\""
+msgstr ""
+
+#: ../properties/nm-openvpn-dialog.glade.h:28
+msgid "_Only use VPN connection for these addresses"
+msgstr ""
+
+#: ../src/nm-openvpn-service.c:136
+msgid ""
+"The VPN login failed because the user name and password were not accepted or "
+"the certificate password was wrong."
+msgstr ""
+
+#: ../src/nm-openvpn-service.c:138
+msgid "The VPN login failed because the VPN program could not be started."
+msgstr ""
+
+#: ../src/nm-openvpn-service.c:140
+msgid ""
+"The VPN login failed because the VPN program could not connect to the VPN "
+"server."
+msgstr ""
+
+#: ../src/nm-openvpn-service.c:142
+msgid ""
+"The VPN login failed because the VPN configuration options were invalid."
+msgstr ""
+
+#: ../src/nm-openvpn-service.c:144
+msgid ""
+"The VPN login failed because the VPN program received an invalid "
+"configuration from the VPN server."
+msgstr ""
+
+#: ../src/nm-openvpn-service.c:146
+#, fuzzy
+msgid "VPN connection failed"
+msgstr "Nessuna connessione definita"
diff --git a/vpn-daemons/openvpn/po/ja.po b/vpn-daemons/openvpn/po/ja.po
new file mode 100644
index 0000000000..220f53415f
--- /dev/null
+++ b/vpn-daemons/openvpn/po/ja.po
@@ -0,0 +1,417 @@
+# Japanese message file for YaST2 (@memory@).
+# Copyright (C) 2005 SUSE Linux Products GmbH.
+# Copyright (C) 2002 SuSE Linux AG.
+# Copyright (C) 2000, 2001 SuSE GmbH.
+# Mike Fabian <mfabian@suse.de>, 2000, 2001.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: YaST (@memory@)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-05-16 17:16+0200\n"
+"PO-Revision-Date: 2001-09-24 20:04+02:00\n"
+"Last-Translator: Mike Fabian <mfabian@suse.de>\n"
+"Language-Team: Japanese <i18n@suse.de>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:148
+#, fuzzy
+msgid "_Password:"
+msgstr "パスワード:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:149
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "パスワード�確� (&V) :"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:272
+#, fuzzy
+msgid "_Username:"
+msgstr "ユーザ�(&U):"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:274
+#, fuzzy
+msgid "_Domain:"
+msgstr "ドメイン(&D):"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:360
+#, fuzzy
+msgid "Connect _anonymously"
+msgstr "接続"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:365
+#, fuzzy
+msgid "Connect as _user:"
+msgstr "接続方法"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:471
+#, fuzzy
+msgid "_Remember password for this session"
+msgstr "確�����も�一度パスワードを入力������(&V): "
+
+#: ../auth-dialog/gnome-two-password-dialog.c:473
+#, fuzzy
+msgid "_Save password in keyring"
+msgstr "パスワード暗�化�設定"
+
+#: ../auth-dialog/main.c:214
+#, c-format
+msgid "You need to authenticate to access the Virtual Private Network '%s'."
+msgstr ""
+
+#: ../auth-dialog/main.c:215
+#, fuzzy
+msgid "Authenticate VPN"
+msgstr "�証"
+
+#: ../auth-dialog/main.c:227 ../auth-dialog/main.c:252
+#, fuzzy
+msgid "Certificate password:"
+msgstr "証明書�パスワード (&P) :"
+
+#: ../nm-openvpn.desktop.in.h:1
+msgid "Add, Remove, and Edit VPN Connections"
+msgstr ""
+
+#: ../nm-openvpn.desktop.in.h:2
+#, fuzzy
+msgid "VPN Connection Manager (OpenVPN)"
+msgstr "接続管�"
+
+#: ../properties/nm-openvpn.c:108
+#, fuzzy
+msgid "OpenVPN Client"
+msgstr "IPPクライアント"
+
+#: ../properties/nm-openvpn.c:614
+#, fuzzy
+msgid "The following OpenVPN connection will be created:"
+msgstr "次�スキャナを無効����。"
+
+#: ../properties/nm-openvpn.c:616
+#, fuzzy, c-format
+msgid "Name:  %s"
+msgstr "��(&M):"
+
+#: ../properties/nm-openvpn.c:624
+#, fuzzy
+msgid "Connection Type: X.509 Certificates"
+msgstr "証明書を�択������"
+
+#: ../properties/nm-openvpn.c:627 ../properties/nm-openvpn.c:654
+#: ../properties/nm-openvpn.c:666
+#, c-format
+msgid "CA:  %s"
+msgstr ""
+
+#: ../properties/nm-openvpn.c:630 ../properties/nm-openvpn.c:669
+#, fuzzy, c-format
+msgid "Cert:  %s"
+msgstr "%1$s を作�"
+
+#: ../properties/nm-openvpn.c:633 ../properties/nm-openvpn.c:672
+#, fuzzy, c-format
+msgid "Key:  %s"
+msgstr "キー: "
+
+#: ../properties/nm-openvpn.c:637
+#, fuzzy
+msgid "Connection Type: Shared Key"
+msgstr "接続�タイプ"
+
+#: ../properties/nm-openvpn.c:640
+#, fuzzy, c-format
+msgid "Shared Key:  %s"
+msgstr "共有キー"
+
+#: ../properties/nm-openvpn.c:643
+#, fuzzy, c-format
+msgid "Local IP:  %s"
+msgstr "ローカルIPアドレス"
+
+#: ../properties/nm-openvpn.c:646
+#, fuzzy, c-format
+msgid "Remote IP:  %s"
+msgstr "リモートIPアドレス(&M)"
+
+#: ../properties/nm-openvpn.c:651
+#, fuzzy
+msgid "Connection Type: Password"
+msgstr "接続�タイプ"
+
+#: ../properties/nm-openvpn.c:657 ../properties/nm-openvpn.c:675
+#, fuzzy, c-format
+msgid "Username:  %s"
+msgstr "ユーザ�: %1"
+
+#: ../properties/nm-openvpn.c:663
+msgid "Connection Type: X.509 with Password Authentication"
+msgstr ""
+
+#: ../properties/nm-openvpn.c:681
+#, fuzzy, c-format
+msgid "Remote:  %s"
+msgstr "役割: %s"
+
+#: ../properties/nm-openvpn.c:684
+#, fuzzy, c-format
+msgid "Device: %s"
+msgstr "デ�イス: %1"
+
+#: ../properties/nm-openvpn.c:684
+#, fuzzy
+msgid "TAP"
+msgstr "PAP"
+
+#: ../properties/nm-openvpn.c:684
+#, fuzzy
+msgid "TUN"
+msgstr "LUN"
+
+#: ../properties/nm-openvpn.c:687
+#, fuzzy, c-format
+msgid "Protocol: %s"
+msgstr "プロトコル"
+
+#: ../properties/nm-openvpn.c:687
+#, fuzzy
+msgid "TCP"
+msgstr "TCP: "
+
+#: ../properties/nm-openvpn.c:687
+#, fuzzy
+msgid "UDP"
+msgstr "UDP: "
+
+#: ../properties/nm-openvpn.c:691
+#, fuzzy, c-format
+msgid "Routes:  %s"
+msgstr "ルート: %1"
+
+#: ../properties/nm-openvpn.c:695
+#, fuzzy, c-format
+msgid "Use LZO Compression: %s"
+msgstr "圧縮"
+
+#: ../properties/nm-openvpn.c:695
+msgid "Yes"
+msgstr "��"
+
+#: ../properties/nm-openvpn.c:695
+msgid "No"
+msgstr "���"
+
+#: ../properties/nm-openvpn.c:698
+msgid "The connection details can be changed using the \"Edit\" button."
+msgstr ""
+
+#: ../properties/nm-openvpn.c:849
+#, fuzzy
+msgid "Cannot import settings"
+msgstr "設定を書�込���ん�"
+
+#: ../properties/nm-openvpn.c:851
+#, fuzzy, c-format
+msgid "The VPN settings file '%s' does not contain valid data."
+msgstr "指定�れ�ファイル��TSIGキー��り��ん。"
+
+#: ../properties/nm-openvpn.c:885
+#, fuzzy
+msgid "Select file to import"
+msgstr "読�込むファイルを�択���。"
+
+#: ../properties/nm-openvpn.c:966 ../properties/nm-openvpn.c:978
+#, fuzzy
+msgid "Select CA to use"
+msgstr "ユーザを�択���(&S):"
+
+#: ../properties/nm-openvpn.c:969
+#, fuzzy
+msgid "Select certificate to use"
+msgstr "証明書ファイル��択"
+
+#: ../properties/nm-openvpn.c:972
+#, fuzzy
+msgid "Select key to use"
+msgstr "�ューナを�択���。"
+
+#: ../properties/nm-openvpn.c:975
+#, fuzzy
+msgid "Select shared key to use"
+msgstr "使用�るPPDファイルを�択���。"
+
+#. printf ("in impl_export\n");
+#: ../properties/nm-openvpn.c:1147
+msgid "Save as..."
+msgstr "��を付���存..."
+
+#: ../properties/nm-openvpn.c:1177
+#, fuzzy, c-format
+msgid "A file named \"%s\" already exists."
+msgstr "%1 ������ホスト����存在���。"
+
+#: ../properties/nm-openvpn.c:1180
+#, fuzzy
+msgid "Do you want to replace it with the one you are saving?"
+msgstr "本当�設定をリセット��もよ������?"
+
+#: ../properties/nm-openvpn-dialog.glade.h:1
+#, fuzzy
+msgid "<b>Connection Name</b>"
+msgstr "<b>説明:  </b>"
+
+#: ../properties/nm-openvpn-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Optional Information</b>"
+msgstr "オプション�情報"
+
+#: ../properties/nm-openvpn-dialog.glade.h:3
+#, fuzzy
+msgid "<b>Required Information</b>"
+msgstr "<p><b>サ�ート情報</b></p>\n"
+
+#: ../properties/nm-openvpn-dialog.glade.h:4
+msgid "<i>example: 172.16.0.0/16 10.11.12.0/24</i>"
+msgstr ""
+
+#: ../properties/nm-openvpn-dialog.glade.h:5
+#, fuzzy
+msgid "CA  file:"
+msgstr "CA �ファイル��存�れ���。"
+
+#: ../properties/nm-openvpn-dialog.glade.h:6
+#, fuzzy
+msgid "Certificate:"
+msgstr "証明書"
+
+#: ../properties/nm-openvpn-dialog.glade.h:7
+#, fuzzy
+msgid "Connection Type:"
+msgstr "接続�タイプ"
+
+#: ../properties/nm-openvpn-dialog.glade.h:8
+msgid "Key:"
+msgstr "キー: "
+
+#: ../properties/nm-openvpn-dialog.glade.h:9
+#, fuzzy
+msgid "Local IP:"
+msgstr "ローカル"
+
+#: ../properties/nm-openvpn-dialog.glade.h:10
+msgid "Password"
+msgstr "パスワード"
+
+#: ../properties/nm-openvpn-dialog.glade.h:11
+msgid ""
+"Please enter the information provided by your system administrator below. Do "
+"not enter your password here as you will be prompted when connecting."
+msgstr ""
+
+#: ../properties/nm-openvpn-dialog.glade.h:12
+msgid ""
+"Please note that the file you import is not an OpenVPN configuration file. "
+"Ask your adminstrator for the file."
+msgstr ""
+
+#: ../properties/nm-openvpn-dialog.glade.h:13
+#, fuzzy
+msgid "Remote IP:"
+msgstr "リモート"
+
+#: ../properties/nm-openvpn-dialog.glade.h:14
+#, fuzzy
+msgid "Shared Key:"
+msgstr "共有キー"
+
+#: ../properties/nm-openvpn-dialog.glade.h:15
+#, fuzzy
+msgid "Shared key"
+msgstr "共有キー"
+
+#: ../properties/nm-openvpn-dialog.glade.h:16
+#, fuzzy
+msgid "Use LZO compression"
+msgstr "圧縮"
+
+#: ../properties/nm-openvpn-dialog.glade.h:17
+#, fuzzy
+msgid "Use TAP device"
+msgstr "&USBデ�イス"
+
+#: ../properties/nm-openvpn-dialog.glade.h:18
+#, fuzzy
+msgid "Use TCP connection"
+msgstr "接続�テスト"
+
+#: ../properties/nm-openvpn-dialog.glade.h:19
+#, fuzzy
+msgid "Username:"
+msgstr "ユーザ�(&U):"
+
+#: ../properties/nm-openvpn-dialog.glade.h:20
+msgid "X.509"
+msgstr ""
+
+#: ../properties/nm-openvpn-dialog.glade.h:21
+msgid ""
+"X.509 Certificates\n"
+"Pre-shared key\n"
+"Password Authentication\n"
+"X.509 with Password Authentication"
+msgstr ""
+
+#: ../properties/nm-openvpn-dialog.glade.h:25
+#, fuzzy
+msgid "_Gateway:"
+msgstr "ゲートウェイ"
+
+#: ../properties/nm-openvpn-dialog.glade.h:26
+#, fuzzy
+msgid "_Import Saved Configuration..."
+msgstr "サー��環境設定(&S)..."
+
+#: ../properties/nm-openvpn-dialog.glade.h:27
+msgid ""
+"_Name used to identify the connection to the private network, e.g. \"Campus "
+"VPN\" or \"Corporate Network\""
+msgstr ""
+
+#: ../properties/nm-openvpn-dialog.glade.h:28
+msgid "_Only use VPN connection for these addresses"
+msgstr ""
+
+#: ../src/nm-openvpn-service.c:136
+msgid ""
+"The VPN login failed because the user name and password were not accepted or "
+"the certificate password was wrong."
+msgstr ""
+
+#: ../src/nm-openvpn-service.c:138
+msgid "The VPN login failed because the VPN program could not be started."
+msgstr ""
+
+#: ../src/nm-openvpn-service.c:140
+msgid ""
+"The VPN login failed because the VPN program could not connect to the VPN "
+"server."
+msgstr ""
+
+#: ../src/nm-openvpn-service.c:142
+msgid ""
+"The VPN login failed because the VPN configuration options were invalid."
+msgstr ""
+
+#: ../src/nm-openvpn-service.c:144
+msgid ""
+"The VPN login failed because the VPN program received an invalid "
+"configuration from the VPN server."
+msgstr ""
+
+#: ../src/nm-openvpn-service.c:146
+#, fuzzy
+msgid "VPN connection failed"
+msgstr "接続�定義�れ����ん"
diff --git a/vpn-daemons/openvpn/po/pl.po b/vpn-daemons/openvpn/po/pl.po
new file mode 100644
index 0000000000..3eeb669f15
--- /dev/null
+++ b/vpn-daemons/openvpn/po/pl.po
@@ -0,0 +1,416 @@
+# Polish message file for YaST2 (@memory@).
+# Copyright (C) 2005 SUSE Linux Products GmbH.
+# Copyright (C) 2003 SuSE Linux AG.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: YaST (@memory@)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-05-16 17:16+0200\n"
+"PO-Revision-Date: 2003-10-06 11:28+0200\n"
+"Last-Translator: Polish <i18n@suse.de>\n"
+"Language-Team: Polish <i18n@suse.de>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;\n"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:148
+#, fuzzy
+msgid "_Password:"
+msgstr "Hasło:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:149
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "Zw&eryfikuj hasło:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:272
+#, fuzzy
+msgid "_Username:"
+msgstr "Nazwa &użytkownika:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:274
+#, fuzzy
+msgid "_Domain:"
+msgstr "&Domena:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:360
+#, fuzzy
+msgid "Connect _anonymously"
+msgstr "Połączenia"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:365
+#, fuzzy
+msgid "Connect as _user:"
+msgstr " Podłączone jako "
+
+#: ../auth-dialog/gnome-two-password-dialog.c:471
+#, fuzzy
+msgid "_Remember password for this session"
+msgstr "Proszę podać hasło ponownie, dla &weryfikacji:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:473
+#, fuzzy
+msgid "_Save password in keyring"
+msgstr "Ustaw sposób szyfrowania haseł"
+
+#: ../auth-dialog/main.c:214
+#, c-format
+msgid "You need to authenticate to access the Virtual Private Network '%s'."
+msgstr ""
+
+#: ../auth-dialog/main.c:215
+#, fuzzy
+msgid "Authenticate VPN"
+msgstr "Uwierzytelnianie"
+
+#: ../auth-dialog/main.c:227 ../auth-dialog/main.c:252
+#, fuzzy
+msgid "Certificate password:"
+msgstr "Hasło certy&fikatu:"
+
+#: ../nm-openvpn.desktop.in.h:1
+msgid "Add, Remove, and Edit VPN Connections"
+msgstr ""
+
+#: ../nm-openvpn.desktop.in.h:2
+#, fuzzy
+msgid "VPN Connection Manager (OpenVPN)"
+msgstr "Zarządzanie połączeniami"
+
+#: ../properties/nm-openvpn.c:108
+#, fuzzy
+msgid "OpenVPN Client"
+msgstr "Klient IPP"
+
+#: ../properties/nm-openvpn.c:614
+#, fuzzy
+msgid "The following OpenVPN connection will be created:"
+msgstr "Zostaną zdezaktywowane następujące skanery:"
+
+#: ../properties/nm-openvpn.c:616
+#, fuzzy, c-format
+msgid "Name:  %s"
+msgstr "Na&zwa:"
+
+#: ../properties/nm-openvpn.c:624
+#, fuzzy
+msgid "Connection Type: X.509 Certificates"
+msgstr "Proszę wybrać certyfikat"
+
+#: ../properties/nm-openvpn.c:627 ../properties/nm-openvpn.c:654
+#: ../properties/nm-openvpn.c:666
+#, c-format
+msgid "CA:  %s"
+msgstr ""
+
+#: ../properties/nm-openvpn.c:630 ../properties/nm-openvpn.c:669
+#, fuzzy, c-format
+msgid "Cert:  %s"
+msgstr "Partycja %1$s zostanie utworzona"
+
+#: ../properties/nm-openvpn.c:633 ../properties/nm-openvpn.c:672
+#, fuzzy, c-format
+msgid "Key:  %s"
+msgstr "Klucz:"
+
+#: ../properties/nm-openvpn.c:637
+#, fuzzy
+msgid "Connection Type: Shared Key"
+msgstr "Typ połączenia"
+
+#: ../properties/nm-openvpn.c:640
+#, fuzzy, c-format
+msgid "Shared Key:  %s"
+msgstr "Klucz współdzielony"
+
+#: ../properties/nm-openvpn.c:643
+#, fuzzy, c-format
+msgid "Local IP:  %s"
+msgstr "Lokalny adres IP"
+
+#: ../properties/nm-openvpn.c:646
+#, fuzzy, c-format
+msgid "Remote IP:  %s"
+msgstr "Z&dalny adres IP"
+
+#: ../properties/nm-openvpn.c:651
+#, fuzzy
+msgid "Connection Type: Password"
+msgstr "Typ połączenia"
+
+#: ../properties/nm-openvpn.c:657 ../properties/nm-openvpn.c:675
+#, fuzzy, c-format
+msgid "Username:  %s"
+msgstr "Nazwa użytkownika: %1"
+
+#: ../properties/nm-openvpn.c:663
+msgid "Connection Type: X.509 with Password Authentication"
+msgstr ""
+
+#: ../properties/nm-openvpn.c:681
+#, fuzzy, c-format
+msgid "Remote:  %s"
+msgstr "Rola: %s"
+
+#: ../properties/nm-openvpn.c:684
+#, fuzzy, c-format
+msgid "Device: %s"
+msgstr "UrzÄ…dzenie: %1"
+
+#: ../properties/nm-openvpn.c:684
+#, fuzzy
+msgid "TAP"
+msgstr "PAP"
+
+#: ../properties/nm-openvpn.c:684
+#, fuzzy
+msgid "TUN"
+msgstr "LUN"
+
+#: ../properties/nm-openvpn.c:687
+#, fuzzy, c-format
+msgid "Protocol: %s"
+msgstr "Protokół"
+
+#: ../properties/nm-openvpn.c:687
+#, fuzzy
+msgid "TCP"
+msgstr "RTC"
+
+#: ../properties/nm-openvpn.c:687
+#, fuzzy
+msgid "UDP"
+msgstr "Identyfikator UID"
+
+#: ../properties/nm-openvpn.c:691
+#, fuzzy, c-format
+msgid "Routes:  %s"
+msgstr "Trasy: %1"
+
+#: ../properties/nm-openvpn.c:695
+#, fuzzy, c-format
+msgid "Use LZO Compression: %s"
+msgstr "Kompresja"
+
+#: ../properties/nm-openvpn.c:695
+msgid "Yes"
+msgstr "Tak"
+
+#: ../properties/nm-openvpn.c:695
+msgid "No"
+msgstr "Nie"
+
+#: ../properties/nm-openvpn.c:698
+msgid "The connection details can be changed using the \"Edit\" button."
+msgstr ""
+
+#: ../properties/nm-openvpn.c:849
+#, fuzzy
+msgid "Cannot import settings"
+msgstr "Nie można zapisać ustawień"
+
+#: ../properties/nm-openvpn.c:851
+#, fuzzy, c-format
+msgid "The VPN settings file '%s' does not contain valid data."
+msgstr "Wybrany plik nie zawiera żadnego klucza TSIG."
+
+#: ../properties/nm-openvpn.c:885
+#, fuzzy
+msgid "Select file to import"
+msgstr "Proszę wybrać plik do odczytania."
+
+#: ../properties/nm-openvpn.c:966 ../properties/nm-openvpn.c:978
+#, fuzzy
+msgid "Select CA to use"
+msgstr "&Wybierz tuner"
+
+#: ../properties/nm-openvpn.c:969
+#, fuzzy
+msgid "Select certificate to use"
+msgstr "Proszę wybrać plik certyfikat"
+
+#: ../properties/nm-openvpn.c:972
+#, fuzzy
+msgid "Select key to use"
+msgstr "Proszę zaznaczyć swój tuner."
+
+#: ../properties/nm-openvpn.c:975
+#, fuzzy
+msgid "Select shared key to use"
+msgstr "Wybierz plik PPD, który ma być użyty."
+
+#. printf ("in impl_export\n");
+#: ../properties/nm-openvpn.c:1147
+msgid "Save as..."
+msgstr "Zapisz jako..."
+
+#: ../properties/nm-openvpn.c:1177
+#, fuzzy, c-format
+msgid "A file named \"%s\" already exists."
+msgstr "Istnieje już host o nazwie %1."
+
+#: ../properties/nm-openvpn.c:1180
+#, fuzzy
+msgid "Do you want to replace it with the one you are saving?"
+msgstr "Czy na pewno przywrócić domyślne ustawienia?"
+
+#: ../properties/nm-openvpn-dialog.glade.h:1
+#, fuzzy
+msgid "<b>Connection Name</b>"
+msgstr "<b>Opis: </b>"
+
+#: ../properties/nm-openvpn-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Optional Information</b>"
+msgstr "Informacje opcjonalne"
+
+#: ../properties/nm-openvpn-dialog.glade.h:3
+#, fuzzy
+msgid "<b>Required Information</b>"
+msgstr "<p><b>Informacje o pomocy technicznej</b></p>\n"
+
+#: ../properties/nm-openvpn-dialog.glade.h:4
+msgid "<i>example: 172.16.0.0/16 10.11.12.0/24</i>"
+msgstr ""
+
+#: ../properties/nm-openvpn-dialog.glade.h:5
+#, fuzzy
+msgid "CA  file:"
+msgstr "CA zapisane do pliku."
+
+#: ../properties/nm-openvpn-dialog.glade.h:6
+#, fuzzy
+msgid "Certificate:"
+msgstr "Certyfikat"
+
+#: ../properties/nm-openvpn-dialog.glade.h:7
+#, fuzzy
+msgid "Connection Type:"
+msgstr "Typ połączenia"
+
+#: ../properties/nm-openvpn-dialog.glade.h:8
+msgid "Key:"
+msgstr "Klucz:"
+
+#: ../properties/nm-openvpn-dialog.glade.h:9
+#, fuzzy
+msgid "Local IP:"
+msgstr "Lokalne"
+
+#: ../properties/nm-openvpn-dialog.glade.h:10
+msgid "Password"
+msgstr "Hasło"
+
+#: ../properties/nm-openvpn-dialog.glade.h:11
+msgid ""
+"Please enter the information provided by your system administrator below. Do "
+"not enter your password here as you will be prompted when connecting."
+msgstr ""
+
+#: ../properties/nm-openvpn-dialog.glade.h:12
+msgid ""
+"Please note that the file you import is not an OpenVPN configuration file. "
+"Ask your adminstrator for the file."
+msgstr ""
+
+#: ../properties/nm-openvpn-dialog.glade.h:13
+#, fuzzy
+msgid "Remote IP:"
+msgstr "Zdalne"
+
+#: ../properties/nm-openvpn-dialog.glade.h:14
+#, fuzzy
+msgid "Shared Key:"
+msgstr "Klucz współdzielony"
+
+#: ../properties/nm-openvpn-dialog.glade.h:15
+#, fuzzy
+msgid "Shared key"
+msgstr "Klucz współdzielony"
+
+#: ../properties/nm-openvpn-dialog.glade.h:16
+#, fuzzy
+msgid "Use LZO compression"
+msgstr "Kompresja"
+
+#: ../properties/nm-openvpn-dialog.glade.h:17
+#, fuzzy
+msgid "Use TAP device"
+msgstr "UrzÄ…dzenia &USB"
+
+#: ../properties/nm-openvpn-dialog.glade.h:18
+#, fuzzy
+msgid "Use TCP connection"
+msgstr "- Zakończenie połączenia"
+
+#: ../properties/nm-openvpn-dialog.glade.h:19
+#, fuzzy
+msgid "Username:"
+msgstr "Nazwa &użytkownika:"
+
+#: ../properties/nm-openvpn-dialog.glade.h:20
+msgid "X.509"
+msgstr ""
+
+#: ../properties/nm-openvpn-dialog.glade.h:21
+msgid ""
+"X.509 Certificates\n"
+"Pre-shared key\n"
+"Password Authentication\n"
+"X.509 with Password Authentication"
+msgstr ""
+
+#: ../properties/nm-openvpn-dialog.glade.h:25
+#, fuzzy
+msgid "_Gateway:"
+msgstr "Brama"
+
+#: ../properties/nm-openvpn-dialog.glade.h:26
+#, fuzzy
+msgid "_Import Saved Configuration..."
+msgstr "Konfiguracja &serwera..."
+
+#: ../properties/nm-openvpn-dialog.glade.h:27
+msgid ""
+"_Name used to identify the connection to the private network, e.g. \"Campus "
+"VPN\" or \"Corporate Network\""
+msgstr ""
+
+#: ../properties/nm-openvpn-dialog.glade.h:28
+msgid "_Only use VPN connection for these addresses"
+msgstr ""
+
+#: ../src/nm-openvpn-service.c:136
+msgid ""
+"The VPN login failed because the user name and password were not accepted or "
+"the certificate password was wrong."
+msgstr ""
+
+#: ../src/nm-openvpn-service.c:138
+msgid "The VPN login failed because the VPN program could not be started."
+msgstr ""
+
+#: ../src/nm-openvpn-service.c:140
+msgid ""
+"The VPN login failed because the VPN program could not connect to the VPN "
+"server."
+msgstr ""
+
+#: ../src/nm-openvpn-service.c:142
+msgid ""
+"The VPN login failed because the VPN configuration options were invalid."
+msgstr ""
+
+#: ../src/nm-openvpn-service.c:144
+msgid ""
+"The VPN login failed because the VPN program received an invalid "
+"configuration from the VPN server."
+msgstr ""
+
+#: ../src/nm-openvpn-service.c:146
+#, fuzzy
+msgid "VPN connection failed"
+msgstr "Brak zdefiniowanych połączeń"
diff --git a/vpn-daemons/openvpn/po/pt_BR.po b/vpn-daemons/openvpn/po/pt_BR.po
index 392f569f36..cb01f05004 100644
--- a/vpn-daemons/openvpn/po/pt_BR.po
+++ b/vpn-daemons/openvpn/po/pt_BR.po
@@ -1,178 +1,201 @@
-# Brazilian Portuguese translation of NetworkManager.
-# Copyright (C) 2004-2006 Free Software Foundation, Inc.
-# This file is distributed under the same license as the NetworkManager package.
-# Raphael Higino <raphaelh@uai.com.br>, 2004-2006.
+# Portugese (Brasilian) message file for YaST2 (@memory@).
+# Copyright (C) 2005 SUSE Linux Products GmbH.
+# Copyright (C) 2002 SuSE Linux AG.
+# Copyright (C) 1999-2000, 2001 SuSE GmbH.
+# Karl Eichwalder <ke@suse.de>, 1999.
+# Ralf Lanz <rlanz@genix.com.br>, 1999.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: NetworkManager\n"
+"Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-28 04:09+0100\n"
-"PO-Revision-Date: 2006-02-28 19:47-0300\n"
-"Last-Translator: Raphael Higino <raphaelh@uai.com.br>\n"
-"Language-Team: Brazilian Portuguese <gnome-l10n-br@listas.cipsga.org.br>\n"
+"POT-Creation-Date: 2006-05-16 17:16+0200\n"
+"PO-Revision-Date: 2002-07-01 14:56+0200\n"
+"Last-Translator: Ralf Lanz <rlanz@genix.com.br>\n"
+"Language-Team: Brazilian Portuguese <i18n@suse.de>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n>1;\n"
 
 #: ../auth-dialog/gnome-two-password-dialog.c:148
+#, fuzzy
 msgid "_Password:"
-msgstr "_Senha:"
+msgstr "Senha:"
 
 #: ../auth-dialog/gnome-two-password-dialog.c:149
+#, fuzzy
 msgid "_Secondary Password:"
-msgstr "_Senha Secondária:"
+msgstr "V&erifique a Senha:"
 
 #: ../auth-dialog/gnome-two-password-dialog.c:272
+#, fuzzy
 msgid "_Username:"
-msgstr "Nome do _usuário:"
+msgstr "Nome de &Usuário:"
 
 #: ../auth-dialog/gnome-two-password-dialog.c:274
+#, fuzzy
 msgid "_Domain:"
-msgstr "_Domínio:"
+msgstr "&Domínio:"
 
 #: ../auth-dialog/gnome-two-password-dialog.c:360
+#, fuzzy
 msgid "Connect _anonymously"
-msgstr "Conectar _anonimamente"
+msgstr "Conexões"
 
 #: ../auth-dialog/gnome-two-password-dialog.c:365
+#, fuzzy
 msgid "Connect as _user:"
-msgstr "Conectar como _usuário:"
+msgstr "Conectado Como "
 
 #: ../auth-dialog/gnome-two-password-dialog.c:471
+#, fuzzy
 msgid "_Remember password for this session"
-msgstr "_Lembrar senha para esta sessão"
+msgstr "Entre novamente a senha para &verificação:"
 
 #: ../auth-dialog/gnome-two-password-dialog.c:473
+#, fuzzy
 msgid "_Save password in keyring"
-msgstr "_Salvar senha no chaveiro"
+msgstr "Configurar Criptografia de senha"
 
 #: ../auth-dialog/main.c:214
 #, c-format
 msgid "You need to authenticate to access the Virtual Private Network '%s'."
-msgstr "Você precisa se autenticar para acessar a Rede Privada Virtual '%s'."
+msgstr ""
 
 #: ../auth-dialog/main.c:215
+#, fuzzy
 msgid "Authenticate VPN"
-msgstr "Autenticar VPN"
+msgstr "Autenticação"
 
 #: ../auth-dialog/main.c:227 ../auth-dialog/main.c:252
+#, fuzzy
 msgid "Certificate password:"
-msgstr "Senha do certificado:"
+msgstr "Senha de Certificado &P:"
 
 #: ../nm-openvpn.desktop.in.h:1
 msgid "Add, Remove, and Edit VPN Connections"
-msgstr "Adicione, remova e edite conexões VPN"
+msgstr ""
 
 #: ../nm-openvpn.desktop.in.h:2
+#, fuzzy
 msgid "VPN Connection Manager (OpenVPN)"
-msgstr "Gerenciador de Conexões VPN (OpenVPN)"
+msgstr "Gerenciamento de Conexão"
 
 #: ../properties/nm-openvpn.c:108
+#, fuzzy
 msgid "OpenVPN Client"
-msgstr "Cliente OpenVPN"
+msgstr "Cliente IPP"
 
 #: ../properties/nm-openvpn.c:614
+#, fuzzy
 msgid "The following OpenVPN connection will be created:"
-msgstr "As seguintes conexões OpenVPN serão criadas:"
+msgstr "Os seguintes scanners serão desativados:"
 
 #: ../properties/nm-openvpn.c:616
-#, c-format
+#, fuzzy, c-format
 msgid "Name:  %s"
-msgstr "Nome:  %s"
+msgstr "No&me:"
 
 #: ../properties/nm-openvpn.c:624
+#, fuzzy
 msgid "Connection Type: X.509 Certificates"
-msgstr "Tipo de Conexão: Certificados X.509"
+msgstr "Escolha um Certificado"
 
 #: ../properties/nm-openvpn.c:627 ../properties/nm-openvpn.c:654
 #: ../properties/nm-openvpn.c:666
 #, c-format
 msgid "CA:  %s"
-msgstr "CA:  %s"
+msgstr ""
 
 #: ../properties/nm-openvpn.c:630 ../properties/nm-openvpn.c:669
-#, c-format
+#, fuzzy, c-format
 msgid "Cert:  %s"
-msgstr "Cert:  %s"
+msgstr "Criar %1$s"
 
 #: ../properties/nm-openvpn.c:633 ../properties/nm-openvpn.c:672
-#, c-format
+#, fuzzy, c-format
 msgid "Key:  %s"
-msgstr "Chave:  %s"
+msgstr "Chave:"
 
 #: ../properties/nm-openvpn.c:637
+#, fuzzy
 msgid "Connection Type: Shared Key"
-msgstr "Tipo de Conexão: Chave Compartilhada"
+msgstr "Tipo de conexão"
 
 #: ../properties/nm-openvpn.c:640
-#, c-format
+#, fuzzy, c-format
 msgid "Shared Key:  %s"
-msgstr "Chave Compartilhada:  %s"
+msgstr "Chave Compartilhada"
 
 #: ../properties/nm-openvpn.c:643
-#, c-format
+#, fuzzy, c-format
 msgid "Local IP:  %s"
-msgstr "IP Local:  %s"
+msgstr "Endereço IP Local"
 
 #: ../properties/nm-openvpn.c:646
-#, c-format
+#, fuzzy, c-format
 msgid "Remote IP:  %s"
-msgstr "IP Remoto:  %s"
+msgstr "Endereço IP Re&moto"
 
 #: ../properties/nm-openvpn.c:651
+#, fuzzy
 msgid "Connection Type: Password"
-msgstr "Tipo de Conexão: Senha"
+msgstr "Tipo de conexão"
 
 #: ../properties/nm-openvpn.c:657 ../properties/nm-openvpn.c:675
-#, c-format
+#, fuzzy, c-format
 msgid "Username:  %s"
-msgstr "Nome do usuário:  %s"
+msgstr "Nome de Usuário: %1"
 
 #: ../properties/nm-openvpn.c:663
 msgid "Connection Type: X.509 with Password Authentication"
-msgstr "Tipo de Conexão: X.509 com Autenticação de Senha"
+msgstr ""
 
 #: ../properties/nm-openvpn.c:681
-#, c-format
+#, fuzzy, c-format
 msgid "Remote:  %s"
-msgstr "Remoto:  %s"
+msgstr "Função: %s"
 
 #: ../properties/nm-openvpn.c:684
-#, c-format
+#, fuzzy, c-format
 msgid "Device: %s"
-msgstr "Dispositivo: %s"
+msgstr "Dispositivo: %1"
 
 #: ../properties/nm-openvpn.c:684
+#, fuzzy
 msgid "TAP"
-msgstr "TAP"
+msgstr "PAP"
 
 #: ../properties/nm-openvpn.c:684
+#, fuzzy
 msgid "TUN"
-msgstr "TUN"
+msgstr "LUN"
 
 #: ../properties/nm-openvpn.c:687
-#, c-format
+#, fuzzy, c-format
 msgid "Protocol: %s"
-msgstr "Protocolo: %s"
+msgstr "Protocolo"
 
 #: ../properties/nm-openvpn.c:687
+#, fuzzy
 msgid "TCP"
-msgstr "TCP"
+msgstr "TCP: "
 
 #: ../properties/nm-openvpn.c:687
+#, fuzzy
 msgid "UDP"
-msgstr "UDP"
+msgstr "UDP: "
 
 #: ../properties/nm-openvpn.c:691
-#, c-format
+#, fuzzy, c-format
 msgid "Routes:  %s"
-msgstr "Rotas:  %s"
+msgstr "Rotas: %1"
 
 #: ../properties/nm-openvpn.c:695
-#, c-format
+#, fuzzy, c-format
 msgid "Use LZO Compression: %s"
-msgstr "Usar Compressão LZO: %s"
+msgstr "Compressão"
 
 #: ../properties/nm-openvpn.c:695
 msgid "Yes"
@@ -184,86 +207,100 @@ msgstr "Não"
 
 #: ../properties/nm-openvpn.c:698
 msgid "The connection details can be changed using the \"Edit\" button."
-msgstr "Os detalhes da conexão podem ser alterados usando o botão \"Editar\"."
+msgstr ""
 
 #: ../properties/nm-openvpn.c:849
+#, fuzzy
 msgid "Cannot import settings"
-msgstr "Não é possível importar configurações"
+msgstr "Não pode gravar configurações!"
 
 #: ../properties/nm-openvpn.c:851
-#, c-format
+#, fuzzy, c-format
 msgid "The VPN settings file '%s' does not contain valid data."
-msgstr "O arquivo de configurações de VPN '%s' não contém dados válidos."
+msgstr "O arquivo especificado não contém uma chave TSIG."
 
 #: ../properties/nm-openvpn.c:885
+#, fuzzy
 msgid "Select file to import"
-msgstr "Selecione o arquivo a importar"
+msgstr "Selecione um arquivo para carregar."
 
 #: ../properties/nm-openvpn.c:966 ../properties/nm-openvpn.c:978
+#, fuzzy
 msgid "Select CA to use"
-msgstr "Selecione o CA a usar"
+msgstr "&Selecione usuário:"
 
 #: ../properties/nm-openvpn.c:969
+#, fuzzy
 msgid "Select certificate to use"
-msgstr "Selecione o certificado a usar"
+msgstr "Selecione Arquivo de Certificado"
 
 #: ../properties/nm-openvpn.c:972
+#, fuzzy
 msgid "Select key to use"
-msgstr "Selecione a chave a usar"
+msgstr "Selecione o sintonizador."
 
 #: ../properties/nm-openvpn.c:975
+#, fuzzy
 msgid "Select shared key to use"
-msgstr "Selecione a chave compartilhada a usar"
+msgstr "Selecione o arquivo PPD para usar."
 
 #. printf ("in impl_export\n");
 #: ../properties/nm-openvpn.c:1147
 msgid "Save as..."
-msgstr "Salvar como..."
+msgstr "Salvar como ..."
 
 #: ../properties/nm-openvpn.c:1177
-#, c-format
+#, fuzzy, c-format
 msgid "A file named \"%s\" already exists."
-msgstr "Um arquivo chamado \"%s\" já existe."
+msgstr "Um host denominado %1 já existe."
 
 #: ../properties/nm-openvpn.c:1180
+#, fuzzy
 msgid "Do you want to replace it with the one you are saving?"
-msgstr "Você deseja substituí-la com aquela que você está salvando?"
+msgstr "Você quer realmente reinicializar suas configurações?"
 
 #: ../properties/nm-openvpn-dialog.glade.h:1
+#, fuzzy
 msgid "<b>Connection Name</b>"
-msgstr "<b>Nome da Conexão</b>"
+msgstr "<b>Descrição: </b>"
 
 #: ../properties/nm-openvpn-dialog.glade.h:2
+#, fuzzy
 msgid "<b>Optional Information</b>"
-msgstr "<b>Informações Opcionais</b>"
+msgstr "Informações Opcionais"
 
 #: ../properties/nm-openvpn-dialog.glade.h:3
+#, fuzzy
 msgid "<b>Required Information</b>"
-msgstr "<b>Informações Requeridas</b>"
+msgstr "<p><b>Informações de Suporte</b></p>\n"
 
 #: ../properties/nm-openvpn-dialog.glade.h:4
 msgid "<i>example: 172.16.0.0/16 10.11.12.0/24</i>"
-msgstr "<i>exemplo: 172.16.0.0/16 10.11.12.0/24</i>"
+msgstr ""
 
 #: ../properties/nm-openvpn-dialog.glade.h:5
+#, fuzzy
 msgid "CA  file:"
-msgstr "Arquivo  CA:"
+msgstr "CA salvo em arquivo."
 
 #: ../properties/nm-openvpn-dialog.glade.h:6
+#, fuzzy
 msgid "Certificate:"
-msgstr "Certificado:"
+msgstr "Certificado"
 
 #: ../properties/nm-openvpn-dialog.glade.h:7
+#, fuzzy
 msgid "Connection Type:"
-msgstr "Tipo de Conexão:"
+msgstr "Tipo de conexão"
 
 #: ../properties/nm-openvpn-dialog.glade.h:8
 msgid "Key:"
 msgstr "Chave:"
 
 #: ../properties/nm-openvpn-dialog.glade.h:9
+#, fuzzy
 msgid "Local IP:"
-msgstr "IP Local:"
+msgstr "Local"
 
 #: ../properties/nm-openvpn-dialog.glade.h:10
 msgid "Password"
@@ -273,45 +310,52 @@ msgstr "Senha"
 msgid ""
 "Please enter the information provided by your system administrator below. Do "
 "not enter your password here as you will be prompted when connecting."
-msgstr "Por favor, digite abaixo as informações fornecidas pelo seu administrador de sistema. Não digite sua senha aqui, já que ela será solicitada ao conectar."
+msgstr ""
 
 #: ../properties/nm-openvpn-dialog.glade.h:12
 msgid ""
 "Please note that the file you import is not an OpenVPN configuration file. "
 "Ask your adminstrator for the file."
-msgstr "Por favor, note que o arquivo que você importou não é um arquivo de configuração OpenVPN. Peça o arquivo ao seu administrador."
+msgstr ""
 
 #: ../properties/nm-openvpn-dialog.glade.h:13
+#, fuzzy
 msgid "Remote IP:"
-msgstr "IP Remoto:"
+msgstr "Remoto"
 
 #: ../properties/nm-openvpn-dialog.glade.h:14
+#, fuzzy
 msgid "Shared Key:"
-msgstr "Chave Compartilhada:"
+msgstr "Chave Compartilhada"
 
 #: ../properties/nm-openvpn-dialog.glade.h:15
+#, fuzzy
 msgid "Shared key"
-msgstr "Chave compartilhada"
+msgstr "Chave Compartilhada"
 
 #: ../properties/nm-openvpn-dialog.glade.h:16
+#, fuzzy
 msgid "Use LZO compression"
-msgstr "Usar compressão LZO"
+msgstr "Compressão"
 
 #: ../properties/nm-openvpn-dialog.glade.h:17
+#, fuzzy
 msgid "Use TAP device"
-msgstr "Usar dispositivo TAP"
+msgstr "Dispositivos &USB"
 
 #: ../properties/nm-openvpn-dialog.glade.h:18
+#, fuzzy
 msgid "Use TCP connection"
-msgstr "Usar conexão TCP"
+msgstr "Testar Conexão"
 
 #: ../properties/nm-openvpn-dialog.glade.h:19
+#, fuzzy
 msgid "Username:"
-msgstr "Nome do usuário:"
+msgstr "Nome de &Usuário:"
 
 #: ../properties/nm-openvpn-dialog.glade.h:20
 msgid "X.509"
-msgstr "X.509"
+msgstr ""
 
 #: ../properties/nm-openvpn-dialog.glade.h:21
 msgid ""
@@ -320,1148 +364,55 @@ msgid ""
 "Password Authentication\n"
 "X.509 with Password Authentication"
 msgstr ""
-"Certificados X.509\n"
-"Chave pré-compartilhada\n"
-"Autenticação de Senha\n"
-"X.509 com Autenticação de Senha"
 
 #: ../properties/nm-openvpn-dialog.glade.h:25
+#, fuzzy
 msgid "_Gateway:"
-msgstr "_Gateway:"
+msgstr "Gateway"
 
 #: ../properties/nm-openvpn-dialog.glade.h:26
+#, fuzzy
 msgid "_Import Saved Configuration..."
-msgstr "_Importar Configurações Salvas..."
+msgstr "Configuração do &Servidor..."
 
 #: ../properties/nm-openvpn-dialog.glade.h:27
 msgid ""
 "_Name used to identify the connection to the private network, e.g. \"Campus "
 "VPN\" or \"Corporate Network\""
-msgstr "_Nome usado para identificar a conexão à rede privada, por ex. \"VPN do Campus\" ou \"Rede Corporativa\""
+msgstr ""
 
 #: ../properties/nm-openvpn-dialog.glade.h:28
 msgid "_Only use VPN connection for these addresses"
-msgstr "Usar conexões VPN _apenas para estes endereços"
+msgstr ""
 
 #: ../src/nm-openvpn-service.c:136
 msgid ""
 "The VPN login failed because the user name and password were not accepted or "
 "the certificate password was wrong."
-msgstr "A autenticação VPN falhou porque o nome do usuário e a senha não foram aceitas ou a senha do certificado estava errada."
+msgstr ""
 
 #: ../src/nm-openvpn-service.c:138
 msgid "The VPN login failed because the VPN program could not be started."
-msgstr "A autenticação VPN falhou porque o programa não pôde ser iniciado."
+msgstr ""
 
 #: ../src/nm-openvpn-service.c:140
 msgid ""
 "The VPN login failed because the VPN program could not connect to the VPN "
 "server."
-msgstr "A autenticação VPN falhou porque o programa VPN não pôde se conectar ao servidor VPN."
+msgstr ""
 
 #: ../src/nm-openvpn-service.c:142
 msgid ""
 "The VPN login failed because the VPN configuration options were invalid."
-msgstr "A autenticação VPN falhou porque as opções de configuração VPN eram inválidas."
+msgstr ""
 
 #: ../src/nm-openvpn-service.c:144
 msgid ""
 "The VPN login failed because the VPN program received an invalid "
 "configuration from the VPN server."
-msgstr "A autenticação VPN falhou porque o programa VPN recebeu uma configuração inválida do servidor VPN."
+msgstr ""
 
 #: ../src/nm-openvpn-service.c:146
+#, fuzzy
 msgid "VPN connection failed"
-msgstr "Falha na conexão VPN"
-
-#~ msgid "Please wait while getting data."
-#~ msgstr "Por favor, aguarde enquanto os dados são obtidos."
-
-#~ msgid "Please ensure that your network settings are correct."
-#~ msgstr ""
-#~ "Por favor, certifique-se de que suas configurações de rede estão corretas."
-
-#~ msgid "Refreshing catalog data"
-#~ msgstr "Atualizando dados do catálogo"
-
-#~ msgid "Downloading catalog information"
-#~ msgstr "Baixando informações do catálogo"
-
-#~ msgid "Verifying"
-#~ msgstr "Verificando"
-
-#~ msgid "Unable to verify package signature for"
-#~ msgstr "Impossível verificar a assinatura do pacote para"
-
-#~ msgid "There is no package signature for"
-#~ msgstr "Não há assinatura do pacote para"
-
-#~ msgid "Preparing Transaction"
-#~ msgstr "Preparando a Transação"
-
-#~ msgid "Installing"
-#~ msgstr "Instalando"
-
-#~ msgid "Removing"
-#~ msgstr "Removendo"
-
-#~ msgid "Configuring"
-#~ msgstr "Configuração"
-
-#~ msgid "Licensed under the GNU General Public License, version 2"
-#~ msgstr "Licensiado sob a Licensa Pública Geral GNU (GPL), versão 2"
-
-#~ msgid "Registration"
-#~ msgstr "Registro"
-
-#~ msgid "Email:"
-#~ msgstr "Email:"
-
-#~ msgid "Registration Code:"
-#~ msgstr "Código de Registro:"
-
-#~ msgid "Register"
-#~ msgstr "Registrar"
-
-#~ msgid "Please fill in both email and registration code."
-#~ msgstr "Por favor, preencha tanto o email quanto o código de ativação."
-
-#~ msgid "Unable to activate"
-#~ msgstr "Impossível ativar"
-
-#~ msgid ""
-#~ "Please ensure you typed the email address and registration code correctly"
-#~ msgstr ""
-#~ "Por favor, certifique-se de que digitou o endereço de email e o código de "
-#~ "ativação corretamente"
-
-#~ msgid "C"
-#~ msgstr "C"
-
-#~ msgid ""
-#~ "Unable to show help because the help files were missing.  Please report "
-#~ "this to your vendor."
-#~ msgstr ""
-#~ "Impossível mostrar a ajuda porque os arquivos da ajuda estão faltando. "
-#~ "Por favor, informe isso ao seu vendedor."
-
-#~ msgid ""
-#~ "Unable to show help because there are no applications available to view "
-#~ "help."
-#~ msgstr ""
-#~ "Impossível mostrar a ajuda porque não há aplicações disponíveis para ver "
-#~ "a ajuda."
-
-#~ msgid "Are you sure you want to open %d package information windows?"
-#~ msgstr ""
-#~ "Você tem certeza de que deseja abrir %d janelas de informação de pacotes?"
-
-#~ msgid "Run Now"
-#~ msgstr "Executar Agora"
-
-#~ msgid "Perform installations and removals"
-#~ msgstr "Executa instalações e remoções"
-
-#~ msgid "Catalogs"
-#~ msgstr "Catálogos"
-
-#~ msgid "Change your catalog subscriptions"
-#~ msgstr "Altera suas assinaturas de catálogos"
-
-#~ msgid "Refresh"
-#~ msgstr "Atualizar"
-
-#~ msgid "Refresh catalog data"
-#~ msgstr "Atualiza dados do catálogo"
-
-#~ msgid "Mark for _Installation"
-#~ msgstr "Marcar para _Instalação"
-
-#~ msgid "Mark selected packages for installation"
-#~ msgstr "Marca o pacote selecionado para instalação"
-
-#~ msgid "Mark for _Removal"
-#~ msgstr "Marcar para _Remoção"
-
-#~ msgid "Mark selected packages for removal"
-#~ msgstr "Marca o pacote selecionado para remoção"
-
-#~ msgid "_Cancel"
-#~ msgstr "_Cancelar"
-
-#~ msgid "Cancel marked package actions"
-#~ msgstr "Cancela as ações nos pacotes marcados"
-
-#~ msgid "Package information"
-#~ msgstr "Informações do pacote"
-
-#~ msgid "_File"
-#~ msgstr "_Arquivo"
-
-#~ msgid "_Edit"
-#~ msgstr "_Editar"
-
-#~ msgid "_View"
-#~ msgstr "_Ver"
-
-#~ msgid "_Actions"
-#~ msgstr "Açõe_s"
-
-#~ msgid "_Help"
-#~ msgstr "Aj_uda"
-
-#~ msgid "Connect to daemon..."
-#~ msgstr "Conectar ao servidor..."
-
-#~ msgid "Connect to a remote daemon"
-#~ msgstr "Conectar a um servidor remoto"
-
-#~ msgid "Install from _File..."
-#~ msgstr "Instalar do _Arquivo"
-
-#~ msgid "Install a package from a local file"
-#~ msgstr "Instala um pacote a partir de um arquivo local"
-
-#~ msgid "Install from _URL..."
-#~ msgstr "Instalar da _URL..."
-
-#~ msgid "Install a package from a remote URL"
-#~ msgstr "Instala um pacote a partir de uma URL remota"
-
-#~ msgid "_Mount Directory..."
-#~ msgstr "_Montar Diretório..."
-
-#~ msgid "Mount a directory as a catalog"
-#~ msgstr "Monta um diretório como um catálogo"
-
-#~ msgid "U_nmount Directory..."
-#~ msgstr "_Desmontar Diretório..."
-
-#~ msgid "Unmount a directory"
-#~ msgstr "Desmonta um diretório"
-
-#~ msgid "_Register..."
-#~ msgstr "_Registrar..."
-
-#~ msgid "Register daemon"
-#~ msgstr "Servidor de registro"
-
-#~ msgid "Quit"
-#~ msgstr "Sair"
-
-#~ msgid "Quit Red Carpet"
-#~ msgstr "Sai do Red Carpet"
-
-#~ msgid "Select _All"
-#~ msgstr "Selecionar _Todos"
-
-#~ msgid "Select all items"
-#~ msgstr "Seleciona todos os itens"
-
-#~ msgid "Deselect all items"
-#~ msgstr "Desseleciona todos os itens"
-
-#~ msgid "Edit services"
-#~ msgstr "Edita serviços"
-
-#~ msgid "Catalog _Subscriptions..."
-#~ msgstr "A_ssinaturas de Catálogos..."
-
-#~ msgid "Edit your catalog subscriptions"
-#~ msgstr "Edita suas assinaturas de catálogos"
-
-#~ msgid "_Preferences..."
-#~ msgstr "_Preferências..."
-
-#~ msgid "Edit your Red Carpet preferences"
-#~ msgstr "Edita suas preferências do Red Carpet"
-
-#~ msgid "_Users..."
-#~ msgstr "_Usuários..."
-
-#~ msgid "Edit user permissions for this daemon"
-#~ msgstr "Edita suas permissões para este servidor"
-
-#~ msgid "_Sidebar"
-#~ msgstr "_Barra Lateral"
-
-#~ msgid "Hide or show the Pending Actions sidebar"
-#~ msgstr "Oculta ou mostra a barra lateral de Ações Pendentes"
-
-#~ msgid "_Advanced Search Options"
-#~ msgstr "Opções _Avançadas de Busca"
-
-#~ msgid "Hide or show advanced search options"
-#~ msgstr "Oculta ou mostra opções avançadas de busca"
-
-#~ msgid "_Catalog Names"
-#~ msgstr "Nomes dos _Catálogos"
-
-#~ msgid "Hide or show catalog names in package lists"
-#~ msgstr "Oculta ou mostra os nomes dos catálogos em listas de pacotes"
-
-#~ msgid "Package _Information..."
-#~ msgstr "_Informação sobre o Pacote..."
-
-#~ msgid "View information about currently selected packages"
-#~ msgstr "Mostra informações sobre os pacotes atualmente selecionados"
-
-#~ msgid "_Daemon Information..."
-#~ msgstr "Informações sobre o _Servidor..."
-
-#~ msgid "View information about this daemon"
-#~ msgstr "Mostra informações sobre este servidor"
-
-#~ msgid "Run _Now"
-#~ msgstr "Executar _Agora"
-
-#~ msgid "Run the current transaction"
-#~ msgstr "Executa a transação atual"
-
-#~ msgid "_Verify System Dependencies"
-#~ msgstr "_Verificar as Dependências do Sistema"
-
-#~ msgid "Verify that all system dependencies are met"
-#~ msgstr "Verifica que todas as dependências do sistema estão satisfeitas"
-
-#~ msgid "Mark for I_nstallation"
-#~ msgstr "Marcar para I_nstalação"
-
-#~ msgid "Mark this package for installation"
-#~ msgstr "Marca este pacote para instalação"
-
-#~ msgid "Mark this package for removal"
-#~ msgstr "Marca este pacote para remoção"
-
-#~ msgid "Cancel installation or removal mark"
-#~ msgstr "Cancela as marcas de instalação ou remoção"
-
-#~ msgid "Re_fresh Catalog Data"
-#~ msgstr "A_tualizar Dados do Catálogo"
-
-#~ msgid "Download latest catalog data"
-#~ msgstr "Baixa os últimos dados do catálogo"
-
-#~ msgid "_Contents"
-#~ msgstr "_Conteúdo"
-
-#~ msgid "View Red Carpet help"
-#~ msgstr "Mostra a ajuda do Red Carpet"
-
-#~ msgid "_About..."
-#~ msgstr "_Sobre..."
-
-#~ msgid "About Red Carpet"
-#~ msgstr "Sobre o Red Carpet"
-
-#~ msgid "Go to the '%s' page"
-#~ msgstr "Vai para a página de '%s'"
-
-#~ msgid "installed"
-#~ msgstr "instalado"
-
-#~ msgid "not installed"
-#~ msgstr "não instalado"
-
-#~ msgid "Found %d matching bundles"
-#~ msgstr "%d pacotes correspondentes encontrados"
-
-#~ msgid "Found 1 matching bundle"
-#~ msgstr "Um pacote correspondente encontrado"
-
-#~ msgid "No matching bundles found"
-#~ msgstr "Nenhum pacote correspondente encontrado"
-
-#~ msgid "All Bundles"
-#~ msgstr "Todos os pacotes"
-
-#~ msgid "Uninstalled Bundles"
-#~ msgstr "Pacotes não instalados"
-
-#~ msgid "Installed Bundles"
-#~ msgstr "Pacotes instalados"
-
-#~ msgid "Catalog:"
-#~ msgstr "Catálogo:"
-
-#~ msgid "Status"
-#~ msgstr "Status"
-
-#~ msgid "Version"
-#~ msgstr "Versão"
-
-#~ msgid "Installed"
-#~ msgstr "Instalado"
-
-#~ msgid "Type"
-#~ msgstr "Tipo"
-
-#~ msgid "All Catalogs"
-#~ msgstr "Todos os catálogos"
-
-#~ msgid "All Subscribed Catalogs"
-#~ msgstr "Todos os catálogos assinados"
-
-#~ msgid "No Catalog/Unknown Catalog"
-#~ msgstr "Nenhum Catálogo/Catálogo Desconhecido"
-
-#~ msgid ""
-#~ "Unable to connect to the daemon:\n"
-#~ " '%s'."
-#~ msgstr ""
-#~ "Impossível conectar ao servidor:\n"
-#~ " '%s'."
-
-#~ msgid ""
-#~ "Detected Red Carpet Daemon version %d.%d.%d.\n"
-#~ "Version %d.%d.%d (or newer) is required"
-#~ msgstr ""
-#~ "A versão %d.%d.%d do servidor Red Carpet foi detectada.\n"
-#~ "A versão %d.%d.%d (ou mais recente) é necessária"
-
-#~ msgid ""
-#~ "Detected protocol version %d.  Version %d is required.  You must update "
-#~ "your version of rcd."
-#~ msgstr ""
-#~ "A versão %d do protocolo foi detectada. A versão %d é necessária. Você "
-#~ "tem que atualizar sua versão do rcd."
-
-#~ msgid "Starting daemon..."
-#~ msgstr "Iniciando o servidor..."
-
-#~ msgid ""
-#~ "Red Carpet requires a Red Carpet Daemon to be running.\n"
-#~ "Would you like to start one now?"
-#~ msgstr ""
-#~ "O Red Carpet necessita de um servidor Red Carpet para executar.\n"
-#~ "Você gostaria de iniciar um agora?"
-
-#~ msgid "Connect to this system"
-#~ msgstr "Conectar a este sistema"
-
-#~ msgid "Connect to a remote system"
-#~ msgstr "Conectar a um sistema remoto"
-
-#~ msgid "Server:"
-#~ msgstr "Servidor:"
-
-#~ msgid "User name:"
-#~ msgstr "Nome do usuário:"
-
-#~ msgid "Password:"
-#~ msgstr "Senha:"
-
-#~ msgid "Connect"
-#~ msgstr "Conectar"
-
-#~ msgid "ZENworks Error Console"
-#~ msgstr "Console de Erros do ZENworks"
-
-#~ msgid "Lost contact with the daemon!"
-#~ msgstr "O contato com o servidor foi perdido!"
-
-#~ msgid "Exit Red Carpet"
-#~ msgstr "Sair do Red Carpet"
-
-#~ msgid "Dependency Resolution"
-#~ msgstr "Resolução de Dependências"
-
-#~ msgid "Verifying System"
-#~ msgstr "Verificando o Sistema"
-
-#~ msgid "Resolving Dependencies"
-#~ msgstr "Resolvendo Dependências"
-
-#~ msgid ""
-#~ "You must agree to the licenses covering this software before installing "
-#~ "it."
-#~ msgstr ""
-#~ "Você deve concordar com a licensa que cobre este software antes de "
-#~ "instalá-lo."
-
-#~ msgid "I Agree"
-#~ msgstr "Eu Concordo"
-
-#~ msgid "Dependency Resolution Failed"
-#~ msgstr "A Resolução de Dependências Falhou"
-
-#~ msgid "System Verified"
-#~ msgstr "Sistema Verificado"
-
-#~ msgid ""
-#~ "All package dependencies are satisfied, and no corrective actions are "
-#~ "required."
-#~ msgstr ""
-#~ "Todas as dependências de pacotes estão satisfeitas, e nenhuma ação "
-#~ "corretiva é necessária."
-
-#~ msgid "Requested Installations"
-#~ msgstr "Instalações Solicitadas"
-
-#~ msgid "Requested Removals"
-#~ msgstr "Remoções Solicitadas"
-
-#~ msgid "Required Removals"
-#~ msgstr "Remoções Requeridas"
-
-#~ msgid "Continue"
-#~ msgstr "Continuar"
-
-#~ msgid "Catalog"
-#~ msgstr "Catálogo"
-
-#~ msgid "Package"
-#~ msgstr "Pacote"
-
-#~ msgid "Current Version"
-#~ msgstr "Versão Atual"
-
-#~ msgid "New Version"
-#~ msgstr "Versão Nova"
-
-#~ msgid "Size"
-#~ msgstr "Tamanho"
-
-#~ msgid "All"
-#~ msgstr "Todos"
-
-#~ msgid "Installations"
-#~ msgstr "Instalações"
-
-#~ msgid "Removals"
-#~ msgstr "Remoções"
-
-#~ msgid "Upgrades"
-#~ msgstr "Atualizações"
-
-#~ msgid "User:"
-#~ msgstr "Usuário:"
-
-#~ msgid "Timeframe (days):"
-#~ msgstr "Período (dias):"
-
-#~ msgid "Bundle"
-#~ msgstr "Pacote"
-
-#~ msgid "Unknown"
-#~ msgstr "Desconhecido"
-
-#~ msgid "Searching..."
-#~ msgstr "Procurando..."
-
-#~ msgid "Time"
-#~ msgstr "Tempo"
-
-#~ msgid "Action"
-#~ msgstr "Ação"
-
-#~ msgid "User"
-#~ msgstr "Usuário"
-
-#~ msgid "Old Version"
-#~ msgstr "Versão Antiga"
-
-#~ msgid "History"
-#~ msgstr "Histórico"
-
-#~ msgid "_History"
-#~ msgstr "_Histórico"
-
-#~ msgid "No results found."
-#~ msgstr "Nenhum resultado encontrado."
-
-#~ msgid "%s is not a valid package"
-#~ msgstr "%s não é um pacote válido"
-
-#~ msgid "There are no valid packages to install"
-#~ msgstr "Não há pacotes válidos para instalar"
-
-#~ msgid "Install from File"
-#~ msgstr "Instalar do Arquivo"
-
-#~ msgid "Downloading %s..."
-#~ msgstr "Baixando %s..."
-
-#~ msgid "Install from URL"
-#~ msgstr "Instalar da URL"
-
-#~ msgid "Package URL:"
-#~ msgstr "URL do pacote:"
-
-#~ msgid "ERROR: You cannot specify both -h/--host and -l/--local options"
-#~ msgstr ""
-#~ "ERRO: Você não pode especificar tanto as opções -h/--host e -l/--local"
-
-#~ msgid "ERROR: You cannot specify a user to a local daemon"
-#~ msgstr "ERRO: Você não pode especificar um usuário para um servidor local"
-
-#~ msgid "Mirror"
-#~ msgstr "Espelho"
-
-#~ msgid "Location"
-#~ msgstr "Localização"
-
-#~ msgid "Choose a Mirror"
-#~ msgstr "Escolha um Espelho"
-
-#~ msgid "Unable to unmount '%s'"
-#~ msgstr "Impossível desmontar '%s'"
-
-#~ msgid "Browse..."
-#~ msgstr "Navegar..."
-
-#~ msgid "Mount Directory"
-#~ msgstr "Montar Diretório"
-
-#~ msgid "Mount catalog"
-#~ msgstr "Montar catálogo"
-
-#~ msgid "Mount a directory as catalog"
-#~ msgstr "Monta um diretório como um catálogo"
-
-#~ msgid "Catalog Name:"
-#~ msgstr "Nome do Catálogo:"
-
-#~ msgid "Directory:"
-#~ msgstr "Diretório:"
-
-#~ msgid "Look for packages recursively"
-#~ msgstr "Procurar por pacotes recursivamente"
-
-#~ msgid "Please choose the path for catalog."
-#~ msgstr "Por favor, escolha o caminho para o catálogo."
-
-#~ msgid "Unmount Catalog"
-#~ msgstr "Desmontar Catálogo"
-
-#~ msgid "Unmount?"
-#~ msgstr "Desmontar?"
-
-#~ msgid "%s News"
-#~ msgstr "Notícias de %s"
-
-#~ msgid "Connect to a locally running daemon"
-#~ msgstr "Conecta a um servidor executando localmente"
-
-#~ msgid "hostname"
-#~ msgstr "nome da máquina"
-
-#~ msgid "Contact daemon on specified host"
-#~ msgstr "Contatar um servidor numa máquina específica"
-
-#~ msgid "username"
-#~ msgstr "nome do usuário"
-
-#~ msgid "Specify user name"
-#~ msgstr "Especifica o nome do usuário"
-
-#~ msgid "password"
-#~ msgstr "senha"
-
-#~ msgid "Print client version and exit"
-#~ msgstr "Imprime informações sobre cliente e sai"
-
-#~ msgid "Get usage information"
-#~ msgstr "Obter informações de uso"
-
-#~ msgid "Usage: %s <options> ..."
-#~ msgstr "Uso: %s <opções> ..."
-
-#~ msgid "newer"
-#~ msgstr "mais recente"
-
-#~ msgid "older"
-#~ msgstr "mais antigo"
-
-#~ msgid "upgrade"
-#~ msgstr "atualizar"
-
-#~ msgid "downgrade"
-#~ msgstr "instalar versão anterior"
-
-#~ msgid "install"
-#~ msgstr "instalar"
-
-#~ msgid "remove"
-#~ msgstr "remover"
-
-#~ msgid "Found %d matching packages"
-#~ msgstr "Encontrados %d pacotes correspondentes"
-
-#~ msgid "Found 1 matching package"
-#~ msgstr "Encontrado 1 pacote correspondente"
-
-#~ msgid "No matching packages found"
-#~ msgstr "Nenhum pacote correspondente encontrado"
-
-#~ msgid "Looking for updates..."
-#~ msgstr "Procurando atualizações..."
-
-#~ msgid "Found %d matching patches"
-#~ msgstr "Encontrados %d patches correspondentes"
-
-#~ msgid "Found 1 matching patch"
-#~ msgstr "Encontrado 1 patch correspondente"
-
-#~ msgid "No matching patches found"
-#~ msgstr "Nenhum patch correspondente encontrado"
-
-#~ msgid "Package Information"
-#~ msgstr "Informação Sobre o Pacote"
-
-#~ msgid "Unnamed"
-#~ msgstr "Sem Nome"
-
-#~ msgid "Dependencies"
-#~ msgstr "Dependências"
-
-#~ msgid "Provides"
-#~ msgstr "Fornece"
-
-#~ msgid "Requires"
-#~ msgstr "Requer"
-
-#~ msgid "Conflicts With"
-#~ msgstr "Conflita Com"
-
-#~ msgid "Release"
-#~ msgstr "Liberação"
-
-#~ msgid "Package Size"
-#~ msgstr "Tamanho do Pacote"
-
-#~ msgid "Installed Size"
-#~ msgstr "Tamanho Instalado"
-
-#~ msgid "Section"
-#~ msgstr "Seção"
-
-#~ msgid "Summary"
-#~ msgstr "Sumário"
-
-#~ msgid "Description"
-#~ msgstr "Descrição"
-
-#~ msgid "Info"
-#~ msgstr "Informação"
-
-#~ msgid "Importance"
-#~ msgstr "Importância"
-
-#~ msgid "Patches"
-#~ msgstr "Patches"
-
-#~ msgid "YOU Patches"
-#~ msgstr "VOCÊ faz o patch"
-
-#~ msgid "Searching for matching patches..."
-#~ msgstr "Procurando por patches correspondentes..."
-
-#~ msgid "No matching patches found."
-#~ msgstr "Nenhum patch correspondente encontrado."
-
-#~ msgid "%.1f%% completed"
-#~ msgstr "%.1f%% completo"
-
-#~ msgid "Updating System"
-#~ msgstr "Atualizando o Sistema"
-
-#~ msgid "Download cancelled"
-#~ msgstr "Download cancelado"
-
-#~ msgid "Transaction cancelled"
-#~ msgstr "Transação cancelada"
-
-#~ msgid "Transaction Finished"
-#~ msgstr "Transação Terminada"
-
-#~ msgid "Downloading packages"
-#~ msgstr "Baixando os pacotes"
-
-#~ msgid "Download Failed"
-#~ msgstr "O Download Falhou"
-
-#~ msgid "Unknown Error"
-#~ msgstr "Erro Desconhecido"
-
-#~ msgid "Processing Transaction"
-#~ msgstr "Processando a Transação"
-
-#~ msgid "The transaction has completed successfully"
-#~ msgstr "A transação foi completada com sucesso"
-
-#~ msgid "Transaction failed"
-#~ msgstr "A Transação falhou"
-
-#~ msgid "Transaction Failed"
-#~ msgstr "A Transação Falhou"
-
-#~ msgid "Interval to refresh catalog data (in hours):"
-#~ msgstr "Intervalo para atualizar os dados do catálogo (em horas):"
-
-#~ msgid "Packages"
-#~ msgstr "Pacotes"
-
-#~ msgid "Require package signatures"
-#~ msgstr "Requisitar assinaturas dos pacotes"
-
-#~ msgid "Maximum number of packages to download at once:"
-#~ msgstr "Número máximo de pacotes para baixar de uma só vez:"
-
-#~ msgid "Enable package rollback"
-#~ msgstr "Habilitar rollback de pacotes"
-
-#~ msgid "Proxy"
-#~ msgstr "Proxy"
-
-#~ msgid "Use a proxy"
-#~ msgstr "Usar um proxy"
-
-#~ msgid "Proxy URL:"
-#~ msgstr "URL do proxy:"
-
-#~ msgid "You do not have permissions to view proxy settings"
-#~ msgstr "Você não tem permissão para ver as configurações de proxy"
-
-#~ msgid "Cache downloaded packages and metadata"
-#~ msgstr "Fazer cache dos pacotes e dos metadados baixados"
-
-#~ msgid "Location of cached data:"
-#~ msgstr "Localização dos dados em cache:"
-
-#~ msgid "Expiration"
-#~ msgstr "Expiração"
-
-#~ msgid "Cache expires"
-#~ msgstr "O cache expira"
-
-#~ msgid "Maximum age in days:"
-#~ msgstr "Idade máxima em dias:"
-
-#~ msgid "Maximum size in MB:"
-#~ msgstr "Tamanho máximo em MB:"
-
-#~ msgid "Current cache size:"
-#~ msgstr "Tamanho atual do cache:"
-
-#~ msgid "Are you sure you want to delete the package files in your cache?"
-#~ msgstr ""
-#~ "Você tem certeza de que quer excluir os arquivos de pacote no seu cache?"
-
-#~ msgid "Empty Cache"
-#~ msgstr "Esvaziar o cache"
-
-#~ msgid "%d MB"
-#~ msgstr "%d MB"
-
-#~ msgid "Value"
-#~ msgstr "Valor"
-
-#~ msgid "Loading preferences..."
-#~ msgstr "Carregando preferências..."
-
-#~ msgid "%s Preferences"
-#~ msgstr "%s Preferências"
-
-#~ msgid "Search"
-#~ msgstr "Procurar"
-
-#~ msgid "S_earch Packages"
-#~ msgstr "Procurar Pacot_es"
-
-#~ msgid "Searching for matching packages..."
-#~ msgstr "Procurando por pacotes correspondentes..."
-
-#~ msgid "No matching packages found."
-#~ msgstr "Nenhum pacote correspondente encontrado."
-
-#~ msgid "All Packages"
-#~ msgstr "Todos os Pacotes"
-
-#~ msgid "Updates"
-#~ msgstr "Atualizações"
-
-#~ msgid "Uninstalled Packages"
-#~ msgstr "Pacotes Não Instalados"
-
-#~ msgid "Installed Packages"
-#~ msgstr "Pacotes Instalados"
-
-#~ msgid "All Sections"
-#~ msgstr "Todas as Seções"
-
-#~ msgid "Productivity"
-#~ msgstr "Produtividade"
-
-#~ msgid "Imaging"
-#~ msgstr "Imagens"
-
-#~ msgid "Personal Info. Mgmt"
-#~ msgstr "Ger. de Inform. Pessoais"
-
-#~ msgid "X Windows"
-#~ msgstr "X Windows"
-
-#~ msgid "Games"
-#~ msgstr "Jogos"
-
-#~ msgid "Multimedia"
-#~ msgstr "Multimídia"
-
-#~ msgid "Internet"
-#~ msgstr "Internet"
-
-#~ msgid "Utilities"
-#~ msgstr "Utilitários"
-
-#~ msgid "System"
-#~ msgstr "Sistema"
-
-#~ msgid "Documentation"
-#~ msgstr "Documentação"
-
-#~ msgid "Libraries"
-#~ msgstr "Bibliotecas"
-
-#~ msgid "Development"
-#~ msgstr "Desenvolvimento"
-
-#~ msgid "Development Tools"
-#~ msgstr "Ferramentas de Desenvolvimento"
-
-#~ msgid "Miscellaneous"
-#~ msgstr "Miscelânea"
-
-#~ msgid "Search descriptions"
-#~ msgstr "Procurar nas descrições"
-
-#~ msgid "Match:"
-#~ msgstr "Correspondência:"
-
-#~ msgid "The daemon identified itself as:"
-#~ msgstr "O servidor se identificou como:"
-
-#~ msgid "System type"
-#~ msgstr "Tipo de sistema"
-
-#~ msgid "Server URL"
-#~ msgstr "URL do servidor"
-
-#~ msgid "Server supports enhanced features."
-#~ msgstr "O servidor suporta recursos melhorados."
-
-#~ msgid "Unable to contact the daemon."
-#~ msgstr "Impossível contatar o servidor."
-
-#~ msgid "Dump daemon info to XML file"
-#~ msgstr "Descarregar informações do servidor em um arquivo XML"
-
-#~ msgid "Could not open file '%s': %s"
-#~ msgstr "Não foi possível abrir o arquivo '%s': %s"
-
-#~ msgid "Choose file to write XML to"
-#~ msgstr "Escolha o arquivo no qual escrever o XML"
-
-#~ msgid "Add Service"
-#~ msgstr "Adicionar Serviço"
-
-#~ msgid "Service URL"
-#~ msgstr "URL do Serviço"
-
-#~ msgid "Service type"
-#~ msgstr "Tipo de serviço"
-
-#~ msgid "Registration key"
-#~ msgstr "Chave de registro"
-
-#~ msgid "Edit Services"
-#~ msgstr "Editar os Serviços"
-
-#~ msgid "URL"
-#~ msgstr "URL"
-
-#~ msgid "_Remove service"
-#~ msgstr "_Remover serviço"
-
-#~ msgid "_Add service"
-#~ msgstr "_Adicionar serviço"
-
-#~ msgid "Pending Actions"
-#~ msgstr "Ações Pendentes"
-
-#~ msgid "%d pending install"
-#~ msgstr "%d instalação pendente"
-
-#~ msgid "%d pending installs"
-#~ msgstr "%d instalações pendentes"
-
-#~ msgid "%d pending removal"
-#~ msgstr "%d remoção pendente"
-
-#~ msgid "%d pending removals"
-#~ msgstr "%d remoções pendentes"
-
-#~ msgid "No pending actions"
-#~ msgstr "Nenhuma ação pendente"
-
-#~ msgid "Installed Software"
-#~ msgstr "Software Instalado"
-
-#~ msgid "I_nstalled Software"
-#~ msgstr "Software I_nstalado"
-
-#~ msgid "Available Software"
-#~ msgstr "Software Disponível"
-
-#~ msgid "A_vailable Software"
-#~ msgstr "Software Disponí_vel"
-
-#~ msgid "Connected to %s"
-#~ msgstr "Conectar a %s"
-
-#~ msgid "Subscribed"
-#~ msgstr "Assinado"
-
-#~ msgid "Catalog Name"
-#~ msgstr "Nome do Catálogo"
-
-#~ msgid "%s Catalog Subscriptions"
-#~ msgstr "Assinaturas do Catálogo %s"
-
-#~ msgid ""
-#~ "You do not have permission to subscribe or unsubscribe from catalogs.  "
-#~ "You will be unable to make any changes to the subscriptions."
-#~ msgstr ""
-#~ "Você não tem permissão para assinar ou cancelar assinaturas de catálagos. "
-#~ "Você não poderá fazer qualquer alteração nas assinaturas."
-
-#~ msgid "Untitled"
-#~ msgstr "Sem Título"
-
-#~ msgid "Are you sure you want to quit?"
-#~ msgstr "Você tem certeza de que deseja sair?"
-
-#~ msgid "_Pending Actions"
-#~ msgstr "Ações _Pendentes"
-
-#~ msgid "_Updates"
-#~ msgstr "_Atualizações"
-
-#~ msgid "_Update All"
-#~ msgstr "_Atualizar Todos"
-
-#~ msgid "The system is up-to-date."
-#~ msgstr "O sistema está atualizado."
-
-#~ msgid "There are no software updates available in any subscribed catalogs."
-#~ msgstr ""
-#~ "Não há nenhuma atualização de software disponível em qualquer dos "
-#~ "catálogos assinados."
-
-#~ msgid "Privilege"
-#~ msgstr "Privilégio"
-
-#~ msgid ""
-#~ "If you remove superuser privileges from yourself, you will be unable to "
-#~ "re-add them.\n"
-#~ "\n"
-#~ "Are you sure you want to do this?"
-#~ msgstr ""
-#~ "Se você remover os privilégios de superusuário de si mesmo, você não "
-#~ "poderá readicioná-los.\n"
-#~ "\n"
-#~ "Você tem certeza de que deseja fazer isto?"
-
-#~ msgid "Enabled"
-#~ msgstr "Habilitado"
-
-#~ msgid "Edit Users"
-#~ msgstr "Editar Usuários"
-
-#~ msgid "Confirm:"
-#~ msgstr "Confirmar:"
-
-#~ msgid "Password can not be empty."
-#~ msgstr "A senha não pode ser vazia."
-
-#~ msgid "Passwords do not match."
-#~ msgstr "A senha não está correta."
-
-#~ msgid "Set %s's password"
-#~ msgstr "Definir a senha de %s"
-
-#~ msgid "Users"
-#~ msgstr "Usuários"
-
-#~ msgid "Add"
-#~ msgstr "Adicionar"
-
-#~ msgid "Are you sure you want to delete '%s'?"
-#~ msgstr "Você tem certeza de que deseja excluir '%s'?"
-
-#~ msgid "Privileges"
-#~ msgstr "Privilégios"
-
-#~ msgid "Add new user"
-#~ msgstr "Adicionar novo usuário"
-
-#~ msgid "Invalid user name."
-#~ msgstr "Nome de usuário inválido."
-
-#~ msgid "Orientation"
-#~ msgstr "Orientação"
-
-#~ msgid "The orientation of the tray."
-#~ msgstr "A orientação da bandeja."
-
-#~ msgid ""
-#~ "There appears to be a Red Carpet update icon already running.  Exiting."
-#~ msgstr ""
-#~ "Parece já haver um ícone de atualização do Red Carpet em execução. O "
-#~ "programa será fechado."
-
-#~ msgid "Brought to you by:"
-#~ msgstr "Trazido a você por:"
-
-#~ msgid "With love from:"
-#~ msgstr "Com o amor de:"
-
-#~ msgid "Best wishes from:"
-#~ msgstr "Os melhores desejos de:"
-
-#~ msgid "Sincerely:"
-#~ msgstr "Sinceramente:"
-
-#~ msgid "Developed by chimps:"
-#~ msgstr "Desenvolvido por chimpanzés:"
-
-#~ msgid "Group Activation"
-#~ msgstr "Ativação do Grupo"
-
-#~ msgid "Activate"
-#~ msgstr "Ativar"
-
-#~ msgid "Channels"
-#~ msgstr "Canais"
-
-#~ msgid "_Activate..."
-#~ msgstr "_Ativar..."
-
-#~ msgid ""
-#~ "Activate daemon against a Red Carpet Express or Red Carpet Enterprise "
-#~ "server"
-#~ msgstr ""
-#~ "Ativa o servidor contra um servidor Red Carpet Express ou Red Carpet "
-#~ "Enterprise"
-
-#~ msgid "Red Carpet Ne_ws..."
-#~ msgstr "Notícias sobre o Red Carpet"
-
-#~ msgid "View the latest Red Carpet news"
-#~ msgstr "Mostra as últimas notícias sobre o Red Carpet"
-
-#~ msgid "Channel"
-#~ msgstr "Canal"
-
-#~ msgid "Channel:"
-#~ msgstr "Canais:"
+msgstr "Nenhuma conexão definida"
diff --git a/vpn-daemons/openvpn/po/sv.po b/vpn-daemons/openvpn/po/sv.po
index 10e9864dc4..208d480c96 100644
--- a/vpn-daemons/openvpn/po/sv.po
+++ b/vpn-daemons/openvpn/po/sv.po
@@ -2,13 +2,13 @@
 # Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 # Christian Rose <menthos@menthos.com>, 2004, 2005.
 #
-# $Id: sv.po,v 1.1 2005/11/14 16:04:36 rml Exp $
+# $Id: sv.po,v 1.1.2.1 2006/05/18 20:31:09 rml Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager-vpnc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-26 01:20+0200\n"
+"POT-Creation-Date: 2006-05-16 17:16+0200\n"
 "PO-Revision-Date: 2005-06-26 01:20+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -17,211 +17,380 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.c:147
+#: ../auth-dialog/gnome-two-password-dialog.c:148
+msgid "_Password:"
+msgstr "_Lösenord:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:149
 msgid "_Secondary Password:"
 msgstr "_Andrahandslösenord:"
 
-#: vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.c:268
+#: ../auth-dialog/gnome-two-password-dialog.c:272
 msgid "_Username:"
 msgstr "_Användarnamn:"
 
-#: vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.c:270
+#: ../auth-dialog/gnome-two-password-dialog.c:274
 msgid "_Domain:"
 msgstr "_Domän:"
 
-#: vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.c:272
-msgid "_Password:"
-msgstr "_Lösenord:"
-
-#: vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.c:355
+#: ../auth-dialog/gnome-two-password-dialog.c:360
 msgid "Connect _anonymously"
 msgstr "Anslut anon_ymt"
 
-#: vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.c:360
+#: ../auth-dialog/gnome-two-password-dialog.c:365
 msgid "Connect as _user:"
 msgstr "Anslut som _användare:"
 
-#: vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.c:466
-msgid "Remember password for this session"
+#: ../auth-dialog/gnome-two-password-dialog.c:471
+#, fuzzy
+msgid "_Remember password for this session"
 msgstr "Kom ihåg lösenordet för denna session"
 
-#: vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.c:468
-msgid "Save password in keyring"
+#: ../auth-dialog/gnome-two-password-dialog.c:473
+#, fuzzy
+msgid "_Save password in keyring"
 msgstr "Spara lösenordet i nyckelring"
 
-#: vpn-daemons/vpnc/auth-dialog/main.c:161
+#: ../auth-dialog/main.c:214
 #, c-format
 msgid "You need to authenticate to access the Virtual Private Network '%s'."
 msgstr "Du måsta autentisera för att komma åt VPN-nätverket \"%s\"."
 
-#: vpn-daemons/vpnc/auth-dialog/main.c:162
+#: ../auth-dialog/main.c:215
 msgid "Authenticate VPN"
 msgstr "Autentisera VPN"
 
-#: vpn-daemons/vpnc/auth-dialog/main.c:169
-msgid "_Group Password:"
-msgstr "_Grupplösenord:"
+#: ../auth-dialog/main.c:227 ../auth-dialog/main.c:252
+#, fuzzy
+msgid "Certificate password:"
+msgstr "Importera certifikat"
 
-#: vpn-daemons/vpnc/nm-vpnc.desktop.in.h:1
-msgid "VPN Connection Manager (vpnc)"
+#: ../nm-openvpn.desktop.in.h:1
+msgid "Add, Remove, and Edit VPN Connections"
+msgstr ""
+
+#: ../nm-openvpn.desktop.in.h:2
+#, fuzzy
+msgid "VPN Connection Manager (OpenVPN)"
 msgstr "VPN-anslutningshanterare (vpnc)"
 
-#: vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade.h:1
-msgid "<b>Connection Name</b>"
-msgstr "<b>Anslutningsnamn</b>"
+#: ../properties/nm-openvpn.c:108
+#, fuzzy
+msgid "OpenVPN Client"
+msgstr "IPP-klient"
 
-#: vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade.h:2
-msgid "<b>Optional Information</b>"
-msgstr "<b>Valfri information</b>"
+#: ../properties/nm-openvpn.c:614
+#, fuzzy
+msgid "The following OpenVPN connection will be created:"
+msgstr "Följande steg kommer att utföras:"
 
-#: vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade.h:3
-msgid "<b>Required Information</b>"
-msgstr "<b>Nödvändig information</b>"
+#: ../properties/nm-openvpn.c:616
+#, fuzzy, c-format
+msgid "Name:  %s"
+msgstr "Na&mn:"
 
-#: vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade.h:4
-msgid "<i>example: 172.16.0.0/16 10.11.12.0/24</i>"
-msgstr "<i>exempel: 172.16.0.0/16 10.11.12.0/24</i>"
+#: ../properties/nm-openvpn.c:624
+#, fuzzy
+msgid "Connection Type: X.509 Certificates"
+msgstr "Välj ett certifikat"
 
-#: vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade.h:5
-msgid "Gateway:"
-msgstr "Gateway:"
+#: ../properties/nm-openvpn.c:627 ../properties/nm-openvpn.c:654
+#: ../properties/nm-openvpn.c:666
+#, c-format
+msgid "CA:  %s"
+msgstr ""
 
-#: vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade.h:6
-msgid "Group Name:"
-msgstr "Gruppnamn:"
+#: ../properties/nm-openvpn.c:630 ../properties/nm-openvpn.c:669
+#, fuzzy, c-format
+msgid "Cert:  %s"
+msgstr "Skapa %1$s"
+
+#: ../properties/nm-openvpn.c:633 ../properties/nm-openvpn.c:672
+#, fuzzy, c-format
+msgid "Key:  %s"
+msgstr "Nyckel:"
+
+#: ../properties/nm-openvpn.c:637
+#, fuzzy
+msgid "Connection Type: Shared Key"
+msgstr "Anslutningstyp"
+
+#: ../properties/nm-openvpn.c:640
+#, fuzzy, c-format
+msgid "Shared Key:  %s"
+msgstr "Delad nyckel"
+
+#: ../properties/nm-openvpn.c:643
+#, fuzzy, c-format
+msgid "Local IP:  %s"
+msgstr "Lokal IP-adress"
+
+#: ../properties/nm-openvpn.c:646
+#, fuzzy, c-format
+msgid "Remote IP:  %s"
+msgstr "Fjärransluten IP-adr&ess"
+
+#: ../properties/nm-openvpn.c:651
+#, fuzzy
+msgid "Connection Type: Password"
+msgstr "Anslutningstyp"
+
+#: ../properties/nm-openvpn.c:657 ../properties/nm-openvpn.c:675
+#, fuzzy, c-format
+msgid "Username:  %s"
+msgstr "\tAnvändarnamn:  %s\n"
 
-#: vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade.h:7
-msgid ""
-"Name used to identify the connection to the private network, e.g. \"Campus "
-"VPN\" or \"Corporate Network\""
+#: ../properties/nm-openvpn.c:663
+msgid "Connection Type: X.509 with Password Authentication"
 msgstr ""
-"Namn som används för att identifiera anslutningen till det privata "
-"nätverket, exempelvis \"Campus-VPN\" eller \"Företagsnätverket\""
 
-#: vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade.h:8
-msgid "Only use VPN connection for these addresses"
-msgstr "Använd endast VPN-anslutning för dessa adresser"
+#: ../properties/nm-openvpn.c:681
+#, fuzzy, c-format
+msgid "Remote:  %s"
+msgstr "\tVägar:  %s\n"
 
-#: vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade.h:9
-msgid "Override user name"
-msgstr "Åsidosätt användarnamn"
+#: ../properties/nm-openvpn.c:684
+#, fuzzy, c-format
+msgid "Device: %s"
+msgstr "Enhet: %1"
 
-#: vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade.h:10
-msgid ""
-"Please enter the information provided by your system administrator below. Do "
-"not enter your password here as you will be prompted when connecting."
-msgstr ""
-"Ange den information som har tillhandahållits av din systemadministratör "
-"nedan. Ange inte lösenordet här eftersom du kommer att efterfrågas det när "
-"du ansluter."
+#: ../properties/nm-openvpn.c:684
+#, fuzzy
+msgid "TAP"
+msgstr "FTP"
 
-#: vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade.h:11
-msgid "Use domain for authentication"
-msgstr "Använd domän för autentisering"
+#: ../properties/nm-openvpn.c:684
+msgid "TUN"
+msgstr ""
 
-#: vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade.h:12
-msgid "_Import..."
-msgstr "_Importera..."
+#: ../properties/nm-openvpn.c:687
+#, fuzzy, c-format
+msgid "Protocol: %s"
+msgstr "Protokoll"
 
-#: vpn-daemons/vpnc/properties/nm-vpnc.c:83
-msgid "Compatible Cisco VPN client (vpnc)"
-msgstr "Kompatibel Cisco VPN-klient (vpnc)"
+#: ../properties/nm-openvpn.c:687
+#, fuzzy
+msgid "TCP"
+msgstr "TCP: "
 
-#: vpn-daemons/vpnc/properties/nm-vpnc.c:448
-#, c-format
-msgid "\tUsername:  %s\n"
-msgstr "\tAnvändarnamn:  %s\n"
+#: ../properties/nm-openvpn.c:687
+#, fuzzy
+msgid "UDP"
+msgstr "UDP: "
 
-#: vpn-daemons/vpnc/properties/nm-vpnc.c:449
-#, c-format
-msgid "\tRoutes:  %s\n"
+#: ../properties/nm-openvpn.c:691
+#, fuzzy, c-format
+msgid "Routes:  %s"
 msgstr "\tVägar:  %s\n"
 
-#: vpn-daemons/vpnc/properties/nm-vpnc.c:450
-#, c-format
-msgid "\tDomain:  %s\n"
-msgstr "\tDomän:  %s\n"
+#: ../properties/nm-openvpn.c:695
+#, fuzzy, c-format
+msgid "Use LZO Compression: %s"
+msgstr "Komprimering"
 
-#: vpn-daemons/vpnc/properties/nm-vpnc.c:453
-#, c-format
-msgid ""
-"The following vpnc VPN connection will be created:\n"
-"\n"
-"\tName:  %s\n"
-"\n"
-"\tGateway:  %s\n"
-"\tGroup Name:  %s\n"
-"%s%s%s\n"
-"The connection details can be changed using the \"Edit\" button.\n"
-msgstr ""
-"Följande vpnc-VPN-anslutning kommer att skapas:\n"
-"\n"
-"\tNamn:  %s\n"
-"\n"
-"\tGateway:  %s\n"
-"\tGruppnamn:  %s\n"
-"%s%s%s\n"
-"Anslutningsdetaljerna kan ändras genom att använda knappen \"Redigera\".\n"
-
-#: vpn-daemons/vpnc/properties/nm-vpnc.c:544
-msgid "TCP tunneling not supported"
-msgstr "TCP-tunnling stöds inte"
-
-#: vpn-daemons/vpnc/properties/nm-vpnc.c:546
-#, c-format
-msgid ""
-"The VPN settings file '%s' specifies that VPN traffic should be tunneled "
-"through TCP which is currently not supported in the vpnc software.\n"
-"\n"
-"The connection can still be created, with TCP tunneling disabled, however it "
-"may not work as expected."
-msgstr ""
-"VPN-inställningsfilen \"%s\" anger att VPN-trafiken ska tunnlas genom TCP "
-"vilket för tillfället inte stöds i vpnc-programvaran.\n"
-"\n"
-"Anslutningen kan fortfarande skapas, med inaktiverad TCP-tunnling, men det "
-"kanske inte fungerar som väntat."
-
-#: vpn-daemons/vpnc/properties/nm-vpnc.c:570
+#: ../properties/nm-openvpn.c:695
+msgid "Yes"
+msgstr "Ja"
+
+#: ../properties/nm-openvpn.c:695
+msgid "No"
+msgstr "Nej"
+
+#: ../properties/nm-openvpn.c:698
+msgid "The connection details can be changed using the \"Edit\" button."
+msgstr ""
+
+#: ../properties/nm-openvpn.c:849
 msgid "Cannot import settings"
 msgstr "Kan inte importera inställningar"
 
-#: vpn-daemons/vpnc/properties/nm-vpnc.c:572
+#: ../properties/nm-openvpn.c:851
 #, c-format
 msgid "The VPN settings file '%s' does not contain valid data."
 msgstr "VPN-inställningsfilen \"%s\" innehåller inte giltiga data."
 
-#: vpn-daemons/vpnc/properties/nm-vpnc.c:589
+#: ../properties/nm-openvpn.c:885
 msgid "Select file to import"
 msgstr "Välj fil att importera"
 
+#: ../properties/nm-openvpn.c:966 ../properties/nm-openvpn.c:978
+#, fuzzy
+msgid "Select CA to use"
+msgstr "Välj an&vändare:"
+
+#: ../properties/nm-openvpn.c:969
+#, fuzzy
+msgid "Select certificate to use"
+msgstr "Välj certifikat"
+
+#: ../properties/nm-openvpn.c:972
+#, fuzzy
+msgid "Select key to use"
+msgstr "Välj mottagare."
+
+#: ../properties/nm-openvpn.c:975
+#, fuzzy
+msgid "Select shared key to use"
+msgstr "Välj PPD-filen som ska användas."
+
 #. printf ("in impl_export\n");
-#: vpn-daemons/vpnc/properties/nm-vpnc.c:744
+#: ../properties/nm-openvpn.c:1147
 msgid "Save as..."
 msgstr "Spara som..."
 
-#: vpn-daemons/vpnc/properties/nm-vpnc.c:774
+#: ../properties/nm-openvpn.c:1177
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "En fil med namnet \"%s\" finns redan."
 
-#: vpn-daemons/vpnc/properties/nm-vpnc.c:777
+#: ../properties/nm-openvpn.c:1180
 msgid "Do you want to replace it with the one you are saving?"
 msgstr "Vill du ersätta den med den du håller på att spara?"
 
-#: vpn-daemons/vpnc/src/nm-vpnc-service.c:115
+#: ../properties/nm-openvpn-dialog.glade.h:1
+msgid "<b>Connection Name</b>"
+msgstr "<b>Anslutningsnamn</b>"
+
+#: ../properties/nm-openvpn-dialog.glade.h:2
+msgid "<b>Optional Information</b>"
+msgstr "<b>Valfri information</b>"
+
+#: ../properties/nm-openvpn-dialog.glade.h:3
+msgid "<b>Required Information</b>"
+msgstr "<b>Nödvändig information</b>"
+
+#: ../properties/nm-openvpn-dialog.glade.h:4
+msgid "<i>example: 172.16.0.0/16 10.11.12.0/24</i>"
+msgstr "<i>exempel: 172.16.0.0/16 10.11.12.0/24</i>"
+
+#: ../properties/nm-openvpn-dialog.glade.h:5
+msgid "CA  file:"
+msgstr ""
+
+#: ../properties/nm-openvpn-dialog.glade.h:6
+#, fuzzy
+msgid "Certificate:"
+msgstr "Certifikat"
+
+#: ../properties/nm-openvpn-dialog.glade.h:7
+#, fuzzy
+msgid "Connection Type:"
+msgstr "Anslutningstyp"
+
+#: ../properties/nm-openvpn-dialog.glade.h:8
+msgid "Key:"
+msgstr "Nyckel:"
+
+#: ../properties/nm-openvpn-dialog.glade.h:9
+#, fuzzy
+msgid "Local IP:"
+msgstr "Lokal"
+
+#: ../properties/nm-openvpn-dialog.glade.h:10
+msgid "Password"
+msgstr "Lösenord"
+
+#: ../properties/nm-openvpn-dialog.glade.h:11
+msgid ""
+"Please enter the information provided by your system administrator below. Do "
+"not enter your password here as you will be prompted when connecting."
+msgstr ""
+"Ange den information som har tillhandahållits av din systemadministratör "
+"nedan. Ange inte lösenordet här eftersom du kommer att efterfrågas det när "
+"du ansluter."
+
+#: ../properties/nm-openvpn-dialog.glade.h:12
+msgid ""
+"Please note that the file you import is not an OpenVPN configuration file. "
+"Ask your adminstrator for the file."
+msgstr ""
+
+#: ../properties/nm-openvpn-dialog.glade.h:13
+#, fuzzy
+msgid "Remote IP:"
+msgstr "Fjärr"
+
+#: ../properties/nm-openvpn-dialog.glade.h:14
+#, fuzzy
+msgid "Shared Key:"
+msgstr "Delad nyckel"
+
+#: ../properties/nm-openvpn-dialog.glade.h:15
+#, fuzzy
+msgid "Shared key"
+msgstr "Delad nyckel"
+
+#: ../properties/nm-openvpn-dialog.glade.h:16
+#, fuzzy
+msgid "Use LZO compression"
+msgstr "Komprimering"
+
+#: ../properties/nm-openvpn-dialog.glade.h:17
+#, fuzzy
+msgid "Use TAP device"
+msgstr "&USB-enheter"
+
+#: ../properties/nm-openvpn-dialog.glade.h:18
+#, fuzzy
+msgid "Use TCP connection"
+msgstr "- Stänga anslutningen"
+
+#: ../properties/nm-openvpn-dialog.glade.h:19
+#, fuzzy
+msgid "Username:"
+msgstr "&Användarnamn:"
+
+#: ../properties/nm-openvpn-dialog.glade.h:20
+msgid "X.509"
+msgstr ""
+
+#: ../properties/nm-openvpn-dialog.glade.h:21
+msgid ""
+"X.509 Certificates\n"
+"Pre-shared key\n"
+"Password Authentication\n"
+"X.509 with Password Authentication"
+msgstr ""
+
+#: ../properties/nm-openvpn-dialog.glade.h:25
+#, fuzzy
+msgid "_Gateway:"
+msgstr "Gateway:"
+
+#: ../properties/nm-openvpn-dialog.glade.h:26
+#, fuzzy
+msgid "_Import Saved Configuration..."
+msgstr "Sparar NIS-inställningar..."
+
+#: ../properties/nm-openvpn-dialog.glade.h:27
+#, fuzzy
+msgid ""
+"_Name used to identify the connection to the private network, e.g. \"Campus "
+"VPN\" or \"Corporate Network\""
+msgstr ""
+"Namn som används för att identifiera anslutningen till det privata "
+"nätverket, exempelvis \"Campus-VPN\" eller \"Företagsnätverket\""
+
+#: ../properties/nm-openvpn-dialog.glade.h:28
+#, fuzzy
+msgid "_Only use VPN connection for these addresses"
+msgstr "Använd endast VPN-anslutning för dessa adresser"
+
+#: ../src/nm-openvpn-service.c:136
+#, fuzzy
 msgid ""
-"The VPN login failed because the user name and password were not accepted."
+"The VPN login failed because the user name and password were not accepted or "
+"the certificate password was wrong."
 msgstr ""
 "VPN-inloggningen misslyckades eftersom användarnamnet och lösenordet inte "
 "accepterades."
 
-#: vpn-daemons/vpnc/src/nm-vpnc-service.c:117
+#: ../src/nm-openvpn-service.c:138
 msgid "The VPN login failed because the VPN program could not be started."
 msgstr ""
 "VPN-inloggningen misslyckades eftersom VPN-programmet inte kunde startas."
 
-#: vpn-daemons/vpnc/src/nm-vpnc-service.c:119
+#: ../src/nm-openvpn-service.c:140
 msgid ""
 "The VPN login failed because the VPN program could not connect to the VPN "
 "server."
@@ -229,14 +398,14 @@ msgstr ""
 "VPN-inloggningen misslyckades eftersom VPN-programmet inte kunde ansluta "
 "till VPN-servern."
 
-#: vpn-daemons/vpnc/src/nm-vpnc-service.c:121
+#: ../src/nm-openvpn-service.c:142
 msgid ""
 "The VPN login failed because the VPN configuration options were invalid."
 msgstr ""
 "VPN-inloggningen misslyckades eftersom VPN-konfigurationsalternativen var "
 "ogiltiga."
 
-#: vpn-daemons/vpnc/src/nm-vpnc-service.c:123
+#: ../src/nm-openvpn-service.c:144
 msgid ""
 "The VPN login failed because the VPN program received an invalid "
 "configuration from the VPN server."
@@ -244,3 +413,63 @@ msgstr ""
 "VPN-inloggningen misslyckades eftersom VPN-programmet mottog en ogiltig "
 "konfiguration från VPN-servern."
 
+#: ../src/nm-openvpn-service.c:146
+#, fuzzy
+msgid "VPN connection failed"
+msgstr "Inga anslutningar definierade"
+
+#~ msgid "_Group Password:"
+#~ msgstr "_Grupplösenord:"
+
+#~ msgid "Group Name:"
+#~ msgstr "Gruppnamn:"
+
+#~ msgid "Override user name"
+#~ msgstr "Åsidosätt användarnamn"
+
+#~ msgid "Use domain for authentication"
+#~ msgstr "Använd domän för autentisering"
+
+#~ msgid "_Import..."
+#~ msgstr "_Importera..."
+
+#~ msgid "Compatible Cisco VPN client (vpnc)"
+#~ msgstr "Kompatibel Cisco VPN-klient (vpnc)"
+
+#~ msgid "\tDomain:  %s\n"
+#~ msgstr "\tDomän:  %s\n"
+
+#~ msgid ""
+#~ "The following vpnc VPN connection will be created:\n"
+#~ "\n"
+#~ "\tName:  %s\n"
+#~ "\n"
+#~ "\tGateway:  %s\n"
+#~ "\tGroup Name:  %s\n"
+#~ "%s%s%s\n"
+#~ "The connection details can be changed using the \"Edit\" button.\n"
+#~ msgstr ""
+#~ "Följande vpnc-VPN-anslutning kommer att skapas:\n"
+#~ "\n"
+#~ "\tNamn:  %s\n"
+#~ "\n"
+#~ "\tGateway:  %s\n"
+#~ "\tGruppnamn:  %s\n"
+#~ "%s%s%s\n"
+#~ "Anslutningsdetaljerna kan ändras genom att använda knappen \"Redigera\".\n"
+
+#~ msgid "TCP tunneling not supported"
+#~ msgstr "TCP-tunnling stöds inte"
+
+#~ msgid ""
+#~ "The VPN settings file '%s' specifies that VPN traffic should be tunneled "
+#~ "through TCP which is currently not supported in the vpnc software.\n"
+#~ "\n"
+#~ "The connection can still be created, with TCP tunneling disabled, however "
+#~ "it may not work as expected."
+#~ msgstr ""
+#~ "VPN-inställningsfilen \"%s\" anger att VPN-trafiken ska tunnlas genom TCP "
+#~ "vilket för tillfället inte stöds i vpnc-programvaran.\n"
+#~ "\n"
+#~ "Anslutningen kan fortfarande skapas, med inaktiverad TCP-tunnling, men "
+#~ "det kanske inte fungerar som väntat."
diff --git a/vpn-daemons/openvpn/po/zh_CN.po b/vpn-daemons/openvpn/po/zh_CN.po
index 1eaae3d5cf..797c81faa6 100644
--- a/vpn-daemons/openvpn/po/zh_CN.po
+++ b/vpn-daemons/openvpn/po/zh_CN.po
@@ -1,179 +1,199 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# Funda Wang <fundawang@linux.net.cn>, 2004.
+# Chinese message file for YaST2 (@memory@)
+# Copyright (C) 2005 SUSE Linux Products GmbH.
+# Copyright (C) 2002 SuSE Linux AG.
+# Copyright (C) 2001 SuSE GmbH.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: NetworkManager\n"
+"Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-04 00:45+0800\n"
-"PO-Revision-Date: 2006-02-04 01:03+0800\n"
-"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
-"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"POT-Creation-Date: 2006-05-16 17:16+0200\n"
+"PO-Revision-Date: 2004-04-02 10:52+0200\n"
+"Last-Translator: 裴寒牧 <phm@a2e.de>\n"
+"Language-Team: 中� <nls-zh@suse.de>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../auth-dialog/gnome-two-password-dialog.c:148
+#, fuzzy
 msgid "_Password:"
-msgstr "密�(_P)："
+msgstr "�令："
 
 #: ../auth-dialog/gnome-two-password-dialog.c:149
+#, fuzzy
 msgid "_Secondary Password:"
-msgstr "次�密�(_S)："
+msgstr "校验�令(&E)："
 
 #: ../auth-dialog/gnome-two-password-dialog.c:272
+#, fuzzy
 msgid "_Username:"
-msgstr "用户�(_U)："
+msgstr "用户�(&U)："
 
 #: ../auth-dialog/gnome-two-password-dialog.c:274
+#, fuzzy
 msgid "_Domain:"
-msgstr "域(_D)："
+msgstr "域(&D)："
 
 #: ../auth-dialog/gnome-two-password-dialog.c:360
+#, fuzzy
 msgid "Connect _anonymously"
-msgstr "匿�连接(_A)"
+msgstr "连接"
 
 #: ../auth-dialog/gnome-two-password-dialog.c:365
+#, fuzzy
 msgid "Connect as _user:"
-msgstr "连接为用户(_U)："
+msgstr "连接为"
 
 #: ../auth-dialog/gnome-two-password-dialog.c:471
+#, fuzzy
 msgid "_Remember password for this session"
-msgstr "此会�记�密�(_R)"
+msgstr "�输一��令以便确认(&V)："
 
 #: ../auth-dialog/gnome-two-password-dialog.c:473
+#, fuzzy
 msgid "_Save password in keyring"
-msgstr "在密钥环中�存密�(_S)"
+msgstr "设置�令加密"
 
 #: ../auth-dialog/main.c:214
 #, c-format
 msgid "You need to authenticate to access the Virtual Private Network '%s'."
-msgstr "�访问虚拟�网“%s�，您必须进行身份验�。"
+msgstr ""
 
 #: ../auth-dialog/main.c:215
+#, fuzzy
 msgid "Authenticate VPN"
-msgstr "验� VPN"
+msgstr "鉴定"
 
 #: ../auth-dialog/main.c:227 ../auth-dialog/main.c:252
+#, fuzzy
 msgid "Certificate password:"
-msgstr "�书密�："
+msgstr "�书�令(&P)："
 
 #: ../nm-openvpn.desktop.in.h:1
 msgid "Add, Remove, and Edit VPN Connections"
-msgstr "添加�删除和编辑 VPN 连接"
+msgstr ""
 
 #: ../nm-openvpn.desktop.in.h:2
+#, fuzzy
 msgid "VPN Connection Manager (OpenVPN)"
-msgstr "VPN 连接管�器(OpenVPN)"
+msgstr "连接管�"
 
 #: ../properties/nm-openvpn.c:108
+#, fuzzy
 msgid "OpenVPN Client"
-msgstr "OpenVPN 客户端"
+msgstr "IPP 客户程�"
 
 #: ../properties/nm-openvpn.c:614
+#, fuzzy
 msgid "The following OpenVPN connection will be created:"
-msgstr "�将创建下�的 VPN 连接："
+msgstr "将�消激活以下扫�仪："
 
 #: ../properties/nm-openvpn.c:616
-#, c-format
+#, fuzzy, c-format
 msgid "Name:  %s"
-msgstr "�称：%s"
+msgstr "�称(&M)："
 
 #: ../properties/nm-openvpn.c:624
+#, fuzzy
 msgid "Connection Type: X.509 Certificates"
-msgstr "连接类型：X.509 �书"
+msgstr "选择�书"
 
 #: ../properties/nm-openvpn.c:627 ../properties/nm-openvpn.c:654
 #: ../properties/nm-openvpn.c:666
 #, c-format
 msgid "CA:  %s"
-msgstr "CA：%s"
+msgstr ""
 
 #: ../properties/nm-openvpn.c:630 ../properties/nm-openvpn.c:669
-#, c-format
+#, fuzzy, c-format
 msgid "Cert:  %s"
-msgstr "�书：%s"
+msgstr "创建 %1$s"
 
 #: ../properties/nm-openvpn.c:633 ../properties/nm-openvpn.c:672
-#, c-format
+#, fuzzy, c-format
 msgid "Key:  %s"
-msgstr "密钥：%s"
+msgstr "密钥："
 
 #: ../properties/nm-openvpn.c:637
+#, fuzzy
 msgid "Connection Type: Shared Key"
-msgstr ""
+msgstr "连接类型"
 
 #: ../properties/nm-openvpn.c:640
-#, c-format
+#, fuzzy, c-format
 msgid "Shared Key:  %s"
-msgstr "共享密钥：%s"
+msgstr "共享密钥"
 
 #: ../properties/nm-openvpn.c:643
-#, c-format
+#, fuzzy, c-format
 msgid "Local IP:  %s"
-msgstr "本地 IP：%s"
+msgstr "本地 IP 地�"
 
 #: ../properties/nm-openvpn.c:646
-#, c-format
+#, fuzzy, c-format
 msgid "Remote IP:  %s"
-msgstr "远程 IP：%s"
+msgstr "远程 IP 地�(&M)"
 
 #: ../properties/nm-openvpn.c:651
+#, fuzzy
 msgid "Connection Type: Password"
-msgstr "连接类型：密�"
+msgstr "连接类型"
 
 #: ../properties/nm-openvpn.c:657 ../properties/nm-openvpn.c:675
-#, c-format
+#, fuzzy, c-format
 msgid "Username:  %s"
-msgstr "用户�：%s"
+msgstr "用户�：%1"
 
 #: ../properties/nm-openvpn.c:663
 msgid "Connection Type: X.509 with Password Authentication"
 msgstr ""
 
 #: ../properties/nm-openvpn.c:681
-#, c-format
+#, fuzzy, c-format
 msgid "Remote:  %s"
-msgstr "远程：%s"
+msgstr "角色：%s"
 
 #: ../properties/nm-openvpn.c:684
-#, c-format
+#, fuzzy, c-format
 msgid "Device: %s"
-msgstr "设备：%s"
+msgstr "设备：%1"
 
 #: ../properties/nm-openvpn.c:684
+#, fuzzy
 msgid "TAP"
-msgstr "TAP"
+msgstr "PAP"
 
 #: ../properties/nm-openvpn.c:684
+#, fuzzy
 msgid "TUN"
-msgstr "TUN"
+msgstr "LUN"
 
 #: ../properties/nm-openvpn.c:687
-#, c-format
+#, fuzzy, c-format
 msgid "Protocol: %s"
-msgstr "�议：%s"
+msgstr "�议"
 
 #: ../properties/nm-openvpn.c:687
+#, fuzzy
 msgid "TCP"
-msgstr "TCP"
+msgstr "RTC"
 
 #: ../properties/nm-openvpn.c:687
+#, fuzzy
 msgid "UDP"
-msgstr "UDP"
+msgstr "UID"
 
 #: ../properties/nm-openvpn.c:691
-#, c-format
+#, fuzzy, c-format
 msgid "Routes:  %s"
-msgstr "路由：%s"
+msgstr "路由: %1"
 
 #: ../properties/nm-openvpn.c:695
-#, c-format
+#, fuzzy, c-format
 msgid "Use LZO Compression: %s"
-msgstr "使用 LZO 压缩：%s"
+msgstr "压缩"
 
 #: ../properties/nm-openvpn.c:695
 msgid "Yes"
@@ -188,33 +208,39 @@ msgid "The connection details can be changed using the \"Edit\" button."
 msgstr ""
 
 #: ../properties/nm-openvpn.c:849
+#, fuzzy
 msgid "Cannot import settings"
-msgstr "无法导入设置"
+msgstr "无法写入设置�"
 
 #: ../properties/nm-openvpn.c:851
-#, c-format
+#, fuzzy, c-format
 msgid "The VPN settings file '%s' does not contain valid data."
-msgstr "VPN 设置文件“%s��包�有效数�。"
+msgstr "所选文件�包� TSIG 密钥."
 
 #: ../properties/nm-openvpn.c:885
+#, fuzzy
 msgid "Select file to import"
-msgstr "选择�导入的文件"
+msgstr "选择�装载的文件。"
 
 #: ../properties/nm-openvpn.c:966 ../properties/nm-openvpn.c:978
+#, fuzzy
 msgid "Select CA to use"
-msgstr "选择�使用的 CA"
+msgstr "选择用户(&S)："
 
 #: ../properties/nm-openvpn.c:969
+#, fuzzy
 msgid "Select certificate to use"
-msgstr "选择�使用的�书"
+msgstr "选择�书文件"
 
 #: ../properties/nm-openvpn.c:972
+#, fuzzy
 msgid "Select key to use"
-msgstr "选择�使用的密钥"
+msgstr "选择调�器。"
 
 #: ../properties/nm-openvpn.c:975
+#, fuzzy
 msgid "Select shared key to use"
-msgstr "选择�使用的共享密钥"
+msgstr "选择�使用的 PPD 文件。"
 
 #. printf ("in impl_export\n");
 #: ../properties/nm-openvpn.c:1147
@@ -222,53 +248,61 @@ msgid "Save as..."
 msgstr "�存为..."
 
 #: ../properties/nm-openvpn.c:1177
-#, c-format
+#, fuzzy, c-format
 msgid "A file named \"%s\" already exists."
-msgstr "已�存在�为“%s�的文件。"
+msgstr "�为 %1 的主机已存在。"
 
 #: ../properties/nm-openvpn.c:1180
+#, fuzzy
 msgid "Do you want to replace it with the one you are saving?"
-msgstr ""
+msgstr "是�确实��设置您的设置？"
 
 #: ../properties/nm-openvpn-dialog.glade.h:1
+#, fuzzy
 msgid "<b>Connection Name</b>"
-msgstr "<b>连接�称</b>"
+msgstr "<b>说明： </b>"
 
 #: ../properties/nm-openvpn-dialog.glade.h:2
+#, fuzzy
 msgid "<b>Optional Information</b>"
-msgstr "<b>�选信�</b>"
+msgstr "�选信�"
 
 #: ../properties/nm-openvpn-dialog.glade.h:3
+#, fuzzy
 msgid "<b>Required Information</b>"
-msgstr "<b>请求的信�</b>"
+msgstr "<p><b>支�信�</b></p>\n"
 
 #: ../properties/nm-openvpn-dialog.glade.h:4
 msgid "<i>example: 172.16.0.0/16 10.11.12.0/24</i>"
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.glade.h:5
+#, fuzzy
 msgid "CA  file:"
-msgstr "CA 文件："
+msgstr "CA 已�存到文件。"
 
 #: ../properties/nm-openvpn-dialog.glade.h:6
+#, fuzzy
 msgid "Certificate:"
-msgstr "�书："
+msgstr "�书"
 
 #: ../properties/nm-openvpn-dialog.glade.h:7
+#, fuzzy
 msgid "Connection Type:"
-msgstr "连接类型："
+msgstr "连接类型"
 
 #: ../properties/nm-openvpn-dialog.glade.h:8
 msgid "Key:"
 msgstr "密钥："
 
 #: ../properties/nm-openvpn-dialog.glade.h:9
+#, fuzzy
 msgid "Local IP:"
-msgstr "本地 IP："
+msgstr "本地"
 
 #: ../properties/nm-openvpn-dialog.glade.h:10
 msgid "Password"
-msgstr "密�"
+msgstr "�令"
 
 #: ../properties/nm-openvpn-dialog.glade.h:11
 msgid ""
@@ -283,32 +317,39 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.glade.h:13
+#, fuzzy
 msgid "Remote IP:"
-msgstr "远程 IP："
+msgstr "远程"
 
 #: ../properties/nm-openvpn-dialog.glade.h:14
+#, fuzzy
 msgid "Shared Key:"
-msgstr "共享密钥："
+msgstr "共享密钥"
 
 #: ../properties/nm-openvpn-dialog.glade.h:15
+#, fuzzy
 msgid "Shared key"
-msgstr "共享�密钥"
+msgstr "共享密钥"
 
 #: ../properties/nm-openvpn-dialog.glade.h:16
+#, fuzzy
 msgid "Use LZO compression"
-msgstr "使用 LZO 压缩"
+msgstr "压缩"
 
 #: ../properties/nm-openvpn-dialog.glade.h:17
+#, fuzzy
 msgid "Use TAP device"
-msgstr ""
+msgstr "USB 设备 (&U)"
 
 #: ../properties/nm-openvpn-dialog.glade.h:18
+#, fuzzy
 msgid "Use TCP connection"
-msgstr "使用 TCP 连接"
+msgstr "测试连接"
 
 #: ../properties/nm-openvpn-dialog.glade.h:19
+#, fuzzy
 msgid "Username:"
-msgstr "用户�："
+msgstr "用户�(&U)："
 
 #: ../properties/nm-openvpn-dialog.glade.h:20
 msgid "X.509"
@@ -323,12 +364,14 @@ msgid ""
 msgstr ""
 
 #: ../properties/nm-openvpn-dialog.glade.h:25
+#, fuzzy
 msgid "_Gateway:"
-msgstr "网关(_G)："
+msgstr "网关"
 
 #: ../properties/nm-openvpn-dialog.glade.h:26
+#, fuzzy
 msgid "_Import Saved Configuration..."
-msgstr "导入�存的�置(_I)..."
+msgstr "�务器�置(&S)..."
 
 #: ../properties/nm-openvpn-dialog.glade.h:27
 msgid ""
@@ -338,7 +381,7 @@ msgstr ""
 
 #: ../properties/nm-openvpn-dialog.glade.h:28
 msgid "_Only use VPN connection for these addresses"
-msgstr "这些地��使用 VPN 连接(_O)"
+msgstr ""
 
 #: ../src/nm-openvpn-service.c:136
 msgid ""
@@ -368,6 +411,6 @@ msgid ""
 msgstr ""
 
 #: ../src/nm-openvpn-service.c:146
+#, fuzzy
 msgid "VPN connection failed"
-msgstr "VPN 连接失败"
-
+msgstr "未定义任何连接"
diff --git a/vpn-daemons/openvpn/po/zh_TW.po b/vpn-daemons/openvpn/po/zh_TW.po
new file mode 100644
index 0000000000..95b9bf6ed0
--- /dev/null
+++ b/vpn-daemons/openvpn/po/zh_TW.po
@@ -0,0 +1,416 @@
+# Chinese message file for YaST2 (@memory@). -*- coding: utf-8 -*-
+# Copyright (C) 2005 SUSE Linux Products GmbH.
+# Copyright (C) 2002 SuSE Linux AG.
+# Copyright (C) 2001 SuSE GmbH.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: YaST (@memory@)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-05-16 17:16+0200\n"
+"PO-Revision-Date: 2001-06-05 18:04+02:00\n"
+"Last-Translator: 裴寒牧 <phm@a2e.de>\n"
+"Language-Team: 中� <nls-zh@suse.de>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:148
+#, fuzzy
+msgid "_Password:"
+msgstr "密碼："
+
+#: ../auth-dialog/gnome-two-password-dialog.c:149
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "確�密碼(&E)："
+
+#: ../auth-dialog/gnome-two-password-dialog.c:272
+#, fuzzy
+msgid "_Username:"
+msgstr "使用者�稱(&U)："
+
+#: ../auth-dialog/gnome-two-password-dialog.c:274
+#, fuzzy
+msgid "_Domain:"
+msgstr "領域(&D)："
+
+#: ../auth-dialog/gnome-two-password-dialog.c:360
+#, fuzzy
+msgid "Connect _anonymously"
+msgstr "連線"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:365
+#, fuzzy
+msgid "Connect as _user:"
+msgstr " 連接身份 "
+
+#: ../auth-dialog/gnome-two-password-dialog.c:471
+#, fuzzy
+msgid "_Remember password for this session"
+msgstr "�新輸入密碼以進行確�(&V)："
+
+#: ../auth-dialog/gnome-two-password-dialog.c:473
+#, fuzzy
+msgid "_Save password in keyring"
+msgstr "設定密碼加密"
+
+#: ../auth-dialog/main.c:214
+#, c-format
+msgid "You need to authenticate to access the Virtual Private Network '%s'."
+msgstr ""
+
+#: ../auth-dialog/main.c:215
+#, fuzzy
+msgid "Authenticate VPN"
+msgstr "é©—è­‰"
+
+#: ../auth-dialog/main.c:227 ../auth-dialog/main.c:252
+#, fuzzy
+msgid "Certificate password:"
+msgstr "憑證密碼(&P)："
+
+#: ../nm-openvpn.desktop.in.h:1
+msgid "Add, Remove, and Edit VPN Connections"
+msgstr ""
+
+#: ../nm-openvpn.desktop.in.h:2
+#, fuzzy
+msgid "VPN Connection Manager (OpenVPN)"
+msgstr "連線管�"
+
+#: ../properties/nm-openvpn.c:108
+#, fuzzy
+msgid "OpenVPN Client"
+msgstr "IPP 用戶端"
+
+#: ../properties/nm-openvpn.c:614
+#, fuzzy
+msgid "The following OpenVPN connection will be created:"
+msgstr "將�用下列掃�器："
+
+#: ../properties/nm-openvpn.c:616
+#, fuzzy, c-format
+msgid "Name:  %s"
+msgstr "�稱(&M)："
+
+#: ../properties/nm-openvpn.c:624
+#, fuzzy
+msgid "Connection Type: X.509 Certificates"
+msgstr "�擇憑證"
+
+#: ../properties/nm-openvpn.c:627 ../properties/nm-openvpn.c:654
+#: ../properties/nm-openvpn.c:666
+#, c-format
+msgid "CA:  %s"
+msgstr ""
+
+#: ../properties/nm-openvpn.c:630 ../properties/nm-openvpn.c:669
+#, fuzzy, c-format
+msgid "Cert:  %s"
+msgstr "建立 %1$s"
+
+#: ../properties/nm-openvpn.c:633 ../properties/nm-openvpn.c:672
+#, fuzzy, c-format
+msgid "Key:  %s"
+msgstr "金鑰："
+
+#: ../properties/nm-openvpn.c:637
+#, fuzzy
+msgid "Connection Type: Shared Key"
+msgstr "連接類型"
+
+#: ../properties/nm-openvpn.c:640
+#, fuzzy, c-format
+msgid "Shared Key:  %s"
+msgstr "共用金鑰"
+
+#: ../properties/nm-openvpn.c:643
+#, fuzzy, c-format
+msgid "Local IP:  %s"
+msgstr "本地 IP ��"
+
+#: ../properties/nm-openvpn.c:646
+#, fuzzy, c-format
+msgid "Remote IP:  %s"
+msgstr "�端 IP ��(&M)"
+
+#: ../properties/nm-openvpn.c:651
+#, fuzzy
+msgid "Connection Type: Password"
+msgstr "連接類型"
+
+#: ../properties/nm-openvpn.c:657 ../properties/nm-openvpn.c:675
+#, fuzzy, c-format
+msgid "Username:  %s"
+msgstr "使用者�稱：%1"
+
+#: ../properties/nm-openvpn.c:663
+msgid "Connection Type: X.509 with Password Authentication"
+msgstr ""
+
+#: ../properties/nm-openvpn.c:681
+#, fuzzy, c-format
+msgid "Remote:  %s"
+msgstr "�能：%s"
+
+#: ../properties/nm-openvpn.c:684
+#, fuzzy, c-format
+msgid "Device: %s"
+msgstr "�置： %1"
+
+#: ../properties/nm-openvpn.c:684
+#, fuzzy
+msgid "TAP"
+msgstr "PAP"
+
+#: ../properties/nm-openvpn.c:684
+#, fuzzy
+msgid "TUN"
+msgstr "LUN"
+
+#: ../properties/nm-openvpn.c:687
+#, fuzzy, c-format
+msgid "Protocol: %s"
+msgstr "�定"
+
+#: ../properties/nm-openvpn.c:687
+#, fuzzy
+msgid "TCP"
+msgstr "RTC"
+
+#: ../properties/nm-openvpn.c:687
+#, fuzzy
+msgid "UDP"
+msgstr "UID"
+
+#: ../properties/nm-openvpn.c:691
+#, fuzzy, c-format
+msgid "Routes:  %s"
+msgstr "路由：%1"
+
+#: ../properties/nm-openvpn.c:695
+#, fuzzy, c-format
+msgid "Use LZO Compression: %s"
+msgstr "壓縮"
+
+#: ../properties/nm-openvpn.c:695
+msgid "Yes"
+msgstr "是"
+
+#: ../properties/nm-openvpn.c:695
+msgid "No"
+msgstr "ç„¡"
+
+#: ../properties/nm-openvpn.c:698
+msgid "The connection details can be changed using the \"Edit\" button."
+msgstr ""
+
+#: ../properties/nm-openvpn.c:849
+#, fuzzy
+msgid "Cannot import settings"
+msgstr "無法寫入設定�"
+
+#: ../properties/nm-openvpn.c:851
+#, fuzzy, c-format
+msgid "The VPN settings file '%s' does not contain valid data."
+msgstr "指定的檔案沒有包� TSIG 金鑰。"
+
+#: ../properties/nm-openvpn.c:885
+#, fuzzy
+msgid "Select file to import"
+msgstr "���載入的檔案。"
+
+#: ../properties/nm-openvpn.c:966 ../properties/nm-openvpn.c:978
+#, fuzzy
+msgid "Select CA to use"
+msgstr "��使用者(&S)："
+
+#: ../properties/nm-openvpn.c:969
+#, fuzzy
+msgid "Select certificate to use"
+msgstr "��憑證檔案"
+
+#: ../properties/nm-openvpn.c:972
+#, fuzzy
+msgid "Select key to use"
+msgstr "��調頻機"
+
+#: ../properties/nm-openvpn.c:975
+#, fuzzy
+msgid "Select shared key to use"
+msgstr "���使用的 PPD 檔案。"
+
+#. printf ("in impl_export\n");
+#: ../properties/nm-openvpn.c:1147
+msgid "Save as..."
+msgstr "�存新檔..."
+
+#: ../properties/nm-openvpn.c:1177
+#, fuzzy, c-format
+msgid "A file named \"%s\" already exists."
+msgstr "�為 %1 的主機已經存在。"
+
+#: ../properties/nm-openvpn.c:1180
+#, fuzzy
+msgid "Do you want to replace it with the one you are saving?"
+msgstr "您確定��設設定嗎？"
+
+#: ../properties/nm-openvpn-dialog.glade.h:1
+#, fuzzy
+msgid "<b>Connection Name</b>"
+msgstr "<b>�述： </b>"
+
+#: ../properties/nm-openvpn-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Optional Information</b>"
+msgstr "�擇性資訊"
+
+#: ../properties/nm-openvpn-dialog.glade.h:3
+#, fuzzy
+msgid "<b>Required Information</b>"
+msgstr "<p><b>支�資訊</b></p>\n"
+
+#: ../properties/nm-openvpn-dialog.glade.h:4
+msgid "<i>example: 172.16.0.0/16 10.11.12.0/24</i>"
+msgstr ""
+
+#: ../properties/nm-openvpn-dialog.glade.h:5
+#, fuzzy
+msgid "CA  file:"
+msgstr "CA 已儲存到檔案。"
+
+#: ../properties/nm-openvpn-dialog.glade.h:6
+#, fuzzy
+msgid "Certificate:"
+msgstr "憑證"
+
+#: ../properties/nm-openvpn-dialog.glade.h:7
+#, fuzzy
+msgid "Connection Type:"
+msgstr "連接類型"
+
+#: ../properties/nm-openvpn-dialog.glade.h:8
+msgid "Key:"
+msgstr "金鑰："
+
+#: ../properties/nm-openvpn-dialog.glade.h:9
+#, fuzzy
+msgid "Local IP:"
+msgstr "本地"
+
+#: ../properties/nm-openvpn-dialog.glade.h:10
+msgid "Password"
+msgstr "密碼"
+
+#: ../properties/nm-openvpn-dialog.glade.h:11
+msgid ""
+"Please enter the information provided by your system administrator below. Do "
+"not enter your password here as you will be prompted when connecting."
+msgstr ""
+
+#: ../properties/nm-openvpn-dialog.glade.h:12
+msgid ""
+"Please note that the file you import is not an OpenVPN configuration file. "
+"Ask your adminstrator for the file."
+msgstr ""
+
+#: ../properties/nm-openvpn-dialog.glade.h:13
+#, fuzzy
+msgid "Remote IP:"
+msgstr "�端"
+
+#: ../properties/nm-openvpn-dialog.glade.h:14
+#, fuzzy
+msgid "Shared Key:"
+msgstr "共用金鑰"
+
+#: ../properties/nm-openvpn-dialog.glade.h:15
+#, fuzzy
+msgid "Shared key"
+msgstr "共用金鑰"
+
+#: ../properties/nm-openvpn-dialog.glade.h:16
+#, fuzzy
+msgid "Use LZO compression"
+msgstr "壓縮"
+
+#: ../properties/nm-openvpn-dialog.glade.h:17
+#, fuzzy
+msgid "Use TAP device"
+msgstr "USB �置(&U)"
+
+#: ../properties/nm-openvpn-dialog.glade.h:18
+#, fuzzy
+msgid "Use TCP connection"
+msgstr "測試連線"
+
+#: ../properties/nm-openvpn-dialog.glade.h:19
+#, fuzzy
+msgid "Username:"
+msgstr "使用者�稱(&U)："
+
+#: ../properties/nm-openvpn-dialog.glade.h:20
+msgid "X.509"
+msgstr ""
+
+#: ../properties/nm-openvpn-dialog.glade.h:21
+msgid ""
+"X.509 Certificates\n"
+"Pre-shared key\n"
+"Password Authentication\n"
+"X.509 with Password Authentication"
+msgstr ""
+
+#: ../properties/nm-openvpn-dialog.glade.h:25
+#, fuzzy
+msgid "_Gateway:"
+msgstr "閘�"
+
+#: ../properties/nm-openvpn-dialog.glade.h:26
+#, fuzzy
+msgid "_Import Saved Configuration..."
+msgstr "伺�器組態(&S)..."
+
+#: ../properties/nm-openvpn-dialog.glade.h:27
+msgid ""
+"_Name used to identify the connection to the private network, e.g. \"Campus "
+"VPN\" or \"Corporate Network\""
+msgstr ""
+
+#: ../properties/nm-openvpn-dialog.glade.h:28
+msgid "_Only use VPN connection for these addresses"
+msgstr ""
+
+#: ../src/nm-openvpn-service.c:136
+msgid ""
+"The VPN login failed because the user name and password were not accepted or "
+"the certificate password was wrong."
+msgstr ""
+
+#: ../src/nm-openvpn-service.c:138
+msgid "The VPN login failed because the VPN program could not be started."
+msgstr ""
+
+#: ../src/nm-openvpn-service.c:140
+msgid ""
+"The VPN login failed because the VPN program could not connect to the VPN "
+"server."
+msgstr ""
+
+#: ../src/nm-openvpn-service.c:142
+msgid ""
+"The VPN login failed because the VPN configuration options were invalid."
+msgstr ""
+
+#: ../src/nm-openvpn-service.c:144
+msgid ""
+"The VPN login failed because the VPN program received an invalid "
+"configuration from the VPN server."
+msgstr ""
+
+#: ../src/nm-openvpn-service.c:146
+#, fuzzy
+msgid "VPN connection failed"
+msgstr "未定義連接"
diff --git a/vpn-daemons/openvpn/properties/Makefile.am b/vpn-daemons/openvpn/properties/Makefile.am
index 9682d02cc6..ff145b4e90 100644
--- a/vpn-daemons/openvpn/properties/Makefile.am
+++ b/vpn-daemons/openvpn/properties/Makefile.am
@@ -18,7 +18,7 @@ libnm_openvpn_properties_la_CFLAGS =                          \
         -DG_DISABLE_DEPRECATED                          \
         -DGDK_DISABLE_DEPRECATED                        \
         -DGNOME_DISABLE_DEPRECATED                      \
-        -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"  \
+	-DGNOMELOCALEDIR=\"$(datadir)/locale\"		\
         -DVERSION=\"$(VERSION)\"
 
 libnm_openvpn_properties_la_LIBADD =       \
diff --git a/vpn-daemons/openvpn/properties/nm-openvpn-dialog.glade b/vpn-daemons/openvpn/properties/nm-openvpn-dialog.glade
index 789d14ef31..79eed43ae0 100644
--- a/vpn-daemons/openvpn/properties/nm-openvpn-dialog.glade
+++ b/vpn-daemons/openvpn/properties/nm-openvpn-dialog.glade
@@ -9,7 +9,7 @@
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">False</property>
-  <property name="resizable">True</property>
+  <property name="resizable">False</property>
   <property name="destroy_with_parent">False</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
@@ -21,7 +21,6 @@
 
   <child>
     <widget class="GtkVBox" id="nm-openvpn-widget">
-      <property name="border_width">8</property>
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
       <property name="spacing">6</property>
@@ -83,35 +82,16 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkHBox" id="hbox1">
+	    <widget class="GtkAlignment" id="alignment7">
 	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label43">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes"></property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">12</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xscale">1</property>
+	      <property name="yscale">1</property>
+	      <property name="top_padding">0</property>
+	      <property name="bottom_padding">0</property>
+	      <property name="left_padding">12</property>
+	      <property name="right_padding">0</property>
 
 	      <child>
 		<widget class="GtkVBox" id="vbox3">
@@ -163,11 +143,6 @@
 		    </packing>
 		  </child>
 		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
 	      </child>
 	    </widget>
 	    <packing>
@@ -179,7 +154,7 @@
 	</widget>
 	<packing>
 	  <property name="padding">0</property>
-	  <property name="expand">True</property>
+	  <property name="expand">False</property>
 	  <property name="fill">True</property>
 	</packing>
       </child>
@@ -188,7 +163,7 @@
 	<widget class="GtkVBox" id="vbox9">
 	  <property name="visible">True</property>
 	  <property name="homogeneous">False</property>
-	  <property name="spacing">0</property>
+	  <property name="spacing">6</property>
 
 	  <child>
 	    <widget class="GtkLabel" id="label28">
@@ -216,20 +191,25 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkVBox" id="openvpn-box-required">
-	      <property name="border_width">6</property>
+	    <widget class="GtkAlignment" id="alignment8">
 	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xscale">1</property>
+	      <property name="yscale">1</property>
+	      <property name="top_padding">0</property>
+	      <property name="bottom_padding">0</property>
+	      <property name="left_padding">12</property>
+	      <property name="right_padding">0</property>
 
 	      <child>
 		<widget class="GtkTable" id="table3">
 		  <property name="visible">True</property>
-		  <property name="n_rows">2</property>
+		  <property name="n_rows">3</property>
 		  <property name="n_columns">2</property>
 		  <property name="homogeneous">False</property>
 		  <property name="row_spacing">6</property>
-		  <property name="column_spacing">0</property>
+		  <property name="column_spacing">12</property>
 
 		  <child>
 		    <widget class="GtkEntry" id="openvpn-remote">
@@ -328,527 +308,439 @@ X.509 with Password Authentication</property>
 		      <property name="y_options">fill</property>
 		    </packing>
 		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkNotebook" id="openvpn-settings">
-	      <property name="border_width">12</property>
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="show_tabs">True</property>
-	      <property name="show_border">True</property>
-	      <property name="tab_pos">GTK_POS_TOP</property>
-	      <property name="scrollable">False</property>
-	      <property name="enable_popup">False</property>
-
-	      <child>
-		<widget class="GtkVBox" id="openvpn-x509-tab">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
 
 		  <child>
-		    <widget class="GtkHBox" id="hbox2">
+		    <widget class="GtkNotebook" id="openvpn-settings">
 		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
-
-		      <child>
-			<widget class="GtkLabel" id="label6">
-			  <property name="visible">True</property>
-			  <property name="label"></property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">12</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
+		      <property name="can_focus">True</property>
+		      <property name="show_tabs">True</property>
+		      <property name="show_border">True</property>
+		      <property name="tab_pos">GTK_POS_TOP</property>
+		      <property name="scrollable">False</property>
+		      <property name="enable_popup">False</property>
 
 		      <child>
-			<widget class="GtkTable" id="table1">
-			  <property name="border_width">3</property>
+			<widget class="GtkVBox" id="openvpn-x509-tab">
 			  <property name="visible">True</property>
-			  <property name="n_rows">3</property>
-			  <property name="n_columns">3</property>
 			  <property name="homogeneous">False</property>
-			  <property name="row_spacing">6</property>
-			  <property name="column_spacing">6</property>
+			  <property name="spacing">6</property>
 
 			  <child>
-			    <widget class="GtkEntry" id="openvpn-ca">
+			    <widget class="GtkTable" id="table1">
+			      <property name="border_width">6</property>
 			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="editable">True</property>
-			      <property name="visibility">True</property>
-			      <property name="max_length">0</property>
-			      <property name="text" translatable="yes"></property>
-			      <property name="has_frame">True</property>
-			      <property name="invisible_char">*</property>
-			      <property name="activates_default">False</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			    </packing>
-			  </child>
+			      <property name="n_rows">3</property>
+			      <property name="n_columns">3</property>
+			      <property name="homogeneous">False</property>
+			      <property name="row_spacing">6</property>
+			      <property name="column_spacing">12</property>
 
-			  <child>
-			    <widget class="GtkLabel" id="label8">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">CA  file:</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">1</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">openvpn-ca</property>
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			      <property name="width_chars">-1</property>
-			      <property name="single_line_mode">False</property>
-			      <property name="angle">0</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			      <property name="x_options">fill</property>
-			    </packing>
-			  </child>
+			      <child>
+				<widget class="GtkEntry" id="openvpn-ca">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="editable">False</property>
+				  <property name="visibility">True</property>
+				  <property name="max_length">0</property>
+				  <property name="text" translatable="yes"></property>
+				  <property name="has_frame">True</property>
+				  <property name="invisible_char">*</property>
+				  <property name="activates_default">False</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">1</property>
+				  <property name="right_attach">2</property>
+				  <property name="top_attach">0</property>
+				  <property name="bottom_attach">1</property>
+				</packing>
+			      </child>
 
-			  <child>
-			    <widget class="GtkLabel" id="label17">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Certificate:</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">1</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			      <property name="width_chars">-1</property>
-			      <property name="single_line_mode">False</property>
-			      <property name="angle">0</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">2</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
+			      <child>
+				<widget class="GtkLabel" id="label8">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">CA  file:</property>
+				  <property name="use_underline">True</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">1</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				  <property name="mnemonic_widget">openvpn-ca</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">0</property>
+				  <property name="right_attach">1</property>
+				  <property name="top_attach">0</property>
+				  <property name="bottom_attach">1</property>
+				  <property name="x_options">fill</property>
+				</packing>
+			      </child>
 
-			  <child>
-			    <widget class="GtkEntry" id="openvpn-cert">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="editable">True</property>
-			      <property name="visibility">True</property>
-			      <property name="max_length">0</property>
-			      <property name="text" translatable="yes"></property>
-			      <property name="has_frame">True</property>
-			      <property name="invisible_char">*</property>
-			      <property name="activates_default">False</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">2</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
+			      <child>
+				<widget class="GtkLabel" id="label17">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">Certificate:</property>
+				  <property name="use_underline">False</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">1</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">0</property>
+				  <property name="right_attach">1</property>
+				  <property name="top_attach">1</property>
+				  <property name="bottom_attach">2</property>
+				  <property name="x_options">fill</property>
+				  <property name="y_options"></property>
+				</packing>
+			      </child>
 
-			  <child>
-			    <widget class="GtkButton" id="openvpn-but-ca">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
+			      <child>
+				<widget class="GtkEntry" id="openvpn-cert">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="editable">False</property>
+				  <property name="visibility">True</property>
+				  <property name="max_length">0</property>
+				  <property name="text" translatable="yes"></property>
+				  <property name="has_frame">True</property>
+				  <property name="invisible_char">*</property>
+				  <property name="activates_default">False</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">1</property>
+				  <property name="right_attach">2</property>
+				  <property name="top_attach">1</property>
+				  <property name="bottom_attach">2</property>
+				  <property name="y_options"></property>
+				</packing>
+			      </child>
 
 			      <child>
-				<widget class="GtkAlignment" id="alignment2">
+				<widget class="GtkButton" id="openvpn-but-ca">
 				  <property name="visible">True</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xscale">0</property>
-				  <property name="yscale">0</property>
-				  <property name="top_padding">0</property>
-				  <property name="bottom_padding">0</property>
-				  <property name="left_padding">0</property>
-				  <property name="right_padding">0</property>
+				  <property name="can_focus">True</property>
+				  <property name="relief">GTK_RELIEF_NORMAL</property>
+				  <property name="focus_on_click">True</property>
 
 				  <child>
-				    <widget class="GtkHBox" id="hbox9">
+				    <widget class="GtkAlignment" id="alignment2">
 				      <property name="visible">True</property>
-				      <property name="homogeneous">False</property>
-				      <property name="spacing">2</property>
+				      <property name="xalign">0.5</property>
+				      <property name="yalign">0.5</property>
+				      <property name="xscale">0</property>
+				      <property name="yscale">0</property>
+				      <property name="top_padding">0</property>
+				      <property name="bottom_padding">0</property>
+				      <property name="left_padding">0</property>
+				      <property name="right_padding">0</property>
 
 				      <child>
-					<widget class="GtkImage" id="image2">
+					<widget class="GtkHBox" id="hbox9">
 					  <property name="visible">True</property>
-					  <property name="stock">gtk-open</property>
-					  <property name="icon_size">4</property>
-					  <property name="xalign">0.5</property>
-					  <property name="yalign">0.5</property>
-					  <property name="xpad">0</property>
-					  <property name="ypad">0</property>
+					  <property name="homogeneous">False</property>
+					  <property name="spacing">2</property>
+
+					  <child>
+					    <widget class="GtkImage" id="image2">
+					      <property name="visible">True</property>
+					      <property name="stock">gtk-open</property>
+					      <property name="icon_size">4</property>
+					      <property name="xalign">0.5</property>
+					      <property name="yalign">0.5</property>
+					      <property name="xpad">0</property>
+					      <property name="ypad">0</property>
+					    </widget>
+					    <packing>
+					      <property name="padding">0</property>
+					      <property name="expand">False</property>
+					      <property name="fill">False</property>
+					    </packing>
+					  </child>
+
+					  <child>
+					    <widget class="GtkLabel" id="label18">
+					      <property name="visible">True</property>
+					      <property name="label" translatable="yes"></property>
+					      <property name="use_underline">False</property>
+					      <property name="use_markup">False</property>
+					      <property name="justify">GTK_JUSTIFY_LEFT</property>
+					      <property name="wrap">False</property>
+					      <property name="selectable">False</property>
+					      <property name="xalign">0.5</property>
+					      <property name="yalign">0.5</property>
+					      <property name="xpad">0</property>
+					      <property name="ypad">0</property>
+					      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					      <property name="width_chars">-1</property>
+					      <property name="single_line_mode">False</property>
+					      <property name="angle">0</property>
+					    </widget>
+					    <packing>
+					      <property name="padding">0</property>
+					      <property name="expand">False</property>
+					      <property name="fill">False</property>
+					    </packing>
+					  </child>
 					</widget>
-					<packing>
-					  <property name="padding">0</property>
-					  <property name="expand">False</property>
-					  <property name="fill">False</property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkLabel" id="label18">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes"></property>
-					  <property name="use_underline">False</property>
-					  <property name="use_markup">False</property>
-					  <property name="justify">GTK_JUSTIFY_LEFT</property>
-					  <property name="wrap">False</property>
-					  <property name="selectable">False</property>
-					  <property name="xalign">0.5</property>
-					  <property name="yalign">0.5</property>
-					  <property name="xpad">0</property>
-					  <property name="ypad">0</property>
-					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-					  <property name="width_chars">-1</property>
-					  <property name="single_line_mode">False</property>
-					  <property name="angle">0</property>
-					</widget>
-					<packing>
-					  <property name="padding">0</property>
-					  <property name="expand">False</property>
-					  <property name="fill">False</property>
-					</packing>
 				      </child>
 				    </widget>
 				  </child>
 				</widget>
+				<packing>
+				  <property name="left_attach">2</property>
+				  <property name="right_attach">3</property>
+				  <property name="top_attach">0</property>
+				  <property name="bottom_attach">1</property>
+				  <property name="x_options">fill</property>
+				  <property name="y_options"></property>
+				</packing>
 			      </child>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">2</property>
-			      <property name="right_attach">3</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkButton" id="openvpn-but-cert">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
 
 			      <child>
-				<widget class="GtkAlignment" id="alignment3">
+				<widget class="GtkButton" id="openvpn-but-cert">
 				  <property name="visible">True</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xscale">0</property>
-				  <property name="yscale">0</property>
-				  <property name="top_padding">0</property>
-				  <property name="bottom_padding">0</property>
-				  <property name="left_padding">0</property>
-				  <property name="right_padding">0</property>
+				  <property name="can_focus">True</property>
+				  <property name="relief">GTK_RELIEF_NORMAL</property>
+				  <property name="focus_on_click">True</property>
 
 				  <child>
-				    <widget class="GtkHBox" id="hbox10">
+				    <widget class="GtkAlignment" id="alignment3">
 				      <property name="visible">True</property>
-				      <property name="homogeneous">False</property>
-				      <property name="spacing">2</property>
-
-				      <child>
-					<widget class="GtkImage" id="image3">
-					  <property name="visible">True</property>
-					  <property name="stock">gtk-open</property>
-					  <property name="icon_size">4</property>
-					  <property name="xalign">0.5</property>
-					  <property name="yalign">0.5</property>
-					  <property name="xpad">0</property>
-					  <property name="ypad">0</property>
-					</widget>
-					<packing>
-					  <property name="padding">0</property>
-					  <property name="expand">False</property>
-					  <property name="fill">False</property>
-					</packing>
-				      </child>
+				      <property name="xalign">0.5</property>
+				      <property name="yalign">0.5</property>
+				      <property name="xscale">0</property>
+				      <property name="yscale">0</property>
+				      <property name="top_padding">0</property>
+				      <property name="bottom_padding">0</property>
+				      <property name="left_padding">0</property>
+				      <property name="right_padding">0</property>
 
 				      <child>
-					<widget class="GtkLabel" id="label19">
+					<widget class="GtkHBox" id="hbox10">
 					  <property name="visible">True</property>
-					  <property name="label" translatable="yes"></property>
-					  <property name="use_underline">True</property>
-					  <property name="use_markup">False</property>
-					  <property name="justify">GTK_JUSTIFY_LEFT</property>
-					  <property name="wrap">False</property>
-					  <property name="selectable">False</property>
-					  <property name="xalign">0.5</property>
-					  <property name="yalign">0.5</property>
-					  <property name="xpad">0</property>
-					  <property name="ypad">0</property>
-					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-					  <property name="width_chars">-1</property>
-					  <property name="single_line_mode">False</property>
-					  <property name="angle">0</property>
+					  <property name="homogeneous">False</property>
+					  <property name="spacing">2</property>
+
+					  <child>
+					    <widget class="GtkImage" id="image3">
+					      <property name="visible">True</property>
+					      <property name="stock">gtk-open</property>
+					      <property name="icon_size">4</property>
+					      <property name="xalign">0.5</property>
+					      <property name="yalign">0.5</property>
+					      <property name="xpad">0</property>
+					      <property name="ypad">0</property>
+					    </widget>
+					    <packing>
+					      <property name="padding">0</property>
+					      <property name="expand">False</property>
+					      <property name="fill">False</property>
+					    </packing>
+					  </child>
+
+					  <child>
+					    <widget class="GtkLabel" id="label19">
+					      <property name="visible">True</property>
+					      <property name="label" translatable="yes"></property>
+					      <property name="use_underline">True</property>
+					      <property name="use_markup">False</property>
+					      <property name="justify">GTK_JUSTIFY_LEFT</property>
+					      <property name="wrap">False</property>
+					      <property name="selectable">False</property>
+					      <property name="xalign">0.5</property>
+					      <property name="yalign">0.5</property>
+					      <property name="xpad">0</property>
+					      <property name="ypad">0</property>
+					      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					      <property name="width_chars">-1</property>
+					      <property name="single_line_mode">False</property>
+					      <property name="angle">0</property>
+					    </widget>
+					    <packing>
+					      <property name="padding">0</property>
+					      <property name="expand">False</property>
+					      <property name="fill">False</property>
+					    </packing>
+					  </child>
 					</widget>
-					<packing>
-					  <property name="padding">0</property>
-					  <property name="expand">False</property>
-					  <property name="fill">False</property>
-					</packing>
 				      </child>
 				    </widget>
 				  </child>
 				</widget>
+				<packing>
+				  <property name="left_attach">2</property>
+				  <property name="right_attach">3</property>
+				  <property name="top_attach">1</property>
+				  <property name="bottom_attach">2</property>
+				  <property name="x_options">fill</property>
+				  <property name="y_options"></property>
+				</packing>
 			      </child>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">2</property>
-			      <property name="right_attach">3</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">2</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
 
-			  <child>
-			    <widget class="GtkLabel" id="label20">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Key:</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">1</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			      <property name="width_chars">-1</property>
-			      <property name="single_line_mode">False</property>
-			      <property name="angle">0</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">2</property>
-			      <property name="bottom_attach">3</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkEntry" id="openvpn-key">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="editable">True</property>
-			      <property name="visibility">True</property>
-			      <property name="max_length">0</property>
-			      <property name="text" translatable="yes"></property>
-			      <property name="has_frame">True</property>
-			      <property name="invisible_char">*</property>
-			      <property name="activates_default">False</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">2</property>
-			      <property name="bottom_attach">3</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
+			      <child>
+				<widget class="GtkLabel" id="label20">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">Key:</property>
+				  <property name="use_underline">False</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">1</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">0</property>
+				  <property name="right_attach">1</property>
+				  <property name="top_attach">2</property>
+				  <property name="bottom_attach">3</property>
+				  <property name="x_options">fill</property>
+				  <property name="y_options"></property>
+				</packing>
+			      </child>
 
-			  <child>
-			    <widget class="GtkButton" id="openvpn-but-key">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
+			      <child>
+				<widget class="GtkEntry" id="openvpn-key">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="editable">False</property>
+				  <property name="visibility">True</property>
+				  <property name="max_length">0</property>
+				  <property name="text" translatable="yes"></property>
+				  <property name="has_frame">True</property>
+				  <property name="invisible_char">*</property>
+				  <property name="activates_default">False</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">1</property>
+				  <property name="right_attach">2</property>
+				  <property name="top_attach">2</property>
+				  <property name="bottom_attach">3</property>
+				  <property name="y_options"></property>
+				</packing>
+			      </child>
 
 			      <child>
-				<widget class="GtkAlignment" id="alignment4">
+				<widget class="GtkButton" id="openvpn-but-key">
 				  <property name="visible">True</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xscale">0</property>
-				  <property name="yscale">0</property>
-				  <property name="top_padding">0</property>
-				  <property name="bottom_padding">0</property>
-				  <property name="left_padding">0</property>
-				  <property name="right_padding">0</property>
+				  <property name="can_focus">True</property>
+				  <property name="relief">GTK_RELIEF_NORMAL</property>
+				  <property name="focus_on_click">True</property>
 
 				  <child>
-				    <widget class="GtkHBox" id="hbox16">
+				    <widget class="GtkAlignment" id="alignment4">
 				      <property name="visible">True</property>
-				      <property name="homogeneous">False</property>
-				      <property name="spacing">2</property>
-
-				      <child>
-					<widget class="GtkImage" id="image4">
-					  <property name="visible">True</property>
-					  <property name="stock">gtk-open</property>
-					  <property name="icon_size">4</property>
-					  <property name="xalign">0.5</property>
-					  <property name="yalign">0.5</property>
-					  <property name="xpad">0</property>
-					  <property name="ypad">0</property>
-					</widget>
-					<packing>
-					  <property name="padding">0</property>
-					  <property name="expand">False</property>
-					  <property name="fill">False</property>
-					</packing>
-				      </child>
+				      <property name="xalign">0.5</property>
+				      <property name="yalign">0.5</property>
+				      <property name="xscale">0</property>
+				      <property name="yscale">0</property>
+				      <property name="top_padding">0</property>
+				      <property name="bottom_padding">0</property>
+				      <property name="left_padding">0</property>
+				      <property name="right_padding">0</property>
 
 				      <child>
-					<widget class="GtkLabel" id="label27">
+					<widget class="GtkHBox" id="hbox16">
 					  <property name="visible">True</property>
-					  <property name="label" translatable="yes"></property>
-					  <property name="use_underline">True</property>
-					  <property name="use_markup">False</property>
-					  <property name="justify">GTK_JUSTIFY_LEFT</property>
-					  <property name="wrap">False</property>
-					  <property name="selectable">False</property>
-					  <property name="xalign">0.5</property>
-					  <property name="yalign">0.5</property>
-					  <property name="xpad">0</property>
-					  <property name="ypad">0</property>
-					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-					  <property name="width_chars">-1</property>
-					  <property name="single_line_mode">False</property>
-					  <property name="angle">0</property>
+					  <property name="homogeneous">False</property>
+					  <property name="spacing">2</property>
+
+					  <child>
+					    <widget class="GtkImage" id="image4">
+					      <property name="visible">True</property>
+					      <property name="stock">gtk-open</property>
+					      <property name="icon_size">4</property>
+					      <property name="xalign">0.5</property>
+					      <property name="yalign">0.5</property>
+					      <property name="xpad">0</property>
+					      <property name="ypad">0</property>
+					    </widget>
+					    <packing>
+					      <property name="padding">0</property>
+					      <property name="expand">False</property>
+					      <property name="fill">False</property>
+					    </packing>
+					  </child>
+
+					  <child>
+					    <widget class="GtkLabel" id="label27">
+					      <property name="visible">True</property>
+					      <property name="label" translatable="yes"></property>
+					      <property name="use_underline">True</property>
+					      <property name="use_markup">False</property>
+					      <property name="justify">GTK_JUSTIFY_LEFT</property>
+					      <property name="wrap">False</property>
+					      <property name="selectable">False</property>
+					      <property name="xalign">0.5</property>
+					      <property name="yalign">0.5</property>
+					      <property name="xpad">0</property>
+					      <property name="ypad">0</property>
+					      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					      <property name="width_chars">-1</property>
+					      <property name="single_line_mode">False</property>
+					      <property name="angle">0</property>
+					    </widget>
+					    <packing>
+					      <property name="padding">0</property>
+					      <property name="expand">False</property>
+					      <property name="fill">False</property>
+					    </packing>
+					  </child>
 					</widget>
-					<packing>
-					  <property name="padding">0</property>
-					  <property name="expand">False</property>
-					  <property name="fill">False</property>
-					</packing>
 				      </child>
 				    </widget>
 				  </child>
 				</widget>
+				<packing>
+				  <property name="left_attach">2</property>
+				  <property name="right_attach">3</property>
+				  <property name="top_attach">2</property>
+				  <property name="bottom_attach">3</property>
+				  <property name="x_options">fill</property>
+				  <property name="y_options"></property>
+				</packing>
 			      </child>
 			    </widget>
 			    <packing>
-			      <property name="left_attach">2</property>
-			      <property name="right_attach">3</property>
-			      <property name="top_attach">2</property>
-			      <property name="bottom_attach">3</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">True</property>
 			    </packing>
 			  </child>
 			</widget>
 			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
+			  <property name="tab_expand">False</property>
+			  <property name="tab_fill">True</property>
 			</packing>
 		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="tab_expand">False</property>
-		  <property name="tab_fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="openvpn-x509tab-label">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">X.509</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="type">tab</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkVBox" id="openvpn-shared-tab">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkHBox" id="hbox18">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
 
 		      <child>
-			<widget class="GtkLabel" id="label31">
+			<widget class="GtkLabel" id="openvpn-x509tab-label">
 			  <property name="visible">True</property>
-			  <property name="label"></property>
+			  <property name="label" translatable="yes">X.509</property>
 			  <property name="use_underline">False</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -856,7 +748,7 @@ X.509 with Password Authentication</property>
 			  <property name="selectable">False</property>
 			  <property name="xalign">0.5</property>
 			  <property name="yalign">0.5</property>
-			  <property name="xpad">12</property>
+			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
 			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 			  <property name="width_chars">-1</property>
@@ -864,308 +756,270 @@ X.509 with Password Authentication</property>
 			  <property name="angle">0</property>
 			</widget>
 			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">True</property>
+			  <property name="type">tab</property>
 			</packing>
 		      </child>
 
 		      <child>
-			<widget class="GtkTable" id="table2">
-			  <property name="border_width">3</property>
+			<widget class="GtkVBox" id="openvpn-shared-tab">
 			  <property name="visible">True</property>
-			  <property name="n_rows">3</property>
-			  <property name="n_columns">3</property>
 			  <property name="homogeneous">False</property>
-			  <property name="row_spacing">12</property>
-			  <property name="column_spacing">6</property>
+			  <property name="spacing">6</property>
 
 			  <child>
-			    <widget class="GtkEntry" id="openvpn-shared-key">
+			    <widget class="GtkTable" id="table2">
+			      <property name="border_width">6</property>
 			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="editable">True</property>
-			      <property name="visibility">True</property>
-			      <property name="max_length">0</property>
-			      <property name="text" translatable="yes"></property>
-			      <property name="has_frame">True</property>
-			      <property name="invisible_char">*</property>
-			      <property name="activates_default">False</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			    </packing>
-			  </child>
+			      <property name="n_rows">3</property>
+			      <property name="n_columns">3</property>
+			      <property name="homogeneous">False</property>
+			      <property name="row_spacing">6</property>
+			      <property name="column_spacing">12</property>
 
-			  <child>
-			    <widget class="GtkLabel" id="label32">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Shared Key:</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">1</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">openvpn-ca</property>
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			      <property name="width_chars">-1</property>
-			      <property name="single_line_mode">False</property>
-			      <property name="angle">0</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			      <property name="x_options">fill</property>
-			    </packing>
-			  </child>
+			      <child>
+				<widget class="GtkEntry" id="openvpn-shared-key">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="editable">True</property>
+				  <property name="visibility">True</property>
+				  <property name="max_length">0</property>
+				  <property name="text" translatable="yes"></property>
+				  <property name="has_frame">True</property>
+				  <property name="invisible_char">*</property>
+				  <property name="activates_default">False</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">1</property>
+				  <property name="right_attach">2</property>
+				  <property name="top_attach">0</property>
+				  <property name="bottom_attach">1</property>
+				</packing>
+			      </child>
 
-			  <child>
-			    <widget class="GtkLabel" id="label33">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Local IP:</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">1</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			      <property name="width_chars">-1</property>
-			      <property name="single_line_mode">False</property>
-			      <property name="angle">0</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">2</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
+			      <child>
+				<widget class="GtkLabel" id="label32">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">Shared Key:</property>
+				  <property name="use_underline">True</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">1</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				  <property name="mnemonic_widget">openvpn-ca</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">0</property>
+				  <property name="right_attach">1</property>
+				  <property name="top_attach">0</property>
+				  <property name="bottom_attach">1</property>
+				  <property name="x_options">fill</property>
+				</packing>
+			      </child>
 
-			  <child>
-			    <widget class="GtkEntry" id="openvpn-local-ip">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="editable">True</property>
-			      <property name="visibility">True</property>
-			      <property name="max_length">0</property>
-			      <property name="text" translatable="yes"></property>
-			      <property name="has_frame">True</property>
-			      <property name="invisible_char">*</property>
-			      <property name="activates_default">False</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">2</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
+			      <child>
+				<widget class="GtkLabel" id="label33">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">Local IP:</property>
+				  <property name="use_underline">False</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">1</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">0</property>
+				  <property name="right_attach">1</property>
+				  <property name="top_attach">1</property>
+				  <property name="bottom_attach">2</property>
+				  <property name="x_options">fill</property>
+				  <property name="y_options"></property>
+				</packing>
+			      </child>
 
-			  <child>
-			    <widget class="GtkLabel" id="label36">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Remote IP:</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">1</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			      <property name="width_chars">-1</property>
-			      <property name="single_line_mode">False</property>
-			      <property name="angle">0</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">2</property>
-			      <property name="bottom_attach">3</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
+			      <child>
+				<widget class="GtkEntry" id="openvpn-local-ip">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="editable">True</property>
+				  <property name="visibility">True</property>
+				  <property name="max_length">0</property>
+				  <property name="text" translatable="yes"></property>
+				  <property name="has_frame">True</property>
+				  <property name="invisible_char">*</property>
+				  <property name="activates_default">False</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">1</property>
+				  <property name="right_attach">2</property>
+				  <property name="top_attach">1</property>
+				  <property name="bottom_attach">2</property>
+				  <property name="y_options"></property>
+				</packing>
+			      </child>
 
-			  <child>
-			    <widget class="GtkEntry" id="openvpn-remote-ip">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="editable">True</property>
-			      <property name="visibility">True</property>
-			      <property name="max_length">0</property>
-			      <property name="text" translatable="yes"></property>
-			      <property name="has_frame">True</property>
-			      <property name="invisible_char">*</property>
-			      <property name="activates_default">False</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">2</property>
-			      <property name="bottom_attach">3</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
+			      <child>
+				<widget class="GtkLabel" id="label36">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">Remote IP:</property>
+				  <property name="use_underline">False</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">1</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">0</property>
+				  <property name="right_attach">1</property>
+				  <property name="top_attach">2</property>
+				  <property name="bottom_attach">3</property>
+				  <property name="x_options">fill</property>
+				  <property name="y_options"></property>
+				</packing>
+			      </child>
 
-			  <child>
-			    <widget class="GtkButton" id="openvpn-but-shared-key">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
+			      <child>
+				<widget class="GtkEntry" id="openvpn-remote-ip">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="editable">True</property>
+				  <property name="visibility">True</property>
+				  <property name="max_length">0</property>
+				  <property name="text" translatable="yes"></property>
+				  <property name="has_frame">True</property>
+				  <property name="invisible_char">*</property>
+				  <property name="activates_default">False</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">1</property>
+				  <property name="right_attach">2</property>
+				  <property name="top_attach">2</property>
+				  <property name="bottom_attach">3</property>
+				  <property name="y_options"></property>
+				</packing>
+			      </child>
 
 			      <child>
-				<widget class="GtkAlignment" id="alignment5">
+				<widget class="GtkButton" id="openvpn-but-shared-key">
 				  <property name="visible">True</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xscale">0</property>
-				  <property name="yscale">0</property>
-				  <property name="top_padding">0</property>
-				  <property name="bottom_padding">0</property>
-				  <property name="left_padding">0</property>
-				  <property name="right_padding">0</property>
+				  <property name="can_focus">True</property>
+				  <property name="relief">GTK_RELIEF_NORMAL</property>
+				  <property name="focus_on_click">True</property>
 
 				  <child>
-				    <widget class="GtkHBox" id="hbox19">
+				    <widget class="GtkAlignment" id="alignment5">
 				      <property name="visible">True</property>
-				      <property name="homogeneous">False</property>
-				      <property name="spacing">2</property>
-
-				      <child>
-					<widget class="GtkImage" id="image5">
-					  <property name="visible">True</property>
-					  <property name="stock">gtk-open</property>
-					  <property name="icon_size">4</property>
-					  <property name="xalign">0.5</property>
-					  <property name="yalign">0.5</property>
-					  <property name="xpad">0</property>
-					  <property name="ypad">0</property>
-					</widget>
-					<packing>
-					  <property name="padding">0</property>
-					  <property name="expand">False</property>
-					  <property name="fill">False</property>
-					</packing>
-				      </child>
+				      <property name="xalign">0.5</property>
+				      <property name="yalign">0.5</property>
+				      <property name="xscale">0</property>
+				      <property name="yscale">0</property>
+				      <property name="top_padding">0</property>
+				      <property name="bottom_padding">0</property>
+				      <property name="left_padding">0</property>
+				      <property name="right_padding">0</property>
 
 				      <child>
-					<widget class="GtkLabel" id="label34">
+					<widget class="GtkHBox" id="hbox19">
 					  <property name="visible">True</property>
-					  <property name="label" translatable="yes"></property>
-					  <property name="use_underline">False</property>
-					  <property name="use_markup">False</property>
-					  <property name="justify">GTK_JUSTIFY_LEFT</property>
-					  <property name="wrap">False</property>
-					  <property name="selectable">False</property>
-					  <property name="xalign">0.5</property>
-					  <property name="yalign">0.5</property>
-					  <property name="xpad">0</property>
-					  <property name="ypad">0</property>
-					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-					  <property name="width_chars">-1</property>
-					  <property name="single_line_mode">False</property>
-					  <property name="angle">0</property>
+					  <property name="homogeneous">False</property>
+					  <property name="spacing">2</property>
+
+					  <child>
+					    <widget class="GtkImage" id="image5">
+					      <property name="visible">True</property>
+					      <property name="stock">gtk-open</property>
+					      <property name="icon_size">4</property>
+					      <property name="xalign">0.5</property>
+					      <property name="yalign">0.5</property>
+					      <property name="xpad">0</property>
+					      <property name="ypad">0</property>
+					    </widget>
+					    <packing>
+					      <property name="padding">0</property>
+					      <property name="expand">False</property>
+					      <property name="fill">False</property>
+					    </packing>
+					  </child>
+
+					  <child>
+					    <widget class="GtkLabel" id="label34">
+					      <property name="visible">True</property>
+					      <property name="label" translatable="yes"></property>
+					      <property name="use_underline">False</property>
+					      <property name="use_markup">False</property>
+					      <property name="justify">GTK_JUSTIFY_LEFT</property>
+					      <property name="wrap">False</property>
+					      <property name="selectable">False</property>
+					      <property name="xalign">0.5</property>
+					      <property name="yalign">0.5</property>
+					      <property name="xpad">0</property>
+					      <property name="ypad">0</property>
+					      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					      <property name="width_chars">-1</property>
+					      <property name="single_line_mode">False</property>
+					      <property name="angle">0</property>
+					    </widget>
+					    <packing>
+					      <property name="padding">0</property>
+					      <property name="expand">False</property>
+					      <property name="fill">False</property>
+					    </packing>
+					  </child>
 					</widget>
-					<packing>
-					  <property name="padding">0</property>
-					  <property name="expand">False</property>
-					  <property name="fill">False</property>
-					</packing>
 				      </child>
 				    </widget>
 				  </child>
 				</widget>
+				<packing>
+				  <property name="left_attach">2</property>
+				  <property name="right_attach">3</property>
+				  <property name="top_attach">0</property>
+				  <property name="bottom_attach">1</property>
+				  <property name="x_options">fill</property>
+				  <property name="y_options"></property>
+				</packing>
 			      </child>
 			    </widget>
 			    <packing>
-			      <property name="left_attach">2</property>
-			      <property name="right_attach">3</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">True</property>
 			    </packing>
 			  </child>
 			</widget>
 			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
+			  <property name="tab_expand">False</property>
+			  <property name="tab_fill">True</property>
 			</packing>
 		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="tab_expand">False</property>
-		  <property name="tab_fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="openvpn-shared-tab-label">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Shared key</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="type">tab</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkVBox" id="openvpn-password-tab">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkHBox" id="hbox20">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
 
 		      <child>
-			<widget class="GtkLabel" id="label48">
+			<widget class="GtkLabel" id="openvpn-shared-tab-label">
 			  <property name="visible">True</property>
-			  <property name="label"></property>
+			  <property name="label" translatable="yes">Shared key</property>
 			  <property name="use_underline">False</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1173,7 +1027,7 @@ X.509 with Password Authentication</property>
 			  <property name="selectable">False</property>
 			  <property name="xalign">0.5</property>
 			  <property name="yalign">0.5</property>
-			  <property name="xpad">12</property>
+			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
 			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 			  <property name="width_chars">-1</property>
@@ -1181,297 +1035,306 @@ X.509 with Password Authentication</property>
 			  <property name="angle">0</property>
 			</widget>
 			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">True</property>
+			  <property name="type">tab</property>
 			</packing>
 		      </child>
 
 		      <child>
-			<widget class="GtkTable" id="table4">
-			  <property name="border_width">3</property>
+			<widget class="GtkVBox" id="openvpn-password-tab">
 			  <property name="visible">True</property>
-			  <property name="n_rows">3</property>
-			  <property name="n_columns">3</property>
 			  <property name="homogeneous">False</property>
-			  <property name="row_spacing">6</property>
-			  <property name="column_spacing">6</property>
+			  <property name="spacing">6</property>
 
 			  <child>
-			    <widget class="GtkEntry" id="openvpn-password-ca">
+			    <widget class="GtkTable" id="table4">
+			      <property name="border_width">6</property>
 			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="editable">True</property>
-			      <property name="visibility">True</property>
-			      <property name="max_length">0</property>
-			      <property name="text" translatable="yes"></property>
-			      <property name="has_frame">True</property>
-			      <property name="invisible_char">*</property>
-			      <property name="activates_default">False</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			    </packing>
-			  </child>
+			      <property name="n_rows">3</property>
+			      <property name="n_columns">3</property>
+			      <property name="homogeneous">False</property>
+			      <property name="row_spacing">6</property>
+			      <property name="column_spacing">12</property>
 
-			  <child>
-			    <widget class="GtkLabel" id="label49">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">CA  file:</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">1</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">openvpn-ca</property>
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			      <property name="width_chars">-1</property>
-			      <property name="single_line_mode">False</property>
-			      <property name="angle">0</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			      <property name="x_options">fill</property>
-			    </packing>
-			  </child>
+			      <child>
+				<widget class="GtkEntry" id="openvpn-password-ca">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="editable">True</property>
+				  <property name="visibility">True</property>
+				  <property name="max_length">0</property>
+				  <property name="text" translatable="yes"></property>
+				  <property name="has_frame">True</property>
+				  <property name="invisible_char">*</property>
+				  <property name="activates_default">False</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">1</property>
+				  <property name="right_attach">2</property>
+				  <property name="top_attach">0</property>
+				  <property name="bottom_attach">1</property>
+				</packing>
+			      </child>
 
-			  <child>
-			    <widget class="GtkLabel" id="label50">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Username:</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">1</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			      <property name="width_chars">-1</property>
-			      <property name="single_line_mode">False</property>
-			      <property name="angle">0</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">2</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
+			      <child>
+				<widget class="GtkLabel" id="label49">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">CA  file:</property>
+				  <property name="use_underline">True</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">1</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				  <property name="mnemonic_widget">openvpn-ca</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">0</property>
+				  <property name="right_attach">1</property>
+				  <property name="top_attach">0</property>
+				  <property name="bottom_attach">1</property>
+				  <property name="x_options">fill</property>
+				</packing>
+			      </child>
 
-			  <child>
-			    <widget class="GtkEntry" id="openvpn-username">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="editable">True</property>
-			      <property name="visibility">True</property>
-			      <property name="max_length">0</property>
-			      <property name="text" translatable="yes"></property>
-			      <property name="has_frame">True</property>
-			      <property name="invisible_char">*</property>
-			      <property name="activates_default">False</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">2</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
+			      <child>
+				<widget class="GtkLabel" id="label50">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">Username:</property>
+				  <property name="use_underline">False</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">1</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">0</property>
+				  <property name="right_attach">1</property>
+				  <property name="top_attach">1</property>
+				  <property name="bottom_attach">2</property>
+				  <property name="x_options">fill</property>
+				  <property name="y_options"></property>
+				</packing>
+			      </child>
 
-			  <child>
-			    <widget class="GtkButton" id="openvpn-password-but-ca">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
+			      <child>
+				<widget class="GtkEntry" id="openvpn-username">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="editable">True</property>
+				  <property name="visibility">True</property>
+				  <property name="max_length">0</property>
+				  <property name="text" translatable="yes"></property>
+				  <property name="has_frame">True</property>
+				  <property name="invisible_char">*</property>
+				  <property name="activates_default">False</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">1</property>
+				  <property name="right_attach">2</property>
+				  <property name="top_attach">1</property>
+				  <property name="bottom_attach">2</property>
+				  <property name="y_options"></property>
+				</packing>
+			      </child>
 
 			      <child>
-				<widget class="GtkAlignment" id="alignment6">
+				<widget class="GtkButton" id="openvpn-password-but-ca">
 				  <property name="visible">True</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xscale">0</property>
-				  <property name="yscale">0</property>
-				  <property name="top_padding">0</property>
-				  <property name="bottom_padding">0</property>
-				  <property name="left_padding">0</property>
-				  <property name="right_padding">0</property>
+				  <property name="can_focus">True</property>
+				  <property name="relief">GTK_RELIEF_NORMAL</property>
+				  <property name="focus_on_click">True</property>
 
 				  <child>
-				    <widget class="GtkHBox" id="hbox21">
+				    <widget class="GtkAlignment" id="alignment6">
 				      <property name="visible">True</property>
-				      <property name="homogeneous">False</property>
-				      <property name="spacing">2</property>
-
-				      <child>
-					<widget class="GtkImage" id="image6">
-					  <property name="visible">True</property>
-					  <property name="stock">gtk-open</property>
-					  <property name="icon_size">4</property>
-					  <property name="xalign">0.5</property>
-					  <property name="yalign">0.5</property>
-					  <property name="xpad">0</property>
-					  <property name="ypad">0</property>
-					</widget>
-					<packing>
-					  <property name="padding">0</property>
-					  <property name="expand">False</property>
-					  <property name="fill">False</property>
-					</packing>
-				      </child>
+				      <property name="xalign">0.5</property>
+				      <property name="yalign">0.5</property>
+				      <property name="xscale">0</property>
+				      <property name="yscale">0</property>
+				      <property name="top_padding">0</property>
+				      <property name="bottom_padding">0</property>
+				      <property name="left_padding">0</property>
+				      <property name="right_padding">0</property>
 
 				      <child>
-					<widget class="GtkLabel" id="label51">
+					<widget class="GtkHBox" id="hbox21">
 					  <property name="visible">True</property>
-					  <property name="label" translatable="yes"></property>
-					  <property name="use_underline">False</property>
-					  <property name="use_markup">False</property>
-					  <property name="justify">GTK_JUSTIFY_LEFT</property>
-					  <property name="wrap">False</property>
-					  <property name="selectable">False</property>
-					  <property name="xalign">0.5</property>
-					  <property name="yalign">0.5</property>
-					  <property name="xpad">0</property>
-					  <property name="ypad">0</property>
-					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-					  <property name="width_chars">-1</property>
-					  <property name="single_line_mode">False</property>
-					  <property name="angle">0</property>
+					  <property name="homogeneous">False</property>
+					  <property name="spacing">2</property>
+
+					  <child>
+					    <widget class="GtkImage" id="image6">
+					      <property name="visible">True</property>
+					      <property name="stock">gtk-open</property>
+					      <property name="icon_size">4</property>
+					      <property name="xalign">0.5</property>
+					      <property name="yalign">0.5</property>
+					      <property name="xpad">0</property>
+					      <property name="ypad">0</property>
+					    </widget>
+					    <packing>
+					      <property name="padding">0</property>
+					      <property name="expand">False</property>
+					      <property name="fill">False</property>
+					    </packing>
+					  </child>
+
+					  <child>
+					    <widget class="GtkLabel" id="label51">
+					      <property name="visible">True</property>
+					      <property name="label" translatable="yes"></property>
+					      <property name="use_underline">False</property>
+					      <property name="use_markup">False</property>
+					      <property name="justify">GTK_JUSTIFY_LEFT</property>
+					      <property name="wrap">False</property>
+					      <property name="selectable">False</property>
+					      <property name="xalign">0.5</property>
+					      <property name="yalign">0.5</property>
+					      <property name="xpad">0</property>
+					      <property name="ypad">0</property>
+					      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					      <property name="width_chars">-1</property>
+					      <property name="single_line_mode">False</property>
+					      <property name="angle">0</property>
+					    </widget>
+					    <packing>
+					      <property name="padding">0</property>
+					      <property name="expand">False</property>
+					      <property name="fill">False</property>
+					    </packing>
+					  </child>
 					</widget>
-					<packing>
-					  <property name="padding">0</property>
-					  <property name="expand">False</property>
-					  <property name="fill">False</property>
-					</packing>
 				      </child>
 				    </widget>
 				  </child>
 				</widget>
+				<packing>
+				  <property name="left_attach">2</property>
+				  <property name="right_attach">3</property>
+				  <property name="top_attach">0</property>
+				  <property name="bottom_attach">1</property>
+				  <property name="x_options">fill</property>
+				  <property name="y_options"></property>
+				</packing>
 			      </child>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">2</property>
-			      <property name="right_attach">3</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
 
-			  <child>
-			    <widget class="GtkLabel" id="label53">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes"></property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			      <property name="width_chars">-1</property>
-			      <property name="single_line_mode">False</property>
-			      <property name="angle">0</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">2</property>
-			      <property name="bottom_attach">3</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
+			      <child>
+				<widget class="GtkLabel" id="label53">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes"></property>
+				  <property name="use_underline">False</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">0</property>
+				  <property name="right_attach">1</property>
+				  <property name="top_attach">2</property>
+				  <property name="bottom_attach">3</property>
+				  <property name="x_options">fill</property>
+				  <property name="y_options"></property>
+				</packing>
+			      </child>
 
-			  <child>
-			    <widget class="GtkLabel" id="label54">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes"></property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">8</property>
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			      <property name="width_chars">-1</property>
-			      <property name="single_line_mode">False</property>
-			      <property name="angle">0</property>
+			      <child>
+				<widget class="GtkLabel" id="label54">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes"></property>
+				  <property name="use_underline">False</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">8</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">1</property>
+				  <property name="right_attach">2</property>
+				  <property name="top_attach">2</property>
+				  <property name="bottom_attach">3</property>
+				  <property name="x_options">fill</property>
+				  <property name="y_options"></property>
+				</packing>
+			      </child>
 			    </widget>
 			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">2</property>
-			      <property name="bottom_attach">3</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">True</property>
 			    </packing>
 			  </child>
 			</widget>
 			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
+			  <property name="tab_expand">False</property>
+			  <property name="tab_fill">True</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkLabel" id="openvpn-password-tab-label">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Password</property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
+			</widget>
+			<packing>
+			  <property name="type">tab</property>
 			</packing>
 		      </child>
 		    </widget>
 		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
+		      <property name="left_attach">0</property>
+		      <property name="right_attach">2</property>
+		      <property name="top_attach">2</property>
+		      <property name="bottom_attach">3</property>
+		      <property name="x_options">fill</property>
+		      <property name="y_options">fill</property>
 		    </packing>
 		  </child>
 		</widget>
-		<packing>
-		  <property name="tab_expand">False</property>
-		  <property name="tab_fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="openvpn-password-tab-label">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Password</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="type">tab</property>
-		</packing>
 	      </child>
 	    </widget>
 	    <packing>
@@ -1482,8 +1345,8 @@ X.509 with Password Authentication</property>
 	  </child>
 	</widget>
 	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
+	  <property name="padding">12</property>
+	  <property name="expand">False</property>
 	  <property name="fill">True</property>
 	</packing>
       </child>
@@ -1496,35 +1359,16 @@ X.509 with Password Authentication</property>
 	  <property name="spacing">3</property>
 
 	  <child>
-	    <widget class="GtkHBox" id="hbox12">
+	    <widget class="GtkAlignment" id="alignment9">
 	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label22">
-		  <property name="visible">True</property>
-		  <property name="label"></property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">12</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xscale">1</property>
+	      <property name="yscale">1</property>
+	      <property name="top_padding">0</property>
+	      <property name="bottom_padding">0</property>
+	      <property name="left_padding">12</property>
+	      <property name="right_padding">0</property>
 
 	      <child>
 		<widget class="GtkVBox" id="vbox6">
@@ -1552,35 +1396,16 @@ X.509 with Password Authentication</property>
 		  </child>
 
 		  <child>
-		    <widget class="GtkHBox" id="hbox15">
+		    <widget class="GtkAlignment" id="alignment10">
 		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
-
-		      <child>
-			<widget class="GtkLabel" id="label25">
-			  <property name="visible">True</property>
-			  <property name="label"></property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">12</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
+		      <property name="xalign">0.5</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xscale">1</property>
+		      <property name="yscale">1</property>
+		      <property name="top_padding">0</property>
+		      <property name="bottom_padding">0</property>
+		      <property name="left_padding">12</property>
+		      <property name="right_padding">0</property>
 
 		      <child>
 			<widget class="GtkVBox" id="vbox7">
@@ -1632,16 +1457,11 @@ X.509 with Password Authentication</property>
 			    </packing>
 			  </child>
 			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
 		      </child>
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
-		      <property name="expand">True</property>
+		      <property name="expand">False</property>
 		      <property name="fill">True</property>
 		    </packing>
 		  </child>
@@ -1702,6 +1522,354 @@ X.509 with Password Authentication</property>
 		      <property name="fill">False</property>
 		    </packing>
 		  </child>
+
+		  <child>
+		    <widget class="GtkHBox" id="hbox23">
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">0</property>
+
+		      <child>
+			<widget class="GtkCheckButton" id="openvpn-use-cipher">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="label" translatable="yes">Use cipher:</property>
+			  <property name="use_underline">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="focus_on_click">True</property>
+			  <property name="active">False</property>
+			  <property name="inconsistent">False</property>
+			  <property name="draw_indicator">True</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkComboBox" id="openvpn-cipher">
+			  <property name="visible">True</property>
+			  <property name="items" translatable="yes"></property>
+			  <property name="add_tearoffs">False</property>
+			  <property name="focus_on_click">True</property>
+			</widget>
+			<packing>
+			  <property name="padding">1</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkHBox" id="hbox24">
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">10</property>
+
+		      <child>
+			<widget class="GtkVBox" id="vbox13">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">0</property>
+
+			  <child>
+			    <widget class="GtkLabel" id="label57">
+			      <property name="visible">True</property>
+			      <property name="label"></property>
+			      <property name="use_underline">False</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0.5</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">12</property>
+			      <property name="ypad">0</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkHBox" id="hbox25">
+			      <property name="visible">True</property>
+			      <property name="homogeneous">False</property>
+			      <property name="spacing">0</property>
+
+			      <child>
+				<widget class="GtkCheckButton" id="openvpn-use-ta">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="label" translatable="yes">Use TLS auth:</property>
+				  <property name="use_underline">True</property>
+				  <property name="relief">GTK_RELIEF_NORMAL</property>
+				  <property name="focus_on_click">True</property>
+				  <property name="active">False</property>
+				  <property name="inconsistent">False</property>
+				  <property name="draw_indicator">True</property>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkEntry" id="openvpn-ta">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="editable">False</property>
+				  <property name="visibility">True</property>
+				  <property name="max_length">0</property>
+				  <property name="text" translatable="yes"></property>
+				  <property name="has_frame">True</property>
+				  <property name="invisible_char">*</property>
+				  <property name="activates_default">False</property>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">True</property>
+				  <property name="fill">True</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkButton" id="openvpn-but-ta">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="relief">GTK_RELIEF_NORMAL</property>
+				  <property name="focus_on_click">True</property>
+
+				  <child>
+				    <widget class="GtkAlignment" id="alignment7">
+				      <property name="visible">True</property>
+				      <property name="xalign">0.5</property>
+				      <property name="yalign">0.5</property>
+				      <property name="xscale">0</property>
+				      <property name="yscale">0</property>
+				      <property name="top_padding">0</property>
+				      <property name="bottom_padding">0</property>
+				      <property name="left_padding">0</property>
+				      <property name="right_padding">0</property>
+
+				      <child>
+					<widget class="GtkHBox" id="hbox24">
+					  <property name="visible">True</property>
+					  <property name="homogeneous">False</property>
+					  <property name="spacing">2</property>
+
+					  <child>
+					    <widget class="GtkImage" id="image7">
+					      <property name="visible">True</property>
+					      <property name="stock">gtk-open</property>
+					      <property name="icon_size">4</property>
+					      <property name="xalign">0.5</property>
+					      <property name="yalign">0.5</property>
+					      <property name="xpad">0</property>
+					      <property name="ypad">0</property>
+					    </widget>
+					    <packing>
+					      <property name="padding">0</property>
+					      <property name="expand">False</property>
+					      <property name="fill">False</property>
+					    </packing>
+					  </child>
+
+					  <child>
+					    <widget class="GtkLabel" id="label55">
+					      <property name="visible">True</property>
+					      <property name="label" translatable="yes"></property>
+					      <property name="use_underline">False</property>
+					      <property name="use_markup">False</property>
+					      <property name="justify">GTK_JUSTIFY_LEFT</property>
+					      <property name="wrap">False</property>
+					      <property name="selectable">False</property>
+					      <property name="xalign">0.5</property>
+					      <property name="yalign">0.5</property>
+					      <property name="xpad">0</property>
+					      <property name="ypad">0</property>
+					      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					      <property name="width_chars">-1</property>
+					      <property name="single_line_mode">False</property>
+					      <property name="angle">0</property>
+					    </widget>
+					    <packing>
+					      <property name="padding">0</property>
+					      <property name="expand">False</property>
+					      <property name="fill">False</property>
+					    </packing>
+					  </child>
+					</widget>
+				      </child>
+				    </widget>
+				  </child>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkLabel" id="label58">
+			      <property name="visible">True</property>
+			      <property name="label"></property>
+			      <property name="use_underline">False</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0.5</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">12</property>
+			      <property name="ypad">0</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
+			    </packing>
+			  </child>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkVBox" id="vbox14">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">0</property>
+
+			  <child>
+			    <widget class="GtkLabel" id="label56">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Direction:</property>
+			      <property name="use_underline">False</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0.5</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkRadioButton" id="openvpn-ta-dir-none">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">none</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">True</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkRadioButton" id="openvpn-ta-dir-zero">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">0</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">False</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			      <property name="group">openvpn-ta-dir-none</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkRadioButton" id="openvpn-ta-dir-one">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">1</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">False</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			      <property name="group">openvpn-ta-dir-none</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
@@ -1737,7 +1905,7 @@ X.509 with Password Authentication</property>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>
-	  <property name="expand">True</property>
+	  <property name="expand">False</property>
 	  <property name="fill">True</property>
 	</packing>
       </child>
@@ -1748,7 +1916,7 @@ X.509 with Password Authentication</property>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>
-	  <property name="expand">True</property>
+	  <property name="expand">False</property>
 	  <property name="fill">True</property>
 	</packing>
       </child>
@@ -1768,7 +1936,7 @@ X.509 with Password Authentication</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
 	      <property name="wrap">True</property>
 	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
+	      <property name="xalign">0</property>
 	      <property name="yalign">0.5</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
@@ -1873,7 +2041,7 @@ X.509 with Password Authentication</property>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>
-	  <property name="expand">True</property>
+	  <property name="expand">False</property>
 	  <property name="fill">True</property>
 	</packing>
       </child>
diff --git a/vpn-daemons/openvpn/properties/nm-openvpn.c b/vpn-daemons/openvpn/properties/nm-openvpn.c
index 4e60c65d6d..a9cb3a2aaa 100644
--- a/vpn-daemons/openvpn/properties/nm-openvpn.c
+++ b/vpn-daemons/openvpn/properties/nm-openvpn.c
@@ -34,6 +34,7 @@
 #include <NetworkManager/nm-vpn-ui-interface.h>
 
 #include "../src/nm-openvpn-service.h"
+#include "../src/nm-utils.h"
 
 typedef struct _NetworkManagerVpnUIImpl NetworkManagerVpnUIImpl;
 
@@ -73,12 +74,20 @@ struct _NetworkManagerVpnUIImpl {
   GtkEntry       *w_username;
   GtkEntry       *w_password_ca;
   GtkButton      *w_button_password_ca;
+  GtkCheckButton *w_use_cipher;
+  GtkComboBox    *w_cipher;
+  GtkCheckButton *w_use_ta;
+  GtkEntry       *w_ta;
+  GtkButton      *w_button_ta;
+  GtkRadioButton *w_ta_dir_none;
+  GtkRadioButton *w_ta_dir_zero;
+  GtkRadioButton *w_ta_dir_one;
 };
 
 static void connection_type_changed(GtkComboBox *box, gpointer user_data);
 
 
-static void 
+static void
 openvpn_clear_widget (NetworkManagerVpnUIImpl *impl)
 {
   gtk_entry_set_text (impl->w_connection_name, "");
@@ -100,6 +109,19 @@ openvpn_clear_widget (NetworkManagerVpnUIImpl *impl)
   gtk_expander_set_expanded (impl->w_opt_info_expander, FALSE);
   gtk_combo_box_set_active (GTK_COMBO_BOX (impl->w_connection_type), 0);
   connection_type_changed (GTK_COMBO_BOX (impl->w_connection_type), impl);
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_cipher), FALSE);
+  gtk_widget_set_sensitive (GTK_WIDGET (impl->w_cipher), FALSE);
+  gtk_combo_box_set_active (GTK_COMBO_BOX (impl->w_cipher), 0);
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_ta), FALSE);
+  gtk_widget_set_sensitive (GTK_WIDGET (impl->w_ta), FALSE);
+  gtk_widget_set_sensitive (GTK_WIDGET (impl->w_button_ta), FALSE);
+  gtk_widget_set_sensitive (GTK_WIDGET (impl->w_ta_dir_none), FALSE);
+  gtk_widget_set_sensitive (GTK_WIDGET (impl->w_ta_dir_zero), FALSE);
+  gtk_widget_set_sensitive (GTK_WIDGET (impl->w_ta_dir_one), FALSE);
+  gtk_entry_set_text (impl->w_ta, "");
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_ta_dir_none), TRUE);
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_ta_dir_zero), FALSE);
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_ta_dir_one), FALSE);
 }
 
 static const char *
@@ -114,6 +136,34 @@ impl_get_service_name (NetworkManagerVpnUI *self)
   return "org.freedesktop.NetworkManager.openvpn";
 }
 
+static void
+set_cipher(GtkComboBox *box, GtkCheckButton *button, const char *value)
+{
+  GtkTreeModel *tree = gtk_combo_box_get_model(box);
+  GtkTreeIter   iter;
+  gboolean      valid;
+
+  valid = gtk_tree_model_get_iter_first(tree, &iter);
+
+  while (valid) {
+    gchar *alg;
+
+    gtk_tree_model_get (tree, &iter, 0, &alg, -1);
+
+/*     printf("set_cipher: %s %s\n", alg, value); */
+
+    if (strcmp(value, alg) == 0) {
+      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(button), TRUE);
+      gtk_widget_set_sensitive (GTK_WIDGET (box), TRUE);
+      gtk_combo_box_set_active_iter (box, &iter);
+      valid = FALSE;
+    } else
+      valid = gtk_tree_model_iter_next (tree, &iter);
+
+    g_free (alg);
+  }
+}
+
 static GtkWidget *
 impl_get_widget (NetworkManagerVpnUI *self, GSList *properties, GSList *routes, const char *connection_name)
 {
@@ -136,7 +186,7 @@ impl_get_widget (NetworkManagerVpnUI *self, GSList *properties, GSList *routes,
     value = (g_slist_next (i))->data;
 
     if (strcmp (key, "remote") == 0) {
-      gtk_entry_set_text (impl->w_remote, value);		
+      gtk_entry_set_text (impl->w_remote, value);
     } else if (strcmp (key, "ca") == 0) {
       gtk_entry_set_text (impl->w_ca, value);
     } else if (strcmp (key, "cert") == 0) {
@@ -178,6 +228,17 @@ impl_get_widget (NetworkManagerVpnUI *self, GSList *properties, GSList *routes,
 		(strcmp (value, "tcp") == 0) ) {
       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_tcp), TRUE);
       should_expand = TRUE;
+    } else if (strcmp (key, "cipher") == 0) {
+      set_cipher(impl->w_cipher, impl->w_use_cipher, value);
+    } else if (strcmp (key, "ta") == 0) {
+      gtk_entry_set_text (impl->w_ta, value);
+      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_ta), TRUE);
+    } else if (strcmp (key, "ta-dir") == 0) {
+/*       printf("ta_dir='%s'\n", value); */
+      if (strcmp (value, "0") == 0)
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_ta_dir_zero), TRUE);
+      else if (strcmp (value, "1") == 0)
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_ta_dir_one), TRUE);
     }
   }
 
@@ -188,10 +249,10 @@ impl_get_widget (NetworkManagerVpnUI *self, GSList *properties, GSList *routes,
     route_str = g_string_new ("");
     for (i = routes; i != NULL; i = g_slist_next (i)) {
       const char *route;
-			
+
       if (i != routes)
 	g_string_append_c(route_str, ' ');
-			
+
       route = (const char *) i->data;
       g_string_append(route_str, route);
     }
@@ -201,7 +262,7 @@ impl_get_widget (NetworkManagerVpnUI *self, GSList *properties, GSList *routes,
     g_free (str);
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_routes), TRUE);
     gtk_widget_set_sensitive (GTK_WIDGET (impl->w_routes), TRUE);
-    
+
     should_expand = TRUE;
   }
 
@@ -228,6 +289,8 @@ impl_get_properties (NetworkManagerVpnUI *self)
   gboolean    use_lzo;
   gboolean    use_tap;
   gboolean    use_tcp;
+  gboolean    use_cipher;
+  gboolean    use_ta;
 
   connectionname         = gtk_entry_get_text (impl->w_connection_name);
   remote                 = gtk_entry_get_text (impl->w_remote);
@@ -241,6 +304,8 @@ impl_get_properties (NetworkManagerVpnUI *self)
   local_ip               = gtk_entry_get_text (impl->w_local_ip);
   remote_ip              = gtk_entry_get_text (impl->w_remote_ip);
   username               = gtk_entry_get_text (impl->w_username);
+  use_cipher             = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_use_cipher));
+  use_ta                 = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_use_ta));
 
   data = NULL;
   data = g_slist_append (data, g_strdup ("connection-type"));
@@ -280,7 +345,28 @@ impl_get_properties (NetworkManagerVpnUI *self)
   data = g_slist_append (data, g_strdup (remote_ip));
   data = g_slist_append (data, g_strdup ("username"));
   data = g_slist_append (data, g_strdup (username));
-
+  if (use_cipher) {
+    const gchar *cipher = gtk_combo_box_get_active_text(impl->w_cipher);
+    if (cipher != NULL) {
+      data = g_slist_append (data, g_strdup ("cipher"));
+      data = g_slist_append (data, g_strdup (cipher));
+    }
+  }
+  if (use_ta) {
+    const gchar* dir;
+
+    data = g_slist_append (data, g_strdup ("ta"));
+    data = g_slist_append (data, g_strdup (gtk_entry_get_text (impl->w_ta)));
+    data = g_slist_append (data, g_strdup ("ta-dir"));
+    if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_ta_dir_zero)))
+      dir = "0";
+    else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_ta_dir_one)))
+      dir = "1";
+    else
+      dir = "";
+/*     printf("ta_dir='%s'\n", dir); */
+    data = g_slist_append (data, g_strdup(dir));
+  }
   return data;
 }
 
@@ -332,7 +418,7 @@ static gboolean
 check_ip (const char *ip)
 {
   int d1, d2, d3, d4;
-	
+
   if (sscanf (ip, "%d.%d.%d.%d", &d1, &d2, &d3, &d4) != 4) {
     return FALSE;
   }
@@ -357,7 +443,7 @@ static gboolean
 check_net_cidr (const char *net)
 {
   int d1, d2, d3, d4, mask;
-	
+
   if (sscanf (net, "%d.%d.%d.%d/%d", &d1, &d2, &d3, &d4, &mask) != 5) {
     return FALSE;
   }
@@ -448,7 +534,7 @@ impl_is_valid (NetworkManagerVpnUI *self)
 
       is_valid = TRUE;
     }
- 
+
   } else if ( connection_type == NM_OPENVPN_CONTYPE_X509USERPASS ) {
 
     const char *username;
@@ -474,7 +560,7 @@ impl_is_valid (NetworkManagerVpnUI *self)
 
       is_valid = TRUE;
     }
- 
+
   } else {
     // default to NM_OPENVPN_CONTYPE_X509
     const char *ca;
@@ -497,20 +583,20 @@ impl_is_valid (NetworkManagerVpnUI *self)
 
       is_valid = TRUE;
     }
-    
+
   }
 
   /* validate routes: each entry must be of the form 'a.b.c.d/mask' */
   if (is_valid) {
     GSList *i;
     GSList *routes;
-    
+
     routes = get_routes (impl);
-      
+
     for (i = routes; is_valid && (i != NULL); i = g_slist_next (i)) {
       is_valid = (is_valid && check_net_cidr ( i->data ));
     }
-      
+
     if (routes != NULL) {
       g_slist_foreach (routes, (GFunc)g_free, NULL);
       g_slist_free (routes);
@@ -521,13 +607,29 @@ impl_is_valid (NetworkManagerVpnUI *self)
 }
 
 
-static void 
-use_routes_toggled (GtkToggleButton *togglebutton, gpointer user_data)
+static void
+use_editable_toggled (GtkToggleButton *togglebutton, gpointer user_data)
 {
   NetworkManagerVpnUIImpl *impl = (NetworkManagerVpnUIImpl *) user_data;
 
-  gtk_widget_set_sensitive (GTK_WIDGET (impl->w_routes), 
-			    gtk_toggle_button_get_active (togglebutton));
+  if (GTK_CHECK_BUTTON(togglebutton) == impl->w_use_routes)
+    gtk_widget_set_sensitive (GTK_WIDGET (impl->w_routes),
+			      gtk_toggle_button_get_active (togglebutton));
+  else if (GTK_CHECK_BUTTON(togglebutton) == impl->w_use_cipher)
+    gtk_widget_set_sensitive (GTK_WIDGET (impl->w_cipher),
+			      gtk_toggle_button_get_active (togglebutton));
+  else if (GTK_CHECK_BUTTON(togglebutton) == impl->w_use_ta) {
+    gtk_widget_set_sensitive (GTK_WIDGET (impl->w_ta),
+			      gtk_toggle_button_get_active (togglebutton));
+    gtk_widget_set_sensitive (GTK_WIDGET (impl->w_button_ta),
+			      gtk_toggle_button_get_active (togglebutton));
+    gtk_widget_set_sensitive (GTK_WIDGET (impl->w_ta_dir_none),
+			      gtk_toggle_button_get_active (togglebutton));
+    gtk_widget_set_sensitive (GTK_WIDGET (impl->w_ta_dir_zero),
+			      gtk_toggle_button_get_active (togglebutton));
+    gtk_widget_set_sensitive (GTK_WIDGET (impl->w_ta_dir_one),
+			      gtk_toggle_button_get_active (togglebutton));
+  }
 
   if (impl->callback != NULL) {
     gboolean is_valid;
@@ -537,8 +639,7 @@ use_routes_toggled (GtkToggleButton *togglebutton, gpointer user_data)
   }
 }
 
-
-static void 
+static void
 editable_changed (GtkEditable *editable, gpointer user_data)
 {
   NetworkManagerVpnUIImpl *impl = (NetworkManagerVpnUIImpl *) user_data;
@@ -555,13 +656,13 @@ editable_changed (GtkEditable *editable, gpointer user_data)
   if ( GTK_ENTRY (editable) == impl->w_ca ) {
     gtk_entry_set_text ( impl->w_password_ca, gtk_entry_get_text (GTK_ENTRY (impl->w_ca)));
   } else if ( GTK_ENTRY (editable) == impl->w_password_ca ) {
-    gtk_entry_set_text ( impl->w_ca, gtk_entry_get_text (GTK_ENTRY (impl->w_password_ca)));    
+    gtk_entry_set_text ( impl->w_ca, gtk_entry_get_text (GTK_ENTRY (impl->w_password_ca)));
   }
 }
 
 
-static void 
-impl_set_validity_changed_callback (NetworkManagerVpnUI *self, 
+static void
+impl_set_validity_changed_callback (NetworkManagerVpnUI *self,
 				    NetworkManagerVpnUIDialogValidityCallback callback,
 				    gpointer user_data)
 {
@@ -591,6 +692,11 @@ impl_get_confirmation_details (NetworkManagerVpnUI *self, gchar **retval)
   gboolean use_tap;
   gboolean use_tcp;
   gint connection_type;
+  gboolean use_cipher;
+  const gchar *cipher;
+  gboolean use_ta;
+  const char *ta;
+  const char *ta_dir;
 
   connectionname         = gtk_entry_get_text (impl->w_connection_name);
   connection_type        = gtk_combo_box_get_active (impl->w_connection_type);
@@ -606,8 +712,17 @@ impl_get_confirmation_details (NetworkManagerVpnUI *self, gchar **retval)
   use_lzo                = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_use_lzo));
   use_tap                = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_use_tap));
   use_tcp                = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_use_tcp));
+  use_cipher             = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_use_cipher));
+  cipher                 = gtk_combo_box_get_active_text(impl->w_cipher);
+  use_ta                 = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_use_ta));
+  ta                     = gtk_entry_get_text (impl->w_ta);
+  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(impl->w_ta_dir_zero)))
+    ta_dir               = "0";
+  else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(impl->w_ta_dir_one)))
+    ta_dir               = "1";
+  else
+    ta_dir               = "";
 
-  
   // This is risky, should be variable length depending on actual data!
   buf = g_string_sized_new (512);
 
@@ -694,6 +809,16 @@ impl_get_confirmation_details (NetworkManagerVpnUI *self, gchar **retval)
   g_string_append (buf, "\n\t");
   g_string_append_printf( buf, _("Use LZO Compression: %s"), ((use_lzo) ? _("Yes") : _("No")));
 
+  if (use_cipher && (cipher != NULL)) {
+    g_string_append (buf, "\n\t");
+    g_string_append_printf (buf, _("Cipher:  %s"), cipher);
+  }
+
+  if (use_ta) {
+    g_string_append (buf, "\n\t");
+    g_string_append_printf (buf, _("TLS auth:  %s %s"), ta, ta_dir);
+  }
+
   g_string_append (buf, "\n\n");
   g_string_append (buf, _("The connection details can be changed using the \"Edit\" button."));
   g_string_append (buf, "\n");
@@ -727,6 +852,9 @@ import_from_file (NetworkManagerVpnUIImpl *impl, const char *path)
     char *local_ip = NULL;
     char *remote_ip = NULL;
     char *username = NULL;
+    char *cipher = NULL;
+    char *ta = NULL;
+    char *ta_dir = NULL;
     gboolean should_expand;
 
     connectionname  = g_key_file_get_string (keyfile, "openvpn", "description", NULL);
@@ -742,6 +870,9 @@ import_from_file (NetworkManagerVpnUIImpl *impl, const char *path)
     local_ip        = g_key_file_get_string (keyfile, "openvpn", "local-ip", NULL);
     remote_ip       = g_key_file_get_string (keyfile, "openvpn", "remote-ip", NULL);
     username        = g_key_file_get_string (keyfile, "openvpn", "username", NULL);
+    cipher          = g_key_file_get_string (keyfile, "openvpn", "cipher", NULL);
+    ta              = g_key_file_get_string (keyfile, "openvpn", "ta", NULL);
+    ta_dir          = g_key_file_get_string (keyfile, "openvpn", "ta_dir", NULL);
 
     /* may not exist */
     if ((routes = g_key_file_get_string (keyfile, "openvpn", "routes", NULL)) == NULL)
@@ -800,7 +931,7 @@ import_from_file (NetworkManagerVpnUIImpl *impl, const char *path)
 	  gtk_entry_set_text (impl->w_ca, ca);
 	} else {
 	  file_is_good = FALSE;
-	}	
+	}
       } else {
 	// no connection type given in config
 	file_is_good = FALSE;
@@ -810,6 +941,29 @@ import_from_file (NetworkManagerVpnUIImpl *impl, const char *path)
       file_is_good = FALSE;
     }
 
+    if (cipher != NULL) {
+      set_cipher(impl->w_cipher, impl->w_use_cipher, cipher);
+    }
+
+    if (ta != NULL) {
+      gtk_entry_set_text (impl->w_ta, ta);
+      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_ta), TRUE);
+      gtk_widget_set_sensitive (GTK_WIDGET (impl->w_ta), TRUE);
+      gtk_widget_set_sensitive (GTK_WIDGET (impl->w_button_ta), TRUE);
+      gtk_widget_set_sensitive (GTK_WIDGET (impl->w_ta_dir_none), TRUE);
+      gtk_widget_set_sensitive (GTK_WIDGET (impl->w_ta_dir_zero), TRUE);
+      gtk_widget_set_sensitive (GTK_WIDGET (impl->w_ta_dir_one), TRUE);
+    }
+
+    if (ta_dir != NULL) {
+      if (strcmp(ta_dir, "0") == 0)
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(impl->w_ta_dir_zero), TRUE);
+      else if (strcmp(ta_dir, "1") == 0)
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(impl->w_ta_dir_one), TRUE);
+      else
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(impl->w_ta_dir_none), TRUE);
+    }
+
     if (file_is_good) {
       should_expand = FALSE;
 
@@ -841,7 +995,7 @@ import_from_file (NetworkManagerVpnUIImpl *impl, const char *path)
       gtk_expander_set_expanded (impl->w_opt_info_expander, should_expand);
     } else {
       GtkWidget *dialog;
-		
+
       dialog = gtk_message_dialog_new (NULL,
 				       GTK_DIALOG_DESTROY_WITH_PARENT,
 				       GTK_MESSAGE_WARNING,
@@ -868,6 +1022,9 @@ import_from_file (NetworkManagerVpnUIImpl *impl, const char *path)
     g_free (local_ip);
     g_free (remote_ip);
     g_free (username);
+    g_free (cipher);
+    g_free (ta);
+    g_free (ta_dir);
   }
 
   g_free (basename);
@@ -888,23 +1045,22 @@ import_button_clicked (GtkButton *button, gpointer user_data)
 					GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 					GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
 					NULL);
-  
+
   if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) {
-		
+
     filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
     /*printf ("User selected '%s'\n", filename);*/
 
   }
-	
+
   gtk_widget_destroy (dialog);
 
   if (filename != NULL) {
     import_from_file (impl, filename);
     g_free (filename);
-  }      
+  }
 }
 
-
 static void
 connection_type_changed (GtkComboBox *box, gpointer user_data)
 {
@@ -916,37 +1072,37 @@ connection_type_changed (GtkComboBox *box, gpointer user_data)
   case NM_OPENVPN_CONTYPE_X509:
   case NM_OPENVPN_CONTYPE_SHAREDKEY:
   case NM_OPENVPN_CONTYPE_PASSWORD:
-    {
-      gtk_notebook_set_current_page( impl->w_settings_notebook, sel );
-      for (i = NM_OPENVPN_CONTYPE_X509; i <= NM_OPENVPN_CONTYPE_PASSWORD; ++i) {
-	GtkWidget *tab = GTK_WIDGET ( gtk_notebook_get_nth_page( GTK_NOTEBOOK (impl->w_settings_notebook), i));
-	gtk_widget_set_sensitive( tab, (i == sel));
-	gtk_widget_set_sensitive( GTK_WIDGET ( gtk_notebook_get_tab_label( GTK_NOTEBOOK (impl->w_settings_notebook), tab) ), (i == sel));
-      }
+  {
+    gtk_notebook_set_current_page( impl->w_settings_notebook, sel );
+    for (i = NM_OPENVPN_CONTYPE_X509; i <= NM_OPENVPN_CONTYPE_PASSWORD; ++i) {
+      GtkWidget *tab = GTK_WIDGET ( gtk_notebook_get_nth_page( GTK_NOTEBOOK (impl->w_settings_notebook), i));
+      gtk_widget_set_sensitive( tab, (i == sel));
+      gtk_widget_set_sensitive( GTK_WIDGET ( gtk_notebook_get_tab_label( GTK_NOTEBOOK (impl->w_settings_notebook), tab) ), (i == sel));
     }
-    break;
+  }
+  break;
   case NM_OPENVPN_CONTYPE_X509USERPASS:
-    {
-      GtkWidget *tab;
+  {
+    GtkWidget *tab;
 
-      tab = GTK_WIDGET ( gtk_notebook_get_nth_page( GTK_NOTEBOOK (impl->w_settings_notebook),
-						    NM_OPENVPN_CONTYPE_X509));
-      gtk_widget_set_sensitive( tab, TRUE);
-      gtk_widget_set_sensitive( GTK_WIDGET ( gtk_notebook_get_tab_label( GTK_NOTEBOOK (impl->w_settings_notebook), tab) ), TRUE);
+    tab = GTK_WIDGET ( gtk_notebook_get_nth_page( GTK_NOTEBOOK (impl->w_settings_notebook),
+						  NM_OPENVPN_CONTYPE_X509));
+    gtk_widget_set_sensitive( tab, TRUE);
+    gtk_widget_set_sensitive( GTK_WIDGET ( gtk_notebook_get_tab_label( GTK_NOTEBOOK (impl->w_settings_notebook), tab) ), TRUE);
 
-      tab = GTK_WIDGET ( gtk_notebook_get_nth_page( GTK_NOTEBOOK (impl->w_settings_notebook),
-						    NM_OPENVPN_CONTYPE_SHAREDKEY));
-      gtk_widget_set_sensitive( tab, FALSE);
-      gtk_widget_set_sensitive( GTK_WIDGET ( gtk_notebook_get_tab_label( GTK_NOTEBOOK (impl->w_settings_notebook), tab) ), FALSE);
+    tab = GTK_WIDGET ( gtk_notebook_get_nth_page( GTK_NOTEBOOK (impl->w_settings_notebook),
+						  NM_OPENVPN_CONTYPE_SHAREDKEY));
+    gtk_widget_set_sensitive( tab, FALSE);
+    gtk_widget_set_sensitive( GTK_WIDGET ( gtk_notebook_get_tab_label( GTK_NOTEBOOK (impl->w_settings_notebook), tab) ), FALSE);
 
-      tab = GTK_WIDGET ( gtk_notebook_get_nth_page( GTK_NOTEBOOK (impl->w_settings_notebook),
-						    NM_OPENVPN_CONTYPE_PASSWORD));
-      gtk_widget_set_sensitive( tab, TRUE);
-      gtk_widget_set_sensitive( GTK_WIDGET ( gtk_notebook_get_tab_label( GTK_NOTEBOOK (impl->w_settings_notebook), tab) ), TRUE);
+    tab = GTK_WIDGET ( gtk_notebook_get_nth_page( GTK_NOTEBOOK (impl->w_settings_notebook),
+						  NM_OPENVPN_CONTYPE_PASSWORD));
+    gtk_widget_set_sensitive( tab, TRUE);
+    gtk_widget_set_sensitive( GTK_WIDGET ( gtk_notebook_get_tab_label( GTK_NOTEBOOK (impl->w_settings_notebook), tab) ), TRUE);
 
-    }
-    gtk_notebook_set_current_page( impl->w_settings_notebook, NM_OPENVPN_CONTYPE_X509 );
-    break;
+  }
+  gtk_notebook_set_current_page( impl->w_settings_notebook, NM_OPENVPN_CONTYPE_X509 );
+  break;
   }
 }
 
@@ -977,6 +1133,9 @@ open_button_clicked (GtkButton *button, gpointer user_data)
   } else if ( button == impl->w_button_password_ca ) {
     msg = _("Select CA to use");
     entry = impl->w_password_ca;
+  } else if ( button == impl->w_button_ta ) {
+    msg = _("Select TA to use");
+    entry = impl->w_ta;
   } else {
     return;
   }
@@ -987,11 +1146,11 @@ open_button_clicked (GtkButton *button, gpointer user_data)
 					GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 					GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
 					NULL);
-  
+
   if ( impl->last_fc_dir != NULL ) {
     gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), impl->last_fc_dir);
   }
-				  
+
   if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) {
     gtk_entry_set_text (entry, gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)));
     dir = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog));
@@ -1004,13 +1163,13 @@ open_button_clicked (GtkButton *button, gpointer user_data)
 
 }
 
-static gboolean 
+static gboolean
 impl_can_export (NetworkManagerVpnUI *self)
 {
   return TRUE;
 }
 
-static gboolean 
+static gboolean
 impl_import_file (NetworkManagerVpnUI *self, const char *path)
 {
   NetworkManagerVpnUIImpl *impl = (NetworkManagerVpnUIImpl *) self->data;
@@ -1018,8 +1177,8 @@ impl_import_file (NetworkManagerVpnUI *self, const char *path)
   return import_from_file (impl, path);
 }
 
-static void
-export_to_file (NetworkManagerVpnUIImpl *impl, const char *path, 
+static gboolean
+export_to_file (NetworkManagerVpnUIImpl *impl, const char *path,
 		GSList *properties, GSList *routes, const char *connection_name)
 {
   FILE *f;
@@ -1036,41 +1195,51 @@ export_to_file (NetworkManagerVpnUIImpl *impl, const char *path,
   const char *local_ip = NULL;
   const char *remote_ip = NULL;
   const char *username = NULL;
+  const char *cipher = NULL;
+  const char *ta = NULL;
+  const char *ta_dir = NULL;
   char *routes_str = NULL;
+  gboolean ret;
 
   /*printf ("in export_to_file; path='%s'\n", path);*/
 
   for (i = properties; i != NULL && g_slist_next (i) != NULL; i = g_slist_next (g_slist_next (i))) {
-    const char *key;
+    const char *k;
     const char *value;
 
-    key = i->data;
+    k = i->data;
     value = (g_slist_next (i))->data;
 
-    if (strcmp (key, "remote") == 0) {
+    if (strcmp (k, "remote") == 0) {
       remote = value;
-    } else if (strcmp (key, "dev") == 0) {
+    } else if (strcmp (k, "dev") == 0) {
       dev = value;
-    } else if (strcmp (key, "proto") == 0) {
+    } else if (strcmp (k, "proto") == 0) {
       proto = value;
-    } else if (strcmp (key, "ca") == 0) {
+    } else if (strcmp (k, "ca") == 0) {
       ca = value;
-    } else if (strcmp (key, "cert") == 0) {
+    } else if (strcmp (k, "cert") == 0) {
       cert = value;
-    } else if (strcmp (key, "key") == 0) {
+    } else if (strcmp (k, "key") == 0) {
       key = value;
-    } else if (strcmp (key, "comp-lzo") == 0) {
+    } else if (strcmp (k, "comp-lzo") == 0) {
       lzo = value;
-    } else if (strcmp (key, "shared-key") == 0) {
+    } else if (strcmp (k, "shared-key") == 0) {
       shared_key = value;
-    } else if (strcmp (key, "local-ip") == 0) {
+    } else if (strcmp (k, "local-ip") == 0) {
       local_ip = value;
-    } else if (strcmp (key, "remote-ip") == 0) {
+    } else if (strcmp (k, "remote-ip") == 0) {
       remote_ip = value;
-    } else if (strcmp (key, "username") == 0) {
+    } else if (strcmp (k, "username") == 0) {
       username = value;
-    } else if (strcmp (key, "connection-type") == 0) {
+    } else if (strcmp (k, "connection-type") == 0) {
       connection_type = value;
+    } else if (strcmp (k, "cipher") == 0) {
+      cipher = value;
+    } else if (strcmp (k, "ta") == 0) {
+      ta = value;
+    } else if (strcmp (k, "ta-dir") == 0) {
+      ta_dir = value;
     }
   }
 
@@ -1081,10 +1250,10 @@ export_to_file (NetworkManagerVpnUIImpl *impl, const char *path,
     str = g_string_new ("routes=");
     for (i = routes; i != NULL; i = g_slist_next (i)) {
       const char *route;
-      
+
       if (i != routes)
 	g_string_append_c (str, ' ');
-			
+
       route = (const char *) i->data;
       g_string_append (str, route);
     }
@@ -1097,7 +1266,7 @@ export_to_file (NetworkManagerVpnUIImpl *impl, const char *path,
   f = fopen (path, "w");
   if (f != NULL) {
 
-    fprintf (f, 
+    fprintf (f,
 	     "[openvpn]\n"
 	     "description=%s\n"
 	     "connection-type=%s\n"
@@ -1112,6 +1281,9 @@ export_to_file (NetworkManagerVpnUIImpl *impl, const char *path,
 	     "local-ip=%s\n"
 	     "remote-ip=%s\n"
 	     "username=%s\n"
+	     "cipher=%s\n"
+	     "ta=%s\n"
+	     "ta_dir=%s\n"
 	     "routes=%s\n",
 	     /* Description */ connection_name,
 	     /* conn type */   connection_type,
@@ -1126,15 +1298,22 @@ export_to_file (NetworkManagerVpnUIImpl *impl, const char *path,
 	     /* local ip */    local_ip,
 	     /* remote ip */   remote_ip,
 	     /* username */    username,
+	     /* cipher */      cipher,
+	     /* TA */          ta,
+	     /* TA direction*/ ta_dir,
 	     /* X-NM-Routes */ routes_str != NULL ? routes_str : "");
 
     fclose (f);
+    ret = TRUE;
   }
+  else
+    ret = FALSE;
   g_free (routes_str);
+  return ret;
 }
 
 
-static gboolean 
+static gboolean
 impl_export (NetworkManagerVpnUI *self, GSList *properties, GSList *routes, const char *connection_name)
 {
   char *suggested_name;
@@ -1156,13 +1335,13 @@ impl_export (NetworkManagerVpnUI *self, GSList *properties, GSList *routes, cons
   g_free (suggested_name);
 
   if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
-    {
-      
-      path = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
-      /*printf ("User selected '%s'\n", path);*/
-      
-    }
-	
+  {
+
+    path = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
+/*     printf ("User selected '%s'\n", path); */
+
+  }
+
   gtk_widget_destroy (dialog);
 
   if (path != NULL) {
@@ -1180,18 +1359,58 @@ impl_export (NetworkManagerVpnUI *self, GSList *properties, GSList *routes, cons
 						_("Do you want to replace it with the one you are saving?"));
       response = gtk_dialog_run (GTK_DIALOG (dialog));
       gtk_widget_destroy (dialog);
-      if (response == GTK_RESPONSE_OK)
-	export_to_file (impl, path, properties, routes, connection_name);
+      if (response != GTK_RESPONSE_OK)
+	goto out;
+    }
+
+    if (!export_to_file (impl, path, properties, routes, connection_name)) {
+      GtkWidget *dialog;
+
+      dialog = gtk_message_dialog_new (NULL,
+				       GTK_DIALOG_DESTROY_WITH_PARENT,
+				       GTK_MESSAGE_WARNING,
+				       GTK_BUTTONS_CLOSE,
+				       _("Failed to export configuration"));
+      gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+						_("Failed to save file %s"), path);
+      gtk_dialog_run (GTK_DIALOG (dialog));
+      gtk_widget_destroy (dialog);
     }
-  }      
+  }
 
+out:
   g_free (path);
 
   return TRUE;
 }
 
+static void
+populate_cipher(GtkComboBox *box)
+{
+  const char *openvpn_binary = NULL;
+  gchar      *cmdline, *tmp, *token;
+
+  openvpn_binary = nm_find_openvpn();
+  if (!openvpn_binary)
+    return;
 
-static NetworkManagerVpnUI* 
+  cmdline = g_strdup_printf("/bin/sh -c \"%s --show-ciphers | /bin/awk '/^[A-Z][A-Z0-9]+-/ { print $1 }'\"", openvpn_binary);
+  if (!g_spawn_command_line_sync(cmdline, &tmp, NULL, NULL, NULL))
+    goto end;
+
+  token = strtok(tmp, "\n");
+
+  while (token) {
+    if (strlen(token))
+      gtk_combo_box_append_text(box, token);
+    token = strtok(NULL, "\n");
+  }
+
+end:
+  g_free(tmp);
+}
+
+static NetworkManagerVpnUI*
 impl_get_object (void)
 {
   char *glade_file;
@@ -1212,9 +1431,9 @@ impl_get_object (void)
     impl->w_remote                = GTK_ENTRY (glade_xml_get_widget (impl->xml, "openvpn-remote"));
     impl->w_use_routes             = GTK_CHECK_BUTTON (glade_xml_get_widget (impl->xml, "openvpn-use-routes"));
     impl->w_routes                 = GTK_ENTRY (glade_xml_get_widget (impl->xml, "openvpn-routes"));
-    impl->w_opt_info_expander      = GTK_EXPANDER (glade_xml_get_widget (impl->xml, 
+    impl->w_opt_info_expander      = GTK_EXPANDER (glade_xml_get_widget (impl->xml,
 									 "openvpn-optional-information-expander"));
-    impl->w_import_button          = GTK_BUTTON (glade_xml_get_widget (impl->xml, 
+    impl->w_import_button          = GTK_BUTTON (glade_xml_get_widget (impl->xml,
 								       "openvpn-import-button"));
 
     impl->w_ca                     = GTK_ENTRY( glade_xml_get_widget( impl->xml, "openvpn-ca" ) );
@@ -1241,57 +1460,75 @@ impl_get_object (void)
     impl->w_password_ca            = GTK_ENTRY( glade_xml_get_widget( impl->xml, "openvpn-password-ca" ) );
     impl->w_button_password_ca     = GTK_BUTTON( glade_xml_get_widget( impl->xml, "openvpn-password-but-ca" ) );
 
+    impl->w_use_cipher             = GTK_CHECK_BUTTON (glade_xml_get_widget (impl->xml, "openvpn-use-cipher"));
+    impl->w_cipher                 = GTK_COMBO_BOX( glade_xml_get_widget( impl->xml, "openvpn-cipher" ) );
+    populate_cipher(impl->w_cipher);
+
+    impl->w_use_ta                 = GTK_CHECK_BUTTON (glade_xml_get_widget (impl->xml, "openvpn-use-ta"));
+    impl->w_ta                     = GTK_ENTRY( glade_xml_get_widget( impl->xml, "openvpn-ta" ) );
+    impl->w_button_ta              = GTK_BUTTON( glade_xml_get_widget( impl->xml, "openvpn-but-ta" ) );
+    impl->w_ta_dir_none            = GTK_RADIO_BUTTON( glade_xml_get_widget( impl->xml, "openvpn-ta-dir-none" ) );
+    impl->w_ta_dir_zero            = GTK_RADIO_BUTTON( glade_xml_get_widget( impl->xml, "openvpn-ta-dir-zero" ) );
+    impl->w_ta_dir_one             = GTK_RADIO_BUTTON( glade_xml_get_widget( impl->xml, "openvpn-ta-dir-one" ) );
+
     impl->callback                 = NULL;
 
 
-    gtk_signal_connect (GTK_OBJECT (impl->w_use_routes), 
-			"toggled", GTK_SIGNAL_FUNC (use_routes_toggled), impl);
+    gtk_signal_connect (GTK_OBJECT (impl->w_use_routes),
+			"toggled", GTK_SIGNAL_FUNC (use_editable_toggled), impl);
+    gtk_signal_connect (GTK_OBJECT (impl->w_use_cipher),
+			"toggled", GTK_SIGNAL_FUNC (use_editable_toggled), impl);
+    gtk_signal_connect (GTK_OBJECT (impl->w_use_ta),
+			"toggled", GTK_SIGNAL_FUNC (use_editable_toggled), impl);
 
-    gtk_signal_connect (GTK_OBJECT (impl->w_connection_name), 
+    gtk_signal_connect (GTK_OBJECT (impl->w_connection_name),
+			"changed", GTK_SIGNAL_FUNC (editable_changed), impl);
+    gtk_signal_connect (GTK_OBJECT (impl->w_remote),
 			"changed", GTK_SIGNAL_FUNC (editable_changed), impl);
-    gtk_signal_connect (GTK_OBJECT (impl->w_remote), 
+    gtk_signal_connect (GTK_OBJECT (impl->w_routes),
 			"changed", GTK_SIGNAL_FUNC (editable_changed), impl);
-    gtk_signal_connect (GTK_OBJECT (impl->w_routes), 
+    gtk_signal_connect (GTK_OBJECT (impl->w_ca),
 			"changed", GTK_SIGNAL_FUNC (editable_changed), impl);
-    gtk_signal_connect (GTK_OBJECT (impl->w_ca), 
+    gtk_signal_connect (GTK_OBJECT (impl->w_cert),
 			"changed", GTK_SIGNAL_FUNC (editable_changed), impl);
-    gtk_signal_connect (GTK_OBJECT (impl->w_cert), 
+    gtk_signal_connect (GTK_OBJECT (impl->w_key),
 			"changed", GTK_SIGNAL_FUNC (editable_changed), impl);
-    gtk_signal_connect (GTK_OBJECT (impl->w_key), 
+    gtk_signal_connect (GTK_OBJECT (impl->w_shared_key),
 			"changed", GTK_SIGNAL_FUNC (editable_changed), impl);
-    gtk_signal_connect (GTK_OBJECT (impl->w_shared_key), 
+    gtk_signal_connect (GTK_OBJECT (impl->w_local_ip),
 			"changed", GTK_SIGNAL_FUNC (editable_changed), impl);
-    gtk_signal_connect (GTK_OBJECT (impl->w_local_ip), 
+    gtk_signal_connect (GTK_OBJECT (impl->w_remote_ip),
 			"changed", GTK_SIGNAL_FUNC (editable_changed), impl);
-    gtk_signal_connect (GTK_OBJECT (impl->w_remote_ip), 
+    gtk_signal_connect (GTK_OBJECT (impl->w_username),
 			"changed", GTK_SIGNAL_FUNC (editable_changed), impl);
-    gtk_signal_connect (GTK_OBJECT (impl->w_username), 
+    gtk_signal_connect (GTK_OBJECT (impl->w_password_ca),
 			"changed", GTK_SIGNAL_FUNC (editable_changed), impl);
-    gtk_signal_connect (GTK_OBJECT (impl->w_password_ca), 
+    gtk_signal_connect (GTK_OBJECT (impl->w_ta),
 			"changed", GTK_SIGNAL_FUNC (editable_changed), impl);
-    
-    
-    gtk_signal_connect (GTK_OBJECT (impl->w_button_ca), 
+
+    gtk_signal_connect (GTK_OBJECT (impl->w_button_ca),
 			"clicked", GTK_SIGNAL_FUNC (open_button_clicked), impl);
-    gtk_signal_connect (GTK_OBJECT (impl->w_button_cert), 
+    gtk_signal_connect (GTK_OBJECT (impl->w_button_cert),
 			"clicked", GTK_SIGNAL_FUNC (open_button_clicked), impl);
-    gtk_signal_connect (GTK_OBJECT (impl->w_button_key), 
+    gtk_signal_connect (GTK_OBJECT (impl->w_button_key),
 			"clicked", GTK_SIGNAL_FUNC (open_button_clicked), impl);
-    gtk_signal_connect (GTK_OBJECT (impl->w_button_shared_key), 
+    gtk_signal_connect (GTK_OBJECT (impl->w_button_shared_key),
 			"clicked", GTK_SIGNAL_FUNC (open_button_clicked), impl);
-    gtk_signal_connect (GTK_OBJECT (impl->w_button_password_ca), 
+    gtk_signal_connect (GTK_OBJECT (impl->w_button_password_ca),
+			"clicked", GTK_SIGNAL_FUNC (open_button_clicked), impl);
+    gtk_signal_connect (GTK_OBJECT (impl->w_button_ta),
 			"clicked", GTK_SIGNAL_FUNC (open_button_clicked), impl);
 
-    gtk_signal_connect (GTK_OBJECT (impl->w_import_button), 
+    gtk_signal_connect (GTK_OBJECT (impl->w_import_button),
 			"clicked", GTK_SIGNAL_FUNC (import_button_clicked), impl);
 
     gtk_signal_connect (GTK_OBJECT (impl->w_connection_type),
 			"changed", GTK_SIGNAL_FUNC (connection_type_changed), impl);
 
     /* make the widget reusable */
-    gtk_signal_connect (GTK_OBJECT (impl->widget), "delete-event", 
+    gtk_signal_connect (GTK_OBJECT (impl->widget), "delete-event",
 			GTK_SIGNAL_FUNC (gtk_widget_hide_on_delete), NULL);
-    
+
     openvpn_clear_widget (impl);
 
     impl->parent.get_display_name              = impl_get_display_name;
@@ -1307,7 +1544,7 @@ impl_get_object (void)
     impl->parent.import_file                   = impl_import_file;
     impl->parent.export                        = impl_export;
     impl->parent.data                          = impl;
-    
+
     return &(impl->parent);
   } else {
     g_free (impl);
@@ -1315,7 +1552,7 @@ impl_get_object (void)
   }
 }
 
-NetworkManagerVpnUI* 
+NetworkManagerVpnUI*
 nm_vpn_properties_factory (void)
 {
   return impl_get_object();
diff --git a/vpn-daemons/openvpn/src/nm-openvpn-service-openvpn-helper.c b/vpn-daemons/openvpn/src/nm-openvpn-service-openvpn-helper.c
index 271b4ffe71..59469b6681 100644
--- a/vpn-daemons/openvpn/src/nm-openvpn-service-openvpn-helper.c
+++ b/vpn-daemons/openvpn/src/nm-openvpn-service-openvpn-helper.c
@@ -175,7 +175,7 @@ send_config_info (DBusConnection *con,
     goto out;
   }
 
-  if (! ipstr_to_uint32 (str_ip4_ptpaddr, &uint_ip4_ptpaddr) ) {
+  if (str_ip4_ptpaddr && ! ipstr_to_uint32 (str_ip4_ptpaddr, &uint_ip4_ptpaddr) ) {
     nm_warning ("nm-openvpn-service-openvpn-helper didn't receive a valid PtP IP4 Address from openvpn.");
     send_config_error (con, "IP4 PtP Address");
     goto out;
diff --git a/vpn-daemons/openvpn/src/nm-openvpn-service.c b/vpn-daemons/openvpn/src/nm-openvpn-service.c
index d37bf724d3..e653d925ab 100644
--- a/vpn-daemons/openvpn/src/nm-openvpn-service.c
+++ b/vpn-daemons/openvpn/src/nm-openvpn-service.c
@@ -50,17 +50,8 @@
 #include "nm-openvpn-service.h"
 #include "nm-utils.h"
 
-
-static const char *openvpn_binary_paths[] =
-{
-  "/usr/sbin/openvpn",
-  "/sbin/openvpn",
-  NULL
-};
-
 #define NM_OPENVPN_HELPER_PATH		BINDIR"/nm-openvpn-service-openvpn-helper"
 
-
 typedef struct _NmOpenVPN_IOData
 {
   char           *username;
@@ -593,7 +584,7 @@ nm_openvpn_start_openvpn_binary (NmOpenVPNData *data,
 				 )
 {
   GPid	        pid;
-  const char  **openvpn_binary = NULL;
+  const char   *openvpn_binary = NULL;
   GPtrArray    *openvpn_argv;
   GError       *error = NULL;
   GSource      *openvpn_watch;
@@ -606,7 +597,9 @@ nm_openvpn_start_openvpn_binary (NmOpenVPNData *data,
   char         *dev = NULL;
   char         *proto = NULL;
   char         *port = NULL;
-
+  char         *cipher = NULL;
+  char         *ta = NULL;
+  char         *ta_dir = NULL;
 
   g_return_val_if_fail (data != NULL, -1);
 
@@ -617,14 +610,8 @@ nm_openvpn_start_openvpn_binary (NmOpenVPNData *data,
   }
 
   /* Find openvpn */
-  openvpn_binary = openvpn_binary_paths;
-  while (*openvpn_binary != NULL) {
-    if (g_file_test (*openvpn_binary, G_FILE_TEST_EXISTS))
-      break;
-    openvpn_binary++;
-  }
-
-  if (!*openvpn_binary) {
+  openvpn_binary = nm_find_openvpn();
+  if (!openvpn_binary) {
     nm_info ("Could not find openvpn binary.");
     return -1;
   }
@@ -653,7 +640,7 @@ nm_openvpn_start_openvpn_binary (NmOpenVPNData *data,
   if ( data->connection_type != NM_OPENVPN_CONTYPE_INVALID ) {
 
     openvpn_argv = g_ptr_array_new ();
-    g_ptr_array_add (openvpn_argv, (gpointer) (*openvpn_binary));
+    g_ptr_array_add (openvpn_argv, (gpointer) (openvpn_binary));
 
     // Note that it should be guaranteed that num_items % 2 == 0
     // Add global arguments
@@ -670,6 +657,12 @@ nm_openvpn_start_openvpn_binary (NmOpenVPNData *data,
 	proto = data_items[++i];
       } else if ( (strcmp( data_items[i], "port") == 0) ) {
 	port = data_items[++i];
+      } else if ( (strcmp( data_items[i], "cipher") == 0) ) {
+	cipher = data_items[++i];
+      } else if ( (strcmp( data_items[i], "ta") == 0) ) {
+	ta = data_items[++i];
+      } else if ( (strcmp( data_items[i], "ta-dir") == 0) ) {
+	ta_dir = data_items[++i];
       }
     }
     g_ptr_array_add (openvpn_argv, (gpointer) "--nobind");
@@ -704,6 +697,20 @@ nm_openvpn_start_openvpn_binary (NmOpenVPNData *data,
       g_ptr_array_add (openvpn_argv, (gpointer) "1194");
     }
 
+    // Cipher
+    if (cipher != NULL) {
+      g_ptr_array_add (openvpn_argv, (gpointer) "--cipher");
+      g_ptr_array_add (openvpn_argv, (gpointer) cipher);
+    }
+
+    // TA
+    if (ta != NULL) {
+      g_ptr_array_add (openvpn_argv, (gpointer) "--tls-auth");
+      g_ptr_array_add (openvpn_argv, (gpointer) ta);
+      if (ta_dir != NULL)
+	g_ptr_array_add (openvpn_argv, (gpointer) ta_dir);
+    }
+
     // Syslog
     g_ptr_array_add (openvpn_argv, (gpointer) "--syslog");
     g_ptr_array_add (openvpn_argv, (gpointer) "nm-openvpn");
@@ -822,7 +829,6 @@ nm_openvpn_start_openvpn_binary (NmOpenVPNData *data,
 
     }
 
-
     g_ptr_array_add (openvpn_argv, NULL);
 
     if (!g_spawn_async_with_pipes (NULL, (char **) openvpn_argv->pdata, NULL,
@@ -918,6 +924,9 @@ nm_openvpn_config_options_validate (char **data_items, int num_items)
     { "remote-ip",			OPT_TYPE_ADDRESS },
     { "username",			OPT_TYPE_ASCII },
     { "connection-type",		OPT_TYPE_ASCII },
+    { "cipher",				OPT_TYPE_ASCII },
+    { "ta",				OPT_TYPE_ASCII },
+    { "ta-dir",				OPT_TYPE_ASCII },
     { NULL,				OPT_TYPE_UNKNOWN } };
   
   unsigned int	i;
@@ -1245,6 +1254,7 @@ nm_openvpn_dbus_process_helper_ip4_config (DBusConnection *con, DBusMessage *mes
   guint32		ip4_dns_len;
   guint32 *		ip4_nbns;
   guint32		ip4_nbns_len;
+  guint32		mss;
   gboolean		success = FALSE;
   char *                empty = "";
 
@@ -1277,6 +1287,9 @@ nm_openvpn_dbus_process_helper_ip4_config (DBusConnection *con, DBusMessage *mes
 	  goto out;
 	}
 
+	/* OpenVPN does not care about the MSS */
+	mss = 0;
+
       dbus_message_append_args (signal,
 				DBUS_TYPE_UINT32, &ip4_vpn_gateway,
 				DBUS_TYPE_STRING, &tundev,
@@ -1285,6 +1298,7 @@ nm_openvpn_dbus_process_helper_ip4_config (DBusConnection *con, DBusMessage *mes
 				DBUS_TYPE_UINT32, &ip4_netmask,
 				DBUS_TYPE_ARRAY, DBUS_TYPE_UINT32, &ip4_dns, ip4_dns_len,
 				DBUS_TYPE_ARRAY, DBUS_TYPE_UINT32, &ip4_nbns, ip4_nbns_len,
+				DBUS_TYPE_UINT32, &mss,
 				DBUS_TYPE_STRING, &empty,
 				DBUS_TYPE_STRING, &empty,
 				DBUS_TYPE_INVALID);
diff --git a/vpn-daemons/openvpn/src/nm-utils.c b/vpn-daemons/openvpn/src/nm-utils.c
index fbcabe912d..5c66a77483 100644
--- a/vpn-daemons/openvpn/src/nm-utils.c
+++ b/vpn-daemons/openvpn/src/nm-utils.c
@@ -24,6 +24,7 @@
 #include <errno.h>
 
 #include <glib.h>
+
 #include "nm-utils.h"
 
 gchar *nm_dbus_escape_object_path (const gchar *utf8_string)
diff --git a/vpn-daemons/openvpn/src/nm-utils.h b/vpn-daemons/openvpn/src/nm-utils.h
index 276f4e2540..7421804983 100644
--- a/vpn-daemons/openvpn/src/nm-utils.h
+++ b/vpn-daemons/openvpn/src/nm-utils.h
@@ -128,4 +128,25 @@ G_STMT_START								\
 gchar *nm_dbus_escape_object_path (const gchar *utf8_string);
 gchar *nm_dbus_unescape_object_path (const gchar *object_path);
 
+static inline const char *nm_find_openvpn (void)
+{
+	static const char *openvpn_binary_paths[] =
+	{
+		"/usr/sbin/openvpn",
+		"/sbin/openvpn",
+		NULL
+	};
+
+	const char  **openvpn_binary = openvpn_binary_paths;
+
+	while (*openvpn_binary != NULL) {
+		if (g_file_test (*openvpn_binary, G_FILE_TEST_EXISTS))
+			break;
+		openvpn_binary++;
+	}
+
+	return *openvpn_binary;
+}
+
+
 #endif /* NM_UTILS_H */
diff --git a/vpn-daemons/pptp/ChangeLog b/vpn-daemons/pptp/ChangeLog
index a9bb0f45f1..f2f85f4a21 100644
--- a/vpn-daemons/pptp/ChangeLog
+++ b/vpn-daemons/pptp/ChangeLog
@@ -1,3 +1,13 @@
+2006-04-23  Dan Williams  <dcbw@redhat.com>
+
+	Patch from j@bootlab.org
+	* src/Makefile.am: add missing files so make distcheck works
+
+2006-03-29  Robert Love  <rml@novell.com>
+
+	* src/nm-pptp-service.c: New eigth argument to DBUS VPN method, the
+	  per-route MSS.  PPTP does not care about the MSS, so we send zero.
+
 2006-01-05  Tim Niemueller <tim@niemueller.de>
 
 	* configure.in: Explicitly set AUX_DIR to . to prevent autoconf from
diff --git a/vpn-daemons/pptp/auth-dialog/Makefile.am b/vpn-daemons/pptp/auth-dialog/Makefile.am
index bf405bfad0..6698147e82 100644
--- a/vpn-daemons/pptp/auth-dialog/Makefile.am
+++ b/vpn-daemons/pptp/auth-dialog/Makefile.am
@@ -14,7 +14,7 @@ nm_pptp_auth_dialog_CPPFLAGS =			\
 	-DG_DISABLE_DEPRECATED			\
 	-DGDK_DISABLE_DEPRECATED		\
 	-DGNOME_DISABLE_DEPRECATED		\
-	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
+	-DGNOMELOCALEDIR=\"$(datadir)/locale\"	\
 	-DVERSION=\"$(VERSION)\"			\
 	$(NULL)
 
diff --git a/vpn-daemons/pptp/po/.cvsignore b/vpn-daemons/pptp/po/.cvsignore
index 68336a4624..b4f445d021 100644
--- a/vpn-daemons/pptp/po/.cvsignore
+++ b/vpn-daemons/pptp/po/.cvsignore
@@ -5,3 +5,4 @@ POTFILES
 da.gmo
 sv.gmo
 *.pot
+stamp-it
diff --git a/vpn-daemons/pptp/properties/Makefile.am b/vpn-daemons/pptp/properties/Makefile.am
index b7b08c268e..72a811ba46 100644
--- a/vpn-daemons/pptp/properties/Makefile.am
+++ b/vpn-daemons/pptp/properties/Makefile.am
@@ -18,7 +18,7 @@ libnm_pptp_properties_la_CFLAGS =                          \
         -DG_DISABLE_DEPRECATED                          \
         -DGDK_DISABLE_DEPRECATED                        \
         -DGNOME_DISABLE_DEPRECATED                      \
-        -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"  \
+	-DGNOMELOCALEDIR=\"$(datadir)/locale\"		\
         -DVERSION=\"$(VERSION)\"
 
 libnm_pptp_properties_la_LIBADD =       \
diff --git a/vpn-daemons/pptp/properties/nm-pptp-dialog.glade b/vpn-daemons/pptp/properties/nm-pptp-dialog.glade
index 2da3be538a..e2e2520a46 100644
--- a/vpn-daemons/pptp/properties/nm-pptp-dialog.glade
+++ b/vpn-daemons/pptp/properties/nm-pptp-dialog.glade
@@ -9,17 +9,18 @@
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">False</property>
-  <property name="resizable">True</property>
+  <property name="resizable">False</property>
   <property name="destroy_with_parent">False</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
 
   <child>
     <widget class="GtkVBox" id="nm-pptp-widget">
-      <property name="border_width">12</property>
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
       <property name="spacing">12</property>
@@ -37,6 +38,10 @@
 	  <property name="yalign">0.5</property>
 	  <property name="xpad">0</property>
 	  <property name="ypad">0</property>
+	  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	  <property name="width_chars">-1</property>
+	  <property name="single_line_mode">False</property>
+	  <property name="angle">0</property>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>
@@ -46,51 +51,34 @@
       </child>
 
       <child>
-	<widget class="GtkVBox" id="vbox2">
+	<widget class="GtkVBox" id="vbox11">
 	  <property name="visible">True</property>
 	  <property name="homogeneous">False</property>
-	  <property name="spacing">6</property>
+	  <property name="spacing">18</property>
 
 	  <child>
-	    <widget class="GtkLabel" id="label2">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">&lt;b&gt;Connection Name&lt;/b&gt;</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">True</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox1">
+	    <widget class="GtkVBox" id="vbox2">
 	      <property name="visible">True</property>
 	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
+	      <property name="spacing">6</property>
 
 	      <child>
-		<widget class="GtkLabel" id="label3">
+		<widget class="GtkLabel" id="label2">
 		  <property name="visible">True</property>
-		  <property name="label"></property>
+		  <property name="label" translatable="yes">&lt;b&gt;Connection Name&lt;/b&gt;</property>
 		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
+		  <property name="use_markup">True</property>
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
 		  <property name="wrap">False</property>
 		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
+		  <property name="xalign">0</property>
 		  <property name="yalign">0.5</property>
-		  <property name="xpad">12</property>
+		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
@@ -100,51 +88,40 @@
 	      </child>
 
 	      <child>
-		<widget class="GtkVBox" id="vbox3">
+		<widget class="GtkAlignment" id="alignment2">
 		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="label4">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Name used to identify the connection to the private network, e.g. &quot;Campus VPN&quot; or &quot;Corporate Network&quot;</property>
-		      <property name="use_underline">True</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">True</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xscale">1</property>
+		  <property name="yscale">1</property>
+		  <property name="top_padding">0</property>
+		  <property name="bottom_padding">0</property>
+		  <property name="left_padding">12</property>
+		  <property name="right_padding">0</property>
 
 		  <child>
-		    <widget class="GtkHBox" id="hbox5">
+		    <widget class="GtkVBox" id="vbox3">
 		      <property name="visible">True</property>
 		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
+		      <property name="spacing">6</property>
 
 		      <child>
-			<widget class="GtkLabel" id="label12">
+			<widget class="GtkLabel" id="label4">
 			  <property name="visible">True</property>
-			  <property name="label"></property>
-			  <property name="use_underline">False</property>
+			  <property name="label" translatable="yes">_Name used to identify the connection to the private network, e.g. &quot;Campus VPN&quot; or &quot;Corporate Network&quot;</property>
+			  <property name="use_underline">True</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
+			  <property name="wrap">True</property>
 			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
+			  <property name="xalign">0</property>
 			  <property name="yalign">0.5</property>
-			  <property name="xpad">12</property>
+			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
@@ -167,16 +144,11 @@
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
 			</packing>
 		      </child>
 		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
 		  </child>
 		</widget>
 		<packing>
@@ -188,171 +160,71 @@
 	    </widget>
 	    <packing>
 	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkVBox" id="vbox9">
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">0</property>
-
-	  <child>
-	    <widget class="GtkLabel" id="label28">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">&lt;b&gt;Required Information&lt;/b&gt;</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">True</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
 	      <property name="expand">False</property>
-	      <property name="fill">False</property>
+	      <property name="fill">True</property>
 	    </packing>
 	  </child>
 
 	  <child>
-	    <widget class="GtkVBox" id="vbox10">
-	      <property name="border_width">12</property>
+	    <widget class="GtkVBox" id="vbox9">
 	      <property name="visible">True</property>
 	      <property name="homogeneous">False</property>
 	      <property name="spacing">6</property>
 
 	      <child>
-		<widget class="GtkHBox" id="hbox17">
+		<widget class="GtkLabel" id="label28">
 		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">0</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="nm-pptp-label-gateway">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Gateway:</property>
-		      <property name="use_underline">True</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">1</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		      <property name="mnemonic_widget">pptp-remote</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkEntry" id="pptp-remote">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="editable">True</property>
-		      <property name="visibility">True</property>
-		      <property name="max_length">0</property>
-		      <property name="text" translatable="yes"></property>
-		      <property name="has_frame">True</property>
-		      <property name="invisible_char">*</property>
-		      <property name="activates_default">False</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
+		  <property name="label" translatable="yes">&lt;b&gt;Required Information&lt;/b&gt;</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">True</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
+		  <property name="expand">False</property>
+		  <property name="fill">False</property>
 		</packing>
 	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkNotebook" id="notebook1">
-	      <property name="border_width">12</property>
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="show_tabs">True</property>
-	      <property name="show_border">True</property>
-	      <property name="tab_pos">GTK_POS_TOP</property>
-	      <property name="scrollable">False</property>
-	      <property name="enable_popup">False</property>
 
 	      <child>
-		<widget class="GtkVBox" id="vbox4">
+		<widget class="GtkAlignment" id="alignment3">
 		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xscale">1</property>
+		  <property name="yscale">1</property>
+		  <property name="top_padding">0</property>
+		  <property name="bottom_padding">0</property>
+		  <property name="left_padding">12</property>
+		  <property name="right_padding">0</property>
 
 		  <child>
-		    <widget class="GtkHBox" id="hbox2">
+		    <widget class="GtkVBox" id="vbox10">
 		      <property name="visible">True</property>
 		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
-
-		      <child>
-			<widget class="GtkLabel" id="label6">
-			  <property name="visible">True</property>
-			  <property name="label"></property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">12</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
+		      <property name="spacing">6</property>
 
 		      <child>
-			<widget class="GtkTable" id="table1">
+			<widget class="GtkHBox" id="hbox17">
 			  <property name="visible">True</property>
-			  <property name="n_rows">1</property>
-			  <property name="n_columns">2</property>
 			  <property name="homogeneous">False</property>
-			  <property name="row_spacing">12</property>
-			  <property name="column_spacing">6</property>
+			  <property name="spacing">12</property>
 
 			  <child>
-			    <widget class="GtkLabel" id="label17">
+			    <widget class="GtkLabel" id="nm-pptp-label-gateway">
 			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Username:</property>
-			      <property name="use_underline">False</property>
+			      <property name="label" translatable="yes">_Gateway:</property>
+			      <property name="use_underline">True</property>
 			      <property name="use_markup">False</property>
 			      <property name="justify">GTK_JUSTIFY_LEFT</property>
 			      <property name="wrap">False</property>
@@ -361,19 +233,21 @@
 			      <property name="yalign">0.5</property>
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
+			      <property name="mnemonic_widget">pptp-remote</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
 			    </widget>
 			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
 			    </packing>
 			  </child>
 
 			  <child>
-			    <widget class="GtkEntry" id="pptp-username">
+			    <widget class="GtkEntry" id="pptp-remote">
 			      <property name="visible">True</property>
 			      <property name="can_focus">True</property>
 			      <property name="editable">True</property>
@@ -385,384 +259,428 @@
 			      <property name="activates_default">False</property>
 			    </widget>
 			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			      <property name="y_options"></property>
+			      <property name="padding">0</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
 			    </packing>
 			  </child>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
-			  <property name="expand">True</property>
+			  <property name="expand">False</property>
 			  <property name="fill">True</property>
 			</packing>
 		      </child>
 
 		      <child>
-			<widget class="GtkLabel" id="label32">
+			<widget class="GtkNotebook" id="notebook1">
 			  <property name="visible">True</property>
-			  <property name="label"></property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">12</property>
-			  <property name="ypad">0</property>
+			  <property name="can_focus">True</property>
+			  <property name="show_tabs">True</property>
+			  <property name="show_border">True</property>
+			  <property name="tab_pos">GTK_POS_TOP</property>
+			  <property name="scrollable">False</property>
+			  <property name="enable_popup">False</property>
+
+			  <child>
+			    <widget class="GtkVBox" id="vbox4">
+			      <property name="border_width">6</property>
+			      <property name="visible">True</property>
+			      <property name="homogeneous">False</property>
+			      <property name="spacing">6</property>
+
+			      <child>
+				<widget class="GtkTable" id="table1">
+				  <property name="visible">True</property>
+				  <property name="n_rows">1</property>
+				  <property name="n_columns">2</property>
+				  <property name="homogeneous">False</property>
+				  <property name="row_spacing">6</property>
+				  <property name="column_spacing">12</property>
+
+				  <child>
+				    <widget class="GtkLabel" id="label17">
+				      <property name="visible">True</property>
+				      <property name="label" translatable="yes">Username:</property>
+				      <property name="use_underline">False</property>
+				      <property name="use_markup">False</property>
+				      <property name="justify">GTK_JUSTIFY_LEFT</property>
+				      <property name="wrap">False</property>
+				      <property name="selectable">False</property>
+				      <property name="xalign">1</property>
+				      <property name="yalign">0.5</property>
+				      <property name="xpad">0</property>
+				      <property name="ypad">0</property>
+				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				      <property name="width_chars">-1</property>
+				      <property name="single_line_mode">False</property>
+				      <property name="angle">0</property>
+				    </widget>
+				    <packing>
+				      <property name="left_attach">0</property>
+				      <property name="right_attach">1</property>
+				      <property name="top_attach">0</property>
+				      <property name="bottom_attach">1</property>
+				      <property name="x_options">fill</property>
+				      <property name="y_options"></property>
+				    </packing>
+				  </child>
+
+				  <child>
+				    <widget class="GtkEntry" id="pptp-username">
+				      <property name="visible">True</property>
+				      <property name="can_focus">True</property>
+				      <property name="editable">True</property>
+				      <property name="visibility">True</property>
+				      <property name="max_length">0</property>
+				      <property name="text" translatable="yes"></property>
+				      <property name="has_frame">True</property>
+				      <property name="invisible_char">*</property>
+				      <property name="activates_default">False</property>
+				    </widget>
+				    <packing>
+				      <property name="left_attach">1</property>
+				      <property name="right_attach">2</property>
+				      <property name="top_attach">0</property>
+				      <property name="bottom_attach">1</property>
+				      <property name="y_options"></property>
+				    </packing>
+				  </child>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">True</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkLabel" id="label33">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">Your password must be defined 
+in /etc/ppp/chap-secrets</property>
+				  <property name="use_underline">False</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">True</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+			    </widget>
+			    <packing>
+			      <property name="tab_expand">False</property>
+			      <property name="tab_fill">True</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkLabel" id="label29">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">MS CHAP-v1/v2</property>
+			      <property name="use_underline">False</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0.5</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
+			    </widget>
+			    <packing>
+			      <property name="type">tab</property>
+			    </packing>
+			  </child>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
 			</packing>
 		      </child>
 		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label33">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Your password must be defined 
-in /etc/ppp/chap-secrets</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_CENTER</property>
-		      <property name="wrap">True</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
 		  </child>
 		</widget>
 		<packing>
-		  <property name="tab_expand">False</property>
-		  <property name="tab_fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label29">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">MS CHAP-v1/v2</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="type">tab</property>
+		  <property name="padding">0</property>
+		  <property name="expand">True</property>
+		  <property name="fill">True</property>
 		</packing>
 	      </child>
 	    </widget>
 	    <packing>
 	      <property name="padding">0</property>
-	      <property name="expand">True</property>
+	      <property name="expand">False</property>
 	      <property name="fill">True</property>
 	    </packing>
 	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkExpander" id="pptp-optional-information-expander">
-	  <property name="visible">True</property>
-	  <property name="can_focus">True</property>
-	  <property name="expanded">True</property>
-	  <property name="spacing">6</property>
 
 	  <child>
-	    <widget class="GtkHBox" id="hbox12">
+	    <widget class="GtkExpander" id="pptp-optional-information-expander">
 	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
+	      <property name="can_focus">True</property>
+	      <property name="expanded">True</property>
+	      <property name="spacing">6</property>
 
 	      <child>
-		<widget class="GtkLabel" id="label22">
+		<widget class="GtkAlignment" id="alignment4">
 		  <property name="visible">True</property>
-		  <property name="label"></property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
 		  <property name="xalign">0.5</property>
 		  <property name="yalign">0.5</property>
-		  <property name="xpad">12</property>
-		  <property name="ypad">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkVBox" id="vbox6">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkCheckButton" id="pptp-use-routes">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">_Only use VPN connection for these addresses</property>
-		      <property name="use_underline">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-		      <property name="active">False</property>
-		      <property name="inconsistent">False</property>
-		      <property name="draw_indicator">True</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
+		  <property name="xscale">1</property>
+		  <property name="yscale">1</property>
+		  <property name="top_padding">0</property>
+		  <property name="bottom_padding">0</property>
+		  <property name="left_padding">12</property>
+		  <property name="right_padding">0</property>
 
 		  <child>
-		    <widget class="GtkHBox" id="hbox15">
+		    <widget class="GtkVBox" id="vbox6">
 		      <property name="visible">True</property>
 		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
+		      <property name="spacing">6</property>
 
 		      <child>
-			<widget class="GtkLabel" id="label25">
+			<widget class="GtkCheckButton" id="pptp-use-routes">
 			  <property name="visible">True</property>
-			  <property name="label"></property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">12</property>
-			  <property name="ypad">0</property>
+			  <property name="can_focus">True</property>
+			  <property name="label" translatable="yes">_Only use VPN connection for these addresses</property>
+			  <property name="use_underline">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="focus_on_click">True</property>
+			  <property name="active">False</property>
+			  <property name="inconsistent">False</property>
+			  <property name="draw_indicator">True</property>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
 			  <property name="expand">False</property>
-			  <property name="fill">True</property>
+			  <property name="fill">False</property>
 			</packing>
 		      </child>
 
 		      <child>
-			<widget class="GtkVBox" id="vbox7">
+			<widget class="GtkAlignment" id="alignment5">
 			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">6</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="label26">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">&lt;i&gt;example: 172.16.0.0/16 10.11.12.0/24&lt;/i&gt;</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">True</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xscale">1</property>
+			  <property name="yscale">1</property>
+			  <property name="top_padding">0</property>
+			  <property name="bottom_padding">0</property>
+			  <property name="left_padding">12</property>
+			  <property name="right_padding">0</property>
 
 			  <child>
-			    <widget class="GtkEntry" id="pptp-routes">
+			    <widget class="GtkVBox" id="vbox7">
 			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="editable">True</property>
-			      <property name="visibility">True</property>
-			      <property name="max_length">0</property>
-			      <property name="text" translatable="yes"></property>
-			      <property name="has_frame">True</property>
-			      <property name="invisible_char">*</property>
-			      <property name="activates_default">False</property>
+			      <property name="homogeneous">False</property>
+			      <property name="spacing">6</property>
+
+			      <child>
+				<widget class="GtkLabel" id="label26">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">&lt;i&gt;example: 172.16.0.0/16 10.11.12.0/24&lt;/i&gt;</property>
+				  <property name="use_underline">False</property>
+				  <property name="use_markup">True</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">True</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkEntry" id="pptp-routes">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="editable">True</property>
+				  <property name="visibility">True</property>
+				  <property name="max_length">0</property>
+				  <property name="text" translatable="yes"></property>
+				  <property name="has_frame">True</property>
+				  <property name="invisible_char">*</property>
+				  <property name="activates_default">False</property>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">True</property>
+				  <property name="fill">True</property>
+				</packing>
+			      </child>
 			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
 			  </child>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
-			  <property name="expand">True</property>
+			  <property name="expand">False</property>
 			  <property name="fill">True</property>
 			</packing>
 		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
 
-		  <child>
-		    <widget class="GtkCheckButton" id="pptp-use-mppc">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">Use MPPC compression</property>
-		      <property name="use_underline">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-		      <property name="active">False</property>
-		      <property name="inconsistent">False</property>
-		      <property name="draw_indicator">True</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
+		      <child>
+			<widget class="GtkCheckButton" id="pptp-use-mppc">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="label" translatable="yes">Use MPPC compression</property>
+			  <property name="use_underline">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="focus_on_click">True</property>
+			  <property name="active">False</property>
+			  <property name="inconsistent">False</property>
+			  <property name="draw_indicator">True</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
 
-		  <child>
-		    <widget class="GtkCheckButton" id="pptp-use-mppe">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">Require MPPE encryption</property>
-		      <property name="use_underline">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-		      <property name="active">False</property>
-		      <property name="inconsistent">False</property>
-		      <property name="draw_indicator">True</property>
+		      <child>
+			<widget class="GtkCheckButton" id="pptp-use-mppe">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="label" translatable="yes">Require MPPE encryption</property>
+			  <property name="use_underline">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="focus_on_click">True</property>
+			  <property name="active">False</property>
+			  <property name="inconsistent">False</property>
+			  <property name="draw_indicator">True</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
 		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
 		  </child>
 		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
 	      </child>
 	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">False</property>
+	      <property name="fill">True</property>
+	    </packing>
 	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkHButtonBox" id="hbuttonbox1">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-	  <property name="spacing">0</property>
 
 	  <child>
-	    <widget class="GtkButton" id="pptp-import-button">
+	    <widget class="GtkHButtonBox" id="hbuttonbox1">
 	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
+	      <property name="layout_style">GTK_BUTTONBOX_END</property>
+	      <property name="spacing">0</property>
 
 	      <child>
-		<widget class="GtkAlignment" id="alignment1">
+		<widget class="GtkButton" id="pptp-import-button">
 		  <property name="visible">True</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xscale">0</property>
-		  <property name="yscale">0</property>
-		  <property name="top_padding">0</property>
-		  <property name="bottom_padding">0</property>
-		  <property name="left_padding">0</property>
-		  <property name="right_padding">0</property>
+		  <property name="can_default">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="relief">GTK_RELIEF_NORMAL</property>
+		  <property name="focus_on_click">True</property>
 
 		  <child>
-		    <widget class="GtkHBox" id="hbox7">
+		    <widget class="GtkAlignment" id="alignment1">
 		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">2</property>
+		      <property name="xalign">0.5</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xscale">0</property>
+		      <property name="yscale">0</property>
+		      <property name="top_padding">0</property>
+		      <property name="bottom_padding">0</property>
+		      <property name="left_padding">0</property>
+		      <property name="right_padding">0</property>
 
 		      <child>
-			<widget class="GtkImage" id="image1">
+			<widget class="GtkHBox" id="hbox7">
 			  <property name="visible">True</property>
-			  <property name="stock">gtk-add</property>
-			  <property name="icon_size">4</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">2</property>
 
-		      <child>
-			<widget class="GtkLabel" id="label15">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Import Saved Configuration...</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
+			  <child>
+			    <widget class="GtkImage" id="image1">
+			      <property name="visible">True</property>
+			      <property name="stock">gtk-add</property>
+			      <property name="icon_size">4</property>
+			      <property name="xalign">0.5</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkLabel" id="label15">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">_Import Saved Configuration...</property>
+			      <property name="use_underline">True</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0.5</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
 			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
 		      </child>
 		    </widget>
 		  </child>
 		</widget>
 	      </child>
 	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">False</property>
+	      <property name="fill">True</property>
+	    </packing>
 	  </child>
 	</widget>
 	<packing>
diff --git a/vpn-daemons/pptp/src/Makefile.am b/vpn-daemons/pptp/src/Makefile.am
index 44a1153f0c..899433bde8 100644
--- a/vpn-daemons/pptp/src/Makefile.am
+++ b/vpn-daemons/pptp/src/Makefile.am
@@ -21,7 +21,11 @@ nm_pptp_service_SOURCES =				\
 				nm-pptp-service.c	\
 				nm-pptp-service.h	\
 				nm-utils.c		\
-				nm-utils.h
+				nm-utils.h		\
+				pppd/fsm.h		\
+				pppd/ipcp.h		\
+				pppd/patchlevel.h 	\
+				pppd/pppd.h
 
 
 nm_pptp_service_LDADD = 						\
diff --git a/vpn-daemons/pptp/src/nm-pptp-service.c b/vpn-daemons/pptp/src/nm-pptp-service.c
index 6b6e2dd42d..4bef2e9b71 100644
--- a/vpn-daemons/pptp/src/nm-pptp-service.c
+++ b/vpn-daemons/pptp/src/nm-pptp-service.c
@@ -831,6 +831,7 @@ static void nm_pptp_dbus_process_helper_ip4_config (DBusConnection *con, DBusMes
   guint32		    ip4_nbns_len;
   guint32 		    ip4_nbns1;
   guint32 		    ip4_nbns2;
+  guint32			mss;
   gboolean		    success = FALSE;
   char *            empty = "";
 
@@ -879,6 +880,9 @@ static void nm_pptp_dbus_process_helper_ip4_config (DBusConnection *con, DBusMes
 	  goto out;
 	}
 
+	/* PPTP does not care about the MSS */
+	mss = 0;
+
       ip4_vpn_gateway=data->ip4_vpn_gateway.s_addr;
       dbus_message_append_args (signal, 
                 DBUS_TYPE_UINT32, &ip4_vpn_gateway,
@@ -888,6 +892,7 @@ static void nm_pptp_dbus_process_helper_ip4_config (DBusConnection *con, DBusMes
 				DBUS_TYPE_UINT32, &ip4_netmask,
 				DBUS_TYPE_ARRAY, DBUS_TYPE_UINT32, &ip4_dns, ip4_dns_len,
 				DBUS_TYPE_ARRAY, DBUS_TYPE_UINT32, &ip4_nbns, ip4_nbns_len,
+				DBUS_TYPE_UINT32, &mss,
 				DBUS_TYPE_STRING, &empty,
 				DBUS_TYPE_STRING, &empty,
 				DBUS_TYPE_INVALID);
diff --git a/vpn-daemons/vpnc/ChangeLog b/vpn-daemons/vpnc/ChangeLog
index 26d04843e4..9efe1a5b4f 100644
--- a/vpn-daemons/vpnc/ChangeLog
+++ b/vpn-daemons/vpnc/ChangeLog
@@ -1,3 +1,26 @@
+2006-05-15  Dan Williams  <dcbw@redhat.com>
+
+	* configure.in: bump version to 0.6.2 for release
+
+2006-04-10  Robert Love  <rml@novell.com>
+
+	* properties/nm-vpnc.c: Report error if writing out of exported
+	  configuration fails.  The silent treatment might work for me and my
+	  wife, but not for failed I/O.
+
+2006-03-29  Robert Love  <rml@novell.com>
+
+	* src/nm-vpnc-service.c: New eigth argument to DBUS VPN method, the
+	  per-route MSS.  Cisco does not care about the MSS, so we send zero.
+
+2006-03-20  Dan Williams  <dcbw@redhat.com>
+
+	* configure.in: Bump release to 0.6
+
+2006-03-08  Christopher Aillon  <caillon@redhat.com>
+
+	* nm-vpnc.desktop.in: Use NoDisplay=true (fixes 333854)
+
 2006-01-23  Robert Love  <rml@novell.com>
 
 	* properties/nm-vpnc-dialog.glade: Add (back) 'Optional Information'
diff --git a/vpn-daemons/vpnc/auth-dialog/Makefile.am b/vpn-daemons/vpnc/auth-dialog/Makefile.am
index 05098b9d00..09211c8709 100644
--- a/vpn-daemons/vpnc/auth-dialog/Makefile.am
+++ b/vpn-daemons/vpnc/auth-dialog/Makefile.am
@@ -14,7 +14,7 @@ nm_vpnc_auth_dialog_CPPFLAGS =			\
 	-DG_DISABLE_DEPRECATED			\
 	-DGDK_DISABLE_DEPRECATED		\
 	-DGNOME_DISABLE_DEPRECATED		\
-	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
+	-DGNOMELOCALEDIR=\"$(datadir)/locale\"	\
 	-DVERSION=\"$(VERSION)\"			\
 	$(NULL)
 
diff --git a/vpn-daemons/vpnc/auth-dialog/main.c b/vpn-daemons/vpnc/auth-dialog/main.c
index b87117b69c..935cf78e86 100644
--- a/vpn-daemons/vpnc/auth-dialog/main.c
+++ b/vpn-daemons/vpnc/auth-dialog/main.c
@@ -261,7 +261,7 @@ main (int argc, char *argv[])
 
 	gnome_program_init ("nm-vpnc-auth-dialog", VERSION, LIBGNOMEUI_MODULE,
 			    argc, argv, 
-			    GNOME_PARAM_NONE);
+			    GNOME_PARAM_NONE, GNOME_PARAM_NONE);
 	  
 	passwords = get_passwords (vpn_name, vpn_service, retry);
 	if (passwords == NULL)
diff --git a/vpn-daemons/vpnc/configure.in b/vpn-daemons/vpnc/configure.in
index 131e9dfff0..41aba8309a 100644
--- a/vpn-daemons/vpnc/configure.in
+++ b/vpn-daemons/vpnc/configure.in
@@ -1,6 +1,6 @@
 AC_PREREQ(2.52)
 
-AC_INIT(NetworkManager-vpnc, 0.5.0, dcbw@redhat.com, NetworkManager-vpnc)
+AC_INIT(NetworkManager-vpnc, 0.6.2, dcbw@redhat.com, NetworkManager-vpnc)
 AC_CONFIG_AUX_DIR(.)
 AM_INIT_AUTOMAKE([subdir-objects])
 AM_MAINTAINER_MODE
@@ -35,7 +35,7 @@ AC_PROG_GCC_TRADITIONAL
 AC_FUNC_MEMCMP
 AC_CHECK_FUNCS(select socket uname)
 
-ALL_LINGUAS="da sv"
+ALL_LINGUAS="da sv fi"
 AC_SUBST(ALL_LINGUAS)
 
 GETTEXT_PACKAGE=NetworkManager-vpnc
diff --git a/vpn-daemons/vpnc/nm-vpnc.desktop.in b/vpn-daemons/vpnc/nm-vpnc.desktop.in
index d06f706dc7..b9a6e5cbc7 100644
--- a/vpn-daemons/vpnc/nm-vpnc.desktop.in
+++ b/vpn-daemons/vpnc/nm-vpnc.desktop.in
@@ -10,3 +10,4 @@ Type=Application
 DocPath=
 Categories=GNOME;Application;Network;
 MimeType=application/x-cisco-vpn-settings
+NoDisplay=true
diff --git a/vpn-daemons/vpnc/po/.cvsignore b/vpn-daemons/vpnc/po/.cvsignore
index 68336a4624..b4f445d021 100644
--- a/vpn-daemons/vpnc/po/.cvsignore
+++ b/vpn-daemons/vpnc/po/.cvsignore
@@ -5,3 +5,4 @@ POTFILES
 da.gmo
 sv.gmo
 *.pot
+stamp-it
diff --git a/vpn-daemons/vpnc/po/ChangeLog b/vpn-daemons/vpnc/po/ChangeLog
index d810f1a98d..08f372fba5 100644
--- a/vpn-daemons/vpnc/po/ChangeLog
+++ b/vpn-daemons/vpnc/po/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-18  Robert Love  <rml@novell.com>
+
+	* da.po, sv.po: Update.
+	* cs.po, de.po, es.po, fr.po, hu.po, it.po, ja.po, pl.po, pt_BR.po,
+	  zh_CN.po, zh_TW.po: Add.
+
 2006-01-26  Lasse Bang Mikkelsen  <lbm@fatalerror.dk>
 
 	* da.po: Updated Danish translation.
diff --git a/vpn-daemons/vpnc/po/cs.po b/vpn-daemons/vpnc/po/cs.po
new file mode 100644
index 0000000000..2f256a55a0
--- /dev/null
+++ b/vpn-daemons/vpnc/po/cs.po
@@ -0,0 +1,243 @@
+# translation of cs.po to cs_CZ
+# Czech message file for YaST2 (@memory@).
+# Copyright (C) 2005 SUSE Linux Products GmbH.
+# Copyright (C) 2002 SuSE Linux AG.
+# Copyright (C) 1999-2001 SuSE GmbH.
+#
+# Petr Pavlik <pp@suse.cz>, 1999, 2000, 2001.
+# Klara Cihlarova <koty@seznam.cz>, 2006.
+msgid ""
+msgstr ""
+"Project-Id-Version: cs\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-05-16 17:10+0200\n"
+"PO-Revision-Date: 2006-05-17 13:12+0200\n"
+"Last-Translator: Klara Cihlarova <koty@seznam.cz>\n"
+"Language-Team: cs_CZ <cs@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms:  nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: KBabel 1.11.2\n"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:147
+msgid "_Secondary Password:"
+msgstr "Ověření _hesla:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:267
+msgid "_Username:"
+msgstr "_Uživ. jméno:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:269
+msgid "_Domain:"
+msgstr "_Doména:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:271
+msgid "_Password:"
+msgstr "_Heslo:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:354
+msgid "Connect _anonymously"
+msgstr "Připojit _anonymně"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:359
+msgid "Connect as _user:"
+msgstr "Připojit jako _uživatel:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:465
+msgid "_Remember passwords for this session"
+msgstr "_Zapamatovat si heslo pro toto sezení"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:467
+msgid "_Save passwords in keyring"
+msgstr "_Uložit do svazku klí�ů"
+
+#: ../auth-dialog/main.c:161
+#, c-format
+msgid "You need to authenticate to access the Virtual Private Network '%s'."
+msgstr "Abyste mohli přistupovat do VPN '%s', musíte zadat své jméno a heslo."
+
+#: ../auth-dialog/main.c:162
+msgid "Authenticate VPN"
+msgstr "Ověřování VPN"
+
+#: ../auth-dialog/main.c:169
+msgid "_Group Password:"
+msgstr "Heslo _skupiny:"
+
+#: ../nm-vpnc.desktop.in.h:1
+msgid "Add, Remove, and Edit VPN Connections"
+msgstr "Přidat, odstranit a upravit VPN připojení"
+
+#: ../nm-vpnc.desktop.in.h:2
+msgid "VPN Connection Manager (vpnc)"
+msgstr "Správa VPN spojení (vpnc)"
+
+#: ../properties/nm-vpnc.c:83
+msgid "Compatible Cisco VPN client (vpnc)"
+msgstr "Klient kompatibilní s Cisco VPN (vpnc)"
+
+#: ../properties/nm-vpnc.c:447
+msgid "The following vpnc VPN connection will be created:"
+msgstr "Budou vytvořeny následující VPN spojení:"
+
+#: ../properties/nm-vpnc.c:449
+#, c-format
+msgid "Name:  %s"
+msgstr "Jméno:  %s"
+
+#: ../properties/nm-vpnc.c:452
+#, c-format
+msgid "Gateway:  %s"
+msgstr "Brána:  %s"
+
+#: ../properties/nm-vpnc.c:454
+#, c-format
+msgid "Group Name:  %s"
+msgstr "Jméno skupiny:  %s"
+
+#: ../properties/nm-vpnc.c:458
+#, c-format
+msgid "Username:  %s"
+msgstr "Jméno uživatele:  %s"
+
+#: ../properties/nm-vpnc.c:463
+#, c-format
+msgid "Domain:  %s"
+msgstr "Doména:  %s"
+
+#: ../properties/nm-vpnc.c:468
+#, c-format
+msgid "Routes:  %s"
+msgstr "Směrování:  %s"
+
+#: ../properties/nm-vpnc.c:472
+msgid "The connection details can be changed using the \"Edit\" button."
+msgstr "Podrobnosti o připojení lze změnit kliknutím na tla�ítko \"Upravit\"."
+
+#: ../properties/nm-vpnc.c:548
+msgid "TCP tunneling not supported"
+msgstr "TCP tunelování není podporováno"
+
+#: ../properties/nm-vpnc.c:550
+#, c-format
+msgid ""
+"The VPN settings file '%s' specifies that VPN traffic should be tunneled "
+"through TCP which is currently not supported in the vpnc software.\n"
+"\n"
+"The connection can still be created, with TCP tunneling disabled, however it "
+"may not work as expected."
+msgstr ""
+"Soubor VPN nastavení '%s' udává, že má být VPN připojení tunelováno "
+"přes TCP. To není v sou�asné době ve vpnc podporováno.\n"
+"\n"
+"Připojení půjde navázat bez TCP tunelování, ale je možné, že nebude "
+"fungovat korektnÄ›."
+
+#: ../properties/nm-vpnc.c:574
+msgid "Cannot import settings"
+msgstr "Nelze importovat nastavení"
+
+#: ../properties/nm-vpnc.c:576
+#, c-format
+msgid "The VPN settings file '%s' does not contain valid data."
+msgstr "Zadaný soubor '%s' neobsahuje platná data."
+
+#: ../properties/nm-vpnc.c:593
+msgid "Select file to import"
+msgstr "Vyberte soubor k importu"
+
+#. printf ("in impl_export\n");
+#: ../properties/nm-vpnc.c:748
+msgid "Save as..."
+msgstr "Uložit jako..."
+
+#: ../properties/nm-vpnc.c:778
+#, c-format
+msgid "A file named \"%s\" already exists."
+msgstr "Jméno souboru \"%s\" již existuje."
+
+#: ../properties/nm-vpnc.c:781
+msgid "Do you want to replace it with the one you are saving?"
+msgstr "Nahradit?"
+
+#: ../properties/nm-vpnc-dialog.glade.h:1
+msgid "<b>Connection Name</b>"
+msgstr "<b>Název připojení</b>"
+
+#: ../properties/nm-vpnc-dialog.glade.h:2
+msgid "<b>Required Information</b>"
+msgstr "<b>Požadované informace</b>"
+
+#: ../properties/nm-vpnc-dialog.glade.h:3
+msgid "<i>example: 172.16.0.0/16 10.11.12.0/24</i>"
+msgstr "<i>příklad: 172.16.0.0/16 10.11.12.0/24</i>"
+
+#: ../properties/nm-vpnc-dialog.glade.h:4
+msgid "G_roup Name:"
+msgstr "J_méno skupiny:"
+
+#: ../properties/nm-vpnc-dialog.glade.h:5
+msgid "O_ptional Information"
+msgstr "_Volitelné informace"
+
+#: ../properties/nm-vpnc-dialog.glade.h:6
+msgid "Override _user name"
+msgstr "Přepsat _uživatelské jméno"
+
+#: ../properties/nm-vpnc-dialog.glade.h:7
+msgid ""
+"Please enter the information provided by your system administrator below. Do "
+"not enter your password here as you will be prompted when connecting."
+msgstr ""
+"Níže zadejte informace od svého správce systému. Nezadávejte své heslo, "
+"budete na něj dotázání později během připojování."
+
+#: ../properties/nm-vpnc-dialog.glade.h:8
+msgid "Use _domain for authentication"
+msgstr "Použít pro ověření _doménu"
+
+#: ../properties/nm-vpnc-dialog.glade.h:9
+msgid "_Gateway:"
+msgstr "_Brána:"
+
+#: ../properties/nm-vpnc-dialog.glade.h:10
+msgid "_Import Saved Configuration..."
+msgstr "_Importovat uložené nastavení..."
+
+#: ../properties/nm-vpnc-dialog.glade.h:11
+msgid ""
+"_Name used to identify the connection to the private network, e.g. \"Campus "
+"VPN\" or \"Corporate Network\""
+msgstr ""
+"_Jméno používané k identifikaci připojení k soukromé síti, např. \"Kolejní VPN\" "
+"nebo \"Práce\""
+
+#: ../properties/nm-vpnc-dialog.glade.h:12
+msgid "_Only use VPN connection for these addresses"
+msgstr "_Použít VPN pouze pro tyto adresy"
+
+#: ../src/nm-vpnc-service.c:116
+msgid "The VPN login failed because the user name and password were not accepted."
+msgstr "Připojení do VPN selhalo. Uživatelské jméno a heslo odmítnuto."
+
+#: ../src/nm-vpnc-service.c:118
+msgid "The VPN login failed because the VPN program could not be started."
+msgstr "Připojení do VPN selhalo. VPN program nelze spustit."
+
+#: ../src/nm-vpnc-service.c:120
+msgid ""
+"The VPN login failed because the VPN program could not connect to the VPN "
+"server."
+msgstr "Připojení do VPN selhalo. Nelze se spojit s VPN serverem."
+
+#: ../src/nm-vpnc-service.c:122
+msgid "The VPN login failed because the VPN configuration options were invalid."
+msgstr "Připojení do VPN selhalo. Chybné volby VPN."
+
+#: ../src/nm-vpnc-service.c:124
+msgid ""
+"The VPN login failed because the VPN program received an invalid "
+"configuration from the VPN server."
+msgstr "Připojení do VPN selhalo. Byly obdrženy chybné volby od VPN serveru."
+
diff --git a/vpn-daemons/vpnc/po/da.po b/vpn-daemons/vpnc/po/da.po
index cc46b95427..c2e5943153 100644
--- a/vpn-daemons/vpnc/po/da.po
+++ b/vpn-daemons/vpnc/po/da.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager-vpnc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-26 15:19+0100\n"
+"POT-Creation-Date: 2006-05-16 17:10+0200\n"
 "PO-Revision-Date: 2006-01-26 15:19+0100\n"
 "Last-Translator: Lasse Bang Mikkelsen <lbm@fatalerror.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -42,11 +42,13 @@ msgid "Connect as _user:"
 msgstr "Tilslut som _bruger:"
 
 #: ../auth-dialog/gnome-two-password-dialog.c:465
-msgid "_Remember password for this session"
+#, fuzzy
+msgid "_Remember passwords for this session"
 msgstr "_Husk adgangskode for denne session"
 
 #: ../auth-dialog/gnome-two-password-dialog.c:467
-msgid "_Save password in keyring"
+#, fuzzy
+msgid "_Save passwords in keyring"
 msgstr "_Gem adgangskode i nøglering"
 
 #: ../auth-dialog/main.c:161
diff --git a/vpn-daemons/vpnc/po/de.po b/vpn-daemons/vpnc/po/de.po
new file mode 100644
index 0000000000..b6e8d6d717
--- /dev/null
+++ b/vpn-daemons/vpnc/po/de.po
@@ -0,0 +1,260 @@
+# German message file for YaST2 (@memory@).
+# Copyright (C) 2005 SUSE Linux Products GmbH.
+# Copyright (C) 2002, 2003 SuSE Linux AG.
+# Copyright (C) 1999, 2000, 2001 SuSE GmbH.
+# Antje Faber <afaber@suse.de>, 2000-2003.
+# Karl Eichwalder <ke@suse.de>, 1999-2003.
+# Martin Lohner <ml@suse.de>, 2000.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: YaST (@memory@)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-05-16 17:10+0200\n"
+"PO-Revision-Date: 2003-02-12 09:27+0100\n"
+"Last-Translator: Karl Eichwalder <ke@suse.de>\n"
+"Language-Team: German <i18n@suse.de>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:147
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "Passwort &bestätigen:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:267
+#, fuzzy
+msgid "_Username:"
+msgstr "Benut&zername:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:269
+#, fuzzy
+msgid "_Domain:"
+msgstr "&Domain:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:271
+#, fuzzy
+msgid "_Password:"
+msgstr "Passwort:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:354
+#, fuzzy
+msgid "Connect _anonymously"
+msgstr "Verbindungen"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:359
+#, fuzzy
+msgid "Connect as _user:"
+msgstr "Verbunden als "
+
+#: ../auth-dialog/gnome-two-password-dialog.c:465
+#, fuzzy
+msgid "_Remember passwords for this session"
+msgstr "&Bestätigen Sie das Passwort:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:467
+#, fuzzy
+msgid "_Save passwords in keyring"
+msgstr "Passwortverschlüsselung festlegen"
+
+#: ../auth-dialog/main.c:161
+#, c-format
+msgid "You need to authenticate to access the Virtual Private Network '%s'."
+msgstr ""
+
+#: ../auth-dialog/main.c:162
+#, fuzzy
+msgid "Authenticate VPN"
+msgstr "Authentifizierung"
+
+#: ../auth-dialog/main.c:169
+#, fuzzy
+msgid "_Group Password:"
+msgstr "Passwort:"
+
+#: ../nm-vpnc.desktop.in.h:1
+msgid "Add, Remove, and Edit VPN Connections"
+msgstr ""
+
+#: ../nm-vpnc.desktop.in.h:2
+#, fuzzy
+msgid "VPN Connection Manager (vpnc)"
+msgstr "Verbindungsverwaltung"
+
+#: ../properties/nm-vpnc.c:83
+msgid "Compatible Cisco VPN client (vpnc)"
+msgstr ""
+
+#: ../properties/nm-vpnc.c:447
+#, fuzzy
+msgid "The following vpnc VPN connection will be created:"
+msgstr "Folgende Scanner werden deaktiviert:"
+
+#: ../properties/nm-vpnc.c:449
+#, fuzzy, c-format
+msgid "Name:  %s"
+msgstr "&Name:"
+
+#: ../properties/nm-vpnc.c:452
+#, fuzzy, c-format
+msgid "Gateway:  %s"
+msgstr "Gateway: %1"
+
+#: ../properties/nm-vpnc.c:454
+#, fuzzy, c-format
+msgid "Group Name:  %s"
+msgstr "Name der Gruppe:"
+
+#: ../properties/nm-vpnc.c:458
+#, fuzzy, c-format
+msgid "Username:  %s"
+msgstr "Benutzername: %1"
+
+#: ../properties/nm-vpnc.c:463
+#, fuzzy, c-format
+msgid "Domain:  %s"
+msgstr "&Domain:"
+
+#: ../properties/nm-vpnc.c:468
+#, fuzzy, c-format
+msgid "Routes:  %s"
+msgstr "Routen: %1"
+
+#: ../properties/nm-vpnc.c:472
+msgid "The connection details can be changed using the \"Edit\" button."
+msgstr ""
+
+#: ../properties/nm-vpnc.c:548
+#, fuzzy
+msgid "TCP tunneling not supported"
+msgstr "Zurzeit nicht unterstützt."
+
+#: ../properties/nm-vpnc.c:550
+#, c-format
+msgid ""
+"The VPN settings file '%s' specifies that VPN traffic should be tunneled "
+"through TCP which is currently not supported in the vpnc software.\n"
+"\n"
+"The connection can still be created, with TCP tunneling disabled, however it "
+"may not work as expected."
+msgstr ""
+
+#: ../properties/nm-vpnc.c:574
+#, fuzzy
+msgid "Cannot import settings"
+msgstr "Einstellungen können nicht geschrieben werden."
+
+#: ../properties/nm-vpnc.c:576
+#, fuzzy, c-format
+msgid "The VPN settings file '%s' does not contain valid data."
+msgstr "Die angegebene Datei enthält keinen TSIG-Schlüssel."
+
+#: ../properties/nm-vpnc.c:593
+#, fuzzy
+msgid "Select file to import"
+msgstr "Wählen Sie eine zu ladende Datei."
+
+#. printf ("in impl_export\n");
+#: ../properties/nm-vpnc.c:748
+msgid "Save as..."
+msgstr "Speichern unter..."
+
+#: ../properties/nm-vpnc.c:778
+#, fuzzy, c-format
+msgid "A file named \"%s\" already exists."
+msgstr "Ein Host mit dem Namen %1 ist bereits vorhanden."
+
+#: ../properties/nm-vpnc.c:781
+#, fuzzy
+msgid "Do you want to replace it with the one you are saving?"
+msgstr ""
+"Möchten Sie Ihre Einstellungen\n"
+"wirklich rückgängig machen?"
+
+#: ../properties/nm-vpnc-dialog.glade.h:1
+#, fuzzy
+msgid "<b>Connection Name</b>"
+msgstr "<b>Beschreibung:</b>"
+
+#: ../properties/nm-vpnc-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Required Information</b>"
+msgstr "<p><b>Support-Informationen</b></p>\n"
+
+#: ../properties/nm-vpnc-dialog.glade.h:3
+msgid "<i>example: 172.16.0.0/16 10.11.12.0/24</i>"
+msgstr ""
+
+#: ../properties/nm-vpnc-dialog.glade.h:4
+#, fuzzy
+msgid "G_roup Name:"
+msgstr "Name der Gruppe:"
+
+#: ../properties/nm-vpnc-dialog.glade.h:5
+#, fuzzy
+msgid "O_ptional Information"
+msgstr "Optionale Informationen"
+
+#: ../properties/nm-vpnc-dialog.glade.h:6
+#, fuzzy
+msgid "Override _user name"
+msgstr "Oder &Benutzernamen eingeben:"
+
+#: ../properties/nm-vpnc-dialog.glade.h:7
+msgid ""
+"Please enter the information provided by your system administrator below. Do "
+"not enter your password here as you will be prompted when connecting."
+msgstr ""
+
+#: ../properties/nm-vpnc-dialog.glade.h:8
+#, fuzzy
+msgid "Use _domain for authentication"
+msgstr "Benutzerauthentifizierung"
+
+#: ../properties/nm-vpnc-dialog.glade.h:9
+#, fuzzy
+msgid "_Gateway:"
+msgstr "Gateway"
+
+#: ../properties/nm-vpnc-dialog.glade.h:10
+#, fuzzy
+msgid "_Import Saved Configuration..."
+msgstr "&Serverkonfiguration..."
+
+#: ../properties/nm-vpnc-dialog.glade.h:11
+msgid ""
+"_Name used to identify the connection to the private network, e.g. \"Campus "
+"VPN\" or \"Corporate Network\""
+msgstr ""
+
+#: ../properties/nm-vpnc-dialog.glade.h:12
+msgid "_Only use VPN connection for these addresses"
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:116
+msgid ""
+"The VPN login failed because the user name and password were not accepted."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:118
+msgid "The VPN login failed because the VPN program could not be started."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:120
+msgid ""
+"The VPN login failed because the VPN program could not connect to the VPN "
+"server."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:122
+msgid ""
+"The VPN login failed because the VPN configuration options were invalid."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:124
+msgid ""
+"The VPN login failed because the VPN program received an invalid "
+"configuration from the VPN server."
+msgstr ""
diff --git a/vpn-daemons/vpnc/po/es.po b/vpn-daemons/vpnc/po/es.po
new file mode 100644
index 0000000000..195cf4753b
--- /dev/null
+++ b/vpn-daemons/vpnc/po/es.po
@@ -0,0 +1,289 @@
+# Spanish message file for YaST2 (@memory@).
+# Copyright (C) 2005 SUSE Linux Products GmbH.
+# Copyright (C) 2002, 2003 SuSE Linux AG.
+# Copyright (C) 1999, 2000, 2001 SuSE GmbH.
+# Ibán josé García Castillo <Iban.Garcia@alufis35.uv.es>, 2000.
+# Javier Moreno <javier.moreno@alufis35.uv.es>, 2000.
+# Jordi Jaen Pallares <jordi@suse.de>, 1999, 2000, 2001.
+# Pablo Iranzo Gómez <Pablo.Iranzo@uv.es>, 2000.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: YaST (@memory@)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-05-16 17:10+0200\n"
+"PO-Revision-Date: 2003-02-12 10:23+0100\n"
+"Last-Translator: Pablo Iranzo Gómez <Pablo.Iranzo@uv.es>\n"
+"Language-Team: Spanish <i18n@suse.de>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:147
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "V&erificar contraseña:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:267
+#, fuzzy
+msgid "_Username:"
+msgstr "Nombre de &usuario:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:269
+#, fuzzy
+msgid "_Domain:"
+msgstr "&Dominio:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:271
+#, fuzzy
+msgid "_Password:"
+msgstr "Contraseña:"
+
+# include/printconf/dialogs.ycp:150
+#: ../auth-dialog/gnome-two-password-dialog.c:354
+#, fuzzy
+msgid "Connect _anonymously"
+msgstr "Conexiones"
+
+# include/scanner/scanner_overview.ycp:85
+# include/scanner/scanner_overview.ycp:85
+# include/scanner/scanner_overview.ycp:85
+#: ../auth-dialog/gnome-two-password-dialog.c:359
+#, fuzzy
+msgid "Connect as _user:"
+msgstr "Conectado como"
+
+# include/partitioning/custom_part_dialogs.ycp:67
+# include/partitioning/custom_part_dialogs.ycp:67
+# include/partitioning/custom_part_dialogs.ycp:67 include/partitioning/custom_part_dialogs.ycp:197
+# 
+#: ../auth-dialog/gnome-two-password-dialog.c:465
+#, fuzzy
+msgid "_Remember passwords for this session"
+msgstr ""
+"Vuelva a introducir la contraseña para \n"
+"&verificarla:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:467
+#, fuzzy
+msgid "_Save passwords in keyring"
+msgstr "Definir codificación de la contraseña"
+
+#: ../auth-dialog/main.c:161
+#, c-format
+msgid "You need to authenticate to access the Virtual Private Network '%s'."
+msgstr ""
+
+#: ../auth-dialog/main.c:162
+#, fuzzy
+msgid "Authenticate VPN"
+msgstr "Autentificación"
+
+#: ../auth-dialog/main.c:169
+#, fuzzy
+msgid "_Group Password:"
+msgstr "Contraseña:"
+
+#: ../nm-vpnc.desktop.in.h:1
+msgid "Add, Remove, and Edit VPN Connections"
+msgstr ""
+
+# include/network/modem/dialogs.ycp:400
+#: ../nm-vpnc.desktop.in.h:2
+#, fuzzy
+msgid "VPN Connection Manager (vpnc)"
+msgstr "Connection Management"
+
+#: ../properties/nm-vpnc.c:83
+msgid "Compatible Cisco VPN client (vpnc)"
+msgstr ""
+
+#
+# include/printconf/dialogs.ycp:1787
+#: ../properties/nm-vpnc.c:447
+#, fuzzy
+msgid "The following vpnc VPN connection will be created:"
+msgstr "Los siguientes escáneres se desactivarán:"
+
+#: ../properties/nm-vpnc.c:449
+#, fuzzy, c-format
+msgid "Name:  %s"
+msgstr "No&mbre:"
+
+#: ../properties/nm-vpnc.c:452
+#, fuzzy, c-format
+msgid "Gateway:  %s"
+msgstr "Pasarela: %1"
+
+# clients/lan_dns.ycp:280
+# clients/lan_dns.ycp:269
+# include/users/ui.ycp:1021
+#: ../properties/nm-vpnc.c:454
+#, fuzzy, c-format
+msgid "Group Name:  %s"
+msgstr "Nombre de grupo:"
+
+# 
+# include/network/providers.ycp:498 include/network/providers.ycp:681
+#: ../properties/nm-vpnc.c:458
+#, fuzzy, c-format
+msgid "Username:  %s"
+msgstr "Nombre de usuario: %1"
+
+#: ../properties/nm-vpnc.c:463
+#, fuzzy, c-format
+msgid "Domain:  %s"
+msgstr "&Dominio:"
+
+#: ../properties/nm-vpnc.c:468
+#, fuzzy, c-format
+msgid "Routes:  %s"
+msgstr "Rutas: %1"
+
+#: ../properties/nm-vpnc.c:472
+msgid "The connection details can be changed using the \"Edit\" button."
+msgstr ""
+
+#: ../properties/nm-vpnc.c:548
+#, fuzzy
+msgid "TCP tunneling not supported"
+msgstr "No es compatible actualmente."
+
+#: ../properties/nm-vpnc.c:550
+#, c-format
+msgid ""
+"The VPN settings file '%s' specifies that VPN traffic should be tunneled "
+"through TCP which is currently not supported in the vpnc software.\n"
+"\n"
+"The connection can still be created, with TCP tunneling disabled, however it "
+"may not work as expected."
+msgstr ""
+
+#: ../properties/nm-vpnc.c:574
+#, fuzzy
+msgid "Cannot import settings"
+msgstr "No es posible escribir la configuración"
+
+#: ../properties/nm-vpnc.c:576
+#, fuzzy, c-format
+msgid "The VPN settings file '%s' does not contain valid data."
+msgstr "El archivo especificado no contiene ninguna clave TSIG."
+
+#: ../properties/nm-vpnc.c:593
+#, fuzzy
+msgid "Select file to import"
+msgstr "Seleccione el archivo que desea cargar."
+
+#. printf ("in impl_export\n");
+#: ../properties/nm-vpnc.c:748
+msgid "Save as..."
+msgstr "Guardar como..."
+
+#: ../properties/nm-vpnc.c:778
+#, fuzzy, c-format
+msgid "A file named \"%s\" already exists."
+msgstr "Ya existe un host llamado %1."
+
+# clients/inst_sw_select.ycp:360
+# clients/inst_sw_select.ycp:436
+# 
+#: ../properties/nm-vpnc.c:781
+#, fuzzy
+msgid "Do you want to replace it with the one you are saving?"
+msgstr "¿Desea realmente reiniciar la selección?"
+
+#: ../properties/nm-vpnc-dialog.glade.h:1
+#, fuzzy
+msgid "<b>Connection Name</b>"
+msgstr "<b>Descripción:</b>"
+
+# clients/support_question.ycp:110
+# clients/support_question.ycp:118
+# clients/support_question.ycp:121
+#: ../properties/nm-vpnc-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Required Information</b>"
+msgstr "<p><b>Información de asistencia</b></p>\n"
+
+#: ../properties/nm-vpnc-dialog.glade.h:3
+msgid "<i>example: 172.16.0.0/16 10.11.12.0/24</i>"
+msgstr ""
+
+# clients/lan_dns.ycp:280
+# clients/lan_dns.ycp:269
+# include/users/ui.ycp:1021
+#: ../properties/nm-vpnc-dialog.glade.h:4
+#, fuzzy
+msgid "G_roup Name:"
+msgstr "Nombre de grupo:"
+
+# clients/online_update_details.ycp:113
+#: ../properties/nm-vpnc-dialog.glade.h:5
+#, fuzzy
+msgid "O_ptional Information"
+msgstr "Información opcional"
+
+# include/cups/ui.ycp:1325
+# include/cups/ui.ycp:1060
+#: ../properties/nm-vpnc-dialog.glade.h:6
+#, fuzzy
+msgid "Override _user name"
+msgstr "O introducir nombre de &usuario:"
+
+#: ../properties/nm-vpnc-dialog.glade.h:7
+msgid ""
+"Please enter the information provided by your system administrator below. Do "
+"not enter your password here as you will be prompted when connecting."
+msgstr ""
+
+#: ../properties/nm-vpnc-dialog.glade.h:8
+#, fuzzy
+msgid "Use _domain for authentication"
+msgstr "Autentificación de usuarios"
+
+#: ../properties/nm-vpnc-dialog.glade.h:9
+#, fuzzy
+msgid "_Gateway:"
+msgstr "Pasarela"
+
+#: ../properties/nm-vpnc-dialog.glade.h:10
+#, fuzzy
+msgid "_Import Saved Configuration..."
+msgstr "Configuración del &servidor..."
+
+#: ../properties/nm-vpnc-dialog.glade.h:11
+msgid ""
+"_Name used to identify the connection to the private network, e.g. \"Campus "
+"VPN\" or \"Corporate Network\""
+msgstr ""
+
+#: ../properties/nm-vpnc-dialog.glade.h:12
+msgid "_Only use VPN connection for these addresses"
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:116
+msgid ""
+"The VPN login failed because the user name and password were not accepted."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:118
+msgid "The VPN login failed because the VPN program could not be started."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:120
+msgid ""
+"The VPN login failed because the VPN program could not connect to the VPN "
+"server."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:122
+msgid ""
+"The VPN login failed because the VPN configuration options were invalid."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:124
+msgid ""
+"The VPN login failed because the VPN program received an invalid "
+"configuration from the VPN server."
+msgstr ""
diff --git a/vpn-daemons/vpnc/po/fi.po b/vpn-daemons/vpnc/po/fi.po
new file mode 100644
index 0000000000..8b1d4491c8
--- /dev/null
+++ b/vpn-daemons/vpnc/po/fi.po
@@ -0,0 +1,235 @@
+# translation of NetworkManager-vpnc.po to
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Jyri Palokangas <jmp@netti.fi>, 2006.
+msgid ""
+msgstr ""
+"Project-Id-Version: NetworkManager-vpnc\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-05-16 17:10+0200\n"
+"PO-Revision-Date: 2006-06-02 10:35+0300\n"
+"Last-Translator: Jyri Palokangas <jmp@netti.fi>\n"
+"Language-Team:  <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.2\n"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:147
+msgid "_Secondary Password:"
+msgstr "Toisijainen _salasana:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:267
+msgid "_Username:"
+msgstr "Käyttäjänim_i:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:269
+msgid "_Domain:"
+msgstr "_Toimialue:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:271
+msgid "_Password:"
+msgstr "S_alasana:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:354
+msgid "Connect _anonymously"
+msgstr "Yhdistä nimettö_mästi"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:359
+msgid "Connect as _user:"
+msgstr "_Yhdistä käyttäjänä:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:465
+msgid "_Remember passwords for this session"
+msgstr "_Muista salasana tämän istunnon ajan"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:467
+msgid "_Save passwords in keyring"
+msgstr "Tall_enna salasana avainrenkaaseen"
+
+#: ../auth-dialog/main.c:161
+#, c-format
+msgid "You need to authenticate to access the Virtual Private Network '%s'."
+msgstr "Sisun täytyy tunnistautua saadaksesi pääsy virtuaaliseen näennäisverkkoon '%s'."
+
+#: ../auth-dialog/main.c:162
+msgid "Authenticate VPN"
+msgstr "VPN tunnistautuminen"
+
+#: ../auth-dialog/main.c:169
+msgid "_Group Password:"
+msgstr "_Ryhmän salasana:"
+
+#: ../nm-vpnc.desktop.in.h:1
+msgid "Add, Remove, and Edit VPN Connections"
+msgstr "Lisää, poista ja muokkaa VPN yhteyksiä"
+
+#: ../nm-vpnc.desktop.in.h:2
+msgid "VPN Connection Manager (vpnc)"
+msgstr "VPN yhteyshallinta (vpnc)"
+
+#: ../properties/nm-vpnc.c:83
+msgid "Compatible Cisco VPN client (vpnc)"
+msgstr "Cisco VPN yhteensopiva asiakas (vpnc)"
+
+#: ../properties/nm-vpnc.c:447
+msgid "The following vpnc VPN connection will be created:"
+msgstr "Seuraava vpnc VPN yhteys luodaan:"
+
+#: ../properties/nm-vpnc.c:449
+#, c-format
+msgid "Name:  %s"
+msgstr "Nimi:  %s"
+
+#: ../properties/nm-vpnc.c:452
+#, c-format
+msgid "Gateway:  %s"
+msgstr "Yhdyskäytävä:  %s"
+
+#: ../properties/nm-vpnc.c:454
+#, c-format
+msgid "Group Name:  %s"
+msgstr "Ryhmän nimi:  %s"
+
+#: ../properties/nm-vpnc.c:458
+#, c-format
+msgid "Username:  %s"
+msgstr "Käyttäjänimi:  %s"
+
+#: ../properties/nm-vpnc.c:463
+#, c-format
+msgid "Domain:  %s"
+msgstr "Toimialue:  %s"
+
+#: ../properties/nm-vpnc.c:468
+#, c-format
+msgid "Routes:  %s"
+msgstr "Reitit:  %s"
+
+#: ../properties/nm-vpnc.c:472
+msgid "The connection details can be changed using the \"Edit\" button."
+msgstr "Yhteydenyksityiskohtia voi muuttaa käyttämällä \"Muokkaa\" painiketta."
+
+#: ../properties/nm-vpnc.c:548
+msgid "TCP tunneling not supported"
+msgstr "TCP tunnelointi ei ole tuettuna"
+
+#: ../properties/nm-vpnc.c:550
+#, c-format
+msgid ""
+"The VPN settings file '%s' specifies that VPN traffic should be tunneled "
+"through TCP which is currently not supported in the vpnc software.\n"
+"\n"
+"The connection can still be created, with TCP tunneling disabled, however it "
+"may not work as expected."
+msgstr ""
+"VPN asetustiedosto '%s' määrittää että VPN liikenne tulisi tunneloida TCP:n läpi, vpnc ohjelmisto ei tue tätä tällä hetkellä.\n"
+"\n"
+"Yhteys voidaan silti luoda, TCP tunnelointi poistettuna käytöstä, voi olla että yhteys ei toimi kuten odotetaan."
+
+#: ../properties/nm-vpnc.c:574
+msgid "Cannot import settings"
+msgstr "Asetusten tuonti ei onnistu"
+
+#: ../properties/nm-vpnc.c:576
+#, c-format
+msgid "The VPN settings file '%s' does not contain valid data."
+msgstr "VPN asetustiedosto '%s' ei sisällä kelpoa dataa."
+
+#: ../properties/nm-vpnc.c:593
+msgid "Select file to import"
+msgstr "Valitse tuotava tiedosto"
+
+#. printf ("in impl_export\n");
+#: ../properties/nm-vpnc.c:748
+msgid "Save as..."
+msgstr "Tallenna nimellä..."
+
+#: ../properties/nm-vpnc.c:778
+#, c-format
+msgid "A file named \"%s\" already exists."
+msgstr "Tiedosto nimellä \"%s\" on jo olemassa."
+
+#: ../properties/nm-vpnc.c:781
+msgid "Do you want to replace it with the one you are saving?"
+msgstr "Haluatko korvata se tiedostolla jota olet tallentamassa?"
+
+#: ../properties/nm-vpnc-dialog.glade.h:1
+msgid "<b>Connection Name</b>"
+msgstr "<b>Yhteyden nimi</b>"
+
+#: ../properties/nm-vpnc-dialog.glade.h:2
+msgid "<b>Required Information</b>"
+msgstr "<b>Vaaditut tiedot</b>"
+
+#: ../properties/nm-vpnc-dialog.glade.h:3
+msgid "<i>example: 172.16.0.0/16 10.11.12.0/24</i>"
+msgstr "<i>esimerkiksi: 172.16.0.0/16 10.11.12.0/24</i>"
+
+#: ../properties/nm-vpnc-dialog.glade.h:4
+msgid "G_roup Name:"
+msgstr "_Ryhmän nimi:"
+
+#: ../properties/nm-vpnc-dialog.glade.h:5
+msgid "O_ptional Information"
+msgstr "Valinnaisia tiet_oja"
+
+#: ../properties/nm-vpnc-dialog.glade.h:6
+msgid "Override _user name"
+msgstr "Ohita käyttäjät_unnus"
+
+#: ../properties/nm-vpnc-dialog.glade.h:7
+msgid ""
+"Please enter the information provided by your system administrator below. Do "
+"not enter your password here as you will be prompted when connecting."
+msgstr "Anna järjestelmänvalvojalta saamasi tiedot tähän. Älä anna salasanaasi tässä, se kysytään kun otat yhteyden."
+
+#: ../properties/nm-vpnc-dialog.glade.h:8
+msgid "Use _domain for authentication"
+msgstr "Käytä _toimialuetta tunnistautumiseen"
+
+#: ../properties/nm-vpnc-dialog.glade.h:9
+msgid "_Gateway:"
+msgstr "_Yhdyskäytävä:"
+
+#: ../properties/nm-vpnc-dialog.glade.h:10
+msgid "_Import Saved Configuration..."
+msgstr "Tuo tallennettu määr_itys..."
+
+#: ../properties/nm-vpnc-dialog.glade.h:11
+msgid ""
+"_Name used to identify the connection to the private network, e.g. \"Campus "
+"VPN\" or \"Corporate Network\""
+msgstr ""
+"_Nimi jota käytetään yhteyden tunnistukseen yksityisessä verkossa, esim. \"Kampus "
+"VPN\" tai \"Yhtiön verkko\""
+
+#: ../properties/nm-vpnc-dialog.glade.h:12
+msgid "_Only use VPN connection for these addresses"
+msgstr "Käytä vain VPN yhteyttä näihin _osoitteisiin"
+
+#: ../src/nm-vpnc-service.c:116
+msgid "The VPN login failed because the user name and password were not accepted."
+msgstr "VPN kirjautuminen epäonnistui koska käyttäjätunnusta tai salasanaa ei hyväksytty."
+
+#: ../src/nm-vpnc-service.c:118
+msgid "The VPN login failed because the VPN program could not be started."
+msgstr "VPN kirjautuminen epäonnistui koska VPN ohjelmaa ei onnistuttu käynnistämään."
+
+#: ../src/nm-vpnc-service.c:120
+msgid ""
+"The VPN login failed because the VPN program could not connect to the VPN "
+"server."
+msgstr "VPN kirjautuminen epäonnistui koska VPN ohjelma ei saanut yhteyttä VPN-palvelimeen."
+
+#: ../src/nm-vpnc-service.c:122
+msgid "The VPN login failed because the VPN configuration options were invalid."
+msgstr "VPN kirjautuminen epäonnistui koska VPN määritysvalinnat olivat virheelliset."
+
+#: ../src/nm-vpnc-service.c:124
+msgid ""
+"The VPN login failed because the VPN program received an invalid "
+"configuration from the VPN server."
+msgstr "VPN kirjautuminen epäonnistui koska VPN ohjelma vastaanotti virheellisen määrityksen VPN-palvelimelta."
+
diff --git a/vpn-daemons/vpnc/po/fr.po b/vpn-daemons/vpnc/po/fr.po
new file mode 100644
index 0000000000..82d0b62940
--- /dev/null
+++ b/vpn-daemons/vpnc/po/fr.po
@@ -0,0 +1,289 @@
+# French message file for YaST2 (@memory@).
+# Copyright (C) 2005 SUSE Linux Products GmbH.
+# Copyright (C) 2002, 2003 SuSE Linux AG.
+# Copyright (C) 2000, 2001 SuSE GmbH.
+# Patricia Vaz <patricia@suse.de>, 2003.
+# Francoise Lermen <flermen@suse.de>, 2000, 2001, 2002.
+# Karine Nguyen <karine@suse.de>, 2001.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: YaST (@memory@)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-05-16 17:10+0200\n"
+"PO-Revision-Date: 2003-02-12 09:50+0100\n"
+"Last-Translator: Patricia Vaz <patricia@suse.de>\n"
+"Language-Team: French <i18n@suse.de>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+# TLABEL users_2002_01_04_0147__49
+#: ../auth-dialog/gnome-two-password-dialog.c:147
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "&Vérifier le mot de passe :"
+
+# TLABEL packages_2002_03_14_2340__5
+#: ../auth-dialog/gnome-two-password-dialog.c:267
+#, fuzzy
+msgid "_Username:"
+msgstr "Nom d'&utilisateur :"
+
+# TLABEL autoinst_2002_08_07_0216__305
+#: ../auth-dialog/gnome-two-password-dialog.c:269
+#, fuzzy
+msgid "_Domain:"
+msgstr "&Domaine :"
+
+# TLABEL online_update_2002_03_14_2340__10
+#: ../auth-dialog/gnome-two-password-dialog.c:271
+#, fuzzy
+msgid "_Password:"
+msgstr "Mot de passe :"
+
+# TLABEL printconf_2002_01_04_0147__63
+#: ../auth-dialog/gnome-two-password-dialog.c:354
+#, fuzzy
+msgid "Connect _anonymously"
+msgstr "Connexions"
+
+# TLABEL scanner_2002_01_04_0147__22
+#: ../auth-dialog/gnome-two-password-dialog.c:359
+#, fuzzy
+msgid "Connect as _user:"
+msgstr "Connecté en tant que"
+
+# TLABEL partitioning_2002_01_04_0147__215
+#: ../auth-dialog/gnome-two-password-dialog.c:465
+#, fuzzy
+msgid "_Remember passwords for this session"
+msgstr ""
+"Entrez à nouveau votre mot de passe\n"
+"pour &vérification :"
+
+# TLABEL user_2002_03_14_2340__5
+#: ../auth-dialog/gnome-two-password-dialog.c:467
+#, fuzzy
+msgid "_Save passwords in keyring"
+msgstr "Définir le chiffrement du mot de passe"
+
+#: ../auth-dialog/main.c:161
+#, c-format
+msgid "You need to authenticate to access the Virtual Private Network '%s'."
+msgstr ""
+
+# TLABEL autoinst_2002_08_07_0216__146
+#: ../auth-dialog/main.c:162
+#, fuzzy
+msgid "Authenticate VPN"
+msgstr "Authentification"
+
+# TLABEL online_update_2002_03_14_2340__10
+#: ../auth-dialog/main.c:169
+#, fuzzy
+msgid "_Group Password:"
+msgstr "Mot de passe :"
+
+#: ../nm-vpnc.desktop.in.h:1
+msgid "Add, Remove, and Edit VPN Connections"
+msgstr ""
+
+# TLABEL lan_2002_01_04_0147__200
+#: ../nm-vpnc.desktop.in.h:2
+#, fuzzy
+msgid "VPN Connection Manager (vpnc)"
+msgstr "Connection Management"
+
+#: ../properties/nm-vpnc.c:83
+msgid "Compatible Cisco VPN client (vpnc)"
+msgstr ""
+
+# TLABEL printer_2002_08_07_0216__75
+#: ../properties/nm-vpnc.c:447
+#, fuzzy
+msgid "The following vpnc VPN connection will be created:"
+msgstr "Les scanneurs suivants seront désactivés :"
+
+# TLABEL cups_2002_03_14_2340__13
+#: ../properties/nm-vpnc.c:449
+#, fuzzy, c-format
+msgid "Name:  %s"
+msgstr "&Nom:"
+
+# TLABEL autoinst_2002_08_07_0216__316
+#: ../properties/nm-vpnc.c:452
+#, fuzzy, c-format
+msgid "Gateway:  %s"
+msgstr "Passerelle : %1"
+
+# TLABEL users_2002_01_04_0147__77
+#: ../properties/nm-vpnc.c:454
+#, fuzzy, c-format
+msgid "Group Name:  %s"
+msgstr "Nom du groupe :"
+
+# TLABEL network_2002_03_14_2340__32
+#: ../properties/nm-vpnc.c:458
+#, fuzzy, c-format
+msgid "Username:  %s"
+msgstr "Nom d'utilisateur : %1"
+
+# TLABEL autoinst_2002_08_07_0216__305
+#: ../properties/nm-vpnc.c:463
+#, fuzzy, c-format
+msgid "Domain:  %s"
+msgstr "&Domaine :"
+
+#: ../properties/nm-vpnc.c:468
+#, fuzzy, c-format
+msgid "Routes:  %s"
+msgstr "Routes: %1"
+
+#: ../properties/nm-vpnc.c:472
+msgid "The connection details can be changed using the \"Edit\" button."
+msgstr ""
+
+#: ../properties/nm-vpnc.c:548
+#, fuzzy
+msgid "TCP tunneling not supported"
+msgstr "Non pris en charge pour le moment."
+
+#: ../properties/nm-vpnc.c:550
+#, c-format
+msgid ""
+"The VPN settings file '%s' specifies that VPN traffic should be tunneled "
+"through TCP which is currently not supported in the vpnc software.\n"
+"\n"
+"The connection can still be created, with TCP tunneling disabled, however it "
+"may not work as expected."
+msgstr ""
+
+# TLABEL profile-manager_2002_08_07_0216__9
+#: ../properties/nm-vpnc.c:574
+#, fuzzy
+msgid "Cannot import settings"
+msgstr "Impossible d'enregistrer les paramètres !"
+
+#: ../properties/nm-vpnc.c:576
+#, fuzzy, c-format
+msgid "The VPN settings file '%s' does not contain valid data."
+msgstr "Le fichier spécifié ne contient pas de clé TSIG."
+
+# TLABEL profile-manager_2002_08_07_0216__58
+#: ../properties/nm-vpnc.c:593
+#, fuzzy
+msgid "Select file to import"
+msgstr "Sélectionnez le fichier à copier."
+
+# TLABEL restore_2002_08_07_0216__41
+#. printf ("in impl_export\n");
+#: ../properties/nm-vpnc.c:748
+msgid "Save as..."
+msgstr "Enregistrer sous..."
+
+# TLABEL network_2002_03_14_2340__39
+#: ../properties/nm-vpnc.c:778
+#, fuzzy, c-format
+msgid "A file named \"%s\" already exists."
+msgstr "Un hôte nommé %1 existe déjà."
+
+# TLABEL packages_2002_03_14_2340__75
+#: ../properties/nm-vpnc.c:781
+#, fuzzy
+msgid "Do you want to replace it with the one you are saving?"
+msgstr "Voulez-vous vraiment rétablir les paramètres initiaux ?"
+
+# TLABEL packages_2002_01_04_0147__194
+#: ../properties/nm-vpnc-dialog.glade.h:1
+#, fuzzy
+msgid "<b>Connection Name</b>"
+msgstr "<b>Description : </b>"
+
+# TLABEL support_2002_01_04_0147__23
+#: ../properties/nm-vpnc-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Required Information</b>"
+msgstr "<p><b>Informations relatives à l'assistance technique</b></p>\n"
+
+#: ../properties/nm-vpnc-dialog.glade.h:3
+msgid "<i>example: 172.16.0.0/16 10.11.12.0/24</i>"
+msgstr ""
+
+# TLABEL users_2002_01_04_0147__77
+#: ../properties/nm-vpnc-dialog.glade.h:4
+#, fuzzy
+msgid "G_roup Name:"
+msgstr "Nom du groupe :"
+
+# TLABEL online_update_2002_01_04_0147__48
+#: ../properties/nm-vpnc-dialog.glade.h:5
+#, fuzzy
+msgid "O_ptional Information"
+msgstr "Informations facultatives"
+
+# TLABEL printer_2002_08_07_0216__230
+#: ../properties/nm-vpnc-dialog.glade.h:6
+#, fuzzy
+msgid "Override _user name"
+msgstr "Ou taper un nom d'&utilisateur :"
+
+#: ../properties/nm-vpnc-dialog.glade.h:7
+msgid ""
+"Please enter the information provided by your system administrator below. Do "
+"not enter your password here as you will be prompted when connecting."
+msgstr ""
+
+# TLABEL autoinst_2002_08_07_0216__146
+#: ../properties/nm-vpnc-dialog.glade.h:8
+#, fuzzy
+msgid "Use _domain for authentication"
+msgstr "Authentification de l'utilisateur"
+
+# TLABEL autoinst_2002_08_07_0216__316
+#: ../properties/nm-vpnc-dialog.glade.h:9
+#, fuzzy
+msgid "_Gateway:"
+msgstr "Passerelle"
+
+#: ../properties/nm-vpnc-dialog.glade.h:10
+#, fuzzy
+msgid "_Import Saved Configuration..."
+msgstr "Configuration du &serveur..."
+
+#: ../properties/nm-vpnc-dialog.glade.h:11
+msgid ""
+"_Name used to identify the connection to the private network, e.g. \"Campus "
+"VPN\" or \"Corporate Network\""
+msgstr ""
+
+#: ../properties/nm-vpnc-dialog.glade.h:12
+msgid "_Only use VPN connection for these addresses"
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:116
+msgid ""
+"The VPN login failed because the user name and password were not accepted."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:118
+msgid "The VPN login failed because the VPN program could not be started."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:120
+msgid ""
+"The VPN login failed because the VPN program could not connect to the VPN "
+"server."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:122
+msgid ""
+"The VPN login failed because the VPN configuration options were invalid."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:124
+msgid ""
+"The VPN login failed because the VPN program received an invalid "
+"configuration from the VPN server."
+msgstr ""
diff --git a/vpn-daemons/vpnc/po/hu.po b/vpn-daemons/vpnc/po/hu.po
new file mode 100644
index 0000000000..7e69d96833
--- /dev/null
+++ b/vpn-daemons/vpnc/po/hu.po
@@ -0,0 +1,274 @@
+# Hungarian message File YaST2 (@memory@).
+# Copyright (C) 2005 SUSE Linux Products GmbH.
+# Copyright (C) 2002 SuSE Linux AG.
+# Copyright (C) 2000, 2001 SuSE GmbH.
+# Marcel Hilzinger <hili@suselinux.hu>, 2001.
+# Sári Gábor <saga@tux.hu>, 2000.
+# Steve Varadi <svaradi@usa.com>, 2000.
+# Zoltán Levárdy <pogacsa@programmer.net>, 1999.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: YaST (@memory@)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-05-16 17:10+0200\n"
+"PO-Revision-Date: 2001-10-18 09:42+0200\n"
+"Last-Translator: Marcel Hilzinger <hili@suselinux.hu>\n"
+"Language-Team: Hungarian <i18n@suse.de>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:147
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "Jelszó &ellenőrzése:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:267
+#, fuzzy
+msgid "_Username:"
+msgstr "&Felhasználónév:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:269
+#, fuzzy
+msgid "_Domain:"
+msgstr "&Tartomány:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:271
+#, fuzzy
+msgid "_Password:"
+msgstr "Jelszó:"
+
+# clients/printconf_ask_device.ycp:192
+#: ../auth-dialog/gnome-two-password-dialog.c:354
+#, fuzzy
+msgid "Connect _anonymously"
+msgstr "Kapcsolatok"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:359
+#, fuzzy
+msgid "Connect as _user:"
+msgstr "Csatlakoztatva másképp: "
+
+#: ../auth-dialog/gnome-two-password-dialog.c:465
+#, fuzzy
+msgid "_Remember passwords for this session"
+msgstr "Az ellenőrzéshez adja meg a &jelszót újból:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:467
+#, fuzzy
+msgid "_Save passwords in keyring"
+msgstr "Jelszótitkosítás beállítása"
+
+#: ../auth-dialog/main.c:161
+#, c-format
+msgid "You need to authenticate to access the Virtual Private Network '%s'."
+msgstr ""
+
+# modules/inst_sw_single.ycp:63
+# clients/inst_sw_single.ycp:118
+#: ../auth-dialog/main.c:162
+#, fuzzy
+msgid "Authenticate VPN"
+msgstr "Hitelesítés"
+
+#: ../auth-dialog/main.c:169
+#, fuzzy
+msgid "_Group Password:"
+msgstr "Jelszó:"
+
+#: ../nm-vpnc.desktop.in.h:1
+msgid "Add, Remove, and Edit VPN Connections"
+msgstr ""
+
+# clients/lan_modem.ycp:793
+#: ../nm-vpnc.desktop.in.h:2
+#, fuzzy
+msgid "VPN Connection Manager (vpnc)"
+msgstr "Kapcsolatkezelés"
+
+#: ../properties/nm-vpnc.c:83
+msgid "Compatible Cisco VPN client (vpnc)"
+msgstr ""
+
+#: ../properties/nm-vpnc.c:447
+#, fuzzy
+msgid "The following vpnc VPN connection will be created:"
+msgstr "A következő lapolvasók kerülnek deaktiválásra:"
+
+#: ../properties/nm-vpnc.c:449
+#, fuzzy, c-format
+msgid "Name:  %s"
+msgstr "&Név:"
+
+#: ../properties/nm-vpnc.c:452
+#, fuzzy, c-format
+msgid "Gateway:  %s"
+msgstr "�tjáró: %1"
+
+# /usr/lib/YaST2/clients/lan_dns.ycp:85
+# clients/lan_dns.ycp:269
+#: ../properties/nm-vpnc.c:454
+#, fuzzy, c-format
+msgid "Group Name:  %s"
+msgstr "Csoportnév:"
+
+# /usr/lib/YaST2/clients/lan_dns.ycp:85
+# clients/lan_dns.ycp:269
+#: ../properties/nm-vpnc.c:458
+#, fuzzy, c-format
+msgid "Username:  %s"
+msgstr "Felhasználónév: %1"
+
+#: ../properties/nm-vpnc.c:463
+#, fuzzy, c-format
+msgid "Domain:  %s"
+msgstr "&Tartomány:"
+
+#: ../properties/nm-vpnc.c:468
+#, fuzzy, c-format
+msgid "Routes:  %s"
+msgstr "Útvonalak: %1"
+
+#: ../properties/nm-vpnc.c:472
+msgid "The connection details can be changed using the \"Edit\" button."
+msgstr ""
+
+#: ../properties/nm-vpnc.c:548
+#, fuzzy
+msgid "TCP tunneling not supported"
+msgstr "Jelenleg nem támogatott."
+
+#: ../properties/nm-vpnc.c:550
+#, c-format
+msgid ""
+"The VPN settings file '%s' specifies that VPN traffic should be tunneled "
+"through TCP which is currently not supported in the vpnc software.\n"
+"\n"
+"The connection can still be created, with TCP tunneling disabled, however it "
+"may not work as expected."
+msgstr ""
+
+#: ../properties/nm-vpnc.c:574
+#, fuzzy
+msgid "Cannot import settings"
+msgstr "A beállítások mentése nem sikerült!"
+
+#: ../properties/nm-vpnc.c:576
+#, fuzzy, c-format
+msgid "The VPN settings file '%s' does not contain valid data."
+msgstr "A megadott fájl nem tartalmaz TSIG kulcsot"
+
+#: ../properties/nm-vpnc.c:593
+#, fuzzy
+msgid "Select file to import"
+msgstr "Válassza ki, hogy melyik fájlt szeretné betölteni."
+
+#. printf ("in impl_export\n");
+#: ../properties/nm-vpnc.c:748
+msgid "Save as..."
+msgstr "Mentés másként..."
+
+#: ../properties/nm-vpnc.c:778
+#, fuzzy, c-format
+msgid "A file named \"%s\" already exists."
+msgstr "%1 nevű gép már létezik."
+
+# modules/inst_sw_select.ycp:273
+# /usr/lib/YaST2/clients/inst_sw_select.ycp:380
+# clients/inst_sw_select.ycp:345
+#: ../properties/nm-vpnc.c:781
+#, fuzzy
+msgid "Do you want to replace it with the one you are saving?"
+msgstr "Valóban eldobja részletezett választását?"
+
+#: ../properties/nm-vpnc-dialog.glade.h:1
+#, fuzzy
+msgid "<b>Connection Name</b>"
+msgstr "<b>Leírás:</b>"
+
+#: ../properties/nm-vpnc-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Required Information</b>"
+msgstr "<p><b>Támogatási információ</b></p>\n"
+
+#: ../properties/nm-vpnc-dialog.glade.h:3
+msgid "<i>example: 172.16.0.0/16 10.11.12.0/24</i>"
+msgstr ""
+
+# /usr/lib/YaST2/clients/lan_dns.ycp:85
+# clients/lan_dns.ycp:269
+#: ../properties/nm-vpnc-dialog.glade.h:4
+#, fuzzy
+msgid "G_roup Name:"
+msgstr "Csoportnév:"
+
+#: ../properties/nm-vpnc-dialog.glade.h:5
+#, fuzzy
+msgid "O_ptional Information"
+msgstr "Részletes adatok"
+
+#: ../properties/nm-vpnc-dialog.glade.h:6
+#, fuzzy
+msgid "Override _user name"
+msgstr "Vagy adjon meg egy &felhasználót:"
+
+#: ../properties/nm-vpnc-dialog.glade.h:7
+msgid ""
+"Please enter the information provided by your system administrator below. Do "
+"not enter your password here as you will be prompted when connecting."
+msgstr ""
+
+# modules/inst_sw_single.ycp:63
+# clients/inst_sw_single.ycp:118
+#: ../properties/nm-vpnc-dialog.glade.h:8
+#, fuzzy
+msgid "Use _domain for authentication"
+msgstr "Felhasználók hitelesítése"
+
+#: ../properties/nm-vpnc-dialog.glade.h:9
+#, fuzzy
+msgid "_Gateway:"
+msgstr "�tjáró"
+
+#: ../properties/nm-vpnc-dialog.glade.h:10
+#, fuzzy
+msgid "_Import Saved Configuration..."
+msgstr "Ki&szolgáló beállítások..."
+
+#: ../properties/nm-vpnc-dialog.glade.h:11
+msgid ""
+"_Name used to identify the connection to the private network, e.g. \"Campus "
+"VPN\" or \"Corporate Network\""
+msgstr ""
+
+#: ../properties/nm-vpnc-dialog.glade.h:12
+msgid "_Only use VPN connection for these addresses"
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:116
+msgid ""
+"The VPN login failed because the user name and password were not accepted."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:118
+msgid "The VPN login failed because the VPN program could not be started."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:120
+msgid ""
+"The VPN login failed because the VPN program could not connect to the VPN "
+"server."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:122
+msgid ""
+"The VPN login failed because the VPN configuration options were invalid."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:124
+msgid ""
+"The VPN login failed because the VPN program received an invalid "
+"configuration from the VPN server."
+msgstr ""
diff --git a/vpn-daemons/vpnc/po/it.po b/vpn-daemons/vpnc/po/it.po
new file mode 100644
index 0000000000..a48096a999
--- /dev/null
+++ b/vpn-daemons/vpnc/po/it.po
@@ -0,0 +1,265 @@
+# Italian message file for YaST2 (@memory@).
+# Copyright (C) 2005 SUSE Linux Products GmbH.
+# Copyright (C) 2002 SuSE Linux AG.
+# Copyright (C) 1999, 2000, 2001 SuSE GmbH.
+# Franca Delcarlo <francad@attglobal.net>, 1999, 2000, 2001.
+# Karl Eichwalder <ke@suse.de>, 2000.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: YaST (@memory@)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-05-16 17:10+0200\n"
+"PO-Revision-Date: 2001-07-18 11:04+0200\n"
+"Last-Translator: Franca Delcarlo <francad@attglobal.net>\n"
+"Language-Team: i18n <i18n@suse.de>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+# TLABEL modules/inst_user.ycp:27
+#: ../auth-dialog/gnome-two-password-dialog.c:147
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "V&erifica password:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:267
+#, fuzzy
+msgid "_Username:"
+msgstr "Nome &utente:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:269
+#, fuzzy
+msgid "_Domain:"
+msgstr "&Dominio:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:271
+#, fuzzy
+msgid "_Password:"
+msgstr "Password:"
+
+# TLABEL modules/printconf/printconf_ask_device.ycp:134
+#: ../auth-dialog/gnome-two-password-dialog.c:354
+#, fuzzy
+msgid "Connect _anonymously"
+msgstr "Connessioni"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:359
+#, fuzzy
+msgid "Connect as _user:"
+msgstr " Connesso come "
+
+#: ../auth-dialog/gnome-two-password-dialog.c:465
+#, fuzzy
+msgid "_Remember passwords for this session"
+msgstr "Ripetere la password per una &verifica:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:467
+#, fuzzy
+msgid "_Save passwords in keyring"
+msgstr "Imposta cifratura password"
+
+#: ../auth-dialog/main.c:161
+#, c-format
+msgid "You need to authenticate to access the Virtual Private Network '%s'."
+msgstr ""
+
+#: ../auth-dialog/main.c:162
+#, fuzzy
+msgid "Authenticate VPN"
+msgstr "Autenticazione"
+
+#: ../auth-dialog/main.c:169
+#, fuzzy
+msgid "_Group Password:"
+msgstr "Password:"
+
+#: ../nm-vpnc.desktop.in.h:1
+msgid "Add, Remove, and Edit VPN Connections"
+msgstr ""
+
+#: ../nm-vpnc.desktop.in.h:2
+#, fuzzy
+msgid "VPN Connection Manager (vpnc)"
+msgstr "Amministrazione delle connessioni"
+
+#: ../properties/nm-vpnc.c:83
+msgid "Compatible Cisco VPN client (vpnc)"
+msgstr ""
+
+# TLABEL modules/printconf/printconf.ycp:515
+#: ../properties/nm-vpnc.c:447
+#, fuzzy
+msgid "The following vpnc VPN connection will be created:"
+msgstr "I seguenti scanner verranno disattivati:"
+
+# TLABEL modules/inst_sw_single.ycp:510
+#: ../properties/nm-vpnc.c:449
+#, fuzzy, c-format
+msgid "Name:  %s"
+msgstr "No&me:"
+
+#: ../properties/nm-vpnc.c:452
+#, fuzzy, c-format
+msgid "Gateway:  %s"
+msgstr "Gateway: %1"
+
+# TLABEL modules/lan/lan.ycp:1377
+#: ../properties/nm-vpnc.c:454
+#, fuzzy, c-format
+msgid "Group Name:  %s"
+msgstr "Nome gruppo:"
+
+# TLABEL modules/lan/lan.ycp:1377
+#: ../properties/nm-vpnc.c:458
+#, fuzzy, c-format
+msgid "Username:  %s"
+msgstr "Nome utente: %1"
+
+#: ../properties/nm-vpnc.c:463
+#, fuzzy, c-format
+msgid "Domain:  %s"
+msgstr "&Dominio:"
+
+#: ../properties/nm-vpnc.c:468
+#, fuzzy, c-format
+msgid "Routes:  %s"
+msgstr "Route: %1"
+
+#: ../properties/nm-vpnc.c:472
+msgid "The connection details can be changed using the \"Edit\" button."
+msgstr ""
+
+#: ../properties/nm-vpnc.c:548
+#, fuzzy
+msgid "TCP tunneling not supported"
+msgstr "Attualmente non supportata."
+
+#: ../properties/nm-vpnc.c:550
+#, c-format
+msgid ""
+"The VPN settings file '%s' specifies that VPN traffic should be tunneled "
+"through TCP which is currently not supported in the vpnc software.\n"
+"\n"
+"The connection can still be created, with TCP tunneling disabled, however it "
+"may not work as expected."
+msgstr ""
+
+#: ../properties/nm-vpnc.c:574
+#, fuzzy
+msgid "Cannot import settings"
+msgstr "Impossibile salvare le impostazioni!"
+
+#: ../properties/nm-vpnc.c:576
+#, fuzzy, c-format
+msgid "The VPN settings file '%s' does not contain valid data."
+msgstr "Il file specificato non contiene una chiave TSIG."
+
+#: ../properties/nm-vpnc.c:593
+#, fuzzy
+msgid "Select file to import"
+msgstr "Selezionate un file da caricare."
+
+#. printf ("in impl_export\n");
+#: ../properties/nm-vpnc.c:748
+msgid "Save as..."
+msgstr "Salva come..."
+
+#: ../properties/nm-vpnc.c:778
+#, fuzzy, c-format
+msgid "A file named \"%s\" already exists."
+msgstr "Il nome host %1 esiste già."
+
+# TLABEL modules/inst_sw_select.ycp:376
+#: ../properties/nm-vpnc.c:781
+#, fuzzy
+msgid "Do you want to replace it with the one you are saving?"
+msgstr "Volete davvero azzerare le vostre impostazioni?"
+
+#: ../properties/nm-vpnc-dialog.glade.h:1
+#, fuzzy
+msgid "<b>Connection Name</b>"
+msgstr "<b>Descrizione:</b> "
+
+#: ../properties/nm-vpnc-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Required Information</b>"
+msgstr "<p><b>Informazioni sul Supporto tecnico</b></p>\n"
+
+#: ../properties/nm-vpnc-dialog.glade.h:3
+msgid "<i>example: 172.16.0.0/16 10.11.12.0/24</i>"
+msgstr ""
+
+# TLABEL modules/lan/lan.ycp:1377
+#: ../properties/nm-vpnc-dialog.glade.h:4
+#, fuzzy
+msgid "G_roup Name:"
+msgstr "Nome gruppo:"
+
+#: ../properties/nm-vpnc-dialog.glade.h:5
+#, fuzzy
+msgid "O_ptional Information"
+msgstr "Informazioni opzionali"
+
+#: ../properties/nm-vpnc-dialog.glade.h:6
+#, fuzzy
+msgid "Override _user name"
+msgstr "Oppure immettete il &nome utente:"
+
+#: ../properties/nm-vpnc-dialog.glade.h:7
+msgid ""
+"Please enter the information provided by your system administrator below. Do "
+"not enter your password here as you will be prompted when connecting."
+msgstr ""
+
+#: ../properties/nm-vpnc-dialog.glade.h:8
+#, fuzzy
+msgid "Use _domain for authentication"
+msgstr "Autenticazione utenti"
+
+#: ../properties/nm-vpnc-dialog.glade.h:9
+#, fuzzy
+msgid "_Gateway:"
+msgstr "Gateway"
+
+#: ../properties/nm-vpnc-dialog.glade.h:10
+#, fuzzy
+msgid "_Import Saved Configuration..."
+msgstr "Configurazione &server..."
+
+#: ../properties/nm-vpnc-dialog.glade.h:11
+msgid ""
+"_Name used to identify the connection to the private network, e.g. \"Campus "
+"VPN\" or \"Corporate Network\""
+msgstr ""
+
+#: ../properties/nm-vpnc-dialog.glade.h:12
+msgid "_Only use VPN connection for these addresses"
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:116
+msgid ""
+"The VPN login failed because the user name and password were not accepted."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:118
+msgid "The VPN login failed because the VPN program could not be started."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:120
+msgid ""
+"The VPN login failed because the VPN program could not connect to the VPN "
+"server."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:122
+msgid ""
+"The VPN login failed because the VPN configuration options were invalid."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:124
+msgid ""
+"The VPN login failed because the VPN program received an invalid "
+"configuration from the VPN server."
+msgstr ""
diff --git a/vpn-daemons/vpnc/po/ja.po b/vpn-daemons/vpnc/po/ja.po
new file mode 100644
index 0000000000..4cea00e3b0
--- /dev/null
+++ b/vpn-daemons/vpnc/po/ja.po
@@ -0,0 +1,256 @@
+# Japanese message file for YaST2 (@memory@).
+# Copyright (C) 2005 SUSE Linux Products GmbH.
+# Copyright (C) 2002 SuSE Linux AG.
+# Copyright (C) 2000, 2001 SuSE GmbH.
+# Mike Fabian <mfabian@suse.de>, 2000, 2001.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: YaST (@memory@)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-05-16 17:10+0200\n"
+"PO-Revision-Date: 2001-09-24 20:04+02:00\n"
+"Last-Translator: Mike Fabian <mfabian@suse.de>\n"
+"Language-Team: Japanese <i18n@suse.de>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:147
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "パスワード�確� (&V) :"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:267
+#, fuzzy
+msgid "_Username:"
+msgstr "ユーザ�(&U):"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:269
+#, fuzzy
+msgid "_Domain:"
+msgstr "ドメイン(&D):"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:271
+#, fuzzy
+msgid "_Password:"
+msgstr "パスワード:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:354
+#, fuzzy
+msgid "Connect _anonymously"
+msgstr "接続"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:359
+#, fuzzy
+msgid "Connect as _user:"
+msgstr "接続方法"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:465
+#, fuzzy
+msgid "_Remember passwords for this session"
+msgstr "確�����も�一度パスワードを入力������(&V): "
+
+#: ../auth-dialog/gnome-two-password-dialog.c:467
+#, fuzzy
+msgid "_Save passwords in keyring"
+msgstr "パスワード暗�化�設定"
+
+#: ../auth-dialog/main.c:161
+#, c-format
+msgid "You need to authenticate to access the Virtual Private Network '%s'."
+msgstr ""
+
+#: ../auth-dialog/main.c:162
+#, fuzzy
+msgid "Authenticate VPN"
+msgstr "�証"
+
+#: ../auth-dialog/main.c:169
+#, fuzzy
+msgid "_Group Password:"
+msgstr "パスワード:"
+
+#: ../nm-vpnc.desktop.in.h:1
+msgid "Add, Remove, and Edit VPN Connections"
+msgstr ""
+
+#: ../nm-vpnc.desktop.in.h:2
+#, fuzzy
+msgid "VPN Connection Manager (vpnc)"
+msgstr "接続管�"
+
+#: ../properties/nm-vpnc.c:83
+msgid "Compatible Cisco VPN client (vpnc)"
+msgstr ""
+
+#: ../properties/nm-vpnc.c:447
+#, fuzzy
+msgid "The following vpnc VPN connection will be created:"
+msgstr "次�スキャナを無効����。"
+
+#: ../properties/nm-vpnc.c:449
+#, fuzzy, c-format
+msgid "Name:  %s"
+msgstr "��(&M):"
+
+#: ../properties/nm-vpnc.c:452
+#, fuzzy, c-format
+msgid "Gateway:  %s"
+msgstr "ゲートウェイ: %1"
+
+#: ../properties/nm-vpnc.c:454
+#, fuzzy, c-format
+msgid "Group Name:  %s"
+msgstr "グループ�: "
+
+#: ../properties/nm-vpnc.c:458
+#, fuzzy, c-format
+msgid "Username:  %s"
+msgstr "ユーザ�: %1"
+
+#: ../properties/nm-vpnc.c:463
+#, fuzzy, c-format
+msgid "Domain:  %s"
+msgstr "ドメイン(&D):"
+
+#: ../properties/nm-vpnc.c:468
+#, fuzzy, c-format
+msgid "Routes:  %s"
+msgstr "ルート: %1"
+
+#: ../properties/nm-vpnc.c:472
+msgid "The connection details can be changed using the \"Edit\" button."
+msgstr ""
+
+#: ../properties/nm-vpnc.c:548
+#, fuzzy
+msgid "TCP tunneling not supported"
+msgstr "�在サ�ート�れ����ん。"
+
+#: ../properties/nm-vpnc.c:550
+#, c-format
+msgid ""
+"The VPN settings file '%s' specifies that VPN traffic should be tunneled "
+"through TCP which is currently not supported in the vpnc software.\n"
+"\n"
+"The connection can still be created, with TCP tunneling disabled, however it "
+"may not work as expected."
+msgstr ""
+
+#: ../properties/nm-vpnc.c:574
+#, fuzzy
+msgid "Cannot import settings"
+msgstr "設定を書�込���ん�"
+
+#: ../properties/nm-vpnc.c:576
+#, fuzzy, c-format
+msgid "The VPN settings file '%s' does not contain valid data."
+msgstr "指定�れ�ファイル��TSIGキー��り��ん。"
+
+#: ../properties/nm-vpnc.c:593
+#, fuzzy
+msgid "Select file to import"
+msgstr "読�込むファイルを�択���。"
+
+#. printf ("in impl_export\n");
+#: ../properties/nm-vpnc.c:748
+msgid "Save as..."
+msgstr "��を付���存..."
+
+#: ../properties/nm-vpnc.c:778
+#, fuzzy, c-format
+msgid "A file named \"%s\" already exists."
+msgstr "%1 ������ホスト����存在���。"
+
+#: ../properties/nm-vpnc.c:781
+#, fuzzy
+msgid "Do you want to replace it with the one you are saving?"
+msgstr "本当�設定をリセット��もよ������?"
+
+#: ../properties/nm-vpnc-dialog.glade.h:1
+#, fuzzy
+msgid "<b>Connection Name</b>"
+msgstr "<b>説明:  </b>"
+
+#: ../properties/nm-vpnc-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Required Information</b>"
+msgstr "<p><b>サ�ート情報</b></p>\n"
+
+#: ../properties/nm-vpnc-dialog.glade.h:3
+msgid "<i>example: 172.16.0.0/16 10.11.12.0/24</i>"
+msgstr ""
+
+#: ../properties/nm-vpnc-dialog.glade.h:4
+#, fuzzy
+msgid "G_roup Name:"
+msgstr "グループ�: "
+
+#: ../properties/nm-vpnc-dialog.glade.h:5
+#, fuzzy
+msgid "O_ptional Information"
+msgstr "オプション�情報"
+
+#: ../properties/nm-vpnc-dialog.glade.h:6
+#, fuzzy
+msgid "Override _user name"
+msgstr "���ユーザ�を入力���(&U):"
+
+#: ../properties/nm-vpnc-dialog.glade.h:7
+msgid ""
+"Please enter the information provided by your system administrator below. Do "
+"not enter your password here as you will be prompted when connecting."
+msgstr ""
+
+#: ../properties/nm-vpnc-dialog.glade.h:8
+#, fuzzy
+msgid "Use _domain for authentication"
+msgstr "ユーザ�証"
+
+#: ../properties/nm-vpnc-dialog.glade.h:9
+#, fuzzy
+msgid "_Gateway:"
+msgstr "ゲートウェイ"
+
+#: ../properties/nm-vpnc-dialog.glade.h:10
+#, fuzzy
+msgid "_Import Saved Configuration..."
+msgstr "サー��環境設定(&S)..."
+
+#: ../properties/nm-vpnc-dialog.glade.h:11
+msgid ""
+"_Name used to identify the connection to the private network, e.g. \"Campus "
+"VPN\" or \"Corporate Network\""
+msgstr ""
+
+#: ../properties/nm-vpnc-dialog.glade.h:12
+msgid "_Only use VPN connection for these addresses"
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:116
+msgid ""
+"The VPN login failed because the user name and password were not accepted."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:118
+msgid "The VPN login failed because the VPN program could not be started."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:120
+msgid ""
+"The VPN login failed because the VPN program could not connect to the VPN "
+"server."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:122
+msgid ""
+"The VPN login failed because the VPN configuration options were invalid."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:124
+msgid ""
+"The VPN login failed because the VPN program received an invalid "
+"configuration from the VPN server."
+msgstr ""
diff --git a/vpn-daemons/vpnc/po/pl.po b/vpn-daemons/vpnc/po/pl.po
new file mode 100644
index 0000000000..f2b582632d
--- /dev/null
+++ b/vpn-daemons/vpnc/po/pl.po
@@ -0,0 +1,255 @@
+# Polish message file for YaST2 (@memory@).
+# Copyright (C) 2005 SUSE Linux Products GmbH.
+# Copyright (C) 2003 SuSE Linux AG.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: YaST (@memory@)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-05-16 17:10+0200\n"
+"PO-Revision-Date: 2003-10-06 11:28+0200\n"
+"Last-Translator: Polish <i18n@suse.de>\n"
+"Language-Team: Polish <i18n@suse.de>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;\n"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:147
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "Zw&eryfikuj hasło:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:267
+#, fuzzy
+msgid "_Username:"
+msgstr "Nazwa &użytkownika:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:269
+#, fuzzy
+msgid "_Domain:"
+msgstr "&Domena:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:271
+#, fuzzy
+msgid "_Password:"
+msgstr "Hasło:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:354
+#, fuzzy
+msgid "Connect _anonymously"
+msgstr "Połączenia"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:359
+#, fuzzy
+msgid "Connect as _user:"
+msgstr " Podłączone jako "
+
+#: ../auth-dialog/gnome-two-password-dialog.c:465
+#, fuzzy
+msgid "_Remember passwords for this session"
+msgstr "Proszę podać hasło ponownie, dla &weryfikacji:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:467
+#, fuzzy
+msgid "_Save passwords in keyring"
+msgstr "Ustaw sposób szyfrowania haseł"
+
+#: ../auth-dialog/main.c:161
+#, c-format
+msgid "You need to authenticate to access the Virtual Private Network '%s'."
+msgstr ""
+
+#: ../auth-dialog/main.c:162
+#, fuzzy
+msgid "Authenticate VPN"
+msgstr "Uwierzytelnianie"
+
+#: ../auth-dialog/main.c:169
+#, fuzzy
+msgid "_Group Password:"
+msgstr "Hasło:"
+
+#: ../nm-vpnc.desktop.in.h:1
+msgid "Add, Remove, and Edit VPN Connections"
+msgstr ""
+
+#: ../nm-vpnc.desktop.in.h:2
+#, fuzzy
+msgid "VPN Connection Manager (vpnc)"
+msgstr "Zarządzanie połączeniami"
+
+#: ../properties/nm-vpnc.c:83
+msgid "Compatible Cisco VPN client (vpnc)"
+msgstr ""
+
+#: ../properties/nm-vpnc.c:447
+#, fuzzy
+msgid "The following vpnc VPN connection will be created:"
+msgstr "Zostaną zdezaktywowane następujące skanery:"
+
+#: ../properties/nm-vpnc.c:449
+#, fuzzy, c-format
+msgid "Name:  %s"
+msgstr "Na&zwa:"
+
+#: ../properties/nm-vpnc.c:452
+#, fuzzy, c-format
+msgid "Gateway:  %s"
+msgstr "Brama: %1"
+
+#: ../properties/nm-vpnc.c:454
+#, fuzzy, c-format
+msgid "Group Name:  %s"
+msgstr "Nazwa grupy:"
+
+#: ../properties/nm-vpnc.c:458
+#, fuzzy, c-format
+msgid "Username:  %s"
+msgstr "Nazwa użytkownika: %1"
+
+#: ../properties/nm-vpnc.c:463
+#, fuzzy, c-format
+msgid "Domain:  %s"
+msgstr "&Domena:"
+
+#: ../properties/nm-vpnc.c:468
+#, fuzzy, c-format
+msgid "Routes:  %s"
+msgstr "Trasy: %1"
+
+#: ../properties/nm-vpnc.c:472
+msgid "The connection details can be changed using the \"Edit\" button."
+msgstr ""
+
+#: ../properties/nm-vpnc.c:548
+#, fuzzy
+msgid "TCP tunneling not supported"
+msgstr "Obecnie nieobsługiwane."
+
+#: ../properties/nm-vpnc.c:550
+#, c-format
+msgid ""
+"The VPN settings file '%s' specifies that VPN traffic should be tunneled "
+"through TCP which is currently not supported in the vpnc software.\n"
+"\n"
+"The connection can still be created, with TCP tunneling disabled, however it "
+"may not work as expected."
+msgstr ""
+
+#: ../properties/nm-vpnc.c:574
+#, fuzzy
+msgid "Cannot import settings"
+msgstr "Nie można zapisać ustawień"
+
+#: ../properties/nm-vpnc.c:576
+#, fuzzy, c-format
+msgid "The VPN settings file '%s' does not contain valid data."
+msgstr "Wybrany plik nie zawiera żadnego klucza TSIG."
+
+#: ../properties/nm-vpnc.c:593
+#, fuzzy
+msgid "Select file to import"
+msgstr "Proszę wybrać plik do odczytania."
+
+#. printf ("in impl_export\n");
+#: ../properties/nm-vpnc.c:748
+msgid "Save as..."
+msgstr "Zapisz jako..."
+
+#: ../properties/nm-vpnc.c:778
+#, fuzzy, c-format
+msgid "A file named \"%s\" already exists."
+msgstr "Istnieje już host o nazwie %1."
+
+#: ../properties/nm-vpnc.c:781
+#, fuzzy
+msgid "Do you want to replace it with the one you are saving?"
+msgstr "Czy na pewno przywrócić domyślne ustawienia?"
+
+#: ../properties/nm-vpnc-dialog.glade.h:1
+#, fuzzy
+msgid "<b>Connection Name</b>"
+msgstr "<b>Opis: </b>"
+
+#: ../properties/nm-vpnc-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Required Information</b>"
+msgstr "<p><b>Informacje o pomocy technicznej</b></p>\n"
+
+#: ../properties/nm-vpnc-dialog.glade.h:3
+msgid "<i>example: 172.16.0.0/16 10.11.12.0/24</i>"
+msgstr ""
+
+#: ../properties/nm-vpnc-dialog.glade.h:4
+#, fuzzy
+msgid "G_roup Name:"
+msgstr "Nazwa grupy:"
+
+#: ../properties/nm-vpnc-dialog.glade.h:5
+#, fuzzy
+msgid "O_ptional Information"
+msgstr "Informacje opcjonalne"
+
+#: ../properties/nm-vpnc-dialog.glade.h:6
+#, fuzzy
+msgid "Override _user name"
+msgstr "Lub wpisz nazwę &użytkownika:"
+
+#: ../properties/nm-vpnc-dialog.glade.h:7
+msgid ""
+"Please enter the information provided by your system administrator below. Do "
+"not enter your password here as you will be prompted when connecting."
+msgstr ""
+
+#: ../properties/nm-vpnc-dialog.glade.h:8
+#, fuzzy
+msgid "Use _domain for authentication"
+msgstr "Uwierzytelnianie użytkowników"
+
+#: ../properties/nm-vpnc-dialog.glade.h:9
+#, fuzzy
+msgid "_Gateway:"
+msgstr "Brama"
+
+#: ../properties/nm-vpnc-dialog.glade.h:10
+#, fuzzy
+msgid "_Import Saved Configuration..."
+msgstr "Konfiguracja &serwera..."
+
+#: ../properties/nm-vpnc-dialog.glade.h:11
+msgid ""
+"_Name used to identify the connection to the private network, e.g. \"Campus "
+"VPN\" or \"Corporate Network\""
+msgstr ""
+
+#: ../properties/nm-vpnc-dialog.glade.h:12
+msgid "_Only use VPN connection for these addresses"
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:116
+msgid ""
+"The VPN login failed because the user name and password were not accepted."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:118
+msgid "The VPN login failed because the VPN program could not be started."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:120
+msgid ""
+"The VPN login failed because the VPN program could not connect to the VPN "
+"server."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:122
+msgid ""
+"The VPN login failed because the VPN configuration options were invalid."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:124
+msgid ""
+"The VPN login failed because the VPN program received an invalid "
+"configuration from the VPN server."
+msgstr ""
diff --git a/vpn-daemons/vpnc/po/pt_BR.po b/vpn-daemons/vpnc/po/pt_BR.po
new file mode 100644
index 0000000000..17d4b3bf77
--- /dev/null
+++ b/vpn-daemons/vpnc/po/pt_BR.po
@@ -0,0 +1,257 @@
+# Portugese (Brasilian) message file for YaST2 (@memory@).
+# Copyright (C) 2005 SUSE Linux Products GmbH.
+# Copyright (C) 2002 SuSE Linux AG.
+# Copyright (C) 1999-2000, 2001 SuSE GmbH.
+# Karl Eichwalder <ke@suse.de>, 1999.
+# Ralf Lanz <rlanz@genix.com.br>, 1999.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: YaST (@memory@)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-05-16 17:10+0200\n"
+"PO-Revision-Date: 2002-07-01 14:56+0200\n"
+"Last-Translator: Ralf Lanz <rlanz@genix.com.br>\n"
+"Language-Team: Brazilian Portuguese <i18n@suse.de>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n>1;\n"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:147
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "V&erifique a Senha:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:267
+#, fuzzy
+msgid "_Username:"
+msgstr "Nome de &Usuário:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:269
+#, fuzzy
+msgid "_Domain:"
+msgstr "&Domínio:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:271
+#, fuzzy
+msgid "_Password:"
+msgstr "Senha:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:354
+#, fuzzy
+msgid "Connect _anonymously"
+msgstr "Conexões"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:359
+#, fuzzy
+msgid "Connect as _user:"
+msgstr "Conectado Como "
+
+#: ../auth-dialog/gnome-two-password-dialog.c:465
+#, fuzzy
+msgid "_Remember passwords for this session"
+msgstr "Entre novamente a senha para &verificação:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:467
+#, fuzzy
+msgid "_Save passwords in keyring"
+msgstr "Configurar Criptografia de senha"
+
+#: ../auth-dialog/main.c:161
+#, c-format
+msgid "You need to authenticate to access the Virtual Private Network '%s'."
+msgstr ""
+
+#: ../auth-dialog/main.c:162
+#, fuzzy
+msgid "Authenticate VPN"
+msgstr "Autenticação"
+
+#: ../auth-dialog/main.c:169
+#, fuzzy
+msgid "_Group Password:"
+msgstr "Senha:"
+
+#: ../nm-vpnc.desktop.in.h:1
+msgid "Add, Remove, and Edit VPN Connections"
+msgstr ""
+
+#: ../nm-vpnc.desktop.in.h:2
+#, fuzzy
+msgid "VPN Connection Manager (vpnc)"
+msgstr "Gerenciamento de Conexão"
+
+#: ../properties/nm-vpnc.c:83
+msgid "Compatible Cisco VPN client (vpnc)"
+msgstr ""
+
+#: ../properties/nm-vpnc.c:447
+#, fuzzy
+msgid "The following vpnc VPN connection will be created:"
+msgstr "Os seguintes scanners serão desativados:"
+
+#: ../properties/nm-vpnc.c:449
+#, fuzzy, c-format
+msgid "Name:  %s"
+msgstr "No&me:"
+
+#: ../properties/nm-vpnc.c:452
+#, fuzzy, c-format
+msgid "Gateway:  %s"
+msgstr "Gateway: %1"
+
+#: ../properties/nm-vpnc.c:454
+#, fuzzy, c-format
+msgid "Group Name:  %s"
+msgstr "Nome de Grupo:"
+
+#: ../properties/nm-vpnc.c:458
+#, fuzzy, c-format
+msgid "Username:  %s"
+msgstr "Nome de Usuário: %1"
+
+#: ../properties/nm-vpnc.c:463
+#, fuzzy, c-format
+msgid "Domain:  %s"
+msgstr "&Domínio:"
+
+#: ../properties/nm-vpnc.c:468
+#, fuzzy, c-format
+msgid "Routes:  %s"
+msgstr "Rotas: %1"
+
+#: ../properties/nm-vpnc.c:472
+msgid "The connection details can be changed using the \"Edit\" button."
+msgstr ""
+
+#: ../properties/nm-vpnc.c:548
+#, fuzzy
+msgid "TCP tunneling not supported"
+msgstr "Sem suporte no momento."
+
+#: ../properties/nm-vpnc.c:550
+#, c-format
+msgid ""
+"The VPN settings file '%s' specifies that VPN traffic should be tunneled "
+"through TCP which is currently not supported in the vpnc software.\n"
+"\n"
+"The connection can still be created, with TCP tunneling disabled, however it "
+"may not work as expected."
+msgstr ""
+
+#: ../properties/nm-vpnc.c:574
+#, fuzzy
+msgid "Cannot import settings"
+msgstr "Não pode gravar configurações!"
+
+#: ../properties/nm-vpnc.c:576
+#, fuzzy, c-format
+msgid "The VPN settings file '%s' does not contain valid data."
+msgstr "O arquivo especificado não contém uma chave TSIG."
+
+#: ../properties/nm-vpnc.c:593
+#, fuzzy
+msgid "Select file to import"
+msgstr "Selecione um arquivo para carregar."
+
+#. printf ("in impl_export\n");
+#: ../properties/nm-vpnc.c:748
+msgid "Save as..."
+msgstr "Salvar como ..."
+
+#: ../properties/nm-vpnc.c:778
+#, fuzzy, c-format
+msgid "A file named \"%s\" already exists."
+msgstr "Um host denominado %1 já existe."
+
+#: ../properties/nm-vpnc.c:781
+#, fuzzy
+msgid "Do you want to replace it with the one you are saving?"
+msgstr "Você quer realmente reinicializar suas configurações?"
+
+#: ../properties/nm-vpnc-dialog.glade.h:1
+#, fuzzy
+msgid "<b>Connection Name</b>"
+msgstr "<b>Descrição: </b>"
+
+#: ../properties/nm-vpnc-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Required Information</b>"
+msgstr "<p><b>Informações de Suporte</b></p>\n"
+
+#: ../properties/nm-vpnc-dialog.glade.h:3
+msgid "<i>example: 172.16.0.0/16 10.11.12.0/24</i>"
+msgstr ""
+
+#: ../properties/nm-vpnc-dialog.glade.h:4
+#, fuzzy
+msgid "G_roup Name:"
+msgstr "Nome de Grupo:"
+
+#: ../properties/nm-vpnc-dialog.glade.h:5
+#, fuzzy
+msgid "O_ptional Information"
+msgstr "Informações Opcionais"
+
+#: ../properties/nm-vpnc-dialog.glade.h:6
+#, fuzzy
+msgid "Override _user name"
+msgstr "Ou tecle nome-de-&usuário:"
+
+#: ../properties/nm-vpnc-dialog.glade.h:7
+msgid ""
+"Please enter the information provided by your system administrator below. Do "
+"not enter your password here as you will be prompted when connecting."
+msgstr ""
+
+#: ../properties/nm-vpnc-dialog.glade.h:8
+#, fuzzy
+msgid "Use _domain for authentication"
+msgstr "Autenticação de Usuário"
+
+#: ../properties/nm-vpnc-dialog.glade.h:9
+#, fuzzy
+msgid "_Gateway:"
+msgstr "Gateway"
+
+#: ../properties/nm-vpnc-dialog.glade.h:10
+#, fuzzy
+msgid "_Import Saved Configuration..."
+msgstr "Configuração do &Servidor..."
+
+#: ../properties/nm-vpnc-dialog.glade.h:11
+msgid ""
+"_Name used to identify the connection to the private network, e.g. \"Campus "
+"VPN\" or \"Corporate Network\""
+msgstr ""
+
+#: ../properties/nm-vpnc-dialog.glade.h:12
+msgid "_Only use VPN connection for these addresses"
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:116
+msgid ""
+"The VPN login failed because the user name and password were not accepted."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:118
+msgid "The VPN login failed because the VPN program could not be started."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:120
+msgid ""
+"The VPN login failed because the VPN program could not connect to the VPN "
+"server."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:122
+msgid ""
+"The VPN login failed because the VPN configuration options were invalid."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:124
+msgid ""
+"The VPN login failed because the VPN program received an invalid "
+"configuration from the VPN server."
+msgstr ""
diff --git a/vpn-daemons/vpnc/po/sv.po b/vpn-daemons/vpnc/po/sv.po
index e600eaf6f8..b9f883543f 100644
--- a/vpn-daemons/vpnc/po/sv.po
+++ b/vpn-daemons/vpnc/po/sv.po
@@ -2,13 +2,13 @@
 # Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 # Christian Rose <menthos@menthos.com>, 2004, 2005.
 #
-# $Id: sv.po,v 1.1 2005/08/12 18:28:04 rml Exp $
+# $Id: sv.po,v 1.1.2.2 2006/06/05 18:04:48 rml Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager-vpnc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-26 01:20+0200\n"
+"POT-Creation-Date: 2006-05-16 17:10+0200\n"
 "PO-Revision-Date: 2005-06-26 01:20+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -17,157 +17,109 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.c:147
+#: ../auth-dialog/gnome-two-password-dialog.c:147
 msgid "_Secondary Password:"
 msgstr "_Andrahandslösenord:"
 
-#: vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.c:268
+#: ../auth-dialog/gnome-two-password-dialog.c:267
 msgid "_Username:"
 msgstr "_Användarnamn:"
 
-#: vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.c:270
+#: ../auth-dialog/gnome-two-password-dialog.c:269
 msgid "_Domain:"
 msgstr "_Domän:"
 
-#: vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.c:272
+#: ../auth-dialog/gnome-two-password-dialog.c:271
 msgid "_Password:"
 msgstr "_Lösenord:"
 
-#: vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.c:355
+#: ../auth-dialog/gnome-two-password-dialog.c:354
 msgid "Connect _anonymously"
 msgstr "Anslut anon_ymt"
 
-#: vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.c:360
+#: ../auth-dialog/gnome-two-password-dialog.c:359
 msgid "Connect as _user:"
 msgstr "Anslut som _användare:"
 
-#: vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.c:466
-msgid "Remember password for this session"
+#: ../auth-dialog/gnome-two-password-dialog.c:465
+#, fuzzy
+msgid "_Remember passwords for this session"
 msgstr "Kom ihåg lösenordet för denna session"
 
-#: vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.c:468
-msgid "Save password in keyring"
+#: ../auth-dialog/gnome-two-password-dialog.c:467
+#, fuzzy
+msgid "_Save passwords in keyring"
 msgstr "Spara lösenordet i nyckelring"
 
-#: vpn-daemons/vpnc/auth-dialog/main.c:161
+#: ../auth-dialog/main.c:161
 #, c-format
 msgid "You need to authenticate to access the Virtual Private Network '%s'."
 msgstr "Du måsta autentisera för att komma åt VPN-nätverket \"%s\"."
 
-#: vpn-daemons/vpnc/auth-dialog/main.c:162
+#: ../auth-dialog/main.c:162
 msgid "Authenticate VPN"
 msgstr "Autentisera VPN"
 
-#: vpn-daemons/vpnc/auth-dialog/main.c:169
+#: ../auth-dialog/main.c:169
 msgid "_Group Password:"
 msgstr "_Grupplösenord:"
 
-#: vpn-daemons/vpnc/nm-vpnc.desktop.in.h:1
+#: ../nm-vpnc.desktop.in.h:1
+msgid "Add, Remove, and Edit VPN Connections"
+msgstr ""
+
+#: ../nm-vpnc.desktop.in.h:2
 msgid "VPN Connection Manager (vpnc)"
 msgstr "VPN-anslutningshanterare (vpnc)"
 
-#: vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade.h:1
-msgid "<b>Connection Name</b>"
-msgstr "<b>Anslutningsnamn</b>"
+#: ../properties/nm-vpnc.c:83
+msgid "Compatible Cisco VPN client (vpnc)"
+msgstr "Kompatibel Cisco VPN-klient (vpnc)"
 
-#: vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade.h:2
-msgid "<b>Optional Information</b>"
-msgstr "<b>Valfri information</b>"
+#: ../properties/nm-vpnc.c:447
+#, fuzzy
+msgid "The following vpnc VPN connection will be created:"
+msgstr "Följande steg kommer att utföras:"
 
-#: vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade.h:3
-msgid "<b>Required Information</b>"
-msgstr "<b>Nödvändig information</b>"
+#: ../properties/nm-vpnc.c:449
+#, fuzzy, c-format
+msgid "Name:  %s"
+msgstr "Na&mn:"
 
-#: vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade.h:4
-msgid "<i>example: 172.16.0.0/16 10.11.12.0/24</i>"
-msgstr "<i>exempel: 172.16.0.0/16 10.11.12.0/24</i>"
+#: ../properties/nm-vpnc.c:452
+#, fuzzy, c-format
+msgid "Gateway:  %s"
+msgstr "Gateway: %1"
 
-#: vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade.h:5
-msgid "Gateway:"
-msgstr "Gateway:"
-
-#: vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade.h:6
-msgid "Group Name:"
+#: ../properties/nm-vpnc.c:454
+#, fuzzy, c-format
+msgid "Group Name:  %s"
 msgstr "Gruppnamn:"
 
-#: vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade.h:7
-msgid ""
-"Name used to identify the connection to the private network, e.g. \"Campus "
-"VPN\" or \"Corporate Network\""
-msgstr ""
-"Namn som används för att identifiera anslutningen till det privata "
-"nätverket, exempelvis \"Campus-VPN\" eller \"Företagsnätverket\""
-
-#: vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade.h:8
-msgid "Only use VPN connection for these addresses"
-msgstr "Använd endast VPN-anslutning för dessa adresser"
-
-#: vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade.h:9
-msgid "Override user name"
-msgstr "Åsidosätt användarnamn"
-
-#: vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade.h:10
-msgid ""
-"Please enter the information provided by your system administrator below. Do "
-"not enter your password here as you will be prompted when connecting."
-msgstr ""
-"Ange den information som har tillhandahållits av din systemadministratör "
-"nedan. Ange inte lösenordet här eftersom du kommer att efterfrågas det när "
-"du ansluter."
-
-#: vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade.h:11
-msgid "Use domain for authentication"
-msgstr "Använd domän för autentisering"
-
-#: vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade.h:12
-msgid "_Import..."
-msgstr "_Importera..."
-
-#: vpn-daemons/vpnc/properties/nm-vpnc.c:83
-msgid "Compatible Cisco VPN client (vpnc)"
-msgstr "Kompatibel Cisco VPN-klient (vpnc)"
-
-#: vpn-daemons/vpnc/properties/nm-vpnc.c:448
-#, c-format
-msgid "\tUsername:  %s\n"
+#: ../properties/nm-vpnc.c:458
+#, fuzzy, c-format
+msgid "Username:  %s"
 msgstr "\tAnvändarnamn:  %s\n"
 
-#: vpn-daemons/vpnc/properties/nm-vpnc.c:449
-#, c-format
-msgid "\tRoutes:  %s\n"
-msgstr "\tVägar:  %s\n"
-
-#: vpn-daemons/vpnc/properties/nm-vpnc.c:450
-#, c-format
-msgid "\tDomain:  %s\n"
+#: ../properties/nm-vpnc.c:463
+#, fuzzy, c-format
+msgid "Domain:  %s"
 msgstr "\tDomän:  %s\n"
 
-#: vpn-daemons/vpnc/properties/nm-vpnc.c:453
-#, c-format
-msgid ""
-"The following vpnc VPN connection will be created:\n"
-"\n"
-"\tName:  %s\n"
-"\n"
-"\tGateway:  %s\n"
-"\tGroup Name:  %s\n"
-"%s%s%s\n"
-"The connection details can be changed using the \"Edit\" button.\n"
+#: ../properties/nm-vpnc.c:468
+#, fuzzy, c-format
+msgid "Routes:  %s"
+msgstr "\tVägar:  %s\n"
+
+#: ../properties/nm-vpnc.c:472
+msgid "The connection details can be changed using the \"Edit\" button."
 msgstr ""
-"Följande vpnc-VPN-anslutning kommer att skapas:\n"
-"\n"
-"\tNamn:  %s\n"
-"\n"
-"\tGateway:  %s\n"
-"\tGruppnamn:  %s\n"
-"%s%s%s\n"
-"Anslutningsdetaljerna kan ändras genom att använda knappen \"Redigera\".\n"
 
-#: vpn-daemons/vpnc/properties/nm-vpnc.c:544
+#: ../properties/nm-vpnc.c:548
 msgid "TCP tunneling not supported"
 msgstr "TCP-tunnling stöds inte"
 
-#: vpn-daemons/vpnc/properties/nm-vpnc.c:546
+#: ../properties/nm-vpnc.c:550
 #, c-format
 msgid ""
 "The VPN settings file '%s' specifies that VPN traffic should be tunneled "
@@ -182,46 +134,111 @@ msgstr ""
 "Anslutningen kan fortfarande skapas, med inaktiverad TCP-tunnling, men det "
 "kanske inte fungerar som väntat."
 
-#: vpn-daemons/vpnc/properties/nm-vpnc.c:570
+#: ../properties/nm-vpnc.c:574
 msgid "Cannot import settings"
 msgstr "Kan inte importera inställningar"
 
-#: vpn-daemons/vpnc/properties/nm-vpnc.c:572
+#: ../properties/nm-vpnc.c:576
 #, c-format
 msgid "The VPN settings file '%s' does not contain valid data."
 msgstr "VPN-inställningsfilen \"%s\" innehåller inte giltiga data."
 
-#: vpn-daemons/vpnc/properties/nm-vpnc.c:589
+#: ../properties/nm-vpnc.c:593
 msgid "Select file to import"
 msgstr "Välj fil att importera"
 
 #. printf ("in impl_export\n");
-#: vpn-daemons/vpnc/properties/nm-vpnc.c:744
+#: ../properties/nm-vpnc.c:748
 msgid "Save as..."
 msgstr "Spara som..."
 
-#: vpn-daemons/vpnc/properties/nm-vpnc.c:774
+#: ../properties/nm-vpnc.c:778
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "En fil med namnet \"%s\" finns redan."
 
-#: vpn-daemons/vpnc/properties/nm-vpnc.c:777
+#: ../properties/nm-vpnc.c:781
 msgid "Do you want to replace it with the one you are saving?"
 msgstr "Vill du ersätta den med den du håller på att spara?"
 
-#: vpn-daemons/vpnc/src/nm-vpnc-service.c:115
+#: ../properties/nm-vpnc-dialog.glade.h:1
+msgid "<b>Connection Name</b>"
+msgstr "<b>Anslutningsnamn</b>"
+
+#: ../properties/nm-vpnc-dialog.glade.h:2
+msgid "<b>Required Information</b>"
+msgstr "<b>Nödvändig information</b>"
+
+#: ../properties/nm-vpnc-dialog.glade.h:3
+msgid "<i>example: 172.16.0.0/16 10.11.12.0/24</i>"
+msgstr "<i>exempel: 172.16.0.0/16 10.11.12.0/24</i>"
+
+#: ../properties/nm-vpnc-dialog.glade.h:4
+#, fuzzy
+msgid "G_roup Name:"
+msgstr "Gruppnamn:"
+
+#: ../properties/nm-vpnc-dialog.glade.h:5
+#, fuzzy
+msgid "O_ptional Information"
+msgstr "Ytterligare information"
+
+#: ../properties/nm-vpnc-dialog.glade.h:6
+#, fuzzy
+msgid "Override _user name"
+msgstr "Åsidosätt användarnamn"
+
+#: ../properties/nm-vpnc-dialog.glade.h:7
+msgid ""
+"Please enter the information provided by your system administrator below. Do "
+"not enter your password here as you will be prompted when connecting."
+msgstr ""
+"Ange den information som har tillhandahållits av din systemadministratör "
+"nedan. Ange inte lösenordet här eftersom du kommer att efterfrågas det när "
+"du ansluter."
+
+#: ../properties/nm-vpnc-dialog.glade.h:8
+#, fuzzy
+msgid "Use _domain for authentication"
+msgstr "Använd domän för autentisering"
+
+#: ../properties/nm-vpnc-dialog.glade.h:9
+#, fuzzy
+msgid "_Gateway:"
+msgstr "Gateway:"
+
+#: ../properties/nm-vpnc-dialog.glade.h:10
+#, fuzzy
+msgid "_Import Saved Configuration..."
+msgstr "Sparar NIS-inställningar..."
+
+#: ../properties/nm-vpnc-dialog.glade.h:11
+#, fuzzy
+msgid ""
+"_Name used to identify the connection to the private network, e.g. \"Campus "
+"VPN\" or \"Corporate Network\""
+msgstr ""
+"Namn som används för att identifiera anslutningen till det privata "
+"nätverket, exempelvis \"Campus-VPN\" eller \"Företagsnätverket\""
+
+#: ../properties/nm-vpnc-dialog.glade.h:12
+#, fuzzy
+msgid "_Only use VPN connection for these addresses"
+msgstr "Använd endast VPN-anslutning för dessa adresser"
+
+#: ../src/nm-vpnc-service.c:116
 msgid ""
 "The VPN login failed because the user name and password were not accepted."
 msgstr ""
 "VPN-inloggningen misslyckades eftersom användarnamnet och lösenordet inte "
 "accepterades."
 
-#: vpn-daemons/vpnc/src/nm-vpnc-service.c:117
+#: ../src/nm-vpnc-service.c:118
 msgid "The VPN login failed because the VPN program could not be started."
 msgstr ""
 "VPN-inloggningen misslyckades eftersom VPN-programmet inte kunde startas."
 
-#: vpn-daemons/vpnc/src/nm-vpnc-service.c:119
+#: ../src/nm-vpnc-service.c:120
 msgid ""
 "The VPN login failed because the VPN program could not connect to the VPN "
 "server."
@@ -229,14 +246,14 @@ msgstr ""
 "VPN-inloggningen misslyckades eftersom VPN-programmet inte kunde ansluta "
 "till VPN-servern."
 
-#: vpn-daemons/vpnc/src/nm-vpnc-service.c:121
+#: ../src/nm-vpnc-service.c:122
 msgid ""
 "The VPN login failed because the VPN configuration options were invalid."
 msgstr ""
 "VPN-inloggningen misslyckades eftersom VPN-konfigurationsalternativen var "
 "ogiltiga."
 
-#: vpn-daemons/vpnc/src/nm-vpnc-service.c:123
+#: ../src/nm-vpnc-service.c:124
 msgid ""
 "The VPN login failed because the VPN program received an invalid "
 "configuration from the VPN server."
@@ -244,3 +261,27 @@ msgstr ""
 "VPN-inloggningen misslyckades eftersom VPN-programmet mottog en ogiltig "
 "konfiguration från VPN-servern."
 
+#~ msgid "<b>Optional Information</b>"
+#~ msgstr "<b>Valfri information</b>"
+
+#~ msgid "_Import..."
+#~ msgstr "_Importera..."
+
+#~ msgid ""
+#~ "The following vpnc VPN connection will be created:\n"
+#~ "\n"
+#~ "\tName:  %s\n"
+#~ "\n"
+#~ "\tGateway:  %s\n"
+#~ "\tGroup Name:  %s\n"
+#~ "%s%s%s\n"
+#~ "The connection details can be changed using the \"Edit\" button.\n"
+#~ msgstr ""
+#~ "Följande vpnc-VPN-anslutning kommer att skapas:\n"
+#~ "\n"
+#~ "\tNamn:  %s\n"
+#~ "\n"
+#~ "\tGateway:  %s\n"
+#~ "\tGruppnamn:  %s\n"
+#~ "%s%s%s\n"
+#~ "Anslutningsdetaljerna kan ändras genom att använda knappen \"Redigera\".\n"
diff --git a/vpn-daemons/vpnc/po/zh_CN.po b/vpn-daemons/vpnc/po/zh_CN.po
new file mode 100644
index 0000000000..c18b680e6a
--- /dev/null
+++ b/vpn-daemons/vpnc/po/zh_CN.po
@@ -0,0 +1,255 @@
+# Chinese message file for YaST2 (@memory@)
+# Copyright (C) 2005 SUSE Linux Products GmbH.
+# Copyright (C) 2002 SuSE Linux AG.
+# Copyright (C) 2001 SuSE GmbH.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: YaST (@memory@)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-05-16 17:10+0200\n"
+"PO-Revision-Date: 2004-04-02 10:52+0200\n"
+"Last-Translator: 裴寒牧 <phm@a2e.de>\n"
+"Language-Team: 中� <nls-zh@suse.de>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:147
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "校验�令(&E)："
+
+#: ../auth-dialog/gnome-two-password-dialog.c:267
+#, fuzzy
+msgid "_Username:"
+msgstr "用户�(&U)："
+
+#: ../auth-dialog/gnome-two-password-dialog.c:269
+#, fuzzy
+msgid "_Domain:"
+msgstr "域(&D)："
+
+#: ../auth-dialog/gnome-two-password-dialog.c:271
+#, fuzzy
+msgid "_Password:"
+msgstr "�令："
+
+#: ../auth-dialog/gnome-two-password-dialog.c:354
+#, fuzzy
+msgid "Connect _anonymously"
+msgstr "连接"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:359
+#, fuzzy
+msgid "Connect as _user:"
+msgstr "连接为"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:465
+#, fuzzy
+msgid "_Remember passwords for this session"
+msgstr "�输一��令以便确认(&V)："
+
+#: ../auth-dialog/gnome-two-password-dialog.c:467
+#, fuzzy
+msgid "_Save passwords in keyring"
+msgstr "设置�令加密"
+
+#: ../auth-dialog/main.c:161
+#, c-format
+msgid "You need to authenticate to access the Virtual Private Network '%s'."
+msgstr ""
+
+#: ../auth-dialog/main.c:162
+#, fuzzy
+msgid "Authenticate VPN"
+msgstr "鉴定"
+
+#: ../auth-dialog/main.c:169
+#, fuzzy
+msgid "_Group Password:"
+msgstr "�令："
+
+#: ../nm-vpnc.desktop.in.h:1
+msgid "Add, Remove, and Edit VPN Connections"
+msgstr ""
+
+#: ../nm-vpnc.desktop.in.h:2
+#, fuzzy
+msgid "VPN Connection Manager (vpnc)"
+msgstr "连接管�"
+
+#: ../properties/nm-vpnc.c:83
+msgid "Compatible Cisco VPN client (vpnc)"
+msgstr ""
+
+#: ../properties/nm-vpnc.c:447
+#, fuzzy
+msgid "The following vpnc VPN connection will be created:"
+msgstr "将�消激活以下扫�仪："
+
+#: ../properties/nm-vpnc.c:449
+#, fuzzy, c-format
+msgid "Name:  %s"
+msgstr "�称(&M)："
+
+#: ../properties/nm-vpnc.c:452
+#, fuzzy, c-format
+msgid "Gateway:  %s"
+msgstr "网关：%1"
+
+#: ../properties/nm-vpnc.c:454
+#, fuzzy, c-format
+msgid "Group Name:  %s"
+msgstr "组�："
+
+#: ../properties/nm-vpnc.c:458
+#, fuzzy, c-format
+msgid "Username:  %s"
+msgstr "用户�：%1"
+
+#: ../properties/nm-vpnc.c:463
+#, fuzzy, c-format
+msgid "Domain:  %s"
+msgstr "域(&D)："
+
+#: ../properties/nm-vpnc.c:468
+#, fuzzy, c-format
+msgid "Routes:  %s"
+msgstr "路由: %1"
+
+#: ../properties/nm-vpnc.c:472
+msgid "The connection details can be changed using the \"Edit\" button."
+msgstr ""
+
+#: ../properties/nm-vpnc.c:548
+#, fuzzy
+msgid "TCP tunneling not supported"
+msgstr "当���支�。"
+
+#: ../properties/nm-vpnc.c:550
+#, c-format
+msgid ""
+"The VPN settings file '%s' specifies that VPN traffic should be tunneled "
+"through TCP which is currently not supported in the vpnc software.\n"
+"\n"
+"The connection can still be created, with TCP tunneling disabled, however it "
+"may not work as expected."
+msgstr ""
+
+#: ../properties/nm-vpnc.c:574
+#, fuzzy
+msgid "Cannot import settings"
+msgstr "无法写入设置�"
+
+#: ../properties/nm-vpnc.c:576
+#, fuzzy, c-format
+msgid "The VPN settings file '%s' does not contain valid data."
+msgstr "所选文件�包� TSIG 密钥."
+
+#: ../properties/nm-vpnc.c:593
+#, fuzzy
+msgid "Select file to import"
+msgstr "选择�装载的文件。"
+
+#. printf ("in impl_export\n");
+#: ../properties/nm-vpnc.c:748
+msgid "Save as..."
+msgstr "�存为..."
+
+#: ../properties/nm-vpnc.c:778
+#, fuzzy, c-format
+msgid "A file named \"%s\" already exists."
+msgstr "�为 %1 的主机已存在。"
+
+#: ../properties/nm-vpnc.c:781
+#, fuzzy
+msgid "Do you want to replace it with the one you are saving?"
+msgstr "是�确实��设置您的设置？"
+
+#: ../properties/nm-vpnc-dialog.glade.h:1
+#, fuzzy
+msgid "<b>Connection Name</b>"
+msgstr "<b>说明： </b>"
+
+#: ../properties/nm-vpnc-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Required Information</b>"
+msgstr "<p><b>支�信�</b></p>\n"
+
+#: ../properties/nm-vpnc-dialog.glade.h:3
+msgid "<i>example: 172.16.0.0/16 10.11.12.0/24</i>"
+msgstr ""
+
+#: ../properties/nm-vpnc-dialog.glade.h:4
+#, fuzzy
+msgid "G_roup Name:"
+msgstr "组�："
+
+#: ../properties/nm-vpnc-dialog.glade.h:5
+#, fuzzy
+msgid "O_ptional Information"
+msgstr "�选信�"
+
+#: ../properties/nm-vpnc-dialog.glade.h:6
+#, fuzzy
+msgid "Override _user name"
+msgstr "或键入用户�(&U)："
+
+#: ../properties/nm-vpnc-dialog.glade.h:7
+msgid ""
+"Please enter the information provided by your system administrator below. Do "
+"not enter your password here as you will be prompted when connecting."
+msgstr ""
+
+#: ../properties/nm-vpnc-dialog.glade.h:8
+#, fuzzy
+msgid "Use _domain for authentication"
+msgstr "用户鉴定"
+
+#: ../properties/nm-vpnc-dialog.glade.h:9
+#, fuzzy
+msgid "_Gateway:"
+msgstr "网关"
+
+#: ../properties/nm-vpnc-dialog.glade.h:10
+#, fuzzy
+msgid "_Import Saved Configuration..."
+msgstr "�务器�置(&S)..."
+
+#: ../properties/nm-vpnc-dialog.glade.h:11
+msgid ""
+"_Name used to identify the connection to the private network, e.g. \"Campus "
+"VPN\" or \"Corporate Network\""
+msgstr ""
+
+#: ../properties/nm-vpnc-dialog.glade.h:12
+msgid "_Only use VPN connection for these addresses"
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:116
+msgid ""
+"The VPN login failed because the user name and password were not accepted."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:118
+msgid "The VPN login failed because the VPN program could not be started."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:120
+msgid ""
+"The VPN login failed because the VPN program could not connect to the VPN "
+"server."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:122
+msgid ""
+"The VPN login failed because the VPN configuration options were invalid."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:124
+msgid ""
+"The VPN login failed because the VPN program received an invalid "
+"configuration from the VPN server."
+msgstr ""
diff --git a/vpn-daemons/vpnc/po/zh_TW.po b/vpn-daemons/vpnc/po/zh_TW.po
new file mode 100644
index 0000000000..2543e0a6a8
--- /dev/null
+++ b/vpn-daemons/vpnc/po/zh_TW.po
@@ -0,0 +1,255 @@
+# Chinese message file for YaST2 (@memory@). -*- coding: utf-8 -*-
+# Copyright (C) 2005 SUSE Linux Products GmbH.
+# Copyright (C) 2002 SuSE Linux AG.
+# Copyright (C) 2001 SuSE GmbH.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: YaST (@memory@)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-05-16 17:10+0200\n"
+"PO-Revision-Date: 2001-06-05 18:04+02:00\n"
+"Last-Translator: 裴寒牧 <phm@a2e.de>\n"
+"Language-Team: 中� <nls-zh@suse.de>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:147
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "確�密碼(&E)："
+
+#: ../auth-dialog/gnome-two-password-dialog.c:267
+#, fuzzy
+msgid "_Username:"
+msgstr "使用者�稱(&U)："
+
+#: ../auth-dialog/gnome-two-password-dialog.c:269
+#, fuzzy
+msgid "_Domain:"
+msgstr "領域(&D)："
+
+#: ../auth-dialog/gnome-two-password-dialog.c:271
+#, fuzzy
+msgid "_Password:"
+msgstr "密碼："
+
+#: ../auth-dialog/gnome-two-password-dialog.c:354
+#, fuzzy
+msgid "Connect _anonymously"
+msgstr "連線"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:359
+#, fuzzy
+msgid "Connect as _user:"
+msgstr " 連接身份 "
+
+#: ../auth-dialog/gnome-two-password-dialog.c:465
+#, fuzzy
+msgid "_Remember passwords for this session"
+msgstr "�新輸入密碼以進行確�(&V)："
+
+#: ../auth-dialog/gnome-two-password-dialog.c:467
+#, fuzzy
+msgid "_Save passwords in keyring"
+msgstr "設定密碼加密"
+
+#: ../auth-dialog/main.c:161
+#, c-format
+msgid "You need to authenticate to access the Virtual Private Network '%s'."
+msgstr ""
+
+#: ../auth-dialog/main.c:162
+#, fuzzy
+msgid "Authenticate VPN"
+msgstr "é©—è­‰"
+
+#: ../auth-dialog/main.c:169
+#, fuzzy
+msgid "_Group Password:"
+msgstr "密碼："
+
+#: ../nm-vpnc.desktop.in.h:1
+msgid "Add, Remove, and Edit VPN Connections"
+msgstr ""
+
+#: ../nm-vpnc.desktop.in.h:2
+#, fuzzy
+msgid "VPN Connection Manager (vpnc)"
+msgstr "連線管�"
+
+#: ../properties/nm-vpnc.c:83
+msgid "Compatible Cisco VPN client (vpnc)"
+msgstr ""
+
+#: ../properties/nm-vpnc.c:447
+#, fuzzy
+msgid "The following vpnc VPN connection will be created:"
+msgstr "將�用下列掃�器："
+
+#: ../properties/nm-vpnc.c:449
+#, fuzzy, c-format
+msgid "Name:  %s"
+msgstr "�稱(&M)："
+
+#: ../properties/nm-vpnc.c:452
+#, fuzzy, c-format
+msgid "Gateway:  %s"
+msgstr "閘�：%1"
+
+#: ../properties/nm-vpnc.c:454
+#, fuzzy, c-format
+msgid "Group Name:  %s"
+msgstr "群組�稱："
+
+#: ../properties/nm-vpnc.c:458
+#, fuzzy, c-format
+msgid "Username:  %s"
+msgstr "使用者�稱：%1"
+
+#: ../properties/nm-vpnc.c:463
+#, fuzzy, c-format
+msgid "Domain:  %s"
+msgstr "領域(&D)："
+
+#: ../properties/nm-vpnc.c:468
+#, fuzzy, c-format
+msgid "Routes:  %s"
+msgstr "路由：%1"
+
+#: ../properties/nm-vpnc.c:472
+msgid "The connection details can be changed using the \"Edit\" button."
+msgstr ""
+
+#: ../properties/nm-vpnc.c:548
+#, fuzzy
+msgid "TCP tunneling not supported"
+msgstr "目��支�。"
+
+#: ../properties/nm-vpnc.c:550
+#, c-format
+msgid ""
+"The VPN settings file '%s' specifies that VPN traffic should be tunneled "
+"through TCP which is currently not supported in the vpnc software.\n"
+"\n"
+"The connection can still be created, with TCP tunneling disabled, however it "
+"may not work as expected."
+msgstr ""
+
+#: ../properties/nm-vpnc.c:574
+#, fuzzy
+msgid "Cannot import settings"
+msgstr "無法寫入設定�"
+
+#: ../properties/nm-vpnc.c:576
+#, fuzzy, c-format
+msgid "The VPN settings file '%s' does not contain valid data."
+msgstr "指定的檔案沒有包� TSIG 金鑰。"
+
+#: ../properties/nm-vpnc.c:593
+#, fuzzy
+msgid "Select file to import"
+msgstr "���載入的檔案。"
+
+#. printf ("in impl_export\n");
+#: ../properties/nm-vpnc.c:748
+msgid "Save as..."
+msgstr "�存新檔..."
+
+#: ../properties/nm-vpnc.c:778
+#, fuzzy, c-format
+msgid "A file named \"%s\" already exists."
+msgstr "�為 %1 的主機已經存在。"
+
+#: ../properties/nm-vpnc.c:781
+#, fuzzy
+msgid "Do you want to replace it with the one you are saving?"
+msgstr "您確定��設設定嗎？"
+
+#: ../properties/nm-vpnc-dialog.glade.h:1
+#, fuzzy
+msgid "<b>Connection Name</b>"
+msgstr "<b>�述： </b>"
+
+#: ../properties/nm-vpnc-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Required Information</b>"
+msgstr "<p><b>支�資訊</b></p>\n"
+
+#: ../properties/nm-vpnc-dialog.glade.h:3
+msgid "<i>example: 172.16.0.0/16 10.11.12.0/24</i>"
+msgstr ""
+
+#: ../properties/nm-vpnc-dialog.glade.h:4
+#, fuzzy
+msgid "G_roup Name:"
+msgstr "群組�稱："
+
+#: ../properties/nm-vpnc-dialog.glade.h:5
+#, fuzzy
+msgid "O_ptional Information"
+msgstr "�擇性資訊"
+
+#: ../properties/nm-vpnc-dialog.glade.h:6
+#, fuzzy
+msgid "Override _user name"
+msgstr "或�入使用者�稱(&U)："
+
+#: ../properties/nm-vpnc-dialog.glade.h:7
+msgid ""
+"Please enter the information provided by your system administrator below. Do "
+"not enter your password here as you will be prompted when connecting."
+msgstr ""
+
+#: ../properties/nm-vpnc-dialog.glade.h:8
+#, fuzzy
+msgid "Use _domain for authentication"
+msgstr "使用者驗證"
+
+#: ../properties/nm-vpnc-dialog.glade.h:9
+#, fuzzy
+msgid "_Gateway:"
+msgstr "閘�"
+
+#: ../properties/nm-vpnc-dialog.glade.h:10
+#, fuzzy
+msgid "_Import Saved Configuration..."
+msgstr "伺�器組態(&S)..."
+
+#: ../properties/nm-vpnc-dialog.glade.h:11
+msgid ""
+"_Name used to identify the connection to the private network, e.g. \"Campus "
+"VPN\" or \"Corporate Network\""
+msgstr ""
+
+#: ../properties/nm-vpnc-dialog.glade.h:12
+msgid "_Only use VPN connection for these addresses"
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:116
+msgid ""
+"The VPN login failed because the user name and password were not accepted."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:118
+msgid "The VPN login failed because the VPN program could not be started."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:120
+msgid ""
+"The VPN login failed because the VPN program could not connect to the VPN "
+"server."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:122
+msgid ""
+"The VPN login failed because the VPN configuration options were invalid."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:124
+msgid ""
+"The VPN login failed because the VPN program received an invalid "
+"configuration from the VPN server."
+msgstr ""
diff --git a/vpn-daemons/vpnc/properties/Makefile.am b/vpn-daemons/vpnc/properties/Makefile.am
index 907d75d821..9171d76237 100644
--- a/vpn-daemons/vpnc/properties/Makefile.am
+++ b/vpn-daemons/vpnc/properties/Makefile.am
@@ -18,7 +18,7 @@ libnm_vpnc_properties_la_CFLAGS =                          \
         -DG_DISABLE_DEPRECATED                          \
         -DGDK_DISABLE_DEPRECATED                        \
         -DGNOME_DISABLE_DEPRECATED                      \
-        -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"  \
+	-DGNOMELOCALEDIR=\"$(datadir)/locale\"		\
         -DVERSION=\"$(VERSION)\"
 
 libnm_vpnc_properties_la_LIBADD =       \
diff --git a/vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade b/vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade
index 0d3f1d744a..d5010c19dd 100644
--- a/vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade
+++ b/vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade
@@ -9,7 +9,7 @@
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">False</property>
-  <property name="resizable">True</property>
+  <property name="resizable">False</property>
   <property name="destroy_with_parent">False</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
@@ -21,10 +21,9 @@
 
   <child>
     <widget class="GtkVBox" id="nm-vpnc-widget">
-      <property name="border_width">12</property>
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
-      <property name="spacing">12</property>
+      <property name="spacing">6</property>
 
       <child>
 	<widget class="GtkLabel" id="label1">
@@ -52,54 +51,29 @@
       </child>
 
       <child>
-	<widget class="GtkVBox" id="vbox2">
+	<widget class="GtkVBox" id="vbox7">
 	  <property name="visible">True</property>
 	  <property name="homogeneous">False</property>
-	  <property name="spacing">6</property>
+	  <property name="spacing">18</property>
 
 	  <child>
-	    <widget class="GtkLabel" id="label2">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">&lt;b&gt;Connection Name&lt;/b&gt;</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">True</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	      <property name="width_chars">-1</property>
-	      <property name="single_line_mode">False</property>
-	      <property name="angle">0</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox1">
+	    <widget class="GtkVBox" id="vbox2">
 	      <property name="visible">True</property>
 	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
+	      <property name="spacing">6</property>
 
 	      <child>
-		<widget class="GtkLabel" id="label3">
+		<widget class="GtkLabel" id="label2">
 		  <property name="visible">True</property>
-		  <property name="label"></property>
+		  <property name="label" translatable="yes">&lt;b&gt;Connection Name&lt;/b&gt;</property>
 		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
+		  <property name="use_markup">True</property>
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
 		  <property name="wrap">False</property>
 		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
+		  <property name="xalign">0</property>
 		  <property name="yalign">0.5</property>
-		  <property name="xpad">12</property>
+		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
 		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 		  <property name="width_chars">-1</property>
@@ -114,56 +88,37 @@
 	      </child>
 
 	      <child>
-		<widget class="GtkVBox" id="vbox3">
+		<widget class="GtkAlignment" id="alignment2">
 		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="label4">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Name used to identify the connection to the private network, e.g. &quot;Campus VPN&quot; or &quot;Corporate Network&quot;</property>
-		      <property name="use_underline">True</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">True</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		      <property name="mnemonic_widget">vpnc-connection-name</property>
-		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		      <property name="width_chars">-1</property>
-		      <property name="single_line_mode">False</property>
-		      <property name="angle">0</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xscale">1</property>
+		  <property name="yscale">1</property>
+		  <property name="top_padding">0</property>
+		  <property name="bottom_padding">0</property>
+		  <property name="left_padding">12</property>
+		  <property name="right_padding">0</property>
 
 		  <child>
-		    <widget class="GtkHBox" id="hbox5">
+		    <widget class="GtkVBox" id="vbox3">
 		      <property name="visible">True</property>
 		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
+		      <property name="spacing">6</property>
 
 		      <child>
-			<widget class="GtkLabel" id="label12">
+			<widget class="GtkLabel" id="label4">
 			  <property name="visible">True</property>
-			  <property name="label"></property>
-			  <property name="use_underline">False</property>
+			  <property name="label" translatable="yes">_Name used to identify the connection to the private network, e.g. &quot;Campus VPN&quot; or &quot;Corporate Network&quot;</property>
+			  <property name="use_underline">True</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
+			  <property name="wrap">True</property>
 			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
+			  <property name="xalign">0</property>
 			  <property name="yalign">0.5</property>
-			  <property name="xpad">12</property>
+			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
+			  <property name="mnemonic_widget">vpnc-connection-name</property>
 			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 			  <property name="width_chars">-1</property>
 			  <property name="single_line_mode">False</property>
@@ -190,16 +145,11 @@
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
 			</packing>
 		      </child>
 		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
 		  </child>
 		</widget>
 		<packing>
@@ -215,63 +165,25 @@
 	      <property name="fill">True</property>
 	    </packing>
 	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkVBox" id="vbox4">
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">6</property>
 
 	  <child>
-	    <widget class="GtkLabel" id="label5">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">&lt;b&gt;Required Information&lt;/b&gt;</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">True</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	      <property name="width_chars">-1</property>
-	      <property name="single_line_mode">False</property>
-	      <property name="angle">0</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox2">
+	    <widget class="GtkVBox" id="vbox4">
 	      <property name="visible">True</property>
 	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
+	      <property name="spacing">6</property>
 
 	      <child>
-		<widget class="GtkLabel" id="label6">
+		<widget class="GtkLabel" id="label5">
 		  <property name="visible">True</property>
-		  <property name="label"></property>
+		  <property name="label" translatable="yes">&lt;b&gt;Required Information&lt;/b&gt;</property>
 		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
+		  <property name="use_markup">True</property>
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
 		  <property name="wrap">False</property>
 		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
+		  <property name="xalign">0</property>
 		  <property name="yalign">0.5</property>
-		  <property name="xpad">12</property>
+		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
 		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 		  <property name="width_chars">-1</property>
@@ -286,227 +198,48 @@
 	      </child>
 
 	      <child>
-		<widget class="GtkTable" id="table1">
+		<widget class="GtkAlignment" id="alignment3">
 		  <property name="visible">True</property>
-		  <property name="n_rows">2</property>
-		  <property name="n_columns">2</property>
-		  <property name="homogeneous">False</property>
-		  <property name="row_spacing">12</property>
-		  <property name="column_spacing">6</property>
-
-		  <child>
-		    <widget class="GtkEntry" id="vpnc-gateway">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="editable">True</property>
-		      <property name="visibility">True</property>
-		      <property name="max_length">0</property>
-		      <property name="text" translatable="yes"></property>
-		      <property name="has_frame">True</property>
-		      <property name="invisible_char">*</property>
-		      <property name="activates_default">False</property>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">1</property>
-		      <property name="right_attach">2</property>
-		      <property name="top_attach">0</property>
-		      <property name="bottom_attach">1</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkEntry" id="vpnc-group-name">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="editable">True</property>
-		      <property name="visibility">True</property>
-		      <property name="max_length">0</property>
-		      <property name="text" translatable="yes"></property>
-		      <property name="has_frame">True</property>
-		      <property name="invisible_char">*</property>
-		      <property name="activates_default">False</property>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">1</property>
-		      <property name="right_attach">2</property>
-		      <property name="top_attach">1</property>
-		      <property name="bottom_attach">2</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label7">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Gateway:</property>
-		      <property name="use_underline">True</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">1</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		      <property name="mnemonic_widget">vpnc-gateway</property>
-		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		      <property name="width_chars">-1</property>
-		      <property name="single_line_mode">False</property>
-		      <property name="angle">0</property>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">0</property>
-		      <property name="right_attach">1</property>
-		      <property name="top_attach">0</property>
-		      <property name="bottom_attach">1</property>
-		      <property name="x_options">fill</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label8">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">G_roup Name:</property>
-		      <property name="use_underline">True</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">1</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		      <property name="mnemonic_widget">vpnc-group-name</property>
-		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		      <property name="width_chars">-1</property>
-		      <property name="single_line_mode">False</property>
-		      <property name="angle">0</property>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">0</property>
-		      <property name="right_attach">1</property>
-		      <property name="top_attach">1</property>
-		      <property name="bottom_attach">2</property>
-		      <property name="x_options">fill</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkExpander" id="vpnc-optional-information-expander">
-	  <property name="visible">True</property>
-	  <property name="can_focus">True</property>
-	  <property name="expanded">False</property>
-	  <property name="spacing">6</property>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox3">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label10">
-		  <property name="visible">True</property>
-		  <property name="label"></property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
 		  <property name="xalign">0.5</property>
 		  <property name="yalign">0.5</property>
-		  <property name="xpad">12</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkVBox" id="vbox5">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkCheckButton" id="vpnc-use-alternate-username">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">Override _user name</property>
-		      <property name="use_underline">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-		      <property name="active">False</property>
-		      <property name="inconsistent">False</property>
-		      <property name="draw_indicator">True</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
+		  <property name="xscale">1</property>
+		  <property name="yscale">1</property>
+		  <property name="top_padding">0</property>
+		  <property name="bottom_padding">0</property>
+		  <property name="left_padding">12</property>
+		  <property name="right_padding">0</property>
 
 		  <child>
-		    <widget class="GtkHBox" id="hbox4">
+		    <widget class="GtkTable" id="table1">
 		      <property name="visible">True</property>
+		      <property name="n_rows">2</property>
+		      <property name="n_columns">2</property>
 		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
+		      <property name="row_spacing">6</property>
+		      <property name="column_spacing">12</property>
 
 		      <child>
-			<widget class="GtkLabel" id="label11">
+			<widget class="GtkEntry" id="vpnc-gateway">
 			  <property name="visible">True</property>
-			  <property name="label"></property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">12</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
+			  <property name="can_focus">True</property>
+			  <property name="editable">True</property>
+			  <property name="visibility">True</property>
+			  <property name="max_length">0</property>
+			  <property name="text" translatable="yes"></property>
+			  <property name="has_frame">True</property>
+			  <property name="invisible_char">*</property>
+			  <property name="activates_default">False</property>
 			</widget>
 			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">True</property>
+			  <property name="left_attach">1</property>
+			  <property name="right_attach">2</property>
+			  <property name="top_attach">0</property>
+			  <property name="bottom_attach">1</property>
 			</packing>
 		      </child>
 
 		      <child>
-			<widget class="GtkEntry" id="vpnc-username">
+			<widget class="GtkEntry" id="vpnc-group-name">
 			  <property name="visible">True</property>
 			  <property name="can_focus">True</property>
 			  <property name="editable">True</property>
@@ -518,178 +251,195 @@
 			  <property name="activates_default">False</property>
 			</widget>
 			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
+			  <property name="left_attach">1</property>
+			  <property name="right_attach">2</property>
+			  <property name="top_attach">1</property>
+			  <property name="bottom_attach">2</property>
 			</packing>
 		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkCheckButton" id="vpnc-use-domain">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">Use _domain for authentication</property>
-		      <property name="use_underline">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-		      <property name="active">False</property>
-		      <property name="inconsistent">False</property>
-		      <property name="draw_indicator">True</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkHBox" id="hbox8">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
 
 		      <child>
-			<widget class="GtkLabel" id="label16">
+			<widget class="GtkLabel" id="label7">
 			  <property name="visible">True</property>
-			  <property name="label"></property>
-			  <property name="use_underline">False</property>
+			  <property name="label" translatable="yes">_Gateway:</property>
+			  <property name="use_underline">True</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
 			  <property name="wrap">False</property>
 			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
+			  <property name="xalign">1</property>
 			  <property name="yalign">0.5</property>
-			  <property name="xpad">12</property>
+			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
+			  <property name="mnemonic_widget">vpnc-gateway</property>
 			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 			  <property name="width_chars">-1</property>
 			  <property name="single_line_mode">False</property>
 			  <property name="angle">0</property>
 			</widget>
 			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">True</property>
+			  <property name="left_attach">0</property>
+			  <property name="right_attach">1</property>
+			  <property name="top_attach">0</property>
+			  <property name="bottom_attach">1</property>
+			  <property name="x_options">fill</property>
 			</packing>
 		      </child>
 
 		      <child>
-			<widget class="GtkEntry" id="vpnc-domain">
+			<widget class="GtkLabel" id="label8">
 			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="visibility">True</property>
-			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes"></property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char">*</property>
-			  <property name="activates_default">False</property>
+			  <property name="label" translatable="yes">G_roup Name:</property>
+			  <property name="use_underline">True</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">1</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			  <property name="mnemonic_widget">vpnc-group-name</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
+			  <property name="left_attach">0</property>
+			  <property name="right_attach">1</property>
+			  <property name="top_attach">1</property>
+			  <property name="bottom_attach">2</property>
+			  <property name="x_options">fill</property>
 			</packing>
 		      </child>
 		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
 		  </child>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">True</property>
+	      <property name="fill">True</property>
+	    </packing>
+	  </child>
 
-		  <child>
-		    <widget class="GtkCheckButton" id="vpnc-use-routes">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">_Only use VPN connection for these addresses</property>
-		      <property name="use_underline">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-		      <property name="active">False</property>
-		      <property name="inconsistent">False</property>
-		      <property name="draw_indicator">True</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
+	  <child>
+	    <widget class="GtkExpander" id="vpnc-optional-information-expander">
+	      <property name="visible">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="expanded">False</property>
+	      <property name="spacing">6</property>
+
+	      <child>
+		<widget class="GtkAlignment" id="alignment4">
+		  <property name="visible">True</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xscale">1</property>
+		  <property name="yscale">1</property>
+		  <property name="top_padding">0</property>
+		  <property name="bottom_padding">0</property>
+		  <property name="left_padding">12</property>
+		  <property name="right_padding">0</property>
 
 		  <child>
-		    <widget class="GtkHBox" id="hbox6">
+		    <widget class="GtkVBox" id="vbox5">
 		      <property name="visible">True</property>
 		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
+		      <property name="spacing">6</property>
 
 		      <child>
-			<widget class="GtkLabel" id="label13">
+			<widget class="GtkCheckButton" id="vpnc-use-alternate-username">
 			  <property name="visible">True</property>
-			  <property name="label"></property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">12</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
+			  <property name="can_focus">True</property>
+			  <property name="label" translatable="yes">Override _user name</property>
+			  <property name="use_underline">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="focus_on_click">True</property>
+			  <property name="active">False</property>
+			  <property name="inconsistent">False</property>
+			  <property name="draw_indicator">True</property>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
-			  <property name="expand">False</property>
+			  <property name="expand">True</property>
 			  <property name="fill">True</property>
 			</packing>
 		      </child>
 
 		      <child>
-			<widget class="GtkVBox" id="vbox6">
+			<widget class="GtkAlignment" id="alignment5">
 			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">6</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xscale">1</property>
+			  <property name="yscale">1</property>
+			  <property name="top_padding">0</property>
+			  <property name="bottom_padding">0</property>
+			  <property name="left_padding">12</property>
+			  <property name="right_padding">0</property>
 
 			  <child>
-			    <widget class="GtkLabel" id="label14">
+			    <widget class="GtkEntry" id="vpnc-username">
 			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">&lt;i&gt;example: 172.16.0.0/16 10.11.12.0/24&lt;/i&gt;</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">True</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			      <property name="width_chars">-1</property>
-			      <property name="single_line_mode">False</property>
-			      <property name="angle">0</property>
+			      <property name="can_focus">True</property>
+			      <property name="editable">True</property>
+			      <property name="visibility">True</property>
+			      <property name="max_length">0</property>
+			      <property name="text" translatable="yes"></property>
+			      <property name="has_frame">True</property>
+			      <property name="invisible_char">*</property>
+			      <property name="activates_default">False</property>
 			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">True</property>
-			    </packing>
 			  </child>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkCheckButton" id="vpnc-use-domain">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="label" translatable="yes">Use _domain for authentication</property>
+			  <property name="use_underline">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="focus_on_click">True</property>
+			  <property name="active">False</property>
+			  <property name="inconsistent">False</property>
+			  <property name="draw_indicator">True</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkAlignment" id="alignment6">
+			  <property name="visible">True</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xscale">1</property>
+			  <property name="yscale">1</property>
+			  <property name="top_padding">0</property>
+			  <property name="bottom_padding">0</property>
+			  <property name="left_padding">12</property>
+			  <property name="right_padding">0</property>
 
 			  <child>
-			    <widget class="GtkEntry" id="vpnc-routes">
+			    <widget class="GtkEntry" id="vpnc-domain">
 			      <property name="visible">True</property>
 			      <property name="can_focus">True</property>
 			      <property name="editable">True</property>
@@ -700,11 +450,96 @@
 			      <property name="invisible_char">*</property>
 			      <property name="activates_default">False</property>
 			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
+			  </child>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkCheckButton" id="vpnc-use-routes">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="label" translatable="yes">_Only use VPN connection for these addresses</property>
+			  <property name="use_underline">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="focus_on_click">True</property>
+			  <property name="active">False</property>
+			  <property name="inconsistent">False</property>
+			  <property name="draw_indicator">True</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkAlignment" id="alignment7">
+			  <property name="visible">True</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xscale">1</property>
+			  <property name="yscale">1</property>
+			  <property name="top_padding">0</property>
+			  <property name="bottom_padding">0</property>
+			  <property name="left_padding">12</property>
+			  <property name="right_padding">0</property>
+
+			  <child>
+			    <widget class="GtkVBox" id="vbox6">
+			      <property name="visible">True</property>
+			      <property name="homogeneous">False</property>
+			      <property name="spacing">6</property>
+
+			      <child>
+				<widget class="GtkLabel" id="label14">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">&lt;i&gt;example: 172.16.0.0/16 10.11.12.0/24&lt;/i&gt;</property>
+				  <property name="use_underline">False</property>
+				  <property name="use_markup">True</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">True</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkEntry" id="vpnc-routes">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="editable">True</property>
+				  <property name="visibility">True</property>
+				  <property name="max_length">0</property>
+				  <property name="text" translatable="yes"></property>
+				  <property name="has_frame">True</property>
+				  <property name="invisible_char">*</property>
+				  <property name="activates_default">False</property>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">True</property>
+				  <property name="fill">True</property>
+				</packing>
+			      </child>
+			    </widget>
 			  </child>
 			</widget>
 			<packing>
@@ -714,130 +549,125 @@
 			</packing>
 		      </child>
 		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
 		  </child>
 		</widget>
+	      </child>
+
+	      <child>
+		<widget class="GtkLabel" id="label17">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">O_ptional Information</property>
+		  <property name="use_underline">True</property>
+		  <property name="use_markup">True</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		</widget>
 		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
+		  <property name="type">label_item</property>
 		</packing>
 	      </child>
 	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label17">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">O_ptional Information</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">True</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	      <property name="width_chars">-1</property>
-	      <property name="single_line_mode">False</property>
-	      <property name="angle">0</property>
-	    </widget>
 	    <packing>
-	      <property name="type">label_item</property>
+	      <property name="padding">0</property>
+	      <property name="expand">True</property>
+	      <property name="fill">True</property>
 	    </packing>
 	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkHButtonBox" id="hbuttonbox1">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-	  <property name="spacing">0</property>
 
 	  <child>
-	    <widget class="GtkButton" id="vpnc-import-button">
+	    <widget class="GtkHButtonBox" id="hbuttonbox1">
 	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
+	      <property name="layout_style">GTK_BUTTONBOX_END</property>
+	      <property name="spacing">0</property>
 
 	      <child>
-		<widget class="GtkAlignment" id="alignment1">
+		<widget class="GtkButton" id="vpnc-import-button">
 		  <property name="visible">True</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xscale">0</property>
-		  <property name="yscale">0</property>
-		  <property name="top_padding">0</property>
-		  <property name="bottom_padding">0</property>
-		  <property name="left_padding">0</property>
-		  <property name="right_padding">0</property>
+		  <property name="can_default">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="relief">GTK_RELIEF_NORMAL</property>
+		  <property name="focus_on_click">True</property>
 
 		  <child>
-		    <widget class="GtkHBox" id="hbox7">
+		    <widget class="GtkAlignment" id="alignment1">
 		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">2</property>
+		      <property name="xalign">0.5</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xscale">0</property>
+		      <property name="yscale">0</property>
+		      <property name="top_padding">0</property>
+		      <property name="bottom_padding">0</property>
+		      <property name="left_padding">0</property>
+		      <property name="right_padding">0</property>
 
 		      <child>
-			<widget class="GtkImage" id="image1">
+			<widget class="GtkHBox" id="hbox7">
 			  <property name="visible">True</property>
-			  <property name="stock">gtk-add</property>
-			  <property name="icon_size">4</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">2</property>
 
-		      <child>
-			<widget class="GtkLabel" id="label15">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Import Saved Configuration...</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
+			  <child>
+			    <widget class="GtkImage" id="image1">
+			      <property name="visible">True</property>
+			      <property name="stock">gtk-add</property>
+			      <property name="icon_size">4</property>
+			      <property name="xalign">0.5</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkLabel" id="label15">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">_Import Saved Configuration...</property>
+			      <property name="use_underline">True</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0.5</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
 			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
 		      </child>
 		    </widget>
 		  </child>
 		</widget>
 	      </child>
 	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">True</property>
+	      <property name="fill">True</property>
+	    </packing>
 	  </child>
 	</widget>
 	<packing>
diff --git a/vpn-daemons/vpnc/properties/nm-vpnc.c b/vpn-daemons/vpnc/properties/nm-vpnc.c
index 44887d4589..c861fcc892 100644
--- a/vpn-daemons/vpnc/properties/nm-vpnc.c
+++ b/vpn-daemons/vpnc/properties/nm-vpnc.c
@@ -627,7 +627,7 @@ impl_import_file (NetworkManagerVpnUI *self, const char *path)
 	return import_from_file (impl, path);
 }
 
-static void
+static gboolean
 export_to_file (NetworkManagerVpnUIImpl *impl, const char *path, 
 		GSList *properties, GSList *routes, const char *connection_name)
 {
@@ -638,6 +638,7 @@ export_to_file (NetworkManagerVpnUIImpl *impl, const char *path,
 	const char *username = NULL;
 	const char *domain = NULL;
 	char *routes_str = NULL;
+	gboolean ret = TRUE;
 
 	/*printf ("in export_to_file; path='%s'\n", path);*/
 
@@ -681,7 +682,10 @@ export_to_file (NetworkManagerVpnUIImpl *impl, const char *path,
 
 	f = fopen (path, "w");
 	if (f == NULL)
+	{
+		ret = FALSE;
 		goto out;
+	}
 
 	fprintf (f, 
 		 "[main]\n"
@@ -730,8 +734,9 @@ export_to_file (NetworkManagerVpnUIImpl *impl, const char *path,
 
 	fclose (f);
 out:
-
 	g_free (routes_str);
+
+	return ret;
 }
 
 
@@ -763,7 +768,7 @@ impl_export (NetworkManagerVpnUI *self, GSList *properties, GSList *routes, cons
 		/*printf ("User selected '%s'\n", path);*/
 
 	}
-	
+
 	gtk_widget_destroy (dialog);
 
 	if (path != NULL) {
@@ -785,8 +790,20 @@ impl_export (NetworkManagerVpnUI *self, GSList *properties, GSList *routes, cons
 				goto out;
 		}
 
-		export_to_file (impl, path, properties, routes, connection_name);
-	}      
+		if (!export_to_file (impl, path, properties, routes, connection_name)) {
+			GtkWidget *dialog;
+
+			dialog = gtk_message_dialog_new (NULL,
+									   GTK_DIALOG_DESTROY_WITH_PARENT,
+									   GTK_MESSAGE_WARNING,
+									   GTK_BUTTONS_CLOSE,
+									   _("Failed to export configuration"));
+			gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+											  _("Failed to save file %s"), path);
+			gtk_dialog_run (GTK_DIALOG (dialog));
+			gtk_widget_destroy (dialog);
+		}
+	}
 
 out:
 	g_free (path);
diff --git a/vpn-daemons/vpnc/src/nm-vpnc-service.c b/vpn-daemons/vpnc/src/nm-vpnc-service.c
index e400e0e6aa..3393caca02 100644
--- a/vpn-daemons/vpnc/src/nm-vpnc-service.c
+++ b/vpn-daemons/vpnc/src/nm-vpnc-service.c
@@ -869,6 +869,7 @@ static void nm_vpnc_dbus_process_helper_ip4_config (DBusConnection *con, DBusMes
 	guint32		ip4_dns_len;
 	guint32 *		ip4_nbns;
 	guint32		ip4_nbns_len;
+	guint32		mss;
 	char *		cisco_def_domain;
 	char *		cisco_banner;
 	gboolean		success = FALSE;
@@ -897,6 +898,10 @@ static void nm_vpnc_dbus_process_helper_ip4_config (DBusConnection *con, DBusMes
 
 	/* For Cisco/vpnc, PtP address == local VPN address */
 	ip4_ptp_address = ip4_address;
+
+	/* and we don't specify an MSS */
+	mss = 0;
+
 #if 0
 	print_vpn_config (ip4_vpn_gateway, tundev, ip4_address, ip4_netmask,
 					ip4_dns, ip4_dns_len, ip4_nbns, ip4_nbns_len,
@@ -914,6 +919,7 @@ static void nm_vpnc_dbus_process_helper_ip4_config (DBusConnection *con, DBusMes
 	                          DBUS_TYPE_UINT32, &ip4_netmask,
 	                          DBUS_TYPE_ARRAY, DBUS_TYPE_UINT32, &ip4_dns, ip4_dns_len,
 	                          DBUS_TYPE_ARRAY, DBUS_TYPE_UINT32, &ip4_nbns, ip4_nbns_len,
+						 DBUS_TYPE_UINT32, &mss,
 	                          DBUS_TYPE_STRING, &cisco_def_domain,
 	                          DBUS_TYPE_STRING, &cisco_banner, DBUS_TYPE_INVALID);
 	if (!dbus_connection_send (data->con, signal, NULL))