Copy over trunk nm-applet from NM svn

svn path=/trunk/; revision=4

68 files changed, 17133 insertions, 19880 deletions

diff --git a/configure.ac b/configure.ac
index 77a30965..90433df7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ(2.52)
 
-AC_INIT(nm-applet, 0.6.5, dcbw@redhat.com, nm-applet)
+AC_INIT(nm-applet, 0.7.0, dcbw@redhat.com, nm-applet)
 AM_INIT_AUTOMAKE([subdir-objects])
 AM_MAINTAINER_MODE
 
@@ -49,8 +49,7 @@ dnl
 GETTEXT_PACKAGE=nm-applet
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
-ALL_LINGUAS="bg bs ca cs da de el en_CA en_GB es fi fr gu hr hu it ja ko lt pl 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])
+IT_PROG_INTLTOOL([0.35.0])
 AM_GLIB_GNU_GETTEXT
 
 dnl
@@ -139,7 +138,16 @@ AC_SUBST(GNOME_KEYRING_CFLAGS)
 AC_SUBST(GNOME_KEYRING_LIBS)
 
 LIBNOTIFY_REQUIRED=0.3.0
-AC_ARG_WITH(notify, AC_HELP_STRING([--with-notify], [Use libnotify]), enable_notify=$withval, enable_notify=auto)
+
+# Building with GTK+ >= 2.10 will use the GtkStatusIcon applet
+# implementation.  Earlier versions of GTK+ will use the EggTrayIcon
+# applet implementation.
+
+PKG_CHECK_EXISTS([gtk+-2.0 >= 2.10],[have_gtk_2_10=yes LIBNOTIFY_REQUIRED=0.4.3],[have_gtk_2_10=no])
+if test x"$have_gtk_2_10" != xno; then
+	AC_DEFINE_UNQUOTED([HAVE_STATUS_ICON], [1],
+		[Use GtkStatusIcon for the applet's icon rather than an EggTrayIcon])
+fi
 
 if test x"$enable_notify" != xno; then
 	PKG_CHECK_MODULES([NOTIFY], [libnotify >= $LIBNOTIFY_REQUIRED], [enable_notify=yes],
@@ -149,7 +157,6 @@ if test x"$enable_notify" != xno; then
 		[Enable notifications with libnotify])
 	fi
 fi
-AM_CONDITIONAL(WITH_NOTIFY, test x"$enable_notify" != xno) # can't do it from inside 'if'
 
 PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0)
 AC_SUBST(LIBGNOMEUI_CFLAGS)
@@ -160,6 +167,9 @@ if test "$have_libgnome_2_14" = "yes"; then
 	AC_DEFINE([HAVE_LIBGNOME_2_14],[1],[Define if we have libgnome 2.14])
 fi
 
+AM_CONDITIONAL(WITH_NOTIFY, test x"$enable_notify" != xno) # can't do it from inside 'if'
+AM_CONDITIONAL([HAVE_GTK_2_10],[test "$have_gtk_2_10" = "yes"])
+
 AC_ARG_WITH(dbus-sys, AC_HELP_STRING([--with-dbus-sys=DIR], [where D-BUS system.d directory is]))
 
 if ! test -z "$with_dbus_sys" ; then
diff --git a/nm-applet.conf b/nm-applet.conf
index a4b02e70..4fb82705 100644
--- a/nm-applet.conf
+++ b/nm-applet.conf
@@ -20,5 +20,7 @@
 		<deny send_destination="org.freedesktop.NetworkManagerInfo"/>
 		<deny send_interface="org.freedesktop.NetworkManagerInfo"/>
 	</policy>
+
+        <limit name="max_replies_per_connection">512</limit>
 </busconfig>
 
diff --git a/po/LINGUAS b/po/LINGUAS
new file mode 100644
index 00000000..3b9b1df3
--- /dev/null
+++ b/po/LINGUAS
@@ -0,0 +1,46 @@
+# please keep this list sorted alphabetically
+#
+ar
+bg
+bs
+ca
+cs
+da
+de
+dz
+el
+en_CA
+en_GB
+es
+et
+fi
+fr
+gu
+hr
+hu
+it
+ja
+ko
+ku
+lt
+lv
+mk
+nb
+ne
+nl
+pa
+pt_BR
+ru
+rw
+sk
+sl
+sq
+sr
+sr@Latn
+sv
+th
+uk
+vi
+wa
+zh_CN
+zh_TW
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
deleted file mode 100644
index d2d4e4cd..00000000
--- a/po/Makefile.in.in
+++ /dev/null
@@ -1,221 +0,0 @@
-# Makefile for program source directory in GNU NLS utilities package.
-# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
-#
-# This file file be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
-#
-# - Modified by Owen Taylor <otaylor@redhat.com> to use GETTEXT_PACKAGE
-#   instead of PACKAGE and to look for po2tbl in ./ not in intl/
-#
-# - Modified by jacob berkman <jacob@ximian.com> to install
-#   Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
-#
-# - Modified by Rodney Dawes <dobey@novell.com> for use with intltool
-#
-# We have the following line for use by intltoolize:
-# INTLTOOL_MAKEFILE
-
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-VPATH = @srcdir@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-datadir = @datadir@
-datarootdir = @datarootdir@
-libdir = @libdir@
-DATADIRNAME = @DATADIRNAME@
-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
-subdir = po
-install_sh = @install_sh@
-# Automake >= 1.8 provides @mkdir_p@.
-# Until it can be supposed, use the safe fallback:
-mkdir_p = $(install_sh) -d
-
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-
-GMSGFMT = @GMSGFMT@
-MSGFMT = @MSGFMT@
-XGETTEXT = @XGETTEXT@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
-GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
-
-ALL_LINGUAS = @ALL_LINGUAS@
-
-PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi)
-
-POFILES=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else LINGUAS="$(ALL_LINGUAS)"; fi; for lang in $$LINGUAS; do printf "$$lang.po "; done)
-
-DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES)
-EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
-
-POTFILES = \
-#This Gets Replace for some reason
-
-CATALOGS=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else LINGUAS="$(ALL_LINGUAS)"; fi; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
-
-.SUFFIXES:
-.SUFFIXES: .po .pox .gmo .mo .msg .cat
-
-.po.pox:
-	$(MAKE) $(GETTEXT_PACKAGE).pot
-	$(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
-
-.po.mo:
-	$(MSGFMT) -o $@ $<
-
-.po.gmo:
-	file=`echo $* | sed 's,.*/,,'`.gmo \
-	  && rm -f $$file && $(GMSGFMT) -o $$file $<
-
-.po.cat:
-	sed -f ../intl/po2msg.sed < $< > $*.msg \
-	  && rm -f $@ && gencat $@ $*.msg
-
-
-all: all-@USE_NLS@
-
-all-yes: $(CATALOGS)
-all-no:
-
-$(GETTEXT_PACKAGE).pot: $(POTFILES)
-	$(GENPOT)
-
-install: install-data
-install-data: install-data-@USE_NLS@
-install-data-no: all
-install-data-yes: all
-	$(mkdir_p) $(DESTDIR)$(itlocaledir)
-	if test -n "$(PO_LINGUAS)"; then \
-	  linguas="$(PO_LINGUAS)"; \
-	else \
-	  linguas="$(ALL_LINGUAS)"; \
-	fi; \
-	for lang in $$linguas; do \
-	  dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
-	  $(mkdir_p) $$dir; \
-	  if test -r $$lang.gmo; then \
-	    $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
-	    echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
-	  else \
-	    $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
-	    echo "installing $(srcdir)/$$lang.gmo as" \
-		 "$$dir/$(GETTEXT_PACKAGE).mo"; \
-	  fi; \
-	  if test -r $$lang.gmo.m; then \
-	    $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
-	    echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
-	  else \
-	    if test -r $(srcdir)/$$lang.gmo.m ; then \
-	      $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \
-		$$dir/$(GETTEXT_PACKAGE).mo.m; \
-	      echo "installing $(srcdir)/$$lang.gmo.m as" \
-		   "$$dir/$(GETTEXT_PACKAGE).mo.m"; \
-	    else \
-	      true; \
-	    fi; \
-	  fi; \
-	done
-
-# Empty stubs to satisfy archaic automake needs
-dvi info tags TAGS ID:
-
-# Define this as empty until I found a useful application.
-installcheck:
-
-uninstall:
-	if test -n "$(PO_LINGUAS)"; then \
-	  linguas="$(PO_LINGUAS)"; \
-	else \
-	  linguas="$(ALL_LINGUAS)"; \
-	fi; \
-	for lang in $$linguas; do \
-	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
-	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
-	done
-
-check: all $(GETTEXT_PACKAGE).pot
-
-mostlyclean:
-	rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
-	rm -f .intltool-merge-cache
-
-clean: mostlyclean
-
-distclean: clean
-	rm -f Makefile Makefile.in POTFILES stamp-it
-	rm -f *.mo *.msg *.cat *.cat.m *.gmo
-
-maintainer-clean: distclean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-	rm -f Makefile.in.in
-
-distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: $(DISTFILES)
-	dists="$(DISTFILES)"; \
-	extra_dists="$(EXTRA_DISTFILES)"; \
-	for file in $$extra_dists; do \
-	  test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \
-	done; \
-	for file in $$dists; do \
-	  test -f $$file || file="$(srcdir)/$$file"; \
-	  ln $$file $(distdir) 2> /dev/null \
-	    || cp -p $$file $(distdir); \
-	done
-
-update-po: Makefile
-	$(MAKE) $(GETTEXT_PACKAGE).pot
-	tmpdir=`pwd`; \
-	if test -n "$(PO_LINGUAS)"; then \
-	  linguas="$(PO_LINGUAS)"; \
-	else \
-	  linguas="$(ALL_LINGUAS)"; \
-	fi; \
-	for lang in $$linguas; do \
-	  echo "$$lang:"; \
-	  result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
-	  if $$result; then \
-	    if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
-	      rm -f $$tmpdir/$$lang.new.po; \
-            else \
-	      if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
-	        :; \
-	      else \
-	        echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
-	        rm -f $$tmpdir/$$lang.new.po; \
-	        exit 1; \
-	      fi; \
-	    fi; \
-	  else \
-	    echo "msgmerge for $$lang.gmo failed!"; \
-	    rm -f $$tmpdir/$$lang.new.po; \
-	  fi; \
-	done
-
-Makefile POTFILES: stamp-it
-	@if test ! -f $@; then \
-	  rm -f stamp-it; \
-	  $(MAKE) stamp-it; \
-	fi
-
-stamp-it: Makefile.in.in ../config.status POTFILES.in
-	cd .. \
-	  && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
-	       $(SHELL) ./config.status
-
-# Tell versions [3.59,3.63) of GNU make not to export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3c72f023..efeb5b32 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,21 +1,3 @@
 [encoding: UTF-8]
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-src/applet-compat.c
-src/applet-dbus-devices.c
-src/applet-dbus-info.c
-src/applet-dbus.c
-src/applet.c
-src/applet.glade
-src/eggtrayicon.c
-src/menu-items.c
-src/other-network-dialog.c
-src/passphrase-dialog.c
-src/vpn-password-dialog.c
-src/wireless-security-option.c
-src/wso-none.c
-src/wso-wep-ascii.c
-src/wso-wep-hex.c
-src/wso-wep-passphrase.c
-src/wso-wpa-eap.c
-src/wso-wpa-psk.c
diff --git a/po/ar.po b/po/ar.po
new file mode 100644
index 00000000..5fedf345
--- /dev/null
+++ b/po/ar.po
@@ -0,0 +1,1021 @@
+# Arabic translations for PACKAGE package.
+# Copyright (C) 2006 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Automatically generated, 2006.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Project\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-01-04 01:55+0000\n"
+"PO-Revision-Date: 2006-11-18 00:58+0100\n"
+"Last-Translator: Djihed Afifi <djihed@gmail.com>\n"
+"Language-Team: Arabic <doc@arabeyes.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=6; plural=n == 0 ? 0 : n == 1 ? 1 : n == 2 ? 2 : n >= "
+"3 && n <= 10 ? 3 : n >= 11 && n <= 99 ? 4 : 5;\n"
+"X-Poedit-Language: Arabic\n"
+
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:926
+#, fuzzy, c-format
+msgid "Passphrase for wireless network %s"
+msgstr "مراقبة قوة الرابط الهوائي للشبكة"
+
+#: ../gnome/applet/applet-dbus.c:274
+#, fuzzy, c-format
+msgid "Connection to the wireless network '%s' failed."
+msgstr "فشل الاتصال بخادم القواميس %s:%d"
+
+#: ../gnome/applet/applet-dbus.c:279
+#, fuzzy
+msgid "Connection to the wired network failed."
+msgstr "فشل الاتصال بخادم القواميس %s:%d"
+
+#: ../gnome/applet/applet.c:182
+#, fuzzy
+msgid "Error displaying connection information:"
+msgstr "سطر لعرض المعلومات"
+
+#: ../gnome/applet/applet.c:200
+msgid "Could not find some required resources (the glade file)!"
+msgstr ""
+
+#: ../gnome/applet/applet.c:210
+#, fuzzy
+msgid "No active connections!"
+msgstr "جاري جلب اتّصالات الإنترنت النّشطة"
+
+#: ../gnome/applet/applet.c:227
+#, fuzzy, c-format
+msgid "%d Mb/s"
+msgstr "مب"
+
+#: ../gnome/applet/applet.c:230
+#, fuzzy, c-format
+msgid "Wired Ethernet (%s)"
+msgstr "واجهة إيثرنت"
+
+#: ../gnome/applet/applet.c:232
+#, fuzzy, c-format
+msgid "Wireless Ethernet (%s)"
+msgstr "واجهة إيثرنت"
+
+#: ../gnome/applet/applet.c:238
+#, fuzzy
+msgid "Unknown"
+msgstr "مجهول"
+
+#: ../gnome/applet/applet.c:330 ../gnome/applet/applet.c:357
+#, fuzzy
+msgid "NetworkManager Applet"
+msgstr "بريمج جافا"
+
+#: ../gnome/applet/applet.c:332
+msgid ""
+"Copyright © 2004-2006 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+msgstr ""
+
+#: ../gnome/applet/applet.c:334 ../gnome/applet/applet.c:361
+msgid ""
+"Notification area applet for managing your network devices and connections."
+msgstr ""
+
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:365
+#, fuzzy
+msgid "translator-credits"
+msgstr "Yousef Raffah يوسف رفه (yousef@raffah.com)"
+
+#: ../gnome/applet/applet.c:359
+msgid ""
+"Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+msgstr ""
+
+#: ../gnome/applet/applet.c:421
+#, fuzzy
+msgid "VPN Login Failure"
+msgstr "فشل في توقيع الشّهادة"
+
+#: ../gnome/applet/applet.c:422
+#, c-format
+msgid "Could not start the VPN connection '%s' due to a login failure."
+msgstr ""
+
+#: ../gnome/applet/applet.c:426
+#, fuzzy
+msgid "VPN Start Failure"
+msgstr "فشل في توقيع الشّهادة"
+
+#: ../gnome/applet/applet.c:427
+#, c-format
+msgid ""
+"Could not start the VPN connection '%s' due to a failure launching the VPN "
+"program."
+msgstr ""
+
+#: ../gnome/applet/applet.c:431 ../gnome/applet/applet.c:441
+#, fuzzy
+msgid "VPN Connect Failure"
+msgstr "فشل في توقيع الشّهادة"
+
+#: ../gnome/applet/applet.c:432
+#, c-format
+msgid "Could not start the VPN connection '%s' due to a connection error."
+msgstr ""
+
+#: ../gnome/applet/applet.c:436
+#, fuzzy
+msgid "VPN Configuration Error"
+msgstr "خطأ أثناء حفظ الإعدادات: %s."
+
+#: ../gnome/applet/applet.c:437
+#, c-format
+msgid "The VPN connection '%s' was not correctly configured."
+msgstr ""
+
+#: ../gnome/applet/applet.c:442
+#, 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:512
+#, fuzzy
+msgid "VPN Login Message"
+msgstr "رسالة إجتماع رديئة"
+
+#: ../gnome/applet/applet.c:737 ../gnome/applet/applet.c:2635
+#: ../gnome/applet/other-network-dialog.c:458
+#: ../gnome/applet/passphrase-dialog.c:228
+msgid ""
+"The NetworkManager Applet could not find some required resources (the glade "
+"file was not found)."
+msgstr ""
+
+#: ../gnome/applet/applet.c:749
+#, c-format
+msgid "The network device \"%s (%s)\" does not support wireless scanning."
+msgstr ""
+
+#: ../gnome/applet/applet.c:757
+#, c-format
+msgid "The network device \"%s (%s)\" does not support link detection."
+msgstr ""
+
+#. Note to translators: this is used if no essid is known
+#: ../gnome/applet/applet.c:905 ../gnome/applet/applet.c:1103
+#, fuzzy
+msgid "(unknown)"
+msgstr "(مجهول)"
+
+#: ../gnome/applet/applet.c:911
+#, fuzzy, c-format
+msgid "Preparing device %s for the wired network..."
+msgstr "تحميل المعلومات لجهاز شبكة"
+
+#: ../gnome/applet/applet.c:913
+#, fuzzy, c-format
+msgid "Preparing device %s for the wireless network '%s'..."
+msgstr "تحميل المعلومات لجهاز شبكة"
+
+#: ../gnome/applet/applet.c:921
+#, fuzzy, c-format
+msgid "Configuring device %s for the wired network..."
+msgstr "تحميل المعلومات لجهاز شبكة"
+
+#: ../gnome/applet/applet.c:923
+#, c-format
+msgid "Attempting to join the wireless network '%s'..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:931
+#, c-format
+msgid "Waiting for Network Key for the wireless network '%s'..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:939 ../gnome/applet/applet.c:949
+msgid "Requesting a network address from the wired network..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:941 ../gnome/applet/applet.c:951
+#, c-format
+msgid "Requesting a network address from the wireless network '%s'..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:959
+#, fuzzy
+msgid "Finishing connection to the wired network..."
+msgstr "نصّب اتصال شبكة بهذا الخادم"
+
+#: ../gnome/applet/applet.c:961
+#, fuzzy, c-format
+msgid "Finishing connection to the wireless network '%s'..."
+msgstr "نصّب اتصال شبكة بهذا الخادم"
+
+#: ../gnome/applet/applet.c:1078
+#, fuzzy
+msgid "NetworkManager is not running"
+msgstr "GDM لا يعمل"
+
+#: ../gnome/applet/applet.c:1086 ../gnome/applet/applet.c:1843
+#, fuzzy
+msgid "Networking disabled"
+msgstr "<b>بريمجات معطلة</b>"
+
+#: ../gnome/applet/applet.c:1091
+#, fuzzy
+msgid "No network connection"
+msgstr "لم توجد أجهزة شبكة"
+
+#: ../gnome/applet/applet.c:1096
+#, fuzzy
+msgid "Wired network connection"
+msgstr "نوع الاتصال - الصفحة %d/%d"
+
+#: ../gnome/applet/applet.c:1100
+msgid "Connected to an Ad-Hoc wireless network"
+msgstr ""
+
+#: ../gnome/applet/applet.c:1102
+#, fuzzy, c-format
+msgid "Wireless network connection to '%s' (%d%%)"
+msgstr "نصّب اتصال شبكة بهذا الخادم"
+
+#: ../gnome/applet/applet.c:1123
+#, fuzzy, c-format
+msgid "VPN connection to '%s'"
+msgstr "الإتّصال بالنّادل"
+
+#: ../gnome/applet/applet.c:1131
+#, fuzzy, c-format
+msgid "VPN connecting to '%s'"
+msgstr "ا_ستعادة الحالة الأصلية"
+
+#: ../gnome/applet/applet.c:1556
+msgid "_Connect to Other Wireless Network..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1577
+#, fuzzy
+msgid "Create _New Wireless Network..."
+msgstr "إنشاء قائمة مراسَلين جديدة"
+
+#: ../gnome/applet/applet.c:1700
+#, fuzzy
+msgid "_VPN Connections"
+msgstr "الإتّصالات النّشطة"
+
+#: ../gnome/applet/applet.c:1745
+#, fuzzy
+msgid "_Configure VPN..."
+msgstr "إعداد خادم _X..."
+
+#: ../gnome/applet/applet.c:1749
+msgid "_Disconnect VPN..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1771
+#, 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:1782
+#, fuzzy, c-format
+msgid "Connect to %s..."
+msgstr "الاتصال بالنّادل..."
+
+#: ../gnome/applet/applet.c:1788
+#, fuzzy, c-format
+msgid "Disconnect from %s..."
+msgstr "أخبار من %s"
+
+#: ../gnome/applet/applet.c:1837
+msgid "No network devices have been found"
+msgstr ""
+
+#: ../gnome/applet/applet.c:2029
+#, fuzzy
+msgid "NetworkManager is not running..."
+msgstr "GDM لا يعمل"
+
+#. 'Enable Networking' item
+#: ../gnome/applet/applet.c:2210
+#, fuzzy
+msgid "Enable _Networking"
+msgstr "مكّن ال_تّسجيل"
+
+#. 'Enable Wireless' item
+#: ../gnome/applet/applet.c:2216
+#, fuzzy
+msgid "Enable _Wireless"
+msgstr "الواجهة اللّاسلكيّة"
+
+#. 'Connection Information' item
+#: ../gnome/applet/applet.c:2222
+#, fuzzy
+msgid "Connection _Information"
+msgstr "بيانات سيّئة"
+
+#. Help item
+#: ../gnome/applet/applet.c:2233
+#, fuzzy
+msgid "_Help"
+msgstr "م_ساعدة"
+
+#. About item
+#: ../gnome/applet/applet.c:2242
+#, fuzzy
+msgid "_About"
+msgstr "_حول"
+
+#: ../gnome/applet/applet.c:2824
+msgid ""
+"The NetworkManager applet could not find some required resources.  It cannot "
+"continue.\n"
+msgstr ""
+
+#: ../gnome/applet/wireless-security-option.c:157
+#, fuzzy
+msgid "Open System"
+msgstr "_فتح مراقب النظام"
+
+#: ../gnome/applet/wireless-security-option.c:160
+#, fuzzy
+msgid "Shared Key"
+msgstr "اتفاق على المفتاح"
+
+#: ../gnome/applet/wireless-security-option.c:208
+#, fuzzy
+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
+#, fuzzy
+msgid "Dynamic WEP"
+msgstr "_مفتاح WEP:"
+
+#: ../gnome/applet/wso-none.c:53
+#, fuzzy
+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
+msgid "WEP 128-bit Passphrase"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:237
+msgid "PEAP"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:238
+#, fuzzy
+msgid "TLS"
+msgstr "TLS غير متوفر"
+
+#: ../gnome/applet/wso-wpa-eap.c:239
+msgid "TTLS"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:93
+#: ../src/nm-ap-security-wpa-eap.c:117
+msgid "WPA2 Enterprise"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:95
+#: ../src/nm-ap-security-wpa-eap.c:122
+msgid "WPA Enterprise"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-psk.c:178
+#, fuzzy
+msgid "WPA2 Personal"
+msgstr "المعلومات الشخصية"
+
+#: ../gnome/applet/wso-wpa-psk.c:180
+#, fuzzy
+msgid "WPA Personal"
+msgstr "المعلومات الشخصية"
+
+#: ../gnome/applet/eggtrayicon.c:134
+#, fuzzy
+msgid "Orientation"
+msgstr "الإتّجاه"
+
+#: ../gnome/applet/eggtrayicon.c:135
+#, fuzzy
+msgid "The orientation of the tray."
+msgstr "إتجاه الطبق."
+
+#: ../gnome/applet/menu-items.c:88
+#, fuzzy, c-format
+msgid "Wired Network (%s)"
+msgstr "واجهة الشبكة"
+
+#: ../gnome/applet/menu-items.c:91
+#, fuzzy
+msgid "_Wired Network"
+msgstr "واجهة الشبكة"
+
+#: ../gnome/applet/menu-items.c:162
+#, fuzzy, c-format
+msgid "Wireless Network (%s)"
+msgid_plural "Wireless Networks (%s)"
+msgstr[0] "واجهة الشبكة"
+msgstr[1] ""
+
+#: ../gnome/applet/menu-items.c:164
+#, fuzzy
+msgid "Wireless Network"
+msgid_plural "Wireless Networks"
+msgstr[0] "واجهة الشبكة"
+msgstr[1] ""
+
+#: ../gnome/applet/menu-items.c:343
+#, fuzzy
+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 ""
+
+#: ../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
+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 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
+#, fuzzy, 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
+#, fuzzy
+msgid " "
+msgstr " "
+
+#: ../gnome/applet/applet.glade.h:2
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
+msgstr ""
+
+#: ../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 "توثق"
+
+#: ../gnome/applet/applet.glade.h:17
+#, fuzzy
+msgid "Broadcast Address:"
+msgstr "عنوان البريد الإلكتروني"
+
+#: ../gnome/applet/applet.glade.h:18
+#, fuzzy
+msgid "CA Certificate File:"
+msgstr "سلطة شهادة (CA) غير صحيحة"
+
+#: ../gnome/applet/applet.glade.h:19
+#, fuzzy
+msgid "C_onnect"
+msgstr "إِ_تّصل"
+
+#: ../gnome/applet/applet.glade.h:20
+#, fuzzy
+msgid "Client Certificate File:"
+msgstr "شهادة عميل SSL"
+
+#: ../gnome/applet/applet.glade.h:21
+#, fuzzy
+msgid "Connection Information"
+msgstr "بيانات سيّئة"
+
+#: ../gnome/applet/applet.glade.h:22
+#, fuzzy
+msgid "Default Route:"
+msgstr "إفتراض الحروف"
+
+#: ../gnome/applet/applet.glade.h:23
+#, fuzzy
+msgid "Destination Address:"
+msgstr "عنوان البريد الإلكتروني"
+
+#: ../gnome/applet/applet.glade.h:24
+#, fuzzy
+msgid "Driver:"
+msgstr "<b>الدافعة</b>"
+
+#: ../gnome/applet/applet.glade.h:25
+#, fuzzy
+msgid "EAP Method:"
+msgstr "طريقة NAT"
+
+#: ../gnome/applet/applet.glade.h:26
+#, fuzzy
+msgid "Hardware Address:"
+msgstr "عنوان العتاد:"
+
+#: ../gnome/applet/applet.glade.h:27
+#, fuzzy
+msgid "IP Address:"
+msgstr "عنوان IP:"
+
+#: ../gnome/applet/applet.glade.h:28
+#, fuzzy
+msgid "Identity:"
+msgstr "الهويّة"
+
+#: ../gnome/applet/applet.glade.h:29
+#, fuzzy
+msgid "Interface:"
+msgstr "الواجهة"
+
+#: ../gnome/applet/applet.glade.h:30
+#, fuzzy
+msgid "Key Type:"
+msgstr "نوع _مفتاح:"
+
+#: ../gnome/applet/applet.glade.h:31
+#, fuzzy
+msgid "Key management:"
+msgstr "إدارة الحسابات"
+
+#: ../gnome/applet/applet.glade.h:32
+#, fuzzy
+msgid "Key:"
+msgstr "[مفتاح]"
+
+#: ../gnome/applet/applet.glade.h:33
+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:38
+#, fuzzy
+msgid ""
+"Open System\n"
+"Shared Key"
+msgstr "فشل فتح شاشة نظام نوافذ X '%s'\n"
+
+#: ../gnome/applet/applet.glade.h:40
+#, fuzzy
+msgid "Other Wireless Network..."
+msgstr "مراقبة قوة الرابط الهوائي للشبكة"
+
+#: ../gnome/applet/applet.glade.h:41
+msgid "Passphrase:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:42
+#, fuzzy
+msgid "Password:"
+msgstr "كلمة المرور:"
+
+#: ../gnome/applet/applet.glade.h:43
+#, fuzzy
+msgid "Primary DNS:"
+msgstr "<b>خوادم DNS</b>"
+
+#: ../gnome/applet/applet.glade.h:44
+#, fuzzy
+msgid "Private Key File:"
+msgstr "جاري احداث مفتاح خاص."
+
+#: ../gnome/applet/applet.glade.h:45
+#, fuzzy
+msgid "Private Key Password:"
+msgstr "جاري احداث مفتاح خاص."
+
+#: ../gnome/applet/applet.glade.h:46
+#, fuzzy
+msgid "Secondary DNS:"
+msgstr "<b>خوادم DNS</b>"
+
+#: ../gnome/applet/applet.glade.h:47
+#, fuzzy
+msgid "Select the CA Certificate File"
+msgstr "سلطة شهادة (CA) غير صحيحة"
+
+#: ../gnome/applet/applet.glade.h:48
+#, fuzzy
+msgid "Select the Client Certificate File"
+msgstr "لا أستطيع اختيار ملف"
+
+#: ../gnome/applet/applet.glade.h:49
+#, fuzzy
+msgid "Select the Private Key File"
+msgstr "لا أستطيع اختيار ملف"
+
+#: ../gnome/applet/applet.glade.h:50
+#, fuzzy
+msgid "Show key"
+msgstr "اتفاق على المفتاح"
+
+#: ../gnome/applet/applet.glade.h:51
+#, fuzzy
+msgid "Show passphrase"
+msgstr "اظهار التفاصيل"
+
+#: ../gnome/applet/applet.glade.h:52
+#, fuzzy
+msgid "Show password"
+msgstr "أ_ظهر كلمة المرور"
+
+#: ../gnome/applet/applet.glade.h:53
+#, fuzzy
+msgid "Show passwords"
+msgstr "تذكر كلمات السر"
+
+#: ../gnome/applet/applet.glade.h:54
+#, fuzzy
+msgid "Speed:"
+msgstr "السرعة:"
+
+#: ../gnome/applet/applet.glade.h:55
+#, fuzzy
+msgid "Subnet Mask:"
+msgstr "العنوان العددي:"
+
+#: ../gnome/applet/applet.glade.h:56
+#, fuzzy
+msgid "Type:"
+msgstr "النّوع:"
+
+#: ../gnome/applet/applet.glade.h:57
+#, fuzzy
+msgid "User Name:"
+msgstr "إسم المستخدم"
+
+#: ../gnome/applet/applet.glade.h:58
+#, fuzzy
+msgid "Wireless Network Key Required"
+msgstr "مراقبة قوة الرابط الهوائي للشبكة"
+
+#: ../gnome/applet/applet.glade.h:59
+#, fuzzy
+msgid "Wireless _adapter:"
+msgstr "الواجهة اللّاسلكيّة"
+
+#: ../gnome/applet/applet.glade.h:60
+msgid "_Always Trust this Wireless Network"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:61
+#, fuzzy
+msgid "_Don't remind me again"
+msgstr "لا تسألني ثانيةً"
+
+#: ../gnome/applet/applet.glade.h:62
+#, fuzzy
+msgid "_Fallback on this Network"
+msgstr "مساعدة حول هذا التّطبيق"
+
+#: ../gnome/applet/applet.glade.h:63
+#, fuzzy
+msgid "_Login to Network"
+msgstr "إذهب إلى موقع الشبكة"
+
+#: ../gnome/applet/applet.glade.h:64
+#, fuzzy
+msgid "_Network Name:"
+msgstr "اسم الشبكة (_ESSID):"
+
+#: ../gnome/applet/applet.glade.h:65
+#, fuzzy
+msgid "_Wireless Security:"
+msgstr "تنبيه أمني"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:417
+#, fuzzy
+msgid "Cannot add VPN connection"
+msgstr "لا يمكن اقامة اتصال مع %s."
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:419
+msgid ""
+"No suitable VPN software was found on your system. Contact your system "
+"administrator."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:461
+#, fuzzy
+msgid "Cannot import VPN connection"
+msgstr "لا يمكن اقامة اتصال مع %s."
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:463
+#, 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:580
+#, fuzzy, c-format
+msgid "Error retrieving VPN connection '%s'"
+msgstr "خطأ أثناء فتح اتصال brlapi"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:583
+#, 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:727
+#, fuzzy, c-format
+msgid "Delete VPN connection \"%s\"?"
+msgstr "نوع الاتصال - الصفحة %d/%d"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:730
+#, 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:924
+#, fuzzy
+msgid "Unable to load"
+msgstr "لا يمكن تحميل·'%s':·%s"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:926
+msgid "Cannot find some needed resources (the glade file)!"
+msgstr ""
+
+#. druid_window = GTK_DIALOG (gtk_dialog_new_with_buttons (_("Create VPN Connection"),
+#. NULL,
+#. GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+#. GTK_STOCK_CANCEL,
+#. GTK_RESPONSE_REJECT,
+#. GTK_STOCK_APPLY,
+#. GTK_RESPONSE_ACCEPT,
+#. NULL));
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1081
+#, fuzzy
+msgid "Create VPN Connection"
+msgstr "نوع الاتصال - الصفحة %d/%d"
+
+#. gtk_container_add (GTK_CONTAINER (druid_window->vbox), GTK_WIDGET(gtk_label_new("Some label")));
+#. gtk_box_pack_start (GTK_BOX (druid_window->vbox), GTK_WIDGET(druid), TRUE,TRUE,0);
+#. gtk_box_pack_start (GTK_BOX (druid_window->vbox), GTK_WIDGET(gtk_label_new("Some label")), TRUE,TRUE,0);
+#. toplevel = gtk_widget_get_toplevel (GTK_WIDGET (druid));
+#. gtk_signal_connect (GTK_OBJECT (toplevel), "delete_event", GTK_SIGNAL_FUNC (vpn_window_close), NULL);
+#. make the druid window modal wrt. our main window
+#. gtk_window_set_modal (druid_window, TRUE);
+#. gtk_window_set_transient_for (GTK_WINDOW(druid_window), GTK_WINDOW (dialog));
+#. Edit dialog
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1099
+#, fuzzy
+msgid "Edit VPN Connection"
+msgstr "نوع الاتصال - الصفحة %d/%d"
+
+#: ../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
+#, fuzzy
+msgid "Delete the selected VPN connection"
+msgstr "حذف وصلة الموقع المزار المنتقات"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
+msgid "E_xport"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
+#, fuzzy
+msgid "Edit the selected VPN connection"
+msgstr "انقر لتحرير اللوحة المنتقات"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
+#, fuzzy
+msgid "Export the VPN settings to a file"
+msgstr "لا يمكن استيراد تعيينات AccessX من الملف '%s'"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
+msgid "Export the selected VPN connection to a file"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
+msgid "Manage Virtual Private Network Connections"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
+#, fuzzy
+msgid "VPN Connections"
+msgstr "الإتّصالات النّشطة"
+
+#: ../src/nm-ap-security-wep.c:52
+#, fuzzy
+msgid "40-bit WEP"
+msgstr "سري كبير [40]"
+
+#: ../src/nm-ap-security-wep.c:54
+#, fuzzy
+msgid "104-bit WEP"
+msgstr "عدد صحيح بقيمة 16 بت غير موقع"
+
+#: ../src/nm-ap-security-wpa-psk.c:51
+msgid "WPA TKIP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:53
+msgid "WPA CCMP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:55
+#, fuzzy
+msgid "WPA Automatic"
+msgstr "تنزيلات آلية"
+
+#: ../src/nm-ap-security-wpa-psk.c:60
+msgid "WPA2 TKIP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:62
+msgid "WPA2 CCMP"
+msgstr ""
+
+#: ../src/nm-ap-security-wpa-psk.c:64
+#, fuzzy
+msgid "WPA2 Automatic"
+msgstr "تنزيلات آلية"
+
+#: ../src/nm-ap-security.c:334
+#, fuzzy
+msgid "none"
+msgstr "لا يوجد"
+
+#: ../src/nm-netlink-monitor.c:174
+#, c-format
+msgid ""
+"unable to create netlink socket for monitoring wired ethernet devices - %s"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:192
+#, c-format
+msgid ""
+"unable to bind to netlink socket for monitoring wired ethernet devices - %s"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:427
+#, fuzzy
+msgid "operation took too long"
+msgstr "سلسلة الشّهادة طويلة جدّاً"
+
+#: ../src/nm-netlink-monitor.c:524
+msgid "received data from wrong type of sender"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:537
+msgid "received data from unexpected sender"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:666
+msgid "too much data was sent over socket and some of it was lost"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:776
+msgid "error occurred while waiting for data on socket"
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:930
+#, c-format
+msgid "You are now connected to the Ad-Hoc wireless network '%s'."
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:935
+#, c-format
+msgid "You are now connected to the wireless network '%s'."
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:942
+msgid "You are now connected to the wired network."
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:948
+#, fuzzy
+msgid "Connection Established"
+msgstr "تم إلغاء الإتّصال"
+
+#: ../gnome/applet/applet-dbus-devices.c:997
+#, fuzzy
+msgid "Disconnected"
+msgstr "قطع الإتصال"
+
+#: ../gnome/applet/applet-dbus-devices.c:998
+msgid "The network connection has been disconnected."
+msgstr ""
+
+#: ../src/nm-ap-security-leap.c:66 ../src/nm-ap-security-leap.c:82
+msgid "LEAP"
+msgstr ""
diff --git a/po/bg.po b/po/bg.po
index e5caf939..fcc73fb0 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: 2006-05-29 18:33+0200\n"
+"POT-Creation-Date: 2005-12-15 08:01+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,59 +16,59 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../src/applet-compat.c:171 ../src/applet-dbus-info.c:919
+#. Setup a request to the keyring to save the network passphrase
+#: ../gnome/applet/applet-dbus-info.c:923
 #, c-format
 msgid "Passphrase for wireless network %s"
 msgstr "Парола за безжичната мрежа %s"
 
-#: ../src/applet-dbus.c:265
+#: ../gnome/applet/applet-dbus.c:302
 #, c-format
 msgid "Connection to the wireless network '%s' failed."
 msgstr "Неуспешно свързване към безжичната мрежа „%s“."
 
-#: ../src/applet-dbus.c:270
+#: ../gnome/applet/applet-dbus.c:307
 msgid "Connection to the wired network failed."
 msgstr "Неуспешно свързване към кабелната мрежа."
 
-#: ../src/applet.c:184
-#, fuzzy
-msgid "Error displaying connection information:"
+#: ../gnome/applet/applet.c:183
+msgid "Error displaying connection information: "
 msgstr "Грешка при показване на информацията за връзката:"
 
-#: ../src/applet.c:202
+#: ../gnome/applet/applet.c:202
 msgid "Could not find some required resources (the glade file)!"
 msgstr "Някои ресурси не бяха открити (файлът на glade)!"
 
-#: ../src/applet.c:213
+#: ../gnome/applet/applet.c:213
 msgid "No active connections!"
 msgstr "Няма действащи връзки!"
 
-#: ../src/applet.c:234
+#: ../gnome/applet/applet.c:228
 #, c-format
 msgid "Wired Ethernet (%s)"
 msgstr "Кабелен Етернет (%s)"
 
-#: ../src/applet.c:236
+#: ../gnome/applet/applet.c:230
 #, c-format
 msgid "Wireless Ethernet (%s)"
 msgstr "Безжичен Етернет (%s)"
 
-#: ../src/applet.c:337 ../src/applet.c:362
+#: ../gnome/applet/applet.c:323 ../gnome/applet/applet.c:348
 msgid "NetworkManager Applet"
 msgstr "Аплетът NetworkManager"
 
-#: ../src/applet.c:339 ../src/applet.c:364
+#: ../gnome/applet/applet.c:325 ../gnome/applet/applet.c:350
 msgid "Copyright © 2004-2005 Red Hat, Inc."
 msgstr "Авторски права © 2004-2005 Red Hat, Inc."
 
-#: ../src/applet.c:340 ../src/applet.c:365
+#: ../gnome/applet/applet.c:326 ../gnome/applet/applet.c:351
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Аплет за областта за уведомяване за управление на мрежовите устройства и "
 "връзки."
 
-#: ../src/applet.c:343 ../src/applet.c:370
+#: ../gnome/applet/applet.c:329 ../gnome/applet/applet.c:356
 msgid "translator-credits"
 msgstr ""
 "Александър Шопов <ash@contact.bg>\n"
@@ -77,22 +77,26 @@ msgstr ""
 "Научете повече за нас на http://gnome.cult.bg\n"
 "Докладвайте за грешки на http://gnome.cult.bg/bugs<"
 
-#: ../src/applet.c:426
+#: ../gnome/applet/applet.c:441
+msgid "VPN Error"
+msgstr "Грешка на ВЧМ"
+
+#: ../gnome/applet/applet.c:445
 msgid "VPN Login Failure"
 msgstr "Грешка при идентификация пред ВЧМ"
 
-#: ../src/applet.c:427
+#: ../gnome/applet/applet.c:446
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a login failure."
 msgstr ""
 "Неуспех при осъществяването на връзката към ВЧМ „%s“ поради грешка в "
 "идентификацията."
 
-#: ../src/applet.c:431
+#: ../gnome/applet/applet.c:450
 msgid "VPN Start Failure"
 msgstr "Грешка при стартиране на ВЧМ"
 
-#: ../src/applet.c:432
+#: ../gnome/applet/applet.c:451
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
@@ -101,25 +105,25 @@ msgstr ""
 "Връзката към ВЧМ „%s“ се провали поради грешка при стартиране на програмата "
 "за ВЧМ."
 
-#: ../src/applet.c:436 ../src/applet.c:446
+#: ../gnome/applet/applet.c:455 ../gnome/applet/applet.c:465
 msgid "VPN Connect Failure"
 msgstr "Грешка при свързване към ВЧМ"
 
-#: ../src/applet.c:437
+#: ../gnome/applet/applet.c:456
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a connection error."
 msgstr "Връзката към ВЧМ „%s“ се провали поради грешка при свързването."
 
-#: ../src/applet.c:441
+#: ../gnome/applet/applet.c:460
 msgid "VPN Configuration Error"
 msgstr "Грешка в настройките на ВЧМ"
 
-#: ../src/applet.c:442
+#: ../gnome/applet/applet.c:461
 #, c-format
 msgid "The VPN connection '%s' was not correctly configured."
 msgstr "Връзката към ВЧМ „%s“ е с неправилни настройки."
 
-#: ../src/applet.c:447
+#: ../gnome/applet/applet.c:466
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' because the VPN server did not "
@@ -128,13 +132,23 @@ msgstr ""
 "Връзката към ВЧМ „%s“ се провали, защото настройките на мрежата върнати от "
 "сървъра за ВЧМ бяха неправилни."
 
-#: ../src/applet.c:517
+#: ../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
 msgid "VPN Login Message"
 msgstr "Съобщение при идентификация пред ВЧМ"
 
-#: ../src/applet.c:741 ../src/applet.c:2508
-#: ../src/other-network-dialog.c:453
-#: ../src/passphrase-dialog.c:228
+#: ../gnome/applet/applet.c:763 ../gnome/applet/applet.c:2367
+#: ../gnome/applet/other-network-dialog.c:379
+#: ../gnome/applet/passphrase-dialog.c:372
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
@@ -142,164 +156,148 @@ msgstr ""
 "Аплетът NetworkManager не можа да открие някои задължителни ресурси (файлът "
 "на glade)."
 
-#: ../src/applet.c:753
+#: ../gnome/applet/applet.c:775
 #, c-format
 msgid "The network device \"%s (%s)\" does not support wireless scanning."
 msgstr "Мрежовото устройство „%s (%s)“ не поддържа безжично претърсване."
 
-#: ../src/applet.c:761
+#: ../gnome/applet/applet.c:783
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
 msgstr "Мрежовото устройство „%s (%s)“ не поддържа засичане на връзка."
 
-#: ../src/applet.c:908
+#: ../gnome/applet/applet.c:928
 #, c-format
 msgid "Preparing device %s for the wired network..."
 msgstr "Подготвяне на устройството „%s“ за кабелната мрежа..."
 
-#: ../src/applet.c:910
+#: ../gnome/applet/applet.c:930
 #, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
 msgstr "Подготвяне на устройството „%s“ за безжичната мрежа „%s“..."
 
-#: ../src/applet.c:918
+#: ../gnome/applet/applet.c:938
 #, c-format
 msgid "Configuring device %s for the wired network..."
 msgstr "Настройване на устройството „%s“ за кабелната мрежа..."
 
-#: ../src/applet.c:920
+#: ../gnome/applet/applet.c:940
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
 msgstr "Опит за свързване към безжичната мрежа „%s“..."
 
-#: ../src/applet.c:928
+#: ../gnome/applet/applet.c:948
 #, c-format
 msgid "Waiting for Network Key for the wireless network '%s'..."
 msgstr "Изчакване за мрежовия ключ за безжичната мрежа „%s“..."
 
-#: ../src/applet.c:936 ../src/applet.c:946
+#: ../gnome/applet/applet.c:956 ../gnome/applet/applet.c:966
 msgid "Requesting a network address from the wired network..."
 msgstr "Запитване на кабелната мрежа за адрес..."
 
-#: ../src/applet.c:938 ../src/applet.c:948
+#: ../gnome/applet/applet.c:958 ../gnome/applet/applet.c:968
 #, c-format
 msgid "Requesting a network address from the wireless network '%s'..."
 msgstr "Запитване на безжичната мрежа „%s“ за адрес..."
 
-#: ../src/applet.c:956
+#: ../gnome/applet/applet.c:976
 msgid "Finishing connection to the wired network..."
 msgstr "Завършване на връзката към кабелната мрежа..."
 
-#: ../src/applet.c:958
+#: ../gnome/applet/applet.c:978
 #, c-format
 msgid "Finishing connection to the wireless network '%s'..."
 msgstr "Завършване на връзката към безжичната мрежа „%s“..."
 
-#: ../src/applet.c:1075
+#: ../gnome/applet/applet.c:1094
 msgid "NetworkManager is not running"
 msgstr "NetworkManager не е включен"
 
-#: ../src/applet.c:1083 ../src/applet.c:1828
-#, fuzzy
-msgid "Networking disabled"
-msgstr "_Име на мрежа:"
-
-#: ../src/applet.c:1088
+#: ../gnome/applet/applet.c:1106
 msgid "No network connection"
 msgstr "Няма връзка към мрежа"
 
-#: ../src/applet.c:1093
+#: ../gnome/applet/applet.c:1111
 msgid "Wired network connection"
 msgstr "Връзка към кабелна мрежа"
 
-#: ../src/applet.c:1097
+#: ../gnome/applet/applet.c:1115
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Връзка към инцидентна, безжична мрежа"
 
-#: ../src/applet.c:1099
+#: ../gnome/applet/applet.c:1117
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "Безжична връзка към „%s“ (%d%%)"
 
-#: ../src/applet.c:1120
+#: ../gnome/applet/applet.c:1139
 #, c-format
 msgid "VPN connection to '%s'"
 msgstr "Връзка по ВЧМ към „%s“"
 
-#: ../src/applet.c:1128
+#: ../gnome/applet/applet.c:1147
 #, c-format
 msgid "VPN connecting to '%s'"
 msgstr "Свързване по ВЧМ към „%s“"
 
-#: ../src/applet.c:1541
+#: ../gnome/applet/applet.c:1537
 msgid "_Connect to Other Wireless Network..."
 msgstr "_Свързване към други безжични мрежи..."
 
-#: ../src/applet.c:1562
+#: ../gnome/applet/applet.c:1558
 msgid "Create _New Wireless Network..."
 msgstr "Създаване на _нова безжична мрежа..."
 
-#: ../src/applet.c:1685
+#: ../gnome/applet/applet.c:1671
 msgid "_VPN Connections"
 msgstr "_Връзки по ВЧМ"
 
-#: ../src/applet.c:1730
+#: ../gnome/applet/applet.c:1703
 msgid "_Configure VPN..."
 msgstr "_Настройване на ВЧМ..."
 
-#: ../src/applet.c:1734
+#: ../gnome/applet/applet.c:1707
 msgid "_Disconnect VPN..."
 msgstr "_Прекъсване на ВЧМ..."
 
-#: ../src/applet.c:1756
+#: ../gnome/applet/applet.c:1729
 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
-#: ../src/applet.c:1767
+#: ../gnome/applet/applet.c:1738
 #, c-format
 msgid "Connect to %s..."
 msgstr "Свързване към %s..."
 
-#: ../src/applet.c:1773
-#, fuzzy, c-format
-msgid "Disconnect from %s..."
-msgstr "Свързване към %s..."
-
-#: ../src/applet.c:1822
+#: ../gnome/applet/applet.c:1788
 msgid "No network devices have been found"
 msgstr "Не са открити мрежови устройства"
 
-#: ../src/applet.c:2014
+#: ../gnome/applet/applet.c:1962
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager не е включен..."
 
-#. 'Enable Networking' item
-#: ../src/applet.c:2170
-msgid "Enable _Networking"
-msgstr ""
-
 #. 'Enable Wireless' item
-#: ../src/applet.c:2176
+#: ../gnome/applet/applet.c:2087
 msgid "Enable _Wireless"
 msgstr "Включване на _безжичната мрежа"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2182
+#: ../gnome/applet/applet.c:2093
 msgid "Connection _Information"
 msgstr "_Информация за връзката"
 
 #. Help item
-#: ../src/applet.c:2193
+#: ../gnome/applet/applet.c:2103
 msgid "_Help"
 msgstr "_Помощ"
 
 #. About item
-#: ../src/applet.c:2202
+#: ../gnome/applet/applet.c:2111
 msgid "_About"
 msgstr "_Относно"
 
-#: ../src/applet.c:2667
+#: ../gnome/applet/applet.c:2503
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
@@ -307,177 +305,99 @@ msgstr ""
 "Аплетът NetworkManager не може да открие необходим ресурс. Програмата не "
 "може да продължи работа.\n"
 
-#: ../src/wireless-security-option.c:157
-#, fuzzy
-msgid "Open System"
-msgstr ""
-"Открита система\n"
-"Споделен ключ"
-
-#: ../src/wireless-security-option.c:160
-#, fuzzy
-msgid "Shared Key"
-msgstr ""
-"Открита система\n"
-"Споделен ключ"
-
-#: ../src/wireless-security-option.c:208
-msgid "Automatic (Default)"
-msgstr ""
-
-#: ../src/wireless-security-option.c:215
-msgid "AES-CCMP"
-msgstr ""
-
-#: ../src/wireless-security-option.c:223
-msgid "TKIP"
-msgstr ""
-
-#: ../src/wireless-security-option.c:231
-msgid "Dynamic WEP"
-msgstr ""
-
-#: ../src/wso-none.c:53
-msgid "None"
-msgstr ""
-
-#: ../src/wso-wep-ascii.c:138
-msgid "WEP 64/128-bit ASCII"
-msgstr ""
-
-#: ../src/wso-wep-hex.c:135
-msgid "WEP 64/128-bit Hex"
-msgstr ""
-
-#: ../src/wso-wep-passphrase.c:135
-#, fuzzy
-msgid "WEP 128-bit Passphrase"
-msgstr "Парола:"
-
-#: ../src/wso-wpa-eap.c:237
-msgid "PEAP"
-msgstr ""
-
-#: ../src/wso-wpa-eap.c:238
-msgid "TLS"
-msgstr ""
-
-#: ../src/wso-wpa-eap.c:239
-msgid "TTLS"
-msgstr ""
-
-#: ../src/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 ""
-
-#: ../src/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 ""
-
-#: ../src/wso-wpa-psk.c:178
-msgid "WPA2 Personal"
-msgstr ""
-
-#: ../src/wso-wpa-psk.c:180
-msgid "WPA Personal"
-msgstr ""
-
-#: ../src/eggtrayicon.c:134
+#: ../gnome/applet/eggtrayicon.c:127
 msgid "Orientation"
 msgstr "Ориентация"
 
-#: ../src/eggtrayicon.c:135
+#: ../gnome/applet/eggtrayicon.c:128
 msgid "The orientation of the tray."
 msgstr "Ориентацията на тавата"
 
-#: ../src/menu-items.c:88
+#: ../gnome/applet/menu-items.c:87
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Кабелна мрежа (%s)"
 
-#: ../src/menu-items.c:91
+#: ../gnome/applet/menu-items.c:90
 msgid "_Wired Network"
 msgstr "_Кабелна мрежа"
 
-#: ../src/menu-items.c:162
+#: ../gnome/applet/menu-items.c:161
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
 msgstr[0] "Безжична мрежа (%s)"
 msgstr[1] "Безжични мрежи (%s)"
 
-#: ../src/menu-items.c:164
+#: ../gnome/applet/menu-items.c:163
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Безжична мрежа"
 msgstr[1] "Безжични мрежи"
 
-#: ../src/menu-items.c:343
+#: ../gnome/applet/menu-items.c:303
 msgid " (invalid Unicode)"
 msgstr " (невалиден Уникод)"
 
-#: ../src/other-network-dialog.c:352
-#, fuzzy, c-format
+#: ../gnome/applet/other-network-dialog.c:248
+#, c-format
 msgid ""
-"By default, the wireless network's name is set to your computer's name, %s, "
-"with no encryption enabled"
+"By default, the ESSID is set to your computer's name, %s, with no encryption "
+"enabled"
 msgstr ""
 "По подразбиране идентификаторът ESSID е името на компютъра Ви, %s, без "
 "шифриране"
 
-#: ../src/other-network-dialog.c:358
+#: ../gnome/applet/other-network-dialog.c:252
 msgid "Create new wireless network"
 msgstr "Създаване на нова безжична мрежа"
 
-#: ../src/other-network-dialog.c:359
-#, fuzzy
+#: ../gnome/applet/other-network-dialog.c:253
 msgid ""
-"Enter the name and security settings of the wireless network you wish to "
+"Enter the ESSID and security settings of the wireless network you wish to "
 "create."
 msgstr ""
 "Въведете идентификатора ESSID и настройките на сигурността на безжичната "
 "мрежа, която искате да създадете."
 
-#: ../src/other-network-dialog.c:363
+#: ../gnome/applet/other-network-dialog.c:257
 msgid "Create New Wireless Network"
 msgstr "Създаване на нова безжична мрежа"
 
-#: ../src/other-network-dialog.c:368
-#, fuzzy
-msgid "Existing wireless network"
+#: ../gnome/applet/other-network-dialog.c:262
+msgid "Custom wireless network"
 msgstr "Потребителска безжична мрежа"
 
-#: ../src/other-network-dialog.c:369
-#, fuzzy
-msgid "Enter the name of the wireless network to which you wish to connect."
+#: ../gnome/applet/other-network-dialog.c:263
+msgid "Enter the ESSID of the wireless network to which you wish to connect."
 msgstr ""
 "Въведете идентификатора ESSID на безжичната мрежа, към която искате да се "
 "свържете."
 
-#: ../src/other-network-dialog.c:371
+#: ../gnome/applet/other-network-dialog.c:265
 msgid "Connect to Other Wireless Network"
 msgstr "Свързване към друга безжична мрежа"
 
-#: ../src/passphrase-dialog.c:215
-#, fuzzy
-msgid "Error connecting to wireless network"
-msgstr "Свързване към друга безжична мрежа"
+#: ../gnome/applet/passphrase-dialog.c:159
+#: ../gnome/applet/applet.glade.h:33
+msgid "Passphrase:"
+msgstr "Парола:"
 
-#: ../src/passphrase-dialog.c:216
-msgid ""
-"The requested wireless network requires security capabilities unsupported by "
-"your hardware."
-msgstr ""
+#: ../gnome/applet/passphrase-dialog.c:162
+msgid "ASCII Key:"
+msgstr "Ключ в ASCII:"
 
-#: ../src/vpn-password-dialog.c:151
-#: ../src/vpn-password-dialog.c:188
+#: ../gnome/applet/passphrase-dialog.c:165
+msgid "Hex Key:"
+msgstr "Шестнайсетичен ключ:"
+
+#: ../gnome/applet/vpn-password-dialog.c:152
+#: ../gnome/applet/vpn-password-dialog.c:189
 #, c-format
 msgid "Cannot start VPN connection '%s'"
 msgstr "Връзката към ВЧМ „%s“ не може да бъде стартирана"
 
-#: ../src/vpn-password-dialog.c:154
+#: ../gnome/applet/vpn-password-dialog.c:155
 #, c-format
 msgid ""
 "Could not find the authentication dialog for VPN connection type '%s'. "
@@ -486,7 +406,7 @@ msgstr ""
 "Диалоговата кутия за идентификация пред ВЧМ „%s“ не може да бъде открита. "
 "Свържете се със системния администратор."
 
-#: ../src/vpn-password-dialog.c:191
+#: ../gnome/applet/vpn-password-dialog.c:192
 #, c-format
 msgid ""
 "There was a problem launching the authentication dialog for VPN connection "
@@ -495,17 +415,17 @@ msgstr ""
 "Имаше проблем с показването на диалоговата кутия за идентификация пред ВЧМ „%"
 "s“. Свържете се със системния администратор."
 
-#: ../src/applet.glade.h:1
+#: ../gnome/applet/applet.glade.h:1
 msgid " "
 msgstr " "
 
-#: ../src/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\">Информация за действащата връзка</span>"
 
-#: ../src/applet.glade.h:4
+#: ../gnome/applet/applet.glade.h:4
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
@@ -520,7 +440,7 @@ msgstr ""
 "Необходима е парола или ключ за шифриране, за да се свържете с безжичната "
 "мрежа „%s“."
 
-#: ../src/applet.glade.h:8
+#: ../gnome/applet/applet.glade.h:8
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
@@ -532,7 +452,7 @@ msgstr ""
 "\n"
 "%s няма да функционира изцяло."
 
-#: ../src/applet.glade.h:12
+#: ../gnome/applet/applet.glade.h:12
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
@@ -549,89 +469,59 @@ msgstr ""
 "е сигурна и можете да й се доверите, задайте настройката отдолу и "
 "NetworkManager няма да Ви иска потвърждения при следващи влизания."
 
-#: ../src/applet.glade.h:15
-msgid "Anonymous Identity:"
-msgstr ""
-
-#: ../src/applet.glade.h:16
+#: ../gnome/applet/applet.glade.h:15
 msgid "Authentication:"
 msgstr "Идентификация:"
 
-#: ../src/applet.glade.h:17
+#: ../gnome/applet/applet.glade.h:16
 msgid "Broadcast Address:"
 msgstr "Адрес за разпръскване:"
 
-#: ../src/applet.glade.h:18
-msgid "CA Certificate File:"
-msgstr ""
-
-#: ../src/applet.glade.h:19
+#: ../gnome/applet/applet.glade.h:17
 msgid "C_onnect"
 msgstr "_Свързване"
 
-#: ../src/applet.glade.h:20
-msgid "Client Certificate File:"
-msgstr ""
-
-#: ../src/applet.glade.h:21
+#: ../gnome/applet/applet.glade.h:18
 msgid "Connection Information"
 msgstr "Информация за връзката"
 
-#: ../src/applet.glade.h:22
+#: ../gnome/applet/applet.glade.h:19
 msgid "Default Route:"
 msgstr "Маршрут по подразбиране:"
 
-#: ../src/applet.glade.h:23
+#: ../gnome/applet/applet.glade.h:20
 msgid "Destination Address:"
 msgstr "Целеви адрес:"
 
-#: ../src/applet.glade.h:24
-msgid "Driver:"
-msgstr ""
-
-#: ../src/applet.glade.h:25
-msgid "EAP Method:"
-msgstr ""
-
-#: ../src/applet.glade.h:26
+#: ../gnome/applet/applet.glade.h:21
 msgid "Hardware Address:"
 msgstr "Хардуерен адрес:"
 
-#: ../src/applet.glade.h:27
+#: ../gnome/applet/applet.glade.h:22
 msgid "IP Address:"
 msgstr "IP адрес:"
 
-#: ../src/applet.glade.h:28
-msgid "Identity:"
-msgstr ""
-
-#: ../src/applet.glade.h:29
+#: ../gnome/applet/applet.glade.h:23
 msgid "Interface:"
 msgstr "Интерфейс:"
 
-#: ../src/applet.glade.h:30
-#, fuzzy
-msgid "Key Type:"
-msgstr "Ключ:"
-
-#: ../src/applet.glade.h:31
+#: ../gnome/applet/applet.glade.h:24
 msgid "Key:"
 msgstr "Ключ:"
 
-#: ../src/applet.glade.h:32
-#, fuzzy
+#: ../gnome/applet/applet.glade.h:25
 msgid ""
 "None\n"
-"WEP 128-bit Passphrase\n"
-"WEP 64/128-bit Hex\n"
-"WEP 64/128-bit ASCII\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"
 
-#: ../src/applet.glade.h:37
+#: ../gnome/applet/applet.glade.h:30
 msgid ""
 "Open System\n"
 "Shared Key"
@@ -639,125 +529,90 @@ msgstr ""
 "Открита система\n"
 "Споделен ключ"
 
-#: ../src/applet.glade.h:39
+#: ../gnome/applet/applet.glade.h:32
 msgid "Other Wireless Network..."
 msgstr "Друга безжична мрежа..."
 
-#: ../src/applet.glade.h:40
-msgid "Passphrase:"
-msgstr "Парола:"
-
-#: ../src/applet.glade.h:41
+#: ../gnome/applet/applet.glade.h:34
 msgid "Password:"
 msgstr "Парола:"
 
-#: ../src/applet.glade.h:42
+#: ../gnome/applet/applet.glade.h:35
 msgid "Primary DNS:"
 msgstr "Основен сървър за DNS:"
 
-#: ../src/applet.glade.h:43
-msgid "Private Key File:"
-msgstr ""
-
-#: ../src/applet.glade.h:44
-msgid "Private Key Password:"
-msgstr ""
-
-#: ../src/applet.glade.h:45
+#: ../gnome/applet/applet.glade.h:36
 msgid "Secondary DNS:"
 msgstr "Допълнителен сървър за DNS:"
 
-#: ../src/applet.glade.h:46
-msgid "Select the CA Certificate File"
-msgstr ""
-
-#: ../src/applet.glade.h:47
-msgid "Select the Client Certificate File"
-msgstr ""
-
-#: ../src/applet.glade.h:48
-msgid "Select the Private Key File"
-msgstr ""
-
-#: ../src/applet.glade.h:49
-msgid "Show key"
-msgstr ""
-
-#: ../src/applet.glade.h:50
-#, fuzzy
-msgid "Show passphrase"
-msgstr "Парола:"
-
-#: ../src/applet.glade.h:51
-#, fuzzy
-msgid "Show password"
-msgstr "Парола:"
-
-#: ../src/applet.glade.h:52
-#, fuzzy
-msgid "Show passwords"
-msgstr "Парола:"
-
-#: ../src/applet.glade.h:53
-msgid "Speed:"
-msgstr ""
-
-#: ../src/applet.glade.h:54
+#: ../gnome/applet/applet.glade.h:37
 msgid "Subnet Mask:"
 msgstr "Маска на подмрежата:"
 
-#: ../src/applet.glade.h:55
-msgid "Type:"
-msgstr ""
-
-#: ../src/applet.glade.h:56
+#: ../gnome/applet/applet.glade.h:38
 msgid "User Name:"
 msgstr "Потребителско име:"
 
-#: ../src/applet.glade.h:57
+#: ../gnome/applet/applet.glade.h:39
 msgid "Wireless Network Key Required"
 msgstr "Необходим е ключ за безжична мрежа"
 
-#: ../src/applet.glade.h:58
+#: ../gnome/applet/applet.glade.h:40
 msgid "Wireless _adapter:"
 msgstr "Безжичен _адаптер:"
 
-#: ../src/applet.glade.h:59
+#: ../gnome/applet/applet.glade.h:41
 msgid "_Always Trust this Wireless Network"
 msgstr "_Постоянно доверие на тази безжична мрежа"
 
-#: ../src/applet.glade.h:60
+#: ../gnome/applet/applet.glade.h:42
 msgid "_Don't remind me again"
 msgstr "_Да няма нови напомняния"
 
-#: ../src/applet.glade.h:61
+#: ../gnome/applet/applet.glade.h:43
 msgid "_Login to Network"
 msgstr "_Свързване към мрежа"
 
-#: ../src/applet.glade.h:62
+#: ../gnome/applet/applet.glade.h:44
 msgid "_Network Name:"
 msgstr "_Име на мрежа:"
 
-#: ../src/applet.glade.h:63
+#: ../gnome/applet/applet.glade.h:45
 msgid "_Wireless Security:"
 msgstr "_Безжична сигурност:"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:383
+#: ../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
 msgid "Cannot add VPN connection"
 msgstr "Не може да се добави връзка към ВЧМ"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:385
+#: ../gnome/vpn-properties/nm-vpn-properties.c:372
 msgid ""
 "No suitable VPN software was found on your system. Contact your system "
 "administrator."
 msgstr ""
 "Не е открит подходящ софтуер за ВЧМ. Свържете се със системния администратор."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:437
+#: ../gnome/vpn-properties/nm-vpn-properties.c:424
 msgid "Cannot import VPN connection"
 msgstr "Връзката към ВЧМ не може да се внесе"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:439
+#: ../gnome/vpn-properties/nm-vpn-properties.c:426
 #, c-format
 msgid ""
 "Cannot find suitable software for VPN connection type '%s' to import the "
@@ -767,12 +622,12 @@ msgstr ""
 "софтуер за връзка към ВЧМ от вида „%1$s“. Свържете се със системния "
 "администратор."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:579
+#: ../gnome/vpn-properties/nm-vpn-properties.c:566
 #, c-format
 msgid "Error retrieving VPN connection '%s'"
 msgstr "Грешка при получаване на информация за връзката към ВЧМ „%s“"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:582
+#: ../gnome/vpn-properties/nm-vpn-properties.c:569
 #, c-format
 msgid ""
 "Could not find the UI files for VPN connection type '%s'. Contact your "
@@ -781,12 +636,12 @@ msgstr ""
 "Файловете с описание на графичния интерфейс за връзки към ВЧМ от вида „%s“ "
 "не могат да бъдат открити. Свържете се със системния администратор."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:739
+#: ../gnome/vpn-properties/nm-vpn-properties.c:729
 #, c-format
 msgid "Delete VPN connection \"%s\"?"
 msgstr "Да се изтрие ли връзката към ВЧМ „%s“?"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:742
+#: ../gnome/vpn-properties/nm-vpn-properties.c:732
 #, c-format
 msgid ""
 "All information about the VPN connection \"%s\" will be lost and you may "
@@ -797,16 +652,16 @@ msgstr ""
 "наложи да я искате наново от системния администратор, ако искате да я "
 "създадете наново."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:959
+#: ../gnome/vpn-properties/nm-vpn-properties.c:938
 msgid "Unable to load"
 msgstr "Неуспех при зареждане"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:961
+#: ../gnome/vpn-properties/nm-vpn-properties.c:940
 msgid "Cannot find some needed resources (the glade file)!"
 msgstr "Някои ресурси не бяха открити (файлът на glade)!"
 
 #. Edit dialog
-#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1058
 msgid "Edit VPN Connection"
 msgstr "Редактиране на връзка към ВЧМ"
 
@@ -880,42 +735,6 @@ 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 ""
@@ -932,115 +751,23 @@ msgstr ""
 "неуспешно свързване към мрежовото гнездо за наблюдение на устройства за "
 "кабелен Етернет - %s"
 
-#: ../src/nm-netlink-monitor.c:405
+#: ../src/nm-netlink-monitor.c:403
 msgid "operation took too long"
 msgstr "операцията продължи прекалено дълго"
 
-#: ../src/nm-netlink-monitor.c:502
+#: ../src/nm-netlink-monitor.c:500
 msgid "received data from wrong type of sender"
 msgstr "получени са данни от неправилен вид изпращач"
 
-#: ../src/nm-netlink-monitor.c:515
+#: ../src/nm-netlink-monitor.c:513
 msgid "received data from unexpected sender"
 msgstr "получени са данни от неочакван изпращач"
 
-#: ../src/nm-netlink-monitor.c:646
+#: ../src/nm-netlink-monitor.c:644
 msgid "too much data was sent over socket and some of it was lost"
 msgstr ""
 "през гнездото са получени прекалено много данни и някои от тях са загубени"
 
-#: ../src/nm-netlink-monitor.c:735
+#: ../src/nm-netlink-monitor.c:733
 msgid "error occurred while waiting for data on socket"
 msgstr "грешка при изчакване за данни през гнездо"
-
-#: ../src/applet-dbus-devices.c:898
-#, fuzzy, c-format
-msgid "You are now connected to the Ad-Hoc wireless network '%s'."
-msgstr "Връзка към инцидентна, безжична мрежа"
-
-#: ../src/applet-dbus-devices.c:903
-#, fuzzy, c-format
-msgid "You are now connected to the wireless network '%s'."
-msgstr "Завършване на връзката към безжичната мрежа „%s“..."
-
-#: ../src/applet-dbus-devices.c:910
-#, fuzzy
-msgid "You are now connected to the wired network."
-msgstr "Завършване на връзката към кабелната мрежа..."
-
-#: ../src/applet-dbus-devices.c:916
-msgid "Connection Established"
-msgstr ""
-
-#: ../src/applet-dbus-devices.c:959
-#, fuzzy
-msgid "Disconnected"
-msgstr "_Прекъсване на ВЧМ..."
-
-#: ../src/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 64687677..5e971391 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: 2006-05-29 18:33+0200\n"
+"POT-Creation-Date: 2004-10-19 13:38-0400\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,116 +16,62 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: ../src/applet-compat.c:171 ../src/applet-dbus-info.c:919
-#, fuzzy, c-format
-msgid "Passphrase for wireless network %s"
-msgstr "Nema wireless mreža..."
-
-#: ../src/applet-dbus.c:265
-#, c-format
-msgid "Connection to the wireless network '%s' failed."
-msgstr ""
-
-#: ../src/applet-dbus.c:270
-msgid "Connection to the wired network failed."
-msgstr ""
-
-#: ../src/applet.c:184
-msgid "Error displaying connection information:"
-msgstr ""
+#: info-daemon/networks.glade:11
+msgid "Modify Wireless Networks"
+msgstr "Izmjeni Wireless mreže"
 
-#: ../src/applet.c:202
-#, fuzzy
-msgid "Could not find some required resources (the glade file)!"
-msgstr ""
-"NetworkManager Aplet nije pronašao neke potrebne resurse (glade nije "
-"pronađen)."
+#: info-daemon/networks.glade:92
+msgid "<span weight=\"bold\">Wireless Networks:</span>"
+msgstr "<span weight=\"bold\">Wireless Mreže:</span>"
 
-#: ../src/applet.c:213
+#: info-daemon/passphrase.glade:9
 #, fuzzy
-msgid "No active connections!"
-msgstr "Mrežne konekcije"
-
-#: ../src/applet.c:234
-#, fuzzy, c-format
-msgid "Wired Ethernet (%s)"
+msgid "Wireless Network Key Required"
 msgstr "Wireless Mreže"
 
-#: ../src/applet.c:236
-#, fuzzy, c-format
-msgid "Wireless Ethernet (%s)"
-msgstr "Wireless Mreže"
+#: info-daemon/passphrase.glade:52
+msgid "_Login to Network"
+msgstr "_Prijava na mrežu"
 
-#: ../src/applet.c:337 ../src/applet.c:362
+#: info-daemon/passphrase.glade:100
 #, fuzzy
-msgid "NetworkManager Applet"
-msgstr "NetworkManager nije pokrenut..."
-
-#: ../src/applet.c:339 ../src/applet.c:364
-msgid "Copyright © 2004-2005 Red Hat, Inc."
-msgstr ""
-
-#: ../src/applet.c:340 ../src/applet.c:365
 msgid ""
-"Notification area applet for managing your network devices and connections."
-msgstr ""
-
-#: ../src/applet.c:343 ../src/applet.c:370
-msgid "translator-credits"
-msgstr ""
-
-#: ../src/applet.c:426
-msgid "VPN Login Failure"
-msgstr ""
-
-#: ../src/applet.c:427
-#, c-format
-msgid "Could not start the VPN connection '%s' due to a login failure."
+"<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'."
 
-#: ../src/applet.c:431
-msgid "VPN Start Failure"
+#: info-daemon/passphrase.glade:129
+msgid "Key Type:"
 msgstr ""
 
-#: ../src/applet.c:432
-#, c-format
+#: info-daemon/passphrase.glade:150
 msgid ""
-"Could not start the VPN connection '%s' due to a failure launching the VPN "
-"program."
+"128-bit Passphrase\n"
+"128-bit Raw Hex Key"
 msgstr ""
 
-#: ../src/applet.c:436 ../src/applet.c:446
-msgid "VPN Connect Failure"
-msgstr ""
-
-#: ../src/applet.c:437
-#, c-format
-msgid "Could not start the VPN connection '%s' due to a connection error."
-msgstr ""
+#: info-daemon/passphrase.glade:180
+#: info-daemon/NetworkManagerInfoPassphraseDialog.c:101
+msgid "Passphrase:"
+msgstr "Passphrase:"
 
-#: ../src/applet.c:441
-msgid "VPN Configuration Error"
-msgstr ""
+#: info-daemon/passphrase.glade:208 panel-applet/essid.glade:162
+msgid "*"
+msgstr "*"
 
-#: ../src/applet.c:442
-#, c-format
-msgid "The VPN connection '%s' was not correctly configured."
-msgstr ""
-
-#: ../src/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 ""
-
-#: ../src/applet.c:517
-msgid "VPN Login Message"
+#: info-daemon/NetworkManagerInfoPassphraseDialog.c:104
+msgid "Key:"
 msgstr ""
 
-#: ../src/applet.c:741 ../src/applet.c:2508
-#: ../src/other-network-dialog.c:453
-#: ../src/passphrase-dialog.c:228
+#. Reuse the above string to make the translators less angry.
+#: panel-applet/NMWirelessApplet.c:691 panel-applet/NMWirelessApplet.c:701
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
@@ -133,850 +79,84 @@ msgstr ""
 "NetworkManager Aplet nije pronašao neke potrebne resurse (glade nije "
 "pronađen)."
 
-#: ../src/applet.c:753
-#, c-format
-msgid "The network device \"%s (%s)\" does not support wireless scanning."
-msgstr ""
-
-#: ../src/applet.c:761
-#, c-format
-msgid "The network device \"%s (%s)\" does not support link detection."
-msgstr ""
-
-#: ../src/applet.c:908
-#, c-format
-msgid "Preparing device %s for the wired network..."
-msgstr ""
-
-#: ../src/applet.c:910
-#, fuzzy, c-format
-msgid "Preparing device %s for the wireless network '%s'..."
-msgstr "Nema wireless mreža..."
-
-#: ../src/applet.c:918
-#, c-format
-msgid "Configuring device %s for the wired network..."
-msgstr ""
-
-#: ../src/applet.c:920
-#, fuzzy, c-format
-msgid "Attempting to join the wireless network '%s'..."
-msgstr "Nema wireless mreža..."
-
-#: ../src/applet.c:928
-#, fuzzy, c-format
-msgid "Waiting for Network Key for the wireless network '%s'..."
-msgstr "Nema wireless mreža..."
-
-#: ../src/applet.c:936 ../src/applet.c:946
-msgid "Requesting a network address from the wired network..."
-msgstr ""
-
-#: ../src/applet.c:938 ../src/applet.c:948
-#, fuzzy, c-format
-msgid "Requesting a network address from the wireless network '%s'..."
-msgstr "Nema wireless mreža..."
-
-#: ../src/applet.c:956
-msgid "Finishing connection to the wired network..."
-msgstr ""
-
-#: ../src/applet.c:958
-#, fuzzy, c-format
-msgid "Finishing connection to the wireless network '%s'..."
-msgstr "Nema wireless mreža..."
-
-#: ../src/applet.c:1075
-#, fuzzy
-msgid "NetworkManager is not running"
-msgstr "NetworkManager nije pokrenut..."
-
-#: ../src/applet.c:1083 ../src/applet.c:1828
-msgid "Networking disabled"
-msgstr ""
-
-#: ../src/applet.c:1088
-#, fuzzy
-msgid "No network connection"
-msgstr "Mrežne konekcije"
-
-#: ../src/applet.c:1093
+#: panel-applet/NMWirelessApplet.c:716
 #, fuzzy
-msgid "Wired network connection"
-msgstr "Mrežne konekcije"
-
-#: ../src/applet.c:1097
-#, fuzzy
-msgid "Connected to an Ad-Hoc wireless network"
+msgid "Custom wireless network"
 msgstr "Wireless Mreže"
 
-#: ../src/applet.c:1099
-#, fuzzy, c-format
-msgid "Wireless network connection to '%s' (%d%%)"
-msgstr "Wireless Mreže"
-
-#: ../src/applet.c:1120
-#, c-format
-msgid "VPN connection to '%s'"
-msgstr ""
-
-#: ../src/applet.c:1128
-#, c-format
-msgid "VPN connecting to '%s'"
+#: panel-applet/NMWirelessApplet.c:717
+msgid "Enter the ESSID of the wireless network to which you wish to connect."
 msgstr ""
 
-#: ../src/applet.c:1541
-#, fuzzy
-msgid "_Connect to Other Wireless Network..."
-msgstr "Wireless Mreže"
-
-#: ../src/applet.c:1562
+#: panel-applet/NMWirelessApplet.c:800
 #, fuzzy
-msgid "Create _New Wireless Network..."
+msgid "Other Wireless Networks..."
 msgstr "Wireless Mreže"
 
-#: ../src/applet.c:1685
-#, fuzzy
-msgid "_VPN Connections"
-msgstr "Mrežne konekcije"
-
-#: ../src/applet.c:1730
-msgid "_Configure VPN..."
-msgstr ""
-
-#: ../src/applet.c:1734
-msgid "_Disconnect VPN..."
-msgstr ""
-
-#: ../src/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
-#: ../src/applet.c:1767
-#, c-format
-msgid "Connect to %s..."
-msgstr ""
-
-#: ../src/applet.c:1773
-#, c-format
-msgid "Disconnect from %s..."
-msgstr ""
-
-#: ../src/applet.c:1822
+#: panel-applet/NMWirelessApplet.c:911
 msgid "No network devices have been found"
 msgstr ""
 
-#: ../src/applet.c:2014
+#: panel-applet/NMWirelessApplet.c:1028
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager nije pokrenut..."
 
-#. 'Enable Networking' item
-#: ../src/applet.c:2170
-#, fuzzy
-msgid "Enable _Networking"
-msgstr "Wireless Mreže"
-
-#. 'Enable Wireless' item
-#: ../src/applet.c:2176
-msgid "Enable _Wireless"
-msgstr ""
-
-#. 'Connection Information' item
-#: ../src/applet.c:2182
-msgid "Connection _Information"
-msgstr ""
-
-#. Help item
-#: ../src/applet.c:2193
-msgid "_Help"
+#: panel-applet/essid.glade:52
+msgid "C_onnect"
 msgstr ""
 
-#. About item
-#: ../src/applet.c:2202
+#: panel-applet/essid.glade:131
 #, fuzzy
-msgid "_About"
-msgstr "_O..."
-
-#: ../src/applet.c:2667
-#, fuzzy
-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)."
-
-#: ../src/wireless-security-option.c:157
-msgid "Open System"
-msgstr ""
-
-#: ../src/wireless-security-option.c:160
-msgid "Shared Key"
-msgstr ""
-
-#: ../src/wireless-security-option.c:208
-msgid "Automatic (Default)"
-msgstr ""
-
-#: ../src/wireless-security-option.c:215
-msgid "AES-CCMP"
-msgstr ""
-
-#: ../src/wireless-security-option.c:223
-msgid "TKIP"
-msgstr ""
-
-#: ../src/wireless-security-option.c:231
-msgid "Dynamic WEP"
-msgstr ""
-
-#: ../src/wso-none.c:53
-msgid "None"
-msgstr ""
-
-#: ../src/wso-wep-ascii.c:138
-msgid "WEP 64/128-bit ASCII"
-msgstr ""
-
-#: ../src/wso-wep-hex.c:135
-msgid "WEP 64/128-bit Hex"
-msgstr ""
+msgid "Wireless _Network:"
+msgstr "Wireless Mreže"
 
-#: ../src/wso-wep-passphrase.c:135
+#: panel-applet/essid.glade:177
 #, fuzzy
-msgid "WEP 128-bit Passphrase"
-msgstr "Passphrase:"
-
-#: ../src/wso-wpa-eap.c:237
-msgid "PEAP"
-msgstr ""
-
-#: ../src/wso-wpa-eap.c:238
-msgid "TLS"
-msgstr ""
-
-#: ../src/wso-wpa-eap.c:239
-msgid "TTLS"
-msgstr ""
-
-#: ../src/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 ""
-
-#: ../src/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 ""
-
-#: ../src/wso-wpa-psk.c:178
-msgid "WPA2 Personal"
-msgstr ""
-
-#: ../src/wso-wpa-psk.c:180
-msgid "WPA Personal"
-msgstr ""
-
-#: ../src/eggtrayicon.c:134
-msgid "Orientation"
-msgstr ""
-
-#: ../src/eggtrayicon.c:135
-msgid "The orientation of the tray."
-msgstr ""
+msgid "Wireless _adapter:"
+msgstr "Wireless Mreže"
 
-#: ../src/menu-items.c:88
+#: panel-applet/menu-info.c:101
 #, fuzzy, c-format
 msgid "Wired Network (%s)"
 msgstr "Wireless Mreže"
 
-#: ../src/menu-items.c:91
+#: panel-applet/menu-info.c:103
 #, fuzzy
-msgid "_Wired Network"
+msgid "Wired Network"
 msgstr "Wireless Mreže"
 
-#: ../src/menu-items.c:162
+#: panel-applet/menu-info.c:168
 #, fuzzy, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
 msgstr[0] "Wireless Mreže"
 msgstr[1] "Wireless Mreže"
 
-#: ../src/menu-items.c:164
+#: panel-applet/menu-info.c:170
 #, fuzzy
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Wireless Mreže"
 msgstr[1] "Wireless Mreže"
 
-#: ../src/menu-items.c:343
+#: panel-applet/menu-info.c:307
 msgid " (invalid Unicode)"
 msgstr ""
 
-#: ../src/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 ""
-
-#: ../src/other-network-dialog.c:358
-#, fuzzy
-msgid "Create new wireless network"
-msgstr "Nema wireless mreža..."
-
-#: ../src/other-network-dialog.c:359
-msgid ""
-"Enter the name and security settings of the wireless network you wish to "
-"create."
-msgstr ""
-
-#: ../src/other-network-dialog.c:363
-#, fuzzy
-msgid "Create New Wireless Network"
-msgstr "Wireless Mreže"
-
-#: ../src/other-network-dialog.c:368
-#, fuzzy
-msgid "Existing wireless network"
-msgstr "Wireless Mreže"
-
-#: ../src/other-network-dialog.c:369
-msgid "Enter the name of the wireless network to which you wish to connect."
-msgstr ""
-
-#: ../src/other-network-dialog.c:371
-#, fuzzy
-msgid "Connect to Other Wireless Network"
-msgstr "Wireless Mreže"
-
-#: ../src/passphrase-dialog.c:215
-#, fuzzy
-msgid "Error connecting to wireless network"
-msgstr "Wireless Mreže"
-
-#: ../src/passphrase-dialog.c:216
-msgid ""
-"The requested wireless network requires security capabilities unsupported by "
-"your hardware."
-msgstr ""
-
-#: ../src/vpn-password-dialog.c:151
-#: ../src/vpn-password-dialog.c:188
-#, c-format
-msgid "Cannot start VPN connection '%s'"
-msgstr ""
-
-#: ../src/vpn-password-dialog.c:154
-#, c-format
-msgid ""
-"Could not find the authentication dialog for VPN connection type '%s'. "
-"Contact your system administrator."
-msgstr ""
-
-#: ../src/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 ""
-
-#: ../src/applet.glade.h:1
-msgid " "
-msgstr " "
-
-#: ../src/applet.glade.h:2
-#, fuzzy
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
-msgstr "<span weight=\"bold\">Wireless Mreže:</span>"
-
-#: ../src/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'."
-
-#: ../src/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 ""
-
-#: ../src/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."
-
-#: ../src/applet.glade.h:15
-msgid "Anonymous Identity:"
-msgstr ""
-
-#: ../src/applet.glade.h:16
-msgid "Authentication:"
-msgstr ""
-
-#: ../src/applet.glade.h:17
-msgid "Broadcast Address:"
-msgstr ""
-
-#: ../src/applet.glade.h:18
-msgid "CA Certificate File:"
-msgstr ""
-
-#: ../src/applet.glade.h:19
-msgid "C_onnect"
-msgstr ""
-
-#: ../src/applet.glade.h:20
-msgid "Client Certificate File:"
-msgstr ""
-
-#: ../src/applet.glade.h:21
-msgid "Connection Information"
-msgstr ""
-
-#: ../src/applet.glade.h:22
-msgid "Default Route:"
-msgstr ""
-
-#: ../src/applet.glade.h:23
-msgid "Destination Address:"
-msgstr ""
-
-#: ../src/applet.glade.h:24
-msgid "Driver:"
-msgstr ""
-
-#: ../src/applet.glade.h:25
-msgid "EAP Method:"
-msgstr ""
-
-#: ../src/applet.glade.h:26
-msgid "Hardware Address:"
-msgstr ""
-
-#: ../src/applet.glade.h:27
-msgid "IP Address:"
-msgstr ""
-
-#: ../src/applet.glade.h:28
-msgid "Identity:"
-msgstr ""
-
-#: ../src/applet.glade.h:29
-msgid "Interface:"
-msgstr ""
-
-#: ../src/applet.glade.h:30
-msgid "Key Type:"
-msgstr ""
-
-#: ../src/applet.glade.h:31
-msgid "Key:"
-msgstr ""
-
-#: ../src/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 ""
-
-#: ../src/applet.glade.h:37
-msgid ""
-"Open System\n"
-"Shared Key"
-msgstr ""
-
-#: ../src/applet.glade.h:39
-#, fuzzy
-msgid "Other Wireless Network..."
-msgstr "Wireless Mreže"
-
-#: ../src/applet.glade.h:40
-msgid "Passphrase:"
-msgstr "Passphrase:"
-
-#: ../src/applet.glade.h:41
-msgid "Password:"
-msgstr ""
-
-#: ../src/applet.glade.h:42
-msgid "Primary DNS:"
-msgstr ""
-
-#: ../src/applet.glade.h:43
-msgid "Private Key File:"
-msgstr ""
-
-#: ../src/applet.glade.h:44
-msgid "Private Key Password:"
-msgstr ""
-
-#: ../src/applet.glade.h:45
-msgid "Secondary DNS:"
-msgstr ""
-
-#: ../src/applet.glade.h:46
-msgid "Select the CA Certificate File"
-msgstr ""
-
-#: ../src/applet.glade.h:47
-msgid "Select the Client Certificate File"
-msgstr ""
-
-#: ../src/applet.glade.h:48
-msgid "Select the Private Key File"
-msgstr ""
-
-#: ../src/applet.glade.h:49
-msgid "Show key"
-msgstr ""
-
-#: ../src/applet.glade.h:50
-#, fuzzy
-msgid "Show passphrase"
-msgstr "Passphrase:"
-
-#: ../src/applet.glade.h:51
-msgid "Show password"
-msgstr ""
-
-#: ../src/applet.glade.h:52
-msgid "Show passwords"
-msgstr ""
-
-#: ../src/applet.glade.h:53
-msgid "Speed:"
-msgstr ""
-
-#: ../src/applet.glade.h:54
-msgid "Subnet Mask:"
-msgstr ""
-
-#: ../src/applet.glade.h:55
-msgid "Type:"
-msgstr ""
-
-#: ../src/applet.glade.h:56
-msgid "User Name:"
-msgstr ""
-
-#: ../src/applet.glade.h:57
-#, fuzzy
-msgid "Wireless Network Key Required"
-msgstr "Wireless Mreže"
-
-#: ../src/applet.glade.h:58
-#, fuzzy
-msgid "Wireless _adapter:"
-msgstr "Wireless Mreže"
-
-#: ../src/applet.glade.h:59
-#, fuzzy
-msgid "_Always Trust this Wireless Network"
-msgstr "Uvijek vjeruj ovoj wireless mreži"
-
-#: ../src/applet.glade.h:60
-msgid "_Don't remind me again"
-msgstr ""
-
-#: ../src/applet.glade.h:61
-msgid "_Login to Network"
-msgstr "_Prijava na mrežu"
-
-#: ../src/applet.glade.h:62
-msgid "_Network Name:"
-msgstr ""
-
-#: ../src/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 ""
-
-#: ../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 ""
-
-#: ../src/applet-dbus-devices.c:898
-#, c-format
-msgid "You are now connected to the Ad-Hoc wireless network '%s'."
-msgstr ""
-
-#: ../src/applet-dbus-devices.c:903
-#, fuzzy, c-format
-msgid "You are now connected to the wireless network '%s'."
-msgstr "Nema wireless mreža..."
-
-#: ../src/applet-dbus-devices.c:910
-msgid "You are now connected to the wired network."
-msgstr ""
-
-#: ../src/applet-dbus-devices.c:916
-msgid "Connection Established"
+#: examples/python/systray/eggtrayicon.c:111
+msgid "Orientation"
 msgstr ""
 
-#: ../src/applet-dbus-devices.c:959
-msgid "Disconnected"
+#: examples/python/systray/eggtrayicon.c:112
+msgid "The orientation of the tray."
 msgstr ""
 
-#: ../src/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 " "
+#~ 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..."
 
@@ -986,6 +166,9 @@ msgstr "Nijedna mrežna konekcija trenutno nije aktivna..."
 #~ 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 48795423..34da421f 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -2,93 +2,114 @@
 # Copyright © 2005, 2006, The Free Software Foundation, Inc.
 # This file is distributed under the same license as the
 #   NetworkManager package.
-# Josep Puigdemont i Casamajó <josep.puigdemont@gmail.com>, 2005, 2006.
+# Josep Puigdemont Casamajó <josep.puigdemont@gmail.com>, 2005, 2006.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: \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"
+"POT-Creation-Date: 2006-12-03 23:04+0100\n"
+"PO-Revision-Date: 2006-12-03 23:01+0100\n"
+"Last-Translator: Josep Puigdemont Casamajó <josep.puigdemont@gmail.com>\n"
 "Language-Team: Catalan <tradgnome@softcatala.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"
 
-#: ../src/applet-compat.c:171 ../src/applet-dbus-info.c:919
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:926
 #, c-format
 msgid "Passphrase for wireless network %s"
 msgstr "Contrasenya per a la xarxa sense fil %s"
 
-#: ../src/applet-dbus.c:265
+#: ../gnome/applet/applet-dbus.c:274
 #, c-format
 msgid "Connection to the wireless network '%s' failed."
 msgstr "Ha fallat la connexió a la xarxa sense fil «%s»."
 
-#: ../src/applet-dbus.c:270
+#: ../gnome/applet/applet-dbus.c:279
 msgid "Connection to the wired network failed."
 msgstr "Ha fallat la connexió a la xarxa amb fil."
 
-#: ../src/applet.c:184
+#: ../gnome/applet/applet.c:182
 msgid "Error displaying connection information:"
 msgstr "S'ha produït un error en mostrar la informació de la connexió:"
 
-#: ../src/applet.c:202
+#: ../gnome/applet/applet.c:200
 msgid "Could not find some required resources (the glade file)!"
 msgstr ""
 "Alguns dels recursos requerits no s'han pogut trobar (el fitxer glade)!"
 
-#: ../src/applet.c:213
+#: ../gnome/applet/applet.c:210
 msgid "No active connections!"
 msgstr "No hi ha cap connexió activa."
 
-#: ../src/applet.c:234
+#: ../gnome/applet/applet.c:227
+#, c-format
+msgid "%d Mb/s"
+msgstr "%d Mb/s"
+
+#: ../gnome/applet/applet.c:230
 #, c-format
 msgid "Wired Ethernet (%s)"
 msgstr "Xarxa amb fil (%s)"
 
-#: ../src/applet.c:236
+#: ../gnome/applet/applet.c:232
 #, c-format
 msgid "Wireless Ethernet (%s)"
 msgstr "Xarxa sense fil (%s)"
 
-#: ../src/applet.c:337 ../src/applet.c:362
+#: ../gnome/applet/applet.c:238
+msgid "Unknown"
+msgstr "Desconegut"
+
+#: ../gnome/applet/applet.c:330 ../gnome/applet/applet.c:357
 msgid "NetworkManager Applet"
 msgstr "Miniaplicació NetworkManager"
 
-#: ../src/applet.c:339 ../src/applet.c:364
-msgid "Copyright © 2004-2005 Red Hat, Inc."
-msgstr "Copyright © 2004-2005 Red Hat, Inc."
+#: ../gnome/applet/applet.c:332
+msgid ""
+"Copyright © 2004-2006 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+msgstr ""
+"Copyright © 2004-2006 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
 
-#: ../src/applet.c:340 ../src/applet.c:365
+#: ../gnome/applet/applet.c:334 ../gnome/applet/applet.c:361
 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."
 
-#: ../src/applet.c:343 ../src/applet.c:370
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:365
 msgid "translator-credits"
 msgstr "Josep Puigdemont i Casamajó <josep.puigdemont@gmail.com>"
 
-#: ../src/applet.c:426
+#: ../gnome/applet/applet.c:359
+msgid ""
+"Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+msgstr ""
+"Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+
+#: ../gnome/applet/applet.c:421
 msgid "VPN Login Failure"
 msgstr "S'ha produït un error en l'entrada VPN"
 
-#: ../src/applet.c:427
+#: ../gnome/applet/applet.c:422
 #, 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»."
 
-#: ../src/applet.c:431
+#: ../gnome/applet/applet.c:426
 msgid "VPN Start Failure"
 msgstr "No s'ha pogut iniciar la VPN"
 
-#: ../src/applet.c:432
+#: ../gnome/applet/applet.c:427
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
@@ -97,27 +118,27 @@ msgstr ""
 "No s'ha pogut iniciar la connexió VPN «%s» perquè s'ha produït un error en "
 "llançar la VPN."
 
-#: ../src/applet.c:436 ../src/applet.c:446
+#: ../gnome/applet/applet.c:431 ../gnome/applet/applet.c:441
 msgid "VPN Connect Failure"
 msgstr "S'ha produït un error en la connexió VPN"
 
-#: ../src/applet.c:437
+#: ../gnome/applet/applet.c:432
 #, 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ó."
 
-#: ../src/applet.c:441
+#: ../gnome/applet/applet.c:436
 msgid "VPN Configuration Error"
 msgstr "S'ha produït un error de configuració de la VPN"
 
-#: ../src/applet.c:442
+#: ../gnome/applet/applet.c:437
 #, c-format
 msgid "The VPN connection '%s' was not correctly configured."
 msgstr "La connexió VPN «%s» no està correctament configurada."
 
-#: ../src/applet.c:447
+#: ../gnome/applet/applet.c:442
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' because the VPN server did not "
@@ -126,13 +147,13 @@ msgstr ""
 "No s'ha pogut iniciar la connexió VPN «%s» perquè el servidor VPN no ha "
 "retornat cap configuració de xarxa adequada."
 
-#: ../src/applet.c:517
+#: ../gnome/applet/applet.c:512
 msgid "VPN Login Message"
 msgstr "Missatge d'entrada de la VPN"
 
-#: ../src/applet.c:741 ../src/applet.c:2508
-#: ../src/other-network-dialog.c:453
-#: ../src/passphrase-dialog.c:228
+#: ../gnome/applet/applet.c:737 ../gnome/applet/applet.c:2635
+#: ../gnome/applet/other-network-dialog.c:458
+#: ../gnome/applet/passphrase-dialog.c:228
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
@@ -140,164 +161,170 @@ msgstr ""
 "La miniaplicació NetworkManager no ha pogut trobar alguns dels recursos "
 "requerits (no s'ha trobat el fitxer glade)."
 
-#: ../src/applet.c:753
+# FIXME
+#: ../gnome/applet/applet.c:749
 #, 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."
 
-#: ../src/applet.c:761
+#: ../gnome/applet/applet.c:757
 #, 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ç."
 
-#: ../src/applet.c:908
+#. Note to translators: this is used if no essid is known
+#: ../gnome/applet/applet.c:905 ../gnome/applet/applet.c:1103
+msgid "(unknown)"
+msgstr "(desconegut)"
+
+#: ../gnome/applet/applet.c:911
 #, c-format
 msgid "Preparing device %s for the wired network..."
-msgstr "S'està perparant el dispositiu %s per a la xarxa amb fil..."
+msgstr "S'està preparant el dispositiu %s per a la xarxa amb fil..."
 
-#: ../src/applet.c:910
+#: ../gnome/applet/applet.c:913
 #, 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»..."
 
-#: ../src/applet.c:918
+#: ../gnome/applet/applet.c:921
 #, c-format
 msgid "Configuring device %s for the wired network..."
-msgstr "S'està configurant el dispositu %s per a la xarxa amb fil..."
+msgstr "S'està configurant el dispositiu %s per a la xarxa amb fil..."
 
-#: ../src/applet.c:920
+#: ../gnome/applet/applet.c:923
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
 msgstr "S'està intentant entrar a la xarxa sense fil «%s»..."
 
-#: ../src/applet.c:928
+#: ../gnome/applet/applet.c:931
 #, 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»..."
 
-#: ../src/applet.c:936 ../src/applet.c:946
+#: ../gnome/applet/applet.c:939 ../gnome/applet/applet.c:949
 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..."
 
-#: ../src/applet.c:938 ../src/applet.c:948
+#: ../gnome/applet/applet.c:941 ../gnome/applet/applet.c:951
 #, 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»..."
 
-#: ../src/applet.c:956
+#: ../gnome/applet/applet.c:959
 msgid "Finishing connection to the wired network..."
 msgstr "S'està finalitzant la connexió a la xarxa amb fil..."
 
-#: ../src/applet.c:958
+#: ../gnome/applet/applet.c:961
 #, c-format
 msgid "Finishing connection to the wireless network '%s'..."
 msgstr "S'està finalizant la connexió a la xarxa sense fil «%s»..."
 
-#: ../src/applet.c:1075
+#: ../gnome/applet/applet.c:1078
 msgid "NetworkManager is not running"
 msgstr "No s'està executant el NetworkManager"
 
-#: ../src/applet.c:1083 ../src/applet.c:1828
+#: ../gnome/applet/applet.c:1086 ../gnome/applet/applet.c:1843
 msgid "Networking disabled"
 msgstr "S'ha inhabilitat la xarxa"
 
-#: ../src/applet.c:1088
+#: ../gnome/applet/applet.c:1091
 msgid "No network connection"
 msgstr "No hi ha cap connexió de xarxa"
 
-#: ../src/applet.c:1093
+#: ../gnome/applet/applet.c:1096
 msgid "Wired network connection"
 msgstr "Connexió de xarxa amb fil"
 
-#: ../src/applet.c:1097
+#: ../gnome/applet/applet.c:1100
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Connectat a una xarxa Ad-Hoc sense fil"
 
-#: ../src/applet.c:1099
+#: ../gnome/applet/applet.c:1102
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "Connexió de xarxa sense fil a «%s» (%d%%)"
 
-#: ../src/applet.c:1120
+#: ../gnome/applet/applet.c:1123
 #, c-format
 msgid "VPN connection to '%s'"
 msgstr "Connexió VPN a «%s»"
 
-#: ../src/applet.c:1128
+#: ../gnome/applet/applet.c:1131
 #, c-format
 msgid "VPN connecting to '%s'"
 msgstr "S'està connectant amb VPN a «%s»"
 
-#: ../src/applet.c:1541
+#: ../gnome/applet/applet.c:1556
 msgid "_Connect to Other Wireless Network..."
 msgstr "_Connecta a d'altres xarxes sense fil..."
 
-#: ../src/applet.c:1562
+#: ../gnome/applet/applet.c:1577
 msgid "Create _New Wireless Network..."
 msgstr "Crea una xarxa sense fil _nova..."
 
-#: ../src/applet.c:1685
+#: ../gnome/applet/applet.c:1700
 msgid "_VPN Connections"
 msgstr "Connexions _VPN"
 
-#: ../src/applet.c:1730
+#: ../gnome/applet/applet.c:1745
 msgid "_Configure VPN..."
 msgstr "_Configura la VPN..."
 
-#: ../src/applet.c:1734
+#: ../gnome/applet/applet.c:1749
 msgid "_Disconnect VPN..."
 msgstr "_Desconnecta la VPN..."
 
-#: ../src/applet.c:1756
+#: ../gnome/applet/applet.c:1771
 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
-#: ../src/applet.c:1767
+#: ../gnome/applet/applet.c:1782
 #, c-format
 msgid "Connect to %s..."
 msgstr "Connecta a %s..."
 
-#: ../src/applet.c:1773
+#: ../gnome/applet/applet.c:1788
 #, c-format
 msgid "Disconnect from %s..."
 msgstr "Desconnecta de %s..."
 
-#: ../src/applet.c:1822
+#: ../gnome/applet/applet.c:1837
 msgid "No network devices have been found"
 msgstr "No s'ha trobat cap dispositiu de xarxa"
 
-#: ../src/applet.c:2014
+#: ../gnome/applet/applet.c:2029
 msgid "NetworkManager is not running..."
 msgstr "No s'està executant el NetworkManager..."
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2170
+#: ../gnome/applet/applet.c:2210
 msgid "Enable _Networking"
 msgstr "Habilita la _xarxa"
 
 #. 'Enable Wireless' item
-#: ../src/applet.c:2176
+#: ../gnome/applet/applet.c:2216
 msgid "Enable _Wireless"
 msgstr "Habilita la xarxa _sense fil"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2182
+#: ../gnome/applet/applet.c:2222
 msgid "Connection _Information"
 msgstr "_Informació de la connexió"
 
 #. Help item
-#: ../src/applet.c:2193
+#: ../gnome/applet/applet.c:2233
 msgid "_Help"
 msgstr "A_juda"
 
 #. About item
-#: ../src/applet.c:2202
+#: ../gnome/applet/applet.c:2242
 msgid "_About"
 msgstr "_Quant a"
 
-#: ../src/applet.c:2667
+#: ../gnome/applet/applet.c:2824
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
@@ -305,111 +332,111 @@ msgstr ""
 "La miniaplicació NetworkManager no ha pogut trobar alguns dels recursos "
 "requerits. No pot continuar.\n"
 
-#: ../src/wireless-security-option.c:157
+#: ../gnome/applet/wireless-security-option.c:157
 msgid "Open System"
 msgstr "Sistema obert"
 
-#: ../src/wireless-security-option.c:160
+#: ../gnome/applet/wireless-security-option.c:160
 msgid "Shared Key"
 msgstr "Clau compartida"
 
-#: ../src/wireless-security-option.c:208
+#: ../gnome/applet/wireless-security-option.c:208
 msgid "Automatic (Default)"
 msgstr "Automàtic (Predeterminat)"
 
-#: ../src/wireless-security-option.c:215
+#: ../gnome/applet/wireless-security-option.c:215
 msgid "AES-CCMP"
 msgstr "AES-CCMP"
 
-#: ../src/wireless-security-option.c:223
+#: ../gnome/applet/wireless-security-option.c:223
 msgid "TKIP"
 msgstr "TKIP"
 
-#: ../src/wireless-security-option.c:231
+#: ../gnome/applet/wireless-security-option.c:231
 msgid "Dynamic WEP"
 msgstr "WEP dinàmic"
 
-#: ../src/wso-none.c:53
+#: ../gnome/applet/wso-none.c:53
 msgid "None"
 msgstr "Cap"
 
-#: ../src/wso-wep-ascii.c:138
+#: ../gnome/applet/wso-wep-ascii.c:138
 msgid "WEP 64/128-bit ASCII"
 msgstr "WEP 64/128-bit ASCII"
 
-#: ../src/wso-wep-hex.c:135
+#: ../gnome/applet/wso-wep-hex.c:135
 msgid "WEP 64/128-bit Hex"
 msgstr "WEP 64/128-bit Hex"
 
-#: ../src/wso-wep-passphrase.c:135
+#: ../gnome/applet/wso-wep-passphrase.c:135
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP contrasenya de 128-bits"
 
-#: ../src/wso-wpa-eap.c:237
+#: ../gnome/applet/wso-wpa-eap.c:237
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../src/wso-wpa-eap.c:238
+#: ../gnome/applet/wso-wpa-eap.c:238
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wso-wpa-eap.c:239
+#: ../gnome/applet/wso-wpa-eap.c:239
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../src/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
-#: ../src/nm-ap-security-wpa-eap.c:116
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:93
+#: ../src/nm-ap-security-wpa-eap.c:117
 msgid "WPA2 Enterprise"
 msgstr "WPA2 Enterprise"
 
-#: ../src/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
-#: ../src/nm-ap-security-wpa-eap.c:121
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:95
+#: ../src/nm-ap-security-wpa-eap.c:122
 msgid "WPA Enterprise"
 msgstr "WPA Enterprise"
 
-#: ../src/wso-wpa-psk.c:178
+#: ../gnome/applet/wso-wpa-psk.c:178
 msgid "WPA2 Personal"
-msgstr "Contrasenya personal WPA2"
+msgstr "WPA2 personal"
 
-#: ../src/wso-wpa-psk.c:180
+#: ../gnome/applet/wso-wpa-psk.c:180
 msgid "WPA Personal"
-msgstr "Contrasenya personal WPA"
+msgstr "WPA personal"
 
-#: ../src/eggtrayicon.c:134
+#: ../gnome/applet/eggtrayicon.c:134
 msgid "Orientation"
 msgstr "Orientació"
 
-#: ../src/eggtrayicon.c:135
+#: ../gnome/applet/eggtrayicon.c:135
 msgid "The orientation of the tray."
-msgstr "Orientació de l'àrea de notificació."
+msgstr "La orientació de l'àrea de notificació."
 
-#: ../src/menu-items.c:88
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Xarxa amb fil (%s)"
 
-#: ../src/menu-items.c:91
+#: ../gnome/applet/menu-items.c:91
 msgid "_Wired Network"
 msgstr "Xarxa amb _fil"
 
-#: ../src/menu-items.c:162
+#: ../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)"
 
-#: ../src/menu-items.c:164
+#: ../gnome/applet/menu-items.c:164
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Xarxa sense fil"
 msgstr[1] "Xarxes sense fil"
 
-#: ../src/menu-items.c:343
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr " (Unicode invàlid)"
 
-#: ../src/other-network-dialog.c:352
+#: ../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, "
@@ -418,11 +445,11 @@ msgstr ""
 "Per defecte, el nom de la xarxa sense fil s'estableix al nom de l'ordinador, "
 "%s, sense habilitar el xifratge"
 
-#: ../src/other-network-dialog.c:358
+#: ../gnome/applet/other-network-dialog.c:358
 msgid "Create new wireless network"
 msgstr "Crea una nova xarxa sense fil"
 
-#: ../src/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."
@@ -430,27 +457,27 @@ msgstr ""
 "Entreu el nom els paràmetres de seguretat per a la xarxa sense fil que "
 "vulgueu crear."
 
-#: ../src/other-network-dialog.c:363
+#: ../gnome/applet/other-network-dialog.c:363
 msgid "Create New Wireless Network"
 msgstr "Crea una xarxa sense fil nova"
 
-#: ../src/other-network-dialog.c:368
+#: ../gnome/applet/other-network-dialog.c:368
 msgid "Existing wireless network"
 msgstr "Xarxa sense fil existent"
 
-#: ../src/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 "Entreu el nom de la xarxa sense fil a la que vulgueu connectar-vos."
 
-#: ../src/other-network-dialog.c:371
+#: ../gnome/applet/other-network-dialog.c:371
 msgid "Connect to Other Wireless Network"
 msgstr "Connecta a d'altres xarxes sense fil"
 
-#: ../src/passphrase-dialog.c:215
+#: ../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..."
 
-#: ../src/passphrase-dialog.c:216
+#: ../gnome/applet/passphrase-dialog.c:216
 msgid ""
 "The requested wireless network requires security capabilities unsupported by "
 "your hardware."
@@ -458,13 +485,13 @@ msgstr ""
 "La xarxa sense fil seleccionada requereix certes característiques de "
 "seguretat que no estan implementades en el aquest maquinari."
 
-#: ../src/vpn-password-dialog.c:151
-#: ../src/vpn-password-dialog.c:188
+#: ../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»"
 
-#: ../src/vpn-password-dialog.c:154
+#: ../gnome/applet/vpn-password-dialog.c:154
 #, c-format
 msgid ""
 "Could not find the authentication dialog for VPN connection type '%s'. "
@@ -473,7 +500,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."
 
-#: ../src/vpn-password-dialog.c:191
+#: ../gnome/applet/vpn-password-dialog.c:191
 #, c-format
 msgid ""
 "There was a problem launching the authentication dialog for VPN connection "
@@ -482,17 +509,17 @@ msgstr ""
 "S'ha produït un error en llançar el diàleg d'autenticació per al tipus de "
 "connexió VPN «%s». Contacteu el vostre administrador de sistemes."
 
-#: ../src/applet.glade.h:1
+#: ../gnome/applet/applet.glade.h:1
 msgid " "
 msgstr " "
 
-#: ../src/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\">Informació de la connexió activa</span>"
 
-#: ../src/applet.glade.h:4
+#: ../gnome/applet/applet.glade.h:4
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
@@ -507,7 +534,7 @@ msgstr ""
 "Es requereix una contrasenya o clau de xifratge per a la xarxa sense fil «%"
 "s»."
 
-#: ../src/applet.glade.h:8
+#: ../gnome/applet/applet.glade.h:8
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
@@ -518,7 +545,7 @@ msgstr ""
 "\n"
 "%s  No serà del tot funcional."
 
-#: ../src/applet.glade.h:12
+#: ../gnome/applet/applet.glade.h:12
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
@@ -531,80 +558,84 @@ msgstr ""
 "<span weight=\"bold\" size=\"larger\">Confirmació de l'entrada a la xarxa "
 "sense fil</span>\n"
 "\n"
-"Heu escollit entrar a la xarxa sene fil «%s». Si esteu segur que la xarxa "
+"Heu escollit entrar a la xarxa sense fil «%s». Si esteu segur que la xarxa "
 "sense fil és segura, feu clic al quadre de comprovació de sota i el "
 "NetworkManager no us tornarà a demanarà cap més confirmació per entrar a "
 "aquesta xarxa en el futur."
 
-#: ../src/applet.glade.h:15
+#: ../gnome/applet/applet.glade.h:15
 msgid "Anonymous Identity:"
 msgstr "Identitat anònima:"
 
-#: ../src/applet.glade.h:16
+#: ../gnome/applet/applet.glade.h:16
 msgid "Authentication:"
 msgstr "Autenticació:"
 
-#: ../src/applet.glade.h:17
+#: ../gnome/applet/applet.glade.h:17
 msgid "Broadcast Address:"
 msgstr "Adreça de multidifusió:"
 
-#: ../src/applet.glade.h:18
+#: ../gnome/applet/applet.glade.h:18
 msgid "CA Certificate File:"
 msgstr "Fitxer del certificat CA:"
 
-#: ../src/applet.glade.h:19
+#: ../gnome/applet/applet.glade.h:19
 msgid "C_onnect"
 msgstr "C_onnecta"
 
-#: ../src/applet.glade.h:20
+#: ../gnome/applet/applet.glade.h:20
 msgid "Client Certificate File:"
 msgstr "Fitxer del certificat del client:"
 
-#: ../src/applet.glade.h:21
+#: ../gnome/applet/applet.glade.h:21
 msgid "Connection Information"
 msgstr "Informació de la connexió"
 
-#: ../src/applet.glade.h:22
+#: ../gnome/applet/applet.glade.h:22
 msgid "Default Route:"
 msgstr "Ruta predeterminada:"
 
-#: ../src/applet.glade.h:23
+#: ../gnome/applet/applet.glade.h:23
 msgid "Destination Address:"
 msgstr "Adreça de destí:"
 
-#: ../src/applet.glade.h:24
+#: ../gnome/applet/applet.glade.h:24
 msgid "Driver:"
 msgstr "Connector:"
 
-#: ../src/applet.glade.h:25
+#: ../gnome/applet/applet.glade.h:25
 msgid "EAP Method:"
 msgstr "Mètode EAP:"
 
-#: ../src/applet.glade.h:26
+#: ../gnome/applet/applet.glade.h:26
 msgid "Hardware Address:"
 msgstr "Adreça del maquinari:"
 
-#: ../src/applet.glade.h:27
+#: ../gnome/applet/applet.glade.h:27
 msgid "IP Address:"
 msgstr "Adreça IP:"
 
-#: ../src/applet.glade.h:28
+#: ../gnome/applet/applet.glade.h:28
 msgid "Identity:"
 msgstr "Identitat:"
 
-#: ../src/applet.glade.h:29
+#: ../gnome/applet/applet.glade.h:29
 msgid "Interface:"
 msgstr "Interfície:"
 
-#: ../src/applet.glade.h:30
+#: ../gnome/applet/applet.glade.h:30
 msgid "Key Type:"
 msgstr "Tipus de clau:"
 
-#: ../src/applet.glade.h:31
+#: ../gnome/applet/applet.glade.h:31
+msgid "Key management:"
+msgstr "Gestió de claus:"
+
+#: ../gnome/applet/applet.glade.h:32
 msgid "Key:"
 msgstr "Clau:"
 
-#: ../src/applet.glade.h:32
+#: ../gnome/applet/applet.glade.h:33
 msgid ""
 "None\n"
 "WEP 128-bit Passphrase\n"
@@ -616,7 +647,7 @@ msgstr ""
 "WEP 64/128-bit Hex\n"
 "WEP 64/128-bit ASCII\n"
 
-#: ../src/applet.glade.h:37
+#: ../gnome/applet/applet.glade.h:38
 msgid ""
 "Open System\n"
 "Shared Key"
@@ -624,111 +655,115 @@ msgstr ""
 "Sistema obert\n"
 "Clau compartida"
 
-#: ../src/applet.glade.h:39
+#: ../gnome/applet/applet.glade.h:40
 msgid "Other Wireless Network..."
 msgstr "Altres xarxes sense fil..."
 
-#: ../src/applet.glade.h:40
+#: ../gnome/applet/applet.glade.h:41
 msgid "Passphrase:"
 msgstr "Contrasenya:"
 
-#: ../src/applet.glade.h:41
+#: ../gnome/applet/applet.glade.h:42
 msgid "Password:"
 msgstr "Contrasenya:"
 
-#: ../src/applet.glade.h:42
+#: ../gnome/applet/applet.glade.h:43
 msgid "Primary DNS:"
 msgstr "DNS primari:"
 
-#: ../src/applet.glade.h:43
+#: ../gnome/applet/applet.glade.h:44
 msgid "Private Key File:"
 msgstr "Fitxer de la clau privada:"
 
-#: ../src/applet.glade.h:44
+#: ../gnome/applet/applet.glade.h:45
 msgid "Private Key Password:"
 msgstr "Contrasenya de la clau privada:"
 
-#: ../src/applet.glade.h:45
+#: ../gnome/applet/applet.glade.h:46
 msgid "Secondary DNS:"
-msgstr "DNS secondari:"
+msgstr "DNS secundari:"
 
-#: ../src/applet.glade.h:46
+#: ../gnome/applet/applet.glade.h:47
 msgid "Select the CA Certificate File"
 msgstr "Seleccioneu el fitxer del certificat de la CA"
 
-#: ../src/applet.glade.h:47
+#: ../gnome/applet/applet.glade.h:48
 msgid "Select the Client Certificate File"
 msgstr "Seleccioneu el fitxer del certificat del client"
 
-#: ../src/applet.glade.h:48
+#: ../gnome/applet/applet.glade.h:49
 msgid "Select the Private Key File"
 msgstr "Seleccioneu el fitxer de la clau privada"
 
-#: ../src/applet.glade.h:49
+#: ../gnome/applet/applet.glade.h:50
 msgid "Show key"
 msgstr "Mostra la clau"
 
-#: ../src/applet.glade.h:50
+#: ../gnome/applet/applet.glade.h:51
 msgid "Show passphrase"
 msgstr "Mostra la contrasenya:"
 
-#: ../src/applet.glade.h:51
+#: ../gnome/applet/applet.glade.h:52
 msgid "Show password"
 msgstr "Mostra la contrasenya:"
 
-#: ../src/applet.glade.h:52
+#: ../gnome/applet/applet.glade.h:53
 msgid "Show passwords"
 msgstr "Mostra les contrasenyes"
 
-#: ../src/applet.glade.h:53
+#: ../gnome/applet/applet.glade.h:54
 msgid "Speed:"
 msgstr "Velocitat:"
 
-#: ../src/applet.glade.h:54
+#: ../gnome/applet/applet.glade.h:55
 msgid "Subnet Mask:"
 msgstr "Màscara de subxarxa:"
 
-#: ../src/applet.glade.h:55
+#: ../gnome/applet/applet.glade.h:56
 msgid "Type:"
 msgstr "Tipus:"
 
-#: ../src/applet.glade.h:56
+#: ../gnome/applet/applet.glade.h:57
 msgid "User Name:"
 msgstr "Nom d'usuari:"
 
-#: ../src/applet.glade.h:57
+#: ../gnome/applet/applet.glade.h:58
 msgid "Wireless Network Key Required"
 msgstr "Es requereix una clau per a la xarxa sense fil"
 
-#: ../src/applet.glade.h:58
+#: ../gnome/applet/applet.glade.h:59
 msgid "Wireless _adapter:"
 msgstr "_Adaptador sense fil:"
 
-#: ../src/applet.glade.h:59
+#: ../gnome/applet/applet.glade.h:60
 msgid "_Always Trust this Wireless Network"
 msgstr "Confia sempre en _aquesta xarxa sense fil"
 
-#: ../src/applet.glade.h:60
+#: ../gnome/applet/applet.glade.h:61
 msgid "_Don't remind me again"
 msgstr "_No m'ho tornis a recordar"
 
-#: ../src/applet.glade.h:61
+#: ../gnome/applet/applet.glade.h:62
+msgid "_Fallback on this Network"
+msgstr "Utilitza aquesta _xarxa com a alternativa"
+
+#: ../gnome/applet/applet.glade.h:63
 msgid "_Login to Network"
 msgstr "_Entra a la xarxa"
 
-#: ../src/applet.glade.h:62
+#: ../gnome/applet/applet.glade.h:64
 msgid "_Network Name:"
 msgstr "Nom de _xarxa:"
 
-#: ../src/applet.glade.h:63
+#: ../gnome/applet/applet.glade.h:65
 msgid "_Wireless Security:"
 msgstr "Seguretat de la _xarxa sense fil:"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:383
+#: ../gnome/vpn-properties/nm-vpn-properties.c:417
 msgid "Cannot add VPN connection"
 msgstr "No s'ha pogut afegir la connexions VPN"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:385
+#: ../gnome/vpn-properties/nm-vpn-properties.c:419
 msgid ""
 "No suitable VPN software was found on your system. Contact your system "
 "administrator."
@@ -736,11 +771,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:437
+#: ../gnome/vpn-properties/nm-vpn-properties.c:461
 msgid "Cannot import VPN connection"
 msgstr "No s'ha pogut importar la connexió VPN"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:439
+#: ../gnome/vpn-properties/nm-vpn-properties.c:463
 #, c-format
 msgid ""
 "Cannot find suitable software for VPN connection type '%s' to import the "
@@ -749,12 +784,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:579
+#: ../gnome/vpn-properties/nm-vpn-properties.c:580
 #, 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:582
+#: ../gnome/vpn-properties/nm-vpn-properties.c:583
 #, c-format
 msgid ""
 "Could not find the UI files for VPN connection type '%s'. Contact your "
@@ -763,12 +798,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:739
+#: ../gnome/vpn-properties/nm-vpn-properties.c:727
 #, c-format
 msgid "Delete VPN connection \"%s\"?"
 msgstr "Voleu suprimir la connexió VPN «%s»?"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:742
+#: ../gnome/vpn-properties/nm-vpn-properties.c:730
 #, c-format
 msgid ""
 "All information about the VPN connection \"%s\" will be lost and you may "
@@ -779,16 +814,36 @@ msgstr ""
 "necessitareu que el vostre administrador us proporcioni informació per a "
 "crear una connexió nova."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:959
+#: ../gnome/vpn-properties/nm-vpn-properties.c:924
 msgid "Unable to load"
 msgstr "No es pot carregar"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:961
+#: ../gnome/vpn-properties/nm-vpn-properties.c:926
 msgid "Cannot find some needed resources (the glade file)!"
 msgstr "No s'han pogut trobar alguns dels recursos requerits el fitxer glade)."
 
+#. druid_window = GTK_DIALOG (gtk_dialog_new_with_buttons (_("Create VPN Connection"),
+#. NULL,
+#. GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+#. GTK_STOCK_CANCEL,
+#. GTK_RESPONSE_REJECT,
+#. GTK_STOCK_APPLY,
+#. GTK_RESPONSE_ACCEPT,
+#. NULL));
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1081
+msgid "Create VPN Connection"
+msgstr "Crea una connexió VPN"
+
+#. gtk_container_add (GTK_CONTAINER (druid_window->vbox), GTK_WIDGET(gtk_label_new("Some label")));
+#. gtk_box_pack_start (GTK_BOX (druid_window->vbox), GTK_WIDGET(druid), TRUE,TRUE,0);
+#. gtk_box_pack_start (GTK_BOX (druid_window->vbox), GTK_WIDGET(gtk_label_new("Some label")), TRUE,TRUE,0);
+#. toplevel = gtk_widget_get_toplevel (GTK_WIDGET (druid));
+#. gtk_signal_connect (GTK_OBJECT (toplevel), "delete_event", GTK_SIGNAL_FUNC (vpn_window_close), NULL);
+#. make the druid window modal wrt. our main window
+#. gtk_window_set_modal (druid_window, TRUE);
+#. gtk_window_set_transient_for (GTK_WINDOW(druid_window), GTK_WINDOW (dialog));
 #. Edit dialog
-#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1099
 msgid "Edit VPN Connection"
 msgstr "Edita la connexió VPN"
 
@@ -797,68 +852,30 @@ msgid "Add a new VPN connection"
 msgstr "Afegeix una connexions VPN nova"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:2
-msgid "Choose which type of VPN connection you wish to create."
-msgstr "Escolliu el tipus de conenxió VPN que vulgueu crear."
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
-msgid "Connect to:"
-msgstr "Connecta a:"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
-msgid "Create VPN Connection"
-msgstr "Crea una connexió VPN"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
-msgid "Create VPN Connection - 1 of 2"
-msgstr "Creació d'una connexió VPN - 1 de 2"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
-msgid "Create VPN Connection - 2 of 2"
-msgstr "Creació d'una connexió VPN - 2 de 2"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
 msgid "Delete the selected VPN connection"
 msgstr "Suprimeix la connexió VPN seleccionada"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
 msgid "E_xport"
 msgstr "E_xporta"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:9
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
 msgid "Edit the selected VPN connection"
 msgstr "Edita la connexió VPN seleccionada"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:10
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
 msgid "Export the VPN settings to a file"
 msgstr "Exporta els paràmetres VPN al fitxer"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:11
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
 msgid "Export the selected VPN connection to a file"
-msgstr "Expoerta la connexió VPN a un fitxer"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:12
-msgid "Finish Creating VPN Connection"
-msgstr "Finalitza la creació de la connexió VPN"
+msgstr "Exporta la connexió VPN a un fitxer"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:13
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
 msgid "Manage Virtual Private Network Connections"
 msgstr "Gestioneu connexions a xarxes privades virtuals"
 
-#: ../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 ""
-"Aquest auxiliar us guiarà a través de la creació d'una nova connexió VPN a "
-"una xarxa privada (VPN).\n"
-"\n"
-"Cal certa informació, com ara l'adreça IP i secrets, que us hauria de "
-"proporcionar el vostre administrador."
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:17
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
 msgid "VPN Connections"
 msgstr "Connexions VPN"
 
@@ -894,11 +911,11 @@ msgstr "WPA2 CCMP"
 msgid "WPA2 Automatic"
 msgstr "WPA2 automàtic"
 
-#: ../src/nm-ap-security.c:320
+#: ../src/nm-ap-security.c:338
 msgid "none"
 msgstr "cap"
 
-#: ../src/nm-netlink-monitor.c:154
+#: ../src/nm-netlink-monitor.c:174
 #, c-format
 msgid ""
 "unable to create netlink socket for monitoring wired ethernet devices - %s"
@@ -906,7 +923,7 @@ msgstr ""
 "no es pot crear el sòcol netlink per a la monitorització de dispositius de "
 "xarxa amb fil ethernet - %s"
 
-#: ../src/nm-netlink-monitor.c:172
+#: ../src/nm-netlink-monitor.c:192
 #, c-format
 msgid ""
 "unable to bind to netlink socket for monitoring wired ethernet devices - %s"
@@ -914,54 +931,83 @@ msgstr ""
 "noes pot vincular al sòcol netlink per a la monitorització de dispositius de "
 "xarxa amb fil ethernet - %s"
 
-#: ../src/nm-netlink-monitor.c:405
+#: ../src/nm-netlink-monitor.c:427
 msgid "operation took too long"
 msgstr "l'operació ha trigat massa"
 
-#: ../src/nm-netlink-monitor.c:502
+#: ../src/nm-netlink-monitor.c:524
 msgid "received data from wrong type of sender"
 msgstr "s'han rebut dades d'un tipus de remitent equivocat"
 
-#: ../src/nm-netlink-monitor.c:515
+#: ../src/nm-netlink-monitor.c:537
 msgid "received data from unexpected sender"
 msgstr "s'han rebut dades d'un remitent que no s'esperava"
 
-#: ../src/nm-netlink-monitor.c:646
+#: ../src/nm-netlink-monitor.c:666
 msgid "too much data was sent over socket and some of it was lost"
-msgstr "s'ha enviat massa dades a través del sòcol, i se n'han perdut algunes"
+msgstr "s'han enviat massa dades a través del sòcol, i se n'han perdut algunes"
 
-#: ../src/nm-netlink-monitor.c:735
+#: ../src/nm-netlink-monitor.c:776
 msgid "error occurred while waiting for data on socket"
 msgstr "s'ha produït un error en esperar dades del sòcol"
 
-#: ../src/applet-dbus-devices.c:898
+#: ../gnome/applet/applet-dbus-devices.c:930
 #, 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»."
 
-#: ../src/applet-dbus-devices.c:903
+#: ../gnome/applet/applet-dbus-devices.c:935
 #, c-format
 msgid "You are now connected to the wireless network '%s'."
 msgstr "Ara esteu connectat a la xarxa sense fil «%s»."
 
-#: ../src/applet-dbus-devices.c:910
+#: ../gnome/applet/applet-dbus-devices.c:942
 msgid "You are now connected to the wired network."
 msgstr "Ara esteu connectat a la xarxa amb fil."
 
-#: ../src/applet-dbus-devices.c:916
+#: ../gnome/applet/applet-dbus-devices.c:948
 msgid "Connection Established"
 msgstr "S'ha establert la connexió"
 
-#: ../src/applet-dbus-devices.c:959
+#: ../gnome/applet/applet-dbus-devices.c:997
 msgid "Disconnected"
 msgstr "Desconnectat"
 
-#: ../src/applet-dbus-devices.c:960
+#: ../gnome/applet/applet-dbus-devices.c:998
 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ó: "
+#: ../src/nm-ap-security-leap.c:66 ../src/nm-ap-security-leap.c:82
+msgid "LEAP"
+msgstr "LEAP"
+
+#~ msgid "Choose which type of VPN connection you wish to create."
+#~ msgstr "Escolliu el tipus de connexió VPN que vulgueu crear."
+
+#~ msgid "Connect to:"
+#~ msgstr "Connecta a:"
+
+#~ msgid "Create VPN Connection - 1 of 2"
+#~ msgstr "Creació d'una connexió VPN - 1 de 2"
+
+#~ msgid "Create VPN Connection - 2 of 2"
+#~ msgstr "Creació d'una connexió VPN - 2 de 2"
+
+#~ msgid "Finish Creating VPN Connection"
+#~ msgstr "Finalitza la creació de la connexió VPN"
+
+#~ 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 ""
+#~ "Aquest auxiliar us guiarà a través de la creació d'una nova connexió VPN "
+#~ "a una xarxa privada (VPN).\n"
+#~ "\n"
+#~ "Cal certa informació, com ara l'adreça IP i secrets, que us hauria de "
+#~ "proporcionar el vostre administrador."
 
 #~ msgid "VPN Error"
 #~ msgstr "Error VPN"
@@ -972,29 +1018,6 @@ msgstr "S'ha desconnectat la connexió de xarxa."
 #~ 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"
 
@@ -1080,9 +1103,6 @@ msgstr "S'ha desconnectat la connexió de xarxa."
 #~ msgid "Wireless _network:"
 #~ msgstr "_Xarxa sense fil:"
 
-#~ msgid "_Key type:"
-#~ msgstr "Tipus de _clau:"
-
 #~ msgid ""
 #~ "Dependent on the private network you want to connect to, you need to "
 #~ "select what type of connection you want to create."
@@ -1126,8 +1146,5 @@ msgstr "S'ha desconnectat la connexió de xarxa."
 #~ msgid "You must log in to access the private network %s"
 #~ msgstr "Heu d'autenticar-vos per accedir a la xarxa privada %s"
 
-#~ msgid "Scanning for wireless networks..."
-#~ msgstr "S'està escanejant per trobar xarxes sense fil..."
-
 #~ msgid "_About..."
 #~ msgstr "_Quant a..."
diff --git a/po/cs.po b/po/cs.po
index 8956e361..8f0cca9e 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,117 +1,128 @@
+# translation of cs.po to
 # Czech translation of NetworkManager.
 # Copyright (C) 2004, 2005, 2006 NetworkManager'S COPYRIGHT HOLDER
 # Copyright (C) 2004, 2005, 2006 Miloslav Trmac <mitr@volny.cz>
 # This file is distributed under the same license as the NetworkManager package.
 # Miloslav Trmac <mitr@volny.cz>, 2004 - 2006.
+# Jakub Friedl <jfriedl@suse.cz>, 2006.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: NetworkManager VERSION\n"
+"Project-Id-Version: cs\n"
 "Report-Msgid-Bugs-To: \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"
+"POT-Creation-Date: 2006-07-14 10:34+0200\n"
+"PO-Revision-Date: 2006-07-14 10:35+0200\n"
+"Last-Translator: Jakub Friedl <jfriedl@suse.cz>\n"
+"Language-Team:  <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%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==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: KBabel 1.10.2\n"
 
-#: ../src/applet-compat.c:171 ../src/applet-dbus-info.c:919
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:926
 #, c-format
 msgid "Passphrase for wireless network %s"
 msgstr "Heslo pro bezdrátovou síť %s"
 
-#: ../src/applet-dbus.c:265
+#: ../gnome/applet/applet-dbus.c:383
 #, c-format
 msgid "Connection to the wireless network '%s' failed."
 msgstr "Připojení k bezdrátové síti '%s' selhalo."
 
-#: ../src/applet-dbus.c:270
+#: ../gnome/applet/applet-dbus.c:388
 msgid "Connection to the wired network failed."
 msgstr "Připojení k drátové síti selhalo."
 
-#: ../src/applet.c:184
+#: ../gnome/applet/applet.c:184
 msgid "Error displaying connection information:"
 msgstr "Chyba při zobrazování informací o připojení:"
 
-#: ../src/applet.c:202
+#: ../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)!"
 
-#: ../src/applet.c:213
+#: ../gnome/applet/applet.c:213
 msgid "No active connections!"
 msgstr "Žádná aktivní připojení!"
 
-#: ../src/applet.c:234
+#: ../gnome/applet/applet.c:234
 #, c-format
 msgid "Wired Ethernet (%s)"
 msgstr "Drátový Ethernet (%s)"
 
-#: ../src/applet.c:236
+#: ../gnome/applet/applet.c:236
 #, c-format
 msgid "Wireless Ethernet (%s)"
 msgstr "Bezdrátový Ethernet (%s)"
 
-#: ../src/applet.c:337 ../src/applet.c:362
+#: ../gnome/applet/applet.c:332 ../gnome/applet/applet.c:358
 msgid "NetworkManager Applet"
 msgstr "Aplet NetworkManager"
 
-#: ../src/applet.c:339 ../src/applet.c:364
-msgid "Copyright © 2004-2005 Red Hat, Inc."
-msgstr "Copyright © 2004-2005 Red Hat, Inc."
-
-#: ../src/applet.c:340 ../src/applet.c:365
+#: ../gnome/applet/applet.c:334
 msgid ""
-"Notification area applet for managing your network devices and connections."
+"Copyright © 2004-2006 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
 msgstr ""
-"Aplet oznamovací oblasti pro správu vašich síťových zařízení a připojení."
+"Copyright © 2004-2006 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+
+#: ../gnome/applet/applet.c:336 ../gnome/applet/applet.c:362
+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í."
 
-#: ../src/applet.c:343 ../src/applet.c:370
+#: ../gnome/applet/applet.c:339 ../gnome/applet/applet.c:366
 msgid "translator-credits"
 msgstr "Miloslav Trmač <mitr@volny.cz>"
 
-#: ../src/applet.c:426
+#: ../gnome/applet/applet.c:360
+msgid ""
+"Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+msgstr ""
+"Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+
+#: ../gnome/applet/applet.c:422
 msgid "VPN Login Failure"
 msgstr "Chyba přihlášení k VPN"
 
-#: ../src/applet.c:427
+#: ../gnome/applet/applet.c:423
 #, 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í."
 
-#: ../src/applet.c:431
+#: ../gnome/applet/applet.c:427
 msgid "VPN Start Failure"
 msgstr "Chyba spuštění VPN"
 
-#: ../src/applet.c:432
+#: ../gnome/applet/applet.c:428
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
 "program."
-msgstr ""
-"Nemohu spustit připojení k VPN '%s' kvůli chybě spouštění programu pro VPN."
+msgstr "Nemohu spustit připojení k VPN '%s' kvůli chybě spouštění programu pro VPN."
 
-#: ../src/applet.c:436 ../src/applet.c:446
+#: ../gnome/applet/applet.c:432 ../gnome/applet/applet.c:442
 msgid "VPN Connect Failure"
 msgstr "Chyba připojení k VPN"
 
-#: ../src/applet.c:437
+#: ../gnome/applet/applet.c:433
 #, 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í."
 
-#: ../src/applet.c:441
+#: ../gnome/applet/applet.c:437
 msgid "VPN Configuration Error"
 msgstr "Chyba nastavení VPN"
 
-#: ../src/applet.c:442
+#: ../gnome/applet/applet.c:438
 #, c-format
 msgid "The VPN connection '%s' was not correctly configured."
 msgstr "Připojení k VPN '%s' nebylo správně nastaveno."
 
-#: ../src/applet.c:447
+#: ../gnome/applet/applet.c:443
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' because the VPN server did not "
@@ -120,13 +131,13 @@ msgstr ""
 "Nemohu spustit připojení k VPN '%s', protože VPN server nevrátil "
 "odpovídající nastavení sítě."
 
-#: ../src/applet.c:517
+#: ../gnome/applet/applet.c:513
 msgid "VPN Login Message"
 msgstr "Zpráva po přihlášení VPN"
 
-#: ../src/applet.c:741 ../src/applet.c:2508
-#: ../src/other-network-dialog.c:453
-#: ../src/passphrase-dialog.c:228
+#: ../gnome/applet/applet.c:737 ../gnome/applet/applet.c:2507
+#: ../gnome/applet/other-network-dialog.c:458
+#: ../gnome/applet/passphrase-dialog.c:228
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
@@ -134,163 +145,163 @@ msgstr ""
 "Aplet NetworkManager nemohl najít některé vyžadované zdroje (soubor glade "
 "nebyl nalezen)."
 
-#: ../src/applet.c:753
+#: ../gnome/applet/applet.c:749
 #, 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í."
 
-#: ../src/applet.c:761
+#: ../gnome/applet/applet.c:757
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
 msgstr "Síťové zařízení \"%s (%s)\" nepodporuje detekci připojení."
 
-#: ../src/applet.c:908
+#: ../gnome/applet/applet.c:904
 #, c-format
 msgid "Preparing device %s for the wired network..."
 msgstr "Připravuji zařízení %s pro drátovou síť..."
 
-#: ../src/applet.c:910
+#: ../gnome/applet/applet.c:906
 #, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
 msgstr "Připravuji zařízení %s pro bezdrátovou síť '%s' ..."
 
-#: ../src/applet.c:918
+#: ../gnome/applet/applet.c:914
 #, c-format
 msgid "Configuring device %s for the wired network..."
 msgstr "Nastavuji zařízení %s pro drátovou síť..."
 
-#: ../src/applet.c:920
+#: ../gnome/applet/applet.c:916
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
 msgstr "Pokouším se přidat k bezdrátové síti '%s'..."
 
-#: ../src/applet.c:928
+#: ../gnome/applet/applet.c:924
 #, c-format
 msgid "Waiting for Network Key for the wireless network '%s'..."
 msgstr "Čekám na klíč bezdrátové sítě '%s' ..."
 
-#: ../src/applet.c:936 ../src/applet.c:946
+#: ../gnome/applet/applet.c:932 ../gnome/applet/applet.c:942
 msgid "Requesting a network address from the wired network..."
 msgstr "Žádám síťovou adresu od drátové sítě..."
 
-#: ../src/applet.c:938 ../src/applet.c:948
+#: ../gnome/applet/applet.c:934 ../gnome/applet/applet.c:944
 #, c-format
 msgid "Requesting a network address from the wireless network '%s'..."
 msgstr "Žádám síťovou adresu od bezdrátové sítě '%s'..."
 
-#: ../src/applet.c:956
+#: ../gnome/applet/applet.c:952
 msgid "Finishing connection to the wired network..."
 msgstr "Dokončuji připojení k drátové síti..."
 
-#: ../src/applet.c:958
+#: ../gnome/applet/applet.c:954
 #, c-format
 msgid "Finishing connection to the wireless network '%s'..."
 msgstr "Dokončuji připojení k bezdrátové síti '%s' ..."
 
-#: ../src/applet.c:1075
+#: ../gnome/applet/applet.c:1071
 msgid "NetworkManager is not running"
 msgstr "NetworkManager neběží"
 
-#: ../src/applet.c:1083 ../src/applet.c:1828
+#: ../gnome/applet/applet.c:1079 ../gnome/applet/applet.c:1824
 msgid "Networking disabled"
 msgstr "Síť zakázána"
 
-#: ../src/applet.c:1088
+#: ../gnome/applet/applet.c:1084
 msgid "No network connection"
 msgstr "Žádné připojení k síti"
 
-#: ../src/applet.c:1093
+#: ../gnome/applet/applet.c:1089
 msgid "Wired network connection"
 msgstr "Drátové připojení k síti"
 
-#: ../src/applet.c:1097
+#: ../gnome/applet/applet.c:1093
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Připojen k ad-hoc bezdrátové síti"
 
-#: ../src/applet.c:1099
+#: ../gnome/applet/applet.c:1095
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "Bezdrátové připojení k '%s' (%d%%)"
 
-#: ../src/applet.c:1120
+#: ../gnome/applet/applet.c:1116
 #, c-format
 msgid "VPN connection to '%s'"
 msgstr "Připojení k VPN '%s'"
 
-#: ../src/applet.c:1128
+#: ../gnome/applet/applet.c:1124
 #, c-format
 msgid "VPN connecting to '%s'"
 msgstr "Připojuji se k VPN '%s'"
 
-#: ../src/applet.c:1541
+#: ../gnome/applet/applet.c:1537
 msgid "_Connect to Other Wireless Network..."
 msgstr "_Připojit se k jiné bezdrátové síti..."
 
-#: ../src/applet.c:1562
+#: ../gnome/applet/applet.c:1558
 msgid "Create _New Wireless Network..."
 msgstr "Vytvořit _novou bezdrátovou síť..."
 
-#: ../src/applet.c:1685
+#: ../gnome/applet/applet.c:1681
 msgid "_VPN Connections"
 msgstr "Připojení k _VPN"
 
-#: ../src/applet.c:1730
+#: ../gnome/applet/applet.c:1726
 msgid "_Configure VPN..."
 msgstr "_Nastavit VPN..."
 
-#: ../src/applet.c:1734
+#: ../gnome/applet/applet.c:1730
 msgid "_Disconnect VPN..."
 msgstr "_Odpojit VPN..."
 
-#: ../src/applet.c:1756
+#: ../gnome/applet/applet.c:1752
 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
-#: ../src/applet.c:1767
+#: ../gnome/applet/applet.c:1763
 #, c-format
 msgid "Connect to %s..."
 msgstr "Připojit se k %s..."
 
-#: ../src/applet.c:1773
+#: ../gnome/applet/applet.c:1769
 #, c-format
 msgid "Disconnect from %s..."
 msgstr "Odpojit se od %s..."
 
-#: ../src/applet.c:1822
+#: ../gnome/applet/applet.c:1818
 msgid "No network devices have been found"
 msgstr "Nebylo nalezeno žádné síťové zařízení"
 
-#: ../src/applet.c:2014
+#: ../gnome/applet/applet.c:2010
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager neběží..."
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2170
+#: ../gnome/applet/applet.c:2166
 msgid "Enable _Networking"
 msgstr "Povolit _síť"
 
 #. 'Enable Wireless' item
-#: ../src/applet.c:2176
+#: ../gnome/applet/applet.c:2172
 msgid "Enable _Wireless"
 msgstr "Povolit _bezdrátové"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2182
+#: ../gnome/applet/applet.c:2178
 msgid "Connection _Information"
 msgstr "_Informace o spojení"
 
 #. Help item
-#: ../src/applet.c:2193
+#: ../gnome/applet/applet.c:2189
 msgid "_Help"
 msgstr "_Nápověda"
 
 #. About item
-#: ../src/applet.c:2202
+#: ../gnome/applet/applet.c:2198
 msgid "_About"
 msgstr "O _aplikaci"
 
-#: ../src/applet.c:2667
+#: ../gnome/applet/applet.c:2666
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
@@ -298,94 +309,94 @@ msgstr ""
 "Aplet NetworkManager nemohl najít některé vyžadované zdroje. Nemůže "
 "pokračovat.\n"
 
-#: ../src/wireless-security-option.c:157
+#: ../gnome/applet/wireless-security-option.c:157
 msgid "Open System"
 msgstr "Otevřený systém"
 
-#: ../src/wireless-security-option.c:160
+#: ../gnome/applet/wireless-security-option.c:160
 msgid "Shared Key"
 msgstr "Sdílený klíč"
 
-#: ../src/wireless-security-option.c:208
+#: ../gnome/applet/wireless-security-option.c:208
 msgid "Automatic (Default)"
 msgstr "Automatické (implicitní)"
 
-#: ../src/wireless-security-option.c:215
+#: ../gnome/applet/wireless-security-option.c:215
 msgid "AES-CCMP"
 msgstr "AES-CCMP"
 
-#: ../src/wireless-security-option.c:223
+#: ../gnome/applet/wireless-security-option.c:223
 msgid "TKIP"
 msgstr "TKIP"
 
-#: ../src/wireless-security-option.c:231
+#: ../gnome/applet/wireless-security-option.c:231
 msgid "Dynamic WEP"
 msgstr "Dynamické WEP"
 
-#: ../src/wso-none.c:53
+#: ../gnome/applet/wso-none.c:53
 msgid "None"
 msgstr "Žádné"
 
-#: ../src/wso-wep-ascii.c:138
+#: ../gnome/applet/wso-wep-ascii.c:138
 msgid "WEP 64/128-bit ASCII"
 msgstr "WEP 64/128 bitů v ASCII"
 
-#: ../src/wso-wep-hex.c:135
+#: ../gnome/applet/wso-wep-hex.c:135
 msgid "WEP 64/128-bit Hex"
 msgstr "WEP 64/128 bitů šestnáctkově"
 
-#: ../src/wso-wep-passphrase.c:135
+#: ../gnome/applet/wso-wep-passphrase.c:135
 msgid "WEP 128-bit Passphrase"
 msgstr "Heslo WEP 128 bitů"
 
-#: ../src/wso-wpa-eap.c:237
+#: ../gnome/applet/wso-wpa-eap.c:237
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../src/wso-wpa-eap.c:238
+#: ../gnome/applet/wso-wpa-eap.c:238
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wso-wpa-eap.c:239
+#: ../gnome/applet/wso-wpa-eap.c:239
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../src/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
-#: ../src/nm-ap-security-wpa-eap.c:116
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:93
+#: ../src/nm-ap-security-wpa-eap.c:117
 msgid "WPA2 Enterprise"
 msgstr "WPA2 Enterprise"
 
-#: ../src/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
-#: ../src/nm-ap-security-wpa-eap.c:121
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:95
+#: ../src/nm-ap-security-wpa-eap.c:122
 msgid "WPA Enterprise"
 msgstr "WPA Enterprise"
 
-#: ../src/wso-wpa-psk.c:178
+#: ../gnome/applet/wso-wpa-psk.c:178
 msgid "WPA2 Personal"
 msgstr "WPA2 Personal"
 
-#: ../src/wso-wpa-psk.c:180
+#: ../gnome/applet/wso-wpa-psk.c:180
 msgid "WPA Personal"
 msgstr "WPA Personal"
 
-#: ../src/eggtrayicon.c:134
+#: ../gnome/applet/eggtrayicon.c:134
 msgid "Orientation"
 msgstr "Orientace"
 
-#: ../src/eggtrayicon.c:135
+#: ../gnome/applet/eggtrayicon.c:135
 msgid "The orientation of the tray."
 msgstr "Orientace oznamovací oblasti."
 
-#: ../src/menu-items.c:88
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Drátová síť (%s)"
 
-#: ../src/menu-items.c:91
+#: ../gnome/applet/menu-items.c:91
 msgid "_Wired Network"
 msgstr "_Drátová síť"
 
-#: ../src/menu-items.c:162
+#: ../gnome/applet/menu-items.c:162
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
@@ -393,18 +404,18 @@ msgstr[0] "Bezdrátová síť (%s)"
 msgstr[1] "Bezdrátové sítě (%s)"
 msgstr[2] "Bezdrátové sítě (%s)"
 
-#: ../src/menu-items.c:164
+#: ../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ě"
 
-#: ../src/menu-items.c:343
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr " (neplatné Unicode)"
 
-#: ../src/other-network-dialog.c:352
+#: ../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, "
@@ -413,11 +424,11 @@ msgstr ""
 "Implicitně je název bezdrátové sítě nastaven na název vašeho počítače, %s, "
 "bez povoleného šifrování"
 
-#: ../src/other-network-dialog.c:358
+#: ../gnome/applet/other-network-dialog.c:358
 msgid "Create new wireless network"
 msgstr "Vytvořit novou bezdrátovou síť"
 
-#: ../src/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."
@@ -425,27 +436,27 @@ msgstr ""
 "Zadejte název a nastavení zabezpečení bezdrátové sítě, kterou chcete "
 "vytvořit."
 
-#: ../src/other-network-dialog.c:363
+#: ../gnome/applet/other-network-dialog.c:363
 msgid "Create New Wireless Network"
 msgstr "Vytvořit novou bezdrátovou síť"
 
-#: ../src/other-network-dialog.c:368
+#: ../gnome/applet/other-network-dialog.c:368
 msgid "Existing wireless network"
 msgstr "Existující bezdrátová síť"
 
-#: ../src/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 "Zadejte název bezdrátové sítě, ke které se chcete připojit."
 
-#: ../src/other-network-dialog.c:371
+#: ../gnome/applet/other-network-dialog.c:371
 msgid "Connect to Other Wireless Network"
 msgstr "Připojit se k jiné bezdrátové síti"
 
-#: ../src/passphrase-dialog.c:215
+#: ../gnome/applet/passphrase-dialog.c:215
 msgid "Error connecting to wireless network"
 msgstr "Chyba při připojování k bezdrátové síti"
 
-#: ../src/passphrase-dialog.c:216
+#: ../gnome/applet/passphrase-dialog.c:216
 msgid ""
 "The requested wireless network requires security capabilities unsupported by "
 "your hardware."
@@ -453,13 +464,13 @@ msgstr ""
 "Požadovaná bezdrátová síť vyžaduje možnosti zabezpečení nepodporované vaším "
 "hardware."
 
-#: ../src/vpn-password-dialog.c:151
-#: ../src/vpn-password-dialog.c:188
+#: ../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'"
 
-#: ../src/vpn-password-dialog.c:154
+#: ../gnome/applet/vpn-password-dialog.c:154
 #, c-format
 msgid ""
 "Could not find the authentication dialog for VPN connection type '%s'. "
@@ -468,7 +479,7 @@ msgstr ""
 "Nemohu najít autentizační dialog pro typ připojení k VPN '%s'. Kontaktujte "
 "vašeho správce systému."
 
-#: ../src/vpn-password-dialog.c:191
+#: ../gnome/applet/vpn-password-dialog.c:191
 #, c-format
 msgid ""
 "There was a problem launching the authentication dialog for VPN connection "
@@ -477,17 +488,15 @@ msgstr ""
 "Při spouštění autentizačního dialogu pro typ připojení k VPN '%s' se vyskytl "
 "problém. Kontaktujte vašeho správce systému."
 
-#: ../src/applet.glade.h:1
+#: ../gnome/applet/applet.glade.h:1
 msgid " "
 msgstr " "
 
-#: ../src/applet.glade.h:2
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Informace o aktivním spojení</span>"
+#: ../gnome/applet/applet.glade.h:2
+msgid "<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Informace o aktivním spojení</span>"
 
-#: ../src/applet.glade.h:4
+#: ../gnome/applet/applet.glade.h:4
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
@@ -500,7 +509,7 @@ msgstr ""
 "\n"
 "Pro přístup k bezdrátové síti '%s' je vyžadováno heslo nebo šifrovací klíč."
 
-#: ../src/applet.glade.h:8
+#: ../gnome/applet/applet.glade.h:8
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
@@ -511,7 +520,7 @@ msgstr ""
 "\n"
 "%s  Nebude úplně fungovat."
 
-#: ../src/applet.glade.h:12
+#: ../gnome/applet/applet.glade.h:12
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
@@ -528,75 +537,79 @@ msgstr ""
 "je tato bezdrátová síť bezpečná, klikněte na zaškrtávací pole níže a "
 "NetworkManager nebude při dalších přihlašováních žádat o potvrzení."
 
-#: ../src/applet.glade.h:15
+#: ../gnome/applet/applet.glade.h:15
 msgid "Anonymous Identity:"
 msgstr "Anonymní identita:"
 
-#: ../src/applet.glade.h:16
+#: ../gnome/applet/applet.glade.h:16
 msgid "Authentication:"
 msgstr "Autentizace:"
 
-#: ../src/applet.glade.h:17
+#: ../gnome/applet/applet.glade.h:17
 msgid "Broadcast Address:"
 msgstr "Adresa broadcastu:"
 
-#: ../src/applet.glade.h:18
+#: ../gnome/applet/applet.glade.h:18
 msgid "CA Certificate File:"
 msgstr "Soubor certifikátu CA:"
 
-#: ../src/applet.glade.h:19
+#: ../gnome/applet/applet.glade.h:19
 msgid "C_onnect"
 msgstr "_Připojit"
 
-#: ../src/applet.glade.h:20
+#: ../gnome/applet/applet.glade.h:20
 msgid "Client Certificate File:"
 msgstr "Soubor certifikátu klienta:"
 
-#: ../src/applet.glade.h:21
+#: ../gnome/applet/applet.glade.h:21
 msgid "Connection Information"
 msgstr "Informace o spojení"
 
-#: ../src/applet.glade.h:22
+#: ../gnome/applet/applet.glade.h:22
 msgid "Default Route:"
 msgstr "Implicitní cesta:"
 
-#: ../src/applet.glade.h:23
+#: ../gnome/applet/applet.glade.h:23
 msgid "Destination Address:"
 msgstr "Adresa cíle:"
 
-#: ../src/applet.glade.h:24
+#: ../gnome/applet/applet.glade.h:24
 msgid "Driver:"
 msgstr "Ovladač:"
 
-#: ../src/applet.glade.h:25
+#: ../gnome/applet/applet.glade.h:25
 msgid "EAP Method:"
 msgstr "Metoda EAP:"
 
-#: ../src/applet.glade.h:26
+#: ../gnome/applet/applet.glade.h:26
 msgid "Hardware Address:"
 msgstr "Hardwarová adresa:"
 
-#: ../src/applet.glade.h:27
+#: ../gnome/applet/applet.glade.h:27
 msgid "IP Address:"
 msgstr "IP adresa:"
 
-#: ../src/applet.glade.h:28
+#: ../gnome/applet/applet.glade.h:28
 msgid "Identity:"
 msgstr "Identita:"
 
-#: ../src/applet.glade.h:29
+#: ../gnome/applet/applet.glade.h:29
 msgid "Interface:"
 msgstr "Rozhraní:"
 
-#: ../src/applet.glade.h:30
+#: ../gnome/applet/applet.glade.h:30
 msgid "Key Type:"
 msgstr "Typ klíče:"
 
-#: ../src/applet.glade.h:31
+#: ../gnome/applet/applet.glade.h:31
+msgid "Key management:"
+msgstr "Správa klíčů"
+
+#: ../gnome/applet/applet.glade.h:32
 msgid "Key:"
 msgstr "Klíč:"
 
-#: ../src/applet.glade.h:32
+#: ../gnome/applet/applet.glade.h:33
 msgid ""
 "None\n"
 "WEP 128-bit Passphrase\n"
@@ -608,7 +621,7 @@ msgstr ""
 "WEP 64/128 bitů šestnáctkově\n"
 "WEP 64/128 bitů v ASCII\n"
 
-#: ../src/applet.glade.h:37
+#: ../gnome/applet/applet.glade.h:38
 msgid ""
 "Open System\n"
 "Shared Key"
@@ -616,103 +629,107 @@ msgstr ""
 "Otevřený systém\n"
 "Sdílený klíč"
 
-#: ../src/applet.glade.h:39
+#: ../gnome/applet/applet.glade.h:40
 msgid "Other Wireless Network..."
 msgstr "Jiná bezdrátová síť..."
 
-#: ../src/applet.glade.h:40
+#: ../gnome/applet/applet.glade.h:41
 msgid "Passphrase:"
 msgstr "Heslo:"
 
-#: ../src/applet.glade.h:41
+#: ../gnome/applet/applet.glade.h:42
 msgid "Password:"
 msgstr "Heslo:"
 
-#: ../src/applet.glade.h:42
+#: ../gnome/applet/applet.glade.h:43
 msgid "Primary DNS:"
 msgstr "Primární DNS:"
 
-#: ../src/applet.glade.h:43
+#: ../gnome/applet/applet.glade.h:44
 msgid "Private Key File:"
 msgstr "Soubor soukromého klíče:"
 
-#: ../src/applet.glade.h:44
+#: ../gnome/applet/applet.glade.h:45
 msgid "Private Key Password:"
 msgstr "Heslo soukromého klíče:"
 
-#: ../src/applet.glade.h:45
+#: ../gnome/applet/applet.glade.h:46
 msgid "Secondary DNS:"
 msgstr "Sekundární DNS:"
 
-#: ../src/applet.glade.h:46
+#: ../gnome/applet/applet.glade.h:47
 msgid "Select the CA Certificate File"
 msgstr "Zvolte soubor certifikátu CA"
 
-#: ../src/applet.glade.h:47
+#: ../gnome/applet/applet.glade.h:48
 msgid "Select the Client Certificate File"
 msgstr "Zvolte soubor certifikátu klienta"
 
-#: ../src/applet.glade.h:48
+#: ../gnome/applet/applet.glade.h:49
 msgid "Select the Private Key File"
 msgstr "Zvolte soubor soukromého klíče"
 
-#: ../src/applet.glade.h:49
+#: ../gnome/applet/applet.glade.h:50
 msgid "Show key"
 msgstr "Zobrazit klíč"
 
-#: ../src/applet.glade.h:50
+#: ../gnome/applet/applet.glade.h:51
 msgid "Show passphrase"
 msgstr "Zobrazit heslo"
 
-#: ../src/applet.glade.h:51
+#: ../gnome/applet/applet.glade.h:52
 msgid "Show password"
 msgstr "Zobrazit heslo"
 
-#: ../src/applet.glade.h:52
+#: ../gnome/applet/applet.glade.h:53
 msgid "Show passwords"
 msgstr "Zobrazit hesla"
 
-#: ../src/applet.glade.h:53
+#: ../gnome/applet/applet.glade.h:54
 msgid "Speed:"
 msgstr "Rychlost:"
 
-#: ../src/applet.glade.h:54
+#: ../gnome/applet/applet.glade.h:55
 msgid "Subnet Mask:"
 msgstr "Maska podsítě:"
 
-#: ../src/applet.glade.h:55
+#: ../gnome/applet/applet.glade.h:56
 msgid "Type:"
 msgstr "Typ:"
 
-#: ../src/applet.glade.h:56
+#: ../gnome/applet/applet.glade.h:57
 msgid "User Name:"
 msgstr "Jméno uživatele:"
 
-#: ../src/applet.glade.h:57
+#: ../gnome/applet/applet.glade.h:58
 msgid "Wireless Network Key Required"
 msgstr "Je vyžadován klíč bezdrátové sítě"
 
-#: ../src/applet.glade.h:58
+#: ../gnome/applet/applet.glade.h:59
 msgid "Wireless _adapter:"
 msgstr "Bezdrátový _adaptér:"
 
-#: ../src/applet.glade.h:59
+#: ../gnome/applet/applet.glade.h:60
 msgid "_Always Trust this Wireless Network"
 msgstr "_Vždy důvěřovat této bezdrátové síti"
 
-#: ../src/applet.glade.h:60
+#: ../gnome/applet/applet.glade.h:61
 msgid "_Don't remind me again"
 msgstr "_Už mě to nepřipomínat"
 
-#: ../src/applet.glade.h:61
+#: ../gnome/applet/applet.glade.h:62
+msgid "_Fallback on this Network"
+msgstr "Používat jako _záložní síť"
+
+#: ../gnome/applet/applet.glade.h:63
 msgid "_Login to Network"
 msgstr "_Přihlásit se k síti"
 
-#: ../src/applet.glade.h:62
+#: ../gnome/applet/applet.glade.h:64
 msgid "_Network Name:"
 msgstr "_Název sítě:"
 
-#: ../src/applet.glade.h:63
+#: ../gnome/applet/applet.glade.h:65
 msgid "_Wireless Security:"
 msgstr "_Bezdrátové zabezpečení:"
 
@@ -885,144 +902,65 @@ msgstr "WPA2 CCMP"
 msgid "WPA2 Automatic"
 msgstr "WPA2 automatické"
 
-#: ../src/nm-ap-security.c:320
+#: ../src/nm-ap-security.c:330
 msgid "none"
 msgstr "žádné"
 
-#: ../src/nm-netlink-monitor.c:154
+#: ../src/nm-netlink-monitor.c:170
 #, c-format
-msgid ""
-"unable to create netlink socket for monitoring wired ethernet devices - %s"
-msgstr ""
-"nemohu vytvořit socket netlink pro sledování drátových síťových zařízení - %s"
+msgid "unable to create netlink socket for monitoring wired ethernet devices - %s"
+msgstr "nemohu vytvořit socket netlink pro sledování drátových síťových zařízení - %s"
 
-#: ../src/nm-netlink-monitor.c:172
+#: ../src/nm-netlink-monitor.c:188
 #, c-format
-msgid ""
-"unable to bind to netlink socket for monitoring wired ethernet devices - %s"
+msgid "unable to bind to netlink socket for monitoring wired ethernet devices - %s"
 msgstr ""
 "nemohu se připojit k socketu netlink pro sledování drátových síťových "
 "zařízení - %s"
 
-#: ../src/nm-netlink-monitor.c:405
+#: ../src/nm-netlink-monitor.c:425
 msgid "operation took too long"
 msgstr "operace trvala příliš dlouho"
 
-#: ../src/nm-netlink-monitor.c:502
+#: ../src/nm-netlink-monitor.c:522
 msgid "received data from wrong type of sender"
 msgstr "přijata data od špatného typu odesílatele"
 
-#: ../src/nm-netlink-monitor.c:515
+#: ../src/nm-netlink-monitor.c:535
 msgid "received data from unexpected sender"
 msgstr "přijata data od neočekávaného odesílatele"
 
-#: ../src/nm-netlink-monitor.c:646
+#: ../src/nm-netlink-monitor.c:664
 msgid "too much data was sent over socket and some of it was lost"
 msgstr "po socketu bylo posláno příliš mnoho dat a některá byla ztracena"
 
-#: ../src/nm-netlink-monitor.c:735
+#: ../src/nm-netlink-monitor.c:774
 msgid "error occurred while waiting for data on socket"
 msgstr "při čekání na data ze socketu došlo k chybě"
 
-#: ../src/applet-dbus-devices.c:898
+#: ../gnome/applet/applet-dbus-devices.c:922
 #, 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'."
 
-#: ../src/applet-dbus-devices.c:903
+#: ../gnome/applet/applet-dbus-devices.c:927
 #, c-format
 msgid "You are now connected to the wireless network '%s'."
 msgstr "Jste právě připojeni k bezdrátové síti '%s'."
 
-#: ../src/applet-dbus-devices.c:910
+#: ../gnome/applet/applet-dbus-devices.c:934
 msgid "You are now connected to the wired network."
 msgstr "Jste právě připojeni ke drátové síti."
 
-#: ../src/applet-dbus-devices.c:916
+#: ../gnome/applet/applet-dbus-devices.c:940
 msgid "Connection Established"
 msgstr "Připojení navázáno"
 
-#: ../src/applet-dbus-devices.c:959
+#: ../gnome/applet/applet-dbus-devices.c:983
 msgid "Disconnected"
 msgstr "Odpojen"
 
-#: ../src/applet-dbus-devices.c:960
+#: ../gnome/applet/applet-dbus-devices.c:984
 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\""
-
-#~ msgid "VPN Error"
-#~ msgstr "Chyba VPN"
-
-#~ msgid "VPN connection '%s' said:"
-#~ msgstr "Připojení k VPN '%s' řeklo:"
-
-#~ msgid "Connected"
-#~ msgstr "Připojen"
-
-#~ msgid "Connected to a wired network interface."
-#~ msgstr "Připojen k drátové síti."
-
-#~ msgid "An ad-hoc wireless network connection has been established."
-#~ msgstr "Bylo vytvořeno ad-hoc bezdrátové připojení k síti."
-
-#~ msgid "A wireless network connection to '%s' has been established."
-#~ msgstr "Bylo vytvořeno ad-hoc bezdrátové připojení k síti '%s'."
-
-#~ msgid "ASCII Key:"
-#~ msgstr "Klíč v ASCII:"
-
-#~ 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 2b0204b7..019728ee 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-05-29 18:33+0200\n"
+"POT-Creation-Date: 2006-01-26 15:17+0100\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,59 +18,58 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../src/applet-compat.c:171 ../src/applet-dbus-info.c:919
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:934
 #, c-format
 msgid "Passphrase for wireless network %s"
 msgstr "Adgangskode til trådløst netværk %s"
 
-#: ../src/applet-dbus.c:265
+#: ../gnome/applet/applet-dbus.c:274
 #, c-format
 msgid "Connection to the wireless network '%s' failed."
 msgstr "Tilslutning til det trådløse netværk '%s' mislykkedes."
 
-#: ../src/applet-dbus.c:270
+#: ../gnome/applet/applet-dbus.c:279
 msgid "Connection to the wired network failed."
 msgstr "Tilslutning til det kablede netværk mislykkedes."
 
-#: ../src/applet.c:184
-#, fuzzy
-msgid "Error displaying connection information:"
+#: ../gnome/applet/applet.c:180
+msgid "Error displaying connection information: "
 msgstr "Fejl ved visning af forbindelses-information: "
 
-#: ../src/applet.c:202
+#: ../gnome/applet/applet.c:199
 msgid "Could not find some required resources (the glade file)!"
 msgstr "Kunne ikke finde nogle krævede ressourcer (glade-filen)!"
 
-#: ../src/applet.c:213
+#: ../gnome/applet/applet.c:210
 msgid "No active connections!"
 msgstr "Ingen aktive forbindelser!"
 
-#: ../src/applet.c:234
+#: ../gnome/applet/applet.c:225
 #, c-format
 msgid "Wired Ethernet (%s)"
 msgstr "Kablet Ethernet (%s)"
 
-#: ../src/applet.c:236
+#: ../gnome/applet/applet.c:227
 #, c-format
 msgid "Wireless Ethernet (%s)"
 msgstr "Trådløst Ethernet (%s)"
 
-#: ../src/applet.c:337 ../src/applet.c:362
+#: ../gnome/applet/applet.c:321 ../gnome/applet/applet.c:346
 msgid "NetworkManager Applet"
 msgstr "NetworkManager-panelprogram"
 
-#: ../src/applet.c:339 ../src/applet.c:364
+#: ../gnome/applet/applet.c:323 ../gnome/applet/applet.c:348
 msgid "Copyright © 2004-2005 Red Hat, Inc."
 msgstr "Copyright © 2004-2005 Red Hat, Inc."
 
-#: ../src/applet.c:340 ../src/applet.c:365
+#: ../gnome/applet/applet.c:324 ../gnome/applet/applet.c:349
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Statusfelt-panelprogram til håndtering af dine netværks-enheder og -"
 "forbindelser."
 
-#: ../src/applet.c:343 ../src/applet.c:370
+#: ../gnome/applet/applet.c:327 ../gnome/applet/applet.c:354
 msgid "translator-credits"
 msgstr ""
 "David Nielsen\n"
@@ -80,20 +79,24 @@ msgstr ""
 "Dansk-gruppen <dansk@dansk-gruppen.dk>\n"
 "Mere info: http://www.dansk-gruppen.dk"
 
-#: ../src/applet.c:426
+#: ../gnome/applet/applet.c:439
+msgid "VPN Error"
+msgstr "VPN fejl"
+
+#: ../gnome/applet/applet.c:443
 msgid "VPN Login Failure"
 msgstr "VPN logind-fejl"
 
-#: ../src/applet.c:427
+#: ../gnome/applet/applet.c:444
 #, 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."
 
-#: ../src/applet.c:431
+#: ../gnome/applet/applet.c:448
 msgid "VPN Start Failure"
 msgstr "VPN etablerings-fejl"
 
-#: ../src/applet.c:432
+#: ../gnome/applet/applet.c:449
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
@@ -102,26 +105,26 @@ msgstr ""
 "Kunne ikke etablere VPN-forbindelsen '%s' pågrund af fejl ved start af VPN-"
 "program."
 
-#: ../src/applet.c:436 ../src/applet.c:446
+#: ../gnome/applet/applet.c:453 ../gnome/applet/applet.c:463
 msgid "VPN Connect Failure"
 msgstr "VPN tilslutnings-fejl"
 
-#: ../src/applet.c:437
+#: ../gnome/applet/applet.c:454
 #, 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."
 
-#: ../src/applet.c:441
+#: ../gnome/applet/applet.c:458
 msgid "VPN Configuration Error"
 msgstr "VPN konfigurations-fejl"
 
-#: ../src/applet.c:442
+#: ../gnome/applet/applet.c:459
 #, c-format
 msgid "The VPN connection '%s' was not correctly configured."
 msgstr "VPN-forbindelsen '%s' er ikke konfigureret korrekt."
 
-#: ../src/applet.c:447
+#: ../gnome/applet/applet.c:464
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' because the VPN server did not "
@@ -130,13 +133,23 @@ msgstr ""
 "Kunne ikke etablere VPN-forbindelsen '%s' fordi VPN-serveren ikke "
 "returnerede en passende netværks-konfiguration."
 
-#: ../src/applet.c:517
+#: ../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
 msgid "VPN Login Message"
 msgstr "VPN logind-meddelelse"
 
-#: ../src/applet.c:741 ../src/applet.c:2508
-#: ../src/other-network-dialog.c:453
-#: ../src/passphrase-dialog.c:228
+#: ../gnome/applet/applet.c:760 ../gnome/applet/applet.c:2514
+#: ../gnome/applet/other-network-dialog.c:457
+#: ../gnome/applet/passphrase-dialog.c:209
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
@@ -144,163 +157,163 @@ msgstr ""
 "NetworkManager panelprogrammet kunne ikke finde nogle krævede ressourcer "
 "(glade-filen blev ikke fundet)."
 
-#: ../src/applet.c:753
+#: ../gnome/applet/applet.c:772
 #, 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."
 
-#: ../src/applet.c:761
+#: ../gnome/applet/applet.c:780
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
 msgstr "Netværks-enheden \"%s (%s)\" understøtter ikke link-detektering."
 
-#: ../src/applet.c:908
+#: ../gnome/applet/applet.c:928
 #, c-format
 msgid "Preparing device %s for the wired network..."
 msgstr "Klargører enheden %s til det kablede netværk..."
 
-#: ../src/applet.c:910
+#: ../gnome/applet/applet.c:930
 #, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
 msgstr "Klargører enheden %s til det trådløse netværk '%s'..."
 
-#: ../src/applet.c:918
+#: ../gnome/applet/applet.c:938
 #, c-format
 msgid "Configuring device %s for the wired network..."
 msgstr "Konfigurerer enheden %s til det kablede netværk..."
 
-#: ../src/applet.c:920
+#: ../gnome/applet/applet.c:940
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
 msgstr "Forsøger at tilslutte til det trådløse netværk '%s'..."
 
-#: ../src/applet.c:928
+#: ../gnome/applet/applet.c:948
 #, 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'..."
 
-#: ../src/applet.c:936 ../src/applet.c:946
+#: ../gnome/applet/applet.c:956 ../gnome/applet/applet.c:966
 msgid "Requesting a network address from the wired network..."
 msgstr "Forespørger en netværks-adresse fra det kablede netværk..."
 
-#: ../src/applet.c:938 ../src/applet.c:948
+#: ../gnome/applet/applet.c:958 ../gnome/applet/applet.c:968
 #, 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'..."
 
-#: ../src/applet.c:956
+#: ../gnome/applet/applet.c:976
 msgid "Finishing connection to the wired network..."
 msgstr "Færdiggører tilslutning til det kablede netværk..."
 
-#: ../src/applet.c:958
+#: ../gnome/applet/applet.c:978
 #, c-format
 msgid "Finishing connection to the wireless network '%s'..."
 msgstr "Færdiggører tilslutning til det trådløse netværk '%s'..."
 
-#: ../src/applet.c:1075
+#: ../gnome/applet/applet.c:1095
 msgid "NetworkManager is not running"
 msgstr "NetworkManager kører ikke"
 
-#: ../src/applet.c:1083 ../src/applet.c:1828
+#: ../gnome/applet/applet.c:1108 ../gnome/applet/applet.c:1842
 msgid "Networking disabled"
 msgstr "Netværks-understøttelse deaktiveret"
 
-#: ../src/applet.c:1088
+#: ../gnome/applet/applet.c:1113
 msgid "No network connection"
 msgstr "Ingen netværks-forbindelse"
 
-#: ../src/applet.c:1093
+#: ../gnome/applet/applet.c:1118
 msgid "Wired network connection"
 msgstr "Kablet netværks-forbindelse"
 
-#: ../src/applet.c:1097
+#: ../gnome/applet/applet.c:1122
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Tilsluttet til et trådløst ad hoc netværk"
 
-#: ../src/applet.c:1099
+#: ../gnome/applet/applet.c:1124
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "Trådløs netværks-forbindelse til '%s' (%d%%)"
 
-#: ../src/applet.c:1120
+#: ../gnome/applet/applet.c:1146
 #, c-format
 msgid "VPN connection to '%s'"
 msgstr "VPN-forbindelse til '%s'"
 
-#: ../src/applet.c:1128
+#: ../gnome/applet/applet.c:1154
 #, c-format
 msgid "VPN connecting to '%s'"
 msgstr "VPN tilslutter til '%s'"
 
-#: ../src/applet.c:1541
+#: ../gnome/applet/applet.c:1567
 msgid "_Connect to Other Wireless Network..."
 msgstr "_Tilslut til andet trådløst netværk..."
 
-#: ../src/applet.c:1562
+#: ../gnome/applet/applet.c:1588
 msgid "Create _New Wireless Network..."
 msgstr "Opret _nyt trådløst netværk..."
 
-#: ../src/applet.c:1685
+#: ../gnome/applet/applet.c:1709
 msgid "_VPN Connections"
 msgstr "_VPN-forbindelser"
 
-#: ../src/applet.c:1730
+#: ../gnome/applet/applet.c:1744
 msgid "_Configure VPN..."
 msgstr "_Konfigurér VPN..."
 
-#: ../src/applet.c:1734
+#: ../gnome/applet/applet.c:1748
 msgid "_Disconnect VPN..."
 msgstr "_Afbryd VPN..."
 
-#: ../src/applet.c:1756
+#: ../gnome/applet/applet.c:1770
 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
-#: ../src/applet.c:1767
+#: ../gnome/applet/applet.c:1781
 #, c-format
 msgid "Connect to %s..."
 msgstr "Tilslut til %s..."
 
-#: ../src/applet.c:1773
+#: ../gnome/applet/applet.c:1787
 #, c-format
 msgid "Disconnect from %s..."
 msgstr "Afbryd fra %s..."
 
-#: ../src/applet.c:1822
+#: ../gnome/applet/applet.c:1836
 msgid "No network devices have been found"
 msgstr "Ingen netværks-enheder blev fundet"
 
-#: ../src/applet.c:2014
+#: ../gnome/applet/applet.c:2028
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager kører ikke..."
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2170
+#: ../gnome/applet/applet.c:2184
 msgid "Enable _Networking"
 msgstr "Aktivér _netværks-understøttelse"
 
 #. 'Enable Wireless' item
-#: ../src/applet.c:2176
+#: ../gnome/applet/applet.c:2190
 msgid "Enable _Wireless"
 msgstr "Aktivér _trådløst netværk"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2182
+#: ../gnome/applet/applet.c:2196
 msgid "Connection _Information"
 msgstr "Forbindelses-_information"
 
 #. Help item
-#: ../src/applet.c:2193
+#: ../gnome/applet/applet.c:2207
 msgid "_Help"
 msgstr "_Hjælp"
 
 #. About item
-#: ../src/applet.c:2202
+#: ../gnome/applet/applet.c:2216
 msgid "_About"
 msgstr "_Om"
 
-#: ../src/applet.c:2667
+#: ../gnome/applet/applet.c:2633
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
@@ -308,116 +321,73 @@ msgstr ""
 "NetworkManager panelprogrammet kunne ikke finde nogle krævede ressourcer - "
 "kan ikke fortsætte.\n"
 
-#: ../src/wireless-security-option.c:157
+#: ../gnome/applet/wireless-security-option.c:158
 msgid "Open System"
 msgstr "Åbent system"
 
-#: ../src/wireless-security-option.c:160
+#: ../gnome/applet/wireless-security-option.c:161
 msgid "Shared Key"
 msgstr "Delt nøgle"
 
-#: ../src/wireless-security-option.c:208
-#, fuzzy
-msgid "Automatic (Default)"
+#: ../gnome/applet/wireless-security-option.c:212
+msgid "TKIP (Default)"
 msgstr "TKIP (forvalgt)"
 
-#: ../src/wireless-security-option.c:215
+#: ../gnome/applet/wireless-security-option.c:221
 msgid "AES-CCMP"
 msgstr "AES-CCMP"
 
-#: ../src/wireless-security-option.c:223
-#, fuzzy
-msgid "TKIP"
-msgstr "WPA TKIP"
-
-#: ../src/wireless-security-option.c:231
-msgid "Dynamic WEP"
-msgstr ""
-
-#: ../src/wso-none.c:53
+#: ../gnome/applet/wso-none.c:53
 msgid "None"
 msgstr "Ingen"
 
-#: ../src/wso-wep-ascii.c:138
-#, fuzzy
-msgid "WEP 64/128-bit ASCII"
+#: ../gnome/applet/wso-wep-ascii.c:128
+msgid "WEP 40/128-bit ASCII"
 msgstr "WEP 40/128-bit ASCII"
 
-#: ../src/wso-wep-hex.c:135
-#, fuzzy
-msgid "WEP 64/128-bit Hex"
+#: ../gnome/applet/wso-wep-hex.c:125
+msgid "WEP 40/128-bit hex"
 msgstr "WEP 40/128-bit hex"
 
-#: ../src/wso-wep-passphrase.c:135
-#, fuzzy
-msgid "WEP 128-bit Passphrase"
+#: ../gnome/applet/wso-wep-passphrase.c:125
+msgid "WEP Passphrase"
 msgstr "WEP-adgangskode:"
 
-#: ../src/wso-wpa-eap.c:237
-msgid "PEAP"
-msgstr ""
-
-#: ../src/wso-wpa-eap.c:238
-msgid "TLS"
-msgstr ""
-
-#: ../src/wso-wpa-eap.c:239
-msgid "TTLS"
-msgstr ""
-
-#: ../src/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 ""
-
-#: ../src/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 ""
-
-#: ../src/wso-wpa-psk.c:178
-msgid "WPA2 Personal"
-msgstr "Personlig WPA2"
-
-#: ../src/wso-wpa-psk.c:180
-msgid "WPA Personal"
-msgstr "Personlig WPA"
-
-#: ../src/eggtrayicon.c:134
+#: ../gnome/applet/eggtrayicon.c:128
 msgid "Orientation"
 msgstr "Retning"
 
-#: ../src/eggtrayicon.c:135
+#: ../gnome/applet/eggtrayicon.c:129
 msgid "The orientation of the tray."
 msgstr "Retningen på statusikonet."
 
-#: ../src/menu-items.c:88
+#: ../gnome/applet/menu-items.c:87
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Kablet netværk (%s)"
 
-#: ../src/menu-items.c:91
+#: ../gnome/applet/menu-items.c:90
 msgid "_Wired Network"
 msgstr "_Kablet netværk"
 
-#: ../src/menu-items.c:162
+#: ../gnome/applet/menu-items.c:161
 #, 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)"
 
-#: ../src/menu-items.c:164
+#: ../gnome/applet/menu-items.c:163
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Trådløst netværk"
 msgstr[1] "Trådløse netværk"
 
-#: ../src/menu-items.c:343
+#: ../gnome/applet/menu-items.c:330
 msgid " (invalid Unicode)"
 msgstr " (ugyldig Unicode)"
 
-#: ../src/other-network-dialog.c:352
+#: ../gnome/applet/other-network-dialog.c:354
 #, c-format
 msgid ""
 "By default, the wireless network's name is set to your computer's name, %s, "
@@ -426,11 +396,11 @@ msgstr ""
 "Som standard navngives det trådløse netværk til din maskines navn, %s, uden "
 "nogen kryptering slået til"
 
-#: ../src/other-network-dialog.c:358
+#: ../gnome/applet/other-network-dialog.c:360
 msgid "Create new wireless network"
 msgstr "Opret nyt trådløst netværk"
 
-#: ../src/other-network-dialog.c:359
+#: ../gnome/applet/other-network-dialog.c:361
 msgid ""
 "Enter the name and security settings of the wireless network you wish to "
 "create."
@@ -438,40 +408,29 @@ msgstr ""
 "Indtast navn- og sikkerhedsopsætning på det trådløse netværk du ønsker at "
 "oprette."
 
-#: ../src/other-network-dialog.c:363
+#: ../gnome/applet/other-network-dialog.c:365
 msgid "Create New Wireless Network"
 msgstr "Opret nyt trådløst netværk"
 
-#: ../src/other-network-dialog.c:368
+#: ../gnome/applet/other-network-dialog.c:370
 msgid "Existing wireless network"
 msgstr "Eksisterende trådløst netværk"
 
-#: ../src/other-network-dialog.c:369
+#: ../gnome/applet/other-network-dialog.c:371
 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."
 
-#: ../src/other-network-dialog.c:371
+#: ../gnome/applet/other-network-dialog.c:373
 msgid "Connect to Other Wireless Network"
 msgstr "Tilslut til andet trådløst netværk"
 
-#: ../src/passphrase-dialog.c:215
-#, fuzzy
-msgid "Error connecting to wireless network"
-msgstr "Eksisterende trådløst netværk"
-
-#: ../src/passphrase-dialog.c:216
-msgid ""
-"The requested wireless network requires security capabilities unsupported by "
-"your hardware."
-msgstr ""
-
-#: ../src/vpn-password-dialog.c:151
-#: ../src/vpn-password-dialog.c:188
+#: ../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 etablere VPN-forbindelsen '%s'"
 
-#: ../src/vpn-password-dialog.c:154
+#: ../gnome/applet/vpn-password-dialog.c:155
 #, c-format
 msgid ""
 "Could not find the authentication dialog for VPN connection type '%s'. "
@@ -480,7 +439,7 @@ msgstr ""
 "Kunne ikke finde godkendelses-vinduet til VPN-forbindelsestypen '%s'. "
 "Kontakt din system-administrator."
 
-#: ../src/vpn-password-dialog.c:191
+#: ../gnome/applet/vpn-password-dialog.c:192
 #, c-format
 msgid ""
 "There was a problem launching the authentication dialog for VPN connection "
@@ -489,17 +448,17 @@ msgstr ""
 "Der opstod en fejl ved start af godkendelses-vinduet til VPN-"
 "forbindelsestypen '%s'. Kontakt din system-administrator."
 
-#: ../src/applet.glade.h:1
+#: ../gnome/applet/applet.glade.h:1
 msgid " "
 msgstr " "
 
-#: ../src/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\">Information om aktiv forbindelse</span>"
 
-#: ../src/applet.glade.h:4
+#: ../gnome/applet/applet.glade.h:4
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
@@ -514,7 +473,7 @@ msgstr ""
 "En adgangskode eller krypteringsnøgle er påkrævet, for at opnå adgang til "
 "det trådløse netværk '%s'."
 
-#: ../src/applet.glade.h:8
+#: ../gnome/applet/applet.glade.h:8
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
@@ -526,7 +485,7 @@ msgstr ""
 "\n"
 "%s  Den vil ikke være fuldstændig funktionsdygtig."
 
-#: ../src/applet.glade.h:12
+#: ../gnome/applet/applet.glade.h:12
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
@@ -543,89 +502,59 @@ msgstr ""
 "dette trådløse netværk er sikkert, afkryds nedenstående afkrydsningsfelt og "
 "NetworkManager vil ikke spørge i fremtiden."
 
-#: ../src/applet.glade.h:15
-msgid "Anonymous Identity:"
-msgstr ""
-
-#: ../src/applet.glade.h:16
+#: ../gnome/applet/applet.glade.h:15
 msgid "Authentication:"
 msgstr "Godkendelse:"
 
-#: ../src/applet.glade.h:17
+#: ../gnome/applet/applet.glade.h:16
 msgid "Broadcast Address:"
 msgstr "Rundsendings-adresse:"
 
-#: ../src/applet.glade.h:18
-msgid "CA Certificate File:"
-msgstr ""
-
-#: ../src/applet.glade.h:19
+#: ../gnome/applet/applet.glade.h:17
 msgid "C_onnect"
 msgstr "T_ilslut"
 
-#: ../src/applet.glade.h:20
-msgid "Client Certificate File:"
-msgstr ""
-
-#: ../src/applet.glade.h:21
+#: ../gnome/applet/applet.glade.h:18
 msgid "Connection Information"
 msgstr "Forbindelses-information"
 
-#: ../src/applet.glade.h:22
+#: ../gnome/applet/applet.glade.h:19
 msgid "Default Route:"
 msgstr "Standard rute:"
 
-#: ../src/applet.glade.h:23
+#: ../gnome/applet/applet.glade.h:20
 msgid "Destination Address:"
 msgstr "Destinations-adresse:"
 
-#: ../src/applet.glade.h:24
-msgid "Driver:"
-msgstr ""
-
-#: ../src/applet.glade.h:25
-msgid "EAP Method:"
-msgstr ""
-
-#: ../src/applet.glade.h:26
+#: ../gnome/applet/applet.glade.h:21
 msgid "Hardware Address:"
 msgstr "Hardware-adresse:"
 
-#: ../src/applet.glade.h:27
+#: ../gnome/applet/applet.glade.h:22
 msgid "IP Address:"
 msgstr "IP-adresse:"
 
-#: ../src/applet.glade.h:28
-msgid "Identity:"
-msgstr ""
-
-#: ../src/applet.glade.h:29
+#: ../gnome/applet/applet.glade.h:23
 msgid "Interface:"
 msgstr "Enhed:"
 
-#: ../src/applet.glade.h:30
-#, fuzzy
-msgid "Key Type:"
-msgstr "Type:"
-
-#: ../src/applet.glade.h:31
+#: ../gnome/applet/applet.glade.h:24
 msgid "Key:"
 msgstr "Nøgle:"
 
-#: ../src/applet.glade.h:32
-#, fuzzy
+#: ../gnome/applet/applet.glade.h:25
 msgid ""
 "None\n"
-"WEP 128-bit Passphrase\n"
-"WEP 64/128-bit Hex\n"
-"WEP 64/128-bit ASCII\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"
 
-#: ../src/applet.glade.h:37
+#: ../gnome/applet/applet.glade.h:30
 msgid ""
 "Open System\n"
 "Shared Key"
@@ -633,114 +562,95 @@ msgstr ""
 "Åbent system\n"
 "Delt nøgle"
 
-#: ../src/applet.glade.h:39
+#: ../gnome/applet/applet.glade.h:32
 msgid "Other Wireless Network..."
 msgstr "Andet trådløst netværk..."
 
-#: ../src/applet.glade.h:40
+#: ../gnome/applet/applet.glade.h:33
 msgid "Passphrase:"
 msgstr "Adgangskode:"
 
-#: ../src/applet.glade.h:41
+#: ../gnome/applet/applet.glade.h:34
 msgid "Password:"
 msgstr "Adgangskode:"
 
-#: ../src/applet.glade.h:42
+#: ../gnome/applet/applet.glade.h:35
 msgid "Primary DNS:"
 msgstr "Primær DNS:"
 
-#: ../src/applet.glade.h:43
-msgid "Private Key File:"
-msgstr ""
-
-#: ../src/applet.glade.h:44
-msgid "Private Key Password:"
-msgstr ""
-
-#: ../src/applet.glade.h:45
+#: ../gnome/applet/applet.glade.h:36
 msgid "Secondary DNS:"
 msgstr "Sekundær DNS:"
 
-#: ../src/applet.glade.h:46
-msgid "Select the CA Certificate File"
-msgstr ""
-
-#: ../src/applet.glade.h:47
-msgid "Select the Client Certificate File"
-msgstr ""
-
-#: ../src/applet.glade.h:48
-msgid "Select the Private Key File"
-msgstr ""
-
-#: ../src/applet.glade.h:49
-msgid "Show key"
-msgstr ""
-
-#: ../src/applet.glade.h:50
-#, fuzzy
-msgid "Show passphrase"
-msgstr "Adgangskode:"
-
-#: ../src/applet.glade.h:51
-#, fuzzy
-msgid "Show password"
-msgstr "Adgangskode:"
-
-#: ../src/applet.glade.h:52
-#, fuzzy
-msgid "Show passwords"
-msgstr "Adgangskode:"
-
-#: ../src/applet.glade.h:53
-msgid "Speed:"
-msgstr ""
-
-#: ../src/applet.glade.h:54
+#: ../gnome/applet/applet.glade.h:37
 msgid "Subnet Mask:"
 msgstr "Undernet-maske:"
 
-#: ../src/applet.glade.h:55
+#: ../gnome/applet/applet.glade.h:38
 msgid "Type:"
 msgstr "Type:"
 
-#: ../src/applet.glade.h:56
+#: ../gnome/applet/applet.glade.h:39
 msgid "User Name:"
 msgstr "Brugernavn:"
 
-#: ../src/applet.glade.h:57
+#: ../gnome/applet/applet.glade.h:40
 msgid "Wireless Network Key Required"
 msgstr "Nøgle til trådløst netværk påkrævet"
 
-#: ../src/applet.glade.h:58
+#: ../gnome/applet/applet.glade.h:41
 msgid "Wireless _adapter:"
 msgstr "Trådløs _adapter:"
 
-#: ../src/applet.glade.h:59
+#: ../gnome/applet/applet.glade.h:42
 msgid "_Always Trust this Wireless Network"
 msgstr "_Stol altid på dette trådløse netværk"
 
-#: ../src/applet.glade.h:60
+#: ../gnome/applet/applet.glade.h:43
 msgid "_Don't remind me again"
 msgstr "_Påmind mig ikke igen"
 
-#: ../src/applet.glade.h:61
+#: ../gnome/applet/applet.glade.h:44
 msgid "_Login to Network"
 msgstr "_Log på netværk"
 
-#: ../src/applet.glade.h:62
+#: ../gnome/applet/applet.glade.h:45
 msgid "_Network Name:"
 msgstr "_Netværksnavn:"
 
-#: ../src/applet.glade.h:63
+#: ../gnome/applet/applet.glade.h:46
 msgid "_Wireless Security:"
 msgstr "Trådløs sikkerhed:"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:383
+#: ../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
 msgid "Cannot add VPN connection"
 msgstr "Kan ikke tilføje VPN-forbindelse"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:385
+#: ../gnome/vpn-properties/nm-vpn-properties.c:360
 msgid ""
 "No suitable VPN software was found on your system. Contact your system "
 "administrator."
@@ -748,11 +658,11 @@ msgstr ""
 "Ingen passende VPN-programmel blev fundet på dit system. Kontakt din system-"
 "administrator."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:437
+#: ../gnome/vpn-properties/nm-vpn-properties.c:412
 msgid "Cannot import VPN connection"
 msgstr "Kan ikke importere VPN-forbindelse"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:439
+#: ../gnome/vpn-properties/nm-vpn-properties.c:414
 #, c-format
 msgid ""
 "Cannot find suitable software for VPN connection type '%s' to import the "
@@ -761,12 +671,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:579
+#: ../gnome/vpn-properties/nm-vpn-properties.c:554
 #, c-format
 msgid "Error retrieving VPN connection '%s'"
 msgstr "Fejl ved hentning af VPN-forbindelsen '%s'"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:582
+#: ../gnome/vpn-properties/nm-vpn-properties.c:557
 #, c-format
 msgid ""
 "Could not find the UI files for VPN connection type '%s'. Contact your "
@@ -775,12 +685,12 @@ msgstr ""
 "Kunne ikke finde brugergrænseflade-filerne til VPN-forbindelsestypen '%s'. "
 "Kontakt din system-administrator."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:739
+#: ../gnome/vpn-properties/nm-vpn-properties.c:717
 #, c-format
 msgid "Delete VPN connection \"%s\"?"
 msgstr "Slet VPN-forbindelsen \"%s\"?"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:742
+#: ../gnome/vpn-properties/nm-vpn-properties.c:720
 #, c-format
 msgid ""
 "All information about the VPN connection \"%s\" will be lost and you may "
@@ -791,16 +701,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:959
+#: ../gnome/vpn-properties/nm-vpn-properties.c:926
 msgid "Unable to load"
 msgstr "Kan ikke indlæse"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:961
+#: ../gnome/vpn-properties/nm-vpn-properties.c:928
 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:1071
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1043
 msgid "Edit VPN Connection"
 msgstr "Redigér VPN-forbindelse"
 
@@ -875,11 +785,11 @@ msgstr ""
 msgid "VPN Connections"
 msgstr "VPN-forbindelser"
 
-#: ../src/nm-ap-security-wep.c:52
+#: ../src/nm-ap-security-wep.c:47
 msgid "40-bit WEP"
 msgstr "40-bit WEP"
 
-#: ../src/nm-ap-security-wep.c:54
+#: ../src/nm-ap-security-wep.c:49
 msgid "104-bit WEP"
 msgstr "104-bit WEP"
 
@@ -891,23 +801,15 @@ msgstr "WPA TKIP"
 msgid "WPA CCMP"
 msgstr "WPA CCMP"
 
-#: ../src/nm-ap-security-wpa-psk.c:54
-msgid "WPA Automatic"
-msgstr ""
-
-#: ../src/nm-ap-security-wpa-psk.c:59
+#: ../src/nm-ap-security-wpa-psk.c:57
 msgid "WPA2 TKIP"
 msgstr "WPA2 TKIP"
 
-#: ../src/nm-ap-security-wpa-psk.c:61
+#: ../src/nm-ap-security-wpa-psk.c:59
 msgid "WPA2 CCMP"
 msgstr "WPA2 CCMP"
 
-#: ../src/nm-ap-security-wpa-psk.c:63
-msgid "WPA2 Automatic"
-msgstr ""
-
-#: ../src/nm-ap-security.c:320
+#: ../src/nm-ap-security.c:310
 msgid "none"
 msgstr "ingen"
 
@@ -946,78 +848,3 @@ 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"
-
-#: ../src/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"
-
-#: ../src/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'..."
-
-#: ../src/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..."
-
-#: ../src/applet-dbus-devices.c:916
-msgid "Connection Established"
-msgstr ""
-
-#: ../src/applet-dbus-devices.c:959
-#, fuzzy
-msgid "Disconnected"
-msgstr "_Afbryd VPN..."
-
-#: ../src/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 41753e16..5b465194 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3,94 +3,103 @@
 # This file is distributed under the same license as the NetworkManager package.
 # Hendrik Brandt <heb@gnome-de.org>, 2004, 2005.
 # Frank Arnold <frank@scirocco-5v-turbo.de>, 2005.
-# Frank Arnold <frank@scirocco-5v-turbo.de>, 2005.
-# 
+# Hendrik Richter <hendrikr@gnome.org>, 2006.
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-29 18:33+0200\n"
-"PO-Revision-Date: 2006-06-09 09:51\n"
-"Last-Translator: Novell Language <language@novell.com>\n"
-"Language-Team: Novell Language <language@novell.com>\n"
+"POT-Creation-Date: 2006-10-01 18:31+0200\n"
+"PO-Revision-Date: 2006-10-08 16:09+0200\n"
+"Last-Translator: Tobias Wolf <towolf@gmx.net>\n"
+"Language-Team: German <gnome-de@gnome.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"
 
-#: ../src/applet-compat.c:171 ../src/applet-dbus-info.c:919
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:926
 #, c-format
 msgid "Passphrase for wireless network %s"
-msgstr "Passwort für Funknetzwerk %s"
+msgstr "Passphrase für Funknetzwerk %s"
 
-#: ../src/applet-dbus.c:265
+#: ../gnome/applet/applet-dbus.c:265
 #, c-format
 msgid "Connection to the wireless network '%s' failed."
 msgstr "Die Verbindung mit Funknetzwerk »%s« ist fehlgeschlagen."
 
-#: ../src/applet-dbus.c:270
+#: ../gnome/applet/applet-dbus.c:270
 msgid "Connection to the wired network failed."
 msgstr "Die Verbindung mit dem Kabelnetzwerk ist fehlgeschlagen."
 
-#: ../src/applet.c:184
+#: ../gnome/applet/applet.c:184
 msgid "Error displaying connection information:"
-msgstr "Fehler beim Anzeigen der Verbindungsinformationen:"
+msgstr "Die Verbindungsinformationen konnten nicht angezeigt werden:"
 
-#: ../src/applet.c:202
+#: ../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)."
 
-#: ../src/applet.c:213
+#: ../gnome/applet/applet.c:213
 msgid "No active connections!"
 msgstr "Keine aktive Netzwerkverbindung"
 
-#: ../src/applet.c:234
+#: ../gnome/applet/applet.c:234
 #, c-format
 msgid "Wired Ethernet (%s)"
 msgstr "Kabel-Ethernet (%s)"
 
-#: ../src/applet.c:236
+#: ../gnome/applet/applet.c:236
 #, c-format
 msgid "Wireless Ethernet (%s)"
 msgstr "Funk-Ethernet (%s)"
 
-#: ../src/applet.c:337 ../src/applet.c:362
+#: ../gnome/applet/applet.c:332 ../gnome/applet/applet.c:358
 msgid "NetworkManager Applet"
 msgstr "Netzwerk-Manager-Applet"
 
-#: ../src/applet.c:339 ../src/applet.c:364
-msgid "Copyright © 2004-2005 Red Hat, Inc."
-msgstr "Copyright © 2004-2005 Red Hat, Inc."
+#: ../gnome/applet/applet.c:334
+msgid ""
+"Copyright © 2004-2006 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+msgstr "Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
 
-#: ../src/applet.c:340 ../src/applet.c:365
+#: ../gnome/applet/applet.c:336 ../gnome/applet/applet.c:362
 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."
 
-#: ../src/applet.c:343 ../src/applet.c:370
+#: ../gnome/applet/applet.c:339 ../gnome/applet/applet.c:366
 msgid "translator-credits"
 msgstr "Hendrik Brandt <heb@gnome-de.org>"
 
-#: ../src/applet.c:426
+#: ../gnome/applet/applet.c:360
+msgid ""
+"Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+msgstr "Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+
+#: ../gnome/applet/applet.c:422
 msgid "VPN Login Failure"
 msgstr "VPN-Anmeldefehler"
 
-#: ../src/applet.c:427
+#: ../gnome/applet/applet.c:423
 #, 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 "
 "werden."
 
-#: ../src/applet.c:431
+#: ../gnome/applet/applet.c:427
 msgid "VPN Start Failure"
 msgstr "VPN-Startfehler"
 
-#: ../src/applet.c:432
+#: ../gnome/applet/applet.c:428
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
@@ -99,27 +108,27 @@ msgstr ""
 "Die VPN-Verbindung »%s« konnte infolge eines Fehlers beim Starten des VPN-"
 "Programms nicht hergestellt werden."
 
-#: ../src/applet.c:436 ../src/applet.c:446
+#: ../gnome/applet/applet.c:432 ../gnome/applet/applet.c:442
 msgid "VPN Connect Failure"
 msgstr "VPN-Verbindungsfehler"
 
-#: ../src/applet.c:437
+#: ../gnome/applet/applet.c:433
 #, 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 "
 "gestartet werden"
 
-#: ../src/applet.c:441
+#: ../gnome/applet/applet.c:437
 msgid "VPN Configuration Error"
 msgstr "VPN-Konfigurationsfehler"
 
-#: ../src/applet.c:442
+#: ../gnome/applet/applet.c:438
 #, c-format
 msgid "The VPN connection '%s' was not correctly configured."
 msgstr "Die VPN-Verbindung »%s« wurde nicht richtig konfiguriert."
 
-#: ../src/applet.c:447
+#: ../gnome/applet/applet.c:443
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' because the VPN server did not "
@@ -128,13 +137,13 @@ msgstr ""
 "Die VPN-Verbindung »%s« konnte nicht hergestellt werden, da der VPN-Server "
 "keine geeignete Netzwerkkonfiguration lieferte."
 
-#: ../src/applet.c:517
+#: ../gnome/applet/applet.c:513
 msgid "VPN Login Message"
 msgstr "VPN-Anmeldemitteilung"
 
-#: ../src/applet.c:741 ../src/applet.c:2508
-#: ../src/other-network-dialog.c:453
-#: ../src/passphrase-dialog.c:228
+#: ../gnome/applet/applet.c:737 ../gnome/applet/applet.c:2507
+#: ../gnome/applet/other-network-dialog.c:458
+#: ../gnome/applet/passphrase-dialog.c:228
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
@@ -142,163 +151,163 @@ msgstr ""
 "Das Netzwerk-Manager-Applet konnte benötigte Ressourcen nicht finden (Die "
 "Glade-Datei wurde nicht gefunden)."
 
-#: ../src/applet.c:753
+#: ../gnome/applet/applet.c:749
 #, c-format
 msgid "The network device \"%s (%s)\" does not support wireless scanning."
 msgstr "Das Netzwerkgerät »%s (%s)« unterstützt keine Funknetzwerksuche."
 
-#: ../src/applet.c:761
+#: ../gnome/applet/applet.c:757
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
 msgstr "Das Netzwerkgerät »%s (%s)« unterstützt keine Link-Erkennung."
 
-#: ../src/applet.c:908
+#: ../gnome/applet/applet.c:904
 #, 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 …"
 
-#: ../src/applet.c:910
+#: ../gnome/applet/applet.c:906
 #, 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« …"
 
-#: ../src/applet.c:918
+#: ../gnome/applet/applet.c:914
 #, 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 …"
 
-#: ../src/applet.c:920
+#: ../gnome/applet/applet.c:916
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
-msgstr "Versuch, dem Funknetzwerk »%s« beizutreten..."
+msgstr "Versuch, dem Funknetzwerk »%s« beizutreten …"
 
-#: ../src/applet.c:928
+#: ../gnome/applet/applet.c:924
 #, 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« …"
 
-#: ../src/applet.c:936 ../src/applet.c:946
+#: ../gnome/applet/applet.c:932 ../gnome/applet/applet.c:942
 msgid "Requesting a network address from the wired network..."
-msgstr "Anfordern einer Netzwerkadresse vom Kabelnetzwerk..."
+msgstr "Anfordern einer Netzwerkadresse vom Kabelnetzwerk …"
 
-#: ../src/applet.c:938 ../src/applet.c:948
+#: ../gnome/applet/applet.c:934 ../gnome/applet/applet.c:944
 #, 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« …"
 
-#: ../src/applet.c:956
+#: ../gnome/applet/applet.c:952
 msgid "Finishing connection to the wired network..."
-msgstr "Fertigstellen der Verbindung mit dem Kabelnetzwerk..."
+msgstr "Fertigstellen der Verbindung mit dem Kabelnetzwerk …"
 
-#: ../src/applet.c:958
+#: ../gnome/applet/applet.c:954
 #, 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« …"
 
-#: ../src/applet.c:1075
+#: ../gnome/applet/applet.c:1071
 msgid "NetworkManager is not running"
-msgstr "Der Netzwerk-Manager ist nicht aktiv"
+msgstr "Der Netzwerk-Manager läuft zur Zeit nicht"
 
-#: ../src/applet.c:1083 ../src/applet.c:1828
+#: ../gnome/applet/applet.c:1079 ../gnome/applet/applet.c:1824
 msgid "Networking disabled"
 msgstr "Netzwerk deaktiviert"
 
-#: ../src/applet.c:1088
+#: ../gnome/applet/applet.c:1084
 msgid "No network connection"
 msgstr "Keine Netzwerkverbindung"
 
-#: ../src/applet.c:1093
+#: ../gnome/applet/applet.c:1089
 msgid "Wired network connection"
 msgstr "Kabelnetzwerkverbindung"
 
-#: ../src/applet.c:1097
+#: ../gnome/applet/applet.c:1093
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Verbunden mit einem Ad-Hoc-Funknetzwerk"
 
-#: ../src/applet.c:1099
+#: ../gnome/applet/applet.c:1095
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "Funknetzwerkverbindung mit »%s« (%d%%)"
 
-#: ../src/applet.c:1120
+#: ../gnome/applet/applet.c:1116
 #, c-format
 msgid "VPN connection to '%s'"
-msgstr "VPN-Verbindungen zu »%s«"
+msgstr "VPN-Verbindung zu »%s«"
 
-#: ../src/applet.c:1128
+#: ../gnome/applet/applet.c:1124
 #, c-format
 msgid "VPN connecting to '%s'"
 msgstr "VPN verbindet zu »%s«"
 
-#: ../src/applet.c:1541
+#: ../gnome/applet/applet.c:1537
 msgid "_Connect to Other Wireless Network..."
-msgstr "Mit einem anderen Funknetzwerk _verbinden..."
+msgstr "Mit einem anderen Funknetzwerk _verbinden …"
 
-#: ../src/applet.c:1562
+#: ../gnome/applet/applet.c:1558
 msgid "Create _New Wireless Network..."
-msgstr "_Neues Funknetzwerk erstellen..."
+msgstr "_Neues Funknetzwerk erstellen …"
 
-#: ../src/applet.c:1685
+#: ../gnome/applet/applet.c:1681
 msgid "_VPN Connections"
 msgstr "_VPN-Verbindungen"
 
-#: ../src/applet.c:1730
+#: ../gnome/applet/applet.c:1726
 msgid "_Configure VPN..."
-msgstr "VPN _konfigurieren..."
+msgstr "VPN _konfigurieren …"
 
-#: ../src/applet.c:1734
+#: ../gnome/applet/applet.c:1730
 msgid "_Disconnect VPN..."
-msgstr "VPN _trennen..."
+msgstr "VPN _trennen …"
 
-#: ../src/applet.c:1756
+#: ../gnome/applet/applet.c:1752
 msgid "_Dial Up Connections"
-msgstr "_Einwahlverbindung"
+msgstr "_Einwahlverbindungen"
 
 #. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
-#: ../src/applet.c:1767
+#: ../gnome/applet/applet.c:1763
 #, c-format
 msgid "Connect to %s..."
-msgstr "Verbinden mit %s..."
+msgstr "Verbinden mit %s …"
 
-#: ../src/applet.c:1773
+#: ../gnome/applet/applet.c:1769
 #, c-format
 msgid "Disconnect from %s..."
-msgstr "Trennen von %s..."
+msgstr "Trennen von %s …"
 
-#: ../src/applet.c:1822
+#: ../gnome/applet/applet.c:1818
 msgid "No network devices have been found"
 msgstr "Es wurden keine Netzwerkgeräte gefunden"
 
-#: ../src/applet.c:2014
+#: ../gnome/applet/applet.c:2010
 msgid "NetworkManager is not running..."
-msgstr "Der Netzwerk-Manager ist nicht aktiv..."
+msgstr "Der Netzwerk-Manager läuft zur Zeit nicht …"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2170
+#: ../gnome/applet/applet.c:2166
 msgid "Enable _Networking"
-msgstr "Netzwerk_aktivieren"
+msgstr "_Netzwerk aktivieren"
 
 #. 'Enable Wireless' item
-#: ../src/applet.c:2176
+#: ../gnome/applet/applet.c:2172
 msgid "Enable _Wireless"
-msgstr "Drahtloses Netzwerk _aktivieren"
+msgstr "_Funknetzwerk aktivieren"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2182
+#: ../gnome/applet/applet.c:2178
 msgid "Connection _Information"
 msgstr "Verbindungs_informationen"
 
 #. Help item
-#: ../src/applet.c:2193
+#: ../gnome/applet/applet.c:2189
 msgid "_Help"
 msgstr "_Hilfe"
 
 #. About item
-#: ../src/applet.c:2202
+#: ../gnome/applet/applet.c:2198
 msgid "_About"
 msgstr "_Info"
 
-#: ../src/applet.c:2667
+#: ../gnome/applet/applet.c:2666
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
@@ -306,168 +315,166 @@ msgstr ""
 "Das Netzwerk-Manager-Applet konnte benötigte Ressourcen nicht finden und "
 "kann deshalb nicht fortfahren.\n"
 
-#: ../src/wireless-security-option.c:157
+#: ../gnome/applet/wireless-security-option.c:157
 msgid "Open System"
 msgstr "Offenes System"
 
-#: ../src/wireless-security-option.c:160
+#: ../gnome/applet/wireless-security-option.c:160
 msgid "Shared Key"
-msgstr "Gemeinsam genutzter Schlüssel"
+msgstr "Gemeinsamer Schlüssel (PSK)"
 
-#: ../src/wireless-security-option.c:208
+#: ../gnome/applet/wireless-security-option.c:208
 msgid "Automatic (Default)"
-msgstr "Automatisch (Standard)"
+msgstr "Automatisch (Vorgabe)"
 
-#: ../src/wireless-security-option.c:215
+#: ../gnome/applet/wireless-security-option.c:215
 msgid "AES-CCMP"
 msgstr "AES-CCMP"
 
-#: ../src/wireless-security-option.c:223
+#: ../gnome/applet/wireless-security-option.c:223
 msgid "TKIP"
 msgstr "TKIP"
 
-#: ../src/wireless-security-option.c:231
+#: ../gnome/applet/wireless-security-option.c:231
 msgid "Dynamic WEP"
-msgstr "WEP dynamisch"
+msgstr "Dynamisches WEP"
 
-#: ../src/wso-none.c:53
+#: ../gnome/applet/wso-none.c:53
 msgid "None"
 msgstr "Keine"
 
-#: ../src/wso-wep-ascii.c:138
+#: ../gnome/applet/wso-wep-ascii.c:138
 msgid "WEP 64/128-bit ASCII"
-msgstr "WEP 64/128-Bit-ASCII"
+msgstr "WEP 64/128-bit ASCII"
 
-#: ../src/wso-wep-hex.c:135
+#: ../gnome/applet/wso-wep-hex.c:135
 msgid "WEP 64/128-bit Hex"
-msgstr "WEP 64/128-Bit-Hex"
+msgstr "WEP 64/128-bit Hex"
 
-#: ../src/wso-wep-passphrase.c:135
+#: ../gnome/applet/wso-wep-passphrase.c:135
 msgid "WEP 128-bit Passphrase"
-msgstr "WEP 128-Bit-Passwortsatz"
+msgstr "WEP 128-bit Passphrase"
 
-#: ../src/wso-wpa-eap.c:237
+#: ../gnome/applet/wso-wpa-eap.c:237
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../src/wso-wpa-eap.c:238
+#: ../gnome/applet/wso-wpa-eap.c:238
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wso-wpa-eap.c:239
+#: ../gnome/applet/wso-wpa-eap.c:239
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../src/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
-#: ../src/nm-ap-security-wpa-eap.c:116
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:93
+#: ../src/nm-ap-security-wpa-eap.c:117
 msgid "WPA2 Enterprise"
 msgstr "WPA2 Enterprise"
 
-#: ../src/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
-#: ../src/nm-ap-security-wpa-eap.c:121
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:95
+#: ../src/nm-ap-security-wpa-eap.c:122
 msgid "WPA Enterprise"
 msgstr "WPA Enterprise"
 
-#: ../src/wso-wpa-psk.c:178
+#: ../gnome/applet/wso-wpa-psk.c:178
 msgid "WPA2 Personal"
 msgstr "WPA2 Personal"
 
-#: ../src/wso-wpa-psk.c:180
+#: ../gnome/applet/wso-wpa-psk.c:180
 msgid "WPA Personal"
 msgstr "WPA Personal"
 
-#: ../src/eggtrayicon.c:134
+#: ../gnome/applet/eggtrayicon.c:134
 msgid "Orientation"
 msgstr "Ausrichtung"
 
-#: ../src/eggtrayicon.c:135
+#: ../gnome/applet/eggtrayicon.c:135
 msgid "The orientation of the tray."
 msgstr "Die Ausrichtung des Benachrichtigungsfeldes."
 
-#: ../src/menu-items.c:88
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Kabelnetzwerk (%s)"
 
-#: ../src/menu-items.c:91
+#: ../gnome/applet/menu-items.c:91
 msgid "_Wired Network"
 msgstr "_Kabelnetzwerk"
 
-#: ../src/menu-items.c:162
+#: ../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)"
 
-#: ../src/menu-items.c:164
+#: ../gnome/applet/menu-items.c:164
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Funknetzwerk"
 msgstr[1] "Funknetzwerke"
 
-#: ../src/menu-items.c:343
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr " (ungültiger Unicode)"
 
-#: ../src/other-network-dialog.c:352
+#: ../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 ""
-"Das drahtlose Netzwerk übernimmt standardmäßig den Namen Ihres Computers, %"
-"s, ohne Verschlüsselung "
+msgstr "Als Vorgabe wird der Name Ihres Rechners »%s« als Netzwerkname "
+"verwendet und keine Verschlüsselung eingerichtet."
 
-#: ../src/other-network-dialog.c:358
+#: ../gnome/applet/other-network-dialog.c:358
 msgid "Create new wireless network"
 msgstr "Ein neues Funknetzwerk erstellen"
 
-#: ../src/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 ""
-"Geben Sie Name und Sicherheitseinstellungen für das neue drahtlose Netzwerk "
-"ein."
+"Bitte geben Sie den Namen und die Sicherheitseinstellungen des zu "
+"erstellenden Funknetzwerks ein."
 
-#: ../src/other-network-dialog.c:363
+#: ../gnome/applet/other-network-dialog.c:363
 msgid "Create New Wireless Network"
 msgstr "Neues Funknetzwerk erstellen"
 
-#: ../src/other-network-dialog.c:368
+#: ../gnome/applet/other-network-dialog.c:368
 msgid "Existing wireless network"
-msgstr "Vorhandenes drahtloses Netzwerk"
+msgstr "Bestehendes Funknetzwerk"
 
-#: ../src/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 ""
-"Geben Sie den Namen des drahtlosen Netzwerks ein, mit dem Sie eine "
-"Verbindung herstellen möchten."
+"Bitte geben Sie den Namen des Funknetzwerks, mit dem Sie sich "
+"verbinden möchten, ein."
 
-#: ../src/other-network-dialog.c:371
+#: ../gnome/applet/other-network-dialog.c:371
 msgid "Connect to Other Wireless Network"
 msgstr "Mit einem anderen Funknetzwerk verbinden"
 
-#: ../src/passphrase-dialog.c:215
+#: ../gnome/applet/passphrase-dialog.c:215
 msgid "Error connecting to wireless network"
-msgstr "Fehler beim Verbinden mit drahtlosem Netzwerk"
+msgstr "Fehler beim Verbinden mit dem Funknetzwerk"
 
-#: ../src/passphrase-dialog.c:216
+#: ../gnome/applet/passphrase-dialog.c:216
 msgid ""
 "The requested wireless network requires security capabilities unsupported by "
 "your hardware."
-msgstr ""
-"Das angeforderte drahtlose Netzwerk setzt Sicherheitseinstellungen voraus, "
-"die von Ihrer Hardware nicht unterstützt werden."
+msgstr "Dieses Funknetzwerk erfordert Sicherheitsfunktionen, die ihre "
+"Hardware nicht unterstützt."
 
-#: ../src/vpn-password-dialog.c:151
-#: ../src/vpn-password-dialog.c:188
+#: ../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"
 
-#: ../src/vpn-password-dialog.c:154
+#: ../gnome/applet/vpn-password-dialog.c:154
 #, c-format
 msgid ""
 "Could not find the authentication dialog for VPN connection type '%s'. "
@@ -477,7 +484,7 @@ msgstr ""
 "gefunden werden. Bitte setzen Sie sich mit Ihrem Systemadministrator in "
 "Verbindung."
 
-#: ../src/vpn-password-dialog.c:191
+#: ../gnome/applet/vpn-password-dialog.c:191
 #, c-format
 msgid ""
 "There was a problem launching the authentication dialog for VPN connection "
@@ -487,18 +494,18 @@ msgstr ""
 "s« ist ein Problem aufgetreten. Bitte setzen Sie sich mit Ihrem "
 "Systemadministrator in Verbindung."
 
-#: ../src/applet.glade.h:1
+#: ../gnome/applet/applet.glade.h:1
 msgid " "
 msgstr " "
 
-#: ../src/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\">Informationen zur aktiven Verbindung</"
 "span>"
 
-#: ../src/applet.glade.h:4
+#: ../gnome/applet/applet.glade.h:4
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
@@ -510,10 +517,9 @@ msgstr ""
 "<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."
+"Für den Zugang zu dem Funknetzwerk »%s« wird ein Schlüssel oder eine Passphrase benötigt."
 
-#: ../src/applet.glade.h:8
+#: ../gnome/applet/applet.glade.h:8
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
@@ -523,9 +529,9 @@ msgstr ""
 "<span weight=\"bold\" size=\"larger\">Eingeschränkte Netzwerkfunktionalität</"
 "span>\n"
 "\n"
-"%s  Es wird nicht vollständig funktionstüchtig sein."
+"%s  Es könnte zu Fehlfunktionen kommen."
 
-#: ../src/applet.glade.h:12
+#: ../gnome/applet/applet.glade.h:12
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
@@ -535,249 +541,256 @@ 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\">Anmeldebestä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 "
+"angegebene Option auswählen und der Netzwerk-Manager wird ab sofort keine "
 "Bestätigung mehr für dieses Netzwerk verlangen."
 
-#: ../src/applet.glade.h:15
+#: ../gnome/applet/applet.glade.h:15
 msgid "Anonymous Identity:"
 msgstr "Anonyme Identität:"
 
-#: ../src/applet.glade.h:16
+#: ../gnome/applet/applet.glade.h:16
 msgid "Authentication:"
 msgstr "Authentifizierung:"
 
-#: ../src/applet.glade.h:17
+#: ../gnome/applet/applet.glade.h:17
 msgid "Broadcast Address:"
 msgstr "Broadcast-Adresse:"
 
-#: ../src/applet.glade.h:18
+#: ../gnome/applet/applet.glade.h:18
 msgid "CA Certificate File:"
-msgstr "CA-Zertifikatdatei:"
+msgstr "Datei mit CA-Zertifikat:"
 
-#: ../src/applet.glade.h:19
+#: ../gnome/applet/applet.glade.h:19
 msgid "C_onnect"
 msgstr "_Verbinden"
 
-#: ../src/applet.glade.h:20
+#: ../gnome/applet/applet.glade.h:20
 msgid "Client Certificate File:"
-msgstr "Client-Zertifikatdatei:"
+msgstr "Datei mit Client-Zertifikat:"
 
-#: ../src/applet.glade.h:21
+#: ../gnome/applet/applet.glade.h:21
 msgid "Connection Information"
 msgstr "Verbindungsinformationen"
 
-#: ../src/applet.glade.h:22
+#: ../gnome/applet/applet.glade.h:22
 msgid "Default Route:"
-msgstr "Standardroute:"
+msgstr "Vorgaberoute:"
 
-#: ../src/applet.glade.h:23
+#: ../gnome/applet/applet.glade.h:23
 msgid "Destination Address:"
 msgstr "Zieladresse:"
 
-#: ../src/applet.glade.h:24
+#: ../gnome/applet/applet.glade.h:24
 msgid "Driver:"
 msgstr "Treiber:"
 
-#: ../src/applet.glade.h:25
+#: ../gnome/applet/applet.glade.h:25
 msgid "EAP Method:"
 msgstr "EAP-Methode:"
 
-#: ../src/applet.glade.h:26
+#: ../gnome/applet/applet.glade.h:26
 msgid "Hardware Address:"
 msgstr "Hardware-Adresse:"
 
-#: ../src/applet.glade.h:27
+#: ../gnome/applet/applet.glade.h:27
 msgid "IP Address:"
 msgstr "IP-Adresse:"
 
-#: ../src/applet.glade.h:28
+#: ../gnome/applet/applet.glade.h:28
 msgid "Identity:"
 msgstr "Identität:"
 
-#: ../src/applet.glade.h:29
+#: ../gnome/applet/applet.glade.h:29
 msgid "Interface:"
 msgstr "Schnittstelle:"
 
-#: ../src/applet.glade.h:30
+#: ../gnome/applet/applet.glade.h:30
 msgid "Key Type:"
 msgstr "Schlüsseltyp:"
 
-#: ../src/applet.glade.h:31
+#: ../gnome/applet/applet.glade.h:31
+msgid "Key management:"
+msgstr "Schlüsselverwaltung:"
+
+#: ../gnome/applet/applet.glade.h:32
 msgid "Key:"
 msgstr "Schlüssel:"
 
-#: ../src/applet.glade.h:32
+#: ../gnome/applet/applet.glade.h:33
 msgid ""
 "None\n"
 "WEP 128-bit Passphrase\n"
 "WEP 64/128-bit Hex\n"
 "WEP 64/128-bit ASCII\n"
-msgstr ""
-"Keine\n"
-"WEP 128-Bit-Passwortsatz\n"
-"WEP 64/128-Bit-Hex\n"
-"WEP 64/128-Bit-ASCII\n"
+msgstr "Keine\n"
+"WEP 128-bit Passphrase\n"
+"WEP 64/128-bit Hex\n"
+"WEP 64/128-bit ASCII\n"
 
-#: ../src/applet.glade.h:37
+#: ../gnome/applet/applet.glade.h:38
 msgid ""
 "Open System\n"
 "Shared Key"
 msgstr ""
 "Offenes System\n"
-"Gemeinsam genutzter Schlüssel"
+"Gemeinsamer Schlüssel"
 
-#: ../src/applet.glade.h:39
+#: ../gnome/applet/applet.glade.h:40
 msgid "Other Wireless Network..."
-msgstr "Anderes Funknetzwerk..."
+msgstr "Anderes Funknetzwerk …"
 
-#: ../src/applet.glade.h:40
+#: ../gnome/applet/applet.glade.h:41
 msgid "Passphrase:"
-msgstr "Passwort:"
+msgstr "Passphrase:"
 
-#: ../src/applet.glade.h:41
+#: ../gnome/applet/applet.glade.h:42
 msgid "Password:"
 msgstr "Passwort:"
 
-#: ../src/applet.glade.h:42
+#: ../gnome/applet/applet.glade.h:43
 msgid "Primary DNS:"
-msgstr "Primär-DNS:"
+msgstr "Primäres DNS:"
 
-#: ../src/applet.glade.h:43
+#: ../gnome/applet/applet.glade.h:44
 msgid "Private Key File:"
-msgstr "Private Schlüsseldatei:"
+msgstr "Datei mit geheimem Schlüssel:"
 
-#: ../src/applet.glade.h:44
+#: ../gnome/applet/applet.glade.h:45
 msgid "Private Key Password:"
-msgstr "Privates Schlüsselpasswort:"
+msgstr "Passwort des geheimen Schlüssels:"
 
-#: ../src/applet.glade.h:45
+#: ../gnome/applet/applet.glade.h:46
 msgid "Secondary DNS:"
-msgstr "Sekundär-DNS:"
+msgstr "Sekundäres DNS:"
 
-#: ../src/applet.glade.h:46
+#: ../gnome/applet/applet.glade.h:47
 msgid "Select the CA Certificate File"
-msgstr "CA-Zertifikatdatei auswählen"
+msgstr "Die Datei mit dem CA-Zertifikat auswählen"
 
-#: ../src/applet.glade.h:47
+#: ../gnome/applet/applet.glade.h:48
 msgid "Select the Client Certificate File"
-msgstr "Client-Zertifikatdatei auswählen"
+msgstr "Die Datei mit dem Client-Zertifikat auswählen"
 
-#: ../src/applet.glade.h:48
+#: ../gnome/applet/applet.glade.h:49
 msgid "Select the Private Key File"
-msgstr "Private Schlüsseldatei auswählen"
+msgstr "Die Datei mit dem geheimen Schlüssel auswählen"
 
-#: ../src/applet.glade.h:49
+#: ../gnome/applet/applet.glade.h:50
 msgid "Show key"
 msgstr "Schlüssel anzeigen"
 
-#: ../src/applet.glade.h:50
+#: ../gnome/applet/applet.glade.h:51
 msgid "Show passphrase"
-msgstr "Passwortsatz anzeigen"
+msgstr "Passphrase anzeigen"
 
-#: ../src/applet.glade.h:51
+#: ../gnome/applet/applet.glade.h:52
 msgid "Show password"
 msgstr "Passwort anzeigen"
 
-#: ../src/applet.glade.h:52
+#: ../gnome/applet/applet.glade.h:53
 msgid "Show passwords"
 msgstr "Passwörter anzeigen"
 
-#: ../src/applet.glade.h:53
+#: ../gnome/applet/applet.glade.h:54
 msgid "Speed:"
 msgstr "Geschwindigkeit:"
 
-#: ../src/applet.glade.h:54
+#: ../gnome/applet/applet.glade.h:55
 msgid "Subnet Mask:"
 msgstr "Subnetz-Maske:"
 
-#: ../src/applet.glade.h:55
+#: ../gnome/applet/applet.glade.h:56
 msgid "Type:"
-msgstr "Typ:"
+msgstr "_Typ:"
 
-#: ../src/applet.glade.h:56
+#: ../gnome/applet/applet.glade.h:57
 msgid "User Name:"
 msgstr "Benutzername:"
 
-#: ../src/applet.glade.h:57
+#: ../gnome/applet/applet.glade.h:58
 msgid "Wireless Network Key Required"
 msgstr "Schlüssel für Funknetzwerk benötigt"
 
-#: ../src/applet.glade.h:58
+#: ../gnome/applet/applet.glade.h:59
 msgid "Wireless _adapter:"
 msgstr "Funknetzwerkk_arte:"
 
-#: ../src/applet.glade.h:59
+#: ../gnome/applet/applet.glade.h:60
 msgid "_Always Trust this Wireless Network"
 msgstr "_Diesem Funknetzwerk immer vertrauen"
 
-#: ../src/applet.glade.h:60
+#: ../gnome/applet/applet.glade.h:61
 msgid "_Don't remind me again"
 msgstr "Diesen _Hinweis nicht mehr anzeigen"
 
-#: ../src/applet.glade.h:61
+#: ../gnome/applet/applet.glade.h:62
+msgid "_Fallback on this Network"
+msgstr "Netzwerk ist _Ausweichlösung"
+
+#: ../gnome/applet/applet.glade.h:63
 msgid "_Login to Network"
 msgstr "_Am Netzwerk anmelden"
 
-#: ../src/applet.glade.h:62
+#: ../gnome/applet/applet.glade.h:64
 msgid "_Network Name:"
 msgstr "_Netzwerkname:"
 
-#: ../src/applet.glade.h:63
+#: ../gnome/applet/applet.glade.h:65
 msgid "_Wireless Security:"
-msgstr "_Sicherheit des drahtlosen Netzwerks:"
+msgstr "_Sicherheit des Funknetzwerks:"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:383
+#: ../gnome/vpn-properties/nm-vpn-properties.c:419
 msgid "Cannot add VPN connection"
-msgstr "VPN-Verbindung konnte nicht hinzugefügt werden"
+msgstr "Die VPN-Verbindung konnte nicht hinzugefügt werden"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:385
+#: ../gnome/vpn-properties/nm-vpn-properties.c:421
 msgid ""
 "No suitable VPN software was found on your system. Contact your system "
 "administrator."
 msgstr ""
-"Es wurde keine brauchbare VPN-Software gefunden. Bitte setzen Sie sich mit "
+"Die notwendige VPN-Software wurde nicht gefunden. Bitte setzen Sie sich mit "
 "Ihrem Systemadministrator in Verbindung."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:437
+#: ../gnome/vpn-properties/nm-vpn-properties.c:463
 msgid "Cannot import VPN connection"
-msgstr "VPN-Verbindung konnte nicht importiert werden"
+msgstr "Die VPN-Verbindung konnte nicht importiert werden"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:439
+#: ../gnome/vpn-properties/nm-vpn-properties.c:465
 #, 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 "
+"Die notwendige Software für VPN-Verbindungen vom Typ »%s« wurde beim "
+"Import der Datei »%s« nicht gefunden. Bitte setzen Sie sich mit Ihrem "
 "Systemadministrator in Verbindung."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:579
+#: ../gnome/vpn-properties/nm-vpn-properties.c:585
 #, c-format
 msgid "Error retrieving VPN connection '%s'"
 msgstr "Fehler beim Abrufen der VPN-Verbindung »%s«"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:582
+#: ../gnome/vpn-properties/nm-vpn-properties.c:588
 #, 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« "
-"wurden nicht gefunden.Bitte setzen Sie sich mit Ihrem Systemadministrator in "
+"wurden nicht gefunden. Bitte setzen Sie sich mit Ihrem Systemadministrator in "
 "Verbindung."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:739
+#: ../gnome/vpn-properties/nm-vpn-properties.c:732
 #, c-format
 msgid "Delete VPN connection \"%s\"?"
 msgstr "Möchten Sie die VPN-Verbindungen »%s« löschen?"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:742
+#: ../gnome/vpn-properties/nm-vpn-properties.c:735
 #, c-format
 msgid ""
 "All information about the VPN connection \"%s\" will be lost and you may "
@@ -788,97 +801,79 @@ msgstr ""
 "Sie werden Ihren Systemadministrator für das Bereitstellen der Informationen "
 "für eine neue Verbindung benötigen."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:959
+#: ../gnome/vpn-properties/nm-vpn-properties.c:908
 msgid "Unable to load"
 msgstr "Konnte nicht geladen werden"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:961
+#: ../gnome/vpn-properties/nm-vpn-properties.c:910
 msgid "Cannot find some needed resources (the glade file)!"
 msgstr ""
 "Einige benötigte Ressourcen wurden nicht gefunden (die Glade-Datei fehlt)."
 
+#. druid_window = GTK_DIALOG (gtk_dialog_new_with_buttons (_("Create VPN Connection"),
+#. NULL,
+#. GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+#. GTK_STOCK_CANCEL,
+#. GTK_RESPONSE_REJECT,
+#. GTK_STOCK_APPLY,
+#. GTK_RESPONSE_ACCEPT,
+#. NULL));
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1055
+msgid "Create VPN Connection"
+msgstr "Neue VPN-Verbindungen erstellen"
+
+#. gtk_container_add (GTK_CONTAINER (druid_window->vbox), GTK_WIDGET(gtk_label_new("Some label")));
+#. gtk_box_pack_start (GTK_BOX (druid_window->vbox), GTK_WIDGET(druid), TRUE,TRUE,0);
+#. gtk_box_pack_start (GTK_BOX (druid_window->vbox), GTK_WIDGET(gtk_label_new("Some label")), TRUE,TRUE,0);
+#. toplevel = gtk_widget_get_toplevel (GTK_WIDGET (druid));
+#. gtk_signal_connect (GTK_OBJECT (toplevel), "delete_event", GTK_SIGNAL_FUNC (vpn_window_close), NULL);
+#. make the druid window modal wrt. our main window
+#. gtk_window_set_modal (druid_window, TRUE);
+#. gtk_window_set_transient_for (GTK_WINDOW(druid_window), GTK_WINDOW (dialog));
 #. Edit dialog
-#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1073
 msgid "Edit VPN Connection"
-msgstr "VPN-Verbindungen bearbeiten"
+msgstr "Eine VPN-Verbindung hinzufügen"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:1
 msgid "Add a new VPN connection"
-msgstr "Neue VPN-Verbindungen hinzufügen"
+msgstr "Neue VPN-Verbindung erstellen"
 
 #: ../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."
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
-msgid "Connect to:"
-msgstr "Verbinden mit:"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
-msgid "Create VPN Connection"
-msgstr "Neue VPN-Verbindungen erstellen"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
-msgid "Create VPN Connection - 1 of 2"
-msgstr "Neue VPN-Verbindungen erstellen - 1 von 2"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
-msgid "Create VPN Connection - 2 of 2"
-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"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
 msgid "E_xport"
 msgstr "E_xportieren"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:9
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
 msgid "Edit the selected VPN connection"
 msgstr "Die ausgewählte VPN-Verbindung bearbeiten"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:10
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
 msgid "Export the VPN settings to a file"
-msgstr "Die VPN-Verbindungsdaten in eine Datei exportieren"
+msgstr "Die Verbindungseinstellungen des VPN in eine Datei exportieren"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:11
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
 msgid "Export the selected VPN connection to a file"
 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"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:13
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
 msgid "Manage Virtual Private Network Connections"
-msgstr "Verbindungen mit Virtuellen Private Netzwerke verwalten"
-
-#: ../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 ""
-"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."
+msgstr "Verbindungen mit Virtuellen Privaten Netzwerken verwalten"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:17
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
 msgid "VPN Connections"
 msgstr "VPN-Verbindungen"
 
 #: ../src/nm-ap-security-wep.c:52
 msgid "40-bit WEP"
-msgstr "40-Bit-WEP"
+msgstr "40-bit WEP"
 
 #: ../src/nm-ap-security-wep.c:54
 msgid "104-bit WEP"
-msgstr "104-Bit-WEP"
+msgstr "104-bit WEP"
 
 #: ../src/nm-ap-security-wpa-psk.c:50
 msgid "WPA TKIP"
@@ -904,11 +899,11 @@ msgstr "WPA2 CCMP"
 msgid "WPA2 Automatic"
 msgstr "WPA2 Automatisch"
 
-#: ../src/nm-ap-security.c:320
+#: ../src/nm-ap-security.c:338
 msgid "none"
 msgstr "Keine"
 
-#: ../src/nm-netlink-monitor.c:154
+#: ../src/nm-netlink-monitor.c:170
 #, c-format
 msgid ""
 "unable to create netlink socket for monitoring wired ethernet devices - %s"
@@ -916,59 +911,57 @@ msgstr ""
 "Erstellung eines Netlink-Socket zur Überwachung von Kabelnetzwerkgeräten "
 "fehlgeschlagen - %s"
 
-#: ../src/nm-netlink-monitor.c:172
+#: ../src/nm-netlink-monitor.c:188
 #, c-format
 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 den Netlink-Socket zur Überwachung von Kabelnetzwerkgeräten "
 "fehlgeschlagen - %s"
 
-#: ../src/nm-netlink-monitor.c:405
+#: ../src/nm-netlink-monitor.c:425
 msgid "operation took too long"
 msgstr "Vorgang dauerte zu lange"
 
-#: ../src/nm-netlink-monitor.c:502
+#: ../src/nm-netlink-monitor.c:522
 msgid "received data from wrong type of sender"
 msgstr "Daten von einem falschen Absendertyp erhalten"
 
-#: ../src/nm-netlink-monitor.c:515
+#: ../src/nm-netlink-monitor.c:535
 msgid "received data from unexpected sender"
 msgstr "Daten von einem unerwarteten Absender erhalten"
 
-#: ../src/nm-netlink-monitor.c:646
+#: ../src/nm-netlink-monitor.c:664
 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 einige davon sind "
 "verloren gegangen"
 
-#: ../src/nm-netlink-monitor.c:735
+#: ../src/nm-netlink-monitor.c:774
 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"
 
-#: ../src/applet-dbus-devices.c:898
-#, c-format
+#: ../gnome/applet/applet-dbus-devices.c:922
 msgid "You are now connected to the Ad-Hoc wireless network '%s'."
-msgstr "Sie sind nun mit dem drahtlosen Ad-hoc-Netzwerk '%s' verbunden."
+msgstr "Sie sind nun mit dem Ad-Hoc-Funknetzwerk »%s« verbunden."
 
-#: ../src/applet-dbus-devices.c:903
-#, c-format
+#: ../gnome/applet/applet-dbus-devices.c:927
 msgid "You are now connected to the wireless network '%s'."
-msgstr "Sie sind nun mit dem drahtlosen Netzwerk '%s' verbunden."
+msgstr "Sie sind nun mit dem Funknetzwerk »%s« verbunden."
 
-#: ../src/applet-dbus-devices.c:910
+#: ../gnome/applet/applet-dbus-devices.c:934
 msgid "You are now connected to the wired network."
-msgstr "Sie sind nun mit dem Kabelnetzwerk verbunden."
+msgstr "Sie sind nun über Kabel mit dem Netzwerk verbunden."
 
-#: ../src/applet-dbus-devices.c:916
+#: ../gnome/applet/applet-dbus-devices.c:940
 msgid "Connection Established"
 msgstr "Verbindung hergestellt"
 
-#: ../src/applet-dbus-devices.c:959
+#: ../gnome/applet/applet-dbus-devices.c:983
 msgid "Disconnected"
 msgstr "Verbindung getrennt"
 
-#: ../src/applet-dbus-devices.c:960
+#: ../gnome/applet/applet-dbus-devices.c:984
 msgid "The network connection has been disconnected."
 msgstr "Die Netzwerkverbindung wurde getrennt."
 
@@ -1033,19 +1026,31 @@ msgstr "Die Netzwerkverbindung wurde getrennt."
 #~ msgid "_Key type:"
 #~ msgstr "_Schlüsseltyp:"
 
-#~ msgid "Stop automatically running the networking applet?"
+#~ msgid "Choose which type of VPN connection you wish to create."
 #~ msgstr ""
-#~ "Soll künftig auf den automatischen Start des Miniprogramms bei der "
-#~ "Anmeldung verzichtet werden?"
+#~ "Bitte wählen Sie aus, welche Art VPN-Verbindung Sie erstellen möchten."
+
+#~ msgid "Connect to:"
+#~ msgstr "Verbinden mit:"
+
+#~ msgid "Create VPN Connection - 1 of 2"
+#~ msgstr "Neue VPN-Verbindungen erstellen - 1 von 2"
+
+#~ msgid "Create VPN Connection - 2 of 2"
+#~ msgstr "Neue VPN-Verbindungen erstellen - 2 von 2"
+
+#~ msgid "Finish Creating VPN Connection"
+#~ msgstr "Erstellen der VPN-Verbindung abschließen"
 
 #~ 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?"
+#~ "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 ""
-#~ "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"
+#~ "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."
diff --git a/po/dz.po b/po/dz.po
new file mode 100644
index 00000000..d50b8c01
--- /dev/null
+++ b/po/dz.po
@@ -0,0 +1,910 @@
+# SOME DESCRIPTIVE TITLE.
+# 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.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: networkmanager\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-10-30 04:46+0100\n"
+"PO-Revision-Date: 2006-10-31 04:11+0530\n"
+"Last-Translator: yangka <yanang_ka@hotmail.com>\n"
+"Language-Team: dzongkha <pgeyleg@dit.gov.bt>\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-Poedit-Language: dzongkha\n"
+"X-Poedit-Country: bhutan\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#: ../gnome/applet/applet-compat.c:171
+#: ../gnome/applet/applet-dbus-info.c:926
+#, c-format
+msgid "Passphrase for wireless network %s"
+msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་དོན་ལུ་ཆོག་ཚིག %s"
+
+#: ../gnome/applet/applet-dbus.c:274
+#, c-format
+msgid "Connection to the wireless network '%s' failed."
+msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་འདི་ལུ་མཐུད་ལམ་ '%s' འཐུས་ཤོར་འབྱུང་ཡོདཔ།"
+
+#: ../gnome/applet/applet-dbus.c:279
+msgid "Connection to the wired network failed."
+msgstr "བརྒྱུད་ཐག་ཅན་གྱི་ཡོངས་འབྲེལ་འདི་ལུ་མཐུད་ལམ་འཐུས་ཤོར་འབྱུང་ཡོདཔ།"
+
+#: ../gnome/applet/applet.c:186
+msgid "Error displaying connection information:"
+msgstr "མཐུད་ལམ་བརྡ་དོན་བཀྲམ་བཏོན་འཛོལ་བ:"
+
+#: ../gnome/applet/applet.c:204
+msgid "Could not find some required resources (the glade file)!"
+msgstr "དགོས་མཁོ་ཅན་གྱི་ཐོན་ཁུངས་ལ་ལོ་འཚོལ་མ་འཐོབ (གེལེཌི་ཡིག་སྣོད)!"
+
+#: ../gnome/applet/applet.c:215
+msgid "No active connections!"
+msgstr "ཤུགས་ལྡན་མཐུད་ལམ་ཚུ་མེདཔ!"
+
+#: ../gnome/applet/applet.c:233
+#, c-format
+msgid "%d Mb/s"
+msgstr "%d ཨེམ་བི/ཨེསི"
+
+#: ../gnome/applet/applet.c:236
+#, c-format
+msgid "Wired Ethernet (%s)"
+msgstr "བརྒྱུད་ཐག་ཅན་གྱི་ཨི་ཐར་ནེཊི (%s)"
+
+#: ../gnome/applet/applet.c:238
+#, c-format
+msgid "Wireless Ethernet (%s)"
+msgstr "རླུང་འཕྲིན་ཨི་ཐར་ནེཊི (%s)"
+
+#: ../gnome/applet/applet.c:244
+msgid "Unknown"
+msgstr "མ་ཤེསཔ།"
+
+#: ../gnome/applet/applet.c:334
+#: ../gnome/applet/applet.c:360
+msgid "NetworkManager Applet"
+msgstr "ཡོངས་འབྲེལ་འཛིན་སྐྱོང་པ་ཨེཔ་ལེཊི།"
+
+#: ../gnome/applet/applet.c:336
+msgid ""
+"Copyright © 2004-2006 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+msgstr ""
+"འདྲ་བཤུས་དབང་ཆ © 2004-2006 Red Hat, Inc.\n"
+"འདྲ་བཤུས་དབང་ཆ© 2005-2006 Novell, Inc."
+
+#: ../gnome/applet/applet.c:338
+#: ../gnome/applet/applet.c:364
+msgid "Notification area applet for managing your network devices and connections."
+msgstr "ཁྱོད་རའི་ཡོངས་འབྲེལ་ཐབས་འཕྲུལ་ཚུ་དང་མཐུད་ལམ་ཚུ་གི་དོན་ལུ་བརྡ་བསྐུལ་མངའ་ཁོངས་ཨེཔ་ལེཊི།"
+
+#: ../gnome/applet/applet.c:341
+#: ../gnome/applet/applet.c:368
+msgid "translator-credits"
+msgstr "སྐད་བསྒྱུར་པ་-ངོ་བསྟོད་ཚུ།"
+
+#: ../gnome/applet/applet.c:362
+msgid ""
+"Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+msgstr ""
+"འདྲ་བཤུས་དབང་ཆ © 2004-2005 Red Hat, Inc.\n"
+"འདྲ་བཤུས་དབང་ཆ © 2005-2006 Novell, Inc."
+
+#: ../gnome/applet/applet.c:424
+msgid "VPN Login Failure"
+msgstr "ཝི་པི་ཨེན་ནང་བསྐྱོད་འཐུས་ཤོར།"
+
+#: ../gnome/applet/applet.c:425
+#, c-format
+msgid "Could not start the VPN connection '%s' due to a login failure."
+msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་འདི་ '%s' ནང་བསྐྱོད་འཐུས་ཤོར་ཅིག་ལུ་ཆད་འདི་འགོ་བཙུགས་མ་ཚུགསཔ།"
+
+#: ../gnome/applet/applet.c:429
+msgid "VPN Start Failure"
+msgstr "ཝི་པི་ཨེན་འགོ་བཙུགས་འཐུས་ཤོར།"
+
+#: ../gnome/applet/applet.c:430
+#, c-format
+msgid "Could not start the VPN connection '%s' due to a failure launching the VPN program."
+msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་འདི་ '%s' ཝི་པི་ཨེན་ལས་རིམ་འདི་གསར་བཙུགས་འབད་ནི་འཐུས་ཤོར་ཅིག་ལུ་ཆད་འགོ་བཙུགས་མ་ཚུགསཔ།"
+
+#: ../gnome/applet/applet.c:434
+#: ../gnome/applet/applet.c:444
+msgid "VPN Connect Failure"
+msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་འཐུས་ཤོར།"
+
+#: ../gnome/applet/applet.c:435
+#, c-format
+msgid "Could not start the VPN connection '%s' due to a connection error."
+msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་འདི་ '%s' མཐུད་ལམ་འཛོལ་བ་ཅིག་ལུ་ཆད་འདི་འགོ་བཙུགས་མ་ཚུགསཔ།"
+
+#: ../gnome/applet/applet.c:439
+msgid "VPN Configuration Error"
+msgstr "ཝི་པི་ཨེན་རིམ་སྒྲིག་འཛོལ་བ།"
+
+#: ../gnome/applet/applet.c:440
+#, c-format
+msgid "The VPN connection '%s' was not correctly configured."
+msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་འདི་ '%s' ངེས་བདེན་སྦེ་རིམ་སྒྲིག་མ་འབད་བར་ཡོདཔ།"
+
+#: ../gnome/applet/applet.c:445
+#, c-format
+msgid "Could not start the VPN connection '%s' because the VPN server did not return an adequate network configuration."
+msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་འདི་ '%s' ཝི་པི་ཨེན་སར་བར་གྱིས་ཡོངས་འབྲེལ་རིམ་སྒྲིག་ལངམ་ཅིག་སླར་ལོག་མེདཔ་ལས་འགོ་བཙུགས་མ་ཚུགསཔ།"
+
+#: ../gnome/applet/applet.c:515
+msgid "VPN Login Message"
+msgstr "ཝི་པི་ཨེན་ནང་བསྐྱོད་འཕྲིན་དོན།"
+
+#: ../gnome/applet/applet.c:739
+#: ../gnome/applet/applet.c:2534
+#: ../gnome/applet/other-network-dialog.c:458
+#: ../gnome/applet/passphrase-dialog.c:228
+msgid "The NetworkManager Applet could not find some required resources (the glade file was not found)."
+msgstr "ཡོངས་འབྲེལ་འཛིན་སྐྱོང་པ་ཨེཔ་ལེཊི་དེ་གིས་དགོས་མཁོ་ཡོད་པའི་ཐོན་ཁུངས་ལ་ལོ་འཚོལ་མ་འཐོབ(གེལེཊི་ཡིག་སྣོད་འདི་འཚོལ་མ་འཐོབ)"
+
+#: ../gnome/applet/applet.c:751
+#, c-format
+msgid "The network device \"%s (%s)\" does not support wireless scanning."
+msgstr "ཡོངས་འབྲེལ་ཐབས་འཕྲུལ་འདི་གིས་ \"%s (%s)\" རླུང་འཕྲིན་པར་ལེན་རྒྱབ་སྐྱོར་མི་འབད།"
+
+#: ../gnome/applet/applet.c:759
+#, c-format
+msgid "The network device \"%s (%s)\" does not support link detection."
+msgstr "ཡོངས་འབྲེལ་ཐབས་འཕྲུལ་འདི་གིས་ \"%s (%s)\" འབྲེལ་ལམ་སྐྱོན་འཛིན་ནི་རྒྱབ་སྐྱོར་མི་འབད།"
+
+#. Note to translators: this is used if no essid is known
+#: ../gnome/applet/applet.c:901
+#: ../gnome/applet/applet.c:1099
+msgid "(unknown)"
+msgstr "(མ་ཤེསཔ)"
+
+#: ../gnome/applet/applet.c:907
+#, c-format
+msgid "Preparing device %s for the wired network..."
+msgstr "བརྒྱུད་ཐག་ཅན་གྱི་ཡོངས་འབྲེལ་འདིའི་དོན་ལུ་ %s ཐབས་འཕྲུལ་གྲ་སྒྲིག་འབད་དོ..."
+
+#: ../gnome/applet/applet.c:909
+#, c-format
+msgid "Preparing device %s for the wireless network '%s'..."
+msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་འདིའི་དོན་ལུ་ %s ཐབས་འཕྲུལ་གྲ་སྒྲིག་འབད་དོ '%s'..."
+
+#: ../gnome/applet/applet.c:917
+#, c-format
+msgid "Configuring device %s for the wired network..."
+msgstr "བརྒྱུད་ཐག་ཅན་གྱི་ཡོངས་འབྲེལ་དོན་ལུ་ %s ཐབས་འཕྲུལ་རིམ་སྒྲིག་འབད་དོ..."
+
+#: ../gnome/applet/applet.c:919
+#, c-format
+msgid "Attempting to join the wireless network '%s'..."
+msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་འདི་ལུ་མཐུད་ནི་དཔའ་བཅམ་དོ '%s'..."
+
+#: ../gnome/applet/applet.c:927
+#, c-format
+msgid "Waiting for Network Key for the wireless network '%s'..."
+msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་འདིའི་དོན་ལུ་ཡོངས་འབྲེལ་ལྡེ་མིག་དོན་ལུ་བསྒུག་དོ '%s'..."
+
+#: ../gnome/applet/applet.c:935
+#: ../gnome/applet/applet.c:945
+msgid "Requesting a network address from the wired network..."
+msgstr "བརྒྱུད་ཐག་ཅན་གྱི་ཡོངས་འབྲེལ་འདི་ལས་ཡོངས་འབྲེལ་ཁ་བྱང་ཅིག་ཞུ་བ་འབད་དོ..."
+
+#: ../gnome/applet/applet.c:937
+#: ../gnome/applet/applet.c:947
+#, c-format
+msgid "Requesting a network address from the wireless network '%s'..."
+msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་འདི་ལས་ཡོངས་འབྲེལ་ཁ་བྱང་ཅིག་ཞུ་བ་འབད་དོ '%s'..."
+
+#: ../gnome/applet/applet.c:955
+msgid "Finishing connection to the wired network..."
+msgstr "བརྒྱུད་ཐག་ཅན་གྱི་ཡོངས་འབྲེལ་འདི་ལུ་མཐུད་ལམ་མཇུག་བསྡུ་དོ..."
+
+#: ../gnome/applet/applet.c:957
+#, c-format
+msgid "Finishing connection to the wireless network '%s'..."
+msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་འདི་ལུ་མཐུད་ལམ་མཇུག་བསྡུ་དོ '%s'..."
+
+#: ../gnome/applet/applet.c:1074
+msgid "NetworkManager is not running"
+msgstr "ཡོངས་འབྲེལ་འཛིན་སྐྱོང་པ་འདི་གཡོག་བཀོལ་མི་བཏུབ།"
+
+#: ../gnome/applet/applet.c:1082
+#: ../gnome/applet/applet.c:1827
+msgid "Networking disabled"
+msgstr "ཡོངས་འབྲེལ་བཟོ་བ་ལྕོགས་མིན་བཟོ་ཡོདཔ།"
+
+#: ../gnome/applet/applet.c:1087
+msgid "No network connection"
+msgstr "ཡོངས་འབྲེལ་མཐུད་ལམ་མེདཔ།"
+
+#: ../gnome/applet/applet.c:1092
+msgid "Wired network connection"
+msgstr "བརྒྱུད་ཐག་ཅན་གྱི་ཡོངས་འབྲེལ་མཐུད་ལམ།"
+
+#: ../gnome/applet/applet.c:1096
+msgid "Connected to an Ad-Hoc wireless network"
+msgstr "ནམ་དགོས་རླུང་འཕྲིན་ཡོངས་འབྲེལ་ཅིག་ལུ་མཐུད་ཡོདཔ།"
+
+#: ../gnome/applet/applet.c:1098
+#, c-format
+msgid "Wireless network connection to '%s' (%d%%)"
+msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་ '%s' (%d%%)ལུ་མཐུད་ལམ།"
+
+#: ../gnome/applet/applet.c:1119
+#, c-format
+msgid "VPN connection to '%s'"
+msgstr "ཝི་པི་ཨེན་ '%s' ལུ་མཐུད་ལམ།"
+
+#: ../gnome/applet/applet.c:1127
+#, c-format
+msgid "VPN connecting to '%s'"
+msgstr "ཝི་པི་ཨེན་ '%s' ལུ་མཐུད་དོ།"
+
+#: ../gnome/applet/applet.c:1540
+msgid "_Connect to Other Wireless Network..."
+msgstr "གཞན་རླུང་འཕྲིན་ཡོངས་འབྲེལ་ལུ་མཐུད...(_C)"
+
+#: ../gnome/applet/applet.c:1561
+msgid "Create _New Wireless Network..."
+msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་གསརཔ་གསར་བསྐྲུན་འབད...(_N)"
+
+#: ../gnome/applet/applet.c:1684
+msgid "_VPN Connections"
+msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་ཚུ།(_V)"
+
+#: ../gnome/applet/applet.c:1729
+msgid "_Configure VPN..."
+msgstr "ཝི་པི་ཨེན་རིམ་སྒྲིག...(_C)"
+
+#: ../gnome/applet/applet.c:1733
+msgid "_Disconnect VPN..."
+msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་མེདཔ་བཟོ...(_D)"
+
+#: ../gnome/applet/applet.c:1755
+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:1766
+#, c-format
+msgid "Connect to %s..."
+msgstr " %s ལུ་མཐུད..."
+
+#: ../gnome/applet/applet.c:1772
+#, c-format
+msgid "Disconnect from %s..."
+msgstr " %s ལས་མཐུད་ལམ་མེདཔ་བཟོ..."
+
+#: ../gnome/applet/applet.c:1821
+msgid "No network devices have been found"
+msgstr "ཡོངས་འབྲེལ་ཐབས་འཕྲུལ་ཚུ་འཚོལ་མ་འཐོབ།"
+
+#: ../gnome/applet/applet.c:2013
+msgid "NetworkManager is not running..."
+msgstr "ཡོངས་འབྲེལ་འཛིན་སྐྱོང་པ་འདི་གཡོག་བཀོལ་མི་བཏུབ..."
+
+#. 'Enable Networking' item
+#: ../gnome/applet/applet.c:2192
+msgid "Enable _Networking"
+msgstr "ཡོངས་འབྲེལ་བཟོ་བ་ལྕོགས་ཅན་བཟོ།(_N)"
+
+#. 'Enable Wireless' item
+#: ../gnome/applet/applet.c:2198
+msgid "Enable _Wireless"
+msgstr "རླུང་འཕྲིན་ལྕོགས་ཅན་བཟོ།(_W)"
+
+#. 'Connection Information' item
+#: ../gnome/applet/applet.c:2204
+msgid "Connection _Information"
+msgstr "མཐུད་ལམ་བརྡ་དོན།(_I)"
+
+#. Help item
+#: ../gnome/applet/applet.c:2215
+msgid "_Help"
+msgstr "གྲོགས་རམ།(_H)"
+
+#. About item
+#: ../gnome/applet/applet.c:2224
+msgid "_About"
+msgstr "སྐོར་ལས།(_A)"
+
+#: ../gnome/applet/applet.c:2695
+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 "ཨེ་ཨི་ཨེསི་-སི་སི་ཨེམ་པི།"
+
+#: ../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
+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:93
+#: ../src/nm-ap-security-wpa-eap.c:117
+msgid "WPA2 Enterprise"
+msgstr "ཌབ་ལུ་པི་ཨེ་ ༢ ཚོང་ལཱ།"
+
+#: ../gnome/applet/wso-wpa-eap.c:249
+#: ../src/nm-ap-security-wpa-eap.c:95
+#: ../src/nm-ap-security-wpa-eap.c:122
+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:91
+msgid "_Wired Network"
+msgstr "བརྒྱུད་ཐག་ཅན་གྱི་ཡོངས་འབྲེལ།(_W)"
+
+#: ../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:164
+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 "རླུང་འཕྲིན་ཡོངས་འབྲེལ་གསརཔ་གསར་བསྐྲུན་འབད།"
+
+#: ../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
+msgid "Create New Wireless Network"
+msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་གསརཔ་གསར་བསྐྲུན་འབད།"
+
+#: ../gnome/applet/other-network-dialog.c:368
+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
+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 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 "ཝི་པི་ཨེན་མཐུད་ལམ་འགོ་བཙུགས་མི་བཏུབ '%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 "ཝི་པི་ཨེན་མཐུད་ལམ་དབྱེ་བ་དོན་ལུ་བདེན་བཤད་ཌའི་ལོག་འདི་འཚོལ་མ་འཐོབ '%s'། ཁྱོད་རའི་རིམ་ལུགས་བདག་སྐྱོང་པ་འབྲེལ་བ་འཐབ།"
+
+#: ../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 "ཝི་པི་ཨེན་མཐུད་ལམ་དབྱེ་བ་དོན་ལུ་%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'།  ཁྱོད་ཀྱིས་རླུང་འཕྲིན་ཡོངས་འབྲེལ་འདི་མཐའ་བཙན་བཟོ་ནི་ངེས་ཏིག་ཨིན་པ་ཅིན་ འོག་གི་ཞིབ་དཔྱད་སྒྲོམ་འདི་ཨེབ་གཏང་འབད་ནི་དང་ཡོངས་འབྲེལ་འཛིན་སྐྱོང་པ་འདི་ལུ་ནང་བསྐྱོད་ཤུལ་ལུ་གུ་ངེས་དཔྱད་དགོས་མཁོ་མེདཔ་ཨིན།"
+
+#: ../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 "མཐུད༔(_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
+msgid "Key management:"
+msgstr "ལྡེ་མིག་འཛིན་སྐྱོང་པ:"
+
+#: ../gnome/applet/applet.glade.h:32
+msgid "Key:"
+msgstr "ལྡེ་མིག:"
+
+#: ../gnome/applet/applet.glade.h:33
+msgid ""
+"None\n"
+"WEP 128-bit Passphrase\n"
+"WEP 64/128-bit Hex\n"
+"WEP 64/128-bit ASCII\n"
+msgstr ""
+"ཅི་མེད\n"
+"ཌབ་ལུ་ཨི་པི་ ༡༢༨-བིཊི་ཆོག་ཡིག་ཚིག\n"
+"ཌབ་ལུ་ཨི་པི ༦༤/༡༢༨-བིཊི་ཧེགསི\n"
+"ཌབ་ལུ་ཨི་པི ༦༤/༡༢༨-བིཊི་ཨེ་ཨེསི་སི་ཨའི་ཨའི\n"
+
+#: ../gnome/applet/applet.glade.h:38
+msgid ""
+"Open System\n"
+"Shared Key"
+msgstr ""
+"ཀུན་གྱི་རིམ་ལུགས\n"
+"ལྡེ་མིག་རུབ་སྤྱོད་འབད་ཡོདཔ།"
+
+#: ../gnome/applet/applet.glade.h:40
+msgid "Other Wireless Network..."
+msgstr "གཞན་རླུང་འཕྲིན་ཡོངས་འབྲེལ..."
+
+#: ../gnome/applet/applet.glade.h:41
+msgid "Passphrase:"
+msgstr "ཆོག་ཡིག་ཚིག:"
+
+#: ../gnome/applet/applet.glade.h:42
+msgid "Password:"
+msgstr "ཆོག་ཡིག:"
+
+#: ../gnome/applet/applet.glade.h:43
+msgid "Primary DNS:"
+msgstr "གཞི་རིམ་ཌི་ཨེན་ཨེསི:"
+
+#: ../gnome/applet/applet.glade.h:44
+msgid "Private Key File:"
+msgstr "སྒེར་གྱི་ལྡེ་མིག་ཡིག་སྣོད:"
+
+#: ../gnome/applet/applet.glade.h:45
+msgid "Private Key Password:"
+msgstr "སྒེར་གྱི་ལྡེ་མིག་ཆོག་ཡིག:"
+
+#: ../gnome/applet/applet.glade.h:46
+msgid "Secondary DNS:"
+msgstr "གལ་གནད་ཆུང་བའི་ཌི་ཨེན་ཨེསི:"
+
+#: ../gnome/applet/applet.glade.h:47
+msgid "Select the CA Certificate File"
+msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད་འདི་སེལ་འཐུ་འབད།"
+
+#: ../gnome/applet/applet.glade.h:48
+msgid "Select the Client Certificate File"
+msgstr "ཞབས་ཏོག་སྤྱོད་མི་ལག་ཁྱེར་ཡིག་སྣོད་འདི་སེལ་འཐུ་འབད།"
+
+#: ../gnome/applet/applet.glade.h:49
+msgid "Select the Private Key File"
+msgstr "སྒེར་གྱི་ལྡེ་མིག་ཡིག་སྣོད་འདི་སེལ་འཐུ་འབད།"
+
+#: ../gnome/applet/applet.glade.h:50
+msgid "Show key"
+msgstr "ལྡེ་མིག་སྟོན།"
+
+#: ../gnome/applet/applet.glade.h:51
+msgid "Show passphrase"
+msgstr "ཆོག་ཡིག་ཚིག་སྟོན།"
+
+#: ../gnome/applet/applet.glade.h:52
+msgid "Show password"
+msgstr "ཆོག་ཡིག་སྟོན།"
+
+#: ../gnome/applet/applet.glade.h:53
+msgid "Show passwords"
+msgstr "ཆོག་ཡིག་ཚུ་སྟོན།"
+
+#: ../gnome/applet/applet.glade.h:54
+msgid "Speed:"
+msgstr "མགྱོགས་ཚད:"
+
+#: ../gnome/applet/applet.glade.h:55
+msgid "Subnet Mask:"
+msgstr "སབ་ནེཊི་གདོང་ཁེབས:"
+
+#: ../gnome/applet/applet.glade.h:56
+msgid "Type:"
+msgstr "དབྱེ་བ:"
+
+#: ../gnome/applet/applet.glade.h:57
+msgid "User Name:"
+msgstr "ལག་ལེན་པའི་མིང་:"
+
+#: ../gnome/applet/applet.glade.h:58
+msgid "Wireless Network Key Required"
+msgstr "རླུང་འཕྲིན་ཡཅངས་འབྲེལ་ལྡེ་མིག་དགོས་མཁོ་ཡོདཔ།"
+
+#: ../gnome/applet/applet.glade.h:59
+msgid "Wireless _adapter:"
+msgstr "རླུང་འཕྲིན་མཐུན་བྱེད:(_a)"
+
+#: ../gnome/applet/applet.glade.h:60
+msgid "_Always Trust this Wireless Network"
+msgstr "ཨ་རྟག་ར་རླུང་འཕྲིན་ཡོངས་འབྲེལ་འདི་བློ་གཏད།(_A)"
+
+#: ../gnome/applet/applet.glade.h:61
+msgid "_Don't remind me again"
+msgstr "ང་ལུ་ལོག་དྲན་བསྐུལ་མ་འབད།(_D)"
+
+#: ../gnome/applet/applet.glade.h:62
+msgid "_Fallback on this Network"
+msgstr "ཡོངས་འབྲེལ་འདི་གུ་གློ་བུར་རྒྱབ་ཐག (_F)"
+
+#: ../gnome/applet/applet.glade.h:63
+msgid "_Login to Network"
+msgstr "ཡོངས་འབྲེལ་ལུ་ནང་བསྐྱོད།(_L)"
+
+#: ../gnome/applet/applet.glade.h:64
+msgid "_Network Name:"
+msgstr "ཡོངས་འབྲེལ་མིང་:(_N)"
+
+#: ../gnome/applet/applet.glade.h:65
+msgid "_Wireless Security:"
+msgstr "རླུང་འཕྲིན་སྲུང་རྒྱབ:(_W)"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:419
+msgid "Cannot add VPN connection"
+msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་ཁ་སྐོང་འབད་མི་བཏུབ།"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:421
+msgid "No suitable VPN software was found on your system. Contact your system administrator."
+msgstr "ཁྱོད་རའི་རིམ་ལུགས་གུ་ཝི་པི་ཨེན་མཉེན་ཆས་དེ་འོས་འབབ་མེདཔ་འཐོབ་ཡོདཔ། ཁྱོད་རའི་བདག་སྐྱོང་པ་རིམ་ལུགས་འབྲེལ་བ་འཐབ།"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:463
+msgid "Cannot import VPN connection"
+msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་ནང་འདྲེན་འབད་མི་བཏུབ།"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:465
+#, c-format
+msgid "Cannot find suitable software for VPN connection type '%s' to import the file '%s'. Contact your system administrator."
+msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་དབྱེ་བ་དོན་ལུ་ '%s'ཡིག་སྣོད་ནང་འདྲེན་འབད་ནི་ལུ '%s'འོས་འབབ་མཉེན་ཆས་འཚོལ་མ་འཐོབ། ཁྱོད་རའི་རིམ་ལུགས་བདག་སྐྱོང་པ་འབྲེལ་བ་འཐབ།"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:585
+#, c-format
+msgid "Error retrieving VPN connection '%s'"
+msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་སླར་འདྲེན་འཛོལ་བ '%s'"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:588
+#, c-format
+msgid "Could not find the UI files for VPN connection type '%s'. Contact your system administrator."
+msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་དབྱེ་བ་དོན་ལུ་ཡུ་ཨའི་ཡིག་སྣོད་ཚུ་འཚོལ་མ་འཐོབ '%s'། ཁྱོད་རའི་རིམ་ལུགས་བདག་སྐྱོང་པ་འབྲེལ་བ་འཐབ།"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:732
+#, c-format
+msgid "Delete VPN connection \"%s\"?"
+msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་བཏོན་གཏང་ནི་ཨིན་ན \"%s\"?"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:735
+#, 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 "ཝི་པི་ཨེན་མཐུད་ལམ་འདིའི་སྐོར་ལས་བརྡ་དོན་ཆ་མཉམ་ \"%s\"བརླག་སྟོར་ཞུགས་ཡོད་པ་ཅིན་ཁྱོད་ཀྱིས་ཁྱོད་རའི་རིམ་ལུགས་བདག་སྐྱོང་པ་འདི་མཐུད་ལམ་གསརཔ་གསར་བསྐྲུན་འབད་ནི་ལུ་བརྡ་དོན་བྱིན་ནི་ལུ་དགོཔ་ཨིན། "
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:908
+msgid "Unable to load"
+msgstr "མངོན་གསལ་འབད་མི་ཚུགསཔ།"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:910
+msgid "Cannot find some needed resources (the glade file)!"
+msgstr "ཐོན་ཁུངས་དགོཔ་ལ་ལོ་འཚོལ་མ་འཐོབ (གེ་ལེཌི་ཡིག་སྣོད་འདི)!"
+
+#. druid_window = GTK_DIALOG (gtk_dialog_new_with_buttons (_("Create VPN Connection"),
+#. NULL,
+#. GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+#. GTK_STOCK_CANCEL,
+#. GTK_RESPONSE_REJECT,
+#. GTK_STOCK_APPLY,
+#. GTK_RESPONSE_ACCEPT,
+#. NULL));
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1055
+msgid "Create VPN Connection"
+msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་གསར་བསྐྲུན་འབད།"
+
+#. gtk_container_add (GTK_CONTAINER (druid_window->vbox), GTK_WIDGET(gtk_label_new("Some label")));
+#. gtk_box_pack_start (GTK_BOX (druid_window->vbox), GTK_WIDGET(druid), TRUE,TRUE,0);
+#. gtk_box_pack_start (GTK_BOX (druid_window->vbox), GTK_WIDGET(gtk_label_new("Some label")), TRUE,TRUE,0);
+#. toplevel = gtk_widget_get_toplevel (GTK_WIDGET (druid));
+#. gtk_signal_connect (GTK_OBJECT (toplevel), "delete_event", GTK_SIGNAL_FUNC (vpn_window_close), NULL);
+#. make the druid window modal wrt. our main window
+#. gtk_window_set_modal (druid_window, TRUE);
+#. gtk_window_set_transient_for (GTK_WINDOW(druid_window), GTK_WINDOW (dialog));
+#. Edit dialog
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1073
+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 "Delete the selected VPN connection"
+msgstr "སེལ་འཐུ་འབད་ཡོད་མི་ཝི་པི་ཨེན་མཐུད་ལམ་འདི་བཏོན་གཏང་།"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
+msgid "E_xport"
+msgstr "ཕྱིར་འདྲེན།(_x)"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
+msgid "Edit the selected VPN connection"
+msgstr "སེལ་འཐུ་འབད་ཡོད་མི་ཝི་པི་ཨེན་མཐུད་ལམ་འདི་ཞུན་དག་འབད།"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
+msgid "Export the VPN settings to a file"
+msgstr "ཝི་པི་ཨེན་སྒྲིག་སྟངས་ཚུ་ཡིག་སྣོད་ཅིག་ལུ་ཕྱིར་འདྲེན་འབད།"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
+msgid "Export the selected VPN connection to a file"
+msgstr "སེལ་འཐུ་འབད་ཡོད་མི་ཝི་པི་ཨེན་མཐུད་ལམ་འདི་ཡིག་སྣོད་ཅིག་ལུ་ཕྱིར་འདྲེན་འབད།"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
+msgid "Manage Virtual Private Network Connections"
+msgstr "བར་ཅུ་ཡལ་སྒེར་དོན་ཡོངས་འབྲེལ་མཐུད་ལམ་ཚུ་འཛིན་སྐྱོང་འབད།"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
+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:338
+msgid "none"
+msgstr "ཅི་མེད།"
+
+#: ../src/nm-netlink-monitor.c:174
+#, c-format
+msgid "unable to create netlink socket for monitoring wired ethernet devices - %s"
+msgstr "བརྒྱུད་ཐག་ཅན་གྱི་ཨི་ཐར་ནེཊི་ཐབས་འཕྲུལ་ཚུ་ལྟ་རྟོག་དོན་ལུ་ནེཊི་ལིངཀ་སོ་ཀེཊི་གསར་བསྐྲུན་འབད་མི་ཚུགསཔ - %s"
+
+#: ../src/nm-netlink-monitor.c:192
+#, c-format
+msgid "unable to bind to netlink socket for monitoring wired ethernet devices - %s"
+msgstr "བརྒྱུད་ཐག་ཅན་གྱི་ཨི་ཐར་ནེཌི་ཐབས་འཕྲུལ་ཚུ་ལྟ་རྟོག་དོན་ལུ་ནེཊི་ལིངཀ་སོཀེཊི་ལུ་བསྡམས་ནི་ལུ་མི་ཚུགསཔ - %s"
+
+#: ../src/nm-netlink-monitor.c:427
+msgid "operation took too long"
+msgstr "བཀོལ་སྤྱོད་འབད་ནི་རིངམ་བསྒོར་ཡོདཔ།"
+
+#: ../src/nm-netlink-monitor.c:524
+msgid "received data from wrong type of sender"
+msgstr "ཕྱི་འགྱུར་གྱི་དབྱེ་བའི་གཏང་མི་ལས་གནད་སྡུད་འཐོབ་ཡོདཔ།"
+
+#: ../src/nm-netlink-monitor.c:537
+msgid "received data from unexpected sender"
+msgstr "རེ་བ་མེད་བའི་གཏང་མི་ལས་གནད་སྡུད་འཐོབ་ཡོདཔ།"
+
+#: ../src/nm-netlink-monitor.c:666
+msgid "too much data was sent over socket and some of it was lost"
+msgstr "སོ་ཀེཊི་ལྟག་གནད་སྡུད་ལེ་ཤ་གཏང་ཡོདཔ་དང་ལ་ལོ་བརླག་སྟོར་ཞུགས་ཡོདཔ།"
+
+#: ../src/nm-netlink-monitor.c:776
+msgid "error occurred while waiting for data on socket"
+msgstr "སོ་ཀེཊི་གུ་གནད་སྡུད་དོན་ལུ་བསྒུག་པའི་སྐབས་འཛོལ་བ་འབྱུང་ཡོདཔ།"
+
+#: ../gnome/applet/applet-dbus-devices.c:922
+#, c-format
+msgid "You are now connected to the Ad-Hoc wireless network '%s'."
+msgstr "ཁྱོད་ད་ནམ་དགོས་རླུང་འཕྲིན་ཡོངས་འབྲེལ་'%s' འདི་ལུ་མཐུད་ཡོདཔ།"
+
+#: ../gnome/applet/applet-dbus-devices.c:927
+#, c-format
+msgid "You are now connected to the wireless network '%s'."
+msgstr "ཁྱོད་ད་རླུང་འཕྲིན་ཡོངས་འབྲེལ་'%s' འདི་ལུ་མཐུད་ཡོདཔ།"
+
+#: ../gnome/applet/applet-dbus-devices.c:934
+msgid "You are now connected to the wired network."
+msgstr "ཁྱོད་ད་བརྒྱུད་ཐག་ཅན་གྱི་་ཡོངས་འབྲེལ་འདི་ལུ་མཐུད་ཡོདཔ།"
+
+#: ../gnome/applet/applet-dbus-devices.c:940
+msgid "Connection Established"
+msgstr "མཐུད་ལམ་གཞི་འཛུགས་འབད་ཡོདཔ།"
+
+#: ../gnome/applet/applet-dbus-devices.c:983
+msgid "Disconnected"
+msgstr "མཐུད་ལམ་བཏོག་ཡོདཔ།"
+
+#: ../gnome/applet/applet-dbus-devices.c:984
+msgid "The network connection has been disconnected."
+msgstr "ཡོངས་འབྲེལ་མཐུད་ལམ་འདི་མཐུད་ལམ་བཏོག་ཡོདཔ།"
+
diff --git a/po/el.po b/po/el.po
index bddf2711..b2a6e561 100644
--- a/po/el.po
+++ b/po/el.po
@@ -1,507 +1,523 @@
-# translation of el.po to Greek
-# translation of el.po to
-# NetworkManager in Greek
+# NetworkManager translation to Greek
 # Nikos Charonitakis <charosn@her.forthnet.gr>, 2005.
-# Kostas Papadimas <pkst@gnome.org>, 2005.
+# Kostas Papadimas <pkst@gnome.org>, 2005-2007.
+# Dimitris Glezos <dimitris@glezos.com>, 2006.
+# .
 # 
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: el\n"
+"Project-Id-Version: NetworkManager 0.7.0\n"
 "Report-Msgid-Bugs-To: \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"
+"POT-Creation-Date: 2007-01-13 10:05+0200\n"
+"PO-Revision-Date: 2007-01-13 10:12+0200\n"
+"Last-Translator: Kostas Papadimas <pkst@gmome.org>\n"
+"Language-Team: Greek <nls@tux.hellug.gr>\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"
+"Plural-Forms:  nplurals=2; plural=(n != 1);"
 
-#: ../src/applet-compat.c:171 ../src/applet-dbus-info.c:919
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:926
 #, c-format
 msgid "Passphrase for wireless network %s"
-msgstr "Συνθηματικό για ασύρματο δικτύο %s"
+msgstr "Συνθηματικό για το ασύρματο δίκτυο %s"
 
-#: ../src/applet-dbus.c:265
+#: ../gnome/applet/applet-dbus.c:274
 #, c-format
 msgid "Connection to the wireless network '%s' failed."
 msgstr "Η σύνδεση στο ασύρματο δίκτυο  '%s' απέτυχε."
 
-#: ../src/applet-dbus.c:270
+#: ../gnome/applet/applet-dbus.c:279
 msgid "Connection to the wired network failed."
 msgstr "Αποτυχία σύνδεσης σε ένα ενσύρματο δίκτυο."
 
-#: ../src/applet.c:184
-#, fuzzy
+#: ../gnome/applet/applet.c:182
 msgid "Error displaying connection information:"
-msgstr "Σφάλμα απεικόνισης πληροφοριών σύνδεσης:"
+msgstr "Σφάλμα εμφάνισης πληροφοριών σύνδεσης:"
 
-#: ../src/applet.c:202
+#: ../gnome/applet/applet.c:200
 msgid "Could not find some required resources (the glade file)!"
-msgstr "Αδυναμία εύρεσης κάποθβν απιατούμενων πόρων (the glade file)!"
+msgstr "Αδυναμία εύρεσης κάποιων απαιτούμενων πόρων (the glade file)!"
 
-#: ../src/applet.c:213
+#: ../gnome/applet/applet.c:210
 msgid "No active connections!"
 msgstr "Δεν υπάρχουν ενεργές συνδέσεις!"
 
-#: ../src/applet.c:234
+#: ../gnome/applet/applet.c:227
+#, c-format
+msgid "%d Mb/s"
+msgstr "%d Mb/s"
+
+#: ../gnome/applet/applet.c:230
 #, c-format
 msgid "Wired Ethernet (%s)"
 msgstr "Ενσύρματο Ethernet (%s)"
 
-#: ../src/applet.c:236
+#: ../gnome/applet/applet.c:232
 #, c-format
 msgid "Wireless Ethernet (%s)"
 msgstr "Ασύρματο Ethernet (%s)"
 
-#: ../src/applet.c:337 ../src/applet.c:362
+#: ../gnome/applet/applet.c:238
+msgid "Unknown"
+msgstr "Άγνωστο"
+
+#: ../gnome/applet/applet.c:330 ../gnome/applet/applet.c:357
 msgid "NetworkManager Applet"
 msgstr "Εφαρμογή NetworkManager"
 
-#: ../src/applet.c:339 ../src/applet.c:364
-#, fuzzy
-msgid "Copyright © 2004-2005 Red Hat, Inc."
-msgstr "Copyright (C) 2004-2005 Red Hat, Inc."
+#: ../gnome/applet/applet.c:332
+msgid ""
+"Copyright © 2004-2006 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+msgstr ""
+"Copyright © 2004-2006 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
 
-#: ../src/applet.c:340 ../src/applet.c:365
+#: ../gnome/applet/applet.c:334 ../gnome/applet/applet.c:361
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Μια μικροεφαρμογή για τη διαχείριση των συσκευών και των συνδέσεων του "
 "δικτύου σας."
 
-#: ../src/applet.c:343 ../src/applet.c:370
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:365
 msgid "translator-credits"
+msgstr "Nikos Charonitakis <charosn@her.forthnet.gr>/n"
+"Kostas Papadimas <pkst@gnome.org> /n"
+"Dimitris Glezos <dimitris@glezos.com>"
+
+#: ../gnome/applet/applet.c:359
+msgid ""
+"Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
 msgstr ""
+"Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
 
-#: ../src/applet.c:426
+#: ../gnome/applet/applet.c:421
 msgid "VPN Login Failure"
-msgstr ""
+msgstr "Αποτυχία αναγνώρισης VPN"
 
-#: ../src/applet.c:427
-#, fuzzy, c-format
+#: ../gnome/applet/applet.c:422
+#, c-format
 msgid "Could not start the VPN connection '%s' due to a login failure."
-msgstr "Αδυναμία εκκίνησης σύνδεσης VPN '%s'"
+msgstr "Αδυναμία εκκίνησης σύνδεσης VPN '%s' λόγω αποτυχίας αναγνώρισης."
 
-#: ../src/applet.c:431
+#: ../gnome/applet/applet.c:426
 msgid "VPN Start Failure"
-msgstr ""
+msgstr "Αποτυχία έναρξης VPN"
 
-#: ../src/applet.c:432
-#, fuzzy, c-format
+#: ../gnome/applet/applet.c:427
+#, c-format
 msgid ""
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
 "program."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Αποτυχία εκκίνησης VPN</span>\n"
-"\n"
-"Αδυναμία εκκίνησης της σύνδεσης VPN '%s' λόγω σφάλματος στην εκκίνηση "
-"τουπρογράμματος VPN. \n"
-"\n"
-"Η υπηρεσία VPN απάντησε: \"%s\""
+"Αδυναμία εκκίνησης της σύνδεσης VPN '%s' λόγω σφάλματος στην εκκίνηση του "
+"προγράμματος VPN."
 
-#: ../src/applet.c:436 ../src/applet.c:446
-#, fuzzy
+#: ../gnome/applet/applet.c:431 ../gnome/applet/applet.c:441
 msgid "VPN Connect Failure"
-msgstr "Συνδέσεις VPN"
+msgstr "Αποτυχία σύνδεσης VPN"
 
-#: ../src/applet.c:437
-#, fuzzy, c-format
+#: ../gnome/applet/applet.c:432
+#, c-format
 msgid "Could not start the VPN connection '%s' due to a connection error."
-msgstr "Αδυναμία εκκίνησης σύνδεσης VPN '%s'"
+msgstr "Αδυναμία εκκίνησης της σύνδεσης VPN '%s' λόγω ενός σφάλματος σύνδεσης."
 
-#: ../src/applet.c:441
+#: ../gnome/applet/applet.c:436
 msgid "VPN Configuration Error"
-msgstr ""
+msgstr "Σφάλμα ρύθμισης VPN"
 
-#: ../src/applet.c:442
+#: ../gnome/applet/applet.c:437
 #, c-format
 msgid "The VPN connection '%s' was not correctly configured."
-msgstr ""
+msgstr "Η σύνδεση VPN '%s' δεν ρυθμίστηκε σωστά."
 
-#: ../src/applet.c:447
-#, fuzzy, c-format
+#: ../gnome/applet/applet.c:442
+#, c-format
 msgid ""
 "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' επειδή ο εξυπηρετητής VPN δεν "
-"επέστρεψε επαρκείς πληροφορίες ρύθμισης δικτύου.\n"
-"\n"
-"Η υπηρεσία VPN απάντησε: \"%s\""
+"Αδυναμία εκκίνησης της σύνδεσης VPN '%s' επειδή ο εξυπηρετητής VPN δεν "
+"επέστρεψε επαρκείς πληροφορίες ρύθμισης δικτύου."
 
-#: ../src/applet.c:517
+#: ../gnome/applet/applet.c:512
 msgid "VPN Login Message"
-msgstr ""
+msgstr "Μήνυμα αναγνώρισης VPN"
 
-#: ../src/applet.c:741 ../src/applet.c:2508
-#: ../src/other-network-dialog.c:453
-#: ../src/passphrase-dialog.c:228
+#: ../gnome/applet/applet.c:737 ../gnome/applet/applet.c:2635
+#: ../gnome/applet/other-network-dialog.c:458
+#: ../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)"
+"Η μικροεφαρμογή NetworkManager δεν μπόρεσε να βρει κάποιους απαιτούμενους "
+"πόρους (δεν βρέθηκε το αρχείο glade)"
 
-#: ../src/applet.c:753
+#: ../gnome/applet/applet.c:749
 #, c-format
 msgid "The network device \"%s (%s)\" does not support wireless scanning."
 msgstr "Η συσκευή δικτύου \"%s (%s)\" δεν υποστηρίζει ασύρματη σάρωση."
 
-#: ../src/applet.c:761
+#: ../gnome/applet/applet.c:757
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
 msgstr "Η συσκευή δικτύου \"%s (%s)\" δεν υποστηρίζει εντοπισμό δεσμού."
 
-#: ../src/applet.c:908
+#. Note to translators: this is used if no essid is known
+#: ../gnome/applet/applet.c:905 ../gnome/applet/applet.c:1103
+msgid "(unknown)"
+msgstr "(άγνωστο)"
+
+#: ../gnome/applet/applet.c:911
 #, c-format
 msgid "Preparing device %s for the wired network..."
 msgstr "Προετοιμασία συσκευής %s για το ενσύρματο δίκτυο..."
 
-#: ../src/applet.c:910
+#: ../gnome/applet/applet.c:913
 #, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
 msgstr "Προετοιμασία συσκευής %s για το ασύρματο δίκτυο '%s'..."
 
-#: ../src/applet.c:918
+#: ../gnome/applet/applet.c:921
 #, c-format
 msgid "Configuring device %s for the wired network..."
 msgstr "Γίνεται ρύθμιση της συσκευής %s για το ενσύρματο δίκτυο..."
 
-#: ../src/applet.c:920
+#: ../gnome/applet/applet.c:923
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
 msgstr "Προσπάθεια σύνδεσης με το ασύρματο δίκτυο '%s'..."
 
-#: ../src/applet.c:928
+#: ../gnome/applet/applet.c:931
 #, c-format
 msgid "Waiting for Network Key for the wireless network '%s'..."
 msgstr "Αναμονή για κλειδί δικτύου για το ασύρματο δίκτυο '%s'..."
 
-#: ../src/applet.c:936 ../src/applet.c:946
-#, fuzzy
+#: ../gnome/applet/applet.c:939 ../gnome/applet/applet.c:949
 msgid "Requesting a network address from the wired network..."
-msgstr "Σύνδεση σε ένα ενσύρματο δίκτυο..."
+msgstr "Ζητείται μια διεύθυνση δικτύου από το ενσύρματο δίκτυο..."
 
-#: ../src/applet.c:938 ../src/applet.c:948
-#, fuzzy, c-format
+#: ../gnome/applet/applet.c:941 ../gnome/applet/applet.c:951
+#, c-format
 msgid "Requesting a network address from the wireless network '%s'..."
-msgstr "a."
+msgstr "Ζητείται μια διεύθυνση δικτύου από το ασύρματο δίκτυο '%s'..."
 
-#: ../src/applet.c:956
+#: ../gnome/applet/applet.c:959
 msgid "Finishing connection to the wired network..."
 msgstr "Η σύνδεση στο ενσύρματο δίκτυο ολοκληρώνεται..."
 
-#: ../src/applet.c:958
+#: ../gnome/applet/applet.c:961
 #, c-format
 msgid "Finishing connection to the wireless network '%s'..."
 msgstr "Η σύνδεση στο ασύρματο δίκτυο '%s' ολοκληρώνεται...."
 
-#: ../src/applet.c:1075
+#: ../gnome/applet/applet.c:1078
 msgid "NetworkManager is not running"
 msgstr "Το NetworkManager δεν εκτελείται"
 
-#: ../src/applet.c:1083 ../src/applet.c:1828
+#: ../gnome/applet/applet.c:1086 ../gnome/applet/applet.c:1843
 msgid "Networking disabled"
-msgstr ""
+msgstr "Απενεργοποίηση δικτύωσης"
 
-#: ../src/applet.c:1088
+#: ../gnome/applet/applet.c:1091
 msgid "No network connection"
 msgstr "Δεν υπάρχει σύνδεση δικτύου"
 
-#: ../src/applet.c:1093
+#: ../gnome/applet/applet.c:1096
 msgid "Wired network connection"
 msgstr "Ενσύρματη σύνδεση δικτύου"
 
-#: ../src/applet.c:1097
-#, fuzzy
+#: ../gnome/applet/applet.c:1100
 msgid "Connected to an Ad-Hoc wireless network"
-msgstr "Συνδεδεμένο"
+msgstr "Έγινε σύνδεση με ένα Ad-Hoc ασύρματο δίκτυο"
 
-#: ../src/applet.c:1099
+#: ../gnome/applet/applet.c:1102
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
-msgstr "Ασύρματη σύνδεση δικτύου σε '%s' (%d%%)"
+msgstr "Ασύρματη σύνδεση στο δίκτυο '%s' (%d%%)"
 
-#: ../src/applet.c:1120
+#: ../gnome/applet/applet.c:1123
 #, c-format
 msgid "VPN connection to '%s'"
 msgstr "Σύνδεση VPN σε '%s'"
 
-#: ../src/applet.c:1128
-#, fuzzy, c-format
+#: ../gnome/applet/applet.c:1131
+#, c-format
 msgid "VPN connecting to '%s'"
 msgstr "Σύνδεση VPN σε '%s'"
 
-#: ../src/applet.c:1541
+#: ../gnome/applet/applet.c:1556
 msgid "_Connect to Other Wireless Network..."
 msgstr "_Σύνδεση σε άλλο ασύρματο δίκτυο..."
 
-#: ../src/applet.c:1562
+#: ../gnome/applet/applet.c:1577
 msgid "Create _New Wireless Network..."
-msgstr "Δημιουργία _νέου ασύρματου δικτύου..."
+msgstr "_Δημιουργία νέου ασύρματου δικτύου..."
 
-#: ../src/applet.c:1685
-#, fuzzy
+#: ../gnome/applet/applet.c:1700
 msgid "_VPN Connections"
-msgstr "Συνδέσεις VPN"
+msgstr "Συν_δέσεις VPN"
 
-#: ../src/applet.c:1730
-#, fuzzy
+#: ../gnome/applet/applet.c:1745
 msgid "_Configure VPN..."
-msgstr "Ρύθμιση VPN..."
+msgstr "_Ρύθμιση VPN..."
 
-#: ../src/applet.c:1734
-#, fuzzy
+#: ../gnome/applet/applet.c:1749
 msgid "_Disconnect VPN..."
-msgstr "Αποσύνδεση VPN..."
+msgstr "Α_ποσύνδεση VPN..."
 
-#: ../src/applet.c:1756
-#, fuzzy
+#: ../gnome/applet/applet.c:1771
 msgid "_Dial Up Connections"
-msgstr "Συνδέσεις VPN"
+msgstr "Συνδέσεις _dial-up VPN"
 
 #. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
-#: ../src/applet.c:1767
-#, fuzzy, c-format
+#: ../gnome/applet/applet.c:1782
+#, c-format
 msgid "Connect to %s..."
-msgstr "Σύνδεση μέσω %s..."
+msgstr "Σύνδεση στο %s..."
 
-#: ../src/applet.c:1773
-#, fuzzy, c-format
+#: ../gnome/applet/applet.c:1788
+#, c-format
 msgid "Disconnect from %s..."
-msgstr "Σύνδεση μέσω %s..."
+msgstr "Αποσύνδεση από %s..."
 
-#: ../src/applet.c:1822
+#: ../gnome/applet/applet.c:1837
 msgid "No network devices have been found"
 msgstr "Δε βρέθηκαν συσκευές δικτύου"
 
-#: ../src/applet.c:2014
+#: ../gnome/applet/applet.c:2029
 msgid "NetworkManager is not running..."
 msgstr "Ο NetworkManager δεν εκτελείται."
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2170
+#: ../gnome/applet/applet.c:2210
 msgid "Enable _Networking"
-msgstr ""
+msgstr "Ενεργοποίηση _δικτύωσης"
 
 #. 'Enable Wireless' item
-#: ../src/applet.c:2176
+#: ../gnome/applet/applet.c:2216
 msgid "Enable _Wireless"
-msgstr ""
+msgstr "Ενεργοποίηση α_σύρματης δικτύωσης"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2182
+#: ../gnome/applet/applet.c:2222
 msgid "Connection _Information"
-msgstr "Πληροφορίες _σύνδεσης"
+msgstr "Π_ληροφορίες σύνδεσης"
 
 #. Help item
-#: ../src/applet.c:2193
+#: ../gnome/applet/applet.c:2233
 msgid "_Help"
 msgstr "_Βοήθεια"
 
 #. About item
-#: ../src/applet.c:2202
+#: ../gnome/applet/applet.c:2242
 msgid "_About"
 msgstr "Πε_ρί"
 
-#: ../src/applet.c:2667
-#, fuzzy
+#: ../gnome/applet/applet.c:2824
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
-msgstr "not εύρεση ο"
+msgstr ""
+"Η μικροεφαρμογή NetworkManager δεν μπόρεσε να βρει κάποιους απαραίτητους "
+"πόρους.  Δεν μπορεί να συνεχίσει.\n"
 
-#: ../src/wireless-security-option.c:157
+#: ../gnome/applet/wireless-security-option.c:157
 msgid "Open System"
-msgstr ""
+msgstr "Ανοιχτό σύστημα"
 
-#: ../src/wireless-security-option.c:160
+#: ../gnome/applet/wireless-security-option.c:160
 msgid "Shared Key"
-msgstr ""
+msgstr "Κοινόχρηστο κλειδί"
 
-#: ../src/wireless-security-option.c:208
+#: ../gnome/applet/wireless-security-option.c:208
 msgid "Automatic (Default)"
-msgstr ""
+msgstr "Αυτόματο (προεπιλογή)"
 
-#: ../src/wireless-security-option.c:215
+#: ../gnome/applet/wireless-security-option.c:215
 msgid "AES-CCMP"
-msgstr ""
+msgstr "AES-CCMP"
 
-#: ../src/wireless-security-option.c:223
+#: ../gnome/applet/wireless-security-option.c:223
 msgid "TKIP"
-msgstr ""
+msgstr "TKIP"
 
-#: ../src/wireless-security-option.c:231
+#: ../gnome/applet/wireless-security-option.c:231
 msgid "Dynamic WEP"
-msgstr ""
+msgstr "Dynamic WEP"
 
-#: ../src/wso-none.c:53
+#: ../gnome/applet/wso-none.c:53
 msgid "None"
-msgstr ""
+msgstr "Κανένα"
 
-#: ../src/wso-wep-ascii.c:138
+#: ../gnome/applet/wso-wep-ascii.c:138
 msgid "WEP 64/128-bit ASCII"
-msgstr ""
+msgstr "WEP 64/128-bit ASCII"
 
-#: ../src/wso-wep-hex.c:135
+#: ../gnome/applet/wso-wep-hex.c:135
 msgid "WEP 64/128-bit Hex"
-msgstr ""
+msgstr "WEP 64/128-bit Hex"
 
-#: ../src/wso-wep-passphrase.c:135
-#, fuzzy
+#: ../gnome/applet/wso-wep-passphrase.c:135
 msgid "WEP 128-bit Passphrase"
-msgstr "Συνθηματικό:"
+msgstr "Κωδική φράση WEP 128-bit"
 
-#: ../src/wso-wpa-eap.c:237
+#: ../gnome/applet/wso-wpa-eap.c:237
 msgid "PEAP"
-msgstr ""
+msgstr "PEAP"
 
-#: ../src/wso-wpa-eap.c:238
+#: ../gnome/applet/wso-wpa-eap.c:238
 msgid "TLS"
-msgstr ""
+msgstr "TLS"
 
-#: ../src/wso-wpa-eap.c:239
+#: ../gnome/applet/wso-wpa-eap.c:239
 msgid "TTLS"
-msgstr ""
+msgstr "TTLS"
 
-#: ../src/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
-#: ../src/nm-ap-security-wpa-eap.c:116
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:93
+#: ../src/nm-ap-security-wpa-eap.c:117
 msgid "WPA2 Enterprise"
-msgstr ""
+msgstr "WPA2 Enterprise"
 
-#: ../src/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
-#: ../src/nm-ap-security-wpa-eap.c:121
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:95
+#: ../src/nm-ap-security-wpa-eap.c:122
 msgid "WPA Enterprise"
-msgstr ""
+msgstr "WPA Enterprise"
 
-#: ../src/wso-wpa-psk.c:178
+#: ../gnome/applet/wso-wpa-psk.c:178
 msgid "WPA2 Personal"
-msgstr ""
+msgstr "WPA2 Personal"
 
-#: ../src/wso-wpa-psk.c:180
+#: ../gnome/applet/wso-wpa-psk.c:180
 msgid "WPA Personal"
-msgstr ""
+msgstr "WPA Personal"
 
-#: ../src/eggtrayicon.c:134
+#: ../gnome/applet/eggtrayicon.c:134
 msgid "Orientation"
 msgstr "Προσανατολισμός"
 
-#: ../src/eggtrayicon.c:135
+#: ../gnome/applet/eggtrayicon.c:135
 msgid "The orientation of the tray."
 msgstr "Ο προσανατολισμός του συρταριού."
 
-#: ../src/menu-items.c:88
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
-msgstr "Ενσύρματο Δίκτυο (%s)"
+msgstr "Ενσύρματο δίκτυο (%s)"
 
-#: ../src/menu-items.c:91
+#: ../gnome/applet/menu-items.c:91
 msgid "_Wired Network"
-msgstr "Ε_νσύρματο Δίκτυο"
+msgstr "Ε_νσύρματο δίκτυο"
 
-#: ../src/menu-items.c:162
+#: ../gnome/applet/menu-items.c:162
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
-msgstr[0] "Ασύρματο Δίκτυο (%s)"
-msgstr[1] "Ασύρματα Δίκτυα (%s)"
+msgstr[0] "Ασύρματο δίκτυο (%s)"
+msgstr[1] "Ασύρματα δίκτυα (%s)"
 
-#: ../src/menu-items.c:164
+#: ../gnome/applet/menu-items.c:164
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
-msgstr[0] "Ασύρματο Δίκτυο"
-msgstr[1] "Ασύρματα Δίκτυα"
+msgstr[0] "Ασύρματο δίκτυο"
+msgstr[1] "Ασύρματα δίκτυα"
 
-#: ../src/menu-items.c:343
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
-msgstr " (μή έγκυρο Unicode)"
+msgstr " (μη έγκυρο Unicode)"
 
-#: ../src/other-network-dialog.c:352
-#, fuzzy, 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 "εξ ορισμού είναι"
+msgstr ""
+"Εξ ορισμού, το όνομα του ασύρματου δικτύου έχει οριστεί στο όνομα του "
+"υπολογιστή σας, %s, χωρίς ενεργοποιημένη κάποια κρυπτογράφηση"
 
-#: ../src/other-network-dialog.c:358
+#: ../gnome/applet/other-network-dialog.c:358
 msgid "Create new wireless network"
-msgstr "Δημιουργία νέου ασύρματου Δικτύου"
+msgstr "Δημιουργία νέου ασύρματου δικτύου"
 
-#: ../src/other-network-dialog.c:359
-#, fuzzy
+#: ../gnome/applet/other-network-dialog.c:359
 msgid ""
 "Enter the name and security settings of the wireless network you wish to "
 "create."
-msgstr "Enter and από."
+msgstr ""
+"Εισάγετε το όνομα και τις ρυθμίσεις ασφάλειας του ασύρματου δικτύου που "
+"επιθυμείτε να δημιουργήσετε."
 
-#: ../src/other-network-dialog.c:363
-#, fuzzy
+#: ../gnome/applet/other-network-dialog.c:363
 msgid "Create New Wireless Network"
-msgstr "Δημιουργία _νέου ασύρματου δικτύου..."
+msgstr "Δημιουργία νέου ασύρματου δικτύου"
 
-#: ../src/other-network-dialog.c:368
-#, fuzzy
+#: ../gnome/applet/other-network-dialog.c:368
 msgid "Existing wireless network"
-msgstr "Προσαρμοσμένο ασύρματο δίκτυο"
+msgstr "Υπάρχον ασύρματο δίκτυο"
 
-#: ../src/other-network-dialog.c:369
-#, fuzzy
+#: ../gnome/applet/other-network-dialog.c:369
 msgid "Enter the name of the wireless network to which you wish to connect."
-msgstr "Εισάγετε το ESSID του ασύρματου δικτύου που θέλετε να συνδεθείτε."
+msgstr ""
+"Εισάγετε το όνομα του ασύρματου δικτύου στο οποίο επιθυμείτε να συνδεθείτε."
 
-#: ../src/other-network-dialog.c:371
-#, fuzzy
+#: ../gnome/applet/other-network-dialog.c:371
 msgid "Connect to Other Wireless Network"
-msgstr "_Σύνδεση σε άλλο ασύρματο δίκτυο..."
+msgstr "Σύνδεση σε άλλο ασύρματο δίκτυο"
 
-#: ../src/passphrase-dialog.c:215
-#, fuzzy
+#: ../gnome/applet/passphrase-dialog.c:215
 msgid "Error connecting to wireless network"
-msgstr "_Σύνδεση σε άλλο ασύρματο δίκτυο..."
+msgstr "Σφάλμα σύνδεσης στο ασύρματο δίκτυο"
 
-#: ../src/passphrase-dialog.c:216
+#: ../gnome/applet/passphrase-dialog.c:216
 msgid ""
 "The requested wireless network requires security capabilities unsupported by "
 "your hardware."
 msgstr ""
+"Το ζητούμενο ασύρματο δίκτυο απαιτεί δυνατότητες ασφάλειας οι οποίες δεν "
+"υποστηρίζονται από το υλικό σας."
 
-#: ../src/vpn-password-dialog.c:151
-#: ../src/vpn-password-dialog.c:188
+#: ../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'"
 
-#: ../src/vpn-password-dialog.c:154
-#, fuzzy, 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 "not εύρεση πιστοποίηση διάλογος για είδος Επαφή."
+msgstr ""
+"Δεν μπόρεσε να βρεθεί ο διάλογος πιστοποίησης για τον τύπο σύνδεσης VPN '%"
+"s'. Επικοινωνήστε με το διαχειριστή του συστήματος σας."
 
-#: ../src/vpn-password-dialog.c:191
-#, fuzzy, 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 "a πιστοποίηση διάλογος για είδος Επαφή."
+msgstr ""
+"Υπήρξε ένα πρόβλημα κατά την εκκίνηση του διαλόγου πιστοποίησης για τη "
+"σύνδεση VPN τύπου '%s'. Επικοινωνήστε με το διαχειριστή του συστήματος σας."
 
-#: ../src/applet.glade.h:1
+#: ../gnome/applet/applet.glade.h:1
 msgid " "
 msgstr " "
 
-#: ../src/applet.glade.h:2
-#, fuzzy
+#: ../gnome/applet/applet.glade.h:2
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
-msgstr "<span weight=\"bold\">Ασύρματα Δίκτυα:</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Πληροφορίες ενεργής σύνδεσης</span>"
 
-#: ../src/applet.glade.h:4
-#, fuzzy, 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"
@@ -509,17 +525,25 @@ msgid ""
 "A passphrase or encryption key is required to access the wireless network '%"
 "s'."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\"> Ασύρματη Δίκτυο</span> ο or είναι."
+"<span weight=\"bold\" size=\"larger\">Απαιτείται κωδική φράση από το "
+"ασύρματο δίκτυο</span>\n"
+"\n"
+"Μια κωδική φράση ή κλειδί κρυπτογράφησης απαιτείται για σύνδεση στο ασύρματο "
+"δίκτυο '%s'."
 
-#: ../src/applet.glade.h:8
-#, fuzzy, 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\"> Δίκτυο</span> ο ο not."
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Μειωμένη λειτουργικότητα δικτύου</"
+"span>\n"
+"\n"
+"Το %s  δε θα είναι εντελώς λειτουργικό."
 
-#: ../src/applet.glade.h:12
+#: ../gnome/applet/applet.glade.h:12
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
@@ -529,264 +553,294 @@ 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\">Επιβεβάιωση σύνδεσης σε ασύρματο "
+"<span weight=\"bold\" size=\"larger\">Επιβεβαίωση σύνδεσης σε ασύρματο "
 "δίκτυο</span>\n"
 "\n"
-"Επιλέξατε να συνδεθείτε με το ασύρματο δίκτυο '%s'.  Αν είστε σίγουροιότι "
-"αυτό το ασύρματο δίκτυο είναι ασφαλές, πατήστε το παρακάτωκουτί ελέγχου και "
+"Επιλέξατε να συνδεθείτε με το ασύρματο δίκτυο '%s'.  Αν είστε σίγουροι ότι "
+"αυτό το ασύρματο δίκτυο είναι ασφαλές, πατήστε το παρακάτω κουτί ελέγχου και "
 "ο NetworkManager δεν θα απαιτεί επιβεβαίωση στις επόμενες συνδέσεις σας."
 
-#: ../src/applet.glade.h:15
+#: ../gnome/applet/applet.glade.h:15
 msgid "Anonymous Identity:"
-msgstr ""
+msgstr "Ανώνυμη ταυτότητα:"
 
-#: ../src/applet.glade.h:16
-#, fuzzy
+#: ../gnome/applet/applet.glade.h:16
 msgid "Authentication:"
-msgstr "Προσανατολισμός"
+msgstr "Πιστοποίηση:"
 
-#: ../src/applet.glade.h:17
-#, fuzzy
+#: ../gnome/applet/applet.glade.h:17
 msgid "Broadcast Address:"
-msgstr "Μετάδοση Διεύθυνση:"
+msgstr "Διεύθυνση μετάδοσης:"
 
-#: ../src/applet.glade.h:18
+#: ../gnome/applet/applet.glade.h:18
 msgid "CA Certificate File:"
-msgstr ""
+msgstr "Αρχείο πιστοποίησης CA:"
 
-#: ../src/applet.glade.h:19
+#: ../gnome/applet/applet.glade.h:19
 msgid "C_onnect"
 msgstr "Σύν_δεση"
 
-#: ../src/applet.glade.h:20
+#: ../gnome/applet/applet.glade.h:20
 msgid "Client Certificate File:"
-msgstr ""
+msgstr "Αρχείο πιστοποίησης χρήστη:"
 
-#: ../src/applet.glade.h:21
+#: ../gnome/applet/applet.glade.h:21
 msgid "Connection Information"
 msgstr "Πληροφορίες σύνδεσης"
 
-#: ../src/applet.glade.h:22
+#: ../gnome/applet/applet.glade.h:22
 msgid "Default Route:"
-msgstr ""
+msgstr "Προεπιλεγμένη διαδρομή:"
 
-#: ../src/applet.glade.h:23
+#: ../gnome/applet/applet.glade.h:23
 msgid "Destination Address:"
 msgstr " Διεύθυνση προορισμού:"
 
-#: ../src/applet.glade.h:24
+#: ../gnome/applet/applet.glade.h:24
 msgid "Driver:"
-msgstr ""
+msgstr "Οδηγός:"
 
-#: ../src/applet.glade.h:25
+#: ../gnome/applet/applet.glade.h:25
 msgid "EAP Method:"
-msgstr ""
+msgstr "Μέθοδος EAP:"
 
-#: ../src/applet.glade.h:26
+#: ../gnome/applet/applet.glade.h:26
 msgid "Hardware Address:"
 msgstr "Διεύθυνση υλικού:"
 
-#: ../src/applet.glade.h:27
+#: ../gnome/applet/applet.glade.h:27
 msgid "IP Address:"
 msgstr "Διεύθυνση IP:"
 
-#: ../src/applet.glade.h:28
+#: ../gnome/applet/applet.glade.h:28
 msgid "Identity:"
-msgstr ""
+msgstr "Ταυτότητα:"
 
-#: ../src/applet.glade.h:29
+#: ../gnome/applet/applet.glade.h:29
 msgid "Interface:"
 msgstr "Διεπαφή:"
 
-#: ../src/applet.glade.h:30
-#, fuzzy
+#: ../gnome/applet/applet.glade.h:30
 msgid "Key Type:"
-msgstr "Κατά Είδος"
+msgstr "Είδος κλειδιού:"
 
-#: ../src/applet.glade.h:31
-#, fuzzy
+#: ../gnome/applet/applet.glade.h:31
+msgid "Key management:"
+msgstr "Διαχείριση κλειδιών"
+
+#: ../gnome/applet/applet.glade.h:32
 msgid "Key:"
-msgstr "Κλειδί Hex:"
+msgstr "Κλειδί:"
 
-#: ../src/applet.glade.h:32
+#: ../gnome/applet/applet.glade.h:33
 msgid ""
 "None\n"
 "WEP 128-bit Passphrase\n"
 "WEP 64/128-bit Hex\n"
 "WEP 64/128-bit ASCII\n"
 msgstr ""
+"Κανένα\n"
+"WEP 128-bit Passphrase\n"
+"WEP 64/128-bit Hex\n"
+"WEP 64/128-bit ASCII\n"
 
-#: ../src/applet.glade.h:37
+#: ../gnome/applet/applet.glade.h:38
 msgid ""
 "Open System\n"
 "Shared Key"
 msgstr ""
+"Ανοικτό σύστημα\n"
+"Κοινόχρηστο κλειδί"
 
-#: ../src/applet.glade.h:39
+#: ../gnome/applet/applet.glade.h:40
 msgid "Other Wireless Network..."
 msgstr "Άλλο ασύρματο δίκτυο..."
 
-#: ../src/applet.glade.h:40
+#: ../gnome/applet/applet.glade.h:41
 msgid "Passphrase:"
 msgstr "Συνθηματικό:"
 
-#: ../src/applet.glade.h:41
+#: ../gnome/applet/applet.glade.h:42
 msgid "Password:"
-msgstr ""
+msgstr "Συνθηματικό:"
 
-#: ../src/applet.glade.h:42
+#: ../gnome/applet/applet.glade.h:43
 msgid "Primary DNS:"
-msgstr ""
+msgstr "Πρωτεύον DNS:"
 
-#: ../src/applet.glade.h:43
+#: ../gnome/applet/applet.glade.h:44
 msgid "Private Key File:"
-msgstr ""
+msgstr "Αρχείο προσωπικού κλειδιού:"
 
-#: ../src/applet.glade.h:44
+#: ../gnome/applet/applet.glade.h:45
 msgid "Private Key Password:"
-msgstr ""
+msgstr "Συνθηματικό προσωπικού κλειδιού:"
 
-#: ../src/applet.glade.h:45
+#: ../gnome/applet/applet.glade.h:46
 msgid "Secondary DNS:"
-msgstr ""
+msgstr "Δευτερεύον DNS:"
 
-#: ../src/applet.glade.h:46
+#: ../gnome/applet/applet.glade.h:47
 msgid "Select the CA Certificate File"
-msgstr ""
+msgstr "Επιλέξτε ένα αρχείο πιστοποίησης CA"
 
-#: ../src/applet.glade.h:47
+#: ../gnome/applet/applet.glade.h:48
 msgid "Select the Client Certificate File"
-msgstr ""
+msgstr "Επιλέξτε το αρχείο πιστοποίησης χρήστη"
 
-#: ../src/applet.glade.h:48
+#: ../gnome/applet/applet.glade.h:49
 msgid "Select the Private Key File"
-msgstr ""
+msgstr "Επιλέξτε το αρχείο προσωπικού κλειδιού"
 
-#: ../src/applet.glade.h:49
+#: ../gnome/applet/applet.glade.h:50
 msgid "Show key"
-msgstr ""
+msgstr "Εμφάνιση κλειδιού"
 
-#: ../src/applet.glade.h:50
-#, fuzzy
+#: ../gnome/applet/applet.glade.h:51
 msgid "Show passphrase"
-msgstr "Συνθηματικό:"
+msgstr "Εμφάνιση συνθηματικής φράσης"
 
-#: ../src/applet.glade.h:51
+#: ../gnome/applet/applet.glade.h:52
 msgid "Show password"
-msgstr ""
+msgstr "Εμφάνιση συνθηματικού"
 
-#: ../src/applet.glade.h:52
+#: ../gnome/applet/applet.glade.h:53
 msgid "Show passwords"
-msgstr ""
+msgstr "Εμφάνιση συνθηματικών"
 
-#: ../src/applet.glade.h:53
+#: ../gnome/applet/applet.glade.h:54
 msgid "Speed:"
-msgstr ""
+msgstr "Ταχύτητα:"
 
-#: ../src/applet.glade.h:54
-#, fuzzy
+#: ../gnome/applet/applet.glade.h:55
 msgid "Subnet Mask:"
-msgstr "Subnet Mask:"
+msgstr "Μάσκα υποδικτύου:"
 
-#: ../src/applet.glade.h:55
-#, fuzzy
+#: ../gnome/applet/applet.glade.h:56
 msgid "Type:"
-msgstr "Κατά Είδος"
+msgstr "Τύπος:"
 
-#: ../src/applet.glade.h:56
+#: ../gnome/applet/applet.glade.h:57
 msgid "User Name:"
-msgstr ""
+msgstr "Όνομα χρήστη:"
 
-#: ../src/applet.glade.h:57
-#, fuzzy
+#: ../gnome/applet/applet.glade.h:58
 msgid "Wireless Network Key Required"
-msgstr "Ασύρματη Δίκτυο Πλήκτρο"
+msgstr "Απαιτείται κλειδί ασύρματου δικτύου"
 
-#: ../src/applet.glade.h:58
+#: ../gnome/applet/applet.glade.h:59
 msgid "Wireless _adapter:"
 msgstr "Ασύρματος _προσαρμογέας:"
 
-#: ../src/applet.glade.h:59
-#, fuzzy
+#: ../gnome/applet/applet.glade.h:60
 msgid "_Always Trust this Wireless Network"
-msgstr "Να είναι πάντα έμπιστο αυτό το ασύρματο Δίκτυο"
+msgstr "Να είναι _πάντα έμπιστο αυτό το ασύρματο δίκτυο"
 
-#: ../src/applet.glade.h:60
-#, fuzzy
+#: ../gnome/applet/applet.glade.h:61
 msgid "_Don't remind me again"
-msgstr "Να μη γίνει υπενθύμιση ξανά"
+msgstr "Να _μη γίνει υπενθύμιση ξανά"
+
+#: ../gnome/applet/applet.glade.h:62
+msgid "_Fallback on this Network"
+msgstr "_Επιστροφή σε αυτό το δίκτυο"
 
-#: ../src/applet.glade.h:61
+#: ../gnome/applet/applet.glade.h:63
 msgid "_Login to Network"
-msgstr "_Είσοδος στο Δίκτυο"
+msgstr "_Είσοδος στο δίκτυο"
 
-#: ../src/applet.glade.h:62
+#: ../gnome/applet/applet.glade.h:64
 msgid "_Network Name:"
-msgstr ""
+msgstr "_Όνομα δικτύου:"
 
-#: ../src/applet.glade.h:63
-#, fuzzy
+#: ../gnome/applet/applet.glade.h:65
 msgid "_Wireless Security:"
-msgstr "Ασύρματος _προσαρμογέας:"
+msgstr "Ασ_φάλεια ασύρματου δικτύου:"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:383
+#: ../gnome/vpn-properties/nm-vpn-properties.c:417
 msgid "Cannot add VPN connection"
 msgstr "Αδυναμία προσθήκης σύνδεσης VPN"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:385
-#, fuzzy
+#: ../gnome/vpn-properties/nm-vpn-properties.c:419
 msgid ""
 "No suitable VPN software was found on your system. Contact your system "
 "administrator."
-msgstr "Όχι στο Επαφή."
+msgstr ""
+"Δε βρέθηκε κατάλληλο λογισμικό VPN στο σύστημα σας. Επικοινωνήστε με το "
+"διαχειριστή του συστήματος σας."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:437
+#: ../gnome/vpn-properties/nm-vpn-properties.c:461
 msgid "Cannot import VPN connection"
 msgstr "Αδυναμία εισαγωγής σύνδεσης VPN"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:439
-#, fuzzy, c-format
+#: ../gnome/vpn-properties/nm-vpn-properties.c:463
+#, c-format
 msgid ""
 "Cannot find suitable software for VPN connection type '%s' to import the "
 "file '%s'. Contact your system administrator."
-msgstr "εύρεση για είδος αρχείο Επαφή."
+msgstr ""
+"Δε βρέθηκε κατάλληλο λογισμικό για τη σύνδεση VPN τύπου '%s' για εισαγωγή "
+"του αρχείου '%s'. Επικοινωνήστε με το διαχειριστή του συστήματος σας."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:579
+#: ../gnome/vpn-properties/nm-vpn-properties.c:580
 #, c-format
 msgid "Error retrieving VPN connection '%s'"
 msgstr "Σφάλμα ανάκτησης σύνδεσης VPN '%s'"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:582
-#, fuzzy, c-format
+#: ../gnome/vpn-properties/nm-vpn-properties.c:583
+#, c-format
 msgid ""
 "Could not find the UI files for VPN connection type '%s'. Contact your "
 "system administrator."
-msgstr "not εύρεση για είδος Επαφή."
+msgstr ""
+"Δε βρέθηκαν τα αρχεία UI για σύνδεση VPN τύπου '%s'. Επικοινωνήστε με το "
+"διαχειριστή του συστήματος σας."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:739
+#: ../gnome/vpn-properties/nm-vpn-properties.c:727
 #, c-format
 msgid "Delete VPN connection \"%s\"?"
 msgstr "Διαγραφή σύνδεσης VPN \"%s\";"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:742
-#, fuzzy, c-format
+#: ../gnome/vpn-properties/nm-vpn-properties.c:730
+#, 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 "Όλα περί and a νέο."
+msgstr ""
+"Όλες οι πληροφορίες για τη σύνδεση VPN \"%s\" θα χαθούν και μπορεί να "
+"χρειαστεί ο διαχειριστής του συστήματος σας να δώσει πληροφορίες για τη "
+"δημιουργία νέας σύνδεσης."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:959
+#: ../gnome/vpn-properties/nm-vpn-properties.c:924
 msgid "Unable to load"
 msgstr "Αδυναμία φόρτωσης"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:961
-#, fuzzy
+#: ../gnome/vpn-properties/nm-vpn-properties.c:926
 msgid "Cannot find some needed resources (the glade file)!"
-msgstr "εύρεση αρχείο!"
+msgstr "Δε μπόρεσαν να βρεθούν οι απαραίτητοι πόροι (το αρχείο glade)!"
+
+#. druid_window = GTK_DIALOG (gtk_dialog_new_with_buttons (_("Create VPN Connection"),
+#. NULL,
+#. GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+#. GTK_STOCK_CANCEL,
+#. GTK_RESPONSE_REJECT,
+#. GTK_STOCK_APPLY,
+#. GTK_RESPONSE_ACCEPT,
+#. NULL));
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1081
+msgid "Create VPN Connection"
+msgstr "Δημιουργία σύνδεσης VPN"
 
+#. gtk_container_add (GTK_CONTAINER (druid_window->vbox), GTK_WIDGET(gtk_label_new("Some label")));
+#. gtk_box_pack_start (GTK_BOX (druid_window->vbox), GTK_WIDGET(druid), TRUE,TRUE,0);
+#. gtk_box_pack_start (GTK_BOX (druid_window->vbox), GTK_WIDGET(gtk_label_new("Some label")), TRUE,TRUE,0);
+#. toplevel = gtk_widget_get_toplevel (GTK_WIDGET (druid));
+#. gtk_signal_connect (GTK_OBJECT (toplevel), "delete_event", GTK_SIGNAL_FUNC (vpn_window_close), NULL);
+#. make the druid window modal wrt. our main window
+#. gtk_window_set_modal (druid_window, TRUE);
+#. gtk_window_set_transient_for (GTK_WINDOW(druid_window), GTK_WINDOW (dialog));
 #. Edit dialog
-#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1099
 msgid "Edit VPN Connection"
 msgstr "Επεξεργασία σύνδεσης VPN"
 
@@ -795,366 +849,160 @@ 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: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
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
 msgid "E_xport"
 msgstr "Ε_ξαγωγή"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:9
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
 msgid "Edit the selected VPN connection"
 msgstr "Επεξεργασία της επιλεγμένης σύνδεσης VPN"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:10
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
 msgid "Export the VPN settings to a file"
 msgstr "Εξαγωγή των ρυθμίσεων VPN σε ένα αρχείο"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:11
-#, fuzzy
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
 msgid "Export the selected VPN connection to a file"
-msgstr "Εξαγωγή σύνδεσης VPN σε αρχείο"
+msgstr "Εξαγωγή της επιλεγμένης σύνδεσης VPN σε ένα αρχείο"
 
-#: ../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
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
 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 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 "από a νέο a ο IP and."
+msgstr "Διαχείριση συνδέσεων εικονικών προσωπικών δικτύων (VPN)"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:17
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
 msgid "VPN Connections"
 msgstr "Συνδέσεις VPN"
 
 #: ../src/nm-ap-security-wep.c:52
 msgid "40-bit WEP"
-msgstr ""
+msgstr "40-bit WEP"
 
 #: ../src/nm-ap-security-wep.c:54
 msgid "104-bit WEP"
-msgstr ""
+msgstr "104-bit WEP"
 
-#: ../src/nm-ap-security-wpa-psk.c:50
+#: ../src/nm-ap-security-wpa-psk.c:51
 msgid "WPA TKIP"
-msgstr ""
+msgstr "WPA TKIP"
 
-#: ../src/nm-ap-security-wpa-psk.c:52
+#: ../src/nm-ap-security-wpa-psk.c:53
 msgid "WPA CCMP"
-msgstr ""
+msgstr "WPA CCMP"
 
-#: ../src/nm-ap-security-wpa-psk.c:54
+#: ../src/nm-ap-security-wpa-psk.c:55
 msgid "WPA Automatic"
-msgstr ""
+msgstr "Αυτόματο WPA"
 
-#: ../src/nm-ap-security-wpa-psk.c:59
+#: ../src/nm-ap-security-wpa-psk.c:60
 msgid "WPA2 TKIP"
-msgstr ""
+msgstr "WPA2 TKIP"
 
-#: ../src/nm-ap-security-wpa-psk.c:61
+#: ../src/nm-ap-security-wpa-psk.c:62
 msgid "WPA2 CCMP"
-msgstr ""
+msgstr "WPA2 CCMP"
 
-#: ../src/nm-ap-security-wpa-psk.c:63
+#: ../src/nm-ap-security-wpa-psk.c:64
 msgid "WPA2 Automatic"
-msgstr ""
+msgstr "Αυτόματο WPA2"
 
-#: ../src/nm-ap-security.c:320
+#: ../src/nm-ap-security.c:334
 msgid "none"
-msgstr ""
+msgstr "κανένα"
 
-#: ../src/nm-netlink-monitor.c:154
-#, fuzzy, c-format
+#: ../src/nm-netlink-monitor.c:174
+#, c-format
 msgid ""
 "unable to create netlink socket for monitoring wired ethernet devices - %s"
-msgstr "για"
+msgstr ""
+"αδυναμία δημιουργίας netlink socket για παρακολούθηση ενσύρματων συσκευών "
+"ethernet - %s"
 
-#: ../src/nm-netlink-monitor.c:172
-#, fuzzy, c-format
+#: ../src/nm-netlink-monitor.c:192
+#, c-format
 msgid ""
 "unable to bind to netlink socket for monitoring wired ethernet devices - %s"
-msgstr "για"
+msgstr ""
+"αδυναμία σύνδεσης με το netlink socket για παρακολούθηση ενσύρματων συσκευών "
+"ethernet - %s"
 
-#: ../src/nm-netlink-monitor.c:405
+#: ../src/nm-netlink-monitor.c:427
 msgid "operation took too long"
-msgstr "η λειτουργία πήρε πολύ χρόνο"
+msgstr "<η λειτουργία πήρε πολύ χρόνο"
 
-#: ../src/nm-netlink-monitor.c:502
-#, fuzzy
+#: ../src/nm-netlink-monitor.c:524
 msgid "received data from wrong type of sender"
-msgstr "είδος από"
+msgstr "έχουν ληφθεί δεδομένα από λανθασμένο τύπο αποστολέα"
 
-#: ../src/nm-netlink-monitor.c:515
+#: ../src/nm-netlink-monitor.c:537
 msgid "received data from unexpected sender"
 msgstr "λήψη δεδομένων από απρόσμενο αποστολές"
 
-#: ../src/nm-netlink-monitor.c:646
+#: ../src/nm-netlink-monitor.c:666
 msgid "too much data was sent over socket and some of it was lost"
 msgstr "στάλθηκαν πάρα πολλά δεδομένα στο socket και μερικά από αυτά χάθηκαν"
 
-#: ../src/nm-netlink-monitor.c:735
+#: ../src/nm-netlink-monitor.c:774
 msgid "error occurred while waiting for data on socket"
 msgstr "δημιουργήθηκε σφάλμα κατά την αναμονή για δεδομένα στο socket"
 
-#: ../src/applet-dbus-devices.c:898
-#, fuzzy, c-format
+#: ../gnome/applet/applet-dbus-devices.c:930
+#, c-format
 msgid "You are now connected to the Ad-Hoc wireless network '%s'."
-msgstr "Συνδεδεμένο"
+msgstr "Έχει γίνει σύνδεση στο Ad-Hoc ασύρματο δίκτυο '%s'."
 
-#: ../src/applet-dbus-devices.c:903
-#, fuzzy, c-format
+#: ../gnome/applet/applet-dbus-devices.c:935
+#, c-format
 msgid "You are now connected to the wireless network '%s'."
-msgstr "Η σύνδεση στο ασύρματο δίκτυο '%s' ολοκληρώνεται...."
+msgstr "Έχει γίνει σύνδεση στο ασύρματο δίκτυο '%s'."
 
-#: ../src/applet-dbus-devices.c:910
-#, fuzzy
+#: ../gnome/applet/applet-dbus-devices.c:942
 msgid "You are now connected to the wired network."
-msgstr "Η σύνδεση στο ενσύρματο δίκτυο ολοκληρώνεται..."
+msgstr "Έχει γίνει σύνδεση στο ενσύρματο δίκτυο."
 
-#: ../src/applet-dbus-devices.c:916
+#: ../gnome/applet/applet-dbus-devices.c:948
 msgid "Connection Established"
-msgstr ""
+msgstr "Η σύνδεση επιτεύχθηκε"
 
-#: ../src/applet-dbus-devices.c:959
-#, fuzzy
+#: ../gnome/applet/applet-dbus-devices.c:997
 msgid "Disconnected"
-msgstr "Αποσύνδεση VPN..."
+msgstr "Χωρίς σύνδεση"
 
-#: ../src/applet-dbus-devices.c:960
+#: ../gnome/applet/applet-dbus-devices.c:998
 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 "Ποτέ Αναζήτηση"
+msgstr "Έγινε αποσύνδεση από το δίκτυο."
 
-#~ msgid "Stop All Wireless Devices"
-#~ msgstr "Διακοπή Όλων Των Ασύρματων Συσκευών"
+#: ../src/nm-ap-security-leap.c:66 ../src/nm-ap-security-leap.c:82
+msgid "LEAP"
+msgstr "LEAP"
 
-#, fuzzy
-#~ msgid "_Passphrase:"
-#~ msgstr "Συνθηματικό:"
+#~ msgid "Choose which type of VPN connection you wish to create."
+#~ msgstr "Επιλέξτε ποιο τύπο σύνδεσης VPN επιθυμείτε να δημιουργήσετε."
 
-#, fuzzy
-#~ msgid "_ASCII Key:"
-#~ msgstr "Κλειδί Ascii:"
+#~ msgid "Connect to:"
+#~ msgstr "Σύνδεση σε:"
 
-#, fuzzy
-#~ msgid "_Hex Key:"
-#~ msgstr "Κλειδί Hex:"
+#~ msgid "Create VPN Connection - 1 of 2"
+#~ msgstr "Δημιουργία σύνδεσης VPN - 1 από 2"
 
-#, fuzzy
-#~ msgid ", with no encryption enabled."
-#~ msgstr "Σύνδεση με κρυπτογράφηση"
+#~ msgid "Create VPN Connection - 2 of 2"
+#~ msgstr "Δημιουργία σύνδεσης VPN - 2 από 2"
 
-#~ 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"
-#~ "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 "Finish Creating VPN Connection"
+#~ msgstr "Ολοκληρώθηκε η δημιουργία σύνδεσης VPN"
 
 #~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">VPN Login Message</span>\n"
-#~ "\n"
-#~ "VPN connection '%s' said:\n"
+#~ "This assistant will guide you through the creation of a connection to a "
+#~ "Virtual Private Network (VPN).\n"
 #~ "\n"
-#~ "\"%s\""
+#~ "It will require some information, such as IP addresses and secrets.  "
+#~ "Please see your system administrator to obtain this information."
 #~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Μήνυμα εισόδου VPN</span>\n"
-#~ "\n"
-#~ "Η σύνδεση VPN '%s' απάντησε:\n"
-#~ "\n"
-#~ "\"%s\""
-
-#~ msgid "Dial Up"
-#~ msgstr "Dial Up"
-
-#~ 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"
+#~ "Ο βοηθός θα σας οδηγήσει στη δημιουργία μιας σύνδεσης σε ένα Προσωπικό "
+#~ "ασύρματο δίκτυο (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."
-#~ msgstr "από a νέο a ο IP and."
+#~ "Θα χρειαστεί κάποιες πληροφορίες, όπως διευθύνσεις IP και μυστικά.  "
+#~ "Παρακαλώ δείτε το διαχειριστή του συστήματος σας για να αποκτήσετε αυτές "
+#~ "τις πληροφορίες."
diff --git a/po/en_CA.po b/po/en_CA.po
index 2867f475..85215f25 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-05-29 18:33+0200\n"
+"POT-Creation-Date: 2006-01-31 21:00-0500\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,74 +17,78 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../src/applet-compat.c:171 ../src/applet-dbus-info.c:919
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:923
 #, c-format
 msgid "Passphrase for wireless network %s"
 msgstr "Passphrase for wireless network %s"
 
-#: ../src/applet-dbus.c:265
+#: ../gnome/applet/applet-dbus.c:244
 #, c-format
 msgid "Connection to the wireless network '%s' failed."
 msgstr "Connection to the wireless network '%s' failed."
 
-#: ../src/applet-dbus.c:270
+#: ../gnome/applet/applet-dbus.c:249
 msgid "Connection to the wired network failed."
 msgstr "Connection to the wired network failed."
 
-#: ../src/applet.c:184
+#: ../gnome/applet/applet.c:179
 msgid "Error displaying connection information:"
 msgstr "Error displaying connection information:"
 
-#: ../src/applet.c:202
+#: ../gnome/applet/applet.c:196
 msgid "Could not find some required resources (the glade file)!"
 msgstr "Could not find some required resources (the glade file)!"
 
-#: ../src/applet.c:213
+#: ../gnome/applet/applet.c:207
 msgid "No active connections!"
 msgstr "No active connections!"
 
-#: ../src/applet.c:234
+#: ../gnome/applet/applet.c:224
 #, c-format
 msgid "Wired Ethernet (%s)"
 msgstr "Wired Ethernet (%s)"
 
-#: ../src/applet.c:236
+#: ../gnome/applet/applet.c:226
 #, c-format
 msgid "Wireless Ethernet (%s)"
 msgstr "Wireless Ethernet (%s)"
 
-#: ../src/applet.c:337 ../src/applet.c:362
+#: ../gnome/applet/applet.c:323 ../gnome/applet/applet.c:348
 msgid "NetworkManager Applet"
 msgstr "NetworkManager Applet"
 
-#: ../src/applet.c:339 ../src/applet.c:364
+#: ../gnome/applet/applet.c:325 ../gnome/applet/applet.c:350
 msgid "Copyright © 2004-2005 Red Hat, Inc."
 msgstr "Copyright © 2004-2005 Red Hat, Inc."
 
-#: ../src/applet.c:340 ../src/applet.c:365
+#: ../gnome/applet/applet.c:326 ../gnome/applet/applet.c:351
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Notification area applet for managing your network devices and connections."
 
-#: ../src/applet.c:343 ../src/applet.c:370
+#: ../gnome/applet/applet.c:329 ../gnome/applet/applet.c:356
 msgid "translator-credits"
 msgstr "Adam Weinberger <adamw@gnome.org>"
 
-#: ../src/applet.c:426
+#: ../gnome/applet/applet.c:441
+msgid "VPN Error"
+msgstr "VPN Error"
+
+#: ../gnome/applet/applet.c:445
 msgid "VPN Login Failure"
 msgstr "VPN Login Failure"
 
-#: ../src/applet.c:427
+#: ../gnome/applet/applet.c:446
 #, 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."
 
-#: ../src/applet.c:431
+#: ../gnome/applet/applet.c:450
 msgid "VPN Start Failure"
 msgstr "VPN Start Failure"
 
-#: ../src/applet.c:432
+#: ../gnome/applet/applet.c:451
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
@@ -93,25 +97,25 @@ msgstr ""
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
 "program."
 
-#: ../src/applet.c:436 ../src/applet.c:446
+#: ../gnome/applet/applet.c:455 ../gnome/applet/applet.c:465
 msgid "VPN Connect Failure"
 msgstr "VPN Connect Failure"
 
-#: ../src/applet.c:437
+#: ../gnome/applet/applet.c:456
 #, 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."
 
-#: ../src/applet.c:441
+#: ../gnome/applet/applet.c:460
 msgid "VPN Configuration Error"
 msgstr "VPN Configuration Error"
 
-#: ../src/applet.c:442
+#: ../gnome/applet/applet.c:461
 #, c-format
 msgid "The VPN connection '%s' was not correctly configured."
 msgstr "The VPN connection '%s' was not correctly configured."
 
-#: ../src/applet.c:447
+#: ../gnome/applet/applet.c:466
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' because the VPN server did not "
@@ -120,13 +124,23 @@ msgstr ""
 "Could not start the VPN connection '%s' because the VPN server did not "
 "return an adequate network configuration."
 
-#: ../src/applet.c:517
+#: ../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
 msgid "VPN Login Message"
 msgstr "VPN Login Message"
 
-#: ../src/applet.c:741 ../src/applet.c:2508
-#: ../src/other-network-dialog.c:453
-#: ../src/passphrase-dialog.c:228
+#: ../gnome/applet/applet.c:762 ../gnome/applet/applet.c:2516
+#: ../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)."
@@ -134,163 +148,163 @@ msgstr ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
 
-#: ../src/applet.c:753
+#: ../gnome/applet/applet.c:774
 #, c-format
 msgid "The network device \"%s (%s)\" does not support wireless scanning."
 msgstr "The network device \"%s (%s)\" does not support wireless scanning."
 
-#: ../src/applet.c:761
+#: ../gnome/applet/applet.c:782
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
 msgstr "The network device \"%s (%s)\" does not support link detection."
 
-#: ../src/applet.c:908
+#: ../gnome/applet/applet.c:929
 #, c-format
 msgid "Preparing device %s for the wired network..."
 msgstr "Preparing device %s for the wired network..."
 
-#: ../src/applet.c:910
+#: ../gnome/applet/applet.c:931
 #, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
 msgstr "Preparing device %s for the wireless network '%s'..."
 
-#: ../src/applet.c:918
+#: ../gnome/applet/applet.c:939
 #, c-format
 msgid "Configuring device %s for the wired network..."
 msgstr "Configuring device %s for the wired network..."
 
-#: ../src/applet.c:920
+#: ../gnome/applet/applet.c:941
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
 msgstr "Attempting to join the wireless network '%s'..."
 
-#: ../src/applet.c:928
+#: ../gnome/applet/applet.c:949
 #, c-format
 msgid "Waiting for Network Key for the wireless network '%s'..."
 msgstr "Waiting for Network Key for the wireless network '%s'..."
 
-#: ../src/applet.c:936 ../src/applet.c:946
+#: ../gnome/applet/applet.c:957 ../gnome/applet/applet.c:967
 msgid "Requesting a network address from the wired network..."
 msgstr "Requesting a network address from the wired network..."
 
-#: ../src/applet.c:938 ../src/applet.c:948
+#: ../gnome/applet/applet.c:959 ../gnome/applet/applet.c:969
 #, c-format
 msgid "Requesting a network address from the wireless network '%s'..."
 msgstr "Requesting a network address from the wireless network '%s'..."
 
-#: ../src/applet.c:956
+#: ../gnome/applet/applet.c:977
 msgid "Finishing connection to the wired network..."
 msgstr "Finishing connection to the wired network..."
 
-#: ../src/applet.c:958
+#: ../gnome/applet/applet.c:979
 #, c-format
 msgid "Finishing connection to the wireless network '%s'..."
 msgstr "Finishing connection to the wireless network '%s'..."
 
-#: ../src/applet.c:1075
+#: ../gnome/applet/applet.c:1096
 msgid "NetworkManager is not running"
 msgstr "NetworkManager is not running"
 
-#: ../src/applet.c:1083 ../src/applet.c:1828
+#: ../gnome/applet/applet.c:1109 ../gnome/applet/applet.c:1843
 msgid "Networking disabled"
 msgstr "Networking disabled"
 
-#: ../src/applet.c:1088
+#: ../gnome/applet/applet.c:1114
 msgid "No network connection"
 msgstr "No network connection"
 
-#: ../src/applet.c:1093
+#: ../gnome/applet/applet.c:1119
 msgid "Wired network connection"
 msgstr "Wired network connection"
 
-#: ../src/applet.c:1097
+#: ../gnome/applet/applet.c:1123
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Connected to an Ad-Hoc wireless network"
 
-#: ../src/applet.c:1099
+#: ../gnome/applet/applet.c:1125
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "Wireless network connection to '%s' (%d%%)"
 
-#: ../src/applet.c:1120
+#: ../gnome/applet/applet.c:1147
 #, c-format
 msgid "VPN connection to '%s'"
 msgstr "VPN connection to '%s'"
 
-#: ../src/applet.c:1128
+#: ../gnome/applet/applet.c:1155
 #, c-format
 msgid "VPN connecting to '%s'"
 msgstr "VPN connecting to '%s'"
 
-#: ../src/applet.c:1541
+#: ../gnome/applet/applet.c:1568
 msgid "_Connect to Other Wireless Network..."
 msgstr "_Connect to Other Wireless Network..."
 
-#: ../src/applet.c:1562
+#: ../gnome/applet/applet.c:1589
 msgid "Create _New Wireless Network..."
 msgstr "Create _New Wireless Network..."
 
-#: ../src/applet.c:1685
+#: ../gnome/applet/applet.c:1710
 msgid "_VPN Connections"
 msgstr "_VPN Connections"
 
-#: ../src/applet.c:1730
+#: ../gnome/applet/applet.c:1745
 msgid "_Configure VPN..."
 msgstr "_Configure VPN..."
 
-#: ../src/applet.c:1734
+#: ../gnome/applet/applet.c:1749
 msgid "_Disconnect VPN..."
 msgstr "_Disconnect VPN..."
 
-#: ../src/applet.c:1756
+#: ../gnome/applet/applet.c:1771
 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
-#: ../src/applet.c:1767
+#: ../gnome/applet/applet.c:1782
 #, c-format
 msgid "Connect to %s..."
 msgstr "Connect to %s..."
 
-#: ../src/applet.c:1773
+#: ../gnome/applet/applet.c:1788
 #, c-format
 msgid "Disconnect from %s..."
 msgstr "Disconnect from %s..."
 
-#: ../src/applet.c:1822
+#: ../gnome/applet/applet.c:1837
 msgid "No network devices have been found"
 msgstr "No network devices have been found"
 
-#: ../src/applet.c:2014
+#: ../gnome/applet/applet.c:2029
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager is not running..."
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2170
+#: ../gnome/applet/applet.c:2185
 msgid "Enable _Networking"
 msgstr "Enable _Networking"
 
 #. 'Enable Wireless' item
-#: ../src/applet.c:2176
+#: ../gnome/applet/applet.c:2191
 msgid "Enable _Wireless"
 msgstr "Enable _Wireless"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2182
+#: ../gnome/applet/applet.c:2197
 msgid "Connection _Information"
 msgstr "Connection _Information"
 
 #. Help item
-#: ../src/applet.c:2193
+#: ../gnome/applet/applet.c:2208
 msgid "_Help"
 msgstr "_Help"
 
 #. About item
-#: ../src/applet.c:2202
+#: ../gnome/applet/applet.c:2217
 msgid "_About"
 msgstr "_About"
 
-#: ../src/applet.c:2667
+#: ../gnome/applet/applet.c:2635
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
@@ -298,114 +312,77 @@ msgstr ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
 
-#: ../src/wireless-security-option.c:157
+#: ../gnome/applet/wireless-security-option.c:157
 msgid "Open System"
 msgstr "Open System"
 
-#: ../src/wireless-security-option.c:160
+#: ../gnome/applet/wireless-security-option.c:160
 msgid "Shared Key"
 msgstr "Shared Key"
 
-#: ../src/wireless-security-option.c:208
+#: ../gnome/applet/wireless-security-option.c:209
 msgid "Automatic (Default)"
 msgstr "Automatic (Default)"
 
-#: ../src/wireless-security-option.c:215
-msgid "AES-CCMP"
-msgstr "AES-CCMP"
-
-#: ../src/wireless-security-option.c:223
+#: ../gnome/applet/wireless-security-option.c:217
 msgid "TKIP"
 msgstr "TKIP"
 
-#: ../src/wireless-security-option.c:231
-msgid "Dynamic WEP"
-msgstr ""
+#: ../gnome/applet/wireless-security-option.c:225
+msgid "AES-CCMP"
+msgstr "AES-CCMP"
 
-#: ../src/wso-none.c:53
+#: ../gnome/applet/wso-none.c:53
 msgid "None"
 msgstr "None"
 
-#: ../src/wso-wep-ascii.c:138
-#, fuzzy
-msgid "WEP 64/128-bit ASCII"
+#: ../gnome/applet/wso-wep-ascii.c:127
+msgid "WEP 40/128-bit ASCII"
 msgstr "WEP 40/128-bit ASCII"
 
-#: ../src/wso-wep-hex.c:135
-#, fuzzy
-msgid "WEP 64/128-bit Hex"
+#: ../gnome/applet/wso-wep-hex.c:124
+msgid "WEP 40/128-bit hex"
 msgstr "WEP 40/128-bit hex"
 
-#: ../src/wso-wep-passphrase.c:135
-#, fuzzy
-msgid "WEP 128-bit Passphrase"
+#: ../gnome/applet/wso-wep-passphrase.c:124
+msgid "WEP Passphrase"
 msgstr "WEP Passphrase"
 
-#: ../src/wso-wpa-eap.c:237
-msgid "PEAP"
-msgstr ""
-
-#: ../src/wso-wpa-eap.c:238
-msgid "TLS"
-msgstr ""
-
-#: ../src/wso-wpa-eap.c:239
-msgid "TTLS"
-msgstr ""
-
-#: ../src/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 ""
-
-#: ../src/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 ""
-
-#: ../src/wso-wpa-psk.c:178
-msgid "WPA2 Personal"
-msgstr "WPA2 Personal"
-
-#: ../src/wso-wpa-psk.c:180
-msgid "WPA Personal"
-msgstr "WPA Personal"
-
-#: ../src/eggtrayicon.c:134
+#: ../gnome/applet/eggtrayicon.c:128
 msgid "Orientation"
 msgstr "Orientation"
 
-#: ../src/eggtrayicon.c:135
+#: ../gnome/applet/eggtrayicon.c:129
 msgid "The orientation of the tray."
 msgstr "The orientation of the tray."
 
-#: ../src/menu-items.c:88
+#: ../gnome/applet/menu-items.c:87
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Wired Network (%s)"
 
-#: ../src/menu-items.c:91
+#: ../gnome/applet/menu-items.c:90
 msgid "_Wired Network"
 msgstr "_Wired Network"
 
-#: ../src/menu-items.c:162
+#: ../gnome/applet/menu-items.c:161
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
 msgstr[0] "Wireless Network (%s)"
 msgstr[1] "Wireless Networks (%s)"
 
-#: ../src/menu-items.c:164
+#: ../gnome/applet/menu-items.c:163
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Wireless Network"
 msgstr[1] "Wireless Networks"
 
-#: ../src/menu-items.c:343
+#: ../gnome/applet/menu-items.c:330
 msgid " (invalid Unicode)"
 msgstr " (invalid Unicode)"
 
-#: ../src/other-network-dialog.c:352
+#: ../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, "
@@ -414,11 +391,11 @@ msgstr ""
 "By default, the wireless network's name is set to your computer's name, %s, "
 "with no encryption enabled"
 
-#: ../src/other-network-dialog.c:358
+#: ../gnome/applet/other-network-dialog.c:358
 msgid "Create new wireless network"
 msgstr "Create new wireless network"
 
-#: ../src/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."
@@ -426,27 +403,27 @@ msgstr ""
 "Enter the name and security settings of the wireless network you wish to "
 "create."
 
-#: ../src/other-network-dialog.c:363
+#: ../gnome/applet/other-network-dialog.c:363
 msgid "Create New Wireless Network"
 msgstr "Create New Wireless Network"
 
-#: ../src/other-network-dialog.c:368
+#: ../gnome/applet/other-network-dialog.c:368
 msgid "Existing wireless network"
 msgstr "Existing wireless network"
 
-#: ../src/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 "Enter the name of the wireless network to which you wish to connect."
 
-#: ../src/other-network-dialog.c:371
+#: ../gnome/applet/other-network-dialog.c:371
 msgid "Connect to Other Wireless Network"
 msgstr "Connect to Other Wireless Network"
 
-#: ../src/passphrase-dialog.c:215
+#: ../gnome/applet/passphrase-dialog.c:214
 msgid "Error connecting to wireless network"
 msgstr "Error connecting to wireless network"
 
-#: ../src/passphrase-dialog.c:216
+#: ../gnome/applet/passphrase-dialog.c:215
 msgid ""
 "The requested wireless network requires security capabilities unsupported by "
 "your hardware."
@@ -454,13 +431,13 @@ msgstr ""
 "The requested wireless network requires security capabilities unsupported by "
 "your hardware."
 
-#: ../src/vpn-password-dialog.c:151
-#: ../src/vpn-password-dialog.c:188
+#: ../gnome/applet/vpn-password-dialog.c:152
+#: ../gnome/applet/vpn-password-dialog.c:189
 #, c-format
 msgid "Cannot start VPN connection '%s'"
 msgstr "Cannot start VPN connection '%s'"
 
-#: ../src/vpn-password-dialog.c:154
+#: ../gnome/applet/vpn-password-dialog.c:155
 #, c-format
 msgid ""
 "Could not find the authentication dialog for VPN connection type '%s'. "
@@ -469,7 +446,7 @@ msgstr ""
 "Could not find the authentication dialogue for VPN connection type '%s'. "
 "Contact your system administrator."
 
-#: ../src/vpn-password-dialog.c:191
+#: ../gnome/applet/vpn-password-dialog.c:192
 #, c-format
 msgid ""
 "There was a problem launching the authentication dialog for VPN connection "
@@ -478,17 +455,17 @@ msgstr ""
 "There was a problem launching the authentication dialogue for VPN connection "
 "type '%s'. Contact your system administrator."
 
-#: ../src/applet.glade.h:1
+#: ../gnome/applet/applet.glade.h:1
 msgid " "
 msgstr " "
 
-#: ../src/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\">Active Connection Information</span>"
 
-#: ../src/applet.glade.h:4
+#: ../gnome/applet/applet.glade.h:4
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
@@ -503,7 +480,7 @@ msgstr ""
 "A passphrase or encryption key is required to access the wireless network '%"
 "s'."
 
-#: ../src/applet.glade.h:8
+#: ../gnome/applet/applet.glade.h:8
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
@@ -514,7 +491,7 @@ msgstr ""
 "\n"
 "%s  It will not be completely functional."
 
-#: ../src/applet.glade.h:12
+#: ../gnome/applet/applet.glade.h:12
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
@@ -531,89 +508,63 @@ msgstr ""
 "that this wireless network is secure, click the checkbox below and "
 "NetworkManager will not require confirmation on subsequent logins."
 
-#: ../src/applet.glade.h:15
-msgid "Anonymous Identity:"
-msgstr ""
-
-#: ../src/applet.glade.h:16
+#: ../gnome/applet/applet.glade.h:15
 msgid "Authentication:"
 msgstr "Authentication:"
 
-#: ../src/applet.glade.h:17
+#: ../gnome/applet/applet.glade.h:16
 msgid "Broadcast Address:"
 msgstr "Broadcast Address:"
 
-#: ../src/applet.glade.h:18
-msgid "CA Certificate File:"
-msgstr ""
-
-#: ../src/applet.glade.h:19
+#: ../gnome/applet/applet.glade.h:17
 msgid "C_onnect"
 msgstr "C_onnect"
 
-#: ../src/applet.glade.h:20
-msgid "Client Certificate File:"
-msgstr ""
-
-#: ../src/applet.glade.h:21
+#: ../gnome/applet/applet.glade.h:18
 msgid "Connection Information"
 msgstr "Connection Information"
 
-#: ../src/applet.glade.h:22
+#: ../gnome/applet/applet.glade.h:19
 msgid "Default Route:"
 msgstr "Default Route:"
 
-#: ../src/applet.glade.h:23
+#: ../gnome/applet/applet.glade.h:20
 msgid "Destination Address:"
 msgstr "Destination Address:"
 
-#: ../src/applet.glade.h:24
+#: ../gnome/applet/applet.glade.h:21
 msgid "Driver:"
 msgstr "Driver:"
 
-#: ../src/applet.glade.h:25
-msgid "EAP Method:"
-msgstr ""
-
-#: ../src/applet.glade.h:26
+#: ../gnome/applet/applet.glade.h:22
 msgid "Hardware Address:"
 msgstr "Hardware Address:"
 
-#: ../src/applet.glade.h:27
+#: ../gnome/applet/applet.glade.h:23
 msgid "IP Address:"
 msgstr "IP Address:"
 
-#: ../src/applet.glade.h:28
-msgid "Identity:"
-msgstr ""
-
-#: ../src/applet.glade.h:29
+#: ../gnome/applet/applet.glade.h:24
 msgid "Interface:"
 msgstr "Interface:"
 
-#: ../src/applet.glade.h:30
-#, fuzzy
-msgid "Key Type:"
-msgstr "Type:"
-
-#: ../src/applet.glade.h:31
+#: ../gnome/applet/applet.glade.h:25
 msgid "Key:"
 msgstr "Key:"
 
-#: ../src/applet.glade.h:32
-#, fuzzy
+#: ../gnome/applet/applet.glade.h:26
 msgid ""
 "None\n"
-"WEP 128-bit Passphrase\n"
-"WEP 64/128-bit Hex\n"
-"WEP 64/128-bit ASCII\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"
 
-#: ../src/applet.glade.h:37
+#: ../gnome/applet/applet.glade.h:31
 msgid ""
 "Open System\n"
 "Shared Key"
@@ -621,114 +572,95 @@ msgstr ""
 "Open System\n"
 "Shared Key"
 
-#: ../src/applet.glade.h:39
+#: ../gnome/applet/applet.glade.h:33
 msgid "Other Wireless Network..."
 msgstr "Other Wireless Network..."
 
-#: ../src/applet.glade.h:40
+#: ../gnome/applet/applet.glade.h:34
 msgid "Passphrase:"
 msgstr "Passphrase:"
 
-#: ../src/applet.glade.h:41
+#: ../gnome/applet/applet.glade.h:35
 msgid "Password:"
 msgstr "Password:"
 
-#: ../src/applet.glade.h:42
+#: ../gnome/applet/applet.glade.h:36
 msgid "Primary DNS:"
 msgstr "Primary DNS:"
 
-#: ../src/applet.glade.h:43
-msgid "Private Key File:"
-msgstr ""
-
-#: ../src/applet.glade.h:44
-msgid "Private Key Password:"
-msgstr ""
-
-#: ../src/applet.glade.h:45
+#: ../gnome/applet/applet.glade.h:37
 msgid "Secondary DNS:"
 msgstr "Secondary DNS:"
 
-#: ../src/applet.glade.h:46
-msgid "Select the CA Certificate File"
-msgstr ""
-
-#: ../src/applet.glade.h:47
-msgid "Select the Client Certificate File"
-msgstr ""
-
-#: ../src/applet.glade.h:48
-msgid "Select the Private Key File"
-msgstr ""
-
-#: ../src/applet.glade.h:49
-msgid "Show key"
-msgstr ""
-
-#: ../src/applet.glade.h:50
-#, fuzzy
-msgid "Show passphrase"
-msgstr "Passphrase:"
-
-#: ../src/applet.glade.h:51
-#, fuzzy
-msgid "Show password"
-msgstr "Password:"
-
-#: ../src/applet.glade.h:52
-#, fuzzy
-msgid "Show passwords"
-msgstr "Password:"
-
-#: ../src/applet.glade.h:53
-msgid "Speed:"
-msgstr ""
-
-#: ../src/applet.glade.h:54
+#: ../gnome/applet/applet.glade.h:38
 msgid "Subnet Mask:"
 msgstr "Subnet Mask:"
 
-#: ../src/applet.glade.h:55
+#: ../gnome/applet/applet.glade.h:39
 msgid "Type:"
 msgstr "Type:"
 
-#: ../src/applet.glade.h:56
+#: ../gnome/applet/applet.glade.h:40
 msgid "User Name:"
 msgstr "User Name:"
 
-#: ../src/applet.glade.h:57
+#: ../gnome/applet/applet.glade.h:41
 msgid "Wireless Network Key Required"
 msgstr "Wireless Network Key Required"
 
-#: ../src/applet.glade.h:58
+#: ../gnome/applet/applet.glade.h:42
 msgid "Wireless _adapter:"
 msgstr "Wireless _adapter:"
 
-#: ../src/applet.glade.h:59
+#: ../gnome/applet/applet.glade.h:43
 msgid "_Always Trust this Wireless Network"
 msgstr "_Always Trust this Wireless Network"
 
-#: ../src/applet.glade.h:60
+#: ../gnome/applet/applet.glade.h:44
 msgid "_Don't remind me again"
 msgstr "_Do not remind me again"
 
-#: ../src/applet.glade.h:61
+#: ../gnome/applet/applet.glade.h:45
 msgid "_Login to Network"
 msgstr "_Login to Network"
 
-#: ../src/applet.glade.h:62
+#: ../gnome/applet/applet.glade.h:46
 msgid "_Network Name:"
 msgstr "_Network Name:"
 
-#: ../src/applet.glade.h:63
+#: ../gnome/applet/applet.glade.h:47
 msgid "_Wireless Security:"
 msgstr "_Wireless Security:"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:383
+#: ../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
 msgid "Cannot add VPN connection"
 msgstr "Cannot add VPN connection"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:385
+#: ../gnome/vpn-properties/nm-vpn-properties.c:360
 msgid ""
 "No suitable VPN software was found on your system. Contact your system "
 "administrator."
@@ -736,11 +668,11 @@ msgstr ""
 "No suitable VPN software was found on your system. Contact your system "
 "administrator."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:437
+#: ../gnome/vpn-properties/nm-vpn-properties.c:412
 msgid "Cannot import VPN connection"
 msgstr "Cannot import VPN connection"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:439
+#: ../gnome/vpn-properties/nm-vpn-properties.c:414
 #, c-format
 msgid ""
 "Cannot find suitable software for VPN connection type '%s' to import the "
@@ -749,12 +681,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:579
+#: ../gnome/vpn-properties/nm-vpn-properties.c:554
 #, c-format
 msgid "Error retrieving VPN connection '%s'"
 msgstr "Error retrieving VPN connection '%s'"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:582
+#: ../gnome/vpn-properties/nm-vpn-properties.c:557
 #, c-format
 msgid ""
 "Could not find the UI files for VPN connection type '%s'. Contact your "
@@ -763,12 +695,12 @@ msgstr ""
 "Could not find the UI files for VPN connection type '%s'. Contact your "
 "system administrator."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:739
+#: ../gnome/vpn-properties/nm-vpn-properties.c:717
 #, c-format
 msgid "Delete VPN connection \"%s\"?"
 msgstr "Delete VPN connection \"%s\"?"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:742
+#: ../gnome/vpn-properties/nm-vpn-properties.c:720
 #, c-format
 msgid ""
 "All information about the VPN connection \"%s\" will be lost and you may "
@@ -779,16 +711,16 @@ msgstr ""
 "need your system administrator to provide information to create a new "
 "connection."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:959
+#: ../gnome/vpn-properties/nm-vpn-properties.c:926
 msgid "Unable to load"
 msgstr "Unable to load"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:961
+#: ../gnome/vpn-properties/nm-vpn-properties.c:928
 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:1071
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1043
 msgid "Edit VPN Connection"
 msgstr "Edit VPN Connection"
 
@@ -862,11 +794,11 @@ msgstr ""
 msgid "VPN Connections"
 msgstr "VPN Connections"
 
-#: ../src/nm-ap-security-wep.c:52
+#: ../src/nm-ap-security-wep.c:47
 msgid "40-bit WEP"
 msgstr "40-bit WEP"
 
-#: ../src/nm-ap-security-wep.c:54
+#: ../src/nm-ap-security-wep.c:49
 msgid "104-bit WEP"
 msgstr "104-bit WEP"
 
@@ -894,7 +826,7 @@ msgstr "WPA2 CCMP"
 msgid "WPA2 Automatic"
 msgstr "WPA2 Automatic"
 
-#: ../src/nm-ap-security.c:320
+#: ../src/nm-ap-security.c:310
 msgid "none"
 msgstr "none"
 
@@ -931,72 +863,3 @@ 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"
-
-#: ../src/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"
-
-#: ../src/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'..."
-
-#: ../src/applet-dbus-devices.c:910
-#, fuzzy
-msgid "You are now connected to the wired network."
-msgstr "Finishing connection to the wired network..."
-
-#: ../src/applet-dbus-devices.c:916
-msgid "Connection Established"
-msgstr ""
-
-#: ../src/applet-dbus-devices.c:959
-#, fuzzy
-msgid "Disconnected"
-msgstr "_Disconnect VPN..."
-
-#: ../src/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 bf6e48de..e62a88fd 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -5,11 +5,11 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: NetworkManager \n"
+"Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: \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"
+"POT-Creation-Date: 2007-01-01 21:30+0000\n"
+"PO-Revision-Date: 2006-12-28 18:52-0000\n"
+"Last-Translator: David Lodge <dave@cirt.net>\n"
 "Language-Team: English (British) <en@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,80 +17,96 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #
-#: ../src/applet-compat.c:171 ../src/applet-dbus-info.c:919
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:926
 #, c-format
 msgid "Passphrase for wireless network %s"
 msgstr "Passphrase for wireless network %s"
 
 #
-#: ../src/applet-dbus.c:265
+#: ../gnome/applet/applet-dbus.c:274
 #, c-format
 msgid "Connection to the wireless network '%s' failed."
 msgstr "Connection to the wireless network '%s' failed."
 
-#: ../src/applet-dbus.c:270
+#: ../gnome/applet/applet-dbus.c:279
 msgid "Connection to the wired network failed."
 msgstr "Connection to the wired network failed."
 
-#: ../src/applet.c:184
-#, fuzzy
+#: ../gnome/applet/applet.c:182
 msgid "Error displaying connection information:"
-msgstr "Error displaying connection information: "
+msgstr "Error displaying connection information:"
 
-#: ../src/applet.c:202
-#, fuzzy
+#: ../gnome/applet/applet.c:200
 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)."
+msgstr "Could not find some required resources (the glade file)!"
 
-#: ../src/applet.c:213
+#: ../gnome/applet/applet.c:210
 msgid "No active connections!"
 msgstr "No active connections!"
 
-#: ../src/applet.c:234
-#, fuzzy, c-format
+#: ../gnome/applet/applet.c:227
+#, c-format
+msgid "%d Mb/s"
+msgstr "%d Mb/s"
+
+#: ../gnome/applet/applet.c:230
+#, c-format
 msgid "Wired Ethernet (%s)"
-msgstr "Wired Network (%s)"
+msgstr "Wired Ethernet (%s)"
 
-#: ../src/applet.c:236
-#, fuzzy, c-format
+#: ../gnome/applet/applet.c:232
+#, c-format
 msgid "Wireless Ethernet (%s)"
-msgstr "Wireless Network (%s)"
+msgstr "Wireless Ethernet (%s)"
+
+#: ../gnome/applet/applet.c:238
+msgid "Unknown"
+msgstr "Unknown"
 
-#: ../src/applet.c:337 ../src/applet.c:362
+#: ../gnome/applet/applet.c:330 ../gnome/applet/applet.c:357
 msgid "NetworkManager Applet"
 msgstr "NetworkManager Applet"
 
-#: ../src/applet.c:339 ../src/applet.c:364
-#, fuzzy
-msgid "Copyright © 2004-2005 Red Hat, Inc."
-msgstr "Copyright (C) 2004-2005 Red Hat, Inc."
+#: ../gnome/applet/applet.c:332
+msgid ""
+"Copyright © 2004-2006 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+msgstr ""
+"Copyright © 2004-2006 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
 
-#: ../src/applet.c:340 ../src/applet.c:365
+#: ../gnome/applet/applet.c:334 ../gnome/applet/applet.c:361
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Notification area applet for managing your network devices and connections."
 
-#: ../src/applet.c:343 ../src/applet.c:370
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:365
 msgid "translator-credits"
 msgstr "David Lodge <dave@cirt.net>James Ogley <james@usr-local-bin.org>"
 
-#: ../src/applet.c:426
+#: ../gnome/applet/applet.c:359
+msgid ""
+"Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+msgstr ""
+"Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+
+#: ../gnome/applet/applet.c:421
 msgid "VPN Login Failure"
 msgstr "VPN Login Failure"
 
-#: ../src/applet.c:427
+#: ../gnome/applet/applet.c:422
 #, 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."
 
-#: ../src/applet.c:431
+#: ../gnome/applet/applet.c:426
 msgid "VPN Start Failure"
 msgstr "VPN Start Failure"
 
-#: ../src/applet.c:432
+#: ../gnome/applet/applet.c:427
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
@@ -99,25 +115,25 @@ msgstr ""
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
 "program."
 
-#: ../src/applet.c:436 ../src/applet.c:446
+#: ../gnome/applet/applet.c:431 ../gnome/applet/applet.c:441
 msgid "VPN Connect Failure"
 msgstr "VPN Connect Failure"
 
-#: ../src/applet.c:437
+#: ../gnome/applet/applet.c:432
 #, 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."
 
-#: ../src/applet.c:441
+#: ../gnome/applet/applet.c:436
 msgid "VPN Configuration Error"
 msgstr "VPN Configuration Error"
 
-#: ../src/applet.c:442
+#: ../gnome/applet/applet.c:437
 #, c-format
 msgid "The VPN connection '%s' was not correctly configured."
 msgstr "The VPN connection '%s' was not correctly configured."
 
-#: ../src/applet.c:447
+#: ../gnome/applet/applet.c:442
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' because the VPN server did not "
@@ -126,13 +142,13 @@ msgstr ""
 "Could not start the VPN connection '%s' because the VPN server did not "
 "return an adequate network configuration."
 
-#: ../src/applet.c:517
+#: ../gnome/applet/applet.c:512
 msgid "VPN Login Message"
 msgstr "VPN Login Message"
 
-#: ../src/applet.c:741 ../src/applet.c:2508
-#: ../src/other-network-dialog.c:453
-#: ../src/passphrase-dialog.c:228
+#: ../gnome/applet/applet.c:737 ../gnome/applet/applet.c:2635
+#: ../gnome/applet/other-network-dialog.c:458
+#: ../gnome/applet/passphrase-dialog.c:228
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
@@ -140,171 +156,174 @@ msgstr ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
 
-#: ../src/applet.c:753
+#: ../gnome/applet/applet.c:749
 #, c-format
 msgid "The network device \"%s (%s)\" does not support wireless scanning."
 msgstr "The network device \"%s (%s)\" does not support wireless scanning."
 
-#: ../src/applet.c:761
+#: ../gnome/applet/applet.c:757
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
 msgstr "The network device \"%s (%s)\" does not support link detection."
 
-#: ../src/applet.c:908
-#, fuzzy, c-format
+#. Note to translators: this is used if no essid is known
+#: ../gnome/applet/applet.c:905 ../gnome/applet/applet.c:1103
+msgid "(unknown)"
+msgstr "(unknown)"
+
+#: ../gnome/applet/applet.c:911
+#, c-format
 msgid "Preparing device %s for the wired network..."
-msgstr "Connecting to a wired network..."
+msgstr "Preparing device %s for the wired network..."
 
 #
-#: ../src/applet.c:910
-#, fuzzy, c-format
+#: ../gnome/applet/applet.c:913
+#, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
-msgstr "Connecting to wireless network '%s'..."
+msgstr "Preparing device %s for the wireless network '%s'..."
 
-#: ../src/applet.c:918
-#, fuzzy, c-format
+#: ../gnome/applet/applet.c:921
+#, c-format
 msgid "Configuring device %s for the wired network..."
-msgstr "Connecting to a wired network..."
+msgstr "Configuring device %s for the wired network..."
 
 #
-#: ../src/applet.c:920
-#, fuzzy, c-format
+#: ../gnome/applet/applet.c:923
+#, c-format
 msgid "Attempting to join the wireless network '%s'..."
-msgstr "Connecting to wireless network '%s'..."
+msgstr "Attempting to join the wireless network '%s'..."
 
 #
-#: ../src/applet.c:928
-#, fuzzy, c-format
+#: ../gnome/applet/applet.c:931
+#, c-format
 msgid "Waiting for Network Key for the wireless network '%s'..."
-msgstr "Connecting to wireless network '%s'..."
+msgstr "Waiting for Network Key for the wireless network '%s'..."
 
-#: ../src/applet.c:936 ../src/applet.c:946
-#, fuzzy
+#: ../gnome/applet/applet.c:939 ../gnome/applet/applet.c:949
 msgid "Requesting a network address from the wired network..."
-msgstr "Connecting to a wired network..."
+msgstr "Requesting a network address from the wired network..."
 
 #
-#: ../src/applet.c:938 ../src/applet.c:948
-#, fuzzy, c-format
+#: ../gnome/applet/applet.c:941 ../gnome/applet/applet.c:951
+#, c-format
 msgid "Requesting a network address from the wireless network '%s'..."
-msgstr "Connecting to wireless network '%s'..."
+msgstr "Requesting a network address from the wireless network '%s'..."
 
-#: ../src/applet.c:956
-#, fuzzy
+#: ../gnome/applet/applet.c:959
 msgid "Finishing connection to the wired network..."
-msgstr "Connecting to a wired network..."
+msgstr "Finishing connection to the wired network..."
 
 #
-#: ../src/applet.c:958
-#, fuzzy, c-format
+#: ../gnome/applet/applet.c:961
+#, c-format
 msgid "Finishing connection to the wireless network '%s'..."
-msgstr "Connecting to wireless network '%s'..."
+msgstr "Finishing connection to the wireless network '%s'..."
 
-#: ../src/applet.c:1075
+#: ../gnome/applet/applet.c:1078
 msgid "NetworkManager is not running"
 msgstr "NetworkManager is not running"
 
-#: ../src/applet.c:1083 ../src/applet.c:1828
+#: ../gnome/applet/applet.c:1086 ../gnome/applet/applet.c:1843
 msgid "Networking disabled"
-msgstr ""
+msgstr "Networking disabled"
 
-#: ../src/applet.c:1088
+#: ../gnome/applet/applet.c:1091
 msgid "No network connection"
 msgstr "No network connection"
 
-#: ../src/applet.c:1093
+#: ../gnome/applet/applet.c:1096
 msgid "Wired network connection"
 msgstr "Wired network connection"
 
 #
-#: ../src/applet.c:1097
+#: ../gnome/applet/applet.c:1100
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Connected to an Ad-Hoc wireless network"
 
-#: ../src/applet.c:1099
+#: ../gnome/applet/applet.c:1102
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "Wireless network connection to '%s' (%d%%)"
 
-#: ../src/applet.c:1120
+#: ../gnome/applet/applet.c:1123
 #, c-format
 msgid "VPN connection to '%s'"
 msgstr "VPN connection to '%s'"
 
-#: ../src/applet.c:1128
+#: ../gnome/applet/applet.c:1131
 #, c-format
 msgid "VPN connecting to '%s'"
 msgstr "VPN connecting to '%s'"
 
-#: ../src/applet.c:1541
+#: ../gnome/applet/applet.c:1556
 msgid "_Connect to Other Wireless Network..."
 msgstr "_Connect to Other Wireless Network..."
 
-#: ../src/applet.c:1562
+#: ../gnome/applet/applet.c:1577
 msgid "Create _New Wireless Network..."
 msgstr "Create _New Wireless Network..."
 
-#: ../src/applet.c:1685
+#: ../gnome/applet/applet.c:1700
 msgid "_VPN Connections"
 msgstr "_VPN Connections"
 
-#: ../src/applet.c:1730
+#: ../gnome/applet/applet.c:1745
 msgid "_Configure VPN..."
 msgstr "_Configure VPN..."
 
-#: ../src/applet.c:1734
+#: ../gnome/applet/applet.c:1749
 msgid "_Disconnect VPN..."
 msgstr "_Disconnect VPN..."
 
-#: ../src/applet.c:1756
+#: ../gnome/applet/applet.c:1771
 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
-#: ../src/applet.c:1767
+#: ../gnome/applet/applet.c:1782
 #, c-format
 msgid "Connect to %s..."
 msgstr "Connect to %s..."
 
-#: ../src/applet.c:1773
-#, fuzzy, c-format
+#: ../gnome/applet/applet.c:1788
+#, c-format
 msgid "Disconnect from %s..."
-msgstr "Connect to %s..."
+msgstr "Disconnect from %s..."
 
-#: ../src/applet.c:1822
+#: ../gnome/applet/applet.c:1837
 msgid "No network devices have been found"
 msgstr "No network devices have been found"
 
-#: ../src/applet.c:2014
+#: ../gnome/applet/applet.c:2029
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager is not running..."
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2170
+#: ../gnome/applet/applet.c:2210
 msgid "Enable _Networking"
-msgstr ""
+msgstr "Enable _Networking"
 
 #. 'Enable Wireless' item
-#: ../src/applet.c:2176
+#: ../gnome/applet/applet.c:2216
 msgid "Enable _Wireless"
-msgstr ""
+msgstr "Enable _Wireless"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2182
+#: ../gnome/applet/applet.c:2222
 msgid "Connection _Information"
 msgstr "Connection _Information"
 
 #. Help item
-#: ../src/applet.c:2193
+#: ../gnome/applet/applet.c:2233
 msgid "_Help"
 msgstr "_Help"
 
 #. About item
-#: ../src/applet.c:2202
+#: ../gnome/applet/applet.c:2242
 msgid "_About"
 msgstr "_About"
 
-#: ../src/applet.c:2667
+#: ../gnome/applet/applet.c:2824
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
@@ -312,95 +331,94 @@ msgstr ""
 "The NetworkManager Applet could not find some required resources.  It cannot "
 "continue.\n"
 
-#: ../src/wireless-security-option.c:157
+#: ../gnome/applet/wireless-security-option.c:157
 msgid "Open System"
-msgstr ""
+msgstr "Open System"
 
-#: ../src/wireless-security-option.c:160
+#: ../gnome/applet/wireless-security-option.c:160
 msgid "Shared Key"
-msgstr ""
+msgstr "Shared Key"
 
-#: ../src/wireless-security-option.c:208
+#: ../gnome/applet/wireless-security-option.c:208
 msgid "Automatic (Default)"
-msgstr ""
+msgstr "Automatic (Default)"
 
-#: ../src/wireless-security-option.c:215
+#: ../gnome/applet/wireless-security-option.c:215
 msgid "AES-CCMP"
-msgstr ""
+msgstr "AES-CCMP"
 
-#: ../src/wireless-security-option.c:223
+#: ../gnome/applet/wireless-security-option.c:223
 msgid "TKIP"
-msgstr ""
+msgstr "TKIP"
 
-#: ../src/wireless-security-option.c:231
+#: ../gnome/applet/wireless-security-option.c:231
 msgid "Dynamic WEP"
-msgstr ""
+msgstr "Dynamic WEP"
 
-#: ../src/wso-none.c:53
+#: ../gnome/applet/wso-none.c:53
 msgid "None"
-msgstr ""
+msgstr "None"
 
-#: ../src/wso-wep-ascii.c:138
+#: ../gnome/applet/wso-wep-ascii.c:138
 msgid "WEP 64/128-bit ASCII"
-msgstr ""
+msgstr "WEP 64/128-bit ASCII"
 
-#: ../src/wso-wep-hex.c:135
+#: ../gnome/applet/wso-wep-hex.c:135
 msgid "WEP 64/128-bit Hex"
-msgstr ""
+msgstr "WEP 64/128-bit Hex"
 
-#: ../src/wso-wep-passphrase.c:135
-#, fuzzy
+#: ../gnome/applet/wso-wep-passphrase.c:135
 msgid "WEP 128-bit Passphrase"
-msgstr "Passphrase:"
+msgstr "WEP 128-bit Passphrase"
 
-#: ../src/wso-wpa-eap.c:237
+#: ../gnome/applet/wso-wpa-eap.c:237
 msgid "PEAP"
-msgstr ""
+msgstr "PEAP"
 
-#: ../src/wso-wpa-eap.c:238
+#: ../gnome/applet/wso-wpa-eap.c:238
 msgid "TLS"
-msgstr ""
+msgstr "TLS"
 
-#: ../src/wso-wpa-eap.c:239
+#: ../gnome/applet/wso-wpa-eap.c:239
 msgid "TTLS"
-msgstr ""
+msgstr "TTLS"
 
-#: ../src/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
-#: ../src/nm-ap-security-wpa-eap.c:116
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:93
+#: ../src/nm-ap-security-wpa-eap.c:117
 msgid "WPA2 Enterprise"
-msgstr ""
+msgstr "WPA2 Enterprise"
 
-#: ../src/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
-#: ../src/nm-ap-security-wpa-eap.c:121
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:95
+#: ../src/nm-ap-security-wpa-eap.c:122
 msgid "WPA Enterprise"
-msgstr ""
+msgstr "WPA Enterprise"
 
-#: ../src/wso-wpa-psk.c:178
+#: ../gnome/applet/wso-wpa-psk.c:178
 msgid "WPA2 Personal"
-msgstr ""
+msgstr "WPA2 Personal"
 
-#: ../src/wso-wpa-psk.c:180
+#: ../gnome/applet/wso-wpa-psk.c:180
 msgid "WPA Personal"
-msgstr ""
+msgstr "WPA Personal"
 
-#: ../src/eggtrayicon.c:134
+#: ../gnome/applet/eggtrayicon.c:134
 msgid "Orientation"
 msgstr "Orientation"
 
-#: ../src/eggtrayicon.c:135
+#: ../gnome/applet/eggtrayicon.c:135
 msgid "The orientation of the tray."
 msgstr "The orientation of the tray."
 
-#: ../src/menu-items.c:88
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Wired Network (%s)"
 
-#: ../src/menu-items.c:91
+#: ../gnome/applet/menu-items.c:91
 msgid "_Wired Network"
 msgstr "_Wired Network"
 
-#: ../src/menu-items.c:162
+#: ../gnome/applet/menu-items.c:162
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
@@ -408,74 +426,74 @@ msgstr[0] "Wireless Network (%s)"
 msgstr[1] "Wireless Networks (%s)"
 
 #
-#: ../src/menu-items.c:164
+#: ../gnome/applet/menu-items.c:164
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Wireless Network"
 msgstr[1] "Wireless Networks"
 
-#: ../src/menu-items.c:343
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr " (invalid Unicode)"
 
-#: ../src/other-network-dialog.c:352
-#, fuzzy, 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 "By default, the ESSID is set to your computer's name,"
+msgstr ""
+"By default, the wireless network's name is set to your computer's name, %s, "
+"with no encryption enabled"
 
 #
-#: ../src/other-network-dialog.c:358
+#: ../gnome/applet/other-network-dialog.c:358
 msgid "Create new wireless network"
 msgstr "Create new wireless network"
 
-#: ../src/other-network-dialog.c:359
-#, fuzzy
+#: ../gnome/applet/other-network-dialog.c:359
 msgid ""
 "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 "
+"Enter the name and security settings of the wireless network you wish to "
 "create."
 
-#: ../src/other-network-dialog.c:363
+#: ../gnome/applet/other-network-dialog.c:363
 msgid "Create New Wireless Network"
 msgstr "Create New Wireless Network..."
 
 #
-#: ../src/other-network-dialog.c:368
-#, fuzzy
+#: ../gnome/applet/other-network-dialog.c:368
 msgid "Existing wireless network"
-msgstr "Custom wireless network"
+msgstr "Existing wireless network"
 
-#: ../src/other-network-dialog.c:369
-#, fuzzy
+#: ../gnome/applet/other-network-dialog.c:369
 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."
+msgstr "Enter the name of the wireless network to which you wish to connect."
 
-#: ../src/other-network-dialog.c:371
+#: ../gnome/applet/other-network-dialog.c:371
 msgid "Connect to Other Wireless Network"
 msgstr "Connect to Other Wireless Network"
 
-#: ../src/passphrase-dialog.c:215
-#, fuzzy
+#: ../gnome/applet/passphrase-dialog.c:215
 msgid "Error connecting to wireless network"
-msgstr "Scanning for wireless networks..."
+msgstr "Error connecting to wireless network"
 
-#: ../src/passphrase-dialog.c:216
+#: ../gnome/applet/passphrase-dialog.c:216
 msgid ""
 "The requested wireless network requires security capabilities unsupported by "
 "your hardware."
 msgstr ""
+"The requested wireless network requires security capabilities unsupported by "
+"your hardware."
 
-#: ../src/vpn-password-dialog.c:151
-#: ../src/vpn-password-dialog.c:188
+#: ../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'"
 
-#: ../src/vpn-password-dialog.c:154
+#: ../gnome/applet/vpn-password-dialog.c:154
 #, c-format
 msgid ""
 "Could not find the authentication dialog for VPN connection type '%s'. "
@@ -484,7 +502,7 @@ msgstr ""
 "Could not find the authentication dialog for VPN connection type '%s'. "
 "Contact your system administrator."
 
-#: ../src/vpn-password-dialog.c:191
+#: ../gnome/applet/vpn-password-dialog.c:191
 #, c-format
 msgid ""
 "There was a problem launching the authentication dialog for VPN connection "
@@ -493,18 +511,17 @@ msgstr ""
 "There was a problem launching the authentication dialog for VPN connection "
 "type '%s'. Contact your system administrator."
 
-#: ../src/applet.glade.h:1
+#: ../gnome/applet/applet.glade.h:1
 msgid " "
 msgstr " "
 
-#: ../src/applet.glade.h:2
-#, fuzzy
+#: ../gnome/applet/applet.glade.h:2
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
 msgstr ""
 "<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
 
-#: ../src/applet.glade.h:4
+#: ../gnome/applet/applet.glade.h:4
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
@@ -519,7 +536,7 @@ msgstr ""
 "A passphrase or encryption key is required to access the wireless network '%"
 "s'."
 
-#: ../src/applet.glade.h:8
+#: ../gnome/applet/applet.glade.h:8
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
@@ -530,8 +547,8 @@ msgstr ""
 "\n"
 "%s  It will not be completely functional."
 
-#: ../src/applet.glade.h:12
-#, fuzzy, no-c-format
+#: ../gnome/applet/applet.glade.h:12
+#, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
 "span>\n"
@@ -543,206 +560,214 @@ 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 "
-"not require confirmation on subsequent connections."
+"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."
 
-#: ../src/applet.glade.h:15
+#: ../gnome/applet/applet.glade.h:15
 msgid "Anonymous Identity:"
-msgstr ""
+msgstr "Anonymous Identity:"
 
-#: ../src/applet.glade.h:16
-#, fuzzy
+#: ../gnome/applet/applet.glade.h:16
 msgid "Authentication:"
-msgstr "Orientation"
+msgstr "Authentication:"
 
-#: ../src/applet.glade.h:17
+#: ../gnome/applet/applet.glade.h:17
 msgid "Broadcast Address:"
 msgstr "Broadcast Address:"
 
-#: ../src/applet.glade.h:18
+#: ../gnome/applet/applet.glade.h:18
 msgid "CA Certificate File:"
-msgstr ""
+msgstr "CA Certificate File:"
 
-#: ../src/applet.glade.h:19
+#: ../gnome/applet/applet.glade.h:19
 msgid "C_onnect"
 msgstr "C_onnect"
 
-#: ../src/applet.glade.h:20
+#: ../gnome/applet/applet.glade.h:20
 msgid "Client Certificate File:"
-msgstr ""
+msgstr "Client Certificate File:"
 
-#: ../src/applet.glade.h:21
+#: ../gnome/applet/applet.glade.h:21
 msgid "Connection Information"
 msgstr "Connection Information"
 
-#: ../src/applet.glade.h:22
+#: ../gnome/applet/applet.glade.h:22
 msgid "Default Route:"
 msgstr "Default Route:"
 
-#: ../src/applet.glade.h:23
+#: ../gnome/applet/applet.glade.h:23
 msgid "Destination Address:"
 msgstr "Destination Address:"
 
-#: ../src/applet.glade.h:24
+#: ../gnome/applet/applet.glade.h:24
 msgid "Driver:"
-msgstr ""
+msgstr "Driver:"
 
-#: ../src/applet.glade.h:25
+#: ../gnome/applet/applet.glade.h:25
 msgid "EAP Method:"
-msgstr ""
+msgstr "EAP Method:"
 
-#: ../src/applet.glade.h:26
+#: ../gnome/applet/applet.glade.h:26
 msgid "Hardware Address:"
 msgstr "Hardware Address:"
 
-#: ../src/applet.glade.h:27
+#: ../gnome/applet/applet.glade.h:27
 msgid "IP Address:"
 msgstr "IP Address:"
 
-#: ../src/applet.glade.h:28
+#: ../gnome/applet/applet.glade.h:28
 msgid "Identity:"
-msgstr ""
+msgstr "Identity:"
 
-#: ../src/applet.glade.h:29
+#: ../gnome/applet/applet.glade.h:29
 msgid "Interface:"
 msgstr "Interface:"
 
-#: ../src/applet.glade.h:30
-#, fuzzy
+#: ../gnome/applet/applet.glade.h:30
 msgid "Key Type:"
-msgstr "_Key Type:"
+msgstr "Key Type:"
 
-#: ../src/applet.glade.h:31
-#, fuzzy
+#: ../gnome/applet/applet.glade.h:31
+msgid "Key management:"
+msgstr "Key management:"
+
+#: ../gnome/applet/applet.glade.h:32
 msgid "Key:"
-msgstr "Hex Key:"
+msgstr "Key:"
 
-#: ../src/applet.glade.h:32
+#: ../gnome/applet/applet.glade.h:33
 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"
 
-#: ../src/applet.glade.h:37
+#: ../gnome/applet/applet.glade.h:38
 msgid ""
 "Open System\n"
 "Shared Key"
 msgstr ""
+"Open System\n"
+"Shared Key"
 
-#: ../src/applet.glade.h:39
+#: ../gnome/applet/applet.glade.h:40
 msgid "Other Wireless Network..."
 msgstr "Other Wireless Networks..."
 
-#: ../src/applet.glade.h:40
+#: ../gnome/applet/applet.glade.h:41
 msgid "Passphrase:"
 msgstr "Passphrase:"
 
-#: ../src/applet.glade.h:41
+#: ../gnome/applet/applet.glade.h:42
 msgid "Password:"
-msgstr ""
+msgstr "Password:"
 
-#: ../src/applet.glade.h:42
+#: ../gnome/applet/applet.glade.h:43
 msgid "Primary DNS:"
 msgstr "Primary DNS:"
 
-#: ../src/applet.glade.h:43
+#: ../gnome/applet/applet.glade.h:44
 msgid "Private Key File:"
-msgstr ""
+msgstr "Private Key File:"
 
-#: ../src/applet.glade.h:44
+#: ../gnome/applet/applet.glade.h:45
 msgid "Private Key Password:"
-msgstr ""
+msgstr "Private Key Password:"
 
-#: ../src/applet.glade.h:45
+#: ../gnome/applet/applet.glade.h:46
 msgid "Secondary DNS:"
 msgstr "Secondary DNS:"
 
-#: ../src/applet.glade.h:46
+#: ../gnome/applet/applet.glade.h:47
 msgid "Select the CA Certificate File"
-msgstr ""
+msgstr "Select the CA Certificate File"
 
-#: ../src/applet.glade.h:47
+#: ../gnome/applet/applet.glade.h:48
 msgid "Select the Client Certificate File"
-msgstr ""
+msgstr "Select the Client Certificate File"
 
-#: ../src/applet.glade.h:48
+#: ../gnome/applet/applet.glade.h:49
 msgid "Select the Private Key File"
-msgstr ""
+msgstr "Select the Private Key File"
 
-#: ../src/applet.glade.h:49
+#: ../gnome/applet/applet.glade.h:50
 msgid "Show key"
-msgstr ""
+msgstr "Show key"
 
-#: ../src/applet.glade.h:50
-#, fuzzy
+#: ../gnome/applet/applet.glade.h:51
 msgid "Show passphrase"
-msgstr "Passphrase:"
+msgstr "Show passphrase"
 
-#: ../src/applet.glade.h:51
+#: ../gnome/applet/applet.glade.h:52
 msgid "Show password"
-msgstr ""
+msgstr "Show password"
 
-#: ../src/applet.glade.h:52
+#: ../gnome/applet/applet.glade.h:53
 msgid "Show passwords"
-msgstr ""
+msgstr "Show passwords"
 
-#: ../src/applet.glade.h:53
+#: ../gnome/applet/applet.glade.h:54
 msgid "Speed:"
-msgstr ""
+msgstr "Speed:"
 
-#: ../src/applet.glade.h:54
+#: ../gnome/applet/applet.glade.h:55
 msgid "Subnet Mask:"
 msgstr "Subnet Mask:"
 
-#: ../src/applet.glade.h:55
-#, fuzzy
+#: ../gnome/applet/applet.glade.h:56
 msgid "Type:"
-msgstr "_Key Type:"
+msgstr "Type:"
 
-#: ../src/applet.glade.h:56
+#: ../gnome/applet/applet.glade.h:57
 msgid "User Name:"
-msgstr ""
+msgstr "User Name:"
 
-#: ../src/applet.glade.h:57
+#: ../gnome/applet/applet.glade.h:58
 msgid "Wireless Network Key Required"
 msgstr "Wireless Network Key Required"
 
 #
-#: ../src/applet.glade.h:58
+#: ../gnome/applet/applet.glade.h:59
 msgid "Wireless _adapter:"
 msgstr "Wireless _adapter:"
 
 #
-#: ../src/applet.glade.h:59
+#: ../gnome/applet/applet.glade.h:60
 msgid "_Always Trust this Wireless Network"
 msgstr "_Always Trust this Wireless Network"
 
-#: ../src/applet.glade.h:60
+#: ../gnome/applet/applet.glade.h:61
 msgid "_Don't remind me again"
 msgstr "_Don't remind me again"
 
-#: ../src/applet.glade.h:61
+#: ../gnome/applet/applet.glade.h:62
+msgid "_Fallback on this Network"
+msgstr "_Fallback on this Network"
+
+#: ../gnome/applet/applet.glade.h:63
 msgid "_Login to Network"
 msgstr "_Login to Network"
 
-#: ../src/applet.glade.h:62
+#: ../gnome/applet/applet.glade.h:64
 msgid "_Network Name:"
-msgstr ""
+msgstr "_Network Name:"
 
 #
-#: ../src/applet.glade.h:63
-#, fuzzy
+#: ../gnome/applet/applet.glade.h:65
 msgid "_Wireless Security:"
-msgstr "Wireless _adapter:"
+msgstr "_Wireless Security:"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:383
+#: ../gnome/vpn-properties/nm-vpn-properties.c:417
 msgid "Cannot add VPN connection"
 msgstr "Cannot add VPN connection"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:385
+#: ../gnome/vpn-properties/nm-vpn-properties.c:419
 msgid ""
 "No suitable VPN software was found on your system. Contact your system "
 "administrator."
@@ -750,11 +775,11 @@ msgstr ""
 "No suitable VPN software was found on your system. Contact your system "
 "administrator."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:437
+#: ../gnome/vpn-properties/nm-vpn-properties.c:461
 msgid "Cannot import VPN connection"
 msgstr "Cannot import VPN connection"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:439
+#: ../gnome/vpn-properties/nm-vpn-properties.c:463
 #, c-format
 msgid ""
 "Cannot find suitable software for VPN connection type '%s' to import the "
@@ -763,12 +788,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:579
+#: ../gnome/vpn-properties/nm-vpn-properties.c:580
 #, c-format
 msgid "Error retrieving VPN connection '%s'"
 msgstr "Error retrieving VPN connection '%s'"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:582
+#: ../gnome/vpn-properties/nm-vpn-properties.c:583
 #, c-format
 msgid ""
 "Could not find the UI files for VPN connection type '%s'. Contact your "
@@ -777,12 +802,12 @@ msgstr ""
 "Could not find the UI files for VPN connection type '%s'. Contact your "
 "system administrator."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:739
+#: ../gnome/vpn-properties/nm-vpn-properties.c:727
 #, c-format
 msgid "Delete VPN connection \"%s\"?"
 msgstr "Delete VPN connection \"%s\"?"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:742
+#: ../gnome/vpn-properties/nm-vpn-properties.c:730
 #, c-format
 msgid ""
 "All information about the VPN connection \"%s\" will be lost and you may "
@@ -793,19 +818,36 @@ msgstr ""
 "need your system administrator to provide information to create a new "
 "connection."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:959
+#: ../gnome/vpn-properties/nm-vpn-properties.c:924
 msgid "Unable to load"
 msgstr "Unable to load"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:961
-#, fuzzy
+#: ../gnome/vpn-properties/nm-vpn-properties.c:926
 msgid "Cannot find some needed resources (the glade file)!"
-msgstr ""
-"The NetworkManager Applet could not find some required resources (the glade "
-"file was not found)."
+msgstr "Cannot find some needed resources (the glade file)!"
+
+#. druid_window = GTK_DIALOG (gtk_dialog_new_with_buttons (_("Create VPN Connection"),
+#. NULL,
+#. GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+#. GTK_STOCK_CANCEL,
+#. GTK_RESPONSE_REJECT,
+#. GTK_STOCK_APPLY,
+#. GTK_RESPONSE_ACCEPT,
+#. NULL));
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1081
+msgid "Create VPN Connection"
+msgstr "Create VPN Connection"
 
+#. gtk_container_add (GTK_CONTAINER (druid_window->vbox), GTK_WIDGET(gtk_label_new("Some label")));
+#. gtk_box_pack_start (GTK_BOX (druid_window->vbox), GTK_WIDGET(druid), TRUE,TRUE,0);
+#. gtk_box_pack_start (GTK_BOX (druid_window->vbox), GTK_WIDGET(gtk_label_new("Some label")), TRUE,TRUE,0);
+#. toplevel = gtk_widget_get_toplevel (GTK_WIDGET (druid));
+#. gtk_signal_connect (GTK_OBJECT (toplevel), "delete_event", GTK_SIGNAL_FUNC (vpn_window_close), NULL);
+#. make the druid window modal wrt. our main window
+#. gtk_window_set_modal (druid_window, TRUE);
+#. gtk_window_set_transient_for (GTK_WINDOW(druid_window), GTK_WINDOW (dialog));
 #. Edit dialog
-#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1099
 msgid "Edit VPN Connection"
 msgstr "Edit VPN Connection"
 
@@ -814,171 +856,135 @@ msgid "Add a new VPN connection"
 msgstr "Add a new VPN connection"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:2
-msgid "Choose which type of VPN connection you wish to create."
-msgstr "Choose which type of VPN connection you wish to create."
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
-msgid "Connect to:"
-msgstr "Connect to:"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
-msgid "Create VPN Connection"
-msgstr "Create VPN Connection"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
-msgid "Create VPN Connection - 1 of 2"
-msgstr "Create VPN Connection - 1 of 2"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
-msgid "Create VPN Connection - 2 of 2"
-msgstr "Create VPN Connection - 2 of 2"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
 msgid "Delete the selected VPN connection"
 msgstr "Delete the selected VPN connection"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
 msgid "E_xport"
 msgstr "E_xport"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:9
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
 msgid "Edit the selected VPN connection"
 msgstr "Edit the selected VPN connection"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:10
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
 msgid "Export the VPN settings to a file"
 msgstr "Export the VPN settings to a file"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:11
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
 msgid "Export the selected VPN connection to a file"
 msgstr "Export the selected VPN connection to a file"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:12
-msgid "Finish Creating VPN Connection"
-msgstr "Finish Creating VPN Connection"
-
 #
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:13
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
 msgid "Manage Virtual Private Network Connections"
 msgstr "Manage Virtual Private Network Connections"
 
-#: ../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 ""
-"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."
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:17
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
 msgid "VPN Connections"
 msgstr "VPN Connections"
 
 #: ../src/nm-ap-security-wep.c:52
 msgid "40-bit WEP"
-msgstr ""
+msgstr "40-bit WEP"
 
 #: ../src/nm-ap-security-wep.c:54
 msgid "104-bit WEP"
-msgstr ""
+msgstr "104-bit WEP"
 
-#: ../src/nm-ap-security-wpa-psk.c:50
+#: ../src/nm-ap-security-wpa-psk.c:51
 msgid "WPA TKIP"
-msgstr ""
+msgstr "WPA TKIP"
 
-#: ../src/nm-ap-security-wpa-psk.c:52
+#: ../src/nm-ap-security-wpa-psk.c:53
 msgid "WPA CCMP"
-msgstr ""
+msgstr "WPA CCMP"
 
-#: ../src/nm-ap-security-wpa-psk.c:54
+#: ../src/nm-ap-security-wpa-psk.c:55
 msgid "WPA Automatic"
-msgstr ""
+msgstr "WPA Automatic"
 
-#: ../src/nm-ap-security-wpa-psk.c:59
+#: ../src/nm-ap-security-wpa-psk.c:60
 msgid "WPA2 TKIP"
-msgstr ""
+msgstr "WPA2 TKIP"
 
-#: ../src/nm-ap-security-wpa-psk.c:61
+#: ../src/nm-ap-security-wpa-psk.c:62
 msgid "WPA2 CCMP"
-msgstr ""
+msgstr "WPA2 CCMP"
 
-#: ../src/nm-ap-security-wpa-psk.c:63
+#: ../src/nm-ap-security-wpa-psk.c:64
 msgid "WPA2 Automatic"
-msgstr ""
+msgstr "WPA2 Automatic"
 
-#: ../src/nm-ap-security.c:320
+#: ../src/nm-ap-security.c:334
 msgid "none"
-msgstr ""
+msgstr "none"
 
-#: ../src/nm-netlink-monitor.c:154
+#: ../src/nm-netlink-monitor.c:174
 #, c-format
 msgid ""
 "unable to create netlink socket for monitoring wired ethernet devices - %s"
 msgstr ""
 "unable to create netlink socket for monitoring wired ethernet devices - %s"
 
-#: ../src/nm-netlink-monitor.c:172
+#: ../src/nm-netlink-monitor.c:192
 #, c-format
 msgid ""
 "unable to bind to netlink socket for monitoring wired ethernet devices - %s"
 msgstr ""
 "unable to bind to netlink socket for monitoring wired ethernet devices - %s"
 
-#: ../src/nm-netlink-monitor.c:405
+#: ../src/nm-netlink-monitor.c:427
 msgid "operation took too long"
 msgstr "operation took too long"
 
-#: ../src/nm-netlink-monitor.c:502
+#: ../src/nm-netlink-monitor.c:524
 msgid "received data from wrong type of sender"
 msgstr "received data from wrong type of sender"
 
-#: ../src/nm-netlink-monitor.c:515
+#: ../src/nm-netlink-monitor.c:537
 msgid "received data from unexpected sender"
 msgstr "received data from unexpected sender"
 
-#: ../src/nm-netlink-monitor.c:646
+#: ../src/nm-netlink-monitor.c:666
 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:735
+#: ../src/nm-netlink-monitor.c:776
 msgid "error occurred while waiting for data on socket"
 msgstr "error occurred while waiting for data on socket"
 
 #
-#: ../src/applet-dbus-devices.c:898
-#, fuzzy, c-format
+#: ../gnome/applet/applet-dbus-devices.c:930
+#, c-format
 msgid "You are now connected to the Ad-Hoc wireless network '%s'."
-msgstr "Connected to an Ad-Hoc wireless network"
+msgstr "You are now connected to the Ad-Hoc wireless network '%s'."
 
 #
-#: ../src/applet-dbus-devices.c:903
-#, fuzzy, c-format
+#: ../gnome/applet/applet-dbus-devices.c:935
+#, c-format
 msgid "You are now connected to the wireless network '%s'."
-msgstr "Connecting to wireless network '%s'..."
+msgstr "You are now connected to the wireless network '%s'."
 
-#: ../src/applet-dbus-devices.c:910
-#, fuzzy
+#: ../gnome/applet/applet-dbus-devices.c:942
 msgid "You are now connected to the wired network."
-msgstr "Connecting to a wired network..."
+msgstr "You are now connected to the wired network."
 
-#: ../src/applet-dbus-devices.c:916
+#: ../gnome/applet/applet-dbus-devices.c:948
 msgid "Connection Established"
-msgstr ""
+msgstr "Connection Established"
 
-#: ../src/applet-dbus-devices.c:959
-#, fuzzy
+#: ../gnome/applet/applet-dbus-devices.c:997
 msgid "Disconnected"
-msgstr "_Disconnect VPN..."
+msgstr "Disconnected"
 
-#: ../src/applet-dbus-devices.c:960
+#: ../gnome/applet/applet-dbus-devices.c:998
 msgid "The network connection has been disconnected."
-msgstr ""
+msgstr "The network connection has been disconnected."
+
+#: ../src/nm-ap-security-leap.c:66 ../src/nm-ap-security-leap.c:82
+msgid "LEAP"
+msgstr "LEAP"
 
 #~ msgid ""
 #~ "The requested wireless network '%s' does not appear to be in range.  A "
@@ -995,102 +1001,3 @@ msgstr ""
 
 #~ 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>"
-
-#~ msgid "Modify Wireless Networks"
-#~ msgstr "Modify Wireless Networks"
-
-#~ msgid "*"
-#~ msgstr "*"
-
-#~ msgid "You must log in to access the private network %s"
-#~ msgstr "You must log in to access the private network %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 Login Failure</span>\n"
-#~ "\n"
-#~ "Could not start the VPN connection '%s' due to a login failure.\n"
-#~ "\n"
-#~ "The VPN service said: \"%s\""
-
-#~ msgid "Pause Wireless Scanning"
-#~ msgstr "Pause Wireless Scanning"
-
-#~ msgid "Resume Wireless Scanning"
-#~ msgstr "Resume Wireless Scanning"
-
-#~ msgid "Stop All Wireless Devices"
-#~ msgstr "Stop All Wireless Devices"
-
-#~ msgid "Start All Wireless Devices"
-#~ msgstr "Start All Wireless Devices"
-
-#~ msgid "_About..."
-#~ msgstr "_About..."
-
-#~ msgid "progress bar label|%d %%"
-#~ msgstr "%d %%"
-
-#~ msgid "_OK"
-#~ msgstr "_OK"
-
-#~ msgid "You must log in to access the Virtual Private Network '%s'."
-#~ msgstr "You must log in to access the Virtual Private Network '%s'."
-
-#~ msgid "%s"
-#~ msgstr "%s"
diff --git a/po/es.po b/po/es.po
index e1ed3b1d..eded800a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,95 +1,117 @@
+# translation of es.po to Spanish
 # translation of NetworkManager.HEAD.po to
 # Traducción de NetworkManager al español.
 # Copyright (C) Spanish translation for NetworkManager
 # This file is distributed under the same license as the NetworkManager package.
+#
 # Antonio Ognio <antonio@linux.org.pe>, 2004.
-# Francisco Javier F. Serrador <serrador@cvs.gnome.org>, 2004, 2005.
+# Francisco Javier F. Serrador <serrador@cvs.gnome.org>, 2004, 2005, 2006.
 # Lucas Vieites Fariña <lucas@asixinformatica.com>, 2005, 2006.
-#
 msgid ""
 msgstr ""
-"Project-Id-Version: NetworkManager.HEAD\n"
+"Project-Id-Version: pan2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-29 18:33+0200\n"
-"PO-Revision-Date: 2006-05-16 13:58\n"
-"Last-Translator: Novell Language <language@novell.com>\n"
-"Language-Team: Novell Language <language@novell.com>\n"
+"POT-Creation-Date: 2006-12-04 18:12+0100\n"
+"PO-Revision-Date: 2006-12-04 18:12+0100\n"
+"Last-Translator: Francisco Javier F. Serrador <serrador@cvs.gnome.org>\n"
+"Language-Team: Spanish <traductores@es.gnome.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\n"
+"X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../src/applet-compat.c:171 ../src/applet-dbus-info.c:919
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:926
 #, c-format
 msgid "Passphrase for wireless network %s"
 msgstr "Frase de paso para la red inalámbrica %s"
 
-#: ../src/applet-dbus.c:265
+#: ../gnome/applet/applet-dbus.c:274
 #, c-format
 msgid "Connection to the wireless network '%s' failed."
 msgstr "La conexión a la red inalámbrica «%s» ha fallado."
 
-#: ../src/applet-dbus.c:270
+#: ../gnome/applet/applet-dbus.c:279
 msgid "Connection to the wired network failed."
 msgstr "La conexión a la red cableada ha fallado."
 
-#: ../src/applet.c:184
+#: ../gnome/applet/applet.c:182
 msgid "Error displaying connection information:"
 msgstr "Ha ocurrido un error al mostrar información de conexión:"
 
-#: ../src/applet.c:202
+#: ../gnome/applet/applet.c:200
 msgid "Could not find some required resources (the glade file)!"
 msgstr ""
 "No se han podido encontrar algunos recursos necesarios (el archivo glade)."
 
-#: ../src/applet.c:213
+#: ../gnome/applet/applet.c:210
 msgid "No active connections!"
 msgstr "No hay conexiones activas."
 
-#: ../src/applet.c:234
+#: ../gnome/applet/applet.c:227
+#, c-format
+msgid "%d Mb/s"
+msgstr "%d Mb/s"
+
+#: ../gnome/applet/applet.c:230
 #, c-format
 msgid "Wired Ethernet (%s)"
 msgstr "Red Ethernet cableada (%s)"
 
-#: ../src/applet.c:236
+#: ../gnome/applet/applet.c:232
 #, c-format
 msgid "Wireless Ethernet (%s)"
 msgstr "Red Ethernet inalámbrica (%s)"
 
-#: ../src/applet.c:337 ../src/applet.c:362
+#: ../gnome/applet/applet.c:238
+msgid "Unknown"
+msgstr "Desconocido"
+
+#: ../gnome/applet/applet.c:330 ../gnome/applet/applet.c:357
 msgid "NetworkManager Applet"
 msgstr "Miniaplicación NetworkManager"
 
-#: ../src/applet.c:339 ../src/applet.c:364
-msgid "Copyright © 2004-2005 Red Hat, Inc."
-msgstr "Copyright © 2004-2005 Red Hat, Inc."
+#: ../gnome/applet/applet.c:332
+msgid ""
+"Copyright © 2004-2006 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+msgstr ""
+"Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
 
-#: ../src/applet.c:340 ../src/applet.c:365
+#: ../gnome/applet/applet.c:334 ../gnome/applet/applet.c:361
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
-"Miniaplicación del área de notificación para administrar sus dispositivos de "
+"Miniaplicación del área de notificación para gestionar sus dispositivos de "
 "red y conexiones."
 
-#: ../src/applet.c:343 ../src/applet.c:370
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:365
 msgid "translator-credits"
-msgstr "Lucas Vieites <lucas@asixinformatica.com>, 2005"
+msgstr "Lucas Vieites <lucas@asixinformatica.com>, 2005-2006"
 
-#: ../src/applet.c:426
+#: ../gnome/applet/applet.c:359
+msgid ""
+"Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+msgstr ""
+"Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+
+#: ../gnome/applet/applet.c:421
 msgid "VPN Login Failure"
 msgstr "Error de acceso de VPN"
 
-#: ../src/applet.c:427
+#: ../gnome/applet/applet.c:422
 #, 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."
 
-#: ../src/applet.c:431
+#: ../gnome/applet/applet.c:426
 msgid "VPN Start Failure"
 msgstr "Error de inicio de VPN"
 
-#: ../src/applet.c:432
+#: ../gnome/applet/applet.c:427
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
@@ -98,26 +120,26 @@ msgstr ""
 "No se pudo iniciar la conexión VPN «%s» debido a un error al iniciar el "
 "programa VPN."
 
-#: ../src/applet.c:436 ../src/applet.c:446
+#: ../gnome/applet/applet.c:431 ../gnome/applet/applet.c:441
 msgid "VPN Connect Failure"
 msgstr "Error de conexión VPN"
 
-#: ../src/applet.c:437
+#: ../gnome/applet/applet.c:432
 #, 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."
 
-#: ../src/applet.c:441
+#: ../gnome/applet/applet.c:436
 msgid "VPN Configuration Error"
 msgstr "Error de configuración VPN"
 
-#: ../src/applet.c:442
+#: ../gnome/applet/applet.c:437
 #, c-format
 msgid "The VPN connection '%s' was not correctly configured."
 msgstr "La conexión VPN «%s» no estaba configurada correctamente."
 
-#: ../src/applet.c:447
+#: ../gnome/applet/applet.c:442
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' because the VPN server did not "
@@ -126,13 +148,13 @@ msgstr ""
 "No se pudo iniciar la conexión VPN «%s» porque el servidor VPN no ha "
 "devuelto una configuración de red adecuada."
 
-#: ../src/applet.c:517
+#: ../gnome/applet/applet.c:512
 msgid "VPN Login Message"
 msgstr "Mensaje de acceso VPN"
 
-#: ../src/applet.c:741 ../src/applet.c:2508
-#: ../src/other-network-dialog.c:453
-#: ../src/passphrase-dialog.c:228
+#: ../gnome/applet/applet.c:737 ../gnome/applet/applet.c:2635
+#: ../gnome/applet/other-network-dialog.c:458
+#: ../gnome/applet/passphrase-dialog.c:228
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
@@ -140,165 +162,170 @@ msgstr ""
 "La miniaplicación NetworkManager no pudo encontrar algunos archivos de "
 "recursos (No se encontró el archivo de glade)."
 
-#: ../src/applet.c:753
+#: ../gnome/applet/applet.c:749
 #, 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."
 
-#: ../src/applet.c:761
+#: ../gnome/applet/applet.c:757
 #, 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."
 
-#: ../src/applet.c:908
+#. Note to translators: this is used if no essid is known
+#: ../gnome/applet/applet.c:905 ../gnome/applet/applet.c:1103
+msgid "(unknown)"
+msgstr "(desconocido)"
+
+#: ../gnome/applet/applet.c:911
 #, c-format
 msgid "Preparing device %s for the wired network..."
-msgstr "Preparando el dispositivo %s para la red cableada..."
+msgstr "Preparando el dispositivo %s para la red cableada…"
 
-#: ../src/applet.c:910
+#: ../gnome/applet/applet.c:913
 #, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
-msgstr "Preparando el dispositivo %s para la red inalámbrica «%s»..."
+msgstr "Preparando el dispositivo %s para la red inalámbrica «%s»…"
 
-#: ../src/applet.c:918
+#: ../gnome/applet/applet.c:921
 #, c-format
 msgid "Configuring device %s for the wired network..."
-msgstr "Configurando el dispositivo %s para la red cableada..."
+msgstr "Configurando el dispositivo %s para la red cableada…"
 
-#: ../src/applet.c:920
+#: ../gnome/applet/applet.c:923
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
-msgstr "Intentando conectar con la red inalámbrica «%s»..."
+msgstr "Intentando conectar con la red inalámbrica «%s»…"
 
-#: ../src/applet.c:928
+#: ../gnome/applet/applet.c:931
 #, 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»..."
+msgstr "Esperando la contraseña de red para la red inalámbrica «%s»…"
 
-#: ../src/applet.c:936 ../src/applet.c:946
+#: ../gnome/applet/applet.c:939 ../gnome/applet/applet.c:949
 msgid "Requesting a network address from the wired network..."
-msgstr "Solicitando una dirección de red a la red cableada..."
+msgstr "Solicitando una dirección de red a la red cableada…"
 
-#: ../src/applet.c:938 ../src/applet.c:948
+#: ../gnome/applet/applet.c:941 ../gnome/applet/applet.c:951
 #, 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»..."
+msgstr "Solicitando una dirección de red a la red inalámbrica «%s»…"
 
-#: ../src/applet.c:956
+#: ../gnome/applet/applet.c:959
 msgid "Finishing connection to the wired network..."
-msgstr "Deteniendo la conexión a la red cableada..."
+msgstr "Deteniendo la conexión a la red cableada…"
 
-#: ../src/applet.c:958
+#: ../gnome/applet/applet.c:961
 #, c-format
 msgid "Finishing connection to the wireless network '%s'..."
-msgstr "Deteniendo la conexión a la red inalámbrica «%s»..."
+msgstr "Deteniendo la conexión a la red inalámbrica «%s»…"
 
-#: ../src/applet.c:1075
+#: ../gnome/applet/applet.c:1078
 msgid "NetworkManager is not running"
 msgstr "NetworkManager no se está ejecutando"
 
-#: ../src/applet.c:1083 ../src/applet.c:1828
+#: ../gnome/applet/applet.c:1086 ../gnome/applet/applet.c:1843
 msgid "Networking disabled"
 msgstr "Red desactivada"
 
-#: ../src/applet.c:1088
+#: ../gnome/applet/applet.c:1091
 msgid "No network connection"
 msgstr "Sin conexión de red"
 
-#: ../src/applet.c:1093
+#: ../gnome/applet/applet.c:1096
 msgid "Wired network connection"
 msgstr "Conexión de red cableada"
 
-#: ../src/applet.c:1097
+#: ../gnome/applet/applet.c:1100
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Conectado con una red inalámbrica Ad-Hoc"
 
-#: ../src/applet.c:1099
+#: ../gnome/applet/applet.c:1102
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "Conexión de red inalámbrica a «%s» (%d%%)"
 
-#: ../src/applet.c:1120
+#: ../gnome/applet/applet.c:1123
 #, c-format
 msgid "VPN connection to '%s'"
 msgstr "Conexión VPN a «%s»"
 
-#: ../src/applet.c:1128
+#: ../gnome/applet/applet.c:1131
 #, c-format
 msgid "VPN connecting to '%s'"
 msgstr "VPN conectando a «%s»"
 
-#: ../src/applet.c:1541
+#: ../gnome/applet/applet.c:1556
 msgid "_Connect to Other Wireless Network..."
-msgstr "_Conectar a otra red inalámbrica..."
+msgstr "_Conectar a otra red inalámbrica…"
 
-#: ../src/applet.c:1562
+#: ../gnome/applet/applet.c:1577
 msgid "Create _New Wireless Network..."
-msgstr "Crear una red inalámbrica _nueva..."
+msgstr "Crear una red inalámbrica _nueva…"
 
-#: ../src/applet.c:1685
+#: ../gnome/applet/applet.c:1700
 msgid "_VPN Connections"
 msgstr "Conexiones _VPN"
 
-#: ../src/applet.c:1730
+#: ../gnome/applet/applet.c:1745
 msgid "_Configure VPN..."
-msgstr "_Configurar VPN..."
+msgstr "_Configurar VPN…"
 
-#: ../src/applet.c:1734
+#: ../gnome/applet/applet.c:1749
 msgid "_Disconnect VPN..."
-msgstr "_Desconectar VPN..."
+msgstr "_Desconectar VPN…"
 
-#: ../src/applet.c:1756
+#: ../gnome/applet/applet.c:1771
 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
-#: ../src/applet.c:1767
+#: ../gnome/applet/applet.c:1782
 #, c-format
 msgid "Connect to %s..."
-msgstr "Conectar a %s..."
+msgstr "Conectar a %s…"
 
-#: ../src/applet.c:1773
+#: ../gnome/applet/applet.c:1788
 #, c-format
 msgid "Disconnect from %s..."
-msgstr "Desconectar de %s..."
+msgstr "Desconectar de %s…"
 
-#: ../src/applet.c:1822
+#: ../gnome/applet/applet.c:1837
 msgid "No network devices have been found"
 msgstr "No se ha encontrado ningún dispositivo de red"
 
-#: ../src/applet.c:2014
+#: ../gnome/applet/applet.c:2029
 msgid "NetworkManager is not running..."
-msgstr "NetworkManager no se está ejecutando..."
+msgstr "NetworkManager no se está ejecutando…"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2170
+#: ../gnome/applet/applet.c:2210
 msgid "Enable _Networking"
 msgstr "Activar _red"
 
 #. 'Enable Wireless' item
-#: ../src/applet.c:2176
+#: ../gnome/applet/applet.c:2216
 msgid "Enable _Wireless"
 msgstr "Activar _inalámbrico"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2182
+#: ../gnome/applet/applet.c:2222
 msgid "Connection _Information"
 msgstr "_Información de la conexión"
 
 #. Help item
-#: ../src/applet.c:2193
+#: ../gnome/applet/applet.c:2233
 msgid "_Help"
-msgstr "A_yuda"
+msgstr "Ay_uda"
 
 #. About item
-#: ../src/applet.c:2202
+#: ../gnome/applet/applet.c:2242
 msgid "_About"
 msgstr "A_cerca de"
 
-#: ../src/applet.c:2667
+#: ../gnome/applet/applet.c:2824
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
@@ -306,111 +333,111 @@ msgstr ""
 "La miniaplicación NetworkManager no pudo encontrar algunos recursos "
 "necesarios. No se puede continuar.\n"
 
-#: ../src/wireless-security-option.c:157
+#: ../gnome/applet/wireless-security-option.c:157
 msgid "Open System"
 msgstr "Sistema abierto"
 
-#: ../src/wireless-security-option.c:160
+#: ../gnome/applet/wireless-security-option.c:160
 msgid "Shared Key"
 msgstr "Clave compartida"
 
-#: ../src/wireless-security-option.c:208
+#: ../gnome/applet/wireless-security-option.c:208
 msgid "Automatic (Default)"
 msgstr "Automático (Predeterminado)"
 
-#: ../src/wireless-security-option.c:215
+#: ../gnome/applet/wireless-security-option.c:215
 msgid "AES-CCMP"
 msgstr "AES-CCMP"
 
-#: ../src/wireless-security-option.c:223
+#: ../gnome/applet/wireless-security-option.c:223
 msgid "TKIP"
 msgstr "TKIP"
 
-#: ../src/wireless-security-option.c:231
+#: ../gnome/applet/wireless-security-option.c:231
 msgid "Dynamic WEP"
 msgstr "WEP dinámico"
 
-#: ../src/wso-none.c:53
+#: ../gnome/applet/wso-none.c:53
 msgid "None"
 msgstr "Ninguno"
 
-#: ../src/wso-wep-ascii.c:138
+#: ../gnome/applet/wso-wep-ascii.c:138
 msgid "WEP 64/128-bit ASCII"
-msgstr "ASCII WEP de 64/128 bits"
+msgstr "WEP de 64/128 bits ASCII"
 
-#: ../src/wso-wep-hex.c:135
+#: ../gnome/applet/wso-wep-hex.c:135
 msgid "WEP 64/128-bit Hex"
-msgstr "Hexadecimal WEP de 64/128 bits"
+msgstr "WEP de 64/128bits hex"
 
-#: ../src/wso-wep-passphrase.c:135
+#: ../gnome/applet/wso-wep-passphrase.c:135
 msgid "WEP 128-bit Passphrase"
-msgstr "Frase de contraseña WEP de 128 bits"
+msgstr "Frase de paso WEP de 128 bits"
 
-#: ../src/wso-wpa-eap.c:237
+#: ../gnome/applet/wso-wpa-eap.c:237
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../src/wso-wpa-eap.c:238
+#: ../gnome/applet/wso-wpa-eap.c:238
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wso-wpa-eap.c:239
+#: ../gnome/applet/wso-wpa-eap.c:239
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../src/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
-#: ../src/nm-ap-security-wpa-eap.c:116
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:93
+#: ../src/nm-ap-security-wpa-eap.c:117
 msgid "WPA2 Enterprise"
-msgstr "WPA2 empresarial"
+msgstr "WPA2 corporativo"
 
-#: ../src/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
-#: ../src/nm-ap-security-wpa-eap.c:121
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:95
+#: ../src/nm-ap-security-wpa-eap.c:122
 msgid "WPA Enterprise"
-msgstr "WPA empresarial"
+msgstr "WPA corporativo"
 
-#: ../src/wso-wpa-psk.c:178
+#: ../gnome/applet/wso-wpa-psk.c:178
 msgid "WPA2 Personal"
-msgstr "WPA2 Personal"
+msgstr "WPA2 personal"
 
-#: ../src/wso-wpa-psk.c:180
+#: ../gnome/applet/wso-wpa-psk.c:180
 msgid "WPA Personal"
-msgstr "WPA Personal"
+msgstr "WPA personal"
 
-#: ../src/eggtrayicon.c:134
+#: ../gnome/applet/eggtrayicon.c:134
 msgid "Orientation"
 msgstr "Orientación"
 
-#: ../src/eggtrayicon.c:135
+#: ../gnome/applet/eggtrayicon.c:135
 msgid "The orientation of the tray."
 msgstr "La orientación del área de notificación."
 
-#: ../src/menu-items.c:88
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Red cableada (%s)"
 
-#: ../src/menu-items.c:91
+#: ../gnome/applet/menu-items.c:91
 msgid "_Wired Network"
 msgstr "Red _cableada"
 
-#: ../src/menu-items.c:162
+#: ../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)"
 
-#: ../src/menu-items.c:164
+#: ../gnome/applet/menu-items.c:164
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Red inalámbrica"
 msgstr[1] "Redes inalámbricas"
 
-#: ../src/menu-items.c:343
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr " (Unicode inválido)"
 
-#: ../src/other-network-dialog.c:352
+#: ../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, "
@@ -419,11 +446,11 @@ msgstr ""
 "Por omisión, el nombre de la red inalámbrica se establece al nombre de su "
 "equipo, %s, sin ninguna encriptación activada"
 
-#: ../src/other-network-dialog.c:358
+#: ../gnome/applet/other-network-dialog.c:358
 msgid "Create new wireless network"
-msgstr "Crea una red inalámbricas nueva"
+msgstr "Crea una red inalámbrica nueva"
 
-#: ../src/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."
@@ -431,28 +458,27 @@ msgstr ""
 "Introduzca el nombre y las opciones de seguridad de la red inalámbrica que "
 "quiere crear."
 
-#: ../src/other-network-dialog.c:363
+#: ../gnome/applet/other-network-dialog.c:363
 msgid "Create New Wireless Network"
 msgstr "Crear una red inalámbrica nueva"
 
-#: ../src/other-network-dialog.c:368
+#: ../gnome/applet/other-network-dialog.c:368
 msgid "Existing wireless network"
 msgstr "Red inalámbrica existente"
 
-#: ../src/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 ""
-"Introduzca el nombre de la red inalámbrica con la que quiere conectarse."
+msgstr "Introduzca el nombre de la red inalámbrica a la que quiere conectarse."
 
-#: ../src/other-network-dialog.c:371
+#: ../gnome/applet/other-network-dialog.c:371
 msgid "Connect to Other Wireless Network"
 msgstr "Conectar a otra red inalámbrica"
 
-#: ../src/passphrase-dialog.c:215
+#: ../gnome/applet/passphrase-dialog.c:215
 msgid "Error connecting to wireless network"
 msgstr "Error al conectar a la red inalámbrica"
 
-#: ../src/passphrase-dialog.c:216
+#: ../gnome/applet/passphrase-dialog.c:216
 msgid ""
 "The requested wireless network requires security capabilities unsupported by "
 "your hardware."
@@ -460,13 +486,13 @@ msgstr ""
 "La red inalámbrica solicitada requiere capacidades de seguridad que su "
 "hardware no proporciona."
 
-#: ../src/vpn-password-dialog.c:151
-#: ../src/vpn-password-dialog.c:188
+#: ../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»"
 
-#: ../src/vpn-password-dialog.c:154
+#: ../gnome/applet/vpn-password-dialog.c:154
 #, c-format
 msgid ""
 "Could not find the authentication dialog for VPN connection type '%s'. "
@@ -475,7 +501,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."
 
-#: ../src/vpn-password-dialog.c:191
+#: ../gnome/applet/vpn-password-dialog.c:191
 #, c-format
 msgid ""
 "There was a problem launching the authentication dialog for VPN connection "
@@ -484,18 +510,18 @@ msgstr ""
 "Ha habido un problema al iniciar el diálogo de autenticación para el tipo de "
 "conexión VPN «%s». Póngase en contacto con su administrador de sistemas."
 
-#: ../src/applet.glade.h:1
+#: ../gnome/applet/applet.glade.h:1
 msgid " "
 msgstr " "
 
-#: ../src/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\">Información de la conexión activa</"
 "span>"
 
-#: ../src/applet.glade.h:4
+#: ../gnome/applet/applet.glade.h:4
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
@@ -510,7 +536,7 @@ msgstr ""
 "Se requiere una frase de paso o clave de encriptación para acceder a la red "
 "inalámbrica «%s»."
 
-#: ../src/applet.glade.h:8
+#: ../gnome/applet/applet.glade.h:8
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
@@ -519,9 +545,9 @@ msgid ""
 msgstr ""
 "<span weight=\"bold\" size=\"larger\">Funcionalidad de red reducida</span>\n"
 "\n"
-"%s No será completamente funcional."
+"%s  No será completamente funcional."
 
-#: ../src/applet.glade.h:12
+#: ../gnome/applet/applet.glade.h:12
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
@@ -538,75 +564,79 @@ msgstr ""
 "red es segura, marque la casilla de abajo y NetworkManager no le volverá a "
 "solicitar confirmación en los siguientes accesos."
 
-#: ../src/applet.glade.h:15
+#: ../gnome/applet/applet.glade.h:15
 msgid "Anonymous Identity:"
 msgstr "Identidad anónima:"
 
-#: ../src/applet.glade.h:16
+#: ../gnome/applet/applet.glade.h:16
 msgid "Authentication:"
 msgstr "Autenticación:"
 
-#: ../src/applet.glade.h:17
+#: ../gnome/applet/applet.glade.h:17
 msgid "Broadcast Address:"
 msgstr "Dirección de difusión:"
 
-#: ../src/applet.glade.h:18
+#: ../gnome/applet/applet.glade.h:18
 msgid "CA Certificate File:"
-msgstr "Archivo de certificado de CA:"
+msgstr "Archivo de certificado CA:"
 
-#: ../src/applet.glade.h:19
+#: ../gnome/applet/applet.glade.h:19
 msgid "C_onnect"
 msgstr "_Conectar"
 
-#: ../src/applet.glade.h:20
+#: ../gnome/applet/applet.glade.h:20
 msgid "Client Certificate File:"
-msgstr "Archivo de certificado de cliente:"
+msgstr "Archivo de certificado del cliente:"
 
-#: ../src/applet.glade.h:21
+#: ../gnome/applet/applet.glade.h:21
 msgid "Connection Information"
 msgstr "Información de la conexión"
 
-#: ../src/applet.glade.h:22
+#: ../gnome/applet/applet.glade.h:22
 msgid "Default Route:"
 msgstr "Ruta predeterminada:"
 
-#: ../src/applet.glade.h:23
+#: ../gnome/applet/applet.glade.h:23
 msgid "Destination Address:"
 msgstr "Dirección de destino:"
 
-#: ../src/applet.glade.h:24
+#: ../gnome/applet/applet.glade.h:24
 msgid "Driver:"
 msgstr "Controlador:"
 
-#: ../src/applet.glade.h:25
+#: ../gnome/applet/applet.glade.h:25
 msgid "EAP Method:"
 msgstr "Método EAP:"
 
-#: ../src/applet.glade.h:26
+#: ../gnome/applet/applet.glade.h:26
 msgid "Hardware Address:"
 msgstr "Dirección hardware:"
 
-#: ../src/applet.glade.h:27
+#: ../gnome/applet/applet.glade.h:27
 msgid "IP Address:"
 msgstr "Dirección IP:"
 
-#: ../src/applet.glade.h:28
+#: ../gnome/applet/applet.glade.h:28
 msgid "Identity:"
 msgstr "Identidad:"
 
-#: ../src/applet.glade.h:29
+#: ../gnome/applet/applet.glade.h:29
 msgid "Interface:"
 msgstr "Interfaz:"
 
-#: ../src/applet.glade.h:30
+#: ../gnome/applet/applet.glade.h:30
 msgid "Key Type:"
 msgstr "Tipo de clave:"
 
-#: ../src/applet.glade.h:31
+#: ../gnome/applet/applet.glade.h:31
+msgid "Key management:"
+msgstr "Gestión de claves:"
+
+#: ../gnome/applet/applet.glade.h:32
 msgid "Key:"
 msgstr "Clave:"
 
-#: ../src/applet.glade.h:32
+#: ../gnome/applet/applet.glade.h:33
 msgid ""
 "None\n"
 "WEP 128-bit Passphrase\n"
@@ -614,11 +644,11 @@ msgid ""
 "WEP 64/128-bit ASCII\n"
 msgstr ""
 "Ninguna\n"
-"Frase de contraseña WEP de 128 bits\n"
-"Hexadecimal WEP de 64/128 bits\n"
-"ASCII WEP de 64/128 bits\n"
+"Frase de paso WEP de 128 bits\n"
+"WEP 64/128-bit hex\n"
+"WEP 64/128-bit ASCII\n"
 
-#: ../src/applet.glade.h:37
+#: ../gnome/applet/applet.glade.h:38
 msgid ""
 "Open System\n"
 "Shared Key"
@@ -626,111 +656,115 @@ msgstr ""
 "Sistema abierto\n"
 "Clave compartida"
 
-#: ../src/applet.glade.h:39
+#: ../gnome/applet/applet.glade.h:40
 msgid "Other Wireless Network..."
-msgstr "Otras redes inalámbricas..."
+msgstr "Otras redes inalámbricas…"
 
-#: ../src/applet.glade.h:40
+#: ../gnome/applet/applet.glade.h:41
 msgid "Passphrase:"
-msgstr "Contraseña:"
+msgstr "Frase de paso:"
 
-#: ../src/applet.glade.h:41
+#: ../gnome/applet/applet.glade.h:42
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: ../src/applet.glade.h:42
+#: ../gnome/applet/applet.glade.h:43
 msgid "Primary DNS:"
 msgstr "DNS primario:"
 
-#: ../src/applet.glade.h:43
+#: ../gnome/applet/applet.glade.h:44
 msgid "Private Key File:"
 msgstr "Archivo de clave privada:"
 
-#: ../src/applet.glade.h:44
+#: ../gnome/applet/applet.glade.h:45
 msgid "Private Key Password:"
 msgstr "Contraseña de clave privada:"
 
-#: ../src/applet.glade.h:45
+#: ../gnome/applet/applet.glade.h:46
 msgid "Secondary DNS:"
 msgstr "DNS secundario:"
 
-#: ../src/applet.glade.h:46
+#: ../gnome/applet/applet.glade.h:47
 msgid "Select the CA Certificate File"
-msgstr "Seleccione el archivo de certificado de CA"
+msgstr "Seleccione el archivo de certificado CA"
 
-#: ../src/applet.glade.h:47
+#: ../gnome/applet/applet.glade.h:48
 msgid "Select the Client Certificate File"
-msgstr "Seleccione el archivo de certificado de cliente"
+msgstr "Seleccione el archivo de certificado del cliente"
 
-#: ../src/applet.glade.h:48
+#: ../gnome/applet/applet.glade.h:49
 msgid "Select the Private Key File"
 msgstr "Seleccione el archivo de clave privada"
 
-#: ../src/applet.glade.h:49
+#: ../gnome/applet/applet.glade.h:50
 msgid "Show key"
-msgstr "Mostrar clave"
+msgstr "Mostrar la clave"
 
-#: ../src/applet.glade.h:50
+#: ../gnome/applet/applet.glade.h:51
 msgid "Show passphrase"
-msgstr "Mostrar frase de contraseña"
+msgstr "Mostrar la frase de paso"
 
-#: ../src/applet.glade.h:51
+#: ../gnome/applet/applet.glade.h:52
 msgid "Show password"
-msgstr "Mostrar contraseña"
+msgstr "Mostrar la contraseña"
 
-#: ../src/applet.glade.h:52
+#: ../gnome/applet/applet.glade.h:53
 msgid "Show passwords"
-msgstr "Mostrar contraseñas"
+msgstr "Mostrar las contraseñas"
 
-#: ../src/applet.glade.h:53
+#: ../gnome/applet/applet.glade.h:54
 msgid "Speed:"
 msgstr "Velocidad:"
 
-#: ../src/applet.glade.h:54
+#: ../gnome/applet/applet.glade.h:55
 msgid "Subnet Mask:"
 msgstr "Máscara de subred:"
 
-#: ../src/applet.glade.h:55
+#: ../gnome/applet/applet.glade.h:56
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../src/applet.glade.h:56
+#: ../gnome/applet/applet.glade.h:57
 msgid "User Name:"
 msgstr "Nombre de usuario:"
 
-#: ../src/applet.glade.h:57
+#: ../gnome/applet/applet.glade.h:58
 msgid "Wireless Network Key Required"
 msgstr "Clave requerida para la red inalámbrica"
 
-#: ../src/applet.glade.h:58
+#: ../gnome/applet/applet.glade.h:59
 msgid "Wireless _adapter:"
 msgstr "_Adaptador inalámbrico:"
 
-#: ../src/applet.glade.h:59
+#: ../gnome/applet/applet.glade.h:60
 msgid "_Always Trust this Wireless Network"
 msgstr "_Siempre confiar en esta red inalámbrica"
 
-#: ../src/applet.glade.h:60
+#: ../gnome/applet/applet.glade.h:61
 msgid "_Don't remind me again"
 msgstr "_No volver a recordar"
 
-#: ../src/applet.glade.h:61
+#: ../gnome/applet/applet.glade.h:62
+msgid "_Fallback on this Network"
+msgstr "_En caso de error volver a esta red"
+
+#: ../gnome/applet/applet.glade.h:63
 msgid "_Login to Network"
 msgstr "_Entrar en la red"
 
-#: ../src/applet.glade.h:62
+#: ../gnome/applet/applet.glade.h:64
 msgid "_Network Name:"
 msgstr "Nombre de _red:"
 
-#: ../src/applet.glade.h:63
+#: ../gnome/applet/applet.glade.h:65
 msgid "_Wireless Security:"
 msgstr "_Seguridad inalámbrica:"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:383
+#: ../gnome/vpn-properties/nm-vpn-properties.c:417
 msgid "Cannot add VPN connection"
 msgstr "No se puede añadir una conexión VPN"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:385
+#: ../gnome/vpn-properties/nm-vpn-properties.c:419
 msgid ""
 "No suitable VPN software was found on your system. Contact your system "
 "administrator."
@@ -738,11 +772,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:437
+#: ../gnome/vpn-properties/nm-vpn-properties.c:461
 msgid "Cannot import VPN connection"
 msgstr "No se puede importar la conexión VPN"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:439
+#: ../gnome/vpn-properties/nm-vpn-properties.c:463
 #, c-format
 msgid ""
 "Cannot find suitable software for VPN connection type '%s' to import the "
@@ -752,12 +786,12 @@ msgstr ""
 "s» para importar el archivo «%s». Póngase en contacto con su administrador "
 "de sistemas."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:579
+#: ../gnome/vpn-properties/nm-vpn-properties.c:580
 #, 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:582
+#: ../gnome/vpn-properties/nm-vpn-properties.c:583
 #, c-format
 msgid ""
 "Could not find the UI files for VPN connection type '%s'. Contact your "
@@ -766,12 +800,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:739
+#: ../gnome/vpn-properties/nm-vpn-properties.c:727
 #, c-format
 msgid "Delete VPN connection \"%s\"?"
 msgstr "¿Desea eliminar la conexión VPN «%s»?"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:742
+#: ../gnome/vpn-properties/nm-vpn-properties.c:730
 #, c-format
 msgid ""
 "All information about the VPN connection \"%s\" will be lost and you may "
@@ -781,16 +815,36 @@ 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:959
+#: ../gnome/vpn-properties/nm-vpn-properties.c:924
 msgid "Unable to load"
 msgstr "No se puede cargar"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:961
+#: ../gnome/vpn-properties/nm-vpn-properties.c:926
 msgid "Cannot find some needed resources (the glade file)!"
 msgstr "No se pueden encontrar algunos recursos necesarios (el archivo glade)."
 
+#. druid_window = GTK_DIALOG (gtk_dialog_new_with_buttons (_("Create VPN Connection"),
+#. NULL,
+#. GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+#. GTK_STOCK_CANCEL,
+#. GTK_RESPONSE_REJECT,
+#. GTK_STOCK_APPLY,
+#. GTK_RESPONSE_ACCEPT,
+#. NULL));
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1081
+msgid "Create VPN Connection"
+msgstr "Crear conexión VPN"
+
+#. gtk_container_add (GTK_CONTAINER (druid_window->vbox), GTK_WIDGET(gtk_label_new("Some label")));
+#. gtk_box_pack_start (GTK_BOX (druid_window->vbox), GTK_WIDGET(druid), TRUE,TRUE,0);
+#. gtk_box_pack_start (GTK_BOX (druid_window->vbox), GTK_WIDGET(gtk_label_new("Some label")), TRUE,TRUE,0);
+#. toplevel = gtk_widget_get_toplevel (GTK_WIDGET (druid));
+#. gtk_signal_connect (GTK_OBJECT (toplevel), "delete_event", GTK_SIGNAL_FUNC (vpn_window_close), NULL);
+#. make the druid window modal wrt. our main window
+#. gtk_window_set_modal (druid_window, TRUE);
+#. gtk_window_set_transient_for (GTK_WINDOW(druid_window), GTK_WINDOW (dialog));
 #. Edit dialog
-#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1099
 msgid "Edit VPN Connection"
 msgstr "Editar conexión VPN"
 
@@ -799,68 +853,30 @@ msgid "Add a new VPN connection"
 msgstr "Añadir una conexión VPN nueva"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:2
-msgid "Choose which type of VPN connection you wish to create."
-msgstr "Seleccione qué tipo de conexión VPN desea crear."
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
-msgid "Connect to:"
-msgstr "Conectar con:"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
-msgid "Create VPN Connection"
-msgstr "Crear conexión VPN"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
-msgid "Create VPN Connection - 1 of 2"
-msgstr "Crear conexión VPN - 1 de 2"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
-msgid "Create VPN Connection - 2 of 2"
-msgstr "Crear conexión VPN - 2 de 2"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
 msgid "Delete the selected VPN connection"
 msgstr "Eliminar la conexión VPN seleccionada"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
 msgid "E_xport"
 msgstr "E_xportar"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:9
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
 msgid "Edit the selected VPN connection"
 msgstr "Editar la conexión VPN seleccionada"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:10
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
 msgid "Export the VPN settings to a file"
 msgstr "Exportar los ajustes VPN a un archivo"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:11
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
 msgid "Export the selected VPN connection to a file"
 msgstr "Exportar la conexión VPN seleccionada a un archivo"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:12
-msgid "Finish Creating VPN Connection"
-msgstr "Finalizar la creación de una conexión VPN."
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:13
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
 msgid "Manage Virtual Private Network Connections"
 msgstr "Gestionar conexiones de Red Privada Virtual (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 ""
-"Este asistente le guiará a través de la creación de una nueva conexión a una "
-"red privada virtual (VPN).\n"
-"\n"
-"Necesitará alguna información como, por ejemplo, direcciones IP y secretos, "
-"que probablemente le serán proporcionados por su administrador de sistemas."
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:17
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
 msgid "VPN Connections"
 msgstr "Conexiones VPN"
 
@@ -896,11 +912,11 @@ msgstr "WPA2 CCMP"
 msgid "WPA2 Automatic"
 msgstr "WPA2 automática"
 
-#: ../src/nm-ap-security.c:320
+#: ../src/nm-ap-security.c:338
 msgid "none"
 msgstr "ninguna"
 
-#: ../src/nm-netlink-monitor.c:154
+#: ../src/nm-netlink-monitor.c:174
 #, c-format
 msgid ""
 "unable to create netlink socket for monitoring wired ethernet devices - %s"
@@ -908,7 +924,7 @@ msgstr ""
 "no puede crear un socket netlink para monitorizar dispositivos ethernet con "
 "cable - %s"
 
-#: ../src/nm-netlink-monitor.c:172
+#: ../src/nm-netlink-monitor.c:192
 #, c-format
 msgid ""
 "unable to bind to netlink socket for monitoring wired ethernet devices - %s"
@@ -916,85 +932,53 @@ msgstr ""
 "no se puede asociar al socket netlink para monitorizar dispositivos ethernet "
 "con cable - %s"
 
-#: ../src/nm-netlink-monitor.c:405
+#: ../src/nm-netlink-monitor.c:427
 msgid "operation took too long"
 msgstr "la operación duró demasiado"
 
-#: ../src/nm-netlink-monitor.c:502
+#: ../src/nm-netlink-monitor.c:524
 msgid "received data from wrong type of sender"
 msgstr "se han recibido datos con un tipo de emisor incorrecto"
 
-#: ../src/nm-netlink-monitor.c:515
+#: ../src/nm-netlink-monitor.c:537
 msgid "received data from unexpected sender"
 msgstr "se han recibido datos de un emisor inesperado"
 
-#: ../src/nm-netlink-monitor.c:646
+#: ../src/nm-netlink-monitor.c:666
 msgid "too much data was sent over socket and some of it was lost"
 msgstr ""
 "se han enviado demasiados datos a través del socket y algunos de perdieron"
 
-#: ../src/nm-netlink-monitor.c:735
+#: ../src/nm-netlink-monitor.c:776
 msgid "error occurred while waiting for data on socket"
 msgstr "ha ocurrido un error mientras esperaban datos en un socket"
 
-#: ../src/applet-dbus-devices.c:898
+#: ../gnome/applet/applet-dbus-devices.c:930
 #, 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."
+msgstr "Ahora está conectado a la red inalámbrica Ad-Hoc «%s»."
 
-#: ../src/applet-dbus-devices.c:903
+#: ../gnome/applet/applet-dbus-devices.c:935
 #, c-format
 msgid "You are now connected to the wireless network '%s'."
-msgstr "Ahora está conectado a la red inalámbrica %s."
+msgstr "Ahora está conectado a la red inalámbrica «%s»."
 
-#: ../src/applet-dbus-devices.c:910
+#: ../gnome/applet/applet-dbus-devices.c:942
 msgid "You are now connected to the wired network."
-msgstr "Ahora está conectado a la red fija."
+msgstr "Ahora está conectado a la red cableada."
 
-#: ../src/applet-dbus-devices.c:916
+#: ../gnome/applet/applet-dbus-devices.c:948
 msgid "Connection Established"
-msgstr "Conexión establecida"
+msgstr "Se ha establecido la conexión"
 
-#: ../src/applet-dbus-devices.c:959
+#: ../gnome/applet/applet-dbus-devices.c:997
 msgid "Disconnected"
 msgstr "Desconectado"
 
-#: ../src/applet-dbus-devices.c:960
+#: ../gnome/applet/applet-dbus-devices.c:998
 msgid "The network connection has been disconnected."
-msgstr "La conexión de red se ha desconectado."
-
-#~ msgid "Stop automatically running the networking applet?"
-#~ msgstr "¿Desea detener la ejecución automática del applet 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 ""
-#~ "El applet de red se cerrará ahora, pero se iniciará automáticamente la "
-#~ "próxima vez que inicie sesión. ¿Desea detener la ejecución automática del "
-#~ "applet de red al inicio de sesión?"
-
-#~ msgid "_Remove"
-#~ msgstr "_Eliminar"
-
-#~ 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"
+msgstr "La conexión de red ha sido desconectada."
 
-#~ msgid "wpa_psk_subwindow"
-#~ msgstr "wpa_psk_subwindow"
+#: ../src/nm-ap-security-leap.c:66 ../src/nm-ap-security-leap.c:82
+msgid "LEAP"
+msgstr "LEAP"
diff --git a/po/et.po b/po/et.po
new file mode 100644
index 00000000..f69ed21f
--- /dev/null
+++ b/po/et.po
@@ -0,0 +1,886 @@
+# Networkmanageri tõlge eesti keelde.
+# Estonian translation of Networkmanager.
+#
+# Copyright (C) 2006 Free Software Foundation, Inc.
+# This file is distributed under the same license as the Networkmanager package.
+#
+# Priit Laes <amd@store20.com>, 2006.
+# Ivar Smolin <okul at linux.ee> 2006.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Networkmanager\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-09-27 21:50+0200\n"
+"PO-Revision-Date: 2006-10-08 01:05+0300\n"
+"Last-Translator: Ivar Smolin <okul@linux.ee>\n"
+"Language-Team: Estonian <gnome-et@linux.ee>\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:926
+#, c-format
+msgid "Passphrase for wireless network %s"
+msgstr "Salasõna juhtmeta võrgu %s jaoks"
+
+#: ../gnome/applet/applet-dbus.c:265
+#, c-format
+msgid "Connection to the wireless network '%s' failed."
+msgstr "Tõrge juhtmeta võrku '%s' ühendumisel."
+
+#: ../gnome/applet/applet-dbus.c:270
+msgid "Connection to the wired network failed."
+msgstr "Juhtmega võrku ühendumine ebaõnnestus."
+
+#: ../gnome/applet/applet.c:184
+msgid "Error displaying connection information:"
+msgstr "Viga ühenduse andmete kuvamisel:"
+
+#: ../gnome/applet/applet.c:202
+msgid "Could not find some required resources (the glade file)!"
+msgstr ""
+
+#: ../gnome/applet/applet.c:213
+msgid "No active connections!"
+msgstr "Aktiivseid ühendusi pole!"
+
+#: ../gnome/applet/applet.c:234
+#, c-format
+msgid "Wired Ethernet (%s)"
+msgstr ""
+
+#: ../gnome/applet/applet.c:236
+#, c-format
+msgid "Wireless Ethernet (%s)"
+msgstr ""
+
+#: ../gnome/applet/applet.c:332
+#: ../gnome/applet/applet.c:358
+msgid "NetworkManager Applet"
+msgstr "Võrguhalduri rakend"
+
+#: ../gnome/applet/applet.c:334
+msgid ""
+"Copyright © 2004-2006 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+msgstr ""
+"Autoriõigused © 2004-2006 Red Hat, Inc.\n"
+"Autoriõigused © 2005-2006 Novell, Inc."
+
+#: ../gnome/applet/applet.c:336
+#: ../gnome/applet/applet.c:362
+msgid "Notification area applet for managing your network devices and connections."
+msgstr ""
+
+#: ../gnome/applet/applet.c:339
+#: ../gnome/applet/applet.c:366
+msgid "translator-credits"
+msgstr ""
+"Priit Laes <amd@store20.com>, 2006.\n"
+"Ivar Smolin <okul@linux.ee> 2006."
+
+#: ../gnome/applet/applet.c:360
+msgid ""
+"Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+msgstr ""
+"Autoriõigused © 2004-2005 Red Hat, Inc.\n"
+"Autoriõigused © 2005-2006 Novell, Inc."
+
+#: ../gnome/applet/applet.c:422
+msgid "VPN Login Failure"
+msgstr ""
+
+#: ../gnome/applet/applet.c:423
+#, c-format
+msgid "Could not start the VPN connection '%s' due to a login failure."
+msgstr ""
+
+#: ../gnome/applet/applet.c:427
+msgid "VPN Start Failure"
+msgstr ""
+
+#: ../gnome/applet/applet.c:428
+#, c-format
+msgid "Could not start the VPN connection '%s' due to a failure launching the VPN program."
+msgstr ""
+
+#: ../gnome/applet/applet.c:432
+#: ../gnome/applet/applet.c:442
+msgid "VPN Connect Failure"
+msgstr ""
+
+#: ../gnome/applet/applet.c:433
+#, c-format
+msgid "Could not start the VPN connection '%s' due to a connection error."
+msgstr ""
+
+#: ../gnome/applet/applet.c:437
+msgid "VPN Configuration Error"
+msgstr ""
+
+#: ../gnome/applet/applet.c:438
+#, c-format
+msgid "The VPN connection '%s' was not correctly configured."
+msgstr ""
+
+#: ../gnome/applet/applet.c:443
+#, 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:513
+msgid "VPN Login Message"
+msgstr ""
+
+#: ../gnome/applet/applet.c:737
+#: ../gnome/applet/applet.c:2507
+#: ../gnome/applet/other-network-dialog.c:458
+#: ../gnome/applet/passphrase-dialog.c:228
+msgid "The NetworkManager Applet could not find some required resources (the glade file was not found)."
+msgstr ""
+
+#: ../gnome/applet/applet.c:749
+#, c-format
+msgid "The network device \"%s (%s)\" does not support wireless scanning."
+msgstr ""
+
+#: ../gnome/applet/applet.c:757
+#, c-format
+msgid "The network device \"%s (%s)\" does not support link detection."
+msgstr ""
+
+#: ../gnome/applet/applet.c:904
+#, c-format
+msgid "Preparing device %s for the wired network..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:906
+#, c-format
+msgid "Preparing device %s for the wireless network '%s'..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:914
+#, c-format
+msgid "Configuring device %s for the wired network..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:916
+#, c-format
+msgid "Attempting to join the wireless network '%s'..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:924
+#, c-format
+msgid "Waiting for Network Key for the wireless network '%s'..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:932
+#: ../gnome/applet/applet.c:942
+msgid "Requesting a network address from the wired network..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:934
+#: ../gnome/applet/applet.c:944
+#, c-format
+msgid "Requesting a network address from the wireless network '%s'..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:952
+msgid "Finishing connection to the wired network..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:954
+#, c-format
+msgid "Finishing connection to the wireless network '%s'..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1071
+msgid "NetworkManager is not running"
+msgstr "Võrguhaldur ei tööta"
+
+#: ../gnome/applet/applet.c:1079
+#: ../gnome/applet/applet.c:1824
+msgid "Networking disabled"
+msgstr ""
+
+#: ../gnome/applet/applet.c:1084
+msgid "No network connection"
+msgstr "Võrguühendus puudub"
+
+#: ../gnome/applet/applet.c:1089
+msgid "Wired network connection"
+msgstr "Juhtmega võrgu ühendus"
+
+#: ../gnome/applet/applet.c:1093
+msgid "Connected to an Ad-Hoc wireless network"
+msgstr ""
+
+#: ../gnome/applet/applet.c:1095
+#, c-format
+msgid "Wireless network connection to '%s' (%d%%)"
+msgstr ""
+
+#: ../gnome/applet/applet.c:1116
+#, c-format
+msgid "VPN connection to '%s'"
+msgstr ""
+
+#: ../gnome/applet/applet.c:1124
+#, c-format
+msgid "VPN connecting to '%s'"
+msgstr ""
+
+#: ../gnome/applet/applet.c:1537
+msgid "_Connect to Other Wireless Network..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1558
+msgid "Create _New Wireless Network..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1681
+msgid "_VPN Connections"
+msgstr "_VPN-ühendused"
+
+#: ../gnome/applet/applet.c:1726
+msgid "_Configure VPN..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1730
+msgid "_Disconnect VPN..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1752
+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:1763
+#, c-format
+msgid "Connect to %s..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1769
+#, c-format
+msgid "Disconnect from %s..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1818
+msgid "No network devices have been found"
+msgstr "Võrguseadmeid ei leitud"
+
+#: ../gnome/applet/applet.c:2010
+msgid "NetworkManager is not running..."
+msgstr "Võrguhaldur ei tööta..."
+
+#. 'Enable Networking' item
+#: ../gnome/applet/applet.c:2166
+msgid "Enable _Networking"
+msgstr ""
+
+#. 'Enable Wireless' item
+#: ../gnome/applet/applet.c:2172
+msgid "Enable _Wireless"
+msgstr ""
+
+#. 'Connection Information' item
+#: ../gnome/applet/applet.c:2178
+msgid "Connection _Information"
+msgstr "Ü_henduse andmed"
+
+#. Help item
+#: ../gnome/applet/applet.c:2189
+msgid "_Help"
+msgstr "_Abi"
+
+#. About item
+#: ../gnome/applet/applet.c:2198
+msgid "_About"
+msgstr "_Programmist lähemalt"
+
+#: ../gnome/applet/applet.c:2666
+msgid "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 ""
+
+#: ../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 "Dünaamiline WEP"
+
+#: ../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
+msgid "WEP 128-bit Passphrase"
+msgstr ""
+
+#: ../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:93
+#: ../src/nm-ap-security-wpa-eap.c:117
+msgid "WPA2 Enterprise"
+msgstr ""
+
+#: ../gnome/applet/wso-wpa-eap.c:249
+#: ../src/nm-ap-security-wpa-eap.c:95
+#: ../src/nm-ap-security-wpa-eap.c:122
+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 "Juhtmega võrk (%s)"
+
+#: ../gnome/applet/menu-items.c:91
+msgid "_Wired Network"
+msgstr "_Juhtmega võrk"
+
+#: ../gnome/applet/menu-items.c:162
+#, c-format
+msgid "Wireless Network (%s)"
+msgid_plural "Wireless Networks (%s)"
+msgstr[0] "Juhtmeta võrk (%s)"
+msgstr[1] "Juhtmeta võrgud (%s)"
+
+#: ../gnome/applet/menu-items.c:164
+msgid "Wireless Network"
+msgid_plural "Wireless Networks"
+msgstr[0] "Juhtmeta võrk"
+msgstr[1] "Juhtmeta võrgud"
+
+#: ../gnome/applet/menu-items.c:343
+msgid " (invalid Unicode)"
+msgstr " (vigane Unikood)"
+
+#: ../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
+msgid "Create New Wireless Network"
+msgstr ""
+
+#: ../gnome/applet/other-network-dialog.c:368
+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
+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 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-ühendust '%s' pole võimalik alustada"
+
+#: ../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
+msgid "<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
+msgstr ""
+
+#: ../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 "Anonüümne identiteet:"
+
+#: ../gnome/applet/applet.glade.h:16
+msgid "Authentication:"
+msgstr "Autentimine:"
+
+#: ../gnome/applet/applet.glade.h:17
+msgid "Broadcast Address:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:18
+msgid "CA Certificate File:"
+msgstr "Sertifitseerimiskeskuse sertifikaadifail:"
+
+#: ../gnome/applet/applet.glade.h:19
+msgid "C_onnect"
+msgstr "Ü_hendu"
+
+#: ../gnome/applet/applet.glade.h:20
+msgid "Client Certificate File:"
+msgstr "Kliendi sertifikaadifail:"
+
+#: ../gnome/applet/applet.glade.h:21
+msgid "Connection Information"
+msgstr "Ühenduse andmed"
+
+#: ../gnome/applet/applet.glade.h:22
+msgid "Default Route:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:23
+msgid "Destination Address:"
+msgstr "Sihtaadress:"
+
+#: ../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 "Riistvaraline aadress:"
+
+#: ../gnome/applet/applet.glade.h:27
+msgid "IP Address:"
+msgstr "IP-aadress:"
+
+#: ../gnome/applet/applet.glade.h:28
+msgid "Identity:"
+msgstr "Identiteet:"
+
+#: ../gnome/applet/applet.glade.h:29
+msgid "Interface:"
+msgstr "Liides:"
+
+#: ../gnome/applet/applet.glade.h:30
+msgid "Key Type:"
+msgstr "Võtme liik:"
+
+#: ../gnome/applet/applet.glade.h:31
+msgid "Key management:"
+msgstr "Võtmehaldus:"
+
+#: ../gnome/applet/applet.glade.h:32
+msgid "Key:"
+msgstr "Võti:"
+
+#: ../gnome/applet/applet.glade.h:33
+msgid ""
+"None\n"
+"WEP 128-bit Passphrase\n"
+"WEP 64/128-bit Hex\n"
+"WEP 64/128-bit ASCII\n"
+msgstr ""
+"Puudub\n"
+"WEP 128-bitine salasõna\n"
+"WEP 64/128-bitine Hex\n"
+"WEP 64/128-bitine ASCII\n"
+
+#: ../gnome/applet/applet.glade.h:38
+msgid ""
+"Open System\n"
+"Shared Key"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:40
+msgid "Other Wireless Network..."
+msgstr "Muu juhtmeta võrk..."
+
+#: ../gnome/applet/applet.glade.h:41
+msgid "Passphrase:"
+msgstr "Salasõna:"
+
+#: ../gnome/applet/applet.glade.h:42
+msgid "Password:"
+msgstr "Parool:"
+
+#: ../gnome/applet/applet.glade.h:43
+msgid "Primary DNS:"
+msgstr "Esmane DNS:"
+
+#: ../gnome/applet/applet.glade.h:44
+msgid "Private Key File:"
+msgstr "Privaatvõtme fail:"
+
+#: ../gnome/applet/applet.glade.h:45
+msgid "Private Key Password:"
+msgstr "Privaatvõtme parool:"
+
+#: ../gnome/applet/applet.glade.h:46
+msgid "Secondary DNS:"
+msgstr "Teisene DNS:"
+
+#: ../gnome/applet/applet.glade.h:47
+msgid "Select the CA Certificate File"
+msgstr "Sertifitseerimiskeskuse sertifikaadifaili valimine"
+
+#: ../gnome/applet/applet.glade.h:48
+msgid "Select the Client Certificate File"
+msgstr "Kliendi sertifikaadifaili valimine"
+
+#: ../gnome/applet/applet.glade.h:49
+msgid "Select the Private Key File"
+msgstr "Privaatvõtme faili valimine"
+
+#: ../gnome/applet/applet.glade.h:50
+msgid "Show key"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:51
+msgid "Show passphrase"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:52
+msgid "Show password"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:53
+msgid "Show passwords"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:54
+msgid "Speed:"
+msgstr "Kiirus:"
+
+#: ../gnome/applet/applet.glade.h:55
+msgid "Subnet Mask:"
+msgstr "Alamvõrgu mask:"
+
+#: ../gnome/applet/applet.glade.h:56
+msgid "Type:"
+msgstr "Liik:"
+
+#: ../gnome/applet/applet.glade.h:57
+msgid "User Name:"
+msgstr "Kasutajanimi:"
+
+#: ../gnome/applet/applet.glade.h:58
+msgid "Wireless Network Key Required"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:59
+msgid "Wireless _adapter:"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:60
+msgid "_Always Trust this Wireless Network"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:61
+msgid "_Don't remind me again"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:62
+msgid "_Fallback on this Network"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:63
+msgid "_Login to Network"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:64
+msgid "_Network Name:"
+msgstr "_Võrgu nimi:"
+
+#: ../gnome/applet/applet.glade.h:65
+msgid "_Wireless Security:"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:389
+msgid "Cannot add VPN connection"
+msgstr "VPN-ühendust pole võimalik lisada"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:391
+msgid "No suitable VPN software was found on your system. Contact your system administrator."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:433
+msgid "Cannot import VPN connection"
+msgstr "VPN-ühendust pole võimalik importida"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:435
+#, 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:555
+#, c-format
+msgid "Error retrieving VPN connection '%s'"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:558
+#, 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:714
+#, c-format
+msgid "Delete VPN connection \"%s\"?"
+msgstr "Kas kustutada VPN-ühendus \"%s\"?"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:717
+#, 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:912
+msgid "Unable to load"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:914
+msgid "Cannot find some needed resources (the glade file)!"
+msgstr ""
+
+#. druid_window = GTK_DIALOG (gtk_dialog_new_with_buttons (_("Create VPN Connection"),
+#. NULL,
+#. GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+#. GTK_STOCK_CANCEL,
+#. GTK_RESPONSE_REJECT,
+#. GTK_STOCK_APPLY,
+#. GTK_RESPONSE_ACCEPT,
+#. NULL));
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1059
+msgid "Create VPN Connection"
+msgstr "VPN-ühenduse loomine"
+
+#. gtk_container_add (GTK_CONTAINER (druid_window->vbox), GTK_WIDGET(gtk_label_new("Some label")));
+#. gtk_box_pack_start (GTK_BOX (druid_window->vbox), GTK_WIDGET(druid), TRUE,TRUE,0);
+#. gtk_box_pack_start (GTK_BOX (druid_window->vbox), GTK_WIDGET(gtk_label_new("Some label")), TRUE,TRUE,0);
+#. toplevel = gtk_widget_get_toplevel (GTK_WIDGET (druid));
+#. gtk_signal_connect (GTK_OBJECT (toplevel), "delete_event", GTK_SIGNAL_FUNC (vpn_window_close), NULL);
+#. make the druid window modal wrt. our main window
+#. gtk_window_set_modal (druid_window, TRUE);
+#. gtk_window_set_transient_for (GTK_WINDOW(druid_window), GTK_WINDOW (dialog));
+#. Edit dialog
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1077
+msgid "Edit VPN Connection"
+msgstr "VPN-ühenduse redigeerimine"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:1
+msgid "Add a new VPN connection"
+msgstr "Uue VPN-ühenduse lisamine"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:2
+msgid "Delete the selected VPN connection"
+msgstr "Valitud VPN-ühenduse kustutamine"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
+msgid "E_xport"
+msgstr "_Ekspordi"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
+msgid "Edit the selected VPN connection"
+msgstr "Valitud VPN-ühenduse redigeerimine"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
+msgid "Export the VPN settings to a file"
+msgstr "VPN-sätete eksportimine faili"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
+msgid "Export the selected VPN connection to a file"
+msgstr "Valitud VPN-ühenduse eksportimine faili"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
+msgid "Manage Virtual Private Network Connections"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
+msgid "VPN Connections"
+msgstr "VPN ühendused"
+
+#: ../src/nm-ap-security-wep.c:52
+msgid "40-bit WEP"
+msgstr "40-bitine WEP"
+
+#: ../src/nm-ap-security-wep.c:54
+msgid "104-bit WEP"
+msgstr "104-bitine 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 automaatne"
+
+#: ../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 automaatne"
+
+#: ../src/nm-ap-security.c:338
+msgid "none"
+msgstr "puudub"
+
+#: ../src/nm-netlink-monitor.c:170
+#, c-format
+msgid "unable to create netlink socket for monitoring wired ethernet devices - %s"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:188
+#, c-format
+msgid "unable to bind to netlink socket for monitoring wired ethernet devices - %s"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:425
+msgid "operation took too long"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:522
+msgid "received data from wrong type of sender"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:535
+msgid "received data from unexpected sender"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:664
+msgid "too much data was sent over socket and some of it was lost"
+msgstr ""
+
+#: ../src/nm-netlink-monitor.c:774
+msgid "error occurred while waiting for data on socket"
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:922
+#, c-format
+msgid "You are now connected to the Ad-Hoc wireless network '%s'."
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:927
+#, c-format
+msgid "You are now connected to the wireless network '%s'."
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:934
+msgid "You are now connected to the wired network."
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:940
+msgid "Connection Established"
+msgstr "Ühendus loodud"
+
+#: ../gnome/applet/applet-dbus-devices.c:983
+msgid "Disconnected"
+msgstr "Ühendamata"
+
+#: ../gnome/applet/applet-dbus-devices.c:984
+msgid "The network connection has been disconnected."
+msgstr "Võrguühendus katkes."
diff --git a/po/fi.po b/po/fi.po
index aaa9eb26..a48b436b 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-29 18:33+0200\n"
-"PO-Revision-Date: 2006-02-28 22:15+0200\n"
+"POT-Creation-Date: 2006-10-15 09:39+0300\n"
+"PO-Revision-Date: 2006-10-15 09:39+0300\n"
 "Last-Translator: Ilkka Tuohela <hile@iki.fi>\n"
 "Language-Team: Finnish <gnome-fi-laatu@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -17,76 +17,97 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../src/applet-compat.c:171 ../src/applet-dbus-info.c:919
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:926
 #, c-format
 msgid "Passphrase for wireless network %s"
 msgstr "Langattoman verkon %s tunnuslause"
 
-#: ../src/applet-dbus.c:265
+#: ../gnome/applet/applet-dbus.c:265
 #, c-format
 msgid "Connection to the wireless network '%s' failed."
 msgstr "Yhteys langattomaan verkkoon \"%s\" epäonnistui."
 
-#: ../src/applet-dbus.c:270
+#: ../gnome/applet/applet-dbus.c:270
 msgid "Connection to the wired network failed."
 msgstr "Yhteys kiinteään verkkoon epäonnistui."
 
-#: ../src/applet.c:184
+#: ../gnome/applet/applet.c:187
 msgid "Error displaying connection information:"
 msgstr "Virhe näytettäessä yhteyden tietoja:"
 
-#: ../src/applet.c:202
+#: ../gnome/applet/applet.c:205
 msgid "Could not find some required resources (the glade file)!"
 msgstr "Joitain vaadittuja osia ei löytynyt (glade-tiedostoa)!"
 
-#: ../src/applet.c:213
+#: ../gnome/applet/applet.c:216
 msgid "No active connections!"
 msgstr "Ei aktiivisia yhteyksiä!"
 
-#: ../src/applet.c:234
+#: ../gnome/applet/applet.c:234
+#, c-format
+msgid "%d Mb/s"
+msgstr "%d Mt/s"
+
+#: ../gnome/applet/applet.c:237
 #, c-format
 msgid "Wired Ethernet (%s)"
 msgstr "Kiinteä Ethernet-yhteys (%s)"
 
-#: ../src/applet.c:236
+#: ../gnome/applet/applet.c:239
 #, c-format
 msgid "Wireless Ethernet (%s)"
 msgstr "Langaton Ethernet (%s)"
 
-#: ../src/applet.c:337 ../src/applet.c:362
+#: ../gnome/applet/applet.c:245
+msgid "Unknown"
+msgstr "Tuntematon"
+
+#: ../gnome/applet/applet.c:335 ../gnome/applet/applet.c:361
 msgid "NetworkManager Applet"
 msgstr "NetworkManager-sovelma"
 
-#: ../src/applet.c:339 ../src/applet.c:364
-msgid "Copyright © 2004-2005 Red Hat, Inc."
-msgstr "Copyright © 2004-2005 Red Hat, Inc."
+#: ../gnome/applet/applet.c:337
+msgid ""
+"Copyright © 2004-2006 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+msgstr ""
+"Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
 
-#: ../src/applet.c:340 ../src/applet.c:365
+#: ../gnome/applet/applet.c:339 ../gnome/applet/applet.c:365
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "Ilmoitusalueen sovelma verkkolaitteiden ja yhteyksien hallintaan."
 
-#: ../src/applet.c:343 ../src/applet.c:370
+#: ../gnome/applet/applet.c:342 ../gnome/applet/applet.c:369
 msgid "translator-credits"
 msgstr ""
 "Ilkka Tuohela, 2005.\n"
 "\n"
 "http://www.gnome.fi/"
 
-#: ../src/applet.c:426
+#: ../gnome/applet/applet.c:363
+msgid ""
+"Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+msgstr ""
+"Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+
+#: ../gnome/applet/applet.c:425
 msgid "VPN Login Failure"
 msgstr "Virhe kirjauduttaessa VPN:ään"
 
-#: ../src/applet.c:427
+#: ../gnome/applet/applet.c:426
 #, 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."
 
-#: ../src/applet.c:431
+#: ../gnome/applet/applet.c:430
 msgid "VPN Start Failure"
 msgstr "VPN-yhteyden käynnistysvirhe"
 
-#: ../src/applet.c:432
+#: ../gnome/applet/applet.c:431
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
@@ -95,25 +116,25 @@ msgstr ""
 "VPN-yhteyttä \"%s\" ei voitu käynnistää, koska VPN-ohjelman suorittaminen "
 "epäonnistui."
 
-#: ../src/applet.c:436 ../src/applet.c:446
+#: ../gnome/applet/applet.c:435 ../gnome/applet/applet.c:445
 msgid "VPN Connect Failure"
 msgstr "VPN-yhteyden yhteydenottovirhe"
 
-#: ../src/applet.c:437
+#: ../gnome/applet/applet.c:436
 #, 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."
 
-#: ../src/applet.c:441
+#: ../gnome/applet/applet.c:440
 msgid "VPN Configuration Error"
 msgstr "VPN-yhteyden asetusvirhe"
 
-#: ../src/applet.c:442
+#: ../gnome/applet/applet.c:441
 #, c-format
 msgid "The VPN connection '%s' was not correctly configured."
 msgstr "VPN-yhteyden \"%s\" asetukset ovat virheelliset."
 
-#: ../src/applet.c:447
+#: ../gnome/applet/applet.c:446
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' because the VPN server did not "
@@ -122,13 +143,13 @@ msgstr ""
 "VPN-yhteyttä \"%s\" ei voitu käynnistää, koska VPN-palvelin ei palauttanut "
 "kelvollista verkkomäärittelyä."
 
-#: ../src/applet.c:517
+#: ../gnome/applet/applet.c:516
 msgid "VPN Login Message"
 msgstr "VPN-yhteyden kirjautumisviesti"
 
-#: ../src/applet.c:741 ../src/applet.c:2508
-#: ../src/other-network-dialog.c:453
-#: ../src/passphrase-dialog.c:228
+#: ../gnome/applet/applet.c:740 ../gnome/applet/applet.c:2510
+#: ../gnome/applet/other-network-dialog.c:458
+#: ../gnome/applet/passphrase-dialog.c:228
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
@@ -136,163 +157,168 @@ msgstr ""
 "NetworkManager-sovelma ei voinut ladata jotain vaadituista resursseista "
 "(glade-tiedostoa ei löytynyt)."
 
-#: ../src/applet.c:753
+#: ../gnome/applet/applet.c:752
 #, c-format
 msgid "The network device \"%s (%s)\" does not support wireless scanning."
 msgstr "Verkkolaite \"%s (%s)\" ei tue langattomien verkkojen etsimistä."
 
-#: ../src/applet.c:761
+#: ../gnome/applet/applet.c:760
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
 msgstr "Verkkolaite \"%s (%s)\" ei tue verkkoyhteyden havaitsemista."
 
-#: ../src/applet.c:908
+#. Note to translators: this is used if no essid is known
+#: ../gnome/applet/applet.c:902 ../gnome/applet/applet.c:1100
+msgid "(unknown)"
+msgstr "(tuntematon)"
+
+#: ../gnome/applet/applet.c:908
 #, c-format
 msgid "Preparing device %s for the wired network..."
 msgstr "Valmistellaan laitetta %s kiinteälle verkkoyhteydelle..."
 
-#: ../src/applet.c:910
+#: ../gnome/applet/applet.c:910
 #, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
 msgstr "Valmistellaan laitetta %s langattomalle verkolle \"%s\"..."
 
-#: ../src/applet.c:918
+#: ../gnome/applet/applet.c:918
 #, c-format
 msgid "Configuring device %s for the wired network..."
 msgstr "Määritellään laitetta %s kiinteälle verkkoyhteydelle..."
 
-#: ../src/applet.c:920
+#: ../gnome/applet/applet.c:920
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
 msgstr "Yritetään liittyä langattomaan verkkoon \"%s\"..."
 
-#: ../src/applet.c:928
+#: ../gnome/applet/applet.c:928
 #, c-format
 msgid "Waiting for Network Key for the wireless network '%s'..."
 msgstr "Odotetaan verkon avainta langattomalle verkolle \"%s\""
 
-#: ../src/applet.c:936 ../src/applet.c:946
+#: ../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..."
 
-#: ../src/applet.c:938 ../src/applet.c:948
+#: ../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\"..."
 
-#: ../src/applet.c:956
+#: ../gnome/applet/applet.c:956
 msgid "Finishing connection to the wired network..."
 msgstr "Viimeistellään yhteyttä kiinteään verkkoon..."
 
-#: ../src/applet.c:958
+#: ../gnome/applet/applet.c:958
 #, c-format
 msgid "Finishing connection to the wireless network '%s'..."
 msgstr "Viimeistellään yhteyttä langattomaan verkkoon \"%s\"..."
 
-#: ../src/applet.c:1075
+#: ../gnome/applet/applet.c:1075
 msgid "NetworkManager is not running"
 msgstr "NetworkManager ei ole käytössä"
 
-#: ../src/applet.c:1083 ../src/applet.c:1828
+#: ../gnome/applet/applet.c:1083 ../gnome/applet/applet.c:1828
 msgid "Networking disabled"
 msgstr "Verkko ei ole käytössä"
 
-#: ../src/applet.c:1088
+#: ../gnome/applet/applet.c:1088
 msgid "No network connection"
 msgstr "Ei verkkoyhteyttä"
 
-#: ../src/applet.c:1093
+#: ../gnome/applet/applet.c:1093
 msgid "Wired network connection"
 msgstr "Kiinteä verkkoyhteys"
 
-#: ../src/applet.c:1097
+#: ../gnome/applet/applet.c:1097
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Yhteys langattomaan Ad-Hoc-verkkoon"
 
-#: ../src/applet.c:1099
+#: ../gnome/applet/applet.c:1099
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "Langaton verkkoyhteys \"%s\" (%d%%)"
 
-#: ../src/applet.c:1120
+#: ../gnome/applet/applet.c:1120
 #, c-format
 msgid "VPN connection to '%s'"
 msgstr "VPN-yhteys \"%s\""
 
-#: ../src/applet.c:1128
+#: ../gnome/applet/applet.c:1128
 #, c-format
 msgid "VPN connecting to '%s'"
 msgstr "VPN-yhteyttä \"%s\" avataan"
 
-#: ../src/applet.c:1541
+#: ../gnome/applet/applet.c:1541
 msgid "_Connect to Other Wireless Network..."
 msgstr "_Yhdistä muihin langattomiin verkkoihin..."
 
-#: ../src/applet.c:1562
+#: ../gnome/applet/applet.c:1562
 msgid "Create _New Wireless Network..."
 msgstr "Luo _uusi langaton verkko..."
 
-#: ../src/applet.c:1685
+#: ../gnome/applet/applet.c:1685
 msgid "_VPN Connections"
 msgstr "_VPN-yhteydet"
 
-#: ../src/applet.c:1730
+#: ../gnome/applet/applet.c:1730
 msgid "_Configure VPN..."
 msgstr "_Määrittele VPN-yhteys..."
 
-#: ../src/applet.c:1734
+#: ../gnome/applet/applet.c:1734
 msgid "_Disconnect VPN..."
 msgstr "_Katkaise VPN-yhteys..."
 
-#: ../src/applet.c:1756
+#: ../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
-#: ../src/applet.c:1767
+#: ../gnome/applet/applet.c:1767
 #, c-format
 msgid "Connect to %s..."
 msgstr "Ota yhteyttä kohteeseen %s..."
 
-#: ../src/applet.c:1773
+#: ../gnome/applet/applet.c:1773
 #, c-format
 msgid "Disconnect from %s..."
 msgstr "Katkaise yhteys kohteeseen %s..."
 
-#: ../src/applet.c:1822
+#: ../gnome/applet/applet.c:1822
 msgid "No network devices have been found"
 msgstr "Verkkolaitteita ei löytynyt"
 
-#: ../src/applet.c:2014
+#: ../gnome/applet/applet.c:2014
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager ei ole käytössä..."
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2170
+#: ../gnome/applet/applet.c:2170
 msgid "Enable _Networking"
 msgstr "Ota _verkko käyttöön"
 
 #. 'Enable Wireless' item
-#: ../src/applet.c:2176
+#: ../gnome/applet/applet.c:2176
 msgid "Enable _Wireless"
 msgstr "Ota _langaton käyttöön"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2182
+#: ../gnome/applet/applet.c:2182
 msgid "Connection _Information"
 msgstr "Tietoja _yhteydestä"
 
 #. Help item
-#: ../src/applet.c:2193
+#: ../gnome/applet/applet.c:2193
 msgid "_Help"
 msgstr "O_hje"
 
 #. About item
-#: ../src/applet.c:2202
+#: ../gnome/applet/applet.c:2202
 msgid "_About"
 msgstr "_Tietoja"
 
-#: ../src/applet.c:2667
+#: ../gnome/applet/applet.c:2669
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
@@ -300,111 +326,111 @@ msgstr ""
 "NetworkManager-sovelma ei löytänyt joitain vaadituista resursseista eikä "
 "pysty jatkamaan.\n"
 
-#: ../src/wireless-security-option.c:157
+#: ../gnome/applet/wireless-security-option.c:157
 msgid "Open System"
 msgstr "Avoin järjestelmä"
 
-#: ../src/wireless-security-option.c:160
+#: ../gnome/applet/wireless-security-option.c:160
 msgid "Shared Key"
 msgstr "Jaettu avain"
 
-#: ../src/wireless-security-option.c:208
+#: ../gnome/applet/wireless-security-option.c:208
 msgid "Automatic (Default)"
 msgstr "Automaattinen (oletus)"
 
-#: ../src/wireless-security-option.c:215
+#: ../gnome/applet/wireless-security-option.c:215
 msgid "AES-CCMP"
 msgstr "AES-CCMP"
 
-#: ../src/wireless-security-option.c:223
+#: ../gnome/applet/wireless-security-option.c:223
 msgid "TKIP"
 msgstr "TKIP"
 
-#: ../src/wireless-security-option.c:231
+#: ../gnome/applet/wireless-security-option.c:231
 msgid "Dynamic WEP"
 msgstr "Dynaaminen WEP"
 
-#: ../src/wso-none.c:53
+#: ../gnome/applet/wso-none.c:53
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../src/wso-wep-ascii.c:138
+#: ../gnome/applet/wso-wep-ascii.c:138
 msgid "WEP 64/128-bit ASCII"
 msgstr "WEP 64/128-bittinen ASCII"
 
-#: ../src/wso-wep-hex.c:135
+#: ../gnome/applet/wso-wep-hex.c:135
 msgid "WEP 64/128-bit Hex"
 msgstr "WEP 64/128-bittinen heksadesimaali"
 
-#: ../src/wso-wep-passphrase.c:135
+#: ../gnome/applet/wso-wep-passphrase.c:135
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bittinen tunnuslause"
 
-#: ../src/wso-wpa-eap.c:237
+#: ../gnome/applet/wso-wpa-eap.c:237
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../src/wso-wpa-eap.c:238
+#: ../gnome/applet/wso-wpa-eap.c:238
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wso-wpa-eap.c:239
+#: ../gnome/applet/wso-wpa-eap.c:239
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../src/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
-#: ../src/nm-ap-security-wpa-eap.c:116
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:93
+#: ../src/nm-ap-security-wpa-eap.c:117
 msgid "WPA2 Enterprise"
 msgstr "WPA2 Enterprise"
 
-#: ../src/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
-#: ../src/nm-ap-security-wpa-eap.c:121
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:95
+#: ../src/nm-ap-security-wpa-eap.c:122
 msgid "WPA Enterprise"
 msgstr "WPA Enterprise"
 
-#: ../src/wso-wpa-psk.c:178
+#: ../gnome/applet/wso-wpa-psk.c:178
 msgid "WPA2 Personal"
 msgstr "WPA2 (henkilökohtainen)"
 
-#: ../src/wso-wpa-psk.c:180
+#: ../gnome/applet/wso-wpa-psk.c:180
 msgid "WPA Personal"
 msgstr "WPA (henkilökohtainen)"
 
-#: ../src/eggtrayicon.c:134
+#: ../gnome/applet/eggtrayicon.c:134
 msgid "Orientation"
 msgstr "Suunta"
 
-#: ../src/eggtrayicon.c:135
+#: ../gnome/applet/eggtrayicon.c:135
 msgid "The orientation of the tray."
 msgstr "Ilmoitusalueen suunta."
 
-#: ../src/menu-items.c:88
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Kiinteä verkkoyhteys (%s)"
 
-#: ../src/menu-items.c:91
+#: ../gnome/applet/menu-items.c:91
 msgid "_Wired Network"
 msgstr "_Kiinteä verkkoyhteys"
 
-#: ../src/menu-items.c:162
+#: ../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)"
 
-#: ../src/menu-items.c:164
+#: ../gnome/applet/menu-items.c:164
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Langaton verkko"
 msgstr[1] "Langattomat verkot"
 
-#: ../src/menu-items.c:343
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr " (virheellistä Unicodea)"
 
-#: ../src/other-network-dialog.c:352
+#: ../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, "
@@ -413,50 +439,50 @@ msgstr ""
 "Oletuksena langattoman verkon nimi asetetaan samaksi kuin tietokoneesi nimi "
 "\"%s\" ja salaus on poissa käytöstä"
 
-#: ../src/other-network-dialog.c:358
+#: ../gnome/applet/other-network-dialog.c:358
 msgid "Create new wireless network"
 msgstr "Luo uusi langaton verkko"
 
-#: ../src/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 "Syötä luotavan langattoman verkon nimi ja turva-asetukset."
 
-#: ../src/other-network-dialog.c:363
+#: ../gnome/applet/other-network-dialog.c:363
 msgid "Create New Wireless Network"
 msgstr "Luo uusi langaton verkko"
 
-#: ../src/other-network-dialog.c:368
+#: ../gnome/applet/other-network-dialog.c:368
 msgid "Existing wireless network"
 msgstr "Olemassaoleva langaton verkko"
 
-#: ../src/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 "Syötä sen langattoman verkon nimi, johon haluat ottaa yhteyttä."
 
-#: ../src/other-network-dialog.c:371
+#: ../gnome/applet/other-network-dialog.c:371
 msgid "Connect to Other Wireless Network"
 msgstr "Ota yhteyttä muuhun langattomaan verkkoon"
 
-#: ../src/passphrase-dialog.c:215
+#: ../gnome/applet/passphrase-dialog.c:215
 msgid "Error connecting to wireless network"
 msgstr "Virhe yhdistettäessä langattomaan verkkoon"
 
-#: ../src/passphrase-dialog.c:216
+#: ../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."
 
-#: ../src/vpn-password-dialog.c:151
-#: ../src/vpn-password-dialog.c:188
+#: ../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ää"
 
-#: ../src/vpn-password-dialog.c:154
+#: ../gnome/applet/vpn-password-dialog.c:154
 #, c-format
 msgid ""
 "Could not find the authentication dialog for VPN connection type '%s'. "
@@ -465,7 +491,7 @@ msgstr ""
 "Kirjautumisikkunaa VPN-yhteyden tyypille \"%s\" ei löydy. Ota yhteyttä "
 "järjestelmäsi ylläpitäjään."
 
-#: ../src/vpn-password-dialog.c:191
+#: ../gnome/applet/vpn-password-dialog.c:191
 #, c-format
 msgid ""
 "There was a problem launching the authentication dialog for VPN connection "
@@ -474,17 +500,17 @@ msgstr ""
 "Virhe käynnistettäessä kirjatumisikkunaa VPN-yhteyden tyypille \"%s\". Ota "
 "yhteyttä järjestelmäsi ylläpitäjään."
 
-#: ../src/applet.glade.h:1
+#: ../gnome/applet/applet.glade.h:1
 msgid " "
 msgstr " "
 
-#: ../src/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\">Tietoja aktiivisesta yhteydestä</span>"
 
-#: ../src/applet.glade.h:4
+#: ../gnome/applet/applet.glade.h:4
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
@@ -499,7 +525,7 @@ msgstr ""
 "Tunnuslause tai salausavain vaaditaan, jotta voit ottaa yhteyttä "
 "langattomaan verkkoon %s."
 
-#: ../src/applet.glade.h:8
+#: ../gnome/applet/applet.glade.h:8
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
@@ -510,7 +536,7 @@ msgstr ""
 "\n"
 "%s  Verkkoyhteys ei ole täysin toimiva."
 
-#: ../src/applet.glade.h:12
+#: ../gnome/applet/applet.glade.h:12
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
@@ -527,75 +553,79 @@ msgstr ""
 "tämä langaton verkko on turvallinen, napsauta alla olevaa ruutua ja "
 "NetworkManager ei kysy tätä vahvistusikkunaa enää uudestaan."
 
-#: ../src/applet.glade.h:15
+#: ../gnome/applet/applet.glade.h:15
 msgid "Anonymous Identity:"
 msgstr "Anonyymi tunniste:"
 
-#: ../src/applet.glade.h:16
+#: ../gnome/applet/applet.glade.h:16
 msgid "Authentication:"
 msgstr "Tunnistautuminen:"
 
-#: ../src/applet.glade.h:17
+#: ../gnome/applet/applet.glade.h:17
 msgid "Broadcast Address:"
 msgstr "Broadcast-osoite:"
 
-#: ../src/applet.glade.h:18
+#: ../gnome/applet/applet.glade.h:18
 msgid "CA Certificate File:"
 msgstr "CA-varmenteen tiedosto:"
 
-#: ../src/applet.glade.h:19
+#: ../gnome/applet/applet.glade.h:19
 msgid "C_onnect"
 msgstr "_Yhdistä"
 
-#: ../src/applet.glade.h:20
+#: ../gnome/applet/applet.glade.h:20
 msgid "Client Certificate File:"
 msgstr "Asiakasvarmenteen tiedosto:"
 
-#: ../src/applet.glade.h:21
+#: ../gnome/applet/applet.glade.h:21
 msgid "Connection Information"
 msgstr "Tietoja yhteydestä"
 
-#: ../src/applet.glade.h:22
+#: ../gnome/applet/applet.glade.h:22
 msgid "Default Route:"
 msgstr "Oletusyhdyskäytävä:"
 
-#: ../src/applet.glade.h:23
+#: ../gnome/applet/applet.glade.h:23
 msgid "Destination Address:"
 msgstr "Kohdeosoite:"
 
-#: ../src/applet.glade.h:24
+#: ../gnome/applet/applet.glade.h:24
 msgid "Driver:"
 msgstr "Ajuri:"
 
-#: ../src/applet.glade.h:25
+#: ../gnome/applet/applet.glade.h:25
 msgid "EAP Method:"
 msgstr "EPA-menetelmä:"
 
-#: ../src/applet.glade.h:26
+#: ../gnome/applet/applet.glade.h:26
 msgid "Hardware Address:"
 msgstr "Laiteosoite:"
 
-#: ../src/applet.glade.h:27
+#: ../gnome/applet/applet.glade.h:27
 msgid "IP Address:"
 msgstr "IP-osoite:"
 
-#: ../src/applet.glade.h:28
+#: ../gnome/applet/applet.glade.h:28
 msgid "Identity:"
 msgstr "Tunniste:"
 
-#: ../src/applet.glade.h:29
+#: ../gnome/applet/applet.glade.h:29
 msgid "Interface:"
 msgstr "Verkkolaite:"
 
-#: ../src/applet.glade.h:30
+#: ../gnome/applet/applet.glade.h:30
 msgid "Key Type:"
 msgstr "Avaimen tyyppi:"
 
-#: ../src/applet.glade.h:31
+#: ../gnome/applet/applet.glade.h:31
+msgid "Key management:"
+msgstr "Avaintenhallinta:"
+
+#: ../gnome/applet/applet.glade.h:32
 msgid "Key:"
 msgstr "Avain:"
 
-#: ../src/applet.glade.h:32
+#: ../gnome/applet/applet.glade.h:33
 msgid ""
 "None\n"
 "WEP 128-bit Passphrase\n"
@@ -607,7 +637,7 @@ msgstr ""
 "WEP 64/128-bittinen heksadesimaali\n"
 "WEP 64/128-bittinen ASCII\n"
 
-#: ../src/applet.glade.h:37
+#: ../gnome/applet/applet.glade.h:38
 msgid ""
 "Open System\n"
 "Shared Key"
@@ -615,111 +645,115 @@ msgstr ""
 "Avoin järjestelmä\n"
 "Jaettu avain"
 
-#: ../src/applet.glade.h:39
+#: ../gnome/applet/applet.glade.h:40
 msgid "Other Wireless Network..."
 msgstr "Muu langaton verkko..."
 
-#: ../src/applet.glade.h:40
+#: ../gnome/applet/applet.glade.h:41
 msgid "Passphrase:"
 msgstr "Tunnuslause:"
 
-#: ../src/applet.glade.h:41
+#: ../gnome/applet/applet.glade.h:42
 msgid "Password:"
 msgstr "Salasana:"
 
-#: ../src/applet.glade.h:42
+#: ../gnome/applet/applet.glade.h:43
 msgid "Primary DNS:"
 msgstr "Ensisijainen DNS:"
 
-#: ../src/applet.glade.h:43
+#: ../gnome/applet/applet.glade.h:44
 msgid "Private Key File:"
 msgstr "Salausavaimen tiedosto"
 
-#: ../src/applet.glade.h:44
+#: ../gnome/applet/applet.glade.h:45
 msgid "Private Key Password:"
 msgstr "Salausavaimen salasana:"
 
-#: ../src/applet.glade.h:45
+#: ../gnome/applet/applet.glade.h:46
 msgid "Secondary DNS:"
 msgstr "Toissijainen DNS:"
 
-#: ../src/applet.glade.h:46
+#: ../gnome/applet/applet.glade.h:47
 msgid "Select the CA Certificate File"
 msgstr "Valise CA-varmenteen tiedosto"
 
-#: ../src/applet.glade.h:47
+#: ../gnome/applet/applet.glade.h:48
 msgid "Select the Client Certificate File"
 msgstr "Valitse asiakasvarmenteen tiedosto"
 
-#: ../src/applet.glade.h:48
+#: ../gnome/applet/applet.glade.h:49
 msgid "Select the Private Key File"
 msgstr "Valitse salaisen avaimen tiedosto"
 
-#: ../src/applet.glade.h:49
+#: ../gnome/applet/applet.glade.h:50
 msgid "Show key"
 msgstr "Näytä avain"
 
-#: ../src/applet.glade.h:50
+#: ../gnome/applet/applet.glade.h:51
 msgid "Show passphrase"
 msgstr "Näytä tunnuslause:"
 
-#: ../src/applet.glade.h:51
+#: ../gnome/applet/applet.glade.h:52
 msgid "Show password"
 msgstr "Näytä salasana"
 
-#: ../src/applet.glade.h:52
+#: ../gnome/applet/applet.glade.h:53
 msgid "Show passwords"
 msgstr "Näytä salasanat"
 
-#: ../src/applet.glade.h:53
+#: ../gnome/applet/applet.glade.h:54
 msgid "Speed:"
 msgstr "Nopeus:"
 
-#: ../src/applet.glade.h:54
+#: ../gnome/applet/applet.glade.h:55
 msgid "Subnet Mask:"
 msgstr "Aliverkkopeite:"
 
-#: ../src/applet.glade.h:55
+#: ../gnome/applet/applet.glade.h:56
 msgid "Type:"
 msgstr "Tyyppi:"
 
-#: ../src/applet.glade.h:56
+#: ../gnome/applet/applet.glade.h:57
 msgid "User Name:"
 msgstr "Käyttäjätunnus:"
 
-#: ../src/applet.glade.h:57
+#: ../gnome/applet/applet.glade.h:58
 msgid "Wireless Network Key Required"
 msgstr "Langattoman verkon salausavain vaaditaan"
 
-#: ../src/applet.glade.h:58
+#: ../gnome/applet/applet.glade.h:59
 msgid "Wireless _adapter:"
 msgstr "Langaton _verkkolaite:"
 
-#: ../src/applet.glade.h:59
+#: ../gnome/applet/applet.glade.h:60
 msgid "_Always Trust this Wireless Network"
 msgstr "_Luota aina tähän langattomaan verkkoon"
 
-#: ../src/applet.glade.h:60
+#: ../gnome/applet/applet.glade.h:61
 msgid "_Don't remind me again"
 msgstr "_Älä huomauta uudestaan"
 
-#: ../src/applet.glade.h:61
+#: ../gnome/applet/applet.glade.h:62
+msgid "_Fallback on this Network"
+msgstr "Käytä _tätä verkkoa, jos muita ei ole saatavilla"
+
+#: ../gnome/applet/applet.glade.h:63
 msgid "_Login to Network"
 msgstr "_Kirjaudu verkkoon"
 
-#: ../src/applet.glade.h:62
+#: ../gnome/applet/applet.glade.h:64
 msgid "_Network Name:"
 msgstr "_Verkon nimi:"
 
-#: ../src/applet.glade.h:63
+#: ../gnome/applet/applet.glade.h:65
 msgid "_Wireless Security:"
 msgstr "_Langaton tietoturva:"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:383
+#: ../gnome/vpn-properties/nm-vpn-properties.c:419
 msgid "Cannot add VPN connection"
 msgstr "VPN-yhteyttä ei voitu lisätä"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:385
+#: ../gnome/vpn-properties/nm-vpn-properties.c:421
 msgid ""
 "No suitable VPN software was found on your system. Contact your system "
 "administrator."
@@ -727,11 +761,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:437
+#: ../gnome/vpn-properties/nm-vpn-properties.c:463
 msgid "Cannot import VPN connection"
 msgstr "VPN-yhteyttä ei voida tuoda"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:439
+#: ../gnome/vpn-properties/nm-vpn-properties.c:465
 #, c-format
 msgid ""
 "Cannot find suitable software for VPN connection type '%s' to import the "
@@ -740,12 +774,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:579
+#: ../gnome/vpn-properties/nm-vpn-properties.c:585
 #, c-format
 msgid "Error retrieving VPN connection '%s'"
 msgstr "Virhe haettaessa VPN-yhteyttä \"%s\""
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:582
+#: ../gnome/vpn-properties/nm-vpn-properties.c:588
 #, c-format
 msgid ""
 "Could not find the UI files for VPN connection type '%s'. Contact your "
@@ -754,12 +788,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:739
+#: ../gnome/vpn-properties/nm-vpn-properties.c:732
 #, c-format
 msgid "Delete VPN connection \"%s\"?"
 msgstr "Poistetaanko VPN-yhteys \"%s\"?"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:742
+#: ../gnome/vpn-properties/nm-vpn-properties.c:735
 #, c-format
 msgid ""
 "All information about the VPN connection \"%s\" will be lost and you may "
@@ -770,16 +804,36 @@ msgstr ""
 "yhteyttä järjestelmäsiylläpitäjään, jotta saat uuden yhteyden luomiseen "
 "tarvittavat tiedot."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:959
+#: ../gnome/vpn-properties/nm-vpn-properties.c:908
 msgid "Unable to load"
 msgstr "Ei voitu ladata"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:961
+#: ../gnome/vpn-properties/nm-vpn-properties.c:910
 msgid "Cannot find some needed resources (the glade file)!"
 msgstr "Jotain tarvittavista resursseista ei löydy (glade-tiedosto)!"
 
+#. druid_window = GTK_DIALOG (gtk_dialog_new_with_buttons (_("Create VPN Connection"),
+#. NULL,
+#. GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+#. GTK_STOCK_CANCEL,
+#. GTK_RESPONSE_REJECT,
+#. GTK_STOCK_APPLY,
+#. GTK_RESPONSE_ACCEPT,
+#. NULL));
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1055
+msgid "Create VPN Connection"
+msgstr "Luo VPN-yhteys"
+
+#. gtk_container_add (GTK_CONTAINER (druid_window->vbox), GTK_WIDGET(gtk_label_new("Some label")));
+#. gtk_box_pack_start (GTK_BOX (druid_window->vbox), GTK_WIDGET(druid), TRUE,TRUE,0);
+#. gtk_box_pack_start (GTK_BOX (druid_window->vbox), GTK_WIDGET(gtk_label_new("Some label")), TRUE,TRUE,0);
+#. toplevel = gtk_widget_get_toplevel (GTK_WIDGET (druid));
+#. gtk_signal_connect (GTK_OBJECT (toplevel), "delete_event", GTK_SIGNAL_FUNC (vpn_window_close), NULL);
+#. make the druid window modal wrt. our main window
+#. gtk_window_set_modal (druid_window, TRUE);
+#. gtk_window_set_transient_for (GTK_WINDOW(druid_window), GTK_WINDOW (dialog));
 #. Edit dialog
-#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1073
 msgid "Edit VPN Connection"
 msgstr "Muokkaa VPN-yhteyttä"
 
@@ -788,67 +842,30 @@ msgid "Add a new VPN connection"
 msgstr "Lisää uusi VPN-yhteys"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:2
-msgid "Choose which type of VPN connection you wish to create."
-msgstr "Valitse minkä tyyppisen VPN-yhteyden haluat lisätä."
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
-msgid "Connect to:"
-msgstr "Yhdistä kohteeseen:"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
-msgid "Create VPN Connection"
-msgstr "Luo VPN-yhteys"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
-msgid "Create VPN Connection - 1 of 2"
-msgstr "Luo VPN-yhteys - vaihe 1/2"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
-msgid "Create VPN Connection - 2 of 2"
-msgstr "Luo VPN-yhteys - vaihe 2/2"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
 msgid "Delete the selected VPN connection"
 msgstr "Poista valittu VPN-yhteys"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
 msgid "E_xport"
 msgstr "_Vie"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:9
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
 msgid "Edit the selected VPN connection"
 msgstr "Muokkaa valittua VPN-yhteyttä"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:10
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
 msgid "Export the VPN settings to a file"
 msgstr "Vie VPN-asetukset tiedostoon"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:11
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
 msgid "Export the selected VPN connection to a file"
 msgstr "Vie valittu VPN-yhteys tiedostoon"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:12
-msgid "Finish Creating VPN Connection"
-msgstr "Viimeistele VPN-yhteyden luonti"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:13
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
 msgid "Manage Virtual Private Network Connections"
 msgstr "Hallitse VPN-yhteyksiä"
 
-#: ../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 ""
-"Tämä velho ohjaa sinua määrittelmään VPN-yhteyden\n"
-"\n"
-"Yhteyden luominen vaatii joitakin tietoja, kuten IP-osoitteita ja "
-"salasanoja. Pyydä vaadittavat tiedot järjestelmäsi ylläpitäjältä."
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:17
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
 msgid "VPN Connections"
 msgstr "VPN-yhteydet"
 
@@ -884,11 +901,11 @@ msgstr "WPA2 COMP"
 msgid "WPA2 Automatic"
 msgstr "WPA2 (automaattinen)"
 
-#: ../src/nm-ap-security.c:320
+#: ../src/nm-ap-security.c:338
 msgid "none"
 msgstr "ei mitään"
 
-#: ../src/nm-netlink-monitor.c:154
+#: ../src/nm-netlink-monitor.c:174
 #, c-format
 msgid ""
 "unable to create netlink socket for monitoring wired ethernet devices - %s"
@@ -896,7 +913,7 @@ msgstr ""
 "Netlink-pistoketta kiinteiden verkkoyhteyksien tarkkailuun ei voida luoda - %"
 "s"
 
-#: ../src/nm-netlink-monitor.c:172
+#: ../src/nm-netlink-monitor.c:192
 #, c-format
 msgid ""
 "unable to bind to netlink socket for monitoring wired ethernet devices - %s"
@@ -904,71 +921,78 @@ msgstr ""
 "Netlink-pistoketta ei voida sitoa kiinteiden verkkoyhteyksien tarkkailua "
 "varten - %s"
 
-#: ../src/nm-netlink-monitor.c:405
+#: ../src/nm-netlink-monitor.c:427
 msgid "operation took too long"
 msgstr "toimenpide kesti liian pitkään"
 
-#: ../src/nm-netlink-monitor.c:502
+#: ../src/nm-netlink-monitor.c:524
 msgid "received data from wrong type of sender"
 msgstr "vastaanotettiin tietoa väärän tyyppiseltä lähettäjältä"
 
-#: ../src/nm-netlink-monitor.c:515
+#: ../src/nm-netlink-monitor.c:537
 msgid "received data from unexpected sender"
 msgstr "vastaanotettiin tietoja odottamattomalta lähettäjältä"
 
-#: ../src/nm-netlink-monitor.c:646
+#: ../src/nm-netlink-monitor.c:666
 msgid "too much data was sent over socket and some of it was lost"
 msgstr "lähetettiin liian paljon tietoja pistekkeeseen ja osaa siitä hukkui"
 
-#: ../src/nm-netlink-monitor.c:735
+#: ../src/nm-netlink-monitor.c:776
 msgid "error occurred while waiting for data on socket"
 msgstr "virhe odotettaessa tietoja pistokkeesta"
 
-#: ../src/applet-dbus-devices.c:898
+#: ../gnome/applet/applet-dbus-devices.c:922
 #, c-format
 msgid "You are now connected to the Ad-Hoc wireless network '%s'."
 msgstr "Yhteys langattomaan Ad-Hoc-verkkoon \"%s\" on nyt muodostettu."
 
-#: ../src/applet-dbus-devices.c:903
+#: ../gnome/applet/applet-dbus-devices.c:927
 #, c-format
 msgid "You are now connected to the wireless network '%s'."
 msgstr "Yhteys langattomaan verkkoon \"%s\" on nyt muodostettu."
 
-#: ../src/applet-dbus-devices.c:910
+#: ../gnome/applet/applet-dbus-devices.c:934
 msgid "You are now connected to the wired network."
 msgstr "Yhteys kiinteään verkkoon on nyt muodostettu."
 
-#: ../src/applet-dbus-devices.c:916
+#: ../gnome/applet/applet-dbus-devices.c:940
 msgid "Connection Established"
 msgstr "Yhteys muodostettu"
 
-#: ../src/applet-dbus-devices.c:959
+#: ../gnome/applet/applet-dbus-devices.c:983
 msgid "Disconnected"
 msgstr "Yhteys katkaistu"
 
-#: ../src/applet-dbus-devices.c:960
+#: ../gnome/applet/applet-dbus-devices.c:984
 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 "Choose which type of VPN connection you wish to create."
+#~ msgstr "Valitse minkä tyyppisen VPN-yhteyden haluat lisätä."
+
+#~ msgid "Connect to:"
+#~ msgstr "Yhdistä kohteeseen:"
 
-#~ msgid "WEP 40/128-bit hex"
-#~ msgstr "WEP 40/128-bittinen heksadesimaali"
+#~ msgid "Create VPN Connection - 1 of 2"
+#~ msgstr "Luo VPN-yhteys - vaihe 1/2"
 
-#~ msgid "WEP Passphrase"
-#~ msgstr "WEP-tunnuslause:"
+#~ msgid "Create VPN Connection - 2 of 2"
+#~ msgstr "Luo VPN-yhteys - vaihe 2/2"
+
+#~ msgid "Finish Creating VPN Connection"
+#~ msgstr "Viimeistele VPN-yhteyden luonti"
 
 #~ msgid ""
-#~ "None\n"
-#~ "WEP Passphrase\n"
-#~ "WEP 40/128-bit hex\n"
-#~ "WEP 40/128-bit ASCII\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.  "
+#~ "Please see your system administrator to obtain this information."
 #~ msgstr ""
-#~ "Ei mitään\n"
-#~ "WEP-tunnuslause\n"
-#~ "WEP 40/128-bittinen heksadesimaali\n"
-#~ "WEP 40/128-bittinen ASCII\n"
+#~ "Tämä velho ohjaa sinua määrittelmään VPN-yhteyden\n"
+#~ "\n"
+#~ "Yhteyden luominen vaatii joitakin tietoja, kuten IP-osoitteita ja "
+#~ "salasanoja. Pyydä vaadittavat tiedot järjestelmäsi ylläpitäjältä."
 
 #~ msgid "leap_subwindow"
 #~ msgstr "leap_ali-ikkuna"
@@ -1044,6 +1068,3 @@ msgstr "Yhteys verkkoon on katkaistu."
 
 #~ msgid "Wireless _network:"
 #~ msgstr "Langaton _verkko:"
-
-#~ msgid "_Key type:"
-#~ msgstr "_Avaimen tyyppi:"
diff --git a/po/fr.po b/po/fr.po
index 0bd4fd8d..a0becf32 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,151 +1,152 @@
 # French translation of NetworkManager.
-# Copyright (C) 2004-2005 The GNOME Foundation.
+# Copyright (C) 2004-2006 The GNOME Foundation.
 # This file is distributed under the same license as the NetworkManager package.
 #
 # Raphaël Tournoy <lexpas@free.fr>, 2004.
+# Stéphane Raimbault <stephae.raimbault@free.fr>, 2006.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: NetworkManager 0.3.3\n"
+"Project-Id-Version: NetworkManager 0.7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-29 18:33+0200\n"
-"PO-Revision-Date: 2006-06-09 09:51\n"
-"Last-Translator: Novell Language <language@novell.com>\n"
-"Language-Team: Novell Language <language@novell.com>\n"
+"POT-Creation-Date: 2006-07-28 13:41+0200\n"
+"PO-Revision-Date: 2006-07-28 13:36+0200\n"
+"Last-Translator: Stéphane Raimbault <stephae.raimbault@free.fr>\n"
+"Language-Team: GNOME French Team <gnomefr@traduc.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"
 
-#: ../src/applet-compat.c:171 ../src/applet-dbus-info.c:919
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:926
 #, c-format
 msgid "Passphrase for wireless network %s"
 msgstr "Phrase secrète pour le réseau sans fil %s"
 
-#: ../src/applet-dbus.c:265
+#: ../gnome/applet/applet-dbus.c:383
 #, c-format
 msgid "Connection to the wireless network '%s' failed."
-msgstr "La connexion au réseau sans fil '%s' a échoué."
+msgstr "La connexion au réseau sans fil « %s » a échoué."
 
-#: ../src/applet-dbus.c:270
+#: ../gnome/applet/applet-dbus.c:388
 msgid "Connection to the wired network failed."
 msgstr "La connexion au réseau câblé a échoué."
 
-#: ../src/applet.c:184
+#: ../gnome/applet/applet.c:184
 msgid "Error displaying connection information:"
-msgstr "Erreur d'affichage des informations de connexion :"
+msgstr "Impossible d'afficher les informations de connexion :"
 
-#: ../src/applet.c:202
+#: ../gnome/applet/applet.c:202
 msgid "Could not find some required resources (the glade file)!"
-msgstr "Certaines ressources requises sont introuvables (fichier glade) !"
+msgstr "Impossible de trouver les ressources requises (fichier glade)."
 
-#: ../src/applet.c:213
+#: ../gnome/applet/applet.c:213
 msgid "No active connections!"
-msgstr "Aucune connexion active !"
+msgstr "Aucune connexion active"
 
-#: ../src/applet.c:234
+#: ../gnome/applet/applet.c:234
 #, c-format
 msgid "Wired Ethernet (%s)"
-msgstr "Ethernet câblé (%s)"
+msgstr "Réseau câblé (%s)"
 
-#: ../src/applet.c:236
+#: ../gnome/applet/applet.c:236
 #, c-format
 msgid "Wireless Ethernet (%s)"
-msgstr "Ethernet sans fil (%s)"
+msgstr "Réseau sans fil (%s)"
 
-#: ../src/applet.c:337 ../src/applet.c:362
+#: ../gnome/applet/applet.c:332 ../gnome/applet/applet.c:358
 msgid "NetworkManager Applet"
 msgstr "Applet NetworkManager"
 
-#: ../src/applet.c:339 ../src/applet.c:364
-msgid "Copyright © 2004-2005 Red Hat, Inc."
-msgstr "Copyright © 2004-2005 Red Hat, Inc."
+#: ../gnome/applet/applet.c:334
+msgid ""
+"Copyright © 2004-2006 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+msgstr ""
+"Copyright © 2004-2006 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
 
-#: ../src/applet.c:340 ../src/applet.c:365
+#: ../gnome/applet/applet.c:336 ../gnome/applet/applet.c:362
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
-"Applet de zone de notification pour la gestion des périphériques réseau et "
-"des connexions."
+"Une zone de notification pour gérer vos périphériques réseaux et vos "
+"connexions."
 
-#: ../src/applet.c:343 ../src/applet.c:370
+#: ../gnome/applet/applet.c:339 ../gnome/applet/applet.c:366
 msgid "translator-credits"
 msgstr ""
-"Mainteneur :\n"
-"Christophe Merlet (RedFox) <redfox@redfoxcenter.org>\n"
-"\n"
-"Contributeurs :\n"
-"Vincent Renardias <vincent@debian.org>\n"
-"Jean-Noël Guiheneuf <jean-noel.guiheneuf@wanadoo.fr>\n"
-"Frédéric Riss <frederic.riss@laposte.net>\n"
-"Joaquim Fellmann <joaquim@altern.org>\n"
-"Christophe Fergeau <teuf@users.sourceforge.net>\n"
-"Brigitte Le Grand <brigitte.le.grand@sun.com> pour Sun Microsystems(tm)\n"
-"Yannick Marchegay <yannick.marchegay@lokanova.com>\n"
-"Sébastien Bacher <seb128@debian.org>\n"
-"Craig Jeffares <cjeffares@novell.com> pour Novell(tm)\n"
-"Vincent Carriere <carriere_vincent@yahoo.fr>\n"
-"Vincent Untz <vuntz@gnome.org>\n"
-"Stéphane Raimbault <stephane.raimbault@free.fr>"
-
-#: ../src/applet.c:426
+"Raphaël Tournoy <lexpas@free.fr>\n"
+"Stéphane Raimbault <stephae.raimbault@free.fr>"
+
+#: ../gnome/applet/applet.c:360
+msgid ""
+"Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+msgstr ""
+"Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+
+#: ../gnome/applet/applet.c:422
 msgid "VPN Login Failure"
-msgstr "Échec de login du VPN"
+msgstr "Échec de l'identification VPN"
 
-#: ../src/applet.c:427
+#: ../gnome/applet/applet.c:423
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a login failure."
 msgstr ""
-"Impossible de démarrer la connexion VPN '%s' en raison d'un échec de login."
+"Impossible de démarrer la connexion VPN « %s » suite à l'échec "
+"d'identification."
 
-#: ../src/applet.c:431
+#: ../gnome/applet/applet.c:427
 msgid "VPN Start Failure"
-msgstr "Échec du démarrage du VPN"
+msgstr "Échec du lancement VPN"
 
-#: ../src/applet.c:432
+#: ../gnome/applet/applet.c:428
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
 "program."
 msgstr ""
-"Impossible de démarrer la connexion VPN '%s' en raison de l'échec du "
-"lancement du programme VPN."
+"Impossible de démarrer la connexion VPN « %s » suite à l'échec de lancement "
+"du programme VPN."
 
-#: ../src/applet.c:436 ../src/applet.c:446
+#: ../gnome/applet/applet.c:432 ../gnome/applet/applet.c:442
 msgid "VPN Connect Failure"
-msgstr "Échec de connexion VPN"
+msgstr "Échec de la connexion VPN"
 
-#: ../src/applet.c:437
+#: ../gnome/applet/applet.c:433
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a connection error."
 msgstr ""
-"Impossible de démarrer la connexion '%s' en raison d'une erreur de connexion."
+"Impossible de démarrer la connexion VPN « %s » suite à une erreur de "
+"connexion."
 
-#: ../src/applet.c:441
+#: ../gnome/applet/applet.c:437
 msgid "VPN Configuration Error"
 msgstr "Erreur de configuration VPN"
 
-#: ../src/applet.c:442
+#: ../gnome/applet/applet.c:438
 #, c-format
 msgid "The VPN connection '%s' was not correctly configured."
-msgstr "La connexion VPN '%s' n'a pas été configurée correctement."
+msgstr "La connexion VPN « %s » n'a pas été correctement configurée."
 
-#: ../src/applet.c:447
+#: ../gnome/applet/applet.c:443
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' because the VPN server did not "
 "return an adequate network configuration."
 msgstr ""
-"Impossible de démarrer la connexion VPN '%s' car le serveur VPN n'a pas "
-"renvoyé de configuration réseau adéquate."
+"Impossible de démarrer la connexion VPN « %s » parce que le serveur VPN "
+"n'indique pas une configuration réseau adéquate."
 
-#: ../src/applet.c:517
+#: ../gnome/applet/applet.c:513
 msgid "VPN Login Message"
-msgstr "Message de login du VPN"
+msgstr "Message d'identification VPN"
 
-#: ../src/applet.c:741 ../src/applet.c:2508
-#: ../src/other-network-dialog.c:453
-#: ../src/passphrase-dialog.c:228
+#: ../gnome/applet/applet.c:737 ../gnome/applet/applet.c:2507
+#: ../gnome/applet/other-network-dialog.c:458
+#: ../gnome/applet/passphrase-dialog.c:228
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
@@ -153,363 +154,361 @@ msgstr ""
 "L'applet NetworkManager n'a pas pu trouver les ressources requises (le "
 "fichier glade n'a pas été trouvé)."
 
-#: ../src/applet.c:753
+#: ../gnome/applet/applet.c:749
 #, c-format
 msgid "The network device \"%s (%s)\" does not support wireless scanning."
 msgstr ""
-"Le périphérique réseau \"%s (%s)\" ne prend pas en charge l'analyse sans fil."
+"Le périphérique « %s (%s) » ne suppporte pas la recherche de réseaux sans "
+"fil."
 
-#: ../src/applet.c:761
+#: ../gnome/applet/applet.c:757
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
 msgstr ""
-"Le périphérique réseau \"%s (%s)\" ne prend pas en charge la détection de "
-"liaison."
+"Le périphérique réseau « %s (%s) » ne supporte pas la détection du "
+"branchement."
 
-#: ../src/applet.c:908
+#: ../gnome/applet/applet.c:904
 #, c-format
 msgid "Preparing device %s for the wired network..."
-msgstr "Préparation du périphérique %s pour le réseau câblé..."
+msgstr "Préparation du périphérique %s pour la connexion câblée..."
 
-#: ../src/applet.c:910
+#: ../gnome/applet/applet.c:906
 #, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
-msgstr "Préparation du périphérique %s pour le réseau sans fil '%s'..."
+msgstr "Préparation du périphérique %s pour le réseau sans fil « %s »..."
 
-#: ../src/applet.c:918
+#: ../gnome/applet/applet.c:914
 #, c-format
 msgid "Configuring device %s for the wired network..."
-msgstr "Configuration du périphérique %s pour le réseau câblé..."
+msgstr "Configuration du périphérique %s pour la connexion câblée..."
 
-#: ../src/applet.c:920
+#: ../gnome/applet/applet.c:916
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
-msgstr "Tentative de connexion au réseau sans fil '%s'..."
+msgstr "Tentative pour rejoindre le réseau sans fil « %s »..."
 
-#: ../src/applet.c:928
+#: ../gnome/applet/applet.c:924
 #, c-format
 msgid "Waiting for Network Key for the wireless network '%s'..."
-msgstr "Attente de la clé réseau pour le réseau sans fil '%s'..."
+msgstr "Attente de la clé réseau pour le réseau sans fil « %s »..."
 
-#: ../src/applet.c:936 ../src/applet.c:946
+#: ../gnome/applet/applet.c:932 ../gnome/applet/applet.c:942
 msgid "Requesting a network address from the wired network..."
-msgstr "Demande d'adresse réseau à partir du réseau câblé..."
+msgstr "Obtention d'une adresse réseau depuis le réseau câblé..."
 
-#: ../src/applet.c:938 ../src/applet.c:948
+#: ../gnome/applet/applet.c:934 ../gnome/applet/applet.c:944
 #, c-format
 msgid "Requesting a network address from the wireless network '%s'..."
-msgstr "Demande d'adresse réseau à partir du réseau sans fil '%s'..."
+msgstr "Obtention d'une adresse réseau depuis réseau sans fil « %s »..."
 
-#: ../src/applet.c:956
+#: ../gnome/applet/applet.c:952
 msgid "Finishing connection to the wired network..."
-msgstr "Fin de la connexion en cours au réseau câblé..."
+msgstr "Finalisation de la connexion au réseau câblé..."
 
-#: ../src/applet.c:958
+#: ../gnome/applet/applet.c:954
 #, c-format
 msgid "Finishing connection to the wireless network '%s'..."
-msgstr "Fin de la connexion en cours au réseau sans fil '%s'..."
+msgstr "Finalisation de la connexion au réseau sans fil « %s »..."
 
-#: ../src/applet.c:1075
+#: ../gnome/applet/applet.c:1071
 msgid "NetworkManager is not running"
 msgstr "NetworkManager n'est pas lancé"
 
-#: ../src/applet.c:1083 ../src/applet.c:1828
+#: ../gnome/applet/applet.c:1079 ../gnome/applet/applet.c:1824
 msgid "Networking disabled"
 msgstr "Réseau désactivé"
 
-#: ../src/applet.c:1088
+#: ../gnome/applet/applet.c:1084
 msgid "No network connection"
 msgstr "Aucune connexion réseau"
 
-#: ../src/applet.c:1093
+#: ../gnome/applet/applet.c:1089
 msgid "Wired network connection"
-msgstr "Connexion à un réseau cablé"
+msgstr "Connexion à un réseau câblé"
 
-#: ../src/applet.c:1097
+#: ../gnome/applet/applet.c:1093
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Connecté à un réseau sans fil Ad-Hoc"
 
-#: ../src/applet.c:1099
+#: ../gnome/applet/applet.c:1095
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
-msgstr "Connexion au réseau sans fil vers « %s » (%d%%)"
+msgstr "Connexion par réseau sans fil à « %s » (%d%%)"
 
-#: ../src/applet.c:1120
+#: ../gnome/applet/applet.c:1116
 #, c-format
 msgid "VPN connection to '%s'"
-msgstr "Connexion VPN à '%s'"
+msgstr "Connexion VPN à « %s »"
 
-#: ../src/applet.c:1128
+#: ../gnome/applet/applet.c:1124
 #, c-format
 msgid "VPN connecting to '%s'"
-msgstr "Connexion du VPN à '%s'"
+msgstr "Connexion VPN à « %s »"
 
-#: ../src/applet.c:1541
+#: ../gnome/applet/applet.c:1537
 msgid "_Connect to Other Wireless Network..."
-msgstr "_Se connecter à un autre réseau sans fil..."
+msgstr "_Se connecter à d'autres réseaux sans fil..."
 
-#: ../src/applet.c:1562
+#: ../gnome/applet/applet.c:1558
 msgid "Create _New Wireless Network..."
-msgstr "Créer_un nouveau réseau sans fil..."
+msgstr "Créer un _nouveau réseau sans fil..."
 
-#: ../src/applet.c:1685
+#: ../gnome/applet/applet.c:1681
 msgid "_VPN Connections"
 msgstr "_Connexions VPN"
 
-#: ../src/applet.c:1730
+#: ../gnome/applet/applet.c:1726
 msgid "_Configure VPN..."
-msgstr "_Configurer le réseau VPN..."
+msgstr "_Configurer le VPN..."
 
-#: ../src/applet.c:1734
+#: ../gnome/applet/applet.c:1730
 msgid "_Disconnect VPN..."
-msgstr "_Se déconnecter du réseau VPN..."
+msgstr "_Déconnecter le VPN..."
 
-#: ../src/applet.c:1756
+#: ../gnome/applet/applet.c:1752
 msgid "_Dial Up Connections"
-msgstr "_Connexions à distance"
+msgstr "Connexions _commutées"
 
 #. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
-#: ../src/applet.c:1767
+#: ../gnome/applet/applet.c:1763
 #, c-format
 msgid "Connect to %s..."
-msgstr "Se connecter à %s..."
+msgstr "Connecter à %s..."
 
-#: ../src/applet.c:1773
+#: ../gnome/applet/applet.c:1769
 #, c-format
 msgid "Disconnect from %s..."
-msgstr "Déconnecté de %s..."
+msgstr "Déconnecter de %s..."
 
-#: ../src/applet.c:1822
+#: ../gnome/applet/applet.c:1818
 msgid "No network devices have been found"
 msgstr "Aucun périphérique réseau n'a été détecté"
 
-#: ../src/applet.c:2014
+#: ../gnome/applet/applet.c:2010
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager n'est pas lancé..."
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2170
+#: ../gnome/applet/applet.c:2166
 msgid "Enable _Networking"
-msgstr "Activer_le réseau"
+msgstr "Activer le _réseau"
 
 #. 'Enable Wireless' item
-#: ../src/applet.c:2176
+#: ../gnome/applet/applet.c:2172
 msgid "Enable _Wireless"
-msgstr "Activer la_connexion sans fil"
+msgstr "Activer le réseau _sans fil"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2182
+#: ../gnome/applet/applet.c:2178
 msgid "Connection _Information"
-msgstr "Informations sur la_connexion"
+msgstr "_Information de connexion"
 
 #. Help item
-#: ../src/applet.c:2193
+#: ../gnome/applet/applet.c:2189
 msgid "_Help"
 msgstr "_Aide"
 
 #. About item
-#: ../src/applet.c:2202
+#: ../gnome/applet/applet.c:2198
 msgid "_About"
 msgstr "À _propos"
 
-#: ../src/applet.c:2667
+#: ../gnome/applet/applet.c:2666
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
 msgstr ""
-"L'applet NetworkManager n'a pas pu trouver certaines ressources requises. "
-"Elle ne peut pas continuer.\n"
+"L'applet NetworkManager n'ayant pas trouvé les ressources requises, "
+"l'exécution ne peut pas continuer.\n"
 
-#: ../src/wireless-security-option.c:157
+#: ../gnome/applet/wireless-security-option.c:157
 msgid "Open System"
 msgstr "Système ouvert"
 
-#: ../src/wireless-security-option.c:160
+#: ../gnome/applet/wireless-security-option.c:160
 msgid "Shared Key"
-msgstr "Clé partagée"
+msgstr "À clé partagée"
 
-#: ../src/wireless-security-option.c:208
+#: ../gnome/applet/wireless-security-option.c:208
 msgid "Automatic (Default)"
-msgstr "Automatique (par défaut)"
+msgstr "Automatique (défaut)"
 
-#: ../src/wireless-security-option.c:215
+#: ../gnome/applet/wireless-security-option.c:215
 msgid "AES-CCMP"
 msgstr "AES-CCMP"
 
-#: ../src/wireless-security-option.c:223
+#: ../gnome/applet/wireless-security-option.c:223
 msgid "TKIP"
 msgstr "TKIP"
 
-#: ../src/wireless-security-option.c:231
+#: ../gnome/applet/wireless-security-option.c:231
 msgid "Dynamic WEP"
 msgstr "WEP dynamique"
 
-#: ../src/wso-none.c:53
+#: ../gnome/applet/wso-none.c:53
 msgid "None"
 msgstr "Aucun"
 
-#: ../src/wso-wep-ascii.c:138
+#: ../gnome/applet/wso-wep-ascii.c:138
 msgid "WEP 64/128-bit ASCII"
-msgstr "WEP 64/128 bits ASCII"
+msgstr "WEP 64/128-bit ASCII"
 
-#: ../src/wso-wep-hex.c:135
+#: ../gnome/applet/wso-wep-hex.c:135
 msgid "WEP 64/128-bit Hex"
-msgstr "WEP 64/128 bits (hex.)"
+msgstr "WEP 64/128-bit Hex"
 
-#: ../src/wso-wep-passphrase.c:135
+#: ../gnome/applet/wso-wep-passphrase.c:135
 msgid "WEP 128-bit Passphrase"
-msgstr "Phrase secrète WEP 128 bits"
+msgstr "WEP 128-bit à phrase secrète"
 
-#: ../src/wso-wpa-eap.c:237
+#: ../gnome/applet/wso-wpa-eap.c:237
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../src/wso-wpa-eap.c:238
+#: ../gnome/applet/wso-wpa-eap.c:238
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wso-wpa-eap.c:239
+#: ../gnome/applet/wso-wpa-eap.c:239
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../src/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
-#: ../src/nm-ap-security-wpa-eap.c:116
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:93
+#: ../src/nm-ap-security-wpa-eap.c:117
 msgid "WPA2 Enterprise"
-msgstr "WPA Enterprise"
+msgstr "WPA2 entreprise"
 
-#: ../src/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
-#: ../src/nm-ap-security-wpa-eap.c:121
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:95
+#: ../src/nm-ap-security-wpa-eap.c:122
 msgid "WPA Enterprise"
-msgstr "WPA Enterprise"
+msgstr "WPA entreprise"
 
-#: ../src/wso-wpa-psk.c:178
+#: ../gnome/applet/wso-wpa-psk.c:178
 msgid "WPA2 Personal"
-msgstr "WPA2 Personal"
+msgstr "WPA2 personnel"
 
-#: ../src/wso-wpa-psk.c:180
+#: ../gnome/applet/wso-wpa-psk.c:180
 msgid "WPA Personal"
-msgstr "WPA Personal"
+msgstr "WPA personnel"
 
-#: ../src/eggtrayicon.c:134
+#: ../gnome/applet/eggtrayicon.c:134
 msgid "Orientation"
 msgstr "Orientation"
 
-#: ../src/eggtrayicon.c:135
+#: ../gnome/applet/eggtrayicon.c:135
 msgid "The orientation of the tray."
 msgstr "L'orientation de la zone de notification."
 
-#: ../src/menu-items.c:88
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
-msgstr "Réseau cablé (%s)"
+msgstr "Réseau câblé (%s)"
 
-#: ../src/menu-items.c:91
+#: ../gnome/applet/menu-items.c:91
 msgid "_Wired Network"
-msgstr "_Réseau câblé"
+msgstr "Réseau _câblé"
 
-#: ../src/menu-items.c:162
+#: ../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)"
 
-#: ../src/menu-items.c:164
+#: ../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"
 
-#: ../src/menu-items.c:343
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
-msgstr " (Unicode non valide)"
+msgstr " (unicode non valide)"
 
-#: ../src/other-network-dialog.c:352
+#: ../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 ""
-"Par défaut, le nom du réseau sans fil est défini sur celui de votre "
-"ordinateur, %s, sans codage activé"
+"Par défaut, le nom du réseau sans fil est assigné au nom de l'ordinateur, %"
+"s, sans cryptage actif."
 
-#: ../src/other-network-dialog.c:358
+#: ../gnome/applet/other-network-dialog.c:358
 msgid "Create new wireless network"
 msgstr "Créer un nouveau réseau sans fil"
 
-#: ../src/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 ""
-"Entrez le nom et les paramètres de sécurité du réseau sans fil que vous "
+"Saisissez le nom et les paramètres de sécurité du réseau sans fil que vous "
 "voulez créer."
 
-#: ../src/other-network-dialog.c:363
+#: ../gnome/applet/other-network-dialog.c:363
 msgid "Create New Wireless Network"
-msgstr "Créer un nouveau réseau sans fil"
+msgstr "Création d'un nouveau réseau sans fil"
 
-#: ../src/other-network-dialog.c:368
+#: ../gnome/applet/other-network-dialog.c:368
 msgid "Existing wireless network"
 msgstr "Réseau sans fil existant"
 
-#: ../src/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 "Entrez le nom du réseau sans fil auquel vous voulez vous connecter."
+msgstr "Saisissez le nom du réseau sans fil auquel vous voulez vous connecter."
 
-#: ../src/other-network-dialog.c:371
+#: ../gnome/applet/other-network-dialog.c:371
 msgid "Connect to Other Wireless Network"
-msgstr "Se connecter à un autre réseau sans fil"
+msgstr "Connexion aux autres réseaux sans fil"
 
-#: ../src/passphrase-dialog.c:215
+#: ../gnome/applet/passphrase-dialog.c:215
 msgid "Error connecting to wireless network"
-msgstr "Erreur de connexion au réseau sans fil"
+msgstr "Erreur à la connexion au réseau sans fil"
 
-#: ../src/passphrase-dialog.c:216
+#: ../gnome/applet/passphrase-dialog.c:216
 msgid ""
 "The requested wireless network requires security capabilities unsupported by "
 "your hardware."
 msgstr ""
-"Le réseau sans fil demandé nécessite des fonctions de sécurité qui ne sont "
-"pas prises en charge par votre matériel."
+"Le réseau sans fil requiert des capacités de sécurité non supportées par "
+"votre matériel."
 
-#: ../src/vpn-password-dialog.c:151
-#: ../src/vpn-password-dialog.c:188
+#: ../gnome/applet/vpn-password-dialog.c:151
+#: ../gnome/applet/vpn-password-dialog.c:188
 #, c-format
 msgid "Cannot start VPN connection '%s'"
-msgstr "Impossible de démarrer la connexion VPN '%s'"
+msgstr "Impossible de démarrer la connexion VPN « %s »"
 
-#: ../src/vpn-password-dialog.c:154
+#: ../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 ""
-"Impossible de trouver la boîte de dialogue d'authentification pour le type "
-"de connexion VPN '%s'. Contactez votre administrateur système."
+"Impossible de trouver la fenêtre d'authentification pour le type de "
+"connexion VPN « %s ». Contactez votre administrateur système."
 
-#: ../src/vpn-password-dialog.c:191
+#: ../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 ""
-"Un problème est survenu lors de l'ouverture de la boîte de dialogue "
-"d'authentification pour le type de connexion VPN '%s'. Contactez votre "
-"administrateur système."
+"Un problème est survenu au lancement de la fenêtre d'authentification pour "
+"le type de connexion VPN « %s ». Contactez votre administrateur système."
 
-#: ../src/applet.glade.h:1
+#: ../gnome/applet/applet.glade.h:1
 msgid " "
 msgstr " "
 
-#: ../src/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\">Informations sur la connexion active</"
-"span>"
+msgstr "<span weight=\"bold\">Information sur la connexion active</span>"
 
-#: ../src/applet.glade.h:4
+#: ../gnome/applet/applet.glade.h:4
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
@@ -518,25 +517,24 @@ msgid ""
 "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 "
+"<span weight=\"bold\" size=\"larger\">Phrase secrète 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 "
+"Une phrase secrète ou une clé de chiffrement est requise pour accéder au "
 "réseau sans fil « %s »."
 
-#: ../src/applet.glade.h:8
+#: ../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\">Fonctionnalité réduite du réseau</"
-"span>\n"
+"<span weight=\"bold\" size=\"larger\">Fonctionnalité réseau réduite</span>\n"
 "\n"
-"%s  Le réseau ne sera pas entièrement opérationnel."
+"%s  Ne sera pas complétement fonctionnel."
 
-#: ../src/applet.glade.h:12
+#: ../gnome/applet/applet.glade.h:12
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
@@ -546,212 +544,220 @@ 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\">Confirmation de login au réseau sans "
-"fil</span>\n"
+"<span weight=\"bold\" size=\"larger\">Confirmation d'identification sur le "
+"réseau sans fil</span>\n"
 "\n"
-"Vous avez choisi de vous loguer au réseau sans fil '%s'. Si vous êtes sûr "
-"que ce réseau sans fil est sécurisé, cochez la case ci-dessous. Ainsi, "
-"NetworkManager ne vous demandera pas de confirmation lors des logins "
-"ultérieurs."
+"Vous avez choisi de vous connecter sur le réseau sans fil « %s ». Si vous "
+"êtes certain que ce réseau sans fil est sécurisé, cliquez sur la boite à "
+"cocher suivante et NetworkManager ne vous demandera plus de confirmation "
+"lors de vos connexions ultérieures."
 
-#: ../src/applet.glade.h:15
+#: ../gnome/applet/applet.glade.h:15
 msgid "Anonymous Identity:"
-msgstr "Identité anonyme :"
+msgstr "Identité anonyme :"
 
-#: ../src/applet.glade.h:16
+#: ../gnome/applet/applet.glade.h:16
 msgid "Authentication:"
-msgstr "Authentification:"
+msgstr "Authentication :"
 
-#: ../src/applet.glade.h:17
+#: ../gnome/applet/applet.glade.h:17
 msgid "Broadcast Address:"
-msgstr "Adresse de diffusion :"
+msgstr "Adresse de broadcast :"
 
-#: ../src/applet.glade.h:18
+#: ../gnome/applet/applet.glade.h:18
 msgid "CA Certificate File:"
-msgstr "Fichier de certificat AC :"
+msgstr "File de certificat CA :"
 
-#: ../src/applet.glade.h:19
+#: ../gnome/applet/applet.glade.h:19
 msgid "C_onnect"
 msgstr "Se _connecter"
 
-#: ../src/applet.glade.h:20
+#: ../gnome/applet/applet.glade.h:20
 msgid "Client Certificate File:"
-msgstr "Fichier de certificat client :"
+msgstr "Fichier de certificat client :"
 
-#: ../src/applet.glade.h:21
+#: ../gnome/applet/applet.glade.h:21
 msgid "Connection Information"
-msgstr "Informations sur la connexion"
+msgstr "Information de connexion"
 
-#: ../src/applet.glade.h:22
+#: ../gnome/applet/applet.glade.h:22
 msgid "Default Route:"
-msgstr "Route par défaut :"
+msgstr "Route par défaut :"
 
-#: ../src/applet.glade.h:23
+#: ../gnome/applet/applet.glade.h:23
 msgid "Destination Address:"
-msgstr "Adresse de destination :"
+msgstr "Adresse de destination :"
 
-#: ../src/applet.glade.h:24
+#: ../gnome/applet/applet.glade.h:24
 msgid "Driver:"
-msgstr "Pilote :"
+msgstr "Pilote :"
 
-#: ../src/applet.glade.h:25
+#: ../gnome/applet/applet.glade.h:25
 msgid "EAP Method:"
-msgstr "Méthode EAP :"
+msgstr "Méthode EAP :"
 
-#: ../src/applet.glade.h:26
+#: ../gnome/applet/applet.glade.h:26
 msgid "Hardware Address:"
-msgstr "Adresse matérielle:"
+msgstr "Adresse matérielle :"
 
-#: ../src/applet.glade.h:27
+#: ../gnome/applet/applet.glade.h:27
 msgid "IP Address:"
-msgstr "Adresse IP:"
+msgstr "Adresse IP :"
 
-#: ../src/applet.glade.h:28
+#: ../gnome/applet/applet.glade.h:28
 msgid "Identity:"
-msgstr "Identité :"
+msgstr "Identité :"
 
-#: ../src/applet.glade.h:29
+#: ../gnome/applet/applet.glade.h:29
 msgid "Interface:"
-msgstr "Interface :"
+msgstr "Interface :"
 
-#: ../src/applet.glade.h:30
+#: ../gnome/applet/applet.glade.h:30
 msgid "Key Type:"
 msgstr "Type de clé :"
 
-#: ../src/applet.glade.h:31
+#: ../gnome/applet/applet.glade.h:31
+msgid "Key management:"
+msgstr "Gestion des clés :"
+
+#: ../gnome/applet/applet.glade.h:32
 msgid "Key:"
-msgstr "Clé:"
+msgstr "Clé :"
 
-#: ../src/applet.glade.h:32
+#: ../gnome/applet/applet.glade.h:33
 msgid ""
 "None\n"
 "WEP 128-bit Passphrase\n"
 "WEP 64/128-bit Hex\n"
 "WEP 64/128-bit ASCII\n"
 msgstr ""
-"Aucun\n"
-"Phrase secrète WEP 128 bits\n"
-"WEP 64/128 bits hex.\n"
-"WEP 64/128 bits ASCII\n"
+"Aucune\n"
+"Phrase secrète WEP 128-bit\n"
+"WEP 64/128-bit Héx.<\n"
+"WEP 64/128-bit ASCII\n"
 
-#: ../src/applet.glade.h:37
+#: ../gnome/applet/applet.glade.h:38
 msgid ""
 "Open System\n"
 "Shared Key"
 msgstr ""
 "Système ouvert\n"
-"Clé partagée"
+"À clé partagée"
 
-#: ../src/applet.glade.h:39
+#: ../gnome/applet/applet.glade.h:40
 msgid "Other Wireless Network..."
-msgstr "Autre réseau sans fil..."
+msgstr "Autres réseaux sans fil..."
 
-#: ../src/applet.glade.h:40
+#: ../gnome/applet/applet.glade.h:41
 msgid "Passphrase:"
-msgstr "Phrase de passe :"
+msgstr "Phrase secrète :"
 
-#: ../src/applet.glade.h:41
+#: ../gnome/applet/applet.glade.h:42
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: ../src/applet.glade.h:42
+#: ../gnome/applet/applet.glade.h:43
 msgid "Primary DNS:"
-msgstr "DNS primaire :"
+msgstr "DNS primaire :"
 
-#: ../src/applet.glade.h:43
+#: ../gnome/applet/applet.glade.h:44
 msgid "Private Key File:"
-msgstr "Fichier de clé privée :"
+msgstr "Fichier de clé privé :"
 
-#: ../src/applet.glade.h:44
+#: ../gnome/applet/applet.glade.h:45
 msgid "Private Key Password:"
-msgstr "Mot de passe de la clé privée :"
+msgstr "Mot de passe de la clé privé :"
 
-#: ../src/applet.glade.h:45
+#: ../gnome/applet/applet.glade.h:46
 msgid "Secondary DNS:"
-msgstr "DNS secondaire :"
+msgstr "DNS secondaire :"
 
-#: ../src/applet.glade.h:46
+#: ../gnome/applet/applet.glade.h:47
 msgid "Select the CA Certificate File"
-msgstr "Sélectionner le fichier de certificat de l'autorité de certification"
+msgstr "Choisissez le fichier de certificat CA"
 
-#: ../src/applet.glade.h:47
+#: ../gnome/applet/applet.glade.h:48
 msgid "Select the Client Certificate File"
-msgstr "Sélectionner le fichier de certificat du client"
+msgstr "Choisissez le fichier de certificat client"
 
-#: ../src/applet.glade.h:48
+#: ../gnome/applet/applet.glade.h:49
 msgid "Select the Private Key File"
-msgstr "Sélectionner le fichier de clé privée"
+msgstr "Choisissez le fichier de clé privée"
 
-#: ../src/applet.glade.h:49
+#: ../gnome/applet/applet.glade.h:50
 msgid "Show key"
 msgstr "Afficher la clé"
 
-#: ../src/applet.glade.h:50
+#: ../gnome/applet/applet.glade.h:51
 msgid "Show passphrase"
-msgstr "Afficher la phrase secrète"
+msgstr "Afficher la phrase secrète"
 
-#: ../src/applet.glade.h:51
+#: ../gnome/applet/applet.glade.h:52
 msgid "Show password"
 msgstr "Afficher le mot de passe"
 
-#: ../src/applet.glade.h:52
+#: ../gnome/applet/applet.glade.h:53
 msgid "Show passwords"
 msgstr "Afficher les mots de passe"
 
-#: ../src/applet.glade.h:53
+#: ../gnome/applet/applet.glade.h:54
 msgid "Speed:"
-msgstr "Vitesse :"
+msgstr "Vitesse :"
 
-#: ../src/applet.glade.h:54
+#: ../gnome/applet/applet.glade.h:55
 msgid "Subnet Mask:"
-msgstr "Masque de sous-réseau:"
+msgstr "Masque de sous-réseau :"
 
-#: ../src/applet.glade.h:55
+#: ../gnome/applet/applet.glade.h:56
 msgid "Type:"
 msgstr "Type :"
 
-#: ../src/applet.glade.h:56
+#: ../gnome/applet/applet.glade.h:57
 msgid "User Name:"
-msgstr "Nom d'utilisateur :"
+msgstr "Nom d'utilisateur :"
 
-#: ../src/applet.glade.h:57
+#: ../gnome/applet/applet.glade.h:58
 msgid "Wireless Network Key Required"
-msgstr "Clef requise par le réseau sans fil"
+msgstr "Clé requise par le réseau sans fil"
 
-#: ../src/applet.glade.h:58
+#: ../gnome/applet/applet.glade.h:59
 msgid "Wireless _adapter:"
-msgstr "_Adaptateur sans fil :"
+msgstr "Ad_aptateur sans fil :"
 
-#: ../src/applet.glade.h:59
+#: ../gnome/applet/applet.glade.h:60
 msgid "_Always Trust this Wireless Network"
 msgstr "_Toujours faire confiance à ce réseau sans fil"
 
-#: ../src/applet.glade.h:60
+#: ../gnome/applet/applet.glade.h:61
 msgid "_Don't remind me again"
-msgstr "_Ne plus afficher ce message"
+msgstr "_Ne plus me le rappeler"
+
+#: ../gnome/applet/applet.glade.h:62
+msgid "_Fallback on this Network"
+msgstr "_Se connecter par défaut sur ce réseau"
 
-#: ../src/applet.glade.h:61
+#: ../gnome/applet/applet.glade.h:63
 msgid "_Login to Network"
-msgstr "_Connexion au réseau"
+msgstr "_S'identifier sur le réseau"
 
-#: ../src/applet.glade.h:62
+#: ../gnome/applet/applet.glade.h:64
 msgid "_Network Name:"
-msgstr "_Nom de réseau :"
+msgstr "_Nom de réseau :"
 
-#: ../src/applet.glade.h:63
+#: ../gnome/applet/applet.glade.h:65
 msgid "_Wireless Security:"
-msgstr "_Sécurité sans fil :"
+msgstr "_Sécurité sans fil :"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.c:383
 msgid "Cannot add VPN connection"
-msgstr "Impossible d'ajouter la connexion VPN"
+msgstr "Impossible d'ajouter des connexions VPN"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.c:385
 msgid ""
 "No suitable VPN software was found on your system. Contact your system "
 "administrator."
 msgstr ""
-"Aucun logiciel VPN adapté n'a été trouvé sur votre système. Contactez votre "
+"Aucun logiciel VPN adéquat n'a été trouvé sur votre système. Contactez votre "
 "administrateur système."
 
 #: ../gnome/vpn-properties/nm-vpn-properties.c:437
@@ -764,13 +770,14 @@ msgid ""
 "Cannot find suitable software for VPN connection type '%s' to import the "
 "file '%s'. Contact your system administrator."
 msgstr ""
-"Impossible de trouver le logiciel adapté au type de connexion VPN '%s' pour "
-"importer le fichier '%s'. Contactez votre administrateur système."
+"Impossible de trouver un logiciel adéquat supportant la connexion VPN de "
+"type « %s » pour importer le fichier « %s ». Contactez votre administrateur "
+"système."
 
 #: ../gnome/vpn-properties/nm-vpn-properties.c:579
 #, c-format
 msgid "Error retrieving VPN connection '%s'"
-msgstr "Erreur de récupération de la connexion VPN '%s'"
+msgstr "Impossible de maintenir la connexion VPN « %s »"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.c:582
 #, c-format
@@ -778,13 +785,13 @@ msgid ""
 "Could not find the UI files for VPN connection type '%s'. Contact your "
 "system administrator."
 msgstr ""
-"Impossible de trouver les fichiers de l'interface utilisateur pour le type "
-"de connexion VPN '%s'. Contactez votre administrateur système."
+"Impossible de trouver les fichiers de l'interface utilisateur pour la "
+"connexion VPN de type « %s ». Contactez votre administrateur système."
 
 #: ../gnome/vpn-properties/nm-vpn-properties.c:739
 #, c-format
 msgid "Delete VPN connection \"%s\"?"
-msgstr "Supprimer la connexion VPN \"%s\" ?"
+msgstr "Voulez-vous supprimer la connexion VPN « %s » ?"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.c:742
 #, c-format
@@ -793,9 +800,9 @@ msgid ""
 "need your system administrator to provide information to create a new "
 "connection."
 msgstr ""
-"Toutes les informations concernant la connexion VPN \"%s\" seront perdues et "
-"votre administrateur système devra peut-être fournir les informations "
-"nécessaires à la création d'une nouvelle connexion."
+"Toutes les informations au sujet de la connexion « %s » seront perdues et il "
+"se peut que vous ayez besoin de votre administrateur système pour créer une "
+"nouvelle connexion."
 
 #: ../gnome/vpn-properties/nm-vpn-properties.c:959
 msgid "Unable to load"
@@ -803,40 +810,40 @@ msgstr "Impossible de charger"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.c:961
 msgid "Cannot find some needed resources (the glade file)!"
-msgstr "Impossible de trouver certaines ressources requises (fichier glade) !"
+msgstr "Impossible de trouver les ressources requises (le fichier glade)."
 
 #. Edit dialog
 #: ../gnome/vpn-properties/nm-vpn-properties.c:1071
 msgid "Edit VPN Connection"
-msgstr "Éditer la connexion VPN"
+msgstr "Édition de la connexion VPN"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:1
 msgid "Add a new VPN connection"
-msgstr "Ajouter une connexion VPN"
+msgstr "Ajoute une nouvelle connexion VPN"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:2
 msgid "Choose which type of VPN connection you wish to create."
-msgstr "Choisissez le type de connexion VPN à créer."
+msgstr "Choisissez quelle type de connection VPN vous souhaitez créer."
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
 msgid "Connect to:"
-msgstr "Se connecter à :"
+msgstr "Se _connecter à :"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
 msgid "Create VPN Connection"
-msgstr "Créer une connexion VPN"
+msgstr "Création d'une connexion VPN"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
 msgid "Create VPN Connection - 1 of 2"
-msgstr "Créer une connexion VPN - 1 sur 2"
+msgstr "Création d'une connexion VPN - 1 sur 2"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
 msgid "Create VPN Connection - 2 of 2"
-msgstr "Créer une connexion VPN - 2 sur 2"
+msgstr "Création d'une connexion VPN - 2 sur 2"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
 msgid "Delete the selected VPN connection"
-msgstr "Supprimer la connexion VPN sélectionnée"
+msgstr "Supprime la connexion VPN sélectionnée"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
 msgid "E_xport"
@@ -844,23 +851,23 @@ msgstr "E_xporter"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:9
 msgid "Edit the selected VPN connection"
-msgstr "Éditer la connexion VPN sélectionnée"
+msgstr "Édite la connexion VPN sélectionnée"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:10
 msgid "Export the VPN settings to a file"
-msgstr "Exporter les paramètres VPN dans un fichier"
+msgstr "Exporte les paramètres VPN dans un fichier"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:11
 msgid "Export the selected VPN connection to a file"
-msgstr "Exporter la connexion VPN sélectionnée dans un fichier"
+msgstr "Exporte la connexion VPN sélectionnée dans un fichier"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:12
 msgid "Finish Creating VPN Connection"
-msgstr "Finir de créer la connexion VPN"
+msgstr "Fin de la création de la connexion VPN"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:13
 msgid "Manage Virtual Private Network Connections"
-msgstr "Gérer les connexions au réseau privé virtuel"
+msgstr "Gérer les connexions réseaux privés virtuels"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:14
 msgid ""
@@ -870,11 +877,11 @@ msgid ""
 "It will require some information, such as IP addresses and secrets.  Please "
 "see your system administrator to obtain this information."
 msgstr ""
-"Cet assistant va vous aider à créer une connexion à un réseau privé virtuel "
-"(VPN).\n"
+"Cet assistant vous guidera durant la création d'une connexion à un réseau "
+"privé virtuel (VPN).\n"
 "\n"
-"Il aura besoin de certaines informations, telles que des adresses IP et des "
-"secrets. Contactez votre administrateur système pour les obtenir."
+"Des informations telles que les adresses IP et les mots de passe vous seront "
+"demandées. Veuillez consultez votre administrateur système pour les obtenir."
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:17
 msgid "VPN Connections"
@@ -882,11 +889,11 @@ msgstr "Connexions VPN"
 
 #: ../src/nm-ap-security-wep.c:52
 msgid "40-bit WEP"
-msgstr "WEP 40 bits"
+msgstr "WEB 40-bit"
 
 #: ../src/nm-ap-security-wep.c:54
 msgid "104-bit WEP"
-msgstr "WEP 104 bits"
+msgstr "WEP 104-bit"
 
 #: ../src/nm-ap-security-wpa-psk.c:50
 msgid "WPA TKIP"
@@ -898,7 +905,7 @@ msgstr "WPA CCMP"
 
 #: ../src/nm-ap-security-wpa-psk.c:54
 msgid "WPA Automatic"
-msgstr "WPA automatique"
+msgstr "WPA Automatique"
 
 #: ../src/nm-ap-security-wpa-psk.c:59
 msgid "WPA2 TKIP"
@@ -910,125 +917,71 @@ msgstr "WPA2 CCMP"
 
 #: ../src/nm-ap-security-wpa-psk.c:63
 msgid "WPA2 Automatic"
-msgstr "WPA2 automatique"
+msgstr "WPA2 Automatique"
 
-#: ../src/nm-ap-security.c:320
+#: ../src/nm-ap-security.c:330
 msgid "none"
 msgstr "Aucun"
 
-#: ../src/nm-netlink-monitor.c:154
+#: ../src/nm-netlink-monitor.c:170
 #, c-format
 msgid ""
 "unable to create netlink socket for monitoring wired ethernet devices - %s"
 msgstr ""
-"impossible de créer un socket netlink pour surveiller les périphériques "
-"Ethernet câblés - %s"
+"impossible de créer une socket réseau pour surveiller les périphériques "
+"ethernet câblés - %s"
 
-#: ../src/nm-netlink-monitor.c:172
+#: ../src/nm-netlink-monitor.c:188
 #, c-format
 msgid ""
 "unable to bind to netlink socket for monitoring wired ethernet devices - %s"
 msgstr ""
-"impossible d'effectuer une liaison au socket netlink pour surveiller les "
-"périphériques Ethernet câblés - %s"
+"impossible d'associer une socket réseau pour surveiller les périphériques "
+"ethernet câblés - %s"
 
-#: ../src/nm-netlink-monitor.c:405
+#: ../src/nm-netlink-monitor.c:425
 msgid "operation took too long"
-msgstr "l'opération a duré trop longtemps"
+msgstr "l'opération a été trop longue"
 
-#: ../src/nm-netlink-monitor.c:502
+#: ../src/nm-netlink-monitor.c:522
 msgid "received data from wrong type of sender"
-msgstr "reçu des données d'un type erroné d'expéditeur"
+msgstr "réception de données depuis le mauvais type d'expéditeur"
 
-#: ../src/nm-netlink-monitor.c:515
+#: ../src/nm-netlink-monitor.c:535
 msgid "received data from unexpected sender"
-msgstr "reçu des données d'un expéditeur inattendu"
+msgstr "réception de données depuis un expéditeur non attendu"
 
-#: ../src/nm-netlink-monitor.c:646
+#: ../src/nm-netlink-monitor.c:664
 msgid "too much data was sent over socket and some of it was lost"
 msgstr ""
-"trop de données ont été envoyées sur le socket et certaines ont été perdues"
+"trop de données ont été envoyées sur la socket et certaines ont été perdues"
 
-#: ../src/nm-netlink-monitor.c:735
+#: ../src/nm-netlink-monitor.c:774
 msgid "error occurred while waiting for data on socket"
-msgstr "une erreur s'est produite pendant l'attente des données sur le socket"
+msgstr "une erreur est survenue pendant l'attente de données sur la socket"
 
-#: ../src/applet-dbus-devices.c:898
+#: ../gnome/applet/applet-dbus-devices.c:922
 #, c-format
 msgid "You are now connected to the Ad-Hoc wireless network '%s'."
-msgstr "Vous êtes connecté au réseau sans fil Ad-Hoc '%s'."
+msgstr "Vous êtes maintenant connecté au réseau sans fil Ad-Hoc « %s »."
 
-#: ../src/applet-dbus-devices.c:903
+#: ../gnome/applet/applet-dbus-devices.c:927
 #, c-format
 msgid "You are now connected to the wireless network '%s'."
-msgstr "Vous êtes connecté au réseau sans fil '%s'."
+msgstr "Vous êtes maintenant connecté au réseau sans fil sans fil « %s »."
 
-#: ../src/applet-dbus-devices.c:910
+#: ../gnome/applet/applet-dbus-devices.c:934
 msgid "You are now connected to the wired network."
-msgstr "Vous êtes connecté au réseau câblé."
+msgstr "Vous êtes maintenant connecté au réseau câblé."
 
-#: ../src/applet-dbus-devices.c:916
+#: ../gnome/applet/applet-dbus-devices.c:940
 msgid "Connection Established"
 msgstr "Connexion établie"
 
-#: ../src/applet-dbus-devices.c:959
+#: ../gnome/applet/applet-dbus-devices.c:983
 msgid "Disconnected"
 msgstr "Déconnecté"
 
-#: ../src/applet-dbus-devices.c:960
+#: ../gnome/applet/applet-dbus-devices.c:984
 msgid "The network connection has been disconnected."
-msgstr "La connexion réseau a été interrompue."
-
-#~ 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"
+msgstr "La connexion réseau a été déconnectée."
diff --git a/po/gu.po b/po/gu.po
index 3ec78d29..b44ba625 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: 2006-05-29 18:33+0200\n"
+"POT-Creation-Date: 2004-10-19 13:38-0400\n"
 "PO-Revision-Date: 2004-09-09 14:24+0530\n"
 "Last-Translator: Ankit Patel <ankit@redhat.com>\n"
 "Language-Team: Gujarati\n"
@@ -18,957 +18,141 @@ msgstr ""
 "Plural-Forms: Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "\n"
 
-#: ../src/applet-compat.c:171 ../src/applet-dbus-info.c:919
-#, fuzzy, c-format
-msgid "Passphrase for wireless network %s"
-msgstr "ત્યાં કોઈ વાયરલેસ નેટવર્ક નથી..."
-
-#: ../src/applet-dbus.c:265
-#, c-format
-msgid "Connection to the wireless network '%s' failed."
-msgstr ""
-
-#: ../src/applet-dbus.c:270
-msgid "Connection to the wired network failed."
-msgstr ""
-
-#: ../src/applet.c:184
-msgid "Error displaying connection information:"
-msgstr ""
+#: info-daemon/networks.glade:11
+msgid "Modify Wireless Networks"
+msgstr "વાયરલેસ નેટવર્કો સુધારો"
 
-#: ../src/applet.c:202
-#, fuzzy
-msgid "Could not find some required resources (the glade file)!"
-msgstr "નેટવર્ક વ્યવસ્થાપક એપ્લેટ અમુક જરુરી સ્રોતો શોધી શકી નહિં (glade ફાઈલ મળી નથી)."
-
-#: ../src/applet.c:213
-#, fuzzy
-msgid "No active connections!"
-msgstr "નેટવર્ક જોડાણો"
+#: info-daemon/networks.glade:92
+msgid "<span weight=\"bold\">Wireless Networks:</span>"
+msgstr "<span weight=\"bold\">વાયરલેસ નેટવર્કો:</span>"
 
-#: ../src/applet.c:234
-#, fuzzy, c-format
-msgid "Wired Ethernet (%s)"
-msgstr "વાયરલેસ નેટવર્કો"
+#: info-daemon/passphrase.glade:9
+msgid "Wireless Network Key Required"
+msgstr "વાયરલેસ નેટવર્ક કી જરુરી છે"
 
-#: ../src/applet.c:236
-#, fuzzy, c-format
-msgid "Wireless Ethernet (%s)"
-msgstr "વાયરલેસ નેટવર્કો"
+#: info-daemon/passphrase.glade:52
+msgid "_Login to Network"
+msgstr "નેટવર્કમાં પ્રવેશો (_L)"
 
-#: ../src/applet.c:337 ../src/applet.c:362
+#: info-daemon/passphrase.glade:100
 #, fuzzy
-msgid "NetworkManager Applet"
-msgstr "નેટવર્ક વ્યવસ્થાપક ચાલતું નથી..."
-
-#: ../src/applet.c:339 ../src/applet.c:364
-msgid "Copyright © 2004-2005 Red Hat, Inc."
-msgstr ""
-
-#: ../src/applet.c:340 ../src/applet.c:365
 msgid ""
-"Notification area applet for managing your network devices and connections."
-msgstr ""
-
-#: ../src/applet.c:343 ../src/applet.c:370
-msgid "translator-credits"
-msgstr ""
-
-#: ../src/applet.c:426
-msgid "VPN Login Failure"
-msgstr ""
-
-#: ../src/applet.c:427
-#, c-format
-msgid "Could not start the VPN connection '%s' due to a login failure."
+"<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' ને ચલાવવા માટે જરુરી છે."
 
-#: ../src/applet.c:431
-msgid "VPN Start Failure"
+#: info-daemon/passphrase.glade:129
+msgid "Key Type:"
 msgstr ""
 
-#: ../src/applet.c:432
-#, c-format
+#: info-daemon/passphrase.glade:150
 msgid ""
-"Could not start the VPN connection '%s' due to a failure launching the VPN "
-"program."
-msgstr ""
-
-#: ../src/applet.c:436 ../src/applet.c:446
-msgid "VPN Connect Failure"
+"128-bit Passphrase\n"
+"128-bit Raw Hex Key"
 msgstr ""
 
-#: ../src/applet.c:437
-#, c-format
-msgid "Could not start the VPN connection '%s' due to a connection error."
-msgstr ""
-
-#: ../src/applet.c:441
-msgid "VPN Configuration Error"
-msgstr ""
+#: info-daemon/passphrase.glade:180
+#: info-daemon/NetworkManagerInfoPassphraseDialog.c:101
+msgid "Passphrase:"
+msgstr "પાસફ્રેઝ:"
 
-#: ../src/applet.c:442
-#, c-format
-msgid "The VPN connection '%s' was not correctly configured."
-msgstr ""
+#: info-daemon/passphrase.glade:208 panel-applet/essid.glade:162
+msgid "*"
+msgstr "*"
 
-#: ../src/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 ""
-
-#: ../src/applet.c:517
-msgid "VPN Login Message"
+#: info-daemon/NetworkManagerInfoPassphraseDialog.c:104
+msgid "Key:"
 msgstr ""
 
-#: ../src/applet.c:741 ../src/applet.c:2508
-#: ../src/other-network-dialog.c:453
-#: ../src/passphrase-dialog.c:228
+#. Reuse the above string to make the translators less angry.
+#: panel-applet/NMWirelessApplet.c:691 panel-applet/NMWirelessApplet.c:701
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
 msgstr "નેટવર્ક વ્યવસ્થાપક એપ્લેટ અમુક જરુરી સ્રોતો શોધી શકી નહિં (glade ફાઈલ મળી નથી)."
 
-#: ../src/applet.c:753
-#, c-format
-msgid "The network device \"%s (%s)\" does not support wireless scanning."
-msgstr ""
-
-#: ../src/applet.c:761
-#, c-format
-msgid "The network device \"%s (%s)\" does not support link detection."
-msgstr ""
-
-#: ../src/applet.c:908
-#, c-format
-msgid "Preparing device %s for the wired network..."
-msgstr ""
-
-#: ../src/applet.c:910
-#, fuzzy, c-format
-msgid "Preparing device %s for the wireless network '%s'..."
-msgstr "ત્યાં કોઈ વાયરલેસ નેટવર્ક નથી..."
-
-#: ../src/applet.c:918
-#, c-format
-msgid "Configuring device %s for the wired network..."
-msgstr ""
-
-#: ../src/applet.c:920
-#, fuzzy, c-format
-msgid "Attempting to join the wireless network '%s'..."
-msgstr "ત્યાં કોઈ વાયરલેસ નેટવર્ક નથી..."
-
-#: ../src/applet.c:928
-#, fuzzy, c-format
-msgid "Waiting for Network Key for the wireless network '%s'..."
-msgstr "ત્યાં કોઈ વાયરલેસ નેટવર્ક નથી..."
-
-#: ../src/applet.c:936 ../src/applet.c:946
-msgid "Requesting a network address from the wired network..."
-msgstr ""
-
-#: ../src/applet.c:938 ../src/applet.c:948
-#, fuzzy, c-format
-msgid "Requesting a network address from the wireless network '%s'..."
-msgstr "ત્યાં કોઈ વાયરલેસ નેટવર્ક નથી..."
-
-#: ../src/applet.c:956
-msgid "Finishing connection to the wired network..."
-msgstr ""
-
-#: ../src/applet.c:958
-#, fuzzy, c-format
-msgid "Finishing connection to the wireless network '%s'..."
-msgstr "ત્યાં કોઈ વાયરલેસ નેટવર્ક નથી..."
-
-#: ../src/applet.c:1075
-#, fuzzy
-msgid "NetworkManager is not running"
-msgstr "નેટવર્ક વ્યવસ્થાપક ચાલતું નથી..."
-
-#: ../src/applet.c:1083 ../src/applet.c:1828
-msgid "Networking disabled"
-msgstr ""
-
-#: ../src/applet.c:1088
-#, fuzzy
-msgid "No network connection"
-msgstr "નેટવર્ક જોડાણો"
-
-#: ../src/applet.c:1093
-#, fuzzy
-msgid "Wired network connection"
-msgstr "નેટવર્ક જોડાણો"
-
-#: ../src/applet.c:1097
+#: panel-applet/NMWirelessApplet.c:716
 #, fuzzy
-msgid "Connected to an Ad-Hoc wireless network"
+msgid "Custom wireless network"
 msgstr "વાયરલેસ નેટવર્કો"
 
-#: ../src/applet.c:1099
-#, fuzzy, c-format
-msgid "Wireless network connection to '%s' (%d%%)"
-msgstr "વાયરલેસ નેટવર્કો"
-
-#: ../src/applet.c:1120
-#, c-format
-msgid "VPN connection to '%s'"
+#: panel-applet/NMWirelessApplet.c:717
+msgid "Enter the ESSID of the wireless network to which you wish to connect."
 msgstr ""
 
-#: ../src/applet.c:1128
-#, c-format
-msgid "VPN connecting to '%s'"
-msgstr ""
-
-#: ../src/applet.c:1541
-#, fuzzy
-msgid "_Connect to Other Wireless Network..."
-msgstr "વાયરલેસ નેટવર્કો"
-
-#: ../src/applet.c:1562
+#: panel-applet/NMWirelessApplet.c:800
 #, fuzzy
-msgid "Create _New Wireless Network..."
+msgid "Other Wireless Networks..."
 msgstr "વાયરલેસ નેટવર્કો"
 
-#: ../src/applet.c:1685
-#, fuzzy
-msgid "_VPN Connections"
-msgstr "નેટવર્ક જોડાણો"
-
-#: ../src/applet.c:1730
-msgid "_Configure VPN..."
-msgstr ""
-
-#: ../src/applet.c:1734
-msgid "_Disconnect VPN..."
-msgstr ""
-
-#: ../src/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
-#: ../src/applet.c:1767
-#, c-format
-msgid "Connect to %s..."
-msgstr ""
-
-#: ../src/applet.c:1773
-#, c-format
-msgid "Disconnect from %s..."
-msgstr ""
-
-#: ../src/applet.c:1822
+#: panel-applet/NMWirelessApplet.c:911
 msgid "No network devices have been found"
 msgstr ""
 
-#: ../src/applet.c:2014
+#: panel-applet/NMWirelessApplet.c:1028
 msgid "NetworkManager is not running..."
 msgstr "નેટવર્ક વ્યવસ્થાપક ચાલતું નથી..."
 
-#. 'Enable Networking' item
-#: ../src/applet.c:2170
-#, fuzzy
-msgid "Enable _Networking"
-msgstr "વાયરલેસ નેટવર્કો"
-
-#. 'Enable Wireless' item
-#: ../src/applet.c:2176
-msgid "Enable _Wireless"
-msgstr ""
-
-#. 'Connection Information' item
-#: ../src/applet.c:2182
-msgid "Connection _Information"
-msgstr ""
-
-#. Help item
-#: ../src/applet.c:2193
-msgid "_Help"
+#: panel-applet/essid.glade:52
+msgid "C_onnect"
 msgstr ""
 
-#. About item
-#: ../src/applet.c:2202
-#, fuzzy
-msgid "_About"
-msgstr "વિશે (_A)..."
-
-#: ../src/applet.c:2667
+#: panel-applet/essid.glade:131
 #, fuzzy
-msgid ""
-"The NetworkManager applet could not find some required resources.  It cannot "
-"continue.\n"
-msgstr "નેટવર્ક વ્યવસ્થાપક એપ્લેટ અમુક જરુરી સ્રોતો શોધી શકી નહિં (glade ફાઈલ મળી નથી)."
-
-#: ../src/wireless-security-option.c:157
-msgid "Open System"
-msgstr ""
-
-#: ../src/wireless-security-option.c:160
-msgid "Shared Key"
-msgstr ""
-
-#: ../src/wireless-security-option.c:208
-msgid "Automatic (Default)"
-msgstr ""
-
-#: ../src/wireless-security-option.c:215
-msgid "AES-CCMP"
-msgstr ""
-
-#: ../src/wireless-security-option.c:223
-msgid "TKIP"
-msgstr ""
-
-#: ../src/wireless-security-option.c:231
-msgid "Dynamic WEP"
-msgstr ""
-
-#: ../src/wso-none.c:53
-msgid "None"
-msgstr ""
-
-#: ../src/wso-wep-ascii.c:138
-msgid "WEP 64/128-bit ASCII"
-msgstr ""
-
-#: ../src/wso-wep-hex.c:135
-msgid "WEP 64/128-bit Hex"
-msgstr ""
+msgid "Wireless _Network:"
+msgstr "વાયરલેસ નેટવર્કો"
 
-#: ../src/wso-wep-passphrase.c:135
+#: panel-applet/essid.glade:177
 #, fuzzy
-msgid "WEP 128-bit Passphrase"
-msgstr "પાસફ્રેઝ:"
-
-#: ../src/wso-wpa-eap.c:237
-msgid "PEAP"
-msgstr ""
-
-#: ../src/wso-wpa-eap.c:238
-msgid "TLS"
-msgstr ""
-
-#: ../src/wso-wpa-eap.c:239
-msgid "TTLS"
-msgstr ""
-
-#: ../src/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 ""
-
-#: ../src/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 ""
-
-#: ../src/wso-wpa-psk.c:178
-msgid "WPA2 Personal"
-msgstr ""
-
-#: ../src/wso-wpa-psk.c:180
-msgid "WPA Personal"
-msgstr ""
-
-#: ../src/eggtrayicon.c:134
-msgid "Orientation"
-msgstr ""
-
-#: ../src/eggtrayicon.c:135
-msgid "The orientation of the tray."
-msgstr ""
+msgid "Wireless _adapter:"
+msgstr "વાયરલેસ નેટવર્કો"
 
-#: ../src/menu-items.c:88
+#: panel-applet/menu-info.c:101
 #, fuzzy, c-format
 msgid "Wired Network (%s)"
 msgstr "વાયરલેસ નેટવર્કો"
 
-#: ../src/menu-items.c:91
+#: panel-applet/menu-info.c:103
 #, fuzzy
-msgid "_Wired Network"
+msgid "Wired Network"
 msgstr "વાયરલેસ નેટવર્કો"
 
-#: ../src/menu-items.c:162
+#: panel-applet/menu-info.c:168
 #, fuzzy, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
 msgstr[0] "વાયરલેસ નેટવર્કો"
 msgstr[1] "વાયરલેસ નેટવર્કો"
 
-#: ../src/menu-items.c:164
+#: panel-applet/menu-info.c:170
 #, fuzzy
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "વાયરલેસ નેટવર્કો"
 msgstr[1] "વાયરલેસ નેટવર્કો"
 
-#: ../src/menu-items.c:343
+#: panel-applet/menu-info.c:307
 msgid " (invalid Unicode)"
 msgstr ""
 
-#: ../src/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 ""
-
-#: ../src/other-network-dialog.c:358
-#, fuzzy
-msgid "Create new wireless network"
-msgstr "ત્યાં કોઈ વાયરલેસ નેટવર્ક નથી..."
-
-#: ../src/other-network-dialog.c:359
-msgid ""
-"Enter the name and security settings of the wireless network you wish to "
-"create."
-msgstr ""
-
-#: ../src/other-network-dialog.c:363
-#, fuzzy
-msgid "Create New Wireless Network"
-msgstr "વાયરલેસ નેટવર્કો"
-
-#: ../src/other-network-dialog.c:368
-#, fuzzy
-msgid "Existing wireless network"
-msgstr "વાયરલેસ નેટવર્કો"
-
-#: ../src/other-network-dialog.c:369
-msgid "Enter the name of the wireless network to which you wish to connect."
-msgstr ""
-
-#: ../src/other-network-dialog.c:371
-#, fuzzy
-msgid "Connect to Other Wireless Network"
-msgstr "વાયરલેસ નેટવર્કો"
-
-#: ../src/passphrase-dialog.c:215
-#, fuzzy
-msgid "Error connecting to wireless network"
-msgstr "વાયરલેસ નેટવર્કો"
-
-#: ../src/passphrase-dialog.c:216
-msgid ""
-"The requested wireless network requires security capabilities unsupported by "
-"your hardware."
-msgstr ""
-
-#: ../src/vpn-password-dialog.c:151
-#: ../src/vpn-password-dialog.c:188
-#, c-format
-msgid "Cannot start VPN connection '%s'"
-msgstr ""
-
-#: ../src/vpn-password-dialog.c:154
-#, c-format
-msgid ""
-"Could not find the authentication dialog for VPN connection type '%s'. "
-"Contact your system administrator."
-msgstr ""
-
-#: ../src/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 ""
-
-#: ../src/applet.glade.h:1
-msgid " "
-msgstr " "
-
-#: ../src/applet.glade.h:2
-#, fuzzy
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
-msgstr "<span weight=\"bold\">વાયરલેસ નેટવર્કો:</span>"
-
-#: ../src/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' ને ચલાવવા માટે જરુરી છે."
-
-#: ../src/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 ""
-
-#: ../src/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' માં પ્રવેશવાનું પસંદ કરેલ છે.  જો તમે ચોક્કસ હોયકે આ વાયરલેસ નેટવર્ક "
-"સુરક્ષિત છે, તો નીચેના ચકાસણીબોક્સમાં ક્લિક કરો અને નેટવર્ક વ્યવસ્થાપક તમને લાંબા સમય સુધી "
-"નકામા પ્રશ્નો પૂછવા માટે સમર્થ નહિં હોય તેની સાથે જોડાવા માટે."
-
-#: ../src/applet.glade.h:15
-msgid "Anonymous Identity:"
-msgstr ""
-
-#: ../src/applet.glade.h:16
-msgid "Authentication:"
-msgstr ""
-
-#: ../src/applet.glade.h:17
-msgid "Broadcast Address:"
-msgstr ""
-
-#: ../src/applet.glade.h:18
-msgid "CA Certificate File:"
-msgstr ""
-
-#: ../src/applet.glade.h:19
-msgid "C_onnect"
-msgstr ""
-
-#: ../src/applet.glade.h:20
-msgid "Client Certificate File:"
-msgstr ""
-
-#: ../src/applet.glade.h:21
-msgid "Connection Information"
-msgstr ""
-
-#: ../src/applet.glade.h:22
-msgid "Default Route:"
-msgstr ""
-
-#: ../src/applet.glade.h:23
-msgid "Destination Address:"
-msgstr ""
-
-#: ../src/applet.glade.h:24
-msgid "Driver:"
-msgstr ""
-
-#: ../src/applet.glade.h:25
-msgid "EAP Method:"
-msgstr ""
-
-#: ../src/applet.glade.h:26
-msgid "Hardware Address:"
-msgstr ""
-
-#: ../src/applet.glade.h:27
-msgid "IP Address:"
-msgstr ""
-
-#: ../src/applet.glade.h:28
-msgid "Identity:"
-msgstr ""
-
-#: ../src/applet.glade.h:29
-msgid "Interface:"
-msgstr ""
-
-#: ../src/applet.glade.h:30
-msgid "Key Type:"
-msgstr ""
-
-#: ../src/applet.glade.h:31
-msgid "Key:"
-msgstr ""
-
-#: ../src/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 ""
-
-#: ../src/applet.glade.h:37
-msgid ""
-"Open System\n"
-"Shared Key"
-msgstr ""
-
-#: ../src/applet.glade.h:39
-#, fuzzy
-msgid "Other Wireless Network..."
-msgstr "વાયરલેસ નેટવર્કો"
-
-#: ../src/applet.glade.h:40
-msgid "Passphrase:"
-msgstr "પાસફ્રેઝ:"
-
-#: ../src/applet.glade.h:41
-msgid "Password:"
-msgstr ""
-
-#: ../src/applet.glade.h:42
-msgid "Primary DNS:"
-msgstr ""
-
-#: ../src/applet.glade.h:43
-msgid "Private Key File:"
-msgstr ""
-
-#: ../src/applet.glade.h:44
-msgid "Private Key Password:"
-msgstr ""
-
-#: ../src/applet.glade.h:45
-msgid "Secondary DNS:"
-msgstr ""
-
-#: ../src/applet.glade.h:46
-msgid "Select the CA Certificate File"
-msgstr ""
-
-#: ../src/applet.glade.h:47
-msgid "Select the Client Certificate File"
-msgstr ""
-
-#: ../src/applet.glade.h:48
-msgid "Select the Private Key File"
-msgstr ""
-
-#: ../src/applet.glade.h:49
-msgid "Show key"
-msgstr ""
-
-#: ../src/applet.glade.h:50
-#, fuzzy
-msgid "Show passphrase"
-msgstr "પાસફ્રેઝ:"
-
-#: ../src/applet.glade.h:51
-msgid "Show password"
-msgstr ""
-
-#: ../src/applet.glade.h:52
-msgid "Show passwords"
-msgstr ""
-
-#: ../src/applet.glade.h:53
-msgid "Speed:"
-msgstr ""
-
-#: ../src/applet.glade.h:54
-msgid "Subnet Mask:"
-msgstr ""
-
-#: ../src/applet.glade.h:55
-msgid "Type:"
-msgstr ""
-
-#: ../src/applet.glade.h:56
-msgid "User Name:"
-msgstr ""
-
-#: ../src/applet.glade.h:57
-msgid "Wireless Network Key Required"
-msgstr "વાયરલેસ નેટવર્ક કી જરુરી છે"
-
-#: ../src/applet.glade.h:58
-#, fuzzy
-msgid "Wireless _adapter:"
-msgstr "વાયરલેસ નેટવર્કો"
-
-#: ../src/applet.glade.h:59
-#, fuzzy
-msgid "_Always Trust this Wireless Network"
-msgstr "હંમેશા આ વાયરલેસ નેટવર્કનો વિશ્વાસ કરો"
-
-#: ../src/applet.glade.h:60
-msgid "_Don't remind me again"
-msgstr ""
-
-#: ../src/applet.glade.h:61
-msgid "_Login to Network"
-msgstr "નેટવર્કમાં પ્રવેશો (_L)"
-
-#: ../src/applet.glade.h:62
-msgid "_Network Name:"
-msgstr ""
-
-#: ../src/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 ""
-
-#: ../src/applet-dbus-devices.c:898
-#, c-format
-msgid "You are now connected to the Ad-Hoc wireless network '%s'."
-msgstr ""
-
-#: ../src/applet-dbus-devices.c:903
-#, fuzzy, c-format
-msgid "You are now connected to the wireless network '%s'."
-msgstr "ત્યાં કોઈ વાયરલેસ નેટવર્ક નથી..."
-
-#: ../src/applet-dbus-devices.c:910
-msgid "You are now connected to the wired network."
-msgstr ""
-
-#: ../src/applet-dbus-devices.c:916
-msgid "Connection Established"
+#: examples/python/systray/eggtrayicon.c:111
+msgid "Orientation"
 msgstr ""
 
-#: ../src/applet-dbus-devices.c:959
-msgid "Disconnected"
+#: examples/python/systray/eggtrayicon.c:112
+msgid "The orientation of the tray."
 msgstr ""
 
-#: ../src/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 "ત્યાં કોઈ વાયરલેસ નેટવર્ક નથી..."
 
@@ -978,9 +162,15 @@ 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 275a245f..3ddfd37d 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: 2006-05-29 18:33+0200\n"
+"POT-Creation-Date: 2005-02-04 17:28+0100\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,994 +16,205 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../src/applet-compat.c:171 ../src/applet-dbus-info.c:919
-#, fuzzy, c-format
-msgid "Passphrase for wireless network %s"
-msgstr "Stvori novu bečičnu mrežu"
-
-#: ../src/applet-dbus.c:265
-#, fuzzy, c-format
-msgid "Connection to the wireless network '%s' failed."
-msgstr "Spajanje na bežičnu mrežu '%s'..."
-
-#: ../src/applet-dbus.c:270
-#, fuzzy
-msgid "Connection to the wired network failed."
-msgstr "Spajanje na žičanu mrežu..."
-
-#: ../src/applet.c:184
-msgid "Error displaying connection information:"
-msgstr ""
-
-#: ../src/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)."
-
-#: ../src/applet.c:213
-#, fuzzy
-msgid "No active connections!"
-msgstr "Nema spoja na mrežu"
-
-#: ../src/applet.c:234
-#, fuzzy, c-format
-msgid "Wired Ethernet (%s)"
-msgstr "Žičana mreža (%s)"
+#: info-daemon/networks.glade:11
+msgid "Modify Wireless Networks"
+msgstr "Postavke bežičnih mreža"
 
-#: ../src/applet.c:236
-#, fuzzy, c-format
-msgid "Wireless Ethernet (%s)"
-msgstr "Bežična mreža (%s)"
+#: info-daemon/networks.glade:92
+msgid "<span weight=\"bold\">Wireless Networks:</span>"
+msgstr "<span weight=\"bold\">Bežične mreže:</span>"
 
-#: ../src/applet.c:337 ../src/applet.c:362
-#, fuzzy
-msgid "NetworkManager Applet"
-msgstr "NetworkManager nije pokrenut"
+#: info-daemon/passphrase.glade:9
+msgid "Wireless Network Key Required"
+msgstr "Potreban je ključ bežične mreže"
 
-#: ../src/applet.c:339 ../src/applet.c:364
-msgid "Copyright © 2004-2005 Red Hat, Inc."
-msgstr ""
+#: info-daemon/passphrase.glade:52
+msgid "_Login to Network"
+msgstr "_Prijava na mrežu"
 
-#: ../src/applet.c:340 ../src/applet.c:365
+#: info-daemon/passphrase.glade:100
 msgid ""
-"Notification area applet for managing your network devices and connections."
-msgstr ""
-
-#: ../src/applet.c:343 ../src/applet.c:370
-msgid "translator-credits"
-msgstr ""
-
-#: ../src/applet.c:426
-msgid "VPN Login Failure"
-msgstr ""
-
-#: ../src/applet.c:427
-#, c-format
-msgid "Could not start the VPN connection '%s' due to a login failure."
+"<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č."
 
-#: ../src/applet.c:431
-msgid "VPN Start Failure"
-msgstr ""
+#: info-daemon/passphrase.glade:129 panel-applet/essid.glade:246
+msgid "Key Type:"
+msgstr "Tip ključa:"
 
-#: ../src/applet.c:432
-#, c-format
+#: info-daemon/passphrase.glade:150 panel-applet/essid.glade:315
 msgid ""
-"Could not start the VPN connection '%s' due to a failure launching the VPN "
-"program."
-msgstr ""
-
-#: ../src/applet.c:436 ../src/applet.c:446
-msgid "VPN Connect Failure"
+"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)"
 
-#: ../src/applet.c:437
-#, c-format
-msgid "Could not start the VPN connection '%s' due to a connection error."
-msgstr ""
-
-#: ../src/applet.c:441
-msgid "VPN Configuration Error"
-msgstr ""
-
-#: ../src/applet.c:442
-#, c-format
-msgid "The VPN connection '%s' was not correctly configured."
-msgstr ""
-
-#: ../src/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/passphrase.glade:181
+#: info-daemon/NetworkManagerInfoPassphraseDialog.c:139
+#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:149
+#: panel-applet/essid.glade:270
+msgid "Passphrase:"
+msgstr "Lozinka:"
 
-#: ../src/applet.c:517
-msgid "VPN Login Message"
-msgstr ""
+#: info-daemon/passphrase.glade:209 panel-applet/essid.glade:203
+#: panel-applet/essid.glade:300
+msgid "*"
+msgstr "*"
 
-#: ../src/applet.c:741 ../src/applet.c:2508
-#: ../src/other-network-dialog.c:453
-#: ../src/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/NetworkManagerInfoPassphraseDialog.c:142
+#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:152
+msgid "Ascii Key:"
+msgstr "Slovčani ključ"
 
-#: ../src/applet.c:753
-#, c-format
-msgid "The network device \"%s (%s)\" does not support wireless scanning."
-msgstr ""
+#: info-daemon/NetworkManagerInfoPassphraseDialog.c:145
+#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:155
+msgid "Hex Key:"
+msgstr "Heksadecimalni ključ"
 
-#: ../src/applet.c:761
+#: info-daemon/NetworkManagerInfoVPN.c:157
 #, c-format
-msgid "The network device \"%s (%s)\" does not support link detection."
-msgstr ""
-
-#: ../src/applet.c:908
-#, fuzzy, c-format
-msgid "Preparing device %s for the wired network..."
-msgstr "Spajanje na žičanu mrežu..."
-
-#: ../src/applet.c:910
-#, fuzzy, c-format
-msgid "Preparing device %s for the wireless network '%s'..."
-msgstr "Spajanje na bežičnu mrežu '%s'..."
-
-#: ../src/applet.c:918
-#, fuzzy, c-format
-msgid "Configuring device %s for the wired network..."
-msgstr "Spajanje na žičanu mrežu..."
-
-#: ../src/applet.c:920
-#, fuzzy, c-format
-msgid "Attempting to join the wireless network '%s'..."
-msgstr "Spajanje na bežičnu mrežu '%s'..."
-
-#: ../src/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'..."
-
-#: ../src/applet.c:936 ../src/applet.c:946
-#, fuzzy
-msgid "Requesting a network address from the wired network..."
-msgstr "Spajanje na žičanu mrežu..."
-
-#: ../src/applet.c:938 ../src/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'..."
-
-#: ../src/applet.c:956
-#, fuzzy
-msgid "Finishing connection to the wired network..."
-msgstr "Spajanje na žičanu mrežu..."
-
-#: ../src/applet.c:958
-#, fuzzy, c-format
-msgid "Finishing connection to the wireless network '%s'..."
-msgstr "Spajanje na bežičnu mrežu '%s'..."
-
-#: ../src/applet.c:1075
-msgid "NetworkManager is not running"
-msgstr "NetworkManager nije pokrenut"
-
-#: ../src/applet.c:1083 ../src/applet.c:1828
-msgid "Networking disabled"
-msgstr ""
+msgid "You must log in to access the private network %s"
+msgstr "Prijava je potrebna za pristup na mrežu %s"
 
-#: ../src/applet.c:1088
+#: panel-applet/NMWirelessApplet.c:313
 msgid "No network connection"
 msgstr "Nema spoja na mrežu"
 
-#: ../src/applet.c:1093
+#: panel-applet/NMWirelessApplet.c:318
 msgid "Wired network connection"
 msgstr "Spoj na žičanu mrežu"
 
-#: ../src/applet.c:1097
+#: panel-applet/NMWirelessApplet.c:323
+msgid "Connecting to a wired network..."
+msgstr "Spajanje na žičanu mrežu..."
+
+#: panel-applet/NMWirelessApplet.c:332
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Spoj na Ad-Hoc bežičnu mrežu"
 
-#: ../src/applet.c:1099
+#: panel-applet/NMWirelessApplet.c:346
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "Spoj na bežičnu mrežu '%s' (%d%%)"
 
-#: ../src/applet.c:1120
-#, c-format
-msgid "VPN connection to '%s'"
-msgstr ""
+#: panel-applet/NMWirelessApplet.c:351
+msgid "Wireless network connection"
+msgstr "Spoj na bežičnu mrežu"
 
-#: ../src/applet.c:1128
+#: panel-applet/NMWirelessApplet.c:356
 #, c-format
-msgid "VPN connecting to '%s'"
-msgstr ""
-
-#: ../src/applet.c:1541
-#, fuzzy
-msgid "_Connect to Other Wireless Network..."
-msgstr "Ostale bežične mreže..."
-
-#: ../src/applet.c:1562
-#, fuzzy
-msgid "Create _New Wireless Network..."
-msgstr "Stvori novu bečičnu mrežu..."
-
-#: ../src/applet.c:1685
-msgid "_VPN Connections"
-msgstr ""
-
-#: ../src/applet.c:1730
-msgid "_Configure VPN..."
-msgstr ""
+msgid "Connecting to wireless network '%s'..."
+msgstr "Spajanje na bežičnu mrežu '%s'..."
 
-#: ../src/applet.c:1734
-msgid "_Disconnect VPN..."
-msgstr ""
+#: panel-applet/NMWirelessApplet.c:362
+msgid "NetworkManager is not running"
+msgstr "NetworkManager nije pokrenut"
 
-#: ../src/applet.c:1756
-msgid "_Dial Up Connections"
-msgstr ""
+#: panel-applet/NMWirelessApplet.c:367
+msgid "Scanning for wireless networks..."
+msgstr "Potraga za bežičnim mrežama..."
 
-#. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
-#: ../src/applet.c:1767
-#, c-format
-msgid "Connect to %s..."
-msgstr ""
+#: panel-applet/NMWirelessApplet.c:690
+msgid "Other Wireless Networks..."
+msgstr "Ostale bežične mreže..."
 
-#: ../src/applet.c:1773
-#, c-format
-msgid "Disconnect from %s..."
-msgstr ""
+#: panel-applet/NMWirelessApplet.c:711
+msgid "Create new Wireless Network..."
+msgstr "Stvori novu bečičnu mrežu..."
 
-#: ../src/applet.c:1822
+#: panel-applet/NMWirelessApplet.c:821
 msgid "No network devices have been found"
 msgstr "Nema mrežnih uređaja"
 
-#: ../src/applet.c:2014
+#: panel-applet/NMWirelessApplet.c:939
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager nije pokrenut..."
 
-#. 'Enable Networking' item
-#: ../src/applet.c:2170
-#, fuzzy
-msgid "Enable _Networking"
-msgstr "Bežična _mreža:"
-
-#. 'Enable Wireless' item
-#: ../src/applet.c:2176
-msgid "Enable _Wireless"
-msgstr ""
+#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:228
+msgid "Create new wireless network"
+msgstr "Stvori novu bečičnu mrežu"
 
-#. 'Connection Information' item
-#: ../src/applet.c:2182
-msgid "Connection _Information"
-msgstr ""
+#: 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."
 
-#. Help item
-#: ../src/applet.c:2193
-msgid "_Help"
-msgstr ""
+#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:234
+msgid "Custom wireless network"
+msgstr "Posebna bežična mreža"
 
-#. About item
-#: ../src/applet.c:2202
-msgid "_About"
+#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:235
+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."
 
-#: ../src/applet.c:2667
-#, fuzzy
+#. 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.  It cannot "
-"continue.\n"
+"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)."
 
-#: ../src/wireless-security-option.c:157
-msgid "Open System"
-msgstr ""
-
-#: ../src/wireless-security-option.c:160
-msgid "Shared Key"
-msgstr ""
-
-#: ../src/wireless-security-option.c:208
-msgid "Automatic (Default)"
-msgstr ""
-
-#: ../src/wireless-security-option.c:215
-msgid "AES-CCMP"
-msgstr ""
-
-#: ../src/wireless-security-option.c:223
-msgid "TKIP"
-msgstr ""
-
-#: ../src/wireless-security-option.c:231
-msgid "Dynamic WEP"
-msgstr ""
-
-#: ../src/wso-none.c:53
-msgid "None"
-msgstr ""
-
-#: ../src/wso-wep-ascii.c:138
-msgid "WEP 64/128-bit ASCII"
-msgstr ""
-
-#: ../src/wso-wep-hex.c:135
-msgid "WEP 64/128-bit Hex"
-msgstr ""
-
-#: ../src/wso-wep-passphrase.c:135
-#, fuzzy
-msgid "WEP 128-bit Passphrase"
-msgstr "Lozinka:"
-
-#: ../src/wso-wpa-eap.c:237
-msgid "PEAP"
-msgstr ""
-
-#: ../src/wso-wpa-eap.c:238
-msgid "TLS"
-msgstr ""
-
-#: ../src/wso-wpa-eap.c:239
-msgid "TTLS"
-msgstr ""
-
-#: ../src/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 ""
-
-#: ../src/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 ""
-
-#: ../src/wso-wpa-psk.c:178
-msgid "WPA2 Personal"
-msgstr ""
+#: panel-applet/essid.glade:53
+msgid "C_onnect"
+msgstr "_Spoji se"
 
-#: ../src/wso-wpa-psk.c:180
-msgid "WPA Personal"
-msgstr ""
+#: panel-applet/essid.glade:132
+msgid "Wireless _adapter:"
+msgstr "Bežični _uređaj:"
 
-#: ../src/eggtrayicon.c:134
-msgid "Orientation"
-msgstr "Orjentacija"
+#: panel-applet/essid.glade:172
+msgid "Wireless _Network:"
+msgstr "Bežična _mreža:"
 
-#: ../src/eggtrayicon.c:135
-msgid "The orientation of the tray."
-msgstr "Orjentacija ladice."
+#: panel-applet/essid.glade:337
+msgid "Connect with encryption enabled"
+msgstr "Spoji se sa enkripcijom"
 
-#: ../src/menu-items.c:88
+#: panel-applet/menu-info.c:109
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Žičana mreža (%s)"
 
-#: ../src/menu-items.c:91
-#, fuzzy
-msgid "_Wired Network"
+#: panel-applet/menu-info.c:111
+msgid "Wired Network"
 msgstr "Žičana mreža"
 
-#: ../src/menu-items.c:162
+#: panel-applet/menu-info.c:177
 #, 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)"
 
-#: ../src/menu-items.c:164
+#: panel-applet/menu-info.c:179
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Bežična mreža"
 msgstr[1] "Bežične mreže"
 
-#: ../src/menu-items.c:343
+#: panel-applet/menu-info.c:316
 msgid " (invalid Unicode)"
 msgstr " (greška u unicodu)"
 
-#: ../src/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 ""
-
-#: ../src/other-network-dialog.c:358
-msgid "Create new wireless network"
-msgstr "Stvori novu bečičnu mrežu"
-
-#: ../src/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."
-
-#: ../src/other-network-dialog.c:363
-#, fuzzy
-msgid "Create New Wireless Network"
-msgstr "Stvori novu bečičnu mrežu..."
-
-#: ../src/other-network-dialog.c:368
-#, fuzzy
-msgid "Existing wireless network"
-msgstr "Posebna bežična mreža"
-
-#: ../src/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."
-
-#: ../src/other-network-dialog.c:371
-#, fuzzy
-msgid "Connect to Other Wireless Network"
-msgstr "Ostale bežične mreže..."
-
-#: ../src/passphrase-dialog.c:215
-#, fuzzy
-msgid "Error connecting to wireless network"
-msgstr "Spajanje na bežičnu mrežu '%s'..."
-
-#: ../src/passphrase-dialog.c:216
-msgid ""
-"The requested wireless network requires security capabilities unsupported by "
-"your hardware."
-msgstr ""
-
-#: ../src/vpn-password-dialog.c:151
-#: ../src/vpn-password-dialog.c:188
-#, c-format
-msgid "Cannot start VPN connection '%s'"
-msgstr ""
-
-#: ../src/vpn-password-dialog.c:154
-#, c-format
-msgid ""
-"Could not find the authentication dialog for VPN connection type '%s'. "
-"Contact your system administrator."
-msgstr ""
-
-#: ../src/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 ""
-
-#: ../src/applet.glade.h:1
-msgid " "
-msgstr ""
-
-#: ../src/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>"
-
-#: ../src/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č."
-
-#: ../src/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 ""
-
-#: ../src/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 ""
-
-#: ../src/applet.glade.h:15
-msgid "Anonymous Identity:"
-msgstr ""
-
-#: ../src/applet.glade.h:16
-#, fuzzy
-msgid "Authentication:"
+#: examples/python/systray/eggtrayicon.c:111
+msgid "Orientation"
 msgstr "Orjentacija"
 
-#: ../src/applet.glade.h:17
-msgid "Broadcast Address:"
-msgstr ""
-
-#: ../src/applet.glade.h:18
-msgid "CA Certificate File:"
-msgstr ""
-
-#: ../src/applet.glade.h:19
-msgid "C_onnect"
-msgstr "_Spoji se"
-
-#: ../src/applet.glade.h:20
-msgid "Client Certificate File:"
-msgstr ""
-
-#: ../src/applet.glade.h:21
-msgid "Connection Information"
-msgstr ""
-
-#: ../src/applet.glade.h:22
-msgid "Default Route:"
-msgstr ""
-
-#: ../src/applet.glade.h:23
-msgid "Destination Address:"
-msgstr ""
-
-#: ../src/applet.glade.h:24
-msgid "Driver:"
-msgstr ""
-
-#: ../src/applet.glade.h:25
-msgid "EAP Method:"
-msgstr ""
-
-#: ../src/applet.glade.h:26
-msgid "Hardware Address:"
-msgstr ""
-
-#: ../src/applet.glade.h:27
-msgid "IP Address:"
-msgstr ""
-
-#: ../src/applet.glade.h:28
-msgid "Identity:"
-msgstr ""
-
-#: ../src/applet.glade.h:29
-msgid "Interface:"
-msgstr ""
-
-#: ../src/applet.glade.h:30
-msgid "Key Type:"
-msgstr "Tip ključa:"
-
-#: ../src/applet.glade.h:31
-#, fuzzy
-msgid "Key:"
-msgstr "Heksadecimalni ključ"
-
-#: ../src/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 ""
-
-#: ../src/applet.glade.h:37
-msgid ""
-"Open System\n"
-"Shared Key"
-msgstr ""
-
-#: ../src/applet.glade.h:39
-#, fuzzy
-msgid "Other Wireless Network..."
-msgstr "Ostale bežične mreže..."
-
-#: ../src/applet.glade.h:40
-msgid "Passphrase:"
-msgstr "Lozinka:"
-
-#: ../src/applet.glade.h:41
-msgid "Password:"
-msgstr ""
-
-#: ../src/applet.glade.h:42
-msgid "Primary DNS:"
-msgstr ""
-
-#: ../src/applet.glade.h:43
-msgid "Private Key File:"
-msgstr ""
-
-#: ../src/applet.glade.h:44
-msgid "Private Key Password:"
-msgstr ""
-
-#: ../src/applet.glade.h:45
-msgid "Secondary DNS:"
-msgstr ""
-
-#: ../src/applet.glade.h:46
-msgid "Select the CA Certificate File"
-msgstr ""
-
-#: ../src/applet.glade.h:47
-msgid "Select the Client Certificate File"
-msgstr ""
-
-#: ../src/applet.glade.h:48
-msgid "Select the Private Key File"
-msgstr ""
-
-#: ../src/applet.glade.h:49
-msgid "Show key"
-msgstr ""
-
-#: ../src/applet.glade.h:50
-#, fuzzy
-msgid "Show passphrase"
-msgstr "Lozinka:"
-
-#: ../src/applet.glade.h:51
-msgid "Show password"
-msgstr ""
-
-#: ../src/applet.glade.h:52
-msgid "Show passwords"
-msgstr ""
-
-#: ../src/applet.glade.h:53
-msgid "Speed:"
-msgstr ""
-
-#: ../src/applet.glade.h:54
-msgid "Subnet Mask:"
-msgstr ""
-
-#: ../src/applet.glade.h:55
-#, fuzzy
-msgid "Type:"
-msgstr "Tip ključa:"
-
-#: ../src/applet.glade.h:56
-msgid "User Name:"
-msgstr ""
-
-#: ../src/applet.glade.h:57
-msgid "Wireless Network Key Required"
-msgstr "Potreban je ključ bežične mreže"
-
-#: ../src/applet.glade.h:58
-msgid "Wireless _adapter:"
-msgstr "Bežični _uređaj:"
-
-#: ../src/applet.glade.h:59
-#, fuzzy
-msgid "_Always Trust this Wireless Network"
-msgstr "Bežična mreža"
-
-#: ../src/applet.glade.h:60
-msgid "_Don't remind me again"
-msgstr ""
-
-#: ../src/applet.glade.h:61
-msgid "_Login to Network"
-msgstr "_Prijava na mrežu"
-
-#: ../src/applet.glade.h:62
-msgid "_Network Name:"
-msgstr ""
-
-#: ../src/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 ""
-
-#: ../src/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"
-
-#: ../src/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'..."
-
-#: ../src/applet-dbus-devices.c:910
-#, fuzzy
-msgid "You are now connected to the wired network."
-msgstr "Spajanje na žičanu mrežu..."
-
-#: ../src/applet-dbus-devices.c:916
-#, fuzzy
-msgid "Connection Established"
-msgstr "Spoji se sa enkripcijom"
-
-#: ../src/applet-dbus-devices.c:959
-msgid "Disconnected"
-msgstr ""
-
-#: ../src/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"
+#: examples/python/systray/eggtrayicon.c:112
+msgid "The orientation of the tray."
+msgstr "Orjentacija ladice."
diff --git a/po/hu.po b/po/hu.po
index 41d2d28e..a6b75863 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,91 +1,110 @@
-# 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: hu\n"
+"Project-Id-Version: NetworkManager.HEAD.hu\n"
 "Report-Msgid-Bugs-To: \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"
+"POT-Creation-Date: 2006-12-13 08:22+0100\n"
+"PO-Revision-Date: 2006-12-13 20:21+0100\n"
+"Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
+"Language-Team: Hungarian <gnome@gnome.hu>\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.10.2\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.2\n"
 
-#: ../src/applet-compat.c:171 ../src/applet-dbus-info.c:919
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:926
 #, c-format
 msgid "Passphrase for wireless network %s"
 msgstr "Jelmondat a(z) %s vezeték nélküli hálózathoz"
 
-#: ../src/applet-dbus.c:265
+#: ../gnome/applet/applet-dbus.c:274
 #, c-format
 msgid "Connection to the wireless network '%s' failed."
 msgstr "Kapcsolódás \"%s\" vezeték nélküli hálózathoz sikertelen."
 
-#: ../src/applet-dbus.c:270
+#: ../gnome/applet/applet-dbus.c:279
 msgid "Connection to the wired network failed."
 msgstr "Kapcsolódás a vezetékes hálózathoz sikertelen."
 
-#: ../src/applet.c:184
+#: ../gnome/applet/applet.c:182
 msgid "Error displaying connection information:"
 msgstr "Hiba a kapcsolatinformációk megjelenítése közben:"
 
-#: ../src/applet.c:202
+#: ../gnome/applet/applet.c:200
 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)!"
 
-#: ../src/applet.c:213
+#: ../gnome/applet/applet.c:210
 msgid "No active connections!"
 msgstr "Nincs aktív kapcsolat!"
 
-#: ../src/applet.c:234
+#: ../gnome/applet/applet.c:227
+#, c-format
+msgid "%d Mb/s"
+msgstr "%d Mb/mp"
+
+#: ../gnome/applet/applet.c:230
 #, c-format
 msgid "Wired Ethernet (%s)"
 msgstr "Vezetékes Ethernet (%s)"
 
-#: ../src/applet.c:236
+#: ../gnome/applet/applet.c:232
 #, c-format
 msgid "Wireless Ethernet (%s)"
 msgstr "Vezeték nélküli Ethernet (%s)"
 
-#: ../src/applet.c:337 ../src/applet.c:362
+#: ../gnome/applet/applet.c:238
+msgid "Unknown"
+msgstr "Ismeretlen"
+
+#: ../gnome/applet/applet.c:330 ../gnome/applet/applet.c:357
 msgid "NetworkManager Applet"
 msgstr "NetworkManager kisalkalmazás"
 
-#: ../src/applet.c:339 ../src/applet.c:364
-msgid "Copyright © 2004-2005 Red Hat, Inc."
-msgstr "Copyright (C) 2004-2005 Red Hat, Inc."
+#: ../gnome/applet/applet.c:332
+msgid ""
+"Copyright © 2004-2006 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+msgstr ""
+"Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
 
-#: ../src/applet.c:340 ../src/applet.c:365
+#: ../gnome/applet/applet.c:334 ../gnome/applet/applet.c:361
 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."
 
-#: ../src/applet.c:343 ../src/applet.c:370
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:365
 msgid "translator-credits"
 msgstr "Kelemen Gábor <kelemeng@gnome.hu>"
 
-#: ../src/applet.c:426
+#: ../gnome/applet/applet.c:359
+msgid ""
+"Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+msgstr ""
+"Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+
+#: ../gnome/applet/applet.c:421
 msgid "VPN Login Failure"
 msgstr "VPN bejelentkezési hiba"
 
-#: ../src/applet.c:427
+#: ../gnome/applet/applet.c:422
 #, 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."
 
-#: ../src/applet.c:431
+#: ../gnome/applet/applet.c:426
 msgid "VPN Start Failure"
 msgstr "VPN indítási hiba"
 
-#: ../src/applet.c:432
+#: ../gnome/applet/applet.c:427
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
@@ -94,25 +113,25 @@ msgstr ""
 "Nem sikerült elindítani \"%s\" VPN kapcsolatot a VPN program indításakor "
 "fellépett hiba miatt."
 
-#: ../src/applet.c:436 ../src/applet.c:446
+#: ../gnome/applet/applet.c:431 ../gnome/applet/applet.c:441
 msgid "VPN Connect Failure"
 msgstr "VPN kapcsolódási hiba"
 
-#: ../src/applet.c:437
+#: ../gnome/applet/applet.c:432
 #, 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."
 
-#: ../src/applet.c:441
+#: ../gnome/applet/applet.c:436
 msgid "VPN Configuration Error"
 msgstr "VPN beállítási hiba"
 
-#: ../src/applet.c:442
+#: ../gnome/applet/applet.c:437
 #, c-format
 msgid "The VPN connection '%s' was not correctly configured."
 msgstr "A(z) \"%s\" VPN kapcsolat nincs megfelelően beállítva."
 
-#: ../src/applet.c:447
+#: ../gnome/applet/applet.c:442
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' because the VPN server did not "
@@ -121,175 +140,180 @@ 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."
 
-#: ../src/applet.c:517
+#: ../gnome/applet/applet.c:512
 msgid "VPN Login Message"
 msgstr "VPN bejelentkezési üzenet"
 
-#: ../src/applet.c:741 ../src/applet.c:2508
-#: ../src/other-network-dialog.c:453
-#: ../src/passphrase-dialog.c:228
+#: ../gnome/applet/applet.c:737 ../gnome/applet/applet.c:2635
+#: ../gnome/applet/other-network-dialog.c:458
+#: ../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."
 
-#: ../src/applet.c:753
+#: ../gnome/applet/applet.c:749
 #, 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."
 
-#: ../src/applet.c:761
+#: ../gnome/applet/applet.c:757
 #, 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."
 
-#: ../src/applet.c:908
+#. Note to translators: this is used if no essid is known
+#: ../gnome/applet/applet.c:905 ../gnome/applet/applet.c:1103
+msgid "(unknown)"
+msgstr "(ismeretlen)"
+
+#: ../gnome/applet/applet.c:911
 #, 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..."
 
-#: ../src/applet.c:910
+#: ../gnome/applet/applet.c:913
 #, 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..."
 
-#: ../src/applet.c:918
+#: ../gnome/applet/applet.c:921
 #, c-format
 msgid "Configuring device %s for the wired network..."
 msgstr "%s eszköz beállítása a vezetékes hálózathoz..."
 
-#: ../src/applet.c:920
+#: ../gnome/applet/applet.c:923
 #, 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..."
 
-#: ../src/applet.c:928
+#: ../gnome/applet/applet.c:931
 #, 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..."
 
-#: ../src/applet.c:936 ../src/applet.c:946
+#: ../gnome/applet/applet.c:939 ../gnome/applet/applet.c:949
 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..."
 
-#: ../src/applet.c:938 ../src/applet.c:948
+#: ../gnome/applet/applet.c:941 ../gnome/applet/applet.c:951
 #, 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..."
 
-#: ../src/applet.c:956
+#: ../gnome/applet/applet.c:959
 msgid "Finishing connection to the wired network..."
 msgstr "A vezetékes hálózathoz való kapcsolódás befejezése..."
 
-#: ../src/applet.c:958
+#: ../gnome/applet/applet.c:961
 #, 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..."
 
-#: ../src/applet.c:1075
+#: ../gnome/applet/applet.c:1078
 msgid "NetworkManager is not running"
 msgstr "A NetworkManager nem fut"
 
-#: ../src/applet.c:1083 ../src/applet.c:1828
+#: ../gnome/applet/applet.c:1086 ../gnome/applet/applet.c:1843
 msgid "Networking disabled"
 msgstr "Hálózat letiltva"
 
-#: ../src/applet.c:1088
+#: ../gnome/applet/applet.c:1091
 msgid "No network connection"
 msgstr "Nincs hálózati kapcsolat"
 
-#: ../src/applet.c:1093
+#: ../gnome/applet/applet.c:1096
 msgid "Wired network connection"
 msgstr "Vezetékes hálózati kapcsolat"
 
-#: ../src/applet.c:1097
+#: ../gnome/applet/applet.c:1100
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Ad-hoc vezeték nélküli hálózathoz kapcsolódva"
 
-#: ../src/applet.c:1099
+#: ../gnome/applet/applet.c:1102
 #, 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%%)"
 
-#: ../src/applet.c:1120
+#: ../gnome/applet/applet.c:1123
 #, c-format
 msgid "VPN connection to '%s'"
 msgstr "VPN kapcsolat a következőhöz: \"%s\""
 
-#: ../src/applet.c:1128
+#: ../gnome/applet/applet.c:1131
 #, c-format
 msgid "VPN connecting to '%s'"
 msgstr "VPN kapcsolódás a következőhöz: \"%s\""
 
-#: ../src/applet.c:1541
+#: ../gnome/applet/applet.c:1556
 msgid "_Connect to Other Wireless Network..."
 msgstr "Kapcsolódás _más vezeték nélküli hálózathoz..."
 
-#: ../src/applet.c:1562
+#: ../gnome/applet/applet.c:1577
 msgid "Create _New Wireless Network..."
 msgstr "Ú_j vezeték nélküli hálózat létrehozása..."
 
-#: ../src/applet.c:1685
+#: ../gnome/applet/applet.c:1700
 msgid "_VPN Connections"
 msgstr "_VPN kapcsolatok"
 
-#: ../src/applet.c:1730
+#: ../gnome/applet/applet.c:1745
 msgid "_Configure VPN..."
 msgstr "V_PN beállítása..."
 
-#: ../src/applet.c:1734
+#: ../gnome/applet/applet.c:1749
 msgid "_Disconnect VPN..."
 msgstr "VP_N bontása..."
 
-#: ../src/applet.c:1756
+#: ../gnome/applet/applet.c:1771
 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
-#: ../src/applet.c:1767
+#: ../gnome/applet/applet.c:1782
 #, c-format
 msgid "Connect to %s..."
 msgstr "Kapcsolódás ehhez: %s..."
 
-#: ../src/applet.c:1773
+#: ../gnome/applet/applet.c:1788
 #, c-format
 msgid "Disconnect from %s..."
 msgstr "Kapcsolat bontása: %s..."
 
-#: ../src/applet.c:1822
+#: ../gnome/applet/applet.c:1837
 msgid "No network devices have been found"
 msgstr "Nem találtam hálózati eszközöket"
 
-#: ../src/applet.c:2014
+#: ../gnome/applet/applet.c:2029
 msgid "NetworkManager is not running..."
 msgstr "A NetworkManager nem fut..."
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2170
+#: ../gnome/applet/applet.c:2210
 msgid "Enable _Networking"
 msgstr "_Hálózat engedélyezése"
 
 #. 'Enable Wireless' item
-#: ../src/applet.c:2176
+#: ../gnome/applet/applet.c:2216
 msgid "Enable _Wireless"
 msgstr "_Vezeték nélküli kapcsolat engedélyezése"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2182
+#: ../gnome/applet/applet.c:2222
 msgid "Connection _Information"
 msgstr "_Kapcsolat-információk"
 
 #. Help item
-#: ../src/applet.c:2193
+#: ../gnome/applet/applet.c:2233
 msgid "_Help"
 msgstr "_Súgó"
 
 #. About item
-#: ../src/applet.c:2202
+#: ../gnome/applet/applet.c:2242
 msgid "_About"
 msgstr "_Névjegy"
 
-#: ../src/applet.c:2667
+#: ../gnome/applet/applet.c:2824
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
@@ -297,111 +321,111 @@ msgstr ""
 "A NetworkManager kisalkalmazás nem talál néhány szükséges erőforrást, ezért "
 "a futása nem folytatódhat.\n"
 
-#: ../src/wireless-security-option.c:157
+#: ../gnome/applet/wireless-security-option.c:157
 msgid "Open System"
 msgstr "Nyílt rendszer"
 
-#: ../src/wireless-security-option.c:160
+#: ../gnome/applet/wireless-security-option.c:160
 msgid "Shared Key"
 msgstr "Megosztott kulcs"
 
-#: ../src/wireless-security-option.c:208
+#: ../gnome/applet/wireless-security-option.c:208
 msgid "Automatic (Default)"
 msgstr "Automatikus (alapértelmezett)"
 
-#: ../src/wireless-security-option.c:215
+#: ../gnome/applet/wireless-security-option.c:215
 msgid "AES-CCMP"
 msgstr "AES-CCMP"
 
-#: ../src/wireless-security-option.c:223
+#: ../gnome/applet/wireless-security-option.c:223
 msgid "TKIP"
 msgstr "TKIP"
 
-#: ../src/wireless-security-option.c:231
+#: ../gnome/applet/wireless-security-option.c:231
 msgid "Dynamic WEP"
 msgstr "Dinamikus WEP"
 
-#: ../src/wso-none.c:53
+#: ../gnome/applet/wso-none.c:53
 msgid "None"
 msgstr "Nincs"
 
-#: ../src/wso-wep-ascii.c:138
+#: ../gnome/applet/wso-wep-ascii.c:138
 msgid "WEP 64/128-bit ASCII"
 msgstr "WEP 64/128 bites ASCII"
 
-#: ../src/wso-wep-hex.c:135
+#: ../gnome/applet/wso-wep-hex.c:135
 msgid "WEP 64/128-bit Hex"
 msgstr "WEP 64/128 bites hexadecimális"
 
-#: ../src/wso-wep-passphrase.c:135
+#: ../gnome/applet/wso-wep-passphrase.c:135
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128 bites jelmondat"
 
-#: ../src/wso-wpa-eap.c:237
+#: ../gnome/applet/wso-wpa-eap.c:237
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../src/wso-wpa-eap.c:238
+#: ../gnome/applet/wso-wpa-eap.c:238
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wso-wpa-eap.c:239
+#: ../gnome/applet/wso-wpa-eap.c:239
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../src/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
-#: ../src/nm-ap-security-wpa-eap.c:116
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:93
+#: ../src/nm-ap-security-wpa-eap.c:117
 msgid "WPA2 Enterprise"
 msgstr "WPA2 Enterprise"
 
-#: ../src/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
-#: ../src/nm-ap-security-wpa-eap.c:121
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:95
+#: ../src/nm-ap-security-wpa-eap.c:122
 msgid "WPA Enterprise"
 msgstr "WPA Enterprise"
 
-#: ../src/wso-wpa-psk.c:178
+#: ../gnome/applet/wso-wpa-psk.c:178
 msgid "WPA2 Personal"
 msgstr "WPA2 személyes"
 
-#: ../src/wso-wpa-psk.c:180
+#: ../gnome/applet/wso-wpa-psk.c:180
 msgid "WPA Personal"
 msgstr "WPA személyes"
 
-#: ../src/eggtrayicon.c:134
+#: ../gnome/applet/eggtrayicon.c:134
 msgid "Orientation"
 msgstr "Tájolás"
 
-#: ../src/eggtrayicon.c:135
+#: ../gnome/applet/eggtrayicon.c:135
 msgid "The orientation of the tray."
 msgstr "A tálca tájolása."
 
-#: ../src/menu-items.c:88
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Vezetékes hálózat (%s)"
 
-#: ../src/menu-items.c:91
+#: ../gnome/applet/menu-items.c:91
 msgid "_Wired Network"
 msgstr "_Vezetékes hálózat"
 
-#: ../src/menu-items.c:162
+#: ../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)"
 
-#: ../src/menu-items.c:164
+#: ../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"
 
-#: ../src/menu-items.c:343
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr " (érvénytelen Unicode)"
 
-#: ../src/other-network-dialog.c:352
+#: ../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, "
@@ -410,11 +434,11 @@ 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"
 
-#: ../src/other-network-dialog.c:358
+#: ../gnome/applet/other-network-dialog.c:358
 msgid "Create new wireless network"
 msgstr "Új vezeték nélküli hálózat létrehozása"
 
-#: ../src/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."
@@ -422,27 +446,27 @@ msgstr ""
 "Adja meg a létrehozandó vezeték nélküli hálózat nevét és biztonsági "
 "beállításait."
 
-#: ../src/other-network-dialog.c:363
+#: ../gnome/applet/other-network-dialog.c:363
 msgid "Create New Wireless Network"
 msgstr "Új vezeték nélküli hálózat létrehozása"
 
-#: ../src/other-network-dialog.c:368
+#: ../gnome/applet/other-network-dialog.c:368
 msgid "Existing wireless network"
 msgstr "Létező vezeték nélküli hálózat"
 
-#: ../src/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 "Adja meg azon vezeték nélküli hálózat nevét, amelyhez kapcsolódni kíván."
 
-#: ../src/other-network-dialog.c:371
+#: ../gnome/applet/other-network-dialog.c:371
 msgid "Connect to Other Wireless Network"
 msgstr "Kapcsolódás más vezeték nélküli hálózathoz"
 
-#: ../src/passphrase-dialog.c:215
+#: ../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"
 
-#: ../src/passphrase-dialog.c:216
+#: ../gnome/applet/passphrase-dialog.c:216
 msgid ""
 "The requested wireless network requires security capabilities unsupported by "
 "your hardware."
@@ -450,13 +474,13 @@ 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."
 
-#: ../src/vpn-password-dialog.c:151
-#: ../src/vpn-password-dialog.c:188
+#: ../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"
 
-#: ../src/vpn-password-dialog.c:154
+#: ../gnome/applet/vpn-password-dialog.c:154
 #, c-format
 msgid ""
 "Could not find the authentication dialog for VPN connection type '%s'. "
@@ -465,7 +489,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."
 
-#: ../src/vpn-password-dialog.c:191
+#: ../gnome/applet/vpn-password-dialog.c:191
 #, c-format
 msgid ""
 "There was a problem launching the authentication dialog for VPN connection "
@@ -474,15 +498,15 @@ msgstr ""
 "Hiba lépett fel a(z) \"%s\" típusú VPN kapcsolathoz tartozó párbeszédablak "
 "elindítása közben. Lépjen kapcsolatba a rendszergazdával."
 
-#: ../src/applet.glade.h:1
+#: ../gnome/applet/applet.glade.h:1
 msgid " "
 msgstr " "
 
-#: ../src/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\">Aktív kapcsolatok információi</span>"
 
-#: ../src/applet.glade.h:4
+#: ../gnome/applet/applet.glade.h:4
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
@@ -497,7 +521,7 @@ msgstr ""
 "A(z) %s vezeték nélküli hálózathoz való hozzáféréshez jelszó vagy "
 "titkosítási kulcs szükséges."
 
-#: ../src/applet.glade.h:8
+#: ../gnome/applet/applet.glade.h:8
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
@@ -509,7 +533,7 @@ msgstr ""
 "\n"
 "%s  nem lesz teljesen működőképes."
 
-#: ../src/applet.glade.h:12
+#: ../gnome/applet/applet.glade.h:12
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
@@ -527,75 +551,79 @@ msgstr ""
 "alábbi jelölőnégyzetre és a NetworkManager nem fog megerősítést kérni, ha a "
 "későbbiekben kapcsolódik hozzá."
 
-#: ../src/applet.glade.h:15
+#: ../gnome/applet/applet.glade.h:15
 msgid "Anonymous Identity:"
 msgstr "Névtelen személyazonosság:"
 
-#: ../src/applet.glade.h:16
+#: ../gnome/applet/applet.glade.h:16
 msgid "Authentication:"
 msgstr "Hitelesítés:"
 
-#: ../src/applet.glade.h:17
+#: ../gnome/applet/applet.glade.h:17
 msgid "Broadcast Address:"
 msgstr "Broadcast cím:"
 
-#: ../src/applet.glade.h:18
+#: ../gnome/applet/applet.glade.h:18
 msgid "CA Certificate File:"
 msgstr "CA tanúsítványfájl:"
 
-#: ../src/applet.glade.h:19
+#: ../gnome/applet/applet.glade.h:19
 msgid "C_onnect"
 msgstr "Kapcs_olódás"
 
-#: ../src/applet.glade.h:20
+#: ../gnome/applet/applet.glade.h:20
 msgid "Client Certificate File:"
 msgstr "Ügyfél tanúsítványfájl:"
 
-#: ../src/applet.glade.h:21
+#: ../gnome/applet/applet.glade.h:21
 msgid "Connection Information"
 msgstr "Kapcsolat-információk"
 
-#: ../src/applet.glade.h:22
+#: ../gnome/applet/applet.glade.h:22
 msgid "Default Route:"
 msgstr "Alapértelmezett útvonal:"
 
-#: ../src/applet.glade.h:23
+#: ../gnome/applet/applet.glade.h:23
 msgid "Destination Address:"
 msgstr "Célcím:"
 
-#: ../src/applet.glade.h:24
+#: ../gnome/applet/applet.glade.h:24
 msgid "Driver:"
 msgstr "Illesztőprogram:"
 
-#: ../src/applet.glade.h:25
+#: ../gnome/applet/applet.glade.h:25
 msgid "EAP Method:"
 msgstr "EAP módszer:"
 
-#: ../src/applet.glade.h:26
+#: ../gnome/applet/applet.glade.h:26
 msgid "Hardware Address:"
 msgstr "Hardvercím:"
 
-#: ../src/applet.glade.h:27
+#: ../gnome/applet/applet.glade.h:27
 msgid "IP Address:"
 msgstr "IP-cím:"
 
-#: ../src/applet.glade.h:28
+#: ../gnome/applet/applet.glade.h:28
 msgid "Identity:"
 msgstr "Személyazonosság:"
 
-#: ../src/applet.glade.h:29
+#: ../gnome/applet/applet.glade.h:29
 msgid "Interface:"
 msgstr "Csatoló:"
 
-#: ../src/applet.glade.h:30
+#: ../gnome/applet/applet.glade.h:30
 msgid "Key Type:"
-msgstr "Kulcs típusa:"
+msgstr "Kulcstípus:"
 
-#: ../src/applet.glade.h:31
+#: ../gnome/applet/applet.glade.h:31
+msgid "Key management:"
+msgstr "Kulcskezelés:"
+
+#: ../gnome/applet/applet.glade.h:32
 msgid "Key:"
 msgstr "Kulcs:"
 
-#: ../src/applet.glade.h:32
+#: ../gnome/applet/applet.glade.h:33
 msgid ""
 "None\n"
 "WEP 128-bit Passphrase\n"
@@ -607,7 +635,7 @@ msgstr ""
 "WEP 64/128-bit hexadecimális\n"
 "WEP 64/128-bit ASCII\n"
 
-#: ../src/applet.glade.h:37
+#: ../gnome/applet/applet.glade.h:38
 msgid ""
 "Open System\n"
 "Shared Key"
@@ -615,111 +643,115 @@ msgstr ""
 "Nyílt rendszer\n"
 "Megosztott kulcs"
 
-#: ../src/applet.glade.h:39
+#: ../gnome/applet/applet.glade.h:40
 msgid "Other Wireless Network..."
 msgstr "Egyéb vezeték nélküli hálózat..."
 
-#: ../src/applet.glade.h:40
+#: ../gnome/applet/applet.glade.h:41
 msgid "Passphrase:"
 msgstr "Jelmondat:"
 
-#: ../src/applet.glade.h:41
+#: ../gnome/applet/applet.glade.h:42
 msgid "Password:"
 msgstr "Jelszó:"
 
-#: ../src/applet.glade.h:42
+#: ../gnome/applet/applet.glade.h:43
 msgid "Primary DNS:"
 msgstr "Elsődleges DNS:"
 
-#: ../src/applet.glade.h:43
+#: ../gnome/applet/applet.glade.h:44
 msgid "Private Key File:"
 msgstr "Személyes kulcsfájl:"
 
-#: ../src/applet.glade.h:44
+#: ../gnome/applet/applet.glade.h:45
 msgid "Private Key Password:"
 msgstr "Személyes kulcs jelszava:"
 
-#: ../src/applet.glade.h:45
+#: ../gnome/applet/applet.glade.h:46
 msgid "Secondary DNS:"
 msgstr "Másodlagos DNS:"
 
-#: ../src/applet.glade.h:46
+#: ../gnome/applet/applet.glade.h:47
 msgid "Select the CA Certificate File"
 msgstr "A CA tanúsítványfájl kiválasztása"
 
-#: ../src/applet.glade.h:47
+#: ../gnome/applet/applet.glade.h:48
 msgid "Select the Client Certificate File"
 msgstr "Az ügyfél tanúsítványfájl kiválasztása"
 
-#: ../src/applet.glade.h:48
+#: ../gnome/applet/applet.glade.h:49
 msgid "Select the Private Key File"
 msgstr "A személyes kulcsfájl kiválasztása"
 
-#: ../src/applet.glade.h:49
+#: ../gnome/applet/applet.glade.h:50
 msgid "Show key"
 msgstr "Kulcs megjelenítése"
 
-#: ../src/applet.glade.h:50
+#: ../gnome/applet/applet.glade.h:51
 msgid "Show passphrase"
 msgstr "Jelmondat megjelenítése:"
 
-#: ../src/applet.glade.h:51
+#: ../gnome/applet/applet.glade.h:52
 msgid "Show password"
 msgstr "Jelszó megjelenítése:"
 
-#: ../src/applet.glade.h:52
+#: ../gnome/applet/applet.glade.h:53
 msgid "Show passwords"
 msgstr "Jelszavak megjelenítése:"
 
-#: ../src/applet.glade.h:53
+#: ../gnome/applet/applet.glade.h:54
 msgid "Speed:"
 msgstr "Sebesség:"
 
-#: ../src/applet.glade.h:54
+#: ../gnome/applet/applet.glade.h:55
 msgid "Subnet Mask:"
 msgstr "Alhálózati maszk:"
 
-#: ../src/applet.glade.h:55
+#: ../gnome/applet/applet.glade.h:56
 msgid "Type:"
 msgstr "Típus:"
 
-#: ../src/applet.glade.h:56
+#: ../gnome/applet/applet.glade.h:57
 msgid "User Name:"
 msgstr "Felhasználói név:"
 
-#: ../src/applet.glade.h:57
+#: ../gnome/applet/applet.glade.h:58
 msgid "Wireless Network Key Required"
-msgstr "Vezeték nélküli hálózat kulcs szükséges"
+msgstr "Vezeték nélküli hálózati kulcs szükséges"
 
-#: ../src/applet.glade.h:58
+#: ../gnome/applet/applet.glade.h:59
 msgid "Wireless _adapter:"
 msgstr "Vezeték _nélküli csatoló:"
 
-#: ../src/applet.glade.h:59
+#: ../gnome/applet/applet.glade.h:60
 msgid "_Always Trust this Wireless Network"
 msgstr "_Mindig megbízom ebben a vezeték nélküli hálózatban"
 
-#: ../src/applet.glade.h:60
+#: ../gnome/applet/applet.glade.h:61
 msgid "_Don't remind me again"
 msgstr "_Ne emlékezzen rám"
 
-#: ../src/applet.glade.h:61
+#: ../gnome/applet/applet.glade.h:62
+msgid "_Fallback on this Network"
+msgstr "_Tartalék ezen a hálózaton"
+
+#: ../gnome/applet/applet.glade.h:63
 msgid "_Login to Network"
 msgstr "_Bejelentkezés a hálózatba"
 
-#: ../src/applet.glade.h:62
+#: ../gnome/applet/applet.glade.h:64
 msgid "_Network Name:"
 msgstr "_Hálózatnév:"
 
-#: ../src/applet.glade.h:63
+#: ../gnome/applet/applet.glade.h:65
 msgid "_Wireless Security:"
 msgstr "Vezeték _nélküli biztonság:"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:383
+#: ../gnome/vpn-properties/nm-vpn-properties.c:417
 msgid "Cannot add VPN connection"
 msgstr "Nem lehet VPN kapcsolatot hozzáadni"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:385
+#: ../gnome/vpn-properties/nm-vpn-properties.c:419
 msgid ""
 "No suitable VPN software was found on your system. Contact your system "
 "administrator."
@@ -727,11 +759,11 @@ msgstr ""
 "Nem található megfelelő VPN szoftver a rendszerén. Lépjen kapcsolatba a "
 "rendszergazdával."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:437
+#: ../gnome/vpn-properties/nm-vpn-properties.c:461
 msgid "Cannot import VPN connection"
 msgstr "Nem lehet VPN kapcsolatot importálni"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:439
+#: ../gnome/vpn-properties/nm-vpn-properties.c:463
 #, c-format
 msgid ""
 "Cannot find suitable software for VPN connection type '%s' to import the "
@@ -740,12 +772,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:579
+#: ../gnome/vpn-properties/nm-vpn-properties.c:580
 #, 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:582
+#: ../gnome/vpn-properties/nm-vpn-properties.c:583
 #, c-format
 msgid ""
 "Could not find the UI files for VPN connection type '%s'. Contact your "
@@ -754,12 +786,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:739
+#: ../gnome/vpn-properties/nm-vpn-properties.c:727
 #, c-format
 msgid "Delete VPN connection \"%s\"?"
 msgstr "Törli a(z) \"%s\" VPN kapcsolatot?"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:742
+#: ../gnome/vpn-properties/nm-vpn-properties.c:730
 #, c-format
 msgid ""
 "All information about the VPN connection \"%s\" will be lost and you may "
@@ -770,16 +802,36 @@ 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:959
+#: ../gnome/vpn-properties/nm-vpn-properties.c:924
 msgid "Unable to load"
 msgstr "Nem lehet betölteni"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:961
+#: ../gnome/vpn-properties/nm-vpn-properties.c:926
 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)!"
 
+#. druid_window = GTK_DIALOG (gtk_dialog_new_with_buttons (_("Create VPN Connection"),
+#. NULL,
+#. GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+#. GTK_STOCK_CANCEL,
+#. GTK_RESPONSE_REJECT,
+#. GTK_STOCK_APPLY,
+#. GTK_RESPONSE_ACCEPT,
+#. NULL));
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1081
+msgid "Create VPN Connection"
+msgstr "VPN kapcsolat létrehozása"
+
+#. gtk_container_add (GTK_CONTAINER (druid_window->vbox), GTK_WIDGET(gtk_label_new("Some label")));
+#. gtk_box_pack_start (GTK_BOX (druid_window->vbox), GTK_WIDGET(druid), TRUE,TRUE,0);
+#. gtk_box_pack_start (GTK_BOX (druid_window->vbox), GTK_WIDGET(gtk_label_new("Some label")), TRUE,TRUE,0);
+#. toplevel = gtk_widget_get_toplevel (GTK_WIDGET (druid));
+#. gtk_signal_connect (GTK_OBJECT (toplevel), "delete_event", GTK_SIGNAL_FUNC (vpn_window_close), NULL);
+#. make the druid window modal wrt. our main window
+#. gtk_window_set_modal (druid_window, TRUE);
+#. gtk_window_set_transient_for (GTK_WINDOW(druid_window), GTK_WINDOW (dialog));
 #. Edit dialog
-#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1099
 msgid "Edit VPN Connection"
 msgstr "VPN kapcsolat szerkesztése"
 
@@ -788,68 +840,30 @@ msgid "Add a new VPN connection"
 msgstr "Új VPN kapcsolat hozzáadása"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:2
-msgid "Choose which type of VPN connection you wish to create."
-msgstr "Válassza ki a létrehozni kívánt VPN típusát."
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
-msgid "Connect to:"
-msgstr "Kapcsolódás:"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
-msgid "Create VPN Connection"
-msgstr "VPN kapcsolat létrehozása"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
-msgid "Create VPN Connection - 1 of 2"
-msgstr "VPN kapcsolat létrehozása - 1/2"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
-msgid "Create VPN Connection - 2 of 2"
-msgstr "VPN kapcsolat létrehozása - 2/2"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
 msgid "Delete the selected VPN connection"
 msgstr "A kijelölt VPN kapcsolat törlése"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
 msgid "E_xport"
 msgstr "E_xportálás"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:9
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
 msgid "Edit the selected VPN connection"
 msgstr "A kijelölt VPN kapcsolat szerkesztése"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:10
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
 msgid "Export the VPN settings to a file"
 msgstr "A VPN beállítások exportálása fájlba"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:11
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
 msgid "Export the selected VPN connection to a file"
 msgstr "A kiválasztott VPN kapcsolat exportálása fájlba"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:12
-msgid "Finish Creating VPN Connection"
-msgstr "VPN kapcsolat létrehozásának befejezése"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:13
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
 msgid "Manage Virtual Private Network Connections"
 msgstr "Virtuális magánhálózati (VPN) kapcsolatok kezelése"
 
-#: ../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 ""
-"Ez az asszisztens végigvezeti Önt egy magánhálózathoz tartozó új Virtuális "
-"magánhálózati (VPN) kapcsolat létrehozásán.\n"
-"\n"
-"Ehhez szükség lesz néhány információra, például IP-címekre és titkokra, ezen "
-"információkért keresse fel a rendszergazdát."
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:17
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
 msgid "VPN Connections"
 msgstr "VPN kapcsolatok"
 
@@ -885,67 +899,72 @@ msgstr "WPA2 CCMP"
 msgid "WPA2 Automatic"
 msgstr "WPA2 automatikus"
 
-#: ../src/nm-ap-security.c:320
+#: ../src/nm-ap-security.c:338
 msgid "none"
 msgstr "nincs"
 
-#: ../src/nm-netlink-monitor.c:154
+#: ../src/nm-netlink-monitor.c:174
 #, c-format
 msgid "unable to create netlink socket for monitoring wired ethernet devices - %s"
 msgstr ""
 "nem lehet netlink foglalatot létrehozni a vezetékes ethernet kártyák "
 "megfigyelésére - %s"
 
-#: ../src/nm-netlink-monitor.c:172
+#: ../src/nm-netlink-monitor.c:192
 #, c-format
 msgid "unable to bind to netlink socket for monitoring wired ethernet devices - %s"
 msgstr ""
 "nem lehet kapcsolódni a netlink foglalathoz a vezetékes ethernet kártyák "
 "megfigyelésére - %s"
 
-#: ../src/nm-netlink-monitor.c:405
+#: ../src/nm-netlink-monitor.c:427
 msgid "operation took too long"
 msgstr "a művelet túl sokáig tartott"
 
-#: ../src/nm-netlink-monitor.c:502
+#: ../src/nm-netlink-monitor.c:524
 msgid "received data from wrong type of sender"
 msgstr "téves feladótól érkezett adat"
 
-#: ../src/nm-netlink-monitor.c:515
+#: ../src/nm-netlink-monitor.c:537
 msgid "received data from unexpected sender"
 msgstr "nem várt feladótól érkezett adat"
 
-#: ../src/nm-netlink-monitor.c:646
+#: ../src/nm-netlink-monitor.c:666
 msgid "too much data was sent over socket and some of it was lost"
 msgstr "túl sok adat lett átküldve a foglalaton és ezek egy része elveszett"
 
-#: ../src/nm-netlink-monitor.c:735
+#: ../src/nm-netlink-monitor.c:776
 msgid "error occurred while waiting for data on socket"
 msgstr "hiba lépett fel adatokra várakozás közben a foglalaton"
 
-#: ../src/applet-dbus-devices.c:898
+#: ../gnome/applet/applet-dbus-devices.c:930
 #, 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."
 
-#: ../src/applet-dbus-devices.c:903
+#: ../gnome/applet/applet-dbus-devices.c:935
 #, 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."
 
-#: ../src/applet-dbus-devices.c:910
+#: ../gnome/applet/applet-dbus-devices.c:942
 msgid "You are now connected to the wired network."
 msgstr "Kapcsolódott a vezetékes hálózathoz."
 
-#: ../src/applet-dbus-devices.c:916
+#: ../gnome/applet/applet-dbus-devices.c:948
 msgid "Connection Established"
 msgstr "Kapcsolat létrehozva"
 
-#: ../src/applet-dbus-devices.c:959
+#: ../gnome/applet/applet-dbus-devices.c:997
 msgid "Disconnected"
 msgstr "Kapcsolat bontva"
 
-#: ../src/applet-dbus-devices.c:960
+#: ../gnome/applet/applet-dbus-devices.c:998
 msgid "The network connection has been disconnected."
 msgstr "A hálózati kapcsolat bontva."
 
+#: ../src/nm-ap-security-leap.c:66 ../src/nm-ap-security-leap.c:82
+#, fuzzy
+msgid "LEAP"
+msgstr "PEAP"
+
diff --git a/po/it.po b/po/it.po
index a9eada7a..88629d46 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,93 +1,104 @@
 # Italian translation for NetworkManager
 # Copyright (C) 2004-2005 THE NetworkManager CopyRight Holder
 # This file is distributed under the same license as the NetworkManager package.
-# Francesco Marletta <francesco.marletta@tiscali.it>, 2004-2005.
+# Francesco Marletta <francesco.marletta@tiscali.it>, 2004-2006.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-29 18:33+0200\n"
-"PO-Revision-Date: 2006-06-09 09:52\n"
-"Last-Translator: Novell Language <language@novell.com>\n"
-"Language-Team: Novell Language <language@novell.com>\n"
+"POT-Creation-Date: 2006-09-30 15:12+0200\n"
+"PO-Revision-Date: 2006-09-02 00:05+0200\n"
+"Last-Translator: Francesco Marletta <francesco.marletta@tiscali.it>\n"
+"Language-Team: Italian <tp@list.slinux.it>\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"
 
-# [NdT] è il titolo della finestra
-#: ../src/applet-compat.c:171 ../src/applet-dbus-info.c:919
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:926
 #, c-format
 msgid "Passphrase for wireless network %s"
 msgstr "Frase di accesso per la rete wireless %s"
 
-#: ../src/applet-dbus.c:265
+#: ../gnome/applet/applet-dbus.c:265
 #, c-format
 msgid "Connection to the wireless network '%s' failed."
 msgstr "Connessione alla rete wireless \"%s\" fallita."
 
-#: ../src/applet-dbus.c:270
+#: ../gnome/applet/applet-dbus.c:270
 msgid "Connection to the wired network failed."
 msgstr "Connessione alla rete cablata fallita."
 
-#: ../src/applet.c:184
+#: ../gnome/applet/applet.c:184
 msgid "Error displaying connection information:"
 msgstr "Errore nel visualizzare le informazioni di connessione:"
 
-#: ../src/applet.c:202
+#: ../gnome/applet/applet.c:202
 msgid "Could not find some required resources (the glade file)!"
 msgstr "Impossibile trovare alcune risorse richieste (il file glade)!"
 
-#: ../src/applet.c:213
+#: ../gnome/applet/applet.c:213
 msgid "No active connections!"
 msgstr "Nessuna connessione attiva!"
 
-#: ../src/applet.c:234
+#: ../gnome/applet/applet.c:234
 #, c-format
 msgid "Wired Ethernet (%s)"
 msgstr "Ethernet cablata (%s)"
 
-#: ../src/applet.c:236
+#: ../gnome/applet/applet.c:236
 #, c-format
 msgid "Wireless Ethernet (%s)"
 msgstr "Ethernet wireless (%s)"
 
-#: ../src/applet.c:337 ../src/applet.c:362
+#: ../gnome/applet/applet.c:332 ../gnome/applet/applet.c:358
 msgid "NetworkManager Applet"
 msgstr "Applet NetworkManager"
 
-#: ../src/applet.c:339 ../src/applet.c:364
-msgid "Copyright © 2004-2005 Red Hat, Inc."
-msgstr "Copyright © 2004-2005 Red Hat, Inc."
+#: ../gnome/applet/applet.c:334
+msgid ""
+"Copyright © 2004-2006 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+msgstr ""
+"Copyright © 2004-2006 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
 
-#: ../src/applet.c:340 ../src/applet.c:365
+#: ../gnome/applet/applet.c:336 ../gnome/applet/applet.c:362
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
-"Un'applet per l'aerea di notifica per la gestione delle interfacce e delle "
-"connessioni di rete"
+"Un'applet per l'area di notifica per la gestione delle interfacce e delle "
+"connessioni di rete."
 
-#: ../src/applet.c:343 ../src/applet.c:370
+#: ../gnome/applet/applet.c:339 ../gnome/applet/applet.c:366
 msgid "translator-credits"
 msgstr "Francesco Marletta <francesco.marletta@tiscali.it>"
 
-#: ../src/applet.c:426
+#: ../gnome/applet/applet.c:360
+msgid ""
+"Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+msgstr ""
+"Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+
+#: ../gnome/applet/applet.c:422
 msgid "VPN Login Failure"
 msgstr "Accesso VPN fallito"
 
-#: ../src/applet.c:427
+#: ../gnome/applet/applet.c:423
 #, 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."
 
-#: ../src/applet.c:431
+#: ../gnome/applet/applet.c:427
 msgid "VPN Start Failure"
 msgstr "Avvio VPN fallito"
 
-#: ../src/applet.c:432
+#: ../gnome/applet/applet.c:428
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
@@ -96,27 +107,27 @@ msgstr ""
 "Impossibile avviare la connessione VPN “%s” a causa di un fallimento "
 "nell'avvio del programma VPN."
 
-#: ../src/applet.c:436 ../src/applet.c:446
+#: ../gnome/applet/applet.c:432 ../gnome/applet/applet.c:442
 msgid "VPN Connect Failure"
 msgstr "Connessione VPN fallita"
 
-#: ../src/applet.c:437
+#: ../gnome/applet/applet.c:433
 #, 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."
 
-#: ../src/applet.c:441
+#: ../gnome/applet/applet.c:437
 msgid "VPN Configuration Error"
 msgstr "Errore di configurazione VPN"
 
-#: ../src/applet.c:442
+#: ../gnome/applet/applet.c:438
 #, c-format
 msgid "The VPN connection '%s' was not correctly configured."
 msgstr "La connessione VPN “%s” non è stata configurata correttamente."
 
-#: ../src/applet.c:447
+#: ../gnome/applet/applet.c:443
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' because the VPN server did not "
@@ -125,13 +136,13 @@ msgstr ""
 "Impossibile avviare la connessione “%s” perché il server VPN non ha "
 "restituito una configurazione di rete adeguata."
 
-#: ../src/applet.c:517
+#: ../gnome/applet/applet.c:513
 msgid "VPN Login Message"
 msgstr "Messaggio di accesso VPN"
 
-#: ../src/applet.c:741 ../src/applet.c:2508
-#: ../src/other-network-dialog.c:453
-#: ../src/passphrase-dialog.c:228
+#: ../gnome/applet/applet.c:737 ../gnome/applet/applet.c:2507
+#: ../gnome/applet/other-network-dialog.c:458
+#: ../gnome/applet/passphrase-dialog.c:228
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
@@ -139,167 +150,167 @@ msgstr ""
 "L'applet NetworkManager non è riuscita a trovare alcune risorse richieste "
 "(il file glade non è stato trovato)."
 
-#: ../src/applet.c:753
+#: ../gnome/applet/applet.c:749
 #, c-format
 msgid "The network device \"%s (%s)\" does not support wireless scanning."
 msgstr "Il dispositivo di rete “%s (%s)” non supporta la scansione wireless."
 
-#: ../src/applet.c:761
+#: ../gnome/applet/applet.c:757
 #, 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."
 
-#: ../src/applet.c:908
+#: ../gnome/applet/applet.c:904
 #, c-format
 msgid "Preparing device %s for the wired network..."
 msgstr "Preparazione del dispositivo %s per la rete cablata in corso..."
 
-#: ../src/applet.c:910
+#: ../gnome/applet/applet.c:906
 #, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
 msgstr ""
 "Preparazione del dispositivo %s per la rete wireless \"%s\" in corso..."
 
-#: ../src/applet.c:918
+#: ../gnome/applet/applet.c:914
 #, c-format
 msgid "Configuring device %s for the wired network..."
 msgstr "Configurazione del dispositivo %s per la rete cablata in corso..."
 
-#: ../src/applet.c:920
+#: ../gnome/applet/applet.c:916
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
 msgstr "Tentativo di unirsi alla rete wireless \"%s\" in corso..."
 
-#: ../src/applet.c:928
+#: ../gnome/applet/applet.c:924
 #, c-format
 msgid "Waiting for Network Key for the wireless network '%s'..."
 msgstr "In attesa della chiave di rete per la rete wireless \"%s\"..."
 
-#: ../src/applet.c:936 ../src/applet.c:946
+#: ../gnome/applet/applet.c:932 ../gnome/applet/applet.c:942
 msgid "Requesting a network address from the wired network..."
 msgstr "Richiesta di un indirizzo di rete dalla rete cablata in corso..."
 
-#: ../src/applet.c:938 ../src/applet.c:948
+#: ../gnome/applet/applet.c:934 ../gnome/applet/applet.c:944
 #, 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..."
 
-#: ../src/applet.c:956
+#: ../gnome/applet/applet.c:952
 msgid "Finishing connection to the wired network..."
 msgstr "Chiusura della connessione alla rete cablata in corso..."
 
-#: ../src/applet.c:958
+#: ../gnome/applet/applet.c:954
 #, c-format
 msgid "Finishing connection to the wireless network '%s'..."
 msgstr "Chiusura della connessione alla rete wireless \"%s\" in corso..."
 
-#: ../src/applet.c:1075
+#: ../gnome/applet/applet.c:1071
 msgid "NetworkManager is not running"
 msgstr "NetworkManager non è in esecuzione"
 
-#: ../src/applet.c:1083 ../src/applet.c:1828
+#: ../gnome/applet/applet.c:1079 ../gnome/applet/applet.c:1824
 msgid "Networking disabled"
 msgstr "Funzionalità di rete disabilitate"
 
-#: ../src/applet.c:1088
+#: ../gnome/applet/applet.c:1084
 msgid "No network connection"
 msgstr "Nessuna connessione di rete"
 
-#: ../src/applet.c:1093
+#: ../gnome/applet/applet.c:1089
 msgid "Wired network connection"
 msgstr "Connessione di rete cablata"
 
-#: ../src/applet.c:1097
+#: ../gnome/applet/applet.c:1093
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Connesso ad una rete wireless ad-hoc"
 
-#: ../src/applet.c:1099
+#: ../gnome/applet/applet.c:1095
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "Connessione di rete wireless a \"%s\" (%d%%)"
 
-#: ../src/applet.c:1120
+#: ../gnome/applet/applet.c:1116
 #, c-format
 msgid "VPN connection to '%s'"
 msgstr "Connessione VPN a “%s”"
 
-#: ../src/applet.c:1128
+#: ../gnome/applet/applet.c:1124
 #, c-format
 msgid "VPN connecting to '%s'"
 msgstr "Connessione VPN a “%s” in corso"
 
-#: ../src/applet.c:1541
+#: ../gnome/applet/applet.c:1537
 msgid "_Connect to Other Wireless Network..."
 msgstr "_Connetti ad altre reti wireless..."
 
-#: ../src/applet.c:1562
+#: ../gnome/applet/applet.c:1558
 msgid "Create _New Wireless Network..."
 msgstr "Crea _nuova rete wireless..."
 
-#: ../src/applet.c:1685
+#: ../gnome/applet/applet.c:1681
 msgid "_VPN Connections"
 msgstr "Connessioni _VPN"
 
-#: ../src/applet.c:1730
+#: ../gnome/applet/applet.c:1726
 msgid "_Configure VPN..."
 msgstr "_Configura VPN..."
 
-#: ../src/applet.c:1734
+#: ../gnome/applet/applet.c:1730
 msgid "_Disconnect VPN..."
 msgstr "_Disconnetti VPN..."
 
-#: ../src/applet.c:1756
+#: ../gnome/applet/applet.c:1752
 msgid "_Dial Up Connections"
 msgstr "Connessioni mo_dem"
 
 #. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
-#: ../src/applet.c:1767
+#: ../gnome/applet/applet.c:1763
 #, c-format
 msgid "Connect to %s..."
 msgstr "Connetti a %s..."
 
-#: ../src/applet.c:1773
+#: ../gnome/applet/applet.c:1769
 #, c-format
 msgid "Disconnect from %s..."
 msgstr "Disconnetti da %s..."
 
-#: ../src/applet.c:1822
+#: ../gnome/applet/applet.c:1818
 msgid "No network devices have been found"
 msgstr "Non è stata trovata alcuna interfaccia di rete"
 
-#: ../src/applet.c:2014
+#: ../gnome/applet/applet.c:2010
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager non è in esecuzione..."
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2170
+#: ../gnome/applet/applet.c:2166
 msgid "Enable _Networking"
 msgstr "Abilita _rete"
 
 #. 'Enable Wireless' item
-#: ../src/applet.c:2176
+#: ../gnome/applet/applet.c:2172
 msgid "Enable _Wireless"
 msgstr "Abilita _wireless"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2182
+#: ../gnome/applet/applet.c:2178
 msgid "Connection _Information"
 msgstr "_Informazioni connessione"
 
 #. Help item
-#: ../src/applet.c:2193
+#: ../gnome/applet/applet.c:2189
 msgid "_Help"
 msgstr "A_iuto"
 
 #. About item
-#: ../src/applet.c:2202
+#: ../gnome/applet/applet.c:2198
 msgid "_About"
 msgstr "I_nformazioni"
 
-#: ../src/applet.c:2667
+#: ../gnome/applet/applet.c:2666
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
@@ -307,115 +318,115 @@ msgstr ""
 "L'applet NetworkManager non è riuscita a trovare alcune risorse richieste. "
 "Non può continuare l'esecuzione.\n"
 
-#: ../src/wireless-security-option.c:157
+#: ../gnome/applet/wireless-security-option.c:157
 msgid "Open System"
 msgstr "Sistema aperto"
 
-#: ../src/wireless-security-option.c:160
+#: ../gnome/applet/wireless-security-option.c:160
 msgid "Shared Key"
 msgstr "Chiave condivisa"
 
 # o Automatica?
-#: ../src/wireless-security-option.c:208
+#: ../gnome/applet/wireless-security-option.c:208
 msgid "Automatic (Default)"
 msgstr "Automatica (predefinito)"
 
-#: ../src/wireless-security-option.c:215
+#: ../gnome/applet/wireless-security-option.c:215
 msgid "AES-CCMP"
 msgstr "AES-CCMP"
 
-#: ../src/wireless-security-option.c:223
+#: ../gnome/applet/wireless-security-option.c:223
 msgid "TKIP"
 msgstr "TKIP"
 
-#: ../src/wireless-security-option.c:231
+#: ../gnome/applet/wireless-security-option.c:231
 msgid "Dynamic WEP"
 msgstr "WEP dinamico"
 
 # Dovrebbe riferirsi a "sicurezza"
-#: ../src/wso-none.c:53
+#: ../gnome/applet/wso-none.c:53
 msgid "None"
 msgstr "Nessuna"
 
-#: ../src/wso-wep-ascii.c:138
+#: ../gnome/applet/wso-wep-ascii.c:138
 msgid "WEP 64/128-bit ASCII"
-msgstr "ASCII 128 bit/WEP 40"
+msgstr "WEP a 64/128 bit ASCII"
 
-#: ../src/wso-wep-hex.c:135
+#: ../gnome/applet/wso-wep-hex.c:135
 msgid "WEP 64/128-bit Hex"
-msgstr "Esadecimale 128 bit/WEP 40"
+msgstr "WEP a 64/128 bit esadecimale"
 
-#: ../src/wso-wep-passphrase.c:135
+#: ../gnome/applet/wso-wep-passphrase.c:135
 msgid "WEP 128-bit Passphrase"
-msgstr "Frase di accesso WEP 128 bit"
+msgstr "Frase di accesso WEP a 128 bit"
 
-#: ../src/wso-wpa-eap.c:237
+#: ../gnome/applet/wso-wpa-eap.c:237
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../src/wso-wpa-eap.c:238
+#: ../gnome/applet/wso-wpa-eap.c:238
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wso-wpa-eap.c:239
+#: ../gnome/applet/wso-wpa-eap.c:239
 msgid "TTLS"
 msgstr "TTLS"
 
 # [NdT] va tradotto?
-#: ../src/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
-#: ../src/nm-ap-security-wpa-eap.c:116
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:93
+#: ../src/nm-ap-security-wpa-eap.c:117
 msgid "WPA2 Enterprise"
 msgstr "WPA2 Enterprise"
 
 # [NdT] va tradotto?
-#: ../src/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
-#: ../src/nm-ap-security-wpa-eap.c:121
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:95
+#: ../src/nm-ap-security-wpa-eap.c:122
 msgid "WPA Enterprise"
 msgstr "WPA Enterprise"
 
-#: ../src/wso-wpa-psk.c:178
+#: ../gnome/applet/wso-wpa-psk.c:178
 msgid "WPA2 Personal"
 msgstr "WPA2 personale"
 
-#: ../src/wso-wpa-psk.c:180
+#: ../gnome/applet/wso-wpa-psk.c:180
 msgid "WPA Personal"
 msgstr "WPA personale"
 
-#: ../src/eggtrayicon.c:134
+#: ../gnome/applet/eggtrayicon.c:134
 msgid "Orientation"
 msgstr "Orientamento"
 
-#: ../src/eggtrayicon.c:135
+#: ../gnome/applet/eggtrayicon.c:135
 msgid "The orientation of the tray."
 msgstr "L'orientamento del vassoio."
 
-#: ../src/menu-items.c:88
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Rete cablata (%s)"
 
-#: ../src/menu-items.c:91
+#: ../gnome/applet/menu-items.c:91
 msgid "_Wired Network"
 msgstr "Rete _cablata"
 
-#: ../src/menu-items.c:162
+#: ../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)"
 
-#: ../src/menu-items.c:164
+#: ../gnome/applet/menu-items.c:164
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Rete wireless"
 msgstr[1] "Reti wireless"
 
-#: ../src/menu-items.c:343
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr " (Unicode non valido)"
 
-#: ../src/other-network-dialog.c:352
+#: ../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, "
@@ -425,11 +436,11 @@ msgstr ""
 "il nome del computer, %s, senza cifratura abilitata"
 
 # [NdT] è il titolo della finestra
-#: ../src/other-network-dialog.c:358
+#: ../gnome/applet/other-network-dialog.c:358
 msgid "Create new wireless network"
 msgstr "Creazione nuova rete wireless"
 
-#: ../src/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."
@@ -437,27 +448,27 @@ msgstr ""
 "Inserire il nome e le impostazioni di sicurezza della rete wireless che si "
 "desidera creare."
 
-#: ../src/other-network-dialog.c:363
+#: ../gnome/applet/other-network-dialog.c:363
 msgid "Create New Wireless Network"
 msgstr "Crea nuova rete wireless"
 
-#: ../src/other-network-dialog.c:368
+#: ../gnome/applet/other-network-dialog.c:368
 msgid "Existing wireless network"
 msgstr "Rete wireless esistente"
 
-#: ../src/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 "Inserire il nome delle rete wireless a cui ci si vuole connettere."
 
-#: ../src/other-network-dialog.c:371
+#: ../gnome/applet/other-network-dialog.c:371
 msgid "Connect to Other Wireless Network"
 msgstr "Connetti ad altre reti wireless"
 
-#: ../src/passphrase-dialog.c:215
+#: ../gnome/applet/passphrase-dialog.c:215
 msgid "Error connecting to wireless network"
 msgstr "Errore nella connessione alla rete wireless"
 
-#: ../src/passphrase-dialog.c:216
+#: ../gnome/applet/passphrase-dialog.c:216
 msgid ""
 "The requested wireless network requires security capabilities unsupported by "
 "your hardware."
@@ -465,13 +476,13 @@ msgstr ""
 "La rete wireless richiesta richiede funzionalità di sicurezza non supportate "
 "dall'hardware presente."
 
-#: ../src/vpn-password-dialog.c:151
-#: ../src/vpn-password-dialog.c:188
+#: ../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\""
 
-#: ../src/vpn-password-dialog.c:154
+#: ../gnome/applet/vpn-password-dialog.c:154
 #, c-format
 msgid ""
 "Could not find the authentication dialog for VPN connection type '%s'. "
@@ -480,7 +491,7 @@ msgstr ""
 "Impossibile trovare la finestra di dialogo per la connessione VPN di tipo \"%"
 "s\". Contattare l'amministratore di sistema."
 
-#: ../src/vpn-password-dialog.c:191
+#: ../gnome/applet/vpn-password-dialog.c:191
 #, c-format
 msgid ""
 "There was a problem launching the authentication dialog for VPN connection "
@@ -490,17 +501,17 @@ msgstr ""
 "autenticazione per la connessione VPN di tipo \"%s\". Contattare "
 "l'amministratore di sistema."
 
-#: ../src/applet.glade.h:1
+#: ../gnome/applet/applet.glade.h:1
 msgid " "
 msgstr " "
 
-#: ../src/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\">Informazioni connessione attiva</span>"
 
-#: ../src/applet.glade.h:4
+#: ../gnome/applet/applet.glade.h:4
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
@@ -515,7 +526,7 @@ msgstr ""
 "È richiesta una frase chiave o una chiave di cifratura per accedere alla "
 "rete wireless \"%s\"."
 
-#: ../src/applet.glade.h:8
+#: ../gnome/applet/applet.glade.h:8
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
@@ -526,7 +537,7 @@ msgstr ""
 "\n"
 "%s  Non sarà del funzionale."
 
-#: ../src/applet.glade.h:12
+#: ../gnome/applet/applet.glade.h:12
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
@@ -543,75 +554,79 @@ msgstr ""
 "questa rete wireless è sicura, selezionare la casella di spunta sottostante "
 "e NetworkManager non chiederà la conferma ai successivi accessi."
 
-#: ../src/applet.glade.h:15
+#: ../gnome/applet/applet.glade.h:15
 msgid "Anonymous Identity:"
 msgstr "Identità anonima:"
 
-#: ../src/applet.glade.h:16
+#: ../gnome/applet/applet.glade.h:16
 msgid "Authentication:"
 msgstr "Autenticazione:"
 
-#: ../src/applet.glade.h:17
+#: ../gnome/applet/applet.glade.h:17
 msgid "Broadcast Address:"
 msgstr "Indirizzo broadcast:"
 
-#: ../src/applet.glade.h:18
+#: ../gnome/applet/applet.glade.h:18
 msgid "CA Certificate File:"
 msgstr "File del certificato della CA:"
 
-#: ../src/applet.glade.h:19
+#: ../gnome/applet/applet.glade.h:19
 msgid "C_onnect"
 msgstr "C_onnetti"
 
-#: ../src/applet.glade.h:20
+#: ../gnome/applet/applet.glade.h:20
 msgid "Client Certificate File:"
 msgstr "File del certificato del client:"
 
-#: ../src/applet.glade.h:21
+#: ../gnome/applet/applet.glade.h:21
 msgid "Connection Information"
 msgstr "Informazioni connessione"
 
-#: ../src/applet.glade.h:22
+#: ../gnome/applet/applet.glade.h:22
 msgid "Default Route:"
 msgstr "Rotta predefinita:"
 
-#: ../src/applet.glade.h:23
+#: ../gnome/applet/applet.glade.h:23
 msgid "Destination Address:"
 msgstr "Indirizzo destinazione:"
 
-#: ../src/applet.glade.h:24
+#: ../gnome/applet/applet.glade.h:24
 msgid "Driver:"
 msgstr "Driver:"
 
-#: ../src/applet.glade.h:25
+#: ../gnome/applet/applet.glade.h:25
 msgid "EAP Method:"
 msgstr "Metodo EAP:"
 
-#: ../src/applet.glade.h:26
+#: ../gnome/applet/applet.glade.h:26
 msgid "Hardware Address:"
 msgstr "Indirizzo hardware:"
 
-#: ../src/applet.glade.h:27
+#: ../gnome/applet/applet.glade.h:27
 msgid "IP Address:"
 msgstr "Indirizzo IP:"
 
-#: ../src/applet.glade.h:28
+#: ../gnome/applet/applet.glade.h:28
 msgid "Identity:"
 msgstr "Identità:"
 
-#: ../src/applet.glade.h:29
+#: ../gnome/applet/applet.glade.h:29
 msgid "Interface:"
 msgstr "Interfaccia:"
 
-#: ../src/applet.glade.h:30
+#: ../gnome/applet/applet.glade.h:30
 msgid "Key Type:"
 msgstr "Tipo di chiave:"
 
-#: ../src/applet.glade.h:31
+#: ../gnome/applet/applet.glade.h:31
+msgid "Key management:"
+msgstr "Gestione chiave:"
+
+#: ../gnome/applet/applet.glade.h:32
 msgid "Key:"
 msgstr "Chiave:"
 
-#: ../src/applet.glade.h:32
+#: ../gnome/applet/applet.glade.h:33
 msgid ""
 "None\n"
 "WEP 128-bit Passphrase\n"
@@ -619,11 +634,11 @@ msgid ""
 "WEP 64/128-bit ASCII\n"
 msgstr ""
 "Nessuna\n"
-"Frase di accesso WEP 128 bit\n"
-"WEP 64/128 bit esadecimale\n"
-"WEP 64/128 bit ASCII\n"
+"Frase di accesso WEP a 128 bit\n"
+"WEP 64/128-bit esadecimale\n"
+"WEP 64/128-bit ASCII\n"
 
-#: ../src/applet.glade.h:37
+#: ../gnome/applet/applet.glade.h:38
 msgid ""
 "Open System\n"
 "Shared Key"
@@ -631,111 +646,115 @@ msgstr ""
 "Sistema aperto\n"
 "Chiave condivisa"
 
-#: ../src/applet.glade.h:39
+#: ../gnome/applet/applet.glade.h:40
 msgid "Other Wireless Network..."
 msgstr "Altra rete wireless..."
 
-#: ../src/applet.glade.h:40
+#: ../gnome/applet/applet.glade.h:41
 msgid "Passphrase:"
 msgstr "Frase chiave:"
 
-#: ../src/applet.glade.h:41
+#: ../gnome/applet/applet.glade.h:42
 msgid "Password:"
 msgstr "Password:"
 
-#: ../src/applet.glade.h:42
+#: ../gnome/applet/applet.glade.h:43
 msgid "Primary DNS:"
 msgstr "DNS primario:"
 
-#: ../src/applet.glade.h:43
+#: ../gnome/applet/applet.glade.h:44
 msgid "Private Key File:"
 msgstr "File della chiave privata:"
 
-#: ../src/applet.glade.h:44
+#: ../gnome/applet/applet.glade.h:45
 msgid "Private Key Password:"
 msgstr "Password della chiave privata:"
 
-#: ../src/applet.glade.h:45
+#: ../gnome/applet/applet.glade.h:46
 msgid "Secondary DNS:"
 msgstr "DNS secondario:"
 
-#: ../src/applet.glade.h:46
+#: ../gnome/applet/applet.glade.h:47
 msgid "Select the CA Certificate File"
 msgstr "Selezionare il file con il certificato della CA"
 
-#: ../src/applet.glade.h:47
+#: ../gnome/applet/applet.glade.h:48
 msgid "Select the Client Certificate File"
 msgstr "Selezionare il file con il certificato del client"
 
-#: ../src/applet.glade.h:48
+#: ../gnome/applet/applet.glade.h:49
 msgid "Select the Private Key File"
 msgstr "Selezionare il file con la chiave privata"
 
-#: ../src/applet.glade.h:49
+#: ../gnome/applet/applet.glade.h:50
 msgid "Show key"
-msgstr "Mostra chiave"
+msgstr "Mostra la chiave"
 
-#: ../src/applet.glade.h:50
+#: ../gnome/applet/applet.glade.h:51
 msgid "Show passphrase"
-msgstr "Mostra frase chiave"
+msgstr "Mostra la frase di accesso"
 
-#: ../src/applet.glade.h:51
+#: ../gnome/applet/applet.glade.h:52
 msgid "Show password"
-msgstr "Mostra password"
+msgstr "Mostra la password"
 
-#: ../src/applet.glade.h:52
+#: ../gnome/applet/applet.glade.h:53
 msgid "Show passwords"
 msgstr "Mostra le password"
 
-#: ../src/applet.glade.h:53
+#: ../gnome/applet/applet.glade.h:54
 msgid "Speed:"
 msgstr "Velocità:"
 
-#: ../src/applet.glade.h:54
+#: ../gnome/applet/applet.glade.h:55
 msgid "Subnet Mask:"
 msgstr "Maschera di rete:"
 
-#: ../src/applet.glade.h:55
+#: ../gnome/applet/applet.glade.h:56
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../src/applet.glade.h:56
+#: ../gnome/applet/applet.glade.h:57
 msgid "User Name:"
 msgstr "Nome utente:"
 
-#: ../src/applet.glade.h:57
+#: ../gnome/applet/applet.glade.h:58
 msgid "Wireless Network Key Required"
 msgstr "Richiesta chiave per rete wireless"
 
-#: ../src/applet.glade.h:58
+#: ../gnome/applet/applet.glade.h:59
 msgid "Wireless _adapter:"
 msgstr "_Adattatore wireless:"
 
-#: ../src/applet.glade.h:59
+#: ../gnome/applet/applet.glade.h:60
 msgid "_Always Trust this Wireless Network"
 msgstr "Dare _sempre fiducia a questa rete wireless"
 
-#: ../src/applet.glade.h:60
+#: ../gnome/applet/applet.glade.h:61
 msgid "_Don't remind me again"
 msgstr "_Non ricordarlo più"
 
-#: ../src/applet.glade.h:61
+#: ../gnome/applet/applet.glade.h:62
+msgid "_Fallback on this Network"
+msgstr "_Ricadi su questa rete"
+
+#: ../gnome/applet/applet.glade.h:63
 msgid "_Login to Network"
-msgstr "_Login alla rete"
+msgstr "_Accesso alla rete"
 
-#: ../src/applet.glade.h:62
+#: ../gnome/applet/applet.glade.h:64
 msgid "_Network Name:"
 msgstr "_Nome rete:"
 
-#: ../src/applet.glade.h:63
+#: ../gnome/applet/applet.glade.h:65
 msgid "_Wireless Security:"
 msgstr "Sicurezza _wireless:"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:383
+#: ../gnome/vpn-properties/nm-vpn-properties.c:419
 msgid "Cannot add VPN connection"
 msgstr "Impossibile aggiungere una connessione VPN"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:385
+#: ../gnome/vpn-properties/nm-vpn-properties.c:421
 msgid ""
 "No suitable VPN software was found on your system. Contact your system "
 "administrator."
@@ -743,11 +762,11 @@ msgstr ""
 "Non è stato trovato un software VPN adatto nel sistema. Contattare "
 "l'amministratore di sistema."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:437
+#: ../gnome/vpn-properties/nm-vpn-properties.c:463
 msgid "Cannot import VPN connection"
 msgstr "Impossibile importare la connessione VPN"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:439
+#: ../gnome/vpn-properties/nm-vpn-properties.c:465
 #, c-format
 msgid ""
 "Cannot find suitable software for VPN connection type '%s' to import the "
@@ -756,12 +775,12 @@ 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."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:579
+#: ../gnome/vpn-properties/nm-vpn-properties.c:585
 #, c-format
 msgid "Error retrieving VPN connection '%s'"
 msgstr "Errore nel recuperare la connessione VPN \"%s\""
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:582
+#: ../gnome/vpn-properties/nm-vpn-properties.c:588
 #, c-format
 msgid ""
 "Could not find the UI files for VPN connection type '%s'. Contact your "
@@ -770,12 +789,12 @@ msgstr ""
 "Impossibile trovare il file di interfaccia per la connessione VPN di tipo \"%"
 "s\". Contattare l'amministratore di sistema."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:739
+#: ../gnome/vpn-properties/nm-vpn-properties.c:732
 #, c-format
 msgid "Delete VPN connection \"%s\"?"
 msgstr "Eliminare la connessione VPN \"%s\"?"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:742
+#: ../gnome/vpn-properties/nm-vpn-properties.c:735
 #, c-format
 msgid ""
 "All information about the VPN connection \"%s\" will be lost and you may "
@@ -786,16 +805,36 @@ msgstr ""
 "necessario chiedere informazioni all'amministratore di sistema per creare "
 "una nuova connessione."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:959
+#: ../gnome/vpn-properties/nm-vpn-properties.c:908
 msgid "Unable to load"
 msgstr "Impossibile caricare"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:961
+#: ../gnome/vpn-properties/nm-vpn-properties.c:910
 msgid "Cannot find some needed resources (the glade file)!"
 msgstr "Impossibile trovare alcune risorse richieste (il file glade)!"
 
+#. druid_window = GTK_DIALOG (gtk_dialog_new_with_buttons (_("Create VPN Connection"),
+#. NULL,
+#. GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+#. GTK_STOCK_CANCEL,
+#. GTK_RESPONSE_REJECT,
+#. GTK_STOCK_APPLY,
+#. GTK_RESPONSE_ACCEPT,
+#. NULL));
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1055
+msgid "Create VPN Connection"
+msgstr "Creazione connessione VPN"
+
+#. gtk_container_add (GTK_CONTAINER (druid_window->vbox), GTK_WIDGET(gtk_label_new("Some label")));
+#. gtk_box_pack_start (GTK_BOX (druid_window->vbox), GTK_WIDGET(druid), TRUE,TRUE,0);
+#. gtk_box_pack_start (GTK_BOX (druid_window->vbox), GTK_WIDGET(gtk_label_new("Some label")), TRUE,TRUE,0);
+#. toplevel = gtk_widget_get_toplevel (GTK_WIDGET (druid));
+#. gtk_signal_connect (GTK_OBJECT (toplevel), "delete_event", GTK_SIGNAL_FUNC (vpn_window_close), NULL);
+#. make the druid window modal wrt. our main window
+#. gtk_window_set_modal (druid_window, TRUE);
+#. gtk_window_set_transient_for (GTK_WINDOW(druid_window), GTK_WINDOW (dialog));
 #. Edit dialog
-#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1073
 msgid "Edit VPN Connection"
 msgstr "Modifica connessione VPN"
 
@@ -804,68 +843,30 @@ 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
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
 msgid "E_xport"
 msgstr "E_sporta"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:9
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
 msgid "Edit the selected VPN connection"
 msgstr "Modifica la connessione VPN selezionata"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:10
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
 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
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
 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
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
 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
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
 msgid "VPN Connections"
 msgstr "Connessioni VPN"
 
@@ -901,11 +902,11 @@ msgstr "WPA2 CCMP"
 msgid "WPA2 Automatic"
 msgstr "WPA2 automatica"
 
-#: ../src/nm-ap-security.c:320
+#: ../src/nm-ap-security.c:338
 msgid "none"
 msgstr "nessuna"
 
-#: ../src/nm-netlink-monitor.c:154
+#: ../src/nm-netlink-monitor.c:170
 #, c-format
 msgid ""
 "unable to create netlink socket for monitoring wired ethernet devices - %s"
@@ -913,7 +914,7 @@ msgstr ""
 "impossibile creare un socket netlink per monitorare i dispositivi di rete "
 "cablata ethernet - %s"
 
-#: ../src/nm-netlink-monitor.c:172
+#: ../src/nm-netlink-monitor.c:188
 #, c-format
 msgid ""
 "unable to bind to netlink socket for monitoring wired ethernet devices - %s"
@@ -921,166 +922,50 @@ msgstr ""
 "impossibile effettuare il bind al socket netlink per monitorare i "
 "dispositivi di rete cablata ethernet - %s"
 
-#: ../src/nm-netlink-monitor.c:405
+#: ../src/nm-netlink-monitor.c:425
 msgid "operation took too long"
 msgstr "l'operazione ha impiegato troppo tempo"
 
-#: ../src/nm-netlink-monitor.c:502
+#: ../src/nm-netlink-monitor.c:522
 msgid "received data from wrong type of sender"
 msgstr "dati ricevuti dal tipo di mittente errato"
 
-#: ../src/nm-netlink-monitor.c:515
+#: ../src/nm-netlink-monitor.c:535
 msgid "received data from unexpected sender"
 msgstr "dati ricevuti da un mittente inatteso"
 
-#: ../src/nm-netlink-monitor.c:646
+#: ../src/nm-netlink-monitor.c:664
 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
+#: ../src/nm-netlink-monitor.c:774
 msgid "error occurred while waiting for data on socket"
 msgstr "si è verificato un errore durante l'attesa dei dati sul socket"
 
-#: ../src/applet-dbus-devices.c:898
+#: ../gnome/applet/applet-dbus-devices.c:922
 #, c-format
 msgid "You are now connected to the Ad-Hoc wireless network '%s'."
 msgstr "Adesso si è connessi alla rete wireless ad-hoc \"%s\"."
 
-#: ../src/applet-dbus-devices.c:903
+#: ../gnome/applet/applet-dbus-devices.c:927
 #, c-format
 msgid "You are now connected to the wireless network '%s'."
 msgstr "Adesso si è connessi alla rete wireless \"%s\"."
 
-#: ../src/applet-dbus-devices.c:910
+#: ../gnome/applet/applet-dbus-devices.c:934
 msgid "You are now connected to the wired network."
 msgstr "Adesso si è connessi alla rete cablata."
 
-#: ../src/applet-dbus-devices.c:916
+#: ../gnome/applet/applet-dbus-devices.c:940
 msgid "Connection Established"
 msgstr "Connessione stabilita"
 
-#: ../src/applet-dbus-devices.c:959
+#: ../gnome/applet/applet-dbus-devices.c:983
 msgid "Disconnected"
 msgstr "Disconnesso"
 
 # [NdT] certo che l'originare era proprio brutto
-#: ../src/applet-dbus-devices.c:960
+#: ../gnome/applet/applet-dbus-devices.c:984
 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 70d6c31b..89c13c4f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,491 +1,511 @@
 # Japanese translation for NetworkManager
 # Copyright (C) 2005 Dan Williams <dcbw@redhat.com>
 # This file is distributed under the same license as the NetworkManager package.
-# Satoru SATOH <ss@gnome.gr.jp>, 2005.
+# Satoru SATOH <ss@gnome.gr.jp>, 2005, 2006.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: NetworkManager 0.3.1\n"
+"Project-Id-Version: NetworkManager HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-29 18:33+0200\n"
-"PO-Revision-Date: 2006-06-16 14:06\n"
-"Last-Translator: Novell Language <language@novell.com>\n"
-"Language-Team: Novell Language <language@novell.com>\n"
+"POT-Creation-Date: 2006-11-01 03:37+0900\n"
+"PO-Revision-Date: 2006-11-01 21:57+0900\n"
+"Last-Translator: Satoru SATOH <ss@gnome.gr.jp>\n"
+"Language-Team: Japanese <gnome-translation@gnome.gr.jp>\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"
 
-#: ../src/applet-compat.c:171 ../src/applet-dbus-info.c:919
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:926
 #, c-format
 msgid "Passphrase for wireless network %s"
-msgstr "ワイヤレスネットワーク %s のパスフレーズ"
+msgstr "無線ネットワーク %s のパスフレーズ"
 
-#: ../src/applet-dbus.c:265
+#: ../gnome/applet/applet-dbus.c:274
 #, c-format
 msgid "Connection to the wireless network '%s' failed."
-msgstr "ワイヤレスネットワーク「%s」への接続に失敗しました。 "
+msgstr "無線ネットワーク '%s' への接続に失敗"
 
-#: ../src/applet-dbus.c:270
+#: ../gnome/applet/applet-dbus.c:279
 msgid "Connection to the wired network failed."
-msgstr "有線ネットワークへの接続に失敗しました。"
+msgstr "有線ネットワークへの接続に失敗"
 
-#: ../src/applet.c:184
+#: ../gnome/applet/applet.c:186
 msgid "Error displaying connection information:"
-msgstr "接続情報の表示エラー:"
+msgstr "接続情報を表示中にエラー:"
 
-#: ../src/applet.c:202
+#: ../gnome/applet/applet.c:204
 msgid "Could not find some required resources (the glade file)!"
-msgstr "必要なリソース(グレードファイル)を見つけることができませんでした。"
+msgstr "いくつか必要なリソース(glade ファイル) をみつけられませんでした!"
 
-#: ../src/applet.c:213
+#: ../gnome/applet/applet.c:215
 msgid "No active connections!"
-msgstr "有効な接続がありません。"
+msgstr "アクティブな接続がありません!"
 
-#: ../src/applet.c:234
+#: ../gnome/applet/applet.c:233
+#, c-format
+msgid "%d Mb/s"
+msgstr "%d Mb/s"
+
+#: ../gnome/applet/applet.c:236
 #, c-format
 msgid "Wired Ethernet (%s)"
-msgstr "有線イーサネット(%s)"
+msgstr "有線 Ethernet (%s)"
 
-#: ../src/applet.c:236
+#: ../gnome/applet/applet.c:238
 #, c-format
 msgid "Wireless Ethernet (%s)"
-msgstr "ワイヤレスイーサネット(%s)"
+msgstr "無線 Ethernet (%s)"
 
-#: ../src/applet.c:337 ../src/applet.c:362
+#: ../gnome/applet/applet.c:244
+msgid "Unknown"
+msgstr "不明"
+
+#: ../gnome/applet/applet.c:334 ../gnome/applet/applet.c:360
 msgid "NetworkManager Applet"
-msgstr "NetworkManagerアプレット"
+msgstr "NetworkManager アプレット"
 
-#: ../src/applet.c:339 ../src/applet.c:364
-msgid "Copyright © 2004-2005 Red Hat, Inc."
-msgstr "Copyright © 2004-2005 Red Hat, Inc."
+#: ../gnome/applet/applet.c:336
+msgid ""
+"Copyright © 2004-2006 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+msgstr ""
+"Copyright © 2004-2006 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
 
-#: ../src/applet.c:340 ../src/applet.c:365
+#: ../gnome/applet/applet.c:338 ../gnome/applet/applet.c:364
 msgid ""
 "Notification area applet for managing your network devices and connections."
-msgstr "ネットワークデバイスと接続を管理する通知領域アプレット。"
+msgstr "ネットワークデバイスと接続を管理するための通知エリアアプレット"
 
-#: ../src/applet.c:343 ../src/applet.c:370
+#: ../gnome/applet/applet.c:341 ../gnome/applet/applet.c:368
 msgid "translator-credits"
+msgstr "Satoru SATOH <ss@gnome.gr.jp>"
+
+#: ../gnome/applet/applet.c:362
+msgid ""
+"Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
 msgstr ""
-"相花 毅 <aihana@gnome.gr.jp>\n"
-"Akira TAGOH <tagoh@gnome.gr.jp>\n"
-"Yukihiro Nakai <nakai@gnome.gr.jp>\n"
-"Takuo KITAME <kitame@debian.org>\n"
-"日本GNOMEユーザー会 http://www.gnome.gr.jp"
+"Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
 
-#: ../src/applet.c:426
+#: ../gnome/applet/applet.c:424
 msgid "VPN Login Failure"
-msgstr "VPNログインの失敗"
+msgstr "VPN ログイン失敗"
 
-#: ../src/applet.c:427
+#: ../gnome/applet/applet.c:425
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a login failure."
-msgstr "ログインの失敗により、VPN接続「%s」を起動できませんでした。"
+msgstr "ログインに失敗したため VPN 接続 '%s' を開始できませんでした"
 
-#: ../src/applet.c:431
+#: ../gnome/applet/applet.c:429
 msgid "VPN Start Failure"
-msgstr "VPNの起動の失敗"
+msgstr "VPN 開始に失敗"
 
-#: ../src/applet.c:432
+#: ../gnome/applet/applet.c:430
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
 "program."
 msgstr ""
-"VPNプログラムの起動の失敗により、VPN接続「%s」を起動できませんでした。   "
+"VPN プログラムを起動できなかったため VPN 接続 '%s' を開始できませんでした"
 
-#: ../src/applet.c:436 ../src/applet.c:446
+#: ../gnome/applet/applet.c:434 ../gnome/applet/applet.c:444
 msgid "VPN Connect Failure"
-msgstr "VPN接続の失敗"
+msgstr "VPN 接続に失敗"
 
-#: ../src/applet.c:437
+#: ../gnome/applet/applet.c:435
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a connection error."
-msgstr "接続エラーにより、VPN接続「%s」を起動できませんでした。"
+msgstr "接続エラーのため VPN 接続 '%s' を開始できませんでした"
 
-#: ../src/applet.c:441
+#: ../gnome/applet/applet.c:439
 msgid "VPN Configuration Error"
-msgstr "VPN設定エラー"
+msgstr "VPN 接続エラー"
 
-#: ../src/applet.c:442
+#: ../gnome/applet/applet.c:440
 #, c-format
 msgid "The VPN connection '%s' was not correctly configured."
-msgstr "VPN接続「%s」は正しく設定されていません。"
+msgstr "VPN 接続 '%s' は適切に設定されました。"
 
-#: ../src/applet.c:447
+#: ../gnome/applet/applet.c:445
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' because the VPN server did not "
 "return an adequate network configuration."
 msgstr ""
-"VPNサーバーが適切なネットワーク設定を返さなかったため、VPN接続「%s」を起動で"
-"きませんでした。"
+"VPN サーバが返事を返さず、適切なネットワーク設定がなされないため VPN 接続 '%"
+"s' を開始できませんでした。"
 
-#: ../src/applet.c:517
+#: ../gnome/applet/applet.c:515
 msgid "VPN Login Message"
-msgstr "VPNログインメッセージ "
+msgstr "VPN ログインメッセージ"
 
-#: ../src/applet.c:741 ../src/applet.c:2508
-#: ../src/other-network-dialog.c:453
-#: ../src/passphrase-dialog.c:228
+#: ../gnome/applet/applet.c:739 ../gnome/applet/applet.c:2534
+#: ../gnome/applet/other-network-dialog.c:458
+#: ../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 ファイル)をみつける"
-"ことができませんでした"
+"NetworkManager アプレットに必要ないくつかのリソース (glade ファイル) をみつけ"
+"られませんでした。"
 
-#: ../src/applet.c:753
+#: ../gnome/applet/applet.c:751
 #, c-format
 msgid "The network device \"%s (%s)\" does not support wireless scanning."
 msgstr ""
-"ネットワークデバイス「%s (%s)」はワイヤレススキャニングをサポートしません。 "
+"ネットワークデバイス \"%s (%s)\" は無線スキャンをサポートしていません。"
 
-#: ../src/applet.c:761
+#: ../gnome/applet/applet.c:759
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
-msgstr "ネットワークデバイス「%s (%s)」はリンク検索をサポートしません。"
+msgstr "ネットワークデバイス \"%s (%s)\" はリンク検出をサポートしていません。"
 
-#: ../src/applet.c:908
+#. Note to translators: this is used if no essid is known
+#: ../gnome/applet/applet.c:901 ../gnome/applet/applet.c:1099
+msgid "(unknown)"
+msgstr "(不明)"
+
+#: ../gnome/applet/applet.c:907
 #, c-format
 msgid "Preparing device %s for the wired network..."
-msgstr "有線ネットワークのデバイス %s を準備中..."
+msgstr "有線ネットワーク用のデバイス %s を準備しています..."
 
-#: ../src/applet.c:910
+#: ../gnome/applet/applet.c:909
 #, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
-msgstr "ワイヤレスネットワーク「%s」のデバイス %s を準備中..."
+msgstr "無線ネットワーク '%s' 用のデバイス %s を準備しています..."
 
-#: ../src/applet.c:918
+#: ../gnome/applet/applet.c:917
 #, c-format
 msgid "Configuring device %s for the wired network..."
-msgstr "有線ネットワークにデバイス %s を設定中..."
+msgstr "有線ネットワーク用のデバイス %s を設定しています..."
 
-#: ../src/applet.c:920
+#: ../gnome/applet/applet.c:919
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
-msgstr "ワイヤレスネットワーク「%s」に接続中..."
+msgstr "無線ネットワーク '%s' に参加しようとしています..."
 
-#: ../src/applet.c:928
+#: ../gnome/applet/applet.c:927
 #, c-format
 msgid "Waiting for Network Key for the wireless network '%s'..."
-msgstr "ワイヤレスネットワーク「%s」のネットワークキーを待機中...."
+msgstr "無線ネットワーク '%s' のネットワーク鍵を待っています..."
 
-#: ../src/applet.c:936 ../src/applet.c:946
+#: ../gnome/applet/applet.c:935 ../gnome/applet/applet.c:945
 msgid "Requesting a network address from the wired network..."
-msgstr "有線ネットワークからネットワークアドレスをリクエスト中..."
+msgstr "有線ネットワークのネットワークアドレスを要求しています..."
 
-#: ../src/applet.c:938 ../src/applet.c:948
+#: ../gnome/applet/applet.c:937 ../gnome/applet/applet.c:947
 #, c-format
 msgid "Requesting a network address from the wireless network '%s'..."
-msgstr "ワイヤレスネットワーク「%s」からネットワークアドレスをリクエスト中..."
+msgstr "無線ネットワーク '%s' のネットワークアドレスを要求しています..."
 
-#: ../src/applet.c:956
+#: ../gnome/applet/applet.c:955
 msgid "Finishing connection to the wired network..."
-msgstr "有線ネットワークへの接続完了..."
+msgstr "有線ネットワークへの接続処理を終了しています..."
 
-#: ../src/applet.c:958
+#: ../gnome/applet/applet.c:957
 #, c-format
 msgid "Finishing connection to the wireless network '%s'..."
-msgstr "ワイヤレスネットワーク「%s」への接続完了..."
+msgstr "無線ネットワーク '%s' への接続処理を終了しています..."
 
-#: ../src/applet.c:1075
+#: ../gnome/applet/applet.c:1074
 msgid "NetworkManager is not running"
 msgstr "NetworkManager は実行されていません"
 
-#: ../src/applet.c:1083 ../src/applet.c:1828
+#: ../gnome/applet/applet.c:1082 ../gnome/applet/applet.c:1827
 msgid "Networking disabled"
-msgstr "ネットワークが無効です"
+msgstr "ネットワークは有効にされていません"
 
-#: ../src/applet.c:1088
+#: ../gnome/applet/applet.c:1087
 msgid "No network connection"
-msgstr "ネットワーク接続なし"
+msgstr "ネットワーク接続がありません"
 
-#: ../src/applet.c:1093
+#: ../gnome/applet/applet.c:1092
 msgid "Wired network connection"
-msgstr "無線ネットワーク接続"
+msgstr "有線ネットワーク接続"
 
-#: ../src/applet.c:1097
+#: ../gnome/applet/applet.c:1096
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Ad-Hoc 無線ネットワークに接続しました"
 
-#: ../src/applet.c:1099
+#: ../gnome/applet/applet.c:1098
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
-msgstr "「%s」(%d%%)へのワイヤレスネットワーク接続"
+msgstr "'%s' (%d%%) に無線ネットワーク接続"
 
-#: ../src/applet.c:1120
+#: ../gnome/applet/applet.c:1119
 #, c-format
 msgid "VPN connection to '%s'"
-msgstr "「%s」へのVPN接続"
+msgstr "'%s' への VPN 接続"
 
-#: ../src/applet.c:1128
+#: ../gnome/applet/applet.c:1127
 #, c-format
 msgid "VPN connecting to '%s'"
-msgstr "「%s」へのVPN接続"
+msgstr "'%s' に VPN 接続しています"
 
-#: ../src/applet.c:1541
+#: ../gnome/applet/applet.c:1540
 msgid "_Connect to Other Wireless Network..."
-msgstr "他のワイヤレスネットワークへの接続(_C)..."
+msgstr "他の無線ネットワークに接続(_C)..."
 
-#: ../src/applet.c:1562
+#: ../gnome/applet/applet.c:1561
 msgid "Create _New Wireless Network..."
-msgstr "新しいワイヤレスネットワークを作成(_N)..."
+msgstr "新しい無線ネットワークを作成(_N)..."
 
-#: ../src/applet.c:1685
+#: ../gnome/applet/applet.c:1684
 msgid "_VPN Connections"
-msgstr "VPN接続(_V)"
+msgstr "VPN 接続(_V)"
 
-#: ../src/applet.c:1730
+#: ../gnome/applet/applet.c:1729
 msgid "_Configure VPN..."
-msgstr "VPNの設定(_C)..."
+msgstr "VPN を設定(_C)..."
 
-#: ../src/applet.c:1734
+#: ../gnome/applet/applet.c:1733
 msgid "_Disconnect VPN..."
-msgstr "VPNの切断(_D)..."
+msgstr "VPN を切断(_D)..."
 
-#: ../src/applet.c:1756
+#: ../gnome/applet/applet.c:1755
 msgid "_Dial Up Connections"
-msgstr "ダイヤルアップ接続(_D)"
+msgstr "ダイアルアップ接続(_D)"
 
 #. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
-#: ../src/applet.c:1767
+#: ../gnome/applet/applet.c:1766
 #, c-format
 msgid "Connect to %s..."
-msgstr "%s に接続します..."
+msgstr "%s に接続..."
 
-#: ../src/applet.c:1773
+#: ../gnome/applet/applet.c:1772
 #, c-format
 msgid "Disconnect from %s..."
-msgstr "%s から接続解除します..."
+msgstr "%s への接続を切断..."
 
-#: ../src/applet.c:1822
+#: ../gnome/applet/applet.c:1821
 msgid "No network devices have been found"
 msgstr "ネットワークデバイスがみつかりませんでした"
 
-#: ../src/applet.c:2014
+#: ../gnome/applet/applet.c:2013
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager は実行されていません..."
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2170
+#: ../gnome/applet/applet.c:2192
 msgid "Enable _Networking"
-msgstr "ネットワークの有効化(_N)"
+msgstr "ネットワークを有効にする(_N)"
 
 #. 'Enable Wireless' item
-#: ../src/applet.c:2176
+#: ../gnome/applet/applet.c:2198
 msgid "Enable _Wireless"
-msgstr "ワイヤレスの有効化(_W)"
+msgstr "無線を有効にする(_W)"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2182
+#: ../gnome/applet/applet.c:2204
 msgid "Connection _Information"
 msgstr "接続情報(_I)"
 
 #. Help item
-#: ../src/applet.c:2193
+#: ../gnome/applet/applet.c:2215
 msgid "_Help"
 msgstr "ヘルプ(_H)"
 
 #. About item
-#: ../src/applet.c:2202
+#: ../gnome/applet/applet.c:2224
 msgid "_About"
 msgstr "情報(_A)"
 
-#: ../src/applet.c:2667
+#: ../gnome/applet/applet.c:2695
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
 msgstr ""
-"NetworkManagerアプレットは必要なリソースを見つけることができませんでした。続"
-"行できません。\n"
+"NetworkManager アプレットに必要ないくつかのリソースをみつけることができません"
+"でした。続行できません。\n"
 
-#: ../src/wireless-security-option.c:157
+#: ../gnome/applet/wireless-security-option.c:157
 msgid "Open System"
-msgstr "オープンシステム"
+msgstr "システムを開く"
 
-#: ../src/wireless-security-option.c:160
+#: ../gnome/applet/wireless-security-option.c:160
 msgid "Shared Key"
-msgstr "共有キー"
+msgstr "共有鍵"
 
-#: ../src/wireless-security-option.c:208
+#: ../gnome/applet/wireless-security-option.c:208
 msgid "Automatic (Default)"
 msgstr "自動(デフォルト)"
 
-#: ../src/wireless-security-option.c:215
+#: ../gnome/applet/wireless-security-option.c:215
 msgid "AES-CCMP"
 msgstr "AES-CCMP"
 
-#: ../src/wireless-security-option.c:223
+#: ../gnome/applet/wireless-security-option.c:223
 msgid "TKIP"
 msgstr "TKIP"
 
-#: ../src/wireless-security-option.c:231
+#: ../gnome/applet/wireless-security-option.c:231
 msgid "Dynamic WEP"
-msgstr "動的WEP"
+msgstr "動的 WEP"
 
-#: ../src/wso-none.c:53
+#: ../gnome/applet/wso-none.c:53
 msgid "None"
 msgstr "なし"
 
-#: ../src/wso-wep-ascii.c:138
+#: ../gnome/applet/wso-wep-ascii.c:138
 msgid "WEP 64/128-bit ASCII"
-msgstr "WEP 64/128ビットASCII"
+msgstr "WEP 64/128-bit ASCII"
 
-#: ../src/wso-wep-hex.c:135
+#: ../gnome/applet/wso-wep-hex.c:135
 msgid "WEP 64/128-bit Hex"
-msgstr "WEP 64/128ビット16進数"
+msgstr "WEP 64/128-bit 十六進数"
 
-#: ../src/wso-wep-passphrase.c:135
+#: ../gnome/applet/wso-wep-passphrase.c:135
 msgid "WEP 128-bit Passphrase"
-msgstr "WEP 128-ビットパラフレーズ"
+msgstr "WEP 128-bit パスフレーズ"
 
-#: ../src/wso-wpa-eap.c:237
+#: ../gnome/applet/wso-wpa-eap.c:237
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../src/wso-wpa-eap.c:238
+#: ../gnome/applet/wso-wpa-eap.c:238
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wso-wpa-eap.c:239
+#: ../gnome/applet/wso-wpa-eap.c:239
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../src/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
-#: ../src/nm-ap-security-wpa-eap.c:116
+# そういう仕様の名前なので訳すべきでない。
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:93
+#: ../src/nm-ap-security-wpa-eap.c:117
 msgid "WPA2 Enterprise"
-msgstr "WPA Enterprise"
+msgstr "WPA2-Enterprise"
 
-#: ../src/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
-#: ../src/nm-ap-security-wpa-eap.c:121
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:95
+#: ../src/nm-ap-security-wpa-eap.c:122
 msgid "WPA Enterprise"
-msgstr "WPA Enterprise"
+msgstr "WPA-Enterprise"
 
-#: ../src/wso-wpa-psk.c:178
+#: ../gnome/applet/wso-wpa-psk.c:178
 msgid "WPA2 Personal"
-msgstr "WPA Personal"
+msgstr "WPA2-Personal"
 
-#: ../src/wso-wpa-psk.c:180
+#: ../gnome/applet/wso-wpa-psk.c:180
 msgid "WPA Personal"
-msgstr "WPA Personal"
+msgstr "WPA-Personal"
 
-#: ../src/eggtrayicon.c:134
+#: ../gnome/applet/eggtrayicon.c:134
 msgid "Orientation"
 msgstr "向き"
 
-#: ../src/eggtrayicon.c:135
+#: ../gnome/applet/eggtrayicon.c:135
 msgid "The orientation of the tray."
 msgstr "トレイの向き"
 
-#: ../src/menu-items.c:88
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
-msgstr "無線ネットワーク (%s)"
+msgstr "有線ネットワーク (%s)"
 
-#: ../src/menu-items.c:91
+#: ../gnome/applet/menu-items.c:91
 msgid "_Wired Network"
 msgstr "有線ネットワーク(_W)"
 
-#: ../src/menu-items.c:162
+#: ../gnome/applet/menu-items.c:162
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
 msgstr[0] "無線ネットワーク (%s)"
-msgstr[1] "無線ネットワーク (%s)"
 
-#: ../src/menu-items.c:164
+#: ../gnome/applet/menu-items.c:164
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "無線ネットワーク"
-msgstr[1] "無線ネットワーク"
 
-#: ../src/menu-items.c:343
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr " (不正な Unicode)"
 
-#: ../src/other-network-dialog.c:352
+#: ../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 に設定されます。"
+"デフォルトでは無線ネットワークの名前はあなたのコンピュータ名 (%s) に設定さ"
+"れ、暗号がないものとされます。"
 
-#: ../src/other-network-dialog.c:358
+#: ../gnome/applet/other-network-dialog.c:358
 msgid "Create new wireless network"
 msgstr "新しい無線ネットワークを作成"
 
-#: ../src/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 "作成するワイヤレスネットワークの名前とセキュリティ設定を入力します。"
+msgstr "作成したい無線ネットワークの名前とセキュリティ設定を入力して下さい。"
 
-#: ../src/other-network-dialog.c:363
+#: ../gnome/applet/other-network-dialog.c:363
 msgid "Create New Wireless Network"
 msgstr "新しい無線ネットワークを作成"
 
-#: ../src/other-network-dialog.c:368
+#: ../gnome/applet/other-network-dialog.c:368
 msgid "Existing wireless network"
-msgstr "既存のワイヤレスネットワーク"
+msgstr "既存の無線ネットワーク"
 
-#: ../src/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 "接続するワイヤレスネットワークの名前を入力します。"
+msgstr "接続したい無線ネットワークの名前を入力して下さい。"
 
-#: ../src/other-network-dialog.c:371
+#: ../gnome/applet/other-network-dialog.c:371
 msgid "Connect to Other Wireless Network"
-msgstr "他のワイヤレスネットワークへの接続"
+msgstr "他の無線ネットワークに接続"
 
-#: ../src/passphrase-dialog.c:215
+#: ../gnome/applet/passphrase-dialog.c:215
 msgid "Error connecting to wireless network"
-msgstr "ワイヤレスネットワークへの接続エラー"
+msgstr "無線ネットワークに接続中にエラー"
 
-#: ../src/passphrase-dialog.c:216
+#: ../gnome/applet/passphrase-dialog.c:216
 msgid ""
 "The requested wireless network requires security capabilities unsupported by "
 "your hardware."
 msgstr ""
-"リクエストされたワイヤレスネットワークには、ハードウェアでサポートされていな"
-"いセキュリティ機能が必要です。"
+"要求された無線ネットワークにはあなたのハードウェアがサポートしていないセキュ"
+"リティ機能が必要です。"
 
-#: ../src/vpn-password-dialog.c:151
-#: ../src/vpn-password-dialog.c:188
+#: ../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」を起動できません"
+msgstr "VPN 接続 '%s' を開始できません"
 
-#: ../src/vpn-password-dialog.c:154
+#: ../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」の認証ダイアログを見つけることができませんでした。システム"
-"管理者にご連絡ください。 "
+"VPN 接続タイプ '%s' の認証ダイアログをみつけられませんでした。システム管理者"
+"に連絡して下さい。"
 
-#: ../src/vpn-password-dialog.c:191
+#: ../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」の認証ダイアログを起動する際に問題が発生しました。システム"
-"管理者にご連絡ください。 "
+"VPN 接続タイプ '%s' の認証ダイアログを起動中に問題が生じました。システム管理"
+"者に連絡して下さい。"
 
-#: ../src/applet.glade.h:1
+#: ../gnome/applet/applet.glade.h:1
 msgid " "
 msgstr " "
 
-#: ../src/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\">有効な接続情報</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">アクティブな接続の情報</span>"
 
-#: ../src/applet.glade.h:4
+#: ../gnome/applet/applet.glade.h:4
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
@@ -497,20 +517,20 @@ msgstr ""
 "<span weight=\"bold\" size=\"larger\">無線ネットワークにはパスフレーズが必要"
 "です</span>\n"
 "\n"
-"無線ネットワーク '%s' にアクセスするにはパスフレーズか暗号化鍵が必要です"
+"無線ネットワーク '%s' にアクセスするにはパスフレーズか暗号化鍵が必要です。"
 
-#: ../src/applet.glade.h:8
+#: ../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  完全には機能しません。"
 
-#: ../src/applet.glade.h:12
+#: ../gnome/applet/applet.glade.h:12
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
@@ -520,81 +540,88 @@ 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\">Wireless Network Login 確認</span>\n"
+"<span weight=\"bold\" size=\"larger\">無線ネットワークログイン確認</span>\n"
 "\n"
-"ワイヤレスネットワーク「%s」にログインするように選択しました。このワイヤレス"
-"ネットワークがセキュアである場合、次のチェックボックスを有効にすると、"
-"NetworkManagerは次回以降のログインで確認を要求しません。"
+"無線ネットワーク '%s' にログインするように選択しました。もしこの無線ネット"
+"ワークがセキュアであることを確信できるのであれば下のチェックボタンをクリック"
+"して NetworkManager がログインの後で確認を必要としないようにすることができま"
+"す。"
 
-#: ../src/applet.glade.h:15
+#: ../gnome/applet/applet.glade.h:15
 msgid "Anonymous Identity:"
-msgstr "匿名識別情報:"
+msgstr "匿名:"
 
-#: ../src/applet.glade.h:16
+#: ../gnome/applet/applet.glade.h:16
 msgid "Authentication:"
 msgstr "認証:"
 
-#: ../src/applet.glade.h:17
+#: ../gnome/applet/applet.glade.h:17
 msgid "Broadcast Address:"
 msgstr "ブロードキャストアドレス:"
 
-#: ../src/applet.glade.h:18
+#: ../gnome/applet/applet.glade.h:18
 msgid "CA Certificate File:"
-msgstr "CA認定ファイル:"
+msgstr "CA 証明ファイル:"
 
-#: ../src/applet.glade.h:19
+#: ../gnome/applet/applet.glade.h:19
 msgid "C_onnect"
 msgstr "接続(_O)"
 
-#: ../src/applet.glade.h:20
+#: ../gnome/applet/applet.glade.h:20
 msgid "Client Certificate File:"
-msgstr "クライアント認定ファイル:"
+msgstr "クライアント証明ファイル:"
 
-#: ../src/applet.glade.h:21
+#: ../gnome/applet/applet.glade.h:21
 msgid "Connection Information"
 msgstr "接続情報"
 
-#: ../src/applet.glade.h:22
+#: ../gnome/applet/applet.glade.h:22
 msgid "Default Route:"
 msgstr "デフォルトルート:"
 
-#: ../src/applet.glade.h:23
+#: ../gnome/applet/applet.glade.h:23
 msgid "Destination Address:"
-msgstr "送信先アドレス:"
+msgstr "宛先アドレス:"
 
-#: ../src/applet.glade.h:24
+#: ../gnome/applet/applet.glade.h:24
 msgid "Driver:"
 msgstr "ドライバ:"
 
-#: ../src/applet.glade.h:25
+#: ../gnome/applet/applet.glade.h:25
 msgid "EAP Method:"
-msgstr "EAPメソッド:"
+msgstr "EAP 方式:"
 
-#: ../src/applet.glade.h:26
+#: ../gnome/applet/applet.glade.h:26
 msgid "Hardware Address:"
 msgstr "ハードウェアアドレス:"
 
-#: ../src/applet.glade.h:27
+#: ../gnome/applet/applet.glade.h:27
 msgid "IP Address:"
-msgstr "IPアドレス:"
+msgstr "IP アドレス:"
 
-#: ../src/applet.glade.h:28
+# とりあえずこのように訳しておくが "Identity" のままの方が適切かもしれない。
+# (WPA-EAP Identity 認証方式: ユーザ ID とパスワードの組で認証)
+#: ../gnome/applet/applet.glade.h:28
 msgid "Identity:"
-msgstr "識別情報:"
+msgstr "ユーザ ID:"
 
-#: ../src/applet.glade.h:29
+#: ../gnome/applet/applet.glade.h:29
 msgid "Interface:"
-msgstr "インタフェース:"
+msgstr "インターフェース:"
 
-#: ../src/applet.glade.h:30
+#: ../gnome/applet/applet.glade.h:30
 msgid "Key Type:"
-msgstr "鍵の種別"
+msgstr "鍵タイプ:"
+
+#: ../gnome/applet/applet.glade.h:31
+msgid "Key management:"
+msgstr "鍵管理:"
 
-#: ../src/applet.glade.h:31
+#: ../gnome/applet/applet.glade.h:32
 msgid "Key:"
-msgstr "キー:"
+msgstr "鍵:"
 
-#: ../src/applet.glade.h:32
+#: ../gnome/applet/applet.glade.h:33
 msgid ""
 "None\n"
 "WEP 128-bit Passphrase\n"
@@ -602,261 +629,248 @@ msgid ""
 "WEP 64/128-bit ASCII\n"
 msgstr ""
 "なし\n"
-"WEP 128-ビットパスフレーズ\n"
-"WEP 64/128-16ビット\n"
-"WEP 64/128-ビット ASCII\n"
+"WEP 128-bit パスフレーズ\n"
+"WEP 64/128-bit 十六進数\n"
+"WEP 64/128-bit ASCII\n"
 
-#: ../src/applet.glade.h:37
+#: ../gnome/applet/applet.glade.h:38
 msgid ""
 "Open System\n"
 "Shared Key"
 msgstr ""
-"システム\n"
-"共有キーを開く"
+"オープンシステム\n"
+"共有鍵"
 
-#: ../src/applet.glade.h:39
+#: ../gnome/applet/applet.glade.h:40
 msgid "Other Wireless Network..."
-msgstr "他のワイヤレスネットワーク..."
+msgstr "他の無線ネットワーク..."
 
-#: ../src/applet.glade.h:40
+#: ../gnome/applet/applet.glade.h:41
 msgid "Passphrase:"
 msgstr "パスフレーズ:"
 
-#: ../src/applet.glade.h:41
+#: ../gnome/applet/applet.glade.h:42
 msgid "Password:"
 msgstr "パスワード:"
 
-#: ../src/applet.glade.h:42
+#: ../gnome/applet/applet.glade.h:43
 msgid "Primary DNS:"
-msgstr "プライマリDNS:"
+msgstr "第一 DNS:"
 
-#: ../src/applet.glade.h:43
+#: ../gnome/applet/applet.glade.h:44
 msgid "Private Key File:"
-msgstr "プライベートキーファイル:"
+msgstr "秘密鍵ファイル:"
 
-#: ../src/applet.glade.h:44
+#: ../gnome/applet/applet.glade.h:45
 msgid "Private Key Password:"
-msgstr "プライベートキーパスワード:"
+msgstr "秘密鍵パスワード:"
 
-#: ../src/applet.glade.h:45
+#: ../gnome/applet/applet.glade.h:46
 msgid "Secondary DNS:"
-msgstr "セカンダリDNS:"
+msgstr "第二 DNS:"
 
-#: ../src/applet.glade.h:46
+#: ../gnome/applet/applet.glade.h:47
 msgid "Select the CA Certificate File"
-msgstr "Ca証明書ファイルを選択する"
+msgstr "CA 証明ファイルを選択"
 
-#: ../src/applet.glade.h:47
+#: ../gnome/applet/applet.glade.h:48
 msgid "Select the Client Certificate File"
-msgstr "クライアント証明書ファイルを選択する"
+msgstr "クライアント証明ファイルを選択"
 
-#: ../src/applet.glade.h:48
+#: ../gnome/applet/applet.glade.h:49
 msgid "Select the Private Key File"
-msgstr "プライベートキーファイルを選択する"
+msgstr "秘密鍵ファイルを選択"
 
-#: ../src/applet.glade.h:49
+#: ../gnome/applet/applet.glade.h:50
 msgid "Show key"
-msgstr "キーを表示する"
+msgstr "鍵を表示"
 
-#: ../src/applet.glade.h:50
+#: ../gnome/applet/applet.glade.h:51
 msgid "Show passphrase"
-msgstr "パスフレーズを表示する"
+msgstr "パスフレーズを表示"
 
-#: ../src/applet.glade.h:51
+#: ../gnome/applet/applet.glade.h:52
 msgid "Show password"
-msgstr "パスワードを表示する"
+msgstr "パスワードを表示"
 
-#: ../src/applet.glade.h:52
+#: ../gnome/applet/applet.glade.h:53
 msgid "Show passwords"
-msgstr "パスワードを表示する"
+msgstr "パスワードを表示"
 
-#: ../src/applet.glade.h:53
+#: ../gnome/applet/applet.glade.h:54
 msgid "Speed:"
 msgstr "速度:"
 
-#: ../src/applet.glade.h:54
+#: ../gnome/applet/applet.glade.h:55
 msgid "Subnet Mask:"
 msgstr "サブネットマスク:"
 
-#: ../src/applet.glade.h:55
+#: ../gnome/applet/applet.glade.h:56
 msgid "Type:"
-msgstr "種別:"
+msgstr "タイプ:"
 
-#: ../src/applet.glade.h:56
+#: ../gnome/applet/applet.glade.h:57
 msgid "User Name:"
 msgstr "ユーザ名:"
 
-#: ../src/applet.glade.h:57
+#: ../gnome/applet/applet.glade.h:58
 msgid "Wireless Network Key Required"
 msgstr "無線ネットワーク鍵が必要です"
 
-#: ../src/applet.glade.h:58
+#: ../gnome/applet/applet.glade.h:59
 msgid "Wireless _adapter:"
 msgstr "無線アダプタ(_A):"
 
-#: ../src/applet.glade.h:59
+#: ../gnome/applet/applet.glade.h:60
 msgid "_Always Trust this Wireless Network"
-msgstr "このワイヤレスネットワークを常に信頼する(_A)"
+msgstr "この無線ネットワークを常に信頼する(_A)"
 
-#: ../src/applet.glade.h:60
+#: ../gnome/applet/applet.glade.h:61
 msgid "_Don't remind me again"
-msgstr "このダイアログを再表示しない(_D)"
+msgstr "二度と催促しない(_D)"
 
-#: ../src/applet.glade.h:61
+#: ../gnome/applet/applet.glade.h:62
+msgid "_Fallback on this Network"
+msgstr "このネットワークにフォールバック(_F)"
+
+#: ../gnome/applet/applet.glade.h:63
 msgid "_Login to Network"
 msgstr "ネットワークにログイン(_L)"
 
-#: ../src/applet.glade.h:62
+#: ../gnome/applet/applet.glade.h:64
 msgid "_Network Name:"
 msgstr "ネットワーク名(_N):"
 
-#: ../src/applet.glade.h:63
+#: ../gnome/applet/applet.glade.h:65
 msgid "_Wireless Security:"
-msgstr "ワイヤレスセキュリティ(_W):"
+msgstr "無線セキュリティ(_W):"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:383
+#: ../gnome/vpn-properties/nm-vpn-properties.c:419
 msgid "Cannot add VPN connection"
-msgstr "VPN接続を追加できません"
+msgstr "VPN 接続を追加できません"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:385
+#: ../gnome/vpn-properties/nm-vpn-properties.c:421
 msgid ""
 "No suitable VPN software was found on your system. Contact your system "
 "administrator."
 msgstr ""
-"システムに適切なVPNソフトウェアが見つかりませんでした。システム管理者にご連絡"
-"ください。"
+"適切な VPN ソフトウェアがシステム上にみつかりませんでした。システム管理者に連"
+"絡してください。"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:437
+#: ../gnome/vpn-properties/nm-vpn-properties.c:463
 msgid "Cannot import VPN connection"
-msgstr "VPN接続をインポートできません"
+msgstr "VPN 接続をインポートできません"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:439
+#: ../gnome/vpn-properties/nm-vpn-properties.c:465
 #, c-format
 msgid ""
 "Cannot find suitable software for VPN connection type '%s' to import the "
 "file '%s'. Contact your system administrator."
 msgstr ""
-"VPN接続タイプ「%s」がファイル「%s」をインポートするために適切なソフトウェアが"
-"見つかりません。システム管理者にご連絡ください。"
+"ファイル '%s' をインポートするための VPN 接続タイプ '%s' 用の適切なソフトウェ"
+"アがシステム上にみつかりませんでした。システム管理者に連絡してください。"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:579
+#: ../gnome/vpn-properties/nm-vpn-properties.c:585
 #, c-format
 msgid "Error retrieving VPN connection '%s'"
-msgstr "VPN接続「%s」の取得エラー"
+msgstr "VPN 接続 '%s' 読み出し中にエラー"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:582
+#: ../gnome/vpn-properties/nm-vpn-properties.c:588
 #, c-format
 msgid ""
 "Could not find the UI files for VPN connection type '%s'. Contact your "
 "system administrator."
 msgstr ""
-"VPN接続タイプ「%s」のUIファイルが見つかりませんでした。システム管理者にご連絡"
-"ください。"
+"VPN 接続タイプ '%s' の UI ファイルをみつけられませんでした。システム管理者に"
+"連絡してください。"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:739
+#: ../gnome/vpn-properties/nm-vpn-properties.c:732
 #, c-format
 msgid "Delete VPN connection \"%s\"?"
-msgstr "VPN接続「%s」を削除しますか?"
+msgstr "VPN 接続 \"%s\" を削除しますか?"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:742
+#: ../gnome/vpn-properties/nm-vpn-properties.c:735
 #, 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」に関する情報はすべて失われます。システム管理者が新しい接続を作成"
-"するための情報を提供する必要があります。"
+"VPN 接続 \"%s\" についてすべての情報が失われ、新しい接続を作成するにはシステ"
+"ム管理者に情報を提供してもらう必要があります。"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:959
+#: ../gnome/vpn-properties/nm-vpn-properties.c:908
 msgid "Unable to load"
-msgstr "ロードできません"
+msgstr "読み込めません"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:961
+#: ../gnome/vpn-properties/nm-vpn-properties.c:910
 msgid "Cannot find some needed resources (the glade file)!"
-msgstr "必要なリソースが見つかりません(グレードファイル)。"
-
+msgstr "必要ないくつかのリソース (glade ファイル) をみつけられません!"
+
+#. druid_window = GTK_DIALOG (gtk_dialog_new_with_buttons (_("Create VPN Connection"),
+#. NULL,
+#. GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+#. GTK_STOCK_CANCEL,
+#. GTK_RESPONSE_REJECT,
+#. GTK_STOCK_APPLY,
+#. GTK_RESPONSE_ACCEPT,
+#. NULL));
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1055
+msgid "Create VPN Connection"
+msgstr "VPN 接続を作成"
+
+#. gtk_container_add (GTK_CONTAINER (druid_window->vbox), GTK_WIDGET(gtk_label_new("Some label")));
+#. gtk_box_pack_start (GTK_BOX (druid_window->vbox), GTK_WIDGET(druid), TRUE,TRUE,0);
+#. gtk_box_pack_start (GTK_BOX (druid_window->vbox), GTK_WIDGET(gtk_label_new("Some label")), TRUE,TRUE,0);
+#. toplevel = gtk_widget_get_toplevel (GTK_WIDGET (druid));
+#. gtk_signal_connect (GTK_OBJECT (toplevel), "delete_event", GTK_SIGNAL_FUNC (vpn_window_close), NULL);
+#. make the druid window modal wrt. our main window
+#. gtk_window_set_modal (druid_window, TRUE);
+#. gtk_window_set_transient_for (GTK_WINDOW(druid_window), GTK_WINDOW (dialog));
 #. Edit dialog
-#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1073
 msgid "Edit VPN Connection"
-msgstr "VPN接続を編集します"
+msgstr "VPN 接続を編集"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:1
 msgid "Add a new VPN connection"
-msgstr "新しいVPN接続を追加します"
+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接続を削除します "
+msgstr "選択した VPN 接続を削除"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
 msgid "E_xport"
 msgstr "エクスポート(_X)"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:9
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
 msgid "Edit the selected VPN connection"
-msgstr "選択したVPN接続を編集する"
+msgstr "選択した VPN 接続を編集"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:10
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
 msgid "Export the VPN settings to a file"
-msgstr "VPN設定をファイルにエクスポートする"
+msgstr "VPN 設定をファイルにエクスポート"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:11
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
 msgid "Export the selected VPN connection to a file"
-msgstr "選択したVPN接続をファイルにエクスポートする"
+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
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
 msgid "Manage Virtual Private Network Connections"
-msgstr "仮想プライベートネットワーク接続を管理する"
+msgstr "仮想プライベートネットワーク (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 ""
-"このアシスタントに従って、仮想プライベートネットワーク(VPN)への接続を作成でき"
-"ます。\n"
-"\n"
-"IPアドレスなどの情報が必要です。"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:17
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
 msgid "VPN Connections"
-msgstr "VPN接続"
+msgstr "VPN 接続"
 
 #: ../src/nm-ap-security-wep.c:52
 msgid "40-bit WEP"
-msgstr "40-ビットWEP"
+msgstr "40-bit WEP"
 
 #: ../src/nm-ap-security-wep.c:54
 msgid "104-bit WEP"
-msgstr "104-ビットWEP"
+msgstr "104-bit WEP"
 
 #: ../src/nm-ap-security-wpa-psk.c:50
 msgid "WPA TKIP"
@@ -868,7 +882,7 @@ msgstr "WPA CCMP"
 
 #: ../src/nm-ap-security-wpa-psk.c:54
 msgid "WPA Automatic"
-msgstr "WPA自動"
+msgstr "WPA 自動"
 
 #: ../src/nm-ap-security-wpa-psk.c:59
 msgid "WPA2 TKIP"
@@ -880,73 +894,101 @@ msgstr "WPA2 CCMP"
 
 #: ../src/nm-ap-security-wpa-psk.c:63
 msgid "WPA2 Automatic"
-msgstr "WPA2自動"
+msgstr "WPA2 自動"
 
-#: ../src/nm-ap-security.c:320
+#: ../src/nm-ap-security.c:338
 msgid "none"
 msgstr "なし"
 
-#: ../src/nm-netlink-monitor.c:154
+#: ../src/nm-netlink-monitor.c:174
 #, c-format
 msgid ""
 "unable to create netlink socket for monitoring wired ethernet devices - %s"
 msgstr ""
-"有線イーサネットデバイスをモニターするネットリンクソケットを作成できません - "
+"有線 Ethernet デバイスを監視するためのネットリンクソケットを作成できません - "
 "%s"
 
-#: ../src/nm-netlink-monitor.c:172
+#: ../src/nm-netlink-monitor.c:192
 #, c-format
 msgid ""
 "unable to bind to netlink socket for monitoring wired ethernet devices - %s"
 msgstr ""
-"有線イーサネットデバイスをモニターするネットリンクソケットをバインドできませ"
-"ん - %s "
+"有線 Ethernet デバイスを監視するためのネットリンクソケットをバインドできませ"
+"ん - %s"
 
-#: ../src/nm-netlink-monitor.c:405
+#: ../src/nm-netlink-monitor.c:427
 msgid "operation took too long"
-msgstr "操作に時間がかかり過ぎました"
+msgstr "処理に時間がかかりすぎています"
 
-#: ../src/nm-netlink-monitor.c:502
+#: ../src/nm-netlink-monitor.c:524
 msgid "received data from wrong type of sender"
-msgstr "不正な送信者からデータを受信しました"
+msgstr "間違ったタイプの送り先からデータを受信しました"
 
-#: ../src/nm-netlink-monitor.c:515
+#: ../src/nm-netlink-monitor.c:537
 msgid "received data from unexpected sender"
-msgstr "予期せぬ送信者からデータを受信しました"
+msgstr "予期しない送り先からデータを受信しました"
 
-#: ../src/nm-netlink-monitor.c:646
+#: ../src/nm-netlink-monitor.c:666
 msgid "too much data was sent over socket and some of it was lost"
-msgstr "ソケット上に送信されたデータが多過ぎ、その一部は失われました"
+msgstr "ソケットを介して送信されたデータが多すぎたためいくらか失われました"
 
-#: ../src/nm-netlink-monitor.c:735
+#: ../src/nm-netlink-monitor.c:776
 msgid "error occurred while waiting for data on socket"
-msgstr "ソケット上でデータを待機中にエラーが発生しました"
+msgstr "ソケット上でデータを待っている際にエラーが発生しました"
 
-#: ../src/applet-dbus-devices.c:898
+#: ../gnome/applet/applet-dbus-devices.c:922
 #, c-format
 msgid "You are now connected to the Ad-Hoc wireless network '%s'."
-msgstr "Ad-Hocワイヤレスネットワーク「%s」に現在接続されています。"
+msgstr "Ad-Hoc 無線ネットワーク '%s' に接続しました。"
 
-#: ../src/applet-dbus-devices.c:903
+#: ../gnome/applet/applet-dbus-devices.c:927
 #, c-format
 msgid "You are now connected to the wireless network '%s'."
-msgstr "ワイヤレスネットワーク「%s」に現在接続されています。"
+msgstr "無線ネットワーク '%s' に接続しました。"
 
-#: ../src/applet-dbus-devices.c:910
+#: ../gnome/applet/applet-dbus-devices.c:934
 msgid "You are now connected to the wired network."
-msgstr "有線ネットワークに現在接続されています。"
+msgstr "有線ネットワークに接続しました。"
 
-#: ../src/applet-dbus-devices.c:916
+#: ../gnome/applet/applet-dbus-devices.c:940
 msgid "Connection Established"
-msgstr "接続が確立されました"
+msgstr "接続を確立"
 
-#: ../src/applet-dbus-devices.c:959
+#: ../gnome/applet/applet-dbus-devices.c:983
 msgid "Disconnected"
-msgstr "切断しました"
+msgstr "接続を切断"
 
-#: ../src/applet-dbus-devices.c:960
+#: ../gnome/applet/applet-dbus-devices.c:984
 msgid "The network connection has been disconnected."
-msgstr "ネットワーク接続が解除されました。"
+msgstr "ネットワーク接続が切断されました。"
+
+#~ msgid "Choose which type of VPN connection you wish to create."
+#~ msgstr "作成したい VPN 接続のタイプを選択してください"
+
+#~ msgid "Connect to:"
+#~ msgstr "接続先:"
+
+#~ msgid "Create VPN Connection - 1 of 2"
+#~ msgstr "VPN 接続を作成 - 1 of 2"
+
+#~ msgid "Create VPN Connection - 2 of 2"
+#~ msgstr "VPN 接続を作成 - 2 of 2"
+
+#~ msgid "Finish Creating VPN Connection"
+#~ msgstr "VPN 接続の作成を終了"
+
+#~ 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 アドレスといったような情報が必要となります。システム管理者に"
+#~ "確認してこれらの情報を得ておいてください。"
 
 #~ msgid "Modify Wireless Networks"
 #~ msgstr "無線ネットワークを変更"
@@ -969,17 +1011,3 @@ msgstr "ネットワーク接続が解除されました。"
 #~ 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 be42948f..d56627f6 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-05-29 18:33+0200\n"
+"POT-Creation-Date: 2006-02-26 13:26+0900\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"
 
-#: ../src/applet-compat.c:171 ../src/applet-dbus-info.c:919
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:923
 #, c-format
 msgid "Passphrase for wireless network %s"
 msgstr "무선 네트워크 %s의 열쇠글"
 
-#: ../src/applet-dbus.c:265
+#: ../gnome/applet/applet-dbus.c:244
 #, c-format
 msgid "Connection to the wireless network '%s' failed."
 msgstr "무선 네트워크 '%s'(으)로 연결 실패."
 
-#: ../src/applet-dbus.c:270
+#: ../gnome/applet/applet-dbus.c:249
 msgid "Connection to the wired network failed."
 msgstr "유선 네트워크 연결 실패."
 
-#: ../src/applet.c:184
+#: ../gnome/applet/applet.c:183
 msgid "Error displaying connection information:"
 msgstr "연결 정보 보이기 오류:"
 
-#: ../src/applet.c:202
+#: ../gnome/applet/applet.c:200
 msgid "Could not find some required resources (the glade file)!"
 msgstr "필요한 몇몇 파일(glade 파일)을 찾을 수 없습니다!"
 
-#: ../src/applet.c:213
+#: ../gnome/applet/applet.c:211
 msgid "No active connections!"
 msgstr "활성된 연결 없음!"
 
-#: ../src/applet.c:234
+#: ../gnome/applet/applet.c:228
 #, c-format
 msgid "Wired Ethernet (%s)"
 msgstr "유선 이더넷 (%s)"
 
-#: ../src/applet.c:236
+#: ../gnome/applet/applet.c:230
 #, c-format
 msgid "Wireless Ethernet (%s)"
 msgstr "무선 이더넷 (%s)"
 
-#: ../src/applet.c:337 ../src/applet.c:362
+#: ../gnome/applet/applet.c:327 ../gnome/applet/applet.c:352
 msgid "NetworkManager Applet"
 msgstr "네트워크 관리자 애플릿"
 
-#: ../src/applet.c:339 ../src/applet.c:364
+#: ../gnome/applet/applet.c:329 ../gnome/applet/applet.c:354
 msgid "Copyright © 2004-2005 Red Hat, Inc."
 msgstr "Copyright © 2004-2005 Red Hat, Inc."
 
-#: ../src/applet.c:340 ../src/applet.c:365
+#: ../gnome/applet/applet.c:330 ../gnome/applet/applet.c:355
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "네트워크 장치와 연결을 관리하는 애플릿."
 
-#: ../src/applet.c:343 ../src/applet.c:370
+#: ../gnome/applet/applet.c:333 ../gnome/applet/applet.c:360
 msgid "translator-credits"
 msgstr "차영호 <ganadist@gmail.com>, 2006"
 
-#: ../src/applet.c:426
+#: ../gnome/applet/applet.c:488
 msgid "VPN Login Failure"
 msgstr "VPN 로그인 실패"
 
-#: ../src/applet.c:427
+#: ../gnome/applet/applet.c:489
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a login failure."
 msgstr "로그인을 실패해서 VPN 연결 '%s'(을)를 시작할 수 없습니다."
 
-#: ../src/applet.c:431
+#: ../gnome/applet/applet.c:493
 msgid "VPN Start Failure"
 msgstr "VPN 시작 실패"
 
-#: ../src/applet.c:432
+#: ../gnome/applet/applet.c:494
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
 "program."
 msgstr "VPN프로그램 실행을 실패해서 VPN 연결 '%s'(을)를 시작할 수 없습니다."
 
-#: ../src/applet.c:436 ../src/applet.c:446
+#: ../gnome/applet/applet.c:498 ../gnome/applet/applet.c:508
 msgid "VPN Connect Failure"
 msgstr "VPN 연결 실패"
 
-#: ../src/applet.c:437
+#: ../gnome/applet/applet.c:499
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a connection error."
 msgstr "연결에 오류가 있어서 VPN 연결 '%s'(을)를 시작할 수 없습니다."
 
-#: ../src/applet.c:441
+#: ../gnome/applet/applet.c:503
 msgid "VPN Configuration Error"
 msgstr "VPN 설정 오류"
 
-#: ../src/applet.c:442
+#: ../gnome/applet/applet.c:504
 #, c-format
 msgid "The VPN connection '%s' was not correctly configured."
 msgstr "VPN 연결 '%s'의 설정이 올바르지 않습니다."
 
-#: ../src/applet.c:447
+#: ../gnome/applet/applet.c:509
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' because the VPN server did not "
@@ -116,13 +116,27 @@ msgstr ""
 "VPN서버가 알맞는 네트워크 설정을 돌려주지 않아서 VPN 연결 '%s'(을)를 시작할 "
 "수 없습니다."
 
-#: ../src/applet.c:517
+#: ../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 로그인 메세지"
 
-#: ../src/applet.c:741 ../src/applet.c:2508
-#: ../src/other-network-dialog.c:453
-#: ../src/passphrase-dialog.c:228
+#: ../gnome/applet/applet.c:859 ../gnome/applet/applet.c:2690
+#: ../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)."
@@ -130,163 +144,188 @@ msgstr ""
 "네트워크 관리자 애플릿이 필요한 몇몇 파일을 찾을 수 없습니다. (glade 파일을 "
 "찾을 수 없습니다)."
 
-#: ../src/applet.c:753
+#: ../gnome/applet/applet.c:871
 #, c-format
 msgid "The network device \"%s (%s)\" does not support wireless scanning."
 msgstr "네트워크 장치 \"%s (%s)\"(이)가 무선랜 검색을 지원하지 않습니다."
 
-#: ../src/applet.c:761
+#: ../gnome/applet/applet.c:879
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
 msgstr "네트워크 장치 \"%s (%s)\"(이)가 연결 감지를 지원하지 않습니다."
 
-#: ../src/applet.c:908
+#: ../gnome/applet/applet.c:1026
 #, c-format
 msgid "Preparing device %s for the wired network..."
 msgstr "유선 네트워크의 장치 %s 준비중..."
 
-#: ../src/applet.c:910
+#: ../gnome/applet/applet.c:1028
 #, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
 msgstr "무선 네트워크 '%2$s'의 장치 %1$s 준비중..."
 
-#: ../src/applet.c:918
+#: ../gnome/applet/applet.c:1036
 #, c-format
 msgid "Configuring device %s for the wired network..."
 msgstr "유선 네트워크의 장치 %s 설정중..."
 
-#: ../src/applet.c:920
+#: ../gnome/applet/applet.c:1038
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
 msgstr "무선 네트워크 '%s'에 참여 준비중..."
 
-#: ../src/applet.c:928
+#: ../gnome/applet/applet.c:1046
 #, c-format
 msgid "Waiting for Network Key for the wireless network '%s'..."
 msgstr "무선 네트워크 '%s'의 네트워크 키 기다리는 중..."
 
-#: ../src/applet.c:936 ../src/applet.c:946
+#: ../gnome/applet/applet.c:1054 ../gnome/applet/applet.c:1064
 msgid "Requesting a network address from the wired network..."
 msgstr "유선 네트워크에서 네트워크 주소 요청중..."
 
-#: ../src/applet.c:938 ../src/applet.c:948
+#: ../gnome/applet/applet.c:1056 ../gnome/applet/applet.c:1066
 #, c-format
 msgid "Requesting a network address from the wireless network '%s'..."
 msgstr "무선 네트워크 '%s'에서 네트워크 주소 요청중..."
 
-#: ../src/applet.c:956
+#: ../gnome/applet/applet.c:1074
 msgid "Finishing connection to the wired network..."
 msgstr "유선 네트워크 연결 끝내는 중..."
 
-#: ../src/applet.c:958
+#: ../gnome/applet/applet.c:1076
 #, c-format
 msgid "Finishing connection to the wireless network '%s'..."
 msgstr "무선 네트워크 '%s' 연결 끝내는 중..."
 
-#: ../src/applet.c:1075
+#: ../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
 msgid "NetworkManager is not running"
 msgstr "네트워크 관리자가 실행 중이지 않습니다"
 
-#: ../src/applet.c:1083 ../src/applet.c:1828
+#: ../gnome/applet/applet.c:1281 ../gnome/applet/applet.c:2017
 msgid "Networking disabled"
 msgstr "네트워크를 사용할 수 없습니다"
 
-#: ../src/applet.c:1088
+#: ../gnome/applet/applet.c:1286
 msgid "No network connection"
 msgstr "네트워크 연결 없음"
 
-#: ../src/applet.c:1093
+#: ../gnome/applet/applet.c:1291
 msgid "Wired network connection"
 msgstr "유선 네트워크 연결"
 
-#: ../src/applet.c:1097
+#: ../gnome/applet/applet.c:1295
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Ad-Hoc 무선 네트워크 연결됨"
 
-#: ../src/applet.c:1099
+#: ../gnome/applet/applet.c:1297
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "'%s'(으)로 무선 네트워크 연결 (%d%%)"
 
-#: ../src/applet.c:1120
+#: ../gnome/applet/applet.c:1319
 #, c-format
 msgid "VPN connection to '%s'"
 msgstr "'%s'(으)로 VPN 연결"
 
-#: ../src/applet.c:1128
+#: ../gnome/applet/applet.c:1327
 #, c-format
 msgid "VPN connecting to '%s'"
 msgstr "'%s'(으)로 VPN 연결중"
 
-#: ../src/applet.c:1541
+#: ../gnome/applet/applet.c:1742
 msgid "_Connect to Other Wireless Network..."
 msgstr "다른 무선 네트워크에 연결(_C)..."
 
-#: ../src/applet.c:1562
+#: ../gnome/applet/applet.c:1763
 msgid "Create _New Wireless Network..."
 msgstr "새 무선 네트워크 만들기(_N)..."
 
-#: ../src/applet.c:1685
+#: ../gnome/applet/applet.c:1884
 msgid "_VPN Connections"
 msgstr "VPN 연결(_V)"
 
-#: ../src/applet.c:1730
+#: ../gnome/applet/applet.c:1919
 msgid "_Configure VPN..."
 msgstr "VPN 설정하기(_C)..."
 
-#: ../src/applet.c:1734
+#: ../gnome/applet/applet.c:1923
 msgid "_Disconnect VPN..."
 msgstr "VPN 연결 끊기(_D)..."
 
-#: ../src/applet.c:1756
+#: ../gnome/applet/applet.c:1945
 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
-#: ../src/applet.c:1767
+#: ../gnome/applet/applet.c:1956
 #, c-format
 msgid "Connect to %s..."
 msgstr "%s(으)로 연결..."
 
-#: ../src/applet.c:1773
+#: ../gnome/applet/applet.c:1962
 #, c-format
 msgid "Disconnect from %s..."
 msgstr "%s에서 연결 끊기..."
 
-#: ../src/applet.c:1822
+#: ../gnome/applet/applet.c:2011
 msgid "No network devices have been found"
 msgstr "네트워크 장치를 찾을 수 없습니다"
 
-#: ../src/applet.c:2014
+#: ../gnome/applet/applet.c:2203
 msgid "NetworkManager is not running..."
 msgstr "네트워크 관리자가 실행중이지 않습니다..."
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2170
+#: ../gnome/applet/applet.c:2359
 msgid "Enable _Networking"
 msgstr "네트워크 사용(_N)"
 
 #. 'Enable Wireless' item
-#: ../src/applet.c:2176
+#: ../gnome/applet/applet.c:2365
 msgid "Enable _Wireless"
 msgstr "무선 네트워크 사용(_W)"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2182
+#: ../gnome/applet/applet.c:2371
 msgid "Connection _Information"
 msgstr "연결 정보(_I)"
 
 #. Help item
-#: ../src/applet.c:2193
+#: ../gnome/applet/applet.c:2382
 msgid "_Help"
 msgstr "도움말(_H)"
 
 #. About item
-#: ../src/applet.c:2202
+#: ../gnome/applet/applet.c:2391
 msgid "_About"
 msgstr "정보(_A)"
 
-#: ../src/applet.c:2667
+#: ../gnome/applet/applet.c:2809
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
@@ -294,112 +333,75 @@ msgstr ""
 "네트워크 관리자 애플릿이 필요한 몇몇 파일을 찾을 수 없습니다. 계속할 수 없습"
 "니다.\n"
 
-#: ../src/wireless-security-option.c:157
+#: ../gnome/applet/wireless-security-option.c:157
 msgid "Open System"
 msgstr "열린 시스템"
 
-#: ../src/wireless-security-option.c:160
+#: ../gnome/applet/wireless-security-option.c:160
 msgid "Shared Key"
 msgstr "공유 키"
 
-#: ../src/wireless-security-option.c:208
+#: ../gnome/applet/wireless-security-option.c:209
 msgid "Automatic (Default)"
 msgstr "자동 (기본값)"
 
-#: ../src/wireless-security-option.c:215
-msgid "AES-CCMP"
-msgstr "AES-CCMP"
-
-#: ../src/wireless-security-option.c:223
+#: ../gnome/applet/wireless-security-option.c:216
 msgid "TKIP"
 msgstr "TKIP"
 
-#: ../src/wireless-security-option.c:231
-msgid "Dynamic WEP"
-msgstr ""
+#: ../gnome/applet/wireless-security-option.c:224
+msgid "AES-CCMP"
+msgstr "AES-CCMP"
 
-#: ../src/wso-none.c:53
+#: ../gnome/applet/wso-none.c:53
 msgid "None"
 msgstr "없음"
 
-#: ../src/wso-wep-ascii.c:138
-#, fuzzy
-msgid "WEP 64/128-bit ASCII"
+#: ../gnome/applet/wso-wep-ascii.c:127
+msgid "WEP 40/128-bit ASCII"
 msgstr "WEP 40/128비트 ASCII"
 
-#: ../src/wso-wep-hex.c:135
-#, fuzzy
-msgid "WEP 64/128-bit Hex"
+#: ../gnome/applet/wso-wep-hex.c:124
+msgid "WEP 40/128-bit hex"
 msgstr "WEP 40/128비트 16진수"
 
-#: ../src/wso-wep-passphrase.c:135
-#, fuzzy
-msgid "WEP 128-bit Passphrase"
+#: ../gnome/applet/wso-wep-passphrase.c:124
+msgid "WEP Passphrase"
 msgstr "WEP 열쇠글"
 
-#: ../src/wso-wpa-eap.c:237
-msgid "PEAP"
-msgstr ""
-
-#: ../src/wso-wpa-eap.c:238
-msgid "TLS"
-msgstr ""
-
-#: ../src/wso-wpa-eap.c:239
-msgid "TTLS"
-msgstr ""
-
-#: ../src/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 ""
-
-#: ../src/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 ""
-
-#: ../src/wso-wpa-psk.c:178
-msgid "WPA2 Personal"
-msgstr "개인용 WPA2"
-
-#: ../src/wso-wpa-psk.c:180
-msgid "WPA Personal"
-msgstr "개인용 WPA"
-
-#: ../src/eggtrayicon.c:134
+#: ../gnome/applet/eggtrayicon.c:134
 msgid "Orientation"
 msgstr "방향"
 
-#: ../src/eggtrayicon.c:135
+#: ../gnome/applet/eggtrayicon.c:135
 msgid "The orientation of the tray."
 msgstr "트레이의 방향."
 
-#: ../src/menu-items.c:88
+#: ../gnome/applet/menu-items.c:87
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "유선 네트워크 (%s)"
 
-#: ../src/menu-items.c:91
+#: ../gnome/applet/menu-items.c:90
 msgid "_Wired Network"
 msgstr "유선 네트워크(_W)"
 
-#: ../src/menu-items.c:162
+#: ../gnome/applet/menu-items.c:161
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
 msgstr[0] "무선 네트워크 (%s)"
 
-#: ../src/menu-items.c:164
+#: ../gnome/applet/menu-items.c:163
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "무선 네트워크"
 
-#: ../src/menu-items.c:343
+#: ../gnome/applet/menu-items.c:330
 msgid " (invalid Unicode)"
 msgstr " (잘못된 유니코드)"
 
-#: ../src/other-network-dialog.c:352
+#: ../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, "
@@ -408,49 +410,49 @@ msgstr ""
 "기본값으로 무선 네트워크의 이름은 컴퓨터의 이름 %s(으)로 설정되고 암호화가 설"
 "정되지 않습니다"
 
-#: ../src/other-network-dialog.c:358
+#: ../gnome/applet/other-network-dialog.c:358
 msgid "Create new wireless network"
 msgstr "새 무선 네트워크 만들기"
 
-#: ../src/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 "만드려는 무선 네트워크의 이름과 보안 설정을 입력하십시오."
 
-#: ../src/other-network-dialog.c:363
+#: ../gnome/applet/other-network-dialog.c:363
 msgid "Create New Wireless Network"
 msgstr "새 무선 네트워크 만들기"
 
-#: ../src/other-network-dialog.c:368
+#: ../gnome/applet/other-network-dialog.c:368
 msgid "Existing wireless network"
 msgstr "있는 무선 네트워크"
 
-#: ../src/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 "연결하려는 무선 네트워크의 이름을 입력하십시오."
 
-#: ../src/other-network-dialog.c:371
+#: ../gnome/applet/other-network-dialog.c:371
 msgid "Connect to Other Wireless Network"
 msgstr "다른 무선 네트워크에 연결"
 
-#: ../src/passphrase-dialog.c:215
+#: ../gnome/applet/passphrase-dialog.c:214
 msgid "Error connecting to wireless network"
 msgstr "무선 네트워크 연결 오류"
 
-#: ../src/passphrase-dialog.c:216
+#: ../gnome/applet/passphrase-dialog.c:215
 msgid ""
 "The requested wireless network requires security capabilities unsupported by "
 "your hardware."
 msgstr "무선 네트워크에서 하드웨어가 지원하지 않는 보안 기능을 필요로 합니다."
 
-#: ../src/vpn-password-dialog.c:151
-#: ../src/vpn-password-dialog.c:188
+#: ../gnome/applet/vpn-password-dialog.c:152
+#: ../gnome/applet/vpn-password-dialog.c:189
 #, c-format
 msgid "Cannot start VPN connection '%s'"
 msgstr "VPN 연결 '%s'(을)를 시작할 수 없습니다"
 
-#: ../src/vpn-password-dialog.c:154
+#: ../gnome/applet/vpn-password-dialog.c:155
 #, c-format
 msgid ""
 "Could not find the authentication dialog for VPN connection type '%s'. "
@@ -459,7 +461,7 @@ msgstr ""
 "VPN 연결 형식 '%s'의 인증 대화상자를 찾을 수 없습니다.시스템 관리자에게 알려"
 "주십시오."
 
-#: ../src/vpn-password-dialog.c:191
+#: ../gnome/applet/vpn-password-dialog.c:192
 #, c-format
 msgid ""
 "There was a problem launching the authentication dialog for VPN connection "
@@ -468,16 +470,16 @@ msgstr ""
 "VPN 연결 형식 '%s'의 인증 대화상자를 시작하는데 문제가 생겼습니다.시스템 관리"
 "자에게 알려주십시오."
 
-#: ../src/applet.glade.h:1
+#: ../gnome/applet/applet.glade.h:1
 msgid " "
 msgstr " "
 
-#: ../src/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\">활성화 된 연결 정보</span>"
 
-#: ../src/applet.glade.h:4
+#: ../gnome/applet/applet.glade.h:4
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
@@ -491,7 +493,7 @@ msgstr ""
 "\n"
 "무선 네트워크 '%s'에 연결하려면 열쇠글이나 암호키가 있어야 합니다."
 
-#: ../src/applet.glade.h:8
+#: ../gnome/applet/applet.glade.h:8
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
@@ -502,7 +504,7 @@ msgstr ""
 "\n"
 "%s 모든 기능을 쓸 수 없습니다."
 
-#: ../src/applet.glade.h:12
+#: ../gnome/applet/applet.glade.h:12
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
@@ -518,89 +520,83 @@ msgstr ""
 "면, 아래의 확인 상자를 눌러서 네트워크 매니져가 로그인 이후에확인을 하지 않도"
 "록 하십시오."
 
-#: ../src/applet.glade.h:15
+#: ../gnome/applet/applet.glade.h:15
 msgid "Anonymous Identity:"
 msgstr ""
 
-#: ../src/applet.glade.h:16
+#: ../gnome/applet/applet.glade.h:16
 msgid "Authentication:"
 msgstr "인증:"
 
-#: ../src/applet.glade.h:17
+#: ../gnome/applet/applet.glade.h:17
 msgid "Broadcast Address:"
 msgstr "Broadcast 주소:"
 
-#: ../src/applet.glade.h:18
+#: ../gnome/applet/applet.glade.h:18
 msgid "CA Certificate File:"
 msgstr "CA 인증서 파일:"
 
-#: ../src/applet.glade.h:19
+#: ../gnome/applet/applet.glade.h:19
 msgid "C_onnect"
 msgstr "연결(_O)"
 
-#: ../src/applet.glade.h:20
+#: ../gnome/applet/applet.glade.h:20
 msgid "Client Certificate File:"
 msgstr "클라이언트 인증서 파일:"
 
-#: ../src/applet.glade.h:21
+#: ../gnome/applet/applet.glade.h:21
 msgid "Connection Information"
 msgstr "연결 정보"
 
-#: ../src/applet.glade.h:22
+#: ../gnome/applet/applet.glade.h:22
 msgid "Default Route:"
 msgstr "기본 Route:"
 
-#: ../src/applet.glade.h:23
+#: ../gnome/applet/applet.glade.h:23
 msgid "Destination Address:"
 msgstr "목표 주소:"
 
-#: ../src/applet.glade.h:24
+#: ../gnome/applet/applet.glade.h:24
 msgid "Driver:"
 msgstr "드라이버:"
 
-#: ../src/applet.glade.h:25
+#: ../gnome/applet/applet.glade.h:25
 msgid "EAP Method:"
 msgstr ""
 
-#: ../src/applet.glade.h:26
+#: ../gnome/applet/applet.glade.h:26
 msgid "Hardware Address:"
 msgstr "하드웨어 주소:"
 
-#: ../src/applet.glade.h:27
+#: ../gnome/applet/applet.glade.h:27
 msgid "IP Address:"
 msgstr "IP 주소:"
 
-#: ../src/applet.glade.h:28
+#: ../gnome/applet/applet.glade.h:28
 msgid "Identity:"
 msgstr ""
 
-#: ../src/applet.glade.h:29
+#: ../gnome/applet/applet.glade.h:29
 msgid "Interface:"
 msgstr "인터페이스:"
 
-#: ../src/applet.glade.h:30
-#, fuzzy
-msgid "Key Type:"
-msgstr "형식:"
-
-#: ../src/applet.glade.h:31
+#: ../gnome/applet/applet.glade.h:30
 msgid "Key:"
 msgstr "키:"
 
-#: ../src/applet.glade.h:32
-#, fuzzy
+#: ../gnome/applet/applet.glade.h:31
 msgid ""
 "None\n"
-"WEP 128-bit Passphrase\n"
-"WEP 64/128-bit Hex\n"
-"WEP 64/128-bit ASCII\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"
 
-#: ../src/applet.glade.h:37
+#: ../gnome/applet/applet.glade.h:36
 msgid ""
 "Open System\n"
 "Shared Key"
@@ -608,125 +604,130 @@ msgstr ""
 "열린 시스템\n"
 "공유 키"
 
-#: ../src/applet.glade.h:39
+#: ../gnome/applet/applet.glade.h:38
 msgid "Other Wireless Network..."
 msgstr "다른 무선 네트워크..."
 
-#: ../src/applet.glade.h:40
+#: ../gnome/applet/applet.glade.h:39
 msgid "Passphrase:"
 msgstr "열쇠글:"
 
-#: ../src/applet.glade.h:41
+#: ../gnome/applet/applet.glade.h:40
 msgid "Password:"
 msgstr "열쇠글:"
 
-#: ../src/applet.glade.h:42
+#: ../gnome/applet/applet.glade.h:41
 msgid "Primary DNS:"
 msgstr "기본 DNS:"
 
-#: ../src/applet.glade.h:43
+#: ../gnome/applet/applet.glade.h:42
 msgid "Private Key File:"
 msgstr "개인키 파일:"
 
-#: ../src/applet.glade.h:44
+#: ../gnome/applet/applet.glade.h:43
 msgid "Private Key Password:"
 msgstr "개인키 열쇠글:"
 
-#: ../src/applet.glade.h:45
+#: ../gnome/applet/applet.glade.h:44
 msgid "Secondary DNS:"
 msgstr "보조 DNS:"
 
-#: ../src/applet.glade.h:46
+#: ../gnome/applet/applet.glade.h:45
 msgid "Select the CA Certificate File"
 msgstr "CA 인증서 파일을 선택하십시오"
 
-#: ../src/applet.glade.h:47
+#: ../gnome/applet/applet.glade.h:46
 msgid "Select the Client Certificate File"
 msgstr "클라이언트 인증서 파일을 선택하십시오"
 
-#: ../src/applet.glade.h:48
+#: ../gnome/applet/applet.glade.h:47
 msgid "Select the Private Key File"
 msgstr "개인키 파일을 선택하십시오"
 
-#: ../src/applet.glade.h:49
-msgid "Show key"
-msgstr ""
-
-#: ../src/applet.glade.h:50
-#, fuzzy
-msgid "Show passphrase"
-msgstr "열쇠글:"
-
-#: ../src/applet.glade.h:51
-#, fuzzy
-msgid "Show password"
-msgstr "열쇠글:"
-
-#: ../src/applet.glade.h:52
-#, fuzzy
-msgid "Show passwords"
-msgstr "열쇠글:"
-
-#: ../src/applet.glade.h:53
-msgid "Speed:"
-msgstr ""
-
-#: ../src/applet.glade.h:54
+#: ../gnome/applet/applet.glade.h:48
 msgid "Subnet Mask:"
 msgstr "서브넷 마스크:"
 
-#: ../src/applet.glade.h:55
+#: ../gnome/applet/applet.glade.h:49
 msgid "Type:"
 msgstr "형식:"
 
-#: ../src/applet.glade.h:56
+#: ../gnome/applet/applet.glade.h:50
 msgid "User Name:"
 msgstr "사용자 이름:"
 
-#: ../src/applet.glade.h:57
+#: ../gnome/applet/applet.glade.h:51
 msgid "Wireless Network Key Required"
 msgstr "무선 네트워크 키가 필요합니다"
 
-#: ../src/applet.glade.h:58
+#: ../gnome/applet/applet.glade.h:52
 msgid "Wireless _adapter:"
 msgstr "무선 아답터(_A):"
 
-#: ../src/applet.glade.h:59
+#: ../gnome/applet/applet.glade.h:53
 msgid "_Always Trust this Wireless Network"
 msgstr "이 무선 네트워크 항상 신뢰(_A)"
 
-#: ../src/applet.glade.h:60
+#: ../gnome/applet/applet.glade.h:54
 msgid "_Don't remind me again"
 msgstr "다시 묻지 않음(_D)"
 
-#: ../src/applet.glade.h:61
+#: ../gnome/applet/applet.glade.h:55
 msgid "_Login to Network"
 msgstr "네트워크에 로그인(_L)"
 
-#: ../src/applet.glade.h:62
+#: ../gnome/applet/applet.glade.h:56
 msgid "_Network Name:"
 msgstr "네트워크 이름(_N):"
 
-#: ../src/applet.glade.h:63
+#: ../gnome/applet/applet.glade.h:57
 msgid "_Wireless Security:"
 msgstr "무선 보안(_W):"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:383
+#: ../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
 msgid "Cannot add VPN connection"
 msgstr "VPN 연결에 더할 수 없음"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:385
+#: ../gnome/vpn-properties/nm-vpn-properties.c:360
 msgid ""
 "No suitable VPN software was found on your system. Contact your system "
 "administrator."
 msgstr ""
 "시스템에 알맞는 VPN 소프트웨어가 없습니다. 시스템 관리자에게 알리기 바립니다."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:437
+#: ../gnome/vpn-properties/nm-vpn-properties.c:411
 msgid "Cannot import VPN connection"
 msgstr "VPN 연결 가져올 수 없음"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:439
+#: ../gnome/vpn-properties/nm-vpn-properties.c:413
 #, c-format
 msgid ""
 "Cannot find suitable software for VPN connection type '%s' to import the "
@@ -735,12 +736,12 @@ msgstr ""
 "파일 '%2$s'에서 VPN 연결 형식 '%1$s'(을)를 가져올 수 있는 적당한 소프트웨어"
 "가 없습니다. 시스템 관리자에게 알리기 바랍니다."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:579
+#: ../gnome/vpn-properties/nm-vpn-properties.c:553
 #, c-format
 msgid "Error retrieving VPN connection '%s'"
 msgstr "VPN 연결 '%s' 얻는데 오류"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:582
+#: ../gnome/vpn-properties/nm-vpn-properties.c:556
 #, c-format
 msgid ""
 "Could not find the UI files for VPN connection type '%s'. Contact your "
@@ -749,12 +750,12 @@ msgstr ""
 "VPN 연결 형식 '%s'에 대한 UI 파일을 찾을 수 없습니다. 시스템 관리자에게 알리"
 "기 바랍니다."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:739
+#: ../gnome/vpn-properties/nm-vpn-properties.c:713
 #, c-format
 msgid "Delete VPN connection \"%s\"?"
 msgstr "VPN 연결 \"%s\"(을)를 지우겠습니까?"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:742
+#: ../gnome/vpn-properties/nm-vpn-properties.c:716
 #, c-format
 msgid ""
 "All information about the VPN connection \"%s\" will be lost and you may "
@@ -764,16 +765,16 @@ msgstr ""
 "VPN 연결 \"%s\"에 대한 모든 정보를 버립니다. 그리고 시스템 관리자에게 새 연결"
 "에 대한 정보를 다시 얻어야 합니다."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:959
+#: ../gnome/vpn-properties/nm-vpn-properties.c:921
 msgid "Unable to load"
 msgstr "읽을 수 없음"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:961
+#: ../gnome/vpn-properties/nm-vpn-properties.c:923
 msgid "Cannot find some needed resources (the glade file)!"
 msgstr "필요한 몇몇 파일(glade 파일)을 찾을 수 없습니다!"
 
 #. Edit dialog
-#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1031
 msgid "Edit VPN Connection"
 msgstr "VPN 연결 편집"
 
@@ -846,11 +847,11 @@ msgstr ""
 msgid "VPN Connections"
 msgstr "VPN 연결"
 
-#: ../src/nm-ap-security-wep.c:52
+#: ../src/nm-ap-security-wep.c:47
 msgid "40-bit WEP"
 msgstr "40비트 WEP"
 
-#: ../src/nm-ap-security-wep.c:54
+#: ../src/nm-ap-security-wep.c:49
 msgid "104-bit WEP"
 msgstr "104비트 WEP"
 
@@ -878,7 +879,7 @@ msgstr "WAP2 CCMP"
 msgid "WPA2 Automatic"
 msgstr "WPA2 자동"
 
-#: ../src/nm-ap-security.c:320
+#: ../src/nm-ap-security.c:305
 msgid "none"
 msgstr "없음"
 
@@ -913,86 +914,3 @@ msgstr "너무 많은 데이터가 보내졌고 일부는 잃어버렸습니다"
 #: ../src/nm-netlink-monitor.c:735
 msgid "error occurred while waiting for data on socket"
 msgstr "소켓에서 데이터를 기다리는 동안 오류가 발생했습니다"
-
-#: ../src/applet-dbus-devices.c:898
-#, fuzzy, c-format
-msgid "You are now connected to the Ad-Hoc wireless network '%s'."
-msgstr "Ad-Hoc 무선 네트워크 연결됨"
-
-#: ../src/applet-dbus-devices.c:903
-#, fuzzy, c-format
-msgid "You are now connected to the wireless network '%s'."
-msgstr "무선 네트워크 '%s' 연결 끝내는 중..."
-
-#: ../src/applet-dbus-devices.c:910
-#, fuzzy
-msgid "You are now connected to the wired network."
-msgstr "유선 네트워크 연결 끝내는 중..."
-
-#: ../src/applet-dbus-devices.c:916
-msgid "Connection Established"
-msgstr ""
-
-#: ../src/applet-dbus-devices.c:959
-msgid "Disconnected"
-msgstr "연결 끊겼음"
-
-#: ../src/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/ku.po b/po/ku.po
new file mode 100644
index 00000000..8856c085
--- /dev/null
+++ b/po/ku.po
@@ -0,0 +1,904 @@
+# Kurdish translation for network-manager
+# Copyright (c) 2007 Rosetta Contributors and Canonical Ltd 2007
+# This file is distributed under the same license as the network-manager package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2007.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: network-manager\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2006-05-18 02:36+0000\n"
+"PO-Revision-Date: 2007-01-02 21:47+0000\n"
+"Last-Translator: Erdal Ronahi <erdal.ronahi@gmail.com>\n"
+"Language-Team: Kurdish <ku@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-Rosetta-Export-Date: 2007-01-03 01:08+0000\n"
+
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:923
+#, c-format
+msgid "Passphrase for wireless network %s"
+msgstr ""
+
+#: ../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 ""
+
+#: ../gnome/applet/applet.c:202
+msgid "Could not find some required resources (the glade file)!"
+msgstr ""
+
+#: ../gnome/applet/applet.c:213
+msgid "No active connections!"
+msgstr "Girêdanên çalak tune!"
+
+#: ../gnome/applet/applet.c:234
+#, c-format
+msgid "Wired Ethernet (%s)"
+msgstr ""
+
+#: ../gnome/applet/applet.c:236
+#, c-format
+msgid "Wireless Ethernet (%s)"
+msgstr ""
+
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:362
+msgid "NetworkManager Applet"
+msgstr "Sepanoka NetworkManager"
+
+#: ../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 ""
+"Notification area applet for managing your network devices and connections."
+msgstr ""
+
+#: ../gnome/applet/applet.c:343 ../gnome/applet/applet.c:370
+msgid "translator-credits"
+msgstr ""
+
+#: ../gnome/applet/applet.c:418
+msgid "Stop automatically running the networking applet?"
+msgstr ""
+
+#: ../gnome/applet/applet.c:419
+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 ""
+
+#: ../gnome/applet/applet.c:506
+msgid "VPN Login Failure"
+msgstr ""
+
+#: ../gnome/applet/applet.c:507
+#, c-format
+msgid "Could not start the VPN connection '%s' due to a login failure."
+msgstr ""
+
+#: ../gnome/applet/applet.c:511
+msgid "VPN Start Failure"
+msgstr ""
+
+#: ../gnome/applet/applet.c:512
+#, c-format
+msgid ""
+"Could not start the VPN connection '%s' due to a failure launching the VPN "
+"program."
+msgstr ""
+
+#: ../gnome/applet/applet.c:516 ../gnome/applet/applet.c:526
+msgid "VPN Connect Failure"
+msgstr ""
+
+#: ../gnome/applet/applet.c:517
+#, c-format
+msgid "Could not start the VPN connection '%s' due to a connection error."
+msgstr ""
+
+#: ../gnome/applet/applet.c:521
+msgid "VPN Configuration Error"
+msgstr ""
+
+#: ../gnome/applet/applet.c:522
+#, c-format
+msgid "The VPN connection '%s' was not correctly configured."
+msgstr ""
+
+#: ../gnome/applet/applet.c:527
+#, 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:597
+msgid "VPN Login Message"
+msgstr ""
+
+#: ../gnome/applet/applet.c:821 ../gnome/applet/applet.c:2593
+#: ../gnome/applet/other-network-dialog.c:453
+#: ../gnome/applet/passphrase-dialog.c:229
+msgid ""
+"The NetworkManager Applet could not find some required resources (the glade "
+"file was not found)."
+msgstr ""
+
+#: ../gnome/applet/applet.c:833
+#, c-format
+msgid "The network device \"%s (%s)\" does not support wireless scanning."
+msgstr ""
+
+#: ../gnome/applet/applet.c:841
+#, c-format
+msgid "The network device \"%s (%s)\" does not support link detection."
+msgstr ""
+
+#: ../gnome/applet/applet.c:988
+#, c-format
+msgid "Preparing device %s for the wired network..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:990
+#, c-format
+msgid "Preparing device %s for the wireless network '%s'..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:998
+#, c-format
+msgid "Configuring device %s for the wired network..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1000
+#, c-format
+msgid "Attempting to join the wireless network '%s'..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1008
+#, c-format
+msgid "Waiting for Network Key for the wireless network '%s'..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1016 ../gnome/applet/applet.c:1026
+msgid "Requesting a network address from the wired network..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1018 ../gnome/applet/applet.c:1028
+#, c-format
+msgid "Requesting a network address from the wireless network '%s'..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1036
+msgid "Finishing connection to the wired network..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1038
+#, c-format
+msgid "Finishing connection to the wireless network '%s'..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1155
+msgid "NetworkManager is not running"
+msgstr ""
+
+#: ../gnome/applet/applet.c:1163 ../gnome/applet/applet.c:1906
+msgid "Networking disabled"
+msgstr ""
+
+#: ../gnome/applet/applet.c:1168
+msgid "No network connection"
+msgstr "Girêdana torê tune"
+
+#: ../gnome/applet/applet.c:1173
+msgid "Wired network connection"
+msgstr "Girêdana torê ya biqablo"
+
+#: ../gnome/applet/applet.c:1177
+msgid "Connected to an Ad-Hoc wireless network"
+msgstr ""
+
+#: ../gnome/applet/applet.c:1179
+#, c-format
+msgid "Wireless network connection to '%s' (%d%%)"
+msgstr ""
+
+#: ../gnome/applet/applet.c:1200
+#, c-format
+msgid "VPN connection to '%s'"
+msgstr ""
+
+#: ../gnome/applet/applet.c:1208
+#, c-format
+msgid "VPN connecting to '%s'"
+msgstr ""
+
+#: ../gnome/applet/applet.c:1621
+msgid "_Connect to Other Wireless Network..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1642
+msgid "Create _New Wireless Network..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1763
+msgid "_VPN Connections"
+msgstr ""
+
+#: ../gnome/applet/applet.c:1808
+msgid "_Configure VPN..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1812
+msgid "_Disconnect VPN..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1834
+msgid "_Dial Up Connections"
+msgstr ""
+
+#: ../gnome/applet/applet.c:1845
+#, c-format
+msgid "Connect to %s..."
+msgstr "Bi %s re girêbide..."
+
+#: ../gnome/applet/applet.c:1851
+#, c-format
+msgid "Disconnect from %s..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:1900
+msgid "No network devices have been found"
+msgstr ""
+
+#: ../gnome/applet/applet.c:2092
+msgid "NetworkManager is not running..."
+msgstr ""
+
+#: ../gnome/applet/applet.c:2248
+msgid "Enable _Networking"
+msgstr "_Torê Çalak bike"
+
+#: ../gnome/applet/applet.c:2254
+msgid "Enable _Wireless"
+msgstr "_Bêqablo Çalak bike"
+
+#: ../gnome/applet/applet.c:2260
+msgid "Connection _Information"
+msgstr "_Agahiya Girêdanê"
+
+#: ../gnome/applet/applet.c:2271
+msgid "_Help"
+msgstr "_Alîkarî"
+
+#: ../gnome/applet/applet.c:2280
+msgid "_About"
+msgstr "_Der barê de"
+
+#: ../gnome/applet/applet.c:2287
+msgid "_Remove"
+msgstr "_Rake"
+
+#: ../gnome/applet/applet.c:2712
+msgid ""
+"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 "Pergalê Vekirî"
+
+#: ../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 "Tune"
+
+#: ../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 ""
+
+#: ../gnome/applet/eggtrayicon.c:135
+msgid "The orientation of the tray."
+msgstr ""
+
+#: ../gnome/applet/menu-items.c:87
+#, c-format
+msgid "Wired Network (%s)"
+msgstr "Tora Biqablo (%s)"
+
+#: ../gnome/applet/menu-items.c:90
+msgid "_Wired Network"
+msgstr "Tora Bi_qablo"
+
+#: ../gnome/applet/menu-items.c:161
+#, c-format
+msgid "Wireless Network (%s)"
+msgid_plural "Wireless Networks (%s)"
+msgstr[0] "Tora Bêqablo (%s)"
+msgstr[1] "Torên Bêqablo (%s)"
+
+#: ../gnome/applet/menu-items.c:163
+msgid "Wireless Network"
+msgid_plural "Wireless Networks"
+msgstr[0] "Tora Bêqablo (%s)"
+msgstr[1] "Torên Bêqablo (%s)"
+
+#: ../gnome/applet/menu-items.c:330
+msgid " (invalid Unicode)"
+msgstr " (Unicode a nederbasdar)"
+
+#: ../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
+msgid "Create New Wireless Network"
+msgstr ""
+
+#: ../gnome/applet/other-network-dialog.c:368
+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
+msgid "Connect to Other Wireless Network"
+msgstr ""
+
+#: ../gnome/applet/passphrase-dialog.c:216
+msgid "Error connecting to wireless network"
+msgstr ""
+
+#: ../gnome/applet/passphrase-dialog.c:217
+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
+#, c-format
+msgid "Cannot start VPN connection '%s'"
+msgstr ""
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../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
+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 "_Girêbide"
+
+#: ../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 "Ajoger:"
+
+#: ../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 "Navnîşana IP:"
+
+#: ../gnome/applet/applet.glade.h:28
+msgid "Identity:"
+msgstr "Nasname:"
+
+#: ../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
+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
+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 ""
+
+#: ../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 ""
+
+#: ../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:361
+msgid "Cannot add VPN connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:363
+msgid ""
+"No suitable VPN software was found on your system. Contact your system "
+"administrator."
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:415
+msgid "Cannot import VPN connection"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:417
+#, 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:557
+#, c-format
+msgid "Error retrieving VPN connection '%s'"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:560
+#, 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:717
+#, c-format
+msgid "Delete VPN connection \"%s\"?"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:720
+#, 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:928
+msgid "Unable to load"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:930
+msgid "Cannot find some needed resources (the glade file)!"
+msgstr ""
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1038
+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
+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
+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
+msgid "VPN Connections"
+msgstr ""
+
+#: ../src/nm-ap-security-wep.c:47
+msgid "40-bit WEP"
+msgstr ""
+
+#: ../src/nm-ap-security-wep.c:49
+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:897
+#, c-format
+msgid "You are now connected to the Ad-Hoc wireless network '%s'."
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:902
+#, c-format
+msgid "You are now connected to the wireless network '%s'."
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:909
+msgid "You are now connected to the wired network."
+msgstr ""
+
+#: ../gnome/applet/applet-dbus-devices.c:915
+msgid "Connection Established"
+msgstr "Girêdan Pêkhat"
+
+#: ../gnome/applet/applet-dbus-devices.c:958
+msgid "Disconnected"
+msgstr "Negirêdayî"
+
+#: ../gnome/applet/applet-dbus-devices.c:959
+msgid "The network connection has been disconnected."
+msgstr ""
\ No newline at end of file
diff --git a/po/lt.po b/po/lt.po
index bf1f8ff5..8f1907ec 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -8,84 +8,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-29 18:33+0200\n"
-"PO-Revision-Date: 2006-02-25 00:37+0200\n"
+"POT-Creation-Date: 2006-07-01 12:39+0300\n"
+"PO-Revision-Date: 2006-07-01 12:41+0300\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"
 
-#: ../src/applet-compat.c:171 ../src/applet-dbus-info.c:919
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:926
 #, c-format
 msgid "Passphrase for wireless network %s"
 msgstr "Bevielio tinklo „%s“ slaptažodis"
 
-#: ../src/applet-dbus.c:265
+#: ../gnome/applet/applet-dbus.c:383
 #, c-format
 msgid "Connection to the wireless network '%s' failed."
 msgstr "Nepavyko prisijungti prie bevielio tinklo „%s“."
 
-#: ../src/applet-dbus.c:270
+#: ../gnome/applet/applet-dbus.c:388
 msgid "Connection to the wired network failed."
 msgstr "Nepavyko prisijungti prie laidinio tinklo."
 
-#: ../src/applet.c:184
+#: ../gnome/applet/applet.c:184
 msgid "Error displaying connection information:"
 msgstr "Klaida rodant prisijungimo informaciją:"
 
-#: ../src/applet.c:202
+#: ../gnome/applet/applet.c:202
 msgid "Could not find some required resources (the glade file)!"
 msgstr "Nepavyko rasti kai kurių reikalingų resursų (glade rinkmenos)!"
 
-#: ../src/applet.c:213
+#: ../gnome/applet/applet.c:213
 msgid "No active connections!"
 msgstr "Nėra aktyvių prisijungimų!"
 
-#: ../src/applet.c:234
+#: ../gnome/applet/applet.c:234
 #, c-format
 msgid "Wired Ethernet (%s)"
 msgstr "Laidinis tinklas (%s)"
 
-#: ../src/applet.c:236
+#: ../gnome/applet/applet.c:236
 #, c-format
 msgid "Wireless Ethernet (%s)"
 msgstr "Bevielis tinklas (%s)"
 
-#: ../src/applet.c:337 ../src/applet.c:362
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:363
 msgid "NetworkManager Applet"
 msgstr "NetworkManager įtaisas"
 
-#: ../src/applet.c:339 ../src/applet.c:364
-msgid "Copyright © 2004-2005 Red Hat, Inc."
-msgstr "Autorinės teisės © 2004-2005 Red Hat, Inc."
+#: ../gnome/applet/applet.c:339
+msgid ""
+"Copyright © 2004-2006 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+msgstr ""
+"Autorinės teisės © 2004-2006 Red Hat, Inc.\n"
+"Autorinės teisės © 2005-2006 Novell, Inc."
 
-#: ../src/applet.c:340 ../src/applet.c:365
+#: ../gnome/applet/applet.c:341 ../gnome/applet/applet.c:367
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Pranešimų vietos įtaisas Jūsų tinklo įrenginių ir prisijungimų valdymui."
 
-#: ../src/applet.c:343 ../src/applet.c:370
+#: ../gnome/applet/applet.c:344 ../gnome/applet/applet.c:372
 msgid "translator-credits"
 msgstr "Žygimantas Beručka <zygis@gnome.org>"
 
-#: ../src/applet.c:426
+#: ../gnome/applet/applet.c:365
+msgid ""
+"Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+msgstr ""
+"Autorinės teisės © 2004-2005 Red Hat, Inc.\n"
+"Autorinės teisės © 2005-2006 Novell, Inc."
+
+#: ../gnome/applet/applet.c:428
 msgid "VPN Login Failure"
 msgstr "VPN prisijungimas nepavyko"
 
-#: ../src/applet.c:427
+#: ../gnome/applet/applet.c:429
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a login failure."
 msgstr "VPN prisijungimo „%s“ atverti nepavyko, nes nepavyko autentikuotis."
 
-#: ../src/applet.c:431
+#: ../gnome/applet/applet.c:433
 msgid "VPN Start Failure"
 msgstr "VPN atverti nepavyko"
 
-#: ../src/applet.c:432
+#: ../gnome/applet/applet.c:434
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
@@ -93,25 +104,25 @@ msgid ""
 msgstr ""
 "Nepavyko atverti VPN prisijungimo „%s“, nes nepavyko paleisti VPN programos."
 
-#: ../src/applet.c:436 ../src/applet.c:446
+#: ../gnome/applet/applet.c:438 ../gnome/applet/applet.c:448
 msgid "VPN Connect Failure"
 msgstr "VPN prisijungimo klaida"
 
-#: ../src/applet.c:437
+#: ../gnome/applet/applet.c:439
 #, 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."
 
-#: ../src/applet.c:441
+#: ../gnome/applet/applet.c:443
 msgid "VPN Configuration Error"
 msgstr "VPN konfigūracijos klaida"
 
-#: ../src/applet.c:442
+#: ../gnome/applet/applet.c:444
 #, c-format
 msgid "The VPN connection '%s' was not correctly configured."
 msgstr "VPN prisijungimas „%s“ buvo neteisingai sukonfigūruotas."
 
-#: ../src/applet.c:447
+#: ../gnome/applet/applet.c:449
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' because the VPN server did not "
@@ -120,13 +131,13 @@ msgstr ""
 "Nepavyko atverti VPN prisijungimo „%s“, nes VPN serveris negrąžino "
 "adekvačios tinklo konfigūracijos."
 
-#: ../src/applet.c:517
+#: ../gnome/applet/applet.c:519
 msgid "VPN Login Message"
 msgstr "VPN prisijungimo pranešimas"
 
-#: ../src/applet.c:741 ../src/applet.c:2508
-#: ../src/other-network-dialog.c:453
-#: ../src/passphrase-dialog.c:228
+#: ../gnome/applet/applet.c:743 ../gnome/applet/applet.c:2510
+#: ../gnome/applet/other-network-dialog.c:458
+#: ../gnome/applet/passphrase-dialog.c:228
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
@@ -134,163 +145,163 @@ msgstr ""
 "NetworkManager įtaisas nerado kai kurių reikalingų resursų (nerasta glade "
 "rinkmena)."
 
-#: ../src/applet.c:753
+#: ../gnome/applet/applet.c:755
 #, c-format
 msgid "The network device \"%s (%s)\" does not support wireless scanning."
 msgstr "Tinklinis įrenginys „%s (%s)“ nepalaiko bevielio skanavimo."
 
-#: ../src/applet.c:761
+#: ../gnome/applet/applet.c:763
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
 msgstr "Tinklinis įrenginys „%s (%s)“ nepalaiko saitų aptikimo."
 
-#: ../src/applet.c:908
+#: ../gnome/applet/applet.c:910
 #, c-format
 msgid "Preparing device %s for the wired network..."
 msgstr "Įrenginys %s ruošiamas laidiniam tinklui..."
 
-#: ../src/applet.c:910
+#: ../gnome/applet/applet.c:912
 #, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
 msgstr "Įrenginys %s ruošiamas bevieliam tinklui „%s“..."
 
-#: ../src/applet.c:918
+#: ../gnome/applet/applet.c:920
 #, c-format
 msgid "Configuring device %s for the wired network..."
 msgstr "Įrenginys %s konfigūruojamas laidiniam tinklui..."
 
-#: ../src/applet.c:920
+#: ../gnome/applet/applet.c:922
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
 msgstr "Bandoma prisijungti prie bevielio tinklo „%s“..."
 
-#: ../src/applet.c:928
+#: ../gnome/applet/applet.c:930
 #, c-format
 msgid "Waiting for Network Key for the wireless network '%s'..."
 msgstr "Bevielio tinklo „%s“ laukiama Tinklo rakto..."
 
-#: ../src/applet.c:936 ../src/applet.c:946
+#: ../gnome/applet/applet.c:938 ../gnome/applet/applet.c:948
 msgid "Requesting a network address from the wired network..."
 msgstr "Laidinio tinklo prašoma adreso tinkle..."
 
-#: ../src/applet.c:938 ../src/applet.c:948
+#: ../gnome/applet/applet.c:940 ../gnome/applet/applet.c:950
 #, c-format
 msgid "Requesting a network address from the wireless network '%s'..."
 msgstr "Bevielio tinklo „%s“ prašoma adreso tinkle..."
 
-#: ../src/applet.c:956
+#: ../gnome/applet/applet.c:958
 msgid "Finishing connection to the wired network..."
 msgstr "Užbaigiamas prisijungimas prie laidinio tinklo..."
 
-#: ../src/applet.c:958
+#: ../gnome/applet/applet.c:960
 #, c-format
 msgid "Finishing connection to the wireless network '%s'..."
 msgstr "Užbaigiamas prisijungimas prie bevielio tinklo „%s“..."
 
-#: ../src/applet.c:1075
+#: ../gnome/applet/applet.c:1077
 msgid "NetworkManager is not running"
 msgstr "NetworkManager nepaleistas"
 
-#: ../src/applet.c:1083 ../src/applet.c:1828
+#: ../gnome/applet/applet.c:1085 ../gnome/applet/applet.c:1830
 msgid "Networking disabled"
 msgstr "Tinklo sąsajos atjungtos"
 
-#: ../src/applet.c:1088
+#: ../gnome/applet/applet.c:1090
 msgid "No network connection"
 msgstr "Nėra tinklo prisijungimo"
 
-#: ../src/applet.c:1093
+#: ../gnome/applet/applet.c:1095
 msgid "Wired network connection"
 msgstr "Bevielis tinklo prisijungimas"
 
-#: ../src/applet.c:1097
+#: ../gnome/applet/applet.c:1099
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Prisijungti prie Ad-Hoc bevielio tinklo"
 
-#: ../src/applet.c:1099
+#: ../gnome/applet/applet.c:1101
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "Bevielio tinklo prisijungimas prie „%s“ (%d%%)"
 
-#: ../src/applet.c:1120
+#: ../gnome/applet/applet.c:1122
 #, c-format
 msgid "VPN connection to '%s'"
 msgstr "VPN prisijungimas prie „%s“"
 
-#: ../src/applet.c:1128
+#: ../gnome/applet/applet.c:1130
 #, c-format
 msgid "VPN connecting to '%s'"
 msgstr "VPN prisijungimas prie „%s“"
 
-#: ../src/applet.c:1541
+#: ../gnome/applet/applet.c:1543
 msgid "_Connect to Other Wireless Network..."
 msgstr "_Prisijungti prie kito bevielio tinklo..."
 
-#: ../src/applet.c:1562
+#: ../gnome/applet/applet.c:1564
 msgid "Create _New Wireless Network..."
 msgstr "Sukurti _naują bevielį tinklą..."
 
-#: ../src/applet.c:1685
+#: ../gnome/applet/applet.c:1687
 msgid "_VPN Connections"
 msgstr "_VPN prisijungimai"
 
-#: ../src/applet.c:1730
+#: ../gnome/applet/applet.c:1732
 msgid "_Configure VPN..."
 msgstr "_Konfigūruoti VPN..."
 
-#: ../src/applet.c:1734
+#: ../gnome/applet/applet.c:1736
 msgid "_Disconnect VPN..."
 msgstr "_Atjungti VPN..."
 
-#: ../src/applet.c:1756
+#: ../gnome/applet/applet.c:1758
 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
-#: ../src/applet.c:1767
+#: ../gnome/applet/applet.c:1769
 #, c-format
 msgid "Connect to %s..."
 msgstr "Prisijungti prie %s..."
 
-#: ../src/applet.c:1773
+#: ../gnome/applet/applet.c:1775
 #, c-format
 msgid "Disconnect from %s..."
 msgstr "Atsijungti nuo %s..."
 
-#: ../src/applet.c:1822
+#: ../gnome/applet/applet.c:1824
 msgid "No network devices have been found"
 msgstr "Nerasta tinklinių įrenginių"
 
-#: ../src/applet.c:2014
+#: ../gnome/applet/applet.c:2016
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager nepaleistas..."
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2170
+#: ../gnome/applet/applet.c:2172
 msgid "Enable _Networking"
 msgstr "Įjungti _tinklą"
 
 #. 'Enable Wireless' item
-#: ../src/applet.c:2176
+#: ../gnome/applet/applet.c:2178
 msgid "Enable _Wireless"
 msgstr "Įjungti _bevielį"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2182
+#: ../gnome/applet/applet.c:2184
 msgid "Connection _Information"
 msgstr "Prisijungimo _informacija"
 
 #. Help item
-#: ../src/applet.c:2193
+#: ../gnome/applet/applet.c:2195
 msgid "_Help"
-msgstr "_Pagalba"
+msgstr "_Žinynas"
 
 #. About item
-#: ../src/applet.c:2202
+#: ../gnome/applet/applet.c:2204
 msgid "_About"
 msgstr "_Apie"
 
-#: ../src/applet.c:2667
+#: ../gnome/applet/applet.c:2669
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
@@ -298,94 +309,94 @@ msgstr ""
 "NetworkManager įtaisas nerado kai kurių reikiamų resursų. Toliau tęsti "
 "nebegalima.\n"
 
-#: ../src/wireless-security-option.c:157
+#: ../gnome/applet/wireless-security-option.c:157
 msgid "Open System"
 msgstr "Atvira sistema"
 
-#: ../src/wireless-security-option.c:160
+#: ../gnome/applet/wireless-security-option.c:160
 msgid "Shared Key"
 msgstr "Viešas raktas"
 
-#: ../src/wireless-security-option.c:208
+#: ../gnome/applet/wireless-security-option.c:208
 msgid "Automatic (Default)"
 msgstr "Automatiškas (numatytasis)"
 
-#: ../src/wireless-security-option.c:215
+#: ../gnome/applet/wireless-security-option.c:215
 msgid "AES-CCMP"
 msgstr "AES-CCMP"
 
-#: ../src/wireless-security-option.c:223
+#: ../gnome/applet/wireless-security-option.c:223
 msgid "TKIP"
 msgstr "TKIP"
 
-#: ../src/wireless-security-option.c:231
+#: ../gnome/applet/wireless-security-option.c:231
 msgid "Dynamic WEP"
-msgstr ""
+msgstr "Dinaminis WEP"
 
-#: ../src/wso-none.c:53
+#: ../gnome/applet/wso-none.c:53
 msgid "None"
 msgstr "Nėra"
 
-#: ../src/wso-wep-ascii.c:138
+#: ../gnome/applet/wso-wep-ascii.c:138
 msgid "WEP 64/128-bit ASCII"
 msgstr "WEP 64/128 bitų ASCII"
 
-#: ../src/wso-wep-hex.c:135
+#: ../gnome/applet/wso-wep-hex.c:135
 msgid "WEP 64/128-bit Hex"
 msgstr "WEP 64/128 bitų Hex"
 
-#: ../src/wso-wep-passphrase.c:135
+#: ../gnome/applet/wso-wep-passphrase.c:135
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128 bitų slaptažodis"
 
-#: ../src/wso-wpa-eap.c:237
+#: ../gnome/applet/wso-wpa-eap.c:237
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../src/wso-wpa-eap.c:238
+#: ../gnome/applet/wso-wpa-eap.c:238
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wso-wpa-eap.c:239
+#: ../gnome/applet/wso-wpa-eap.c:239
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../src/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
-#: ../src/nm-ap-security-wpa-eap.c:116
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:93
+#: ../src/nm-ap-security-wpa-eap.c:117
 msgid "WPA2 Enterprise"
 msgstr "WPA2 industrinis"
 
-#: ../src/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
-#: ../src/nm-ap-security-wpa-eap.c:121
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:95
+#: ../src/nm-ap-security-wpa-eap.c:122
 msgid "WPA Enterprise"
 msgstr "WPA industrinis"
 
-#: ../src/wso-wpa-psk.c:178
+#: ../gnome/applet/wso-wpa-psk.c:178
 msgid "WPA2 Personal"
 msgstr "WPA2 asmeninis"
 
-#: ../src/wso-wpa-psk.c:180
+#: ../gnome/applet/wso-wpa-psk.c:180
 msgid "WPA Personal"
 msgstr "WPA asmeninis"
 
-#: ../src/eggtrayicon.c:134
+#: ../gnome/applet/eggtrayicon.c:134
 msgid "Orientation"
 msgstr "Orientacija"
 
-#: ../src/eggtrayicon.c:135
+#: ../gnome/applet/eggtrayicon.c:135
 msgid "The orientation of the tray."
 msgstr "Skydelio orientacija."
 
-#: ../src/menu-items.c:88
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Laidinis tinklas (%s)"
 
-#: ../src/menu-items.c:91
+#: ../gnome/applet/menu-items.c:91
 msgid "_Wired Network"
 msgstr "_Laidinis tinklas"
 
-#: ../src/menu-items.c:162
+#: ../gnome/applet/menu-items.c:162
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
@@ -393,18 +404,18 @@ msgstr[0] "Bevielis tinklas (%s)"
 msgstr[1] "Bevieliai tinklai (%s)"
 msgstr[2] "Bevielių tinklų (%s)"
 
-#: ../src/menu-items.c:164
+#: ../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ų"
 
-#: ../src/menu-items.c:343
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr " (netinkamas Unikodas)"
 
-#: ../src/other-network-dialog.c:352
+#: ../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, "
@@ -413,38 +424,38 @@ msgstr ""
 "Jei nenurodyta kitaip, bevielio tinklo pavadinimas yra nustatytas į Jūsų "
 "kompiuterio vardą, %s, šifravimas neįjungtas."
 
-#: ../src/other-network-dialog.c:358
+#: ../gnome/applet/other-network-dialog.c:358
 msgid "Create new wireless network"
 msgstr "Sukurti naują bevielį tinklą"
 
-#: ../src/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 ""
 "Įveskite norimo sukurti bevielio tinklo pavadinimą ir saugumo nustatymus."
 
-#: ../src/other-network-dialog.c:363
+#: ../gnome/applet/other-network-dialog.c:363
 msgid "Create New Wireless Network"
 msgstr "Sukurti naują bevielį tinklą"
 
-#: ../src/other-network-dialog.c:368
+#: ../gnome/applet/other-network-dialog.c:368
 msgid "Existing wireless network"
 msgstr "Esantis bevielis tinklas"
 
-#: ../src/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 "Įveskite bevielio tinklo, prie kurio norite jungtis, pavadinimą."
 
-#: ../src/other-network-dialog.c:371
+#: ../gnome/applet/other-network-dialog.c:371
 msgid "Connect to Other Wireless Network"
 msgstr "Prisijungti prie kito bevielio tinklo"
 
-#: ../src/passphrase-dialog.c:215
+#: ../gnome/applet/passphrase-dialog.c:215
 msgid "Error connecting to wireless network"
 msgstr "Klaida jungiantis prie bevielio tinklo"
 
-#: ../src/passphrase-dialog.c:216
+#: ../gnome/applet/passphrase-dialog.c:216
 msgid ""
 "The requested wireless network requires security capabilities unsupported by "
 "your hardware."
@@ -452,13 +463,13 @@ msgstr ""
 "Užklaustam bevieliui tinklui reikia saugumo ypatybių, kokių Jūsų aparatūra "
 "nepalaiko."
 
-#: ../src/vpn-password-dialog.c:151
-#: ../src/vpn-password-dialog.c:188
+#: ../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“"
 
-#: ../src/vpn-password-dialog.c:154
+#: ../gnome/applet/vpn-password-dialog.c:154
 #, c-format
 msgid ""
 "Could not find the authentication dialog for VPN connection type '%s'. "
@@ -467,7 +478,7 @@ msgstr ""
 "Nepavyko rasti autentikacijos dialogo VPN prisijungimo tipui „%s“. "
 "Susisiekite su savo sistemos administratoriumi."
 
-#: ../src/vpn-password-dialog.c:191
+#: ../gnome/applet/vpn-password-dialog.c:191
 #, c-format
 msgid ""
 "There was a problem launching the authentication dialog for VPN connection "
@@ -476,18 +487,18 @@ msgstr ""
 "Įvyko klaida paleidžiant autentikacijos dialogą VPN prisijungimo tipui „%s“. "
 "Susisiekite su savo sistemos administratoriumi."
 
-#: ../src/applet.glade.h:1
+#: ../gnome/applet/applet.glade.h:1
 msgid " "
 msgstr " "
 
-#: ../src/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\">Aktyvaus prisijungimo informacija</"
 "span>"
 
-#: ../src/applet.glade.h:4
+#: ../gnome/applet/applet.glade.h:4
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
@@ -502,7 +513,7 @@ msgstr ""
 "Norint prisijungti prie bevielio tinklo „%s“ reikalingas slaptažodis ar "
 "šifruotas raktas."
 
-#: ../src/applet.glade.h:8
+#: ../gnome/applet/applet.glade.h:8
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
@@ -514,7 +525,7 @@ msgstr ""
 "\n"
 "%s  Jo funkcionalumas bus ribotas."
 
-#: ../src/applet.glade.h:12
+#: ../gnome/applet/applet.glade.h:12
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
@@ -531,76 +542,75 @@ msgstr ""
 "kad šis bevielis tinklas saugus, spragtelėkite žemiau esantį žymimąjį "
 "langelį ir NetworkManager ateityje prisijungiant nereikalaus patvirtinimo."
 
-#: ../src/applet.glade.h:15
+#: ../gnome/applet/applet.glade.h:15
 msgid "Anonymous Identity:"
 msgstr "Anoniminė tapatybė:"
 
-#: ../src/applet.glade.h:16
+#: ../gnome/applet/applet.glade.h:16
 msgid "Authentication:"
 msgstr "Autentikacija:"
 
-#: ../src/applet.glade.h:17
+#: ../gnome/applet/applet.glade.h:17
 msgid "Broadcast Address:"
 msgstr "Transliacijos adresas:"
 
-#: ../src/applet.glade.h:18
+#: ../gnome/applet/applet.glade.h:18
 msgid "CA Certificate File:"
 msgstr "CA sertifikato rinkmena:"
 
-#: ../src/applet.glade.h:19
+#: ../gnome/applet/applet.glade.h:19
 msgid "C_onnect"
 msgstr "Prisi_jungti"
 
-#: ../src/applet.glade.h:20
+#: ../gnome/applet/applet.glade.h:20
 msgid "Client Certificate File:"
 msgstr "Kliento sertifikato rinkmena:"
 
-#: ../src/applet.glade.h:21
+#: ../gnome/applet/applet.glade.h:21
 msgid "Connection Information"
 msgstr "Prisijungimo informacija"
 
-#: ../src/applet.glade.h:22
+#: ../gnome/applet/applet.glade.h:22
 msgid "Default Route:"
 msgstr "Numatytasis maršrutas:"
 
-#: ../src/applet.glade.h:23
+#: ../gnome/applet/applet.glade.h:23
 msgid "Destination Address:"
 msgstr "Paskirties adresas:"
 
-#: ../src/applet.glade.h:24
+#: ../gnome/applet/applet.glade.h:24
 msgid "Driver:"
 msgstr "Tvarkyklė:"
 
-#: ../src/applet.glade.h:25
+#: ../gnome/applet/applet.glade.h:25
 msgid "EAP Method:"
 msgstr "EAP metodas:"
 
-#: ../src/applet.glade.h:26
+#: ../gnome/applet/applet.glade.h:26
 msgid "Hardware Address:"
 msgstr "Aparatinis adresas:"
 
-#: ../src/applet.glade.h:27
+#: ../gnome/applet/applet.glade.h:27
 msgid "IP Address:"
 msgstr "IP adresas:"
 
-#: ../src/applet.glade.h:28
+#: ../gnome/applet/applet.glade.h:28
 msgid "Identity:"
 msgstr "Tapatybė:"
 
-#: ../src/applet.glade.h:29
+#: ../gnome/applet/applet.glade.h:29
 msgid "Interface:"
 msgstr "Sąsaja:"
 
-#: ../src/applet.glade.h:30
-#, fuzzy
+#: ../gnome/applet/applet.glade.h:30
 msgid "Key Type:"
-msgstr "Tipas:"
+msgstr "Rakto tipas:"
 
-#: ../src/applet.glade.h:31
+#: ../gnome/applet/applet.glade.h:31
 msgid "Key:"
 msgstr "Raktas:"
 
-#: ../src/applet.glade.h:32
+#: ../gnome/applet/applet.glade.h:32
 msgid ""
 "None\n"
 "WEP 128-bit Passphrase\n"
@@ -612,7 +622,7 @@ msgstr ""
 "WEP 64/128 bitų Hex\n"
 "WEP 64/128 bitų ASCII\n"
 
-#: ../src/applet.glade.h:37
+#: ../gnome/applet/applet.glade.h:37
 msgid ""
 "Open System\n"
 "Shared Key"
@@ -620,103 +630,107 @@ msgstr ""
 "Atvira sistema\n"
 "Viešas raktas"
 
-#: ../src/applet.glade.h:39
+#: ../gnome/applet/applet.glade.h:39
 msgid "Other Wireless Network..."
 msgstr "Kitas bevielis tinklas..."
 
-#: ../src/applet.glade.h:40
+#: ../gnome/applet/applet.glade.h:40
 msgid "Passphrase:"
 msgstr "Slaptažodis:"
 
-#: ../src/applet.glade.h:41
+#: ../gnome/applet/applet.glade.h:41
 msgid "Password:"
 msgstr "Slaptažodis:"
 
-#: ../src/applet.glade.h:42
+#: ../gnome/applet/applet.glade.h:42
 msgid "Primary DNS:"
 msgstr "Pirminis DNS:"
 
-#: ../src/applet.glade.h:43
+#: ../gnome/applet/applet.glade.h:43
 msgid "Private Key File:"
 msgstr "Privataus rakto rinkmena:"
 
-#: ../src/applet.glade.h:44
+#: ../gnome/applet/applet.glade.h:44
 msgid "Private Key Password:"
 msgstr "Privataus rakto slaptažodis:"
 
-#: ../src/applet.glade.h:45
+#: ../gnome/applet/applet.glade.h:45
 msgid "Secondary DNS:"
 msgstr "Antrinis DNS:"
 
-#: ../src/applet.glade.h:46
+#: ../gnome/applet/applet.glade.h:46
 msgid "Select the CA Certificate File"
 msgstr "Pasirinkite CA sertifikato rinkmeną"
 
-#: ../src/applet.glade.h:47
+#: ../gnome/applet/applet.glade.h:47
 msgid "Select the Client Certificate File"
 msgstr "Pasirinkite Kliento sertifikato rinkmeną"
 
-#: ../src/applet.glade.h:48
+#: ../gnome/applet/applet.glade.h:48
 msgid "Select the Private Key File"
 msgstr "Pasirinkite privataus rakto rinkmeną"
 
-#: ../src/applet.glade.h:49
+#: ../gnome/applet/applet.glade.h:49
 msgid "Show key"
 msgstr "Rodyti raktą"
 
-#: ../src/applet.glade.h:50
+#: ../gnome/applet/applet.glade.h:50
 msgid "Show passphrase"
 msgstr "Rodyti slaptažodį"
 
-#: ../src/applet.glade.h:51
+#: ../gnome/applet/applet.glade.h:51
 msgid "Show password"
 msgstr "Rodyti slaptažodį"
 
-#: ../src/applet.glade.h:52
+#: ../gnome/applet/applet.glade.h:52
 msgid "Show passwords"
 msgstr "Rodyti slaptažodžius"
 
-#: ../src/applet.glade.h:53
+#: ../gnome/applet/applet.glade.h:53
 msgid "Speed:"
 msgstr "Greitis:"
 
-#: ../src/applet.glade.h:54
+#: ../gnome/applet/applet.glade.h:54
 msgid "Subnet Mask:"
 msgstr "Potinklio kaukė:"
 
-#: ../src/applet.glade.h:55
+#: ../gnome/applet/applet.glade.h:55
 msgid "Type:"
 msgstr "Tipas:"
 
-#: ../src/applet.glade.h:56
+#: ../gnome/applet/applet.glade.h:56
 msgid "User Name:"
 msgstr "Naudotojo vardas:"
 
-#: ../src/applet.glade.h:57
+#: ../gnome/applet/applet.glade.h:57
 msgid "Wireless Network Key Required"
 msgstr "Reikalingas bevielio tinklo raktas"
 
-#: ../src/applet.glade.h:58
+#: ../gnome/applet/applet.glade.h:58
 msgid "Wireless _adapter:"
 msgstr "Bevielis _adapteris:"
 
-#: ../src/applet.glade.h:59
+#: ../gnome/applet/applet.glade.h:59
 msgid "_Always Trust this Wireless Network"
 msgstr "_Visada pasitikėti šiuo bevieliu tinklu"
 
-#: ../src/applet.glade.h:60
+#: ../gnome/applet/applet.glade.h:60
 msgid "_Don't remind me again"
 msgstr "_Daugiau man nepriminti"
 
-#: ../src/applet.glade.h:61
+#: ../gnome/applet/applet.glade.h:61
+msgid "_Fallback on this Network"
+msgstr "_Kaip atsarginį variantą naudoti šį tinklą"
+
+#: ../gnome/applet/applet.glade.h:62
 msgid "_Login to Network"
 msgstr "_Prisijungi prie tinklo"
 
-#: ../src/applet.glade.h:62
+#: ../gnome/applet/applet.glade.h:63
 msgid "_Network Name:"
 msgstr "_Tinklo pavadinimas:"
 
-#: ../src/applet.glade.h:63
+#: ../gnome/applet/applet.glade.h:64
 msgid "_Wireless Security:"
 msgstr "_Bevielis saugumas:"
 
@@ -891,18 +905,18 @@ msgstr "WPA2 CCMP"
 msgid "WPA2 Automatic"
 msgstr "WPA2 automatiškas"
 
-#: ../src/nm-ap-security.c:320
+#: ../src/nm-ap-security.c:321
 msgid "none"
 msgstr "nėra"
 
-#: ../src/nm-netlink-monitor.c:154
+#: ../src/nm-netlink-monitor.c:170
 #, c-format
 msgid ""
 "unable to create netlink socket for monitoring wired ethernet devices - %s"
 msgstr ""
 "nepavyko suskurti netlink lizdo laidinių tinklo įrenginių stebėjimui - %s"
 
-#: ../src/nm-netlink-monitor.c:172
+#: ../src/nm-netlink-monitor.c:188
 #, c-format
 msgid ""
 "unable to bind to netlink socket for monitoring wired ethernet devices - %s"
@@ -910,106 +924,53 @@ msgstr ""
 "nepavyko susijungti su netlink lizdu laidinių tinklo įrenginių stebėjimui - %"
 "s"
 
-#: ../src/nm-netlink-monitor.c:405
+#: ../src/nm-netlink-monitor.c:425
 msgid "operation took too long"
 msgstr "operacija užtruko per ilgai"
 
-#: ../src/nm-netlink-monitor.c:502
+#: ../src/nm-netlink-monitor.c:522
 msgid "received data from wrong type of sender"
 msgstr "gauti duomenys iš neteisingo siuntėjo tipo"
 
-#: ../src/nm-netlink-monitor.c:515
+#: ../src/nm-netlink-monitor.c:535
 msgid "received data from unexpected sender"
 msgstr "gauti duomenys iš nesitikėto siuntėjo"
 
-#: ../src/nm-netlink-monitor.c:646
+#: ../src/nm-netlink-monitor.c:664
 msgid "too much data was sent over socket and some of it was lost"
 msgstr ""
 "lizdu buvo perduota per daug duomenų ir kai kurie duomenys buvo prarasti"
 
-#: ../src/nm-netlink-monitor.c:735
+#: ../src/nm-netlink-monitor.c:774
 msgid "error occurred while waiting for data on socket"
 msgstr "laukiant lizde duomenų įvyko klaida"
 
-#: ../src/applet-dbus-devices.c:898
+#: ../gnome/applet/applet-dbus-devices.c:922
 #, 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“."
 
-#: ../src/applet-dbus-devices.c:903
+#: ../gnome/applet/applet-dbus-devices.c:927
 #, c-format
 msgid "You are now connected to the wireless network '%s'."
 msgstr "Jūs dabar prisijungę prie bevielio tinklo „%s“."
 
-#: ../src/applet-dbus-devices.c:910
+#: ../gnome/applet/applet-dbus-devices.c:934
 msgid "You are now connected to the wired network."
 msgstr "Jūs dabar prisijungę prie laidinio tinklo."
 
-#: ../src/applet-dbus-devices.c:916
+#: ../gnome/applet/applet-dbus-devices.c:940
 msgid "Connection Established"
 msgstr "Prisijungta"
 
-#: ../src/applet-dbus-devices.c:959
+#: ../gnome/applet/applet-dbus-devices.c:983
 msgid "Disconnected"
 msgstr "Atjungta"
 
-#: ../src/applet-dbus-devices.c:960
+#: ../gnome/applet/applet-dbus-devices.c:984
 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?"
 
diff --git a/po/lv.po b/po/lv.po
new file mode 100644
index 00000000..96946a0f
--- /dev/null
+++ b/po/lv.po
@@ -0,0 +1,969 @@
+# translation of NetworkManager.HEAD2.po to Latvian
+# translation of NetworkManager.HEAD.po to Latvian
+# This file is distributed under the same license as the PACKAGE package.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
+# Raivis Dejus <orvils@gmail.com>, 2006.
+msgid ""
+msgstr ""
+"Project-Id-Version: NetworkManager.HEAD2\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-06-21 13:50+0300\n"
+"PO-Revision-Date: 2006-06-12 22:05+0300\n"
+"Last-Translator: Raivis Dejus <orvils@gmail.com>\n"
+"Language-Team: Latvian <locale@laka.lv>\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 != 0 ? 1 : "
+"2);\n"
+"X-Generator: KBabel 1.10.2\n"
+
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:926
+#, c-format
+msgid "Passphrase for wireless network %s"
+msgstr "Parole priekš bezvadu tīkla %s"
+
+#: ../gnome/applet/applet-dbus.c:383
+#, c-format
+msgid "Connection to the wireless network '%s' failed."
+msgstr "Pieslēgums bezvadu tīklam '%s' neizdevies."
+
+#: ../gnome/applet/applet-dbus.c:388
+msgid "Connection to the wired network failed."
+msgstr "Pieslēgums vadu tīklam neizdevies."
+
+#: ../gnome/applet/applet.c:184
+msgid "Error displaying connection information:"
+msgstr "Kļuda paziņojot pieslēguma informāciju:"
+
+#: ../gnome/applet/applet.c:202
+msgid "Could not find some required resources (the glade file)!"
+msgstr "Nevar atrast dažus pieprasījuma resursus (noras fails)!"
+
+#: ../gnome/applet/applet.c:213
+msgid "No active connections!"
+msgstr "Nav aktīvu sakaru!"
+
+#: ../gnome/applet/applet.c:234
+#, c-format
+msgid "Wired Ethernet (%s)"
+msgstr "Vadu tīkls ethernet (%s)"
+
+#: ../gnome/applet/applet.c:236
+#, c-format
+msgid "Wireless Ethernet (%s)"
+msgstr "Bezvadu tīks ethernet (%s)"
+
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:363
+msgid "NetworkManager Applet"
+msgstr "NetworkManager aplets"
+
+#: ../gnome/applet/applet.c:339
+msgid ""
+"Copyright © 2004-2006 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+msgstr ""
+"Copyright © 2004-2006 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+
+#: ../gnome/applet/applet.c:341 ../gnome/applet/applet.c:367
+msgid ""
+"Notification area applet for managing your network devices and connections."
+msgstr ""
+"Notifikācijas laukuma aplets priekš jūsus tīkla ierīču un savienojumu "
+"vadības."
+
+#: ../gnome/applet/applet.c:344 ../gnome/applet/applet.c:372
+msgid "translator-credits"
+msgstr "translator-atzīšana"
+
+#: ../gnome/applet/applet.c:365
+msgid ""
+"Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+msgstr ""
+"Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+
+#: ../gnome/applet/applet.c:428
+msgid "VPN Login Failure"
+msgstr "VPN litotājvārda kļūme"
+
+#: ../gnome/applet/applet.c:429
+#, c-format
+msgid "Could not start the VPN connection '%s' due to a login failure."
+msgstr "Nevar sākt VPN savienojumu '%s' litotājvārda kļūmes dēļ."
+
+#: ../gnome/applet/applet.c:433
+msgid "VPN Start Failure"
+msgstr "VPN sākšanas kļūme"
+
+#: ../gnome/applet/applet.c:434
+#, c-format
+msgid ""
+"Could not start the VPN connection '%s' due to a failure launching the VPN "
+"program."
+msgstr "Nevar sākt VPN savienojumu '%s' VPN startēšanās kļūdas dēļ."
+
+#: ../gnome/applet/applet.c:438 ../gnome/applet/applet.c:448
+msgid "VPN Connect Failure"
+msgstr "VPN savienojuma kļūme"
+
+#: ../gnome/applet/applet.c:439
+#, c-format
+msgid "Could not start the VPN connection '%s' due to a connection error."
+msgstr "Nevar sākt VPN savienojumu '%s' savienojuma kļūmes dēļ."
+
+#: ../gnome/applet/applet.c:443
+msgid "VPN Configuration Error"
+msgstr "VPN konfigrācijas kļūme"
+
+#: ../gnome/applet/applet.c:444
+#, c-format
+msgid "The VPN connection '%s' was not correctly configured."
+msgstr "VPN savienojums '%s' nebija korekti konfigurēts."
+
+#: ../gnome/applet/applet.c:449
+#, c-format
+msgid ""
+"Could not start the VPN connection '%s' because the VPN server did not "
+"return an adequate network configuration."
+msgstr ""
+"Nevar sākt VPN savienojumu '%s' tādēļ, ka VPN serveris neatgriezaadekvātu "
+"tīkla konfigurāciju."
+
+#: ../gnome/applet/applet.c:519
+msgid "VPN Login Message"
+msgstr "VPN litotājvārda ziņojums"
+
+#: ../gnome/applet/applet.c:743 ../gnome/applet/applet.c:2510
+#: ../gnome/applet/other-network-dialog.c:458
+#: ../gnome/applet/passphrase-dialog.c:228
+msgid ""
+"The NetworkManager Applet could not find some required resources (the glade "
+"file was not found)."
+msgstr ""
+"Tīkla administartora aplets nevarēja atrast dažus pieprasītos resursus "
+"(noras failsnetika atrasts)."
+
+#: ../gnome/applet/applet.c:755
+#, c-format
+msgid "The network device \"%s (%s)\" does not support wireless scanning."
+msgstr "Tīkla ierīce \"%s (%s)\" natbalsta bezvadu skanēšanu."
+
+#: ../gnome/applet/applet.c:763
+#, c-format
+msgid "The network device \"%s (%s)\" does not support link detection."
+msgstr "Tīkla ierīce \"%s (%s)\" natbalsta saites atklāšanu."
+
+#: ../gnome/applet/applet.c:910
+#, c-format
+msgid "Preparing device %s for the wired network..."
+msgstr "Ierīce %s tiek sagatavota priekš vadu tīkla..."
+
+#: ../gnome/applet/applet.c:912
+#, c-format
+msgid "Preparing device %s for the wireless network '%s'..."
+msgstr "Ierīce %s tiek sagatavota priekš bezvadu tīkla '%s'..."
+
+#: ../gnome/applet/applet.c:920
+#, c-format
+msgid "Configuring device %s for the wired network..."
+msgstr "Ierīce %s tiek konfigurēta vadu tīklam..."
+
+#: ../gnome/applet/applet.c:922
+#, c-format
+msgid "Attempting to join the wireless network '%s'..."
+msgstr "Mēģina pievienoties bezvadu tīklam '%s'..."
+
+#: ../gnome/applet/applet.c:930
+#, c-format
+msgid "Waiting for Network Key for the wireless network '%s'..."
+msgstr "Gaida tīla atslēgu priekš bezvadu tīla '%s'..."
+
+#: ../gnome/applet/applet.c:938 ../gnome/applet/applet.c:948
+msgid "Requesting a network address from the wired network..."
+msgstr "Tiek pieprasīta tīkla adrese priekš vadu tīkla..."
+
+#: ../gnome/applet/applet.c:940 ../gnome/applet/applet.c:950
+#, c-format
+msgid "Requesting a network address from the wireless network '%s'..."
+msgstr "Tiek pieprasīta tīkla adrese priekš bezvadu tīkla '%s'..."
+
+#: ../gnome/applet/applet.c:958
+msgid "Finishing connection to the wired network..."
+msgstr "Tiek pabeigta pieslēgšanās vadu tīklam..."
+
+#: ../gnome/applet/applet.c:960
+#, c-format
+msgid "Finishing connection to the wireless network '%s'..."
+msgstr "Tiek pabeigta pieslēgšanās bezvadu tīklam '%s'..."
+
+#: ../gnome/applet/applet.c:1077
+msgid "NetworkManager is not running"
+msgstr "Tīkla administrators nav palaists"
+
+#: ../gnome/applet/applet.c:1085 ../gnome/applet/applet.c:1830
+msgid "Networking disabled"
+msgstr "Tīklošana atslēgta"
+
+#: ../gnome/applet/applet.c:1090
+msgid "No network connection"
+msgstr "Nav tīla pieslēguma"
+
+#: ../gnome/applet/applet.c:1095
+msgid "Wired network connection"
+msgstr "Vadu tīkla pieslēgums"
+
+#: ../gnome/applet/applet.c:1099
+msgid "Connected to an Ad-Hoc wireless network"
+msgstr "Pieslēgs pie Ad-Hoc bezvadu tīkla"
+
+#: ../gnome/applet/applet.c:1101
+#, c-format
+msgid "Wireless network connection to '%s' (%d%%)"
+msgstr "Bezvadu tīkla pieslēgums pie '%s' (%d%%)"
+
+#: ../gnome/applet/applet.c:1122
+#, c-format
+msgid "VPN connection to '%s'"
+msgstr "VPN pieslēgums pie '%s'"
+
+#: ../gnome/applet/applet.c:1130
+#, c-format
+msgid "VPN connecting to '%s'"
+msgstr "VPN pieslēdzas pie '%s'"
+
+#: ../gnome/applet/applet.c:1543
+msgid "_Connect to Other Wireless Network..."
+msgstr "Pieslēgties _citam bezvadu tīlam..."
+
+#: ../gnome/applet/applet.c:1564
+msgid "Create _New Wireless Network..."
+msgstr "Izveidot jau_nu bezvadu tīklu..."
+
+#: ../gnome/applet/applet.c:1687
+msgid "_VPN Connections"
+msgstr "_VPN savienojumi"
+
+#: ../gnome/applet/applet.c:1732
+msgid "_Configure VPN..."
+msgstr "_Konfigurēt VPN..."
+
+#: ../gnome/applet/applet.c:1736
+msgid "_Disconnect VPN..."
+msgstr "_Atvienot VPN..."
+
+#: ../gnome/applet/applet.c:1758
+msgid "_Dial Up Connections"
+msgstr "Ie_zvanpieslēgums"
+
+#. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
+#: ../gnome/applet/applet.c:1769
+#, c-format
+msgid "Connect to %s..."
+msgstr "Pieslēgties pie %s..."
+
+#: ../gnome/applet/applet.c:1775
+#, c-format
+msgid "Disconnect from %s..."
+msgstr "Atvienoties no %s..."
+
+#: ../gnome/applet/applet.c:1824
+msgid "No network devices have been found"
+msgstr "Neviena tīkla ierīce netika atrasta"
+
+#: ../gnome/applet/applet.c:2016
+msgid "NetworkManager is not running..."
+msgstr "Tīkla administrators nav palaists..."
+
+#. 'Enable Networking' item
+#: ../gnome/applet/applet.c:2172
+msgid "Enable _Networking"
+msgstr "Aktivizēt _tīklu"
+
+#. 'Enable Wireless' item
+#: ../gnome/applet/applet.c:2178
+msgid "Enable _Wireless"
+msgstr "Aktivizēt _WiFi"
+
+#. 'Connection Information' item
+#: ../gnome/applet/applet.c:2184
+msgid "Connection _Information"
+msgstr "Pieslēguma _informācija"
+
+#. Help item
+#: ../gnome/applet/applet.c:2195
+msgid "_Help"
+msgstr "_Palīdzība"
+
+#. About item
+#: ../gnome/applet/applet.c:2204
+msgid "_About"
+msgstr "P_ar"
+
+#: ../gnome/applet/applet.c:2669
+msgid ""
+"The NetworkManager applet could not find some required resources.  It cannot "
+"continue.\n"
+msgstr ""
+"Tīkla administratora aplets nevarēja atrast dažus pieprasītos resursus. Tas "
+"nevar turpinat.\n"
+
+#: ../gnome/applet/wireless-security-option.c:157
+msgid "Open System"
+msgstr "Atvērt sistēmu"
+
+#: ../gnome/applet/wireless-security-option.c:160
+msgid "Shared Key"
+msgstr "Koplietošanas atslēga"
+
+#: ../gnome/applet/wireless-security-option.c:208
+msgid "Automatic (Default)"
+msgstr "Automātiski (noklusēti)"
+
+#: ../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 "Dinamiskais WEP"
+
+#: ../gnome/applet/wso-none.c:53
+msgid "None"
+msgstr "Nekas"
+
+#: ../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 Parole"
+
+#: ../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:93
+#: ../src/nm-ap-security-wpa-eap.c:117
+msgid "WPA2 Enterprise"
+msgstr "WPA2 Uzņēmums"
+
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:95
+#: ../src/nm-ap-security-wpa-eap.c:122
+msgid "WPA Enterprise"
+msgstr "WPA Uzņēmums"
+
+#: ../gnome/applet/wso-wpa-psk.c:178
+msgid "WPA2 Personal"
+msgstr "WPA2 Privāts"
+
+#: ../gnome/applet/wso-wpa-psk.c:180
+msgid "WPA Personal"
+msgstr "WPA Privāts"
+
+#: ../gnome/applet/eggtrayicon.c:134
+msgid "Orientation"
+msgstr "Orientācija"
+
+#: ../gnome/applet/eggtrayicon.c:135
+msgid "The orientation of the tray."
+msgstr "Paplātes orientācija."
+
+#: ../gnome/applet/menu-items.c:88
+#, c-format
+msgid "Wired Network (%s)"
+msgstr "Vadu tīkls (%s)"
+
+#: ../gnome/applet/menu-items.c:91
+msgid "_Wired Network"
+msgstr "_Vadu tīkls"
+
+#: ../gnome/applet/menu-items.c:162
+#, c-format
+msgid "Wireless Network (%s)"
+msgid_plural "Wireless Networks (%s)"
+msgstr[0] "Bezvadu tīkls (%s)"
+msgstr[1] "Bezvadu tīkli (%s)"
+msgstr[2] "Bezvadu tīklu (%s)"
+
+#: ../gnome/applet/menu-items.c:164
+msgid "Wireless Network"
+msgid_plural "Wireless Networks"
+msgstr[0] "Bezvadu tīkls"
+msgstr[1] "Bezvadu tīkli"
+msgstr[2] "Bezvadu tīklu"
+
+#: ../gnome/applet/menu-items.c:343
+msgid " (invalid Unicode)"
+msgstr " (nederīgs unikods)"
+
+#: ../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 ""
+"Noklusēti bezvadu tīkla nosaukums ir uzstādīts tāds, kā jūsu datora "
+"nosaukums %s bez sifrēšanas"
+
+#: ../gnome/applet/other-network-dialog.c:358
+msgid "Create new wireless network"
+msgstr "Izveidot jaunu bezvadu tīklu"
+
+#: ../gnome/applet/other-network-dialog.c:359
+msgid ""
+"Enter the name and security settings of the wireless network you wish to "
+"create."
+msgstr ""
+"Ievadiet nosaukumu un drošības uzstādījumus bezvadu tīklam, ko jūs vēlaties "
+"izveidot."
+
+#: ../gnome/applet/other-network-dialog.c:363
+msgid "Create New Wireless Network"
+msgstr "Radīt jaunu bezvadu tīklu"
+
+#: ../gnome/applet/other-network-dialog.c:368
+msgid "Existing wireless network"
+msgstr "Pastāvošs bezvadu tīkls"
+
+#: ../gnome/applet/other-network-dialog.c:369
+msgid "Enter the name of the wireless network to which you wish to connect."
+msgstr "Ievadiet nosaukumu tam bezvadu tīklam, kuram jūs vēlaties pieslēgties."
+
+#: ../gnome/applet/other-network-dialog.c:371
+msgid "Connect to Other Wireless Network"
+msgstr "Pieslēgties citam bezvadu tīklam"
+
+#: ../gnome/applet/passphrase-dialog.c:215
+msgid "Error connecting to wireless network"
+msgstr "Bezvadu tīkla savienojuma kļūda"
+
+#: ../gnome/applet/passphrase-dialog.c:216
+msgid ""
+"The requested wireless network requires security capabilities unsupported by "
+"your hardware."
+msgstr ""
+"Pieprasītais bezvadu tīkls pieprasa drošību, ko neatbalsta jūsu aparatūra."
+
+#: ../gnome/applet/vpn-password-dialog.c:151
+#: ../gnome/applet/vpn-password-dialog.c:188
+#, c-format
+msgid "Cannot start VPN connection '%s'"
+msgstr "Nevar sākt VPN savienojumu '%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 ""
+"Nevar atrast autentifikācijas dialogu priekš VPN savienojuma tipa '%s'. "
+"Sazinieties ar savu sistēmas administratoru."
+
+#: ../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 ""
+"Bija problēma startējot autentifikācijas dialogu priekš VPN savienojuma tipa "
+"'%s'. Sazinieties ar jūsu sistēmas administratoru."
+
+#: ../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\">Aktīvā savienojuma informācija</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\">Bezvadu tīkls pieprasa paroli</span>\n"
+"\n"
+"Parole vai šifrēšanas atslēga tiek piepraīta, lai piekļūtu bevadu tīlam '%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\">Atvieglota tīkla funkcionēšana</span>\n"
+"\n"
+"%s  Tas nebūs pilnīgi funkcionāli."
+
+#: ../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\">Bezvadu tīkla lietotājvārda "
+"apstiprināšana</span>\n"
+"\n"
+"Jūs esat izvēlējies pieslēgties šim bezvadu tīklam: '%s'. Ja jūs esat "
+"pārliecināts, ka šis bezvadu tīkls ir drošs, uzklikšķiniet blakus esošajā "
+"atzīmes rūtiņā un tīkla administrators neprasīs apstiprināšanu turpmāk "
+"piereģistrējoties."
+
+#: ../gnome/applet/applet.glade.h:15
+msgid "Anonymous Identity:"
+msgstr "Anonīma identitāte:"
+
+#: ../gnome/applet/applet.glade.h:16
+msgid "Authentication:"
+msgstr "Autentificēšana:"
+
+#: ../gnome/applet/applet.glade.h:17
+msgid "Broadcast Address:"
+msgstr "Apraides adrese:"
+
+#: ../gnome/applet/applet.glade.h:18
+msgid "CA Certificate File:"
+msgstr "CA setrifikāta fails:"
+
+#: ../gnome/applet/applet.glade.h:19
+msgid "C_onnect"
+msgstr "_Savienot"
+
+#: ../gnome/applet/applet.glade.h:20
+msgid "Client Certificate File:"
+msgstr "Klienta sertifikāta fails:"
+
+#: ../gnome/applet/applet.glade.h:21
+msgid "Connection Information"
+msgstr "Savienojuma informācija"
+
+#: ../gnome/applet/applet.glade.h:22
+msgid "Default Route:"
+msgstr "Noklusētais maršruts:"
+
+#: ../gnome/applet/applet.glade.h:23
+msgid "Destination Address:"
+msgstr "Saņēmēja adrese:"
+
+#: ../gnome/applet/applet.glade.h:24
+msgid "Driver:"
+msgstr "Draiveris:"
+
+#: ../gnome/applet/applet.glade.h:25
+msgid "EAP Method:"
+msgstr "EAP metode:"
+
+#: ../gnome/applet/applet.glade.h:26
+msgid "Hardware Address:"
+msgstr "Aparatūras adrese:"
+
+#: ../gnome/applet/applet.glade.h:27
+msgid "IP Address:"
+msgstr "IP adrese:"
+
+#: ../gnome/applet/applet.glade.h:28
+msgid "Identity:"
+msgstr "Identitāte:"
+
+#: ../gnome/applet/applet.glade.h:29
+msgid "Interface:"
+msgstr "Saskarne:"
+
+#: ../gnome/applet/applet.glade.h:30
+msgid "Key Type:"
+msgstr "Atslēgas tips:"
+
+#: ../gnome/applet/applet.glade.h:31
+msgid "Key:"
+msgstr "Atslēga:"
+
+#: ../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 ""
+"Neviens\n"
+"WEP 128-bit Parole\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 ""
+"Atvērt sistēmu\n"
+"Koplietojamā atslēga"
+
+#: ../gnome/applet/applet.glade.h:39
+msgid "Other Wireless Network..."
+msgstr "Cits bezvadu tīkls..."
+
+#: ../gnome/applet/applet.glade.h:40
+msgid "Passphrase:"
+msgstr "Parole:"
+
+#: ../gnome/applet/applet.glade.h:41
+msgid "Password:"
+msgstr "Parole:"
+
+#: ../gnome/applet/applet.glade.h:42
+msgid "Primary DNS:"
+msgstr "Primārais DNS:"
+
+#: ../gnome/applet/applet.glade.h:43
+msgid "Private Key File:"
+msgstr "Privātās atslēgas fails:"
+
+#: ../gnome/applet/applet.glade.h:44
+msgid "Private Key Password:"
+msgstr "Privātās atslēgas parole:"
+
+#: ../gnome/applet/applet.glade.h:45
+msgid "Secondary DNS:"
+msgstr "Sekundārais DNS:"
+
+#: ../gnome/applet/applet.glade.h:46
+msgid "Select the CA Certificate File"
+msgstr "Izvēlieties CA sertifikāta failu"
+
+#: ../gnome/applet/applet.glade.h:47
+msgid "Select the Client Certificate File"
+msgstr "Izvēlieties klienta sertifikāta failu"
+
+#: ../gnome/applet/applet.glade.h:48
+msgid "Select the Private Key File"
+msgstr "Izvēlieties privātās atslēgas failu"
+
+#: ../gnome/applet/applet.glade.h:49
+msgid "Show key"
+msgstr "Rādīt atslēgu"
+
+#: ../gnome/applet/applet.glade.h:50
+msgid "Show passphrase"
+msgstr "Rādīt paroli"
+
+#: ../gnome/applet/applet.glade.h:51
+msgid "Show password"
+msgstr "Rādīt paroli"
+
+#: ../gnome/applet/applet.glade.h:52
+msgid "Show passwords"
+msgstr "Rādīt paroles"
+
+#: ../gnome/applet/applet.glade.h:53
+msgid "Speed:"
+msgstr "Ātrums:"
+
+#: ../gnome/applet/applet.glade.h:54
+msgid "Subnet Mask:"
+msgstr "Apakštīkla mask:"
+
+#: ../gnome/applet/applet.glade.h:55
+msgid "Type:"
+msgstr "Tips:"
+
+#: ../gnome/applet/applet.glade.h:56
+msgid "User Name:"
+msgstr "Lietotāja vārds:"
+
+#: ../gnome/applet/applet.glade.h:57
+msgid "Wireless Network Key Required"
+msgstr "Tiek pieprasīta bezvadu tīkla atslēga"
+
+#: ../gnome/applet/applet.glade.h:58
+msgid "Wireless _adapter:"
+msgstr "Bezvadu _adapteris:"
+
+#: ../gnome/applet/applet.glade.h:59
+msgid "_Always Trust this Wireless Network"
+msgstr "_Vienmēr uzticēties šim bezvadu tīlaam"
+
+#: ../gnome/applet/applet.glade.h:60
+msgid "_Don't remind me again"
+msgstr "Neatgā_dināt vairs"
+
+#: ../gnome/applet/applet.glade.h:61
+msgid "_Fallback on this Network"
+msgstr "Šī tīkla atkāpe (_Fallback)"
+
+#: ../gnome/applet/applet.glade.h:62
+msgid "_Login to Network"
+msgstr "Pies_lēgties tīklam"
+
+#: ../gnome/applet/applet.glade.h:63
+msgid "_Network Name:"
+msgstr "_Tīkla nosaukums:"
+
+#: ../gnome/applet/applet.glade.h:64
+msgid "_Wireless Security:"
+msgstr "Bez_vadu drošība:"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:383
+msgid "Cannot add VPN connection"
+msgstr "Nevar pievienot VPN savienojumu"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:385
+msgid ""
+"No suitable VPN software was found on your system. Contact your system "
+"administrator."
+msgstr ""
+"Jūsu sistēmā netika atrasta piemērota VPN programmatūra. Sazinieties ar savu "
+"sistēmadministaratoru."
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:437
+msgid "Cannot import VPN connection"
+msgstr "Nevar importēt VPN savienojumu"
+
+#: ../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 ""
+"Nevar atrast piemērotu programmatūru priekš VPN savienojuma tipa'%s'lai "
+"importētu failu '%s'. sazinieties ar savu sistēmadministratoru."
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:579
+#, c-format
+msgid "Error retrieving VPN connection '%s'"
+msgstr "Kļūda atgūstot VPN savienojumu '%s'"
+
+#: ../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 ""
+"Nevar atrast UI failus priekš VPN savienojuma tipa'%s'. Sazinieties ar savu "
+"sistēmadministratoru."
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:739
+#, c-format
+msgid "Delete VPN connection \"%s\"?"
+msgstr "Izdzēst VPN savienojumu \"%s\"?"
+
+#: ../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 ""
+"Visa informācija par VPN savienojumu \"%s\" tiks pazaudēta un jums būs "
+"nepieciešams jūsusistēmas administrators, lai sagādātu informāciju, lai "
+"radītu jaunu savienojumu."
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:959
+msgid "Unable to load"
+msgstr "Nevar ielādēt"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:961
+msgid "Cannot find some needed resources (the glade file)!"
+msgstr "Nevar atrast dažus vajadzīgos resursus (noras fails)!"
+
+#. Edit dialog
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
+msgid "Edit VPN Connection"
+msgstr "Rediģēt VPN savienojumu"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:1
+msgid "Add a new VPN connection"
+msgstr "Pievienot jaunu VPN savienojumu"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:2
+msgid "Choose which type of VPN connection you wish to create."
+msgstr "Izvēlieties kuru VPN savienojuma tipu jūs vēlaties radīt."
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
+msgid "Connect to:"
+msgstr "Svienot ar:"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
+msgid "Create VPN Connection"
+msgstr "Izveidot VPN savienojumu"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
+msgid "Create VPN Connection - 1 of 2"
+msgstr "Izveidot VPN savienojumu -1 no 2"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
+msgid "Create VPN Connection - 2 of 2"
+msgstr "Izveidot VPN savienojumu -2 no 2"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
+msgid "Delete the selected VPN connection"
+msgstr "Izdzēst izvēlēto VPN savienojumu"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
+msgid "E_xport"
+msgstr "E_ksportēt"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:9
+msgid "Edit the selected VPN connection"
+msgstr "Rediģēt izvēlēto VPN savienojumu"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:10
+msgid "Export the VPN settings to a file"
+msgstr "Eksportēt VPN uzstādījumus uz failu"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:11
+msgid "Export the selected VPN connection to a file"
+msgstr "Eksportēt izvēlēto VPN savienojumu uz failu"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:12
+msgid "Finish Creating VPN Connection"
+msgstr "Pabeigt veidot VPN savienojumu"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:13
+msgid "Manage Virtual Private Network Connections"
+msgstr "Pārvaldīt virtuālo privāto tīklu savienojumus"
+
+#: ../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 ""
+"Šis asistents iepazīstinās jūs ar Virtuālā Privātā Tīkla (VPN) savienojuma "
+"radīšanu.\n"
+"\n"
+"Tas pieprasīs mazliet informācijas, tādu kā IP adresi un noslēpumus.  Lūdzu "
+"vaicājiet savam sistēmadministratoram, lai iegūtu šo informāciju."
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:17
+msgid "VPN Connections"
+msgstr "VPN savienojumi"
+
+#: ../src/nm-ap-security-wep.c:52
+msgid "40-bit WEP"
+msgstr "40-bitu WEP"
+
+#: ../src/nm-ap-security-wep.c:54
+msgid "104-bit WEP"
+msgstr "104-bitu 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 automātiskais"
+
+#: ../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 automātiskais"
+
+#: ../src/nm-ap-security.c:321
+msgid "none"
+msgstr "neviens"
+
+#: ../src/nm-netlink-monitor.c:170
+#, c-format
+msgid ""
+"unable to create netlink socket for monitoring wired ethernet devices - %s"
+msgstr ""
+"Nespēj radīt tīla saites ligzdu priekš cietsavienojuma tīkla ethernet "
+"ierīces - %s monitoringa"
+
+#: ../src/nm-netlink-monitor.c:188
+#, c-format
+msgid ""
+"unable to bind to netlink socket for monitoring wired ethernet devices - %s"
+msgstr ""
+"Nespēj piesaistīties pie tīkla saites ligzdas priekš cietsavienojuma tīkla "
+"ethernet ierīces - %s monitoringa"
+
+#: ../src/nm-netlink-monitor.c:425
+msgid "operation took too long"
+msgstr "Operācija rit pārāk ilgi"
+
+#: ../src/nm-netlink-monitor.c:522
+msgid "received data from wrong type of sender"
+msgstr "saņemti dati no nepareiza tipa sūtītāja"
+
+#: ../src/nm-netlink-monitor.c:535
+msgid "received data from unexpected sender"
+msgstr "saņemti dati no negaidīta sūtītāja"
+
+#: ../src/nm-netlink-monitor.c:664
+msgid "too much data was sent over socket and some of it was lost"
+msgstr "Pārāk daudzi dati tika sūtīti caur ligzdu un daži tika pazaudēti"
+
+#: ../src/nm-netlink-monitor.c:774
+msgid "error occurred while waiting for data on socket"
+msgstr "Gaidot datus caur ligzdu, ieviesusies kļūda"
+
+#: ../gnome/applet/applet-dbus-devices.c:922
+#, c-format
+msgid "You are now connected to the Ad-Hoc wireless network '%s'."
+msgstr "Jūs esat savienots ar Ad-Hoc bezvadu tīlu '%s'."
+
+#: ../gnome/applet/applet-dbus-devices.c:927
+#, c-format
+msgid "You are now connected to the wireless network '%s'."
+msgstr "Jūs esat savienots ar bezvadu tīlu '%s'."
+
+#: ../gnome/applet/applet-dbus-devices.c:934
+msgid "You are now connected to the wired network."
+msgstr "Jūs esat savienots ar cietsavienojuma tīlu."
+
+#: ../gnome/applet/applet-dbus-devices.c:940
+msgid "Connection Established"
+msgstr "Savienojums ir ieviesies"
+
+#: ../gnome/applet/applet-dbus-devices.c:983
+msgid "Disconnected"
+msgstr "Atslēgts"
+
+#: ../gnome/applet/applet-dbus-devices.c:984
+msgid "The network connection has been disconnected."
+msgstr "Tīkla savienojums ir ticis atslēgts."
diff --git a/po/mk.po b/po/mk.po
index c3233351..0d6c6e2b 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -1,95 +1,106 @@
+# translation of mk.po to Macedonian
 # translation of mk.po.
 # Copyright (C) 2005 THE mk.po'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the mk.po package.
+#
 # Арангел Ангов <ufo@linux.net.mk>, 2005.
-# , fuzzy
 # <>, 2005.
-# Арангел Ангов <ufo@linux.net.mk>, 2005.
-# 
-# 
+# Jovan Naumovski <jovan@lugola.net>, 2006.
+# Arangel Angov <ufo@linux.net.mk>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: mk.po\n"
+"Project-Id-Version: mk\n"
 "Report-Msgid-Bugs-To: \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"
+"POT-Creation-Date: 2006-08-12 04:55+0200\n"
+"PO-Revision-Date: 2006-08-12 13:09+0200\n"
+"Last-Translator: Arangel Angov <ufo@linux.net.mk>\n"
+"Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural= n==1 || n%10==1 ? 0 : 1\n"
+"X-Generator: KBabel 1.11.2\n"
 
-#: ../src/applet-compat.c:171 ../src/applet-dbus-info.c:919
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:926
 #, c-format
 msgid "Passphrase for wireless network %s"
 msgstr "Фразата за лозинка за безжичната мрежа %s"
 
-#: ../src/applet-dbus.c:265
+#: ../gnome/applet/applet-dbus.c:265
 #, c-format
 msgid "Connection to the wireless network '%s' failed."
 msgstr "Поврзувањето со безжичната мрежа '%s' не успеа."
 
-#: ../src/applet-dbus.c:270
+#: ../gnome/applet/applet-dbus.c:270
 msgid "Connection to the wired network failed."
 msgstr "Поврзувањето со жичената мрежа не успеа."
 
-#: ../src/applet.c:184
+#: ../gnome/applet/applet.c:184
 msgid "Error displaying connection information:"
 msgstr "Грешка во прикажувањето на информациите за поврзувањето:"
 
-#: ../src/applet.c:202
+#: ../gnome/applet/applet.c:202
 msgid "Could not find some required resources (the glade file)!"
 msgstr ""
 "Аплетот за „Менаџерот за мрежа“ не може да најде некои од потребните ресурси "
 "(не е пронајдена glade датотеката)!"
 
-#: ../src/applet.c:213
+#: ../gnome/applet/applet.c:213
 msgid "No active connections!"
 msgstr "Нема активни поврзувања!"
 
-#: ../src/applet.c:234
+#: ../gnome/applet/applet.c:234
 #, c-format
 msgid "Wired Ethernet (%s)"
 msgstr "Жичена етернет мрежа (%s)"
 
-#: ../src/applet.c:236
+#: ../gnome/applet/applet.c:236
 #, c-format
 msgid "Wireless Ethernet (%s)"
 msgstr "Безжична етернет мрежа (%s)"
 
-#: ../src/applet.c:337 ../src/applet.c:362
+#: ../gnome/applet/applet.c:332 ../gnome/applet/applet.c:358
 msgid "NetworkManager Applet"
 msgstr "Аплет за менаџирање со мрежи"
 
-#: ../src/applet.c:339 ../src/applet.c:364
-msgid "Copyright © 2004-2005 Red Hat, Inc."
-msgstr "Copyright © 2004-2005 Red Hat, Inc."
-
-#: ../src/applet.c:340 ../src/applet.c:365
+#: ../gnome/applet/applet.c:334
 msgid ""
-"Notification area applet for managing your network devices and connections."
+"Copyright © 2004-2006 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
 msgstr ""
-"Аплет во местото за известување за менаџирање на мрежните уреди и поврзувања."
+"Copyright © 2004-2006 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
 
-#: ../src/applet.c:343 ../src/applet.c:370
+#: ../gnome/applet/applet.c:336 ../gnome/applet/applet.c:362
+msgid "Notification area applet for managing your network devices and connections."
+msgstr "Аплет во местото за известување за менаџирање на мрежните уреди и поврзувања."
+
+#: ../gnome/applet/applet.c:339 ../gnome/applet/applet.c:366
 msgid "translator-credits"
 msgstr "Јован Наумовски"
 
-#: ../src/applet.c:426
+#: ../gnome/applet/applet.c:360
+msgid ""
+"Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+msgstr ""
+"Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+
+#: ../gnome/applet/applet.c:422
 msgid "VPN Login Failure"
 msgstr "VPN најавата не успеа"
 
-#: ../src/applet.c:427
+#: ../gnome/applet/applet.c:423
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a login failure."
-msgstr ""
-"Не можам да го стартувам VPN поврзувањето '%s' заради грешка во најавувањето."
+msgstr "Не можам да го стартувам VPN поврзувањето '%s' заради грешка во најавувањето."
 
-#: ../src/applet.c:431
+#: ../gnome/applet/applet.c:427
 msgid "VPN Start Failure"
 msgstr "Стартувањето на VPN не успеа"
 
-#: ../src/applet.c:432
+#: ../gnome/applet/applet.c:428
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
@@ -98,26 +109,25 @@ msgstr ""
 "Не можам да го стартувам VPN поврзувањето '%s'  поради грешка во подигањето "
 "на VPN програмата."
 
-#: ../src/applet.c:436 ../src/applet.c:446
+#: ../gnome/applet/applet.c:432 ../gnome/applet/applet.c:442
 msgid "VPN Connect Failure"
 msgstr "Грешка во VPN поврзувањето"
 
-#: ../src/applet.c:437
+#: ../gnome/applet/applet.c:433
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a connection error."
-msgstr ""
-"Не можам да го стартувам VPN поврзувањето '%s' поради грешка во поврзувањето."
+msgstr "Не можам да го стартувам VPN поврзувањето '%s' поради грешка во поврзувањето."
 
-#: ../src/applet.c:441
+#: ../gnome/applet/applet.c:437
 msgid "VPN Configuration Error"
 msgstr "Грешка во VPN конфигурирањето"
 
-#: ../src/applet.c:442
+#: ../gnome/applet/applet.c:438
 #, c-format
 msgid "The VPN connection '%s' was not correctly configured."
 msgstr "VPN поврзувањето '%s' беше неправилно конфигурирано."
 
-#: ../src/applet.c:447
+#: ../gnome/applet/applet.c:443
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' because the VPN server did not "
@@ -126,13 +136,13 @@ msgstr ""
 "Не можам да го стартувам VPN поврзувањето '%s' бидејќи VPN серверот не врати "
 "адекватна мрежна конфигурација."
 
-#: ../src/applet.c:517
+#: ../gnome/applet/applet.c:513
 msgid "VPN Login Message"
 msgstr "VPN најавна порака"
 
-#: ../src/applet.c:741 ../src/applet.c:2508
-#: ../src/other-network-dialog.c:453
-#: ../src/passphrase-dialog.c:228
+#: ../gnome/applet/applet.c:737 ../gnome/applet/applet.c:2507
+#: ../gnome/applet/other-network-dialog.c:458
+#: ../gnome/applet/passphrase-dialog.c:228
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
@@ -140,163 +150,163 @@ msgstr ""
 "Аплетот за „Менаџерот за мрежа“ не може да најде некои од потребните ресурси "
 "(не е пронајдена glade датотеката)."
 
-#: ../src/applet.c:753
+#: ../gnome/applet/applet.c:749
 #, c-format
 msgid "The network device \"%s (%s)\" does not support wireless scanning."
 msgstr "Мрежниот уред \"%s (%s)\" не поддржува безжично скенирање."
 
-#: ../src/applet.c:761
+#: ../gnome/applet/applet.c:757
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
 msgstr "Мрежниот уред \"%s (%s)\" не поддржува откривање на врска."
 
-#: ../src/applet.c:908
+#: ../gnome/applet/applet.c:904
 #, c-format
 msgid "Preparing device %s for the wired network..."
 msgstr "Го подготвувам уредот %s за жичената мрежа..."
 
-#: ../src/applet.c:910
+#: ../gnome/applet/applet.c:906
 #, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
 msgstr "Го подготвувам уредот %s за безжичната мрежа '%s'..."
 
-#: ../src/applet.c:918
+#: ../gnome/applet/applet.c:914
 #, c-format
 msgid "Configuring device %s for the wired network..."
 msgstr "Го конфигурирам уредот %s за жичената мрежа..."
 
-#: ../src/applet.c:920
+#: ../gnome/applet/applet.c:916
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
 msgstr "Се обидувам да се придружам кон безжичната мрежа '%s'..."
 
-#: ../src/applet.c:928
+#: ../gnome/applet/applet.c:924
 #, c-format
 msgid "Waiting for Network Key for the wireless network '%s'..."
 msgstr "Чекам мрежен клуч за безжичната мрежа '%s'..."
 
-#: ../src/applet.c:936 ../src/applet.c:946
+#: ../gnome/applet/applet.c:932 ../gnome/applet/applet.c:942
 msgid "Requesting a network address from the wired network..."
 msgstr "Барам мрежна адреса од жичената мрежа..."
 
-#: ../src/applet.c:938 ../src/applet.c:948
+#: ../gnome/applet/applet.c:934 ../gnome/applet/applet.c:944
 #, c-format
 msgid "Requesting a network address from the wireless network '%s'..."
 msgstr "Барам мрежна адреса од жичената мрежа '%s'..."
 
-#: ../src/applet.c:956
+#: ../gnome/applet/applet.c:952
 msgid "Finishing connection to the wired network..."
 msgstr "Го завршувам поврзувањето со жичената мрежа..."
 
-#: ../src/applet.c:958
+#: ../gnome/applet/applet.c:954
 #, c-format
 msgid "Finishing connection to the wireless network '%s'..."
 msgstr "Го завршувам поврзувањето со жичената мрежа '%s'..."
 
-#: ../src/applet.c:1075
+#: ../gnome/applet/applet.c:1071
 msgid "NetworkManager is not running"
 msgstr "Менаџерот за мрежа не работи"
 
-#: ../src/applet.c:1083 ../src/applet.c:1828
+#: ../gnome/applet/applet.c:1079 ../gnome/applet/applet.c:1824
 msgid "Networking disabled"
 msgstr "Вмрежувањето е оневозможено"
 
-#: ../src/applet.c:1088
+#: ../gnome/applet/applet.c:1084
 msgid "No network connection"
 msgstr "Нема мрежна врска"
 
-#: ../src/applet.c:1093
+#: ../gnome/applet/applet.c:1089
 msgid "Wired network connection"
 msgstr "Мрежна врска"
 
-#: ../src/applet.c:1097
+#: ../gnome/applet/applet.c:1093
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Врзани сте на ад-хок безжична мрежа"
 
-#: ../src/applet.c:1099
+#: ../gnome/applet/applet.c:1095
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "Безжично мрежно поврзување до '%s' (%d%%)"
 
-#: ../src/applet.c:1120
+#: ../gnome/applet/applet.c:1116
 #, c-format
 msgid "VPN connection to '%s'"
 msgstr "VPN врска до '%s'"
 
-#: ../src/applet.c:1128
+#: ../gnome/applet/applet.c:1124
 #, c-format
 msgid "VPN connecting to '%s'"
 msgstr "VPN се конектира до '%s'"
 
-#: ../src/applet.c:1541
+#: ../gnome/applet/applet.c:1537
 msgid "_Connect to Other Wireless Network..."
 msgstr "_Поврзи се со друга безжична мрежа..."
 
-#: ../src/applet.c:1562
+#: ../gnome/applet/applet.c:1558
 msgid "Create _New Wireless Network..."
 msgstr "Креирај _нова безжична мрежа..."
 
-#: ../src/applet.c:1685
+#: ../gnome/applet/applet.c:1681
 msgid "_VPN Connections"
 msgstr "_VPN поврзувања"
 
-#: ../src/applet.c:1730
+#: ../gnome/applet/applet.c:1726
 msgid "_Configure VPN..."
 msgstr "_Конфигурирај VPN..."
 
-#: ../src/applet.c:1734
+#: ../gnome/applet/applet.c:1730
 msgid "_Disconnect VPN..."
 msgstr "_Прекини врска со VPN..."
 
-#: ../src/applet.c:1756
+#: ../gnome/applet/applet.c:1752
 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
-#: ../src/applet.c:1767
+#: ../gnome/applet/applet.c:1763
 #, c-format
 msgid "Connect to %s..."
 msgstr "Поврзи се со %s..."
 
-#: ../src/applet.c:1773
+#: ../gnome/applet/applet.c:1769
 #, c-format
 msgid "Disconnect from %s..."
 msgstr "Прекини врска со %s..."
 
-#: ../src/applet.c:1822
+#: ../gnome/applet/applet.c:1818
 msgid "No network devices have been found"
 msgstr "Не се пронајдени мрежни уреди"
 
-#: ../src/applet.c:2014
+#: ../gnome/applet/applet.c:2010
 msgid "NetworkManager is not running..."
 msgstr "Менаџерот за мрежа работи..."
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2170
+#: ../gnome/applet/applet.c:2166
 msgid "Enable _Networking"
 msgstr "Овозможи _вмрежување"
 
 #. 'Enable Wireless' item
-#: ../src/applet.c:2176
+#: ../gnome/applet/applet.c:2172
 msgid "Enable _Wireless"
 msgstr "Овозможи _безжична мрежа"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2182
+#: ../gnome/applet/applet.c:2178
 msgid "Connection _Information"
 msgstr "_Информации за поврзувањето"
 
 #. Help item
-#: ../src/applet.c:2193
+#: ../gnome/applet/applet.c:2189
 msgid "_Help"
 msgstr "_Помош"
 
 #. About item
-#: ../src/applet.c:2202
+#: ../gnome/applet/applet.c:2198
 msgid "_About"
 msgstr "_За"
 
-#: ../src/applet.c:2667
+#: ../gnome/applet/applet.c:2666
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
@@ -304,112 +314,113 @@ msgstr ""
 "Аплетот за „Менаџерот за мрежа“ не може да најде некои од потребните "
 "ресурси. Не може да продолжи.\n"
 
-#: ../src/wireless-security-option.c:157
+#: ../gnome/applet/wireless-security-option.c:157
 msgid "Open System"
 msgstr "Отворен систем"
 
-#: ../src/wireless-security-option.c:160
+#: ../gnome/applet/wireless-security-option.c:160
 msgid "Shared Key"
 msgstr "Споделен клуч"
 
-#: ../src/wireless-security-option.c:208
+#: ../gnome/applet/wireless-security-option.c:208
 msgid "Automatic (Default)"
 msgstr "Автоматски (Стандардно)"
 
-#: ../src/wireless-security-option.c:215
+#: ../gnome/applet/wireless-security-option.c:215
 msgid "AES-CCMP"
 msgstr "AES-CCMP"
 
-#: ../src/wireless-security-option.c:223
+#: ../gnome/applet/wireless-security-option.c:223
 msgid "TKIP"
 msgstr "TKIP"
 
-#: ../src/wireless-security-option.c:231
+#: ../gnome/applet/wireless-security-option.c:231
 msgid "Dynamic WEP"
 msgstr "Динамичен WEP"
 
-#: ../src/wso-none.c:53
+#: ../gnome/applet/wso-none.c:53
 msgid "None"
 msgstr "Ништо"
 
-#: ../src/wso-wep-ascii.c:138
+#: ../gnome/applet/wso-wep-ascii.c:138
 msgid "WEP 64/128-bit ASCII"
 msgstr "WEP 64/128-bit ASCII"
 
-#: ../src/wso-wep-hex.c:135
+#: ../gnome/applet/wso-wep-hex.c:135
 msgid "WEP 64/128-bit Hex"
 msgstr "WEP 64/128-bit Hex"
 
-#: ../src/wso-wep-passphrase.c:135
+#: ../gnome/applet/wso-wep-passphrase.c:135
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit фраза за лозинка"
 
-#: ../src/wso-wpa-eap.c:237
+#: ../gnome/applet/wso-wpa-eap.c:237
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../src/wso-wpa-eap.c:238
+#: ../gnome/applet/wso-wpa-eap.c:238
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wso-wpa-eap.c:239
+#: ../gnome/applet/wso-wpa-eap.c:239
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../src/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
-#: ../src/nm-ap-security-wpa-eap.c:116
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:93
+#: ../src/nm-ap-security-wpa-eap.c:117
 msgid "WPA2 Enterprise"
 msgstr "WPA2 Enterprise"
 
-#: ../src/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
-#: ../src/nm-ap-security-wpa-eap.c:121
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:95
+#: ../src/nm-ap-security-wpa-eap.c:122
 msgid "WPA Enterprise"
 msgstr "WPA Enterprise"
 
-#: ../src/wso-wpa-psk.c:178
+#: ../gnome/applet/wso-wpa-psk.c:178
 msgid "WPA2 Personal"
 msgstr "WPA2 Personal"
 
-#: ../src/wso-wpa-psk.c:180
+#: ../gnome/applet/wso-wpa-psk.c:180
 msgid "WPA Personal"
 msgstr "WPA Personal"
 
-#: ../src/eggtrayicon.c:134
+#: ../gnome/applet/eggtrayicon.c:134
 msgid "Orientation"
 msgstr "Ориентација"
 
-#: ../src/eggtrayicon.c:135
+#: ../gnome/applet/eggtrayicon.c:135
 msgid "The orientation of the tray."
 msgstr "Ориентација во местото за сместување."
 
-#: ../src/menu-items.c:88
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Мрежа (%s)"
 
-#: ../src/menu-items.c:91
+#: ../gnome/applet/menu-items.c:91
 msgid "_Wired Network"
 msgstr "_Жичена мрежа"
 
-#: ../src/menu-items.c:162
-#, fuzzy, c-format
+#: ../gnome/applet/menu-items.c:162
+#, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
 msgstr[0] "Безжична мрежа (%s)"
-msgstr[1] "Безжична мрежа (%s)"
+msgstr[1] "Безжични мрежи (%s)"
+msgstr[2] "Безжични мрежи (%s)"
 
-#: ../src/menu-items.c:164
-#, fuzzy
+#: ../gnome/applet/menu-items.c:164
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Безжична мрежа"
-msgstr[1] "Безжична мрежа"
+msgstr[1] "Безжични мрежи"
+msgstr[2] "Безжични мрежи"
 
-#: ../src/menu-items.c:343
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr " (невалиден јуникод)"
 
-#: ../src/other-network-dialog.c:352
+#: ../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, "
@@ -418,11 +429,11 @@ msgstr ""
 "Стандардно, името на безжичната мрежа е поставено како името на твојот "
 "компјутер, %s, без приклучено енкриптирање"
 
-#: ../src/other-network-dialog.c:358
+#: ../gnome/applet/other-network-dialog.c:358
 msgid "Create new wireless network"
 msgstr "Креирај нова безжична мрежа"
 
-#: ../src/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."
@@ -430,27 +441,27 @@ msgstr ""
 "Внесете го името и безбедносните поставувања на безжичната мрежа која што "
 "сакате да ја креирате."
 
-#: ../src/other-network-dialog.c:363
+#: ../gnome/applet/other-network-dialog.c:363
 msgid "Create New Wireless Network"
 msgstr "Креирај нова безжична мрежа"
 
-#: ../src/other-network-dialog.c:368
+#: ../gnome/applet/other-network-dialog.c:368
 msgid "Existing wireless network"
 msgstr "Постоечка безжична мрежа"
 
-#: ../src/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 "Внесете име на безжичната мрежа на која што сакате да се врзете."
 
-#: ../src/other-network-dialog.c:371
+#: ../gnome/applet/other-network-dialog.c:371
 msgid "Connect to Other Wireless Network"
 msgstr "Поврзи се со друга безжична мрежа"
 
-#: ../src/passphrase-dialog.c:215
+#: ../gnome/applet/passphrase-dialog.c:215
 msgid "Error connecting to wireless network"
 msgstr "Грешка при поврзувањето со безжичната мрежа"
 
-#: ../src/passphrase-dialog.c:216
+#: ../gnome/applet/passphrase-dialog.c:216
 msgid ""
 "The requested wireless network requires security capabilities unsupported by "
 "your hardware."
@@ -458,13 +469,13 @@ msgstr ""
 "Бараната безжична мрежа бара безбедносни можности кои се неподдржани од "
 "Вашиот хардвер."
 
-#: ../src/vpn-password-dialog.c:151
-#: ../src/vpn-password-dialog.c:188
+#: ../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'"
 
-#: ../src/vpn-password-dialog.c:154
+#: ../gnome/applet/vpn-password-dialog.c:154
 #, c-format
 msgid ""
 "Could not find the authentication dialog for VPN connection type '%s'. "
@@ -474,7 +485,7 @@ msgstr ""
 "за VPN поврзувањето од тип '%s'. Контактирајте го администраторот на "
 "системот."
 
-#: ../src/vpn-password-dialog.c:191
+#: ../gnome/applet/vpn-password-dialog.c:191
 #, c-format
 msgid ""
 "There was a problem launching the authentication dialog for VPN connection "
@@ -484,18 +495,17 @@ msgstr ""
 "веродостојноста за VPN поврзувањето од тип '%s'. Контактирајте го "
 "администраторот на системот."
 
-#: ../src/applet.glade.h:1
+#: ../gnome/applet/applet.glade.h:1
 msgid " "
 msgstr " "
 
-#: ../src/applet.glade.h:2
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
+#: ../gnome/applet/applet.glade.h:2
+msgid "<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
 msgstr ""
 "<span weight=\"bold\" size=\"larger\">Информации за активното поврзување</"
 "span>"
 
-#: ../src/applet.glade.h:4
+#: ../gnome/applet/applet.glade.h:4
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
@@ -510,7 +520,7 @@ msgstr ""
 "Фразата за лозинката или клучот за кодирање се потребни за пристап до "
 "безжичната мрежа '%s'."
 
-#: ../src/applet.glade.h:8
+#: ../gnome/applet/applet.glade.h:8
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
@@ -522,7 +532,7 @@ msgstr ""
 "\n"
 "%s нема да биде комплетно функционална."
 
-#: ../src/applet.glade.h:12
+#: ../gnome/applet/applet.glade.h:12
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
@@ -539,75 +549,79 @@ msgstr ""
 "безжична мрежа е безбедна, кликнете на полето за чекирање подолу и  "
 "NetworkManager нема да бара потврда на ваквите поврзувања."
 
-#: ../src/applet.glade.h:15
+#: ../gnome/applet/applet.glade.h:15
 msgid "Anonymous Identity:"
 msgstr "Анонимен идентитет:"
 
-#: ../src/applet.glade.h:16
+#: ../gnome/applet/applet.glade.h:16
 msgid "Authentication:"
 msgstr "Проверка на веродостојноста:"
 
-#: ../src/applet.glade.h:17
+#: ../gnome/applet/applet.glade.h:17
 msgid "Broadcast Address:"
 msgstr "Адреса за емитување:"
 
-#: ../src/applet.glade.h:18
+#: ../gnome/applet/applet.glade.h:18
 msgid "CA Certificate File:"
 msgstr "Датотека за CA сертификат:"
 
-#: ../src/applet.glade.h:19
+#: ../gnome/applet/applet.glade.h:19
 msgid "C_onnect"
 msgstr "В_рзи се"
 
-#: ../src/applet.glade.h:20
+#: ../gnome/applet/applet.glade.h:20
 msgid "Client Certificate File:"
 msgstr "Датотека за сертификат на клиентот:"
 
-#: ../src/applet.glade.h:21
+#: ../gnome/applet/applet.glade.h:21
 msgid "Connection Information"
 msgstr "Информации за поврзувањето"
 
-#: ../src/applet.glade.h:22
+#: ../gnome/applet/applet.glade.h:22
 msgid "Default Route:"
 msgstr "Стандардна насока:"
 
-#: ../src/applet.glade.h:23
+#: ../gnome/applet/applet.glade.h:23
 msgid "Destination Address:"
 msgstr "Адреса на дестинацијата:"
 
-#: ../src/applet.glade.h:24
+#: ../gnome/applet/applet.glade.h:24
 msgid "Driver:"
 msgstr "Драјвер:"
 
-#: ../src/applet.glade.h:25
+#: ../gnome/applet/applet.glade.h:25
 msgid "EAP Method:"
 msgstr "EAP метод:"
 
-#: ../src/applet.glade.h:26
+#: ../gnome/applet/applet.glade.h:26
 msgid "Hardware Address:"
 msgstr "Хардверска адреса:"
 
-#: ../src/applet.glade.h:27
+#: ../gnome/applet/applet.glade.h:27
 msgid "IP Address:"
 msgstr "IP Адреса:"
 
-#: ../src/applet.glade.h:28
+#: ../gnome/applet/applet.glade.h:28
 msgid "Identity:"
 msgstr "Идентитет:"
 
-#: ../src/applet.glade.h:29
+#: ../gnome/applet/applet.glade.h:29
 msgid "Interface:"
 msgstr "Уред:"
 
-#: ../src/applet.glade.h:30
+#: ../gnome/applet/applet.glade.h:30
 msgid "Key Type:"
 msgstr "Тип на клуч:"
 
-#: ../src/applet.glade.h:31
+#: ../gnome/applet/applet.glade.h:31
+msgid "Key management:"
+msgstr "Менаџмент на клучеви:"
+
+#: ../gnome/applet/applet.glade.h:32
 msgid "Key:"
 msgstr "Клуч:"
 
-#: ../src/applet.glade.h:32
+#: ../gnome/applet/applet.glade.h:33
 msgid ""
 "None\n"
 "WEP 128-bit Passphrase\n"
@@ -619,7 +633,7 @@ msgstr ""
 "WEP 64/128-bit Hex\n"
 "WEP 64/128-bit ASCII\n"
 
-#: ../src/applet.glade.h:37
+#: ../gnome/applet/applet.glade.h:38
 msgid ""
 "Open System\n"
 "Shared Key"
@@ -627,111 +641,115 @@ msgstr ""
 "Отворен систем\n"
 "Споделен клуч"
 
-#: ../src/applet.glade.h:39
+#: ../gnome/applet/applet.glade.h:40
 msgid "Other Wireless Network..."
 msgstr "Друга безжична мрежа..."
 
-#: ../src/applet.glade.h:40
+#: ../gnome/applet/applet.glade.h:41
 msgid "Passphrase:"
 msgstr "Фраза за лозинка:"
 
-#: ../src/applet.glade.h:41
+#: ../gnome/applet/applet.glade.h:42
 msgid "Password:"
 msgstr "Лозинка:"
 
-#: ../src/applet.glade.h:42
+#: ../gnome/applet/applet.glade.h:43
 msgid "Primary DNS:"
 msgstr "Примарен DNS:"
 
-#: ../src/applet.glade.h:43
+#: ../gnome/applet/applet.glade.h:44
 msgid "Private Key File:"
 msgstr "Датотека со приватен клуч:"
 
-#: ../src/applet.glade.h:44
+#: ../gnome/applet/applet.glade.h:45
 msgid "Private Key Password:"
 msgstr "Лозинка на приватниот клуч:"
 
-#: ../src/applet.glade.h:45
+#: ../gnome/applet/applet.glade.h:46
 msgid "Secondary DNS:"
 msgstr "Втор DNS:"
 
-#: ../src/applet.glade.h:46
+#: ../gnome/applet/applet.glade.h:47
 msgid "Select the CA Certificate File"
 msgstr "Одберете ја датотеката за CA сертификатот"
 
-#: ../src/applet.glade.h:47
+#: ../gnome/applet/applet.glade.h:48
 msgid "Select the Client Certificate File"
 msgstr "Одберете ја датотеката за клиентскиот сертификат"
 
-#: ../src/applet.glade.h:48
+#: ../gnome/applet/applet.glade.h:49
 msgid "Select the Private Key File"
 msgstr "Одберете датотека со приватен клуч"
 
-#: ../src/applet.glade.h:49
+#: ../gnome/applet/applet.glade.h:50
 msgid "Show key"
 msgstr "Прикажи клуч"
 
-#: ../src/applet.glade.h:50
+#: ../gnome/applet/applet.glade.h:51
 msgid "Show passphrase"
 msgstr "Прикажи ја фразата за лозинка"
 
-#: ../src/applet.glade.h:51
+#: ../gnome/applet/applet.glade.h:52
 msgid "Show password"
 msgstr "Прикажи лозинка"
 
-#: ../src/applet.glade.h:52
+#: ../gnome/applet/applet.glade.h:53
 msgid "Show passwords"
 msgstr "Прикажи лозинки"
 
-#: ../src/applet.glade.h:53
+#: ../gnome/applet/applet.glade.h:54
 msgid "Speed:"
 msgstr "Брзина:"
 
-#: ../src/applet.glade.h:54
+#: ../gnome/applet/applet.glade.h:55
 msgid "Subnet Mask:"
 msgstr "Сабнет маск:"
 
-#: ../src/applet.glade.h:55
+#: ../gnome/applet/applet.glade.h:56
 msgid "Type:"
 msgstr "Тип:"
 
-#: ../src/applet.glade.h:56
+#: ../gnome/applet/applet.glade.h:57
 msgid "User Name:"
 msgstr "Корисничко име:"
 
-#: ../src/applet.glade.h:57
+#: ../gnome/applet/applet.glade.h:58
 msgid "Wireless Network Key Required"
 msgstr "Потребен е клучот за безжичната мрежа"
 
-#: ../src/applet.glade.h:58
+#: ../gnome/applet/applet.glade.h:59
 msgid "Wireless _adapter:"
 msgstr "Безжичен _адаптер:"
 
-#: ../src/applet.glade.h:59
+#: ../gnome/applet/applet.glade.h:60
 msgid "_Always Trust this Wireless Network"
 msgstr "_Секогаш верувај ѝ на оваа безжична мрежа"
 
-#: ../src/applet.glade.h:60
+#: ../gnome/applet/applet.glade.h:61
 msgid "_Don't remind me again"
 msgstr "_Не ме потсетувај повеќе"
 
-#: ../src/applet.glade.h:61
+#: ../gnome/applet/applet.glade.h:62
+msgid "_Fallback on this Network"
+msgstr "_Врати се на оваа мрежа"
+
+#: ../gnome/applet/applet.glade.h:63
 msgid "_Login to Network"
 msgstr "_Најави се на мрежа"
 
-#: ../src/applet.glade.h:62
+#: ../gnome/applet/applet.glade.h:64
 msgid "_Network Name:"
 msgstr "Име на _мрежа:"
 
-#: ../src/applet.glade.h:63
+#: ../gnome/applet/applet.glade.h:65
 msgid "_Wireless Security:"
 msgstr "_Безжична безбедност:"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:383
+#: ../gnome/vpn-properties/nm-vpn-properties.c:389
 msgid "Cannot add VPN connection"
 msgstr "Не можам да додадам VPN поврзување"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:385
+#: ../gnome/vpn-properties/nm-vpn-properties.c:391
 msgid ""
 "No suitable VPN software was found on your system. Contact your system "
 "administrator."
@@ -739,11 +757,11 @@ msgstr ""
 "Не е пронајден соодветен VPN софтвер на Вашиот систем. Контактирајте го "
 "Вашиот систем администратор."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:437
+#: ../gnome/vpn-properties/nm-vpn-properties.c:433
 msgid "Cannot import VPN connection"
 msgstr "Не можам да увезам VPN поврзување"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:439
+#: ../gnome/vpn-properties/nm-vpn-properties.c:435
 #, c-format
 msgid ""
 "Cannot find suitable software for VPN connection type '%s' to import the "
@@ -752,12 +770,12 @@ msgstr ""
 "Не можам да најдам соодветен софтвер за VPN поврзување од типот '%s' за да "
 "ја внесам датотеката '%s' . Контактирајте го администраторот."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:579
+#: ../gnome/vpn-properties/nm-vpn-properties.c:555
 #, c-format
 msgid "Error retrieving VPN connection '%s'"
 msgstr "Грешка во воспоставувањето на VPN поврзувањето '%s'"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:582
+#: ../gnome/vpn-properties/nm-vpn-properties.c:558
 #, c-format
 msgid ""
 "Could not find the UI files for VPN connection type '%s'. Contact your "
@@ -766,12 +784,12 @@ msgstr ""
 "Не можам да ги пронајдам датотеките за корисничкиот интерфејс за VPN "
 "поврзувањето од тип '%s'. Контактирајте го Вашиот администратор на системот."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:739
+#: ../gnome/vpn-properties/nm-vpn-properties.c:714
 #, c-format
 msgid "Delete VPN connection \"%s\"?"
 msgstr "Да го избришам VPN поврзувањето \"%s\"?"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:742
+#: ../gnome/vpn-properties/nm-vpn-properties.c:717
 #, c-format
 msgid ""
 "All information about the VPN connection \"%s\" will be lost and you may "
@@ -782,16 +800,36 @@ msgstr ""
 "треба да го контактирате администраторот за да добиете информации за "
 "креирање на ново поврзување."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:959
+#: ../gnome/vpn-properties/nm-vpn-properties.c:912
 msgid "Unable to load"
 msgstr "Не можам да вчитам"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:961
+#: ../gnome/vpn-properties/nm-vpn-properties.c:914
 msgid "Cannot find some needed resources (the glade file)!"
 msgstr "Не можам да ги пронајдам потребните ресурси (glade датотеката)!"
 
+#. druid_window = GTK_DIALOG (gtk_dialog_new_with_buttons (_("Create VPN Connection"),
+#. NULL,
+#. GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+#. GTK_STOCK_CANCEL,
+#. GTK_RESPONSE_REJECT,
+#. GTK_STOCK_APPLY,
+#. GTK_RESPONSE_ACCEPT,
+#. NULL));
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1059
+msgid "Create VPN Connection"
+msgstr "Креирај VPN поврзување"
+
+#. gtk_container_add (GTK_CONTAINER (druid_window->vbox), GTK_WIDGET(gtk_label_new("Some label")));
+#. gtk_box_pack_start (GTK_BOX (druid_window->vbox), GTK_WIDGET(druid), TRUE,TRUE,0);
+#. gtk_box_pack_start (GTK_BOX (druid_window->vbox), GTK_WIDGET(gtk_label_new("Some label")), TRUE,TRUE,0);
+#. toplevel = gtk_widget_get_toplevel (GTK_WIDGET (druid));
+#. gtk_signal_connect (GTK_OBJECT (toplevel), "delete_event", GTK_SIGNAL_FUNC (vpn_window_close), NULL);
+#. make the druid window modal wrt. our main window
+#. gtk_window_set_modal (druid_window, TRUE);
+#. gtk_window_set_transient_for (GTK_WINDOW(druid_window), GTK_WINDOW (dialog));
 #. Edit dialog
-#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1077
 msgid "Edit VPN Connection"
 msgstr "Уреди го VPN поврзувањето"
 
@@ -800,68 +838,30 @@ 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
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
 msgid "E_xport"
 msgstr "И_звези"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:9
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
 msgid "Edit the selected VPN connection"
 msgstr "Уреди го избраното VPN поврзување"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:10
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
 msgid "Export the VPN settings to a file"
 msgstr "Извези ги поставувањата за VPN во датотека"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:11
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
 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
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
 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
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
 msgid "VPN Connections"
 msgstr "VPN поврзувања"
 
@@ -897,140 +897,67 @@ msgstr "WPA2 CCMP"
 msgid "WPA2 Automatic"
 msgstr "WPA2 Aвтоматски"
 
-#: ../src/nm-ap-security.c:320
+#: ../src/nm-ap-security.c:330
 msgid "none"
 msgstr "ништо"
 
-#: ../src/nm-netlink-monitor.c:154
+#: ../src/nm-netlink-monitor.c:170
 #, c-format
-msgid ""
-"unable to create netlink socket for monitoring wired ethernet devices - %s"
+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:188
 #, c-format
-msgid ""
-"unable to bind to netlink socket for monitoring wired ethernet devices - %s"
+msgid "unable to bind to netlink socket for monitoring wired ethernet devices - %s"
 msgstr ""
 "не можам да се поврзам нетлинк сокет за надгледување на жичените етернет "
 "уреди - %s"
 
-#: ../src/nm-netlink-monitor.c:405
+#: ../src/nm-netlink-monitor.c:425
 msgid "operation took too long"
 msgstr "операцијата траеше предолго"
 
-#: ../src/nm-netlink-monitor.c:502
+#: ../src/nm-netlink-monitor.c:522
 msgid "received data from wrong type of sender"
 msgstr "примив податоци од погрешен тип на испраќач"
 
-#: ../src/nm-netlink-monitor.c:515
+#: ../src/nm-netlink-monitor.c:535
 msgid "received data from unexpected sender"
 msgstr "примив податоци од неочекуван испраќач"
 
-#: ../src/nm-netlink-monitor.c:646
+#: ../src/nm-netlink-monitor.c:664
 msgid "too much data was sent over socket and some of it was lost"
-msgstr ""
-"премногу податоци беа испратени преку сокетот и некои од нив се изгубија"
+msgstr "премногу податоци беа испратени преку сокетот и некои од нив се изгубија"
 
-#: ../src/nm-netlink-monitor.c:735
+#: ../src/nm-netlink-monitor.c:774
 msgid "error occurred while waiting for data on socket"
 msgstr "се случи грешка при чекањето на податоци од сокетот"
 
-#: ../src/applet-dbus-devices.c:898
+#: ../gnome/applet/applet-dbus-devices.c:922
 #, c-format
 msgid "You are now connected to the Ad-Hoc wireless network '%s'."
 msgstr "Сега сте поврзани со Ad-Hoc безжичната мрежа '%s'."
 
-#: ../src/applet-dbus-devices.c:903
+#: ../gnome/applet/applet-dbus-devices.c:927
 #, c-format
 msgid "You are now connected to the wireless network '%s'."
 msgstr "Сега сте поврзани со безжичната мрежа '%s'."
 
-#: ../src/applet-dbus-devices.c:910
+#: ../gnome/applet/applet-dbus-devices.c:934
 msgid "You are now connected to the wired network."
 msgstr "Сега сте поврзани со безжичната мрежа."
 
-#: ../src/applet-dbus-devices.c:916
+#: ../gnome/applet/applet-dbus-devices.c:940
 msgid "Connection Established"
 msgstr "Врската е воспоставена"
 
-#: ../src/applet-dbus-devices.c:959
+#: ../gnome/applet/applet-dbus-devices.c:983
 msgid "Disconnected"
 msgstr "Прекината врска"
 
-#: ../src/applet-dbus-devices.c:960
+#: ../gnome/applet/applet-dbus-devices.c:984
 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 e69841e4..35d5c2e2 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager 0.1.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-29 18:33+0200\n"
-"PO-Revision-Date: 2006-03-02 12:59+0100\n"
+"POT-Creation-Date: 2006-12-10 17:41+0100\n"
+"PO-Revision-Date: 2006-12-10 17:42+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"
@@ -17,73 +17,94 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../src/applet-compat.c:171 ../src/applet-dbus-info.c:919
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:926
 #, c-format
 msgid "Passphrase for wireless network %s"
 msgstr "Passord for trådløst nettverk %s"
 
-#: ../src/applet-dbus.c:265
+#: ../gnome/applet/applet-dbus.c:274
 #, c-format
 msgid "Connection to the wireless network '%s' failed."
 msgstr "Tilkobling til trådløst nettverk «%s» feilet."
 
-#: ../src/applet-dbus.c:270
+#: ../gnome/applet/applet-dbus.c:279
 msgid "Connection to the wired network failed."
 msgstr "Tilkobling til trådløst nettverk feilet."
 
-#: ../src/applet.c:184
+#: ../gnome/applet/applet.c:182
 msgid "Error displaying connection information:"
 msgstr "Feil under visning av tilkoblingsinformasjon:"
 
-#: ../src/applet.c:202
+#: ../gnome/applet/applet.c:200
 msgid "Could not find some required resources (the glade file)!"
 msgstr "Fant ikke nødvendige ressurser (glade-filen)."
 
-#: ../src/applet.c:213
+#: ../gnome/applet/applet.c:210
 msgid "No active connections!"
 msgstr "Ingen aktive tilkoblinger!"
 
-#: ../src/applet.c:234
+#: ../gnome/applet/applet.c:227
+#, c-format
+msgid "%d Mb/s"
+msgstr "%d Mb/s"
+
+#: ../gnome/applet/applet.c:230
 #, c-format
 msgid "Wired Ethernet (%s)"
 msgstr "Kablet nettverk (%s)"
 
-#: ../src/applet.c:236
+#: ../gnome/applet/applet.c:232
 #, c-format
 msgid "Wireless Ethernet (%s)"
 msgstr "Trådløst nettverk (%s)"
 
-#: ../src/applet.c:337 ../src/applet.c:362
+#: ../gnome/applet/applet.c:238
+msgid "Unknown"
+msgstr "Ukjent"
+
+#: ../gnome/applet/applet.c:330 ../gnome/applet/applet.c:357
 msgid "NetworkManager Applet"
 msgstr "NetworkManager panelprogram"
 
-#: ../src/applet.c:339 ../src/applet.c:364
-msgid "Copyright © 2004-2005 Red Hat, Inc."
-msgstr "Opphavsrett © 2004-2005 Red Hat, Inc."
+#: ../gnome/applet/applet.c:332
+msgid ""
+"Copyright © 2004-2006 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+msgstr ""
+"Opphavsrett © 2004-2005 Red Hat, Inc.\n"
+"Opphavsrett © 2005-2006 Novell, Inc."
 
-#: ../src/applet.c:340 ../src/applet.c:365
+#: ../gnome/applet/applet.c:334 ../gnome/applet/applet.c:361
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "Et panelprogram for å håndtere nettverksenheter og tilkoblinger."
 
-#: ../src/applet.c:343 ../src/applet.c:370
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:365
 msgid "translator-credits"
 msgstr "Kjartan Maraas <kmaraas@gnome.org>"
 
-#: ../src/applet.c:426
+#: ../gnome/applet/applet.c:359
+msgid ""
+"Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+msgstr ""
+"Opphavsrett © 2004-2005 Red Hat, Inc.\n"
+"Opphavsrett © 2005-2006 Novell, Inc."
+
+#: ../gnome/applet/applet.c:421
 msgid "VPN Login Failure"
 msgstr "Feil ved VPN-pålogging"
 
-#: ../src/applet.c:427
+#: ../gnome/applet/applet.c:422
 #, 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."
 
-#: ../src/applet.c:431
+#: ../gnome/applet/applet.c:426
 msgid "VPN Start Failure"
 msgstr "Feil ved start av VPN"
 
-#: ../src/applet.c:432
+#: ../gnome/applet/applet.c:427
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
@@ -92,25 +113,25 @@ msgstr ""
 "Kunne ikke starte VPN-tilkobling «%s» på grunn av feil ved oppstart av VPN-"
 "programmet."
 
-#: ../src/applet.c:436 ../src/applet.c:446
+#: ../gnome/applet/applet.c:431 ../gnome/applet/applet.c:441
 msgid "VPN Connect Failure"
 msgstr "Feil ved tilkobling av VPN"
 
-#: ../src/applet.c:437
+#: ../gnome/applet/applet.c:432
 #, 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."
 
-#: ../src/applet.c:441
+#: ../gnome/applet/applet.c:436
 msgid "VPN Configuration Error"
 msgstr "Feil i konfigurasjon av VPN"
 
-#: ../src/applet.c:442
+#: ../gnome/applet/applet.c:437
 #, c-format
 msgid "The VPN connection '%s' was not correctly configured."
 msgstr "VPN-tilkobling «%s» er ikke korrekt konfigurert."
 
-#: ../src/applet.c:447
+#: ../gnome/applet/applet.c:442
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' because the VPN server did not "
@@ -119,177 +140,182 @@ msgstr ""
 "Kunne ikke starte VPN-tilkobling «%s» fordi VPN-tjeneren ikke returnerte "
 "riktig nettverkskonfigurasjon."
 
-#: ../src/applet.c:517
+#: ../gnome/applet/applet.c:512
 msgid "VPN Login Message"
 msgstr "Påloggingsmelding for VPN"
 
-#: ../src/applet.c:741 ../src/applet.c:2508
-#: ../src/other-network-dialog.c:453
-#: ../src/passphrase-dialog.c:228
+#: ../gnome/applet/applet.c:737 ../gnome/applet/applet.c:2635
+#: ../gnome/applet/other-network-dialog.c:458
+#: ../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)."
 
-#: ../src/applet.c:753
+#: ../gnome/applet/applet.c:749
 #, 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."
 
-#: ../src/applet.c:761
+#: ../gnome/applet/applet.c:757
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
 msgstr ""
 "Nettverksenheten «%s (%s)» støtter ikke informasjon om tilkoblet status."
 
-#: ../src/applet.c:908
+#. Note to translators: this is used if no essid is known
+#: ../gnome/applet/applet.c:905 ../gnome/applet/applet.c:1103
+msgid "(unknown)"
+msgstr "(ukjent)"
+
+#: ../gnome/applet/applet.c:911
 #, c-format
 msgid "Preparing device %s for the wired network..."
 msgstr "Klargjør enhet %s for det trådløse nettverket..."
 
-#: ../src/applet.c:910
+#: ../gnome/applet/applet.c:913
 #, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
 msgstr "Klargjør enhet %s for trådløst nettverk «%s»..."
 
-#: ../src/applet.c:918
+#: ../gnome/applet/applet.c:921
 #, c-format
 msgid "Configuring device %s for the wired network..."
 msgstr "Konfigurerer enhet %s for kablet nettverk..."
 
-#: ../src/applet.c:920
+#: ../gnome/applet/applet.c:923
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
 msgstr "Forsøker å bruke trådløst nettverk «%s»..."
 
-#: ../src/applet.c:928
+#: ../gnome/applet/applet.c:931
 #, c-format
 msgid "Waiting for Network Key for the wireless network '%s'..."
 msgstr "Venter på nettverksnøkkel for trådløst nettverk «%s»..."
 
-#: ../src/applet.c:936 ../src/applet.c:946
+#: ../gnome/applet/applet.c:939 ../gnome/applet/applet.c:949
 msgid "Requesting a network address from the wired network..."
 msgstr "Ber om en nettverksadresse fra kablet nettverk..."
 
-#: ../src/applet.c:938 ../src/applet.c:948
+#: ../gnome/applet/applet.c:941 ../gnome/applet/applet.c:951
 #, c-format
 msgid "Requesting a network address from the wireless network '%s'..."
 msgstr "Ber om en nettverksadresse fra trådløst nettverk «%s»..."
 
-#: ../src/applet.c:956
+#: ../gnome/applet/applet.c:959
 msgid "Finishing connection to the wired network..."
 msgstr "Fullfører tilkobling til kablet nettverk..."
 
-#: ../src/applet.c:958
+#: ../gnome/applet/applet.c:961
 #, c-format
 msgid "Finishing connection to the wireless network '%s'..."
 msgstr "Fullfører tilkobling til trådløst nettverk «%s»..."
 
-#: ../src/applet.c:1075
+#: ../gnome/applet/applet.c:1078
 msgid "NetworkManager is not running"
 msgstr "NetworkManager kjører ikke"
 
-#: ../src/applet.c:1083 ../src/applet.c:1828
+#: ../gnome/applet/applet.c:1086 ../gnome/applet/applet.c:1843
 msgid "Networking disabled"
 msgstr "Nettverk deaktivert"
 
-#: ../src/applet.c:1088
+#: ../gnome/applet/applet.c:1091
 msgid "No network connection"
 msgstr "Ingen nettverksforbindelse"
 
-#: ../src/applet.c:1093
+#: ../gnome/applet/applet.c:1096
 msgid "Wired network connection"
-msgstr "Trådløs nettverkforbindelse"
+msgstr "Kablet nettverkforbindelse"
 
-#: ../src/applet.c:1097
+#: ../gnome/applet/applet.c:1100
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Kobler til et Ad-Hoc trådløst nettverk"
 
-#: ../src/applet.c:1099
+#: ../gnome/applet/applet.c:1102
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "Trådløs nettverksforbindelse til «%s» (%d%%)"
 
-#: ../src/applet.c:1120
+#: ../gnome/applet/applet.c:1123
 #, c-format
 msgid "VPN connection to '%s'"
 msgstr "VPN-tilkobling til «%s»"
 
-#: ../src/applet.c:1128
+#: ../gnome/applet/applet.c:1131
 #, c-format
 msgid "VPN connecting to '%s'"
 msgstr "Kobler til «%s» via VPN"
 
-#: ../src/applet.c:1541
+#: ../gnome/applet/applet.c:1556
 msgid "_Connect to Other Wireless Network..."
 msgstr "_Koble til annet trådløst nettverk..."
 
-#: ../src/applet.c:1562
+#: ../gnome/applet/applet.c:1577
 msgid "Create _New Wireless Network..."
 msgstr "Opprett _nytt trådløst nettverk..."
 
-#: ../src/applet.c:1685
+#: ../gnome/applet/applet.c:1700
 msgid "_VPN Connections"
 msgstr "_VPN-tilkoblinger"
 
-#: ../src/applet.c:1730
+#: ../gnome/applet/applet.c:1745
 msgid "_Configure VPN..."
 msgstr "_Konfigurer VPN..."
 
-#: ../src/applet.c:1734
+#: ../gnome/applet/applet.c:1749
 msgid "_Disconnect VPN..."
 msgstr "Ko_ble fra VPN..."
 
-#: ../src/applet.c:1756
+#: ../gnome/applet/applet.c:1771
 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
-#: ../src/applet.c:1767
+#: ../gnome/applet/applet.c:1782
 #, c-format
 msgid "Connect to %s..."
 msgstr "Koble til %s..."
 
-#: ../src/applet.c:1773
+#: ../gnome/applet/applet.c:1788
 #, c-format
 msgid "Disconnect from %s..."
 msgstr "Koble fra %s..."
 
-#: ../src/applet.c:1822
+#: ../gnome/applet/applet.c:1837
 msgid "No network devices have been found"
 msgstr "Ingen nettverksenheter ble funnet"
 
-#: ../src/applet.c:2014
+#: ../gnome/applet/applet.c:2029
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager kjører ikke..."
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2170
+#: ../gnome/applet/applet.c:2210
 msgid "Enable _Networking"
 msgstr "_Aktiver nettverk"
 
 #. 'Enable Wireless' item
-#: ../src/applet.c:2176
+#: ../gnome/applet/applet.c:2216
 msgid "Enable _Wireless"
 msgstr "Aktiver _trådløst nettverk"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2182
+#: ../gnome/applet/applet.c:2222
 msgid "Connection _Information"
 msgstr "Tilkoblings_informasjon"
 
 #. Help item
-#: ../src/applet.c:2193
+#: ../gnome/applet/applet.c:2233
 msgid "_Help"
 msgstr "_Hjelp"
 
 #. About item
-#: ../src/applet.c:2202
+#: ../gnome/applet/applet.c:2242
 msgid "_About"
 msgstr "_Om"
 
-#: ../src/applet.c:2667
+#: ../gnome/applet/applet.c:2824
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
@@ -297,111 +323,111 @@ msgstr ""
 "Panelprogrammet for NetworkManager fant ikke noen av de nødvendige "
 "ressursene. Det kan ikke fortsette.\n"
 
-#: ../src/wireless-security-option.c:157
+#: ../gnome/applet/wireless-security-option.c:157
 msgid "Open System"
 msgstr "Åpent system"
 
-#: ../src/wireless-security-option.c:160
+#: ../gnome/applet/wireless-security-option.c:160
 msgid "Shared Key"
 msgstr "Delt nøkkel"
 
-#: ../src/wireless-security-option.c:208
+#: ../gnome/applet/wireless-security-option.c:208
 msgid "Automatic (Default)"
 msgstr "Automatisk (forvalgt)"
 
-#: ../src/wireless-security-option.c:215
+#: ../gnome/applet/wireless-security-option.c:215
 msgid "AES-CCMP"
 msgstr "AES-CCMP"
 
-#: ../src/wireless-security-option.c:223
+#: ../gnome/applet/wireless-security-option.c:223
 msgid "TKIP"
 msgstr "TKIP"
 
-#: ../src/wireless-security-option.c:231
+#: ../gnome/applet/wireless-security-option.c:231
 msgid "Dynamic WEP"
 msgstr "Dynamisk WEP"
 
-#: ../src/wso-none.c:53
+#: ../gnome/applet/wso-none.c:53
 msgid "None"
 msgstr "Ingen"
 
-#: ../src/wso-wep-ascii.c:138
+#: ../gnome/applet/wso-wep-ascii.c:138
 msgid "WEP 64/128-bit ASCII"
 msgstr "WEP 64/128-bit ASCII"
 
-#: ../src/wso-wep-hex.c:135
+#: ../gnome/applet/wso-wep-hex.c:135
 msgid "WEP 64/128-bit Hex"
 msgstr "WEP 64/128-bit heksadesimal"
 
-#: ../src/wso-wep-passphrase.c:135
+#: ../gnome/applet/wso-wep-passphrase.c:135
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit passord:"
 
-#: ../src/wso-wpa-eap.c:237
+#: ../gnome/applet/wso-wpa-eap.c:237
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../src/wso-wpa-eap.c:238
+#: ../gnome/applet/wso-wpa-eap.c:238
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wso-wpa-eap.c:239
+#: ../gnome/applet/wso-wpa-eap.c:239
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../src/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
-#: ../src/nm-ap-security-wpa-eap.c:116
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:93
+#: ../src/nm-ap-security-wpa-eap.c:117
 msgid "WPA2 Enterprise"
 msgstr "WPA2 enterprise"
 
-#: ../src/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
-#: ../src/nm-ap-security-wpa-eap.c:121
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:95
+#: ../src/nm-ap-security-wpa-eap.c:122
 msgid "WPA Enterprise"
 msgstr "WPA enterprise"
 
-#: ../src/wso-wpa-psk.c:178
+#: ../gnome/applet/wso-wpa-psk.c:178
 msgid "WPA2 Personal"
 msgstr "WPA2 personlig"
 
-#: ../src/wso-wpa-psk.c:180
+#: ../gnome/applet/wso-wpa-psk.c:180
 msgid "WPA Personal"
 msgstr "WPA personlig"
 
-#: ../src/eggtrayicon.c:134
+#: ../gnome/applet/eggtrayicon.c:134
 msgid "Orientation"
 msgstr "Orientering"
 
-#: ../src/eggtrayicon.c:135
+#: ../gnome/applet/eggtrayicon.c:135
 msgid "The orientation of the tray."
 msgstr "Orientering for trauet."
 
-#: ../src/menu-items.c:88
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Kablet nettverk (%s)"
 
-#: ../src/menu-items.c:91
+#: ../gnome/applet/menu-items.c:91
 msgid "_Wired Network"
 msgstr "_Kablet nettverk"
 
-#: ../src/menu-items.c:162
+#: ../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)"
 
-#: ../src/menu-items.c:164
+#: ../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"
 
-#: ../src/menu-items.c:343
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr " (ugyldig Unicode)"
 
-#: ../src/other-network-dialog.c:352
+#: ../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, "
@@ -410,11 +436,11 @@ msgstr ""
 "Nettverksnavnet er som standard satt til datamaskinens navn, %s,  og "
 "kryptering er ikke aktivert."
 
-#: ../src/other-network-dialog.c:358
+#: ../gnome/applet/other-network-dialog.c:358
 msgid "Create new wireless network"
 msgstr "Opprett nytt trådløst nettverk"
 
-#: ../src/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."
@@ -422,27 +448,27 @@ msgstr ""
 "Oppgi navn og sikkerhetsinnstillinger for det trådløse nettverket du ønsker "
 "å opprette."
 
-#: ../src/other-network-dialog.c:363
+#: ../gnome/applet/other-network-dialog.c:363
 msgid "Create New Wireless Network"
 msgstr "Opprett nytt trådløst nettverk"
 
-#: ../src/other-network-dialog.c:368
+#: ../gnome/applet/other-network-dialog.c:368
 msgid "Existing wireless network"
 msgstr "Eksisterende trådløse nettverk"
 
-#: ../src/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 "Oppgi navnet til det trådløse nettverket du ønsker å koble deg til."
 
-#: ../src/other-network-dialog.c:371
+#: ../gnome/applet/other-network-dialog.c:371
 msgid "Connect to Other Wireless Network"
 msgstr "Koble til annet trådløst nettverk"
 
-#: ../src/passphrase-dialog.c:215
+#: ../gnome/applet/passphrase-dialog.c:215
 msgid "Error connecting to wireless network"
 msgstr "Feil under tilkobling til trådløst nettverk"
 
-#: ../src/passphrase-dialog.c:216
+#: ../gnome/applet/passphrase-dialog.c:216
 msgid ""
 "The requested wireless network requires security capabilities unsupported by "
 "your hardware."
@@ -450,13 +476,13 @@ msgstr ""
 "Valgt trådløst nettverk krever en type sikkerhet som ikke er støttet av ditt "
 "nettverkskort."
 
-#: ../src/vpn-password-dialog.c:151
-#: ../src/vpn-password-dialog.c:188
+#: ../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»"
 
-#: ../src/vpn-password-dialog.c:154
+#: ../gnome/applet/vpn-password-dialog.c:154
 #, c-format
 msgid ""
 "Could not find the authentication dialog for VPN connection type '%s'. "
@@ -465,7 +491,7 @@ msgstr ""
 "Fant ikke autentiseringsdialogen for VPN tilkoblingstypen «%s». Kontakt din "
 "systemadministrator."
 
-#: ../src/vpn-password-dialog.c:191
+#: ../gnome/applet/vpn-password-dialog.c:191
 #, c-format
 msgid ""
 "There was a problem launching the authentication dialog for VPN connection "
@@ -474,17 +500,17 @@ msgstr ""
 "Det oppstod en feil under oppstart av autentiseringsdialogen for VPN "
 "tilkoblingstypen «%s». Kontakt din systemadministrator."
 
-#: ../src/applet.glade.h:1
+#: ../gnome/applet/applet.glade.h:1
 msgid " "
 msgstr " "
 
-#: ../src/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\">Informasjon om aktiv tilkobling</span>"
 
-#: ../src/applet.glade.h:4
+#: ../gnome/applet/applet.glade.h:4
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
@@ -499,7 +525,7 @@ msgstr ""
 "Ett passord eller en krypteringsnøkkel kreves for å aksessere trådløst "
 "nettverk «%s»."
 
-#: ../src/applet.glade.h:8
+#: ../gnome/applet/applet.glade.h:8
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
@@ -511,7 +537,7 @@ msgstr ""
 "\n"
 "%s  Ikke fullstendig funksjonell."
 
-#: ../src/applet.glade.h:12
+#: ../gnome/applet/applet.glade.h:12
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
@@ -528,75 +554,79 @@ msgstr ""
 "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."
 
-#: ../src/applet.glade.h:15
+#: ../gnome/applet/applet.glade.h:15
 msgid "Anonymous Identity:"
 msgstr "Anonym identitet:"
 
-#: ../src/applet.glade.h:16
+#: ../gnome/applet/applet.glade.h:16
 msgid "Authentication:"
 msgstr "Autentisering:"
 
-#: ../src/applet.glade.h:17
+#: ../gnome/applet/applet.glade.h:17
 msgid "Broadcast Address:"
 msgstr "Kringkastingsadresse:"
 
-#: ../src/applet.glade.h:18
+#: ../gnome/applet/applet.glade.h:18
 msgid "CA Certificate File:"
 msgstr "Sertifikatfil for CA:"
 
-#: ../src/applet.glade.h:19
+#: ../gnome/applet/applet.glade.h:19
 msgid "C_onnect"
 msgstr "K_oble til"
 
-#: ../src/applet.glade.h:20
+#: ../gnome/applet/applet.glade.h:20
 msgid "Client Certificate File:"
 msgstr "Sertifikatfil for klient:"
 
-#: ../src/applet.glade.h:21
+#: ../gnome/applet/applet.glade.h:21
 msgid "Connection Information"
 msgstr "Tilkoblingsinformasjon"
 
-#: ../src/applet.glade.h:22
+#: ../gnome/applet/applet.glade.h:22
 msgid "Default Route:"
 msgstr "Forvalgt rute:"
 
-#: ../src/applet.glade.h:23
+#: ../gnome/applet/applet.glade.h:23
 msgid "Destination Address:"
 msgstr "Måladresse:"
 
-#: ../src/applet.glade.h:24
+#: ../gnome/applet/applet.glade.h:24
 msgid "Driver:"
 msgstr "Driver:"
 
-#: ../src/applet.glade.h:25
+#: ../gnome/applet/applet.glade.h:25
 msgid "EAP Method:"
 msgstr "EAP-metode:"
 
-#: ../src/applet.glade.h:26
+#: ../gnome/applet/applet.glade.h:26
 msgid "Hardware Address:"
 msgstr "Maskinvareadresse:"
 
-#: ../src/applet.glade.h:27
+#: ../gnome/applet/applet.glade.h:27
 msgid "IP Address:"
 msgstr "IP adresse:"
 
-#: ../src/applet.glade.h:28
+#: ../gnome/applet/applet.glade.h:28
 msgid "Identity:"
 msgstr "Identitet:"
 
-#: ../src/applet.glade.h:29
+#: ../gnome/applet/applet.glade.h:29
 msgid "Interface:"
 msgstr "Grensesnitt:"
 
-#: ../src/applet.glade.h:30
+#: ../gnome/applet/applet.glade.h:30
 msgid "Key Type:"
 msgstr "Nøkkeltype:"
 
-#: ../src/applet.glade.h:31
+#: ../gnome/applet/applet.glade.h:31
+msgid "Key management:"
+msgstr "Nøkkelhåndtering:"
+
+#: ../gnome/applet/applet.glade.h:32
 msgid "Key:"
 msgstr "Nøkkel:"
 
-#: ../src/applet.glade.h:32
+#: ../gnome/applet/applet.glade.h:33
 msgid ""
 "None\n"
 "WEP 128-bit Passphrase\n"
@@ -608,7 +638,7 @@ msgstr ""
 "WEP 64/128-bit heksadesimal\n"
 "WEP 64/128-bit ASCII\n"
 
-#: ../src/applet.glade.h:37
+#: ../gnome/applet/applet.glade.h:38
 msgid ""
 "Open System\n"
 "Shared Key"
@@ -616,111 +646,115 @@ msgstr ""
 "Åpent system\n"
 "Delt nøkkel"
 
-#: ../src/applet.glade.h:39
+#: ../gnome/applet/applet.glade.h:40
 msgid "Other Wireless Network..."
 msgstr "Annet trådløst nettverk..."
 
-#: ../src/applet.glade.h:40
+#: ../gnome/applet/applet.glade.h:41
 msgid "Passphrase:"
 msgstr "Passord:"
 
-#: ../src/applet.glade.h:41
+#: ../gnome/applet/applet.glade.h:42
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../src/applet.glade.h:42
+#: ../gnome/applet/applet.glade.h:43
 msgid "Primary DNS:"
 msgstr "Primær DNS:"
 
-#: ../src/applet.glade.h:43
+#: ../gnome/applet/applet.glade.h:44
 msgid "Private Key File:"
 msgstr "Privat nøkkelfil:"
 
-#: ../src/applet.glade.h:44
+#: ../gnome/applet/applet.glade.h:45
 msgid "Private Key Password:"
 msgstr "Passord for privat nøkkel:"
 
-#: ../src/applet.glade.h:45
+#: ../gnome/applet/applet.glade.h:46
 msgid "Secondary DNS:"
 msgstr "Sekundær DNS:"
 
-#: ../src/applet.glade.h:46
+#: ../gnome/applet/applet.glade.h:47
 msgid "Select the CA Certificate File"
 msgstr "Velg sertifikatfil for CA"
 
-#: ../src/applet.glade.h:47
+#: ../gnome/applet/applet.glade.h:48
 msgid "Select the Client Certificate File"
 msgstr "Velg sertifikatfil for klient"
 
-#: ../src/applet.glade.h:48
+#: ../gnome/applet/applet.glade.h:49
 msgid "Select the Private Key File"
 msgstr "Velg fil med privat nøkkel"
 
-#: ../src/applet.glade.h:49
+#: ../gnome/applet/applet.glade.h:50
 msgid "Show key"
 msgstr "Vis nøkkel"
 
-#: ../src/applet.glade.h:50
+#: ../gnome/applet/applet.glade.h:51
 msgid "Show passphrase"
 msgstr "Vis passord"
 
-#: ../src/applet.glade.h:51
+#: ../gnome/applet/applet.glade.h:52
 msgid "Show password"
 msgstr "Vis passord"
 
-#: ../src/applet.glade.h:52
+#: ../gnome/applet/applet.glade.h:53
 msgid "Show passwords"
 msgstr "Vis passord"
 
-#: ../src/applet.glade.h:53
+#: ../gnome/applet/applet.glade.h:54
 msgid "Speed:"
 msgstr "Hastighet:"
 
-#: ../src/applet.glade.h:54
+#: ../gnome/applet/applet.glade.h:55
 msgid "Subnet Mask:"
 msgstr "Subnettmaske:"
 
-#: ../src/applet.glade.h:55
+#: ../gnome/applet/applet.glade.h:56
 msgid "Type:"
 msgstr "Type:"
 
-#: ../src/applet.glade.h:56
+#: ../gnome/applet/applet.glade.h:57
 msgid "User Name:"
 msgstr "Brukernavn:"
 
-#: ../src/applet.glade.h:57
+#: ../gnome/applet/applet.glade.h:58
 msgid "Wireless Network Key Required"
 msgstr "Nøkkel for trådløst nettverk kreves"
 
-#: ../src/applet.glade.h:58
+#: ../gnome/applet/applet.glade.h:59
 msgid "Wireless _adapter:"
 msgstr "Trådløst _kort:"
 
-#: ../src/applet.glade.h:59
+#: ../gnome/applet/applet.glade.h:60
 msgid "_Always Trust this Wireless Network"
 msgstr "Stol _alltid på dette trådløse nettverket"
 
-#: ../src/applet.glade.h:60
+#: ../gnome/applet/applet.glade.h:61
 msgid "_Don't remind me again"
 msgstr "_Ikke vis påminnelse igjen"
 
-#: ../src/applet.glade.h:61
+#: ../gnome/applet/applet.glade.h:62
+msgid "_Fallback on this Network"
+msgstr "_Fall tilbake til dette nettverk"
+
+#: ../gnome/applet/applet.glade.h:63
 msgid "_Login to Network"
 msgstr "_Logg på nettverk"
 
-#: ../src/applet.glade.h:62
+#: ../gnome/applet/applet.glade.h:64
 msgid "_Network Name:"
 msgstr "_Nettverksnavn:"
 
-#: ../src/applet.glade.h:63
+#: ../gnome/applet/applet.glade.h:65
 msgid "_Wireless Security:"
 msgstr "Tr_ådløs sikkerhet:"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:383
+#: ../gnome/vpn-properties/nm-vpn-properties.c:417
 msgid "Cannot add VPN connection"
 msgstr "Kan ikke legge til VPN-tilkobling"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:385
+#: ../gnome/vpn-properties/nm-vpn-properties.c:419
 msgid ""
 "No suitable VPN software was found on your system. Contact your system "
 "administrator."
@@ -728,11 +762,11 @@ msgstr ""
 "Ingen passende VPN-programvare ble funnet på systemet. Kontakt din "
 "systemadministrator."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:437
+#: ../gnome/vpn-properties/nm-vpn-properties.c:461
 msgid "Cannot import VPN connection"
 msgstr "Kan ikke importere VPN-tilkobling"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:439
+#: ../gnome/vpn-properties/nm-vpn-properties.c:463
 #, c-format
 msgid ""
 "Cannot find suitable software for VPN connection type '%s' to import the "
@@ -741,12 +775,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:579
+#: ../gnome/vpn-properties/nm-vpn-properties.c:580
 #, c-format
 msgid "Error retrieving VPN connection '%s'"
 msgstr "Feil under henting av VPN tilkobling «%s»"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:582
+#: ../gnome/vpn-properties/nm-vpn-properties.c:583
 #, c-format
 msgid ""
 "Could not find the UI files for VPN connection type '%s'. Contact your "
@@ -755,12 +789,12 @@ msgstr ""
 "Kunne ikke finne brukergrensesnittfiler for VPN-tilkobling type «%s». "
 "Kontakt din systemadministrator."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:739
+#: ../gnome/vpn-properties/nm-vpn-properties.c:727
 #, c-format
 msgid "Delete VPN connection \"%s\"?"
 msgstr "Slett VPN-tilkobling «%s»?"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:742
+#: ../gnome/vpn-properties/nm-vpn-properties.c:730
 #, c-format
 msgid ""
 "All information about the VPN connection \"%s\" will be lost and you may "
@@ -770,16 +804,36 @@ 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:959
+#: ../gnome/vpn-properties/nm-vpn-properties.c:924
 msgid "Unable to load"
 msgstr "Kunne ikke laste"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:961
+#: ../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)."
 
+#. druid_window = GTK_DIALOG (gtk_dialog_new_with_buttons (_("Create VPN Connection"),
+#. NULL,
+#. GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+#. GTK_STOCK_CANCEL,
+#. GTK_RESPONSE_REJECT,
+#. GTK_STOCK_APPLY,
+#. GTK_RESPONSE_ACCEPT,
+#. NULL));
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1081
+msgid "Create VPN Connection"
+msgstr "Opprett VPN-tilkobling"
+
+#. gtk_container_add (GTK_CONTAINER (druid_window->vbox), GTK_WIDGET(gtk_label_new("Some label")));
+#. gtk_box_pack_start (GTK_BOX (druid_window->vbox), GTK_WIDGET(druid), TRUE,TRUE,0);
+#. gtk_box_pack_start (GTK_BOX (druid_window->vbox), GTK_WIDGET(gtk_label_new("Some label")), TRUE,TRUE,0);
+#. toplevel = gtk_widget_get_toplevel (GTK_WIDGET (druid));
+#. gtk_signal_connect (GTK_OBJECT (toplevel), "delete_event", GTK_SIGNAL_FUNC (vpn_window_close), NULL);
+#. make the druid window modal wrt. our main window
+#. gtk_window_set_modal (druid_window, TRUE);
+#. gtk_window_set_transient_for (GTK_WINDOW(druid_window), GTK_WINDOW (dialog));
 #. Edit dialog
-#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1099
 msgid "Edit VPN Connection"
 msgstr "Rediger VPN-tilkobling"
 
@@ -788,68 +842,30 @@ 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
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
 msgid "E_xport"
 msgstr "E_ksporter"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:9
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
 msgid "Edit the selected VPN connection"
 msgstr "Rediger valgt VPN-tilkobling"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:10
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
 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
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
 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
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
 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
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
 msgid "VPN Connections"
 msgstr "VPN-tilkoblinger"
 
@@ -885,11 +901,11 @@ msgstr "WPA2 CCMP"
 msgid "WPA2 Automatic"
 msgstr "WPA2 automatisk"
 
-#: ../src/nm-ap-security.c:320
+#: ../src/nm-ap-security.c:338
 msgid "none"
 msgstr "ingen"
 
-#: ../src/nm-netlink-monitor.c:154
+#: ../src/nm-netlink-monitor.c:174
 #, c-format
 msgid ""
 "unable to create netlink socket for monitoring wired ethernet devices - %s"
@@ -897,7 +913,7 @@ msgstr ""
 "kan ikke opprette netlink-plugg for overvåking av kablede ethernet-enheter - "
 "%s"
 
-#: ../src/nm-netlink-monitor.c:172
+#: ../src/nm-netlink-monitor.c:192
 #, c-format
 msgid ""
 "unable to bind to netlink socket for monitoring wired ethernet devices - %s"
@@ -905,83 +921,52 @@ msgstr ""
 "kan ikke binde til netlink-plugg for overvåking av kablede ethernet-enheter "
 "- %s"
 
-#: ../src/nm-netlink-monitor.c:405
+#: ../src/nm-netlink-monitor.c:427
 msgid "operation took too long"
 msgstr "operasjonen tok for lang tid"
 
-#: ../src/nm-netlink-monitor.c:502
+#: ../src/nm-netlink-monitor.c:524
 msgid "received data from wrong type of sender"
 msgstr "mottok data fra feil type avsender"
 
-#: ../src/nm-netlink-monitor.c:515
+#: ../src/nm-netlink-monitor.c:537
 msgid "received data from unexpected sender"
 msgstr "mottok data fra uventet avsender"
 
-#: ../src/nm-netlink-monitor.c:646
+#: ../src/nm-netlink-monitor.c:666
 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
+#: ../src/nm-netlink-monitor.c:776
 msgid "error occurred while waiting for data on socket"
 msgstr "det skjedde en feil under venting på data på sokkel"
 
-#: ../src/applet-dbus-devices.c:898
+#: ../gnome/applet/applet-dbus-devices.c:930
 #, 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»."
 
-#: ../src/applet-dbus-devices.c:903
+#: ../gnome/applet/applet-dbus-devices.c:935
 #, c-format
 msgid "You are now connected to the wireless network '%s'."
 msgstr "Du er nå koblet til trådløst nettverk «%s»."
 
-#: ../src/applet-dbus-devices.c:910
+#: ../gnome/applet/applet-dbus-devices.c:942
 msgid "You are now connected to the wired network."
 msgstr "Du er nå koblet til kablet nettverk."
 
-#: ../src/applet-dbus-devices.c:916
+#: ../gnome/applet/applet-dbus-devices.c:948
 msgid "Connection Established"
 msgstr "Tilkobling etablert"
 
-#: ../src/applet-dbus-devices.c:959
+#: ../gnome/applet/applet-dbus-devices.c:997
 msgid "Disconnected"
 msgstr "Frakoblet"
 
-#: ../src/applet-dbus-devices.c:960
+#: ../gnome/applet/applet-dbus-devices.c:998
 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"
+#: ../src/nm-ap-security-leap.c:66 ../src/nm-ap-security-leap.c:82
+msgid "LEAP"
+msgstr "LEAP"
diff --git a/po/ne.po b/po/ne.po
index b326cf60..62e9d8c0 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -1,496 +1,478 @@
+# translation of NetworkManager.HEAD.ne.po to Nepali
 # translation of NetworkManager.HEAD.po to Nepali
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 # Jyotsna Shrestha <jyoshrestha@hotmail.com>, 2005.
+# Ganesh Ghimire <gghimire@gmail.com>, 2005.
+# Dadhiram Nepal <yourssymbol@gmail.com>, 2005.
+# Jaydeep Bhusal <zaydeep@hotmail.com>, 2005.
+# Mahesh subedi <submanesh@hotmail.com>, 2006.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: NetworkManager.HEAD\n"
-"Report-Msgid-Bugs-To: \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"
+"Project-Id-Version: NetworkManager.HEAD.ne\n"
+"Report-Msgid-Bugs-To:<info@mpp.org.np> \n"
+"POT-Creation-Date: 2006-05-15 12:26+0200\n"
+"PO-Revision-Date: 2006-09-04 10:10+0545\n"
+"Last-Translator: Mahesh subedi <submanesh@hotmail.com>\n"
 "Language-Team: Nepali <info@mpp.org.np>\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!=0;\n"
-"X-Generator: KBabel 1.9.1\n"
+"Plural-Forms: nplurals=2;plural=(n!=1)\n"
+"X-Generator: KBabel 1.10.2\n"
 
-#: ../src/applet-compat.c:171 ../src/applet-dbus-info.c:919
-#, fuzzy, c-format
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:919
+#, c-format
 msgid "Passphrase for wireless network %s"
-msgstr "नयाँ ताररहित संजाल सृजना गर्नुहोला।"
+msgstr "ताररहित सञ्जाल %s का लागि पासफ्रेज"
 
-#: ../src/applet-dbus.c:265
-#, fuzzy, c-format
+#: ../gnome/applet/applet-dbus.c:383
+#, c-format
 msgid "Connection to the wireless network '%s' failed."
-msgstr "ताररहित संजाल '%s' सम्पर्क गरिदै..."
+msgstr "ताररहित सञ्जाल '%s' जडान असफल"
 
-#: ../src/applet-dbus.c:270
-#, fuzzy
+#: ../gnome/applet/applet-dbus.c:388
 msgid "Connection to the wired network failed."
-msgstr "तारसहित संजालमा सम्पर्क गरिदै..."
+msgstr "तारसहित सञ्जालमा जडान असफल"
 
-#: ../src/applet.c:184
+#: ../gnome/applet/applet.c:184
 msgid "Error displaying connection information:"
-msgstr ""
+msgstr "जडान सूचना प्रदर्शन गर्दा त्रुटि:"
 
-#: ../src/applet.c:202
-#, fuzzy
+#: ../gnome/applet/applet.c:202
 msgid "Could not find some required resources (the glade file)!"
-msgstr "संजालप्रबन्धक एपप्लेटले केहि आवश्यक स्रोतहरू फेला पार्नसकेन (ग्लेड फाइल फेला परेन)।"
+msgstr "केही आवश्यक स्रोतहरू (ग्लाड फाइल) फेला पार्न सकेन !"
 
-#: ../src/applet.c:213
-#, fuzzy
+#: ../gnome/applet/applet.c:213
 msgid "No active connections!"
-msgstr "संजाल जडान छैन"
+msgstr "सक्रिय जडान छैन !"
 
-#: ../src/applet.c:234
-#, fuzzy, c-format
+#: ../gnome/applet/applet.c:234
+#, c-format
 msgid "Wired Ethernet (%s)"
-msgstr "तारसहित सञ्जाल (%s)"
+msgstr "तारसहित इथरनेट (%s)"
 
-#: ../src/applet.c:236
-#, fuzzy, c-format
+#: ../gnome/applet/applet.c:236
+#, c-format
 msgid "Wireless Ethernet (%s)"
-msgstr "ताररहित सञ्जाल (%s)"
+msgstr "ताररहित इथरनेट (%s)"
 
-#: ../src/applet.c:337 ../src/applet.c:362
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:362
 msgid "NetworkManager Applet"
-msgstr "संजालप्रबन्धक एप्लेट"
+msgstr "सञ्जाल प्रबन्धक एप्लेट"
 
-#: ../src/applet.c:339 ../src/applet.c:364
-#, fuzzy
+#: ../gnome/applet/applet.c:339 ../gnome/applet/applet.c:364
 msgid "Copyright © 2004-2005 Red Hat, Inc."
-msgstr "सर्वाधिकार (C) २००४-२००५ रेड ह्याट, आइएनसि।"
+msgstr "सर्वाधिकार © 2004-2005 Red Hat, Inc."
 
-#: ../src/applet.c:340 ../src/applet.c:365
-msgid ""
-"Notification area applet for managing your network devices and connections."
-msgstr "तपाईको संजाल यन्त्रहरू र जडानहरू प्रबन्धको लागी चेतावनी क्षेत्र एपप्लेट"
+#: ../gnome/applet/applet.c:340 ../gnome/applet/applet.c:365
+msgid "Notification area applet for managing your network devices and connections."
+msgstr "तपाईँको सञ्जाल यन्त्र र जडान प्रबन्धका लागि चेतावनी क्षेत्र एप्लेट"
 
-#: ../src/applet.c:343 ../src/applet.c:370
+#: ../gnome/applet/applet.c:343 ../gnome/applet/applet.c:370
 msgid "translator-credits"
 msgstr ""
+"Mahesh Subedi <submanesh@hotmail.com>"
+"Ganesh Ghimire <gghimire@gmail.com>"
+"Dadhiram Nepal <yourssymbol@gmail.com>"
+"Jaydeep Bhusal <zaydeep@hotmail.com>"
 
-#: ../src/applet.c:426
+#: ../gnome/applet/applet.c:426
 msgid "VPN Login Failure"
-msgstr ""
+msgstr "VPN लगइन असफल"
 
-#: ../src/applet.c:427
+#: ../gnome/applet/applet.c:427
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a login failure."
-msgstr ""
+msgstr "लगइन असफलताका कारणले VPN जडान '%s' सुरु गर्न सकेन ।"
 
-#: ../src/applet.c:431
+#: ../gnome/applet/applet.c:431
 msgid "VPN Start Failure"
-msgstr ""
+msgstr "VPN लगइन असफल"
 
-#: ../src/applet.c:432
+#: ../gnome/applet/applet.c:432
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
 "program."
-msgstr ""
+msgstr "कार्यक्रम सरुआत असफलताका कारणले VPN जडान '%s' सुरु गर्न सकेन ।"
 
-#: ../src/applet.c:436 ../src/applet.c:446
-#, fuzzy
+#: ../gnome/applet/applet.c:436 ../gnome/applet/applet.c:446
 msgid "VPN Connect Failure"
-msgstr "संजाल जडान छैन"
+msgstr "VPN जडान असफल"
 
-#: ../src/applet.c:437
+#: ../gnome/applet/applet.c:437
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a connection error."
-msgstr ""
+msgstr "जडान त्रुटिका कारणले VPN जडान '%s' सुरु गर्न सकेन ।"
 
-#: ../src/applet.c:441
+#: ../gnome/applet/applet.c:441
 msgid "VPN Configuration Error"
-msgstr ""
+msgstr "VPN कन्फिगरेसन त्रुटि"
 
-#: ../src/applet.c:442
+#: ../gnome/applet/applet.c:442
 #, c-format
 msgid "The VPN connection '%s' was not correctly configured."
-msgstr ""
+msgstr "VPN जडान '%s' सही कन्फिगर भएको थिएन ।"
 
-#: ../src/applet.c:447
+#: ../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 ""
+msgstr "VPN सर्भरले प्रयाप्त सञ्जाल कन्फिगरेसन फिर्ता नगरेको कारणले VPN जडान '%s' सुरु गर्न सकेन ।"
 
-#: ../src/applet.c:517
+#: ../gnome/applet/applet.c:517
 msgid "VPN Login Message"
-msgstr ""
+msgstr "VPN लगइन सन्देश"
 
-#: ../src/applet.c:741 ../src/applet.c:2508
-#: ../src/other-network-dialog.c:453
-#: ../src/passphrase-dialog.c:228
+#: ../gnome/applet/applet.c:741 ../gnome/applet/applet.c:2506
+#: ../gnome/applet/other-network-dialog.c:453
+#: ../gnome/applet/passphrase-dialog.c:229
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
-msgstr "संजालप्रबन्धक एपप्लेटले केहि आवश्यक स्रोतहरू फेला पार्नसकेन (ग्लेड फाइल फेला परेन)।"
+msgstr "सञ्जाल प्रबन्धक एप्लेटले केही आवश्यक स्रोतहरू (ग्लेड फाइल फेला परेन) फेला पार्न सकेन ।"
 
-#: ../src/applet.c:753
+#: ../gnome/applet/applet.c:753
 #, c-format
 msgid "The network device \"%s (%s)\" does not support wireless scanning."
-msgstr "संजाल साधन \"%s (%s)\" ले ताररहित स्क्यानिङलाई समर्थन गरेन।"
+msgstr "सञ्जाल यन्त्र \"%s (%s)\" ले ताररहित स्क्यानिङलाई समर्थन गरेन ।"
 
-#: ../src/applet.c:761
+#: ../gnome/applet/applet.c:761
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
-msgstr "संजाल साधन \"%s (%s)\" ले सम्पर्क अनुसन्धान समर्थन गरेन।"
+msgstr "सञ्जाल यन्त्र \"%s (%s)\" ले लिङ्क अनुसन्धान समर्थन गरेन ।"
 
-#: ../src/applet.c:908
-#, fuzzy, c-format
+#: ../gnome/applet/applet.c:908
+#, c-format
 msgid "Preparing device %s for the wired network..."
-msgstr "तारसहित संजालमा सम्पर्क गरिदै..."
+msgstr "तारसहित सञ्जालका लागि यन्त्र %s तयारी गरिँदैछ..."
 
-#: ../src/applet.c:910
-#, fuzzy, c-format
+#: ../gnome/applet/applet.c:910
+#, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
-msgstr "ताररहित संजाल '%s' सम्पर्क गरिदै..."
+msgstr "ताररहित सञ्जाल '%s'का लागि यन्त्र %s तयारी गरिँदैछ..."
 
-#: ../src/applet.c:918
-#, fuzzy, c-format
+#: ../gnome/applet/applet.c:918
+#, c-format
 msgid "Configuring device %s for the wired network..."
-msgstr "तारसहित संजालमा सम्पर्क गरिदै..."
+msgstr "तारसहित सञ्जालका लागि यन्त्र %s तयारी गरिँदैछ..."
 
-#: ../src/applet.c:920
-#, fuzzy, c-format
+#: ../gnome/applet/applet.c:920
+#, c-format
 msgid "Attempting to join the wireless network '%s'..."
-msgstr "ताररहित संजाल '%s' सम्पर्क गरिदै..."
+msgstr "ताररहित सञ्जाल '%s' जडान गर्न समाहित गरिँदैछ..."
 
-#: ../src/applet.c:928
-#, fuzzy, c-format
+#: ../gnome/applet/applet.c:928
+#, c-format
 msgid "Waiting for Network Key for the wireless network '%s'..."
-msgstr "ताररहित संजाल '%s' सम्पर्क गरिदै..."
+msgstr "ताररहित सञ्जाल '%s' का लागि सञ्जाल कुञ्जीलाई प्रतिक्षा गर्दैछ..."
 
-#: ../src/applet.c:936 ../src/applet.c:946
-#, fuzzy
+#: ../gnome/applet/applet.c:936 ../gnome/applet/applet.c:946
 msgid "Requesting a network address from the wired network..."
-msgstr "तारसहित संजालमा सम्पर्क गरिदै..."
+msgstr "तारसहित सञ्जालबाट एउटा सञ्जाल ठेगाना अनुरोध गरिँदैछ..."
 
-#: ../src/applet.c:938 ../src/applet.c:948
-#, fuzzy, 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 "ताररहित संजाल '%s' सम्पर्क गरिदै..."
+msgstr "ताररहित सञ्जाल '%s' बाट सञ्जाल ठेगाना अनुरोध गरिँदैछ..."
 
-#: ../src/applet.c:956
-#, fuzzy
+#: ../gnome/applet/applet.c:956
 msgid "Finishing connection to the wired network..."
-msgstr "तारसहित संजालमा सम्पर्क गरिदै..."
+msgstr "तारसहित सञ्जालमा जडान सकिँदैछ..."
 
-#: ../src/applet.c:958
-#, fuzzy, c-format
+#: ../gnome/applet/applet.c:958
+#, c-format
 msgid "Finishing connection to the wireless network '%s'..."
-msgstr "ताररहित संजाल '%s' सम्पर्क गरिदै..."
+msgstr "ताररहित सञ्जाल '%s' मा जडान सकिँदैछ..."
 
-#: ../src/applet.c:1075
+#: ../gnome/applet/applet.c:1075
 msgid "NetworkManager is not running"
-msgstr "संजालप्रबन्धक संचालन भईराखेको छैन।"
+msgstr "सञ्जाल प्रबन्धक चलिरहेको छैन ।"
 
-#: ../src/applet.c:1083 ../src/applet.c:1828
+#: ../gnome/applet/applet.c:1083 ../gnome/applet/applet.c:1826
 msgid "Networking disabled"
-msgstr ""
+msgstr "सञ्जाल अक्षम पारियो"
 
-#: ../src/applet.c:1088
+#: ../gnome/applet/applet.c:1088
 msgid "No network connection"
-msgstr "संजाल जडान छैन"
+msgstr "सञ्जाल जडान छैन"
 
-#: ../src/applet.c:1093
+#: ../gnome/applet/applet.c:1093
 msgid "Wired network connection"
-msgstr "तारसहित संजाल जडान"
+msgstr "तारसहित सञ्जाल जडान"
 
-#: ../src/applet.c:1097
+#: ../gnome/applet/applet.c:1097
 msgid "Connected to an Ad-Hoc wireless network"
-msgstr "एड-एचओसि ताररहित संजालमा सम्पर्क स्थापना गरियो।"
+msgstr "Ad-Hoc ताररहित सञ्जालमा जडान स्थापना गरियो"
 
-#: ../src/applet.c:1099
+#: ../gnome/applet/applet.c:1099
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
-msgstr "'%s' (%d%%) मा ताररहित संजाल सम्पर्क"
+msgstr "'%s' (%d%%) मा ताररहित सञ्जाल जडान"
 
-#: ../src/applet.c:1120
-#, fuzzy, c-format
+#: ../gnome/applet/applet.c:1120
+#, c-format
 msgid "VPN connection to '%s'"
-msgstr "संजाल जडान छैन"
+msgstr "'%s' मा VPN जडान"
 
-#: ../src/applet.c:1128
-#, fuzzy, c-format
+#: ../gnome/applet/applet.c:1128
+#, c-format
 msgid "VPN connecting to '%s'"
-msgstr "संजाल जडान छैन"
+msgstr "'%s' मा VPN जडान गरिँदैछ"
 
-#: ../src/applet.c:1541
-#, fuzzy
+#: ../gnome/applet/applet.c:1541
 msgid "_Connect to Other Wireless Network..."
-msgstr "अन्य ताररहित संजालहरू॰॰॰"
+msgstr "अन्य ताररहित सञ्जालमा जडान गर्नुहोस्..."
 
-#: ../src/applet.c:1562
-#, fuzzy
+#: ../gnome/applet/applet.c:1562
 msgid "Create _New Wireless Network..."
-msgstr "नयाँ ताररहित सञ्जाल सृजना॰॰॰"
+msgstr "नयाँ ताररहित सञ्जाल सिर्जना गर्नुहोस्..."
 
-#: ../src/applet.c:1685
-#, fuzzy
+#: ../gnome/applet/applet.c:1683
 msgid "_VPN Connections"
-msgstr "संजाल जडान छैन"
+msgstr "VPN जडान"
 
-#: ../src/applet.c:1730
+#: ../gnome/applet/applet.c:1728
 msgid "_Configure VPN..."
-msgstr ""
+msgstr "VPN कन्फिगर गर्नुहोस्..."
 
-#: ../src/applet.c:1734
+#: ../gnome/applet/applet.c:1732
 msgid "_Disconnect VPN..."
-msgstr ""
+msgstr "VPN जडान बिच्छेद गर्नुहोस्..."
 
-#: ../src/applet.c:1756
-#, fuzzy
+#: ../gnome/applet/applet.c:1754
 msgid "_Dial Up Connections"
-msgstr "संजाल जडान छैन"
+msgstr "डायलअप जडान"
 
 #. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
-#: ../src/applet.c:1767
+#: ../gnome/applet/applet.c:1765
 #, c-format
 msgid "Connect to %s..."
-msgstr ""
+msgstr "%s मा जडान गर्नुहोस्..."
 
-#: ../src/applet.c:1773
+#: ../gnome/applet/applet.c:1771
 #, c-format
 msgid "Disconnect from %s..."
-msgstr ""
+msgstr "%s बाट जडान बिच्छेद गर्नुहोस्..."
 
-#: ../src/applet.c:1822
+#: ../gnome/applet/applet.c:1820
 msgid "No network devices have been found"
-msgstr "संजाल साधन फेला परेको छैन।"
+msgstr "सञ्जाल यन्त्र फेला पारेको छैन"
 
-#: ../src/applet.c:2014
+#: ../gnome/applet/applet.c:2012
 msgid "NetworkManager is not running..."
-msgstr "संजालप्रबन्धक संचालन भईराखेको छैन॰॰॰"
+msgstr "सञ्जाल प्रबन्धक चलिरहेको छैन..."
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2170
+#: ../gnome/applet/applet.c:2168
 msgid "Enable _Networking"
-msgstr ""
+msgstr "सञ्जाल सक्षम पार्नुहोस्"
 
 #. 'Enable Wireless' item
-#: ../src/applet.c:2176
+#: ../gnome/applet/applet.c:2174
 msgid "Enable _Wireless"
-msgstr ""
+msgstr "ताररहित सक्षम पार्नुहोस्"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2182
+#: ../gnome/applet/applet.c:2180
 msgid "Connection _Information"
-msgstr ""
+msgstr "जडान सूचना"
 
 #. Help item
-#: ../src/applet.c:2193
-#, fuzzy
+#: ../gnome/applet/applet.c:2191
 msgid "_Help"
-msgstr "मद्दत॒"
+msgstr "मद्दत"
 
 #. About item
-#: ../src/applet.c:2202
-#, fuzzy
+#: ../gnome/applet/applet.c:2200
 msgid "_About"
-msgstr "बारेमा॒"
+msgstr "बारेमा"
 
-#: ../src/applet.c:2667
-#, fuzzy
+#: ../gnome/applet/applet.c:2625
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
-msgstr "संजालप्रबन्धक एपप्लेटले केहि आवश्यक स्रोतहरू फेला पार्नसकेन (ग्लेड फाइल फेला परेन)।"
+msgstr "सञ्जाल प्रबन्धक एप्लेटले केही आवश्यक स्रोतहरू फेला पार्न सकेन । यसलाई सुचारू गर्न सकेन ।\n"
 
-#: ../src/wireless-security-option.c:157
+#: ../gnome/applet/wireless-security-option.c:157
 msgid "Open System"
-msgstr ""
+msgstr "प्रणाली खोल्नुहोस्"
 
-#: ../src/wireless-security-option.c:160
+#: ../gnome/applet/wireless-security-option.c:160
 msgid "Shared Key"
-msgstr ""
+msgstr "साझेदारी गरिएको कुञ्जी"
 
-#: ../src/wireless-security-option.c:208
+#: ../gnome/applet/wireless-security-option.c:208
 msgid "Automatic (Default)"
-msgstr ""
+msgstr "स्वचालित (पूर्वनिर्धारित)"
 
-#: ../src/wireless-security-option.c:215
+#: ../gnome/applet/wireless-security-option.c:215
 msgid "AES-CCMP"
-msgstr ""
+msgstr "AES-CCMP"
 
-#: ../src/wireless-security-option.c:223
+#: ../gnome/applet/wireless-security-option.c:223
 msgid "TKIP"
-msgstr ""
+msgstr "TKIP"
 
-#: ../src/wireless-security-option.c:231
+#: ../gnome/applet/wireless-security-option.c:231
 msgid "Dynamic WEP"
-msgstr ""
+msgstr "गतिशिल WEP"
 
-#: ../src/wso-none.c:53
+#: ../gnome/applet/wso-none.c:53
 msgid "None"
-msgstr ""
+msgstr "कुनै पनि होइन"
 
-#: ../src/wso-wep-ascii.c:138
+#: ../gnome/applet/wso-wep-ascii.c:138
 msgid "WEP 64/128-bit ASCII"
-msgstr ""
+msgstr "WEP 64/128-bit ASCII"
 
-#: ../src/wso-wep-hex.c:135
+#: ../gnome/applet/wso-wep-hex.c:135
 msgid "WEP 64/128-bit Hex"
-msgstr ""
+msgstr "WEP 64/128-बिट हेक्स"
 
-#: ../src/wso-wep-passphrase.c:135
-#, fuzzy
+#: ../gnome/applet/wso-wep-passphrase.c:135
 msgid "WEP 128-bit Passphrase"
-msgstr "गुज्रिएकोवाक्य:"
+msgstr "WEP 128-bit पासफ्रेज"
 
-#: ../src/wso-wpa-eap.c:237
+#: ../gnome/applet/wso-wpa-eap.c:237
 msgid "PEAP"
-msgstr ""
+msgstr "PEAP"
 
-#: ../src/wso-wpa-eap.c:238
+#: ../gnome/applet/wso-wpa-eap.c:238
 msgid "TLS"
-msgstr ""
+msgstr "TLS"
 
-#: ../src/wso-wpa-eap.c:239
+#: ../gnome/applet/wso-wpa-eap.c:239
 msgid "TTLS"
-msgstr ""
+msgstr "TTLS"
 
-#: ../src/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
+#: ../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 ""
+msgstr "WPA2 उद्योग"
 
-#: ../src/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
+#: ../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 ""
+msgstr "WPA उद्योग"
 
-#: ../src/wso-wpa-psk.c:178
+#: ../gnome/applet/wso-wpa-psk.c:178
 msgid "WPA2 Personal"
-msgstr ""
+msgstr "WPA2 व्यक्तिगत"
 
-#: ../src/wso-wpa-psk.c:180
+#: ../gnome/applet/wso-wpa-psk.c:180
 msgid "WPA Personal"
-msgstr ""
+msgstr "WPA व्यक्तिगत"
 
-#: ../src/eggtrayicon.c:134
+#: ../gnome/applet/eggtrayicon.c:134
 msgid "Orientation"
-msgstr "अभिमुखीकरण॒"
+msgstr "अभिमुखीकरण"
 
-#: ../src/eggtrayicon.c:135
+#: ../gnome/applet/eggtrayicon.c:135
 msgid "The orientation of the tray."
-msgstr "ट्रेको अभिमुखीकरण॒"
+msgstr "ट्रेको अभिमुखीकरण"
 
-#: ../src/menu-items.c:88
+#: ../gnome/applet/menu-items.c:87
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "तारसहित सञ्जाल (%s)"
 
-#: ../src/menu-items.c:91
-#, fuzzy
+#: ../gnome/applet/menu-items.c:90
 msgid "_Wired Network"
 msgstr "तारसहित सञ्जाल"
 
-#: ../src/menu-items.c:162
+#: ../gnome/applet/menu-items.c:161
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
 msgstr[0] "ताररहित सञ्जाल (%s)"
-msgstr[1] "ताररहित सञ्जालहरू (%s)"
+msgstr[1] "ताररहित सञ्जाल (%s)"
 
-#: ../src/menu-items.c:164
+#: ../gnome/applet/menu-items.c:163
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "ताररहित सञ्जाल"
-msgstr[1] "ताररहित सञ्जालहरू"
+msgstr[1] "ताररहित सञ्जाल"
 
-#: ../src/menu-items.c:343
+#: ../gnome/applet/menu-items.c:330
 msgid " (invalid Unicode)"
-msgstr " (अमान्य यूनिकोड)"
+msgstr " (अवैध यूनिकोड)"
 
-#: ../src/other-network-dialog.c:352
+#: ../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 ""
+msgstr "पूर्वनिर्धारण अनुसार, कुनै गुप्तीकरण सक्षम नपारिकन ताररहित सञ्जालको नाम तपाईँको कम्प्युटरको नाम  %s मा सेट हुन्छ"
 
-#: ../src/other-network-dialog.c:358
+#: ../gnome/applet/other-network-dialog.c:358
 msgid "Create new wireless network"
-msgstr "नयाँ ताररहित संजाल सृजना गर्नुहोला।"
+msgstr "नयाँ ताररहित सञ्जाल सिर्जना गर्नुहोस्"
 
-#: ../src/other-network-dialog.c:359
-#, fuzzy
+#: ../gnome/applet/other-network-dialog.c:359
 msgid ""
 "Enter the name and security settings of the wireless network you wish to "
 "create."
-msgstr ""
-"तपाईले सृजना गर्न चहानुभएको ताररहित संजालको ई एस एस आई डि र सुरक्षा मिलान प्रवेश "
-"गराउनुहोला।"
+msgstr "तपाईँले सिर्जना गर्न चहानुभएको ताररहित सञ्जालको नाम र सुरक्षा सेटिङ प्रविष्ट गर्नुहोस् ।"
 
-#: ../src/other-network-dialog.c:363
-#, fuzzy
+#: ../gnome/applet/other-network-dialog.c:363
 msgid "Create New Wireless Network"
-msgstr "नयाँ ताररहित सञ्जाल सृजना॰॰॰"
+msgstr "नयाँ ताररहित सञ्जाल सिर्जना गर्नुहोस्"
 
-#: ../src/other-network-dialog.c:368
-#, fuzzy
+#: ../gnome/applet/other-network-dialog.c:368
 msgid "Existing wireless network"
-msgstr "ताररहित संजाल आफै मिलाउनुहोला"
+msgstr "अवस्थित ताररहित सञ्जाल"
 
-#: ../src/other-network-dialog.c:369
-#, fuzzy
+#: ../gnome/applet/other-network-dialog.c:369
 msgid "Enter the name of the wireless network to which you wish to connect."
-msgstr "तपाईले सम्पर्क गर्न चहानुभएको ताररहित संजालको ई एस एस आई डि प्रवेश गराउनुहोला।"
+msgstr "तपाईँले जडान गर्न चहानुभएको ताररहित सञ्जालको नाम प्रविष्ट गर्नुहोस् ।"
 
-#: ../src/other-network-dialog.c:371
-#, fuzzy
+#: ../gnome/applet/other-network-dialog.c:371
 msgid "Connect to Other Wireless Network"
-msgstr "अन्य ताररहित संजालहरू॰॰॰"
+msgstr "अन्य ताररहित सञ्जालमा जडान गर्नुहोस्"
 
-#: ../src/passphrase-dialog.c:215
-#, fuzzy
+#: ../gnome/applet/passphrase-dialog.c:216
 msgid "Error connecting to wireless network"
-msgstr "ताररहित संजाल '%s' सम्पर्क गरिदै..."
+msgstr "ताररहित सञ्जालमा जडान गर्दा त्रुटि"
 
-#: ../src/passphrase-dialog.c:216
+#: ../gnome/applet/passphrase-dialog.c:217
 msgid ""
 "The requested wireless network requires security capabilities unsupported by "
 "your hardware."
-msgstr ""
+msgstr "अनुरोध गरिएको ताररहित सञ्जाललाई तपाईँको हार्डवयेरले समर्थन नगर्ने सुरक्षा क्षमता आवश्यक पर्दछ ।"
 
-#: ../src/vpn-password-dialog.c:151
-#: ../src/vpn-password-dialog.c:188
+#: ../gnome/applet/vpn-password-dialog.c:152
+#: ../gnome/applet/vpn-password-dialog.c:189
 #, c-format
 msgid "Cannot start VPN connection '%s'"
-msgstr ""
+msgstr "VPN जडान '%s' सुरु गर्न सकिँदैन"
 
-#: ../src/vpn-password-dialog.c:154
+#: ../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 ""
+msgstr "VPN जडान परकार '%s'का लागि प्रमाणीकरण समवाद भेटाउन सकेन । तपाईँको प्रणाली प्रशासकलाई सम्पर्क गर्नुहोस् ।"
 
-#: ../src/vpn-password-dialog.c:191
+#: ../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 ""
+msgstr "VPN जडान प्रकार '%s' का लागि प्रमाणीकरण विस्तार गर्दा समस्या थियो । तपाईँको प्रणाली प्रशासकलाई सम्पर्क गर्नुहोस् ।"
 
-#: ../src/applet.glade.h:1
+#: ../gnome/applet/applet.glade.h:1
 msgid " "
 msgstr " "
 
-#: ../src/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:2
+msgid "<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">जडान सूचना सक्रिय पार्नुहोस्</span>"
 
-#: ../src/applet.glade.h:4
+#: ../gnome/applet/applet.glade.h:4
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
@@ -499,24 +481,24 @@ msgid ""
 "A passphrase or encryption key is required to access the wireless network '%"
 "s'."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">गुजरिएकोवाक्य चाहियो ताररहित संजाल</span> "
-"बाट\n"
+"<span weight=\"bold\" size=\"larger\">ताररहित सञ्जाललाई पासफ्रेज आवश्यक पर्दछ</span>\n"
 "\n"
-"गुजरिएकोवाक्य र गुप्तिकरण कुन्ज ताररहित संजाल '%s' प्रवेशको लागी चाहिन्छ।"
+"ताररहित सञ्जाल '%"
+"s' को पहुँचका लागि एउटा पासफ्रेज वा गुप्तीकरण कुञ्जी आवश्यक पर्दछ ।"
 
-#: ../src/applet.glade.h:8
+#: ../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  यो पूर्ण कार्य हुने छैन।"
+"%s यो पूर्णरूपले प्रकार्यता हुने छैन ।"
 
-#: ../src/applet.glade.h:12
-#, fuzzy, no-c-format
+#: ../gnome/applet/applet.glade.h:12
+#, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
 "span>\n"
@@ -525,323 +507,308 @@ 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\">ताररहित संजाल लगइन प्रमाणित</span>\n"
+"<span weight=\"bold\" size=\"larger\">ताररहित सञ्जाल लगइन यकिन</span>\n"
 "\n"
-"तपाईले ताररहित संजाल '%s' मा लगइन छान्नु भएको छ। यदि तपाई निश्चिन्त हुनुहुन्छ कि "
-"ताररहित संजाल सुरक्षित छ, तलको जाँच बाकसमा क्लिक गर्नुहोला र संजाल प्रबन्धकले मन्द "
-"प्रश्नहरूले तपाईलाई दु:ख दिंदैन जब तपाई यससंग जोडिनुहुन्छ।."
+"तपाईँले ताररहित सञ्जाल '%s' मा लगइन रोज्नु भएको छ । यदि तपाईँ ताररहित सञ्जाल सुरक्षित छ भन्ने कुरामा निश्चिन्त हुनुहुन्छ भने तलको जाँच बाकसमा क्लिक गर्नुहोस् र सञ्जाल प्रबन्धकलाई क्रमागत लग आगतमा यकिन आवश्यक हुँदैन ।"
 
-#: ../src/applet.glade.h:15
+#: ../gnome/applet/applet.glade.h:15
 msgid "Anonymous Identity:"
-msgstr ""
+msgstr "पहिचान गुमनाम:"
 
-#: ../src/applet.glade.h:16
-#, fuzzy
+#: ../gnome/applet/applet.glade.h:16
 msgid "Authentication:"
-msgstr "अभिमुखीकरण॒"
+msgstr "प्रमाणीकरण:"
 
-#: ../src/applet.glade.h:17
+#: ../gnome/applet/applet.glade.h:17
 msgid "Broadcast Address:"
-msgstr ""
+msgstr "प्रसारण ठेगाना:"
 
-#: ../src/applet.glade.h:18
+#: ../gnome/applet/applet.glade.h:18
 msgid "CA Certificate File:"
-msgstr ""
+msgstr "CA प्रमाणपत्र फाइल:"
 
-#: ../src/applet.glade.h:19
+#: ../gnome/applet/applet.glade.h:19
 msgid "C_onnect"
-msgstr "सम्पर्क गर्नुहोला"
+msgstr "जडान गर्नुहोस्"
 
-#: ../src/applet.glade.h:20
+#: ../gnome/applet/applet.glade.h:20
 msgid "Client Certificate File:"
-msgstr ""
+msgstr "ग्राहक प्रमाणपत्र फाइल:"
 
-#: ../src/applet.glade.h:21
+#: ../gnome/applet/applet.glade.h:21
 msgid "Connection Information"
-msgstr ""
+msgstr "जडान सूचना"
 
-#: ../src/applet.glade.h:22
+#: ../gnome/applet/applet.glade.h:22
 msgid "Default Route:"
-msgstr ""
+msgstr "पूर्वनिरधारित बाटो:"
 
-#: ../src/applet.glade.h:23
+#: ../gnome/applet/applet.glade.h:23
 msgid "Destination Address:"
-msgstr ""
+msgstr "गन्तब्य ठेगाना:"
 
-#: ../src/applet.glade.h:24
+#: ../gnome/applet/applet.glade.h:24
 msgid "Driver:"
-msgstr ""
+msgstr "ड्राइभर:"
 
-#: ../src/applet.glade.h:25
+#: ../gnome/applet/applet.glade.h:25
 msgid "EAP Method:"
-msgstr ""
+msgstr "EAP विधि:"
 
-#: ../src/applet.glade.h:26
+#: ../gnome/applet/applet.glade.h:26
 msgid "Hardware Address:"
-msgstr ""
+msgstr "हार्डवयेर ठेगाना:"
 
-#: ../src/applet.glade.h:27
+#: ../gnome/applet/applet.glade.h:27
 msgid "IP Address:"
-msgstr ""
+msgstr "IP ठेगाना:"
 
-#: ../src/applet.glade.h:28
+#: ../gnome/applet/applet.glade.h:28
 msgid "Identity:"
-msgstr ""
+msgstr "पहिचान:"
 
-#: ../src/applet.glade.h:29
+#: ../gnome/applet/applet.glade.h:29
 msgid "Interface:"
-msgstr ""
+msgstr "इन्टरफेस:"
 
-#: ../src/applet.glade.h:30
+#: ../gnome/applet/applet.glade.h:30
 msgid "Key Type:"
-msgstr "कुन्ज प्रकार:"
+msgstr "कुञ्जी प्रकार:"
 
-#: ../src/applet.glade.h:31
-#, fuzzy
+#: ../gnome/applet/applet.glade.h:31
 msgid "Key:"
-msgstr "हेक्स कुन्ज:"
+msgstr "कुञ्जी:"
 
-#: ../src/applet.glade.h:32
+#: ../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-bit पासफ्रेस\n"
+"WEP 64/128-bit हेक्स\n"
+"WEP 64/128-bit ASCII\n"
 
-#: ../src/applet.glade.h:37
+#: ../gnome/applet/applet.glade.h:37
 msgid ""
 "Open System\n"
 "Shared Key"
 msgstr ""
+"खुला प्रणाली\n"
+"बाँडिएको कुञ्जी"
 
-#: ../src/applet.glade.h:39
-#, fuzzy
+#: ../gnome/applet/applet.glade.h:39
 msgid "Other Wireless Network..."
-msgstr "अन्य ताररहित संजालहरू॰॰॰"
+msgstr "अन्य ताररहित सञ्जाल..."
 
-#: ../src/applet.glade.h:40
+#: ../gnome/applet/applet.glade.h:40
 msgid "Passphrase:"
-msgstr "गुज्रिएकोवाक्य:"
+msgstr "पासफ्रेज:"
 
-#: ../src/applet.glade.h:41
+#: ../gnome/applet/applet.glade.h:41
 msgid "Password:"
-msgstr ""
+msgstr "पासवर्ड:"
 
-#: ../src/applet.glade.h:42
+#: ../gnome/applet/applet.glade.h:42
 msgid "Primary DNS:"
-msgstr ""
+msgstr "प्राथमिक DNS:"
 
-#: ../src/applet.glade.h:43
+#: ../gnome/applet/applet.glade.h:43
 msgid "Private Key File:"
-msgstr ""
+msgstr "व्यक्तिगत कुञ्जी फाइल:"
 
-#: ../src/applet.glade.h:44
+#: ../gnome/applet/applet.glade.h:44
 msgid "Private Key Password:"
-msgstr ""
+msgstr "व्यक्तिगत कुञ्जी पासवर्ड:"
 
-#: ../src/applet.glade.h:45
+#: ../gnome/applet/applet.glade.h:45
 msgid "Secondary DNS:"
-msgstr ""
+msgstr "गौण DNS:"
 
-#: ../src/applet.glade.h:46
+#: ../gnome/applet/applet.glade.h:46
 msgid "Select the CA Certificate File"
-msgstr ""
+msgstr "CA प्रमाणपत्र फाइल चयन गर्नुहोस्"
 
-#: ../src/applet.glade.h:47
+#: ../gnome/applet/applet.glade.h:47
 msgid "Select the Client Certificate File"
-msgstr ""
+msgstr "ग्राहक प्रमाणपत्र फाइल चयन गर्नुहोस्"
 
-#: ../src/applet.glade.h:48
+#: ../gnome/applet/applet.glade.h:48
 msgid "Select the Private Key File"
-msgstr ""
+msgstr "व्यक्तिगत कुञ्जी फाइल चयन गर्नुहोस्"
 
-#: ../src/applet.glade.h:49
+#: ../gnome/applet/applet.glade.h:49
 msgid "Show key"
-msgstr ""
+msgstr "कुञ्जी देखाउनुहोस्"
 
-#: ../src/applet.glade.h:50
-#, fuzzy
+#: ../gnome/applet/applet.glade.h:50
 msgid "Show passphrase"
-msgstr "गुज्रिएकोवाक्य:"
+msgstr "पासफ्रेज देखाउनुहोस्"
 
-#: ../src/applet.glade.h:51
+#: ../gnome/applet/applet.glade.h:51
 msgid "Show password"
-msgstr ""
+msgstr "पासवर्ड देखाउनुहोस्"
 
-#: ../src/applet.glade.h:52
+#: ../gnome/applet/applet.glade.h:52
 msgid "Show passwords"
-msgstr ""
+msgstr "पासवर्ड देखाउनुहोस्"
 
-#: ../src/applet.glade.h:53
+#: ../gnome/applet/applet.glade.h:53
 msgid "Speed:"
-msgstr ""
+msgstr "गति:"
 
-#: ../src/applet.glade.h:54
+#: ../gnome/applet/applet.glade.h:54
 msgid "Subnet Mask:"
-msgstr ""
+msgstr "सबनेट मास्क:"
 
-#: ../src/applet.glade.h:55
-#, fuzzy
+#: ../gnome/applet/applet.glade.h:55
 msgid "Type:"
-msgstr "कुन्ज प्रकार:"
+msgstr "प्रकार:"
 
-#: ../src/applet.glade.h:56
+#: ../gnome/applet/applet.glade.h:56
 msgid "User Name:"
-msgstr ""
+msgstr "प्रयोगकर्ता नाम:"
 
-#: ../src/applet.glade.h:57
+#: ../gnome/applet/applet.glade.h:57
 msgid "Wireless Network Key Required"
-msgstr "ताररहित सञ्जाल कुन्ज चाहियो"
+msgstr "ताररहित सञ्जाल कुञ्जी आवश्यक"
 
-#: ../src/applet.glade.h:58
+#: ../gnome/applet/applet.glade.h:58
 msgid "Wireless _adapter:"
-msgstr "ताररहित एडप्टर:"
+msgstr "ताररहित अनुकूलक:"
 
-#: ../src/applet.glade.h:59
-#, fuzzy
+#: ../gnome/applet/applet.glade.h:59
 msgid "_Always Trust this Wireless Network"
-msgstr "जहिलेपनि यहि ताररहित सञ्जालमा विश्वास गर्नुहोला।"
+msgstr "सधै यो ताररहित सञ्जालमा विश्वास गर्नुहोस्"
 
-#: ../src/applet.glade.h:60
-#, fuzzy
+#: ../gnome/applet/applet.glade.h:60
 msgid "_Don't remind me again"
-msgstr "मलाई फेरि नसम्झाउनुहोला।"
+msgstr "मलाई फेरि सम्झाउनु पर्दैन"
 
-#: ../src/applet.glade.h:61
+#: ../gnome/applet/applet.glade.h:61
 msgid "_Login to Network"
-msgstr "सञ्जालमा लगइन गर्नुहोला"
+msgstr "सञ्जालमा लगइन गर्नुहोस्"
 
-#: ../src/applet.glade.h:62
+#: ../gnome/applet/applet.glade.h:62
 msgid "_Network Name:"
-msgstr ""
+msgstr "सञ्जाल नाम:"
 
-#: ../src/applet.glade.h:63
-#, fuzzy
+#: ../gnome/applet/applet.glade.h:63
 msgid "_Wireless Security:"
-msgstr "ताररहित एडप्टर:"
+msgstr "ताररहित सुरक्षा:"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:383
-#, fuzzy
+#: ../gnome/vpn-properties/nm-vpn-properties.c:378
 msgid "Cannot add VPN connection"
-msgstr "संजाल जडान छैन"
+msgstr "VPN जडान थप्न सकिँदैन"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:385
+#: ../gnome/vpn-properties/nm-vpn-properties.c:380
 msgid ""
 "No suitable VPN software was found on your system. Contact your system "
 "administrator."
-msgstr ""
+msgstr "तपाईँको प्रणालीमा उपयुक्त VPN सफ्टवेयर फेला परेन । तपाईँको प्रणाली प्रशासकलाई सम्पर्क गर्नुहोस् ।"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:437
-#, fuzzy
+#: ../gnome/vpn-properties/nm-vpn-properties.c:432
 msgid "Cannot import VPN connection"
-msgstr "संजाल जडान छैन"
+msgstr "VPN जडान आयात गर्न सकिँदैन"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:439
+#: ../gnome/vpn-properties/nm-vpn-properties.c:434
 #, c-format
 msgid ""
 "Cannot find suitable software for VPN connection type '%s' to import the "
 "file '%s'. Contact your system administrator."
-msgstr ""
+msgstr "'%s' फाइलमा आयात गर्न VPN जडान प्रकार '%s' का लागि उपयुक्त छैन । तपाईँको प्रणाली प्रशासकलाई सम्पर्क गर्नुहोस् ।"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:579
+#: ../gnome/vpn-properties/nm-vpn-properties.c:574
 #, c-format
 msgid "Error retrieving VPN connection '%s'"
-msgstr ""
+msgstr "VPN जडान '%s' पुन: प्रयास गर्दा त्रुटि"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:582
+#: ../gnome/vpn-properties/nm-vpn-properties.c:577
 #, c-format
 msgid ""
 "Could not find the UI files for VPN connection type '%s'. Contact your "
 "system administrator."
-msgstr ""
+msgstr "VPN जडान प्रकार '%s' का लागि UI फाइल फेला पार्न सकिँदैन । तपाईँको प्रणाली प्रशासकसँग सम्पर्क गर्नुहोस् ।"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:739
-#, fuzzy, c-format
+#: ../gnome/vpn-properties/nm-vpn-properties.c:734
+#, c-format
 msgid "Delete VPN connection \"%s\"?"
-msgstr "संजाल जडान छैन"
+msgstr "VPN जडान \"%s\" मेट्नुहोस् ?"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:742
+#: ../gnome/vpn-properties/nm-vpn-properties.c:737
 #, 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 ""
+msgstr "VPN जडान \"%s\" का बारेमा सबै सूचना नष्ट हुँनेछन् र तपाईँलाई नयाँ जडान सिर्जना गर्ने सूचना उपलबध गराउन तपाईँको प्रणाली प्रशासकको आवश्यकता पर्नसक्छ ।"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:959
+#: ../gnome/vpn-properties/nm-vpn-properties.c:947
 msgid "Unable to load"
-msgstr ""
+msgstr "लोड गर्न अक्षम"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:961
-#, fuzzy
+#: ../gnome/vpn-properties/nm-vpn-properties.c:949
 msgid "Cannot find some needed resources (the glade file)!"
-msgstr "संजालप्रबन्धक एपप्लेटले केहि आवश्यक स्रोतहरू फेला पार्नसकेन (ग्लेड फाइल फेला परेन)।"
+msgstr "केही आवश्यक स्रोत (ग्लेड फाइल) फेला पार्न सकिँदैन !"
 
 #. Edit dialog
-#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
-#, fuzzy
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1058
 msgid "Edit VPN Connection"
-msgstr "संजाल जडान छैन"
+msgstr "VPN जडान सम्पादन गर्नुहोस्"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:1
-#, fuzzy
 msgid "Add a new VPN connection"
-msgstr "संजाल जडान छैन"
+msgstr "नयाँ VPN जडान थप्नुहोस्"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:2
 msgid "Choose which type of VPN connection you wish to create."
-msgstr ""
+msgstr "तपाईँले सिर्जना गर्न चाहेको VPN प्रकारको जडान रोज्नुहोस्"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
-#, fuzzy
 msgid "Connect to:"
-msgstr "सम्पर्क गर्नुहोला"
+msgstr "यसमा जडान गर्नुहोस्:"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
-#, fuzzy
 msgid "Create VPN Connection"
-msgstr "संजाल जडान छैन"
+msgstr "VPN जडान सिर्जना गर्नुहोस्"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
-#, fuzzy
 msgid "Create VPN Connection - 1 of 2"
-msgstr "संजाल जडान छैन"
+msgstr "VPN जडान २ को - १ सिर्जना गर्नुहोस्"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
-#, fuzzy
 msgid "Create VPN Connection - 2 of 2"
-msgstr "संजाल जडान छैन"
+msgstr "VPN जडान २ को - २ सिर्जना गर्नुहोस्"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
 msgid "Delete the selected VPN connection"
-msgstr ""
+msgstr "चयन गरेको VPN जडान मेट्नुहोस्"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
 msgid "E_xport"
-msgstr ""
+msgstr "निर्यात गर्नुहोस्"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:9
 msgid "Edit the selected VPN connection"
-msgstr ""
+msgstr "चयन गरेको VPN जडान सम्पादन गर्नुहोस्"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:10
 msgid "Export the VPN settings to a file"
-msgstr ""
+msgstr "फाइलमा VPN सेटिङ निर्यात गर्नुहोस्"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:11
 msgid "Export the selected VPN connection to a file"
-msgstr ""
+msgstr "फाइलमा चयन गरेको VPN जडान निर्यात गर्नुहोस्"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:12
-#, fuzzy
 msgid "Finish Creating VPN Connection"
-msgstr "संजाल जडान छैन"
+msgstr "VPN जडान सिर्जना सकियो"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:13
-#, fuzzy
 msgid "Manage Virtual Private Network Connections"
-msgstr "ताररहित संजाल सम्पर्क"
+msgstr "अवास्तविक व्यक्तिगत सञ्जाल जडान प्रवन्ध गर्नुहोस्"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:14
 msgid ""
@@ -851,243 +818,103 @@ msgid ""
 "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
-#, fuzzy
 msgid "VPN Connections"
-msgstr "संजाल जडान छैन"
+msgstr "VPN जडान"
 
 #: ../src/nm-ap-security-wep.c:52
 msgid "40-bit WEP"
-msgstr ""
+msgstr "४०-बिट WEP"
 
 #: ../src/nm-ap-security-wep.c:54
 msgid "104-bit WEP"
-msgstr ""
+msgstr "१०४-बिट WEP"
 
 #: ../src/nm-ap-security-wpa-psk.c:50
 msgid "WPA TKIP"
-msgstr ""
+msgstr "WPA TKIP"
 
 #: ../src/nm-ap-security-wpa-psk.c:52
 msgid "WPA CCMP"
-msgstr ""
+msgstr "WPA CCMP"
 
 #: ../src/nm-ap-security-wpa-psk.c:54
 msgid "WPA Automatic"
-msgstr ""
+msgstr "स्विचालित WPA"
 
 #: ../src/nm-ap-security-wpa-psk.c:59
 msgid "WPA2 TKIP"
-msgstr ""
+msgstr "WPA2 TKIP"
 
 #: ../src/nm-ap-security-wpa-psk.c:61
 msgid "WPA2 CCMP"
-msgstr ""
+msgstr "WPA2 CCMP"
 
 #: ../src/nm-ap-security-wpa-psk.c:63
 msgid "WPA2 Automatic"
-msgstr ""
+msgstr "स्वचालित WPA2"
 
 #: ../src/nm-ap-security.c:320
 msgid "none"
-msgstr ""
+msgstr "कुनै पनि होइन"
 
-#: ../src/nm-netlink-monitor.c:154
+#: ../src/nm-netlink-monitor.c:170
 #, c-format
-msgid ""
-"unable to create netlink socket for monitoring wired ethernet devices - %s"
-msgstr "मानिटरिङ तारसहित ईथरनेट यन्त्र - %s को लागी नेटलिङ्क सकेट सृजना गर्न असक्षम"
+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:188
 #, c-format
-msgid ""
-"unable to bind to netlink socket for monitoring wired ethernet devices - %s"
-msgstr "मानिटरिङ तारसहित ईथरनेट यन्त्र - %s को लागी नेटलिङ्क सकेट संयोजन गर्न असक्षम"
+msgid "unable to bind to netlink socket for monitoring wired ethernet devices - %s"
+msgstr "मोनिटरिङ तारसहित इथरनेट यन्त्र - %s का लागि नेटलिङ्क सकेट संयोजन गर्न अक्षम"
 
-#: ../src/nm-netlink-monitor.c:405
+#: ../src/nm-netlink-monitor.c:425
 msgid "operation took too long"
-msgstr "संचालनले धेरै लामो लियो"
+msgstr "सञ्चालनले लामो समय लियो"
 
-#: ../src/nm-netlink-monitor.c:502
+#: ../src/nm-netlink-monitor.c:522
 msgid "received data from wrong type of sender"
-msgstr "गलत प्रकारको प्रेषकबाट पठाएको डाटा प्राप्त गरियो।"
+msgstr "गलत प्रकारको प्रेषकबाट पठाएको डेटा प्राप्त गरियो"
 
-#: ../src/nm-netlink-monitor.c:515
+#: ../src/nm-netlink-monitor.c:535
 msgid "received data from unexpected sender"
-msgstr "आशा नगरेको प्रेषकबाट पठाएको डाटा प्राप्त गरियो।"
+msgstr "आशा नगरेको प्रेषकबाट पठाएको डेटा प्राप्त गरियो"
 
-#: ../src/nm-netlink-monitor.c:646
+#: ../src/nm-netlink-monitor.c:664
 msgid "too much data was sent over socket and some of it was lost"
-msgstr "सकेट माथी धेरै डाटाहरू पठाईयो र त्यसमध्ये केहि हरायो।"
+msgstr "सकेटलाई धेरै डेटा पठाइयो र त्यसमध्ये केही हरायो ।"
 
-#: ../src/nm-netlink-monitor.c:735
+#: ../src/nm-netlink-monitor.c:774
 msgid "error occurred while waiting for data on socket"
-msgstr ""
+msgstr "सकेटमा डेटाका लागि पर्खिरहदा त्रुटि देखाउँछ"
 
-#: ../src/applet-dbus-devices.c:898
-#, fuzzy, c-format
+#: ../gnome/applet/applet-dbus-devices.c:921
+#, c-format
 msgid "You are now connected to the Ad-Hoc wireless network '%s'."
-msgstr "एड-एचओसि ताररहित संजालमा सम्पर्क स्थापना गरियो।"
+msgstr "तपाईँले अहिले Ad-Hoc ताररहित सञ्जाल '%s' मा जडित हुनुहुन्छ ।"
 
-#: ../src/applet-dbus-devices.c:903
-#, fuzzy, c-format
+#: ../gnome/applet/applet-dbus-devices.c:926
+#, c-format
 msgid "You are now connected to the wireless network '%s'."
-msgstr "ताररहित संजाल '%s' सम्पर्क गरिदै..."
+msgstr "तपाईँ अहिले ताररहित सञ्जाल '%s' मा जडित हुनुहुन्छ ।"
 
-#: ../src/applet-dbus-devices.c:910
-#, fuzzy
+#: ../gnome/applet/applet-dbus-devices.c:933
 msgid "You are now connected to the wired network."
-msgstr "तारसहित संजालमा सम्पर्क गरिदै..."
+msgstr "तपाईँ अहिले तारसहित सञ्जालमा जडित हुनुहुन्छ ।"
 
-#: ../src/applet-dbus-devices.c:916
-#, fuzzy
+#: ../gnome/applet/applet-dbus-devices.c:939
 msgid "Connection Established"
-msgstr "सक्षम गुप्तिकरण सहित जडान गर्नुहोला"
+msgstr "जडान स्थापना भयो"
 
-#: ../src/applet-dbus-devices.c:959
+#: ../gnome/applet/applet-dbus-devices.c:982
 msgid "Disconnected"
-msgstr ""
+msgstr "जडान विच्छेद भयो"
 
-#: ../src/applet-dbus-devices.c:960
+#: ../gnome/applet/applet-dbus-devices.c:983
 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 "जहिलेपनि यहि ताररहित सञ्जालमा विश्वास गर्नुहोला।"
+msgstr "सञ्जाल जडान बिच्छेद भएको छ ।"
 
-#~ msgid "Don't remind me again"
-#~ msgstr "मलाई फेरि नसम्झाउनुहोला।"
diff --git a/po/nl.po b/po/nl.po
index 6798c900..7664be13 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNOME 2.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-29 18:33+0200\n"
-"PO-Revision-Date: 2006-02-14 13:49+0100\n"
+"POT-Creation-Date: 2006-12-26 15:06+0100\n"
+"PO-Revision-Date: 2006-12-27 09:36+1000\n"
 "Last-Translator: Tino Meinen <a.t.meinen@chello.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "MIME-Version: 1.0\n"
@@ -22,287 +22,314 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../src/applet-compat.c:171 ../src/applet-dbus-info.c:919
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:926
 #, c-format
 msgid "Passphrase for wireless network %s"
 msgstr "Wachtwoordzin voor draadloos netwerk %s"
 
-#: ../src/applet-dbus.c:265
+#: ../gnome/applet/applet-dbus.c:274
 #, c-format
 msgid "Connection to the wireless network '%s' failed."
-msgstr "Verbinding maken met het draadloos netwerk '%s' is mislukt."
+msgstr "Verbinding maken met het draadloos netwerk ‘%s’ is mislukt."
 
 # vaste netwerk
-#: ../src/applet-dbus.c:270
+#: ../gnome/applet/applet-dbus.c:279
 msgid "Connection to the wired network failed."
-msgstr "Verbinding maken met het bekabelde netwerk is mislukt."
+msgstr "Verbinding maken met het bekabeld netwerk is mislukt."
 
-#: ../src/applet.c:184
+#: ../gnome/applet/applet.c:182
 msgid "Error displaying connection information:"
 msgstr "Fout bij weergeven van verbindingsinformatie:"
 
-#: ../src/applet.c:202
+#: ../gnome/applet/applet.c:200
 msgid "Could not find some required resources (the glade file)!"
 msgstr "Kon bepaalde vereiste bronnen niet vinden (het glade bestand)!"
 
 # Netwerken
-#: ../src/applet.c:213
+#: ../gnome/applet/applet.c:210
 msgid "No active connections!"
 msgstr "Geen actieve netwerkverbindingen!"
 
+#: ../gnome/applet/applet.c:227
+#, c-format
+msgid "%d Mb/s"
+msgstr "%d Mb/s"
+
 # Bekabeld ethernet/kabel-ethernet
-#: ../src/applet.c:234
+#: ../gnome/applet/applet.c:230
 #, c-format
 msgid "Wired Ethernet (%s)"
 msgstr "Bekabeld ethernet (%s)"
 
-#: ../src/applet.c:236
+#: ../gnome/applet/applet.c:232
 #, c-format
 msgid "Wireless Ethernet (%s)"
 msgstr "Draadloos ethernet (%s)"
 
-#: ../src/applet.c:337 ../src/applet.c:362
+#: ../gnome/applet/applet.c:238
+msgid "Unknown"
+msgstr "Onbekend"
+
+#: ../gnome/applet/applet.c:330 ../gnome/applet/applet.c:357
 msgid "NetworkManager Applet"
 msgstr "NetworkManager applet"
 
-#: ../src/applet.c:339 ../src/applet.c:364
-msgid "Copyright © 2004-2005 Red Hat, Inc."
-msgstr "Copyright © 2004-2005 Red Hat, Inc."
+#: ../gnome/applet/applet.c:332
+msgid ""
+"Copyright © 2004-2006 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+msgstr ""
+"Copyright © 2004-2006 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, 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.
-#: ../src/applet.c:340 ../src/applet.c:365
+#: ../gnome/applet/applet.c:334 ../gnome/applet/applet.c:361
 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."
 
-#: ../src/applet.c:343 ../src/applet.c:370
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:365
 msgid "translator-credits"
 msgstr ""
 "Tino Meinen\n"
 "\n"
 "Kijk voor meer informatie op http://nl.gnome.org/"
 
-#: ../src/applet.c:426
+#: ../gnome/applet/applet.c:359
+msgid ""
+"Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+msgstr ""
+"Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+
+#: ../gnome/applet/applet.c:421
 msgid "VPN Login Failure"
 msgstr "VPN-aanmelding mislukt"
 
 # starten/opzetten/aanmaken 
 # aanmeldfout/aanmeldingsfout
 # (dit bericht komt meerdere keren voor)
-#: ../src/applet.c:427
+#: ../gnome/applet/applet.c:422
 #, 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."
+msgstr "Kon de VPN-verbinding ‘%s’ niet starten vanwege een aanmeldingsfout."
 
-#: ../src/applet.c:431
+#: ../gnome/applet/applet.c:426
 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
-#: ../src/applet.c:432
+#: ../gnome/applet/applet.c:427
 #, 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 "
+"Kon de VPN-verbinding ‘%s’ niet maken omdat het VPN-programma niet kon "
 "opstarten."
 
-#: ../src/applet.c:436 ../src/applet.c:446
+#: ../gnome/applet/applet.c:431 ../gnome/applet/applet.c:441
 msgid "VPN Connect Failure"
 msgstr "VPN-verbinding mislukt"
 
 # VPN-verbinding starten/opzetten/aanmaken
-#: ../src/applet.c:437
+#: ../gnome/applet/applet.c:432
 #, 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."
+msgstr "Kon de VPN-verbinding ‘%s’ niet starten vanwege een verbindingsfout."
 
-#: ../src/applet.c:441
+#: ../gnome/applet/applet.c:436
 msgid "VPN Configuration Error"
 msgstr "VPN-configuratiefout"
 
 # niet goed/onjuist
-#: ../src/applet.c:442
+#: ../gnome/applet/applet.c:437
 #, c-format
 msgid "The VPN connection '%s' was not correctly configured."
-msgstr "De VPN-verbinding '%s' is niet goed geconfigureerd."
+msgstr "De VPN-verbinding ‘%s’ is niet goed geconfigureerd."
 
-#: ../src/applet.c:447
+#: ../gnome/applet/applet.c:442
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' because the VPN server did not "
 "return an adequate network configuration."
 msgstr ""
-"Kon de VPN-verbinding '%s' niet maken omdat de VPN-server geen geschikte "
+"Kon de VPN-verbinding ‘%s’ niet maken omdat de VPN-server geen geschikte "
 "netwerkconfiguratie aangaf."
 
-#: ../src/applet.c:517
+#: ../gnome/applet/applet.c:512
 msgid "VPN Login Message"
 msgstr "VPN-aanmeldbericht"
 
-#: ../src/applet.c:741 ../src/applet.c:2508
-#: ../src/other-network-dialog.c:453
-#: ../src/passphrase-dialog.c:228
+#: ../gnome/applet/applet.c:737 ../gnome/applet/applet.c:2635
+#: ../gnome/applet/other-network-dialog.c:458
+#: ../gnome/applet/passphrase-dialog.c:228
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
 msgstr ""
 "Het NetworkManager-applet kon bepaalde vereiste bronnen niet vinden (het "
-"glade bestand is niet gevonden)."
+"glade-bestand is niet gevonden)."
 
 # station/apparaat
-#: ../src/applet.c:753
+#: ../gnome/applet/applet.c:749
 #, c-format
 msgid "The network device \"%s (%s)\" does not support wireless scanning."
-msgstr "Het netwerkapparaat \"%s (%s)\" ondersteunt draadloos scannen niet."
+msgstr "Draadloos scannen is niet mogelijk met het netwerkapparaat ‘%s (%s)’."
 
-#: ../src/applet.c:761
+#: ../gnome/applet/applet.c:757
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
-msgstr "Het netwerkapparaat \"%s (%s)\" ondersteunt link-detecteren niet."
+msgstr "Link-detectie is niet mogelijk met het netwerkapparaat ‘%s (%s)’."
+
+#. Note to translators: this is used if no essid is known
+#: ../gnome/applet/applet.c:905 ../gnome/applet/applet.c:1103
+msgid "(unknown)"
+msgstr "(onbekend)"
 
 # vaste netwerk
-#: ../src/applet.c:908
+#: ../gnome/applet/applet.c:911
 #, c-format
 msgid "Preparing device %s for the wired network..."
-msgstr "Apparaat %s wordt ingesteld voor het bekabelde netwerk..."
+msgstr "Apparaat %s wordt ingesteld voor het bekabeld netwerk..."
 
-#: ../src/applet.c:910
+#: ../gnome/applet/applet.c:913
 #, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
-msgstr "Apparaat %s wordt ingesteld op het draadloos netwerk '%s'..."
+msgstr "Apparaat %s wordt ingesteld op het draadloos netwerk ‘%s’..."
 
 # vaste netwerk
-#: ../src/applet.c:918
+#: ../gnome/applet/applet.c:921
 #, c-format
 msgid "Configuring device %s for the wired network..."
-msgstr "Appraat %s wordt geconfigureerd voor het bekabelde netwerk..."
+msgstr "Appraat %s wordt geconfigureerd voor het bekabeld 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')
-#: ../src/applet.c:920
+#: ../gnome/applet/applet.c:923
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
-msgstr "Poging aan te sluiten bij het draadloos netwerk '%s'..."
+msgstr "Poging aan te sluiten bij het draadloos netwerk ‘%s’..."
 
-#: ../src/applet.c:928
+#: ../gnome/applet/applet.c:931
 #, c-format
 msgid "Waiting for Network Key for the wireless network '%s'..."
-msgstr "Wachten op netwerksleutel voor het draadloos netwerk '%s'..."
+msgstr "Wachten op netwerksleutel voor het draadloos netwerk ‘%s’..."
 
 # vaste netwerk
-#: ../src/applet.c:936 ../src/applet.c:946
+#: ../gnome/applet/applet.c:939 ../gnome/applet/applet.c:949
 msgid "Requesting a network address from the wired network..."
-msgstr "Er wordt een netwerkadres verzocht voor het bekabelde netwerk..."
+msgstr "Er wordt een netwerkadres verzocht voor het bekabeld netwerk..."
 
-#: ../src/applet.c:938 ../src/applet.c:948
+#: ../gnome/applet/applet.c:941 ../gnome/applet/applet.c:951
 #, c-format
 msgid "Requesting a network address from the wireless network '%s'..."
-msgstr "Er wordt een netwerkadres verzocht voor het draadloos netwerk '%s'..."
+msgstr "Er wordt een netwerkadres verzocht voor het draadloos netwerk ‘%s’..."
 
 # afgerond/voltooid/gelegd
 # vaste netwerk
-#: ../src/applet.c:956
+#: ../gnome/applet/applet.c:959
 msgid "Finishing connection to the wired network..."
-msgstr "Verbinding met het bekabelde netwerk wordt voltooid..."
+msgstr "Verbinding met het bekabeld netwerk wordt voltooid..."
 
-#: ../src/applet.c:958
+#: ../gnome/applet/applet.c:961
 #, c-format
 msgid "Finishing connection to the wireless network '%s'..."
-msgstr "Verbinding met het draadloos netwerk '%s' wordt voltooid..."
+msgstr "Verbinding met het draadloos netwerk ‘%s’ wordt voltooid..."
 
 # is niet uitgevoerd (klinkt als verleden tijd)
 # is niet opgestart
 # NetworkManager loopt niet
 # Geen NetworkManager aanwezig
 # NetworkManager niet aanwezig
-#: ../src/applet.c:1075
+#: ../gnome/applet/applet.c:1078
 msgid "NetworkManager is not running"
 msgstr "Geen NetworkManager..."
 
 # netwerk is uitgezet/netwerken is uitgezet/netwerken is niet mogelijk
-#: ../src/applet.c:1083 ../src/applet.c:1828
+#: ../gnome/applet/applet.c:1086 ../gnome/applet/applet.c:1843
 msgid "Networking disabled"
 msgstr "Netwerk is uitgeschakeld"
 
 # geen netwerk/netwerkverbinding
-#: ../src/applet.c:1088
+#: ../gnome/applet/applet.c:1091
 msgid "No network connection"
 msgstr "Geen netwerkverbinding"
 
-# netwerk/netwerkverbinding
+# dit is een tooltip die boven het applet verschijnt
+# netwerkverbinding via de kabel/netwerk/netwerkverbinding
 # vaste netwerk
-#: ../src/applet.c:1093
+#: ../gnome/applet/applet.c:1096
 msgid "Wired network connection"
-msgstr "Bekabelde netwerkverbinding"
+msgstr "Netwerkverbinding via de kabel"
 
-#: ../src/applet.c:1097
+#: ../gnome/applet/applet.c:1100
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Verbonden met een Ad-hoc draadloos netwerk"
 
-#: ../src/applet.c:1099
+#: ../gnome/applet/applet.c:1102
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
-msgstr "Draadloze netwerkverbinding met '%s' (%d%%)"
+msgstr "Verbinding met draadloos netwerk ‘%s’ (%d%%)"
 
 # verbinding naar/met
-#: ../src/applet.c:1120
+#: ../gnome/applet/applet.c:1123
 #, c-format
 msgid "VPN connection to '%s'"
-msgstr "VPN-verbinding met '%s'"
+msgstr "VPN-verbinding met ‘%s’"
 
 # Connecting? ipv connection?
-#: ../src/applet.c:1128
+#: ../gnome/applet/applet.c:1131
 #, c-format
 msgid "VPN connecting to '%s'"
-msgstr "VPN verbinden met '%s'"
+msgstr "VPN verbinden met ‘%s’"
 
-#: ../src/applet.c:1541
+#: ../gnome/applet/applet.c:1556
 msgid "_Connect to Other Wireless Network..."
 msgstr "_Verbinden met ander draadloos netwerk..."
 
-#: ../src/applet.c:1562
+#: ../gnome/applet/applet.c:1577
 msgid "Create _New Wireless Network..."
 msgstr "_Nieuw draadloos netwerk aanmaken..."
 
 # Netwerken
-#: ../src/applet.c:1685
+#: ../gnome/applet/applet.c:1700
 msgid "_VPN Connections"
 msgstr "_VPN-verbindingen"
 
-#: ../src/applet.c:1730
+#: ../gnome/applet/applet.c:1745
 msgid "_Configure VPN..."
 msgstr "VPN _configureren..."
 
-#: ../src/applet.c:1734
+#: ../gnome/applet/applet.c:1749
 msgid "_Disconnect VPN..."
 msgstr "V_PN-verbinding verbreken..."
 
 # Netwerken
-#: ../src/applet.c:1756
+#: ../gnome/applet/applet.c:1771
 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
-#: ../src/applet.c:1767
+#: ../gnome/applet/applet.c:1782
 #, c-format
 msgid "Connect to %s..."
 msgstr "Verbinden met %s..."
 
-#: ../src/applet.c:1773
+#: ../gnome/applet/applet.c:1788
 #, c-format
 msgid "Disconnect from %s..."
 msgstr "Verbinden met %s verbreken..."
 
 # Er zijn geen netwerkapparaten geconfigureerd/gevonden
-#: ../src/applet.c:1822
+#: ../gnome/applet/applet.c:1837
 msgid "No network devices have been found"
 msgstr "Er zijn geen netwerkapparaten geconfigureerd"
 
@@ -312,38 +339,38 @@ msgstr "Er zijn geen netwerkapparaten geconfigureerd"
 # NetworkManager loopt niet
 # Geen NetworkManager aanwezig
 # NetworkManager niet aanwezig
-#: ../src/applet.c:2014
+#: ../gnome/applet/applet.c:2029
 msgid "NetworkManager is not running..."
 msgstr "Geen NetworkManager..."
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2170
+#: ../gnome/applet/applet.c:2210
 msgid "Enable _Networking"
 msgstr "_Netwerk aanzetten"
 
 # Wireless gebruiken
 #. 'Enable Wireless' item
-#: ../src/applet.c:2176
+#: ../gnome/applet/applet.c:2216
 msgid "Enable _Wireless"
 msgstr "_Draadloos netwerk aanzetten"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2182
+#: ../gnome/applet/applet.c:2222
 msgid "Connection _Information"
 msgstr "_Verbindingsinformatie"
 
 #. Help item
-#: ../src/applet.c:2193
+#: ../gnome/applet/applet.c:2233
 msgid "_Help"
 msgstr "_Hulp"
 
 #. About item
-#: ../src/applet.c:2202
+#: ../gnome/applet/applet.c:2242
 msgid "_About"
 msgstr "I_nfo"
 
 # het kan het glade-bestand niet vinden.
-#: ../src/applet.c:2667
+#: ../gnome/applet/applet.c:2824
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
@@ -351,115 +378,115 @@ msgstr ""
 "Het NetworkManager-applet kon bepaalde vereiste bronnen niet vinden.  Het "
 "zal nu worden afgesloten.\n"
 
-#: ../src/wireless-security-option.c:157
+#: ../gnome/applet/wireless-security-option.c:157
 msgid "Open System"
 msgstr "Open systeem"
 
-#: ../src/wireless-security-option.c:160
+#: ../gnome/applet/wireless-security-option.c:160
 msgid "Shared Key"
 msgstr "Gedeelde sleutel"
 
-#: ../src/wireless-security-option.c:208
+#: ../gnome/applet/wireless-security-option.c:208
 msgid "Automatic (Default)"
 msgstr "Automatisch (standaard)"
 
-#: ../src/wireless-security-option.c:215
+#: ../gnome/applet/wireless-security-option.c:215
 msgid "AES-CCMP"
 msgstr "AES-CCMP"
 
-#: ../src/wireless-security-option.c:223
+#: ../gnome/applet/wireless-security-option.c:223
 msgid "TKIP"
 msgstr "TKIP"
 
-#: ../src/wireless-security-option.c:231
+#: ../gnome/applet/wireless-security-option.c:231
 msgid "Dynamic WEP"
 msgstr "Dynamisch WEP"
 
-#: ../src/wso-none.c:53
+#: ../gnome/applet/wso-none.c:53
 msgid "None"
 msgstr "Geen"
 
-#: ../src/wso-wep-ascii.c:138
+#: ../gnome/applet/wso-wep-ascii.c:138
 msgid "WEP 64/128-bit ASCII"
 msgstr "WEP 64/128-bit ASCII"
 
-#: ../src/wso-wep-hex.c:135
+#: ../gnome/applet/wso-wep-hex.c:135
 msgid "WEP 64/128-bit Hex"
 msgstr "WEP 64/128-bit Hex"
 
-#: ../src/wso-wep-passphrase.c:135
+#: ../gnome/applet/wso-wep-passphrase.c:135
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit wachtwoordzin"
 
-#: ../src/wso-wpa-eap.c:237
+#: ../gnome/applet/wso-wpa-eap.c:237
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../src/wso-wpa-eap.c:238
+#: ../gnome/applet/wso-wpa-eap.c:238
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wso-wpa-eap.c:239
+#: ../gnome/applet/wso-wpa-eap.c:239
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../src/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
-#: ../src/nm-ap-security-wpa-eap.c:116
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:93
+#: ../src/nm-ap-security-wpa-eap.c:117
 msgid "WPA2 Enterprise"
 msgstr "WPA2 enterprise"
 
-#: ../src/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
-#: ../src/nm-ap-security-wpa-eap.c:121
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:95
+#: ../src/nm-ap-security-wpa-eap.c:122
 msgid "WPA Enterprise"
 msgstr "WPA enterprise"
 
-#: ../src/wso-wpa-psk.c:178
+#: ../gnome/applet/wso-wpa-psk.c:178
 msgid "WPA2 Personal"
 msgstr "WPA2 persoonlijk"
 
-#: ../src/wso-wpa-psk.c:180
+#: ../gnome/applet/wso-wpa-psk.c:180
 msgid "WPA Personal"
 msgstr "WPA persoonlijk"
 
-#: ../src/eggtrayicon.c:134
+#: ../gnome/applet/eggtrayicon.c:134
 msgid "Orientation"
 msgstr "Oriëntatie"
 
-#: ../src/eggtrayicon.c:135
+#: ../gnome/applet/eggtrayicon.c:135
 msgid "The orientation of the tray."
 msgstr "De oriëntatie van het applet."
 
 # vaste netwerk
-#: ../src/menu-items.c:88
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
-msgstr "Bekabelde netwerk (%s)"
+msgstr "Bekabeld netwerk (%s)"
 
 # vaste netwerk
-#: ../src/menu-items.c:91
+#: ../gnome/applet/menu-items.c:91
 msgid "_Wired Network"
-msgstr "_Bekabelde netwerk"
+msgstr "_Bekabeld netwerk"
 
-#: ../src/menu-items.c:162
+#: ../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)"
 
-#: ../src/menu-items.c:164
+#: ../gnome/applet/menu-items.c:164
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Draadloos netwerk"
 msgstr[1] "Draadloze netwerken"
 
-#: ../src/menu-items.c:343
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr " (ongeldige Unicode)"
 
 # encryptie/versleuteling/cryptografie
 # en wordt er geen gebruik gemaakt van cryptografie/wordt de verbinding niet versleuteld
-#: ../src/other-network-dialog.c:352
+#: ../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, "
@@ -468,11 +495,11 @@ msgstr ""
 "Standaard wordt de naam van het draadloos netwerk ingesteld op de naam van "
 "uw computer: %s, en wordt de verbinding niet versleuteld."
 
-#: ../src/other-network-dialog.c:358
+#: ../gnome/applet/other-network-dialog.c:358
 msgid "Create new wireless network"
 msgstr "Nieuw draadloos netwerk aanmaken"
 
-#: ../src/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."
@@ -480,28 +507,28 @@ msgstr ""
 "Geef de naam en de beveiligingsinstellingen van het draadloos netwerk dat u "
 "wilt aanmaken."
 
-#: ../src/other-network-dialog.c:363
+#: ../gnome/applet/other-network-dialog.c:363
 msgid "Create New Wireless Network"
 msgstr "Nieuw draadloos netwerk aanmaken"
 
-#: ../src/other-network-dialog.c:368
+#: ../gnome/applet/other-network-dialog.c:368
 msgid "Existing wireless network"
 msgstr "Bestaand draadloos netwerk"
 
-#: ../src/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 ""
 "Geef de naam van het draadloos netwerk waarmee u een verbinding wilt maken."
 
-#: ../src/other-network-dialog.c:371
+#: ../gnome/applet/other-network-dialog.c:371
 msgid "Connect to Other Wireless Network"
 msgstr "Verbinden met ander draadloos netwerk"
 
-#: ../src/passphrase-dialog.c:215
+#: ../gnome/applet/passphrase-dialog.c:215
 msgid "Error connecting to wireless network"
 msgstr "Fout bij het verbinden met draadloos netwerk"
 
-#: ../src/passphrase-dialog.c:216
+#: ../gnome/applet/passphrase-dialog.c:216
 msgid ""
 "The requested wireless network requires security capabilities unsupported by "
 "your hardware."
@@ -509,35 +536,35 @@ msgstr ""
 "Het gekozen draadloos netwerk vereist een type beveiliging die niet mogelijk "
 "is met uw hardware."
 
-#: ../src/vpn-password-dialog.c:151
-#: ../src/vpn-password-dialog.c:188
+#: ../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"
+msgstr "Kan VPN-verbinding ‘%s’ niet starten"
 
-#: ../src/vpn-password-dialog.c:154
+#: ../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 ""
-"Kon het aanmeldingsdialoogvenster voor VPN-verbindingstype '%s' niet vinden. "
+"Kon het aanmeldingsdialoogvenster voor VPN-verbindingstype ‘%s’ niet vinden. "
 "Neem contact op met uw systeembeheerder."
 
-#: ../src/vpn-password-dialog.c:191
+#: ../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 ""
 "Er was een probleem bij het opstarten van het aanmeldingsdialoogvenster voor "
-"VPN-verbindingstype '%s'. Neem contact op met uw systeembeheerder."
+"VPN-verbindingstype ‘%s’. Neem contact op met uw systeembeheerder."
 
-#: ../src/applet.glade.h:1
+#: ../gnome/applet/applet.glade.h:1
 msgid " "
 msgstr " "
 
-#: ../src/applet.glade.h:2
+#: ../gnome/applet/applet.glade.h:2
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
 msgstr ""
@@ -545,7 +572,7 @@ msgstr ""
 
 # om toegang te kunnen verkrijgen tot het draadloos netwerk s
 # WEP-key voorlopig laten staan ipv versleuteling, mogelijk is het duidelijker
-#: ../src/applet.glade.h:4
+#: ../gnome/applet/applet.glade.h:4
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
@@ -557,10 +584,10 @@ msgstr ""
 "<span weight=\"bold\" size=\"larger\">Draadloos netwerk vraagt "
 "wachtwoordzin</span>\n"
 "\n"
-"Om toegang te krijgen tot het draadloos netwerk '%s' wordt een wachtwoordzin "
+"Om toegang te krijgen tot het draadloos netwerk ‘%s’ wordt een wachtwoordzin "
 "gevraagd."
 
-#: ../src/applet.glade.h:8
+#: ../gnome/applet/applet.glade.h:8
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
@@ -572,7 +599,7 @@ msgstr ""
 "\n"
 "%s  Het zal niet volledig functioneel zijn."
 
-#: ../src/applet.glade.h:12
+#: ../gnome/applet/applet.glade.h:12
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
@@ -585,82 +612,86 @@ msgstr ""
 "<span weight=\"bold\" size=\"larger\">Aanmelding bij draadloos netwerk "
 "bevestigen</span>\n"
 "\n"
-"U heeft gekozen om uzelf aan te melden bij het draadloos netwerk '%s'.  "
+"U heeft gekozen om uzelf aan te melden bij het draadloos netwerk ‘%s’.  "
 "Indien u zeker weet dat dit draadloos netwerk veilig is, vink dan "
 "onderstaande optie aan. NetworkManager zal u dan niet meer om toestemming "
 "vragen wanneer u zich weer bij dit netwerk aanmeldt."
 
-#: ../src/applet.glade.h:15
+#: ../gnome/applet/applet.glade.h:15
 msgid "Anonymous Identity:"
 msgstr "Anonieme identiteit:"
 
 # identiteitscontrole/aanmeldingscontrole
-#: ../src/applet.glade.h:16
+#: ../gnome/applet/applet.glade.h:16
 msgid "Authentication:"
 msgstr "Aanmeldingscontrole:"
 
-#: ../src/applet.glade.h:17
+#: ../gnome/applet/applet.glade.h:17
 msgid "Broadcast Address:"
 msgstr "Broadcastadres:"
 
-#: ../src/applet.glade.h:18
+#: ../gnome/applet/applet.glade.h:18
 msgid "CA Certificate File:"
 msgstr "CA-certificaatbestand:"
 
-#: ../src/applet.glade.h:19
+#: ../gnome/applet/applet.glade.h:19
 msgid "C_onnect"
 msgstr "_Verbinden"
 
-#: ../src/applet.glade.h:20
+#: ../gnome/applet/applet.glade.h:20
 msgid "Client Certificate File:"
 msgstr "Cliënt-certificaatbestand:"
 
-#: ../src/applet.glade.h:21
+#: ../gnome/applet/applet.glade.h:21
 msgid "Connection Information"
 msgstr "Verbindingsinformatie"
 
-#: ../src/applet.glade.h:22
+#: ../gnome/applet/applet.glade.h:22
 msgid "Default Route:"
 msgstr "Standaardroute:"
 
-#: ../src/applet.glade.h:23
+#: ../gnome/applet/applet.glade.h:23
 msgid "Destination Address:"
 msgstr "Doeladres:"
 
-#: ../src/applet.glade.h:24
+#: ../gnome/applet/applet.glade.h:24
 msgid "Driver:"
 msgstr "Stuurprogramma:"
 
-#: ../src/applet.glade.h:25
+#: ../gnome/applet/applet.glade.h:25
 msgid "EAP Method:"
 msgstr "EAP-methode:"
 
-#: ../src/applet.glade.h:26
+#: ../gnome/applet/applet.glade.h:26
 msgid "Hardware Address:"
 msgstr "Hardware-adres:"
 
-#: ../src/applet.glade.h:27
+#: ../gnome/applet/applet.glade.h:27
 msgid "IP Address:"
 msgstr "IP-adres:"
 
-#: ../src/applet.glade.h:28
+#: ../gnome/applet/applet.glade.h:28
 msgid "Identity:"
 msgstr "Identiteit:"
 
-#: ../src/applet.glade.h:29
+#: ../gnome/applet/applet.glade.h:29
 msgid "Interface:"
 msgstr "Apparaat:"
 
-#: ../src/applet.glade.h:30
+#: ../gnome/applet/applet.glade.h:30
 msgid "Key Type:"
 msgstr "Sleuteltype:"
 
+#: ../gnome/applet/applet.glade.h:31
+msgid "Key management:"
+msgstr "Sleutelbeheer:"
+
 # station/apparaat/interface
-#: ../src/applet.glade.h:31
+#: ../gnome/applet/applet.glade.h:32
 msgid "Key:"
 msgstr "Sleutel:"
 
-#: ../src/applet.glade.h:32
+#: ../gnome/applet/applet.glade.h:33
 msgid ""
 "None\n"
 "WEP 128-bit Passphrase\n"
@@ -672,7 +703,7 @@ msgstr ""
 "WEP 64/128-bit hex\n"
 "WEP 64/128-bit ASCII\n"
 
-#: ../src/applet.glade.h:37
+#: ../gnome/applet/applet.glade.h:38
 msgid ""
 "Open System\n"
 "Shared Key"
@@ -680,116 +711,120 @@ msgstr ""
 "Open systeem\n"
 "gedeelde sleutel"
 
-#: ../src/applet.glade.h:39
+#: ../gnome/applet/applet.glade.h:40
 msgid "Other Wireless Network..."
 msgstr "Ander draadloos netwerk..."
 
-#: ../src/applet.glade.h:40
+#: ../gnome/applet/applet.glade.h:41
 msgid "Passphrase:"
 msgstr "Wachtwoordzin:"
 
-#: ../src/applet.glade.h:41
+#: ../gnome/applet/applet.glade.h:42
 msgid "Password:"
 msgstr "Wachtwoord:"
 
-#: ../src/applet.glade.h:42
+#: ../gnome/applet/applet.glade.h:43
 msgid "Primary DNS:"
 msgstr "Primaire DNS:"
 
-#: ../src/applet.glade.h:43
+#: ../gnome/applet/applet.glade.h:44
 msgid "Private Key File:"
 msgstr "Privé sleutelbestand:"
 
-#: ../src/applet.glade.h:44
+#: ../gnome/applet/applet.glade.h:45
 msgid "Private Key Password:"
 msgstr "Privé sleutelwachtwoord:"
 
-#: ../src/applet.glade.h:45
+#: ../gnome/applet/applet.glade.h:46
 msgid "Secondary DNS:"
 msgstr "Secondaire DNS:"
 
-#: ../src/applet.glade.h:46
+#: ../gnome/applet/applet.glade.h:47
 msgid "Select the CA Certificate File"
 msgstr "Selecteer het CA-certificaatbestand"
 
-#: ../src/applet.glade.h:47
+#: ../gnome/applet/applet.glade.h:48
 msgid "Select the Client Certificate File"
 msgstr "Selecteer het cliënt-certificaatbestand"
 
-#: ../src/applet.glade.h:48
+#: ../gnome/applet/applet.glade.h:49
 msgid "Select the Private Key File"
 msgstr "Selecteer het privé sleutelbestand"
 
-#: ../src/applet.glade.h:49
+#: ../gnome/applet/applet.glade.h:50
 msgid "Show key"
 msgstr "Sleutel tonen"
 
-#: ../src/applet.glade.h:50
+#: ../gnome/applet/applet.glade.h:51
 msgid "Show passphrase"
 msgstr "Wachtwoordzin tonen"
 
-#: ../src/applet.glade.h:51
+#: ../gnome/applet/applet.glade.h:52
 msgid "Show password"
 msgstr "Wachtwoord tonen"
 
-#: ../src/applet.glade.h:52
+#: ../gnome/applet/applet.glade.h:53
 msgid "Show passwords"
 msgstr "Wachtwoorden tonen"
 
-#: ../src/applet.glade.h:53
+#: ../gnome/applet/applet.glade.h:54
 msgid "Speed:"
 msgstr "Snelheid:"
 
-#: ../src/applet.glade.h:54
+#: ../gnome/applet/applet.glade.h:55
 msgid "Subnet Mask:"
 msgstr "Subnetmasker:"
 
-#: ../src/applet.glade.h:55
+#: ../gnome/applet/applet.glade.h:56
 msgid "Type:"
 msgstr "Type:"
 
 # inlognaam/gebruikersnaam
-#: ../src/applet.glade.h:56
+#: ../gnome/applet/applet.glade.h:57
 msgid "User Name:"
 msgstr "Gebruikersnaam:"
 
-#: ../src/applet.glade.h:57
+#: ../gnome/applet/applet.glade.h:58
 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
-#: ../src/applet.glade.h:58
+#: ../gnome/applet/applet.glade.h:59
 msgid "Wireless _adapter:"
 msgstr "Draadloos _adapter:"
 
-#: ../src/applet.glade.h:59
+#: ../gnome/applet/applet.glade.h:60
 msgid "_Always Trust this Wireless Network"
 msgstr "_Dit draadloos netwerk altijd vertrouwen"
 
-#: ../src/applet.glade.h:60
+#: ../gnome/applet/applet.glade.h:61
 msgid "_Don't remind me again"
 msgstr "_Niet meer tonen"
 
-#: ../src/applet.glade.h:61
+#: ../gnome/applet/applet.glade.h:62
+msgid "_Fallback on this Network"
+msgstr "_Terugvallen op dit netwerk"
+
+#: ../gnome/applet/applet.glade.h:63
 msgid "_Login to Network"
 msgstr "_Aanmelden bij het netwerk"
 
-#: ../src/applet.glade.h:62
+#: ../gnome/applet/applet.glade.h:64
 msgid "_Network Name:"
 msgstr "_Netwerknaam:"
 
 # Bedoeld wordt beveiliging van het draadloos netwerk.
 # niet dat de beveiling draadloos is.
-#: ../src/applet.glade.h:63
+#: ../gnome/applet/applet.glade.h:65
 msgid "_Wireless Security:"
 msgstr "_Draadloos beveiliging:"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:383
+#: ../gnome/vpn-properties/nm-vpn-properties.c:417
 msgid "Cannot add VPN connection"
 msgstr "Kan VPN-verbinding niet toevoegen"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:385
+#: ../gnome/vpn-properties/nm-vpn-properties.c:419
 msgid ""
 "No suitable VPN software was found on your system. Contact your system "
 "administrator."
@@ -798,63 +833,83 @@ msgstr ""
 "met uw systeembeheerder."
 
 # Netwerken
-#: ../gnome/vpn-properties/nm-vpn-properties.c:437
+#: ../gnome/vpn-properties/nm-vpn-properties.c:461
 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:439
+#: ../gnome/vpn-properties/nm-vpn-properties.c:463
 #, 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."
+"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:579
+#: ../gnome/vpn-properties/nm-vpn-properties.c:580
 #, c-format
 msgid "Error retrieving VPN connection '%s'"
-msgstr "Fout bij herleiden VPN-verbinding '%s'"
+msgstr "Fout bij herleiden VPN-verbinding ‘%s’"
 
 # bleh: UI files
-#: ../gnome/vpn-properties/nm-vpn-properties.c:582
+#: ../gnome/vpn-properties/nm-vpn-properties.c:583
 #, 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 "
+"Kon de UI-bestanden voor VPN-verbindingtype ‘%s’ niet vinden. Neem contact "
 "op met uw systeembeheerder."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:739
+#: ../gnome/vpn-properties/nm-vpn-properties.c:727
 #, c-format
 msgid "Delete VPN connection \"%s\"?"
-msgstr "VPN-verbinding \"%s\" verwijderen?"
+msgstr "VPN-verbinding ‘%s’ verwijderen?"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:742
+#: ../gnome/vpn-properties/nm-vpn-properties.c:730
 #, 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 informatie over de VPN-verbinding \"%s\" zal verloren gaan en u zult "
+"Alle informatie over de VPN-verbinding ‘%s’ zal verloren gaan en u zult "
 "mogelijk uw systeembeheerder om informatie moeten vragen voor het opzetten "
 "van een nieuwe verbinding."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:959
+#: ../gnome/vpn-properties/nm-vpn-properties.c:924
 msgid "Unable to load"
 msgstr "Kon niet laden"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:961
+#: ../gnome/vpn-properties/nm-vpn-properties.c:926
 msgid "Cannot find some needed resources (the glade file)!"
 msgstr "Kon bepaalde vereiste bronnen niet vinden (het glade bestand)!"
 
+#. druid_window = GTK_DIALOG (gtk_dialog_new_with_buttons (_("Create VPN Connection"),
+#. NULL,
+#. GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+#. GTK_STOCK_CANCEL,
+#. GTK_RESPONSE_REJECT,
+#. GTK_STOCK_APPLY,
+#. GTK_RESPONSE_ACCEPT,
+#. NULL));
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1081
+msgid "Create VPN Connection"
+msgstr "VPN-verbinding aanmaken"
+
+#. gtk_container_add (GTK_CONTAINER (druid_window->vbox), GTK_WIDGET(gtk_label_new("Some label")));
+#. gtk_box_pack_start (GTK_BOX (druid_window->vbox), GTK_WIDGET(druid), TRUE,TRUE,0);
+#. gtk_box_pack_start (GTK_BOX (druid_window->vbox), GTK_WIDGET(gtk_label_new("Some label")), TRUE,TRUE,0);
+#. toplevel = gtk_widget_get_toplevel (GTK_WIDGET (druid));
+#. gtk_signal_connect (GTK_OBJECT (toplevel), "delete_event", GTK_SIGNAL_FUNC (vpn_window_close), NULL);
+#. make the druid window modal wrt. our main window
+#. gtk_window_set_modal (druid_window, TRUE);
+#. gtk_window_set_transient_for (GTK_WINDOW(druid_window), GTK_WINDOW (dialog));
 #. Edit dialog
-#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1099
 msgid "Edit VPN Connection"
 msgstr "VPN-verbinding bewerken"
 
@@ -862,76 +917,36 @@ msgstr "VPN-verbinding bewerken"
 msgid "Add a new VPN connection"
 msgstr "Een nieuwe VPN-verbinding toevoegen"
 
-# opzetten/aanmaken
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:2
-msgid "Choose which type of VPN connection you wish to create."
-msgstr "Kies welk type VPN-verbinding u wilt aanmaken."
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
-msgid "Connect to:"
-msgstr "Verbinden met:"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
-msgid "Create VPN Connection"
-msgstr "VPN-verbinding aanmaken"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
-msgid "Create VPN Connection - 1 of 2"
-msgstr "VPN-verbinding aanmaken - 1 van 2"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
-msgid "Create VPN Connection - 2 of 2"
-msgstr "VPN-verbinding aanmaken - 2 van 2"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
 msgid "Delete the selected VPN connection"
 msgstr "De geselecteerde VPN-verbinding verwijderen"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
 msgid "E_xport"
 msgstr "E_xporteren"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:9
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
 msgid "Edit the selected VPN connection"
 msgstr "De geselecteerde VPN-verbinding bewerken"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:10
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
 msgid "Export the VPN settings to a file"
 msgstr "De VPN-instellingen exporteren naar een bestand"
 
 # gebiedende wijs hier mooier?
 # Exporteer de geselecteerde VPN-verbinding naar een bestand
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:11
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
 msgid "Export the selected VPN connection to a file"
 msgstr "De geselecteerde VPN-verbinding exporteren naar een bestand"
 
-# voltooi het aanmaken van de VPN-verbinding
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:12
-msgid "Finish Creating VPN Connection"
-msgstr "VPN-verbinding aanmaken voltooien"
-
 # virtuele privenetwerkverbindingen
 # virtuele prive-netwerken beheren
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:13
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
 msgid "Manage Virtual Private Network Connections"
 msgstr "Virtual Private Network-verbindingen beheren"
 
-#: ../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 ""
-"Deze assistent zal u helpen bij het opzetten van een Virtual Private "
-"Networdk (VPN)\n"
-"\n"
-"Het heeft bepaalde gegevens nodig zoals IP-adressen en geheimen. Vraag uw "
-"systeembeheerder om deze informatie."
-
 # Netwerken
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:17
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
 msgid "VPN Connections"
 msgstr "VPN-verbindingen"
 
@@ -943,35 +958,35 @@ msgstr "40-bit WEP"
 msgid "104-bit WEP"
 msgstr "104-bit WEP"
 
-#: ../src/nm-ap-security-wpa-psk.c:50
+#: ../src/nm-ap-security-wpa-psk.c:51
 msgid "WPA TKIP"
 msgstr "WPA TKIP"
 
-#: ../src/nm-ap-security-wpa-psk.c:52
+#: ../src/nm-ap-security-wpa-psk.c:53
 msgid "WPA CCMP"
 msgstr "WPA CCMP"
 
-#: ../src/nm-ap-security-wpa-psk.c:54
+#: ../src/nm-ap-security-wpa-psk.c:55
 msgid "WPA Automatic"
 msgstr "WPA automatisch"
 
-#: ../src/nm-ap-security-wpa-psk.c:59
+#: ../src/nm-ap-security-wpa-psk.c:60
 msgid "WPA2 TKIP"
 msgstr "WPA2 TKIP"
 
-#: ../src/nm-ap-security-wpa-psk.c:61
+#: ../src/nm-ap-security-wpa-psk.c:62
 msgid "WPA2 CCMP"
 msgstr "WPA2 CCMP"
 
-#: ../src/nm-ap-security-wpa-psk.c:63
+#: ../src/nm-ap-security-wpa-psk.c:64
 msgid "WPA2 Automatic"
 msgstr "WPA2 automatisch"
 
-#: ../src/nm-ap-security.c:320
+#: ../src/nm-ap-security.c:334
 msgid "none"
 msgstr "geen"
 
-#: ../src/nm-netlink-monitor.c:154
+#: ../src/nm-netlink-monitor.c:174
 #, c-format
 msgid ""
 "unable to create netlink socket for monitoring wired ethernet devices - %s"
@@ -979,7 +994,7 @@ msgstr ""
 "niet in staat om een netlink-socket aan te maken voor het monitoren van "
 "bekabelde ethernet-apparaten - %s"
 
-#: ../src/nm-netlink-monitor.c:172
+#: ../src/nm-netlink-monitor.c:192
 #, c-format
 msgid ""
 "unable to bind to netlink socket for monitoring wired ethernet devices - %s"
@@ -987,113 +1002,109 @@ msgstr ""
 "Niet in staat om te binden aan netlink-socket voor het monitoren van "
 "bekabelde ethernet-apparaten - %s"
 
-#: ../src/nm-netlink-monitor.c:405
+#: ../src/nm-netlink-monitor.c:427
 msgid "operation took too long"
 msgstr "bewerking duurde te lang"
 
-#: ../src/nm-netlink-monitor.c:502
+#: ../src/nm-netlink-monitor.c:524
 msgid "received data from wrong type of sender"
 msgstr "data ontvangen van een verkeerd type zender"
 
-#: ../src/nm-netlink-monitor.c:515
+#: ../src/nm-netlink-monitor.c:537
 msgid "received data from unexpected sender"
 msgstr "data ontvangen van een onverwachte zender"
 
-#: ../src/nm-netlink-monitor.c:646
+#: ../src/nm-netlink-monitor.c:666
 msgid "too much data was sent over socket and some of it was lost"
 msgstr "te veel data verzonden over de socket, een gedeelte is verloren"
 
-#: ../src/nm-netlink-monitor.c:735
+#: ../src/nm-netlink-monitor.c:776
 msgid "error occurred while waiting for data on socket"
 msgstr "er is een fout opgetreden bij het wachten op data van de 'socket'"
 
-#: ../src/applet-dbus-devices.c:898
+#: ../gnome/applet/applet-dbus-devices.c:930
 #, 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'."
+msgstr "U bent nu verbonden met het Ad-hoc draadloos netwerk ‘%s’."
 
-#: ../src/applet-dbus-devices.c:903
+#: ../gnome/applet/applet-dbus-devices.c:935
 #, c-format
 msgid "You are now connected to the wireless network '%s'."
-msgstr "U bent nu verbonden met het draadloos netwerk '%s'."
+msgstr "U bent nu verbonden met het draadloos netwerk ‘%s’."
 
-# bedraad netwerk
-#: ../src/applet-dbus-devices.c:910
+# bedraad netwerk/vast netwerk
+#: ../gnome/applet/applet-dbus-devices.c:942
 msgid "You are now connected to the wired network."
-msgstr "U bent nu verbonden met het bekabelde netwerk."
+msgstr "U bent nu verbonden met het bekabeld netwerk."
 
-#: ../src/applet-dbus-devices.c:916
+#: ../gnome/applet/applet-dbus-devices.c:948
 msgid "Connection Established"
 msgstr "Verbinding ingesteld"
 
-#: ../src/applet-dbus-devices.c:959
+#: ../gnome/applet/applet-dbus-devices.c:997
 msgid "Disconnected"
 msgstr "Verbinding verbroken"
 
 # "the connection has been disconnected" is een contaminatie
-#: ../src/applet-dbus-devices.c:960
+#: ../gnome/applet/applet-dbus-devices.c:998
 msgid "The network connection has been disconnected."
 msgstr "De verbinding met het netwerk is verbroken."
 
-#~ msgid "VPN Error"
-#~ msgstr "VPN-fout"
+#: ../src/nm-ap-security-leap.c:66 ../src/nm-ap-security-leap.c:82
+msgid "LEAP"
+msgstr "LEAP"
 
-#~ msgid "The VPN service said: \"%s\""
-#~ msgstr "De VPN-service meldde: \"%s\""
+# opzetten/aanmaken
+#~ msgid "Choose which type of VPN connection you wish to create."
+#~ msgstr "Kies welk type VPN-verbinding u wilt aanmaken."
 
-# verbinding naar/met
-#~ msgid "VPN connection '%s' said:"
-#~ msgstr "VPN-verbinding '%s' meldde:"
+#~ msgid "Connect to:"
+#~ msgstr "Verbinden met:"
 
-#~ msgid "WEP 40/128-bit ASCII"
-#~ msgstr "WEP 40/128-bit ASCII"
+#~ msgid "Create VPN Connection - 1 of 2"
+#~ msgstr "VPN-verbinding aanmaken - 1 van 2"
 
-#~ msgid "WEP 40/128-bit hex"
-#~ msgstr "WEP 40/128-bit hex"
+#~ msgid "Create VPN Connection - 2 of 2"
+#~ msgstr "VPN-verbinding aanmaken - 2 van 2"
 
-#~ msgid "WEP Passphrase"
-#~ msgstr "WEP wachtwoordzin"
+# voltooi het aanmaken van de VPN-verbinding
+#~ msgid "Finish Creating VPN Connection"
+#~ msgstr "VPN-verbinding aanmaken voltooien"
 
 #~ msgid ""
-#~ "None\n"
-#~ "WEP Passphrase\n"
-#~ "WEP 40/128-bit hex\n"
-#~ "WEP 40/128-bit ASCII\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.  "
+#~ "Please see your system administrator to obtain this information."
 #~ msgstr ""
-#~ "Geen\n"
-#~ "WEP wachtwoordzin\n"
-#~ "WEP 40/128-bit hex\n"
-#~ "WEP 40/128-bit ASCII\n"
+#~ "Deze assistent zal u helpen bij het opzetten van een Virtual Private "
+#~ "Networdk (VPN)\n"
+#~ "\n"
+#~ "Het heeft bepaalde gegevens nodig zoals IP-adressen en geheimen. Vraag uw "
+#~ "systeembeheerder om deze informatie."
 
-# BUG: deze horen niet thuis in het po-bestand
-#~ msgid "leap_subwindow"
-#~ msgstr "leap_subwindow"
+#~ msgid "Stop automatically running the networking applet?"
+#~ msgstr "Niet langer automatisch het netwerk-applet opstarten?"
 
-# BUG: deze horen niet thuis in het po-bestand
-#~ msgid "wep_key_subwindow"
-#~ msgstr "wep_key_subwindow"
+#~ 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?"
 
-# BUG: deze horen niet thuis in het po-bestand
-#~ msgid "wep_passphrase_subwindow"
-#~ msgstr "wep_passphrase_subwindow"
+#~ msgid "_Remove"
+#~ msgstr "_Verwijderen"
 
-# BUG: deze horen niet thuis in het po-bestand
-#~ msgid "wpa_psk_subwindow"
-#~ msgstr "wpa_psk_subwindow"
+#~ msgid "VPN Error"
+#~ msgstr "VPN-fout"
 
 #~ msgid "Connect using WPA2"
 #~ msgstr "Verbinden met gebruik van WPA2"
 
-#~ msgid "CCMP/AES"
-#~ msgstr "CCMP/AES"
-
-#~ msgid "Use WPA Enterprise (WPA2)"
-#~ msgstr "WPA-enterprise (WPA2) gebruiken"
-
-# BUG: deze horen niet thuis in het po-bestand
-#~ msgid "wpa_psk_passphrase_subwindow"
-#~ msgstr "wpa_psk_passphrase_subwindow"
-
 #~ msgid "WPA Preshared-Key Hex"
 #~ msgstr "WPA preshared-key hex"
 
@@ -1122,22 +1133,6 @@ msgstr "De verbinding met het netwerk is verbroken."
 #~ msgid "Wireless _network:"
 #~ msgstr "Draadloos _netwerk:"
 
-#~ msgid "_Key type:"
-#~ msgstr "_Sleuteltype:"
-
-# draadloze netwerk/draadloos netwerk
-#~ 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 ""
-#~ "Het opgevraagde draadloos netwerk '%s' is kennelijk niet binnen bereik.  "
-#~ "Indien er een ander draadloos netwerk beschikbaar is zal dat worden "
-#~ "gebruikt."
-
-# deze zin is verbonden met de vorige zin?
-#~ msgid ", with no encryption enabled."
-#~ msgstr ", en zonder versleuteling."
-
 #~ msgid "Could not open socket!"
 #~ msgstr "Kon 'socket' niet openen!"
 
@@ -1173,23 +1168,6 @@ msgstr "De verbinding met het netwerk is verbroken."
 #~ "Afhankelijk van het privé-netwerk weermee u een verbinding wilt maken, "
 #~ "moet u het type verbinding selecteren wat u wilt maken."
 
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">%s</span>\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "\"%s\""
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">%s</span>\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "\"%s\""
-
-# Okay
-#~ msgid "_OK"
-#~ msgstr "_OK"
-
 # aanmeld-fout kan verwarrend zijn omdat je je ook bij een draadloos 
 # netwerk moet aanmelden.
 #~ msgid ""
@@ -1233,9 +1211,6 @@ msgstr "De verbinding met het netwerk is verbroken."
 #~ "\n"
 #~ "De VPN-service meldde: \"%s\""
 
-#~ msgid "%s"
-#~ msgstr "%s"
-
 #~ msgid "Other Wireless Networks..."
 #~ msgstr "Andere draadloze netwerken..."
 
@@ -1253,9 +1228,6 @@ msgstr "De verbinding met het netwerk is verbroken."
 #~ msgid "You must log in to access the Virtual Private Network '%s'."
 #~ msgstr "U moet inloggen voor toegang tot het Virtual Private Network '%s'."
 
-#~ msgid "*"
-#~ msgstr "*"
-
 #~ msgid "<span weight=\"bold\">Wireless Networks:</span>"
 #~ msgstr "<span weight=\"bold\">Draadloze netwerken:</span>"
 
@@ -1268,25 +1240,6 @@ msgstr "De verbinding met het netwerk is verbroken."
 #~ msgid "There are no network devices..."
 #~ msgstr "Er zijn geen netwerkapparaten..."
 
-# aanwezig/actief
-#~ msgid "No network connection is currently active..."
-#~ msgstr "Er is momenteel geen netwerkverbinding actief..."
-
 # 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/pa.po b/po/pa.po
index 28917915..81a69e73 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: 2006-05-29 18:33+0200\n"
+"POT-Creation-Date: 2005-03-05 11:56+0100\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,1000 +20,249 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "\n"
 
-#: ../src/applet-compat.c:171 ../src/applet-dbus-info.c:919
-#, fuzzy, c-format
-msgid "Passphrase for wireless network %s"
-msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ ਬਣਾਓ"
-
-#: ../src/applet-dbus.c:265
-#, fuzzy, c-format
-msgid "Connection to the wireless network '%s' failed."
-msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ '%s' ਨਾਲ ਜੁੜਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
-
-#: ../src/applet-dbus.c:270
-#, fuzzy
-msgid "Connection to the wired network failed."
-msgstr "ਤਾਰ ਵਾਲੇ ਨੈਟਵਰਕ ਨਾਲ ਜੁੜਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
-
-#: ../src/applet.c:184
-msgid "Error displaying connection information:"
-msgstr ""
-
-#: ../src/applet.c:202
-msgid "Could not find some required resources (the glade file)!"
-msgstr ""
-
-#: ../src/applet.c:213
-#, fuzzy
-msgid "No active connections!"
-msgstr "ਕੋਈ ਨੈਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਨਹੀਂ"
-
-#: ../src/applet.c:234
-#, fuzzy, c-format
-msgid "Wired Ethernet (%s)"
-msgstr "ਤਾਰ ਨੈਟਰਵਕ (%s)"
-
-#: ../src/applet.c:236
-#, fuzzy, c-format
-msgid "Wireless Ethernet (%s)"
-msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ (%s)"
+#: info-daemon/networks.glade.h:1
+msgid "<span weight=\"bold\">Wireless Networks:</span>"
+msgstr "<span weight=\"bold\">ਬੇਤਾਰ ਨੈੱਟਵਰਕ:</span>"
 
-#: ../src/applet.c:337 ../src/applet.c:362
-msgid "NetworkManager Applet"
-msgstr "ਨੈਟਵਰਕਮੈਨੇਜਰ ਐਪਲਿਟ"
+#: info-daemon/networks.glade.h:2
+msgid "Modify Wireless Networks"
+msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ ਸੋਧ"
 
-#: ../src/applet.c:339 ../src/applet.c:364
-#, fuzzy
-msgid "Copyright © 2004-2005 Red Hat, Inc."
-msgstr "ਹੱਕ ਰਾਖਵੇਂ ਹਨ (C) 2004-2005 Red Hat, Inc."
+#: info-daemon/passphrase.glade.h:1
+msgid "*"
+msgstr "*"
 
-#: ../src/applet.c:340 ../src/applet.c:365
+#: info-daemon/passphrase.glade.h:2
 msgid ""
-"Notification area applet for managing your network devices and connections."
-msgstr ""
-"ਸੂਚਨਾ ਖੇਤਰ ਐਪਲਿਟ, ਜੋ ਕਿ ਵੇਖਾਉਦਾ ਹੈ ਕਿ ਤੁਹਾਡੇ ਨੈਟਵਰਕ ਜੰਤਰਾਂ ਅਤੇ ਕੁਨੈਕਸ਼ਨਾਂ ਨੂੰ ਕਿਵੇਂ ਵੇਖਿਆ ਜਾਵੇ।"
-
-#: ../src/applet.c:343 ../src/applet.c:370
-msgid "translator-credits"
-msgstr ""
-
-#: ../src/applet.c:426
-msgid "VPN Login Failure"
-msgstr ""
-
-#: ../src/applet.c:427
-#, c-format
-msgid "Could not start the VPN connection '%s' due to a login failure."
-msgstr ""
-
-#: ../src/applet.c:431
-msgid "VPN Start Failure"
+"128-bit Passphrase (WEP)\n"
+"Ascii Key (WEP)\n"
+"Hex Key (WEP)"
 msgstr ""
+"128-bit ਪ੍ਹੈਰਾ (WEP)\n"
+"Ascii ਕੁੰਜੀ (WEP)\n"
+"Hex ਕੁੰਜੀ (WEP)"
 
-#: ../src/applet.c:432
-#, c-format
+#: info-daemon/passphrase.glade.h:6
+#, no-c-format
 msgid ""
-"Could not start the VPN connection '%s' due to a failure launching the VPN "
-"program."
-msgstr ""
-
-#: ../src/applet.c:436 ../src/applet.c:446
-msgid "VPN Connect Failure"
-msgstr ""
-
-#: ../src/applet.c:437
-#, c-format
-msgid "Could not start the VPN connection '%s' due to a connection error."
+"<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 ""
 
-#: ../src/applet.c:441
-msgid "VPN Configuration Error"
-msgstr ""
+#: info-daemon/passphrase.glade.h:9
+msgid "Key Type:"
+msgstr "ਕੁੰਜੀ ਕਿਸਮ:"
 
-#: ../src/applet.c:442
-#, c-format
-msgid "The VPN connection '%s' was not correctly configured."
-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 "ਪ੍ਰਸੰਗ:"
 
-#: ../src/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/passphrase.glade.h:11
+msgid "Wireless Network Key Required"
+msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ ਸਵਿੱਚ ਲੋੜੀਦਾ"
 
-#: ../src/applet.c:517
-msgid "VPN Login Message"
-msgstr ""
+#: info-daemon/passphrase.glade.h:12
+msgid "_Login to Network"
+msgstr "ਨੈਟਵਰਕ ਤੇ ਲਾਗਿੰਨ(_L)"
 
-#: ../src/applet.c:741 ../src/applet.c:2508
-#: ../src/other-network-dialog.c:453
-#: ../src/passphrase-dialog.c:228
-msgid ""
-"The NetworkManager Applet could not find some required resources (the glade "
-"file was not found)."
-msgstr ""
+#: info-daemon/NetworkManagerInfoPassphraseDialog.c:142
+#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:153
+msgid "Ascii Key:"
+msgstr "Ascii ਕੁੰਜੀ:"
 
-#: ../src/applet.c:753
-#, c-format
-msgid "The network device \"%s (%s)\" does not support wireless scanning."
-msgstr ""
+#: info-daemon/NetworkManagerInfoPassphraseDialog.c:145
+#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:156
+msgid "Hex Key:"
+msgstr "Hex ਕੁੰਜੀ:"
 
-#: ../src/applet.c:761
+#: info-daemon/NetworkManagerInfoVPN.c:157
 #, c-format
-msgid "The network device \"%s (%s)\" does not support link detection."
-msgstr ""
-
-#: ../src/applet.c:908
-#, fuzzy, c-format
-msgid "Preparing device %s for the wired network..."
-msgstr "ਤਾਰ ਵਾਲੇ ਨੈਟਵਰਕ ਨਾਲ ਜੁੜਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
-
-#: ../src/applet.c:910
-#, fuzzy, c-format
-msgid "Preparing device %s for the wireless network '%s'..."
-msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ '%s' ਨਾਲ ਜੁੜਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
-
-#: ../src/applet.c:918
-#, fuzzy, c-format
-msgid "Configuring device %s for the wired network..."
-msgstr "ਤਾਰ ਵਾਲੇ ਨੈਟਵਰਕ ਨਾਲ ਜੁੜਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
-
-#: ../src/applet.c:920
-#, fuzzy, c-format
-msgid "Attempting to join the wireless network '%s'..."
-msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ '%s' ਨਾਲ ਜੁੜਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
-
-#: ../src/applet.c:928
-#, fuzzy, c-format
-msgid "Waiting for Network Key for the wireless network '%s'..."
-msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ '%s' ਨਾਲ ਜੁੜਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
-
-#: ../src/applet.c:936 ../src/applet.c:946
-#, fuzzy
-msgid "Requesting a network address from the wired network..."
-msgstr "ਤਾਰ ਵਾਲੇ ਨੈਟਵਰਕ ਨਾਲ ਜੁੜਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
-
-#: ../src/applet.c:938 ../src/applet.c:948
-#, fuzzy, c-format
-msgid "Requesting a network address from the wireless network '%s'..."
-msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ '%s' ਨਾਲ ਜੁੜਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
+msgid "You must log in to access the private network %s"
+msgstr "ਤੁਹਾਨੂੰ ਨਿੱਜੀ ਨੈਟਵਰਕ %s ਨੂੰ ਵਰਤਣ ਲਈ ਲਾਗਿੰਨ ਕਰਨਾ ਪਵੇਗਾ"
 
-#: ../src/applet.c:956
-#, fuzzy
-msgid "Finishing connection to the wired network..."
-msgstr "ਤਾਰ ਵਾਲੇ ਨੈਟਵਰਕ ਨਾਲ ਜੁੜਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
-
-#: ../src/applet.c:958
-#, fuzzy, c-format
-msgid "Finishing connection to the wireless network '%s'..."
-msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ '%s' ਨਾਲ ਜੁੜਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
+#: panel-applet/NMWirelessApplet.c:142 panel-applet/NMWirelessApplet.c:160
+msgid "NetworkManager Applet"
+msgstr "ਨੈਟਵਰਕਮੈਨੇਜਰ ਐਪਲਿਟ"
 
-#: ../src/applet.c:1075
-msgid "NetworkManager is not running"
-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."
 
-#: ../src/applet.c:1083 ../src/applet.c:1828
-msgid "Networking disabled"
-msgstr ""
+#: panel-applet/NMWirelessApplet.c:145 panel-applet/NMWirelessApplet.c:163
+msgid "Notification area applet for managing your network devices and connections."
+msgstr "ਸੂਚਨਾ ਖੇਤਰ ਐਪਲਿਟ, ਜੋ ਕਿ ਵੇਖਾਉਦਾ ਹੈ ਕਿ ਤੁਹਾਡੇ ਨੈਟਵਰਕ ਜੰਤਰਾਂ ਅਤੇ ਕੁਨੈਕਸ਼ਨਾਂ ਨੂੰ ਕਿਵੇਂ ਵੇਖਿਆ ਜਾਵੇ।"
 
-#: ../src/applet.c:1088
+#: panel-applet/NMWirelessApplet.c:379
 msgid "No network connection"
 msgstr "ਕੋਈ ਨੈਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਨਹੀਂ"
 
-#: ../src/applet.c:1093
+#: panel-applet/NMWirelessApplet.c:384
 msgid "Wired network connection"
 msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ"
 
-#: ../src/applet.c:1097
+#: panel-applet/NMWirelessApplet.c:389
+msgid "Connecting to a wired network..."
+msgstr "ਤਾਰ ਵਾਲੇ ਨੈਟਵਰਕ ਨਾਲ ਜੁੜਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
+
+#: panel-applet/NMWirelessApplet.c:398
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Ad-Hoc ਬੇਤਾਰ ਨੈਟਵਰਕ ਨਾਲ ਜੁੜਿਆ"
 
-#: ../src/applet.c:1099
+#: panel-applet/NMWirelessApplet.c:412
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "'%s' (%d%%) ਲਈ ਬੇਤਾਰ ਨੈਟਵਰਕ ਕੁਨੈਕਸ਼ਨ"
 
-#: ../src/applet.c:1120
-#, c-format
-msgid "VPN connection to '%s'"
-msgstr ""
+#: panel-applet/NMWirelessApplet.c:417
+msgid "Wireless network connection"
+msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ ਸੋਧ"
 
-#: ../src/applet.c:1128
+#: panel-applet/NMWirelessApplet.c:422
 #, c-format
-msgid "VPN connecting to '%s'"
-msgstr ""
-
-#: ../src/applet.c:1541
-#, fuzzy
-msgid "_Connect to Other Wireless Network..."
-msgstr "ਹੋਰ ਬੇਤਾਰ ਨੈੱਟਵਰਕ..."
-
-#: ../src/applet.c:1562
-#, fuzzy
-msgid "Create _New Wireless Network..."
-msgstr "ਨਵਾਂ ਬੇਤਾਰ ਨੈੱਟਵਰਕ ਬਣਾਓ..."
-
-#: ../src/applet.c:1685
-msgid "_VPN Connections"
-msgstr ""
-
-#: ../src/applet.c:1730
-msgid "_Configure VPN..."
-msgstr ""
+msgid "Connecting to wireless network '%s'..."
+msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ '%s' ਨਾਲ ਜੁੜਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: ../src/applet.c:1734
-msgid "_Disconnect VPN..."
-msgstr ""
+#: panel-applet/NMWirelessApplet.c:428
+msgid "NetworkManager is not running"
+msgstr "ਨੈਟਵਰਕ ਮੈਨੇਜਰ ਚੱਲ ਨਹੀਂ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/applet.c:1756
-msgid "_Dial Up Connections"
-msgstr ""
+#: panel-applet/NMWirelessApplet.c:433
+msgid "Scanning for wireless networks..."
+msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ ਲਈ ਖੋਜ ਜਾਰੀ ਹੈ..."
 
-#. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
-#: ../src/applet.c:1767
-#, c-format
-msgid "Connect to %s..."
-msgstr ""
+#: panel-applet/NMWirelessApplet.c:798
+msgid "Other Wireless Networks..."
+msgstr "ਹੋਰ ਬੇਤਾਰ ਨੈੱਟਵਰਕ..."
 
-#: ../src/applet.c:1773
-#, c-format
-msgid "Disconnect from %s..."
-msgstr ""
+#: panel-applet/NMWirelessApplet.c:819
+msgid "Create new Wireless Network..."
+msgstr "ਨਵਾਂ ਬੇਤਾਰ ਨੈੱਟਵਰਕ ਬਣਾਓ..."
 
-#: ../src/applet.c:1822
+#: panel-applet/NMWirelessApplet.c:895
 msgid "No network devices have been found"
 msgstr "ਕੋਈ ਨੈਟਵਰਕ ਜੰਤਰ ਨਹੀਂ ਲੱਭਿਆ"
 
-#: ../src/applet.c:2014
+#: panel-applet/NMWirelessApplet.c:1037
 msgid "NetworkManager is not running..."
 msgstr "ਨੈਟਵਰਕਮੈਨੇਜਰ ਚੱਲ ਨਹੀਂ ਰਿਹਾ ਹੈ..."
 
-#. 'Enable Networking' item
-#: ../src/applet.c:2170
-msgid "Enable _Networking"
-msgstr ""
+#: panel-applet/NMWirelessApplet.c:1107 panel-applet/NMWirelessApplet.c:1156
+msgid "Pause Wireless Scanning"
+msgstr "ਬੇਤਾਰ ਪੜਤਾਲ ਰੋਕੋ"
 
-#. 'Enable Wireless' item
-#: ../src/applet.c:2176
-msgid "Enable _Wireless"
-msgstr ""
+#: panel-applet/NMWirelessApplet.c:1112
+msgid "Resume Wireless Scanning"
+msgstr "ਬੇਤਾਰ ਪੜਤਾਲ ਮੁੜ ਚਾਲੂ"
 
-#. 'Connection Information' item
-#: ../src/applet.c:2182
-msgid "Connection _Information"
-msgstr ""
+#: panel-applet/NMWirelessApplet.c:1122 panel-applet/NMWirelessApplet.c:1162
+msgid "Stop All Wireless Devices"
+msgstr "ਸਭ ਬੇਤਾਰ ਜੰਤਰ ਰੋਕੋ"
 
-#. Help item
-#: ../src/applet.c:2193
-#, fuzzy
-msgid "_Help"
+#: panel-applet/NMWirelessApplet.c:1127
+msgid "Start All Wireless Devices"
+msgstr "ਸਭ ਬੇਤਾਰ ਜੰਤਰ ਸ਼ੁਰੂ"
+
+#: panel-applet/NMWirelessApplet.c:1172
+msgid "Help"
 msgstr "ਸਹਾਇਤਾ"
 
-#. About item
-#: ../src/applet.c:2202
-#, fuzzy
-msgid "_About"
+#: panel-applet/NMWirelessApplet.c:1179
+msgid "About"
 msgstr "ਇਸ ਬਾਰੇ"
 
-#: ../src/applet.c:2667
-msgid ""
-"The NetworkManager applet could not find some required resources.  It cannot "
-"continue.\n"
-msgstr ""
-
-#: ../src/wireless-security-option.c:157
-msgid "Open System"
-msgstr ""
-
-#: ../src/wireless-security-option.c:160
-msgid "Shared Key"
-msgstr ""
-
-#: ../src/wireless-security-option.c:208
-msgid "Automatic (Default)"
-msgstr ""
-
-#: ../src/wireless-security-option.c:215
-msgid "AES-CCMP"
-msgstr ""
-
-#: ../src/wireless-security-option.c:223
-msgid "TKIP"
-msgstr ""
-
-#: ../src/wireless-security-option.c:231
-msgid "Dynamic WEP"
-msgstr ""
-
-#: ../src/wso-none.c:53
-msgid "None"
-msgstr ""
-
-#: ../src/wso-wep-ascii.c:138
-msgid "WEP 64/128-bit ASCII"
-msgstr ""
+#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:229
+msgid "Create new wireless network"
+msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ ਬਣਾਓ"
 
-#: ../src/wso-wep-hex.c:135
-msgid "WEP 64/128-bit Hex"
+#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:230
+msgid ""
+"Enter the ESSID and security settings of the wireless network you wish to "
+"create."
 msgstr ""
 
-#: ../src/wso-wep-passphrase.c:135
-#, fuzzy
-msgid "WEP 128-bit Passphrase"
-msgstr "ਪ੍ਰਸੰਗ:"
-
-#: ../src/wso-wpa-eap.c:237
-msgid "PEAP"
-msgstr ""
+#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:235
+msgid "Custom wireless network"
+msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ ਸੋਧ"
 
-#: ../src/wso-wpa-eap.c:238
-msgid "TLS"
+#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:236
+msgid "Enter the ESSID of the wireless network to which you wish to connect."
 msgstr ""
 
-#: ../src/wso-wpa-eap.c:239
-msgid "TTLS"
+#. 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)."
 msgstr ""
 
-#: ../src/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
-#: ../src/nm-ap-security-wpa-eap.c:116
-msgid "WPA2 Enterprise"
+#: panel-applet/essid.glade.h:1
+msgid ""
+"128-bit passphrase (WEP)\n"
+"Ascii key (WEP)\n"
+"Hex key (WEP)"
 msgstr ""
+"128-bit ਪ੍ਹੈਰਾ (WEP)\n"
+"Ascii ਕੁੰਜੀ (WEP)\n"
+"Hex ਕੁੰਜੀ (WEP)"
 
-#: ../src/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 ""
+#: panel-applet/essid.glade.h:4
+msgid "C_onnect"
+msgstr "ਕੁਨੈਕਸ਼ਨ(_o)"
 
-#: ../src/wso-wpa-psk.c:178
-msgid "WPA2 Personal"
-msgstr ""
+#: panel-applet/essid.glade.h:5
+msgid "Connect with encryption enabled"
+msgstr "ਇਕ੍ਰਿਪਸ਼ਨ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਯੋਗ"
 
-#: ../src/wso-wpa-psk.c:180
-msgid "WPA Personal"
-msgstr ""
+#: panel-applet/essid.glade.h:6
+msgid "Key type:"
+msgstr "ਕੁੰਜੀ ਕਿਸਮ:"
 
-#: ../src/eggtrayicon.c:134
-msgid "Orientation"
-msgstr "ਸਥਿਤੀ"
+#: panel-applet/essid.glade.h:8
+msgid "Wireless _adapter:"
+msgstr "ਬੇਤਾਰ ਐਡਪਟਰ(_a):"
 
-#: ../src/eggtrayicon.c:135
-msgid "The orientation of the tray."
-msgstr "ਟਰੇ ਦੀ ਸਥਿਤੀ ਹੈ।"
+#: panel-applet/essid.glade.h:9
+msgid "Wireless _network:"
+msgstr "ਬੇਤਾਰ ਨੈਟਵਰਕ(_n):"
 
-#: ../src/menu-items.c:88
+#: panel-applet/menu-info.c:91
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "ਤਾਰ ਨੈਟਰਵਕ (%s)"
 
-#: ../src/menu-items.c:91
-#, fuzzy
-msgid "_Wired Network"
+#: panel-applet/menu-info.c:93
+msgid "Wired Network"
 msgstr "ਤਾਰ ਨੈੱਟਵਰਕ"
 
-#: ../src/menu-items.c:162
+#: panel-applet/menu-info.c:166
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
 msgstr[0] "ਬੇਤਾਰ ਨੈੱਟਵਰਕ (%s)"
 msgstr[1] "ਬੇਤਾਰ ਨੈੱਟਵਰਕ (%s)"
 
-#: ../src/menu-items.c:164
+#: panel-applet/menu-info.c:168
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "ਬੇਤਾਰ ਨੈੱਟਵਰਕ"
 msgstr[1] "ਬੇਤਾਰ ਨੈੱਟਵਰਕ"
 
-#: ../src/menu-items.c:343
+#: panel-applet/menu-info.c:294
 msgid " (invalid Unicode)"
 msgstr " (ਗਲਤ ਯੂਨੀਕੋਡ)"
 
-#: ../src/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 ""
-
-#: ../src/other-network-dialog.c:358
-msgid "Create new wireless network"
-msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ ਬਣਾਓ"
-
-#: ../src/other-network-dialog.c:359
-msgid ""
-"Enter the name and security settings of the wireless network you wish to "
-"create."
-msgstr ""
-
-#: ../src/other-network-dialog.c:363
-#, fuzzy
-msgid "Create New Wireless Network"
-msgstr "ਨਵਾਂ ਬੇਤਾਰ ਨੈੱਟਵਰਕ ਬਣਾਓ..."
-
-#: ../src/other-network-dialog.c:368
-#, fuzzy
-msgid "Existing wireless network"
-msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ ਸੋਧ"
-
-#: ../src/other-network-dialog.c:369
-msgid "Enter the name of the wireless network to which you wish to connect."
-msgstr ""
-
-#: ../src/other-network-dialog.c:371
-#, fuzzy
-msgid "Connect to Other Wireless Network"
-msgstr "ਹੋਰ ਬੇਤਾਰ ਨੈੱਟਵਰਕ..."
-
-#: ../src/passphrase-dialog.c:215
-#, fuzzy
-msgid "Error connecting to wireless network"
-msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ '%s' ਨਾਲ ਜੁੜਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
-
-#: ../src/passphrase-dialog.c:216
-msgid ""
-"The requested wireless network requires security capabilities unsupported by "
-"your hardware."
-msgstr ""
-
-#: ../src/vpn-password-dialog.c:151
-#: ../src/vpn-password-dialog.c:188
-#, c-format
-msgid "Cannot start VPN connection '%s'"
-msgstr ""
-
-#: ../src/vpn-password-dialog.c:154
-#, c-format
-msgid ""
-"Could not find the authentication dialog for VPN connection type '%s'. "
-"Contact your system administrator."
-msgstr ""
-
-#: ../src/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 ""
-
-#: ../src/applet.glade.h:1
-msgid " "
-msgstr ""
-
-#: ../src/applet.glade.h:2
-#, fuzzy
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
-msgstr "<span weight=\"bold\">ਬੇਤਾਰ ਨੈੱਟਵਰਕ:</span>"
-
-#: ../src/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 ""
-
-#: ../src/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 ""
-
-#: ../src/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 ""
-
-#: ../src/applet.glade.h:15
-msgid "Anonymous Identity:"
-msgstr ""
-
-#: ../src/applet.glade.h:16
-#, fuzzy
-msgid "Authentication:"
+#: examples/python/systray/eggtrayicon.c:111
+msgid "Orientation"
 msgstr "ਸਥਿਤੀ"
 
-#: ../src/applet.glade.h:17
-msgid "Broadcast Address:"
-msgstr ""
-
-#: ../src/applet.glade.h:18
-msgid "CA Certificate File:"
-msgstr ""
-
-#: ../src/applet.glade.h:19
-msgid "C_onnect"
-msgstr "ਕੁਨੈਕਸ਼ਨ(_o)"
-
-#: ../src/applet.glade.h:20
-msgid "Client Certificate File:"
-msgstr ""
-
-#: ../src/applet.glade.h:21
-msgid "Connection Information"
-msgstr ""
-
-#: ../src/applet.glade.h:22
-msgid "Default Route:"
-msgstr ""
-
-#: ../src/applet.glade.h:23
-msgid "Destination Address:"
-msgstr ""
-
-#: ../src/applet.glade.h:24
-msgid "Driver:"
-msgstr ""
-
-#: ../src/applet.glade.h:25
-msgid "EAP Method:"
-msgstr ""
-
-#: ../src/applet.glade.h:26
-msgid "Hardware Address:"
-msgstr ""
-
-#: ../src/applet.glade.h:27
-msgid "IP Address:"
-msgstr ""
-
-#: ../src/applet.glade.h:28
-msgid "Identity:"
-msgstr ""
-
-#: ../src/applet.glade.h:29
-msgid "Interface:"
-msgstr ""
-
-#: ../src/applet.glade.h:30
-msgid "Key Type:"
-msgstr "ਕੁੰਜੀ ਕਿਸਮ:"
-
-#: ../src/applet.glade.h:31
-#, fuzzy
-msgid "Key:"
-msgstr "Hex ਕੁੰਜੀ:"
-
-#: ../src/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 ""
-
-#: ../src/applet.glade.h:37
-msgid ""
-"Open System\n"
-"Shared Key"
-msgstr ""
-
-#: ../src/applet.glade.h:39
-#, fuzzy
-msgid "Other Wireless Network..."
-msgstr "ਹੋਰ ਬੇਤਾਰ ਨੈੱਟਵਰਕ..."
-
-#: ../src/applet.glade.h:40
-msgid "Passphrase:"
-msgstr "ਪ੍ਰਸੰਗ:"
-
-#: ../src/applet.glade.h:41
-msgid "Password:"
-msgstr ""
-
-#: ../src/applet.glade.h:42
-msgid "Primary DNS:"
-msgstr ""
-
-#: ../src/applet.glade.h:43
-msgid "Private Key File:"
-msgstr ""
-
-#: ../src/applet.glade.h:44
-msgid "Private Key Password:"
-msgstr ""
-
-#: ../src/applet.glade.h:45
-msgid "Secondary DNS:"
-msgstr ""
-
-#: ../src/applet.glade.h:46
-msgid "Select the CA Certificate File"
-msgstr ""
-
-#: ../src/applet.glade.h:47
-msgid "Select the Client Certificate File"
-msgstr ""
-
-#: ../src/applet.glade.h:48
-msgid "Select the Private Key File"
-msgstr ""
-
-#: ../src/applet.glade.h:49
-msgid "Show key"
-msgstr ""
-
-#: ../src/applet.glade.h:50
-#, fuzzy
-msgid "Show passphrase"
-msgstr "ਪ੍ਰਸੰਗ:"
-
-#: ../src/applet.glade.h:51
-msgid "Show password"
-msgstr ""
-
-#: ../src/applet.glade.h:52
-msgid "Show passwords"
-msgstr ""
-
-#: ../src/applet.glade.h:53
-msgid "Speed:"
-msgstr ""
-
-#: ../src/applet.glade.h:54
-msgid "Subnet Mask:"
-msgstr ""
-
-#: ../src/applet.glade.h:55
-#, fuzzy
-msgid "Type:"
-msgstr "ਕੁੰਜੀ ਕਿਸਮ:"
-
-#: ../src/applet.glade.h:56
-msgid "User Name:"
-msgstr ""
-
-#: ../src/applet.glade.h:57
-msgid "Wireless Network Key Required"
-msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ ਸਵਿੱਚ ਲੋੜੀਦਾ"
-
-#: ../src/applet.glade.h:58
-msgid "Wireless _adapter:"
-msgstr "ਬੇਤਾਰ ਐਡਪਟਰ(_a):"
-
-#: ../src/applet.glade.h:59
-#, fuzzy
-msgid "_Always Trust this Wireless Network"
-msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ"
-
-#: ../src/applet.glade.h:60
-msgid "_Don't remind me again"
-msgstr ""
-
-#: ../src/applet.glade.h:61
-msgid "_Login to Network"
-msgstr "ਨੈਟਵਰਕ ਤੇ ਲਾਗਿੰਨ(_L)"
-
-#: ../src/applet.glade.h:62
-msgid "_Network Name:"
-msgstr ""
-
-#: ../src/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 ""
-
-#: ../src/applet-dbus-devices.c:898
-#, fuzzy, c-format
-msgid "You are now connected to the Ad-Hoc wireless network '%s'."
-msgstr "Ad-Hoc ਬੇਤਾਰ ਨੈਟਵਰਕ ਨਾਲ ਜੁੜਿਆ"
-
-#: ../src/applet-dbus-devices.c:903
-#, fuzzy, c-format
-msgid "You are now connected to the wireless network '%s'."
-msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ '%s' ਨਾਲ ਜੁੜਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
-
-#: ../src/applet-dbus-devices.c:910
-#, fuzzy
-msgid "You are now connected to the wired network."
-msgstr "ਤਾਰ ਵਾਲੇ ਨੈਟਵਰਕ ਨਾਲ ਜੁੜਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
-
-#: ../src/applet-dbus-devices.c:916
-#, fuzzy
-msgid "Connection Established"
-msgstr "ਇਕ੍ਰਿਪਸ਼ਨ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਯੋਗ"
-
-#: ../src/applet-dbus-devices.c:959
-msgid "Disconnected"
-msgstr ""
-
-#: ../src/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 "ਇਕ੍ਰਿਪਸ਼ਨ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਯੋਗ"
+#: examples/python/systray/eggtrayicon.c:112
+msgid "The orientation of the tray."
+msgstr "ਟਰੇ ਦੀ ਸਥਿਤੀ ਹੈ।"
 
-#~ msgid "Wired Network"
-#~ msgstr "ਤਾਰ ਨੈੱਟਵਰਕ"
diff --git a/po/pl.po b/po/pl.po
deleted file mode 100644
index f356edd3..00000000
--- a/po/pl.po
+++ /dev/null
@@ -1,891 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# 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.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: 1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-29 18:33+0200\n"
-"PO-Revision-Date: 2006-06-15 11:35+0100\n"
-"Last-Translator: Wadim Dziedzic <nikdo@aviary.pl>\n"
-"Language-Team: PL <PL@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%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
-
-#: ../src/applet-compat.c:171
-#: ../src/applet-dbus-info.c:919
-#, c-format
-msgid "Passphrase for wireless network %s"
-msgstr "Hasło dla sieci bezprzewodowej %s"
-
-#: ../src/applet-dbus.c:265
-#, c-format
-msgid "Connection to the wireless network '%s' failed."
-msgstr "Połączenie z siecią bezprzewodową '%s' zakończone niepowodzeniem."
-
-#: ../src/applet-dbus.c:270
-msgid "Connection to the wired network failed."
-msgstr "Połączenie z siecią kablową zakończone niepowodzeniem."
-
-#: ../src/applet.c:184
-msgid "Error displaying connection information:"
-msgstr "Błąd podczas wyświetlania informacji o połączeniu:"
-
-#: ../src/applet.c:202
-msgid "Could not find some required resources (the glade file)!"
-msgstr "Nie znaleziono wymaganych plików zasobów (plik glade)."
-
-#: ../src/applet.c:213
-msgid "No active connections!"
-msgstr "Brak aktywnych połączeń."
-
-#: ../src/applet.c:234
-#, c-format
-msgid "Wired Ethernet (%s)"
-msgstr "Ethernet kablowy (%s)"
-
-#: ../src/applet.c:236
-#, c-format
-msgid "Wireless Ethernet (%s)"
-msgstr "Ethernet bezprzewodowy (%s)"
-
-#: ../src/applet.c:337
-#: ../src/applet.c:362
-msgid "NetworkManager Applet"
-msgstr "Aplet NetworkManager"
-
-#: ../src/applet.c:339
-#: ../src/applet.c:364
-msgid "Copyright © 2004-2005 Red Hat, Inc."
-msgstr "Copyright © 2004-2005 Red Hat, Inc."
-
-#: ../src/applet.c:340
-#: ../src/applet.c:365
-msgid "Notification area applet for managing your network devices and connections."
-msgstr "Aplet paska systemowego do zarządzania urządzeniami i połączeniami sieciowymi."
-
-#: ../src/applet.c:343
-#: ../src/applet.c:370
-msgid "translator-credits"
-msgstr "AviaryPL dla Novell Polska sp. z o.o. 2006"
-
-#: ../src/applet.c:426
-msgid "VPN Login Failure"
-msgstr "Błąd logowania VPN"
-
-#: ../src/applet.c:427
-#, c-format
-msgid "Could not start the VPN connection '%s' due to a login failure."
-msgstr "Nie można uruchomić połączenia VPN '%s' z powodu błędu logowania."
-
-#: ../src/applet.c:431
-msgid "VPN Start Failure"
-msgstr "Błąd uruchamiania VPN"
-
-#: ../src/applet.c:432
-#, c-format
-msgid "Could not start the VPN connection '%s' due to a failure launching the VPN program."
-msgstr "Nie można uruchomić połączenia VPN '%s' z powodu błędu uruchamiania programu VPN."
-
-#: ../src/applet.c:436
-#: ../src/applet.c:446
-msgid "VPN Connect Failure"
-msgstr "Błąd połączenia VPN"
-
-#: ../src/applet.c:437
-#, c-format
-msgid "Could not start the VPN connection '%s' due to a connection error."
-msgstr "Nie można uruchomić połączenia VPN '%s' z powodu błędu połączenia."
-
-#: ../src/applet.c:441
-msgid "VPN Configuration Error"
-msgstr "Błąd konfiguracji VPN"
-
-#: ../src/applet.c:442
-#, c-format
-msgid "The VPN connection '%s' was not correctly configured."
-msgstr "Połączenie VPN '%s' nie zostało poprawnie skonfigurowane."
-
-#: ../src/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 "Nie można uruchomić połączenia VPN '%s' ponieważ serwer VPN nie zwrócił odpowiedniej konfiguracji sieci."
-
-#: ../src/applet.c:517
-msgid "VPN Login Message"
-msgstr "Wiadomość logowania VPN"
-
-#: ../src/applet.c:741
-#: ../src/applet.c:2508
-#: ../src/other-network-dialog.c:453
-#: ../src/passphrase-dialog.c:228
-msgid "The NetworkManager Applet could not find some required resources (the glade file was not found)."
-msgstr "Nie znaleziono wymaganych przez aplet NetworkManager plików zasobów (pliku glade)."
-
-#: ../src/applet.c:753
-#, c-format
-msgid "The network device \"%s (%s)\" does not support wireless scanning."
-msgstr "Urządzenie \"%s (%s)\" nie obsługuje skanowania bezprzewodowego."
-
-#: ../src/applet.c:761
-#, c-format
-msgid "The network device \"%s (%s)\" does not support link detection."
-msgstr "Urządzenie \"%s (%s)\" nie obsługuje wykrywania połączenia."
-
-#: ../src/applet.c:908
-#, c-format
-msgid "Preparing device %s for the wired network..."
-msgstr "Przygotowywanie urządzenia %s do sieci kablowej..."
-
-#: ../src/applet.c:910
-#, c-format
-msgid "Preparing device %s for the wireless network '%s'..."
-msgstr "Przygotowywanie urządzenia %s do sieci bezprzewodowej '%s'..."
-
-#: ../src/applet.c:918
-#, c-format
-msgid "Configuring device %s for the wired network..."
-msgstr "Konfigurowanie urządzenia %s dla sieci kablowej..."
-
-#: ../src/applet.c:920
-#, c-format
-msgid "Attempting to join the wireless network '%s'..."
-msgstr "Próba dołączenia do sieci bezprzewodowej '%s'..."
-
-#: ../src/applet.c:928
-#, c-format
-msgid "Waiting for Network Key for the wireless network '%s'..."
-msgstr "Oczekiwanie na klucz sieci bezprzewodowej '%s'..."
-
-#: ../src/applet.c:936
-#: ../src/applet.c:946
-msgid "Requesting a network address from the wired network..."
-msgstr "Wysyłanie żądania adresu do sieci kablowej..."
-
-#: ../src/applet.c:938
-#: ../src/applet.c:948
-#, c-format
-msgid "Requesting a network address from the wireless network '%s'..."
-msgstr "Wysyłanie żądania adresu do sieci bezprzewodowej '%s'..."
-
-#: ../src/applet.c:956
-msgid "Finishing connection to the wired network..."
-msgstr "Zamykanie połączenia z siecią kablową..."
-
-#: ../src/applet.c:958
-#, c-format
-msgid "Finishing connection to the wireless network '%s'..."
-msgstr "Zamykanie połączenia z siecią bezprzewodową '%s'..."
-
-#: ../src/applet.c:1075
-msgid "NetworkManager is not running"
-msgstr "Aplet NetworkManager nie jest uruchomiony"
-
-#: ../src/applet.c:1083
-#: ../src/applet.c:1828
-msgid "Networking disabled"
-msgstr "Sieć wyłączona"
-
-#: ../src/applet.c:1088
-msgid "No network connection"
-msgstr "Brak połączenia sieciowego"
-
-#: ../src/applet.c:1093
-msgid "Wired network connection"
-msgstr "Połączenie kablowe"
-
-#: ../src/applet.c:1097
-msgid "Connected to an Ad-Hoc wireless network"
-msgstr "Połączono z siecią bezprzewodową Ad-Hoc"
-
-#: ../src/applet.c:1099
-#, c-format
-msgid "Wireless network connection to '%s' (%d%%)"
-msgstr "Połączenie bezprzewodowe z '%s' (%d%%)"
-
-#: ../src/applet.c:1120
-#, c-format
-msgid "VPN connection to '%s'"
-msgstr "Połączenie VPN z '%s'"
-
-#: ../src/applet.c:1128
-#, c-format
-msgid "VPN connecting to '%s'"
-msgstr "Łączenie VPN z '%s'"
-
-#: ../src/applet.c:1541
-msgid "_Connect to Other Wireless Network..."
-msgstr "_Połącz z inną siecią bezprzewodową..."
-
-#: ../src/applet.c:1562
-msgid "Create _New Wireless Network..."
-msgstr "Utwórz _nową sieć bezprzewodową..."
-
-#: ../src/applet.c:1685
-msgid "_VPN Connections"
-msgstr "Połączenia _VPN"
-
-#: ../src/applet.c:1730
-msgid "_Configure VPN..."
-msgstr "_Skonfiguruj VPN..."
-
-#: ../src/applet.c:1734
-msgid "_Disconnect VPN..."
-msgstr "_Rozłącz VPN..."
-
-#: ../src/applet.c:1756
-msgid "_Dial Up Connections"
-msgstr "Połączenia wdzwaniane"
-
-#. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
-#: ../src/applet.c:1767
-#, c-format
-msgid "Connect to %s..."
-msgstr "Połącz z '%s'..."
-
-#: ../src/applet.c:1773
-#, c-format
-msgid "Disconnect from %s..."
-msgstr "Rozłącz z '%s'"
-
-#: ../src/applet.c:1822
-msgid "No network devices have been found"
-msgstr "Nie znaleziono urządzeń sieciowych"
-
-#: ../src/applet.c:2014
-msgid "NetworkManager is not running..."
-msgstr "Aplet NetworkManager nie jest uruchomiony..."
-
-#. 'Enable Networking' item
-#: ../src/applet.c:2170
-msgid "Enable _Networking"
-msgstr "_Włącz  sieć"
-
-#. 'Enable Wireless' item
-#: ../src/applet.c:2176
-msgid "Enable _Wireless"
-msgstr "Włącz _bezprzewodowe"
-
-#. 'Connection Information' item
-#: ../src/applet.c:2182
-msgid "Connection _Information"
-msgstr "_Informacje o połączeniu"
-
-#. Help item
-#: ../src/applet.c:2193
-msgid "_Help"
-msgstr "_Pomoc"
-
-#. About item
-#: ../src/applet.c:2202
-msgid "_About"
-msgstr "Inform_acje"
-
-#: ../src/applet.c:2667
-msgid "The NetworkManager applet could not find some required resources.  It cannot continue.\n"
-msgstr "Nie znaleziono wymaganych zasobów. Program NetworkManager zostanie zamknięty.\n"
-
-#: ../src/wireless-security-option.c:157
-msgid "Open System"
-msgstr "System otwarty"
-
-#: ../src/wireless-security-option.c:160
-msgid "Shared Key"
-msgstr "Klucz współdzielony"
-
-#: ../src/wireless-security-option.c:208
-msgid "Automatic (Default)"
-msgstr "Automatyczny (domyślny)"
-
-#: ../src/wireless-security-option.c:215
-msgid "AES-CCMP"
-msgstr "AES-CCMP"
-
-#: ../src/wireless-security-option.c:223
-msgid "TKIP"
-msgstr "TKIP"
-
-#: ../src/wireless-security-option.c:231
-msgid "Dynamic WEP"
-msgstr "Dynamiczny WEP"
-
-#: ../src/wso-none.c:53
-msgid "None"
-msgstr "Brak"
-
-#: ../src/wso-wep-ascii.c:138
-msgid "WEP 64/128-bit ASCII"
-msgstr "WEP 64/128-bit ASCII"
-
-#: ../src/wso-wep-hex.c:135
-msgid "WEP 64/128-bit Hex"
-msgstr "WEP 64/128-bit Hex"
-
-#: ../src/wso-wep-passphrase.c:135
-msgid "WEP 128-bit Passphrase"
-msgstr "WEP z 128 bitowym hasłem"
-
-#: ../src/wso-wpa-eap.c:237
-msgid "PEAP"
-msgstr "PEAP"
-
-#: ../src/wso-wpa-eap.c:238
-msgid "TLS"
-msgstr "TLS"
-
-#: ../src/wso-wpa-eap.c:239
-msgid "TTLS"
-msgstr "TTLS"
-
-#: ../src/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"
-
-#: ../src/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"
-
-#: ../src/wso-wpa-psk.c:178
-msgid "WPA2 Personal"
-msgstr "WPA2 Personal"
-
-#: ../src/wso-wpa-psk.c:180
-msgid "WPA Personal"
-msgstr "WPA Personal"
-
-# NOTSURE
-#: ../src/eggtrayicon.c:134
-msgid "Orientation"
-msgstr "Orientacja"
-
-#: ../src/eggtrayicon.c:135
-msgid "The orientation of the tray."
-msgstr "Orientacja paska."
-
-#: ../src/menu-items.c:88
-#, c-format
-msgid "Wired Network (%s)"
-msgstr "Sieć kablowa (%s)"
-
-#: ../src/menu-items.c:91
-msgid "_Wired Network"
-msgstr "Sieć _kablowa"
-
-# NOTSURE mnogie
-#: ../src/menu-items.c:162
-#, c-format
-msgid "Wireless Network (%s)"
-msgid_plural "Wireless Networks (%s)"
-msgstr[0] "Sieć bezprzewodowa (%s)"
-msgstr[1] "Sieci bezprzewodowe (%s)"
-msgstr[2] "Sieci bezprzewodowe (%s)"
-
-#: ../src/menu-items.c:164
-msgid "Wireless Network"
-msgid_plural "Wireless Networks"
-msgstr[0] "Sieć bezprzewodowa"
-msgstr[1] "Sieci bezprzewodowe"
-msgstr[2] "Sieci bezprzewodowych"
-
-#: ../src/menu-items.c:343
-msgid " (invalid Unicode)"
-msgstr "(błędny Unicode)"
-
-#: ../src/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 "Domyślnie nazwa sieci bezprzewodowej jest taka sama jak nazwa komputera - %s, szyfrowanie wyłączone"
-
-#: ../src/other-network-dialog.c:358
-msgid "Create new wireless network"
-msgstr "Utwórz nową sieć bezprzewodową"
-
-#: ../src/other-network-dialog.c:359
-msgid "Enter the name and security settings of the wireless network you wish to create."
-msgstr "Proszę podać nazwę i parametry bezpieczeństwa dla nowej sieci bezprzewodowej."
-
-#: ../src/other-network-dialog.c:363
-msgid "Create New Wireless Network"
-msgstr "Utwórz nową sieć bezprzewodową"
-
-#: ../src/other-network-dialog.c:368
-msgid "Existing wireless network"
-msgstr "Istniejąca sieć bezprzewodowa"
-
-#: ../src/other-network-dialog.c:369
-msgid "Enter the name of the wireless network to which you wish to connect."
-msgstr "Proszę podać nazwę sieci bezprzewodowej do połączenia."
-
-#: ../src/other-network-dialog.c:371
-msgid "Connect to Other Wireless Network"
-msgstr "Połącz z inną siecią bezprzewodową"
-
-#: ../src/passphrase-dialog.c:215
-msgid "Error connecting to wireless network"
-msgstr "Błąd łączenia z siecią bezprzewodową"
-
-#: ../src/passphrase-dialog.c:216
-msgid "The requested wireless network requires security capabilities unsupported by your hardware."
-msgstr "Ustawienia bezpieczeństwa sieci bezprzewodowej nie są obsługiwane przez używane urządzenie."
-
-#: ../src/vpn-password-dialog.c:151
-#: ../src/vpn-password-dialog.c:188
-#, c-format
-msgid "Cannot start VPN connection '%s'"
-msgstr "Nie można uruchomić połączenia VPN '%s'"
-
-#: ../src/vpn-password-dialog.c:154
-#, c-format
-msgid "Could not find the authentication dialog for VPN connection type '%s'. Contact your system administrator."
-msgstr "Nie znaleziono okna uwierzytelniania dla połączenia VPN typu '%s'. Proszę skontaktować się z administratorem."
-
-#: ../src/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 "Napotkano problem podczas otwierania okna uwierzytelniania połączenia VPN typu '%s'. Proszę skontaktować się z administratorem."
-
-#: ../src/applet.glade.h:1
-msgid " "
-msgstr " "
-
-#: ../src/applet.glade.h:2
-msgid "<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Informacje o aktywnych połączeniach</span>"
-
-#: ../src/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\">Sieć bezprzewodowa wymaga hasła</span>\n"
-"\n"
-"Aby połączyć się z siecią bezprzewodową '%s' wymagane jest hasło lub klucz szyfrowania."
-
-#: ../src/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\">Ograniczone działanie sieci</span>\n"
-"\n"
-"%s  nie będzie działać całkowicie."
-
-#: ../src/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\">Potwierdzenie logowania do sieci bezprzewodowej</span>\n"
-"\n"
-"Wybrano logowanie do sieci bezprzewodowej '%s'. Jeśli sieć można uznać za bezpieczną, należy zaznaczyć opcję poniżej i program NetworkManager nie będzie już wymagał potwierdzenia przy następnych połączeniach."
-
-#: ../src/applet.glade.h:15
-msgid "Anonymous Identity:"
-msgstr "Tożsamość anonimowa:"
-
-#: ../src/applet.glade.h:16
-msgid "Authentication:"
-msgstr "Uwierzytelnianie:"
-
-#: ../src/applet.glade.h:17
-msgid "Broadcast Address:"
-msgstr "Adres rozgłaszania"
-
-#: ../src/applet.glade.h:18
-msgid "CA Certificate File:"
-msgstr "Plik certyfikatu CA:"
-
-#: ../src/applet.glade.h:19
-msgid "C_onnect"
-msgstr "P_ołącz"
-
-#: ../src/applet.glade.h:20
-msgid "Client Certificate File:"
-msgstr "Plik certyfikatu klienta:"
-
-#: ../src/applet.glade.h:21
-msgid "Connection Information"
-msgstr "Informacje o połączeniu"
-
-#: ../src/applet.glade.h:22
-msgid "Default Route:"
-msgstr "Trasa domyślna:"
-
-#: ../src/applet.glade.h:23
-msgid "Destination Address:"
-msgstr "Adres docelowy:"
-
-#: ../src/applet.glade.h:24
-msgid "Driver:"
-msgstr "Sterownik:"
-
-#: ../src/applet.glade.h:25
-msgid "EAP Method:"
-msgstr "Metoda EAP:"
-
-#: ../src/applet.glade.h:26
-msgid "Hardware Address:"
-msgstr "Adres sprzętowy:"
-
-#: ../src/applet.glade.h:27
-msgid "IP Address:"
-msgstr "Adres IP:"
-
-#: ../src/applet.glade.h:28
-msgid "Identity:"
-msgstr "Tożsamość:"
-
-#: ../src/applet.glade.h:29
-msgid "Interface:"
-msgstr "Interfejs:"
-
-#: ../src/applet.glade.h:30
-msgid "Key Type:"
-msgstr "Typ klucza:"
-
-#: ../src/applet.glade.h:31
-msgid "Key:"
-msgstr "Klucz:"
-
-#: ../src/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 ""
-"Brak\n"
-"128 bitowe Hasło WEP\n"
-"WEP 64/128-bit Hex\n"
-"WEP 64/128-bit ASCII\n"
-
-#: ../src/applet.glade.h:37
-msgid ""
-"Open System\n"
-"Shared Key"
-msgstr ""
-"System otwarty\n"
-"Klucz współdzielony"
-
-#: ../src/applet.glade.h:39
-msgid "Other Wireless Network..."
-msgstr "Inna sieć bezprzewodowa..."
-
-#: ../src/applet.glade.h:40
-msgid "Passphrase:"
-msgstr "Hasło WEP:"
-
-#: ../src/applet.glade.h:41
-msgid "Password:"
-msgstr "Hasło:"
-
-#: ../src/applet.glade.h:42
-msgid "Primary DNS:"
-msgstr "Podstawowy DNS:"
-
-#: ../src/applet.glade.h:43
-msgid "Private Key File:"
-msgstr "Plik klucza prywatnego:"
-
-#: ../src/applet.glade.h:44
-msgid "Private Key Password:"
-msgstr "Hasło klucza prywatnego:"
-
-#: ../src/applet.glade.h:45
-msgid "Secondary DNS:"
-msgstr "Zapasowy DNS:"
-
-#: ../src/applet.glade.h:46
-msgid "Select the CA Certificate File"
-msgstr "Plik certyfikatu CA"
-
-#: ../src/applet.glade.h:47
-msgid "Select the Client Certificate File"
-msgstr "Plik certyfikatu klienta"
-
-#: ../src/applet.glade.h:48
-msgid "Select the Private Key File"
-msgstr "Plik klucza prywatnego"
-
-#: ../src/applet.glade.h:49
-msgid "Show key"
-msgstr "Pokaż klucz"
-
-#: ../src/applet.glade.h:50
-msgid "Show passphrase"
-msgstr "Pokaż hasło WEP"
-
-#: ../src/applet.glade.h:51
-msgid "Show password"
-msgstr "Pokaż hasło"
-
-#: ../src/applet.glade.h:52
-msgid "Show passwords"
-msgstr "Pokaż hasła"
-
-#: ../src/applet.glade.h:53
-msgid "Speed:"
-msgstr "Prędkość:"
-
-#: ../src/applet.glade.h:54
-msgid "Subnet Mask:"
-msgstr "Maska podsieci:"
-
-#: ../src/applet.glade.h:55
-msgid "Type:"
-msgstr "Typ:"
-
-#: ../src/applet.glade.h:56
-msgid "User Name:"
-msgstr "Nazwa użytkownika:"
-
-#: ../src/applet.glade.h:57
-msgid "Wireless Network Key Required"
-msgstr "Wymagany klucz sieci bezprzewodowej"
-
-#: ../src/applet.glade.h:58
-msgid "Wireless _adapter:"
-msgstr "Urządzenie _bezprzewodowe:"
-
-#: ../src/applet.glade.h:59
-msgid "_Always Trust this Wireless Network"
-msgstr "_Zawsze ufaj tej sieci bezprzewodowej"
-
-#: ../src/applet.glade.h:60
-msgid "_Don't remind me again"
-msgstr "_Nie przypominaj więcej"
-
-#: ../src/applet.glade.h:61
-msgid "_Login to Network"
-msgstr "Za_loguj do sieci"
-
-#: ../src/applet.glade.h:62
-msgid "_Network Name:"
-msgstr "N_azwa sieci:"
-
-#: ../src/applet.glade.h:63
-msgid "_Wireless Security:"
-msgstr "B_ezpieczeństwo sieci:"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.c:383
-msgid "Cannot add VPN connection"
-msgstr "Nie można dodać połączenia VPN"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.c:385
-msgid "No suitable VPN software was found on your system. Contact your system administrator."
-msgstr "Nie znaleziono oprogramowania dla VPN. Proszę skontaktować się z administratorem."
-
-#: ../gnome/vpn-properties/nm-vpn-properties.c:437
-msgid "Cannot import VPN connection"
-msgstr "Nie można zaimportować połączenia VPN"
-
-#: ../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 "Nie znaleziono oprogramowania dla połączenia VPN typu '%s' do importu pliku '%s'. Proszę skontaktować się z administratorem."
-
-#: ../gnome/vpn-properties/nm-vpn-properties.c:579
-#, c-format
-msgid "Error retrieving VPN connection '%s'"
-msgstr "Napotkano błąd podczas wyszukiwania połączenia VPN '%s'"
-
-#: ../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 "Nie znaleziono plików interfejsu dla połączenia VPN typu: '%s'. Proszę skontaktować się z administratorem."
-
-#: ../gnome/vpn-properties/nm-vpn-properties.c:739
-#, c-format
-msgid "Delete VPN connection \"%s\"?"
-msgstr "Naprawdę usunąć połączenie VPN \"%s\"?"
-
-#: ../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 "Wszystkie dane połączenia VPN \"%s\" zostaną utracone. Utworzenie nowego połączenia może wymagać udziału administratora sieci."
-
-#: ../gnome/vpn-properties/nm-vpn-properties.c:959
-msgid "Unable to load"
-msgstr "Nie można odczytać"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.c:961
-msgid "Cannot find some needed resources (the glade file)!"
-msgstr "Nie można znaleźć plików zasobów (pliki glade)."
-
-#. Edit dialog
-#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
-msgid "Edit VPN Connection"
-msgstr "Edytuj połączenia VPN"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:1
-msgid "Add a new VPN connection"
-msgstr "Dodaj połączenie VPN"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:2
-msgid "Choose which type of VPN connection you wish to create."
-msgstr "Proszę wybrać typ połączenia VPN do utworzenia."
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
-msgid "Connect to:"
-msgstr "Połącz z:"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
-msgid "Create VPN Connection"
-msgstr "Tworzenie połączenia VPN"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
-msgid "Create VPN Connection - 1 of 2"
-msgstr "Tworzenie połączenia VPN - krok 1 z 2"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
-msgid "Create VPN Connection - 2 of 2"
-msgstr "Tworzenie połączenia VPN - krok 1 z 2"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
-msgid "Delete the selected VPN connection"
-msgstr "Usuń wybrane połączenie VPN"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
-msgid "E_xport"
-msgstr "E_ksportuj"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:9
-msgid "Edit the selected VPN connection"
-msgstr "Edytuj wybrane połączenie VPN"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:10
-msgid "Export the VPN settings to a file"
-msgstr "Eksportuj ustawienia VPN do pliku"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:11
-msgid "Export the selected VPN connection to a file"
-msgstr "Eksportuj wybrane połączenie VPN do pliku"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:12
-msgid "Finish Creating VPN Connection"
-msgstr "Kończenie tworzenie połączenia VPN"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:13
-msgid "Manage Virtual Private Network Connections"
-msgstr "Zarządzanie połączeniami Virtual Private Network"
-
-#: ../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 ""
-"Niniejszy asystent pomaga w tworzeniu połączenia VPN (Virtual Private Network)\n"
-"\n"
-"Potrzebne będą dane na temat adresów IP oraz uwierzytelniania. Aby uzyskać te informacje, należy skontaktować się administratorem."
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:17
-msgid "VPN Connections"
-msgstr "Połączenia VPN"
-
-#: ../src/nm-ap-security-wep.c:52
-msgid "40-bit WEP"
-msgstr "40 bitowy WEP"
-
-#: ../src/nm-ap-security-wep.c:54
-msgid "104-bit WEP"
-msgstr "104 bitowy 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 Automatic"
-
-#: ../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 Automatic"
-
-#: ../src/nm-ap-security.c:320
-msgid "none"
-msgstr "brak"
-
-#: ../src/nm-netlink-monitor.c:154
-#, c-format
-msgid "unable to create netlink socket for monitoring wired ethernet devices - %s"
-msgstr "nie można utworzyć gniazda netlink dla monitorowania kablowych urządzeń ethernet - %s"
-
-#: ../src/nm-netlink-monitor.c:172
-#, c-format
-msgid "unable to bind to netlink socket for monitoring wired ethernet devices - %s"
-msgstr "nie można utworzyć dowiązania do gniazda netlink dla monitorowania kablowych urządzeń ethernet - %s"
-
-#: ../src/nm-netlink-monitor.c:405
-msgid "operation took too long"
-msgstr "operacja zajęła zbyt dużo czasu"
-
-#: ../src/nm-netlink-monitor.c:502
-msgid "received data from wrong type of sender"
-msgstr "otrzymano dane od nadawcy nieprawidłowego typu"
-
-#: ../src/nm-netlink-monitor.c:515
-msgid "received data from unexpected sender"
-msgstr "otrzymano dane od nieoczekiwanego nadawcy"
-
-#: ../src/nm-netlink-monitor.c:646
-msgid "too much data was sent over socket and some of it was lost"
-msgstr "część danych została utracona, ponieważ wysłano ich zbyt dużo"
-
-#: ../src/nm-netlink-monitor.c:735
-msgid "error occurred while waiting for data on socket"
-msgstr "napotkano błąd podczas oczekiwania na dane"
-
-#: ../src/applet-dbus-devices.c:898
-#, c-format
-msgid "You are now connected to the Ad-Hoc wireless network '%s'."
-msgstr "Połączono z bezprzewodową siecią Ad-Hoc '%s'."
-
-#: ../src/applet-dbus-devices.c:903
-#, c-format
-msgid "You are now connected to the wireless network '%s'."
-msgstr "Połączono z siecią bezprzewodową '%s'."
-
-#: ../src/applet-dbus-devices.c:910
-msgid "You are now connected to the wired network."
-msgstr "Połączono z siecią kablową."
-
-#: ../src/applet-dbus-devices.c:916
-msgid "Connection Established"
-msgstr "Połączenie nawiązane"
-
-#: ../src/applet-dbus-devices.c:959
-msgid "Disconnected"
-msgstr "Rozłączono"
-
-#: ../src/applet-dbus-devices.c:960
-msgid "The network connection has been disconnected."
-msgstr "Połączenie sieciowe zostało rozłączone."
-
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 3ac1f9d9..4a378249 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,620 +1,605 @@
 # Brazilian Portuguese translation of NetworkManager.
-# Copyright (C) 2004-2006 Free Software Foundation, Inc.
+# Copyright (C) 2004-2007 Free Software Foundation, Inc.
 # This file is distributed under the same license as the NetworkManager package.
-# Raphael Higino <raphaelh@uai.com.br>, 2004-2006.
+# Raphael Higino <phhigino@gmail.com>, 2004-2007.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-29 18:33+0200\n"
-"PO-Revision-Date: 2006-06-09 09:56\n"
-"Last-Translator: Novell Language <language@novell.com>\n"
-"Language-Team: Novell Language <language@novell.com>\n"
+"POT-Creation-Date: 2007-01-02 04:01+0000\n"
+"PO-Revision-Date: 2007-01-13 15:52-0300\n"
+"Last-Translator: Raphael Higino <phhigino@gmail.com>\n"
+"Language-Team: Brazilian Portuguese <gnome-l10n-br@listas.cipsga.org.br>\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"
 
-#: ../src/applet-compat.c:171 ../src/applet-dbus-info.c:919
+#: ../gnome/applet/applet-compat.c:171
+#: ../gnome/applet/applet-dbus-info.c:926
 #, c-format
 msgid "Passphrase for wireless network %s"
 msgstr "Frase secreta para rede sem fio %s"
 
-#: ../src/applet-dbus.c:265
+#: ../gnome/applet/applet-dbus.c:274
 #, c-format
 msgid "Connection to the wireless network '%s' failed."
 msgstr "A conexão com a rede sem fio '%s' falhou."
 
-#: ../src/applet-dbus.c:270
+#: ../gnome/applet/applet-dbus.c:279
 msgid "Connection to the wired network failed."
 msgstr "A conexão à rede com fios falhou."
 
-#: ../src/applet.c:184
+#: ../gnome/applet/applet.c:182
 msgid "Error displaying connection information:"
 msgstr "Erro ao exibir as informações da conexão:"
 
-#: ../src/applet.c:202
+#: ../gnome/applet/applet.c:200
 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)."
 
-#: ../src/applet.c:213
+#: ../gnome/applet/applet.c:210
 msgid "No active connections!"
 msgstr "Nenhuma conexão ativa!"
 
-#: ../src/applet.c:234
+#: ../gnome/applet/applet.c:227
+#, c-format
+msgid "%d Mb/s"
+msgstr "%d Mb/s"
+
+#: ../gnome/applet/applet.c:230
 #, c-format
 msgid "Wired Ethernet (%s)"
 msgstr "Ethernet Com Fios (%s)"
 
-#: ../src/applet.c:236
+#: ../gnome/applet/applet.c:232
 #, c-format
 msgid "Wireless Ethernet (%s)"
 msgstr "Ethernet Sem Fio (%s)"
 
-#: ../src/applet.c:337 ../src/applet.c:362
+#: ../gnome/applet/applet.c:238
+msgid "Unknown"
+msgstr "Unknown"
+
+#: ../gnome/applet/applet.c:330
+#: ../gnome/applet/applet.c:357
 msgid "NetworkManager Applet"
 msgstr "Mini-aplicativo Gerenciador de Rede"
 
-#: ../src/applet.c:339 ../src/applet.c:364
-msgid "Copyright © 2004-2005 Red Hat, Inc."
-msgstr "Copyright © 2004-2005 Red Hat, Inc."
-
-#: ../src/applet.c:340 ../src/applet.c:365
+#: ../gnome/applet/applet.c:332
 msgid ""
-"Notification area applet for managing your network devices and connections."
+"Copyright © 2004-2006 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
 msgstr ""
-"Mini-aplicativo da área de notificação para gerenciar seus dispositivos e "
-"conexões de rede."
+"Copyright © 2004-2006 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+
+#: ../gnome/applet/applet.c:334
+#: ../gnome/applet/applet.c:361
+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."
 
-#: ../src/applet.c:343 ../src/applet.c:370
+#: ../gnome/applet/applet.c:337
+#: ../gnome/applet/applet.c:365
 msgid "translator-credits"
-msgstr "Raphael Higino <raphaelh@uai.com.br>"
+msgstr "Raphael Higino <phhigino@gmail.com>"
 
-#: ../src/applet.c:426
+#: ../gnome/applet/applet.c:359
+msgid ""
+"Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+msgstr ""
+"Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+
+#: ../gnome/applet/applet.c:421
 msgid "VPN Login Failure"
 msgstr "Falha ao se autenticar na VPN"
 
-#: ../src/applet.c:427
+#: ../gnome/applet/applet.c:422
 #, 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."
 
-#: ../src/applet.c:431
+#: ../gnome/applet/applet.c:426
 msgid "VPN Start Failure"
 msgstr "Falha ao iniciar a VPN"
 
-#: ../src/applet.c:432
+#: ../gnome/applet/applet.c:427
 #, 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."
+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."
 
-#: ../src/applet.c:436 ../src/applet.c:446
+#: ../gnome/applet/applet.c:431
+#: ../gnome/applet/applet.c:441
 msgid "VPN Connect Failure"
 msgstr "Falha ao conectar-se à VPN"
 
-#: ../src/applet.c:437
+#: ../gnome/applet/applet.c:432
 #, 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."
 
-#: ../src/applet.c:441
+#: ../gnome/applet/applet.c:436
 msgid "VPN Configuration Error"
 msgstr "Erro de configuração da VPN"
 
-#: ../src/applet.c:442
+#: ../gnome/applet/applet.c:437
 #, c-format
 msgid "The VPN connection '%s' was not correctly configured."
 msgstr "A conexão VPN '%s' não foi configurada corretamente."
 
-#: ../src/applet.c:447
+#: ../gnome/applet/applet.c:442
 #, 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."
+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."
 
-#: ../src/applet.c:517
+#: ../gnome/applet/applet.c:512
 msgid "VPN Login Message"
 msgstr "Mensagem de autenticação da VPN"
 
-#: ../src/applet.c:741 ../src/applet.c:2508
-#: ../src/other-network-dialog.c:453
-#: ../src/passphrase-dialog.c:228
-msgid ""
-"The NetworkManager Applet could not find some required resources (the glade "
-"file was not found)."
-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:737
+#: ../gnome/applet/applet.c:2635
+#: ../gnome/applet/other-network-dialog.c:458
+#: ../gnome/applet/passphrase-dialog.c:228
+msgid "The NetworkManager Applet could not find some required resources (the glade file was not found)."
+msgstr "O mini-aplicativo Gerenciador de Rede não pôde encontrar alguns recursos requeridos (o arquivo glade não foi encontrado)."
 
-#: ../src/applet.c:753
+#: ../gnome/applet/applet.c:749
 #, 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."
 
-#: ../src/applet.c:761
+#: ../gnome/applet/applet.c:757
 #, 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."
 
-#: ../src/applet.c:908
+#. Note to translators: this is used if no essid is known
+#: ../gnome/applet/applet.c:905
+#: ../gnome/applet/applet.c:1103
+msgid "(unknown)"
+msgstr "(desconhecido)"
+
+#: ../gnome/applet/applet.c:911
 #, c-format
 msgid "Preparing device %s for the wired network..."
 msgstr "Preparando o dispositivo %s para a rede com fios..."
 
-#: ../src/applet.c:910
+#: ../gnome/applet/applet.c:913
 #, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
 msgstr "Preparando o dispositivo %s para a rede com fios '%s'..."
 
-#: ../src/applet.c:918
+#: ../gnome/applet/applet.c:921
 #, c-format
 msgid "Configuring device %s for the wired network..."
 msgstr "Configurando dispositivo %s para a rede com fios..."
 
-#: ../src/applet.c:920
+#: ../gnome/applet/applet.c:923
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
 msgstr "Tentando se juntar à rede sem fio '%s'..."
 
-#: ../src/applet.c:928
+#: ../gnome/applet/applet.c:931
 #, c-format
 msgid "Waiting for Network Key for the wireless network '%s'..."
 msgstr "Esperando a chave da rede sem fio '%s'..."
 
-#: ../src/applet.c:936 ../src/applet.c:946
+#: ../gnome/applet/applet.c:939
+#: ../gnome/applet/applet.c:949
 msgid "Requesting a network address from the wired network..."
 msgstr "Requisitando um endereço de rede da rede com fios..."
 
-#: ../src/applet.c:938 ../src/applet.c:948
+#: ../gnome/applet/applet.c:941
+#: ../gnome/applet/applet.c:951
 #, c-format
 msgid "Requesting a network address from the wireless network '%s'..."
 msgstr "Requisitando um endereço de rede da rede sem fios '%s'..."
 
-#: ../src/applet.c:956
+#: ../gnome/applet/applet.c:959
 msgid "Finishing connection to the wired network..."
 msgstr "Terminando a conexão à rede com fios..."
 
-#: ../src/applet.c:958
+#: ../gnome/applet/applet.c:961
 #, c-format
 msgid "Finishing connection to the wireless network '%s'..."
 msgstr "Terminando a conexão à rede sem fio '%s'..."
 
-#: ../src/applet.c:1075
+#: ../gnome/applet/applet.c:1078
 msgid "NetworkManager is not running"
 msgstr "O Gerenciador de Rede não está sendo executado"
 
-#: ../src/applet.c:1083 ../src/applet.c:1828
+#: ../gnome/applet/applet.c:1086
+#: ../gnome/applet/applet.c:1843
 msgid "Networking disabled"
 msgstr "Rede desabilitada"
 
-#: ../src/applet.c:1088
+#: ../gnome/applet/applet.c:1091
 msgid "No network connection"
 msgstr "Nenhuma conexão de rede"
 
-#: ../src/applet.c:1093
+#: ../gnome/applet/applet.c:1096
 msgid "Wired network connection"
 msgstr "Conexão de rede com fios"
 
-#: ../src/applet.c:1097
+#: ../gnome/applet/applet.c:1100
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Conectado a uma rede sem fio Ad-Hoc"
 
-#: ../src/applet.c:1099
+#: ../gnome/applet/applet.c:1102
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "Conexão de rede sem fio com '%s' (%d%%)"
 
-#: ../src/applet.c:1120
+#: ../gnome/applet/applet.c:1123
 #, c-format
 msgid "VPN connection to '%s'"
 msgstr "Conexão VPN com '%s'"
 
-#: ../src/applet.c:1128
+#: ../gnome/applet/applet.c:1131
 #, c-format
 msgid "VPN connecting to '%s'"
 msgstr "Estabelecendo conexão VPN com '%s'"
 
-#: ../src/applet.c:1541
+#: ../gnome/applet/applet.c:1556
 msgid "_Connect to Other Wireless Network..."
 msgstr "_Conectar-se a Outra Rede Sem Fio..."
 
-#: ../src/applet.c:1562
+#: ../gnome/applet/applet.c:1577
 msgid "Create _New Wireless Network..."
 msgstr "Criar _nova rede sem fio..."
 
-#: ../src/applet.c:1685
+#: ../gnome/applet/applet.c:1700
 msgid "_VPN Connections"
 msgstr "Conexões _VPN"
 
-#: ../src/applet.c:1730
+#: ../gnome/applet/applet.c:1745
 msgid "_Configure VPN..."
 msgstr "_Configurar VPN..."
 
-#: ../src/applet.c:1734
+#: ../gnome/applet/applet.c:1749
 msgid "_Disconnect VPN..."
 msgstr "_Desconectar VPN..."
 
-#: ../src/applet.c:1756
+#: ../gnome/applet/applet.c:1771
 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
-#: ../src/applet.c:1767
+#: ../gnome/applet/applet.c:1782
 #, c-format
 msgid "Connect to %s..."
 msgstr "Conectar a %s..."
 
-#: ../src/applet.c:1773
+#: ../gnome/applet/applet.c:1788
 #, c-format
 msgid "Disconnect from %s..."
 msgstr "Desconectar de %s..."
 
-#: ../src/applet.c:1822
+#: ../gnome/applet/applet.c:1837
 msgid "No network devices have been found"
 msgstr "Nenhum dispositivo de rede foi encontrado"
 
-#: ../src/applet.c:2014
+#: ../gnome/applet/applet.c:2029
 msgid "NetworkManager is not running..."
 msgstr "O Gerenciador de Rede não está sendo executado..."
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2170
+#: ../gnome/applet/applet.c:2210
 msgid "Enable _Networking"
 msgstr "_Habilitar Rede"
 
 #. 'Enable Wireless' item
-#: ../src/applet.c:2176
+#: ../gnome/applet/applet.c:2216
 msgid "Enable _Wireless"
 msgstr "Habilitar Rede _Sem Fio"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2182
+#: ../gnome/applet/applet.c:2222
 msgid "Connection _Information"
 msgstr "_Informações da Conexão"
 
 #. Help item
-#: ../src/applet.c:2193
+#: ../gnome/applet/applet.c:2233
 msgid "_Help"
 msgstr "Aj_uda"
 
 #. About item
-#: ../src/applet.c:2202
+#: ../gnome/applet/applet.c:2242
 msgid "_About"
 msgstr "_Sobre"
 
-#: ../src/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"
+#: ../gnome/applet/applet.c:2824
+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"
 
-#: ../src/wireless-security-option.c:157
+#: ../gnome/applet/wireless-security-option.c:157
 msgid "Open System"
 msgstr "Sistema Aberto"
 
-#: ../src/wireless-security-option.c:160
+#: ../gnome/applet/wireless-security-option.c:160
 msgid "Shared Key"
 msgstr "Chave Compartilhada"
 
-#: ../src/wireless-security-option.c:208
+#: ../gnome/applet/wireless-security-option.c:208
 msgid "Automatic (Default)"
 msgstr "Automático (Padrão)"
 
-#: ../src/wireless-security-option.c:215
+#: ../gnome/applet/wireless-security-option.c:215
 msgid "AES-CCMP"
 msgstr "AES-CCMP"
 
-#: ../src/wireless-security-option.c:223
+#: ../gnome/applet/wireless-security-option.c:223
 msgid "TKIP"
 msgstr "TKIP"
 
-#: ../src/wireless-security-option.c:231
+#: ../gnome/applet/wireless-security-option.c:231
 msgid "Dynamic WEP"
 msgstr "WEP Dinâmico"
 
-#: ../src/wso-none.c:53
+#: ../gnome/applet/wso-none.c:53
 msgid "None"
 msgstr "Nenhuma"
 
-#: ../src/wso-wep-ascii.c:138
+#: ../gnome/applet/wso-wep-ascii.c:138
 msgid "WEP 64/128-bit ASCII"
-msgstr "WEP de 64/128 bits (ASCII)"
+msgstr "WEP de 64/128 bits ASCII"
 
-#: ../src/wso-wep-hex.c:135
+#: ../gnome/applet/wso-wep-hex.c:135
 msgid "WEP 64/128-bit Hex"
-msgstr "WEP de 64/128 bits (Hexadecimal)"
+msgstr "WEP de 64/128 bits hexa"
 
-#: ../src/wso-wep-passphrase.c:135
+#: ../gnome/applet/wso-wep-passphrase.c:135
 msgid "WEP 128-bit Passphrase"
-msgstr "WEP de 128 bits (Frase Secreta)"
+msgstr "WEP de 128 bits frase secreta"
 
-#: ../src/wso-wpa-eap.c:237
+#: ../gnome/applet/wso-wpa-eap.c:237
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../src/wso-wpa-eap.c:238
+#: ../gnome/applet/wso-wpa-eap.c:238
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wso-wpa-eap.c:239
+#: ../gnome/applet/wso-wpa-eap.c:239
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../src/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
-#: ../src/nm-ap-security-wpa-eap.c:116
+#: ../gnome/applet/wso-wpa-eap.c:247
+#: ../src/nm-ap-security-wpa-eap.c:93
+#: ../src/nm-ap-security-wpa-eap.c:117
 msgid "WPA2 Enterprise"
 msgstr "WPA2 Empresas"
 
-#: ../src/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
-#: ../src/nm-ap-security-wpa-eap.c:121
+#: ../gnome/applet/wso-wpa-eap.c:249
+#: ../src/nm-ap-security-wpa-eap.c:95
+#: ../src/nm-ap-security-wpa-eap.c:122
 msgid "WPA Enterprise"
 msgstr "WPA Empresas"
 
-#: ../src/wso-wpa-psk.c:178
+#: ../gnome/applet/wso-wpa-psk.c:178
 msgid "WPA2 Personal"
 msgstr "WPA2 Pessoal"
 
-#: ../src/wso-wpa-psk.c:180
+#: ../gnome/applet/wso-wpa-psk.c:180
 msgid "WPA Personal"
 msgstr "WPA Pessoal"
 
-#: ../src/eggtrayicon.c:134
+#: ../gnome/applet/eggtrayicon.c:134
 msgid "Orientation"
 msgstr "Orientação"
 
-#: ../src/eggtrayicon.c:135
+#: ../gnome/applet/eggtrayicon.c:135
 msgid "The orientation of the tray."
 msgstr "A orientação da bandeja."
 
-#: ../src/menu-items.c:88
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Rede Com Fios (%s)"
 
-#: ../src/menu-items.c:91
+#: ../gnome/applet/menu-items.c:91
 msgid "_Wired Network"
 msgstr "_Rede Com Fios"
 
-#: ../src/menu-items.c:162
+#: ../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)"
 
-#: ../src/menu-items.c:164
+#: ../gnome/applet/menu-items.c:164
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Rede Sem Fio"
 msgstr[1] "Redes Sem Fio"
 
-#: ../src/menu-items.c:343
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr " (Unicode inválido)"
 
-#: ../src/other-network-dialog.c:352
+#: ../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 ""
-"Por padrão, o nome da rede sem fio é definido com o nome do seu computador, %"
-"s, sem nenhuma criptografia habilitada"
+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"
 
-#: ../src/other-network-dialog.c:358
+#: ../gnome/applet/other-network-dialog.c:358
 msgid "Create new wireless network"
 msgstr "Criar nova rede sem fio"
 
-#: ../src/other-network-dialog.c:359
-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."
+#: ../gnome/applet/other-network-dialog.c:359
+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."
 
-#: ../src/other-network-dialog.c:363
+#: ../gnome/applet/other-network-dialog.c:363
 msgid "Create New Wireless Network"
 msgstr "Criar nova rede sem fio"
 
-#: ../src/other-network-dialog.c:368
+#: ../gnome/applet/other-network-dialog.c:368
 msgid "Existing wireless network"
 msgstr "Rede sem fio existente"
 
-#: ../src/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 "Digite o nome da rede sem fio com a qual você deseja se conectar."
 
-#: ../src/other-network-dialog.c:371
+#: ../gnome/applet/other-network-dialog.c:371
 msgid "Connect to Other Wireless Network"
 msgstr "Conectar a outra rede sem fio"
 
-#: ../src/passphrase-dialog.c:215
+#: ../gnome/applet/passphrase-dialog.c:215
 msgid "Error connecting to wireless network"
 msgstr "Erro ao conectar à rede sem fio"
 
-#: ../src/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."
+#: ../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."
 
-#: ../src/vpn-password-dialog.c:151
-#: ../src/vpn-password-dialog.c:188
+#: ../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'"
 
-#: ../src/vpn-password-dialog.c:154
+#: ../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."
+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."
 
-#: ../src/vpn-password-dialog.c:191
+#: ../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."
+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."
 
-#: ../src/applet.glade.h:1
+#: ../gnome/applet/applet.glade.h:1
 msgid " "
 msgstr " "
 
-#: ../src/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>"
+#: ../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>"
 
-#: ../src/applet.glade.h:4
+#: ../gnome/applet/applet.glade.h:4
 #, no-c-format
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
-"Network</span>\n"
+"<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'."
+"A passphrase or encryption key is required to access the wireless network '%s'."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Frase Secreta Requerida pela Rede Sem "
-"Fio</span>\n"
+"<span weight=\"bold\" size=\"larger\">Frase Secreta Requerida pela Rede Sem Fio</span>\n"
 "\n"
-"Uma frase secreta ou uma chave de criptografia é requerida para acessar a "
-"rede sem fio '%s'."
+"Uma frase secreta ou uma chave de criptografia é requerida para acessar a rede sem fio '%s'."
 
-#: ../src/applet.glade.h:8
+#: ../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\">Funcionalidade da Rede Reduzida</"
-"span>\n"
+"<span weight=\"bold\" size=\"larger\">Funcionalidade da Rede Reduzida</span>\n"
 "\n"
 "%s  Não será completamente funcional."
 
-#: ../src/applet.glade.h:12
+#: ../gnome/applet/applet.glade.h:12
 #, no-c-format
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
-"span>\n"
+"<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."
+"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\">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."
 
-#: ../src/applet.glade.h:15
+#: ../gnome/applet/applet.glade.h:15
 msgid "Anonymous Identity:"
 msgstr "Identidade Anônima:"
 
-#: ../src/applet.glade.h:16
+#: ../gnome/applet/applet.glade.h:16
 msgid "Authentication:"
 msgstr "Autenticação:"
 
-#: ../src/applet.glade.h:17
+#: ../gnome/applet/applet.glade.h:17
 msgid "Broadcast Address:"
 msgstr "Endereço de Broadcast:"
 
-#: ../src/applet.glade.h:18
+#: ../gnome/applet/applet.glade.h:18
 msgid "CA Certificate File:"
 msgstr "Arquivo de Certificado CA:"
 
-#: ../src/applet.glade.h:19
+#: ../gnome/applet/applet.glade.h:19
 msgid "C_onnect"
 msgstr "C_onectar"
 
-#: ../src/applet.glade.h:20
+#: ../gnome/applet/applet.glade.h:20
 msgid "Client Certificate File:"
 msgstr "Arquivo de Certificado do Cliente:"
 
-#: ../src/applet.glade.h:21
+#: ../gnome/applet/applet.glade.h:21
 msgid "Connection Information"
 msgstr "Informações da Conexão"
 
-#: ../src/applet.glade.h:22
+#: ../gnome/applet/applet.glade.h:22
 msgid "Default Route:"
 msgstr "Rota Padrão:"
 
-#: ../src/applet.glade.h:23
+#: ../gnome/applet/applet.glade.h:23
 msgid "Destination Address:"
 msgstr "Endereço de Destino:"
 
-#: ../src/applet.glade.h:24
+#: ../gnome/applet/applet.glade.h:24
 msgid "Driver:"
 msgstr "Driver:"
 
-#: ../src/applet.glade.h:25
+#: ../gnome/applet/applet.glade.h:25
 msgid "EAP Method:"
 msgstr "Método EAP:"
 
-#: ../src/applet.glade.h:26
+#: ../gnome/applet/applet.glade.h:26
 msgid "Hardware Address:"
 msgstr "Endereço de Hardware:"
 
-#: ../src/applet.glade.h:27
+#: ../gnome/applet/applet.glade.h:27
 msgid "IP Address:"
 msgstr "Endereço IP:"
 
-#: ../src/applet.glade.h:28
+#: ../gnome/applet/applet.glade.h:28
 msgid "Identity:"
 msgstr "Identidade:"
 
-#: ../src/applet.glade.h:29
+#: ../gnome/applet/applet.glade.h:29
 msgid "Interface:"
 msgstr "Interface:"
 
-#: ../src/applet.glade.h:30
+#: ../gnome/applet/applet.glade.h:30
 msgid "Key Type:"
-msgstr "Tipo de Chave:"
+msgstr "Tipo de chave:"
 
-#: ../src/applet.glade.h:31
+#: ../gnome/applet/applet.glade.h:31
+msgid "Key management:"
+msgstr "Gerenciamento de chaves:"
+
+#: ../gnome/applet/applet.glade.h:32
 msgid "Key:"
 msgstr "Chave:"
 
-#: ../src/applet.glade.h:32
+#: ../gnome/applet/applet.glade.h:33
 msgid ""
 "None\n"
 "WEP 128-bit Passphrase\n"
 "WEP 64/128-bit Hex\n"
 "WEP 64/128-bit ASCII\n"
 msgstr ""
-"Nenhum\n"
-"WEP de 128 bits (Frase Secreta)\n"
-"WEP de 64/128 bits (Hexadecimal)\n"
-"WEP de 64/128 bits (ASCII)\n"
+"Nenhuma\n"
+"WEP de 128 bits frase secreta\n"
+"WEP de 64/128 bits hexa\n"
+"WEP de 64/128 bits ASCII\n"
 
-#: ../src/applet.glade.h:37
+#: ../gnome/applet/applet.glade.h:38
 msgid ""
 "Open System\n"
 "Shared Key"
@@ -622,172 +607,177 @@ msgstr ""
 "Sistema Aberto\n"
 "Chave Compartilhada"
 
-#: ../src/applet.glade.h:39
+#: ../gnome/applet/applet.glade.h:40
 msgid "Other Wireless Network..."
 msgstr "Outra Rede Sem Fio..."
 
-#: ../src/applet.glade.h:40
+#: ../gnome/applet/applet.glade.h:41
 msgid "Passphrase:"
 msgstr "Frase Secreta:"
 
-#: ../src/applet.glade.h:41
+#: ../gnome/applet/applet.glade.h:42
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../src/applet.glade.h:42
+#: ../gnome/applet/applet.glade.h:43
 msgid "Primary DNS:"
 msgstr "DNS Primário:"
 
-#: ../src/applet.glade.h:43
+#: ../gnome/applet/applet.glade.h:44
 msgid "Private Key File:"
 msgstr "Arquivo da Chave Privada:"
 
-#: ../src/applet.glade.h:44
+#: ../gnome/applet/applet.glade.h:45
 msgid "Private Key Password:"
 msgstr "Senha da Chave Privada:"
 
-#: ../src/applet.glade.h:45
+#: ../gnome/applet/applet.glade.h:46
 msgid "Secondary DNS:"
 msgstr "DNS Secondário:"
 
-#: ../src/applet.glade.h:46
+#: ../gnome/applet/applet.glade.h:47
 msgid "Select the CA Certificate File"
 msgstr "Selecione o arquivo de certificado CA"
 
-#: ../src/applet.glade.h:47
+#: ../gnome/applet/applet.glade.h:48
 msgid "Select the Client Certificate File"
 msgstr "Selecione o arquivo de certificado do cliente"
 
-#: ../src/applet.glade.h:48
+#: ../gnome/applet/applet.glade.h:49
 msgid "Select the Private Key File"
 msgstr "Selecione o arquivo da chave privada"
 
-#: ../src/applet.glade.h:49
+#: ../gnome/applet/applet.glade.h:50
 msgid "Show key"
 msgstr "Mostrar chave"
 
-#: ../src/applet.glade.h:50
+#: ../gnome/applet/applet.glade.h:51
 msgid "Show passphrase"
 msgstr "Mostrar frase secreta"
 
-#: ../src/applet.glade.h:51
+#: ../gnome/applet/applet.glade.h:52
 msgid "Show password"
 msgstr "Mostrar senha"
 
-#: ../src/applet.glade.h:52
+#: ../gnome/applet/applet.glade.h:53
 msgid "Show passwords"
 msgstr "Mostrar senhas"
 
-#: ../src/applet.glade.h:53
+#: ../gnome/applet/applet.glade.h:54
 msgid "Speed:"
 msgstr "Velocidade:"
 
-#: ../src/applet.glade.h:54
+#: ../gnome/applet/applet.glade.h:55
 msgid "Subnet Mask:"
 msgstr "Máscara de Subrede:"
 
-#: ../src/applet.glade.h:55
+#: ../gnome/applet/applet.glade.h:56
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../src/applet.glade.h:56
+#: ../gnome/applet/applet.glade.h:57
 msgid "User Name:"
 msgstr "Nome do Usuário:"
 
-#: ../src/applet.glade.h:57
+#: ../gnome/applet/applet.glade.h:58
 msgid "Wireless Network Key Required"
 msgstr "Chave da Rede Sem Fio Requerida"
 
-#: ../src/applet.glade.h:58
+#: ../gnome/applet/applet.glade.h:59
 msgid "Wireless _adapter:"
 msgstr "_Adaptador sem fio:"
 
-#: ../src/applet.glade.h:59
+#: ../gnome/applet/applet.glade.h:60
 msgid "_Always Trust this Wireless Network"
 msgstr "_Sempre confiar nesta rede sem fio"
 
-#: ../src/applet.glade.h:60
+#: ../gnome/applet/applet.glade.h:61
 msgid "_Don't remind me again"
 msgstr "_Não se lembre de mim novamente"
 
-#: ../src/applet.glade.h:61
+#: ../gnome/applet/applet.glade.h:62
+msgid "_Fallback on this Network"
+msgstr "Usar esta rede em caso de _falha"
+
+#: ../gnome/applet/applet.glade.h:63
 msgid "_Login to Network"
 msgstr "_Entrar na rede"
 
-#: ../src/applet.glade.h:62
+#: ../gnome/applet/applet.glade.h:64
 msgid "_Network Name:"
 msgstr "_Nome da Rede:"
 
-#: ../src/applet.glade.h:63
+#: ../gnome/applet/applet.glade.h:65
 msgid "_Wireless Security:"
 msgstr "_Segurança Sem Fio:"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:383
+#: ../gnome/vpn-properties/nm-vpn-properties.c:417
 msgid "Cannot add VPN connection"
 msgstr "Não é possível adicionar conexão VPN"
 
-#: ../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."
+#: ../gnome/vpn-properties/nm-vpn-properties.c:419
+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."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:437
+#: ../gnome/vpn-properties/nm-vpn-properties.c:461
 msgid "Cannot import VPN connection"
 msgstr "Não é possível importar conexão VPN"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:439
+#: ../gnome/vpn-properties/nm-vpn-properties.c:463
 #, 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."
+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."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:579
+#: ../gnome/vpn-properties/nm-vpn-properties.c:580
 #, c-format
 msgid "Error retrieving VPN connection '%s'"
 msgstr "Erro ao recuperar a conexão VPN '%s'"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:582
+#: ../gnome/vpn-properties/nm-vpn-properties.c:583
 #, 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."
+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."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:739
+#: ../gnome/vpn-properties/nm-vpn-properties.c:727
 #, c-format
 msgid "Delete VPN connection \"%s\"?"
 msgstr "Excluir a conexão VPN \"%s\"?"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:742
+#: ../gnome/vpn-properties/nm-vpn-properties.c:730
 #, 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."
+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."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:959
+#: ../gnome/vpn-properties/nm-vpn-properties.c:924
 msgid "Unable to load"
 msgstr "Impossível carregar"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:961
+#: ../gnome/vpn-properties/nm-vpn-properties.c:926
 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)."
+
+#. druid_window = GTK_DIALOG (gtk_dialog_new_with_buttons (_("Create VPN Connection"),
+#. NULL,
+#. GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+#. GTK_STOCK_CANCEL,
+#. GTK_RESPONSE_REJECT,
+#. GTK_STOCK_APPLY,
+#. GTK_RESPONSE_ACCEPT,
+#. NULL));
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1081
+msgid "Create VPN Connection"
+msgstr "Criar Conexão VPN"
 
+#. gtk_container_add (GTK_CONTAINER (druid_window->vbox), GTK_WIDGET(gtk_label_new("Some label")));
+#. gtk_box_pack_start (GTK_BOX (druid_window->vbox), GTK_WIDGET(druid), TRUE,TRUE,0);
+#. gtk_box_pack_start (GTK_BOX (druid_window->vbox), GTK_WIDGET(gtk_label_new("Some label")), TRUE,TRUE,0);
+#. toplevel = gtk_widget_get_toplevel (GTK_WIDGET (druid));
+#. gtk_signal_connect (GTK_OBJECT (toplevel), "delete_event", GTK_SIGNAL_FUNC (vpn_window_close), NULL);
+#. make the druid window modal wrt. our main window
+#. gtk_window_set_modal (druid_window, TRUE);
+#. gtk_window_set_transient_for (GTK_WINDOW(druid_window), GTK_WINDOW (dialog));
 #. Edit dialog
-#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1099
 msgid "Edit VPN Connection"
 msgstr "Editar conexões VPN"
 
@@ -796,69 +786,30 @@ msgid "Add a new VPN connection"
 msgstr "Adicionar uma nova conexão VPN"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:2
-msgid "Choose which type of VPN connection you wish to create."
-msgstr "Escolha qual tipo de conexão VPN você deseja criar."
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
-msgid "Connect to:"
-msgstr "Conectar a:"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
-msgid "Create VPN Connection"
-msgstr "Criar Conexão VPN"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
-msgid "Create VPN Connection - 1 of 2"
-msgstr "Criar Conexão VPN - 1 de 2"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
-msgid "Create VPN Connection - 2 of 2"
-msgstr "Criar Conexão VPN - 2 de 2"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
 msgid "Delete the selected VPN connection"
 msgstr "Excluir a conexão VPN selecionada"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
 msgid "E_xport"
 msgstr "E_xportar"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:9
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
 msgid "Edit the selected VPN connection"
 msgstr "Editar a conexão VPN selecionada"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:10
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
 msgid "Export the VPN settings to a file"
 msgstr "Exportar as configurações VPN para um arquivo"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:11
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
 msgid "Export the selected VPN connection to a file"
 msgstr "Exportar as conexão VPN para um arquivo"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:12
-msgid "Finish Creating VPN Connection"
-msgstr "Terminar de criar conexão VPN"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:13
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
 msgid "Manage Virtual Private Network Connections"
 msgstr "Gerenciar Conexões de Rede Privada Virtual"
 
-#: ../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 ""
-"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."
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:17
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
 msgid "VPN Connections"
 msgstr "Conexões VPN"
 
@@ -870,141 +821,140 @@ msgstr "WEP de 40 bits"
 msgid "104-bit WEP"
 msgstr "WEP de 104 bits"
 
-#: ../src/nm-ap-security-wpa-psk.c:50
+#: ../src/nm-ap-security-wpa-psk.c:51
 msgid "WPA TKIP"
 msgstr "WPA TKIP"
 
-#: ../src/nm-ap-security-wpa-psk.c:52
+#: ../src/nm-ap-security-wpa-psk.c:53
 msgid "WPA CCMP"
 msgstr "WPA CCMP"
 
-#: ../src/nm-ap-security-wpa-psk.c:54
+#: ../src/nm-ap-security-wpa-psk.c:55
 msgid "WPA Automatic"
 msgstr "WPA Automático"
 
-#: ../src/nm-ap-security-wpa-psk.c:59
+#: ../src/nm-ap-security-wpa-psk.c:60
 msgid "WPA2 TKIP"
 msgstr "WPA2 TKIP"
 
-#: ../src/nm-ap-security-wpa-psk.c:61
+#: ../src/nm-ap-security-wpa-psk.c:62
 msgid "WPA2 CCMP"
 msgstr "WPA2 CCMP"
 
-#: ../src/nm-ap-security-wpa-psk.c:63
+#: ../src/nm-ap-security-wpa-psk.c:64
 msgid "WPA2 Automatic"
 msgstr "WPA2 Automático"
 
-#: ../src/nm-ap-security.c:320
+#: ../src/nm-ap-security.c:334
 msgid "none"
 msgstr "nenhuma"
 
-#: ../src/nm-netlink-monitor.c:154
+#: ../src/nm-netlink-monitor.c:174
 #, 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"
+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"
 
-#: ../src/nm-netlink-monitor.c:172
+#: ../src/nm-netlink-monitor.c:192
 #, 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"
+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"
 
-#: ../src/nm-netlink-monitor.c:405
+#: ../src/nm-netlink-monitor.c:427
 msgid "operation took too long"
 msgstr "a operação demorou demais"
 
-#: ../src/nm-netlink-monitor.c:502
+#: ../src/nm-netlink-monitor.c:524
 msgid "received data from wrong type of sender"
 msgstr "dados recebidos de um tipo de remetente errado"
 
-#: ../src/nm-netlink-monitor.c:515
+#: ../src/nm-netlink-monitor.c:537
 msgid "received data from unexpected sender"
 msgstr "dados recebidos de um remetente inesperado"
 
-#: ../src/nm-netlink-monitor.c:646
+#: ../src/nm-netlink-monitor.c:666
 msgid "too much data was sent over socket and some of it was lost"
 msgstr "dados demais foram recebidos pelo socket e alguns deles foram perdidos"
 
-#: ../src/nm-netlink-monitor.c:735
+#: ../src/nm-netlink-monitor.c:776
 msgid "error occurred while waiting for data on socket"
 msgstr "ocorreu um erro ao esperar por dados no socket"
 
-#: ../src/applet-dbus-devices.c:898
+#: ../gnome/applet/applet-dbus-devices.c:930
 #, c-format
 msgid "You are now connected to the Ad-Hoc wireless network '%s'."
-msgstr "Agora, você está conectado à rede sem fio '%s' Ad-Hoc."
+msgstr "Você não está conectado à rede sem fio Ad-Hoc '%s'."
 
-#: ../src/applet-dbus-devices.c:903
+#: ../gnome/applet/applet-dbus-devices.c:935
 #, c-format
 msgid "You are now connected to the wireless network '%s'."
-msgstr "Agora, você está conectado à rede sem fio '%s'."
+msgstr "Você não está conectado à rede sem fio '%s'."
 
-#: ../src/applet-dbus-devices.c:910
+#: ../gnome/applet/applet-dbus-devices.c:942
 msgid "You are now connected to the wired network."
-msgstr "Agora, você está conectado à rede com fio."
+msgstr "Você não está conectado à rede por fios."
 
-#: ../src/applet-dbus-devices.c:916
+#: ../gnome/applet/applet-dbus-devices.c:948
 msgid "Connection Established"
-msgstr "Conexão Estabelecida"
+msgstr "Conexão estabelecida"
 
-#: ../src/applet-dbus-devices.c:959
+#: ../gnome/applet/applet-dbus-devices.c:997
 msgid "Disconnected"
 msgstr "Desconectado"
 
-#: ../src/applet-dbus-devices.c:960
+#: ../gnome/applet/applet-dbus-devices.c:998
 msgid "The network connection has been disconnected."
-msgstr "A conexão de rede foi desfeita."
+msgstr "A conexão de rede foi desconectada."
+
+#: ../src/nm-ap-security-leap.c:66
+#: ../src/nm-ap-security-leap.c:82
+msgid "LEAP"
+msgstr "LEAP"
 
 #~ 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 "Choose which type of VPN connection you wish to create."
+#~ msgstr "Escolha qual tipo de conexão VPN você deseja criar."
+#~ msgid "Connect to:"
+#~ msgstr "Conectar a:"
+#~ msgid "Create VPN Connection - 1 of 2"
+#~ msgstr "Criar Conexão VPN - 1 de 2"
+#~ msgid "Create VPN Connection - 2 of 2"
+#~ msgstr "Criar Conexão VPN - 2 de 2"
+#~ msgid "Finish Creating VPN Connection"
+#~ msgstr "Terminar de criar conexão VPN"
+#~ 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 ""
+#~ "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."
 #~ msgid "Modify Wireless Networks"
 #~ msgstr "Modificar Redes Sem Fio"
-
 #~ msgid ""
 #~ "128-bit Passphrase\n"
 #~ "128-bit Raw Hex Key"
 #~ msgstr ""
 #~ "Frase Secreta de 128 bits\n"
 #~ "Chave Hexa Bruta de 128 bits"
-
 #~ msgid "*"
 #~ msgstr "*"
-
 #~ msgid "There are no network devices..."
 #~ msgstr "Não há nenhum dispositivo de rede..."
-
 #~ 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/ru.po b/po/ru.po
new file mode 100644
index 00000000..f416f7d9
--- /dev/null
+++ b/po/ru.po
@@ -0,0 +1,972 @@
+# translation of ru.po to
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Leonid Kanter <leon@asplinux.ru>, 2006, 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: ru\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-01-03 18:02+0200\n"
+"PO-Revision-Date: 2007-01-03 18:06+0200\n"
+"Last-Translator: Leonid Kanter <leon@asplinux.ru>\n"
+"Language-Team:  <gnome-cyr@gnome.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"
+"X-Generator: KBabel 1.11.4\n"
+
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:926
+#, c-format
+msgid "Passphrase for wireless network %s"
+msgstr "Ключевая фраза для беспроводного соединения %s"
+
+#: ../gnome/applet/applet-dbus.c:274
+#, c-format
+msgid "Connection to the wireless network '%s' failed."
+msgstr "Сбой подключения к беспроводной сети \"%s\"."
+
+#: ../gnome/applet/applet-dbus.c:279
+msgid "Connection to the wired network failed."
+msgstr "Сбой подключения к беспроводной сети."
+
+#: ../gnome/applet/applet.c:182
+msgid "Error displaying connection information:"
+msgstr "Ошибка при отображении сведений о соединении:"
+
+#: ../gnome/applet/applet.c:200
+msgid "Could not find some required resources (the glade file)!"
+msgstr "Не удаётся найти некоторые необходимые ресурсы (файл glade)!"
+
+#: ../gnome/applet/applet.c:210
+msgid "No active connections!"
+msgstr "Нет активных соединений!"
+
+#: ../gnome/applet/applet.c:227
+#, c-format
+msgid "%d Mb/s"
+msgstr "%d Мб/c"
+
+#: ../gnome/applet/applet.c:230
+#, c-format
+msgid "Wired Ethernet (%s)"
+msgstr "Проводной Ethernet (%s)"
+
+#: ../gnome/applet/applet.c:232
+#, c-format
+msgid "Wireless Ethernet (%s)"
+msgstr "Беспроводный Ethernet (%s)"
+
+#: ../gnome/applet/applet.c:238
+msgid "Unknown"
+msgstr "Неизвестно"
+
+#: ../gnome/applet/applet.c:330 ../gnome/applet/applet.c:357
+msgid "NetworkManager Applet"
+msgstr "Апплет NetworkManager"
+
+#: ../gnome/applet/applet.c:332
+msgid ""
+"Copyright © 2004-2006 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+msgstr ""
+"Copyright © 2004-2006 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+
+#: ../gnome/applet/applet.c:334 ../gnome/applet/applet.c:361
+msgid "Notification area applet for managing your network devices and connections."
+msgstr "Апплет для управления сетевыми устройствами и соединениями."
+
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:365
+msgid "translator-credits"
+msgstr "Леонид Кантер <leon@asplinux.ru>"
+
+#: ../gnome/applet/applet.c:359
+msgid ""
+"Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+msgstr ""
+"Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+
+#: ../gnome/applet/applet.c:421
+msgid "VPN Login Failure"
+msgstr "Ошибка авторизации VPN"
+
+#: ../gnome/applet/applet.c:422
+#, c-format
+msgid "Could not start the VPN connection '%s' due to a login failure."
+msgstr "Не удаётся запустить соединение VPN '%s' из-за ошибки авторизации."
+
+#: ../gnome/applet/applet.c:426
+msgid "VPN Start Failure"
+msgstr "Ошибка запуска VPN"
+
+#: ../gnome/applet/applet.c:427
+#, 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:431 ../gnome/applet/applet.c:441
+msgid "VPN Connect Failure"
+msgstr "Ошибка соединения VPN"
+
+#: ../gnome/applet/applet.c:432
+#, c-format
+msgid "Could not start the VPN connection '%s' due to a connection error."
+msgstr "Не удаётся запустить соединение VPN '%s' из-за ошибки соединения."
+
+#: ../gnome/applet/applet.c:436
+msgid "VPN Configuration Error"
+msgstr "Ошибка конфигурации VPN"
+
+#: ../gnome/applet/applet.c:437
+#, c-format
+msgid "The VPN connection '%s' was not correctly configured."
+msgstr "Соединение VPN '%s' не было правильно настроено."
+
+#: ../gnome/applet/applet.c:442
+#, 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:512
+msgid "VPN Login Message"
+msgstr "Сообщение авторизации VPN"
+
+#: ../gnome/applet/applet.c:737 ../gnome/applet/applet.c:2635
+#: ../gnome/applet/other-network-dialog.c:458
+#: ../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:749
+#, c-format
+msgid "The network device \"%s (%s)\" does not support wireless scanning."
+msgstr "Сетевое устройство \"%s (%s)\" не поддерживает беспроводное сканирование."
+
+#: ../gnome/applet/applet.c:757
+#, c-format
+msgid "The network device \"%s (%s)\" does not support link detection."
+msgstr "Сетевое устройство \"%s (%s)\" не поддерживает обнаружение соединения."
+
+#. Note to translators: this is used if no essid is known
+#: ../gnome/applet/applet.c:905 ../gnome/applet/applet.c:1103
+msgid "(unknown)"
+msgstr "(неизвестно)"
+
+#: ../gnome/applet/applet.c:911
+#, c-format
+msgid "Preparing device %s for the wired network..."
+msgstr "Подготовка устройства %s для проводной сети..."
+
+#: ../gnome/applet/applet.c:913
+#, c-format
+msgid "Preparing device %s for the wireless network '%s'..."
+msgstr "Подготовка устройства %s для беспроводной сети '%s'..."
+
+#: ../gnome/applet/applet.c:921
+#, c-format
+msgid "Configuring device %s for the wired network..."
+msgstr "Устройство %s настраивается для проводной сети..."
+
+#: ../gnome/applet/applet.c:923
+#, c-format
+msgid "Attempting to join the wireless network '%s'..."
+msgstr "Попытка подключения к беспроводной сети '%s'..."
+
+#: ../gnome/applet/applet.c:931
+#, c-format
+msgid "Waiting for Network Key for the wireless network '%s'..."
+msgstr "Ожидание ключа сети для беспроводной сети '%s'..."
+
+#: ../gnome/applet/applet.c:939 ../gnome/applet/applet.c:949
+msgid "Requesting a network address from the wired network..."
+msgstr "Запрос сетевого адреса из проводной сети..."
+
+#: ../gnome/applet/applet.c:941 ../gnome/applet/applet.c:951
+#, c-format
+msgid "Requesting a network address from the wireless network '%s'..."
+msgstr "Запрос сетевого адреса из беспроводной сети '%s'..."
+
+#: ../gnome/applet/applet.c:959
+msgid "Finishing connection to the wired network..."
+msgstr "Завершение подключения к проводной сети..."
+
+#: ../gnome/applet/applet.c:961
+#, c-format
+msgid "Finishing connection to the wireless network '%s'..."
+msgstr "Завершение подключения к беспроводной сети '%s'..."
+
+#: ../gnome/applet/applet.c:1078
+msgid "NetworkManager is not running"
+msgstr "NetworkManager не запущен"
+
+#: ../gnome/applet/applet.c:1086 ../gnome/applet/applet.c:1843
+msgid "Networking disabled"
+msgstr "Поддержка сети отключена"
+
+#: ../gnome/applet/applet.c:1091
+msgid "No network connection"
+msgstr "Нет подключения к сети"
+
+#: ../gnome/applet/applet.c:1096
+msgid "Wired network connection"
+msgstr "Подключение к проводной сети"
+
+#: ../gnome/applet/applet.c:1100
+msgid "Connected to an Ad-Hoc wireless network"
+msgstr "Подключен к беспроводной сети Ad Hoc"
+
+#: ../gnome/applet/applet.c:1102
+#, c-format
+msgid "Wireless network connection to '%s' (%d%%)"
+msgstr "Подключен к беспроводной сети '%s' (%d%%)"
+
+#: ../gnome/applet/applet.c:1123
+#, c-format
+msgid "VPN connection to '%s'"
+msgstr "Подключен к VPN '%s'"
+
+#: ../gnome/applet/applet.c:1131
+#, c-format
+msgid "VPN connecting to '%s'"
+msgstr "Подключение к VPN '%s'"
+
+#: ../gnome/applet/applet.c:1556
+msgid "_Connect to Other Wireless Network..."
+msgstr "Подключиться к _другой беспроводной сети..."
+
+#: ../gnome/applet/applet.c:1577
+msgid "Create _New Wireless Network..."
+msgstr "Создать _новую беспроводную сеть..."
+
+#: ../gnome/applet/applet.c:1700
+msgid "_VPN Connections"
+msgstr "Соединения _VPN"
+
+#: ../gnome/applet/applet.c:1745
+msgid "_Configure VPN..."
+msgstr "_Настроить VPN..."
+
+#: ../gnome/applet/applet.c:1749
+msgid "_Disconnect VPN..."
+msgstr "_Отключить VPN..."
+
+#: ../gnome/applet/applet.c:1771
+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:1782
+#, c-format
+msgid "Connect to %s..."
+msgstr "Подключение к %s..."
+
+#: ../gnome/applet/applet.c:1788
+#, c-format
+msgid "Disconnect from %s..."
+msgstr "Отключение от %s..."
+
+#: ../gnome/applet/applet.c:1837
+msgid "No network devices have been found"
+msgstr "Сетевые устройства не были обнаружены"
+
+#: ../gnome/applet/applet.c:2029
+msgid "NetworkManager is not running..."
+msgstr "NetworkManager не запущен..."
+
+#. 'Enable Networking' item
+#: ../gnome/applet/applet.c:2210
+msgid "Enable _Networking"
+msgstr "_Сеть"
+
+#. 'Enable Wireless' item
+#: ../gnome/applet/applet.c:2216
+msgid "Enable _Wireless"
+msgstr "_Беспроводная сеть"
+
+#. 'Connection Information' item
+#: ../gnome/applet/applet.c:2222
+msgid "Connection _Information"
+msgstr "C_ведения о соединении"
+
+#. Help item
+#: ../gnome/applet/applet.c:2233
+msgid "_Help"
+msgstr "_Справка"
+
+#. About item
+#: ../gnome/applet/applet.c:2242
+msgid "_About"
+msgstr "_О программе"
+
+#: ../gnome/applet/applet.c:2824
+msgid ""
+"The NetworkManager applet could not find some required resources.  It cannot "
+"continue.\n"
+msgstr ""
+"Апплет NetworkManager не может найти некоторые необходимые ресурсы. "
+"Продолжение невозможно.\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 "Dynamic 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 Passphrase"
+
+#: ../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:93
+#: ../src/nm-ap-security-wpa-eap.c:117
+msgid "WPA2 Enterprise"
+msgstr "WPA2 Enterprise"
+
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:95
+#: ../src/nm-ap-security-wpa-eap.c:122
+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
+#, c-format
+msgid "Wireless Network (%s)"
+msgid_plural "Wireless Networks (%s)"
+msgstr[0] "Беспроводная сеть (%s)"
+msgstr[1] "Беспроводные сети (%s)"
+msgstr[2] "Беспроводные сети (%s)"
+
+#: ../gnome/applet/menu-items.c:164
+msgid "Wireless Network"
+msgid_plural "Wireless Networks"
+msgstr[0] "Беспроводная сеть"
+msgstr[1] "Беспроводные сети"
+msgstr[2] "Беспроводные сети"
+
+#: ../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 "Создание новой беспроводной сети"
+
+#: ../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
+msgid "Create New Wireless Network"
+msgstr "Создание новой беспроводной сети"
+
+#: ../gnome/applet/other-network-dialog.c:368
+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
+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 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 ""
+"Не удаётся найти диалог аутентификации для VPN-соединения типа '%s'. "
+"Свяжитесь со своим системным администратором."
+
+#: ../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 "Anonymous Identity:"
+
+#: ../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 "С_оединить"
+
+#: ../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 "MAC-адрес:"
+
+#: ../gnome/applet/applet.glade.h:27
+msgid "IP Address:"
+msgstr "Адрес IP:"
+
+#: ../gnome/applet/applet.glade.h:28
+msgid "Identity:"
+msgstr "Identity:"
+
+#: ../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 management:"
+msgstr "Управление ключами:"
+
+#: ../gnome/applet/applet.glade.h:32
+msgid "Key:"
+msgstr "Ключ:"
+
+#: ../gnome/applet/applet.glade.h:33
+msgid ""
+"None\n"
+"WEP 128-bit Passphrase\n"
+"WEP 64/128-bit Hex\n"
+"WEP 64/128-bit ASCII\n"
+msgstr ""
+"Нет\n"
+"WEP 128-bit Passphrase\n"
+"WEP 64/128-bit Hex\n"
+"WEP 64/128-bit ASCII\n"
+
+#: ../gnome/applet/applet.glade.h:38
+msgid ""
+"Open System\n"
+"Shared Key"
+msgstr ""
+"Открытая система\n"
+"Общий ключ"
+
+#: ../gnome/applet/applet.glade.h:40
+msgid "Other Wireless Network..."
+msgstr "Другая беспроводная сеть..."
+
+#: ../gnome/applet/applet.glade.h:41
+msgid "Passphrase:"
+msgstr "Ключевая фраза:"
+
+#: ../gnome/applet/applet.glade.h:42
+msgid "Password:"
+msgstr "Пароль:"
+
+#: ../gnome/applet/applet.glade.h:43
+msgid "Primary DNS:"
+msgstr "Первичный DNS:"
+
+#: ../gnome/applet/applet.glade.h:44
+msgid "Private Key File:"
+msgstr "Файл личного ключа:"
+
+#: ../gnome/applet/applet.glade.h:45
+msgid "Private Key Password:"
+msgstr "Пароль личного ключа:"
+
+#: ../gnome/applet/applet.glade.h:46
+msgid "Secondary DNS:"
+msgstr "Вторичный DNS:"
+
+#: ../gnome/applet/applet.glade.h:47
+msgid "Select the CA Certificate File"
+msgstr "Выберите файл сертификата CA"
+
+#: ../gnome/applet/applet.glade.h:48
+msgid "Select the Client Certificate File"
+msgstr "Выберите файл сертификата клиента"
+
+#: ../gnome/applet/applet.glade.h:49
+msgid "Select the Private Key File"
+msgstr "Выберите файл личного ключа"
+
+#: ../gnome/applet/applet.glade.h:50
+msgid "Show key"
+msgstr "Показать ключ"
+
+#: ../gnome/applet/applet.glade.h:51
+msgid "Show passphrase"
+msgstr "Показать ключевую фразу"
+
+#: ../gnome/applet/applet.glade.h:52
+msgid "Show password"
+msgstr "Показать пароль"
+
+#: ../gnome/applet/applet.glade.h:53
+msgid "Show passwords"
+msgstr "Показать пароли"
+
+#: ../gnome/applet/applet.glade.h:54
+msgid "Speed:"
+msgstr "Скорость:"
+
+#: ../gnome/applet/applet.glade.h:55
+msgid "Subnet Mask:"
+msgstr "Маска подсети:"
+
+#: ../gnome/applet/applet.glade.h:56
+msgid "Type:"
+msgstr "Тип:"
+
+#: ../gnome/applet/applet.glade.h:57
+msgid "User Name:"
+msgstr "Имя пользователя:"
+
+#: ../gnome/applet/applet.glade.h:58
+msgid "Wireless Network Key Required"
+msgstr "Требуется ключ беспроводной сети"
+
+#: ../gnome/applet/applet.glade.h:59
+msgid "Wireless _adapter:"
+msgstr "Беспроводный _адаптер:"
+
+#: ../gnome/applet/applet.glade.h:60
+msgid "_Always Trust this Wireless Network"
+msgstr "_Всегда доверять этой беспроводной сети"
+
+#: ../gnome/applet/applet.glade.h:61
+msgid "_Don't remind me again"
+msgstr "_Не напоминать больше"
+
+#: ../gnome/applet/applet.glade.h:62
+msgid "_Fallback on this Network"
+msgstr "_Исползовать как резервную сеть"
+
+#: ../gnome/applet/applet.glade.h:63
+msgid "_Login to Network"
+msgstr "_Зарегистрироваться в сети"
+
+#: ../gnome/applet/applet.glade.h:64
+msgid "_Network Name:"
+msgstr "_Имя сети:"
+
+#: ../gnome/applet/applet.glade.h:65
+msgid "_Wireless Security:"
+msgstr "_Защита беспроводной сети:"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:417
+msgid "Cannot add VPN connection"
+msgstr "Не удаётся добавить соединение VPN"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:419
+msgid ""
+"No suitable VPN software was found on your system. Contact your system "
+"administrator."
+msgstr ""
+"В вашей системе не обнаружено подходящего программного обеспечения для "
+"подключения к VPN. Свяжитесь со своим системным администратором."
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:461
+msgid "Cannot import VPN connection"
+msgstr "Не удаётся импортировать соединение VPN"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:463
+#, c-format
+msgid ""
+"Cannot find suitable software for VPN connection type '%s' to import the "
+"file '%s'. Contact your system administrator."
+msgstr ""
+"Не удаётся найти подходящее программное обеспечение для соединения VPN типа "
+"'%s' для импорта файла '%s'.  Свяжитесь со своим системным администратором."
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:580
+#, c-format
+msgid "Error retrieving VPN connection '%s'"
+msgstr "Ошибка получения VPN-соединения '%s'"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:583
+#, 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:727
+#, c-format
+msgid "Delete VPN connection \"%s\"?"
+msgstr "Удалить соединение VPN \"%s\"?"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:730
+#, 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\" будут утрачены и, возможно, вам "
+"придётся обратиться к системному администратору для создания нового "
+"соединения."
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:924
+msgid "Unable to load"
+msgstr "Не удаётся загрузить"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:926
+msgid "Cannot find some needed resources (the glade file)!"
+msgstr "Не удаётся найти некоторые необходимые ресурсы (файл glade)!"
+
+#. druid_window = GTK_DIALOG (gtk_dialog_new_with_buttons (_("Create VPN Connection"),
+#. NULL,
+#. GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+#. GTK_STOCK_CANCEL,
+#. GTK_RESPONSE_REJECT,
+#. GTK_STOCK_APPLY,
+#. GTK_RESPONSE_ACCEPT,
+#. NULL));
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1081
+msgid "Create VPN Connection"
+msgstr "Создание соединения VPN"
+
+#. gtk_container_add (GTK_CONTAINER (druid_window->vbox), GTK_WIDGET(gtk_label_new("Some label")));
+#. gtk_box_pack_start (GTK_BOX (druid_window->vbox), GTK_WIDGET(druid), TRUE,TRUE,0);
+#. gtk_box_pack_start (GTK_BOX (druid_window->vbox), GTK_WIDGET(gtk_label_new("Some label")), TRUE,TRUE,0);
+#. toplevel = gtk_widget_get_toplevel (GTK_WIDGET (druid));
+#. gtk_signal_connect (GTK_OBJECT (toplevel), "delete_event", GTK_SIGNAL_FUNC (vpn_window_close), NULL);
+#. make the druid window modal wrt. our main window
+#. gtk_window_set_modal (druid_window, TRUE);
+#. gtk_window_set_transient_for (GTK_WINDOW(druid_window), GTK_WINDOW (dialog));
+#. Edit dialog
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1099
+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 "Delete the selected VPN connection"
+msgstr "Удалить выделенное соединение VPN"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
+msgid "E_xport"
+msgstr "Э_кспорт"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
+msgid "Edit the selected VPN connection"
+msgstr "Изменить выделенное соединение VPN"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
+msgid "Export the VPN settings to a file"
+msgstr "Экспорт параметров соединения VPN в файл"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
+msgid "Export the selected VPN connection to a file"
+msgstr "Экспорт выделенного соединения VPN в файл"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
+msgid "Manage Virtual Private Network Connections"
+msgstr "Управление соединениями VPN"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
+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:51
+msgid "WPA TKIP"
+msgstr "WPA TKIP"
+
+#: ../src/nm-ap-security-wpa-psk.c:53
+msgid "WPA CCMP"
+msgstr "WPA CCMP"
+
+#: ../src/nm-ap-security-wpa-psk.c:55
+msgid "WPA Automatic"
+msgstr "WPA Automatic"
+
+#: ../src/nm-ap-security-wpa-psk.c:60
+msgid "WPA2 TKIP"
+msgstr "WPA2 TKIP"
+
+#: ../src/nm-ap-security-wpa-psk.c:62
+msgid "WPA2 CCMP"
+msgstr "WPA2 CCMP"
+
+#: ../src/nm-ap-security-wpa-psk.c:64
+msgid "WPA2 Automatic"
+msgstr "WPA2 Automatic"
+
+#: ../src/nm-ap-security.c:334
+msgid "none"
+msgstr "нет"
+
+#: ../src/nm-netlink-monitor.c:174
+#, c-format
+msgid "unable to create netlink socket for monitoring wired ethernet devices - %s"
+msgstr ""
+"не удаётся создать сокет netlink для мониторинга проводных устройтв ethernet "
+"- %s"
+
+#: ../src/nm-netlink-monitor.c:192
+#, c-format
+msgid "unable to bind to netlink socket for monitoring wired ethernet devices - %s"
+msgstr ""
+"не удаётся подключиться к сокету netlink для мониторинга проводных устройтв "
+"ethernet - %s"
+
+#: ../src/nm-netlink-monitor.c:427
+msgid "operation took too long"
+msgstr "операция заняла слишком много времени"
+
+#: ../src/nm-netlink-monitor.c:524
+msgid "received data from wrong type of sender"
+msgstr "получены данные от неверного типа отправителя"
+
+#: ../src/nm-netlink-monitor.c:537
+msgid "received data from unexpected sender"
+msgstr "получены данные от неожиданного отправителя"
+
+#: ../src/nm-netlink-monitor.c:666
+msgid "too much data was sent over socket and some of it was lost"
+msgstr ""
+"слишком много данных было передано через сокет, и некоторые данные были "
+"утрачены"
+
+#: ../src/nm-netlink-monitor.c:776
+msgid "error occurred while waiting for data on socket"
+msgstr "произошла ошибка при ожидании данных из сокета"
+
+#: ../gnome/applet/applet-dbus-devices.c:930
+#, c-format
+msgid "You are now connected to the Ad-Hoc wireless network '%s'."
+msgstr "Сейчас вы подключены к беспроводной сети AdHoc \"%s\"."
+
+#: ../gnome/applet/applet-dbus-devices.c:935
+#, c-format
+msgid "You are now connected to the wireless network '%s'."
+msgstr "Сейчас вы подключены к беспроводной сети \"%s\"."
+
+#: ../gnome/applet/applet-dbus-devices.c:942
+msgid "You are now connected to the wired network."
+msgstr "Сейчас вы подключены к проводной сети."
+
+#: ../gnome/applet/applet-dbus-devices.c:948
+msgid "Connection Established"
+msgstr "Соединение установлено"
+
+#: ../gnome/applet/applet-dbus-devices.c:997
+msgid "Disconnected"
+msgstr "Соединение разорвано"
+
+#: ../gnome/applet/applet-dbus-devices.c:998
+msgid "The network connection has been disconnected."
+msgstr "Сетевое соединение было разорвано."
+
+#: ../src/nm-ap-security-leap.c:66 ../src/nm-ap-security-leap.c:82
+msgid "LEAP"
+msgstr "LEAP"
+
diff --git a/po/rw.po b/po/rw.po
index 3eca4344..05d92b38 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: 2006-05-29 18:33+0200\n"
+"POT-Creation-Date: 2005-04-01 16:22-0700\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,498 +25,306 @@ msgstr ""
 "ULL NAME <EMAIL@ADDRESS>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../src/applet-compat.c:171 ../src/applet-dbus-info.c:919
-#, fuzzy, c-format
-msgid "Passphrase for wireless network %s"
-msgstr "Gishya urusobe"
-
-#: ../src/applet-dbus.c:265
-#, fuzzy, c-format
-msgid "Connection to the wireless network '%s' failed."
-msgstr "Kuri urusobe"
-
-#: ../src/applet-dbus.c:270
+#: info-daemon/networks.glade.h:1
 #, fuzzy
-msgid "Connection to the wired network failed."
-msgstr "Kuri a urusobe"
+msgid "<span weight=\"bold\">Wireless Networks:</span>"
+msgstr "<Uburemere UTSINDAGIYE"
 
-#: ../src/applet.c:184
-msgid "Error displaying connection information:"
+#: info-daemon/networks.glade.h:2
+msgid "Modify Wireless Networks"
 msgstr ""
 
-#: ../src/applet.c:202
-#, fuzzy
-msgid "Could not find some required resources (the glade file)!"
-msgstr "OYA Gushaka Bya ngombwa i IDOSIYE OYA Byabonetse"
-
-#: ../src/applet.c:213
-#, fuzzy
-msgid "No active connections!"
-msgstr "urusobe Ukwihuza"
+#: info-daemon/passphrase.glade.h:1 panel-applet/applet.glade.h:2
+msgid "*"
+msgstr "*"
 
-#: ../src/applet.c:234
-#, c-format
-msgid "Wired Ethernet (%s)"
-msgstr ""
-
-#: ../src/applet.c:236
-#, c-format
-msgid "Wireless Ethernet (%s)"
+#: info-daemon/passphrase.glade.h:2
+msgid ""
+"128-bit Passphrase (WEP)\n"
+"Ascii Key (WEP)\n"
+"Hex Key (WEP)"
 msgstr ""
 
-#: ../src/applet.c:337 ../src/applet.c:362
-msgid "NetworkManager Applet"
+#: 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'."
 msgstr ""
+"<Uburemere UTSINDAGIYE Ingano Kinini ku A Cyangwa Bishunzwe: Urufunguzo ni "
+"Bya ngombwa Kuri i urusobe"
 
-#: ../src/applet.c:339 ../src/applet.c:364
-#, fuzzy
-msgid "Copyright © 2004-2005 Red Hat, Inc."
-msgstr "C"
-
-#: ../src/applet.c:340 ../src/applet.c:365
+# #-#-#-#-#  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
 #, fuzzy
-msgid ""
-"Notification area applet for managing your network devices and connections."
-msgstr "Ubuso Apuleti... kugirango urusobe Na Ukwihuza"
-
-#: ../src/applet.c:343 ../src/applet.c:370
-msgid "translator-credits"
-msgstr ""
+msgid "Key Type:"
+msgstr "Ubwoko bw'agakandisho"
 
-#: ../src/applet.c:426
-msgid "VPN Login Failure"
+#: 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 ""
 
-#: ../src/applet.c:427
-#, c-format
-msgid "Could not start the VPN connection '%s' due to a login failure."
+#: info-daemon/passphrase.glade.h:11
+msgid "Wireless Network Key Required"
 msgstr ""
 
-#: ../src/applet.c:431
-msgid "VPN Start Failure"
-msgstr ""
+#: info-daemon/passphrase.glade.h:12 panel-applet/applet.glade.h:22
+#, fuzzy
+msgid "_Login to Network"
+msgstr "Kuri"
 
-#: ../src/applet.c:432
-#, c-format
-msgid ""
-"Could not start the VPN connection '%s' due to a failure launching the VPN "
-"program."
+#: info-daemon/NetworkManagerInfoPassphraseDialog.c:143
+#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:153
+msgid "Ascii Key:"
 msgstr ""
 
-#: ../src/applet.c:436 ../src/applet.c:446
-msgid "VPN Connect Failure"
+#: info-daemon/NetworkManagerInfoPassphraseDialog.c:146
+#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:156
+msgid "Hex Key:"
 msgstr ""
 
-#: ../src/applet.c:437
-#, c-format
-msgid "Could not start the VPN connection '%s' due to a connection error."
-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"
 
-#: ../src/applet.c:441
-msgid "VPN Configuration Error"
+#: panel-applet/NMWirelessApplet.c:149 panel-applet/NMWirelessApplet.c:167
+msgid "NetworkManager Applet"
 msgstr ""
 
-#: ../src/applet.c:442
-#, c-format
-msgid "The VPN connection '%s' was not correctly configured."
-msgstr ""
+#: panel-applet/NMWirelessApplet.c:151 panel-applet/NMWirelessApplet.c:169
+#, fuzzy
+msgid "Copyright (C) 2004-2005 Red Hat, Inc."
+msgstr "C"
 
-#: ../src/applet.c:447
-#, c-format
+#: panel-applet/NMWirelessApplet.c:152 panel-applet/NMWirelessApplet.c:170
+#, fuzzy
 msgid ""
-"Could not start the VPN connection '%s' because the VPN server did not "
-"return an adequate network configuration."
-msgstr ""
-
-#: ../src/applet.c:517
-msgid "VPN Login Message"
-msgstr ""
+"Notification area applet for managing your network devices and connections."
+msgstr "Ubuso Apuleti... kugirango urusobe Na Ukwihuza"
 
-#: ../src/applet.c:741 ../src/applet.c:2508
-#: ../src/other-network-dialog.c:453
-#: ../src/passphrase-dialog.c:228
+#: panel-applet/NMWirelessApplet.c:384 panel-applet/NMWirelessApplet.c:1523
+#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:319
 #, 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"
 
-#: ../src/applet.c:753
+#: panel-applet/NMWirelessApplet.c:395
 #, fuzzy, c-format
 msgid "The network device \"%s (%s)\" does not support wireless scanning."
 msgstr "urusobe APAREYE OYA Gushigikira"
 
-#: ../src/applet.c:761
+#: panel-applet/NMWirelessApplet.c:403
 #, fuzzy, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
 msgstr "urusobe APAREYE OYA Gushigikira Ihuza"
 
-#: ../src/applet.c:908
-#, fuzzy, c-format
-msgid "Preparing device %s for the wired network..."
-msgstr "Kuri a urusobe"
-
-#: ../src/applet.c:910
-#, fuzzy, c-format
-msgid "Preparing device %s for the wireless network '%s'..."
-msgstr "Kuri urusobe"
-
-#: ../src/applet.c:918
-#, fuzzy, c-format
-msgid "Configuring device %s for the wired network..."
-msgstr "Kuri a urusobe"
-
-#: ../src/applet.c:920
-#, fuzzy, c-format
-msgid "Attempting to join the wireless network '%s'..."
-msgstr "Kuri urusobe"
-
-#: ../src/applet.c:928
-#, fuzzy, c-format
-msgid "Waiting for Network Key for the wireless network '%s'..."
-msgstr "Kuri urusobe"
-
-#: ../src/applet.c:936 ../src/applet.c:946
-#, fuzzy
-msgid "Requesting a network address from the wired network..."
-msgstr "Kuri a urusobe"
-
-#: ../src/applet.c:938 ../src/applet.c:948
-#, fuzzy, c-format
-msgid "Requesting a network address from the wireless network '%s'..."
-msgstr "Kuri urusobe"
-
-#: ../src/applet.c:956
-#, fuzzy
-msgid "Finishing connection to the wired network..."
-msgstr "Kuri a urusobe"
-
-#: ../src/applet.c:958
-#, fuzzy, c-format
-msgid "Finishing connection to the wireless network '%s'..."
-msgstr "Kuri urusobe"
-
-#: ../src/applet.c:1075
-#, fuzzy
-msgid "NetworkManager is not running"
-msgstr "ni OYA"
-
-#: ../src/applet.c:1083 ../src/applet.c:1828
-msgid "Networking disabled"
-msgstr ""
-
-#: ../src/applet.c:1088
+#: panel-applet/NMWirelessApplet.c:627
 #, fuzzy
 msgid "No network connection"
 msgstr "urusobe Ukwihuza"
 
-#: ../src/applet.c:1093
+#: panel-applet/NMWirelessApplet.c:632
 #, fuzzy
 msgid "Wired network connection"
 msgstr "urusobe Ukwihuza"
 
-#: ../src/applet.c:1097
+#: panel-applet/NMWirelessApplet.c:637
+#, fuzzy
+msgid "Connecting to a wired network..."
+msgstr "Kuri a urusobe"
+
+#: panel-applet/NMWirelessApplet.c:646
 #, fuzzy
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Kuri urusobe"
 
-#: ../src/applet.c:1099
+#: panel-applet/NMWirelessApplet.c:660
 #, fuzzy, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "urusobe Ukwihuza Kuri"
 
-#: ../src/applet.c:1120
-#, c-format
-msgid "VPN connection to '%s'"
-msgstr ""
-
-#: ../src/applet.c:1128
-#, c-format
-msgid "VPN connecting to '%s'"
-msgstr ""
-
-#: ../src/applet.c:1541
+#: panel-applet/NMWirelessApplet.c:665
 #, fuzzy
-msgid "_Connect to Other Wireless Network..."
+msgid "Wireless network connection"
+msgstr "urusobe Ukwihuza"
+
+#: panel-applet/NMWirelessApplet.c:670
+#, fuzzy, c-format
+msgid "Connecting to wireless network '%s'..."
 msgstr "Kuri urusobe"
 
-#: ../src/applet.c:1562
+#: panel-applet/NMWirelessApplet.c:676
 #, fuzzy
-msgid "Create _New Wireless Network..."
-msgstr "Gishya"
-
-#: ../src/applet.c:1685
-msgid "_VPN Connections"
-msgstr ""
-
-#: ../src/applet.c:1730
-msgid "_Configure VPN..."
-msgstr ""
-
-#: ../src/applet.c:1734
-msgid "_Disconnect VPN..."
-msgstr ""
+msgid "NetworkManager is not running"
+msgstr "ni OYA"
 
-#: ../src/applet.c:1756
-msgid "_Dial Up Connections"
-msgstr ""
+#: panel-applet/NMWirelessApplet.c:681
+#, fuzzy
+msgid "Scanning for wireless networks..."
+msgstr "kugirango"
 
-#. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
-#: ../src/applet.c:1767
-#, c-format
-msgid "Connect to %s..."
+#: panel-applet/NMWirelessApplet.c:1046
+msgid "Other Wireless Networks..."
 msgstr ""
 
-#: ../src/applet.c:1773
-#, c-format
-msgid "Disconnect from %s..."
-msgstr ""
+#: panel-applet/NMWirelessApplet.c:1067
+#, fuzzy
+msgid "Create new Wireless Network..."
+msgstr "Gishya"
 
-#: ../src/applet.c:1822
+#: panel-applet/NMWirelessApplet.c:1143
 #, fuzzy
 msgid "No network devices have been found"
 msgstr "urusobe Byabonetse"
 
-#: ../src/applet.c:2014
+#: panel-applet/NMWirelessApplet.c:1285
 #, fuzzy
 msgid "NetworkManager is not running..."
 msgstr "ni OYA"
 
-#. 'Enable Networking' item
-#: ../src/applet.c:2170
-msgid "Enable _Networking"
+#: panel-applet/NMWirelessApplet.c:1355 panel-applet/NMWirelessApplet.c:1403
+msgid "Pause Wireless Scanning"
 msgstr ""
 
-#. 'Enable Wireless' item
-#: ../src/applet.c:2176
-msgid "Enable _Wireless"
+#: panel-applet/NMWirelessApplet.c:1360
+msgid "Resume Wireless Scanning"
 msgstr ""
 
-#. 'Connection Information' item
-#: ../src/applet.c:2182
-msgid "Connection _Information"
+#: panel-applet/NMWirelessApplet.c:1370 panel-applet/NMWirelessApplet.c:1409
+msgid "Stop All Wireless Devices"
 msgstr ""
 
-# scp/source\office\profile.lng:STR_VALUE_TEMPLATE_SERVICES_HELP.text
-#. Help item
-#: ../src/applet.c:2193
+#: panel-applet/NMWirelessApplet.c:1375
 #, fuzzy
-msgid "_Help"
+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"
 msgstr "Ifashayobora"
 
-#. About item
-#: ../src/applet.c:2202
-#, fuzzy
-msgid "_About"
+#: panel-applet/NMWirelessApplet.c:1425
+msgid "About"
 msgstr "Bigyanye"
 
-#: ../src/applet.c:2667
+#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:232
 #, fuzzy
-msgid ""
-"The NetworkManager applet could not find some required resources.  It cannot "
-"continue.\n"
-msgstr "OYA Gushaka Bya ngombwa i IDOSIYE OYA Byabonetse"
-
-#: ../src/wireless-security-option.c:157
-msgid "Open System"
-msgstr ""
-
-#: ../src/wireless-security-option.c:160
-msgid "Shared Key"
-msgstr ""
-
-#: ../src/wireless-security-option.c:208
-msgid "Automatic (Default)"
-msgstr ""
-
-#: ../src/wireless-security-option.c:215
-msgid "AES-CCMP"
-msgstr ""
-
-#: ../src/wireless-security-option.c:223
-msgid "TKIP"
-msgstr ""
-
-#: ../src/wireless-security-option.c:231
-msgid "Dynamic WEP"
-msgstr ""
-
-#: ../src/wso-none.c:53
-msgid "None"
-msgstr ""
-
-#: ../src/wso-wep-ascii.c:138
-msgid "WEP 64/128-bit ASCII"
-msgstr ""
-
-#: ../src/wso-wep-hex.c:135
-msgid "WEP 64/128-bit Hex"
-msgstr ""
+msgid "Create new wireless network"
+msgstr "Gishya urusobe"
 
-#: ../src/wso-wep-passphrase.c:135
-msgid "WEP 128-bit Passphrase"
-msgstr ""
+#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:233
+#, 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"
 
-#: ../src/wso-wpa-eap.c:237
-msgid "PEAP"
-msgstr ""
+#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:238
+#, fuzzy
+msgid "Custom wireless network"
+msgstr "Kugena urusobe"
 
-#: ../src/wso-wpa-eap.c:238
-msgid "TLS"
-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"
 
-#: ../src/wso-wpa-eap.c:239
-msgid "TTLS"
-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"
 
-#: ../src/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/essid.glade.h:4 panel-applet/applet.glade.h:15
+#, fuzzy
+msgid "C_onnect"
+msgstr "Kwihuza"
 
-#: ../src/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 ""
+#: panel-applet/essid.glade.h:5 panel-applet/applet.glade.h:16
+#, fuzzy
+msgid "Connect with encryption enabled"
+msgstr "Na: Bishunzwe: Bikora"
 
-#: ../src/wso-wpa-psk.c:178
-msgid "WPA2 Personal"
-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"
 
-#: ../src/wso-wpa-psk.c:180
-msgid "WPA Personal"
+#: panel-applet/essid.glade.h:8 panel-applet/applet.glade.h:20
+msgid "Wireless _adapter:"
 msgstr ""
 
-#: ../src/eggtrayicon.c:134
-msgid "Orientation"
-msgstr "Icyerekezo"
-
-#: ../src/eggtrayicon.c:135
+#: panel-applet/essid.glade.h:9 panel-applet/applet.glade.h:21
 #, fuzzy
-msgid "The orientation of the tray."
-msgstr "Icyerekezo Bya i"
+msgid "Wireless _network:"
+msgstr "urusobe"
 
-#: ../src/menu-items.c:88
+#: panel-applet/menu-info.c:91
 #, c-format
 msgid "Wired Network (%s)"
 msgstr ""
 
-#: ../src/menu-items.c:91
-#, fuzzy
-msgid "_Wired Network"
-msgstr "urusobe"
+#: panel-applet/menu-info.c:93
+msgid "Wired Network"
+msgstr ""
 
-#: ../src/menu-items.c:162
+#: panel-applet/menu-info.c:166
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/menu-items.c:164
+#: panel-applet/menu-info.c:168
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/menu-items.c:343
+#: panel-applet/menu-info.c:294
 #, fuzzy
 msgid " (invalid Unicode)"
 msgstr "(Sibyo"
 
-#: ../src/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 ""
-
-#: ../src/other-network-dialog.c:358
-#, fuzzy
-msgid "Create new wireless network"
-msgstr "Gishya urusobe"
-
-#: ../src/other-network-dialog.c:359
-#, fuzzy
-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"
-
-#: ../src/other-network-dialog.c:363
-#, fuzzy
-msgid "Create New Wireless Network"
-msgstr "Gishya"
-
-#: ../src/other-network-dialog.c:368
-#, fuzzy
-msgid "Existing wireless network"
-msgstr "Kugena urusobe"
-
-#: ../src/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"
+#: examples/python/systray/eggtrayicon.c:111 panel-applet/eggtrayicon.c:118
+msgid "Orientation"
+msgstr "Icyerekezo"
 
-#: ../src/other-network-dialog.c:371
+#: examples/python/systray/eggtrayicon.c:112 panel-applet/eggtrayicon.c:119
 #, fuzzy
-msgid "Connect to Other Wireless Network"
-msgstr "Kuri urusobe"
+msgid "The orientation of the tray."
+msgstr "Icyerekezo Bya i"
 
-#: ../src/passphrase-dialog.c:215
+# offmgr/source\offapp\intro\intro.hrc:TEXT_DEFAULTABOUT.text
+#: panel-applet/NMWirelessApplet.xml.h:1
 #, fuzzy
-msgid "Error connecting to wireless network"
-msgstr "Kuri urusobe"
-
-#: ../src/passphrase-dialog.c:216
-msgid ""
-"The requested wireless network requires security capabilities unsupported by "
-"your hardware."
-msgstr ""
-
-#: ../src/vpn-password-dialog.c:151
-#: ../src/vpn-password-dialog.c:188
-#, c-format
-msgid "Cannot start VPN connection '%s'"
-msgstr ""
+msgid "_About..."
+msgstr "Ibyerekeye"
 
-#: ../src/vpn-password-dialog.c:154
-#, c-format
-msgid ""
-"Could not find the authentication dialog for VPN connection type '%s'. "
-"Contact your system administrator."
-msgstr ""
-
-#: ../src/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 ""
-
-#: ../src/applet.glade.h:1
+#: panel-applet/applet.glade.h:1
 msgid " "
 msgstr " "
 
-#: ../src/applet.glade.h:2
-#, fuzzy
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
-msgstr "<Uburemere UTSINDAGIYE"
-
-#: ../src/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"
-
-#: ../src/applet.glade.h:8
+#: panel-applet/applet.glade.h:7
 #, fuzzy, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
@@ -524,563 +332,67 @@ msgid ""
 "%s  It will not be completely functional."
 msgstr "<Uburemere UTSINDAGIYE Ingano Kinini OYA"
 
-#: ../src/applet.glade.h:12
+#: panel-applet/applet.glade.h:11
 #, 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."
+"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"
 
-#: ../src/applet.glade.h:15
-msgid "Anonymous Identity:"
-msgstr ""
-
-#: ../src/applet.glade.h:16
-#, fuzzy
-msgid "Authentication:"
-msgstr "Icyerekezo"
-
-#: ../src/applet.glade.h:17
-msgid "Broadcast Address:"
-msgstr ""
-
-#: ../src/applet.glade.h:18
-msgid "CA Certificate File:"
-msgstr ""
-
-#: ../src/applet.glade.h:19
-#, fuzzy
-msgid "C_onnect"
-msgstr "Kwihuza"
-
-#: ../src/applet.glade.h:20
-msgid "Client Certificate File:"
-msgstr ""
-
-#: ../src/applet.glade.h:21
-msgid "Connection Information"
-msgstr ""
-
-#: ../src/applet.glade.h:22
-msgid "Default Route:"
-msgstr ""
-
-#: ../src/applet.glade.h:23
-msgid "Destination Address:"
-msgstr ""
-
-#: ../src/applet.glade.h:24
-msgid "Driver:"
-msgstr ""
-
-#: ../src/applet.glade.h:25
-msgid "EAP Method:"
-msgstr ""
-
-#: ../src/applet.glade.h:26
-msgid "Hardware Address:"
-msgstr ""
-
-#: ../src/applet.glade.h:27
-msgid "IP Address:"
-msgstr ""
-
-#: ../src/applet.glade.h:28
-msgid "Identity:"
-msgstr ""
-
-#: ../src/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
-#: ../src/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
-#: ../src/applet.glade.h:31
-#, fuzzy
-msgid "Key:"
-msgstr "Ubwoko bw'agakandisho"
-
-#: ../src/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 ""
-
-#: ../src/applet.glade.h:37
-msgid ""
-"Open System\n"
-"Shared Key"
-msgstr ""
-
-#: ../src/applet.glade.h:39
-#, fuzzy
-msgid "Other Wireless Network..."
-msgstr "Gishya"
-
-#: ../src/applet.glade.h:40
-msgid "Passphrase:"
-msgstr ""
-
-#: ../src/applet.glade.h:41
-msgid "Password:"
-msgstr ""
-
-#: ../src/applet.glade.h:42
-msgid "Primary DNS:"
-msgstr ""
-
-#: ../src/applet.glade.h:43
-msgid "Private Key File:"
-msgstr ""
-
-#: ../src/applet.glade.h:44
-msgid "Private Key Password:"
-msgstr ""
-
-#: ../src/applet.glade.h:45
-msgid "Secondary DNS:"
-msgstr ""
-
-#: ../src/applet.glade.h:46
-msgid "Select the CA Certificate File"
-msgstr ""
-
-#: ../src/applet.glade.h:47
-msgid "Select the Client Certificate File"
-msgstr ""
-
-#: ../src/applet.glade.h:48
-msgid "Select the Private Key File"
-msgstr ""
-
-#: ../src/applet.glade.h:49
-msgid "Show key"
-msgstr ""
-
-#: ../src/applet.glade.h:50
-msgid "Show passphrase"
-msgstr ""
-
-#: ../src/applet.glade.h:51
-msgid "Show password"
-msgstr ""
-
-#: ../src/applet.glade.h:52
-msgid "Show passwords"
-msgstr ""
-
-#: ../src/applet.glade.h:53
-msgid "Speed:"
-msgstr ""
-
-#: ../src/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
-#: ../src/applet.glade.h:55
+#: panel-applet/applet.glade.h:14
 #, fuzzy
-msgid "Type:"
-msgstr "Ubwoko bw'agakandisho"
-
-#: ../src/applet.glade.h:56
-msgid "User Name:"
-msgstr ""
-
-#: ../src/applet.glade.h:57
-msgid "Wireless Network Key Required"
-msgstr ""
-
-#: ../src/applet.glade.h:58
-msgid "Wireless _adapter:"
-msgstr ""
-
-#: ../src/applet.glade.h:59
-#, fuzzy
-msgid "_Always Trust this Wireless Network"
+msgid "Always Trust this Wireless Network"
 msgstr "iyi"
 
-#: ../src/applet.glade.h:60
-msgid "_Don't remind me again"
-msgstr ""
-
-#: ../src/applet.glade.h:61
-#, fuzzy
-msgid "_Login to Network"
-msgstr "Kuri"
-
-#: ../src/applet.glade.h:62
-msgid "_Network Name:"
-msgstr ""
-
-#: ../src/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 "Add a new VPN connection"
-msgstr "urusobe Ukwihuza"
-
-#: ../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"
+#: panel-applet/applet.glade.h:17
+msgid "Don't remind me again"
 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
+# crashrep/source\all\crashrep.lng:%OK_BUTTON%.text
+#: panel-applet/applet.glade.h:23
 #, 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 ""
+msgid "_OK"
+msgstr "YEGO"
 
-#: ../src/nm-netlink-monitor.c:154
+#: 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:405
+#: src/nm-netlink-monitor.c:403
 msgid "operation took too long"
 msgstr ""
 
-#: ../src/nm-netlink-monitor.c:502
+#: src/nm-netlink-monitor.c:500
 #, fuzzy
 msgid "received data from wrong type of sender"
 msgstr "BYAKIRIWE Ibyatanzwe Bivuye Ubwoko Bya Uwohereza"
 
-#: ../src/nm-netlink-monitor.c:515
+#: src/nm-netlink-monitor.c:513
 #, fuzzy
 msgid "received data from unexpected sender"
 msgstr "BYAKIRIWE Ibyatanzwe Bivuye Uwohereza"
 
-#: ../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 ""
-
-#: ../src/applet-dbus-devices.c:898
-#, fuzzy, c-format
-msgid "You are now connected to the Ad-Hoc wireless network '%s'."
-msgstr "Kuri urusobe"
-
-#: ../src/applet-dbus-devices.c:903
-#, fuzzy, c-format
-msgid "You are now connected to the wireless network '%s'."
-msgstr "Kuri urusobe"
-
-#: ../src/applet-dbus-devices.c:910
-#, fuzzy
-msgid "You are now connected to the wired network."
-msgstr "Kuri a urusobe"
-
-#: ../src/applet-dbus-devices.c:916
-#, fuzzy
-msgid "Connection Established"
-msgstr "Na: Bishunzwe: Bikora"
-
-#: ../src/applet-dbus-devices.c:959
-msgid "Disconnected"
-msgstr ""
-
-#: ../src/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"
+#: src/nm-netlink-monitor.c:535
+#, fuzzy, c-format
+msgid "%s"
+msgstr "%s"
 
+#: src/nm-netlink-monitor.c:644
 #, fuzzy
-#~ msgid "Always Trust this Wireless Network"
-#~ msgstr "iyi"
+msgid "too much data was sent over socket and some of it was lost"
+msgstr "Ibyatanzwe Yoherejwe: KURI Na Bya"
diff --git a/po/sk.po b/po/sk.po
index 9df97b14..e47a6ea2 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -3,14 +3,14 @@
 # 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.2.1 2006/05/29 16:58:09 utx Exp $
+# $Id: sk.po,v 1.47 2006/10/15 22:29:21 marcel Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-29 18:33+0200\n"
-"PO-Revision-Date: 2006-01-19 00:00+0100\n"
+"POT-Creation-Date: 2006-10-16 00:28+0200\n"
+"PO-Revision-Date: 2006-10-16 00:29+0200\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "MIME-Version: 1.0\n"
@@ -18,75 +18,95 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural= (n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
 
-#: ../src/applet-compat.c:171 ../src/applet-dbus-info.c:919
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:926
 #, c-format
 msgid "Passphrase for wireless network %s"
 msgstr "Heslo pre bezdrôtovú sieť %s"
 
-#: ../src/applet-dbus.c:265
+#: ../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."
 
-#: ../src/applet-dbus.c:270
+#: ../gnome/applet/applet-dbus.c:270
 msgid "Connection to the wired network failed."
 msgstr "Pripájanie k drôtovej sieti zlyhalo."
 
-#: ../src/applet.c:184
-#, fuzzy
+#: ../gnome/applet/applet.c:187
 msgid "Error displaying connection information:"
-msgstr "Chyba pri zobrazovaní informácií o spojení: "
+msgstr "Chyba pri zobrazovaní informácií o spojení:"
 
-#: ../src/applet.c:202
+#: ../gnome/applet/applet.c:205
 msgid "Could not find some required resources (the glade file)!"
 msgstr "Nepodarilo sa nájsť niektoré vyžadované zdroje (súbor glade)!"
 
-#: ../src/applet.c:213
+#: ../gnome/applet/applet.c:216
 msgid "No active connections!"
 msgstr "Bez aktívnych sieťových spojení!"
 
-#: ../src/applet.c:234
+#: ../gnome/applet/applet.c:234
+#, c-format
+msgid "%d Mb/s"
+msgstr "%d Mb/s"
+
+#: ../gnome/applet/applet.c:237
 #, c-format
 msgid "Wired Ethernet (%s)"
 msgstr "Drôtový ethernet (%s)"
 
-#: ../src/applet.c:236
+#: ../gnome/applet/applet.c:239
 #, c-format
 msgid "Wireless Ethernet (%s)"
 msgstr "Bezdrôtový ethernet (%s)"
 
-#: ../src/applet.c:337 ../src/applet.c:362
+#: ../gnome/applet/applet.c:245
+msgid "Unknown"
+msgstr "Neznáme"
+
+#: ../gnome/applet/applet.c:335 ../gnome/applet/applet.c:361
 msgid "NetworkManager Applet"
 msgstr "Applet NetworkManager"
 
-#: ../src/applet.c:339 ../src/applet.c:364
-msgid "Copyright © 2004-2005 Red Hat, Inc."
-msgstr "Autorské práva © 2004-2005 Red Hat, Inc."
+#: ../gnome/applet/applet.c:337
+msgid ""
+"Copyright © 2004-2006 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+msgstr ""
+"Autorské práva © 2004-2006 Red Hat, Inc.\n"
+"Autorské práva © 2005-2006 Novell, Inc."
 
-#: ../src/applet.c:340 ../src/applet.c:365
+#: ../gnome/applet/applet.c:339 ../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í."
 
-#: ../src/applet.c:343 ../src/applet.c:370
+#: ../gnome/applet/applet.c:342 ../gnome/applet/applet.c:369
 msgid "translator-credits"
 msgstr "Marcel Telka <marcel@telka.sk>"
 
-#: ../src/applet.c:426
+#: ../gnome/applet/applet.c:363
+msgid ""
+"Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+msgstr ""
+"Autorské práva © 2004-2005 Red Hat, Inc.\n"
+"Autorské práva © 2005-2006 Novell, Inc."
+
+#: ../gnome/applet/applet.c:425
 msgid "VPN Login Failure"
 msgstr "Zlyhanie VPN prihlásenia"
 
-#: ../src/applet.c:427
+#: ../gnome/applet/applet.c:426
 #, 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."
 
-#: ../src/applet.c:431
+#: ../gnome/applet/applet.c:430
 msgid "VPN Start Failure"
 msgstr "Zlyhanie spustenia VPN"
 
-#: ../src/applet.c:432
+#: ../gnome/applet/applet.c:431
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' due to a failure launching the VPN "
@@ -95,25 +115,25 @@ msgstr ""
 "Nepodarilo sa spustiť VPN spojenie '%s' kvôli zlyhaniu spustenia VPN "
 "programu."
 
-#: ../src/applet.c:436 ../src/applet.c:446
+#: ../gnome/applet/applet.c:435 ../gnome/applet/applet.c:445
 msgid "VPN Connect Failure"
 msgstr "Zlyhanie VPN spojenia"
 
-#: ../src/applet.c:437
+#: ../gnome/applet/applet.c:436
 #, 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."
 
-#: ../src/applet.c:441
+#: ../gnome/applet/applet.c:440
 msgid "VPN Configuration Error"
 msgstr "Chyba konfigurácie VPN"
 
-#: ../src/applet.c:442
+#: ../gnome/applet/applet.c:441
 #, c-format
 msgid "The VPN connection '%s' was not correctly configured."
 msgstr "VPN spojenie '%s' nebolo správne nakonfigurované."
 
-#: ../src/applet.c:447
+#: ../gnome/applet/applet.c:446
 #, c-format
 msgid ""
 "Could not start the VPN connection '%s' because the VPN server did not "
@@ -122,13 +142,13 @@ msgstr ""
 "Nepodarilo sa spustiť VPN spojenie '%s', pretože VPN server nevrátil "
 "príslušnú konfiguráciu siete."
 
-#: ../src/applet.c:517
+#: ../gnome/applet/applet.c:516
 msgid "VPN Login Message"
 msgstr "Správa VPN prihlásenia"
 
-#: ../src/applet.c:741 ../src/applet.c:2508
-#: ../src/other-network-dialog.c:453
-#: ../src/passphrase-dialog.c:228
+#: ../gnome/applet/applet.c:740 ../gnome/applet/applet.c:2510
+#: ../gnome/applet/other-network-dialog.c:458
+#: ../gnome/applet/passphrase-dialog.c:228
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
@@ -136,163 +156,168 @@ msgstr ""
 "Applet NetworkManager nemohol nájsť niektoré vyžadované zdroje (súbor glade "
 "nebol nájdený)."
 
-#: ../src/applet.c:753
+#: ../gnome/applet/applet.c:752
 #, 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."
 
-#: ../src/applet.c:761
+#: ../gnome/applet/applet.c:760
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
 msgstr "Sieťové zariadenie \"%s (%s)\" nepodporuje detekciu linky."
 
-#: ../src/applet.c:908
+#. Note to translators: this is used if no essid is known
+#: ../gnome/applet/applet.c:902 ../gnome/applet/applet.c:1100
+msgid "(unknown)"
+msgstr "(neznáme)"
+
+#: ../gnome/applet/applet.c:908
 #, c-format
 msgid "Preparing device %s for the wired network..."
 msgstr "Pripravujem zariadenie %s pre drôtovú sieť..."
 
-#: ../src/applet.c:910
+#: ../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'..."
 
-#: ../src/applet.c:918
+#: ../gnome/applet/applet.c:918
 #, c-format
 msgid "Configuring device %s for the wired network..."
 msgstr "Konfigurácia zariadenia %s pre drôtovú sieť..."
 
-#: ../src/applet.c:920
+#: ../gnome/applet/applet.c:920
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
 msgstr "Pokus o pripojenie k bezdrôtovej sieti '%s'..."
 
-#: ../src/applet.c:928
+#: ../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'..."
 
-#: ../src/applet.c:936 ../src/applet.c:946
+#: ../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..."
 
-#: ../src/applet.c:938 ../src/applet.c:948
+#: ../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'..."
 
-#: ../src/applet.c:956
+#: ../gnome/applet/applet.c:956
 msgid "Finishing connection to the wired network..."
 msgstr "Ukončovanie spojenia k drôtovej sieti..."
 
-#: ../src/applet.c:958
+#: ../gnome/applet/applet.c:958
 #, c-format
 msgid "Finishing connection to the wireless network '%s'..."
 msgstr "Ukončovanie spojenia k bezdrôtovej sieti '%s'..."
 
-#: ../src/applet.c:1075
+#: ../gnome/applet/applet.c:1075
 msgid "NetworkManager is not running"
 msgstr "NetworkManager nebeží"
 
-#: ../src/applet.c:1083 ../src/applet.c:1828
+#: ../gnome/applet/applet.c:1083 ../gnome/applet/applet.c:1828
 msgid "Networking disabled"
 msgstr "Sieť deaktivovaná"
 
-#: ../src/applet.c:1088
+#: ../gnome/applet/applet.c:1088
 msgid "No network connection"
 msgstr "Bez sieťového spojenia"
 
-#: ../src/applet.c:1093
+#: ../gnome/applet/applet.c:1093
 msgid "Wired network connection"
 msgstr "Pripojenie k drôtovej sieti"
 
-#: ../src/applet.c:1097
+#: ../gnome/applet/applet.c:1097
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Pripájané k bezdrôtovej sieti Ad-Hoc"
 
-#: ../src/applet.c:1099
+#: ../gnome/applet/applet.c:1099
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "Bezdrôtové sieťové pripojenie k '%s' (%d%%)"
 
-#: ../src/applet.c:1120
+#: ../gnome/applet/applet.c:1120
 #, c-format
 msgid "VPN connection to '%s'"
 msgstr "VPN spojenie s '%s'"
 
-#: ../src/applet.c:1128
+#: ../gnome/applet/applet.c:1128
 #, c-format
 msgid "VPN connecting to '%s'"
 msgstr "VPN pripájanie k '%s'"
 
-#: ../src/applet.c:1541
+#: ../gnome/applet/applet.c:1541
 msgid "_Connect to Other Wireless Network..."
 msgstr "_Pripojiť sa k inej bezdrôtovej sieti..."
 
-#: ../src/applet.c:1562
+#: ../gnome/applet/applet.c:1562
 msgid "Create _New Wireless Network..."
 msgstr "Vytvoriť _novú bezdrôtovú sieť..."
 
-#: ../src/applet.c:1685
+#: ../gnome/applet/applet.c:1685
 msgid "_VPN Connections"
 msgstr "_VPN spojenia"
 
-#: ../src/applet.c:1730
+#: ../gnome/applet/applet.c:1730
 msgid "_Configure VPN..."
 msgstr "_Konfigurovať VPN..."
 
-#: ../src/applet.c:1734
+#: ../gnome/applet/applet.c:1734
 msgid "_Disconnect VPN..."
 msgstr "_Odpojiť VPN..."
 
-#: ../src/applet.c:1756
+#: ../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
-#: ../src/applet.c:1767
+#: ../gnome/applet/applet.c:1767
 #, c-format
 msgid "Connect to %s..."
 msgstr "Pripojiť k %s..."
 
-#: ../src/applet.c:1773
+#: ../gnome/applet/applet.c:1773
 #, c-format
 msgid "Disconnect from %s..."
 msgstr "Odpojiť od %s..."
 
-#: ../src/applet.c:1822
+#: ../gnome/applet/applet.c:1822
 msgid "No network devices have been found"
 msgstr "Neboli nájdené iné sieťové zariadenia"
 
-#: ../src/applet.c:2014
+#: ../gnome/applet/applet.c:2014
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager nebeží..."
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2170
+#: ../gnome/applet/applet.c:2170
 msgid "Enable _Networking"
 msgstr "Povoliť _sieť"
 
 #. 'Enable Wireless' item
-#: ../src/applet.c:2176
+#: ../gnome/applet/applet.c:2176
 msgid "Enable _Wireless"
 msgstr "Povoliť _bezdrôtové pripojenie"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2182
+#: ../gnome/applet/applet.c:2182
 msgid "Connection _Information"
 msgstr "_Informácie o spojení"
 
 #. Help item
-#: ../src/applet.c:2193
+#: ../gnome/applet/applet.c:2193
 msgid "_Help"
 msgstr "_Pomocník"
 
 #. About item
-#: ../src/applet.c:2202
+#: ../gnome/applet/applet.c:2202
 msgid "_About"
 msgstr "_O programe"
 
-#: ../src/applet.c:2667
+#: ../gnome/applet/applet.c:2669
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
@@ -300,101 +325,94 @@ msgstr ""
 "Applet NetworkManager nemohol nájsť niektoré vyžadované zdroje. Nemôže "
 "pokračovať.\n"
 
-#: ../src/wireless-security-option.c:157
+#: ../gnome/applet/wireless-security-option.c:157
 msgid "Open System"
 msgstr "Otvorený systém"
 
-#: ../src/wireless-security-option.c:160
+#: ../gnome/applet/wireless-security-option.c:160
 msgid "Shared Key"
 msgstr "Zdieľaný kľúč"
 
-#: ../src/wireless-security-option.c:208
-#, fuzzy
+#: ../gnome/applet/wireless-security-option.c:208
 msgid "Automatic (Default)"
-msgstr "TKIP (Predvolené)"
+msgstr "Automatické (Predvolené)"
 
-#: ../src/wireless-security-option.c:215
+#: ../gnome/applet/wireless-security-option.c:215
 msgid "AES-CCMP"
-msgstr "AES CCMP"
+msgstr "AES-CCMP"
 
-#: ../src/wireless-security-option.c:223
-#, fuzzy
+#: ../gnome/applet/wireless-security-option.c:223
 msgid "TKIP"
-msgstr "WPA TKIP"
+msgstr "TKIP"
 
-#: ../src/wireless-security-option.c:231
+#: ../gnome/applet/wireless-security-option.c:231
 msgid "Dynamic WEP"
-msgstr ""
+msgstr "Dynamický WEP"
 
-#: ../src/wso-none.c:53
+#: ../gnome/applet/wso-none.c:53
 msgid "None"
 msgstr "Nič"
 
-#: ../src/wso-wep-ascii.c:138
-#, fuzzy
+#: ../gnome/applet/wso-wep-ascii.c:138
 msgid "WEP 64/128-bit ASCII"
-msgstr "WEP 40/128 bitov v ASCII"
+msgstr "WEP 64/128 bitov v ASCII"
 
-#: ../src/wso-wep-hex.c:135
-#, fuzzy
+#: ../gnome/applet/wso-wep-hex.c:135
 msgid "WEP 64/128-bit Hex"
-msgstr "WEP 40/128 bitov v šestnástkovej sústave"
+msgstr "WEP 64/128 bitov v šestnástkovej sústave"
 
-#: ../src/wso-wep-passphrase.c:135
-#, fuzzy
+#: ../gnome/applet/wso-wep-passphrase.c:135
 msgid "WEP 128-bit Passphrase"
-msgstr "WEP heslo:"
+msgstr "WEP 128 bitové heslo"
 
-#: ../src/wso-wpa-eap.c:237
+#: ../gnome/applet/wso-wpa-eap.c:237
 msgid "PEAP"
-msgstr ""
+msgstr "PEAP"
 
-#: ../src/wso-wpa-eap.c:238
+#: ../gnome/applet/wso-wpa-eap.c:238
 msgid "TLS"
-msgstr ""
+msgstr "TLS"
 
-#: ../src/wso-wpa-eap.c:239
+#: ../gnome/applet/wso-wpa-eap.c:239
 msgid "TTLS"
-msgstr ""
+msgstr "TTLS"
 
-#: ../src/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
-#: ../src/nm-ap-security-wpa-eap.c:116
+#: ../gnome/applet/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:93
+#: ../src/nm-ap-security-wpa-eap.c:117
 msgid "WPA2 Enterprise"
-msgstr ""
+msgstr "Podnikové WPA2"
 
-#: ../src/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
-#: ../src/nm-ap-security-wpa-eap.c:121
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:95
+#: ../src/nm-ap-security-wpa-eap.c:122
 msgid "WPA Enterprise"
-msgstr ""
+msgstr "Podnikové WPA"
 
-#: ../src/wso-wpa-psk.c:178
-#, fuzzy
+#: ../gnome/applet/wso-wpa-psk.c:178
 msgid "WPA2 Personal"
-msgstr "Osobné WPA/WPA2"
+msgstr "Osobné WPA2"
 
-#: ../src/wso-wpa-psk.c:180
-#, fuzzy
+#: ../gnome/applet/wso-wpa-psk.c:180
 msgid "WPA Personal"
-msgstr "Osobné WPA/WPA2"
+msgstr "Osobné WPA"
 
-#: ../src/eggtrayicon.c:134
+#: ../gnome/applet/eggtrayicon.c:134
 msgid "Orientation"
 msgstr "Orientácia"
 
-#: ../src/eggtrayicon.c:135
+#: ../gnome/applet/eggtrayicon.c:135
 msgid "The orientation of the tray."
 msgstr "Orientácia zásobníka."
 
-#: ../src/menu-items.c:88
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Drôtová sieť (%s)"
 
-#: ../src/menu-items.c:91
+#: ../gnome/applet/menu-items.c:91
 msgid "_Wired Network"
 msgstr "_Drôtová sieť"
 
-#: ../src/menu-items.c:162
+#: ../gnome/applet/menu-items.c:162
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
@@ -402,18 +420,18 @@ msgstr[0] "Bezdrôtových sietí (%s)"
 msgstr[1] "Bezdrôtová sieť (%s)"
 msgstr[2] "Bezdrôtové siete (%s)"
 
-#: ../src/menu-items.c:164
+#: ../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"
 
-#: ../src/menu-items.c:343
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr " (neplatný Unikód)"
 
-#: ../src/other-network-dialog.c:352
+#: ../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, "
@@ -422,11 +440,11 @@ msgstr ""
 "Štandardne je názov bezdrôtovej siete nastavený na názov vášho počítača, %s, "
 "bez povoleného šifrovania"
 
-#: ../src/other-network-dialog.c:358
+#: ../gnome/applet/other-network-dialog.c:358
 msgid "Create new wireless network"
 msgstr "Vytvoriť novú bezdrôtovú sieť"
 
-#: ../src/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."
@@ -434,40 +452,41 @@ msgstr ""
 "Zadajte názov a bezpečnostné nastavenia bezdrôtovej siete, ktorú chcete "
 "vytvoriť."
 
-#: ../src/other-network-dialog.c:363
+#: ../gnome/applet/other-network-dialog.c:363
 msgid "Create New Wireless Network"
 msgstr "Vytvoriť _novú bezdrôtovú sieť"
 
-#: ../src/other-network-dialog.c:368
+#: ../gnome/applet/other-network-dialog.c:368
 msgid "Existing wireless network"
 msgstr "Existujúca bezdrôtová sieť"
 
-#: ../src/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 "Zadajte názov bezdrôtovej siete, ku ktorej sa chcete pripojiť."
 
-#: ../src/other-network-dialog.c:371
+#: ../gnome/applet/other-network-dialog.c:371
 msgid "Connect to Other Wireless Network"
 msgstr "_Pripojiť sa k inej bezdrôtovej sieti"
 
-#: ../src/passphrase-dialog.c:215
-#, fuzzy
+#: ../gnome/applet/passphrase-dialog.c:215
 msgid "Error connecting to wireless network"
-msgstr "Existujúca bezdrôtová sieť"
+msgstr "Chyba pri pripájaní bezdrôtovej sieti"
 
-#: ../src/passphrase-dialog.c:216
+#: ../gnome/applet/passphrase-dialog.c:216
 msgid ""
 "The requested wireless network requires security capabilities unsupported by "
 "your hardware."
 msgstr ""
+"Požadované bezdrôtová sieť vyžaduje bezpečnostné vlastnosti nepodporované "
+"vašim hardvérom."
 
-#: ../src/vpn-password-dialog.c:151
-#: ../src/vpn-password-dialog.c:188
+#: ../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'"
 
-#: ../src/vpn-password-dialog.c:154
+#: ../gnome/applet/vpn-password-dialog.c:154
 #, c-format
 msgid ""
 "Could not find the authentication dialog for VPN connection type '%s'. "
@@ -476,7 +495,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."
 
-#: ../src/vpn-password-dialog.c:191
+#: ../gnome/applet/vpn-password-dialog.c:191
 #, c-format
 msgid ""
 "There was a problem launching the authentication dialog for VPN connection "
@@ -485,17 +504,17 @@ msgstr ""
 "Vyskytol sa problém pri spúšťaní dialógového okna overenia totožnosti pre "
 "VPN spojenie typu '%s'. Spojte sa s vašim sprácom systému."
 
-#: ../src/applet.glade.h:1
+#: ../gnome/applet/applet.glade.h:1
 msgid " "
 msgstr " "
 
-#: ../src/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\">Informácie o aktívnom spojení</span>"
 
-#: ../src/applet.glade.h:4
+#: ../gnome/applet/applet.glade.h:4
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
@@ -509,7 +528,7 @@ msgstr ""
 "\n"
 "Heslo alebo šifrovací kľúč je potrebný pre prístup k bezdrôtovej sieti '%s'."
 
-#: ../src/applet.glade.h:8
+#: ../gnome/applet/applet.glade.h:8
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
@@ -520,7 +539,7 @@ msgstr ""
 "\n"
 "%s  Nebude to úplne funkčné."
 
-#: ../src/applet.glade.h:12
+#: ../gnome/applet/applet.glade.h:12
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
@@ -537,77 +556,79 @@ msgstr ""
 "táto bezdrôtová sieť je bezpečná, označte zaškrtávacie pole nižšie a "
 "NetworkManager nebude viac vyžadovať potvrdenie pri ďalších prihláseniach."
 
-#: ../src/applet.glade.h:15
+#: ../gnome/applet/applet.glade.h:15
 msgid "Anonymous Identity:"
-msgstr ""
+msgstr "Anonymná identita:"
 
-#: ../src/applet.glade.h:16
+#: ../gnome/applet/applet.glade.h:16
 msgid "Authentication:"
 msgstr "Overenie totožnosti:"
 
-#: ../src/applet.glade.h:17
+#: ../gnome/applet/applet.glade.h:17
 msgid "Broadcast Address:"
 msgstr "Adresa šírenia:"
 
-#: ../src/applet.glade.h:18
+#: ../gnome/applet/applet.glade.h:18
 msgid "CA Certificate File:"
-msgstr ""
+msgstr "Súbor CA certifikátu:"
 
-#: ../src/applet.glade.h:19
+#: ../gnome/applet/applet.glade.h:19
 msgid "C_onnect"
 msgstr "Prip_ojiť"
 
-#: ../src/applet.glade.h:20
+#: ../gnome/applet/applet.glade.h:20
 msgid "Client Certificate File:"
-msgstr ""
+msgstr "Súbor s certifikátom klienta:"
 
-#: ../src/applet.glade.h:21
+#: ../gnome/applet/applet.glade.h:21
 msgid "Connection Information"
 msgstr "Informácie o spojení"
 
-#: ../src/applet.glade.h:22
+#: ../gnome/applet/applet.glade.h:22
 msgid "Default Route:"
 msgstr "Predvolené smerovanie:"
 
-#: ../src/applet.glade.h:23
+#: ../gnome/applet/applet.glade.h:23
 msgid "Destination Address:"
 msgstr "Cieľová adresa:"
 
-#: ../src/applet.glade.h:24
+#: ../gnome/applet/applet.glade.h:24
 msgid "Driver:"
-msgstr ""
+msgstr "Ovládač:"
 
-#: ../src/applet.glade.h:25
+#: ../gnome/applet/applet.glade.h:25
 msgid "EAP Method:"
-msgstr ""
+msgstr "Metóda EAP:"
 
-#: ../src/applet.glade.h:26
+#: ../gnome/applet/applet.glade.h:26
 msgid "Hardware Address:"
 msgstr "Hardvérová adresa:"
 
-#: ../src/applet.glade.h:27
+#: ../gnome/applet/applet.glade.h:27
 msgid "IP Address:"
 msgstr "IP adresa:"
 
-#: ../src/applet.glade.h:28
+#: ../gnome/applet/applet.glade.h:28
 msgid "Identity:"
-msgstr ""
+msgstr "Identita:"
 
-#: ../src/applet.glade.h:29
+#: ../gnome/applet/applet.glade.h:29
 msgid "Interface:"
 msgstr "Rozhranie:"
 
-#: ../src/applet.glade.h:30
-#, fuzzy
+#: ../gnome/applet/applet.glade.h:30
 msgid "Key Type:"
-msgstr "Typ:"
+msgstr "Typ kľúča:"
+
+#: ../gnome/applet/applet.glade.h:31
+msgid "Key management:"
+msgstr "Správa kľúčov:"
 
-#: ../src/applet.glade.h:31
+#: ../gnome/applet/applet.glade.h:32
 msgid "Key:"
 msgstr "Kľúč:"
 
-#: ../src/applet.glade.h:32
-#, fuzzy
+#: ../gnome/applet/applet.glade.h:33
 msgid ""
 "None\n"
 "WEP 128-bit Passphrase\n"
@@ -615,11 +636,11 @@ msgid ""
 "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"
+"WEP 128 bitové heslo\n"
+"WEP 64/128 bitov v šestnástkovej sústave\n"
+"WEP 64/128 bitov ASCII\n"
 
-#: ../src/applet.glade.h:37
+#: ../gnome/applet/applet.glade.h:38
 msgid ""
 "Open System\n"
 "Shared Key"
@@ -627,114 +648,115 @@ msgstr ""
 "Otvorený systém\n"
 "Zdieľaný kľúč"
 
-#: ../src/applet.glade.h:39
+#: ../gnome/applet/applet.glade.h:40
 msgid "Other Wireless Network..."
 msgstr "Ostatné bezdrôtové siete..."
 
-#: ../src/applet.glade.h:40
+#: ../gnome/applet/applet.glade.h:41
 msgid "Passphrase:"
 msgstr "Heslo:"
 
-#: ../src/applet.glade.h:41
+#: ../gnome/applet/applet.glade.h:42
 msgid "Password:"
 msgstr "Heslo:"
 
-#: ../src/applet.glade.h:42
+#: ../gnome/applet/applet.glade.h:43
 msgid "Primary DNS:"
 msgstr "Primárne DNS:"
 
-#: ../src/applet.glade.h:43
+#: ../gnome/applet/applet.glade.h:44
 msgid "Private Key File:"
-msgstr ""
+msgstr "Súbor súkromného kľúča:"
 
-#: ../src/applet.glade.h:44
+#: ../gnome/applet/applet.glade.h:45
 msgid "Private Key Password:"
-msgstr ""
+msgstr "Heslo súkromného kľúča:"
 
-#: ../src/applet.glade.h:45
+#: ../gnome/applet/applet.glade.h:46
 msgid "Secondary DNS:"
 msgstr "Sekundárne DNS:"
 
-#: ../src/applet.glade.h:46
+#: ../gnome/applet/applet.glade.h:47
 msgid "Select the CA Certificate File"
-msgstr ""
+msgstr "Vybrať súbor s CA certifikátom"
 
-#: ../src/applet.glade.h:47
+#: ../gnome/applet/applet.glade.h:48
 msgid "Select the Client Certificate File"
-msgstr ""
+msgstr "Vybrať súbor s certifikátom klienta"
 
-#: ../src/applet.glade.h:48
+#: ../gnome/applet/applet.glade.h:49
 msgid "Select the Private Key File"
-msgstr ""
+msgstr "Vybrať súbor súbor súkromného kľúča"
 
-#: ../src/applet.glade.h:49
+#: ../gnome/applet/applet.glade.h:50
 msgid "Show key"
-msgstr ""
+msgstr "Zobraziť kľúč"
 
-#: ../src/applet.glade.h:50
-#, fuzzy
+#: ../gnome/applet/applet.glade.h:51
 msgid "Show passphrase"
-msgstr "Heslo:"
+msgstr "Zobraziť heslo"
 
-#: ../src/applet.glade.h:51
-#, fuzzy
+#: ../gnome/applet/applet.glade.h:52
 msgid "Show password"
-msgstr "Heslo:"
+msgstr "Zobraziť heslo"
 
-#: ../src/applet.glade.h:52
-#, fuzzy
+#: ../gnome/applet/applet.glade.h:53
 msgid "Show passwords"
-msgstr "Heslo:"
+msgstr "Zobraziť heslá"
 
-#: ../src/applet.glade.h:53
+#: ../gnome/applet/applet.glade.h:54
 msgid "Speed:"
-msgstr ""
+msgstr "Rýchlosť:"
 
-#: ../src/applet.glade.h:54
+#: ../gnome/applet/applet.glade.h:55
 msgid "Subnet Mask:"
 msgstr "Maska podsiete:"
 
-#: ../src/applet.glade.h:55
+#: ../gnome/applet/applet.glade.h:56
 msgid "Type:"
 msgstr "Typ:"
 
-#: ../src/applet.glade.h:56
+#: ../gnome/applet/applet.glade.h:57
 msgid "User Name:"
 msgstr "Meno používateľa:"
 
-#: ../src/applet.glade.h:57
+#: ../gnome/applet/applet.glade.h:58
 msgid "Wireless Network Key Required"
 msgstr "Je potrebný kľúč bezdrôtovej siete"
 
-#: ../src/applet.glade.h:58
+#: ../gnome/applet/applet.glade.h:59
 msgid "Wireless _adapter:"
 msgstr "Bezdrôtový _adaptér:"
 
-#: ../src/applet.glade.h:59
+#: ../gnome/applet/applet.glade.h:60
 msgid "_Always Trust this Wireless Network"
 msgstr "_Vždy dôverovať tejto bezdrôtovej sieti"
 
-#: ../src/applet.glade.h:60
+#: ../gnome/applet/applet.glade.h:61
 msgid "_Don't remind me again"
 msgstr "_Nepripomínať mi znovu"
 
-#: ../src/applet.glade.h:61
+#: ../gnome/applet/applet.glade.h:62
+msgid "_Fallback on this Network"
+msgstr "_Núdzovo použiť túto sieť"
+
+#: ../gnome/applet/applet.glade.h:63
 msgid "_Login to Network"
 msgstr "_Prihlásenie k sieti"
 
-#: ../src/applet.glade.h:62
+#: ../gnome/applet/applet.glade.h:64
 msgid "_Network Name:"
 msgstr "_Sieťové meno:"
 
-#: ../src/applet.glade.h:63
+#: ../gnome/applet/applet.glade.h:65
 msgid "_Wireless Security:"
 msgstr "Bezdrôtová bezpečnosť:"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:383
+#: ../gnome/vpn-properties/nm-vpn-properties.c:419
 msgid "Cannot add VPN connection"
 msgstr "Nemôžte pridať VPN spojenie"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:385
+#: ../gnome/vpn-properties/nm-vpn-properties.c:421
 msgid ""
 "No suitable VPN software was found on your system. Contact your system "
 "administrator."
@@ -742,11 +764,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:437
+#: ../gnome/vpn-properties/nm-vpn-properties.c:463
 msgid "Cannot import VPN connection"
 msgstr "Nemôžte importovať VPN spojenie"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:439
+#: ../gnome/vpn-properties/nm-vpn-properties.c:465
 #, c-format
 msgid ""
 "Cannot find suitable software for VPN connection type '%s' to import the "
@@ -755,12 +777,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:579
+#: ../gnome/vpn-properties/nm-vpn-properties.c:585
 #, c-format
 msgid "Error retrieving VPN connection '%s'"
 msgstr "Chyba pri získavaní VPN spojenia '%s'"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:582
+#: ../gnome/vpn-properties/nm-vpn-properties.c:588
 #, c-format
 msgid ""
 "Could not find the UI files for VPN connection type '%s'. Contact your "
@@ -769,12 +791,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:739
+#: ../gnome/vpn-properties/nm-vpn-properties.c:732
 #, c-format
 msgid "Delete VPN connection \"%s\"?"
 msgstr "Odstrániť VPN spojenie \"%s\"?"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:742
+#: ../gnome/vpn-properties/nm-vpn-properties.c:735
 #, c-format
 msgid ""
 "All information about the VPN connection \"%s\" will be lost and you may "
@@ -785,16 +807,36 @@ 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:959
+#: ../gnome/vpn-properties/nm-vpn-properties.c:908
 msgid "Unable to load"
 msgstr "Nepodarilo sa načítať"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:961
+#: ../gnome/vpn-properties/nm-vpn-properties.c:910
 msgid "Cannot find some needed resources (the glade file)!"
 msgstr "Nepodarilo sa nájsť niektoré vyžadované zdroje (súbor glade)!"
 
+#. druid_window = GTK_DIALOG (gtk_dialog_new_with_buttons (_("Create VPN Connection"),
+#. NULL,
+#. GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+#. GTK_STOCK_CANCEL,
+#. GTK_RESPONSE_REJECT,
+#. GTK_STOCK_APPLY,
+#. GTK_RESPONSE_ACCEPT,
+#. NULL));
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1055
+msgid "Create VPN Connection"
+msgstr "Vytvoriť VPN spojenie"
+
+#. gtk_container_add (GTK_CONTAINER (druid_window->vbox), GTK_WIDGET(gtk_label_new("Some label")));
+#. gtk_box_pack_start (GTK_BOX (druid_window->vbox), GTK_WIDGET(druid), TRUE,TRUE,0);
+#. gtk_box_pack_start (GTK_BOX (druid_window->vbox), GTK_WIDGET(gtk_label_new("Some label")), TRUE,TRUE,0);
+#. toplevel = gtk_widget_get_toplevel (GTK_WIDGET (druid));
+#. gtk_signal_connect (GTK_OBJECT (toplevel), "delete_event", GTK_SIGNAL_FUNC (vpn_window_close), NULL);
+#. make the druid window modal wrt. our main window
+#. gtk_window_set_modal (druid_window, TRUE);
+#. gtk_window_set_transient_for (GTK_WINDOW(druid_window), GTK_WINDOW (dialog));
 #. Edit dialog
-#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1073
 msgid "Edit VPN Connection"
 msgstr "Upraviť VPN spojenie"
 
@@ -803,68 +845,30 @@ msgid "Add a new VPN connection"
 msgstr "Pridať nové VPN spojenie"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:2
-msgid "Choose which type of VPN connection you wish to create."
-msgstr "Vyberte si, ktorý typ VPN spojenia chcete vytvoriť."
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
-msgid "Connect to:"
-msgstr "Pripojiť k:"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
-msgid "Create VPN Connection"
-msgstr "Vytvoriť VPN spojenie"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
-msgid "Create VPN Connection - 1 of 2"
-msgstr "Vytvoriť VPN spojenie - 1 z 2"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
-msgid "Create VPN Connection - 2 of 2"
-msgstr "Vytvoriť VPN spojenie - 2 z 2"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
 msgid "Delete the selected VPN connection"
 msgstr "Odstrániť vybrané VPN spojenie"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
 msgid "E_xport"
 msgstr "E_xportovať"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:9
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
 msgid "Edit the selected VPN connection"
 msgstr "Upraviť vybrané VPN spojenie"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:10
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
 msgid "Export the VPN settings to a file"
 msgstr "Exportovať VPN nastavenia do súboru"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:11
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
 msgid "Export the selected VPN connection to a file"
 msgstr "Exportovať vybrané VPN spojenie do súboru"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:12
-msgid "Finish Creating VPN Connection"
-msgstr "Dokončiť vytváranie VPN spojenia"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:13
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
 msgid "Manage Virtual Private Network Connections"
 msgstr "Spravovať spojenia Virtuálnych Privátnych Sietí (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 ""
-"Tento asistent vás bude sprevádzať počas vytvárania spojenia k Virtuálnej "
-"Privátnej Sieti (VPN).\n"
-"\n"
-"Bude vyžadovať niektoré informácie, ako sú IP adresy a heslá. Prosím, "
-"vyžiadajte si tieto informácie od vášho správcu systému."
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:17
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
 msgid "VPN Connections"
 msgstr "VPN spojenia"
 
@@ -886,7 +890,7 @@ msgstr "WPA CCMP"
 
 #: ../src/nm-ap-security-wpa-psk.c:54
 msgid "WPA Automatic"
-msgstr ""
+msgstr "Automatické WPA"
 
 #: ../src/nm-ap-security-wpa-psk.c:59
 msgid "WPA2 TKIP"
@@ -898,13 +902,13 @@ msgstr "WPA2 CCMP"
 
 #: ../src/nm-ap-security-wpa-psk.c:63
 msgid "WPA2 Automatic"
-msgstr ""
+msgstr "Automatické WPA2"
 
-#: ../src/nm-ap-security.c:320
+#: ../src/nm-ap-security.c:338
 msgid "none"
 msgstr "nič"
 
-#: ../src/nm-netlink-monitor.c:154
+#: ../src/nm-netlink-monitor.c:174
 #, c-format
 msgid ""
 "unable to create netlink socket for monitoring wired ethernet devices - %s"
@@ -912,7 +916,7 @@ msgstr ""
 "nepodarilo sa vytvoriť sieťovú zásuvku pre sledovanie drôtových ethernet "
 "zariadení - %s"
 
-#: ../src/nm-netlink-monitor.c:172
+#: ../src/nm-netlink-monitor.c:192
 #, c-format
 msgid ""
 "unable to bind to netlink socket for monitoring wired ethernet devices - %s"
@@ -920,92 +924,49 @@ msgstr ""
 "nepodarilo sa pripojiť k sieťovej zásuvke pre sledovanie drôtových ethernet "
 "zariadení - %s"
 
-#: ../src/nm-netlink-monitor.c:405
+#: ../src/nm-netlink-monitor.c:427
 msgid "operation took too long"
 msgstr "operácia trvala veľmi dlho"
 
-#: ../src/nm-netlink-monitor.c:502
+#: ../src/nm-netlink-monitor.c:524
 msgid "received data from wrong type of sender"
 msgstr "prijaté dáta od zlého typu odosielateľa"
 
-#: ../src/nm-netlink-monitor.c:515
+#: ../src/nm-netlink-monitor.c:537
 msgid "received data from unexpected sender"
 msgstr "prijaté dáta od neočakávaného odosielateľa"
 
-#: ../src/nm-netlink-monitor.c:646
+#: ../src/nm-netlink-monitor.c:666
 msgid "too much data was sent over socket and some of it was lost"
 msgstr ""
 "príliš veľa dát bolo odoslaných cez zásuvku a niektoré z nich boli stratené"
 
-#: ../src/nm-netlink-monitor.c:735
+#: ../src/nm-netlink-monitor.c:776
 msgid "error occurred while waiting for data on socket"
 msgstr "vyskytla sa chyba pri čakaní na dáta zo zásuvky"
 
-#: ../src/applet-dbus-devices.c:898
-#, fuzzy, c-format
+#: ../gnome/applet/applet-dbus-devices.c:922
+#, c-format
 msgid "You are now connected to the Ad-Hoc wireless network '%s'."
-msgstr "Pripájané k bezdrôtovej sieti Ad-Hoc"
+msgstr "Teraz ste pripojený k bezdrôtovej sieti '%s' Ad-Hoc."
 
-#: ../src/applet-dbus-devices.c:903
-#, fuzzy, c-format
+#: ../gnome/applet/applet-dbus-devices.c:927
+#, c-format
 msgid "You are now connected to the wireless network '%s'."
-msgstr "Ukončovanie spojenia k bezdrôtovej sieti '%s'..."
+msgstr "Teraz ste pripojený k bezdrôtovej sieti '%s'."
 
-#: ../src/applet-dbus-devices.c:910
-#, fuzzy
+#: ../gnome/applet/applet-dbus-devices.c:934
 msgid "You are now connected to the wired network."
-msgstr "Ukončovanie spojenia k drôtovej sieti..."
+msgstr "Teraz ste pripojený k drôtovej sieti."
 
-#: ../src/applet-dbus-devices.c:916
+#: ../gnome/applet/applet-dbus-devices.c:940
 msgid "Connection Established"
-msgstr ""
+msgstr "Spojenie nadviazané"
 
-#: ../src/applet-dbus-devices.c:959
-#, fuzzy
+#: ../gnome/applet/applet-dbus-devices.c:983
 msgid "Disconnected"
-msgstr "_Odpojiť VPN..."
+msgstr "Odpojené"
 
-#: ../src/applet-dbus-devices.c:960
+#: ../gnome/applet/applet-dbus-devices.c:984
 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"
+msgstr "Sieťové spojenie bolo rozpojené."
diff --git a/po/sl.po b/po/sl.po
new file mode 100644
index 00000000..d42310fb
--- /dev/null
+++ b/po/sl.po
@@ -0,0 +1,918 @@
+# Slovenian translation of NetworkManager.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the NetworkManager package.
+#
+# Matic Žgur <mr.zgur@gmail.com>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: NetworkManager\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-11-17 05:31+0100\n"
+"PO-Revision-Date: 2007-01-09 16:11+0100\n"
+"Last-Translator: Matic Žgur <mr.zgur@gmail.com>\n"
+"Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+"X-Poedit-Language: Slovenian\n"
+
+#: ../gnome/applet/applet-compat.c:171
+#: ../gnome/applet/applet-dbus-info.c:926
+#, c-format
+msgid "Passphrase for wireless network %s"
+msgstr "Šifrirna fraza za brezžično omrežje %s"
+
+#: ../gnome/applet/applet-dbus.c:274
+#, c-format
+msgid "Connection to the wireless network '%s' failed."
+msgstr "Povezava z brezžičnim omrežjem %s ni uspela"
+
+#: ../gnome/applet/applet-dbus.c:279
+msgid "Connection to the wired network failed."
+msgstr "Povezava z žičnim omrežjem ni uspela."
+
+#: ../gnome/applet/applet.c:182
+msgid "Error displaying connection information:"
+msgstr "Napaka pri prikazovanju informacij o povezavi:"
+
+#: ../gnome/applet/applet.c:200
+msgid "Could not find some required resources (the glade file)!"
+msgstr "Ni mogoče najti nekaterih zahtevanih virov (datoteke glade)!"
+
+#: ../gnome/applet/applet.c:210
+msgid "No active connections!"
+msgstr "Ni aktivnih povezav!"
+
+#: ../gnome/applet/applet.c:227
+#, c-format
+msgid "%d Mb/s"
+msgstr "%d Mb/s"
+
+#: ../gnome/applet/applet.c:230
+#, c-format
+msgid "Wired Ethernet (%s)"
+msgstr "Žični eternet (%s)"
+
+#: ../gnome/applet/applet.c:232
+#, c-format
+msgid "Wireless Ethernet (%s)"
+msgstr "Brezžični eternet (%s)"
+
+#: ../gnome/applet/applet.c:238
+msgid "Unknown"
+msgstr "Neznano"
+
+#: ../gnome/applet/applet.c:330
+#: ../gnome/applet/applet.c:357
+msgid "NetworkManager Applet"
+msgstr "Programček NetworkManager"
+
+#: ../gnome/applet/applet.c:332
+msgid ""
+"Copyright © 2004-2006 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+msgstr ""
+"Copyright © 2004-2006 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+
+#: ../gnome/applet/applet.c:334
+#: ../gnome/applet/applet.c:361
+msgid "Notification area applet for managing your network devices and connections."
+msgstr "Programček za območje obvestil za upravljanje vaših mrežnih naprav in povezav."
+
+#: ../gnome/applet/applet.c:337
+#: ../gnome/applet/applet.c:365
+msgid "translator-credits"
+msgstr "Matic Žgur <mr.zgur@gmail.com>"
+
+#: ../gnome/applet/applet.c:359
+msgid ""
+"Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+msgstr ""
+"Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+
+#: ../gnome/applet/applet.c:421
+msgid "VPN Login Failure"
+msgstr "Neuspela prijava VPN"
+
+#: ../gnome/applet/applet.c:422
+#, c-format
+msgid "Could not start the VPN connection '%s' due to a login failure."
+msgstr "Ni mogoče začeti povezave VPN '%s' zaradi neuspele prijave."
+
+#: ../gnome/applet/applet.c:426
+msgid "VPN Start Failure"
+msgstr "Neuspel zagon VPN"
+
+#: ../gnome/applet/applet.c:427
+#, c-format
+msgid "Could not start the VPN connection '%s' due to a failure launching the VPN program."
+msgstr "Ni mogoče začeti povezave VPN '%s' zaradi neuspelega zagona programa VPN."
+
+#: ../gnome/applet/applet.c:431
+#: ../gnome/applet/applet.c:441
+msgid "VPN Connect Failure"
+msgstr "Neuspela povezava VPN"
+
+#: ../gnome/applet/applet.c:432
+#, c-format
+msgid "Could not start the VPN connection '%s' due to a connection error."
+msgstr "Ni mogoče začeti povezave VPN '%s' zaradi napake pri povezavi."
+
+#: ../gnome/applet/applet.c:436
+msgid "VPN Configuration Error"
+msgstr "Napaka nastavitev VPN"
+
+#: ../gnome/applet/applet.c:437
+#, c-format
+msgid "The VPN connection '%s' was not correctly configured."
+msgstr "Povezava VPN '%s' ni pravilno nastavljena."
+
+#: ../gnome/applet/applet.c:442
+#, c-format
+msgid "Could not start the VPN connection '%s' because the VPN server did not return an adequate network configuration."
+msgstr "Ni mogoče začeti povezave VPN '%s', ker strežnik VPN ni vrnil ustreznih nastavitev."
+
+#: ../gnome/applet/applet.c:512
+msgid "VPN Login Message"
+msgstr "Prijavno sporočilo VPN"
+
+#: ../gnome/applet/applet.c:737
+#: ../gnome/applet/applet.c:2635
+#: ../gnome/applet/other-network-dialog.c:458
+#: ../gnome/applet/passphrase-dialog.c:228
+msgid "The NetworkManager Applet could not find some required resources (the glade file was not found)."
+msgstr "Programček NetworkManager ne more najti nekaterih zahtevanih virov (datoteka glade ni bila najdena)."
+
+#: ../gnome/applet/applet.c:749
+#, c-format
+msgid "The network device \"%s (%s)\" does not support wireless scanning."
+msgstr "Omrežna naprava \"%s (%s)\" ne podpira skeniranja brezžičnih omrežij."
+
+#: ../gnome/applet/applet.c:757
+#, c-format
+msgid "The network device \"%s (%s)\" does not support link detection."
+msgstr "Omrežna naprava \"%s (%s)\" ne podpira odkrivanja povezav."
+
+#. Note to translators: this is used if no essid is known
+#: ../gnome/applet/applet.c:905
+#: ../gnome/applet/applet.c:1103
+msgid "(unknown)"
+msgstr "(neznano)"
+
+#: ../gnome/applet/applet.c:911
+#, c-format
+msgid "Preparing device %s for the wired network..."
+msgstr "Pripravljanje naprave %s na žično omrežje ..."
+
+#: ../gnome/applet/applet.c:913
+#, c-format
+msgid "Preparing device %s for the wireless network '%s'..."
+msgstr "Pripravljanje naprave %s na rezžično omrežje '%s' ..."
+
+#: ../gnome/applet/applet.c:921
+#, c-format
+msgid "Configuring device %s for the wired network..."
+msgstr "Nastavljanje naprave %s za žično omrežje ..."
+
+#: ../gnome/applet/applet.c:923
+#, c-format
+msgid "Attempting to join the wireless network '%s'..."
+msgstr "Poskus pridruževanja brezžičnemu omrežju '%s' ..."
+
+#: ../gnome/applet/applet.c:931
+#, c-format
+msgid "Waiting for Network Key for the wireless network '%s'..."
+msgstr "Čakanje na omrežni ključ za brezžično omrežje '%s' ..."
+
+#: ../gnome/applet/applet.c:939
+#: ../gnome/applet/applet.c:949
+msgid "Requesting a network address from the wired network..."
+msgstr "Zahtevanje omrežnega naslova iz žičnega omrežja ..."
+
+#: ../gnome/applet/applet.c:941
+#: ../gnome/applet/applet.c:951
+#, c-format
+msgid "Requesting a network address from the wireless network '%s'..."
+msgstr "Zahtevanje omrežnega naslova iz brezžičnega omrežja '%s' ..."
+
+#: ../gnome/applet/applet.c:959
+msgid "Finishing connection to the wired network..."
+msgstr "Zaključevanje povezave v žično omrežje ..."
+
+#: ../gnome/applet/applet.c:961
+#, c-format
+msgid "Finishing connection to the wireless network '%s'..."
+msgstr "Zaključevanje povezave v brezžično omrežje '%s' ..."
+
+#: ../gnome/applet/applet.c:1078
+msgid "NetworkManager is not running"
+msgstr "NetworkManager ni zagnan"
+
+#: ../gnome/applet/applet.c:1086
+#: ../gnome/applet/applet.c:1843
+msgid "Networking disabled"
+msgstr "Omrežje onemogočeno"
+
+#: ../gnome/applet/applet.c:1091
+msgid "No network connection"
+msgstr "Nobene omrežne povezave"
+
+#: ../gnome/applet/applet.c:1096
+msgid "Wired network connection"
+msgstr "Žična omrežna povezava"
+
+#: ../gnome/applet/applet.c:1100
+msgid "Connected to an Ad-Hoc wireless network"
+msgstr "Povezan v ad-hoc brezžično omrežje"
+
+#: ../gnome/applet/applet.c:1102
+#, c-format
+msgid "Wireless network connection to '%s' (%d%%)"
+msgstr "Brezžična omrežna povezava z '%s' (%d%%)"
+
+#: ../gnome/applet/applet.c:1123
+#, c-format
+msgid "VPN connection to '%s'"
+msgstr "Povezave VPN z '%s'"
+
+#: ../gnome/applet/applet.c:1131
+#, c-format
+msgid "VPN connecting to '%s'"
+msgstr "Povezovanje VPN z '%s'"
+
+#: ../gnome/applet/applet.c:1556
+msgid "_Connect to Other Wireless Network..."
+msgstr "Po_veži se v drugo brezžično omrežje ..."
+
+#: ../gnome/applet/applet.c:1577
+msgid "Create _New Wireless Network..."
+msgstr "_Ustvari novo brezžično omrežje ..."
+
+#: ../gnome/applet/applet.c:1700
+msgid "_VPN Connections"
+msgstr "_Povezave VPN"
+
+#: ../gnome/applet/applet.c:1745
+msgid "_Configure VPN..."
+msgstr "_Nastavi VPN ..."
+
+#: ../gnome/applet/applet.c:1749
+msgid "_Disconnect VPN..."
+msgstr "_Prekini povezavo z VPN ..."
+
+#: ../gnome/applet/applet.c:1771
+msgid "_Dial Up Connections"
+msgstr "_Klicna povezava"
+
+#. 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
+#, c-format
+msgid "Connect to %s..."
+msgstr "Poveži se v %s ..."
+
+#: ../gnome/applet/applet.c:1788
+#, c-format
+msgid "Disconnect from %s..."
+msgstr "Prekini povezavo z %s ..."
+
+#: ../gnome/applet/applet.c:1837
+msgid "No network devices have been found"
+msgstr "Najdena ni bila nobena omrežna naprava"
+
+#: ../gnome/applet/applet.c:2029
+msgid "NetworkManager is not running..."
+msgstr "NetworkManager ni zagnan ..."
+
+#. 'Enable Networking' item
+#: ../gnome/applet/applet.c:2210
+msgid "Enable _Networking"
+msgstr "Omogoči _omrežje"
+
+#. 'Enable Wireless' item
+#: ../gnome/applet/applet.c:2216
+msgid "Enable _Wireless"
+msgstr "Omogoči _brezžično omrežje"
+
+#. 'Connection Information' item
+#: ../gnome/applet/applet.c:2222
+msgid "Connection _Information"
+msgstr "_Informacije o povezavi"
+
+#. Help item
+#: ../gnome/applet/applet.c:2233
+msgid "_Help"
+msgstr "_Pomoč"
+
+#. About item
+#: ../gnome/applet/applet.c:2242
+msgid "_About"
+msgstr "_O Programu"
+
+#: ../gnome/applet/applet.c:2824
+msgid "The NetworkManager applet could not find some required resources.  It cannot continue.\n"
+msgstr "Programček NetworkManager ne more najti nekaterih zahtevanih virov.  Ni mogoče nadaljevati.\n"
+
+#: ../gnome/applet/wireless-security-option.c:157
+msgid "Open System"
+msgstr "Odprti sistem"
+
+#: ../gnome/applet/wireless-security-option.c:160
+msgid "Shared Key"
+msgstr "Deljeni ključ"
+
+#: ../gnome/applet/wireless-security-option.c:208
+msgid "Automatic (Default)"
+msgstr "Samodejno (privzeto)"
+
+#: ../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 "Dinamični WEP"
+
+#: ../gnome/applet/wso-none.c:53
+msgid "None"
+msgstr "Brez"
+
+#: ../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 šifrirna fraza"
+
+#: ../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:93
+#: ../src/nm-ap-security-wpa-eap.c:117
+msgid "WPA2 Enterprise"
+msgstr "Podjetniški WPA2"
+
+#: ../gnome/applet/wso-wpa-eap.c:249
+#: ../src/nm-ap-security-wpa-eap.c:95
+#: ../src/nm-ap-security-wpa-eap.c:122
+msgid "WPA Enterprise"
+msgstr "Podjetniški WPA"
+
+#: ../gnome/applet/wso-wpa-psk.c:178
+msgid "WPA2 Personal"
+msgstr "Osebni WPA2"
+
+#: ../gnome/applet/wso-wpa-psk.c:180
+msgid "WPA Personal"
+msgstr "Osebni WPA"
+
+#: ../gnome/applet/eggtrayicon.c:134
+msgid "Orientation"
+msgstr "Usmerjenost"
+
+#: ../gnome/applet/eggtrayicon.c:135
+msgid "The orientation of the tray."
+msgstr "Usmeritev pladnja."
+
+#: ../gnome/applet/menu-items.c:88
+#, c-format
+msgid "Wired Network (%s)"
+msgstr "Žično omrežje (%s)"
+
+#: ../gnome/applet/menu-items.c:91
+msgid "_Wired Network"
+msgstr "Ž_ično omrežje"
+
+#: ../gnome/applet/menu-items.c:162
+#, c-format
+msgid "Wireless Network (%s)"
+msgid_plural "Wireless Networks (%s)"
+msgstr[0] "Brezžično omrežje (%s)"
+msgstr[1] "Brezžični omrežji (%s)"
+msgstr[2] "Brezžična omrežja (%s)"
+msgstr[3] "Brezžična omrežja (%s)"
+
+#: ../gnome/applet/menu-items.c:164
+msgid "Wireless Network"
+msgid_plural "Wireless Networks"
+msgstr[0] "Brezžično omrežje"
+msgstr[1] "Brezžični omrežji"
+msgstr[2] "Brezžična omrežja"
+msgstr[3] "Brezžična omrežja"
+
+#: ../gnome/applet/menu-items.c:343
+msgid " (invalid Unicode)"
+msgstr " (neveljaven 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 "Privzeto je ime brezžičnega omrežja nastavljeno na ime vašega računalnika, %s, brez omogočenega šifriranja"
+
+#: ../gnome/applet/other-network-dialog.c:358
+msgid "Create new wireless network"
+msgstr "Ustvari novo brezžično omrežje"
+
+#: ../gnome/applet/other-network-dialog.c:359
+msgid "Enter the name and security settings of the wireless network you wish to create."
+msgstr "Vnesite ime in varnostne nastavitve brezžičnega omrežja, ki ga želite ustvariti."
+
+#: ../gnome/applet/other-network-dialog.c:363
+msgid "Create New Wireless Network"
+msgstr "Ustvari novo brezžično omrežje"
+
+#: ../gnome/applet/other-network-dialog.c:368
+msgid "Existing wireless network"
+msgstr "Obstoječe brezžično omrežje"
+
+#: ../gnome/applet/other-network-dialog.c:369
+msgid "Enter the name of the wireless network to which you wish to connect."
+msgstr "Vnesite ime brezžičnega omrežja, v katerega se želite povezati."
+
+#: ../gnome/applet/other-network-dialog.c:371
+msgid "Connect to Other Wireless Network"
+msgstr "Poveži se v drugo brezžično omrežje"
+
+#: ../gnome/applet/passphrase-dialog.c:215
+msgid "Error connecting to wireless network"
+msgstr "Napaka pri povezovanju z brezžičnim omrežjem"
+
+#: ../gnome/applet/passphrase-dialog.c:216
+msgid "The requested wireless network requires security capabilities unsupported by your hardware."
+msgstr "Zahtevano brezžično omrežje zahteva varnostne zmožnosti, ki so nepodprte z vašo strojno opremo."
+
+#: ../gnome/applet/vpn-password-dialog.c:151
+#: ../gnome/applet/vpn-password-dialog.c:188
+#, c-format
+msgid "Cannot start VPN connection '%s'"
+msgstr "Ni mogoče začeti povezave 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 "Ni mogoče najti pogovornega okna za overitev za povezavo VPN vrste '%s'. Kontaktirajte sistemskega administratorja."
+
+#: ../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 "Pri zagonu pogovornega okna za overovitev za povezavo VPN vrste '%s' je prišlo do problema. Kontaktirajte sistemskega administratorja."
+
+#: ../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\">Informacije o aktivni povezavi</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\">Šifrirna fraza, ki jo zahteva brezžično omrežje</span>\n"
+"\n"
+"Za dostop do brezžičnega omrežja '%s' je zahtevana šifrirna fraza ali šifrirni 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 ""
+"<span weight=\"bold\" size=\"larger\">Zmanjšana uporabnost omrežja</span>\n"
+"\n"
+"%s  ne bo popolnoma uporaben."
+
+#: ../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\">Potrditev prijave v brezžično omrežje</span>\n"
+"\n"
+"Izbrali ste prijavo v brezžično omrežje '%s'. Če ste prepričani, da je to brezžično omrežje varno, kliknite potrditveno polje spodaj in NetworkManager ne bo več zahteval potrditve za nadaljnje prijave."
+
+#: ../gnome/applet/applet.glade.h:15
+msgid "Anonymous Identity:"
+msgstr "Anonimna identiteta:"
+
+#: ../gnome/applet/applet.glade.h:16
+msgid "Authentication:"
+msgstr "Overovitev:"
+
+#: ../gnome/applet/applet.glade.h:17
+msgid "Broadcast Address:"
+msgstr "Naslov za razpršeno oddajanje:"
+
+#: ../gnome/applet/applet.glade.h:18
+msgid "CA Certificate File:"
+msgstr "Datoteka overiteljevega (CA) certifikata:"
+
+#: ../gnome/applet/applet.glade.h:19
+msgid "C_onnect"
+msgstr "Po_veži se"
+
+#: ../gnome/applet/applet.glade.h:20
+msgid "Client Certificate File:"
+msgstr "Datoteka odjemalčevega certifikata:"
+
+#: ../gnome/applet/applet.glade.h:21
+msgid "Connection Information"
+msgstr "Informacije o povezavi"
+
+#: ../gnome/applet/applet.glade.h:22
+msgid "Default Route:"
+msgstr "Privzeta smer:"
+
+#: ../gnome/applet/applet.glade.h:23
+msgid "Destination Address:"
+msgstr "Ciljni naslov:"
+
+#: ../gnome/applet/applet.glade.h:24
+msgid "Driver:"
+msgstr "Gonilnik:"
+
+#: ../gnome/applet/applet.glade.h:25
+msgid "EAP Method:"
+msgstr "Metoda EAP:"
+
+#: ../gnome/applet/applet.glade.h:26
+msgid "Hardware Address:"
+msgstr "Naslov strojne opreme:"
+
+#: ../gnome/applet/applet.glade.h:27
+msgid "IP Address:"
+msgstr "IP naslov:"
+
+#: ../gnome/applet/applet.glade.h:28
+msgid "Identity:"
+msgstr "Identiteta:"
+
+#: ../gnome/applet/applet.glade.h:29
+msgid "Interface:"
+msgstr "Vmesnik:"
+
+#: ../gnome/applet/applet.glade.h:30
+msgid "Key Type:"
+msgstr "Vrsta ključa:"
+
+#: ../gnome/applet/applet.glade.h:31
+msgid "Key management:"
+msgstr "Upravljanje s ključi:"
+
+#: ../gnome/applet/applet.glade.h:32
+msgid "Key:"
+msgstr "Ključ:"
+
+#: ../gnome/applet/applet.glade.h:33
+msgid ""
+"None\n"
+"WEP 128-bit Passphrase\n"
+"WEP 64/128-bit Hex\n"
+"WEP 64/128-bit ASCII\n"
+msgstr ""
+"Brez\n"
+"WEP 128-bit šifrirna fraza\n"
+"WEP 64/128-bit Hex\n"
+"WEP 64/128-bit ASCII\n"
+
+#: ../gnome/applet/applet.glade.h:38
+msgid ""
+"Open System\n"
+"Shared Key"
+msgstr ""
+"Odprti sistem\n"
+"Deljeni ključ"
+
+#: ../gnome/applet/applet.glade.h:40
+msgid "Other Wireless Network..."
+msgstr "Drugo brezžično omrežje ..."
+
+#: ../gnome/applet/applet.glade.h:41
+msgid "Passphrase:"
+msgstr "Šifrirna fraza:"
+
+#: ../gnome/applet/applet.glade.h:42
+msgid "Password:"
+msgstr "Geslo:"
+
+#: ../gnome/applet/applet.glade.h:43
+msgid "Primary DNS:"
+msgstr "Primarni DNS;"
+
+#: ../gnome/applet/applet.glade.h:44
+msgid "Private Key File:"
+msgstr "Datoteka zasebnega ključa:"
+
+#: ../gnome/applet/applet.glade.h:45
+msgid "Private Key Password:"
+msgstr "Geslo zasebnega ključa:"
+
+#: ../gnome/applet/applet.glade.h:46
+msgid "Secondary DNS:"
+msgstr "Sekundarni DNS:"
+
+#: ../gnome/applet/applet.glade.h:47
+msgid "Select the CA Certificate File"
+msgstr "Izberite datoteko overiteljevega (CA) certifikata"
+
+#: ../gnome/applet/applet.glade.h:48
+msgid "Select the Client Certificate File"
+msgstr "Izberite datoteko odjemalčevega certifikata"
+
+#: ../gnome/applet/applet.glade.h:49
+msgid "Select the Private Key File"
+msgstr "Izberite datoteko zasebnega ključa"
+
+#: ../gnome/applet/applet.glade.h:50
+msgid "Show key"
+msgstr "Pokaži ključ"
+
+#: ../gnome/applet/applet.glade.h:51
+msgid "Show passphrase"
+msgstr "Pokaži šifrirno frazo"
+
+#: ../gnome/applet/applet.glade.h:52
+msgid "Show password"
+msgstr "Pokaži geslo"
+
+#: ../gnome/applet/applet.glade.h:53
+msgid "Show passwords"
+msgstr "Pokaži gesla"
+
+#: ../gnome/applet/applet.glade.h:54
+msgid "Speed:"
+msgstr "Hitrost:"
+
+#: ../gnome/applet/applet.glade.h:55
+msgid "Subnet Mask:"
+msgstr "Maska podomrežja:"
+
+#: ../gnome/applet/applet.glade.h:56
+msgid "Type:"
+msgstr "Vrsta:"
+
+#: ../gnome/applet/applet.glade.h:57
+msgid "User Name:"
+msgstr "Uporabniško ime:"
+
+#: ../gnome/applet/applet.glade.h:58
+msgid "Wireless Network Key Required"
+msgstr "Zahtevan ključ brezžičnega omrežja"
+
+#: ../gnome/applet/applet.glade.h:59
+msgid "Wireless _adapter:"
+msgstr "Brezžični _vmesnik:"
+
+#: ../gnome/applet/applet.glade.h:60
+msgid "_Always Trust this Wireless Network"
+msgstr "Vedno _zaupaj temu brezžičnemu omrežju"
+
+#: ../gnome/applet/applet.glade.h:61
+msgid "_Don't remind me again"
+msgstr "_Ne spomni me več"
+
+#: ../gnome/applet/applet.glade.h:62
+msgid "_Fallback on this Network"
+msgstr ""
+
+#: ../gnome/applet/applet.glade.h:63
+msgid "_Login to Network"
+msgstr "_Prijava v omrežje"
+
+#: ../gnome/applet/applet.glade.h:64
+msgid "_Network Name:"
+msgstr "_Ime omrežja:"
+
+#: ../gnome/applet/applet.glade.h:65
+msgid "_Wireless Security:"
+msgstr "_Zaščita omrežja:"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:417
+msgid "Cannot add VPN connection"
+msgstr "Ni mogoče dodati povezave VPN"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:419
+msgid "No suitable VPN software was found on your system. Contact your system administrator."
+msgstr "Ustrezna programska oprema za VPN ni bila najdena na vašem sistemu. Kontaktirajte vašega sistemskega administratorja."
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:461
+msgid "Cannot import VPN connection"
+msgstr "Ni mogoče uvoziti povezave VPN"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:463
+#, c-format
+msgid "Cannot find suitable software for VPN connection type '%s' to import the file '%s'. Contact your system administrator."
+msgstr "Ni mogoče najti ustrezne programske opreme za povezavo VPN vrste '%s' za uvoz datoteke '%s'. Kontaktirajte vašega sistemskega administratorja."
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:580
+#, c-format
+msgid "Error retrieving VPN connection '%s'"
+msgstr "Napaka pri pridobivanju povezave VPN '%s'"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:583
+#, c-format
+msgid "Could not find the UI files for VPN connection type '%s'. Contact your system administrator."
+msgstr "Ni mogoče najti datotek uporabniškega vmesnika za povezavo VPN vrste \"%s\". Kontaktirajte vašega sistemskega administratorja."
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:727
+#, c-format
+msgid "Delete VPN connection \"%s\"?"
+msgstr "Ali želite izbrisati povezavo VPN \"%s\"?"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:730
+#, 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 "Vse informacije o povezavi VPN \"%s\" bodo izgubljene in mogoče boste potrebovali vašega sistemskega administratorja, da vam priskrbi informacije za ustvarjanje nove povezave."
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:924
+msgid "Unable to load"
+msgstr "Ni mogoče naložiti"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:926
+msgid "Cannot find some needed resources (the glade file)!"
+msgstr "Ni mogoče najti nekaterih potrebnih virov (datoteke glade)!"
+
+#. druid_window = GTK_DIALOG (gtk_dialog_new_with_buttons (_("Create VPN Connection"),
+#. NULL,
+#. GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+#. GTK_STOCK_CANCEL,
+#. GTK_RESPONSE_REJECT,
+#. GTK_STOCK_APPLY,
+#. GTK_RESPONSE_ACCEPT,
+#. NULL));
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1081
+msgid "Create VPN Connection"
+msgstr "Ustvari povezavo VPN"
+
+#. gtk_container_add (GTK_CONTAINER (druid_window->vbox), GTK_WIDGET(gtk_label_new("Some label")));
+#. gtk_box_pack_start (GTK_BOX (druid_window->vbox), GTK_WIDGET(druid), TRUE,TRUE,0);
+#. gtk_box_pack_start (GTK_BOX (druid_window->vbox), GTK_WIDGET(gtk_label_new("Some label")), TRUE,TRUE,0);
+#. toplevel = gtk_widget_get_toplevel (GTK_WIDGET (druid));
+#. gtk_signal_connect (GTK_OBJECT (toplevel), "delete_event", GTK_SIGNAL_FUNC (vpn_window_close), NULL);
+#. make the druid window modal wrt. our main window
+#. gtk_window_set_modal (druid_window, TRUE);
+#. gtk_window_set_transient_for (GTK_WINDOW(druid_window), GTK_WINDOW (dialog));
+#. Edit dialog
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1099
+msgid "Edit VPN Connection"
+msgstr "Uredi povezavo VPN"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:1
+msgid "Add a new VPN connection"
+msgstr "Dodaj novo povezavo VPN"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:2
+msgid "Delete the selected VPN connection"
+msgstr "Izbriši izbrano povezavo VPN"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
+msgid "E_xport"
+msgstr "I_zvozi"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
+msgid "Edit the selected VPN connection"
+msgstr "Uredi izbrano povezavo VPN"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
+msgid "Export the VPN settings to a file"
+msgstr "Izvozi nastavitve VPN v datoteko"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
+msgid "Export the selected VPN connection to a file"
+msgstr "Izvozi izbrano povezavo VPN v datoteko"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
+msgid "Manage Virtual Private Network Connections"
+msgstr "Upravljanje povezav navideznega zasebnega omrežja (VPN)"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
+msgid "VPN Connections"
+msgstr "Povezave VPN"
+
+#: ../src/nm-ap-security-wep.c:52
+msgid "40-bit WEP"
+msgstr "40-bitni WEP"
+
+#: ../src/nm-ap-security-wep.c:54
+msgid "104-bit WEP"
+msgstr "104-bitni 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 "Samodejni 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 "Samodejni WPA2"
+
+#: ../src/nm-ap-security.c:338
+msgid "none"
+msgstr "brez"
+
+#: ../src/nm-netlink-monitor.c:174
+#, c-format
+msgid "unable to create netlink socket for monitoring wired ethernet devices - %s"
+msgstr "ni mogoče ustvariti netlink vtiča (netlink socket) za nadzor žičnih eternet naprav - %s"
+
+#: ../src/nm-netlink-monitor.c:192
+#, c-format
+msgid "unable to bind to netlink socket for monitoring wired ethernet devices - %s"
+msgstr "ni mogoče vzpostaviti vezi z netlink vtičem (netlink socket) za nadzor žičnih eternet naprav - %s"
+
+#: ../src/nm-netlink-monitor.c:427
+msgid "operation took too long"
+msgstr "operacija je trajala predolgo"
+
+#: ../src/nm-netlink-monitor.c:524
+msgid "received data from wrong type of sender"
+msgstr "prejeti podatki od pošiljatelja napačne vrste"
+
+#: ../src/nm-netlink-monitor.c:537
+msgid "received data from unexpected sender"
+msgstr "prejeti podatki od nepričakovanega pošiljatelja"
+
+#: ../src/nm-netlink-monitor.c:666
+msgid "too much data was sent over socket and some of it was lost"
+msgstr "preveč podatkov je bilo poslano preko vtiča in nekaj se jih je izgubilo"
+
+#: ../src/nm-netlink-monitor.c:776
+msgid "error occurred while waiting for data on socket"
+msgstr "med čakanjem na podatke na vtiču je prišlo do napake"
+
+#: ../gnome/applet/applet-dbus-devices.c:930
+#, c-format
+msgid "You are now connected to the Ad-Hoc wireless network '%s'."
+msgstr "Zdaj ste povezani v ad-hoc brezžično omrežje '%s'."
+
+#: ../gnome/applet/applet-dbus-devices.c:935
+#, c-format
+msgid "You are now connected to the wireless network '%s'."
+msgstr "Zdaj ste povezani z brezžičnim omrežjem '%s'."
+
+#: ../gnome/applet/applet-dbus-devices.c:942
+msgid "You are now connected to the wired network."
+msgstr "Zdaj ste povezani z žičnim omrežjem."
+
+#: ../gnome/applet/applet-dbus-devices.c:948
+msgid "Connection Established"
+msgstr "Povezava vzpostavljena"
+
+#: ../gnome/applet/applet-dbus-devices.c:997
+msgid "Disconnected"
+msgstr "Prekinjena povezava"
+
+#: ../gnome/applet/applet-dbus-devices.c:998
+msgid "The network connection has been disconnected."
+msgstr "Omrežna povezava je bila prekinjena."
+
+#: ../src/nm-ap-security-leap.c:66
+#: ../src/nm-ap-security-leap.c:82
+msgid "LEAP"
+msgstr "LEAP"
+
diff --git a/po/sq.po b/po/sq.po
index f68e1393..b425d1e3 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: 2006-05-29 18:33+0200\n"
+"POT-Creation-Date: 2004-10-19 13:38-0400\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,116 +15,61 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/applet-compat.c:171 ../src/applet-dbus-info.c:919
-#, fuzzy, c-format
-msgid "Passphrase for wireless network %s"
-msgstr "Nuk ekziston asnjë rrjet wireless..."
-
-#: ../src/applet-dbus.c:265
-#, c-format
-msgid "Connection to the wireless network '%s' failed."
-msgstr ""
-
-#: ../src/applet-dbus.c:270
-msgid "Connection to the wired network failed."
-msgstr ""
-
-#: ../src/applet.c:184
-msgid "Error displaying connection information:"
-msgstr ""
-
-#: ../src/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)."
-
-#: ../src/applet.c:213
-#, fuzzy
-msgid "No active connections!"
-msgstr "Lidhjet e rrjetit"
-
-#: ../src/applet.c:234
-#, fuzzy, c-format
-msgid "Wired Ethernet (%s)"
+#: info-daemon/networks.glade:11
+msgid "Modify Wireless Networks"
 msgstr "Ndrysho Rrjetet Wireless"
 
-#: ../src/applet.c:236
-#, fuzzy, c-format
-msgid "Wireless Ethernet (%s)"
-msgstr "Ndrysho Rrjetet Wireless"
+#: info-daemon/networks.glade:92
+msgid "<span weight=\"bold\">Wireless Networks:</span>"
+msgstr "<span weight=\"bold\">Rrjete Wireless:</span>"
 
-#: ../src/applet.c:337 ../src/applet.c:362
-#, fuzzy
-msgid "NetworkManager Applet"
-msgstr "NetworkManager nuk është duke punuar..."
+#: info-daemon/passphrase.glade:9
+msgid "Wireless Network Key Required"
+msgstr "Nevoitet Kyçi i Rrjetit Wireless"
 
-#: ../src/applet.c:339 ../src/applet.c:364
-msgid "Copyright © 2004-2005 Red Hat, Inc."
-msgstr ""
+#: info-daemon/passphrase.glade:52
+msgid "_Login to Network"
+msgstr "_Identifikohu në Rrjet"
 
-#: ../src/applet.c:340 ../src/applet.c:365
+#: info-daemon/passphrase.glade:100
+#, fuzzy
 msgid ""
-"Notification area applet for managing your network devices and connections."
-msgstr ""
-
-#: ../src/applet.c:343 ../src/applet.c:370
-msgid "translator-credits"
-msgstr ""
-
-#: ../src/applet.c:426
-msgid "VPN Login Failure"
-msgstr ""
-
-#: ../src/applet.c:427
-#, c-format
-msgid "Could not start the VPN connection '%s' due to a login failure."
+"<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."
 
-#: ../src/applet.c:431
-msgid "VPN Start Failure"
+#: info-daemon/passphrase.glade:129
+msgid "Key Type:"
 msgstr ""
 
-#: ../src/applet.c:432
-#, c-format
+#: info-daemon/passphrase.glade:150
 msgid ""
-"Could not start the VPN connection '%s' due to a failure launching the VPN "
-"program."
-msgstr ""
-
-#: ../src/applet.c:436 ../src/applet.c:446
-msgid "VPN Connect Failure"
-msgstr ""
-
-#: ../src/applet.c:437
-#, c-format
-msgid "Could not start the VPN connection '%s' due to a connection error."
-msgstr ""
-
-#: ../src/applet.c:441
-msgid "VPN Configuration Error"
+"128-bit Passphrase\n"
+"128-bit Raw Hex Key"
 msgstr ""
 
-#: ../src/applet.c:442
-#, c-format
-msgid "The VPN connection '%s' was not correctly configured."
-msgstr ""
+#: info-daemon/passphrase.glade:180
+#: info-daemon/NetworkManagerInfoPassphraseDialog.c:101
+msgid "Passphrase:"
+msgstr "Fjalëkalimi:"
 
-#: ../src/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/passphrase.glade:208 panel-applet/essid.glade:162
+msgid "*"
+msgstr "*"
 
-#: ../src/applet.c:517
-msgid "VPN Login Message"
+#: info-daemon/NetworkManagerInfoPassphraseDialog.c:104
+msgid "Key:"
 msgstr ""
 
-#: ../src/applet.c:741 ../src/applet.c:2508
-#: ../src/other-network-dialog.c:453
-#: ../src/passphrase-dialog.c:228
+#. Reuse the above string to make the translators less angry.
+#: panel-applet/NMWirelessApplet.c:691 panel-applet/NMWirelessApplet.c:701
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
@@ -132,854 +77,92 @@ msgstr ""
 "Instrumenti NetworkManager nuk arrin të gjejë disa burime të nevojshme (file "
 "glade nuk u gjet)."
 
-#: ../src/applet.c:753
-#, c-format
-msgid "The network device \"%s (%s)\" does not support wireless scanning."
-msgstr ""
-
-#: ../src/applet.c:761
-#, c-format
-msgid "The network device \"%s (%s)\" does not support link detection."
-msgstr ""
-
-#: ../src/applet.c:908
-#, c-format
-msgid "Preparing device %s for the wired network..."
-msgstr ""
-
-#: ../src/applet.c:910
-#, fuzzy, c-format
-msgid "Preparing device %s for the wireless network '%s'..."
-msgstr "Nuk ekziston asnjë rrjet wireless..."
-
-#: ../src/applet.c:918
-#, c-format
-msgid "Configuring device %s for the wired network..."
-msgstr ""
-
-#: ../src/applet.c:920
-#, fuzzy, c-format
-msgid "Attempting to join the wireless network '%s'..."
-msgstr "Nuk ekziston asnjë rrjet wireless..."
-
-#: ../src/applet.c:928
-#, fuzzy, c-format
-msgid "Waiting for Network Key for the wireless network '%s'..."
-msgstr "Nuk ekziston asnjë rrjet wireless..."
-
-#: ../src/applet.c:936 ../src/applet.c:946
-msgid "Requesting a network address from the wired network..."
-msgstr ""
-
-#: ../src/applet.c:938 ../src/applet.c:948
-#, fuzzy, c-format
-msgid "Requesting a network address from the wireless network '%s'..."
-msgstr "Nuk ekziston asnjë rrjet wireless..."
-
-#: ../src/applet.c:956
-msgid "Finishing connection to the wired network..."
-msgstr ""
-
-#: ../src/applet.c:958
-#, fuzzy, c-format
-msgid "Finishing connection to the wireless network '%s'..."
-msgstr "Nuk ekziston asnjë rrjet wireless..."
-
-#: ../src/applet.c:1075
-#, fuzzy
-msgid "NetworkManager is not running"
-msgstr "NetworkManager nuk është duke punuar..."
-
-#: ../src/applet.c:1083 ../src/applet.c:1828
-msgid "Networking disabled"
-msgstr ""
-
-#: ../src/applet.c:1088
-#, fuzzy
-msgid "No network connection"
-msgstr "Lidhjet e rrjetit"
-
-#: ../src/applet.c:1093
+#: panel-applet/NMWirelessApplet.c:716
 #, fuzzy
-msgid "Wired network connection"
-msgstr "Lidhjet e rrjetit"
-
-#: ../src/applet.c:1097
-#, fuzzy
-msgid "Connected to an Ad-Hoc wireless network"
+msgid "Custom wireless network"
 msgstr "Ndrysho Rrjetet Wireless"
 
-#: ../src/applet.c:1099
-#, fuzzy, c-format
-msgid "Wireless network connection to '%s' (%d%%)"
-msgstr "Ndrysho Rrjetet Wireless"
-
-#: ../src/applet.c:1120
-#, c-format
-msgid "VPN connection to '%s'"
-msgstr ""
-
-#: ../src/applet.c:1128
-#, c-format
-msgid "VPN connecting to '%s'"
+#: panel-applet/NMWirelessApplet.c:717
+msgid "Enter the ESSID of the wireless network to which you wish to connect."
 msgstr ""
 
-#: ../src/applet.c:1541
+#: panel-applet/NMWirelessApplet.c:800
 #, fuzzy
-msgid "_Connect to Other Wireless Network..."
+msgid "Other Wireless Networks..."
 msgstr "Rrjete të tjerë Wireless..."
 
-#: ../src/applet.c:1562
-#, fuzzy
-msgid "Create _New Wireless Network..."
-msgstr "Rrjete të tjerë Wireless..."
-
-#: ../src/applet.c:1685
-#, fuzzy
-msgid "_VPN Connections"
-msgstr "Lidhjet e rrjetit"
-
-#: ../src/applet.c:1730
-msgid "_Configure VPN..."
-msgstr ""
-
-#: ../src/applet.c:1734
-msgid "_Disconnect VPN..."
-msgstr ""
-
-#: ../src/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
-#: ../src/applet.c:1767
-#, c-format
-msgid "Connect to %s..."
-msgstr ""
-
-#: ../src/applet.c:1773
-#, c-format
-msgid "Disconnect from %s..."
-msgstr ""
-
-#: ../src/applet.c:1822
+#: panel-applet/NMWirelessApplet.c:911
 msgid "No network devices have been found"
 msgstr ""
 
-#: ../src/applet.c:2014
+#: panel-applet/NMWirelessApplet.c:1028
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager nuk është duke punuar..."
 
-#. 'Enable Networking' item
-#: ../src/applet.c:2170
-#, fuzzy
-msgid "Enable _Networking"
-msgstr "Ndrysho Rrjetet Wireless"
-
-#. 'Enable Wireless' item
-#: ../src/applet.c:2176
-msgid "Enable _Wireless"
-msgstr ""
-
-#. 'Connection Information' item
-#: ../src/applet.c:2182
-msgid "Connection _Information"
-msgstr ""
-
-#. Help item
-#: ../src/applet.c:2193
-msgid "_Help"
-msgstr ""
-
-#. About item
-#: ../src/applet.c:2202
-#, fuzzy
-msgid "_About"
-msgstr "_Informacione..."
-
-#: ../src/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)."
-
-#: ../src/wireless-security-option.c:157
-msgid "Open System"
-msgstr ""
-
-#: ../src/wireless-security-option.c:160
-msgid "Shared Key"
-msgstr ""
-
-#: ../src/wireless-security-option.c:208
-msgid "Automatic (Default)"
-msgstr ""
-
-#: ../src/wireless-security-option.c:215
-msgid "AES-CCMP"
-msgstr ""
-
-#: ../src/wireless-security-option.c:223
-msgid "TKIP"
-msgstr ""
-
-#: ../src/wireless-security-option.c:231
-msgid "Dynamic WEP"
-msgstr ""
-
-#: ../src/wso-none.c:53
-msgid "None"
-msgstr ""
-
-#: ../src/wso-wep-ascii.c:138
-msgid "WEP 64/128-bit ASCII"
-msgstr ""
-
-#: ../src/wso-wep-hex.c:135
-msgid "WEP 64/128-bit Hex"
+#: panel-applet/essid.glade:52
+msgid "C_onnect"
 msgstr ""
 
-#: ../src/wso-wep-passphrase.c:135
+#: panel-applet/essid.glade:131
 #, fuzzy
-msgid "WEP 128-bit Passphrase"
-msgstr "Fjalëkalimi:"
-
-#: ../src/wso-wpa-eap.c:237
-msgid "PEAP"
-msgstr ""
-
-#: ../src/wso-wpa-eap.c:238
-msgid "TLS"
-msgstr ""
-
-#: ../src/wso-wpa-eap.c:239
-msgid "TTLS"
-msgstr ""
-
-#: ../src/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 ""
-
-#: ../src/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 ""
-
-#: ../src/wso-wpa-psk.c:178
-msgid "WPA2 Personal"
-msgstr ""
-
-#: ../src/wso-wpa-psk.c:180
-msgid "WPA Personal"
-msgstr ""
-
-#: ../src/eggtrayicon.c:134
-msgid "Orientation"
-msgstr ""
+msgid "Wireless _Network:"
+msgstr "Ndrysho Rrjetet Wireless"
 
-#: ../src/eggtrayicon.c:135
-msgid "The orientation of the tray."
+#: panel-applet/essid.glade:177
+msgid "Wireless _adapter:"
 msgstr ""
 
-#: ../src/menu-items.c:88
+#: panel-applet/menu-info.c:101
 #, fuzzy, c-format
 msgid "Wired Network (%s)"
 msgstr "Ndrysho Rrjetet Wireless"
 
-#: ../src/menu-items.c:91
+#: panel-applet/menu-info.c:103
 #, fuzzy
-msgid "_Wired Network"
+msgid "Wired Network"
 msgstr "Ndrysho Rrjetet Wireless"
 
-#: ../src/menu-items.c:162
+#: panel-applet/menu-info.c:168
 #, fuzzy, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
 msgstr[0] "Ndrysho Rrjetet Wireless"
 msgstr[1] "Ndrysho Rrjetet Wireless"
 
-#: ../src/menu-items.c:164
+#: panel-applet/menu-info.c:170
 #, fuzzy
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Ndrysho Rrjetet Wireless"
 msgstr[1] "Ndrysho Rrjetet Wireless"
 
-#: ../src/menu-items.c:343
+#: panel-applet/menu-info.c:307
 msgid " (invalid Unicode)"
 msgstr ""
 
-#: ../src/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 ""
-
-#: ../src/other-network-dialog.c:358
-#, fuzzy
-msgid "Create new wireless network"
-msgstr "Nuk ekziston asnjë rrjet wireless..."
-
-#: ../src/other-network-dialog.c:359
-msgid ""
-"Enter the name and security settings of the wireless network you wish to "
-"create."
-msgstr ""
-
-#: ../src/other-network-dialog.c:363
-#, fuzzy
-msgid "Create New Wireless Network"
-msgstr "Ndrysho Rrjetet Wireless"
-
-#: ../src/other-network-dialog.c:368
-#, fuzzy
-msgid "Existing wireless network"
-msgstr "Ndrysho Rrjetet Wireless"
-
-#: ../src/other-network-dialog.c:369
-msgid "Enter the name of the wireless network to which you wish to connect."
-msgstr ""
-
-#: ../src/other-network-dialog.c:371
-#, fuzzy
-msgid "Connect to Other Wireless Network"
-msgstr "Rrjete të tjerë Wireless..."
-
-#: ../src/passphrase-dialog.c:215
-#, fuzzy
-msgid "Error connecting to wireless network"
-msgstr "Ndrysho Rrjetet Wireless"
-
-#: ../src/passphrase-dialog.c:216
-msgid ""
-"The requested wireless network requires security capabilities unsupported by "
-"your hardware."
-msgstr ""
-
-#: ../src/vpn-password-dialog.c:151
-#: ../src/vpn-password-dialog.c:188
-#, c-format
-msgid "Cannot start VPN connection '%s'"
-msgstr ""
-
-#: ../src/vpn-password-dialog.c:154
-#, c-format
-msgid ""
-"Could not find the authentication dialog for VPN connection type '%s'. "
-"Contact your system administrator."
-msgstr ""
-
-#: ../src/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 ""
-
-#: ../src/applet.glade.h:1
-msgid " "
-msgstr " "
-
-#: ../src/applet.glade.h:2
-#, fuzzy
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
-msgstr "<span weight=\"bold\">Rrjete Wireless:</span>"
-
-#: ../src/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."
-
-#: ../src/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 ""
-
-#: ../src/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ë."
-
-#: ../src/applet.glade.h:15
-msgid "Anonymous Identity:"
-msgstr ""
-
-#: ../src/applet.glade.h:16
-msgid "Authentication:"
-msgstr ""
-
-#: ../src/applet.glade.h:17
-msgid "Broadcast Address:"
-msgstr ""
-
-#: ../src/applet.glade.h:18
-msgid "CA Certificate File:"
-msgstr ""
-
-#: ../src/applet.glade.h:19
-msgid "C_onnect"
-msgstr ""
-
-#: ../src/applet.glade.h:20
-msgid "Client Certificate File:"
-msgstr ""
-
-#: ../src/applet.glade.h:21
-msgid "Connection Information"
-msgstr ""
-
-#: ../src/applet.glade.h:22
-msgid "Default Route:"
-msgstr ""
-
-#: ../src/applet.glade.h:23
-msgid "Destination Address:"
-msgstr ""
-
-#: ../src/applet.glade.h:24
-msgid "Driver:"
-msgstr ""
-
-#: ../src/applet.glade.h:25
-msgid "EAP Method:"
-msgstr ""
-
-#: ../src/applet.glade.h:26
-msgid "Hardware Address:"
-msgstr ""
-
-#: ../src/applet.glade.h:27
-msgid "IP Address:"
-msgstr ""
-
-#: ../src/applet.glade.h:28
-msgid "Identity:"
-msgstr ""
-
-#: ../src/applet.glade.h:29
-msgid "Interface:"
-msgstr ""
-
-#: ../src/applet.glade.h:30
-msgid "Key Type:"
-msgstr ""
-
-#: ../src/applet.glade.h:31
-msgid "Key:"
-msgstr ""
-
-#: ../src/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 ""
-
-#: ../src/applet.glade.h:37
-msgid ""
-"Open System\n"
-"Shared Key"
-msgstr ""
-
-#: ../src/applet.glade.h:39
-#, fuzzy
-msgid "Other Wireless Network..."
-msgstr "Rrjete të tjerë Wireless..."
-
-#: ../src/applet.glade.h:40
-msgid "Passphrase:"
-msgstr "Fjalëkalimi:"
-
-#: ../src/applet.glade.h:41
-msgid "Password:"
-msgstr ""
-
-#: ../src/applet.glade.h:42
-msgid "Primary DNS:"
-msgstr ""
-
-#: ../src/applet.glade.h:43
-msgid "Private Key File:"
-msgstr ""
-
-#: ../src/applet.glade.h:44
-msgid "Private Key Password:"
-msgstr ""
-
-#: ../src/applet.glade.h:45
-msgid "Secondary DNS:"
-msgstr ""
-
-#: ../src/applet.glade.h:46
-msgid "Select the CA Certificate File"
-msgstr ""
-
-#: ../src/applet.glade.h:47
-msgid "Select the Client Certificate File"
-msgstr ""
-
-#: ../src/applet.glade.h:48
-msgid "Select the Private Key File"
-msgstr ""
-
-#: ../src/applet.glade.h:49
-msgid "Show key"
-msgstr ""
-
-#: ../src/applet.glade.h:50
-#, fuzzy
-msgid "Show passphrase"
-msgstr "Fjalëkalimi:"
-
-#: ../src/applet.glade.h:51
-msgid "Show password"
-msgstr ""
-
-#: ../src/applet.glade.h:52
-msgid "Show passwords"
-msgstr ""
-
-#: ../src/applet.glade.h:53
-msgid "Speed:"
-msgstr ""
-
-#: ../src/applet.glade.h:54
-msgid "Subnet Mask:"
-msgstr ""
-
-#: ../src/applet.glade.h:55
-msgid "Type:"
-msgstr ""
-
-#: ../src/applet.glade.h:56
-msgid "User Name:"
-msgstr ""
-
-#: ../src/applet.glade.h:57
-msgid "Wireless Network Key Required"
-msgstr "Nevoitet Kyçi i Rrjetit Wireless"
-
-#: ../src/applet.glade.h:58
-msgid "Wireless _adapter:"
-msgstr ""
-
-#: ../src/applet.glade.h:59
-#, fuzzy
-msgid "_Always Trust this Wireless Network"
-msgstr "Ky rrjet wireless është gjithmonë i besueshëm"
-
-#: ../src/applet.glade.h:60
-msgid "_Don't remind me again"
-msgstr ""
-
-#: ../src/applet.glade.h:61
-msgid "_Login to Network"
-msgstr "_Identifikohu në Rrjet"
-
-#: ../src/applet.glade.h:62
-msgid "_Network Name:"
-msgstr ""
-
-#: ../src/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 ""
-
-#: ../src/applet-dbus-devices.c:898
-#, c-format
-msgid "You are now connected to the Ad-Hoc wireless network '%s'."
-msgstr ""
-
-#: ../src/applet-dbus-devices.c:903
-#, fuzzy, c-format
-msgid "You are now connected to the wireless network '%s'."
-msgstr "Nuk ekziston asnjë rrjet wireless..."
-
-#: ../src/applet-dbus-devices.c:910
-msgid "You are now connected to the wired network."
-msgstr ""
-
-#: ../src/applet-dbus-devices.c:916
-msgid "Connection Established"
-msgstr ""
-
-#: ../src/applet-dbus-devices.c:959
-msgid "Disconnected"
+#: examples/python/systray/eggtrayicon.c:111
+msgid "Orientation"
 msgstr ""
 
-#: ../src/applet-dbus-devices.c:960
-msgid "The network connection has been disconnected."
+#: examples/python/systray/eggtrayicon.c:112
+msgid "The orientation of the tray."
 msgstr ""
 
-#~ msgid "Modify Wireless Networks"
-#~ msgstr "Ndrysho Rrjetet Wireless"
-
-#~ msgid "*"
-#~ msgstr "*"
+#~ msgid "There are no wireless networks..."
+#~ msgstr "Nuk ekziston asnjë rrjet wireless..."
 
 #~ 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 13f38e64..e04c0164 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,398 +6,236 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-29 18:33+0200\n"
-"PO-Revision-Date: 2005-05-14 18:47+02:00\n"
+"POT-Creation-Date: 2005-05-13 16:11-0400\n"
+"PO-Revision-Date: 2006-06-02 20:40+0200\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"
 
-#: ../src/applet-compat.c:171 ../src/applet-dbus-info.c:919
-#, fuzzy, c-format
-msgid "Passphrase for wireless network %s"
-msgstr "Направи нову бежичну мрежу"
-
-#: ../src/applet-dbus.c:265
-#, fuzzy, c-format
-msgid "Connection to the wireless network '%s' failed."
-msgstr "Неуспела веза са бежичном мрежом „%s“.\n"
-
-#: ../src/applet-dbus.c:270
-#, fuzzy
-msgid "Connection to the wired network failed."
-msgstr "Неуспела веза са жичаном мрежом.\n"
-
-#: ../src/applet.c:184
-msgid "Error displaying connection information:"
-msgstr ""
+#: examples/python/systray/eggtrayicon.c:111 gnome/applet/eggtrayicon.c:118
+msgid "Orientation"
+msgstr "Усмерење"
 
-#: ../src/applet.c:202
-#, fuzzy
-msgid "Could not find some required resources (the glade file)!"
-msgstr ""
-"Аплет Управник мреже није могао да пронађе неке од потребних ресурса (глејд "
-"датотека није пронађена)."
+# Потребан је бољи превод за ово
+#: examples/python/systray/eggtrayicon.c:112 gnome/applet/eggtrayicon.c:119
+msgid "The orientation of the tray."
+msgstr "Усмерење обавештајне зоне."
 
-#: ../src/applet.c:213
-#, fuzzy
-msgid "No active connections!"
-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“ није у домету. Биће коришћена друга бежична мрежа ако је расположива."
 
-#: ../src/applet.c:234
-#, fuzzy, c-format
-msgid "Wired Ethernet (%s)"
-msgstr "Жичана мрежа (%s)"
+#: gnome/applet/applet-dbus.c:573
+#, c-format
+msgid "Connection to the wireless network '%s' failed.\n"
+msgstr "Неуспела веза са бежичном мрежом „%s“.\n"
 
-#: ../src/applet.c:236
-#, fuzzy, c-format
-msgid "Wireless Ethernet (%s)"
-msgstr "Бежична мрежа (%s)"
+#: gnome/applet/applet-dbus.c:578
+msgid "Connection to the wired network failed.\n"
+msgstr "Неуспела веза са жичаном мрежом.\n"
 
-#: ../src/applet.c:337 ../src/applet.c:362
+#: gnome/applet/applet.c:194 gnome/applet/applet.c:212
 msgid "NetworkManager Applet"
 msgstr "Аплет Управник мреже"
 
-#: ../src/applet.c:339 ../src/applet.c:364
-#, fuzzy
-msgid "Copyright © 2004-2005 Red Hat, Inc."
+#: gnome/applet/applet.c:196 gnome/applet/applet.c:214
+msgid "Copyright (C) 2004-2005 Red Hat, Inc."
 msgstr "Copyright (C) 2004-2005 Red Hat, Inc."
 
-#: ../src/applet.c:340 ../src/applet.c:365
+#: gnome/applet/applet.c:197 gnome/applet/applet.c:215
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "Аплет за обавештајну зону за управљање мрежним уређајима и везама."
 
-#: ../src/applet.c:343 ../src/applet.c:370
-msgid "translator-credits"
-msgstr ""
-
-#: ../src/applet.c:426
-msgid "VPN Login Failure"
-msgstr ""
-
-#: ../src/applet.c:427
-#, c-format
-msgid "Could not start the VPN connection '%s' due to a login failure."
-msgstr ""
-
-#: ../src/applet.c:431
-msgid "VPN Start Failure"
-msgstr ""
-
-#: ../src/applet.c:432
+#: gnome/applet/applet.c:280
 #, c-format
 msgid ""
-"Could not start the VPN connection '%s' due to a failure launching the VPN "
-"program."
-msgstr ""
-
-#: ../src/applet.c:436 ../src/applet.c:446
-#, fuzzy
-msgid "VPN Connect Failure"
-msgstr "VPN везе"
-
-#: ../src/applet.c:437
-#, c-format
-msgid "Could not start the VPN connection '%s' due to a connection error."
-msgstr ""
-
-#: ../src/applet.c:441
-msgid "VPN Configuration Error"
-msgstr ""
-
-#: ../src/applet.c:442
-#, c-format
-msgid "The VPN connection '%s' was not correctly configured."
+"<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“"
 
-#: ../src/applet.c:447
+#: gnome/applet/applet.c:341
 #, c-format
 msgid ""
-"Could not start the VPN connection '%s' because the VPN server did not "
-"return an adequate network configuration."
-msgstr ""
-
-#: ../src/applet.c:517
-msgid "VPN Login Message"
+"<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“"
 
-#: ../src/applet.c:741 ../src/applet.c:2508
-#: ../src/other-network-dialog.c:453
-#: ../src/passphrase-dialog.c:228
+#: gnome/applet/applet.c:559 gnome/applet/applet.c:1922
+#: gnome/applet/other-network-dialog.c:315
+#: gnome/applet/passphrase-dialog.c:430
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
-msgstr ""
-"Аплет Управник мреже није могао да пронађе неке од потребних ресурса (глејд "
-"датотека није пронађена)."
+msgstr "Аплет Управник мреже није могао да пронађе неке од потребних ресурса (глејд датотека није пронађена)."
 
-#: ../src/applet.c:753
+#: gnome/applet/applet.c:572
 #, c-format
 msgid "The network device \"%s (%s)\" does not support wireless scanning."
 msgstr "Мрежни уређај „%s (%s)“ не подржава потрагу за бежичним мрежама."
 
-#: ../src/applet.c:761
+#: gnome/applet/applet.c:579
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
 msgstr "Мрежни уређај „%s (%s)“ не подржава откривање везе."
 
-#: ../src/applet.c:908
+#: gnome/applet/applet.c:700
 #, c-format
 msgid "Preparing device %s for the wired network..."
 msgstr "Припрема уређаја %s за жичану мрежу..."
 
-#: ../src/applet.c:910
+#: gnome/applet/applet.c:702
 #, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
 msgstr "Припрема уређаја %s за бежичну мрежу „%s“..."
 
-#: ../src/applet.c:918
+#: gnome/applet/applet.c:709
 #, c-format
 msgid "Configuring device %s for the wired network..."
 msgstr "Подешавање уређаја %s за бежичну мрежу..."
 
-#: ../src/applet.c:920
+#: gnome/applet/applet.c:711
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
 msgstr "Покушај приступа бежичној мрежи „%s“..."
 
-#: ../src/applet.c:928
+#: gnome/applet/applet.c:718
 #, c-format
 msgid "Waiting for Network Key for the wireless network '%s'..."
 msgstr "Чекање на мрежни кључ за бежичну мрежу „%s“..."
 
-#: ../src/applet.c:936 ../src/applet.c:946
+#: gnome/applet/applet.c:725 gnome/applet/applet.c:734
 msgid "Requesting a network address from the wired network..."
 msgstr "Потраживање мрежне адресе за жичану мрежу..."
 
-#: ../src/applet.c:938 ../src/applet.c:948
+#: gnome/applet/applet.c:727 gnome/applet/applet.c:736
 #, c-format
 msgid "Requesting a network address from the wireless network '%s'..."
 msgstr "Потраживање мрежне адресе за бежичну мрежу „%s“..."
 
-#: ../src/applet.c:956
+#: gnome/applet/applet.c:743
 msgid "Finishing connection to the wired network..."
 msgstr "Обустављање везе са жичаном мрежом..."
 
-#: ../src/applet.c:958
+#: gnome/applet/applet.c:745
 #, c-format
 msgid "Finishing connection to the wireless network '%s'..."
 msgstr "Обустављање везе са бежичном мрежом „%s“..."
 
-#: ../src/applet.c:1075
+#: gnome/applet/applet.c:791
 msgid "NetworkManager is not running"
 msgstr "Управљач мреже није покренут"
 
-#: ../src/applet.c:1083 ../src/applet.c:1828
-msgid "Networking disabled"
-msgstr ""
-
-#: ../src/applet.c:1088
+#: gnome/applet/applet.c:802
 msgid "No network connection"
 msgstr "Нема мрежних веза"
 
-#: ../src/applet.c:1093
+#: gnome/applet/applet.c:809
 msgid "Wired network connection"
-msgstr "Бежична мрежна веза"
+msgstr "Жична мрежна веза"
 
 # FIXME Ад-хок
-#: ../src/applet.c:1097
+#: gnome/applet/applet.c:816
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Повезан са ад-хок бежичном мрежом"
 
-#: ../src/applet.c:1099
+#: gnome/applet/applet.c:830
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "Бежична мрежна веза са „%s“ (%d%%)"
 
-#: ../src/applet.c:1120
-#, fuzzy, c-format
-msgid "VPN connection to '%s'"
-msgstr "VPN везе"
-
-#: ../src/applet.c:1128
-#, fuzzy, c-format
-msgid "VPN connecting to '%s'"
-msgstr "VPN везе"
-
-#: ../src/applet.c:1541
-#, fuzzy
-msgid "_Connect to Other Wireless Network..."
+#: gnome/applet/applet.c:1181
+msgid "Other Wireless Networks..."
 msgstr "Остале бежичне мреже..."
 
-#: ../src/applet.c:1562
-#, fuzzy
-msgid "Create _New Wireless Network..."
+#: gnome/applet/applet.c:1202
+msgid "Create new Wireless Network..."
 msgstr "Направи нову бежичну мрежу..."
 
-#: ../src/applet.c:1685
-#, fuzzy
-msgid "_VPN Connections"
-msgstr "VPN везе"
-
-#: ../src/applet.c:1730
-msgid "_Configure VPN..."
-msgstr ""
-
-#: ../src/applet.c:1734
-#, fuzzy
-msgid "_Disconnect VPN..."
-msgstr "Искључи VPN..."
-
-#: ../src/applet.c:1756
-#, fuzzy
-msgid "_Dial Up Connections"
+#: gnome/applet/applet.c:1315
+msgid "VPN Connections"
 msgstr "VPN везе"
 
-#. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
-#: ../src/applet.c:1767
-#, fuzzy, c-format
-msgid "Connect to %s..."
-msgstr "Искључи VPN..."
-
-#: ../src/applet.c:1773
-#, fuzzy, c-format
-msgid "Disconnect from %s..."
+#: gnome/applet/applet.c:1337
+msgid "Disconnect VPN..."
 msgstr "Искључи VPN..."
 
-#: ../src/applet.c:1822
+#: gnome/applet/applet.c:1366
 msgid "No network devices have been found"
 msgstr "Није пронађен ниједан мрежни уређај"
 
-#: ../src/applet.c:2014
+#: gnome/applet/applet.c:1529
 msgid "NetworkManager is not running..."
 msgstr "Управљач мрежом није покренут..."
 
-#. 'Enable Networking' item
-#: ../src/applet.c:2170
-msgid "Enable _Networking"
-msgstr ""
+#: gnome/applet/applet.c:1599 gnome/applet/applet.c:1647
+msgid "Pause Wireless Scanning"
+msgstr "Обустави тражење бежичне мреже"
 
-#. 'Enable Wireless' item
-#: ../src/applet.c:2176
-msgid "Enable _Wireless"
-msgstr ""
+#: gnome/applet/applet.c:1604
+msgid "Resume Wireless Scanning"
+msgstr "Настави тражење бежичне мреже"
 
-#. 'Connection Information' item
-#: ../src/applet.c:2182
-msgid "Connection _Information"
-msgstr ""
+#: gnome/applet/applet.c:1614 gnome/applet/applet.c:1653
+msgid "Stop All Wireless Devices"
+msgstr "Заустави све бежичне уређаје"
+
+#: gnome/applet/applet.c:1619
+msgid "Start All Wireless Devices"
+msgstr "Покрени све бежичне уређаје"
 
-#. Help item
-#: ../src/applet.c:2193
-#, fuzzy
-msgid "_Help"
+#: gnome/applet/applet.c:1662
+msgid "Help"
 msgstr "Помоћ"
 
-#. About item
-#: ../src/applet.c:2202
-#, fuzzy
-msgid "_About"
+#: gnome/applet/applet.c:1669
+msgid "About"
 msgstr "О програму"
 
-#: ../src/applet.c:2667
+#: gnome/applet/applet.c:2070
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
-msgstr ""
-"Управљач мрежом није успео да пронађе неопходне ресурсе и не може да настави "
-"рад.\n"
-
-#: ../src/wireless-security-option.c:157
-msgid "Open System"
-msgstr ""
-
-#: ../src/wireless-security-option.c:160
-msgid "Shared Key"
-msgstr ""
-
-#: ../src/wireless-security-option.c:208
-msgid "Automatic (Default)"
-msgstr ""
-
-#: ../src/wireless-security-option.c:215
-msgid "AES-CCMP"
-msgstr ""
-
-#: ../src/wireless-security-option.c:223
-msgid "TKIP"
-msgstr ""
-
-#: ../src/wireless-security-option.c:231
-msgid "Dynamic WEP"
-msgstr ""
-
-#: ../src/wso-none.c:53
-msgid "None"
-msgstr ""
-
-#: ../src/wso-wep-ascii.c:138
-msgid "WEP 64/128-bit ASCII"
-msgstr ""
-
-#: ../src/wso-wep-hex.c:135
-msgid "WEP 64/128-bit Hex"
-msgstr ""
-
-#: ../src/wso-wep-passphrase.c:135
-#, fuzzy
-msgid "WEP 128-bit Passphrase"
-msgstr "Лозинка:"
-
-#: ../src/wso-wpa-eap.c:237
-msgid "PEAP"
-msgstr ""
-
-#: ../src/wso-wpa-eap.c:238
-msgid "TLS"
-msgstr ""
-
-#: ../src/wso-wpa-eap.c:239
-msgid "TTLS"
-msgstr ""
-
-#: ../src/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 ""
-
-#: ../src/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 ""
+msgstr "Управљач мрежом није успео да пронађе неопходне ресурсе и не може да настави рад.\n"
 
-#: ../src/wso-wpa-psk.c:178
-msgid "WPA2 Personal"
-msgstr ""
-
-#: ../src/wso-wpa-psk.c:180
-msgid "WPA Personal"
-msgstr ""
-
-#: ../src/eggtrayicon.c:134
-msgid "Orientation"
-msgstr "Усмерење"
-
-# Потребан је бољи превод за ово
-#: ../src/eggtrayicon.c:135
-msgid "The orientation of the tray."
-msgstr "Усмерење обавештајне зоне."
+#: gnome/applet/gtkcellrendererprogress.c:243
+#: gnome/applet/gtkcellrendererprogress.c:301
+#, c-format
+msgid "progress bar label|%d %%"
+msgstr "%d %%"
 
-#: ../src/menu-items.c:88
+#: gnome/applet/menu-items.c:91
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Жичана мрежа (%s)"
 
-#: ../src/menu-items.c:91
-#, fuzzy
-msgid "_Wired Network"
+#: gnome/applet/menu-items.c:93
+msgid "Wired Network"
 msgstr "Жичана мрежа"
 
-#: ../src/menu-items.c:162
+#: gnome/applet/menu-items.c:166
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
@@ -405,104 +243,85 @@ msgstr[0] "Бежична мрежа (%s)"
 msgstr[1] "Бежичне мреже (%s)"
 msgstr[2] "Бежичних мрежа (%s)"
 
-#: ../src/menu-items.c:164
+#: gnome/applet/menu-items.c:168
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Бежична мрежа"
 msgstr[1] "Бежичне мреже"
 msgstr[2] "Бежичне мреже"
 
-#: ../src/menu-items.c:343
+#: gnome/applet/menu-items.c:294
 msgid " (invalid Unicode)"
 msgstr " (неисправан Уникод)"
 
-#: ../src/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: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 "АСКРИ кључ:"
 
-#: ../src/other-network-dialog.c:358
+#: gnome/applet/other-network-dialog.c:154
+#: gnome/applet/passphrase-dialog.c:170
+msgid "Hex Key:"
+msgstr "Хекса кључ:"
+
+#: gnome/applet/other-network-dialog.c:229
 msgid "Create new wireless network"
 msgstr "Направи нову бежичну мрежу"
 
-#: ../src/other-network-dialog.c:359
-#, fuzzy
+#: gnome/applet/other-network-dialog.c:230
 msgid ""
-"Enter the name and security settings of the wireless network you wish to "
+"Enter the ESSID and security settings of the wireless network you wish to "
 "create."
-msgstr ""
-"Унесите ESSID и безбедносне поставке бежичне мреже коју желите да начините."
+msgstr "Унесите ESSID и безбедносне поставке бежичне мреже коју желите да начините."
 
-#: ../src/other-network-dialog.c:363
-#, fuzzy
-msgid "Create New Wireless Network"
-msgstr "Направи нову бежичну мрежу..."
-
-#: ../src/other-network-dialog.c:368
-#, fuzzy
-msgid "Existing wireless network"
+#: gnome/applet/other-network-dialog.c:235
+msgid "Custom wireless network"
 msgstr "Корисничка бежична мрежа"
 
-#: ../src/other-network-dialog.c:369
-#, fuzzy
-msgid "Enter the name of the wireless network to which you wish to connect."
+#: gnome/applet/other-network-dialog.c:236
+msgid "Enter the ESSID of the wireless network to which you wish to connect."
 msgstr "Унесите ESSID бежичне мреже са којом желите да се повежете."
 
-#: ../src/other-network-dialog.c:371
-#, fuzzy
-msgid "Connect to Other Wireless Network"
-msgstr "Остале бежичне мреже..."
+#: gnome/applet/vpn-password-dialog.c:105
+#, c-format
+msgid "You must log in to access the Virtual Private Network '%s'."
+msgstr "Морате бити пријављени како бисте користили виртуелну приватну мрежу „%s“."
 
-# FIXME Ад-хок
-#: ../src/passphrase-dialog.c:215
-#, fuzzy
-msgid "Error connecting to wireless network"
-msgstr "Повезан са ад-хок бежичном мрежом"
+#: gnome/applet/applet.glade.h:1
+msgid " "
+msgstr " "
 
-#: ../src/passphrase-dialog.c:216
-msgid ""
-"The requested wireless network requires security capabilities unsupported by "
-"your hardware."
-msgstr ""
+#: gnome/applet/applet.glade.h:2
+msgid "*"
+msgstr "*"
 
-#: ../src/vpn-password-dialog.c:151
-#: ../src/vpn-password-dialog.c:188
-#, c-format
-msgid "Cannot start VPN connection '%s'"
-msgstr ""
-
-#: ../src/vpn-password-dialog.c:154
-#, c-format
+#: gnome/applet/applet.glade.h:3
 msgid ""
-"Could not find the authentication dialog for VPN connection type '%s'. "
-"Contact your system administrator."
+"128-bit Passphrase (WEP)\n"
+"Ascii Key (WEP)\n"
+"Hex Key (WEP)"
 msgstr ""
+"128-битни кључ (WEP)\n"
+"АСКРИ кључ (WEP)\n"
+"Хекс кључ (WEP)"
 
-#: ../src/vpn-password-dialog.c:191
-#, c-format
+#: gnome/applet/applet.glade.h:6
 msgid ""
-"There was a problem launching the authentication dialog for VPN connection "
-"type '%s'. Contact your system administrator."
+"128-bit passphrase (WEP)\n"
+"Ascii key (WEP)\n"
+"Hex key (WEP)"
 msgstr ""
+"128-битни кључ (WEP)\n"
+"АСКРИ кључ (WEP)\n"
+"Хекс кључ (WEP)"
 
-#: ../src/applet.glade.h:1
-msgid " "
-msgstr " "
-
-#: ../src/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“"
-
-#: ../src/applet.glade.h:4
+#: gnome/applet/applet.glade.h:10
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
@@ -515,614 +334,104 @@ msgstr ""
 "\n"
 " Лозинка или кључ за шифровање су неопходни за приступ бежичној мрежи „%s“."
 
-#: ../src/applet.glade.h:8
+#: gnome/applet/applet.glade.h:14
 #, 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 неће бити сасвим употребљива."
 
-#: ../src/applet.glade.h:12
-#, fuzzy, no-c-format
+#: gnome/applet/applet.glade.h:18
+#, 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."
+"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“. Ако сте сигурни да је ова бежична "
-"мрежа безбедна, обележите кућицу испод и Управник мреже вам више неће "
-"постављати сувишна питања при пријави на ову мрежу."
-
-#: ../src/applet.glade.h:15
-msgid "Anonymous Identity:"
-msgstr ""
-
-#: ../src/applet.glade.h:16
-#, fuzzy
-msgid "Authentication:"
-msgstr "Усмерење"
-
-#: ../src/applet.glade.h:17
-msgid "Broadcast Address:"
-msgstr ""
+"Желите да се пријавите на мрежу „%s“. Ако сте сигурни да је ова бежична мрежа безбедна, обележите кућицу испод и Управник мреже вам више неће постављати сувишна питања при пријави на ову мрежу."
 
-#: ../src/applet.glade.h:18
-msgid "CA Certificate File:"
-msgstr ""
+#: gnome/applet/applet.glade.h:21
+msgid "Always Trust this Wireless Network"
+msgstr "Увек поклони поверење бежичној мрежи"
 
-#: ../src/applet.glade.h:19
+#: gnome/applet/applet.glade.h:22
 msgid "C_onnect"
 msgstr "П_овежи се"
 
-#: ../src/applet.glade.h:20
-msgid "Client Certificate File:"
-msgstr ""
-
-#: ../src/applet.glade.h:21
-msgid "Connection Information"
-msgstr ""
-
-#: ../src/applet.glade.h:22
-msgid "Default Route:"
-msgstr ""
-
-#: ../src/applet.glade.h:23
-msgid "Destination Address:"
-msgstr ""
-
-#: ../src/applet.glade.h:24
-msgid "Driver:"
-msgstr ""
-
-#: ../src/applet.glade.h:25
-msgid "EAP Method:"
-msgstr ""
-
-#: ../src/applet.glade.h:26
-msgid "Hardware Address:"
-msgstr ""
-
-#: ../src/applet.glade.h:27
-msgid "IP Address:"
-msgstr ""
-
-#: ../src/applet.glade.h:28
-msgid "Identity:"
-msgstr ""
+#: gnome/applet/applet.glade.h:23
+msgid "Connect with encryption enabled"
+msgstr "Повежи се и укључи шифровање"
 
-#: ../src/applet.glade.h:29
-msgid "Interface:"
-msgstr ""
+#: gnome/applet/applet.glade.h:24
+msgid "Don't remind me again"
+msgstr "Не подсећај ме више"
 
-#: ../src/applet.glade.h:30
+#: gnome/applet/applet.glade.h:25
 msgid "Key Type:"
 msgstr "Врста кључа:"
 
-#: ../src/applet.glade.h:31
-#, fuzzy
-msgid "Key:"
-msgstr "Хекса кључ:"
-
-#: ../src/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 ""
-
-#: ../src/applet.glade.h:37
-msgid ""
-"Open System\n"
-"Shared Key"
-msgstr ""
-
-#: ../src/applet.glade.h:39
-#, fuzzy
-msgid "Other Wireless Network..."
-msgstr "Остале бежичне мреже..."
-
-#: ../src/applet.glade.h:40
-msgid "Passphrase:"
-msgstr "Лозинка:"
-
-#: ../src/applet.glade.h:41
-msgid "Password:"
-msgstr ""
-
-#: ../src/applet.glade.h:42
-msgid "Primary DNS:"
-msgstr ""
-
-#: ../src/applet.glade.h:43
-msgid "Private Key File:"
-msgstr ""
-
-#: ../src/applet.glade.h:44
-msgid "Private Key Password:"
-msgstr ""
-
-#: ../src/applet.glade.h:45
-msgid "Secondary DNS:"
-msgstr ""
-
-#: ../src/applet.glade.h:46
-msgid "Select the CA Certificate File"
-msgstr ""
-
-#: ../src/applet.glade.h:47
-msgid "Select the Client Certificate File"
-msgstr ""
-
-#: ../src/applet.glade.h:48
-msgid "Select the Private Key File"
-msgstr ""
-
-#: ../src/applet.glade.h:49
-msgid "Show key"
-msgstr ""
-
-#: ../src/applet.glade.h:50
-#, fuzzy
-msgid "Show passphrase"
-msgstr "Лозинка:"
-
-#: ../src/applet.glade.h:51
-msgid "Show password"
-msgstr ""
-
-#: ../src/applet.glade.h:52
-msgid "Show passwords"
-msgstr ""
-
-#: ../src/applet.glade.h:53
-msgid "Speed:"
-msgstr ""
-
-#: ../src/applet.glade.h:54
-msgid "Subnet Mask:"
-msgstr ""
-
-#: ../src/applet.glade.h:55
-#, fuzzy
-msgid "Type:"
+#: gnome/applet/applet.glade.h:26
+msgid "Key type:"
 msgstr "Врста кључа:"
 
-#: ../src/applet.glade.h:56
-msgid "User Name:"
-msgstr ""
-
-#: ../src/applet.glade.h:57
+#: gnome/applet/applet.glade.h:28
 msgid "Wireless Network Key Required"
 msgstr "Потребан је кључ за бежичну мрежу"
 
-#: ../src/applet.glade.h:58
+#: gnome/applet/applet.glade.h:29
 msgid "Wireless _adapter:"
 msgstr "Бежични _уређај:"
 
-#: ../src/applet.glade.h:59
-#, fuzzy
-msgid "_Always Trust this Wireless Network"
-msgstr "Увек поклони поверење бежичној мрежи"
+#: gnome/applet/applet.glade.h:30
+msgid "Wireless _network:"
+msgstr "Бежична _мрежа:"
 
-#: ../src/applet.glade.h:60
-#, fuzzy
-msgid "_Don't remind me again"
-msgstr "Не подсећај ме више"
-
-#: ../src/applet.glade.h:61
+#: gnome/applet/applet.glade.h:31
 msgid "_Login to Network"
 msgstr "_Умрежи се"
 
-#: ../src/applet.glade.h:62
-msgid "_Network Name:"
-msgstr ""
-
-#: ../src/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 ""
-
-#: ../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 ""
+#: gnome/applet/applet.glade.h:32
+msgid "_OK"
+msgstr "_У реду"
 
-#: ../src/nm-netlink-monitor.c:154
+#: 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:405
+#: src/nm-netlink-monitor.c:404
 msgid "operation took too long"
 msgstr "Потрага је предуго трајала"
 
-#: ../src/nm-netlink-monitor.c:502
+#: src/nm-netlink-monitor.c:501
 msgid "received data from wrong type of sender"
 msgstr "Примљени су подаци погрешног типа од пошиљаоца"
 
-#: ../src/nm-netlink-monitor.c:515
+#: src/nm-netlink-monitor.c:514
 msgid "received data from unexpected sender"
 msgstr "Примљени су подаци од неочекиваног пошиљаоца"
 
-#: ../src/nm-netlink-monitor.c:646
+#: src/nm-netlink-monitor.c:536
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: src/nm-netlink-monitor.c:645
 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 Ад-хок
-#: ../src/applet-dbus-devices.c:898
-#, fuzzy, c-format
-msgid "You are now connected to the Ad-Hoc wireless network '%s'."
-msgstr "Повезан са ад-хок бежичном мрежом"
-
-#: ../src/applet-dbus-devices.c:903
-#, fuzzy, c-format
-msgid "You are now connected to the wireless network '%s'."
-msgstr "Обустављање везе са бежичном мрежом „%s“..."
-
-#: ../src/applet-dbus-devices.c:910
-#, fuzzy
-msgid "You are now connected to the wired network."
-msgstr "Обустављање везе са жичаном мрежом..."
-
-#: ../src/applet-dbus-devices.c:916
-#, fuzzy
-msgid "Connection Established"
-msgstr "Повежи се и укључи шифровање"
-
-#: ../src/applet-dbus-devices.c:959
-#, fuzzy
-msgid "Disconnected"
-msgstr "Искључи VPN..."
-
-#: ../src/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 934b4f7f..4904cecd 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -6,398 +6,236 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-29 18:33+0200\n"
-"PO-Revision-Date: 2005-05-14 18:47+02:00\n"
+"POT-Creation-Date: 2005-05-13 16:11-0400\n"
+"PO-Revision-Date: 2006-06-02 20:40+0200\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"
 
-#: ../src/applet-compat.c:171 ../src/applet-dbus-info.c:919
-#, fuzzy, c-format
-msgid "Passphrase for wireless network %s"
-msgstr "Napravi novu bežičnu mrežu"
-
-#: ../src/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"
-
-#: ../src/applet-dbus.c:270
-#, fuzzy
-msgid "Connection to the wired network failed."
-msgstr "Neuspela veza sa žičanom mrežom.\n"
-
-#: ../src/applet.c:184
-msgid "Error displaying connection information:"
-msgstr ""
+#: examples/python/systray/eggtrayicon.c:111 gnome/applet/eggtrayicon.c:118
+msgid "Orientation"
+msgstr "Usmerenje"
 
-#: ../src/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)."
+# 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."
 
-#: ../src/applet.c:213
-#, fuzzy
-msgid "No active connections!"
-msgstr "Nema mrežnih veza"
+#: 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."
 
-#: ../src/applet.c:234
-#, fuzzy, c-format
-msgid "Wired Ethernet (%s)"
-msgstr "Žičana mreža (%s)"
+#: gnome/applet/applet-dbus.c:573
+#, c-format
+msgid "Connection to the wireless network '%s' failed.\n"
+msgstr "Neuspela veza sa bežičnom mrežom „%s“.\n"
 
-#: ../src/applet.c:236
-#, fuzzy, c-format
-msgid "Wireless Ethernet (%s)"
-msgstr "Bežična mreža (%s)"
+#: gnome/applet/applet-dbus.c:578
+msgid "Connection to the wired network failed.\n"
+msgstr "Neuspela veza sa žičanom mrežom.\n"
 
-#: ../src/applet.c:337 ../src/applet.c:362
+#: gnome/applet/applet.c:194 gnome/applet/applet.c:212
 msgid "NetworkManager Applet"
 msgstr "Aplet Upravnik mreže"
 
-#: ../src/applet.c:339 ../src/applet.c:364
-#, fuzzy
-msgid "Copyright © 2004-2005 Red Hat, Inc."
+#: gnome/applet/applet.c:196 gnome/applet/applet.c:214
+msgid "Copyright (C) 2004-2005 Red Hat, Inc."
 msgstr "Copyright (C) 2004-2005 Red Hat, Inc."
 
-#: ../src/applet.c:340 ../src/applet.c:365
+#: gnome/applet/applet.c:197 gnome/applet/applet.c:215
 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."
 
-#: ../src/applet.c:343 ../src/applet.c:370
-msgid "translator-credits"
-msgstr ""
-
-#: ../src/applet.c:426
-msgid "VPN Login Failure"
-msgstr ""
-
-#: ../src/applet.c:427
-#, c-format
-msgid "Could not start the VPN connection '%s' due to a login failure."
-msgstr ""
-
-#: ../src/applet.c:431
-msgid "VPN Start Failure"
-msgstr ""
-
-#: ../src/applet.c:432
+#: gnome/applet/applet.c:280
 #, c-format
 msgid ""
-"Could not start the VPN connection '%s' due to a failure launching the VPN "
-"program."
-msgstr ""
-
-#: ../src/applet.c:436 ../src/applet.c:446
-#, fuzzy
-msgid "VPN Connect Failure"
-msgstr "VPN veze"
-
-#: ../src/applet.c:437
-#, c-format
-msgid "Could not start the VPN connection '%s' due to a connection error."
-msgstr ""
-
-#: ../src/applet.c:441
-msgid "VPN Configuration Error"
-msgstr ""
-
-#: ../src/applet.c:442
-#, c-format
-msgid "The VPN connection '%s' was not correctly configured."
+"<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“"
 
-#: ../src/applet.c:447
+#: gnome/applet/applet.c:341
 #, c-format
 msgid ""
-"Could not start the VPN connection '%s' because the VPN server did not "
-"return an adequate network configuration."
-msgstr ""
-
-#: ../src/applet.c:517
-msgid "VPN Login Message"
+"<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“"
 
-#: ../src/applet.c:741 ../src/applet.c:2508
-#: ../src/other-network-dialog.c:453
-#: ../src/passphrase-dialog.c:228
+#: gnome/applet/applet.c:559 gnome/applet/applet.c:1922
+#: gnome/applet/other-network-dialog.c:315
+#: gnome/applet/passphrase-dialog.c:430
 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)."
 
-#: ../src/applet.c:753
+#: gnome/applet/applet.c:572
 #, 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."
 
-#: ../src/applet.c:761
+#: gnome/applet/applet.c:579
 #, 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."
 
-#: ../src/applet.c:908
+#: gnome/applet/applet.c:700
 #, c-format
 msgid "Preparing device %s for the wired network..."
 msgstr "Priprema uređaja %s za žičanu mrežu..."
 
-#: ../src/applet.c:910
+#: gnome/applet/applet.c:702
 #, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
 msgstr "Priprema uređaja %s za bežičnu mrežu „%s“..."
 
-#: ../src/applet.c:918
+#: gnome/applet/applet.c:709
 #, c-format
 msgid "Configuring device %s for the wired network..."
 msgstr "Podešavanje uređaja %s za bežičnu mrežu..."
 
-#: ../src/applet.c:920
+#: gnome/applet/applet.c:711
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
 msgstr "Pokušaj pristupa bežičnoj mreži „%s“..."
 
-#: ../src/applet.c:928
+#: gnome/applet/applet.c:718
 #, 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“..."
 
-#: ../src/applet.c:936 ../src/applet.c:946
+#: gnome/applet/applet.c:725 gnome/applet/applet.c:734
 msgid "Requesting a network address from the wired network..."
 msgstr "Potraživanje mrežne adrese za žičanu mrežu..."
 
-#: ../src/applet.c:938 ../src/applet.c:948
+#: gnome/applet/applet.c:727 gnome/applet/applet.c:736
 #, 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“..."
 
-#: ../src/applet.c:956
+#: gnome/applet/applet.c:743
 msgid "Finishing connection to the wired network..."
 msgstr "Obustavljanje veze sa žičanom mrežom..."
 
-#: ../src/applet.c:958
+#: gnome/applet/applet.c:745
 #, c-format
 msgid "Finishing connection to the wireless network '%s'..."
 msgstr "Obustavljanje veze sa bežičnom mrežom „%s“..."
 
-#: ../src/applet.c:1075
+#: gnome/applet/applet.c:791
 msgid "NetworkManager is not running"
 msgstr "Upravljač mreže nije pokrenut"
 
-#: ../src/applet.c:1083 ../src/applet.c:1828
-msgid "Networking disabled"
-msgstr ""
-
-#: ../src/applet.c:1088
+#: gnome/applet/applet.c:802
 msgid "No network connection"
 msgstr "Nema mrežnih veza"
 
-#: ../src/applet.c:1093
+#: gnome/applet/applet.c:809
 msgid "Wired network connection"
-msgstr "Bežična mrežna veza"
+msgstr "Žična mrežna veza"
 
 # FIXME Ad-hok
-#: ../src/applet.c:1097
+#: gnome/applet/applet.c:816
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "Povezan sa ad-hok bežičnom mrežom"
 
-#: ../src/applet.c:1099
+#: gnome/applet/applet.c:830
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "Bežična mrežna veza sa „%s“ (%d%%)"
 
-#: ../src/applet.c:1120
-#, fuzzy, c-format
-msgid "VPN connection to '%s'"
-msgstr "VPN veze"
-
-#: ../src/applet.c:1128
-#, fuzzy, c-format
-msgid "VPN connecting to '%s'"
-msgstr "VPN veze"
-
-#: ../src/applet.c:1541
-#, fuzzy
-msgid "_Connect to Other Wireless Network..."
+#: gnome/applet/applet.c:1181
+msgid "Other Wireless Networks..."
 msgstr "Ostale bežične mreže..."
 
-#: ../src/applet.c:1562
-#, fuzzy
-msgid "Create _New Wireless Network..."
+#: gnome/applet/applet.c:1202
+msgid "Create new Wireless Network..."
 msgstr "Napravi novu bežičnu mrežu..."
 
-#: ../src/applet.c:1685
-#, fuzzy
-msgid "_VPN Connections"
-msgstr "VPN veze"
-
-#: ../src/applet.c:1730
-msgid "_Configure VPN..."
-msgstr ""
-
-#: ../src/applet.c:1734
-#, fuzzy
-msgid "_Disconnect VPN..."
-msgstr "Isključi VPN..."
-
-#: ../src/applet.c:1756
-#, fuzzy
-msgid "_Dial Up Connections"
+#: gnome/applet/applet.c:1315
+msgid "VPN Connections"
 msgstr "VPN veze"
 
-#. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
-#: ../src/applet.c:1767
-#, fuzzy, c-format
-msgid "Connect to %s..."
-msgstr "Isključi VPN..."
-
-#: ../src/applet.c:1773
-#, fuzzy, c-format
-msgid "Disconnect from %s..."
+#: gnome/applet/applet.c:1337
+msgid "Disconnect VPN..."
 msgstr "Isključi VPN..."
 
-#: ../src/applet.c:1822
+#: gnome/applet/applet.c:1366
 msgid "No network devices have been found"
 msgstr "Nije pronađen nijedan mrežni uređaj"
 
-#: ../src/applet.c:2014
+#: gnome/applet/applet.c:1529
 msgid "NetworkManager is not running..."
 msgstr "Upravljač mrežom nije pokrenut..."
 
-#. 'Enable Networking' item
-#: ../src/applet.c:2170
-msgid "Enable _Networking"
-msgstr ""
+#: gnome/applet/applet.c:1599 gnome/applet/applet.c:1647
+msgid "Pause Wireless Scanning"
+msgstr "Obustavi traženje bežične mreže"
 
-#. 'Enable Wireless' item
-#: ../src/applet.c:2176
-msgid "Enable _Wireless"
-msgstr ""
+#: gnome/applet/applet.c:1604
+msgid "Resume Wireless Scanning"
+msgstr "Nastavi traženje bežične mreže"
 
-#. 'Connection Information' item
-#: ../src/applet.c:2182
-msgid "Connection _Information"
-msgstr ""
+#: gnome/applet/applet.c:1614 gnome/applet/applet.c:1653
+msgid "Stop All Wireless Devices"
+msgstr "Zaustavi sve bežične uređaje"
+
+#: gnome/applet/applet.c:1619
+msgid "Start All Wireless Devices"
+msgstr "Pokreni sve bežične uređaje"
 
-#. Help item
-#: ../src/applet.c:2193
-#, fuzzy
-msgid "_Help"
+#: gnome/applet/applet.c:1662
+msgid "Help"
 msgstr "Pomoć"
 
-#. About item
-#: ../src/applet.c:2202
-#, fuzzy
-msgid "_About"
+#: gnome/applet/applet.c:1669
+msgid "About"
 msgstr "O programu"
 
-#: ../src/applet.c:2667
+#: gnome/applet/applet.c:2070
 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"
-
-#: ../src/wireless-security-option.c:157
-msgid "Open System"
-msgstr ""
-
-#: ../src/wireless-security-option.c:160
-msgid "Shared Key"
-msgstr ""
-
-#: ../src/wireless-security-option.c:208
-msgid "Automatic (Default)"
-msgstr ""
-
-#: ../src/wireless-security-option.c:215
-msgid "AES-CCMP"
-msgstr ""
-
-#: ../src/wireless-security-option.c:223
-msgid "TKIP"
-msgstr ""
-
-#: ../src/wireless-security-option.c:231
-msgid "Dynamic WEP"
-msgstr ""
-
-#: ../src/wso-none.c:53
-msgid "None"
-msgstr ""
-
-#: ../src/wso-wep-ascii.c:138
-msgid "WEP 64/128-bit ASCII"
-msgstr ""
-
-#: ../src/wso-wep-hex.c:135
-msgid "WEP 64/128-bit Hex"
-msgstr ""
-
-#: ../src/wso-wep-passphrase.c:135
-#, fuzzy
-msgid "WEP 128-bit Passphrase"
-msgstr "Lozinka:"
-
-#: ../src/wso-wpa-eap.c:237
-msgid "PEAP"
-msgstr ""
-
-#: ../src/wso-wpa-eap.c:238
-msgid "TLS"
-msgstr ""
-
-#: ../src/wso-wpa-eap.c:239
-msgid "TTLS"
-msgstr ""
-
-#: ../src/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 ""
-
-#: ../src/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 ""
+msgstr "Upravljač mrežom nije uspeo da pronađe neophodne resurse i ne može da nastavi rad.\n"
 
-#: ../src/wso-wpa-psk.c:178
-msgid "WPA2 Personal"
-msgstr ""
-
-#: ../src/wso-wpa-psk.c:180
-msgid "WPA Personal"
-msgstr ""
-
-#: ../src/eggtrayicon.c:134
-msgid "Orientation"
-msgstr "Usmerenje"
-
-# Potreban je bolji prevod za ovo
-#: ../src/eggtrayicon.c:135
-msgid "The orientation of the tray."
-msgstr "Usmerenje obaveštajne zone."
+#: gnome/applet/gtkcellrendererprogress.c:243
+#: gnome/applet/gtkcellrendererprogress.c:301
+#, c-format
+msgid "progress bar label|%d %%"
+msgstr "%d %%"
 
-#: ../src/menu-items.c:88
+#: gnome/applet/menu-items.c:91
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Žičana mreža (%s)"
 
-#: ../src/menu-items.c:91
-#, fuzzy
-msgid "_Wired Network"
+#: gnome/applet/menu-items.c:93
+msgid "Wired Network"
 msgstr "Žičana mreža"
 
-#: ../src/menu-items.c:162
+#: gnome/applet/menu-items.c:166
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
@@ -405,104 +243,85 @@ msgstr[0] "Bežična mreža (%s)"
 msgstr[1] "Bežične mreže (%s)"
 msgstr[2] "Bežičnih mreža (%s)"
 
-#: ../src/menu-items.c:164
+#: gnome/applet/menu-items.c:168
 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"
 
-#: ../src/menu-items.c:343
+#: gnome/applet/menu-items.c:294
 msgid " (invalid Unicode)"
 msgstr " (neispravan Unikod)"
 
-#: ../src/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: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č:"
 
-#: ../src/other-network-dialog.c:358
+#: 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:229
 msgid "Create new wireless network"
 msgstr "Napravi novu bežičnu mrežu"
 
-#: ../src/other-network-dialog.c:359
-#, fuzzy
+#: gnome/applet/other-network-dialog.c:230
 msgid ""
-"Enter the name and security settings of the wireless network you wish to "
+"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."
+msgstr "Unesite ESSID i bezbednosne postavke bežične mreže koju želite da načinite."
 
-#: ../src/other-network-dialog.c:363
-#, fuzzy
-msgid "Create New Wireless Network"
-msgstr "Napravi novu bežičnu mrežu..."
-
-#: ../src/other-network-dialog.c:368
-#, fuzzy
-msgid "Existing wireless network"
+#: gnome/applet/other-network-dialog.c:235
+msgid "Custom wireless network"
 msgstr "Korisnička bežična mreža"
 
-#: ../src/other-network-dialog.c:369
-#, fuzzy
-msgid "Enter the name of the wireless network to which you wish to connect."
+#: gnome/applet/other-network-dialog.c:236
+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."
 
-#: ../src/other-network-dialog.c:371
-#, fuzzy
-msgid "Connect to Other Wireless Network"
-msgstr "Ostale bežične mreže..."
+#: 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“."
 
-# FIXME Ad-hok
-#: ../src/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:1
+msgid " "
+msgstr " "
 
-#: ../src/passphrase-dialog.c:216
-msgid ""
-"The requested wireless network requires security capabilities unsupported by "
-"your hardware."
-msgstr ""
+#: gnome/applet/applet.glade.h:2
+msgid "*"
+msgstr "*"
 
-#: ../src/vpn-password-dialog.c:151
-#: ../src/vpn-password-dialog.c:188
-#, c-format
-msgid "Cannot start VPN connection '%s'"
-msgstr ""
-
-#: ../src/vpn-password-dialog.c:154
-#, c-format
+#: gnome/applet/applet.glade.h:3
 msgid ""
-"Could not find the authentication dialog for VPN connection type '%s'. "
-"Contact your system administrator."
+"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)"
 
-#: ../src/vpn-password-dialog.c:191
-#, c-format
+#: gnome/applet/applet.glade.h:6
 msgid ""
-"There was a problem launching the authentication dialog for VPN connection "
-"type '%s'. Contact your system administrator."
+"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)"
 
-#: ../src/applet.glade.h:1
-msgid " "
-msgstr " "
-
-#: ../src/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“"
-
-#: ../src/applet.glade.h:4
+#: gnome/applet/applet.glade.h:10
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
@@ -515,615 +334,104 @@ msgstr ""
 "\n"
 " Lozinka ili ključ za šifrovanje su neophodni za pristup bežičnoj mreži „%s“."
 
-#: ../src/applet.glade.h:8
+#: gnome/applet/applet.glade.h:14
 #, 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."
 
-#: ../src/applet.glade.h:12
-#, fuzzy, no-c-format
+#: gnome/applet/applet.glade.h:18
+#, 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."
+"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."
-
-#: ../src/applet.glade.h:15
-msgid "Anonymous Identity:"
-msgstr ""
-
-#: ../src/applet.glade.h:16
-#, fuzzy
-msgid "Authentication:"
-msgstr "Usmerenje"
-
-#: ../src/applet.glade.h:17
-msgid "Broadcast Address:"
-msgstr ""
+"Ž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."
 
-#: ../src/applet.glade.h:18
-msgid "CA Certificate File:"
-msgstr ""
+#: gnome/applet/applet.glade.h:21
+msgid "Always Trust this Wireless Network"
+msgstr "Uvek pokloni poverenje bežičnoj mreži"
 
-#: ../src/applet.glade.h:19
+#: gnome/applet/applet.glade.h:22
 msgid "C_onnect"
 msgstr "P_oveži se"
 
-#: ../src/applet.glade.h:20
-msgid "Client Certificate File:"
-msgstr ""
-
-#: ../src/applet.glade.h:21
-msgid "Connection Information"
-msgstr ""
-
-#: ../src/applet.glade.h:22
-msgid "Default Route:"
-msgstr ""
-
-#: ../src/applet.glade.h:23
-msgid "Destination Address:"
-msgstr ""
-
-#: ../src/applet.glade.h:24
-msgid "Driver:"
-msgstr ""
-
-#: ../src/applet.glade.h:25
-msgid "EAP Method:"
-msgstr ""
-
-#: ../src/applet.glade.h:26
-msgid "Hardware Address:"
-msgstr ""
-
-#: ../src/applet.glade.h:27
-msgid "IP Address:"
-msgstr ""
-
-#: ../src/applet.glade.h:28
-msgid "Identity:"
-msgstr ""
+#: gnome/applet/applet.glade.h:23
+msgid "Connect with encryption enabled"
+msgstr "Poveži se i uključi šifrovanje"
 
-#: ../src/applet.glade.h:29
-msgid "Interface:"
-msgstr ""
+#: gnome/applet/applet.glade.h:24
+msgid "Don't remind me again"
+msgstr "Ne podsećaj me više"
 
-#: ../src/applet.glade.h:30
+#: gnome/applet/applet.glade.h:25
 msgid "Key Type:"
 msgstr "Vrsta ključa:"
 
-#: ../src/applet.glade.h:31
-#, fuzzy
-msgid "Key:"
-msgstr "Heksa ključ:"
-
-#: ../src/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 ""
-
-#: ../src/applet.glade.h:37
-msgid ""
-"Open System\n"
-"Shared Key"
-msgstr ""
-
-#: ../src/applet.glade.h:39
-#, fuzzy
-msgid "Other Wireless Network..."
-msgstr "Ostale bežične mreže..."
-
-#: ../src/applet.glade.h:40
-msgid "Passphrase:"
-msgstr "Lozinka:"
-
-#: ../src/applet.glade.h:41
-msgid "Password:"
-msgstr ""
-
-#: ../src/applet.glade.h:42
-msgid "Primary DNS:"
-msgstr ""
-
-#: ../src/applet.glade.h:43
-msgid "Private Key File:"
-msgstr ""
-
-#: ../src/applet.glade.h:44
-msgid "Private Key Password:"
-msgstr ""
-
-#: ../src/applet.glade.h:45
-msgid "Secondary DNS:"
-msgstr ""
-
-#: ../src/applet.glade.h:46
-msgid "Select the CA Certificate File"
-msgstr ""
-
-#: ../src/applet.glade.h:47
-msgid "Select the Client Certificate File"
-msgstr ""
-
-#: ../src/applet.glade.h:48
-msgid "Select the Private Key File"
-msgstr ""
-
-#: ../src/applet.glade.h:49
-msgid "Show key"
-msgstr ""
-
-#: ../src/applet.glade.h:50
-#, fuzzy
-msgid "Show passphrase"
-msgstr "Lozinka:"
-
-#: ../src/applet.glade.h:51
-msgid "Show password"
-msgstr ""
-
-#: ../src/applet.glade.h:52
-msgid "Show passwords"
-msgstr ""
-
-#: ../src/applet.glade.h:53
-msgid "Speed:"
-msgstr ""
-
-#: ../src/applet.glade.h:54
-msgid "Subnet Mask:"
-msgstr ""
-
-#: ../src/applet.glade.h:55
-#, fuzzy
-msgid "Type:"
+#: gnome/applet/applet.glade.h:26
+msgid "Key type:"
 msgstr "Vrsta ključa:"
 
-#: ../src/applet.glade.h:56
-msgid "User Name:"
-msgstr ""
-
-#: ../src/applet.glade.h:57
+#: gnome/applet/applet.glade.h:28
 msgid "Wireless Network Key Required"
 msgstr "Potreban je ključ za bežičnu mrežu"
 
-#: ../src/applet.glade.h:58
+#: gnome/applet/applet.glade.h:29
 msgid "Wireless _adapter:"
 msgstr "Bežični _uređaj:"
 
-#: ../src/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:30
+msgid "Wireless _network:"
+msgstr "Bežična _mreža:"
 
-#: ../src/applet.glade.h:60
-#, fuzzy
-msgid "_Don't remind me again"
-msgstr "Ne podsećaj me više"
-
-#: ../src/applet.glade.h:61
+#: gnome/applet/applet.glade.h:31
 msgid "_Login to Network"
 msgstr "_Umreži se"
 
-#: ../src/applet.glade.h:62
-msgid "_Network Name:"
-msgstr ""
-
-#: ../src/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 ""
-
-#: ../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 ""
+#: gnome/applet/applet.glade.h:32
+msgid "_OK"
+msgstr "_U redu"
 
-#: ../src/nm-netlink-monitor.c:154
+#: 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:405
+#: src/nm-netlink-monitor.c:404
 msgid "operation took too long"
 msgstr "Potraga je predugo trajala"
 
-#: ../src/nm-netlink-monitor.c:502
+#: src/nm-netlink-monitor.c:501
 msgid "received data from wrong type of sender"
 msgstr "Primljeni su podaci pogrešnog tipa od pošiljaoca"
 
-#: ../src/nm-netlink-monitor.c:515
+#: src/nm-netlink-monitor.c:514
 msgid "received data from unexpected sender"
 msgstr "Primljeni su podaci od neočekivanog pošiljaoca"
 
-#: ../src/nm-netlink-monitor.c:646
+#: src/nm-netlink-monitor.c:536
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: src/nm-netlink-monitor.c:645
 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
-#: ../src/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"
-
-#: ../src/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“..."
-
-#: ../src/applet-dbus-devices.c:910
-#, fuzzy
-msgid "You are now connected to the wired network."
-msgstr "Obustavljanje veze sa žičanom mrežom..."
-
-#: ../src/applet-dbus-devices.c:916
-#, fuzzy
-msgid "Connection Established"
-msgstr "Poveži se i uključi šifrovanje"
-
-#: ../src/applet-dbus-devices.c:959
-#, fuzzy
-msgid "Disconnected"
-msgstr "Isključi VPN..."
-
-#: ../src/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 49a0512e..5eac2d8e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,358 +1,376 @@
 # Swedish messages for NetworkManager.
-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
-# Christian Rose <menthos@menthos.com>, 2004, 2005.
+# Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
+# Daniel Nylander <po@danielnylander.se>, 2006.
+# Christian Rose <menthos@menthos.com>, 2004, 2005, 2006.
 #
-# $Id: sv.po,v 1.9.2.1 2006/05/29 16:58:09 utx Exp $
+# $Id: sv.po,v 1.14 2006/12/10 18:34:55 dnylande Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: \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"
+"POT-Creation-Date: 2006-12-10 14:09+0100\n"
+"PO-Revision-Date: 2006-12-10 15:42+0100\n"
+"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
+"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\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"
 
-#: ../src/applet-compat.c:171 ../src/applet-dbus-info.c:919
+#: ../gnome/applet/applet-compat.c:171
+#: ../gnome/applet/applet-dbus-info.c:926
 #, c-format
 msgid "Passphrase for wireless network %s"
 msgstr "Lösenfras för det trådlösa nätverket %s"
 
-#: ../src/applet-dbus.c:265
+#: ../gnome/applet/applet-dbus.c:274
 #, c-format
 msgid "Connection to the wireless network '%s' failed."
 msgstr "Anslutning till det trådlösa nätverket \"%s\" misslyckades."
 
-#: ../src/applet-dbus.c:270
+#: ../gnome/applet/applet-dbus.c:279
 msgid "Connection to the wired network failed."
 msgstr "Anslutning till det trådburna nätverket misslyckades."
 
-#: ../src/applet.c:184
+#: ../gnome/applet/applet.c:182
 msgid "Error displaying connection information:"
 msgstr "Fel vid visning av anslutningsinformation:"
 
-#: ../src/applet.c:202
+#: ../gnome/applet/applet.c:200
 msgid "Could not find some required resources (the glade file)!"
 msgstr "Kunde inte hitta en del nödvändiga resurser (glade-filen)!"
 
-#: ../src/applet.c:213
+#: ../gnome/applet/applet.c:210
 msgid "No active connections!"
 msgstr "Inga aktiva anslutningar!"
 
-#: ../src/applet.c:234
+#: ../gnome/applet/applet.c:227
+#, c-format
+msgid "%d Mb/s"
+msgstr "%d Mb/s"
+
+#: ../gnome/applet/applet.c:230
 #, c-format
 msgid "Wired Ethernet (%s)"
 msgstr "Trådbundet Ethernet (%s)"
 
-#: ../src/applet.c:236
+#: ../gnome/applet/applet.c:232
 #, c-format
 msgid "Wireless Ethernet (%s)"
 msgstr "Trådlöst Ethernet (%s)"
 
-#: ../src/applet.c:337 ../src/applet.c:362
+#: ../gnome/applet/applet.c:238
+msgid "Unknown"
+msgstr "Okänt"
+
+#: ../gnome/applet/applet.c:330
+#: ../gnome/applet/applet.c:357
 msgid "NetworkManager Applet"
 msgstr "Panelprogram för nätverkshantering"
 
-#: ../src/applet.c:339 ../src/applet.c:364
-msgid "Copyright © 2004-2005 Red Hat, Inc."
-msgstr "Copyright © 2004-2005 Red Hat, Inc."
-
-#: ../src/applet.c:340 ../src/applet.c:365
+#: ../gnome/applet/applet.c:332
 msgid ""
-"Notification area applet for managing your network devices and connections."
+"Copyright © 2004-2006 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
 msgstr ""
-"Panelprogram i notifieringsytan för hantering av dina nätverksenheter och "
-"nätverksanslutningar."
+"Copyright © 2004-2006 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+
+#: ../gnome/applet/applet.c:334
+#: ../gnome/applet/applet.c:361
+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."
 
-#: ../src/applet.c:343 ../src/applet.c:370
+#: ../gnome/applet/applet.c:337
+#: ../gnome/applet/applet.c:365
 msgid "translator-credits"
 msgstr ""
+"Daniel Nylander\n"
 "Christian Rose\n"
+"\n"
 "Skicka synpunkter på översättningen till\n"
 "tp-sv@listor.tp-sv.se"
 
-#: ../src/applet.c:426
+#: ../gnome/applet/applet.c:359
+msgid ""
+"Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+msgstr ""
+"Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+
+#: ../gnome/applet/applet.c:421
 msgid "VPN Login Failure"
 msgstr "VPN-inloggningsfel"
 
-#: ../src/applet.c:427
+#: ../gnome/applet/applet.c:422
 #, 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."
+msgstr "Kunde inte starta VPN-anslutningen \"%s\" på grund av ett inloggningfel."
 
-#: ../src/applet.c:431
+#: ../gnome/applet/applet.c:426
 msgid "VPN Start Failure"
 msgstr "VPN-startfel"
 
-#: ../src/applet.c:432
+#: ../gnome/applet/applet.c:427
 #, c-format
-msgid ""
-"Could not start the VPN connection '%s' due to a failure launching the VPN "
-"program."
-msgstr ""
-"Kunde inte starta VPN-anslutningen \"%s\" på grund av ett fel vid start av "
-"VPN-programmet."
+msgid "Could not start the VPN connection '%s' due to a failure launching the VPN program."
+msgstr "Kunde inte starta VPN-anslutningen \"%s\" på grund av ett fel vid start av VPN-programmet."
 
-#: ../src/applet.c:436 ../src/applet.c:446
+#: ../gnome/applet/applet.c:431
+#: ../gnome/applet/applet.c:441
 msgid "VPN Connect Failure"
 msgstr "VPN-anslutningsfel"
 
-#: ../src/applet.c:437
+#: ../gnome/applet/applet.c:432
 #, 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."
+msgstr "Kunde inte starta VPN-anslutningen \"%s\" på grund av ett anslutningsfel."
 
-#: ../src/applet.c:441
+#: ../gnome/applet/applet.c:436
 msgid "VPN Configuration Error"
 msgstr "VPN-konfigurationsfel"
 
-#: ../src/applet.c:442
+#: ../gnome/applet/applet.c:437
 #, c-format
 msgid "The VPN connection '%s' was not correctly configured."
 msgstr "VPN-anslutningen \"%s\" konfigurerades inte korrekt."
 
-#: ../src/applet.c:447
+#: ../gnome/applet/applet.c:442
 #, c-format
-msgid ""
-"Could not start the VPN connection '%s' because the VPN server did not "
-"return an adequate network configuration."
-msgstr ""
-"Kunde inte starta VPN-anslutningen \"%s\" eftersom VPN-servern inte "
-"returnerade en lämplig nätverkskonfiguration."
+msgid "Could not start the VPN connection '%s' because the VPN server did not return an adequate network configuration."
+msgstr "Kunde inte starta VPN-anslutningen \"%s\" eftersom VPN-servern inte returnerade en lämplig nätverkskonfiguration."
 
-#: ../src/applet.c:517
+#: ../gnome/applet/applet.c:512
 msgid "VPN Login Message"
 msgstr "VPN-inloggningsmeddelande"
 
-#: ../src/applet.c:741 ../src/applet.c:2508
-#: ../src/other-network-dialog.c:453
-#: ../src/passphrase-dialog.c:228
-msgid ""
-"The NetworkManager Applet could not find some required resources (the glade "
-"file was not found)."
-msgstr ""
-"Panelprogrammet för nätverkshantering kunde inte hitta en del nödvändiga "
-"resurser (glade-filen hittades inte)."
+#: ../gnome/applet/applet.c:737
+#: ../gnome/applet/applet.c:2635
+#: ../gnome/applet/other-network-dialog.c:458
+#: ../gnome/applet/passphrase-dialog.c:228
+msgid "The NetworkManager Applet could not find some required resources (the glade file was not found)."
+msgstr "Panelprogrammet för nätverkshantering kunde inte hitta en del nödvändiga resurser (glade-filen hittades inte)."
 
-#: ../src/applet.c:753
+#: ../gnome/applet/applet.c:749
 #, 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."
 
-#: ../src/applet.c:761
+#: ../gnome/applet/applet.c:757
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
 msgstr "Nätverksenheten \"%s (%s)\" stöder inte länkdetektering."
 
-#: ../src/applet.c:908
+#. Note to translators: this is used if no essid is known
+#: ../gnome/applet/applet.c:905
+#: ../gnome/applet/applet.c:1103
+msgid "(unknown)"
+msgstr "(okänt)"
+
+#: ../gnome/applet/applet.c:911
 #, c-format
 msgid "Preparing device %s for the wired network..."
 msgstr "Förbereder enheten %s för det trådbundna nätverket..."
 
-#: ../src/applet.c:910
+#: ../gnome/applet/applet.c:913
 #, 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\"..."
 
-#: ../src/applet.c:918
+#: ../gnome/applet/applet.c:921
 #, c-format
 msgid "Configuring device %s for the wired network..."
 msgstr "Konfigurerar enheten %s för det trådbundna nätverket..."
 
-#: ../src/applet.c:920
+#: ../gnome/applet/applet.c:923
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
 msgstr "Försöker ansluta till det trådlösa nätverket \"%s\"..."
 
-#: ../src/applet.c:928
+#: ../gnome/applet/applet.c:931
 #, 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\"..."
 
-#: ../src/applet.c:936 ../src/applet.c:946
+#: ../gnome/applet/applet.c:939
+#: ../gnome/applet/applet.c:949
 msgid "Requesting a network address from the wired network..."
 msgstr "Begär en nätverksadress från det trådbundna nätverket..."
 
-#: ../src/applet.c:938 ../src/applet.c:948
+#: ../gnome/applet/applet.c:941
+#: ../gnome/applet/applet.c:951
 #, 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\"..."
 
-#: ../src/applet.c:956
+#: ../gnome/applet/applet.c:959
 msgid "Finishing connection to the wired network..."
 msgstr "Slutför anslutning till det trådbundna nätverket..."
 
-#: ../src/applet.c:958
+#: ../gnome/applet/applet.c:961
 #, c-format
 msgid "Finishing connection to the wireless network '%s'..."
 msgstr "Slutför anslutning till det trådlösa nätverket \"%s\"..."
 
-#: ../src/applet.c:1075
+#: ../gnome/applet/applet.c:1078
 msgid "NetworkManager is not running"
 msgstr "Nätverkshanteraren är inte igång"
 
-#: ../src/applet.c:1083 ../src/applet.c:1828
+#: ../gnome/applet/applet.c:1086
+#: ../gnome/applet/applet.c:1843
 msgid "Networking disabled"
 msgstr "Nätverk inaktiverat"
 
-#: ../src/applet.c:1088
+#: ../gnome/applet/applet.c:1091
 msgid "No network connection"
 msgstr "Ingen nätverksanslutning"
 
-#: ../src/applet.c:1093
+#: ../gnome/applet/applet.c:1096
 msgid "Wired network connection"
 msgstr "Trådbunden nätverksanslutning"
 
-#: ../src/applet.c:1097
+#: ../gnome/applet/applet.c:1100
 msgid "Connected to an Ad-Hoc wireless network"
-msgstr "Anluten till ett trådlöst ad hoc-nätverk"
+msgstr "Ansluten till ett trådlöst ad hoc-nätverk"
 
-#: ../src/applet.c:1099
+#: ../gnome/applet/applet.c:1102
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "Trådlös nätverksanslutning till \"%s\" (%d%%)"
 
-#: ../src/applet.c:1120
+#: ../gnome/applet/applet.c:1123
 #, c-format
 msgid "VPN connection to '%s'"
 msgstr "VPN-anslutning till \"%s\""
 
-#: ../src/applet.c:1128
+#: ../gnome/applet/applet.c:1131
 #, c-format
 msgid "VPN connecting to '%s'"
 msgstr "VPN-ansluter till \"%s\""
 
-#: ../src/applet.c:1541
+#: ../gnome/applet/applet.c:1556
 msgid "_Connect to Other Wireless Network..."
 msgstr "_Anslut till annat trådlöst nätverk..."
 
-#: ../src/applet.c:1562
+#: ../gnome/applet/applet.c:1577
 msgid "Create _New Wireless Network..."
 msgstr "Skapa _nytt trådlöst nätverk..."
 
-#: ../src/applet.c:1685
+#: ../gnome/applet/applet.c:1700
 msgid "_VPN Connections"
 msgstr "_VPN-anslutningar"
 
-#: ../src/applet.c:1730
+#: ../gnome/applet/applet.c:1745
 msgid "_Configure VPN..."
 msgstr "_Konfigurera VPN..."
 
-#: ../src/applet.c:1734
+#: ../gnome/applet/applet.c:1749
 msgid "_Disconnect VPN..."
 msgstr "Koppla _från VPN..."
 
-#: ../src/applet.c:1756
+#: ../gnome/applet/applet.c:1771
 msgid "_Dial Up Connections"
 msgstr "_Uppringda anslutningar"
 
 #. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
-#: ../src/applet.c:1767
+#: ../gnome/applet/applet.c:1782
 #, c-format
 msgid "Connect to %s..."
 msgstr "Anslut till %s..."
 
-#: ../src/applet.c:1773
+#: ../gnome/applet/applet.c:1788
 #, c-format
 msgid "Disconnect from %s..."
 msgstr "Koppla från %s..."
 
-#: ../src/applet.c:1822
+#: ../gnome/applet/applet.c:1837
 msgid "No network devices have been found"
 msgstr "Inga nätverksenheter har hittats"
 
-#: ../src/applet.c:2014
+#: ../gnome/applet/applet.c:2029
 msgid "NetworkManager is not running..."
 msgstr "Nätverkshanteraren är inte igång..."
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2170
+#: ../gnome/applet/applet.c:2210
 msgid "Enable _Networking"
 msgstr "Aktivera _nätverk"
 
 #. 'Enable Wireless' item
-#: ../src/applet.c:2176
+#: ../gnome/applet/applet.c:2216
 msgid "Enable _Wireless"
 msgstr "Aktivera _trådlöst"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2182
+#: ../gnome/applet/applet.c:2222
 msgid "Connection _Information"
 msgstr "Anslutnings_information"
 
 #. Help item
-#: ../src/applet.c:2193
+#: ../gnome/applet/applet.c:2233
 msgid "_Help"
 msgstr "_Hjälp"
 
 #. About item
-#: ../src/applet.c:2202
+#: ../gnome/applet/applet.c:2242
 msgid "_About"
 msgstr "_Om"
 
-#: ../src/applet.c:2667
-msgid ""
-"The NetworkManager applet could not find some required resources.  It cannot "
-"continue.\n"
-msgstr ""
-"Panelprogrammet för nätverkshantering kunde inte hitta en del nödvändiga "
-"resurser. Det kan inte fortsätta.\n"
+#: ../gnome/applet/applet.c:2824
+msgid "The NetworkManager applet could not find some required resources.  It cannot continue.\n"
+msgstr "Panelprogrammet för nätverkshantering kunde inte hitta en del nödvändiga resurser. Det kan inte fortsätta.\n"
 
-#: ../src/wireless-security-option.c:157
+#: ../gnome/applet/wireless-security-option.c:157
 msgid "Open System"
 msgstr "Öppet system"
 
-#: ../src/wireless-security-option.c:160
+#: ../gnome/applet/wireless-security-option.c:160
 msgid "Shared Key"
 msgstr "Delad nyckel"
 
-#: ../src/wireless-security-option.c:208
+#: ../gnome/applet/wireless-security-option.c:208
 msgid "Automatic (Default)"
 msgstr "Automatiskt (standard)"
 
-#: ../src/wireless-security-option.c:215
+#: ../gnome/applet/wireless-security-option.c:215
 msgid "AES-CCMP"
 msgstr "AES-CCMP"
 
-#: ../src/wireless-security-option.c:223
+#: ../gnome/applet/wireless-security-option.c:223
 msgid "TKIP"
 msgstr "TKIP"
 
-#: ../src/wireless-security-option.c:231
+#: ../gnome/applet/wireless-security-option.c:231
 msgid "Dynamic WEP"
 msgstr "Dynamisk WEP"
 
-#: ../src/wso-none.c:53
+#: ../gnome/applet/wso-none.c:53
 msgid "None"
 msgstr "Ingen"
 
-#: ../src/wso-wep-ascii.c:138
+#: ../gnome/applet/wso-wep-ascii.c:138
 msgid "WEP 64/128-bit ASCII"
 msgstr "WEP 64/128-bitars ASCII"
 
-#: ../src/wso-wep-hex.c:135
+#: ../gnome/applet/wso-wep-hex.c:135
 msgid "WEP 64/128-bit Hex"
 msgstr "WEP 64/128-bitars hexadecimal"
 
-#: ../src/wso-wep-passphrase.c:135
+#: ../gnome/applet/wso-wep-passphrase.c:135
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bitars lösenfras"
 
-#: ../src/wso-wpa-eap.c:237
+#: ../gnome/applet/wso-wpa-eap.c:237
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../src/wso-wpa-eap.c:238
+#: ../gnome/applet/wso-wpa-eap.c:238
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wso-wpa-eap.c:239
+#: ../gnome/applet/wso-wpa-eap.c:239
 msgid "TTLS"
 msgstr "TTLS"
 
@@ -361,8 +379,9 @@ msgstr "TTLS"
 # översatt.
 # /Christian
 #
-#: ../src/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
-#: ../src/nm-ap-security-wpa-eap.c:116
+#: ../gnome/applet/wso-wpa-eap.c:247
+#: ../src/nm-ap-security-wpa-eap.c:93
+#: ../src/nm-ap-security-wpa-eap.c:117
 msgid "WPA2 Enterprise"
 msgstr "WPA2 Enterprise"
 
@@ -371,8 +390,9 @@ msgstr "WPA2 Enterprise"
 # översatt.
 # /Christian
 #
-#: ../src/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
-#: ../src/nm-ap-security-wpa-eap.c:121
+#: ../gnome/applet/wso-wpa-eap.c:249
+#: ../src/nm-ap-security-wpa-eap.c:95
+#: ../src/nm-ap-security-wpa-eap.c:122
 msgid "WPA Enterprise"
 msgstr "WPA Enterprise"
 
@@ -381,7 +401,7 @@ msgstr "WPA Enterprise"
 # översatt.
 # /Christian
 #
-#: ../src/wso-wpa-psk.c:178
+#: ../gnome/applet/wso-wpa-psk.c:178
 msgid "WPA2 Personal"
 msgstr "WPA2 Personal"
 
@@ -390,241 +410,211 @@ msgstr "WPA2 Personal"
 # översatt.
 # /Christian
 #
-#: ../src/wso-wpa-psk.c:180
+#: ../gnome/applet/wso-wpa-psk.c:180
 msgid "WPA Personal"
 msgstr "WPA Personal"
 
-#: ../src/eggtrayicon.c:134
+#: ../gnome/applet/eggtrayicon.c:134
 msgid "Orientation"
 msgstr "Orientering"
 
-#: ../src/eggtrayicon.c:135
+#: ../gnome/applet/eggtrayicon.c:135
 msgid "The orientation of the tray."
 msgstr "Orienteringen på lådan."
 
-#: ../src/menu-items.c:88
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Trådbundet nätverk (%s)"
 
-#: ../src/menu-items.c:91
+#: ../gnome/applet/menu-items.c:91
 msgid "_Wired Network"
 msgstr "_Trådbundet nätverk"
 
-#: ../src/menu-items.c:162
+#: ../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)"
 
-#: ../src/menu-items.c:164
+#: ../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"
 
-#: ../src/menu-items.c:343
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr " (ogiltig Unicode)"
 
-#: ../src/other-network-dialog.c:352
+#: ../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"
+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"
 
-#: ../src/other-network-dialog.c:358
+#: ../gnome/applet/other-network-dialog.c:358
 msgid "Create new wireless network"
 msgstr "Skapa nytt trådlöst nätverk"
 
-#: ../src/other-network-dialog.c:359
-msgid ""
-"Enter the name and security settings of the wireless network you wish to "
-"create."
-msgstr ""
-"Ange namnet och säkerhetsinställningarna för det trådlösa nätverk som du "
-"vill skapa."
+#: ../gnome/applet/other-network-dialog.c:359
+msgid "Enter the name and security settings of the wireless network you wish to create."
+msgstr "Ange namnet och säkerhetsinställningarna för det trådlösa nätverk som du vill skapa."
 
-#: ../src/other-network-dialog.c:363
+#: ../gnome/applet/other-network-dialog.c:363
 msgid "Create New Wireless Network"
 msgstr "Skapa nytt trådlöst nätverk"
 
-#: ../src/other-network-dialog.c:368
+#: ../gnome/applet/other-network-dialog.c:368
 msgid "Existing wireless network"
 msgstr "Befintligt trådlöst nätverk"
 
-#: ../src/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 "Ange namnet på det trådlösa nätverk som du vill ansluta till."
 
-#: ../src/other-network-dialog.c:371
+#: ../gnome/applet/other-network-dialog.c:371
 msgid "Connect to Other Wireless Network"
 msgstr "Anslut till annat trådlöst nätverk"
 
-#: ../src/passphrase-dialog.c:215
+#: ../gnome/applet/passphrase-dialog.c:215
 msgid "Error connecting to wireless network"
 msgstr "Fel vid anslutning till trådlöst nätverk"
 
-#: ../src/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/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."
 
-#: ../src/vpn-password-dialog.c:151
-#: ../src/vpn-password-dialog.c:188
+#: ../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\""
 
-#: ../src/vpn-password-dialog.c:154
+#: ../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 ""
-"Kunde inte hitta autentiseringsdialogen för VPN-anslutningstypen \"%s\". "
-"Kontakta din systemadministratör."
+msgid "Could not find the authentication dialog for VPN connection type '%s'. Contact your system administrator."
+msgstr "Kunde inte hitta autentiseringsdialogen för VPN-anslutningstypen \"%s\". Kontakta din systemadministratör."
 
-#: ../src/vpn-password-dialog.c:191
+#: ../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 ""
-"Ett problem inträffade vid start av autentiseringsdialogen för VPN-"
-"anslutningstypen \"%s\". Kontakta din systemadministratör."
+msgid "There was a problem launching the authentication dialog for VPN connection type '%s'. Contact your system administrator."
+msgstr "Ett problem inträffade vid start av autentiseringsdialogen för VPN-anslutningstypen \"%s\". Kontakta din systemadministratör."
 
-#: ../src/applet.glade.h:1
+#: ../gnome/applet/applet.glade.h:1
 msgid " "
 msgstr " "
 
-#: ../src/applet.glade.h:2
-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:2
+msgid "<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Information om aktiv anslutning</span>"
 
-#: ../src/applet.glade.h:4
+#: ../gnome/applet/applet.glade.h:4
 #, no-c-format
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
-"Network</span>\n"
+"<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'."
+"A passphrase or encryption key is required to access the wireless network '%s'."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Lösenfras krävs av det trådlösa "
-"nätverket</span>\n"
+"<span weight=\"bold\" size=\"larger\">Lösenfras krävs av det trådlösa nätverket</span>\n"
 "\n"
-"En lösenfras eller en krypteringsnyckel krävs för att komma åt det trådlösa "
-"nätverket \"%s\"."
+"En lösenfras eller en krypteringsnyckel krävs för att komma åt det trådlösa nätverket \"%s\"."
 
-#: ../src/applet.glade.h:8
+#: ../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\">Reducerad nätverksfunktionalitet</"
-"span>\n"
+"<span weight=\"bold\" size=\"larger\">Reducerad nätverksfunktionalitet</span>\n"
 "\n"
 "%s  Det kommer inte att vara helt fungerande."
 
-#: ../src/applet.glade.h:12
+#: ../gnome/applet/applet.glade.h:12
 #, no-c-format
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
-"span>\n"
+"<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."
+"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\">Inloggningsbekräftelse för trådlöst "
-"nätverk</span>\n"
+"<span weight=\"bold\" size=\"larger\">Inloggningsbekräftelse för trådlöst nätverk</span>\n"
 "\n"
-"Du har valt att logga in på det trådlösa nätverket \"%s\". Om du är säker på "
-"att detta trådlösa nätverk är säkert klickar du i kryssrutan nedan, så "
-"kommer nätverkshanteraren inte längre att kräva bekräftelse vid framtida "
-"inloggningar."
+"Du har valt att logga in på det trådlösa nätverket \"%s\". Om du är säker på att detta trådlösa nätverk är säkert klickar du i kryssrutan nedan, så kommer nätverkshanteraren inte längre att kräva bekräftelse vid framtida inloggningar."
 
-#: ../src/applet.glade.h:15
+#: ../gnome/applet/applet.glade.h:15
 msgid "Anonymous Identity:"
 msgstr "Anonym identitet:"
 
-#: ../src/applet.glade.h:16
+#: ../gnome/applet/applet.glade.h:16
 msgid "Authentication:"
 msgstr "Autentisering:"
 
-#: ../src/applet.glade.h:17
+#: ../gnome/applet/applet.glade.h:17
 msgid "Broadcast Address:"
 msgstr "Broadcast-adress:"
 
-#: ../src/applet.glade.h:18
+#: ../gnome/applet/applet.glade.h:18
 msgid "CA Certificate File:"
 msgstr "CA-certifikatfil:"
 
-#: ../src/applet.glade.h:19
+#: ../gnome/applet/applet.glade.h:19
 msgid "C_onnect"
 msgstr "_Anslut"
 
-#: ../src/applet.glade.h:20
+#: ../gnome/applet/applet.glade.h:20
 msgid "Client Certificate File:"
 msgstr "Klientcertifikatfil:"
 
-#: ../src/applet.glade.h:21
+#: ../gnome/applet/applet.glade.h:21
 msgid "Connection Information"
 msgstr "Anslutningsinformation"
 
-#: ../src/applet.glade.h:22
+#: ../gnome/applet/applet.glade.h:22
 msgid "Default Route:"
 msgstr "Standardväg:"
 
-#: ../src/applet.glade.h:23
+#: ../gnome/applet/applet.glade.h:23
 msgid "Destination Address:"
 msgstr "Måladress:"
 
-#: ../src/applet.glade.h:24
+#: ../gnome/applet/applet.glade.h:24
 msgid "Driver:"
 msgstr "Drivrutin:"
 
-#: ../src/applet.glade.h:25
+#: ../gnome/applet/applet.glade.h:25
 msgid "EAP Method:"
 msgstr "EAP-metod:"
 
-#: ../src/applet.glade.h:26
+#: ../gnome/applet/applet.glade.h:26
 msgid "Hardware Address:"
 msgstr "Hårdvaruadress:"
 
-#: ../src/applet.glade.h:27
+#: ../gnome/applet/applet.glade.h:27
 msgid "IP Address:"
 msgstr "IP-adress:"
 
-#: ../src/applet.glade.h:28
+#: ../gnome/applet/applet.glade.h:28
 msgid "Identity:"
 msgstr "Identitet:"
 
-#: ../src/applet.glade.h:29
+#: ../gnome/applet/applet.glade.h:29
 msgid "Interface:"
 msgstr "Gränssnitt:"
 
-#: ../src/applet.glade.h:30
+#: ../gnome/applet/applet.glade.h:30
 msgid "Key Type:"
 msgstr "Nyckeltyp:"
 
-#: ../src/applet.glade.h:31
+#: ../gnome/applet/applet.glade.h:31
+msgid "Key management:"
+msgstr "Nyckelhantering:"
+
+#: ../gnome/applet/applet.glade.h:32
 msgid "Key:"
 msgstr "Nyckel:"
 
-#: ../src/applet.glade.h:32
+#: ../gnome/applet/applet.glade.h:33
 msgid ""
 "None\n"
 "WEP 128-bit Passphrase\n"
@@ -636,7 +626,7 @@ msgstr ""
 "WEP 64/128-bitars hexadecimal\n"
 "WEP 64/128-bitars ASCII\n"
 
-#: ../src/applet.glade.h:37
+#: ../gnome/applet/applet.glade.h:38
 msgid ""
 "Open System\n"
 "Shared Key"
@@ -644,171 +634,177 @@ msgstr ""
 "Öppet system\n"
 "Delad nyckel"
 
-#: ../src/applet.glade.h:39
+#: ../gnome/applet/applet.glade.h:40
 msgid "Other Wireless Network..."
 msgstr "Annat trådlöst nätverk..."
 
-#: ../src/applet.glade.h:40
+#: ../gnome/applet/applet.glade.h:41
 msgid "Passphrase:"
 msgstr "Lösenfras:"
 
-#: ../src/applet.glade.h:41
+#: ../gnome/applet/applet.glade.h:42
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: ../src/applet.glade.h:42
+#: ../gnome/applet/applet.glade.h:43
 msgid "Primary DNS:"
 msgstr "Primär DNS:"
 
-#: ../src/applet.glade.h:43
+#: ../gnome/applet/applet.glade.h:44
 msgid "Private Key File:"
 msgstr "Fil med privat nyckel:"
 
-#: ../src/applet.glade.h:44
+#: ../gnome/applet/applet.glade.h:45
 msgid "Private Key Password:"
 msgstr "Lösenord för privat nyckel:"
 
-#: ../src/applet.glade.h:45
+#: ../gnome/applet/applet.glade.h:46
 msgid "Secondary DNS:"
 msgstr "Sekundär DNS:"
 
-#: ../src/applet.glade.h:46
+#: ../gnome/applet/applet.glade.h:47
 msgid "Select the CA Certificate File"
 msgstr "Välj en CA-certifikatfil"
 
-#: ../src/applet.glade.h:47
+#: ../gnome/applet/applet.glade.h:48
 msgid "Select the Client Certificate File"
 msgstr "Välj en klientcertifikatfil"
 
-#: ../src/applet.glade.h:48
+#: ../gnome/applet/applet.glade.h:49
 msgid "Select the Private Key File"
 msgstr "Välj fil med privat nyckel"
 
-#: ../src/applet.glade.h:49
+#: ../gnome/applet/applet.glade.h:50
 msgid "Show key"
 msgstr "Visa nyckel"
 
-#: ../src/applet.glade.h:50
+#: ../gnome/applet/applet.glade.h:51
 msgid "Show passphrase"
 msgstr "Visa lösenfras"
 
-#: ../src/applet.glade.h:51
+#: ../gnome/applet/applet.glade.h:52
 msgid "Show password"
 msgstr "Visa lösenord"
 
-#: ../src/applet.glade.h:52
+#: ../gnome/applet/applet.glade.h:53
 msgid "Show passwords"
 msgstr "Visa lösenord"
 
-#: ../src/applet.glade.h:53
+#: ../gnome/applet/applet.glade.h:54
 msgid "Speed:"
 msgstr "Hastighet:"
 
-#: ../src/applet.glade.h:54
+#: ../gnome/applet/applet.glade.h:55
 msgid "Subnet Mask:"
 msgstr "Subnätsmask:"
 
-#: ../src/applet.glade.h:55
+#: ../gnome/applet/applet.glade.h:56
 msgid "Type:"
 msgstr "Typ:"
 
-#: ../src/applet.glade.h:56
+#: ../gnome/applet/applet.glade.h:57
 msgid "User Name:"
 msgstr "Användarnamn:"
 
-#: ../src/applet.glade.h:57
+#: ../gnome/applet/applet.glade.h:58
 msgid "Wireless Network Key Required"
 msgstr "Nyckel krävs för det trådlösa nätverket"
 
-#: ../src/applet.glade.h:58
+#: ../gnome/applet/applet.glade.h:59
 msgid "Wireless _adapter:"
 msgstr "Trådlös _nätverksadapter:"
 
-#: ../src/applet.glade.h:59
+#: ../gnome/applet/applet.glade.h:60
 msgid "_Always Trust this Wireless Network"
 msgstr "_Lita alltid på detta trådlösa nätverk"
 
-#: ../src/applet.glade.h:60
+#: ../gnome/applet/applet.glade.h:61
 msgid "_Don't remind me again"
 msgstr "_Påminn mig inte igen"
 
-#: ../src/applet.glade.h:61
+#: ../gnome/applet/applet.glade.h:62
+msgid "_Fallback on this Network"
+msgstr "_Fall tillbaka på detta nätverk"
+
+#: ../gnome/applet/applet.glade.h:63
 msgid "_Login to Network"
 msgstr "_Logga in på nätverket"
 
-#: ../src/applet.glade.h:62
+#: ../gnome/applet/applet.glade.h:64
 msgid "_Network Name:"
 msgstr "_Nätverksnamn:"
 
-#: ../src/applet.glade.h:63
+#: ../gnome/applet/applet.glade.h:65
 msgid "_Wireless Security:"
 msgstr "_Trådlös säkerhet:"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:383
+#: ../gnome/vpn-properties/nm-vpn-properties.c:417
 msgid "Cannot add VPN connection"
 msgstr "Kan inte lägga till VPN-anslutning"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:385
-msgid ""
-"No suitable VPN software was found on your system. Contact your system "
-"administrator."
-msgstr ""
-"Ingen lämplig VPN-programvara hittades på ditt system. Kontakta din "
-"systemadministratör."
+#: ../gnome/vpn-properties/nm-vpn-properties.c:419
+msgid "No suitable VPN software was found on your system. Contact your system administrator."
+msgstr "Ingen lämplig VPN-programvara hittades på ditt system. Kontakta din systemadministratör."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:437
+#: ../gnome/vpn-properties/nm-vpn-properties.c:461
 msgid "Cannot import VPN connection"
 msgstr "Kan inte importera VPN-anslutning"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:439
+#: ../gnome/vpn-properties/nm-vpn-properties.c:463
 #, c-format
-msgid ""
-"Cannot find suitable software for VPN connection type '%s' to import the "
-"file '%s'. Contact your system administrator."
-msgstr ""
-"Kan inte hitta lämplig programvara för VPN-anslutningstypen \"%s\" för att "
-"importera filen \"%s\". Kontakta din systemadministratör."
+msgid "Cannot find suitable software for VPN connection type '%s' to import the file '%s'. Contact your system administrator."
+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:579
+#: ../gnome/vpn-properties/nm-vpn-properties.c:580
 #, c-format
 msgid "Error retrieving VPN connection '%s'"
 msgstr "Fel vid hämtning av VPN-anslutningen \"%s\""
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:582
+#: ../gnome/vpn-properties/nm-vpn-properties.c:583
 #, c-format
-msgid ""
-"Could not find the UI files for VPN connection type '%s'. Contact your "
-"system administrator."
-msgstr ""
-"Kunde inte hitta användargränssnittsfilerna för VPN-anslutningstypen \"%s\". "
-"Kontakta din systemadministratör."
+msgid "Could not find the UI files for VPN connection type '%s'. Contact your system administrator."
+msgstr "Kunde inte hitta användargränssnittsfilerna för VPN-anslutningstypen \"%s\". Kontakta din systemadministratör."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:739
+#: ../gnome/vpn-properties/nm-vpn-properties.c:727
 #, c-format
 msgid "Delete VPN connection \"%s\"?"
 msgstr "Ta bort VPN-anslutningen \"%s\"?"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:742
+#: ../gnome/vpn-properties/nm-vpn-properties.c:730
 #, 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 information om VPN-anslutningen \"%s\" kommer att gå förlorad och du kan "
-"komma att behöva kontakta din systemadministratör för att få information för "
-"att kunna skapa en ny anslutning."
+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 information om VPN-anslutningen \"%s\" kommer att gå förlorad och du kan 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:959
+#: ../gnome/vpn-properties/nm-vpn-properties.c:924
 msgid "Unable to load"
 msgstr "Kan inte läsa in"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:961
+#: ../gnome/vpn-properties/nm-vpn-properties.c:926
 msgid "Cannot find some needed resources (the glade file)!"
 msgstr "Kunde inte hitta en del nödvändiga resurser (glade-filen)!"
 
+#. druid_window = GTK_DIALOG (gtk_dialog_new_with_buttons (_("Create VPN Connection"),
+#. NULL,
+#. GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+#. GTK_STOCK_CANCEL,
+#. GTK_RESPONSE_REJECT,
+#. GTK_STOCK_APPLY,
+#. GTK_RESPONSE_ACCEPT,
+#. NULL));
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1081
+msgid "Create VPN Connection"
+msgstr "Skapa VPN-anslutning"
+
+#. gtk_container_add (GTK_CONTAINER (druid_window->vbox), GTK_WIDGET(gtk_label_new("Some label")));
+#. gtk_box_pack_start (GTK_BOX (druid_window->vbox), GTK_WIDGET(druid), TRUE,TRUE,0);
+#. gtk_box_pack_start (GTK_BOX (druid_window->vbox), GTK_WIDGET(gtk_label_new("Some label")), TRUE,TRUE,0);
+#. toplevel = gtk_widget_get_toplevel (GTK_WIDGET (druid));
+#. gtk_signal_connect (GTK_OBJECT (toplevel), "delete_event", GTK_SIGNAL_FUNC (vpn_window_close), NULL);
+#. make the druid window modal wrt. our main window
+#. gtk_window_set_modal (druid_window, TRUE);
+#. gtk_window_set_transient_for (GTK_WINDOW(druid_window), GTK_WINDOW (dialog));
 #. Edit dialog
-#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1099
 msgid "Edit VPN Connection"
 msgstr "Redigera VPN-anslutning"
 
@@ -817,69 +813,30 @@ msgid "Add a new VPN connection"
 msgstr "Lägg till en ny VPN-anslutning"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:2
-msgid "Choose which type of VPN connection you wish to create."
-msgstr "Välj vilken typ av VPN-anslutning som du vill skapa."
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
-msgid "Connect to:"
-msgstr "Anslut till:"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
-msgid "Create VPN Connection"
-msgstr "Skapa VPN-anslutning"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
-msgid "Create VPN Connection - 1 of 2"
-msgstr "Skapa VPN-anslutning - 1 av 2"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
-msgid "Create VPN Connection - 2 of 2"
-msgstr "Skapa VPN-anslutning - 2 av 2"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
 msgid "Delete the selected VPN connection"
 msgstr "Ta bort den markerade VPN-anslutningen"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
 msgid "E_xport"
 msgstr "E_xportera"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:9
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
 msgid "Edit the selected VPN connection"
 msgstr "Redigera den markerade VPN-anslutningen"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:10
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
 msgid "Export the VPN settings to a file"
 msgstr "Exportera VPN-inställningarna till en fil"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:11
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
 msgid "Export the selected VPN connection to a file"
 msgstr "Exportera den markerade VPN-anslutningen till en fil"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:12
-msgid "Finish Creating VPN Connection"
-msgstr "Slutför skapande av VPN-anslutning"
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:13
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
 msgid "Manage Virtual Private Network Connections"
 msgstr "Hantera VPN-anslutningar"
 
-#: ../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 ""
-"Denna guide kommer att hjälpa dig igenom processen att skapa en ny "
-"anslutning till ett virtuellt privat nätverk (VPN).\n"
-"\n"
-"Den kommer att kräva en del information, som till exempel ip-adresser och "
-"hemligheter. Kontakta din systemadministratör för att få tag i denna "
-"information."
-
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:17
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
 msgid "VPN Connections"
 msgstr "VPN-anslutningar"
 
@@ -915,132 +872,160 @@ msgstr "WPA2 CCMP"
 msgid "WPA2 Automatic"
 msgstr "WPA2 automatisk"
 
-#: ../src/nm-ap-security.c:320
+#: ../src/nm-ap-security.c:338
 msgid "none"
 msgstr "ingen"
 
-#: ../src/nm-netlink-monitor.c:154
+#: ../src/nm-netlink-monitor.c:174
 #, c-format
-msgid ""
-"unable to create netlink socket for monitoring wired ethernet devices - %s"
-msgstr ""
-"kan inte skapa netlink-uttag för övervakning av trådbundna ethernet-enheter "
-"- %s"
+msgid "unable to create netlink socket for monitoring wired ethernet devices - %s"
+msgstr "kan inte skapa netlink-uttag för övervakning av trådbundna ethernet-enheter - %s"
 
-#: ../src/nm-netlink-monitor.c:172
+#: ../src/nm-netlink-monitor.c:192
 #, c-format
-msgid ""
-"unable to bind to netlink socket for monitoring wired ethernet devices - %s"
-msgstr ""
-"kan inte binda till netlink-uttag för övervakning av trådbundna ethernet-"
-"enheter - %s"
+msgid "unable to bind to netlink socket for monitoring wired ethernet devices - %s"
+msgstr "kan inte binda till netlink-uttag för övervakning av trådbundna ethernet-enheter - %s"
 
-#: ../src/nm-netlink-monitor.c:405
+#: ../src/nm-netlink-monitor.c:427
 msgid "operation took too long"
 msgstr "åtgärden tog för lång tid"
 
-#: ../src/nm-netlink-monitor.c:502
+#: ../src/nm-netlink-monitor.c:524
 msgid "received data from wrong type of sender"
 msgstr "mottog data från fel typ av avsändare"
 
-#: ../src/nm-netlink-monitor.c:515
+#: ../src/nm-netlink-monitor.c:537
 msgid "received data from unexpected sender"
 msgstr "mottog data från oväntad avsändare"
 
-#: ../src/nm-netlink-monitor.c:646
+#: ../src/nm-netlink-monitor.c:666
 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:735
+#: ../src/nm-netlink-monitor.c:776
 msgid "error occurred while waiting for data on socket"
 msgstr "fel inträffade vid väntan på data i uttaget"
 
-#: ../src/applet-dbus-devices.c:898
+#: ../gnome/applet/applet-dbus-devices.c:930
 #, 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\"."
 
-#: ../src/applet-dbus-devices.c:903
+#: ../gnome/applet/applet-dbus-devices.c:935
 #, 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\"."
 
-#: ../src/applet-dbus-devices.c:910
+#: ../gnome/applet/applet-dbus-devices.c:942
 msgid "You are now connected to the wired network."
 msgstr "Du är nu ansluten till det trådbundna nätverket."
 
-#: ../src/applet-dbus-devices.c:916
+#: ../gnome/applet/applet-dbus-devices.c:948
 msgid "Connection Established"
 msgstr "Anslutning etablerad"
 
-#: ../src/applet-dbus-devices.c:959
+#: ../gnome/applet/applet-dbus-devices.c:997
 msgid "Disconnected"
 msgstr "Frånkopplad"
 
-#: ../src/applet-dbus-devices.c:960
+#: ../gnome/applet/applet-dbus-devices.c:998
 msgid "The network connection has been disconnected."
 msgstr "Nätverksanslutningen har kopplats från."
 
+#: ../src/nm-ap-security-leap.c:66
+#: ../src/nm-ap-security-leap.c:82
+msgid "LEAP"
+msgstr "LEAP"
+
+#~ msgid "Choose which type of VPN connection you wish to create."
+#~ msgstr "Välj vilken typ av VPN-anslutning som du vill skapa."
+#~ msgid "Connect to:"
+#~ msgstr "Anslut till:"
+#~ msgid "Create VPN Connection - 1 of 2"
+#~ msgstr "Skapa VPN-anslutning - 1 av 2"
+#~ msgid "Create VPN Connection - 2 of 2"
+#~ msgstr "Skapa VPN-anslutning - 2 av 2"
+#~ msgid "Finish Creating VPN Connection"
+#~ msgstr "Slutför skapande av VPN-anslutning"
+#~ 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 ""
+#~ "Denna guide kommer att hjälpa dig igenom processen att skapa en ny "
+#~ "anslutning till ett virtuellt privat nätverk (VPN).\n"
+#~ "\n"
+#~ "Den kommer att kräva en del information, som till exempel ip-adresser och "
+#~ "hemligheter. Kontakta din systemadministratör för att få tag i denna "
+#~ "information."
+#~ 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 "Passphrase"
+#~ msgstr "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 "Username:"
+#~ msgstr "Användarnamn:"
+#~ msgid "Network Name:"
+#~ msgstr "Nätverksnamn:"
 #~ 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"
@@ -1049,7 +1034,6 @@ msgstr "Nätverksanslutningen har kopplats från."
 #~ "128-bitars lösenfras (WEP)\n"
 #~ "ASCII-nyckel (WEP)\n"
 #~ "Hexadecimal nyckel (WEP)"
-
 #~ msgid ""
 #~ "128-bit passphrase (WEP)\n"
 #~ "ASCII key (WEP)\n"
@@ -1058,86 +1042,48 @@ msgstr "Nätverksanslutningen har kopplats från."
 #~ "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)"
-
 #~ msgid "Wireless network (%s)"
 #~ msgstr "Trådlöst nätverk (%s)"
-
 #~ msgid "VPN connections"
 #~ msgstr "VPN-anslutningar"
-
 #~ msgid "Configure VPN..."
 #~ msgstr "Konfigurera VPN..."
-
-#~ msgid "Disconnect VPN..."
-#~ msgstr "Koppla från VPN..."
-
 #~ msgid "Dial Up Connections"
 #~ msgstr "Uppringda anslutningar"
-
 #~ msgid "Wireless Enabled"
 #~ msgstr "Trådlöst aktiverat"
-
 #~ msgid "Connection information"
 #~ msgstr "Anslutningsinformation"
-
-#~ msgid "Passphrase"
-#~ msgstr "Lösenfras"
-
 #~ msgid "Hexadecimal Key:"
 #~ msgstr "Hexadecimal nyckel:"
-
-#~ msgid ""
-#~ "By default, the ESSID is set to your computer's name, %s, with no "
-#~ "encryption enabled."
-#~ msgstr ""
-#~ "Som standard är ESSID angivet till din dators namn, %s, och utan någon "
-#~ "kryptering aktiverad."
-
 #~ msgid "Create a new wireless network..."
 #~ msgstr "Skapa ett nytt trådlöst nätverk..."
-
 #~ msgid "Create a new wireless network"
 #~ msgstr "Skapa ett nytt trådlöst nätverk"
-
-#~ msgid "Connect to other wireless network"
-#~ msgstr "Anslut till annat trådlöst nätverk"
-
 #~ msgid "Active Connection Information"
 #~ msgstr "Information om aktiv anslutning"
-
 #~ msgid "Connect with encryption enabled"
 #~ msgstr "Anslut med kryptering aktiverad"
-
 #~ msgid "Always Trust this Wireless Network"
 #~ msgstr "Lita alltid på detta trådlösa nätverk"
-
 #~ msgid "Don't remind me again"
 #~ msgstr "Påminn mig inte igen"
-
 #~ msgid "Key type:"
 #~ msgstr "Nyckeltyp:"
-
 #~ msgid "Connection to the wireless network '%s' failed.\n"
 #~ msgstr "Anslutning till det trådlösa nätverket \"%s\" misslyckades.\n"
-
 #~ msgid "Connection to the wired network failed.\n"
 #~ msgstr "Anslutning till det trådburna nätverket misslyckades.\n"
-
 #~ msgid ""
 #~ "<span weight=\"bold\" size=\"larger\">VPN Login Failure</span>\n"
 #~ "\n"
@@ -1150,7 +1096,6 @@ msgstr "Nätverksanslutningen har kopplats från."
 #~ "Kunde inte starta VPN-anslutningen \"%s\" på grund av ett inloggningfel.\n"
 #~ "\n"
 #~ "VPN-tjänsten sa: \"%s\""
-
 #~ msgid ""
 #~ "<span weight=\"bold\" size=\"larger\">VPN Start Failure</span>\n"
 #~ "\n"
@@ -1165,7 +1110,6 @@ msgstr "Nätverksanslutningen har kopplats från."
 #~ "av VPN-programmet.\n"
 #~ "\n"
 #~ "VPN-tjänsten sa: \"%s\""
-
 #~ msgid ""
 #~ "<span weight=\"bold\" size=\"larger\">VPN Connect Failure</span>\n"
 #~ "\n"
@@ -1179,7 +1123,6 @@ msgstr "Nätverksanslutningen har kopplats från."
 #~ "anslutningsfel.\n"
 #~ "\n"
 #~ "VPN-tjänsten sa: \"%s\""
-
 #~ msgid ""
 #~ "<span weight=\"bold\" size=\"larger\">VPN Configuration Error</span>\n"
 #~ "\n"
@@ -1192,7 +1135,6 @@ msgstr "Nätverksanslutningen har kopplats från."
 #~ "VPN-anslutningen \"%s\" konfigurerades inte korrekt.\n"
 #~ "\n"
 #~ "VPN-tjänsten sa: \"%s\""
-
 #~ msgid ""
 #~ "<span weight=\"bold\" size=\"larger\">VPN Connect Failure</span>\n"
 #~ "\n"
@@ -1207,195 +1149,127 @@ msgstr "Nätverksanslutningen har kopplats från."
 #~ "returnerade en lämplig nätverkskonfiguration.\n"
 #~ "\n"
 #~ "VPN-tjänsten sa: \"%s\""
-
 #~ msgid "_Stop All Wireless Devices"
 #~ msgstr "_Stoppa alla trådlösa enheter"
-
 #~ msgid "_Start All Wireless Devices"
 #~ msgstr "_Starta alla trådlösa enheter"
-
 #~ msgid "_Wireless Network Discovery"
 #~ msgstr "_Upptäckt av trådlösa nätverk"
-
 #~ msgid "Always Search"
 #~ msgstr "Sök alltid"
-
 #~ msgid "Search Only When Disconnected"
 #~ msgstr "Sök endast då frånkopplad"
-
 #~ msgid "Never Search"
 #~ msgstr "Sök aldrig"
-
 #~ msgid "Stop All Wireless Devices"
 #~ msgstr "Stoppa alla trådlösa enheter"
-
 #~ msgid "_OK"
 #~ msgstr "_OK"
-
 #~ msgid ""
 #~ "Dependent on the private network you want to connect to, you need to "
 #~ "select what type of connection you want to create."
 #~ msgstr ""
 #~ "Beroende på det privata nätverk som du vill ansluta till måste du välja "
 #~ "vilken typ av anslutning som du vill skapa."
-
 #~ msgid "%s"
 #~ msgstr "%s"
-
 #~ msgid "Error"
 #~ msgstr "Fel"
-
 #~ msgid "VPN connection"
 #~ msgstr "VPN-anslutning"
-
 #~ msgid "VPN Connection"
 #~ msgstr "VPN-anslutning"
-
 #~ msgid "Create New Wireless Network..."
 #~ msgstr "Skapa nytt trådlöst nätverk..."
-
 #~ msgid "Start All Wireless Devices"
 #~ msgstr "Starta alla trådlösa enheter"
-
 #~ msgid "Wireless Network Discovery"
 #~ msgstr "Upptäckt av trådlösa nätverk"
-
 #~ msgid "Help"
 #~ msgstr "Hjälp"
-
 #~ msgid "Wired Network"
 #~ msgstr "Trådbundet nätverk"
-
 #~ msgid "Reduced Network Functionality"
 #~ msgstr "Reducerad nätverksfunktionalitet"
-
 #~ msgid "%s  It will not be completely functional."
 #~ msgstr "%s  Det kommer inte att vara helt fungerande."
-
 #~ msgid "It will not be completely functional."
 #~ msgstr "Det kommer inte att vara helt fungerande."
-
 #~ msgid "Other Wireless Networks..."
 #~ msgstr "Andra trådlösa nätverk..."
-
 #~ msgid "Export"
 #~ msgstr "Exportera"
-
-#~ msgid "Username:"
-#~ msgstr "Användarnamn:"
-
 #~ msgid "Domain:"
 #~ msgstr "Domän:"
-
 #~ msgid "VPN Connection Manager"
 #~ msgstr "VPN-anslutningshanterare"
-
-#~ msgid "Connection Name"
-#~ msgstr "Anslutningsnamn"
-
 #~ msgid "Required Information"
 #~ msgstr "Nödvändig information"
-
 #~ msgid "Username:  %s"
 #~ msgstr "Användarnamn:  %s"
-
 #~ msgid "Username: %s"
 #~ msgstr "Användarnamn: %s"
-
 #~ msgid "Routes:  %s"
 #~ msgstr "Vägar:  %s"
-
 #~ msgid "Routes: %s"
 #~ msgstr "Vägar: %s"
-
 #~ msgid "Domain:  %s"
 #~ msgstr "Domän:  %s"
-
 #~ msgid "Domain: %s"
 #~ msgstr "Domän: %s"
-
 #~ msgid "Scanning for wireless networks..."
 #~ msgstr "Söker efter trådlösa nätverk..."
-
 #~ msgid "Pause Wireless Scanning"
 #~ msgstr "Gör paus i sökning efter trådlösa nätverk"
-
 #~ msgid "Resume Wireless Scanning"
 #~ msgstr "Återuppta sökning efter trådlösa nätverk"
-
 #~ msgid "About"
 #~ msgstr "Om"
-
 #~ msgid "progress bar label|%d %%"
 #~ msgstr "%d %%"
-
 #~ msgid "*"
 #~ msgstr "*"
-
 #~ msgid "Copyright (C) 2004-2006 Red Hat, Inc."
 #~ msgstr "Copyright © 2004-2006 Red Hat, Inc."
-
-#~ msgid "Copyright © 2004-2006 Red Hat, Inc."
-#~ msgstr "Copyright © 2004-2006 Red Hat, Inc."
-
 #~ msgid "Copyright (C) 2004-2007 Red Hat, Inc."
 #~ msgstr "Copyright © 2004-2007 Red Hat, Inc."
-
 #~ msgid "Copyright © 2004-2007 Red Hat, Inc."
 #~ msgstr "Copyright © 2004-2007 Red Hat, Inc."
-
 #~ msgid "Copyright (C) 2004-2008 Red Hat, Inc."
 #~ msgstr "Copyright © 2004-2008 Red Hat, Inc."
-
 #~ msgid "Copyright © 2004-2008 Red Hat, Inc."
 #~ msgstr "Copyright © 2004-2008 Red Hat, Inc."
-
 #~ msgid "Other Wireless Networks"
 #~ msgstr "Andra trådlösa nätverk"
-
 #~ msgid "VPN"
 #~ msgstr "VPN"
-
 #~ msgid ""
 #~ "The NetworkManager applet could not find some required resources.  It "
 #~ "cannot continue."
 #~ msgstr ""
 #~ "Panelprogrammet för nätverkshantering kunde inte hitta en del nödvändiga "
 #~ "resurser. Det kan inte fortsätta."
-
 #~ msgid "Create new wireless network..."
 #~ msgstr "Skapa nytt trådlöst nätverk..."
-
 #~ msgid "Modify Wireless Networks"
 #~ msgstr "Ändra trådlösa nätverk"
-
 #~ msgid "<span weight=\"bold\">Wireless Networks:</span>"
 #~ msgstr "<span weight=\"bold\">Trådlösa nätverk:</span>"
-
 #~ msgid "There are no network devices..."
 #~ msgstr "Det finns inga nätverksenheter..."
-
-#~ msgid "A wired network connection is currently active..."
-#~ msgstr "En kabelburen nätverksanslutning är aktiv för tillfället..."
-
 #~ msgid "Modify Wireless Network"
 #~ msgstr "Ändra trådlöst nätverk"
-
 #~ msgid "Wireless networks"
 #~ msgstr "Trådlösa nätverk"
-
 #~ msgid ""
 #~ "A passphrase or WEP key is required to access the wireless network '%s'."
 #~ msgstr ""
 #~ "En lösenfras eller en WEP-nyckel krävs för att komma åt det trådlösa "
 #~ "nätverket \"%s\"."
-
 #~ msgid "About..."
 #~ msgstr "Om..."
-
 #~ msgid "Wireless Network Login Confirmation"
 #~ msgstr "Inloggningsbekräftelse för trådlöst nätverk"
-
 #~ msgid ""
 #~ "You have chosen log in to the wireless network '%s'.  If you are sure "
 #~ "this wireless network is secure, click the checkbox below and "
@@ -1407,45 +1281,3 @@ msgstr "Nätverksanslutningen har kopplats från."
 #~ "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/th.po b/po/th.po
new file mode 100644
index 00000000..aeb3df39
--- /dev/null
+++ b/po/th.po
@@ -0,0 +1,943 @@
+# Thai translation of NetworkManager.
+# Copyright (C) 2007 Free Software Foundation, Inc.
+# This file is distributed under the same license as the NetworkManager package.
+# Isriya Paireepairit <markpeak@gmail.com>, 2006.
+# Theppitak Karoonboonyanan <thep@linux.thai.net>, 2006-2007.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: NetworkManager\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-01-23 23:12+0700\n"
+"PO-Revision-Date: 2007-01-23 23:15+0700\n"
+"Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
+"Language-Team: Thai <l10n@opentle.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;"
+
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:926
+#, c-format
+msgid "Passphrase for wireless network %s"
+msgstr "วลีรหัสผ่านสำหรับเครือข่ายไร้สาย %s"
+
+#: ../gnome/applet/applet-dbus.c:274
+#, c-format
+msgid "Connection to the wireless network '%s' failed."
+msgstr "เชื่อมต่อไปยังเครือข่ายไร้สาย '%s' ไม่สำเร็จ"
+
+#: ../gnome/applet/applet-dbus.c:279
+msgid "Connection to the wired network failed."
+msgstr "เชื่อมต่อไปยังเครือข่ายแบบมีสายไม่สำเร็จ"
+
+#: ../gnome/applet/applet.c:182
+msgid "Error displaying connection information:"
+msgstr "เกิดปัญหาในการแสดงข้อมูลการเชื่อมต่อ:"
+
+#: ../gnome/applet/applet.c:200
+msgid "Could not find some required resources (the glade file)!"
+msgstr "หาข้อมูลบางอย่างที่ต้องใช้ (แฟ้ม glade) ไม่พบ!"
+
+#: ../gnome/applet/applet.c:210
+msgid "No active connections!"
+msgstr "ไม่มีการเชื่อมต่อที่ใช้งานอยู่!"
+
+#: ../gnome/applet/applet.c:227
+#, c-format
+msgid "%d Mb/s"
+msgstr "%d Mb/s"
+
+#: ../gnome/applet/applet.c:230
+#, c-format
+msgid "Wired Ethernet (%s)"
+msgstr "อีเทอร์เน็ตมีสาย (%s)"
+
+#: ../gnome/applet/applet.c:232
+#, c-format
+msgid "Wireless Ethernet (%s)"
+msgstr "อีเทอร์เน็ตไร้สาย (%s)"
+
+#: ../gnome/applet/applet.c:238
+msgid "Unknown"
+msgstr "ไม่มีข้อมูล"
+
+#: ../gnome/applet/applet.c:330 ../gnome/applet/applet.c:357
+msgid "NetworkManager Applet"
+msgstr "แอพเพล็ต NetworkManager"
+
+#: ../gnome/applet/applet.c:332
+msgid ""
+"Copyright © 2004-2006 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+msgstr ""
+"สงวนลิขสิทธิ์ © 2004-2006 Red Hat, Inc.\n"
+"สงวนลิขสิทธิ์ © 2005-2006 Novell, Inc."
+
+#: ../gnome/applet/applet.c:334 ../gnome/applet/applet.c:361
+msgid ""
+"Notification area applet for managing your network devices and connections."
+msgstr "แอพเพล็ตพื้นที่แจ้งเหตุสำหรับจัดการอุปกรณ์เครือข่ายและการเชื่อมต่อ"
+
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:365
+msgid "translator-credits"
+msgstr ""
+"อิสริยะ ไพรีพ่ายฤทธิ์ <markpeak@gmail.com>\n"
+"เทพพิทักษ์ การุญบุญญานันท์ <thep@linux.thai.net>"
+
+#: ../gnome/applet/applet.c:359
+msgid ""
+"Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+msgstr ""
+"สงวนลิขสิทธิ์ © 2004-2005 Red Hat, Inc.\n"
+"สงวนลิขสิทธิ์ © 2005-2006 Novell, Inc."
+
+#: ../gnome/applet/applet.c:421
+msgid "VPN Login Failure"
+msgstr "ล็อกอิน VPN ไม่สำเร็จ"
+
+#: ../gnome/applet/applet.c:422
+#, c-format
+msgid "Could not start the VPN connection '%s' due to a login failure."
+msgstr "ไม่สามารถเริ่มการเชื่อมต่อ VPN '%s' เนื่องจากล็อกอินไม่สำเร็จ"
+
+#: ../gnome/applet/applet.c:426
+msgid "VPN Start Failure"
+msgstr "เริ่มต้น VPN ไม่สำเร็จ"
+
+#: ../gnome/applet/applet.c:427
+#, 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:431 ../gnome/applet/applet.c:441
+msgid "VPN Connect Failure"
+msgstr "เชื่อมต่อ VPN ไม่สำเร็จ"
+
+#: ../gnome/applet/applet.c:432
+#, c-format
+msgid "Could not start the VPN connection '%s' due to a connection error."
+msgstr "ไม่สามารถเริ่มการเชื่อมต่อ VPN '%s' เนื่องจากเกิดปัญหาในการเชื่อมต่อ"
+
+#: ../gnome/applet/applet.c:436
+msgid "VPN Configuration Error"
+msgstr "ตั้งค่า VPN ผิดพลาด"
+
+#: ../gnome/applet/applet.c:437
+#, c-format
+msgid "The VPN connection '%s' was not correctly configured."
+msgstr "การเชื่อมต่อ VPN '%s' ตั้งค่าไว้ไม่ถูกต้อง"
+
+#: ../gnome/applet/applet.c:442
+#, 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:512
+msgid "VPN Login Message"
+msgstr "ข้อความล็อกอิน VPN"
+
+#: ../gnome/applet/applet.c:737 ../gnome/applet/applet.c:2635
+#: ../gnome/applet/other-network-dialog.c:458
+#: ../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:749
+#, c-format
+msgid "The network device \"%s (%s)\" does not support wireless scanning."
+msgstr "อุปกรณ์เครือข่าย \"%s (%s)\" ไม่สนับสนุนการค้นหาเครือข่ายไร้สาย"
+
+#: ../gnome/applet/applet.c:757
+#, c-format
+msgid "The network device \"%s (%s)\" does not support link detection."
+msgstr "อุปกรณ์เครือข่าย \"%s (%s)\" ไม่สนับสนุนการค้นหาเครือข่ายอัตโนมัติ"
+
+#. Note to translators: this is used if no essid is known
+#: ../gnome/applet/applet.c:905 ../gnome/applet/applet.c:1103
+msgid "(unknown)"
+msgstr "(ไม่รู้จัก)"
+
+#: ../gnome/applet/applet.c:911
+#, c-format
+msgid "Preparing device %s for the wired network..."
+msgstr "กำลังเตรียมอุปกรณ์ %s สำหรับเครือข่ายมีสาย..."
+
+#: ../gnome/applet/applet.c:913
+#, c-format
+msgid "Preparing device %s for the wireless network '%s'..."
+msgstr "กำลังเตรียมอุปกรณ์ %s สำหรับเครือข่ายไร้สาย '%s'..."
+
+#: ../gnome/applet/applet.c:921
+#, c-format
+msgid "Configuring device %s for the wired network..."
+msgstr "กำลังตั้งค่าอุปกรณ์ %s สำหรับเครือข่ายมีสาย..."
+
+#: ../gnome/applet/applet.c:923
+#, c-format
+msgid "Attempting to join the wireless network '%s'..."
+msgstr "กำลังติดต่อขอเข้าเครือข่ายไร้สาย '%s'..."
+
+#: ../gnome/applet/applet.c:931
+#, c-format
+msgid "Waiting for Network Key for the wireless network '%s'..."
+msgstr "กำลังคอยกุญแจเข้าสู่เครือข่ายไร้สาย '%s'..."
+
+#: ../gnome/applet/applet.c:939 ../gnome/applet/applet.c:949
+msgid "Requesting a network address from the wired network..."
+msgstr "กำลังขอที่อยู่จากเครือข่ายมีสาย..."
+
+#: ../gnome/applet/applet.c:941 ../gnome/applet/applet.c:951
+#, c-format
+msgid "Requesting a network address from the wireless network '%s'..."
+msgstr "กำลังขอที่อยู่จากเครือข่ายไร้สาย '%s'..."
+
+#: ../gnome/applet/applet.c:959
+msgid "Finishing connection to the wired network..."
+msgstr "เชื่อมต่อกับเครือข่ายมีสายสำเร็จ..."
+
+#: ../gnome/applet/applet.c:961
+#, c-format
+msgid "Finishing connection to the wireless network '%s'..."
+msgstr "เชื่อมต่อกับเครือข่ายไร้สาย '%s' สำเร็จ..."
+
+#: ../gnome/applet/applet.c:1078
+msgid "NetworkManager is not running"
+msgstr "NetworkManager ไม่ได้ทำงานอยู่"
+
+#: ../gnome/applet/applet.c:1086 ../gnome/applet/applet.c:1843
+msgid "Networking disabled"
+msgstr "ปิดการใช้งานเครือข่ายอยู่"
+
+#: ../gnome/applet/applet.c:1091
+msgid "No network connection"
+msgstr "ไม่ได้เชื่อมกับเครือข่าย"
+
+#: ../gnome/applet/applet.c:1096
+msgid "Wired network connection"
+msgstr "เชื่อมกับเครือข่ายมีสาย"
+
+#: ../gnome/applet/applet.c:1100
+msgid "Connected to an Ad-Hoc wireless network"
+msgstr "เชื่อมต่อกับเครือข่ายไร้สายแบบ Ad-Hoc"
+
+#: ../gnome/applet/applet.c:1102
+#, c-format
+msgid "Wireless network connection to '%s' (%d%%)"
+msgstr "การเชื่อมต่อเครือข่ายไร้สาย '%s' (%d%%)"
+
+#: ../gnome/applet/applet.c:1123
+#, c-format
+msgid "VPN connection to '%s'"
+msgstr "เชื่อมต่อ VPN ไปยัง '%s'"
+
+#: ../gnome/applet/applet.c:1131
+#, c-format
+msgid "VPN connecting to '%s'"
+msgstr "กำลังเชื่อมต่อ VPN ไปยัง '%s'"
+
+#: ../gnome/applet/applet.c:1556
+msgid "_Connect to Other Wireless Network..."
+msgstr "เ_ชื่อมต่อกับเครือข่ายไร้สายอื่น..."
+
+#: ../gnome/applet/applet.c:1577
+msgid "Create _New Wireless Network..."
+msgstr "_สร้างเครือข่ายไร้สายใหม่..."
+
+#: ../gnome/applet/applet.c:1700
+msgid "_VPN Connections"
+msgstr "_การเชื่อมต่อ VPN"
+
+#: ../gnome/applet/applet.c:1745
+msgid "_Configure VPN..."
+msgstr "_ตั้งค่า VPN..."
+
+#: ../gnome/applet/applet.c:1749
+msgid "_Disconnect VPN..."
+msgstr "ตั_ดการเชื่อมต่อ VPN..."
+
+#: ../gnome/applet/applet.c:1771
+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:1782
+#, c-format
+msgid "Connect to %s..."
+msgstr "เชื่อมต่อไปยัง %s..."
+
+#: ../gnome/applet/applet.c:1788
+#, c-format
+msgid "Disconnect from %s..."
+msgstr "ตัดการเชื่อมต่อจาก %s..."
+
+#: ../gnome/applet/applet.c:1837
+msgid "No network devices have been found"
+msgstr "ไม่พบอุปกรณ์เครือข่ายในระบบ"
+
+#: ../gnome/applet/applet.c:2029
+msgid "NetworkManager is not running..."
+msgstr "NetworkManager ไม่ได้ทำงานอยู่..."
+
+#. 'Enable Networking' item
+#: ../gnome/applet/applet.c:2210
+msgid "Enable _Networking"
+msgstr "เปิดใช้เ_ครือข่าย"
+
+#. 'Enable Wireless' item
+#: ../gnome/applet/applet.c:2216
+msgid "Enable _Wireless"
+msgstr "เปิดใช้ไ_ร้สาย"
+
+#. 'Connection Information' item
+#: ../gnome/applet/applet.c:2222
+msgid "Connection _Information"
+msgstr "_ข้อมูลการเชื่อมต่อ"
+
+#. Help item
+#: ../gnome/applet/applet.c:2233
+msgid "_Help"
+msgstr "_วิธีใช้"
+
+#. About item
+#: ../gnome/applet/applet.c:2242
+msgid "_About"
+msgstr "เ_กี่ยวกับ"
+
+#: ../gnome/applet/applet.c:2824
+msgid ""
+"The NetworkManager applet could not find some required resources.  It cannot "
+"continue.\n"
+msgstr "แอพเพล็ต NetworkManager หาข้อมูลที่ต้องการไม่สำเร็จ ไม่สามารถดำเนินการต่อได้\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 บิต แบบ 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:93
+#: ../src/nm-ap-security-wpa-eap.c:117
+msgid "WPA2 Enterprise"
+msgstr "WPA2 เอนเทอร์ไพรส์"
+
+#: ../gnome/applet/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:95
+#: ../src/nm-ap-security-wpa-eap.c:122
+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: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
+#, c-format
+msgid "Wireless Network (%s)"
+msgid_plural "Wireless Networks (%s)"
+msgstr[0] "เครือข่ายไร้สาย (%s)"
+
+#: ../gnome/applet/menu-items.c:164
+msgid "Wireless Network"
+msgid_plural "Wireless Networks"
+msgstr[0] "เครือข่ายไร้สาย"
+
+#: ../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 "สร้างเครือข่ายไร้สายใหม่"
+
+#: ../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
+msgid "Create New Wireless Network"
+msgstr "สร้างเครือข่ายไร้สายใหม่"
+
+#: ../gnome/applet/other-network-dialog.c:368
+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
+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 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 "หาคำโต้ตอบสำหรับการเชื่อมต่อ VPN ชนิด '%s' ไม่พบ กรุณาติดต่อผู้ดูแลระบบของคุณ"
+
+#: ../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 "เ_ชื่อมต่อ"
+
+#: ../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 "ที่อยู่ไอพี:"
+
+#: ../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 management:"
+msgstr "การจัดการกุญแจ:"
+
+#: ../gnome/applet/applet.glade.h:32
+msgid "Key:"
+msgstr "กุญแจ:"
+
+#: ../gnome/applet/applet.glade.h:33
+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:38
+msgid ""
+"Open System\n"
+"Shared Key"
+msgstr ""
+"ระบบเปิด\n"
+"ใช้กุญแจร่วมกัน"
+
+#: ../gnome/applet/applet.glade.h:40
+msgid "Other Wireless Network..."
+msgstr "เครือข่ายไร้สายอื่น..."
+
+#: ../gnome/applet/applet.glade.h:41
+msgid "Passphrase:"
+msgstr "วลีรหัสผ่าน:"
+
+#: ../gnome/applet/applet.glade.h:42
+msgid "Password:"
+msgstr "รหัสผ่าน:"
+
+#: ../gnome/applet/applet.glade.h:43
+msgid "Primary DNS:"
+msgstr "DNS หลัก:"
+
+#: ../gnome/applet/applet.glade.h:44
+msgid "Private Key File:"
+msgstr "แฟ้มกุญแจส่วนตัว:"
+
+#: ../gnome/applet/applet.glade.h:45
+msgid "Private Key Password:"
+msgstr "รหัสผ่านกุญแจส่วนตัว:"
+
+#: ../gnome/applet/applet.glade.h:46
+msgid "Secondary DNS:"
+msgstr "DNS สำรอง:"
+
+#: ../gnome/applet/applet.glade.h:47
+msgid "Select the CA Certificate File"
+msgstr "เลือกแฟ้มใบรับรอง CA"
+
+#: ../gnome/applet/applet.glade.h:48
+msgid "Select the Client Certificate File"
+msgstr "เลือกแฟ้มใบรับรองเครื่องลูกข่าย"
+
+#: ../gnome/applet/applet.glade.h:49
+msgid "Select the Private Key File"
+msgstr "เลือกแฟ้มกุญแจส่วนตัว"
+
+#: ../gnome/applet/applet.glade.h:50
+msgid "Show key"
+msgstr "แสดงกุญแจ"
+
+#: ../gnome/applet/applet.glade.h:51
+msgid "Show passphrase"
+msgstr "แสดงวลีรหัสผ่าน"
+
+#: ../gnome/applet/applet.glade.h:52
+msgid "Show password"
+msgstr "แสดงรหัสผ่าน"
+
+#: ../gnome/applet/applet.glade.h:53
+msgid "Show passwords"
+msgstr "แสดงรหัสผ่าน"
+
+#: ../gnome/applet/applet.glade.h:54
+msgid "Speed:"
+msgstr "ความเร็ว:"
+
+#: ../gnome/applet/applet.glade.h:55
+msgid "Subnet Mask:"
+msgstr "ซับเน็ตแมสก์:"
+
+#: ../gnome/applet/applet.glade.h:56
+msgid "Type:"
+msgstr "ชนิด:"
+
+#: ../gnome/applet/applet.glade.h:57
+msgid "User Name:"
+msgstr "ชื่อผู้ใช้:"
+
+#: ../gnome/applet/applet.glade.h:58
+msgid "Wireless Network Key Required"
+msgstr "ต้องการกุญแจเข้าเครือข่ายไร้สาย"
+
+#: ../gnome/applet/applet.glade.h:59
+msgid "Wireless _adapter:"
+msgstr "_อุปกรณ์ไร้สาย:"
+
+#: ../gnome/applet/applet.glade.h:60
+msgid "_Always Trust this Wireless Network"
+msgstr "เ_ชื่อถือเครือข่ายไร้สายนี้เสมอ"
+
+#: ../gnome/applet/applet.glade.h:61
+msgid "_Don't remind me again"
+msgstr "ไ_ม่ต้องเตือนฉันอีก"
+
+#: ../gnome/applet/applet.glade.h:62
+msgid "_Fallback on this Network"
+msgstr "ใช้เครือข่ายนี้_สำรองแทน"
+
+#: ../gnome/applet/applet.glade.h:63
+msgid "_Login to Network"
+msgstr "_ล็อกอินเข้าเครือข่าย"
+
+#: ../gnome/applet/applet.glade.h:64
+msgid "_Network Name:"
+msgstr "_ชื่อเครือข่าย:"
+
+#: ../gnome/applet/applet.glade.h:65
+msgid "_Wireless Security:"
+msgstr "การรักษา_ความปลอดภัยเครือข่ายไร้สาย:"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:417
+msgid "Cannot add VPN connection"
+msgstr "ไม่สามารถเพิ่มการเชื่อมต่อ VPN"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:419
+msgid ""
+"No suitable VPN software was found on your system. Contact your system "
+"administrator."
+msgstr "ไม่มีซอฟต์แวร์ VPN ที่เหมาะสมอยู่ในระบบ กรุณาติดต่อผู้ดูแลระบบ"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:461
+msgid "Cannot import VPN connection"
+msgstr "ไม่สามารถนำเข้าการเชื่อมต่อ VPN"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:463
+#, c-format
+msgid ""
+"Cannot find suitable software for VPN connection type '%s' to import the "
+"file '%s'. Contact your system administrator."
+msgstr "ไม่มีซอฟต์แวร์ VPN แบบ '%s' ที่เหมาะสมจากแฟ้มนำเข้า '%s' กรุณาติดต่อผู้ดูแลระบบ"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:580
+#, c-format
+msgid "Error retrieving VPN connection '%s'"
+msgstr "เกิดปัญหาในการรับข้อมูลการเชื่อมต่อ VPN '%s'"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:583
+#, c-format
+msgid ""
+"Could not find the UI files for VPN connection type '%s'. Contact your "
+"system administrator."
+msgstr "ไม่พบแฟ้ม UI สำหรับการเชื่อมต่อ VPN แบบ '%s' กรุณาติดต่อผู้ดูแลระบบ"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:727
+#, c-format
+msgid "Delete VPN connection \"%s\"?"
+msgstr "ลบการเชื่อมต่อ VPN \"%s\" หรือไม่?"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:730
+#, 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\" จะสูญหายทั้งหมด และคุณอาจต้องสอบถามผู้ดูแลระบบ "
+"เพื่อขอข้อมูลในการสร้างการเชื่อมต่อใหม่"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:924
+msgid "Unable to load"
+msgstr "โหลดไม่สำเร็จ"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.c:926
+msgid "Cannot find some needed resources (the glade file)!"
+msgstr "ไม่พบข้อมูลบางอย่างที่ต้องใช้ (แฟ้ม glade)!"
+
+#. druid_window = GTK_DIALOG (gtk_dialog_new_with_buttons (_("Create VPN Connection"),
+#. NULL,
+#. GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+#. GTK_STOCK_CANCEL,
+#. GTK_RESPONSE_REJECT,
+#. GTK_STOCK_APPLY,
+#. GTK_RESPONSE_ACCEPT,
+#. NULL));
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1081
+msgid "Create VPN Connection"
+msgstr "สร้างการเชื่อมต่อ VPN"
+
+#. gtk_container_add (GTK_CONTAINER (druid_window->vbox), GTK_WIDGET(gtk_label_new("Some label")));
+#. gtk_box_pack_start (GTK_BOX (druid_window->vbox), GTK_WIDGET(druid), TRUE,TRUE,0);
+#. gtk_box_pack_start (GTK_BOX (druid_window->vbox), GTK_WIDGET(gtk_label_new("Some label")), TRUE,TRUE,0);
+#. toplevel = gtk_widget_get_toplevel (GTK_WIDGET (druid));
+#. gtk_signal_connect (GTK_OBJECT (toplevel), "delete_event", GTK_SIGNAL_FUNC (vpn_window_close), NULL);
+#. make the druid window modal wrt. our main window
+#. gtk_window_set_modal (druid_window, TRUE);
+#. gtk_window_set_transient_for (GTK_WINDOW(druid_window), GTK_WINDOW (dialog));
+#. Edit dialog
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1099
+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 "Delete the selected VPN connection"
+msgstr "ลบการเชื่อมต่อ VPN ที่เลือก"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
+msgid "E_xport"
+msgstr "_ส่งออก"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
+msgid "Edit the selected VPN connection"
+msgstr "แก้ไขการเชื่อมต่อ VPN ที่เลือก"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
+msgid "Export the VPN settings to a file"
+msgstr "ส่งออกข้อมูลการเชื่อมต่อ VPN ออกเป็นแฟ้ม"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
+msgid "Export the selected VPN connection to a file"
+msgstr "ส่งออกข้อมูลการเชื่อมต่อ VPN ที่เลือกออกเป็นแฟ้ม"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
+msgid "Manage Virtual Private Network Connections"
+msgstr "จัดการเชื่อมต่อ  Virtual Private Network"
+
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
+msgid "VPN Connections"
+msgstr "การเชื่อมต่อ VPN"
+
+#: ../src/nm-ap-security-wep.c:52
+msgid "40-bit WEP"
+msgstr "WEP 40 บิต"
+
+#: ../src/nm-ap-security-wep.c:54
+msgid "104-bit WEP"
+msgstr "WEP 104 บิต"
+
+#: ../src/nm-ap-security-wpa-psk.c:51
+msgid "WPA TKIP"
+msgstr "WPA TKIP"
+
+#: ../src/nm-ap-security-wpa-psk.c:53
+msgid "WPA CCMP"
+msgstr "WPA CCMP"
+
+#: ../src/nm-ap-security-wpa-psk.c:55
+msgid "WPA Automatic"
+msgstr "WPA อัตโนมัติ"
+
+#: ../src/nm-ap-security-wpa-psk.c:60
+msgid "WPA2 TKIP"
+msgstr "WPA2 TKIP"
+
+#: ../src/nm-ap-security-wpa-psk.c:62
+msgid "WPA2 CCMP"
+msgstr "WPA2 CCMP"
+
+#: ../src/nm-ap-security-wpa-psk.c:64
+msgid "WPA2 Automatic"
+msgstr "WPA2 อัตโนมัติ"
+
+#: ../src/nm-ap-security.c:334
+msgid "none"
+msgstr "ไม่มี"
+
+#: ../src/nm-netlink-monitor.c:174
+#, c-format
+msgid ""
+"unable to create netlink socket for monitoring wired ethernet devices - %s"
+msgstr "ไม่สามารถสร้างซ็อกเก็ต netlink สำหรับติดตามอุปกรณ์อีเทอร์เน็ตแบบมีสายได้ - %s"
+
+#: ../src/nm-netlink-monitor.c:192
+#, c-format
+msgid ""
+"unable to bind to netlink socket for monitoring wired ethernet devices - %s"
+msgstr "ไม่สามารถ bind กับซ็อกเก็ต netlink เพื่อติดตามอุปกรณ์อีเทอร์เน็ตแบบมีสายได้ - %s"
+
+#: ../src/nm-netlink-monitor.c:427
+msgid "operation took too long"
+msgstr "การดำเนินการใช้เวลานานผิดปกติ"
+
+#: ../src/nm-netlink-monitor.c:524
+msgid "received data from wrong type of sender"
+msgstr "ได้รับข้อมูลจากผู้ส่งไม่ถูกชนิด"
+
+#: ../src/nm-netlink-monitor.c:537
+msgid "received data from unexpected sender"
+msgstr "ได้รับข้อมูลจากผู้ส่งที่ไม่ต้องการ"
+
+#: ../src/nm-netlink-monitor.c:666
+msgid "too much data was sent over socket and some of it was lost"
+msgstr "ข้อมูลถูกส่งผ่านซ็อกเก็ตมากเกินไป และบางส่วนสูญหาย"
+
+#: ../src/nm-netlink-monitor.c:774
+msgid "error occurred while waiting for data on socket"
+msgstr "เกิดปัญหาระหว่างรอข้อมูลจากซ็อกเก็ต"
+
+#: ../gnome/applet/applet-dbus-devices.c:930
+#, c-format
+msgid "You are now connected to the Ad-Hoc wireless network '%s'."
+msgstr "คุณเชื่อมต่อกับเครือข่ายไร้สายแบบ Ad-Hoc '%s' แล้ว"
+
+#: ../gnome/applet/applet-dbus-devices.c:935
+#, c-format
+msgid "You are now connected to the wireless network '%s'."
+msgstr "คุณเชื่อมต่อกับเครือข่ายไร้สาย '%s' แล้ว"
+
+#: ../gnome/applet/applet-dbus-devices.c:942
+msgid "You are now connected to the wired network."
+msgstr "คุณเชื่อมต่อกับเครือข่ายแบบมีสายแล้ว"
+
+#: ../gnome/applet/applet-dbus-devices.c:948
+msgid "Connection Established"
+msgstr "เชื่อมต่อเครือข่ายแล้ว"
+
+#: ../gnome/applet/applet-dbus-devices.c:997
+msgid "Disconnected"
+msgstr "ตัดการเชื่อมต่อแล้ว"
+
+#: ../gnome/applet/applet-dbus-devices.c:998
+msgid "The network connection has been disconnected."
+msgstr "การเชื่อมต่อเครือข่ายถูกตัดแล้ว"
+
+#: ../src/nm-ap-security-leap.c:66 ../src/nm-ap-security-leap.c:82
+msgid "LEAP"
+msgstr "LEAP"
diff --git a/po/uk.po b/po/uk.po
index 2c0aa5c4..f07e1ed0 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: 2006-05-29 18:33+0200\n"
+"POT-Creation-Date: 2005-08-10 12:09+0300\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,81 +17,102 @@ 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"
 
-#: ../src/applet-compat.c:171 ../src/applet-dbus-info.c:919
+#. Setup a request to the keyring to save the network passphrase
+#: ../gnome/applet/applet-dbus-info.c:839
 #, c-format
 msgid "Passphrase for wireless network %s"
 msgstr "Парольна фраза бездротової мережі %s"
 
-#: ../src/applet-dbus.c:265
-#, fuzzy, c-format
-msgid "Connection to the wireless network '%s' failed."
+#: ../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"
 msgstr "Помилка з'єднання з бездротовою мережею '%s'.\n"
 
-#: ../src/applet-dbus.c:270
-#, fuzzy
-msgid "Connection to the wired network failed."
+#: ../gnome/applet/applet-dbus.c:603
+msgid "Connection to the wired network failed.\n"
 msgstr "Помилка з'єднання з дротовою мережею.\n"
 
-#: ../src/applet.c:184
-#, fuzzy
-msgid "Error displaying connection information:"
+#: ../gnome/applet/applet.c:192
+msgid "Error displaying connection information: "
 msgstr "Помилка відображення інформації про з'єднання: "
 
-#: ../src/applet.c:202
+#: ../gnome/applet/applet.c:217
 msgid "Could not find some required resources (the glade file)!"
 msgstr "Не вдається знайти деякі необхідні ресурси (не знайдено файл glade)!"
 
-#: ../src/applet.c:213
+#: ../gnome/applet/applet.c:227
 msgid "No active connections!"
 msgstr "Немає активних з'єднань!"
 
-#: ../src/applet.c:234
+#: ../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
 #, c-format
 msgid "Wired Ethernet (%s)"
 msgstr "Дротова мережа Ethernet (%s)"
 
-#: ../src/applet.c:236
+#: ../gnome/applet/applet.c:286
 #, c-format
 msgid "Wireless Ethernet (%s)"
 msgstr "Бездротова мережа Ethernet (%s)"
 
-#: ../src/applet.c:337 ../src/applet.c:362
+#: ../gnome/applet/applet.c:380 ../gnome/applet/applet.c:398
 msgid "NetworkManager Applet"
 msgstr "Аплет NetworkManager"
 
-#: ../src/applet.c:339 ../src/applet.c:364
-#, fuzzy
-msgid "Copyright © 2004-2005 Red Hat, Inc."
+#: ../gnome/applet/applet.c:382 ../gnome/applet/applet.c:400
+msgid "Copyright (C) 2004-2005 Red Hat, Inc."
 msgstr "Авторські права (C) 2004-2005 Red Hat, Inc."
 
-#: ../src/applet.c:340 ../src/applet.c:365
+#: ../gnome/applet/applet.c:383 ../gnome/applet/applet.c:401
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Аплет області сповіщення для керування мережними пристроями та з'єднаннями."
 
-#: ../src/applet.c:343 ../src/applet.c:370
-msgid "translator-credits"
-msgstr ""
-
-#: ../src/applet.c:426
-msgid "VPN Login Failure"
-msgstr ""
-
-#: ../src/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:486
+msgid "VPN Error"
+msgstr "Помилка VPN"
 
-#: ../src/applet.c:431
-msgid "VPN Start Failure"
+#: ../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\""
 msgstr ""
+"<span weight=\"bold\" size=\"larger\">Помилка входу у VPN</span>\n"
+"\n"
+"Через помилку входу не вдається запустити VPN-з'єднання '%s'.\n"
+"\n"
+"Повідомлення служби VPN: \"%s\""
 
-#: ../src/applet.c:432
-#, fuzzy, c-format
+#: ../gnome/applet/applet.c:495
+#, 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."
+"program.\n"
+"\n"
+"The VPN service said: \"%s\""
 msgstr ""
 "<span weight=\"bold\" size=\"larger\">Помилка запуску VPN</span>\n"
 "\n"
@@ -100,30 +121,45 @@ msgstr ""
 "\n"
 "Повідомлення служби VPN: \"%s\""
 
-#: ../src/applet.c:436 ../src/applet.c:446
-#, fuzzy
-msgid "VPN Connect Failure"
-msgstr "Налаштовування VPN"
-
-#: ../src/applet.c:437
-#, fuzzy, c-format
-msgid "Could not start the VPN connection '%s' due to a connection error."
-msgstr "Не вдається запустити з'єднання VPN '%s'"
-
-#: ../src/applet.c:441
-msgid "VPN Configuration Error"
+#: ../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\""
 msgstr ""
+"<span weight=\"bold\" size=\"larger\">Помилка з'єднання VPN</span>\n"
+"\n"
+"Не вдається відкрити VPN-з'єднання '%s' через помилку з'єднання.\n"
+"\n"
+"Повідомлення служби VPN: \"%s\""
 
-#: ../src/applet.c:442
+#: ../gnome/applet/applet.c:505
 #, c-format
-msgid "The VPN connection '%s' was not correctly configured."
+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\""
 
-#: ../src/applet.c:447
-#, fuzzy, c-format
+#: ../gnome/applet/applet.c:510
+#, 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."
+"return an adequate network configuration.\n"
+"\n"
+"The VPN service said: \"%s\""
 msgstr ""
 "<span weight=\"bold\" size=\"larger\">Помилка з'єднання VPN</span>\n"
 "\n"
@@ -132,13 +168,24 @@ msgstr ""
 "\n"
 "Повідомлення служби VPN: \"%s\""
 
-#: ../src/applet.c:517
-msgid "VPN Login Message"
+#: ../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\""
 msgstr ""
+"<span weight=\"bold\" size=\"larger\">Повідомлення входу VPN</span>\n"
+"\n"
+"Повідомлення VPN-з'єднання '%s':\n"
+"\n"
+"\"%s\""
 
-#: ../src/applet.c:741 ../src/applet.c:2508
-#: ../src/other-network-dialog.c:453
-#: ../src/passphrase-dialog.c:228
+#: ../gnome/applet/applet.c:795 ../gnome/applet/applet.c:2431
+#: ../gnome/applet/other-network-dialog.c:322
+#: ../gnome/applet/passphrase-dialog.c:397
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
@@ -146,168 +193,161 @@ msgstr ""
 "Аплет NetworkManager не може знайти деякі необхідні ресурси (не знайдено "
 "файл glade)."
 
-#: ../src/applet.c:753
+#: ../gnome/applet/applet.c:808
 #, c-format
 msgid "The network device \"%s (%s)\" does not support wireless scanning."
 msgstr ""
 "Мережний пристрій \"%s (%s)\" не підтримує сканування бездротової мережі."
 
-#: ../src/applet.c:761
+#: ../gnome/applet/applet.c:815
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
 msgstr "Мережний пристрій \"%s (%s)\" не підтримує виявлення зв'язку."
 
-#: ../src/applet.c:908
+#: ../gnome/applet/applet.c:936
 #, c-format
 msgid "Preparing device %s for the wired network..."
 msgstr "Пристрій %s готується до з'єднання з дротовою мережею..."
 
-#: ../src/applet.c:910
+#: ../gnome/applet/applet.c:938
 #, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
 msgstr "Пристрій %s готується до з'єднання з бездротовою мережею '%s'..."
 
-#: ../src/applet.c:918
+#: ../gnome/applet/applet.c:945
 #, c-format
 msgid "Configuring device %s for the wired network..."
 msgstr "Пристрій %s налаштовується для дротової мережі..."
 
-#: ../src/applet.c:920
+#: ../gnome/applet/applet.c:947
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
 msgstr "Спроба з'єднатись з бездротовою мережею '%s'..."
 
-#: ../src/applet.c:928
+#: ../gnome/applet/applet.c:954
 #, c-format
 msgid "Waiting for Network Key for the wireless network '%s'..."
 msgstr "Очікується мережний ключ бездротової мережі '%s'..."
 
-#: ../src/applet.c:936 ../src/applet.c:946
+#: ../gnome/applet/applet.c:961 ../gnome/applet/applet.c:970
 msgid "Requesting a network address from the wired network..."
 msgstr "Запитується мережна адреса дротової мережі..."
 
-#: ../src/applet.c:938 ../src/applet.c:948
+#: ../gnome/applet/applet.c:963 ../gnome/applet/applet.c:972
 #, c-format
 msgid "Requesting a network address from the wireless network '%s'..."
 msgstr "Запитується мережна адреса бездротової мережі '%s'..."
 
-#: ../src/applet.c:956
+#: ../gnome/applet/applet.c:979
 msgid "Finishing connection to the wired network..."
 msgstr "Завершується з'єднання з дротовою мережею..."
 
-#: ../src/applet.c:958
+#: ../gnome/applet/applet.c:981
 #, c-format
 msgid "Finishing connection to the wireless network '%s'..."
 msgstr "Завершується з'єднання з бездротовою мережею '%s'..."
 
-#: ../src/applet.c:1075
+#: ../gnome/applet/applet.c:1027
 msgid "NetworkManager is not running"
 msgstr "NetworkManager не запущено"
 
-#: ../src/applet.c:1083 ../src/applet.c:1828
-msgid "Networking disabled"
-msgstr ""
-
-#: ../src/applet.c:1088
+#: ../gnome/applet/applet.c:1038
 msgid "No network connection"
 msgstr "Немає з'єднання з мережею"
 
-#: ../src/applet.c:1093
+#: ../gnome/applet/applet.c:1045
 msgid "Wired network connection"
 msgstr "Дротове з'єднання з мережею"
 
-#: ../src/applet.c:1097
+#: ../gnome/applet/applet.c:1052
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "З'єднано з особливою бездротовою мережею"
 
-#: ../src/applet.c:1099
+#: ../gnome/applet/applet.c:1066
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "Бездротове мережне з'єднання з '%s' (%d%%)"
 
-#: ../src/applet.c:1120
+#: ../gnome/applet/applet.c:1091
 #, c-format
 msgid "VPN connection to '%s'"
 msgstr "VPN з'єднання до '%s'"
 
-#: ../src/applet.c:1128
-#, fuzzy, c-format
-msgid "VPN connecting to '%s'"
-msgstr "VPN з'єднання до '%s'"
-
-#: ../src/applet.c:1541
+#: ../gnome/applet/applet.c:1542
 msgid "_Connect to Other Wireless Network..."
 msgstr "_З'єднатись з іншою бездротовою мережею..."
 
-#: ../src/applet.c:1562
+#: ../gnome/applet/applet.c:1563
 msgid "Create _New Wireless Network..."
 msgstr "Створити _нову бездротову мережу..."
 
-#: ../src/applet.c:1685
-#, fuzzy
-msgid "_VPN Connections"
+#: ../gnome/applet/applet.c:1676
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:17
+msgid "VPN Connections"
 msgstr "Налаштовування VPN"
 
-#: ../src/applet.c:1730
-#, fuzzy
-msgid "_Configure VPN..."
+#: ../gnome/applet/applet.c:1703
+msgid "Configure VPN..."
 msgstr "Налаштовування VPN..."
 
-#: ../src/applet.c:1734
-#, fuzzy
-msgid "_Disconnect VPN..."
+#: ../gnome/applet/applet.c:1707
+msgid "Disconnect VPN..."
 msgstr "Від'єднання від VPN..."
 
-#: ../src/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
-#: ../src/applet.c:1767
-#, fuzzy, c-format
-msgid "Connect to %s..."
-msgstr "З'єднатись з:"
+#: ../gnome/applet/applet.c:1730
+msgid "Dial Up"
+msgstr "Комутаційне з'єднання"
 
-#: ../src/applet.c:1773
-#, fuzzy, c-format
-msgid "Disconnect from %s..."
-msgstr "Від'єднання від VPN..."
-
-#: ../src/applet.c:1822
+#: ../gnome/applet/applet.c:1790
 msgid "No network devices have been found"
 msgstr "Не було знайдено мережних пристроїв"
 
-#: ../src/applet.c:2014
+#: ../gnome/applet/applet.c:1955
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager не запущено..."
 
-#. 'Enable Networking' item
-#: ../src/applet.c:2170
-msgid "Enable _Networking"
-msgstr ""
+#: ../gnome/applet/applet.c:2023
+msgid "_Stop All Wireless Devices"
+msgstr "З_упинити усі бездротові пристрої"
 
-#. 'Enable Wireless' item
-#: ../src/applet.c:2176
-msgid "Enable _Wireless"
-msgstr ""
+#: ../gnome/applet/applet.c:2028
+msgid "_Start All Wireless Devices"
+msgstr "_Запустити усі бездротові пристрої"
 
-#. 'Connection Information' item
-#: ../src/applet.c:2182
+#: ../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 "Ніколи не шукати"
+
+#. Stop All Wireless Devices item
+#: ../gnome/applet/applet.c:2090
+msgid "Stop All Wireless Devices"
+msgstr "Зупинити усі бездротові пристрої"
+
+#: ../gnome/applet/applet.c:2096
 msgid "Connection _Information"
 msgstr "_Інформація про з'єднання"
 
-#. Help item
-#: ../src/applet.c:2193
+#: ../gnome/applet/applet.c:2104
 msgid "_Help"
 msgstr "_Довідка"
 
-#. About item
-#: ../src/applet.c:2202
+#: ../gnome/applet/applet.c:2111
 msgid "_About"
 msgstr "_Про програму"
 
-#: ../src/applet.c:2667
+#: ../gnome/applet/applet.c:2581
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
@@ -315,95 +355,24 @@ msgstr ""
 "Аплет NetworkManager не може знайти деякі необхідні ресурси.  Продовжувати "
 "роботу неможливо.\n"
 
-#: ../src/wireless-security-option.c:157
-msgid "Open System"
-msgstr ""
-
-#: ../src/wireless-security-option.c:160
-msgid "Shared Key"
-msgstr ""
-
-#: ../src/wireless-security-option.c:208
-msgid "Automatic (Default)"
-msgstr ""
-
-#: ../src/wireless-security-option.c:215
-msgid "AES-CCMP"
-msgstr ""
-
-#: ../src/wireless-security-option.c:223
-msgid "TKIP"
-msgstr ""
-
-#: ../src/wireless-security-option.c:231
-msgid "Dynamic WEP"
-msgstr ""
-
-#: ../src/wso-none.c:53
-msgid "None"
-msgstr ""
-
-#: ../src/wso-wep-ascii.c:138
-msgid "WEP 64/128-bit ASCII"
-msgstr ""
-
-#: ../src/wso-wep-hex.c:135
-msgid "WEP 64/128-bit Hex"
-msgstr ""
-
-#: ../src/wso-wep-passphrase.c:135
-#, fuzzy
-msgid "WEP 128-bit Passphrase"
-msgstr "Парольна фраза:"
-
-#: ../src/wso-wpa-eap.c:237
-msgid "PEAP"
-msgstr ""
-
-#: ../src/wso-wpa-eap.c:238
-msgid "TLS"
-msgstr ""
-
-#: ../src/wso-wpa-eap.c:239
-msgid "TTLS"
-msgstr ""
-
-#: ../src/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 ""
-
-#: ../src/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 ""
-
-#: ../src/wso-wpa-psk.c:178
-msgid "WPA2 Personal"
-msgstr ""
-
-#: ../src/wso-wpa-psk.c:180
-msgid "WPA Personal"
-msgstr ""
-
-#: ../src/eggtrayicon.c:134
+#: ../gnome/applet/eggtrayicon.c:118
 msgid "Orientation"
 msgstr "Орієнтація"
 
-#: ../src/eggtrayicon.c:135
+#: ../gnome/applet/eggtrayicon.c:119
 msgid "The orientation of the tray."
 msgstr "Орієнтація лотка."
 
-#: ../src/menu-items.c:88
+#: ../gnome/applet/menu-items.c:89
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Дротова мережа (%s)"
 
-#: ../src/menu-items.c:91
+#: ../gnome/applet/menu-items.c:92
 msgid "_Wired Network"
 msgstr "_Дротова мережа"
 
-#: ../src/menu-items.c:162
+#: ../gnome/applet/menu-items.c:165
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
@@ -411,75 +380,68 @@ msgstr[0] "Бездротова мережа (%s)"
 msgstr[1] "Бездротові мережі (%s)"
 msgstr[2] "Бездротові мережі (%s)"
 
-#: ../src/menu-items.c:164
+#: ../gnome/applet/menu-items.c:167
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Бездротова мережа"
 msgstr[1] "Бездротові мережі"
 msgstr[2] "Бездротові мережі"
 
-#: ../src/menu-items.c:343
+#: ../gnome/applet/menu-items.c:309
 msgid " (invalid Unicode)"
 msgstr " (неправильний Юнікод)"
 
-#: ../src/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: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 "Шістнадцятковий ключ:"
 
-#: ../src/other-network-dialog.c:358
+#: ../gnome/applet/other-network-dialog.c:232
 msgid "Create new wireless network"
 msgstr "Створити новий бездротовий пристрій"
 
-#: ../src/other-network-dialog.c:359
-#, fuzzy
+#: ../gnome/applet/other-network-dialog.c:233
 msgid ""
-"Enter the name and security settings of the wireless network you wish to "
+"Enter the ESSID and security settings of the wireless network you wish to "
 "create."
 msgstr ""
 "Введіть ESSID та параметри безпеки бездротової мережі, яку ви бажаєте "
 "створити."
 
-#: ../src/other-network-dialog.c:363
-#, fuzzy
-msgid "Create New Wireless Network"
-msgstr "Створити _нову бездротову мережу..."
+#: ../gnome/applet/other-network-dialog.c:234
+msgid "By default, the ESSID is set to your computer's name,"
+msgstr "Типово, значення ESSID таке ж як назва комп'ютера,"
 
-#: ../src/other-network-dialog.c:368
-#, fuzzy
-msgid "Existing wireless network"
+#: ../gnome/applet/other-network-dialog.c:236
+msgid ", with no encryption enabled."
+msgstr ", без увімкнення шифрування"
+
+#: ../gnome/applet/other-network-dialog.c:241
+msgid "Custom wireless network"
 msgstr "Власна бездротова мережа"
 
-#: ../src/other-network-dialog.c:369
-#, fuzzy
-msgid "Enter the name of the wireless network to which you wish to connect."
+#: ../gnome/applet/other-network-dialog.c:242
+msgid "Enter the ESSID of the wireless network to which you wish to connect."
 msgstr "Введіть ESSID бездротової мережі, до якої ви бажаєте з'єднатись."
 
-#: ../src/other-network-dialog.c:371
-#, fuzzy
-msgid "Connect to Other Wireless Network"
-msgstr "_З'єднатись з іншою бездротовою мережею..."
-
-#: ../src/passphrase-dialog.c:215
-#, fuzzy
-msgid "Error connecting to wireless network"
-msgstr "З'єднано з особливою бездротовою мережею"
-
-#: ../src/passphrase-dialog.c:216
-msgid ""
-"The requested wireless network requires security capabilities unsupported by "
-"your hardware."
-msgstr ""
-
-#: ../src/vpn-password-dialog.c:151
-#: ../src/vpn-password-dialog.c:188
+#: ../gnome/applet/vpn-password-dialog.c:152
+#: ../gnome/applet/vpn-password-dialog.c:191
 #, c-format
 msgid "Cannot start VPN connection '%s'"
 msgstr "Не вдається запустити з'єднання VPN '%s'"
 
-#: ../src/vpn-password-dialog.c:154
+#: ../gnome/applet/vpn-password-dialog.c:155
 #, c-format
 msgid ""
 "Could not find the authentication dialog for VPN connection type '%s'. "
@@ -488,7 +450,7 @@ msgstr ""
 "Не вдається знайти діалогове вікно аутентифікації для з'єднання VPN типу '%"
 "s'. Зв'яжіться з системним адміністратором."
 
-#: ../src/vpn-password-dialog.c:191
+#: ../gnome/applet/vpn-password-dialog.c:194
 #, c-format
 msgid ""
 "There was a problem launching the authentication dialog for VPN connection "
@@ -497,17 +459,37 @@ msgstr ""
 "Проблема запуску діалогового вікна аутентифікації для з'єднання VPN типу '%"
 "s'. Зв'яжіться з системним адміністратором."
 
-#: ../src/applet.glade.h:1
+#: ../gnome/applet/applet.glade.h:1
 msgid " "
 msgstr " "
 
-#: ../src/applet.glade.h:2
+#: ../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>"
 
-#: ../src/applet.glade.h:4
+#: ../gnome/applet/applet.glade.h:10
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
@@ -522,7 +504,7 @@ msgstr ""
 "Для доступу до бездротової мережі '%s' необхідна парольна фраза чи ключ "
 "шифрування."
 
-#: ../src/applet.glade.h:8
+#: ../gnome/applet/applet.glade.h:14
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
@@ -534,7 +516,7 @@ msgstr ""
 "\n"
 "%s  Програма не повністю функціональна."
 
-#: ../src/applet.glade.h:12
+#: ../gnome/applet/applet.glade.h:18
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
@@ -551,200 +533,87 @@ msgstr ""
 "відмітьте поле нижче, та NetworkManager надалі не буде набридати запитаннями "
 "при з'єднанні."
 
-#: ../src/applet.glade.h:15
-msgid "Anonymous Identity:"
-msgstr ""
-
-#: ../src/applet.glade.h:16
-#, fuzzy
-msgid "Authentication:"
-msgstr "Орієнтація"
+#: ../gnome/applet/applet.glade.h:21
+msgid "Always Trust this Wireless Network"
+msgstr "Завжди довіряти бездротовій мережі"
 
-#: ../src/applet.glade.h:17
+#: ../gnome/applet/applet.glade.h:22
 msgid "Broadcast Address:"
 msgstr "Широкомовна адреса:"
 
-#: ../src/applet.glade.h:18
-msgid "CA Certificate File:"
-msgstr ""
-
-#: ../src/applet.glade.h:19
+#: ../gnome/applet/applet.glade.h:23
 msgid "C_onnect"
 msgstr "_З'єднатись"
 
-#: ../src/applet.glade.h:20
-msgid "Client Certificate File:"
-msgstr ""
+#: ../gnome/applet/applet.glade.h:24
+msgid "Connect with encryption enabled"
+msgstr "З'єднання з шифруванням"
 
-#: ../src/applet.glade.h:21
+#: ../gnome/applet/applet.glade.h:25
 msgid "Connection Information"
 msgstr "Інформація про з'єднання"
 
-#: ../src/applet.glade.h:22
-msgid "Default Route:"
-msgstr ""
-
-#: ../src/applet.glade.h:23
+#: ../gnome/applet/applet.glade.h:26
 msgid "Destination Address:"
 msgstr "Цільова адреса:"
 
-#: ../src/applet.glade.h:24
-msgid "Driver:"
-msgstr ""
-
-#: ../src/applet.glade.h:25
-msgid "EAP Method:"
-msgstr ""
+#: ../gnome/applet/applet.glade.h:27
+msgid "Don't remind me again"
+msgstr "Не нагадувати надалі"
 
-#: ../src/applet.glade.h:26
+#: ../gnome/applet/applet.glade.h:28
 msgid "Hardware Address:"
 msgstr "Апаратна адреса:"
 
-#: ../src/applet.glade.h:27
+#: ../gnome/applet/applet.glade.h:29
 msgid "IP Address:"
 msgstr "Адреса IP:"
 
-#: ../src/applet.glade.h:28
-msgid "Identity:"
-msgstr ""
-
-#: ../src/applet.glade.h:29
+#: ../gnome/applet/applet.glade.h:30
 msgid "Interface:"
 msgstr "Інтерфейс:"
 
-#: ../src/applet.glade.h:30
+#: ../gnome/applet/applet.glade.h:31
 msgid "Key Type:"
 msgstr "Тип ключа:"
 
-#: ../src/applet.glade.h:31
-#, fuzzy
-msgid "Key:"
-msgstr "Шістнадцятковий ключ:"
-
-#: ../src/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 ""
-
-#: ../src/applet.glade.h:37
-msgid ""
-"Open System\n"
-"Shared Key"
-msgstr ""
+#: ../gnome/applet/applet.glade.h:32
+msgid "Key type:"
+msgstr "Тип ключа:"
 
-#: ../src/applet.glade.h:39
+#: ../gnome/applet/applet.glade.h:33
 msgid "Other Wireless Network..."
 msgstr "Інша бездротова мережа..."
 
-#: ../src/applet.glade.h:40
-msgid "Passphrase:"
-msgstr "Парольна фраза:"
-
-#: ../src/applet.glade.h:41
-msgid "Password:"
-msgstr ""
-
-#: ../src/applet.glade.h:42
-msgid "Primary DNS:"
-msgstr ""
-
-#: ../src/applet.glade.h:43
-msgid "Private Key File:"
-msgstr ""
-
-#: ../src/applet.glade.h:44
-msgid "Private Key Password:"
-msgstr ""
-
-#: ../src/applet.glade.h:45
-msgid "Secondary DNS:"
-msgstr ""
-
-#: ../src/applet.glade.h:46
-msgid "Select the CA Certificate File"
-msgstr ""
-
-#: ../src/applet.glade.h:47
-msgid "Select the Client Certificate File"
-msgstr ""
-
-#: ../src/applet.glade.h:48
-msgid "Select the Private Key File"
-msgstr ""
-
-#: ../src/applet.glade.h:49
-msgid "Show key"
-msgstr ""
-
-#: ../src/applet.glade.h:50
-#, fuzzy
-msgid "Show passphrase"
-msgstr "Парольна фраза:"
-
-#: ../src/applet.glade.h:51
-msgid "Show password"
-msgstr ""
-
-#: ../src/applet.glade.h:52
-msgid "Show passwords"
-msgstr ""
-
-#: ../src/applet.glade.h:53
-msgid "Speed:"
-msgstr ""
-
-#: ../src/applet.glade.h:54
+#: ../gnome/applet/applet.glade.h:35
 msgid "Subnet Mask:"
 msgstr "Маска мережі:"
 
-#: ../src/applet.glade.h:55
-#, fuzzy
-msgid "Type:"
-msgstr "Тип ключа:"
-
-#: ../src/applet.glade.h:56
-msgid "User Name:"
-msgstr ""
-
-#: ../src/applet.glade.h:57
+#: ../gnome/applet/applet.glade.h:36
 msgid "Wireless Network Key Required"
 msgstr "Вимагається ключ бездротової мережі"
 
-#: ../src/applet.glade.h:58
+#: ../gnome/applet/applet.glade.h:37
 msgid "Wireless _adapter:"
 msgstr "Бездротовий _адаптер:"
 
-#: ../src/applet.glade.h:59
-#, fuzzy
-msgid "_Always Trust this Wireless Network"
-msgstr "Завжди довіряти бездротовій мережі"
-
-#: ../src/applet.glade.h:60
-#, fuzzy
-msgid "_Don't remind me again"
-msgstr "Не нагадувати надалі"
+#: ../gnome/applet/applet.glade.h:38
+msgid "Wireless _network:"
+msgstr "Бездротова _мережа"
 
-#: ../src/applet.glade.h:61
+#: ../gnome/applet/applet.glade.h:39
 msgid "_Login to Network"
 msgstr "_Увійти в мережу"
 
-#: ../src/applet.glade.h:62
-msgid "_Network Name:"
-msgstr ""
-
-#: ../src/applet.glade.h:63
-#, fuzzy
-msgid "_Wireless Security:"
-msgstr "Бездротовий _адаптер:"
+#: ../gnome/applet/applet.glade.h:40
+msgid "_OK"
+msgstr "_Гаразд"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:383
+#: ../gnome/vpn-properties/nm-vpn-properties.c:374
 msgid "Cannot add VPN connection"
 msgstr "Не вдається додати з'єднання VPN"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:385
+#: ../gnome/vpn-properties/nm-vpn-properties.c:376
 msgid ""
 "No suitable VPN software was found on your system. Contact your system "
 "administrator."
@@ -752,11 +621,11 @@ msgstr ""
 "У системі не встановлено потрібне програмне забезпечення VPN. Зв'яжіться з "
 "системним адміністратором."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:437
+#: ../gnome/vpn-properties/nm-vpn-properties.c:428
 msgid "Cannot import VPN connection"
 msgstr "Не вдається імпортувати з'єднання VPN"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:439
+#: ../gnome/vpn-properties/nm-vpn-properties.c:430
 #, c-format
 msgid ""
 "Cannot find suitable software for VPN connection type '%s' to import the "
@@ -765,12 +634,12 @@ msgstr ""
 "Не вдається знайти відповідне програмне забезпечення для з'єднань VPN типу '%"
 "s', щоб імпортувати файл '%s'. Зв'яжіться з системним адміністратором."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:579
+#: ../gnome/vpn-properties/nm-vpn-properties.c:570
 #, c-format
 msgid "Error retrieving VPN connection '%s'"
 msgstr "Помилка отримання з'єднання VPN '%s'"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:582
+#: ../gnome/vpn-properties/nm-vpn-properties.c:573
 #, c-format
 msgid ""
 "Could not find the UI files for VPN connection type '%s'. Contact your "
@@ -779,12 +648,12 @@ msgstr ""
 "Не вдається знайти файли графічного інтерфейсу для з'єднання  VPN типу '%s'. "
 "Зв'яжіться з системним адміністратором."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:739
+#: ../gnome/vpn-properties/nm-vpn-properties.c:733
 #, c-format
 msgid "Delete VPN connection \"%s\"?"
 msgstr "Видалити з'єднання VPN \"%s\"?"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:742
+#: ../gnome/vpn-properties/nm-vpn-properties.c:736
 #, c-format
 msgid ""
 "All information about the VPN connection \"%s\" will be lost and you may "
@@ -795,11 +664,11 @@ msgstr ""
 "доведеться звернутись до системного адміністратора за інформацією для "
 "створення нового з'єднання."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:959
+#: ../gnome/vpn-properties/nm-vpn-properties.c:951
 msgid "Unable to load"
 msgstr "Не вдається завантажити"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:961
+#: ../gnome/vpn-properties/nm-vpn-properties.c:953
 msgid "Cannot find some needed resources (the glade file)!"
 msgstr "Не вдається знайти деякі необхідні ресурси (не знайдено файл glade)!"
 
@@ -813,29 +682,33 @@ 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:4
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
 msgid "Create VPN Connection"
 msgstr "Створення з'єднання VPN"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
 msgid "Create VPN Connection - 1 of 2"
 msgstr "Створення з'єднання VPN - 1 з 2"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
 msgid "Create VPN Connection - 2 of 2"
 msgstr "Створення з'єднання VPN - 2 з 2"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
 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 "_Експорт"
@@ -845,78 +718,34 @@ 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 у файл"
+msgid "Export VPN connection 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 у файл"
+msgid "Export the VPN settings to a file"
+msgstr "Експортувати параметри VPN у файл"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:12
-#, fuzzy
-msgid "Finish Creating VPN Connection"
+msgid "Finish create 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 connection to a "
-"Virtual Private Network (VPN).\n"
+"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.  Please "
-"see your system administrator to obtain this information."
+"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 та секрети, які, "
 "можливо, надаються системним вашим адміністратором."
 
-#: ../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 ""
@@ -932,284 +761,27 @@ msgstr ""
 "не вдається прив'язатись до мережного сокету для контролю пристрою ethernet "
 "- %s"
 
-#: ../src/nm-netlink-monitor.c:405
+#: ../src/nm-netlink-monitor.c:403
 msgid "operation took too long"
 msgstr "операція виконується надто довго"
 
-#: ../src/nm-netlink-monitor.c:502
+#: ../src/nm-netlink-monitor.c:500
 msgid "received data from wrong type of sender"
 msgstr "отримано дані з неправильним типом відправника"
 
-#: ../src/nm-netlink-monitor.c:515
+#: ../src/nm-netlink-monitor.c:513
 msgid "received data from unexpected sender"
 msgstr "отримано дані з несподіваним відправником"
 
-#: ../src/nm-netlink-monitor.c:646
+#: ../src/nm-netlink-monitor.c:535
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/nm-netlink-monitor.c:644
 msgid "too much data was sent over socket and some of it was lost"
 msgstr "через сокет надто багато даних надіслано, та частину з них втрачено"
 
-#: ../src/nm-netlink-monitor.c:735
+#: ../src/nm-netlink-monitor.c:733
 msgid "error occurred while waiting for data on socket"
 msgstr "помилка при очікуванні даних з сокету"
-
-#: ../src/applet-dbus-devices.c:898
-#, fuzzy, c-format
-msgid "You are now connected to the Ad-Hoc wireless network '%s'."
-msgstr "З'єднано з особливою бездротовою мережею"
-
-#: ../src/applet-dbus-devices.c:903
-#, fuzzy, c-format
-msgid "You are now connected to the wireless network '%s'."
-msgstr "Завершується з'єднання з бездротовою мережею '%s'..."
-
-#: ../src/applet-dbus-devices.c:910
-#, fuzzy
-msgid "You are now connected to the wired network."
-msgstr "Завершується з'єднання з дротовою мережею..."
-
-#: ../src/applet-dbus-devices.c:916
-#, fuzzy
-msgid "Connection Established"
-msgstr "З'єднання з шифруванням"
-
-#: ../src/applet-dbus-devices.c:959
-#, fuzzy
-msgid "Disconnected"
-msgstr "Від'єднання від VPN..."
-
-#: ../src/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 e9e31ada..cba9dea8 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -1,491 +1,515 @@
 # Vietnamese translation for Network Manager.
-# Copyright © 2006 Gnome i18n Project for Vietnamese.
-# Clytie Siddall <clytie@riverland.net.au>, 2006.
+# Copyright © 2007 Gnome i18n Project for Vietnamese.
+# Clytie Siddall <clytie@riverland.net.au>, 2006-2007.
 # 
 msgid ""
-msgstr ""
-"Project-Id-Version: NetworkManager HEAD\n"
+""
+msgstr "Project-Id-Version: NetworkManager HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-29 18:33+0200\n"
-"PO-Revision-Date: 2006-02-28 17:28+1030\n"
+"POT-Creation-Date: 2007-01-02 04:01+0000\n"
+"PO-Revision-Date: 2007-01-05 14:47+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\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: LocFactoryEditor 1.6b36\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: LocFactoryEditor 1.6fc1\n"
 
-#: ../src/applet-compat.c:171 ../src/applet-dbus-info.c:919
+#: ../gnome/applet/applet-compat.c:171
+#: ../gnome/applet/applet-dbus-info.c:926
 #, c-format
 msgid "Passphrase for wireless network %s"
 msgstr "Cụm từ mật khẩu cho mạng vô tuyến %s"
 
-#: ../src/applet-dbus.c:265
+#: ../gnome/applet/applet-dbus.c:274
 #, 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."
+msgstr "Lỗi kết nối đến mạng vô tuyến « %s »."
 
-#: ../src/applet-dbus.c:270
+#: ../gnome/applet/applet-dbus.c:279
 msgid "Connection to the wired network failed."
-msgstr "Việc kết nối đến mạng tuyến bị lỗi."
+msgstr "Lỗi kết nối đến mạng tuyến."
 
-#: ../src/applet.c:184
+#: ../gnome/applet/applet.c:182
 msgid "Error displaying connection information:"
 msgstr "Gặp lỗi khi hiển thị thông tin kết nối:"
 
-#: ../src/applet.c:202
+#: ../gnome/applet/applet.c:200
 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). •"
+msgstr "Không tìm thấy một số tài nguyên cần thiết (tập tin glade) !"
 
-#: ../src/applet.c:213
+#: ../gnome/applet/applet.c:210
 msgid "No active connections!"
-msgstr "• Không có kết nối hoạt động. •"
+msgstr "Không có kết nối hoạt động !"
 
-#: ../src/applet.c:234
+#: ../gnome/applet/applet.c:227
+#, c-format
+msgid "%d Mb/s"
+msgstr "%d Mb/g"
+
+#: ../gnome/applet/applet.c:230
 #, c-format
 msgid "Wired Ethernet (%s)"
 msgstr "Ethernet tuyến (%s)"
 
-#: ../src/applet.c:236
+#: ../gnome/applet/applet.c:232
 #, c-format
 msgid "Wireless Ethernet (%s)"
 msgstr "Ethernet vô tuyến (%s)"
 
-#: ../src/applet.c:337 ../src/applet.c:362
+#: ../gnome/applet/applet.c:238
+msgid "Unknown"
+msgstr "Không rõ"
+
+#: ../gnome/applet/applet.c:330
+#: ../gnome/applet/applet.c:357
 msgid "NetworkManager Applet"
-msgstr "Tiểu dụng Quản lý mạng"
+msgstr "Tiểu dụng Quản Lý Mạng"
 
-#: ../src/applet.c:339 ../src/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:332
+msgid ""
+"Copyright © 2004-2006 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+msgstr "Tác quyền © năm 2004-2006 của Red Hat, Inc.\n"
+"Tác quyền © năm 2005-2006 của Novell, Inc."
 
-#: ../src/applet.c:340 ../src/applet.c:365
+#: ../gnome/applet/applet.c:334
+#: ../gnome/applet/applet.c:361
 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."
 
-#: ../src/applet.c:343 ../src/applet.c:370
+#: ../gnome/applet/applet.c:337
+#: ../gnome/applet/applet.c:365
 msgid "translator-credits"
 msgstr "Nhóm Việt hóa Gnome <gnomevi-list@lists.sourceforge.net>"
 
-#: ../src/applet.c:426
+#: ../gnome/applet/applet.c:359
+msgid ""
+"Copyright © 2004-2005 Red Hat, Inc.\n"
+"Copyright © 2005-2006 Novell, Inc."
+msgstr "Tác quyền © năm 2004-2005 của Red Hat, Inc.\n"
+"Tác quyền © năm 2005-2006 của Novell, Inc."
+
+#: ../gnome/applet/applet.c:421
 msgid "VPN Login Failure"
-msgstr "Đăng nhập VPN bị lỗi"
+msgstr "Lỗi đăng nhập VPN"
 
-#: ../src/applet.c:427
+#: ../gnome/applet/applet.c:422
 #, 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."
+msgstr "Không thể khởi chạy kết nối VPN « %s » do lỗi đăng nhập."
 
-#: ../src/applet.c:431
+#: ../gnome/applet/applet.c:426
 msgid "VPN Start Failure"
-msgstr "Khởi chạy VPN bị lỗi"
+msgstr "Lỗi khởi chạy VPN"
 
-#: ../src/applet.c:432
+#: ../gnome/applet/applet.c:427
 #, 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ị "
-"lỗi."
+msgstr "Không thể khởi chạy kết nối VPN « %s » do lỗi khởi chạy chương trình VPN."
 
-#: ../src/applet.c:436 ../src/applet.c:446
+#: ../gnome/applet/applet.c:431
+#: ../gnome/applet/applet.c:441
 msgid "VPN Connect Failure"
-msgstr "Kết nối VPN bị lỗi"
+msgstr "Lỗi kết nối VPN"
 
-#: ../src/applet.c:437
+#: ../gnome/applet/applet.c:432
 #, 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."
 
-#: ../src/applet.c:441
+#: ../gnome/applet/applet.c:436
 msgid "VPN Configuration Error"
 msgstr "Lỗi cấu hình VPN"
 
-#: ../src/applet.c:442
+#: ../gnome/applet/applet.c:437
 #, 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 »."
 
-#: ../src/applet.c:447
+#: ../gnome/applet/applet.c:442
 #, 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 "
-"hình mạng hợp lệ."
+msgstr "Không thể khởi chạy kết nối VPN « %s » vì trình phục vụ VPN chưa trả lại cấu "
+"hình mạng thích hợp."
 
-#: ../src/applet.c:517
+#: ../gnome/applet/applet.c:512
 msgid "VPN Login Message"
 msgstr "Thông điệp đăng nhập VPN"
 
-#: ../src/applet.c:741 ../src/applet.c:2508
-#: ../src/other-network-dialog.c:453
-#: ../src/passphrase-dialog.c:228
+#: ../gnome/applet/applet.c:737
+#: ../gnome/applet/applet.c:2635
+#: ../gnome/applet/other-network-dialog.c:458
+#: ../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 tìm thấy một số tài nguyên cần thiết (không tìm "
 "thấy tập tin glade)."
 
-#: ../src/applet.c:753
+#: ../gnome/applet/applet.c:749
 #, 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."
 
-#: ../src/applet.c:761
+#: ../gnome/applet/applet.c:757
 #, 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."
 
-#: ../src/applet.c:908
+#.Note to translators: this is used if no essid is known
+#: ../gnome/applet/applet.c:905
+#: ../gnome/applet/applet.c:1103
+msgid "(unknown)"
+msgstr "(không rõ)"
+
+#: ../gnome/applet/applet.c:911
 #, c-format
 msgid "Preparing device %s for the wired network..."
 msgstr "Đang chuẩn bị thiết bị %s cho mạng tuyến..."
 
-#: ../src/applet.c:910
+#: ../gnome/applet/applet.c:913
 #, 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 »..."
 
-#: ../src/applet.c:918
+#: ../gnome/applet/applet.c:921
 #, 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..."
 
-#: ../src/applet.c:920
+#: ../gnome/applet/applet.c:923
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
-msgstr "Đang cố tham gia mạng vô tuyến « %s »..."
+msgstr "Đang thử tham gia mạng vô tuyến « %s »..."
 
-#: ../src/applet.c:928
+#: ../gnome/applet/applet.c:931
 #, 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 »..."
+msgstr "Đang đợi Khóa Mạng cho mạng vô tuyến « %s »..."
 
-#: ../src/applet.c:936 ../src/applet.c:946
+#: ../gnome/applet/applet.c:939
+#: ../gnome/applet/applet.c:949
 msgid "Requesting a network address from the wired network..."
 msgstr "Đang yêu cầu địa chỉ mạng từ mạng tuyến..."
 
-#: ../src/applet.c:938 ../src/applet.c:948
+#: ../gnome/applet/applet.c:941
+#: ../gnome/applet/applet.c:951
 #, 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 »..."
 
-#: ../src/applet.c:956
+#: ../gnome/applet/applet.c:959
 msgid "Finishing connection to the wired network..."
 msgstr "Đang kết nối xong tới mạng tuyến..."
 
-#: ../src/applet.c:958
+#: ../gnome/applet/applet.c:961
 #, 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 »..."
 
-#: ../src/applet.c:1075
+#: ../gnome/applet/applet.c:1078
 msgid "NetworkManager is not running"
-msgstr "Trình NetworkManager chưa chạy."
+msgstr "Trình NetworkManager không đang chạy"
 
-#: ../src/applet.c:1083 ../src/applet.c:1828
+#: ../gnome/applet/applet.c:1086
+#: ../gnome/applet/applet.c:1843
 msgid "Networking disabled"
 msgstr "Chạy mạng bị tắt"
 
-#: ../src/applet.c:1088
+#: ../gnome/applet/applet.c:1091
 msgid "No network connection"
 msgstr "Không có kết nối mạng"
 
-#: ../src/applet.c:1093
+#: ../gnome/applet/applet.c:1096
 msgid "Wired network connection"
 msgstr "Kết nối mạng tuyến"
 
-#: ../src/applet.c:1097
+#: ../gnome/applet/applet.c:1100
 msgid "Connected to an Ad-Hoc wireless network"
-msgstr "Đã kết nối tới một mạng vô tuyến Như có"
+msgstr "Đã kết nối tới một mạng vô tuyến Như Có"
 
-#: ../src/applet.c:1099
+#: ../gnome/applet/applet.c:1102
 #, 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%%)"
+msgstr "Kết nối mạng vô tuyến tới « %s » (%d%%)"
 
-#: ../src/applet.c:1120
+#: ../gnome/applet/applet.c:1123
 #, c-format
 msgid "VPN connection to '%s'"
-msgstr "Cách kết nối VPN tới « %s »"
+msgstr "Kết nối VPN tới « %s »"
 
-#: ../src/applet.c:1128
+#: ../gnome/applet/applet.c:1131
 #, c-format
 msgid "VPN connecting to '%s'"
 msgstr "Đang kết nối VPN tới « %s »..."
 
-#: ../src/applet.c:1541
+#: ../gnome/applet/applet.c:1556
 msgid "_Connect to Other Wireless Network..."
-msgstr "_Kết nối tới mạng Vô tuyến Khác..."
+msgstr "Kết nối tới mạng vô tuyến khá_c..."
 
-#: ../src/applet.c:1562
+#: ../gnome/applet/applet.c:1577
 msgid "Create _New Wireless Network..."
-msgstr "Tạo mạng Vô tuyến _Mới..."
+msgstr "Tạo mạ_ng vô tuyến mới..."
 
-#: ../src/applet.c:1685
+#: ../gnome/applet/applet.c:1700
 msgid "_VPN Connections"
 msgstr "Kết nối _VPN"
 
-#: ../src/applet.c:1730
+#: ../gnome/applet/applet.c:1745
 msgid "_Configure VPN..."
 msgstr "_Cấu hình VPN..."
 
-#: ../src/applet.c:1734
+#: ../gnome/applet/applet.c:1749
 msgid "_Disconnect VPN..."
-msgstr "_Ngắt kết nối VPN..."
+msgstr "N_gắt kết nối VPN..."
 
-#: ../src/applet.c:1756
+#: ../gnome/applet/applet.c:1771
 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
-#: ../src/applet.c:1767
+#.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
 #, c-format
 msgid "Connect to %s..."
 msgstr "Kết nối đến %s..."
 
-#: ../src/applet.c:1773
+#: ../gnome/applet/applet.c:1788
 #, c-format
 msgid "Disconnect from %s..."
 msgstr "Ngắt kết nối từ %s..."
 
-#: ../src/applet.c:1822
+#: ../gnome/applet/applet.c:1837
 msgid "No network devices have been found"
 msgstr "Không tìm thấy thiết bị mạng nào"
 
-#: ../src/applet.c:2014
+#: ../gnome/applet/applet.c:2029
 msgid "NetworkManager is not running..."
-msgstr "Trình NetworkManager chưa chạy..."
+msgstr "Trình NetworkManager không đang chạy..."
 
-#. 'Enable Networking' item
-#: ../src/applet.c:2170
+#.'Enable Networking' item
+#: ../gnome/applet/applet.c:2210
 msgid "Enable _Networking"
 msgstr "Bật chạy _mạng"
 
-#. 'Enable Wireless' item
-#: ../src/applet.c:2176
+#.'Enable Wireless' item
+#: ../gnome/applet/applet.c:2216
 msgid "Enable _Wireless"
-msgstr "Bật _Vô tuyến"
+msgstr "Bật _vô tuyến"
 
-#. 'Connection Information' item
-#: ../src/applet.c:2182
+#.'Connection Information' item
+#: ../gnome/applet/applet.c:2222
 msgid "Connection _Information"
 msgstr "Thông t_in kết nối"
 
-#. Help item
-#: ../src/applet.c:2193
+#.Help item
+#: ../gnome/applet/applet.c:2233
 msgid "_Help"
 msgstr "Trợ _giúp"
 
-#. About item
-#: ../src/applet.c:2202
+#.About item
+#: ../gnome/applet/applet.c:2242
 msgid "_About"
 msgstr "_Giới thiệu"
 
-#: ../src/applet.c:2667
+#: ../gnome/applet/applet.c:2824
 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 tìm thấy một số tài nguyên nên không thể tiếp "
 "tục.\n"
 
-#: ../src/wireless-security-option.c:157
+#: ../gnome/applet/wireless-security-option.c:157
 msgid "Open System"
 msgstr "Hệ thống mở"
 
-#: ../src/wireless-security-option.c:160
+#: ../gnome/applet/wireless-security-option.c:160
 msgid "Shared Key"
 msgstr "Khóa dùng chung"
 
-#: ../src/wireless-security-option.c:208
+#: ../gnome/applet/wireless-security-option.c:208
 msgid "Automatic (Default)"
-msgstr "Tự động (Mặc định)"
+msgstr "Tự động (mặc định)"
 
 # Name: don't translate / Tên: đừng dịch
-#: ../src/wireless-security-option.c:215
+#: ../gnome/applet/wireless-security-option.c:215
 msgid "AES-CCMP"
 msgstr "AES-CCMP"
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
-#: ../src/wireless-security-option.c:223
+#: ../gnome/applet/wireless-security-option.c:223
 msgid "TKIP"
 msgstr "TKIP"
 
-#: ../src/wireless-security-option.c:231
+#: ../gnome/applet/wireless-security-option.c:231
 msgid "Dynamic WEP"
 msgstr "WEP động"
 
-#: ../src/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
-#: ../src/wso-wep-ascii.c:138
+#: ../gnome/applet/wso-wep-ascii.c:138
 msgid "WEP 64/128-bit ASCII"
 msgstr "WEP 64/128-bit ASCII"
 
-#: ../src/wso-wep-hex.c:135
+#: ../gnome/applet/wso-wep-hex.c:135
 msgid "WEP 64/128-bit Hex"
 msgstr "WEP 64/128-bit thập lục"
 
-#: ../src/wso-wep-passphrase.c:135
+#: ../gnome/applet/wso-wep-passphrase.c:135
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit cụm từ mật khẩu"
 
-#: ../src/wso-wpa-eap.c:237
+#: ../gnome/applet/wso-wpa-eap.c:237
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../src/wso-wpa-eap.c:238
+#: ../gnome/applet/wso-wpa-eap.c:238
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wso-wpa-eap.c:239
+#: ../gnome/applet/wso-wpa-eap.c:239
 msgid "TTLS"
 msgstr "TTLS"
 
 # Name: don't translate / Tên: đừng dịch
-#: ../src/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
-#: ../src/nm-ap-security-wpa-eap.c:116
+#: ../gnome/applet/wso-wpa-eap.c:247
+#: ../src/nm-ap-security-wpa-eap.c:93
+#: ../src/nm-ap-security-wpa-eap.c:117
 msgid "WPA2 Enterprise"
 msgstr "WPA2 Enterprise"
 
 # Name: don't translate / Tên: đừng dịch
-#: ../src/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
-#: ../src/nm-ap-security-wpa-eap.c:121
+#: ../gnome/applet/wso-wpa-eap.c:249
+#: ../src/nm-ap-security-wpa-eap.c:95
+#: ../src/nm-ap-security-wpa-eap.c:122
 msgid "WPA Enterprise"
 msgstr "WPA Enterprise"
 
-#: ../src/wso-wpa-psk.c:178
+#: ../gnome/applet/wso-wpa-psk.c:178
 msgid "WPA2 Personal"
 msgstr "WPA2 Cá nhân"
 
-#: ../src/wso-wpa-psk.c:180
+#: ../gnome/applet/wso-wpa-psk.c:180
 msgid "WPA Personal"
 msgstr "WPA Cá nhân"
 
-#: ../src/eggtrayicon.c:134
+#: ../gnome/applet/eggtrayicon.c:134
 msgid "Orientation"
 msgstr "Hướng"
 
-#: ../src/eggtrayicon.c:135
+#: ../gnome/applet/eggtrayicon.c:135
 msgid "The orientation of the tray."
-msgstr "Hướng khay."
+msgstr "Hướng của khay."
 
-#: ../src/menu-items.c:88
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
-msgstr "mạng tuyến (%s)"
+msgstr "Mạng tuyến (%s)"
 
-#: ../src/menu-items.c:91
+#: ../gnome/applet/menu-items.c:91
 msgid "_Wired Network"
-msgstr "mạng t_uyến"
+msgstr "Mạng t_uyến"
 
-#: ../src/menu-items.c:162
+#: ../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)"
+msgstr[0] "Mạng vô tuyến (%s)"
 
-#: ../src/menu-items.c:164
+#: ../gnome/applet/menu-items.c:164
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
-msgstr[0] "mạng vô tuyến"
+msgstr[0] "Mạng vô tuyến"
 
-#: ../src/menu-items.c:343
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr " (Unicode không hợp lệ)"
 
-#: ../src/other-network-dialog.c:352
+#: ../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, "
-"không có mật mã được bật."
+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 của bạn, %s, không có mật mã được bật."
 
-#: ../src/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"
 
-#: ../src/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."
+msgstr "Hãy nhập tên và thiết lập bảo mật của mạng vô tuyến bạn muốn tạo."
 
-#: ../src/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"
 
-#: ../src/other-network-dialog.c:368
+#: ../gnome/applet/other-network-dialog.c:368
 msgid "Existing wireless network"
-msgstr "mạng vô tuyến đã có"
+msgstr "Mạng vô tuyến đã có"
 
-#: ../src/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."
+msgstr "Hãy nhập tên của mạng vô tuyến đến đó bạn muốn kết nối."
 
-#: ../src/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"
+msgstr "Kết nối đến mạng vô tuyến khác"
 
-#: ../src/passphrase-dialog.c:215
+#: ../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"
 
-#: ../src/passphrase-dialog.c:216
+#: ../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 "
-"phần cứng của bạn."
+msgstr "Mạng vô tuyến đã yêu cầu cũng 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."
 
-#: ../src/vpn-password-dialog.c:151
-#: ../src/vpn-password-dialog.c:188
+#: ../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 »"
 
-#: ../src/vpn-password-dialog.c:154
+#: ../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 "
-"với quản trị hệ thống."
+msgstr "Không tìm thấy hộp thoại xác thực cho kết nối VPN kiểu « %s ». Hãy liên lạc "
+"với nhà quản trị hệ thống."
 
-#: ../src/vpn-password-dialog.c:191
+#: ../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 "
-"liên lạc với quản trị hệ thống."
+msgstr "Gặp lỗi khi khởi chạy hộp thoại xác thực cho kết nối VPN kiểu « %s ». Hãy "
+"liên lạc với nhà quản trị hệ thống."
 
-#: ../src/applet.glade.h:1
+#: ../gnome/applet/applet.glade.h:1
 msgid " "
 msgstr " "
 
-#: ../src/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>"
 
-#: ../src/applet.glade.h:4
+#: ../gnome/applet/applet.glade.h:4
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
@@ -493,24 +517,22 @@ msgid ""
 "\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 bởi 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 »."
 
-#: ../src/applet.glade.h:8
+#: ../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."
+"%s  Nó sẽ không có chức năng đầy đủ."
 
-#: ../src/applet.glade.h:12
+#: ../gnome/applet/applet.glade.h:12
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
@@ -519,336 +541,319 @@ 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 nhận đăng nhập vào 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."
+"Bạn đã chọn đăng nhập vào 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 nhận khi đăng nhập sau."
 
-#: ../src/applet.glade.h:15
+#: ../gnome/applet/applet.glade.h:15
 msgid "Anonymous Identity:"
 msgstr "Thực thể vô danh:"
 
-#: ../src/applet.glade.h:16
+#: ../gnome/applet/applet.glade.h:16
 msgid "Authentication:"
 msgstr "Xác thực:"
 
-#: ../src/applet.glade.h:17
+#: ../gnome/applet/applet.glade.h:17
 msgid "Broadcast Address:"
 msgstr "Địa chỉ phát thanh:"
 
-#: ../src/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:"
 
-#: ../src/applet.glade.h:19
+#: ../gnome/applet/applet.glade.h:19
 msgid "C_onnect"
-msgstr "_Kết nối"
+msgstr "Kết nố_i"
 
-#: ../src/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:"
+msgstr "Tập tin chứng nhận khách:"
 
-#: ../src/applet.glade.h:21
+#: ../gnome/applet/applet.glade.h:21
 msgid "Connection Information"
 msgstr "Thông tin kết nối"
 
-#: ../src/applet.glade.h:22
+#: ../gnome/applet/applet.glade.h:22
 msgid "Default Route:"
 msgstr "Tuyến mặc định:"
 
-#: ../src/applet.glade.h:23
+#: ../gnome/applet/applet.glade.h:23
 msgid "Destination Address:"
 msgstr "Địa chỉ đích:"
 
-#: ../src/applet.glade.h:24
+#: ../gnome/applet/applet.glade.h:24
 msgid "Driver:"
 msgstr "Trình điều khiển:"
 
-#: ../src/applet.glade.h:25
+#: ../gnome/applet/applet.glade.h:25
 msgid "EAP Method:"
 msgstr "Phương pháp EAP:"
 
-#: ../src/applet.glade.h:26
+#: ../gnome/applet/applet.glade.h:26
 msgid "Hardware Address:"
 msgstr "Địa chỉ phần cứng:"
 
-#: ../src/applet.glade.h:27
+#: ../gnome/applet/applet.glade.h:27
 msgid "IP Address:"
 msgstr "Địa chỉ IP:"
 
-#: ../src/applet.glade.h:28
+#: ../gnome/applet/applet.glade.h:28
 msgid "Identity:"
 msgstr "Thực thể:"
 
-#: ../src/applet.glade.h:29
+#: ../gnome/applet/applet.glade.h:29
 msgid "Interface:"
 msgstr "Giao diện:"
 
-#: ../src/applet.glade.h:30
+#: ../gnome/applet/applet.glade.h:30
 msgid "Key Type:"
 msgstr "Kiểu khoá :"
 
-#: ../src/applet.glade.h:31
+#: ../gnome/applet/applet.glade.h:31
+msgid "Key management:"
+msgstr "Quản lý khoá:"
+
+#: ../gnome/applet/applet.glade.h:32
 msgid "Key:"
 msgstr "Khóa:"
 
-#: ../src/applet.glade.h:32
+#: ../gnome/applet/applet.glade.h:33
 msgid ""
 "None\n"
 "WEP 128-bit Passphrase\n"
 "WEP 64/128-bit Hex\n"
 "WEP 64/128-bit ASCII\n"
-msgstr ""
-"Không có\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"
 
-#: ../src/applet.glade.h:37
+#: ../gnome/applet/applet.glade.h:38
 msgid ""
 "Open System\n"
 "Shared Key"
-msgstr ""
-"Hệ thống mở\n"
+msgstr "Hệ thống mở\n"
 "Khóa dùng chung"
 
-#: ../src/applet.glade.h:39
+#: ../gnome/applet/applet.glade.h:40
 msgid "Other Wireless Network..."
-msgstr "mạng Vô tuyến khác..."
+msgstr "Mạng vô tuyến khác..."
 
-#: ../src/applet.glade.h:40
+#: ../gnome/applet/applet.glade.h:41
 msgid "Passphrase:"
 msgstr "Cụm từ mật khẩu :"
 
-#: ../src/applet.glade.h:41
+#: ../gnome/applet/applet.glade.h:42
 msgid "Password:"
 msgstr "Mật khẩu :"
 
-#: ../src/applet.glade.h:42
+#: ../gnome/applet/applet.glade.h:43
 msgid "Primary DNS:"
 msgstr "DNS chính:"
 
-#: ../src/applet.glade.h:43
+#: ../gnome/applet/applet.glade.h:44
 msgid "Private Key File:"
 msgstr "Tập tin khoá riêng:"
 
-#: ../src/applet.glade.h:44
+#: ../gnome/applet/applet.glade.h:45
 msgid "Private Key Password:"
 msgstr "Mật khẩu khoá riêng:"
 
-#: ../src/applet.glade.h:45
+#: ../gnome/applet/applet.glade.h:46
 msgid "Secondary DNS:"
 msgstr "DNS phụ :"
 
-#: ../src/applet.glade.h:46
+#: ../gnome/applet/applet.glade.h:47
 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)."
+msgstr "Chọn tập tin chứng nhận của nhà cầm quyền chứng nhận (CA)"
 
-#: ../src/applet.glade.h:47
+#: ../gnome/applet/applet.glade.h:48
 msgid "Select the Client Certificate File"
-msgstr "Chọn tập tin chứng nhận của ứng dụng khách."
+msgstr "Chọn tập tin chứng nhận khách (client)"
 
-#: ../src/applet.glade.h:48
+#: ../gnome/applet/applet.glade.h:49
 msgid "Select the Private Key File"
-msgstr "Chọn tập tin là khóa riêng."
+msgstr "Chọn tập tin là khóa riêng"
 
-#: ../src/applet.glade.h:49
+#: ../gnome/applet/applet.glade.h:50
 msgid "Show key"
 msgstr "Hiện khoá"
 
-#: ../src/applet.glade.h:50
+#: ../gnome/applet/applet.glade.h:51
 msgid "Show passphrase"
 msgstr "HIện cụm từ mật khẩu"
 
-#: ../src/applet.glade.h:51
+#: ../gnome/applet/applet.glade.h:52
 msgid "Show password"
 msgstr "Hiện mật khẩu"
 
-#: ../src/applet.glade.h:52
+#: ../gnome/applet/applet.glade.h:53
 msgid "Show passwords"
 msgstr "Hiện các mật khẩu"
 
-#: ../src/applet.glade.h:53
+#: ../gnome/applet/applet.glade.h:54
 msgid "Speed:"
 msgstr "Tốc độ :"
 
-#: ../src/applet.glade.h:54
+#: ../gnome/applet/applet.glade.h:55
 msgid "Subnet Mask:"
 msgstr "Mặt nạ mạng cấp dưới:"
 
-#: ../src/applet.glade.h:55
+#: ../gnome/applet/applet.glade.h:56
 msgid "Type:"
 msgstr "Kiểu :"
 
-#: ../src/applet.glade.h:56
+#: ../gnome/applet/applet.glade.h:57
 msgid "User Name:"
 msgstr "Tên người dùng:"
 
-#: ../src/applet.glade.h:57
+#: ../gnome/applet/applet.glade.h:58
 msgid "Wireless Network Key Required"
-msgstr "Cần thiết Khóa mạng Vô tuyến:"
+msgstr "Cần thiết khóa mạng vô tuyến:"
 
-#: ../src/applet.glade.h:58
+#: ../gnome/applet/applet.glade.h:59
 msgid "Wireless _adapter:"
-msgstr "_Bộ điều hợp vô tuyến"
+msgstr "_Bộ điều hợp vô tuyến:"
 
-#: ../src/applet.glade.h:59
+#: ../gnome/applet/applet.glade.h:60
 msgid "_Always Trust this Wireless Network"
 msgstr "_Luôn luôn tin cây mạng vô tuyến này"
 
-#: ../src/applet.glade.h:60
+#: ../gnome/applet/applet.glade.h:61
 msgid "_Don't remind me again"
-msgstr "_Đừng nhắc nhở tôi lần nữa"
+msgstr "Đừ_ng nhắc nhở tôi lần nữa"
 
-#: ../src/applet.glade.h:61
+#: ../gnome/applet/applet.glade.h:62
+msgid "_Fallback on this Network"
+msgstr "_Phục hồi từ mạng này"
+
+#: ../gnome/applet/applet.glade.h:63
 msgid "_Login to Network"
-msgstr "_Đăng nhập với mạng"
+msgstr "Đăng nhập _vào mạng"
 
-#: ../src/applet.glade.h:62
+#: ../gnome/applet/applet.glade.h:64
 msgid "_Network Name:"
-msgstr "T_ên mạng:"
+msgstr "Tê_n mạng:"
 
-#: ../src/applet.glade.h:63
+#: ../gnome/applet/applet.glade.h:65
 msgid "_Wireless Security:"
 msgstr "_Bảo mật vô tuyến:"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:383
+#: ../gnome/vpn-properties/nm-vpn-properties.c:417
 msgid "Cannot add VPN connection"
-msgstr "Không thể thêm sự kết nối VPN"
+msgstr "Không thể thêm kết nối VPN"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:385
+#: ../gnome/vpn-properties/nm-vpn-properties.c:419
 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 "
-"lạc với quản trị hệ thống."
+msgstr "Không tìm thấy phần mềm VPN thích hợp nằm trong hệ thống của bạn. Hãy liên "
+"lạc với nhà quản trị hệ thống."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:437
+#: ../gnome/vpn-properties/nm-vpn-properties.c:461
 msgid "Cannot import VPN connection"
-msgstr "Không thể nhập sự kết nối VPN"
+msgstr "Không thể nhập kết nối VPN"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:439
+#: ../gnome/vpn-properties/nm-vpn-properties.c:463
 #, 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 "
-"tin « %s ». Hãy liên lạc với quản trị hệ thống."
+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 nhà quản trị hệ thống."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:579
+#: ../gnome/vpn-properties/nm-vpn-properties.c:580
 #, c-format
 msgid "Error retrieving VPN connection '%s'"
-msgstr "Gặp lỗi khi lấy kết nối PN « %s »"
+msgstr "Gặp lỗi khi lấy kết nối VPN « %s »"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:582
+#: ../gnome/vpn-properties/nm-vpn-properties.c:583
 #, 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 "
-"». Hãy liên lạc với quản trị hệ thống."
+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 nhà quản trị hệ thống."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:739
+#: ../gnome/vpn-properties/nm-vpn-properties.c:727
 #, c-format
 msgid "Delete VPN connection \"%s\"?"
-msgstr "Xóa bỏ sự kết nối VPN « %s » không?"
+msgstr "Xóa bỏ kết nối VPN « %s » không?"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:742
+#: ../gnome/vpn-properties/nm-vpn-properties.c:730
 #, 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 "
-"trị hệ thống cung cấp thông tin để tạo sự kết nối mới."
+msgstr "Mọi thông tin về kết nối VPN « %s » sẽ bị mất; bạn có thể sẽ cần xin nhà "
+"quản trị hệ thống cung cấp thông tin để tạo kết nối mới."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:959
+#: ../gnome/vpn-properties/nm-vpn-properties.c:924
 msgid "Unable to load"
 msgstr "Không thể tải"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:961
+#: ../gnome/vpn-properties/nm-vpn-properties.c:926
 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:1071
+msgstr "Không tìm thấy một số tài nguyên cần thiết (tải tập tin glade) !"
+
+#.druid_window = GTK_DIALOG (gtk_dialog_new_with_buttons (_("Create VPN Connection"),
+#.NULL,
+#.GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+#.GTK_STOCK_CANCEL,
+#.GTK_RESPONSE_REJECT,
+#.GTK_STOCK_APPLY,
+#.GTK_RESPONSE_ACCEPT,
+#.NULL));
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1081
+msgid "Create VPN Connection"
+msgstr "Tạo kết nối VPN"
+
+#.gtk_container_add (GTK_CONTAINER (druid_window->vbox), GTK_WIDGET(gtk_label_new("Some label")));
+#.gtk_box_pack_start (GTK_BOX (druid_window->vbox), GTK_WIDGET(druid), TRUE,TRUE,0);
+#.gtk_box_pack_start (GTK_BOX (druid_window->vbox), GTK_WIDGET(gtk_label_new("Some label")), TRUE,TRUE,0);
+#.toplevel = gtk_widget_get_toplevel (GTK_WIDGET (druid));
+#.gtk_signal_connect (GTK_OBJECT (toplevel), "delete_event", GTK_SIGNAL_FUNC (vpn_window_close), NULL);
+#.make the druid window modal wrt. our main window
+#.gtk_window_set_modal (druid_window, TRUE);
+#.gtk_window_set_transient_for (GTK_WINDOW(druid_window), GTK_WINDOW (dialog));
+#.Edit dialog
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1099
 msgid "Edit VPN Connection"
-msgstr "Sửa đổi sự kết nối VPN"
+msgstr "Sửa kết nối VPN"
 
 #: ../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"
+msgstr "Thêm kết nối VPN mới"
 
 #: ../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
-msgid "Connect to:"
-msgstr "Kết nối đến:"
-
-#: ../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
-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
-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
 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:3
 msgid "E_xport"
 msgstr "_Xuất"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:9
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
 msgid "Edit the selected VPN connection"
-msgstr "Sửa đổi kết nối VPN đã chọn."
+msgstr "Sửa kết nối VPN đã chọn"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:10
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
 msgid "Export the VPN settings to a file"
-msgstr "Xuất các thiết lập VPN vào tập tin"
+msgstr "Xuất 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:6
 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
-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:7
 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
-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 "
-"(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."
+msgstr "Quản lý các kết nối mạng riêng ảo (VPN)"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:17
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
 msgid "VPN Connections"
 msgstr "Kết nối VPN"
 
@@ -863,146 +868,98 @@ 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:51
 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:53
 msgid "WPA CCMP"
 msgstr "WPA CCMP"
 
-#: ../src/nm-ap-security-wpa-psk.c:54
+#: ../src/nm-ap-security-wpa-psk.c:55
 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:60
 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:62
 msgid "WPA2 CCMP"
 msgstr "WPA2 CCMP"
 
-#: ../src/nm-ap-security-wpa-psk.c:63
+#: ../src/nm-ap-security-wpa-psk.c:64
 msgid "WPA2 Automatic"
 msgstr "WPA2 Tự động"
 
-#: ../src/nm-ap-security.c:320
+#: ../src/nm-ap-security.c:334
 msgid "none"
 msgstr "không có"
 
-#: ../src/nm-netlink-monitor.c:154
+#: ../src/nm-netlink-monitor.c:174
 #, 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 "
-"tuyến — %s"
+msgstr "không thể tạo ổ cắm kiểu liên kết mạng (netlink), để theo dõi các thiết bị "
+"Ethernet tuyến — %s"
 
-#: ../src/nm-netlink-monitor.c:172
+#: ../src/nm-netlink-monitor.c:192
 #, 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ị "
-"Ethernet tuyến — %s"
+msgstr "không thể đóng kết tới ổ cắm kiểu liên kết mạng (netlink), để theo dõi các "
+"thiết bị Ethernet tuyến — %s"
 
-#: ../src/nm-netlink-monitor.c:405
+#: ../src/nm-netlink-monitor.c:427
 msgid "operation took too long"
 msgstr "thao tác quá lâu"
 
-#: ../src/nm-netlink-monitor.c:502
+#: ../src/nm-netlink-monitor.c:524
 msgid "received data from wrong type of sender"
-msgstr "đã nhận dữ liệu từ bộ gởi kiểu không đúng"
+msgstr "đã nhận dữ liệu từ bộ gởi kiểu sai"
 
-#: ../src/nm-netlink-monitor.c:515
+#: ../src/nm-netlink-monitor.c:537
 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:666
 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"
+msgstr "quá nhiều dữ liệu đã được gởi qua ổ cắm nên một phần bị mất"
 
-#: ../src/nm-netlink-monitor.c:735
+#: ../src/nm-netlink-monitor.c:776
 msgid "error occurred while waiting for data on socket"
 msgstr "gặp lỗi khi đợi dữ liệu trên ổ cắm"
 
-#: ../src/applet-dbus-devices.c:898
+#: ../gnome/applet/applet-dbus-devices.c:930
 #, 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 »."
+msgstr "Bây giờ bạn có kết nối hoạt động đến mạng vô tuyến Như Có « %s »."
 
-#: ../src/applet-dbus-devices.c:903
+#: ../gnome/applet/applet-dbus-devices.c:935
 #, 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 »."
 
-#: ../src/applet-dbus-devices.c:910
+#: ../gnome/applet/applet-dbus-devices.c:942
 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."
 
-#: ../src/applet-dbus-devices.c:916
+#: ../gnome/applet/applet-dbus-devices.c:948
 msgid "Connection Established"
 msgstr "Kết nối đã được thiết lập"
 
-#: ../src/applet-dbus-devices.c:959
+#: ../gnome/applet/applet-dbus-devices.c:997
 msgid "Disconnected"
 msgstr "Bị ngắt kết nối"
 
-#: ../src/applet-dbus-devices.c:960
+#: ../gnome/applet/applet-dbus-devices.c:998
 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ỏ"
+#: ../src/nm-ap-security-leap.c:66
+#: ../src/nm-ap-security-leap.c:82
+msgid "LEAP"
+msgstr "LEAP"
diff --git a/po/wa.po b/po/wa.po
index f28e1cbb..41bccf2a 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: 2006-05-29 18:33+0200\n"
+"POT-Creation-Date: 2004-10-19 13:38-0400\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,116 +16,62 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
-#: ../src/applet-compat.c:171 ../src/applet-dbus-info.c:919
-#, fuzzy, c-format
-msgid "Passphrase for wireless network %s"
-msgstr "I gn a nole rantoele sins fyis..."
-
-#: ../src/applet-dbus.c:265
-#, c-format
-msgid "Connection to the wireless network '%s' failed."
-msgstr ""
-
-#: ../src/applet-dbus.c:270
-msgid "Connection to the wired network failed."
-msgstr ""
-
-#: ../src/applet.c:184
-msgid "Error displaying connection information:"
-msgstr ""
+#: info-daemon/networks.glade:11
+msgid "Modify Wireless Networks"
+msgstr "Candjî les rantoeles sins fyis"
 
-#: ../src/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é)."
-
-#: ../src/applet.c:213
-#, fuzzy
-msgid "No active connections!"
-msgstr "Raloyaedjes rantoele"
+#: info-daemon/networks.glade:92
+msgid "<span weight=\"bold\">Wireless Networks:</span>"
+msgstr "<span weight=\"bold\">Rantoeles sins fyis:</span>"
 
-#: ../src/applet.c:234
-#, fuzzy, c-format
-msgid "Wired Ethernet (%s)"
-msgstr "Rantoeles sins fyis"
+#: 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"
 
-#: ../src/applet.c:236
-#, fuzzy, c-format
-msgid "Wireless Ethernet (%s)"
-msgstr "Rantoeles sins fyis"
+#: info-daemon/passphrase.glade:52
+msgid "_Login to Network"
+msgstr "S' _elodjî sol rantoele"
 
-#: ../src/applet.c:337 ../src/applet.c:362
+#: info-daemon/passphrase.glade:100
 #, fuzzy
-msgid "NetworkManager Applet"
-msgstr "Li manaedjeu d' rantoeles n' est nén en alaedje..."
-
-#: ../src/applet.c:339 ../src/applet.c:364
-msgid "Copyright © 2004-2005 Red Hat, Inc."
-msgstr ""
-
-#: ../src/applet.c:340 ../src/applet.c:365
 msgid ""
-"Notification area applet for managing your network devices and connections."
-msgstr ""
-
-#: ../src/applet.c:343 ../src/applet.c:370
-msgid "translator-credits"
-msgstr ""
-
-#: ../src/applet.c:426
-msgid "VPN Login Failure"
-msgstr ""
-
-#: ../src/applet.c:427
-#, c-format
-msgid "Could not start the VPN connection '%s' due to a login failure."
+"<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»."
 
-#: ../src/applet.c:431
-msgid "VPN Start Failure"
+#: info-daemon/passphrase.glade:129
+msgid "Key Type:"
 msgstr ""
 
-#: ../src/applet.c:432
-#, c-format
+#: info-daemon/passphrase.glade:150
 msgid ""
-"Could not start the VPN connection '%s' due to a failure launching the VPN "
-"program."
-msgstr ""
-
-#: ../src/applet.c:436 ../src/applet.c:446
-msgid "VPN Connect Failure"
-msgstr ""
-
-#: ../src/applet.c:437
-#, c-format
-msgid "Could not start the VPN connection '%s' due to a connection error."
-msgstr ""
-
-#: ../src/applet.c:441
-msgid "VPN Configuration Error"
+"128-bit Passphrase\n"
+"128-bit Raw Hex Key"
 msgstr ""
 
-#: ../src/applet.c:442
-#, c-format
-msgid "The VPN connection '%s' was not correctly configured."
-msgstr ""
+#: info-daemon/passphrase.glade:180
+#: info-daemon/NetworkManagerInfoPassphraseDialog.c:101
+msgid "Passphrase:"
+msgstr "Sicret:"
 
-#: ../src/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/passphrase.glade:208 panel-applet/essid.glade:162
+msgid "*"
+msgstr "*"
 
-#: ../src/applet.c:517
-msgid "VPN Login Message"
+#: info-daemon/NetworkManagerInfoPassphraseDialog.c:104
+msgid "Key:"
 msgstr ""
 
-#: ../src/applet.c:741 ../src/applet.c:2508
-#: ../src/other-network-dialog.c:453
-#: ../src/passphrase-dialog.c:228
+#. Reuse the above string to make the translators less angry.
+#: panel-applet/NMWirelessApplet.c:691 panel-applet/NMWirelessApplet.c:701
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
@@ -133,851 +79,81 @@ 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é)."
 
-#: ../src/applet.c:753
-#, c-format
-msgid "The network device \"%s (%s)\" does not support wireless scanning."
-msgstr ""
-
-#: ../src/applet.c:761
-#, c-format
-msgid "The network device \"%s (%s)\" does not support link detection."
-msgstr ""
-
-#: ../src/applet.c:908
-#, c-format
-msgid "Preparing device %s for the wired network..."
-msgstr ""
-
-#: ../src/applet.c:910
-#, fuzzy, c-format
-msgid "Preparing device %s for the wireless network '%s'..."
-msgstr "I gn a nole rantoele sins fyis..."
-
-#: ../src/applet.c:918
-#, c-format
-msgid "Configuring device %s for the wired network..."
-msgstr ""
-
-#: ../src/applet.c:920
-#, fuzzy, c-format
-msgid "Attempting to join the wireless network '%s'..."
-msgstr "I gn a nole rantoele sins fyis..."
-
-#: ../src/applet.c:928
-#, fuzzy, c-format
-msgid "Waiting for Network Key for the wireless network '%s'..."
-msgstr "I gn a nole rantoele sins fyis..."
-
-#: ../src/applet.c:936 ../src/applet.c:946
-msgid "Requesting a network address from the wired network..."
-msgstr ""
-
-#: ../src/applet.c:938 ../src/applet.c:948
-#, fuzzy, c-format
-msgid "Requesting a network address from the wireless network '%s'..."
-msgstr "I gn a nole rantoele sins fyis..."
-
-#: ../src/applet.c:956
-msgid "Finishing connection to the wired network..."
-msgstr ""
-
-#: ../src/applet.c:958
-#, fuzzy, c-format
-msgid "Finishing connection to the wireless network '%s'..."
-msgstr "I gn a nole rantoele sins fyis..."
-
-#: ../src/applet.c:1075
-#, fuzzy
-msgid "NetworkManager is not running"
-msgstr "Li manaedjeu d' rantoeles n' est nén en alaedje..."
-
-#: ../src/applet.c:1083 ../src/applet.c:1828
-msgid "Networking disabled"
-msgstr ""
-
-#: ../src/applet.c:1088
-#, fuzzy
-msgid "No network connection"
-msgstr "Raloyaedjes rantoele"
-
-#: ../src/applet.c:1093
+#: panel-applet/NMWirelessApplet.c:716
 #, fuzzy
-msgid "Wired network connection"
-msgstr "Raloyaedjes rantoele"
-
-#: ../src/applet.c:1097
-#, fuzzy
-msgid "Connected to an Ad-Hoc wireless network"
+msgid "Custom wireless network"
 msgstr "Rantoeles sins fyis"
 
-#: ../src/applet.c:1099
-#, fuzzy, c-format
-msgid "Wireless network connection to '%s' (%d%%)"
-msgstr "Rantoeles sins fyis"
-
-#: ../src/applet.c:1120
-#, c-format
-msgid "VPN connection to '%s'"
-msgstr ""
-
-#: ../src/applet.c:1128
-#, c-format
-msgid "VPN connecting to '%s'"
+#: panel-applet/NMWirelessApplet.c:717
+msgid "Enter the ESSID of the wireless network to which you wish to connect."
 msgstr ""
 
-#: ../src/applet.c:1541
+#: panel-applet/NMWirelessApplet.c:800
 #, fuzzy
-msgid "_Connect to Other Wireless Network..."
+msgid "Other Wireless Networks..."
 msgstr "Rantoeles sins fyis"
 
-#: ../src/applet.c:1562
-#, fuzzy
-msgid "Create _New Wireless Network..."
-msgstr "Rantoeles sins fyis"
-
-#: ../src/applet.c:1685
-#, fuzzy
-msgid "_VPN Connections"
-msgstr "Raloyaedjes rantoele"
-
-#: ../src/applet.c:1730
-msgid "_Configure VPN..."
-msgstr ""
-
-#: ../src/applet.c:1734
-msgid "_Disconnect VPN..."
-msgstr ""
-
-#: ../src/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
-#: ../src/applet.c:1767
-#, c-format
-msgid "Connect to %s..."
-msgstr ""
-
-#: ../src/applet.c:1773
-#, c-format
-msgid "Disconnect from %s..."
-msgstr ""
-
-#: ../src/applet.c:1822
+#: panel-applet/NMWirelessApplet.c:911
 msgid "No network devices have been found"
 msgstr ""
 
-#: ../src/applet.c:2014
+#: panel-applet/NMWirelessApplet.c:1028
 msgid "NetworkManager is not running..."
 msgstr "Li manaedjeu d' rantoeles n' est nén en alaedje..."
 
-#. 'Enable Networking' item
-#: ../src/applet.c:2170
-#, fuzzy
-msgid "Enable _Networking"
-msgstr "Rantoeles sins fyis"
-
-#. 'Enable Wireless' item
-#: ../src/applet.c:2176
-msgid "Enable _Wireless"
-msgstr ""
-
-#. 'Connection Information' item
-#: ../src/applet.c:2182
-msgid "Connection _Information"
-msgstr ""
-
-#. Help item
-#: ../src/applet.c:2193
-msgid "_Help"
+#: panel-applet/essid.glade:52
+msgid "C_onnect"
 msgstr ""
 
-#. About item
-#: ../src/applet.c:2202
-#, fuzzy
-msgid "_About"
-msgstr "Å_d fwait..."
-
-#: ../src/applet.c:2667
+#: panel-applet/essid.glade:131
 #, fuzzy
-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é)."
-
-#: ../src/wireless-security-option.c:157
-msgid "Open System"
-msgstr ""
-
-#: ../src/wireless-security-option.c:160
-msgid "Shared Key"
-msgstr ""
-
-#: ../src/wireless-security-option.c:208
-msgid "Automatic (Default)"
-msgstr ""
-
-#: ../src/wireless-security-option.c:215
-msgid "AES-CCMP"
-msgstr ""
-
-#: ../src/wireless-security-option.c:223
-msgid "TKIP"
-msgstr ""
-
-#: ../src/wireless-security-option.c:231
-msgid "Dynamic WEP"
-msgstr ""
-
-#: ../src/wso-none.c:53
-msgid "None"
-msgstr ""
-
-#: ../src/wso-wep-ascii.c:138
-msgid "WEP 64/128-bit ASCII"
-msgstr ""
-
-#: ../src/wso-wep-hex.c:135
-msgid "WEP 64/128-bit Hex"
-msgstr ""
+msgid "Wireless _Network:"
+msgstr "Rantoeles sins fyis"
 
-#: ../src/wso-wep-passphrase.c:135
+#: panel-applet/essid.glade:177
 #, fuzzy
-msgid "WEP 128-bit Passphrase"
-msgstr "Sicret:"
-
-#: ../src/wso-wpa-eap.c:237
-msgid "PEAP"
-msgstr ""
-
-#: ../src/wso-wpa-eap.c:238
-msgid "TLS"
-msgstr ""
-
-#: ../src/wso-wpa-eap.c:239
-msgid "TTLS"
-msgstr ""
-
-#: ../src/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 ""
-
-#: ../src/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 ""
-
-#: ../src/wso-wpa-psk.c:178
-msgid "WPA2 Personal"
-msgstr ""
-
-#: ../src/wso-wpa-psk.c:180
-msgid "WPA Personal"
-msgstr ""
-
-#: ../src/eggtrayicon.c:134
-msgid "Orientation"
-msgstr ""
-
-#: ../src/eggtrayicon.c:135
-msgid "The orientation of the tray."
-msgstr ""
+msgid "Wireless _adapter:"
+msgstr "Rantoeles sins fyis"
 
-#: ../src/menu-items.c:88
+#: panel-applet/menu-info.c:101
 #, fuzzy, c-format
 msgid "Wired Network (%s)"
 msgstr "Rantoeles sins fyis"
 
-#: ../src/menu-items.c:91
+#: panel-applet/menu-info.c:103
 #, fuzzy
-msgid "_Wired Network"
+msgid "Wired Network"
 msgstr "Rantoeles sins fyis"
 
-#: ../src/menu-items.c:162
+#: panel-applet/menu-info.c:168
 #, fuzzy, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
 msgstr[0] "Rantoeles sins fyis"
 msgstr[1] "Rantoeles sins fyis"
 
-#: ../src/menu-items.c:164
+#: panel-applet/menu-info.c:170
 #, fuzzy
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Rantoeles sins fyis"
 msgstr[1] "Rantoeles sins fyis"
 
-#: ../src/menu-items.c:343
+#: panel-applet/menu-info.c:307
 msgid " (invalid Unicode)"
 msgstr ""
 
-#: ../src/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 ""
-
-#: ../src/other-network-dialog.c:358
-#, fuzzy
-msgid "Create new wireless network"
-msgstr "I gn a nole rantoele sins fyis..."
-
-#: ../src/other-network-dialog.c:359
-msgid ""
-"Enter the name and security settings of the wireless network you wish to "
-"create."
-msgstr ""
-
-#: ../src/other-network-dialog.c:363
-#, fuzzy
-msgid "Create New Wireless Network"
-msgstr "Rantoeles sins fyis"
-
-#: ../src/other-network-dialog.c:368
-#, fuzzy
-msgid "Existing wireless network"
-msgstr "Rantoeles sins fyis"
-
-#: ../src/other-network-dialog.c:369
-msgid "Enter the name of the wireless network to which you wish to connect."
-msgstr ""
-
-#: ../src/other-network-dialog.c:371
-#, fuzzy
-msgid "Connect to Other Wireless Network"
-msgstr "Rantoeles sins fyis"
-
-#: ../src/passphrase-dialog.c:215
-#, fuzzy
-msgid "Error connecting to wireless network"
-msgstr "Rantoeles sins fyis"
-
-#: ../src/passphrase-dialog.c:216
-msgid ""
-"The requested wireless network requires security capabilities unsupported by "
-"your hardware."
-msgstr ""
-
-#: ../src/vpn-password-dialog.c:151
-#: ../src/vpn-password-dialog.c:188
-#, c-format
-msgid "Cannot start VPN connection '%s'"
-msgstr ""
-
-#: ../src/vpn-password-dialog.c:154
-#, c-format
-msgid ""
-"Could not find the authentication dialog for VPN connection type '%s'. "
-"Contact your system administrator."
-msgstr ""
-
-#: ../src/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 ""
-
-#: ../src/applet.glade.h:1
-msgid " "
-msgstr " "
-
-#: ../src/applet.glade.h:2
-#, fuzzy
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
-msgstr "<span weight=\"bold\">Rantoeles sins fyis:</span>"
-
-#: ../src/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»."
-
-#: ../src/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 ""
-
-#: ../src/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."
-
-#: ../src/applet.glade.h:15
-msgid "Anonymous Identity:"
-msgstr ""
-
-#: ../src/applet.glade.h:16
-msgid "Authentication:"
-msgstr ""
-
-#: ../src/applet.glade.h:17
-msgid "Broadcast Address:"
-msgstr ""
-
-#: ../src/applet.glade.h:18
-msgid "CA Certificate File:"
-msgstr ""
-
-#: ../src/applet.glade.h:19
-msgid "C_onnect"
-msgstr ""
-
-#: ../src/applet.glade.h:20
-msgid "Client Certificate File:"
-msgstr ""
-
-#: ../src/applet.glade.h:21
-msgid "Connection Information"
-msgstr ""
-
-#: ../src/applet.glade.h:22
-msgid "Default Route:"
-msgstr ""
-
-#: ../src/applet.glade.h:23
-msgid "Destination Address:"
-msgstr ""
-
-#: ../src/applet.glade.h:24
-msgid "Driver:"
-msgstr ""
-
-#: ../src/applet.glade.h:25
-msgid "EAP Method:"
-msgstr ""
-
-#: ../src/applet.glade.h:26
-msgid "Hardware Address:"
-msgstr ""
-
-#: ../src/applet.glade.h:27
-msgid "IP Address:"
-msgstr ""
-
-#: ../src/applet.glade.h:28
-msgid "Identity:"
-msgstr ""
-
-#: ../src/applet.glade.h:29
-msgid "Interface:"
-msgstr ""
-
-#: ../src/applet.glade.h:30
-msgid "Key Type:"
-msgstr ""
-
-#: ../src/applet.glade.h:31
-msgid "Key:"
-msgstr ""
-
-#: ../src/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 ""
-
-#: ../src/applet.glade.h:37
-msgid ""
-"Open System\n"
-"Shared Key"
-msgstr ""
-
-#: ../src/applet.glade.h:39
-#, fuzzy
-msgid "Other Wireless Network..."
-msgstr "Rantoeles sins fyis"
-
-#: ../src/applet.glade.h:40
-msgid "Passphrase:"
-msgstr "Sicret:"
-
-#: ../src/applet.glade.h:41
-msgid "Password:"
-msgstr ""
-
-#: ../src/applet.glade.h:42
-msgid "Primary DNS:"
-msgstr ""
-
-#: ../src/applet.glade.h:43
-msgid "Private Key File:"
-msgstr ""
-
-#: ../src/applet.glade.h:44
-msgid "Private Key Password:"
-msgstr ""
-
-#: ../src/applet.glade.h:45
-msgid "Secondary DNS:"
-msgstr ""
-
-#: ../src/applet.glade.h:46
-msgid "Select the CA Certificate File"
-msgstr ""
-
-#: ../src/applet.glade.h:47
-msgid "Select the Client Certificate File"
-msgstr ""
-
-#: ../src/applet.glade.h:48
-msgid "Select the Private Key File"
-msgstr ""
-
-#: ../src/applet.glade.h:49
-msgid "Show key"
-msgstr ""
-
-#: ../src/applet.glade.h:50
-#, fuzzy
-msgid "Show passphrase"
-msgstr "Sicret:"
-
-#: ../src/applet.glade.h:51
-msgid "Show password"
-msgstr ""
-
-#: ../src/applet.glade.h:52
-msgid "Show passwords"
-msgstr ""
-
-#: ../src/applet.glade.h:53
-msgid "Speed:"
-msgstr ""
-
-#: ../src/applet.glade.h:54
-msgid "Subnet Mask:"
-msgstr ""
-
-#: ../src/applet.glade.h:55
-msgid "Type:"
-msgstr ""
-
-#: ../src/applet.glade.h:56
-msgid "User Name:"
-msgstr ""
-
-#: ../src/applet.glade.h:57
-msgid "Wireless Network Key Required"
-msgstr "I gn a mezåjhe d' ene clé d' ecriptaedje pol rantoele sins fyis"
-
-#: ../src/applet.glade.h:58
-#, fuzzy
-msgid "Wireless _adapter:"
-msgstr "Rantoeles sins fyis"
-
-#: ../src/applet.glade.h:59
-#, fuzzy
-msgid "_Always Trust this Wireless Network"
-msgstr "Aveur tofer fiyate dins cisse rantoele ci"
-
-#: ../src/applet.glade.h:60
-msgid "_Don't remind me again"
-msgstr ""
-
-#: ../src/applet.glade.h:61
-msgid "_Login to Network"
-msgstr "S' _elodjî sol rantoele"
-
-#: ../src/applet.glade.h:62
-msgid "_Network Name:"
-msgstr ""
-
-#: ../src/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 ""
-
-#: ../src/applet-dbus-devices.c:898
-#, c-format
-msgid "You are now connected to the Ad-Hoc wireless network '%s'."
-msgstr ""
-
-#: ../src/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..."
-
-#: ../src/applet-dbus-devices.c:910
-msgid "You are now connected to the wired network."
-msgstr ""
-
-#: ../src/applet-dbus-devices.c:916
-msgid "Connection Established"
+#: examples/python/systray/eggtrayicon.c:111
+msgid "Orientation"
 msgstr ""
 
-#: ../src/applet-dbus-devices.c:959
-msgid "Disconnected"
+#: examples/python/systray/eggtrayicon.c:112
+msgid "The orientation of the tray."
 msgstr ""
 
-#: ../src/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..."
 
@@ -987,9 +163,15 @@ msgstr "Nou raloyaedje rantoele en alaedje pol moumint..."
 #~ 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 aff23e3b..fe3eff50 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-29 18:33+0200\n"
-"PO-Revision-Date: 2005-10-16 17:47+0800\n"
+"POT-Creation-Date: 2006-05-27 12:26+0200\n"
+"PO-Revision-Date: 2006-05-27 23:35+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
@@ -16,453 +16,453 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../src/applet-compat.c:171 ../src/applet-dbus-info.c:919
+#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:919
 #, c-format
 msgid "Passphrase for wireless network %s"
 msgstr "无线网络 %s 的密码句"
 
-#: ../src/applet-dbus.c:265
+#: ../gnome/applet/applet-dbus.c:383
 #, c-format
 msgid "Connection to the wireless network '%s' failed."
 msgstr "到无线网络“%s”的连接失败。"
 
-#: ../src/applet-dbus.c:270
+#: ../gnome/applet/applet-dbus.c:388
 msgid "Connection to the wired network failed."
 msgstr "连接到有线网络失败。"
 
-#: ../src/applet.c:184
+#: ../gnome/applet/applet.c:184
 msgid "Error displaying connection information:"
 msgstr "显示连接信息出错："
 
-#: ../src/applet.c:202
+#: ../gnome/applet/applet.c:202
 msgid "Could not find some required resources (the glade file)!"
 msgstr "序找不到所需的资源(glade 文件未找到)！"
 
-#: ../src/applet.c:213
+#: ../gnome/applet/applet.c:213
 msgid "No active connections!"
 msgstr "没有活动的连接！"
 
-#: ../src/applet.c:234
+#: ../gnome/applet/applet.c:234
 #, c-format
 msgid "Wired Ethernet (%s)"
 msgstr "有线以太网(%s)"
 
-#: ../src/applet.c:236
+#: ../gnome/applet/applet.c:236
 #, c-format
 msgid "Wireless Ethernet (%s)"
 msgstr "无线以太网(%s)"
 
-#: ../src/applet.c:337 ../src/applet.c:362
+#: ../gnome/applet/applet.c:337 ../gnome/applet/applet.c:362
 msgid "NetworkManager Applet"
 msgstr "网络管理器小程序"
 
-#: ../src/applet.c:339 ../src/applet.c:364
+#: ../gnome/applet/applet.c:339 ../gnome/applet/applet.c:364
 msgid "Copyright © 2004-2005 Red Hat, Inc."
 msgstr "版权 (C) 2004-2005 Red Hat, Inc."
 
-#: ../src/applet.c:340 ../src/applet.c:365
+#: ../gnome/applet/applet.c:340 ../gnome/applet/applet.c:365
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "管理您网络设备和连接的通知区域小程序"
 
-#: ../src/applet.c:343 ../src/applet.c:370
+#: ../gnome/applet/applet.c:343 ../gnome/applet/applet.c:370
 msgid "translator-credits"
 msgstr "Funda Wang <fundawang@linux.net.cn>"
 
-#: ../src/applet.c:426
+#: ../gnome/applet/applet.c:426
 msgid "VPN Login Failure"
 msgstr "VPN 登录失败"
 
-#: ../src/applet.c:427
+#: ../gnome/applet/applet.c:427
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a login failure."
 msgstr "无法启动 VPN 连接“%s”，原因是登录失败。"
 
-#: ../src/applet.c:431
+#: ../gnome/applet/applet.c:431
 msgid "VPN Start Failure"
 msgstr "VPN 启动失败"
 
-#: ../src/applet.c:432
+#: ../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 程序失败。"
 
-#: ../src/applet.c:436 ../src/applet.c:446
+#: ../gnome/applet/applet.c:436 ../gnome/applet/applet.c:446
 msgid "VPN Connect Failure"
 msgstr "VPN 连接失败"
 
-#: ../src/applet.c:437
+#: ../gnome/applet/applet.c:437
 #, c-format
 msgid "Could not start the VPN connection '%s' due to a connection error."
 msgstr "无法启动 VPN 连接“%s”，原因是连接出错。"
 
-#: ../src/applet.c:441
+#: ../gnome/applet/applet.c:441
 msgid "VPN Configuration Error"
 msgstr "VPN 配置错误"
 
-#: ../src/applet.c:442
+#: ../gnome/applet/applet.c:442
 #, c-format
 msgid "The VPN connection '%s' was not correctly configured."
 msgstr "VPN 连接“%s”未正确配置。"
 
-#: ../src/applet.c:447
+#: ../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 服务器未返回足够的网络配置。"
 
-#: ../src/applet.c:517
+#: ../gnome/applet/applet.c:517
 msgid "VPN Login Message"
 msgstr "VPN 登录消息"
 
-#: ../src/applet.c:741 ../src/applet.c:2508
-#: ../src/other-network-dialog.c:453
-#: ../src/passphrase-dialog.c:228
+#: ../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 文件未找到)。"
 
-#: ../src/applet.c:753
+#: ../gnome/applet/applet.c:753
 #, c-format
 msgid "The network device \"%s (%s)\" does not support wireless scanning."
 msgstr "网络设备“%s(%s)”不支持无线扫描。"
 
-#: ../src/applet.c:761
+#: ../gnome/applet/applet.c:761
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
 msgstr "网络设备“%s(%s)”不支持链接检测。"
 
-#: ../src/applet.c:908
+#: ../gnome/applet/applet.c:908
 #, c-format
 msgid "Preparing device %s for the wired network..."
 msgstr "正在为有线网络准备设备 %s..."
 
-#: ../src/applet.c:910
+#: ../gnome/applet/applet.c:910
 #, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
 msgstr "正在为无线网络“%2$s”准备设备 %1$s..."
 
-#: ../src/applet.c:918
+#: ../gnome/applet/applet.c:918
 #, c-format
 msgid "Configuring device %s for the wired network..."
 msgstr "正在为有线网络配置设备 %s..."
 
-#: ../src/applet.c:920
+#: ../gnome/applet/applet.c:920
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
 msgstr "正在试图加入无线网络“%s”..."
 
-#: ../src/applet.c:928
+#: ../gnome/applet/applet.c:928
 #, c-format
 msgid "Waiting for Network Key for the wireless network '%s'..."
 msgstr "正在等待无线网络“%s”的网络密钥..."
 
-#: ../src/applet.c:936 ../src/applet.c:946
+#: ../gnome/applet/applet.c:936 ../gnome/applet/applet.c:946
 msgid "Requesting a network address from the wired network..."
 msgstr "正在从有线网络请求网络地址..."
 
-#: ../src/applet.c:938 ../src/applet.c:948
+#: ../gnome/applet/applet.c:938 ../gnome/applet/applet.c:948
 #, c-format
 msgid "Requesting a network address from the wireless network '%s'..."
 msgstr "正在从无线网络“%s”请求网络地址..."
 
-#: ../src/applet.c:956
+#: ../gnome/applet/applet.c:956
 msgid "Finishing connection to the wired network..."
 msgstr "正在完成到有线网络的连接..."
 
-#: ../src/applet.c:958
+#: ../gnome/applet/applet.c:958
 #, c-format
 msgid "Finishing connection to the wireless network '%s'..."
 msgstr "正在完成到无线网络“%s”的连接..."
 
-#: ../src/applet.c:1075
+#: ../gnome/applet/applet.c:1075
 msgid "NetworkManager is not running"
 msgstr "网络管理器未运行"
 
-#: ../src/applet.c:1083 ../src/applet.c:1828
+#: ../gnome/applet/applet.c:1083 ../gnome/applet/applet.c:1828
 msgid "Networking disabled"
 msgstr "网络已禁用"
 
-#: ../src/applet.c:1088
+#: ../gnome/applet/applet.c:1088
 msgid "No network connection"
 msgstr "没有网络连接"
 
-#: ../src/applet.c:1093
+#: ../gnome/applet/applet.c:1093
 msgid "Wired network connection"
 msgstr "有线网络连接"
 
-#: ../src/applet.c:1097
+#: ../gnome/applet/applet.c:1097
 msgid "Connected to an Ad-Hoc wireless network"
-msgstr "已连接到点对点无线网络"
+msgstr "已连接到 Ad-Hoc 无线网络"
 
-#: ../src/applet.c:1099
+#: ../gnome/applet/applet.c:1099
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "到“%s”的无线网络连接(%d%%)"
 
-#: ../src/applet.c:1120
+#: ../gnome/applet/applet.c:1120
 #, c-format
 msgid "VPN connection to '%s'"
 msgstr "到“%s”的 VPN 连接"
 
-#: ../src/applet.c:1128
+#: ../gnome/applet/applet.c:1128
 #, c-format
 msgid "VPN connecting to '%s'"
 msgstr "连接到“%s”的 VPN"
 
-#: ../src/applet.c:1541
+#: ../gnome/applet/applet.c:1541
 msgid "_Connect to Other Wireless Network..."
 msgstr "连接到其它无线网络(_C)..."
 
-#: ../src/applet.c:1562
+#: ../gnome/applet/applet.c:1562
 msgid "Create _New Wireless Network..."
 msgstr "创建新的无线网络(_N)..."
 
-#: ../src/applet.c:1685
+#: ../gnome/applet/applet.c:1685
 msgid "_VPN Connections"
 msgstr "_VPN 连接"
 
-#: ../src/applet.c:1730
+#: ../gnome/applet/applet.c:1730
 msgid "_Configure VPN..."
 msgstr "配置 VPN(_C)..."
 
-#: ../src/applet.c:1734
+#: ../gnome/applet/applet.c:1734
 msgid "_Disconnect VPN..."
 msgstr "断开 VPN(_D)..."
 
-#: ../src/applet.c:1756
+#: ../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
-#: ../src/applet.c:1767
+#: ../gnome/applet/applet.c:1767
 #, c-format
 msgid "Connect to %s..."
 msgstr "正在连接到 %s..."
 
-#: ../src/applet.c:1773
+#: ../gnome/applet/applet.c:1773
 #, c-format
 msgid "Disconnect from %s..."
 msgstr "正在从 %s 断开..."
 
-#: ../src/applet.c:1822
+#: ../gnome/applet/applet.c:1822
 msgid "No network devices have been found"
 msgstr "没有发现网络设备"
 
-#: ../src/applet.c:2014
+#: ../gnome/applet/applet.c:2014
 msgid "NetworkManager is not running..."
 msgstr "网络管理器未运行..."
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2170
+#: ../gnome/applet/applet.c:2170
 msgid "Enable _Networking"
 msgstr "启用联网(_N)"
 
 #. 'Enable Wireless' item
-#: ../src/applet.c:2176
+#: ../gnome/applet/applet.c:2176
 msgid "Enable _Wireless"
 msgstr "启用无线(_W)"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2182
+#: ../gnome/applet/applet.c:2182
 msgid "Connection _Information"
 msgstr "连接信息(_I)"
 
 #. Help item
-#: ../src/applet.c:2193
+#: ../gnome/applet/applet.c:2193
 msgid "_Help"
 msgstr "帮助(_H)"
 
 #. About item
-#: ../src/applet.c:2202
+#: ../gnome/applet/applet.c:2202
 msgid "_About"
 msgstr "关于(_A)"
 
-#: ../src/applet.c:2667
+#: ../gnome/applet/applet.c:2667
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
 msgstr "网络管理器小程序找不到所需的资源。无法继续。\n"
 
-#: ../src/wireless-security-option.c:157
+#: ../gnome/applet/wireless-security-option.c:157
 msgid "Open System"
 msgstr "开放式系统"
 
-#: ../src/wireless-security-option.c:160
+#: ../gnome/applet/wireless-security-option.c:160
 msgid "Shared Key"
 msgstr "共享密钥"
 
-#: ../src/wireless-security-option.c:208
+#: ../gnome/applet/wireless-security-option.c:208
 msgid "Automatic (Default)"
 msgstr "自动(默认)"
 
-#: ../src/wireless-security-option.c:215
+#: ../gnome/applet/wireless-security-option.c:215
 msgid "AES-CCMP"
 msgstr "AES-CCMP"
 
-#: ../src/wireless-security-option.c:223
+#: ../gnome/applet/wireless-security-option.c:223
 msgid "TKIP"
 msgstr "TKIP"
 
-#: ../src/wireless-security-option.c:231
+#: ../gnome/applet/wireless-security-option.c:231
 msgid "Dynamic WEP"
 msgstr "动态 WEP"
 
-#: ../src/wso-none.c:53
+#: ../gnome/applet/wso-none.c:53
 msgid "None"
 msgstr "无"
 
-#: ../src/wso-wep-ascii.c:138
+#: ../gnome/applet/wso-wep-ascii.c:138
 msgid "WEP 64/128-bit ASCII"
 msgstr "WEP 64/128 位 ASCII"
 
-#: ../src/wso-wep-hex.c:135
+#: ../gnome/applet/wso-wep-hex.c:135
 msgid "WEP 64/128-bit Hex"
 msgstr "WEP 64/128 位十六进制"
 
-#: ../src/wso-wep-passphrase.c:135
+#: ../gnome/applet/wso-wep-passphrase.c:135
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128 位密码句"
 
-#: ../src/wso-wpa-eap.c:237
+#: ../gnome/applet/wso-wpa-eap.c:237
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../src/wso-wpa-eap.c:238
+#: ../gnome/applet/wso-wpa-eap.c:238
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wso-wpa-eap.c:239
+#: ../gnome/applet/wso-wpa-eap.c:239
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../src/wso-wpa-eap.c:247 ../src/nm-ap-security-wpa-eap.c:92
+#: ../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 企业"
 
-#: ../src/wso-wpa-eap.c:249 ../src/nm-ap-security-wpa-eap.c:94
+#: ../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 企业"
 
-#: ../src/wso-wpa-psk.c:178
+#: ../gnome/applet/wso-wpa-psk.c:178
 msgid "WPA2 Personal"
 msgstr "WPA2 个人"
 
-#: ../src/wso-wpa-psk.c:180
+#: ../gnome/applet/wso-wpa-psk.c:180
 msgid "WPA Personal"
 msgstr "WPA 个人"
 
-#: ../src/eggtrayicon.c:134
+#: ../gnome/applet/eggtrayicon.c:134
 msgid "Orientation"
 msgstr "方向"
 
-#: ../src/eggtrayicon.c:135
+#: ../gnome/applet/eggtrayicon.c:135
 msgid "The orientation of the tray."
 msgstr "托盘方向。"
 
-#: ../src/menu-items.c:88
+#: ../gnome/applet/menu-items.c:88
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "有线网络(%s)"
 
-#: ../src/menu-items.c:91
+#: ../gnome/applet/menu-items.c:91
 msgid "_Wired Network"
 msgstr "有线网络(_W)"
 
-#: ../src/menu-items.c:162
+#: ../gnome/applet/menu-items.c:162
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
 msgstr[0] "无线网络(%s)"
 
-#: ../src/menu-items.c:164
+#: ../gnome/applet/menu-items.c:164
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "无线网络"
 
-#: ../src/menu-items.c:343
+#: ../gnome/applet/menu-items.c:343
 msgid " (invalid Unicode)"
 msgstr " (无效的 Unicode)"
 
-#: ../src/other-network-dialog.c:352
+#: ../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，如果没有加密的话"
 
-#: ../src/other-network-dialog.c:358
+#: ../gnome/applet/other-network-dialog.c:358
 msgid "Create new wireless network"
 msgstr "创建新的无线网络"
 
-#: ../src/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 "输入您想要创建的无线网络的名称和安全设置。"
 
-#: ../src/other-network-dialog.c:363
+#: ../gnome/applet/other-network-dialog.c:363
 msgid "Create New Wireless Network"
 msgstr "创建新的无线网络"
 
-#: ../src/other-network-dialog.c:368
+#: ../gnome/applet/other-network-dialog.c:368
 msgid "Existing wireless network"
 msgstr "现有无线网络"
 
-#: ../src/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 "输入您想要连接的无线网络的名称。"
 
-#: ../src/other-network-dialog.c:371
+#: ../gnome/applet/other-network-dialog.c:371
 msgid "Connect to Other Wireless Network"
 msgstr "连接到其它无线网络"
 
-#: ../src/passphrase-dialog.c:215
+#: ../gnome/applet/passphrase-dialog.c:215
 msgid "Error connecting to wireless network"
 msgstr "连接到无线网络出错"
 
-#: ../src/passphrase-dialog.c:216
+#: ../gnome/applet/passphrase-dialog.c:216
 msgid ""
 "The requested wireless network requires security capabilities unsupported by "
 "your hardware."
 msgstr "您的硬件不支持请求的无线网络所需的安全特性。"
 
-#: ../src/vpn-password-dialog.c:151
-#: ../src/vpn-password-dialog.c:188
+#: ../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”"
 
-#: ../src/vpn-password-dialog.c:154
+#: ../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”的身份验证对话。请联系您的系统管理员。"
 
-#: ../src/vpn-password-dialog.c:191
+#: ../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”的身份验证对话有问题。请联系您的系统管理员。"
 
-#: ../src/applet.glade.h:1
+#: ../gnome/applet/applet.glade.h:1
 msgid " "
 msgstr " "
 
-#: ../src/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\">活动连接信息</span>"
 
-#: ../src/applet.glade.h:4
+#: ../gnome/applet/applet.glade.h:4
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
@@ -475,7 +475,7 @@ msgstr ""
 "\n"
 "要访问无线网络“%s”，需要提供密码句或加密密钥。"
 
-#: ../src/applet.glade.h:8
+#: ../gnome/applet/applet.glade.h:8
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
@@ -486,7 +486,7 @@ msgstr ""
 "\n"
 "%s  该网络无法完整工作。"
 
-#: ../src/applet.glade.h:12
+#: ../gnome/applet/applet.glade.h:12
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
@@ -501,75 +501,75 @@ msgstr ""
 "您选择登录到无线网络“%s”。如果您确定此无线网络是安全的，请选中下面的复选框，"
 "网络管理器在以后登录时将不会请求确认。"
 
-#: ../src/applet.glade.h:15
+#: ../gnome/applet/applet.glade.h:15
 msgid "Anonymous Identity:"
 msgstr "匿名身份："
 
-#: ../src/applet.glade.h:16
+#: ../gnome/applet/applet.glade.h:16
 msgid "Authentication:"
 msgstr "认证："
 
-#: ../src/applet.glade.h:17
+#: ../gnome/applet/applet.glade.h:17
 msgid "Broadcast Address:"
 msgstr "广播地址："
 
-#: ../src/applet.glade.h:18
+#: ../gnome/applet/applet.glade.h:18
 msgid "CA Certificate File:"
 msgstr "CA 证书文件："
 
-#: ../src/applet.glade.h:19
+#: ../gnome/applet/applet.glade.h:19
 msgid "C_onnect"
 msgstr "连接(_O)"
 
-#: ../src/applet.glade.h:20
+#: ../gnome/applet/applet.glade.h:20
 msgid "Client Certificate File:"
 msgstr "客户端证书文件："
 
-#: ../src/applet.glade.h:21
+#: ../gnome/applet/applet.glade.h:21
 msgid "Connection Information"
 msgstr "连接信息"
 
-#: ../src/applet.glade.h:22
+#: ../gnome/applet/applet.glade.h:22
 msgid "Default Route:"
 msgstr "默认路由："
 
-#: ../src/applet.glade.h:23
+#: ../gnome/applet/applet.glade.h:23
 msgid "Destination Address:"
 msgstr "目的地址："
 
-#: ../src/applet.glade.h:24
+#: ../gnome/applet/applet.glade.h:24
 msgid "Driver:"
 msgstr "驱动程序："
 
-#: ../src/applet.glade.h:25
+#: ../gnome/applet/applet.glade.h:25
 msgid "EAP Method:"
 msgstr "EAP 方法："
 
-#: ../src/applet.glade.h:26
+#: ../gnome/applet/applet.glade.h:26
 msgid "Hardware Address:"
 msgstr "硬件地址："
 
-#: ../src/applet.glade.h:27
+#: ../gnome/applet/applet.glade.h:27
 msgid "IP Address:"
 msgstr "IP 地址："
 
-#: ../src/applet.glade.h:28
+#: ../gnome/applet/applet.glade.h:28
 msgid "Identity:"
 msgstr "身份："
 
-#: ../src/applet.glade.h:29
+#: ../gnome/applet/applet.glade.h:29
 msgid "Interface:"
 msgstr "接口："
 
-#: ../src/applet.glade.h:30
+#: ../gnome/applet/applet.glade.h:30
 msgid "Key Type:"
 msgstr "密钥类型："
 
-#: ../src/applet.glade.h:31
+#: ../gnome/applet/applet.glade.h:31
 msgid "Key:"
 msgstr "密钥："
 
-#: ../src/applet.glade.h:32
+#: ../gnome/applet/applet.glade.h:32
 msgid ""
 "None\n"
 "WEP 128-bit Passphrase\n"
@@ -581,129 +581,127 @@ msgstr ""
 "WEP 64/128 位十六进制\n"
 "WEP 64/128 位 ASCII\n"
 
-#: ../src/applet.glade.h:37
+#: ../gnome/applet/applet.glade.h:37
 msgid ""
 "Open System\n"
 "Shared Key"
-msgstr ""
-"开放式系统\n"
-"共享密钥"
+msgstr "开放式系统\n共享密钥"
 
-#: ../src/applet.glade.h:39
+#: ../gnome/applet/applet.glade.h:39
 msgid "Other Wireless Network..."
 msgstr "其它无线网络..."
 
-#: ../src/applet.glade.h:40
+#: ../gnome/applet/applet.glade.h:40
 msgid "Passphrase:"
 msgstr "密码句："
 
-#: ../src/applet.glade.h:41
+#: ../gnome/applet/applet.glade.h:41
 msgid "Password:"
 msgstr "密码："
 
-#: ../src/applet.glade.h:42
+#: ../gnome/applet/applet.glade.h:42
 msgid "Primary DNS:"
 msgstr "主 DNS："
 
-#: ../src/applet.glade.h:43
+#: ../gnome/applet/applet.glade.h:43
 msgid "Private Key File:"
 msgstr "私钥文件："
 
-#: ../src/applet.glade.h:44
+#: ../gnome/applet/applet.glade.h:44
 msgid "Private Key Password:"
 msgstr "私用密钥密码："
 
-#: ../src/applet.glade.h:45
+#: ../gnome/applet/applet.glade.h:45
 msgid "Secondary DNS:"
 msgstr "辅 DNS："
 
-#: ../src/applet.glade.h:46
+#: ../gnome/applet/applet.glade.h:46
 msgid "Select the CA Certificate File"
 msgstr "选择 CA 证书文件"
 
-#: ../src/applet.glade.h:47
+#: ../gnome/applet/applet.glade.h:47
 msgid "Select the Client Certificate File"
 msgstr "选择客户端证书文件"
 
-#: ../src/applet.glade.h:48
+#: ../gnome/applet/applet.glade.h:48
 msgid "Select the Private Key File"
 msgstr "选择私钥文件"
 
-#: ../src/applet.glade.h:49
+#: ../gnome/applet/applet.glade.h:49
 msgid "Show key"
 msgstr "显示密钥"
 
-#: ../src/applet.glade.h:50
+#: ../gnome/applet/applet.glade.h:50
 msgid "Show passphrase"
 msgstr "显示密码句"
 
-#: ../src/applet.glade.h:51
+#: ../gnome/applet/applet.glade.h:51
 msgid "Show password"
 msgstr "显示密码"
 
-#: ../src/applet.glade.h:52
+#: ../gnome/applet/applet.glade.h:52
 msgid "Show passwords"
 msgstr "显示密码"
 
-#: ../src/applet.glade.h:53
+#: ../gnome/applet/applet.glade.h:53
 msgid "Speed:"
 msgstr "速度："
 
-#: ../src/applet.glade.h:54
+#: ../gnome/applet/applet.glade.h:54
 msgid "Subnet Mask:"
 msgstr "子网掩码："
 
-#: ../src/applet.glade.h:55
+#: ../gnome/applet/applet.glade.h:55
 msgid "Type:"
 msgstr "类型："
 
-#: ../src/applet.glade.h:56
+#: ../gnome/applet/applet.glade.h:56
 msgid "User Name:"
 msgstr "用户名："
 
-#: ../src/applet.glade.h:57
+#: ../gnome/applet/applet.glade.h:57
 msgid "Wireless Network Key Required"
 msgstr "需要无线网络密钥"
 
-#: ../src/applet.glade.h:58
+#: ../gnome/applet/applet.glade.h:58
 msgid "Wireless _adapter:"
 msgstr "无线适配器(_A)："
 
-#: ../src/applet.glade.h:59
+#: ../gnome/applet/applet.glade.h:59
 msgid "_Always Trust this Wireless Network"
 msgstr "总是信任此无线网络(_A)"
 
-#: ../src/applet.glade.h:60
+#: ../gnome/applet/applet.glade.h:60
 msgid "_Don't remind me again"
 msgstr "以后不再提醒(_D)"
 
-#: ../src/applet.glade.h:61
+#: ../gnome/applet/applet.glade.h:61
 msgid "_Login to Network"
 msgstr "登录到网络(_L)"
 
-#: ../src/applet.glade.h:62
+#: ../gnome/applet/applet.glade.h:62
 msgid "_Network Name:"
 msgstr "网络名称(_N)："
 
-#: ../src/applet.glade.h:63
+#: ../gnome/applet/applet.glade.h:63
 msgid "_Wireless Security:"
 msgstr "无线安全性(_W)："
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:383
+#: ../gnome/vpn-properties/nm-vpn-properties.c:378
 msgid "Cannot add VPN connection"
 msgstr "无法添加 VPN 连接"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:385
+#: ../gnome/vpn-properties/nm-vpn-properties.c:380
 msgid ""
 "No suitable VPN software was found on your system. Contact your system "
 "administrator."
 msgstr "您的系统上未找到合适的 VPN 软件。请联系您的系统管理员。"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:437
+#: ../gnome/vpn-properties/nm-vpn-properties.c:432
 msgid "Cannot import VPN connection"
-msgstr "没有导入 VPN 连接"
+msgstr "无法导入 VPN 连接"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:439
+#: ../gnome/vpn-properties/nm-vpn-properties.c:434
 #, c-format
 msgid ""
 "Cannot find suitable software for VPN connection type '%s' to import the "
@@ -711,24 +709,24 @@ msgid ""
 msgstr ""
 "找不到合适的软件来导入 VPN 连接类型“%s”的文件“%s”。请联系您的系统管理员。"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:579
+#: ../gnome/vpn-properties/nm-vpn-properties.c:574
 #, c-format
 msgid "Error retrieving VPN connection '%s'"
 msgstr "获取 VPN 连接“%s”出错"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:582
+#: ../gnome/vpn-properties/nm-vpn-properties.c:577
 #, 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:739
+#: ../gnome/vpn-properties/nm-vpn-properties.c:734
 #, c-format
 msgid "Delete VPN connection \"%s\"?"
 msgstr "删除 VPN 连接“%s”吗？"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:742
+#: ../gnome/vpn-properties/nm-vpn-properties.c:737
 #, c-format
 msgid ""
 "All information about the VPN connection \"%s\" will be lost and you may "
@@ -738,16 +736,16 @@ msgstr ""
 "关于 VPN 连接“%s”的全部信息都将丢失。要创建新连接的话，您就必须请求您的系统管"
 "理员提供相应信息。"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:959
+#: ../gnome/vpn-properties/nm-vpn-properties.c:947
 msgid "Unable to load"
 msgstr "无法装入"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:961
+#: ../gnome/vpn-properties/nm-vpn-properties.c:949
 msgid "Cannot find some needed resources (the glade file)!"
 msgstr "找不到所需的资源(glade 文件)！"
 
 #. Edit dialog
-#: ../gnome/vpn-properties/nm-vpn-properties.c:1071
+#: ../gnome/vpn-properties/nm-vpn-properties.c:1058
 msgid "Edit VPN Connection"
 msgstr "编辑 VPN 连接"
 
@@ -856,172 +854,61 @@ msgstr "WPA2 自动"
 msgid "none"
 msgstr "无"
 
-#: ../src/nm-netlink-monitor.c:154
+#: ../src/nm-netlink-monitor.c:170
 #, 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:188
 #, c-format
 msgid ""
 "unable to bind to netlink socket for monitoring wired ethernet devices - %s"
 msgstr "无法绑定到监视有线以太网设备的网络连接套接字 - %s"
 
-#: ../src/nm-netlink-monitor.c:405
+#: ../src/nm-netlink-monitor.c:425
 msgid "operation took too long"
 msgstr "操作时间太长"
 
-#: ../src/nm-netlink-monitor.c:502
+#: ../src/nm-netlink-monitor.c:522
 msgid "received data from wrong type of sender"
 msgstr "从错误的发送者类型收到数据"
 
-#: ../src/nm-netlink-monitor.c:515
+#: ../src/nm-netlink-monitor.c:535
 msgid "received data from unexpected sender"
 msgstr "从未知的发送者收到数据"
 
-#: ../src/nm-netlink-monitor.c:646
+#: ../src/nm-netlink-monitor.c:664
 msgid "too much data was sent over socket and some of it was lost"
 msgstr "向套接字发送的数据太多，其中有些已经丢失"
 
-#: ../src/nm-netlink-monitor.c:735
+#: ../src/nm-netlink-monitor.c:774
 msgid "error occurred while waiting for data on socket"
 msgstr "等候套接字上的数据时发生了错误"
 
-#: ../src/applet-dbus-devices.c:898
+#: ../gnome/applet/applet-dbus-devices.c:922
 #, c-format
 msgid "You are now connected to the Ad-Hoc wireless network '%s'."
 msgstr "您现在已连接到 Ad-Hoc 无线网络“%s”。"
 
-#: ../src/applet-dbus-devices.c:903
+#: ../gnome/applet/applet-dbus-devices.c:927
 #, c-format
 msgid "You are now connected to the wireless network '%s'."
 msgstr "您现在已连接到无线网络“%s”。"
 
-#: ../src/applet-dbus-devices.c:910
+#: ../gnome/applet/applet-dbus-devices.c:934
 msgid "You are now connected to the wired network."
 msgstr "您现在已连接到有线网络。"
 
-#: ../src/applet-dbus-devices.c:916
+#: ../gnome/applet/applet-dbus-devices.c:940
 msgid "Connection Established"
 msgstr "连接已建立"
 
-#: ../src/applet-dbus-devices.c:959
+#: ../gnome/applet/applet-dbus-devices.c:983
 msgid "Disconnected"
 msgstr "已断开连接"
 
-#: ../src/applet-dbus-devices.c:960
+#: ../gnome/applet/applet-dbus-devices.c:984
 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 f3be358b..e2ba2a2a 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,467 +7,431 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Network Manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-29 18:33+0200\n"
-"PO-Revision-Date: 2006-06-09 09:56\n"
-"Last-Translator: Novell Language <language@novell.com>\n"
-"Language-Team: Novell Language <language@novell.com>\n"
+"POT-Creation-Date: 2005-07-21 22:15+0800\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"
 "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"
 
-#: ../src/applet-compat.c:171 ../src/applet-dbus-info.c:919
+#: ../gnome/applet/applet-dbus-info.c:986
 #, c-format
-msgid "Passphrase for wireless network %s"
-msgstr "無線網路 %s 的通行碼"
+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 ""
 
-#: ../src/applet-dbus.c:265
+#: ../gnome/applet/applet-dbus.c:597
 #, c-format
-msgid "Connection to the wireless network '%s' failed."
-msgstr "連線到無線網路 '%s' 失敗。"
+msgid "Connection to the wireless network '%s' failed.\n"
+msgstr "連接無線網路‘%s’失敗。\n"
 
-#: ../src/applet-dbus.c:270
-msgid "Connection to the wired network failed."
-msgstr "連線到有線網路失敗。"
+#: ../gnome/applet/applet-dbus.c:602
+msgid "Connection to the wired network failed.\n"
+msgstr "連接有線網路失敗。\n"
 
-#: ../src/applet.c:184
-msgid "Error displaying connection information:"
-msgstr "顯示連線資訊時發生錯誤："
+#: ../gnome/applet/applet.c:192
+msgid "Error displaying connection information: "
+msgstr "顯示連線資訊發生錯誤："
 
-#: ../src/applet.c:202
+#: ../gnome/applet/applet.c:217
 msgid "Could not find some required resources (the glade file)!"
 msgstr "無法找到一些需要的資源（glade 檔）！"
 
-#: ../src/applet.c:213
+#: ../gnome/applet/applet.c:227
 msgid "No active connections!"
 msgstr "沒有使用中的連線"
 
-#: ../src/applet.c:234
+#: ../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
 #, c-format
 msgid "Wired Ethernet (%s)"
 msgstr "有線乙太網路 (%s)"
 
-#: ../src/applet.c:236
+#: ../gnome/applet/applet.c:286
 #, c-format
 msgid "Wireless Ethernet (%s)"
 msgstr "有線乙太網路 (%s)"
 
-#: ../src/applet.c:337 ../src/applet.c:362
+#: ../gnome/applet/applet.c:380 ../gnome/applet/applet.c:398
 msgid "NetworkManager Applet"
 msgstr "NetworkManager 面板程式"
 
-#: ../src/applet.c:339 ../src/applet.c:364
-msgid "Copyright © 2004-2005 Red Hat, Inc."
-msgstr "版權所有 © 2004-2005 Red Hat, Inc."
+#: ../gnome/applet/applet.c:382 ../gnome/applet/applet.c:400
+msgid "Copyright (C) 2004-2005 Red Hat, Inc."
+msgstr "版權所有 (C) 2004-2005 Red Hat, Inc."
 
-#: ../src/applet.c:340 ../src/applet.c:365
+#: ../gnome/applet/applet.c:383 ../gnome/applet/applet.c:401
 msgid ""
 "Notification area applet for managing your network devices and connections."
-msgstr "可用來管理網路設備和連線的通知區域 Applet。"
-
-#: ../src/applet.c:343 ../src/applet.c:370
-msgid "translator-credits"
 msgstr ""
-"GNOME 程式中文化郵件論壇\n"
-"community@linuxhall.org\n"
-"\n"
-"Stanley Wong <stanley18fan0k@yahoo.com.hk>, 2005"
 
-#: ../src/applet.c:426
-msgid "VPN Login Failure"
-msgstr "VPN 登入失敗"
+#: ../gnome/applet/applet.c:486
+msgid "VPN Error"
+msgstr "VPN 錯誤"
 
-#: ../src/applet.c:427
+#: ../gnome/applet/applet.c:490
 #, c-format
-msgid "Could not start the VPN connection '%s' due to a login failure."
-msgstr "因登入失敗而無法啟動 VPN 連線 '%s' "
-
-#: ../src/applet.c:431
-msgid "VPN Start Failure"
-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 ""
 
-#: ../src/applet.c:432
+#: ../gnome/applet/applet.c:495
 #, 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."
-msgstr "因啟動 VPN 程式失敗而無法啟動 VPN 連線 '%s' "
-
-#: ../src/applet.c:436 ../src/applet.c:446
-msgid "VPN Connect Failure"
-msgstr "VPN 連線失敗"
+"program.\n"
+"\n"
+"The VPN service said: \"%s\""
+msgstr ""
 
-#: ../src/applet.c:437
+#: ../gnome/applet/applet.c:500
 #, c-format
-msgid "Could not start the VPN connection '%s' due to a connection error."
-msgstr "因發生連線錯誤而無法啟動 VPN 連線 '%s'。"
-
-#: ../src/applet.c:441
-msgid "VPN Configuration Error"
-msgstr "VPN 組態錯誤"
+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 ""
 
-#: ../src/applet.c:442
+#: ../gnome/applet/applet.c:505
 #, c-format
-msgid "The VPN connection '%s' was not correctly configured."
-msgstr "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 ""
 
-#: ../src/applet.c:447
+#: ../gnome/applet/applet.c:510
 #, 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."
-msgstr "因 VPN 伺服器未傳回足夠的網路組態而無法啟動 VPN 連線 '%s' "
+"return an adequate network configuration.\n"
+"\n"
+"The VPN service said: \"%s\""
+msgstr ""
 
-#: ../src/applet.c:517
-msgid "VPN Login Message"
-msgstr "VPN 登入訊息"
+#: ../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\""
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">VPN 登入訊息</span>\n"
+"\n"
+"VPN 連線‘%s’說：\n"
+"\n"
+"\"%s\""
 
-#: ../src/applet.c:741 ../src/applet.c:2508
-#: ../src/other-network-dialog.c:453
-#: ../src/passphrase-dialog.c:228
+#: ../gnome/applet/applet.c:795 ../gnome/applet/applet.c:2365
+#: ../gnome/applet/other-network-dialog.c:315
+#: ../gnome/applet/passphrase-dialog.c:455
 msgid ""
 "The NetworkManager Applet could not find some required resources (the glade "
 "file was not found)."
 msgstr "NetworkManager 面板程式無法找到一些需要的資源（找不到 glade 檔）"
 
-#: ../src/applet.c:753
+#: ../gnome/applet/applet.c:808
 #, c-format
 msgid "The network device \"%s (%s)\" does not support wireless scanning."
 msgstr "網路裝置“%s (%s)”不支援無線網路掃描。"
 
-#: ../src/applet.c:761
+#: ../gnome/applet/applet.c:815
 #, c-format
 msgid "The network device \"%s (%s)\" does not support link detection."
 msgstr "網路裝置“%s (%s)”不支援連接偵測"
 
-#: ../src/applet.c:908
+#: ../gnome/applet/applet.c:936
 #, c-format
 msgid "Preparing device %s for the wired network..."
 msgstr "裝置 %s 正準備連接有線網路..."
 
-#: ../src/applet.c:910
+#: ../gnome/applet/applet.c:938
 #, c-format
 msgid "Preparing device %s for the wireless network '%s'..."
 msgstr "裝置 %s 正準備連接無線網路‘%s’..."
 
-#: ../src/applet.c:918
-#, c-format
+#: ../gnome/applet/applet.c:945
+#, fuzzy, c-format
 msgid "Configuring device %s for the wired network..."
-msgstr "正在設定設備 %s 的有線網路... "
+msgstr "正在連接到有線網路..."
 
-#: ../src/applet.c:920
+#: ../gnome/applet/applet.c:947
 #, c-format
 msgid "Attempting to join the wireless network '%s'..."
 msgstr "正在嘗試加入無線網路‘%s’..."
 
-#: ../src/applet.c:928
+#: ../gnome/applet/applet.c:954
 #, c-format
 msgid "Waiting for Network Key for the wireless network '%s'..."
 msgstr "正在等待無線網路‘%s’的網路金鑰..."
 
-#: ../src/applet.c:936 ../src/applet.c:946
+#: ../gnome/applet/applet.c:961 ../gnome/applet/applet.c:970
 msgid "Requesting a network address from the wired network..."
 msgstr "正要求有線網路提供網路位址..."
 
-#: ../src/applet.c:938 ../src/applet.c:948
+#: ../gnome/applet/applet.c:963 ../gnome/applet/applet.c:972
 #, c-format
 msgid "Requesting a network address from the wireless network '%s'..."
 msgstr "正要求無線網路‘%s’提供網路位址..."
 
-#: ../src/applet.c:956
+#: ../gnome/applet/applet.c:979
 msgid "Finishing connection to the wired network..."
 msgstr "連接有線網路完成..."
 
-#: ../src/applet.c:958
+#: ../gnome/applet/applet.c:981
 #, c-format
 msgid "Finishing connection to the wireless network '%s'..."
 msgstr "連接無線網路‘%s’完成..."
 
-#: ../src/applet.c:1075
+#: ../gnome/applet/applet.c:1027
 msgid "NetworkManager is not running"
 msgstr "NetworkManager 沒有執行"
 
-#: ../src/applet.c:1083 ../src/applet.c:1828
-msgid "Networking disabled"
-msgstr "網路已停用"
-
-#: ../src/applet.c:1088
+#: ../gnome/applet/applet.c:1038
 msgid "No network connection"
 msgstr "沒有網路連接"
 
-#: ../src/applet.c:1093
+#: ../gnome/applet/applet.c:1045
 msgid "Wired network connection"
 msgstr "有線網路連接"
 
-#: ../src/applet.c:1097
+#: ../gnome/applet/applet.c:1052
 msgid "Connected to an Ad-Hoc wireless network"
 msgstr "連接到 Ad-Hoc 點對點式無線網路"
 
-#: ../src/applet.c:1099
+#: ../gnome/applet/applet.c:1066
 #, c-format
 msgid "Wireless network connection to '%s' (%d%%)"
 msgstr "無線網路連接到‘%s’ (%d%%)"
 
-#: ../src/applet.c:1120
+#: ../gnome/applet/applet.c:1091
 #, c-format
 msgid "VPN connection to '%s'"
 msgstr "VPN 連線連接到‘%s’"
 
-#: ../src/applet.c:1128
-#, c-format
-msgid "VPN connecting to '%s'"
-msgstr "連線到 '%s' 的 VPN"
-
-#: ../src/applet.c:1541
+#: ../gnome/applet/applet.c:1517
 msgid "_Connect to Other Wireless Network..."
 msgstr "連接到其它的無線網路(_C)..."
 
-#: ../src/applet.c:1562
+#: ../gnome/applet/applet.c:1538
 msgid "Create _New Wireless Network..."
 msgstr "建立新的無線網路(_N)..."
 
-#: ../src/applet.c:1685
-msgid "_VPN Connections"
-msgstr "VPN 連線(_V)"
-
-#: ../src/applet.c:1730
-msgid "_Configure VPN..."
-msgstr "設定 VPN..."
-
-#: ../src/applet.c:1734
-msgid "_Disconnect VPN..."
-msgstr "中斷連線 VPN(_D)..."
-
-#: ../src/applet.c:1756
-msgid "_Dial Up Connections"
-msgstr "撥接連線(_D)"
+#: ../gnome/applet/applet.c:1651
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:17
+msgid "VPN Connections"
+msgstr "VPN 連線"
 
-#. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
-#: ../src/applet.c:1767
-#, c-format
-msgid "Connect to %s..."
-msgstr "連線到 %s..."
+#: ../gnome/applet/applet.c:1678
+msgid "Configure VPN..."
+msgstr "設置 VPN..."
 
-#: ../src/applet.c:1773
-#, c-format
-msgid "Disconnect from %s..."
-msgstr "從 %s 中斷連線..."
+#: ../gnome/applet/applet.c:1682
+msgid "Disconnect VPN..."
+msgstr "與 VPN 斷線..."
 
-#: ../src/applet.c:1822
+#: ../gnome/applet/applet.c:1732
 msgid "No network devices have been found"
 msgstr "找不到任何網路裝置"
 
-#: ../src/applet.c:2014
+#: ../gnome/applet/applet.c:1890
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager 沒有執行...."
 
-#. 'Enable Networking' item
-#: ../src/applet.c:2170
-msgid "Enable _Networking"
-msgstr "啟用網路(_N) "
+#: ../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)"
 
-#. 'Enable Wireless' item
-#: ../src/applet.c:2176
-msgid "Enable _Wireless"
-msgstr "啟用無線(_W)"
+#: ../gnome/applet/applet.c:1997
+msgid "Always Search"
+msgstr "總是搜尋"
 
-#. 'Connection Information' item
-#: ../src/applet.c:2182
+#: ../gnome/applet/applet.c:2005
+msgid "Search Only When Disconnected"
+msgstr "在斷線時才搜尋"
+
+#: ../gnome/applet/applet.c:2013
+msgid "Never Search"
+msgstr "永不搜尋"
+
+#. Stop All Wireless Devices item
+#: ../gnome/applet/applet.c:2025
+msgid "Stop All Wireless Devices"
+msgstr "停止所有無線網路裝置"
+
+#: ../gnome/applet/applet.c:2031
 msgid "Connection _Information"
 msgstr "連線資訊(_I)"
 
-#. Help item
-#: ../src/applet.c:2193
+#: ../gnome/applet/applet.c:2039
 msgid "_Help"
 msgstr "求助(_H)"
 
-#. About item
-#: ../src/applet.c:2202
+#: ../gnome/applet/applet.c:2046
 msgid "_About"
 msgstr "關於(_A)"
 
-#: ../src/applet.c:2667
+#: ../gnome/applet/applet.c:2515
 msgid ""
 "The NetworkManager applet could not find some required resources.  It cannot "
 "continue.\n"
 msgstr "NetworkManager 面板程式無法找到一些需要的資源。它無法繼續。\n"
 
-#: ../src/wireless-security-option.c:157
-msgid "Open System"
-msgstr "開放系統"
-
-#: ../src/wireless-security-option.c:160
-msgid "Shared Key"
-msgstr "共用金鑰"
-
-#: ../src/wireless-security-option.c:208
-msgid "Automatic (Default)"
-msgstr "自動 (預設)"
-
-#: ../src/wireless-security-option.c:215
-msgid "AES-CCMP"
-msgstr "AES-CCMP"
-
-#: ../src/wireless-security-option.c:223
-msgid "TKIP"
-msgstr "TKIP"
-
-#: ../src/wireless-security-option.c:231
-msgid "Dynamic WEP"
-msgstr "動態 WEP"
-
-#: ../src/wso-none.c:53
-msgid "None"
-msgstr "無"
-
-#: ../src/wso-wep-ascii.c:138
-msgid "WEP 64/128-bit ASCII"
-msgstr "WEP 40/128 位元 ASCII"
-
-#: ../src/wso-wep-hex.c:135
-msgid "WEP 64/128-bit Hex"
-msgstr "WEP 40/104 位元 Hex"
-
-#: ../src/wso-wep-passphrase.c:135
-msgid "WEP 128-bit Passphrase"
-msgstr "WEP 128 位元通行碼"
-
-#: ../src/wso-wpa-eap.c:237
-msgid "PEAP"
-msgstr "PEAP"
-
-#: ../src/wso-wpa-eap.c:238
-msgid "TLS"
-msgstr "TLS"
-
-#: ../src/wso-wpa-eap.c:239
-msgid "TTLS"
-msgstr "TTLS"
-
-#: ../src/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"
-
-#: ../src/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"
-
-#: ../src/wso-wpa-psk.c:178
-msgid "WPA2 Personal"
-msgstr "WPA2 Personal"
-
-#: ../src/wso-wpa-psk.c:180
-msgid "WPA Personal"
-msgstr "WPA Personal"
-
-#: ../src/eggtrayicon.c:134
+#: ../gnome/applet/eggtrayicon.c:118
 msgid "Orientation"
 msgstr "方向"
 
-#: ../src/eggtrayicon.c:135
+#: ../gnome/applet/eggtrayicon.c:119
 msgid "The orientation of the tray."
 msgstr "面板的方向"
 
-#: ../src/menu-items.c:88
+#: ../gnome/applet/menu-items.c:89
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "有線網路 (%s)"
 
-#: ../src/menu-items.c:91
+#: ../gnome/applet/menu-items.c:92
 msgid "_Wired Network"
 msgstr "有線網路(_W)"
 
-#: ../src/menu-items.c:162
+#: ../gnome/applet/menu-items.c:165
 #, c-format
 msgid "Wireless Network (%s)"
 msgid_plural "Wireless Networks (%s)"
 msgstr[0] "無線網路 (%s)"
 
-#: ../src/menu-items.c:164
+#: ../gnome/applet/menu-items.c:167
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "無線網路"
 
-#: ../src/menu-items.c:343
+#: ../gnome/applet/menu-items.c:309
 msgid " (invalid Unicode)"
 msgstr "（無效的統一碼）"
 
-#: ../src/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: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 格式金鑰："
 
-#: ../src/other-network-dialog.c:358
+#: ../gnome/applet/other-network-dialog.c:154
+#: ../gnome/applet/passphrase-dialog.c:169
+msgid "Hex Key:"
+msgstr "Hex 格式金鑰："
+
+#: ../gnome/applet/other-network-dialog.c:229
 msgid "Create new wireless network"
 msgstr "建立新的無線網路"
 
-#: ../src/other-network-dialog.c:359
+#: ../gnome/applet/other-network-dialog.c:230
 msgid ""
-"Enter the name and security settings of the wireless network you wish to "
+"Enter the ESSID and security settings of the wireless network you wish to "
 "create."
-msgstr "輸入您所要建立無線網路的名稱和安全性設定。"
-
-#: ../src/other-network-dialog.c:363
-msgid "Create New Wireless Network"
-msgstr "建立新的無線網路"
-
-#: ../src/other-network-dialog.c:368
-msgid "Existing wireless network"
-msgstr "現有的無線網路"
+msgstr "輸入您要建立的無線網路的 ESSID 及安全設定。"
 
-#: ../src/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:235
+msgid "Custom wireless network"
+msgstr "自訂無線網路"
 
-#: ../src/other-network-dialog.c:371
-msgid "Connect to Other Wireless Network"
-msgstr "連接到其他無線網路"
+#: ../gnome/applet/other-network-dialog.c:236
+msgid "Enter the ESSID of the wireless network to which you wish to connect."
+msgstr "輸入您要連接的無線網路的 ESSID。"
 
-#: ../src/passphrase-dialog.c:215
-msgid "Error connecting to wireless network"
-msgstr "連接到無線網路時發生錯誤"
-
-#: ../src/passphrase-dialog.c:216
-msgid ""
-"The requested wireless network requires security capabilities unsupported by "
-"your hardware."
-msgstr "要求的無線網路必須使用您硬體不支援的安全性功能。"
+#: ../gnome/applet/passphrase-dialog.c:248
+#, c-format
+msgid "Passphrase for wireless network %s"
+msgstr "無線網路 %s 的通行碼"
 
-#: ../src/vpn-password-dialog.c:151
-#: ../src/vpn-password-dialog.c:188
+#: ../gnome/applet/vpn-password-dialog.c:152
+#: ../gnome/applet/vpn-password-dialog.c:191
 #, c-format
 msgid "Cannot start VPN connection '%s'"
 msgstr "無法執行 VPN 連線‘%s’"
 
-#: ../src/vpn-password-dialog.c:154
+#: ../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 "無法找到 VPN 連線類型 '%s' 的驗證對話方塊。請聯絡您的系統管理員。"
+msgstr ""
 
-#: ../src/vpn-password-dialog.c:191
+#: ../gnome/applet/vpn-password-dialog.c:194
 #, c-format
 msgid ""
 "There was a problem launching the authentication dialog for VPN connection "
 "type '%s'. Contact your system administrator."
 msgstr ""
-"啟動 VPN 連線類型 '%s' 的驗證對話方塊時發生問題。請聯絡您的系統管理員。"
 
-#: ../src/applet.glade.h:1
+#: ../gnome/applet/applet.glade.h:1
 msgid " "
 msgstr " "
 
-#: ../src/applet.glade.h:2
+#: ../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>"
 
-#: ../src/applet.glade.h:4
+#: ../gnome/applet/applet.glade.h:10
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
@@ -480,18 +444,15 @@ msgstr ""
 "\n"
 "需要一個通行碼或是密鑰來存取無線網路‘%s’"
 
-#: ../src/applet.glade.h:8
+#: ../gnome/applet/applet.glade.h:14
 #, 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  這項功能不會完整執行。"
 
-#: ../src/applet.glade.h:12
+#: ../gnome/applet/applet.glade.h:18
 #, no-c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
@@ -501,254 +462,134 @@ 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\">無線網路登入確認</span>\n"
-"\n"
-"您已經選擇登入無線網路 '%s'。如果您確定這是安全的無線網路，請在下面按一下核取"
-"方塊，NetworkManager 在接下來的登入時就不會要求您進行確認。"
-
-#: ../src/applet.glade.h:15
-msgid "Anonymous Identity:"
-msgstr "匿名身份："
 
-#: ../src/applet.glade.h:16
-msgid "Authentication:"
-msgstr "驗證："
+#: ../gnome/applet/applet.glade.h:21
+msgid "Always Trust this Wireless Network"
+msgstr "總是信任這無線網路"
 
-#: ../src/applet.glade.h:17
+#: ../gnome/applet/applet.glade.h:22
 msgid "Broadcast Address:"
 msgstr "廣播位址："
 
-#: ../src/applet.glade.h:18
-msgid "CA Certificate File:"
-msgstr "CA 憑證檔案："
-
-#: ../src/applet.glade.h:19
+#: ../gnome/applet/applet.glade.h:23
 msgid "C_onnect"
 msgstr "連線(_O)"
 
-#: ../src/applet.glade.h:20
-msgid "Client Certificate File:"
-msgstr "用戶端憑證檔案："
+#: ../gnome/applet/applet.glade.h:24
+msgid "Connect with encryption enabled"
+msgstr "啟用加密連接"
 
-#: ../src/applet.glade.h:21
+#: ../gnome/applet/applet.glade.h:25
 msgid "Connection Information"
 msgstr "連線資訊"
 
-#: ../src/applet.glade.h:22
-msgid "Default Route:"
-msgstr "預設路由："
-
-#: ../src/applet.glade.h:23
+#: ../gnome/applet/applet.glade.h:26
 msgid "Destination Address:"
 msgstr "目的地位址："
 
-#: ../src/applet.glade.h:24
-msgid "Driver:"
-msgstr "驅動程式："
-
-#: ../src/applet.glade.h:25
-msgid "EAP Method:"
-msgstr "EAP 方法："
+#: ../gnome/applet/applet.glade.h:27
+msgid "Don't remind me again"
+msgstr "不要再提醒我"
 
-#: ../src/applet.glade.h:26
+#: ../gnome/applet/applet.glade.h:28
 msgid "Hardware Address:"
 msgstr "硬體位址："
 
-#: ../src/applet.glade.h:27
+#: ../gnome/applet/applet.glade.h:29
 msgid "IP Address:"
 msgstr "IP 位址："
 
-#: ../src/applet.glade.h:28
-msgid "Identity:"
-msgstr "身份："
-
-#: ../src/applet.glade.h:29
+#: ../gnome/applet/applet.glade.h:30
 msgid "Interface:"
 msgstr "介面："
 
-#: ../src/applet.glade.h:30
+#: ../gnome/applet/applet.glade.h:31
 msgid "Key Type:"
 msgstr "金鑰類型："
 
-#: ../src/applet.glade.h:31
-msgid "Key:"
-msgstr "金鑰："
-
-#: ../src/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 位元 Hex\n"
-"WEP 64/128 位元 ASCII\n"
-
-#: ../src/applet.glade.h:37
-msgid ""
-"Open System\n"
-"Shared Key"
-msgstr ""
-"開放系統\n"
-"共享金鑰"
+#: ../gnome/applet/applet.glade.h:32
+msgid "Key type:"
+msgstr "金鑰類型："
 
-#: ../src/applet.glade.h:39
+#: ../gnome/applet/applet.glade.h:33
 msgid "Other Wireless Network..."
 msgstr "其它無線網路..."
 
-#: ../src/applet.glade.h:40
-msgid "Passphrase:"
-msgstr "通行碼："
-
-#: ../src/applet.glade.h:41
-msgid "Password:"
-msgstr "密碼(P)："
-
-#: ../src/applet.glade.h:42
-msgid "Primary DNS:"
-msgstr "主要 DNS："
-
-#: ../src/applet.glade.h:43
-msgid "Private Key File:"
-msgstr "私密金鑰檔案："
-
-#: ../src/applet.glade.h:44
-msgid "Private Key Password:"
-msgstr "私密金鑰密碼："
-
-#: ../src/applet.glade.h:45
-msgid "Secondary DNS:"
-msgstr "次要 DNS："
-
-#: ../src/applet.glade.h:46
-msgid "Select the CA Certificate File"
-msgstr "選取 CA 憑證檔案"
-
-#: ../src/applet.glade.h:47
-msgid "Select the Client Certificate File"
-msgstr "選取用戶端憑證檔案"
-
-#: ../src/applet.glade.h:48
-msgid "Select the Private Key File"
-msgstr "選取私密金鑰檔案"
-
-#: ../src/applet.glade.h:49
-msgid "Show key"
-msgstr "顯示金鑰"
-
-#: ../src/applet.glade.h:50
-msgid "Show passphrase"
-msgstr "顯示通行碼"
-
-#: ../src/applet.glade.h:51
-msgid "Show password"
-msgstr "顯示密碼"
-
-#: ../src/applet.glade.h:52
-msgid "Show passwords"
-msgstr "顯示密碼"
-
-#: ../src/applet.glade.h:53
-msgid "Speed:"
-msgstr "速度："
-
-#: ../src/applet.glade.h:54
+#: ../gnome/applet/applet.glade.h:35
 msgid "Subnet Mask:"
 msgstr "子網路遮罩："
 
-#: ../src/applet.glade.h:55
-msgid "Type:"
-msgstr "類型："
-
-#: ../src/applet.glade.h:56
-msgid "User Name:"
-msgstr "使用者名稱："
-
-#: ../src/applet.glade.h:57
+#: ../gnome/applet/applet.glade.h:36
 msgid "Wireless Network Key Required"
 msgstr "需要無線網路金鑰"
 
-#: ../src/applet.glade.h:58
+#: ../gnome/applet/applet.glade.h:37
 msgid "Wireless _adapter:"
 msgstr "無線網絡卡(_A)："
 
-#: ../src/applet.glade.h:59
-msgid "_Always Trust this Wireless Network"
-msgstr "永遠信賴這個無線網路(_A)"
-
-#: ../src/applet.glade.h:60
-msgid "_Don't remind me again"
-msgstr "不要再提醒我(_D)"
+#: ../gnome/applet/applet.glade.h:38
+msgid "Wireless _network:"
+msgstr "無線網路(_N)："
 
-#: ../src/applet.glade.h:61
+#: ../gnome/applet/applet.glade.h:39
 msgid "_Login to Network"
 msgstr "登入網路(_L)"
 
-#: ../src/applet.glade.h:62
-msgid "_Network Name:"
-msgstr "網路名稱(_N)："
-
-#: ../src/applet.glade.h:63
-msgid "_Wireless Security:"
-msgstr "無線安全性(_W)："
+#: ../gnome/applet/applet.glade.h:40
+msgid "_OK"
+msgstr "確定(_O)"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:383
+#: ../gnome/vpn-properties/nm-vpn-properties.c:374
 msgid "Cannot add VPN connection"
 msgstr "無法加入 VPN 連線"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:385
+#: ../gnome/vpn-properties/nm-vpn-properties.c:376
 msgid ""
 "No suitable VPN software was found on your system. Contact your system "
 "administrator."
-msgstr "您的系統中沒有適用的 VPN 軟體。請聯絡您的系統管理員。"
+msgstr ""
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:437
+#: ../gnome/vpn-properties/nm-vpn-properties.c:428
 msgid "Cannot import VPN connection"
 msgstr "無法匯入 VPN 網路連線"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:439
+#: ../gnome/vpn-properties/nm-vpn-properties.c:430
 #, c-format
 msgid ""
 "Cannot find suitable software for VPN connection type '%s' to import the "
 "file '%s'. Contact your system administrator."
 msgstr ""
-"無法找到適合 VPN 連線類型 '%s' 用來匯入檔案  '%s' 的軟體。請聯絡您的系統管理"
-"員。"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:579
+#: ../gnome/vpn-properties/nm-vpn-properties.c:570
 #, c-format
 msgid "Error retrieving VPN connection '%s'"
-msgstr "取回 VPN 連線 '%s' 時發生錯誤"
+msgstr ""
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:582
+#: ../gnome/vpn-properties/nm-vpn-properties.c:573
 #, c-format
 msgid ""
 "Could not find the UI files for VPN connection type '%s'. Contact your "
 "system administrator."
-msgstr "無法找到 VPN 連線類型 '%s' 的 UI 檔案。請聯絡您的系統管理員。"
+msgstr ""
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:739
+#: ../gnome/vpn-properties/nm-vpn-properties.c:733
 #, c-format
 msgid "Delete VPN connection \"%s\"?"
 msgstr "刪除 VPN 連線“%s”？"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:742
+#: ../gnome/vpn-properties/nm-vpn-properties.c:736
 #, 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\" 的所有資訊都將遺失，因此您可能需要請系統管理員提供資訊來"
-"建立新連線。"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:959
+#: ../gnome/vpn-properties/nm-vpn-properties.c:951
 msgid "Unable to load"
 msgstr "無法載入"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:961
+#: ../gnome/vpn-properties/nm-vpn-properties.c:953
 msgid "Cannot find some needed resources (the glade file)!"
 msgstr "無法找到一些需要的資源（ glade 檔）！"
 
@@ -762,28 +603,30 @@ 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
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
 msgid "Create VPN Connection"
 msgstr "建立 VPN 連線"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
 msgid "Create VPN Connection - 1 of 2"
 msgstr "建立 VPN 連線 - 第一步"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
 msgid "Create VPN Connection - 2 of 2"
 msgstr "建立 VPN 連線 - 第二步"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
+#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
 msgid "Delete the selected VPN connection"
-msgstr "刪除選定的 VPN 連線"
+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."
+msgstr ""
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
 msgid "E_xport"
@@ -794,203 +637,66 @@ 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 設定至檔案"
+msgid "Export VPN connection 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 連線到檔案"
+msgid "Export the VPN settings to a file"
+msgstr "匯出 VPN 設定至檔案"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:12
-msgid "Finish Creating VPN Connection"
-msgstr "完成建立 VPN 連線"
+msgid "Finish create VPN Connection"
+msgstr "建立 VPN 連線完成"
 
 #: ../gnome/vpn-properties/nm-vpn-properties.glade.h:13
-msgid "Manage Virtual Private Network Connections"
-msgstr "管理虛擬私密網路連線"
+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"
+"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.  Please "
-"see your system administrator to obtain this information."
+"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 位址和秘密。請聯絡您的系統管理員取得這份資訊。"
-
-#: ../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 位元 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 Automatic"
-
-#: ../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 Automatic"
-
-#: ../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 ""
 
 #: ../src/nm-netlink-monitor.c:172
 #, c-format
 msgid ""
 "unable to bind to netlink socket for monitoring wired ethernet devices - %s"
-msgstr "無法結合網路連線插槽來監控有線乙太網路設備 - %s"
+msgstr ""
 
-#: ../src/nm-netlink-monitor.c:405
+#: ../src/nm-netlink-monitor.c:404
 msgid "operation took too long"
-msgstr "操作所需時間太長"
+msgstr ""
 
-#: ../src/nm-netlink-monitor.c:502
+#: ../src/nm-netlink-monitor.c:501
 msgid "received data from wrong type of sender"
-msgstr "收到錯誤傳送者類型傳來的資料"
+msgstr ""
 
-#: ../src/nm-netlink-monitor.c:515
+#: ../src/nm-netlink-monitor.c:514
 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 "等候插槽上的資料時發生錯誤"
-
-#: ../src/applet-dbus-devices.c:898
-#, c-format
-msgid "You are now connected to the Ad-Hoc wireless network '%s'."
-msgstr "您現在已連接到 Ad-Hoc 點對點式無線網路 '%s'。"
+msgstr ""
 
-#: ../src/applet-dbus-devices.c:903
+#: ../src/nm-netlink-monitor.c:536
 #, c-format
-msgid "You are now connected to the wireless network '%s'."
-msgstr "您現在已連接到無線網路 '%s'。"
-
-#: ../src/applet-dbus-devices.c:910
-msgid "You are now connected to the wired network."
-msgstr "您現在已連接到有線網路。"
-
-#: ../src/applet-dbus-devices.c:916
-msgid "Connection Established"
-msgstr "連線已建立"
-
-#: ../src/applet-dbus-devices.c:959
-msgid "Disconnected"
-msgstr "斷線"
+msgid "%s"
+msgstr "%s"
 
-#: ../src/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)"
-
-#~ 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 "停止所有無線網路裝置"
-
-#~ 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)"
+#: ../src/nm-netlink-monitor.c:645
+msgid "too much data was sent over socket and some of it was lost"
+msgstr ""
 
-#~ msgid "%s"
-#~ msgstr "%s"
+#: ../src/nm-netlink-monitor.c:734
+msgid "error occurred while waiting for data on socket"
+msgstr ""
 
 #~ msgid "Modify Wireless Networks"
 #~ msgstr "修改無線網路"
@@ -1000,23 +706,3 @@ 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/applet-dbus-devices.c b/src/applet-dbus-devices.c
index bf3c17cc..b9087df9 100644
--- a/src/applet-dbus-devices.c
+++ b/src/applet-dbus-devices.c
@@ -56,6 +56,8 @@ static void nma_dbus_nm_state_cb (DBusPendingCall *pcall, void *user_data)
 	g_return_if_fail (pcall != NULL);
 	g_return_if_fail (applet != NULL);
 
+	nm_dbus_send_with_callback_replied (pcall, __func__);
+
 	if (!(reply = dbus_pending_call_steal_reply (pcall)))
 		goto out;
 
@@ -90,15 +92,13 @@ out:
 void nma_dbus_update_nm_state (NMApplet *applet)
 {
 	DBusMessage *		message;
-	DBusPendingCall *	pcall = NULL;
 
 	g_return_if_fail (applet != NULL);
 
 	if ((message = dbus_message_new_method_call (NM_DBUS_SERVICE, NM_DBUS_PATH, NM_DBUS_INTERFACE, "state")))
 	{
-		dbus_connection_send_with_reply (applet->connection, message, &pcall, -1);
-		if (pcall)
-			dbus_pending_call_set_notify (pcall, nma_dbus_nm_state_cb, applet, NULL);
+		nm_dbus_send_with_callback (applet->connection, message,
+				nma_dbus_nm_state_cb, applet, NULL, __func__);
 		dbus_message_unref (message);
 	}
 }
@@ -127,6 +127,8 @@ static void nma_dbus_device_get_driver_cb (DBusPendingCall *pcall, void *user_da
 	g_return_if_fail (pcall != NULL);
 	g_return_if_fail (applet != NULL);
 
+	nm_dbus_send_with_callback_replied (pcall, __func__);
+
 	if (!(reply = dbus_pending_call_steal_reply (pcall)))
 		goto out;
 
@@ -170,7 +172,6 @@ out:
 static void nma_dbus_device_get_driver (NetworkDevice *dev, NMApplet *applet)
 {
 	DBusMessage *		message;
-	DBusPendingCall *	pcall = NULL;
 	const char *		op;
 
 	g_return_if_fail (applet != NULL);
@@ -179,15 +180,17 @@ static void nma_dbus_device_get_driver (NetworkDevice *dev, NMApplet *applet)
 	op = network_device_get_nm_path (dev);
 	if ((message = dbus_message_new_method_call (NM_DBUS_SERVICE, op, NM_DBUS_INTERFACE_DEVICES, "getDriver")))
 	{
-		dbus_connection_send_with_reply (applet->connection, message, &pcall, -1);
-		if (pcall)
-		{
-			DriverCBData *	data = g_malloc0 (sizeof (DriverCBData));
+		DriverCBData *	data = g_malloc0 (sizeof (DriverCBData));
+
+		network_device_ref (dev);
+		data->dev = dev;
+		data->applet = applet;
 
-			network_device_ref (dev);
-			data->dev = dev;
-			data->applet = applet;
-			dbus_pending_call_set_notify (pcall, nma_dbus_device_get_driver_cb, data, NULL);
+		if (!nm_dbus_send_with_callback (applet->connection, message,
+				nma_dbus_device_get_driver_cb, data, NULL, __func__))
+		{
+			network_device_unref (dev);
+			g_free (data);
 		}
 		dbus_message_unref (message);
 	}
@@ -209,6 +212,8 @@ static void nma_dbus_update_wireless_enabled_cb (DBusPendingCall *pcall, void *u
 	g_return_if_fail (pcall != NULL);
 	g_return_if_fail (applet != NULL);
 
+	nm_dbus_send_with_callback_replied (pcall, __func__);
+
 	if (!(reply = dbus_pending_call_steal_reply (pcall)))
 		goto out;
 
@@ -246,15 +251,13 @@ out:
 static void nma_dbus_update_wireless_enabled (NMApplet *applet)
 {
 	DBusMessage *		message;
-	DBusPendingCall *	pcall = NULL;
 
 	g_return_if_fail (applet != NULL);
 
 	if ((message = dbus_message_new_method_call (NM_DBUS_SERVICE, NM_DBUS_PATH, NM_DBUS_INTERFACE, "getWirelessEnabled")))
 	{
-		dbus_connection_send_with_reply (applet->connection, message, &pcall, -1);
-		if (pcall)
-			dbus_pending_call_set_notify (pcall, nma_dbus_update_wireless_enabled_cb, applet, NULL);
+		nm_dbus_send_with_callback (applet->connection, message,
+				nma_dbus_update_wireless_enabled_cb, applet, NULL, __func__);
 		dbus_message_unref (message);
 	}
 }
@@ -270,14 +273,14 @@ typedef struct HalInfoCBData
 
 static void free_hal_info_cb_data (HalInfoCBData *cb_data)
 {
-	if (cb_data)
-	{
-		network_device_unref (cb_data->dev);
-		g_free (cb_data->parent_op);
-		g_free (cb_data->vendor);
-		memset (cb_data, 0, sizeof (HalInfoCBData));
-		g_free (cb_data);
-	}
+	if (!cb_data)
+		return;
+
+	network_device_unref (cb_data->dev);
+	g_free (cb_data->parent_op);
+	g_free (cb_data->vendor);
+	memset (cb_data, 0, sizeof (HalInfoCBData));
+	g_free (cb_data);
 }
 
 
@@ -291,8 +294,7 @@ static void hal_info_product_cb (DBusPendingCall *pcall, void *user_data)
 {
 	DBusMessage *		reply;
 	HalInfoCBData *	cb_data = (HalInfoCBData *) user_data;
-	char *			info_product = "Unknown";
-	char *			desc;
+	char *			info_product;
 
 	g_return_if_fail (pcall != NULL);
 	g_return_if_fail (cb_data != NULL);
@@ -301,16 +303,31 @@ static void hal_info_product_cb (DBusPendingCall *pcall, void *user_data)
 	g_return_if_fail (cb_data->parent_op != NULL);
 	g_return_if_fail (cb_data->vendor != NULL);
 
+	nm_dbus_send_with_callback_replied (pcall, __func__);
+
 	if (!(reply = dbus_pending_call_steal_reply (pcall)))
 		goto out;
 
-	if (!message_is_error (reply))
-		dbus_message_get_args (reply, NULL, DBUS_TYPE_STRING, &info_product, DBUS_TYPE_INVALID);
+	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;
+	}
 
-	desc = g_strdup_printf ("%s %s", cb_data->vendor, info_product);
-	network_device_set_desc (cb_data->dev, desc);
-	g_free (desc);
+	if (dbus_message_get_args (reply, NULL, DBUS_TYPE_STRING, &info_product, DBUS_TYPE_INVALID))
+	{
+		char *desc;
 
+ 		desc = g_strdup_printf ("%s %s", cb_data->vendor, info_product);
+ 		network_device_set_desc (cb_data->dev, desc);
+		g_free (desc);
+	}
 	dbus_message_unref (reply);
 
 out:
@@ -328,10 +345,7 @@ static void hal_info_vendor_cb (DBusPendingCall *pcall, void *user_data)
 {
 	DBusMessage *		reply;
 	HalInfoCBData *	cb_data = (HalInfoCBData *) user_data;
-	char *			info_vendor = "Unknown";
-	DBusMessage *		message;
-	DBusPendingCall *	product_pcall = NULL;
-
+	char *			info_vendor;
 
 	g_return_if_fail (pcall != NULL);
 	g_return_if_fail (cb_data != NULL);
@@ -339,33 +353,47 @@ static void hal_info_vendor_cb (DBusPendingCall *pcall, void *user_data)
 	g_return_if_fail (cb_data->dev != NULL);
 	g_return_if_fail (cb_data->parent_op != NULL);
 
+	nm_dbus_send_with_callback_replied (pcall, __func__);
+
 	if (!(reply = dbus_pending_call_steal_reply (pcall)))
 		goto out;
 
-	if (!message_is_error (reply))
-		dbus_message_get_args (reply, NULL, DBUS_TYPE_STRING, &info_vendor, DBUS_TYPE_INVALID);
+	if (message_is_error (reply))
+	{
+		DBusError err;
 
-	if ((message = dbus_message_new_method_call ("org.freedesktop.Hal", cb_data->parent_op,
-										"org.freedesktop.Hal.Device", "GetPropertyString")))
+		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 (dbus_message_get_args (reply, NULL, DBUS_TYPE_STRING, &info_vendor, DBUS_TYPE_INVALID))
 	{
-		const char *	prop = "info.product";
+		DBusMessage *		message;
 
-		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)
+		if ((message = dbus_message_new_method_call ("org.freedesktop.Hal", cb_data->parent_op,
+											"org.freedesktop.Hal.Device", "GetPropertyString")))
 		{
-			HalInfoCBData *	product_cb_data = g_malloc0 (sizeof (HalInfoCBData));
+			const char *	prop = "info.product";
+			HalInfoCBData *product_cb_data = g_malloc0 (sizeof (HalInfoCBData));
+
+			dbus_message_append_args (message, DBUS_TYPE_STRING, &prop, DBUS_TYPE_INVALID);
 
 			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);
+
+			nm_dbus_send_with_callback (cb_data->applet->connection, message,
+					hal_info_product_cb, product_cb_data,
+					(DBusFreeFunction) free_hal_info_cb_data, __func__);
+			dbus_message_unref (message);
 		}
-		dbus_message_unref (message);
 	}
-
 	dbus_message_unref (reply);
 
 out:
@@ -390,6 +418,8 @@ static void hal_net_physdev_cb (DBusPendingCall *pcall, void *user_data)
 	g_return_if_fail (cb_data->applet != NULL);
 	g_return_if_fail (cb_data->dev != NULL);
 
+	nm_dbus_send_with_callback_replied (pcall, __func__);
+
 	if (!(reply = dbus_pending_call_steal_reply (pcall)))
 		goto out;
 
@@ -409,25 +439,23 @@ static void hal_net_physdev_cb (DBusPendingCall *pcall, void *user_data)
 	if (dbus_message_get_args (reply, NULL, DBUS_TYPE_STRING, &op, DBUS_TYPE_INVALID))
 	{
 		DBusMessage *		message;
-		DBusPendingCall *	vendor_pcall = NULL;
 
 		if ((message = dbus_message_new_method_call ("org.freedesktop.Hal", op,
 											"org.freedesktop.Hal.Device", "GetPropertyString")))
 		{
 			const char *	prop = "info.vendor";
+			HalInfoCBData *vendor_cb_data = g_malloc0 (sizeof (HalInfoCBData));
 
 			dbus_message_append_args (message, DBUS_TYPE_STRING, &prop, DBUS_TYPE_INVALID);
-			dbus_connection_send_with_reply (cb_data->applet->connection, message, &vendor_pcall, -1);
-			if (vendor_pcall)
-			{
-				HalInfoCBData *	vendor_cb_data = g_malloc0 (sizeof (HalInfoCBData));
 
-				vendor_cb_data->applet = cb_data->applet;
-				network_device_ref (cb_data->dev);
-				vendor_cb_data->dev = cb_data->dev;
-				vendor_cb_data->parent_op = g_strdup (op);
-				dbus_pending_call_set_notify (vendor_pcall, hal_info_vendor_cb, vendor_cb_data, (DBusFreeFunction) free_hal_info_cb_data);
-			}
+			vendor_cb_data->applet = cb_data->applet;
+			network_device_ref (cb_data->dev);
+			vendor_cb_data->dev = cb_data->dev;
+			vendor_cb_data->parent_op = g_strdup (op);
+
+			nm_dbus_send_with_callback (cb_data->applet->connection, message,
+					hal_info_vendor_cb, vendor_cb_data,
+					(DBusFreeFunction) free_hal_info_cb_data, __func__);
 			dbus_message_unref (message);
 		}
 	}
@@ -447,7 +475,6 @@ out:
 static void nma_dbus_update_device_info_from_hal (NetworkDevice *dev, NMApplet *applet)
 {
 	DBusMessage *		message;
-	DBusPendingCall *	pcall = NULL;
 
 	g_return_if_fail (applet != NULL);
 	g_return_if_fail (applet->connection != NULL);
@@ -457,18 +484,17 @@ static void nma_dbus_update_device_info_from_hal (NetworkDevice *dev, NMApplet *
 										"org.freedesktop.Hal.Device", "GetPropertyString")))
 	{
 		const char *	prop = "net.physical_device";
+		HalInfoCBData *cb_data = g_malloc0 (sizeof (HalInfoCBData));
 
 		dbus_message_append_args (message, DBUS_TYPE_STRING, &prop, DBUS_TYPE_INVALID);
-		dbus_connection_send_with_reply (applet->connection, message, &pcall, -1);
-		if (pcall)
-		{
-			HalInfoCBData *	cb_data = g_malloc0 (sizeof (HalInfoCBData));
 
-			cb_data->applet = applet;
-			network_device_ref (dev);
-			cb_data->dev = dev;
-			dbus_pending_call_set_notify (pcall, hal_net_physdev_cb, cb_data, (DBusFreeFunction) free_hal_info_cb_data);
-		}
+		cb_data->applet = applet;
+		network_device_ref (dev);
+		cb_data->dev = dev;
+
+		nm_dbus_send_with_callback (cb_data->applet->connection, message,
+				hal_net_physdev_cb, cb_data,
+				(DBusFreeFunction) free_hal_info_cb_data, __func__);
 		dbus_message_unref (message);
 	}
 }
@@ -496,11 +522,11 @@ typedef struct NetPropCBData
 
 static void free_net_prop_cb_data (NetPropCBData *data)
 {
-	if (data)
-	{
-		g_free (data->dev_op);
-		g_free (data->act_net);
-	}
+	if (!data)
+		return;
+
+	g_free (data->dev_op);
+	g_free (data->act_net);
 	g_free (data);
 }
 
@@ -531,6 +557,8 @@ static void nma_dbus_net_properties_cb (DBusPendingCall *pcall, void *user_data)
 	g_return_if_fail (cb_data->applet != NULL);
 	g_return_if_fail (cb_data->dev_op != NULL);
 
+	nm_dbus_send_with_callback_replied (pcall, __func__);
+
 	applet = cb_data->applet;
 
 	if (!(reply = dbus_pending_call_steal_reply (pcall)))
@@ -608,7 +636,6 @@ out:
 void nma_dbus_device_update_one_network (NMApplet *applet, const char *dev_path, const char *net_path, const char *active_net_path)
 {
 	DBusMessage *		message;
-	DBusPendingCall *	pcall = NULL;
 
 	g_return_if_fail (applet != NULL);
 	g_return_if_fail (dev_path != NULL);
@@ -616,16 +643,15 @@ void nma_dbus_device_update_one_network (NMApplet *applet, const char *dev_path,
 
 	if ((message = dbus_message_new_method_call (NM_DBUS_SERVICE, net_path, NM_DBUS_INTERFACE_DEVICES, "getProperties")))
 	{
-		dbus_connection_send_with_reply (applet->connection, message, &pcall, -1);
-		if (pcall)
-		{
-			NetPropCBData * cb_data = g_malloc0 (sizeof (NetPropCBData));
+		NetPropCBData * cb_data = g_malloc0 (sizeof (NetPropCBData));
 
-			cb_data->dev_op = g_strdup (dev_path);
-			cb_data->act_net = (active_net_path && strlen (active_net_path)) ? g_strdup (active_net_path) : NULL;
-			cb_data->applet = applet;
-			dbus_pending_call_set_notify (pcall, nma_dbus_net_properties_cb, cb_data, (DBusFreeFunction) free_net_prop_cb_data);
-		}
+		cb_data->dev_op = g_strdup (dev_path);
+		cb_data->act_net = (active_net_path && strlen (active_net_path)) ? g_strdup (active_net_path) : NULL;
+		cb_data->applet = applet;
+
+		nm_dbus_send_with_callback (applet->connection, message,
+			nma_dbus_net_properties_cb, cb_data,
+			(DBusFreeFunction) free_net_prop_cb_data, __func__);
 		dbus_message_unref (message);
 	}
 }
@@ -737,6 +763,8 @@ static void nma_dbus_device_properties_cb (DBusPendingCall *pcall, void *user_da
 	g_return_if_fail (pcall != NULL);
 	g_return_if_fail (applet != NULL);
 
+	nm_dbus_send_with_callback_replied (pcall, __func__);
+
 	if (!(reply = dbus_pending_call_steal_reply (pcall)))
 		goto out;
 
@@ -839,16 +867,14 @@ out:
 void nma_dbus_device_update_one_device (NMApplet *applet, const char *dev_path)
 {
 	DBusMessage *		message;
-	DBusPendingCall *	pcall = NULL;
 
 	g_return_if_fail (applet != NULL);
 	g_return_if_fail (dev_path != NULL);
 
 	if ((message = dbus_message_new_method_call (NM_DBUS_SERVICE, dev_path, NM_DBUS_INTERFACE_DEVICES, "getProperties")))
 	{
-		dbus_connection_send_with_reply (applet->connection, message, &pcall, -1);
-		if (pcall)
-			dbus_pending_call_set_notify (pcall, nma_dbus_device_properties_cb, applet, NULL);
+		nm_dbus_send_with_callback (applet->connection, message,
+				nma_dbus_device_properties_cb, applet, NULL, __func__);
 		dbus_message_unref (message);
 	}
 }
@@ -865,9 +891,7 @@ static void free_device_activated_cb_data (DeviceActivatedCBData *obj)
 		return;
 
 	obj->applet = NULL;
-	if (obj->essid)
-		g_free (obj->essid);
-
+	g_free (obj->essid);
 	memset (obj, 0, sizeof (DeviceActivatedCBData));
 	g_free (obj);
 }
@@ -883,11 +907,19 @@ static void nma_dbus_device_activated_cb (DBusPendingCall *pcall, void *user_dat
 	char *				icon = NULL;
 #endif
 
+	nm_dbus_send_with_callback_replied (pcall, __func__);
+
 	nma_dbus_device_properties_cb (pcall, applet);
 
 	/* Don't show anything if the applet isn't shown */
-	if (!GTK_WIDGET_VISIBLE (GTK_WIDGET (applet)))
+#ifdef HAVE_STATUS_ICON
+	if (!gtk_status_icon_get_visible (applet->status_icon) ||
+	    !gtk_status_icon_is_embedded (applet->status_icon))
+		goto out;
+#else
+	if (!GTK_WIDGET_VISIBLE (GTK_WIDGET (applet->tray_icon)))
 		goto out;
+#endif /* HAVE_STATUS_ICON */
 
 #ifdef ENABLE_NOTIFY
 	active_device = nma_get_first_active_device (applet->device_list);
@@ -924,9 +956,8 @@ out:
 
 void nma_dbus_device_activated (NMApplet *applet, const char *dev_path, const char *essid)
 {
-	DBusMessage *		message;
-	DBusPendingCall *	pcall = NULL;
-	DeviceActivatedCBData	*cb_data = NULL;
+	DBusMessage *			message;
+	DeviceActivatedCBData *	cb_data = NULL;
 
 	g_return_if_fail (applet != NULL);
 	g_return_if_fail (dev_path != NULL);
@@ -938,9 +969,8 @@ void nma_dbus_device_activated (NMApplet *applet, const char *dev_path, const ch
 
 	if ((message = dbus_message_new_method_call (NM_DBUS_SERVICE, dev_path, NM_DBUS_INTERFACE_DEVICES, "getProperties")))
 	{
-		dbus_connection_send_with_reply (applet->connection, message, &pcall, -1);
-		if (pcall)
-			dbus_pending_call_set_notify (pcall, nma_dbus_device_activated_cb, cb_data, NULL);
+		nm_dbus_send_with_callback (applet->connection, message,
+				nma_dbus_device_activated_cb, cb_data, NULL, __func__);
 		dbus_message_unref (message);
 	}
 }
@@ -950,11 +980,19 @@ static void nma_dbus_device_deactivated_cb (DBusPendingCall *pcall, void *user_d
 {
 	NMApplet *	applet = (NMApplet *) user_data;
 
+	nm_dbus_send_with_callback_replied (pcall, __func__);
+
 	nma_dbus_device_properties_cb (pcall, applet);
 
 #ifdef ENABLE_NOTIFY
 	/* Don't show anything if the applet isn't shown */
-	if (GTK_WIDGET_VISIBLE (GTK_WIDGET (applet)))
+#ifdef HAVE_STATUS_ICON
+	if (gtk_status_icon_get_visible (applet->status_icon) &&
+	    gtk_status_icon_is_embedded (applet->status_icon))
+#else
+	if (GTK_WIDGET_VISIBLE (GTK_WIDGET (applet->tray_icon)))
+#endif /* HAVE_STATUS_ICON */
+
 	{
 		nma_send_event_notification (applet, NOTIFY_URGENCY_NORMAL, _("Disconnected"),
 			_("The network connection has been disconnected."), "nm-no-connection");
@@ -964,17 +1002,15 @@ static void nma_dbus_device_deactivated_cb (DBusPendingCall *pcall, void *user_d
 
 void nma_dbus_device_deactivated (NMApplet *applet, const char *dev_path)
 {
-	DBusMessage *		message;
-	DBusPendingCall *	pcall = NULL;
+	DBusMessage *	message;
 
 	g_return_if_fail (applet != NULL);
 	g_return_if_fail (dev_path != NULL);
 
 	if ((message = dbus_message_new_method_call (NM_DBUS_SERVICE, dev_path, NM_DBUS_INTERFACE_DEVICES, "getProperties")))
 	{
-		dbus_connection_send_with_reply (applet->connection, message, &pcall, -1);
-		if (pcall)
-			dbus_pending_call_set_notify (pcall, nma_dbus_device_deactivated_cb, applet, NULL);
+		nm_dbus_send_with_callback (applet->connection, message,
+				nma_dbus_device_deactivated_cb, applet, NULL, __func__);
 		dbus_message_unref (message);
 	}
 }
@@ -988,14 +1024,16 @@ void nma_dbus_device_deactivated (NMApplet *applet, const char *dev_path)
  */
 static void nma_dbus_update_devices_cb (DBusPendingCall *pcall, void *user_data)
 {
-	DBusMessage *		reply;
+	DBusMessage *	reply;
 	NMApplet *	applet = (NMApplet *) user_data;
-	char **			devices;
-	int				num_devices;
+	char **		devices;
+	int			num_devices;
 
 	g_return_if_fail (pcall != NULL);
 	g_return_if_fail (applet != NULL);
 
+	nm_dbus_send_with_callback_replied (pcall, __func__);
+
 	if (!(reply = dbus_pending_call_steal_reply (pcall)))
 		goto out;
 
@@ -1043,15 +1081,13 @@ out:
 void nma_dbus_update_devices (NMApplet *applet)
 {
 	DBusMessage *		message;
-	DBusPendingCall *	pcall;
 
 	nma_free_data_model (applet);
 
 	if ((message = dbus_message_new_method_call (NM_DBUS_SERVICE, NM_DBUS_PATH, NM_DBUS_INTERFACE, "getDevices")))
 	{
-		dbus_connection_send_with_reply (applet->connection, message, &pcall, -1);
-		if (pcall)
-			dbus_pending_call_set_notify (pcall, nma_dbus_update_devices_cb, applet, NULL);
+		nm_dbus_send_with_callback (applet->connection, message,
+				nma_dbus_update_devices_cb, applet, NULL, __func__);
 		dbus_message_unref (message);
 	}
 	nma_dbus_update_wireless_enabled (applet);
@@ -1074,6 +1110,8 @@ static void nma_dbus_update_dialup_cb (DBusPendingCall *pcall, void *user_data)
 	g_return_if_fail (pcall != NULL);
 	g_return_if_fail (applet != NULL);
 
+	nm_dbus_send_with_callback_replied (pcall, __func__);
+
 	if (!(reply = dbus_pending_call_steal_reply (pcall)))
 		goto out;
 
@@ -1121,6 +1159,27 @@ out:
 
 
 /*
+ * nma_dbus_update_dialup
+ *
+ * Do an update of dial up devices.
+ *
+ */
+void nma_dbus_update_dialup (NMApplet *applet)
+{
+	DBusMessage *message;
+
+	nma_free_data_model (applet);
+
+	if ((message = dbus_message_new_method_call (NM_DBUS_SERVICE, NM_DBUS_PATH, NM_DBUS_INTERFACE, "getDialup")))
+	{
+		nm_dbus_send_with_callback (applet->connection, message,
+				nma_dbus_update_dialup_cb, applet, NULL, __func__);
+		dbus_message_unref (message);
+	}
+}
+
+
+/*
  * nma_dbus_dialup_activate_connection
  *
  * Tell NetworkManager to activate a particular dialup connection.
@@ -1203,29 +1262,6 @@ void nma_dbus_dialup_deactivate_connection (NMApplet *applet, const char *name)
 
 
 /*
- * nma_dbus_update_dialup
- *
- * Do an update of dial up devices.
- *
- */
-void nma_dbus_update_dialup (NMApplet *applet)
-{
-	DBusMessage *message;
-	DBusPendingCall *pcall;
-
-	nma_free_data_model (applet);
-
-	if ((message = dbus_message_new_method_call (NM_DBUS_SERVICE, NM_DBUS_PATH, NM_DBUS_INTERFACE, "getDialup")))
-	{
-		dbus_connection_send_with_reply (applet->connection, message, &pcall, -1);
-		if (pcall)
-			dbus_pending_call_set_notify (pcall, nma_dbus_update_dialup_cb, applet, NULL);
-		dbus_message_unref (message);
-	}
-}
-
-
-/*
  * nma_dbus_device_remove_one_device
  *
  * Remove a device from our list.
@@ -1253,7 +1289,7 @@ void nma_dbus_device_remove_one_device (NMApplet *applet, const char *dev_path)
  *
  */
 void nma_dbus_set_device (DBusConnection *connection, NetworkDevice *dev, const char *essid,
-						WirelessSecurityOption * opt)
+					 gboolean fallback, WirelessSecurityOption * opt)
 {
 	DBusMessage *	message;
 	gboolean		success = TRUE;
@@ -1272,6 +1308,7 @@ void nma_dbus_set_device (DBusConnection *connection, NetworkDevice *dev, const
 			/* Build up the required args */
 			dbus_message_append_args (message, DBUS_TYPE_OBJECT_PATH, &dev_path,
 										DBUS_TYPE_STRING, &essid,
+										DBUS_TYPE_BOOLEAN, &fallback,
 										DBUS_TYPE_INVALID);
 
 			/* If we have specific wireless security options, add them */
@@ -1373,9 +1410,6 @@ void nma_dbus_enable_networking (NMApplet *applet, gboolean enabled)
 
 	if ((message = dbus_message_new_method_call (NM_DBUS_SERVICE, NM_DBUS_PATH, NM_DBUS_INTERFACE, method)))
 	{
-		gboolean true = TRUE; /* Eek... */
-
-		dbus_message_append_args (message, DBUS_TYPE_BOOLEAN, &true, DBUS_TYPE_INVALID);
 		dbus_connection_send (applet->connection, message, NULL);
 		dbus_message_unref (message);
 	}
diff --git a/src/applet-dbus-devices.h b/src/applet-dbus-devices.h
index 05562af2..13183e46 100644
--- a/src/applet-dbus-devices.h
+++ b/src/applet-dbus-devices.h
@@ -49,7 +49,7 @@ void			nma_dbus_device_remove_one_device			(NMApplet *applet, const char *dev_pa
 void			nma_dbus_device_update_one_network		(NMApplet *applet, const char *dev_path, const char *net_path, const char *active_net_path);
 void			nma_dbus_device_remove_one_network		(NMApplet *applet, const char *dev_path, const char *net_path);
 void			nma_dbus_update_strength				(NMApplet *applet, const char *dev_path, const char *net_path, int strength);
-void			nma_dbus_set_device					(DBusConnection *connection, NetworkDevice *dev, const char *essid, WirelessSecurityOption *opt);
+void			nma_dbus_set_device					(DBusConnection *connection, NetworkDevice *dev, const char *essid, gboolean fallback, WirelessSecurityOption *opt);
 void			nma_dbus_create_network					(DBusConnection *connection, NetworkDevice *dev, const char *essid, WirelessSecurityOption *opt);
 
 void			nma_free_data_model					(NMApplet *applet);
diff --git a/src/applet-dbus-info.c b/src/applet-dbus-info.c
index a22c098f..624e1267 100644
--- a/src/applet-dbus-info.c
+++ b/src/applet-dbus-info.c
@@ -395,7 +395,7 @@ nmi_dbus_get_network_properties (DBusConnection *connection,
 	char *			escaped_network = NULL;
 	char *			essid = NULL;
 	gint				timestamp = -1;
-	gboolean			trusted = FALSE;
+	gboolean			fallback = FALSE;
 	DBusMessageIter 	iter, array_iter;
 	GConfClient *		client;
 	NMGConfWSO *		gconf_wso;
@@ -435,9 +435,9 @@ nmi_dbus_get_network_properties (DBusConnection *connection,
 	if (!nm_gconf_get_int_helper (client, GCONF_PATH_WIRELESS_NETWORKS, "timestamp", escaped_network, &timestamp) || (timestamp < 0))
 		timestamp = 0;
 
-	/* Trusted status */
-	if (!nm_gconf_get_bool_helper (client, GCONF_PATH_WIRELESS_NETWORKS, "trusted", escaped_network, &trusted))
-		trusted = FALSE;
+	/* Fallback status */
+	if (!nm_gconf_get_bool_helper (client, GCONF_PATH_WIRELESS_NETWORKS, "fallback", escaped_network, &fallback))
+		fallback = FALSE;
 
 	/* Grab the list of stored access point BSSIDs */
 	gconf_key = g_strdup_printf ("%s/%s/bssids", GCONF_PATH_WIRELESS_NETWORKS, escaped_network);
@@ -468,8 +468,8 @@ nmi_dbus_get_network_properties (DBusConnection *connection,
 	/* Second arg: Timestamp (INT32) */
 	dbus_message_iter_append_basic (&iter, DBUS_TYPE_INT32, &timestamp);
 
-	/* Third arg: Trusted (BOOLEAN) */
-	dbus_message_iter_append_basic (&iter, DBUS_TYPE_BOOLEAN, &trusted);
+	/* Third arg: Fallback? (BOOLEAN) */
+	dbus_message_iter_append_basic (&iter, DBUS_TYPE_BOOLEAN, &fallback);
 
 	/* Fourth arg: List of AP BSSIDs (ARRAY, STRING) */
 	dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING_AS_STRING, &array_iter);
@@ -818,12 +818,14 @@ static void
 nmi_save_network_info (NMApplet *applet,
                        const char *essid,
                        gboolean automatic,
+                       gboolean fallback,
                        const char *bssid,
                        NMGConfWSO * gconf_wso)
 {
-	char *					key;
-	GConfEntry *				gconf_entry;
-	char *					escaped_network;
+	char *			key;
+	GConfEntry *		gconf_entry;
+	char *			escaped_network;
+	GConfValue *		value;
 
 	g_return_if_fail (applet != NULL);
 	g_return_if_fail (essid != NULL);
@@ -854,9 +856,18 @@ nmi_save_network_info (NMApplet *applet,
 		g_free (key);
 	}
 
+	/*
+	 * XXX: We don't want to move a network from fallback to non-fallback because the user
+	 * connected via other means.  We need a better way to do this.
+	 */
+	key = g_strdup_printf ("%s/%s/fallback", GCONF_PATH_WIRELESS_NETWORKS, escaped_network);
+	value = gconf_client_get (applet->gconf_client, key, NULL);
+	if (!value || value->type != GCONF_VALUE_BOOL || (!gconf_value_get_bool (value) && fallback))
+		gconf_client_set_bool (applet->gconf_client, key, fallback, NULL);
+	g_free (key);
+
 	if (bssid && (strlen (bssid) >= 11))
 	{
-		GConfValue *	value;
 		GSList *		new_bssid_list = NULL;
 		gboolean		found = FALSE;
 
@@ -954,6 +965,7 @@ nmi_dbus_update_network_info (DBusConnection *connection,
 	NMApplet *		applet = (NMApplet *) user_data;
 	char *			essid = NULL;
 	gboolean			automatic;
+	gboolean			fallback;
 	NMGConfWSO *		gconf_wso = NULL;
 	DBusMessageIter	iter;
 	char *			bssid;
@@ -984,7 +996,15 @@ nmi_dbus_update_network_info (DBusConnection *connection,
 	}
 	dbus_message_iter_get_basic (&iter, &automatic);
 
-	/* Third argument: Access point's BSSID */
+	/* Third argument: Fallback? (BOOLEAN) */
+	if (!dbus_message_iter_next (&iter) || (dbus_message_iter_get_arg_type (&iter) != DBUS_TYPE_BOOLEAN))
+	{
+		nm_warning ("%s:%d - message argument 'fallback' was invalid.", __FILE__, __LINE__);
+		goto out;
+	}
+	dbus_message_iter_get_basic (&iter, &fallback);
+
+	/* Fourth argument: Access point's BSSID */
 	if (!dbus_message_iter_next (&iter) || (dbus_message_iter_get_arg_type (&iter) != DBUS_TYPE_STRING))
 	{
 		nm_warning ("%s:%d - message argument 'bssid' was invalid.", __FILE__, __LINE__);
@@ -1002,7 +1022,7 @@ nmi_dbus_update_network_info (DBusConnection *connection,
 		goto out;
 	}
 
-	nmi_save_network_info (applet, essid, automatic, bssid, gconf_wso);
+	nmi_save_network_info (applet, essid, automatic, fallback, bssid, gconf_wso);
 	g_object_unref (G_OBJECT (gconf_wso));
 
 out:
diff --git a/src/applet-dbus-vpn.c b/src/applet-dbus-vpn.c
index 470cc0af..9d8ecf23 100644
--- a/src/applet-dbus-vpn.c
+++ b/src/applet-dbus-vpn.c
@@ -126,6 +126,8 @@ static void nma_dbus_vpn_properties_cb (DBusPendingCall *pcall, void *user_data)
 	g_return_if_fail (cb_data->applet != NULL);
 	g_return_if_fail (cb_data->name != NULL);
 
+	nm_dbus_send_with_callback_replied (pcall, __func__);
+
 	applet = cb_data->applet;
 
 	if (!(reply = dbus_pending_call_steal_reply (pcall)))
@@ -180,7 +182,6 @@ out:
 void nma_dbus_vpn_update_one_vpn_connection (NMApplet *applet, const char *vpn_name)
 {
 	DBusMessage *		message;
-	DBusPendingCall *	pcall = NULL;
 
 	g_return_if_fail (applet != NULL);
 	g_return_if_fail (vpn_name != NULL);
@@ -189,17 +190,17 @@ void nma_dbus_vpn_update_one_vpn_connection (NMApplet *applet, const char *vpn_n
 
 	if ((message = dbus_message_new_method_call (NM_DBUS_SERVICE, NM_DBUS_PATH_VPN, NM_DBUS_INTERFACE_VPN, "getVPNConnectionProperties")))
 	{
+		VpnPropsCBData *	cb_data = g_malloc0 (sizeof (VpnPropsCBData));
+
 		dbus_message_append_args (message, DBUS_TYPE_STRING, &vpn_name, DBUS_TYPE_INVALID);
-		dbus_connection_send_with_reply (applet->connection, message, &pcall, -1);
-		dbus_message_unref (message);
-		if (pcall)
-		{
-			VpnPropsCBData *	cb_data = g_malloc0 (sizeof (VpnPropsCBData));
 
-			cb_data->applet = applet;
-			cb_data->name = g_strdup (vpn_name);
-			dbus_pending_call_set_notify (pcall, nma_dbus_vpn_properties_cb, cb_data, (DBusFreeFunction) free_vpn_props_cb_data);
-		}
+		cb_data->applet = applet;
+		cb_data->name = g_strdup (vpn_name);
+
+		nm_dbus_send_with_callback (applet->connection, message,
+				nma_dbus_vpn_properties_cb, cb_data,
+				(DBusFreeFunction) free_vpn_props_cb_data, __func__);
+		dbus_message_unref (message);
 	}
 }
 
@@ -220,6 +221,8 @@ static void nma_dbus_vpn_update_vpn_connections_cb (DBusPendingCall *pcall, void
 	g_return_if_fail (pcall != NULL);
 	g_return_if_fail (applet != NULL);
 
+	nm_dbus_send_with_callback_replied (pcall, __func__);
+
 	if (!(reply = dbus_pending_call_steal_reply (pcall)))
 		goto out;
 
@@ -267,7 +270,6 @@ out:
 void nma_dbus_vpn_update_vpn_connections (NMApplet *applet)
 {
 	DBusMessage *		message;
-	DBusPendingCall *	pcall;
 
 	nma_free_vpn_connections (applet);
 
@@ -275,10 +277,9 @@ void nma_dbus_vpn_update_vpn_connections (NMApplet *applet)
 
 	if ((message = dbus_message_new_method_call (NM_DBUS_SERVICE, NM_DBUS_PATH_VPN, NM_DBUS_INTERFACE_VPN, "getVPNConnections")))
 	{
-		dbus_connection_send_with_reply (applet->connection, message, &pcall, -1);
+		nm_dbus_send_with_callback (applet->connection, message,
+				nma_dbus_vpn_update_vpn_connections_cb, applet, NULL, __func__);
 		dbus_message_unref (message);
-		if (pcall)
-			dbus_pending_call_set_notify (pcall, nma_dbus_vpn_update_vpn_connections_cb, applet, NULL);
 	}
 }
 
diff --git a/src/applet-dbus.c b/src/applet-dbus.c
index 9a2f07aa..f6307df6 100644
--- a/src/applet-dbus.c
+++ b/src/applet-dbus.c
@@ -28,6 +28,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdarg.h>
+#include <math.h>
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib-lowlevel.h>
 #include "applet.h"
@@ -48,12 +49,11 @@
  */
 static DBusHandlerResult nma_dbus_filter (DBusConnection *connection, DBusMessage *message, void *user_data)
 {
-	NMApplet	*applet = (NMApplet *)user_data;
-	gboolean			 handled = TRUE;
-
-	const char *		object_path;
-	const char *		member;
-	const char *		interface;
+	NMApplet *	applet = (NMApplet *)user_data;
+	gboolean		handled = TRUE;
+	const char *	object_path;
+	const char *	member;
+	const char *	interface;
 
 	g_return_val_if_fail (applet != NULL, DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
 	g_return_val_if_fail (connection != NULL, DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
diff --git a/src/applet-dbus.h b/src/applet-dbus.h
index c32b5c88..81263bdc 100644
--- a/src/applet-dbus.h
+++ b/src/applet-dbus.h
@@ -27,14 +27,6 @@
 #include "NetworkManager.h"
 #include "applet.h"
 
-/* Return codes for functions that use dbus */
-enum
-{
-	RETURN_SUCCESS = 1,
-	RETURN_FAILURE = 0,
-	RETURN_NO_NM = -1
-};
-
 static inline gboolean message_is_error (DBusMessage *msg)
 {
 	g_return_val_if_fail (msg != NULL, FALSE);
diff --git a/src/applet-notifications.c b/src/applet-notifications.c
index b7f7a581..15de97cc 100644
--- a/src/applet-notifications.c
+++ b/src/applet-notifications.c
@@ -46,7 +46,11 @@ nma_send_event_notification (NMApplet *applet,
 
 	notify_icon = icon ? icon : GTK_STOCK_NETWORK;
 
-	applet->notification = notify_notification_new (summary, message, notify_icon, GTK_WIDGET (applet));
+#ifdef HAVE_STATUS_ICON
+	applet->notification = notify_notification_new_with_status_icon (summary, message, notify_icon, applet->status_icon);
+#else
+	applet->notification = notify_notification_new (summary, message, notify_icon, GTK_WIDGET (applet->tray_icon));
+#endif /* HAVE_STATUS_ICON */
 
 	notify_notification_set_urgency (applet->notification, urgency);
 	notify_notification_show (applet->notification, NULL);
diff --git a/src/applet.c b/src/applet.c
index 0b4a51e9..a7c235fd 100644
--- a/src/applet.c
+++ b/src/applet.c
@@ -75,16 +75,16 @@
 	#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_context_menu_update (NMApplet *applet);
-static GtkWidget *				nma_get_instance (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 */
+static GObject *			nma_constructor (GType type, guint n_props, GObjectConstructParam *construct_props);
+static void			nma_icons_init (NMApplet *applet);
+static void				nma_icons_free (NMApplet *applet);
+static void				nma_icons_zero (NMApplet *applet);
+static gboolean			nma_icons_load_from_disk (NMApplet *applet);
+static void				nma_context_menu_update (NMApplet *applet);
+static void			nma_finalize (GObject *object);
+static GType				nma_get_type (void);	/* for G_DEFINE_TYPE */
 
-G_DEFINE_TYPE(NMApplet, nma, EGG_TYPE_TRAY_ICON)
+G_DEFINE_TYPE(NMApplet, nma, G_TYPE_OBJECT)
 
 /*
  * nm_null_safe_strcmp
@@ -130,37 +130,33 @@ static void nma_init (NMApplet *applet)
 {
 	applet->animation_id = 0;
 	applet->animation_step = 0;
-	glade_gnome_init ();
+	applet->nm_running = FALSE;
+	applet->device_list = NULL;
+	applet->vpn_connections = NULL;
+	applet->dialup_list = NULL;
+	applet->nm_state = NM_STATE_DISCONNECTED;
+	applet->passphrase_dialog = NULL;
+	applet->connection_timeout_id = 0;
+	applet->redraw_timeout_id = 0;
+	applet->icon_theme = NULL;
+#ifdef ENABLE_NOTIFY
+	applet->notification = NULL;
+#endif
+#ifdef HAVE_STATUS_ICON
+	applet->size = -1;
+#endif
 
-	if (!nma_icons_init (applet))
-		return;
+	nma_icons_zero (applet);
 
 /*	gtk_window_set_default_icon_from_file (ICONDIR"/NMApplet/wireless-applet.png", NULL); */
-	gtk_widget_show (nma_get_instance (applet));
 }
 
 static void nma_class_init (NMAppletClass *klass)
 {
-	GObjectClass *gobject_class;
-
-	gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
-								ICONDIR);
+	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 
-	gobject_class = G_OBJECT_CLASS (klass);
 	gobject_class->constructor = nma_constructor;
-}
-
-static GObject *nma_constructor (GType type, guint n_props, GObjectConstructParam *construct_props)
-{
-	GObject *obj;
-	NMApplet *applet;
-	NMAppletClass *klass;
-
-	klass = NM_APPLET_CLASS (g_type_class_peek (type));
-	obj = G_OBJECT_CLASS (nma_parent_class)->constructor (type, n_props, construct_props);
-	applet =  NM_APPLET (obj);
-
-	return obj;
+	gobject_class->finalize = nma_finalize;
 }
 
 static GtkWidget * get_label (GtkWidget *info_dialog, GladeXML *xml, const char *name)
@@ -201,9 +197,8 @@ static gboolean nma_update_info (NMApplet *applet)
 	info_dialog = glade_xml_get_widget (applet->info_dialog_xml, "info_dialog");
 	if (!info_dialog)
 	{
-		char *err = g_strdup (_("Could not find some required resources (the glade file)!"));
+		const char *err = _("Could not find some required resources (the glade file)!");
 		nma_show_socket_err (info_dialog, err);
-		g_free (err);
 		return FALSE;
 	}
 	
@@ -212,9 +207,8 @@ static gboolean nma_update_info (NMApplet *applet)
 
 	if (!dev || !iface)
 	{
-		char *err = g_strdup (_("No active connections!"));
+		const char *err = _("No active connections!");
 		nma_show_socket_err (info_dialog, err);
-		g_free (err);
 		return FALSE;
 	}
 
@@ -230,7 +224,7 @@ static gboolean nma_update_info (NMApplet *applet)
 
 	mbs = network_device_get_speed (dev);
 	if (mbs)
-		speed = g_strdup_printf ("%d Mb/s", mbs);
+		speed = g_strdup_printf (_("%d Mb/s"), mbs);
 
 	if (network_device_is_wired (dev))
 		iface_and_type = g_strdup_printf (_("Wired Ethernet (%s)"), iface);
@@ -241,7 +235,7 @@ static gboolean nma_update_info (NMApplet *applet)
 	gtk_label_set_text (GTK_LABEL (label), iface_and_type);
 
 	label = get_label (info_dialog, applet->info_dialog_xml, "label-speed");
-	gtk_label_set_text (GTK_LABEL (label), mbs ? speed : "Unknown");
+	gtk_label_set_text (GTK_LABEL (label), mbs ? speed : _("Unknown"));
 
 	label = get_label (info_dialog, applet->info_dialog_xml, "label-driver");
 	gtk_label_set_text (GTK_LABEL (label), driver);
@@ -286,12 +280,14 @@ static void nma_show_info_cb (GtkMenuItem *mi, NMApplet *applet)
 	}
 }
 
+#if GTK_CHECK_VERSION (2, 6, 0)
 static void about_dialog_activate_link_cb (GtkAboutDialog *about,
                                            const gchar *url,
                                            gpointer data)
 {
 	gnome_url_show (url, NULL);
 }
+#endif
 
 static void nma_about_cb (GtkMenuItem *mi, NMApplet *applet)
 {
@@ -342,12 +338,13 @@ static void nma_about_cb (GtkMenuItem *mi, NMApplet *applet)
 	                                pixbuf);
 	g_object_unref (pixbuf);
 
-	gtk_window_set_screen (GTK_WINDOW (about_dialog), gtk_widget_get_screen (GTK_WIDGET (applet)));
+	gtk_window_set_screen (GTK_WINDOW (about_dialog), gtk_widget_get_screen (GTK_WIDGET (applet->tray_icon)));
 	g_signal_connect (about_dialog, "destroy", G_CALLBACK (gtk_widget_destroyed), &about_dialog);
 	gtk_widget_show (about_dialog);
 
 #else
 
+	/* FIXME: unnecessary with libgnomeui >= 2.16.0 */
 	static gboolean been_here = FALSE;
 	if (!been_here)
 	{
@@ -515,6 +512,7 @@ void nma_show_vpn_login_banner (NMApplet *applet, const char *vpn_name, const ch
 	title = _("VPN Login Message");
 #ifdef ENABLE_NOTIFY
 	msg = g_strdup_printf ("\n%s", banner);
+	/* gnome-lockscreen is a padlock; exactly what we want for a VPN */
 	nma_send_event_notification (applet, NOTIFY_URGENCY_LOW,
 		title, msg, "gnome-lockscreen");
 #else
@@ -821,7 +819,9 @@ static VPNConnection *nma_get_first_activating_vpn_connection (NMApplet *applet)
 
 static void nma_set_icon (NMApplet *applet, GdkPixbuf *link_icon, GdkPixbuf *vpn_icon)
 {
+#ifndef HAVE_STATUS_ICON
 	GtkRequisition requisition;
+#endif
 	GdkPixbuf	*composite;
 	VPNConnection	*vpn;
 
@@ -838,14 +838,18 @@ static void nma_set_icon (NMApplet *applet, GdkPixbuf *link_icon, GdkPixbuf *vpn
 		gdk_pixbuf_composite (vpn_icon, composite, 0, 0, gdk_pixbuf_get_width (vpn_icon),
 							gdk_pixbuf_get_height (vpn_icon), 0, 0, 1.0, 1.0, GDK_INTERP_NEAREST, 255);
 
+#ifdef HAVE_STATUS_ICON
+	gtk_status_icon_set_from_pixbuf (applet->status_icon, composite);
+#else
 	gtk_image_set_from_pixbuf (GTK_IMAGE (applet->pixmap), composite);
 
 	/* Add some padding to the applet to ensure the
 	 * highlight has some space.
 	 */
-	gtk_widget_set_size_request (GTK_WIDGET (applet), -1, -1);
-	gtk_widget_size_request (GTK_WIDGET (applet), &requisition);
-	gtk_widget_set_size_request (GTK_WIDGET (applet), requisition.width + 6, requisition.height + 2);
+	gtk_widget_set_size_request (GTK_WIDGET (applet->tray_icon), -1, -1);
+	gtk_widget_size_request (GTK_WIDGET (applet->tray_icon), &requisition);
+	gtk_widget_set_size_request (GTK_WIDGET (applet->tray_icon), requisition.width + 6, requisition.height + 2);
+#endif /* HAVE_STATUS_ICON */
 
 	g_object_unref (composite);
 }
@@ -897,7 +901,8 @@ static GdkPixbuf * nma_act_stage_to_pixbuf (NMApplet *applet, NetworkDevice *dev
 	g_return_val_if_fail (tip != NULL, NULL);
 
 	iface = network_device_get_iface (dev);
-	essid = net ? wireless_network_get_essid (net) : NULL;
+	/* Note to translators: this is used if no essid is known */
+	essid = net ? wireless_network_get_essid (net) : _("(unknown)");
 	switch (network_device_get_act_stage (dev))
 	{
 		case NM_ACT_STAGE_DEVICE_PREPARE:
@@ -1095,7 +1100,7 @@ void nma_update_state (NMApplet *applet)
 					tip = g_strdup (_("Connected to an Ad-Hoc wireless network"));
 				else
 					tip = g_strdup_printf (_("Wireless network connection to '%s' (%d%%)"),
-					                       active_network ? wireless_network_get_essid (active_network) : "(unknown)", strength);
+					                       active_network ? wireless_network_get_essid (active_network) : _("(unknown)"), strength);
 			}
 			pixbuf = nma_get_connected_icon (applet, act_dev);
 			break;
@@ -1137,10 +1142,11 @@ void nma_update_state (NMApplet *applet)
 	}
 
 done:
-	if (!applet->tooltips)
-		applet->tooltips = gtk_tooltips_new ();
-
+#ifdef HAVE_STATUS_ICON
+	gtk_status_icon_set_tooltip (applet->status_icon, tip);
+#else
 	gtk_tooltips_set_tip (applet->tooltips, applet->event_box, tip, NULL);
+#endif /* HAVE_STATUS_ICON */
 	g_free (tip);
 
 	applet->animation_step = 0;
@@ -1154,17 +1160,28 @@ done:
 			applet->animation_id = 0;
 		}
 
+#ifdef HAVE_STATUS_ICON
+		if (pixbuf)
+			nma_set_icon (applet, pixbuf, applet->vpn_lock_icon);
+		else
+			gtk_status_icon_set_from_stock (applet->status_icon, GTK_STOCK_MISSING_IMAGE);
+#else
 		if (pixbuf)
 			nma_set_icon (applet, pixbuf, applet->vpn_lock_icon);
 		else
 			show_applet = FALSE;
+#endif /* HAVE_STATUS_ICON */
 	}
 
 	/* determine if we should hide the notification icon */
+#ifdef HAVE_STATUS_ICON
+	gtk_status_icon_set_visible (applet->status_icon, show_applet);
+#else
 	if (show_applet)
-		gtk_widget_show (GTK_WIDGET (applet));
+		gtk_widget_show (GTK_WIDGET (applet->tray_icon));
 	else
-		gtk_widget_hide (GTK_WIDGET (applet));
+		gtk_widget_hide (GTK_WIDGET (applet->tray_icon));
+#endif /* HAVE_STATUS_ICON */
 }
 
 
@@ -1283,7 +1300,7 @@ static void nma_menu_item_activate (GtkMenuItem *item, gpointer user_data)
 	if ((tag = g_object_get_data (G_OBJECT (item), "network")))
 		net = network_device_get_wireless_network_by_essid (dev, tag);
 
-	nma_dbus_set_device (applet->connection, dev, net ? wireless_network_get_essid (net) : NULL, NULL);
+	nma_dbus_set_device (applet->connection, dev, net ? wireless_network_get_essid (net) : NULL, FALSE, NULL);
 	network_device_unref (dev);
 
 	nmi_dbus_signal_user_interface_activated (applet->connection);
@@ -1758,20 +1775,18 @@ static void nma_menu_add_dialup_menu (GtkWidget *menu, NMApplet *applet)
 	{
 		GtkMenuItem *connect_item, *disconnect_item;
 		char *name = elt->data;
-		char *label;
+		const char *label;
 
 		/* FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item */
 
 		label = g_strdup_printf (_("Connect to %s..."), name);
 		connect_item = GTK_MENU_ITEM (gtk_menu_item_new_with_label (label));
-		g_free (label);
 		g_object_set_data (G_OBJECT (connect_item), "dialup", name);
 		g_signal_connect (G_OBJECT (connect_item), "activate", G_CALLBACK (nma_menu_dialup_connect_item_activate), applet);
 		gtk_menu_shell_append (GTK_MENU_SHELL (dialup_menu), GTK_WIDGET (connect_item));
 
 		label = g_strdup_printf (_("Disconnect from %s..."), name);
 		disconnect_item = GTK_MENU_ITEM (gtk_menu_item_new_with_label (label));
-		g_free (label);
 		g_object_set_data (G_OBJECT (disconnect_item), "dialup", name);
 		g_signal_connect (G_OBJECT (disconnect_item), "activate", G_CALLBACK (nma_menu_dialup_disconnect_item_activate), applet);
 		gtk_menu_shell_append (GTK_MENU_SHELL (dialup_menu), GTK_WIDGET (disconnect_item));
@@ -2028,9 +2043,11 @@ static void nma_dropdown_menu_show_cb (GtkWidget *menu, NMApplet *applet)
 	g_return_if_fail (menu != NULL);
 	g_return_if_fail (applet != NULL);
 
-	if (!applet->tooltips)
-		applet->tooltips = gtk_tooltips_new ();
+#ifdef HAVE_STATUS_ICON
+	gtk_status_icon_set_tooltip (applet->status_icon, NULL);
+#else
 	gtk_tooltips_set_tip (applet->tooltips, applet->event_box, NULL, NULL);
+#endif /* HAVE_STATUS_ICON */
 
 	if (applet->dropdown_menu && (menu == applet->dropdown_menu))
 	{
@@ -2234,28 +2251,68 @@ static GtkWidget *nma_context_menu_create (NMApplet *applet)
 }
 
 
+#ifdef HAVE_STATUS_ICON
+
 /*
- * nma_theme_change_cb
+ * nma_status_icon_screen_changed_cb:
  *
- * Destroy the popdown menu when the theme changes
+ * Handle screen change events for the status icon
  *
  */
-static void nma_theme_change_cb (NMApplet *applet)
+static void nma_status_icon_screen_changed_cb (GtkStatusIcon *icon, GParamSpec *pspec, NMApplet *applet)
 {
-	g_return_if_fail (applet != NULL);
+	nma_icons_init (applet);
+}
 
-	if (applet->dropdown_menu)
-		nma_dropdown_menu_clear (applet->dropdown_menu);
+/*
+ * nma_status_icon_size_changed_cb:
+ *
+ * Handle size change events for the status icon
+ *
+ */
+static gboolean nma_status_icon_size_changed_cb (GtkStatusIcon *icon, gint size, NMApplet *applet)
+{
+	nma_icons_free (applet);
 
-	if (applet->top_menu_item)
-	{
-		gtk_menu_item_remove_submenu (GTK_MENU_ITEM (applet->top_menu_item));
-		applet->dropdown_menu = nma_dropdown_menu_create (GTK_MENU_ITEM (applet->top_menu_item), applet);
-		g_signal_connect (applet->dropdown_menu, "deactivate", G_CALLBACK (nma_dropdown_menu_deactivate_cb), applet);
-	}
+	applet->size = size;
+	nma_icons_load_from_disk (applet);
+
+	nma_update_state (applet);
+
+	return TRUE;
+}
+
+/*
+ * nma_status_icon_activate_cb:
+ *
+ * Handle left clicks for the status icon
+ *
+ */
+static void nma_status_icon_activate_cb (GtkStatusIcon *icon, NMApplet *applet)
+{
+	gtk_menu_popup (GTK_MENU (applet->dropdown_menu), NULL, NULL,
+			gtk_status_icon_position_menu, icon,
+			1, gtk_get_current_event_time ());
+}
+
+static void nma_status_icon_popup_menu_cb (GtkStatusIcon *icon, guint button, guint32 activate_time, NMApplet *applet)
+{
+	nma_context_menu_update (applet);
+	gtk_menu_popup (GTK_MENU (applet->context_menu), NULL, NULL,
+			gtk_status_icon_position_menu, icon,
+			button, activate_time);
 }
 
 /*
+ * nma_status_icon_popup_menu_cb:
+ *
+ * Handle right clicks for the status icon
+ *
+ */
+
+#else /* !HAVE_STATUS_ICON */
+
+/*
  * nma_menu_position_func
  *
  * Position main dropdown menu, adapted from netapplet
@@ -2330,6 +2387,27 @@ static void nma_dropdown_menu_deactivate_cb (GtkWidget *menu, NMApplet *applet)
 	gtk_widget_set_state (applet->event_box, GTK_STATE_NORMAL);
 }
 
+/*
+ * nma_theme_change_cb
+ *
+ * Destroy the popdown menu when the theme changes
+ *
+ */
+static void nma_theme_change_cb (NMApplet *applet)
+{
+	g_return_if_fail (applet != NULL);
+
+	if (applet->dropdown_menu)
+		nma_dropdown_menu_clear (applet->dropdown_menu);
+
+	if (applet->top_menu_item)
+	{
+		gtk_menu_item_remove_submenu (GTK_MENU_ITEM (applet->top_menu_item));
+		applet->dropdown_menu = nma_dropdown_menu_create (GTK_MENU_ITEM (applet->top_menu_item), applet);
+		g_signal_connect (applet->dropdown_menu, "deactivate", G_CALLBACK (nma_dropdown_menu_deactivate_cb), applet);
+	}
+}
+#endif /* HAVE_STATUS_ICON */
 
 /*
  * nma_setup_widgets
@@ -2340,22 +2418,46 @@ static void nma_dropdown_menu_deactivate_cb (GtkWidget *menu, NMApplet *applet)
  */
 static void nma_setup_widgets (NMApplet *applet)
 {
+#ifdef HAVE_STATUS_ICON
+	applet->status_icon = gtk_status_icon_new ();
+
+	g_signal_connect (applet->status_icon, "notify::screen",
+			  G_CALLBACK (nma_status_icon_screen_changed_cb), applet);
+	g_signal_connect (applet->status_icon, "size-changed",
+			  G_CALLBACK (nma_status_icon_size_changed_cb), applet);
+	g_signal_connect (applet->status_icon, "activate",
+			  G_CALLBACK (nma_status_icon_activate_cb), applet);
+	g_signal_connect (applet->status_icon, "popup-menu",
+			  G_CALLBACK (nma_status_icon_popup_menu_cb), applet);
+
+	gtk_status_icon_set_visible (applet->status_icon, TRUE);
+#else
+	applet->tray_icon = egg_tray_icon_new ("NetworkManager");
+	g_object_ref (applet->tray_icon);
+	gtk_object_sink (GTK_OBJECT (applet->tray_icon));
+
 	/* Event box is the main applet widget */
 	applet->event_box = gtk_event_box_new ();
 	gtk_container_set_border_width (GTK_CONTAINER (applet->event_box), 0);
+	g_signal_connect (applet->event_box, "button_press_event", G_CALLBACK (nma_toplevel_menu_button_press_cb), applet);
+
+	applet->pixmap = gtk_image_new ();
+	gtk_container_add (GTK_CONTAINER (applet->event_box), applet->pixmap);
+	gtk_container_add (GTK_CONTAINER (applet->tray_icon), applet->event_box);
+ 	gtk_widget_show_all (GTK_WIDGET (applet->tray_icon));
+
+	gtk_widget_show_all (GTK_WIDGET (applet->tray_icon));
+
+#endif /* HAVE_STATUS_ICON */
 
 	applet->top_menu_item = gtk_menu_item_new();
 	gtk_widget_set_name (applet->top_menu_item, "ToplevelMenu");
 	gtk_container_set_border_width (GTK_CONTAINER (applet->top_menu_item), 0);
 
-	applet->pixmap = gtk_image_new ();
-	gtk_container_add (GTK_CONTAINER (applet->event_box), applet->pixmap);
-	gtk_container_add (GTK_CONTAINER (applet), applet->event_box);
- 	gtk_widget_show_all (GTK_WIDGET (applet));
- 
 	applet->dropdown_menu = nma_dropdown_menu_create (GTK_MENU_ITEM (applet->top_menu_item), applet);
-	g_signal_connect (applet->event_box, "button_press_event", G_CALLBACK (nma_toplevel_menu_button_press_cb), applet);
+#ifndef HAVE_STATUS_ICON
 	g_signal_connect (applet->dropdown_menu, "deactivate", G_CALLBACK (nma_dropdown_menu_deactivate_cb), applet);
+#endif /* !HAVE_STATUS_ICON */
 
 	applet->context_menu = nma_context_menu_create (applet);
 	applet->encryption_size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
@@ -2461,13 +2563,15 @@ static void nma_gconf_vpn_connections_notify_callback (GConfClient *client, guin
 
 
 /*
- * nma_destroy
+ * nma_finalize
  *
  * Destroy the applet and clean up its data
  *
  */
-static void G_GNUC_NORETURN nma_destroy (NMApplet *applet)
+static void nma_finalize (GObject *object)
 {
+	NMApplet *applet = NM_APPLET (object);
+
 	if (applet->dropdown_menu)
 		nma_dropdown_menu_clear (applet->dropdown_menu);
 	if (applet->top_menu_item)
@@ -2490,60 +2594,53 @@ static void G_GNUC_NORETURN nma_destroy (NMApplet *applet)
 		applet->connection_timeout_id = 0;
 	}
 
-	if (applet->gconf_client)
-		g_object_unref (G_OBJECT (applet->gconf_client));
-
 	nma_free_data_model (applet);
 
 	g_free (applet->glade_file);
 
 	gconf_client_notify_remove (applet->gconf_client, applet->gconf_prefs_notify_id);
 	gconf_client_notify_remove (applet->gconf_client, applet->gconf_vpn_notify_id);
-	g_object_unref (G_OBJECT (applet->gconf_client));
+	g_object_unref (applet->gconf_client);
 
 	dbus_method_dispatcher_unref (applet->nmi_methods);
 
-	exit (EXIT_SUCCESS);
+#ifdef HAVE_STATUS_ICON
+	g_object_unref (applet->status_icon);
+#else
+	gtk_widget_destroy (GTK_WIDGET (applet->tray_icon));
+	g_object_unref (applet->tray_icon);
+#endif /* HAVE_STATUS_ICON */
+
+	G_OBJECT_CLASS (nma_parent_class)->finalize (object);
 }
 
 
-/*
- * nma_get_instance
- *
- * Create the initial instance of our wireless applet
- *
- */
-static GtkWidget * nma_get_instance (NMApplet *applet)
+static GObject *nma_constructor (GType type, guint n_props, GObjectConstructParam *construct_props)
 {
-	gtk_widget_hide (GTK_WIDGET (applet));
+	GObject *obj;
+	NMApplet *applet;
 
-	applet->nm_running = FALSE;
-	applet->device_list = NULL;
-	applet->vpn_connections = NULL;
-	applet->dialup_list = NULL;
-	applet->nm_state = NM_STATE_DISCONNECTED;
-	applet->tooltips = NULL;
-	applet->passphrase_dialog = NULL;
-	applet->connection_timeout_id = 0;
-	applet->redraw_timeout_id = 0;
-#ifdef ENABLE_NOTIFY
-	applet->notification = NULL;
+	obj = G_OBJECT_CLASS (nma_parent_class)->constructor (type, n_props, construct_props);
+	applet =  NM_APPLET (obj);
+
+#ifndef HAVE_STATUS_ICON
+	applet->tooltips = gtk_tooltips_new ();
 #endif
 
+	glade_gnome_init ();
+
 	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))
 	{
 		nma_schedule_warning_dialog (applet, _("The NetworkManager Applet could not find some required resources (the glade file was not found)."));
 		g_free (applet->glade_file);
 		applet->glade_file = NULL;
-		return NULL;
+		return NULL; // FIXMEchpe
 	}
 
 	applet->info_dialog_xml = glade_xml_new (applet->glade_file, "info_dialog", NULL);
 
 	applet->gconf_client = gconf_client_get_default ();
-	if (!applet->gconf_client)
-		return NULL;
 
 	gconf_client_add_dir (applet->gconf_client, GCONF_PATH_WIRELESS, GCONF_CLIENT_PRELOAD_NONE, NULL);
 	applet->gconf_prefs_notify_id = gconf_client_notify_add (applet->gconf_client, GCONF_PATH_WIRELESS,
@@ -2559,20 +2656,24 @@ static GtkWidget * nma_get_instance (NMApplet *applet)
 	 */
 	nma_compat_convert_oldformat_entries (applet->gconf_client);
 
+	/* Load pixmaps and create applet widgets */
+	nma_setup_widgets (applet);
+
+	nma_icons_init (applet);
+
 	/* D-Bus init stuff */
-	dbus_g_thread_init ();
 	applet->nmi_methods = nmi_dbus_nmi_methods_setup ();
 	nma_dbus_init_helper (applet);
 	if (!applet->connection)
 		nma_start_dbus_connection_watch (applet);
 
-	/* Load pixmaps and create applet widgets */
-	nma_setup_widgets (applet);
+#ifndef HAVE_STATUS_ICON
+	g_signal_connect (applet->tray_icon, "style-set", G_CALLBACK (nma_theme_change_cb), NULL);
 
-	g_signal_connect (applet, "destroy", G_CALLBACK (nma_destroy), NULL);
-	g_signal_connect (applet, "style-set", G_CALLBACK (nma_theme_change_cb), NULL);
+	nma_icons_load_from_disk (applet);
+#endif /* !HAVE_STATUS_ICON */
 
-	return GTK_WIDGET (applet);
+	return obj;
 }
 
 
@@ -2580,27 +2681,43 @@ static void nma_icons_free (NMApplet *applet)
 {
 	int i;
 
-	g_object_unref (applet->no_connection_icon);
-	g_object_unref (applet->wired_icon);
-	g_object_unref (applet->adhoc_icon);
-	g_object_unref (applet->vpn_lock_icon);
+	if (!applet->icons_loaded)
+		return;
 
-	g_object_unref (applet->wireless_00_icon);
-	g_object_unref (applet->wireless_25_icon);
-	g_object_unref (applet->wireless_50_icon);
-	g_object_unref (applet->wireless_75_icon);
-	g_object_unref (applet->wireless_100_icon);
+	if (applet->no_connection_icon)
+		g_object_unref (applet->no_connection_icon);
+	if (applet->wired_icon)
+		g_object_unref (applet->wired_icon);
+	if (applet->adhoc_icon)
+		g_object_unref (applet->adhoc_icon);
+	if (applet->vpn_lock_icon)
+		g_object_unref (applet->vpn_lock_icon);
+
+	if (applet->wireless_00_icon)
+		g_object_unref (applet->wireless_00_icon);
+	if (applet->wireless_25_icon)
+		g_object_unref (applet->wireless_25_icon);
+	if (applet->wireless_50_icon)
+		g_object_unref (applet->wireless_50_icon);
+	if (applet->wireless_75_icon)
+		g_object_unref (applet->wireless_75_icon);
+	if (applet->wireless_100_icon)
+		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]);
+			if (applet->network_connecting_icons[i][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]);
+		if (applet->vpn_connecting_icons[i])
+			g_object_unref (applet->vpn_connecting_icons[i]);
+
+	nma_icons_zero (applet);
 }
 
 static void nma_icons_zero (NMApplet *applet)
@@ -2629,12 +2746,13 @@ static void nma_icons_zero (NMApplet *applet)
 	for (i = 0; i < NUM_VPN_CONNECTING_FRAMES; i++)
 		applet->vpn_connecting_icons[i] = NULL;
 
+	applet->icons_loaded = FALSE;
 }
 
 #define ICON_LOAD(x, y)	\
 	{		\
 		GError *err = NULL; \
-		x = gtk_icon_theme_load_icon (icon_theme, y, 22, 0, &err); \
+		x = gtk_icon_theme_load_icon (applet->icon_theme, y, size, 0, &err); \
 		if (x == NULL) { \
 			success = FALSE; \
 			g_warning ("Icon %s missing: %s", y, err->message); \
@@ -2644,16 +2762,25 @@ static void nma_icons_zero (NMApplet *applet)
 	}
 
 static gboolean
-nma_icons_load_from_disk (NMApplet *applet, GtkIconTheme *icon_theme)
+nma_icons_load_from_disk (NMApplet *applet)
 {
-	int		i;
+	int 		size, i;
 	gboolean	success;
 
 	/*
 	 * 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);
+
+	g_return_val_if_fail (!applet->icons_loaded, FALSE);
+
+#ifdef HAVE_STATUS_ICON
+	size = applet->size;
+	if (size < 0)
+		return FALSE;
+#else
+	size = 22; /* hard-coded */
+#endif /* HAVE_STATUS_ICON */
 
 	ICON_LOAD(applet->no_connection_icon, "nm-no-connection");
 	ICON_LOAD(applet->wired_icon, "nm-device-wired");
@@ -2705,41 +2832,65 @@ out:
 static void nma_icon_theme_changed (GtkIconTheme *icon_theme, NMApplet *applet)
 {
 	nma_icons_free (applet);
-	nma_icons_load_from_disk (applet, icon_theme);
-	/* FIXME: force redraw */
-}
+	nma_icons_load_from_disk (applet);
+	nma_update_state (applet);
+}
+
+static void nma_icons_init (NMApplet *applet)
+{
+	const char style[] =
+		"style \"MenuBar\"\n"
+		"{\n"
+			"GtkMenuBar::shadow_type = GTK_SHADOW_NONE\n"
+			"GtkMenuBar::internal-padding = 0\n"
+		"}\n"
+		"style \"MenuItem\"\n"
+		"{\n"
+			"xthickness=0\n"
+			"ythickness=0\n"
+		"}\n"
+		"class \"GtkMenuBar\" style \"MenuBar\"\n"
+		"widget \"*ToplevelMenu*\" style \"MenuItem\"\n";
+	GdkScreen *screen;
+	gboolean path_appended;
 
-static gboolean nma_icons_init (NMApplet *applet)
-{
-	GtkIconTheme *icon_theme;
-	const gchar *style = " \
-		style \"MenuBar\" \
-		{ \
-			GtkMenuBar::shadow_type = GTK_SHADOW_NONE \
-			GtkMenuBar::internal-padding = 0 \
-		} \
-		style \"MenuItem\" \
-		{ \
-			xthickness=0 \
-			ythickness=0 \
-		} \
-		class \"GtkMenuBar\" style \"MenuBar\"\
-		widget \"*ToplevelMenu*\" style \"MenuItem\"\
-		";	
+	if (applet->icon_theme)
+	{
+		g_signal_handlers_disconnect_by_func (applet->icon_theme,
+						      G_CALLBACK (nma_icon_theme_changed),
+						      applet);
+	}
+
+#ifdef HAVE_STATUS_ICON
+#if GTK_CHECK_VERSION(2, 11, 0)
+	screen = gtk_status_icon_get_screen (applet->status_icon);
+#else
+	screen = gdk_screen_get_default ();
+#endif /* gtk 2.11.0 */
+#else /* !HAVE_STATUS_ICON */
+	screen = gtk_widget_get_screen (GTK_WIDGET (applet->tray_icon));
+#endif /* HAVE_STATUS_ICON */
+	
+	applet->icon_theme = gtk_icon_theme_get_for_screen (screen);
+
+	/* If not done yet, append our search path */
+	path_appended = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (applet->icon_theme),
+					 		    "NMAIconPathAppended"));
+	if (path_appended == FALSE)
+	{
+		gtk_icon_theme_append_search_path (applet->icon_theme, ICONDIR);
+		g_object_set_data (G_OBJECT (applet->icon_theme),
+				   "NMAIconPathAppended",
+				   GINT_TO_POINTER (TRUE));
+	}
+
+	g_signal_connect (applet->icon_theme, "changed", G_CALLBACK (nma_icon_theme_changed), applet);
 
 	/* FIXME: Do we need to worry about other screens? */
 	gtk_rc_parse_string (style);
-
-	icon_theme = gtk_icon_theme_get_default ();
-	if (!nma_icons_load_from_disk (applet, icon_theme))
-		return FALSE;
-	g_signal_connect (icon_theme, "changed", G_CALLBACK (nma_icon_theme_changed), applet);
-	return TRUE;
 }
 
-
 NMApplet *nma_new ()
 {
-	return g_object_new (NM_TYPE_APPLET, "title", "NetworkManager", NULL);
+	return g_object_new (NM_TYPE_APPLET, NULL);
 }
-
diff --git a/src/applet.glade b/src/applet.glade
index 65ee164f..57ec2188 100644
--- a/src/applet.glade
+++ b/src/applet.glade
@@ -426,7 +426,7 @@ You have chosen to log in to the wireless network '%s'.  If you are sure that th
 	      <child>
 		<widget class="GtkTable" id="table1">
 		  <property name="visible">True</property>
-		  <property name="n_rows">4</property>
+		  <property name="n_rows">5</property>
 		  <property name="n_columns">2</property>
 		  <property name="homogeneous">False</property>
 		  <property name="row_spacing">6</property>
@@ -548,8 +548,8 @@ You have chosen to log in to the wireless network '%s'.  If you are sure that th
 		    <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>
@@ -569,8 +569,8 @@ WEP 64/128-bit ASCII
 		    <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="x_options">fill</property>
 		      <property name="y_options">fill</property>
 		    </packing>
@@ -589,9 +589,31 @@ WEP 64/128-bit ASCII
 		    <packing>
 		      <property name="left_attach">0</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="x_options">fill</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkCheckButton" id="fallback_button">
+		      <property name="visible">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="label" translatable="yes">_Fallback on this Network</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">2</property>
+		      <property name="bottom_attach">3</property>
 		      <property name="x_options">fill</property>
+		      <property name="y_options"></property>
 		    </packing>
 		  </child>
 		</widget>
diff --git a/src/applet.h b/src/applet.h
index 6397aab1..96791baf 100644
--- a/src/applet.h
+++ b/src/applet.h
@@ -31,9 +31,16 @@
 #include <glade/glade.h>
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib.h>
-#include "eggtrayicon.h"
 #include <net/ethernet.h>
 
+#ifdef GDK_WINDOWING_X11
+#include <gdk/gdkx.h>
+#endif
+
+#ifndef HAVE_STATUS_ICON
+#include "eggtrayicon.h"
+#endif
+
 #include "nm-device.h"
 #include "wireless-network.h"
 #include "dbus-method-dispatcher.h"
@@ -63,7 +70,7 @@ typedef struct VPNConnection VPNConnection;
 
 typedef struct
 {
-	EggTrayIconClass	parent_class;
+	GObjectClass	parent_class;
 } NMAppletClass; 
 
 /*
@@ -72,7 +79,7 @@ typedef struct
  */
 typedef struct
 {
-	EggTrayIcon		parent;
+	GObject                 parent_instance;
 
 	DBusConnection *	connection;
 	DBusMethodDispatcher *	nmi_methods;
@@ -87,12 +94,14 @@ typedef struct
 	gboolean			is_adhoc;
 	gboolean			wireless_enabled;
 	gboolean			nm_running;
+	gboolean			icons_loaded;
 
 	NMState			nm_state;
 	GSList *			device_list;
 	GSList *			dialup_list;
 	GSList *			vpn_connections;
 
+	GtkIconTheme *          icon_theme;
 	GdkPixbuf *		no_connection_icon;
 	GdkPixbuf *		wired_icon;
 	GdkPixbuf *		adhoc_icon;
@@ -113,13 +122,20 @@ typedef struct
 	guint			animation_id;
 
 	/* Direct UI elements */
+#ifdef HAVE_STATUS_ICON
+	GtkStatusIcon *		status_icon;
+	int			size;
+#else
+	EggTrayIcon *		tray_icon;
 	GtkWidget *		pixmap;
+	GtkWidget *		event_box;
+	GtkTooltips *		tooltips;
+#endif /* HAVE_STATUS_ICON */
+
 	GtkWidget *		top_menu_item;
 	GtkWidget *		dropdown_menu;
 	GtkWidget *		vpn_menu;
-	GtkWidget *		event_box;
 	GtkSizeGroup *		encryption_size_group;
-	GtkTooltips *		tooltips;
 
 	GtkWidget *		context_menu;
 	GtkWidget *		enable_networking_item;
@@ -135,13 +151,13 @@ typedef struct
 
 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/src/main.c b/src/main.c
index b94e7c38..fbd3a2d2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -44,10 +44,11 @@ int main (int argc, char *argv[])
 {
 	NMApplet *	nma;
 	GnomeClient *	client;
+	GnomeProgram *	program;
 
-	gnome_program_init ("nm-applet", VERSION, LIBGNOMEUI_MODULE,
-			    argc, argv, 
-			    GNOME_PARAM_NONE, GNOME_PARAM_NONE);
+	program = gnome_program_init ("nm-applet", VERSION, LIBGNOMEUI_MODULE,
+				      argc, argv, 
+				      GNOME_PARAM_NONE, GNOME_PARAM_NONE);
 
     	client = gnome_master_client ();
     	gnome_client_set_restart_style (client, GNOME_RESTART_ANYWAY);
@@ -57,14 +58,14 @@ int main (int argc, char *argv[])
 	textdomain (GETTEXT_PACKAGE);
 
 	nma = nma_new ();
-	if (!nma)
-		exit (EXIT_FAILURE);
 
-    	g_signal_connect (client, "save_yourself", G_CALLBACK (gtk_true), NULL);
-    	g_signal_connect (client, "die", G_CALLBACK (session_die), nma);	
+	g_signal_connect (client, "save_yourself", G_CALLBACK (gtk_true), NULL);
+	g_signal_connect (client, "die", G_CALLBACK (session_die), nma);	
 
-	gtk_widget_show_all (GTK_WIDGET (nma));
 	gtk_main ();
 
-	return 0;
+	g_object_unref (nma);
+	g_object_unref (program);
+
+	exit (EXIT_SUCCESS);
 }
diff --git a/src/menu-items.c b/src/menu-items.c
index dbe2cfc5..b8fa19b3 100644
--- a/src/menu-items.c
+++ b/src/menu-items.c
@@ -91,7 +91,6 @@ void wired_menu_item_update (NMWiredMenuItem *item, NetworkDevice *dev, const gi
 		text = g_strdup (_("_Wired Network"));
 
 	gtk_label_set_text_with_mnemonic (GTK_LABEL (item->label), text);
-	g_free (text);
 
 	/* Only dim the item if the device supports carrier detection AND
 	 * we know it doesn't have a link.
diff --git a/src/nm-device.c b/src/nm-device.c
index e23b60fa..b2d5ac63 100644
--- a/src/nm-device.c
+++ b/src/nm-device.c
@@ -164,8 +164,6 @@ void network_device_unref (NetworkDevice *dev)
 		g_free (dev->broadcast);
 		g_free (dev->netmask);
 		g_free (dev->ip4addr);
-		g_free (dev->primary_dns);
-		g_free (dev->secondary_dns);
 		memset (dev, 0, sizeof (NetworkDevice));
 		g_free (dev);
 	}
diff --git a/src/other-network-dialog.c b/src/other-network-dialog.c
index 4669cf16..01f6e6d9 100644
--- a/src/other-network-dialog.c
+++ b/src/other-network-dialog.c
@@ -410,19 +410,24 @@ static void nma_ond_response_cb (GtkDialog *dialog, gint response, gpointer data
 			WirelessSecurityOption *	opt;
 			GtkComboBox *			security_combo;
 			GtkTreeIter			iter;
+			GtkWidget *			fallback_button;
 			char *				str;
 			NetworkDevice *		dev;
+			gboolean				fallback;
 
 			gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo), &iter);
 			gtk_tree_model_get (model, &iter, NAME_COLUMN, &str, DEV_COLUMN, &dev, -1);
 
+			fallback_button = glade_xml_get_widget (xml, "fallback_button");
+			fallback = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (fallback_button));
+
 			security_combo = GTK_COMBO_BOX (glade_xml_get_widget (xml, "security_combo"));
 			opt = wsm_get_option_for_active (wsm, security_combo);
 
 			if (create_network)
 				nma_dbus_create_network (applet->connection, dev, essid, opt);
 			else
-				nma_dbus_set_device (applet->connection, dev, essid, opt);
+				nma_dbus_set_device (applet->connection, dev, essid, fallback, opt);
 		}
 	}
 
diff --git a/src/passphrase-dialog.c b/src/passphrase-dialog.c
index 562a8c15..2d05ec1d 100644
--- a/src/passphrase-dialog.c
+++ b/src/passphrase-dialog.c
@@ -86,7 +86,6 @@ static void nmi_passphrase_dialog_security_combo_changed (GtkWidget *security_co
 	GtkWidget *	wso_widget;
 	GladeXML *	xml;
 	GtkWidget *	vbox;
-	GList *		children;
 	GList *		elt;
 
 	g_return_if_fail (dialog != NULL);
@@ -99,8 +98,7 @@ static void nmi_passphrase_dialog_security_combo_changed (GtkWidget *security_co
 	vbox = GTK_WIDGET (glade_xml_get_widget (xml, "wireless_security_vbox"));
 
 	/* Remove any previous wireless security widgets */
-	children = gtk_container_get_children (GTK_CONTAINER (vbox));
-	for (elt = children; elt; elt = g_list_next (elt))
+	for (elt = gtk_container_get_children (GTK_CONTAINER (vbox)); elt; elt = g_list_next (elt))
 	{
 		GtkWidget * child = GTK_WIDGET (elt->data);
 
@@ -108,8 +106,6 @@ static void nmi_passphrase_dialog_security_combo_changed (GtkWidget *security_co
 			gtk_container_remove (GTK_CONTAINER (vbox), child);
 	}
 
-	g_list_free (children);
-
 	/* Determine and add the correct wireless security widget to the dialog */
 	wso_widget = wsm_get_widget_for_active (wsm, GTK_COMBO_BOX (security_combo), GTK_SIGNAL_FUNC (update_button_cb), dialog);
 	if (wso_widget)
diff --git a/src/vpn-password-dialog.c b/src/vpn-password-dialog.c
index 538c5128..a379ef1c 100644
--- a/src/vpn-password-dialog.c
+++ b/src/vpn-password-dialog.c
@@ -53,7 +53,7 @@ child_finished_cb (GPid pid, gint status, gpointer userdata)
 static gboolean 
 child_stdout_data_cb (GIOChannel *source, GIOCondition condition, gpointer userdata)
 {
-	char *str = NULL;
+	char *str;
 	IOUserData *io_user_data = (IOUserData *) userdata;
 	GSList **passwords = (GSList **) io_user_data->passwords;
 
@@ -77,13 +77,10 @@ child_stdout_data_cb (GIOChannel *source, GIOCondition condition, gpointer userd
 			/* remove terminating newline */
 			str[len - 1] = '\0';
 			*passwords = g_slist_append (*passwords, str);
-			str = NULL;
 		}
 	}
 
 out:
-	g_free (str);
-
 	return TRUE;
 }
 
diff --git a/src/wireless-security-manager.c b/src/wireless-security-manager.c
index 80ea0b7f..a5f842be 100644
--- a/src/wireless-security-manager.c
+++ b/src/wireless-security-manager.c
@@ -162,13 +162,14 @@ static WirelessSecurityOption * get_active_option_from_combo (GtkComboBox *combo
 	WirelessSecurityOption * opt = NULL;
 	GtkTreeIter			iter;
 	GtkTreeModel *			model;
+	char *				str;
 
 	g_return_val_if_fail (combo != NULL, NULL);
 
 	model = gtk_combo_box_get_model (combo);
 	g_assert (model);
 	if (gtk_combo_box_get_active_iter (combo, &iter))
-		gtk_tree_model_get (model, &iter, OPT_COLUMN, &opt, -1);
+		gtk_tree_model_get (model, &iter, NAME_COLUMN, &str, OPT_COLUMN, &opt, -1);
 
 	return opt;
 }
@@ -214,7 +215,6 @@ void wsm_free (WirelessSecurityManager *wsm)
 {
 	g_return_if_fail (wsm != NULL);
 
-	g_free (wsm->glade_file);
 	g_slist_foreach (wsm->options, (GFunc) wso_free, NULL);
 	g_slist_free (wsm->options);
 	memset (wsm, 0, sizeof (WirelessSecurityManager));
diff --git a/src/wireless-security-option.c b/src/wireless-security-option.c
index bf722b96..3383b640 100644
--- a/src/wireless-security-option.c
+++ b/src/wireless-security-option.c
@@ -170,13 +170,14 @@ int wso_wep_auth_combo_get_auth_alg (WirelessSecurityOption *opt, GtkComboBox *
 	GtkTreeIter	iter;
 	GtkTreeModel *	model;
 	int			auth_alg;
+	char *		str;
 
 	g_return_val_if_fail (opt != NULL, -1);
 	g_return_val_if_fail (combo != NULL, -1);
 
 	model = gtk_combo_box_get_model (combo);
 	gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo), &iter);
-	gtk_tree_model_get (model, &iter, AUTH_ALG_COLUMN, &auth_alg, -1);
+	gtk_tree_model_get (model, &iter, NAME_COLUMN, &str, AUTH_ALG_COLUMN, &auth_alg, -1);
 	return auth_alg;
 }