--- nparted-0.1.orig/Makefile.in
+++ nparted-0.1/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -57,21 +57,24 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
+BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 DATADIRNAME = @DATADIRNAME@
 GENCAT = @GENCAT@
+GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
-GT_NO = @GT_NO@
-GT_YES = @GT_YES@
-INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
 INSTOBJEXT = @INSTOBJEXT@
-INTLDEPS = @INTLDEPS@
+INTLBISON = @INTLBISON@
 INTLINCS = @INTLINCS@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
+INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+LIBICONV = @LIBICONV@
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -82,7 +85,6 @@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-l = @l@
 
 sbin_PROGRAMS = nparted
 
@@ -119,7 +121,7 @@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gtar
+TAR = tar
 GZIP_ENV = --best
 SOURCES = $(nparted_SOURCES)
 OBJECTS = $(nparted_OBJECTS)
@@ -137,7 +139,7 @@
 $(ACLOCAL_M4):  configure.in 
 	cd $(srcdir) && $(ACLOCAL)
 
-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+config.status: $(srcdir)/configure.in $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
 $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
 	cd $(srcdir) && $(AUTOCONF)
@@ -177,7 +179,7 @@
 	$(COMPILE) -c $<
 
 mostlyclean-compile:
-	-rm -f *.o core *.core
+	-rm -f *.o core *.core 
 
 clean-compile:
 
@@ -337,7 +339,6 @@
 	      || exit 1; \
 	  fi; \
 	done
-
 info-am:
 info: info-recursive
 dvi-am:
@@ -372,24 +373,24 @@
 
 distclean-generic:
 	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f config.cache config.log config.status stamp-h stamp-h[0-9]* *.o
 
 maintainer-clean-generic:
 mostlyclean-am:  mostlyclean-sbinPROGRAMS mostlyclean-compile \
 		mostlyclean-tags mostlyclean-generic
-
 mostlyclean: mostlyclean-recursive
 
 clean-am:  clean-sbinPROGRAMS clean-compile clean-tags clean-generic \
 		mostlyclean-am
 
 clean: clean-recursive
+	rm -rf config.*
 
 distclean-am:  distclean-sbinPROGRAMS distclean-compile distclean-tags \
 		distclean-generic clean-am
 
 distclean: distclean-recursive
-	-rm -f config.status
+	-rm -f config.*
 
 maintainer-clean-am:  maintainer-clean-sbinPROGRAMS \
 		maintainer-clean-compile maintainer-clean-tags \
--- nparted-0.1.orig/aclocal.m4
+++ nparted-0.1/aclocal.m4
@@ -1,4 +1,4 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4
+dnl aclocal.m4 generated automatically by aclocal 1.4-p4
 
 dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
@@ -106,13 +106,45 @@
 # Ulrich Drepper <drepper@cygnus.com>, 1995.
 #
 # This file can be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
-
-# serial 5
-
-AC_DEFUN(AM_WITH_NLS,
+# be used in projects which are not available under the GNU General Public
+# License or the GNU Library General Public License but which still want
+# to provide support for the GNU gettext functionality.
+# Please note that the actual code of the GNU gettext library is covered
+# by the GNU Library General Public License, and the rest of the GNU
+# gettext package package is covered by the GNU General Public License.
+# They are *not* in the public domain.
+
+# serial 10
+
+dnl Usage: AM_WITH_NLS([TOOLSYMBOL], [NEEDSYMBOL], [LIBDIR]).
+dnl If TOOLSYMBOL is specified and is 'use-libtool', then a libtool library
+dnl    $(top_builddir)/intl/libintl.la will be created (shared and/or static,
+dnl    depending on --{enable,disable}-{shared,static} and on the presence of
+dnl    AM-DISABLE-SHARED). Otherwise, a static library
+dnl    $(top_builddir)/intl/libintl.a will be created.
+dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
+dnl    implementations (in libc or libintl) without the ngettext() function
+dnl    will be ignored.
+dnl LIBDIR is used to find the intl libraries.  If empty,
+dnl    the value `$(top_builddir)/intl/' is used.
+dnl
+dnl The result of the configuration is one of three cases:
+dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
+dnl    and used.
+dnl    Catalog format: GNU --> install in $(datadir)
+dnl    Catalog extension: .mo after installation, .gmo in source tree
+dnl 2) GNU gettext has been found in the system's C library.
+dnl    Catalog format: GNU --> install in $(datadir)
+dnl    Catalog extension: .mo after installation, .gmo in source tree
+dnl 3) No internationalization, always use English msgid.
+dnl    Catalog format: none
+dnl    Catalog extension: none
+dnl The use of .gmo is historical (it was needed to avoid overwriting the
+dnl GNU format catalogs when building on a platform with an X/Open gettext),
+dnl but we keep it in order not to force irrelevant filename changes on the
+dnl maintainers.
+dnl
+AC_DEFUN([AM_WITH_NLS],
   [AC_MSG_CHECKING([whether NLS is requested])
     dnl Default is enabled NLS
     AC_ARG_ENABLE(nls,
@@ -121,11 +153,15 @@
     AC_MSG_RESULT($USE_NLS)
     AC_SUBST(USE_NLS)
 
+    BUILD_INCLUDED_LIBINTL=no
     USE_INCLUDED_LIBINTL=no
+    INTLLIBS=
 
     dnl If we use NLS figure out what method
     if test "$USE_NLS" = "yes"; then
-      AC_DEFINE(ENABLE_NLS)
+      AC_DEFINE(ENABLE_NLS, 1,
+        [Define to 1 if translation of program messages to the user's native language
+   is requested.])
       AC_MSG_CHECKING([whether included gettext is requested])
       AC_ARG_WITH(included-gettext,
         [  --with-included-gettext use the GNU gettext library included here],
@@ -136,86 +172,74 @@
       nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
       if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
         dnl User does not insist on using GNU NLS library.  Figure out what
-        dnl to use.  If gettext or catgets are available (in this order) we
-        dnl use this.  Else we have to fall back to GNU NLS library.
-	dnl catgets is only used if permitted by option --with-catgets.
-	nls_cv_header_intl=
-	nls_cv_header_libgt=
+        dnl to use.  If GNU gettext is available we use this.  Else we have
+        dnl to fall back to GNU NLS library.
 	CATOBJEXT=NONE
 
+        dnl Add a version number to the cache macros.
+        define(gt_cv_func_gnugettext_libc, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libc])
+        define(gt_cv_func_gnugettext_libintl, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libintl])
+
 	AC_CHECK_HEADER(libintl.h,
-	  [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc,
-	    [AC_TRY_LINK([#include <libintl.h>], [return (int) gettext ("")],
-	       gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)])
-
-	   if test "$gt_cv_func_gettext_libc" != "yes"; then
-	     AC_CHECK_LIB(intl, bindtextdomain,
-	       [AC_CACHE_CHECK([for gettext in libintl],
-		 gt_cv_func_gettext_libintl,
-		 [AC_CHECK_LIB(intl, gettext,
-		  gt_cv_func_gettext_libintl=yes,
-		  gt_cv_func_gettext_libintl=no)],
-		 gt_cv_func_gettext_libintl=no)])
+	  [AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
+	    [AC_TRY_LINK([#include <libintl.h>
+extern int _nl_msg_cat_cntr;],
+	       [bindtextdomain ("", "");
+return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr],
+	       gt_cv_func_gnugettext_libc=yes,
+	       gt_cv_func_gnugettext_libc=no)])
+
+	   if test "$gt_cv_func_gnugettext_libc" != "yes"; then
+	     AC_CACHE_CHECK([for GNU gettext in libintl],
+	       gt_cv_func_gnugettext_libintl,
+	       [gt_save_LIBS="$LIBS"
+		LIBS="$LIBS -lintl $LIBICONV"
+		AC_TRY_LINK([#include <libintl.h>
+extern int _nl_msg_cat_cntr;],
+		  [bindtextdomain ("", "");
+return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr],
+		  gt_cv_func_gnugettext_libintl=yes,
+		  gt_cv_func_gnugettext_libintl=no)
+		LIBS="$gt_save_LIBS"])
 	   fi
 
-	   if test "$gt_cv_func_gettext_libc" = "yes" \
-	      || test "$gt_cv_func_gettext_libintl" = "yes"; then
-	      AC_DEFINE(HAVE_GETTEXT)
-	      AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-		[test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
-	      if test "$MSGFMT" != "no"; then
-		AC_CHECK_FUNCS(dcgettext)
-		AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-		AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-		  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-		AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
-			       return _nl_msg_cat_cntr],
-		  [CATOBJEXT=.gmo
-		   DATADIRNAME=share],
-		  [CATOBJEXT=.mo
-		   DATADIRNAME=lib])
-		INSTOBJEXT=.mo
-	      fi
-	    fi
-	])
+	   dnl If an already present or preinstalled GNU gettext() is found,
+	   dnl use it.  But if this macro is used in GNU gettext, and GNU
+	   dnl gettext is already preinstalled in libintl, we update this
+	   dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
+	   if test "$gt_cv_func_gnugettext_libc" = "yes" \
+	      || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
+		   && test "$PACKAGE" != gettext; }; then
+	     AC_DEFINE(HAVE_GETTEXT, 1,
+               [Define if the GNU gettext() function is already present or preinstalled.])
+
+	     if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
+	       dnl If iconv() is in a separate libiconv library, then anyone
+	       dnl linking with libintl{.a,.so} also needs to link with
+	       dnl libiconv.
+	       INTLLIBS="-lintl $LIBICONV"
+	     fi
+
+	     gt_save_LIBS="$LIBS"
+	     LIBS="$LIBS $INTLLIBS"
+	     AC_CHECK_FUNCS(dcgettext)
+	     LIBS="$gt_save_LIBS"
+
+	     dnl Search for GNU msgfmt in the PATH.
+	     AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+	       [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1], :)
+	     AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+
+	     dnl Search for GNU xgettext in the PATH.
+	     AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+	       [$ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1], :)
 
-        if test "$CATOBJEXT" = "NONE"; then
-	  AC_MSG_CHECKING([whether catgets can be used])
-	  AC_ARG_WITH(catgets,
-	    [  --with-catgets          use catgets functions if available],
-	    nls_cv_use_catgets=$withval, nls_cv_use_catgets=no)
-	  AC_MSG_RESULT($nls_cv_use_catgets)
-
-	  if test "$nls_cv_use_catgets" = "yes"; then
-	    dnl No gettext in C library.  Try catgets next.
-	    AC_CHECK_LIB(i, main)
-	    AC_CHECK_FUNC(catgets,
-	      [AC_DEFINE(HAVE_CATGETS)
-	       INTLOBJS="\$(CATOBJS)"
-	       AC_PATH_PROG(GENCAT, gencat, no)dnl
-	       if test "$GENCAT" != "no"; then
-		 AC_PATH_PROG(GMSGFMT, gmsgfmt, no)
-		 if test "$GMSGFMT" = "no"; then
-		   AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt,
-		    [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)
-		 fi
-		 AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-		   [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-		 USE_INCLUDED_LIBINTL=yes
-		 CATOBJEXT=.cat
-		 INSTOBJEXT=.cat
-		 DATADIRNAME=lib
-		 INTLDEPS='$(top_builddir)/intl/libintl.a'
-		 INTLLIBS=$INTLDEPS
-		 LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-		 nls_cv_header_intl=intl/libintl.h
-		 nls_cv_header_libgt=intl/libgettext.h
-	       fi])
-	  fi
-        fi
+	     CATOBJEXT=.gmo
+	   fi
+	])
 
         if test "$CATOBJEXT" = "NONE"; then
-	  dnl Neither gettext nor catgets in included in the C library.
+	  dnl GNU gettext is not found in the C library.
 	  dnl Fall back on GNU gettext library.
 	  nls_cv_use_gnu_gettext=yes
         fi
@@ -225,27 +249,38 @@
         dnl Mark actions used to generate GNU NLS library.
         INTLOBJS="\$(GETTOBJS)"
         AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt)
+	  [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1], :)
         AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
         AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+	  [$ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1], :)
         AC_SUBST(MSGFMT)
+	BUILD_INCLUDED_LIBINTL=yes
 	USE_INCLUDED_LIBINTL=yes
         CATOBJEXT=.gmo
-        INSTOBJEXT=.mo
-        DATADIRNAME=share
-	INTLDEPS='$(top_builddir)/intl/libintl.a'
-	INTLLIBS=$INTLDEPS
-	LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-        nls_cv_header_intl=intl/libintl.h
-        nls_cv_header_libgt=intl/libgettext.h
+	INTLLIBS="ifelse([$3],[],\$(top_builddir)/intl,[$3])/libintl.ifelse([$1], use-libtool, [l], [])a $LIBICONV"
+	LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
+      fi
+
+      dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
+      dnl Test whether we really found GNU msgfmt.
+      if test "$GMSGFMT" != ":"; then
+	dnl If it is no GNU msgfmt we define it as : so that the
+	dnl Makefiles still can work.
+	if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then
+	  : ;
+	else
+	  AC_MSG_RESULT(
+	    [found msgfmt program is not GNU msgfmt; ignore it])
+	  GMSGFMT=":"
+	fi
       fi
 
+      dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
       dnl Test whether we really found GNU xgettext.
       if test "$XGETTEXT" != ":"; then
 	dnl If it is no GNU xgettext we define it as : so that the
 	dnl Makefiles still can work.
-	if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+	if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then
 	  : ;
 	else
 	  AC_MSG_RESULT(
@@ -254,25 +289,76 @@
 	fi
       fi
 
-      # We need to process the po/ directory.
+      dnl We need to process the po/ directory.
       POSUB=po
-    else
-      DATADIRNAME=share
-      nls_cv_header_intl=intl/libintl.h
-      nls_cv_header_libgt=intl/libgettext.h
     fi
-    AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
     AC_OUTPUT_COMMANDS(
-     [case "$CONFIG_FILES" in *po/Makefile.in*)
-        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
-      esac])
+     [for ac_file in $CONFIG_FILES; do
+        # Support "outfile[:infile[:infile...]]"
+        case "$ac_file" in
+          *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+        esac
+        # PO directories have a Makefile.in generated from Makefile.in.in.
+        case "$ac_file" in */Makefile.in)
+          # Adjust a relative srcdir.
+          ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+          ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+          ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+          # In autoconf-2.13 it is called $ac_given_srcdir.
+          # In autoconf-2.50 it is called $srcdir.
+          test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+          case "$ac_given_srcdir" in
+            .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+            /*) top_srcdir="$ac_given_srcdir" ;;
+            *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
+          esac
+          if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
+            rm -f "$ac_dir/POTFILES"
+            test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
+            sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," -e "\$s/\(.*\) \\\\/\1/" < "$ac_given_srcdir/$ac_dir/POTFILES.in" > "$ac_dir/POTFILES"
+            test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
+            sed -e "/POTFILES =/r $ac_dir/POTFILES" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
+          fi
+          ;;
+        esac
+      done])
 
 
-    # If this is used in GNU gettext we have to set USE_NLS to `yes'
-    # because some of the sources are only built for this goal.
+    dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
+    dnl to 'yes' because some of the testsuite requires it.
     if test "$PACKAGE" = gettext; then
-      USE_NLS=yes
-      USE_INCLUDED_LIBINTL=yes
+      BUILD_INCLUDED_LIBINTL=yes
+    fi
+
+    dnl intl/plural.c is generated from intl/plural.y. It requires bison,
+    dnl because plural.y uses bison specific features. It requires at least
+    dnl bison-1.26 because earlier versions generate a plural.c that doesn't
+    dnl compile.
+    dnl bison is only needed for the maintainer (who touches plural.y). But in
+    dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
+    dnl the rule in general Makefile. Now, some people carelessly touch the
+    dnl files or have a broken "make" program, hence the plural.c rule will
+    dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
+    dnl present or too old.
+    AC_CHECK_PROGS([INTLBISON], [bison])
+    if test -z "$INTLBISON"; then
+      ac_verc_fail=yes
+    else
+      dnl Found it, now check the version.
+      AC_MSG_CHECKING([version of bison])
+changequote(<<,>>)dnl
+      ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
+      case $ac_prog_version in
+        '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+        1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
+changequote([,])dnl
+           ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+        *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
+      esac
+      AC_MSG_RESULT([$ac_prog_version])
+    fi
+    if test $ac_verc_fail = yes; then
+      INTLBISON=:
     fi
 
     dnl These rules are solely for the distribution goal.  While doing this
@@ -284,22 +370,38 @@
     done
 
     dnl Make all variables we use known to autoconf.
+    AC_SUBST(BUILD_INCLUDED_LIBINTL)
     AC_SUBST(USE_INCLUDED_LIBINTL)
     AC_SUBST(CATALOGS)
     AC_SUBST(CATOBJEXT)
-    AC_SUBST(DATADIRNAME)
     AC_SUBST(GMOFILES)
-    AC_SUBST(INSTOBJEXT)
-    AC_SUBST(INTLDEPS)
     AC_SUBST(INTLLIBS)
     AC_SUBST(INTLOBJS)
     AC_SUBST(POFILES)
     AC_SUBST(POSUB)
+
+    dnl For backward compatibility. Some configure.ins may be using this.
+    nls_cv_header_intl=
+    nls_cv_header_libgt=
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    DATADIRNAME=share
+    AC_SUBST(DATADIRNAME)
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    INSTOBJEXT=.mo
+    AC_SUBST(INSTOBJEXT)
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    GENCAT=gencat
+    AC_SUBST(GENCAT)
   ])
 
-AC_DEFUN(AM_GNU_GETTEXT,
+dnl Usage: Just like AM_WITH_NLS, which see.
+AC_DEFUN([AM_GNU_GETTEXT],
   [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
    AC_REQUIRE([AC_PROG_CC])dnl
+   AC_REQUIRE([AC_CANONICAL_HOST])dnl
    AC_REQUIRE([AC_PROG_RANLIB])dnl
    AC_REQUIRE([AC_ISC_POSIX])dnl
    AC_REQUIRE([AC_HEADER_STDC])dnl
@@ -309,21 +411,18 @@
    AC_REQUIRE([AC_TYPE_SIZE_T])dnl
    AC_REQUIRE([AC_FUNC_ALLOCA])dnl
    AC_REQUIRE([AC_FUNC_MMAP])dnl
+   AC_REQUIRE([jm_GLIBC21])dnl
 
-   AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \
-unistd.h sys/param.h])
-   AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
-strdup __argz_count __argz_stringify __argz_next])
-
-   if test "${ac_cv_func_stpcpy+set}" != "set"; then
-     AC_CHECK_FUNCS(stpcpy)
-   fi
-   if test "${ac_cv_func_stpcpy}" = "yes"; then
-     AC_DEFINE(HAVE_STPCPY)
-   fi
+   AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
+stdlib.h string.h unistd.h sys/param.h])
+   AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getcwd getegid geteuid \
+getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \
+strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
 
+   AM_ICONV
+   AM_LANGINFO_CODESET
    AM_LC_MESSAGES
-   AM_WITH_NLS
+   AM_WITH_NLS([$1],[$2],[$3])
 
    if test "x$CATOBJEXT" != "x"; then
      if test "x$ALL_LINGUAS" = "x"; then
@@ -331,10 +430,21 @@
      else
        AC_MSG_CHECKING(for catalogs to be installed)
        NEW_LINGUAS=
-       for lang in ${LINGUAS=$ALL_LINGUAS}; do
-         case "$ALL_LINGUAS" in
-          *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
-         esac
+       for presentlang in $ALL_LINGUAS; do
+         useit=no
+         for desiredlang in ${LINGUAS-$ALL_LINGUAS}; do
+           # Use the presentlang catalog if desiredlang is
+           #   a. equal to presentlang, or
+           #   b. a variant of presentlang (because in this case,
+           #      presentlang can be used as a fallback for messages
+           #      which are not translated in the desiredlang catalog).
+           case "$desiredlang" in
+             "$presentlang"*) useit=yes;;
+           esac
+         done
+         if test $useit = yes; then
+           NEW_LINGUAS="$NEW_LINGUAS $presentlang"
+         fi
        done
        LINGUAS=$NEW_LINGUAS
        AC_MSG_RESULT($LINGUAS)
@@ -346,47 +456,8 @@
      fi
    fi
 
-   dnl The reference to <locale.h> in the installed <libintl.h> file
-   dnl must be resolved because we cannot expect the users of this
-   dnl to define HAVE_LOCALE_H.
-   if test $ac_cv_header_locale_h = yes; then
-     INCLUDE_LOCALE_H="#include <locale.h>"
-   else
-     INCLUDE_LOCALE_H="\
-/* The system does not provide the header <locale.h>.  Take care yourself.  */"
-   fi
-   AC_SUBST(INCLUDE_LOCALE_H)
-
-   dnl Determine which catalog format we have (if any is needed)
-   dnl For now we know about two different formats:
-   dnl   Linux libc-5 and the normal X/Open format
-   test -d intl || mkdir intl
-   if test "$CATOBJEXT" = ".cat"; then
-     AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen)
-
-     dnl Transform the SED scripts while copying because some dumb SEDs
-     dnl cannot handle comments.
-     sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed
-   fi
-   dnl po2tbl.sed is always needed.
-   sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
-     $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed
-
-   dnl In the intl/Makefile.in we have a special dependency which makes
-   dnl only sense for gettext.  We comment this out for non-gettext
-   dnl packages.
-   if test "$PACKAGE" = "gettext"; then
-     GT_NO="#NO#"
-     GT_YES=
-   else
-     GT_NO=
-     GT_YES="#YES#"
-   fi
-   AC_SUBST(GT_NO)
-   AC_SUBST(GT_YES)
-
    dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
-   dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
+   dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
    dnl Try to locate is.
    MKINSTALLDIRS=
    if test -n "$ac_aux_dir"; then
@@ -397,40 +468,28 @@
    fi
    AC_SUBST(MKINSTALLDIRS)
 
-   dnl *** For now the libtool support in intl/Makefile is not for real.
-   l=
-   AC_SUBST(l)
-
-   dnl Generate list of files to be processed by xgettext which will
-   dnl be included in po/Makefile.
-   test -d po || mkdir po
-   if test "x$srcdir" != "x."; then
-     if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-       posrcprefix="$srcdir/"
-     else
-       posrcprefix="../$srcdir/"
-     fi
-   else
-     posrcprefix="../"
-   fi
-   rm -f po/POTFILES
-   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
-	< $srcdir/po/POTFILES.in > po/POTFILES
+   dnl Enable libtool support if the surrounding package wishes it.
+   INTL_LIBTOOL_SUFFIX_PREFIX=ifelse([$1], use-libtool, [l], [])
+   AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
   ])
 
 # Search path for a program which passes the given test.
 # Ulrich Drepper <drepper@cygnus.com>, 1996.
 #
 # This file can be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
+# be used in projects which are not available under the GNU General Public
+# License or the GNU Library General Public License but which still want
+# to provide support for the GNU gettext functionality.
+# Please note that the actual code of the GNU gettext library is covered
+# by the GNU Library General Public License, and the rest of the GNU
+# gettext package package is covered by the GNU General Public License.
+# They are *not* in the public domain.
 
-# serial 1
+# serial 2
 
 dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
 dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-AC_DEFUN(AM_PATH_PROG_WITH_TEST,
+AC_DEFUN([AM_PATH_PROG_WITH_TEST],
 [# Extract the first word of "$2", so it can be a program name with args.
 set dummy $2; ac_word=[$]2
 AC_MSG_CHECKING([for $ac_word])
@@ -458,7 +517,7 @@
   ;;
 esac])dnl
 $1="$ac_cv_path_$1"
-if test -n "[$]$1"; then
+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
   AC_MSG_RESULT([$]$1)
 else
   AC_MSG_RESULT(no)
@@ -466,23 +525,161 @@
 AC_SUBST($1)dnl
 ])
 
+#serial 1
+# This test replaces the one in autoconf.
+# Currently this macro should have the same name as the autoconf macro
+# because gettext's gettext.m4 (distributed in the automake package)
+# still uses it.  Otherwise, the use in gettext.m4 makes autoheader
+# give these diagnostics:
+#   configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
+#   configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
+
+undefine([AC_ISC_POSIX])
+
+AC_DEFUN([AC_ISC_POSIX],
+  [
+    dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
+    AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
+  ]
+)
+
+#serial 2
+
+# Test for the GNU C Library, version 2.1 or newer.
+# From Bruno Haible.
+
+AC_DEFUN([jm_GLIBC21],
+  [
+    AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
+      ac_cv_gnu_library_2_1,
+      [AC_EGREP_CPP([Lucky GNU user],
+	[
+#include <features.h>
+#ifdef __GNU_LIBRARY__
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
+  Lucky GNU user
+ #endif
+#endif
+	],
+	ac_cv_gnu_library_2_1=yes,
+	ac_cv_gnu_library_2_1=no)
+      ]
+    )
+    AC_SUBST(GLIBC21)
+    GLIBC21="$ac_cv_gnu_library_2_1"
+  ]
+)
+
+#serial AM2
+
+dnl From Bruno Haible.
+
+AC_DEFUN([AM_ICONV],
+[
+  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
+  dnl those with the standalone portable GNU libiconv installed).
+
+  AC_ARG_WITH([libiconv-prefix],
+[  --with-libiconv-prefix=DIR  search for libiconv in DIR/include and DIR/lib], [
+    for dir in `echo "$withval" | tr : ' '`; do
+      if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
+      if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
+    done
+   ])
+
+  AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
+    am_cv_func_iconv="no, consider installing GNU libiconv"
+    am_cv_lib_iconv=no
+    AC_TRY_LINK([#include <stdlib.h>
+#include <iconv.h>],
+      [iconv_t cd = iconv_open("","");
+       iconv(cd,NULL,NULL,NULL,NULL);
+       iconv_close(cd);],
+      am_cv_func_iconv=yes)
+    if test "$am_cv_func_iconv" != yes; then
+      am_save_LIBS="$LIBS"
+      LIBS="$LIBS -liconv"
+      AC_TRY_LINK([#include <stdlib.h>
+#include <iconv.h>],
+        [iconv_t cd = iconv_open("","");
+         iconv(cd,NULL,NULL,NULL,NULL);
+         iconv_close(cd);],
+        am_cv_lib_iconv=yes
+        am_cv_func_iconv=yes)
+      LIBS="$am_save_LIBS"
+    fi
+  ])
+  if test "$am_cv_func_iconv" = yes; then
+    AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
+    AC_MSG_CHECKING([for iconv declaration])
+    AC_CACHE_VAL(am_cv_proto_iconv, [
+      AC_TRY_COMPILE([
+#include <stdlib.h>
+#include <iconv.h>
+extern
+#ifdef __cplusplus
+"C"
+#endif
+#if defined(__STDC__) || defined(__cplusplus)
+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
+#else
+size_t iconv();
+#endif
+], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
+      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
+    am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
+    AC_MSG_RESULT([$]{ac_t:-
+         }[$]am_cv_proto_iconv)
+    AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
+      [Define as const if the declaration of iconv() needs const.])
+  fi
+  LIBICONV=
+  if test "$am_cv_lib_iconv" = yes; then
+    LIBICONV="-liconv"
+  fi
+  AC_SUBST(LIBICONV)
+])
+
+#serial AM1
+
+dnl From Bruno Haible.
+
+AC_DEFUN([AM_LANGINFO_CODESET],
+[
+  AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
+    [AC_TRY_LINK([#include <langinfo.h>],
+      [char* cs = nl_langinfo(CODESET);],
+      am_cv_langinfo_codeset=yes,
+      am_cv_langinfo_codeset=no)
+    ])
+  if test $am_cv_langinfo_codeset = yes; then
+    AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
+      [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
+  fi
+])
+
 # Check whether LC_MESSAGES is available in <locale.h>.
 # Ulrich Drepper <drepper@cygnus.com>, 1995.
 #
 # This file can be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
+# be used in projects which are not available under the GNU General Public
+# License or the GNU Library General Public License but which still want
+# to provide support for the GNU gettext functionality.
+# Please note that the actual code of the GNU gettext library is covered
+# by the GNU Library General Public License, and the rest of the GNU
+# gettext package package is covered by the GNU General Public License.
+# They are *not* in the public domain.
 
-# serial 1
+# serial 2
 
-AC_DEFUN(AM_LC_MESSAGES,
+AC_DEFUN([AM_LC_MESSAGES],
   [if test $ac_cv_header_locale_h = yes; then
     AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
       [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
        am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
     if test $am_cv_val_LC_MESSAGES = yes; then
-      AC_DEFINE(HAVE_LC_MESSAGES)
+      AC_DEFINE(HAVE_LC_MESSAGES, 1,
+        [Define if your <locale.h> file defines LC_MESSAGES.])
     fi
   fi])
 
--- nparted-0.1.orig/configure
+++ nparted-0.1/configure
@@ -992,13 +992,13 @@
   CFLAGS="$ac_save_CFLAGS"
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
+    CFLAGS="-g -g2"
   else
     CFLAGS="-g"
   fi
 else
   if test "$GCC" = yes; then
-    CFLAGS="-O2"
+    CFLAGS="-g2"
   else
     CFLAGS=
   fi
@@ -1121,10 +1121,10 @@
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char ped_init();
+char _init();
 
 int main() {
-ped_init()
+_init()
 ; return 0; }
 EOF
 if { (eval echo configure:1131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
@@ -1161,7 +1161,7 @@
 
 
 
-ALL_LINGUAS="es es_ES"
+ALL_LINGUAS="es es_ES fr fr_FR"
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
 echo "configure:1167: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
@@ -3192,10 +3192,10 @@
    rm -f po/POTFILES
    sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
 	< $srcdir/po/POTFILES.in > po/POTFILES
-  
+
 CFLAGS="$CFLAGS -DLOCALEDIR=\"\\\"$datadir/locale\\\"\""
-if test "$USE_INCLUDED_LIBINTL" = "yes"; then
-	{ echo "configure: error: GNU nparted requires gettext to be intsalled for compilation -
+if test "$USE_INCLUDED_LIBINTL" = "no"; then
+	{ echo "configure: error: GNU nparted requires gettextcat coin to be intsalled for compilation -
 	if native language suppor is desired. Either disable native language
 	suppor with:
 		$ ./configure --disable-nls
--- nparted-0.1.orig/edit_partition.c
+++ nparted-0.1/edit_partition.c
@@ -27,6 +27,8 @@
 
 /* Codigo a realizar cuando se edita una partición */
 #include "nparted.h"
+#include <string.h>
+
 /* Joder que función tan grande, me parece que hay que particionarla
  * valga la redundancia */
 typedef struct _edit edit;
@@ -45,7 +47,7 @@
 
 	form->start=		newtLabel( 1, 3,_("Start")  );
 	form->end=		newtLabel( 1, 5,_("End")    );
-	form->tamano=		newtLabel( 1, 7,_("Tamano") );
+	form->tamano=		newtLabel( 1, 7,_("Size") );
 
 	form->now=		newtLabel(14, 1,_("Now")    );
 	form->start_now=	newtLabel(12, 3,"");
@@ -69,7 +71,7 @@
 				|NEWT_FLAG_RETURNEXIT);
 
 
-	form->grow=newtCheckbox(5,10,_("Grow too much posibble"),' ',NULL,NULL);
+	form->grow=newtCheckbox(5,10,_("Grow as much as possible"),' ',NULL,NULL);
 	form->file_system=newtLabel(50,10,_("Without Filesystem"));
 	form->sel_file_system=newtButton(38,9,_("Select"));
 
@@ -116,7 +118,7 @@
 		return 0;
 	}
 	disk->dev=dev;
-	disk->disk=ped_disk_open(disk->dev);
+	disk->disk=ped_disk_new(disk->dev);
 	disk->constraint=ped_constraint_any(disk->disk);
 	disk->part=ped_disk_get_partition(disk->disk,npart);
 	disk->fs_name_changed=0;
@@ -140,7 +142,7 @@
 	return 1;
 
 error_disk_close: 
-	ped_disk_close(disk->disk);
+	ped_disk_commit(disk->disk);
 error:
 	return 0;
 
@@ -153,20 +155,20 @@
 		newtLabelSetText(form->file_system,disk->fs_type->name);	
 	}
 
-	sprintf(ptrb,"%d",(int)SEC2CIL(disk->dev,disk->part->geom.start));
+	snprintf(ptrb, sizeof(ptrb), "%d",(int)SEC2CIL(disk->dev,disk->part->geom.start));
 	newtLabelSetText(form->start_now,ptrb);
 
-	sprintf(ptrb,"%d",(int)SEC2CIL(disk->dev,disk->part->geom.end));
+	snprintf(ptrb, sizeof(ptrb), "%d",(int)SEC2CIL(disk->dev,disk->part->geom.end));
 	newtLabelSetText(form->end_now,ptrb);
 
-	sprintf(ptrb,"%d Mb", (int)SEC2MB((disk->part->geom.end-disk->part->geom.start+1)));
+	snprintf(ptrb, sizeof(ptrb), "%d Mb", (int)SEC2MB((disk->part->geom.end-disk->part->geom.start+1)));
 	newtLabelSetText(form->tamano_now,ptrb);
 
-	sprintf(ptrb,"%d",(int)SEC2CIL(disk->dev,disk->geom->start));
+	snprintf(ptrb, sizeof(ptrb), "%d",(int)SEC2CIL(disk->dev,disk->geom->start));
 	newtLabelSetText(form->start_min,ptrb);
-	sprintf(ptrb,"%d",(int)SEC2CIL(disk->dev,disk->geom->end));
+	snprintf(ptrb, sizeof(ptrb), "%d",(int)SEC2CIL(disk->dev,disk->geom->end));
 	newtLabelSetText(form->end_max,ptrb);
-	sprintf(ptrb,"%d Mb", (int)SEC2MB((disk->geom->end-disk->geom->start+1)));
+	snprintf(ptrb, sizeof(ptrb), "%d Mb", (int)SEC2MB((disk->geom->end-disk->geom->start+1)));
 	newtLabelSetText(form->tamano_max,ptrb);
 
 	newtScaleSet(form->progress,(100* (new_size->end))/disk->geom->end);
@@ -187,7 +189,7 @@
 
 	answer=NULL;
 
-	strcpy(fs_name,"Without Filesystem");
+	strncpy(fs_name,"Without Filesystem", sizeof(fs_name));
 	do{
 		fill_form(form, disk,&new_size);
 		newtFormRun(form->form,&(form->toexit));
@@ -203,11 +205,11 @@
 			
 			if(new_size.end<disk->geom->start) new_size.end=disk->geom->start;
 
-			sprintf(ptrb,"%d",(int)SEC2CIL(disk->dev,new_size.end));
+			snprintf(ptrb, sizeof(ptrb), "%d",(int)SEC2CIL(disk->dev,new_size.end));
 			newtEntrySet(form->end_new,ptrb,1);
-			sprintf(ptrb,"%d",(int)SEC2CIL(disk->dev,new_size.start));
+			snprintf(ptrb, sizeof(ptrb), "%d",(int)SEC2CIL(disk->dev,new_size.start));
 			newtEntrySet(form->start_new,ptrb,1);
-			sprintf(ptrb,"%d", (int)SEC2MB( (new_size.end- new_size.start)));
+			snprintf(ptrb, sizeof(ptrb), "%d", (int)SEC2MB( (new_size.end- new_size.start)));
 			newtEntrySet(form->tamano_new,ptrb,1);
 		}
 		if(answer==form->sel_file_system){
@@ -218,7 +220,7 @@
 				)==PED_EXCEPTION_OK){
 				aux=select_file_system();	
 				if(aux!=NULL){
-					strcpy(fs_name,aux);
+					strncpy(fs_name,aux, sizeof(fs_name));
 					newtLabelSetText(form->file_system,fs_name);
 					disk->fs_name_changed=1;
 				}
@@ -241,7 +243,7 @@
 				new_size.start=CIL2SEC(disk->dev,new_size.start);
 				if(new_size.start<64) new_size.start=64;
 				new_size.end=CIL2SEC(disk->dev,new_size.end+1)-1;
-				sprintf(ptrb,"%d", (int)SEC2MB( (new_size.end-
+				snprintf(ptrb, sizeof(ptrb), "%d", (int)SEC2MB( (new_size.end-
 							    new_size.start)));
 				newtEntrySet(form->tamano_new,ptrb,1);
 			}
@@ -258,9 +260,9 @@
 			}else{
 				if(new_size.start==0) new_size.start=disk->part->geom.start;
 				new_size.end=MB2SEC((tam))+new_size.start;
-				sprintf(ptrb,"%d",(int)SEC2CIL(disk->dev,new_size.end));
+				snprintf(ptrb, sizeof(ptrb), "%d",(int)SEC2CIL(disk->dev,new_size.end));
 				newtEntrySet(form->end_new,ptrb,1);
-				sprintf(ptrb,"%d",(int)SEC2CIL(disk->dev,new_size.start));
+				snprintf(ptrb, sizeof(ptrb), "%d",(int)SEC2CIL(disk->dev,new_size.start));
 				newtEntrySet(form->start_new,ptrb,1);
 			}
 		}
@@ -285,42 +287,42 @@
 			new_size.end-=CIL2SEC(disk->dev,2);
 			if(new_size.end<disk->geom->start) new_size.end=disk->geom->start;
 
-			sprintf(ptrb,"%d",(int)SEC2CIL(disk->dev,new_size.end));
+			snprintf(ptrb, sizeof(ptrb), "%d",(int)SEC2CIL(disk->dev,new_size.end));
 			newtEntrySet(form->end_new,ptrb,1);
-			sprintf(ptrb,"%d",(int)SEC2CIL(disk->dev,new_size.start));
+			snprintf(ptrb, sizeof(ptrb), "%d",(int)SEC2CIL(disk->dev,new_size.start));
 			newtEntrySet(form->start_new,ptrb,1);
-			sprintf(ptrb,"%d", (int)SEC2MB( (new_size.end- new_size.start)));
+			snprintf(ptrb, sizeof(ptrb), "%d", (int)SEC2MB( (new_size.end- new_size.start)));
 			newtEntrySet(form->tamano_new,ptrb,1);
 
 
 		}if(key==NEWT_KEY_PGUP){
 			new_size.end+=CIL2SEC(disk->dev,2);
 			if(new_size.end>disk->geom->end) new_size.end=disk->geom->end;
-			sprintf(ptrb,"%d",(int)SEC2CIL(disk->dev,new_size.end));
+			snprintf(ptrb, sizeof(ptrb), "%d",(int)SEC2CIL(disk->dev,new_size.end));
 			newtEntrySet(form->end_new,ptrb,1);
-			sprintf(ptrb,"%d",(int)SEC2CIL(disk->dev,new_size.start));
+			snprintf(ptrb, sizeof(ptrb), "%d",(int)SEC2CIL(disk->dev,new_size.start));
 			newtEntrySet(form->start_new,ptrb,1);
-			sprintf(ptrb,"%d", (int)SEC2MB( (new_size.end- new_size.start)));
+			snprintf(ptrb, sizeof(ptrb), "%d", (int)SEC2MB( (new_size.end- new_size.start)));
 			newtEntrySet(form->tamano_new,ptrb,1);
 
 		}if(key==NEWT_KEY_LEFT){
 			new_size.end-=50;
 			if(new_size.end<disk->geom->start) new_size.end=disk->geom->start;
-			sprintf(ptrb,"%d",(int)SEC2CIL(disk->dev,new_size.end));
+			snprintf(ptrb, sizeof(ptrb), "%d",(int)SEC2CIL(disk->dev,new_size.end));
 			newtEntrySet(form->end_new,ptrb,1);
-			sprintf(ptrb,"%d",(int)SEC2CIL(disk->dev,new_size.start));
+			snprintf(ptrb, sizeof(ptrb), "%d",(int)SEC2CIL(disk->dev,new_size.start));
 			newtEntrySet(form->start_new,ptrb,1);
-			sprintf(ptrb,"%d", (int)SEC2MB( (new_size.end- new_size.start)));
+			snprintf(ptrb, sizeof(ptrb), "%d", (int)SEC2MB( (new_size.end- new_size.start)));
 			newtEntrySet(form->tamano_new,ptrb,1);
 
 		}if(key==NEWT_KEY_RIGHT){
 			new_size.end+=50;
 			if(new_size.end>disk->geom->end) new_size.end=disk->geom->end;
-			sprintf(ptrb,"%d",(int)SEC2CIL(disk->dev,new_size.end));
+			snprintf(ptrb, sizeof(ptrb), "%d",(int)SEC2CIL(disk->dev,new_size.end));
 			newtEntrySet(form->end_new,ptrb,1);
-			sprintf(ptrb,"%d",(int)SEC2CIL(disk->dev,new_size.start));
+			snprintf(ptrb, sizeof(ptrb), "%d",(int)SEC2CIL(disk->dev,new_size.start));
 			newtEntrySet(form->start_new,ptrb,1);
-			sprintf(ptrb,"%d", (int)SEC2MB( (new_size.end- new_size.start)));
+			snprintf(ptrb, sizeof(ptrb), "%d", (int)SEC2MB( (new_size.end- new_size.start)));
 			newtEntrySet(form->tamano_new,ptrb,1);
 
 		}
@@ -336,7 +338,7 @@
 }
 int finalize_disk(disk_info *disk)
 {
-	ped_disk_close(disk->disk);
+	ped_disk_commit(disk->disk);
 	return 1;
 }
 int edit_partition (PedDevice *dev,int npart)
@@ -352,7 +354,7 @@
 		return 0;
 	}
 
-	sprintf(ptrb,_("Editing %s%d"),dev->path,npart);
+	snprintf(ptrb, sizeof(ptrb), _("Editing %s%d"),dev->path,npart);
 	/* Cuando se da a init_form por segunda vez da fallo */
 	init_form(form,ptrb);
 	/* Get some information */
--- nparted-0.1.orig/add_partition.c
+++ nparted-0.1/add_partition.c
@@ -24,6 +24,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 #include "nparted.h"
+#include <string.h>
 
 int do_list_free (PedDevice *dev, newtComponent free_list)
 {
@@ -32,7 +33,7 @@
 
 	strech *list_strech,*p,*new,*extend,*walk;
 
-	disk=ped_disk_open(dev);
+	disk=ped_disk_new(dev);
 	if(!disk) goto error;
 	
 	part=NULL;
@@ -42,7 +43,7 @@
 
 		if(part->type==PED_PARTITION_FREESPACE){
 #ifdef DEBUG_NPARTED
-			sprintf(ptrb,"mirando particion free (%Ld,%Ld) ",
+			snprintf(ptrb,sizeof(ptrb)"mirando particion free (%Ld,%Ld) ",
 					part->geom.start,part->geom.end);
 			ped_exception_throw(PED_EXCEPTION_ERROR,
 					PED_EXCEPTION_OK,
@@ -97,7 +98,7 @@
 			while (walk!=NULL){
 
 #ifdef DEBUG_NPARTED
-				sprintf(ptrb,"miando si (%Ld,%Ld) está dentro de (%Ld,%Ld)",
+				snprintf(ptrb, sizeof(ptrb), "miando si (%Ld,%Ld) está dentro de (%Ld,%Ld)",
 						part->geom.start,part->geom.end,walk->start,walk->end);
 				ped_exception_throw(PED_EXCEPTION_ERROR,
 						PED_EXCEPTION_OK,
@@ -132,7 +133,7 @@
 	p=list_strech;
 	while(p){
 		if(p->start<p->end){
-			sprintf(ptrb,"%Ld<=>%Ld",SEC2CIL(dev,p->start),SEC2CIL(dev,p->end));	
+			snprintf(ptrb, sizeof(ptrb), "%Ld<=>%Ld",SEC2CIL(dev,p->start),SEC2CIL(dev,p->end));	
 			newtListboxAppendEntry(free_list,ptrb,p);
 		}
 		new =p;
@@ -140,19 +141,19 @@
 	}
 
 	/* Ya tenemos en list_strech la lista de todos los huecos libres */
-	ped_disk_close(disk);
+	ped_disk_commit(disk);
 	return 1;
 error_disk_close:
-	ped_disk_close(disk);
+	ped_disk_commit(disk);
 error:
 	return 0;
 }
 
 static int grow_strech(PedDevice *dev,strech *tramo){
 	PedPartition *part;
-	PedDisk *disk=ped_disk_open(dev);
+	PedDisk *disk=ped_disk_new(dev);
 
-	disk=ped_disk_open(dev);
+	disk=ped_disk_new(dev);
 	if(!disk) goto error;
 
 	part=NULL;
@@ -160,10 +161,10 @@
 	part=ped_disk_get_partition_by_sector(disk, tramo->start);
 	if (part!=NULL){
 		tramo->end=part->geom.end;
-		ped_disk_close(disk);
+		ped_disk_commit(disk);
 		return 1;
 	}
-	ped_disk_close(disk);
+	ped_disk_commit(disk);
 	return 0;
 error:
 	return 0;
@@ -172,7 +173,7 @@
 	PedPartition *part;
 	PedDisk *disk;
 
-	disk=ped_disk_open(dev);
+	disk=ped_disk_new(dev);
 	if(!disk) goto error;
 
 	part=NULL;
@@ -181,12 +182,12 @@
 	if (part->type!=PED_PARTITION_LOGICAL&&part->type!=PED_PARTITION_PRIMARY){
 		part=ped_disk_get_partition_by_sector(disk, tramo->end);
 		if (part->type!=PED_PARTITION_LOGICAL&&part->type!=PED_PARTITION_PRIMARY){
-			ped_disk_close(disk);
+			ped_disk_commit(disk);
 			return 1;
 		}
 	}
 error_close_disk:
-	ped_disk_close(disk);
+	ped_disk_commit(disk);
 	return 0;
 error:
 	return 0;
@@ -195,48 +196,54 @@
 	newtComponent form,grow,inicio,fin, tam,fs,sel_fs,free_list,ok,cancel,ans,dofs,sel_ptype,ptype;
 	char fs_type[20];
 	PedSector tamano;
-	strech *ptramo,*tramo,p;
-	char part_type;
-	int ret,salir=0;
+	strech	*ptramo,*tramo,p;
+	char	part_type;
+	int	ret,salir=0;
+	int	height = (mainwin_size.height - 12) / 4;
+	int	width = 31 + (mainwin_size.width - 79) / 2;
+	const int	left = 25;
+	const int	middle = 31;
+	const int	right = 41;
 
 	/* ******************************************************************** *
 	 * 		INTERFAZ						*
 	 * ******************************************************************** */
+	height = (height > 1) ? height : 2;
 	tramo=&p;
-	sprintf(ptrb,_("Adding a part to %s"),dev->path);
+	snprintf(ptrb, sizeof(ptrb), _("Adding a part to %s"), dev->path);
 	newtCenteredWindow(mainwin_size.width, mainwin_size.height, ptrb);
-	form=newtForm(NULL,NULL,0);
-	free_list=newtListbox(5,3,10,NEWT_FLAG_SCROLL|NEWT_FLAG_RETURNEXIT);
-	newtListboxSetWidth(free_list,27);
+	form=newtForm(NULL, NULL, 0);
+	free_list=newtListbox(5, 3, mainwin_size.height - 8, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
+	newtListboxSetWidth(free_list, 23);
 
 	do_list_free(dev, free_list);
-	grow=newtCheckbox(mainwin_size.width-42,2,_("Growable"),' ',NULL,NULL);
-	dofs=newtCheckbox(mainwin_size.width-42,4,_("Do fyle sistem"),' ',NULL,NULL);
-	sel_ptype=newtCompactButton(mainwin_size.width-42,8,_("Select partition type"));
-	ptype=newtLabel(mainwin_size.width-15,8,"Primary");
+	grow=newtCheckbox(width, 2, _("Growable"), ' ', NULL,NULL);
+	dofs=newtCheckbox(width, 2 + height, _("Create file system"), ' ', NULL, NULL);
+	sel_ptype=newtCompactButton(width, 2 + 3 * height, _("Select partition type"));
+	ptype=newtLabel(width + left, 2 + 3 * height,"Primary");
 	part_type='p';
-	inicio=newtEntry(mainwin_size.width-15,2,NULL,10,NULL,NEWT_ENTRY_SCROLL
+	inicio=newtEntry(width + middle,2,NULL,10,NULL,NEWT_ENTRY_SCROLL
 			|NEWT_FLAG_RETURNEXIT);
-	fin=newtEntry(mainwin_size.width-15,4,NULL,10,NULL,NEWT_ENTRY_SCROLL
+	fin=newtEntry(width + middle, 2 + height,NULL,10,NULL,NEWT_ENTRY_SCROLL
 			|NEWT_FLAG_RETURNEXIT);
-	tam=newtEntry(mainwin_size.width-15,6,NULL,10,NULL,NEWT_ENTRY_SCROLL
+	tam=newtEntry(width + middle, 2 + 2 * height,NULL,10,NULL,NEWT_ENTRY_SCROLL
 			|NEWT_FLAG_RETURNEXIT);
-	sel_fs=newtCompactButton(mainwin_size.width-42,10,_("Select file system"));
-	fs=newtLabel(mainwin_size.width-15,10,"ext2");
-	ok=newtButton(5,16,_("Create"));
-	cancel=newtButton(mainwin_size.width-30,16,_("Cancel"));
+	sel_fs=newtCompactButton(width, 2 + 4 * height,_("Select file system"));
+	fs=newtLabel(width + left, 2 + 4 * height,"ext2");
+	ok=newtButton(5,mainwin_size.height - 4,_("Create"));
+	cancel=newtButton(mainwin_size.width-30,mainwin_size.height - 4,_("Cancel"));
 	newtFormAddComponents(form,
-			free_list, newtLabel(6,2,_("free strechs")),
+			free_list, newtLabel(6,2,_("free units")),
 			grow,dofs,
-			inicio,    newtLabel(mainwin_size.width-23,2,_("Start")),
-			newtLabel(mainwin_size.width-5,2,_(" Cil.")),
-			fin, 	   newtLabel(mainwin_size.width-23,4,_("End")),
-			newtLabel(mainwin_size.width-5,4,_(" Cil.")),
-			newtLabel(mainwin_size.width-5,4,_(" Cil.")),
-			tam,	   newtLabel(mainwin_size.width-23,6,_("Size")),
-			newtLabel(mainwin_size.width-5,6,_(" Mb")),
+			inicio,    newtLabel(width + left, 2,_("Start")),
+			newtLabel(width + right, 2,_(" Cyl.")),
+			fin, 	   newtLabel(width + left,2 + height,_("End")),
+			newtLabel(width + right, 2 + height,_(" Cyl.")),
+			newtLabel(width + right, 2 + height,_(" Cyl.")),
+			tam,	   newtLabel(width + left, 2 + 2 * height,_("Size")),
+			newtLabel(width + right, 2 + 2 * height,_(" Mb")),
 			fs,sel_fs,ok,cancel,sel_ptype,ptype,NULL);
-	strcpy(fs_type,"ext2");
+	strncpy(fs_type,"ext2", sizeof(fs_type));
 
 	/* ************************************************************ *
 	 * 			PROCESS					*
@@ -258,7 +265,7 @@
 			char *aux;
 			aux=select_file_system();
 			if(aux!=NULL){
-				strcpy(fs_type,aux);
+				strncpy(fs_type,aux, sizeof(fs_type));
 				newtLabelSetText(fs,fs_type);
 			}
 		}
@@ -307,7 +314,7 @@
 			}
 
 			/* Pedimos confirmacion*/
-			sprintf(ptrb,_("Are you sure create in %s a %c partition of type %s from %Ld to %Ld?")
+			snprintf(ptrb, sizeof(ptrb), _("Are you sure create in %s a %c partition of type %s from %Ld to %Ld?")
 					,dev->path,part_type,fs_type,tramo->start, tramo->end);
 			if(ped_exception_throw(PED_EXCEPTION_INFORMATION,
 					PED_EXCEPTION_YES|PED_EXCEPTION_NO,
@@ -335,11 +342,11 @@
 		}
 		if(ans==free_list){
 			ptramo=newtListboxGetCurrent(free_list);
-			sprintf(ptrb,"%Ld",SEC2CIL(dev,ptramo->start));
+			snprintf(ptrb, sizeof(ptrb), "%Ld",SEC2CIL(dev,ptramo->start));
 			newtEntrySet(inicio,ptrb,1);
-			sprintf(ptrb,"%Ld",SEC2CIL(dev,ptramo->end));
+			snprintf(ptrb, sizeof(ptrb), "%Ld",SEC2CIL(dev,ptramo->end));
 			newtEntrySet(fin,ptrb,1);
-			sprintf(ptrb,"%d", (int)SEC2MB(ptramo->end - ptramo->start+1));
+			snprintf(ptrb, sizeof(ptrb), "%d", (int)SEC2MB(ptramo->end - ptramo->start+1));
 			newtEntrySet(tam,ptrb,1);
 		}
 		if(ans==inicio||ans==fin){
@@ -366,7 +373,7 @@
 					newtEntrySet(inicio,"",1);
 					newtEntrySet(tam,"",1);
 				}else{
-					sprintf(ptrb,"%d", (int)SEC2MB((tramo->end-tramo->start+1)));
+					snprintf(ptrb, sizeof(ptrb), "%d", (int)SEC2MB((tramo->end-tramo->start+1)));
 					newtEntrySet(tam,ptrb,1);
 				}
 			}
@@ -392,7 +399,7 @@
 					newtEntrySet(inicio,"",1);
 					newtEntrySet(tam,"",1);
 				}else{
-					sprintf(ptrb,"%d", (int)SEC2CIL(dev,tramo->end));
+					snprintf(ptrb, sizeof(ptrb), "%d", (int)SEC2CIL(dev,tramo->end));
 					newtEntrySet(fin,ptrb,1);
 				}
 			}
--- nparted-0.1.orig/copy_partition.c
+++ nparted-0.1/copy_partition.c
@@ -25,9 +25,7 @@
 */
 #include "nparted.h"
 
-int copy_partition ( PedDevice *dev, int npart )
+int copy_partition (PedDevice *dev, int npart )
 {
-
-	return 1;
-
+  return 1;
 }
--- nparted-0.1.orig/del_partition.c
+++ nparted-0.1/del_partition.c
@@ -27,7 +27,7 @@
 
 int del_partition( PedDevice *dev, int npart)
 {
-	sprintf (ptrb,_("Are you sure that you del %s%-2d partition?"),
+	snprintf (ptrb, sizeof(ptrb), _("Are you sure that you del %s%-2d partition?"),
 			dev->path, npart);
 
 	if(ped_exception_throw (PED_EXCEPTION_INFORMATION,
--- nparted-0.1.orig/exception_manager.c
+++ nparted-0.1/exception_manager.c
@@ -28,31 +28,31 @@
 #include "nparted.h"
 #include "exception_manager.h"
 
-#undef _(A)
-#define _(A) (A)
+
 static char *names_exception_types[]={
-	_("You don't have seen this,report me"),
-	_("Information message"),
-	_("!!!----WARNING----!!!"),
-	_("!!!----ERROR----!!!"),
-	_("!!!----FATAL ERROR ----!!!"),
-	_("You has found a bug, please report me"),
-	_("Feature yet implemented"),
+	("You don't have seen this,report me"),
+	("Information message"),
+	("!!!----WARNING----!!!"),
+	("!!!----ERROR----!!!"),
+	("!!!----FATAL ERROR ----!!!"),
+	("You has found a bug, please report me"),
+	("Feature yet implemented"),
 };
+
 static button_option options[]={
-	{1,   	{_("FIX"),} ,			{PED_EXCEPTION_FIX,},{}			},
-	{1,	{_("YES"),},			{PED_EXCEPTION_YES,},{}				},
-	{1,	{_("NO"),},			{PED_EXCEPTION_NO,},{}				},
-	{1,	{_("OK"),},			{PED_EXCEPTION_OK,},{}				},
-	{1,	{_("RETRY"),},			{PED_EXCEPTION_RETRY,},{}				},
-	{1,	{_("IGNORE"),},			{PED_EXCEPTION_IGNORE,},{}				},
-	{1,	{_("CANCEL"),},			{PED_EXCEPTION_CANCEL,},{}				},
-	{2,	{_("OK"),_("CANCEL"),},		{PED_EXCEPTION_OK,PED_EXCEPTION_CANCEL,},{}	},
-	{2,	{_("YES"),_("NO"),},		{PED_EXCEPTION_YES,PED_EXCEPTION_NO,},{}		},
-	{3,	{_("YES"),_("NO"),_("CANCEL"),},{PED_EXCEPTION_YES,PED_EXCEPTION_NO,PED_EXCEPTION_CANCEL,},{}},
-	{2,	{_("IGNORE"),_("CANCEL"),},	{PED_EXCEPTION_IGNORE,PED_EXCEPTION_CANCEL,},{}	},
-	{2,	{_("RETRY"),_("CANCEL"),},	{PED_EXCEPTION_RETRY,PED_EXCEPTION_CANCEL,},{}	},
-	{3,{_("RETRY"),_("IGNORE"),_("CANCEL"),},{PED_EXCEPTION_RETRY,PED_EXCEPTION_IGNORE,PED_EXCEPTION_CANCEL,},{}}
+	{1,   	{("FIX"),} ,			{PED_EXCEPTION_FIX,},{}			},
+	{1,	{("YES"),},			{PED_EXCEPTION_YES,},{}				},
+	{1,	{("NO"),},			{PED_EXCEPTION_NO,},{}				},
+	{1,	{("OK"),},			{PED_EXCEPTION_OK,},{}				},
+	{1,	{("RETRY"),},			{PED_EXCEPTION_RETRY,},{}				},
+	{1,	{("IGNORE"),},			{PED_EXCEPTION_IGNORE,},{}				},
+	{1,	{("CANCEL"),},			{PED_EXCEPTION_CANCEL,},{}				},
+	{2,	{("OK"),("CANCEL"),},		{PED_EXCEPTION_OK,PED_EXCEPTION_CANCEL,},{}	},
+	{2,	{("YES"),("NO"),},		{PED_EXCEPTION_YES,PED_EXCEPTION_NO,},{}		},
+	{3,	{("YES"),("NO"),("CANCEL"),},{PED_EXCEPTION_YES,PED_EXCEPTION_NO,PED_EXCEPTION_CANCEL,},{}},
+	{2,	{("IGNORE"),("CANCEL"),},	{PED_EXCEPTION_IGNORE,PED_EXCEPTION_CANCEL,},{}	},
+	{2,	{("RETRY"),("CANCEL"),},	{PED_EXCEPTION_RETRY,PED_EXCEPTION_CANCEL,},{}	},
+	{3,{("RETRY"),("IGNORE"),("CANCEL"),},{PED_EXCEPTION_RETRY,PED_EXCEPTION_IGNORE,PED_EXCEPTION_CANCEL,},{}}
 };
 
 
@@ -79,9 +79,9 @@
 	y=newtTextboxGetNumLines(text)+2;
 	if (list_buttons==NULL) list_buttons=&options[3];
 	for (i=0; i<list_buttons->num; i++){
-		size_button=strlen(list_buttons->label[i])+5;
+		size_button=strlen(_(list_buttons->label[i]))+5;
 		list_buttons->button[i]= newtButton(x*(i+1)-size_button/2,y,
-				list_buttons->label[i]);
+				_(list_buttons->label[i]));
 		newtFormAddComponent(form,list_buttons->button[i]);
 	}
 	button=newtRunForm(form);
@@ -156,6 +156,6 @@
 	default:
 		list_button=&options[3];break;
 	}
-	return do_message_window(names_exception_types[exception->type],
-			exception->message,list_button);
+	return do_message_window(_(names_exception_types[exception->type]),
+				 exception->message,list_button);
 }
--- nparted-0.1.orig/exception_manager.h
+++ nparted-0.1/exception_manager.h
@@ -27,16 +27,7 @@
 #ifndef EXCEPTION_MANAGER_
 #define EXCEPTION_MANAGER_
 #include <parted/parted.h>
-/*
-#ifdef HAVE_NLS
-# define _(strint) (gettext(string))
-# ifdef HAVE_LIBINTL_H
-#  include <libintl.h>
-# endif
-#else
-# define _(string) (string)
-#endif
-*/
+
 #include <stdlib.h>
 #include <parted/parted.h>
 #include <newt.h>
--- nparted-0.1.orig/main.c
+++ nparted-0.1/main.c
@@ -30,6 +30,7 @@
  * salga. así es más fácil de que no se nos escape algúna estructura
  * sin cerrar
  */
+#include <string.h>
 #include "nparted.h"
 
 char ptrb[256];
@@ -66,19 +67,19 @@
 
 	for (i=0;(dev=ped_device_get_next(dev))!=NULL;i++){
 		tam=(dev->sector_size*dev->length)/(1024*1024);
-		sprintf(ptrb,"%s: %s-%s(%d-%d-%d %dB/sec) %LdMb",dev->path,
+		snprintf(ptrb, sizeof(ptrb), "%s: %s-%s(%d-%d-%d %dB/sec) %LdMb",dev->path,
 				get_name_device_type(dev->type),
 				dev->model,dev->heads,dev->sectors,
 				dev->cylinders, dev->sector_size, tam);
 
 		item=(itemlist*)NP_malloc(sizeof(itemlist));
-		strcpy(item->dev,dev->path);
+		strncpy(item->dev,dev->path, sizeof(item->dev));
 		item->dev[8]='\0';
 		item->part=-1;
 		
 		newtListboxAppendEntry(list,ptrb,item);
 
-		disk=ped_disk_open(dev);
+		disk=ped_disk_new(dev);
 		part=NULL;
 		if (disk==NULL){
 			if(ped_exception_throw(PED_EXCEPTION_FATAL,
@@ -100,9 +101,9 @@
 			geom=&(part->geom);
 			fs_type=ped_file_system_probe(geom);
 			if (fs_type!=NULL && fs_type->name!=NULL)
-				strcpy(fs_name,fs_type->name);
+				strncpy(fs_name, fs_type->name, sizeof(fs_name));
 			else
-				strcpy(fs_name,"");
+				strncpy(fs_name, "", sizeof(fs_name));
 			tam=geom->length*dev->sector_size; //bytes
 			tam=tam/(1024*1024); //Mbytes
 			/* Tam-cilindro=head*sectors*sizeofsector*/
@@ -110,13 +111,13 @@
 			end=geom->end/(dev->heads*dev->sectors)+1;
 
 
-			sprintf(ptrb,"     %s%-2d: %-8s Cil:(%Ld-%Ld) %LdMB %-8s",
+			snprintf(ptrb, sizeof(ptrb), "     %s%-2d: %-8s Cyl:(%Ld-%Ld) %LdMB %-8s",
 					dev->path, part->num, 
 					ped_partition_type_get_name(part->type),
 					start,end,tam,fs_name);
 
 			item=(itemlist*)NP_malloc(sizeof(itemlist));
-			strcpy(item->dev,dev->path);
+			strncpy(item->dev,dev->path, sizeof(item->dev));
 			item->dev[8]='\0';
 			item->part=part->num;
 
@@ -124,7 +125,7 @@
 			newtListboxAppendEntry(list,ptrb,item);
 
 		}
-		ped_disk_close(disk);
+		ped_disk_commit(disk);
 
 	}
 	if (i==0){
@@ -151,6 +152,8 @@
 	struct newtExitStruct toexit;
 	itemlist *item;
 	int key;
+	int height;
+
 	mainwin_size.width=screen_size.width-5;
 	mainwin_size.height=screen_size.height-5;
 	
@@ -158,15 +161,15 @@
 			_("Select the disk or partition"));	
 
 	formMain=newtForm(NULL,NULL,0);
-	list_disks=newtListbox(1,2,13,NEWT_FLAG_SCROLL);
-	newtListboxSetWidth(list_disks,62);
+	list_disks=newtListbox(1,2, mainwin_size.height - 7, NEWT_FLAG_SCROLL);
+	newtListboxSetWidth(list_disks, mainwin_size.width - 19);
 	if (!do_list_disks(list_disks)) return; 
-
-	add=newtButton (mainwin_size.width-10,2,_(" Add "));
-	del=newtButton(mainwin_size.width-10,7,_(" Del "));
-	edit=newtButton(mainwin_size.width-10,12,_(" Edit"));
-	copy=newtButton(5,16,_(" Copy"));
-	quit=newtButton(mainwin_size.width-30,16,_(" Quit"));
+	height = (mainwin_size.height - 12) / 4;
+	add=newtButton (mainwin_size.width-16, height,_(" Add "));
+	del=newtButton(mainwin_size.width-16, 2 * height + 4,_(" Del "));
+	edit=newtButton(mainwin_size.width-16,3 * height + 8,_(" Edit"));
+	copy=newtButton(5, mainwin_size.height - 4,_(" Copy"));
+	quit=newtButton(mainwin_size.width-30, mainwin_size.height - 4,_(" Quit"));
 
 	newtFormAddComponents(formMain,add,del,edit,copy,quit,list_disks,
 		NULL);
@@ -245,18 +248,19 @@
 }
 void init_parted (void )
 {
+        i18n_initialize();
 	ped_exception_set_handler(exception_handler);
-	ped_init();
+	//_init();
 	ped_device_probe_all();
 
 	newtInit();
 	newtCls();
 
-	newtDrawRootText(0,0,_("Debian Instalation"));
+	newtDrawRootText(0,0,_("Debian Installation"));
 #if defined(VERSION) && defined(PACKAGE)
-	sprintf(ptrb,_("%s v.%s"),PACKAGE,VERSION);
+	snprintf(ptrb, sizeof(ptrb),_("%s v.%s"),PACKAGE,VERSION);
 #else
-	sprintf(ptrb,_("NParted "));
+	snprintf(ptrb, sizeof(ptrb)_("NParted "));
 #endif
 	newtDrawRootText(-25,-1,ptrb);
 
@@ -266,7 +270,7 @@
 void done_parted(void )
 {
 	newtFinished();
-	ped_done();
+	//	_done(); 
 }
 #ifndef BOOTFLOPPIES
 int main (void)
--- nparted-0.1.orig/nparted.c
+++ nparted-0.1/nparted.c
@@ -28,9 +28,10 @@
 {
 	PedDisk*	disk;
 	PedFileSystem*	fs;
-	PedPartition* part;
+	PedPartition*	part;
+	PedTimer	t;
 
-	disk = ped_disk_open (*dev);
+	disk = ped_disk_new (*dev);
 	if (!disk)
 		goto error;
 
@@ -43,13 +44,13 @@
 	fs = ped_file_system_open (&part->geom);
 	if (!fs)
 		goto error_close_disk;
-	ped_file_system_check (fs);
+	ped_file_system_check (fs, &t);
 	ped_file_system_close (fs);
-	ped_disk_close (disk);
+	ped_disk_commit (disk);
 	return 1;
 
 error_close_disk:
-	ped_disk_close (disk);
+	ped_disk_commit (disk);
 error:
 	return 0;
 }
@@ -62,8 +63,9 @@
 	PedPartition*		src = NULL;
 	PedPartition*		dst = NULL;
 	PedFileSystem*		src_fs = NULL;
+	PedTimer		t;
 
-	src_disk = ped_disk_open (*dev);
+	src_disk = ped_disk_new (*dev);
 	if (!src_disk)
 		goto error;
 
@@ -84,7 +86,7 @@
 	dst_device = ped_device_get (dev_dest);
 	if (!dst_device)
 		goto error_close_disk;
-	dst_disk = ped_disk_open (dst_device);
+	dst_disk = ped_disk_new (dst_device);
 	
 	dst = ped_disk_get_partition (dst_disk, npart_dest);
 	if (!dst) {
@@ -106,20 +108,20 @@
 	src_fs = ped_file_system_open (&src->geom);
 	if (!src_fs)
 		goto error_close_disk;
-	if (!ped_file_system_copy (src_fs, &dst->geom))
+	if (!ped_file_system_copy (src_fs, &dst->geom, &t))
 		goto error_close_fs;
 	ped_file_system_close (src_fs);
 	if (dst_disk && src_disk != dst_disk)
-		ped_disk_close (dst_disk);
-	ped_disk_close (src_disk);
+		ped_disk_commit (dst_disk);
+	ped_disk_commit (src_disk);
 	return 1;
 
 error_close_fs:
 	ped_file_system_close (src_fs);
 error_close_disk:
 	if (dst_disk && src_disk != dst_disk)
-		ped_disk_close (dst_disk);
-	ped_disk_close (src_disk);
+		ped_disk_commit (dst_disk);
+	ped_disk_commit (src_disk);
 error:
 	return 0;
 }
@@ -131,30 +133,30 @@
 	PedDiskType*	type;
 
 	ped_exception_fetch_all ();
-	disk = ped_disk_open (*dev);
+	disk = ped_disk_new (*dev);
 	if (!disk) ped_exception_catch ();
 	ped_exception_leave_all ();
 
 	if (disk) {
-		if (ped_disk_is_busy (disk)) {
+		if (ped_device_is_busy (*dev)) {
 			if (ped_exception_throw (
 				PED_EXCEPTION_WARNING,
 				PED_EXCEPTION_IGNORE_CANCEL,
 				_("Partition(s) on %s are being used."),
 				disk->dev->path)
 					!= PED_EXCEPTION_IGNORE) {
-				ped_disk_close (disk);
+				ped_disk_commit (disk);
 				return 0;
 			}
 		}
-		ped_disk_close (disk);
+		ped_disk_commit (disk);
 	}
 
 	type = ped_disk_type_get (label);
 	if (!type)
 		goto error_syntax;
 
-	ped_disk_create (*dev, type);
+	ped_disk_new_fresh (*dev, type);
 	return 1;
 
 error_syntax:
@@ -167,8 +169,9 @@
 	PedPartition*		part;
 	PedFileSystemType*	type;
 	PedFileSystem*		fs;
+	PedTimer		t;
 
-	disk = ped_disk_open (*dev);
+	disk = ped_disk_new (*dev);
 	if (!disk)
 		goto error;
 
@@ -196,19 +199,18 @@
 		goto error_close_disk;
 	}
 
-	fs = ped_file_system_create (&part->geom, type);
+	fs = ped_file_system_create (&part->geom, type, &t);
 	if (!fs)
 		goto error;
 	ped_file_system_close (fs);
 
 	if (!ped_partition_set_system (part, type))
 		goto error_close_disk;
-	if (!ped_disk_write (disk))
-		goto error_close_disk;
-	ped_disk_close (disk);
+	ped_disk_destroy (disk);
+	ped_disk_commit (disk);
 	return 1;
 error_close_disk:
-	ped_disk_close (disk);
+	ped_disk_commit (disk);
 error:
 	return 0;
 }
@@ -221,10 +223,10 @@
 	PedFileSystemType*		fs_type;
 	PedConstraint*			constraint;
 
-	disk = ped_disk_open (*dev);
+	disk = ped_disk_new (*dev);
 	if (!disk)
 		goto error;
-	constraint = ped_constraint_any (disk);
+	constraint = ped_constraint_any (*dev);
 	if (!constraint)
 		goto error_close_disk;
 
@@ -265,9 +267,9 @@
 	 */
        	ped_partition_set_system (part, fs_type);
 
-	ped_disk_write (disk);
+	ped_disk_destroy (disk);
 	ped_constraint_destroy (constraint);
-	ped_disk_close (disk);
+	ped_disk_commit (disk);
 	return 1;
 
 error_destroy_part:
@@ -275,7 +277,7 @@
 error_destroy_constraint:
 	ped_constraint_destroy (constraint);
 error_close_disk:
-	ped_disk_close (disk);
+	ped_disk_commit (disk);
 error:
 	return 0;
 }
@@ -289,11 +291,12 @@
 	PedFileSystemType*		fs_type;
 	PedFileSystem*			fs;
 	PedConstraint*			constraint;
+	PedTimer			t;
 
-	disk = ped_disk_open (*dev);
+	disk = ped_disk_new (*dev);
 	if (!disk)
 		goto error;
-	constraint = ped_constraint_any (disk);
+	constraint = ped_constraint_any (*dev);
 	if (!constraint)
 		goto error_close_disk;
 
@@ -327,7 +330,7 @@
 	if (!ped_disk_add_partition (disk, part, constraint))
 		goto error_destroy_part;
 
-	fs = ped_file_system_create (&part->geom, fs_type);
+	fs = ped_file_system_create (&part->geom, fs_type, &t);
 	if (!fs) 
 		goto error_remove_part;
 	ped_file_system_close (fs);
@@ -337,9 +340,9 @@
  */
 	ped_partition_set_system (part, fs_type);
 
-	ped_disk_write (disk);
+	ped_disk_destroy (disk);
 	ped_constraint_destroy (constraint);
-	ped_disk_close (disk);
+	ped_disk_commit (disk);
 	return 1;
 
 error_remove_part:
@@ -350,7 +353,7 @@
 error_destroy_constraint:
 	ped_constraint_destroy (constraint);
 error_close_disk:
-	ped_disk_close (disk);
+	ped_disk_commit (disk);
 error:
 	return 0;
 }
@@ -362,8 +365,9 @@
 	PedGeometry		old_geom;
 	PedConstraint*		constraint;
 	PedFileSystem*		fs = NULL;
+	PedTimer		t;
 
-	disk = ped_disk_open (*dev);
+	disk = ped_disk_new (*dev);
 	if (!disk)
 		goto error;
 
@@ -391,7 +395,7 @@
 	/* NOTE: this gets aligned by ped_disk_set_partition_geom() */
 
 	old_geom = part->geom;
-	constraint = ped_constraint_any (disk);
+	constraint = ped_constraint_any (*dev);
 	if (!constraint)
 		goto error_close_disk;
 	if (!ped_disk_set_partition_geom (disk, part, constraint, start, end)) {
@@ -410,18 +414,17 @@
 	fs = ped_file_system_open (&old_geom);
 	if (!fs)
 		goto error_close_disk;
-	if (!ped_file_system_copy (fs, &part->geom))
+	if (!ped_file_system_copy (fs, &part->geom, &t))
 		goto error_close_fs;
 	ped_file_system_close (fs);
-	if (!ped_disk_write (disk))
-		goto error_close_disk;
-	ped_disk_close (disk);
+	ped_disk_destroy (disk);
+	ped_disk_commit (disk);
 	return 1;
 
 error_close_fs:
 	ped_file_system_close (fs);
 error_close_disk:
-	ped_disk_close (disk);
+	ped_disk_commit (disk);
 error:
 	return 0;
 }
@@ -431,7 +434,7 @@
 	PedDisk*	disk;
 	PedPartition*	part;
 
-	disk = ped_disk_open (*dev);
+	disk = ped_disk_new (*dev);
 	if (!disk)
 		goto error;
 
@@ -449,13 +452,12 @@
 
 	if (!ped_partition_set_name (part, name))
 		goto error_close_disk;
-	if (!ped_disk_write (disk))
-		goto error_close_disk;
-	ped_disk_close (disk);
+	ped_disk_destroy (disk);
+	ped_disk_commit (disk);
 	return 1;
 
 error_close_disk:
-	ped_disk_close (disk);
+	ped_disk_commit (disk);
 error:
 	return 0;
 }
@@ -467,8 +469,9 @@
 	PedFileSystem*		fs;
 	PedFileSystemType*	fs_type;
 	PedConstraint*		constraint;
+	PedTimer		t;
 
-	disk = ped_disk_open (*dev);
+	disk = ped_disk_new (*dev);
 	if (!disk)
 		goto error;
 	
@@ -489,7 +492,7 @@
 
 
 	if (part->type == PED_PARTITION_EXTENDED) {
-		constraint = ped_constraint_any (disk);
+		constraint = ped_constraint_any (*dev);
 		if (!ped_disk_set_partition_geom (disk, part, constraint,
 						  start, end))
 			goto error_destroy_constraint;
@@ -503,15 +506,15 @@
 		if (!ped_disk_set_partition_geom (disk, part, constraint,
 						  start, end))
 			goto error_close_fs;
-		if (!ped_file_system_resize (fs, &part->geom))
+		if (!ped_file_system_resize (fs, &part->geom, &t))
 			goto error_close_fs;
 		ped_file_system_close (fs);
 		ped_partition_set_system (part, fs_type);
 	}
 
-	ped_disk_write (disk);
+	ped_disk_destroy (disk);
 	ped_constraint_destroy (constraint);
-	ped_disk_close (disk);
+	ped_disk_commit (disk);
 	return 1;
 
 error_close_fs:
@@ -519,7 +522,7 @@
 error_destroy_constraint:
 	ped_constraint_destroy (constraint);
 error_close_disk:
-	ped_disk_close (disk);
+	ped_disk_commit (disk);
 error:
 	return 0;
 }
@@ -529,7 +532,7 @@
 	PedDisk*		disk;
 	PedPartition*		part;
 
-	disk = ped_disk_open (*dev);
+	disk = ped_disk_new (*dev);
 	if (!disk)
 		goto error;
 
@@ -549,12 +552,12 @@
 	}
 
 	ped_disk_delete_partition (disk, part);
-	ped_disk_write (disk);
-	ped_disk_close (disk);
+	ped_disk_destroy (disk);
+	ped_disk_commit (disk);
 	return 1;
 
 error_close_disk:
-	ped_disk_close (disk);
+	ped_disk_commit (disk);
 error:
 	return 0;
 }
@@ -565,7 +568,7 @@
 	PedPartition*		part;
 	PedPartitionFlag	flag;
 
-	disk = ped_disk_open (*dev);
+	disk = ped_disk_new (*dev);
 	if (!disk)
 		goto error;
 
@@ -584,14 +587,13 @@
 
 	if (!ped_partition_set_flag (part, flag, state))
 		goto error_close_disk;
-	if (!ped_disk_write (disk))
-		goto error_close_disk;
-	ped_disk_close (disk);
+	ped_disk_destroy (disk);
+	ped_disk_commit (disk);
 	return 1;
 
 error_help:
 error_close_disk:
-	ped_disk_close (disk);
+	ped_disk_commit (disk);
 error:
 	return 0;
 }
--- nparted-0.1.orig/nparted.h
+++ nparted-0.1/nparted.h
@@ -27,17 +27,14 @@
 #ifndef _NPARTED_
 #define _NPARTED_
 
+// removed in libparted 1.6, I don't understand why..., so I redefined it
+#define PED_PARTITION_PRIMARY 0
+
 /* Para cuando tenga soporte gettex con configure*/
 //#include "config.h"
 
-#ifdef ENABLE_NLS
-# define _(string) (gettext(string))
-//# ifdef HAVE_LIBINTL_H
-#  include <libintl.h>
-//# endif
-#else
-# define _(string) (string)
-#endif
+#define _(string) (gettext(string))
+#include <libintl.h>
 
 #include <stdlib.h>
 #include <parted/parted.h>
@@ -96,4 +93,5 @@
 int do_resize (PedDevice** dev,int npart, PedSector start, PedSector end);
 int do_rm (PedDevice** dev, int npart);
 int do_set (PedDevice** dev, int npart, char *flag_name,int state);
+void i18n_initialize (void);
 #endif
--- nparted-0.1.orig/utils.c
+++ nparted-0.1/utils.c
@@ -30,12 +30,10 @@
 {
 	/* Si HAVE_NLS es definido, asumimos la existencia de 
 	 * tres funciones invocadas aquí */
-#ifdef HAVE_NLS
 	/* Ponemos la localización actual */
-	setlocale(LC_MESSAGES,"");
-	bindtextdomain(PACKAGE,LOCALDIR);
+	//setlocale(LC_MESSAGES,"");
+	bindtextdomain(PACKAGE,"/usr/share/locale");
 	textdomain(PACKAGE);	
-#endif 
 }
 
 static char *device_type[]={"UNKNOWN","SCSI","IDE","DAC960","CPQARRAY"};
@@ -47,7 +45,9 @@
 		case PED_DEVICE_IDE:return device_type[2];
 		case PED_DEVICE_DAC960:return device_type[3];
 		case PED_DEVICE_CPQARRAY: return device_type[4];
-
+	        case PED_DEVICE_FILE: return device_type[0];	
+	        case PED_DEVICE_ATARAID: return device_type[0];
+	        case PED_DEVICE_I2O: return device_type[0];
 	}
 	return device_type[0];
 }
--- nparted-0.1.orig/po/Makefile.in.in
+++ nparted-0.1/po/Makefile.in.in
@@ -16,7 +16,7 @@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 
-prefix = @prefix@
+prefix = $(DESTDIR)@prefix@
 exec_prefix = @exec_prefix@
 datadir = $(prefix)/@DATADIRNAME@
 localedir = $(datadir)/locale
@@ -66,11 +66,11 @@
 	$(MSGMERGE) $< $(srcdir)/$(PACKAGE).pot -o $*.pox
 
 .po.mo:
-	$(MSGFMT) -o $@ $<
+	$(MSGFMT) --check --statistics --verbose -o $@ $<
 
 .po.gmo:
 	file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
-	  && rm -f $$file && $(GMSGFMT) -o $$file $<
+	  && rm -f $$file && $(GMSGFMT) --check --statistics --verbose -o $$file $<
 
 .po.cat:
 	sed -f ../intl/po2msg.sed < $< > $*.msg \
@@ -186,7 +186,7 @@
 
 mostlyclean:
 	rm -f core core.* *.pox $(PACKAGE).po *.old.po cat-id-tbl.tmp
-	rm -fr *.o
+	rm -f *.o *.gmo
 
 clean: mostlyclean
 
--- nparted-0.1.orig/po/nparted.pot
+++ nparted-0.1/po/nparted.pot
@@ -6,98 +6,98 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-11-14 13:04+0100\n"
+"POT-Creation-Date: 2002-07-05 04:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
+"Content-Transfer-Encoding: 8bit\n"
 
-#: add_partition.c:74
+#: add_partition.c:75
 msgid "Can't have two parts extended in one disk"
 msgstr ""
 
-#: add_partition.c:206
+#: add_partition.c:213
 #, c-format
 msgid "Adding a part to %s"
 msgstr ""
 
-#: add_partition.c:213
+#: add_partition.c:220
 msgid "Growable"
 msgstr ""
 
-#: add_partition.c:214
-msgid "Do fyle sistem"
+#: add_partition.c:221
+msgid "Create file system"
 msgstr ""
 
-#: add_partition.c:215
+#: add_partition.c:222
 msgid "Select partition type"
 msgstr ""
 
-#: add_partition.c:224
+#: add_partition.c:231
 msgid "Select file system"
 msgstr ""
 
-#: add_partition.c:226
+#: add_partition.c:233
 msgid "Create"
 msgstr ""
 
-#: add_partition.c:227
+#: add_partition.c:234
 msgid "Cancel"
 msgstr ""
 
-#: add_partition.c:229
-msgid "free strechs"
+#: add_partition.c:236
+msgid "free units"
 msgstr ""
 
-#: add_partition.c:231 edit_partition.c:46
+#: add_partition.c:238 edit_partition.c:48
 msgid "Start"
 msgstr ""
 
-#: add_partition.c:232 add_partition.c:234 add_partition.c:235
-msgid " Cil."
+#: add_partition.c:239 add_partition.c:241 add_partition.c:242
+msgid " Cyl."
 msgstr ""
 
-#: add_partition.c:233 edit_partition.c:47
+#: add_partition.c:240 edit_partition.c:49
 msgid "End"
 msgstr ""
 
-#: add_partition.c:236
+#: add_partition.c:243 edit_partition.c:50
 msgid "Size"
 msgstr ""
 
-#: add_partition.c:237
+#: add_partition.c:244
 msgid " Mb"
 msgstr ""
 
-#: add_partition.c:249
+#: add_partition.c:256
 msgid "Primary"
 msgstr ""
 
-#: add_partition.c:251
+#: add_partition.c:258
 msgid "Extend"
 msgstr ""
 
-#: add_partition.c:253
+#: add_partition.c:260
 msgid "Logic"
 msgstr ""
 
-#: add_partition.c:271 add_partition.c:351 add_partition.c:380
-#: edit_partition.c:235 edit_partition.c:256
+#: add_partition.c:278 add_partition.c:358 add_partition.c:387
+#: edit_partition.c:237 edit_partition.c:258
 msgid "a number is needed"
 msgstr ""
 
-#: add_partition.c:293 add_partition.c:363 add_partition.c:389
+#: add_partition.c:300 add_partition.c:370 add_partition.c:396
 msgid "Out limits"
 msgstr ""
 
-#: add_partition.c:304
+#: add_partition.c:311
 msgid "I can't do filesystem on a extended partition"
 msgstr ""
 
 #. Pedimos confirmacion
-#: add_partition.c:310
+#: add_partition.c:317
 #, c-format
 msgid "Are you sure create in %s a %c partition of type %s from %Ld to %Ld?"
 msgstr ""
@@ -107,225 +107,171 @@
 msgid "Are you sure that you del %s%-2d partition?"
 msgstr ""
 
-#: edit_partition.c:48
-msgid "Tamano"
-msgstr ""
-
-#: edit_partition.c:50
+#: edit_partition.c:52
 msgid "Now"
 msgstr ""
 
-#: edit_partition.c:55
+#: edit_partition.c:57
 msgid "Max."
 msgstr ""
 
-#: edit_partition.c:62
+#: edit_partition.c:64
 msgid "New geom"
 msgstr ""
 
-#: edit_partition.c:72
-msgid "Grow too much posibble"
+#: edit_partition.c:74
+msgid "Grow as much as possible"
 msgstr ""
 
-#: edit_partition.c:73
+#: edit_partition.c:75
 msgid "Without Filesystem"
 msgstr ""
 
-#: edit_partition.c:74
+#: edit_partition.c:76
 msgid "Select"
 msgstr ""
 
-#: edit_partition.c:76 exception_manager.c:46 exception_manager.c:50
+#: edit_partition.c:78
 msgid "OK"
 msgstr ""
 
-#: edit_partition.c:77 exception_manager.c:49 exception_manager.c:50
-#: exception_manager.c:52 exception_manager.c:53 exception_manager.c:54
-#: exception_manager.c:55
+#: edit_partition.c:79
 msgid "CANCEL"
 msgstr ""
 
-#: edit_partition.c:115
+#: edit_partition.c:117
 msgid "Device not valid"
 msgstr ""
 
-#: edit_partition.c:128
+#: edit_partition.c:130
 msgid "Partition not valid"
 msgstr ""
 
-#: edit_partition.c:136
+#: edit_partition.c:138
 msgid "I can't get de max partition's geometry"
 msgstr ""
 
-#: edit_partition.c:217
+#: edit_partition.c:219
 msgid "Change the file system will destroy any data"
 msgstr ""
 
-#: edit_partition.c:275
+#: edit_partition.c:277
 msgid "Are you soure?"
 msgstr ""
 
-#: edit_partition.c:355
+#: edit_partition.c:357
 #, c-format
 msgid "Editing %s%d"
 msgstr ""
 
-#: exception_manager.c:34
-msgid "You don't have seen this,report me"
-msgstr ""
-
-#: exception_manager.c:35
-msgid "Information message"
-msgstr ""
-
-#: exception_manager.c:36
-msgid "!!!----WARNING----!!!"
-msgstr ""
-
-#: exception_manager.c:37
-msgid "!!!----ERROR----!!!"
-msgstr ""
-
-#: exception_manager.c:38
-msgid "!!!----FATAL ERROR ----!!!"
-msgstr ""
-
-#: exception_manager.c:39
-msgid "You has found a bug, please report me"
-msgstr ""
-
-#: exception_manager.c:40
-msgid "Feature yet implemented"
-msgstr ""
-
-#: exception_manager.c:43
-msgid "FIX"
-msgstr ""
-
-#: exception_manager.c:44 exception_manager.c:51 exception_manager.c:52
-msgid "YES"
-msgstr ""
-
-#: exception_manager.c:45 exception_manager.c:51 exception_manager.c:52
-msgid "NO"
-msgstr ""
-
-#: exception_manager.c:47 exception_manager.c:54 exception_manager.c:55
-msgid "RETRY"
-msgstr ""
-
-#: exception_manager.c:48 exception_manager.c:53 exception_manager.c:55
-msgid "IGNORE"
-msgstr ""
-
 #: exception_manager.c:70
 msgid "Warning"
 msgstr ""
 
-#: main.c:87
+#: main.c:88
 msgid "Device detected, but I can't open it"
 msgstr ""
 
-#: main.c:137
+#: main.c:138
 msgid "No device detected, Are you root? "
 msgstr ""
 
-#: main.c:158
+#: main.c:161
 msgid "Select the disk or partition"
 msgstr ""
 
-#: main.c:165
+#: main.c:168
 msgid " Add "
 msgstr ""
 
-#: main.c:166
+#: main.c:169
 msgid " Del "
 msgstr ""
 
-#: main.c:167
+#: main.c:170
 msgid " Edit"
 msgstr ""
 
-#: main.c:168
+#: main.c:171
 msgid " Copy"
 msgstr ""
 
-#: main.c:169
+#: main.c:172
 msgid " Quit"
 msgstr ""
 
-#: main.c:187
+#: main.c:190
 msgid "Intern error have ocurred"
 msgstr ""
 
-#: main.c:194
+#: main.c:197
 msgid "A Hard disk, can't edit, select a partition or add a new partition"
 msgstr ""
 
-#: main.c:212
+#: main.c:215
 msgid "Can't del a hard disk, if you want del, remove it from equipment ;-)"
 msgstr ""
 
-#: main.c:224
+#: main.c:227
 msgid "Please, select the partition to copy,I can't copy the whole disk"
 msgstr ""
 
-#: main.c:255
-msgid "Debian Instalation"
+#: main.c:259
+msgid "Debian Installation"
 msgstr ""
 
-#: main.c:257
+#: main.c:261
 #, c-format
 msgid "%s v.%s"
 msgstr ""
 
-#: main.c:259
+#: main.c:263
 msgid "NParted "
 msgstr ""
 
-#: nparted.c:40 nparted.c:178 nparted.c:373 nparted.c:442 nparted.c:478
-#: nparted.c:539 nparted.c:575
+#: nparted.c:41 nparted.c:181 nparted.c:377 nparted.c:445 nparted.c:481
+#: nparted.c:542 nparted.c:578
 msgid "Partition doesn't exist."
 msgstr ""
 
-#: nparted.c:74
+#: nparted.c:76
 msgid "Source partition doesn't exist."
 msgstr ""
 
-#: nparted.c:79
+#: nparted.c:81
 msgid "Can't copy extended partitions."
 msgstr ""
 
-#: nparted.c:92
+#: nparted.c:94
 msgid "Destination partition doesn't exist."
 msgstr ""
 
-#: nparted.c:99
+#: nparted.c:101
 msgid "Destination partition is being used."
 msgstr ""
 
-#: nparted.c:143
+#: nparted.c:145
 #, c-format
 msgid "Partition(s) on %s are being used."
 msgstr ""
 
-#: nparted.c:185 nparted.c:386 nparted.c:485 nparted.c:546
+#: nparted.c:188 nparted.c:390 nparted.c:488 nparted.c:549
 msgid "Partition is being used."
 msgstr ""
 
-#: nparted.c:195
+#: nparted.c:198
 msgid "Unknown filesystem type."
 msgstr ""
 
-#: nparted.c:249 nparted.c:319
+#: nparted.c:251 nparted.c:322
 msgid "Unknown file system type."
 msgstr ""
 
-#: nparted.c:378
+#: nparted.c:382
 msgid "Can't move extended partitions."
 msgstr ""
 
-#: nparted.c:404
+#: nparted.c:408
 msgid "Can't move a partition onto itself.  Try using resize, perhaps?"
 msgstr ""
 
--- nparted-0.1.orig/po/es.po
+++ nparted-0.1/po/es.po
@@ -3,16 +3,19 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-11-14 13:04+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
+# Spanish messages for Nparted
+# Copyright (C) 2002 Julien LEMOINE
+# Unknown 
+#
+msgid  ""
+msgstr "Project-Id-Version: nparted 0.1\n"
+       "POT-Creation-Date: 2001-12-28 18:38+0100\n"
+       "PO-Revision-Date: 2001-12-28 19:27+0100\n"
+       "Last-Translator: Julien LEMOINE <speedblue@debian.org>\n"
+       "Language-Team: Spanish\n"
+       "MIME-Version: 1.0\n"
+       "Content-Type: text/plain; charset=ISO-8859-1\n"
+       "Content-Transfer-Encoding: 8bit\n"
 
 #: add_partition.c:74
 msgid "Can't have two parts extended in one disk"
@@ -28,7 +31,7 @@
 msgstr "Crecible"
 
 #: add_partition.c:214
-msgid "Do fyle sistem"
+msgid "Create file system"
 msgstr "Hacer sistema de ficheros"
 
 #: add_partition.c:215
@@ -48,7 +51,7 @@
 msgstr "Cancelar"
 
 #: add_partition.c:229
-msgid "free strechs"
+msgid "free units"
 msgstr "Huecos libres"
 
 #: add_partition.c:231 edit_partition.c:46
@@ -56,8 +59,8 @@
 msgstr "Comienzo"
 
 #: add_partition.c:232 add_partition.c:234 add_partition.c:235
-msgid " Cil."
-msgstr ""
+msgid " Cyl."
+msgstr "Cil"
 
 #: add_partition.c:233 edit_partition.c:47
 msgid "End"
@@ -126,7 +129,7 @@
 msgstr "Nueva geometría"
 
 #: edit_partition.c:72
-msgid "Grow too much posibble"
+msgid "Grow as much as possible"
 msgstr "Crecer lo máximo posible"
 
 #: edit_partition.c:73
@@ -277,8 +280,8 @@
 msgstr ""
 "Por favor, selecciona la partición a copiar, No puedo copiar un disco entero"
 
-#: main.c:255
-msgid "Debian Instalation"
+#: main.c:259
+msgid "Debian Installation"
 msgstr "Instalación Debian"
 
 #: main.c:257
--- nparted-0.1.orig/po/es_ES.po
+++ nparted-0.1/po/es_ES.po
@@ -3,16 +3,19 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-11-14 13:04+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
+# Spanish messages for Nparted
+# Copyright (C) 2002 Julien LEMOINE
+# Unknown 
+#
+msgid  ""
+msgstr "Project-Id-Version: nparted 0.1\n"
+       "POT-Creation-Date: 2001-12-28 18:38+0100\n"
+       "PO-Revision-Date: 2001-12-28 19:27+0100\n"
+       "Last-Translator: Julien LEMOINE <speedblue@debian.org>\n"
+       "Language-Team: Spanish\n"
+       "MIME-Version: 1.0\n"
+       "Content-Type: text/plain; charset=ISO-8859-1\n"
+       "Content-Transfer-Encoding: 8bit\n"
 
 #: add_partition.c:74
 msgid "Can't have two parts extended in one disk"
@@ -28,7 +31,7 @@
 msgstr "Crecible"
 
 #: add_partition.c:214
-msgid "Do fyle sistem"
+msgid "Create file system"
 msgstr "Hacer sistema de ficheros"
 
 #: add_partition.c:215
@@ -48,7 +51,7 @@
 msgstr "Cancelar"
 
 #: add_partition.c:229
-msgid "free strechs"
+msgid "free units"
 msgstr "Huecos libres"
 
 #: add_partition.c:231 edit_partition.c:46
@@ -56,8 +59,8 @@
 msgstr "Comienzo"
 
 #: add_partition.c:232 add_partition.c:234 add_partition.c:235
-msgid " Cil."
-msgstr ""
+msgid " Cyl."
+msgstr "Cil"
 
 #: add_partition.c:233 edit_partition.c:47
 msgid "End"
@@ -126,7 +129,7 @@
 msgstr "Nueva geometría"
 
 #: edit_partition.c:72
-msgid "Grow too much posibble"
+msgid "Grow as much as possible"
 msgstr "Crecer lo máximo posible"
 
 #: edit_partition.c:73
@@ -277,8 +280,8 @@
 msgstr ""
 "Por favor, selecciona la partición a copiar, No puedo copiar un disco entero"
 
-#: main.c:255
-msgid "Debian Instalation"
+#: main.c:259
+msgid "Debian Installation"
 msgstr "Instalación Debian"
 
 #: main.c:257
--- nparted-0.1.orig/po/cat-id-tbl.c
+++ nparted-0.1/po/cat-id-tbl.c
@@ -11,14 +11,14 @@
   {"Can't have two parts extended in one disk", 2},
   {"Adding a part to %s", 3},
   {"Growable", 4},
-  {"Do fyle sistem", 5},
+  {"Create file system", 5},
   {"Select partition type", 6},
   {"Select file system", 7},
   {"Create", 8},
   {"Cancel", 9},
-  {"free strechs", 10},
+  {"free units", 10},
   {"Start", 11},
-  {" Cil.", 12},
+  {" Cyl.", 12},
   {"End", 13},
   {"Size", 14},
   {" Mb", 15},
@@ -30,66 +30,53 @@
   {"I can't do filesystem on a extended partition", 21},
   {"Are you sure create in %s a %c partition of type %s from %Ld to %Ld?", 22},
   {"Are you sure that you del %s%-2d partition?", 23},
-  {"Tamano", 24},
-  {"Now", 25},
-  {"Max.", 26},
-  {"New geom", 27},
-  {"Grow too much posibble", 28},
-  {"Without Filesystem", 29},
-  {"Select", 30},
-  {"OK", 31},
-  {"CANCEL", 32},
-  {"Device not valid", 33},
-  {"Partition not valid", 34},
-  {"I can't get de max partition's geometry", 35},
-  {"Change the file system will destroy any data", 36},
-  {"Are you soure?", 37},
-  {"Editing %s%d", 38},
-  {"You don't have seen this,report me", 39},
-  {"Information message", 40},
-  {"!!!----WARNING----!!!", 41},
-  {"!!!----ERROR----!!!", 42},
-  {"!!!----FATAL ERROR ----!!!", 43},
-  {"You has found a bug, please report me", 44},
-  {"Feature yet implemented", 45},
-  {"FIX", 46},
-  {"YES", 47},
-  {"NO", 48},
-  {"RETRY", 49},
-  {"IGNORE", 50},
-  {"Warning", 51},
-  {"Device detected, but I can't open it", 52},
-  {"No device detected, Are you root? ", 53},
-  {"Select the disk or partition", 54},
-  {" Add ", 55},
-  {" Del ", 56},
-  {" Edit", 57},
-  {" Copy", 58},
-  {" Quit", 59},
-  {"Intern error have ocurred", 60},
-  {"A Hard disk, can't edit, select a partition or add a new partition", 61},
-  {"Can't del a hard disk, if you want del, remove it from equipment ;-)", 62},
-  {"Please, select the partition to copy,I can't copy the whole disk", 63},
-  {"Debian Instalation", 64},
-  {"%s v.%s", 65},
-  {"NParted ", 66},
-  {"Partition doesn't exist.", 67},
-  {"Source partition doesn't exist.", 68},
-  {"Can't copy extended partitions.", 69},
-  {"Destination partition doesn't exist.", 70},
-  {"Destination partition is being used.", 71},
-  {"Partition(s) on %s are being used.", 72},
-  {"Partition is being used.", 73},
-  {"Unknown filesystem type.", 74},
-  {"Unknown file system type.", 75},
-  {"Can't move extended partitions.", 76},
-  {"Can't move a partition onto itself.  Try using resize, perhaps?", 77},
-  {"I can't malloc, abort", 78},
-  {"Please, select file system", 79},
-  {"primary", 80},
-  {"logical", 81},
-  {"extended", 82},
-  {"Please, select partition_type", 83},
+  {"Now", 24},
+  {"Max.", 25},
+  {"New geom", 26},
+  {"Grow as much as possible", 27},
+  {"Without Filesystem", 28},
+  {"Select", 29},
+  {"OK", 30},
+  {"CANCEL", 31},
+  {"Device not valid", 32},
+  {"Partition not valid", 33},
+  {"I can't get de max partition's geometry", 34},
+  {"Change the file system will destroy any data", 35},
+  {"Are you soure?", 36},
+  {"Editing %s%d", 37},
+  {"Warning", 38},
+  {"Device detected, but I can't open it", 39},
+  {"No device detected, Are you root? ", 40},
+  {"Select the disk or partition", 41},
+  {" Add ", 42},
+  {" Del ", 43},
+  {" Edit", 44},
+  {" Copy", 45},
+  {" Quit", 46},
+  {"Intern error have ocurred", 47},
+  {"A Hard disk, can't edit, select a partition or add a new partition", 48},
+  {"Can't del a hard disk, if you want del, remove it from equipment ;-)", 49},
+  {"Please, select the partition to copy,I can't copy the whole disk", 50},
+  {"Debian Installation", 51},
+  {"%s v.%s", 52},
+  {"NParted ", 53},
+  {"Partition doesn't exist.", 54},
+  {"Source partition doesn't exist.", 55},
+  {"Can't copy extended partitions.", 56},
+  {"Destination partition doesn't exist.", 57},
+  {"Destination partition is being used.", 58},
+  {"Partition(s) on %s are being used.", 59},
+  {"Partition is being used.", 60},
+  {"Unknown filesystem type.", 61},
+  {"Unknown file system type.", 62},
+  {"Can't move extended partitions.", 63},
+  {"Can't move a partition onto itself.  Try using resize, perhaps?", 64},
+  {"I can't malloc, abort", 65},
+  {"Please, select file system", 66},
+  {"primary", 67},
+  {"logical", 68},
+  {"extended", 69},
+  {"Please, select partition_type", 70},
 };
 
-int _msg_tbl_length = 83;
+int _msg_tbl_length = 70;
--- nparted-0.1.orig/po/POTFILES
+++ nparted-0.1/po/POTFILES
@@ -0,0 +1,8 @@
+	../add_partition.c \
+	../copy_partition.c \
+	../del_partition.c \
+	../edit_partition.c \
+	../exception_manager.c \
+	../main.c \
+	../nparted.c \
+	../utils.c
--- nparted-0.1.orig/po/fr_FR.po
+++ nparted-0.1/po/fr_FR.po
@@ -0,0 +1,353 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+# French messages for Nparted
+# Copyright (C) 2002 Julien LEMOINE
+# Julien LEMOINE <speedblue@debian.org>
+#
+msgid  ""
+msgstr "Project-Id-Version: nparted 0.1\n"
+       "POT-Creation-Date: 2001-12-28 18:38+0100\n"
+       "PO-Revision-Date: 2001-12-28 19:27+0100\n"
+       "Last-Translator: Julien LEMOINE <julien@speedblue.org>\n"
+       "Language-Team: French\n"
+       "MIME-Version: 1.0\n"
+       "Content-Type: text/plain; charset=ISO-8859-1\n"
+       "Content-Transfer-Encoding: 8bit\n"
+
+#: add_partition.c:74
+msgid "Can't have two parts extended in one disk"
+msgstr "Un disque ne peut contenir deux partitions étendus"
+
+#: add_partition.c:206
+#, c-format
+msgid "Adding a part to %s"
+msgstr "Ajouter une partition à %s"
+
+#: add_partition.c:213
+msgid "Growable"
+msgstr "peut s'étendre"
+
+#: add_partition.c:214
+msgid "Create file system"
+msgstr "Créer le sys."
+
+#: add_partition.c:215
+msgid "Select partition type"
+msgstr "Sél. le type"
+
+#: add_partition.c:224
+msgid "Select file system"
+msgstr "Sél. le syst."
+
+#: add_partition.c:226
+msgid "Create"
+msgstr "Créer"
+
+#: add_partition.c:227
+msgid "Cancel"
+msgstr "Annuler"
+
+#: add_partition.c:229
+msgid "free units"
+msgstr "unités libre"
+
+#: add_partition.c:231 edit_partition.c:46
+msgid "Start"
+msgstr "Dém."
+
+#: add_partition.c:232 add_partition.c:234 add_partition.c:235
+msgid " Cyl."
+msgstr "Cyl"
+
+#: add_partition.c:233 edit_partition.c:47
+msgid "End"
+msgstr "Fin"
+
+#: add_partition.c:236
+msgid "Size"
+msgstr "Tail."
+
+#: add_partition.c:237
+msgid " Mb"
+msgstr "Mo"
+
+#: add_partition.c:249
+msgid "Primary"
+msgstr "Primaire"
+
+#: add_partition.c:251
+msgid "Extend"
+msgstr "Étendu"
+
+#: add_partition.c:253
+msgid "Logic"
+msgstr "Logique"
+
+#: add_partition.c:271 add_partition.c:351 add_partition.c:380
+#: edit_partition.c:235 edit_partition.c:256
+msgid "a number is needed"
+msgstr "un nombre est nécessaire"
+
+#: add_partition.c:293 add_partition.c:363 add_partition.c:389
+msgid "Out limits"
+msgstr "Hors des limites"
+
+#: add_partition.c:304
+msgid "I can't do filesystem on a extended partition"
+msgstr "Impossible de créer le système de fichier sur une partition étendu"
+
+#. Pedimos confirmacion
+#: add_partition.c:310
+#, c-format
+msgid "Are you sure create in %s a %c partition of type %s from %Ld to %Ld?"
+msgstr "Êtes vous sûr de vouloir créer dans %s une partition %c de type %s depuis %Ld vers %Ld ?"
+
+#: del_partition.c:30
+#, c-format
+msgid "Are you sure that you del %s%-2d partition?"
+msgstr "Êtes vous sûr de vouloir supprimer %s%-2d partition?"
+
+#: edit_partition.c:50
+msgid "Now"
+msgstr "Maintenant"
+
+#: edit_partition.c:55
+msgid "Max."
+msgstr "Max."
+
+#: edit_partition.c:62
+msgid "New geom"
+msgstr "Nouvelle géométrie"
+
+#: edit_partition.c:72
+msgid "Grow as much as possible"
+msgstr "Agrandir le plus possible"
+
+#: edit_partition.c:73
+msgid "Without Filesystem"
+msgstr "Sans système de fichier"
+
+#: edit_partition.c:74
+msgid "Select"
+msgstr "Sélect."
+
+#: edit_partition.c:76 exception_manager.c:46 exception_manager.c:50
+msgid "OK"
+msgstr "OK"
+
+#: edit_partition.c:77 exception_manager.c:49 exception_manager.c:50
+#: exception_manager.c:52 exception_manager.c:53 exception_manager.c:54
+#: exception_manager.c:55
+msgid "CANCEL"
+msgstr "ANNULER"
+
+#: edit_partition.c:115
+msgid "Device not valid"
+msgstr "Périphérique invalide"
+
+#: edit_partition.c:128
+msgid "Partition not valid"
+msgstr "Partition invalide"
+
+#: edit_partition.c:136
+msgid "I can't get de max partition's geometry"
+msgstr "Impossible de récupérer la géométrie maximum de la partition"
+
+#: edit_partition.c:217
+msgid "Change the file system will destroy any data"
+msgstr "Le changement de système de fichier va détruire toutes les données"
+
+#: edit_partition.c:275
+msgid "Are you soure?"
+msgstr "Êtes vous sûr ?"
+
+#: edit_partition.c:355
+#, c-format
+msgid "Editing %s%d"
+msgstr "Éditer %s%d"
+
+#: exception_manager.c:34
+msgid "You don't have seen this,report me"
+msgstr "Vous n'avez pas vu ceci, rapportez le moi"
+
+#: exception_manager.c:35
+msgid "Information message"
+msgstr "Message Informatif"
+
+#: exception_manager.c:36
+msgid "!!!----WARNING----!!!"
+msgstr "!!!---ATTENTION---!!!"
+
+#: exception_manager.c:37
+msgid "!!!----ERROR----!!!"
+msgstr "!!!---ERREUR---!!!"
+
+#: exception_manager.c:38
+msgid "!!!----FATAL ERROR ----!!!"
+msgstr "!!!---ERREUR FATALE---!!!"
+
+#: exception_manager.c:39
+msgid "You has found a bug, please report me"
+msgstr "Vous avez trouve un bug, merci de me le rapporter"
+
+#: exception_manager.c:40
+msgid "Feature yet implemented"
+msgstr "Fonctionnalité non implémentée"
+
+#: exception_manager.c:43
+msgid "FIX"
+msgstr "FIX"
+
+#: exception_manager.c:44 exception_manager.c:51 exception_manager.c:52
+msgid "YES"
+msgstr "OUI"
+
+#: exception_manager.c:45 exception_manager.c:51 exception_manager.c:52
+msgid "NO"
+msgstr "NON"
+
+#: exception_manager.c:47 exception_manager.c:54 exception_manager.c:55
+msgid "RETRY"
+msgstr "RÉESSAYER"
+
+#: exception_manager.c:48 exception_manager.c:53 exception_manager.c:55
+msgid "IGNORE"
+msgstr "IGNORER"
+
+#: exception_manager.c:70
+msgid "Warning"
+msgstr "Attention"
+
+#: main.c:87
+msgid "Device detected, but I can't open it"
+msgstr "Périphérique détecté, Mais impossible de l'ouvrir"
+
+#: main.c:137
+msgid "No device detected, Are you root? "
+msgstr "Aucun périphérique détecté, êtes vous root? "
+
+#: main.c:158
+msgid "Select the disk or partition"
+msgstr "Sélectionnez le disque où la partition"
+
+#: main.c:165
+msgid " Add "
+msgstr " Ajouter "
+
+#: main.c:166
+msgid " Del "
+msgstr " Supprimer "
+
+#: main.c:167
+msgid " Edit"
+msgstr " Éditer"
+
+#: main.c:168
+msgid " Copy"
+msgstr " Copier"
+
+#: main.c:169
+msgid " Quit"
+msgstr " Quitter"
+
+#: main.c:187
+msgid "Intern error have ocurred"
+msgstr "Une erreur interne est apparue"
+
+#: main.c:194
+msgid "A Hard disk, can't edit, select a partition or add a new partition"
+msgstr "Impossible d'éditer un disque, sélectionnez une partition où ajoutez en une"
+
+#: main.c:212
+msgid "Can't del a hard disk, if you want del, remove it from equipment ;-)"
+msgstr "Impossible de supprimer un Disque, Si vous voulez le supprimer enlevez le de votre ordinateur ;-)"
+
+#: main.c:224
+msgid "Please, select the partition to copy,I can't copy the whole disk"
+msgstr "Merci de sélectionnez la partition a copier, Impossible de copier un disque vide"
+
+#: main.c:259
+msgid "Debian Installation"
+msgstr "Installation Debian"
+
+#: main.c:257
+#, c-format
+msgid "%s v.%s"
+msgstr "%s v.%s"
+
+#: main.c:259
+msgid "NParted "
+msgstr "NParted"
+
+#: nparted.c:40 nparted.c:178 nparted.c:373 nparted.c:442 nparted.c:478
+#: nparted.c:539 nparted.c:575
+msgid "Partition doesn't exist."
+msgstr "La partition n'existe pas"
+
+#: nparted.c:74
+msgid "Source partition doesn't exist."
+msgstr "la partition source n'existe pas"
+
+#: nparted.c:79
+msgid "Can't copy extended partitions."
+msgstr "Impossible de copier une partition étendu"
+
+#: nparted.c:92
+msgid "Destination partition doesn't exist."
+msgstr "La partition de destination n'existe pas"
+
+#: nparted.c:99
+msgid "Destination partition is being used."
+msgstr "La partition de destination est en cours d'utilisation"
+
+#: nparted.c:143
+#, c-format
+msgid "Partition(s) on %s are being used."
+msgstr "Les partition(s) sur %s sont en cours d'utilisation"
+
+#: nparted.c:185 nparted.c:386 nparted.c:485 nparted.c:546
+msgid "Partition is being used."
+msgstr "Partition en cours d'utilisation"
+
+#: nparted.c:195
+msgid "Unknown filesystem type."
+msgstr "type de système de fichier inconnu"
+
+#: nparted.c:249 nparted.c:319
+msgid "Unknown file system type."
+msgstr "type de système de fichier inconnu"
+
+#: nparted.c:378
+msgid "Can't move extended partitions."
+msgstr "Impossible de déplacer une partition étendu"
+
+#: nparted.c:404
+msgid "Can't move a partition onto itself.  Try using resize, perhaps?"
+msgstr "Impossible de déplacer une partition sur elle même, essayez de la redimensionner"
+
+#: utils.c:64
+msgid "I can't malloc, abort"
+msgstr "Plus de mémoire(Malloc impossible), arrêt"
+
+#: utils.c:89
+msgid "Please, select file system"
+msgstr "Sélectionnez un type de système de fichier"
+
+#: utils.c:117
+msgid "primary"
+msgstr "primaire"
+
+#: utils.c:118
+msgid "logical"
+msgstr "logique"
+
+#: utils.c:119
+msgid "extended"
+msgstr "étendu"
+
+#: utils.c:121
+msgid "Please, select partition_type"
+msgstr "Sélectionnez un type de système de fichier"
--- nparted-0.1.orig/po/fr.po
+++ nparted-0.1/po/fr.po
@@ -0,0 +1,353 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+# French messages for Nparted
+# Copyright (C) 2002 Julien LEMOINE
+# Julien LEMOINE <speedblue@debian.org>
+#
+msgid  ""
+msgstr "Project-Id-Version: nparted 0.1\n"
+       "POT-Creation-Date: 2001-12-28 18:38+0100\n"
+       "PO-Revision-Date: 2001-12-28 19:27+0100\n"
+       "Last-Translator: Julien LEMOINE <julien@speedblue.org>\n"
+       "Language-Team: French\n"
+       "MIME-Version: 1.0\n"
+       "Content-Type: text/plain; charset=ISO-8859-1\n"
+       "Content-Transfer-Encoding: 8bit\n"
+
+#: add_partition.c:74
+msgid "Can't have two parts extended in one disk"
+msgstr "Un disque ne peut contenir deux partitions étendus"
+
+#: add_partition.c:206
+#, c-format
+msgid "Adding a part to %s"
+msgstr "Ajouter une partition à %s"
+
+#: add_partition.c:213
+msgid "Growable"
+msgstr "peut s'étendre"
+
+#: add_partition.c:214
+msgid "Create file system"
+msgstr "Créer le sys."
+
+#: add_partition.c:215
+msgid "Select partition type"
+msgstr "Sél. le type"
+
+#: add_partition.c:224
+msgid "Select file system"
+msgstr "Sél. le syst."
+
+#: add_partition.c:226
+msgid "Create"
+msgstr "Créer"
+
+#: add_partition.c:227
+msgid "Cancel"
+msgstr "Annuler"
+
+#: add_partition.c:229
+msgid "free units"
+msgstr "unités libre"
+
+#: add_partition.c:231 edit_partition.c:46
+msgid "Start"
+msgstr "Dém."
+
+#: add_partition.c:232 add_partition.c:234 add_partition.c:235
+msgid " Cyl."
+msgstr "Cyl"
+
+#: add_partition.c:233 edit_partition.c:47
+msgid "End"
+msgstr "Fin"
+
+#: add_partition.c:236
+msgid "Size"
+msgstr "Tail."
+
+#: add_partition.c:237
+msgid " Mb"
+msgstr "Mo"
+
+#: add_partition.c:249
+msgid "Primary"
+msgstr "Primaire"
+
+#: add_partition.c:251
+msgid "Extend"
+msgstr "Étendu"
+
+#: add_partition.c:253
+msgid "Logic"
+msgstr "Logique"
+
+#: add_partition.c:271 add_partition.c:351 add_partition.c:380
+#: edit_partition.c:235 edit_partition.c:256
+msgid "a number is needed"
+msgstr "un nombre est nécessaire"
+
+#: add_partition.c:293 add_partition.c:363 add_partition.c:389
+msgid "Out limits"
+msgstr "Hors des limites"
+
+#: add_partition.c:304
+msgid "I can't do filesystem on a extended partition"
+msgstr "Impossible de créer le système de fichier sur une partition étendu"
+
+#. Pedimos confirmacion
+#: add_partition.c:310
+#, c-format
+msgid "Are you sure create in %s a %c partition of type %s from %Ld to %Ld?"
+msgstr "Êtes vous sûr de vouloir créer dans %s une partition %c de type %s depuis %Ld vers %Ld ?"
+
+#: del_partition.c:30
+#, c-format
+msgid "Are you sure that you del %s%-2d partition?"
+msgstr "Êtes vous sûr de vouloir supprimer %s%-2d partition?"
+
+#: edit_partition.c:50
+msgid "Now"
+msgstr "Maintenant"
+
+#: edit_partition.c:55
+msgid "Max."
+msgstr "Max."
+
+#: edit_partition.c:62
+msgid "New geom"
+msgstr "Nouvelle géométrie"
+
+#: edit_partition.c:72
+msgid "Grow as much as possible"
+msgstr "Agrandir le plus possible"
+
+#: edit_partition.c:73
+msgid "Without Filesystem"
+msgstr "Sans système de fichier"
+
+#: edit_partition.c:74
+msgid "Select"
+msgstr "Sélect."
+
+#: edit_partition.c:76 exception_manager.c:46 exception_manager.c:50
+msgid "OK"
+msgstr "OK"
+
+#: edit_partition.c:77 exception_manager.c:49 exception_manager.c:50
+#: exception_manager.c:52 exception_manager.c:53 exception_manager.c:54
+#: exception_manager.c:55
+msgid "CANCEL"
+msgstr "ANNULER"
+
+#: edit_partition.c:115
+msgid "Device not valid"
+msgstr "Périphérique invalide"
+
+#: edit_partition.c:128
+msgid "Partition not valid"
+msgstr "Partition invalide"
+
+#: edit_partition.c:136
+msgid "I can't get de max partition's geometry"
+msgstr "Impossible de récupérer la géométrie maximum de la partition"
+
+#: edit_partition.c:217
+msgid "Change the file system will destroy any data"
+msgstr "Le changement de système de fichier va détruire toutes les données"
+
+#: edit_partition.c:275
+msgid "Are you soure?"
+msgstr "Êtes vous sûr ?"
+
+#: edit_partition.c:355
+#, c-format
+msgid "Editing %s%d"
+msgstr "Éditer %s%d"
+
+#: exception_manager.c:34
+msgid "You don't have seen this,report me"
+msgstr "Vous n'avez pas vu ceci, rapportez le moi"
+
+#: exception_manager.c:35
+msgid "Information message"
+msgstr "Message Informatif"
+
+#: exception_manager.c:36
+msgid "!!!----WARNING----!!!"
+msgstr "!!!---ATTENTION---!!!"
+
+#: exception_manager.c:37
+msgid "!!!----ERROR----!!!"
+msgstr "!!!---ERREUR---!!!"
+
+#: exception_manager.c:38
+msgid "!!!----FATAL ERROR ----!!!"
+msgstr "!!!---ERREUR FATALE---!!!"
+
+#: exception_manager.c:39
+msgid "You has found a bug, please report me"
+msgstr "Vous avez trouve un bug, merci de me le rapporter"
+
+#: exception_manager.c:40
+msgid "Feature yet implemented"
+msgstr "Fonctionnalité non implémentée"
+
+#: exception_manager.c:43
+msgid "FIX"
+msgstr "FIX"
+
+#: exception_manager.c:44 exception_manager.c:51 exception_manager.c:52
+msgid "YES"
+msgstr "OUI"
+
+#: exception_manager.c:45 exception_manager.c:51 exception_manager.c:52
+msgid "NO"
+msgstr "NON"
+
+#: exception_manager.c:47 exception_manager.c:54 exception_manager.c:55
+msgid "RETRY"
+msgstr "RÉESSAYER"
+
+#: exception_manager.c:48 exception_manager.c:53 exception_manager.c:55
+msgid "IGNORE"
+msgstr "IGNORER"
+
+#: exception_manager.c:70
+msgid "Warning"
+msgstr "Attention"
+
+#: main.c:87
+msgid "Device detected, but I can't open it"
+msgstr "Périphérique détecté, Mais impossible de l'ouvrir"
+
+#: main.c:137
+msgid "No device detected, Are you root? "
+msgstr "Aucun périphérique détecté, êtes vous root? "
+
+#: main.c:158
+msgid "Select the disk or partition"
+msgstr "Sélectionnez le disque où la partition"
+
+#: main.c:165
+msgid " Add "
+msgstr " Ajouter "
+
+#: main.c:166
+msgid " Del "
+msgstr " Supprimer "
+
+#: main.c:167
+msgid " Edit"
+msgstr " Éditer"
+
+#: main.c:168
+msgid " Copy"
+msgstr " Copier"
+
+#: main.c:169
+msgid " Quit"
+msgstr " Quitter"
+
+#: main.c:187
+msgid "Intern error have ocurred"
+msgstr "Une erreur interne est apparue"
+
+#: main.c:194
+msgid "A Hard disk, can't edit, select a partition or add a new partition"
+msgstr "Impossible d'éditer un disque, sélectionnez une partition où ajoutez en une"
+
+#: main.c:212
+msgid "Can't del a hard disk, if you want del, remove it from equipment ;-)"
+msgstr "Impossible de supprimer un Disque, Si vous voulez le supprimer enlevez le de votre ordinateur ;-)"
+
+#: main.c:224
+msgid "Please, select the partition to copy,I can't copy the whole disk"
+msgstr "Merci de sélectionnez la partition a copier, Impossible de copier un disque vide"
+
+#: main.c:259
+msgid "Debian Installation"
+msgstr "Installation Debian"
+
+#: main.c:257
+#, c-format
+msgid "%s v.%s"
+msgstr "%s v.%s"
+
+#: main.c:259
+msgid "NParted "
+msgstr "NParted"
+
+#: nparted.c:40 nparted.c:178 nparted.c:373 nparted.c:442 nparted.c:478
+#: nparted.c:539 nparted.c:575
+msgid "Partition doesn't exist."
+msgstr "La partition n'existe pas"
+
+#: nparted.c:74
+msgid "Source partition doesn't exist."
+msgstr "la partition source n'existe pas"
+
+#: nparted.c:79
+msgid "Can't copy extended partitions."
+msgstr "Impossible de copier une partition étendu"
+
+#: nparted.c:92
+msgid "Destination partition doesn't exist."
+msgstr "La partition de destination n'existe pas"
+
+#: nparted.c:99
+msgid "Destination partition is being used."
+msgstr "La partition de destination est en cours d'utilisation"
+
+#: nparted.c:143
+#, c-format
+msgid "Partition(s) on %s are being used."
+msgstr "Les partition(s) sur %s sont en cours d'utilisation"
+
+#: nparted.c:185 nparted.c:386 nparted.c:485 nparted.c:546
+msgid "Partition is being used."
+msgstr "Partition en cours d'utilisation"
+
+#: nparted.c:195
+msgid "Unknown filesystem type."
+msgstr "type de système de fichier inconnu"
+
+#: nparted.c:249 nparted.c:319
+msgid "Unknown file system type."
+msgstr "type de système de fichier inconnu"
+
+#: nparted.c:378
+msgid "Can't move extended partitions."
+msgstr "Impossible de déplacer une partition étendu"
+
+#: nparted.c:404
+msgid "Can't move a partition onto itself.  Try using resize, perhaps?"
+msgstr "Impossible de déplacer une partition sur elle même, essayez de la redimensionner"
+
+#: utils.c:64
+msgid "I can't malloc, abort"
+msgstr "Plus de mémoire(Malloc impossible), arrêt"
+
+#: utils.c:89
+msgid "Please, select file system"
+msgstr "Sélectionnez un type de système de fichier"
+
+#: utils.c:117
+msgid "primary"
+msgstr "primaire"
+
+#: utils.c:118
+msgid "logical"
+msgstr "logique"
+
+#: utils.c:119
+msgid "extended"
+msgstr "étendu"
+
+#: utils.c:121
+msgid "Please, select partition_type"
+msgstr "Sélectionnez un type de système de fichier"
--- nparted-0.1.orig/intl/Makefile.in
+++ nparted-0.1/intl/Makefile.in
@@ -150,7 +150,7 @@
 
 info dvi:
 
-$(OBJECTS): ../config.h libgettext.h
+$(OBJECTS): libgettext.h
 bindtextdom.$lo finddomain.$lo loadmsgcat.$lo: gettextP.h gettext.h loadinfo.h
 dcgettext.$lo: gettextP.h gettext.h hash-string.h loadinfo.h
 
@@ -166,7 +166,7 @@
 
 
 mostlyclean:
-	rm -f *.a *.o *.lo core core.*
+	rm -f *.a *.o *.lo core core.* libintl.h
 
 clean: mostlyclean
 
--- nparted-0.1.orig/intl/dcgettext.c
+++ nparted-0.1/intl/dcgettext.c
@@ -15,6 +15,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
+#include <string.h>
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
--- nparted-0.1.orig/intl/po2tbl.sed
+++ nparted-0.1/intl/po2tbl.sed
@@ -0,0 +1,60 @@
+1 {
+  i\
+/* Automatically generated by po2tbl.sed from @PACKAGE NAME@.pot.  */\
+\
+#if HAVE_CONFIG_H\
+# include <config.h>\
+#endif\
+\
+#include "libgettext.h"\
+\
+const struct _msg_ent _msg_tbl[] = {
+  h
+  s/.*/0/
+  x
+}
+/^msgid/ {
+  s/msgid[ 	]*\(".*"\)/  {\1/
+  tb
+  :b
+  N
+  s/\(.*\)"\(\n\)"\(.*"\)/\1\2\3/
+  ta
+  s/\(.*\)\n.*/\1/
+  bc
+  :a
+  s/\(.*\)\(\n.*\)/\1\\\2/
+  P
+  s/.*\n\(.*\)/\1/
+  tb
+  :c
+  x
+  td
+  :d
+  s/9\(_*\)$/_\1/
+  td
+  s/^\(_*\)$/0\1/
+  s/8\(_*\)$/9\1/
+  s/7\(_*\)$/8\1/
+  s/6\(_*\)$/7\1/
+  s/5\(_*\)$/6\1/
+  s/4\(_*\)$/5\1/
+  s/3\(_*\)$/4\1/
+  s/2\(_*\)$/3\1/
+  s/1\(_*\)$/2\1/
+  s/0\(_*\)$/1\1/
+  s/_/0/g
+  x
+  G
+  s/\(.*\)\n\([0-9]*\)/\1, \2},/
+  s/\(.*\)"$/\1/
+  p
+}
+$ {
+  i\
+};\
+
+  g
+  s/0*\(.*\)/int _msg_tbl_length = \1;/p
+}
+d
--- nparted-0.1.orig/debian/changelog
+++ nparted-0.1/debian/changelog
@@ -0,0 +1,76 @@
+nparted (0.1-9) unstable; urgency=low
+
+  * nparted is now an inofficial debian package, I asked deletion from 
+    debian pool since there are no upstream authors.
+  * changed section to admin (closes: #179162)
+  * fixed typos in man (closes: #179147)
+  * build depends on new version of gettext (closes: #179501)
+
+ -- Julien LEMOINE <speedblue@debian.org>  Wed,  5 Feb 2003 21:47:31 +0100
+
+nparted (0.1-8) unstable; urgency=low
+
+  * updated man page (closes: #179026)
+  * updated to follow the last version of Debian Policy (3.5.8)
+
+ -- Julien LEMOINE <speedblue@debian.org>  Thu, 30 Jan 2003 13:58:06 +0100
+
+nparted (0.1-7) unstable; urgency=low
+
+  * updated to follow the last version of Debian Policy
+
+ -- Julien LEMOINE <speedblue@debian.org>  Wed, 21 Aug 2002 16:15:03 +0200
+
+nparted (0.1-6) unstable; urgency=low
+
+  * ported to parted1.6
+    replace ped_disk_open by ped_disk_new
+    replace ped_disk_create by ped_disk_new_fresh
+    replace ped_disk_write by ped_disk_destroy
+    replace ped_disk_close by ped_disk_commit
+    add timer to ped_file_system_create, ped_file_system_copy,
+      ped_file_system_check and ped_file_system_resize
+    remove ped_init() and ped_done()
+  * recompile nparted using parted1.6 (closes: #136053)
+
+ -- Julien LEMOINE <speedblue@debian.org>  Fri,  5 Jul 2002 03:18:44 +0200
+
+nparted (0.1-5) unstable; urgency=low
+
+  * recompile nparted using e2fsprogs 1.27-2
+  * delete Makefile on clean
+
+ -- Julien LEMOINE <speedblue@debian.org>  Sun, 24 Mar 2002 01:01:07 +0100
+
+nparted (0.1-4) unstable; urgency=low
+
+  * add i18n (gettext) support.
+    fr, fr_FR, es and es_ES templates.
+
+ -- Julien LEMOINE <speedblue@debian.org>  Thu, 21 Mar 2002 02:03:44 +0100
+
+nparted (0.1-3) unstable; urgency=low
+
+  * fixed display, align components according to resolution
+  * fixed overlap and typo in 'add' screen (closes: #136911)
+
+ -- Julien LEMOINE <speedblue@debian.org>  Sun, 10 Mar 2002 01:45:08 +0100
+
+nparted (0.1-2) unstable; urgency=low
+
+  * fixed some typos (apply patch from Petter Reinholdtsen) (closes: #136320)
+  * fixed segv at startup (closes: #135771)
+  * changed package description (closes: #135770)
+
+ -- Julien LEMOINE <speedblue@debian.org>  Tue, 25 Feb 2002 03:21:16 +0100
+
+nparted (0.1-1) unstable; urgency=low
+
+  * Initial Release.
+  * Made a man page
+  * made French Translation
+  * closes: #120407
+	
+ -- Julien LEMOINE <speedblue@debian.org>  Wed, 26 Dec 2001 01:06:15 +0100
+
+
--- nparted-0.1.orig/debian/copyright
+++ nparted-0.1/debian/copyright
@@ -0,0 +1,16 @@
+This package was debianized by Julien LEMOINE <speedblue@debian.org> on
+Wed, 26 Dec 2001 01:06:15 +0100.
+
+It was downloaded from http://www.laespiral.org/proyectos/nparted/
+
+Upstream Authors: Mario Teijeiro <asimovi@escomposlinux.org>,
+		  Esteve Fernàndez <esteve@sindominio.net>
+
+Copyright:
+This software is Copyright (C) 1998-2000  Mario Teijeiro Otero Esteve Fernández
+Jaime Villate La Espiral Andrew Clausen, Lennert Buytenhek and Red Hat, Inc.
+
+You are free to distribute this software under the terms of
+the GNU General Public License.
+On Debian systems, the complete text of the GNU General Public
+License can be found in /usr/share/common-licenses/GPL file.
--- nparted-0.1.orig/debian/dirs
+++ nparted-0.1/debian/dirs
@@ -0,0 +1 @@
+usr/sbin
--- nparted-0.1.orig/debian/nparted.sgml
+++ nparted-0.1/debian/nparted.sgml
@@ -0,0 +1,106 @@
+<!doctype refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname "<firstname>Julien LEMOINE</firstname>">
+  <!ENTITY dhsurname   "<surname>SpeedBlue</surname>">
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY dhdate      "<date>December 26, 2001</date>">
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1). -->
+  <!ENTITY dhsection   "<manvolnum>8</manvolnum>">
+  <!ENTITY dhemail     "<email>speedblue@debian.org</email>">
+  <!ENTITY dhusername  "Julien LEMOINE">
+  <!ENTITY dhucpackage "<refentrytitle>nparted</refentrytitle>">
+  <!ENTITY dhpackage   "nparted">
+
+  <!ENTITY debian      "<productname>Debian GNU/Linux</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+]>
+
+<refentry>
+  <docinfo>
+    <address>
+      &dhemail;
+    </address>
+    <author>
+      &dhfirstname;
+      &dhsurname;
+    </author>
+    <copyright>
+      <year>2001</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </docinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose>Curses and GNU Parted based disk partition table manipulator for GNU/Linux</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para><command>&dhpackage;</command> is an interface (front-end) that uses the GNU parted library.
+GNU parted (and therefore nParted) allows to resize, 
+to copy and to move partitions, in the style of PowerQuest's well-known 
+program, Partition Magic.
+     </para>
+
+  </refsect1>
+  <refsect1>
+    <title>OPTIONS</title>
+
+    <para>This program does not take any command line arguments.</para>
+
+  </refsect1>
+  <refsect1>
+    <title>SEE ALSO</title>
+
+    <para>nparted is incompletely documented by the files in the
+      <filename>/usr/share/doc/nparted/</filename> 
+      directory.</para>
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by &dhusername; &dhemail; for
+      the &debian; system (but may be used by others).</para>
+
+    <!-- <para>Permission is granted to copy, distribute and/or modify
+      this document under the terms of the <acronym>GNU</acronym> Free
+      Documentation License, Version 1.1 or any later version
+      published by the Free Software Foundation; with no Invariant
+      Sections, no Front-Cover Texts and no Back-Cover Texts.  A copy
+      of the license can be found under
+      <filename>/usr/share/common-licenses/FDL</filename>.</para> -->
+
+  </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
--- nparted-0.1.orig/debian/control
+++ nparted-0.1/debian/control
@@ -0,0 +1,14 @@
+Source: nparted
+Section: admin
+Priority: optional
+Maintainer: Julien LEMOINE <speedblue@debian.org>
+Build-Depends: debhelper (>> 3.0.0), docbook-utils | docbook-to-man, libparted1.6-dev (>> 1.4.0), libnewt-dev (>> 0.50.0), uuid-dev (>= 1.2), gettext (>= 0.11.5)
+Standards-Version: 3.5.8
+
+Package: nparted
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Newt and GNU Parted based disk partition table manipulator
+ nParted is a newt-based front end to the GNU parted library that
+ permits the user to resize, copy, and move disk partitions in the style
+ of PowerQuest's well-known Partition Magic partition table editor.
--- nparted-0.1.orig/debian/rules
+++ nparted-0.1/debian/rules
@@ -0,0 +1,60 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This is the debhelper compatability version to use.
+export DH_COMPAT=3
+
+build: build-stamp
+build-stamp:
+	dh_testdir
+	./configure --prefix=/usr --with-included-gettext
+	$(MAKE)
+	if [ -f /usr/bin/docbook2man ]; then 				\
+		/usr/bin/docbook2man debian/nparted.sgml;  		\
+	else 								\
+		/usr/bin/docbook-to-man debian/nparted.sgml > nparted.8; \
+	fi
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+	-$(MAKE) clean
+	-rm -f *.8 ./po/Makefile ./intl/Makefile ./Makefile po/Makefile.in
+	-rm -f manpage*
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	$(MAKE) install DESTDIR=`pwd`/debian/nparted
+
+
+binary-indep: build install
+
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installdocs
+	dh_installmanpages
+	dh_installinfo
+	dh_installchangelogs 
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
--- nparted-0.1.orig/debian/docs
+++ nparted-0.1/debian/docs
@@ -0,0 +1 @@
+TODO