File nm-vpnc-0.6-branch.patch of Package NetworkManager-vpnc

Overview Repositories Revisions Requests Users Attributes Meta

File nm-vpnc-0.6-branch.patch of Package NetworkManager-vpnc (Revision e29c4479a16babf7c7b0a5646370f130)

Currently displaying revision e29c4479a16babf7c7b0a5646370f130 , Show latest

diff -urN NetworkManager-vpnc-0.5.0cvs20060202/auth-dialog/main.c NetworkManager-vpnc-CVS/auth-dialog/main.c
--- NetworkManager-vpnc-0.5.0cvs20060202/auth-dialog/main.c	2005-06-23 22:47:07.000000000 +0300
+++ NetworkManager-vpnc-CVS/auth-dialog/main.c	2006-04-10 23:34:24.000000000 +0300
@@ -261,7 +261,7 @@
 
 	gnome_program_init ("nm-vpnc-auth-dialog", VERSION, LIBGNOMEUI_MODULE,
 			 argc, argv, 
-			 GNOME_PARAM_NONE);
+			 GNOME_PARAM_NONE, GNOME_PARAM_NONE);
 	 
 	passwords = get_passwords (vpn_name, vpn_service, retry);
 	if (passwords == NULL)
diff -urN NetworkManager-vpnc-0.5.0cvs20060202/auth-dialog/Makefile.am NetworkManager-vpnc-CVS/auth-dialog/Makefile.am
--- NetworkManager-vpnc-0.5.0cvs20060202/auth-dialog/Makefile.am	2005-06-12 17:34:53.000000000 +0300
+++ NetworkManager-vpnc-CVS/auth-dialog/Makefile.am	2006-09-27 18:10:31.000000000 +0300
@@ -14,8 +14,8 @@
 	-DG_DISABLE_DEPRECATED			\
 	-DGDK_DISABLE_DEPRECATED		\
 	-DGNOME_DISABLE_DEPRECATED		\
-	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
-	-DVERSION=\"$(VERSION)\"			\
+	-DGNOMELOCALEDIR=\"$(datadir)/locale\"	\
+	-DVERSION=\"$(VERSION)\"		\
 	$(NULL)
 
 nm_vpnc_auth_dialog_SOURCES =			\
diff -urN NetworkManager-vpnc-0.5.0cvs20060202/auth-dialog/Makefile.in NetworkManager-vpnc-CVS/auth-dialog/Makefile.in
--- NetworkManager-vpnc-0.5.0cvs20060202/auth-dialog/Makefile.in	2006-02-02 23:48:08.000000000 +0200
+++ NetworkManager-vpnc-CVS/auth-dialog/Makefile.in	2006-11-02 10:56:16.000000000 +0200
@@ -111,8 +111,6 @@
 FFLAGS = @FFLAGS@
 GCONF_CFLAGS = @GCONF_CFLAGS@
 GCONF_LIBS = @GCONF_LIBS@
-GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@
-GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GLADE_CFLAGS = @GLADE_CFLAGS@
 GLADE_LIBS = @GLADE_LIBS@
@@ -252,8 +250,8 @@
 	-DG_DISABLE_DEPRECATED			\
 	-DGDK_DISABLE_DEPRECATED		\
 	-DGNOME_DISABLE_DEPRECATED		\
-	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
-	-DVERSION=\"$(VERSION)\"			\
+	-DGNOMELOCALEDIR=\"$(datadir)/locale\"	\
+	-DVERSION=\"$(VERSION)\"		\
 	$(NULL)
 
 nm_vpnc_auth_dialog_SOURCES = \
diff -urN NetworkManager-vpnc-0.5.0cvs20060202/ChangeLog NetworkManager-vpnc-CVS/ChangeLog
--- NetworkManager-vpnc-0.5.0cvs20060202/ChangeLog	2006-01-23 21:02:25.000000000 +0200
+++ NetworkManager-vpnc-CVS/ChangeLog	2006-11-01 18:33:28.000000000 +0200
@@ -1,3 +1,59 @@
+2006-11-01 Tambet Ingo <tambet@ximian.com>
+
+	* properties/nm-vpnc.c (import_from_file): Rewrite using pcf-file
+	parser instead of GKeyFile, which has slightly different syntax.
+
+	* properties/pcf-file.h: Implement.
+
+	* properties/pcf-file.c: Implement.
+
+	* properties/Makefile.am: Add pcf-file.[ch] to build.
+
+	* src/nm-vpnc-service.c (nm_vpnc_dbus_handle_start_vpn): Return
+	dbus message reply instead of emitting signals on errors.
+	(nm_vpnc_dbus_start_vpn): Get the reply from VPN start instead of
+	creating a blank one.
+
+2006-09-27 Robert Love <rml@novell.com>
+
+	Patch by Tambet Ingo <tambet@ximian.com>:
+	* configure.in, auth-dialog/main.c, properties/Makefile.am,
+	 properties/nm-pptp.c, src/Makefile.am,
+	 src/nm-vpnc-service-helper.c, src/nm-vpnc-service.c:
+	 Make VPN module compilation more robust, even if NetworkManager is
+	 installed into non-standard prefix.
+
+2006-07-13 Robert Love <rml@novell.com>
+
+	* configure.in: Bump version to 0.6.4 to match NM release.
+
+2006-07-11 Robert Love <rml@novell.com>
+
+	* src/src/nm-vpnc-service.c: Backport rekeying improvements from HEAD.
+
+2006-05-15 Dan Williams <dcbw@redhat.com>
+
+	* configure.in: bump version to 0.6.2 for release
+
+2006-04-10 Robert Love <rml@novell.com>
+
+	* properties/nm-vpnc.c: Report error if writing out of exported
+	 configuration fails. The silent treatment might work for me and my
+	 wife, but not for failed I/O.
+
+2006-03-29 Robert Love <rml@novell.com>
+
+	* src/nm-vpnc-service.c: New eigth argument to DBUS VPN method, the
+	 per-route MSS. Cisco does not care about the MSS, so we send zero.
+
+2006-03-20 Dan Williams <dcbw@redhat.com>
+
+	* configure.in: Bump release to 0.6
+
+2006-03-08 Christopher Aillon <caillon@redhat.com>
+
+	* nm-vpnc.desktop.in: Use NoDisplay=true (fixes 333854)
+
 2006-01-23 Robert Love <rml@novell.com>
 
 	* properties/nm-vpnc-dialog.glade: Add (back) 'Optional Information'
diff -urN NetworkManager-vpnc-0.5.0cvs20060202/configure NetworkManager-vpnc-CVS/configure
--- NetworkManager-vpnc-0.5.0cvs20060202/configure	2006-02-02 23:48:04.000000000 +0200
+++ NetworkManager-vpnc-CVS/configure	2006-11-02 10:56:13.000000000 +0200
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for NetworkManager-vpnc 0.5.0cvs20060202.
+# Generated by GNU Autoconf 2.59 for NetworkManager-vpnc 0.6.4.
 #
 # Report bugs to <dcbw@redhat.com>.
 #
@@ -423,8 +423,8 @@
 # Identity of this package.
 PACKAGE_NAME='NetworkManager-vpnc'
 PACKAGE_TARNAME='NetworkManager-vpnc'
-PACKAGE_VERSION='0.5.0cvs20060202'
-PACKAGE_STRING='NetworkManager-vpnc 0.5.0cvs20060202'
+PACKAGE_VERSION='0.6.4'
+PACKAGE_STRING='NetworkManager-vpnc 0.6.4'
 PACKAGE_BUGREPORT='dcbw@redhat.com'
 
 # Factoring default headers for most tests.
@@ -464,7 +464,7 @@
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS ALL_LINGUAS GETTEXT_PACKAGE INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB PKG_CONFIG ac_pt_PKG_CONFIG GTHREAD_CFLAGS GTHREAD_LIBS DBUS_CFLAGS DBUS_LIBS NETWORK_MANAGER_CFLAGS NETWORK_MANAGER_LIBS GTK_CFLAGS GTK_LIBS GDK_PIXBUF_CFLAGS GDK_PIXBUF_LIBS GLADE_CFLAGS GLADE_LIBS LIBGNOMEUI_CFLAGS LIBGNOMEUI_LIBS GCONF_CFLAGS GCONF_LIBS GNOMEKEYRING_CFLAGS GNOMEKEYRING_LIBS LOCALSTATEDIR SYSCONFDIR DATADIR BINDIR SBINDIR LIBDIR LIBEXECDIR LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS ALL_LINGUAS GETTEXT_PACKAGE INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB PKG_CONFIG ac_pt_PKG_CONFIG GTHREAD_CFLAGS GTHREAD_LIBS DBUS_CFLAGS DBUS_LIBS NETWORK_MANAGER_CFLAGS NETWORK_MANAGER_LIBS GTK_CFLAGS GTK_LIBS GLADE_CFLAGS GLADE_LIBS LIBGNOMEUI_CFLAGS LIBGNOMEUI_LIBS GCONF_CFLAGS GCONF_LIBS GNOMEKEYRING_CFLAGS GNOMEKEYRING_LIBS LOCALSTATEDIR SYSCONFDIR DATADIR BINDIR SBINDIR LIBDIR LIBEXECDIR LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -981,14 +981,6 @@
 ac_env_GTK_LIBS_value=$GTK_LIBS
 ac_cv_env_GTK_LIBS_set=${GTK_LIBS+set}
 ac_cv_env_GTK_LIBS_value=$GTK_LIBS
-ac_env_GDK_PIXBUF_CFLAGS_set=${GDK_PIXBUF_CFLAGS+set}
-ac_env_GDK_PIXBUF_CFLAGS_value=$GDK_PIXBUF_CFLAGS
-ac_cv_env_GDK_PIXBUF_CFLAGS_set=${GDK_PIXBUF_CFLAGS+set}
-ac_cv_env_GDK_PIXBUF_CFLAGS_value=$GDK_PIXBUF_CFLAGS
-ac_env_GDK_PIXBUF_LIBS_set=${GDK_PIXBUF_LIBS+set}
-ac_env_GDK_PIXBUF_LIBS_value=$GDK_PIXBUF_LIBS
-ac_cv_env_GDK_PIXBUF_LIBS_set=${GDK_PIXBUF_LIBS+set}
-ac_cv_env_GDK_PIXBUF_LIBS_value=$GDK_PIXBUF_LIBS
 ac_env_GLADE_CFLAGS_set=${GLADE_CFLAGS+set}
 ac_env_GLADE_CFLAGS_value=$GLADE_CFLAGS
 ac_cv_env_GLADE_CFLAGS_set=${GLADE_CFLAGS+set}
@@ -1029,7 +1021,7 @@
 # Omit some internal or obsolete options to make the list less imposing.
 # This message is too long to be a string in the A/UX 3.1 sh.
 cat <<_ACEOF
-\`configure' configures NetworkManager-vpnc 0.5.0cvs20060202 to adapt to many kinds of systems.
+\`configure' configures NetworkManager-vpnc 0.6.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1095,7 +1087,7 @@
 
 if test -n "$ac_init_help"; then
 case $ac_init_help in
- short | recursive ) echo "Configuration of NetworkManager-vpnc 0.5.0cvs20060202:";;
+ short | recursive ) echo "Configuration of NetworkManager-vpnc 0.6.4:";;
 esac
 cat <<\_ACEOF
 
@@ -1150,10 +1142,6 @@
 linker flags for NETWORK_MANAGER, overriding pkg-config
 GTK_CFLAGS C compiler flags for GTK, overriding pkg-config
 GTK_LIBS linker flags for GTK, overriding pkg-config
- GDK_PIXBUF_CFLAGS
- C compiler flags for GDK_PIXBUF, overriding pkg-config
- GDK_PIXBUF_LIBS
- linker flags for GDK_PIXBUF, overriding pkg-config
 GLADE_CFLAGS
 C compiler flags for GLADE, overriding pkg-config
 GLADE_LIBS linker flags for GLADE, overriding pkg-config
@@ -1268,7 +1256,7 @@
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
 cat <<\_ACEOF
-NetworkManager-vpnc configure 0.5.0cvs20060202
+NetworkManager-vpnc configure 0.6.4
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1282,7 +1270,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by NetworkManager-vpnc $as_me 0.5.0cvs20060202, which was
+It was created by NetworkManager-vpnc $as_me 0.6.4, which was
 generated by GNU Autoconf 2.59. Invocation command line was
 
 $ $0 $@
@@ -1925,7 +1913,7 @@
 
 # Define the identity of the package.
 PACKAGE='NetworkManager-vpnc'
- VERSION='0.5.0cvs20060202'
+ VERSION='0.6.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3989,7 +3977,7 @@
 ;;
 *-*-irix6*)
 # Find out which ABI we are using.
- echo '#line 3992 "configure"' > conftest.$ac_ext
+ echo '#line 3980 "configure"' > conftest.$ac_ext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 (eval $ac_compile) 2>&5
 ac_status=$?
@@ -5588,7 +5576,7 @@
 
 
 # Provide some information about the compiler.
-echo "$as_me:5591:" \
+echo "$as_me:5579:" \
 "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6651,11 +6639,11 @@
 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
 -e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6654: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6642: $lt_compile\"" >&5)
 (eval "$lt_compile" 2>conftest.err)
 ac_status=$?
 cat conftest.err >&5
- echo "$as_me:6658: \$? = $ac_status" >&5
+ echo "$as_me:6646: \$? = $ac_status" >&5
 if (exit $ac_status) && test -s "$ac_outfile"; then
 # The compiler can only warn and ignore the option if not recognized
 # So say no if there are warnings other than the usual output.
@@ -6919,11 +6907,11 @@
 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
 -e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6922: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6910: $lt_compile\"" >&5)
 (eval "$lt_compile" 2>conftest.err)
 ac_status=$?
 cat conftest.err >&5
- echo "$as_me:6926: \$? = $ac_status" >&5
+ echo "$as_me:6914: \$? = $ac_status" >&5
 if (exit $ac_status) && test -s "$ac_outfile"; then
 # The compiler can only warn and ignore the option if not recognized
 # So say no if there are warnings other than the usual output.
@@ -7023,11 +7011,11 @@
 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
 -e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7026: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7014: $lt_compile\"" >&5)
 (eval "$lt_compile" 2>out/conftest.err)
 ac_status=$?
 cat out/conftest.err >&5
- echo "$as_me:7030: \$? = $ac_status" >&5
+ echo "$as_me:7018: \$? = $ac_status" >&5
 if (exit $ac_status) && test -s out/conftest2.$ac_objext
 then
 # The compiler can only warn and ignore the option if not recognized
@@ -9368,7 +9356,7 @@
 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 lt_status=$lt_dlunknown
 cat > conftest.$ac_ext <<EOF
-#line 9371 "configure"
+#line 9359 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9468,7 +9456,7 @@
 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 lt_status=$lt_dlunknown
 cat > conftest.$ac_ext <<EOF
-#line 9471 "configure"
+#line 9459 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11808,11 +11796,11 @@
 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
 -e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11811: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11799: $lt_compile\"" >&5)
 (eval "$lt_compile" 2>conftest.err)
 ac_status=$?
 cat conftest.err >&5
- echo "$as_me:11815: \$? = $ac_status" >&5
+ echo "$as_me:11803: \$? = $ac_status" >&5
 if (exit $ac_status) && test -s "$ac_outfile"; then
 # The compiler can only warn and ignore the option if not recognized
 # So say no if there are warnings other than the usual output.
@@ -11912,11 +11900,11 @@
 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
 -e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11915: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11903: $lt_compile\"" >&5)
 (eval "$lt_compile" 2>out/conftest.err)
 ac_status=$?
 cat out/conftest.err >&5
- echo "$as_me:11919: \$? = $ac_status" >&5
+ echo "$as_me:11907: \$? = $ac_status" >&5
 if (exit $ac_status) && test -s out/conftest2.$ac_objext
 then
 # The compiler can only warn and ignore the option if not recognized
@@ -13482,11 +13470,11 @@
 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
 -e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13485: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13473: $lt_compile\"" >&5)
 (eval "$lt_compile" 2>conftest.err)
 ac_status=$?
 cat conftest.err >&5
- echo "$as_me:13489: \$? = $ac_status" >&5
+ echo "$as_me:13477: \$? = $ac_status" >&5
 if (exit $ac_status) && test -s "$ac_outfile"; then
 # The compiler can only warn and ignore the option if not recognized
 # So say no if there are warnings other than the usual output.
@@ -13586,11 +13574,11 @@
 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
 -e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13589: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13577: $lt_compile\"" >&5)
 (eval "$lt_compile" 2>out/conftest.err)
 ac_status=$?
 cat out/conftest.err >&5
- echo "$as_me:13593: \$? = $ac_status" >&5
+ echo "$as_me:13581: \$? = $ac_status" >&5
 if (exit $ac_status) && test -s out/conftest2.$ac_objext
 then
 # The compiler can only warn and ignore the option if not recognized
@@ -15789,11 +15777,11 @@
 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
 -e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15792: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15780: $lt_compile\"" >&5)
 (eval "$lt_compile" 2>conftest.err)
 ac_status=$?
 cat conftest.err >&5
- echo "$as_me:15796: \$? = $ac_status" >&5
+ echo "$as_me:15784: \$? = $ac_status" >&5
 if (exit $ac_status) && test -s "$ac_outfile"; then
 # The compiler can only warn and ignore the option if not recognized
 # So say no if there are warnings other than the usual output.
@@ -16057,11 +16045,11 @@
 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
 -e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16060: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16048: $lt_compile\"" >&5)
 (eval "$lt_compile" 2>conftest.err)
 ac_status=$?
 cat conftest.err >&5
- echo "$as_me:16064: \$? = $ac_status" >&5
+ echo "$as_me:16052: \$? = $ac_status" >&5
 if (exit $ac_status) && test -s "$ac_outfile"; then
 # The compiler can only warn and ignore the option if not recognized
 # So say no if there are warnings other than the usual output.
@@ -16161,11 +16149,11 @@
 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
 -e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16164: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16152: $lt_compile\"" >&5)
 (eval "$lt_compile" 2>out/conftest.err)
 ac_status=$?
 cat out/conftest.err >&5
- echo "$as_me:16168: \$? = $ac_status" >&5
+ echo "$as_me:16156: \$? = $ac_status" >&5
 if (exit $ac_status) && test -s out/conftest2.$ac_objext
 then
 # The compiler can only warn and ignore the option if not recognized
@@ -19585,7 +19573,7 @@
 done
 
 
-ALL_LINGUAS="da sv"
+ALL_LINGUAS="cs da de es fi fr hu it ja pl pt_BR sv zh_CN zh_TW"
 
 
 GETTEXT_PACKAGE=NetworkManager-vpnc
@@ -21678,9 +21666,6 @@
 	:
 fi
 
-
-
-
 pkg_failed=no
 echo "$as_me:$LINENO: checking for DBUS" >&5
 echo $ECHO_N "checking for DBUS... $ECHO_C" >&6
@@ -21792,9 +21777,6 @@
 	:
 fi
 
-
-
-
 pkg_failed=no
 echo "$as_me:$LINENO: checking for NETWORK_MANAGER" >&5
 echo $ECHO_N "checking for NETWORK_MANAGER... $ECHO_C" >&6
@@ -21906,9 +21888,6 @@
 	:
 fi
 
-
-
-
 pkg_failed=no
 echo "$as_me:$LINENO: checking for GTK" >&5
 echo $ECHO_N "checking for GTK... $ECHO_C" >&6
@@ -22020,123 +21999,6 @@
 	:
 fi
 
-
-
-
-pkg_failed=no
-echo "$as_me:$LINENO: checking for GDK_PIXBUF" >&5
-echo $ECHO_N "checking for GDK_PIXBUF... $ECHO_C" >&6
-
-if test -n "$PKG_CONFIG"; then
- if test -n "$GDK_PIXBUF_CFLAGS"; then
- pkg_cv_GDK_PIXBUF_CFLAGS="$GDK_PIXBUF_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-pixbuf-2.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "gdk-pixbuf-2.0") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_GDK_PIXBUF_CFLAGS=`$PKG_CONFIG --cflags "gdk-pixbuf-2.0" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$GDK_PIXBUF_LIBS"; then
- pkg_cv_GDK_PIXBUF_LIBS="$GDK_PIXBUF_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-pixbuf-2.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "gdk-pixbuf-2.0") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_GDK_PIXBUF_LIBS=`$PKG_CONFIG --libs "gdk-pixbuf-2.0" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- fi
-else
-	pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
-	 GDK_PIXBUF_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gdk-pixbuf-2.0"`
- else
-	 GDK_PIXBUF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gdk-pixbuf-2.0"`
- fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$GDK_PIXBUF_PKG_ERRORS" >&5
-
-	{ { echo "$as_me:$LINENO: error: Package requirements (gdk-pixbuf-2.0) were not met:
-
-$GDK_PIXBUF_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables GDK_PIXBUF_CFLAGS
-and GDK_PIXBUF_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&5
-echo "$as_me: error: Package requirements (gdk-pixbuf-2.0) were not met:
-
-$GDK_PIXBUF_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables GDK_PIXBUF_CFLAGS
-and GDK_PIXBUF_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&2;}
- { (exit 1); exit 1; }; }
-elif test $pkg_failed = untried; then
-	{ { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables GDK_PIXBUF_CFLAGS
-and GDK_PIXBUF_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-See \`config.log' for more details." >&5
-echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables GDK_PIXBUF_CFLAGS
-and GDK_PIXBUF_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
-else
-	GDK_PIXBUF_CFLAGS=$pkg_cv_GDK_PIXBUF_CFLAGS
-	GDK_PIXBUF_LIBS=$pkg_cv_GDK_PIXBUF_LIBS
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-	:
-fi
-
-
-
-
 pkg_failed=no
 echo "$as_me:$LINENO: checking for GLADE" >&5
 echo $ECHO_N "checking for GLADE... $ECHO_C" >&6
@@ -22248,9 +22110,6 @@
 	:
 fi
 
-
-
-
 pkg_failed=no
 echo "$as_me:$LINENO: checking for LIBGNOMEUI" >&5
 echo $ECHO_N "checking for LIBGNOMEUI... $ECHO_C" >&6
@@ -22362,9 +22221,6 @@
 	:
 fi
 
-
-
-
 pkg_failed=no
 echo "$as_me:$LINENO: checking for GCONF" >&5
 echo $ECHO_N "checking for GCONF... $ECHO_C" >&6
@@ -22476,9 +22332,6 @@
 	:
 fi
 
-
-
-
 pkg_failed=no
 echo "$as_me:$LINENO: checking for GNOMEKEYRING" >&5
 echo $ECHO_N "checking for GNOMEKEYRING... $ECHO_C" >&6
@@ -22591,8 +22444,6 @@
 fi
 
 
-
-
 EXP_VAR=LOCALSTATEDIR
 FROM_VAR=$localstatedir
 
@@ -23269,7 +23120,7 @@
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by NetworkManager-vpnc $as_me 0.5.0cvs20060202, which was
+This file was extended by NetworkManager-vpnc $as_me 0.6.4, which was
 generated by GNU Autoconf 2.59. Invocation command line was
 
 CONFIG_FILES = $CONFIG_FILES
@@ -23332,7 +23183,7 @@
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-NetworkManager-vpnc config.status 0.5.0cvs20060202
+NetworkManager-vpnc config.status 0.6.4
 configured by $0, generated by GNU Autoconf 2.59,
 with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -23662,8 +23513,6 @@
 s,@NETWORK_MANAGER_LIBS@,$NETWORK_MANAGER_LIBS,;t t
 s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t
 s,@GTK_LIBS@,$GTK_LIBS,;t t
-s,@GDK_PIXBUF_CFLAGS@,$GDK_PIXBUF_CFLAGS,;t t
-s,@GDK_PIXBUF_LIBS@,$GDK_PIXBUF_LIBS,;t t
 s,@GLADE_CFLAGS@,$GLADE_CFLAGS,;t t
 s,@GLADE_LIBS@,$GLADE_LIBS,;t t
 s,@LIBGNOMEUI_CFLAGS@,$LIBGNOMEUI_CFLAGS,;t t
diff -urN NetworkManager-vpnc-0.5.0cvs20060202/configure.in NetworkManager-vpnc-CVS/configure.in
--- NetworkManager-vpnc-0.5.0cvs20060202/configure.in	2006-02-02 23:47:41.000000000 +0200
+++ NetworkManager-vpnc-CVS/configure.in	2006-09-27 18:10:31.000000000 +0300
@@ -1,6 +1,6 @@
 AC_PREREQ(2.52)
 
-AC_INIT(NetworkManager-vpnc, 0.5.0cvs20060202, dcbw@redhat.com, NetworkManager-vpnc)
+AC_INIT(NetworkManager-vpnc, 0.6.4, dcbw@redhat.com, NetworkManager-vpnc)
 AC_CONFIG_AUX_DIR(.)
 AM_INIT_AUTOMAKE([subdir-objects])
 AM_MAINTAINER_MODE
@@ -35,7 +35,7 @@
 AC_FUNC_MEMCMP
 AC_CHECK_FUNCS(select socket uname)
 
-ALL_LINGUAS="da sv"
+ALL_LINGUAS="cs da de es fi fr hu it ja pl pt_BR sv zh_CN zh_TW"
 AC_SUBST(ALL_LINGUAS)
 
 GETTEXT_PACKAGE=NetworkManager-vpnc
@@ -46,40 +46,13 @@
 AM_GLIB_GNU_GETTEXT
 
 PKG_CHECK_MODULES(GTHREAD, gthread-2.0)
-AC_SUBST(GTHREAD_CFLAGS)
-AC_SUBST(GTHREAD_LIBS)
-
 PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= 0.30)
-AC_SUBST(DBUS_CFLAGS)
-AC_SUBST(DBUS_LIBS)
-
 PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= 0.4.1)
-AC_SUBST(NETWORK_MANAGER_CFLAGS)
-AC_SUBST(NETWORK_MANAGER_LIBS)
-
 PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6)
-AC_SUBST(GTK_CFLAGS)
-AC_SUBST(GTK_LIBS)
-
-PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0)
-AC_SUBST(GDK_PIXBUF_CFLAGS)
-AC_SUBST(GDK_PIXBUF_LIBS)
-
 PKG_CHECK_MODULES(GLADE, libglade-2.0)
-AC_SUBST(GLADE_CFLAGS)
-AC_SUBST(GLADE_LIBS)
-
 PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0)
-AC_SUBST(LIBGNOMEUI_CFLAGS)
-AC_SUBST(LIBGNOMEUI_LIBS)
-
 PKG_CHECK_MODULES(GCONF, gconf-2.0)
-AC_SUBST(GCONF_CFLAGS)
-AC_SUBST(GCONF_LIBS)
-
 PKG_CHECK_MODULES(GNOMEKEYRING, gnome-keyring-1)
-AC_SUBST(GNOMEKEYRING_CFLAGS)
-AC_SUBST(GNOMEKEYRING_LIBS)
 
 AS_AC_EXPAND(LOCALSTATEDIR, $localstatedir)
 AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
diff -urN NetworkManager-vpnc-0.5.0cvs20060202/Makefile.in NetworkManager-vpnc-CVS/Makefile.in
--- NetworkManager-vpnc-0.5.0cvs20060202/Makefile.in	2006-02-02 23:48:08.000000000 +0200
+++ NetworkManager-vpnc-CVS/Makefile.in	2006-11-02 10:56:17.000000000 +0200
@@ -128,8 +128,6 @@
 FFLAGS = @FFLAGS@
 GCONF_CFLAGS = @GCONF_CFLAGS@
 GCONF_LIBS = @GCONF_LIBS@
-GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@
-GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GLADE_CFLAGS = @GLADE_CFLAGS@
 GLADE_LIBS = @GLADE_LIBS@
diff -urN NetworkManager-vpnc-0.5.0cvs20060202/nm-vpnc.desktop.in NetworkManager-vpnc-CVS/nm-vpnc.desktop.in
--- NetworkManager-vpnc-0.5.0cvs20060202/nm-vpnc.desktop.in	2005-10-19 21:27:16.000000000 +0300
+++ NetworkManager-vpnc-CVS/nm-vpnc.desktop.in	2006-03-09 23:39:17.000000000 +0200
@@ -10,3 +10,4 @@
 DocPath=
 Categories=GNOME;Application;Network;
 MimeType=application/x-cisco-vpn-settings
+NoDisplay=true
diff -urN NetworkManager-vpnc-0.5.0cvs20060202/po/ChangeLog NetworkManager-vpnc-CVS/po/ChangeLog
--- NetworkManager-vpnc-0.5.0cvs20060202/po/ChangeLog	2006-01-26 16:19:41.000000000 +0200
+++ NetworkManager-vpnc-CVS/po/ChangeLog	2006-06-16 23:00:03.000000000 +0300
@@ -1,3 +1,14 @@
+2006-06-16 Robert Love <rml@novell.com>
+
+	* pl.po: Update.
+	* ../configure.in: Update ALL_LINGUAS.
+
+2006-05-18 Robert Love <rml@novell.com>
+
+	* da.po, sv.po: Update.
+	* cs.po, de.po, es.po, fr.po, hu.po, it.po, ja.po, pl.po, pt_BR.po,
+	 zh_CN.po, zh_TW.po: Add.
+
 2006-01-26 Lasse Bang Mikkelsen <lbm@fatalerror.dk>
 
 	* da.po: Updated Danish translation.
diff -urN NetworkManager-vpnc-0.5.0cvs20060202/po/cs.po NetworkManager-vpnc-CVS/po/cs.po
--- NetworkManager-vpnc-0.5.0cvs20060202/po/cs.po	1970-01-01 03:00:00.000000000 +0300
+++ NetworkManager-vpnc-CVS/po/cs.po	2006-05-18 23:34:21.000000000 +0300
@@ -0,0 +1,243 @@
+# translation of cs.po to cs_CZ
+# Czech message file for YaST2 (@memory@).
+# Copyright (C) 2005 SUSE Linux Products GmbH.
+# Copyright (C) 2002 SuSE Linux AG.
+# Copyright (C) 1999-2001 SuSE GmbH.
+#
+# Petr Pavlik <pp@suse.cz>, 1999, 2000, 2001.
+# Klara Cihlarova <koty@seznam.cz>, 2006.
+msgid ""
+msgstr ""
+"Project-Id-Version: cs\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-05-16 17:10+0200\n"
+"PO-Revision-Date: 2006-05-17 13:12+0200\n"
+"Last-Translator: Klara Cihlarova <koty@seznam.cz>\n"
+"Language-Team: cs_CZ <cs@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: KBabel 1.11.2\n"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:147
+msgid "_Secondary Password:"
+msgstr "Ověření _hesla:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:267
+msgid "_Username:"
+msgstr "_Uživ. jméno:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:269
+msgid "_Domain:"
+msgstr "_Doména:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:271
+msgid "_Password:"
+msgstr "_Heslo:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:354
+msgid "Connect _anonymously"
+msgstr "Připojit _anonymně"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:359
+msgid "Connect as _user:"
+msgstr "Připojit jako _uživatel:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:465
+msgid "_Remember passwords for this session"
+msgstr "_Zapamatovat si heslo pro toto sezení"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:467
+msgid "_Save passwords in keyring"
+msgstr "_Uložit do svazku klíčů"
+
+#: ../auth-dialog/main.c:161
+#, c-format
+msgid "You need to authenticate to access the Virtual Private Network '%s'."
+msgstr "Abyste mohli přistupovat do VPN '%s', musíte zadat své jméno a heslo."
+
+#: ../auth-dialog/main.c:162
+msgid "Authenticate VPN"
+msgstr "Ověřování VPN"
+
+#: ../auth-dialog/main.c:169
+msgid "_Group Password:"
+msgstr "Heslo _skupiny:"
+
+#: ../nm-vpnc.desktop.in.h:1
+msgid "Add, Remove, and Edit VPN Connections"
+msgstr "Přidat, odstranit a upravit VPN připojení"
+
+#: ../nm-vpnc.desktop.in.h:2
+msgid "VPN Connection Manager (vpnc)"
+msgstr "Správa VPN spojení (vpnc)"
+
+#: ../properties/nm-vpnc.c:83
+msgid "Compatible Cisco VPN client (vpnc)"
+msgstr "Klient kompatibilní s Cisco VPN (vpnc)"
+
+#: ../properties/nm-vpnc.c:447
+msgid "The following vpnc VPN connection will be created:"
+msgstr "Budou vytvořeny následující VPN spojení:"
+
+#: ../properties/nm-vpnc.c:449
+#, c-format
+msgid "Name: %s"
+msgstr "Jméno: %s"
+
+#: ../properties/nm-vpnc.c:452
+#, c-format
+msgid "Gateway: %s"
+msgstr "Brána: %s"
+
+#: ../properties/nm-vpnc.c:454
+#, c-format
+msgid "Group Name: %s"
+msgstr "Jméno skupiny: %s"
+
+#: ../properties/nm-vpnc.c:458
+#, c-format
+msgid "Username: %s"
+msgstr "Jméno uživatele: %s"
+
+#: ../properties/nm-vpnc.c:463
+#, c-format
+msgid "Domain: %s"
+msgstr "Doména: %s"
+
+#: ../properties/nm-vpnc.c:468
+#, c-format
+msgid "Routes: %s"
+msgstr "Směrování: %s"
+
+#: ../properties/nm-vpnc.c:472
+msgid "The connection details can be changed using the \"Edit\" button."
+msgstr "Podrobnosti o připojení lze změnit kliknutím na tlačítko \"Upravit\"."
+
+#: ../properties/nm-vpnc.c:548
+msgid "TCP tunneling not supported"
+msgstr "TCP tunelování není podporováno"
+
+#: ../properties/nm-vpnc.c:550
+#, c-format
+msgid ""
+"The VPN settings file '%s' specifies that VPN traffic should be tunneled "
+"through TCP which is currently not supported in the vpnc software.\n"
+"\n"
+"The connection can still be created, with TCP tunneling disabled, however it "
+"may not work as expected."
+msgstr ""
+"Soubor VPN nastavení '%s' udává, že má být VPN připojení tunelováno "
+"přes TCP. To není v současné době ve vpnc podporováno.\n"
+"\n"
+"Připojení půjde navázat bez TCP tunelování, ale je možné, že nebude "
+"fungovat korektně."
+
+#: ../properties/nm-vpnc.c:574
+msgid "Cannot import settings"
+msgstr "Nelze importovat nastavení"
+
+#: ../properties/nm-vpnc.c:576
+#, c-format
+msgid "The VPN settings file '%s' does not contain valid data."
+msgstr "Zadaný soubor '%s' neobsahuje platná data."
+
+#: ../properties/nm-vpnc.c:593
+msgid "Select file to import"
+msgstr "Vyberte soubor k importu"
+
+#. printf ("in impl_export\n");
+#: ../properties/nm-vpnc.c:748
+msgid "Save as..."
+msgstr "Uložit jako..."
+
+#: ../properties/nm-vpnc.c:778
+#, c-format
+msgid "A file named \"%s\" already exists."
+msgstr "Jméno souboru \"%s\" již existuje."
+
+#: ../properties/nm-vpnc.c:781
+msgid "Do you want to replace it with the one you are saving?"
+msgstr "Nahradit?"
+
+#: ../properties/nm-vpnc-dialog.glade.h:1
+msgid "Connection Name"
+msgstr "Název připojení"
+
+#: ../properties/nm-vpnc-dialog.glade.h:2
+msgid "Required Information"
+msgstr "Požadované informace"
+
+#: ../properties/nm-vpnc-dialog.glade.h:3
+msgid "example: 172.16.0.0/16 10.11.12.0/24"
+msgstr "příklad: 172.16.0.0/16 10.11.12.0/24"
+
+#: ../properties/nm-vpnc-dialog.glade.h:4
+msgid "G_roup Name:"
+msgstr "J_méno skupiny:"
+
+#: ../properties/nm-vpnc-dialog.glade.h:5
+msgid "O_ptional Information"
+msgstr "_Volitelné informace"
+
+#: ../properties/nm-vpnc-dialog.glade.h:6
+msgid "Override _user name"
+msgstr "Přepsat _uživatelské jméno"
+
+#: ../properties/nm-vpnc-dialog.glade.h:7
+msgid ""
+"Please enter the information provided by your system administrator below. Do "
+"not enter your password here as you will be prompted when connecting."
+msgstr ""
+"Níže zadejte informace od svého správce systému. Nezadávejte své heslo, "
+"budete na něj dotázání později během připojování."
+
+#: ../properties/nm-vpnc-dialog.glade.h:8
+msgid "Use _domain for authentication"
+msgstr "Použít pro ověření _doménu"
+
+#: ../properties/nm-vpnc-dialog.glade.h:9
+msgid "_Gateway:"
+msgstr "_Brána:"
+
+#: ../properties/nm-vpnc-dialog.glade.h:10
+msgid "_Import Saved Configuration..."
+msgstr "_Importovat uložené nastavení..."
+
+#: ../properties/nm-vpnc-dialog.glade.h:11
+msgid ""
+"_Name used to identify the connection to the private network, e.g. \"Campus "
+"VPN\" or \"Corporate Network\""
+msgstr ""
+"_Jméno používané k identifikaci připojení k soukromé síti, např. \"Kolejní VPN\" "
+"nebo \"Práce\""
+
+#: ../properties/nm-vpnc-dialog.glade.h:12
+msgid "_Only use VPN connection for these addresses"
+msgstr "_Použít VPN pouze pro tyto adresy"
+
+#: ../src/nm-vpnc-service.c:116
+msgid "The VPN login failed because the user name and password were not accepted."
+msgstr "Připojení do VPN selhalo. Uživatelské jméno a heslo odmítnuto."
+
+#: ../src/nm-vpnc-service.c:118
+msgid "The VPN login failed because the VPN program could not be started."
+msgstr "Připojení do VPN selhalo. VPN program nelze spustit."
+
+#: ../src/nm-vpnc-service.c:120
+msgid ""
+"The VPN login failed because the VPN program could not connect to the VPN "
+"server."
+msgstr "Připojení do VPN selhalo. Nelze se spojit s VPN serverem."
+
+#: ../src/nm-vpnc-service.c:122
+msgid "The VPN login failed because the VPN configuration options were invalid."
+msgstr "Připojení do VPN selhalo. Chybné volby VPN."
+
+#: ../src/nm-vpnc-service.c:124
+msgid ""
+"The VPN login failed because the VPN program received an invalid "
+"configuration from the VPN server."
+msgstr "Připojení do VPN selhalo. Byly obdrženy chybné volby od VPN serveru."
+
diff -urN NetworkManager-vpnc-0.5.0cvs20060202/po/da.po NetworkManager-vpnc-CVS/po/da.po
--- NetworkManager-vpnc-0.5.0cvs20060202/po/da.po	2006-01-26 16:19:41.000000000 +0200
+++ NetworkManager-vpnc-CVS/po/da.po	2006-05-18 23:34:21.000000000 +0300
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: NetworkManager-vpnc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-26 15:19+0100\n"
+"POT-Creation-Date: 2006-05-16 17:10+0200\n"
 "PO-Revision-Date: 2006-01-26 15:19+0100\n"
 "Last-Translator: Lasse Bang Mikkelsen <lbm@fatalerror.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -42,11 +42,13 @@
 msgstr "Tilslut som _bruger:"
 
 #: ../auth-dialog/gnome-two-password-dialog.c:465
-msgid "_Remember password for this session"
+#, fuzzy
+msgid "_Remember passwords for this session"
 msgstr "_Husk adgangskode for denne session"
 
 #: ../auth-dialog/gnome-two-password-dialog.c:467
-msgid "_Save password in keyring"
+#, fuzzy
+msgid "_Save passwords in keyring"
 msgstr "_Gem adgangskode i nøglering"
 
 #: ../auth-dialog/main.c:161
diff -urN NetworkManager-vpnc-0.5.0cvs20060202/po/de.po NetworkManager-vpnc-CVS/po/de.po
--- NetworkManager-vpnc-0.5.0cvs20060202/po/de.po	1970-01-01 03:00:00.000000000 +0300
+++ NetworkManager-vpnc-CVS/po/de.po	2006-05-18 23:34:21.000000000 +0300
@@ -0,0 +1,260 @@
+# German message file for YaST2 (@memory@).
+# Copyright (C) 2005 SUSE Linux Products GmbH.
+# Copyright (C) 2002, 2003 SuSE Linux AG.
+# Copyright (C) 1999, 2000, 2001 SuSE GmbH.
+# Antje Faber <afaber@suse.de>, 2000-2003.
+# Karl Eichwalder <ke@suse.de>, 1999-2003.
+# Martin Lohner <ml@suse.de>, 2000.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: YaST (@memory@)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-05-16 17:10+0200\n"
+"PO-Revision-Date: 2003-02-12 09:27+0100\n"
+"Last-Translator: Karl Eichwalder <ke@suse.de>\n"
+"Language-Team: German <i18n@suse.de>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:147
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "Passwort &bestätigen:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:267
+#, fuzzy
+msgid "_Username:"
+msgstr "Benut&zername:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:269
+#, fuzzy
+msgid "_Domain:"
+msgstr "&Domain:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:271
+#, fuzzy
+msgid "_Password:"
+msgstr "Passwort:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:354
+#, fuzzy
+msgid "Connect _anonymously"
+msgstr "Verbindungen"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:359
+#, fuzzy
+msgid "Connect as _user:"
+msgstr "Verbunden als "
+
+#: ../auth-dialog/gnome-two-password-dialog.c:465
+#, fuzzy
+msgid "_Remember passwords for this session"
+msgstr "&Bestätigen Sie das Passwort:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:467
+#, fuzzy
+msgid "_Save passwords in keyring"
+msgstr "Passwortverschlüsselung festlegen"
+
+#: ../auth-dialog/main.c:161
+#, c-format
+msgid "You need to authenticate to access the Virtual Private Network '%s'."
+msgstr ""
+
+#: ../auth-dialog/main.c:162
+#, fuzzy
+msgid "Authenticate VPN"
+msgstr "Authentifizierung"
+
+#: ../auth-dialog/main.c:169
+#, fuzzy
+msgid "_Group Password:"
+msgstr "Passwort:"
+
+#: ../nm-vpnc.desktop.in.h:1
+msgid "Add, Remove, and Edit VPN Connections"
+msgstr ""
+
+#: ../nm-vpnc.desktop.in.h:2
+#, fuzzy
+msgid "VPN Connection Manager (vpnc)"
+msgstr "Verbindungsverwaltung"
+
+#: ../properties/nm-vpnc.c:83
+msgid "Compatible Cisco VPN client (vpnc)"
+msgstr ""
+
+#: ../properties/nm-vpnc.c:447
+#, fuzzy
+msgid "The following vpnc VPN connection will be created:"
+msgstr "Folgende Scanner werden deaktiviert:"
+
+#: ../properties/nm-vpnc.c:449
+#, fuzzy, c-format
+msgid "Name: %s"
+msgstr "&Name:"
+
+#: ../properties/nm-vpnc.c:452
+#, fuzzy, c-format
+msgid "Gateway: %s"
+msgstr "Gateway: %1"
+
+#: ../properties/nm-vpnc.c:454
+#, fuzzy, c-format
+msgid "Group Name: %s"
+msgstr "Name der Gruppe:"
+
+#: ../properties/nm-vpnc.c:458
+#, fuzzy, c-format
+msgid "Username: %s"
+msgstr "Benutzername: %1"
+
+#: ../properties/nm-vpnc.c:463
+#, fuzzy, c-format
+msgid "Domain: %s"
+msgstr "&Domain:"
+
+#: ../properties/nm-vpnc.c:468
+#, fuzzy, c-format
+msgid "Routes: %s"
+msgstr "Routen: %1"
+
+#: ../properties/nm-vpnc.c:472
+msgid "The connection details can be changed using the \"Edit\" button."
+msgstr ""
+
+#: ../properties/nm-vpnc.c:548
+#, fuzzy
+msgid "TCP tunneling not supported"
+msgstr "Zurzeit nicht unterstützt."
+
+#: ../properties/nm-vpnc.c:550
+#, c-format
+msgid ""
+"The VPN settings file '%s' specifies that VPN traffic should be tunneled "
+"through TCP which is currently not supported in the vpnc software.\n"
+"\n"
+"The connection can still be created, with TCP tunneling disabled, however it "
+"may not work as expected."
+msgstr ""
+
+#: ../properties/nm-vpnc.c:574
+#, fuzzy
+msgid "Cannot import settings"
+msgstr "Einstellungen können nicht geschrieben werden."
+
+#: ../properties/nm-vpnc.c:576
+#, fuzzy, c-format
+msgid "The VPN settings file '%s' does not contain valid data."
+msgstr "Die angegebene Datei enthält keinen TSIG-Schlüssel."
+
+#: ../properties/nm-vpnc.c:593
+#, fuzzy
+msgid "Select file to import"
+msgstr "Wählen Sie eine zu ladende Datei."
+
+#. printf ("in impl_export\n");
+#: ../properties/nm-vpnc.c:748
+msgid "Save as..."
+msgstr "Speichern unter..."
+
+#: ../properties/nm-vpnc.c:778
+#, fuzzy, c-format
+msgid "A file named \"%s\" already exists."
+msgstr "Ein Host mit dem Namen %1 ist bereits vorhanden."
+
+#: ../properties/nm-vpnc.c:781
+#, fuzzy
+msgid "Do you want to replace it with the one you are saving?"
+msgstr ""
+"Möchten Sie Ihre Einstellungen\n"
+"wirklich rückgängig machen?"
+
+#: ../properties/nm-vpnc-dialog.glade.h:1
+#, fuzzy
+msgid "Connection Name"
+msgstr "Beschreibung:"
+
+#: ../properties/nm-vpnc-dialog.glade.h:2
+#, fuzzy
+msgid "Required Information"
+msgstr "Support-Informationen\n"
+
+#: ../properties/nm-vpnc-dialog.glade.h:3
+msgid "example: 172.16.0.0/16 10.11.12.0/24"
+msgstr ""
+
+#: ../properties/nm-vpnc-dialog.glade.h:4
+#, fuzzy
+msgid "G_roup Name:"
+msgstr "Name der Gruppe:"
+
+#: ../properties/nm-vpnc-dialog.glade.h:5
+#, fuzzy
+msgid "O_ptional Information"
+msgstr "Optionale Informationen"
+
+#: ../properties/nm-vpnc-dialog.glade.h:6
+#, fuzzy
+msgid "Override _user name"
+msgstr "Oder &Benutzernamen eingeben:"
+
+#: ../properties/nm-vpnc-dialog.glade.h:7
+msgid ""
+"Please enter the information provided by your system administrator below. Do "
+"not enter your password here as you will be prompted when connecting."
+msgstr ""
+
+#: ../properties/nm-vpnc-dialog.glade.h:8
+#, fuzzy
+msgid "Use _domain for authentication"
+msgstr "Benutzerauthentifizierung"
+
+#: ../properties/nm-vpnc-dialog.glade.h:9
+#, fuzzy
+msgid "_Gateway:"
+msgstr "Gateway"
+
+#: ../properties/nm-vpnc-dialog.glade.h:10
+#, fuzzy
+msgid "_Import Saved Configuration..."
+msgstr "&Serverkonfiguration..."
+
+#: ../properties/nm-vpnc-dialog.glade.h:11
+msgid ""
+"_Name used to identify the connection to the private network, e.g. \"Campus "
+"VPN\" or \"Corporate Network\""
+msgstr ""
+
+#: ../properties/nm-vpnc-dialog.glade.h:12
+msgid "_Only use VPN connection for these addresses"
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:116
+msgid ""
+"The VPN login failed because the user name and password were not accepted."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:118
+msgid "The VPN login failed because the VPN program could not be started."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:120
+msgid ""
+"The VPN login failed because the VPN program could not connect to the VPN "
+"server."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:122
+msgid ""
+"The VPN login failed because the VPN configuration options were invalid."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:124
+msgid ""
+"The VPN login failed because the VPN program received an invalid "
+"configuration from the VPN server."
+msgstr ""
diff -urN NetworkManager-vpnc-0.5.0cvs20060202/po/es.po NetworkManager-vpnc-CVS/po/es.po
--- NetworkManager-vpnc-0.5.0cvs20060202/po/es.po	1970-01-01 03:00:00.000000000 +0300
+++ NetworkManager-vpnc-CVS/po/es.po	2006-05-18 23:34:21.000000000 +0300
@@ -0,0 +1,289 @@
+# Spanish message file for YaST2 (@memory@).
+# Copyright (C) 2005 SUSE Linux Products GmbH.
+# Copyright (C) 2002, 2003 SuSE Linux AG.
+# Copyright (C) 1999, 2000, 2001 SuSE GmbH.
+# Ibán josé García Castillo <Iban.Garcia@alufis35.uv.es>, 2000.
+# Javier Moreno <javier.moreno@alufis35.uv.es>, 2000.
+# Jordi Jaen Pallares <jordi@suse.de>, 1999, 2000, 2001.
+# Pablo Iranzo Gómez <Pablo.Iranzo@uv.es>, 2000.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: YaST (@memory@)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-05-16 17:10+0200\n"
+"PO-Revision-Date: 2003-02-12 10:23+0100\n"
+"Last-Translator: Pablo Iranzo Gómez <Pablo.Iranzo@uv.es>\n"
+"Language-Team: Spanish <i18n@suse.de>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:147
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "V&erificar contraseña:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:267
+#, fuzzy
+msgid "_Username:"
+msgstr "Nombre de &usuario:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:269
+#, fuzzy
+msgid "_Domain:"
+msgstr "&Dominio:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:271
+#, fuzzy
+msgid "_Password:"
+msgstr "Contraseña:"
+
+# include/printconf/dialogs.ycp:150
+#: ../auth-dialog/gnome-two-password-dialog.c:354
+#, fuzzy
+msgid "Connect _anonymously"
+msgstr "Conexiones"
+
+# include/scanner/scanner_overview.ycp:85
+# include/scanner/scanner_overview.ycp:85
+# include/scanner/scanner_overview.ycp:85
+#: ../auth-dialog/gnome-two-password-dialog.c:359
+#, fuzzy
+msgid "Connect as _user:"
+msgstr "Conectado como"
+
+# include/partitioning/custom_part_dialogs.ycp:67
+# include/partitioning/custom_part_dialogs.ycp:67
+# include/partitioning/custom_part_dialogs.ycp:67 include/partitioning/custom_part_dialogs.ycp:197
+# 
+#: ../auth-dialog/gnome-two-password-dialog.c:465
+#, fuzzy
+msgid "_Remember passwords for this session"
+msgstr ""
+"Vuelva a introducir la contraseña para \n"
+"&verificarla:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:467
+#, fuzzy
+msgid "_Save passwords in keyring"
+msgstr "Definir codificación de la contraseña"
+
+#: ../auth-dialog/main.c:161
+#, c-format
+msgid "You need to authenticate to access the Virtual Private Network '%s'."
+msgstr ""
+
+#: ../auth-dialog/main.c:162
+#, fuzzy
+msgid "Authenticate VPN"
+msgstr "Autentificación"
+
+#: ../auth-dialog/main.c:169
+#, fuzzy
+msgid "_Group Password:"
+msgstr "Contraseña:"
+
+#: ../nm-vpnc.desktop.in.h:1
+msgid "Add, Remove, and Edit VPN Connections"
+msgstr ""
+
+# include/network/modem/dialogs.ycp:400
+#: ../nm-vpnc.desktop.in.h:2
+#, fuzzy
+msgid "VPN Connection Manager (vpnc)"
+msgstr "Connection Management"
+
+#: ../properties/nm-vpnc.c:83
+msgid "Compatible Cisco VPN client (vpnc)"
+msgstr ""
+
+#
+# include/printconf/dialogs.ycp:1787
+#: ../properties/nm-vpnc.c:447
+#, fuzzy
+msgid "The following vpnc VPN connection will be created:"
+msgstr "Los siguientes escáneres se desactivarán:"
+
+#: ../properties/nm-vpnc.c:449
+#, fuzzy, c-format
+msgid "Name: %s"
+msgstr "No&mbre:"
+
+#: ../properties/nm-vpnc.c:452
+#, fuzzy, c-format
+msgid "Gateway: %s"
+msgstr "Pasarela: %1"
+
+# clients/lan_dns.ycp:280
+# clients/lan_dns.ycp:269
+# include/users/ui.ycp:1021
+#: ../properties/nm-vpnc.c:454
+#, fuzzy, c-format
+msgid "Group Name: %s"
+msgstr "Nombre de grupo:"
+
+# 
+# include/network/providers.ycp:498 include/network/providers.ycp:681
+#: ../properties/nm-vpnc.c:458
+#, fuzzy, c-format
+msgid "Username: %s"
+msgstr "Nombre de usuario: %1"
+
+#: ../properties/nm-vpnc.c:463
+#, fuzzy, c-format
+msgid "Domain: %s"
+msgstr "&Dominio:"
+
+#: ../properties/nm-vpnc.c:468
+#, fuzzy, c-format
+msgid "Routes: %s"
+msgstr "Rutas: %1"
+
+#: ../properties/nm-vpnc.c:472
+msgid "The connection details can be changed using the \"Edit\" button."
+msgstr ""
+
+#: ../properties/nm-vpnc.c:548
+#, fuzzy
+msgid "TCP tunneling not supported"
+msgstr "No es compatible actualmente."
+
+#: ../properties/nm-vpnc.c:550
+#, c-format
+msgid ""
+"The VPN settings file '%s' specifies that VPN traffic should be tunneled "
+"through TCP which is currently not supported in the vpnc software.\n"
+"\n"
+"The connection can still be created, with TCP tunneling disabled, however it "
+"may not work as expected."
+msgstr ""
+
+#: ../properties/nm-vpnc.c:574
+#, fuzzy
+msgid "Cannot import settings"
+msgstr "No es posible escribir la configuración"
+
+#: ../properties/nm-vpnc.c:576
+#, fuzzy, c-format
+msgid "The VPN settings file '%s' does not contain valid data."
+msgstr "El archivo especificado no contiene ninguna clave TSIG."
+
+#: ../properties/nm-vpnc.c:593
+#, fuzzy
+msgid "Select file to import"
+msgstr "Seleccione el archivo que desea cargar."
+
+#. printf ("in impl_export\n");
+#: ../properties/nm-vpnc.c:748
+msgid "Save as..."
+msgstr "Guardar como..."
+
+#: ../properties/nm-vpnc.c:778
+#, fuzzy, c-format
+msgid "A file named \"%s\" already exists."
+msgstr "Ya existe un host llamado %1."
+
+# clients/inst_sw_select.ycp:360
+# clients/inst_sw_select.ycp:436
+# 
+#: ../properties/nm-vpnc.c:781
+#, fuzzy
+msgid "Do you want to replace it with the one you are saving?"
+msgstr "¿Desea realmente reiniciar la selección?"
+
+#: ../properties/nm-vpnc-dialog.glade.h:1
+#, fuzzy
+msgid "Connection Name"
+msgstr "Descripción:"
+
+# clients/support_question.ycp:110
+# clients/support_question.ycp:118
+# clients/support_question.ycp:121
+#: ../properties/nm-vpnc-dialog.glade.h:2
+#, fuzzy
+msgid "Required Information"
+msgstr "Información de asistencia\n"
+
+#: ../properties/nm-vpnc-dialog.glade.h:3
+msgid "example: 172.16.0.0/16 10.11.12.0/24"
+msgstr ""
+
+# clients/lan_dns.ycp:280
+# clients/lan_dns.ycp:269
+# include/users/ui.ycp:1021
+#: ../properties/nm-vpnc-dialog.glade.h:4
+#, fuzzy
+msgid "G_roup Name:"
+msgstr "Nombre de grupo:"
+
+# clients/online_update_details.ycp:113
+#: ../properties/nm-vpnc-dialog.glade.h:5
+#, fuzzy
+msgid "O_ptional Information"
+msgstr "Información opcional"
+
+# include/cups/ui.ycp:1325
+# include/cups/ui.ycp:1060
+#: ../properties/nm-vpnc-dialog.glade.h:6
+#, fuzzy
+msgid "Override _user name"
+msgstr "O introducir nombre de &usuario:"
+
+#: ../properties/nm-vpnc-dialog.glade.h:7
+msgid ""
+"Please enter the information provided by your system administrator below. Do "
+"not enter your password here as you will be prompted when connecting."
+msgstr ""
+
+#: ../properties/nm-vpnc-dialog.glade.h:8
+#, fuzzy
+msgid "Use _domain for authentication"
+msgstr "Autentificación de usuarios"
+
+#: ../properties/nm-vpnc-dialog.glade.h:9
+#, fuzzy
+msgid "_Gateway:"
+msgstr "Pasarela"
+
+#: ../properties/nm-vpnc-dialog.glade.h:10
+#, fuzzy
+msgid "_Import Saved Configuration..."
+msgstr "Configuración del &servidor..."
+
+#: ../properties/nm-vpnc-dialog.glade.h:11
+msgid ""
+"_Name used to identify the connection to the private network, e.g. \"Campus "
+"VPN\" or \"Corporate Network\""
+msgstr ""
+
+#: ../properties/nm-vpnc-dialog.glade.h:12
+msgid "_Only use VPN connection for these addresses"
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:116
+msgid ""
+"The VPN login failed because the user name and password were not accepted."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:118
+msgid "The VPN login failed because the VPN program could not be started."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:120
+msgid ""
+"The VPN login failed because the VPN program could not connect to the VPN "
+"server."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:122
+msgid ""
+"The VPN login failed because the VPN configuration options were invalid."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:124
+msgid ""
+"The VPN login failed because the VPN program received an invalid "
+"configuration from the VPN server."
+msgstr ""
diff -urN NetworkManager-vpnc-0.5.0cvs20060202/po/fi.po NetworkManager-vpnc-CVS/po/fi.po
--- NetworkManager-vpnc-0.5.0cvs20060202/po/fi.po	1970-01-01 03:00:00.000000000 +0300
+++ NetworkManager-vpnc-CVS/po/fi.po	2006-06-05 21:00:38.000000000 +0300
@@ -0,0 +1,235 @@
+# translation of NetworkManager-vpnc.po to
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Jyri Palokangas <jmp@netti.fi>, 2006.
+msgid ""
+msgstr ""
+"Project-Id-Version: NetworkManager-vpnc\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-05-16 17:10+0200\n"
+"PO-Revision-Date: 2006-06-02 10:35+0300\n"
+"Last-Translator: Jyri Palokangas <jmp@netti.fi>\n"
+"Language-Team: <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.2\n"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:147
+msgid "_Secondary Password:"
+msgstr "Toisijainen _salasana:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:267
+msgid "_Username:"
+msgstr "Käyttäjänim_i:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:269
+msgid "_Domain:"
+msgstr "_Toimialue:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:271
+msgid "_Password:"
+msgstr "S_alasana:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:354
+msgid "Connect _anonymously"
+msgstr "Yhdistä nimettö_mästi"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:359
+msgid "Connect as _user:"
+msgstr "_Yhdistä käyttäjänä:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:465
+msgid "_Remember passwords for this session"
+msgstr "_Muista salasana tämän istunnon ajan"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:467
+msgid "_Save passwords in keyring"
+msgstr "Tall_enna salasana avainrenkaaseen"
+
+#: ../auth-dialog/main.c:161
+#, c-format
+msgid "You need to authenticate to access the Virtual Private Network '%s'."
+msgstr "Sisun täytyy tunnistautua saadaksesi pääsy virtuaaliseen näennäisverkkoon '%s'."
+
+#: ../auth-dialog/main.c:162
+msgid "Authenticate VPN"
+msgstr "VPN tunnistautuminen"
+
+#: ../auth-dialog/main.c:169
+msgid "_Group Password:"
+msgstr "_Ryhmän salasana:"
+
+#: ../nm-vpnc.desktop.in.h:1
+msgid "Add, Remove, and Edit VPN Connections"
+msgstr "Lisää, poista ja muokkaa VPN yhteyksiä"
+
+#: ../nm-vpnc.desktop.in.h:2
+msgid "VPN Connection Manager (vpnc)"
+msgstr "VPN yhteyshallinta (vpnc)"
+
+#: ../properties/nm-vpnc.c:83
+msgid "Compatible Cisco VPN client (vpnc)"
+msgstr "Cisco VPN yhteensopiva asiakas (vpnc)"
+
+#: ../properties/nm-vpnc.c:447
+msgid "The following vpnc VPN connection will be created:"
+msgstr "Seuraava vpnc VPN yhteys luodaan:"
+
+#: ../properties/nm-vpnc.c:449
+#, c-format
+msgid "Name: %s"
+msgstr "Nimi: %s"
+
+#: ../properties/nm-vpnc.c:452
+#, c-format
+msgid "Gateway: %s"
+msgstr "Yhdyskäytävä: %s"
+
+#: ../properties/nm-vpnc.c:454
+#, c-format
+msgid "Group Name: %s"
+msgstr "Ryhmän nimi: %s"
+
+#: ../properties/nm-vpnc.c:458
+#, c-format
+msgid "Username: %s"
+msgstr "Käyttäjänimi: %s"
+
+#: ../properties/nm-vpnc.c:463
+#, c-format
+msgid "Domain: %s"
+msgstr "Toimialue: %s"
+
+#: ../properties/nm-vpnc.c:468
+#, c-format
+msgid "Routes: %s"
+msgstr "Reitit: %s"
+
+#: ../properties/nm-vpnc.c:472
+msgid "The connection details can be changed using the \"Edit\" button."
+msgstr "Yhteydenyksityiskohtia voi muuttaa käyttämällä \"Muokkaa\" painiketta."
+
+#: ../properties/nm-vpnc.c:548
+msgid "TCP tunneling not supported"
+msgstr "TCP tunnelointi ei ole tuettuna"
+
+#: ../properties/nm-vpnc.c:550
+#, c-format
+msgid ""
+"The VPN settings file '%s' specifies that VPN traffic should be tunneled "
+"through TCP which is currently not supported in the vpnc software.\n"
+"\n"
+"The connection can still be created, with TCP tunneling disabled, however it "
+"may not work as expected."
+msgstr ""
+"VPN asetustiedosto '%s' määrittää että VPN liikenne tulisi tunneloida TCP:n läpi, vpnc ohjelmisto ei tue tätä tällä hetkellä.\n"
+"\n"
+"Yhteys voidaan silti luoda, TCP tunnelointi poistettuna käytöstä, voi olla että yhteys ei toimi kuten odotetaan."
+
+#: ../properties/nm-vpnc.c:574
+msgid "Cannot import settings"
+msgstr "Asetusten tuonti ei onnistu"
+
+#: ../properties/nm-vpnc.c:576
+#, c-format
+msgid "The VPN settings file '%s' does not contain valid data."
+msgstr "VPN asetustiedosto '%s' ei sisällä kelpoa dataa."
+
+#: ../properties/nm-vpnc.c:593
+msgid "Select file to import"
+msgstr "Valitse tuotava tiedosto"
+
+#. printf ("in impl_export\n");
+#: ../properties/nm-vpnc.c:748
+msgid "Save as..."
+msgstr "Tallenna nimellä..."
+
+#: ../properties/nm-vpnc.c:778
+#, c-format
+msgid "A file named \"%s\" already exists."
+msgstr "Tiedosto nimellä \"%s\" on jo olemassa."
+
+#: ../properties/nm-vpnc.c:781
+msgid "Do you want to replace it with the one you are saving?"
+msgstr "Haluatko korvata se tiedostolla jota olet tallentamassa?"
+
+#: ../properties/nm-vpnc-dialog.glade.h:1
+msgid "Connection Name"
+msgstr "Yhteyden nimi"
+
+#: ../properties/nm-vpnc-dialog.glade.h:2
+msgid "Required Information"
+msgstr "Vaaditut tiedot"
+
+#: ../properties/nm-vpnc-dialog.glade.h:3
+msgid "example: 172.16.0.0/16 10.11.12.0/24"
+msgstr "esimerkiksi: 172.16.0.0/16 10.11.12.0/24"
+
+#: ../properties/nm-vpnc-dialog.glade.h:4
+msgid "G_roup Name:"
+msgstr "_Ryhmän nimi:"
+
+#: ../properties/nm-vpnc-dialog.glade.h:5
+msgid "O_ptional Information"
+msgstr "Valinnaisia tiet_oja"
+
+#: ../properties/nm-vpnc-dialog.glade.h:6
+msgid "Override _user name"
+msgstr "Ohita käyttäjät_unnus"
+
+#: ../properties/nm-vpnc-dialog.glade.h:7
+msgid ""
+"Please enter the information provided by your system administrator below. Do "
+"not enter your password here as you will be prompted when connecting."
+msgstr "Anna järjestelmänvalvojalta saamasi tiedot tähän. Älä anna salasanaasi tässä, se kysytään kun otat yhteyden."
+
+#: ../properties/nm-vpnc-dialog.glade.h:8
+msgid "Use _domain for authentication"
+msgstr "Käytä _toimialuetta tunnistautumiseen"
+
+#: ../properties/nm-vpnc-dialog.glade.h:9
+msgid "_Gateway:"
+msgstr "_Yhdyskäytävä:"
+
+#: ../properties/nm-vpnc-dialog.glade.h:10
+msgid "_Import Saved Configuration..."
+msgstr "Tuo tallennettu määr_itys..."
+
+#: ../properties/nm-vpnc-dialog.glade.h:11
+msgid ""
+"_Name used to identify the connection to the private network, e.g. \"Campus "
+"VPN\" or \"Corporate Network\""
+msgstr ""
+"_Nimi jota käytetään yhteyden tunnistukseen yksityisessä verkossa, esim. \"Kampus "
+"VPN\" tai \"Yhtiön verkko\""
+
+#: ../properties/nm-vpnc-dialog.glade.h:12
+msgid "_Only use VPN connection for these addresses"
+msgstr "Käytä vain VPN yhteyttä näihin _osoitteisiin"
+
+#: ../src/nm-vpnc-service.c:116
+msgid "The VPN login failed because the user name and password were not accepted."
+msgstr "VPN kirjautuminen epäonnistui koska käyttäjätunnusta tai salasanaa ei hyväksytty."
+
+#: ../src/nm-vpnc-service.c:118
+msgid "The VPN login failed because the VPN program could not be started."
+msgstr "VPN kirjautuminen epäonnistui koska VPN ohjelmaa ei onnistuttu käynnistämään."
+
+#: ../src/nm-vpnc-service.c:120
+msgid ""
+"The VPN login failed because the VPN program could not connect to the VPN "
+"server."
+msgstr "VPN kirjautuminen epäonnistui koska VPN ohjelma ei saanut yhteyttä VPN-palvelimeen."
+
+#: ../src/nm-vpnc-service.c:122
+msgid "The VPN login failed because the VPN configuration options were invalid."
+msgstr "VPN kirjautuminen epäonnistui koska VPN määritysvalinnat olivat virheelliset."
+
+#: ../src/nm-vpnc-service.c:124
+msgid ""
+"The VPN login failed because the VPN program received an invalid "
+"configuration from the VPN server."
+msgstr "VPN kirjautuminen epäonnistui koska VPN ohjelma vastaanotti virheellisen määrityksen VPN-palvelimelta."
+
diff -urN NetworkManager-vpnc-0.5.0cvs20060202/po/fr.po NetworkManager-vpnc-CVS/po/fr.po
--- NetworkManager-vpnc-0.5.0cvs20060202/po/fr.po	1970-01-01 03:00:00.000000000 +0300
+++ NetworkManager-vpnc-CVS/po/fr.po	2006-05-18 23:34:21.000000000 +0300
@@ -0,0 +1,289 @@
+# French message file for YaST2 (@memory@).
+# Copyright (C) 2005 SUSE Linux Products GmbH.
+# Copyright (C) 2002, 2003 SuSE Linux AG.
+# Copyright (C) 2000, 2001 SuSE GmbH.
+# Patricia Vaz <patricia@suse.de>, 2003.
+# Francoise Lermen <flermen@suse.de>, 2000, 2001, 2002.
+# Karine Nguyen <karine@suse.de>, 2001.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: YaST (@memory@)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-05-16 17:10+0200\n"
+"PO-Revision-Date: 2003-02-12 09:50+0100\n"
+"Last-Translator: Patricia Vaz <patricia@suse.de>\n"
+"Language-Team: French <i18n@suse.de>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+# TLABEL users_2002_01_04_0147__49
+#: ../auth-dialog/gnome-two-password-dialog.c:147
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "&Vérifier le mot de passe :"
+
+# TLABEL packages_2002_03_14_2340__5
+#: ../auth-dialog/gnome-two-password-dialog.c:267
+#, fuzzy
+msgid "_Username:"
+msgstr "Nom d'&utilisateur :"
+
+# TLABEL autoinst_2002_08_07_0216__305
+#: ../auth-dialog/gnome-two-password-dialog.c:269
+#, fuzzy
+msgid "_Domain:"
+msgstr "&Domaine :"
+
+# TLABEL online_update_2002_03_14_2340__10
+#: ../auth-dialog/gnome-two-password-dialog.c:271
+#, fuzzy
+msgid "_Password:"
+msgstr "Mot de passe :"
+
+# TLABEL printconf_2002_01_04_0147__63
+#: ../auth-dialog/gnome-two-password-dialog.c:354
+#, fuzzy
+msgid "Connect _anonymously"
+msgstr "Connexions"
+
+# TLABEL scanner_2002_01_04_0147__22
+#: ../auth-dialog/gnome-two-password-dialog.c:359
+#, fuzzy
+msgid "Connect as _user:"
+msgstr "Connecté en tant que"
+
+# TLABEL partitioning_2002_01_04_0147__215
+#: ../auth-dialog/gnome-two-password-dialog.c:465
+#, fuzzy
+msgid "_Remember passwords for this session"
+msgstr ""
+"Entrez à nouveau votre mot de passe\n"
+"pour &vérification :"
+
+# TLABEL user_2002_03_14_2340__5
+#: ../auth-dialog/gnome-two-password-dialog.c:467
+#, fuzzy
+msgid "_Save passwords in keyring"
+msgstr "Définir le chiffrement du mot de passe"
+
+#: ../auth-dialog/main.c:161
+#, c-format
+msgid "You need to authenticate to access the Virtual Private Network '%s'."
+msgstr ""
+
+# TLABEL autoinst_2002_08_07_0216__146
+#: ../auth-dialog/main.c:162
+#, fuzzy
+msgid "Authenticate VPN"
+msgstr "Authentification"
+
+# TLABEL online_update_2002_03_14_2340__10
+#: ../auth-dialog/main.c:169
+#, fuzzy
+msgid "_Group Password:"
+msgstr "Mot de passe :"
+
+#: ../nm-vpnc.desktop.in.h:1
+msgid "Add, Remove, and Edit VPN Connections"
+msgstr ""
+
+# TLABEL lan_2002_01_04_0147__200
+#: ../nm-vpnc.desktop.in.h:2
+#, fuzzy
+msgid "VPN Connection Manager (vpnc)"
+msgstr "Connection Management"
+
+#: ../properties/nm-vpnc.c:83
+msgid "Compatible Cisco VPN client (vpnc)"
+msgstr ""
+
+# TLABEL printer_2002_08_07_0216__75
+#: ../properties/nm-vpnc.c:447
+#, fuzzy
+msgid "The following vpnc VPN connection will be created:"
+msgstr "Les scanneurs suivants seront désactivés :"
+
+# TLABEL cups_2002_03_14_2340__13
+#: ../properties/nm-vpnc.c:449
+#, fuzzy, c-format
+msgid "Name: %s"
+msgstr "&Nom:"
+
+# TLABEL autoinst_2002_08_07_0216__316
+#: ../properties/nm-vpnc.c:452
+#, fuzzy, c-format
+msgid "Gateway: %s"
+msgstr "Passerelle : %1"
+
+# TLABEL users_2002_01_04_0147__77
+#: ../properties/nm-vpnc.c:454
+#, fuzzy, c-format
+msgid "Group Name: %s"
+msgstr "Nom du groupe :"
+
+# TLABEL network_2002_03_14_2340__32
+#: ../properties/nm-vpnc.c:458
+#, fuzzy, c-format
+msgid "Username: %s"
+msgstr "Nom d'utilisateur : %1"
+
+# TLABEL autoinst_2002_08_07_0216__305
+#: ../properties/nm-vpnc.c:463
+#, fuzzy, c-format
+msgid "Domain: %s"
+msgstr "&Domaine :"
+
+#: ../properties/nm-vpnc.c:468
+#, fuzzy, c-format
+msgid "Routes: %s"
+msgstr "Routes: %1"
+
+#: ../properties/nm-vpnc.c:472
+msgid "The connection details can be changed using the \"Edit\" button."
+msgstr ""
+
+#: ../properties/nm-vpnc.c:548
+#, fuzzy
+msgid "TCP tunneling not supported"
+msgstr "Non pris en charge pour le moment."
+
+#: ../properties/nm-vpnc.c:550
+#, c-format
+msgid ""
+"The VPN settings file '%s' specifies that VPN traffic should be tunneled "
+"through TCP which is currently not supported in the vpnc software.\n"
+"\n"
+"The connection can still be created, with TCP tunneling disabled, however it "
+"may not work as expected."
+msgstr ""
+
+# TLABEL profile-manager_2002_08_07_0216__9
+#: ../properties/nm-vpnc.c:574
+#, fuzzy
+msgid "Cannot import settings"
+msgstr "Impossible d'enregistrer les paramètres !"
+
+#: ../properties/nm-vpnc.c:576
+#, fuzzy, c-format
+msgid "The VPN settings file '%s' does not contain valid data."
+msgstr "Le fichier spécifié ne contient pas de clé TSIG."
+
+# TLABEL profile-manager_2002_08_07_0216__58
+#: ../properties/nm-vpnc.c:593
+#, fuzzy
+msgid "Select file to import"
+msgstr "Sélectionnez le fichier à copier."
+
+# TLABEL restore_2002_08_07_0216__41
+#. printf ("in impl_export\n");
+#: ../properties/nm-vpnc.c:748
+msgid "Save as..."
+msgstr "Enregistrer sous..."
+
+# TLABEL network_2002_03_14_2340__39
+#: ../properties/nm-vpnc.c:778
+#, fuzzy, c-format
+msgid "A file named \"%s\" already exists."
+msgstr "Un hôte nommé %1 existe déjà."
+
+# TLABEL packages_2002_03_14_2340__75
+#: ../properties/nm-vpnc.c:781
+#, fuzzy
+msgid "Do you want to replace it with the one you are saving?"
+msgstr "Voulez-vous vraiment rétablir les paramètres initiaux ?"
+
+# TLABEL packages_2002_01_04_0147__194
+#: ../properties/nm-vpnc-dialog.glade.h:1
+#, fuzzy
+msgid "Connection Name"
+msgstr "Description : "
+
+# TLABEL support_2002_01_04_0147__23
+#: ../properties/nm-vpnc-dialog.glade.h:2
+#, fuzzy
+msgid "Required Information"
+msgstr "Informations relatives à l'assistance technique\n"
+
+#: ../properties/nm-vpnc-dialog.glade.h:3
+msgid "example: 172.16.0.0/16 10.11.12.0/24"
+msgstr ""
+
+# TLABEL users_2002_01_04_0147__77
+#: ../properties/nm-vpnc-dialog.glade.h:4
+#, fuzzy
+msgid "G_roup Name:"
+msgstr "Nom du groupe :"
+
+# TLABEL online_update_2002_01_04_0147__48
+#: ../properties/nm-vpnc-dialog.glade.h:5
+#, fuzzy
+msgid "O_ptional Information"
+msgstr "Informations facultatives"
+
+# TLABEL printer_2002_08_07_0216__230
+#: ../properties/nm-vpnc-dialog.glade.h:6
+#, fuzzy
+msgid "Override _user name"
+msgstr "Ou taper un nom d'&utilisateur :"
+
+#: ../properties/nm-vpnc-dialog.glade.h:7
+msgid ""
+"Please enter the information provided by your system administrator below. Do "
+"not enter your password here as you will be prompted when connecting."
+msgstr ""
+
+# TLABEL autoinst_2002_08_07_0216__146
+#: ../properties/nm-vpnc-dialog.glade.h:8
+#, fuzzy
+msgid "Use _domain for authentication"
+msgstr "Authentification de l'utilisateur"
+
+# TLABEL autoinst_2002_08_07_0216__316
+#: ../properties/nm-vpnc-dialog.glade.h:9
+#, fuzzy
+msgid "_Gateway:"
+msgstr "Passerelle"
+
+#: ../properties/nm-vpnc-dialog.glade.h:10
+#, fuzzy
+msgid "_Import Saved Configuration..."
+msgstr "Configuration du &serveur..."
+
+#: ../properties/nm-vpnc-dialog.glade.h:11
+msgid ""
+"_Name used to identify the connection to the private network, e.g. \"Campus "
+"VPN\" or \"Corporate Network\""
+msgstr ""
+
+#: ../properties/nm-vpnc-dialog.glade.h:12
+msgid "_Only use VPN connection for these addresses"
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:116
+msgid ""
+"The VPN login failed because the user name and password were not accepted."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:118
+msgid "The VPN login failed because the VPN program could not be started."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:120
+msgid ""
+"The VPN login failed because the VPN program could not connect to the VPN "
+"server."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:122
+msgid ""
+"The VPN login failed because the VPN configuration options were invalid."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:124
+msgid ""
+"The VPN login failed because the VPN program received an invalid "
+"configuration from the VPN server."
+msgstr ""
diff -urN NetworkManager-vpnc-0.5.0cvs20060202/po/hu.po NetworkManager-vpnc-CVS/po/hu.po
--- NetworkManager-vpnc-0.5.0cvs20060202/po/hu.po	1970-01-01 03:00:00.000000000 +0300
+++ NetworkManager-vpnc-CVS/po/hu.po	2006-05-18 23:34:21.000000000 +0300
@@ -0,0 +1,274 @@
+# Hungarian message File YaST2 (@memory@).
+# Copyright (C) 2005 SUSE Linux Products GmbH.
+# Copyright (C) 2002 SuSE Linux AG.
+# Copyright (C) 2000, 2001 SuSE GmbH.
+# Marcel Hilzinger <hili@suselinux.hu>, 2001.
+# Sári Gábor <saga@tux.hu>, 2000.
+# Steve Varadi <svaradi@usa.com>, 2000.
+# Zoltán Levárdy <pogacsa@programmer.net>, 1999.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: YaST (@memory@)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-05-16 17:10+0200\n"
+"PO-Revision-Date: 2001-10-18 09:42+0200\n"
+"Last-Translator: Marcel Hilzinger <hili@suselinux.hu>\n"
+"Language-Team: Hungarian <i18n@suse.de>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:147
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "Jelszó &ellenőrzése:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:267
+#, fuzzy
+msgid "_Username:"
+msgstr "&Felhasználónév:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:269
+#, fuzzy
+msgid "_Domain:"
+msgstr "&Tartomány:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:271
+#, fuzzy
+msgid "_Password:"
+msgstr "Jelszó:"
+
+# clients/printconf_ask_device.ycp:192
+#: ../auth-dialog/gnome-two-password-dialog.c:354
+#, fuzzy
+msgid "Connect _anonymously"
+msgstr "Kapcsolatok"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:359
+#, fuzzy
+msgid "Connect as _user:"
+msgstr "Csatlakoztatva másképp: "
+
+#: ../auth-dialog/gnome-two-password-dialog.c:465
+#, fuzzy
+msgid "_Remember passwords for this session"
+msgstr "Az ellenőrzéshez adja meg a &jelszót újból:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:467
+#, fuzzy
+msgid "_Save passwords in keyring"
+msgstr "Jelszótitkosítás beállítása"
+
+#: ../auth-dialog/main.c:161
+#, c-format
+msgid "You need to authenticate to access the Virtual Private Network '%s'."
+msgstr ""
+
+# modules/inst_sw_single.ycp:63
+# clients/inst_sw_single.ycp:118
+#: ../auth-dialog/main.c:162
+#, fuzzy
+msgid "Authenticate VPN"
+msgstr "Hitelesítés"
+
+#: ../auth-dialog/main.c:169
+#, fuzzy
+msgid "_Group Password:"
+msgstr "Jelszó:"
+
+#: ../nm-vpnc.desktop.in.h:1
+msgid "Add, Remove, and Edit VPN Connections"
+msgstr ""
+
+# clients/lan_modem.ycp:793
+#: ../nm-vpnc.desktop.in.h:2
+#, fuzzy
+msgid "VPN Connection Manager (vpnc)"
+msgstr "Kapcsolatkezelés"
+
+#: ../properties/nm-vpnc.c:83
+msgid "Compatible Cisco VPN client (vpnc)"
+msgstr ""
+
+#: ../properties/nm-vpnc.c:447
+#, fuzzy
+msgid "The following vpnc VPN connection will be created:"
+msgstr "A következő lapolvasók kerülnek deaktiválásra:"
+
+#: ../properties/nm-vpnc.c:449
+#, fuzzy, c-format
+msgid "Name: %s"
+msgstr "&Név:"
+
+#: ../properties/nm-vpnc.c:452
+#, fuzzy, c-format
+msgid "Gateway: %s"
+msgstr "Átjáró: %1"
+
+# /usr/lib/YaST2/clients/lan_dns.ycp:85
+# clients/lan_dns.ycp:269
+#: ../properties/nm-vpnc.c:454
+#, fuzzy, c-format
+msgid "Group Name: %s"
+msgstr "Csoportnév:"
+
+# /usr/lib/YaST2/clients/lan_dns.ycp:85
+# clients/lan_dns.ycp:269
+#: ../properties/nm-vpnc.c:458
+#, fuzzy, c-format
+msgid "Username: %s"
+msgstr "Felhasználónév: %1"
+
+#: ../properties/nm-vpnc.c:463
+#, fuzzy, c-format
+msgid "Domain: %s"
+msgstr "&Tartomány:"
+
+#: ../properties/nm-vpnc.c:468
+#, fuzzy, c-format
+msgid "Routes: %s"
+msgstr "Útvonalak: %1"
+
+#: ../properties/nm-vpnc.c:472
+msgid "The connection details can be changed using the \"Edit\" button."
+msgstr ""
+
+#: ../properties/nm-vpnc.c:548
+#, fuzzy
+msgid "TCP tunneling not supported"
+msgstr "Jelenleg nem támogatott."
+
+#: ../properties/nm-vpnc.c:550
+#, c-format
+msgid ""
+"The VPN settings file '%s' specifies that VPN traffic should be tunneled "
+"through TCP which is currently not supported in the vpnc software.\n"
+"\n"
+"The connection can still be created, with TCP tunneling disabled, however it "
+"may not work as expected."
+msgstr ""
+
+#: ../properties/nm-vpnc.c:574
+#, fuzzy
+msgid "Cannot import settings"
+msgstr "A beállítások mentése nem sikerült!"
+
+#: ../properties/nm-vpnc.c:576
+#, fuzzy, c-format
+msgid "The VPN settings file '%s' does not contain valid data."
+msgstr "A megadott fájl nem tartalmaz TSIG kulcsot"
+
+#: ../properties/nm-vpnc.c:593
+#, fuzzy
+msgid "Select file to import"
+msgstr "Válassza ki, hogy melyik fájlt szeretné betölteni."
+
+#. printf ("in impl_export\n");
+#: ../properties/nm-vpnc.c:748
+msgid "Save as..."
+msgstr "Mentés másként..."
+
+#: ../properties/nm-vpnc.c:778
+#, fuzzy, c-format
+msgid "A file named \"%s\" already exists."
+msgstr "%1 nevű gép már létezik."
+
+# modules/inst_sw_select.ycp:273
+# /usr/lib/YaST2/clients/inst_sw_select.ycp:380
+# clients/inst_sw_select.ycp:345
+#: ../properties/nm-vpnc.c:781
+#, fuzzy
+msgid "Do you want to replace it with the one you are saving?"
+msgstr "Valóban eldobja részletezett választását?"
+
+#: ../properties/nm-vpnc-dialog.glade.h:1
+#, fuzzy
+msgid "Connection Name"
+msgstr "Leírás:"
+
+#: ../properties/nm-vpnc-dialog.glade.h:2
+#, fuzzy
+msgid "Required Information"
+msgstr "Támogatási információ\n"
+
+#: ../properties/nm-vpnc-dialog.glade.h:3
+msgid "example: 172.16.0.0/16 10.11.12.0/24"
+msgstr ""
+
+# /usr/lib/YaST2/clients/lan_dns.ycp:85
+# clients/lan_dns.ycp:269
+#: ../properties/nm-vpnc-dialog.glade.h:4
+#, fuzzy
+msgid "G_roup Name:"
+msgstr "Csoportnév:"
+
+#: ../properties/nm-vpnc-dialog.glade.h:5
+#, fuzzy
+msgid "O_ptional Information"
+msgstr "Részletes adatok"
+
+#: ../properties/nm-vpnc-dialog.glade.h:6
+#, fuzzy
+msgid "Override _user name"
+msgstr "Vagy adjon meg egy &felhasználót:"
+
+#: ../properties/nm-vpnc-dialog.glade.h:7
+msgid ""
+"Please enter the information provided by your system administrator below. Do "
+"not enter your password here as you will be prompted when connecting."
+msgstr ""
+
+# modules/inst_sw_single.ycp:63
+# clients/inst_sw_single.ycp:118
+#: ../properties/nm-vpnc-dialog.glade.h:8
+#, fuzzy
+msgid "Use _domain for authentication"
+msgstr "Felhasználók hitelesítése"
+
+#: ../properties/nm-vpnc-dialog.glade.h:9
+#, fuzzy
+msgid "_Gateway:"
+msgstr "Átjáró"
+
+#: ../properties/nm-vpnc-dialog.glade.h:10
+#, fuzzy
+msgid "_Import Saved Configuration..."
+msgstr "Ki&szolgáló beállítások..."
+
+#: ../properties/nm-vpnc-dialog.glade.h:11
+msgid ""
+"_Name used to identify the connection to the private network, e.g. \"Campus "
+"VPN\" or \"Corporate Network\""
+msgstr ""
+
+#: ../properties/nm-vpnc-dialog.glade.h:12
+msgid "_Only use VPN connection for these addresses"
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:116
+msgid ""
+"The VPN login failed because the user name and password were not accepted."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:118
+msgid "The VPN login failed because the VPN program could not be started."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:120
+msgid ""
+"The VPN login failed because the VPN program could not connect to the VPN "
+"server."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:122
+msgid ""
+"The VPN login failed because the VPN configuration options were invalid."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:124
+msgid ""
+"The VPN login failed because the VPN program received an invalid "
+"configuration from the VPN server."
+msgstr ""
diff -urN NetworkManager-vpnc-0.5.0cvs20060202/po/it.po NetworkManager-vpnc-CVS/po/it.po
--- NetworkManager-vpnc-0.5.0cvs20060202/po/it.po	1970-01-01 03:00:00.000000000 +0300
+++ NetworkManager-vpnc-CVS/po/it.po	2006-05-18 23:34:21.000000000 +0300
@@ -0,0 +1,265 @@
+# Italian message file for YaST2 (@memory@).
+# Copyright (C) 2005 SUSE Linux Products GmbH.
+# Copyright (C) 2002 SuSE Linux AG.
+# Copyright (C) 1999, 2000, 2001 SuSE GmbH.
+# Franca Delcarlo <francad@attglobal.net>, 1999, 2000, 2001.
+# Karl Eichwalder <ke@suse.de>, 2000.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: YaST (@memory@)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-05-16 17:10+0200\n"
+"PO-Revision-Date: 2001-07-18 11:04+0200\n"
+"Last-Translator: Franca Delcarlo <francad@attglobal.net>\n"
+"Language-Team: i18n <i18n@suse.de>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+# TLABEL modules/inst_user.ycp:27
+#: ../auth-dialog/gnome-two-password-dialog.c:147
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "V&erifica password:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:267
+#, fuzzy
+msgid "_Username:"
+msgstr "Nome &utente:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:269
+#, fuzzy
+msgid "_Domain:"
+msgstr "&Dominio:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:271
+#, fuzzy
+msgid "_Password:"
+msgstr "Password:"
+
+# TLABEL modules/printconf/printconf_ask_device.ycp:134
+#: ../auth-dialog/gnome-two-password-dialog.c:354
+#, fuzzy
+msgid "Connect _anonymously"
+msgstr "Connessioni"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:359
+#, fuzzy
+msgid "Connect as _user:"
+msgstr " Connesso come "
+
+#: ../auth-dialog/gnome-two-password-dialog.c:465
+#, fuzzy
+msgid "_Remember passwords for this session"
+msgstr "Ripetere la password per una &verifica:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:467
+#, fuzzy
+msgid "_Save passwords in keyring"
+msgstr "Imposta cifratura password"
+
+#: ../auth-dialog/main.c:161
+#, c-format
+msgid "You need to authenticate to access the Virtual Private Network '%s'."
+msgstr ""
+
+#: ../auth-dialog/main.c:162
+#, fuzzy
+msgid "Authenticate VPN"
+msgstr "Autenticazione"
+
+#: ../auth-dialog/main.c:169
+#, fuzzy
+msgid "_Group Password:"
+msgstr "Password:"
+
+#: ../nm-vpnc.desktop.in.h:1
+msgid "Add, Remove, and Edit VPN Connections"
+msgstr ""
+
+#: ../nm-vpnc.desktop.in.h:2
+#, fuzzy
+msgid "VPN Connection Manager (vpnc)"
+msgstr "Amministrazione delle connessioni"
+
+#: ../properties/nm-vpnc.c:83
+msgid "Compatible Cisco VPN client (vpnc)"
+msgstr ""
+
+# TLABEL modules/printconf/printconf.ycp:515
+#: ../properties/nm-vpnc.c:447
+#, fuzzy
+msgid "The following vpnc VPN connection will be created:"
+msgstr "I seguenti scanner verranno disattivati:"
+
+# TLABEL modules/inst_sw_single.ycp:510
+#: ../properties/nm-vpnc.c:449
+#, fuzzy, c-format
+msgid "Name: %s"
+msgstr "No&me:"
+
+#: ../properties/nm-vpnc.c:452
+#, fuzzy, c-format
+msgid "Gateway: %s"
+msgstr "Gateway: %1"
+
+# TLABEL modules/lan/lan.ycp:1377
+#: ../properties/nm-vpnc.c:454
+#, fuzzy, c-format
+msgid "Group Name: %s"
+msgstr "Nome gruppo:"
+
+# TLABEL modules/lan/lan.ycp:1377
+#: ../properties/nm-vpnc.c:458
+#, fuzzy, c-format
+msgid "Username: %s"
+msgstr "Nome utente: %1"
+
+#: ../properties/nm-vpnc.c:463
+#, fuzzy, c-format
+msgid "Domain: %s"
+msgstr "&Dominio:"
+
+#: ../properties/nm-vpnc.c:468
+#, fuzzy, c-format
+msgid "Routes: %s"
+msgstr "Route: %1"
+
+#: ../properties/nm-vpnc.c:472
+msgid "The connection details can be changed using the \"Edit\" button."
+msgstr ""
+
+#: ../properties/nm-vpnc.c:548
+#, fuzzy
+msgid "TCP tunneling not supported"
+msgstr "Attualmente non supportata."
+
+#: ../properties/nm-vpnc.c:550
+#, c-format
+msgid ""
+"The VPN settings file '%s' specifies that VPN traffic should be tunneled "
+"through TCP which is currently not supported in the vpnc software.\n"
+"\n"
+"The connection can still be created, with TCP tunneling disabled, however it "
+"may not work as expected."
+msgstr ""
+
+#: ../properties/nm-vpnc.c:574
+#, fuzzy
+msgid "Cannot import settings"
+msgstr "Impossibile salvare le impostazioni!"
+
+#: ../properties/nm-vpnc.c:576
+#, fuzzy, c-format
+msgid "The VPN settings file '%s' does not contain valid data."
+msgstr "Il file specificato non contiene una chiave TSIG."
+
+#: ../properties/nm-vpnc.c:593
+#, fuzzy
+msgid "Select file to import"
+msgstr "Selezionate un file da caricare."
+
+#. printf ("in impl_export\n");
+#: ../properties/nm-vpnc.c:748
+msgid "Save as..."
+msgstr "Salva come..."
+
+#: ../properties/nm-vpnc.c:778
+#, fuzzy, c-format
+msgid "A file named \"%s\" already exists."
+msgstr "Il nome host %1 esiste già."
+
+# TLABEL modules/inst_sw_select.ycp:376
+#: ../properties/nm-vpnc.c:781
+#, fuzzy
+msgid "Do you want to replace it with the one you are saving?"
+msgstr "Volete davvero azzerare le vostre impostazioni?"
+
+#: ../properties/nm-vpnc-dialog.glade.h:1
+#, fuzzy
+msgid "Connection Name"
+msgstr "Descrizione: "
+
+#: ../properties/nm-vpnc-dialog.glade.h:2
+#, fuzzy
+msgid "Required Information"
+msgstr "Informazioni sul Supporto tecnico\n"
+
+#: ../properties/nm-vpnc-dialog.glade.h:3
+msgid "example: 172.16.0.0/16 10.11.12.0/24"
+msgstr ""
+
+# TLABEL modules/lan/lan.ycp:1377
+#: ../properties/nm-vpnc-dialog.glade.h:4
+#, fuzzy
+msgid "G_roup Name:"
+msgstr "Nome gruppo:"
+
+#: ../properties/nm-vpnc-dialog.glade.h:5
+#, fuzzy
+msgid "O_ptional Information"
+msgstr "Informazioni opzionali"
+
+#: ../properties/nm-vpnc-dialog.glade.h:6
+#, fuzzy
+msgid "Override _user name"
+msgstr "Oppure immettete il &nome utente:"
+
+#: ../properties/nm-vpnc-dialog.glade.h:7
+msgid ""
+"Please enter the information provided by your system administrator below. Do "
+"not enter your password here as you will be prompted when connecting."
+msgstr ""
+
+#: ../properties/nm-vpnc-dialog.glade.h:8
+#, fuzzy
+msgid "Use _domain for authentication"
+msgstr "Autenticazione utenti"
+
+#: ../properties/nm-vpnc-dialog.glade.h:9
+#, fuzzy
+msgid "_Gateway:"
+msgstr "Gateway"
+
+#: ../properties/nm-vpnc-dialog.glade.h:10
+#, fuzzy
+msgid "_Import Saved Configuration..."
+msgstr "Configurazione &server..."
+
+#: ../properties/nm-vpnc-dialog.glade.h:11
+msgid ""
+"_Name used to identify the connection to the private network, e.g. \"Campus "
+"VPN\" or \"Corporate Network\""
+msgstr ""
+
+#: ../properties/nm-vpnc-dialog.glade.h:12
+msgid "_Only use VPN connection for these addresses"
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:116
+msgid ""
+"The VPN login failed because the user name and password were not accepted."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:118
+msgid "The VPN login failed because the VPN program could not be started."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:120
+msgid ""
+"The VPN login failed because the VPN program could not connect to the VPN "
+"server."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:122
+msgid ""
+"The VPN login failed because the VPN configuration options were invalid."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:124
+msgid ""
+"The VPN login failed because the VPN program received an invalid "
+"configuration from the VPN server."
+msgstr ""
diff -urN NetworkManager-vpnc-0.5.0cvs20060202/po/ja.po NetworkManager-vpnc-CVS/po/ja.po
--- NetworkManager-vpnc-0.5.0cvs20060202/po/ja.po	1970-01-01 03:00:00.000000000 +0300
+++ NetworkManager-vpnc-CVS/po/ja.po	2006-05-18 23:34:21.000000000 +0300
@@ -0,0 +1,256 @@
+# Japanese message file for YaST2 (@memory@).
+# Copyright (C) 2005 SUSE Linux Products GmbH.
+# Copyright (C) 2002 SuSE Linux AG.
+# Copyright (C) 2000, 2001 SuSE GmbH.
+# Mike Fabian <mfabian@suse.de>, 2000, 2001.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: YaST (@memory@)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-05-16 17:10+0200\n"
+"PO-Revision-Date: 2001-09-24 20:04+02:00\n"
+"Last-Translator: Mike Fabian <mfabian@suse.de>\n"
+"Language-Team: Japanese <i18n@suse.de>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:147
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "パスワードの確認 (&V) :"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:267
+#, fuzzy
+msgid "_Username:"
+msgstr "ユーザ名(&U):"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:269
+#, fuzzy
+msgid "_Domain:"
+msgstr "ドメイン(&D):"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:271
+#, fuzzy
+msgid "_Password:"
+msgstr "パスワード:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:354
+#, fuzzy
+msgid "Connect _anonymously"
+msgstr "接続"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:359
+#, fuzzy
+msgid "Connect as _user:"
+msgstr "接続方法"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:465
+#, fuzzy
+msgid "_Remember passwords for this session"
+msgstr "確認のため、もう一度パスワードを入力してください(&V): "
+
+#: ../auth-dialog/gnome-two-password-dialog.c:467
+#, fuzzy
+msgid "_Save passwords in keyring"
+msgstr "パスワード暗号化の設定"
+
+#: ../auth-dialog/main.c:161
+#, c-format
+msgid "You need to authenticate to access the Virtual Private Network '%s'."
+msgstr ""
+
+#: ../auth-dialog/main.c:162
+#, fuzzy
+msgid "Authenticate VPN"
+msgstr "認証"
+
+#: ../auth-dialog/main.c:169
+#, fuzzy
+msgid "_Group Password:"
+msgstr "パスワード:"
+
+#: ../nm-vpnc.desktop.in.h:1
+msgid "Add, Remove, and Edit VPN Connections"
+msgstr ""
+
+#: ../nm-vpnc.desktop.in.h:2
+#, fuzzy
+msgid "VPN Connection Manager (vpnc)"
+msgstr "接続管理"
+
+#: ../properties/nm-vpnc.c:83
+msgid "Compatible Cisco VPN client (vpnc)"
+msgstr ""
+
+#: ../properties/nm-vpnc.c:447
+#, fuzzy
+msgid "The following vpnc VPN connection will be created:"
+msgstr "次のスキャナを無効にします。"
+
+#: ../properties/nm-vpnc.c:449
+#, fuzzy, c-format
+msgid "Name: %s"
+msgstr "名前(&M):"
+
+#: ../properties/nm-vpnc.c:452
+#, fuzzy, c-format
+msgid "Gateway: %s"
+msgstr "ゲートウェイ: %1"
+
+#: ../properties/nm-vpnc.c:454
+#, fuzzy, c-format
+msgid "Group Name: %s"
+msgstr "グループ名: "
+
+#: ../properties/nm-vpnc.c:458
+#, fuzzy, c-format
+msgid "Username: %s"
+msgstr "ユーザ名: %1"
+
+#: ../properties/nm-vpnc.c:463
+#, fuzzy, c-format
+msgid "Domain: %s"
+msgstr "ドメイン(&D):"
+
+#: ../properties/nm-vpnc.c:468
+#, fuzzy, c-format
+msgid "Routes: %s"
+msgstr "ルート: %1"
+
+#: ../properties/nm-vpnc.c:472
+msgid "The connection details can be changed using the \"Edit\" button."
+msgstr ""
+
+#: ../properties/nm-vpnc.c:548
+#, fuzzy
+msgid "TCP tunneling not supported"
+msgstr "現在サポートされていません。"
+
+#: ../properties/nm-vpnc.c:550
+#, c-format
+msgid ""
+"The VPN settings file '%s' specifies that VPN traffic should be tunneled "
+"through TCP which is currently not supported in the vpnc software.\n"
+"\n"
+"The connection can still be created, with TCP tunneling disabled, however it "
+"may not work as expected."
+msgstr ""
+
+#: ../properties/nm-vpnc.c:574
+#, fuzzy
+msgid "Cannot import settings"
+msgstr "設定を書き込めません！"
+
+#: ../properties/nm-vpnc.c:576
+#, fuzzy, c-format
+msgid "The VPN settings file '%s' does not contain valid data."
+msgstr "指定されたファイルにはTSIGキーがありません。"
+
+#: ../properties/nm-vpnc.c:593
+#, fuzzy
+msgid "Select file to import"
+msgstr "読み込むファイルを選択します。"
+
+#. printf ("in impl_export\n");
+#: ../properties/nm-vpnc.c:748
+msgid "Save as..."
+msgstr "名前を付けて保存..."
+
+#: ../properties/nm-vpnc.c:778
+#, fuzzy, c-format
+msgid "A file named \"%s\" already exists."
+msgstr "%1 という名前のホストはすでに存在します。"
+
+#: ../properties/nm-vpnc.c:781
+#, fuzzy
+msgid "Do you want to replace it with the one you are saving?"
+msgstr "本当に設定をリセットしてもよろしいですか?"
+
+#: ../properties/nm-vpnc-dialog.glade.h:1
+#, fuzzy
+msgid "Connection Name"
+msgstr "説明: "
+
+#: ../properties/nm-vpnc-dialog.glade.h:2
+#, fuzzy
+msgid "Required Information"
+msgstr "サポート情報\n"
+
+#: ../properties/nm-vpnc-dialog.glade.h:3
+msgid "example: 172.16.0.0/16 10.11.12.0/24"
+msgstr ""
+
+#: ../properties/nm-vpnc-dialog.glade.h:4
+#, fuzzy
+msgid "G_roup Name:"
+msgstr "グループ名: "
+
+#: ../properties/nm-vpnc-dialog.glade.h:5
+#, fuzzy
+msgid "O_ptional Information"
+msgstr "オプションの情報"
+
+#: ../properties/nm-vpnc-dialog.glade.h:6
+#, fuzzy
+msgid "Override _user name"
+msgstr "またはユーザ名を入力します(&U):"
+
+#: ../properties/nm-vpnc-dialog.glade.h:7
+msgid ""
+"Please enter the information provided by your system administrator below. Do "
+"not enter your password here as you will be prompted when connecting."
+msgstr ""
+
+#: ../properties/nm-vpnc-dialog.glade.h:8
+#, fuzzy
+msgid "Use _domain for authentication"
+msgstr "ユーザ認証"
+
+#: ../properties/nm-vpnc-dialog.glade.h:9
+#, fuzzy
+msgid "_Gateway:"
+msgstr "ゲートウェイ"
+
+#: ../properties/nm-vpnc-dialog.glade.h:10
+#, fuzzy
+msgid "_Import Saved Configuration..."
+msgstr "サーバの環境設定(&S)..."
+
+#: ../properties/nm-vpnc-dialog.glade.h:11
+msgid ""
+"_Name used to identify the connection to the private network, e.g. \"Campus "
+"VPN\" or \"Corporate Network\""
+msgstr ""
+
+#: ../properties/nm-vpnc-dialog.glade.h:12
+msgid "_Only use VPN connection for these addresses"
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:116
+msgid ""
+"The VPN login failed because the user name and password were not accepted."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:118
+msgid "The VPN login failed because the VPN program could not be started."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:120
+msgid ""
+"The VPN login failed because the VPN program could not connect to the VPN "
+"server."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:122
+msgid ""
+"The VPN login failed because the VPN configuration options were invalid."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:124
+msgid ""
+"The VPN login failed because the VPN program received an invalid "
+"configuration from the VPN server."
+msgstr ""
diff -urN NetworkManager-vpnc-0.5.0cvs20060202/po/pl.po NetworkManager-vpnc-CVS/po/pl.po
--- NetworkManager-vpnc-0.5.0cvs20060202/po/pl.po	1970-01-01 03:00:00.000000000 +0300
+++ NetworkManager-vpnc-CVS/po/pl.po	2006-06-16 23:00:03.000000000 +0300
@@ -0,0 +1,222 @@
+# Polish message file for YaST2 (@memory@).
+# Copyright (C) 2005 SUSE Linux Products GmbH.
+# Copyright (C) 2003 SuSE Linux AG.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: YaST (@memory@)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-05-16 17:10+0200\n"
+"PO-Revision-Date: 2006-06-12 21:19+0100\n"
+"Last-Translator: Wadim Dziedzic <nikdo@aviary.pl>\n"
+"Language-Team: Polish <i18n@suse.de>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:147
+msgid "_Secondary Password:"
+msgstr "Hasło _dodatkowe:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:267
+msgid "_Username:"
+msgstr "Nazwa _użytkownika:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:269
+msgid "_Domain:"
+msgstr "_Domena:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:271
+msgid "_Password:"
+msgstr "_Hasło:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:354
+msgid "Connect _anonymously"
+msgstr "Połącz _anonimowo"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:359
+msgid "Connect as _user:"
+msgstr "Połącz jako _użytkownik:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:465
+msgid "_Remember password for this session"
+msgstr "_Zapamiętaj hasło w tej sesji"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:467
+msgid "_Save password in keyring"
+msgstr "_Zapamiętaj hasło"
+
+#: ../auth-dialog/main.c:161
+#, c-format
+msgid "You need to authenticate to access the Virtual Private Network '%s'."
+msgstr "Aby uzyskać dostęp do Wirtualnej Sieci Prywatnej '%s', należy wykonać uwierzytelnianie."
+
+#: ../auth-dialog/main.c:162
+msgid "Authenticate VPN"
+msgstr "Uwierzytelnij VPN"
+
+#: ../auth-dialog/main.c:169
+msgid "_Group Password:"
+msgstr "Hasło _grupy:"
+
+#: ../nm-vpnc.desktop.in.h:1
+msgid "Add, Remove, and Edit VPN Connections"
+msgstr "Dodawanie, usuwanie i edycja połączeń VPN"
+
+#: ../nm-vpnc.desktop.in.h:2
+msgid "VPN Connection Manager (vpnc)"
+msgstr "Połączenia VPN (vpnc)"
+
+#: ../properties/nm-vpnc.c:83
+msgid "Compatible Cisco VPN client (vpnc)"
+msgstr "Klient kompatybilny z Cisco VPN (vpnc)"
+
+#: ../properties/nm-vpnc.c:447
+msgid "The following vpnc VPN connection will be created:"
+msgstr "Utworzone zostanie poniższe połączenie VPN vpnc:"
+
+#: ../properties/nm-vpnc.c:449
+#, c-format
+msgid "Name: %s"
+msgstr "Nazwa: %s"
+
+#: ../properties/nm-vpnc.c:452
+#, c-format
+msgid "Gateway: %s"
+msgstr "Brama: %s"
+
+#: ../properties/nm-vpnc.c:454
+#, c-format
+msgid "Group Name: %s"
+msgstr "Nazwa grupy: %s"
+
+#: ../properties/nm-vpnc.c:458
+#, c-format
+msgid "Username: %s"
+msgstr "Nazwa użytkownika: %s"
+
+#: ../properties/nm-vpnc.c:463
+#, c-format
+msgid "Domain: %s"
+msgstr "Domena: %s"
+
+#: ../properties/nm-vpnc.c:468
+#, c-format
+msgid "Routes: %s"
+msgstr "Trasy: %s"
+
+#: ../properties/nm-vpnc.c:472
+msgid "The connection details can be changed using the \"Edit\" button."
+msgstr "Szczegóły połączenia można zmienić za pomocą przycisku \"Edytuj\"."
+
+#: ../properties/nm-vpnc.c:548
+msgid "TCP tunneling not supported"
+msgstr "Tunelowanie TCP nie jest obsługiwane"
+
+#: ../properties/nm-vpnc.c:550
+#, c-format
+msgid ""
+"The VPN settings file '%s' specifies that VPN traffic should be tunneled through TCP which is currently not supported in the vpnc software.\n"
+"\n"
+"The connection can still be created, with TCP tunneling disabled, however it may not work as expected."
+msgstr ""
+"Plik ustawień VPN '%s' określa, że ruch VPN ma być tunelowany poprzez TCP. Opcja nie jest jednak obsługiwana przez program vpnc\n"
+"\n"
+"Połączenie z wyłączonym tunelowaniem TCP może nie działać poprawnie."
+
+#: ../properties/nm-vpnc.c:574
+msgid "Cannot import settings"
+msgstr "Nie można zaimportować ustawień"
+
+#: ../properties/nm-vpnc.c:576
+#, c-format
+msgid "The VPN settings file '%s' does not contain valid data."
+msgstr "Plik ustawień VPN '%s' nie zawiera poprawnych danych."
+
+#: ../properties/nm-vpnc.c:593
+msgid "Select file to import"
+msgstr "Plik do zaimportowania"
+
+#. printf ("in impl_export\n");
+#: ../properties/nm-vpnc.c:748
+msgid "Save as..."
+msgstr "Zapisz jako..."
+
+#: ../properties/nm-vpnc.c:778
+#, c-format
+msgid "A file named \"%s\" already exists."
+msgstr "Plik \"%s\" już istnieje."
+
+#: ../properties/nm-vpnc.c:781
+msgid "Do you want to replace it with the one you are saving?"
+msgstr "Czy nadpisać go zapisywanym plikiem?"
+
+#: ../properties/nm-vpnc-dialog.glade.h:1
+msgid "Connection Name"
+msgstr "Nazwa połączenia"
+
+#: ../properties/nm-vpnc-dialog.glade.h:2
+msgid "Required Information"
+msgstr "Informacje wymagane"
+
+#: ../properties/nm-vpnc-dialog.glade.h:3
+msgid "example: 172.16.0.0/16 10.11.12.0/24"
+msgstr "przykład: 172.16.0.0/16 10.11.12.0/24"
+
+#: ../properties/nm-vpnc-dialog.glade.h:4
+msgid "G_roup Name:"
+msgstr "Nazwa g_rupy:"
+
+#: ../properties/nm-vpnc-dialog.glade.h:5
+msgid "O_ptional Information"
+msgstr "Informacje _dodatkowe"
+
+#: ../properties/nm-vpnc-dialog.glade.h:6
+msgid "Override _user name"
+msgstr "Wymuś _nazwę użytkownika"
+
+#: ../properties/nm-vpnc-dialog.glade.h:7
+msgid "Please enter the information provided by your system administrator below. Do not enter your password here as you will be prompted when connecting."
+msgstr "Proszę podać poniżej informacje dostarczone przez administratora. Hasło trzeba będzie podać później, podczas łączenia."
+
+#: ../properties/nm-vpnc-dialog.glade.h:8
+msgid "Use _domain for authentication"
+msgstr "Użyj _domeny do uwierzytelniania"
+
+#: ../properties/nm-vpnc-dialog.glade.h:9
+msgid "_Gateway:"
+msgstr "_Brama:"
+
+#: ../properties/nm-vpnc-dialog.glade.h:10
+msgid "_Import Saved Configuration..."
+msgstr "_Importuj konfigurację..."
+
+#: ../properties/nm-vpnc-dialog.glade.h:11
+msgid "_Name used to identify the connection to the private network, e.g. \"Campus VPN\" or \"Corporate Network\""
+msgstr "_Nazwa identyfikująca połączenie do sieci prywatnej. Np. \"VPN kampusu\" lub \"Sieć firmowa\""
+
+#: ../properties/nm-vpnc-dialog.glade.h:12
+msgid "_Only use VPN connection for these addresses"
+msgstr "_Używaj połączeń VPN tylko dla tych adresów"
+
+#: ../src/nm-vpnc-service.c:116
+msgid "The VPN login failed because the user name and password were not accepted."
+msgstr "Logowanie VPN zakończone niepowodzeniem z powodu błędnego użytkownika i hasła."
+
+#: ../src/nm-vpnc-service.c:118
+msgid "The VPN login failed because the VPN program could not be started."
+msgstr "Logowanie VPN zakończone niepowodzeniem z powodu niemożności uruchomienia programu VPN."
+
+#: ../src/nm-vpnc-service.c:120
+msgid "The VPN login failed because the VPN program could not connect to the VPN server."
+msgstr "Logowanie VPN zakończone niepowodzeniem z powodu braku połączenia z serwerem VPN."
+
+#: ../src/nm-vpnc-service.c:122
+msgid "The VPN login failed because the VPN configuration options were invalid."
+msgstr "Logowanie VPN zakończone niepowodzeniem z powodu błędnych opcji konfiguracyjnych."
+
+#: ../src/nm-vpnc-service.c:124
+msgid "The VPN login failed because the VPN program received an invalid configuration from the VPN server."
+msgstr "Logowanie VPN zakończone niepowodzeniem z powodu otrzymania od serwera VPN błędnej konfiguracji."
+
diff -urN NetworkManager-vpnc-0.5.0cvs20060202/po/pt_BR.po NetworkManager-vpnc-CVS/po/pt_BR.po
--- NetworkManager-vpnc-0.5.0cvs20060202/po/pt_BR.po	1970-01-01 03:00:00.000000000 +0300
+++ NetworkManager-vpnc-CVS/po/pt_BR.po	2006-05-18 23:34:21.000000000 +0300
@@ -0,0 +1,257 @@
+# Portugese (Brasilian) message file for YaST2 (@memory@).
+# Copyright (C) 2005 SUSE Linux Products GmbH.
+# Copyright (C) 2002 SuSE Linux AG.
+# Copyright (C) 1999-2000, 2001 SuSE GmbH.
+# Karl Eichwalder <ke@suse.de>, 1999.
+# Ralf Lanz <rlanz@genix.com.br>, 1999.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: YaST (@memory@)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-05-16 17:10+0200\n"
+"PO-Revision-Date: 2002-07-01 14:56+0200\n"
+"Last-Translator: Ralf Lanz <rlanz@genix.com.br>\n"
+"Language-Team: Brazilian Portuguese <i18n@suse.de>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n>1;\n"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:147
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "V&erifique a Senha:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:267
+#, fuzzy
+msgid "_Username:"
+msgstr "Nome de &Usuário:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:269
+#, fuzzy
+msgid "_Domain:"
+msgstr "&Domínio:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:271
+#, fuzzy
+msgid "_Password:"
+msgstr "Senha:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:354
+#, fuzzy
+msgid "Connect _anonymously"
+msgstr "Conexões"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:359
+#, fuzzy
+msgid "Connect as _user:"
+msgstr "Conectado Como "
+
+#: ../auth-dialog/gnome-two-password-dialog.c:465
+#, fuzzy
+msgid "_Remember passwords for this session"
+msgstr "Entre novamente a senha para &verificação:"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:467
+#, fuzzy
+msgid "_Save passwords in keyring"
+msgstr "Configurar Criptografia de senha"
+
+#: ../auth-dialog/main.c:161
+#, c-format
+msgid "You need to authenticate to access the Virtual Private Network '%s'."
+msgstr ""
+
+#: ../auth-dialog/main.c:162
+#, fuzzy
+msgid "Authenticate VPN"
+msgstr "Autenticação"
+
+#: ../auth-dialog/main.c:169
+#, fuzzy
+msgid "_Group Password:"
+msgstr "Senha:"
+
+#: ../nm-vpnc.desktop.in.h:1
+msgid "Add, Remove, and Edit VPN Connections"
+msgstr ""
+
+#: ../nm-vpnc.desktop.in.h:2
+#, fuzzy
+msgid "VPN Connection Manager (vpnc)"
+msgstr "Gerenciamento de Conexão"
+
+#: ../properties/nm-vpnc.c:83
+msgid "Compatible Cisco VPN client (vpnc)"
+msgstr ""
+
+#: ../properties/nm-vpnc.c:447
+#, fuzzy
+msgid "The following vpnc VPN connection will be created:"
+msgstr "Os seguintes scanners serão desativados:"
+
+#: ../properties/nm-vpnc.c:449
+#, fuzzy, c-format
+msgid "Name: %s"
+msgstr "No&me:"
+
+#: ../properties/nm-vpnc.c:452
+#, fuzzy, c-format
+msgid "Gateway: %s"
+msgstr "Gateway: %1"
+
+#: ../properties/nm-vpnc.c:454
+#, fuzzy, c-format
+msgid "Group Name: %s"
+msgstr "Nome de Grupo:"
+
+#: ../properties/nm-vpnc.c:458
+#, fuzzy, c-format
+msgid "Username: %s"
+msgstr "Nome de Usuário: %1"
+
+#: ../properties/nm-vpnc.c:463
+#, fuzzy, c-format
+msgid "Domain: %s"
+msgstr "&Domínio:"
+
+#: ../properties/nm-vpnc.c:468
+#, fuzzy, c-format
+msgid "Routes: %s"
+msgstr "Rotas: %1"
+
+#: ../properties/nm-vpnc.c:472
+msgid "The connection details can be changed using the \"Edit\" button."
+msgstr ""
+
+#: ../properties/nm-vpnc.c:548
+#, fuzzy
+msgid "TCP tunneling not supported"
+msgstr "Sem suporte no momento."
+
+#: ../properties/nm-vpnc.c:550
+#, c-format
+msgid ""
+"The VPN settings file '%s' specifies that VPN traffic should be tunneled "
+"through TCP which is currently not supported in the vpnc software.\n"
+"\n"
+"The connection can still be created, with TCP tunneling disabled, however it "
+"may not work as expected."
+msgstr ""
+
+#: ../properties/nm-vpnc.c:574
+#, fuzzy
+msgid "Cannot import settings"
+msgstr "Não pode gravar configurações!"
+
+#: ../properties/nm-vpnc.c:576
+#, fuzzy, c-format
+msgid "The VPN settings file '%s' does not contain valid data."
+msgstr "O arquivo especificado não contém uma chave TSIG."
+
+#: ../properties/nm-vpnc.c:593
+#, fuzzy
+msgid "Select file to import"
+msgstr "Selecione um arquivo para carregar."
+
+#. printf ("in impl_export\n");
+#: ../properties/nm-vpnc.c:748
+msgid "Save as..."
+msgstr "Salvar como ..."
+
+#: ../properties/nm-vpnc.c:778
+#, fuzzy, c-format
+msgid "A file named \"%s\" already exists."
+msgstr "Um host denominado %1 já existe."
+
+#: ../properties/nm-vpnc.c:781
+#, fuzzy
+msgid "Do you want to replace it with the one you are saving?"
+msgstr "Você quer realmente reinicializar suas configurações?"
+
+#: ../properties/nm-vpnc-dialog.glade.h:1
+#, fuzzy
+msgid "Connection Name"
+msgstr "Descrição: "
+
+#: ../properties/nm-vpnc-dialog.glade.h:2
+#, fuzzy
+msgid "Required Information"
+msgstr "Informações de Suporte\n"
+
+#: ../properties/nm-vpnc-dialog.glade.h:3
+msgid "example: 172.16.0.0/16 10.11.12.0/24"
+msgstr ""
+
+#: ../properties/nm-vpnc-dialog.glade.h:4
+#, fuzzy
+msgid "G_roup Name:"
+msgstr "Nome de Grupo:"
+
+#: ../properties/nm-vpnc-dialog.glade.h:5
+#, fuzzy
+msgid "O_ptional Information"
+msgstr "Informações Opcionais"
+
+#: ../properties/nm-vpnc-dialog.glade.h:6
+#, fuzzy
+msgid "Override _user name"
+msgstr "Ou tecle nome-de-&usuário:"
+
+#: ../properties/nm-vpnc-dialog.glade.h:7
+msgid ""
+"Please enter the information provided by your system administrator below. Do "
+"not enter your password here as you will be prompted when connecting."
+msgstr ""
+
+#: ../properties/nm-vpnc-dialog.glade.h:8
+#, fuzzy
+msgid "Use _domain for authentication"
+msgstr "Autenticação de Usuário"
+
+#: ../properties/nm-vpnc-dialog.glade.h:9
+#, fuzzy
+msgid "_Gateway:"
+msgstr "Gateway"
+
+#: ../properties/nm-vpnc-dialog.glade.h:10
+#, fuzzy
+msgid "_Import Saved Configuration..."
+msgstr "Configuração do &Servidor..."
+
+#: ../properties/nm-vpnc-dialog.glade.h:11
+msgid ""
+"_Name used to identify the connection to the private network, e.g. \"Campus "
+"VPN\" or \"Corporate Network\""
+msgstr ""
+
+#: ../properties/nm-vpnc-dialog.glade.h:12
+msgid "_Only use VPN connection for these addresses"
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:116
+msgid ""
+"The VPN login failed because the user name and password were not accepted."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:118
+msgid "The VPN login failed because the VPN program could not be started."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:120
+msgid ""
+"The VPN login failed because the VPN program could not connect to the VPN "
+"server."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:122
+msgid ""
+"The VPN login failed because the VPN configuration options were invalid."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:124
+msgid ""
+"The VPN login failed because the VPN program received an invalid "
+"configuration from the VPN server."
+msgstr ""
diff -urN NetworkManager-vpnc-0.5.0cvs20060202/po/sv.po NetworkManager-vpnc-CVS/po/sv.po
--- NetworkManager-vpnc-0.5.0cvs20060202/po/sv.po	2005-08-12 21:28:04.000000000 +0300
+++ NetworkManager-vpnc-CVS/po/sv.po	2006-06-05 21:04:48.000000000 +0300
@@ -2,13 +2,13 @@
 # Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 # Christian Rose <menthos@menthos.com>, 2004, 2005.
 #
-# $Id: sv.po,v 1.1 2005/08/12 18:28:04 rml Exp $
+# $Id: sv.po,v 1.1.2.2 2006/06/05 18:04:48 rml Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager-vpnc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-26 01:20+0200\n"
+"POT-Creation-Date: 2006-05-16 17:10+0200\n"
 "PO-Revision-Date: 2005-06-26 01:20+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -17,157 +17,109 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.c:147
+#: ../auth-dialog/gnome-two-password-dialog.c:147
 msgid "_Secondary Password:"
 msgstr "_Andrahandslösenord:"
 
-#: vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.c:268
+#: ../auth-dialog/gnome-two-password-dialog.c:267
 msgid "_Username:"
 msgstr "_Användarnamn:"
 
-#: vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.c:270
+#: ../auth-dialog/gnome-two-password-dialog.c:269
 msgid "_Domain:"
 msgstr "_Domän:"
 
-#: vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.c:272
+#: ../auth-dialog/gnome-two-password-dialog.c:271
 msgid "_Password:"
 msgstr "_Lösenord:"
 
-#: vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.c:355
+#: ../auth-dialog/gnome-two-password-dialog.c:354
 msgid "Connect _anonymously"
 msgstr "Anslut anon_ymt"
 
-#: vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.c:360
+#: ../auth-dialog/gnome-two-password-dialog.c:359
 msgid "Connect as _user:"
 msgstr "Anslut som _användare:"
 
-#: vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.c:466
-msgid "Remember password for this session"
+#: ../auth-dialog/gnome-two-password-dialog.c:465
+#, fuzzy
+msgid "_Remember passwords for this session"
 msgstr "Kom ihåg lösenordet för denna session"
 
-#: vpn-daemons/vpnc/auth-dialog/gnome-two-password-dialog.c:468
-msgid "Save password in keyring"
+#: ../auth-dialog/gnome-two-password-dialog.c:467
+#, fuzzy
+msgid "_Save passwords in keyring"
 msgstr "Spara lösenordet i nyckelring"
 
-#: vpn-daemons/vpnc/auth-dialog/main.c:161
+#: ../auth-dialog/main.c:161
 #, c-format
 msgid "You need to authenticate to access the Virtual Private Network '%s'."
 msgstr "Du måsta autentisera för att komma åt VPN-nätverket \"%s\"."
 
-#: vpn-daemons/vpnc/auth-dialog/main.c:162
+#: ../auth-dialog/main.c:162
 msgid "Authenticate VPN"
 msgstr "Autentisera VPN"
 
-#: vpn-daemons/vpnc/auth-dialog/main.c:169
+#: ../auth-dialog/main.c:169
 msgid "_Group Password:"
 msgstr "_Grupplösenord:"
 
-#: vpn-daemons/vpnc/nm-vpnc.desktop.in.h:1
-msgid "VPN Connection Manager (vpnc)"
-msgstr "VPN-anslutningshanterare (vpnc)"
-
-#: vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade.h:1
-msgid "Connection Name"
-msgstr "Anslutningsnamn"
-
-#: vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade.h:2
-msgid "Optional Information"
-msgstr "Valfri information"
-
-#: vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade.h:3
-msgid "Required Information"
-msgstr "Nödvändig information"
-
-#: vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade.h:4
-msgid "example: 172.16.0.0/16 10.11.12.0/24"
-msgstr "exempel: 172.16.0.0/16 10.11.12.0/24"
-
-#: vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade.h:5
-msgid "Gateway:"
-msgstr "Gateway:"
-
-#: vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade.h:6
-msgid "Group Name:"
-msgstr "Gruppnamn:"
-
-#: vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade.h:7
-msgid ""
-"Name used to identify the connection to the private network, e.g. \"Campus "
-"VPN\" or \"Corporate Network\""
-msgstr ""
-"Namn som används för att identifiera anslutningen till det privata "
-"nätverket, exempelvis \"Campus-VPN\" eller \"Företagsnätverket\""
-
-#: vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade.h:8
-msgid "Only use VPN connection for these addresses"
-msgstr "Använd endast VPN-anslutning för dessa adresser"
-
-#: vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade.h:9
-msgid "Override user name"
-msgstr "Åsidosätt användarnamn"
-
-#: vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade.h:10
-msgid ""
-"Please enter the information provided by your system administrator below. Do "
-"not enter your password here as you will be prompted when connecting."
+#: ../nm-vpnc.desktop.in.h:1
+msgid "Add, Remove, and Edit VPN Connections"
 msgstr ""
-"Ange den information som har tillhandahållits av din systemadministratör "
-"nedan. Ange inte lösenordet här eftersom du kommer att efterfrågas det när "
-"du ansluter."
 
-#: vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade.h:11
-msgid "Use domain for authentication"
-msgstr "Använd domän för autentisering"
-
-#: vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade.h:12
-msgid "_Import..."
-msgstr "_Importera..."
+#: ../nm-vpnc.desktop.in.h:2
+msgid "VPN Connection Manager (vpnc)"
+msgstr "VPN-anslutningshanterare (vpnc)"
 
-#: vpn-daemons/vpnc/properties/nm-vpnc.c:83
+#: ../properties/nm-vpnc.c:83
 msgid "Compatible Cisco VPN client (vpnc)"
 msgstr "Kompatibel Cisco VPN-klient (vpnc)"
 
-#: vpn-daemons/vpnc/properties/nm-vpnc.c:448
-#, c-format
-msgid "\tUsername: %s\n"
-msgstr "\tAnvändarnamn: %s\n"
+#: ../properties/nm-vpnc.c:447
+#, fuzzy
+msgid "The following vpnc VPN connection will be created:"
+msgstr "Följande steg kommer att utföras:"
+
+#: ../properties/nm-vpnc.c:449
+#, fuzzy, c-format
+msgid "Name: %s"
+msgstr "Na&mn:"
+
+#: ../properties/nm-vpnc.c:452
+#, fuzzy, c-format
+msgid "Gateway: %s"
+msgstr "Gateway: %1"
+
+#: ../properties/nm-vpnc.c:454
+#, fuzzy, c-format
+msgid "Group Name: %s"
+msgstr "Gruppnamn:"
 
-#: vpn-daemons/vpnc/properties/nm-vpnc.c:449
-#, c-format
-msgid "\tRoutes: %s\n"
-msgstr "\tVägar: %s\n"
+#: ../properties/nm-vpnc.c:458
+#, fuzzy, c-format
+msgid "Username: %s"
+msgstr "\tAnvändarnamn: %s\n"
 
-#: vpn-daemons/vpnc/properties/nm-vpnc.c:450
-#, c-format
-msgid "\tDomain: %s\n"
+#: ../properties/nm-vpnc.c:463
+#, fuzzy, c-format
+msgid "Domain: %s"
 msgstr "\tDomän: %s\n"
 
-#: vpn-daemons/vpnc/properties/nm-vpnc.c:453
-#, c-format
-msgid ""
-"The following vpnc VPN connection will be created:\n"
-"\n"
-"\tName: %s\n"
-"\n"
-"\tGateway: %s\n"
-"\tGroup Name: %s\n"
-"%s%s%s\n"
-"The connection details can be changed using the \"Edit\" button.\n"
+#: ../properties/nm-vpnc.c:468
+#, fuzzy, c-format
+msgid "Routes: %s"
+msgstr "\tVägar: %s\n"
+
+#: ../properties/nm-vpnc.c:472
+msgid "The connection details can be changed using the \"Edit\" button."
 msgstr ""
-"Följande vpnc-VPN-anslutning kommer att skapas:\n"
-"\n"
-"\tNamn: %s\n"
-"\n"
-"\tGateway: %s\n"
-"\tGruppnamn: %s\n"
-"%s%s%s\n"
-"Anslutningsdetaljerna kan ändras genom att använda knappen \"Redigera\".\n"
 
-#: vpn-daemons/vpnc/properties/nm-vpnc.c:544
+#: ../properties/nm-vpnc.c:548
 msgid "TCP tunneling not supported"
 msgstr "TCP-tunnling stöds inte"
 
-#: vpn-daemons/vpnc/properties/nm-vpnc.c:546
+#: ../properties/nm-vpnc.c:550
 #, c-format
 msgid ""
 "The VPN settings file '%s' specifies that VPN traffic should be tunneled "
@@ -182,46 +134,111 @@
 "Anslutningen kan fortfarande skapas, med inaktiverad TCP-tunnling, men det "
 "kanske inte fungerar som väntat."
 
-#: vpn-daemons/vpnc/properties/nm-vpnc.c:570
+#: ../properties/nm-vpnc.c:574
 msgid "Cannot import settings"
 msgstr "Kan inte importera inställningar"
 
-#: vpn-daemons/vpnc/properties/nm-vpnc.c:572
+#: ../properties/nm-vpnc.c:576
 #, c-format
 msgid "The VPN settings file '%s' does not contain valid data."
 msgstr "VPN-inställningsfilen \"%s\" innehåller inte giltiga data."
 
-#: vpn-daemons/vpnc/properties/nm-vpnc.c:589
+#: ../properties/nm-vpnc.c:593
 msgid "Select file to import"
 msgstr "Välj fil att importera"
 
 #. printf ("in impl_export\n");
-#: vpn-daemons/vpnc/properties/nm-vpnc.c:744
+#: ../properties/nm-vpnc.c:748
 msgid "Save as..."
 msgstr "Spara som..."
 
-#: vpn-daemons/vpnc/properties/nm-vpnc.c:774
+#: ../properties/nm-vpnc.c:778
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "En fil med namnet \"%s\" finns redan."
 
-#: vpn-daemons/vpnc/properties/nm-vpnc.c:777
+#: ../properties/nm-vpnc.c:781
 msgid "Do you want to replace it with the one you are saving?"
 msgstr "Vill du ersätta den med den du håller på att spara?"
 
-#: vpn-daemons/vpnc/src/nm-vpnc-service.c:115
+#: ../properties/nm-vpnc-dialog.glade.h:1
+msgid "Connection Name"
+msgstr "Anslutningsnamn"
+
+#: ../properties/nm-vpnc-dialog.glade.h:2
+msgid "Required Information"
+msgstr "Nödvändig information"
+
+#: ../properties/nm-vpnc-dialog.glade.h:3
+msgid "example: 172.16.0.0/16 10.11.12.0/24"
+msgstr "exempel: 172.16.0.0/16 10.11.12.0/24"
+
+#: ../properties/nm-vpnc-dialog.glade.h:4
+#, fuzzy
+msgid "G_roup Name:"
+msgstr "Gruppnamn:"
+
+#: ../properties/nm-vpnc-dialog.glade.h:5
+#, fuzzy
+msgid "O_ptional Information"
+msgstr "Ytterligare information"
+
+#: ../properties/nm-vpnc-dialog.glade.h:6
+#, fuzzy
+msgid "Override _user name"
+msgstr "Åsidosätt användarnamn"
+
+#: ../properties/nm-vpnc-dialog.glade.h:7
+msgid ""
+"Please enter the information provided by your system administrator below. Do "
+"not enter your password here as you will be prompted when connecting."
+msgstr ""
+"Ange den information som har tillhandahållits av din systemadministratör "
+"nedan. Ange inte lösenordet här eftersom du kommer att efterfrågas det när "
+"du ansluter."
+
+#: ../properties/nm-vpnc-dialog.glade.h:8
+#, fuzzy
+msgid "Use _domain for authentication"
+msgstr "Använd domän för autentisering"
+
+#: ../properties/nm-vpnc-dialog.glade.h:9
+#, fuzzy
+msgid "_Gateway:"
+msgstr "Gateway:"
+
+#: ../properties/nm-vpnc-dialog.glade.h:10
+#, fuzzy
+msgid "_Import Saved Configuration..."
+msgstr "Sparar NIS-inställningar..."
+
+#: ../properties/nm-vpnc-dialog.glade.h:11
+#, fuzzy
+msgid ""
+"_Name used to identify the connection to the private network, e.g. \"Campus "
+"VPN\" or \"Corporate Network\""
+msgstr ""
+"Namn som används för att identifiera anslutningen till det privata "
+"nätverket, exempelvis \"Campus-VPN\" eller \"Företagsnätverket\""
+
+#: ../properties/nm-vpnc-dialog.glade.h:12
+#, fuzzy
+msgid "_Only use VPN connection for these addresses"
+msgstr "Använd endast VPN-anslutning för dessa adresser"
+
+#: ../src/nm-vpnc-service.c:116
 msgid ""
 "The VPN login failed because the user name and password were not accepted."
 msgstr ""
 "VPN-inloggningen misslyckades eftersom användarnamnet och lösenordet inte "
 "accepterades."
 
-#: vpn-daemons/vpnc/src/nm-vpnc-service.c:117
+#: ../src/nm-vpnc-service.c:118
 msgid "The VPN login failed because the VPN program could not be started."
 msgstr ""
 "VPN-inloggningen misslyckades eftersom VPN-programmet inte kunde startas."
 
-#: vpn-daemons/vpnc/src/nm-vpnc-service.c:119
+#: ../src/nm-vpnc-service.c:120
 msgid ""
 "The VPN login failed because the VPN program could not connect to the VPN "
 "server."
@@ -229,14 +246,14 @@
 "VPN-inloggningen misslyckades eftersom VPN-programmet inte kunde ansluta "
 "till VPN-servern."
 
-#: vpn-daemons/vpnc/src/nm-vpnc-service.c:121
+#: ../src/nm-vpnc-service.c:122
 msgid ""
 "The VPN login failed because the VPN configuration options were invalid."
 msgstr ""
 "VPN-inloggningen misslyckades eftersom VPN-konfigurationsalternativen var "
 "ogiltiga."
 
-#: vpn-daemons/vpnc/src/nm-vpnc-service.c:123
+#: ../src/nm-vpnc-service.c:124
 msgid ""
 "The VPN login failed because the VPN program received an invalid "
 "configuration from the VPN server."
@@ -244,3 +261,27 @@
 "VPN-inloggningen misslyckades eftersom VPN-programmet mottog en ogiltig "
 "konfiguration från VPN-servern."
 
+#~ msgid "Optional Information"
+#~ msgstr "Valfri information"
+
+#~ msgid "_Import..."
+#~ msgstr "_Importera..."
+
+#~ msgid ""
+#~ "The following vpnc VPN connection will be created:\n"
+#~ "\n"
+#~ "\tName: %s\n"
+#~ "\n"
+#~ "\tGateway: %s\n"
+#~ "\tGroup Name: %s\n"
+#~ "%s%s%s\n"
+#~ "The connection details can be changed using the \"Edit\" button.\n"
+#~ msgstr ""
+#~ "Följande vpnc-VPN-anslutning kommer att skapas:\n"
+#~ "\n"
+#~ "\tNamn: %s\n"
+#~ "\n"
+#~ "\tGateway: %s\n"
+#~ "\tGruppnamn: %s\n"
+#~ "%s%s%s\n"
+#~ "Anslutningsdetaljerna kan ändras genom att använda knappen \"Redigera\".\n"
diff -urN NetworkManager-vpnc-0.5.0cvs20060202/po/zh_CN.po NetworkManager-vpnc-CVS/po/zh_CN.po
--- NetworkManager-vpnc-0.5.0cvs20060202/po/zh_CN.po	1970-01-01 03:00:00.000000000 +0300
+++ NetworkManager-vpnc-CVS/po/zh_CN.po	2006-05-18 23:34:21.000000000 +0300
@@ -0,0 +1,255 @@
+# Chinese message file for YaST2 (@memory@)
+# Copyright (C) 2005 SUSE Linux Products GmbH.
+# Copyright (C) 2002 SuSE Linux AG.
+# Copyright (C) 2001 SuSE GmbH.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: YaST (@memory@)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-05-16 17:10+0200\n"
+"PO-Revision-Date: 2004-04-02 10:52+0200\n"
+"Last-Translator: 裴寒牧 <phm@a2e.de>\n"
+"Language-Team: 中华 <nls-zh@suse.de>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:147
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "校验口令(&E)："
+
+#: ../auth-dialog/gnome-two-password-dialog.c:267
+#, fuzzy
+msgid "_Username:"
+msgstr "用户名(&U)："
+
+#: ../auth-dialog/gnome-two-password-dialog.c:269
+#, fuzzy
+msgid "_Domain:"
+msgstr "域(&D)："
+
+#: ../auth-dialog/gnome-two-password-dialog.c:271
+#, fuzzy
+msgid "_Password:"
+msgstr "口令："
+
+#: ../auth-dialog/gnome-two-password-dialog.c:354
+#, fuzzy
+msgid "Connect _anonymously"
+msgstr "连接"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:359
+#, fuzzy
+msgid "Connect as _user:"
+msgstr "连接为"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:465
+#, fuzzy
+msgid "_Remember passwords for this session"
+msgstr "再输一遍口令以便确认(&V)："
+
+#: ../auth-dialog/gnome-two-password-dialog.c:467
+#, fuzzy
+msgid "_Save passwords in keyring"
+msgstr "设置口令加密"
+
+#: ../auth-dialog/main.c:161
+#, c-format
+msgid "You need to authenticate to access the Virtual Private Network '%s'."
+msgstr ""
+
+#: ../auth-dialog/main.c:162
+#, fuzzy
+msgid "Authenticate VPN"
+msgstr "鉴定"
+
+#: ../auth-dialog/main.c:169
+#, fuzzy
+msgid "_Group Password:"
+msgstr "口令："
+
+#: ../nm-vpnc.desktop.in.h:1
+msgid "Add, Remove, and Edit VPN Connections"
+msgstr ""
+
+#: ../nm-vpnc.desktop.in.h:2
+#, fuzzy
+msgid "VPN Connection Manager (vpnc)"
+msgstr "连接管理"
+
+#: ../properties/nm-vpnc.c:83
+msgid "Compatible Cisco VPN client (vpnc)"
+msgstr ""
+
+#: ../properties/nm-vpnc.c:447
+#, fuzzy
+msgid "The following vpnc VPN connection will be created:"
+msgstr "将取消激活以下扫描仪："
+
+#: ../properties/nm-vpnc.c:449
+#, fuzzy, c-format
+msgid "Name: %s"
+msgstr "名称(&M)："
+
+#: ../properties/nm-vpnc.c:452
+#, fuzzy, c-format
+msgid "Gateway: %s"
+msgstr "网关：%1"
+
+#: ../properties/nm-vpnc.c:454
+#, fuzzy, c-format
+msgid "Group Name: %s"
+msgstr "组名："
+
+#: ../properties/nm-vpnc.c:458
+#, fuzzy, c-format
+msgid "Username: %s"
+msgstr "用户名：%1"
+
+#: ../properties/nm-vpnc.c:463
+#, fuzzy, c-format
+msgid "Domain: %s"
+msgstr "域(&D)："
+
+#: ../properties/nm-vpnc.c:468
+#, fuzzy, c-format
+msgid "Routes: %s"
+msgstr "路由: %1"
+
+#: ../properties/nm-vpnc.c:472
+msgid "The connection details can be changed using the \"Edit\" button."
+msgstr ""
+
+#: ../properties/nm-vpnc.c:548
+#, fuzzy
+msgid "TCP tunneling not supported"
+msgstr "当前不受支持。"
+
+#: ../properties/nm-vpnc.c:550
+#, c-format
+msgid ""
+"The VPN settings file '%s' specifies that VPN traffic should be tunneled "
+"through TCP which is currently not supported in the vpnc software.\n"
+"\n"
+"The connection can still be created, with TCP tunneling disabled, however it "
+"may not work as expected."
+msgstr ""
+
+#: ../properties/nm-vpnc.c:574
+#, fuzzy
+msgid "Cannot import settings"
+msgstr "无法写入设置！"
+
+#: ../properties/nm-vpnc.c:576
+#, fuzzy, c-format
+msgid "The VPN settings file '%s' does not contain valid data."
+msgstr "所选文件不包含 TSIG 密钥."
+
+#: ../properties/nm-vpnc.c:593
+#, fuzzy
+msgid "Select file to import"
+msgstr "选择要装载的文件。"
+
+#. printf ("in impl_export\n");
+#: ../properties/nm-vpnc.c:748
+msgid "Save as..."
+msgstr "另存为..."
+
+#: ../properties/nm-vpnc.c:778
+#, fuzzy, c-format
+msgid "A file named \"%s\" already exists."
+msgstr "名为 %1 的主机已存在。"
+
+#: ../properties/nm-vpnc.c:781
+#, fuzzy
+msgid "Do you want to replace it with the one you are saving?"
+msgstr "是否确实要重设置您的设置？"
+
+#: ../properties/nm-vpnc-dialog.glade.h:1
+#, fuzzy
+msgid "Connection Name"
+msgstr "说明： "
+
+#: ../properties/nm-vpnc-dialog.glade.h:2
+#, fuzzy
+msgid "Required Information"
+msgstr "支持信息\n"
+
+#: ../properties/nm-vpnc-dialog.glade.h:3
+msgid "example: 172.16.0.0/16 10.11.12.0/24"
+msgstr ""
+
+#: ../properties/nm-vpnc-dialog.glade.h:4
+#, fuzzy
+msgid "G_roup Name:"
+msgstr "组名："
+
+#: ../properties/nm-vpnc-dialog.glade.h:5
+#, fuzzy
+msgid "O_ptional Information"
+msgstr "可选信息"
+
+#: ../properties/nm-vpnc-dialog.glade.h:6
+#, fuzzy
+msgid "Override _user name"
+msgstr "或键入用户名(&U)："
+
+#: ../properties/nm-vpnc-dialog.glade.h:7
+msgid ""
+"Please enter the information provided by your system administrator below. Do "
+"not enter your password here as you will be prompted when connecting."
+msgstr ""
+
+#: ../properties/nm-vpnc-dialog.glade.h:8
+#, fuzzy
+msgid "Use _domain for authentication"
+msgstr "用户鉴定"
+
+#: ../properties/nm-vpnc-dialog.glade.h:9
+#, fuzzy
+msgid "_Gateway:"
+msgstr "网关"
+
+#: ../properties/nm-vpnc-dialog.glade.h:10
+#, fuzzy
+msgid "_Import Saved Configuration..."
+msgstr "服务器配置(&S)..."
+
+#: ../properties/nm-vpnc-dialog.glade.h:11
+msgid ""
+"_Name used to identify the connection to the private network, e.g. \"Campus "
+"VPN\" or \"Corporate Network\""
+msgstr ""
+
+#: ../properties/nm-vpnc-dialog.glade.h:12
+msgid "_Only use VPN connection for these addresses"
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:116
+msgid ""
+"The VPN login failed because the user name and password were not accepted."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:118
+msgid "The VPN login failed because the VPN program could not be started."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:120
+msgid ""
+"The VPN login failed because the VPN program could not connect to the VPN "
+"server."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:122
+msgid ""
+"The VPN login failed because the VPN configuration options were invalid."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:124
+msgid ""
+"The VPN login failed because the VPN program received an invalid "
+"configuration from the VPN server."
+msgstr ""
diff -urN NetworkManager-vpnc-0.5.0cvs20060202/po/zh_TW.po NetworkManager-vpnc-CVS/po/zh_TW.po
--- NetworkManager-vpnc-0.5.0cvs20060202/po/zh_TW.po	1970-01-01 03:00:00.000000000 +0300
+++ NetworkManager-vpnc-CVS/po/zh_TW.po	2006-05-18 23:34:21.000000000 +0300
@@ -0,0 +1,255 @@
+# Chinese message file for YaST2 (@memory@). -*- coding: utf-8 -*-
+# Copyright (C) 2005 SUSE Linux Products GmbH.
+# Copyright (C) 2002 SuSE Linux AG.
+# Copyright (C) 2001 SuSE GmbH.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: YaST (@memory@)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-05-16 17:10+0200\n"
+"PO-Revision-Date: 2001-06-05 18:04+02:00\n"
+"Last-Translator: 裴寒牧 <phm@a2e.de>\n"
+"Language-Team: 中華 <nls-zh@suse.de>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:147
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "確認密碼(&E)："
+
+#: ../auth-dialog/gnome-two-password-dialog.c:267
+#, fuzzy
+msgid "_Username:"
+msgstr "使用者名稱(&U)："
+
+#: ../auth-dialog/gnome-two-password-dialog.c:269
+#, fuzzy
+msgid "_Domain:"
+msgstr "領域(&D)："
+
+#: ../auth-dialog/gnome-two-password-dialog.c:271
+#, fuzzy
+msgid "_Password:"
+msgstr "密碼："
+
+#: ../auth-dialog/gnome-two-password-dialog.c:354
+#, fuzzy
+msgid "Connect _anonymously"
+msgstr "連線"
+
+#: ../auth-dialog/gnome-two-password-dialog.c:359
+#, fuzzy
+msgid "Connect as _user:"
+msgstr " 連接身份 "
+
+#: ../auth-dialog/gnome-two-password-dialog.c:465
+#, fuzzy
+msgid "_Remember passwords for this session"
+msgstr "重新輸入密碼以進行確認(&V)："
+
+#: ../auth-dialog/gnome-two-password-dialog.c:467
+#, fuzzy
+msgid "_Save passwords in keyring"
+msgstr "設定密碼加密"
+
+#: ../auth-dialog/main.c:161
+#, c-format
+msgid "You need to authenticate to access the Virtual Private Network '%s'."
+msgstr ""
+
+#: ../auth-dialog/main.c:162
+#, fuzzy
+msgid "Authenticate VPN"
+msgstr "驗證"
+
+#: ../auth-dialog/main.c:169
+#, fuzzy
+msgid "_Group Password:"
+msgstr "密碼："
+
+#: ../nm-vpnc.desktop.in.h:1
+msgid "Add, Remove, and Edit VPN Connections"
+msgstr ""
+
+#: ../nm-vpnc.desktop.in.h:2
+#, fuzzy
+msgid "VPN Connection Manager (vpnc)"
+msgstr "連線管理"
+
+#: ../properties/nm-vpnc.c:83
+msgid "Compatible Cisco VPN client (vpnc)"
+msgstr ""
+
+#: ../properties/nm-vpnc.c:447
+#, fuzzy
+msgid "The following vpnc VPN connection will be created:"
+msgstr "將停用下列掃描器："
+
+#: ../properties/nm-vpnc.c:449
+#, fuzzy, c-format
+msgid "Name: %s"
+msgstr "名稱(&M)："
+
+#: ../properties/nm-vpnc.c:452
+#, fuzzy, c-format
+msgid "Gateway: %s"
+msgstr "閘道：%1"
+
+#: ../properties/nm-vpnc.c:454
+#, fuzzy, c-format
+msgid "Group Name: %s"
+msgstr "群組名稱："
+
+#: ../properties/nm-vpnc.c:458
+#, fuzzy, c-format
+msgid "Username: %s"
+msgstr "使用者名稱：%1"
+
+#: ../properties/nm-vpnc.c:463
+#, fuzzy, c-format
+msgid "Domain: %s"
+msgstr "領域(&D)："
+
+#: ../properties/nm-vpnc.c:468
+#, fuzzy, c-format
+msgid "Routes: %s"
+msgstr "路由：%1"
+
+#: ../properties/nm-vpnc.c:472
+msgid "The connection details can be changed using the \"Edit\" button."
+msgstr ""
+
+#: ../properties/nm-vpnc.c:548
+#, fuzzy
+msgid "TCP tunneling not supported"
+msgstr "目前不支援。"
+
+#: ../properties/nm-vpnc.c:550
+#, c-format
+msgid ""
+"The VPN settings file '%s' specifies that VPN traffic should be tunneled "
+"through TCP which is currently not supported in the vpnc software.\n"
+"\n"
+"The connection can still be created, with TCP tunneling disabled, however it "
+"may not work as expected."
+msgstr ""
+
+#: ../properties/nm-vpnc.c:574
+#, fuzzy
+msgid "Cannot import settings"
+msgstr "無法寫入設定！"
+
+#: ../properties/nm-vpnc.c:576
+#, fuzzy, c-format
+msgid "The VPN settings file '%s' does not contain valid data."
+msgstr "指定的檔案沒有包含 TSIG 金鑰。"
+
+#: ../properties/nm-vpnc.c:593
+#, fuzzy
+msgid "Select file to import"
+msgstr "選取要載入的檔案。"
+
+#. printf ("in impl_export\n");
+#: ../properties/nm-vpnc.c:748
+msgid "Save as..."
+msgstr "另存新檔..."
+
+#: ../properties/nm-vpnc.c:778
+#, fuzzy, c-format
+msgid "A file named \"%s\" already exists."
+msgstr "名為 %1 的主機已經存在。"
+
+#: ../properties/nm-vpnc.c:781
+#, fuzzy
+msgid "Do you want to replace it with the one you are saving?"
+msgstr "您確定要重設設定嗎？"
+
+#: ../properties/nm-vpnc-dialog.glade.h:1
+#, fuzzy
+msgid "Connection Name"
+msgstr "描述： "
+
+#: ../properties/nm-vpnc-dialog.glade.h:2
+#, fuzzy
+msgid "Required Information"
+msgstr "支援資訊\n"
+
+#: ../properties/nm-vpnc-dialog.glade.h:3
+msgid "example: 172.16.0.0/16 10.11.12.0/24"
+msgstr ""
+
+#: ../properties/nm-vpnc-dialog.glade.h:4
+#, fuzzy
+msgid "G_roup Name:"
+msgstr "群組名稱："
+
+#: ../properties/nm-vpnc-dialog.glade.h:5
+#, fuzzy
+msgid "O_ptional Information"
+msgstr "選擇性資訊"
+
+#: ../properties/nm-vpnc-dialog.glade.h:6
+#, fuzzy
+msgid "Override _user name"
+msgstr "或鍵入使用者名稱(&U)："
+
+#: ../properties/nm-vpnc-dialog.glade.h:7
+msgid ""
+"Please enter the information provided by your system administrator below. Do "
+"not enter your password here as you will be prompted when connecting."
+msgstr ""
+
+#: ../properties/nm-vpnc-dialog.glade.h:8
+#, fuzzy
+msgid "Use _domain for authentication"
+msgstr "使用者驗證"
+
+#: ../properties/nm-vpnc-dialog.glade.h:9
+#, fuzzy
+msgid "_Gateway:"
+msgstr "閘道"
+
+#: ../properties/nm-vpnc-dialog.glade.h:10
+#, fuzzy
+msgid "_Import Saved Configuration..."
+msgstr "伺服器組態(&S)..."
+
+#: ../properties/nm-vpnc-dialog.glade.h:11
+msgid ""
+"_Name used to identify the connection to the private network, e.g. \"Campus "
+"VPN\" or \"Corporate Network\""
+msgstr ""
+
+#: ../properties/nm-vpnc-dialog.glade.h:12
+msgid "_Only use VPN connection for these addresses"
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:116
+msgid ""
+"The VPN login failed because the user name and password were not accepted."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:118
+msgid "The VPN login failed because the VPN program could not be started."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:120
+msgid ""
+"The VPN login failed because the VPN program could not connect to the VPN "
+"server."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:122
+msgid ""
+"The VPN login failed because the VPN configuration options were invalid."
+msgstr ""
+
+#: ../src/nm-vpnc-service.c:124
+msgid ""
+"The VPN login failed because the VPN program received an invalid "
+"configuration from the VPN server."
+msgstr ""
diff -urN NetworkManager-vpnc-0.5.0cvs20060202/properties/Makefile.am NetworkManager-vpnc-CVS/properties/Makefile.am
--- NetworkManager-vpnc-0.5.0cvs20060202/properties/Makefile.am	2005-06-12 17:34:54.000000000 +0300
+++ NetworkManager-vpnc-CVS/properties/Makefile.am	2006-11-01 18:33:28.000000000 +0200
@@ -3,29 +3,33 @@
 lib_LTLIBRARIES = libnm-vpnc-properties.la
 
 libnm_vpnc_properties_la_SOURCES = 			\
+				pcf-file.c		\
+				pcf-file.h		\
 				nm-vpnc.c
 
 gladedir = $(datadir)/gnome-vpn-properties/vpnc
 glade_DATA = nm-vpnc-dialog.glade
 
-libnm_vpnc_properties_la_CFLAGS = \
+libnm_vpnc_properties_la_CFLAGS = \
 $(GLADE_CFLAGS) \
 $(GTK_CFLAGS) \
 $(GCONF_CFLAGS) \
 $(LIBGNOMEUI_CFLAGS) \
+ $(NETWORK_MANAGER_CFLAGS) \
 -DICONDIR=\""$(datadir)/pixmaps"\" \
 -DGLADEDIR=\""$(gladedir)"\" \
 -DG_DISABLE_DEPRECATED \
 -DGDK_DISABLE_DEPRECATED \
 -DGNOME_DISABLE_DEPRECATED \
- -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+	-DGNOMELOCALEDIR=\"$(datadir)/locale\"		\
 -DVERSION=\"$(VERSION)\"
 
 libnm_vpnc_properties_la_LIBADD = \
 $(GLADE_LIBS) \
 $(GTK_LIBS) \
 $(GCONF_LIBS) \
- $(LIBGNOMEUI_LIBS)
+ $(LIBGNOMEUI_LIBS) \
+ $(NETWORK_MANAGER_LIBS)
 
 CLEANFILES = *.bak *.gladep *~
 
diff -urN NetworkManager-vpnc-0.5.0cvs20060202/properties/Makefile.in NetworkManager-vpnc-CVS/properties/Makefile.in
--- NetworkManager-vpnc-0.5.0cvs20060202/properties/Makefile.in	2006-02-02 23:48:08.000000000 +0200
+++ NetworkManager-vpnc-CVS/properties/Makefile.in	2006-11-02 10:56:16.000000000 +0200
@@ -59,8 +59,9 @@
 am__DEPENDENCIES_1 =
 libnm_vpnc_properties_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_libnm_vpnc_properties_la_OBJECTS = \
+	libnm_vpnc_properties_la-pcf-file.lo \
 	libnm_vpnc_properties_la-nm-vpnc.lo
 libnm_vpnc_properties_la_OBJECTS = \
 	$(am_libnm_vpnc_properties_la_OBJECTS)
@@ -121,8 +122,6 @@
 FFLAGS = @FFLAGS@
 GCONF_CFLAGS = @GCONF_CFLAGS@
 GCONF_LIBS = @GCONF_LIBS@
-GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@
-GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GLADE_CFLAGS = @GLADE_CFLAGS@
 GLADE_LIBS = @GLADE_LIBS@
@@ -251,6 +250,8 @@
 target_alias = @target_alias@
 lib_LTLIBRARIES = libnm-vpnc-properties.la
 libnm_vpnc_properties_la_SOURCES = \
+				pcf-file.c		\
+				pcf-file.h		\
 				nm-vpnc.c
 
 gladedir = $(datadir)/gnome-vpn-properties/vpnc
@@ -260,19 +261,21 @@
 $(GTK_CFLAGS) \
 $(GCONF_CFLAGS) \
 $(LIBGNOMEUI_CFLAGS) \
+ $(NETWORK_MANAGER_CFLAGS) \
 -DICONDIR=\""$(datadir)/pixmaps"\" \
 -DGLADEDIR=\""$(gladedir)"\" \
 -DG_DISABLE_DEPRECATED \
 -DGDK_DISABLE_DEPRECATED \
 -DGNOME_DISABLE_DEPRECATED \
- -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+	-DGNOMELOCALEDIR=\"$(datadir)/locale\"		\
 -DVERSION=\"$(VERSION)\"
 
 libnm_vpnc_properties_la_LIBADD = \
 $(GLADE_LIBS) \
 $(GTK_LIBS) \
 $(GCONF_LIBS) \
- $(LIBGNOMEUI_LIBS)
+ $(LIBGNOMEUI_LIBS) \
+ $(NETWORK_MANAGER_LIBS)
 
 CLEANFILES = *.bak *.gladep *~
 EXTRA_DIST = \
@@ -348,6 +351,7 @@
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnm_vpnc_properties_la-nm-vpnc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnm_vpnc_properties_la-pcf-file.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \
@@ -373,6 +377,13 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
+libnm_vpnc_properties_la-pcf-file.lo: pcf-file.c
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnm_vpnc_properties_la_CFLAGS) $(CFLAGS) -MT libnm_vpnc_properties_la-pcf-file.lo -MD -MP -MF "$(DEPDIR)/libnm_vpnc_properties_la-pcf-file.Tpo" -c -o libnm_vpnc_properties_la-pcf-file.lo `test -f 'pcf-file.c' || echo '$(srcdir)/'`pcf-file.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libnm_vpnc_properties_la-pcf-file.Tpo" "$(DEPDIR)/libnm_vpnc_properties_la-pcf-file.Plo"; else rm -f "$(DEPDIR)/libnm_vpnc_properties_la-pcf-file.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pcf-file.c' object='libnm_vpnc_properties_la-pcf-file.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnm_vpnc_properties_la_CFLAGS) $(CFLAGS) -c -o libnm_vpnc_properties_la-pcf-file.lo `test -f 'pcf-file.c' || echo '$(srcdir)/'`pcf-file.c
+
 libnm_vpnc_properties_la-nm-vpnc.lo: nm-vpnc.c
 @am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnm_vpnc_properties_la_CFLAGS) $(CFLAGS) -MT libnm_vpnc_properties_la-nm-vpnc.lo -MD -MP -MF "$(DEPDIR)/libnm_vpnc_properties_la-nm-vpnc.Tpo" -c -o libnm_vpnc_properties_la-nm-vpnc.lo `test -f 'nm-vpnc.c' || echo '$(srcdir)/'`nm-vpnc.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libnm_vpnc_properties_la-nm-vpnc.Tpo" "$(DEPDIR)/libnm_vpnc_properties_la-nm-vpnc.Plo"; else rm -f "$(DEPDIR)/libnm_vpnc_properties_la-nm-vpnc.Tpo"; exit 1; fi
diff -urN NetworkManager-vpnc-0.5.0cvs20060202/properties/nm-vpnc.c NetworkManager-vpnc-CVS/properties/nm-vpnc.c
--- NetworkManager-vpnc-0.5.0cvs20060202/properties/nm-vpnc.c	2005-08-15 22:34:20.000000000 +0300
+++ NetworkManager-vpnc-CVS/properties/nm-vpnc.c	2006-11-01 18:33:28.000000000 +0200
@@ -1,5 +1,5 @@
 /***************************************************************************
- * CVSID: $Id: nm-vpnc.c,v 1.5 2005/08/15 19:34:20 caillon Exp $
+ * CVSID: $Id: nm-vpnc.c,v 1.5.2.3 2006/11/01 16:33:28 tambeti Exp $
 *
 * nm-vpnc.c : GNOME UI dialogs for configuring vpnc VPN connections
 *
@@ -31,7 +31,8 @@
 
 #define NM_VPN_API_SUBJECT_TO_CHANGE
 
-#include <NetworkManager/nm-vpn-ui-interface.h>
+#include <nm-vpn-ui-interface.h>
+#include "pcf-file.h"
 
 typedef struct _NetworkManagerVpnUIImpl NetworkManagerVpnUIImpl;
 
@@ -478,95 +479,85 @@
 static gboolean
 import_from_file (NetworkManagerVpnUIImpl *impl, const char *path)
 {
-	char *basename;
-	GKeyFile *keyfile;
-	gboolean file_is_good;
-
-	/*printf ("path='%s'\n", path);*/
-
-	file_is_good = FALSE;
-	basename = g_path_get_basename (path);
-
-	keyfile = g_key_file_new ();
-	if (g_key_file_load_from_file (keyfile, path, 0, NULL)) {
-		char *connectionname = NULL;
-		char *gateway = NULL;
-		char *groupname = NULL;
-		char *username = NULL;
-		char *domain = NULL;
-		char *tunneling_mode = NULL;
-		char *routes = NULL;
-		gboolean should_expand;
-
-		if ((connectionname = g_key_file_get_string (keyfile, "main", "Description", NULL)) == NULL)
-			goto error;
-		if ((gateway = g_key_file_get_string (keyfile, "main", "Host", NULL)) == NULL)
-			goto error;
-		if ((groupname = g_key_file_get_string (keyfile, "main", "GroupName", NULL)) == NULL)
-			goto error;
-		if ((username = g_key_file_get_string (keyfile, "main", "Username", NULL)) == NULL)
-			goto error;
-		if ((domain = g_key_file_get_string (keyfile, "main", "NTDomain", NULL)) == NULL)
-			goto error;
-		if ((tunneling_mode = g_key_file_get_string (keyfile, "main", "TunnelingMode", NULL)) == NULL)
-			goto error;
-
-		/* may not exist */
-		if ((routes = g_key_file_get_string (keyfile, "main", "X-NM-Routes", NULL)) == NULL)
-			routes = g_strdup ("");
-
-		/* sanity check data */
-		if (! (strlen (gateway) > 0 &&
-		 strlen (groupname) > 0))
-			goto error;
-
-		gtk_entry_set_text (impl->w_connection_name, connectionname);
-		gtk_entry_set_text (impl->w_gateway, gateway);
-		gtk_entry_set_text (impl->w_group_name, groupname);
-
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_alternate_username), strlen (username) > 0);
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_routes), strlen (routes) > 0);
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_domain), strlen (domain) > 0);
-		gtk_entry_set_text (impl->w_username, username);
-		gtk_entry_set_text (impl->w_routes, routes);
-		gtk_entry_set_text (impl->w_domain, domain);
-		gtk_widget_set_sensitive (GTK_WIDGET (impl->w_username), strlen (username) > 0);
-		gtk_widget_set_sensitive (GTK_WIDGET (impl->w_routes), strlen (routes) > 0);
-		gtk_widget_set_sensitive (GTK_WIDGET (impl->w_domain), strlen (username) > 0);
+	GHashTable *pcf;
+	const char *buf;
+	gboolean have_value;
+	char *basename = NULL;
+	gboolean expand = FALSE;
+	gboolean success = FALSE;
+
+	pcf = pcf_file_load (path);
+	if (pcf == NULL)
+		return FALSE;
 
-		should_expand = (strlen (username) > 0) || (strlen (domain) > 0) || (strlen (routes) > 0);
-		gtk_expander_set_expanded (impl->w_opt_info_expander, should_expand);
+	/* Connection name */
+	if ((buf = pcf_file_lookup_value (pcf, "main", "Description")) == NULL || strlen (buf) < 1)
+		goto error;
+	gtk_entry_set_text (impl->w_connection_name, buf);
+
+	/* Gateway */
+	if ((buf = pcf_file_lookup_value (pcf, "main", "Host")) == NULL || strlen (buf) < 1)
+		goto error;
+	gtk_entry_set_text (impl->w_gateway, buf);
+
+	/* Group name */
+	if ((buf = pcf_file_lookup_value (pcf, "main", "GroupName")) == NULL || strlen (buf) < 1)
+		goto error;
+	gtk_entry_set_text (impl->w_group_name, buf);
 
+	/* Optional settings */
+
+	if ((buf = pcf_file_lookup_value (pcf, "main", "UserName")))
+		gtk_entry_set_text (impl->w_username, buf);
+	have_value = buf == NULL ? FALSE : strlen (buf) > 0;
+	expand |= have_value;
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_alternate_username), have_value);
+	gtk_widget_set_sensitive (GTK_WIDGET (impl->w_username), have_value);
+	gtk_widget_set_sensitive (GTK_WIDGET (impl->w_domain), have_value);
+
+	if ((buf = pcf_file_lookup_value (pcf, "main", "NTDomain")))
+		gtk_entry_set_text (impl->w_domain, buf);
+	have_value = buf == NULL ? FALSE : strlen (buf) > 0;
+	expand |= have_value;
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_domain), have_value);
+
+	if ((buf = pcf_file_lookup_value (pcf, "main", "X-NM-Routes")))
+		gtk_entry_set_text (impl->w_routes, buf);
+	have_value = buf == NULL ? FALSE : strlen (buf) > 0;
+	expand |= have_value;
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_routes), have_value);
+	gtk_widget_set_sensitive (GTK_WIDGET (impl->w_routes), have_value);
+
+	gtk_expander_set_expanded (impl->w_opt_info_expander, expand);
+
+	if ((buf = pcf_file_lookup_value (pcf, "main", "TunnelingMode"))) {
 		/* If applicable, put up warning that TCP tunneling will be disabled */
-		if (strcmp (tunneling_mode, "1") == 0) {
+
+		if (strncmp (buf, "1", 1) == 0) {
 			GtkWidget *dialog;
 
-			dialog = gtk_message_dialog_new (NULL,
-							 GTK_DIALOG_DESTROY_WITH_PARENT,
-							 GTK_MESSAGE_WARNING,
-							 GTK_BUTTONS_CLOSE,
-							 _("TCP tunneling not supported"));
+			basename = g_path_get_basename (path);
+			dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_DESTROY_WITH_PARENT,
+											 GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE,
+											 _("TCP tunneling not supported"));
 			gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-								 _("The VPN settings file '%s' specifies that VPN traffic should be tunneled through TCP which is currently not supported in the vpnc software.\n\nThe connection can still be created, with TCP tunneling disabled, however it may not work as expected."), basename);
+													 _("The VPN settings file '%s' specifies that VPN traffic should be tunneled through TCP which is currently not supported in the vpnc software.\n\nThe connection can still be created, with TCP tunneling disabled, however it may not work as expected."), basename);
 			gtk_dialog_run (GTK_DIALOG (dialog));
 			gtk_widget_destroy (dialog);
 		}
+	}
 
-		file_is_good = TRUE;
+	success = TRUE;
 
-	error:
-		g_free (connectionname);
-		g_free (gateway);
-		g_free (groupname);
-		g_free (username);
-		g_free (domain);
-		g_free (tunneling_mode);
-	}
-	g_key_file_free (keyfile);
+ error:	
+	g_hash_table_destroy (pcf);
 
-	if (!file_is_good) {
+	if (!success) {
 		GtkWidget *dialog;
-		
+
+		if (!basename)
+			basename = g_path_get_basename (path);
+
 		dialog = gtk_message_dialog_new (NULL,
 						 GTK_DIALOG_DESTROY_WITH_PARENT,
 						 GTK_MESSAGE_WARNING,
@@ -580,7 +571,7 @@
 
 	g_free (basename);
 
-	return file_is_good;
+	return success;
 }
 
 static void
@@ -627,7 +618,7 @@
 	return import_from_file (impl, path);
 }
 
-static void
+static gboolean
 export_to_file (NetworkManagerVpnUIImpl *impl, const char *path, 
 		GSList *properties, GSList *routes, const char *connection_name)
 {
@@ -638,6 +629,7 @@
 	const char *username = NULL;
 	const char *domain = NULL;
 	char *routes_str = NULL;
+	gboolean ret = TRUE;
 
 	/*printf ("in export_to_file; path='%s'\n", path);*/
 
@@ -681,7 +673,10 @@
 
 	f = fopen (path, "w");
 	if (f == NULL)
+	{
+		ret = FALSE;
 		goto out;
+	}
 
 	fprintf (f, 
 		 "[main]\n"
@@ -730,8 +725,9 @@
 
 	fclose (f);
 out:
-
 	g_free (routes_str);
+
+	return ret;
 }
 
 
@@ -763,7 +759,7 @@
 		/*printf ("User selected '%s'\n", path);*/
 
 	}
-	
+
 	gtk_widget_destroy (dialog);
 
 	if (path != NULL) {
@@ -785,8 +781,20 @@
 				goto out;
 		}
 
-		export_to_file (impl, path, properties, routes, connection_name);
-	} 
+		if (!export_to_file (impl, path, properties, routes, connection_name)) {
+			GtkWidget *dialog;
+
+			dialog = gtk_message_dialog_new (NULL,
+									 GTK_DIALOG_DESTROY_WITH_PARENT,
+									 GTK_MESSAGE_WARNING,
+									 GTK_BUTTONS_CLOSE,
+									 _("Failed to export configuration"));
+			gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+											 _("Failed to save file %s"), path);
+			gtk_dialog_run (GTK_DIALOG (dialog));
+			gtk_widget_destroy (dialog);
+		}
+	}
 
 out:
 	g_free (path);
diff -urN NetworkManager-vpnc-0.5.0cvs20060202/properties/nm-vpnc-dialog.glade NetworkManager-vpnc-CVS/properties/nm-vpnc-dialog.glade
--- NetworkManager-vpnc-0.5.0cvs20060202/properties/nm-vpnc-dialog.glade	2006-01-23 21:02:34.000000000 +0200
+++ NetworkManager-vpnc-CVS/properties/nm-vpnc-dialog.glade	2006-05-29 05:59:10.000000000 +0300
@@ -9,7 +9,7 @@
 <property name="type">GTK_WINDOW_TOPLEVEL</property>
 <property name="window_position">GTK_WIN_POS_NONE</property>
 <property name="modal">False</property>
- <property name="resizable">True</property>
+ <property name="resizable">False</property>
 <property name="destroy_with_parent">False</property>
 <property name="decorated">True</property>
 <property name="skip_taskbar_hint">False</property>
@@ -21,10 +21,9 @@
 
 <child>
 <widget class="GtkVBox" id="nm-vpnc-widget">
- <property name="border_width">12</property>
 <property name="visible">True</property>
 <property name="homogeneous">False</property>
- <property name="spacing">12</property>
+ <property name="spacing">6</property>
 
 <child>
 	<widget class="GtkLabel" id="label1">
@@ -52,54 +51,29 @@
 </child>
 
 <child>
-	<widget class="GtkVBox" id="vbox2">
+	<widget class="GtkVBox" id="vbox7">
 	 <property name="visible">True</property>
 	 <property name="homogeneous">False</property>
-	 <property name="spacing">6</property>
+	 <property name="spacing">18</property>
 
 	 <child>
-	 <widget class="GtkLabel" id="label2">
-	 <property name="visible">True</property>
-	 <property name="label" translatable="yes">&lt;b&gt;Connection Name&lt;/b&gt;</property>
-	 <property name="use_underline">False</property>
-	 <property name="use_markup">True</property>
-	 <property name="justify">GTK_JUSTIFY_LEFT</property>
-	 <property name="wrap">False</property>
-	 <property name="selectable">False</property>
-	 <property name="xalign">0</property>
-	 <property name="yalign">0.5</property>
-	 <property name="xpad">0</property>
-	 <property name="ypad">0</property>
-	 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	 <property name="width_chars">-1</property>
-	 <property name="single_line_mode">False</property>
-	 <property name="angle">0</property>
-	 </widget>
-	 <packing>
-	 <property name="padding">0</property>
-	 <property name="expand">False</property>
-	 <property name="fill">True</property>
-	 </packing>
-	 </child>
-
-	 <child>
-	 <widget class="GtkHBox" id="hbox1">
+	 <widget class="GtkVBox" id="vbox2">
 	 <property name="visible">True</property>
 	 <property name="homogeneous">False</property>
-	 <property name="spacing">0</property>
+	 <property name="spacing">6</property>
 
 	 <child>
-		<widget class="GtkLabel" id="label3">
+		<widget class="GtkLabel" id="label2">
 		 <property name="visible">True</property>
-		 <property name="label"></property>
+		 <property name="label" translatable="yes">&lt;b&gt;Connection Name&lt;/b&gt;</property>
 		 <property name="use_underline">False</property>
-		 <property name="use_markup">False</property>
+		 <property name="use_markup">True</property>
 		 <property name="justify">GTK_JUSTIFY_LEFT</property>
 		 <property name="wrap">False</property>
 		 <property name="selectable">False</property>
-		 <property name="xalign">0.5</property>
+		 <property name="xalign">0</property>
 		 <property name="yalign">0.5</property>
-		 <property name="xpad">12</property>
+		 <property name="xpad">0</property>
 		 <property name="ypad">0</property>
 		 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 		 <property name="width_chars">-1</property>
@@ -114,56 +88,37 @@
 	 </child>
 
 	 <child>
-		<widget class="GtkVBox" id="vbox3">
+		<widget class="GtkAlignment" id="alignment2">
 		 <property name="visible">True</property>
-		 <property name="homogeneous">False</property>
-		 <property name="spacing">6</property>
-
-		 <child>
-		 <widget class="GtkLabel" id="label4">
-		 <property name="visible">True</property>
-		 <property name="label" translatable="yes">_Name used to identify the connection to the private network, e.g. &quot;Campus VPN&quot; or &quot;Corporate Network&quot;</property>
-		 <property name="use_underline">True</property>
-		 <property name="use_markup">False</property>
-		 <property name="justify">GTK_JUSTIFY_LEFT</property>
-		 <property name="wrap">True</property>
-		 <property name="selectable">False</property>
-		 <property name="xalign">0</property>
-		 <property name="yalign">0.5</property>
-		 <property name="xpad">0</property>
-		 <property name="ypad">0</property>
-		 <property name="mnemonic_widget">vpnc-connection-name</property>
-		 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		 <property name="width_chars">-1</property>
-		 <property name="single_line_mode">False</property>
-		 <property name="angle">0</property>
-		 </widget>
-		 <packing>
-		 <property name="padding">0</property>
-		 <property name="expand">False</property>
-		 <property name="fill">True</property>
-		 </packing>
-		 </child>
+		 <property name="xalign">0.5</property>
+		 <property name="yalign">0.5</property>
+		 <property name="xscale">1</property>
+		 <property name="yscale">1</property>
+		 <property name="top_padding">0</property>
+		 <property name="bottom_padding">0</property>
+		 <property name="left_padding">12</property>
+		 <property name="right_padding">0</property>
 
 		 <child>
-		 <widget class="GtkHBox" id="hbox5">
+		 <widget class="GtkVBox" id="vbox3">
 		 <property name="visible">True</property>
 		 <property name="homogeneous">False</property>
-		 <property name="spacing">0</property>
+		 <property name="spacing">6</property>
 
 		 <child>
-			<widget class="GtkLabel" id="label12">
+			<widget class="GtkLabel" id="label4">
 			 <property name="visible">True</property>
-			 <property name="label"></property>
-			 <property name="use_underline">False</property>
+			 <property name="label" translatable="yes">_Name used to identify the connection to the private network, e.g. &quot;Campus VPN&quot; or &quot;Corporate Network&quot;</property>
+			 <property name="use_underline">True</property>
 			 <property name="use_markup">False</property>
 			 <property name="justify">GTK_JUSTIFY_LEFT</property>
-			 <property name="wrap">False</property>
+			 <property name="wrap">True</property>
 			 <property name="selectable">False</property>
-			 <property name="xalign">0.5</property>
+			 <property name="xalign">0</property>
 			 <property name="yalign">0.5</property>
-			 <property name="xpad">12</property>
+			 <property name="xpad">0</property>
 			 <property name="ypad">0</property>
+			 <property name="mnemonic_widget">vpnc-connection-name</property>
 			 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 			 <property name="width_chars">-1</property>
 			 <property name="single_line_mode">False</property>
@@ -190,16 +145,11 @@
 			</widget>
 			<packing>
 			 <property name="padding">0</property>
-			 <property name="expand">True</property>
-			 <property name="fill">True</property>
+			 <property name="expand">False</property>
+			 <property name="fill">False</property>
 			</packing>
 		 </child>
 		 </widget>
-		 <packing>
-		 <property name="padding">0</property>
-		 <property name="expand">True</property>
-		 <property name="fill">True</property>
-		 </packing>
 		 </child>
 		</widget>
 		<packing>
@@ -215,63 +165,25 @@
 	 <property name="fill">True</property>
 	 </packing>
 	 </child>
-	</widget>
-	<packing>
-	 <property name="padding">0</property>
-	 <property name="expand">True</property>
-	 <property name="fill">True</property>
-	</packing>
- </child>
-
- <child>
-	<widget class="GtkVBox" id="vbox4">
-	 <property name="visible">True</property>
-	 <property name="homogeneous">False</property>
-	 <property name="spacing">6</property>
 
 	 <child>
-	 <widget class="GtkLabel" id="label5">
-	 <property name="visible">True</property>
-	 <property name="label" translatable="yes">&lt;b&gt;Required Information&lt;/b&gt;</property>
-	 <property name="use_underline">False</property>
-	 <property name="use_markup">True</property>
-	 <property name="justify">GTK_JUSTIFY_LEFT</property>
-	 <property name="wrap">False</property>
-	 <property name="selectable">False</property>
-	 <property name="xalign">0</property>
-	 <property name="yalign">0.5</property>
-	 <property name="xpad">0</property>
-	 <property name="ypad">0</property>
-	 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	 <property name="width_chars">-1</property>
-	 <property name="single_line_mode">False</property>
-	 <property name="angle">0</property>
-	 </widget>
-	 <packing>
-	 <property name="padding">0</property>
-	 <property name="expand">False</property>
-	 <property name="fill">True</property>
-	 </packing>
-	 </child>
-
-	 <child>
-	 <widget class="GtkHBox" id="hbox2">
+	 <widget class="GtkVBox" id="vbox4">
 	 <property name="visible">True</property>
 	 <property name="homogeneous">False</property>
-	 <property name="spacing">0</property>
+	 <property name="spacing">6</property>
 
 	 <child>
-		<widget class="GtkLabel" id="label6">
+		<widget class="GtkLabel" id="label5">
 		 <property name="visible">True</property>
-		 <property name="label"></property>
+		 <property name="label" translatable="yes">&lt;b&gt;Required Information&lt;/b&gt;</property>
 		 <property name="use_underline">False</property>
-		 <property name="use_markup">False</property>
+		 <property name="use_markup">True</property>
 		 <property name="justify">GTK_JUSTIFY_LEFT</property>
 		 <property name="wrap">False</property>
 		 <property name="selectable">False</property>
-		 <property name="xalign">0.5</property>
+		 <property name="xalign">0</property>
 		 <property name="yalign">0.5</property>
-		 <property name="xpad">12</property>
+		 <property name="xpad">0</property>
 		 <property name="ypad">0</property>
 		 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 		 <property name="width_chars">-1</property>
@@ -286,227 +198,48 @@
 	 </child>
 
 	 <child>
-		<widget class="GtkTable" id="table1">
+		<widget class="GtkAlignment" id="alignment3">
 		 <property name="visible">True</property>
-		 <property name="n_rows">2</property>
-		 <property name="n_columns">2</property>
-		 <property name="homogeneous">False</property>
-		 <property name="row_spacing">12</property>
-		 <property name="column_spacing">6</property>
-
-		 <child>
-		 <widget class="GtkEntry" id="vpnc-gateway">
-		 <property name="visible">True</property>
-		 <property name="can_focus">True</property>
-		 <property name="editable">True</property>
-		 <property name="visibility">True</property>
-		 <property name="max_length">0</property>
-		 <property name="text" translatable="yes"></property>
-		 <property name="has_frame">True</property>
-		 <property name="invisible_char">*</property>
-		 <property name="activates_default">False</property>
-		 </widget>
-		 <packing>
-		 <property name="left_attach">1</property>
-		 <property name="right_attach">2</property>
-		 <property name="top_attach">0</property>
-		 <property name="bottom_attach">1</property>
-		 </packing>
-		 </child>
-
-		 <child>
-		 <widget class="GtkEntry" id="vpnc-group-name">
-		 <property name="visible">True</property>
-		 <property name="can_focus">True</property>
-		 <property name="editable">True</property>
-		 <property name="visibility">True</property>
-		 <property name="max_length">0</property>
-		 <property name="text" translatable="yes"></property>
-		 <property name="has_frame">True</property>
-		 <property name="invisible_char">*</property>
-		 <property name="activates_default">False</property>
-		 </widget>
-		 <packing>
-		 <property name="left_attach">1</property>
-		 <property name="right_attach">2</property>
-		 <property name="top_attach">1</property>
-		 <property name="bottom_attach">2</property>
-		 </packing>
-		 </child>
-
-		 <child>
-		 <widget class="GtkLabel" id="label7">
-		 <property name="visible">True</property>
-		 <property name="label" translatable="yes">_Gateway:</property>
-		 <property name="use_underline">True</property>
-		 <property name="use_markup">False</property>
-		 <property name="justify">GTK_JUSTIFY_LEFT</property>
-		 <property name="wrap">False</property>
-		 <property name="selectable">False</property>
-		 <property name="xalign">1</property>
-		 <property name="yalign">0.5</property>
-		 <property name="xpad">0</property>
-		 <property name="ypad">0</property>
-		 <property name="mnemonic_widget">vpnc-gateway</property>
-		 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		 <property name="width_chars">-1</property>
-		 <property name="single_line_mode">False</property>
-		 <property name="angle">0</property>
-		 </widget>
-		 <packing>
-		 <property name="left_attach">0</property>
-		 <property name="right_attach">1</property>
-		 <property name="top_attach">0</property>
-		 <property name="bottom_attach">1</property>
-		 <property name="x_options">fill</property>
-		 </packing>
-		 </child>
-
-		 <child>
-		 <widget class="GtkLabel" id="label8">
-		 <property name="visible">True</property>
-		 <property name="label" translatable="yes">G_roup Name:</property>
-		 <property name="use_underline">True</property>
-		 <property name="use_markup">False</property>
-		 <property name="justify">GTK_JUSTIFY_LEFT</property>
-		 <property name="wrap">False</property>
-		 <property name="selectable">False</property>
-		 <property name="xalign">1</property>
-		 <property name="yalign">0.5</property>
-		 <property name="xpad">0</property>
-		 <property name="ypad">0</property>
-		 <property name="mnemonic_widget">vpnc-group-name</property>
-		 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		 <property name="width_chars">-1</property>
-		 <property name="single_line_mode">False</property>
-		 <property name="angle">0</property>
-		 </widget>
-		 <packing>
-		 <property name="left_attach">0</property>
-		 <property name="right_attach">1</property>
-		 <property name="top_attach">1</property>
-		 <property name="bottom_attach">2</property>
-		 <property name="x_options">fill</property>
-		 </packing>
-		 </child>
-		</widget>
-		<packing>
-		 <property name="padding">0</property>
-		 <property name="expand">True</property>
-		 <property name="fill">True</property>
-		</packing>
-	 </child>
-	 </widget>
-	 <packing>
-	 <property name="padding">0</property>
-	 <property name="expand">True</property>
-	 <property name="fill">True</property>
-	 </packing>
-	 </child>
-	</widget>
-	<packing>
-	 <property name="padding">0</property>
-	 <property name="expand">True</property>
-	 <property name="fill">True</property>
-	</packing>
- </child>
-
- <child>
-	<widget class="GtkExpander" id="vpnc-optional-information-expander">
-	 <property name="visible">True</property>
-	 <property name="can_focus">True</property>
-	 <property name="expanded">False</property>
-	 <property name="spacing">6</property>
-
-	 <child>
-	 <widget class="GtkHBox" id="hbox3">
-	 <property name="visible">True</property>
-	 <property name="homogeneous">False</property>
-	 <property name="spacing">0</property>
-
-	 <child>
-		<widget class="GtkLabel" id="label10">
-		 <property name="visible">True</property>
-		 <property name="label"></property>
-		 <property name="use_underline">False</property>
-		 <property name="use_markup">False</property>
-		 <property name="justify">GTK_JUSTIFY_LEFT</property>
-		 <property name="wrap">False</property>
-		 <property name="selectable">False</property>
 		 <property name="xalign">0.5</property>
 		 <property name="yalign">0.5</property>
-		 <property name="xpad">12</property>
-		 <property name="ypad">0</property>
-		 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		 <property name="width_chars">-1</property>
-		 <property name="single_line_mode">False</property>
-		 <property name="angle">0</property>
-		</widget>
-		<packing>
-		 <property name="padding">0</property>
-		 <property name="expand">False</property>
-		 <property name="fill">True</property>
-		</packing>
-	 </child>
-
-	 <child>
-		<widget class="GtkVBox" id="vbox5">
-		 <property name="visible">True</property>
-		 <property name="homogeneous">False</property>
-		 <property name="spacing">6</property>
-
-		 <child>
-		 <widget class="GtkCheckButton" id="vpnc-use-alternate-username">
-		 <property name="visible">True</property>
-		 <property name="can_focus">True</property>
-		 <property name="label" translatable="yes">Override _user name</property>
-		 <property name="use_underline">True</property>
-		 <property name="relief">GTK_RELIEF_NORMAL</property>
-		 <property name="focus_on_click">True</property>
-		 <property name="active">False</property>
-		 <property name="inconsistent">False</property>
-		 <property name="draw_indicator">True</property>
-		 </widget>
-		 <packing>
-		 <property name="padding">0</property>
-		 <property name="expand">True</property>
-		 <property name="fill">True</property>
-		 </packing>
-		 </child>
+		 <property name="xscale">1</property>
+		 <property name="yscale">1</property>
+		 <property name="top_padding">0</property>
+		 <property name="bottom_padding">0</property>
+		 <property name="left_padding">12</property>
+		 <property name="right_padding">0</property>
 
 		 <child>
-		 <widget class="GtkHBox" id="hbox4">
+		 <widget class="GtkTable" id="table1">
 		 <property name="visible">True</property>
+		 <property name="n_rows">2</property>
+		 <property name="n_columns">2</property>
 		 <property name="homogeneous">False</property>
-		 <property name="spacing">0</property>
+		 <property name="row_spacing">6</property>
+		 <property name="column_spacing">12</property>
 
 		 <child>
-			<widget class="GtkLabel" id="label11">
+			<widget class="GtkEntry" id="vpnc-gateway">
 			 <property name="visible">True</property>
-			 <property name="label"></property>
-			 <property name="use_underline">False</property>
-			 <property name="use_markup">False</property>
-			 <property name="justify">GTK_JUSTIFY_LEFT</property>
-			 <property name="wrap">False</property>
-			 <property name="selectable">False</property>
-			 <property name="xalign">0.5</property>
-			 <property name="yalign">0.5</property>
-			 <property name="xpad">12</property>
-			 <property name="ypad">0</property>
-			 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			 <property name="width_chars">-1</property>
-			 <property name="single_line_mode">False</property>
-			 <property name="angle">0</property>
+			 <property name="can_focus">True</property>
+			 <property name="editable">True</property>
+			 <property name="visibility">True</property>
+			 <property name="max_length">0</property>
+			 <property name="text" translatable="yes"></property>
+			 <property name="has_frame">True</property>
+			 <property name="invisible_char">*</property>
+			 <property name="activates_default">False</property>
 			</widget>
 			<packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">True</property>
+			 <property name="left_attach">1</property>
+			 <property name="right_attach">2</property>
+			 <property name="top_attach">0</property>
+			 <property name="bottom_attach">1</property>
 			</packing>
 		 </child>
 
 		 <child>
-			<widget class="GtkEntry" id="vpnc-username">
+			<widget class="GtkEntry" id="vpnc-group-name">
 			 <property name="visible">True</property>
 			 <property name="can_focus">True</property>
 			 <property name="editable">True</property>
@@ -518,178 +251,195 @@
 			 <property name="activates_default">False</property>
 			</widget>
 			<packing>
-			 <property name="padding">0</property>
-			 <property name="expand">True</property>
-			 <property name="fill">True</property>
+			 <property name="left_attach">1</property>
+			 <property name="right_attach">2</property>
+			 <property name="top_attach">1</property>
+			 <property name="bottom_attach">2</property>
 			</packing>
 		 </child>
-		 </widget>
-		 <packing>
-		 <property name="padding">0</property>
-		 <property name="expand">True</property>
-		 <property name="fill">True</property>
-		 </packing>
-		 </child>
-
-		 <child>
-		 <widget class="GtkCheckButton" id="vpnc-use-domain">
-		 <property name="visible">True</property>
-		 <property name="can_focus">True</property>
-		 <property name="label" translatable="yes">Use _domain for authentication</property>
-		 <property name="use_underline">True</property>
-		 <property name="relief">GTK_RELIEF_NORMAL</property>
-		 <property name="focus_on_click">True</property>
-		 <property name="active">False</property>
-		 <property name="inconsistent">False</property>
-		 <property name="draw_indicator">True</property>
-		 </widget>
-		 <packing>
-		 <property name="padding">0</property>
-		 <property name="expand">False</property>
-		 <property name="fill">False</property>
-		 </packing>
-		 </child>
-
-		 <child>
-		 <widget class="GtkHBox" id="hbox8">
-		 <property name="visible">True</property>
-		 <property name="homogeneous">False</property>
-		 <property name="spacing">0</property>
 
 		 <child>
-			<widget class="GtkLabel" id="label16">
+			<widget class="GtkLabel" id="label7">
 			 <property name="visible">True</property>
-			 <property name="label"></property>
-			 <property name="use_underline">False</property>
+			 <property name="label" translatable="yes">_Gateway:</property>
+			 <property name="use_underline">True</property>
 			 <property name="use_markup">False</property>
 			 <property name="justify">GTK_JUSTIFY_LEFT</property>
 			 <property name="wrap">False</property>
 			 <property name="selectable">False</property>
-			 <property name="xalign">0.5</property>
+			 <property name="xalign">1</property>
 			 <property name="yalign">0.5</property>
-			 <property name="xpad">12</property>
+			 <property name="xpad">0</property>
 			 <property name="ypad">0</property>
+			 <property name="mnemonic_widget">vpnc-gateway</property>
 			 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 			 <property name="width_chars">-1</property>
 			 <property name="single_line_mode">False</property>
 			 <property name="angle">0</property>
 			</widget>
 			<packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">True</property>
+			 <property name="left_attach">0</property>
+			 <property name="right_attach">1</property>
+			 <property name="top_attach">0</property>
+			 <property name="bottom_attach">1</property>
+			 <property name="x_options">fill</property>
 			</packing>
 		 </child>
 
 		 <child>
-			<widget class="GtkEntry" id="vpnc-domain">
+			<widget class="GtkLabel" id="label8">
 			 <property name="visible">True</property>
-			 <property name="can_focus">True</property>
-			 <property name="editable">True</property>
-			 <property name="visibility">True</property>
-			 <property name="max_length">0</property>
-			 <property name="text" translatable="yes"></property>
-			 <property name="has_frame">True</property>
-			 <property name="invisible_char">*</property>
-			 <property name="activates_default">False</property>
+			 <property name="label" translatable="yes">G_roup Name:</property>
+			 <property name="use_underline">True</property>
+			 <property name="use_markup">False</property>
+			 <property name="justify">GTK_JUSTIFY_LEFT</property>
+			 <property name="wrap">False</property>
+			 <property name="selectable">False</property>
+			 <property name="xalign">1</property>
+			 <property name="yalign">0.5</property>
+			 <property name="xpad">0</property>
+			 <property name="ypad">0</property>
+			 <property name="mnemonic_widget">vpnc-group-name</property>
+			 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			 <property name="width_chars">-1</property>
+			 <property name="single_line_mode">False</property>
+			 <property name="angle">0</property>
 			</widget>
 			<packing>
-			 <property name="padding">0</property>
-			 <property name="expand">True</property>
-			 <property name="fill">True</property>
+			 <property name="left_attach">0</property>
+			 <property name="right_attach">1</property>
+			 <property name="top_attach">1</property>
+			 <property name="bottom_attach">2</property>
+			 <property name="x_options">fill</property>
 			</packing>
 		 </child>
 		 </widget>
-		 <packing>
-		 <property name="padding">0</property>
-		 <property name="expand">True</property>
-		 <property name="fill">True</property>
-		 </packing>
 		 </child>
+		</widget>
+		<packing>
+		 <property name="padding">0</property>
+		 <property name="expand">False</property>
+		 <property name="fill">True</property>
+		</packing>
+	 </child>
+	 </widget>
+	 <packing>
+	 <property name="padding">0</property>
+	 <property name="expand">True</property>
+	 <property name="fill">True</property>
+	 </packing>
+	 </child>
 
-		 <child>
-		 <widget class="GtkCheckButton" id="vpnc-use-routes">
-		 <property name="visible">True</property>
-		 <property name="can_focus">True</property>
-		 <property name="label" translatable="yes">_Only use VPN connection for these addresses</property>
-		 <property name="use_underline">True</property>
-		 <property name="relief">GTK_RELIEF_NORMAL</property>
-		 <property name="focus_on_click">True</property>
-		 <property name="active">False</property>
-		 <property name="inconsistent">False</property>
-		 <property name="draw_indicator">True</property>
-		 </widget>
-		 <packing>
-		 <property name="padding">0</property>
-		 <property name="expand">False</property>
-		 <property name="fill">False</property>
-		 </packing>
-		 </child>
+	 <child>
+	 <widget class="GtkExpander" id="vpnc-optional-information-expander">
+	 <property name="visible">True</property>
+	 <property name="can_focus">True</property>
+	 <property name="expanded">False</property>
+	 <property name="spacing">6</property>
+
+	 <child>
+		<widget class="GtkAlignment" id="alignment4">
+		 <property name="visible">True</property>
+		 <property name="xalign">0.5</property>
+		 <property name="yalign">0.5</property>
+		 <property name="xscale">1</property>
+		 <property name="yscale">1</property>
+		 <property name="top_padding">0</property>
+		 <property name="bottom_padding">0</property>
+		 <property name="left_padding">12</property>
+		 <property name="right_padding">0</property>
 
 		 <child>
-		 <widget class="GtkHBox" id="hbox6">
+		 <widget class="GtkVBox" id="vbox5">
 		 <property name="visible">True</property>
 		 <property name="homogeneous">False</property>
-		 <property name="spacing">0</property>
+		 <property name="spacing">6</property>
 
 		 <child>
-			<widget class="GtkLabel" id="label13">
+			<widget class="GtkCheckButton" id="vpnc-use-alternate-username">
 			 <property name="visible">True</property>
-			 <property name="label"></property>
-			 <property name="use_underline">False</property>
-			 <property name="use_markup">False</property>
-			 <property name="justify">GTK_JUSTIFY_LEFT</property>
-			 <property name="wrap">False</property>
-			 <property name="selectable">False</property>
-			 <property name="xalign">0.5</property>
-			 <property name="yalign">0.5</property>
-			 <property name="xpad">12</property>
-			 <property name="ypad">0</property>
-			 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			 <property name="width_chars">-1</property>
-			 <property name="single_line_mode">False</property>
-			 <property name="angle">0</property>
+			 <property name="can_focus">True</property>
+			 <property name="label" translatable="yes">Override _user name</property>
+			 <property name="use_underline">True</property>
+			 <property name="relief">GTK_RELIEF_NORMAL</property>
+			 <property name="focus_on_click">True</property>
+			 <property name="active">False</property>
+			 <property name="inconsistent">False</property>
+			 <property name="draw_indicator">True</property>
 			</widget>
 			<packing>
 			 <property name="padding">0</property>
-			 <property name="expand">False</property>
+			 <property name="expand">True</property>
 			 <property name="fill">True</property>
 			</packing>
 		 </child>
 
 		 <child>
-			<widget class="GtkVBox" id="vbox6">
+			<widget class="GtkAlignment" id="alignment5">
 			 <property name="visible">True</property>
-			 <property name="homogeneous">False</property>
-			 <property name="spacing">6</property>
+			 <property name="xalign">0.5</property>
+			 <property name="yalign">0.5</property>
+			 <property name="xscale">1</property>
+			 <property name="yscale">1</property>
+			 <property name="top_padding">0</property>
+			 <property name="bottom_padding">0</property>
+			 <property name="left_padding">12</property>
+			 <property name="right_padding">0</property>
 
 			 <child>
-			 <widget class="GtkLabel" id="label14">
+			 <widget class="GtkEntry" id="vpnc-username">
 			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">&lt;i&gt;example: 172.16.0.0/16 10.11.12.0/24&lt;/i&gt;</property>
-			 <property name="use_underline">False</property>
-			 <property name="use_markup">True</property>
-			 <property name="justify">GTK_JUSTIFY_LEFT</property>
-			 <property name="wrap">False</property>
-			 <property name="selectable">False</property>
-			 <property name="xalign">0</property>
-			 <property name="yalign">0.5</property>
-			 <property name="xpad">0</property>
-			 <property name="ypad">0</property>
-			 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			 <property name="width_chars">-1</property>
-			 <property name="single_line_mode">False</property>
-			 <property name="angle">0</property>
+			 <property name="can_focus">True</property>
+			 <property name="editable">True</property>
+			 <property name="visibility">True</property>
+			 <property name="max_length">0</property>
+			 <property name="text" translatable="yes"></property>
+			 <property name="has_frame">True</property>
+			 <property name="invisible_char">*</property>
+			 <property name="activates_default">False</property>
 			 </widget>
-			 <packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">True</property>
-			 </packing>
 			 </child>
+			</widget>
+			<packing>
+			 <property name="padding">0</property>
+			 <property name="expand">True</property>
+			 <property name="fill">True</property>
+			</packing>
+		 </child>
+
+		 <child>
+			<widget class="GtkCheckButton" id="vpnc-use-domain">
+			 <property name="visible">True</property>
+			 <property name="can_focus">True</property>
+			 <property name="label" translatable="yes">Use _domain for authentication</property>
+			 <property name="use_underline">True</property>
+			 <property name="relief">GTK_RELIEF_NORMAL</property>
+			 <property name="focus_on_click">True</property>
+			 <property name="active">False</property>
+			 <property name="inconsistent">False</property>
+			 <property name="draw_indicator">True</property>
+			</widget>
+			<packing>
+			 <property name="padding">0</property>
+			 <property name="expand">False</property>
+			 <property name="fill">False</property>
+			</packing>
+		 </child>
+
+		 <child>
+			<widget class="GtkAlignment" id="alignment6">
+			 <property name="visible">True</property>
+			 <property name="xalign">0.5</property>
+			 <property name="yalign">0.5</property>
+			 <property name="xscale">1</property>
+			 <property name="yscale">1</property>
+			 <property name="top_padding">0</property>
+			 <property name="bottom_padding">0</property>
+			 <property name="left_padding">12</property>
+			 <property name="right_padding">0</property>
 
 			 <child>
-			 <widget class="GtkEntry" id="vpnc-routes">
+			 <widget class="GtkEntry" id="vpnc-domain">
 			 <property name="visible">True</property>
 			 <property name="can_focus">True</property>
 			 <property name="editable">True</property>
@@ -700,11 +450,96 @@
 			 <property name="invisible_char">*</property>
 			 <property name="activates_default">False</property>
 			 </widget>
-			 <packing>
-			 <property name="padding">0</property>
-			 <property name="expand">True</property>
-			 <property name="fill">True</property>
-			 </packing>
+			 </child>
+			</widget>
+			<packing>
+			 <property name="padding">0</property>
+			 <property name="expand">True</property>
+			 <property name="fill">True</property>
+			</packing>
+		 </child>
+
+		 <child>
+			<widget class="GtkCheckButton" id="vpnc-use-routes">
+			 <property name="visible">True</property>
+			 <property name="can_focus">True</property>
+			 <property name="label" translatable="yes">_Only use VPN connection for these addresses</property>
+			 <property name="use_underline">True</property>
+			 <property name="relief">GTK_RELIEF_NORMAL</property>
+			 <property name="focus_on_click">True</property>
+			 <property name="active">False</property>
+			 <property name="inconsistent">False</property>
+			 <property name="draw_indicator">True</property>
+			</widget>
+			<packing>
+			 <property name="padding">0</property>
+			 <property name="expand">False</property>
+			 <property name="fill">False</property>
+			</packing>
+		 </child>
+
+		 <child>
+			<widget class="GtkAlignment" id="alignment7">
+			 <property name="visible">True</property>
+			 <property name="xalign">0.5</property>
+			 <property name="yalign">0.5</property>
+			 <property name="xscale">1</property>
+			 <property name="yscale">1</property>
+			 <property name="top_padding">0</property>
+			 <property name="bottom_padding">0</property>
+			 <property name="left_padding">12</property>
+			 <property name="right_padding">0</property>
+
+			 <child>
+			 <widget class="GtkVBox" id="vbox6">
+			 <property name="visible">True</property>
+			 <property name="homogeneous">False</property>
+			 <property name="spacing">6</property>
+
+			 <child>
+				<widget class="GtkLabel" id="label14">
+				 <property name="visible">True</property>
+				 <property name="label" translatable="yes">&lt;i&gt;example: 172.16.0.0/16 10.11.12.0/24&lt;/i&gt;</property>
+				 <property name="use_underline">False</property>
+				 <property name="use_markup">True</property>
+				 <property name="justify">GTK_JUSTIFY_LEFT</property>
+				 <property name="wrap">False</property>
+				 <property name="selectable">False</property>
+				 <property name="xalign">0</property>
+				 <property name="yalign">0.5</property>
+				 <property name="xpad">0</property>
+				 <property name="ypad">0</property>
+				 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				 <property name="width_chars">-1</property>
+				 <property name="single_line_mode">False</property>
+				 <property name="angle">0</property>
+				</widget>
+				<packing>
+				 <property name="padding">0</property>
+				 <property name="expand">False</property>
+				 <property name="fill">True</property>
+				</packing>
+			 </child>
+
+			 <child>
+				<widget class="GtkEntry" id="vpnc-routes">
+				 <property name="visible">True</property>
+				 <property name="can_focus">True</property>
+				 <property name="editable">True</property>
+				 <property name="visibility">True</property>
+				 <property name="max_length">0</property>
+				 <property name="text" translatable="yes"></property>
+				 <property name="has_frame">True</property>
+				 <property name="invisible_char">*</property>
+				 <property name="activates_default">False</property>
+				</widget>
+				<packing>
+				 <property name="padding">0</property>
+				 <property name="expand">True</property>
+				 <property name="fill">True</property>
+				</packing>
+			 </child>
+			 </widget>
 			 </child>
 			</widget>
 			<packing>
@@ -714,130 +549,125 @@
 			</packing>
 		 </child>
 		 </widget>
-		 <packing>
-		 <property name="padding">0</property>
-		 <property name="expand">True</property>
-		 <property name="fill">True</property>
-		 </packing>
 		 </child>
 		</widget>
+	 </child>
+
+	 <child>
+		<widget class="GtkLabel" id="label17">
+		 <property name="visible">True</property>
+		 <property name="label" translatable="yes">O_ptional Information</property>
+		 <property name="use_underline">True</property>
+		 <property name="use_markup">True</property>
+		 <property name="justify">GTK_JUSTIFY_LEFT</property>
+		 <property name="wrap">False</property>
+		 <property name="selectable">False</property>
+		 <property name="xalign">0.5</property>
+		 <property name="yalign">0.5</property>
+		 <property name="xpad">0</property>
+		 <property name="ypad">0</property>
+		 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		 <property name="width_chars">-1</property>
+		 <property name="single_line_mode">False</property>
+		 <property name="angle">0</property>
+		</widget>
 		<packing>
-		 <property name="padding">0</property>
-		 <property name="expand">True</property>
-		 <property name="fill">True</property>
+		 <property name="type">label_item</property>
 		</packing>
 	 </child>
 	 </widget>
-	 </child>
-
-	 <child>
-	 <widget class="GtkLabel" id="label17">
-	 <property name="visible">True</property>
-	 <property name="label" translatable="yes">O_ptional Information</property>
-	 <property name="use_underline">True</property>
-	 <property name="use_markup">True</property>
-	 <property name="justify">GTK_JUSTIFY_LEFT</property>
-	 <property name="wrap">False</property>
-	 <property name="selectable">False</property>
-	 <property name="xalign">0.5</property>
-	 <property name="yalign">0.5</property>
-	 <property name="xpad">0</property>
-	 <property name="ypad">0</property>
-	 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	 <property name="width_chars">-1</property>
-	 <property name="single_line_mode">False</property>
-	 <property name="angle">0</property>
-	 </widget>
 	 <packing>
-	 <property name="type">label_item</property>
+	 <property name="padding">0</property>
+	 <property name="expand">True</property>
+	 <property name="fill">True</property>
 	 </packing>
 	 </child>
-	</widget>
-	<packing>
-	 <property name="padding">0</property>
-	 <property name="expand">True</property>
-	 <property name="fill">True</property>
-	</packing>
- </child>
-
- <child>
-	<widget class="GtkHButtonBox" id="hbuttonbox1">
-	 <property name="visible">True</property>
-	 <property name="layout_style">GTK_BUTTONBOX_END</property>
-	 <property name="spacing">0</property>
 
 	 <child>
-	 <widget class="GtkButton" id="vpnc-import-button">
+	 <widget class="GtkHButtonBox" id="hbuttonbox1">
 	 <property name="visible">True</property>
-	 <property name="can_default">True</property>
-	 <property name="can_focus">True</property>
-	 <property name="relief">GTK_RELIEF_NORMAL</property>
-	 <property name="focus_on_click">True</property>
+	 <property name="layout_style">GTK_BUTTONBOX_END</property>
+	 <property name="spacing">0</property>
 
 	 <child>
-		<widget class="GtkAlignment" id="alignment1">
+		<widget class="GtkButton" id="vpnc-import-button">
 		 <property name="visible">True</property>
-		 <property name="xalign">0.5</property>
-		 <property name="yalign">0.5</property>
-		 <property name="xscale">0</property>
-		 <property name="yscale">0</property>
-		 <property name="top_padding">0</property>
-		 <property name="bottom_padding">0</property>
-		 <property name="left_padding">0</property>
-		 <property name="right_padding">0</property>
+		 <property name="can_default">True</property>
+		 <property name="can_focus">True</property>
+		 <property name="relief">GTK_RELIEF_NORMAL</property>
+		 <property name="focus_on_click">True</property>
 
 		 <child>
-		 <widget class="GtkHBox" id="hbox7">
+		 <widget class="GtkAlignment" id="alignment1">
 		 <property name="visible">True</property>
-		 <property name="homogeneous">False</property>
-		 <property name="spacing">2</property>
+		 <property name="xalign">0.5</property>
+		 <property name="yalign">0.5</property>
+		 <property name="xscale">0</property>
+		 <property name="yscale">0</property>
+		 <property name="top_padding">0</property>
+		 <property name="bottom_padding">0</property>
+		 <property name="left_padding">0</property>
+		 <property name="right_padding">0</property>
 
 		 <child>
-			<widget class="GtkImage" id="image1">
+			<widget class="GtkHBox" id="hbox7">
 			 <property name="visible">True</property>
-			 <property name="stock">gtk-add</property>
-			 <property name="icon_size">4</property>
-			 <property name="xalign">0.5</property>
-			 <property name="yalign">0.5</property>
-			 <property name="xpad">0</property>
-			 <property name="ypad">0</property>
-			</widget>
-			<packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			</packing>
-		 </child>
+			 <property name="homogeneous">False</property>
+			 <property name="spacing">2</property>
 
-		 <child>
-			<widget class="GtkLabel" id="label15">
-			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">_Import Saved Configuration...</property>
-			 <property name="use_underline">True</property>
-			 <property name="use_markup">False</property>
-			 <property name="justify">GTK_JUSTIFY_LEFT</property>
-			 <property name="wrap">False</property>
-			 <property name="selectable">False</property>
-			 <property name="xalign">0.5</property>
-			 <property name="yalign">0.5</property>
-			 <property name="xpad">0</property>
-			 <property name="ypad">0</property>
-			 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			 <property name="width_chars">-1</property>
-			 <property name="single_line_mode">False</property>
-			 <property name="angle">0</property>
+			 <child>
+			 <widget class="GtkImage" id="image1">
+			 <property name="visible">True</property>
+			 <property name="stock">gtk-add</property>
+			 <property name="icon_size">4</property>
+			 <property name="xalign">0.5</property>
+			 <property name="yalign">0.5</property>
+			 <property name="xpad">0</property>
+			 <property name="ypad">0</property>
+			 </widget>
+			 <packing>
+			 <property name="padding">0</property>
+			 <property name="expand">False</property>
+			 <property name="fill">False</property>
+			 </packing>
+			 </child>
+
+			 <child>
+			 <widget class="GtkLabel" id="label15">
+			 <property name="visible">True</property>
+			 <property name="label" translatable="yes">_Import Saved Configuration...</property>
+			 <property name="use_underline">True</property>
+			 <property name="use_markup">False</property>
+			 <property name="justify">GTK_JUSTIFY_LEFT</property>
+			 <property name="wrap">False</property>
+			 <property name="selectable">False</property>
+			 <property name="xalign">0.5</property>
+			 <property name="yalign">0.5</property>
+			 <property name="xpad">0</property>
+			 <property name="ypad">0</property>
+			 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			 <property name="width_chars">-1</property>
+			 <property name="single_line_mode">False</property>
+			 <property name="angle">0</property>
+			 </widget>
+			 <packing>
+			 <property name="padding">0</property>
+			 <property name="expand">False</property>
+			 <property name="fill">False</property>
+			 </packing>
+			 </child>
 			</widget>
-			<packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">False</property>
-			</packing>
 		 </child>
 		 </widget>
 		 </child>
 		</widget>
 	 </child>
 	 </widget>
+	 <packing>
+	 <property name="padding">0</property>
+	 <property name="expand">True</property>
+	 <property name="fill">True</property>
+	 </packing>
 	 </child>
 	</widget>
 	<packing>
diff -urN NetworkManager-vpnc-0.5.0cvs20060202/properties/pcf-file.c NetworkManager-vpnc-CVS/properties/pcf-file.c
--- NetworkManager-vpnc-0.5.0cvs20060202/properties/pcf-file.c	1970-01-01 03:00:00.000000000 +0300
+++ NetworkManager-vpnc-CVS/properties/pcf-file.c	2006-11-01 18:33:28.000000000 +0200
@@ -0,0 +1,158 @@
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <ctype.h>
+
+#include "pcf-file.h"
+
+static void
+pcf_entry_free (PcfEntry *entry)
+{
+	if (entry) {
+		g_free (entry->key);
+		g_free (entry->value);
+		g_free (entry);
+	}
+}
+
+/*
+ The main reader loop here is based on the simple .ini file
+ parser from avahi/avahi-daemon/ini-file-parser.c
+*/
+
+GHashTable *
+pcf_file_load (const char *fname)
+{
+	FILE *fo;
+	unsigned line;
+ GHashTable *pcf;
+	GHashTable *group = NULL;
+ 
+ g_return_val_if_fail (fname != NULL, NULL);
+
+ if (!(fo = fopen (fname, "r"))) {
+ g_warning ("Failed to open file '%s': %s", fname, strerror (errno));
+ return NULL;
+ }
+
+	pcf = g_hash_table_new_full (g_str_hash, g_str_equal,
+								 g_free,
+								 (GDestroyNotify) g_hash_table_destroy);
+
+ line = 0;
+ while (!feof (fo)) {
+ char ln[256], *s, *e;
+ 
+ if (!(fgets (ln, sizeof (ln), fo)))
+ break;
+
+ line++;
+
+ s = ln + strspn (ln, " \t");
+ s[strcspn (s, "\r\n")] = 0;
+
+ /* Skip comments and empty lines */
+ if (*s == ';' || *s == 0)
+ continue;
+
+ if (*s == '[') {
+ /* new group */
+ 
+ if (!(e = strchr (s, ']'))) {
+ g_warning ("Unclosed group header in %s:%u: <%s>", fname, line, s);
+ goto fail;
+ }
+
+ *e = 0;
+
+			group = g_hash_table_new_full (g_str_hash, g_str_equal, NULL,
+										 (GDestroyNotify) pcf_entry_free);
+
+			g_hash_table_insert (pcf, g_utf8_strdown (s+1, -1), group);
+ } else {
+			PcfEntry *entry;
+
+ /* Normal assignment */
+ if (!(e = strchr (s, '='))) {
+ g_warning ("Missing assignment in %s:%u: <%s>", fname, line, s);
+ goto fail;
+ }
+ 
+ if (!group) {
+ g_warning ("Assignment outside group in %s:%u <%s>", fname, line, s);
+ goto fail;
+ }
+ 
+ /* Split the key and the value */
+ *(e++) = 0;
+
+			entry = g_new (PcfEntry, 1);
+			entry->value = g_strdup (e);
+
+			if (*s == '!') {
+				entry->key = g_utf8_strdown (s+1, -1);
+				entry->read_only = TRUE;
+			} else {
+				entry->key = g_utf8_strdown (s, -1);
+				entry->read_only = FALSE;
+			}
+
+			g_hash_table_insert (group, entry->key, entry);
+ }
+ }
+ 
+ fclose (fo);
+ 
+ return pcf;
+
+fail:
+
+ if (fo)
+ fclose (fo);
+
+ if (pcf)
+ g_hash_table_destroy (pcf);
+
+ return NULL;
+}
+
+PcfEntry *
+pcf_file_lookup (GHashTable *pcf_file,
+				 const char *group,
+				 const char *key)
+{
+	gpointer section;
+	PcfEntry *entry = NULL;
+	char *group_lower = NULL;
+	char *key_lower = NULL;
+
+	g_return_val_if_fail (pcf_file != NULL, NULL);
+	g_return_val_if_fail (group != NULL, NULL);
+	g_return_val_if_fail (key != NULL, NULL);
+
+	group_lower = g_utf8_strdown (group, -1);
+	section = g_hash_table_lookup (pcf_file, group_lower);
+	if (section) {
+		key_lower = g_utf8_strdown (key, -1);
+		entry = (PcfEntry *) g_hash_table_lookup ((GHashTable *) section, key_lower);
+	}
+
+	g_free (group_lower);
+	g_free (key_lower);
+
+	return entry;
+}
+
+const char *
+pcf_file_lookup_value (GHashTable *pcf_file,
+					 const char *group,
+					 const char *key)
+{
+	PcfEntry *entry;
+
+	entry = pcf_file_lookup (pcf_file, group, key);
+	if (entry)
+		return entry->value;
+
+	return NULL;
+}
diff -urN NetworkManager-vpnc-0.5.0cvs20060202/properties/pcf-file.h NetworkManager-vpnc-CVS/properties/pcf-file.h
--- NetworkManager-vpnc-0.5.0cvs20060202/properties/pcf-file.h	1970-01-01 03:00:00.000000000 +0300
+++ NetworkManager-vpnc-CVS/properties/pcf-file.h	2006-11-01 18:33:28.000000000 +0200
@@ -0,0 +1,23 @@
+#ifndef PCF_FILE_H
+#define PCF_FILE_H
+
+#include <glib.h>
+
+typedef struct PcfEntry PcfEntry;
+
+struct PcfEntry {
+	char *key;
+	char *value;
+	gboolean read_only;
+};
+
+GHashTable *pcf_file_load (const char *fname);
+PcfEntry *pcf_file_lookup (GHashTable *pcf_file,
+								 const char *group,
+								 const char *key);
+
+const char *pcf_file_lookup_value (GHashTable *pcf_file,
+								 const char *group,
+								 const char *key);
+
+#endif /* PCF_FILE_H */
diff -urN NetworkManager-vpnc-0.5.0cvs20060202/src/Makefile.am NetworkManager-vpnc-CVS/src/Makefile.am
--- NetworkManager-vpnc-0.5.0cvs20060202/src/Makefile.am	2005-12-07 01:37:09.000000000 +0200
+++ NetworkManager-vpnc-CVS/src/Makefile.am	2006-09-27 18:10:37.000000000 +0300
@@ -1,8 +1,9 @@
 INCLUDES = -I${top_srcdir} -I${top_srcdir}/utils -I${top_srcdir}/vpn-daemons/vpnc
 
 AM_CPPFLAGS =							\
-	$(DBUS_CFLAGS)						\
 	$(GTHREAD_CFLAGS)					\
+	$(DBUS_CFLAGS)						\
+	$(NETWORK_MANAGER_CFLAGS)				\
 	-Wall							\
 	-DDBUS_API_SUBJECT_TO_CHANGE				\
 	-DG_DISABLE_DEPRECATED					\
@@ -24,16 +25,18 @@
 				nm-utils.h
 
 
-nm_vpnc_service_LDADD = 						\
-				$(DBUS_LIBS)				\
-				$(GTHREAD_LIBS)
-
+nm_vpnc_service_LDADD = 				\
+				$(GTHREAD_LIBS) 	\
+				$(DBUS_LIBS) 		\
+				$(NETWORK_MANAGER_LIBS)
 
 nm_vpnc_service_vpnc_helper_SOURCES = 					\
 				nm-vpnc-service-vpnc-helper.c
 
 nm_vpnc_service_vpnc_helper_LDADD = 					\
 				$(DBUS_LIBS)				\
-				$(GTHREAD_LIBS)
+				$(GTHREAD_LIBS) 			\
+				$(NETWORK_MANAGER_LIBS)
 
 CLEANFILES = *~
+
diff -urN NetworkManager-vpnc-0.5.0cvs20060202/src/Makefile.in NetworkManager-vpnc-CVS/src/Makefile.in
--- NetworkManager-vpnc-0.5.0cvs20060202/src/Makefile.in	2006-02-02 23:48:08.000000000 +0200
+++ NetworkManager-vpnc-CVS/src/Makefile.in	2006-11-02 10:56:17.000000000 +0200
@@ -56,13 +56,13 @@
 nm_vpnc_service_OBJECTS = $(am_nm_vpnc_service_OBJECTS)
 am__DEPENDENCIES_1 =
 nm_vpnc_service_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_nm_vpnc_service_vpnc_helper_OBJECTS = \
 	nm-vpnc-service-vpnc-helper.$(OBJEXT)
 nm_vpnc_service_vpnc_helper_OBJECTS = \
 	$(am_nm_vpnc_service_vpnc_helper_OBJECTS)
 nm_vpnc_service_vpnc_helper_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -120,8 +120,6 @@
 FFLAGS = @FFLAGS@
 GCONF_CFLAGS = @GCONF_CFLAGS@
 GCONF_LIBS = @GCONF_LIBS@
-GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@
-GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GLADE_CFLAGS = @GLADE_CFLAGS@
 GLADE_LIBS = @GLADE_LIBS@
@@ -250,8 +248,9 @@
 target_alias = @target_alias@
 INCLUDES = -I${top_srcdir} -I${top_srcdir}/utils -I${top_srcdir}/vpn-daemons/vpnc
 AM_CPPFLAGS = \
-	$(DBUS_CFLAGS)						\
 	$(GTHREAD_CFLAGS)					\
+	$(DBUS_CFLAGS)						\
+	$(NETWORK_MANAGER_CFLAGS)				\
 	-Wall							\
 	-DDBUS_API_SUBJECT_TO_CHANGE				\
 	-DG_DISABLE_DEPRECATED					\
@@ -271,15 +270,17 @@
 				nm-utils.h
 
 nm_vpnc_service_LDADD = \
-				$(DBUS_LIBS)				\
-				$(GTHREAD_LIBS)
+				$(GTHREAD_LIBS) 	\
+				$(DBUS_LIBS) 		\
+				$(NETWORK_MANAGER_LIBS)
 
 nm_vpnc_service_vpnc_helper_SOURCES = \
 				nm-vpnc-service-vpnc-helper.c
 
 nm_vpnc_service_vpnc_helper_LDADD = \
 				$(DBUS_LIBS)				\
-				$(GTHREAD_LIBS)
+				$(GTHREAD_LIBS) 			\
+				$(NETWORK_MANAGER_LIBS)
 
 CLEANFILES = *~
 all: all-am
diff -urN NetworkManager-vpnc-0.5.0cvs20060202/src/nm-vpnc-service.c NetworkManager-vpnc-CVS/src/nm-vpnc-service.c
--- NetworkManager-vpnc-0.5.0cvs20060202/src/nm-vpnc-service.c	2006-01-17 00:58:13.000000000 +0200
+++ NetworkManager-vpnc-CVS/src/nm-vpnc-service.c	2006-11-01 18:33:28.000000000 +0200
@@ -41,8 +41,8 @@
 #include <arpa/inet.h>
 #include <ctype.h>
 
-#include <NetworkManager/NetworkManager.h>
-#include <NetworkManager/NetworkManagerVPN.h>
+#include <NetworkManager.h>
+#include <NetworkManagerVPN.h>
 
 #include "nm-vpnc-service.h"
 #include "nm-utils.h"
@@ -57,6 +57,7 @@
 
 #define NM_VPNC_HELPER_PATH		BINDIR"/nm-vpnc-service-vpnc-helper"
 #define NM_VPNC_UDP_ENCAPSULATION_PORT	0 /* random port */
+#define NM_VPNC_REKEYING_INTERVAL 7200 /* default interval of 2 hours */
 
 typedef struct NmVpncData
 {
@@ -435,6 +436,7 @@
 {
 	int i;
 	gboolean has_user_name = FALSE;
+	gboolean has_rekey_interval = FALSE;
 
 	g_return_val_if_fail (user_name != NULL, FALSE);
 	g_return_val_if_fail (password_items != NULL, FALSE);
@@ -452,12 +454,17 @@
 		write_config_option (vpnc_fd, "%s %s\n", data_items[i], data_items[i+1]);
 		if (strcmp (data_items[i], "Xauth username") == 0)
 			has_user_name = TRUE;
+		else if (strcmp (data_items[i], "Rekeying interval") == 0)
+			has_rekey_interval = TRUE;
 	}
 
 	/* if user name isn't specified, use the name of the logged in user */
 	if (!has_user_name)
 		write_config_option (vpnc_fd, "Xauth username %s\n", user_name);
 
+	if (!has_rekey_interval)
+		write_config_option (vpnc_fd, "Rekeying interval %d\n", NM_VPNC_REKEYING_INTERVAL);
+
 	return TRUE;
 }
 
@@ -485,17 +492,19 @@
 static gboolean nm_vpnc_config_options_validate (char **data_items, int num_items)
 {
 	Option	allowed_opts[] = {
-					{ "IPSec gateway",			OPT_TYPE_ADDRESS },
-					{ "IPSec ID",				OPT_TYPE_ASCII },
-					{ "IPSec secret",			OPT_TYPE_ASCII },
-					{ "Xauth username",			OPT_TYPE_ASCII },
-					{ "UDP Encapsulate",		OPT_TYPE_NONE },
-					{ "UDP Encapsulation Port",	OPT_TYPE_ASCII },
-					{ "Domain",				OPT_TYPE_ASCII },
-					{ "IKE DH Group",			OPT_TYPE_ASCII },
-					{ "Perfect Forward Secrecy",	OPT_TYPE_ASCII },
-					{ "Application Version",		OPT_TYPE_ASCII },
-					{ NULL,					OPT_TYPE_UNKNOWN } };
+		{ "IPSec gateway", OPT_TYPE_ADDRESS },
+		{ "IPSec ID", OPT_TYPE_ASCII },
+		{ "IPSec secret", OPT_TYPE_ASCII },
+		{ "Xauth username", OPT_TYPE_ASCII },
+		{ "UDP Encapsulate", OPT_TYPE_NONE },
+		{ "UDP Encapsulation Port", OPT_TYPE_ASCII },
+		{ "Domain", OPT_TYPE_ASCII },
+		{ "IKE DH Group", OPT_TYPE_ASCII },
+		{ "Perfect Forward Secrecy", OPT_TYPE_ASCII },
+		{ "Application Version", OPT_TYPE_ASCII },
+		{ "Rekeying interval", OPT_TYPE_ASCII },
+		{ NULL, OPT_TYPE_UNKNOWN }
+	};
 
 	unsigned int	i;
 
@@ -573,20 +582,24 @@
 * Parse message arguments and start the VPN connection.
 *
 */
-static gboolean nm_vpnc_dbus_handle_start_vpn (DBusMessage *message, NmVpncData *data)
+static DBusMessage *
+nm_vpnc_dbus_handle_start_vpn (DBusMessage *message, NmVpncData *data)
 {
 	char **		data_items = NULL;
-	int		num_items = -1;
+	int			num_items = -1;
 	char **		password_items = NULL;
-	int		num_passwords = -1;
+	int			num_passwords = -1;
+	char **		user_routes = NULL;
+	int			user_routes_count = -1;
 	const char *	name = NULL;
 	const char *	user_name = NULL;
 	DBusError		error;
 	gboolean		success = FALSE;
-	gint			vpnc_fd = -1;	
+	gint			vpnc_fd = -1;
+	DBusMessage *	reply = NULL;
 
-	g_return_val_if_fail (message != NULL, FALSE);
-	g_return_val_if_fail (data != NULL, FALSE);
+	g_return_val_if_fail (message != NULL, NULL);
+	g_return_val_if_fail (data != NULL, NULL);
 
 	nm_vpnc_set_state (data, NM_VPN_STATE_STARTING);
 
@@ -596,35 +609,55 @@
 				 DBUS_TYPE_STRING, &user_name,
 				 DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &password_items, &num_passwords,
 				 DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &data_items, &num_items,
+				 DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &user_routes, &user_routes_count,
 				 DBUS_TYPE_INVALID))
 	{
 		nm_warning ("Could not process the request because its arguments were invalid. dbus said: '%s'", error.message);
-		nm_vpnc_dbus_signal_failure (data, NM_DBUS_VPN_SIGNAL_VPN_CONFIG_BAD);
+		reply = nm_dbus_create_error_message (message,
+											 NM_DBUS_INTERFACE_VPN,
+											 "InvalidArguments",
+											 "Invalid method arguments.");
 		dbus_error_free (&error);
 		goto out;
 	}
 
 	if (!nm_vpnc_config_options_validate (data_items, num_items))
 	{
-		nm_vpnc_dbus_signal_failure (data, NM_DBUS_VPN_SIGNAL_VPN_CONFIG_BAD);
+		reply = nm_dbus_create_error_message (message, NM_DBUS_INTERFACE_VPNC, NM_DBUS_VPN_BAD_ARGUMENTS,
+											 "Invalid VPN options.");
 		goto out;
 	}
 
 	/* Now we can finally try to activate the VPN */
-	if ((vpnc_fd = nm_vpnc_start_vpnc_binary (data)) >= 0)
+	if ((vpnc_fd = nm_vpnc_start_vpnc_binary (data)) < 0)
 	{
-		if (nm_vpnc_config_write (vpnc_fd, user_name, password_items, num_passwords, data_items, num_items))
-			success = TRUE;
-		else
-			nm_vpnc_dbus_signal_failure (data, NM_DBUS_VPN_SIGNAL_LAUNCH_FAILED);
-		close (vpnc_fd);
+		reply = nm_dbus_create_error_message (message, NM_DBUS_INTERFACE_VPNC, "LaunchFailed",
+											 "Failed to run vpnc binary.");
+		goto out;
+	}
+
+	if (!nm_vpnc_config_write (vpnc_fd, user_name, password_items, num_passwords, data_items, num_items))
+	{
+		reply = nm_dbus_create_error_message (message, NM_DBUS_INTERFACE_VPNC, NM_DBUS_VPN_BAD_ARGUMENTS,
+											 "Invalid VPN options.");
+		goto out;
 	}
 
+	reply = dbus_message_new_method_return (message);
+	success = TRUE;
+
 out:
+
+	if (vpnc_fd >= 0)
+		close (vpnc_fd);
+
 	dbus_free_string_array (data_items);
+	dbus_free_string_array (password_items);
+	dbus_free_string_array (user_routes);
 	if (!success)
 		nm_vpnc_set_state (data, NM_VPN_STATE_STOPPED);
-	return success;
+
+	return reply;
 }
 
 
@@ -687,8 +720,7 @@
 
 		case NM_VPN_STATE_STOPPED:
 			nm_vpnc_cancel_quit_timer (data);
-			nm_vpnc_dbus_handle_start_vpn (message, data);
-			reply = dbus_message_new_method_return (message);
+			reply = nm_vpnc_dbus_handle_start_vpn (message, data);
 			break;
 
 		default:
@@ -864,6 +896,7 @@
 	guint32		ip4_dns_len;
 	guint32 *		ip4_nbns;
 	guint32		ip4_nbns_len;
+	guint32		mss;
 	char *		cisco_def_domain;
 	char *		cisco_banner;
 	gboolean		success = FALSE;
@@ -892,6 +925,10 @@
 
 	/* For Cisco/vpnc, PtP address == local VPN address */
 	ip4_ptp_address = ip4_address;
+
+	/* and we don't specify an MSS */
+	mss = 0;
+
 #if 0
 	print_vpn_config (ip4_vpn_gateway, tundev, ip4_address, ip4_netmask,
 					ip4_dns, ip4_dns_len, ip4_nbns, ip4_nbns_len,
@@ -909,6 +946,7 @@
 	 DBUS_TYPE_UINT32, &ip4_netmask,
 	 DBUS_TYPE_ARRAY, DBUS_TYPE_UINT32, &ip4_dns, ip4_dns_len,
 	 DBUS_TYPE_ARRAY, DBUS_TYPE_UINT32, &ip4_nbns, ip4_nbns_len,
+						 DBUS_TYPE_UINT32, &mss,
 	 DBUS_TYPE_STRING, &cisco_def_domain,
 	 DBUS_TYPE_STRING, &cisco_banner, DBUS_TYPE_INVALID);
 	if (!dbus_connection_send (data->con, signal, NULL))
diff -urN NetworkManager-vpnc-0.5.0cvs20060202/src/nm-vpnc-service-vpnc-helper.c NetworkManager-vpnc-CVS/src/nm-vpnc-service-vpnc-helper.c
--- NetworkManager-vpnc-0.5.0cvs20060202/src/nm-vpnc-service-vpnc-helper.c	2005-09-26 17:53:22.000000000 +0300
+++ NetworkManager-vpnc-CVS/src/nm-vpnc-service-vpnc-helper.c	2006-09-27 18:10:37.000000000 +0300
@@ -29,7 +29,7 @@
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib-lowlevel.h>
 #include <dbus/dbus-glib.h>
-#include <NetworkManager/NetworkManager.h>
+#include <NetworkManager.h>
 
 #include "nm-vpnc-service.h"
 #include "nm-utils.h"

Places

File nm-vpnc-0.6-branch.patch of Package NetworkManager-vpnc (Revision e29c4479a16babf7c7b0a5646370f130)

Places